From 20d01284c2b4d0af466454effe622d0bf41d5c38 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 May 2013 12:47:52 +0200
Subject: [PATCH 0001/4742] Give the line wrapper a CSS class CodeMirror-code

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4f0823b73a..507f3731ab 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -106,7 +106,7 @@ window.CodeMirror = (function() {
     d.scrollbarV = elt("div", [elt("div", null, null, "width: 1px")], "CodeMirror-vscrollbar");
     d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
     // DIVs containing the selection and the actual code
-    d.lineDiv = elt("div");
+    d.lineDiv = elt("div", null, "CodeMirror-code");
     d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
     // Blinky cursor, and element used to ensure cursor fits at the end of a line
     d.cursor = elt("div", "\u00a0", "CodeMirror-cursor");

From 5dbe952bb3cabf64c92f4e80ffde7e9c7fc2d213 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 May 2013 12:56:47 +0200
Subject: [PATCH 0002/4742] [css mode] Properly make keywords case-insensitive

Also prevent Object.prototype properties like toString from
being interpreted as keywords.

Closes #1495
---
 mode/css/css.js | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 8b1aca280e..f0fae602d1 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -165,26 +165,27 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
         if (type == "variable-definition") state.stack.push("propertyValue");
         return "variable-2";
       } else if (style == "property") {
-        if (context == "propertyValue"){
-          if (valueKeywords[stream.current()]) {
+        var word = stream.current().toLowerCase();
+        if (context == "propertyValue") {
+          if (valueKeywords.hasOwnProperty(word)) {
             style = "string-2";
-          } else if (colorKeywords[stream.current()]) {
+          } else if (colorKeywords.hasOwnProperty(word)) {
             style = "keyword";
           } else {
             style = "variable-2";
           }
         } else if (context == "rule") {
-          if (!propertyKeywords[stream.current()]) {
+          if (!propertyKeywords.hasOwnProperty(word)) {
             style += " error";
           }
         } else if (context == "block") {
           // if a value is present in both property, value, or color, the order
           // of preference is property -> color -> value
-          if (propertyKeywords[stream.current()]) {
+          if (propertyKeywords.hasOwnProperty(word)) {
             style = "property";
-          } else if (colorKeywords[stream.current()]) {
+          } else if (colorKeywords.hasOwnProperty(word)) {
             style = "keyword";
-          } else if (valueKeywords[stream.current()]) {
+          } else if (valueKeywords.hasOwnProperty(word)) {
             style = "string-2";
           } else {
             style = "tag";
@@ -194,38 +195,36 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
         } else if (context == "@media") {
           if (atMediaTypes[stream.current()]) {
             style = "attribute"; // Known attribute
-          } else if (/^(only|not)$/i.test(stream.current())) {
+          } else if (/^(only|not)$/.test(word)) {
             style = "keyword";
-          } else if (stream.current().toLowerCase() == "and") {
+          } else if (word == "and") {
             style = "error"; // "and" is only allowed in @mediaType
-          } else if (atMediaFeatures[stream.current()]) {
+          } else if (atMediaFeatures.hasOwnProperty(word)) {
             style = "error"; // Known property, should be in @mediaType(
           } else {
             // Unknown, expecting keyword or attribute, assuming attribute
             style = "attribute error";
           }
         } else if (context == "@mediaType") {
-          if (atMediaTypes[stream.current()]) {
+          if (atMediaTypes.hasOwnProperty(word)) {
             style = "attribute";
-          } else if (stream.current().toLowerCase() == "and") {
+          } else if (word == "and") {
             style = "operator";
-          } else if (/^(only|not)$/i.test(stream.current())) {
+          } else if (/^(only|not)$/.test(word)) {
             style = "error"; // Only allowed in @media
-          } else if (atMediaFeatures[stream.current()]) {
-            style = "error"; // Known property, should be in parentheses
           } else {
             // Unknown attribute or property, but expecting property (preceded
             // by "and"). Should be in parentheses
             style = "error";
           }
         } else if (context == "@mediaType(") {
-          if (propertyKeywords[stream.current()]) {
+          if (propertyKeywords.hasOwnProperty(word)) {
             // do nothing, remains "property"
-          } else if (atMediaTypes[stream.current()]) {
+          } else if (atMediaTypes.hasOwnProperty(word)) {
             style = "error"; // Known property, should be in parentheses
-          } else if (stream.current().toLowerCase() == "and") {
+          } else if (word == "and") {
             style = "operator";
-          } else if (/^(only|not)$/i.test(stream.current())) {
+          } else if (/^(only|not)$/.test(word)) {
             style = "error"; // Only allowed in @media
           } else {
             style += " error";

From 798a05182b1996fdd9d96b1e7eb9fa4478afc292 Mon Sep 17 00:00:00 2001
From: Randy Edmunds <redmunds@adobe.com>
Date: Fri, 3 May 2013 11:52:40 -0700
Subject: [PATCH 0003/4742] add gutter filler

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

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 71e0d0e52b..5512380116 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -19,7 +19,7 @@
   padding: 0 4px; /* Horizontal padding of content */
 }
 
-.CodeMirror-scrollbar-filler {
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   background-color: white; /* The little square between H and V scrollbars */
 }
 
@@ -125,7 +125,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 /* The fake, visible scrollbars. Used to force redraw during scrolling
    before actuall scrolling happens, thus preventing shaking and
    flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler {
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   position: absolute;
   z-index: 6;
   display: none;
@@ -142,7 +142,9 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 .CodeMirror-scrollbar-filler {
   right: 0; bottom: 0;
-  z-index: 6;
+}
+.CodeMirror-gutter-filler {
+  left: 0; bottom: 0;
 }
 
 .CodeMirror-gutters {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 507f3731ab..051852f0c2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -105,6 +105,7 @@ window.CodeMirror = (function() {
     d.scrollbarH = elt("div", [elt("div", null, null, "height: 1px")], "CodeMirror-hscrollbar");
     d.scrollbarV = elt("div", [elt("div", null, null, "width: 1px")], "CodeMirror-vscrollbar");
     d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
+    d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
     // DIVs containing the selection and the actual code
     d.lineDiv = elt("div", null, "CodeMirror-code");
     d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
@@ -133,7 +134,7 @@ window.CodeMirror = (function() {
     d.scroller.setAttribute("tabIndex", "-1");
     // The element in which the editor lives.
     d.wrapper = elt("div", [d.inputDiv, d.scrollbarH, d.scrollbarV,
-                            d.scrollbarFiller, d.scroller], "CodeMirror");
+                            d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
     // Work around IE7 z-index bug
     if (ie_lt8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
     if (place.appendChild) place.appendChild(d.wrapper); else place(d.wrapper);
@@ -212,7 +213,7 @@ window.CodeMirror = (function() {
     estimateLineHeights(cm);
     regChange(cm);
     clearCaches(cm);
-    setTimeout(function(){updateScrollbars(cm.display, cm.doc.height);}, 100);
+    setTimeout(function(){updateScrollbars(cm.display, cm.doc.height, cm.options.fixedGutter);}, 100);
   }
 
   function estimateHeight(cm) {
@@ -317,7 +318,7 @@ window.CodeMirror = (function() {
 
   // Re-synchronize the fake scrollbars with the actual size of the
   // content. Optionally force a scrollTop.
-  function updateScrollbars(d /* display */, docHeight) {
+  function updateScrollbars(d /* display */, docHeight, fixedGutter) {
     var totalHeight = docHeight + paddingVert(d);
     d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
     var scrollHeight = Math.max(totalHeight, d.scroller.scrollHeight);
@@ -339,6 +340,11 @@ window.CodeMirror = (function() {
       d.scrollbarFiller.style.display = "block";
       d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = scrollbarWidth(d.measure) + "px";
     } else d.scrollbarFiller.style.display = "";
+    if (needsH && fixedGutter) {
+      d.gutterFiller.style.display = "block";
+      d.gutterFiller.style.height = scrollbarWidth(d.measure) + "px";
+      d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
+    } else d.gutterFiller.style.display = "";
 
     if (mac_geLion && scrollbarWidth(d.measure) === 0)
       d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px";
@@ -404,7 +410,7 @@ window.CodeMirror = (function() {
           signalLater(cm, "viewportChange", cm, cm.display.showingFrom, cm.display.showingTo);
       } else break;
       updateSelection(cm);
-      updateScrollbars(cm.display, cm.doc.height);
+      updateScrollbars(cm.display, cm.doc.height, cm.options.fixedGutter);
 
       // Clip forced viewport to actual scrollable area
       if (viewPort)
@@ -1590,7 +1596,7 @@ window.CodeMirror = (function() {
       var target = e_target(e);
       if (target == display.scrollbarH || target == display.scrollbarH.firstChild ||
           target == display.scrollbarV || target == display.scrollbarV.firstChild ||
-          target == display.scrollbarFiller) return null;
+          target == display.scrollbarFiller || target == display.gutterFiller) return null;
     }
     var x, y, space = getRect(display.lineSpace);
     // Fails unpredictably on IE[67] when mouse is dragged around quickly.

From 9d92920b4fbb2d50f0246ebae3eeacef50bd56f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 May 2013 13:08:38 +0200
Subject: [PATCH 0004/4742] Add coverGutterNextToScrollbar option

Issue #1493
---
 doc/manual.html   |  7 +++++++
 lib/codemirror.js | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 6f47472050..a2a129d047 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -232,6 +232,13 @@ <h2 id="config">Configuration</h2>
       horizontally (false) or whether it stays fixed during horizontal
       scrolling (true, the default).</dd>
 
+      <dt id="option_coverGutterNextToScrollbar"><code><strong>coverGutterNextToScrollbar</strong>: boolean</code></dt>
+      <dd>When <a href="#option_fixedGutter"><code>fixedGutter</code></a>
+      is on, and there is a horizontal scrollbar, by default the
+      gutter will be visible to the left of this scrollbar. If this
+      option is set to true, it will be covered by an element with
+      class <code>CodeMirror-gutter-filler</code>.</dd>
+
       <dt id="option_readOnly"><code><strong>readOnly</strong>: boolean|string</code></dt>
       <dd>This disables editing of the editor content by the user. If
       the special value <code>"nocursor"</code> is given (instead of
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 051852f0c2..4becd1a0b6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -213,7 +213,7 @@ window.CodeMirror = (function() {
     estimateLineHeights(cm);
     regChange(cm);
     clearCaches(cm);
-    setTimeout(function(){updateScrollbars(cm.display, cm.doc.height, cm.options.fixedGutter);}, 100);
+    setTimeout(function(){updateScrollbars(cm);}, 100);
   }
 
   function estimateHeight(cm) {
@@ -251,6 +251,7 @@ window.CodeMirror = (function() {
 
   function guttersChanged(cm) {
     updateGutters(cm);
+    alignHorizontally(cm);
     regChange(cm);
   }
 
@@ -318,7 +319,8 @@ window.CodeMirror = (function() {
 
   // Re-synchronize the fake scrollbars with the actual size of the
   // content. Optionally force a scrollTop.
-  function updateScrollbars(d /* display */, docHeight, fixedGutter) {
+  function updateScrollbars(cm) {
+    var d = cm.display, docHeight = cm.doc.height;
     var totalHeight = docHeight + paddingVert(d);
     d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
     var scrollHeight = Math.max(totalHeight, d.scroller.scrollHeight);
@@ -340,7 +342,7 @@ window.CodeMirror = (function() {
       d.scrollbarFiller.style.display = "block";
       d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = scrollbarWidth(d.measure) + "px";
     } else d.scrollbarFiller.style.display = "";
-    if (needsH && fixedGutter) {
+    if (needsH && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
       d.gutterFiller.style.display = "block";
       d.gutterFiller.style.height = scrollbarWidth(d.measure) + "px";
       d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
@@ -410,7 +412,7 @@ window.CodeMirror = (function() {
           signalLater(cm, "viewportChange", cm, cm.display.showingFrom, cm.display.showingTo);
       } else break;
       updateSelection(cm);
-      updateScrollbars(cm.display, cm.doc.height, cm.options.fixedGutter);
+      updateScrollbars(cm);
 
       // Clip forced viewport to actual scrollable area
       if (viewPort)
@@ -3123,6 +3125,7 @@ window.CodeMirror = (function() {
     cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
     cm.refresh();
   }, true);
+  option("coverGutterNextToScrollbar", false, updateScrollbars);
   option("lineNumbers", false, function(cm) {
     setGuttersForLineNumbers(cm.options);
     guttersChanged(cm);

From 53bc4b1f54670c827662d5210a37b35e63a07c39 Mon Sep 17 00:00:00 2001
From: Andy Kimball <ak@configit.com>
Date: Fri, 3 May 2013 11:42:48 +0100
Subject: [PATCH 0005/4742] Fix copy/paste in IE

---
 addon/runmode/runmode.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 3e1bed7361..a25e96c170 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -1,5 +1,7 @@
 CodeMirror.runMode = function(string, modespec, callback, options) {
   var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
+  var isIe8OrEarlier = /\bMSIE\s(\d+)/.exec(navigator.userAgent);
+  isIe8OrEarlier = isIe8OrEarlier && +isIe8OrEarlier[1] <= 8;
 
   if (callback.nodeType == 1) {
     var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
@@ -7,7 +9,11 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
     node.innerHTML = "";
     callback = function(text, style) {
       if (text == "\n") {
-        node.appendChild(document.createElement("br"));
+        // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.
+        // Emitting a carriage return makes everything ok.
+        var newLine = isIe8OrEarlier ? '\r' : text;
+        var newLineSpan = node.appendChild(document.createElement("span"));
+        newLineSpan.appendChild( document.createTextNode(newLine));
         col = 0;
         return;
       }

From 64113ec97bb73c2a740d42d56021acb01ce05a92 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 May 2013 13:20:08 +0200
Subject: [PATCH 0006/4742] Simplify 53bc4b1f54670c827662d5210a37b35e63a07c39

---
 addon/runmode/runmode.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index a25e96c170..a7da6d718f 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -1,7 +1,7 @@
 CodeMirror.runMode = function(string, modespec, callback, options) {
   var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
-  var isIe8OrEarlier = /\bMSIE\s(\d+)/.exec(navigator.userAgent);
-  isIe8OrEarlier = isIe8OrEarlier && +isIe8OrEarlier[1] <= 8;
+  var ie = /MSIE \d/.test(navigator.userAgent);
+  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
 
   if (callback.nodeType == 1) {
     var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
@@ -11,9 +11,7 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
       if (text == "\n") {
         // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.
         // Emitting a carriage return makes everything ok.
-        var newLine = isIe8OrEarlier ? '\r' : text;
-        var newLineSpan = node.appendChild(document.createElement("span"));
-        newLineSpan.appendChild( document.createTextNode(newLine));
+        node.appendChild(document.createTextNode(ie_lt9 ? '\r' : text));
         col = 0;
         return;
       }

From a3402da8e342d6925f5a431b7ccf3ff4bfd2966c Mon Sep 17 00:00:00 2001
From: Steffen Beyer <steffen.beyer@213tec.com>
Date: Sat, 4 May 2013 05:20:31 +0200
Subject: [PATCH 0007/4742] add overwrite mode ("R") to vim keymap

---
 keymap/vim.js    | 19 +++++++++++++++++++
 test/vim_test.js |  7 +++++++
 2 files changed, 26 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 499601b5b0..cbb9760360 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -255,6 +255,7 @@
     { keys: ['P'], type: 'action', action: 'paste',
         actionArgs: { after: false }},
     { keys: ['r', 'character'], type: 'action', action: 'replace' },
+    { keys: ['R'], type: 'action', action: 'enterReplaceMode' },
     { keys: ['u'], type: 'action', action: 'undo' },
     { keys: ['Ctrl-r'], type: 'action', action: 'redo' },
     { keys: ['m', 'character'], type: 'action', action: 'setMark' },
@@ -1605,6 +1606,10 @@
           }
         }
       },
+      enterReplaceMode: function(cm, actionArgs) {
+        cm.setOption('keyMap', 'vim-replace');
+        cm.toggleOverwrite();
+      },
       incrementNumberToken: function(cm, actionArgs, vim) {
         var cur = cm.getCursor();
         var lineStr = cm.getLine(cur.line);
@@ -3035,6 +3040,20 @@
       fallthrough: ['default']
     };
 
+    function exitReplaceMode(cm) {
+      cm.toggleOverwrite();
+      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
+      cm.setOption('keyMap', 'vim');
+    }
+
+    CodeMirror.keyMap['vim-replace'] = {
+      'Esc': exitReplaceMode,
+      'Ctrl-[': exitReplaceMode,
+      'Ctrl-C': exitReplaceMode,
+      'Backspace': 'goCharLeft',
+      fallthrough: ['default']
+    };
+
     return vimApi;
   };
   // Initialize Vim and make it available as an API.
diff --git a/test/vim_test.js b/test/vim_test.js
index f958c5fd1a..17cf753ae2 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -860,6 +860,13 @@ testVim('r', function(cm, vim, helpers) {
   helpers.doKeys('v', 'j', 'h', 'r', 'Space');
   eq('wuuu  \n    her', cm.getValue(),'Replacing selection by space-characters failed');
 }, { value: 'wordet\nanother' });
+testVim('R', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('R');
+  helpers.assertCursorAt(0, 1);
+  eq('vim-replace', cm.getOption('keyMap'));
+  is(cm.state.overwrite, 'Setting overwrite state failed');
+});
 testVim('mark', function(cm, vim, helpers) {
   cm.setCursor(2, 2);
   helpers.doKeys('m', 't');

From 1aae9a9453cdbe5e549ec8c11495098ccdf20810 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 May 2013 13:27:17 +0200
Subject: [PATCH 0008/4742] Document toggleOverwrite method

---
 doc/manual.html   | 8 +++++---
 lib/codemirror.js | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index a2a129d047..361a0e4273 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1360,9 +1360,6 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
     <h3 id="api_misc">Miscellaneous methods</h3>
 
     <dl>
-      <dt id="constructor"><code><strong>CodeMirror</strong>(elt: Element|function(elt: Element), ?config: object)</code></dt>
-      <dd>The constructor. See <a href="#usage">Basic Usage</a>.</dd>
-
       <dt id="operation"><code><strong>cm.operation</strong>(func: () → any) → any</code></dt>
       <dd>CodeMirror internally buffers changes and only updates its
       DOM structure after it has finished performing some operation.
@@ -1389,6 +1386,11 @@ <h3 id="api_misc">Miscellaneous methods</h3>
           <dd>Reduce the indentation of the line.</dd>
         </dl></dd>
 
+      <dt id="toggleOverwrite"><code><strong>cm.toggleOverwrite</strong>(?value: bool)</code></dt>
+      <dd>Switches between overwrite and normal insert mode (when not
+      given an argument), or sets the overwrite mode to a specific
+      state (when given an argument).</dd>
+
       <dt id="posFromIndex"><code><strong>doc.posFromIndex</strong>(index: integer) → {line, ch}</code></dt>
       <dd>Calculates and returns a <code>{line, ch}</code> object for a
       zero-based <code>index</code> who's value is relative to the start of the
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4becd1a0b6..c1b95555fa 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3002,7 +3002,8 @@ window.CodeMirror = (function() {
       sel.goalColumn = pos.left;
     }),
 
-    toggleOverwrite: function() {
+    toggleOverwrite: function(value) {
+      if (value != null && value == this.state.overwrite) return;
       if (this.state.overwrite = !this.state.overwrite)
         this.display.cursor.className += " CodeMirror-overwrite";
       else

From dc3ca9661bd9902f672f417ddfa1f839ab889a9e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 May 2013 13:33:09 +0200
Subject: [PATCH 0009/4742] [lint addon] Don't use -span- in css classes

Apparently Bootstrap messes with those.

Closes #1497
---
 addon/lint/lint.css | 6 +++---
 addon/lint/lint.js  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index 4fd72e774a..eb15381f02 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -24,18 +24,18 @@
   -ms-transition: opacity .4s;
 }
 
-.CodeMirror-lint-span-error, .CodeMirror-lint-span-warning {
+.CodeMirror-lint-mark-error, .CodeMirror-lint-mark-warning {
   background-position: left bottom;
   background-repeat: repeat-x;
 }
 
-.CodeMirror-lint-span-error {
+.CodeMirror-lint-mark-error {
   background-image:
   url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==")
   ;
 }
 
-.CodeMirror-lint-span-warning {
+.CodeMirror-lint-mark-warning {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
 }
 
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 231eb2f567..ca05da76ef 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -135,7 +135,7 @@ CodeMirror.validate = (function() {
         if (state.hasGutter) tipLabel.appendChild(annotationTooltip(ann));
 
         if (ann.to) state.marked.push(cm.markText(ann.from, ann.to, {
-          className: "CodeMirror-lint-span-" + severity,
+          className: "CodeMirror-lint-mark-" + severity,
           __annotation: ann
         }));
       }
@@ -164,7 +164,7 @@ CodeMirror.validate = (function() {
   var nearby = [0, 0, 0, 5, 0, -5, 5, 0, -5, 0];
 
   function onMouseOver(cm, e) {
-    if (!/\bCodeMirror-lint-span-/.test((e.target || e.srcElement).className)) return;
+    if (!/\bCodeMirror-lint-mark-/.test((e.target || e.srcElement).className)) return;
     for (var i = 0; i < nearby.length; i += 2) {
       var spans = cm.findMarksAt(cm.coordsChar({left: e.clientX + nearby[i],
                                                 top: e.clientY + nearby[i + 1]}));

From 3ff32994e81ef4c8dc7baac61aac71dbf4822726 Mon Sep 17 00:00:00 2001
From: Aaron Brooks <aaron@brooks1.net>
Date: Sun, 5 May 2013 21:27:04 -0400
Subject: [PATCH 0010/4742] vim mode: Add tests covering word selection
 behavior.

---
 test/vim_test.js | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/test/vim_test.js b/test/vim_test.js
index 17cf753ae2..567633c65d 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -688,6 +688,48 @@ testVim('<<', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 1);
 }, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
 
+// Edit tests
+function testEdit(name, before, pos, edit, after) {
+  return testVim(name, function(cm, vim, helpers) {
+             cm.setCursor(0, before.search(pos));
+             helpers.doKeys.apply(this, edit.split(''));
+             eq(after, cm.getValue());
+           }, {value: before});
+}
+
+// These Delete tests effectively cover word-wise Change, Visual & Yank.
+// Tabs are used as differentiated whitespace to catch edge cases.
+// Normal word:
+testEdit('diw_mid_spc', 'foo \tbAr\t baz', /A/, 'diw', 'foo \t\t baz');
+testEdit('daw_mid_spc', 'foo \tbAr\t baz', /A/, 'daw', 'foo \tbaz');
+testEdit('diw_mid_punct', 'foo \tbAr.\t baz', /A/, 'diw', 'foo \t.\t baz');
+testEdit('daw_mid_punct', 'foo \tbAr.\t baz', /A/, 'daw', 'foo.\t baz');
+testEdit('diw_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'diw', 'foo \t,.\t baz');
+testEdit('daw_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'daw', 'foo \t,.\t baz');
+testEdit('diw_start_spc', 'bAr \tbaz', /A/, 'diw', ' \tbaz');
+testEdit('daw_start_spc', 'bAr \tbaz', /A/, 'daw', 'baz');
+testEdit('diw_start_punct', 'bAr. \tbaz', /A/, 'diw', '. \tbaz');
+testEdit('daw_start_punct', 'bAr. \tbaz', /A/, 'daw', '. \tbaz');
+testEdit('diw_end_spc', 'foo \tbAr', /A/, 'diw', 'foo \t');
+testEdit('daw_end_spc', 'foo \tbAr', /A/, 'daw', 'foo');
+testEdit('diw_end_punct', 'foo \tbAr.', /A/, 'diw', 'foo \t.');
+testEdit('daw_end_punct', 'foo \tbAr.', /A/, 'daw', 'foo.');
+// Big word:
+testEdit('diW_mid_spc', 'foo \tbAr\t baz', /A/, 'diW', 'foo \t\t baz');
+testEdit('daW_mid_spc', 'foo \tbAr\t baz', /A/, 'daW', 'foo \tbaz');
+testEdit('diW_mid_punct', 'foo \tbAr.\t baz', /A/, 'diW', 'foo \t\t baz');
+testEdit('daW_mid_punct', 'foo \tbAr.\t baz', /A/, 'daW', 'foo \tbaz');
+testEdit('diW_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'diW', 'foo \t\t baz');
+testEdit('daW_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'daW', 'foo \tbaz');
+testEdit('diW_start_spc', 'bAr\t baz', /A/, 'diW', '\t baz');
+testEdit('daW_start_spc', 'bAr\t baz', /A/, 'daW', 'baz');
+testEdit('diW_start_punct', 'bAr.\t baz', /A/, 'diW', '\t baz');
+testEdit('daW_start_punct', 'bAr.\t baz', /A/, 'daW', 'baz');
+testEdit('diW_end_spc', 'foo \tbAr', /A/, 'diW', 'foo \t');
+testEdit('daW_end_spc', 'foo \tbAr', /A/, 'daW', 'foo');
+testEdit('diW_end_punct', 'foo \tbAr.', /A/, 'diW', 'foo \t');
+testEdit('daW_end_punct', 'foo \tbAr.', /A/, 'daW', 'foo');
+
 // Operator-motion tests
 testVim('D', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);

From 0f394dc8c30ba2092bfcb40d83e70923d10841fd Mon Sep 17 00:00:00 2001
From: Aaron Brooks <aaron@brooks1.net>
Date: Sun, 5 May 2013 21:30:02 -0400
Subject: [PATCH 0011/4742] vim mode: Fix off-by-one errors in word selection.

The below conforms to Vim's behavior regarding whitespace trimming.
---
 keymap/vim.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index cbb9760360..52052c3ffd 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -835,7 +835,7 @@
               return;
             }
             var query = cm.getLine(word.start.line).substring(word.start.ch,
-                word.end.ch + 1);
+                word.end.ch);
             if (isKeyword) {
               query = '\\b' + query + '\\b';
             } else {
@@ -1866,15 +1866,27 @@
 
       var wordAfterRegex = matchRegex.exec(textAfterIdx);
       var wordStart = idx;
-      var wordEnd = idx + wordAfterRegex[0].length - 1;
+      var wordEnd = idx + wordAfterRegex[0].length;
       // TODO: Find a better way to do this. It will be slow on very long lines.
-      var wordBeforeRegex = matchRegex.exec(reverse(textBeforeIdx));
+      var revTextBeforeIdx = reverse(textBeforeIdx);
+      var wordBeforeRegex = matchRegex.exec(revTextBeforeIdx);
       if (wordBeforeRegex) {
         wordStart -= wordBeforeRegex[0].length;
       }
 
       if (inclusive) {
-        wordEnd++;
+        // If present, trim all whitespace after word.
+        // Otherwise, trim all whitespace before word.
+        var textAfterWordEnd = line.substring(wordEnd);
+        var whitespacesAfterWord = textAfterWordEnd.match(/^\s*/)[0].length;
+        if (whitespacesAfterWord > 0) {
+          wordEnd += whitespacesAfterWord;
+        } else {
+          var revTrim = revTextBeforeIdx.length - wordStart;
+          var textBeforeWordStart = revTextBeforeIdx.substring(revTrim);
+          var whitespacesBeforeWord = textBeforeWordStart.match(/^\s*/)[0].length;
+          wordStart -= whitespacesBeforeWord;
+        }
       }
 
       return { start: { line: cur.line, ch: wordStart },

From b56c4ae750fc12ae5a250a4d574c1cb30f7cc8f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 May 2013 08:17:32 +0200
Subject: [PATCH 0012/4742] Add CodeMirror Eclipse to real-world uses

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

diff --git a/doc/realworld.html b/doc/realworld.html
index fb78e9de3a..5b8106c169 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -31,6 +31,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
       <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>
       <li><a href="http://www.codebugapp.com/">Codebug</a> (PHP Xdebug front-end)</li>
+      <li><a href="https://github.com/angelozerr/CodeMirror-Eclipse">CodeMirror Eclipse</a> (embed CM in Eclipse)</li>
       <li><a href="http://emmet.io/blog/codemirror-movie/">CodeMirror movie</a> (scripted editing demos)</li>
       <li><a href="http://code.google.com/p/codemirror2-gwt/">CodeMirror2-GWT</a> (Google Web Toolkit wrapper)</li>
       <li><a href="http://www.crunchzilla.com/code-monster">Code Monster</a> & <a href="http://www.crunchzilla.com/code-maven">Code Maven</a> (learning environment)</li>

From 66dac5ff0b84a5961ded9a65bf21582cb80a58de Mon Sep 17 00:00:00 2001
From: Timothy Hatcher <timothy@apple.com>
Date: Tue, 30 Apr 2013 15:38:58 -0700
Subject: [PATCH 0013/4742] CodeMirror should set spellcheck=false on the input
 textarea

WebKit does not honor autocorrect=off, but it does honor
spellcheck=false.
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c1b95555fa..4c9f04945e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -97,7 +97,7 @@ window.CodeMirror = (function() {
     else input.setAttribute("wrap", "off");
     // if border: 0; -- iOS fails to open keyboard (issue #1287)
     if (ios) input.style.border = "1px solid black";
-    input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off");
+    input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off"); input.setAttribute("spellcheck", "false");
 
     // Wraps and hides input textarea
     d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");

From 2745e4e24341987c7c8aa9eebed32640c40a89b4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 May 2013 08:27:29 +0200
Subject: [PATCH 0014/4742] [javascript mode] Fix bug in handling of
 expressions without commas

Closes #1501
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 2c2801dda6..87856a89f3 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -291,7 +291,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
 
   function maybeoperatorComma(type, value) {
-    if (type == ",") return cont(expression);
+    if (type == ",") return pass();
     return maybeoperatorNoComma(type, value, maybeoperatorComma);
   }
   function maybeoperatorNoComma(type, value, me) {

From a48b5d71cd30c58808f359a9c604dac89d9b2ba6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 May 2013 09:55:14 +0200
Subject: [PATCH 0015/4742] Don't call alignHorizontally before display update

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4c9f04945e..5698a3cbcf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -251,8 +251,8 @@ window.CodeMirror = (function() {
 
   function guttersChanged(cm) {
     updateGutters(cm);
-    alignHorizontally(cm);
     regChange(cm);
+    setTimeout(function(){alignHorizontally(cm);}, 20);
   }
 
   function updateGutters(cm) {
@@ -3126,7 +3126,7 @@ window.CodeMirror = (function() {
     cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
     cm.refresh();
   }, true);
-  option("coverGutterNextToScrollbar", false, updateScrollbars);
+  option("coverGutterNextToScrollbar", false, updateScrollbars, true);
   option("lineNumbers", false, function(cm) {
     setGuttersForLineNumbers(cm.options);
     guttersChanged(cm);

From 8411bcff5cdbcb60b6d1a579add1871e123a719f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 May 2013 10:59:41 +0200
Subject: [PATCH 0016/4742] [sass mode] Support double-colon pseudo elements

Closes #1461
---
 mode/sass/sass.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 8758b25189..9c9a0dae07 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -9,7 +9,7 @@ CodeMirror.defineMode("sass", function(config) {
   var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-", "\\!=", "/", "\\*", "%", "and", "or", "not"];
   var opRegexp = tokenRegexp(operators);
 
-  var pseudoElementsRegexp = /^:[\w\-]+/;
+  var pseudoElementsRegexp = /^::?[\w\-]+/;
 
   var urlTokens = function(stream, state){
     var ch = stream.peek();

From fdb46a21d48fbd36f0901d7bc1055572cf0fc4a4 Mon Sep 17 00:00:00 2001
From: LM <ladislav@marek.su>
Date: Mon, 6 May 2013 10:14:17 +0200
Subject: [PATCH 0017/4742] [smalltalk mode] add support for '$<...>' character
 syntax

---
 mode/smalltalk/smalltalk.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index f8c9026bb3..7730669149 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -40,7 +40,10 @@ CodeMirror.defineMode('smalltalk', function(config) {
       token.name = 'string-2';
 
     } else if (aChar === '$') {
-      stream.eatWhile(/[^ ]/);
+      if (stream.next() === '<') {
+        stream.eatWhile(/[^ >]/);
+        stream.next();
+      }
       token.name = 'string-2';
 
     } else if (aChar === '|' && state.expectVariable) {

From b4809cde9732dd76331a4a827e2245058cd3140e Mon Sep 17 00:00:00 2001
From: LM <ladislav@marek.su>
Date: Mon, 6 May 2013 10:15:13 +0200
Subject: [PATCH 0018/4742] [smalltalk mode] remove unused variable

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

diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index 7730669149..8a7290132c 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -121,7 +121,6 @@ CodeMirror.defineMode('smalltalk', function(config) {
       state.context = token.context;
       state.expectVariable = token.eos;
 
-      state.lastToken = token;
       return token.name;
     },
 

From 36f68ca85a48692c6246fb1a2f3a0dd8d3887e0a Mon Sep 17 00:00:00 2001
From: LM <ladislav@marek.su>
Date: Mon, 6 May 2013 10:16:29 +0200
Subject: [PATCH 0019/4742] [smalltalk mode] comma is special character

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

diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index 8a7290132c..e7de666228 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -1,6 +1,6 @@
 CodeMirror.defineMode('smalltalk', function(config) {
 
-  var specialChars = /[+\-\/\\*~<>=@%|&?!.:;^]/;
+  var specialChars = /[+\-\/\\*~<>=@%|&?!.,:;^]/;
   var keywords = /true|false|nil|self|super|thisContext/;
 
   var Context = function(tokenizer, parent) {

From fca338be9dd62db07f154277c7b3bd0ade6788c7 Mon Sep 17 00:00:00 2001
From: LM <ladislav@marek.su>
Date: Mon, 6 May 2013 10:19:14 +0200
Subject: [PATCH 0020/4742] [smalltalk mode] disallow brackets in symbol
 literal

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

diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index e7de666228..eb32417514 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -36,7 +36,7 @@ CodeMirror.defineMode('smalltalk', function(config) {
       token = nextString(stream, new Context(nextString, context));
 
     } else if (aChar === '#') {
-      stream.eatWhile(/[^ .]/);
+      stream.eatWhile(/[^ .\[\]()]/);
       token.name = 'string-2';
 
     } else if (aChar === '$') {

From 949c5eb99e25c823a7154d1c4095a67b5b288d1b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 7 May 2013 22:07:23 +0200
Subject: [PATCH 0021/4742] [closebrackets addon] Remove ECMA5-ism

Closes #1508
---
 addon/edit/closebrackets.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 43902aee68..2abc8c5fe6 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -23,9 +23,9 @@
           return CodeMirror.Pass;
       }
     };
-    var closingBrackets = [];
+    var closingBrackets = "";
     for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
-      if (left != right) closingBrackets.push(right);
+      if (left != right) closingBrackets += right;
       function surround(cm) {
         var selection = cm.getSelection();
         cm.replaceSelection(left + selection + right);

From 4251e74998313a3dc9cab46496a3e39b0ea1c2d2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 8 May 2013 09:41:49 +0200
Subject: [PATCH 0022/4742] Add Janvas and Oak links to real-world uses

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 5b8106c169..85d0360335 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -60,6 +60,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://haxpad.com/">HaxPad</a> (editor for Win RT)</li>
       <li><a href="http://megafonweblab.github.com/histone-javascript/">Histone template engine playground</a></li>
       <li><a href="http://icecoder.net">ICEcoder</a> (web IDE)</li>
+      <li><a href="http://www.janvas.com/">Janvas</a> (vector graphics editor)</li>
       <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>
       <li><a href="http://jqfundamentals.com/">jQuery fundamentals</a> (interactive tutorial)</li>
       <li><a href="http://jsbin.com">jsbin.com</a> (JS playground)</li>
@@ -73,6 +74,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="https://www.my2ndgeneration.com/">My2ndGeneration</a> (social coding)</li>
       <li><a href="http://www.navigatecms.com">Navigate CMS</a></li>
       <li><a href="https://notex.ch">NoTex</a> (rST authoring)</li>
+      <li><a href="http://oakoutliner.com">Oak</a> (online outliner)</li>
       <li><a href="http://clrhome.org/asm/">ORG</a> (z80 assembly IDE)</li>
       <li><a href="https://github.com/mamacdon/orion-codemirror">Orion-CodeMirror integration</a> (running CodeMirror modes in Orion)</li>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>

From 13ab1f1f14a2685428343cfadd0befaf93db9dfb Mon Sep 17 00:00:00 2001
From: John Lees-Miller <jdleesmiller@gmail.com>
Date: Sat, 4 May 2013 21:08:18 +0100
Subject: [PATCH 0023/4742] fix stex mode handling of line break with optional
 argument

---
 mode/stex/stex.js | 2 +-
 mode/stex/test.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 318b63acd4..ca04c24f22 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -95,7 +95,7 @@ CodeMirror.defineMode("stex", function() {
         }
 
         // white space control characters
-        if (source.match(/^\\[,;!\/]/)) {
+        if (source.match(/^\\[,;!\/\\]/)) {
           return "tag";
         }
 
diff --git a/mode/stex/test.js b/mode/stex/test.js
index 727a7db07e..ab629e81ea 100644
--- a/mode/stex/test.js
+++ b/mode/stex/test.js
@@ -114,4 +114,7 @@
   MT("mathWithComment",
      "[keyword $][variable-2 x] [comment % $]",
      "[variable-2 y][keyword $] other text");
+
+  MT("lineBreakArgument",
+    "[tag \\\\][bracket [[][atom 1cm][bracket ]]]");
 })();

From de3f7934304af3b7977b23816b09fde3f45ea928 Mon Sep 17 00:00:00 2001
From: Narciso Jaramillo <njaramil@adobe.com>
Date: Tue, 7 May 2013 16:12:04 -0700
Subject: [PATCH 0024/4742] Make vim dialog work correctly

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 52052c3ffd..41f74ba7b3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2369,7 +2369,7 @@
             onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp });
       }
       else {
-        callback(prompt(shortText, ""));
+        onClose(prompt(shortText, ""));
       }
     }
     function findUnescapedSlashes(str) {

From 240a326280005259928c1c0ef049963697efd0dd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 8 May 2013 12:32:50 +0200
Subject: [PATCH 0025/4742] [compress script] Fix passing of arguments to
 UglifyJS, pass -c -m by default

Closes #1510
---
 bin/compress | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/compress b/bin/compress
index d059b618ba..809fbe83d4 100755
--- a/bin/compress
+++ b/bin/compress
@@ -29,14 +29,15 @@ function help(ok) {
   process.exit(ok ? 0 : 1);
 }
 
-var local = null, args = null, files = [], blob = "";
+var local = null, args = [], extraArgs = null, files = [], blob = "";
 
 for (var i = 2; i < process.argv.length; ++i) {
   var arg = process.argv[i];
   if (arg == "--local" && i + 1 < process.argv.length) {
     var parts = process.argv[++i].split(/\s+/);
     local = parts[0];
-    args = parts.slice(1);
+    extraArgs = parts.slice(1);
+    if (!extraArgs.length) extraArgs = ["-c", "-m"];
   } else if (arg == "--help") {
     help(true);
   } else if (arg[0] != "-") {
@@ -73,7 +74,7 @@ if (files.length) {
 }
   
 if (local) {
-  require("child_process").spawn(local, args, {stdio: ["ignore", process.stdout, process.stderr]});
+  require("child_process").spawn(local, args.concat(extraArgs), {stdio: ["ignore", process.stdout, process.stderr]});
 } else {
   var data = new Buffer("js_code=" + require("querystring").escape(blob), "utf8");
   var req = require("http").request({

From 7fcb11276e50601eb35a1c0a32bf810047e49988 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 8 May 2013 12:00:23 +0200
Subject: [PATCH 0026/4742] [bidi support] Overhaul algorithm to deal with
 corner case

When a level 2 section intersected with a level 0 one, an
assumption in the visual motion code was violated, resulting
in bogus motion and thus infinite loops in the charCoords code.
---
 lib/codemirror.js | 119 ++++++++++++++++++++++++++--------------------
 test/test.js      |   3 +-
 2 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5698a3cbcf..97a8d14007 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1149,32 +1149,26 @@ window.CodeMirror = (function() {
       if (right) m.left = m.right; else m.right = m.left;
       return intoCoordSystem(cm, lineObj, m, context);
     }
-    var order = getOrder(lineObj), ch = pos.ch;
-    if (!order) return get(ch);
-    var main, other, linedir = order[0].level;
-    for (var i = 0; i < order.length; ++i) {
-      var part = order[i], rtl = part.level % 2, nb, here;
-      if (part.from < ch && part.to > ch) return get(ch, rtl);
-      var left = rtl ? part.to : part.from, right = rtl ? part.from : part.to;
-      if (left == ch) {
-        // IE returns bogus offsets and widths for edges where the
-        // direction flips, but only for the side with the lower
-        // level. So we try to use the side with the higher level.
-        if (i && part.level < (nb = order[i-1]).level) here = get(nb.level % 2 ? nb.from : nb.to - 1, true);
-        else here = get(rtl && part.from != part.to ? ch - 1 : ch);
-        if (rtl == linedir) main = here; else other = here;
-      } else if (right == ch) {
-        var nb = i < order.length - 1 && order[i+1];
-        if (!rtl && nb && nb.from == nb.to) continue;
-        if (nb && part.level < nb.level) here = get(nb.level % 2 ? nb.to - 1 : nb.from);
-        else here = get(rtl ? ch : ch - 1, true);
-        if (rtl == linedir) main = here; else other = here;
+    function getBidi(ch, partPos) {
+      var part = order[partPos], right = part.level % 2;
+      if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
+        part = order[--partPos];
+        ch = bidiRight(part) - (part.level % 2 ? 0 : 1);
+        right = true;
+      } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
+        part = order[++partPos];
+        ch = bidiLeft(part) - part.level % 2;
+        right = false;
       }
+      if (right && ch == part.to && ch > part.from) return get(ch - 1);
+      return get(ch, right);
     }
-    if (linedir && !ch) other = get(order[0].to - 1);
-    if (!main) return other;
-    if (other) main.other = other;
-    return main;
+    var order = getOrder(lineObj), ch = pos.ch;
+    if (!order) return get(ch);
+    var partPos = getBidiPartAt(order, ch);
+    var val = getBidi(ch, partPos);
+    if (bidiOther != null) val.other = getBidi(ch, bidiOther);
+    return val;
   }
 
   function PosMaybeOutside(line, ch, outside) {
@@ -5382,6 +5376,40 @@ window.CodeMirror = (function() {
     return Pos(lineN, ch);
   }
 
+  function compareBidiLevel(order, a, b) {
+    var linedir = order[0].level;
+    if (a == linedir) return true;
+    if (b == linedir) return false;
+    return a < b;
+  }
+  var bidiOther;
+  function getBidiPartAt(order, pos) {
+    for (var i = 0, found; i < order.length; ++i) {
+      var cur = order[i];
+      if (cur.from < pos && cur.to > pos) { bidiOther = null; return i; }
+      if (cur.from == pos || cur.to == pos) {
+        if (found == null) {
+          found = i;
+        } else if (compareBidiLevel(order, cur.level, order[found].level)) {
+          bidiOther = found;
+          return i;
+        } else {
+          bidiOther = i;
+          return found;
+        }
+      }
+    }
+    bidiOther = null;
+    return found;
+  }
+
+  function moveInLine(line, pos, dir, byUnit) {
+    if (!byUnit) return pos + dir;
+    do pos += dir;
+    while (pos > 0 && isExtendingChar.test(line.text.charAt(pos)));
+    return pos;
+  }
+
   // This is somewhat involved. It is needed in order to move
   // 'visually' through bi-directional text -- i.e., pressing left
   // should make the cursor go left, even when in RTL text. The
@@ -5391,37 +5419,24 @@ window.CodeMirror = (function() {
   function moveVisually(line, start, dir, byUnit) {
     var bidi = getOrder(line);
     if (!bidi) return moveLogically(line, start, dir, byUnit);
-    var moveOneUnit = byUnit ? function(pos, dir) {
-      do pos += dir;
-      while (pos > 0 && isExtendingChar.test(line.text.charAt(pos)));
-      return pos;
-    } : function(pos, dir) { return pos + dir; };
-    var linedir = bidi[0].level;
-    for (var i = 0; i < bidi.length; ++i) {
-      var part = bidi[i], sticky = part.level % 2 == linedir;
-      if ((part.from < start && part.to > start) ||
-          (sticky && (part.from == start || part.to == start))) break;
-    }
-    var target = moveOneUnit(start, part.level % 2 ? -dir : dir);
-
-    while (target != null) {
-      if (part.level % 2 == linedir) {
-        if (target < part.from || target > part.to) {
-          part = bidi[i += dir];
-          target = part && (dir > 0 == part.level % 2 ? moveOneUnit(part.to, -1) : moveOneUnit(part.from, 1));
-        } else break;
+    var pos = getBidiPartAt(bidi, start), part = bidi[pos];
+    var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit);
+
+    for (;;) {
+      if (target > part.from && target < part.to) return target;
+      if (target == part.from || target == part.to) {
+        if (getBidiPartAt(bidi, target) == pos) return target;
+        part = bidi[pos += dir];
+        return (dir > 0) == part.level % 2 ? part.to : part.from;
       } else {
-        if (target == bidiLeft(part)) {
-          part = bidi[--i];
-          target = part && bidiRight(part);
-        } else if (target == bidiRight(part)) {
-          part = bidi[++i];
-          target = part && bidiLeft(part);
-        } else break;
+        part = bidi[pos += dir];
+        if (!part) return null;
+        if ((dir > 0) == part.level % 2)
+          target = moveInLine(line, part.to, -1, byUnit);
+        else
+          target = moveInLine(line, part.from, 1, byUnit);
       }
     }
-
-    return target < 0 || target > line.text.length ? null : target;
   }
 
   function moveLogically(line, start, dir, byUnit) {
diff --git a/test/test.js b/test/test.js
index a334c5a59c..93d899a66e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1013,7 +1013,8 @@ testCM("verticalMovementCommandsWrapping", function(cm) {
 
 testCM("rtlMovement", function(cm) {
   forEach(["خحج", "خحabcخحج", "abخحخحجcd", "abخde", "abخح2342خ1حج", "خ1ح2خح3حxج",
-           "خحcd", "1خحcd", "abcdeح1ج", "خمرحبها مها!", "foobarر"], function(line) {
+           "خحcd", "1خحcd", "abcdeح1ج", "خمرحبها مها!", "foobarر",
+           "<img src=\"/בדיקה3.jpg\">"], function(line) {
     var inv = line.charAt(0) == "خ";
     cm.setValue(line + "\n"); cm.execCommand(inv ? "goLineEnd" : "goLineStart");
     var cursor = byClassName(cm.getWrapperElement(), "CodeMirror-cursor")[0];

From 32050bbb0a9aa4d7e4ff995c4ecd06abf5c926b6 Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Mon, 6 May 2013 17:01:20 +0200
Subject: [PATCH 0027/4742] [vim keymap] Add Ctrl-o/Ctrl-i jumplist motions

---
 keymap/vim.js    | 124 +++++++++++++++++++++++++++++++++++++++--------
 test/vim_test.js |  41 ++++++++++++++++
 2 files changed, 145 insertions(+), 20 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 41f74ba7b3..e333dc9c25 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -81,13 +81,13 @@
     // Motions
     { keys: ['H'], type: 'motion',
         motion: 'moveToTopLine',
-        motionArgs: { linewise: true }},
+        motionArgs: { linewise: true, toJumplist: true }},
     { keys: ['M'], type: 'motion',
         motion: 'moveToMiddleLine',
-        motionArgs: { linewise: true }},
+        motionArgs: { linewise: true, toJumplist: true }},
     { keys: ['L'], type: 'motion',
         motion: 'moveToBottomLine',
-        motionArgs: { linewise: true }},
+        motionArgs: { linewise: true, toJumplist: true }},
     { keys: ['h'], type: 'motion',
         motion: 'moveByCharacters',
         motionArgs: { forward: false }},
@@ -133,9 +133,9 @@
         motionArgs: { forward: false, wordEnd: true, bigWord: true,
             inclusive: true }},
     { keys: ['{'], type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: false }},
+        motionArgs: { forward: false, toJumplist: true }},
     { keys: ['}'], type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: true }},
+        motionArgs: { forward: true, toJumplist: true }},
     { keys: ['Ctrl-f'], type: 'motion',
         motion: 'moveByPage', motionArgs: { forward: true }},
     { keys: ['Ctrl-b'], type: 'motion',
@@ -148,10 +148,10 @@
         motionArgs: { forward: false, explicitRepeat: true }},
     { keys: ['g', 'g'], type: 'motion',
         motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: false, explicitRepeat: true, linewise: true }},
+        motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
     { keys: ['G'], type: 'motion',
         motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: true, explicitRepeat: true, linewise: true }},
+        motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
     { keys: ['0'], type: 'motion', motion: 'moveToStartOfLine' },
     { keys: ['^'], type: 'motion',
         motion: 'moveToFirstNonWhiteSpaceCharacter' },
@@ -169,7 +169,7 @@
         motionArgs: { inclusive: true }},
     { keys: ['%'], type: 'motion',
         motion: 'moveToMatchedSymbol',
-        motionArgs: { inclusive: true }},
+        motionArgs: { inclusive: true, toJumplist: true }},
     { keys: ['f', 'character'], type: 'motion',
         motion: 'moveToCharacter',
         motionArgs: { forward: true , inclusive: true }},
@@ -186,18 +186,20 @@
         motionArgs: { forward: true }},
     { keys: [','], type: 'motion', motion: 'repeatLastCharacterSearch',
         motionArgs: { forward: false }},
-    { keys: ['\'', 'character'], type: 'motion', motion: 'goToMark' },
-    { keys: ['`', 'character'], type: 'motion', motion: 'goToMark' },
+    { keys: ['\'', 'character'], type: 'motion', motion: 'goToMark',
+        motionArgs: {toJumplist: true}},
+    { keys: ['`', 'character'], type: 'motion', motion: 'goToMark',
+        motionArgs: {toJumplist: true}},
     { keys: [']', '`',], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
     { keys: ['[', '`',], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
     { keys: [']', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
     { keys: ['[', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
     { keys: [']', 'character'], type: 'motion',
         motion: 'moveToSymbol',
-        motionArgs: { forward: true}},
+        motionArgs: { forward: true, toJumplist: true}},
     { keys: ['[', 'character'], type: 'motion',
         motion: 'moveToSymbol',
-        motionArgs: { forward: false}},
+        motionArgs: { forward: false, toJumplist: true}},
     { keys: ['|'], type: 'motion',
         motion: 'moveToColumn',
         motionArgs: { }},
@@ -212,9 +214,9 @@
         operatorArgs: { indentRight: false }},
     { keys: ['g', '~'], type: 'operator', operator: 'swapcase' },
     { keys: ['n'], type: 'motion', motion: 'findNext',
-        motionArgs: { forward: true }},
+        motionArgs: { forward: true, toJumplist: true }},
     { keys: ['N'], type: 'motion', motion: 'findNext',
-        motionArgs: { forward: false }},
+        motionArgs: { forward: false, toJumplist: true }},
     // Operator-Motion dual commands
     { keys: ['x'], type: 'operatorMotion', operator: 'delete',
         motion: 'moveByCharacters', motionArgs: { forward: true },
@@ -235,6 +237,10 @@
     { keys: ['~'], type: 'operatorMotion', operator: 'swapcase',
         motion: 'moveByCharacters', motionArgs: { forward: true }},
     // Actions
+    { keys: ['Ctrl-i'], type: 'action', action: 'jumpListWalk',
+        actionArgs: { forward: true }},
+    { keys: ['Ctrl-o'], type: 'action', action: 'jumpListWalk',
+        actionArgs: { forward: false }},
     { keys: ['a'], type: 'action', action: 'enterInsertMode',
         actionArgs: { insertAt: 'charAfter' }},
     { keys: ['A'], type: 'action', action: 'enterInsertMode',
@@ -288,13 +294,13 @@
         motionArgs: { textObjectInner: true }},
     // Search
     { keys: ['/'], type: 'search',
-        searchArgs: { forward: true, querySrc: 'prompt' }},
+        searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
     { keys: ['?'], type: 'search',
-        searchArgs: { forward: false, querySrc: 'prompt' }},
+        searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
     { keys: ['*'], type: 'search',
-        searchArgs: { forward: true, querySrc: 'wordUnderCursor' }},
+        searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
     { keys: ['#'], type: 'search',
-        searchArgs: { forward: false, querySrc: 'wordUnderCursor' }},
+        searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
     // Ex command
     { keys: [':'], type: 'ex' }
   ];
@@ -362,6 +368,48 @@
       return false;
     }
 
+    var circularJumpList = (function(){
+      var size = 100;
+      var pointer = -1;
+      var head = 0;
+      var tail = 0;
+      var buffer = new Array(size);
+      function add(cm, oldCur, newCur) {
+        var current = pointer % size;
+        var curMark = buffer[current];
+        function useNextSlot(cursor) {
+          var next = ++pointer % size;
+          var trashMark = buffer[next];
+          if (trashMark) {
+            trashMark.clear();
+          }
+          buffer[next] = cm.setBookmark(cursor);
+        }
+        if (!curMark || !cursorEqual(curMark.find(), oldCur)) {
+          useNextSlot(oldCur);
+        }
+        useNextSlot(newCur);
+        head = pointer;
+        tail = pointer - size + 1;
+        if (tail < 0) {
+          tail = 0;
+        }
+      }
+      function move(offset) {
+        pointer += offset;
+        if (pointer > head) {
+          pointer = head;
+        } else if (pointer < tail) {
+          pointer = tail;
+        }
+        return buffer[(size + pointer) % size];
+      }
+      return {
+        cachedCursor: undefined, //used for # and * jumps
+        add: add,
+        move: move
+      };
+    })();
     // Global Vim state. Call getVimGlobalState to get and initialize.
     var vimGlobalState;
     function getVimGlobalState() {
@@ -371,6 +419,7 @@
           searchQuery: null,
           // Whether we are searching backwards.
           searchIsReversed: false,
+          jumpList: circularJumpList,
           // Recording latest f, t, F or T motion command.
           lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
           registerController: new RegisterController({})
@@ -776,7 +825,7 @@
           commandDispatcher.processMotion(cm, vim, {
             type: 'motion',
             motion: 'findNext',
-            motionArgs: { forward: true }
+            motionArgs: { forward: true, toJumplist: command.searchArgs.toJumplist }
           });
         }
         function onPromptClose(query) {
@@ -841,7 +890,13 @@
             } else {
               query = escapeRegex(query);
             }
+
+            // cachedCursor is used to save the old position of the cursor
+            // when * or # causes vim to seek for the nearest word and shift
+            // the cursor before entering the motion.
+            getVimGlobalState().jumpList.cachedCursor = cm.getCursor();
             cm.setCursor(word.start);
+
             handleQuery(query, true /** ignoreCase */, false /** smartCase */);
             break;
         }
@@ -918,6 +973,17 @@
           if (!motionResult) {
             return;
           }
+          if (motionArgs.toJumplist) {
+            var jumpList = getVimGlobalState().jumpList;
+            // if the current motion is # or *, use cachedCursor
+            var cachedCursor = jumpList.cachedCursor;
+            if (cachedCursor) {
+              recordJumpPosition(cm, cachedCursor, motionResult);
+              delete jumpList.cachedCursor;
+            } else {
+              recordJumpPosition(cm, curOriginal, motionResult);
+            }
+          }
           if (motionResult instanceof Array) {
             curStart = motionResult[0];
             curEnd = motionResult[1];
@@ -1078,7 +1144,7 @@
             }
 
             var equal = cursorEqual(cursor, best);
-            var between = (motionArgs.forward) ? 
+            var between = (motionArgs.forward) ?
               cusrorIsBetween(cursor, mark, best) :
               cusrorIsBetween(best, mark, cursor);
 
@@ -1384,6 +1450,18 @@
     };
 
     var actions = {
+      jumpListWalk: function(cm, actionArgs, vim) {
+        if (vim.visualMode) {
+          return;
+        }
+        var repeat = actionArgs.repeat;
+        var forward = actionArgs.forward;
+        var jumpList = getVimGlobalState().jumpList;
+
+        var mark = jumpList.move(forward ? repeat : -repeat);
+        var markPos = mark ? mark.find() : cm.getCursor();
+        cm.setCursor(markPos);
+      },
       scrollToCursor: function(cm, actionArgs) {
         var lineNum = cm.getCursor().line;
         var heightProp = window.getComputedStyle(cm.getScrollerElement()).
@@ -1893,6 +1971,12 @@
         end: { line: cur.line, ch: wordEnd }};
     }
 
+    function recordJumpPosition(cm, oldCur, newCur) {
+      if(!cursorEqual(oldCur, newCur)) {
+        getVimGlobalState().jumpList.add(cm, oldCur, newCur);
+      }
+    }
+
     function recordLastCharacterSearch(increment, args) {
         var vimGlobalState = getVimGlobalState();
         vimGlobalState.lastChararacterSearch.increment = increment;
diff --git a/test/vim_test.js b/test/vim_test.js
index 567633c65d..b2104d4186 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -158,6 +158,47 @@ function testVim(name, run, opts, expectedFail) {
     }
   }, expectedFail);
 };
+var jumplistScene = ''+
+  'word\n'+
+  '(word)\n'+
+  '{word\n'+
+  'word.\n'+
+  '\n'+
+  'word search\n'+
+  '}word\n'+
+  'word\n'+
+  'word\n';
+function testJumplist(name, keys, endPos, startPos, dialog) {
+  endPos = makeCursor(endPos[0], endPos[1]);
+  startPos = makeCursor(startPos[0], startPos[1]);
+  testVim(name, function(cm, vim, helpers) {
+    if(dialog)cm.openDialog = helpers.fakeOpenDialog('word');
+    cm.setCursor(startPos);
+    helpers.doKeys.apply(null, keys);
+    helpers.assertCursorAt(endPos);
+  }, {value: jumplistScene});
+};
+testJumplist('jumplist_H', ['H', 'Ctrl-o'], [5,2], [5,2]);
+testJumplist('jumplist_M', ['M', 'Ctrl-o'], [2,2], [2,2]);
+testJumplist('jumplist_L', ['L', 'Ctrl-o'], [2,2], [2,2]);
+testJumplist('jumplist_[[', ['[', '[', 'Ctrl-o'], [5,2], [5,2]);
+testJumplist('jumplist_]]', [']', ']', 'Ctrl-o'], [2,2], [2,2]);
+testJumplist('jumplist_G', ['G', 'Ctrl-o'], [5,2], [5,2]);
+testJumplist('jumplist_gg', ['g', 'g', 'Ctrl-o'], [5,2], [5,2]);
+testJumplist('jumplist_%', ['%', 'Ctrl-o'], [1,5], [1,5]);
+testJumplist('jumplist_{', ['{', 'Ctrl-o'], [1,5], [1,5]);
+testJumplist('jumplist_}', ['}', 'Ctrl-o'], [1,5], [1,5]);
+testJumplist('jumplist_\'', ['m', 'a', 'h', '\'', 'a', 'h', 'Ctrl-i'], [1,5], [1,5]);
+testJumplist('jumplist_`', ['m', 'a', 'h', '`', 'a', 'h', 'Ctrl-i'], [1,5], [1,5]);
+testJumplist('jumplist_*_cachedCursor', ['*', 'Ctrl-o'], [1,3], [1,3]);
+testJumplist('jumplist_#_cachedCursor', ['#', 'Ctrl-o'], [1,3], [1,3]);
+testJumplist('jumplist_n', ['#', 'n', 'Ctrl-o'], [1,1], [2,3]);
+testJumplist('jumplist_N', ['#', 'N', 'Ctrl-o'], [1,1], [2,3]);
+testJumplist('jumplist_repeat_<c-o>', ['*', '*', '*', '3', 'Ctrl-o'], [2,3], [2,3]);
+testJumplist('jumplist_repeat_<c-i>', ['*', '*', '*', '3', 'Ctrl-o', '2', 'Ctrl-i'], [5,0], [2,3]);
+testJumplist('jumplist_repeated_motion', ['3', '*', 'Ctrl-o'], [2,3], [2,3]);
+testJumplist('jumplist_/', ['/', 'Ctrl-o'], [2,3], [2,3], 'dialog');
+testJumplist('jumplist_?', ['?', 'Ctrl-o'], [2,3], [2,3], 'dialog');
 
 /**
  * @param name Name of the test

From c10c1597b64eeb4259274b1fb90b966d525c8f3e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 9 May 2013 09:19:14 +0200
Subject: [PATCH 0028/4742] [real-world uses] Add Handcraft 2

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 85d0360335..7268e4482c 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -56,6 +56,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
       <li><a href="http://web.uvic.ca/~siefkenj/graphit/graphit.html">Graphit</a> (function graphing)</li>
+      <li><a href="http://www.handcraft2.com/">Handcraft 2</a> (HTML prototyping)</li>
       <li><a href="http://try.haxe.org">Haxe</a> (Haxe Playground) </li>
       <li><a href="http://haxpad.com/">HaxPad</a> (editor for Win RT)</li>
       <li><a href="http://megafonweblab.github.com/histone-javascript/">Histone template engine playground</a></li>

From 66edc4afabb9968f40a1e2272a57802f871988b7 Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Thu, 9 May 2013 23:47:47 +0200
Subject: [PATCH 0029/4742] [vim keymap] Fix deleted jumplist marks

---
 keymap/vim.js    | 40 ++++++++++++++++++++++++++++++++--------
 test/vim_test.js |  8 +++++++-
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index e333dc9c25..2c4724eb6d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -368,7 +368,7 @@
       return false;
     }
 
-    var circularJumpList = (function(){
+    var circularJumpList = function() {
       var size = 100;
       var pointer = -1;
       var head = 0;
@@ -385,7 +385,13 @@
           }
           buffer[next] = cm.setBookmark(cursor);
         }
-        if (!curMark || !cursorEqual(curMark.find(), oldCur)) {
+        if (curMark) {
+          var markPos = curMark.find();
+          // avoid recording redundant cursor position
+          if (markPos && !cursorEqual(markPos, oldCur)) {
+            useNextSlot(oldCur);
+          }
+        } else {
           useNextSlot(oldCur);
         }
         useNextSlot(newCur);
@@ -395,21 +401,38 @@
           tail = 0;
         }
       }
-      function move(offset) {
+      function move(cm, offset) {
         pointer += offset;
         if (pointer > head) {
           pointer = head;
         } else if (pointer < tail) {
           pointer = tail;
         }
-        return buffer[(size + pointer) % size];
+        var mark = buffer[(size + pointer) % size];
+        // skip marks that are temporarily removed from text buffer
+        if (!mark.find()) {
+          var inc = offset > 0 ? 1 : -1;
+          var newCur;
+          var oldCur = cm.getCursor();
+          do {
+            pointer += inc;
+            mark = buffer[(size + pointer) % size];
+            // skip marks that are the same as current position
+            if (mark &&
+                (newCur = mark.find()) &&
+                !cursorEqual(oldCur, newCur)) {
+              break;
+            }
+          } while (pointer < head && pointer > tail);
+        }
+        return mark;
       }
       return {
         cachedCursor: undefined, //used for # and * jumps
         add: add,
         move: move
       };
-    })();
+    };
     // Global Vim state. Call getVimGlobalState to get and initialize.
     var vimGlobalState;
     function getVimGlobalState() {
@@ -419,7 +442,7 @@
           searchQuery: null,
           // Whether we are searching backwards.
           searchIsReversed: false,
-          jumpList: circularJumpList,
+          jumpList: circularJumpList(),
           // Recording latest f, t, F or T motion command.
           lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
           registerController: new RegisterController({})
@@ -1458,8 +1481,9 @@
         var forward = actionArgs.forward;
         var jumpList = getVimGlobalState().jumpList;
 
-        var mark = jumpList.move(forward ? repeat : -repeat);
-        var markPos = mark ? mark.find() : cm.getCursor();
+        var mark = jumpList.move(cm, forward ? repeat : -repeat);
+        var markPos = mark ? mark.find() : undefined;
+        markPos = markPos ? markPos : cm.getCursor();
         cm.setCursor(markPos);
       },
       scrollToCursor: function(cm, actionArgs) {
diff --git a/test/vim_test.js b/test/vim_test.js
index b2104d4186..93596148be 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -172,6 +172,7 @@ function testJumplist(name, keys, endPos, startPos, dialog) {
   endPos = makeCursor(endPos[0], endPos[1]);
   startPos = makeCursor(startPos[0], startPos[1]);
   testVim(name, function(cm, vim, helpers) {
+    CodeMirror.Vim.clearVimGlobalState_();
     if(dialog)cm.openDialog = helpers.fakeOpenDialog('word');
     cm.setCursor(startPos);
     helpers.doKeys.apply(null, keys);
@@ -199,7 +200,12 @@ testJumplist('jumplist_repeat_<c-i>', ['*', '*', '*', '3', 'Ctrl-o', '2', 'Ctrl-
 testJumplist('jumplist_repeated_motion', ['3', '*', 'Ctrl-o'], [2,3], [2,3]);
 testJumplist('jumplist_/', ['/', 'Ctrl-o'], [2,3], [2,3], 'dialog');
 testJumplist('jumplist_?', ['?', 'Ctrl-o'], [2,3], [2,3], 'dialog');
-
+testJumplist('jumplist_skip_delted_mark<c-o>',
+             ['*', 'n', 'n', 'k', 'd', 'k', 'Ctrl-o', 'Ctrl-o', 'Ctrl-o'],
+             [0,2], [0,2]);
+testJumplist('jumplist_skip_delted_mark<c-i>',
+             ['*', 'n', 'n', 'k', 'd', 'k', 'Ctrl-o', 'Ctrl-i', 'Ctrl-i'],
+             [1,0], [0,2]);
 /**
  * @param name Name of the test
  * @param keys An array of keys or a string with a single key to simulate.

From 0c68e2095ae139ad573f401f61e7129d685a0fae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 May 2013 09:19:26 +0200
Subject: [PATCH 0030/4742] [real-world uses] Add Code together

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 7268e4482c..c3f2c814fc 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -38,6 +38,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://codepen.io">Codepen</a> (gallery of animations)</li>
       <li><a href="http://sasstwo.codeschool.com/levels/1/challenges/1">Code School</a> (online tech learning environment)</li>
       <li><a href="http://code-snippets.bungeshea.com/">Code Snippets</a> (WordPress snippet management plugin)</li>
+      <li><a href="http://antonmi.github.io/code_together/">Code together</a> (collaborative editing)</li>
       <li><a href="http://codev.it/">Codev</a> (collaborative IDE)</li>
       <li><a href="http://ot.substance.io/demo/">Collaborative CodeMirror demo</a> (CodeMirror + operational transforms)</li>
       <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>

From 345114a579c8d207c871bf8e02d3cd9582c85049 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 May 2013 09:26:08 +0200
Subject: [PATCH 0031/4742] Add word char unicode range for Korean characters

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 97a8d14007..745caba277 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5190,7 +5190,7 @@ window.CodeMirror = (function() {
     return function(){return f.apply(null, args);};
   }
 
-  var nonASCIISingleCaseWordChar = /[\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc]/;
+  var nonASCIISingleCaseWordChar = /[\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
   function isWordChar(ch) {
     return /\w/.test(ch) || ch > "\x80" &&
       (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));

From 1bcd6e13971bf241d9743fa89a1e780315da586b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 5 May 2013 15:40:58 -0400
Subject: [PATCH 0032/4742] [vim] Rewrite of moveToWord, much cleaner logic.

Plus extra test cases.
---
 keymap/vim.js    | 135 ++++++++++++++++++++++++++++-------------------
 test/vim_test.js | 127 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 206 insertions(+), 56 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 2c4724eb6d..3b857e58b1 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1082,7 +1082,7 @@
             // Expand selection to entire line.
             expandSelectionToLine(cm, curStart, curEnd);
           } else if (motionArgs.forward) {
-            // Clip to trailing newlines only if we the motion goes forward.
+            // Clip to trailing newlines only if the motion goes forward.
             clipToLine(cm, curStart, curEnd);
           }
           operatorArgs.registerName = registerName;
@@ -1911,10 +1911,30 @@
     // caret to the first character of the next line.
     function clipToLine(cm, curStart, curEnd) {
       var selection = cm.getRange(curStart, curEnd);
-      var lines = selection.split('\n');
-      if (lines.length > 1 && isWhiteSpaceString(lines.pop())) {
-        curEnd.line--;
-        curEnd.ch = lineLength(cm, curEnd.line);
+      // Only clip if the selection ends with trailing newline + whitespace
+      if (/\n\s*$/.test(selection)) {
+        var lines = selection.split('\n');
+        // We know this is all whitepsace.
+        lines.pop();
+
+        // Cases:
+        // 1. Last word is an empty line - do not clip the trailing '\n'
+        // 2. Last word is not an empty line - clip the trailing '\n'
+        var line;
+        // Find the line containing the last word, and clip all whitespace up
+        // to it.
+        for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) {
+          var clipped = false;
+          curEnd.line--;
+          curEnd.ch = 0;
+        }
+        // If the last word is not an empty line, clip an additional newline
+        if (line) {
+          curEnd.line--;
+          curEnd.ch = lineLength(cm, curEnd.line);
+        } else {
+          curEnd.ch = 0;
+        }
       }
     }
 
@@ -2141,18 +2161,31 @@
      *     backward.
      * @param {boolean} bigWord True if punctuation count as part of the word.
      *     False if only [a-zA-Z0-9] characters count as part of the word.
+     * @param {boolean} emptyLineIsWord True if empty lines should be treated
+     *     as words.
      * @return {Object{from:number, to:number, line: number}} The boundaries of
      *     the word, or null if there are no more words.
      */
-    // TODO: Treat empty lines (with no whitespace) as words.
-    function findWord(cm, cur, forward, bigWord) {
+    function findWord(cm, cur, forward, bigWord, emptyLineIsWord) {
       var lineNum = cur.line;
       var pos = cur.ch;
       var line = cm.getLine(lineNum);
       var dir = forward ? 1 : -1;
       var regexps = bigWord ? bigWordRegexp : wordRegexp;
 
+      if (emptyLineIsWord && line == '') {
+        lineNum += dir;
+        line = cm.getLine(lineNum);
+        if (!isLine(cm, lineNum)) {
+          return null;
+        }
+        pos = (forward) ? 0 : line.length;
+      }
+
       while (true) {
+        if (emptyLineIsWord && line == '') {
+          return { from: 0, to: 0, line: lineNum };
+        }
         var stop = (dir > 0) ? line.length : -1;
         var wordStart = stop, wordEnd = stop;
         // Find bounds of next word.
@@ -2208,56 +2241,48 @@
      */
     function moveToWord(cm, repeat, forward, wordEnd, bigWord) {
       var cur = cm.getCursor();
+      var curStart = copyCursor(cur);
+      var words = [];
+      if (forward && !wordEnd || !forward && wordEnd) {
+        repeat++;
+      }
+      // For 'e', empty lines are not considered words, go figure.
+      var emptyLineIsWord = !(forward && wordEnd);
       for (var i = 0; i < repeat; i++) {
-        var startCh = cur.ch, startLine = cur.line, word;
-        var movedToNextWord = false;
-        while (!movedToNextWord) {
-          // Search and advance.
-          word = findWord(cm, cur, forward, bigWord);
-          movedToNextWord = true;
-          if (word) {
-            // Move to the word we just found. If by moving to the word we end
-            // up in the same spot, then move an extra character and search
-            // again.
-            cur.line = word.line;
-            if (forward && wordEnd) {
-              // 'e'
-              cur.ch = word.to - 1;
-            } else if (forward && !wordEnd) {
-              // 'w'
-              if (inRangeInclusive(cur.ch, word.from, word.to) &&
-                  word.line == startLine) {
-                // Still on the same word. Go to the next one.
-                movedToNextWord = false;
-                cur.ch = word.to - 1;
-              } else {
-                cur.ch = word.from;
-              }
-            } else if (!forward && wordEnd) {
-              // 'ge'
-              if (inRangeInclusive(cur.ch, word.from, word.to) &&
-                  word.line == startLine) {
-                // still on the same word. Go to the next one.
-                movedToNextWord = false;
-                cur.ch = word.from;
-              } else {
-                cur.ch = word.to;
-              }
-            } else if (!forward && !wordEnd) {
-              // 'b'
-              cur.ch = word.from;
-            }
-          } else {
-            // No more words to be found. Move to the end.
-            if (forward) {
-              return { line: cur.line, ch: lineLength(cm, cur.line) };
-            } else {
-              return { line: cur.line, ch: 0 };
-            }
-          }
-        }
+        var word = findWord(cm, cur, forward, bigWord, emptyLineIsWord);
+        if (!word) {
+          var eodCh = lineLength(cm, cm.lastLine());
+          words.push(forward
+              ? {line: cm.lastLine(), from: eodCh, to: eodCh}
+              : {line: 0, from: 0, to: 0});
+          break;
+        }
+        words.push(word);
+        cur = {line: word.line, ch: forward ? (word.to - 1) : word.from};
+      }
+      var shortCircuit = words.length != repeat;
+      var firstWord = words[0];
+      var lastWord = words.pop();
+      if (forward && !wordEnd) {
+        // w
+        if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) {
+          // We did not start in the middle of a word. Discard the extra word at the end.
+          lastWord = words.pop();
+        }
+        return {line: lastWord.line, ch: lastWord.from};
+      } else if (forward && wordEnd) {
+        return {line: lastWord.line, ch: lastWord.to - 1};
+      } else if (!forward && wordEnd) {
+        // ge
+        if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
+          // We did not start in the middle of a word. Discard the extra word at the end.
+          lastWord = words.pop();
+        }
+        return {line: lastWord.line, ch: lastWord.to};
+      } else {
+        // b
+        return {line: lastWord.line, ch: lastWord.from};
       }
-      return cur;
     }
 
     function moveToCharacter(cm, repeat, forward, character) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 93596148be..4979e404b3 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -10,7 +10,9 @@ var code = '' +
 '    n = read(0, buf, sizeof buf);\n' +
 '    bufp = buf;\n' +
 '  }\n' +
-'  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;\n' +
+'\n' +
+'  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;\n' + 
+' \n' +
 '}\n';
 
 var lines = (function() {
@@ -243,24 +245,30 @@ testMotion('j_repeat', ['2', 'j'], offsetCursor(word1.end, 2, 0), word1.end);
 testMotion('k', 'k', offsetCursor(word3.end, -1, 0), word3.end);
 testMotion('k_repeat', ['2', 'k'], makeCursor(0, 4), makeCursor(2, 4));
 testMotion('w', 'w', word1.start);
+testMotion('w_multiple_newlines_no_space', 'w', makeCursor(12, 2), makeCursor(11, 2));
+testMotion('w_multiple_newlines_with_space', 'w', makeCursor(14, 0), makeCursor(12, 51));
 testMotion('w_repeat', ['2', 'w'], word2.start);
 testMotion('w_wrap', ['w'], word3.start, word2.start);
 testMotion('w_endOfDocument', 'w', endOfDocument, endOfDocument);
+testMotion('w_start_to_end', ['1000', 'w'], endOfDocument, makeCursor(0, 0));
 testMotion('W', 'W', bigWord1.start);
 testMotion('W_repeat', ['2', 'W'], bigWord3.start, bigWord1.start);
 testMotion('e', 'e', word1.end);
 testMotion('e_repeat', ['2', 'e'], word2.end);
 testMotion('e_wrap', 'e', word3.end, word2.end);
 testMotion('e_endOfDocument', 'e', endOfDocument, endOfDocument);
+testMotion('e_start_to_end', ['1000', 'e'], endOfDocument, makeCursor(0, 0));
 testMotion('b', 'b', word3.start, word3.end);
 testMotion('b_repeat', ['2', 'b'], word2.start, word3.end);
 testMotion('b_wrap', 'b', word2.start, word3.start);
 testMotion('b_startOfDocument', 'b', makeCursor(0, 0), makeCursor(0, 0));
+testMotion('b_end_to_start', ['1000', 'b'], makeCursor(0, 0), endOfDocument);
 testMotion('ge', ['g', 'e'], word2.end, word3.end);
 testMotion('ge_repeat', ['2', 'g', 'e'], word1.end, word3.start);
 testMotion('ge_wrap', ['g', 'e'], word2.end, word3.start);
 testMotion('ge_startOfDocument', ['g', 'e'], makeCursor(0, 0),
     makeCursor(0, 0));
+testMotion('ge_end_to_start', ['1000', 'g', 'e'], makeCursor(0, 0), endOfDocument);
 testMotion('gg', ['g', 'g'], makeCursor(lines[0].line, lines[0].textStart),
     makeCursor(3, 1));
 testMotion('gg_repeat', ['3', 'g', 'g'],
@@ -414,6 +422,7 @@ testVim('dl', function(cm, vim, helpers) {
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
 testVim('dl_eol', function(cm, vim, helpers) {
+  // TODO:  This test is incorrect.  The cursor should end up at (0, 5).
   var curStart = makeCursor(0, 6);
   cm.setCursor(curStart);
   helpers.doKeys('d', 'l');
@@ -527,6 +536,53 @@ testVim('dw_eol', function(cm, vim, helpers) {
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2' });
+testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
+  // Assert that dw does not delete the newline if last word to delete is at end
+  // of line and it is followed by multiple newlines.
+  var curStart = makeCursor(0, 1);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'w');
+  eq(' \n\nword2', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1', register.text);
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+}, { value: ' word1\n\nword2' });
+testVim('dw_empty_line_followed_by_whitespace', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('  \nword', cm.getValue());
+}, { value: '\n  \nword' });
+testVim('dw_empty_line_followed_by_word', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('word', cm.getValue());
+}, { value: '\nword' });
+testVim('dw_empty_line_followed_by_empty_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('\n', cm.getValue());
+}, { value: '\n\n' });
+testVim('dw_whitespace_followed_by_whitespace', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('\n   \n', cm.getValue());
+}, { value: '  \n   \n' });
+testVim('dw_whitespace_followed_by_empty_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('\n\n', cm.getValue());
+}, { value: '  \n\n' });
+testVim('dw_word_whitespace_word', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('\n   \nword2', cm.getValue());
+}, { value: 'word1\n   \nword2'})
+testVim('dw_end_of_document', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('d', 'w');
+  eq('\nab', cm.getValue());
+}, { value: '\nabc' });
 testVim('dw_repeat', function(cm, vim, helpers) {
   // Assert that dw does delete newline if it should go to the next line, and
   // that repeat works properly.
@@ -539,6 +595,75 @@ testVim('dw_repeat', function(cm, vim, helpers) {
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2' });
+testVim('de_word_start_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'e');
+  eq('\n\n', cm.getValue());
+}, { value: 'word\n\n' });
+testVim('de_word_end_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  helpers.doKeys('d', 'e');
+  eq('wor', cm.getValue());
+}, { value: 'word\n\n\n' });
+testVim('de_whitespace_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'e');
+  eq('', cm.getValue());
+}, { value: '   \n\n\n' });
+testVim('de_end_of_document', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('d', 'e');
+  eq('\nab', cm.getValue());
+}, { value: '\nabc' });
+testVim('db_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('d', 'b');
+  eq('\n\n', cm.getValue());
+}, { value: '\n\n\n' });
+testVim('db_word_start_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('d', 'b');
+  eq('\nword', cm.getValue());
+}, { value: '\n\nword' });
+testVim('db_word_end_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 3);
+  helpers.doKeys('d', 'b');
+  eq('\n\nd', cm.getValue());
+}, { value: '\n\nword' });
+testVim('db_whitespace_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('d', 'b');
+  eq('', cm.getValue());
+}, { value: '\n   \n' });
+testVim('db_start_of_document', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'b');
+  eq('abc\n', cm.getValue());
+}, { value: 'abc\n' });
+testVim('dge_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doKeys('d', 'g', 'e');
+  // Note: In real VIM the result should be '', but it's not quite consistent,
+  // since 2 newlines are deleted. But in the similar case of word\n\n, only
+  // 1 newline is deleted. We'll diverge from VIM's behavior since it's much
+  // easier this way.
+  eq('\n', cm.getValue());
+}, { value: '\n\n' });
+testVim('dge_word_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doKeys('d', 'g', 'e');
+  eq('wor\n', cm.getValue());
+}, { value: 'word\n\n'});
+testVim('dge_whitespace_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('d', 'g', 'e');
+  eq('', cm.getValue());
+}, { value: '\n  \n' });
+testVim('dge_start_of_document', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'g', 'e');
+  eq('bc\n', cm.getValue());
+}, { value: 'abc\n' });
 testVim('d_inclusive', function(cm, vim, helpers) {
   // Assert that when inclusive is set, the character the cursor is on gets
   // deleted too.

From b50aef35d68a28b758ea18fe6d9856c41bff1948 Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Wed, 8 May 2013 16:03:14 +0200
Subject: [PATCH 0033/4742] [vim keymap] Fix % seek forward behavior, add %seek
 skip comments/quotes

---
 keymap/vim.js    | 45 ++++++++++++++++++++++++++++++++++++---------
 test/vim_test.js | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 3b857e58b1..fcdff6f74b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1345,9 +1345,24 @@
       },
       moveToMatchedSymbol: function(cm, motionArgs) {
         var cursor = cm.getCursor();
-        var symbol = cm.getLine(cursor.line).charAt(cursor.ch);
-        if (isMatchableSymbol(symbol)) {
-          return findMatchedSymbol(cm, cm.getCursor(), motionArgs.symbol);
+        var line = cursor.line;
+        var ch = cursor.ch;
+        var lineText = cm.getLine(line);
+        var symbol;
+        var startContext = cm.getTokenAt(cursor).type;
+        var startCtxLevel = getContextLevel(startContext);
+        do {
+          symbol = lineText.charAt(ch++);
+          if (symbol && isMatchableSymbol(symbol)) {
+            var endContext = cm.getTokenAt({line:line, ch:ch}).type;
+            var endCtxLevel = getContextLevel(endContext);
+            if (startCtxLevel >= endCtxLevel) {
+              break;
+            }
+          }
+        } while (symbol);
+        if (symbol) {
+          return findMatchedSymbol(cm, {line:line, ch:ch-1}, symbol);
         } else {
           return cursor;
         }
@@ -2338,9 +2353,17 @@
       return idx;
     }
 
+    function getContextLevel(ctx) {
+      return (ctx === 'string' || ctx === 'comment') ? 1 : 0;
+    }
+
     function findMatchedSymbol(cm, cur, symb) {
       var line = cur.line;
-      symb = symb ? symb : cm.getLine(line).charAt(cur.ch);
+      var ch = cur.ch;
+      symb = symb ? symb : cm.getLine(line).charAt(ch);
+
+      var symbContext = cm.getTokenAt({line:line, ch:ch+1}).type;
+      var symbCtxLevel = getContextLevel(symbContext);
 
       var reverseSymb = ({
         '(': ')', ')': '(',
@@ -2356,7 +2379,7 @@
       // depending on which bracket we're matching
       var increment = ({'(': 1, '{': 1, '[': 1})[symb] || -1;
       var endLine = increment === 1 ? cm.lineCount() : -1;
-      var depth = 1, nextCh = symb, index = cur.ch, lineText = cm.getLine(line);
+      var depth = 1, nextCh = symb, index = ch, lineText = cm.getLine(line);
       // Simple search for closing paren--just count openings and closings till
       // we find our match
       // TODO: use info from CodeMirror to ignore closing brackets in comments
@@ -2375,10 +2398,14 @@
           }
           nextCh = lineText.charAt(index);
         }
-        if (nextCh === symb) {
-          depth++;
-        } else if (nextCh === reverseSymb) {
-          depth--;
+        var revSymbContext = cm.getTokenAt({line:line, ch:index+1}).type;
+        var revSymbCtxLevel = getContextLevel(revSymbContext);
+        if (symbCtxLevel >= revSymbCtxLevel) {
+          if (nextCh === symb) {
+            depth++;
+          } else if (nextCh === reverseSymb) {
+            depth--;
+          }
         }
       }
 
diff --git a/test/vim_test.js b/test/vim_test.js
index 4979e404b3..63d3197734 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -34,6 +34,7 @@ var wordLine = lines[0];
 var bigWordLine = lines[1];
 var charLine = lines[2];
 var bracesLine = lines[3];
+var seekBraceLine = lines[4];
 
 var word1 = {
   start: { line: wordLine.line, ch: 1 },
@@ -82,6 +83,14 @@ var curlys1 = {
   start: { line: bracesLine.line, ch: 9 },
   end: { line: bracesLine.line, ch: 11 }
 };
+var seekOutside = {
+  start: { line: seekBraceLine.line, ch: 1 },
+  end: { line: seekBraceLine.line, ch: 16 }
+};
+var seekInside = {
+  start: { line: seekBraceLine.line, ch: 14 },
+  end: { line: seekBraceLine.line, ch: 11 }
+};
 
 function copyCursor(cur) {
   return { ch: cur.ch, line: cur.line };
@@ -301,11 +310,34 @@ testMotion('T_repeat', ['2', 'T', 'p'], offsetCursor(pChars[0], 0, 1), pChars[2]
 testMotion('%_parens', ['%'], parens1.end, parens1.start);
 testMotion('%_squares', ['%'], squares1.end, squares1.start);
 testMotion('%_braces', ['%'], curlys1.end, curlys1.start);
+testMotion('%_seek_outside', ['%'], seekOutside.end, seekOutside.start);
+testMotion('%_seek_inside', ['%'], seekInside.end, seekInside.start);
+testVim('%_seek_skip', function(cm, vim, helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,9);
+}, {value:'01234"("()'});
+testVim('%_skip_string', function(cm, vim, helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,4);
+  cm.setCursor(0,2);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,0);
+}, {value:'(")")'});
+(')')
+testVim('%_skip_comment', function(cm, vim, helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,6);
+  cm.setCursor(0,3);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,0);
+}, {value:'(/*)*/)'});
 // Make sure that moving down after going to the end of a line always leaves you
 // at the end of a line, but preserves the offset in other cases
 testVim('Changing lines after Eol operation', function(cm, vim, helpers) {
-  var startPos = { line: 0, ch: 0 };
-  cm.setCursor(startPos);
+  cm.setCursor(0,0);
   helpers.doKeys(['$']);
   helpers.doKeys(['j']);
   // After moving to Eol and then down, we should be at Eol of line 2

From 2f156c70610d98564a313ce0f89a14683195b36c Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 12 May 2013 15:07:22 -0400
Subject: [PATCH 0034/4742] [searchcursor] Small fixes to greedy regex search.

Makes "backtracking" matches match the forward search matches.
Fixes "0 or more" '\w*' type searches
---
 addon/search/searchcursor.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index a590e84443..3da3f04e8f 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -24,16 +24,26 @@
             if (!newMatch) break;
             match = newMatch;
             start = match.index;
-            cutOff = match.index + 1;
+            cutOff = match.index + (match[0].length || 1);
+            if (cutOff == line.length) break;
+          }
+          var matchLen = (match && match[0].length) || 0;
+          if (!matchLen) {
+            if (start == 0 && line.length == 0) {match = undefined;}
+            else if (start != doc.getLine(pos.line).length) {
+              matchLen++;
+            }
           }
         } else {
           query.lastIndex = pos.ch;
-          var line = doc.getLine(pos.line), match = query.exec(line),
-          start = match && match.index;
+          var line = doc.getLine(pos.line), match = query.exec(line);
+          var matchLen = (match && match[0].length) || 0;
+          var start = match && match.index;
+          if (start + matchLen != line.length && !matchLen) matchLen = 1;
         }
-        if (match && match[0])
+        if (match && matchLen)
           return {from: Pos(pos.line, start),
-                  to: Pos(pos.line, start + match[0].length),
+                  to: Pos(pos.line, start + matchLen),
                   match: match};
       };
     } else { // String query

From d641e0d8c9254c0b5229cb961e028c930ee528ec Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Fri, 15 Mar 2013 22:26:29 -0400
Subject: [PATCH 0035/4742] [vim] Fix greedy regex search

---
 keymap/vim.js    | 11 ++++----
 test/vim_test.js | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fcdff6f74b..48276836ca 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -842,7 +842,7 @@
           try {
             updateSearchQuery(cm, query, ignoreCase, smartCase);
           } catch (e) {
-            showConfirm(cm, 'Invalid regex: ' + regexPart);
+            showConfirm(cm, 'Invalid regex: ' + query);
             return;
           }
           commandDispatcher.processMotion(cm, vim, {
@@ -2656,7 +2656,7 @@
             if (match[0].length == 0) {
               // Matched empty string, skip to next.
               stream.next();
-              return;
+              return "searching";
             }
             if (!stream.sol()) {
               // Backtrack 1 to match \b
@@ -2692,12 +2692,11 @@
       if (repeat === undefined) { repeat = 1; }
       return cm.operation(function() {
         var pos = cm.getCursor();
-        if (!prev) {
-          pos.ch += 1;
-        }
         var cursor = cm.getSearchCursor(query, pos);
         for (var i = 0; i < repeat; i++) {
-          if (!cursor.find(prev)) {
+          var found = cursor.find(prev);
+          if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); }
+          if (!found) {
             // SearchCursor may have returned null because it hit EOF, wrap
             // around and try again.
             cursor = cm.getSearchCursor(query,
diff --git a/test/vim_test.js b/test/vim_test.js
index 63d3197734..f2304b99cf 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1401,6 +1401,76 @@ testVim('/_case', function(cm, vim, helpers) {
   helpers.doKeys('/');
   helpers.assertCursorAt(1, 6);
 }, { value: 'match nope match \n nope Match' });
+testVim('/_nongreedy', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('aa');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa aa \n a aa'});
+testVim('?_nongreedy', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('aa');
+  helpers.doKeys('?');
+  helpers.assertCursorAt(1, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa aa \n a aa'});
+testVim('/_greedy', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('a+');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 1);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa aa \n a aa'});
+testVim('?_greedy', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('a+');
+  helpers.doKeys('?');
+  helpers.assertCursorAt(1, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 1);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa aa \n a aa'});
+testVim('/_greedy_0_or_more', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('a*');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 5);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 0);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 1);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa  aa\n aa'});
+testVim('?_greedy_0_or_more', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('a*');
+  helpers.doKeys('?');
+  helpers.assertCursorAt(1, 1);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 0);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 5);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa  aa\n aa'});
 testVim('? and n/N', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('match');
   helpers.doKeys('?');

From db76ceeaffd461fb5e3d0559624e14701a53eaa9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 May 2013 10:16:07 +0200
Subject: [PATCH 0036/4742] Prevent update and viewportChange events from being
 fired too often

Previously, they'd fire multiple times when an update didn't immediately
become stable.
---
 lib/codemirror.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 745caba277..934fcd4f99 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -405,12 +405,8 @@ window.CodeMirror = (function() {
     var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
     for (;;) {
-      if (updateDisplayInner(cm, changes, visible)) {
-        updated = true;
-        signalLater(cm, "update", cm);
-        if (cm.display.showingFrom != oldFrom || cm.display.showingTo != oldTo)
-          signalLater(cm, "viewportChange", cm, cm.display.showingFrom, cm.display.showingTo);
-      } else break;
+      if (!updateDisplayInner(cm, changes, visible)) break;
+      updated = true;
       updateSelection(cm);
       updateScrollbars(cm);
 
@@ -424,6 +420,11 @@ window.CodeMirror = (function() {
       changes = [];
     }
 
+    if (updated) {
+      signalLater(cm, "update", cm);
+      if (cm.display.showingFrom != oldFrom || cm.display.showingTo != oldTo)
+        signalLater(cm, "viewportChange", cm, cm.display.showingFrom, cm.display.showingTo);
+    }
     return updated;
   }
 

From b2c1d962d836efe08a39cabee7c1a46e6bc2551d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 May 2013 10:22:53 +0200
Subject: [PATCH 0037/4742] Explicitly set gutter height

This prevents it from being repainted whenever the height of the inner
editor briefly changes during a repaint. (At least, it does on Webkit).

Issue #1514
---
 lib/codemirror.css | 1 -
 lib/codemirror.js  | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 5512380116..f5379d967c 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -149,7 +149,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-gutters {
   position: absolute; left: 0; top: 0;
-  height: 100%;
   padding-bottom: 30px;
   z-index: 3;
 }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 934fcd4f99..699f55a4c5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -127,10 +127,8 @@ window.CodeMirror = (function() {
     // Will contain the gutters, if any
     d.gutters = elt("div", null, "CodeMirror-gutters");
     d.lineGutter = null;
-    // Helper element to properly size the gutter backgrounds
-    var scrollerInner = elt("div", [d.sizer, d.heightForcer, d.gutters], null, "position: relative; min-height: 100%");
     // Provides scrolling
-    d.scroller = elt("div", [scrollerInner], "CodeMirror-scroll");
+    d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
     d.scroller.setAttribute("tabIndex", "-1");
     // The element in which the editor lives.
     d.wrapper = elt("div", [d.inputDiv, d.scrollbarH, d.scrollbarV,
@@ -323,6 +321,7 @@ window.CodeMirror = (function() {
     var d = cm.display, docHeight = cm.doc.height;
     var totalHeight = docHeight + paddingVert(d);
     d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
+    d.gutters.style.height = Math.max(totalHeight, d.scroller.clientHeight - scrollerCutOff) + "px";
     var scrollHeight = Math.max(totalHeight, d.scroller.scrollHeight);
     var needsH = d.scroller.scrollWidth > d.scroller.clientWidth;
     var needsV = scrollHeight > d.scroller.clientHeight;

From ffebe6da853ac5825ae4b2dc7173dcbfa7d51e39 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 May 2013 10:30:09 +0200
Subject: [PATCH 0038/4742] [yaml mode] Comments must be preceded by whitespace

Closes #1516
---
 mode/yaml/yaml.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index bdd303dfed..7a095b31db 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -9,7 +9,9 @@ CodeMirror.defineMode("yaml", function() {
       var esc = state.escaped;
       state.escaped = false;
       /* comments */
-      if (ch == "#") { stream.skipToEnd(); return "comment"; }
+      if (ch == "#" && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
+        stream.skipToEnd(); return "comment";
+      }
       if (state.literal && stream.indentation() > state.keyCol) {
         stream.skipToEnd(); return "string";
       } else if (state.literal) { state.literal = false; }

From d4f05936c278ea12ff41eb766a1cd9935e37c965 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 May 2013 13:47:28 +0200
Subject: [PATCH 0039/4742] [comment addon] Implement automatic
 commenting/uncommenting

---
 addon/comment/comment.js          | 145 ++++++++++++++++++++++++++++++
 doc/manual.html                   |  68 ++++++++++++++
 mode/clike/clike.js               |   5 +-
 mode/clojure/clojure.js           |   4 +-
 mode/coffeescript/coffeescript.js |   3 +-
 mode/commonlisp/commonlisp.js     |   6 +-
 mode/css/css.js                   |   4 +-
 mode/erlang/erlang.js             |   5 +-
 mode/gas/gas.js                   |   6 +-
 mode/go/go.js                     |   5 +-
 mode/haskell/haskell.js           |   6 +-
 mode/javascript/index.html        |   4 +-
 mode/javascript/javascript.js     |   3 +
 mode/lua/lua.js                   |   6 +-
 mode/ocaml/ocaml.js               |   5 +-
 mode/php/php.js                   |   3 +
 mode/python/python.js             |   3 +-
 mode/ruby/ruby.js                 |   3 +-
 mode/rust/rust.js                 |   5 +-
 mode/scheme/scheme.js             |   4 +-
 mode/xml/xml.js                   |   2 +
 test/comment_test.js              |  46 ++++++++++
 test/driver.js                    |   3 +-
 test/index.html                   |   2 +
 test/test.js                      |   2 +
 25 files changed, 330 insertions(+), 18 deletions(-)
 create mode 100644 addon/comment/comment.js
 create mode 100644 test/comment_test.js

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
new file mode 100644
index 0000000000..2963268a72
--- /dev/null
+++ b/addon/comment/comment.js
@@ -0,0 +1,145 @@
+(function() {
+  "use strict";
+  
+  var noOptions = {};
+  var nonWS = /[^\s\u00a0]/;
+  var Pos = CodeMirror.Pos;
+
+  function firstNonWS(str) {
+    var found = str.search(nonWS);
+    return found == -1 ? 0 : found;
+  }
+
+  CodeMirror.commands.toggleComment = function(cm) {
+    var from = cm.getCursor("start"), to = cm.getCursor("end");
+    cm.uncomment(from, to) || cm.lineComment(from, to);
+  };
+
+  CodeMirror.defineExtension("lineComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = CodeMirror.innerMode(self.getMode(), self.getTokenAt(from).state).mode;
+    var commentString = options.lineComment || mode.lineComment;
+    if (!commentString) {
+      if (options.blockCommentStart || mode.blockCommentStart) {
+        options.fullLines = true;
+        self.blockComment(from, to, options);
+      }
+      return;
+    }
+    var tabSize = self.getOption("tabSize"), firstLine = self.getLine(from.line);
+    if (firstLine == null) return;
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
+    var pad = options.padding == null ? " " : options.padding;
+    var blankLines = options.commentBlankLines;
+
+    self.operation(function() {
+      if (options.indent) {
+        var baseCol = CodeMirror.countColumn(firstLine, null, tabSize);
+        var baseString = firstLine.slice(0, firstNonWS(firstLine));
+        for (var i = from.line; i < end; ++i) {
+          var line = self.getLine(i), cut = baseString.length;
+          if (!blankLines && !nonWS.test(line)) continue;
+          if (line.slice(0, cut) != baseString) cut = firstNonWS(line);
+          self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut));
+        }
+      } else {
+        for (var i = from.line; i < end; ++i) {
+          if (blankLines || nonWS.test(self.getLine(i)))
+            self.replaceRange(commentString + pad, Pos(i, 0));
+        }
+      }
+    });
+  });
+
+  CodeMirror.defineExtension("blockComment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = CodeMirror.innerMode(self.getMode(), self.getTokenAt(from).state).mode;
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) {
+      if ((options.lineComment || mode.lineComment) && options.fullLines != false)
+        self.lineComment(from, to, options);
+      return;
+    }
+
+    var end = Math.min(to.line, self.lastLine());
+    if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
+
+    var pad = options.padding == null ? " " : options.padding;
+    if (from.line > end) return;
+
+    self.operation(function() {
+      if (options.fullLines != false) {
+        var lastLineHasText = nonWS.test(self.getLine(end));
+        self.replaceRange(pad + endString, Pos(end));
+        self.replaceRange(startString + pad, Pos(from.line, 0));
+        var lead = options.blockCommentLead || mode.blockCommentLead;
+        if (lead != null) for (var i = from.line + 1; i <= end; ++i)
+          if (i != end || lastLineHasText)
+            self.replaceRange(lead + pad, Pos(i, 0));
+      } else {
+        self.replaceRange(endString, to);
+        self.replaceRange(startString, from);
+      }
+    });
+  });
+
+  CodeMirror.defineExtension("uncomment", function(from, to, options) {
+    if (!options) options = noOptions;
+    var self = this, mode = CodeMirror.innerMode(self.getMode(), self.getTokenAt(from).state).mode;
+    var end = Math.min(to.line, self.lastLine()), start = Math.min(from.line, end);
+
+    // Try finding line comments
+    var lineString = options.lineComment || mode.lineComment, lines = [];
+    var pad = options.padding == null ? " " : options.padding;
+    lineComment: for(;;) {
+      if (!lineString) break;
+      for (var i = start; i <= end; ++i) {
+        var line = self.getLine(i);
+        var found = line.indexOf(lineString);
+        if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
+        if (i != start && nonWS.test(line.slice(0, found))) break lineComment;
+        lines.push(line);
+      }
+      self.operation(function() {
+        for (var i = start; i <= end; ++i) {
+          var line = lines[i - start];
+          var pos = line.indexOf(lineString), endPos = pos + lineString.length;
+          if (pos < 0) continue;
+          if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
+          self.replaceRange("", Pos(i, pos), Pos(i, endPos));
+        }
+      });
+      return true;
+    }
+    
+    // Try block comments
+    var startString = options.blockCommentStart || mode.blockCommentStart;
+    var endString = options.blockCommentEnd || mode.blockCommentEnd;
+    if (!startString || !endString) return false;
+    var lead = options.blockCommentLead || mode.blockCommentLead;
+    var startLine = self.getLine(start), endLine = end == start ? startLine : self.getLine(end);
+    var open = startLine.indexOf(startString), close = endLine.lastIndexOf(endString);
+    if (close == -1 && start != end) {
+      endLine = self.getLine(--end);
+      close = endLine.lastIndexOf(endString);
+    }
+    if (open == -1 || close == -1) return false;
+
+    self.operation(function() {
+      self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
+                        Pos(end, close + endString.length));
+      var openEnd = open + startString.length;
+      if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length;
+      self.replaceRange("", Pos(start, open), Pos(start, openEnd));
+      if (lead) for (var i = start + 1; i <= end; ++i) {
+        var line = self.getLine(i), found = line.indexOf(lead);
+        if (found == -1 || nonWS.test(line.slice(0, found))) continue;
+        var foundEnd = found + lead.length;
+        if (pad && line.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length;
+        self.replaceRange("", Pos(i, found), Pos(i, foundEnd));
+      }
+    });
+    return true;
+  });
+})();
diff --git a/doc/manual.html b/doc/manual.html
index 361a0e4273..a7d6a67948 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1501,6 +1501,7 @@ <h2 id="addons">Add-ons</h2>
       prompt (should include an <code>input</code> tag), and a
       callback function that is called when text has been entered.
       Depends on <code>addon/dialog/dialog.css</code>.</dd>
+
       <dt id="addon_searchcursor"><a href="../addon/search/searchcursor.js"><code>search/searchcursor.js</code></a></dt>
       <dd>Adds the <code>getSearchCursor(query, start, caseFold) →
       cursor</code> method to CodeMirror instances, which can be used
@@ -1539,6 +1540,7 @@ <h2 id="addons">Add-ons</h2>
       on <code>searchcursor.js</code>, and will make use
       of <a href="#addon_dialog"><code>openDialog</code></a> when
       available to make prompting for search queries less ugly.</dd>
+
       <dt id="addon_matchbrackets"><a href="../addon/edit/matchbrackets.js"><code>edit/matchbrackets.js</code></a></dt>
       <dd>Defines an option <code>matchBrackets</code> which, when set
       to true, causes matching brackets to be highlighted whenever the
@@ -1547,6 +1549,7 @@ <h2 id="addons">Add-ons</h2>
       once, and a method <code>findMatchingBracket</code> that can be
       used to run the bracket-finding algorithm that this uses
       internally.</dd>
+
       <dt id="addon_closebrackets"><a href="../addon/edit/closebrackets.js"><code>edit/closebrackets.js</code></a></dt>
       <dd>Defines an option <code>autoCloseBrackets</code> that will
       auto-close brackets and quotes when typed. By default, it'll
@@ -1554,6 +1557,50 @@ <h2 id="addons">Add-ons</h2>
       string similar to that (containing pairs of matching characters)
       to customize it. <a href="../demo/closebrackets.html">Demo
       here</a>.</dd>
+
+      <dt id="addon_comment"><a href="../addon/comment/comment.js"><code>comment/comment.js</code></a></dt>
+      <dd>Addon for commenting and uncommenting code. Adds three
+      methods to CodeMirror instances:
+      <dl>
+        <dt id="lineComment"><code><strong>lineComment</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>
+        <dd>Set the lines in the given range to be line comments. Will
+        fall back to <code>blockComment</code> when no line comment
+        style is defined for the mode.</dd>
+        <dt id="blockComment"><code><strong>blockComment</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>
+        <dd>Wrap the code in the given range in a block comment. Will
+        fall back to <code>lineComment</code> when no block comment
+        style is defined for the mode.</dd>
+        <dt id="uncomment"><code><strong>uncomment</strong>(from: {line, ch}, to: {line, ch}, ?options: object) → boolean</code></dt>
+        <dd>Try to uncomment the given range.
+          Returns <code>true</code> if a comment range was found and
+          removed, <code>false</code> otherwise.</dd>
+      </dl>
+      The <code>options</code> object accepted by these methods may
+      have the following properties:
+      <dl>
+        <dt><code>blockCommentStart, blockCommentEnd, blockCommentLead, lineComment: string</code></dt>
+        <dd>Override the <a href="#mode_comment">comment string
+        properties</a> of the mode with custom comment strings.</dd>
+        <dt><code>padding</code></dt>
+        <dd>A string that will be inserted after opening and before
+        closing comment markers. Defaults to a single space.</dd>
+        <dt><code>commentBlankLines</code></dt>
+        <dd>Whether, when adding line comments, to also comment lines
+        that contain only whitespace.</dd>
+        <dt><code>indent</code></dt>
+        <dd>When adding line comments and this is turned on, it will
+        align the comment block to the current indentation of the
+        first line of the block.</dd>
+        <dt><code>fullLines</code></dt>
+        <dd>When block commenting, this controls whether the whole
+        lines are indented, or only the precise range that is given.
+        Defaults to <code>true</code>.</dd>
+      </dl>
+      The addon also defines
+      a <code>toggleComment</code> <a href="#commands">command</a>,
+      which will try to uncomment the current selection, and if that
+      fails, line-comments it.</dd>
+
       <dt id="addon_foldcode"><a href="../addon/fold/foldcode.js"><code>fold/foldcode.js</code></a></dt>
       <dd>Helps with code folding.
       See <a href="../demo/folding.html">the demo</a> for an example.
@@ -1571,6 +1618,7 @@ <h2 id="addons">Add-ons</h2>
       where indentation determines block structure (Python, Haskell),
       and <code>CodeMirror.tagRangeFinder</code>, for XML-style
       languages.</dd>
+
       <dt id="addon_runmode"><a href="../addon/runmode/runmode.js"><code>runmode/runmode.js</code></a></dt>
       <dd>Can be used to run a CodeMirror mode over text without
       actually opening an editor instance.
@@ -1580,6 +1628,7 @@ <h2 id="addons">Add-ons</h2>
       (without including all of CodeMirror) and
       for <a href="../addon/runmode/runmode.node.js">running under
       node.js</a>.</dd>
+
       <dt id="addon_overlay"><a href="../addon/mode/overlay.js"><code>mode/overlay.js</code></a></dt>
       <dd>Mode combinator that can be used to extend a mode with an
       'overlay' — a secondary mode is run over the stream, along with
@@ -1588,6 +1637,7 @@ <h2 id="addons">Add-ons</h2>
       Defines <code>CodeMirror.overlayMode</code>, which is used to
       create such a mode. See <a href="../demo/mustache.html">this
       demo</a> for a detailed example.</dd>
+
       <dt id="addon_multiplex"><a href="../addon/mode/multiplex.js"><code>mode/multiplex.js</code></a></dt>
       <dd>Mode combinator that can be used to easily 'multiplex'
       between several modes.
@@ -1607,6 +1657,7 @@ <h2 id="addons">Add-ons</h2>
       see the content between the delimiters.
       See <a href="../demo/multiplex.html">this demo</a> for an
       example.</dd>
+
       <dt id="addon_show-hint"><a href="../addon/hint/show-hint.js"><code>hint/show-hint.js</code></a></dt>
       <dd>Provides a framework for showing autocompletion hints.
       Defines <code>CodeMirror.showHint</code>, which takes a
@@ -1622,11 +1673,13 @@ <h2 id="addons">Add-ons</h2>
       hint sources for various languages. Check
       out <a href="../demo/complete.html">the demo</a> for an
       example.</dd>
+
       <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>match-highlighter.js</code></a></dt>
       <dd>Adds a <code>highlightSelectionMatches</code> option that
       can be enabled to highlight all instances of a currently
       selected word.
       Demo <a href="../demo/matchhighlighter.html">here</a>.</dd>
+
       <dt id="addon_lint"><a href="../addon/lint/lint.js"><code>lint/lint.js</code></a></dt>
       <dd>Defines an interface component for showing linting warnings,
       with pluggable warning sources
@@ -1637,20 +1690,24 @@ <h2 id="addons">Add-ons</h2>
       example <code>CodeMirror.javascriptValidator</code>). Depends
       on <code>addon/lint/lint.css</code>. A demo can be
       found <a href="../demo/lint.html">here</a>.</dd>
+
       <dt id="addon_mark-selection"><a href="../addon/selection/mark-selection.js"><code>selection/mark-selection.js</code></a></dt>
       <dd>Causes the selected text to be marked with the CSS class
       <code>CodeMirror-selectedtext</code> when the <code>styleSelectedText</code> option
       is enabled. Useful to change the colour of the selection (in addition to the background),
       like in <a href="../demo/markselection.html">this demo</a>.</dd>
+
       <dt id="addon_active-line"><a href="../addon/selection/active-line.js"><code>selection/active-line.js</code></a></dt>
       <dd>Defines a <code>styleActiveLine</code> option that, when enabled,
       gives the wrapper of the active line the class <code>CodeMirror-activeline</code>, 
       and adds a background with the class <code>CodeMirror-activeline-background</code>.
       is enabled. See the <a href="../demo/activeline.html">demo</a>.</dd>
+
       <dt id="addon_closetag"><a href="../addon/edit/closetag.js"><code>edit/closetag.js</code></a></dt>
       <dd>Provides utility functions for adding automatic tag closing
       to XML modes. See
       the <a href="../demo/closetag.html">demo</a>.</dd>
+
       <dt id="addon_loadmode"><a href="../addon/mode/loadmode.js"><code>mode/loadmode.js</code></a></dt>
       <dd>Defines a <code>CodeMirror.requireMode(modename,
       callback)</code> function that will try to load a given mode and
@@ -1663,12 +1720,14 @@ <h2 id="addons">Add-ons</h2>
       which will ensure the given mode is loaded and cause the given
       editor instance to refresh its mode when the loading
       succeeded. See the <a href="../demo/loadmode.html">demo</a>.</dd>
+
       <dt id="addon_continuecomment"><a href="../addon/edit/continuecomment.js"><code>edit/continuecomment.js</code></a></dt>
       <dd>Adds an <code>continueComments</code> option, which can be
       set to true to have the editor prefix new lines inside C-like
       block comments with an asterisk when Enter is pressed. It can
       also be set to a string in order to bind this functionality to a
       specific key..</dd>
+
       <dt id="addon_placeholder"><a href="../addon/display/placeholder.js"><code>display/placeholder.js</code></a></dt>
       <dd>Adds a <code>placeholder</code> option that can be used to
       make text appear in the editor when it is empty and not focused.
@@ -1833,6 +1892,15 @@ <h2 id="modeapi">Writing CodeMirror Modes</h2>
     return <code>CodeMirror.Pass</code> to indicate that it
     could not come up with a precise indentation.</p>
 
+    <p id="mode_comment">To work well with
+    the <a href="#addon_comment">commenting addon</a>, a mode may
+    define <code>lineComment</code> (string that starts a line
+    comment), <code>blockCommentStart</code>, <code>blockCommentEnd</code>
+    (strings that start and end block comments),
+    and <code>blockCommentLead</code> (a string to put at the start of
+    continued lines in a block comment). All of these are
+    optional.</p>
+
     <p id="electricChars">Finally, a mode may define
     an <code>electricChars</code> property, which should hold a string
     containing all the characters that should trigger the behaviour
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index c14d7b4006..83bf8019f2 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -155,7 +155,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       else return ctx.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: "{}"
+    electricChars: "{}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index fae675477d..ee22a12fed 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -215,7 +215,9 @@ CodeMirror.defineMode("clojure", function () {
         indent: function (state) {
             if (state.indentStack == null) return state.indentation;
             return state.indentStack.indent;
-        }
+        },
+
+        lineComment: ";;"
     };
 });
 
diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index cf1cf4f246..509d9207bb 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -337,8 +337,9 @@ CodeMirror.defineMode('coffeescript', function(conf) {
             }
 
             return state.scopes[0].offset;
-        }
+        },
 
+        lineComment: "#"
     };
     return external;
 });
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index eeba759668..8fa08c8ac2 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -94,7 +94,11 @@ CodeMirror.defineMode("commonlisp", function (config) {
     indent: function (state, _textAfter) {
       var i = state.ctx.indentTo;
       return typeof i == "number" ? i : state.ctx.start + 1;
-    }
+    },
+
+    lineComment: ";;",
+    blockCommentStart: "#|",
+    blockCommentEnd: "|#"
   };
 });
 
diff --git a/mode/css/css.js b/mode/css/css.js
index f0fae602d1..f4ee021ed4 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -286,7 +286,9 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
       return state.baseIndent + n * indentUnit;
     },
 
-    electricChars: "}"
+    electricChars: "}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/"
   };
 });
 
diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index 029b8e5561..79e0434d1f 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -456,8 +456,9 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
 
     indent:
       function(state, textAfter) {
-//        console.log(state.tokenStack);
         return myIndent(state,textAfter);
-      }
+      },
+
+    lineComment: "%"
   };
 });
diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index 6604f01820..a6e6892908 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -321,6 +321,10 @@ CodeMirror.defineMode("gas", function(_config, parserConfig) {
           return style;
         }
       }
-    }
+    },
+
+    lineComment: lineCommentStartSymbol,
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/"
   };
 });
diff --git a/mode/go/go.js b/mode/go/go.js
index 8b84a5ca42..6a458a6fe9 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -158,7 +158,10 @@ CodeMirror.defineMode("go", function(config) {
       else return ctx.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: "{}:"
+    electricChars: "{}:",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 
diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index faec08dc33..b18d5ced1a 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -234,7 +234,11 @@ CodeMirror.defineMode("haskell", function() {
       var t = state.f(stream, function(s) { state.f = s; });
       var w = stream.current();
       return (w in wellKnownWords) ? wellKnownWords[w] : t;
-    }
+    },
+
+    blockCommentStart: "{-",
+    blockCommentEnd: "-}",
+    lineComment: "--"
   };
 
 });
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index dd0ca220d8..db063b772d 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -7,6 +7,7 @@
     <script src="../../lib/codemirror.js"></script>
     <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="../../addon/edit/continuecomment.js"></script>
+    <script src="../../addon/comment/comment.js"></script>
     <script src="javascript.js"></script>
     <link rel="stylesheet" href="../../doc/docs.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
@@ -68,7 +69,8 @@ <h1>CodeMirror: JavaScript mode</h1>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         matchBrackets: true,
-        continueComments: "Enter"
+        continueComments: "Enter",
+        extraKeys: {"Ctrl-Q": "toggleComment"}
       });
     </script>
 
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 87856a89f3..fabe1c42b9 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -453,6 +453,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     },
 
     electricChars: ":{}",
+    blockCommentStart: jsonMode ? null : "/*",
+    blockCommentEnd: jsonMode ? null : "*/",
+    lineComment: jsonMode ? null : "//",
 
     jsonMode: jsonMode
   };
diff --git a/mode/lua/lua.js b/mode/lua/lua.js
index 90761e2941..b8deaa2575 100644
--- a/mode/lua/lua.js
+++ b/mode/lua/lua.js
@@ -133,7 +133,11 @@ CodeMirror.defineMode("lua", function(config, parserConfig) {
     indent: function(state, textAfter) {
       var closing = dedentPartial.test(textAfter);
       return state.basecol + indentUnit * (state.indentDepth - (closing ? 1 : 0));
-    }
+    },
+
+    lineComment: "--",
+    blockCommentStart: "--[[",
+    blockCommentEnd: "]]"
   };
 });
 
diff --git a/mode/ocaml/ocaml.js b/mode/ocaml/ocaml.js
index 7dc3d283b2..32cbc0b7ba 100644
--- a/mode/ocaml/ocaml.js
+++ b/mode/ocaml/ocaml.js
@@ -106,7 +106,10 @@ CodeMirror.defineMode('ocaml', function() {
     token: function(stream, state) {
       if (stream.eatSpace()) return null;
       return state.tokenize(stream, state);
-    }
+    },
+
+    blockCommentStart: "(*",
+    blockCommentEnd: "*)"
   };
 });
 
diff --git a/mode/php/php.js b/mode/php/php.js
index 56497ed436..fa0db5b1fe 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -118,6 +118,9 @@
       },
 
       electricChars: "/{}:",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      lineComment: "//",
 
       innerMode: function(state) { return {state: state.curState, mode: state.curMode}; }
     };
diff --git a/mode/python/python.js b/mode/python/python.js
index d69ef8389b..b623972b88 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -331,8 +331,9 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             }
 
             return state.scopes[0].offset;
-        }
+        },
 
+        lineComment: "#"
     };
     return external;
 });
diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index d106a542db..883244b1c7 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -186,8 +186,9 @@ CodeMirror.defineMode("ruby", function(config) {
       return ct.indented + (closing ? 0 : config.indentUnit) +
         (state.continuedLine ? config.indentUnit : 0);
     },
-     electricChars: "}de" // enD and rescuE
 
+    electricChars: "}de", // enD and rescuE
+    lineComment: "#"
   };
 });
 
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index ea3005c360..7bee489b47 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -425,7 +425,10 @@ CodeMirror.defineMode("rust", function() {
       return lexical.indented + (closing ? 0 : (lexical.info == "alt" ? altIndentUnit : indentUnit));
     },
 
-    electricChars: "{}"
+    electricChars: "{}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 2ed0a24cd8..c5990ae92c 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -223,7 +223,9 @@ CodeMirror.defineMode("scheme", function () {
         indent: function (state) {
             if (state.indentStack == null) return state.indentation;
             return state.indentStack.indent;
-        }
+        },
+
+        lineComment: ";;"
     };
 });
 
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 440343bbe7..b04248c6c6 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -317,6 +317,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     },
 
     electricChars: "/",
+    blockCommentStart: "<!--",
+    blockCommentEnd: "-->",
 
     configuration: parserConfig.htmlMode ? "html" : "xml"
   };
diff --git a/test/comment_test.js b/test/comment_test.js
new file mode 100644
index 0000000000..311bdb5f49
--- /dev/null
+++ b/test/comment_test.js
@@ -0,0 +1,46 @@
+namespace = "comment_";
+
+(function() {
+  function test(name, mode, run, before, after) {
+    return testCM(name, function(cm) {
+      run(cm);
+      eq(cm.getValue(), after);
+    }, {value: before, mode: mode});
+  }
+
+  var simpleProg = "function foo() {\n  return bar;\n}";
+
+  test("block", "javascript", function(cm) {
+    cm.blockComment(Pos(0, 3), Pos(3, 0), {blockCommentLead: " *"});
+  }, simpleProg + "\n", "/* function foo() {\n *   return bar;\n * }\n */");
+
+  test("blockToggle", "javascript", function(cm) {
+    cm.blockComment(Pos(0, 3), Pos(2, 0), {blockCommentLead: " *"});
+    cm.uncomment(Pos(0, 3), Pos(2, 0), {blockCommentLead: " *"});
+  }, simpleProg, simpleProg);
+
+  test("line", "javascript", function(cm) {
+    cm.lineComment(Pos(1, 1), Pos(1, 1));
+  }, simpleProg, "function foo() {\n//   return bar;\n}");
+
+  test("lineToggle", "javascript", function(cm) {
+    cm.lineComment(Pos(0, 0), Pos(2, 1));
+    cm.uncomment(Pos(0, 0), Pos(2, 1));
+  }, simpleProg, simpleProg);
+
+  test("fallbackToBlock", "css", function(cm) {
+    cm.lineComment(Pos(0, 0), Pos(2, 1));
+  }, "html {\n  border: none;\n}", "/* html {\n  border: none;\n} */");
+
+  test("fallbackToLine", "ruby", function(cm) {
+    cm.blockComment(Pos(0, 0), Pos(1));
+  }, "def blah()\n  return hah\n", "# def blah()\n#   return hah\n");
+
+  test("commentRange", "javascript", function(cm) {
+    cm.blockComment(Pos(1, 2), Pos(1, 13), {fullLines: false});
+  }, simpleProg, "function foo() {\n  /*return bar;*/\n}");
+
+  test("indented", "javascript", function(cm) {
+    cm.lineComment(Pos(1, 0), Pos(2), {indent: true});
+  }, simpleProg, "function foo() {\n  // return bar;\n  // }");
+})();
diff --git a/test/driver.js b/test/driver.js
index aba427702e..ae79c328fe 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -23,8 +23,9 @@ function test(name, run, expectedFail) {
   tests.push({name: name, func: run, expectedFail: expectedFail});
   return name;
 }
+var namespace = "";
 function testCM(name, run, opts, expectedFail) {
-  return test("core_" + name, function() {
+  return test(namespace + name, function() {
     var place = document.getElementById("testground"), cm = CodeMirror(place, opts);
     var successful = false;
     try {
diff --git a/test/index.html b/test/index.html
index d397e8f7a2..816cef5948 100644
--- a/test/index.html
+++ b/test/index.html
@@ -9,6 +9,7 @@
     <script src="../lib/codemirror.js"></script>
     <script src="../addon/mode/overlay.js"></script>
     <script src="../addon/search/searchcursor.js"></script>
+    <script src="../addon/comment/comment.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
     <script src="../mode/xml/xml.js"></script>
     <script src="../keymap/vim.js"></script>
@@ -53,6 +54,7 @@ <h1>CodeMirror: Test Suite</h1>
     <script src="driver.js"></script>
     <script src="test.js"></script>
     <script src="doc_test.js"></script>
+    <script src="comment_test.js"></script>
     <script src="mode_test.js"></script>
     <script src="../mode/css/css.js"></script>
     <script src="../mode/css/test.js"></script>
diff --git a/test/test.js b/test/test.js
index 93d899a66e..637f6e79ca 100644
--- a/test/test.js
+++ b/test/test.js
@@ -32,6 +32,8 @@ var opera_version = opera && navigator.userAgent.match(/Version\/(\d+\.\d+)/);
 if (opera_version) opera_version = Number(opera_version);
 var opera_lt10 = opera && (!opera_version || opera_version < 10);
 
+namespace = "core_";
+
 test("core_fromTextArea", function() {
   var te = document.getElementById("code");
   te.value = "CONTENT";

From 3095862234bed78cb2dda2581ffe17cad5878a63 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 May 2013 13:53:18 +0200
Subject: [PATCH 0040/4742] [comment addon] Fix lint errors

---
 addon/comment/comment.js |  5 ++---
 addon/lint/lint.js       | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 2963268a72..ae42b6bcd5 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -1,6 +1,6 @@
 (function() {
   "use strict";
-  
+
   var noOptions = {};
   var nonWS = /[^\s\u00a0]/;
   var Pos = CodeMirror.Pos;
@@ -34,7 +34,6 @@
 
     self.operation(function() {
       if (options.indent) {
-        var baseCol = CodeMirror.countColumn(firstLine, null, tabSize);
         var baseString = firstLine.slice(0, firstNonWS(firstLine));
         for (var i = from.line; i < end; ++i) {
           var line = self.getLine(i), cut = baseString.length;
@@ -112,7 +111,7 @@
       });
       return true;
     }
-    
+
     // Try block comments
     var startString = options.blockCommentStart || mode.blockCommentStart;
     var endString = options.blockCommentEnd || mode.blockCommentEnd;
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index ca05da76ef..29fd8d9c3c 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -105,11 +105,11 @@ CodeMirror.validate = (function() {
   }
 
   function startLinting(cm) {
-          var state = cm._lintState, options = state.options;
-          if (options.async)
-                  options.getAnnotations(cm, updateLinting, options);
-          else
-                 updateLinting(cm, options.getAnnotations(cm.getValue()));
+    var state = cm._lintState, options = state.options;
+    if (options.async)
+      options.getAnnotations(cm, updateLinting, options);
+    else
+      updateLinting(cm, options.getAnnotations(cm.getValue()));
   }
 
   function updateLinting(cm, annotationsNotSorted) {

From 669c8dd45baff0193e3ac78c325c5d903af74c15 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 May 2013 14:05:30 +0200
Subject: [PATCH 0041/4742] [comment addon] Another lint fix

---
 addon/comment/comment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index ae42b6bcd5..4f590f2870 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -26,7 +26,7 @@
       }
       return;
     }
-    var tabSize = self.getOption("tabSize"), firstLine = self.getLine(from.line);
+    var firstLine = self.getLine(from.line);
     if (firstLine == null) return;
     var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
     var pad = options.padding == null ? " " : options.padding;

From 373cb16763574e3d1d31847f2fb911472d06114d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 May 2013 14:11:59 +0200
Subject: [PATCH 0042/4742] Fix context menu select-all in IE9+

Closes #1522
---
 lib/codemirror.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 699f55a4c5..fec1d582d9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2097,6 +2097,13 @@ window.CodeMirror = (function() {
     // Adds "Select all" to context menu in FF
     if (posEq(sel.from, sel.to)) display.input.value = display.prevInput = " ";
 
+    function prepareSelectAllHack() {
+      if (display.input.selectionStart != null) {
+        var extval = display.input.value = " " + (posEq(sel.from, sel.to) ? "" : display.input.value);
+        display.prevInput = " ";
+        display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
+      }
+    }
     function rehide() {
       display.inputDiv.style.position = "relative";
       display.input.style.cssText = oldCSS;
@@ -2104,12 +2111,10 @@ window.CodeMirror = (function() {
       slowPoll(cm);
 
       // Try to detect the user choosing select-all
-      if (display.input.selectionStart != null && (!ie || ie_lt9)) {
+      if (display.input.selectionStart != null) {
+        if (!ie || ie_lt9) prepareSelectAllHack();
         clearTimeout(detectingSelectAll);
-        var extval = display.input.value = " " + (posEq(sel.from, sel.to) ? "" : display.input.value), i = 0;
-        display.prevInput = " ";
-        display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
-        var poll = function(){
+        var i = 0, poll = function(){
           if (display.prevInput == " " && display.input.selectionStart == 0)
             operation(cm, commands.selectAll)(cm);
           else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);
@@ -2119,6 +2124,7 @@ window.CodeMirror = (function() {
       }
     }
 
+    if (ie && !ie_lt9) prepareSelectAllHack();
     if (captureMiddleClick) {
       e_stop(e);
       var mouseup = function() {

From fb6df35b2e9c79d6fe4b834d92b8f7ed0407f385 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 May 2013 16:27:06 +0200
Subject: [PATCH 0043/4742] [less mode] Remove fixed list of tags

It makes no sense.

Issue #1466
---
 mode/less/less.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/mode/less/less.js b/mode/less/less.js
index 6df4790995..09f510e032 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -7,12 +7,6 @@
 CodeMirror.defineMode("less", function(config) {
   var indentUnit = config.indentUnit, type;
   function ret(style, tp) {type = tp; return style;}
-  //html tags
-  var tags = "a abbr acronym address applet area article aside audio b base basefont bdi bdo big blockquote body br button canvas caption cite code col colgroup command datalist dd del details dfn dir div dl dt em embed fieldset figcaption figure font footer form frame frameset h1 h2 h3 h4 h5 h6 head header hgroup hr html i iframe img input ins keygen kbd label legend li link map mark menu meta meter nav noframes noscript object ol optgroup option output p param pre progress q rp rt ruby s samp script section select small source span strike strong style sub summary sup table tbody td textarea tfoot th thead time title tr track tt u ul var video wbr".split(' ');
-
-  function inTagsArray(val){
-    for(var i=0; i<tags.length; i++)if(val === tags[i])return true;
-  }
 
   var selectors = /(^\:root$|^\:nth\-child$|^\:nth\-last\-child$|^\:nth\-of\-type$|^\:nth\-last\-of\-type$|^\:first\-child$|^\:last\-child$|^\:first\-of\-type$|^\:last\-of\-type$|^\:only\-child$|^\:only\-of\-type$|^\:empty$|^\:link|^\:visited$|^\:active$|^\:hover$|^\:focus$|^\:target$|^\:lang$|^\:enabled^\:disabled$|^\:checked$|^\:first\-line$|^\:first\-letter$|^\:before$|^\:after$|^\:not$|^\:required$|^\:invalid$)/;
 
@@ -135,8 +129,6 @@ CodeMirror.defineMode("less", function(config) {
         //stream.backUp(stream.current().length-1);
         //return ret(null, ch); //console.log( stream.current() );
         return ret("number", "unit");
-      }else if( inTagsArray(stream.current().toLowerCase()) ){ // match html tags
-        return ret("tag", "tag");
       }else if( /\/|[\s\)]/.test(stream.peek() || stream.eol() || (stream.eatSpace() && stream.peek() == "/")) && stream.current().indexOf(".") !== -1){
         if(stream.current().substring(stream.current().length-1,stream.current().length) == "{"){
           stream.backUp(1);

From 6193e89b65341e1288f16080871ff90b0fbda179 Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Mon, 13 May 2013 22:43:29 +0200
Subject: [PATCH 0044/4742] [vim keymap] Add actionArgs for command 'i' 'I'

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 48276836ca..4d7833f14e 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -245,9 +245,10 @@
         actionArgs: { insertAt: 'charAfter' }},
     { keys: ['A'], type: 'action', action: 'enterInsertMode',
         actionArgs: { insertAt: 'eol' }},
-    { keys: ['i'], type: 'action', action: 'enterInsertMode' },
+    { keys: ['i'], type: 'action', action: 'enterInsertMode',
+        actionArgs: { insertAt: 'inplace' }},
     { keys: ['I'], type: 'action', action: 'enterInsertMode',
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
+        actionArgs: { insertAt: 'firstNonBlank' }},
     { keys: ['o'], type: 'action', action: 'newLineAndEnterInsertMode',
         actionArgs: { after: true }},
     { keys: ['O'], type: 'action', action: 'newLineAndEnterInsertMode',
@@ -368,7 +369,7 @@
       return false;
     }
 
-    var circularJumpList = function() {
+    var createCircularJumpList = function() {
       var size = 100;
       var pointer = -1;
       var head = 0;
@@ -442,7 +443,7 @@
           searchQuery: null,
           // Whether we are searching backwards.
           searchIsReversed: false,
-          jumpList: circularJumpList(),
+          jumpList: createCircularJumpList(),
           // Recording latest f, t, F or T motion command.
           lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
           registerController: new RegisterController({})
@@ -1528,6 +1529,8 @@
           cm.setCursor(cursor);
         } else if (insertAt == 'charAfter') {
           cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
+        } else if (insertAt == 'firstNonBlank') {
++         cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
         }
         cm.setOption('keyMap', 'vim-insert');
       },

From 1f3e26ab6869f0a3de97f5cf01e37c93e54f4a7f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 May 2013 10:51:09 +0200
Subject: [PATCH 0045/4742] [vim keymap] Remove stray plus character

Issue #1525
---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 4d7833f14e..3640e65be8 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1530,7 +1530,7 @@
         } else if (insertAt == 'charAfter') {
           cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
         } else if (insertAt == 'firstNonBlank') {
-+         cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+          cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
         }
         cm.setOption('keyMap', 'vim-insert');
       },

From b5e0401e4424084e39cd3762feb284c01cc9caf6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 May 2013 11:13:46 +0200
Subject: [PATCH 0046/4742] Allow mode spec objects to have mime types as name

Other properties will be added/overridden in the config object for the
mime type.
---
 lib/codemirror.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fec1d582d9..15a092f9c4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3180,10 +3180,15 @@ window.CodeMirror = (function() {
   };
 
   CodeMirror.resolveMode = function(spec) {
-    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
+    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
       spec = mimeModes[spec];
-    else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec))
+    } else if (typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+      var found = mimeModes[spec.name];
+      spec = createObj(found, spec);
+      spec.name = found.name;
+    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
       return CodeMirror.resolveMode("application/xml");
+    }
     if (typeof spec == "string") return {name: spec};
     else return spec || {name: "null"};
   };

From c3cb802df2e001bc0b2d1b78766a603a48ec2d1b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 May 2013 11:18:16 +0200
Subject: [PATCH 0047/4742] [clike mode] Fix interaction of dontAlignCalls and
 statementIndentUnit

Closes #1518
---
 mode/clike/clike.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 83bf8019f2..09621bc08d 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -150,8 +150,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
       var closing = firstChar == ctx.type;
       if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
-      else if (dontAlignCalls && ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else if (ctx.align && (!dontAlignCalls || ctx.type != ")")) return ctx.column + (closing ? 0 : 1);
+      else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
       else return ctx.indented + (closing ? 0 : indentUnit);
     },
 

From 00504d8a36c1cd4cb5699601bc49ca1012c2fe78 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 May 2013 11:25:48 +0200
Subject: [PATCH 0048/4742] Don't crash when getMode is passed null

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 15a092f9c4..7f5f672adb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3182,7 +3182,7 @@ window.CodeMirror = (function() {
   CodeMirror.resolveMode = function(spec) {
     if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
       spec = mimeModes[spec];
-    } else if (typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+    } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
       var found = mimeModes[spec.name];
       spec = createObj(found, spec);
       spec.name = found.name;

From ea523decb8bd3562bfaae4891903c46e9c190f87 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 15 May 2013 13:03:59 +0200
Subject: [PATCH 0049/4742] Shuffle real-world uses on front page, add
 Bitbucket and JSFiddle

---
 doc/realworld.html |  2 ++
 index.html         | 39 ++++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index c3f2c814fc..941d926dbe 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -25,6 +25,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
       <li><a href="http://amber-lang.net/">Amber</a> (JavaScript-based Smalltalk system)</li>
       <li><a href="http://apeye.org/">APEye</a> (tool for testing &amp; documenting APIs)</li>
+      <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a> (code hosting)</li>
       <li><a href="http://buzz.blogger.com/2013/04/improvements-to-blogger-template-html.html">Blogger's template editor</a></li>
       <li><a href="http://bluegriffon.org/">BlueGriffon</a> (HTML editor)</li>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
@@ -66,6 +67,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>
       <li><a href="http://jqfundamentals.com/">jQuery fundamentals</a> (interactive tutorial)</li>
       <li><a href="http://jsbin.com">jsbin.com</a> (JS playground)</li>
+      <li><a href="http://jsfiddle.com">jsfiddle.com</a> (another JS playground)</li>
       <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>
       <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>
diff --git a/index.html b/index.html
index 1dba41984b..a0d3d5b48f 100644
--- a/index.html
+++ b/index.html
@@ -120,28 +120,29 @@ <h2 style="margin-top: 0">Usage demos:</h2>
     <h2>Real-world uses:</h2>
 
     <ul>
-      <li><a href="http://jsbin.com">jsbin.com</a> (JS playground)</li>
-      <li><a href="http://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light Table</a> (experimental IDE)</li>
-      <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
-      <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
+      <li><a href="http://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light Table</a></li>
+      <li><a href="http://brackets.io">Adobe Brackets</a></li>
+      <li><a href="http://jsbin.com">jsbin.com</a></li>
+      <li><a href="http://jsfiddle.com">jsfiddle.com</a></li>
+      <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
-      <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
-      <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
-      <li><a href="http://emmet.io">Emmet</a> (fast XML editing)</li>
-      <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
-      <li><a href="http://codev.it/">Codev</a> (collaborative IDE)</li>
-      <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a> (augmented editing)</li>
-      <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
-      <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
+      <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a></li>
+      <li><a href="http://emmet.io">Emmet</a></li>
+      <li><a href="http://prose.io/">Prose.io</a></li>
+      <li><a href="http://paperjs.org/">Paper.js</a></li>
+      <li><a href="http://codev.it/">Codev</a></li>
+      <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a></li>
+      <li><a href="http://www.wescheme.org/">WeScheme</a></li>
+      <li><a href="http://www.mergely.com/">Mergely</a></li>
       <li><a href="http://webglplayground.net/">WebGL playground</a></li>
-      <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>
-      <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
-      <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>
-      <li><a href="http://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
-      <li><a href="http://try.haxe.org">Try Haxe</a> (Haxe Playground) </li>
-      <li><a href="http://cssdeck.com/">CSSDeck</a> (CSS showcase)</li>
+      <li><a href="https://thefiletree.com">The File Tree</a></li>
+      <li><a href="http://www.jshint.com/">JSHint</a></li>
+      <li><a href="http://sqlfiddle.com">SQLFiddle</a></li>
+      <li><a href="http://try.haxe.org">Try Haxe</a> </li>
+      <li><a href="http://cssdeck.com/">CSSDeck</a></li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
-      <li><a href="https://notex.ch">NoTex</a> (rST authoring)</li>
+      <li><a href="https://notex.ch">NoTex</a></li>
+      <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
       <li><a href="doc/realworld.html">More...</a></li>
     </ul>
 

From 36fe7d5b4a3ffdd804933a323a45f23ae0885e20 Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Tue, 14 May 2013 23:16:39 +0200
Subject: [PATCH 0050/4742] [vim keymap] Change defaultKeymap notation format

---
 keymap/vim.js    | 108 ++++++++++++++++++-----------------------------
 test/vim_test.js |  62 +++++++++++++--------------
 2 files changed, 73 insertions(+), 97 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 3640e65be8..9c0197faaa 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -58,26 +58,26 @@
   var defaultKeymap = [
     // Key to key mapping. This goes first to make it possible to override
     // existing mappings.
-    { keys: ['Left'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['Right'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['Up'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['Down'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['Space'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['Backspace'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['Ctrl-Space'], type: 'keyToKey', toKeys: ['W'] },
-    { keys: ['Ctrl-Backspace'], type: 'keyToKey', toKeys: ['B'] },
-    { keys: ['Shift-Space'], type: 'keyToKey', toKeys: ['w'] },
-    { keys: ['Shift-Backspace'], type: 'keyToKey', toKeys: ['b'] },
-    { keys: ['Ctrl-n'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['Ctrl-p'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['Ctrl-['], type: 'keyToKey', toKeys: ['Esc'] },
-    { keys: ['Ctrl-c'], type: 'keyToKey', toKeys: ['Esc'] },
+    { keys: ['<Left>'], type: 'keyToKey', toKeys: ['h'] },
+    { keys: ['<Right>'], type: 'keyToKey', toKeys: ['l'] },
+    { keys: ['<Up>'], type: 'keyToKey', toKeys: ['k'] },
+    { keys: ['<Down>'], type: 'keyToKey', toKeys: ['j'] },
+    { keys: ['<Space>'], type: 'keyToKey', toKeys: ['l'] },
+    { keys: ['<BS>'], type: 'keyToKey', toKeys: ['h'] },
+    { keys: ['<C-Space>'], type: 'keyToKey', toKeys: ['W'] },
+    { keys: ['<C-BS>'], type: 'keyToKey', toKeys: ['B'] },
+    { keys: ['<S-Space>'], type: 'keyToKey', toKeys: ['w'] },
+    { keys: ['<S-BS>'], type: 'keyToKey', toKeys: ['b'] },
+    { keys: ['<C-n>'], type: 'keyToKey', toKeys: ['j'] },
+    { keys: ['<C-p>'], type: 'keyToKey', toKeys: ['k'] },
+    { keys: ['C-['], type: 'keyToKey', toKeys: ['<Esc>'] },
+    { keys: ['<C-c>'], type: 'keyToKey', toKeys: ['<Esc>'] },
     { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'] },
     { keys: ['S'], type: 'keyToKey', toKeys: ['c', 'c'] },
-    { keys: ['Home'], type: 'keyToKey', toKeys: ['0'] },
-    { keys: ['End'], type: 'keyToKey', toKeys: ['$'] },
-    { keys: ['PageUp'], type: 'keyToKey', toKeys: ['Ctrl-b'] },
-    { keys: ['PageDown'], type: 'keyToKey', toKeys: ['Ctrl-f'] },
+    { keys: ['<Home>'], type: 'keyToKey', toKeys: ['0'] },
+    { keys: ['<End>'], type: 'keyToKey', toKeys: ['$'] },
+    { keys: ['<PageUp>'], type: 'keyToKey', toKeys: ['<C-b>'] },
+    { keys: ['<PageDown>'], type: 'keyToKey', toKeys: ['<C-f>'] },
     // Motions
     { keys: ['H'], type: 'motion',
         motion: 'moveToTopLine',
@@ -136,14 +136,14 @@
         motionArgs: { forward: false, toJumplist: true }},
     { keys: ['}'], type: 'motion', motion: 'moveByParagraph',
         motionArgs: { forward: true, toJumplist: true }},
-    { keys: ['Ctrl-f'], type: 'motion',
+    { keys: ['<C-f>'], type: 'motion',
         motion: 'moveByPage', motionArgs: { forward: true }},
-    { keys: ['Ctrl-b'], type: 'motion',
+    { keys: ['<C-b>'], type: 'motion',
         motion: 'moveByPage', motionArgs: { forward: false }},
-    { keys: ['Ctrl-d'], type: 'motion',
+    { keys: ['<C-d>'], type: 'motion',
         motion: 'moveByScroll',
         motionArgs: { forward: true, explicitRepeat: true }},
-    { keys: ['Ctrl-u'], type: 'motion',
+    { keys: ['<C-u>'], type: 'motion',
         motion: 'moveByScroll',
         motionArgs: { forward: false, explicitRepeat: true }},
     { keys: ['g', 'g'], type: 'motion',
@@ -237,9 +237,9 @@
     { keys: ['~'], type: 'operatorMotion', operator: 'swapcase',
         motion: 'moveByCharacters', motionArgs: { forward: true }},
     // Actions
-    { keys: ['Ctrl-i'], type: 'action', action: 'jumpListWalk',
+    { keys: ['<C-i>'], type: 'action', action: 'jumpListWalk',
         actionArgs: { forward: true }},
-    { keys: ['Ctrl-o'], type: 'action', action: 'jumpListWalk',
+    { keys: ['<C-o>'], type: 'action', action: 'jumpListWalk',
         actionArgs: { forward: false }},
     { keys: ['a'], type: 'action', action: 'enterInsertMode',
         actionArgs: { insertAt: 'charAfter' }},
@@ -264,7 +264,7 @@
     { keys: ['r', 'character'], type: 'action', action: 'replace' },
     { keys: ['R'], type: 'action', action: 'enterReplaceMode' },
     { keys: ['u'], type: 'action', action: 'undo' },
-    { keys: ['Ctrl-r'], type: 'action', action: 'redo' },
+    { keys: ['<C-r>'], type: 'action', action: 'redo' },
     { keys: ['m', 'character'], type: 'action', action: 'setMark' },
     { keys: ['\"', 'character'], type: 'action', action: 'setRegister' },
     { keys: ['z', 'z'], type: 'action', action: 'scrollToCursor',
@@ -274,7 +274,7 @@
         motion: 'moveToFirstNonWhiteSpaceCharacter' },
     { keys: ['z', 't'], type: 'action', action: 'scrollToCursor',
         actionArgs: { position: 'top' }},
-    { keys: ['z', 'Enter'], type: 'action', action: 'scrollToCursor',
+    { keys: ['z', '<CR>'], type: 'action', action: 'scrollToCursor',
         actionArgs: { position: 'top' },
         motion: 'moveToFirstNonWhiteSpaceCharacter' },
     { keys: ['z', '-'], type: 'action', action: 'scrollToCursor',
@@ -283,9 +283,9 @@
         actionArgs: { position: 'bottom' },
         motion: 'moveToFirstNonWhiteSpaceCharacter' },
     { keys: ['.'], type: 'action', action: 'repeatLastEdit' },
-    { keys: ['Ctrl-a'], type: 'action', action: 'incrementNumberToken',
+    { keys: ['<C-a>'], type: 'action', action: 'incrementNumberToken',
         actionArgs: {increase: true, backtrack: false}},
-    { keys: ['Ctrl-x'], type: 'action', action: 'incrementNumberToken',
+    { keys: ['<C-x>'], type: 'action', action: 'incrementNumberToken',
         actionArgs: {increase: false, backtrack: false}},
     // Text object motions
     { keys: ['a', 'character'], type: 'motion',
@@ -509,7 +509,7 @@
       handleKey: function(cm, key) {
         var command;
         var vim = getVimState(cm);
-        if (key == 'Esc') {
+        if (key == '<Esc>') {
           // Clear input state and get back to normal mode.
           vim.inputState = new InputState();
           if (vim.visualMode) {
@@ -717,10 +717,10 @@
                 inputState.selectedCharacter = keys[keys.length - 1];
                 if(inputState.selectedCharacter.length>1){
                   switch(inputState.selectedCharacter){
-                    case "Enter":
+                    case "<CR>":
                       inputState.selectedCharacter='\n';
                       break;
-                    case "Space":
+                    case "<Space>":
                       inputState.selectedCharacter=' ';
                       break;
                     default:
@@ -2930,41 +2930,14 @@
     // Converts a key string sequence of the form a<C-w>bd<Left> into Vim's
     // keymap representation.
     function parseKeyString(str) {
-      var idx = 0;
+      var key, match;
       var keys = [];
-      while (idx < str.length) {
-        if (str.charAt(idx) != '<') {
-          keys.push(str.charAt(idx));
-          idx++;
-          continue;
-        }
-        // Vim key notation here means desktop Vim key-notation.
-        // See :help key-notation in desktop Vim.
-        var vimKeyNotationStart = ++idx;
-        while (str.charAt(idx++) != '>') {}
-        var vimKeyNotation = str.substring(vimKeyNotationStart, idx - 1);
-        var mod='';
-        var match = (/^C-(.+)$/).exec(vimKeyNotation);
-        if (match) {
-          mod='Ctrl-';
-          vimKeyNotation=match[1];
-        }
-        var key;
-        switch (vimKeyNotation) {
-          case 'BS':
-            key = 'Backspace';
-            break;
-          case 'CR':
-            key = 'Enter';
-            break;
-          case 'Del':
-            key = 'Delete';
-            break;
-          default:
-            key = vimKeyNotation;
-            break;
-        }
-        keys.push(mod + key);
+      while (str) {
+        match = (/<\w+-.+?>|<\w+>|./).exec(str);
+        if(match === null)break;
+        key = match[0];
+        str = str.substring(match.index + key.length);
+        keys.push(key);
       }
       return keys;
     }
@@ -3148,8 +3121,11 @@
         }
         if (modifier) {
           // Vim will parse modifier+key combination as a single key.
-          key = modifier + '-' + key;
+          key = modifier.charAt(0) + '-' + key;
         }
+        var specialKey = ({Enter:'CR',Backspace:'BS',Delete:'Del'})[key];
+        key = specialKey ? specialKey : key;
+        key = key.length > 1 ? '<'+ key + '>' : key;
         vim.handleKey(cm, key);
       }
 
diff --git a/test/vim_test.js b/test/vim_test.js
index f2304b99cf..83bbec9ac6 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -190,32 +190,32 @@ function testJumplist(name, keys, endPos, startPos, dialog) {
     helpers.assertCursorAt(endPos);
   }, {value: jumplistScene});
 };
-testJumplist('jumplist_H', ['H', 'Ctrl-o'], [5,2], [5,2]);
-testJumplist('jumplist_M', ['M', 'Ctrl-o'], [2,2], [2,2]);
-testJumplist('jumplist_L', ['L', 'Ctrl-o'], [2,2], [2,2]);
-testJumplist('jumplist_[[', ['[', '[', 'Ctrl-o'], [5,2], [5,2]);
-testJumplist('jumplist_]]', [']', ']', 'Ctrl-o'], [2,2], [2,2]);
-testJumplist('jumplist_G', ['G', 'Ctrl-o'], [5,2], [5,2]);
-testJumplist('jumplist_gg', ['g', 'g', 'Ctrl-o'], [5,2], [5,2]);
-testJumplist('jumplist_%', ['%', 'Ctrl-o'], [1,5], [1,5]);
-testJumplist('jumplist_{', ['{', 'Ctrl-o'], [1,5], [1,5]);
-testJumplist('jumplist_}', ['}', 'Ctrl-o'], [1,5], [1,5]);
-testJumplist('jumplist_\'', ['m', 'a', 'h', '\'', 'a', 'h', 'Ctrl-i'], [1,5], [1,5]);
-testJumplist('jumplist_`', ['m', 'a', 'h', '`', 'a', 'h', 'Ctrl-i'], [1,5], [1,5]);
-testJumplist('jumplist_*_cachedCursor', ['*', 'Ctrl-o'], [1,3], [1,3]);
-testJumplist('jumplist_#_cachedCursor', ['#', 'Ctrl-o'], [1,3], [1,3]);
-testJumplist('jumplist_n', ['#', 'n', 'Ctrl-o'], [1,1], [2,3]);
-testJumplist('jumplist_N', ['#', 'N', 'Ctrl-o'], [1,1], [2,3]);
-testJumplist('jumplist_repeat_<c-o>', ['*', '*', '*', '3', 'Ctrl-o'], [2,3], [2,3]);
-testJumplist('jumplist_repeat_<c-i>', ['*', '*', '*', '3', 'Ctrl-o', '2', 'Ctrl-i'], [5,0], [2,3]);
-testJumplist('jumplist_repeated_motion', ['3', '*', 'Ctrl-o'], [2,3], [2,3]);
-testJumplist('jumplist_/', ['/', 'Ctrl-o'], [2,3], [2,3], 'dialog');
-testJumplist('jumplist_?', ['?', 'Ctrl-o'], [2,3], [2,3], 'dialog');
+testJumplist('jumplist_H', ['H', '<C-o>'], [5,2], [5,2]);
+testJumplist('jumplist_M', ['M', '<C-o>'], [2,2], [2,2]);
+testJumplist('jumplist_L', ['L', '<C-o>'], [2,2], [2,2]);
+testJumplist('jumplist_[[', ['[', '[', '<C-o>'], [5,2], [5,2]);
+testJumplist('jumplist_]]', [']', ']', '<C-o>'], [2,2], [2,2]);
+testJumplist('jumplist_G', ['G', '<C-o>'], [5,2], [5,2]);
+testJumplist('jumplist_gg', ['g', 'g', '<C-o>'], [5,2], [5,2]);
+testJumplist('jumplist_%', ['%', '<C-o>'], [1,5], [1,5]);
+testJumplist('jumplist_{', ['{', '<C-o>'], [1,5], [1,5]);
+testJumplist('jumplist_}', ['}', '<C-o>'], [1,5], [1,5]);
+testJumplist('jumplist_\'', ['m', 'a', 'h', '\'', 'a', 'h', '<C-i>'], [1,5], [1,5]);
+testJumplist('jumplist_`', ['m', 'a', 'h', '`', 'a', 'h', '<C-i>'], [1,5], [1,5]);
+testJumplist('jumplist_*_cachedCursor', ['*', '<C-o>'], [1,3], [1,3]);
+testJumplist('jumplist_#_cachedCursor', ['#', '<C-o>'], [1,3], [1,3]);
+testJumplist('jumplist_n', ['#', 'n', '<C-o>'], [1,1], [2,3]);
+testJumplist('jumplist_N', ['#', 'N', '<C-o>'], [1,1], [2,3]);
+testJumplist('jumplist_repeat_<c-o>', ['*', '*', '*', '3', '<C-o>'], [2,3], [2,3]);
+testJumplist('jumplist_repeat_<c-i>', ['*', '*', '*', '3', '<C-o>', '2', '<C-i>'], [5,0], [2,3]);
+testJumplist('jumplist_repeated_motion', ['3', '*', '<C-o>'], [2,3], [2,3]);
+testJumplist('jumplist_/', ['/', '<C-o>'], [2,3], [2,3], 'dialog');
+testJumplist('jumplist_?', ['?', '<C-o>'], [2,3], [2,3], 'dialog');
 testJumplist('jumplist_skip_delted_mark<c-o>',
-             ['*', 'n', 'n', 'k', 'd', 'k', 'Ctrl-o', 'Ctrl-o', 'Ctrl-o'],
+             ['*', 'n', 'n', 'k', 'd', 'k', '<C-o>', '<C-o>', '<C-o>'],
              [0,2], [0,2]);
 testJumplist('jumplist_skip_delted_mark<c-i>',
-             ['*', 'n', 'n', 'k', 'd', 'k', 'Ctrl-o', 'Ctrl-i', 'Ctrl-i'],
+             ['*', 'n', 'n', 'k', 'd', 'k', '<C-o>', '<C-i>', '<C-i>'],
              [1,0], [0,2]);
 /**
  * @param name Name of the test
@@ -970,22 +970,22 @@ testVim('Y', function(cm, vim, helpers) {
 // Action tests
 testVim('ctrl-a', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
-  helpers.doKeys('Ctrl-a');
+  helpers.doKeys('<C-a>');
   eq('-9', cm.getValue());
   helpers.assertCursorAt(0, 1);
-  helpers.doKeys('2','Ctrl-a');
+  helpers.doKeys('2','<C-a>');
   eq('-7', cm.getValue());
 }, {value: '-10'});
 testVim('ctrl-x', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
-  helpers.doKeys('Ctrl-x');
+  helpers.doKeys('<C-x>');
   eq('-1', cm.getValue());
   helpers.assertCursorAt(0, 1);
-  helpers.doKeys('2','Ctrl-x');
+  helpers.doKeys('2','<C-x>');
   eq('-3', cm.getValue());
 }, {value: '0'});
-testVim('Ctrl-x/Ctrl-a search forward', function(cm, vim, helpers) {
-  ['Ctrl-x', 'Ctrl-a'].forEach(function(key) {
+testVim('<C-x>/<C-a> search forward', function(cm, vim, helpers) {
+  ['<C-x>', '<C-a>'].forEach(function(key) {
     cm.setCursor(0, 0);
     helpers.doKeys(key);
     helpers.assertCursorAt(0, 5);
@@ -1103,7 +1103,7 @@ testVim('r', function(cm, vim, helpers) {
   eq('wuuuet\nanother', cm.getValue(),'3r failed');
   helpers.assertCursorAt(0, 3);
   cm.setCursor(0, 4);
-  helpers.doKeys('v', 'j', 'h', 'r', 'Space');
+  helpers.doKeys('v', 'j', 'h', 'r', '<Space>');
   eq('wuuu  \n    her', cm.getValue(),'Replacing selection by space-characters failed');
 }, { value: 'wordet\nanother' });
 testVim('R', function(cm, vim, helpers) {
@@ -2001,7 +2001,7 @@ testVim('ex_api_test', function(cm, vim, helpers) {
   helpers.doEx(':ext to');
   eq(val,'to','Defining ex-command failed');
   CodeMirror.Vim.map('<C-CR><Space>',':ext');
-  helpers.doKeys('Ctrl-Enter','Space');
+  helpers.doKeys('<C-CR>','<Space>');
   is(res,'Mapping to key failed');
 });
 // For now, this test needs to be last because it messes up : for future tests.

From 9a8282fd1d310b3bf61d101b230b4766a933688c Mon Sep 17 00:00:00 2001
From: Alex Piggott <apiggott@ikanow.com>
Date: Wed, 15 May 2013 13:14:57 +0200
Subject: [PATCH 0051/4742] [brace-fold addon] Also handle square brackets

---
 addon/fold/brace-fold.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index dc78883f35..efdffb877c 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -3,17 +3,23 @@ CodeMirror.braceRangeFinder = function(cm, start) {
   var at = lineText.length, startChar, tokenType;
   for (; at > 0;) {
     var found = lineText.lastIndexOf("{", at);
-    if (found < start.ch) break;
+    var startToken = '{', endToken = '}';
+    if (found < start.ch) {
+      found = lineText.lastIndexOf("[", at);
+      if (found < start.ch) break;
+      startToken = '['; endToken = ']';
+    }
+
     tokenType = cm.getTokenAt(CodeMirror.Pos(line, found + 1)).type;
     if (!/^(comment|string)/.test(tokenType)) { startChar = found; break; }
     at = found - 1;
   }
-  if (startChar == null || lineText.lastIndexOf("}") > startChar) return;
+  if (startChar == null || lineText.lastIndexOf(startToken) > startChar) return;
   var count = 1, lastLine = cm.lineCount(), end, endCh;
   outer: for (var i = line + 1; i < lastLine; ++i) {
     var text = cm.getLine(i), pos = 0;
     for (;;) {
-      var nextOpen = text.indexOf("{", pos), nextClose = text.indexOf("}", pos);
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
       if (nextOpen < 0) nextOpen = text.length;
       if (nextClose < 0) nextClose = text.length;
       pos = Math.min(nextOpen, nextClose);

From 6b7e2953febaba158e6128b7a3d07b7b02c88636 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Mon, 13 May 2013 19:12:09 +0400
Subject: [PATCH 0052/4742] mark-selection addon improvement

Addresses issue #1484 and speeds up mark-selection add-on by
maintaining text selection coverage with small chunks of text marks.
---
 addon/selection/mark-selection.js | 135 +++++++++++++++++++++++++++---
 1 file changed, 125 insertions(+), 10 deletions(-)

diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index d7ff30c9a9..80eb9def0f 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -13,22 +13,137 @@
       cm.on("cursorActivity", updateSelectedText);
     } else if (!val && prev) {
       cm.off("cursorActivity", updateSelectedText);
-      clearSelectedText(cm);
-      delete cm._selectionMark;
+      removeTextMarks(cm);
     }
   });
 
-  function clearSelectedText(cm) {
-    if (cm._selectionMark) cm._selectionMark.clear();
+  function cmp(pos1, pos2) {
+    return pos1.line !== pos2.line ? pos1.line - pos2.line : pos1.ch - pos2.ch;
+  }
+
+  function removeTextMarks(cm) {
+    if (cm._selectionMarks) {
+      for(var i = 0; i < cm._selectionMarks.length; ++i) {
+        cm._selectionMarks[i].clear();
+      }
+    }
+    cm._selectionMarks = null;
+  }
+
+  function markText(cm, start, end) {
+    if (cmp(start, end) === 0)
+      return;
+    var opt = {className: "CodeMirror-selectedtext"};
+    cm._selectionMarks.push(cmp(start, end) <= 0 ? cm.markText(start, end, opt) : cm.markText(end, start, opt));
+  }
+
+  var CHUNK_SIZE = 8;
+  var Pos = CodeMirror.Pos;
+
+  function coverRange(cm, anchor, head) {
+    if (Math.abs(anchor.line - head.line) < CHUNK_SIZE) {
+      markText(cm, anchor, head);
+      return;
+    }
+    if (head.line > anchor.line) {
+      markText(cm, anchor, Pos(anchor.line + CHUNK_SIZE, 0));
+      for(var line = anchor.line + CHUNK_SIZE; line + CHUNK_SIZE < head.line; line += CHUNK_SIZE)
+        markText(cm, Pos(line, 0), Pos(line + CHUNK_SIZE, 0));
+      markText(cm, Pos(line, 0), head);
+    } else {
+      markText(cm, anchor, Pos(anchor.line - CHUNK_SIZE + 1, 0));
+      for(var line = anchor.line - CHUNK_SIZE + 1; line - CHUNK_SIZE > head.line; line -= CHUNK_SIZE)
+        markText(cm, Pos(line, 0), Pos(line - CHUNK_SIZE, 0));
+      markText(cm, Pos(line, 0), head);
+    }
+  }
+
+  function createInitialCoverage(cm) {
+    var anchor = cm.getCursor("anchor");
+    var head = cm.getCursor("head");
+    cm._selectionMarks = [];
+    coverRange(cm, anchor, head);
+  }
+
+  function getCoveredRange(cm) {
+    var first = cm._selectionMarks[0].find();
+    var last = cm._selectionMarks[cm._selectionMarks.length - 1].find();
+    if (!first || !last)
+        return null;
+    var reversed = cmp(first.from, last.to) >= 0;
+    return reversed ? {anchor: first.to, head: last.from, reversed: reversed} : {anchor: first.from, head: last.to, reversed: reversed};
+  }
+
+  function incrementalCoverageUpdate(cm) {
+    var anchor = cm.getCursor("anchor");
+    var head = cm.getCursor("head");
+    var reversed = cmp(head, anchor) < 0;
+    var lastSelection = getCoveredRange(cm);
+    // if the anchor of selection moved or selection changed direction - remove everything and construct from scratch.
+    if (!lastSelection || cmp(anchor, lastSelection.anchor) !== 0 || (reversed ^ lastSelection.reversed)) {
+      removeTextMarks(cm);
+      createInitialCoverage(cm);
+      return;
+    }
+    // fast return if nothing changed
+    if (cmp(head, lastSelection.head) === 0)
+      return;
+
+    // if only column changed then update last text mark
+    if (head.line === lastSelection.head.line) {
+      var lastMark = cm._selectionMarks.pop();
+      var position = lastMark.find();
+      lastMark.clear();
+      markText(cm, reversed ? position.to : position.from, head);
+      return;
+    }
+
+    if (!reversed) {
+      // if selection shrinks
+      if (head.line < lastSelection.head.line) {
+        var textMark,
+          position;
+        do {
+          textMark = cm._selectionMarks.pop();
+          position = textMark.find();
+          textMark.clear();
+        } while (cm._selectionMarks.length && position.from.line >= head.line);
+        markText(cm, position.from, head);
+      } else {
+        var textMark = cm._selectionMarks.pop();
+        var position = textMark.find();
+        textMark.clear();
+        coverRange(cm, position.from, head);
+      }
+    } else {
+      // selection getting smaller
+      if (head.line > lastSelection.head.line) {
+        var textMark,
+          position;
+        do {
+          textMark = cm._selectionMarks.pop();
+          position = textMark.find();
+          textMark.clear();
+        } while (cm._selectionMarks.length && position.to.line <= head.line);
+        markText(cm, position.to, head);
+      } else {
+        var textMark = cm._selectionMarks.pop();
+        var position = textMark.find();
+        coverRange(cm, position.to, head);
+        textMark.clear();
+      }
+    }
   }
 
   function updateSelectedText(cm) {
-    clearSelectedText(cm);
+    cm.operation(function() {
+        if (!cm.somethingSelected())
+          return removeTextMarks(cm);
+
+        if (!cm._selectionMarks || !cm._selectionMarks.length)
+          return createInitialCoverage(cm);
 
-    if (cm.somethingSelected())
-      cm._selectionMark = cm.markText(cm.getCursor("start"), cm.getCursor("end"),
-                                      {className: "CodeMirror-selectedtext"});
-    else
-      cm._selectionMark = null;
+        incrementalCoverageUpdate(cm);
+    });
   }
 })();

From 5a5f9f4e25b1a88de413fbca295881beacd5b82a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 May 2013 11:32:46 +0200
Subject: [PATCH 0053/4742] [mark-selection addon] Simplify

Issue #1523
---
 addon/selection/mark-selection.js | 183 ++++++++++++------------------
 1 file changed, 71 insertions(+), 112 deletions(-)

diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index 80eb9def0f..c97776e492 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -1,7 +1,8 @@
 // Because sometimes you need to mark the selected *text*.
 //
 // Adds an option 'styleSelectedText' which, when enabled, gives
-// selected text the CSS class "CodeMirror-selectedtext".
+// selected text the CSS class given as option value, or
+// "CodeMirror-selectedtext" when the value is not a string.
 
 (function() {
   "use strict";
@@ -9,141 +10,99 @@
   CodeMirror.defineOption("styleSelectedText", false, function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
-      updateSelectedText(cm);
-      cm.on("cursorActivity", updateSelectedText);
+      cm.state.markedSelection = [];
+      cm.state.markedSelectionStyle = typeof val == "string" ? val : "CodeMirror-selectedtext";
+      reset(cm);
+      cm.on("cursorActivity", onCursorActivity);
+      cm.on("change", onChange);
     } else if (!val && prev) {
-      cm.off("cursorActivity", updateSelectedText);
-      removeTextMarks(cm);
+      cm.off("cursorActivity", onCursorActivity);
+      cm.off("change", onChange);
+      clear(cm);
+      cm.state.markedSelection = cm.state.markedSelectionStyle = null;
     }
   });
 
-  function cmp(pos1, pos2) {
-    return pos1.line !== pos2.line ? pos1.line - pos2.line : pos1.ch - pos2.ch;
-  }
-
-  function removeTextMarks(cm) {
-    if (cm._selectionMarks) {
-      for(var i = 0; i < cm._selectionMarks.length; ++i) {
-        cm._selectionMarks[i].clear();
-      }
-    }
-    cm._selectionMarks = null;
+  function onCursorActivity(cm) {
+    cm.operation(function() { update(cm); });
   }
 
-  function markText(cm, start, end) {
-    if (cmp(start, end) === 0)
-      return;
-    var opt = {className: "CodeMirror-selectedtext"};
-    cm._selectionMarks.push(cmp(start, end) <= 0 ? cm.markText(start, end, opt) : cm.markText(end, start, opt));
+  function onChange(cm) {
+    if (cm.state.markedSelection.length)
+      cm.operation(function() { clear(cm); });
   }
 
   var CHUNK_SIZE = 8;
   var Pos = CodeMirror.Pos;
 
-  function coverRange(cm, anchor, head) {
-    if (Math.abs(anchor.line - head.line) < CHUNK_SIZE) {
-      markText(cm, anchor, head);
-      return;
-    }
-    if (head.line > anchor.line) {
-      markText(cm, anchor, Pos(anchor.line + CHUNK_SIZE, 0));
-      for(var line = anchor.line + CHUNK_SIZE; line + CHUNK_SIZE < head.line; line += CHUNK_SIZE)
-        markText(cm, Pos(line, 0), Pos(line + CHUNK_SIZE, 0));
-      markText(cm, Pos(line, 0), head);
-    } else {
-      markText(cm, anchor, Pos(anchor.line - CHUNK_SIZE + 1, 0));
-      for(var line = anchor.line - CHUNK_SIZE + 1; line - CHUNK_SIZE > head.line; line -= CHUNK_SIZE)
-        markText(cm, Pos(line, 0), Pos(line - CHUNK_SIZE, 0));
-      markText(cm, Pos(line, 0), head);
+  function cmp(pos1, pos2) {
+    return pos1.line - pos2.line || pos1.ch - pos2.ch;
+  }
+
+  function coverRange(cm, from, to, addAt) {
+    if (cmp(from, to) == 0) return;
+    var array = cm.state.markedSelection;
+    var cls = cm.state.markedSelectionStyle;
+    for (var line = from.line;;) {
+      var start = line == from.line ? from : Pos(line, 0);
+      var endLine = line + CHUNK_SIZE, atEnd = endLine >= to.line;
+      var end = atEnd ? to : Pos(endLine, 0);
+      var mark = cm.markText(start, end, {className: cls});
+      if (addAt == null) array.push(mark);
+      else array.splice(addAt++, 0, mark);
+      if (atEnd) break;
+      line = endLine;
     }
   }
 
-  function createInitialCoverage(cm) {
-    var anchor = cm.getCursor("anchor");
-    var head = cm.getCursor("head");
-    cm._selectionMarks = [];
-    coverRange(cm, anchor, head);
+  function clear(cm) {
+    var array = cm.state.markedSelection;
+    for (var i = 0; i < array.length; ++i) array[i].clear();
+    array.length = 0;
   }
 
-  function getCoveredRange(cm) {
-    var first = cm._selectionMarks[0].find();
-    var last = cm._selectionMarks[cm._selectionMarks.length - 1].find();
-    if (!first || !last)
-        return null;
-    var reversed = cmp(first.from, last.to) >= 0;
-    return reversed ? {anchor: first.to, head: last.from, reversed: reversed} : {anchor: first.from, head: last.to, reversed: reversed};
+  function reset(cm) {
+    clear(cm);
+    var from = cm.getCursor("start"), to = cm.getCursor("end");
+    coverRange(cm, from, to);
   }
 
-  function incrementalCoverageUpdate(cm) {
-    var anchor = cm.getCursor("anchor");
-    var head = cm.getCursor("head");
-    var reversed = cmp(head, anchor) < 0;
-    var lastSelection = getCoveredRange(cm);
-    // if the anchor of selection moved or selection changed direction - remove everything and construct from scratch.
-    if (!lastSelection || cmp(anchor, lastSelection.anchor) !== 0 || (reversed ^ lastSelection.reversed)) {
-      removeTextMarks(cm);
-      createInitialCoverage(cm);
-      return;
-    }
-    // fast return if nothing changed
-    if (cmp(head, lastSelection.head) === 0)
-      return;
+  function update(cm) {
+    var from = cm.getCursor("start"), to = cm.getCursor("end");
+    if (cmp(from, to) == 0) return clear(cm);
 
-    // if only column changed then update last text mark
-    if (head.line === lastSelection.head.line) {
-      var lastMark = cm._selectionMarks.pop();
-      var position = lastMark.find();
-      lastMark.clear();
-      markText(cm, reversed ? position.to : position.from, head);
-      return;
-    }
+    var array = cm.state.markedSelection;
+    if (!array.length) return coverRange(cm, from, to);
+
+    var coverStart = array[0].find(), coverEnd = array[array.length - 1].find();
+    if (!coverStart || !coverEnd || to.line - from.line < CHUNK_SIZE ||
+        cmp(from, coverEnd.to) >= 0 || cmp(to, coverStart.from) <= 0)
+      return reset(cm);
 
-    if (!reversed) {
-      // if selection shrinks
-      if (head.line < lastSelection.head.line) {
-        var textMark,
-          position;
-        do {
-          textMark = cm._selectionMarks.pop();
-          position = textMark.find();
-          textMark.clear();
-        } while (cm._selectionMarks.length && position.from.line >= head.line);
-        markText(cm, position.from, head);
+    while (cmp(from, coverStart.from) > 0) {
+      array.shift().clear();
+      coverStart = array[0].find();
+    }
+    if (cmp(from, coverStart.from) < 0) {
+      if (coverStart.to.line - from.line < CHUNK_SIZE) {
+        array.shift().clear();
+        coverRange(cm, from, coverStart.to, 0);
       } else {
-        var textMark = cm._selectionMarks.pop();
-        var position = textMark.find();
-        textMark.clear();
-        coverRange(cm, position.from, head);
+        coverRange(cm, from, coverStart.from, 0);
       }
-    } else {
-      // selection getting smaller
-      if (head.line > lastSelection.head.line) {
-        var textMark,
-          position;
-        do {
-          textMark = cm._selectionMarks.pop();
-          position = textMark.find();
-          textMark.clear();
-        } while (cm._selectionMarks.length && position.to.line <= head.line);
-        markText(cm, position.to, head);
+    }
+
+    while (cmp(to, coverEnd.to) < 0) {
+      array.pop().clear();
+      coverEnd = array[array.length - 1].find();
+    }
+    if (cmp(to, coverEnd.to) > 0) {
+      if (to.line - coverEnd.from.line < CHUNK_SIZE) {
+        array.pop().clear();
+        coverRange(cm, coverEnd.from, to);
       } else {
-        var textMark = cm._selectionMarks.pop();
-        var position = textMark.find();
-        coverRange(cm, position.to, head);
-        textMark.clear();
+        coverRange(cm, coverEnd.to, to);
       }
     }
   }
-
-  function updateSelectedText(cm) {
-    cm.operation(function() {
-        if (!cm.somethingSelected())
-          return removeTextMarks(cm);
-
-        if (!cm._selectionMarks || !cm._selectionMarks.length)
-          return createInitialCoverage(cm);
-
-        incrementalCoverageUpdate(cm);
-    });
-  }
 })();

From eccea9beaad51a34006430b446892d9a5333e543 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 May 2013 11:39:14 +0200
Subject: [PATCH 0054/4742] Move addon state objects into cm.state

Rather than polluting the top-level of the editor object
---
 addon/display/placeholder.js      |  8 ++++----
 addon/lint/lint.js                | 14 +++++++-------
 addon/search/match-highlighter.js |  8 ++++----
 addon/search/search.js            |  2 +-
 addon/selection/active-line.js    | 12 ++++++------
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index f85f2df127..18f9dff3ab 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -19,14 +19,14 @@
   });
 
   function clearPlaceholder(cm) {
-    if (cm._placeholder) {
-      cm._placeholder.parentNode.removeChild(cm._placeholder);
-      cm._placeholder = null;
+    if (cm.state.placeholder) {
+      cm.state.placeholder.parentNode.removeChild(cm.state.placeholder);
+      cm.state.placeholder = null;
     }
   }
   function setPlaceholder(cm) {
     clearPlaceholder(cm);
-    var elt = cm._placeholder = document.createElement("pre");
+    var elt = cm.state.placeholder = document.createElement("pre");
     elt.style.cssText = "height: 0; overflow: visible";
     elt.className = "CodeMirror-placeholder";
     elt.appendChild(document.createTextNode(cm.getOption("placeholder")));
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 29fd8d9c3c..2e7cea1925 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -59,7 +59,7 @@ CodeMirror.validate = (function() {
   }
 
   function clearMarks(cm) {
-    var state = cm._lintState;
+    var state = cm.state.lint;
     if (state.hasGutter) cm.clearGutter(GUTTER_ID);
     for (var i = 0; i < state.marked.length; ++i)
       state.marked[i].clear();
@@ -105,7 +105,7 @@ CodeMirror.validate = (function() {
   }
 
   function startLinting(cm) {
-    var state = cm._lintState, options = state.options;
+    var state = cm.state.lint, options = state.options;
     if (options.async)
       options.getAnnotations(cm, updateLinting, options);
     else
@@ -114,7 +114,7 @@ CodeMirror.validate = (function() {
 
   function updateLinting(cm, annotationsNotSorted) {
     clearMarks(cm);
-    var state = cm._lintState, options = state.options;
+    var state = cm.state.lint, options = state.options;
 
     var annotations = groupByLine(annotationsNotSorted);
 
@@ -148,7 +148,7 @@ CodeMirror.validate = (function() {
   }
 
   function onChange(cm) {
-    var state = cm._lintState;
+    var state = cm.state.lint;
     clearTimeout(state.timeout);
     state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
   }
@@ -179,14 +179,14 @@ CodeMirror.validate = (function() {
     if (old && old != CodeMirror.Init) {
       clearMarks(cm);
       cm.off("change", onChange);
-      CodeMirror.off(cm.getWrapperElement(), "mouseover", cm._lintState.onMouseOver);
-      delete cm._lintState;
+      CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
+      delete cm.state.lint;
     }
 
     if (val) {
       var gutters = cm.getOption("gutters"), hasLintGutter = false;
       for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
-      var state = cm._lintState = new LintState(cm, parseOptions(val), hasLintGutter);
+      var state = cm.state.lint = new LintState(cm, parseOptions(val), hasLintGutter);
       cm.on("change", onChange);
       if (state.options.tooltips != false)
         CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 14c1dab5b6..0800f4c638 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -24,19 +24,19 @@
   CodeMirror.defineOption("highlightSelectionMatches", false, function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
-      cm._matchHighlightState = new State(val);
+      cm.state.matchHighlighter = new State(val);
       cm.on("cursorActivity", highlightMatches);
     } else if (!val && prev) {
-      var over = cm._matchHighlightState.overlay;
+      var over = cm.state.matchHighlighter.overlay;
       if (over) cm.removeOverlay(over);
-      cm._matchHighlightState = null;
+      cm.state.matchHighlighter = null;
       cm.off("cursorActivity", highlightMatches);
     }
   });
 
   function highlightMatches(cm) {
     cm.operation(function() {
-      var state = cm._matchHighlightState;
+      var state = cm.state.matchHighlighter;
       if (state.overlay) {
         cm.removeOverlay(state.overlay);
         state.overlay = null;
diff --git a/addon/search/search.js b/addon/search/search.js
index 6331b86555..eb9ab8bede 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -27,7 +27,7 @@
     this.overlay = null;
   }
   function getSearchState(cm) {
-    return cm._searchState || (cm._searchState = new SearchState());
+    return cm.state.search || (cm.state.search = new SearchState());
   }
   function getSearchCursor(cm, query, pos) {
     // Heuristic: if the query string is all lowercase, do a case insensitive search.
diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index 211de0fefd..65fab6f162 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -17,23 +17,23 @@
     } else if (!val && prev) {
       cm.off("cursorActivity", updateActiveLine);
       clearActiveLine(cm);
-      delete cm._activeLine;
+      delete cm.state.activeLine;
     }
   });
 
   function clearActiveLine(cm) {
-    if ("_activeLine" in cm) {
-      cm.removeLineClass(cm._activeLine, "wrap", WRAP_CLASS);
-      cm.removeLineClass(cm._activeLine, "background", BACK_CLASS);
+    if ("activeLine" in cm.state) {
+      cm.removeLineClass(cm.state.activeLine, "wrap", WRAP_CLASS);
+      cm.removeLineClass(cm.state.activeLine, "background", BACK_CLASS);
     }
   }
 
   function updateActiveLine(cm) {
     var line = cm.getLineHandle(cm.getCursor().line);
-    if (cm._activeLine == line) return;
+    if (cm.state.activeLine == line) return;
     clearActiveLine(cm);
     cm.addLineClass(line, "wrap", WRAP_CLASS);
     cm.addLineClass(line, "background", BACK_CLASS);
-    cm._activeLine = line;
+    cm.state.activeLine = line;
   }
 })();

From 6286d9db04d604a12f660c9b3fc0ce66929abb6b Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Tue, 14 May 2013 00:41:49 +0200
Subject: [PATCH 0055/4742] [vim keymap] Add macro support for normal mode

[vim keymap] Remove duplicated @ logic

[vim keymap] Remove q swapping

[vim keymap] Recover mis-deleted line from 3-way merge conflict

[vim keymap] "q" repeatable by count

[vim keymap] Remove deprecated lookup tables

[vim keymap] Robustify if condition

[vim keymap] Revise logKey logic

[vim keymap] IE8 compatible forEach

[vim keymap] Transparentize hidden states

[vim keymap] Minor fixup

[vim keymap] Eliminate globals/Remove unused function/Add tests
---
 keymap/vim.js    | 101 ++++++++++++++++++++++++++++++++++++++++++++++-
 test/index.html  |   1 +
 test/vim_test.js |  16 ++++++++
 3 files changed, 117 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9c0197faaa..fd8167e098 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -262,6 +262,8 @@
     { keys: ['P'], type: 'action', action: 'paste',
         actionArgs: { after: false }},
     { keys: ['r', 'character'], type: 'action', action: 'replace' },
+    { keys: ['@', 'character'], type: 'action', action: 'replayMacro' },
+    { keys: ['q', 'character'], type: 'action', action: 'enterMacroRecordMode' },
     { keys: ['R'], type: 'action', action: 'enterReplaceMode' },
     { keys: ['u'], type: 'action', action: 'undo' },
     { keys: ['<C-r>'], type: 'action', action: 'redo' },
@@ -411,7 +413,7 @@
         }
         var mark = buffer[(size + pointer) % size];
         // skip marks that are temporarily removed from text buffer
-        if (!mark.find()) {
+        if (mark && !mark.find()) {
           var inc = offset > 0 ? 1 : -1;
           var newCur;
           var oldCur = cm.getCursor();
@@ -434,6 +436,26 @@
         move: move
       };
     };
+
+    var createMacroState = function() {
+      return {
+        macroKeyBuffer: [],
+        latestRegister: undefined,
+        enteredMacroMode: undefined,
+        isMacroPlaying: false,
+        toggle: function(cm, registerName) {
+          if (this.enteredMacroMode) { //onExit
+            this.enteredMacroMode(); // close dialog
+            this.enteredMacroMode = undefined;
+          } else { //onEnter
+            this.latestRegister = registerName;
+            this.enteredMacroMode = cm.openDialog(
+              '(recording)['+registerName+']', null, {bottom:true});
+          }
+        }
+      }
+    }
+
     // Global Vim state. Call getVimGlobalState to get and initialize.
     var vimGlobalState;
     function getVimGlobalState() {
@@ -444,6 +466,7 @@
           // Whether we are searching backwards.
           searchIsReversed: false,
           jumpList: createCircularJumpList(),
+          macroModeState: createMacroState(),
           // Recording latest f, t, F or T motion command.
           lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
           registerController: new RegisterController({})
@@ -509,6 +532,14 @@
       handleKey: function(cm, key) {
         var command;
         var vim = getVimState(cm);
+        var macroModeState = getVimGlobalState().macroModeState;
+        if (macroModeState.enteredMacroMode) {
+          if (key == 'q') {
+            actions.exitMacroRecordMode();
+            return;
+          }
+          logKey(macroModeState, key);
+        }
         if (key == '<Esc>') {
           // Clear input state and get back to normal mode.
           vim.inputState = new InputState();
@@ -671,6 +702,9 @@
           this.unamedRegister.set(text, linewise);
         }
       },
+      setRegisterText: function(name, text, linewise) {
+        this.getRegister(name).set(text, linewise);
+      },
       // Gets the register named @name.  If one of @name doesn't already exist,
       // create it.  If @name is invalid, return the unamedRegister.
       getRegister: function(name) {
@@ -1521,6 +1555,30 @@
         // view into the right place.
         cm.scrollIntoView();
       },
+      replayMacro: function(cm, actionArgs) {
+        var registerName = actionArgs.selectedCharacter;
+        var repeat = actionArgs.repeat;
+        var macroModeState = getVimGlobalState().macroModeState;
+        if (registerName == '@') {
+          registerName = macroModeState.latestRegister;
+        }
+        var keyBuffer = parseRegisterToKeyBuffer(macroModeState, registerName);
+        while(repeat--){
+          executeMacroKeyBuffer(cm, macroModeState, keyBuffer);
+        }
+      },
+      exitMacroRecordMode: function(cm, actionArgs) {
+        var macroModeState = getVimGlobalState().macroModeState;
+        macroModeState.toggle();
+        parseKeyBufferToRegister(macroModeState.latestRegister,
+                                 macroModeState.macroKeyBuffer);
+      },
+      enterMacroRecordMode: function(cm, actionArgs) {
+        var macroModeState = getVimGlobalState().macroModeState;
+        var registerName = actionArgs.selectedCharacter;
+        macroModeState.toggle(cm, registerName);
+        emptyMacroKeyBuffer(macroModeState);
+      },
       enterInsertMode: function(cm, actionArgs) {
         var insertAt = (actionArgs) ? actionArgs.insertAt : null;
         if (insertAt == 'eol') {
@@ -3190,6 +3248,47 @@
       fallthrough: ['default']
     };
 
+    function parseRegisterToKeyBuffer(macroModeState, registerName) {
+      var match, key;
+      var register = getVimGlobalState().registerController.getRegister(registerName);
+      var text = register.toString();
+      var macroKeyBuffer = macroModeState.macroKeyBuffer;
+      emptyMacroKeyBuffer(macroModeState);
+      do {
+        match = text.match(/<\w+-.+>|<\w+>|.|\n/);
+        if(match === null)break;
+        key = match[0];
+        text = text.substring(match.index + key.length);
+        macroKeyBuffer.push(key);
+      } while (text);
+      return macroKeyBuffer;
+    }
+
+    function parseKeyBufferToRegister(registerName, keyBuffer) {
+      var text = keyBuffer.join('');
+      getVimGlobalState().registerController.setRegisterText(registerName, text);
+    }
+
+    function emptyMacroKeyBuffer(macroModeState) {
+      if(macroModeState.isMacroPlaying)return;
+      var macroKeyBuffer = macroModeState.macroKeyBuffer;
+      macroKeyBuffer.length = 0;
+    }
+
+    function executeMacroKeyBuffer(cm, macroModeState, keyBuffer) {
+      macroModeState.isMacroPlaying = true;
+      for (var i = 0, len = keyBuffer.length; i < len; i++) {
+        CodeMirror.Vim.handleKey(cm, keyBuffer[i]);
+      };
+      macroModeState.isMacroPlaying = false;
+    }
+
+    function logKey(macroModeState, key) {
+      if(macroModeState.isMacroPlaying)return;
+      var macroKeyBuffer = macroModeState.macroKeyBuffer;
+      macroKeyBuffer.push(key);
+    }
+
     function exitReplaceMode(cm) {
       cm.toggleOverwrite();
       cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
diff --git a/test/index.html b/test/index.html
index 816cef5948..3eb691576a 100644
--- a/test/index.html
+++ b/test/index.html
@@ -9,6 +9,7 @@
     <script src="../lib/codemirror.js"></script>
     <script src="../addon/mode/overlay.js"></script>
     <script src="../addon/search/searchcursor.js"></script>
+    <script src="../addon/dialog/dialog.js"></script>
     <script src="../addon/comment/comment.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
     <script src="../mode/xml/xml.js"></script>
diff --git a/test/vim_test.js b/test/vim_test.js
index 83bbec9ac6..ff376c6dc2 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -169,6 +169,22 @@ function testVim(name, run, opts, expectedFail) {
     }
   }, expectedFail);
 };
+testVim('qq@q', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'q', 'l', 'l', 'q');
+  helpers.assertCursorAt(0,2);
+  helpers.doKeys('@', 'q');
+  helpers.assertCursorAt(0,4);
+}, { value: '            '});
+testVim('@@', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'q', 'l', 'l', 'q');
+  helpers.assertCursorAt(0,2);
+  helpers.doKeys('@', 'q');
+  helpers.assertCursorAt(0,4);
+  helpers.doKeys('@', '@');
+  helpers.assertCursorAt(0,6);
+}, { value: '            '});
 var jumplistScene = ''+
   'word\n'+
   '(word)\n'+

From 4206fd03bb0c6c7a4f0eea002d777e3839ca420e Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Thu, 16 May 2013 11:00:25 +0200
Subject: [PATCH 0056/4742] [vim keymap] Fix zz/zt/zb

---
 keymap/vim.js    | 23 ++++++++++-------------
 test/vim_test.js | 39 +++++++++++++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fd8167e098..ac6d29c465 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1538,22 +1538,19 @@
       },
       scrollToCursor: function(cm, actionArgs) {
         var lineNum = cm.getCursor().line;
-        var heightProp = window.getComputedStyle(cm.getScrollerElement()).
-            getPropertyValue('height');
-        var height = parseInt(heightProp);
-        var y = cm.charCoords({line: lineNum, ch: 0}, "local").top;
-        var halfHeight = parseInt(height) / 2;
+        var charCoords = cm.charCoords({line: lineNum, ch: 0}, "local");
+        var height = cm.getScrollInfo().clientHeight;
+        var y = charCoords.top;
+        var lineHeight = charCoords.bottom - y;
         switch (actionArgs.position) {
-          case 'center': y = y - (height / 2) + 10;
-              break;
-          case 'bottom': y = y - height;
-              break;
-          case 'top': break;
+          case 'center': y = y - (height / 2) + lineHeight;
+            break;
+          case 'bottom': y = y - height + lineHeight*1.4;
+            break;
+          case 'top': y = y + lineHeight*0.4;
+            break;
         }
         cm.scrollTo(null, y);
-        // The calculations are slightly off, use scrollIntoView to nudge the
-        // view into the right place.
-        cm.scrollIntoView();
       },
       replayMacro: function(cm, actionArgs) {
         var registerName = actionArgs.selectedCharacter;
diff --git a/test/vim_test.js b/test/vim_test.js
index ff376c6dc2..69714079de 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1752,14 +1752,45 @@ testVim('HML', function(cm, vim, helpers) {
   helpers.doKeys('M');
   helpers.assertCursorAt(103,4);
 }, { value: (function(){
-  var upperLines = new Array(100);
-  var lowerLines = new Array(100);
+  var lines = new Array(100);
   var upper = '  xx\n';
   var lower = '    xx\n';
-  upper = upperLines.join(upper);
-  lower = upperLines.join(lower);
+  upper = lines.join(upper);
+  lower = lines.join(lower);
   return upper + lower;
 })()});
+
+var zVals = ['zb','zz','zt','z-','z.','z<CR>'].map(function(e, idx){
+  var lineNum = 250;
+  var lines = 35;
+  testVim(e, function(cm, vim, helpers) {
+    var k1 = e[0];
+    var k2 = e.substring(1);
+    var textHeight = cm.defaultTextHeight();
+    cm.setSize(600, lines*textHeight);
+    cm.setCursor(lineNum, 0);
+    helpers.doKeys(k1, k2);
+    zVals[idx] = cm.getScrollInfo().top;
+  }, { value: (function(){
+    return new Array(500).join('\n');
+  })()});
+});
+testVim('zb<zz', function(cm, vim, helpers){
+  eq(zVals[0]<zVals[1], true);
+});
+testVim('zz<zt', function(cm, vim, helpers){
+  eq(zVals[1]<zVals[2], true);
+});
+testVim('zb==z-', function(cm, vim, helpers){
+  eq(zVals[0], zVals[3]);
+});
+testVim('zz==z.', function(cm, vim, helpers){
+  eq(zVals[1], zVals[4]);
+});
+testVim('zt==z<CR>', function(cm, vim, helpers){
+  eq(zVals[2], zVals[5]);
+});
+
 var squareBracketMotionSandbox = ''+
   '({\n'+//0
   '  ({\n'+//11

From 3788103b7b94f5960c3d3380097f7bb332daabad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 May 2013 14:29:53 +0200
Subject: [PATCH 0057/4742] [real-world uses] Add Upsource

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 941d926dbe..0c51cc79cd 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -98,6 +98,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>
       <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
+      <li><a href="https://upsource.jetbrains.com/">Upsource</a> (code viewer)</li>
       <li><a href="http://webglplayground.net/">WebGL playground</a></li>
       <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
       <li><a href="http://wordpress.org/extend/plugins/codemirror-for-codeeditor/">WordPress plugin</a></li>

From 7b8ed766a8a545a6bedc594a34f466ebe260baf7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 May 2013 15:40:25 +0200
Subject: [PATCH 0058/4742] [css mode] Recognize SVG properties

Closes #1529
---
 mode/css/css.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index f4ee021ed4..b9953c1767 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -392,7 +392,17 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "vertical-align", "visibility", "voice-balance", "voice-duration",
     "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
     "voice-volume", "volume", "white-space", "widows", "width", "word-break",
-    "word-spacing", "word-wrap", "z-index"
+    "word-spacing", "word-wrap", "z-index",
+    // SVG-specific
+    "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
+    "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
+    "color-interpolation", "color-interpolation-filters", "color-profile",
+    "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",
+    "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke",
+    "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin",
+    "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
+    "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
+    "glyph-orientation-vertical", "kerning", "text-anchor", "writing-mode"
   ]);
 
   var colorKeywords = keySet([

From 18c08f6efcc3dd646e2f1d7e32575cbe2940d39a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 May 2013 15:50:22 +0200
Subject: [PATCH 0059/4742] [real-world uses] Better link for Upsource

---
 doc/realworld.html | 2 +-
 index.html         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index 0c51cc79cd..75507842dd 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -98,7 +98,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>
       <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
-      <li><a href="https://upsource.jetbrains.com/">Upsource</a> (code viewer)</li>
+      <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a> (code viewer)</li>
       <li><a href="http://webglplayground.net/">WebGL playground</a></li>
       <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
       <li><a href="http://wordpress.org/extend/plugins/codemirror-for-codeeditor/">WordPress plugin</a></li>
diff --git a/index.html b/index.html
index a0d3d5b48f..f5244742ea 100644
--- a/index.html
+++ b/index.html
@@ -129,6 +129,7 @@ <h2>Real-world uses:</h2>
       <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a></li>
       <li><a href="http://emmet.io">Emmet</a></li>
       <li><a href="http://prose.io/">Prose.io</a></li>
+      <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a></li>
       <li><a href="http://paperjs.org/">Paper.js</a></li>
       <li><a href="http://codev.it/">Codev</a></li>
       <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a></li>
@@ -138,7 +139,6 @@ <h2>Real-world uses:</h2>
       <li><a href="https://thefiletree.com">The File Tree</a></li>
       <li><a href="http://www.jshint.com/">JSHint</a></li>
       <li><a href="http://sqlfiddle.com">SQLFiddle</a></li>
-      <li><a href="http://try.haxe.org">Try Haxe</a> </li>
       <li><a href="http://cssdeck.com/">CSSDeck</a></li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
       <li><a href="https://notex.ch">NoTex</a></li>

From fc38d5f9aaa946b2bce6458d07fb48a279021bd0 Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Thu, 16 May 2013 14:55:05 +0200
Subject: [PATCH 0060/4742] [vim keymap] Improve code structure for later usage

---
 keymap/vim.js | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index ac6d29c465..42e6ecaac0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3163,36 +3163,37 @@
        * modifers.
        */
       // TODO: Figure out a way to catch capslock.
-      function handleKeyEvent_(cm, key, modifier) {
-        if (isUpperCase(key)) {
+      function cmKeyToVimKey(key, modifier) {
+        var vimKey = key;
+        if (isUpperCase(vimKey)) {
           // Convert to lower case if shift is not the modifier since the key
           // we get from CodeMirror is always upper case.
           if (modifier == 'Shift') {
             modifier = null;
           }
           else {
-            key = key.toLowerCase();
+            vimKey = vimKey.toLowerCase();
           }
         }
         if (modifier) {
           // Vim will parse modifier+key combination as a single key.
-          key = modifier.charAt(0) + '-' + key;
+          vimKey = modifier.charAt(0) + '-' + vimKey;
         }
-        var specialKey = ({Enter:'CR',Backspace:'BS',Delete:'Del'})[key];
-        key = specialKey ? specialKey : key;
-        key = key.length > 1 ? '<'+ key + '>' : key;
-        vim.handleKey(cm, key);
+        var specialKey = ({Enter:'CR',Backspace:'BS',Delete:'Del'})[vimKey];
+        vimKey = specialKey ? specialKey : vimKey;
+        vimKey = vimKey.length > 1 ? '<'+ vimKey + '>' : vimKey;
+        return vimKey;
       }
 
       // Closure to bind CodeMirror, key, modifier.
-      function keyMapper(key, modifier) {
+      function keyMapper(vimKey) {
         return function(cm) {
-          handleKeyEvent_(cm, key, modifier);
+          vim.handleKey(cm, vimKey);
         };
       }
 
       var modifiers = ['Shift', 'Ctrl'];
-      var keyMap = {
+      var cmToVimKeymap = {
         'nofallthrough': true,
         'style': 'fat-cursor'
       };
@@ -3204,11 +3205,9 @@
             // them.
             key = "'" + key + "'";
           }
-          if (modifier) {
-            keyMap[modifier + '-' + key] = keyMapper(keys[i], modifier);
-          } else {
-            keyMap[key] = keyMapper(keys[i]);
-          }
+          var vimKey = cmKeyToVimKey(keys[i], modifier);
+          var cmKey = modifier ? modifier + '-' + key : key;
+          cmToVimKeymap[cmKey] = keyMapper(vimKey);
         }
       }
       bindKeys(upperCaseAlphabet);
@@ -3220,7 +3219,7 @@
       bindKeys(numbers, 'Ctrl');
       bindKeys(specialKeys);
       bindKeys(specialKeys, 'Ctrl');
-      return keyMap;
+      return cmToVimKeymap;
     }
     CodeMirror.keyMap.vim = buildVimKeyMap();
 

From 20f7dc8c6f62fdcce602ec00c63d48d319c6a79a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 May 2013 00:02:15 +0200
Subject: [PATCH 0061/4742] [real-world uses] Add snippets.pro

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 75507842dd..f90b0f5a13 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -90,6 +90,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
       <li><a href="http://www.skulpt.org/">Skulpt</a> (in-browser Python environment)</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://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>

From 14f3188c42f5c368a5a760cbd46510e00d8e337f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 May 2013 14:48:45 +0200
Subject: [PATCH 0062/4742] More involved span-affects-wrapping test on Webkit

A dash is only handled specially when preceded by a word character.

Issue #1531
---
 demo/spanaffectswrapping_shim.html | 11 ++++++-----
 lib/codemirror.js                  | 24 +++++++++++++++++-------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/demo/spanaffectswrapping_shim.html b/demo/spanaffectswrapping_shim.html
index 733db067ff..14b6c8d82a 100644
--- a/demo/spanaffectswrapping_shim.html
+++ b/demo/spanaffectswrapping_shim.html
@@ -14,23 +14,24 @@ <h1>CodeMirror: odd wrapping shim</h1>
     in <a href="../lib/codemirror.js"><code>lib/codemirror.js</code></a>
     for some more details.</p>
 
-    <div style="white-space: pre-wrap; width: 50px;" id="area"></div>
+    <div style="white-space: pre-wrap; width: 50px;" id="area">foooo,-10br</div>
     <pre id="output"></pre>
 
     <script id="script">
       var a = document.getElementById("area"), bad = Object.create(null);
       var chars = "a~`!@#$%^&*()-_=+}{[]\|'\"/?.>,<:;", l = chars.length;
-      for (var x = 0; x < l; ++x) for (var y = 0; y < l; ++y) {
-        var s1 = "foooo" + chars.charAt(x), s2 = chars.charAt(y) + "br";
+      var bad = "";
+      for (var x = 0; x < l; ++x) {
+        var s1 = "fooo" + chars.charAt(x) + "-", s2 = "1br";
         a.appendChild(document.createTextNode(s1 + s2));
         var h1 = a.offsetHeight;
         a.innerHTML = "";
         a.appendChild(document.createElement("span")).appendChild(document.createTextNode(s1));
         a.appendChild(document.createElement("span")).appendChild(document.createTextNode(s2));
-        if (a.offsetHeight != h1)
-          bad[chars.charAt(x)] = (bad[chars.charAt(x)] || "") + chars.charAt(y);
+        if (a.offsetHeight != h1) bad += chars.charAt(x);
         a.innerHTML = "";
       }
+      console.log(bad); flf();
 
       var re = "";
       function toREElt(str) {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7f5f672adb..daa55a7b86 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4236,8 +4236,7 @@ window.CodeMirror = (function() {
       if (ch >= "\ud800" && ch < "\udbff" && i < text.length - 1) {
         ch = text.slice(i, i + 2);
         ++i;
-      } else if (i && wrapping &&
-                 spanAffectsWrapping.test(text.slice(i - 1, i + 1))) {
+      } else if (i && wrapping && spanAffectsWrapping(text, i)) {
         builder.pre.appendChild(elt("wbr"));
       }
       var span = builder.measure[builder.pos] =
@@ -5262,13 +5261,24 @@ window.CodeMirror = (function() {
   // word wrapping between certain characters *only* if a new inline
   // element is started between them. This makes it hard to reliably
   // measure the position of things, since that requires inserting an
-  // extra span. This terribly fragile set of regexps matches the
+  // extra span. This terribly fragile set of tests matches the
   // character combinations that suffer from this phenomenon on the
   // various browsers.
-  var spanAffectsWrapping = /^$/; // Won't match any two-character string
-  if (gecko) spanAffectsWrapping = /$'/;
-  else if (safari && !/Version\/([6-9]|\d\d)\b/.test(navigator.userAgent)) spanAffectsWrapping = /\-[^ \-?]|\?[^ !'\"\),.\-\/:;\?\]\}]/;
-  else if (webkit) spanAffectsWrapping = /[~!#%&*)=+}\]|\"\.>,:;][({[<]|-[^\-?\.]|\?[\w~`@#$%\^&*(_=+{[|><]/;
+  function spanAffectsWrapping() { return false; }
+  if (gecko) // Only for "$'"
+    spanAffectsWrapping = function(str, i) {
+      return str.charCodeAt(i - 1) == 36 && str.charCodeAt(i) == 39;
+    };
+  else if (safari && !/Version\/([6-9]|\d\d)\b/.test(navigator.userAgent))
+    spanAffectsWrapping = function(str, i) {
+      return /\-[^ \-?]|\?[^ !\'\"\),.\-\/:;\?\]\}]/.test(str.slice(i - 1, i + 1));
+    };
+  else if (webkit)
+    spanAffectsWrapping = function(str, i) {
+      if (i > 1 && str.charCodeAt(i - 1) == 45 && /\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i)))
+        return true;
+      return /[~!#%&*)=+}\]|\"\.>,:;][({[<]|\?[\w~`@#$%\^&*(_=+{[|><]/.test(str.slice(i - 1, i + 1));
+    };
 
   var knownScrollbarWidth;
   function scrollbarWidth(measure) {

From 1b5dbf726f955601c1954a2ffc1b865b104511af Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 May 2013 14:55:16 +0200
Subject: [PATCH 0063/4742] Revert debug changes that I accidentally committed

---
 demo/spanaffectswrapping_shim.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/demo/spanaffectswrapping_shim.html b/demo/spanaffectswrapping_shim.html
index 14b6c8d82a..733db067ff 100644
--- a/demo/spanaffectswrapping_shim.html
+++ b/demo/spanaffectswrapping_shim.html
@@ -14,24 +14,23 @@ <h1>CodeMirror: odd wrapping shim</h1>
     in <a href="../lib/codemirror.js"><code>lib/codemirror.js</code></a>
     for some more details.</p>
 
-    <div style="white-space: pre-wrap; width: 50px;" id="area">foooo,-10br</div>
+    <div style="white-space: pre-wrap; width: 50px;" id="area"></div>
     <pre id="output"></pre>
 
     <script id="script">
       var a = document.getElementById("area"), bad = Object.create(null);
       var chars = "a~`!@#$%^&*()-_=+}{[]\|'\"/?.>,<:;", l = chars.length;
-      var bad = "";
-      for (var x = 0; x < l; ++x) {
-        var s1 = "fooo" + chars.charAt(x) + "-", s2 = "1br";
+      for (var x = 0; x < l; ++x) for (var y = 0; y < l; ++y) {
+        var s1 = "foooo" + chars.charAt(x), s2 = chars.charAt(y) + "br";
         a.appendChild(document.createTextNode(s1 + s2));
         var h1 = a.offsetHeight;
         a.innerHTML = "";
         a.appendChild(document.createElement("span")).appendChild(document.createTextNode(s1));
         a.appendChild(document.createElement("span")).appendChild(document.createTextNode(s2));
-        if (a.offsetHeight != h1) bad += chars.charAt(x);
+        if (a.offsetHeight != h1)
+          bad[chars.charAt(x)] = (bad[chars.charAt(x)] || "") + chars.charAt(y);
         a.innerHTML = "";
       }
-      console.log(bad); flf();
 
       var re = "";
       function toREElt(str) {

From f4ed6ceb6db94a5b9e39013f156ef94f6e770f99 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 May 2013 14:59:05 +0200
Subject: [PATCH 0064/4742] Fix bug in horizontal motion through atomic ranges

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index daa55a7b86..cdb4685f72 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2656,7 +2656,7 @@ window.CodeMirror = (function() {
   }
 
   function findPosH(doc, pos, dir, unit, visually) {
-    var line = pos.line, ch = pos.ch;
+    var line = pos.line, ch = pos.ch, origDir = dir;
     var lineObj = getLine(doc, line);
     var possible = true;
     function findNextLine() {
@@ -2695,7 +2695,7 @@ window.CodeMirror = (function() {
         if (dir > 0 && !moveOnce(!first)) break;
       }
     }
-    var result = skipAtomic(doc, Pos(line, ch), dir, true);
+    var result = skipAtomic(doc, Pos(line, ch), origDir, true);
     if (!possible) result.hitSide = true;
     return result;
   }

From a691c9dd5230869c4054d200c6b6e4fb1a92b308 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 May 2013 15:15:39 +0200
Subject: [PATCH 0065/4742] [css mode] Recognize more colors

Closes #1494
---
 mode/css/css.js | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index b9953c1767..27c97f37eb 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -406,8 +406,32 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
   ]);
 
   var colorKeywords = keySet([
-    "black", "silver", "gray", "white", "maroon", "red", "purple", "fuchsia",
-    "green", "lime", "olive", "yellow", "navy", "blue", "teal", "aqua"
+    "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
+    "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
+    "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue",
+    "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod",
+    "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen",
+    "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen",
+    "darkslateblue", "darkslategray", "darkturquoise", "darkviolet",
+    "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick",
+    "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite",
+    "gold", "goldenrod", "gray", "green", "greenyellow", "honeydew",
+    "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender",
+    "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",
+    "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink",
+    "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray",
+    "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta",
+    "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple",
+    "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise",
+    "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin",
+    "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered",
+    "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred",
+    "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue",
+    "purple", "red", "rosybrown", "royalblue", "saddlebrown", "salmon",
+    "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
+    "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",
+    "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
+    "whitesmoke", "yellow", "yellowgreen"
   ]);
 
   var valueKeywords = keySet([
@@ -490,7 +514,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
     "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
-    "visibleStroke", "visual", "w-resize", "wait", "wave", "white", "wider",
+    "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
     "window", "windowframe", "windowtext", "x-large", "x-small", "xor",
     "xx-large", "xx-small"
   ]);

From 93fd369693211817cf0a0210b7dbe8f9a28a35f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 May 2013 15:52:47 +0200
Subject: [PATCH 0066/4742] Mark release 3.13

---
 doc/compress.html   |  1 +
 doc/oldrelease.html | 28 ++++++++++++++++++++++++++++
 index.html          | 38 ++++++++++----------------------------
 lib/codemirror.js   |  2 +-
 package.json        |  2 +-
 5 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 9ed4773e8e..9c0fafec18 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -30,6 +30,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <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=3.13.0;f=">3.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.12;f=">3.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.11;f=">3.11</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.1;f=">3.1</option>
diff --git a/doc/oldrelease.html b/doc/oldrelease.html
index b51e93c328..dd5d8e8c1d 100644
--- a/doc/oldrelease.html
+++ b/doc/oldrelease.html
@@ -19,6 +19,34 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 </pre>
 </div>
 
+  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
+
+  <ul class="rel-note">
+    <li>New theme: <a href="../demo/theme.html?solarized%20light">Solarized</a>.</li>
+    <li>Introduce <a href="manual.html#addLineClass"><code>addLineClass</code></a>
+    and <a href="manual.html#removeLineClass"><code>removeLineClass</code></a>,
+    drop <code>setLineClass</code>.</li>
+    <li>Add a <em>lot</em> of
+    new <a href="manual.html#markText">options for marked text</a>
+    (read-only, atomic, collapsed, widget replacement).</li>
+    <li>Remove the old code folding interface in favour of these new ranges.</li>
+    <li>Add <a href="manual.html#isClean"><code>isClean</code></a>/<a href="manual.html#markClean"><code>markClean</code></a> methods.</li>
+    <li>Remove <code>compoundChange</code> method, use better undo-event-combining heuristic.</li>
+    <li>Improve scrolling performance smoothness.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0beta2...v3.0rc1">list of patches</a>.</li>
+  </ul>
+
+  <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-2.35.zip">Version 2.35</a>:</p>
+
+  <ul class="rel-note">
+    <li>New (sub) mode: <a href="../mode/javascript/typescript.html">TypeScript</a>.</li>
+    <li>Don't overwrite (insert key) when pasting.</li>
+    <li>Fix several bugs in <a href="manual.html#markText"><code>markText</code></a>/undo interaction.</li>
+    <li>Better indentation of JavaScript code without semicolons.</li>
+    <li>Add <a href="manual.html#defineInitHook"><code>defineInitHook</code></a> function.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-3.0beta2.zip">Version 3.0, beta 2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index f5244742ea..0f855ecbb3 100644
--- a/index.html
+++ b/index.html
@@ -287,6 +287,16 @@ <h2>Reading material</h2>
 
   <h2 id=releases>Releases</h2>
 
+  <p class="rel">20-05-2013: <a href="http://codemirror.net/codemirror-3.13.zip">Version 3.13</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="mode/cobol/index.html">COBOL</a> and <a href="mode/haml/index.html">HAML</a>.</li>
+    <li>New options: <a href="doc/manual.html#option_cursorScrollMargin"><code>cursorScrollMargin</code></a> and <a href="doc/manual.html#option_coverGutterNextToScrollbar"><code>coverGutterNextToScrollbar</code></a>.</li>
+    <li>New addon: <a href="doc/manual.html#addon_comment">commenting</a>.</li>
+    <li>More features added to the <a href="demo/vim.html">Vim keymap</a>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.12...3.13.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">19-04-2013: <a href="http://codemirror.net/codemirror-3.12.zip">Version 3.12</a>:</p>
 
   <ul class="rel-note">
@@ -445,34 +455,6 @@ <h2 id=releases>Releases</h2>
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
-
-  <ul class="rel-note">
-    <li>New theme: <a href="demo/theme.html?solarized%20light">Solarized</a>.</li>
-    <li>Introduce <a href="doc/manual.html#addLineClass"><code>addLineClass</code></a>
-    and <a href="doc/manual.html#removeLineClass"><code>removeLineClass</code></a>,
-    drop <code>setLineClass</code>.</li>
-    <li>Add a <em>lot</em> of
-    new <a href="doc/manual.html#markText">options for marked text</a>
-    (read-only, atomic, collapsed, widget replacement).</li>
-    <li>Remove the old code folding interface in favour of these new ranges.</li>
-    <li>Add <a href="doc/manual.html#isClean"><code>isClean</code></a>/<a href="doc/manual.html#markClean"><code>markClean</code></a> methods.</li>
-    <li>Remove <code>compoundChange</code> method, use better undo-event-combining heuristic.</li>
-    <li>Improve scrolling performance smoothness.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0beta2...v3.0rc1">list of patches</a>.</li>
-  </ul>
-
-  <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-2.35.zip">Version 2.35</a>:</p>
-
-  <ul class="rel-note">
-    <li>New (sub) mode: <a href="mode/javascript/typescript.html">TypeScript</a>.</li>
-    <li>Don't overwrite (insert key) when pasting.</li>
-    <li>Fix several bugs in <a href="doc/manual.html#markText"><code>markText</code></a>/undo interaction.</li>
-    <li>Better indentation of JavaScript code without semicolons.</li>
-    <li>Add <a href="doc/manual.html#defineInitHook"><code>defineInitHook</code></a> function.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
-  </ul>
-
   <p><a href="doc/oldrelease.html">Older releases...</a></p>
 
 </div></div>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index cdb4685f72..b42c321527 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5629,7 +5629,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.12 +";
+  CodeMirror.version = "3.13";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 021531c672..05c946b726 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.12.01",
+    "version":"3.13.00",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 82752ca5d1e3bac5473de9936d864b58171ab2d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 May 2013 15:55:40 +0200
Subject: [PATCH 0067/4742] Bump version number post-3.13

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b42c321527..732f549084 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5629,7 +5629,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.13";
+  CodeMirror.version = "3.13 +";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 05c946b726..7e0d64a71c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.13.00",
+    "version":"3.13.01",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 51292d0b8d2c632eeeccbd6ff83a88316a83c038 Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Mon, 20 May 2013 14:11:56 +0200
Subject: [PATCH 0068/4742] [vim keymap] Minor fixup for macro normalMode

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 42e6ecaac0..532e640a1f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -536,9 +536,9 @@
         if (macroModeState.enteredMacroMode) {
           if (key == 'q') {
             actions.exitMacroRecordMode();
+            vim.inputState = new InputState();
             return;
           }
-          logKey(macroModeState, key);
         }
         if (key == '<Esc>') {
           // Clear input state and get back to normal mode.
@@ -575,6 +575,9 @@
             this.handleKey(cm, command.toKeys[i]);
           }
         } else {
+          if (macroModeState.enteredMacroMode) {
+            logKey(macroModeState, key);
+          }
           commandDispatcher.processCommand(cm, vim, command);
         }
       }
@@ -3251,7 +3254,7 @@
       var macroKeyBuffer = macroModeState.macroKeyBuffer;
       emptyMacroKeyBuffer(macroModeState);
       do {
-        match = text.match(/<\w+-.+>|<\w+>|.|\n/);
+        match = (/<\w+-.+?>|<\w+>|./).exec(text);
         if(match === null)break;
         key = match[0];
         text = text.substring(match.index + key.length);

From f8b2dcfb6e4ae86d6a67a9e5706783a8998fe4f7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 21 May 2013 14:37:15 +0200
Subject: [PATCH 0069/4742] [package.json] Use 'repository' rather than
 'repositories' field

Apparently the second is no longer supported in npm 1.2 (?).
---
 package.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 7e0d64a71c..80bd128efc 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,6 @@
     "maintainers":[{"name": "Marijn Haverbeke",
                     "email": "marijnh@gmail.com",
                     "web": "http://marijnhaverbeke.nl"}],
-    "repositories": [{"type": "git",
-                      "url": "http://marijnhaverbeke.nl/git/codemirror"},
-                     {"type": "git",
-                      "url": "https://github.com/marijnh/CodeMirror.git"}]
+    "repository": {"type": "git",
+                   "url": "http://marijnhaverbeke.nl/git/codemirror"}
 }

From 3818137291d94bfb168e037309727040d693b756 Mon Sep 17 00:00:00 2001
From: 4r2r <arthrrr@gmail.com>
Date: Wed, 22 May 2013 19:12:07 +0400
Subject: [PATCH 0070/4742] CodeMirror.multiplexingMode: added an innerStyle
 option and test.

Example usage: applying different color schemes to submodes.
---
 addon/mode/multiplex.js      |  8 +++++++-
 addon/mode/multiplex_test.js | 30 ++++++++++++++++++++++++++++++
 demo/multiplex.html          |  6 ++++++
 doc/manual.html              | 18 ++++++++++--------
 test/index.html              |  2 ++
 5 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 addon/mode/multiplex_test.js

diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 3ff3a929ed..32cc579c3a 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -1,5 +1,5 @@
 CodeMirror.multiplexingMode = function(outer /*, others */) {
-  // Others should be {open, close, mode [, delimStyle]} objects
+  // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
   var others = Array.prototype.slice.call(arguments, 1);
   var n_others = others.length;
 
@@ -58,6 +58,12 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         if (found > -1) stream.string = oldContent;
         var cur = stream.current(), found = cur.indexOf(curInner.close);
         if (found > -1) stream.backUp(cur.length - found);
+
+        if (curInner.innerStyle) {
+          if (innerToken) innerToken = innerToken + ' ' + curInner.innerStyle;
+          else innerToken = curInner.innerStyle;
+        }
+
         return innerToken;
       }
     },
diff --git a/addon/mode/multiplex_test.js b/addon/mode/multiplex_test.js
new file mode 100644
index 0000000000..c0656357c7
--- /dev/null
+++ b/addon/mode/multiplex_test.js
@@ -0,0 +1,30 @@
+(function() {
+  CodeMirror.defineMode("markdown_with_stex", function(){
+    var inner = CodeMirror.getMode({}, "stex");
+    var outer = CodeMirror.getMode({}, "markdown");
+
+    var innerOptions = {
+      open: '$',
+      close: '$',
+      mode: inner,
+      delimStyle: 'delim',
+      innerStyle: 'inner'
+    };
+
+    return CodeMirror.multiplexingMode(outer, innerOptions);
+  });
+
+  var mode = CodeMirror.getMode({}, "markdown_with_stex");
+
+  function MT(name) {
+    test.mode(
+      name,
+      mode,
+      Array.prototype.slice.call(arguments, 1),
+      'multiplexing');
+  }
+
+  MT(
+    "stexInsideMarkdown",
+    "[strong **Equation:**] [delim $][inner&tag \\pi][delim $]");
+})();
diff --git a/demo/multiplex.html b/demo/multiplex.html
index 9ebe8f357b..ec0519cb98 100644
--- a/demo/multiplex.html
+++ b/demo/multiplex.html
@@ -56,5 +56,11 @@ <h1><< this is not <html >></h1>
     the <a href="../addon/mode/multiplex.js">source</a> for more
     information.</p>
 
+    <p>
+      <strong>Parsing/Highlighting Tests:</strong>
+      <a href="../test/index.html#multiplexing_*">normal</a>,
+      <a href="../test/index.html#verbose,multiplexing_*">verbose</a>.
+    </p>
+
   </body>
 </html>
diff --git a/doc/manual.html b/doc/manual.html
index a7d6a67948..5d029aebc1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -788,7 +788,7 @@ <h3 id="api_content">Content manipulation methods</h3>
       <dt id="lastLine"><code><strong>doc.lastLine</strong>() → integer</code></dt>
       <dd>Get the last line of the editor. This will
       usually be <code>doc.lineCount() - 1</code>,
-      but for <a href="#linkedDoc_from">linked sub-views</a>, 
+      but for <a href="#linkedDoc_from">linked sub-views</a>,
       it might return other values.</dd>
 
       <dt id="getLineHandle"><code><strong>doc.getLineHandle</strong>(num: integer) → LineHandle</code></dt>
@@ -1150,7 +1150,7 @@ <h3 id="api_marker">Text-marking methods</h3>
     </dl>
 
     <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
-    
+
     <dl>
       <dt id="setGutterMarker"><code><strong>cm.setGutterMarker</strong>(line: integer|LineHandle, gutterID: string, value: Element) → LineHandle</code></dt>
       <dd>Sets the gutter marker for the given gutter (identified by
@@ -1160,7 +1160,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       clear the marker, or a DOM element, to set it. The DOM element
       will be shown in the specified gutter next to the specified
       line.</dd>
-      
+
       <dt id="clearGutter"><code><strong>cm.clearGutter</strong>(gutterID: string)</code></dt>
       <dd>Remove all gutter markers in
       the <a href="#option_gutters">gutter</a> with the given ID.</dd>
@@ -1643,7 +1643,7 @@ <h2 id="addons">Add-ons</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]}</code>
+      any number of <code>{open, close, mode [, delimStyle, innerStyle]}</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
@@ -1652,9 +1652,11 @@ <h2 id="addons">Add-ons</h2>
       the <code>close</code> string is encountered.
       Pass <code>"\n"</code> for <code>open</code> or <code>close</code>
       if you want to switch on a blank line.
-      When <code>delimStyle</code> is specified, it will be the token
-      style returned for the delimiter tokens. The outer mode will not
-      see the content between the delimiters.
+      <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.
       See <a href="../demo/multiplex.html">this demo</a> for an
       example.</dd>
 
@@ -1699,7 +1701,7 @@ <h2 id="addons">Add-ons</h2>
 
       <dt id="addon_active-line"><a href="../addon/selection/active-line.js"><code>selection/active-line.js</code></a></dt>
       <dd>Defines a <code>styleActiveLine</code> option that, when enabled,
-      gives the wrapper of the active line the class <code>CodeMirror-activeline</code>, 
+      gives the wrapper of the active line the class <code>CodeMirror-activeline</code>,
       and adds a background with the class <code>CodeMirror-activeline-background</code>.
       is enabled. See the <a href="../demo/activeline.html">demo</a>.</dd>
 
diff --git a/test/index.html b/test/index.html
index 3eb691576a..4667d589e8 100644
--- a/test/index.html
+++ b/test/index.html
@@ -8,6 +8,7 @@
     <link rel="stylesheet" href="mode_test.css">
     <script src="../lib/codemirror.js"></script>
     <script src="../addon/mode/overlay.js"></script>
+    <script src="../addon/mode/multiplex.js"></script>
     <script src="../addon/search/searchcursor.js"></script>
     <script src="../addon/dialog/dialog.js"></script>
     <script src="../addon/comment/comment.js"></script>
@@ -73,6 +74,7 @@ <h1>CodeMirror: Test Suite</h1>
     <script src="../mode/stex/test.js"></script>
     <script src="../mode/xquery/xquery.js"></script>
     <script src="../mode/xquery/test.js"></script>
+    <script src="../addon/mode/multiplex_test.js"></script>
     <script src="vim_test.js"></script>
     <script>
       window.onload = runHarness;

From 45355b2c4ed28ad693eb44e100f3747d552a02f2 Mon Sep 17 00:00:00 2001
From: Dan Heberden <danheberden@gmail.com>
Date: Tue, 21 May 2013 16:21:39 -0700
Subject: [PATCH 0071/4742] Add `bower.json` file for full bower compatibility.

---
 bower.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 bower.json

diff --git a/bower.json b/bower.json
new file mode 100644
index 0000000000..eb2b75b8d1
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,16 @@
+{
+  "name": "CodeMirror",
+  "version": "3.13.0",
+  "main": ["lib/codemirror.js", "lib/codemirror.css"],
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "components",
+    "bin",
+    "demo",
+    "doc",
+    "test",
+    "index.html",
+    "package.json"
+  ]
+}

From e7661343396e8ab9d7006648083e0f15a3298baf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 22 May 2013 20:10:09 +0200
Subject: [PATCH 0072/4742] [bower.json] Remove version field

Issue #1540
---
 bower.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bower.json b/bower.json
index eb2b75b8d1..66e049dfbe 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,5 @@
 {
   "name": "CodeMirror",
-  "version": "3.13.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",

From 1a70a1bf1724f9c1f0eb89c5a6bb9a12ab136daa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 22 May 2013 20:23:21 +0200
Subject: [PATCH 0073/4742] Revert "[bower.json] Remove version field"

This reverts commit e7661343396e8ab9d7006648083e0f15a3298baf.
---
 bower.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bower.json b/bower.json
index 66e049dfbe..eb2b75b8d1 100644
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,6 @@
 {
   "name": "CodeMirror",
+  "version": "3.13.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",

From d07c5471ca649b78366b4c10c3ef698504a454a6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 May 2013 09:05:09 +0200
Subject: [PATCH 0074/4742] Limit firing of redraws from resize events

---
 lib/codemirror.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 732f549084..1b124a432e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1513,11 +1513,14 @@ window.CodeMirror = (function() {
     // Prevent wrapper from ever scrolling
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
+    var resizeTimer = new Delayed();
     function onResize() {
-      // Might be a text scaling operation, clear size caches.
-      d.cachedCharWidth = d.cachedTextHeight = null;
-      clearCaches(cm);
-      runInOp(cm, bind(regChange, cm));
+      resizeTimer.set(function() {
+        // Might be a text scaling operation, clear size caches.
+        d.cachedCharWidth = d.cachedTextHeight = null;
+        clearCaches(cm);
+        runInOp(cm, bind(regChange, cm));
+      }, 200);
     }
     on(window, "resize", onResize);
     // Above handler holds on to the editor and its data structures.

From 65c74d5905fe362350a8cf7e70f9e032e2043986 Mon Sep 17 00:00:00 2001
From: Ben Keen <ben.keen@gmail.com>
Date: Tue, 21 May 2013 19:16:03 -0700
Subject: [PATCH 0075/4742] [smarty mode] Rewrite, Smarty 3 support added

Issue #956
---
 mode/smarty/index.html |  45 ++++++-
 mode/smarty/smarty.js  | 268 ++++++++++++++++++++++++-----------------
 2 files changed, 201 insertions(+), 112 deletions(-)

diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index 6b7debedc4..9e41733807 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -12,6 +12,7 @@
   <body>
     <h1>CodeMirror: Smarty mode</h1>
 
+	<h3>Default settings (Smarty 2, <b>{</b> and <b>}</b> delimiters)</h3>
     <form><textarea id="code" name="code">
 {extends file="parent.tpl"}
 {include file="template.tpl"}
@@ -43,6 +44,7 @@ <h1>CodeMirror: Smarty mode</h1>
 
     <br />
 
+	<h3>Smarty 2, custom delimiters</h3>
     <form><textarea id="code2" name="code2">
 {--extends file="parent.tpl"--}
 {--include file="template.tpl"--}
@@ -76,7 +78,48 @@ <h1>CodeMirror: Smarty mode</h1>
       });
     </script>
 
-    <p>A plain text/Smarty mode which allows for custom delimiter tags (defaults to <b>{</b> and <b>}</b>).</p>
+	<br />
+
+	<h3>Smarty 3</h3>
+
+	<textarea id="code3" name="code3">
+Nested tags {$foo={counter one=1 two={inception}}+3} are now valid in Smarty 3.
+
+<script>
+function test() {
+	console.log("Smarty 3 permits single curly braces followed by whitespace to NOT slip into Smarty mode.");
+}
+</script>
+
+{assign var=foo value=[1,2,3]}
+{assign var=foo value=['y'=>'yellow','b'=>'blue']}
+{assign var=foo value=[1,[9,8],3]}
+
+{$foo=$bar+2} {* a comment *}
+{$foo.bar=1}  {* another comment *}
+{$foo = myfunct(($x+$y)*3)}
+{$foo = strlen($bar)}
+{$foo.bar.baz=1}, {$foo[]=1}
+
+Smarty "dot" syntax (note: embedded {} are used to address ambiguities):
+
+{$foo.a.b.c}      => $foo['a']['b']['c']
+{$foo.a.$b.c}     => $foo['a'][$b]['c']
+{$foo.a.{$b+4}.c} => $foo['a'][$b+4]['c']
+{$foo.a.{$b.c}}   => $foo['a'][$b['c']]
+
+{$object->method1($x)->method2($y)}</textarea>
+
+	<script>
+		var editor = CodeMirror.fromTextArea(document.getElementById("code3"), {
+			lineNumbers: true,
+			mode: "smarty",
+			smartyVersion: 3
+		});
+	</script>
+
+
+    <p>A plain text/Smarty version 2 or 3 mode, which allows for custom delimiter tags.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-smarty</code></p>
   </body>
diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 7d7e62f86e..00c1df5aa8 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -1,140 +1,186 @@
+/**
+ * Smarty 2 and 3 mode.
+ */
 CodeMirror.defineMode("smarty", function(config) {
-  var keyFuncs = ["debug", "extends", "function", "include", "literal"];
+  "use strict";
+
+  // our default settings; check to see if they're overridden
+  var settings = {
+    rightDelimiter: '}',
+    leftDelimiter: '{',
+    smartyVersion: 2 // for backward compatibility
+  };
+  if (config.hasOwnProperty("leftDelimiter")) {
+    settings.leftDelimiter = config.leftDelimiter;
+  }
+  if (config.hasOwnProperty("rightDelimiter")) {
+    settings.rightDelimiter = config.rightDelimiter;
+  }
+  if (config.hasOwnProperty("smartyVersion") && config.smartyVersion === 3) {
+    settings.smartyVersion = 3;
+  }
+
+  var keyFunctions = ["debug", "extends", "function", "include", "literal"];
   var last;
   var regs = {
     operatorChars: /[+\-*&%=<>!?]/,
-    validIdentifier: /[a-zA-Z0-9\_]/,
-    stringChar: /[\'\"]/
+    validIdentifier: /[a-zA-Z0-9_]/,
+    stringChar: /['"]/
   };
-  var leftDelim = (typeof config.mode.leftDelimiter != 'undefined') ? config.mode.leftDelimiter : "{";
-  var rightDelim = (typeof config.mode.rightDelimiter != 'undefined') ? config.mode.rightDelimiter : "}";
-  function ret(style, lst) { last = lst; return style; }
 
-
-  function tokenizer(stream, state) {
-    function chain(parser) {
+  var helpers = {
+    continue: function(style, lastType) {
+      last = lastType;
+      return style;
+    },
+    chain: function(stream, state, parser) {
       state.tokenize = parser;
       return parser(stream, state);
     }
+  };
 
-    if (stream.match(leftDelim, true)) {
-      if (stream.eat("*")) {
-        return chain(inBlock("comment", "*" + rightDelim));
-      }
-      else {
-        state.tokenize = inSmarty;
-        return "tag";
-      }
-    }
-    else {
-      // I'd like to do an eatWhile() here, but I can't get it to eat only up to the rightDelim string/char
-      stream.next();
-      return null;
-    }
-  }
 
-  function inSmarty(stream, state) {
-    if (stream.match(rightDelim, true)) {
-      state.tokenize = tokenizer;
-      return ret("tag", null);
-    }
+  // our various parsers
+  var parsers = {
 
-    var ch = stream.next();
-    if (ch == "$") {
-      stream.eatWhile(regs.validIdentifier);
-      return ret("variable-2", "variable");
-    }
-    else if (ch == ".") {
-      return ret("operator", "property");
-    }
-    else if (regs.stringChar.test(ch)) {
-      state.tokenize = inAttribute(ch);
-      return ret("string", "string");
-    }
-    else if (regs.operatorChars.test(ch)) {
-      stream.eatWhile(regs.operatorChars);
-      return ret("operator", "operator");
-    }
-    else if (ch == "[" || ch == "]") {
-      return ret("bracket", "bracket");
-    }
-    else if (/\d/.test(ch)) {
-      stream.eatWhile(/\d/);
-      return ret("number", "number");
-    }
-    else {
-      if (state.last == "variable") {
-        if (ch == "@") {
-          stream.eatWhile(regs.validIdentifier);
-          return ret("property", "property");
+    // the main tokenizer
+    tokenizer: function(stream, state) {
+      if (stream.match(settings.leftDelimiter, true)) {
+        if (stream.eat("*")) {
+          return helpers.chain(stream, state, parsers.inBlock("comment", "*" + settings.rightDelimiter));
+        } else {
+          // Smarty 3 allows { and } surrounded by whitespace to NOT slip into Smarty mode
+          state.depth++;
+          var isEol = stream.eol();
+          var isFollowedByWhitespace = /\s/.test(stream.peek());
+          if (settings.smartyVersion === 3 && settings.leftDelimiter === "{" && (isEol || isFollowedByWhitespace)) {
+            state.depth--;
+            return null;
+          } else {
+            state.tokenize = parsers.smarty;
+            last = "startTag";
+            return "tag";
+          }
         }
-        else if (ch == "|") {
-          stream.eatWhile(regs.validIdentifier);
-          return ret("qualifier", "modifier");
-        }
-      }
-      else if (state.last == "whitespace") {
-        stream.eatWhile(regs.validIdentifier);
-        return ret("attribute", "modifier");
-      }
-      else if (state.last == "property") {
-        stream.eatWhile(regs.validIdentifier);
-        return ret("property", null);
-      }
-      else if (/\s/.test(ch)) {
-        last = "whitespace";
+      } else {
+        stream.next();
         return null;
       }
+    },
 
-      var str = "";
-      if (ch != "/") {
-        str += ch;
-      }
-      var c = "";
-      while ((c = stream.eat(regs.validIdentifier))) {
-        str += c;
-      }
-      var i, j;
-      for (i=0, j=keyFuncs.length; i<j; i++) {
-        if (keyFuncs[i] == str) {
-          return ret("keyword", "keyword");
+    // parsing Smarty content
+    smarty: function(stream, state) {
+      if (stream.match(settings.rightDelimiter, true)) {
+        if (settings.smartyVersion === 3) {
+          state.depth--;
+          if (state.depth <= 0) {
+            state.tokenize = parsers.tokenizer;
+          }
+        } else {
+          state.tokenize = parsers.tokenizer;
         }
+        return helpers.continue("tag", null);
       }
-      if (/\s/.test(ch)) {
-        return null;
+
+      if (stream.match(settings.leftDelimiter, true)) {
+        state.depth++;
+        return helpers.continue("tag", "startTag");
       }
-      return ret("tag", "tag");
-    }
-  }
 
-  function inAttribute(quote) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.next() == quote) {
-          state.tokenize = inSmarty;
-          break;
+      var ch = stream.next();
+      if (ch == "$") {
+        stream.eatWhile(regs.validIdentifier);
+        return helpers.continue("variable-2", "variable");
+      } else if (ch == ".") {
+        return helpers.continue("operator", "property");
+      } else if (regs.stringChar.test(ch)) {
+        state.tokenize = parsers.inAttribute(ch);
+        return helpers.continue("string", "string");
+      } else if (regs.operatorChars.test(ch)) {
+        stream.eatWhile(regs.operatorChars);
+        return helpers.continue("operator", "operator");
+      } else if (ch == "[" || ch == "]") {
+        return helpers.continue("bracket", "bracket");
+      } else if (/\d/.test(ch)) {
+        stream.eatWhile(/\d/);
+        return helpers.continue("number", "number");
+      } else {
+
+        if (state.last == "variable") {
+          if (ch == "@") {
+            stream.eatWhile(regs.validIdentifier);
+            return helpers.continue("property", "property");
+          } else if (ch == "|") {
+            stream.eatWhile(regs.validIdentifier);
+            return helpers.continue("qualifier", "modifier");
+          }
+        } else if (state.last == "whitespace") {
+          stream.eatWhile(regs.validIdentifier);
+          return helpers.continue("attribute", "modifier");
+        } if (state.last == "property") {
+          stream.eatWhile(regs.validIdentifier);
+          return helpers.continue("property", null);
+        } else if (/\s/.test(ch)) {
+          last = "whitespace";
+          return null;
         }
-      }
-      return "string";
-    };
-  }
 
-  function inBlock(style, terminator) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.match(terminator)) {
-          state.tokenize = tokenizer;
-          break;
+        var str = "";
+        if (ch != "/") {
+          str += ch;
         }
-        stream.next();
+		var c = null;
+        while (c = stream.eat(regs.validIdentifier)) {
+          str += c;
+        }
+        for (var i=0, j=keyFunctions.length; i<j; i++) {
+          if (keyFunctions[i] == str) {
+            return helpers.continue("keyword", "keyword");
+          }
+        }
+        if (/\s/.test(ch)) {
+          return null;
+        }
+        return helpers.continue("tag", "tag");
       }
-      return style;
-    };
-  }
+    },
+
+    inAttribute: function(quote) {
+      return function(stream, state) {
+        while (!stream.eol()) {
+          if (stream.next() == quote) {
+            state.tokenize = parsers.smarty;
+            break;
+          }
+        }
+        return "string";
+      };
+    },
+
+    inBlock: function(style, terminator) {
+      return function(stream, state) {
+        while (!stream.eol()) {
+          if (stream.match(terminator)) {
+            state.tokenize = parsers.tokenizer;
+            break;
+          }
+          stream.next();
+        }
+        return style;
+      };
+    }
+  };
+
 
+  // the public API for CodeMirror
   return {
     startState: function() {
-      return { tokenize: tokenizer, mode: "smarty", last: null };
+      return {
+        tokenize: parsers.tokenizer,
+        mode: "smarty",
+        last: null,
+        depth: 0
+      };
     },
     token: function(stream, state) {
       var style = state.tokenize(stream, state);
@@ -145,4 +191,4 @@ CodeMirror.defineMode("smarty", function(config) {
   };
 });
 
-CodeMirror.defineMIME("text/x-smarty", "smarty");
+CodeMirror.defineMIME("text/x-smarty", "smarty");
\ No newline at end of file

From 0b1a9f906d318ae9c3634ec506045b4dcdf79ee2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 May 2013 12:06:16 +0200
Subject: [PATCH 0076/4742] [trailingspace addon] Add

---
 addon/edit/trailingspace.js | 15 ++++++++++++++
 demo/trailingspace.html     | 39 +++++++++++++++++++++++++++++++++++++
 doc/manual.html             | 15 ++++++++++----
 lib/codemirror.js           |  3 ++-
 4 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 addon/edit/trailingspace.js
 create mode 100644 demo/trailingspace.html

diff --git a/addon/edit/trailingspace.js b/addon/edit/trailingspace.js
new file mode 100644
index 0000000000..f6bb02645d
--- /dev/null
+++ b/addon/edit/trailingspace.js
@@ -0,0 +1,15 @@
+CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
+  if (prev == CodeMirror.Init) prev = false;
+  if (prev && !val)
+    cm.removeOverlay("trailingspace");
+  else if (!prev && val)
+    cm.addOverlay({
+      token: function(stream) {
+        for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
+        if (i > stream.pos) { stream.pos = i; return null; }
+        stream.pos = l;
+        return "trailingspace";
+      },
+      name: "trailingspace"
+    });
+});
diff --git a/demo/trailingspace.html b/demo/trailingspace.html
new file mode 100644
index 0000000000..ca74152eca
--- /dev/null
+++ b/demo/trailingspace.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: Trailing Whitespace Demo</title>
+    <link rel="stylesheet" href="../lib/codemirror.css">
+    <script src="../lib/codemirror.js"></script>
+    <script src="../addon/edit/trailingspace.js"></script>
+    <link rel="stylesheet" href="../doc/docs.css">
+
+    <style type="text/css">
+      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+      .cm-trailingspace {
+        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);
+        background-position: bottom left;
+        background-repeat: repeat-x;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>CodeMirror: Trailing Whitespace Demo</h1>
+
+    <form><textarea id="code" name="code">This text  
+ has some	 
+trailing whitespace!</textarea></form>
+
+    <script>
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+  lineNumbers: true,
+  showTrailingSpace: true
+});
+</script>
+
+<p>Uses
+the <a href="../doc/manual.html#addon_trailingspace">trailingspace</a>
+addon to highlight trailing whitespace.</p>
+
+  </body>
+</html>
diff --git a/doc/manual.html b/doc/manual.html
index 5d029aebc1..33625b577c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -939,10 +939,10 @@ <h3 id="api_configuration">Configuration methods</h3>
       override the styling of the base mode entirely, instead of the
       two being applied together.</dd>
       <dt id="removeOverlay"><code><strong>cm.removeOverlay</strong>(mode: string|object)</code></dt>
-      <dd>Pass this the exact argument passed for
-      the <code>mode</code> parameter
-      to <a href="#addOverlay"><code>addOverlay</code></a> to remove
-      an overlay again.</dd>
+      <dd>Pass this the exact value passed for the <code>mode</code>
+      parameter to <a href="#addOverlay"><code>addOverlay</code></a>,
+      or a string that corresponds to the <code>name</code> propery of
+      that value, to remove an overlay again.</dd>
 
       <dt id="on"><code><strong>cm.on</strong>(type: string, func: (...args))</code></dt>
       <dd>Register an event handler for the given event type (a
@@ -1558,6 +1558,13 @@ <h2 id="addons">Add-ons</h2>
       to customize it. <a href="../demo/closebrackets.html">Demo
       here</a>.</dd>
 
+      <dt id="addon_trailingspace"><a href="../addon/edit/trailingspace.js"><code>edit/trailingspace.js</code></a></dt>
+      <dd>Adds an option <code>showTrailingSpace</code> which, when
+      enabled, adds the CSS class <code>cm-trailingspace</code> to
+      stretches of whitespace at the end of lines.
+      The <a href="../demo/trailingspace.html">demo</a> has a nice
+      squiggly underline style for this class.</dd>
+
       <dt id="addon_comment"><a href="../addon/comment/comment.js"><code>comment/comment.js</code></a></dt>
       <dd>Addon for commenting and uncommenting code. Adds three
       methods to CodeMirror instances:
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1b124a432e..a2324e7679 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2780,7 +2780,8 @@ window.CodeMirror = (function() {
     removeOverlay: operation(null, function(spec) {
       var overlays = this.state.overlays;
       for (var i = 0; i < overlays.length; ++i) {
-        if (overlays[i].modeSpec == spec) {
+        var cur = overlays[i].modeSpec;
+        if (cur == spec || typeof spec == "string" && cur.name == spec) {
           overlays.splice(i, 1);
           this.state.modeGen++;
           regChange(this);

From 2daf724ed578726f2e37ef22dc8eebebd44b2a64 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 May 2013 13:11:07 +0200
Subject: [PATCH 0077/4742] [smarty mode] Fix lint errors

---
 mode/smarty/smarty.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 00c1df5aa8..856f7bb3be 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -29,7 +29,7 @@ CodeMirror.defineMode("smarty", function(config) {
   };
 
   var helpers = {
-    continue: function(style, lastType) {
+    cont: function(style, lastType) {
       last = lastType;
       return style;
     },
@@ -79,47 +79,47 @@ CodeMirror.defineMode("smarty", function(config) {
         } else {
           state.tokenize = parsers.tokenizer;
         }
-        return helpers.continue("tag", null);
+        return helpers.cont("tag", null);
       }
 
       if (stream.match(settings.leftDelimiter, true)) {
         state.depth++;
-        return helpers.continue("tag", "startTag");
+        return helpers.cont("tag", "startTag");
       }
 
       var ch = stream.next();
       if (ch == "$") {
         stream.eatWhile(regs.validIdentifier);
-        return helpers.continue("variable-2", "variable");
+        return helpers.cont("variable-2", "variable");
       } else if (ch == ".") {
-        return helpers.continue("operator", "property");
+        return helpers.cont("operator", "property");
       } else if (regs.stringChar.test(ch)) {
         state.tokenize = parsers.inAttribute(ch);
-        return helpers.continue("string", "string");
+        return helpers.cont("string", "string");
       } else if (regs.operatorChars.test(ch)) {
         stream.eatWhile(regs.operatorChars);
-        return helpers.continue("operator", "operator");
+        return helpers.cont("operator", "operator");
       } else if (ch == "[" || ch == "]") {
-        return helpers.continue("bracket", "bracket");
+        return helpers.cont("bracket", "bracket");
       } else if (/\d/.test(ch)) {
         stream.eatWhile(/\d/);
-        return helpers.continue("number", "number");
+        return helpers.cont("number", "number");
       } else {
 
         if (state.last == "variable") {
           if (ch == "@") {
             stream.eatWhile(regs.validIdentifier);
-            return helpers.continue("property", "property");
+            return helpers.cont("property", "property");
           } else if (ch == "|") {
             stream.eatWhile(regs.validIdentifier);
-            return helpers.continue("qualifier", "modifier");
+            return helpers.cont("qualifier", "modifier");
           }
         } else if (state.last == "whitespace") {
           stream.eatWhile(regs.validIdentifier);
-          return helpers.continue("attribute", "modifier");
+          return helpers.cont("attribute", "modifier");
         } if (state.last == "property") {
           stream.eatWhile(regs.validIdentifier);
-          return helpers.continue("property", null);
+          return helpers.cont("property", null);
         } else if (/\s/.test(ch)) {
           last = "whitespace";
           return null;
@@ -129,19 +129,19 @@ CodeMirror.defineMode("smarty", function(config) {
         if (ch != "/") {
           str += ch;
         }
-		var c = null;
+        var c = null;
         while (c = stream.eat(regs.validIdentifier)) {
           str += c;
         }
         for (var i=0, j=keyFunctions.length; i<j; i++) {
           if (keyFunctions[i] == str) {
-            return helpers.continue("keyword", "keyword");
+            return helpers.cont("keyword", "keyword");
           }
         }
         if (/\s/.test(ch)) {
           return null;
         }
-        return helpers.continue("tag", "tag");
+        return helpers.cont("tag", "tag");
       }
     },
 
@@ -191,4 +191,4 @@ CodeMirror.defineMode("smarty", function(config) {
   };
 });
 
-CodeMirror.defineMIME("text/x-smarty", "smarty");
\ No newline at end of file
+CodeMirror.defineMIME("text/x-smarty", "smarty");

From f5312750a476256f58e5fcfdaef3547b87bdce05 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 24 May 2013 08:31:56 +0200
Subject: [PATCH 0078/4742] Remove unneeded cursor set at end of drag

(The mousemove events should already have taken care of that.)

Issue #1488
---
 lib/codemirror.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a2324e7679..f21f76a34e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1728,8 +1728,6 @@ window.CodeMirror = (function() {
 
     function done(e) {
       counter = Infinity;
-      var cur = posFromMouse(cm, e);
-      if (cur) doSelect(cur);
       e_preventDefault(e);
       focusInput(cm);
       off(document, "mousemove", move);

From 6edd771495c6a333166b7d22a5ebe0e0df47483e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 24 May 2013 09:22:39 +0200
Subject: [PATCH 0079/4742] Also fire beforeChange for undo/redo changes

But disable its update method in that case.

Issue #1539
---
 doc/manual.html   | 27 ++++++++++++++++-----------
 lib/codemirror.js | 23 +++++++++++++++--------
 test/test.js      | 13 +++++++++++++
 3 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 33625b577c..6fa58c6e30 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -406,17 +406,22 @@ <h2 id="events">Events</h2>
       properties, as with
       the <a href="#event_change"><code>"change"</code></a> event, but
       never a <code>next</code> property, since this is fired for each
-      individual change, and not batched per operation. It also
-      has <code>update(from, to, text)</code>
-      and <code>cancel()</code> methods, which may be used to modify
-      or cancel the change. All three arguments to <code>update</code>
-      are optional, and can be left off to leave the existing value
-      for that field intact. <strong>Note:</strong> you may not do
-      anything from a <code>"beforeChange"</code> handler that would
-      cause changes to the document or its visualization. Doing so
-      will, since this handler is called directly from the bowels of
-      the CodeMirror implementation, probably cause the editor to
-      become corrupted.</dd>
+      individual change, and not batched per operation. It also has
+      a <code>cancel()</code> method, which can be called to cancel
+      the change, and, <strong>if</strong> the change isn't coming
+      from an undo or redo event, an <code>update(from, to,
+      text)</code> method, which may be used to modify the change.
+      Undo or redo changes can't be modified, because they hold some
+      metainformation for restoring old marked ranges that is only
+      valid for that specific change. All three arguments
+      to <code>update</code> are optional, and can be left off to
+      leave the existing value for that field
+      intact. <strong>Note:</strong> you may not do anything from
+      a <code>"beforeChange"</code> handler that would cause changes
+      to the document or its visualization. Doing so will, since this
+      handler is called directly from the bowels of the CodeMirror
+      implementation, probably cause the editor to become
+      corrupted.</dd>
 
       <dt id="event_cursorActivity"><code><strong>"cursorActivity"</strong> (instance: CodeMirror)</code></dt>
       <dd>Will be fired when the cursor or selection moves, or any
diff --git a/lib/codemirror.js b/lib/codemirror.js
index f21f76a34e..b92b3a9bbc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2186,21 +2186,21 @@ window.CodeMirror = (function() {
     return {anchor: adjustPos(doc.sel.anchor), head: adjustPos(doc.sel.head)};
   }
 
-  function filterChange(doc, change) {
+  function filterChange(doc, change, update) {
     var obj = {
       canceled: false,
       from: change.from,
       to: change.to,
       text: change.text,
       origin: change.origin,
-      update: function(from, to, text, origin) {
-        if (from) this.from = clipPos(doc, from);
-        if (to) this.to = clipPos(doc, to);
-        if (text) this.text = text;
-        if (origin !== undefined) this.origin = origin;
-      },
       cancel: function() { this.canceled = true; }
     };
+    if (update) obj.update = function(from, to, text, origin) {
+      if (from) this.from = clipPos(doc, from);
+      if (to) this.to = clipPos(doc, to);
+      if (text) this.text = text;
+      if (origin !== undefined) this.origin = origin;
+    };
     signal(doc, "beforeChange", doc, obj);
     if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj);
 
@@ -2217,7 +2217,7 @@ window.CodeMirror = (function() {
     }
 
     if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
-      change = filterChange(doc, change);
+      change = filterChange(doc, change, true);
       if (!change) return;
     }
 
@@ -2262,9 +2262,16 @@ window.CodeMirror = (function() {
                 anchorAfter: event.anchorBefore, headAfter: event.headBefore};
     (type == "undo" ? hist.undone : hist.done).push(anti);
 
+    var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
+
     for (var i = event.changes.length - 1; i >= 0; --i) {
       var change = event.changes[i];
       change.origin = type;
+      if (filter && !filterChange(doc, change, false)) {
+        (type == "undo" ? hist.done : hist.undone).length = 0;
+        return;
+      }
+
       anti.changes.push(historyChangeFromChange(doc, change));
 
       var after = i ? computeSelAfterChange(doc, change, null)
diff --git a/test/test.js b/test/test.js
index 637f6e79ca..d42a76bd41 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1358,6 +1358,19 @@ testCM("beforeChange", function(cm) {
   eq(cm.getValue(), "hello,_i_am_a\nhey_hey_hey");
 }, {value: "abcdefghijk"});
 
+testCM("beforeChangeUndo", function(cm) {
+  cm.setLine(0, "hi");
+  cm.setLine(0, "bye");
+  eq(cm.historySize().undo, 2);
+  cm.on("beforeChange", function(cm, change) {
+    is(!change.update);
+    change.cancel();
+  });
+  cm.undo();
+  eq(cm.historySize().undo, 0);
+  eq(cm.getValue(), "bye\ntwo");
+}, {value: "one\ntwo"});
+
 testCM("beforeSelectionChange", function(cm) {
   function notAtEnd(cm, pos) {
     var len = cm.getLine(pos.line).length;

From 83fdc1e77cc078029504de549b2eef8e1bb83f12 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 25 May 2013 06:59:11 +0200
Subject: [PATCH 0080/4742] Fix patch d07c5471ca649b78366b4c10c3ef698504a454a6

The argument order to Delayed.set was wrong, and we actually
want to ensure that the resize fires at least every 100ms during
a resize, so that the display doesn't lag too much.
---
 lib/codemirror.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b92b3a9bbc..aa0de5de43 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1513,14 +1513,15 @@ window.CodeMirror = (function() {
     // Prevent wrapper from ever scrolling
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
-    var resizeTimer = new Delayed();
+    var resizeTimer;
     function onResize() {
-      resizeTimer.set(function() {
+      if (resizeTimer == null) resizeTimer = setTimeout(function() {
+        resizeTimer = null;
         // Might be a text scaling operation, clear size caches.
         d.cachedCharWidth = d.cachedTextHeight = null;
         clearCaches(cm);
         runInOp(cm, bind(regChange, cm));
-      }, 200);
+      }, 100);
     }
     on(window, "resize", onResize);
     // Above handler holds on to the editor and its data structures.

From 8e6b9f5e15d16f388fa15f88a930013a87f6c304 Mon Sep 17 00:00:00 2001
From: Ben Keen <ben.keen@gmail.com>
Date: Fri, 24 May 2013 22:11:59 -0700
Subject: [PATCH 0081/4742] [smarty mode] bugfixes

- escaped quotes in strings now displayed properly
- whitespace no longer affects qualifiers
- parentheses properly highlighted
---
 mode/smarty/smarty.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 856f7bb3be..826c2b966c 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -91,6 +91,8 @@ CodeMirror.defineMode("smarty", function(config) {
       if (ch == "$") {
         stream.eatWhile(regs.validIdentifier);
         return helpers.cont("variable-2", "variable");
+      } else if (ch == "|") {
+        return helpers.cont("operator", "pipe");
       } else if (ch == ".") {
         return helpers.cont("operator", "property");
       } else if (regs.stringChar.test(ch)) {
@@ -101,6 +103,8 @@ CodeMirror.defineMode("smarty", function(config) {
         return helpers.cont("operator", "operator");
       } else if (ch == "[" || ch == "]") {
         return helpers.cont("bracket", "bracket");
+      } else if (ch == "(" || ch == ")") {
+        return helpers.cont("bracket", "operator");
       } else if (/\d/.test(ch)) {
         stream.eatWhile(/\d/);
         return helpers.cont("number", "number");
@@ -114,6 +118,9 @@ CodeMirror.defineMode("smarty", function(config) {
             stream.eatWhile(regs.validIdentifier);
             return helpers.cont("qualifier", "modifier");
           }
+        } else if (state.last == "pipe") {
+          stream.eatWhile(regs.validIdentifier);
+          return helpers.cont("qualifier", "modifier");
         } else if (state.last == "whitespace") {
           stream.eatWhile(regs.validIdentifier);
           return helpers.cont("attribute", "modifier");
@@ -147,11 +154,15 @@ CodeMirror.defineMode("smarty", function(config) {
 
     inAttribute: function(quote) {
       return function(stream, state) {
+        var prevChar = null;
+        var currChar = null;
         while (!stream.eol()) {
-          if (stream.next() == quote) {
+          currChar = stream.peek();
+          if (stream.next() == quote && prevChar !== '\\') {
             state.tokenize = parsers.smarty;
             break;
           }
+          prevChar = currChar;
         }
         return "string";
       };

From 3f203d7b83d58a701ee9c980408fe1aab018795d Mon Sep 17 00:00:00 2001
From: John Connor <john.theman.connor@gmail.com>
Date: Sat, 25 May 2013 13:41:25 -0400
Subject: [PATCH 0082/4742] [vim keymap] 'dd' now handles last line corretly.

Current behavior:
```
word1
word2

```
If the cursor is on the last line and 'dd' is executed, the buffer does
not change.

Expected behavior:
```
word1
word2
```
---
 keymap/vim.js    | 10 ++++++++++
 test/vim_test.js |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 532e640a1f..51b93aec30 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -663,6 +663,9 @@
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise) {
+        if (linewise && text.charAt(0) == '\n') {
+          text = text.slice(1) + '\n';
+        }
         // Lowercase and uppercase registers refer to the same register.
         // Uppercase just means append.
         var register = this.isValidRegister(registerName) ?
@@ -1476,6 +1479,13 @@
       },
       // delete is a javascript keyword.
       'delete': function(cm, operatorArgs, vim, curStart, curEnd) {
+        // If the ending line is past the last line, inclusive, instead of
+        // including the trailing \n, include the \n before the starting line
+        if (operatorArgs.linewise &&
+            curEnd.line > cm.lastLine() && curStart.line > cm.firstLine()) {
+          curStart.line--;
+          curStart.ch = lineLength(cm, curStart.line);
+        }
         getVimGlobalState().registerController.pushText(
             operatorArgs.registerName, 'delete', cm.getRange(curStart, curEnd),
             operatorArgs.linewise);
diff --git a/test/vim_test.js b/test/vim_test.js
index 69714079de..f3b53508f6 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -782,6 +782,13 @@ testVim('dd_multiply_repeat', function(cm, vim, helpers) {
   is(register.linewise);
   helpers.assertCursorAt(0, lines[6].textStart);
 });
+testVim('dd_lastline', function(cm, vim, helpers) {
+  cm.setCursor(cm.lineCount(), 0);
+  var expectedLineCount = cm.lineCount() - 1;
+  helpers.doKeys('d', 'd');
+  eq(expectedLineCount, cm.lineCount());
+  helpers.assertCursorAt(cm.lineCount() - 1, 0);
+});
 // Yank commands should behave the exact same as d commands, expect that nothing
 // gets deleted.
 testVim('yw_repeat', function(cm, vim, helpers) {

From 4c2fa0767a4168250bde05015ced6ec31f697686 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 27 May 2013 12:01:19 +0200
Subject: [PATCH 0083/4742] Update Webkit spanAffectsWrapping hack to recognize
 some common Unicode punctuation

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index aa0de5de43..a68417598c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5287,7 +5287,7 @@ window.CodeMirror = (function() {
     spanAffectsWrapping = function(str, i) {
       if (i > 1 && str.charCodeAt(i - 1) == 45 && /\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i)))
         return true;
-      return /[~!#%&*)=+}\]|\"\.>,:;][({[<]|\?[\w~`@#$%\^&*(_=+{[|><]/.test(str.slice(i - 1, i + 1));
+      return /[~!#%&*)=+}\]|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|…[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
     };
 
   var knownScrollbarWidth;

From 9a50176800dfd9f4a5cdc19564a26381e71ed96f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 May 2013 08:17:47 +0200
Subject: [PATCH 0084/4742] [comment addon] Fix bug in uncommenting
 line-commented blocks

(http://stackoverflow.com/questions/16702574/codemirror-comment-js-addon-wont-uncomment-in-ruby-mode)
---
 addon/comment/comment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 4f590f2870..b25bd96f22 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -97,7 +97,7 @@
         var line = self.getLine(i);
         var found = line.indexOf(lineString);
         if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
-        if (i != start && nonWS.test(line.slice(0, found))) break lineComment;
+        if (i != start && found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
         lines.push(line);
       }
       self.operation(function() {

From 8aaac4445a317fff82ab314e9dd6f6d8404c8ff7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 May 2013 10:06:37 +0200
Subject: [PATCH 0085/4742] [xml mode] Make else indentation style correspond
 to rest of project

---
 mode/xml/xml.js | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index b04248c6c6..ae71c64130 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -58,20 +58,19 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         if (stream.eat("[")) {
           if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>"));
           else return null;
-        }
-        else if (stream.match("--")) return chain(inBlock("comment", "-->"));
-        else if (stream.match("DOCTYPE", true, true)) {
+        } else if (stream.match("--")) {
+          return chain(inBlock("comment", "-->"));
+        } else if (stream.match("DOCTYPE", true, true)) {
           stream.eatWhile(/[\w\._\-]/);
           return chain(doctype(1));
+        } else {
+          return null;
         }
-        else return null;
-      }
-      else if (stream.eat("?")) {
+      } else if (stream.eat("?")) {
         stream.eatWhile(/[\w\._\-]/);
         state.tokenize = inBlock("meta", "?>");
         return "meta";
-      }
-      else {
+      } else {
         var isClose = stream.eat("/");
         tagName = "";
         var c;
@@ -81,8 +80,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         state.tokenize = inTag;
         return "tag";
       }
-    }
-    else if (ch == "&") {
+    } else if (ch == "&") {
       var ok;
       if (stream.eat("#")) {
         if (stream.eat("x")) {
@@ -94,8 +92,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";");
       }
       return ok ? "atom" : "error";
-    }
-    else {
+    } else {
       stream.eatWhile(/[^&<]/);
       return null;
     }
@@ -107,16 +104,15 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       state.tokenize = inText;
       type = ch == ">" ? "endTag" : "selfcloseTag";
       return "tag";
-    }
-    else if (ch == "=") {
+    } else if (ch == "=") {
       type = "equals";
       return null;
-    }
-    else if (/[\'\"]/.test(ch)) {
+    } else if (ch == "<") {
+      return "error";
+    } else if (/[\'\"]/.test(ch)) {
       state.tokenize = inAttribute(ch);
       return state.tokenize(stream, state);
-    }
-    else {
+    } else {
       stream.eatWhile(/[^\s\u00a0=<>\"\']/);
       return "word";
     }

From a85d89c082cb5764ad137b6d1a3d79cffbb7f275 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 May 2013 13:49:18 +0200
Subject: [PATCH 0086/4742] [xml-hint addon] Rewrite from scratch

Using some of the ideas from the html5 hinter. Can now
use a much richer source of hinting information, and also
completes properties and property values.
---
 addon/hint/show-hint.js |  13 +++-
 addon/hint/xml-hint.js  | 168 +++++++++++++---------------------------
 demo/xmlcomplete.html   | 119 ++++++++++++++++------------
 doc/manual.html         |  33 +++++++-
 4 files changed, 164 insertions(+), 169 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 2c54dcd77e..504fda786b 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,7 +1,7 @@
 CodeMirror.showHint = function(cm, getHints, options) {
   if (!options) options = {};
   var startCh = cm.getCursor().ch, continued = false;
-  var closeOn = options.closeCharacters || /[\s()\[\]{};:]/;
+  var closeOn = options.closeCharacters || /[\s()\[\]{};:>]/;
 
   function startHinting() {
     // We want a single cursor position.
@@ -114,6 +114,7 @@ CodeMirror.showHint = function(cm, getHints, options) {
       }
     } else ourMap = baseMap;
 
+    cm.state.completionActive = true;
     cm.addKeyMap(ourMap);
     cm.on("cursorActivity", cursorActivity);
     var closingOnBlur;
@@ -154,7 +155,10 @@ CodeMirror.showHint = function(cm, getHints, options) {
       cm.off("blur", onBlur);
       cm.off("focus", onFocus);
       cm.off("scroll", onScroll);
-      if (willContinue !== true) CodeMirror.signal(data, "close");
+      if (willContinue !== true) {
+        CodeMirror.signal(data, "close");
+        cm.state.completionActive = false;
+      }
     }
     function pick() {
       pickCompletion(cm, data, completions[selectedHint]);
@@ -169,8 +173,9 @@ CodeMirror.showHint = function(cm, getHints, options) {
           pos.ch < startCh || cm.somethingSelected() ||
           (pos.ch && closeOn.test(line.charAt(pos.ch - 1))))
         close();
-      else
-        once = setTimeout(function(){close(true); continued = true; startHinting();}, 70);
+      else {
+        once = setTimeout(function(){close(true); continued = true; startHinting();}, 170);
+      }
     }
     CodeMirror.signal(data, "select", completions[0], hints.firstChild);
     return true;
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 42eab6f3b7..bc26a09c6d 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -1,118 +1,60 @@
 (function() {
-
-    CodeMirror.xmlHints = [];
-
-    CodeMirror.xmlHint = function(cm) {
-
-        var cursor = cm.getCursor();
-
-        if (cursor.ch > 0) {
-
-            var text = cm.getRange(CodeMirror.Pos(0, 0), cursor);
-            var typed = '';
-            var simbol = '';
-            for(var i = text.length - 1; i >= 0; i--) {
-                if(text[i] == ' ' || text[i] == '<') {
-                    simbol = text[i];
-                    break;
-                }
-                else {
-                    typed = text[i] + typed;
-                }
-            }
-
-            text = text.slice(0, text.length - typed.length);
-
-            var path = getActiveElement(text) + simbol;
-            var hints = CodeMirror.xmlHints[path];
-
-            if(typeof hints === 'undefined')
-                hints = [''];
-            else {
-                hints = hints.slice(0);
-                for (var i = hints.length - 1; i >= 0; i--) {
-                    if(hints[i].indexOf(typed) != 0)
-                        hints.splice(i, 1);
-                }
-            }
-
-            return {
-                list: hints,
-                from: CodeMirror.Pos(cursor.line, cursor.ch - typed.length),
-                to: cursor
-            };
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+
+  CodeMirror.xmlHint = function(cm, options) {
+    var tags = options && options.schemaInfo;
+    if (!tags) return;
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
+    if (inner.mode.name != "xml") return;
+    var result = [], replaceToken = false, prefix;
+    var isTag = token.string.charAt(0) == "<";
+    if (!inner.state.tagName || isTag) { // Tag completion
+      if (isTag) {
+        prefix = token.string.slice(1);
+        replaceToken = true;
+      }
+      var cx = inner.state.context, curTag = cx && tags[cx.tagName];
+      var childList = cx ? curTag && curTag.children : tags["!top"];
+      if (childList) {
+        for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].indexOf(prefix) == 0)
+          result.push("<" + childList[i]);
+      } else {
+        for (var name in tags) if (tags.hasOwnProperty(name) && name != "!top" && (!prefix || name.indexOf(prefix) == 0))
+          result.push("<" + name);
+      }
+      if (cx && (!prefix || ("/" + cx.tagName).indexOf(prefix) == 0))
+        result.push("</" + cx.tagName + ">");
+    } else {
+      // Attribute completion
+      var curTag = tags[inner.state.tagName], attrs = curTag && curTag.attrs;
+      if (!attrs) return;
+      if (token.type == "string" || token.string == "=") { // A value
+        var before = cm.getRange(Pos(cur.line, Math.max(0, cur.ch - 60)),
+                                 Pos(cur.line, token.type == "string" ? token.start : token.end));
+        var atName = before.match(/([^\s\u00a0=<>\"\']+)=$/), atValues;
+        if (!atName || !attrs.hasOwnProperty(atName[1]) || !(atValues = attrs[atName[1]])) return;
+        if (token.type == "string") {
+          prefix = token.string.charAt(0) == '"' ? token.string.slice(1) : token.string;
+          replaceToken = true;
         }
-    };
-
-    var getActiveElement = function(text) {
-
-        var element = '';
-
-        if(text.length >= 0) {
-
-            var regex = new RegExp('<([^!?][^\\s/>]*)[\\s\\S]*?>', 'g');
-
-            var matches = [];
-            var match;
-            while ((match = regex.exec(text)) != null) {
-                matches.push({
-                    tag: match[1],
-                    selfclose: (match[0].slice(match[0].length - 2) === '/>')
-                });
-            }
-
-            for (var i = matches.length - 1, skip = 0; i >= 0; i--) {
-
-                var item = matches[i];
-
-                if (item.tag[0] == '/')
-                {
-                    skip++;
-                }
-                else if (item.selfclose == false)
-                {
-                    if (skip > 0)
-                    {
-                        skip--;
-                    }
-                    else
-                    {
-                        element = '<' + item.tag + '>' + element;
-                    }
-                }
-            }
-
-            element += getOpenTag(text);
+        for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].indexOf(prefix) == 0)
+          result.push('"' + atValues[i] + '"');
+      } else { // An attribute name
+        if (token.type == "attribute") {
+          prefix = token.string;
+          replaceToken = true;
         }
-
-        return element;
+        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || attr.indexOf(prefix) == 0))
+          result.push(attr);
+      }
+    }
+    return {
+      list: result,
+      from: replaceToken ? Pos(cur.line, token.start) : cur,
+      to: replaceToken ? Pos(cur.line, token.end) : cur
     };
-
-    var getOpenTag = function(text) {
-
-        var open = text.lastIndexOf('<');
-        var close = text.lastIndexOf('>');
-
-        if (close < open)
-        {
-            text = text.slice(open);
-
-            if(text != '<') {
-
-                var space = text.indexOf(' ');
-                if(space < 0)
-                    space = text.indexOf('\t');
-                if(space < 0)
-                    space = text.indexOf('\n');
-
-                if (space < 0)
-                    space = text.length;
-
-                return text.slice(0, space);
-            }
-        }
-
-        return '';
-    };
-
+  };
 })();
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index 28a50638f7..a03b4c5fcc 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -7,75 +7,96 @@
     <script src="../lib/codemirror.js"></script>
     <script src="../addon/hint/show-hint.js"></script>
     <link rel="stylesheet" href="../addon/hint/show-hint.css">
-    <script src="../addon/edit/closetag.js"></script>
     <script src="../addon/hint/xml-hint.js"></script>
     <script src="../mode/xml/xml.js"></script>
     <link rel="stylesheet" href="../doc/docs.css">
     <style type="text/css">
-      .CodeMirror { border: 1px solid #eee; height: auto; }
-      .CodeMirror-scroll { overflow-y: hidden; overflow-x: auto; }
+      .CodeMirror { border: 1px solid #eee; }
     </style>
   </head>
   <body>
     <h1>CodeMirror: XML Autocomplete demo</h1>
 
-    <form><textarea id="code" name="code"></textarea></form>
+    <form><textarea id="code" name="code"><!-- write some xml below -->
+</textarea></form>
 
-    <p>Type '&lt;' or space inside tag or
-    press <strong>ctrl-space</strong> to activate autocompletion. See
-    the code (<a href="../addon/hint/show-hint.js">here</a>
-    and <a href="../addon/hint/xml-hint.js">here</a>) to figure out how
-    it works.</p>
+    <p>Press <strong>ctrl-space</strong>, or type a '<' character to
+    activate autocompletion. This demo defines a simple schema that
+    guides completion. The schema can be customized—see
+    the <a href="../doc/manual.html#addon_xml-hint">manual</a>.</p>
 
     <script>
-      CodeMirror.xmlHints['<'] = [
-          'levelTop',
-          'levelRoot',
-          'mainLevel'
-      ];
+      var dummy = {
+        attrs: {
+          color: ["red", "green", "blue", "purple", "white", "black", "yellow"],
+          size: ["large", "medium", "small"],
+          description: null
+        },
+        children: []
+      };
 
-      CodeMirror.xmlHints['<levelTop '] = 
-      CodeMirror.xmlHints['<levelRoot '] = 
-      CodeMirror.xmlHints['<mainLevel '] = [
-          'property1111',
-          'property2222'
-      ];
-
-      CodeMirror.xmlHints['<levelTop><'] = 
-      CodeMirror.xmlHints['<levelRoot><'] = 
-      CodeMirror.xmlHints['<mainLevel><'] = [
-          'second',
-          'two'
-      ];
-
-      CodeMirror.xmlHints['<levelTop><second '] = [
-        'secondProperty'
-      ];
-
-      CodeMirror.xmlHints['<levelTop><second><'] = [
-        'three',
-        'x-three'
-      ];
+      var tags = {
+        "!top": ["top"],
+        top: {
+          attrs: {
+            lang: ["en", "de", "fr", "nl"],
+            freeform: null
+          },
+          children: ["animal", "plant"]
+        },
+        animal: {
+          attrs: {
+            name: null,
+            isduck: ["yes", "no"]
+          },
+          children: ["wings", "feet", "body", "head", "tail"]
+        },
+        plant: {
+          attrs: {name: null},
+          children: ["leaves", "stem", "flowers"]
+        },
+        wings: dummy, feet: dummy, body: dummy, head: dummy, tail: dummy,
+        leaves: dummy, stem: dummy, flowers: dummy
+      };
 
       CodeMirror.commands.autocomplete = function(cm) {
-        CodeMirror.showHint(cm, CodeMirror.xmlHint);
+        CodeMirror.showHint(cm, CodeMirror.xmlHint, {schemaInfo: tags});
       }
-      function passAndHint(cm) {
-        setTimeout(function() {cm.execCommand("autocomplete");}, 100);
+
+      function completeAfter(cm, pred) {
+        var cur = cm.getCursor();
+        if (!pred || pred()) setTimeout(function() {
+          if (!cm.state.completionActive) cm.execCommand("autocomplete");
+        }, 100);
         return CodeMirror.Pass;
       }
 
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-            value: '',
-            mode: 'text/html',
-            lineNumbers: true,
-            extraKeys: {
-                "' '": passAndHint,
-                "'<'": passAndHint,
-                "Ctrl-Space": "autocomplete"
-            },
-            autoCloseTags: true
+      function completeIfAfterLt(cm) {
+        return completeAfter(cm, function() {
+          var cur = cm.getCursor();
+          return cm.getRange(CodeMirror.Pos(cur.line, cur.ch - 1), cur) == "<";
         });
+      }
+
+      function completeIfInTag(cm) {
+        return completeAfter(cm, function() {
+          var tok = cm.getTokenAt(cm.getCursor());
+          var inner = CodeMirror.innerMode(cm.getMode(), tok.state).state;
+          return inner.tagName;
+        });
+      }
+
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: "xml",
+        lineNumbers: true,
+        extraKeys: {
+          "'<'": completeAfter,
+          "'/'": completeIfAfterLt,
+          "' '": completeIfInTag,
+          "'='": completeIfInTag,
+          "Ctrl-Space": "autocomplete"
+        }
+      });
     </script>
   </body>
 </html>
diff --git a/doc/manual.html b/doc/manual.html
index 6fa58c6e30..07e72c7b63 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1682,12 +1682,39 @@ <h2 id="addons">Add-ons</h2>
       is an array of strings (the completions), and <code>from</code>
       and <code>to</code> give the start and end of the token that is
       being completed. Depends
-      on <code>addon/hint/show-hint.css</code>. See the other files in
-      the <a href="../addon/hint/"><code>addon/hint</code></a> for
-      hint sources for various languages. Check
+      on <code>addon/hint/show-hint.css</code>. Check
       out <a href="../demo/complete.html">the demo</a> for an
       example.</dd>
 
+      <dt id="addon_javascript-hint"><a href="../addon/hint/javascript-hint.js"><code>hint/javascript-hint.js</code></a></dt>
+      <dd>Defines a simple hinting function for JavaScript
+      (<code>CodeMirror.javascriptHint</code>) and CoffeeScript
+      (<code>CodeMirror.coffeescriptHint</code>) code. This will
+      simply use the JavaScript environment that the editor runs in as
+      a source of information about objects and their properties.</dd>
+
+      <dt id="addon_xml-hint"><a href="../addon/hint/xml-hint.js"><code>hint/xml-hint.js</code></a></dt>
+      <dd>Defines <code>CodeMirror.xmlHint</code>, which produces
+      hints for XML tagnames, attribute names, and attribute values,
+      guided by a <code>schemaInfo</code> option (a property of the
+      second argument passed to the hinting function, or the third
+      argument passed to <code>CodeMirror.showHint</code>).<br>The
+      schema info should be an object mapping tag names to information
+      about these tags, with optionally a <code>"!top"</code> property
+      containing a list of the names of valid top-level tags. The
+      values of the properties should be objects with optional
+      properties <code>children</code> (an array of valid child
+      element names, omit to simply allow all tags to appear)
+      and <code>attrs</code> (an object mapping attribute names
+      to <code>null</code> for free-form attributes, and an array of
+      valid values for restricted
+      attributes). <a href="../demo/xmlcomplete.html">Demo
+      here.</a></dd>
+
+      <dt id="addon_python-hint"><a href="../addon/hint/python-hint.js"><code>hint/python-hint.js</code></a></dt>
+      <dd>A very simple hinting function for Python code.
+      Defines <code>CodeMirror.pythonHint</code>.</dd>
+
       <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>match-highlighter.js</code></a></dt>
       <dd>Adds a <code>highlightSelectionMatches</code> option that
       can be enabled to highlight all instances of a currently

From d23d0589aae8d98f236ef0eb0e29b435fcad3b9f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 May 2013 15:06:36 +0200
Subject: [PATCH 0087/4742] [html-hint addon] Rewrite to reuse xml-hint instead
 of own hinting function

---
 addon/hint/html-hint.js | 895 +++++++++++++++-------------------------
 demo/html5complete.html |  76 +---
 doc/manual.html         |  11 +
 3 files changed, 349 insertions(+), 633 deletions(-)

diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index 8b5dc6f002..23238df054 100755
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -1,582 +1,335 @@
 (function () {
-  function htmlHint(editor, htmlStructure, getToken) {
-    var cur = editor.getCursor();
-    var token = getToken(editor, cur);
-    var keywords = [];
-    var i = 0;
-    var j = 0;
-    var k = 0;
-    var from = {line: cur.line, ch: cur.ch};
-    var to = {line: cur.line, ch: cur.ch};
-    var flagClean = true;
+  var langs = "ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" ");
+  var targets = ["_blank", "_self", "_top", "_parent"];
+  var charsets = ["ascii", "utf-8", "utf-16", "latin1", "latin1"];
+  var methods = ["get", "post", "put", "delete"];
+  var encs = ["application/x-www-form-urlencoded", "multipart/form-data", "text/plain"];
+  var media = ["all", "screen", "print", "embossed", "braille", "handheld", "print", "projection", "screen", "tty", "tv", "speech",
+               "3d-glasses", "resolution [>][<][=] [X]", "device-aspect-ratio: X/Y", "orientation:portrait",
+               "orientation:landscape", "device-height: [X]", "device-width: [X]"];
+  var s = { attrs: {} }; // Simple tag, reused for a whole lot of tags
 
-    var text = editor.getRange({line: 0, ch: 0}, cur);
-
-    var open = text.lastIndexOf('<');
-    var close = text.lastIndexOf('>');
-    var tokenString = token.string.replace("<","");
-
-    if(open > close) {
-      var last = editor.getRange({line: cur.line, ch: cur.ch - 1}, cur);
-      if(last == "<") {
-        for(i = 0; i < htmlStructure.length; i++) {
-          keywords.push(htmlStructure[i].tag);
-        }
-        from.ch = token.start + 1;
-      } else {
-        var counter = 0;
-        var found = function(token, type, position) {
-          counter++;
-          if(counter > 50) return;
-          if(token.type == type) {
-            return token;
-          } else {
-            position.ch = token.start;
-            var newToken = editor.getTokenAt(position);
-            return found(newToken, type, position);
-          }
-        };
-
-        var nodeToken = found(token, "tag", {line: cur.line, ch: cur.ch});
-        var node = nodeToken.string.substring(1);
-
-        if(token.type === null && token.string.trim() === "") {
-          for(i = 0; i < htmlStructure.length; i++) {
-            if(htmlStructure[i].tag == node) {
-              for(j = 0; j < htmlStructure[i].attr.length; j++) {
-                keywords.push(htmlStructure[i].attr[j].key + "=\"\" ");
-              }
-
-              for(k = 0; k < globalAttributes.length; k++) {
-                keywords.push(globalAttributes[k].key + "=\"\" ");
-              }
-            }
-          }
-        } else if(token.type == "string") {
-          tokenString = tokenString.substring(1, tokenString.length - 1);
-          var attributeToken = found(token, "attribute", {line: cur.line, ch: cur.ch});
-          var attribute = attributeToken.string;
-
-          for(i = 0; i < htmlStructure.length; i++) {
-            if(htmlStructure[i].tag == node) {
-              for(j = 0; j < htmlStructure[i].attr.length; j++) {
-                if(htmlStructure[i].attr[j].key == attribute) {
-                  for(k = 0; k < htmlStructure[i].attr[j].values.length; k++) {
-                    keywords.push(htmlStructure[i].attr[j].values[k]);
-                  }
-                }
-              }
-
-              for(j = 0; j < globalAttributes.length; j++) {
-                if(globalAttributes[j].key == attribute) {
-                  for(k = 0; k < globalAttributes[j].values.length; k++) {
-                    keywords.push(globalAttributes[j].values[k]);
-                  }
-                }
-              }
-            }
-          }
-          from.ch = token.start + 1;
-        } else if(token.type == "attribute") {
-          for(i = 0; i < htmlStructure.length; i++) {
-            if(htmlStructure[i].tag == node) {
-              for(j = 0; j < htmlStructure[i].attr.length; j++) {
-                keywords.push(htmlStructure[i].attr[j].key + "=\"\" ");
-              }
-
-              for(k = 0; k < globalAttributes.length; k++) {
-                keywords.push(globalAttributes[k].key + "=\"\" ");
-              }
-            }
-          }
-          from.ch = token.start;
-        } else if(token.type == "tag") {
-          for(i = 0; i < htmlStructure.length; i++) {
-            keywords.push(htmlStructure[i].tag);
-          }
-
-          from.ch = token.start + 1;
-        }
+  var data = {
+    a: {
+      attrs: {
+        href: null, ping: null, type: null,
+        media: media,
+        target: targets,
+        hreflang: langs
       }
-    } else {
-      for(i = 0; i < htmlStructure.length; i++) {
-        keywords.push("<" + htmlStructure[i].tag);
+    },
+    abbr: s,
+    acronym: s,
+    address: s,
+    applet: s,
+    area: {
+      attrs: {
+        alt: null, coords: null, href: null, target: null, ping: null,
+        media: media, hreflang: langs, type: null,
+        shape: ["default", "rect", "circle", "poly"]
       }
-
-      tokenString = ("<" + tokenString).trim();
-      from.ch = token.start;
-    }
-
-    if(flagClean === true && tokenString.trim() === "") {
-      flagClean = false;
-    }
-
-    if(flagClean) {
-      keywords = cleanResults(tokenString, keywords);
-    }
-
-    return {list: keywords, from: from, to: to};
-  }
-
-
-  var cleanResults = function(text, keywords) {
-    var results = [];
-    var i = 0;
-
-    for(i = 0; i < keywords.length; i++) {
-      if(keywords[i].substring(0, text.length) == text) {
-        results.push(keywords[i]);
+    },
+    article: s,
+    aside: s,
+    audio: {
+      attrs: {
+        src: null, mediagroup: null,
+        crossorigin: ["anonymous", "use-credentials"],
+        preload: ["none", "metadata", "auto"],
+        autoplay: ["", "autoplay"],
+        loop: ["", "loop"],
+        controls: ["", "controls"]
       }
-    }
-
-    return results;
+    },
+    b: s,
+    base: { attrs: { href: null, target: targets } },
+    basefont: s,
+    bdi: s,
+    bdo: s,
+    big: s,
+    blockquote: { attrs: { cite: null } },
+    body: s,
+    br: s,
+    button: {
+      attrs: {
+        form: null, formaction: null, name: null, value: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "autofocus"],
+        formenctype: encs,
+        formmethod: methods,
+        formnovalidate: ["", "novalidate"],
+        formtarget: targets,
+        type: ["submit", "reset", "button"]
+      }
+    },
+    canvas: { attrs: { width: null, height: null } },
+    caption: s,
+    center: s,
+    cite: s,
+    code: s,
+    col: { attrs: { span: null } },
+    colgroup: { attrs: { span: null } },
+    command: {
+      attrs: {
+        type: ["command", "checkbox", "radio"],
+        label: null, icon: null, radiogroup: null, command: null, title: null,
+        disabled: ["", "disabled"],
+        checked: ["", "checked"]
+      }
+    },
+    data: { attrs: { value: null } },
+    datagrid: { attrs: { disabled: ["", "disabled"], multiple: ["", "multiple"] } },
+    datalist: { attrs: { data: null } },
+    dd: s,
+    del: { attrs: { cite: null, datetime: null } },
+    details: { attrs: { open: ["", "open"] } },
+    dfn: s,
+    dir: s,
+    div: s,
+    dl: s,
+    dt: s,
+    em: s,
+    embed: { attrs: { src: null, type: null, width: null, height: null } },
+    eventsource: { attrs: { src: null } },
+    fieldset: { attrs: { disabled: ["", "disabled"], form: null, name: null } },
+    figcaption: s,
+    figure: s,
+    font: s,
+    footer: s,
+    form: {
+      attrs: {
+        action: null, name: null,
+        "accept-charset": charsets,
+        autocomplete: ["on", "off"],
+        enctype: encs,
+        method: methods,
+        novalidate: ["", "novalidate"],
+        target: targets
+      }
+    },
+    frame: s,
+    frameset: s,
+    h1: s, h2: s, h3: s, h4: s, h5: s, h6: s,
+    head: {
+      attrs: {},
+      children: ["title", "base", "link", "style", "meta", "script", "noscript", "command"]
+    },
+    header: s,
+    hgroup: s,
+    hr: s,
+    html: {
+      attrs: { manifest: null },
+      children: ["head", "body"]
+    },
+    i: s,
+    iframe: {
+      attrs: {
+        src: null, srcdoc: null, name: null, width: null, height: null,
+        sandbox: ["allow-top-navigation", "allow-same-origin", "allow-forms", "allow-scripts"],
+        seamless: ["", "seamless"]
+      }
+    },
+    img: {
+      attrs: {
+        alt: null, src: null, ismap: null, usemap: null, width: null, height: null,
+        crossorigin: ["anonymous", "use-credentials"]
+      }
+    },
+    input: {
+      attrs: {
+        alt: null, dirname: null, form: null, formaction: null,
+        height: null, list: null, max: null, maxlength: null, min: null,
+        name: null, pattern: null, placeholder: null, size: null, src: null,
+        step: null, value: null, width: null,
+        accept: ["audio/*", "video/*", "image/*"],
+        autocomplete: ["on", "off"],
+        autofocus: ["", "autofocus"],
+        checked: ["", "checked"],
+        disabled: ["", "disabled"],
+        formenctype: encs,
+        formmethod: methods,
+        formnovalidate: ["", "novalidate"],
+        formtarget: targets,
+        multiple: ["", "multiple"],
+        readonly: ["", "readonly"],
+        required: ["", "required"],
+        type: ["hidden", "text", "search", "tel", "url", "email", "password", "datetime", "date", "month",
+               "week", "time", "datetime-local", "number", "range", "color", "checkbox", "radio",
+               "file", "submit", "image", "reset", "button"]
+      }
+    },
+    ins: { attrs: { cite: null, datetime: null } },
+    kbd: s,
+    keygen: {
+      attrs: {
+        challenge: null, form: null, name: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "disabled"],
+        keytype: ["RSA"]
+      }
+    },
+    label: { attrs: { "for": null, form: null } },
+    legend: s,
+    li: { attrs: { value: null } },
+    link: {
+      attrs: {
+        href: null, type: null,
+        hreflang: langs,
+        media: media,
+        sizes: ["all", "16x16", "16x16 32x32", "16x16 32x32 64x64"]
+      }
+    },
+    map: { attrs: { name: null } },
+    mark: s,
+    menu: { attrs: { label: null, type: ["list", "context", "toolbar"] } },
+    meta: {
+      attrs: {
+        content: null,
+        charset: charsets,
+        name: ["viewport", "application-name", "author", "description", "generator", "keywords"],
+        "http-equiv": ["content-language", "content-type", "default-style", "refresh"]
+      }
+    },
+    meter: { attrs: { value: null, min: null, low: null, high: null, max: null, optimum: null } },
+    nav: s,
+    noframes: s,
+    noscript: s,
+    object: {
+      attrs: {
+        data: null, type: null, name: null, usemap: null, form: null, width: null, height: null,
+        typemustmatch: ["", "typemustmatch"]
+      }
+    },
+    ol: { attrs: { reversed: ["", "reversed"], start: null, type: ["1", "a", "A", "i", "I"] } },
+    optgroup: { attrs: { disabled: ["", "disabled"], label: null } },
+    option: { attrs: { disabled: ["", "disabled"], label: null, selected: ["", "selected"], value: null } },
+    output: { attrs: { "for": null, form: null, name: null } },
+    p: s,
+    param: { attrs: { name: null, value: null } },
+    pre: s,
+    progress: { attrs: { value: null, max: null } },
+    q: { attrs: { cite: null } },
+    rp: s,
+    rt: s,
+    ruby: s,
+    s: s,
+    samp: s,
+    script: {
+      attrs: {
+        type: ["text/javascript"],
+        src: null,
+        async: ["", "async"],
+        defer: ["", "defer"],
+        charset: charsets
+      }
+    },
+    section: s,
+    select: {
+      attrs: {
+        form: null, name: null, size: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "disabled"],
+        multiple: ["", "multiple"]
+      }
+    },
+    small: s,
+    source: { attrs: { src: null, type: null, media: null } },
+    span: s,
+    strike: s,
+    strong: s,
+    style: {
+      attrs: {
+        type: ["text/css"],
+        media: media,
+        scoped: null
+      }
+    },
+    sub: s,
+    summary: s,
+    sup: s,
+    table: s,
+    tbody: s,
+    td: { attrs: { colspan: null, rowspan: null, headers: null } },
+    textarea: {
+      attrs: {
+        dirname: null, form: null, maxlength: null, name: null, placeholder: null,
+        rows: null, cols: null,
+        autofocus: ["", "autofocus"],
+        disabled: ["", "disabled"],
+        readonly: ["", "readonly"],
+        required: ["", "required"],
+        wrap: ["soft", "hard"]
+      }
+    },
+    tfoot: s,
+    th: { attrs: { colspan: null, rowspan: null, headers: null, scope: ["row", "col", "rowgroup", "colgroup"] } },
+    thead: s,
+    time: { attrs: { datetime: null } },
+    title: s,
+    tr: s,
+    track: {
+      attrs: {
+        src: null, label: null, "default": null,
+        kind: ["subtitles", "captions", "descriptions", "chapters", "metadata"],
+        srclang: langs
+      }
+    },
+    tt: s,
+    u: s,
+    ul: s,
+    "var": s,
+    video: {
+      attrs: {
+        src: null, poster: null, width: null, height: null,
+        crossorigin: ["anonymous", "use-credentials"],
+        preload: ["auto", "metadata", "none"],
+        autoplay: ["", "autoplay"],
+        mediagroup: ["movie"],
+        muted: ["", "muted"],
+        controls: ["", "controls"]
+      }
+    },
+    wbr: s
   };
 
-  var htmlStructure = [
-    {tag: '!DOCTYPE', attr: []},
-    {tag: 'a', attr: [
-      {key: 'href', values: ["#"]},
-      {key: 'target', values: ["_blank","_self","_top","_parent"]},
-      {key: 'ping', values: [""]},
-      {key: 'media', values: ["#"]},
-      {key: 'hreflang', values: ["en","es"]},
-      {key: 'type', values: []}
-    ]},
-    {tag: 'abbr', attr: []},
-    {tag: 'acronym', attr: []},
-    {tag: 'address', attr: []},
-    {tag: 'applet', attr: []},
-    {tag: 'area', attr: [
-      {key: 'alt', values: [""]},
-      {key: 'coords', values: ["rect: left, top, right, bottom","circle: center-x, center-y, radius","poly: x1, y1, x2, y2, ..."]},
-      {key: 'shape', values: ["default","rect","circle","poly"]},
-      {key: 'href', values: ["#"]},
-      {key: 'target', values: ["#"]},
-      {key: 'ping', values: []},
-      {key: 'media', values: []},
-      {key: 'hreflang', values: []},
-      {key: 'type', values: []}
-
-    ]},
-    {tag: 'article', attr: []},
-    {tag: 'aside', attr: []},
-    {tag: 'audio', attr: [
-      {key: 'src', values: []},
-      {key: 'crossorigin', values: ["anonymous","use-credentials"]},
-      {key: 'preload', values: ["none","metadata","auto"]},
-      {key: 'autoplay', values: ["","autoplay"]},
-      {key: 'mediagroup', values: []},
-      {key: 'loop', values: ["","loop"]},
-      {key: 'controls', values: ["","controls"]}
-    ]},
-    {tag: 'b', attr: []},
-    {tag: 'base', attr: [
-      {key: 'href', values: ["#"]},
-      {key: 'target', values: ["_blank","_self","_top","_parent"]}
-    ]},
-    {tag: 'basefont', attr: []},
-    {tag: 'bdi', attr: []},
-    {tag: 'bdo', attr: []},
-    {tag: 'big', attr: []},
-    {tag: 'blockquote', attr: [
-      {key: 'cite', values: ["http://"]}
-    ]},
-    {tag: 'body', attr: []},
-    {tag: 'br', attr: []},
-    {tag: 'button', attr: [
-      {key: 'autofocus', values: ["","autofocus"]},
-      {key: 'disabled', values: ["","disabled"]},
-      {key: 'form', values: []},
-      {key: 'formaction', values: []},
-      {key: 'formenctype', values: ["application/x-www-form-urlencoded","multipart/form-data","text/plain"]},
-      {key: 'formmethod', values: ["get","post","put","delete"]},
-      {key: 'formnovalidate', values: ["","novalidate"]},
-      {key: 'formtarget', values: ["_blank","_self","_top","_parent"]},
-      {key: 'name', values: []},
-      {key: 'type', values: ["submit","reset","button"]},
-      {key: 'value', values: []}
-    ]},
-    {tag: 'canvas', attr: [
-      {key: 'width', values: []},
-      {key: 'height', values: []}
-    ]},
-    {tag: 'caption', attr: []},
-    {tag: 'center', attr: []},
-    {tag: 'cite', attr: []},
-    {tag: 'code', attr: []},
-    {tag: 'col', attr: [
-      {key: 'span', values: []}
-    ]},
-    {tag: 'colgroup', attr: [
-      {key: 'span', values: []}
-    ]},
-    {tag: 'command', attr: [
-      {key: 'type', values: ["command","checkbox","radio"]},
-      {key: 'label', values: []},
-      {key: 'icon', values: []},
-      {key: 'disabled', values: ["","disabled"]},
-      {key: 'checked', values: ["","checked"]},
-      {key: 'radiogroup', values: []},
-      {key: 'command', values: []},
-      {key: 'title', values: []}
-    ]},
-    {tag: 'data', attr: [
-      {key: 'value', values: []}
-    ]},
-    {tag: 'datagrid', attr: [
-      {key: 'disabled', values: ["","disabled"]},
-      {key: 'multiple', values: ["","multiple"]}
-    ]},
-    {tag: 'datalist', attr: [
-      {key: 'data', values: []}
-    ]},
-    {tag: 'dd', attr: []},
-    {tag: 'del', attr: [
-      {key: 'cite', values: []},
-      {key: 'datetime', values: []}
-    ]},
-    {tag: 'details', attr: [
-      {key: 'open', values: ["","open"]}
-    ]},
-    {tag: 'dfn', attr: []},
-    {tag: 'dir', attr: []},
-    {tag: 'div', attr: [
-      {key: 'id', values: []},
-      {key: 'class', values: []},
-      {key: 'style', values: []}
-    ]},
-    {tag: 'dl', attr: []},
-    {tag: 'dt', attr: []},
-    {tag: 'em', attr: []},
-    {tag: 'embed', attr: [
-      {key: 'src', values: []},
-      {key: 'type', values: []},
-      {key: 'width', values: []},
-      {key: 'height', values: []}
-    ]},
-    {tag: 'eventsource', attr: [
-      {key: 'src', values: []}
-    ]},
-    {tag: 'fieldset', attr: [
-      {key: 'disabled', values: ["","disabled"]},
-      {key: 'form', values: []},
-      {key: 'name', values: []}
-    ]},
-    {tag: 'figcaption', attr: []},
-    {tag: 'figure', attr: []},
-    {tag: 'font', attr: []},
-    {tag: 'footer', attr: []},
-    {tag: 'form', attr: [
-      {key: 'accept-charset', values: ["UNKNOWN","utf-8"]},
-      {key: 'action', values: []},
-      {key: 'autocomplete', values: ["on","off"]},
-      {key: 'enctype', values: ["application/x-www-form-urlencoded","multipart/form-data","text/plain"]},
-      {key: 'method', values: ["get","post","put","delete","dialog"]},
-      {key: 'name', values: []},
-      {key: 'novalidate', values: ["","novalidate"]},
-      {key: 'target', values: ["_blank","_self","_top","_parent"]}
-    ]},
-    {tag: 'frame', attr: []},
-    {tag: 'frameset', attr: []},
-    {tag: 'h1', attr: []},
-    {tag: 'h2', attr: []},
-    {tag: 'h3', attr: []},
-    {tag: 'h4', attr: []},
-    {tag: 'h5', attr: []},
-    {tag: 'h6', attr: []},
-    {tag: 'head', attr: []},
-    {tag: 'header', attr: []},
-    {tag: 'hgroup', attr: []},
-    {tag: 'hr', attr: []},
-    {tag: 'html', attr: [
-      {key: 'manifest', values: []}
-    ]},
-    {tag: 'i', attr: []},
-    {tag: 'iframe', attr: [
-      {key: 'src', values: []},
-      {key: 'srcdoc', values: []},
-      {key: 'name', values: []},
-      {key: 'sandbox', values: ["allow-top-navigation","allow-same-origin","allow-forms","allow-scripts"]},
-      {key: 'seamless', values: ["","seamless"]},
-      {key: 'width', values: []},
-      {key: 'height', values: []}
-    ]},
-    {tag: 'img', attr: [
-      {key: 'alt', values: []},
-      {key: 'src', values: []},
-      {key: 'crossorigin', values: ["anonymous","use-credentials"]},
-      {key: 'ismap', values: []},
-      {key: 'usemap', values: []},
-      {key: 'width', values: []},
-      {key: 'height', values: []}
-    ]},
-    {tag: 'input', attr: [
-      {key: 'accept', values: ["audio/*","video/*","image/*"]},
-      {key: 'alt', values: []},
-      {key: 'autocomplete', values: ["on","off"]},
-      {key: 'autofocus', values: ["","autofocus"]},
-      {key: 'checked', values: ["","checked"]},
-      {key: 'disabled', values: ["","disabled"]},
-      {key: 'dirname', values: []},
-      {key: 'form', values: []},
-      {key: 'formaction', values: []},
-      {key: 'formenctype', values: ["application/x-www-form-urlencoded","multipart/form-data","text/plain"]},
-      {key: 'formmethod', values: ["get","post","put","delete"]},
-      {key: 'formnovalidate', values: ["","novalidate"]},
-      {key: 'formtarget', values: ["_blank","_self","_top","_parent"]},
-      {key: 'height', values: []},
-      {key: 'list', values: []},
-      {key: 'max', values: []},
-      {key: 'maxlength', values: []},
-      {key: 'min', values: []},
-      {key: 'multiple', values: ["","multiple"]},
-      {key: 'name', values: []},
-      {key: 'pattern', values: []},
-      {key: 'placeholder', values: []},
-      {key: 'readonly', values: ["","readonly"]},
-      {key: 'required', values: ["","required"]},
-      {key: 'size', values: []},
-      {key: 'src', values: []},
-      {key: 'step', values: []},
-      {key: 'type', values: [
-        "hidden","text","search","tel","url","email","password","datetime","date","month","week","time","datetime-local",
-        "number","range","color","checkbox","radio","file","submit","image","reset","button"
-      ]},
-      {key: 'value', values: []},
-      {key: 'width', values: []}
-    ]},
-    {tag: 'ins', attr: [
-      {key: 'cite', values: []},
-      {key: 'datetime', values: []}
-    ]},
-    {tag: 'kbd', attr: []},
-    {tag: 'keygen', attr: [
-      {key: 'autofocus', values: ["","autofocus"]},
-      {key: 'challenge', values: []},
-      {key: 'disabled', values: ["","disabled"]},
-      {key: 'form', values: []},
-      {key: 'keytype', values: ["RSA"]},
-      {key: 'name', values: []}
-    ]},
-    {tag: 'label', attr: [
-      {key: 'for', values: []},
-      {key: 'form', values: []}
-    ]},
-    {tag: 'legend', attr: []},
-    {tag: 'li', attr: [
-      {key: 'value', values: []}
-    ]},
-    {tag: 'link', attr: [
-      {key: 'href', values: []},
-      {key: 'hreflang', values: ["en","es"]},
-      {key: 'media', values: [
-        "all","screen","print","embossed","braille","handheld","print","projection","screen","tty","tv","speech","3d-glasses",
-        "resolution [>][<][=] [X]dpi","resolution [>][<][=] [X]dpcm","device-aspect-ratio: 16/9","device-aspect-ratio: 4/3",
-        "device-aspect-ratio: 32/18","device-aspect-ratio: 1280/720","device-aspect-ratio: 2560/1440","orientation:portrait",
-        "orientation:landscape","device-height: [X]px","device-width: [X]px","-webkit-min-device-pixel-ratio: 2"
-      ]},
-      {key: 'type', values: []},
-      {key: 'sizes', values: ["all","16x16","16x16 32x32","16x16 32x32 64x64"]}
-    ]},
-    {tag: 'map', attr: [
-      {key: 'name', values: []}
-    ]},
-    {tag: 'mark', attr: []},
-    {tag: 'menu', attr: [
-      {key: 'type', values: ["list","context","toolbar"]},
-      {key: 'label', values: []}
-    ]},
-    {tag: 'meta', attr: [
-      {key: 'charset', attr: ["utf-8"]},
-      {key: 'name', attr: ["viewport","application-name","author","description","generator","keywords"]},
-      {key: 'content', attr: ["","width=device-width","initial-scale=1, maximum-scale=1, minimun-scale=1, user-scale=no"]},
-      {key: 'http-equiv', attr: ["content-language","content-type","default-style","refresh"]}
-    ]},
-    {tag: 'meter', attr: [
-      {key: 'value', values: []},
-      {key: 'min', values: []},
-      {key: 'low', values: []},
-      {key: 'high', values: []},
-      {key: 'max', values: []},
-      {key: 'optimum', values: []}
-    ]},
-    {tag: 'nav', attr: []},
-    {tag: 'noframes', attr: []},
-    {tag: 'noscript', attr: []},
-    {tag: 'object', attr: [
-      {key: 'data', values: []},
-      {key: 'type', values: []},
-      {key: 'typemustmatch', values: ["","typemustmatch"]},
-      {key: 'name', values: []},
-      {key: 'usemap', values: []},
-      {key: 'form', values: []},
-      {key: 'width', values: []},
-      {key: 'height', values: []}
-    ]},
-    {tag: 'ol', attr: [
-      {key: 'reversed', values: ["", "reversed"]},
-      {key: 'start', values: []},
-      {key: 'type', values: ["1","a","A","i","I"]}
-    ]},
-    {tag: 'optgroup', attr: [
-      {key: 'disabled', values: ["","disabled"]},
-      {key: 'label', values: []}
-    ]},
-    {tag: 'option', attr: [
-      {key: 'disabled', values: ["", "disabled"]},
-      {key: 'label', values: []},
-      {key: 'selected', values: ["", "selected"]},
-      {key: 'value', values: []}
-    ]},
-    {tag: 'output', attr: [
-      {key: 'for', values: []},
-      {key: 'form', values: []},
-      {key: 'name', values: []}
-    ]},
-    {tag: 'p', attr: []},
-    {tag: 'param', attr: [
-      {key: 'name', values: []},
-      {key: 'value', values: []}
-    ]},
-    {tag: 'pre', attr: []},
-    {tag: 'progress', attr: [
-      {key: 'value', values: []},
-      {key: 'max', values: []}
-    ]},
-    {tag: 'q', attr: [
-      {key: 'cite', values: []}
-    ]},
-    {tag: 'rp', attr: []},
-    {tag: 'rt', attr: []},
-    {tag: 'ruby', attr: []},
-    {tag: 's', attr: []},
-    {tag: 'samp', attr: []},
-    {tag: 'script', attr: [
-      {key: 'type', values: ["text/javascript"]},
-      {key: 'src', values: []},
-      {key: 'async', values: ["","async"]},
-      {key: 'defer', values: ["","defer"]},
-      {key: 'charset', values: ["utf-8"]}
-    ]},
-    {tag: 'section', attr: []},
-    {tag: 'select', attr: [
-      {key: 'autofocus', values: ["", "autofocus"]},
-      {key: 'disabled', values: ["", "disabled"]},
-      {key: 'form', values: []},
-      {key: 'multiple', values: ["", "multiple"]},
-      {key: 'name', values: []},
-      {key: 'size', values: []}
-    ]},
-    {tag: 'small', attr: []},
-    {tag: 'source', attr: [
-      {key: 'src', values: []},
-      {key: 'type', values: []},
-      {key: 'media', values: []}
-    ]},
-    {tag: 'span', attr: []},
-    {tag: 'strike', attr: []},
-    {tag: 'strong', attr: []},
-    {tag: 'style', attr: [
-      {key: 'type', values: ["text/css"]},
-      {key: 'media', values: ["all","braille","print","projection","screen","speech"]},
-      {key: 'scoped', values: []}
-    ]},
-    {tag: 'sub', attr: []},
-    {tag: 'summary', attr: []},
-    {tag: 'sup', attr: []},
-    {tag: 'table', attr: [
-      {key: 'border', values: []}
-    ]},
-    {tag: 'tbody', attr: []},
-    {tag: 'td', attr: [
-      {key: 'colspan', values: []},
-      {key: 'rowspan', values: []},
-      {key: 'headers', values: []}
-    ]},
-    {tag: 'textarea', attr: [
-      {key: 'autofocus', values: ["","autofocus"]},
-      {key: 'disabled', values: ["","disabled"]},
-      {key: 'dirname', values: []},
-      {key: 'form', values: []},
-      {key: 'maxlength', values: []},
-      {key: 'name', values: []},
-      {key: 'placeholder', values: []},
-      {key: 'readonly', values: ["","readonly"]},
-      {key: 'required', values: ["","required"]},
-      {key: 'rows', values: []},
-      {key: 'cols', values: []},
-      {key: 'wrap', values: ["soft","hard"]}
-    ]},
-    {tag: 'tfoot', attr: []},
-    {tag: 'th', attr: [
-      {key: 'colspan', values: []},
-      {key: 'rowspan', values: []},
-      {key: 'headers', values: []},
-      {key: 'scope', values: ["row","col","rowgroup","colgroup"]}
-    ]},
-    {tag: 'thead', attr: []},
-    {tag: 'time', attr: [
-      {key: 'datetime', values: []}
-    ]},
-    {tag: 'title', attr: []},
-    {tag: 'tr', attr: []},
-    {tag: 'track', attr: [
-      {key: 'kind', values: ["subtitles","captions","descriptions","chapters","metadata"]},
-      {key: 'src', values: []},
-      {key: 'srclang', values: ["en","es"]},
-      {key: 'label', values: []},
-      {key: 'default', values: []}
-    ]},
-    {tag: 'tt', attr: []},
-    {tag: 'u', attr: []},
-    {tag: 'ul', attr: []},
-    {tag: 'var', attr: []},
-    {tag: 'video', attr: [
-      {key: "src", values: []},
-      {key: "crossorigin", values: ["anonymous","use-credentials"]},
-      {key: "poster", values: []},
-      {key: "preload", values: ["auto","metadata","none"]},
-      {key: "autoplay", values: ["","autoplay"]},
-      {key: "mediagroup", values: ["movie"]},
-      {key: "loop", values: ["","loop"]},
-      {key: "muted", values: ["","muted"]},
-      {key: "controls", values: ["","controls"]},
-      {key: "width", values: []},
-      {key: "height", values: []}
-    ]},
-    {tag: 'wbr', attr: []}
-  ];
+  var globalAttrs = {
+    accesskey: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
+    "class": null,
+    contenteditable: ["true", "false"],
+    contextmenu: null,
+    dir: ["ltr", "rtl", "auto"],
+    draggable: ["true", "false", "auto"],
+    dropzone: ["copy", "move", "link", "string:", "file:"],
+    hidden: ["hidden"],
+    id: null,
+    inert: ["inert"],
+    itemid: null,
+    itemprop: null,
+    itemref: null,
+    itemscope: ["itemscope"],
+    itemtype: null,
+    lang: ["en", "es"],
+    spellcheck: ["true", "false"],
+    style: null,
+    tabindex: ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
+    title: null,
+    translate: ["yes", "no"],
+    onclick: null,
+    rel: ["stylesheet", "alternate", "author", "bookmark", "help", "license", "next", "nofollow", "noreferrer", "prefetch", "prev", "search", "tag"]
+  };
+  function populate(obj) {
+    for (var attr in globalAttrs) if (globalAttrs.hasOwnProperty(attr))
+      obj.attrs[attr] = globalAttrs[attr];
+  }
 
-  var globalAttributes = [
-    {key: "accesskey", values: ["a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","0","1","2","3","4","5","6","7","8","9"]},
-    {key: "class", values: []},
-    {key: "contenteditable", values: ["true", "false"]},
-    {key: "contextmenu", values: []},
-    {key: "dir", values: ["ltr","rtl","auto"]},
-    {key: "draggable", values: ["true","false","auto"]},
-    {key: "dropzone", values: ["copy","move","link","string:","file:"]},
-    {key: "hidden", values: ["hidden"]},
-    {key: "id", values: []},
-    {key: "inert", values: ["inert"]},
-    {key: "itemid", values: []},
-    {key: "itemprop", values: []},
-    {key: "itemref", values: []},
-    {key: "itemscope", values: ["itemscope"]},
-    {key: "itemtype", values: []},
-    {key: "lang", values: ["en","es"]},
-    {key: "spellcheck", values: ["true","false"]},
-    {key: "style", values: []},
-    {key: "tabindex", values: ["1","2","3","4","5","6","7","8","9"]},
-    {key: "title", values: []},
-    {key: "translate", values: ["yes","no"]},
-    {key: "onclick", values: []},
-    {key: 'rel', values: ["stylesheet","alternate","author","bookmark","help","license","next","nofollow","noreferrer","prefetch","prev","search","tag"]}
-  ];
+  populate(s);
+  for (var tag in data) if (data.hasOwnProperty(tag) && data[tag] != s)
+    populate(data[tag]);
 
-  CodeMirror.htmlHint = function(editor) {
-    if(String.prototype.trim == undefined) {
-      String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g, '');};
-    }
-    return htmlHint(editor, htmlStructure, function (e, cur) { return e.getTokenAt(cur); });
+  CodeMirror.htmlSchema = data;
+  CodeMirror.htmlHint = function(cm, options) {
+    var local = {schemaInfo: data};
+    if (options) for (var opt in options) local[opt] = options[opt];
+    return CodeMirror.xmlHint(cm, local);
   };
 })();
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 5091354ae9..5b2dd0de1d 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -2,12 +2,12 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>CodeMirror: Close-Tag Demo</title>
+    <title>CodeMirror: HTML completion demo</title>
     <link rel="stylesheet" href="../lib/codemirror.css">
     <script src="../lib/codemirror.js"></script>
     <script src="../addon/hint/show-hint.js"></script>
     <link rel="stylesheet" href="../addon/hint/show-hint.css">
-    <script src="../addon/edit/closetag.js"></script>
+    <script src="../addon/hint/xml-hint.js"></script>
     <script src="../addon/hint/html-hint.js"></script>
     <script src="../mode/xml/xml.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
@@ -21,72 +21,24 @@
   </head>
   <body>
     
-    <h1>HTML5 code completation demo</h1>
-    <ul>
-      <li>Type an html tag. If you press Ctrl+Space a hint panel show the code suggest. You can type to autocomplete tags, attributes if your cursor are inner a tag or attribute values if your cursor are inner a attribute value.</li>
-    </ul>
+    <h1>HTML completion demo</h1>
+    <p>Shows the <a href="xmlcomplete.html">XML completer</a>
+    parameterized with information about the tags in HTML.
+    Press <strong>ctrl-space</strong> to activate completion.</p>
 
-    <form><textarea id="code" name="code">
-<!DOCTYPE html>
-<html lang="en">
+    <div id="code"></div>
 
-  <head>
-    <meta charset="utf-8">
-    <title>Home - W2S Web IDE</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-  </head>
-  
-  <body>
-    
-    <div class="container">
-      
-      <div class="masthead">
-        <h3 class="muted">HTML5 Autocomplete</h3>
-        <div class="navbar">
-          <div class="navbar-inner">
-            <div class="container">
-              <ul class="nav">
-                <li class=" active "><a href="#">Home</a></li>
-                <li class=""><a href="#">Features</a></li>
-                <li class=""><a href="#">Sign In</a></li>
-              </ul>
-            </div>
-          </div>
-        </div><!-- /.navbar -->
-      </div>
-      
-      <!-- Jumbotron -->
-      <div class="jumbotron">
-        <img src="/Images/w2s.png" />
-        <h1>W2S Cloud IDE</h1>
-      </div>
-      
-      <hr>
-      
-      
-      <hr>
-      
-      <div class="footer">
-        Final of html5 autocomplete
-      </div>
-      
-    </div> <!-- /container -->
-  </body>
-</html>
-
-</textarea></form>
     <script type="text/javascript">
       CodeMirror.commands.autocomplete = function(cm) {
           CodeMirror.showHint(cm, CodeMirror.htmlHint);
       }
-        
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: 'text/html',
-        autoCloseTags: true,
-        extraKeys: {"Ctrl-Space": "autocomplete"}
-      });
+      window.onload = function() {
+        editor = CodeMirror(document.getElementById("code"), {
+          mode: "text/html",
+          extraKeys: {"Ctrl-Space": "autocomplete"},
+          value: "<!doctype html>\n<html>\n  " + document.documentElement.innerHTML + "\n</html>"
+        });
+      };
     </script>
   </body>
 </html>
diff --git a/doc/manual.html b/doc/manual.html
index 07e72c7b63..3bfc3d0e91 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1711,6 +1711,17 @@ <h2 id="addons">Add-ons</h2>
       attributes). <a href="../demo/xmlcomplete.html">Demo
       here.</a></dd>
 
+      <dt id="addon_html-hint"><a href="../addon/hint/html-hint.js"><code>hint/html-hint.js</code></a></dt>
+      <dd>Provides schema info to
+      the <a href="#addon_xml-hint">xml-hint</a> addon for HTML
+      documents. Defines a schema
+      object <code>CodeMirror.htmlSchema</code> that you can pass to
+      as a <code>schemaInfo</code> option, and
+      a <code>CodeMirror.htmlHint</code> hinting function that
+      automatically calls <code>CodeMirror.xmlHint</code> with this
+      schema data. See
+      the <a href="../demo/html5complete.html">demo</a>.</dd>
+
       <dt id="addon_python-hint"><a href="../addon/hint/python-hint.js"><code>hint/python-hint.js</code></a></dt>
       <dd>A very simple hinting function for Python code.
       Defines <code>CodeMirror.pythonHint</code>.</dd>

From a22787fa013b6027d8c2ec94b75124a9c19dbb7b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 May 2013 19:35:29 +0200
Subject: [PATCH 0088/4742] Work around IE bug where drag events get fired
 twice

Closes #1551
---
 lib/codemirror.js | 57 ++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a68417598c..37f7a1100d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1744,11 +1744,41 @@ window.CodeMirror = (function() {
     on(document, "mouseup", up);
   }
 
+  function clickInGutter(cm, e) {
+    var display = cm.display;
+    try { var mX = e.clientX, mY = e.clientY; }
+    catch(e) { return false; }
+
+    if (mX >= Math.floor(getRect(display.gutters).right)) return false;
+    e_preventDefault(e);
+    if (!hasHandler(cm, "gutterClick")) return true;
+
+    var lineBox = getRect(display.lineDiv);
+    if (mY > lineBox.bottom) return true;
+    mY -= lineBox.top - display.viewOffset;
+
+    for (var i = 0; i < cm.options.gutters.length; ++i) {
+      var g = display.gutters.childNodes[i];
+      if (g && getRect(g).right >= mX) {
+        var line = lineAtHeight(cm.doc, mY);
+        var gutter = cm.options.gutters[i];
+        signalLater(cm, "gutterClick", cm, line, gutter, e);
+        break;
+      }
+    }
+    return true;
+  }
+
+  // Kludge to work around strange IE behavior where it'll sometimes
+  // re-fire a series of drag-related events right after the drop (#1551)
+  var lastDrop = 0;
+
   function onDrop(e) {
     var cm = this;
     if (eventInWidget(cm.display, e) || (cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))))
       return;
     e_preventDefault(e);
+    if (ie) lastDrop = +new Date;
     var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
     if (!pos || isReadOnly(cm)) return;
     if (files && files.length && window.FileReader && window.File) {
@@ -1788,33 +1818,8 @@ window.CodeMirror = (function() {
     }
   }
 
-  function clickInGutter(cm, e) {
-    var display = cm.display;
-    try { var mX = e.clientX, mY = e.clientY; }
-    catch(e) { return false; }
-
-    if (mX >= Math.floor(getRect(display.gutters).right)) return false;
-    e_preventDefault(e);
-    if (!hasHandler(cm, "gutterClick")) return true;
-
-    var lineBox = getRect(display.lineDiv);
-    if (mY > lineBox.bottom) return true;
-    mY -= lineBox.top - display.viewOffset;
-
-    for (var i = 0; i < cm.options.gutters.length; ++i) {
-      var g = display.gutters.childNodes[i];
-      if (g && getRect(g).right >= mX) {
-        var line = lineAtHeight(cm.doc, mY);
-        var gutter = cm.options.gutters[i];
-        signalLater(cm, "gutterClick", cm, line, gutter, e);
-        break;
-      }
-    }
-    return true;
-  }
-
   function onDragStart(cm, e) {
-    if (ie && !cm.state.draggingText) { e_stop(e); return; }
+    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
     if (eventInWidget(cm.display, e)) return;
 
     var txt = cm.getSelection();

From c71f96fbf30af73c19c8453ea32cfc9d2d053975 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 May 2013 19:59:48 +0200
Subject: [PATCH 0089/4742] [javascript mode] More comma-handling tweaks

Issue #1443
---
 mode/javascript/javascript.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fabe1c42b9..ab76a57e81 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -270,17 +270,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {
-    return expressionInner(type, maybeoperatorComma);
+    return expressionInner(type, false);
   }
   function expressionNoComma(type) {
-    return expressionInner(type, maybeoperatorNoComma);
+    return expressionInner(type, true);
   }
-  function expressionInner(type, maybeop) {
+  function expressionInner(type, noComma) {
+    var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
     if (type == "function") return cont(functiondef);
-    if (type == "keyword c") return cont(maybeexpression);
+    if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
-    if (type == "operator") return cont(expression);
+    if (type == "operator") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), commasep(expressionNoComma, "]"), poplex, maybeop);
     if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeop);
     return cont();
@@ -289,9 +290,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type.match(/[;\}\)\],]/)) return pass();
     return pass(expression);
   }
+  function maybeexpressionNoComma(type) {
+    if (type.match(/[;\}\)\],]/)) return pass();
+    return pass(expressionNoComma);
+  }
 
   function maybeoperatorComma(type, value) {
-    if (type == ",") return pass();
+    if (type == ",") return cont(expression);
     return maybeoperatorNoComma(type, value, maybeoperatorComma);
   }
   function maybeoperatorNoComma(type, value, me) {

From a828fa125508eb7c6e59894af20ff5918811da37 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 May 2013 21:57:40 +0200
Subject: [PATCH 0090/4742] [xml-hint demo] Fix minor bug, add sponsor link

---
 demo/xmlcomplete.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index a03b4c5fcc..5363b39611 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -25,6 +25,10 @@ <h1>CodeMirror: XML Autocomplete demo</h1>
     guides completion. The schema can be customized—see
     the <a href="../doc/manual.html#addon_xml-hint">manual</a>.</p>
 
+    <p>Development of the <code>xml-hint</code> addon was kindly
+    sponsored
+    by <a href="http://www.xperiment.mobi">www.xperiment.mobi</a>.</p>
+
     <script>
       var dummy = {
         attrs: {
@@ -81,6 +85,7 @@ <h1>CodeMirror: XML Autocomplete demo</h1>
       function completeIfInTag(cm) {
         return completeAfter(cm, function() {
           var tok = cm.getTokenAt(cm.getCursor());
+          if (tok.type == "string" && (tok.string.charAt(tok.string.length - 1) != '"' || tok.string.length == 1)) return false;
           var inner = CodeMirror.innerMode(cm.getMode(), tok.state).state;
           return inner.tagName;
         });

From c294a0c91eb7e4059cbf8e665d6895a749745b18 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 May 2013 22:03:39 +0200
Subject: [PATCH 0091/4742] [xml-hint addon] Properly support single-quoted
 attributes

---
 addon/hint/xml-hint.js | 9 +++++++--
 demo/xmlcomplete.html  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index bc26a09c6d..ea5b8d546a 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -5,6 +5,7 @@
 
   CodeMirror.xmlHint = function(cm, options) {
     var tags = options && options.schemaInfo;
+    var quote = (options && options.quoteChar) || '"';
     if (!tags) return;
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
@@ -37,11 +38,15 @@
         var atName = before.match(/([^\s\u00a0=<>\"\']+)=$/), atValues;
         if (!atName || !attrs.hasOwnProperty(atName[1]) || !(atValues = attrs[atName[1]])) return;
         if (token.type == "string") {
-          prefix = token.string.charAt(0) == '"' ? token.string.slice(1) : token.string;
+          prefix = token.string;
+          if (/['"]/.test(token.string.charAt(0))) {
+            quote = token.string.charAt(0);
+            prefix = token.string.slice(1);
+          }
           replaceToken = true;
         }
         for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].indexOf(prefix) == 0)
-          result.push('"' + atValues[i] + '"');
+          result.push(quote + atValues[i] + quote);
       } else { // An attribute name
         if (token.type == "attribute") {
           prefix = token.string;
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index 5363b39611..559451b54f 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -85,7 +85,7 @@ <h1>CodeMirror: XML Autocomplete demo</h1>
       function completeIfInTag(cm) {
         return completeAfter(cm, function() {
           var tok = cm.getTokenAt(cm.getCursor());
-          if (tok.type == "string" && (tok.string.charAt(tok.string.length - 1) != '"' || tok.string.length == 1)) return false;
+          if (tok.type == "string" && (!/['"]/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1)) return false;
           var inner = CodeMirror.innerMode(cm.getMode(), tok.state).state;
           return inner.tagName;
         });

From b9e9d5c3a676f83f2cc8b2793615d31798d52ed3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 May 2013 09:26:47 +0200
Subject: [PATCH 0092/4742] Remove setDragImage call for Safari (again)

Issue #332
---
 lib/codemirror.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 37f7a1100d..0cbfbb1917 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1827,7 +1827,7 @@ window.CodeMirror = (function() {
 
     // Use dummy image instead of default browsers image.
     // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
-    if (e.dataTransfer.setDragImage) {
+    if (e.dataTransfer.setDragImage && !safari) {
       var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
       if (opera) {
         img.width = img.height = 1;
@@ -1835,15 +1835,6 @@ window.CodeMirror = (function() {
         // Force a relayout, or Opera won't use our image for some obscure reason
         img._top = img.offsetTop;
       }
-      if (safari) {
-        if (cm.display.dragImg) {
-          img = cm.display.dragImg;
-        } else {
-          cm.display.dragImg = img;
-          img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
-          cm.display.wrapper.appendChild(img);
-        }
-      }
       e.dataTransfer.setDragImage(img, 0, 0);
       if (opera) img.parentNode.removeChild(img);
     }

From a9d5b3b6108398aa29dfc0a396614a3f93aca483 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 May 2013 09:42:57 +0200
Subject: [PATCH 0093/4742] [xml-hint demo] Disable implicit completion on
 single candidate

When implicitly activating completion, it is undesirable.
---
 demo/xmlcomplete.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index 559451b54f..fdf335b2e7 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -63,14 +63,11 @@ <h1>CodeMirror: XML Autocomplete demo</h1>
         leaves: dummy, stem: dummy, flowers: dummy
       };
 
-      CodeMirror.commands.autocomplete = function(cm) {
-        CodeMirror.showHint(cm, CodeMirror.xmlHint, {schemaInfo: tags});
-      }
-
       function completeAfter(cm, pred) {
         var cur = cm.getCursor();
         if (!pred || pred()) setTimeout(function() {
-          if (!cm.state.completionActive) cm.execCommand("autocomplete");
+          if (!cm.state.completionActive)
+            CodeMirror.showHint(cm, CodeMirror.xmlHint, {schemaInfo: tags, completeSingle: false});
         }, 100);
         return CodeMirror.Pass;
       }
@@ -99,7 +96,9 @@ <h1>CodeMirror: XML Autocomplete demo</h1>
           "'/'": completeIfAfterLt,
           "' '": completeIfInTag,
           "'='": completeIfInTag,
-          "Ctrl-Space": "autocomplete"
+          "Ctrl-Space": function(cm) {
+            CodeMirror.showHint(cm, CodeMirror.xmlHint, {schemaInfo: tags});
+          }
         }
       });
     </script>

From ba5554ddeaae8e6525d7ea196ec8da3ba1dac6a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 May 2013 10:05:15 +0200
Subject: [PATCH 0094/4742] Fix partial-updating of lines with line widgets
 above them

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0cbfbb1917..0865b55889 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -656,25 +656,25 @@ window.CodeMirror = (function() {
 
     if (reuse) {
       reuse.alignable = null;
-      var isOk = true, widgetsSeen = 0;
+      var isOk = true, widgetsSeen = 0, insertBefore = null;
       for (var n = reuse.firstChild, next; n; n = next) {
         next = n.nextSibling;
         if (!/\bCodeMirror-linewidget\b/.test(n.className)) {
           reuse.removeChild(n);
         } else {
           for (var i = 0, first = true; i < line.widgets.length; ++i) {
-            var widget = line.widgets[i], isFirst = false;
-            if (!widget.above) { isFirst = first; first = false; }
+            var widget = line.widgets[i];
+            if (!widget.above) { insertBefore = n; first = false; }
             if (widget.node == n.firstChild) {
               positionLineWidget(widget, n, reuse, dims);
               ++widgetsSeen;
-              if (isFirst) reuse.insertBefore(lineElement, n);
               break;
             }
           }
           if (i == line.widgets.length) { isOk = false; break; }
         }
       }
+      reuse.insertBefore(lineElement, insertBefore);
       if (isOk && widgetsSeen == line.widgets.length) {
         wrap = reuse;
         reuse.className = line.wrapClass || "";

From 3328ed0ebc31182f3853d6564d45bcabcc8c1806 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 12:14:24 +0200
Subject: [PATCH 0095/4742] Reset scrollbarwidth cache when window is resized

Zooming can produce different measurements.
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0865b55889..96a84d3d89 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1518,7 +1518,7 @@ window.CodeMirror = (function() {
       if (resizeTimer == null) resizeTimer = setTimeout(function() {
         resizeTimer = null;
         // Might be a text scaling operation, clear size caches.
-        d.cachedCharWidth = d.cachedTextHeight = null;
+        d.cachedCharWidth = d.cachedTextHeight = knownScrollbarWidth = null;
         clearCaches(cm);
         runInOp(cm, bind(regChange, cm));
       }, 100);

From 0bfab07985e5734a2d8eb364d9d12d4ddcfe1719 Mon Sep 17 00:00:00 2001
From: MinRK <benjaminrk@gmail.com>
Date: Thu, 23 May 2013 12:41:39 -0700
Subject: [PATCH 0096/4742] forgive one pixel in scrollbars

Sometimes I find that CodeMirror adds scrollbars inappropriately (most often due to browser zoom).
Digging around suggested that it is some non-integers resulting in rounding up the measured size,
and I haven't been able to find a case where the two values differ by more than one pixel, so simply setting the threshold one pixel higher seems to address the issue.

This PR forgives one pixel in the size comparison before drawing the scrollbars.
---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 96a84d3d89..717ac6f4d5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -323,8 +323,8 @@ window.CodeMirror = (function() {
     d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
     d.gutters.style.height = Math.max(totalHeight, d.scroller.clientHeight - scrollerCutOff) + "px";
     var scrollHeight = Math.max(totalHeight, d.scroller.scrollHeight);
-    var needsH = d.scroller.scrollWidth > d.scroller.clientWidth;
-    var needsV = scrollHeight > d.scroller.clientHeight;
+    var needsH = d.scroller.scrollWidth > (d.scroller.clientWidth + 1);
+    var needsV = scrollHeight > (d.scroller.clientHeight + 1);
     if (needsV) {
       d.scrollbarV.style.display = "block";
       d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";

From cd6540cb3b6d6e5de55eab2c4b692cbe768d8e97 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 12:36:11 +0200
Subject: [PATCH 0097/4742] Add handleMouseEvents option to markText and
 addLineWidget

---
 doc/manual.html   | 11 +++++++++++
 lib/codemirror.js | 17 ++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 3bfc3d0e91..2b3874aaa5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1090,6 +1090,12 @@ <h3 id="api_marker">Text-marking methods</h3>
         <dd>Use a given node to display this range. Implies both
         collapsed and atomic. The given DOM node <em>must</em> be an
         inline element (as opposed to a block element).</dd>
+        <dt><code><strong>handleMouseEvents</strong>: boolean</code></dt>
+        <dd>When <code>replacedWith</code> is given, this determines
+        whether the editor will capture mouse and drag events
+        occurring in this widget. Default is false—the events will be
+        left alone for the default browser handler, or specific
+        handlers on the widget, to capture.</dd>
         <dt id="mark_readOnly"><code><strong>readOnly</strong>: boolean</code></dt>
         <dd>A read-only span can, as long as it is not cleared, not be
         modified except by
@@ -1231,6 +1237,11 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
           <dt><code><strong>showIfHidden</strong>: boolean</code></dt>
           <dd>When true, will cause the widget to be rendered even if
           the line it is associated with is hidden.</dd>
+          <dt><code><strong>handleMouseEvents</strong>: boolean</code></dt>
+          <dd>Determines whether the editor will capture mouse and
+          drag events occurring in this widget. Default is false—the
+          events will be left alone for the default browser handler,
+          or specific handlers on the widget, to capture.</dd>
         </dl>
       Note that the widget node will become a descendant of nodes with
       CodeMirror-specific CSS classes, and those classes might in some
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 717ac6f4d5..9b6b2e1ecd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -602,8 +602,9 @@ window.CodeMirror = (function() {
       if (nextIntact && nextIntact.to == lineN) nextIntact = intact.shift();
       if (lineIsHidden(cm.doc, line)) {
         if (line.height != 0) updateLineHeight(line, 0);
-        if (line.widgets && cur.previousSibling) for (var i = 0; i < line.widgets.length; ++i)
-          if (line.widgets[i].showIfHidden) {
+        if (line.widgets && cur.previousSibling) for (var i = 0; i < line.widgets.length; ++i) {
+          var w = line.widgets[i];
+          if (w.showIfHidden) {
             var prev = cur.previousSibling;
             if (/pre/i.test(prev.nodeName)) {
               var wrap = elt("div", null, null, "position: relative");
@@ -611,9 +612,11 @@ window.CodeMirror = (function() {
               wrap.appendChild(prev);
               prev = wrap;
             }
-            var wnode = prev.appendChild(elt("div", [line.widgets[i].node], "CodeMirror-linewidget"));
-            positionLineWidget(line.widgets[i], wnode, prev, dims);
+            var wnode = prev.appendChild(elt("div", [w.node], "CodeMirror-linewidget"));
+            if (!w.handleMouseEvents) wnode.ignoreEvents = true;
+            positionLineWidget(w, wnode, prev, dims);
           }
+        }
       } else if (nextIntact && nextIntact.from <= lineN && nextIntact.to > lineN) {
         // This line is intact. Skip to the actual node. Update its
         // line number if needed.
@@ -709,6 +712,7 @@ window.CodeMirror = (function() {
     if (ie_lt8) wrap.style.zIndex = 2;
     if (line.widgets && wrap != reuse) for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
       var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
+      if (!widget.handleMouseEvents) node.ignoreEvents = true;
       positionLineWidget(widget, node, wrap, dims);
       if (widget.above)
         wrap.insertBefore(node, cm.options.lineNumbers && line.height != 0 ? gutterWrap : lineElement);
@@ -1584,9 +1588,7 @@ window.CodeMirror = (function() {
 
   function eventInWidget(display, e) {
     for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
-      if (!n) return true;
-      if (/\bCodeMirror-(?:line)?widget\b/.test(n.className) ||
-          n.parentNode == display.sizer && n != display.mover) return true;
+      if (!n || n.ignoreEvents || n.parentNode == display.sizer && n != display.mover) return true;
     }
   }
 
@@ -3664,6 +3666,7 @@ window.CodeMirror = (function() {
     if (marker.replacedWith) {
       marker.collapsed = true;
       marker.replacedWith = elt("span", [marker.replacedWith], "CodeMirror-widget");
+      if (!options.handleMouseEvents) marker.replacedWith.ignoreEvents = true;
     }
     if (marker.collapsed) sawCollapsedSpans = true;
 

From 41aeb8a512bf2fe7cf52e75465e1701b9124e753 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 13:32:05 +0200
Subject: [PATCH 0098/4742] Take top padding into account in "local" coordinate
 space, fix bug in fromCoordSystem

Issue #1557
---
 lib/codemirror.js | 18 +++++++++---------
 test/test.js      | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9b6b2e1ecd..6b452d699d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1109,7 +1109,8 @@ window.CodeMirror = (function() {
     if (context == "line") return rect;
     if (!context) context = "local";
     var yOff = heightAtLine(cm, lineObj);
-    if (context != "local") yOff -= cm.display.viewOffset;
+    if (context == "local") yOff += paddingTop(cm.display);
+    else yOff -= cm.display.viewOffset;
     if (context == "page") {
       var lOff = getRect(cm.display.lineSpace);
       yOff += lOff.top + (window.pageYOffset || (document.documentElement || document.body).scrollTop);
@@ -1125,19 +1126,18 @@ window.CodeMirror = (function() {
   function fromCoordSystem(cm, coords, context) {
     if (context == "div") return coords;
     var left = coords.left, top = coords.top;
+    // First move into "page" coordinate system
     if (context == "page") {
       left -= window.pageXOffset || (document.documentElement || document.body).scrollLeft;
       top -= window.pageYOffset || (document.documentElement || document.body).scrollTop;
+    } else if (context == "local" || !context) {
+      var localBox = getRect(cm.display.sizer);
+      left += localBox.left;
+      top += localBox.top;
     }
+
     var lineSpaceBox = getRect(cm.display.lineSpace);
-    left -= lineSpaceBox.left;
-    top -= lineSpaceBox.top;
-    if (context == "local" || !context) {
-      var editorBox = getRect(cm.display.wrapper);
-      left += editorBox.left;
-      top += editorBox.top;
-    }
-    return {left: left, top: top};
+    return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
   }
 
   function charCoords(cm, pos, context, lineObj) {
diff --git a/test/test.js b/test/test.js
index d42a76bd41..ec309107bf 100644
--- a/test/test.js
+++ b/test/test.js
@@ -211,15 +211,18 @@ testCM("coords", function(cm) {
 
 testCM("coordsChar", function(cm) {
   addDoc(cm, 35, 70);
-  for (var ch = 0; ch <= 35; ch += 5) {
-    for (var line = 0; line < 70; line += 5) {
-      cm.setCursor(line, ch);
-      var coords = cm.charCoords(Pos(line, ch));
-      var pos = cm.coordsChar({left: coords.left, top: coords.top + 5});
-      eqPos(pos, Pos(line, ch));
+  for (var i = 0; i < 2; ++i) {
+    var sys = i ? "local" : "page";
+    for (var ch = 0; ch <= 35; ch += 5) {
+      for (var line = 0; line < 70; line += 5) {
+        cm.setCursor(line, ch);
+        var coords = cm.charCoords(Pos(line, ch), sys);
+        var pos = cm.coordsChar({left: coords.left + 1, top: coords.top + 1}, sys);
+        eqPos(pos, Pos(line, ch));
+      }
     }
   }
-});
+}, {lineNumbers: true});
 
 testCM("posFromIndex", function(cm) {
   cm.setValue(

From b800af364642d1e053cfb3e6f2c196bdd1bc1cd0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 13:39:07 +0200
Subject: [PATCH 0099/4742] Add a lineAtHeight method

Issue #1556
---
 doc/manual.html   | 7 ++++++-
 lib/codemirror.js | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 2b3874aaa5..2d78dbe454 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1299,7 +1299,7 @@ <h3 id="api_sizing">Sizing, scrolling and positioning methods</h3>
       end (<code>false</code>) of the selection, or, if a <code>{line,
       ch}</code> object is given, it specifies the precise position at
       which you want to measure.</dd>
-      <dt id="charCoords"><code><strong>cm.charCoords</strong>(pos: {line, ch}, mode: string) → {left, right, top, bottom}</code></dt>
+      <dt id="charCoords"><code><strong>cm.charCoords</strong>(pos: {line, ch}, ?mode: string) → {left, right, top, bottom}</code></dt>
       <dd>Returns the position and dimensions of an arbitrary
       character. <code>pos</code> should be a <code>{line, ch}</code>
       object. This differs from <code>cursorCoords</code> in that
@@ -1313,6 +1313,11 @@ <h3 id="api_sizing">Sizing, scrolling and positioning methods</h3>
       the coordinates are interpreted. It may
       be <code>"window"</code>, <code>"page"</code> (the default),
       or <code>"local"</code>.</dd>
+      <dt id="lineAtHeight"><code><strong>cm.lineAtHeight</strong>(height: number, ?mode: string) → number</code></dt>
+      <dd>Computes the line at the given pixel
+      height. <code>mode</code> can be one of the same strings
+      that <a href="#coordsChar"><code>coordsChar</code></a>
+      accepts.</dd>
       <dt id="defaultTextHeight"><code><strong>cm.defaultTextHeight</strong>() → number</code></dt>
       <dd>Returns the line height of the default font for the editor.</dd>
       <dt id="defaultCharWidth"><code><strong>cm.defaultCharWidth</strong>() → number</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6b452d699d..191804ccc0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2851,6 +2851,11 @@ window.CodeMirror = (function() {
       return coordsChar(this, coords.left, coords.top);
     },
 
+    lineAtHeight: function(height, mode) {
+      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
+      return lineAtHeight(this.doc, height + this.display.viewOffset);
+    },
+
     defaultTextHeight: function() { return textHeight(this.display); },
     defaultCharWidth: function() { return charWidth(this.display); },
 

From fb6df7fb3bb796eb26185e9dda894b0b868f92aa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 13:47:45 +0200
Subject: [PATCH 0100/4742] [vim keymap] Fix reliance on bug in coordsChar

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 51b93aec30..d29f39cac4 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2811,10 +2811,10 @@
     }
     function getUserVisibleLines(cm) {
       var scrollInfo = cm.getScrollInfo();
-      var occludeTorleranceTop = 6;
-      var occludeTorleranceBottom = 10;
-      var from = cm.coordsChar({left:0, top: occludeTorleranceTop}, 'local');
-      var bottomY = scrollInfo.clientHeight - occludeTorleranceBottom;
+      var occludeToleranceTop = 6;
+      var occludeToleranceBottom = 10;
+      var from = cm.coordsChar({left:0, top: occludeToleranceTop + scrollInfo.top}, 'local');
+      var bottomY = scrollInfo.clientHeight - occludeToleranceBottom + scrollInfo.top;
       var to = cm.coordsChar({left:0, top: bottomY}, 'local');
       return {top: from.line, bottom: to.line};
     }

From a8088496ad582499fe7fb9a22b1f6ae66f6b88bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 14:09:01 +0200
Subject: [PATCH 0101/4742] [closebrackets addon] Add 'explode' feature

Issue #1552
---
 addon/edit/closebrackets.js | 40 ++++++++++++++++++++++++++++++-------
 doc/manual.html             | 12 +++++++----
 2 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 2abc8c5fe6..32819516fb 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -1,23 +1,36 @@
 (function() {
   var DEFAULT_BRACKETS = "()[]{}''\"\"";
+  var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
   var SPACE_CHAR_REGEX = /\s/;
 
   CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
-    var wasOn = old && old != CodeMirror.Init;
-    if (val && !wasOn)
-      cm.addKeyMap(buildKeymap(typeof val == "string" ? val : DEFAULT_BRACKETS));
-    else if (!val && wasOn)
+    if (old != CodeMirror.Init && old)
       cm.removeKeyMap("autoCloseBrackets");
+    if (!val) return;
+    var pairs = DEFAULT_BRACKETS, explode = DEFAULT_EXPLODE_ON_ENTER;
+    if (typeof val == "string") pairs = val;
+    else if (typeof val == "object") {
+      if (val.pairs != null) pairs = val.pairs;
+      if (val.explode != null) explode = val.explode;
+    }
+    var map = buildKeymap(pairs);
+    if (explode) map.Enter = buildExplodeHandler(explode);
+    cm.addKeyMap(map);
   });
 
+  function charsAround(cm, pos) {
+    var str = cm.getRange(CodeMirror.Pos(pos.line, pos.ch - 1),
+                          CodeMirror.Pos(pos.line, pos.ch + 1));
+    return str.length == 2 ? str : null;
+  }
+
   function buildKeymap(pairs) {
     var map = {
       name : "autoCloseBrackets",
       Backspace: function(cm) {
         if (cm.somethingSelected()) return CodeMirror.Pass;
-        var cur = cm.getCursor(), line = cm.getLine(cur.line);
-        if (cur.ch && cur.ch < line.length &&
-          pairs.indexOf(line.slice(cur.ch - 1, cur.ch + 1)) % 2 == 0)
+        var cur = cm.getCursor(), around = charsAround(cm, cur);
+        if (around && pairs.indexOf(line.slice(cur.ch - 1, cur.ch + 1)) % 2 == 0)
           cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
         else
           return CodeMirror.Pass;
@@ -51,4 +64,17 @@
     })(pairs.charAt(i), pairs.charAt(i + 1));
     return map;
   }
+
+  function buildExplodeHandler(pairs) {
+    return function(cm) {
+      var cur = cm.getCursor(), around = charsAround(cm, cur);
+      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+      cm.operation(function() {
+        var newPos = CodeMirror.Pos(cur.line + 1, 0);
+        cm.replaceSelection("\n\n", {anchor: newPos, head: newPos}, "+input");
+        cm.indentLine(cur.line + 1, null, true);
+        cm.indentLine(cur.line + 2, null, true);
+      });
+    };
+  }
 })();
diff --git a/doc/manual.html b/doc/manual.html
index 2d78dbe454..cc9a1d8b86 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1574,10 +1574,14 @@ <h2 id="addons">Add-ons</h2>
       <dt id="addon_closebrackets"><a href="../addon/edit/closebrackets.js"><code>edit/closebrackets.js</code></a></dt>
       <dd>Defines an option <code>autoCloseBrackets</code> that will
       auto-close brackets and quotes when typed. By default, it'll
-      auto-close <code>()[]{}''""</code>, but you can pass it a
-      string similar to that (containing pairs of matching characters)
-      to customize it. <a href="../demo/closebrackets.html">Demo
-      here</a>.</dd>
+      auto-close <code>()[]{}''""</code>, but you can pass it a string
+      similar to that (containing pairs of matching characters), or an
+      object with <code>pairs</code> and
+      optionally <code>explode</code> properties to customize
+      it. <code>explode</code> should be a similar string that gives
+      the pairs of characters that, when enter is pressed between
+      them, should have the second character also moved to its own
+      line. <a href="../demo/closebrackets.html">Demo here</a>.</dd>
 
       <dt id="addon_trailingspace"><a href="../addon/edit/trailingspace.js"><code>edit/trailingspace.js</code></a></dt>
       <dd>Adds an option <code>showTrailingSpace</code> which, when

From a092d987583dbc677deae277707037ef23c1476f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 14:35:21 +0200
Subject: [PATCH 0102/4742] [show-hint addon] More complete documentation

---
 doc/manual.html | 69 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index cc9a1d8b86..ffa7c6f09c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1695,14 +1695,69 @@ <h2 id="addons">Add-ons</h2>
       <dt id="addon_show-hint"><a href="../addon/hint/show-hint.js"><code>hint/show-hint.js</code></a></dt>
       <dd>Provides a framework for showing autocompletion hints.
       Defines <code>CodeMirror.showHint</code>, which takes a
-      CodeMirror instance and a hinting function, and pops up a widget
-      that allows the user to select a completion. Hinting functions
-      are function that take an editor instance, and return
+      CodeMirror instance, a hinting function, and optionally an
+      options object, and pops up a widget that allows the user to
+      select a completion. Hinting functions are function that take an
+      editor instance and an optional options object, and return
       a <code>{list, from, to}</code> object, where <code>list</code>
-      is an array of strings (the completions), and <code>from</code>
-      and <code>to</code> give the start and end of the token that is
-      being completed. Depends
-      on <code>addon/hint/show-hint.css</code>. Check
+      is an array of strings or objects (the completions),
+      and <code>from</code> and <code>to</code> give the start and end
+      of the token that is being completed. When completions aren't
+      simple strings, they should be objects with the folowing
+      properties:
+      <dl>
+        <dt><code><strong>text</strong>: string</code></dt>
+        <dd>The completion text. This is the only required
+        property.</dd>
+        <dt><code><strong>displayText</strong>: string</code></dt>
+        <dd>The text that should be displayed in the menu.</dd>
+        <dt><code><strong>className</strong>: string</code></dt>
+        <dd>A CSS class name to apply to the completion's line in the
+        menu.</dd>
+        <dt><code><strong>render</strong>: fn(Element, self, data)</code></dt>
+        <dd>A method used to create the DOM structure for showing the
+        completion by appending it to its first argument.</dd>
+        <dt><code><strong>hint</strong>: fn(CodeMirror, self, data)</code></dt>
+        <dd>A method used to actually apply the completion, instead of
+        the default behavior.</dd>
+      </dl>
+      The plugin understands the following options (the options object
+      will also be passed along to the hinting function, which may
+      understand additional options):
+      <dl>
+        <dt><code><strong>async</strong>: boolean</code></dt>
+        <dd>When set to true, the hinting function's signature should
+        be <code>(cm, callback, ?options)</code>, and the completion
+        interface will only be popped up when the hinting function
+        calls the callback, passing it the object holding the
+        completions.</dd>
+        <dt><code><strong>completeSingle</strong>: boolean</code></dt>
+        <dd>Determines whether, when only a single completion is
+        available, it is completed without showing the dialog.
+        Defaults to true.</dd>
+        <dt><code><strong>alignWithWord</strong>: boolean</code></dt>
+        <dd>Whether the pop-up should be horizontally aligned with the
+        start of the word (true, default), or with the cursor (false).</dd>
+        <dt><code><strong>customKeys</strong>: keymap</code></dt>
+        <dd>Allows you to provide a custom keymap of keys to be active
+        when the pop-up is active. To bind a key to a behavior that is
+        already present in the default keymap, bind it to the name of
+        the key in the default keymap (for example <code>"Up"</code>).</dd>
+      </dl>
+      The following events will be fired on the completions object
+      during completion:
+      <dl>
+        <dt><code><strong>"shown"</strong> ()</code></dt>
+        <dd>Fired when the pop-up is shown.</dd>
+        <dt><code><strong>"select"</strong> (completion, Element)</code></dt>
+        <dd>Fired when a completion is selected. Passed the completion
+        value (string or object) and the DOM node that represents it
+        in the menu.</dd>
+        <dt><code><strong>"close"</strong> ()</code></dt>
+        <dd>Fired when the completion is finished.</dd>
+      </dl>
+      This addon depends styles
+      from <code>addon/hint/show-hint.css</code>. Check
       out <a href="../demo/complete.html">the demo</a> for an
       example.</dd>
 

From 2e62847db235b3e63a7d75026fb2d6e25e5f798b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 14:47:55 +0200
Subject: [PATCH 0103/4742] [show-hint addon] Make sure to clear
 state.completionActive when no match is found

---
 addon/hint/show-hint.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 504fda786b..a0661e4622 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -24,12 +24,17 @@ CodeMirror.showHint = function(cm, getHints, options) {
   }
 
   function showHints(data) {
-    if (!data || !data.list.length) return;
+    if (!data || !data.list.length) {
+      if (continued) {
+        cm.state.completionActive = false;
+        CodeMirror.signal(data, "close");
+      }
+      return;
+    }
+
     var completions = data.list;
-    // When there is only one completion, use it directly.
-    if (!continued && options.completeSingle !== false && completions.length == 1) {
+    if (!continued && options.completeSingle != false && completions.length == 1) {
       pickCompletion(cm, data, completions[0]);
-      CodeMirror.signal(data, "close");
       return true;
     }
 

From 8955ce4817a754674594144b64aa1bac59c227d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 15:16:50 +0200
Subject: [PATCH 0104/4742] Add support for "window" coordinate system to
 charCoords/cursorCoords

---
 lib/codemirror.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 191804ccc0..a5fc2f2ed3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1100,6 +1100,9 @@ window.CodeMirror = (function() {
     cm.display.lineNumChars = null;
   }
 
+  function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }
+  function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }
+
   // Context is one of "line", "div" (display.lineDiv), "local"/null (editor), or "page"
   function intoCoordSystem(cm, lineObj, rect, context) {
     if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
@@ -1111,10 +1114,10 @@ window.CodeMirror = (function() {
     var yOff = heightAtLine(cm, lineObj);
     if (context == "local") yOff += paddingTop(cm.display);
     else yOff -= cm.display.viewOffset;
-    if (context == "page") {
+    if (context == "page" || context == "window") {
       var lOff = getRect(cm.display.lineSpace);
-      yOff += lOff.top + (window.pageYOffset || (document.documentElement || document.body).scrollTop);
-      var xOff = lOff.left + (window.pageXOffset || (document.documentElement || document.body).scrollLeft);
+      yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
+      var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
       rect.left += xOff; rect.right += xOff;
     }
     rect.top += yOff; rect.bottom += yOff;
@@ -1128,8 +1131,8 @@ window.CodeMirror = (function() {
     var left = coords.left, top = coords.top;
     // First move into "page" coordinate system
     if (context == "page") {
-      left -= window.pageXOffset || (document.documentElement || document.body).scrollLeft;
-      top -= window.pageYOffset || (document.documentElement || document.body).scrollTop;
+      left -= pageScrollX();
+      top -= pageScrollY();
     } else if (context == "local" || !context) {
       var localBox = getRect(cm.display.sizer);
       left += localBox.left;

From 14fc698b95f4229bf4609e84caf2194c9c2c214b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 15:25:58 +0200
Subject: [PATCH 0105/4742] Remove explicit compensation for paddingTop in
 scrolling code

Local coords now include paddingTop.

Issue #1557
---
 lib/codemirror.js | 13 ++++++-------
 test/test.js      | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a5fc2f2ed3..f56c6880e4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2537,9 +2537,9 @@ window.CodeMirror = (function() {
   function scrollCursorIntoView(cm) {
     var coords = scrollPosIntoView(cm, cm.doc.sel.head, cm.options.cursorScrollMargin);
     if (!cm.state.focused) return;
-    var display = cm.display, box = getRect(display.sizer), doScroll = null, pTop = paddingTop(cm.display);
-    if (coords.top + pTop + box.top < 0) doScroll = true;
-    else if (coords.bottom + pTop + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
+    var display = cm.display, box = getRect(display.sizer), doScroll = null;
+    if (coords.top + box.top < 0) doScroll = true;
+    else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
     if (doScroll != null && !phantom) {
       var hidden = display.cursor.style.display == "none";
       if (hidden) {
@@ -2577,12 +2577,11 @@ window.CodeMirror = (function() {
   }
 
   function calculateScrollPos(cm, x1, y1, x2, y2) {
-    var display = cm.display, pt = paddingTop(display);
-    y1 += pt; y2 += pt;
+    var display = cm.display, snapMargin = textHeight(cm.display);
     if (y1 < 0) y1 = 0;
     var screen = display.scroller.clientHeight - scrollerCutOff, screentop = display.scroller.scrollTop, result = {};
     var docBottom = cm.doc.height + paddingVert(display);
-    var atTop = y1 < pt + 10, atBottom = y2 + pt > docBottom - 10;
+    var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
     if (y1 < screentop) {
       result.scrollTop = atTop ? 0 : y1;
     } else if (y2 > screentop + screen) {
@@ -2950,7 +2949,7 @@ window.CodeMirror = (function() {
         if (left + node.offsetWidth > hspace)
           left = hspace - node.offsetWidth;
       }
-      node.style.top = (top + paddingTop(display)) + "px";
+      node.style.top = top + "px";
       node.style.left = node.style.right = "";
       if (horiz == "right") {
         left = display.sizer.clientWidth - node.offsetWidth;
diff --git a/test/test.js b/test/test.js
index ec309107bf..07e2d67130 100644
--- a/test/test.js
+++ b/test/test.js
@@ -516,6 +516,24 @@ testCM("scrollSnap", function(cm) {
   is(info.left == 0 && info.top + 2 > info.height - cm.getScrollerElement().clientHeight, "scrolled clean to bottom");
 });
 
+testCM("scrollIntoView", function(cm) {
+  var outer = cm.getWrapperElement().getBoundingClientRect();
+  function test(line, ch) {
+    var pos = Pos(line, ch);
+    cm.scrollIntoView(pos);
+    var box = cm.charCoords(pos, "window");
+    is(box.left >= outer.left && box.right <= outer.right &&
+       box.top >= outer.top && box.bottom <= outer.bottom);
+  }
+  addDoc(cm, 200, 200);
+  test(199, 199);
+  test(0, 0);
+  test(100, 100);
+  test(199, 0);
+  test(0, 199);
+  test(100, 100);
+});
+
 testCM("selectionPos", function(cm) {
   if (phantom) return;
   cm.setSize(100, 100);

From 97b3110549e3e68a5519cff294929d149bdbff2c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 May 2013 15:36:30 +0200
Subject: [PATCH 0106/4742] Another test that fails mysteriously on Travis'
 Phantom

(but not on my local one, or in a real browser)
---
 test/test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test.js b/test/test.js
index 07e2d67130..cefe14cc90 100644
--- a/test/test.js
+++ b/test/test.js
@@ -517,6 +517,7 @@ testCM("scrollSnap", function(cm) {
 });
 
 testCM("scrollIntoView", function(cm) {
+  if (phantom) return;
   var outer = cm.getWrapperElement().getBoundingClientRect();
   function test(line, ch) {
     var pos = Pos(line, ch);

From c2f527ecea98b99eb5d21fbf666e672412a0a115 Mon Sep 17 00:00:00 2001
From: Mike Ivanov <me@mikeivanov.com>
Date: Thu, 30 May 2013 20:43:09 -0300
Subject: [PATCH 0107/4742] Fix a non-word

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

diff --git a/doc/manual.html b/doc/manual.html
index ffa7c6f09c..b36053a4fd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -757,14 +757,14 @@ <h3 id="api_constructor">Constructor</h3>
     <h3 id="api_content">Content manipulation methods</h3>
 
     <dl>
-      <dt id="getValue"><code><strong>doc.getValue</strong>(?seperator: string) → string</code></dt>
+      <dt id="getValue"><code><strong>doc.getValue</strong>(?separator: string) → string</code></dt>
       <dd>Get the current editor content. You can pass it an optional
       argument to specify the string to be used to separate lines
       (defaults to <code>"\n"</code>).</dd>
       <dt id="setValue"><code><strong>doc.setValue</strong>(content: string)</code></dt>
       <dd>Set the editor content.</dd>
 
-      <dt id="getRange"><code><strong>doc.getRange</strong>(from: {line, ch}, to: {line, ch}, ?seperator: string) → string</code></dt>
+      <dt id="getRange"><code><strong>doc.getRange</strong>(from: {line, ch}, to: {line, ch}, ?separator: string) → string</code></dt>
       <dd>Get the text between the given points in the editor, which
       should be <code>{line, ch}</code> objects. An optional third
       argument can be given to indicate the line separator string to

From 83709e32d44941bfef4e3f7bce02b68bde9ef663 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 May 2013 10:07:38 +0200
Subject: [PATCH 0108/4742] Fix bug in measuring of lines with only collapsed
 elements

Closes #1559
---
 lib/codemirror.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f56c6880e4..ab09ad7f2c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4153,9 +4153,8 @@ window.CodeMirror = (function() {
   }
 
   function lineContent(cm, realLine, measure) {
-    var merged, line = realLine, lineBefore, sawBefore, simple = true;
+    var merged, line = realLine, lineBefore, sawBefore, empty = true;
     while (merged = collapsedSpanAtStart(line)) {
-      simple = false;
       line = getLine(cm.doc, merged.find().from.line);
       if (!lineBefore) lineBefore = line;
     }
@@ -4165,6 +4164,7 @@ window.CodeMirror = (function() {
     if (line.textClass) builder.pre.className = line.textClass;
 
     do {
+      if (line.text) empty = false;
       builder.measure = line == realLine && measure;
       builder.pos = 0;
       builder.addToken = builder.measure ? buildTokenMeasure : buildToken;
@@ -4176,14 +4176,11 @@ window.CodeMirror = (function() {
       }
       var next = insertLineContent(line, builder, getLineStyles(cm, line));
       sawBefore = line == lineBefore;
-      if (next) {
-        line = getLine(cm.doc, next.to.line);
-        simple = false;
-      }
+      if (next) line = getLine(cm.doc, next.to.line);
     } while (next);
 
     if (measure && !builder.addedOne)
-      measure[0] = builder.pre.appendChild(simple ? elt("span", "\u00a0") : zeroWidthElement(cm.display.measure));
+      measure[0] = builder.pre.appendChild(empty ? elt("span", "\u00a0") : zeroWidthElement(cm.display.measure));
     if (!builder.pre.firstChild && !lineIsHidden(cm.doc, realLine))
       builder.pre.appendChild(document.createTextNode("\u00a0"));
 

From f338135f2f35dd18d3f6e948edcaeae393150035 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 May 2013 10:50:39 +0200
Subject: [PATCH 0109/4742] Support a disableInput property on keymaps

Stop suppressing key events for nofallthrough keymaps.

Issue #1558
---
 keymap/emacs.js   |  2 +-
 keymap/vim.js     |  1 +
 lib/codemirror.js | 21 +++++++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index fab3ab9fe6..39bea17dcf 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -25,6 +25,6 @@
 
   CodeMirror.keyMap["emacs-Ctrl-X"] = {
     "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": "undo", "K": "close",
-    auto: "emacs", nofallthrough: true
+    auto: "emacs", nofallthrough: true, disableInput: true
   };
 })();
diff --git a/keymap/vim.js b/keymap/vim.js
index d29f39cac4..bd1c16c292 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3208,6 +3208,7 @@
       var modifiers = ['Shift', 'Ctrl'];
       var cmToVimKeymap = {
         'nofallthrough': true,
+        'disableInput': true,
         'style': 'fat-cursor'
       };
       function bindKeys(keys, modifier) {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ab09ad7f2c..9a8bd37379 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -236,9 +236,11 @@ window.CodeMirror = (function() {
   }
 
   function keyMapChanged(cm) {
-    var style = keyMap[cm.options.keyMap].style;
+    var map = keyMap[cm.options.keyMap], style = map.style;
     cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
       (style ? " cm-keymap-" + style : "");
+    if (map.disableInput) cm.doc.cantEdit |= cantEdit_keymap;
+    else cm.doc.cantEdit &= ~cantEdit_keymap;
   }
 
   function themeChanged(cm) {
@@ -2003,7 +2005,6 @@ window.CodeMirror = (function() {
     } else {
       handled = lookupKey(name, keymaps, function(b) { return doHandleBinding(cm, b); });
     }
-    if (handled == "stop") handled = false;
 
     if (handled) {
       e_preventDefault(e);
@@ -2485,7 +2486,7 @@ window.CodeMirror = (function() {
   function skipAtomic(doc, pos, bias, mayClear) {
     var flipped = false, curPos = pos;
     var dir = bias || 1;
-    doc.cantEdit = false;
+    doc.cantEdit &= ~cantEdit_inatomic;
     search: for (;;) {
       var line = getLine(doc, curPos.line);
       if (line.markedSpans) {
@@ -2517,7 +2518,7 @@ window.CodeMirror = (function() {
                   // -- try again *with* clearing, if we didn't already
                   if (!mayClear) return skipAtomic(doc, pos, bias, true);
                   // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit = true;
+                  doc.cantEdit |= cantEdit_inatomic;
                   return Pos(doc.first, 0);
                 }
                 flipped = true; newPos = pos; dir = -dir;
@@ -3428,7 +3429,7 @@ window.CodeMirror = (function() {
 
     for (var i = 0; i < maps.length; ++i) {
       var done = lookup(maps[i]);
-      if (done) return done;
+      if (done) return done != "stop";
     }
   }
   function isModifierKey(event) {
@@ -3610,8 +3611,8 @@ window.CodeMirror = (function() {
     if (min != null && cm) regChange(cm, min, max + 1);
     this.lines.length = 0;
     this.explicitlyCleared = true;
-    if (this.collapsed && this.doc.cantEdit) {
-      this.doc.cantEdit = false;
+    if (this.atomic && (this.doc.cantEdit & cantEdit_inatomic)) {
+      this.doc.cantEdit &= ~cantEdit_inatomic;
       if (cm) reCheckSelection(cm);
     }
     if (withOp) endOperation(cm);
@@ -4527,6 +4528,8 @@ window.CodeMirror = (function() {
     }
   };
 
+  var cantEdit_inatomic = 1, cantEdit_keymap = 2;
+
   var nextDocId = 0;
   var Doc = CodeMirror.Doc = function(text, mode, firstLine) {
     if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
@@ -4535,7 +4538,7 @@ window.CodeMirror = (function() {
     BranchChunk.call(this, [new LeafChunk([makeLine("", null)])]);
     this.first = firstLine;
     this.scrollTop = this.scrollLeft = 0;
-    this.cantEdit = false;
+    this.cantEdit = 0;
     this.history = makeHistory();
     this.frontier = firstLine;
     var start = Pos(firstLine, 0);
@@ -4783,6 +4786,8 @@ window.CodeMirror = (function() {
     loadMode(cm);
     if (!cm.options.lineWrapping) computeMaxLength(cm);
     cm.options.mode = doc.modeOption;
+    if (keyMap[cm.options.keyMap].disableInput) doc.cantEdit |= cantEdit_keymap;
+    else doc.cantEdit &= ~cantEdit_keymap;
     regChange(cm);
   }
 

From 63a49817a4522ada322ea81fd8b341d4dd7ee598 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 1 Jun 2013 00:54:26 -0400
Subject: [PATCH 0110/4742] Change disableInput behavior to allow programmatic
 edits.

---
 lib/codemirror.js | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9a8bd37379..5f361e4b3e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -239,8 +239,7 @@ window.CodeMirror = (function() {
     var map = keyMap[cm.options.keyMap], style = map.style;
     cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
       (style ? " cm-keymap-" + style : "");
-    if (map.disableInput) cm.doc.cantEdit |= cantEdit_keymap;
-    else cm.doc.cantEdit &= ~cantEdit_keymap;
+    cm.doc.disableInput = !!map.disableInput;
   }
 
   function themeChanged(cm) {
@@ -1423,7 +1422,7 @@ window.CodeMirror = (function() {
     if (!cm.state.focused || hasSelection(input) || isReadOnly(cm)) return false;
     var text = input.value;
     if (text == prevInput && posEq(sel.from, sel.to)) return false;
-    if (ie && !ie_lt9 && cm.display.inputHasSelection === text) {
+    if (cm.doc.disableInput || ie && !ie_lt9 && cm.display.inputHasSelection === text) {
       resetInput(cm, true);
       return false;
     }
@@ -2486,7 +2485,7 @@ window.CodeMirror = (function() {
   function skipAtomic(doc, pos, bias, mayClear) {
     var flipped = false, curPos = pos;
     var dir = bias || 1;
-    doc.cantEdit &= ~cantEdit_inatomic;
+    doc.cantEdit = false;
     search: for (;;) {
       var line = getLine(doc, curPos.line);
       if (line.markedSpans) {
@@ -2518,7 +2517,7 @@ window.CodeMirror = (function() {
                   // -- try again *with* clearing, if we didn't already
                   if (!mayClear) return skipAtomic(doc, pos, bias, true);
                   // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit |= cantEdit_inatomic;
+                  doc.cantEdit = true;
                   return Pos(doc.first, 0);
                 }
                 flipped = true; newPos = pos; dir = -dir;
@@ -3611,8 +3610,8 @@ window.CodeMirror = (function() {
     if (min != null && cm) regChange(cm, min, max + 1);
     this.lines.length = 0;
     this.explicitlyCleared = true;
-    if (this.atomic && (this.doc.cantEdit & cantEdit_inatomic)) {
-      this.doc.cantEdit &= ~cantEdit_inatomic;
+    if (this.atomic && this.doc.cantEdit) {
+      this.doc.cantEdit = false;
       if (cm) reCheckSelection(cm);
     }
     if (withOp) endOperation(cm);
@@ -4528,8 +4527,6 @@ window.CodeMirror = (function() {
     }
   };
 
-  var cantEdit_inatomic = 1, cantEdit_keymap = 2;
-
   var nextDocId = 0;
   var Doc = CodeMirror.Doc = function(text, mode, firstLine) {
     if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
@@ -4538,7 +4535,7 @@ window.CodeMirror = (function() {
     BranchChunk.call(this, [new LeafChunk([makeLine("", null)])]);
     this.first = firstLine;
     this.scrollTop = this.scrollLeft = 0;
-    this.cantEdit = 0;
+    this.cantEdit = false;
     this.history = makeHistory();
     this.frontier = firstLine;
     var start = Pos(firstLine, 0);
@@ -4786,8 +4783,7 @@ window.CodeMirror = (function() {
     loadMode(cm);
     if (!cm.options.lineWrapping) computeMaxLength(cm);
     cm.options.mode = doc.modeOption;
-    if (keyMap[cm.options.keyMap].disableInput) doc.cantEdit |= cantEdit_keymap;
-    else doc.cantEdit &= ~cantEdit_keymap;
+    doc.disableInput = !!keyMap[cm.options.keyMap].disableInput;
     regChange(cm);
   }
 

From c086444347fae9c4bca0d2b98c19b7499539fd57 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 2 Jun 2013 17:42:59 +0200
Subject: [PATCH 0111/4742] Fixup 63a49817a4522ada322ea81fd8b341d4dd7ee598

Issue #1565
---
 lib/codemirror.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5f361e4b3e..d378040336 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -239,7 +239,7 @@ window.CodeMirror = (function() {
     var map = keyMap[cm.options.keyMap], style = map.style;
     cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
       (style ? " cm-keymap-" + style : "");
-    cm.doc.disableInput = !!map.disableInput;
+    cm.state.disableInput = map.disableInput;
   }
 
   function themeChanged(cm) {
@@ -1419,10 +1419,10 @@ window.CodeMirror = (function() {
   // supported or compatible enough yet to rely on.)
   function readInput(cm) {
     var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc, sel = doc.sel;
-    if (!cm.state.focused || hasSelection(input) || isReadOnly(cm)) return false;
+    if (!cm.state.focused || hasSelection(input) || isReadOnly(cm) || cm.state.disableInput) return false;
     var text = input.value;
     if (text == prevInput && posEq(sel.from, sel.to)) return false;
-    if (cm.doc.disableInput || ie && !ie_lt9 && cm.display.inputHasSelection === text) {
+    if (ie && !ie_lt9 && cm.display.inputHasSelection === text) {
       resetInput(cm, true);
       return false;
     }
@@ -4783,7 +4783,6 @@ window.CodeMirror = (function() {
     loadMode(cm);
     if (!cm.options.lineWrapping) computeMaxLength(cm);
     cm.options.mode = doc.modeOption;
-    doc.disableInput = !!keyMap[cm.options.keyMap].disableInput;
     regChange(cm);
   }
 

From 88efc61e32fefde35b845510c6445b9bb1be7bb8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 2 Jun 2013 18:02:37 +0200
Subject: [PATCH 0112/4742] [closebrackets addon] Fix reference to removed
 variable

Issue #1552
---
 addon/edit/closebrackets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 32819516fb..6fbf38ae67 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -30,7 +30,7 @@
       Backspace: function(cm) {
         if (cm.somethingSelected()) return CodeMirror.Pass;
         var cur = cm.getCursor(), around = charsAround(cm, cur);
-        if (around && pairs.indexOf(line.slice(cur.ch - 1, cur.ch + 1)) % 2 == 0)
+        if (around && pairs.indexOf(around) % 2 == 0)
           cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
         else
           return CodeMirror.Pass;

From 5e9bcf71dfe0d449cb045aa6c51404620e5a49e5 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 1 Jun 2013 10:15:02 -0400
Subject: [PATCH 0113/4742] [vim keymap] Add support for :sort

---
 keymap/vim.js    | 92 ++++++++++++++++++++++++++++++++++++++++++++----
 test/vim_test.js | 55 ++++++++++++++++++++++++++++-
 2 files changed, 139 insertions(+), 8 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index bd1c16c292..df40bfc02e 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -967,7 +967,9 @@
       },
       processEx: function(cm, vim, command) {
         function onPromptClose(input) {
-          exCommandDispatcher.processCommand(cm, input);
+          // Give the prompt some time to close so that if processCommand shows
+          // an error, the elements don't overlap.
+          window.setTimeout(10, exCommandDispatcher.processCommand(cm, input));
         }
         function onPromptKeyDown(e, input, close) {
           var keyName = CodeMirror.keyName(e);
@@ -1189,7 +1191,7 @@
         return null;
       },
       jumpToMark: function(cm, motionArgs, vim) {
-        var best = cm.getCursor(); 
+        var best = cm.getCursor();
         for (var i = 0; i < motionArgs.repeat; i++) {
           var cursor = best;
           for (var key in vim.marks) {
@@ -2150,7 +2152,7 @@
         }
       },
       // TODO: The original Vim implementation only operates on level 1 and 2.
-      // The current implementation doesn't check for code block level and 
+      // The current implementation doesn't check for code block level and
       // therefore it operates on any levels.
       method: {
         init: function(state) {
@@ -2202,7 +2204,7 @@
         reverseSymb: (forward ?  { ')': '(', '}': '{' } : { '(': ')', '{': '}' })[symb],
         forward: forward,
         depth: 0,
-        curMoveThrough: false      
+        curMoveThrough: false
       };
       var mode = symbolToMode[symb];
       if(!mode)return cur;
@@ -2828,6 +2830,7 @@
       { name: 'write', shortName: 'w', type: 'builtIn' },
       { name: 'undo', shortName: 'u', type: 'builtIn' },
       { name: 'redo', shortName: 'red', type: 'builtIn' },
+      { name: 'sort', shortName: 'sor', type: 'builtIn'},
       { name: 'substitute', shortName: 's', type: 'builtIn'},
       { name: 'nohlsearch', shortName: 'noh', type: 'builtIn'},
       { name: 'delmarks', shortName: 'delm', type: 'builtin'}
@@ -2874,7 +2877,11 @@
           showConfirm(cm, 'Not an editor command ":' + input + '"');
           return;
         }
-        exCommands[commandName](cm, params);
+        try {
+          exCommands[commandName](cm, params);
+        } catch(e) {
+          showConfirm(cm, e);
+        }
       },
       parseInput_: function(cm, inputStream, result) {
         inputStream.eatWhile(':');
@@ -2919,7 +2926,7 @@
             break;
           default:
             inputStream.backUp(1);
-            return cm.getCursor().line;
+            return undefined;
         }
       },
       parseCommandArgs_: function(inputStream, params, command) {
@@ -3029,6 +3036,77 @@
               linewise: true },
             repeatOverride: params.line+1});
       },
+      sort: function(cm, params) {
+        var reverse, ignoreCase, unique, number;
+        function parseArgs() {
+          if (params.argString) {
+            var args = new CodeMirror.StringStream(params.argString);
+            if (args.eat('!')) { reverse = true; }
+            if (args.eol()) { return; }
+            if (!args.eatSpace()) { throw 'invalid arguments ' + args.match(/.*/)[0]; }
+            var opts = args.match(/[a-z]+/);
+            if (opts) {
+              opts = opts[0];
+              ignoreCase = opts.indexOf('i') != -1;
+              unique = opts.indexOf('u') != -1;
+              var decimal = opts.indexOf('d') != -1 && 1;
+              var hex = opts.indexOf('x') != -1 && 1;
+              var octal = opts.indexOf('o') != -1 && 1;
+              if (decimal + hex + octal > 1) { throw 'invalid arguments'; }
+              number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
+            }
+            if (args.eatSpace() && args.match(/\/.*\//)) { throw 'patterns not supported'; }
+          }
+        }
+        parseArgs();
+        var lineStart = params.line || cm.firstLine();
+        var lineEnd = params.lineEnd || params.line || cm.lastLine();
+        if (lineStart == lineEnd) { return; }
+        var curStart = { line: lineStart, ch: 0 };
+        var curEnd = { line: lineEnd, ch: lineLength(cm, lineEnd) };
+        var text = cm.getRange(curStart, curEnd).split('\n');
+        var numberRegex = (number == 'decimal') ? /(-?)([\d]+)/ :
+           (number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i :
+           (number == 'octal') ? /([0-7]+)/ : null;
+        var radix = (number == 'decimal') ? 10 : (number == 'hex') ? 16 : (number == 'octal') ? 8 : null;
+        var numPart = [], textPart = [];
+        if (number) {
+          for (var i = 0; i < text.length; i++) {
+            if (numberRegex.exec(text[i])) {
+              numPart.push(text[i]);
+            } else {
+              textPart.push(text[i]);
+            }
+          }
+        } else {
+          textPart = text;
+        }
+        function compareFn(a, b) {
+          if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
+          if (ignoreCase) { a = a.toLowerCase(); b = b.toLowerCase(); }
+          var anum = number && numberRegex.exec(a);
+          var bnum = number && numberRegex.exec(b);
+          if (!anum) { return a < b ? -1 : 1; }
+          anum = parseInt((anum[1] + anum[2]).toLowerCase(), radix);
+          bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix);
+          return anum - bnum;
+        }
+        numPart.sort(compareFn);
+        textPart.sort(compareFn);
+        text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart);
+        if (unique) { // Remove duplicate lines
+          var textOld = text;
+          var lastLine;
+          text = []
+          for (var i = 0; i < textOld.length; i++) {
+            if (textOld[i] != lastLine) {
+              text.push(textOld[i]);
+            }
+            lastLine = textOld[i];
+          }
+        }
+        cm.replaceRange(text.join('\n'), curStart, curEnd);
+      },
       substitute: function(cm, params) {
         var argString = params.argString;
         var slashes = findUnescapedSlashes(argString);
@@ -3067,7 +3145,7 @@
         }
         var state = getSearchState(cm);
         var query = state.getQuery();
-        var lineStart = params.line || cm.firstLine();
+        var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
         var lineEnd = params.lineEnd || lineStart;
         if (count) {
           lineStart = lineEnd;
diff --git a/test/vim_test.js b/test/vim_test.js
index f3b53508f6..28c967b8f5 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -11,7 +11,7 @@ var code = '' +
 '    bufp = buf;\n' +
 '  }\n' +
 '\n' +
-'  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;\n' + 
+'  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;\n' +
 ' \n' +
 '}\n';
 
@@ -1940,6 +1940,59 @@ testVim('ex_write', function(cm, vim, helpers) {
   }
   CodeMirror.commands.save = tmp;
 });
+testVim('ex_sort', function(cm, vim, helpers) {
+  helpers.doEx('sort');
+  eq('Z\na\nb\nc\nd', cm.getValue());
+}, { value: 'b\nZ\nd\nc\na'});
+testVim('ex_sort_reverse', function(cm, vim, helpers) {
+  helpers.doEx('sort!');
+  eq('d\nc\nb\na', cm.getValue());
+}, { value: 'b\nd\nc\na'});
+testVim('ex_sort_range', function(cm, vim, helpers) {
+  helpers.doEx('2,3sort');
+  eq('b\nc\nd\na', cm.getValue());
+}, { value: 'b\nd\nc\na'});
+testVim('ex_sort_oneline', function(cm, vim, helpers) {
+  helpers.doEx('2sort');
+  // Expect no change.
+  eq('b\nd\nc\na', cm.getValue());
+}, { value: 'b\nd\nc\na'});
+testVim('ex_sort_ignoreCase', function(cm, vim, helpers) {
+  helpers.doEx('sort i');
+  eq('a\nb\nc\nd\nZ', cm.getValue());
+}, { value: 'b\nZ\nd\nc\na'});
+testVim('ex_sort_unique', function(cm, vim, helpers) {
+  helpers.doEx('sort u');
+  eq('Z\na\nb\nc\nd', cm.getValue());
+}, { value: 'b\nZ\na\na\nd\na\nc\na'});
+testVim('ex_sort_decimal', function(cm, vim, helpers) {
+  helpers.doEx('sort d');
+  eq('d3\n s5\n6\n.9', cm.getValue());
+}, { value: '6\nd3\n s5\n.9'});
+testVim('ex_sort_decimal_negative', function(cm, vim, helpers) {
+  helpers.doEx('sort d');
+  eq('z-9\nd3\n s5\n6\n.9', cm.getValue());
+}, { value: '6\nd3\n s5\n.9\nz-9'});
+testVim('ex_sort_decimal_reverse', function(cm, vim, helpers) {
+  helpers.doEx('sort! d');
+  eq('.9\n6\n s5\nd3', cm.getValue());
+}, { value: '6\nd3\n s5\n.9'});
+testVim('ex_sort_hex', function(cm, vim, helpers) {
+  helpers.doEx('sort x');
+  eq(' s5\n6\n.9\n&0xB\nd3', cm.getValue());
+}, { value: '6\nd3\n s5\n&0xB\n.9'});
+testVim('ex_sort_octal', function(cm, vim, helpers) {
+  helpers.doEx('sort o');
+  eq('.8\n.9\nd3\n s5\n6', cm.getValue());
+}, { value: '6\nd3\n s5\n.9\n.8'});
+testVim('ex_sort_decimal_mixed', function(cm, vim, helpers) {
+  helpers.doEx('sort d');
+  eq('y\nz\nc1\nb2\na3', cm.getValue());
+}, { value: 'a3\nz\nc1\ny\nb2'});
+testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
+  helpers.doEx('sort! d');
+  eq('a3\nb2\nc1\nz\ny', cm.getValue());
+}, { value: 'a3\nz\nc1\ny\nb2'});
 testVim('ex_substitute_same_line', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   helpers.doEx('s/one/two');

From 366c18b89eb02b9e6b1e3b7c45e64ae9cb6a71e6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 2 Jun 2013 18:26:44 +0200
Subject: [PATCH 0114/4742] [show-hint addon] (experiment) Add a container
 option

---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index a0661e4622..ab23e97383 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -54,7 +54,7 @@ CodeMirror.showHint = function(cm, getHints, options) {
     var left = pos.left, top = pos.bottom, below = true;
     hints.style.left = left + "px";
     hints.style.top = top + "px";
-    document.body.appendChild(hints);
+    (options.container || document.body).appendChild(hints);
     CodeMirror.signal(data, "shown");
 
     // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.

From 7c72746248d722fdc8c51f064e18e118d0ae7ad6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Jun 2013 11:36:17 +0200
Subject: [PATCH 0115/4742] Fix bug that caused zero-length spans to
 occasionally survive edits

Issue #1561
---
 lib/codemirror.js | 7 +++++++
 test/test.js      | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d378040336..eab89da931 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3847,6 +3847,13 @@ window.CodeMirror = (function() {
         }
       }
     }
+    if (sameLine && first) {
+      // Make sure we didn't create any zero-length spans
+      for (var i = 0; i < first.length; ++i)
+        if (first[i].from != null && first[i].from == first[i].to && first[i].marker.type != "bookmark")
+          first.splice(i--, 1);
+      if (!first.length) first = null;
+    }
 
     var newMarkers = [first];
     if (!sameLine) {
diff --git a/test/test.js b/test/test.js
index cefe14cc90..fe478bb58e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -450,6 +450,13 @@ testCM("markClearBetween", function(cm) {
   eq(cm.findMarksAt(Pos(1, 1)).length, 0);
 });
 
+testCM("deleteSpanCollapsedInclusiveLeft", function(cm) {
+  var from = Pos(1, 0), to = Pos(1, 1);
+  var m = cm.markText(from, to, {collapsed: true, inclusiveLeft: true});
+  // Delete collapsed span.
+  cm.replaceRange("", from, to);
+}, {value: "abc\nX\ndef"});
+
 testCM("bookmark", function(cm) {
   function p(v) { return v && Pos(v[0], v[1]); }
   forEach([{a: [1, 0], b: [1, 1], c: "", d: [1, 4]},

From de92ca1bab49a2f18bd6f7e9d8200a9d75270304 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Jun 2013 14:06:42 +0200
Subject: [PATCH 0116/4742] Allow inline widgets to wrap again, measurement of
 their start and end

---
 lib/codemirror.css |  1 -
 lib/codemirror.js  | 55 ++++++++++++++++++++++++++++++++--------------
 test/test.js       | 16 ++++++++++++++
 3 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index f5379d967c..52881f7dfd 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -205,7 +205,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 
 .CodeMirror-widget {
-  display: inline-block;
 }
 
 .CodeMirror-wrap .CodeMirror-scroll {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index eab89da931..b32de75c37 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -799,17 +799,17 @@ window.CodeMirror = (function() {
     function drawForLine(line, fromArg, toArg, retTop) {
       var lineObj = getLine(doc, line);
       var lineLen = lineObj.text.length, rVal = retTop ? Infinity : -Infinity;
-      function coords(ch) {
-        return charCoords(cm, Pos(line, ch), "div", lineObj);
+      function coords(ch, bias) {
+        return charCoords(cm, Pos(line, ch), "div", lineObj, bias);
       }
 
       iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
-        var leftPos = coords(from), rightPos, left, right;
+        var leftPos = coords(from, "left"), rightPos, left, right;
         if (from == to) {
           rightPos = leftPos;
           left = right = leftPos.left;
         } else {
-          rightPos = coords(to - 1);
+          rightPos = coords(to - 1, "right");
           if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; }
           left = leftPos.left;
           right = rightPos.right;
@@ -968,7 +968,7 @@ window.CodeMirror = (function() {
     return e.offsetLeft;
   }
 
-  function measureChar(cm, line, ch, data) {
+  function measureChar(cm, line, ch, data, bias) {
     var dir = -1;
     data = data || measureLine(cm, line);
 
@@ -979,7 +979,8 @@ window.CodeMirror = (function() {
     }
     return {left: pos < ch ? r.right : r.left,
             right: pos > ch ? r.left : r.right,
-            top: r.top, bottom: r.bottom};
+            top: bias == "right" && r.topRight != null ? r.topRight : r.top,
+            bottom: bias == "right" && r.bottomRight != null ? r.bottomRight : r.bottom};
   }
 
   function findCachedMeasurement(cm, line) {
@@ -1052,9 +1053,9 @@ window.CodeMirror = (function() {
     if (ie_lt9 && display.measure.first != pre)
       removeChildrenAndAdd(display.measure, pre);
 
-    for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {
-      var size = getRect(cur);
-      var top = Math.max(0, size.top - outer.top), bot = Math.min(size.bottom - outer.top, maxBot);
+    function categorizeVSpan(top, bot) {
+      if (bot > maxBot) bot = maxBot;
+      if (top < 0) top = 0;
       for (var j = 0; j < vranges.length; j += 2) {
         var rtop = vranges[j], rbot = vranges[j+1];
         if (rtop > bot || rbot < top) continue;
@@ -1063,17 +1064,37 @@ window.CodeMirror = (function() {
             Math.min(bot, rbot) - Math.max(top, rtop) >= (bot - top) >> 1) {
           vranges[j] = Math.min(top, rtop);
           vranges[j+1] = Math.max(bot, rbot);
-          break;
+          return j;
         }
       }
-      if (j == vranges.length) vranges.push(top, bot);
+      vranges.push(top, bot);
+      return j;
+    }
+
+    for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {
+      var size;
+      // A widget might wrap, needs special care
+      if (/\bCodeMirror-widget\b/.test(cur.className) && cur.getClientRects) {
+        var rects = cur.getClientRects(), rLeft = rects[0], rRight = rects[rects.length - 1];
+        if (rects.length == 1) {
+          size = rLeft;
+        } else {
+          var vCatLeft = categorizeVSpan(rLeft.top - outer.top, rLeft.bottom - outer.top);
+          var vCatRight = categorizeVSpan(rRight.top - outer.top, rRight.bottom - outer.top);
+          data[i] = {left: rLeft.left - outer.left, right: rRight.right - outer.left,
+                     top: vCatLeft, topRight: vCatRight};
+          continue;
+        }
+      } else size = getRect(cur);
+      var vCat = categorizeVSpan(size.top - outer.top, size.bottom - outer.top);
       var right = size.right;
       if (cur.measureRight) right = getRect(cur.measureRight).left;
-      data[i] = {left: size.left - outer.left, right: right - outer.left, top: j};
+      data[i] = {left: size.left - outer.left, right: right - outer.left, top: vCat};
     }
     for (var i = 0, cur; i < data.length; ++i) if (cur = data[i]) {
-      var vr = cur.top;
+      var vr = cur.top, vrRight = cur.topRight;
       cur.top = vranges[vr]; cur.bottom = vranges[vr+1];
+      if (vrRight != null) { cur.topRight = vranges[vrRight]; cur.bottomRight = vranges[vrRight]; }
     }
 
     return data;
@@ -1086,7 +1107,7 @@ window.CodeMirror = (function() {
       if (sp.collapsed && (sp.to == null || sp.to == line.text.length)) hasBadSpan = true;
     }
     var cached = !hasBadSpan && findCachedMeasurement(cm, line);
-    if (cached) return measureChar(cm, line, line.text.length, cached.measure).right;
+    if (cached) return measureChar(cm, line, line.text.length, cached.measure, "right").right;
 
     var pre = lineContent(cm, line);
     var end = pre.appendChild(zeroWidthElement(cm.display.measure));
@@ -1144,16 +1165,16 @@ window.CodeMirror = (function() {
     return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
   }
 
-  function charCoords(cm, pos, context, lineObj) {
+  function charCoords(cm, pos, context, lineObj, bias) {
     if (!lineObj) lineObj = getLine(cm.doc, pos.line);
-    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch), context);
+    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, null, bias), context);
   }
 
   function cursorCoords(cm, pos, context, lineObj, measurement) {
     lineObj = lineObj || getLine(cm.doc, pos.line);
     if (!measurement) measurement = measureLine(cm, lineObj);
     function get(ch, right) {
-      var m = measureChar(cm, lineObj, ch, measurement);
+      var m = measureChar(cm, lineObj, ch, measurement, right ? "right" : "left");
       if (right) m.left = m.right; else m.right = m.left;
       return intoCoordSystem(cm, lineObj, m, context);
     }
diff --git a/test/test.js b/test/test.js
index fe478bb58e..8936be8daf 100644
--- a/test/test.js
+++ b/test/test.js
@@ -786,6 +786,22 @@ testCM("badNestedFold", function(cm) {
   is(/overlap/i.test(caught.message), "wrong error");
 });
 
+testCM("wrappingInlineWidget", function(cm) {
+  cm.setSize("10em");
+  var w = document.createElement("span");
+  w.style.background = "yellow";
+  w.innerHTML = "one two three four";
+  cm.markText(Pos(0, 6), Pos(0, 9), {replacedWith: w});
+  var cur0 = cm.cursorCoords(Pos(0, 0)), cur1 = cm.cursorCoords(Pos(0, 10));
+  is(cur0.top < cur1.top);
+  is(cur0.bottom < cur1.bottom);
+  var curL = cm.cursorCoords(Pos(0, 6)), curR = cm.cursorCoords(Pos(0, 9));
+  eq(curL.top, cur0.top);
+  eq(curL.bottom, cur0.bottom);
+  eq(curR.top, cur1.top);
+  eq(curR.bottom, cur1.bottom);
+}, {value: "1 2 3 xxx 4 5 6", lineWrapping: true});
+
 testCM("inlineWidget", function(cm) {
   var w = cm.setBookmark(Pos(0, 2), {widget: document.createTextNode("uu")});
   cm.setCursor(0, 2);

From 0bcc95abe15059403e0bd4d31e839c1267e8b36d Mon Sep 17 00:00:00 2001
From: tfjgeorge <tfjgeorge@gmail.com>
Date: Tue, 4 Jun 2013 11:45:39 +0300
Subject: [PATCH 0117/4742] Update index.html. Fixed typo jsfiddle.net instead
 of jsfiddle.com

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

diff --git a/index.html b/index.html
index 0f855ecbb3..59599c46cb 100644
--- a/index.html
+++ b/index.html
@@ -123,7 +123,7 @@ <h2>Real-world uses:</h2>
       <li><a href="http://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light Table</a></li>
       <li><a href="http://brackets.io">Adobe Brackets</a></li>
       <li><a href="http://jsbin.com">jsbin.com</a></li>
-      <li><a href="http://jsfiddle.com">jsfiddle.com</a></li>
+      <li><a href="http://jsfiddle.net">jsfiddle.net</a></li>
       <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
       <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a></li>

From 9fcee65e590a96b3dff045bf10f7db17d2d38c0d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Jun 2013 11:14:19 +0200
Subject: [PATCH 0118/4742] Fix bug where measuring the right of a wrapped
 inline widget broke at end of line

---
 lib/codemirror.js |  7 ++++---
 test/test.js      | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b32de75c37..bd5d5d25d3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -977,10 +977,11 @@ window.CodeMirror = (function() {
       if (r) break;
       if (dir < 0 && pos == 0) dir = 1;
     }
+    var rightV = (pos < ch || bias == "right") && r.topRight != null;
     return {left: pos < ch ? r.right : r.left,
             right: pos > ch ? r.left : r.right,
-            top: bias == "right" && r.topRight != null ? r.topRight : r.top,
-            bottom: bias == "right" && r.bottomRight != null ? r.bottomRight : r.bottom};
+            top: rightV ? r.topRight : r.top,
+            bottom: rightV ? r.bottomRight : r.bottom};
   }
 
   function findCachedMeasurement(cm, line) {
@@ -1094,7 +1095,7 @@ window.CodeMirror = (function() {
     for (var i = 0, cur; i < data.length; ++i) if (cur = data[i]) {
       var vr = cur.top, vrRight = cur.topRight;
       cur.top = vranges[vr]; cur.bottom = vranges[vr+1];
-      if (vrRight != null) { cur.topRight = vranges[vrRight]; cur.bottomRight = vranges[vrRight]; }
+      if (vrRight != null) { cur.topRight = vranges[vrRight]; cur.bottomRight = vranges[vrRight+1]; }
     }
 
     return data;
diff --git a/test/test.js b/test/test.js
index 8936be8daf..fa8cccdc6f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -787,9 +787,9 @@ testCM("badNestedFold", function(cm) {
 });
 
 testCM("wrappingInlineWidget", function(cm) {
-  cm.setSize("10em");
+  cm.setSize("11em");
   var w = document.createElement("span");
-  w.style.background = "yellow";
+  w.style.color = "red";
   w.innerHTML = "one two three four";
   cm.markText(Pos(0, 6), Pos(0, 9), {replacedWith: w});
   var cur0 = cm.cursorCoords(Pos(0, 0)), cur1 = cm.cursorCoords(Pos(0, 10));
@@ -800,7 +800,11 @@ testCM("wrappingInlineWidget", function(cm) {
   eq(curL.bottom, cur0.bottom);
   eq(curR.top, cur1.top);
   eq(curR.bottom, cur1.bottom);
-}, {value: "1 2 3 xxx 4 5 6", lineWrapping: true});
+  cm.replaceRange("", Pos(0, 9), Pos(0));
+  curR = cm.cursorCoords(Pos(0, 9));
+  eq(curR.top, cur1.top);
+  eq(curR.bottom, cur1.bottom);
+}, {value: "1 2 3 xxx 4", lineWrapping: true});
 
 testCM("inlineWidget", function(cm) {
   var w = cm.setBookmark(Pos(0, 2), {widget: document.createTextNode("uu")});

From eafb2cadf67c9e6da560ab948dfdb2cb84baa2e3 Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Wed, 5 Jun 2013 08:57:20 +0200
Subject: [PATCH 0119/4742] [sql mode] Minor fixes

* index.html included codemirror.js twice
* optimize .tableName syntax check
---
 mode/sql/index.html | 3 +--
 mode/sql/sql.js     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index 8a2495ca24..bc3b3a819c 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -5,7 +5,6 @@
         <title>SQL Mode for CodeMirror</title>
         <link rel="stylesheet" href="../../lib/codemirror.css" />
         <script src="../../lib/codemirror.js"></script>
-        <script src="../../lib/codemirror.js"></script>
         <script src="sql.js"></script>
         <style>
 .CodeMirror {
@@ -39,7 +38,7 @@ <h1>SQL Mode for CodeMirror</h1>
         <form>
             <textarea id="code" name="code">-- SQL Mode for CodeMirror
 SELECT SQL_NO_CACHE DISTINCT
-		@var1 AS `val1`, @'val2', @global.'sql_mode',
+		@var1 AS `val1`, @`val2`, @global.'sql_mode',
 		1.1 AS `float_val`, .14 AS `another_float`, 0.09e3 AS `int_with_esp`,
 		0xFA5 AS `hex`, x'fa5' AS `hex2`, 0b101 AS `bin`, b'101' AS `bin2`,
 		DATE '1994-01-01' AS `sql_date`, { T "1994-01-01" } AS `odbc_date`,
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 066db97a82..bf705025aa 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -55,7 +55,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
         return "number";
       }
       // .table_name (ODBC)
-      if (stream.match(/^[a-zA-Z_]+/) && support.ODBCdotTable == true) {
+      if (support.ODBCdotTable == true && stream.match(/^[a-zA-Z_]+/)) {
         return "variable-2";
       }
     } else if (operatorChars.test(ch)) {

From 5f110524710c6959fbb3d9b1a2192796770a1da9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Jun 2013 10:38:51 +0200
Subject: [PATCH 0120/4742] Fix bug that causes replacedWith widgets to hide
 lines

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bd5d5d25d3..b08a0b59e5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3970,6 +3970,7 @@ window.CodeMirror = (function() {
       sp = sps[i];
       if (!sp.marker.collapsed) continue;
       if (sp.from == null) return true;
+      if (sp.marker.replacedWith) continue;
       if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
         return true;
     }
@@ -3983,7 +3984,7 @@ window.CodeMirror = (function() {
       return true;
     for (var sp, i = 0; i < line.markedSpans.length; ++i) {
       sp = line.markedSpans[i];
-      if (sp.marker.collapsed && sp.from == span.to &&
+      if (sp.marker.collapsed && !sp.marker.replacedWith && sp.from == span.to &&
           (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
           lineIsHiddenInner(doc, line, sp)) return true;
     }

From 78f9b12bc18f25829623168ae0fb2562e4773e24 Mon Sep 17 00:00:00 2001
From: Daniel Faust <daniel@faust.ec>
Date: Wed, 5 Jun 2013 12:05:32 +0300
Subject: [PATCH 0121/4742] Update search.js

The variable "query" only contains the string version of the query, even if a regex has been submitted. "state.query" contains either a regex object or a string, depending on the input.
The function searchOverlay contains the neccessary logic to differientiate between these two types, indicating that the original purpose of it was that regexes should be highlighted accordingly.
Passing the "query" variable to searchOverlay fails to highlight regexes, for example case insensitive searches, and thus isn't in sync with the find next / find previous commands.
---
 addon/search/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index eb9ab8bede..c30922df4f 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -55,7 +55,7 @@
         if (!query || state.query) return;
         state.query = parseQuery(query);
         cm.removeOverlay(state.overlay);
-        state.overlay = searchOverlay(query);
+        state.overlay = searchOverlay(state.query);
         cm.addOverlay(state.overlay);
         state.posFrom = state.posTo = cm.getCursor();
         findNext(cm, rev);

From ee79ca38d6e107d17508b4f72f83fd01cda5da89 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Jun 2013 12:04:17 +0200
Subject: [PATCH 0122/4742] [match-highlighter addon] Add showToken option

---
 addon/search/match-highlighter.js | 66 +++++++++++++++++++++----------
 doc/manual.html                   | 10 ++++-
 2 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 0800f4c638..212167580a 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -5,35 +5,49 @@
 // document.
 //
 // The option can be set to true to simply enable it, or to a
-// {minChars, style} object to explicitly configure it. minChars is
-// the minimum amount of characters that should be selected for the
-// behavior to occur, and style is the token style to apply to the
-// matches. This will be prefixed by "cm-" to create an actual CSS
-// class name.
+// {minChars, style, showToken} object to explicitly configure it.
+// minChars is the minimum amount of characters that should be
+// selected for the behavior to occur, and style is the token style to
+// apply to the matches. This will be prefixed by "cm-" to create an
+// actual CSS class name. showToken, when enabled, will cause the
+// current token to be highlighted when nothing is selected.
 
 (function() {
   var DEFAULT_MIN_CHARS = 2;
   var DEFAULT_TOKEN_STYLE = "matchhighlight";
 
   function State(options) {
-    this.minChars = typeof options == "object" && options.minChars || DEFAULT_MIN_CHARS;
-    this.style = typeof options == "object" && options.style || DEFAULT_TOKEN_STYLE;
-    this.overlay = null;
+    if (typeof options == "object") {
+      this.minChars = options.minChars;
+      this.style = options.style;
+      this.showToken = options.showToken;
+    }
+    if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
+    if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
+    this.overlay = this.timeout = null;
   }
 
   CodeMirror.defineOption("highlightSelectionMatches", false, function(cm, val, old) {
-    var prev = old && old != CodeMirror.Init;
-    if (val && !prev) {
-      cm.state.matchHighlighter = new State(val);
-      cm.on("cursorActivity", highlightMatches);
-    } else if (!val && prev) {
+    if (old && old != CodeMirror.Init) {
       var over = cm.state.matchHighlighter.overlay;
       if (over) cm.removeOverlay(over);
+      clearTimeout(cm.state.matchHighlighter.timeout);
       cm.state.matchHighlighter = null;
-      cm.off("cursorActivity", highlightMatches);
+      cm.off("cursorActivity", cursorActivity);
+    }
+    if (val) {
+      cm.state.matchHighlighter = new State(val);
+      highlightMatches(cm);
+      cm.on("cursorActivity", cursorActivity);
     }
   });
 
+  function cursorActivity(cm) {
+    var state = cm.state.matchHighlighter;
+    clearTimeout(state.timeout);
+    state.timeout = setTimeout(function() {highlightMatches(cm);}, 100);
+  }
+
   function highlightMatches(cm) {
     cm.operation(function() {
       var state = cm.state.matchHighlighter;
@@ -42,17 +56,29 @@
         state.overlay = null;
       }
 
-      if (!cm.somethingSelected()) return;
+      if (!cm.somethingSelected() && state.showToken) {
+        var tok = cm.getTokenAt(cm.getCursor()).string;
+        if (/\w/.test(tok))
+          cm.addOverlay(state.overlay = makeOverlay(tok, true, state.style));
+        return;
+      }
+      if (cm.getCursor("head").line != cm.getCursor("anchor").line) return;
       var selection = cm.getSelection().replace(/^\s+|\s+$/g, "");
-      if (selection.length < state.minChars) return;
-
-      cm.addOverlay(state.overlay = makeOverlay(selection, state.style));
+      if (selection.length >= state.minChars)
+        cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
     });
   }
 
-  function makeOverlay(query, style) {
+  function boundariesAround(stream) {
+    return (stream.start || /.\b./.test(stream.string.slice(stream.start - 1, stream.start + 1))) &&
+      (stream.pos == stream.string.length || /.\b./.test(stream.string.slice(stream.pos - 1, stream.pos + 1)));
+  }
+
+  function makeOverlay(query, wordBoundaries, style) {
     return {token: function(stream) {
-      if (stream.match(query)) return style;
+      if (stream.match(query) &&
+          (!wordBoundaries || boundariesAround(stream)))
+        return style;
       stream.next();
       stream.skipTo(query.charAt(0)) || stream.skipToEnd();
     }};
diff --git a/doc/manual.html b/doc/manual.html
index b36053a4fd..42a2d83d2b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1804,7 +1804,15 @@ <h2 id="addons">Add-ons</h2>
       <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>match-highlighter.js</code></a></dt>
       <dd>Adds a <code>highlightSelectionMatches</code> option that
       can be enabled to highlight all instances of a currently
-      selected word.
+      selected word. Can be set either to true or to an object
+      containing the following options: <code>minChars</code>, for the
+      minimum amount of selected characters that triggers a highlight
+      (default 2), <code>style</code>, for the style to be used to
+      highlight the matches (default <code>"matchhighlight"</code>,
+      which will correspond to CSS class <code>cm-matchhighlight),
+      and <code>showToken</code> which, when enabled, causes the
+      current token to be highlighted when nothing is selected
+      (defaults to off).
       Demo <a href="../demo/matchhighlighter.html">here</a>.</dd>
 
       <dt id="addon_lint"><a href="../addon/lint/lint.js"><code>lint/lint.js</code></a></dt>

From d3ecd4edc911861ae45c10425b26d7fb1d51e354 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Jun 2013 12:06:16 +0200
Subject: [PATCH 0123/4742] Document disableInput property on keymaps

---
 doc/manual.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 42a2d83d2b..fad483eda1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -629,8 +629,11 @@ <h2 id="keymaps">Keymaps</h2>
     <p>When a keymap contains a <code>nofallthrough</code> property
     set to <code>true</code>, keys matched against that map will be
     ignored if they don't match any of the bindings in the map (no
-    further child maps will be tried, and the default effect of
-    inserting a character will not occur).</p>
+    further child maps will be tried). When
+    the <code>disableInput</code> property is set
+    to <code>true</code>, the default effect of inserting a character
+    will be suppressed when the keymap is active as the top-level
+    map.</p>
 
     <h2 id="styling">Customized Styling</h2>
 

From fec397d70d62925a3fe32e4662c3536cfa012d4d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Jun 2013 14:27:12 +0200
Subject: [PATCH 0124/4742] Add changeGeneration method, provide more module
 dirtiness tracking

---
 doc/manual.html   | 18 ++++++++++++++----
 lib/codemirror.js | 31 +++++++++++++++++--------------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index fad483eda1..616a11002f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -821,11 +821,21 @@ <h3 id="api_content">Content manipulation methods</h3>
       <dd>Set the editor content as 'clean', a flag that it will
       retain until it is edited, and which will be set again when such
       an edit is undone again. Useful to track whether the content
-      needs to be saved.</dd>
-      <dt id="isClean"><code><strong>doc.isClean</strong>() → boolean</code></dt>
-      <dd>Returns whether the document is currently clean (not
+      needs to be saved. This function is deprecated in favor
+      of <a href="#changeGeneration"><code>changeGeneration</code></a>,
+      which allows multiple subsystems to track different notions of
+      cleanness without interfering.</dd>
+      <dt id="changeGeneration"><code><strong>doc.changeGeneration</strong>() → integer</code></dt>
+      <dd>Returns a number that can later be passed
+      to <a href="#isClean"><code>isClean</code></a> to test whether
+      any edits were made (and not undone) in the meantime.</dd>
+      <dt id="isClean"><code><strong>doc.isClean</strong>(?generation: integer) → boolean</code></dt>
+      <dd>Returns whether the document is currently clean — not
       modified since initialization or the last call
-      to <a href="#markClean"><code>markClean</code></a>).</dd>
+      to <a href="#markClean"><code>markClean</code></a> if no
+      argument is passed, or since the matching call
+      to <a href="#changeGeneration"><code>changeGeneration</code></a>
+      if a generation value is given.</dd>
     </dl>
 
     <h3 id="api_selection">Cursor and selection methods</h3>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index b08a0b59e5..043209543a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2280,11 +2280,12 @@ window.CodeMirror = (function() {
     var hist = doc.history;
     var event = (type == "undo" ? hist.done : hist.undone).pop();
     if (!event) return;
-    hist.dirtyCounter += type == "undo" ? -1 : 1;
 
     var anti = {changes: [], anchorBefore: event.anchorAfter, headBefore: event.headAfter,
-                anchorAfter: event.anchorBefore, headAfter: event.headBefore};
+                anchorAfter: event.anchorBefore, headAfter: event.headBefore,
+                generation: hist.generation};
     (type == "undo" ? hist.undone : hist.done).push(anti);
+    hist.generation = event.generation || ++hist.maxGeneration;
 
     var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
 
@@ -4567,6 +4568,7 @@ window.CodeMirror = (function() {
     this.scrollTop = this.scrollLeft = 0;
     this.cantEdit = false;
     this.history = makeHistory();
+    this.cleanGeneration = 1;
     this.frontier = firstLine;
     var start = Pos(firstLine, 0);
     this.sel = {from: start, to: start, head: start, anchor: start, shift: false, extend: false, goalColumn: null};
@@ -4667,20 +4669,25 @@ window.CodeMirror = (function() {
       var hist = this.history;
       return {undo: hist.done.length, redo: hist.undone.length};
     },
-    clearHistory: function() {this.history = makeHistory();},
+    clearHistory: function() {this.history = makeHistory(this.history.maxGeneration);},
 
     markClean: function() {
-      this.history.dirtyCounter = 0;
+      this.cleanGeneration = this.changeGeneration();
+    },
+    changeGeneration: function() {
       this.history.lastOp = this.history.lastOrigin = null;
+      return this.history.generation;
+    },
+    isClean: function (gen) {
+      return this.history.generation == (gen || this.cleanGeneration);
     },
-    isClean: function () {return this.history.dirtyCounter == 0;},
 
     getHistory: function() {
       return {done: copyHistoryArray(this.history.done),
               undone: copyHistoryArray(this.history.undone)};
     },
     setHistory: function(histData) {
-      var hist = this.history = makeHistory();
+      var hist = this.history = makeHistory(this.history.maxGeneration);
       hist.done = histData.done.slice(0);
       hist.undone = histData.undone.slice(0);
     },
@@ -4910,7 +4917,7 @@ window.CodeMirror = (function() {
 
   // HISTORY
 
-  function makeHistory() {
+  function makeHistory(startGen) {
     return {
       // Arrays of history events. Doing something adds an event to
       // done and clears undo. Undoing moves events from done to
@@ -4920,7 +4927,7 @@ window.CodeMirror = (function() {
       // event
       lastTime: 0, lastOp: null, lastOrigin: null,
       // Used by the isClean() method
-      dirtyCounter: 0
+      generation: startGen || 1, maxGeneration: startGen || 1
     };
   }
 
@@ -4964,17 +4971,13 @@ window.CodeMirror = (function() {
     } else {
       // Can not be merged, start a new event.
       cur = {changes: [historyChangeFromChange(doc, change)],
+             generation: hist.generation,
              anchorBefore: doc.sel.anchor, headBefore: doc.sel.head,
              anchorAfter: selAfter.anchor, headAfter: selAfter.head};
       hist.done.push(cur);
+      hist.generation = ++hist.maxGeneration;
       while (hist.done.length > hist.undoDepth)
         hist.done.shift();
-      if (hist.dirtyCounter < 0)
-        // The user has made a change after undoing past the last clean state.
-        // We can never get back to a clean state now until markClean() is called.
-        hist.dirtyCounter = NaN;
-      else
-        hist.dirtyCounter++;
     }
     hist.lastTime = time;
     hist.lastOp = opId;

From 19726208593213d01964d82464aa6a881f103345 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Jun 2013 14:39:58 +0200
Subject: [PATCH 0125/4742] [emacs mode] Minor improvements, add the start of a
 test suite

---
 keymap/emacs.js    | 53 +++++++++++++++++++++++++++++++---
 test/emacs_test.js | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 test/index.html    |  2 ++
 3 files changed, 123 insertions(+), 4 deletions(-)
 create mode 100644 test/emacs_test.js

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 39bea17dcf..6b8437cefc 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -1,21 +1,66 @@
 // TODO number prefixes
 (function() {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
+
   // Really primitive kill-ring implementation.
   var killRing = [];
   function addToRing(str) {
     killRing.push(str);
     if (killRing.length > 50) killRing.shift();
   }
+  function growRingTop(str) {
+    if (!killRing.length) return addToRing(str);
+    killRing[killRing.length - 1] += str;
+  }
   function getFromRing() { return killRing[killRing.length - 1] || ""; }
   function popFromRing() { if (killRing.length > 1) killRing.pop(); return getFromRing(); }
 
+  var lastKill = null;
+
+  function kill(cm, from, to, mayGrow, text) {
+    if (text == null) text = cm.getRange(from, to);
+
+    if (mayGrow && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen))
+      growRingTop(text);
+    else
+      addToRing(text);
+    cm.replaceRange("", from, to, "+delete");
+
+    if (mayGrow) lastKill = {cm: cm, pos: from, gen: cm.changeGeneration()};
+    else lastKill = null;
+  }
+
   CodeMirror.keyMap.emacs = {
     "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
-    "Ctrl-W": function(cm) {addToRing(cm.getSelection()); cm.replaceSelection("");},
-    "Ctrl-Alt-W": function(cm) {addToRing(cm.getSelection()); cm.replaceSelection("");},
-    "Alt-W": function(cm) {addToRing(cm.getSelection());},
-    "Ctrl-Y": function(cm) {cm.replaceSelection(getFromRing());},
+    "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
+    "Ctrl-K": function(cm) {
+      var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
+      var text = cm.getRange(start, end);
+      if (!/\S/.test(text)) {
+        text += "\n";
+        end = Pos(start.line + 1, 0);
+      }
+      kill(cm, start, end, true, text);
+    },
+    "Alt-W": function(cm) {
+      addToRing(cm.getSelection());
+    },
+    "Ctrl-Y": function(cm) {
+      var start = cm.getCursor();
+      cm.replaceRange(getFromRing(), start, start, "paste");
+      cm.setSelection(start, cm.getCursor());
+    },
     "Alt-Y": function(cm) {cm.replaceSelection(popFromRing());},
+
+    "Ctrl-Space": function(cm) {
+      cm.setCursor(cm.getCursor());
+      cm.setExtending(true);
+      cm.on("change", function() { cm.setExtending(false); });
+    },
+
     "Ctrl-/": "undo", "Shift-Ctrl--": "undo", "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
     "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": "clearSearch", "Shift-Alt-5": "replace",
     "Ctrl-Z": "undo", "Cmd-Z": "undo", "Alt-/": "autocomplete", "Alt-V": "goPageUp",
diff --git a/test/emacs_test.js b/test/emacs_test.js
new file mode 100644
index 0000000000..26a6945be9
--- /dev/null
+++ b/test/emacs_test.js
@@ -0,0 +1,72 @@
+(function() {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+  namespace = "emacs_";
+
+  var eventCache = {};
+  function fakeEvent(keyName) {
+    var event = eventCache[key];
+    if (event) return event;
+
+    var ctrl, shift, alt;
+    var key = keyName.replace(/\w+-/g, function(type) {
+      if (type == "Ctrl-") ctrl = true;
+      else if (type == "Alt-") alt = true;
+      else if (type == "Shift-") shift = true;
+      return "";
+    });
+    var code;
+    for (var c in CodeMirror.keyNames)
+      if (CodeMirror.keyNames[c] == key) { code = c; break; }
+    if (c == null) throw new Error("Unknown key: " + key);
+
+    return eventCache[keyName] = {
+      type: "keydown", keyCode: code, ctrlKey: ctrl, shiftKey: shift, altKey: alt,
+      preventDefault: function(){}, stopPropagation: function(){}
+    };
+  }
+
+  function sim(name, start /*, keys..., result */) {
+    var keys = Array.prototype.slice.call(arguments, 2, arguments.length - 1);
+    var result = arguments[arguments.length - 1];
+    testCM(name, function(cm) {
+      for (var i = 0; i < keys.length; ++i) {
+        var cur = keys[i];
+        if (cur instanceof Pos) cm.setCursor(cur);
+        else if (cur.call) cur(cm);
+        else cm.triggerOnKeyDown(fakeEvent(cur));
+      }
+      if (result instanceof Pos) eqPos(cm.getCursor(), result);
+      else eq(cm.getValue(), result);
+    }, {keyMap: "emacs", value: start});
+  }
+
+  sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", Pos(0, 1));
+  sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", Pos(1, 0));
+
+  sim("killYank", "abc\ndef\nghi",
+      "Ctrl-F", "Ctrl-Space", "Ctrl-N", "Ctrl-N", "Ctrl-W", "Ctrl-E", "Ctrl-Y",
+      "ahibc\ndef\ng");
+  sim("killRing", "abcdef",
+      "Ctrl-Space", "Ctrl-F", "Ctrl-W", "Ctrl-Space", "Ctrl-F", "Ctrl-W",
+      "Ctrl-Y", "Alt-Y",
+      "acdef");
+  sim("copyYank", "abcd",
+      "Ctrl-Space", "Ctrl-E", "Alt-W", "Ctrl-Y",
+      "abcdabcd");
+
+  sim("killLineSimple", "foo\nbar", "Ctrl-F", "Ctrl-K", "f\nbar");
+  sim("killLineEmptyLine", "foo\n  \nbar", "Ctrl-N", "Ctrl-K", "foo\nbar");
+  sim("killLineMulti", "foo\nbar\nbaz",
+      "Ctrl-F", "Ctrl-F", "Ctrl-K", "Ctrl-K", "Ctrl-K", "Ctrl-A", "Ctrl-Y",
+      "o\nbarfo\nbaz");
+
+  testCM("save", function(cm) {
+    var saved = false;
+    CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };
+    cm.triggerOnKeyDown(fakeEvent("Ctrl-X"));
+    cm.triggerOnKeyDown(fakeEvent("Ctrl-S"));
+    is(saved, "hi");
+  }, {value: "hi", keyMap: "emacs"});
+})();
diff --git a/test/index.html b/test/index.html
index 4667d589e8..f6fbb8d8cc 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,6 +15,7 @@
     <script src="../mode/javascript/javascript.js"></script>
     <script src="../mode/xml/xml.js"></script>
     <script src="../keymap/vim.js"></script>
+    <script src="../keymap/emacs.js"></script>
 
     <style type="text/css">
       .ok {color: #090;}
@@ -76,6 +77,7 @@ <h1>CodeMirror: Test Suite</h1>
     <script src="../mode/xquery/test.js"></script>
     <script src="../addon/mode/multiplex_test.js"></script>
     <script src="vim_test.js"></script>
+    <script src="emacs_test.js"></script>
     <script>
       window.onload = runHarness;
       CodeMirror.on(window, 'hashchange', runHarness);

From 5ecc1e138304fade3ec784a8f24d41fb7e89675f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Jun 2013 15:07:50 +0200
Subject: [PATCH 0126/4742] [emacs mode] Add Ctrl-Up/Ctrl-Down support

---
 keymap/emacs.js    | 25 ++++++++++++++++++++++++-
 test/emacs_test.js | 31 ++++++++++++++++++-------------
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 6b8437cefc..bb5f5a631b 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -5,7 +5,8 @@
   var Pos = CodeMirror.Pos;
   function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
 
-  // Really primitive kill-ring implementation.
+  // Kill 'ring'
+
   var killRing = [];
   function addToRing(str) {
     killRing.push(str);
@@ -33,6 +34,25 @@
     else lastKill = null;
   }
 
+  // Boundaries of various units
+
+  function paragraphEnd(cm, dir) {
+    var pos = cm.getCursor(), no = pos.line, line = cm.getLine(no);
+    var sawText = /\S/.test(dir < 0 ? line.slice(0, pos.ch) : line.slice(pos.ch));
+    var fst = cm.firstLine(), lst = cm.lastLine();
+    for (;;) {
+      no += dir;
+      if (no < fst || no > lst)
+        return cm.clipPos(Pos(no - dir, dir < 0 ? 0 : null));
+      line = cm.getLine(no);
+      var hasText = /\S/.test(line);
+      if (hasText) sawText = true;
+      else if (sawText) return Pos(no, 0);
+    }
+  }
+
+  // Actual keymap
+
   CodeMirror.keyMap.emacs = {
     "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
     "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
@@ -61,6 +81,9 @@
       cm.on("change", function() { cm.setExtending(false); });
     },
 
+    "Ctrl-Up": function(cm) { cm.extendSelection(paragraphEnd(cm, -1)); },
+    "Ctrl-Down": function(cm) { cm.extendSelection(paragraphEnd(cm, 1)); },
+
     "Ctrl-/": "undo", "Shift-Ctrl--": "undo", "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
     "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": "clearSearch", "Shift-Alt-5": "replace",
     "Ctrl-Z": "undo", "Cmd-Z": "undo", "Alt-/": "autocomplete", "Alt-V": "goPageUp",
diff --git a/test/emacs_test.js b/test/emacs_test.js
index 26a6945be9..77053d4f13 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -27,9 +27,8 @@
     };
   }
 
-  function sim(name, start /*, keys..., result */) {
-    var keys = Array.prototype.slice.call(arguments, 2, arguments.length - 1);
-    var result = arguments[arguments.length - 1];
+  function sim(name, start /*, actions... */) {
+    var keys = Array.prototype.slice.call(arguments, 2);
     testCM(name, function(cm) {
       for (var i = 0; i < keys.length; ++i) {
         var cur = keys[i];
@@ -37,30 +36,36 @@
         else if (cur.call) cur(cm);
         else cm.triggerOnKeyDown(fakeEvent(cur));
       }
-      if (result instanceof Pos) eqPos(cm.getCursor(), result);
-      else eq(cm.getValue(), result);
     }, {keyMap: "emacs", value: start});
   }
 
-  sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", Pos(0, 1));
-  sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", Pos(1, 0));
+  function at(line, ch) { return function(cm) { eqPos(cm.getCursor(), Pos(line, ch)); }; }
+  function txt(str) { return function(cm) { eq(cm.getValue(), str); }; }
+
+  sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", at(0, 1));
+  sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", at(1, 0));
 
   sim("killYank", "abc\ndef\nghi",
       "Ctrl-F", "Ctrl-Space", "Ctrl-N", "Ctrl-N", "Ctrl-W", "Ctrl-E", "Ctrl-Y",
-      "ahibc\ndef\ng");
+      txt("ahibc\ndef\ng"));
   sim("killRing", "abcdef",
       "Ctrl-Space", "Ctrl-F", "Ctrl-W", "Ctrl-Space", "Ctrl-F", "Ctrl-W",
       "Ctrl-Y", "Alt-Y",
-      "acdef");
+      txt("acdef"));
   sim("copyYank", "abcd",
       "Ctrl-Space", "Ctrl-E", "Alt-W", "Ctrl-Y",
-      "abcdabcd");
+      txt("abcdabcd"));
 
-  sim("killLineSimple", "foo\nbar", "Ctrl-F", "Ctrl-K", "f\nbar");
-  sim("killLineEmptyLine", "foo\n  \nbar", "Ctrl-N", "Ctrl-K", "foo\nbar");
+  sim("killLineSimple", "foo\nbar", "Ctrl-F", "Ctrl-K", txt("f\nbar"));
+  sim("killLineEmptyLine", "foo\n  \nbar", "Ctrl-N", "Ctrl-K", txt("foo\nbar"));
   sim("killLineMulti", "foo\nbar\nbaz",
       "Ctrl-F", "Ctrl-F", "Ctrl-K", "Ctrl-K", "Ctrl-K", "Ctrl-A", "Ctrl-Y",
-      "o\nbarfo\nbaz");
+      txt("o\nbarfo\nbaz"));
+
+  sim("moveByParagraph", "abc\ndef\n\n\nhij\nklm\n\n",
+      "Ctrl-F", "Ctrl-Down", at(2, 0), "Ctrl-Down", at(6, 0),
+      "Ctrl-N", "Ctrl-Up", at(3, 0), "Ctrl-Up", at(0, 0),
+      Pos(1, 2), "Ctrl-Down", at(2, 0), Pos(4, 2), "Ctrl-Up", at(3, 0));
 
   testCM("save", function(cm) {
     var saved = false;

From 0b20cf2e673ff29e6af759c0cfb25ffb6d1a3306 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Jun 2013 16:16:46 +0200
Subject: [PATCH 0127/4742] [emacs mode] Add by-sentence and by-expression
 motion

---
 addon/edit/matchbrackets.js | 19 +++++++++------
 demo/emacs.html             |  1 +
 keymap/emacs.js             | 48 +++++++++++++++++++++++++++++++++++++
 test/emacs_test.js          | 12 +++++++++-
 test/index.html             |  1 +
 5 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index e4ff914c6b..834b397656 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -5,13 +5,15 @@
   var Pos = CodeMirror.Pos;
 
   var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
-  function findMatchingBracket(cm) {
-    var maxScanLen = cm.state._matchBrackets.maxScanLineLength || 10000;
+  function findMatchingBracket(cm, where, strict) {
+    var state = cm.state.matchBrackets;
+    var maxScanLen = (state && state.maxScanLineLength) || 10000;
 
-    var cur = cm.getCursor(), line = cm.getLineHandle(cur.line), pos = cur.ch - 1;
+    var cur = where || cm.getCursor(), line = cm.getLineHandle(cur.line), pos = cur.ch - 1;
     var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
     if (!match) return null;
     var forward = match.charAt(1) == ">", d = forward ? 1 : -1;
+    if (strict && forward != (pos == cur.ch)) return null;
     var style = cm.getTokenAt(Pos(cur.line, pos + 1)).type;
 
     var stack = [line.text.charAt(pos)], re = /[(){}[\]]/;
@@ -36,12 +38,13 @@
       else found = scan(cm.getLineHandle(i), i);
       if (found) break;
     }
-    return {from: Pos(cur.line, pos), to: found && Pos(i, found.pos), match: found && found.match};
+    return {from: Pos(cur.line, pos), to: found && Pos(i, found.pos),
+            match: found && found.match, forward: forward};
   }
 
   function matchBrackets(cm, autoclear) {
     // Disable brace matching in long lines, since it'll cause hugely slow updates
-    var maxHighlightLen = cm.state._matchBrackets.maxHighlightLineLength || 1000;
+    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
     var found = findMatchingBracket(cm);
     if (!found || cm.getLine(found.from.line).length > maxHighlightLen ||
        found.to && cm.getLine(found.to.line).length > maxHighlightLen)
@@ -72,11 +75,13 @@
     if (old && old != CodeMirror.Init)
       cm.off("cursorActivity", doMatchBrackets);
     if (val) {
-      cm.state._matchBrackets = typeof val == "object" ? val : {};
+      cm.state.matchBrackets = typeof val == "object" ? val : {};
       cm.on("cursorActivity", doMatchBrackets);
     }
   });
 
   CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
-  CodeMirror.defineExtension("findMatchingBracket", function(){return findMatchingBracket(this);});
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
+    return findMatchingBracket(this, pos, strict);
+  });
 })();
diff --git a/demo/emacs.html b/demo/emacs.html
index b37a46b048..f465d893bf 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -7,6 +7,7 @@
     <script src="../lib/codemirror.js"></script>
     <script src="../mode/clike/clike.js"></script>
     <script src="../keymap/emacs.js"></script>
+    <script src="../addon/edit/matchbrackets.js"></script>
     <link rel="stylesheet" href="../doc/docs.css">
 
     <style type="text/css">
diff --git a/keymap/emacs.js b/keymap/emacs.js
index bb5f5a631b..d616a5509d 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -51,6 +51,44 @@
     }
   }
 
+  function sentenceEnd(cm, dir) {
+    var pos = cm.getCursor(), line = pos.line, ch = pos.ch;
+    var text = cm.getLine(pos.line), sawWord = false;
+    for (;;) {
+      var next = text.charAt(ch + (dir < 0 ? -1 : 0));
+      if (!next) { // End/beginning of line reached
+        if (line == (dir < 0 ? cm.firstLine() : cm.lastLine())) return Pos(line, ch);
+        text = cm.getLine(line + dir);
+        if (!/\S/.test(text)) return Pos(line, ch);
+        line += dir;
+        ch = dir < 0 ? text.length : 0;
+        continue;
+      }
+      if (sawWord && /[!?.]/.test(next)) return Pos(line, ch + (dir > 0 ? 1 : 0));
+      if (!sawWord) sawWord = /\w/.test(next);
+      ch += dir;
+    }
+  }
+
+  function exprEnd(cm, dir) {
+    var pos = cm.getCursor(), wrap;
+    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true))
+        && wrap.match && (wrap.forward ? 1 : -1) == dir)
+      return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
+
+    for (var first = true;; first = false) {
+      var token = cm.getTokenAt(pos);
+      var after = Pos(pos.line, dir < 0 ? token.start : token.end);
+      if (first && dir > 0 && token.end == pos.ch || !/\w/.test(token.string)) {
+        var newPos = cm.findPosH(after, dir, "char");
+        if (posEq(after, newPos)) return pos;
+        else pos = newPos;
+      } else {
+        return after;
+      }
+    }
+  }
+
   // Actual keymap
 
   CodeMirror.keyMap.emacs = {
@@ -84,6 +122,15 @@
     "Ctrl-Up": function(cm) { cm.extendSelection(paragraphEnd(cm, -1)); },
     "Ctrl-Down": function(cm) { cm.extendSelection(paragraphEnd(cm, 1)); },
 
+    "Alt-A": function(cm) { cm.extendSelection(sentenceEnd(cm, -1)); },
+    "Alt-E": function(cm) { cm.extendSelection(sentenceEnd(cm, 1)); },
+    "Alt-K": function(cm) { kill(cm, cm.getCursor(), sentenceEnd(cm, 1), true); },
+
+    "Ctrl-Alt-K": function(cm) { kill(cm, cm.getCursor(), exprEnd(cm, 1), true); },
+    "Ctrl-Alt-Backspace": function(cm) { kill(cm, cm.getCursor(), exprEnd(cm, -1), true); },
+    "Ctrl-Alt-F": function(cm) { cm.extendSelection(exprEnd(cm, 1)); },
+    "Ctrl-Alt-B": function(cm) { cm.extendSelection(exprEnd(cm, -1)); },
+
     "Ctrl-/": "undo", "Shift-Ctrl--": "undo", "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
     "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": "clearSearch", "Shift-Alt-5": "replace",
     "Ctrl-Z": "undo", "Cmd-Z": "undo", "Alt-/": "autocomplete", "Alt-V": "goPageUp",
@@ -93,6 +140,7 @@
 
   CodeMirror.keyMap["emacs-Ctrl-X"] = {
     "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": "undo", "K": "close",
+    "Delete": function(cm) { kill(cm, cm.getCursor(), sentenceEnd(cm, 1), true); },
     auto: "emacs", nofallthrough: true, disableInput: true
   };
 })();
diff --git a/test/emacs_test.js b/test/emacs_test.js
index 77053d4f13..cdcf17325a 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -36,7 +36,7 @@
         else if (cur.call) cur(cm);
         else cm.triggerOnKeyDown(fakeEvent(cur));
       }
-    }, {keyMap: "emacs", value: start});
+    }, {keyMap: "emacs", value: start, mode: "javascript"});
   }
 
   function at(line, ch) { return function(cm) { eqPos(cm.getCursor(), Pos(line, ch)); }; }
@@ -67,6 +67,16 @@
       "Ctrl-N", "Ctrl-Up", at(3, 0), "Ctrl-Up", at(0, 0),
       Pos(1, 2), "Ctrl-Down", at(2, 0), Pos(4, 2), "Ctrl-Up", at(3, 0));
 
+  sim("moveBySentence", "sentence one! sentence\ntwo\n\nparagraph two",
+      "Alt-E", at(0, 13), "Alt-E", at(1, 3), "Ctrl-F", "Alt-A", at(0, 13));
+
+  sim("moveByExpr", "function foo(a, b) {}",
+      "Ctrl-Alt-F", at(0, 8), "Ctrl-Alt-F", at(0, 12), "Ctrl-Alt-F", at(0, 18),
+      "Ctrl-Alt-B", at(0, 12), "Ctrl-Alt-B", at(0, 9));
+  sim("delExpr", "var x = [\n  a,\n  b\n  c\n];",
+      Pos(0, 8), "Ctrl-Alt-K", txt("var x = ;"), "Ctrl-/",
+      Pos(4, 1), "Ctrl-Alt-Backspace", txt("var x = ;"));
+
   testCM("save", function(cm) {
     var saved = false;
     CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };
diff --git a/test/index.html b/test/index.html
index f6fbb8d8cc..4a827e643a 100644
--- a/test/index.html
+++ b/test/index.html
@@ -11,6 +11,7 @@
     <script src="../addon/mode/multiplex.js"></script>
     <script src="../addon/search/searchcursor.js"></script>
     <script src="../addon/dialog/dialog.js"></script>
+    <script src="../addon/edit/matchbrackets.js"></script>
     <script src="../addon/comment/comment.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
     <script src="../mode/xml/xml.js"></script>

From 44b8f450077942b1356245ee9256e7326f3c4152 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 08:36:44 +0200
Subject: [PATCH 0128/4742] [comment addon] Make toggleComment work on empty
 lines

---
 addon/comment/comment.js | 11 ++++++-----
 demo/emacs.html          |  1 +
 keymap/emacs.js          |  2 ++
 test/comment_test.js     |  5 +++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index b25bd96f22..3c76744654 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -30,7 +30,7 @@
     if (firstLine == null) return;
     var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
     var pad = options.padding == null ? " " : options.padding;
-    var blankLines = options.commentBlankLines;
+    var blankLines = options.commentBlankLines || from.line == to.line;
 
     self.operation(function() {
       if (options.indent) {
@@ -90,9 +90,9 @@
 
     // Try finding line comments
     var lineString = options.lineComment || mode.lineComment, lines = [];
-    var pad = options.padding == null ? " " : options.padding;
-    lineComment: for(;;) {
-      if (!lineString) break;
+    var pad = options.padding == null ? " " : options.padding, didSomething;
+    lineComment: {
+      if (!lineString) break lineComment;
       for (var i = start; i <= end; ++i) {
         var line = self.getLine(i);
         var found = line.indexOf(lineString);
@@ -106,10 +106,11 @@
           var pos = line.indexOf(lineString), endPos = pos + lineString.length;
           if (pos < 0) continue;
           if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
+          didSomething = true;
           self.replaceRange("", Pos(i, pos), Pos(i, endPos));
         }
       });
-      return true;
+      if (didSomething) return true;
     }
 
     // Try block comments
diff --git a/demo/emacs.html b/demo/emacs.html
index f465d893bf..664a3fdae9 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -8,6 +8,7 @@
     <script src="../mode/clike/clike.js"></script>
     <script src="../keymap/emacs.js"></script>
     <script src="../addon/edit/matchbrackets.js"></script>
+    <script src="../addon/comment/comment.js"></script>
     <link rel="stylesheet" href="../doc/docs.css">
 
     <style type="text/css">
diff --git a/keymap/emacs.js b/keymap/emacs.js
index d616a5509d..f6f664ab0a 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -131,6 +131,8 @@
     "Ctrl-Alt-F": function(cm) { cm.extendSelection(exprEnd(cm, 1)); },
     "Ctrl-Alt-B": function(cm) { cm.extendSelection(exprEnd(cm, -1)); },
 
+    "Alt-;": "toggleComment",
+
     "Ctrl-/": "undo", "Shift-Ctrl--": "undo", "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
     "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": "clearSearch", "Shift-Alt-5": "replace",
     "Ctrl-Z": "undo", "Cmd-Z": "undo", "Alt-/": "autocomplete", "Alt-V": "goPageUp",
diff --git a/test/comment_test.js b/test/comment_test.js
index 311bdb5f49..7ab3127b43 100644
--- a/test/comment_test.js
+++ b/test/comment_test.js
@@ -43,4 +43,9 @@ namespace = "comment_";
   test("indented", "javascript", function(cm) {
     cm.lineComment(Pos(1, 0), Pos(2), {indent: true});
   }, simpleProg, "function foo() {\n  // return bar;\n  // }");
+
+  test("singleEmptyLine", "javascript", function(cm) {
+    cm.setCursor(1);
+    cm.execCommand("toggleComment");
+  }, "a;\n\nb;", "a;\n// \nb;");
 })();

From 4d90587c4f3e30d6852369cf5968429c3bfd32e4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 08:56:29 +0200
Subject: [PATCH 0129/4742] [emacs mode] Add Alt-G G, Alt-Space, Alt-;

---
 demo/emacs.html    |  2 ++
 keymap/emacs.js    | 43 +++++++++++++++++++++++++++++++++++++------
 test/emacs_test.js |  5 +++++
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/demo/emacs.html b/demo/emacs.html
index 664a3fdae9..fc147fda0f 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -9,6 +9,8 @@
     <script src="../keymap/emacs.js"></script>
     <script src="../addon/edit/matchbrackets.js"></script>
     <script src="../addon/comment/comment.js"></script>
+    <script src="../addon/dialog/dialog.js"></script>
+    <link rel="stylesheet" href="../addon/dialog/dialog.css">
     <link rel="stylesheet" href="../doc/docs.css">
 
     <style type="text/css">
diff --git a/keymap/emacs.js b/keymap/emacs.js
index f6f664ab0a..03b7d6d79e 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -89,10 +89,24 @@
     }
   }
 
+  // Utilities
+
+  function setMark(cm) {
+    cm.setCursor(cm.getCursor());
+    cm.setExtending(true);
+    cm.on("change", function() { cm.setExtending(false); });
+  }
+
+  function getInput(cm, msg, f) {
+    if (cm.openDialog)
+      cm.openDialog(msg + ": <input type=\"text\" style=\"width: 10em\"/>", f, {bottom: true});
+    else
+      f(prompt(msg, ""));
+  }
+
   // Actual keymap
 
   CodeMirror.keyMap.emacs = {
-    "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
     "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
     "Ctrl-K": function(cm) {
       var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
@@ -113,11 +127,7 @@
     },
     "Alt-Y": function(cm) {cm.replaceSelection(popFromRing());},
 
-    "Ctrl-Space": function(cm) {
-      cm.setCursor(cm.getCursor());
-      cm.setExtending(true);
-      cm.on("change", function() { cm.setExtending(false); });
-    },
+    "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
 
     "Ctrl-Up": function(cm) { cm.extendSelection(paragraphEnd(cm, -1)); },
     "Ctrl-Down": function(cm) { cm.extendSelection(paragraphEnd(cm, 1)); },
@@ -131,6 +141,16 @@
     "Ctrl-Alt-F": function(cm) { cm.extendSelection(exprEnd(cm, 1)); },
     "Ctrl-Alt-B": function(cm) { cm.extendSelection(exprEnd(cm, -1)); },
 
+    "Alt-G": function(cm) {cm.setOption("keyMap", "emacs-Alt-G");},
+    "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
+
+    "Alt-Space": function(cm) {
+      var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
+      while (from && /\s/.test(text.charAt(from - 1))) --from;
+      while (to < text.length && /\s/.test(text.charAt(to))) ++to;
+      cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
+    },
+
     "Alt-;": "toggleComment",
 
     "Ctrl-/": "undo", "Shift-Ctrl--": "undo", "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
@@ -145,4 +165,15 @@
     "Delete": function(cm) { kill(cm, cm.getCursor(), sentenceEnd(cm, 1), true); },
     auto: "emacs", nofallthrough: true, disableInput: true
   };
+
+  CodeMirror.keyMap["emacs-Alt-G"] = {
+    "G": function(cm) {
+      getInput(cm, "Goto line", function(str) {
+        var num;
+        if (str && !isNaN(num = Number(str)) && num == num|0 && num > 0)
+          cm.setCursor(num - 1);
+      });
+    },
+    auto: "emacs", nofallthrough: true, disableInput: true
+  };
 })();
diff --git a/test/emacs_test.js b/test/emacs_test.js
index cdcf17325a..b46b1e98fd 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -77,6 +77,11 @@
       Pos(0, 8), "Ctrl-Alt-K", txt("var x = ;"), "Ctrl-/",
       Pos(4, 1), "Ctrl-Alt-Backspace", txt("var x = ;"));
 
+  sim("justOneSpace", "hi      bye  ",
+      Pos(0, 4), "Alt-Space", txt("hi bye  "),
+      Pos(0, 4), "Alt-Space", txt("hi b ye  "),
+      "Ctrl-A", "Alt-Space", "Ctrl-E", "Alt-Space", txt(" hi b ye "));
+
   testCM("save", function(cm) {
     var saved = false;
     CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };

From 3871f258e604683b68cfe4df8c9a53b1f40f50c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 09:14:10 +0200
Subject: [PATCH 0130/4742] [emacs mode] Add Ctrl-O, Ctrl-T

---
 demo/emacs.html    |  2 ++
 keymap/emacs.js    | 10 ++++++++++
 test/emacs_test.js |  7 +++++++
 3 files changed, 19 insertions(+)

diff --git a/demo/emacs.html b/demo/emacs.html
index fc147fda0f..0a8cfc5d99 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -10,6 +10,8 @@
     <script src="../addon/edit/matchbrackets.js"></script>
     <script src="../addon/comment/comment.js"></script>
     <script src="../addon/dialog/dialog.js"></script>
+    <script src="../addon/search/searchcursor.js"></script>
+    <script src="../addon/search/search.js"></script>
     <link rel="stylesheet" href="../addon/dialog/dialog.css">
     <link rel="stylesheet" href="../doc/docs.css">
 
diff --git a/keymap/emacs.js b/keymap/emacs.js
index 03b7d6d79e..6fb011732b 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -150,6 +150,16 @@
       while (to < text.length && /\s/.test(text.charAt(to))) ++to;
       cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
     },
+    "Ctrl-O": function(cm) { cm.replaceSelection("\n", "start"); },
+    "Ctrl-T": function(cm) {
+      var pos = cm.getCursor();
+      if (pos.ch < cm.getLine(pos.line).length) pos = Pos(pos.line, pos.ch + 1);
+      var from = cm.findPosH(pos, -2, "char");
+      var range = cm.getRange(from, pos);
+      if (range.length != 2) return;
+      cm.setSelection(from, pos);
+      cm.replaceSelection(range.charAt(1) + range.charAt(0), "end");
+    },
 
     "Alt-;": "toggleComment",
 
diff --git a/test/emacs_test.js b/test/emacs_test.js
index b46b1e98fd..7bef7d5d02 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -82,6 +82,13 @@
       Pos(0, 4), "Alt-Space", txt("hi b ye  "),
       "Ctrl-A", "Alt-Space", "Ctrl-E", "Alt-Space", txt(" hi b ye "));
 
+  sim("openLine", "foo bar", "Alt-F", "Ctrl-O", txt("foo\n bar"))
+
+  sim("transposeChar", "abcd\n\ne",
+      "Ctrl-F", "Ctrl-T", "Ctrl-T", txt("bcad\n\ne"), at(0, 3),
+      "Ctrl-F", "Ctrl-T", "Ctrl-T", "Ctrl-T", txt("bcda\n\ne"), at(0, 4),
+      "Ctrl-F", "Ctrl-T", txt("bcd\na\ne"), at(1, 1));
+
   testCM("save", function(cm) {
     var saved = false;
     CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };

From 25ff374958257ec3ec150e11e723016f1849a662 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 09:23:19 +0200
Subject: [PATCH 0131/4742] [emacs mode] Add Alt-C, Alt-U, Alt-L

---
 keymap/emacs.js    | 16 ++++++++++++++++
 test/emacs_test.js |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 6fb011732b..138108dd0a 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -104,6 +104,12 @@
       f(prompt(msg, ""));
   }
 
+  function operateOnWord(cm, op) {
+    var start = cm.getCursor(), end = cm.findPosH(start, 1, "word");
+    cm.replaceRange(op(cm.getRange(start, end)), start, end);
+    cm.setCursor(end);
+  }
+
   // Actual keymap
 
   CodeMirror.keyMap.emacs = {
@@ -161,6 +167,16 @@
       cm.replaceSelection(range.charAt(1) + range.charAt(0), "end");
     },
 
+    "Alt-C": function(cm) {
+      operateOnWord(cm, function(w) {
+        var letter = w.search(/\w/);
+        if (letter == -1) return w;
+        return w.slice(0, letter) + w.charAt(letter).toUpperCase() + w.slice(letter + 1).toLowerCase();
+      });
+    },
+    "Alt-U": function(cm) { operateOnWord(cm, function(w) { return w.toUpperCase(); }); },
+    "Alt-L": function(cm) { operateOnWord(cm, function(w) { return w.toLowerCase(); }); },
+
     "Alt-;": "toggleComment",
 
     "Ctrl-/": "undo", "Shift-Ctrl--": "undo", "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
diff --git a/test/emacs_test.js b/test/emacs_test.js
index 7bef7d5d02..2e920bd9ab 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -89,6 +89,10 @@
       "Ctrl-F", "Ctrl-T", "Ctrl-T", "Ctrl-T", txt("bcda\n\ne"), at(0, 4),
       "Ctrl-F", "Ctrl-T", txt("bcd\na\ne"), at(1, 1));
 
+  sim("manipWordCase", "foo BAR bAZ",
+      "Alt-C", "Alt-L", "Alt-U", txt("Foo bar BAZ"),
+      "Ctrl-A", "Alt-U", "Alt-L", "Alt-C", txt("FOO bar Baz"));
+
   testCM("save", function(cm) {
     var saved = false;
     CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };

From 4610b0ba6f6137100ceebf2c0cf2936ea4bef74b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 09:32:50 +0200
Subject: [PATCH 0132/4742] Support integer 'how' argument to indentLine

---
 doc/manual.html   |  5 ++++-
 lib/codemirror.js |  6 ++++--
 test/test.js      | 10 ++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 616a11002f..44f53d3b3a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1404,7 +1404,7 @@ <h3 id="api_misc">Miscellaneous methods</h3>
       lot faster. The return value from this method will be the return
       value of your function.</dd>
 
-      <dt id="indentLine"><code><strong>cm.indentLine</strong>(line: integer, ?dir: string)</code></dt>
+      <dt id="indentLine"><code><strong>cm.indentLine</strong>(line: integer, ?dir: string|integer)</code></dt>
       <dd>Adjust the indentation of the given line. The second
       argument (which defaults to <code>"smart"</code>) may be one of:
         <dl>
@@ -1418,6 +1418,9 @@ <h3 id="api_misc">Miscellaneous methods</h3>
           one <a href="#option_indentUnit">indent unit</a>.</dd>
           <dt><code><strong>"subtract"</strong></code></dt>
           <dd>Reduce the indentation of the line.</dd>
+          <dt><code><strong>&lt;integer></strong></code></dt>
+          <dd>Add (positive number) or reduce (negative number) the
+          indentation by the given amount of spaces.</dd>
         </dl></dd>
 
       <dt id="toggleOverwrite"><code><strong>cm.toggleOverwrite</strong>(?value: bool)</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 043209543a..8607b6aa90 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2641,7 +2641,7 @@ window.CodeMirror = (function() {
 
   function indentLine(cm, n, how, aggressive) {
     var doc = cm.doc;
-    if (!how) how = "add";
+    if (how == null) how = "add";
     if (how == "smart") {
       if (!cm.doc.mode.indent) how = "prev";
       else var state = getStateBefore(cm, n);
@@ -2664,6 +2664,8 @@ window.CodeMirror = (function() {
       indentation = curSpace + cm.options.indentUnit;
     } else if (how == "subtract") {
       indentation = curSpace - cm.options.indentUnit;
+    } else if (typeof how == "number") {
+      indentation = curSpace + how;
     }
     indentation = Math.max(0, indentation);
 
@@ -2820,7 +2822,7 @@ window.CodeMirror = (function() {
     }),
 
     indentLine: operation(null, function(n, dir, aggressive) {
-      if (typeof dir != "string") {
+      if (typeof dir != "string" && typeof dir != "number") {
         if (dir == null) dir = this.options.smartIndent ? "smart" : "prev";
         else dir = dir ? "add" : "subtract";
       }
diff --git a/test/test.js b/test/test.js
index fa8cccdc6f..f34f3ced7b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -155,6 +155,16 @@ testCM("indent", function(cm) {
   eq(cm.getLine(1), "\t\t  blah();");
 }, {value: "if (x) {\nblah();\n}", indentUnit: 3, indentWithTabs: true, tabSize: 8});
 
+testCM("indentByNumber", function(cm) {
+  cm.indentLine(0, 2);
+  eq(cm.getLine(0), "  foo");
+  cm.indentLine(0, -200);
+  eq(cm.getLine(0), "foo");
+  cm.setSelection(Pos(0, 0), Pos(1, 2));
+  cm.indentSelection(3);
+  eq(cm.getValue(), "   foo\n   bar\nbaz");
+}, {value: "foo\nbar\nbaz"});
+
 test("core_defaults", function() {
   var defsCopy = {}, defs = CodeMirror.defaults;
   for (var opt in defs) defsCopy[opt] = defs[opt];

From b1f215e56ea17887deee361d8c889d416d6a5c56 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 09:43:32 +0200
Subject: [PATCH 0133/4742] Fix bug where 'auto' keymap transitions didn't
 restore disableInput setting

---
 lib/codemirror.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8607b6aa90..31601379e8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2007,8 +2007,10 @@ window.CodeMirror = (function() {
     var startMap = getKeyMap(cm.options.keyMap), next = startMap.auto;
     clearTimeout(maybeTransition);
     if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
-      if (getKeyMap(cm.options.keyMap) == startMap)
+      if (getKeyMap(cm.options.keyMap) == startMap) {
         cm.options.keyMap = (next.call ? next.call(null, cm) : next);
+        keyMapChanged(cm);
+      }
     }, 50);
 
     var name = keyName(e, true), handled = false;

From f920ac8da24d2838f97eda19eb547106817c78f7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 11:49:01 +0200
Subject: [PATCH 0134/4742] Fire events when keys are handled and input is read

(experimental, documentation will follow when finalized)
---
 lib/codemirror.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 31601379e8..a796b0bbeb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1459,11 +1459,14 @@ window.CodeMirror = (function() {
       from = Pos(from.line, from.ch - (prevInput.length - same));
     else if (cm.state.overwrite && posEq(from, to) && !cm.state.pasteIncoming)
       to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + (text.length - same)));
-    var updateInput = cm.curOp.updateInput;
-    makeChange(cm.doc, {from: from, to: to, text: splitLines(text.slice(same)),
-                        origin: cm.state.pasteIncoming ? "paste" : "+input"}, "end");
 
+    var updateInput = cm.curOp.updateInput;
+    var changeEvent = {from: from, to: to, text: splitLines(text.slice(same)),
+                       origin: cm.state.pasteIncoming ? "paste" : "+input"};
+    makeChange(cm.doc, changeEvent, "end");
     cm.curOp.updateInput = updateInput;
+    signalLater(cm, "inputRead", cm, changeEvent);
+
     if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
     else cm.display.prevInput = text;
     if (withOp) endOperation(cm);
@@ -2033,6 +2036,7 @@ window.CodeMirror = (function() {
       e_preventDefault(e);
       restartBlink(cm);
       if (ie_lt9) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
+      signalLater(cm, "keyHandled", cm, name, e);
     }
     return handled;
   }
@@ -2043,6 +2047,7 @@ window.CodeMirror = (function() {
     if (handled) {
       e_preventDefault(e);
       restartBlink(cm);
+      signalLater(cm, "keyHandled", cm, "'" + ch + "'", e);
     }
     return handled;
   }

From 1517f7055a0a290114271bcc1351efd84a4984c4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 11:49:08 +0200
Subject: [PATCH 0135/4742] [emacs mode] Add rough support for command prefixes

---
 keymap/emacs.js    | 181 ++++++++++++++++++++++++++++++++++++---------
 test/emacs_test.js |  13 ++++
 2 files changed, 161 insertions(+), 33 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 138108dd0a..c8aa01064e 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -16,7 +16,7 @@
     if (!killRing.length) return addToRing(str);
     killRing[killRing.length - 1] += str;
   }
-  function getFromRing() { return killRing[killRing.length - 1] || ""; }
+  function getFromRing(n) { return killRing[killRing.length - (n ? Math.min(n, 1) : 1)] || ""; }
   function popFromRing() { if (killRing.length > 1) killRing.pop(); return getFromRing(); }
 
   var lastKill = null;
@@ -36,8 +36,8 @@
 
   // Boundaries of various units
 
-  function paragraphEnd(cm, dir) {
-    var pos = cm.getCursor(), no = pos.line, line = cm.getLine(no);
+  function byParagraph(cm, pos, dir) {
+    var no = pos.line, line = cm.getLine(no);
     var sawText = /\S/.test(dir < 0 ? line.slice(0, pos.ch) : line.slice(pos.ch));
     var fst = cm.firstLine(), lst = cm.lastLine();
     for (;;) {
@@ -51,8 +51,8 @@
     }
   }
 
-  function sentenceEnd(cm, dir) {
-    var pos = cm.getCursor(), line = pos.line, ch = pos.ch;
+  function bySentence(cm, pos, dir) {
+    var line = pos.line, ch = pos.ch;
     var text = cm.getLine(pos.line), sawWord = false;
     for (;;) {
       var next = text.charAt(ch + (dir < 0 ? -1 : 0));
@@ -70,8 +70,8 @@
     }
   }
 
-  function exprEnd(cm, dir) {
-    var pos = cm.getCursor(), wrap;
+  function byExpr(cm, pos, dir) {
+    var wrap;
     if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true))
         && wrap.match && (wrap.forward ? 1 : -1) == dir)
       return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
@@ -89,6 +89,91 @@
     }
   }
 
+  // Prefixes (only crudely supported)
+
+  function getPrefix(cm, precise) {
+    var digits = cm.state.emacsPrefix;
+    if (!digits) return 1;
+    clearPrefix(cm);
+    return digits == "-" ? -1 : Number(digits);
+  }
+
+  function repeated(cmd) {
+    var f = typeof cmd == "string" ? function(cm) { cm.execCommand(cmd); } : cmd;
+    return function(cm) {
+      var prefix = getPrefix(cm);
+      f(cm);
+      for (var i = 1; i < prefix; ++i) f(cm);
+    };
+  }
+
+  function findEnd(cm, by, dir) {
+    var pos = cm.getCursor(), prefix = getPrefix(cm);
+    if (prefix < 0) { dir = -dir; prefix = -prefix; }
+    for (var i = 0; i < prefix; ++i) {
+      var newPos = by(cm, pos, dir);
+      if (posEq(newPos, pos)) break;
+      pos = newPos;
+    }
+    return pos;
+  }
+
+  function move(cm, by, dir) {
+    cm.extendSelection(findEnd(cm, by, dir));
+  }
+
+  function killTo(cm, by, dir) {
+    kill(cm, cm.getCursor(), findEnd(cm, by, dir), true);
+  }
+
+  function addPrefix(cm, digit) {
+    if (cm.state.emacsPrefix) {
+      if (digit != "-") cm.state.emacsPrefix += digit;
+      return;
+    }
+    // Not active yet
+    cm.state.emacsPrefix = digit;
+    cm.on("keyHandled", maybeClearPrefix);
+    cm.on("inputRead", maybeDuplicateInput);
+  }
+
+  var prefixPreservingKeys = {"Alt-G": true, "Ctrl-X": true, "Ctrl-Q": true, "Ctrl-U": true};
+
+  function maybeClearPrefix(cm, arg) {
+    if (!cm.state.emacsPrefixMap && !prefixPreservingKeys.hasOwnProperty(arg))
+      clearPrefix(cm);
+  }
+
+  function clearPrefix(cm) {
+    cm.state.emacsPrefix = null;
+    cm.off("keyHandled", maybeClearPrefix);
+    cm.off("inputRead", maybeDuplicateInput);
+  }
+
+  function maybeDuplicateInput(cm, event) {
+    var dup = getPrefix(cm);
+    if (dup > 1 && event.origin == "+input") {
+      var one = event.text.join("\n"), txt = "";
+      for (var i = 1; i < dup; ++i) txt += one;
+      cm.replaceSelection(txt, "end", "+input");
+    }
+  }
+
+  function addPrefixMap(cm) {
+    cm.state.emacsPrefixMap = true;
+    cm.addKeyMap(prefixMap);
+    cm.on("keyHandled", maybeRemovePrefixMap);                          
+    cm.on("inputRead", maybeRemovePrefixMap);
+  }
+
+  function maybeRemovePrefixMap(cm, arg) {
+    if (typeof arg == "string" && (/^\d$/.test(arg) || arg == "Ctrl-U")) return;
+    cm.removeKeyMap(prefixMap);
+    cm.state.emacsPrefixMap = false;
+    cm.off("keyHandled", maybeRemovePrefixMap);                          
+    cm.off("inputRead", maybeRemovePrefixMap);
+  }
+
   // Utilities
 
   function setMark(cm) {
@@ -112,9 +197,9 @@
 
   // Actual keymap
 
-  CodeMirror.keyMap.emacs = {
+  var keyMap = CodeMirror.keyMap.emacs = {
     "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
-    "Ctrl-K": function(cm) {
+    "Ctrl-K": repeated(function(cm) {
       var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
       var text = cm.getRange(start, end);
       if (!/\S/.test(text)) {
@@ -122,33 +207,30 @@
         end = Pos(start.line + 1, 0);
       }
       kill(cm, start, end, true, text);
-    },
+    }),
     "Alt-W": function(cm) {
       addToRing(cm.getSelection());
     },
     "Ctrl-Y": function(cm) {
       var start = cm.getCursor();
-      cm.replaceRange(getFromRing(), start, start, "paste");
+      cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
       cm.setSelection(start, cm.getCursor());
     },
     "Alt-Y": function(cm) {cm.replaceSelection(popFromRing());},
 
     "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
 
-    "Ctrl-Up": function(cm) { cm.extendSelection(paragraphEnd(cm, -1)); },
-    "Ctrl-Down": function(cm) { cm.extendSelection(paragraphEnd(cm, 1)); },
+    "Ctrl-Up": function(cm) { move(cm, byParagraph, -1); },
+    "Ctrl-Down": function(cm) { move(cm, byParagraph, 1); },
 
-    "Alt-A": function(cm) { cm.extendSelection(sentenceEnd(cm, -1)); },
-    "Alt-E": function(cm) { cm.extendSelection(sentenceEnd(cm, 1)); },
-    "Alt-K": function(cm) { kill(cm, cm.getCursor(), sentenceEnd(cm, 1), true); },
+    "Alt-A": function(cm) { move(cm, bySentence, -1); },
+    "Alt-E": function(cm) { move(cm, bySentence, 1); },
+    "Alt-K": function(cm) { killTo(cm, bySentence, 1); },
 
-    "Ctrl-Alt-K": function(cm) { kill(cm, cm.getCursor(), exprEnd(cm, 1), true); },
-    "Ctrl-Alt-Backspace": function(cm) { kill(cm, cm.getCursor(), exprEnd(cm, -1), true); },
-    "Ctrl-Alt-F": function(cm) { cm.extendSelection(exprEnd(cm, 1)); },
-    "Ctrl-Alt-B": function(cm) { cm.extendSelection(exprEnd(cm, -1)); },
-
-    "Alt-G": function(cm) {cm.setOption("keyMap", "emacs-Alt-G");},
-    "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
+    "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1); },
+    "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1); },
+    "Ctrl-Alt-F": function(cm) { move(cm, byExpr, 1); },
+    "Ctrl-Alt-B": function(cm) { move(cm, byExpr, -1); },
 
     "Alt-Space": function(cm) {
       var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
@@ -156,8 +238,8 @@
       while (to < text.length && /\s/.test(text.charAt(to))) ++to;
       cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
     },
-    "Ctrl-O": function(cm) { cm.replaceSelection("\n", "start"); },
-    "Ctrl-T": function(cm) {
+    "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }),
+    "Ctrl-T": repeated(function(cm) {
       var pos = cm.getCursor();
       if (pos.ch < cm.getLine(pos.line).length) pos = Pos(pos.line, pos.ch + 1);
       var from = cm.findPosH(pos, -2, "char");
@@ -165,35 +247,54 @@
       if (range.length != 2) return;
       cm.setSelection(from, pos);
       cm.replaceSelection(range.charAt(1) + range.charAt(0), "end");
-    },
+    }),
 
-    "Alt-C": function(cm) {
+    "Alt-C": repeated(function(cm) {
       operateOnWord(cm, function(w) {
         var letter = w.search(/\w/);
         if (letter == -1) return w;
         return w.slice(0, letter) + w.charAt(letter).toUpperCase() + w.slice(letter + 1).toLowerCase();
       });
-    },
-    "Alt-U": function(cm) { operateOnWord(cm, function(w) { return w.toUpperCase(); }); },
-    "Alt-L": function(cm) { operateOnWord(cm, function(w) { return w.toLowerCase(); }); },
+    }),
+    "Alt-U": repeated(function(cm) {
+      operateOnWord(cm, function(w) { return w.toUpperCase(); });
+    }),
+    "Alt-L": repeated(function(cm) {
+      operateOnWord(cm, function(w) { return w.toLowerCase(); });
+    }),
 
     "Alt-;": "toggleComment",
 
-    "Ctrl-/": "undo", "Shift-Ctrl--": "undo", "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
+    "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
+    "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
+    "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
     "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": "clearSearch", "Shift-Alt-5": "replace",
-    "Ctrl-Z": "undo", "Cmd-Z": "undo", "Alt-/": "autocomplete", "Alt-V": "goPageUp",
+    "Alt-/": "autocomplete", "Alt-V": "goPageUp",
     "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
+
+    "Alt-G": function(cm) {cm.setOption("keyMap", "emacs-Alt-G");},
+    "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
+    "Ctrl-Q": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-Q");},
+    "Ctrl-U": addPrefixMap,
+
     fallthrough: ["basic", "emacsy"]
   };
 
   CodeMirror.keyMap["emacs-Ctrl-X"] = {
-    "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": "undo", "K": "close",
+    "Tab": function(cm) {
+      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
+    },
+
+    "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": repeated("undo"), "K": "close",
     "Delete": function(cm) { kill(cm, cm.getCursor(), sentenceEnd(cm, 1), true); },
     auto: "emacs", nofallthrough: true, disableInput: true
   };
 
   CodeMirror.keyMap["emacs-Alt-G"] = {
     "G": function(cm) {
+      var prefix = getPrefix(cm, true);
+      if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
+
       getInput(cm, "Goto line", function(str) {
         var num;
         if (str && !isNaN(num = Number(str)) && num == num|0 && num > 0)
@@ -202,4 +303,18 @@
     },
     auto: "emacs", nofallthrough: true, disableInput: true
   };
+
+  CodeMirror.keyMap["emacs-Ctrl-Q"] = {
+    "Tab": repeated("insertTab"),
+    auto: "emacs", nofallthrough: true
+  };
+
+  var prefixMap = {"Ctrl-G": clearPrefix};
+  function regPrefix(d) {
+    prefixMap[d] = function(cm) { addPrefix(cm, d); };
+    keyMap["Ctrl-" + d] = function(cm) { addPrefix(cm, d); };
+    prefixPreservingKeys["Ctrl-" + d] = true;
+  }
+  for (var i = 0; i < 10; ++i) regPrefix(String(i));
+  regPrefix("-");
 })();
diff --git a/test/emacs_test.js b/test/emacs_test.js
index 2e920bd9ab..b5f67236e5 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -66,6 +66,9 @@
       "Ctrl-F", "Ctrl-Down", at(2, 0), "Ctrl-Down", at(6, 0),
       "Ctrl-N", "Ctrl-Up", at(3, 0), "Ctrl-Up", at(0, 0),
       Pos(1, 2), "Ctrl-Down", at(2, 0), Pos(4, 2), "Ctrl-Up", at(3, 0));
+  sim("moveByParagraphMulti", "abc\n\ndef\n\nhij\n\nklm",
+      "Ctrl-U", "2", "Ctrl-Down", at(3, 0),
+      "Shift-Alt-.", "Ctrl-3", "Ctrl-Up", at(1, 0));
 
   sim("moveBySentence", "sentence one! sentence\ntwo\n\nparagraph two",
       "Alt-E", at(0, 13), "Alt-E", at(1, 3), "Ctrl-F", "Alt-A", at(0, 13));
@@ -73,9 +76,16 @@
   sim("moveByExpr", "function foo(a, b) {}",
       "Ctrl-Alt-F", at(0, 8), "Ctrl-Alt-F", at(0, 12), "Ctrl-Alt-F", at(0, 18),
       "Ctrl-Alt-B", at(0, 12), "Ctrl-Alt-B", at(0, 9));
+  sim("moveByExprMulti", "foo bar baz bug",
+      "Ctrl-2", "Ctrl-Alt-F", at(0, 7),
+      "Ctrl--", "Ctrl-Alt-F", at(0, 4),
+      "Ctrl--", "Ctrl-2", "Ctrl-Alt-B", at(0, 11));
   sim("delExpr", "var x = [\n  a,\n  b\n  c\n];",
       Pos(0, 8), "Ctrl-Alt-K", txt("var x = ;"), "Ctrl-/",
       Pos(4, 1), "Ctrl-Alt-Backspace", txt("var x = ;"));
+  sim("delExprMulti", "foo bar baz",
+      "Ctrl-2", "Ctrl-Alt-K", txt(" baz"),
+      "Ctrl-/", "Ctrl-E", "Ctrl-2", "Ctrl-Alt-Backspace", txt("foo "));
 
   sim("justOneSpace", "hi      bye  ",
       Pos(0, 4), "Alt-Space", txt("hi bye  "),
@@ -92,6 +102,9 @@
   sim("manipWordCase", "foo BAR bAZ",
       "Alt-C", "Alt-L", "Alt-U", txt("Foo bar BAZ"),
       "Ctrl-A", "Alt-U", "Alt-L", "Alt-C", txt("FOO bar Baz"));
+  sim("manipWordCaseMulti", "foo Bar bAz",
+      "Ctrl-2", "Alt-U", txt("FOO BAR bAz"),
+      "Ctrl-A", "Ctrl-3", "Alt-C", txt("Foo Bar Baz"));
 
   testCM("save", function(cm) {
     var saved = false;

From edde687bb049e54d06ecd539735ecee0c059da3d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 12:14:39 +0200
Subject: [PATCH 0136/4742] [emacs mode] Duplicate 'emacsy'/'basic' bindings

Make them support prefixes.
---
 keymap/emacs.js    | 58 ++++++++++++++++++++++++++++++++++++----------
 lib/codemirror.js  |  3 ++-
 test/emacs_test.js | 14 +++++++++++
 3 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index c8aa01064e..dce3929abf 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -36,6 +36,22 @@
 
   // Boundaries of various units
 
+  function byChar(cm, pos, dir) {
+    return cm.findPosH(pos, dir, "char", true);
+  }
+
+  function byWord(cm, pos, dir) {
+    return cm.findPosH(pos, dir, "word", true);
+  }
+
+  function byLine(cm, pos, dir) {
+    return cm.findPosV(pos, dir, "line", cm.doc.sel.goalColumn);
+  }
+
+  function byPage(cm, pos, dir) {
+    return cm.findPosV(pos, dir, "page", cm.doc.sel.goalColumn);
+  }
+
   function byParagraph(cm, pos, dir) {
     var no = pos.line, line = cm.getLine(no);
     var sawText = /\S/.test(dir < 0 ? line.slice(0, pos.ch) : line.slice(pos.ch));
@@ -118,8 +134,12 @@
     return pos;
   }
 
-  function move(cm, by, dir) {
-    cm.extendSelection(findEnd(cm, by, dir));
+  function move(by, dir) {
+    var f = function(cm) {
+      cm.extendSelection(findEnd(cm, by, dir));
+    };
+    f.motion = true;
+    return f;
   }
 
   function killTo(cm, by, dir) {
@@ -220,17 +240,33 @@
 
     "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
 
-    "Ctrl-Up": function(cm) { move(cm, byParagraph, -1); },
-    "Ctrl-Down": function(cm) { move(cm, byParagraph, 1); },
+    "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
+    "Right": move(byChar, 1), "Left": move(byChar, -1),
+    "Ctrl-D": function(cm) { killTo(cm, byChar, 1); },
+    "Delete": function(cm) { killTo(cm, byChar, 1); },
+    "Ctrl-H": function(cm) { killTo(cm, byChar, -1); },
+    "Backspace": function(cm) { killTo(cm, byChar, -1); },
+
+    "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
+    "Alt-D": function(cm) { killTo(cm, byWord, 1); },
+    "Alt-Backspace": function(cm) { killTo(cm, byWord, -1); },
+
+    "Ctrl-N": move(byLine, 1), "Ctrl-P": move(byLine, -1),
+    "Down": move(byLine, 1), "Up": move(byLine, -1),
+    "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
+    "End": "goLineEnd", "Home": "goLineStart",
 
-    "Alt-A": function(cm) { move(cm, bySentence, -1); },
-    "Alt-E": function(cm) { move(cm, bySentence, 1); },
+    "Alt-V": move(byPage, -1), "Ctrl-V": move(byPage, 1),
+    "PageUp": move(byPage, -1), "PageDown": move(byPage, 1),
+
+    "Ctrl-Up": move(byParagraph, -1), "Ctrl-Down": move(byParagraph, 1),
+
+    "Alt-A": move(bySentence, -1), "Alt-E": move(bySentence, 1),
     "Alt-K": function(cm) { killTo(cm, bySentence, 1); },
 
     "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1); },
     "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1); },
-    "Ctrl-Alt-F": function(cm) { move(cm, byExpr, 1); },
-    "Ctrl-Alt-B": function(cm) { move(cm, byExpr, -1); },
+    "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1),
 
     "Alt-Space": function(cm) {
       var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
@@ -269,15 +305,13 @@
     "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
     "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
     "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": "clearSearch", "Shift-Alt-5": "replace",
-    "Alt-/": "autocomplete", "Alt-V": "goPageUp",
+    "Alt-/": "autocomplete",
     "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
 
     "Alt-G": function(cm) {cm.setOption("keyMap", "emacs-Alt-G");},
     "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
     "Ctrl-Q": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-Q");},
-    "Ctrl-U": addPrefixMap,
-
-    fallthrough: ["basic", "emacsy"]
+    "Ctrl-U": addPrefixMap
   };
 
   CodeMirror.keyMap["emacs-Ctrl-X"] = {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a796b0bbeb..b1bb217ec3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2026,7 +2026,8 @@ window.CodeMirror = (function() {
       // 'go') bound to the keyname without 'Shift-'.
       handled = lookupKey("Shift-" + name, keymaps, function(b) {return doHandleBinding(cm, b, true);})
              || lookupKey(name, keymaps, function(b) {
-                  if (typeof b == "string" && /^go[A-Z]/.test(b)) return doHandleBinding(cm, b);
+                  if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
+                    return doHandleBinding(cm, b);
                 });
     } else {
       handled = lookupKey(name, keymaps, function(b) { return doHandleBinding(cm, b); });
diff --git a/test/emacs_test.js b/test/emacs_test.js
index b5f67236e5..24a61c3739 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -43,7 +43,21 @@
   function txt(str) { return function(cm) { eq(cm.getValue(), str); }; }
 
   sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", at(0, 1));
+  sim("motionHMulti", "abcde",
+      "Ctrl-4", "Ctrl-F", at(0, 4), "Ctrl--", "Ctrl-2", "Ctrl-F", at(0, 2),
+      "Ctrl-5", "Ctrl-B", at(0, 0));
+
+  sim("motionHWord", "abc. def ghi",
+      "Alt-F", at(0, 3), "Alt-F", at(0, 8),
+      "Ctrl-B", "Alt-B", at(0, 5), "Alt-B", at(0, 0));
+  sim("motionHWordMulti", "abc. def ghi ",
+      "Ctrl-3", "Alt-F", at(0, 12), "Ctrl-2", "Alt-B", at(0, 5),
+      "Ctrl--", "Alt-B", at(0, 8));
+
   sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", at(1, 0));
+  sim("motionVMulti", "a\nb\nc\nd\ne\n",
+      "Ctrl-2", "Ctrl-N", at(2, 0), "Ctrl-F", "Ctrl--", "Ctrl-N", at(1, 1),
+      "Ctrl--", "Ctrl-3", "Ctrl-P", at(4, 1));
 
   sim("killYank", "abc\ndef\nghi",
       "Ctrl-F", "Ctrl-Space", "Ctrl-N", "Ctrl-N", "Ctrl-W", "Ctrl-E", "Ctrl-Y",

From 272d69e323e64b04689624034c228a8a60bdaed1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 13:14:31 +0200
Subject: [PATCH 0137/4742] [emacs mode] A few more expression-based bindings

---
 keymap/emacs.js    | 35 ++++++++++++++++++++++++++++++++++-
 test/emacs_test.js |  5 +++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index dce3929abf..b9750bc9c2 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -1,4 +1,3 @@
-// TODO number prefixes
 (function() {
   "use strict";
 
@@ -215,6 +214,26 @@
     cm.setCursor(end);
   }
 
+  function toEnclosingExpr(cm) {
+    var pos = cm.getCursor(), line = pos.line, ch = pos.ch;
+    var stack = [];
+    while (line >= cm.firstLine()) {
+      var text = cm.getLine(line);
+      for (var i = ch == null ? text.length : ch; i > 0;) {
+        var ch = text.charAt(--i);
+        if (ch == ")")
+          stack.push("(");
+        else if (ch == "]")
+          stack.push("[");
+        else if (ch == "}")
+          stack.push("{");
+        else if (/[\(\{\[]/.test(ch) && (!stack.length || stack.pop() != ch))
+          return cm.extendSelection(Pos(line, i));
+      }
+      --line; ch = null;
+    }
+  }
+
   // Actual keymap
 
   var keyMap = CodeMirror.keyMap.emacs = {
@@ -268,6 +287,17 @@
     "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1); },
     "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1),
 
+    "Shift-Ctrl-Alt-2": function(cm) {
+      cm.setSelection(findEnd(cm, byExpr, 1), cm.getCursor());
+    },
+    "Ctrl-Alt-T": function(cm) {
+      var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1);
+      var rightEnd = byExpr(cm, leftEnd, 1), rightStart = byExpr(cm, rightEnd, -1);
+      cm.replaceRange(cm.getRange(rightStart, rightEnd) + cm.getRange(leftEnd, rightStart) +
+                      cm.getRange(leftStart, leftEnd), leftStart, rightEnd);
+    },
+    "Ctrl-Alt-U": repeated(toEnclosingExpr),
+
     "Alt-Space": function(cm) {
       var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
       while (from && /\s/.test(text.charAt(from - 1))) --from;
@@ -318,6 +348,9 @@
     "Tab": function(cm) {
       cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
     },
+    "Ctrl-X": function(cm) {
+      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
+    },
 
     "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": repeated("undo"), "K": "close",
     "Delete": function(cm) { kill(cm, cm.getCursor(), sentenceEnd(cm, 1), true); },
diff --git a/test/emacs_test.js b/test/emacs_test.js
index 24a61c3739..ab18241dee 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -120,6 +120,11 @@
       "Ctrl-2", "Alt-U", txt("FOO BAR bAz"),
       "Ctrl-A", "Ctrl-3", "Alt-C", txt("Foo Bar Baz"));
 
+  sim("upExpr", "foo {\n  bar[];\n  baz(blah);\n}",
+      Pos(2, 7), "Ctrl-Alt-U", at(2, 5), "Ctrl-Alt-U", at(0, 4));
+  sim("transposeExpr", "do foo[bar] dah",
+      Pos(0, 6), "Ctrl-Alt-T", txt("do [bar]foo dah"));
+
   testCM("save", function(cm) {
     var saved = false;
     CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };

From 94059603b32fe92b370313a18cd008161a970513 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 15:22:31 +0200
Subject: [PATCH 0138/4742] [brace-fold addon] Allow single-line folds

---
 addon/fold/brace-fold.js | 44 ++++++++++++++++++++++++----------------
 demo/folding.html        |  4 ++--
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index efdffb877c..2e45aaa11d 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -1,23 +1,33 @@
 CodeMirror.braceRangeFinder = function(cm, start) {
   var line = start.line, lineText = cm.getLine(line);
-  var at = lineText.length, startChar, tokenType;
-  for (; at > 0;) {
-    var found = lineText.lastIndexOf("{", at);
-    var startToken = '{', endToken = '}';
-    if (found < start.ch) {
-      found = lineText.lastIndexOf("[", at);
-      if (found < start.ch) break;
-      startToken = '['; endToken = ']';
+  var startCh, tokenType;
+
+  function findOpening(openCh) {
+    for (var at = start.ch, pass = 0;;) {
+      var found = lineText.lastIndexOf(openCh, at - 1);
+      if (found == -1) {
+        if (pass == 1) break;
+        pass = 1;
+        at = lineText.length;
+        continue;
+      }
+      if (pass == 1 && found < start.ch) break;
+      tokenType = cm.getTokenAt(CodeMirror.Pos(line, found + 1)).type;
+      if (!/^(comment|string)/.test(tokenType)) return found + 1;
+      at = found - 1;
     }
+  }
 
-    tokenType = cm.getTokenAt(CodeMirror.Pos(line, found + 1)).type;
-    if (!/^(comment|string)/.test(tokenType)) { startChar = found; break; }
-    at = found - 1;
+  var startToken = "{", endToken = "}", startCh = findOpening("{");
+  if (startCh == null) {
+    startToken = "[", endToken = "]";
+    startCh = findOpening("[");
   }
-  if (startChar == null || lineText.lastIndexOf(startToken) > startChar) return;
-  var count = 1, lastLine = cm.lineCount(), end, endCh;
-  outer: for (var i = line + 1; i < lastLine; ++i) {
-    var text = cm.getLine(i), pos = 0;
+
+  if (startCh == null) return;
+  var count = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
     for (;;) {
       var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
       if (nextOpen < 0) nextOpen = text.length;
@@ -31,7 +41,7 @@ CodeMirror.braceRangeFinder = function(cm, start) {
       ++pos;
     }
   }
-  if (end == null || end == line + 1) return;
-  return {from: CodeMirror.Pos(line, startChar + 1),
+  if (end == null || line == end && endCh == startCh) return;
+  return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
 };
diff --git a/demo/folding.html b/demo/folding.html
index cd0417aac6..2b8ffc6233 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -48,7 +48,7 @@ <h1>CodeMirror: Code Folding Demo</h1>
     mode: "javascript",
     lineNumbers: true,
     lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){foldFunc(cm, cm.getCursor().line);}}
+    extraKeys: {"Ctrl-Q": function(cm){foldFunc(cm, cm.getCursor());}}
   });
   editor.on("gutterClick", foldFunc);
   foldFunc(editor, 9);
@@ -58,7 +58,7 @@ <h1>CodeMirror: Code Folding Demo</h1>
     mode: "text/html",
     lineNumbers: true,
     lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){foldFunc_html(cm, cm.getCursor().line);}}
+    extraKeys: {"Ctrl-Q": function(cm){foldFunc_html(cm, cm.getCursor());}}
   });
   editor_html.on("gutterClick", foldFunc_html);
   foldFunc_html(editor_html, 11);

From 7f40a2bc2e013d69e2fbd846bd09f84d1dcfe7d6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 15:47:45 +0200
Subject: [PATCH 0139/4742] [foldcode addon] Modernize interface

(Old newFoldFunction interface preserved for backwards-compatibility.)
---
 addon/fold/foldcode.js | 40 ++++++++++++++++++++++++++++------------
 addon/fold/xml-fold.js |  2 +-
 demo/folding.html      | 18 +++++++++---------
 doc/manual.html        | 28 ++++++++++++++++++----------
 4 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index b8b4b0da9e..ff5e5eaf00 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -1,15 +1,12 @@
-CodeMirror.newFoldFunction = function(rangeFinder, widget) {
-  if (widget == null) widget = "\u2194";
-  if (typeof widget == "string") {
-    var text = document.createTextNode(widget);
-    widget = document.createElement("span");
-    widget.appendChild(text);
-    widget.className = "CodeMirror-foldmarker";
-  }
+(function() {
+  "use strict";
+
+  function doFold(cm, pos, options) {
+    var finder = options.call ? options : (options && options.rangeFinder);
+    if (!finder) return;
 
-  return function(cm, pos) {
     if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
-    var range = rangeFinder(cm, pos);
+    var range = finder(cm, pos);
     if (!range) return;
 
     var present = cm.findMarksAt(range.from), cleared = 0;
@@ -21,12 +18,31 @@ CodeMirror.newFoldFunction = function(rangeFinder, widget) {
     }
     if (cleared) return;
 
-    var myWidget = widget.cloneNode(true);
+    var myWidget = makeWidget(options);
     CodeMirror.on(myWidget, "mousedown", function() {myRange.clear();});
     var myRange = cm.markText(range.from, range.to, {
       replacedWith: myWidget,
       clearOnEnter: true,
       __isFold: true
     });
+  }
+
+  function makeWidget(options) {
+    var widget = (options && options.widget) || "\u2194";
+    if (typeof widget == "string") {
+      var text = document.createTextNode(widget);
+      widget = document.createElement("span");
+      widget.appendChild(text);
+      widget.className = "CodeMirror-foldmarker";
+    }
+    return widget;
+  }
+
+  // Clumsy backwards-compatible interface
+  CodeMirror.newFoldFunction = function(rangeFinder, widget) {
+    return function(cm, pos) { doFold(cm, pos, {rangeFinder: rangeFinder, widget: widget}); };
   };
-};
+
+  // New-style interface
+  CodeMirror.defineExtension("foldCode", function(pos, options) { doFold(this, pos, options); });
+})();
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 79c524d485..58f2b934cc 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -4,7 +4,7 @@ CodeMirror.tagRangeFinder = (function() {
   var xmlTagStart = new RegExp("<(/?)([" + nameStartChar + "][" + nameChar + "]*)", "g");
 
   return function(cm, start) {
-    var line = start.line, ch = start.ch, lineText = cm.getLine(line);
+    var line = start.line, ch = 0, lineText = cm.getLine(line);
 
     function nextLine() {
       if (line >= cm.lastLine()) return;
diff --git a/demo/folding.html b/demo/folding.html
index 2b8ffc6233..e67531a0fc 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -43,26 +43,26 @@ <h1>CodeMirror: Code Folding Demo</h1>
   var te_html = document.getElementById("code-html");
   te_html.value = "<html>\n  " + document.documentElement.innerHTML + "\n</html>";
 
-  var foldFunc = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder);
+  function foldJS(cm, where) { cm.foldCode(where, CodeMirror.braceRangeFinder); }
   window.editor = CodeMirror.fromTextArea(te, {
     mode: "javascript",
     lineNumbers: true,
     lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){foldFunc(cm, cm.getCursor());}}
+    extraKeys: {"Ctrl-Q": function(cm){foldJS(cm, cm.getCursor());}}
   });
-  editor.on("gutterClick", foldFunc);
-  foldFunc(editor, 9);
+  editor.on("gutterClick", foldJS);
+  foldJS(editor, 9);
 
-  var foldFunc_html = CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder);
+  function foldHTML(cm, where) { cm.foldCode(where, CodeMirror.tagRangeFinder); }
   window.editor_html = CodeMirror.fromTextArea(te_html, {
     mode: "text/html",
     lineNumbers: true,
     lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){foldFunc_html(cm, cm.getCursor());}}
+    extraKeys: {"Ctrl-Q": function(cm){foldHTML(cm, cm.getCursor());}}
   });
-  editor_html.on("gutterClick", foldFunc_html);
-  foldFunc_html(editor_html, 11);
-  foldFunc_html(editor_html, 1);
+  editor_html.on("gutterClick", foldHTML);
+  foldHTML(editor_html, 11);
+  foldHTML(editor_html, 1);
 };
 </script>
   </body>
diff --git a/doc/manual.html b/doc/manual.html
index 44f53d3b3a..a55e374971 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1522,6 +1522,10 @@ <h3 id="api_static">Static properties</h3>
       its only argument, and from then on, that function will be called
       (with the instance as argument) whenever a new CodeMirror instance
       is initialized.</dd>
+
+      <dt id="Pos"><code><strong>Pos</strong>(line: integer, ?ch: integer)</code></dt>
+      <dd>A constructor for the <code>{line, ch}</code> objects that
+      are used to represent positions in editor documents.</dd>
     </dl>
 
     <h2 id="addons">Add-ons</h2>
@@ -1650,22 +1654,26 @@ <h2 id="addons">Add-ons</h2>
       fails, line-comments it.</dd>
 
       <dt id="addon_foldcode"><a href="../addon/fold/foldcode.js"><code>fold/foldcode.js</code></a></dt>
-      <dd>Helps with code folding.
-      See <a href="../demo/folding.html">the demo</a> for an example.
-      Call <code>CodeMirror.newFoldFunction</code> with a range-finder
-      helper function to create a function that will, when applied to
-      a CodeMirror instance and a line number, attempt to fold or
-      unfold the block starting at the given line. A range-finder is a
-      language-specific function that also takes an instance and a
-      line number, and returns an range to be folded, or null if no
-      block is started on that line. There are files in
+      <dd>Helps with code folding. Add a <code>foldCode</code> method
+      to editor instances, which takes as first argument the position
+      that should be folded (may be a line number or
+      a <a href="#Pos"><code>Pos</code></a>), and as second argument
+      either a range-finder function, or an <code>{rangeFinder,
+      widget}</code> options object, where <code>widget</code> may
+      hold either a string or a DOM node. When called, the method will
+      try to do a code fold starting at the given line, or unfold the
+      fold that is already present. A range-finder function is a
+      language-specific function that takes an instance and a
+      position, and returns a range to be folded, if it finds one.
+      There are files in
       the <a href="../addon/fold/"><code>addon/fold/</code></a>
       directory providing <code>CodeMirror.braceRangeFinder</code>,
       which finds blocks in brace languages (JavaScript, C, Java,
       etc), <code>CodeMirror.indentRangeFinder</code>, for languages
       where indentation determines block structure (Python, Haskell),
       and <code>CodeMirror.tagRangeFinder</code>, for XML-style
-      languages.</dd>
+      languages. See <a href="../demo/folding.html">the demo</a> for
+      an example.</dd>
 
       <dt id="addon_runmode"><a href="../addon/runmode/runmode.js"><code>runmode/runmode.js</code></a></dt>
       <dd>Can be used to run a CodeMirror mode over text without

From 95d5c84e71bb33d41284e42eb62c2529c0a5c5a7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 16:05:49 +0200
Subject: [PATCH 0140/4742] Don't leave gaps in selection under replacedWith
 ranges

---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b1bb217ec3..37c1687213 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -834,8 +834,9 @@ window.CodeMirror = (function() {
       var fromObj = getLine(doc, sel.from.line);
       var cur = fromObj, merged, path = [sel.from.line, sel.from.ch], singleLine;
       while (merged = collapsedSpanAtEnd(cur)) {
-        var found = merged.find();
-        path.push(found.from.ch, found.to.line, found.to.ch);
+        var found = merged.find(), end = found.from.ch;
+        if (merged.replacedWith) end = found.to.line == found.from.line ? found.to.ch : null;
+        path.push(end, found.to.line, found.to.ch);
         if (found.to.line == sel.to.line) {
           path.push(sel.to.ch);
           singleLine = true;

From 24d2f0eca4040785a7344bc325b870367afdf3f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 16:35:21 +0200
Subject: [PATCH 0141/4742] [show-hint addon] Change the mechanism by which
 keymaps are overridden

The old one was a horrible hack.
---
 addon/hint/show-hint.js | 64 +++++++++++++++++++++++++++--------------
 doc/manual.html         | 13 +++++++--
 2 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index ab23e97383..dd845ada35 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -23,6 +23,39 @@ CodeMirror.showHint = function(cm, getHints, options) {
     else cm.replaceRange(getText(completion), data.from, data.to);
   }
 
+  function buildKeyMap(options, handle) {
+    var baseMap = {
+      Up: function() {handle.moveFocus(-1);},
+      Down: function() {handle.moveFocus(1);},
+      PageUp: function() {handle.moveFocus(-handle.menuSize());},
+      PageDown: function() {handle.moveFocus(handle.menuSize());},
+      Home: function() {handle.setFocus(0);},
+      End: function() {handle.setFocus(handle.length);},
+      Enter: handle.pick,
+      Tab: handle.pick,
+      Esc: handle.close
+    };
+    var ourMap = options.customKeys ? {} : baseMap;
+    function addBinding(key, val) {
+      var bound;
+      if (typeof val != "string")
+        bound = function(cm) { return val(cm, handle); };
+      // This mechanism is deprecated
+      else if (baseMap.hasOwnProperty(val))
+        bound = baseMap[val];
+      else
+        bound = val;
+      ourMap[key] = bound;
+    }
+    if (options.customKeys)
+      for (var key in options.customKeys) if (options.customKeys.hasOwnProperty(key))
+        addBinding(key, options.customKeys[key]);
+    if (options.extraKeys)
+      for (var key in options.extraKeys) if (options.extraKeys.hasOwnProperty(key))
+        addBinding(key, options.extraKeys[key]);
+    return ourMap;
+  }
+
   function showHints(data) {
     if (!data || !data.list.length) {
       if (continued) {
@@ -99,28 +132,17 @@ CodeMirror.showHint = function(cm, getHints, options) {
       return Math.floor(hints.clientHeight / hints.firstChild.offsetHeight) || 1;
     }
 
-    var ourMap, baseMap = {
-      Up: function() {changeActive(selectedHint - 1);},
-      Down: function() {changeActive(selectedHint + 1);},
-      PageUp: function() {changeActive(selectedHint - screenAmount());},
-      PageDown: function() {changeActive(selectedHint + screenAmount());},
-      Home: function() {changeActive(0);},
-      End: function() {changeActive(completions.length - 1);},
-      Enter: pick,
-      Tab: pick,
-      Esc: close
-    };
-    if (options.customKeys) {
-      ourMap = {};
-      for (var key in options.customKeys) if (options.customKeys.hasOwnProperty(key)) {
-        var val = options.customKeys[key];
-        if (baseMap.hasOwnProperty(val)) val = baseMap[val];
-        ourMap[key] = val;
-      }
-    } else ourMap = baseMap;
+    var keyMap = buildKeyMap(options, {
+      moveFocus: function(n) { changeActive(selectedHint + n); },
+      setFocus: function(n) { changeActive(n); },
+      menuSize: function() { return screenAmount(); },
+      length: completions.length,
+      close: close,
+      pick: pick
+    });
 
     cm.state.completionActive = true;
-    cm.addKeyMap(ourMap);
+    cm.addKeyMap(keyMap);
     cm.on("cursorActivity", cursorActivity);
     var closingOnBlur;
     function onBlur(){ closingOnBlur = setTimeout(close, 100); };
@@ -155,7 +177,7 @@ CodeMirror.showHint = function(cm, getHints, options) {
       done = true;
       clearTimeout(once);
       hints.parentNode.removeChild(hints);
-      cm.removeKeyMap(ourMap);
+      cm.removeKeyMap(keyMap);
       cm.off("cursorActivity", cursorActivity);
       cm.off("blur", onBlur);
       cm.off("focus", onFocus);
diff --git a/doc/manual.html b/doc/manual.html
index a55e374971..716524d704 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1764,9 +1764,16 @@ <h2 id="addons">Add-ons</h2>
         start of the word (true, default), or with the cursor (false).</dd>
         <dt><code><strong>customKeys</strong>: keymap</code></dt>
         <dd>Allows you to provide a custom keymap of keys to be active
-        when the pop-up is active. To bind a key to a behavior that is
-        already present in the default keymap, bind it to the name of
-        the key in the default keymap (for example <code>"Up"</code>).</dd>
+        when the pop-up is active. The handlers will be called with an
+        extra argument, a handle to the completion menu, which
+        has <code>moveFocus(n)</code>, <code>setFocus(n)</code>, <code>pick()</code>,
+        and <code>close()</code> methods (see the source for details),
+        that can be used to change the focused element, pick the
+        current element or close the menu.</dd>
+        <dt><code><strong>extraKeys</strong>: keymap</code></dt>
+        <dd>Like <code>customKeys</code> above, but the bindings will
+        be added to the set of default bindings, instead of replacing
+        them.</dd>
       </dl>
       The following events will be fired on the completions object
       during completion:

From 6e56c7fe4235c131069dd4a1938f0d8eb77ea7c2 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Thu, 6 Jun 2013 17:39:05 +0400
Subject: [PATCH 0142/4742] Do not call startWorker every 100ms on typing

When smth is typed into the CodeMirror editor
it schedules a job to rehighlight the next 500 lines of the document. This job
is intended to be executed in a 400ms time (as hardcoded in
`makeChangeSingleDocInEditor` method), but actually
400ms delay gets overwritten with 100ms delay which is set
from `updateDisplayInner` method.
The problem with this is that people hardly ever type 10 chars/second,
so the highlighter gets its time to rehighlight 500 lines of the
document while keydown events get postponed and user might feel some
slowleness.
---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 37c1687213..30bc052d20 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -512,9 +512,11 @@ window.CodeMirror = (function() {
       display.lastSizeC != display.wrapper.clientHeight;
     // This is just a bogus formula that detects when the editor is
     // resized or the font size changes.
-    if (different) display.lastSizeC = display.wrapper.clientHeight;
+    if (different) {
+      display.lastSizeC = display.wrapper.clientHeight;
+      startWorker(cm, 400);
+    }
     display.showingFrom = from; display.showingTo = to;
-    startWorker(cm, 100);
 
     var prevBottom = display.lineDiv.offsetTop;
     for (var node = display.lineDiv.firstChild, height; node; node = node.nextSibling) if (node.lineObj) {
@@ -1879,6 +1881,7 @@ window.CodeMirror = (function() {
     if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
     if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;
     if (gecko) updateDisplay(cm, []);
+    startWorker(cm, 100);
   }
   function setScrollLeft(cm, val, isScroller) {
     if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;

From d547914152bf322c1c14349ee184855f23b929bc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 17:58:03 +0200
Subject: [PATCH 0143/4742] Recommend standards mode for all browsers

Issue #1567
---
 demo/resize.html |  1 -
 index.html       | 15 ++++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/demo/resize.html b/demo/resize.html
index 7badc2bfbb..5778d56f33 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -1,4 +1,3 @@
-<!doctype html>
 <html>
   <head>
     <meta charset="utf-8">
diff --git a/index.html b/index.html
index 59599c46cb..94d9b10483 100644
--- a/index.html
+++ b/index.html
@@ -213,20 +213,17 @@ <h2 id="supported">Supported browsers</h2>
     <li>Chrome, any version</li>
     <li>Safari 5.2 or higher</li>
     <li>Opera 9 or higher (with some key-handling problems on OS X)</li>
-    <li>Internet Explorer 8 or higher in standards mode<br>
-      <em>(<strong>Not</strong> quirks mode. But quasi-standards mode with a
-      transitional doctype is also flaky. <code>&lt;!doctype
-      html></code> is recommended.)</em></li>
+    <li>Internet Explorer 8 or higher<br>
     <li>Internet Explorer 7 (standards mode) is usable, but buggy. It
     has a <a href="http://therealcrisp.xs4all.nl/meuk/IE-zindexbug.html">z-index
     bug</a> that prevents CodeMirror from working properly.</li>
   </ul>
 
-  <p>I am not actively testing against every new browser release, and
-  vendors have a habit of introducing bugs all the time, so I am
-  relying on the community to tell me when something breaks.
-  See <a href="#support">here</a> for information on how to contact
-  me.</p>
+  <p>Note that CodeMirror is only supported in
+  <strong>standards</strong> mode. So not quirks mode,
+  but <em>also</em> not the quasi-standards mode that IE gives you
+  when you specify a transitional doctype. Simply using the
+  HTML5-style <code>&lt;!doctype html></code> is recommended.</li>
 
   <p>Mobile browsers mostly kind of work, but, because of limitations
   and their fundamentally different UI assumptions, show a lot of

From 69e9473b1eea76b3d9155a40c8a1c69e82c61c1d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 18:07:51 +0200
Subject: [PATCH 0144/4742] [javascript mode] Add statementIndentUnit option,
 tweak indentation

Issue #1553
---
 mode/javascript/javascript.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index ab76a57e81..3e49b4ad0f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -2,6 +2,7 @@
 
 CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
+  var statementIndentUnit = parserConfig.statementIndentUnit || indentUnit;
   var jsonMode = parserConfig.json;
   var isTS = parserConfig.typescript;
 
@@ -226,8 +227,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function pushlex(type, info) {
     var result = function() {
-      var state = cx.state;
-      state.lexical = new JSLexical(state.indented, cx.stream.column(), type, null, state.lexical, info);
+      var state = cx.state, indent = state.indented;
+      if (state.lexical.type == "stat") indent = state.lexical.indented;
+      state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
     };
     result.lex = true;
     return result;
@@ -450,7 +452,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       else if (type == "form" && firstChar == "{") return lexical.indented;
       else if (type == "form") return lexical.indented + indentUnit;
       else if (type == "stat")
-        return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? indentUnit : 0);
+        return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? statementIndentUnit : 0);
       else if (lexical.info == "switch" && !closing)
         return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
       else if (lexical.align) return lexical.column + (closing ? 0 : 1);

From 36da87e8bc6cca78cf421225923b108d219a2438 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Jun 2013 18:16:56 +0200
Subject: [PATCH 0145/4742] [javascript mode] Fixup patch
 69e9473b1eea76b3d9155a40c8a1c69e82c61c1d

---
 mode/javascript/javascript.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 3e49b4ad0f..d15ffea5f6 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -2,7 +2,7 @@
 
 CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
-  var statementIndentUnit = parserConfig.statementIndentUnit || indentUnit;
+  var statementIndent = parserConfig.statementIndent;
   var jsonMode = parserConfig.json;
   var isTS = parserConfig.typescript;
 
@@ -442,17 +442,15 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (state.tokenize != jsTokenBase) return 0;
       var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
       if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
+      if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
+        lexical = lexical.prev;
       var type = lexical.type, closing = firstChar == type;
-      if (parserConfig.statementIndent != null) {
-        if (type == ")" && lexical.prev && lexical.prev.type == "stat") lexical = lexical.prev;
-        if (lexical.type == "stat") return lexical.indented + parserConfig.statementIndent;
-      }
 
       if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? 4 : 0);
       else if (type == "form" && firstChar == "{") return lexical.indented;
       else if (type == "form") return lexical.indented + indentUnit;
       else if (type == "stat")
-        return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? statementIndentUnit : 0);
+        return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? statementIndent || indentUnit : 0);
       else if (lexical.info == "switch" && !closing)
         return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
       else if (lexical.align) return lexical.column + (closing ? 0 : 1);

From 54961df34967a9efa2c42d10f06658a7e94382a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Jun 2013 09:03:48 +0200
Subject: [PATCH 0146/4742] Fix overzealous entering of folded spans in
 coordsChar

---
 lib/codemirror.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 30bc052d20..a720b11dc0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1204,9 +1204,10 @@ window.CodeMirror = (function() {
     return val;
   }
 
-  function PosMaybeOutside(line, ch, outside) {
+  function PosWithInfo(line, ch, outside, after) {
     var pos = new Pos(line, ch);
     if (outside) pos.outside = true;
+    if (after) pos.after = true;
     return pos;
   }
 
@@ -1214,10 +1215,10 @@ window.CodeMirror = (function() {
   function coordsChar(cm, x, y) {
     var doc = cm.doc;
     y += cm.display.viewOffset;
-    if (y < 0) return PosMaybeOutside(doc.first, 0, true);
+    if (y < 0) return PosWithInfo(doc.first, 0, true);
     var lineNo = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
     if (lineNo > last)
-      return PosMaybeOutside(doc.first + doc.size - 1, getLine(doc, last).text.length, true);
+      return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, true);
     if (x < 0) x = 0;
 
     for (;;) {
@@ -1225,7 +1226,7 @@ window.CodeMirror = (function() {
       var found = coordsCharInner(cm, lineObj, lineNo, x, y);
       var merged = collapsedSpanAtEnd(lineObj);
       var mergedPos = merged && merged.find();
-      if (merged && found.ch >= mergedPos.from.ch)
+      if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.after))
         lineNo = mergedPos.to.line;
       else
         return found;
@@ -1251,14 +1252,13 @@ window.CodeMirror = (function() {
     var from = lineLeft(lineObj), to = lineRight(lineObj);
     var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;
 
-    if (x > toX) return PosMaybeOutside(lineNo, to, toOutside);
+    if (x > toX) return PosWithInfo(lineNo, to, toOutside, true);
     // Do a binary search between these bounds.
     for (;;) {
       if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-        var after = x - fromX < toX - x, ch = after ? from : to;
+        var after = x - fromX <= toX - x, ch = after ? from : to;
         while (isExtendingChar.test(lineObj.text.charAt(ch))) ++ch;
-        var pos = PosMaybeOutside(lineNo, ch, after ? fromOutside : toOutside);
-        pos.after = after;
+        var pos = PosWithInfo(lineNo, ch, after ? fromOutside : toOutside, after);
         return pos;
       }
       var step = Math.ceil(dist / 2), middle = from + step;

From 52e23021e85909d1e260cb3b884c092ae27ad64c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Jun 2013 10:30:45 +0200
Subject: [PATCH 0147/4742] Overhaul selection drawing algorithm again

To better deal with drawing selections around replacedWith widgets.
---
 lib/codemirror.js | 59 ++++++++++++++++++-----------------------------
 1 file changed, 22 insertions(+), 37 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a720b11dc0..f8d689c9a6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -798,9 +798,10 @@ window.CodeMirror = (function() {
                                "px; height: " + (bottom - top) + "px"));
     }
 
-    function drawForLine(line, fromArg, toArg, retTop) {
+    function drawForLine(line, fromArg, toArg) {
       var lineObj = getLine(doc, line);
-      var lineLen = lineObj.text.length, rVal = retTop ? Infinity : -Infinity;
+      var lineLen = lineObj.text.length;
+      var start, end;
       function coords(ch, bias) {
         return charCoords(cm, Pos(line, ch), "div", lineObj, bias);
       }
@@ -816,57 +817,41 @@ window.CodeMirror = (function() {
           left = leftPos.left;
           right = rightPos.right;
         }
+        if (fromArg == null && from == 0) left = pl;
         if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
           add(left, leftPos.top, null, leftPos.bottom);
           left = pl;
           if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);
         }
         if (toArg == null && to == lineLen) right = clientWidth;
-        if (fromArg == null && from == 0) left = pl;
-        rVal = retTop ? Math.min(rightPos.top, rVal) : Math.max(rightPos.bottom, rVal);
+        if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
+          start = leftPos;
+        if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
+          end = rightPos;
         if (left < pl + 1) left = pl;
         add(left, rightPos.top, right - left, rightPos.bottom);
       });
-      return rVal;
+      return {start: start, end: end};
     }
 
     if (sel.from.line == sel.to.line) {
       drawForLine(sel.from.line, sel.from.ch, sel.to.ch);
     } else {
-      var fromObj = getLine(doc, sel.from.line);
-      var cur = fromObj, merged, path = [sel.from.line, sel.from.ch], singleLine;
-      while (merged = collapsedSpanAtEnd(cur)) {
-        var found = merged.find(), end = found.from.ch;
-        if (merged.replacedWith) end = found.to.line == found.from.line ? found.to.ch : null;
-        path.push(end, found.to.line, found.to.ch);
-        if (found.to.line == sel.to.line) {
-          path.push(sel.to.ch);
-          singleLine = true;
-          break;
-        }
-        cur = getLine(doc, found.to.line);
-      }
-
       // This is a single, merged line
-      if (singleLine) {
-        for (var i = 0; i < path.length; i += 3)
-          drawForLine(path[i], path[i+1], path[i+2]);
-      } else {
-        var middleTop, middleBot, toObj = getLine(doc, sel.to.line);
-        if (sel.from.ch)
-          // Draw the first line of selection.
-          middleTop = drawForLine(sel.from.line, sel.from.ch, null, false);
-        else
-          // Simply include it in the middle block.
-          middleTop = heightAtLine(cm, fromObj) - display.viewOffset;
-
-        if (!sel.to.ch)
-          middleBot = heightAtLine(cm, toObj) - display.viewOffset;
-        else
-          middleBot = drawForLine(sel.to.line, collapsedSpanAtStart(toObj) ? null : 0, sel.to.ch, true);
-
-        if (middleTop < middleBot) add(pl, middleTop, null, middleBot);
+      var fromLine = getLine(doc, sel.from.line), toLine = getLine(doc, sel.to.line);
+      var singleVLine = visualLine(doc, fromLine) == visualLine(doc, toLine);
+      var leftEnd = drawForLine(sel.from.line, sel.from.ch, singleVLine ? fromLine.text.length : null).end;
+      var rightStart = drawForLine(sel.to.line, singleVLine ? 0 : null, sel.to.ch).start;
+      if (singleVLine) {
+        if (leftEnd.top < rightStart.top - 2) {
+          add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
+          add(pl, rightStart.top, rightStart.left, rightStart.bottom);
+        } else {
+          add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
+        }
       }
+      if (leftEnd.bottom < rightStart.top)
+        add(pl, leftEnd.bottom, null, rightStart.top);
     }
 
     removeChildrenAndAdd(display.selectionDiv, fragment);

From 031b45dd97b76ad940317bfb02a143715d126933 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Jun 2013 10:37:39 +0200
Subject: [PATCH 0148/4742] Fix bug in drawing of nested collapsed spans

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f8d689c9a6..db55f934d5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4345,7 +4345,7 @@ window.CodeMirror = (function() {
             if (m.className) spanStyle += " " + m.className;
             if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
             if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
-            if (m.collapsed && (!collapsed || collapsed.marker.width < m.width))
+            if (m.collapsed && (!collapsed || collapsed.marker.size < m.size))
               collapsed = sp;
           } else if (sp.from > pos && nextChange > sp.from) {
             nextChange = sp.from;

From b0afbbcd6f57ad69b3c7d3d3348758ad369f4e40 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Jun 2013 11:07:42 +0200
Subject: [PATCH 0149/4742] [foldcode addon] Support scanUp and minFoldSize
 options

---
 addon/fold/foldcode.js | 28 +++++++++++++-------
 doc/manual.html        | 59 ++++++++++++++++++++++++++----------------
 2 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index ff5e5eaf00..fe53811098 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -4,19 +4,29 @@
   function doFold(cm, pos, options) {
     var finder = options.call ? options : (options && options.rangeFinder);
     if (!finder) return;
-
     if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
-    var range = finder(cm, pos);
-    if (!range) return;
+    var minSize = options && options.minFoldSize || 0;
 
-    var present = cm.findMarksAt(range.from), cleared = 0;
-    for (var i = 0; i < present.length; ++i) {
-      if (present[i].__isFold) {
-        ++cleared;
-        present[i].clear();
+    function getRange(allowFolded) {
+      var range = finder(cm, pos);
+      if (!range || range.to.line - range.from.line < minSize) return null;
+      var marks = cm.findMarksAt(range.from);
+      for (var i = 0; i < marks.length; ++i) {
+        if (marks[i].__isFold) {
+          if (!allowFolded) return null;
+          range.cleared = true;
+          marks[i].clear();
+        }
       }
+      return range;
+    }
+
+    var range = getRange(true);
+    if (options && options.scanUp) while (!range && pos.line > cm.firstLine()) {
+      pos = CodeMirror.Pos(pos.line - 1, 0);
+      range = getRange(false);
     }
-    if (cleared) return;
+    if (!range || range.cleared) return;
 
     var myWidget = makeWidget(options);
     CodeMirror.on(myWidget, "mousedown", function() {myRange.clear();});
diff --git a/doc/manual.html b/doc/manual.html
index 716524d704..75dc0491a5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1633,17 +1633,17 @@ <h2 id="addons">Add-ons</h2>
         <dt><code>blockCommentStart, blockCommentEnd, blockCommentLead, lineComment: string</code></dt>
         <dd>Override the <a href="#mode_comment">comment string
         properties</a> of the mode with custom comment strings.</dd>
-        <dt><code>padding</code></dt>
+        <dt><code><strong>padding</strong>: string</code></dt>
         <dd>A string that will be inserted after opening and before
         closing comment markers. Defaults to a single space.</dd>
-        <dt><code>commentBlankLines</code></dt>
+        <dt><code><strong>commentBlankLines</strong>: boolean</code></dt>
         <dd>Whether, when adding line comments, to also comment lines
         that contain only whitespace.</dd>
-        <dt><code>indent</code></dt>
+        <dt><code><strong>indent</strong>: boolean</code></dt>
         <dd>When adding line comments and this is turned on, it will
         align the comment block to the current indentation of the
         first line of the block.</dd>
-        <dt><code>fullLines</code></dt>
+        <dt><code><strong>fullLines</strong>: boolean</code></dt>
         <dd>When block commenting, this controls whether the whole
         lines are indented, or only the precise range that is given.
         Defaults to <code>true</code>.</dd>
@@ -1655,25 +1655,38 @@ <h2 id="addons">Add-ons</h2>
 
       <dt id="addon_foldcode"><a href="../addon/fold/foldcode.js"><code>fold/foldcode.js</code></a></dt>
       <dd>Helps with code folding. Add a <code>foldCode</code> method
-      to editor instances, which takes as first argument the position
-      that should be folded (may be a line number or
+      to editor instances, which will try to do a code fold starting
+      at the given line, or unfold the fold that is already present.
+      The method takes as first argument the position that should be
+      folded (may be a line number or
       a <a href="#Pos"><code>Pos</code></a>), and as second argument
-      either a range-finder function, or an <code>{rangeFinder,
-      widget}</code> options object, where <code>widget</code> may
-      hold either a string or a DOM node. When called, the method will
-      try to do a code fold starting at the given line, or unfold the
-      fold that is already present. A range-finder function is a
-      language-specific function that takes an instance and a
-      position, and returns a range to be folded, if it finds one.
-      There are files in
-      the <a href="../addon/fold/"><code>addon/fold/</code></a>
-      directory providing <code>CodeMirror.braceRangeFinder</code>,
-      which finds blocks in brace languages (JavaScript, C, Java,
-      etc), <code>CodeMirror.indentRangeFinder</code>, for languages
-      where indentation determines block structure (Python, Haskell),
-      and <code>CodeMirror.tagRangeFinder</code>, for XML-style
-      languages. See <a href="../demo/folding.html">the demo</a> for
-      an example.</dd>
+      either a range-finder function, or an options object, supporting
+      the following properties:
+      <dl>
+        <dt><code><strong>rangeFinder</strong>: fn(CodeMirror, Pos)</code></dt>
+        <dd>The function that is used to find foldable ranges. There
+        are files in the <a href="../addon/fold/"><code>addon/fold/</code></a>
+        directory providing <code>CodeMirror.braceRangeFinder</code>,
+        which finds blocks in brace languages (JavaScript, C, Java,
+        etc), <code>CodeMirror.indentRangeFinder</code>, for languages
+        where indentation determines block structure (Python,
+        Haskell), and <code>CodeMirror.tagRangeFinder</code>, for
+        XML-style languages.</dd>
+        <dt><code><strong>widget</strong>: string|Element</code></dt>
+        <dd>The widget to show for folded ranges. Can be either a
+        string, in which case it'll become a span with
+        class <code>CodeMirror-foldmarker</code>, or a DOM node.</dd>
+        <dt><code><strong>scanUp</strong>: boolean</code></dt>
+        <dd>When true (default is false), the addon will try to find
+        foldable ranges on the lines above the current one if there
+        isn't an eligible one on the given line.</dd>
+        <dt><code><strong>minFoldSize</strong>: integer</code></dt>
+        <dd>The minimum amount of lines that a fold should span to be
+        accepted. Defaults to 0, which also allows single-line
+        folds.</dd>
+      </dl>
+      See <a href="../demo/folding.html">the demo</a> for an
+      example.</dd>
 
       <dt id="addon_runmode"><a href="../addon/runmode/runmode.js"><code>runmode/runmode.js</code></a></dt>
       <dd>Can be used to run a CodeMirror mode over text without
@@ -1840,7 +1853,7 @@ <h2 id="addons">Add-ons</h2>
       minimum amount of selected characters that triggers a highlight
       (default 2), <code>style</code>, for the style to be used to
       highlight the matches (default <code>"matchhighlight"</code>,
-      which will correspond to CSS class <code>cm-matchhighlight),
+      which will correspond to CSS class <code>cm-matchhighlight</code>),
       and <code>showToken</code> which, when enabled, causes the
       current token to be highlighted when nothing is selected
       (defaults to off).

From 43948ec982f1670bd5fbcc4c9966191e4dc4df85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Jun 2013 11:12:41 +0200
Subject: [PATCH 0150/4742] [show-hint addon] Add closeOnUnfocus option

---
 addon/hint/show-hint.js | 12 ++++++++----
 doc/manual.html         |  3 +++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index dd845ada35..627a69092c 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -147,8 +147,10 @@ CodeMirror.showHint = function(cm, getHints, options) {
     var closingOnBlur;
     function onBlur(){ closingOnBlur = setTimeout(close, 100); };
     function onFocus(){ clearTimeout(closingOnBlur); };
-    cm.on("blur", onBlur);
-    cm.on("focus", onFocus);
+    if (options.closeOnUnfocus !== false) {
+      cm.on("blur", onBlur);
+      cm.on("focus", onFocus);
+    }
     var startScroll = cm.getScrollInfo();
     function onScroll() {
       var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
@@ -179,8 +181,10 @@ CodeMirror.showHint = function(cm, getHints, options) {
       hints.parentNode.removeChild(hints);
       cm.removeKeyMap(keyMap);
       cm.off("cursorActivity", cursorActivity);
-      cm.off("blur", onBlur);
-      cm.off("focus", onFocus);
+      if (options.closeOnUnfocus !== false) {
+        cm.off("blur", onBlur);
+        cm.off("focus", onFocus);
+      }
       cm.off("scroll", onScroll);
       if (willContinue !== true) {
         CodeMirror.signal(data, "close");
diff --git a/doc/manual.html b/doc/manual.html
index 75dc0491a5..8c026476e7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1775,6 +1775,9 @@ <h2 id="addons">Add-ons</h2>
         <dt><code><strong>alignWithWord</strong>: boolean</code></dt>
         <dd>Whether the pop-up should be horizontally aligned with the
         start of the word (true, default), or with the cursor (false).</dd>
+        <dt><code><strong>closeOnUnfocus</strong>: boolean</code></dt>
+        <dd>When enabled (which is the default), the pop-up will close
+        when the editor is unfocused.</dd>
         <dt><code><strong>customKeys</strong>: keymap</code></dt>
         <dd>Allows you to provide a custom keymap of keys to be active
         when the pop-up is active. The handlers will be called with an

From 43aebd0bc605db459257c5ec0f0720e57a850c58 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Jun 2013 12:11:43 +0200
Subject: [PATCH 0151/4742] [brace-fold addon] Add includeRangeFinder and
 importRangeFinder

For folding Java and C/C++ style import/include blocks.
---
 addon/fold/brace-fold.js | 43 ++++++++++++++++++++++++++++++++++++++++
 addon/fold/foldcode.js   | 10 ++++++++++
 2 files changed, 53 insertions(+)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 2e45aaa11d..e35115b8b9 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -45,3 +45,46 @@ CodeMirror.braceRangeFinder = function(cm, start) {
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
 };
+
+CodeMirror.importRangeFinder = function(cm, start) {
+  function hasImport(line) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type != "keyword" || start.string != "import") return null;
+    // Now find closing semicolon, return its position
+    for (var i = line, e = Math.min(cm.lastLine(), line + 10); i <= e; ++i) {
+      var text = cm.getLine(i), semi = text.indexOf(";");
+      if (semi != -1) return {startCh: start.end, end: CodeMirror.Pos(i, semi)};
+    }
+  }
+
+  var start = start.line, has = hasImport(start), prev;
+  if (!has || hasImport(start - 1) || ((prev = hasImport(start - 2)) && prev.end.line == start - 1))
+    return null;
+  for (var end = has.end;;) {
+    var next = hasImport(end.line + 1);
+    if (next == null) break;
+    end = next.end;
+  }
+  return {from: cm.clipPos(CodeMirror.Pos(start, has.startCh + 1)), to: end};
+};
+
+CodeMirror.includeRangeFinder = function(cm, start) {
+  function hasInclude(line) {
+    if (line < cm.firstLine() || line > cm.lastLine()) return null;
+    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
+    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
+    if (start.type == "meta" && start.string.slice(0, 8) == "#include") return start.start + 8;
+  }
+
+  var start = start.line, has = hasInclude(start);
+  if (has == null || hasInclude(start - 1) != null) return null;
+  for (var end = start;;) {
+    var next = hasInclude(end + 1);
+    if (next == null) break;
+    ++end;
+  }
+  return {from: CodeMirror.Pos(start, has + 1),
+          to: cm.clipPos(CodeMirror.Pos(end))};
+};
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index fe53811098..2743d3e2c9 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -55,4 +55,14 @@
 
   // New-style interface
   CodeMirror.defineExtension("foldCode", function(pos, options) { doFold(this, pos, options); });
+
+  CodeMirror.combineRangeFinders = function() {
+    var funcs = Array.prototype.slice.call(arguments, 0);
+    return function(cm, start) {
+      for (var i = 0; i < funcs.length; ++i) {
+        var found = funcs[i](cm, start);
+        if (found) return found;
+      }
+    };
+  };
 })();

From a2360396d6cf793747402996bb8dd91b9fa2e814 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 8 Jun 2013 01:50:53 -0400
Subject: [PATCH 0152/4742] [vim keymap] :substitute support to confirm each
 replace

---
 keymap/vim.js    | 131 ++++++++++++++++++++++++++++++++++++++++-------
 test/vim_test.js |  72 ++++++++++++++++++++++++++
 2 files changed, 184 insertions(+), 19 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index df40bfc02e..999acaf760 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1748,7 +1748,10 @@
         cm.setCursor(curPosFinal);
       },
       undo: function(cm, actionArgs) {
-        repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)();
+        cm.operation(function() {
+          repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)();
+          cm.setCursor(cm.getCursor('anchor'));
+        });
       },
       redo: function(cm, actionArgs) {
         repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)();
@@ -2605,6 +2608,7 @@
         onClose(prompt(shortText, ""));
       }
     }
+
     function findUnescapedSlashes(str) {
       var escapeNextChar = false;
       var slashes = [];
@@ -2840,6 +2844,10 @@
     };
     Vim.ExCommandDispatcher.prototype = {
       processCommand: function(cm, input) {
+        var vim = getVimState(cm);
+        if (vim.visualMode) {
+          exitVisualMode(cm, vim);
+        }
         var inputStream = new CodeMirror.StringStream(input);
         var params = {};
         params.input = input;
@@ -2863,7 +2871,7 @@
             if (command.type == 'exToKey') {
               // Handle Ex to Key mapping.
               for (var i = 0; i < command.toKeys.length; i++) {
-                vim.handleKey(cm, command.toKeys[i]);
+                CodeMirror.Vim.handleKey(cm, command.toKeys[i]);
               }
               return;
             } else if (command.type == 'exToEx') {
@@ -3108,6 +3116,10 @@
         cm.replaceRange(text.join('\n'), curStart, curEnd);
       },
       substitute: function(cm, params) {
+        if (!cm.getSearchCursor) {
+          throw 'Search feature not available. Requires searchcursor.js or ' +
+              'any other getSearchCursor implementation.';
+        }
         var argString = params.argString;
         var slashes = findUnescapedSlashes(argString);
         if (slashes[0] !== 0) {
@@ -3119,6 +3131,7 @@
         var replacePart = '';
         var flagsPart;
         var count;
+        var confirm = false; // Whether to confirm each replace.
         if (slashes[1]) {
           replacePart = argString.substring(slashes[1] + 1, slashes[2]);
         }
@@ -3130,6 +3143,10 @@
           count = parseInt(trailing[1]);
         }
         if (flagsPart) {
+          if (flagsPart.indexOf('c') != -1) {
+            confirm = true;
+            flagsPart.replace('c', '');
+          }
           regexPart = regexPart + '/' + flagsPart;
         }
         if (regexPart) {
@@ -3152,20 +3169,8 @@
           lineEnd = lineStart + count - 1;
         }
         var startPos = clipCursorToContent(cm, { line: lineStart, ch: 0 });
-        function doReplace() {
-          for (var cursor = cm.getSearchCursor(query, startPos);
-               cursor.findNext() &&
-                   isInRange(cursor.from(), lineStart, lineEnd);) {
-            var text = cm.getRange(cursor.from(), cursor.to());
-            var newText = text.replace(query, replacePart);
-            cursor.replace(newText);
-          }
-          var vim = getVimState(cm);
-          if (vim.visualMode) {
-            exitVisualMode(cm, vim);
-          }
-        }
-        cm.operation(doReplace);
+        var cursor = cm.getSearchCursor(query, startPos);
+        doReplace(cm, confirm, lineStart, lineEnd, cursor, query, replacePart);
       },
       redo: CodeMirror.commands.redo,
       undo: CodeMirror.commands.undo,
@@ -3246,6 +3251,95 @@
 
     var exCommandDispatcher = new Vim.ExCommandDispatcher();
 
+    /**
+    * @param {CodeMirror} cm CodeMirror instance we are in.
+    * @param {boolean} confirm Whether to confirm each replace.
+    * @param {Cursor} lineStart Line to start replacing from.
+    * @param {Cursor} lineEnd Line to stop replacing at.
+    * @param {RegExp} query Query for performing matches with.
+    * @param {string} replaceWith Text to replace matches with. May contain $1,
+    *     $2, etc for replacing captured groups using Javascript replace.
+    */
+    function doReplace(cm, confirm, lineStart, lineEnd, searchCursor, query,
+        replaceWith) {
+      // Set up all the functions.
+      var done = false;
+      var lastPos = searchCursor.from();
+      function replaceAll() {
+        cm.operation(function() {
+          while (!done) {
+            replace();
+            next();
+          }
+          stop();
+        });
+      }
+      function replace() {
+        var text = cm.getRange(searchCursor.from(), searchCursor.to());
+        var newText = text.replace(query, replaceWith);
+        searchCursor.replace(newText);
+      }
+      function next() {
+        var found = searchCursor.findNext();
+        if (!found) {
+          done = true;
+        } else if (isInRange(searchCursor.from(), lineStart, lineEnd)) {
+          cm.scrollIntoView(searchCursor.from(), 30);
+          cm.setSelection(searchCursor.from(), searchCursor.to());
+          lastPos = searchCursor.from();
+          done = false;
+        } else {
+          done = true;
+        }
+      }
+      function stop(close) {
+        if (close) { close(); }
+        cm.focus();
+        if (lastPos) {
+          cm.setCursor(lastPos);
+          var vim = getVimState(cm);
+          vim.lastHPos = vim.lastHSPos = lastPos.ch;
+        }
+      }
+      function onPromptKeyDown(e, value, close) {
+        // Swallow all keys.
+        CodeMirror.e_stop(e);
+        var keyName = CodeMirror.keyName(e);
+        switch (keyName) {
+          case 'Y':
+            replace(); next(); break;
+          case 'N':
+            next(); break;
+          case 'A':
+            cm.operation(replaceAll); break;
+          case 'L':
+            replace();
+            // fall through and exit.
+          case 'Q':
+          case 'Esc':
+          case 'Ctrl-C':
+          case 'Ctrl-[':
+            stop(close);
+            break;
+        }
+        if (done) { stop(close); }
+      }
+
+      // Actually do replace.
+      next();
+      if (done) {
+        throw 'No matches for ' + query.source;
+      }
+      if (!confirm) {
+        replaceAll();
+        return;
+      }
+      showPrompt(cm, {
+        prefix: 'replace with <strong>' + replaceWith + '</strong> (y/n/a/q/l)',
+        onKeyDown: onPromptKeyDown
+      });
+    }
+
     // Register Vim with CodeMirror
     function buildVimKeyMap() {
       /**
@@ -3279,7 +3373,7 @@
       // Closure to bind CodeMirror, key, modifier.
       function keyMapper(vimKey) {
         return function(cm) {
-          vim.handleKey(cm, vimKey);
+          CodeMirror.Vim.handleKey(cm, vimKey);
         };
       }
 
@@ -3394,7 +3488,6 @@
     return vimApi;
   };
   // Initialize Vim and make it available as an API.
-  var vim = Vim();
-  CodeMirror.Vim = vim;
+  CodeMirror.Vim = Vim();
 }
 )();
diff --git a/test/vim_test.js b/test/vim_test.js
index 28c967b8f5..e157204a04 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2038,6 +2038,78 @@ testVim('ex_substitute_count_with_range', function(cm, vim, helpers) {
   helpers.doEx('1,3s/\\d/0/ 3');
   eq('1\n2\n0\n0', cm.getValue());
 }, { value: '1\n2\n3\n4' });
+function testSubstituteConfirm(name, command, initialValue, expectedValue, keys, finalPos) {
+  testVim(name, function(cm, vim, helpers) {
+    var savedOpenDialog = cm.openDialog;
+    var savedKeyName = CodeMirror.keyName;
+    var onKeyDown;
+    var recordedCallback;
+    var closed = true; // Start out closed, set false on second openDialog.
+    function close() {
+      closed = true;
+    }
+    // First openDialog should save callback.
+    cm.openDialog = function(template, callback, options) {
+      recordedCallback = callback;
+    }
+    // Do first openDialog.
+    helpers.doKeys(':');
+    // Second openDialog should save keyDown handler.
+    cm.openDialog = function(template, callback, options) {
+      onKeyDown = options.onKeyDown;
+      closed = false;
+    };
+    // Return the command to Vim and trigger second openDialog.
+    recordedCallback(command);
+    // The event should really use keyCode, but here just mock it out and use
+    // key and replace keyName to just return key.
+    CodeMirror.keyName = function (e) { return e.key; }
+    keys = keys.toUpperCase();
+    for (var i = 0; i < keys.length; i++) {
+      is(!closed);
+      onKeyDown({ key: keys.charAt(i) }, '', close);
+    }
+    try {
+      eq(expectedValue, cm.getValue());
+      helpers.assertCursorAt(finalPos);
+      is(closed);
+    } catch(e) {
+      throw e
+    } finally {
+      // Restore overriden functions.
+      CodeMirror.keyName = savedKeyName;
+      cm.openDialog = savedOpenDialog;
+    }
+  }, { value: initialValue });
+};
+testSubstituteConfirm('ex_substitute_confirm_emptydoc',
+    '%s/x/b/c', '', '', '', makeCursor(0, 0));
+testSubstituteConfirm('ex_substitute_confirm_nomatch',
+    '%s/x/b/c', 'ba a\nbab', 'ba a\nbab', '', makeCursor(0, 0));
+testSubstituteConfirm('ex_substitute_confirm_accept',
+    '%s/a/b/c', 'ba a\nbab', 'bb b\nbbb', 'yyy', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_random_keys',
+    '%s/a/b/c', 'ba a\nbab', 'bb b\nbbb', 'ysdkywerty', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_some',
+    '%s/a/b/c', 'ba a\nbab', 'bb a\nbbb', 'yny', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_all',
+    '%s/a/b/c', 'ba a\nbab', 'bb b\nbbb', 'a', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_accept_then_all',
+    '%s/a/b/c', 'ba a\nbab', 'bb b\nbbb', 'ya', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_quit',
+    '%s/a/b/c', 'ba a\nbab', 'bb a\nbab', 'yq', makeCursor(0, 3));
+testSubstituteConfirm('ex_substitute_confirm_last',
+    '%s/a/b/c', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
+testSubstituteConfirm('ex_substitute_confirm_oneline',
+    '1s/a/b/c', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
+testSubstituteConfirm('ex_substitute_confirm_range_accept',
+    '1,2s/a/b/c', 'aa\na \na\na', 'bb\nb \na\na', 'yyy', makeCursor(1, 0));
+testSubstituteConfirm('ex_substitute_confirm_range_some',
+    '1,3s/a/b/c', 'aa\na \na\na', 'ba\nb \nb\na', 'ynyy', makeCursor(2, 0));
+testSubstituteConfirm('ex_substitute_confirm_range_all',
+    '1,3s/a/b/c', 'aa\na \na\na', 'bb\nb \nb\na', 'a', makeCursor(2, 0));
+testSubstituteConfirm('ex_substitute_confirm_range_last',
+    '1,3s/a/b/c', 'aa\na \na\na', 'bb\nb \na\na', 'yyl', makeCursor(1, 0));
 //:noh should clear highlighting of search-results but allow to resume search through n
 testVim('ex_noh_clearSearchHighlight', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('match');

From f64bac39128c1e003b2a68c9ae0d05303d5a4b0b Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Sat, 8 Jun 2013 14:46:08 +0200
Subject: [PATCH 0153/4742] [sql mode] charset casting syntax

* add support to "charsetCast" with syntax n str or N str or _charset str
* add example in index.html
---
 mode/sql/index.html | 5 +++--
 mode/sql/sql.js     | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index bc3b3a819c..52578132e0 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -38,11 +38,12 @@ <h1>SQL Mode for CodeMirror</h1>
         <form>
             <textarea id="code" name="code">-- SQL Mode for CodeMirror
 SELECT SQL_NO_CACHE DISTINCT
-		@var1 AS `val1`, @`val2`, @global.'sql_mode',
+		@var1 AS `val1`, @'val2', @global.'sql_mode',
 		1.1 AS `float_val`, .14 AS `another_float`, 0.09e3 AS `int_with_esp`,
 		0xFA5 AS `hex`, x'fa5' AS `hex2`, 0b101 AS `bin`, b'101' AS `bin2`,
 		DATE '1994-01-01' AS `sql_date`, { T "1994-01-01" } AS `odbc_date`,
-		'myString', UNKNOWN
+		'my string', _utf8'your string', N'her string',
+        TRUE, FALSE, UNKNOWN
 	FROM DUAL
 	-- space needed after '--'
 	# 1 line comment
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index bf705025aa..29a37eb91a 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -38,6 +38,11 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       // strings
       state.tokenize = tokenLiteral(ch);
       return state.tokenize(stream, state);
+    } else if (support.charsetCast == true &&
+        (((ch == "n" || ch == "N") || (ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
+        && (stream.peek() == "'" || stream.peek() == '"'))) {
+      // charset casting: _utf8'str', N'str', n'str'
+      return "keyword";
     } else if (/^[\(\),\;\[\]]/.test(ch)) {
       // no highlightning
       return null;
@@ -230,7 +235,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat"),
+    support: set("ODBCdotTable zerolessFloat charsetCast"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -246,7 +251,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat"),
+    support: set("ODBCdotTable zerolessFloat charsetCast"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,

From de575f2609be31897f3ff560c3e83162f3c23137 Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Sat, 8 Jun 2013 15:00:01 +0200
Subject: [PATCH 0154/4742] [sql mode] Add comments with links to supported
 syntaxes documentation

---
 mode/sql/sql.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 29a37eb91a..5c8a0d6598 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -22,13 +22,16 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     if ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/))
       || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/)) {
       // hex
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/hexadecimal-literals.html
       return "number";
     } else if (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
       || (ch == "0" && stream.match(/^b[01]+/))) {
       // bitstring
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/bit-field-literals.html
       return "number";
     } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
       // numbers
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
       stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
       return "number";
     } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
@@ -36,22 +39,26 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       return "variable-3";
     } else if (ch == '"' || ch == "'") {
       // strings
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
       state.tokenize = tokenLiteral(ch);
       return state.tokenize(stream, state);
     } else if (support.charsetCast == true &&
         (((ch == "n" || ch == "N") || (ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
         && (stream.peek() == "'" || stream.peek() == '"'))) {
       // charset casting: _utf8'str', N'str', n'str'
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
       return "keyword";
     } else if (/^[\(\),\;\[\]]/.test(ch)) {
       // no highlightning
       return null;
     } else if (ch == "#" || (ch == "-" && stream.eat("-") && stream.eat(" "))) {
       // 1-line comments
+      // ref: https://kb.askmonty.org/en/comment-syntax/
       stream.skipToEnd();
       return "comment";
     } else if (ch == "/" && stream.eat("*")) {
       // multi-line comments
+      // ref: https://kb.askmonty.org/en/comment-syntax/
       state.tokenize = tokenComment;
       return state.tokenize(stream, state);
     } else if (ch == ".") {
@@ -60,6 +67,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
         return "number";
       }
       // .table_name (ODBC)
+      // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
       if (support.ODBCdotTable == true && stream.match(/^[a-zA-Z_]+/)) {
         return "variable-2";
       }
@@ -70,11 +78,13 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (ch == '{' &&
         (stream.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/) || stream.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/))) {
       // dates (weird ODBC syntax)
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
       return "number";
     } else {
       stream.eatWhile(/^[_\w\d]/);
       var word = stream.current().toLowerCase();
       // dates (standard SQL syntax)
+      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
       if (dateSQL.hasOwnProperty(word) && (stream.match(/^( )+'[^']*'/) || stream.match(/^( )+"[^"]*"/)))
         return "number";
       if (atoms.hasOwnProperty(word)) return "atom";
@@ -171,6 +181,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
   // `identifier`
   function hookIdentifier(stream) {
+    // MySQL/MariaDB identifiers
+    // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
     var ch;
     while ((ch = stream.next()) != null) {
       if (ch == "`" && !stream.eat("`")) return "variable-2";

From 1a1ae42ac0126710fbff9461707f7faee35731c5 Mon Sep 17 00:00:00 2001
From: lynschinzer <lynschinzer@gmail.com>
Date: Sun, 26 May 2013 19:41:48 +0200
Subject: [PATCH 0155/4742] [vim keymap] Repeat insert changes for
 A,I,a,i,caw,ciw

---
 keymap/vim.js | 87 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 3 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 999acaf760..52641370de 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -441,6 +441,12 @@
       return {
         macroKeyBuffer: [],
         latestRegister: undefined,
+        lastInsertModeChanages: {
+          ch: 0,
+          baseRemnantLength: 0,
+          cachedText: '',
+          text: ''
+        },
         enteredMacroMode: undefined,
         isMacroPlaying: false,
         toggle: function(cm, registerName) {
@@ -1603,6 +1609,10 @@
           cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
         }
         cm.setOption('keyMap', 'vim-insert');
+        cm.on('change', onInsertModeTextChanges);
+        var vim = getVimState(cm);
+        if(insertAt)commandDispatcher.recordLastEdit(cm, vim, insertAt);
+        getVimGlobalState().macroModeState.lastInsertModeChanages.text = '';
       },
       toggleVisualMode: function(cm, actionArgs, vim) {
         var repeat = actionArgs.repeat;
@@ -1832,15 +1842,24 @@
         cm.setCursor({line: cur.line, ch: start + numberStr.length - 1});
       },
       repeatLastEdit: function(cm, actionArgs, vim) {
-        // TODO: Make this repeat insert mode changes.
         var lastEdit = vim.lastEdit;
-        if (lastEdit) {
+        var repeat = actionArgs.repeat;
+        var macroModeState = getVimGlobalState().macroModeState;
+        if (isInsertModeChanges(lastEdit)) { /* A,I,a,i */
+          actions.enterInsertMode(cm, { isRepeatEdit:true, insertAt:lastEdit });
+          repeatLastInsertModeChanges(cm, repeat, macroModeState);
+          return;
+        } else if (lastEdit) {
           if (actionArgs.repeat && actionArgs.repeatIsExplicit) {
             vim.lastEdit.repeatOverride = actionArgs.repeat;
           }
           var currentInputState = vim.inputState;
           vim.inputState = vim.lastEdit;
           commandDispatcher.evalInput(cm, vim);
+          if (lastEdit.operator == 'change') {
+            repeatLastInsertModeChanges(cm, repeat, macroModeState);
+            return;
+          }
           vim.inputState = currentInputState;
         }
       }
@@ -3409,9 +3428,15 @@
     }
     CodeMirror.keyMap.vim = buildVimKeyMap();
 
-    function exitInsertMode(cm) {
+    function exitInsertMode(cm, suppressChanges) {
       cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
       cm.setOption('keyMap', 'vim');
+      cm.off('change', onInsertModeTextChanges);
+      logKey(getVimGlobalState().macroModeState, '<Esc>');
+      if (!suppressChanges) {
+        var lastChange = getVimGlobalState().macroModeState.lastInsertModeChanages;
+        lastChange.cachedText = lastChange.text;
+      }
     }
 
     CodeMirror.keyMap['vim-insert'] = {
@@ -3477,6 +3502,62 @@
       cm.setOption('keyMap', 'vim');
     }
 
+    function changeObjToString(changeObj) {
+      return changeObj.text.join('\n');
+    }
+
+    function onInsertModeTextChanges(cm, changeObj) {
+      var macroModeState = getVimGlobalState().macroModeState;
+      var keyBuffer = macroModeState.macroKeyBuffer;
+      var cur = cm.getCursor();
+      var line = cur.line;
+      var ch = cur.ch;
+      var lastChange = macroModeState.lastInsertModeChanages;
+      var remnantLength;
+      if (lastChange.text) {
+        // if current change is newline, push '\n'
+        if (changeObj.text.length > 1) {
+          lastChange.text += changeObj.text.join('\n');
+
+        // if last change was newline, update lastChange state for current line
+        } else if (lastChange.text.charAt(lastChange.text.length-1) == '\n') {
+          lastChange.baseRemnantLength = lastChange.text.length;
+          lastChange.text += changeObj.text;
+          changeObj.text = lastChange.text;
+          lastChange.ch = changeObj.from.ch;
+
+        // Merge consecutive grainy changes into one chunk
+        } else {
+          var remnantLength = lastChange.baseRemnantLength + changeObj.from.ch - lastChange.ch;
+          var lastText = lastChange.text;
+          var changeObjText = changeObjToString(changeObj);
+          var lastTextRemnant = lastText.substring(0, remnantLength);
+          lastChange.text = lastTextRemnant + changeObjText;
+        }
+      } else { // reset lastChange state
+        lastChange.ch = changeObj.from.ch;
+        lastChange.text = changeObj.text.join('\n');
+        lastChange.baseRemnantLength = 0;
+        console.log(changeObj.text);
+      }
+    }
+
+    function isInsertModeChanges(lastEdit) {
+      return (typeof lastEdit) == 'string';
+    }
+
+    function repeatLastInsertModeChanges(cm, repeat, macroModeState) {
+      var cur = cm.getCursor();
+      var lastChange = macroModeState.lastInsertModeChanages;
+      var text = '';
+      var cachedText = lastChange.cachedText;
+      while (repeat--) {
+        text += cachedText;
+      }
+      cm.replaceRange(text, cur, cur);
+      exitInsertMode(cm, /* suppressChanges */true);
+    }
+
     CodeMirror.keyMap['vim-replace'] = {
       'Esc': exitReplaceMode,
       'Ctrl-[': exitReplaceMode,

From ebc3fa73c3a1e759c86eb9726f6cd4ac7620914b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 1 Jun 2013 16:06:58 -0400
Subject: [PATCH 0156/4742] [vim keymap] Fixups for repeat insert mode changes

Cleans a lot of insert mode record/replay code.
Adds support for o and O.
Adds unit tests and fixes a lot of corner cases.
Fixes cw deleting trailing whitespace.
---
 keymap/vim.js    | 201 +++++++++++++++++++++++++----------------------
 test/vim_test.js |  80 +++++++++++++++++++
 2 files changed, 185 insertions(+), 96 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 52641370de..fd5729e5d6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -241,30 +241,34 @@
         actionArgs: { forward: true }},
     { keys: ['<C-o>'], type: 'action', action: 'jumpListWalk',
         actionArgs: { forward: false }},
-    { keys: ['a'], type: 'action', action: 'enterInsertMode',
+    { keys: ['a'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'charAfter' }},
-    { keys: ['A'], type: 'action', action: 'enterInsertMode',
+    { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'eol' }},
-    { keys: ['i'], type: 'action', action: 'enterInsertMode',
+    { keys: ['i'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'inplace' }},
-    { keys: ['I'], type: 'action', action: 'enterInsertMode',
+    { keys: ['I'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'firstNonBlank' }},
     { keys: ['o'], type: 'action', action: 'newLineAndEnterInsertMode',
+        isEdit: true,
         actionArgs: { after: true }},
     { keys: ['O'], type: 'action', action: 'newLineAndEnterInsertMode',
+        isEdit: true,
         actionArgs: { after: false }},
     { keys: ['v'], type: 'action', action: 'toggleVisualMode' },
     { keys: ['V'], type: 'action', action: 'toggleVisualMode',
         actionArgs: { linewise: true }},
-    { keys: ['J'], type: 'action', action: 'joinLines' },
-    { keys: ['p'], type: 'action', action: 'paste',
-        actionArgs: { after: true }},
-    { keys: ['P'], type: 'action', action: 'paste',
-        actionArgs: { after: false }},
-    { keys: ['r', 'character'], type: 'action', action: 'replace' },
+    { keys: ['J'], type: 'action', action: 'joinLines', isEdit: true },
+    { keys: ['p'], type: 'action', action: 'paste', isEdit: true,
+        actionArgs: { after: true, isEdit: true }},
+    { keys: ['P'], type: 'action', action: 'paste', isEdit: true,
+        actionArgs: { after: false, isEdit: true }},
+    { keys: ['r', 'character'], type: 'action', action: 'replace', isEdit: true },
     { keys: ['@', 'character'], type: 'action', action: 'replayMacro' },
     { keys: ['q', 'character'], type: 'action', action: 'enterMacroRecordMode' },
-    { keys: ['R'], type: 'action', action: 'enterReplaceMode' },
+    // Handle Replace-mode as a special case of insert mode.
+    { keys: ['R'], type: 'action', action: 'enterInsertMode', isEdit: true,
+        actionArgs: { replace: true }},
     { keys: ['u'], type: 'action', action: 'undo' },
     { keys: ['<C-r>'], type: 'action', action: 'redo' },
     { keys: ['m', 'character'], type: 'action', action: 'setMark' },
@@ -286,8 +290,10 @@
         motion: 'moveToFirstNonWhiteSpaceCharacter' },
     { keys: ['.'], type: 'action', action: 'repeatLastEdit' },
     { keys: ['<C-a>'], type: 'action', action: 'incrementNumberToken',
+        isEdit: true,
         actionArgs: {increase: true, backtrack: false}},
     { keys: ['<C-x>'], type: 'action', action: 'incrementNumberToken',
+        isEdit: true,
         actionArgs: {increase: false, backtrack: false}},
     // Text object motions
     { keys: ['a', 'character'], type: 'motion',
@@ -441,10 +447,10 @@
       return {
         macroKeyBuffer: [],
         latestRegister: undefined,
-        lastInsertModeChanages: {
+        inReplay: false,
+        lastInsertModeChanges: {
           ch: 0,
           baseRemnantLength: 0,
-          cachedText: '',
           text: ''
         },
         enteredMacroMode: undefined,
@@ -497,9 +503,10 @@
           // executed in between.
           lastMotion: null,
           marks: {},
+          insertMode: true,
           visualMode: false,
           // If we are in visual line mode. No effect if visualMode is false.
-          visualLine: false
+          visualLine: false,
         };
       }
       return cm.vimState;
@@ -872,7 +879,10 @@
         actionArgs.repeatIsExplicit = repeatIsExplicit;
         actionArgs.registerName = inputState.registerName;
         vim.inputState = new InputState();
-        vim.lastMotion = null,
+        vim.lastMotion = null;
+        if (command.isEdit) {
+          this.recordLastEdit(cm, vim, inputState, command);
+        }
         actions[command.action](cm, actionArgs, vim);
       },
       processSearch: function(cm, vim, command) {
@@ -1143,12 +1153,16 @@
             exitVisualMode(cm, vim);
           }
           if (operatorArgs.enterInsertMode) {
-            actions.enterInsertMode(cm);
+            actions.enterInsertMode(cm, {}, vim);
           }
         }
       },
-      recordLastEdit: function(cm, vim, inputState) {
+      recordLastEdit: function(cm, vim, inputState, actionCommand) {
+        var macroModeState = getVimGlobalState().macroModeState;
+        if (macroModeState.inReplay) { return; }
         vim.lastEdit = inputState;
+        vim.lastEditActionCommand = actionCommand;
+        macroModeState.lastInsertModeChanges.text = '';
       }
     };
 
@@ -1481,6 +1495,14 @@
           // curEnd should be on the first character of the new line.
           cm.replaceRange('\n', curStart, curEnd);
         } else {
+          // Exclude trailing whitespace if the range is not all whitespace.
+          var text = cm.getRange(curStart, curEnd);
+          if (!isWhiteSpaceString(text)) {
+            var match = (/\s+$/).exec(text);
+            if (match) {
+              curEnd = offsetCursor(curEnd, 0, - match[0].length);
+            }
+          }
           cm.replaceRange('', curStart, curEnd);
         }
         cm.setCursor(curStart);
@@ -1597,7 +1619,8 @@
         macroModeState.toggle(cm, registerName);
         emptyMacroKeyBuffer(macroModeState);
       },
-      enterInsertMode: function(cm, actionArgs) {
+      enterInsertMode: function(cm, actionArgs, vim) {
+        vim.insertMode = true;
         var insertAt = (actionArgs) ? actionArgs.insertAt : null;
         if (insertAt == 'eol') {
           var cursor = cm.getCursor();
@@ -1609,10 +1632,14 @@
           cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
         }
         cm.setOption('keyMap', 'vim-insert');
-        cm.on('change', onInsertModeTextChanges);
-        var vim = getVimState(cm);
-        if(insertAt)commandDispatcher.recordLastEdit(cm, vim, insertAt);
-        getVimGlobalState().macroModeState.lastInsertModeChanages.text = '';
+        if (actionArgs && actionArgs.replace) {
+          // Handle Replace-mode as a special case of insert mode.
+          cm.toggleOverwrite(true);
+          cm.setOption('keyMap', 'vim-replace');
+        } else {
+          cm.setOption('keyMap', 'vim-insert');
+        }
+        cm.on('change', onChange);
       },
       toggleVisualMode: function(cm, actionArgs, vim) {
         var repeat = actionArgs.repeat;
@@ -1698,7 +1725,7 @@
           cm.setCursor(curFinalPos);
         });
       },
-      newLineAndEnterInsertMode: function(cm, actionArgs) {
+      newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
         var insertAt = cm.getCursor();
         if (insertAt.line === cm.firstLine() && !actionArgs.after) {
           // Special case for inserting newline before start of document.
@@ -1713,7 +1740,7 @@
               CodeMirror.commands.newlineAndIndent;
           newlineFn(cm);
         }
-        this.enterInsertMode(cm);
+        this.enterInsertMode(cm, {}, vim);
       },
       paste: function(cm, actionArgs, vim) {
         var cur = cm.getCursor();
@@ -1809,10 +1836,6 @@
           }
         }
       },
-      enterReplaceMode: function(cm, actionArgs) {
-        cm.setOption('keyMap', 'vim-replace');
-        cm.toggleOverwrite();
-      },
       incrementNumberToken: function(cm, actionArgs, vim) {
         var cur = cm.getCursor();
         var lineStr = cm.getLine(cur.line);
@@ -1845,23 +1868,30 @@
         var lastEdit = vim.lastEdit;
         var repeat = actionArgs.repeat;
         var macroModeState = getVimGlobalState().macroModeState;
-        if (isInsertModeChanges(lastEdit)) { /* A,I,a,i */
-          actions.enterInsertMode(cm, { isRepeatEdit:true, insertAt:lastEdit });
-          repeatLastInsertModeChanges(cm, repeat, macroModeState);
-          return;
-        } else if (lastEdit) {
-          if (actionArgs.repeat && actionArgs.repeatIsExplicit) {
+        macroModeState.inReplay = true;
+        if (lastEdit) {
+          if (repeat && actionArgs.repeatIsExplicit) {
             vim.lastEdit.repeatOverride = actionArgs.repeat;
           }
           var currentInputState = vim.inputState;
           vim.inputState = vim.lastEdit;
-          commandDispatcher.evalInput(cm, vim);
-          if (lastEdit.operator == 'change') {
+          if (vim.lastEditActionCommand) {
+            commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
+          } else {
+            commandDispatcher.evalInput(cm, vim);
+          }
+          if (macroModeState.lastInsertModeChanges.text) {
+            // For some reason, repeat cw in desktop VIM will does not repeat
+            // insert. Will conform to that behavior.
+            repeat = !vim.lastEditActionCommand ? 1 : repeat;
             repeatLastInsertModeChanges(cm, repeat, macroModeState);
-            return;
           }
           vim.inputState = currentInputState;
         }
+        macroModeState.inReplay = false;
+        if (vim.insertMode) {
+          exitInsertMode(cm);
+        }
       }
     };
 
@@ -3428,15 +3458,12 @@
     }
     CodeMirror.keyMap.vim = buildVimKeyMap();
 
-    function exitInsertMode(cm, suppressChanges) {
+    function exitInsertMode(cm) {
+      getVimState(cm).insertMode = false;
       cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
       cm.setOption('keyMap', 'vim');
-      cm.off('change', onInsertModeTextChanges);
-      logKey(getVimGlobalState().macroModeState, '<Esc>');
-      if (!suppressChanges) {
-        var lastChange = getVimGlobalState().macroModeState.lastInsertModeChanages;
-        lastChange.cachedText = lastChange.text;
-      }
+      cm.toggleOverwrite(false); // exit replace mode if we were in it.
+      cm.off('change', onChange);
     }
 
     CodeMirror.keyMap['vim-insert'] = {
@@ -3455,6 +3482,11 @@
       fallthrough: ['default']
     };
 
+    CodeMirror.keyMap['vim-replace'] = {
+      'Backspace': 'goCharLeft',
+      fallthrough: ['vim-insert']
+    };
+
     function parseRegisterToKeyBuffer(macroModeState, registerName) {
       var match, key;
       var register = getVimGlobalState().registerController.getRegister(registerName);
@@ -3496,49 +3528,36 @@
       macroKeyBuffer.push(key);
     }
 
-    function exitReplaceMode(cm) {
-      cm.toggleOverwrite();
-      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
-      cm.setOption('keyMap', 'vim');
-    }
-
-    function changeObjToString(changeObj) {
-      return changeObj.text.join('\n');
-    }
-
-    function onInsertModeTextChanges(cm, changeObj) {
+    /**
+     * Listens for changes made in insert mode. Should only be active in insert
+     * mode.
+     */
+    function onChange(cm, changeObj) {
       var macroModeState = getVimGlobalState().macroModeState;
-      var keyBuffer = macroModeState.macroKeyBuffer;
-      var cur = cm.getCursor();
-      var line = cur.line;
-      var ch = cur.ch;
-      var lastChange = macroModeState.lastInsertModeChanages;
-      var remnantLength;
-      if (lastChange.text) {
-        // if current change is newline, push '\n'
-        if (changeObj.text.length > 1) {
-          lastChange.text += changeObj.text.join('\n');
-
-        // if last change was newline, update lastChange state for current line
-        } else if (lastChange.text.charAt(lastChange.text.length-1) == '\n') {
-          lastChange.baseRemnantLength = lastChange.text.length;
-          lastChange.text += changeObj.text;
-          changeObj.text = lastChange.text;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      while (changeObj) {
+        var changeObjText = changeObj.text.join('\n');
+        if (lastChange.text) {
+          if (lastChange.text.charAt(lastChange.text.length-1) == '\n') {
+            // if last change was newline, update lastChange state for current line
+            lastChange.baseRemnantLength = lastChange.text.length;
+            lastChange.text += changeObjText;
+            lastChange.ch = changeObj.from.ch;
+          } else {
+            // Merge consecutive grainy changes into one chunk
+            var remnantLength = lastChange.baseRemnantLength + changeObj.from.ch - lastChange.ch;
+            var lastText = lastChange.text;
+            var changeObjText = changeObjText;
+            var lastTextRemnant = lastText.substring(0, remnantLength);
+            lastChange.text = lastTextRemnant + changeObjText;
+          }
+        } else { // reset lastChange state
           lastChange.ch = changeObj.from.ch;
-
-        // Merge consecutive grainy changes into one chunk
-        } else {
-          var remnantLength = lastChange.baseRemnantLength + changeObj.from.ch - lastChange.ch;
-          var lastText = lastChange.text;
-          var changeObjText = changeObjToString(changeObj);
-          var lastTextRemnant = lastText.substring(0, remnantLength);
-          lastChange.text = lastTextRemnant + changeObjText;
+          lastChange.text = changeObj.text.join('\n');
+          lastChange.baseRemnantLength = 0;
         }
-      } else { // reset lastChange state
-        lastChange.ch = changeObj.from.ch;
-        lastChange.text = changeObj.text.join('\n');
-        lastChange.baseRemnantLength = 0;
-        console.log(changeObj.text);
+        // Change objects may be chained with next.
+        changeObj = changeObj.next;
       }
     }
 
@@ -3548,24 +3567,14 @@
 
     function repeatLastInsertModeChanges(cm, repeat, macroModeState) {
       var cur = cm.getCursor();
-      var lastChange = macroModeState.lastInsertModeChanages;
+      var lastChange = macroModeState.lastInsertModeChanges;
       var text = '';
-      var cachedText = lastChange.cachedText;
       while (repeat--) {
-        text += cachedText;
+        text += lastChange.text;
       }
       cm.replaceRange(text, cur, cur);
-      exitInsertMode(cm, /* suppressChanges */true);
     }
 
-    CodeMirror.keyMap['vim-replace'] = {
-      'Esc': exitReplaceMode,
-      'Ctrl-[': exitReplaceMode,
-      'Ctrl-C': exitReplaceMode,
-      'Backspace': 'goCharLeft',
-      fallthrough: ['default']
-    };
-
     return vimApi;
   };
   // Initialize Vim and make it available as an API.
diff --git a/test/vim_test.js b/test/vim_test.js
index e157204a04..f70fed41c9 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -124,6 +124,18 @@ function testVim(name, run, opts, expectedFail) {
         }
       }
     }
+    function doInsertModeKeysFn(cm) {
+      return function(args) {
+        if (args instanceof Array) { arguments = args; }
+        function executeHandler(handler) {
+          if (typeof handler == 'string') { CodeMirror.commands[handler](cm);
+          } else { handler(cm); }
+        }
+        for (var i = 0; i < arguments.length; i++) {
+          var handler = CodeMirror.lookupKey(arguments[i], ['vim-insert'], executeHandler);
+        }
+      }
+    }
     function doExFn(cm) {
       return function(command) {
         cm.openDialog = helpers.fakeOpenDialog(command);
@@ -148,6 +160,10 @@ function testVim(name, run, opts, expectedFail) {
     }
     var helpers = {
       doKeys: doKeysFn(cm),
+      // Warning: Only emulates keymap events, not character insertions. Use
+      // replaceRange to simulate character insertions.
+      // Keys are in CodeMirror format, NOT vim format.
+      doInsertModeKeys: doInsertModeKeysFn(cm),
       doEx: doExFn(cm),
       assertCursorAt: assertCursorAtFn(cm),
       fakeOpenDialog: fakeOpenDialog,
@@ -789,6 +805,12 @@ testVim('dd_lastline', function(cm, vim, helpers) {
   eq(expectedLineCount, cm.lineCount());
   helpers.assertCursorAt(cm.lineCount() - 1, 0);
 });
+testVim('cw', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('c', '2', 'w');
+  eq(' word3', cm.getValue());
+  helpers.assertCursorAt(0, 0);
+}, { value: 'word1 word2 word3'});
 // Yank commands should behave the exact same as d commands, expect that nothing
 // gets deleted.
 testVim('yw_repeat', function(cm, vim, helpers) {
@@ -1559,6 +1581,64 @@ testVim('._repeat', function(cm, vim, helpers) {
   helpers.doKeys('3', '.');
   eq('6', cm.getValue());
 }, { value: '1 2 3 4 5 6'});
+testVim('._insert', function(cm, vim, helpers) {
+  helpers.doKeys('i');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('<Esc>');
+  cm.setCursor(0, 3);
+  helpers.doKeys('.');
+  eq('testestt', cm.getValue());
+  helpers.assertCursorAt(0, 6);
+}, { value: ''});
+testVim('._insert_repeat', function(cm, vim, helpers) {
+  helpers.doKeys('i');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('<Esc>');
+  cm.setCursor(0, 3);
+  helpers.doKeys('2', '.');
+  eq('testesttestt', cm.getValue());
+  helpers.assertCursorAt(0, 10);
+}, { value: ''});
+testVim('._insert_o', function(cm, vim, helpers) {
+  helpers.doKeys('o');
+  cm.replaceRange('z', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  cm.setCursor(1, 0);
+  helpers.doKeys('.');
+  eq('\nz\nz', cm.getValue());
+  helpers.assertCursorAt(2, 0);
+}, { value: ''});
+testVim('._insert_o_indent', function(cm, vim, helpers) {
+  helpers.doKeys('o');
+  cm.replaceRange('z', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  cm.setCursor(1, 2);
+  helpers.doKeys('.');
+  eq('{\n  z\n  z', cm.getValue());
+  helpers.assertCursorAt(2, 2);
+}, { value: '{', mode: 'text/css'});
+testVim('._insert_cw', function(cm, vim, helpers) {
+  helpers.doKeys('c', 'w');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  cm.setCursor(0, 3);
+  helpers.doKeys('2', 'l');
+  helpers.doKeys('.');
+  eq('test test word3', cm.getValue());
+  helpers.assertCursorAt(0, 8);
+}, { value: 'word1 word2 word3' });
+testVim('._insert_cw_repeat', function(cm, vim, helpers) {
+  // For some reason, repeating cw in desktop VIM will does not repeat insert.
+  // Will conform to that behavior.
+  helpers.doKeys('c', 'w');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  cm.setCursor(0, 4);
+  helpers.doKeys('l');
+  helpers.doKeys('2', '.');
+  eq('test test', cm.getValue());
+  helpers.assertCursorAt(0, 8);
+}, { value: 'word1 word2 word3' });
 testVim('f;', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('f', 'x');

From 0864410244e4472f8a9554ddf046cc636e6aea6a Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 2 Jun 2013 02:10:18 -0400
Subject: [PATCH 0157/4742] [vim keymap] Add support for insert mode count
 repeat.

---
 keymap/vim.js    | 128 ++++++++++++++++++++++++++++++++++-------------
 test/vim_test.js |  58 +++++++++++++++++----
 2 files changed, 141 insertions(+), 45 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fd5729e5d6..fe655d88be 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -250,10 +250,10 @@
     { keys: ['I'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'firstNonBlank' }},
     { keys: ['o'], type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true,
+        isEdit: true, interlaceInsertRepeat: true,
         actionArgs: { after: true }},
     { keys: ['O'], type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true,
+        isEdit: true, interlaceInsertRepeat: true,
         actionArgs: { after: false }},
     { keys: ['v'], type: 'action', action: 'toggleVisualMode' },
     { keys: ['V'], type: 'action', action: 'toggleVisualMode',
@@ -491,6 +491,12 @@
         // Store instance state in the CodeMirror object.
         cm.vimState = {
           inputState: new InputState(),
+          // Vim's input state that triggered the last edit, used to repeat
+          // motions and operators with '.'.
+          lastEditInputState: undefined,
+          // Vim's action command before the last edit, used to repeat actions
+          // with '.' and insert mode repeat.
+          lastEditActionCommand: undefined,
           // When using jk for navigation, if you move from a longer line to a
           // shorter line, the cursor may clip to the end of the shorter line.
           // If j is pressed again and cursor goes to the next line, the
@@ -503,7 +509,10 @@
           // executed in between.
           lastMotion: null,
           marks: {},
-          insertMode: true,
+          insertMode: false,
+          // Repeat count for changes made in insert mode, triggered by key
+          // sequences like 3,i. Only exists when insertMode is true.
+          insertModeRepeat: undefined,
           visualMode: false,
           // If we are in visual line mode. No effect if visualMode is false.
           visualLine: false,
@@ -1160,7 +1169,7 @@
       recordLastEdit: function(cm, vim, inputState, actionCommand) {
         var macroModeState = getVimGlobalState().macroModeState;
         if (macroModeState.inReplay) { return; }
-        vim.lastEdit = inputState;
+        vim.lastEditInputState = inputState;
         vim.lastEditActionCommand = actionCommand;
         macroModeState.lastInsertModeChanges.text = '';
       }
@@ -1621,6 +1630,7 @@
       },
       enterInsertMode: function(cm, actionArgs, vim) {
         vim.insertMode = true;
+        vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
         var insertAt = (actionArgs) ? actionArgs.insertAt : null;
         if (insertAt == 'eol') {
           var cursor = cm.getCursor();
@@ -1639,7 +1649,10 @@
         } else {
           cm.setOption('keyMap', 'vim-insert');
         }
-        cm.on('change', onChange);
+        if (!getVimGlobalState().macroModeState.inReplay) {
+          // Only record if not replaying.
+          cm.on('change', onChange);
+        }
       },
       toggleVisualMode: function(cm, actionArgs, vim) {
         var repeat = actionArgs.repeat;
@@ -1740,7 +1753,7 @@
               CodeMirror.commands.newlineAndIndent;
           newlineFn(cm);
         }
-        this.enterInsertMode(cm, {}, vim);
+        this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
       },
       paste: function(cm, actionArgs, vim) {
         var cur = cm.getCursor();
@@ -1865,33 +1878,15 @@
         cm.setCursor({line: cur.line, ch: start + numberStr.length - 1});
       },
       repeatLastEdit: function(cm, actionArgs, vim) {
-        var lastEdit = vim.lastEdit;
+        var lastEditInputState = vim.lastEditInputState;
+        if (!lastEditInputState) { return; }
         var repeat = actionArgs.repeat;
-        var macroModeState = getVimGlobalState().macroModeState;
-        macroModeState.inReplay = true;
-        if (lastEdit) {
-          if (repeat && actionArgs.repeatIsExplicit) {
-            vim.lastEdit.repeatOverride = actionArgs.repeat;
-          }
-          var currentInputState = vim.inputState;
-          vim.inputState = vim.lastEdit;
-          if (vim.lastEditActionCommand) {
-            commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
-          } else {
-            commandDispatcher.evalInput(cm, vim);
-          }
-          if (macroModeState.lastInsertModeChanges.text) {
-            // For some reason, repeat cw in desktop VIM will does not repeat
-            // insert. Will conform to that behavior.
-            repeat = !vim.lastEditActionCommand ? 1 : repeat;
-            repeatLastInsertModeChanges(cm, repeat, macroModeState);
-          }
-          vim.inputState = currentInputState;
-        }
-        macroModeState.inReplay = false;
-        if (vim.insertMode) {
-          exitInsertMode(cm);
+        if (repeat && actionArgs.repeatIsExplicit) {
+          vim.lastEditInputState.repeatOverride = repeat;
+        } else {
+          repeat = vim.lastEditInputState.repeatOverride || repeat;
         }
+        repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
       }
     };
 
@@ -3459,11 +3454,20 @@
     CodeMirror.keyMap.vim = buildVimKeyMap();
 
     function exitInsertMode(cm) {
-      getVimState(cm).insertMode = false;
+      var vim = getVimState(cm)
+      vim.insertMode = false;
+      var inReplay = getVimGlobalState().macroModeState.inReplay;
+      if (!inReplay) { cm.off('change', onChange); }
+      if (!inReplay && vim.insertModeRepeat > 1) {
+        // Perform insert mode repeat for commands like 3,a and 3,o.
+        repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
+            true /** repeatForInsert */);
+        vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
+      }
+      delete vim.insertModeRepeat;
       cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
       cm.setOption('keyMap', 'vim');
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
-      cm.off('change', onChange);
     }
 
     CodeMirror.keyMap['vim-insert'] = {
@@ -3561,9 +3565,61 @@
       }
     }
 
-    function isInsertModeChanges(lastEdit) {
-      return (typeof lastEdit) == 'string';
-    }
+    /**
+     * Repeats the last edit, which includes exactly 1 command and at most 1
+     * insert. Operator and motion commands are read from lastEditInputState,
+     * while action commands are read from lastEditActionCommand.
+     *
+     * If repeatForInsert is true, then the function was called by
+     * exitInsertMode to repeat the insert mode changes the user just made. The
+     * corresponding enterInsertMode call was made with a count.
+     */
+    function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
+      var lastEditInputState = vim.lastEditInputState;
+      var macroModeState = getVimGlobalState().macroModeState;
+      macroModeState.inReplay = true;
+      var isAction = !!vim.lastEditActionCommand;
+      var cachedInputState = vim.inputState;
+      function repeatCommand() {
+        if (isAction) {
+          commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
+        } else {
+          commandDispatcher.evalInput(cm, vim);
+        }
+      }
+      function repeatInsert(repeat) {
+        if (macroModeState.lastInsertModeChanges.text) {
+          // For some reason, repeat cw in desktop VIM will does not repeat
+          // insert mode changes. Will conform to that behavior.
+          repeat = !vim.lastEditActionCommand ? 1 : repeat;
+          repeatLastInsertModeChanges(cm, repeat, macroModeState);
+        }
+      }
+      vim.inputState = vim.lastEditInputState;
+      if (isAction && vim.lastEditActionCommand.interlaceInsertRepeat) {
+        // o and O repeat have to be interlaced with insert repeats so that the
+        // insertions appear on separate lines instead of the last line.
+        for (var i = 0; i < repeat; i++) {
+          repeatCommand();
+          repeatInsert(1);
+        }
+      } else {
+        if (!repeatForInsert) {
+          // Hack to get the cursor to end up at the right place. If I is
+          // repeated in insert mode repeat, cursor will be 1 insert
+          // change set left of where it should be.
+          repeatCommand();
+        }
+        repeatInsert(repeat);
+      }
+      vim.inputState = cachedInputState;
+      if (vim.insertMode && !repeatForInsert) {
+        // Don't exit insert mode twice. If repeatForInsert is set, then we
+        // were called by an exitInsertMode call lower on the stack.
+        exitInsertMode(cm);
+      }
+      macroModeState.inReplay = false;
+    };
 
     function repeatLastInsertModeChanges(cm, repeat, macroModeState) {
       var cur = cm.getCursor();
diff --git a/test/vim_test.js b/test/vim_test.js
index f70fed41c9..4aacaca0fe 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1060,8 +1060,14 @@ testVim('i', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 1);
   eq('vim-insert', cm.getOption('keyMap'));
 });
+testVim('i_repeat', function(cm, vim, helpers) {
+  helpers.doKeys('3', 'i');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  eq('testtesttest', cm.getValue());
+  helpers.assertCursorAt(0, 11);
+}, { value: '' });
 testVim('A', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
   helpers.doKeys('A');
   helpers.assertCursorAt(0, lines[0].length);
   eq('vim-insert', cm.getOption('keyMap'));
@@ -1072,6 +1078,14 @@ testVim('I', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, lines[0].textStart);
   eq('vim-insert', cm.getOption('keyMap'));
 });
+testVim('I_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('3', 'I');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  eq('testtesttestblah', cm.getValue());
+  helpers.assertCursorAt(0, 11);
+}, { value: 'blah' });
 testVim('o', function(cm, vim, helpers) {
   cm.setCursor(0, 4);
   helpers.doKeys('o');
@@ -1079,6 +1093,15 @@ testVim('o', function(cm, vim, helpers) {
   helpers.assertCursorAt(1, 0);
   eq('vim-insert', cm.getOption('keyMap'));
 }, { value: 'word1\nword2' });
+testVim('o_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('3', 'o');
+  cm.replaceRange('test', cm.getCursor());
+  cm.setCursor(1, 3)
+  helpers.doInsertModeKeys('Esc');
+  eq('\ntest\ntest\ntest', cm.getValue());
+  helpers.assertCursorAt(3, 3);
+}, { value: '' });
 testVim('O', function(cm, vim, helpers) {
   cm.setCursor(0, 4);
   helpers.doKeys('O');
@@ -1584,8 +1607,7 @@ testVim('._repeat', function(cm, vim, helpers) {
 testVim('._insert', function(cm, vim, helpers) {
   helpers.doKeys('i');
   cm.replaceRange('test', cm.getCursor());
-  helpers.doKeys('<Esc>');
-  cm.setCursor(0, 3);
+  helpers.doInsertModeKeys('Esc');
   helpers.doKeys('.');
   eq('testestt', cm.getValue());
   helpers.assertCursorAt(0, 6);
@@ -1593,21 +1615,39 @@ testVim('._insert', function(cm, vim, helpers) {
 testVim('._insert_repeat', function(cm, vim, helpers) {
   helpers.doKeys('i');
   cm.replaceRange('test', cm.getCursor());
-  helpers.doKeys('<Esc>');
-  cm.setCursor(0, 3);
+  cm.setCursor(0, 4);
+  helpers.doInsertModeKeys('Esc');
   helpers.doKeys('2', '.');
   eq('testesttestt', cm.getValue());
   helpers.assertCursorAt(0, 10);
 }, { value: ''});
+testVim('._repeat_insert', function(cm, vim, helpers) {
+  helpers.doKeys('3', 'i');
+  cm.replaceRange('te', cm.getCursor());
+  cm.setCursor(0, 2);
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('.');
+  eq('tetettetetee', cm.getValue());
+  helpers.assertCursorAt(0, 10);
+}, { value: ''});
 testVim('._insert_o', function(cm, vim, helpers) {
   helpers.doKeys('o');
   cm.replaceRange('z', cm.getCursor());
+  cm.setCursor(1, 1);
   helpers.doInsertModeKeys('Esc');
-  cm.setCursor(1, 0);
   helpers.doKeys('.');
   eq('\nz\nz', cm.getValue());
   helpers.assertCursorAt(2, 0);
 }, { value: ''});
+testVim('._insert_o_repeat', function(cm, vim, helpers) {
+  helpers.doKeys('o');
+  cm.replaceRange('z', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  cm.setCursor(1, 0);
+  helpers.doKeys('2', '.');
+  eq('\nz\nz\nz', cm.getValue());
+  helpers.assertCursorAt(3, 0);
+}, { value: ''});
 testVim('._insert_o_indent', function(cm, vim, helpers) {
   helpers.doKeys('o');
   cm.replaceRange('z', cm.getCursor());
@@ -1616,7 +1656,7 @@ testVim('._insert_o_indent', function(cm, vim, helpers) {
   helpers.doKeys('.');
   eq('{\n  z\n  z', cm.getValue());
   helpers.assertCursorAt(2, 2);
-}, { value: '{', mode: 'text/css'});
+}, { value: '{'});
 testVim('._insert_cw', function(cm, vim, helpers) {
   helpers.doKeys('c', 'w');
   cm.replaceRange('test', cm.getCursor());
@@ -1628,8 +1668,8 @@ testVim('._insert_cw', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 8);
 }, { value: 'word1 word2 word3' });
 testVim('._insert_cw_repeat', function(cm, vim, helpers) {
-  // For some reason, repeating cw in desktop VIM will does not repeat insert.
-  // Will conform to that behavior.
+  // For some reason, repeat cw in desktop VIM will does not repeat insert mode
+  // changes. Will conform to that behavior.
   helpers.doKeys('c', 'w');
   cm.replaceRange('test', cm.getCursor());
   helpers.doInsertModeKeys('Esc');

From afa1b866e2c0cb1ceccc7d5ed76b7d56a817fb71 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 9 Jun 2013 14:12:08 -0400
Subject: [PATCH 0158/4742] [vim keymap] Rewrite insert mode change recording

---
 keymap/vim.js    | 113 +++++++++++++++++++++++++++++++++--------------
 test/vim_test.js |  44 ++++++++++++++++--
 2 files changed, 121 insertions(+), 36 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fe655d88be..ac331b9f65 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -449,9 +449,8 @@
         latestRegister: undefined,
         inReplay: false,
         lastInsertModeChanges: {
-          ch: 0,
-          baseRemnantLength: 0,
-          text: ''
+          changes: [], // Change list
+          expectCursorActivityForChange: false // Set to true on change, false on cursorActivity.
         },
         enteredMacroMode: undefined,
         isMacroPlaying: false,
@@ -534,6 +533,11 @@
       clearVimGlobalState_: function() {
         vimGlobalState = null;
       },
+      // Testing hook.
+      getVimGlobalState_: function() {
+        return vimGlobalState;
+      },
+      InsertModeKey: InsertModeKey,
       map: function(lhs, rhs) {
         // Add user defined key bindings.
         exCommandDispatcher.map(lhs, rhs);
@@ -1171,7 +1175,8 @@
         if (macroModeState.inReplay) { return; }
         vim.lastEditInputState = inputState;
         vim.lastEditActionCommand = actionCommand;
-        macroModeState.lastInsertModeChanges.text = '';
+        macroModeState.lastInsertModeChanges.changes = [];
+        macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
       }
     };
 
@@ -1652,6 +1657,8 @@
         if (!getVimGlobalState().macroModeState.inReplay) {
           // Only record if not replaying.
           cm.on('change', onChange);
+          cm.on('cursorActivity', onCursorActivity);
+          CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
         }
       },
       toggleVisualMode: function(cm, actionArgs, vim) {
@@ -3457,7 +3464,11 @@
       var vim = getVimState(cm)
       vim.insertMode = false;
       var inReplay = getVimGlobalState().macroModeState.inReplay;
-      if (!inReplay) { cm.off('change', onChange); }
+      if (!inReplay) {
+        cm.off('change', onChange);
+        cm.off('cursorActivity', onCursorActivity);
+        CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
+      }
       if (!inReplay && vim.insertModeRepeat > 1) {
         // Perform insert mode repeat for commands like 3,a and 3,o.
         repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
@@ -3533,38 +3544,63 @@
     }
 
     /**
-     * Listens for changes made in insert mode. Should only be active in insert
-     * mode.
+     * Listens for changes made in insert mode.
+     * Should only be active in insert mode.
      */
     function onChange(cm, changeObj) {
       var macroModeState = getVimGlobalState().macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       while (changeObj) {
-        var changeObjText = changeObj.text.join('\n');
-        if (lastChange.text) {
-          if (lastChange.text.charAt(lastChange.text.length-1) == '\n') {
-            // if last change was newline, update lastChange state for current line
-            lastChange.baseRemnantLength = lastChange.text.length;
-            lastChange.text += changeObjText;
-            lastChange.ch = changeObj.from.ch;
-          } else {
-            // Merge consecutive grainy changes into one chunk
-            var remnantLength = lastChange.baseRemnantLength + changeObj.from.ch - lastChange.ch;
-            var lastText = lastChange.text;
-            var changeObjText = changeObjText;
-            var lastTextRemnant = lastText.substring(0, remnantLength);
-            lastChange.text = lastTextRemnant + changeObjText;
-          }
-        } else { // reset lastChange state
-          lastChange.ch = changeObj.from.ch;
-          lastChange.text = changeObj.text.join('\n');
-          lastChange.baseRemnantLength = 0;
+        lastChange.expectCursorActivityForChange = true;
+        if (changeObj.origin == '+input' || changeObj.origin == 'paste'
+            || changeObj.origin === undefined /* only in testing */) {
+          var text = changeObj.text.join('\n');
+          lastChange.changes.push(text);
         }
         // Change objects may be chained with next.
         changeObj = changeObj.next;
       }
     }
 
+    /**
+    * Listens for any kind of cursor activity on CodeMirror.
+    * - For tracking cursor activity in insert mode.
+    * - Should only be active in insert mode.
+    */
+    function onCursorActivity(cm) {
+      var macroModeState = getVimGlobalState().macroModeState;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      if (lastChange.expectCursorActivityForChange) {
+        lastChange.expectCursorActivityForChange = false;
+      } else {
+        // Cursor moved outside the context of an edit. Reset the change.
+        lastChange.changes = [];
+      }
+    }
+
+    /** Wrapper for special keys pressed in insert mode */
+    function InsertModeKey(keyName) {
+      this.keyName = keyName;
+    }
+
+    /**
+    * Handles raw key down events from the text area.
+    * - Should only be active in insert mode.
+    * - For recording deletes in insert mode.
+    */
+    function onKeyEventTargetKeyDown(e) {
+      var macroModeState = getVimGlobalState().macroModeState;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      var keyName = CodeMirror.keyName(e);
+      function onKeyFound(binding) {
+        lastChange.changes.push(new InsertModeKey(keyName));
+        return true;
+      }
+      if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
+        CodeMirror.lookupKey(keyName, ['vim-insert'], onKeyFound)
+      }
+    }
+
     /**
      * Repeats the last edit, which includes exactly 1 command and at most 1
      * insert. Operator and motion commands are read from lastEditInputState,
@@ -3588,7 +3624,7 @@
         }
       }
       function repeatInsert(repeat) {
-        if (macroModeState.lastInsertModeChanges.text) {
+        if (macroModeState.lastInsertModeChanges.changes.length > 0) {
           // For some reason, repeat cw in desktop VIM will does not repeat
           // insert mode changes. Will conform to that behavior.
           repeat = !vim.lastEditActionCommand ? 1 : repeat;
@@ -3622,13 +3658,26 @@
     };
 
     function repeatLastInsertModeChanges(cm, repeat, macroModeState) {
-      var cur = cm.getCursor();
       var lastChange = macroModeState.lastInsertModeChanges;
-      var text = '';
-      while (repeat--) {
-        text += lastChange.text;
+      function keyHandler(binding) {
+        if (typeof binding == 'string') {
+          CodeMirror.commands[binding](cm);
+        } else {
+          binding(cm);
+        }
+        return true;
+      }
+      for (var i = 0; i < repeat; i++) {
+        for (var j = 0; j < lastChange.changes.length; j++) {
+          var change = lastChange.changes[j];
+          if (change instanceof InsertModeKey) {
+            CodeMirror.lookupKey(change.keyName, ['vim-insert'], keyHandler);
+          } else {
+            var cur = cm.getCursor();
+            cm.replaceRange(change, cur, cur);
+          }
+        }
       }
-      cm.replaceRange(text, cur, cur);
     }
 
     return vimApi;
diff --git a/test/vim_test.js b/test/vim_test.js
index 4aacaca0fe..47fc6cd14f 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -128,11 +128,24 @@ function testVim(name, run, opts, expectedFail) {
       return function(args) {
         if (args instanceof Array) { arguments = args; }
         function executeHandler(handler) {
-          if (typeof handler == 'string') { CodeMirror.commands[handler](cm);
-          } else { handler(cm); }
+          if (typeof handler == 'string') {
+            CodeMirror.commands[handler](cm);
+          } else {
+            handler(cm);
+          }
+          return true;
         }
         for (var i = 0; i < arguments.length; i++) {
-          var handler = CodeMirror.lookupKey(arguments[i], ['vim-insert'], executeHandler);
+          var key = arguments[i];
+          // Find key in keymap and handle.
+          var handled = CodeMirror.lookupKey(key, ['vim-insert'], executeHandler);
+          // Record for insert mode.
+          if (handled === true && cm.vimState.insertMode && arguments[i] != 'Esc') {
+            var lastChange = CodeMirror.Vim.getVimGlobalState_().macroModeState.lastInsertModeChanges;
+            if (lastChange) {
+              lastChange.changes.push(new CodeMirror.Vim.InsertModeKey(key));
+            }
+          }
         }
       }
     }
@@ -1067,6 +1080,14 @@ testVim('i_repeat', function(cm, vim, helpers) {
   eq('testtesttest', cm.getValue());
   helpers.assertCursorAt(0, 11);
 }, { value: '' });
+testVim('i_repeat_delete', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('2', 'i');
+  cm.replaceRange('z', cm.getCursor());
+  helpers.doInsertModeKeys('Backspace', 'Backspace', 'Esc');
+  eq('abe', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+}, { value: 'abcde' });
 testVim('A', function(cm, vim, helpers) {
   helpers.doKeys('A');
   helpers.assertCursorAt(0, lines[0].length);
@@ -1097,7 +1118,6 @@ testVim('o_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('3', 'o');
   cm.replaceRange('test', cm.getCursor());
-  cm.setCursor(1, 3)
   helpers.doInsertModeKeys('Esc');
   eq('\ntest\ntest\ntest', cm.getValue());
   helpers.assertCursorAt(3, 3);
@@ -1679,6 +1699,22 @@ testVim('._insert_cw_repeat', function(cm, vim, helpers) {
   eq('test test', cm.getValue());
   helpers.assertCursorAt(0, 8);
 }, { value: 'word1 word2 word3' });
+testVim('._delete', function(cm, vim, helpers) {
+  cm.setCursor(0, 5);
+  helpers.doKeys('i');
+  helpers.doInsertModeKeys('Backspace', 'Esc');
+  helpers.doKeys('.');
+  eq('zace', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+}, { value: 'zabcde'});
+testVim('._delete_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 6);
+  helpers.doKeys('i');
+  helpers.doInsertModeKeys('Backspace', 'Esc');
+  helpers.doKeys('2', '.');
+  eq('zzce', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+}, { value: 'zzabcde'});
 testVim('f;', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('f', 'x');

From 71c101515abffba6a06de9dd31c43c493e9444c5 Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Mon, 10 Jun 2013 09:51:58 +0200
Subject: [PATCH 0159/4742] [sql mode] Various improvements

 * More comments

 * MySQL/MariaDB: add \N as synonym of NULL

 * separate support.charsetCast (_utf8'str') from support.nCharCast (N'str')

 * oracle supports: nCharCast, zerolessFloat

 * comment which explains Mime Types properties
---
 mode/sql/sql.js | 51 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 5c8a0d6598..768410fb36 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -42,8 +42,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
       state.tokenize = tokenLiteral(ch);
       return state.tokenize(stream, state);
-    } else if (support.charsetCast == true &&
-        (((ch == "n" || ch == "N") || (ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
+    } else if ((((support.nCharCast == true && (ch == "n" || ch == "N"))
+        || (support.charsetCast == true && ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
         && (stream.peek() == "'" || stream.peek() == '"'))) {
       // charset casting: _utf8'str', N'str', n'str'
       // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
@@ -193,7 +193,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   // variable token
   function hookVar(stream) {
     // variables
-    // @@ and prefix
+    // @@prefix.varName @varName
+    // varName can be quoted with ` or ' or "
+    // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
     if (stream.eat("@")) {
       stream.match(/^session\./);
       stream.match(/^local\./);
@@ -217,18 +219,27 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
   // short client keyword token
   function hookClient(stream) {
+    // \N means NULL
+    // ref: http://dev.mysql.com/doc/refman/5.5/en/null-values.html
+    if (stream.eat("N")) {
+        return "atom";
+    }
     // \g, etc
+    // ref: http://dev.mysql.com/doc/refman/5.5/en/mysql-commands.html
     return stream.match(/^[a-zA-Z]\b/) ? "variable-2" : null;
   }
 
+  // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
   var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from having in insert into is join like not on or order select set table union update values where ";
 
+  // turn a space-separated list into an array
   function set(str) {
     var obj = {}, words = str.split(" ");
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
 
+  // A generic SQL Mode. It's not a standard, it just try to support what is generally supported
   CodeMirror.defineMIME("text/x-sql", {
     name: "sql",
     keywords: set(sqlKeywords + "begin"),
@@ -247,7 +258,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat charsetCast"),
+    support: set("ODBCdotTable zerolessFloat nCharCast charsetCast"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -263,7 +274,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat charsetCast"),
+    support: set("ODBCdotTable zerolessFloat nCharCast charsetCast"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -279,6 +290,34 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     functions:  set("abs acos add_months ascii asin atan atan2 average bfilename ceil chartorowid chr concat convert cos cosh count decode deref dual dump dup_val_on_index empty error exp false floor found glb greatest hextoraw initcap instr instrb isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mod months_between new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null nvl others power rawtohex reftohex round rowcount rowidtochar rpad rtrim sign sin sinh soundex sqlcode sqlerrm sqrt stddev substr substrb sum sysdate tan tanh to_char to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid upper user userenv variance vsize"),
     builtin:    set("bfile blob character clob dec float int integer mlslabel natural naturaln nchar nclob number numeric nvarchar2 real rowtype signtype smallint string varchar varchar2"),
     operatorChars: /^[*+\-%<>!=~]/,
-    dateSQL:    set("date time timestamp")
+    dateSQL:    set("date time timestamp"),
+    support:    set("nCharCast zerolessFloat")
   });
 }());
+
+/*
+  How Properties of Mime Types are used by SQL Mode
+  =================================================
+
+  keywords:
+    A list of keywords you want to be highlighted.
+  functions:
+    A list of function names you want to be highlighted.
+  builtin:
+    A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword").
+  operatorChars:
+    All characters that must be handled as operators.
+  client:
+    Commands parsed and executed by the client (not the server).
+  support:
+    A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
+    * ODBCdotTable: .tableName
+    * zerolessFloat: .1
+    * nCharCast: N'string'
+    * charsetCast: _utf8'string'
+  atoms:
+    Keywords that must be highlighted as atoms,. Some DBMS's support more atoms than others:
+    UNKNOWN, INFINITY, UNDERFLOW, NaN...
+  dateSQL:
+    Used for date/time SQL standard syntax, because not all DBMS's support same temporal types.
+*/

From ea47530e601568e3ea7951071d01f4516c9932c1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Jun 2013 11:01:48 +0200
Subject: [PATCH 0160/4742] Export changeEnd utility

See #1581
---
 doc/manual.html   | 10 +++++++++-
 lib/codemirror.js |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8c026476e7..ee1bbb253a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1523,9 +1523,17 @@ <h3 id="api_static">Static properties</h3>
       (with the instance as argument) whenever a new CodeMirror instance
       is initialized.</dd>
 
-      <dt id="Pos"><code><strong>Pos</strong>(line: integer, ?ch: integer)</code></dt>
+      <dt id="Pos"><code><strong>CodeMirror.Pos</strong>(line: integer, ?ch: integer)</code></dt>
       <dd>A constructor for the <code>{line, ch}</code> objects that
       are used to represent positions in editor documents.</dd>
+
+      <dt id="changeEnd"><code><strong>CodeMirror.changeEnd</strong>(change: object) → {line, ch}</code></dt>
+      <dd>Utility function that computes an end position from a change
+      (an object with <code>from</code>, <code>to</code>,
+      and <code>text</code> properties, as passed to
+      various <a href="#event_change">event handlers</a>). The
+      returned position will be the end of the changed
+      range, <em>after</em> the change is applied.</dd>
     </dl>
 
     <h2 id="addons">Add-ons</h2>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index db55f934d5..1ab54436a0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2161,11 +2161,11 @@ window.CodeMirror = (function() {
 
   // UPDATING
 
-  function changeEnd(change) {
+  var changeEnd = CodeMirror.changeEnd = function(change) {
     if (!change.text) return change.to;
     return Pos(change.from.line + change.text.length - 1,
                lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
-  }
+  };
 
   // Make sure a position will be valid after the given change.
   function clipPostChange(doc, change, pos) {

From 6c0a769cf82e81b44dda6905aab5e14967b2ad67 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Jun 2013 11:50:35 +0200
Subject: [PATCH 0161/4742] Fix bug in character measuring code for line
 containing only a multi-line widget

---
 demo/folding.html | 46 +++++++++++++++++++++-------------------------
 lib/codemirror.js | 23 ++++++++++-------------
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/demo/folding.html b/demo/folding.html
index e67531a0fc..dd78dc369a 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -26,44 +26,40 @@
   <body>
     <h1>CodeMirror: Code Folding Demo</h1>
 
-    <p>Demonstration of code folding using the code
-    in <a href="../addon/fold/foldcode.js"><code>foldcode.js</code></a>.
-    Press ctrl-q or click on the gutter to fold a block, again
-    to unfold.</p>
     <form>
-      <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
       <div style="max-width: 50em">HTML:<br><textarea id="code-html" name="code-html"></textarea></div>
     </form>
     <script id="script">
+
 window.onload = function() {
-  var te = document.getElementById("code");
-  var sc = document.getElementById("script");
-  te.value = (sc.textContent || sc.innerText || sc.innerHTML).replace(/^\s*/, "");
-  sc.innerHTML = "";
   var te_html = document.getElementById("code-html");
-  te_html.value = "<html>\n  " + document.documentElement.innerHTML + "\n</html>";
+  te_html.value = "two\n\nthree";
 
-  function foldJS(cm, where) { cm.foldCode(where, CodeMirror.braceRangeFinder); }
-  window.editor = CodeMirror.fromTextArea(te, {
-    mode: "javascript",
+  window.cm = CodeMirror.fromTextArea(te_html, {
+    mode: "text/html",
     lineNumbers: true,
     lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){foldJS(cm, cm.getCursor());}}
   });
-  editor.on("gutterClick", foldJS);
-  foldJS(editor, 9);
 
-  function foldHTML(cm, where) { cm.foldCode(where, CodeMirror.tagRangeFinder); }
-  window.editor_html = CodeMirror.fromTextArea(te_html, {
-    mode: "text/html",
-    lineNumbers: true,
-    lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){foldHTML(cm, cm.getCursor());}}
+  function makeWidget(options) {
+    var widget = (options && options.widget) || "\u2194";
+    if (typeof widget == "string") {
+      var text = document.createTextNode(widget);
+      widget = document.createElement("span");
+      widget.appendChild(text);
+      widget.className = "CodeMirror-foldmarker";
+    }
+    return widget;
+  }
+
+  var Pos = CodeMirror.Pos;
+
+  cm.markText(Pos(1, 0), Pos(2, 5), {
+    collapsed: true,
+    replacedWith: makeWidget()
   });
-  editor_html.on("gutterClick", foldHTML);
-  foldHTML(editor_html, 11);
-  foldHTML(editor_html, 1);
 };
+
 </script>
   </body>
 </html>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1ab54436a0..46a8a4b8a3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4183,14 +4183,12 @@ window.CodeMirror = (function() {
   }
 
   function lineContent(cm, realLine, measure) {
-    var merged, line = realLine, lineBefore, sawBefore, empty = true;
-    while (merged = collapsedSpanAtStart(line)) {
+    var merged, line = realLine, empty = true;
+    while (merged = collapsedSpanAtStart(line))
       line = getLine(cm.doc, merged.find().from.line);
-      if (!lineBefore) lineBefore = line;
-    }
 
     var builder = {pre: elt("pre"), col: 0, pos: 0, display: !measure,
-                   measure: null, addedOne: false, cm: cm};
+                   measure: null, measuredSomething: false, cm: cm};
     if (line.textClass) builder.pre.className = line.textClass;
 
     do {
@@ -4200,16 +4198,15 @@ window.CodeMirror = (function() {
       builder.addToken = builder.measure ? buildTokenMeasure : buildToken;
       if ((ie || webkit) && cm.getOption("lineWrapping"))
         builder.addToken = buildTokenSplitSpaces(builder.addToken);
-      if (measure && sawBefore && line != realLine && !builder.addedOne) {
+      var next = insertLineContent(line, builder, getLineStyles(cm, line));
+      if (measure && line == realLine && !builder.measuredSomething) {
         measure[0] = builder.pre.appendChild(zeroWidthElement(cm.display.measure));
-        builder.addedOne = true;
+        builder.measuredSomething = true;
       }
-      var next = insertLineContent(line, builder, getLineStyles(cm, line));
-      sawBefore = line == lineBefore;
       if (next) line = getLine(cm.doc, next.to.line);
     } while (next);
 
-    if (measure && !builder.addedOne)
+    if (measure && !builder.measuredSomething && !measure[0])
       measure[0] = builder.pre.appendChild(empty ? elt("span", "\u00a0") : zeroWidthElement(cm.display.measure));
     if (!builder.pre.firstChild && !lineIsHidden(cm.doc, realLine))
       builder.pre.appendChild(document.createTextNode("\u00a0"));
@@ -4293,7 +4290,7 @@ window.CodeMirror = (function() {
         span.style.whiteSpace = "normal";
       builder.pos += ch.length;
     }
-    if (text.length) builder.addedOne = true;
+    if (text.length) builder.measuredSomething = true;
   }
 
   function buildTokenSplitSpaces(inner) {
@@ -4312,9 +4309,9 @@ window.CodeMirror = (function() {
     if (widget) {
       if (!builder.display) widget = widget.cloneNode(true);
       builder.pre.appendChild(widget);
-      if (builder.measure && size) {
+      if (builder.measure) {
         builder.measure[builder.pos] = widget;
-        builder.addedOne = true;
+        builder.measuredSomething = true;
       }
     }
     builder.pos += size;

From 9ea6f4990bd9973108b9359f674c2ae2c6ed348e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Jun 2013 11:52:31 +0200
Subject: [PATCH 0162/4742] Restore accidentally commited changes

---
 demo/folding.html | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/demo/folding.html b/demo/folding.html
index dd78dc369a..e67531a0fc 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -26,40 +26,44 @@
   <body>
     <h1>CodeMirror: Code Folding Demo</h1>
 
+    <p>Demonstration of code folding using the code
+    in <a href="../addon/fold/foldcode.js"><code>foldcode.js</code></a>.
+    Press ctrl-q or click on the gutter to fold a block, again
+    to unfold.</p>
     <form>
+      <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
       <div style="max-width: 50em">HTML:<br><textarea id="code-html" name="code-html"></textarea></div>
     </form>
     <script id="script">
-
 window.onload = function() {
+  var te = document.getElementById("code");
+  var sc = document.getElementById("script");
+  te.value = (sc.textContent || sc.innerText || sc.innerHTML).replace(/^\s*/, "");
+  sc.innerHTML = "";
   var te_html = document.getElementById("code-html");
-  te_html.value = "two\n\nthree";
+  te_html.value = "<html>\n  " + document.documentElement.innerHTML + "\n</html>";
 
-  window.cm = CodeMirror.fromTextArea(te_html, {
-    mode: "text/html",
+  function foldJS(cm, where) { cm.foldCode(where, CodeMirror.braceRangeFinder); }
+  window.editor = CodeMirror.fromTextArea(te, {
+    mode: "javascript",
     lineNumbers: true,
     lineWrapping: true,
+    extraKeys: {"Ctrl-Q": function(cm){foldJS(cm, cm.getCursor());}}
   });
+  editor.on("gutterClick", foldJS);
+  foldJS(editor, 9);
 
-  function makeWidget(options) {
-    var widget = (options && options.widget) || "\u2194";
-    if (typeof widget == "string") {
-      var text = document.createTextNode(widget);
-      widget = document.createElement("span");
-      widget.appendChild(text);
-      widget.className = "CodeMirror-foldmarker";
-    }
-    return widget;
-  }
-
-  var Pos = CodeMirror.Pos;
-
-  cm.markText(Pos(1, 0), Pos(2, 5), {
-    collapsed: true,
-    replacedWith: makeWidget()
+  function foldHTML(cm, where) { cm.foldCode(where, CodeMirror.tagRangeFinder); }
+  window.editor_html = CodeMirror.fromTextArea(te_html, {
+    mode: "text/html",
+    lineNumbers: true,
+    lineWrapping: true,
+    extraKeys: {"Ctrl-Q": function(cm){foldHTML(cm, cm.getCursor());}}
   });
+  editor_html.on("gutterClick", foldHTML);
+  foldHTML(editor_html, 11);
+  foldHTML(editor_html, 1);
 };
-
 </script>
   </body>
 </html>

From 2a70c1f362906783a3ef2fa37e63eaeb0a3d96cd Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Mon, 10 Jun 2013 14:02:27 +0200
Subject: [PATCH 0163/4742] [sql mode] fix zeroless float syntax

---
 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 768410fb36..0c6e1fa133 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -63,7 +63,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       return state.tokenize(stream, state);
     } else if (ch == ".") {
       // .1 for 0.1
-      if (support.zerolessFloat == true && stream.match(/^(?:\d+(?:e\d*)?|\d*e\d+)/i)) {
+      if (support.zerolessFloat == true && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) {
         return "number";
       }
       // .table_name (ODBC)

From 25b4a5f81303c4001ba988e223ea6ce0eca0d614 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Jun 2013 10:41:15 +0200
Subject: [PATCH 0164/4742] Have the linter take an optional directory argument

---
 bin/lint | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/lint b/bin/lint
index 3b6338691e..6dd08b05c8 100755
--- a/bin/lint
+++ b/bin/lint
@@ -2,10 +2,12 @@
 
 var lint = require("../test/lint/lint");
 
-process.chdir(__dirname.slice(0, __dirname.lastIndexOf("/")));
-
-lint.checkDir("mode");
-lint.checkDir("lib");
-lint.checkDir("addon");
+if (process.argv.length > 2) {
+  lint.checkDir(process.argv[2]);
+} else {
+  process.chdir(__dirname.slice(0, __dirname.lastIndexOf("/")));
+  lint.checkDir("lib");
+  lint.checkDir("addon");
+}
 
 process.exit(lint.success() ? 0 : 1);

From 40e527cc94a4116d36f705cab6932f4eda747962 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Jun 2013 10:59:02 +0200
Subject: [PATCH 0165/4742] Measure size of inline widget *content*, not widget
 wrapper node

The height of an 'inline' element is pretty much meaningless.
---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 46a8a4b8a3..a3da356d54 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1064,7 +1064,8 @@ window.CodeMirror = (function() {
       var size;
       // A widget might wrap, needs special care
       if (/\bCodeMirror-widget\b/.test(cur.className) && cur.getClientRects) {
-        var rects = cur.getClientRects(), rLeft = rects[0], rRight = rects[rects.length - 1];
+        var rects = (cur.firstChild.nodeType == 1 ? cur.firstChild : cur).getClientRects();
+        var rLeft = rects[0], rRight = rects[rects.length - 1];
         if (rects.length == 1) {
           size = rLeft;
         } else {
@@ -1085,7 +1086,6 @@ window.CodeMirror = (function() {
       cur.top = vranges[vr]; cur.bottom = vranges[vr+1];
       if (vrRight != null) { cur.topRight = vranges[vrRight]; cur.bottomRight = vranges[vrRight+1]; }
     }
-
     return data;
   }
 

From cf4f05d4255b820ee903a91a2854b459cae9324b Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Mon, 10 Jun 2013 20:15:28 +0200
Subject: [PATCH 0166/4742] [sql mode] MySQL/MariaDB: add client commands \! \?
 \. \#

---
 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 0c6e1fa133..70a46f103f 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -226,7 +226,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     }
     // \g, etc
     // ref: http://dev.mysql.com/doc/refman/5.5/en/mysql-commands.html
-    return stream.match(/^[a-zA-Z]\b/) ? "variable-2" : null;
+    return stream.match(/^[a-zA-Z.#!?]/) ? "variable-2" : null;
   }
 
   // these keywords are used by all SQL dialects (however, a mode can still overwrite it)

From 0db3c6f4cd54e9744a8a3a462a9bc1c422f6f4cb Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Tue, 11 Jun 2013 00:40:58 +0200
Subject: [PATCH 0167/4742] [sql mode] Add support.commentHash and
 support.commentSpaceRequired to support Oracle comments

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

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 70a46f103f..7b54681c00 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -51,7 +51,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (/^[\(\),\;\[\]]/.test(ch)) {
       // no highlightning
       return null;
-    } else if (ch == "#" || (ch == "-" && stream.eat("-") && stream.eat(" "))) {
+    } else if ((support.commentHash && ch == "#")
+        || (ch == "-" && stream.eat("-") && (!support.commentSpaceRequired || stream.eat(" ")))) {
       // 1-line comments
       // ref: https://kb.askmonty.org/en/comment-syntax/
       stream.skipToEnd();
@@ -258,7 +259,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat nCharCast charsetCast"),
+    support: set("ODBCdotTable zerolessFloat nCharCast charsetCast commentHash commentSpaceRequired"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -274,7 +275,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat nCharCast charsetCast"),
+    support: set("ODBCdotTable zerolessFloat nCharCast charsetCast commentHash commentSpaceRequired"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -315,6 +316,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     * zerolessFloat: .1
     * nCharCast: N'string'
     * charsetCast: _utf8'string'
+    * commentHash: use # char for comments
+    * commentSpaceRequired: require a space after -- for comments
   atoms:
     Keywords that must be highlighted as atoms,. Some DBMS's support more atoms than others:
     UNKNOWN, INFINITY, UNDERFLOW, NaN...

From d7bdc14544c6d67b534544359da611c2e62aaf50 Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Tue, 11 Jun 2013 09:49:28 +0200
Subject: [PATCH 0168/4742] [sql mode] New mime-type: x-cassandra

* add x-cassandra
* add support.doubleQuote
* add support.commentSlashSlash
---
 mode/sql/index.html |  1 +
 mode/sql/sql.js     | 30 +++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index 52578132e0..acf60b88c3 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -56,6 +56,7 @@ <h1>SQL Mode for CodeMirror</h1>
             <code><a href="?mime=text/x-sql">text/x-sql</a></code>,
             <code><a href="?mime=text/x-mysql">text/x-mysql</a></code>,
             <code><a href="?mime=text/x-mariadb">text/x-mariadb</a></code>,
+            <code><a href="?mime=text/x-cassandra">text/x-cassandra</a></code>,
             <code><a href="?mime=text/x-plsql">text/x-plsql</a></code>.
         </p>
         <p>
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 7b54681c00..e4a8b934c5 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -37,7 +37,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
       // placeholders
       return "variable-3";
-    } else if (ch == '"' || ch == "'") {
+    } else if (ch == "'" || (ch == '"' && support.doubleQuote)) {
       // strings
       // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
       state.tokenize = tokenLiteral(ch);
@@ -51,6 +51,10 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (/^[\(\),\;\[\]]/.test(ch)) {
       // no highlightning
       return null;
+    } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) {
+      // 1-line comment
+      stream.skipToEnd();
+      return "comment";
     } else if ((support.commentHash && ch == "#")
         || (ch == "-" && stream.eat("-") && (!support.commentSpaceRequired || stream.eat(" ")))) {
       // 1-line comments
@@ -248,7 +252,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable")
+    support: set("ODBCdotTable doubleQuote")
   });
 
   CodeMirror.defineMIME("text/x-mysql", {
@@ -259,7 +263,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat nCharCast charsetCast commentHash commentSpaceRequired"),
+    support: set("ODBCdotTable zerolessFloat doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -275,7 +279,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat nCharCast charsetCast commentHash commentSpaceRequired"),
+    support: set("ODBCdotTable zerolessFloat doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -283,6 +287,20 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     }
   });
 
+  // the query language used by Apache Cassandra is called CQL, but this mime type
+  // is called Cassandra to avoid confusion with Contextual Query Language
+  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"),
+    operatorChars: /^[<>=]/,
+    dateSQL: { },
+    support: set("commentSlashSlash"),
+    hooks: { }
+  });
+
   // this is based on Peter Raganitsch's 'plsql' mode
   CodeMirror.defineMIME("text/x-plsql", {
     name:       "sql",
@@ -292,7 +310,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     builtin:    set("bfile blob character clob dec float int integer mlslabel natural naturaln nchar nclob number numeric nvarchar2 real rowtype signtype smallint string varchar varchar2"),
     operatorChars: /^[*+\-%<>!=~]/,
     dateSQL:    set("date time timestamp"),
-    support:    set("nCharCast zerolessFloat")
+    support:    set("doubleQuote nCharCast zerolessFloat")
   });
 }());
 
@@ -314,9 +332,11 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
     * ODBCdotTable: .tableName
     * zerolessFloat: .1
+    * doubleQuote
     * nCharCast: N'string'
     * charsetCast: _utf8'string'
     * commentHash: use # char for comments
+    * commentSlashSlash: use // for comments
     * commentSpaceRequired: require a space after -- for comments
   atoms:
     Keywords that must be highlighted as atoms,. Some DBMS's support more atoms than others:

From c00d86cf49bb1ed42a616ec3881c0bf85512bc9e Mon Sep 17 00:00:00 2001
From: Tomas Varaneckas <tomas.varaneckas@gmail.com>
Date: Tue, 11 Jun 2013 20:52:44 +0300
Subject: [PATCH 0169/4742] [lint addon] Introduce CoffeeScript linter

---
 addon/lint/coffeescript-lint.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 addon/lint/coffeescript-lint.js

diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
new file mode 100644
index 0000000000..9c30de51c2
--- /dev/null
+++ b/addon/lint/coffeescript-lint.js
@@ -0,0 +1,24 @@
+// Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
+
+CodeMirror.coffeeValidator = function(text) {
+  var found = [];
+  var parseError = function(err) {
+    var loc = err.lineNumber;
+    found.push({from: CodeMirror.Pos(loc-1, 0),
+                to: CodeMirror.Pos(loc, 0),
+                severity: err.level,
+                message: err.message});
+  };
+  try {
+    var res = coffeelint.lint(text);
+    for(var i = 0; i < res.length; i++) {
+      parseError(res[i]);
+    }
+  } catch(e) {
+    found.push({from: CodeMirror.Pos(e.location.first_line, 0),
+                to: CodeMirror.Pos(e.location.last_line, e.location.last_column),
+                severity: 'error',
+                message: e.message});
+  }
+  return found;
+};

From 27faa43065df1d8c0b14a5f60aaaeb7d0069433b Mon Sep 17 00:00:00 2001
From: jeffkenton <kenton@adobe.com>
Date: Tue, 11 Jun 2013 14:48:08 -0400
Subject: [PATCH 0170/4742] [clike mode] Add shader language mode

New mime types x-shader/x-vertex (vertex shaders) and
x-shader/x-fragment.
---
 mode/clike/clike.js | 56 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 09621bc08d..3fcc1a757b 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -302,4 +302,60 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
     }
   });
+  mimes(["x-shader/x-vertex", "x-shader/x-fragment"], {
+    name: "clike",
+    keywords: words("float int bool void " +
+                    "vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 " +
+                    "mat2 mat3 mat4 " +
+                    "sampler1D sampler2D sampler3D samplerCube " +
+                    "sampler1DShadow sampler2DShadow" +
+                    "const attribute uniform varying " +
+                    "break continue discard return " +
+                    "for while do if else struct " +
+                    "in out inout"),
+    blockKeywords: words("for while do if else struct"),
+    builtin: words("radians degrees sin cos tan asin acos atan " +
+                    "pow exp log exp2 sqrt inversesqrt " +
+                    "abs sign floor ceil fract mod min max clamp mix step smootstep " +
+                    "length distance dot cross normalize ftransform faceforward " +
+                    "reflect refract matrixCompMult " +
+                    "lessThan lessThanEqual greaterThan greaterThanEqual " +
+                    "equal notEqual any all not " +
+                    "texture1D texture1DProj texture1DLod texture1DProjLod " +
+                    "texture2D texture2DProj texture2DLod texture2DProjLod " +
+                    "texture3D texture3DProj texture3DLod texture3DProjLod " +
+                    "textureCube textureCubeLod " +
+                    "shadow1D shadow2D shadow1DProj shadow2DProj " +
+                    "shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod " +
+                    "dFdx dFdy fwidth " +
+                    "noise1 noise2 noise3 noise4"),
+    atoms: words("true false " +
+                "gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex " +
+                "gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 " +
+                "gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 " +
+                "gl_FogCoord " +
+                "gl_Position gl_PointSize gl_ClipVertex " +
+                "gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor " +
+                "gl_TexCoord gl_FogFragCoord " +
+                "gl_FragCoord gl_FrontFacing " +
+                "gl_FragColor gl_FragData gl_FragDepth " +
+                "gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix " +
+                "gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse " +
+                "gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse " +
+                "gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose " +
+                "gl_ProjectionMatrixInverseTranspose " +
+                "gl_ModelViewProjectionMatrixInverseTranspose " +
+                "gl_TextureMatrixInverseTranspose " +
+                "gl_NormalScale gl_DepthRange gl_ClipPlane " +
+                "gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel " +
+                "gl_FrontLightModelProduct gl_BackLightModelProduct " +
+                "gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ " +
+                "gl_FogParameters " +
+                "gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords " +
+                "gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats " +
+                "gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits " +
+                "gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits " +
+                "gl_MaxDrawBuffers"),
+    hooks: {"#": cppHook}
+  });
 }());

From a75ba7e6daa9115bf8957a1bb498c9a5cabbce2e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Jun 2013 11:42:57 +0200
Subject: [PATCH 0171/4742] [javascript mode] Add doubleIndentSwitch option

Default is still true.

Closes #1592
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d15ffea5f6..6435e138d6 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -451,7 +451,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       else if (type == "form") return lexical.indented + indentUnit;
       else if (type == "stat")
         return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? statementIndent || indentUnit : 0);
-      else if (lexical.info == "switch" && !closing)
+      else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
         return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
       else if (lexical.align) return lexical.column + (closing ? 0 : 1);
       else return lexical.indented + (closing ? 0 : indentUnit);

From 10a4a7a8ba69ed8dd3652a61d19c734dc5bc72d6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Jun 2013 12:08:09 +0200
Subject: [PATCH 0172/4742] Fire events for DOM events that the editor handles

Deprecate onKeyEvent and onDragEvent
---
 doc/manual.html   | 25 +++++++++++++++++++------
 lib/codemirror.js | 24 +++++++++++++++++-------
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index ee1bbb253a..eef360eb80 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -282,17 +282,21 @@ <h2 id="config">Configuration</h2>
       <dd>Controls whether drag-and-drop is enabled. On by default.</dd>
 
       <dt id="option_onDragEvent"><code><strong>onDragEvent</strong>: function(instance: CodeMirror, event: Event) → boolean</code></dt>
-      <dd>When given, this will be called when the editor is handling
+      <dd><em>Deprecated! See <a href="#event_dom">these</a> event
+      handlers for the current recommended approach.</em><br>When given,
+      this will be called when the editor is handling
       a <code>dragenter</code>, <code>dragover</code>,
-      or <code>drop</code> event. It will be passed the editor instance
-      and the event object as arguments. The callback can choose to
-      handle the event itself, in which case it should
+      or <code>drop</code> event. It will be passed the editor
+      instance and the event object as arguments. The callback can
+      choose to handle the event itself, in which case it should
       return <code>true</code> to indicate that CodeMirror should not
       do anything further.</dd>
 
       <dt id="option_onKeyEvent"><code><strong>onKeyEvent</strong>: function(instance: CodeMirror, event: Event) → boolean</code></dt>
-      <dd>This provides a rather low-level hook into CodeMirror's key
-      handling. If provided, this function will be called on
+      <dd><em>Deprecated! See <a href="#event_dom">these</a> event
+      handlers for the current recommended approach.</em><br>This
+      provides a rather low-level hook into CodeMirror's key handling.
+      If provided, this function will be called on
       every <code>keydown</code>, <code>keyup</code>,
       and <code>keypress</code> event that CodeMirror captures. It
       will be passed two arguments, the editor instance and the key
@@ -471,6 +475,15 @@ <h2 id="events">Events</h2>
       added to the document. The handler may mess with the style of
       the resulting element, or add event handlers, but
       should <em>not</em> try to change the state of the editor.</dd>
+
+      <dt id="event_dom"><code><strong>"mousedown"</strong>,
+      <strong>"dblclick"</strong>, <strong>"keydown"</strong>, <strong>"keypress"</strong>,
+      <strong>"keyup"</strong>, <strong>"dragstart"</strong>, <strong>"dragenter"</strong>,
+      <strong>"dragover"</strong>, <strong>"drop"</strong>
+      (instance: CodeMirror, event: Event)</code></dt>
+      <dd>Fired when CodeMirror is handling a DOM event of this type.
+      You can <code>preventDefault</code> the event to signal that
+      CodeMirror should do no further handling.</dd>
     </dl>
 
     <p>It is also possible to <a href="#on">register</a> events on
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a3da356d54..c709a589c7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1495,6 +1495,7 @@ window.CodeMirror = (function() {
     on(d.scroller, "mousedown", operation(cm, onMouseDown));
     if (ie)
       on(d.scroller, "dblclick", operation(cm, function(e) {
+        if (signalDOMEvent(cm, e)) return;
         var pos = posFromMouse(cm, e);
         if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
         e_preventDefault(e);
@@ -1502,7 +1503,7 @@ window.CodeMirror = (function() {
         extendSelection(cm.doc, word.from, word.to);
       }));
     else
-      on(d.scroller, "dblclick", e_preventDefault);
+      on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
     on(d.lineSpace, "selectstart", function(e) {
       if (!eventInWidget(d, e)) e_preventDefault(e);
     });
@@ -1556,7 +1557,7 @@ window.CodeMirror = (function() {
     setTimeout(unregister, 5000);
 
     on(d.input, "keyup", operation(cm, function(e) {
-      if (cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
+      if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
       if (e.keyCode == 16) cm.doc.sel.shift = false;
     }));
     on(d.input, "input", bind(fastPoll, cm));
@@ -1566,7 +1567,7 @@ window.CodeMirror = (function() {
     on(d.input, "blur", bind(onBlur, cm));
 
     function drag_(e) {
-      if (cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))) return;
+      if (signalDOMEvent(cm, e) || cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))) return;
       e_stop(e);
     }
     if (cm.options.dragDrop) {
@@ -1625,6 +1626,7 @@ window.CodeMirror = (function() {
 
   var lastClick, lastDoubleClick;
   function onMouseDown(e) {
+    if (signalDOMEvent(this, e)) return;
     var cm = this, display = cm.display, doc = cm.doc, sel = doc.sel;
     sel.shift = e.shiftKey;
 
@@ -1794,7 +1796,7 @@ window.CodeMirror = (function() {
 
   function onDrop(e) {
     var cm = this;
-    if (eventInWidget(cm.display, e) || (cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))))
+    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e) || (cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))))
       return;
     e_preventDefault(e);
     if (ie) lastDrop = +new Date;
@@ -1839,7 +1841,7 @@ window.CodeMirror = (function() {
 
   function onDragStart(cm, e) {
     if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
-    if (eventInWidget(cm.display, e)) return;
+    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
 
     var txt = cm.getSelection();
     e.dataTransfer.setData("Text", txt);
@@ -2047,7 +2049,7 @@ window.CodeMirror = (function() {
     var cm = this;
     if (!cm.state.focused) onFocus(cm);
     if (ie && e.keyCode == 27) { e.returnValue = false; }
-    if (cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
+    if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
     var code = e.keyCode;
     // IE does strange things with escape.
     cm.doc.sel.shift = code == 16 || e.shiftKey;
@@ -2063,7 +2065,7 @@ window.CodeMirror = (function() {
 
   function onKeyPress(e) {
     var cm = this;
-    if (cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
+    if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
     var keyCode = e.keyCode, charCode = e.charCode;
     if (opera && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
     if (((opera && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
@@ -5088,6 +5090,9 @@ window.CodeMirror = (function() {
     if (e.stopPropagation) e.stopPropagation();
     else e.cancelBubble = true;
   }
+  function e_defaultPrevented(e) {
+    return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;
+  }
   function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
   CodeMirror.e_stop = e_stop;
   CodeMirror.e_preventDefault = e_preventDefault;
@@ -5154,6 +5159,11 @@ window.CodeMirror = (function() {
       delayedCallbacks.push(bnd(arr[i]));
   }
 
+  function signalDOMEvent(cm, e) {
+    signal(cm, e.type, cm, e);
+    return e_defaultPrevented(e);
+  }
+
   function fireDelayed() {
     --delayedCallbackDepth;
     var delayed = delayedCallbacks;

From ea47c30a9252b9020a79aa65de9b2df7346baa42 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Jun 2013 12:36:44 +0200
Subject: [PATCH 0173/4742] Ensure coordsChar sets 'after' properly for clicks
 before the start of line

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c709a589c7..2b2219b8ad 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1241,7 +1241,7 @@ window.CodeMirror = (function() {
     // Do a binary search between these bounds.
     for (;;) {
       if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-        var after = x - fromX <= toX - x, ch = after ? from : to;
+        var after = x >= fromX && x - fromX <= toX - x, ch = x < fromX || after ? from : to;
         while (isExtendingChar.test(lineObj.text.charAt(ch))) ++ch;
         var pos = PosWithInfo(lineNo, ch, after ? fromOutside : toOutside, after);
         return pos;
@@ -2742,7 +2742,7 @@ window.CodeMirror = (function() {
       y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
     }
     for (;;) {
-      var target = coordsChar(cm, x, y);
+      var target = coordsChar(cm, x - .5, y);
       if (!target.outside) break;
       if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }
       y += dir * 5;

From 187a0cb5f10c8df5e4f7bf1914bf9a7183a7614e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Jun 2013 13:59:41 +0200
Subject: [PATCH 0174/4742] Better solution to storing relative x position in
 coordsChar return value

It now has an xRel property that can be -1, 0, or 1, rather than a boolean after.

This way, we can distinguish between precise matches and coords after the
returned position.
---
 lib/codemirror.js | 35 ++++++++++++++++++-----------------
 test/driver.js    |  2 +-
 test/test.js      |  8 +++++++-
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2b2219b8ad..234f4aee8a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1061,21 +1061,20 @@ window.CodeMirror = (function() {
     }
 
     for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {
-      var size;
+      var size, elt = cur;
       // A widget might wrap, needs special care
       if (/\bCodeMirror-widget\b/.test(cur.className) && cur.getClientRects) {
-        var rects = (cur.firstChild.nodeType == 1 ? cur.firstChild : cur).getClientRects();
-        var rLeft = rects[0], rRight = rects[rects.length - 1];
-        if (rects.length == 1) {
-          size = rLeft;
-        } else {
+        if (cur.firstChild.nodeType == 1) elt = cur.firstChild;
+        var rects = elt.getClientRects(), rLeft = rects[0], rRight = rects[rects.length - 1];
+        if (rects.length > 1) {
           var vCatLeft = categorizeVSpan(rLeft.top - outer.top, rLeft.bottom - outer.top);
           var vCatRight = categorizeVSpan(rRight.top - outer.top, rRight.bottom - outer.top);
           data[i] = {left: rLeft.left - outer.left, right: rRight.right - outer.left,
                      top: vCatLeft, topRight: vCatRight};
           continue;
         }
-      } else size = getRect(cur);
+      }
+      size = getRect(elt);
       var vCat = categorizeVSpan(size.top - outer.top, size.bottom - outer.top);
       var right = size.right;
       if (cur.measureRight) right = getRect(cur.measureRight).left;
@@ -1189,10 +1188,10 @@ window.CodeMirror = (function() {
     return val;
   }
 
-  function PosWithInfo(line, ch, outside, after) {
+  function PosWithInfo(line, ch, outside, xRel) {
     var pos = new Pos(line, ch);
+    pos.xRel = xRel;
     if (outside) pos.outside = true;
-    if (after) pos.after = true;
     return pos;
   }
 
@@ -1200,10 +1199,10 @@ window.CodeMirror = (function() {
   function coordsChar(cm, x, y) {
     var doc = cm.doc;
     y += cm.display.viewOffset;
-    if (y < 0) return PosWithInfo(doc.first, 0, true);
+    if (y < 0) return PosWithInfo(doc.first, 0, true, -1);
     var lineNo = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
     if (lineNo > last)
-      return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, true);
+      return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);
     if (x < 0) x = 0;
 
     for (;;) {
@@ -1211,7 +1210,7 @@ window.CodeMirror = (function() {
       var found = coordsCharInner(cm, lineObj, lineNo, x, y);
       var merged = collapsedSpanAtEnd(lineObj);
       var mergedPos = merged && merged.find();
-      if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.after))
+      if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
         lineNo = mergedPos.to.line;
       else
         return found;
@@ -1237,13 +1236,15 @@ window.CodeMirror = (function() {
     var from = lineLeft(lineObj), to = lineRight(lineObj);
     var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;
 
-    if (x > toX) return PosWithInfo(lineNo, to, toOutside, true);
+    if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1);
     // Do a binary search between these bounds.
     for (;;) {
       if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-        var after = x >= fromX && x - fromX <= toX - x, ch = x < fromX || after ? from : to;
+        var ch = x < fromX || x - fromX <= toX - x ? from : to;
+        var xDiff = (ch == from ? fromX : toX) - x;
         while (isExtendingChar.test(lineObj.text.charAt(ch))) ++ch;
-        var pos = PosWithInfo(lineNo, ch, after ? fromOutside : toOutside, after);
+        var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,
+                              xDiff < 0 ? -1 : xDiff ? 1 : 0);
         return pos;
       }
       var step = Math.ceil(dist / 2), middle = from + step;
@@ -2742,7 +2743,7 @@ window.CodeMirror = (function() {
       y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
     }
     for (;;) {
-      var target = coordsChar(cm, x - .5, y);
+      var target = coordsChar(cm, x, y);
       if (!target.outside) break;
       if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }
       y += dir * 5;
@@ -2753,7 +2754,7 @@ window.CodeMirror = (function() {
   function findWordAt(line, pos) {
     var start = pos.ch, end = pos.ch;
     if (line) {
-      if (pos.after === false || end == line.length) --start; else ++end;
+      if (pos.xRel < 0 || end == line.length) --start; else ++end;
       var startChar = line.charAt(start);
       var check = isWordChar(startChar) ? isWordChar
         : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
diff --git a/test/driver.js b/test/driver.js
index ae79c328fe..8c32ec7faa 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -26,7 +26,7 @@ function test(name, run, expectedFail) {
 var namespace = "";
 function testCM(name, run, opts, expectedFail) {
   return test(namespace + name, function() {
-    var place = document.getElementById("testground"), cm = CodeMirror(place, opts);
+    var place = document.getElementById("testground"), cm = window.cm = CodeMirror(place, opts);
     var successful = false;
     try {
       run(cm);
diff --git a/test/test.js b/test/test.js
index f34f3ced7b..b9dd77a9d4 100644
--- a/test/test.js
+++ b/test/test.js
@@ -736,7 +736,7 @@ testCM("structuredFold", function(cm) {
   eq(cm.getValue(), "xxxx\nxxxx\nxxxx");
   addDoc(cm, 4, 8);
   range = cm.markText(Pos(1, 2), Pos(6, 2), {
-    replacedWith: document.createTextNode("x"),
+    replacedWith: document.createTextNode("M"),
     clearOnEnter: true
   });
   var cleared = 0;
@@ -757,6 +757,12 @@ testCM("structuredFold", function(cm) {
   cm.setCursor(1, 2);
   CodeMirror.commands.goCharRight(cm);
   eqPos(cm.getCursor(), Pos(1, 3));
+  range = cm.markText(Pos(2, 0), Pos(4, 4), {
+    replacedWith: document.createTextNode("M")
+  });
+  cm.setCursor(1, 0);
+  CodeMirror.commands.goLineDown(cm);
+  eqPos(cm.getCursor(), Pos(2, 0));
 }, null);
 
 testCM("nestedFold", function(cm) {

From 61b939dbaa386fdab4b3e989dbb003b67c3411c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Jun 2013 14:02:49 +0200
Subject: [PATCH 0175/4742] Disable another test that fails on Phantom

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

diff --git a/test/test.js b/test/test.js
index b9dd77a9d4..2bcc450288 100644
--- a/test/test.js
+++ b/test/test.js
@@ -723,6 +723,7 @@ testCM("everythingFolded", function(cm) {
 });
 
 testCM("structuredFold", function(cm) {
+  if (phantom) return;
   addDoc(cm, 4, 8);
   var range = cm.markText(Pos(1, 2), Pos(6, 2), {
     replacedWith: document.createTextNode("Q")

From 3cf3cd46f1bf38920bf64ad64d5b4682a4a3792c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Jun 2013 15:32:59 +0200
Subject: [PATCH 0176/4742] Enable the linter for the keymap/ directory

---
 bin/lint        |   2 +
 keymap/emacs.js |   6 +--
 keymap/vim.js   | 129 ++++++++++++++----------------------------------
 3 files changed, 42 insertions(+), 95 deletions(-)

diff --git a/bin/lint b/bin/lint
index 6dd08b05c8..bbb85b6c26 100755
--- a/bin/lint
+++ b/bin/lint
@@ -7,7 +7,9 @@ if (process.argv.length > 2) {
 } else {
   process.chdir(__dirname.slice(0, __dirname.lastIndexOf("/")));
   lint.checkDir("lib");
+  lint.checkDir("mode");
   lint.checkDir("addon");
+  lint.checkDir("keymap");
 }
 
 process.exit(lint.success() ? 0 : 1);
diff --git a/keymap/emacs.js b/keymap/emacs.js
index b9750bc9c2..8727121ceb 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -108,7 +108,7 @@
 
   function getPrefix(cm, precise) {
     var digits = cm.state.emacsPrefix;
-    if (!digits) return 1;
+    if (!digits) return precise ? null : 1;
     clearPrefix(cm);
     return digits == "-" ? -1 : Number(digits);
   }
@@ -181,7 +181,7 @@
   function addPrefixMap(cm) {
     cm.state.emacsPrefixMap = true;
     cm.addKeyMap(prefixMap);
-    cm.on("keyHandled", maybeRemovePrefixMap);                          
+    cm.on("keyHandled", maybeRemovePrefixMap);
     cm.on("inputRead", maybeRemovePrefixMap);
   }
 
@@ -189,7 +189,7 @@
     if (typeof arg == "string" && (/^\d$/.test(arg) || arg == "Ctrl-U")) return;
     cm.removeKeyMap(prefixMap);
     cm.state.emacsPrefixMap = false;
-    cm.off("keyHandled", maybeRemovePrefixMap);                          
+    cm.off("keyHandled", maybeRemovePrefixMap);
     cm.off("inputRead", maybeRemovePrefixMap);
   }
 
diff --git a/keymap/vim.js b/keymap/vim.js
index ac331b9f65..88f9595d19 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -190,8 +190,8 @@
         motionArgs: {toJumplist: true}},
     { keys: ['`', 'character'], type: 'motion', motion: 'goToMark',
         motionArgs: {toJumplist: true}},
-    { keys: [']', '`',], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
-    { keys: ['[', '`',], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
+    { keys: [']', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
+    { keys: ['[', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
     { keys: [']', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
     { keys: ['[', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
     { keys: [']', 'character'], type: 'motion',
@@ -315,9 +315,7 @@
   ];
 
   var Vim = function() {
-    var alphabetRegex = /[A-Za-z]/;
     var numberRegex = /[\d]/;
-    var whiteSpaceRegex = /\s/;
     var wordRegexp = [(/\w/), (/[^\w\s]/)], bigWordRegexp = [(/\S/)];
     function makeKeyRange(start, size) {
       var keys = [];
@@ -338,9 +336,6 @@
     var validRegisters = upperCaseAlphabet.concat(lowerCaseAlphabet).concat(
         numbers).concat('-\"'.split(''));
 
-    function isAlphabet(k) {
-      return alphabetRegex.test(k);
-    }
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
     }
@@ -356,18 +351,9 @@
     function isUpperCase(k) {
       return (/^[A-Z]$/).test(k);
     }
-    function isAlphanumeric(k) {
-      return (/^[\w]$/).test(k);
-    }
-    function isWhiteSpace(k) {
-      return whiteSpaceRegex.test(k);
-    }
     function isWhiteSpaceString(k) {
       return (/^\s*$/).test(k);
     }
-    function inRangeInclusive(x, start, end) {
-      return x >= start && x <= end;
-    }
     function inArray(val, arr) {
       for (var i = 0; i < arr.length; i++) {
         if (arr[i] == val) {
@@ -464,8 +450,8 @@
               '(recording)['+registerName+']', null, {bottom:true});
           }
         }
-      }
-    }
+      };
+    };
 
     // Global Vim state. Call getVimGlobalState to get and initialize.
     var vimGlobalState;
@@ -514,7 +500,7 @@
           insertModeRepeat: undefined,
           visualMode: false,
           // If we are in visual line mode. No effect if visualMode is false.
-          visualLine: false,
+          visualLine: false
         };
       }
       return cm.vimState;
@@ -894,7 +880,7 @@
         vim.inputState = new InputState();
         vim.lastMotion = null;
         if (command.isEdit) {
-          this.recordLastEdit(cm, vim, inputState, command);
+          this.recordLastEdit(vim, inputState, command);
         }
         actions[command.action](cm, actionArgs, vim);
       },
@@ -925,11 +911,11 @@
           cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
           handleQuery(query, true /** ignoreCase */, true /** smartCase */);
         }
-        function onPromptKeyUp(e, query) {
+        function onPromptKeyUp(_e, query) {
           var parsedQuery;
           try {
             parsedQuery = updateSearchQuery(cm, query,
-                true /** ignoreCase */, true /** smartCase */)
+                true /** ignoreCase */, true /** smartCase */);
           } catch (e) {
             // Swallow bad regexes for incremental search.
           }
@@ -940,7 +926,7 @@
             cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
           }
         }
-        function onPromptKeyDown(e, query, close) {
+        function onPromptKeyDown(e, _query, close) {
           var keyName = CodeMirror.keyName(e);
           if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
             updateSearchQuery(cm, originalQuery);
@@ -1000,7 +986,7 @@
           // an error, the elements don't overlap.
           window.setTimeout(10, exCommandDispatcher.processCommand(cm, input));
         }
-        function onPromptKeyDown(e, input, close) {
+        function onPromptKeyDown(e, _input, close) {
           var keyName = CodeMirror.keyName(e);
           if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
             CodeMirror.e_stop(e);
@@ -1039,7 +1025,7 @@
         var curEnd;
         var repeat;
         if (operator) {
-          this.recordLastEdit(cm, vim, inputState);
+          this.recordLastEdit(vim, inputState);
         }
         if (inputState.repeatOverride !== undefined) {
           // If repeatOverride is specified, that takes precedence over the
@@ -1170,7 +1156,7 @@
           }
         }
       },
-      recordLastEdit: function(cm, vim, inputState, actionCommand) {
+      recordLastEdit: function(vim, inputState, actionCommand) {
         var macroModeState = getVimGlobalState().macroModeState;
         if (macroModeState.inReplay) { return; }
         vim.lastEditInputState = inputState;
@@ -1205,7 +1191,7 @@
         var cur = cm.getCursor();
         return { line: cur.line + motionArgs.repeat - 1, ch: Infinity };
       },
-      findNext: function(cm, motionArgs, vim) {
+      findNext: function(cm, motionArgs) {
         var state = getSearchState(cm);
         var query = state.getQuery();
         if (!query) {
@@ -1217,7 +1203,7 @@
         highlightSearchMatches(cm, query);
         return findNext(cm, prev/** prev */, query, motionArgs.repeat);
       },
-      goToMark: function(cm, motionArgs, vim) {
+      goToMark: function(_cm, motionArgs, vim) {
         var mark = vim.marks[motionArgs.selectedCharacter];
         if (mark) {
           return mark.find();
@@ -1234,7 +1220,7 @@
             }
             var mark = vim.marks[key].find();
             var isWrongDirection = (motionArgs.forward) ?
-              cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark)
+              cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark);
 
             if (isWrongDirection) {
               continue;
@@ -1355,7 +1341,6 @@
         return { line: line, ch: 0 };
       },
       moveByScroll: function(cm, motionArgs, vim) {
-        var globalState = getVimGlobalState();
         var scrollbox = cm.getScrollInfo();
         var curEnd = null;
         var repeat = motionArgs.repeat;
@@ -1407,7 +1392,7 @@
       moveToEol: function(cm, motionArgs, vim) {
         var cur = cm.getCursor();
         vim.lastHPos = Infinity;
-        var retval={ line: cur.line + motionArgs.repeat - 1, ch: Infinity }
+        var retval={ line: cur.line + motionArgs.repeat - 1, ch: Infinity };
         var end=cm.clipPos(retval);
         end.ch--;
         vim.lastHSPos = cm.charCoords(end,"div").left;
@@ -1420,7 +1405,7 @@
         return { line: cursor.line,
             ch: findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)) };
       },
-      moveToMatchedSymbol: function(cm, motionArgs) {
+      moveToMatchedSymbol: function(cm) {
         var cursor = cm.getCursor();
         var line = cursor.line;
         var ch = cursor.ch;
@@ -1482,7 +1467,7 @@
         motionArgs.inclusive = forward ? true : false;
         var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
         if (!curEnd) {
-          cm.moveH(increment, 'char')
+          cm.moveH(increment, 'char');
           return cm.getCursor();
         }
         curEnd.ch += increment;
@@ -1491,7 +1476,7 @@
     };
 
     var operators = {
-      change: function(cm, operatorArgs, vim, curStart, curEnd) {
+      change: function(cm, operatorArgs, _vim, curStart, curEnd) {
         getVimGlobalState().registerController.pushText(
             operatorArgs.registerName, 'change', cm.getRange(curStart, curEnd),
             operatorArgs.linewise);
@@ -1522,7 +1507,7 @@
         cm.setCursor(curStart);
       },
       // delete is a javascript keyword.
-      'delete': function(cm, operatorArgs, vim, curStart, curEnd) {
+      'delete': function(cm, operatorArgs, _vim, curStart, curEnd) {
         // If the ending line is past the last line, inclusive, instead of
         // including the trailing \n, include the \n before the starting line
         if (operatorArgs.linewise &&
@@ -1560,7 +1545,7 @@
         cm.setCursor(curStart);
         cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
       },
-      swapcase: function(cm, operatorArgs, vim, curStart, curEnd, curOriginal) {
+      swapcase: function(cm, _operatorArgs, _vim, curStart, curEnd, curOriginal) {
         var toSwap = cm.getRange(curStart, curEnd);
         var swapped = '';
         for (var i = 0; i < toSwap.length; i++) {
@@ -1571,7 +1556,7 @@
         cm.replaceRange(swapped, curStart, curEnd);
         cm.setCursor(curOriginal);
       },
-      yank: function(cm, operatorArgs, vim, curStart, curEnd, curOriginal) {
+      yank: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
         getVimGlobalState().registerController.pushText(
             operatorArgs.registerName, 'yank',
             cm.getRange(curStart, curEnd), operatorArgs.linewise);
@@ -1621,7 +1606,7 @@
           executeMacroKeyBuffer(cm, macroModeState, keyBuffer);
         }
       },
-      exitMacroRecordMode: function(cm, actionArgs) {
+      exitMacroRecordMode: function() {
         var macroModeState = getVimGlobalState().macroModeState;
         macroModeState.toggle();
         parseKeyBufferToRegister(macroModeState.latestRegister,
@@ -1762,7 +1747,7 @@
         }
         this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
       },
-      paste: function(cm, actionArgs, vim) {
+      paste: function(cm, actionArgs) {
         var cur = cm.getCursor();
         var register = getVimGlobalState().registerController.getRegister(
             actionArgs.registerName);
@@ -1813,7 +1798,7 @@
       redo: function(cm, actionArgs) {
         repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)();
       },
-      setRegister: function(cm, actionArgs, vim) {
+      setRegister: function(_cm, actionArgs, vim) {
         vim.inputState.registerName = actionArgs.selectedCharacter;
       },
       setMark: function(cm, actionArgs, vim) {
@@ -1856,7 +1841,7 @@
           }
         }
       },
-      incrementNumberToken: function(cm, actionArgs, vim) {
+      incrementNumberToken: function(cm, actionArgs) {
         var cur = cm.getCursor();
         var lineStr = cm.getLine(cur.line);
         var re = /-?\d+/g;
@@ -1942,14 +1927,6 @@
       var ch = Math.min(Math.max(0, cur.ch), maxCh);
       return { line: line, ch: ch };
     }
-    // Merge arguments in place, for overriding arguments.
-    function mergeArgs(to, from) {
-      for (var prop in from) {
-        if (from.hasOwnProperty(prop)) {
-          to[prop] = from[prop];
-        }
-      }
-    }
     function copyArgs(args) {
       var ret = {};
       for (var prop in args) {
@@ -1962,17 +1939,6 @@
     function offsetCursor(cur, offsetLine, offsetCh) {
       return { line: cur.line + offsetLine, ch: cur.ch + offsetCh };
     }
-    function arrayEq(a1, a2) {
-      if (a1.length != a2.length) {
-        return false;
-      }
-      for (var i = 0; i < a1.length; i++) {
-        if (a1[i] != a2[i]) {
-          return false;
-        }
-      }
-      return true;
-    }
     function matchKeysPartial(pressed, mapped) {
       for (var i = 0; i < pressed.length; i++) {
         // 'character' means any character. For mark, register commads, etc.
@@ -1982,14 +1948,6 @@
       }
       return true;
     }
-    function arrayIsSubsetFromBeginning(small, big) {
-      for (var i = 0; i < small.length; i++) {
-        if (small[i] != big[i]) {
-          return false;
-        }
-      }
-      return true;
-    }
     function repeatFn(cm, fn, repeat) {
       return function() {
         for (var i = 0; i < repeat; i++) {
@@ -2066,7 +2024,6 @@
         // Find the line containing the last word, and clip all whitespace up
         // to it.
         for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) {
-          var clipped = false;
           curEnd.line--;
           curEnd.ch = 0;
         }
@@ -2081,7 +2038,7 @@
     }
 
     // Expand the selection to line ends.
-    function expandSelectionToLine(cm, curStart, curEnd) {
+    function expandSelectionToLine(_cm, curStart, curEnd) {
       curStart.ch = 0;
       curEnd.ch = 0;
       curEnd.line++;
@@ -2095,7 +2052,7 @@
       return firstNonWS == -1 ? text.length : firstNonWS;
     }
 
-    function expandWordUnderCursor(cm, inclusive, forward, bigWord, noSymbol) {
+    function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
       var cur = cm.getCursor();
       var line = cm.getLine(cur.line);
       var idx = cur.ch;
@@ -2553,16 +2510,6 @@
       return { start: start, end: end };
     }
 
-    function regexLastIndexOf(string, pattern, startIndex) {
-      for (var i = !startIndex ? string.length : startIndex;
-          i >= 0; --i) {
-        if (pattern.test(string.charAt(i))) {
-          return i;
-        }
-      }
-      return -1;
-    }
-
     // Takes in a symbol and a cursor and tries to simulate text objects that
     // have identical opening and closing symbols
     // TODO support across multiple lines
@@ -2682,7 +2629,7 @@
      *   then both ignoreCase and smartCase are ignored, and 'i' will be passed
      *   through to the Regex object.
      */
-    function parseQuery(cm, query, ignoreCase, smartCase) {
+    function parseQuery(query, ignoreCase, smartCase) {
       // Check if the query is already a regex.
       if (query instanceof RegExp) { return query; }
       // First try to extract regex + flags from the input. If no flags found,
@@ -2758,7 +2705,7 @@
         return;
       }
       var state = getSearchState(cm);
-      var query = parseQuery(cm, rawQuery, !!ignoreCase, !!smartCase);
+      var query = parseQuery(rawQuery, !!ignoreCase, !!smartCase);
       if (!query) {
         return;
       }
@@ -3156,7 +3103,7 @@
         if (unique) { // Remove duplicate lines
           var textOld = text;
           var lastLine;
-          text = []
+          text = [];
           for (var i = 0; i < textOld.length; i++) {
             if (textOld[i] != lastLine) {
               text.push(textOld[i]);
@@ -3352,7 +3299,7 @@
           vim.lastHPos = vim.lastHSPos = lastPos.ch;
         }
       }
-      function onPromptKeyDown(e, value, close) {
+      function onPromptKeyDown(e, _value, close) {
         // Swallow all keys.
         CodeMirror.e_stop(e);
         var keyName = CodeMirror.keyName(e);
@@ -3428,7 +3375,6 @@
         };
       }
 
-      var modifiers = ['Shift', 'Ctrl'];
       var cmToVimKeymap = {
         'nofallthrough': true,
         'disableInput': true,
@@ -3461,7 +3407,7 @@
     CodeMirror.keyMap.vim = buildVimKeyMap();
 
     function exitInsertMode(cm) {
-      var vim = getVimState(cm)
+      var vim = getVimState(cm);
       vim.insertMode = false;
       var inReplay = getVimGlobalState().macroModeState.inReplay;
       if (!inReplay) {
@@ -3547,7 +3493,7 @@
      * Listens for changes made in insert mode.
      * Should only be active in insert mode.
      */
-    function onChange(cm, changeObj) {
+    function onChange(_cm, changeObj) {
       var macroModeState = getVimGlobalState().macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       while (changeObj) {
@@ -3567,7 +3513,7 @@
     * - For tracking cursor activity in insert mode.
     * - Should only be active in insert mode.
     */
-    function onCursorActivity(cm) {
+    function onCursorActivity() {
       var macroModeState = getVimGlobalState().macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       if (lastChange.expectCursorActivityForChange) {
@@ -3592,12 +3538,12 @@
       var macroModeState = getVimGlobalState().macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       var keyName = CodeMirror.keyName(e);
-      function onKeyFound(binding) {
+      function onKeyFound() {
         lastChange.changes.push(new InsertModeKey(keyName));
         return true;
       }
       if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
-        CodeMirror.lookupKey(keyName, ['vim-insert'], onKeyFound)
+        CodeMirror.lookupKey(keyName, ['vim-insert'], onKeyFound);
       }
     }
 
@@ -3611,7 +3557,6 @@
      * corresponding enterInsertMode call was made with a count.
      */
     function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
-      var lastEditInputState = vim.lastEditInputState;
       var macroModeState = getVimGlobalState().macroModeState;
       macroModeState.inReplay = true;
       var isAction = !!vim.lastEditActionCommand;

From d3665c39cef8f4d0f68adfc210d9a013e8d73586 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Wed, 12 Jun 2013 06:36:30 -0600
Subject: [PATCH 0177/4742] lint keymap

```
$ test/run.js
keymap/emacs.js: Trailing whitespace at line 184, column 71
keymap/emacs.js: Unused argument precise (109:25)
keymap/vim.js: Unexpected token (193:22)
```
---
 test/run.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/run.js b/test/run.js
index 5588d6f388..52221be5a2 100755
--- a/test/run.js
+++ b/test/run.js
@@ -5,6 +5,7 @@ var lint = require("./lint/lint");
 lint.checkDir("mode");
 lint.checkDir("lib");
 lint.checkDir("addon");
+lint.checkDir("keymap");
 
 var ok = lint.success();
 

From bb73aeacb8be450b86cecddf171eaab2907a4b09 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Wed, 12 Jun 2013 12:09:52 -0400
Subject: [PATCH 0178/4742] [ruby mode] Colorize instance variable
 interpolation in double quoted strings

---
 mode/ruby/ruby.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 883244b1c7..1a2f9677be 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -117,9 +117,14 @@ CodeMirror.defineMode("ruby", function(config) {
           state.tokenize.pop();
           break;
         }
-        if (embed && ch == "#" && !escaped && stream.eat("{")) {
-          state.tokenize.push(tokenBaseUntilBrace(arguments.callee));
-          break;
+        if (embed && ch == "#" && !escaped) {
+          if (stream.eat("{")) {
+            state.tokenize.push(tokenBaseUntilBrace(arguments.callee));
+            break;
+          } else if (stream.eat("@")) {
+            stream.eatWhile(/[\w\?]/);
+            return "variable-2";
+          }
         }
         escaped = !escaped && ch == "\\";
       }

From 5f227ae876d3e4fb865502fd4da27ac11edf4860 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Jun 2013 22:59:17 +0200
Subject: [PATCH 0179/4742] [manual] Link to list of externally hosted addons

---
 doc/manual.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index eef360eb80..b6cf5c209e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -39,10 +39,10 @@ <h2 id="overview">Overview</h2>
     component, no accompanying buttons, auto-completion, or other IDE
     functionality. It does provide a rich API on top of which such
     functionality can be straightforwardly implemented. See
-    the <a href="#addons">add-ons</a> included in the distribution,
-    and
-    the <a href="https://github.com/jagthedrummer/codemirror-ui">CodeMirror
-    UI</a> project, for reusable implementations of extra features.</p>
+    the <a href="#addons">addons</a> included in the distribution,
+    and the <a href="https://github.com/marijnh/CodeMirror/wiki/CodeMirror-addons">list
+    of externally hosted addons</a>, for reusable
+    implementations of extra features.</p>
 
     <p>CodeMirror works with language-specific modes. Modes are
     JavaScript programs that help color (and optionally indent) text
@@ -713,7 +713,7 @@ <h2 id="styling">Customized Styling</h2>
       with this class.</dd>
 
       <dt id="class_CodeMirror_matchingbracket"><code><strong>CodeMirror-matchingbracket</strong></code>,
-        <code>CodeMirror-nonmatchingbracket</code></dt>
+        <code><strong>CodeMirror-nonmatchingbracket</strong></code></dt>
       <dd>These are used to style matched (or unmatched) brackets.</dd>
     </dl>
 

From ff82d0755439fc7f6af09dabec9ae300ca0f834e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 13 Jun 2013 17:48:08 +0200
Subject: [PATCH 0180/4742] Add heightAtLine method

---
 doc/manual.html   | 7 +++++++
 lib/codemirror.js | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index b6cf5c209e..d7e82bfb7f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1344,6 +1344,13 @@ <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>
+      <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
+      defaults to <code>"page"</code>. When a line below the bottom of
+      the document is specified, the returned value is the bottom of
+      the last line in the document.</dd>
       <dt id="defaultTextHeight"><code><strong>cm.defaultTextHeight</strong>() → number</code></dt>
       <dd>Returns the line height of the default font for the editor.</dd>
       <dt id="defaultCharWidth"><code><strong>cm.defaultCharWidth</strong>() → number</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 234f4aee8a..f5dc7e6813 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2882,6 +2882,14 @@ window.CodeMirror = (function() {
       height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
       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);
+      return intoCoordSystem(this, getLine(this.doc, line), {top: 0, left: 0}, mode || "page").top +
+        (end ? lineObj.height : 0);
+    },
 
     defaultTextHeight: function() { return textHeight(this.display); },
     defaultCharWidth: function() { return charWidth(this.display); },

From 839e47b8dd5e59392228db9a4c58216091a512d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 13 Jun 2013 18:51:52 +0200
Subject: [PATCH 0181/4742] [vim keymap] Fix bogus setTimeout call

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 88f9595d19..46bd09c9da 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -984,7 +984,7 @@
         function onPromptClose(input) {
           // Give the prompt some time to close so that if processCommand shows
           // an error, the elements don't overlap.
-          window.setTimeout(10, exCommandDispatcher.processCommand(cm, input));
+          exCommandDispatcher.processCommand(cm, input);
         }
         function onPromptKeyDown(e, _input, close) {
           var keyName = CodeMirror.keyName(e);

From 2de0b1c0cb09d86dbd1c74d15adf7e8dc1526ec4 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Wed, 12 Jun 2013 14:26:16 -0400
Subject: [PATCH 0182/4742] [ruby mode] Various improvements

* Handle default string % literal for Ruby

  %{Hello World} == %q{Hello World}

  One gotcha though:

  5%(2) == 5 % 2

  Will be seen as a string, but it will be interpreted
  as the modulo operator by ruby.

* Variables names can't include a ? nor a !

* Improve symbols parsing rules

  - can be operators (e.g :+, :/, :-, :>>)
  - start with @ or $
  - end with !, ? or =
  - can't start by a digit

  Though when defined in reverse as hash keys (e.g {foo: 'bar'})

  - can only start with [a-zA-Z\_]
  - can't end with =

* Instance and class variables can't start by a digit but globals can be only digits

* Add some missing keywords

  Actually only __END__ is really a keyword.
  But __FILE__, __LINE__ and __dir__ are special variables so most editors highlight them as keywords.

* Several regexp improvements

  - Use the string-2 class for regexps like JS mode
  - Xonsider %r as a regexp
  - Handle interpolation inside regexps

  It allow to colorize properly stuffs like:

  ```ruby
/foo #{1 + 2}/
%r{foo #{@bar} baz}
```

* Fix parsing of brace enclosed string literals with interpolation

  As an example:

  ```ruby
%Q{foo #{42} baz #{26} fizz}
```
  The coloration was broken after the first interpolation.
---
 mode/ruby/ruby.js | 80 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 17 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 1a2f9677be..af0ffe9e54 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -10,7 +10,7 @@ CodeMirror.defineMode("ruby", function(config) {
     "redo", "rescue", "retry", "return", "self", "super", "then", "true", "undef", "unless",
     "until", "when", "while", "yield", "nil", "raise", "throw", "catch", "fail", "loop", "callcc",
     "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
-    "require_relative", "extend", "autoload"
+    "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
   ]);
   var indentWords = wordObj(["def", "class", "case", "for", "while", "do", "module", "then",
                              "catch", "loop", "proc", "begin"]);
@@ -31,14 +31,16 @@ CodeMirror.defineMode("ruby", function(config) {
     }
     if (stream.eatSpace()) return null;
     var ch = stream.next(), m;
-    if (ch == "`" || ch == "'" || ch == '"' ||
-        (ch == "/" && !stream.eol() && stream.peek() != " ")) {
+    if (ch == "`" || ch == "'" || ch == '"') {
       return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
+    } else if (ch == "/" && !stream.eol() && stream.peek() != " ") {
+      return chain(readQuoted(ch, "string-2", true), stream, state);
     } else if (ch == "%") {
-      var style, embed = false;
+      var style = "string", embed = false;
       if (stream.eat("s")) style = "atom";
       else if (stream.eat(/[WQ]/)) { style = "string"; embed = true; }
-      else if (stream.eat(/[wxqr]/)) style = "string";
+      else if (stream.eat(/[r]/)) { style = "string-2"; embed = true; }
+      else if (stream.eat(/[wxq]/)) style = "string";
       var delim = stream.eat(/[^\w\s]/);
       if (!delim) return "operator";
       if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
@@ -64,18 +66,42 @@ CodeMirror.defineMode("ruby", function(config) {
     } else if (ch == ":") {
       if (stream.eat("'")) return chain(readQuoted("'", "atom", false), stream, state);
       if (stream.eat('"')) return chain(readQuoted('"', "atom", true), stream, state);
-      stream.eatWhile(/[\w\?]/);
-      return "atom";
-    } else if (ch == "@") {
+
+      // :> :>> :< :<< are valid symbols
+      if (stream.eat(/[\<\>]/)) {
+        stream.eat(/[\<\>]/);
+        return "atom";
+      }
+
+      // :+ :- :/ :* :| :& :! are valid symbols
+      if (stream.eat(/[\+\-\*\/\&\|\:\!]/)) {
+        return "atom";
+      }
+
+      // Symbols can't start by a digit
+      if (stream.eat(/[a-zA-Z$@_]/)) {
+        stream.eatWhile(/[\w]/);
+        // Only one ? ! = is allowed and only as the last character
+        stream.eat(/[\?\!\=]/);
+        return "atom";
+      }
+      return "operator";
+    } else if (ch == "@" && stream.match(/^@?[a-zA-Z_]/)) {
       stream.eat("@");
-      stream.eatWhile(/[\w\?]/);
+      stream.eatWhile(/[\w]/);
       return "variable-2";
     } else if (ch == "$") {
-      stream.next();
-      stream.eatWhile(/[\w\?]/);
+      if (stream.eat(/[a-zA-Z_]/)) {
+        stream.eatWhile(/[\w]/);
+      } else if (stream.eat(/\d/)) {
+        stream.eat(/\d/);
+      } else {
+        stream.next(); // Must be a special global like $: or $!
+      }
       return "variable-3";
-    } else if (/\w/.test(ch)) {
-      stream.eatWhile(/[\w\?]/);
+    } else if (/[a-zA-Z_]/.test(ch)) {
+      stream.eatWhile(/[\w]/);
+      stream.eat(/[\?\!]/);
       if (stream.eat(":")) return "atom";
       return "ident";
     } else if (ch == "|" && (state.varList || state.lastTok == "{" || state.lastTok == "do")) {
@@ -109,9 +135,26 @@ CodeMirror.defineMode("ruby", function(config) {
       return tokenBase(stream, state);
     };
   }
+  function tokenBaseOnce() {
+    var alreadyCalled = false;
+    return function(stream, state) {
+      if (alreadyCalled) {
+        state.tokenize.pop();
+        return state.tokenize[state.tokenize.length-1](stream, state);
+      }
+      alreadyCalled = true;
+      return tokenBase(stream, state);
+    };
+  }
   function readQuoted(quote, style, embed, unescaped) {
     return function(stream, state) {
       var escaped = false, ch;
+
+      if (state.context.type === 'read-quoted-paused') {
+        state.context = state.context.prev;
+        stream.eat("}");
+      }
+
       while ((ch = stream.next()) != null) {
         if (ch == quote && (unescaped || !escaped)) {
           state.tokenize.pop();
@@ -119,11 +162,14 @@ CodeMirror.defineMode("ruby", function(config) {
         }
         if (embed && ch == "#" && !escaped) {
           if (stream.eat("{")) {
-            state.tokenize.push(tokenBaseUntilBrace(arguments.callee));
+            if (quote == "}") {
+              state.context = {prev: state.context, type: 'read-quoted-paused'};
+            }
+            state.tokenize.push(tokenBaseUntilBrace());
+            break;
+          } else if (/[@\$]/.test(stream.peek())) {
+            state.tokenize.push(tokenBaseOnce());
             break;
-          } else if (stream.eat("@")) {
-            stream.eatWhile(/[\w\?]/);
-            return "variable-2";
           }
         }
         escaped = !escaped && ch == "\\";

From 7fc7a1f51d39fd82a7ad4e9ba611c73413cbdc72 Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Thu, 13 Jun 2013 10:50:27 +0200
Subject: [PATCH 0183/4742] [sql mode] number syntaxes with specific mime types

* hex not supported by cassandra
* binary not supported by cassandra
* new syntax: "1." (mysql,mariadb,oracle)
---
 mode/sql/sql.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index e4a8b934c5..9016cc7aae 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -19,20 +19,23 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       if (result !== false) return result;
     }
 
-    if ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/))
-      || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/)) {
+    if (support.hexNumber == true &&
+      ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/))
+      || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/))) {
       // hex
       // ref: http://dev.mysql.com/doc/refman/5.5/en/hexadecimal-literals.html
       return "number";
-    } else if (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
-      || (ch == "0" && stream.match(/^b[01]+/))) {
+    } else if (support.binaryNumber == true &&
+      (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
+      || (ch == "0" && stream.match(/^b[01]+/)))) {
       // bitstring
       // ref: http://dev.mysql.com/doc/refman/5.5/en/bit-field-literals.html
       return "number";
     } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
       // numbers
       // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
-      stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
+          stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
+      support.decimallessFloat == true && stream.eat('.');
       return "number";
     } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
       // placeholders
@@ -252,7 +255,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable doubleQuote")
+    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
   });
 
   CodeMirror.defineMIME("text/x-mysql", {
@@ -263,7 +266,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -279,7 +282,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable zerolessFloat doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -297,7 +300,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true"),
     operatorChars: /^[<>=]/,
     dateSQL: { },
-    support: set("commentSlashSlash"),
+    support: set("commentSlashSlash decimallessFloat"),
     hooks: { }
   });
 
@@ -310,7 +313,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     builtin:    set("bfile blob character clob dec float int integer mlslabel natural naturaln nchar nclob number numeric nvarchar2 real rowtype signtype smallint string varchar varchar2"),
     operatorChars: /^[*+\-%<>!=~]/,
     dateSQL:    set("date time timestamp"),
-    support:    set("doubleQuote nCharCast zerolessFloat")
+    support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")
   });
 }());
 

From 321e53b2008192bc25f6badbd4a3d04698bf0937 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Jun 2013 09:49:54 +0200
Subject: [PATCH 0184/4742] Fix bug in addLineClass/removeLineClass

\b can match the inside of a class name (-).
---
 lib/codemirror.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f5dc7e6813..ee54767d9a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2919,7 +2919,7 @@ window.CodeMirror = (function() {
       return changeLine(this, handle, function(line) {
         var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
         if (!line[prop]) line[prop] = cls;
-        else if (new RegExp("\\b" + cls + "\\b").test(line[prop])) return false;
+        else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
         else line[prop] += " " + cls;
         return true;
       });
@@ -2932,9 +2932,10 @@ window.CodeMirror = (function() {
         if (!cur) return false;
         else if (cls == null) line[prop] = null;
         else {
-          var upd = cur.replace(new RegExp("^" + cls + "\\b\\s*|\\s*\\b" + cls + "\\b"), "");
-          if (upd == cur) return false;
-          line[prop] = upd || null;
+          var found = cur.match(new RegExp("(?:^|\\s+)" + cls + "(?:$|\\s+)"));
+          if (!found) return false;
+          var end = found.index + found[0].length;
+          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
         }
         return true;
       });

From 52558bf921b61ac194b1e71be4ab3c8cda50aa06 Mon Sep 17 00:00:00 2001
From: Narciso Jaramillo <njaramil@adobe.com>
Date: Thu, 13 Jun 2013 11:38:16 -0700
Subject: [PATCH 0185/4742] Add 'precise' option to getTokenAt() and
 getStateBefore() that ignores possibly dirty line states

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

diff --git a/doc/manual.html b/doc/manual.html
index d7e82bfb7f..fb87954725 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1389,7 +1389,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="getTokenAt"><code><strong>cm.getTokenAt</strong>(pos: {line, ch}) → object</code></dt>
+      <dt id="getTokenAt"><code><strong>cm.getTokenAt</strong>(pos: {line, ch}, ?precise: boolean) → object</code></dt>
       <dd>Retrieves information about the token the current mode found
       before the given position (a <code>{line, ch}</code> object). The
       returned object has the following properties:
@@ -1401,14 +1401,19 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
         to the token, such as <code>"keyword"</code>
         or <code>"comment"</code> (may also be null).</dd>
         <dt><code><strong>state</strong></code></dt><dd>The mode's state at the end of this token.</dd>
-      </dl></dd>
+      </dl>
+      If <code>precise</code> is true, the token will be guaranteed to be accurate based on recent edits. If false or
+      not specified, the token will use cached state information, which will be faster but might not be accurate if
+      edits were recently made and highlighting has not yet completed.
+      </dd>
 
-      <dt id="getStateAfter"><code><strong>cm.getStateAfter</strong>(?line: integer) → object</code></dt>
+      <dt id="getStateAfter"><code><strong>cm.getStateAfter</strong>(?line: integer, ?precise: boolean) → object</code></dt>
       <dd>Returns the mode's parser state, if any, at the end of the
       given line number. If no line number is given, the state at the
       end of the document is returned. This can be useful for storing
       parsing errors in the state, or getting other kinds of
-      contextual information for a line.</dd>
+      contextual information for a line. <code>precise</code> is defined
+      as in <code>getTokenAt()</code>.</dd>
     </dl>
 
     <h3 id="api_misc">Miscellaneous methods</h3>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ee54767d9a..0c16c8a16e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -917,12 +917,12 @@ window.CodeMirror = (function() {
   // valid state. If that fails, it returns the line with the
   // smallest indentation, which tends to need the least context to
   // parse correctly.
-  function findStartLine(cm, n) {
+  function findStartLine(cm, n, precise) {
     var minindent, minline, doc = cm.doc;
     for (var search = n, lim = n - 100; search > lim; --search) {
       if (search <= doc.first) return doc.first;
       var line = getLine(doc, search - 1);
-      if (line.stateAfter) return search;
+      if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
       var indented = countColumn(line.text, null, cm.options.tabSize);
       if (minline == null || minindent > indented) {
         minline = search - 1;
@@ -932,10 +932,10 @@ window.CodeMirror = (function() {
     return minline;
   }
 
-  function getStateBefore(cm, n) {
+  function getStateBefore(cm, n, precise) {
     var doc = cm.doc, display = cm.display;
       if (!doc.mode.startState) return true;
-    var pos = findStartLine(cm, n), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
+    var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
     if (!state) state = startState(doc.mode);
     else state = copyState(doc.mode, state);
     doc.iter(pos, n, function(line) {
@@ -2837,10 +2837,10 @@ window.CodeMirror = (function() {
 
     // Fetch the parser token for a given character. Useful for hacks
     // that want to inspect the mode state (say, for completion).
-    getTokenAt: function(pos) {
+    getTokenAt: function(pos, precise) {
       var doc = this.doc;
       pos = clipPos(doc, pos);
-      var state = getStateBefore(this, pos.line), mode = this.doc.mode;
+      var state = getStateBefore(this, pos.line, precise), mode = this.doc.mode;
       var line = getLine(doc, pos.line);
       var stream = new StringStream(line.text, this.options.tabSize);
       while (stream.pos < pos.ch && !stream.eol()) {
@@ -2855,10 +2855,10 @@ window.CodeMirror = (function() {
               state: state};
     },
 
-    getStateAfter: function(line) {
+    getStateAfter: function(line, precise) {
       var doc = this.doc;
       line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
-      return getStateBefore(this, line + 1);
+      return getStateBefore(this, line + 1, precise);
     },
 
     cursorCoords: function(start, mode) {

From 313ea27a9f00d7bc8ebd71b80f6cfa57d5fcd28f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Jun 2013 17:35:13 +0200
Subject: [PATCH 0186/4742] [resize demo] Restore doctype

Which had been accidentally removed.
---
 demo/resize.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/resize.html b/demo/resize.html
index 5778d56f33..7badc2bfbb 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <html>
   <head>
     <meta charset="utf-8">

From e1567eda05495ec643fb15dd86500ea736af2e50 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Jun 2013 17:52:50 +0200
Subject: [PATCH 0187/4742] IE10 fixes

Makes the test suite run again.

Main problem was an accidentally shadowed variable that was only
used on IE.

Closes #1607
---
 lib/codemirror.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0c16c8a16e..4bf29937e7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1061,11 +1061,11 @@ window.CodeMirror = (function() {
     }
 
     for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {
-      var size, elt = cur;
+      var size, node = cur;
       // A widget might wrap, needs special care
       if (/\bCodeMirror-widget\b/.test(cur.className) && cur.getClientRects) {
-        if (cur.firstChild.nodeType == 1) elt = cur.firstChild;
-        var rects = elt.getClientRects(), rLeft = rects[0], rRight = rects[rects.length - 1];
+        if (cur.firstChild.nodeType == 1) node = cur.firstChild;
+        var rects = node.getClientRects(), rLeft = rects[0], rRight = rects[rects.length - 1];
         if (rects.length > 1) {
           var vCatLeft = categorizeVSpan(rLeft.top - outer.top, rLeft.bottom - outer.top);
           var vCatRight = categorizeVSpan(rRight.top - outer.top, rRight.bottom - outer.top);
@@ -1074,7 +1074,7 @@ window.CodeMirror = (function() {
           continue;
         }
       }
-      size = getRect(elt);
+      size = getRect(node);
       var vCat = categorizeVSpan(size.top - outer.top, size.bottom - outer.top);
       var right = size.right;
       if (cur.measureRight) right = getRect(cur.measureRight).left;
@@ -5228,7 +5228,11 @@ window.CodeMirror = (function() {
     if (ios) { // Mobile Safari apparently has a bug where select() is broken.
       node.selectionStart = 0;
       node.selectionEnd = node.value.length;
-    } else node.select();
+    } else {
+      // Suppress mysterious IE10 errors
+      try { node.select(); }
+      catch(_e) {}
+    }
   }
 
   function indexOf(collection, elt) {

From a6698dc68c81b31cece9aaf437c413658086a45a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Jun 2013 19:07:09 +0200
Subject: [PATCH 0188/4742] [real-world uses] Add WebKit Web inspector

---
 doc/realworld.html | 1 +
 index.html         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index f90b0f5a13..e4a7f13972 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -101,6 +101,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
       <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a> (code viewer)</li>
       <li><a href="http://webglplayground.net/">WebGL playground</a></li>
+      <li><a href="https://www.webkit.org/blog/2518/state-of-web-inspector/#source-code">WebKit Web inspector</a></li>
       <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
       <li><a href="http://wordpress.org/extend/plugins/codemirror-for-codeeditor/">WordPress plugin</a></li>
       <li><a href="http://www.xosystem.org/home/applications_websites/xosystem_website/xoside_EN.php">XOSide</a> (online editor)</li>
diff --git a/index.html b/index.html
index 94d9b10483..7940aa6f04 100644
--- a/index.html
+++ b/index.html
@@ -122,6 +122,7 @@ <h2>Real-world uses:</h2>
     <ul>
       <li><a href="http://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light Table</a></li>
       <li><a href="http://brackets.io">Adobe Brackets</a></li>
+      <li><a href="https://www.webkit.org/blog/2518/state-of-web-inspector/#source-code">WebKit Web inspector</a></li>
       <li><a href="http://jsbin.com">jsbin.com</a></li>
       <li><a href="http://jsfiddle.net">jsfiddle.net</a></li>
       <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a></li>

From f00bd25b8d8206f321b91abeb04b07b6b4a35dcc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Jun 2013 11:34:19 +0200
Subject: [PATCH 0189/4742] Fix inverted computation of relative x in
 coordsChar

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4bf29937e7..d1dd02703b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1241,7 +1241,7 @@ window.CodeMirror = (function() {
     for (;;) {
       if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
         var ch = x < fromX || x - fromX <= toX - x ? from : to;
-        var xDiff = (ch == from ? fromX : toX) - x;
+        var xDiff = x - (ch == from ? fromX : toX);
         while (isExtendingChar.test(lineObj.text.charAt(ch))) ++ch;
         var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,
                               xDiff < 0 ? -1 : xDiff ? 1 : 0);

From 5e26b0eef41912b2ca55a3d559b80a756857fde3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Jun 2013 11:44:07 +0200
Subject: [PATCH 0190/4742] Fix problem with character measuring around widgets

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d1dd02703b..a62960b014 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -837,7 +837,6 @@ window.CodeMirror = (function() {
     if (sel.from.line == sel.to.line) {
       drawForLine(sel.from.line, sel.from.ch, sel.to.ch);
     } else {
-      // This is a single, merged line
       var fromLine = getLine(doc, sel.from.line), toLine = getLine(doc, sel.to.line);
       var singleVLine = visualLine(doc, fromLine) == visualLine(doc, toLine);
       var leftEnd = drawForLine(sel.from.line, sel.from.ch, singleVLine ? fromLine.text.length : null).end;
@@ -4320,11 +4319,12 @@ window.CodeMirror = (function() {
   function buildCollapsedSpan(builder, size, widget) {
     if (widget) {
       if (!builder.display) widget = widget.cloneNode(true);
-      builder.pre.appendChild(widget);
       if (builder.measure) {
-        builder.measure[builder.pos] = widget;
+        builder.measure[builder.pos] = size ? widget
+          : builder.pre.appendChild(zeroWidthElement(cm.display.measure));
         builder.measuredSomething = true;
       }
+      builder.pre.appendChild(widget);
     }
     builder.pos += size;
   }

From d4e1b8c1c29b015e4879c4c6263346d59f7db366 Mon Sep 17 00:00:00 2001
From: Chris Granger <ibdknox@gmail.com>
Date: Sun, 16 Jun 2013 20:00:14 -0600
Subject: [PATCH 0191/4742] fix typo from
 5e26b0eef41912b2ca55a3d559b80a756857fde3

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a62960b014..395ba3ff2e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4321,7 +4321,7 @@ window.CodeMirror = (function() {
       if (!builder.display) widget = widget.cloneNode(true);
       if (builder.measure) {
         builder.measure[builder.pos] = size ? widget
-          : builder.pre.appendChild(zeroWidthElement(cm.display.measure));
+          : builder.pre.appendChild(zeroWidthElement(builder.cm.display.measure));
         builder.measuredSomething = true;
       }
       builder.pre.appendChild(widget);

From 737d1b48e38f064dec7fe67221e972a264e4a54a Mon Sep 17 00:00:00 2001
From: Joseph Pecoraro <pecoraro@apple.com>
Date: Wed, 12 Jun 2013 11:51:32 -0700
Subject: [PATCH 0192/4742] Cmd-Backspace should delete from the start of the
 line to the cursor on Mac

---
 lib/codemirror.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 395ba3ff2e..1c61686911 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3327,6 +3327,10 @@ window.CodeMirror = (function() {
       var l = cm.getCursor().line;
       cm.replaceRange("", Pos(l, 0), Pos(l), "+delete");
     },
+    delLineLeft: function(cm) {
+      var cur = cm.getCursor();
+      cm.replaceRange("", Pos(cur.line, 0), cur, "+delete");
+    },
     undo: function(cm) {cm.undo();},
     redo: function(cm) {cm.redo();},
     goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
@@ -3422,7 +3426,7 @@ window.CodeMirror = (function() {
     "Alt-Right": "goGroupRight", "Cmd-Left": "goLineStart", "Cmd-Right": "goLineEnd", "Alt-Backspace": "delGroupBefore",
     "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
     "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
-    "Cmd-[": "indentLess", "Cmd-]": "indentMore",
+    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delLineLeft",
     fallthrough: ["basic", "emacsy"]
   };
   keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;

From b1c895c3b4b0a1bbcdfde5ad3fa523a3eb2da552 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Jun 2013 11:41:22 +0200
Subject: [PATCH 0193/4742] [extra keymap] Add, including only move-line
 functionality

Issue #1616
---
 demo/theme.html |  1 +
 keymap/extra.js | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 keymap/extra.js

diff --git a/demo/theme.html b/demo/theme.html
index 0f979f73aa..147a89ff14 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -23,6 +23,7 @@
     <link rel="stylesheet" href="../theme/twilight.css">
     <link rel="stylesheet" href="../theme/midnight.css">
     <script src="../mode/javascript/javascript.js"></script>
+    <script src="../keymap/extra.js"></script>
     <link rel="stylesheet" href="../doc/docs.css">
 
     <style type="text/css">
diff --git a/keymap/extra.js b/keymap/extra.js
new file mode 100644
index 0000000000..95a2fc4f14
--- /dev/null
+++ b/keymap/extra.js
@@ -0,0 +1,44 @@
+// A number of additional default bindings that are too obscure to
+// include in the core codemirror.js file.
+
+(function() {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+
+  function moveLines(cm, start, end, dist) {
+    if (!dist || start > end) return 0;
+
+    var from = cm.clipPos(Pos(start, 0)), to = cm.clipPos(Pos(end));
+    var text = cm.getRange(from, to);
+
+    if (start <= cm.firstLine())
+      cm.replaceRange("", from, Pos(to.line + 1, 0));
+    else
+      cm.replaceRange("", Pos(from.line - 1), to);
+    var target = from.line + dist;
+    if (target <= cm.firstLine()) {
+      cm.replaceRange(text + "\n", Pos(target, 0));
+      return cm.firstLine() - from.line;
+    } else {
+      var targetPos = cm.clipPos(Pos(target - 1));
+      cm.replaceRange("\n" + text, targetPos);
+      return targetPos.line + 1 - from.line;
+    }
+  }
+    
+  function moveSelectedLines(cm, dist) {
+    var head = cm.getCursor("head"), anchor = cm.getCursor("anchor");
+    var inv = (head.line - anchor.line || head.ch - anchor.ch) < 0;
+    cm.operation(function() {
+      var moved = moveLines(cm, Math.min(head.line, anchor.line), Math.max(head.line, anchor.line), dist);
+      cm.setSelection(Pos(anchor.line + moved, anchor.ch), Pos(head.line + moved, head.ch));
+    });
+  }
+
+  CodeMirror.commands.moveLinesUp = function(cm) { moveSelectedLines(cm, -1); };
+  CodeMirror.commands.moveLinesDown = function(cm) { moveSelectedLines(cm, 1); };
+
+  CodeMirror.keyMap["default"]["Alt-Up"] = "moveLinesUp";
+  CodeMirror.keyMap["default"]["Alt-Down"] = "moveLinesDown";
+})();

From 6272823eae3b9627950100bea978c16e0f322ca4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Jun 2013 11:46:23 +0200
Subject: [PATCH 0194/4742] Make linter happy

---
 keymap/extra.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keymap/extra.js b/keymap/extra.js
index 95a2fc4f14..18dd5a979d 100644
--- a/keymap/extra.js
+++ b/keymap/extra.js
@@ -26,10 +26,9 @@
       return targetPos.line + 1 - from.line;
     }
   }
-    
+
   function moveSelectedLines(cm, dist) {
     var head = cm.getCursor("head"), anchor = cm.getCursor("anchor");
-    var inv = (head.line - anchor.line || head.ch - anchor.ch) < 0;
     cm.operation(function() {
       var moved = moveLines(cm, Math.min(head.line, anchor.line), Math.max(head.line, anchor.line), dist);
       cm.setSelection(Pos(anchor.line + moved, anchor.ch), Pos(head.line + moved, head.ch));

From d762b2141f8c75c2e2178cc57363e62d064e8dca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Jun 2013 12:32:34 +0200
Subject: [PATCH 0195/4742] [xml-fold addon] Export findMatchingTag
 functionality

---
 addon/fold/xml-fold.js | 149 ++++++++++++++++++++++++++++++-----------
 1 file changed, 109 insertions(+), 40 deletions(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 58f2b934cc..4dbb4dafca 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -1,64 +1,133 @@
-CodeMirror.tagRangeFinder = (function() {
+(function() {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+
   var nameStartChar = "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
   var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
   var xmlTagStart = new RegExp("<(/?)([" + nameStartChar + "][" + nameChar + "]*)", "g");
 
-  return function(cm, start) {
-    var line = start.line, ch = 0, lineText = cm.getLine(line);
+  function Iter(cm, line, ch) {
+    this.line = line; this.ch = ch;
+    this.cm = cm; this.text = cm.getLine(line);
+  }
 
-    function nextLine() {
-      if (line >= cm.lastLine()) return;
-      ch = 0;
-      lineText = cm.getLine(++line);
-      return true;
-    }
-    function toTagEnd() {
-      for (;;) {
-        var gt = lineText.indexOf(">", ch);
-        if (gt == -1) { if (nextLine()) continue; else return; }
-        var lastSlash = lineText.lastIndexOf("/", gt);
-        var selfClose = lastSlash > -1 && /^\s*$/.test(lineText.slice(lastSlash + 1, gt));
-        ch = gt + 1;
-        return selfClose ? "selfClose" : "regular";
-      }
+  function nextLine(iter) {
+    if (iter.line >= iter.cm.lastLine()) return;
+    iter.ch = 0;
+    iter.text = iter.cm.getLine(++iter.line);
+    return true;
+  }
+  function prevLine(iter) {
+    if (iter.line <= iter.cm.firstLine()) return;
+    iter.text = iter.cm.getLine(--iter.line);
+    iter.ch = iter.text.length;
+    return true;
+  }
+
+  function toTagEnd(iter) {
+    for (;;) {
+      var gt = iter.text.indexOf(">", iter.ch);
+      if (gt == -1) { if (nextLine(iter)) continue; else return; }
+      var lastSlash = iter.text.lastIndexOf("/", gt);
+      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
+      iter.ch = gt + 1;
+      return selfClose ? "selfClose" : "regular";
     }
-    function toNextTag() {
-      for (;;) {
-        xmlTagStart.lastIndex = ch;
-        var found = xmlTagStart.exec(lineText);
-        if (!found) { if (nextLine()) continue; else return; }
-        ch = found.index + found[0].length;
-        return found;
-      }
+  }
+  function toTagStart(iter) {
+    for (;;) {
+      var lt = iter.text.lastIndexOf("<", iter.ch - 1);
+      if (lt == -1) { if (prevLine(iter)) continue; else return; }
+      xmlTagStart.lastIndex = lt;
+      iter.ch = lt;
+      var match = xmlTagStart.exec(iter.text);
+      if (match && match.index == lt) return match;
     }
+  }
 
-    var stack = [], startCh;
+  function toNextTag(iter) {
     for (;;) {
-      var openTag = toNextTag(), end;
-      if (!openTag || line != start.line || !(end = toTagEnd())) return;
-      if (!openTag[1] && end != "selfClose") {
-        stack.push(openTag[2]);
-        startCh = ch;
-        break;
-      }
+      xmlTagStart.lastIndex = iter.ch;
+      var found = xmlTagStart.exec(iter.text);
+      if (!found) { if (nextLine(iter)) continue; else return; }
+      iter.ch = found.index + found[0].length;
+      return found;
     }
+  }
+  function toPrevTag(iter) {
+    for (;;) {
+      var gt = iter.text.lastIndexOf(">", iter.ch - 1);
+      if (gt == -1) { if (prevLine(iter)) continue; else return; }
+      var lastSlash = iter.text.lastIndexOf("/", gt);
+      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
+      iter.ch = gt + 1;
+      return selfClose ? "selfClose" : "regular";
+    }
+  }
 
+  function findMatchingClose(iter, tag) {
+    var stack = [tag];
     for (;;) {
-      var next = toNextTag(), end, tagLine = line, tagCh = ch - (next ? next[0].length : 0);
-      if (!next || !(end = toTagEnd())) return;
+      var next = toNextTag(iter), end, tagLine = iter.line, tagCh = iter.ch - (next ? next[0].length : 0);
+      if (!next || !(end = toTagEnd(iter))) return;
       if (end == "selfClose") continue;
       if (next[1]) { // closing tag
         for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == next[2]) {
           stack.length = i;
           break;
         }
-        if (!stack.length) return {
-          from: CodeMirror.Pos(start.line, startCh),
-          to: CodeMirror.Pos(tagLine, tagCh)
-        };
+        if (!stack.length) return Pos(tagLine, tagCh);
       } else { // opening tag
         stack.push(next[2]);
       }
     }
+  }
+  function findMatchingOpen(iter, tag) {
+    var stack = [tag];
+    for (;;) {
+      var prev = toPrevTag(iter);
+      if (!prev) return;
+      if (prev == "selfClose") { toTagStart(iter); continue; }
+      var tagLine = iter.line, tagCh = iter.ch;
+      var start = toTagStart(iter);
+      if (!start) return;
+      if (start[1]) { // closing tag
+        stack.push(start[2]);
+      } else { // opening tag
+        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == start[2]) {
+          stack.length = i;
+          break;
+        }
+        if (!stack.length) return Pos(tagLine, tagCh);
+      }
+    }
+  }
+
+  CodeMirror.tagRangeFinder = function(cm, start) {
+    var iter = new Iter(cm, start.line, 0);
+    for (;;) {
+      var openTag = toNextTag(iter), end;
+      if (!openTag || iter.line != start.line || !(end = toTagEnd(iter))) return;
+      if (!openTag[1] && end != "selfClose") {
+        var startCh = iter.ch, close = findMatchingClose(iter, openTag[2]);
+        return close && {from: Pos(start.line, startCh), to: close};
+      }
+    }
+  };
+
+  CodeMirror.findMatchingTag = function(cm, pos) {
+    var iter = new Iter(cm, pos.line, pos.ch);
+    var end = toTagEnd(iter), start = toTagStart(iter);
+    if (!end || end == "selfClose" || !start) return;
+
+    if (start[1]) { // closing tag
+      var open = findMatchingOpen(iter, start[2]);
+      return open && {from: Pos(iter.line, iter.ch), to: open};
+    } else { // opening tag
+      toTagEnd(iter);
+      var close = findMatchingClose(iter, start[2]);
+      return close && {from: close, to: Pos(iter.line, iter.ch)};
+    }
   };
 })();

From a4d5985acc383c6952efa3610909c55a39a67f9d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Jun 2013 10:06:20 +0200
Subject: [PATCH 0196/4742] Change representation of styles arrays

As a micro-optimization, and to prepare for the next patch.
---
 lib/codemirror.js | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1c61686911..d0689349dd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4111,7 +4111,7 @@ window.CodeMirror = (function() {
   function runMode(cm, text, mode, state, f) {
     var flattenSpans = mode.flattenSpans;
     if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
-    var curText = "", curStyle = null;
+    var curStart = 0, curStyle = null;
     var stream = new StringStream(text, cm.options.tabSize), style;
     if (text == "" && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
@@ -4123,14 +4123,13 @@ window.CodeMirror = (function() {
       } else {
         style = mode.token(stream, state);
       }
-      var substr = stream.current();
-      stream.start = stream.pos;
       if (!flattenSpans || curStyle != style) {
-        if (curText) f(curText, curStyle);
-        curText = substr; curStyle = style;
-      } else curText = curText + substr;
+        if (curStart < stream.start) f(stream.start, curStyle);
+        curStart = stream.start; curStyle = style;
+      }
+      stream.start = stream.pos;
     }
-    if (curText) f(curText, curStyle);
+    if (curStart < stream.pos) f(stream.pos, curStyle);
   }
 
   function highlightLine(cm, line, state) {
@@ -4138,27 +4137,24 @@ window.CodeMirror = (function() {
     // mode/overlays that it is based on (for easy invalidation).
     var st = [cm.state.modeGen];
     // Compute the base array of styles
-    runMode(cm, line.text, cm.doc.mode, state, function(txt, style) {st.push(txt, style);});
+    runMode(cm, line.text, cm.doc.mode, state, function(end, style) {st.push(end, style);});
 
     // Run overlays, adjust style array.
     for (var o = 0; o < cm.state.overlays.length; ++o) {
-      var overlay = cm.state.overlays[o], i = 1;
-      runMode(cm, line.text, overlay.mode, true, function(txt, style) {
-        var start = i, len = txt.length;
+      var overlay = cm.state.overlays[o], i = 1, at = 0;
+      runMode(cm, line.text, overlay.mode, true, function(end, style) {
+        var start = i;
         // Ensure there's a token end at the current position, and that i points at it
-        while (len) {
-          var cur = st[i], len_ = cur.length;
-          if (len_ <= len) {
-            len -= len_;
-          } else {
-            st.splice(i, 1, cur.slice(0, len), st[i+1], cur.slice(len));
-            len = 0;
-          }
+        while (at < end) {
+          var i_end = st[i];
+          if (i_end > end)
+            st.splice(i, 1, end, st[i+1], i_end);
           i += 2;
+          at = Math.min(end, i_end);
         }
         if (!style) return;
         if (overlay.opaque) {
-          st.splice(start, i - start, txt, style);
+          st.splice(start, i - start, end, style);
           i = start + 2;
         } else {
           for (; start < i; start += 2) {
@@ -4336,15 +4332,14 @@ window.CodeMirror = (function() {
   // Outputs a number of spans to make up a line, taking highlighting
   // and marked text into account.
   function insertLineContent(line, builder, styles) {
-    var spans = line.markedSpans;
+    var spans = line.markedSpans, allText = line.text, at = 0;
     if (!spans) {
       for (var i = 1; i < styles.length; i+=2)
-        builder.addToken(builder, styles[i], styleToClass(styles[i+1]));
+        builder.addToken(builder, allText.slice(at, at = styles[i]), styleToClass(styles[i+1]));
       return;
     }
 
-    var allText = line.text, len = allText.length;
-    var pos = 0, i = 1, text = "", style;
+    var len = allText.length, pos = 0, i = 1, text = "", style;
     var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, collapsed;
     for (;;) {
       if (nextChange == pos) { // Update current marker set
@@ -4388,7 +4383,8 @@ window.CodeMirror = (function() {
           pos = end;
           spanStartStyle = "";
         }
-        text = styles[i++]; style = styleToClass(styles[i++]);
+        text = allText.slice(at, at = styles[i++]);
+        style = styleToClass(styles[i++]);
       }
     }
   }

From c1df890ac6041e1fbc848dc73804f4ae759d0fb9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Jun 2013 11:17:31 +0200
Subject: [PATCH 0197/4742] Add getTokenTypeAt method

Use it to make xml-fold more robust, and matchbrackets much faster.
---
 addon/edit/matchbrackets.js |  5 ++---
 addon/fold/xml-fold.js      |  9 +++++++++
 doc/manual.html             |  8 ++++++++
 lib/codemirror.js           | 12 ++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 834b397656..131fe831fd 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -14,18 +14,17 @@
     if (!match) return null;
     var forward = match.charAt(1) == ">", d = forward ? 1 : -1;
     if (strict && forward != (pos == cur.ch)) return null;
-    var style = cm.getTokenAt(Pos(cur.line, pos + 1)).type;
+    var style = cm.getTokenTypeAt(Pos(cur.line, pos + 1));
 
     var stack = [line.text.charAt(pos)], re = /[(){}[\]]/;
     function scan(line, lineNo, start) {
       if (!line.text) return;
       var pos = forward ? 0 : line.text.length - 1, end = forward ? line.text.length : -1;
       if (line.text.length > maxScanLen) return null;
-      var checkTokenStyles = line.text.length < 1000;
       if (start != null) pos = start + d;
       for (; pos != end; pos += d) {
         var ch = line.text.charAt(pos);
-        if (re.test(ch) && (!checkTokenStyles || cm.getTokenAt(Pos(lineNo, pos + 1)).type == style)) {
+        if (re.test(ch) && cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style) {
           var match = matching[ch];
           if (match.charAt(1) == ">" == forward) stack.push(ch);
           else if (stack.pop() != match.charAt(0)) return {pos: pos, match: false};
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 4dbb4dafca..cb3e9a3082 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -12,6 +12,11 @@
     this.cm = cm; this.text = cm.getLine(line);
   }
 
+  function tagAt(iter, ch) {
+    var type = iter.cm.getTokenTypeAt(Pos(iter.line, ch));
+    return type && /\btag\b/.test(type);
+  }
+
   function nextLine(iter) {
     if (iter.line >= iter.cm.lastLine()) return;
     iter.ch = 0;
@@ -29,6 +34,7 @@
     for (;;) {
       var gt = iter.text.indexOf(">", iter.ch);
       if (gt == -1) { if (nextLine(iter)) continue; else return; }
+      if (!tagAt(iter, gt + 1)) { iter.ch = gt + 1; continue; }
       var lastSlash = iter.text.lastIndexOf("/", gt);
       var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
       iter.ch = gt + 1;
@@ -39,6 +45,7 @@
     for (;;) {
       var lt = iter.text.lastIndexOf("<", iter.ch - 1);
       if (lt == -1) { if (prevLine(iter)) continue; else return; }
+      if (!tagAt(iter, lt + 1)) { iter.ch = lt; continue; }
       xmlTagStart.lastIndex = lt;
       iter.ch = lt;
       var match = xmlTagStart.exec(iter.text);
@@ -51,6 +58,7 @@
       xmlTagStart.lastIndex = iter.ch;
       var found = xmlTagStart.exec(iter.text);
       if (!found) { if (nextLine(iter)) continue; else return; }
+      if (!tagAt(iter, found.index + 1)) { iter.ch = found.index + 1; continue; }
       iter.ch = found.index + found[0].length;
       return found;
     }
@@ -59,6 +67,7 @@
     for (;;) {
       var gt = iter.text.lastIndexOf(">", iter.ch - 1);
       if (gt == -1) { if (prevLine(iter)) continue; else return; }
+      if (!tagAt(iter, gt + 1)) { iter.ch = gt; continue; }
       var lastSlash = iter.text.lastIndexOf("/", gt);
       var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
       iter.ch = gt + 1;
diff --git a/doc/manual.html b/doc/manual.html
index fb87954725..4bf94b1c81 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1407,6 +1407,14 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
       edits were recently made and highlighting has not yet completed.
       </dd>
 
+      <dt id="getTokenTypeAt"><code><strong>cm.getTokenTypeAt</strong>(pos: {line, ch}) → string</code></dt>
+      <dd>This is a (much) cheaper version
+      of <a href="#getTokenAt"><code>getTokenAt</code></a> useful for
+      when you just need the type of the token at a given position,
+      and no other information. Will return <code>null</code> for
+      unstyled tokens, and a string, potentially containing multiple
+      space-separated style names, otherwise.</dd>
+
       <dt id="getStateAfter"><code><strong>cm.getStateAfter</strong>(?line: integer, ?precise: boolean) → object</code></dt>
       <dd>Returns the mode's parser state, if any, at the end of the
       given line number. If no line number is given, the state at the
diff --git a/lib/codemirror.js b/lib/codemirror.js
index d0689349dd..5407c46666 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2854,6 +2854,18 @@ window.CodeMirror = (function() {
               state: state};
     },
 
+    getTokenTypeAt: function(pos) {
+      pos = clipPos(this.doc, pos);
+      var styles = getLineStyles(this, getLine(this.doc, pos.line));
+      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
+      for (;;) {
+        var mid = (before + after) >> 1;
+        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
+        else if (styles[mid * 2 + 1] < ch) before = mid + 1;
+        else return styles[mid * 2 + 2];
+      }
+    },
+
     getStateAfter: function(line, precise) {
       var doc = this.doc;
       line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);

From 2ad8ba157a15af67fe975d92f193f6561b4537bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Jun 2013 11:21:15 +0200
Subject: [PATCH 0198/4742] [real-world uses] Add Quivive file manager

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

diff --git a/doc/realworld.html b/doc/realworld.html
index e4a7f13972..98aaff989b 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -86,6 +86,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>
       <li><a href="http://qyapp.com">QiYun web app platform</a></li>
       <li><a href="http://ariya.ofilabs.com/2011/09/hybrid-webnative-desktop-codemirror.html">Qt+Webkit integration</a> (building a desktop CodeMirror app)</li>
+      <li><a href="http://www.quivive-file-manager.com">Quivive File Manager</a></li>
       <li><a href="http://rascalmicro.com/docs/basic-tutorial-getting-started.html">Rascal</a> (tiny computer)</li>
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>

From 5056a0556acca659386461c8d9d48e6d5d266007 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Jun 2013 15:27:33 +0200
Subject: [PATCH 0199/4742] [xml-fold addon] Add findEnclosingTag utility

---
 addon/fold/xml-fold.js | 45 ++++++++++++++++++++++++++++++------------
 demo/folding.html      |  2 +-
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index cb3e9a3082..fac577dea8 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -76,9 +76,9 @@
   }
 
   function findMatchingClose(iter, tag) {
-    var stack = [tag];
+    var stack = [];
     for (;;) {
-      var next = toNextTag(iter), end, tagLine = iter.line, tagCh = iter.ch - (next ? next[0].length : 0);
+      var next = toNextTag(iter), end, startLine = iter.line, startCh = iter.ch - (next ? next[0].length : 0);
       if (!next || !(end = toTagEnd(iter))) return;
       if (end == "selfClose") continue;
       if (next[1]) { // closing tag
@@ -86,19 +86,23 @@
           stack.length = i;
           break;
         }
-        if (!stack.length) return Pos(tagLine, tagCh);
+        if (i < 0 && (!tag || tag == next[2])) return {
+          tag: next[2],
+          from: Pos(startLine, startCh),
+          to: Pos(iter.line, iter.ch)
+        };
       } else { // opening tag
         stack.push(next[2]);
       }
     }
   }
   function findMatchingOpen(iter, tag) {
-    var stack = [tag];
+    var stack = [];
     for (;;) {
       var prev = toPrevTag(iter);
       if (!prev) return;
       if (prev == "selfClose") { toTagStart(iter); continue; }
-      var tagLine = iter.line, tagCh = iter.ch;
+      var endLine = iter.line, endCh = iter.ch;
       var start = toTagStart(iter);
       if (!start) return;
       if (start[1]) { // closing tag
@@ -108,7 +112,11 @@
           stack.length = i;
           break;
         }
-        if (!stack.length) return Pos(tagLine, tagCh);
+        if (i < 0 && (!tag || tag == start[2])) return {
+          tag: start[2],
+          from: Pos(iter.line, iter.ch),
+          to: Pos(endLine, endCh)
+        };
       }
     }
   }
@@ -119,24 +127,35 @@
       var openTag = toNextTag(iter), end;
       if (!openTag || iter.line != start.line || !(end = toTagEnd(iter))) return;
       if (!openTag[1] && end != "selfClose") {
-        var startCh = iter.ch, close = findMatchingClose(iter, openTag[2]);
-        return close && {from: Pos(start.line, startCh), to: close};
+        var start = Pos(iter.line, iter.ch);
+        var close = findMatchingClose(iter, openTag[2]);
+        return close && {from: start, to: close.from};
       }
     }
   };
 
   CodeMirror.findMatchingTag = function(cm, pos) {
     var iter = new Iter(cm, pos.line, pos.ch);
-    var end = toTagEnd(iter), start = toTagStart(iter);
+    var end = toTagEnd(iter), endPos = Pos(iter.line, iter.ch), start = toTagStart(iter);
     if (!end || end == "selfClose" || !start) return;
+    var here = {from: Pos(iter.line, iter.ch), to: endPos};
 
     if (start[1]) { // closing tag
-      var open = findMatchingOpen(iter, start[2]);
-      return open && {from: Pos(iter.line, iter.ch), to: open};
+      return findMatchingOpen(iter, start[2]);
     } else { // opening tag
       toTagEnd(iter);
-      var close = findMatchingClose(iter, start[2]);
-      return close && {from: close, to: Pos(iter.line, iter.ch)};
+      return findMatchingClose(iter, start[2]);
+    }
+  };
+
+  CodeMirror.findEnclosingTag = function(cm, pos) {
+    var iter = new Iter(cm, pos.line, pos.ch);
+    for (;;) {
+      var open = findMatchingOpen(iter);
+      if (!open) break;
+      var forward = new Iter(cm, pos.line, pos.ch);
+      var close = findMatchingClose(forward, open.tag);
+      if (close) return {open: open, close: close};
     }
   };
 })();
diff --git a/demo/folding.html b/demo/folding.html
index e67531a0fc..ffda97c1c9 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -61,7 +61,7 @@ <h1>CodeMirror: Code Folding Demo</h1>
     extraKeys: {"Ctrl-Q": function(cm){foldHTML(cm, cm.getCursor());}}
   });
   editor_html.on("gutterClick", foldHTML);
-  foldHTML(editor_html, 11);
+  foldHTML(editor_html, 13);
   foldHTML(editor_html, 1);
 };
 </script>

From 4d2096bfcd45536f0ccaadd63abd53feecd4c552 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Jun 2013 15:37:14 +0200
Subject: [PATCH 0200/4742] Remove unused variable

---
 addon/fold/xml-fold.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index fac577dea8..3f4988df32 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -138,7 +138,6 @@
     var iter = new Iter(cm, pos.line, pos.ch);
     var end = toTagEnd(iter), endPos = Pos(iter.line, iter.ch), start = toTagStart(iter);
     if (!end || end == "selfClose" || !start) return;
-    var here = {from: Pos(iter.line, iter.ch), to: endPos};
 
     if (start[1]) { // closing tag
       return findMatchingOpen(iter, start[2]);

From 10a12e1a16b48c1ff1504e9c9f3786e39a3efb1d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Jun 2013 15:44:23 +0200
Subject: [PATCH 0201/4742] [xml-fold addon] Remove another unused var

---
 addon/fold/xml-fold.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 3f4988df32..b764bc0190 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -136,7 +136,7 @@
 
   CodeMirror.findMatchingTag = function(cm, pos) {
     var iter = new Iter(cm, pos.line, pos.ch);
-    var end = toTagEnd(iter), endPos = Pos(iter.line, iter.ch), start = toTagStart(iter);
+    var end = toTagEnd(iter), start = toTagStart(iter);
     if (!end || end == "selfClose" || !start) return;
 
     if (start[1]) { // closing tag

From 93c931dacbd2530ed6a1f867e6525a3a0ec06da0 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Tue, 18 Jun 2013 13:49:43 -0700
Subject: [PATCH 0202/4742] [vim keymap] Style tweaks

* simpler concat
* less escaping
* shave a line
* throw early
* throw new error
* single quotes
* format returns
* rm unneeded parens
* add whitespace
* re-add braces
---
 keymap/vim.js | 128 ++++++++++++++++++++++++--------------------------
 1 file changed, 62 insertions(+), 66 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 46bd09c9da..e05be03176 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -272,7 +272,7 @@
     { keys: ['u'], type: 'action', action: 'undo' },
     { keys: ['<C-r>'], type: 'action', action: 'redo' },
     { keys: ['m', 'character'], type: 'action', action: 'setMark' },
-    { keys: ['\"', 'character'], type: 'action', action: 'setRegister' },
+    { keys: ['"', 'character'], type: 'action', action: 'setRegister' },
     { keys: ['z', 'z'], type: 'action', action: 'scrollToCursor',
         actionArgs: { position: 'center' }},
     { keys: ['z', '.'], type: 'action', action: 'scrollToCursor',
@@ -327,14 +327,11 @@
     var upperCaseAlphabet = makeKeyRange(65, 26);
     var lowerCaseAlphabet = makeKeyRange(97, 26);
     var numbers = makeKeyRange(48, 10);
-    var SPECIAL_SYMBOLS = '~`!@#$%^&*()_-+=[{}]\\|/?.,<>:;\"\'';
-    var specialSymbols = SPECIAL_SYMBOLS.split('');
+    var specialSymbols = '~`!@#$%^&*()_-+=[{}]\\|/?.,<>:;"\''.split('');
     var specialKeys = ['Left', 'Right', 'Up', 'Down', 'Space', 'Backspace',
         'Esc', 'Home', 'End', 'PageUp', 'PageDown', 'Enter'];
-    var validMarks = upperCaseAlphabet.concat(lowerCaseAlphabet).concat(
-        numbers).concat(['<', '>']);
-    var validRegisters = upperCaseAlphabet.concat(lowerCaseAlphabet).concat(
-        numbers).concat('-\"'.split(''));
+    var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
+    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"']);
 
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
@@ -529,10 +526,11 @@
         exCommandDispatcher.map(lhs, rhs);
       },
       defineEx: function(name, prefix, func){
-        if (name.indexOf(prefix) === 0) {
-          exCommands[name]=func;
-          exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
-        }else throw new Error("(Vim.defineEx) \""+prefix+"\" is not a prefix of \""+name+"\", command not registered");
+        if (name.indexOf(prefix) !== 0) {
+          throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
+        }
+        exCommands[name]=func;
+        exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
       },
       // Initializes vim state variable on the CodeMirror object. Should only be
       // called lazily by handleKey or for testing.
@@ -671,7 +669,7 @@
      */
     function RegisterController(registers) {
       this.registers = registers;
-      this.unamedRegister = registers['\"'] = new Register();
+      this.unamedRegister = registers['"'] = new Register();
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise) {
@@ -757,32 +755,31 @@
               // stroke.
               inputState.keyBuffer.push(key);
               return null;
-            } else {
-              if (inputState.operator && command.type == 'action') {
-                // Ignore matched action commands after an operator. Operators
-                // only operate on motions. This check is really for text
-                // objects since aW, a[ etcs conflicts with a.
-                continue;
-              }
-              // Matches whole comand. Return the command.
-              if (command.keys[keys.length - 1] == 'character') {
-                inputState.selectedCharacter = keys[keys.length - 1];
-                if(inputState.selectedCharacter.length>1){
-                  switch(inputState.selectedCharacter){
-                    case "<CR>":
-                      inputState.selectedCharacter='\n';
-                      break;
-                    case "<Space>":
-                      inputState.selectedCharacter=' ';
-                      break;
-                    default:
-                      continue;
-                  }
+            }
+            if (inputState.operator && command.type == 'action') {
+              // Ignore matched action commands after an operator. Operators
+              // only operate on motions. This check is really for text
+              // objects since aW, a[ etcs conflicts with a.
+              continue;
+            }
+            // Matches whole comand. Return the command.
+            if (command.keys[keys.length - 1] == 'character') {
+              inputState.selectedCharacter = keys[keys.length - 1];
+              if(inputState.selectedCharacter.length>1){
+                switch(inputState.selectedCharacter){
+                  case '<CR>':
+                    inputState.selectedCharacter='\n';
+                    break;
+                  case '<Space>':
+                    inputState.selectedCharacter=' ';
+                    break;
+                  default:
+                    continue;
                 }
               }
-              inputState.keyBuffer = [];
-              return command;
             }
+            inputState.keyBuffer = [];
+            return command;
           }
         }
         // Clear the buffer since there are no partial matches.
@@ -1282,7 +1279,7 @@
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
           vim.lastHPos = endCh;
         }
-        vim.lastHSPos = cm.charCoords({line:line, ch:endCh},"div").left;
+        vim.lastHSPos = cm.charCoords({line:line, ch:endCh},'div').left;
         return { line: line, ch: endCh };
       },
       moveByDisplayLines: function(cm, motionArgs, vim) {
@@ -1295,10 +1292,10 @@
           case this.moveToEol:
             break;
           default:
-            vim.lastHSPos = cm.charCoords(cur,"div").left;
+            vim.lastHSPos = cm.charCoords(cur,'div').left;
         }
         var repeat = motionArgs.repeat;
-        var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),"line",vim.lastHSPos);
+        var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),'line',vim.lastHSPos);
         if (res.hitSide) {
           if (motionArgs.forward) {
             var lastCharCoords = cm.charCoords(res, 'div');
@@ -1386,7 +1383,7 @@
         var repeat = motionArgs.repeat;
         // repeat is equivalent to which column we want to move to!
         vim.lastHPos = repeat - 1;
-        vim.lastHSPos = cm.charCoords(cm.getCursor(),"div").left;
+        vim.lastHSPos = cm.charCoords(cm.getCursor(),'div').left;
         return moveToColumn(cm, repeat);
       },
       moveToEol: function(cm, motionArgs, vim) {
@@ -1395,7 +1392,7 @@
         var retval={ line: cur.line + motionArgs.repeat - 1, ch: Infinity };
         var end=cm.clipPos(retval);
         end.ch--;
-        vim.lastHSPos = cm.charCoords(end,"div").left;
+        vim.lastHSPos = cm.charCoords(end,'div').left;
         return retval;
       },
       moveToFirstNonWhiteSpaceCharacter: function(cm) {
@@ -1580,7 +1577,7 @@
       },
       scrollToCursor: function(cm, actionArgs) {
         var lineNum = cm.getCursor().line;
-        var charCoords = cm.charCoords({line: lineNum, ch: 0}, "local");
+        var charCoords = cm.charCoords({line: lineNum, ch: 0}, 'local');
         var height = cm.getScrollInfo().clientHeight;
         var y = charCoords.top;
         var lineHeight = charCoords.bottom - y;
@@ -1907,7 +1904,7 @@
       '\'': function(cm, inclusive) {
         return findBeginningAndEnd(cm, "'", inclusive);
       },
-      '\"': function(cm, inclusive) {
+      '"': function(cm, inclusive) {
         return findBeginningAndEnd(cm, '"', inclusive);
       }
     };
@@ -1964,7 +1961,8 @@
     function cursorIsBefore(cur1, cur2) {
       if (cur1.line < cur2.line) {
         return true;
-      } else if (cur1.line == cur2.line && cur1.ch < cur2.ch) {
+      }
+      if (cur1.line == cur2.line && cur1.ch < cur2.ch) {
         return true;
       }
       return false;
@@ -1979,17 +1977,16 @@
       return cm.getLine(lineNum).length;
     }
     function reverse(s){
-      return s.split("").reverse().join("");
+      return s.split('').reverse().join('');
     }
     function trim(s) {
       if (s.trim) {
         return s.trim();
-      } else {
-        return s.replace(/^\s+|\s+$/g, '');
       }
+      return s.replace(/^\s+|\s+$/g, '');
     }
     function escapeRegex(s) {
-      return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, "\\$1");
+      return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
     }
 
     function exitVisualMode(cm, vim) {
@@ -2324,7 +2321,7 @@
         pos = (dir > 0) ? 0 : line.length;
       }
       // Should never get here.
-      throw 'The impossible happened.';
+      throw new Error('The impossible happened.');
     }
 
     /**
@@ -2603,7 +2600,7 @@
             onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp });
       }
       else {
-        onClose(prompt(shortText, ""));
+        onClose(prompt(shortText, ''));
       }
     }
 
@@ -2688,16 +2685,16 @@
     }
     function regexEqual(r1, r2) {
       if (r1 instanceof RegExp && r2 instanceof RegExp) {
-          var props = ["global", "multiline", "ignoreCase", "source"];
+          var props = ['global', 'multiline', 'ignoreCase', 'source'];
           for (var i = 0; i < props.length; i++) {
               var prop = props[i];
               if (r1[prop] !== r2[prop]) {
-                  return(false);
+                  return false;
               }
           }
-          return(true);
+          return true;
       }
-      return(false);
+      return false;
     }
     // Returns true if the query is valid.
     function updateSearchQuery(cm, rawQuery, ignoreCase, smartCase) {
@@ -2731,7 +2728,7 @@
             if (match[0].length == 0) {
               // Matched empty string, skip to next.
               stream.next();
-              return "searching";
+              return 'searching';
             }
             if (!stream.sol()) {
               // Backtrack 1 to match \b
@@ -2742,7 +2739,7 @@
               }
             }
             stream.match(query);
-            return "searching";
+            return 'searching';
           }
           while (!stream.eol()) {
             stream.next();
@@ -2782,7 +2779,8 @@
           }
         }
         return cursor.from();
-      });}
+      });
+    }
     function clearSearchHighlight(cm) {
       cm.removeOverlay(getSearchState(cm).getOverlay());
       getSearchState(cm).setOverlay(null);
@@ -2926,10 +2924,8 @@
             var mark = getVimState(cm).marks[inputStream.next()];
             if (mark && mark.find()) {
               return mark.find().line;
-            } else {
-              throw "Mark not set";
             }
-            break;
+            throw new Error('Mark not set');
           default:
             inputStream.backUp(1);
             return undefined;
@@ -3049,7 +3045,7 @@
             var args = new CodeMirror.StringStream(params.argString);
             if (args.eat('!')) { reverse = true; }
             if (args.eol()) { return; }
-            if (!args.eatSpace()) { throw 'invalid arguments ' + args.match(/.*/)[0]; }
+            if (!args.eatSpace()) { throw new Error('invalid arguments ' + args.match(/.*/)[0]); }
             var opts = args.match(/[a-z]+/);
             if (opts) {
               opts = opts[0];
@@ -3058,10 +3054,10 @@
               var decimal = opts.indexOf('d') != -1 && 1;
               var hex = opts.indexOf('x') != -1 && 1;
               var octal = opts.indexOf('o') != -1 && 1;
-              if (decimal + hex + octal > 1) { throw 'invalid arguments'; }
+              if (decimal + hex + octal > 1) { throw new Error('invalid arguments'); }
               number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
             }
-            if (args.eatSpace() && args.match(/\/.*\//)) { throw 'patterns not supported'; }
+            if (args.eatSpace() && args.match(/\/.*\//)) { throw new Error('patterns not supported'); }
           }
         }
         parseArgs();
@@ -3115,8 +3111,8 @@
       },
       substitute: function(cm, params) {
         if (!cm.getSearchCursor) {
-          throw 'Search feature not available. Requires searchcursor.js or ' +
-              'any other getSearchCursor implementation.';
+          throw new Error('Search feature not available. Requires searchcursor.js or ' +
+              'any other getSearchCursor implementation.');
         }
         var argString = params.argString;
         var slashes = findUnescapedSlashes(argString);
@@ -3236,7 +3232,7 @@
                 delete state.marks[mark];
               }
             } else {
-              showConfirm(cm, 'Invalid argument: ' + startMark + "-");
+              showConfirm(cm, 'Invalid argument: ' + startMark + '-');
               return;
             }
           } else {
@@ -3326,7 +3322,7 @@
       // Actually do replace.
       next();
       if (done) {
-        throw 'No matches for ' + query.source;
+        throw new Error('No matches for ' + query.source);
       }
       if (!confirm) {
         replaceAll();

From 66a3f0132850d841ca3957568899a6cba280df25 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Jun 2013 13:01:08 +0200
Subject: [PATCH 0203/4742] [show-hint addon] Restructure

Also makes sure that no two hinting dialogs can be active at the
same time.

Issue #1619
---
 addon/hint/show-hint.js | 278 ++++++++++++++++++++++++----------------
 1 file changed, 165 insertions(+), 113 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 627a69092c..02c94f4408 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,28 +1,109 @@
-CodeMirror.showHint = function(cm, getHints, options) {
-  if (!options) options = {};
-  var startCh = cm.getCursor().ch, continued = false;
-  var closeOn = options.closeCharacters || /[\s()\[\]{};:>]/;
+(function() {
+  "use strict";
 
-  function startHinting() {
+  CodeMirror.showHint = function(cm, getHints, options) {
     // We want a single cursor position.
     if (cm.somethingSelected()) return;
 
-    if (options.async)
-      getHints(cm, showHints, options);
+    if (cm.state.completionActive) cm.state.completionActive.close();
+
+    var completion = cm.state.completionActive = new Completion(cm, getHints, options || {});
+    CodeMirror.signal(cm, "startCompletion", cm);
+    if (completion.options.async)
+      getHints(cm, function(hints) { completion.showHints(hints); }, completion.options);
     else
-      return showHints(getHints(cm, options));
+      return completion.showHints(getHints(cm, completion.options));
+  };
+
+  function Completion(cm, getHints, options) {
+    this.cm = cm;
+    this.getHints = getHints;
+    this.options = options;
+    this.widget = null;
   }
 
+  Completion.prototype = {
+    close: function() {
+      if (!this.active()) return;
+
+      if (this.widget) this.widget.close();
+      this.cm.state.completionActive = null;
+      CodeMirror.signal(this.cm, "endCompletion", this.cm);
+    },
+
+    active: function() {
+      return this.cm.state.completionActive == this;
+    },
+
+    pick: function(data, i) {
+      var completion = data.list[i];
+      if (completion.hint) completion.hint(this.cm, data, completion);
+      else this.cm.replaceRange(getText(completion), data.from, data.to);
+      this.close();
+    },
+
+    showHints: function(data) {
+      if (!data || !data.list.length || !this.active()) return this.close();
+
+      if (this.options.completeSingle != false && data.list.length == 1)
+        this.pick(data, 0);
+      else
+        this.showWidget(data);
+    },
+
+    showWidget: function(data) {
+      this.widget = new Widget(this, data);
+      CodeMirror.signal(data, "shown");
+
+      var debounce = null, completion = this, finished;
+      var closeOn = this.options.closeCharacters || /[\s()\[\]{};:>,]/;
+      var startPos = this.cm.getCursor(), startLen = this.cm.getLine(startPos.line).length;
+
+      function done() {
+        if (finished) return;
+        finished = true;
+        completion.close();
+        completion.cm.off("cursorActivity", activity);
+        CodeMirror.signal(data, "close");
+      }
+      function isDone() {
+        if (finished) return true;
+        if (!completion.widget) { done(); return true; }
+      }
+
+      function update() {
+        if (isDone()) return;
+        if (completion.options.async)
+          completion.getHints(completion.cm, finishUpdate, completion.options);
+        else
+          finishUpdate(completion.getHints(completion.cm, completion.options));
+      }
+      function finishUpdate(data) {
+        if (isDone()) return;
+        if (!data || !data.list.length) return done();
+        completion.widget.close();
+        completion.widget = new Widget(completion, data);
+      }
+
+      function activity() {
+        clearTimeout(debounce);
+        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 = setTimeout(update, 170);
+      }
+      this.cm.on("cursorActivity", activity);
+    }
+  };
+
   function getText(completion) {
     if (typeof completion == "string") return completion;
     else return completion.text;
   }
 
-  function pickCompletion(cm, data, completion) {
-    if (completion.hint) completion.hint(cm, data, completion);
-    else cm.replaceRange(getText(completion), data.from, data.to);
-  }
-
   function buildKeyMap(options, handle) {
     var baseMap = {
       Up: function() {handle.moveFocus(-1);},
@@ -56,40 +137,30 @@ CodeMirror.showHint = function(cm, getHints, options) {
     return ourMap;
   }
 
-  function showHints(data) {
-    if (!data || !data.list.length) {
-      if (continued) {
-        cm.state.completionActive = false;
-        CodeMirror.signal(data, "close");
-      }
-      return;
-    }
+  function Widget(completion, data) {
+    this.completion = completion;
+    this.data = data;
+    var widget = this, cm = completion.cm, options = completion.options;
 
-    var completions = data.list;
-    if (!continued && options.completeSingle != false && completions.length == 1) {
-      pickCompletion(cm, data, completions[0]);
-      return true;
-    }
-
-    // Build the select widget
-    var hints = document.createElement("ul"), selectedHint = 0;
+    var hints = this.hints = document.createElement("ul");
     hints.className = "CodeMirror-hints";
+    this.selectedHint = 0;
+
+    var completions = data.list;
     for (var i = 0; i < completions.length; ++i) {
-      var elt = hints.appendChild(document.createElement("li")), completion = completions[i];
+      var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
       var className = "CodeMirror-hint" + (i ? "" : " CodeMirror-hint-active");
-      if (completion.className != null) className = completion.className + " " + className;
+      if (cur.className != null) className = cur.className + " " + className;
       elt.className = className;
-      if (completion.render) completion.render(elt, data, completion);
-      else elt.appendChild(document.createTextNode(completion.displayText || getText(completion)));
+      if (cur.render) cur.render(elt, data, cur);
+      else elt.appendChild(document.createTextNode(cur.displayText || getText(cur)));
       elt.hintId = i;
     }
+
     var pos = cm.cursorCoords(options.alignWithWord !== false ? data.from : null);
     var left = pos.left, top = pos.bottom, below = true;
     hints.style.left = left + "px";
     hints.style.top = top + "px";
-    (options.container || document.body).appendChild(hints);
-    CodeMirror.signal(data, "shown");
-
     // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
     var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
     var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
@@ -113,104 +184,85 @@ CodeMirror.showHint = function(cm, getHints, options) {
       }
       hints.style.top = (top = pos.bottom - overlapY) + "px";
     }
+    (options.container || document.body).appendChild(hints);
 
-    function changeActive(i) {
-      i = Math.max(0, Math.min(i, completions.length - 1));
-      if (selectedHint == i) return;
-      var node = hints.childNodes[selectedHint];
-      node.className = node.className.replace(" CodeMirror-hint-active", "");
-      node = hints.childNodes[selectedHint = i];
-      node.className += " CodeMirror-hint-active";
-      if (node.offsetTop < hints.scrollTop)
-        hints.scrollTop = node.offsetTop - 3;
-      else if (node.offsetTop + node.offsetHeight > hints.scrollTop + hints.clientHeight)
-        hints.scrollTop = node.offsetTop + node.offsetHeight - hints.clientHeight + 3;
-      CodeMirror.signal(data, "select", completions[selectedHint], node);
-    }
-
-    function screenAmount() {
-      return Math.floor(hints.clientHeight / hints.firstChild.offsetHeight) || 1;
-    }
-
-    var keyMap = buildKeyMap(options, {
-      moveFocus: function(n) { changeActive(selectedHint + n); },
-      setFocus: function(n) { changeActive(n); },
-      menuSize: function() { return screenAmount(); },
+    cm.addKeyMap(this.keyMap = buildKeyMap(options, {
+      moveFocus: function(n) { widget.changeActive(widget.selectedHint + n); },
+      setFocus: function(n) { widget.changeActive(n); },
+      menuSize: function() { return widget.screenAmount(); },
       length: completions.length,
-      close: close,
-      pick: pick
-    });
+      close: function() { completion.close(); },
+      pick: function() { widget.pick(); }
+    }));
 
-    cm.state.completionActive = true;
-    cm.addKeyMap(keyMap);
-    cm.on("cursorActivity", cursorActivity);
-    var closingOnBlur;
-    function onBlur(){ closingOnBlur = setTimeout(close, 100); };
-    function onFocus(){ clearTimeout(closingOnBlur); };
     if (options.closeOnUnfocus !== false) {
-      cm.on("blur", onBlur);
-      cm.on("focus", onFocus);
+      var closingOnBlur;
+      cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
+      cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
     }
+
     var startScroll = cm.getScrollInfo();
-    function onScroll() {
+    cm.on("scroll", this.onScroll = function() {
       var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
-      var newTop = top + startScroll.top - curScroll.top, point = newTop;
+      var newTop = top + startScroll.top - curScroll.top;
+      var point = newTop - (window.pageYOffset || (document.documentElement || document.body).scrollTop);
       if (!below) point += hints.offsetHeight;
-      if (point <= editor.top || point >= editor.bottom) return close();
+      if (point <= editor.top || point >= editor.bottom) return completion.close();
       hints.style.top = newTop + "px";
       hints.style.left = (left + startScroll.left - curScroll.left) + "px";
-    }
-    cm.on("scroll", onScroll);
+    });
+
     CodeMirror.on(hints, "dblclick", function(e) {
       var t = e.target || e.srcElement;
-      if (t.hintId != null) {selectedHint = t.hintId; pick();}
+      if (t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
     });
     CodeMirror.on(hints, "click", function(e) {
       var t = e.target || e.srcElement;
-      if (t.hintId != null) changeActive(t.hintId);
+      if (t.hintId != null) widget.changeActive(t.hintId);
     });
     CodeMirror.on(hints, "mousedown", function() {
       setTimeout(function(){cm.focus();}, 20);
     });
 
-    var done = false, once;
-    function close(willContinue) {
-      if (done) return;
-      done = true;
-      clearTimeout(once);
-      hints.parentNode.removeChild(hints);
-      cm.removeKeyMap(keyMap);
-      cm.off("cursorActivity", cursorActivity);
-      if (options.closeOnUnfocus !== false) {
-        cm.off("blur", onBlur);
-        cm.off("focus", onFocus);
-      }
-      cm.off("scroll", onScroll);
-      if (willContinue !== true) {
-        CodeMirror.signal(data, "close");
-        cm.state.completionActive = false;
-      }
-    }
-    function pick() {
-      pickCompletion(cm, data, completions[selectedHint]);
-      close();
-    }
-    var once, lastPos = cm.getCursor(), lastLen = cm.getLine(lastPos.line).length;
-    function cursorActivity() {
-      clearTimeout(once);
-
-      var pos = cm.getCursor(), line = cm.getLine(pos.line);
-      if (pos.line != lastPos.line || line.length - pos.ch != lastLen - lastPos.ch ||
-          pos.ch < startCh || cm.somethingSelected() ||
-          (pos.ch && closeOn.test(line.charAt(pos.ch - 1))))
-        close();
-      else {
-        once = setTimeout(function(){close(true); continued = true; startHinting();}, 170);
-      }
-    }
     CodeMirror.signal(data, "select", completions[0], hints.firstChild);
     return true;
   }
 
-  return startHinting();
-};
+  Widget.prototype = {
+    close: function() {
+      if (this.completion.widget != this) return;
+      this.completion.widget = null;
+      this.hints.parentNode.removeChild(this.hints);
+      this.completion.cm.removeKeyMap(this.keyMap);
+
+      var cm = this.completion.cm;
+      if (this.completion.options.closeOnUnfocus !== false) {
+        cm.off("blur", this.onBlur);
+        cm.off("focus", this.onFocus);
+      }
+      cm.off("scroll", this.onScroll);
+    },
+
+    pick: function() {
+      this.completion.pick(this.data, this.selectedHint);
+    },
+
+    changeActive: function(i) {
+      i = Math.max(0, Math.min(i, this.data.list.length - 1));
+      if (this.selectedHint == i) return;
+      var node = this.hints.childNodes[this.selectedHint];
+      node.className = node.className.replace(" CodeMirror-hint-active", "");
+      node = this.hints.childNodes[this.selectedHint = i];
+      node.className += " CodeMirror-hint-active";
+      if (node.offsetTop < this.hints.scrollTop)
+        this.hints.scrollTop = node.offsetTop - 3;
+      else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
+        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;
+      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
+    },
+
+    screenAmount: function() {
+      return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
+    }
+  };
+})();

From 641adadfd356c1354b19b4a88e91cdc1336f18fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Jun 2013 14:26:36 +0200
Subject: [PATCH 0204/4742] [merge addon] Initial add

---
 addon/merge/dep/diff_match_patch.js |  50 ++++
 addon/merge/merge.css               |  82 ++++++
 addon/merge/merge.js                | 431 ++++++++++++++++++++++++++++
 demo/merge.html                     |  63 ++++
 doc/manual.html                     |  14 +
 test/lint/lint.js                   |   2 +-
 6 files changed, 641 insertions(+), 1 deletion(-)
 create mode 100644 addon/merge/dep/diff_match_patch.js
 create mode 100644 addon/merge/merge.css
 create mode 100644 addon/merge/merge.js
 create mode 100644 demo/merge.html

diff --git a/addon/merge/dep/diff_match_patch.js b/addon/merge/dep/diff_match_patch.js
new file mode 100644
index 0000000000..ac34105fc4
--- /dev/null
+++ b/addon/merge/dep/diff_match_patch.js
@@ -0,0 +1,50 @@
+// From https://code.google.com/p/google-diff-match-patch/ , licensed under the Apache License 2.0
+(function(){function diff_match_patch(){this.Diff_Timeout=1;this.Diff_EditCost=4;this.Match_Threshold=0.5;this.Match_Distance=1E3;this.Patch_DeleteThreshold=0.5;this.Patch_Margin=4;this.Match_MaxBits=32}
+diff_match_patch.prototype.diff_main=function(a,b,c,d){"undefined"==typeof d&&(d=0>=this.Diff_Timeout?Number.MAX_VALUE:(new Date).getTime()+1E3*this.Diff_Timeout);if(null==a||null==b)throw Error("Null input. (diff_main)");if(a==b)return a?[[0,a]]:[];"undefined"==typeof c&&(c=!0);var e=c,f=this.diff_commonPrefix(a,b);c=a.substring(0,f);a=a.substring(f);b=b.substring(f);var f=this.diff_commonSuffix(a,b),g=a.substring(a.length-f);a=a.substring(0,a.length-f);b=b.substring(0,b.length-f);a=this.diff_compute_(a,
+b,e,d);c&&a.unshift([0,c]);g&&a.push([0,g]);this.diff_cleanupMerge(a);return a};
+diff_match_patch.prototype.diff_compute_=function(a,b,c,d){if(!a)return[[1,b]];if(!b)return[[-1,a]];var e=a.length>b.length?a:b,f=a.length>b.length?b:a,g=e.indexOf(f);return-1!=g?(c=[[1,e.substring(0,g)],[0,f],[1,e.substring(g+f.length)]],a.length>b.length&&(c[0][0]=c[2][0]=-1),c):1==f.length?[[-1,a],[1,b]]:(e=this.diff_halfMatch_(a,b))?(f=e[0],a=e[1],g=e[2],b=e[3],e=e[4],f=this.diff_main(f,g,c,d),c=this.diff_main(a,b,c,d),f.concat([[0,e]],c)):c&&100<a.length&&100<b.length?this.diff_lineMode_(a,b,
+d):this.diff_bisect_(a,b,d)};
+diff_match_patch.prototype.diff_lineMode_=function(a,b,c){var d=this.diff_linesToChars_(a,b);a=d.chars1;b=d.chars2;d=d.lineArray;a=this.diff_main(a,b,!1,c);this.diff_charsToLines_(a,d);this.diff_cleanupSemantic(a);a.push([0,""]);for(var e=d=b=0,f="",g="";b<a.length;){switch(a[b][0]){case 1:e++;g+=a[b][1];break;case -1:d++;f+=a[b][1];break;case 0:if(1<=d&&1<=e){a.splice(b-d-e,d+e);b=b-d-e;d=this.diff_main(f,g,!1,c);for(e=d.length-1;0<=e;e--)a.splice(b,0,d[e]);b+=d.length}d=e=0;g=f=""}b++}a.pop();return a};
+diff_match_patch.prototype.diff_bisect_=function(a,b,c){for(var d=a.length,e=b.length,f=Math.ceil((d+e)/2),g=f,h=2*f,j=Array(h),i=Array(h),k=0;k<h;k++)j[k]=-1,i[k]=-1;j[g+1]=0;i[g+1]=0;for(var k=d-e,q=0!=k%2,r=0,t=0,p=0,w=0,v=0;v<f&&!((new Date).getTime()>c);v++){for(var n=-v+r;n<=v-t;n+=2){var l=g+n,m;m=n==-v||n!=v&&j[l-1]<j[l+1]?j[l+1]:j[l-1]+1;for(var s=m-n;m<d&&s<e&&a.charAt(m)==b.charAt(s);)m++,s++;j[l]=m;if(m>d)t+=2;else if(s>e)r+=2;else if(q&&(l=g+k-n,0<=l&&l<h&&-1!=i[l])){var u=d-i[l];if(m>=
+u)return this.diff_bisectSplit_(a,b,m,s,c)}}for(n=-v+p;n<=v-w;n+=2){l=g+n;u=n==-v||n!=v&&i[l-1]<i[l+1]?i[l+1]:i[l-1]+1;for(m=u-n;u<d&&m<e&&a.charAt(d-u-1)==b.charAt(e-m-1);)u++,m++;i[l]=u;if(u>d)w+=2;else if(m>e)p+=2;else if(!q&&(l=g+k-n,0<=l&&(l<h&&-1!=j[l])&&(m=j[l],s=g+m-l,u=d-u,m>=u)))return this.diff_bisectSplit_(a,b,m,s,c)}}return[[-1,a],[1,b]]};
+diff_match_patch.prototype.diff_bisectSplit_=function(a,b,c,d,e){var f=a.substring(0,c),g=b.substring(0,d);a=a.substring(c);b=b.substring(d);f=this.diff_main(f,g,!1,e);e=this.diff_main(a,b,!1,e);return f.concat(e)};
+diff_match_patch.prototype.diff_linesToChars_=function(a,b){function c(a){for(var b="",c=0,f=-1,g=d.length;f<a.length-1;){f=a.indexOf("\n",c);-1==f&&(f=a.length-1);var r=a.substring(c,f+1),c=f+1;(e.hasOwnProperty?e.hasOwnProperty(r):void 0!==e[r])?b+=String.fromCharCode(e[r]):(b+=String.fromCharCode(g),e[r]=g,d[g++]=r)}return b}var d=[],e={};d[0]="";var f=c(a),g=c(b);return{chars1:f,chars2:g,lineArray:d}};
+diff_match_patch.prototype.diff_charsToLines_=function(a,b){for(var c=0;c<a.length;c++){for(var d=a[c][1],e=[],f=0;f<d.length;f++)e[f]=b[d.charCodeAt(f)];a[c][1]=e.join("")}};diff_match_patch.prototype.diff_commonPrefix=function(a,b){if(!a||!b||a.charAt(0)!=b.charAt(0))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(f,e)==b.substring(f,e)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
+diff_match_patch.prototype.diff_commonSuffix=function(a,b){if(!a||!b||a.charAt(a.length-1)!=b.charAt(b.length-1))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(a.length-e,a.length-f)==b.substring(b.length-e,b.length-f)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
+diff_match_patch.prototype.diff_commonOverlap_=function(a,b){var c=a.length,d=b.length;if(0==c||0==d)return 0;c>d?a=a.substring(c-d):c<d&&(b=b.substring(0,c));c=Math.min(c,d);if(a==b)return c;for(var d=0,e=1;;){var f=a.substring(c-e),f=b.indexOf(f);if(-1==f)return d;e+=f;if(0==f||a.substring(c-e)==b.substring(0,e))d=e,e++}};
+diff_match_patch.prototype.diff_halfMatch_=function(a,b){function c(a,b,c){for(var d=a.substring(c,c+Math.floor(a.length/4)),e=-1,g="",h,j,n,l;-1!=(e=b.indexOf(d,e+1));){var m=f.diff_commonPrefix(a.substring(c),b.substring(e)),s=f.diff_commonSuffix(a.substring(0,c),b.substring(0,e));g.length<s+m&&(g=b.substring(e-s,e)+b.substring(e,e+m),h=a.substring(0,c-s),j=a.substring(c+m),n=b.substring(0,e-s),l=b.substring(e+m))}return 2*g.length>=a.length?[h,j,n,l,g]:null}if(0>=this.Diff_Timeout)return null;
+var d=a.length>b.length?a:b,e=a.length>b.length?b:a;if(4>d.length||2*e.length<d.length)return null;var f=this,g=c(d,e,Math.ceil(d.length/4)),d=c(d,e,Math.ceil(d.length/2)),h;if(!g&&!d)return null;h=d?g?g[4].length>d[4].length?g:d:d:g;var j;a.length>b.length?(g=h[0],d=h[1],e=h[2],j=h[3]):(e=h[0],j=h[1],g=h[2],d=h[3]);h=h[4];return[g,d,e,j,h]};
+diff_match_patch.prototype.diff_cleanupSemantic=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=0,h=0,j=0,i=0;f<a.length;)0==a[f][0]?(c[d++]=f,g=j,h=i,i=j=0,e=a[f][1]):(1==a[f][0]?j+=a[f][1].length:i+=a[f][1].length,e&&(e.length<=Math.max(g,h)&&e.length<=Math.max(j,i))&&(a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,d--,f=0<d?c[d-1]:-1,i=j=h=g=0,e=null,b=!0)),f++;b&&this.diff_cleanupMerge(a);this.diff_cleanupSemanticLossless(a);for(f=1;f<a.length;){if(-1==a[f-1][0]&&1==a[f][0]){b=a[f-1][1];c=a[f][1];
+d=this.diff_commonOverlap_(b,c);e=this.diff_commonOverlap_(c,b);if(d>=e){if(d>=b.length/2||d>=c.length/2)a.splice(f,0,[0,c.substring(0,d)]),a[f-1][1]=b.substring(0,b.length-d),a[f+1][1]=c.substring(d),f++}else if(e>=b.length/2||e>=c.length/2)a.splice(f,0,[0,b.substring(0,e)]),a[f-1][0]=1,a[f-1][1]=c.substring(0,c.length-e),a[f+1][0]=-1,a[f+1][1]=b.substring(e),f++;f++}f++}};
+diff_match_patch.prototype.diff_cleanupSemanticLossless=function(a){function b(a,b){if(!a||!b)return 6;var c=a.charAt(a.length-1),d=b.charAt(0),e=c.match(diff_match_patch.nonAlphaNumericRegex_),f=d.match(diff_match_patch.nonAlphaNumericRegex_),g=e&&c.match(diff_match_patch.whitespaceRegex_),h=f&&d.match(diff_match_patch.whitespaceRegex_),c=g&&c.match(diff_match_patch.linebreakRegex_),d=h&&d.match(diff_match_patch.linebreakRegex_),i=c&&a.match(diff_match_patch.blanklineEndRegex_),j=d&&b.match(diff_match_patch.blanklineStartRegex_);
+return i||j?5:c||d?4:e&&!g&&h?3:g||h?2:e||f?1:0}for(var c=1;c<a.length-1;){if(0==a[c-1][0]&&0==a[c+1][0]){var d=a[c-1][1],e=a[c][1],f=a[c+1][1],g=this.diff_commonSuffix(d,e);if(g)var h=e.substring(e.length-g),d=d.substring(0,d.length-g),e=h+e.substring(0,e.length-g),f=h+f;for(var g=d,h=e,j=f,i=b(d,e)+b(e,f);e.charAt(0)===f.charAt(0);){var d=d+e.charAt(0),e=e.substring(1)+f.charAt(0),f=f.substring(1),k=b(d,e)+b(e,f);k>=i&&(i=k,g=d,h=e,j=f)}a[c-1][1]!=g&&(g?a[c-1][1]=g:(a.splice(c-1,1),c--),a[c][1]=
+h,j?a[c+1][1]=j:(a.splice(c+1,1),c--))}c++}};diff_match_patch.nonAlphaNumericRegex_=/[^a-zA-Z0-9]/;diff_match_patch.whitespaceRegex_=/\s/;diff_match_patch.linebreakRegex_=/[\r\n]/;diff_match_patch.blanklineEndRegex_=/\n\r?\n$/;diff_match_patch.blanklineStartRegex_=/^\r?\n\r?\n/;
+diff_match_patch.prototype.diff_cleanupEfficiency=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=!1,h=!1,j=!1,i=!1;f<a.length;){if(0==a[f][0])a[f][1].length<this.Diff_EditCost&&(j||i)?(c[d++]=f,g=j,h=i,e=a[f][1]):(d=0,e=null),j=i=!1;else if(-1==a[f][0]?i=!0:j=!0,e&&(g&&h&&j&&i||e.length<this.Diff_EditCost/2&&3==g+h+j+i))a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,e=null,g&&h?(j=i=!0,d=0):(d--,f=0<d?c[d-1]:-1,j=i=!1),b=!0;f++}b&&this.diff_cleanupMerge(a)};
+diff_match_patch.prototype.diff_cleanupMerge=function(a){a.push([0,""]);for(var b=0,c=0,d=0,e="",f="",g;b<a.length;)switch(a[b][0]){case 1:d++;f+=a[b][1];b++;break;case -1:c++;e+=a[b][1];b++;break;case 0:1<c+d?(0!==c&&0!==d&&(g=this.diff_commonPrefix(f,e),0!==g&&(0<b-c-d&&0==a[b-c-d-1][0]?a[b-c-d-1][1]+=f.substring(0,g):(a.splice(0,0,[0,f.substring(0,g)]),b++),f=f.substring(g),e=e.substring(g)),g=this.diff_commonSuffix(f,e),0!==g&&(a[b][1]=f.substring(f.length-g)+a[b][1],f=f.substring(0,f.length-
+g),e=e.substring(0,e.length-g))),0===c?a.splice(b-d,c+d,[1,f]):0===d?a.splice(b-c,c+d,[-1,e]):a.splice(b-c-d,c+d,[-1,e],[1,f]),b=b-c-d+(c?1:0)+(d?1:0)+1):0!==b&&0==a[b-1][0]?(a[b-1][1]+=a[b][1],a.splice(b,1)):b++,c=d=0,f=e=""}""===a[a.length-1][1]&&a.pop();c=!1;for(b=1;b<a.length-1;)0==a[b-1][0]&&0==a[b+1][0]&&(a[b][1].substring(a[b][1].length-a[b-1][1].length)==a[b-1][1]?(a[b][1]=a[b-1][1]+a[b][1].substring(0,a[b][1].length-a[b-1][1].length),a[b+1][1]=a[b-1][1]+a[b+1][1],a.splice(b-1,1),c=!0):a[b][1].substring(0,
+a[b+1][1].length)==a[b+1][1]&&(a[b-1][1]+=a[b+1][1],a[b][1]=a[b][1].substring(a[b+1][1].length)+a[b+1][1],a.splice(b+1,1),c=!0)),b++;c&&this.diff_cleanupMerge(a)};diff_match_patch.prototype.diff_xIndex=function(a,b){var c=0,d=0,e=0,f=0,g;for(g=0;g<a.length;g++){1!==a[g][0]&&(c+=a[g][1].length);-1!==a[g][0]&&(d+=a[g][1].length);if(c>b)break;e=c;f=d}return a.length!=g&&-1===a[g][0]?f:f+(b-e)};
+diff_match_patch.prototype.diff_prettyHtml=function(a){for(var b=[],c=/&/g,d=/</g,e=/>/g,f=/\n/g,g=0;g<a.length;g++){var h=a[g][0],j=a[g][1],j=j.replace(c,"&amp;").replace(d,"&lt;").replace(e,"&gt;").replace(f,"&para;<br>");switch(h){case 1:b[g]='<ins style="background:#e6ffe6;">'+j+"</ins>";break;case -1:b[g]='<del style="background:#ffe6e6;">'+j+"</del>";break;case 0:b[g]="<span>"+j+"</span>"}}return b.join("")};
+diff_match_patch.prototype.diff_text1=function(a){for(var b=[],c=0;c<a.length;c++)1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_text2=function(a){for(var b=[],c=0;c<a.length;c++)-1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_levenshtein=function(a){for(var b=0,c=0,d=0,e=0;e<a.length;e++){var f=a[e][0],g=a[e][1];switch(f){case 1:c+=g.length;break;case -1:d+=g.length;break;case 0:b+=Math.max(c,d),d=c=0}}return b+=Math.max(c,d)};
+diff_match_patch.prototype.diff_toDelta=function(a){for(var b=[],c=0;c<a.length;c++)switch(a[c][0]){case 1:b[c]="+"+encodeURI(a[c][1]);break;case -1:b[c]="-"+a[c][1].length;break;case 0:b[c]="="+a[c][1].length}return b.join("\t").replace(/%20/g," ")};
+diff_match_patch.prototype.diff_fromDelta=function(a,b){for(var c=[],d=0,e=0,f=b.split(/\t/g),g=0;g<f.length;g++){var h=f[g].substring(1);switch(f[g].charAt(0)){case "+":try{c[d++]=[1,decodeURI(h)]}catch(j){throw Error("Illegal escape in diff_fromDelta: "+h);}break;case "-":case "=":var i=parseInt(h,10);if(isNaN(i)||0>i)throw Error("Invalid number in diff_fromDelta: "+h);h=a.substring(e,e+=i);"="==f[g].charAt(0)?c[d++]=[0,h]:c[d++]=[-1,h];break;default:if(f[g])throw Error("Invalid diff operation in diff_fromDelta: "+
+f[g]);}}if(e!=a.length)throw Error("Delta length ("+e+") does not equal source text length ("+a.length+").");return c};diff_match_patch.prototype.match_main=function(a,b,c){if(null==a||null==b||null==c)throw Error("Null input. (match_main)");c=Math.max(0,Math.min(c,a.length));return a==b?0:a.length?a.substring(c,c+b.length)==b?c:this.match_bitap_(a,b,c):-1};
+diff_match_patch.prototype.match_bitap_=function(a,b,c){function d(a,d){var e=a/b.length,g=Math.abs(c-d);return!f.Match_Distance?g?1:e:e+g/f.Match_Distance}if(b.length>this.Match_MaxBits)throw Error("Pattern too long for this browser.");var e=this.match_alphabet_(b),f=this,g=this.Match_Threshold,h=a.indexOf(b,c);-1!=h&&(g=Math.min(d(0,h),g),h=a.lastIndexOf(b,c+b.length),-1!=h&&(g=Math.min(d(0,h),g)));for(var j=1<<b.length-1,h=-1,i,k,q=b.length+a.length,r,t=0;t<b.length;t++){i=0;for(k=q;i<k;)d(t,c+
+k)<=g?i=k:q=k,k=Math.floor((q-i)/2+i);q=k;i=Math.max(1,c-k+1);var p=Math.min(c+k,a.length)+b.length;k=Array(p+2);for(k[p+1]=(1<<t)-1;p>=i;p--){var w=e[a.charAt(p-1)];k[p]=0===t?(k[p+1]<<1|1)&w:(k[p+1]<<1|1)&w|((r[p+1]|r[p])<<1|1)|r[p+1];if(k[p]&j&&(w=d(t,p-1),w<=g))if(g=w,h=p-1,h>c)i=Math.max(1,2*c-h);else break}if(d(t+1,c)>g)break;r=k}return h};
+diff_match_patch.prototype.match_alphabet_=function(a){for(var b={},c=0;c<a.length;c++)b[a.charAt(c)]=0;for(c=0;c<a.length;c++)b[a.charAt(c)]|=1<<a.length-c-1;return b};
+diff_match_patch.prototype.patch_addContext_=function(a,b){if(0!=b.length){for(var c=b.substring(a.start2,a.start2+a.length1),d=0;b.indexOf(c)!=b.lastIndexOf(c)&&c.length<this.Match_MaxBits-this.Patch_Margin-this.Patch_Margin;)d+=this.Patch_Margin,c=b.substring(a.start2-d,a.start2+a.length1+d);d+=this.Patch_Margin;(c=b.substring(a.start2-d,a.start2))&&a.diffs.unshift([0,c]);(d=b.substring(a.start2+a.length1,a.start2+a.length1+d))&&a.diffs.push([0,d]);a.start1-=c.length;a.start2-=c.length;a.length1+=
+c.length+d.length;a.length2+=c.length+d.length}};
+diff_match_patch.prototype.patch_make=function(a,b,c){var d;if("string"==typeof a&&"string"==typeof b&&"undefined"==typeof c)d=a,b=this.diff_main(d,b,!0),2<b.length&&(this.diff_cleanupSemantic(b),this.diff_cleanupEfficiency(b));else if(a&&"object"==typeof a&&"undefined"==typeof b&&"undefined"==typeof c)b=a,d=this.diff_text1(b);else if("string"==typeof a&&b&&"object"==typeof b&&"undefined"==typeof c)d=a;else if("string"==typeof a&&"string"==typeof b&&c&&"object"==typeof c)d=a,b=c;else throw Error("Unknown call format to patch_make.");
+if(0===b.length)return[];c=[];a=new diff_match_patch.patch_obj;for(var e=0,f=0,g=0,h=d,j=0;j<b.length;j++){var i=b[j][0],k=b[j][1];!e&&0!==i&&(a.start1=f,a.start2=g);switch(i){case 1:a.diffs[e++]=b[j];a.length2+=k.length;d=d.substring(0,g)+k+d.substring(g);break;case -1:a.length1+=k.length;a.diffs[e++]=b[j];d=d.substring(0,g)+d.substring(g+k.length);break;case 0:k.length<=2*this.Patch_Margin&&e&&b.length!=j+1?(a.diffs[e++]=b[j],a.length1+=k.length,a.length2+=k.length):k.length>=2*this.Patch_Margin&&
+e&&(this.patch_addContext_(a,h),c.push(a),a=new diff_match_patch.patch_obj,e=0,h=d,f=g)}1!==i&&(f+=k.length);-1!==i&&(g+=k.length)}e&&(this.patch_addContext_(a,h),c.push(a));return c};diff_match_patch.prototype.patch_deepCopy=function(a){for(var b=[],c=0;c<a.length;c++){var d=a[c],e=new diff_match_patch.patch_obj;e.diffs=[];for(var f=0;f<d.diffs.length;f++)e.diffs[f]=d.diffs[f].slice();e.start1=d.start1;e.start2=d.start2;e.length1=d.length1;e.length2=d.length2;b[c]=e}return b};
+diff_match_patch.prototype.patch_apply=function(a,b){if(0==a.length)return[b,[]];a=this.patch_deepCopy(a);var c=this.patch_addPadding(a);b=c+b+c;this.patch_splitMax(a);for(var d=0,e=[],f=0;f<a.length;f++){var g=a[f].start2+d,h=this.diff_text1(a[f].diffs),j,i=-1;if(h.length>this.Match_MaxBits){if(j=this.match_main(b,h.substring(0,this.Match_MaxBits),g),-1!=j&&(i=this.match_main(b,h.substring(h.length-this.Match_MaxBits),g+h.length-this.Match_MaxBits),-1==i||j>=i))j=-1}else j=this.match_main(b,h,g);
+if(-1==j)e[f]=!1,d-=a[f].length2-a[f].length1;else if(e[f]=!0,d=j-g,g=-1==i?b.substring(j,j+h.length):b.substring(j,i+this.Match_MaxBits),h==g)b=b.substring(0,j)+this.diff_text2(a[f].diffs)+b.substring(j+h.length);else if(g=this.diff_main(h,g,!1),h.length>this.Match_MaxBits&&this.diff_levenshtein(g)/h.length>this.Patch_DeleteThreshold)e[f]=!1;else{this.diff_cleanupSemanticLossless(g);for(var h=0,k,i=0;i<a[f].diffs.length;i++){var q=a[f].diffs[i];0!==q[0]&&(k=this.diff_xIndex(g,h));1===q[0]?b=b.substring(0,
+j+k)+q[1]+b.substring(j+k):-1===q[0]&&(b=b.substring(0,j+k)+b.substring(j+this.diff_xIndex(g,h+q[1].length)));-1!==q[0]&&(h+=q[1].length)}}}b=b.substring(c.length,b.length-c.length);return[b,e]};
+diff_match_patch.prototype.patch_addPadding=function(a){for(var b=this.Patch_Margin,c="",d=1;d<=b;d++)c+=String.fromCharCode(d);for(d=0;d<a.length;d++)a[d].start1+=b,a[d].start2+=b;var d=a[0],e=d.diffs;if(0==e.length||0!=e[0][0])e.unshift([0,c]),d.start1-=b,d.start2-=b,d.length1+=b,d.length2+=b;else if(b>e[0][1].length){var f=b-e[0][1].length;e[0][1]=c.substring(e[0][1].length)+e[0][1];d.start1-=f;d.start2-=f;d.length1+=f;d.length2+=f}d=a[a.length-1];e=d.diffs;0==e.length||0!=e[e.length-1][0]?(e.push([0,
+c]),d.length1+=b,d.length2+=b):b>e[e.length-1][1].length&&(f=b-e[e.length-1][1].length,e[e.length-1][1]+=c.substring(0,f),d.length1+=f,d.length2+=f);return c};
+diff_match_patch.prototype.patch_splitMax=function(a){for(var b=this.Match_MaxBits,c=0;c<a.length;c++)if(!(a[c].length1<=b)){var d=a[c];a.splice(c--,1);for(var e=d.start1,f=d.start2,g="";0!==d.diffs.length;){var h=new diff_match_patch.patch_obj,j=!0;h.start1=e-g.length;h.start2=f-g.length;""!==g&&(h.length1=h.length2=g.length,h.diffs.push([0,g]));for(;0!==d.diffs.length&&h.length1<b-this.Patch_Margin;){var g=d.diffs[0][0],i=d.diffs[0][1];1===g?(h.length2+=i.length,f+=i.length,h.diffs.push(d.diffs.shift()),
+j=!1):-1===g&&1==h.diffs.length&&0==h.diffs[0][0]&&i.length>2*b?(h.length1+=i.length,e+=i.length,j=!1,h.diffs.push([g,i]),d.diffs.shift()):(i=i.substring(0,b-h.length1-this.Patch_Margin),h.length1+=i.length,e+=i.length,0===g?(h.length2+=i.length,f+=i.length):j=!1,h.diffs.push([g,i]),i==d.diffs[0][1]?d.diffs.shift():d.diffs[0][1]=d.diffs[0][1].substring(i.length))}g=this.diff_text2(h.diffs);g=g.substring(g.length-this.Patch_Margin);i=this.diff_text1(d.diffs).substring(0,this.Patch_Margin);""!==i&&
+(h.length1+=i.length,h.length2+=i.length,0!==h.diffs.length&&0===h.diffs[h.diffs.length-1][0]?h.diffs[h.diffs.length-1][1]+=i:h.diffs.push([0,i]));j||a.splice(++c,0,h)}}};diff_match_patch.prototype.patch_toText=function(a){for(var b=[],c=0;c<a.length;c++)b[c]=a[c];return b.join("")};
+diff_match_patch.prototype.patch_fromText=function(a){var b=[];if(!a)return b;a=a.split("\n");for(var c=0,d=/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;c<a.length;){var e=a[c].match(d);if(!e)throw Error("Invalid patch string: "+a[c]);var f=new diff_match_patch.patch_obj;b.push(f);f.start1=parseInt(e[1],10);""===e[2]?(f.start1--,f.length1=1):"0"==e[2]?f.length1=0:(f.start1--,f.length1=parseInt(e[2],10));f.start2=parseInt(e[3],10);""===e[4]?(f.start2--,f.length2=1):"0"==e[4]?f.length2=0:(f.start2--,f.length2=
+parseInt(e[4],10));for(c++;c<a.length;){e=a[c].charAt(0);try{var g=decodeURI(a[c].substring(1))}catch(h){throw Error("Illegal escape in patch_fromText: "+g);}if("-"==e)f.diffs.push([-1,g]);else if("+"==e)f.diffs.push([1,g]);else if(" "==e)f.diffs.push([0,g]);else if("@"==e)break;else if(""!==e)throw Error('Invalid patch mode "'+e+'" in: '+g);c++}}return b};diff_match_patch.patch_obj=function(){this.diffs=[];this.start2=this.start1=null;this.length2=this.length1=0};
+diff_match_patch.patch_obj.prototype.toString=function(){var a,b;a=0===this.length1?this.start1+",0":1==this.length1?this.start1+1:this.start1+1+","+this.length1;b=0===this.length2?this.start2+",0":1==this.length2?this.start2+1:this.start2+1+","+this.length2;a=["@@ -"+a+" +"+b+" @@\n"];var c;for(b=0;b<this.diffs.length;b++){switch(this.diffs[b][0]){case 1:c="+";break;case -1:c="-";break;case 0:c=" "}a[b+1]=c+encodeURI(this.diffs[b][1])+"\n"}return a.join("").replace(/%20/g," ")};
+this.diff_match_patch=diff_match_patch;this.DIFF_DELETE=-1;this.DIFF_INSERT=1;this.DIFF_EQUAL=0;})()
diff --git a/addon/merge/merge.css b/addon/merge/merge.css
new file mode 100644
index 0000000000..1f20f88a43
--- /dev/null
+++ b/addon/merge/merge.css
@@ -0,0 +1,82 @@
+.CodeMirror-diff {
+  position: relative;
+  border: 1px solid #ddd;
+}
+
+.CodeMirror-diff, .CodeMirror-diff .CodeMirror {
+  height: 350px;
+}
+
+.CodeMirror-diff-2pane .CodeMirror-diff-pane { width: 47%; }
+.CodeMirror-diff-2pane .CodeMirror-diff-gap { width: 6%; }
+.CodeMirror-diff-3pane .CodeMirror-diff-pane { width: 31%; }
+.CodeMirror-diff-3pane .CodeMirror-diff-gap { width: 3.5%; }
+
+.CodeMirror-diff-pane {
+  float: left;
+}
+
+.CodeMirror-diff-gap {
+  float: left;
+  height: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+  border-left: 1px solid #ddd;
+  border-right: 1px solid #ddd;
+  position: relative;
+  background: #f8f8f8;
+}
+
+.CodeMirror-diff-scrolllock-wrap {
+  position: absolute;
+  bottom: 0; left: 50%;
+}
+.CodeMirror-diff-scrolllock {
+  position: relative;
+  left: -50%;
+  cursor: pointer;
+  color: #555;
+  line-height: 1;
+}
+
+.CodeMirror-diff-copybuttons-left, .CodeMirror-diff-copybuttons-right {
+  position: absolute;
+  left: 0; top: 0;
+  right: 0; bottom: 0;
+  line-height: 1;
+}
+
+.CodeMirror-diff-copy {
+  position: absolute;
+  cursor: pointer;
+  color: #44c;
+}
+
+.CodeMirror-diff-copybuttons-left .CodeMirror-diff-copy { left: 2px; }
+.CodeMirror-diff-copybuttons-right .CodeMirror-diff-copy { right: 2px; }
+
+.CodeMirror-diff-r-inserted, .CodeMirror-diff-l-inserted {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
+  background-position: bottom left;
+  background-repeat: repeat-x;
+}
+
+.CodeMirror-diff-r-deleted, .CodeMirror-diff-l-deleted {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
+  background-position: bottom left;
+  background-repeat: repeat-x;
+}
+
+.CodeMirror-diff-r-chunk { background: #ffffe0; }
+.CodeMirror-diff-r-chunk-start { border-top: 1px solid #ee8; }
+.CodeMirror-diff-r-chunk-end { border-bottom: 1px solid #ee8; }
+.CodeMirror-diff-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
+
+.CodeMirror-diff-l-chunk { background: #eef; }
+.CodeMirror-diff-l-chunk-start { border-top: 1px solid #88e; }
+.CodeMirror-diff-l-chunk-end { border-bottom: 1px solid #88e; }
+.CodeMirror-diff-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
+
+.CodeMirror-diff-l-chunk.CodeMirror-diff-r-chunk { background: #dfd; }
+.CodeMirror-diff-l-chunk-start.CodeMirror-diff-r-chunk-start { border-top: 1px solid #4e4; }
+.CodeMirror-diff-l-chunk-end.CodeMirror-diff-r-chunk-end { border-bottom: 1px solid #4e4; }
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
new file mode 100644
index 0000000000..b112518596
--- /dev/null
+++ b/addon/merge/merge.js
@@ -0,0 +1,431 @@
+(function() {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+  var svgNS = "http://www.w3.org/2000/svg";
+
+  function DiffView(mv, type) {
+    this.mv = mv;
+    this.type = type;
+    this.classes = type == "left"
+      ? {chunk: "CodeMirror-diff-l-chunk",
+         start: "CodeMirror-diff-l-chunk-start",
+         end: "CodeMirror-diff-l-chunk-end",
+         insert: "CodeMirror-diff-l-inserted",
+         del: "CodeMirror-diff-l-deleted",
+         connect: "CodeMirror-diff-l-connect"}
+      : {chunk: "CodeMirror-diff-r-chunk",
+         start: "CodeMirror-diff-r-chunk-start",
+         end: "CodeMirror-diff-r-chunk-end",
+         insert: "CodeMirror-diff-r-inserted",
+         del: "CodeMirror-diff-r-deleted",
+         connect: "CodeMirror-diff-r-connect"};
+  }
+
+  DiffView.prototype = {
+    constructor: DiffView,
+    init: function(pane, orig, options) {
+      this.edit = this.mv.edit;
+      this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: true}, copyObj(options)));
+
+      this.diff = getDiff(orig, options.value);
+      this.diffOutOfDate = false;
+
+      this.forceUpdate = registerUpdate(this);
+      setScrollLock(this, true, false);
+      registerScroll(this);
+    }
+  };
+
+  function registerUpdate(dv) {
+    var edit = {from: 0, to: 0, marked: []};
+    var orig = {from: 0, to: 0, marked: []};
+    var debounceChange;
+    function update() {
+      if (dv.diffOutOfDate) {
+        dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
+        dv.diffOutOfDate = false;
+      }
+      updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
+      updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
+      drawConnectors(dv);
+    }
+    function set(slow) {
+      clearTimeout(debounceChange);
+      debounceChange = setTimeout(update, slow == true ? 250 : 100);
+    }
+    dv.edit.on("change", function() {
+      if (!dv.diffOutOfDate) {
+        dv.diffOutOfDate = true;
+        edit.from = edit.to = orig.from = orig.to = 0;
+      }
+      set(true);
+    });
+    dv.edit.on("viewportChange", set);
+    dv.orig.on("viewportChange", set);
+    update();
+    return update;
+  }
+
+  function registerScroll(dv) {
+    dv.edit.on("scroll", function() {
+      syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
+    });
+    dv.orig.on("scroll", function() {
+      syncScroll(dv, DIFF_DELETE) && drawConnectors(dv);
+    });
+  }
+
+  function syncScroll(dv, type) {
+    // Change handler will do a refresh after a timeout when diff is out of date
+    if (dv.diffOutOfDate) return false;
+    if (!dv.lockScroll) return true;
+    var editor, other, now = +new Date;
+    if (type == DIFF_INSERT) { editor = dv.edit; other = dv.orig; }
+    else { editor = dv.orig; other = dv.edit; }
+    // Don't take action if the position of this editor was recently set
+    // (to prevent feedback loops)
+    if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
+
+    var sInfo = editor.getScrollInfo(), halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
+    var mid = editor.lineAtHeight(midY, "local");
+    var around = chunkBoundariesAround(dv.diff, mid, type == DIFF_INSERT);
+    var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
+    var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
+    var ratio = (midY - off.top) / (off.bot - off.top);
+    other.scrollTo(null, (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top));
+    other.state.scrollSetAt = now;
+    other.state.scrollSetBy = dv;
+    return true;
+  }
+
+  function getOffsets(editor, around) {
+    var bot = around.after;
+    if (bot == null) bot = editor.lastLine() + 1;
+    return {top: editor.heightAtLine(around.before || 0, "local"),
+            bot: editor.heightAtLine(bot, "local")};
+  }
+
+  function setScrollLock(dv, val, action) {
+    dv.lockScroll = val;
+    if (val && action != false) syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
+    dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db&nbsp;&nbsp;\u21da";
+  }
+
+  // Updating the marks for editor content
+
+  function clearMarks(editor, arr, classes) {
+    for (var i = 0; i < arr.length; ++i) {
+      var mark = arr[i];
+      if (mark instanceof CodeMirror.TextMarker) {
+        mark.clear();
+      } else {
+        editor.removeLineClass(mark, "background", classes.chunk);
+        editor.removeLineClass(mark, "background", classes.start);
+        editor.removeLineClass(mark, "background", classes.end);
+      }
+    }
+    arr.length = 0;
+  }
+
+  // FIXME maybe add a margin around viewport to prevent too many updates
+  function updateMarks(editor, diff, state, type, classes) {
+    var vp = editor.getViewport();
+    editor.operation(function() {
+      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
+        clearMarks(editor, state.marked, classes);
+        markChanges(editor, diff, type, state.marked, vp.from, vp.to, classes);
+        state.from = vp.from; state.to = vp.to;
+      } else {
+        if (vp.from < state.from) {
+          markChanges(editor, diff, type, state.marked, vp.from, state.from, classes);
+          state.from = vp.from;
+        }
+        if (vp.to > state.to) {
+          markChanges(editor, diff, type, state.marked, state.to, vp.to, classes);
+          state.to = vp.to;
+        }
+      }
+    });
+  }
+
+  function markChanges(editor, diff, type, marks, from, to, classes) {
+    var pos = Pos(0, 0);
+    var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
+    var cls = type == DIFF_DELETE ? classes.del : classes.insert;
+    function markChunk(start, end) {
+      var bfrom = Math.max(from, start), bto = Math.min(to, end);
+      for (var i = bfrom; i < bto; ++i) {
+        var line = editor.addLineClass(i, "background", classes.chunk);
+        if (i == start) editor.addLineClass(line, "background", classes.start);
+        if (i == end - 1) editor.addLineClass(line, "background", classes.end);
+        marks.push(line);
+      }
+      // When the chunk is empty, make sure a horizontal line shows up
+      if (start == end && bfrom == end && bto == end) {
+        if (bfrom)
+          marks.push(editor.addLineClass(bfrom - 1, "background", classes.end));
+        else
+          marks.push(editor.addLineClass(bfrom, "background", classes.start));
+      }
+    }
+
+    var chunkStart = 0;
+    for (var i = 0; i < diff.length; ++i) {
+      var part = diff[i], tp = part[0], str = part[1];
+      if (tp == DIFF_EQUAL) {
+        var cleanFrom = pos.line + (startOfLineClean(diff, i) ? 0 : 1);
+        moveOver(pos, str);
+        var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
+        if (cleanTo > cleanFrom) {
+          if (i) markChunk(chunkStart, cleanFrom);
+          chunkStart = cleanTo;
+        }
+      } else {
+        if (tp == type) {
+          var end = moveOver(pos, str, true);
+          var a = posMax(top, pos), b = posMin(bot, end);
+          if (!posEq(a, b))
+            marks.push(editor.markText(a, b, {className: cls}));
+          pos = end;
+        }
+      }
+    }
+    if (chunkStart <= pos.line) markChunk(chunkStart, pos.line + 1);
+  }
+
+  // Updating the gap between editor and original
+
+  function drawConnectors(dv) {
+    if (dv.svg) {
+      clear(dv.svg);
+      var w = dv.gap.offsetWidth;
+      attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
+    }
+    clear(dv.copyButtons);
+
+    var flip = dv.type == "left";
+    var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
+    var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
+    iterateChunks(dv.diff, function(topOrig, botOrig, topEdit, botEdit) {
+      if (topEdit >= vpEdit.to || botEdit < vpEdit.from ||
+          topOrig >= vpOrig.to || botOrig < vpOrig.from)
+        return;
+      var topLpx = dv.orig.heightAtLine(topOrig, "local") - sTopOrig, top = topLpx;
+      if (dv.svg) {
+        var topRpx = dv.edit.heightAtLine(topEdit, "local") - sTopEdit;
+        if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
+        var botLpx = dv.orig.heightAtLine(botOrig, "local") - sTopOrig;
+        var botRpx = dv.edit.heightAtLine(botEdit, "local") - sTopEdit;
+        if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
+        var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
+        var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
+        attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
+              "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
+              "class", dv.classes.connect);
+      }
+      var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
+                                                "CodeMirror-diff-copy"));
+      copy.title = "Revert chunk";
+      copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
+      copy.style.top = top + "px";
+    });
+  }
+
+  function copyChunk(dv, chunk) {
+    if (dv.diffOutOfDate) return;
+    dv.edit.replaceRange(dv.orig.getRange(Pos(chunk.topOrig, 0), Pos(chunk.botOrig, 0)),
+                         Pos(chunk.topEdit, 0), Pos(chunk.botEdit, 0));
+  }
+
+  // Merge view, containing 0, 1, or 2 diff views.
+
+  var MergeView = CodeMirror.MergeView = function(node, options) {
+    if (!(this instanceof MergeView)) return new MergeView(node, options);
+
+    var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
+    var hasLeft = origLeft != null, hasRight = origRight != null;
+    var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
+    var wrap = [], left = this.left = null, right = this.right = null;
+
+    if (hasLeft) {
+      left = this.left = new DiffView(this, "left");
+      var leftPane = elt("div", null, "CodeMirror-diff-pane");
+      wrap.push(leftPane);
+      wrap.push(buildGap(left));
+    }
+
+    var editPane = elt("div", null, "CodeMirror-diff-pane");
+    wrap.push(editPane);
+
+    if (hasRight) {
+      right = this.right = new DiffView(this, "right");
+      wrap.push(buildGap(right));
+      var rightPane = elt("div", null, "CodeMirror-diff-pane");
+      wrap.push(rightPane);
+    }
+
+    wrap.push(elt("div", null, null, "height: 0; clear: both;"));
+    var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-diff CodeMirror-diff-" + panes + "pane"));
+    this.edit = CodeMirror(editPane, copyObj(options));
+
+    if (left) left.init(leftPane, origLeft, options);
+    if (right) right.init(rightPane, origRight, options);
+
+    var onResize = function() {
+      if (left) drawConnectors(left);
+      if (right) drawConnectors(right);
+    };
+    CodeMirror.on(window, "resize", onResize);
+    var resizeInterval = setInterval(function() {
+      for (var p = wrapElt.parentNode; p && p != document.body; p = p.parentNode) {}
+      if (!p) { clearInterval(resizeInterval); CodeMirror.off(window, "resize", onResize); }
+    }, 5000);
+  };
+
+  function buildGap(dv) {
+    var lock = dv.lockButton = elt("div", null, "CodeMirror-diff-scrolllock");
+    lock.title = "Toggle locked scrolling";
+    var lockWrap = elt("div", [lock], "CodeMirror-diff-scrolllock-wrap");
+    CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
+    dv.copyButtons = elt("div", null, "CodeMirror-diff-copybuttons-" + dv.type);
+    CodeMirror.on(dv.copyButtons, "click", function(e) {
+      var node = e.target || e.srcElement;
+      if (node.chunk) copyChunk(dv, node.chunk);
+    });
+    var gapElts = [dv.copyButtons, lockWrap];
+    var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
+    if (svg && !svg.createSVGRect) svg = null;
+    dv.svg = svg;
+    if (svg) gapElts.push(svg);
+
+    return dv.gap = elt("div", gapElts, "CodeMirror-diff-gap");
+  }
+
+  MergeView.prototype = {
+    constuctor: MergeView,
+    editor: function() { return this.edit; },
+    rightOriginal: function() { return this.right && this.right.orig; },
+    leftOriginal: function() { return this.left && this.left.orig; }
+  };
+
+  // Operations on diffs
+
+  var dmp = new diff_match_patch();
+  function getDiff(a, b) {
+    var diff = dmp.diff_main(a, b);
+    dmp.diff_cleanupSemantic(diff);
+    // The library sometimes leaves in empty parts, which confuse the algorithm
+    for (var i = 0; i < diff.length; ++i) {
+      var part = diff[i];
+      if (!part[1]) {
+        diff.splice(i--, 1);
+      } else if (i && diff[i - 1][0] == part[0]) {
+        diff.splice(i--, 1);
+        diff[i][1] += part[1];
+      }
+    }
+    return diff;
+  }
+
+  function iterateChunks(diff, f) {
+    var startEdit = 0, startOrig = 0;
+    var edit = Pos(0, 0), orig = Pos(0, 0);
+    for (var i = 0; i < diff.length; ++i) {
+      var part = diff[i], tp = part[0];
+      if (tp == DIFF_EQUAL) {
+        var startOff = startOfLineClean(diff, i) ? 0 : 1;
+        var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
+        moveOver(edit, part[1], null, orig);
+        var endOff = endOfLineClean(diff, i) ? 1 : 0;
+        var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
+        if (cleanToEdit > cleanFromEdit) {
+          if (i) f(startOrig, cleanFromOrig, startEdit, cleanFromEdit);
+          startEdit = cleanToEdit; startOrig = cleanToOrig;
+        }
+      } else {
+        moveOver(tp == DIFF_INSERT ? edit : orig, part[1]);
+      }
+    }
+    if (startEdit <= edit.line || startOrig <= orig.line)
+      f(startOrig, orig.line + 1, startEdit, edit.line + 1);
+  }
+
+  function endOfLineClean(diff, i) {
+    if (i == diff.length - 1) return true;
+    var next = diff[i + 1][1];
+    if (next.length == 1 || next.charCodeAt(0) != 10) return false;
+    if (i == diff.length - 2) return true;
+    next = diff[i + 2][1];
+    return next.length > 1 && next.charCodeAt(0) == 10;
+  }
+
+  function startOfLineClean(diff, i) {
+    if (i == 0) return true;
+    var last = diff[i - 1][1];
+    if (last.charCodeAt(last.length - 1) != 10) return false;
+    if (i == 1) return true;
+    last = diff[i - 2][1];
+    return last.charCodeAt(last.length - 1) == 10;
+  }
+
+  function chunkBoundariesAround(diff, n, nInEdit) {
+    var beforeE, afterE, beforeO, afterO;
+    iterateChunks(diff, function(fromOrig, toOrig, fromEdit, toEdit) {
+      var fromLocal = nInEdit ? fromEdit : fromOrig;
+      var toLocal = nInEdit ? toEdit : toOrig;
+      if (afterE == null) {
+        if (fromLocal > n) { afterE = fromEdit; afterO = fromOrig; }
+        else if (toLocal > n) { afterE = toEdit; afterO = toOrig; }
+      }
+      if (toLocal <= n) { beforeE = toEdit; beforeO = toOrig; }
+      else if (fromLocal <= n) { beforeE = fromEdit; beforeO = fromOrig; }
+    });
+    return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
+  }
+
+  // General utilities
+
+  function elt(tag, content, className, style) {
+    var e = document.createElement(tag);
+    if (className) e.className = className;
+    if (style) e.style.cssText = style;
+    if (typeof content == "string") e.appendChild(document.createTextNode(content));
+    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
+    return e;
+  }
+
+  function clear(node) {
+    for (var count = node.childNodes.length; count > 0; --count)
+      node.removeChild(node.firstChild);
+  }
+
+  function attrs(elt) {
+    for (var i = 1; i < arguments.length; i += 2)
+      elt.setAttribute(arguments[i], arguments[i+1]);
+  }
+
+  function copyObj(obj, target) {
+    if (!target) target = {};
+    for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
+    return target;
+  }
+
+  function moveOver(pos, str, copy, other) {
+    var out = copy ? Pos(pos.line, pos.ch) : pos, at = 0;
+    for (;;) {
+      var nl = str.indexOf("\n", at);
+      if (nl == -1) break;
+      ++out.line;
+      if (other) ++other.line;
+      at = nl + 1;
+    }
+    out.ch = (at ? 0 : out.ch) + (str.length - at);
+    if (other) other.ch = (at ? 0 : other.ch) + (str.length - at);
+    return out;
+  }
+
+  function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
+  function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
+  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
+})();
diff --git a/demo/merge.html b/demo/merge.html
new file mode 100644
index 0000000000..907f769d57
--- /dev/null
+++ b/demo/merge.html
@@ -0,0 +1,63 @@
+<!doctype html>
+<head>
+  <meta charset="utf-8">
+  <link rel=stylesheet href="../lib/codemirror.css">
+  <script src="../lib/codemirror.js"></script>
+  <script src="../mode/xml/xml.js"></script>
+  <script src="../addon/merge/dep/diff_match_patch.js"></script>
+  <link rel=stylesheet href="../addon/merge/merge.css">
+  <script src="../addon/merge/merge.js"></script>
+  <link rel="stylesheet" href="../doc/docs.css">
+  <title>CodeMirror: merge view demo</title>
+  <style>
+    .CodeMirror { line-height: 1.2; }
+    body { max-width: 80em; }
+    span.clicky {
+      cursor: pointer;
+      background: #d70;
+      color: white;
+      padding: 0 3px;
+      border-radius: 3px;
+    }
+  </style>
+</head>
+
+<h1>CodeMirror: merge view demo</h1>
+
+<div id=view></div>
+
+<p>The <a href="../doc/manual.html#addon_merge"><code>merge</code></a>
+addon provides an interface for displaying and merging diffs,
+either <span class=clicky onclick="initUI(2)">two-way</span>
+or <span class=clicky onclick="initUI(3)">three-way</span>. The left
+(or center) pane is editable, and the differences with the other
+pane(s) are shown live as you edit it.</p>
+
+<p>This addon depends on
+the <a href="https://code.google.com/p/google-diff-match-patch/">google-diff-match-patch</a>
+library to compute the diffs.</p>
+
+<script>
+var value, orig1, orig2, dv;
+
+function initUI(panes) {
+  if (value == null) return;
+  var target = document.getElementById("view");
+  target.innerHTML = "";
+  dv = CodeMirror.MergeView(target, {
+    value: value,
+    origLeft: panes == 3 ? orig1 : null,
+    orig: orig2,
+    lineNumbers: true,
+    mode: "text/html"
+  });
+}
+
+window.onload = function() {
+  value = document.documentElement.innerHTML;
+  orig1 = value.replace(/\.\.\//g, "codemirror/").replace("yellow", "orange");
+  orig2 = value.replace(/\u003cscript/g, "\u003cscript type=text/javascript ")
+    .replace("white", "purple;\n      font: comic sans;\n      text-decoration: underline;\n      height: 15em");
+  initUI(2);
+};
+</script>
diff --git a/doc/manual.html b/doc/manual.html
index 4bf94b1c81..2ecd71fbe3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1957,6 +1957,20 @@ <h2 id="addons">Add-ons</h2>
       Also gives the editor a <code>CodeMirror-empty</code> CSS class
       whenever it doesn't contain any text.
       See <a href="../demo/placeholder.html">the demo</a>.</dd>
+
+      <dt id="addon_merge"><a href="../addon/merge/merge.js"><code>merge/merge.js</code></a></dt>
+      <dd>Implements an interface for merging changes, using either a
+      2-way or a 3-way view. The <code>CodeMirror.MergeView</code>
+      constructor takes arguments similar to
+      the <a href="#CodeMirror"><code>CodeMirror</code></a>
+      constructor, first a node to append the interface to, and then
+      an options object. Two extra optional options are
+      recognized, <code>origLeft</code> and <code>origRight</code>,
+      which may be strings that provide original versions of the
+      document, which will be shown to the left and right of the
+      editor in non-editable CodeMirror instances. The merge interface
+      will highlight changes between the editable document and the
+      original(s) (<a href="../demo/merge.html">demo</a>).</dd>
     </dl>
 
     <h2 id="modeapi">Writing CodeMirror Modes</h2>
diff --git a/test/lint/lint.js b/test/lint/lint.js
index 5f808922f2..4fc577fa01 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -103,7 +103,7 @@ function checkDir(dir) {
   fs.readdirSync(dir).forEach(function(file) {
     var fname = dir + "/" + file;
     if (/\.js$/.test(file)) checkFile(fname);
-    else if (fs.lstatSync(fname).isDirectory()) checkDir(fname);
+    else if (file != "dep" && fs.lstatSync(fname).isDirectory()) checkDir(fname);
   });
 }
 

From 4dee296563f3d6e6c1f1d93919e3a4875f60c70a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Jun 2013 19:31:08 +0200
Subject: [PATCH 0205/4742] [show-hint addon] Fix problem with close event
 firing too late

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

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 02c94f4408..35e5cbb721 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -19,7 +19,7 @@
     this.cm = cm;
     this.getHints = getHints;
     this.options = options;
-    this.widget = null;
+    this.widget = this.onClose = null;
   }
 
   Completion.prototype = {
@@ -27,6 +27,7 @@
       if (!this.active()) return;
 
       if (this.widget) this.widget.close();
+      if (this.onClose) this.onClose();
       this.cm.state.completionActive = null;
       CodeMirror.signal(this.cm, "endCompletion", this.cm);
     },
@@ -96,6 +97,7 @@
           debounce = setTimeout(update, 170);
       }
       this.cm.on("cursorActivity", activity);
+      this.onClose = done;
     }
   };
 

From 03449c69ffebdac0648a3f4d347cddd365522572 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <brandon@forewordreviews.com>
Date: Wed, 19 Jun 2013 15:53:02 -0400
Subject: [PATCH 0206/4742] [markdown mode] Fix bug with two links or email
 addresses on same line.

---
 mode/markdown/markdown.js | 4 ++--
 mode/markdown/test.js     | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index d93d55590e..72b0d6ced2 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -308,11 +308,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return type;
     }
 
-    if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, true)) {
+    if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, false)) {
       return switchInline(stream, state, inlineElement(linkinline, '>'));
     }
 
-    if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, true)) {
+    if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
       return switchInline(stream, state, inlineElement(linkemail, '>'));
     }
 
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index c451412fee..99ae056132 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -533,9 +533,15 @@
   MT("linkWeb",
      "[link <http://example.com/>] foo");
 
+  MT("linkWebDouble",
+     "[link <http://example.com/>] foo [link <http://example.com/>]");
+
   MT("linkEmail",
      "[link <user@example.com>] foo");
 
+  MT("linkEmailDouble",
+     "[link <user@example.com>] foo [link <user@example.com>]");
+
   MT("emAsterisk",
      "[em *foo*] bar");
 

From 112fdb507e33d0e3140124cdc4a689e790b2fec0 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <brandon@forewordreviews.com>
Date: Wed, 19 Jun 2013 16:00:29 -0400
Subject: [PATCH 0207/4742] [test harness] Escape < and & in test
 input/results.

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

diff --git a/test/mode_test.js b/test/mode_test.js
index 79a7752492..c759b257bf 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -84,7 +84,7 @@
     var s = '';
     if (pass) {
       s += '<div class="mt-test ' + passStyle + '">';
-      s +=   '<pre>' + text + '</pre>';
+      s +=   '<pre>' + text.replace('&', '&amp;').replace('<', '&lt;') + '</pre>';
       s +=   '<div class="cm-s-default">';
       s +=   prettyPrintOutputTable(observedOutput);
       s +=   '</div>';
@@ -92,7 +92,7 @@
       return s;
     } else {
       s += '<div class="mt-test ' + passStyle + '">';
-      s +=   '<pre>' + text + '</pre>';
+      s +=   '<pre>' + text.replace('&', '&amp;').replace('<', '&lt;') + '</pre>';
       s +=   '<div class="cm-s-default">';
       s += 'expected:';
       s +=   prettyPrintOutputTable(expectedOutput);
@@ -178,7 +178,7 @@
       s +=
       '<td class="mt-token">' +
         '<span class="cm-' + String(style).replace(/ +/g, " cm-") + '">' +
-        val.replace(/ /g,'\xb7') +
+        val.replace(/ /g,'\xb7').replace('&', '&amp;').replace('<', '&lt;') +
         '</span>' +
         '</td>';
     }

From b609e8f0e9041a619ad647d714b6ecdcf908e909 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Jun 2013 10:41:33 +0200
Subject: [PATCH 0208/4742] Document inputRead and keyHandled events

---
 doc/manual.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 2ecd71fbe3..ceaad6b44b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -431,6 +431,17 @@ <h2 id="events">Events</h2>
       <dd>Will be fired when the cursor or selection moves, or any
       change is made to the editor content.</dd>
 
+      <dt id="event_keyHandled"><code><strong>"keyHandled"</strong> (instance: CodeMirror, name: string, event: Event)</code></dt>
+      <dd>Fired after a key is handled through a
+      keymap. <code>name</code> is the name of the handled key (for
+      example <code>"Ctrl-X"</code> or <code>"'q'"</code>),
+      and <code>event</code> is the DOM <code>keydown</code>
+      or <code>keypress</code> event.</dd>
+
+      <dt id="event_inputRead"><code><strong>"inputRead"</strong> (instance: CodeMirror, changeObj: object)</code></dt>
+      <dd>Fired whenever new input is read from the hidden textarea
+      (typed or pasted by the user).</dd>
+
       <dt id="event_beforeSelectionChange"><code><strong>"beforeSelectionChange"</strong> (instance: CodeMirror, selection: {head, anchor})</code></dt>
       <dd>This event is fired before the selection is moved. Its
       handler may modify the resulting selection head and anchor.

From 7e4a1382542273717942961b862dd13da966123b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Jun 2013 10:44:37 +0200
Subject: [PATCH 0209/4742] Mark release 3.14.0

---
 doc/compress.html   |  2 ++
 doc/manual.html     | 10 ++++------
 doc/oldrelease.html | 14 ++++++++++++++
 index.html          | 41 +++++++++++++++++++++++++++--------------
 lib/codemirror.js   |  2 +-
 package.json        |  2 +-
 6 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 9c0fafec18..fede6f43fa 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -30,6 +30,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <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=3.14.0;f=">3.14</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.13.0;f=">3.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.12;f=">3.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.11;f=">3.11</option>
@@ -169,6 +170,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/addon/lint/lint.js">lint.js</option>
           <option value="http://codemirror.net/addon/lint/javascript-lint.js">javascript-lint.js</option>
           <option value="http://codemirror.net/addon/lint/json-lint.js">json-lint.js</option>
+          <option value="http://codemirror.net/addon/merge/merge.js">merge.js</option>
         </optgroup>
         <optgroup label="Keymaps">
           <option value="http://codemirror.net/keymap/emacs.js">emacs.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index ceaad6b44b..655e64db4c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1504,12 +1504,10 @@ <h3 id="api_static">Static properties</h3>
     <dl>
       <dt id="version"><code><strong>CodeMirror.version</strong>: string</code></dt>
       <dd>It contains a string that indicates the version of the
-      library. For releases, this simply
-      contains <code>"major.minor"</code> (for
-      example <code>"2.33"</code>. For beta versions, <code>" B"</code>
-      (space, capital B) is added at the end of the string, for
-      development snapshots, <code>" +"</code> (space, plus) is
-      added.</dd>
+      library. This is a triple of
+      integers <code>"major.minor.patch"</code>,
+      where <code>patch</code> is zero for releases, and something
+      else (usually one) for dev snapshots.</dd>
 
       <dt id="fromTextArea"><code><strong>CodeMirror.fromTextArea</strong>(textArea: TextAreaElement, ?config: object)</code></dt>
       <dd>
diff --git a/doc/oldrelease.html b/doc/oldrelease.html
index dd5d8e8c1d..40e15032b6 100644
--- a/doc/oldrelease.html
+++ b/doc/oldrelease.html
@@ -19,6 +19,20 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 </pre>
 </div>
 
+  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
+
+  <ul class="rel-note">
+    <li>New mode: <a href="../mode/z80/index.html">Z80 assembly</a>.</li>
+    <li>New theme: <a href="../demo/theme.html?twilight">Twilight</a>.</li>
+    <li>Add command-line compression helper.</li>
+    <li>Make <a href="manual.html#scrollIntoView"><code>scrollIntoView</code></a> public.</li>
+    <li>Add <a href="manual.html#defaultTextHeight"><code>defaultTextHeight</code></a> method.</li>
+    <li>Various extensions to the vim keymap.</li>
+    <li>Make <a href="../mode/php/index.html">PHP mode</a> build on <a href="../mode/htmlmixed/index.html">mixed HTML mode</a>.</li>
+    <li>Add <a href="manual.html#addon_continuecomment">comment-continuing</a> add-on.</li>
+    <li>Full <a href="../https://github.com/marijnh/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 7940aa6f04..6a9dbcb603 100644
--- a/index.html
+++ b/index.html
@@ -285,6 +285,33 @@ <h2>Reading material</h2>
 
   <h2 id=releases>Releases</h2>
 
+  <p class="rel">20-06-2013: <a href="http://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
+
+  <ul class="rel-note">
+    <li>New
+    addons: <a href="doc/manual.html#addon_trailingspace">trailing
+    space highlight</a>, <a href="doc/manual.html#addon_xml-hint">XML
+    completion</a> (rewritten),
+    and <a href="doc/manual.html#addon_merge">diff merging</a>.</li>
+    <li><a href="doc/manual.html#markText"><code>markText</code></a>
+    and <a href="doc/manual.html#addLineWidget"><code>addLineWidget</code></a>
+    now take a <code>handleMouseEvents</code> option.</li>
+    <li>New methods: <a href="doc/manual.html#lineAtHeight"><code>lineAtHeight</code></a>,
+    <a href="doc/manual.html#getTokenTypeAt"><code>getTokenTypeAt</code></a>.</li>
+    <li>More precise cleanness-tracking
+    using <a href="doc/manual.html#changeGeneration"><code>changeGeneration</code></a>
+    and <a href="doc/manual.html#isClean"><code>isClean</code></a>.</li>
+    <li>Many extensions to <a href="demo/emacs.html">Emacs</a> mode
+    (prefixes, more navigation units, and more).</li>
+    <li>New
+    events <a href="doc/manual.html#event_keyHandled"><code>"keyHandled"</code></a>
+    and <a href="doc/manual.html#event_inputRead"><code>"inputRead"</code></a>.</li>
+    <li>Various improvements to <a href="mode/ruby/index.html">Ruby</a>,
+    <a href="mode/smarty/index.html">Smarty</a>, <a href="mode/sql/index.html">SQL</a>,
+    and <a href="demo/vim.html">Vim</a> modes.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.13.0...3.14.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">20-05-2013: <a href="http://codemirror.net/codemirror-3.13.zip">Version 3.13</a>:</p>
 
   <ul class="rel-note">
@@ -439,20 +466,6 @@ <h2 id=releases>Releases</h2>
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
-
-  <ul class="rel-note">
-    <li>New mode: <a href="mode/z80/index.html">Z80 assembly</a>.</li>
-    <li>New theme: <a href="demo/theme.html?twilight">Twilight</a>.</li>
-    <li>Add command-line compression helper.</li>
-    <li>Make <a href="doc/manual.html#scrollIntoView"><code>scrollIntoView</code></a> public.</li>
-    <li>Add <a href="doc/manual.html#defaultTextHeight"><code>defaultTextHeight</code></a> method.</li>
-    <li>Various extensions to the vim keymap.</li>
-    <li>Make <a href="mode/php/index.html">PHP mode</a> build on <a href="mode/htmlmixed/index.html">mixed HTML mode</a>.</li>
-    <li>Add <a href="doc/manual.html#addon_continuecomment">comment-continuing</a> add-on.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
-  </ul>
-
   <p><a href="doc/oldrelease.html">Older releases...</a></p>
 
 </div></div>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5407c46666..92fd188728 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5707,7 +5707,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.13 +";
+  CodeMirror.version = "3.14.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 80bd128efc..9cc8a6962b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.13.01",
+    "version":"3.14.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 43d0608edc5125606248d2d70961b5a6055ec92b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Jun 2013 10:46:52 +0200
Subject: [PATCH 0210/4742] Bump version number post-3.14

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 92fd188728..5da1f17fea 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5707,7 +5707,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.14.0";
+  CodeMirror.version = "3.14.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 9cc8a6962b..17e5487f25 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.14.0",
+    "version":"3.14.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 59e5b5cbda7267dd10505e92493cc671b3002abe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Jun 2013 11:23:53 +0200
Subject: [PATCH 0211/4742] [merge addon] Fix layout on Firefox

Work around percentage width rounding problems.
---
 addon/merge/merge.css | 12 ++++++++++--
 addon/merge/merge.js  |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.css b/addon/merge/merge.css
index 1f20f88a43..1302532091 100644
--- a/addon/merge/merge.css
+++ b/addon/merge/merge.css
@@ -1,6 +1,7 @@
 .CodeMirror-diff {
   position: relative;
   border: 1px solid #ddd;
+  white-space: pre;
 }
 
 .CodeMirror-diff, .CodeMirror-diff .CodeMirror {
@@ -13,11 +14,18 @@
 .CodeMirror-diff-3pane .CodeMirror-diff-gap { width: 3.5%; }
 
 .CodeMirror-diff-pane {
-  float: left;
+  display: inline-block;
+  white-space: normal;
+}
+.CodeMirror-diff-pane-rightmost {
+  position: absolute;
+  right: 0px;
+  z-index: 1;
 }
 
 .CodeMirror-diff-gap {
-  float: left;
+  z-index: 2;
+  display: inline-block;
   height: 100%;
   box-sizing: border-box;
   overflow: hidden;
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index b112518596..0e813f3e25 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -265,6 +265,8 @@
       wrap.push(rightPane);
     }
 
+    (hasRight ? rightPane : editPane).className += " CodeMirror-diff-pane-rightmost";
+
     wrap.push(elt("div", null, null, "height: 0; clear: both;"));
     var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-diff CodeMirror-diff-" + panes + "pane"));
     this.edit = CodeMirror(editPane, copyObj(options));

From 607b32d857eac4315407d428a3245e971b212490 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Jun 2013 13:35:13 +0200
Subject: [PATCH 0212/4742] [tern addon] Work-in-progress

---
 addon/tern/tern.css |  84 +++++++
 addon/tern/tern.js  | 531 ++++++++++++++++++++++++++++++++++++++++++++
 demo/tern.html      |  95 ++++++++
 3 files changed, 710 insertions(+)
 create mode 100644 addon/tern/tern.css
 create mode 100644 addon/tern/tern.js
 create mode 100644 demo/tern.html

diff --git a/addon/tern/tern.css b/addon/tern/tern.css
new file mode 100644
index 0000000000..e8d5731861
--- /dev/null
+++ b/addon/tern/tern.css
@@ -0,0 +1,84 @@
+.CodeMirror-Tern-completion {
+  padding-left: 22px;
+  position: relative;
+}
+.CodeMirror-Tern-completion:before {
+  position: absolute;
+  left: 2px;
+  bottom: 2px;
+  border-radius: 50%;
+  font-size: 12px;
+  font-weight: bold;
+  height: 15px;
+  width: 15px;
+  line-height: 16px;
+  text-align: center;
+  color: white;
+  box-sizing: border-box;
+}
+.CodeMirror-Tern-completion-unknown:before {
+  content: "?";
+  background: #4bb;
+}
+.CodeMirror-Tern-completion-object:before {
+  content: "O";
+  background: #77c;
+}
+.CodeMirror-Tern-completion-fn:before {
+  content: "F";
+  background: #7c7;
+}
+.CodeMirror-Tern-completion-array:before {
+  content: "A";
+  background: #c66;
+}
+.CodeMirror-Tern-completion-number:before {
+  content: "1";
+  background: #999;
+}
+.CodeMirror-Tern-completion-string:before {
+  content: "S";
+  background: #999;
+}
+.CodeMirror-Tern-completion-bool:before {
+  content: "B";
+  background: #999;
+}
+
+.CodeMirror-Tern-completion-guess {
+  color: #999;
+}
+
+.CodeMirror-Tern-tooltip {
+  border: 1px solid silver;
+  border-radius: 3px;
+  color: #444;
+  padding: 2px 5px;
+  font-size: 90%;
+  font-family: monospace;
+  background-color: white;
+  white-space: pre-wrap;
+
+  max-width: 40em;
+  position: absolute;
+  z-index: 10;
+  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+
+  transition: opacity 1s;
+  -moz-transition: opacity 1s;
+  -webkit-transition: opacity 1s;
+  -o-transition: opacity 1s;
+  -ms-transition: opacity 1s;
+}
+
+.CodeMirror-Tern-hint-doc {
+  max-width: 25em;
+}
+
+.CodeMirror-Tern-fname { color: black; }
+.CodeMirror-Tern-farg { color: #70a; }
+.CodeMirror-Tern-farg-current { text-decoration: underline; }
+.CodeMirror-Tern-type { color: #07c; }
+.CodeMirror-Tern-fhint-guess { opacity: .7; }
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
new file mode 100644
index 0000000000..662736637c
--- /dev/null
+++ b/addon/tern/tern.js
@@ -0,0 +1,531 @@
+// Glue code between CodeMirror and Tern.
+//
+// Create a CodeMirror.TernServer to wrap an actual Tern server,
+// register open documents (CodeMirror.Doc instances) with it, and
+// call its methods to activate the assisting functions that Tern
+// provides.
+//
+// Options supported (all optional):
+// * defs: An array of JSON definition data structures.
+// * plugins: An object mapping plugin names to configuration
+//   options.
+// * getFile: A function(name, c) that can be used to access files in
+//   the project that haven't been loaded yet. Simply do c(null) to
+//   indicate that a file is not available.
+// * switchToDoc: A function(name) that should, when providing a
+//   multi-file view, switch the view or focus to the named file.
+// * showError: A function(editor, message) that can be used to
+//   override the way errors are displayed.
+
+(function() {
+  "use strict";
+
+  CodeMirror.getURL = function(url, c) {
+    var xhr = new XMLHttpRequest();
+    xhr.open("get", url, true);
+    xhr.send();
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState != 4) return;
+      if (xhr.status < 400) return c(null, xhr.responseText);
+      var e = new Error(xhr.responseText || "No response");
+      e.status = xhr.status;
+      c(e);
+    };
+  };
+
+  CodeMirror.TernServer = function(options) {
+    var self = this;
+    this.options = options || {};
+    var plugins = this.options.plugins || {};
+    if (!plugins.doc_comment) plugins.doc_comment = true;
+    this.server = new tern.Server({
+      getFile: function(name, c) { return getFile(self, name, c); },
+      async: true,
+      defs: this.options.defs || [],
+      plugins: plugins
+    });
+    this.docs = Object.create(null);
+    this.trackChange = function(doc, change) { trackChange(self, doc, change); };
+
+    this.cachedArgHints = null;
+    this.activeArgHints = null;
+    this.jumpStack = [];
+  };
+
+  CodeMirror.TernServer.prototype = {
+    addDoc: function(name, doc) {
+      this.server.addFile(name, doc.getValue());
+      CodeMirror.on(doc, "change", this.trackChange);
+      return this.docs[name] = {doc: doc, name: name, changed: null};
+    },
+
+    delDoc: function(name) {
+      var found = this.docs[name];
+      if (!found) return;
+      CodeMirror.on(found.doc, "change", this.trackChange);
+      delete this.docs[name];
+      this.server.delFile(name);
+    },
+
+    complete: function(cm) {
+      var self = this;
+      CodeMirror.showHint(cm, function(cm, c) { return hint(self, cm, c); }, {async: true});
+    },
+
+    showType: function(cm) { showType(this, cm); },
+
+    updateArgHints: function(cm) { updateArgHints(this, cm); },
+
+    jumpToDef: function(cm) { jumpToDef(this, cm); },
+
+    jumpBack: function(cm) { jumpBack(this, cm); },
+
+    rename: function(cm) { rename(this, cm); }
+  };
+
+  var Pos = CodeMirror.Pos;
+  var cls = "CodeMirror-Tern-";
+  var bigDoc = 250;
+
+  function getFile(ts, name, c) {
+    var buf = ts.docs[name];
+    if (buf)
+      c(buf.doc.getValue());
+    else if (ts.options.getFile)
+      ts.options.getFile(name, c);
+    else
+      c(null);
+  }
+
+  function findDoc(ts, doc, name) {
+    for (var name in ts.docs) {
+      var cur = ts.docs[name];
+      if (cur.doc == doc) return cur;
+    }
+    if (!name) for (var i = 0;; ++i) {
+      var n = "[doc" + (i || "") + "]";
+      if (!ts.docs[n]) { name = n; break; }
+    }
+    return ts.addDoc(n, doc);
+  }
+
+  function trackChange(ts, doc, change) {
+    var data = findDoc(ts, doc);
+
+    var argHints = ts.cachedArgHints;
+    if (argHints && argHints.doc == doc && cmpPos(argHints.start, change.to) <= 0)
+      ts.cachedArgHints = null;
+
+    var changed = data.changed;
+    if (changed == null)
+      data.changed = changed = {from: change.from.line, to: change.from.line};
+    var end = change.from.line + (change.text.length - 1);
+    if (change.from.line < changed.to) changed.to = changed.to - (change.to.line - end);
+    if (end >= changed.to) changed.to = end + 1;
+    if (changed.from > change.from.line) changed.from = change.from.line;
+
+    if (doc.lineCount() > bigDoc && change.to - changed.from > 100) setTimeout(function() {
+      if (data.changed && data.changed.to - data.changed.from > 100) sendDoc(ts, data);
+    }, 200);
+  }
+
+  function sendDoc(ts, doc) {
+    ts.server.request({files: [{type: "full", name: doc.name, text: doc.doc.getValue()}]}, function(error) {
+      if (error) console.error(error);
+      else doc.changed = null;
+    });
+  }
+
+  // Completion
+
+  function hint(ts, cm, c) {
+    var doc = findDoc(ts, cm.getDoc());
+    var req = buildRequest(ts, doc, {type: "completions", types: true, docs: true});
+
+    ts.server.request(req, function(error, data) {
+      if (error) return showError(ts, cm, error);
+      var completions = [], after = "";
+      var from = data.start, to = data.end;
+      if (cm.getRange(Pos(from.line, from.ch - 2), from) == "[\"" &&
+          cm.getRange(to, Pos(to.line, to.ch + 2)) != "\"]")
+        after = "\"]";
+
+      for (var i = 0; i < data.completions.length; ++i) {
+        var completion = data.completions[i], className = typeToIcon(completion.type);
+        if (data.guess) className += " " + cls + "guess";
+        completions.push({text: completion.name + after,
+                          displayText: completion.name,
+                          className: className,
+                          doc: completion.doc});
+      }
+
+      var obj = {from: from, to: to, list: completions};
+      var tooltip = null;
+      CodeMirror.on(obj, "close", function() { remove(tooltip); });
+      CodeMirror.on(obj, "select", function(cur, node) {
+        remove(tooltip);
+        if (cur.doc) {
+          tooltip = makeTooltip(node.parentNode.getBoundingClientRect().right + window.pageXOffset,
+                                node.getBoundingClientRect().top + window.pageYOffset, cur.doc);
+          tooltip.className += " " + cls + "hint-doc";
+        }
+      });
+      c(obj);
+    });
+  }
+
+  function typeToIcon(type) {
+    var suffix;
+    if (type == "?") suffix = "unknown";
+    else if (type == "number" || type == "string" || type == "bool") suffix = type;
+    else if (/^fn\(/.test(type)) suffix = "fn";
+    else if (/^\[/.test(type)) suffix = "array";
+    else suffix = "object";
+    return cls + "completion " + cls + "completion-" + suffix;
+  }
+
+  // Type queries
+
+  function showType(ts, cm) {
+    var doc = findDoc(ts, cm.getDoc());
+    ts.server.request(buildRequest(ts, doc, "type"), function(error, data) {
+      if (error) return showError(ts, cm, error);
+      var tip = elt("span", null, elt("strong", null, data.type || "not found"));
+      if (data.doc)
+        tip.appendChild(document.createTextNode(" — " + data.doc));
+      if (data.url) {
+        tip.appendChild(document.createTextNode(" "));
+        tip.appendChild(elt("a", null, "[docs]")).href = data.url;
+      }
+      tempTooltip(cm, tip);
+    });
+  }
+
+  // Maintaining argument hints
+
+  function updateArgHints(ts, cm) {
+    if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
+
+    if (cm.somethingSelected()) return;
+    var lex = cm.getTokenAt(cm.getCursor()).state.lexical;
+    if (lex.info != "call") return;
+
+    var ch = lex.column, pos = lex.pos || 0;
+    for (var line = cm.getCursor().line, e = Math.max(0, line - 9), found = false; line >= e; --line)
+      if (cm.getLine(line).charAt(ch) == "(") {found = true; break;}
+    if (!found) return;
+
+    var start = Pos(line, ch);
+    var cache = ts.cachedArgHints;
+    if (cache && cache.doc == cm.getDoc() && cmpPos(start, cache.start) == 0)
+      return showArgHints(ts, cm, pos);
+
+    var query = {type: "type", preferFunction: true, end: start};
+    ts.server.request(buildRequest(ts, findDoc(ts, cm.getDoc()), query), function(error, data) {
+      if (error || !data.type || !(/^fn\(/).test(data.type)) return;
+      ts.cachedArgHints = {
+        start: pos,
+        type: parseFnType(data.type),
+        name: data.exprName || data.name || "fn",
+        guess: data.guess,
+        doc: cm.getDoc()
+      };
+      showArgHints(ts, cm, pos);
+    });
+  }
+
+  function showArgHints(ts, cm, pos) {
+    if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
+
+    var cache = ts.cachedArgHints, tp = cache.type;
+    var tip = elt("span", cache.guess ? cls + "fhint-guess" : null,
+                  elt("span", cls + "fname", cache.name), "(");
+    for (var i = 0; i < tp.args.length; ++i) {
+      if (i) tip.appendChild(document.createTextNode(", "));
+      var arg = tp.args[i];
+      tip.appendChild(elt("span", cls + "farg" + (i == pos ? " " + cls + "farg-current" : ""), arg.name || "?"));
+      if (arg.type != "?") {
+        tip.appendChild(document.createTextNode(":\u00a0"));
+        tip.appendChild(elt("span", cls + "type", arg.type));
+      }
+    }
+    tip.appendChild(document.createTextNode(tp.rettype ? ") ->\u00a0" : ")"));
+    if (tp.rettype) tip.appendChild(elt("span", cls + "type", tp.rettype));
+    var place = cm.cursorCoords(null, "page");
+    ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip);
+  }
+
+  function parseFnType(text) {
+    var args = [], pos = 3;
+
+    function skipMatching(upto) {
+      var depth = 0, start = pos;
+      for (;;) {
+        var next = text.charAt(pos);
+        if (upto.test(next) && !depth) return text.slice(start, pos);
+        if (/[{\[\(]/.test(next)) ++depth;
+        else if (/[}\]\)]/.test(next)) --depth;
+        ++pos;
+      }
+    }
+
+    // Parse arguments
+    if (text.charAt(pos) != ")") for (;;) {
+      var name = text.slice(pos).match(/^([^, \(\[\{]+): /);
+      if (name) {
+        pos += name[0].length;
+        name = name[1];
+      }
+      args.push({name: name, type: skipMatching(/[\),]/)});
+      if (text.charAt(pos) == ")") break;
+      pos += 2;
+    }
+
+    var rettype = text.slice(pos).match(/^\) -> (.*)$/);
+
+    return {args: args, rettype: rettype && rettype[1]};
+  }
+
+  // Moving to the definition of something
+
+  function jumpToDef(ts, cm) {
+    function inner(varName) {
+      var req = {type: "definition", variable: varName || null};
+      var doc = findDoc(ts, cm.getDoc());
+      ts.server.request(buildRequest(ts, doc, req), function(error, data) {
+        if (error) return showError(ts, cm, error);
+        if (!data.file && data.url) { window.open(data.url); return; }
+
+        if (data.file) {
+          var localDoc = ts.docs[data.file], found;
+          if (localDoc && (found = findContext(localDoc.doc, data))) {
+            ts.jumpStack.push({file: doc.name,
+                               start: cm.getCursor("from"),
+                               end: cm.getCursor("to")});
+            moveTo(ts, doc, localDoc, found.start, found.end);
+            return;
+          }
+        }
+        showError(ts, cm, "Could not find a definition.");
+      });
+    }
+
+    if (!atInterestingExpression(cm))
+      dialog(cm, "Jump to variable", function(name) { if (name) inner(name); });
+    else
+      inner();
+  }
+
+  function jumpBack(ts, cm) {
+    var pos = ts.jumpStack.pop(), doc = pos && ts.docs[pos.file];
+    if (!doc) return;
+    moveTo(ts, findDoc(ts, cm.getDoc()), doc, pos.start, pos.end);
+  }
+
+  function moveTo(ts, curDoc, doc, start, end) {
+    doc.doc.setSelection(end, start);
+    if (curDoc != doc && ts.options.switchToDoc)
+      ts.options.switchToDoc(doc.name);
+  }
+
+  // The {line,ch} representation of positions makes this rather awkward.
+  function findContext(doc, data) {
+    var before = data.context.slice(0, data.contextOffset).split("\n");
+    var startLine = data.start.line - (before.length - 1);
+    var start = Pos(startLine, (before.length == 1 ? data.start.ch : doc.getLine(startLine).length) - before[0].length);
+
+    var text = doc.getLine(startLine).slice(start.ch);
+    for (var cur = startLine + 1; cur < doc.lineCount() && text.length < data.context.length; ++cur)
+      text += "\n" + doc.getLine(cur);
+    if (text.slice(0, data.context.length) == data.context) return data;
+
+    var cursor = doc.getSearchCursor(data.context, 0, false);
+    var nearest, nearestDist = Infinity;
+    while (cursor.findNext()) {
+      var from = cursor.from(), dist = Math.abs(from.line - start.line) * 10000;
+      if (!dist) dist = Math.abs(from.ch - start.ch);
+      if (dist < nearestDist) { nearest = from; nearestDist = dist; }
+    }
+    if (!nearest) return null;
+
+    if (before.length == 1)
+      nearest.ch += before[0].length;
+    else
+      nearest = Pos(nearest.line + (before.length - 1), before[before.length - 1].length);
+    if (data.start.line == data.end.line)
+      var end = Pos(nearest.line, nearest.ch + (data.end.ch - data.start.ch));
+    else
+      var end = Pos(nearest.line + (data.end.line - data.start.line), data.end.ch);
+    return {start: nearest, end: end};
+  }
+
+  function atInterestingExpression(cm) {
+    var pos = cm.getCursor("end"), tok = cm.getTokenAt(pos);
+    if (tok.start < pos.ch && (tok.type == "comment" || tok.type == "string")) return false;
+    return /\w/.test(cm.getLine(pos.line).slice(Math.max(pos.ch - 1, 0), pos.ch + 1));
+  }
+
+  // Variable renaming
+
+  function rename(ts, cm) {
+    var token = cm.getTokenAt(cm.getCursor());
+    if (!/\w/.test(token.string)) showError(ts, cm, "Not at a variable");
+    dialog(cm, "New name for " + token.string, function(newName) {
+      var req = {type: "rename", newName: newName}, doc = findDoc(ts, cm.getDoc());
+      ts.server.request(buildRequest(ts, doc, req, false), function(error, data) {
+        if (error) return showError(ts, cm, error);
+        applyChanges(ts, data.changes);
+      });
+    });
+  }
+
+  var nextChangeOrig = 0;
+  function applyChanges(ts, changes) {
+    var perFile = Object.create(null);
+    for (var i = 0; i < changes.length; ++i) {
+      var ch = changes[i];
+      (perFile[ch.file] || (perFile[ch.file] = [])).push(ch);
+    }
+    for (var file in perFile) {
+      var known = ts.docs[file], chs = perFile[file];;
+      if (!known) continue;
+      chs.sort(function(a, b) { return cmpPos(b, a); });
+      var origin = "*rename" + (++nextChangeOrig);
+      for (var i = 0; i < chs.length; ++i) {
+        var ch = chs[i];
+        known.doc.replaceRange(ch.text, ch.start, ch.end, origin);
+      }
+    }
+  }
+
+  // Generic request-building helper
+
+  function buildRequest(ts, doc, query, allowFragments) {
+    var files = [], offsetLines = 0;
+    if (typeof query == "string") query = {type: query};
+    query.lineCharPositions = true;
+    if (query.end == null) {
+      query.end = doc.doc.getCursor("end");
+      if (doc.doc.somethingSelected())
+        query.start = doc.doc.getCursor("start");
+    }
+    var startPos = query.start || query.end;
+
+    if (doc.changed) {
+      if (doc.doc.lineCount() > bigDoc && allowFragments !== false &&
+          doc.changed.to - doc.changed.from < 100 &&
+          doc.changed.from <= startPos.line && doc.changed.to > query.end.line) {
+        files.push(getFragmentAround(doc, startPos, query.end));
+        query.file = "#0";
+        var offsetLines = files[0].offsetLines;
+        if (query.start != null) query.start = incLine(-offsetLines, query.start);
+        query.end = incLine(-offsetLines, query.end);
+      } else {
+        files.push({type: "full",
+                    name: doc.name,
+                    text: doc.doc.getValue()});
+        query.file = doc.name;
+        doc.changed = null;
+      }
+    } else {
+      query.file = doc.name;
+    }
+    for (var name in ts.docs) {
+      var cur = ts.docs[name];
+      if (cur.changed && cur != doc) {
+        files.push({type: "full", name: cur.name, text: cur.doc.getValue()});
+        cur.changed = null;
+      }
+    }
+
+    return {query: query, files: files};
+  }
+
+  function getFragmentAround(data, start, end) {
+    var doc = data.doc;
+    var minIndent = null, minLine = null, endLine, tabSize = doc.getOption("tabSize");
+    for (var p = start.line - 1, min = Math.max(0, p - 50); p >= min; --p) {
+      var line = doc.getLine(p), fn = line.search(/\bfunction\b/);
+      if (fn < 0) continue;
+      var indent = CodeMirror.countColumn(line, null, tabSize);
+      if (minIndent != null && minIndent <= indent) continue;
+      minIndent = indent;
+      minLine = p;
+    }
+    if (minLine == null) minLine = min;
+    var max = Math.min(doc.lastLine(), end.line + 20);
+    if (minIndent == null || minIndent == CodeMirror.countColumn(doc.getLine(start.line), null, tabSize))
+      endLine = max;
+    else for (endLine = end.line + 1; endLine < max; ++endLine) {
+      var indent = CodeMirror.countColumn(doc.getLine(endLine), null, tabSize);
+      if (indent <= minIndent) break;
+    }
+    var from = Pos(minLine, 0);
+
+    return {type: "part",
+            name: data.name,
+            offsetLines: from.line,
+            text: doc.getRange(from, Pos(endLine, 0))};
+  }
+
+  // Generic utilities
+
+  function cmpPos(a, b) { return a.line - b.line || a.ch - b.ch; }
+
+  function elt(tagname, cls /*, ... elts*/) {
+    var e = document.createElement(tagname);
+    if (cls) e.className = cls;
+    for (var i = 2; i < arguments.length; ++i) {
+      var elt = arguments[i];
+      if (typeof elt == "string") elt = document.createTextNode(elt);
+      e.appendChild(elt);
+    }
+    return e;
+  }
+
+  function dialog(cm, text, f) {
+    if (cm.openDialog)
+      cm.openDialog(text + ": <input type=text>", f);
+    else
+      f(prompt(text, ""));
+  }
+
+  // Tooltips
+
+  function tempTooltip(cm, content) {
+    var where = cm.cursorCoords();
+    var tip = makeTooltip(where.right + 1, where.bottom, content);
+    function clear() {
+      if (!tip.parentNode) return;
+      cm.off("cursorActivity", clear);
+      fadeOut(tip);
+    }
+    setTimeout(clear, 1700);
+    cm.on("cursorActivity", clear);
+  }
+
+  function makeTooltip(x, y, content) {
+    var node = elt("div", cls + "tooltip", content);
+    node.style.left = x + "px";
+    node.style.top = y + "px";
+    document.body.appendChild(node);
+    return node;
+  }
+
+  function remove(node) {
+    var p = node && node.parentNode;
+    if (p) p.removeChild(node);
+  }
+
+  function fadeOut(tooltip) {
+    tooltip.style.opacity = "0";
+    setTimeout(function() { remove(tooltip); }, 1100);
+  }
+
+  function showError(ts, cm, msg) {
+    if (ts.options.showError)
+      ts.options.showError(cm, msg);
+    else
+      tempTooltip(cm, String(msg));
+  }
+})();
diff --git a/demo/tern.html b/demo/tern.html
new file mode 100644
index 0000000000..22464f8a60
--- /dev/null
+++ b/demo/tern.html
@@ -0,0 +1,95 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: Tern Demo</title>
+    <link rel="stylesheet" href="../lib/codemirror.css">
+    <script src="../lib/codemirror.js"></script>
+    <script src="../mode/javascript/javascript.js"></script>
+    <link rel="stylesheet" href="../doc/docs.css">
+    <script src="../addon/dialog/dialog.js"></script>
+    <link rel="stylesheet" href="../addon/dialog/dialog.css">
+    <script src="../addon/hint/show-hint.js"></script>
+    <link rel="stylesheet" href="../addon/hint/show-hint.css">
+    <script src="../addon/tern/tern.js"></script>
+    <link rel="stylesheet" href="../addon/tern/tern.css">
+
+    <!-- NOTE: if you are going to actually deploy this in production,
+         DO NOT hot-link these files. Host them yourself. -->
+    <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/lib/signal.js"></script>
+    <script src="http://ternjs.net/lib/tern.js"></script>
+    <script src="http://ternjs.net/lib/def.js"></script>
+    <script src="http://ternjs.net/lib/comment.js"></script>
+    <script src="http://ternjs.net/lib/infer.js"></script>
+    <script src="http://ternjs.net/plugin/doc_comment.js"></script>
+
+    <style>
+      .CodeMirror {border: 1px solid #ddd;}
+    </style>
+  </head>
+  <body>
+    <h1>CodeMirror: Tern Demo</h1>
+
+    <form><textarea id="code" name="code">// Use ctrl-space to complete something
+// Put the cursor in or after an expression, press ctrl-i to
+// find its type
+
+var foo = ["array", "of", "strings"];
+var bar = foo.slice(0, 2).join("").split("a")[0];
+
+// Works for locally defined types too.
+
+function CTor() { this.size = 10; }
+CTor.prototype.hallo = "hallo";
+
+var baz = new CTor;
+baz.
+
+// You can press ctrl-q when the cursor is on a variable name to
+// rename it. Try it with CTor...
+
+// When the cursor is in an argument list, the arguments are
+// shown below the editor.
+
+[1].reduce(  );
+
+// And a little more advanced code...
+
+(function(exports) {
+  exports.randomElt = function(arr) {
+    return arr[Math.floor(arr.length * Math.random())];
+  };
+  exports.strList = "foo".split("");
+  exports.intList = exports.strList.map(function(s) { return s.charCodeAt(0); });
+})(window.myMod = {});
+
+var randomStr = myMod.randomElt(myMod.strList);
+var randomInt = myMod.randomElt(myMod.intList);
+</textarea></p>
+
+<script>
+  var server;
+  CodeMirror.getURL("http://ternjs.net/defs/ecma5.json", function(err, code) {
+    if (err) throw new Error("Request for ecma5.json: " + err);
+    server = new CodeMirror.TernServer({defs: [JSON.parse(code)]});
+    editor.setOption("extraKeys", {
+      "Ctrl-Space": function(cm) { server.complete(cm); },
+      "Ctrl-I": function(cm) { server.showType(cm); },
+      "Alt-.": function(cm) { server.jumpToDef(cm); },
+      "Alt-,": function(cm) { server.jumpBack(cm); },
+      "Ctrl-Q": function(cm) { server.rename(cm); },
+    })
+    editor.on("cursorActivity", function(cm) { server.updateArgHints(cm); });
+  });
+
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    mode: "javascript"
+  });
+</script>
+
+  </body>
+</html>

From 2677aba253ef5c0a1ed6332e961cef5712f334d3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Jun 2013 17:37:44 +0200
Subject: [PATCH 0213/4742] [xml-fold addon] Prevent infinite recursion from
 weird lastIndexOf behavior

Issue #1625
---
 addon/fold/xml-fold.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index b764bc0190..29d730eb71 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -43,7 +43,7 @@
   }
   function toTagStart(iter) {
     for (;;) {
-      var lt = iter.text.lastIndexOf("<", iter.ch - 1);
+      var lt = iter.ch ? iter.text.lastIndexOf("<", iter.ch - 1) : -1;
       if (lt == -1) { if (prevLine(iter)) continue; else return; }
       if (!tagAt(iter, lt + 1)) { iter.ch = lt; continue; }
       xmlTagStart.lastIndex = lt;
@@ -65,7 +65,7 @@
   }
   function toPrevTag(iter) {
     for (;;) {
-      var gt = iter.text.lastIndexOf(">", iter.ch - 1);
+      var gt = iter.ch ? iter.text.lastIndexOf(">", iter.ch - 1) : -1;
       if (gt == -1) { if (prevLine(iter)) continue; else return; }
       if (!tagAt(iter, gt + 1)) { iter.ch = gt; continue; }
       var lastSlash = iter.text.lastIndexOf("/", gt);

From f674dd148c27c882d3a85885caa9c27bb5638ee5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Jun 2013 09:53:32 +0200
Subject: [PATCH 0214/4742] Support insertAt option to addLineWidget

Issue #1627
---
 doc/manual.html   | 10 ++++++++--
 lib/codemirror.js |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 655e64db4c..68692e2956 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1253,7 +1253,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       widget again, simply use DOM methods (move it somewhere else, or
       call <code>removeChild</code> on its parent).</dd>
 
-      <dt id="addLineWidget"><code><strong>cm.addLineWidget</strong>(line: integer|LineHandle, node: Element, ?options: object) → LineWidget</code></dt>
+      <dt id="addLineWidget"><code><strong>cm.addLineWidget</strong>(line: integer|LineHandle, node: Element, ?options: object, ?pos: integer) → LineWidget</code></dt>
       <dd>Adds a line widget, an element shown below a line, spanning
       the whole of the editor's width, and moving the lines below it
       downwards. <code>line</code> should be either an integer or a
@@ -1261,7 +1261,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       will be displayed below the given line. <code>options</code>,
       when given, should be an object that configures the behavior of
       the widget. The following options are supported (all default to
-      false) →
+      false):
         <dl>
           <dt><code><strong>coverGutter</strong>: boolean</code></dt>
           <dd>Whether the widget should cover the gutter.</dd>
@@ -1279,6 +1279,12 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
           drag events occurring in this widget. Default is false—the
           events will be left alone for the default browser handler,
           or specific handlers on the widget, to capture.</dd>
+          <dt><code><strong>insertAt</strong>: integer</code></dt>
+          <dd>By default, the widget is added below other widgets for
+          the line. This option can be used to place it at a different
+          position (zero for the top, N to put it after the Nth other
+          widget). Note that this only has effect once, when the
+          widget is created.
         </dl>
       Note that the widget node will become a descendant of nodes with
       CodeMirror-specific CSS classes, and those classes might in some
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5da1f17fea..ea3f8d9328 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4078,7 +4078,9 @@ window.CodeMirror = (function() {
     var widget = new LineWidget(cm, node, options);
     if (widget.noHScroll) cm.display.alignWidgets = true;
     changeLine(cm, handle, function(line) {
-      (line.widgets || (line.widgets = [])).push(widget);
+      var widgets = line.widgets || (line.widgets = []);
+      if (options.insertAt == null) widgets.push(widget);
+      else widgets.splice(Math.max(widgets.length - 1, options.insertAt), 0, widget);
       widget.line = line;
       if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {
         var aboveVisible = heightAtLine(cm, line) < cm.display.scroller.scrollTop;

From 93a850a52b98ddf5a633b793df33edb0b3794ab1 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Tue, 18 Jun 2013 17:56:48 -0700
Subject: [PATCH 0215/4742] [vim keymap] Fix bugs in line handling

Closes #1612
---
 keymap/vim.js    | 49 ++++++++++++++++++++++++------------------------
 test/vim_test.js | 25 +++++++++++++++++-------
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index e05be03176..8c942a3ff5 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -554,19 +554,16 @@
           // Clear input state and get back to normal mode.
           vim.inputState = new InputState();
           if (vim.visualMode) {
-            exitVisualMode(cm, vim);
+            exitVisualMode(cm);
           }
           return;
         }
-        if (vim.visualMode &&
-            cursorEqual(cm.getCursor('head'), cm.getCursor('anchor'))) {
-          // The selection was cleared. Exit visual mode.
-          exitVisualMode(cm, vim);
-        }
+        // Enter visual mode when the mouse selects text.
         if (!vim.visualMode &&
             !cursorEqual(cm.getCursor('head'), cm.getCursor('anchor'))) {
           vim.visualMode = true;
           vim.visualLine = false;
+          cm.on('mousedown', exitVisualMode);
         }
         if (key != '0' || (key == '0' && vim.inputState.getRepeat() === 0)) {
           // Have to special case 0 since it's both a motion and a number.
@@ -1146,7 +1143,7 @@
           operators[operator](cm, operatorArgs, vim, curStart,
               curEnd, curOriginal);
           if (vim.visualMode) {
-            exitVisualMode(cm, vim);
+            exitVisualMode(cm);
           }
           if (operatorArgs.enterInsertMode) {
             actions.enterInsertMode(cm, {}, vim);
@@ -1272,8 +1269,13 @@
         }
         var repeat = motionArgs.repeat+(motionArgs.repeatOffset||0);
         var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
-        if (line < cm.firstLine() || line > cm.lastLine() ) {
-          return null;
+        var first = cm.firstLine();
+        var last = cm.lastLine();
+        // Vim cancels linewise motions that start on an edge and move beyond
+        // that edge. It does not cancel motions that do not start on an edge.
+        if ((line < first && cur.line == first) ||
+            (line > last && cur.line == last)) {
+          return;
         }
         if(motionArgs.toFirstChar){
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
@@ -1478,18 +1480,12 @@
             operatorArgs.registerName, 'change', cm.getRange(curStart, curEnd),
             operatorArgs.linewise);
         if (operatorArgs.linewise) {
-          // Delete starting at the first nonwhitespace character of the first
-          // line, instead of from the start of the first line. This way we get
-          // an indent when we get into insert mode. This behavior isn't quite
-          // correct because we should treat this as a completely new line, and
-          // indent should be whatever codemirror thinks is the right indent.
-          // But cm.indentLine doesn't seem work on empty lines.
-          // TODO: Fix the above.
-          curStart.ch =
-              findFirstNonWhiteSpaceCharacter(cm.getLine(curStart.line));
-          // Insert an additional newline so that insert mode can start there.
-          // curEnd should be on the first character of the new line.
-          cm.replaceRange('\n', curStart, curEnd);
+          // Push the next line back down, if there is a next line.
+          var replacement = curEnd.line > cm.lastLine() ? '' : '\n';
+          cm.replaceRange(replacement, curStart, curEnd);
+          cm.indentLine(curStart.line, 'smart');
+          // null ch so setCursor moves to end of line.
+          curStart.ch = null;
         } else {
           // Exclude trailing whitespace if the range is not all whitespace.
           var text = cm.getRange(curStart, curEnd);
@@ -1651,6 +1647,7 @@
         //     equal to the repeat times the size of the previous visual
         //     operation.
         if (!vim.visualMode) {
+          cm.on('mousedown', exitVisualMode);
           vim.visualMode = true;
           vim.visualLine = !!actionArgs.linewise;
           if (vim.visualLine) {
@@ -1692,7 +1689,7 @@
             // mode instead of exiting visual mode.
             vim.visualLine = false;
           } else {
-            exitVisualMode(cm, vim);
+            exitVisualMode(cm);
           }
         }
         updateMark(cm, vim, '<', cursorIsBefore(curStart, curEnd) ? curStart
@@ -1832,7 +1829,7 @@
           cm.replaceRange(replaceWithStr, curStart, curEnd);
           if(vim.visualMode){
             cm.setCursor(curStart);
-            exitVisualMode(cm,vim);
+            exitVisualMode(cm);
           }else{
             cm.setCursor(offsetCursor(curEnd, 0, -1));
           }
@@ -1989,7 +1986,9 @@
       return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
     }
 
-    function exitVisualMode(cm, vim) {
+    function exitVisualMode(cm) {
+      cm.off('mousedown', exitVisualMode);
+      var vim = cm.vimState;
       vim.visualMode = false;
       vim.visualLine = false;
       var selectionStart = cm.getCursor('anchor');
@@ -2842,7 +2841,7 @@
       processCommand: function(cm, input) {
         var vim = getVimState(cm);
         if (vim.visualMode) {
-          exitVisualMode(cm, vim);
+          exitVisualMode(cm);
         }
         var inputStream = new CodeMirror.StringStream(input);
         var params = {};
diff --git a/test/vim_test.js b/test/vim_test.js
index 47fc6cd14f..44639c72c8 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -296,8 +296,10 @@ testMotion('l', 'l', makeCursor(0, 1));
 testMotion('l_repeat', ['2', 'l'], makeCursor(0, 2));
 testMotion('j', 'j', offsetCursor(word1.end, 1, 0), word1.end);
 testMotion('j_repeat', ['2', 'j'], offsetCursor(word1.end, 2, 0), word1.end);
+testMotion('j_repeat_clip', ['1000', 'j'], endOfDocument);
 testMotion('k', 'k', offsetCursor(word3.end, -1, 0), word3.end);
 testMotion('k_repeat', ['2', 'k'], makeCursor(0, 4), makeCursor(2, 4));
+testMotion('k_repeat_clip', ['1000', 'k'], makeCursor(0, 4), makeCursor(2, 4));
 testMotion('w', 'w', word1.start);
 testMotion('w_multiple_newlines_no_space', 'w', makeCursor(12, 2), makeCursor(11, 2));
 testMotion('w_multiple_newlines_with_space', 'w', makeCursor(14, 0), makeCursor(12, 51));
@@ -818,12 +820,6 @@ testVim('dd_lastline', function(cm, vim, helpers) {
   eq(expectedLineCount, cm.lineCount());
   helpers.assertCursorAt(cm.lineCount() - 1, 0);
 });
-testVim('cw', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', '2', 'w');
-  eq(' word3', cm.getValue());
-  helpers.assertCursorAt(0, 0);
-}, { value: 'word1 word2 word3'});
 // Yank commands should behave the exact same as d commands, expect that nothing
 // gets deleted.
 testVim('yw_repeat', function(cm, vim, helpers) {
@@ -854,6 +850,12 @@ testVim('yy_multiply_repeat', function(cm, vim, helpers) {
 // Change commands behave like d commands except that it also enters insert
 // mode. In addition, when the change is linewise, an additional newline is
 // inserted so that insert mode starts on that line.
+testVim('cw', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('c', '2', 'w');
+  eq(' word3', cm.getValue());
+  helpers.assertCursorAt(0, 0);
+}, { value: 'word1 word2 word3'});
 testVim('cw_repeat', function(cm, vim, helpers) {
   // Assert that cw does delete newline if it should go to the next line, and
   // that repeat works properly.
@@ -877,9 +879,14 @@ testVim('cc_multiply_repeat', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq(expectedBuffer, register.text);
   is(register.linewise);
-  helpers.assertCursorAt(0, lines[0].textStart);
   eq('vim-insert', cm.getOption('keyMap'));
 });
+testVim('cc_append', function(cm, vim, helpers) {
+  var expectedLineCount = cm.lineCount();
+  cm.setCursor(cm.lastLine(), 0);
+  helpers.doKeys('c', 'c');
+  eq(expectedLineCount, cm.lineCount());
+});
 // Swapcase commands edit in place and do not modify registers.
 testVim('g~w_repeat', function(cm, vim, helpers) {
   // Assert that dw does delete newline if it should go to the next line, and
@@ -1471,6 +1478,10 @@ testVim('visual_join', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'J');
   eq(' 1 2 3\n 4\n 5', cm.getValue());
 }, { value: ' 1\n 2\n 3\n 4\n 5' });
+testVim('visual_blank', function(cm, vim, helpers) {
+  helpers.doKeys('v', 'k');
+  eq(vim.visualMode, true);
+}, { value: '\n' });
 testVim('/ and n/N', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('match');
   helpers.doKeys('/');

From 44cc08d6610783f9be8c98310b221ed684f721a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Jun 2013 10:05:41 +0200
Subject: [PATCH 0216/4742] Fix bug in addLineWidget / insertAt implementation

(f674dd148c27c882d3a85885caa9c27bb5638ee5)
---
 lib/codemirror.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ea3f8d9328..986f1640c8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4035,7 +4035,7 @@ window.CodeMirror = (function() {
   // LINE WIDGETS
 
   var LineWidget = CodeMirror.LineWidget = function(cm, node, options) {
-    for (var opt in options) if (options.hasOwnProperty(opt))
+    if (options) for (var opt in options) if (options.hasOwnProperty(opt))
       this[opt] = options[opt];
     this.cm = cm;
     this.node = node;
@@ -4079,8 +4079,8 @@ window.CodeMirror = (function() {
     if (widget.noHScroll) cm.display.alignWidgets = true;
     changeLine(cm, handle, function(line) {
       var widgets = line.widgets || (line.widgets = []);
-      if (options.insertAt == null) widgets.push(widget);
-      else widgets.splice(Math.max(widgets.length - 1, options.insertAt), 0, widget);
+      if (widget.insertAt == null) widgets.push(widget);
+      else widgets.splice(Math.max(widgets.length - 1, widget.insertAt), 0, widget);
       widget.line = line;
       if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {
         var aboveVisible = heightAtLine(cm, line) < cm.display.scroller.scrollTop;

From 41deb2c055ba2efee8b5ee62b740df4582390827 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Jun 2013 10:24:02 +0200
Subject: [PATCH 0217/4742] [matchtags addon] Add

Issue #1625
---
 addon/edit/matchtags.js | 31 +++++++++++++++++++++++++++++++
 addon/fold/xml-fold.js  | 15 ++++++++++-----
 demo/matchtags.html     | 37 +++++++++++++++++++++++++++++++++++++
 doc/manual.html         | 11 +++++++++++
 4 files changed, 89 insertions(+), 5 deletions(-)
 create mode 100644 addon/edit/matchtags.js
 create mode 100644 demo/matchtags.html

diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
new file mode 100644
index 0000000000..8cdc8b20c8
--- /dev/null
+++ b/addon/edit/matchtags.js
@@ -0,0 +1,31 @@
+(function() {
+  "use strict";
+
+  CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init)
+      cm.off("cursorActivity", doMatchTags);
+    if (val)
+      cm.on("cursorActivity", doMatchTags);
+  });
+
+  function doMatchTags(cm) {
+    cm.operation(function() {
+      if (cm.state.matchedTags) { cm.state.matchedTags(); cm.state.matchedTags = null; }
+
+      var cur = cm.getCursor();
+      var match = CodeMirror.findMatchingTag(cm, cur) || CodeMirror.findEnclosingTag(cm, cur);
+      if (!match) return;
+      var one = cm.markText(match.open.from, match.open.to, {className: "CodeMirror-matchingbracket"});
+      var two = cm.markText(match.close.from, match.close.to, {className: "CodeMirror-matchingbracket"});
+      cm.state.matchedTags = function() { one.clear(); two.clear(); };
+    });
+  }
+
+  CodeMirror.commands.toMatchingTag = function(cm) {
+    var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
+    if (found) {
+      var other = found.at == "close" ? found.open : found.close;
+      cm.setSelection(other.to, other.from);
+    }
+  };
+})();
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 29d730eb71..572feaa244 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -2,6 +2,7 @@
   "use strict";
 
   var Pos = CodeMirror.Pos;
+  function cmp(a, b) { return a.line - b.line || a.ch - b.ch; }
 
   var nameStartChar = "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
   var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
@@ -136,14 +137,18 @@
 
   CodeMirror.findMatchingTag = function(cm, pos) {
     var iter = new Iter(cm, pos.line, pos.ch);
-    var end = toTagEnd(iter), start = toTagStart(iter);
-    if (!end || end == "selfClose" || !start) return;
+    var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
+    var start = end && toTagStart(iter);
+    if (!end || end == "selfClose" || !start || cmp(iter, pos) > 0) return;
+    var here = {from: Pos(iter.line, iter.ch), to: to, tag: start[2]};
 
     if (start[1]) { // closing tag
-      return findMatchingOpen(iter, start[2]);
+      var open = findMatchingOpen(iter, start[2]);
+      return open && {open: open, close: here, at: "close"};
     } else { // opening tag
-      toTagEnd(iter);
-      return findMatchingClose(iter, start[2]);
+      iter = new Iter(cm, to.line, to.ch);
+      var close = findMatchingClose(iter, start[2]);
+      return close && {open: here, close: close, at: "open"};
     }
   };
 
diff --git a/demo/matchtags.html b/demo/matchtags.html
new file mode 100644
index 0000000000..053c0ed667
--- /dev/null
+++ b/demo/matchtags.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: Tag Matcher Demo</title>
+    <link rel="stylesheet" href="../lib/codemirror.css">
+    <script src="../lib/codemirror.js"></script>
+    <script src="../addon/fold/xml-fold.js"></script>
+    <script src="../addon/edit/matchtags.js"></script>
+    <script src="../mode/xml/xml.js"></script>
+    <link rel="stylesheet" href="../doc/docs.css">
+
+    <style type="text/css">
+      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+    </style>
+  </head>
+  <body>
+    <h1>CodeMirror: Tag Matcher Demo</h1>
+
+    <div id="editor"></div>
+
+    <script>
+window.onload = function() {
+  editor = CodeMirror(document.getElementById("editor"), {
+    value: "<html>\n  " + document.documentElement.innerHTML + "\n</html>",
+    mode: "text/html",
+    matchTags: true,
+    extraKeys: {"Ctrl-J": "toMatchingTag"}
+  });
+};
+    </script>
+
+    <p>Put the cursor on or inside a pair of tags to highlight them.
+    Press Ctrl-J to jump to the tag that matches the one under the
+    cursor.</p>
+  </body>
+</html>
diff --git a/doc/manual.html b/doc/manual.html
index 68692e2956..4284535f3f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1659,6 +1659,17 @@ <h2 id="addons">Add-ons</h2>
       them, should have the second character also moved to its own
       line. <a href="../demo/closebrackets.html">Demo here</a>.</dd>
 
+      <dt id="addon_matchtags"><a href="../addon/edit/matchtags.js"><code>edit/matchtags.js</code></a></dt>
+      <dd>Defines an option <code>matchTags</code> that, when enabled,
+      will cause the tags around the cursor to be highlighted (using
+      the <code>CodeMirror-matchingbrackets</code> class). Also
+      defines
+      a <a href="#commands">command</a> <code>toMatchingTag</code>,
+      which you can bind a key to in order to jump to the tag mathing
+      the one under the cursor. Depends on
+      the <code>addon/fold/xml-fold.js</code>
+      addon. <a href="../demo/matchtags.html">Demo here.</a></dd>
+
       <dt id="addon_trailingspace"><a href="../addon/edit/trailingspace.js"><code>edit/trailingspace.js</code></a></dt>
       <dd>Adds an option <code>showTrailingSpace</code> which, when
       enabled, adds the CSS class <code>cm-trailingspace</code> to

From 493bd95ca309958ac3e1335a704893decc77a92d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Jun 2013 10:37:24 +0200
Subject: [PATCH 0218/4742] [real-world uses] Add Echoplexus and Shadertoy

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 98aaff989b..6e76980b4a 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -47,6 +47,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://cssdeck.com/">CSSDeck</a> (CSS showcase)</li>
       <li><a href="http://ireneros.com/deck/deck.js-codemirror/introduction/#textarea-code">Deck.js integration</a> (slides with editors)</li>
       <li><a href="http://www.dbninja.com">DbNinja</a> (MySQL access interface)</li>
+      <li><a href="https://chat.echoplex.us/">Echoplexus</a> (chat and collaborative coding)</li>
       <li><a href="http://elm-lang.org/Examples.elm">Elm language examples</a></li>
       <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
       <li><a href="http://emmet.io">Emmet</a> (fast XML editing)</li>
@@ -89,6 +90,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://www.quivive-file-manager.com">Quivive File Manager</a></li>
       <li><a href="http://rascalmicro.com/docs/basic-tutorial-getting-started.html">Rascal</a> (tiny computer)</li>
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
+      <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
       <li><a href="http://www.skulpt.org/">Skulpt</a> (in-browser Python environment)</li>
       <li><a href="http://snippets.pro/">Snippets.pro</a> (code snippet sharing)</li>

From a48327868c691c94841f635442330603a9ca4bf4 Mon Sep 17 00:00:00 2001
From: Drew Bratcher <drew@crowdspots.com>
Date: Sun, 23 Jun 2013 22:49:37 -0700
Subject: [PATCH 0219/4742] [jade mode] Add

---
 mode/jade/index.html | 54 +++++++++++++++++++++++++++
 mode/jade/jade.js    | 88 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 mode/jade/index.html
 create mode 100644 mode/jade/jade.js

diff --git a/mode/jade/index.html b/mode/jade/index.html
new file mode 100644
index 0000000000..0e68ba8ac4
--- /dev/null
+++ b/mode/jade/index.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: Jade Templating Mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="jade.js"></script>
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <link rel="stylesheet" href="../../doc/docs.css">
+  </head>
+  <body>
+    <h1>CodeMirror: Jade Templating Mode</h1>
+    <form><textarea id="code" name="code">
+doctype 5
+  html
+    head
+      title= "Jade Templating CodeMirror Mode Example"
+      link(rel='stylesheet', href='/css/bootstrap.min.css')
+      link(rel='stylesheet', href='/css/index.css')
+      script(type='text/javascript', src='/js/jquery-1.9.1.min.js')
+      script(type='text/javascript', src='/js/bootstrap.min.js')
+    body
+      div.header
+        h1 Welcome to this Example
+      div.spots
+        if locals.spots
+          each spot in spots
+            div.spot.well
+         div
+           if spot.logo
+             img.img-rounded.logo(src=spot.logo)
+           else
+             img.img-rounded.logo(src="img/placeholder.png")
+         h3
+           a(href=spot.hash) ##{spot.hash}
+           if spot.title
+             span.title #{spot.title}
+           if spot.desc
+             div #{spot.desc}
+        else
+          h3 There are no spots currently available.
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "jade", alignCDATA: true},
+        lineNumbers: true
+      });
+    </script>
+    <h3>The Jade Templating Mode</h3>
+      <p> Created by Drew Bratcher. Managed as part of an Adobe Brackets extension at <a href="https://github.com/dbratcher/brackets-jade">https://github.com/dbratcher/brackets-jade</a>.</p>
+    <p><strong>MIME type defined:</strong> <code>text/x-jade</code>.</p>
+  </body>
+</html>
diff --git a/mode/jade/jade.js b/mode/jade/jade.js
new file mode 100644
index 0000000000..2c62632f1e
--- /dev/null
+++ b/mode/jade/jade.js
@@ -0,0 +1,88 @@
+CodeMirror.defineMode("jade", function () {
+  var symbol_regex1 = /^(?:~|!|%|\^|\*|\+|=|\\|:|;|,|\/|\?|&|<|>|\|)/;
+  var open_paren_regex = /^(\(|\[)/;
+  var close_paren_regex = /^(\)|\])/;
+  var keyword_regex1 = /^(if|else|return|var|function|include|doctype|each)/;
+  var keyword_regex2 = /^(#|{|}|\.)/;
+  var keyword_regex3 = /^(in)/;
+  var html_regex1 = /^(html|head|title|meta|link|script|body|br|div|input|span|a|img)/;
+  var html_regex2 = /^(h1|h2|h3|h4|h5|p|strong|em)/;
+  return {
+    startState: function () {
+      return {
+        inString: false,
+        stringType: "",
+        beforeTag: true,
+        justMatchedKeyword: false,
+        afterParen: false
+      };
+    },
+    token: function (stream, state) {
+      //check for state changes
+      if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
+        state.stringType = stream.peek();
+        stream.next(); // Skip quote
+        state.inString = true; // Update state
+      }
+
+      //return state
+      if (state.inString) {
+        if (stream.skipTo(state.stringType)) { // Quote found on this line
+          stream.next(); // Skip quote
+          state.inString = false; // Clear flag
+        } else {
+          stream.skipToEnd(); // Rest of line is string
+        }
+        state.justMatchedKeyword = false;
+        return "string"; // Token style
+      } else if(stream.sol()) {
+        stream.eatSpace();
+        if(stream.match(keyword_regex1)) {
+          state.justMatchedKeyword = true;
+          stream.eatSpace();
+          return "keyword";
+        }
+        if(stream.match(html_regex1) || stream.match(html_regex2)) {
+          state.justMatchedKeyword = true;
+          return "variable";
+        }
+        return null;
+      } else if(stream.eatSpace()) {
+        state.justMatchedKeyword = false;
+        if(stream.match(keyword_regex3) && stream.eatSpace()) {
+          state.justMatchedKeyword = true;
+          return "keyword";
+        }
+        return null;
+      } else if(stream.match(symbol_regex1)) {
+        state.justMatchedKeyword = false;
+        return "atom";
+      } else if(stream.match(open_paren_regex)) {
+        state.afterParen = true;
+        state.justMatchedKeyword = true;
+        return "def";
+      } else if(stream.match(close_paren_regex)) {
+        state.afterParen = false;
+        state.justMatchedKeyword = true;
+        return "def";
+      } else if(stream.match(keyword_regex2)) {
+        state.justMatchedKeyword = true;
+        return "keyword";
+      } else if(stream.eatSpace()) {
+        state.justMatchedKeyword = false;
+        return null;
+      } else {
+        stream.next();
+        if(state.justMatchedKeyword){
+          return "property";
+        } else if(state.afterParen) {
+          return "property";
+        }
+        return null;
+      }
+    }
+  };
+});
+
+CodeMirror.defineMIME('text/x-jade', 'jade');
+

From 8942221a52622b750f1d1c52c857aef05c85effc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Jun 2013 10:41:22 +0200
Subject: [PATCH 0220/4742] [jade mode] Integrate

---
 doc/compress.html | 1 +
 doc/modes.html    | 1 +
 mode/meta.js      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/doc/compress.html b/doc/compress.html
index fede6f43fa..8b7a11d670 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -93,6 +93,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/mode/htmlembedded/htmlembedded.js">htmlembedded.js</option>
           <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option>
           <option value="http://codemirror.net/mode/http/http.js">http.js</option>
+          <option value="http://codemirror.net/mode/jade/jade.js">jade.js</option>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
           <option value="http://codemirror.net/mode/less/less.js">less.js</option>
diff --git a/doc/modes.html b/doc/modes.html
index af798aa774..69c7d5e9ad 100644
--- a/doc/modes.html
+++ b/doc/modes.html
@@ -45,6 +45,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="../mode/htmlmixed/index.html">HTML mixed-mode</a></li>
       <li><a href="../mode/http/index.html">HTTP</a></li>
       <li><a href="../mode/clike/index.html">Java</a></li>
+      <li><a href="../mode/jade/index.html">Jade</a></li>
       <li><a href="../mode/javascript/index.html">JavaScript</a></li>
       <li><a href="../mode/jinja2/index.html">Jinja2</a></li>
       <li><a href="../mode/less/index.html">LESS</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index e8cfc8fb63..cb1051e68f 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -26,6 +26,7 @@ CodeMirror.modeInfo = [
   {name: 'JavaServer Pages', mime: 'application/x-jsp', mode: 'htmlembedded'},
   {name: 'HTML', mime: 'text/html', mode: 'htmlmixed'},
   {name: 'HTTP', mime: 'message/http', mode: 'http'},
+  {name: 'Jade', mime: 'text/x-jade', mode: 'jade'},
   {name: 'JavaScript', mime: 'text/javascript', mode: 'javascript'},
   {name: 'JSON', mime: 'application/x-json', mode: 'javascript'},
   {name: 'JSON', mime: 'application/json', mode: 'javascript'},

From a4cbc645611017015594fe5e8f9738b27d1c571c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Jun 2013 12:45:42 +0200
Subject: [PATCH 0221/4742] [tern addon] Support custom type/completion tips

+ a few other fixes
---
 addon/tern/tern.js | 83 ++++++++++++++++++++++++----------------------
 demo/tern.html     | 15 ++++++++-
 2 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 662736637c..5cff75782b 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -16,23 +16,16 @@
 //   multi-file view, switch the view or focus to the named file.
 // * showError: A function(editor, message) that can be used to
 //   override the way errors are displayed.
+// * completionTip: Customize the content in tooltips for completions.
+//   Is passed a single argument—the completion's data as returned by
+//   Tern—and may return a string, DOM node, or null to indicate that
+//   no tip should be shown. By default the docstring is shown.
+// * typeTip: Like completionTip, but for the tooltips shown for type
+//   queries.
 
 (function() {
   "use strict";
 
-  CodeMirror.getURL = function(url, c) {
-    var xhr = new XMLHttpRequest();
-    xhr.open("get", url, true);
-    xhr.send();
-    xhr.onreadystatechange = function() {
-      if (xhr.readyState != 4) return;
-      if (xhr.status < 400) return c(null, xhr.responseText);
-      var e = new Error(xhr.responseText || "No response");
-      e.status = xhr.status;
-      c(e);
-    };
-  };
-
   CodeMirror.TernServer = function(options) {
     var self = this;
     this.options = options || {};
@@ -62,7 +55,7 @@
     delDoc: function(name) {
       var found = this.docs[name];
       if (!found) return;
-      CodeMirror.on(found.doc, "change", this.trackChange);
+      CodeMirror.off(found.doc, "change", this.trackChange);
       delete this.docs[name];
       this.server.delFile(name);
     },
@@ -72,6 +65,8 @@
       CodeMirror.showHint(cm, function(cm, c) { return hint(self, cm, c); }, {async: true});
     },
 
+    getHint: function(cm, c) { return hint(this, cm, c); },
+
     showType: function(cm) { showType(this, cm); },
 
     updateArgHints: function(cm) { updateArgHints(this, cm); },
@@ -80,7 +75,11 @@
 
     jumpBack: function(cm) { jumpBack(this, cm); },
 
-    rename: function(cm) { rename(this, cm); }
+    rename: function(cm) { rename(this, cm); },
+
+    request: function(cm, query, c) {
+      this.server.request(buildRequest(this, findDoc(this, cm.getDoc()), query), c);
+    }
   };
 
   var Pos = CodeMirror.Pos;
@@ -139,10 +138,7 @@
   // Completion
 
   function hint(ts, cm, c) {
-    var doc = findDoc(ts, cm.getDoc());
-    var req = buildRequest(ts, doc, {type: "completions", types: true, docs: true});
-
-    ts.server.request(req, function(error, data) {
+    ts.request(cm, {type: "completions", types: true, docs: true}, function(error, data) {
       if (error) return showError(ts, cm, error);
       var completions = [], after = "";
       var from = data.start, to = data.end;
@@ -156,7 +152,7 @@
         completions.push({text: completion.name + after,
                           displayText: completion.name,
                           className: className,
-                          doc: completion.doc});
+                          data: completion});
       }
 
       var obj = {from: from, to: to, list: completions};
@@ -164,9 +160,10 @@
       CodeMirror.on(obj, "close", function() { remove(tooltip); });
       CodeMirror.on(obj, "select", function(cur, node) {
         remove(tooltip);
-        if (cur.doc) {
+        var content = ts.options.completionTip ? ts.options.completionTip(cur.data) : cur.data.doc;
+        if (content) {
           tooltip = makeTooltip(node.parentNode.getBoundingClientRect().right + window.pageXOffset,
-                                node.getBoundingClientRect().top + window.pageYOffset, cur.doc);
+                                node.getBoundingClientRect().top + window.pageYOffset, content);
           tooltip.className += " " + cls + "hint-doc";
         }
       });
@@ -187,15 +184,18 @@
   // Type queries
 
   function showType(ts, cm) {
-    var doc = findDoc(ts, cm.getDoc());
-    ts.server.request(buildRequest(ts, doc, "type"), function(error, data) {
+    ts.request(cm, "type", function(error, data) {
       if (error) return showError(ts, cm, error);
-      var tip = elt("span", null, elt("strong", null, data.type || "not found"));
-      if (data.doc)
-        tip.appendChild(document.createTextNode(" — " + data.doc));
-      if (data.url) {
-        tip.appendChild(document.createTextNode(" "));
-        tip.appendChild(elt("a", null, "[docs]")).href = data.url;
+      if (ts.options.typeTip) {
+        var tip = ts.options.typeTip(data);
+      } else {
+        var tip = elt("span", null, elt("strong", null, data.type || "not found"));
+        if (data.doc)
+          tip.appendChild(document.createTextNode(" — " + data.doc));
+        if (data.url) {
+          tip.appendChild(document.createTextNode(" "));
+          tip.appendChild(elt("a", null, "[docs]")).href = data.url;
+        }
       }
       tempTooltip(cm, tip);
     });
@@ -204,7 +204,7 @@
   // Maintaining argument hints
 
   function updateArgHints(ts, cm) {
-    if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
+    closeArgHints(ts);
 
     if (cm.somethingSelected()) return;
     var lex = cm.getTokenAt(cm.getCursor()).state.lexical;
@@ -220,8 +220,7 @@
     if (cache && cache.doc == cm.getDoc() && cmpPos(start, cache.start) == 0)
       return showArgHints(ts, cm, pos);
 
-    var query = {type: "type", preferFunction: true, end: start};
-    ts.server.request(buildRequest(ts, findDoc(ts, cm.getDoc()), query), function(error, data) {
+    ts.request(cm, {type: "type", preferFunction: true, end: start}, function(error, data) {
       if (error || !data.type || !(/^fn\(/).test(data.type)) return;
       ts.cachedArgHints = {
         start: pos,
@@ -235,7 +234,7 @@
   }
 
   function showArgHints(ts, cm, pos) {
-    if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
+    closeArgHints(ts);
 
     var cache = ts.cachedArgHints, tp = cache.type;
     var tip = elt("span", cache.guess ? cls + "fhint-guess" : null,
@@ -324,8 +323,10 @@
 
   function moveTo(ts, curDoc, doc, start, end) {
     doc.doc.setSelection(end, start);
-    if (curDoc != doc && ts.options.switchToDoc)
+    if (curDoc != doc && ts.options.switchToDoc) {
+      closeArgHints(ts);
       ts.options.switchToDoc(doc.name);
+    }
   }
 
   // The {line,ch} representation of positions makes this rather awkward.
@@ -371,8 +372,7 @@
     var token = cm.getTokenAt(cm.getCursor());
     if (!/\w/.test(token.string)) showError(ts, cm, "Not at a variable");
     dialog(cm, "New name for " + token.string, function(newName) {
-      var req = {type: "rename", newName: newName}, doc = findDoc(ts, cm.getDoc());
-      ts.server.request(buildRequest(ts, doc, req, false), function(error, data) {
+      ts.request(cm, {type: "rename", newName: newName, fullDocs: true}, function(error, data) {
         if (error) return showError(ts, cm, error);
         applyChanges(ts, data.changes);
       });
@@ -400,8 +400,9 @@
 
   // Generic request-building helper
 
-  function buildRequest(ts, doc, query, allowFragments) {
-    var files = [], offsetLines = 0;
+  function buildRequest(ts, doc, query) {
+    var files = [], offsetLines = 0, allowFragments = !query.fullDocs;
+    if (!allowFragments) delete query.fullDocs;
     if (typeof query == "string") query = {type: query};
     query.lineCharPositions = true;
     if (query.end == null) {
@@ -528,4 +529,8 @@
     else
       tempTooltip(cm, String(msg));
   }
+
+  function closeArgHints(ts) {
+    if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
+  }
 })();
diff --git a/demo/tern.html b/demo/tern.html
index 22464f8a60..42c2b1a7bb 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -71,8 +71,21 @@ <h1>CodeMirror: Tern Demo</h1>
 </textarea></p>
 
 <script>
+  function getURL(url, c) {
+    var xhr = new XMLHttpRequest();
+    xhr.open("get", url, true);
+    xhr.send();
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState != 4) return;
+      if (xhr.status < 400) return c(null, xhr.responseText);
+      var e = new Error(xhr.responseText || "No response");
+      e.status = xhr.status;
+      c(e);
+    };
+  }
+
   var server;
-  CodeMirror.getURL("http://ternjs.net/defs/ecma5.json", function(err, code) {
+  getURL("http://ternjs.net/defs/ecma5.json", function(err, code) {
     if (err) throw new Error("Request for ecma5.json: " + err);
     server = new CodeMirror.TernServer({defs: [JSON.parse(code)]});
     editor.setOption("extraKeys", {

From 92201ddd625662bfe3f309aeae499412f35006e3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Jun 2013 13:24:19 +0200
Subject: [PATCH 0222/4742] [tern addon] Add crude support for web workers

---
 addon/tern/tern.js   | 68 +++++++++++++++++++++++++++++++++++++++-----
 addon/tern/worker.js | 39 +++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 7 deletions(-)
 create mode 100644 addon/tern/worker.js

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 5cff75782b..8b04c7de88 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -22,6 +22,18 @@
 //   no tip should be shown. By default the docstring is shown.
 // * typeTip: Like completionTip, but for the tooltips shown for type
 //   queries.
+//
+// It is possible to run the Tern server in a web worker by specifying
+// these additional options:
+// * useWorker: Set to true to enable web worker mode. You'll probably
+//   want to feature detect the actual value you use here, for example
+//   !!window.Worker.
+// * workerScript: The main script of the worker. Point this to
+//   wherever you are hosting worker.js from this directory.
+// * workerDeps: An array of paths pointing (relative to workerScript)
+//   to the Acorn and Tern libraries and any Tern plugins you want to
+//   load. Or, if you minified those into a single script and included
+//   them in the workerScript, simply leave this undefined.
 
 (function() {
   "use strict";
@@ -29,14 +41,18 @@
   CodeMirror.TernServer = function(options) {
     var self = this;
     this.options = options || {};
-    var plugins = this.options.plugins || {};
+    var plugins = this.options.plugins || (this.options.plugins = {});
     if (!plugins.doc_comment) plugins.doc_comment = true;
-    this.server = new tern.Server({
-      getFile: function(name, c) { return getFile(self, name, c); },
-      async: true,
-      defs: this.options.defs || [],
-      plugins: plugins
-    });
+    if (this.options.useWorker) {
+      this.server = new WorkerServer(this);
+    } else {
+      this.server = new tern.Server({
+        getFile: function(name, c) { return getFile(self, name, c); },
+        async: true,
+        defs: this.options.defs || [],
+        plugins: plugins
+      });
+    }
     this.docs = Object.create(null);
     this.trackChange = function(doc, change) { trackChange(self, doc, change); };
 
@@ -533,4 +549,42 @@
   function closeArgHints(ts) {
     if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
   }
+
+  function WorkerServer(ts) {
+    var worker = new Worker(ts.options.workerScript);
+    worker.postMessage({type: "init",
+                        defs: ts.options.defs,
+                        plugins: ts.options.plugins,
+                        scripts: ts.options.workerDeps});
+    var msgId = 0, pending = {};
+
+    function send(data, c) {
+      if (c) {
+        data.id = ++msgId;
+        pending[msgId] = c;
+      }
+      worker.postMessage(data);
+    }
+    worker.onmessage = function(e) {
+      var data = e.data;
+      if (data.type == "getFile") {
+        getFile(ts, name, function(err, text) {
+          send({type: "getFile", err: String(err), text: text, id: data.id});
+        });
+      } else if (data.type == "debug") {
+        console.log(data.message);
+      } else if (data.id && pending[data.id]) {
+        pending[data.id](data.err, data.body);
+        delete pending[data.id];
+      }
+    };
+    worker.onerror = function(e) {
+      for (var id in pending) pending[id](e);
+      pending = {};
+    };
+
+    this.addFile = function(name, text) { send({type: "add", name: name, text: text}); };
+    this.delFile = function(name) { send({type: "del", name: name}); };
+    this.request = function(body, c) { send({type: "req", body: body}, c); };
+  }
 })();
diff --git a/addon/tern/worker.js b/addon/tern/worker.js
new file mode 100644
index 0000000000..0164762f59
--- /dev/null
+++ b/addon/tern/worker.js
@@ -0,0 +1,39 @@
+var server;
+
+this.onmessage = function(e) {
+  var data = e.data;
+  switch (data.type) {
+  case "init": return startServer(data.defs, data.plugins, data.scripts);
+  case "add": return server.addFile(data.name, data.text);
+  case "del": return server.delFile(data.name);
+  case "req": return server.request(data.body, function(err, reqData) {
+    postMessage({id: data.id, body: reqData, err: err && String(err)});
+  });
+  case "getFile":
+    var c = pending[data.id];
+    delete pending[data.id];
+    return c(data.err, data.text);
+  default: throw new Error("Unknown message type: " + data.type);
+  }
+};
+
+var nextId = 0, pending = {};
+function getFile(file, c) {
+  postMessage({type: "getFile", name: file, id: ++nextId});
+  pending[nextId] = c;
+}
+
+function startServer(defs, plugins, scripts) {
+  if (scripts) importScripts.apply(null, scripts);
+
+  server = new tern.Server({
+    getFile: getFile,
+    async: true,
+    defs: defs,
+    plugins: plugins
+  });
+}
+
+var console = {
+  log: function(v) { postMessage({type: "debug", message: v}); }
+};

From e3ea602fc4174a71b7e50830db0fd07c7c3f0e35 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Jun 2013 13:28:33 +0200
Subject: [PATCH 0223/4742] [tern addon] Add fileFilter option

---
 addon/tern/tern.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 8b04c7de88..3bec44e2fb 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -12,6 +12,8 @@
 // * getFile: A function(name, c) that can be used to access files in
 //   the project that haven't been loaded yet. Simply do c(null) to
 //   indicate that a file is not available.
+// * fileFilter: A function that will be applied to documents before
+//   passing them on to Tern.
 // * switchToDoc: A function(name) that should, when providing a
 //   multi-file view, switch the view or focus to the named file.
 // * showError: A function(editor, message) that can be used to
@@ -63,7 +65,7 @@
 
   CodeMirror.TernServer.prototype = {
     addDoc: function(name, doc) {
-      this.server.addFile(name, doc.getValue());
+      this.server.addFile(name, docValue(this, doc));
       CodeMirror.on(doc, "change", this.trackChange);
       return this.docs[name] = {doc: doc, name: name, changed: null};
     },
@@ -105,7 +107,7 @@
   function getFile(ts, name, c) {
     var buf = ts.docs[name];
     if (buf)
-      c(buf.doc.getValue());
+      c(docValue(ts, buf.doc));
     else if (ts.options.getFile)
       ts.options.getFile(name, c);
     else
@@ -145,7 +147,7 @@
   }
 
   function sendDoc(ts, doc) {
-    ts.server.request({files: [{type: "full", name: doc.name, text: doc.doc.getValue()}]}, function(error) {
+    ts.server.request({files: [{type: "full", name: doc.name, text: docValue(ts, doc.doc)}]}, function(error) {
       if (error) console.error(error);
       else doc.changed = null;
     });
@@ -440,7 +442,7 @@
       } else {
         files.push({type: "full",
                     name: doc.name,
-                    text: doc.doc.getValue()});
+                    text: docValue(ts, doc.doc)});
         query.file = doc.name;
         doc.changed = null;
       }
@@ -450,7 +452,7 @@
     for (var name in ts.docs) {
       var cur = ts.docs[name];
       if (cur.changed && cur != doc) {
-        files.push({type: "full", name: cur.name, text: cur.doc.getValue()});
+        files.push({type: "full", name: cur.name, text: docValue(ts, cur.doc)});
         cur.changed = null;
       }
     }
@@ -550,6 +552,14 @@
     if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
   }
 
+  function docValue(ts, doc) {
+    var val = doc.getValue();
+    if (ts.options.fileFilter) val = ts.options.fileFilter(val);
+    return val;
+  }
+
+  // Worker wrapper
+
   function WorkerServer(ts) {
     var worker = new Worker(ts.options.workerScript);
     worker.postMessage({type: "init",

From 16cade33efaf50e456621f84ee1a79d55b5ebcec Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Jun 2013 13:34:39 +0200
Subject: [PATCH 0224/4742] [tern addon] Add hideDoc method

---
 addon/tern/tern.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 3bec44e2fb..4702bb747d 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -78,6 +78,12 @@
       this.server.delFile(name);
     },
 
+    hideDoc: function(name) {
+      closeArgHints(this);
+      var found = this.docs[name];
+      if (found && found.changed) sendDoc(this, found);
+    },
+
     complete: function(cm) {
       var self = this;
       CodeMirror.showHint(cm, function(cm, c) { return hint(self, cm, c); }, {async: true});

From 93fc95b41ec2d144feab927fbd4018d82ce298e6 Mon Sep 17 00:00:00 2001
From: Drew Bratcher <drew@crowdspots.com>
Date: Mon, 24 Jun 2013 21:07:39 -0700
Subject: [PATCH 0225/4742] [jade mode] fixed start of line bug

... that caused certain jade files to cause brackets to hang
---
 mode/jade/jade.js | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index 2c62632f1e..61abb27ab7 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -35,54 +35,56 @@ CodeMirror.defineMode("jade", function () {
         }
         state.justMatchedKeyword = false;
         return "string"; // Token style
-      } else if(stream.sol()) {
-        stream.eatSpace();
-        if(stream.match(keyword_regex1)) {
+      } else if (stream.sol() && stream.eatSpace()) {
+        if (stream.match(keyword_regex1)) {
           state.justMatchedKeyword = true;
           stream.eatSpace();
           return "keyword";
         }
-        if(stream.match(html_regex1) || stream.match(html_regex2)) {
+        if (stream.match(html_regex1) || stream.match(html_regex2)) {
           state.justMatchedKeyword = true;
           return "variable";
         }
-        return null;
-      } else if(stream.eatSpace()) {
+      } else if (stream.sol() && stream.match(keyword_regex1)) {
+        state.justMatchedKeyword = true;
+        stream.eatSpace();
+        return "keyword";
+      } else if (stream.sol() && (stream.match(html_regex1) || stream.match(html_regex2))) {
+        state.justMatchedKeyword = true;
+        return "variable";
+      } else if (stream.eatSpace()) {
         state.justMatchedKeyword = false;
-        if(stream.match(keyword_regex3) && stream.eatSpace()) {
+        if (stream.match(keyword_regex3) && stream.eatSpace()) {
           state.justMatchedKeyword = true;
           return "keyword";
         }
-        return null;
-      } else if(stream.match(symbol_regex1)) {
+      } else if (stream.match(symbol_regex1)) {
         state.justMatchedKeyword = false;
         return "atom";
-      } else if(stream.match(open_paren_regex)) {
+      } else if (stream.match(open_paren_regex)) {
         state.afterParen = true;
         state.justMatchedKeyword = true;
         return "def";
-      } else if(stream.match(close_paren_regex)) {
+      } else if (stream.match(close_paren_regex)) {
         state.afterParen = false;
         state.justMatchedKeyword = true;
         return "def";
-      } else if(stream.match(keyword_regex2)) {
+      } else if (stream.match(keyword_regex2)) {
         state.justMatchedKeyword = true;
         return "keyword";
-      } else if(stream.eatSpace()) {
+      } else if (stream.eatSpace()) {
         state.justMatchedKeyword = false;
-        return null;
       } else {
         stream.next();
-        if(state.justMatchedKeyword){
+        if (state.justMatchedKeyword) {
           return "property";
-        } else if(state.afterParen) {
+        } else if (state.afterParen) {
           return "property";
         }
-        return null;
       }
+      return null;
     }
   };
 });
 
 CodeMirror.defineMIME('text/x-jade', 'jade');
-

From db38471bb48daf6fbfa951e38d91f28f8e4a0910 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Jun 2013 09:09:32 +0200
Subject: [PATCH 0226/4742] [css mode] Fix incorrect entering of propertyValue
 context

Closes #1533
---
 mode/css/css.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 27c97f37eb..93c2b10695 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -273,7 +273,6 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
       else if (context == "@mediaType" && stream.current() == ",") state.stack.pop();
       else if (context == "@mediaType" && type == "(") state.stack.push("@mediaType(");
       else if (context == "@mediaType(" && type == ")") state.stack.pop();
-      else if ((context == "rule" || context == "block") && type == ":") state.stack.push("propertyValue");
       else if (context == "propertyValue" && type == ";") state.stack.pop();
       else if (context == "@import" && type == ";") state.stack.pop();
       return style;

From 9ca3d37a2bf296c7fb6d2aed64fd23cf9fcbf070 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Jun 2013 09:24:15 +0200
Subject: [PATCH 0227/4742] [css mode] Better fix for #1533

---
 mode/css/css.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 93c2b10695..b38a968e5e 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -103,7 +103,8 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     startState: function(base) {
       return {tokenize: tokenBase,
               baseIndent: base || 0,
-              stack: []};
+              stack: [],
+              lastToken: null};
     },
 
     token: function(stream, state) {
@@ -163,7 +164,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
       var context = state.stack[state.stack.length-1];
       if (style == "variable") {
         if (type == "variable-definition") state.stack.push("propertyValue");
-        return "variable-2";
+        return state.lastToken = "variable-2";
       } else if (style == "property") {
         var word = stream.current().toLowerCase();
         if (context == "propertyValue") {
@@ -273,9 +274,10 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
       else if (context == "@mediaType" && stream.current() == ",") state.stack.pop();
       else if (context == "@mediaType" && type == "(") state.stack.push("@mediaType(");
       else if (context == "@mediaType(" && type == ")") state.stack.pop();
+      else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
       else if (context == "propertyValue" && type == ";") state.stack.pop();
       else if (context == "@import" && type == ";") state.stack.pop();
-      return style;
+      return state.lastToken = style;
     },
 
     indent: function(state, textAfter) {

From 128e79e3570e684c0617eeae2b1fcf6b43e83633 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Jun 2013 09:31:05 +0200
Subject: [PATCH 0228/4742] [scss tests] Simplify a test to handle a limit in
 property parsing

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

diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 996dc78849..3644f63de8 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -64,7 +64,7 @@
     "[tag p] { [tag a] { [property color][operator :][atom #000]; } }");
 
   MT('interpolation_in_property',
-    "[tag foo] { [operator #{][variable-2 $hello][operator }:][atom #000]; }");
+    "[tag foo] { [operator #{][variable-2 $hello][operator }:][number 2]; }");
 
   MT('interpolation_in_selector',
     "[tag foo][operator #{][variable-2 $hello][operator }] { [property color][operator :][atom #000]; }");

From 5b011c7db143b85b255e9363745c95a38f70f619 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Jun 2013 13:47:29 +0200
Subject: [PATCH 0229/4742] More hacks in character measurement to fix cursor
 at zero-width widget

Issue #1617
---
 lib/codemirror.js | 79 +++++++++++++++++++++++++++--------------------
 test/test.js      | 15 +++++++++
 2 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 986f1640c8..f3f0efb640 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -964,11 +964,12 @@ window.CodeMirror = (function() {
       if (r) break;
       if (dir < 0 && pos == 0) dir = 1;
     }
-    var rightV = (pos < ch || bias == "right") && r.topRight != null;
+    if ((pos > ch || bias == "left") && r.leftSide) r = r.leftSide;
+    else if ((pos < ch || bias == "right") && r.rightSide) r = r.rightSide;
     return {left: pos < ch ? r.right : r.left,
             right: pos > ch ? r.left : r.right,
-            top: rightV ? r.topRight : r.top,
-            bottom: rightV ? r.bottomRight : r.bottom};
+            top: r.top,
+            bottom: r.bottom};
   }
 
   function findCachedMeasurement(cm, line) {
@@ -1041,48 +1042,51 @@ window.CodeMirror = (function() {
     if (ie_lt9 && display.measure.first != pre)
       removeChildrenAndAdd(display.measure, pre);
 
-    function categorizeVSpan(top, bot) {
+    function measureRect(rect) {
+      var top = rect.top - outer.top, bot = rect.bottom - outer.top;
       if (bot > maxBot) bot = maxBot;
       if (top < 0) top = 0;
-      for (var j = 0; j < vranges.length; j += 2) {
-        var rtop = vranges[j], rbot = vranges[j+1];
+      for (var i = vranges.length - 2; i >= 0; i -= 2) {
+        var rtop = vranges[i], rbot = vranges[i+1];
         if (rtop > bot || rbot < top) continue;
         if (rtop <= top && rbot >= bot ||
             top <= rtop && bot >= rbot ||
             Math.min(bot, rbot) - Math.max(top, rtop) >= (bot - top) >> 1) {
-          vranges[j] = Math.min(top, rtop);
-          vranges[j+1] = Math.max(bot, rbot);
-          return j;
+          vranges[i] = Math.min(top, rtop);
+          vranges[i+1] = Math.max(bot, rbot);
+          break;
         }
       }
-      vranges.push(top, bot);
-      return j;
+      if (i < 0) { i = vranges.length; vranges.push(top, bot); }
+      return {left: rect.left - outer.left,
+              right: rect.right - outer.left,
+              top: i, bottom: null};
+    }
+    function finishRect(rect) {
+      rect.bottom = vranges[rect.top+1];
+      if (isNaN(rect.bottom)) debugger;
+      rect.top = vranges[rect.top];
     }
 
     for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {
-      var size, node = cur;
+      var node = cur, rect = null;
       // A widget might wrap, needs special care
       if (/\bCodeMirror-widget\b/.test(cur.className) && cur.getClientRects) {
         if (cur.firstChild.nodeType == 1) node = cur.firstChild;
-        var rects = node.getClientRects(), rLeft = rects[0], rRight = rects[rects.length - 1];
+        var rects = node.getClientRects();
         if (rects.length > 1) {
-          var vCatLeft = categorizeVSpan(rLeft.top - outer.top, rLeft.bottom - outer.top);
-          var vCatRight = categorizeVSpan(rRight.top - outer.top, rRight.bottom - outer.top);
-          data[i] = {left: rLeft.left - outer.left, right: rRight.right - outer.left,
-                     top: vCatLeft, topRight: vCatRight};
-          continue;
+          rect = data[i] = measureRect(rects[0]);
+          rect.rightSide = measureRect(rects[rects.length - 1]);
         }
       }
-      size = getRect(node);
-      var vCat = categorizeVSpan(size.top - outer.top, size.bottom - outer.top);
-      var right = size.right;
-      if (cur.measureRight) right = getRect(cur.measureRight).left;
-      data[i] = {left: size.left - outer.left, right: right - outer.left, top: vCat};
+      if (!rect) rect = data[i] = measureRect(getRect(node));
+      if (cur.measureRight) rect.right = getRect(cur.measureRight).left;
+      if (cur.leftSide) rect.leftSide = measureRect(getRect(cur.leftSide));
     }
     for (var i = 0, cur; i < data.length; ++i) if (cur = data[i]) {
-      var vr = cur.top, vrRight = cur.topRight;
-      cur.top = vranges[vr]; cur.bottom = vranges[vr+1];
-      if (vrRight != null) { cur.topRight = vranges[vrRight]; cur.bottomRight = vranges[vrRight+1]; }
+      finishRect(cur);
+      if (cur.leftSide) finishRect(cur.leftSide);
+      if (cur.rightSide) finishRect(cur.rightSide);
     }
     return data;
   }
@@ -4304,9 +4308,11 @@ window.CodeMirror = (function() {
       } else if (i && wrapping && spanAffectsWrapping(text, i)) {
         builder.pre.appendChild(elt("wbr"));
       }
+      var old = builder.measure[builder.pos];
       var span = builder.measure[builder.pos] =
         buildToken(builder, ch, style,
                    start && startStyle, i == text.length - 1 && endStyle);
+      if (old) span.leftSide = old.leftSide || old;
       // In IE single-space nodes wrap differently than spaces
       // embedded in larger text nodes, except when set to
       // white-space: normal (issue #1268).
@@ -4330,15 +4336,23 @@ window.CodeMirror = (function() {
     };
   }
 
-  function buildCollapsedSpan(builder, size, widget) {
+  function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
+    var widget = !ignoreWidget && marker.replacedWith;
     if (widget) {
       if (!builder.display) widget = widget.cloneNode(true);
+      builder.pre.appendChild(widget);
       if (builder.measure) {
-        builder.measure[builder.pos] = size ? widget
-          : builder.pre.appendChild(zeroWidthElement(builder.cm.display.measure));
+        if (size) {
+          builder.measure[builder.pos] = widget;
+        } else {
+          var elt = builder.measure[builder.pos] = zeroWidthElement(builder.cm.display.measure);
+          if (marker.type != "bookmark" || marker.insertLeft)
+            builder.pre.insertBefore(elt, widget);
+          else
+            builder.pre.appendChild(elt);
+        }
         builder.measuredSomething = true;
       }
-      builder.pre.appendChild(widget);
     }
     builder.pos += size;
   }
@@ -4372,12 +4386,11 @@ window.CodeMirror = (function() {
           } else if (sp.from > pos && nextChange > sp.from) {
             nextChange = sp.from;
           }
-          if (m.type == "bookmark" && sp.from == pos && m.replacedWith)
-            foundBookmark = m.replacedWith;
+          if (m.type == "bookmark" && sp.from == pos && m.replacedWith) foundBookmark = m;
         }
         if (collapsed && (collapsed.from || 0) == pos) {
           buildCollapsedSpan(builder, (collapsed.to == null ? len : collapsed.to) - pos,
-                             collapsed.from != null && collapsed.marker.replacedWith);
+                             collapsed.marker, collapsed.from == null);
           if (collapsed.to == null) return collapsed.marker.find();
         }
         if (foundBookmark && !collapsed) buildCollapsedSpan(builder, 0, foundBookmark);
diff --git a/test/test.js b/test/test.js
index 2bcc450288..cc4b57a4b6 100644
--- a/test/test.js
+++ b/test/test.js
@@ -499,6 +499,21 @@ testCM("bookmarkInsertLeft", function(cm) {
   eqPos(bl.find(), Pos(0, 1));
 }, {value: "abcdef"});
 
+testCM("bookmarkCursor", function(cm) {
+  var pos01 = cm.cursorCoords(Pos(0, 1)), pos11 = cm.cursorCoords(Pos(1, 1)),
+      pos20 = cm.cursorCoords(Pos(2, 0)), pos30 = cm.cursorCoords(Pos(3, 0));
+  cm.setBookmark(Pos(0, 1), {widget: document.createTextNode("←"), insertLeft: true});
+  cm.setBookmark(Pos(2, 0), {widget: document.createTextNode("←"), insertLeft: true});
+  cm.setBookmark(Pos(1, 1), {widget: document.createTextNode("→")});
+  cm.setBookmark(Pos(3, 0), {widget: document.createTextNode("→")});
+  var new01 = cm.cursorCoords(Pos(0, 1)), new11 = cm.cursorCoords(Pos(1, 1)),
+      new20 = cm.cursorCoords(Pos(2, 0)), new30 = cm.cursorCoords(Pos(3, 0));
+  is(new01.left == pos01.left && new01.top == pos01.top, "at left, middle of line");
+  is(new11.left > pos11.left && new11.top == pos11.top, "at right, middle of line");
+  is(new20.left == pos20.left && new20.top == pos20.top, "at left, empty line");
+  is(new30.left > pos30.left && new30.top == pos30.top, "at right, empty line");
+}, {value: "foo\nbar\n\n\nx"});
+
 testCM("getAllMarks", function(cm) {
   addDoc(cm, 10, 10);
   var m1 = cm.setBookmark(Pos(0, 2));

From ecbbfe2478b30eae134a387deba43d8c451f8f6e Mon Sep 17 00:00:00 2001
From: Ken Newman <wraithkenny@unfocus.com>
Date: Wed, 26 Jun 2013 16:10:52 -0400
Subject: [PATCH 0230/4742] [themes] Fix unrestricted rules

---
 theme/lesser-dark.css |  2 +-
 theme/midnight.css    | 22 +++++++++++-----------
 theme/vibrant-ink.css |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 67f71ad727..0bd08f5c6d 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -14,7 +14,7 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 .cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
 
-div.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
+.cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
 
 .cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
 .cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
diff --git a/theme/midnight.css b/theme/midnight.css
index e567625c6c..ec612779d6 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -1,22 +1,22 @@
 /* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
 
 /*<!--breakpoint-->*/
-.breakpoints {width: .8em;}
-.breakpoint { color: #822; }
+.cm-s-midnight .breakpoints {width: .8em;}
+.cm-s-midnight .breakpoint { color: #822; }
 
 /*<!--match-->*/
-span.CodeMirror-matchhighlight { background: #494949 }
-.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67; !important }
+.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949 }
+.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67; !important }
 
 /*<!--activeline-->*/
-.activeline {background: #253540 !important;}
+.cm-s-midnight .activeline {background: #253540 !important;}
 
 .cm-s-midnight.CodeMirror {
     background: #0F192A;
     color: #D1EDFF;
 }
 
-.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+.cm-s-midnight.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 
 .cm-s-midnight div.CodeMirror-selected {background: #314D67 !important;}
 .cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;}
@@ -29,7 +29,7 @@ span.CodeMirror-matchhighlight { background: #494949 }
 .cm-s-midnight span.cm-atom {color: #AE81FF;}
 .cm-s-midnight span.cm-number {color: #D1EDFF;}
 
-.cm-s-midnight span.cm-property, .cm-s-tropicaleve span.cm-attribute {color: #A6E22E;}
+.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute {color: #A6E22E;}
 .cm-s-midnight span.cm-keyword {color: #E83737;}
 .cm-s-midnight span.cm-string {color: #1DC116;}
 
@@ -46,7 +46,7 @@ span.CodeMirror-matchhighlight { background: #494949 }
   color: white !important;
 }
 
-.typ { color: #FFAA3E; }
-.atn { color: #606; }
-.atv { color: #080; }
-.dec { color: #606; }
+.cm-s-midnight .typ { color: #FFAA3E; }
+.cm-s-midnight .atn { color: #606; }
+.cm-s-midnight .atv { color: #080; }
+.cm-s-midnight .dec { color: #606; }
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index 22024a489a..4445be2d71 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -11,8 +11,8 @@
 .cm-s-vibrant-ink .cm-atom { color: #FC0; }
 .cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
 .cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
-.cm-s-vibrant-ink span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #FFC66D }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-cobalt span.cm-def { color: #FFC66D }
+.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D }
 .cm-s-vibrant-ink .cm-operator { color: #888; }
 .cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
 .cm-s-vibrant-ink .cm-string { color:  #A5C25C }

From c91110d097878ef87a5a582e35d93376bca39207 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 27 Jun 2013 08:24:14 +0200
Subject: [PATCH 0231/4742] [midnight theme] Remove some rules referring to
 classes CM does not use

---
 theme/midnight.css | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/theme/midnight.css b/theme/midnight.css
index ec612779d6..f10edf932a 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -1,9 +1,5 @@
 /* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
 
-/*<!--breakpoint-->*/
-.cm-s-midnight .breakpoints {width: .8em;}
-.cm-s-midnight .breakpoint { color: #822; }
-
 /*<!--match-->*/
 .cm-s-midnight span.CodeMirror-matchhighlight { background: #494949 }
 .cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67; !important }
@@ -45,8 +41,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-.cm-s-midnight .typ { color: #FFAA3E; }
-.cm-s-midnight .atn { color: #606; }
-.cm-s-midnight .atv { color: #080; }
-.cm-s-midnight .dec { color: #606; }

From 1121be6ce8201fdd3d507b8b438aaa105bbb156e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 27 Jun 2013 08:28:33 +0200
Subject: [PATCH 0232/4742] [merge addon] Fix another layout issue

---
 addon/merge/merge.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/merge/merge.css b/addon/merge/merge.css
index 1302532091..58c468fda3 100644
--- a/addon/merge/merge.css
+++ b/addon/merge/merge.css
@@ -16,6 +16,7 @@
 .CodeMirror-diff-pane {
   display: inline-block;
   white-space: normal;
+  vertical-align: top;
 }
 .CodeMirror-diff-pane-rightmost {
   position: absolute;

From dea9374057fd8545e6083bca79679f69b8f7b46b Mon Sep 17 00:00:00 2001
From: Hasan Karahan <hasan.karahan81@gmail.com>
Date: Tue, 2 Jul 2013 13:39:00 +0500
Subject: [PATCH 0233/4742] [rst] Emphasis and literal highlighting fix

Ensured that emphasis (weak & strong) plus literal syntax highlighting are rendered correctly even if the highlighted word is followed immediately by a non-word character (like an interpunction):

 * ```a word **strongly emphasised**?```;
 * ```a word *weakly emphasised*?```;
 * ```a word with ``literal emphasis``?```;

Further changed recognition order to `strong`, `weak`, `literal`, `number`, `positive`, `negative` and `link` to comply more with the reStructuredText spec (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#recognition-order).
---
 mode/rst/LICENSE.txt |  2 +-
 mode/rst/rst.js      | 39 +++++++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/mode/rst/LICENSE.txt b/mode/rst/LICENSE.txt
index 39484fabb9..c40984a84d 100644
--- a/mode/rst/LICENSE.txt
+++ b/mode/rst/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2013 Hasan Karahan
+Copyright (c) 2013 Hasan Karahan <hasan.karahan81@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 8de9d75415..6f12d7c32f 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -494,6 +494,14 @@ CodeMirror.defineMode('rst-base', function (config) {
 
 CodeMirror.defineMode('rst', function (config, options) {
 
+    var rx_strong = /^\*\*[^\*\s](?:[^\*]*[^\*\s])?\*\*/;
+    var rx_emphasis = /^\*[^\*\s](?:[^\*]*[^\*\s])?\*/;
+    var rx_literal = /^``[^`\s](?:[^`]*[^`\s])``/;
+
+    var rx_number = /^(?:[\d]+(?:[\.,]\d+)*)/;
+    var rx_positive = /^(?:\s\+[\d]+(?:[\.,]\d+)*)/;
+    var rx_negative = /^(?:\s\-[\d]+(?:[\.,]\d+)*)/;
+
     var rx_uri_protocol = "[Hh][Tt][Tt][Pp][Ss]?://";
     var rx_uri_domain = "(?:[\\d\\w.-]+)\\.(?:\\w{2,6})";
     var rx_uri_path = "(?:/[\\d\\w\\#\\%\\&\\-\\.\\,\\/\\:\\=\\?\\~]+)*";
@@ -501,33 +509,32 @@ CodeMirror.defineMode('rst', function (config, options) {
         rx_uri_protocol + rx_uri_domain + rx_uri_path
     );
 
-    var rx_strong = /^\*\*[^\*\s](?:[^\*]*[^\*\s])?\*\*(\s+|$)/;
-    var rx_emphasis = /^[^\*]\*[^\*\s](?:[^\*]*[^\*\s])?\*(\s+|$)/;
-    var rx_literal = /^``[^`\s](?:[^`]*[^`\s])``(\s+|$)/;
-
-    var rx_number = /^(?:[\d]+(?:[\.,]\d+)*)/;
-    var rx_positive = /^(?:\s\+[\d]+(?:[\.,]\d+)*)/;
-    var rx_negative = /^(?:\s\-[\d]+(?:[\.,]\d+)*)/;
-
     var overlay = {
         token: function (stream) {
 
-            if (stream.match(rx_uri)) return 'link';
-            if (stream.match(rx_strong)) return 'strong';
-            if (stream.match(rx_emphasis)) return 'em';
-            if (stream.match(rx_literal)) return 'string-2';
-            if (stream.match(rx_number)) return 'number';
-            if (stream.match(rx_positive)) return 'positive';
-            if (stream.match(rx_negative)) return 'negative';
+            if (stream.match(rx_strong) && stream.match (/\W+|$/, false))
+                return 'strong';
+            if (stream.match(rx_emphasis) && stream.match (/\W+|$/, false))
+                return 'em';
+            if (stream.match(rx_literal) && stream.match (/\W+|$/, false))
+                return 'string-2';
+            if (stream.match(rx_number))
+                return 'number';
+            if (stream.match(rx_positive))
+                return 'positive';
+            if (stream.match(rx_negative))
+                return 'negative';
+            if (stream.match(rx_uri))
+                return 'link';
 
             while (stream.next() != null) {
-                if (stream.match(rx_uri, false)) break;
                 if (stream.match(rx_strong, false)) break;
                 if (stream.match(rx_emphasis, false)) break;
                 if (stream.match(rx_literal, false)) break;
                 if (stream.match(rx_number, false)) break;
                 if (stream.match(rx_positive, false)) break;
                 if (stream.match(rx_negative, false)) break;
+                if (stream.match(rx_uri, false)) break;
             }
 
             return null;

From 4f52afbdd7ac9eb824d7e506dcc4704b08b2f1f7 Mon Sep 17 00:00:00 2001
From: Hasan Karahan <hasan.karahan81@gmail.com>
Date: Tue, 2 Jul 2013 14:56:21 +0500
Subject: [PATCH 0234/4742] [rst] Reference name fix w.r.t. "phrase-references"

Phrase-references should be able to contain interpunction characters; fixed.
---
 mode/rst/rst.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 6f12d7c32f..db5aa6cd8f 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -36,9 +36,11 @@ CodeMirror.defineMode('rst-base', function (config) {
     var TAIL = "(?:\\s*|\\W|$)",
         rx_TAIL = new RegExp(format('^{0}', TAIL));
 
-    var NAME = "(?:[^\\W\\d_](?:[\\w\\+\\.\\-:]*[^\\W_])?)",
+    var NAME =
+        "(?:[^\\W\\d_](?:[\\w!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)",
         rx_NAME = new RegExp(format('^{0}', NAME));
-    var NAME_WWS = "(?:[^\\W\\d_](?:[\\w\\s\\+\\.\\-:]*[^\\W_])?)";
+    var NAME_WWS =
+        "(?:[^\\W\\d_](?:[\\w\\s!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)";
     var REF_NAME = format('(?:{0}|`{1}`)', NAME, NAME_WWS);
 
     var TEXT1 = "(?:[^\\s\\|](?:[^\\|]*[^\\s\\|])?)";

From 0f3b2dc731e940db47ced44e753c09d8fa5d9561 Mon Sep 17 00:00:00 2001
From: LM <ladislav@marek.su>
Date: Wed, 26 Jun 2013 17:07:28 +0200
Subject: [PATCH 0235/4742] [smalltalk mode] add support for "#'...'" symbol
 syntax

---
 mode/smalltalk/smalltalk.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index eb32417514..f2d4cb3185 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -36,8 +36,13 @@ CodeMirror.defineMode('smalltalk', function(config) {
       token = nextString(stream, new Context(nextString, context));
 
     } else if (aChar === '#') {
-      stream.eatWhile(/[^ .\[\]()]/);
-      token.name = 'string-2';
+      if (stream.peek() === '\'') {
+        stream.next();
+        token = nextSymbol(stream, new Context(nextSymbol, context));
+      } else {
+        stream.eatWhile(/[^ .\[\]()]/);
+        token.name = 'string-2';
+      }
 
     } else if (aChar === '$') {
       if (stream.next() === '<') {
@@ -89,6 +94,11 @@ CodeMirror.defineMode('smalltalk', function(config) {
     return new Token('string', stream.eat('\'') ? context.parent : context, false);
   };
 
+  var nextSymbol = function(stream, context) {
+    stream.eatWhile(/[^']/);
+    return new Token('string-2', stream.eat('\'') ? context.parent : context, false);
+  };
+
   var nextTemporaries = function(stream, context) {
     var token = new Token(null, context, false);
     var aChar = stream.next();

From e4c069c14e89dc049e88e56c8ed575564b889b99 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jul 2013 13:00:30 +0200
Subject: [PATCH 0236/4742] [tern addon] Fix a few bugs

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

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 4702bb747d..1b99b5452c 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -443,8 +443,8 @@
         files.push(getFragmentAround(doc, startPos, query.end));
         query.file = "#0";
         var offsetLines = files[0].offsetLines;
-        if (query.start != null) query.start = incLine(-offsetLines, query.start);
-        query.end = incLine(-offsetLines, query.end);
+        if (query.start != null) query.start = Pos(query.start.line - -offsetLines, query.start.ch);
+        query.end = Pos(query.end.line - offsetLines, query.end.ch);
       } else {
         files.push({type: "full",
                     name: doc.name,
@@ -468,7 +468,7 @@
 
   function getFragmentAround(data, start, end) {
     var doc = data.doc;
-    var minIndent = null, minLine = null, endLine, tabSize = doc.getOption("tabSize");
+    var minIndent = null, minLine = null, endLine, tabSize = 4;
     for (var p = start.line - 1, min = Math.max(0, p - 50); p >= min; --p) {
       var line = doc.getLine(p), fn = line.search(/\bfunction\b/);
       if (fn < 0) continue;

From 2baf270a9b4d0e2f3451e9a6e517164603230dfe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jul 2013 13:03:29 +0200
Subject: [PATCH 0237/4742] [tern addon] Pass file name and document to
 fileFilter

---
 addon/tern/tern.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 1b99b5452c..9155924018 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -12,8 +12,8 @@
 // * getFile: A function(name, c) that can be used to access files in
 //   the project that haven't been loaded yet. Simply do c(null) to
 //   indicate that a file is not available.
-// * fileFilter: A function that will be applied to documents before
-//   passing them on to Tern.
+// * fileFilter: A function(value, docName, doc) that will be applied
+//   to documents before passing them on to Tern.
 // * switchToDoc: A function(name) that should, when providing a
 //   multi-file view, switch the view or focus to the named file.
 // * showError: A function(editor, message) that can be used to
@@ -65,9 +65,10 @@
 
   CodeMirror.TernServer.prototype = {
     addDoc: function(name, doc) {
-      this.server.addFile(name, docValue(this, doc));
+      var data = {doc: doc, name: name, changed: null};
+      this.server.addFile(name, docValue(this, data));
       CodeMirror.on(doc, "change", this.trackChange);
-      return this.docs[name] = {doc: doc, name: name, changed: null};
+      return this.docs[name] = data;
     },
 
     delDoc: function(name) {
@@ -113,7 +114,7 @@
   function getFile(ts, name, c) {
     var buf = ts.docs[name];
     if (buf)
-      c(docValue(ts, buf.doc));
+      c(docValue(ts, buf));
     else if (ts.options.getFile)
       ts.options.getFile(name, c);
     else
@@ -153,7 +154,7 @@
   }
 
   function sendDoc(ts, doc) {
-    ts.server.request({files: [{type: "full", name: doc.name, text: docValue(ts, doc.doc)}]}, function(error) {
+    ts.server.request({files: [{type: "full", name: doc.name, text: docValue(ts, doc)}]}, function(error) {
       if (error) console.error(error);
       else doc.changed = null;
     });
@@ -448,7 +449,7 @@
       } else {
         files.push({type: "full",
                     name: doc.name,
-                    text: docValue(ts, doc.doc)});
+                    text: docValue(ts, doc)});
         query.file = doc.name;
         doc.changed = null;
       }
@@ -458,7 +459,7 @@
     for (var name in ts.docs) {
       var cur = ts.docs[name];
       if (cur.changed && cur != doc) {
-        files.push({type: "full", name: cur.name, text: docValue(ts, cur.doc)});
+        files.push({type: "full", name: cur.name, text: docValue(ts, cur)});
         cur.changed = null;
       }
     }
@@ -559,8 +560,8 @@
   }
 
   function docValue(ts, doc) {
-    var val = doc.getValue();
-    if (ts.options.fileFilter) val = ts.options.fileFilter(val);
+    var val = doc.doc.getValue();
+    if (ts.options.fileFilter) val = ts.options.fileFilter(val, doc.name, doc.doc);
     return val;
   }
 

From 40321eb8aa47ca14dfb31ae6f3c07de15be86d9f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jul 2013 13:27:58 +0200
Subject: [PATCH 0238/4742] Add -moz-box-sizing rules to the styles that use
 box-sizing

Apparenly Firefox still hasn't caught up on the unprefixed version.
---
 addon/merge/merge.css | 1 +
 addon/tern/tern.css   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addon/merge/merge.css b/addon/merge/merge.css
index 58c468fda3..3bd6bbb9a5 100644
--- a/addon/merge/merge.css
+++ b/addon/merge/merge.css
@@ -28,6 +28,7 @@
   z-index: 2;
   display: inline-block;
   height: 100%;
+  -moz-box-sizing: border-box;
   box-sizing: border-box;
   overflow: hidden;
   border-left: 1px solid #ddd;
diff --git a/addon/tern/tern.css b/addon/tern/tern.css
index e8d5731861..eacc2f053a 100644
--- a/addon/tern/tern.css
+++ b/addon/tern/tern.css
@@ -14,6 +14,7 @@
   line-height: 16px;
   text-align: center;
   color: white;
+  -moz-box-sizing: border-box;
   box-sizing: border-box;
 }
 .CodeMirror-Tern-completion-unknown:before {

From b62ad2e6b6e67db85cb0c951fa02187c8a959b55 Mon Sep 17 00:00:00 2001
From: Alexander Pavlov <apavlov@chromium.org>
Date: Thu, 27 Jun 2013 18:08:33 +0400
Subject: [PATCH 0239/4742] Propagate StringStream's match() fixes to runmode

---
 addon/runmode/runmode-standalone.js | 4 +++-
 addon/runmode/runmode.node.js       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 7a9b82ffa8..5be7d74405 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -43,12 +43,14 @@ StringStream.prototype = {
   match: function(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
       var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-      if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) {
+      var substr = this.string.substr(this.pos, pattern.length);
+      if (cased(substr) == cased(pattern)) {
         if (consume !== false) this.pos += pattern.length;
         return true;
       }
     } else {
       var match = this.string.slice(this.pos).match(pattern);
+      if (match && match.index > 0) return null;
       if (match && consume !== false) this.pos += match[0].length;
       return match;
     }
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index a6ea919d83..ffdcc16a83 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -41,12 +41,14 @@ StringStream.prototype = {
   match: function(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
       var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-      if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) {
+      var substr = this.string.substr(this.pos, pattern.length);
+      if (cased(substr) == cased(pattern)) {
         if (consume !== false) this.pos += pattern.length;
         return true;
       }
     } else {
       var match = this.string.slice(this.pos).match(pattern);
+      if (match && match.index > 0) return null;
       if (match && consume !== false) this.pos += match[0].length;
       return match;
     }

From 39e051d234da99b81d4d6617c4918b6a2c3d0c53 Mon Sep 17 00:00:00 2001
From: James Campos <james.r.campos@gmail.com>
Date: Sat, 22 Jun 2013 09:19:50 -0700
Subject: [PATCH 0240/4742] [vim keymap] Define a vim option, register
 beforeSelectionChange handler

Issue #1084
Issue #1630
---
 demo/vim.html     |   4 +-
 keymap/vim.js     | 164 +++++++++++++++++++++++++---------------------
 lib/codemirror.js |   3 +-
 test/vim_test.js  |  44 +++++--------
 4 files changed, 112 insertions(+), 103 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index c5835d40da..9b7a432c6b 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -50,13 +50,13 @@ <h1>CodeMirror: Vim bindings demo</h1>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         mode: "text/x-csrc",
-        keyMap: "vim",
+        vimMode: true,
         showCursorWhenSelecting: true
       });
       var editor2 = CodeMirror.fromTextArea(document.getElementById("code2"), {
         lineNumbers: true,
         mode: "text/x-csrc",
-        keyMap: "vim",
+        vimMode: true,
         showCursorWhenSelecting: true
       });
     </script>
diff --git a/keymap/vim.js b/keymap/vim.js
index 8c942a3ff5..977642ea38 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -206,8 +206,7 @@
     // Operators
     { keys: ['d'], type: 'operator', operator: 'delete' },
     { keys: ['y'], type: 'operator', operator: 'yank' },
-    { keys: ['c'], type: 'operator', operator: 'change',
-        operatorArgs: { enterInsertMode: true } },
+    { keys: ['c'], type: 'operator', operator: 'change' },
     { keys: ['>'], type: 'operator', operator: 'indent',
         operatorArgs: { indentRight: true }},
     { keys: ['<'], type: 'operator', operator: 'indent',
@@ -231,7 +230,7 @@
         motion: 'moveToEol', motionArgs: { inclusive: true },
         operatorMotionArgs: { visualLine: true }},
     { keys: ['C'], type: 'operatorMotion',
-        operator: 'change', operatorArgs: { enterInsertMode: true },
+        operator: 'change',
         motion: 'moveToEol', motionArgs: { inclusive: true },
         operatorMotionArgs: { visualLine: true }},
     { keys: ['~'], type: 'operatorMotion', operator: 'swapcase',
@@ -315,6 +314,27 @@
   ];
 
   var Vim = function() {
+    CodeMirror.defineOption('vimMode', false, function(cm, val) {
+      if (val) {
+        cm.setOption('keyMap', 'vim');
+        cm.on('beforeSelectionChange', beforeSelectionChange);
+        maybeInitVimState(cm);
+      } else if (cm.state.vim) {
+        cm.setOption('keyMap', 'default');
+        cm.off('beforeSelectionChange', beforeSelectionChange);
+        cm.state.vim = null;
+      }
+    });
+    function beforeSelectionChange(cm, cur) {
+      var vim = cm.state.vim;
+      if (vim.insertMode || vim.exMode) return;
+
+      var head = cur.head;
+      if (head.ch && head.ch == cm.doc.getLine(head.line).length) {
+        head.ch--;
+      }
+    }
+
     var numberRegex = /[\d]/;
     var wordRegexp = [(/\w/), (/[^\w\s]/)], bigWordRegexp = [(/\S/)];
     function makeKeyRange(start, size) {
@@ -450,28 +470,11 @@
       };
     };
 
-    // Global Vim state. Call getVimGlobalState to get and initialize.
-    var vimGlobalState;
-    function getVimGlobalState() {
-      if (!vimGlobalState) {
-        vimGlobalState = {
-          // The current search query.
-          searchQuery: null,
-          // Whether we are searching backwards.
-          searchIsReversed: false,
-          jumpList: createCircularJumpList(),
-          macroModeState: createMacroState(),
-          // Recording latest f, t, F or T motion command.
-          lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
-          registerController: new RegisterController({})
-        };
-      }
-      return vimGlobalState;
-    }
-    function getVimState(cm) {
-      if (!cm.vimState) {
+
+    function maybeInitVimState(cm) {
+      if (!cm.state.vim) {
         // Store instance state in the CodeMirror object.
-        cm.vimState = {
+        cm.state.vim = {
           inputState: new InputState(),
           // Vim's input state that triggered the last edit, used to repeat
           // motions and operators with '.'.
@@ -500,7 +503,21 @@
           visualLine: false
         };
       }
-      return cm.vimState;
+      return cm.state.vim;
+    }
+    var vimGlobalState;
+    function resetVimGlobalState() {
+      vimGlobalState = {
+        // The current search query.
+        searchQuery: null,
+        // Whether we are searching backwards.
+        searchIsReversed: false,
+        jumpList: createCircularJumpList(),
+        macroModeState: createMacroState(),
+        // Recording latest f, t, F or T motion command.
+        lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
+        registerController: new RegisterController({})
+      };
     }
 
     var vimApi= {
@@ -510,16 +527,19 @@
       // Testing hook, though it might be useful to expose the register
       // controller anyways.
       getRegisterController: function() {
-        return getVimGlobalState().registerController;
+        return vimGlobalState.registerController;
       },
       // Testing hook.
-      clearVimGlobalState_: function() {
-        vimGlobalState = null;
-      },
+      resetVimGlobalState_: resetVimGlobalState,
+
       // Testing hook.
       getVimGlobalState_: function() {
         return vimGlobalState;
       },
+
+      // Testing hook.
+      maybeInitVimState_: maybeInitVimState,
+
       InsertModeKey: InsertModeKey,
       map: function(lhs, rhs) {
         // Add user defined key bindings.
@@ -532,17 +552,12 @@
         exCommands[name]=func;
         exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
       },
-      // Initializes vim state variable on the CodeMirror object. Should only be
-      // called lazily by handleKey or for testing.
-      maybeInitState: function(cm) {
-        getVimState(cm);
-      },
       // This is the outermost function called by CodeMirror, after keys have
       // been mapped to their Vim equivalents.
       handleKey: function(cm, key) {
         var command;
-        var vim = getVimState(cm);
-        var macroModeState = getVimGlobalState().macroModeState;
+        var vim = maybeInitVimState(cm);
+        var macroModeState = vimGlobalState.macroModeState;
         if (macroModeState.enteredMacroMode) {
           if (key == 'q') {
             actions.exitMacroRecordMode();
@@ -967,7 +982,7 @@
             // cachedCursor is used to save the old position of the cursor
             // when * or # causes vim to seek for the nearest word and shift
             // the cursor before entering the motion.
-            getVimGlobalState().jumpList.cachedCursor = cm.getCursor();
+            vimGlobalState.jumpList.cachedCursor = cm.getCursor();
             cm.setCursor(word.start);
 
             handleQuery(query, true /** ignoreCase */, false /** smartCase */);
@@ -1049,7 +1064,7 @@
             return;
           }
           if (motionArgs.toJumplist) {
-            var jumpList = getVimGlobalState().jumpList;
+            var jumpList = vimGlobalState.jumpList;
             // if the current motion is # or *, use cachedCursor
             var cachedCursor = jumpList.cachedCursor;
             if (cachedCursor) {
@@ -1145,13 +1160,10 @@
           if (vim.visualMode) {
             exitVisualMode(cm);
           }
-          if (operatorArgs.enterInsertMode) {
-            actions.enterInsertMode(cm, {}, vim);
-          }
         }
       },
       recordLastEdit: function(vim, inputState, actionCommand) {
-        var macroModeState = getVimGlobalState().macroModeState;
+        var macroModeState = vimGlobalState.macroModeState;
         if (macroModeState.inReplay) { return; }
         vim.lastEditInputState = inputState;
         vim.lastEditActionCommand = actionCommand;
@@ -1458,7 +1470,7 @@
         return [start, end];
       },
       repeatLastCharacterSearch: function(cm, motionArgs) {
-        var lastSearch = getVimGlobalState().lastChararacterSearch;
+        var lastSearch = vimGlobalState.lastChararacterSearch;
         var repeat = motionArgs.repeat;
         var forward = motionArgs.forward === lastSearch.forward;
         var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
@@ -1476,7 +1488,7 @@
 
     var operators = {
       change: function(cm, operatorArgs, _vim, curStart, curEnd) {
-        getVimGlobalState().registerController.pushText(
+        vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'change', cm.getRange(curStart, curEnd),
             operatorArgs.linewise);
         if (operatorArgs.linewise) {
@@ -1497,6 +1509,7 @@
           }
           cm.replaceRange('', curStart, curEnd);
         }
+        actions.enterInsertMode(cm, {}, cm.state.vim);
         cm.setCursor(curStart);
       },
       // delete is a javascript keyword.
@@ -1508,7 +1521,7 @@
           curStart.line--;
           curStart.ch = lineLength(cm, curStart.line);
         }
-        getVimGlobalState().registerController.pushText(
+        vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'delete', cm.getRange(curStart, curEnd),
             operatorArgs.linewise);
         cm.replaceRange('', curStart, curEnd);
@@ -1550,7 +1563,7 @@
         cm.setCursor(curOriginal);
       },
       yank: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
-        getVimGlobalState().registerController.pushText(
+        vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'yank',
             cm.getRange(curStart, curEnd), operatorArgs.linewise);
         cm.setCursor(curOriginal);
@@ -1564,7 +1577,7 @@
         }
         var repeat = actionArgs.repeat;
         var forward = actionArgs.forward;
-        var jumpList = getVimGlobalState().jumpList;
+        var jumpList = vimGlobalState.jumpList;
 
         var mark = jumpList.move(cm, forward ? repeat : -repeat);
         var markPos = mark ? mark.find() : undefined;
@@ -1590,7 +1603,7 @@
       replayMacro: function(cm, actionArgs) {
         var registerName = actionArgs.selectedCharacter;
         var repeat = actionArgs.repeat;
-        var macroModeState = getVimGlobalState().macroModeState;
+        var macroModeState = vimGlobalState.macroModeState;
         if (registerName == '@') {
           registerName = macroModeState.latestRegister;
         }
@@ -1600,13 +1613,13 @@
         }
       },
       exitMacroRecordMode: function() {
-        var macroModeState = getVimGlobalState().macroModeState;
+        var macroModeState = vimGlobalState.macroModeState;
         macroModeState.toggle();
         parseKeyBufferToRegister(macroModeState.latestRegister,
                                  macroModeState.macroKeyBuffer);
       },
       enterMacroRecordMode: function(cm, actionArgs) {
-        var macroModeState = getVimGlobalState().macroModeState;
+        var macroModeState = vimGlobalState.macroModeState;
         var registerName = actionArgs.selectedCharacter;
         macroModeState.toggle(cm, registerName);
         emptyMacroKeyBuffer(macroModeState);
@@ -1632,7 +1645,7 @@
         } else {
           cm.setOption('keyMap', 'vim-insert');
         }
-        if (!getVimGlobalState().macroModeState.inReplay) {
+        if (!vimGlobalState.macroModeState.inReplay) {
           // Only record if not replaying.
           cm.on('change', onChange);
           cm.on('cursorActivity', onCursorActivity);
@@ -1725,6 +1738,7 @@
         });
       },
       newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
+        vim.insertMode = true;
         var insertAt = cm.getCursor();
         if (insertAt.line === cm.firstLine() && !actionArgs.after) {
           // Special case for inserting newline before start of document.
@@ -1743,7 +1757,7 @@
       },
       paste: function(cm, actionArgs) {
         var cur = cm.getCursor();
-        var register = getVimGlobalState().registerController.getRegister(
+        var register = vimGlobalState.registerController.getRegister(
             actionArgs.registerName);
         if (!register.text) {
           return;
@@ -1988,7 +2002,7 @@
 
     function exitVisualMode(cm) {
       cm.off('mousedown', exitVisualMode);
-      var vim = cm.vimState;
+      var vim = cm.state.vim;
       vim.visualMode = false;
       vim.visualLine = false;
       var selectionStart = cm.getCursor('anchor');
@@ -2112,12 +2126,11 @@
 
     function recordJumpPosition(cm, oldCur, newCur) {
       if(!cursorEqual(oldCur, newCur)) {
-        getVimGlobalState().jumpList.add(cm, oldCur, newCur);
+        vimGlobalState.jumpList.add(cm, oldCur, newCur);
       }
     }
 
     function recordLastCharacterSearch(increment, args) {
-        var vimGlobalState = getVimGlobalState();
         vimGlobalState.lastChararacterSearch.increment = increment;
         vimGlobalState.lastChararacterSearch.forward = args.forward;
         vimGlobalState.lastChararacterSearch.selectedCharacter = args.selectedCharacter;
@@ -2571,10 +2584,10 @@
     function SearchState() {}
     SearchState.prototype = {
       getQuery: function() {
-        return getVimGlobalState().query;
+        return vimGlobalState.query;
       },
       setQuery: function(query) {
-        getVimGlobalState().query = query;
+        vimGlobalState.query = query;
       },
       getOverlay: function() {
         return this.searchOverlay;
@@ -2583,14 +2596,14 @@
         this.searchOverlay = overlay;
       },
       isReversed: function() {
-        return getVimGlobalState().isReversed;
+        return vimGlobalState.isReversed;
       },
       setReversed: function(reversed) {
-        getVimGlobalState().isReversed = reversed;
+        vimGlobalState.isReversed = reversed;
       }
     };
     function getSearchState(cm) {
-      var vim = getVimState(cm);
+      var vim = cm.state.vim;
       return vim.searchState_ || (vim.searchState_ = new SearchState());
     }
     function dialog(cm, template, shortText, onClose, options) {
@@ -2839,7 +2852,7 @@
     };
     Vim.ExCommandDispatcher.prototype = {
       processCommand: function(cm, input) {
-        var vim = getVimState(cm);
+        var vim = cm.state.vim;
         if (vim.visualMode) {
           exitVisualMode(cm);
         }
@@ -2920,7 +2933,7 @@
           case '$':
             return cm.lastLine();
           case '\'':
-            var mark = getVimState(cm).marks[inputStream.next()];
+            var mark = cm.state.vim.marks[inputStream.next()];
             if (mark && mark.find()) {
               return mark.find().line;
             }
@@ -3030,7 +3043,7 @@
         exCommandDispatcher.map(mapArgs[0], mapArgs[1], cm);
       },
       move: function(cm, params) {
-        commandDispatcher.processCommand(cm, getVimState(cm), {
+        commandDispatcher.processCommand(cm, cm.state.vim, {
             type: 'motion',
             motion: 'moveToLineOrEdgeOfDocument',
             motionArgs: { forward: false, explicitRepeat: true,
@@ -3185,7 +3198,7 @@
           return;
         }
 
-        var state = getVimState(cm);
+        var state = cm.state.vim;
         var stream = new CodeMirror.StringStream(params.argString.trim());
         while (!stream.eol()) {
           stream.eatSpace();
@@ -3256,6 +3269,7 @@
     function doReplace(cm, confirm, lineStart, lineEnd, searchCursor, query,
         replaceWith) {
       // Set up all the functions.
+      cm.state.vim.exMode = true;
       var done = false;
       var lastPos = searchCursor.from();
       function replaceAll() {
@@ -3290,7 +3304,8 @@
         cm.focus();
         if (lastPos) {
           cm.setCursor(lastPos);
-          var vim = getVimState(cm);
+          var vim = cm.state.vim;
+          vim.exMode = false;
           vim.lastHPos = vim.lastHSPos = lastPos.ch;
         }
       }
@@ -3402,9 +3417,8 @@
     CodeMirror.keyMap.vim = buildVimKeyMap();
 
     function exitInsertMode(cm) {
-      var vim = getVimState(cm);
-      vim.insertMode = false;
-      var inReplay = getVimGlobalState().macroModeState.inReplay;
+      var vim = cm.state.vim;
+      var inReplay = vimGlobalState.macroModeState.inReplay;
       if (!inReplay) {
         cm.off('change', onChange);
         cm.off('cursorActivity', onCursorActivity);
@@ -3418,6 +3432,7 @@
       }
       delete vim.insertModeRepeat;
       cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
+      vim.insertMode = false;
       cm.setOption('keyMap', 'vim');
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
     }
@@ -3445,7 +3460,7 @@
 
     function parseRegisterToKeyBuffer(macroModeState, registerName) {
       var match, key;
-      var register = getVimGlobalState().registerController.getRegister(registerName);
+      var register = vimGlobalState.registerController.getRegister(registerName);
       var text = register.toString();
       var macroKeyBuffer = macroModeState.macroKeyBuffer;
       emptyMacroKeyBuffer(macroModeState);
@@ -3461,7 +3476,7 @@
 
     function parseKeyBufferToRegister(registerName, keyBuffer) {
       var text = keyBuffer.join('');
-      getVimGlobalState().registerController.setRegisterText(registerName, text);
+      vimGlobalState.registerController.setRegisterText(registerName, text);
     }
 
     function emptyMacroKeyBuffer(macroModeState) {
@@ -3489,7 +3504,7 @@
      * Should only be active in insert mode.
      */
     function onChange(_cm, changeObj) {
-      var macroModeState = getVimGlobalState().macroModeState;
+      var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       while (changeObj) {
         lastChange.expectCursorActivityForChange = true;
@@ -3509,7 +3524,7 @@
     * - Should only be active in insert mode.
     */
     function onCursorActivity() {
-      var macroModeState = getVimGlobalState().macroModeState;
+      var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       if (lastChange.expectCursorActivityForChange) {
         lastChange.expectCursorActivityForChange = false;
@@ -3530,7 +3545,7 @@
     * - For recording deletes in insert mode.
     */
     function onKeyEventTargetKeyDown(e) {
-      var macroModeState = getVimGlobalState().macroModeState;
+      var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       var keyName = CodeMirror.keyName(e);
       function onKeyFound() {
@@ -3552,7 +3567,7 @@
      * corresponding enterInsertMode call was made with a count.
      */
     function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
-      var macroModeState = getVimGlobalState().macroModeState;
+      var macroModeState = vimGlobalState.macroModeState;
       macroModeState.inReplay = true;
       var isAction = !!vim.lastEditActionCommand;
       var cachedInputState = vim.inputState;
@@ -3620,6 +3635,7 @@
       }
     }
 
+    resetVimGlobalState();
     return vimApi;
   };
   // Initialize Vim and make it available as an API.
diff --git a/lib/codemirror.js b/lib/codemirror.js
index f3f0efb640..e4f5e19349 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4976,7 +4976,8 @@ window.CodeMirror = (function() {
   }
 
   function historyChangeFromChange(doc, change) {
-    var histChange = {from: change.from, to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
+    var from = { line: change.from.line, ch: change.from.ch };
+    var histChange = {from: from, to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
     attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
     linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
     return histChange;
diff --git a/test/vim_test.js b/test/vim_test.js
index 44639c72c8..0e88243215 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -99,7 +99,7 @@ function copyCursor(cur) {
 function testVim(name, run, opts, expectedFail) {
   var vimOpts = {
     lineNumbers: true,
-    keyMap: 'vim',
+    vimMode: true,
     showCursorWhenSelecting: true,
     value: code
   };
@@ -111,8 +111,7 @@ function testVim(name, run, opts, expectedFail) {
   return test('vim_' + name, function() {
     var place = document.getElementById("testground");
     var cm = CodeMirror(place, vimOpts);
-    CodeMirror.Vim.maybeInitState(cm);
-    var vim = cm.vimState;
+    var vim = CodeMirror.Vim.maybeInitVimState_(cm);
 
     function doKeysFn(cm) {
       return function(args) {
@@ -140,7 +139,7 @@ function testVim(name, run, opts, expectedFail) {
           // Find key in keymap and handle.
           var handled = CodeMirror.lookupKey(key, ['vim-insert'], executeHandler);
           // Record for insert mode.
-          if (handled === true && cm.vimState.insertMode && arguments[i] != 'Esc') {
+          if (handled === true && cm.state.vim.insertMode && arguments[i] != 'Esc') {
             var lastChange = CodeMirror.Vim.getVimGlobalState_().macroModeState.lastInsertModeChanges;
             if (lastChange) {
               lastChange.changes.push(new CodeMirror.Vim.InsertModeKey(key));
@@ -184,7 +183,7 @@ function testVim(name, run, opts, expectedFail) {
         return CodeMirror.Vim.getRegisterController();
       }
     }
-    CodeMirror.Vim.clearVimGlobalState_();
+    CodeMirror.Vim.resetVimGlobalState_();
     var successful = false;
     try {
       run(cm, vim, helpers);
@@ -228,7 +227,7 @@ function testJumplist(name, keys, endPos, startPos, dialog) {
   endPos = makeCursor(endPos[0], endPos[1]);
   startPos = makeCursor(startPos[0], startPos[1]);
   testVim(name, function(cm, vim, helpers) {
-    CodeMirror.Vim.clearVimGlobalState_();
+    CodeMirror.Vim.resetVimGlobalState_();
     if(dialog)cm.openDialog = helpers.fakeOpenDialog('word');
     cm.setCursor(startPos);
     helpers.doKeys.apply(null, keys);
@@ -501,15 +500,13 @@ testVim('dl', function(cm, vim, helpers) {
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
 testVim('dl_eol', function(cm, vim, helpers) {
-  // TODO:  This test is incorrect.  The cursor should end up at (0, 5).
-  var curStart = makeCursor(0, 6);
-  cm.setCursor(curStart);
+  cm.setCursor(0, 6);
   helpers.doKeys('d', 'l');
   eq(' word1', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
   eq(' ', register.text);
   is(!register.linewise);
-  helpers.assertCursorAt(0, 6);
+  helpers.assertCursorAt(0, 5);
 }, { value: ' word1 ' });
 testVim('dl_repeat', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 0);
@@ -594,38 +591,35 @@ testVim('dw_word', function(cm, vim, helpers) {
 testVim('dw_only_word', function(cm, vim, helpers) {
   // Test that if there is only 1 word left, dw deletes till the end of the
   // line.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
+  cm.setCursor(0, 1);
   helpers.doKeys('d', 'w');
   eq(' ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
   eq('word1 ', register.text);
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1 ' });
 testVim('dw_eol', function(cm, vim, helpers) {
   // Assert that dw does not delete the newline if last word to delete is at end
   // of line.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
+  cm.setCursor(0, 1);
   helpers.doKeys('d', 'w');
   eq(' \nword2', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
   eq('word1', register.text);
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1\nword2' });
 testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
   // Assert that dw does not delete the newline if last word to delete is at end
   // of line and it is followed by multiple newlines.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
+  cm.setCursor(0, 1);
   helpers.doKeys('d', 'w');
   eq(' \n\nword2', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
   eq('word1', register.text);
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1\n\nword2' });
 testVim('dw_empty_line_followed_by_whitespace', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -665,14 +659,13 @@ testVim('dw_end_of_document', function(cm, vim, helpers) {
 testVim('dw_repeat', function(cm, vim, helpers) {
   // Assert that dw does delete newline if it should go to the next line, and
   // that repeat works properly.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
+  cm.setCursor(0, 1);
   helpers.doKeys('d', '2', 'w');
   eq(' ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
   eq('word1\nword2', register.text);
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1\nword2' });
 testVim('de_word_start_and_empty_lines', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -1001,14 +994,13 @@ testEdit('daW_end_punct', 'foo \tbAr.', /A/, 'daW', 'foo');
 
 // Operator-motion tests
 testVim('D', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
+  cm.setCursor(0, 3);
   helpers.doKeys('D');
   eq(' wo\nword2\n word3', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
   eq('rd1', register.text);
   is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
+  helpers.assertCursorAt(0, 2);
 }, { value: ' word1\nword2\n word3' });
 testVim('C', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);
@@ -1018,7 +1010,7 @@ testVim('C', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('rd1', register.text);
   is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
+  eqPos(curStart, cm.getCursor());
   eq('vim-insert', cm.getOption('keyMap'));
 }, { value: ' word1\nword2\n word3' });
 testVim('Y', function(cm, vim, helpers) {

From ca6db50f5874b003f5d4daae23391c10dfa7d957 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jul 2013 13:58:49 +0200
Subject: [PATCH 0241/4742] Fix bug in findWordAt

Which could result in a selection at a negative character offset
when double-clicking.

Issue #1638
---
 lib/codemirror.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e4f5e19349..1aa350a2df 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1064,7 +1064,6 @@ window.CodeMirror = (function() {
     }
     function finishRect(rect) {
       rect.bottom = vranges[rect.top+1];
-      if (isNaN(rect.bottom)) debugger;
       rect.top = vranges[rect.top];
     }
 
@@ -2757,7 +2756,7 @@ window.CodeMirror = (function() {
   function findWordAt(line, pos) {
     var start = pos.ch, end = pos.ch;
     if (line) {
-      if (pos.xRel < 0 || end == line.length) --start; else ++end;
+      if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
       var startChar = line.charAt(start);
       var check = isWordChar(startChar) ? isWordChar
         : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}

From e0e2181cf0033ebb0f24c7909b0ce546d8c62edd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jul 2013 14:04:20 +0200
Subject: [PATCH 0242/4742] [real-world uses] Add Fiddle Salad

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 6e76980b4a..2150abe401 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -54,6 +54,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://www.fastfig.com/">Fastfig</a> (online computation/math tool)</li>
       <li><a href="https://metacpan.org/module/Farabi">Farabi</a> (modern Perl IDE)</li>
       <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>
+      <li><a href="http://fiddlesalad.com/">Fiddle Salad</a> (web development environment)</li>
       <li><a href="http://www.firepad.io">Firepad</a> (collaborative text editor)</li>
       <li><a href="http://tour.golang.org">Go language tour</a></li>
       <li><a href="https://github.com/github/android">GitHub's Android app</a></li>

From 836932ff202d860d86fa40c1788e238096394d15 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jul 2013 14:25:35 +0200
Subject: [PATCH 0243/4742] [compression helper] Sort and complete addon
 scripts

---
 doc/compress.html | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 8b7a11d670..c7eec47d5e 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -140,38 +140,43 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/mode/z80/z80.js">z80.js</option>
         </optgroup>
         <optgroup label="Add-ons">
-          <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
+          <option value="http://codemirror.net/addon/selection/active-line.js">active-line.js</option>
+          <option value="http://codemirror.net/addon/fold/brace-fold.js">brace-fold.js</option>
+          <option value="http://codemirror.net/addon/edit/closebrackets.js">closebrackets.js</option>
           <option value="http://codemirror.net/addon/edit/closetag.js">closetag.js</option>
+          <option value="http://codemirror.net/addon/runmode/colorize.js">colorize.js</option>
+          <option value="http://codemirror.net/addon/edit/comment.js">comment.js</option>
           <option value="http://codemirror.net/addon/edit/continuecomment.js">continuecomment.js</option>
           <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>
-          <option value="http://codemirror.net/addon/edit/matchbrackets.js">matchbrackets.js</option>
-          <option value="http://codemirror.net/addon/edit/closebrackets.js">closebrackets.js</option>
+          <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
           <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
-          <option value="http://codemirror.net/addon/fold/xml-fold.js">xml-fold.js</option>
-          <option value="http://codemirror.net/addon/fold/brace-fold.js">brace-fold.js</option>
+          <option value="http://codemirror.net/addon/hint/html-hint.js">html-hint.js</option>
           <option value="http://codemirror.net/addon/fold/indent-fold.js">indent-fold.js</option>
-          <option value="http://codemirror.net/addon/hint/show-hint.js">show-hint.js</option>
           <option value="http://codemirror.net/addon/hint/javascript-hint.js">javascript-hint.js</option>
-          <option value="http://codemirror.net/addon/hint/xml-hint.js">xml-hint.js</option>
-          <option value="http://codemirror.net/addon/hint/html-hint.js">html-hint.js</option>
-          <option value="http://codemirror.net/addon/hint/pig-hint.js">pig-hint.js</option>
-          <option value="http://codemirror.net/addon/hint/python-hint.js">python-hint.js</option>
+          <option value="http://codemirror.net/addon/lint/javascript-lint.js">javascript-lint.js</option>
+          <option value="http://codemirror.net/addon/lint/json-lint.js">json-lint.js</option>
+          <option value="http://codemirror.net/addon/lint/lint.js">lint.js</option>
           <option value="http://codemirror.net/addon/mode/loadmode.js">loadmode.js</option>
-          <option value="http://codemirror.net/addon/mode/overlay.js">overlay.js</option>
+          <option value="http://codemirror.net/addon/selection/mark-selection.js">mark-selection.js</option>
+          <option value="http://codemirror.net/addon/search/match-highlighter.js">match-highlighter.js</option>
+          <option value="http://codemirror.net/addon/edit/matchbrackets.js">matchbrackets.js</option>
+          <option value="http://codemirror.net/addon/edit/matchtags.js">matchtags.js</option>
+          <option value="http://codemirror.net/addon/merge/merge.js">merge.js</option>
           <option value="http://codemirror.net/addon/mode/multiplex.js">multiplex.js</option>
-          <option value="http://codemirror.net/addon/runmode/colorize.js">colorize.js</option>
+          <option value="http://codemirror.net/addon/mode/overlay.js">overlay.js</option>
+          <option value="http://codemirror.net/addon/hint/pig-hint.js">pig-hint.js</option>
+          <option value="http://codemirror.net/addon/display/placeholder.js">placeholder.js</option>
+          <option value="http://codemirror.net/addon/hint/python-hint.js">python-hint.js</option>
           <option value="http://codemirror.net/addon/runmode/runmode.js">runmode.js</option>
-          <option value="http://codemirror.net/addon/runmode/runmode-standalone.js">runmode-standalone.js</option>
           <option value="http://codemirror.net/addon/runmode/runmode.node.js">runmode.node.js</option>
+          <option value="http://codemirror.net/addon/runmode/runmode-standalone.js">runmode-standalone.js</option>
           <option value="http://codemirror.net/addon/search/search.js">search.js</option>
           <option value="http://codemirror.net/addon/search/searchcursor.js">searchcursor.js</option>
-          <option value="http://codemirror.net/addon/search/match-highlighter.js">match-highlighter.js</option>
-          <option value="http://codemirror.net/addon/selection/mark-selection.js">mark-selection.js</option>
-          <option value="http://codemirror.net/addon/selection/active-line.js">active-line.js</option>
-          <option value="http://codemirror.net/addon/lint/lint.js">lint.js</option>
-          <option value="http://codemirror.net/addon/lint/javascript-lint.js">javascript-lint.js</option>
-          <option value="http://codemirror.net/addon/lint/json-lint.js">json-lint.js</option>
-          <option value="http://codemirror.net/addon/merge/merge.js">merge.js</option>
+          <option value="http://codemirror.net/addon/hint/show-hint.js">show-hint.js</option>
+          <option value="http://codemirror.net/addon/edit/trailingspace.js">trailingspace.js</option>
+          <option value="http://codemirror.net/addon/tern/tern.js">tern.js</option>
+          <option value="http://codemirror.net/addon/fold/xml-fold.js">xml-fold.js</option>
+          <option value="http://codemirror.net/addon/hint/xml-hint.js">xml-hint.js</option>
         </optgroup>
         <optgroup label="Keymaps">
           <option value="http://codemirror.net/keymap/emacs.js">emacs.js</option>

From 4d85080d2a031fecf7fe21f5fa3fe8e6376db4ea Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jul 2013 15:32:12 +0200
Subject: [PATCH 0244/4742] [merge addon] Make sure synchronized scrolling
 scrolls other pane to top/bot

---
 addon/merge/merge.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 0e813f3e25..66721e3584 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -93,7 +93,21 @@
     var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
     var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
     var ratio = (midY - off.top) / (off.bot - off.top);
-    other.scrollTo(null, (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top));
+    var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
+
+    var botDist, mix;
+    // Some careful tweaking to make sure no space is left out of view
+    // when scrolling to top or bottom.
+    if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
+      targetPos = targetPos * mix + sInfo.top * (1 - mix);
+    } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
+      var otherInfo = other.getScrollInfo();
+      var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
+      if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
+        targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
+    }
+
+    other.scrollTo(null, targetPos);
     other.state.scrollSetAt = now;
     other.state.scrollSetBy = dv;
     return true;
@@ -208,8 +222,8 @@
     var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
     var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
     iterateChunks(dv.diff, function(topOrig, botOrig, topEdit, botEdit) {
-      if (topEdit >= vpEdit.to || botEdit < vpEdit.from ||
-          topOrig >= vpOrig.to || botOrig < vpOrig.from)
+      if (topEdit > vpEdit.to || botEdit < vpEdit.from ||
+          topOrig > vpOrig.to || botOrig < vpOrig.from)
         return;
       var topLpx = dv.orig.heightAtLine(topOrig, "local") - sTopOrig, top = topLpx;
       if (dv.svg) {

From f3bc32b662b5b04d83e63dab71c523ee5edbe405 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jul 2013 15:33:59 +0200
Subject: [PATCH 0245/4742] [merge addon] Synchronize vertical scrolling

---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 66721e3584..cae9ea7167 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -107,7 +107,7 @@
         targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
     }
 
-    other.scrollTo(null, targetPos);
+    other.scrollTo(sInfo.left, targetPos);
     other.state.scrollSetAt = now;
     other.state.scrollSetBy = dv;
     return true;

From b4cca0242a4570dae04cfa38024f29f196c896e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jul 2013 15:35:51 +0200
Subject: [PATCH 0246/4742] [merge addon] Use CodeMirror-merge-* CSS class
 names

Since the addon is called merge, not diff.
---
 addon/merge/merge.css | 56 +++++++++++++++++++++----------------------
 addon/merge/merge.js  | 44 +++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/addon/merge/merge.css b/addon/merge/merge.css
index 3bd6bbb9a5..63237fc8e9 100644
--- a/addon/merge/merge.css
+++ b/addon/merge/merge.css
@@ -1,30 +1,30 @@
-.CodeMirror-diff {
+.CodeMirror-merge {
   position: relative;
   border: 1px solid #ddd;
   white-space: pre;
 }
 
-.CodeMirror-diff, .CodeMirror-diff .CodeMirror {
+.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
   height: 350px;
 }
 
-.CodeMirror-diff-2pane .CodeMirror-diff-pane { width: 47%; }
-.CodeMirror-diff-2pane .CodeMirror-diff-gap { width: 6%; }
-.CodeMirror-diff-3pane .CodeMirror-diff-pane { width: 31%; }
-.CodeMirror-diff-3pane .CodeMirror-diff-gap { width: 3.5%; }
+.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 47%; }
+.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 6%; }
+.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
+.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
 
-.CodeMirror-diff-pane {
+.CodeMirror-merge-pane {
   display: inline-block;
   white-space: normal;
   vertical-align: top;
 }
-.CodeMirror-diff-pane-rightmost {
+.CodeMirror-merge-pane-rightmost {
   position: absolute;
   right: 0px;
   z-index: 1;
 }
 
-.CodeMirror-diff-gap {
+.CodeMirror-merge-gap {
   z-index: 2;
   display: inline-block;
   height: 100%;
@@ -37,11 +37,11 @@
   background: #f8f8f8;
 }
 
-.CodeMirror-diff-scrolllock-wrap {
+.CodeMirror-merge-scrolllock-wrap {
   position: absolute;
   bottom: 0; left: 50%;
 }
-.CodeMirror-diff-scrolllock {
+.CodeMirror-merge-scrolllock {
   position: relative;
   left: -50%;
   cursor: pointer;
@@ -49,44 +49,44 @@
   line-height: 1;
 }
 
-.CodeMirror-diff-copybuttons-left, .CodeMirror-diff-copybuttons-right {
+.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
   position: absolute;
   left: 0; top: 0;
   right: 0; bottom: 0;
   line-height: 1;
 }
 
-.CodeMirror-diff-copy {
+.CodeMirror-merge-copy {
   position: absolute;
   cursor: pointer;
   color: #44c;
 }
 
-.CodeMirror-diff-copybuttons-left .CodeMirror-diff-copy { left: 2px; }
-.CodeMirror-diff-copybuttons-right .CodeMirror-diff-copy { right: 2px; }
+.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
+.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
 
-.CodeMirror-diff-r-inserted, .CodeMirror-diff-l-inserted {
+.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
   background-position: bottom left;
   background-repeat: repeat-x;
 }
 
-.CodeMirror-diff-r-deleted, .CodeMirror-diff-l-deleted {
+.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
   background-position: bottom left;
   background-repeat: repeat-x;
 }
 
-.CodeMirror-diff-r-chunk { background: #ffffe0; }
-.CodeMirror-diff-r-chunk-start { border-top: 1px solid #ee8; }
-.CodeMirror-diff-r-chunk-end { border-bottom: 1px solid #ee8; }
-.CodeMirror-diff-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
+.CodeMirror-merge-r-chunk { background: #ffffe0; }
+.CodeMirror-merge-r-chunk-start { border-top: 1px solid #ee8; }
+.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #ee8; }
+.CodeMirror-merge-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
 
-.CodeMirror-diff-l-chunk { background: #eef; }
-.CodeMirror-diff-l-chunk-start { border-top: 1px solid #88e; }
-.CodeMirror-diff-l-chunk-end { border-bottom: 1px solid #88e; }
-.CodeMirror-diff-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
+.CodeMirror-merge-l-chunk { background: #eef; }
+.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
+.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
+.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
 
-.CodeMirror-diff-l-chunk.CodeMirror-diff-r-chunk { background: #dfd; }
-.CodeMirror-diff-l-chunk-start.CodeMirror-diff-r-chunk-start { border-top: 1px solid #4e4; }
-.CodeMirror-diff-l-chunk-end.CodeMirror-diff-r-chunk-end { border-bottom: 1px solid #4e4; }
+.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
+.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
+.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index cae9ea7167..16c3356c20 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -8,18 +8,18 @@
     this.mv = mv;
     this.type = type;
     this.classes = type == "left"
-      ? {chunk: "CodeMirror-diff-l-chunk",
-         start: "CodeMirror-diff-l-chunk-start",
-         end: "CodeMirror-diff-l-chunk-end",
-         insert: "CodeMirror-diff-l-inserted",
-         del: "CodeMirror-diff-l-deleted",
-         connect: "CodeMirror-diff-l-connect"}
-      : {chunk: "CodeMirror-diff-r-chunk",
-         start: "CodeMirror-diff-r-chunk-start",
-         end: "CodeMirror-diff-r-chunk-end",
-         insert: "CodeMirror-diff-r-inserted",
-         del: "CodeMirror-diff-r-deleted",
-         connect: "CodeMirror-diff-r-connect"};
+      ? {chunk: "CodeMirror-merge-l-chunk",
+         start: "CodeMirror-merge-l-chunk-start",
+         end: "CodeMirror-merge-l-chunk-end",
+         insert: "CodeMirror-merge-l-inserted",
+         del: "CodeMirror-merge-l-deleted",
+         connect: "CodeMirror-merge-l-connect"}
+      : {chunk: "CodeMirror-merge-r-chunk",
+         start: "CodeMirror-merge-r-chunk-start",
+         end: "CodeMirror-merge-r-chunk-end",
+         insert: "CodeMirror-merge-r-inserted",
+         del: "CodeMirror-merge-r-deleted",
+         connect: "CodeMirror-merge-r-connect"};
   }
 
   DiffView.prototype = {
@@ -239,7 +239,7 @@
               "class", dv.classes.connect);
       }
       var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
-                                                "CodeMirror-diff-copy"));
+                                                "CodeMirror-merge-copy"));
       copy.title = "Revert chunk";
       copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
       copy.style.top = top + "px";
@@ -264,25 +264,25 @@
 
     if (hasLeft) {
       left = this.left = new DiffView(this, "left");
-      var leftPane = elt("div", null, "CodeMirror-diff-pane");
+      var leftPane = elt("div", null, "CodeMirror-merge-pane");
       wrap.push(leftPane);
       wrap.push(buildGap(left));
     }
 
-    var editPane = elt("div", null, "CodeMirror-diff-pane");
+    var editPane = elt("div", null, "CodeMirror-merge-pane");
     wrap.push(editPane);
 
     if (hasRight) {
       right = this.right = new DiffView(this, "right");
       wrap.push(buildGap(right));
-      var rightPane = elt("div", null, "CodeMirror-diff-pane");
+      var rightPane = elt("div", null, "CodeMirror-merge-pane");
       wrap.push(rightPane);
     }
 
-    (hasRight ? rightPane : editPane).className += " CodeMirror-diff-pane-rightmost";
+    (hasRight ? rightPane : editPane).className += " CodeMirror-merge-pane-rightmost";
 
     wrap.push(elt("div", null, null, "height: 0; clear: both;"));
-    var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-diff CodeMirror-diff-" + panes + "pane"));
+    var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
     this.edit = CodeMirror(editPane, copyObj(options));
 
     if (left) left.init(leftPane, origLeft, options);
@@ -300,11 +300,11 @@
   };
 
   function buildGap(dv) {
-    var lock = dv.lockButton = elt("div", null, "CodeMirror-diff-scrolllock");
+    var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
     lock.title = "Toggle locked scrolling";
-    var lockWrap = elt("div", [lock], "CodeMirror-diff-scrolllock-wrap");
+    var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
     CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
-    dv.copyButtons = elt("div", null, "CodeMirror-diff-copybuttons-" + dv.type);
+    dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
     CodeMirror.on(dv.copyButtons, "click", function(e) {
       var node = e.target || e.srcElement;
       if (node.chunk) copyChunk(dv, node.chunk);
@@ -315,7 +315,7 @@
     dv.svg = svg;
     if (svg) gapElts.push(svg);
 
-    return dv.gap = elt("div", gapElts, "CodeMirror-diff-gap");
+    return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
   }
 
   MergeView.prototype = {

From bc85bdb354799ab2e1c8dd4a1dd2600db826e42c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jul 2013 08:48:19 +0200
Subject: [PATCH 0247/4742] [matchtags addon] Only highlight matching tag, try
 to be more efficient

---
 addon/edit/matchtags.js | 36 ++++++++++++++++++++++++++----------
 addon/fold/xml-fold.js  | 20 +++++++++++---------
 demo/matchtags.html     |  1 +
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index 8cdc8b20c8..66e57c8e9e 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -2,25 +2,41 @@
   "use strict";
 
   CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init)
+    if (old && old != CodeMirror.Init) {
       cm.off("cursorActivity", doMatchTags);
-    if (val)
+      cm.off("viewportChange", maybeUpdateMatch);
+      clear(cm);
+    }
+    if (val) {
       cm.on("cursorActivity", doMatchTags);
+      cm.on("viewportChange", maybeUpdateMatch);
+      doMatchTags(cm);
+    }
   });
 
+  function clear(cm) {
+    if (cm.state.matchedTag) {
+      cm.state.matchedTag.clear();
+      cm.state.matchedTag = null;
+    }
+  }
+
   function doMatchTags(cm) {
     cm.operation(function() {
-      if (cm.state.matchedTags) { cm.state.matchedTags(); cm.state.matchedTags = null; }
-
-      var cur = cm.getCursor();
-      var match = CodeMirror.findMatchingTag(cm, cur) || CodeMirror.findEnclosingTag(cm, cur);
-      if (!match) return;
-      var one = cm.markText(match.open.from, match.open.to, {className: "CodeMirror-matchingbracket"});
-      var two = cm.markText(match.close.from, match.close.to, {className: "CodeMirror-matchingbracket"});
-      cm.state.matchedTags = function() { one.clear(); two.clear(); };
+      clear(cm);
+      var cur = cm.getCursor(), range = cm.getViewport();
+      range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
+      var match = CodeMirror.findMatchingTag(cm, cur, range);
+      if (cm.state.failedTagMatch = !match) return;
+      var other = match.at == "close" ? match.open : match.close;
+      cm.state.matchedTag = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
     });
   }
 
+  function maybeUpdateMatch(cm) {
+    if (cm.state.failedTagMatch) doMatchTags(cm);
+  }
+
   CodeMirror.commands.toMatchingTag = function(cm) {
     var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
     if (found) {
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 572feaa244..bf8ca9c2ac 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -8,9 +8,11 @@
   var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
   var xmlTagStart = new RegExp("<(/?)([" + nameStartChar + "][" + nameChar + "]*)", "g");
 
-  function Iter(cm, line, ch) {
+  function Iter(cm, line, ch, range) {
     this.line = line; this.ch = ch;
     this.cm = cm; this.text = cm.getLine(line);
+    this.min = range ? range.from : cm.firstLine();
+    this.max = range ? range.to - 1 : cm.lastLine();
   }
 
   function tagAt(iter, ch) {
@@ -19,13 +21,13 @@
   }
 
   function nextLine(iter) {
-    if (iter.line >= iter.cm.lastLine()) return;
+    if (iter.line >= iter.max) return;
     iter.ch = 0;
     iter.text = iter.cm.getLine(++iter.line);
     return true;
   }
   function prevLine(iter) {
-    if (iter.line <= iter.cm.firstLine()) return;
+    if (iter.line <= iter.min) return;
     iter.text = iter.cm.getLine(--iter.line);
     iter.ch = iter.text.length;
     return true;
@@ -135,8 +137,8 @@
     }
   };
 
-  CodeMirror.findMatchingTag = function(cm, pos) {
-    var iter = new Iter(cm, pos.line, pos.ch);
+  CodeMirror.findMatchingTag = function(cm, pos, range) {
+    var iter = new Iter(cm, pos.line, pos.ch, range);
     var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
     var start = end && toTagStart(iter);
     if (!end || end == "selfClose" || !start || cmp(iter, pos) > 0) return;
@@ -146,18 +148,18 @@
       var open = findMatchingOpen(iter, start[2]);
       return open && {open: open, close: here, at: "close"};
     } else { // opening tag
-      iter = new Iter(cm, to.line, to.ch);
+      iter = new Iter(cm, to.line, to.ch, range);
       var close = findMatchingClose(iter, start[2]);
       return close && {open: here, close: close, at: "open"};
     }
   };
 
-  CodeMirror.findEnclosingTag = function(cm, pos) {
-    var iter = new Iter(cm, pos.line, pos.ch);
+  CodeMirror.findEnclosingTag = function(cm, pos, range) {
+    var iter = new Iter(cm, pos.line, pos.ch, range);
     for (;;) {
       var open = findMatchingOpen(iter);
       if (!open) break;
-      var forward = new Iter(cm, pos.line, pos.ch);
+      var forward = new Iter(cm, pos.line, pos.ch, range);
       var close = findMatchingClose(forward, open.tag);
       if (close) return {open: open, close: close};
     }
diff --git a/demo/matchtags.html b/demo/matchtags.html
index 053c0ed667..8f4217debe 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -12,6 +12,7 @@
 
     <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+      .CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
     </style>
   </head>
   <body>

From c969e83279331d1535096fb8925816630667760a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jul 2013 09:43:27 +0200
Subject: [PATCH 0248/4742] Stabilize scroll position when removing widgets

(When they are above visible range, scroll up to correspond for
height reduction.)

Closes #1645
---
 lib/codemirror.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1aa350a2df..c702260103 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4057,7 +4057,9 @@ window.CodeMirror = (function() {
     if (no == null || !ws) return;
     for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
     if (!ws.length) this.line.widgets = null;
+    var aboveVisible = heightAtLine(this.cm, this.line) < this.cm.doc.scrollTop;
     updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));
+    if (aboveVisible) addToScrollPos(this.cm, 0, -this.height);
     regChange(this.cm, no, no + 1);
   });
   LineWidget.prototype.changed = widgetOperation(function() {
@@ -4086,7 +4088,7 @@ window.CodeMirror = (function() {
       else widgets.splice(Math.max(widgets.length - 1, widget.insertAt), 0, widget);
       widget.line = line;
       if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {
-        var aboveVisible = heightAtLine(cm, line) < cm.display.scroller.scrollTop;
+        var aboveVisible = heightAtLine(cm, line) < cm.doc.scrollTop;
         updateLineHeight(line, line.height + widgetHeight(widget));
         if (aboveVisible) addToScrollPos(cm, 0, widget.height);
       }

From a7dba9653f39b100879b82b6e6e5d6d542474488 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jul 2013 10:21:33 +0200
Subject: [PATCH 0249/4742] Fix problem in widget-preserving line redraws

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c702260103..4721f67e2f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -668,10 +668,10 @@ window.CodeMirror = (function() {
         if (!/\bCodeMirror-linewidget\b/.test(n.className)) {
           reuse.removeChild(n);
         } else {
-          for (var i = 0, first = true; i < line.widgets.length; ++i) {
+          for (var i = 0; i < line.widgets.length; ++i) {
             var widget = line.widgets[i];
-            if (!widget.above) { insertBefore = n; first = false; }
             if (widget.node == n.firstChild) {
+              if (!widget.above && !insertBefore) insertBefore = n;
               positionLineWidget(widget, n, reuse, dims);
               ++widgetsSeen;
               break;

From ac14de0d671c0219c4c10c28ed2f63aa9b4e3993 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jul 2013 10:41:28 +0200
Subject: [PATCH 0250/4742] Fix bug in character measurement

Issue #1617
---
 lib/codemirror.js | 5 +++--
 test/test.js      | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4721f67e2f..180594f198 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -964,8 +964,9 @@ window.CodeMirror = (function() {
       if (r) break;
       if (dir < 0 && pos == 0) dir = 1;
     }
-    if ((pos > ch || bias == "left") && r.leftSide) r = r.leftSide;
-    else if ((pos < ch || bias == "right") && r.rightSide) r = r.rightSide;
+    bias = pos > ch ? "left" : pos < ch ? "right" : bias;
+    if (bias == "left" && r.leftSide) r = r.leftSide;
+    else if (bias == "right" && r.rightSide) r = r.rightSide;
     return {left: pos < ch ? r.right : r.left,
             right: pos > ch ? r.left : r.right,
             top: r.top,
diff --git a/test/test.js b/test/test.js
index cc4b57a4b6..641818484d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -501,7 +501,8 @@ testCM("bookmarkInsertLeft", function(cm) {
 
 testCM("bookmarkCursor", function(cm) {
   var pos01 = cm.cursorCoords(Pos(0, 1)), pos11 = cm.cursorCoords(Pos(1, 1)),
-      pos20 = cm.cursorCoords(Pos(2, 0)), pos30 = cm.cursorCoords(Pos(3, 0));
+      pos20 = cm.cursorCoords(Pos(2, 0)), pos30 = cm.cursorCoords(Pos(3, 0)),
+      pos41 = cm.cursorCoords(Pos(4, 1));
   cm.setBookmark(Pos(0, 1), {widget: document.createTextNode("←"), insertLeft: true});
   cm.setBookmark(Pos(2, 0), {widget: document.createTextNode("←"), insertLeft: true});
   cm.setBookmark(Pos(1, 1), {widget: document.createTextNode("→")});
@@ -512,7 +513,9 @@ testCM("bookmarkCursor", function(cm) {
   is(new11.left > pos11.left && new11.top == pos11.top, "at right, middle of line");
   is(new20.left == pos20.left && new20.top == pos20.top, "at left, empty line");
   is(new30.left > pos30.left && new30.top == pos30.top, "at right, empty line");
-}, {value: "foo\nbar\n\n\nx"});
+  cm.setBookmark(Pos(4, 0), {widget: document.createTextNode("→")});
+  is(cm.cursorCoords(Pos(4, 1)).left > pos41.left, "single-char bug");
+}, {value: "foo\nbar\n\n\nx\ny"});
 
 testCM("getAllMarks", function(cm) {
   addDoc(cm, 10, 10);

From ba3a62bde5305d4e02ec8555564aa25cb5743862 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jul 2013 11:37:13 +0200
Subject: [PATCH 0251/4742] [anyword-hint addon] Add

---
 addon/hint/anyword-hint.js | 34 +++++++++++++++++++
 demo/anywordhint.html      | 69 ++++++++++++++++++++++++++++++++++++++
 doc/manual.html            |  9 +++++
 3 files changed, 112 insertions(+)
 create mode 100644 addon/hint/anyword-hint.js
 create mode 100644 demo/anywordhint.html

diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
new file mode 100644
index 0000000000..b3b2c1e1c0
--- /dev/null
+++ b/addon/hint/anyword-hint.js
@@ -0,0 +1,34 @@
+(function() {
+  "use strict";
+
+  var WORD = /[\w$]+/, RANGE = 500;
+
+  CodeMirror.anyWordHint = function(editor, options) {
+    var word = options && options.word || WORD;
+    var range = options && options.range || RANGE;
+    var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
+    var start = cur.ch, end = start;
+    while (end < curLine.length && word.test(curLine.charAt(end))) ++end;
+    while (start && word.test(curLine.charAt(start - 1))) --start;
+    var curWord = start != end && curLine.slice(start, end);
+
+    var list = [], seen = {};
+    function scan(dir) {
+      var line = cur.line, end = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
+      for (; line != end; line += dir) {
+        var text = editor.getLine(line), m;
+        var re = new RegExp(word.source, "g");
+        while (m = re.exec(text)) {
+          if (line == cur.line && m[0] === curWord) continue;
+          if ((!curWord || m[0].indexOf(curWord) == 0) && !seen.hasOwnProperty(m[0])) {
+            seen[m[0]] = true;
+            list.push(m[0]);
+          }
+        }
+      }
+    }
+    scan(-1);
+    scan(1);
+    return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
+  };
+})();
diff --git a/demo/anywordhint.html b/demo/anywordhint.html
new file mode 100644
index 0000000000..820df39e90
--- /dev/null
+++ b/demo/anywordhint.html
@@ -0,0 +1,69 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: Any Word Completion Demo</title>
+    <link rel="stylesheet" href="../lib/codemirror.css">
+    <script src="../lib/codemirror.js"></script>
+    <script src="../addon/hint/show-hint.js"></script>
+    <link rel="stylesheet" href="../addon/hint/show-hint.css">
+    <script src="../addon/hint/anyword-hint.js"></script>
+    <script src="../mode/javascript/javascript.js"></script>
+    <link rel="stylesheet" href="../doc/docs.css">
+  </head>
+  <body>
+    <h1>CodeMirror: Any Word Completion Demo</h1>
+
+    <form><textarea id="code" name="code">
+(function() {
+  "use strict";
+
+  var WORD = /[\w$]+/g, RANGE = 500;
+
+  CodeMirror.anyWordHint = function(editor, options) {
+    var word = options && options.word || WORD;
+    var range = options && options.range || RANGE;
+    var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
+    var start = cur.ch, end = start;
+    while (end < curLine.length && word.test(curLine.charAt(end))) ++end;
+    while (start && word.test(curLine.charAt(start - 1))) --start;
+    var curWord = start != end && curLine.slice(start, end);
+
+    var list = [], seen = {};
+    function scan(dir) {
+      var line = cur.line, end = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
+      for (; line != end; line += dir) {
+        var text = editor.getLine(line), m;
+        word.lastIndex = 0;
+        while (m = word.exec(text)) {
+          if ((!curWord || m[0].indexOf(curWord) == 0) && !seen.hasOwnProperty(m[0])) {
+            seen[m[0]] = true;
+            list.push(m[0]);
+          }
+        }
+      }
+    }
+    scan(-1);
+    scan(1);
+    return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
+  };
+})();
+</textarea></form>
+
+<p>Press <strong>ctrl-space</strong> to activate autocompletion. The
+completion uses
+the <a href="../doc/manual.html#addon_anyword-hint">anyword-hint.js</a>
+module, which simply looks at nearby words in the buffer and completes
+to those.</p>
+
+    <script>
+      CodeMirror.commands.autocomplete = function(cm) {
+        CodeMirror.showHint(cm, CodeMirror.anyWordHint);
+      }
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        extraKeys: {"Ctrl-Space": "autocomplete"}
+      });
+    </script>
+  </body>
+</html>
diff --git a/doc/manual.html b/doc/manual.html
index 4284535f3f..74b2aab783 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1915,6 +1915,15 @@ <h2 id="addons">Add-ons</h2>
       <dd>A very simple hinting function for Python code.
       Defines <code>CodeMirror.pythonHint</code>.</dd>
 
+      <dt id="addon_anyword-hint"><a href="../addon/hint/anyword-hint.js"><code>hint/anyword-hint.js</code></a></dt>
+      <dd>A very simple hinting function
+      (<code>CodeMirror.anyWordHint</code>) that simply looks for
+      words in the nearby code and completes to those. Takes two
+      optional options, <code>word</code>, a regular expression that
+      matches words (sequences of one or more character),
+      and <code>range</code>, which defines how many lines the addon
+      should scan when completing (defaults to 500).</dd>
+
       <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>match-highlighter.js</code></a></dt>
       <dd>Adds a <code>highlightSelectionMatches</code> option that
       can be enabled to highlight all instances of a currently

From 022bc2862faa29970193fa10f8bbb3f469600e26 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jul 2013 13:45:22 +0200
Subject: [PATCH 0252/4742] Add registerHelper/getHelper mechanism

Move hinting functions into it.
---
 addon/hint/anyword-hint.js    |  4 +--
 addon/hint/html-hint.js       |  8 +++--
 addon/hint/javascript-hint.js | 10 +++++--
 addon/hint/pig-hint.js        |  6 ++--
 addon/hint/python-hint.js     |  6 ++--
 addon/hint/show-hint.js       |  2 ++
 addon/hint/xml-hint.js        |  7 +++--
 demo/anywordhint.html         |  6 ++--
 demo/complete.html            |  2 +-
 demo/html5complete.html       |  2 +-
 demo/xmlcomplete.html         |  4 +--
 doc/manual.html               | 55 ++++++++++++++++++++++++++---------
 lib/codemirror.js             | 18 +++++++++++-
 mode/xml/xml.js               |  3 +-
 14 files changed, 96 insertions(+), 37 deletions(-)

diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index b3b2c1e1c0..36ff618e09 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -3,7 +3,7 @@
 
   var WORD = /[\w$]+/, RANGE = 500;
 
-  CodeMirror.anyWordHint = function(editor, options) {
+  CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
     var word = options && options.word || WORD;
     var range = options && options.range || RANGE;
     var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
@@ -30,5 +30,5 @@
     scan(-1);
     scan(1);
     return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
-  };
+  });
 })();
diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index 23238df054..cf256851ef 100755
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -327,9 +327,11 @@
     populate(data[tag]);
 
   CodeMirror.htmlSchema = data;
-  CodeMirror.htmlHint = function(cm, options) {
+  function htmlHint(cm, options) {
     var local = {schemaInfo: data};
     if (options) for (var opt in options) local[opt] = options[opt];
-    return CodeMirror.xmlHint(cm, local);
-  };
+    return CodeMirror.hint.xml(cm, local);
+  }
+  CodeMirror.htmlHint = htmlHint; // deprecated
+  CodeMirror.registerHelper("hint", "html", htmlHint);
 })();
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index b961c5abe9..042fe1325d 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -56,11 +56,13 @@
             to: Pos(cur.line, token.end)};
   }
 
-  CodeMirror.javascriptHint = function(editor, options) {
+  function javascriptHint(editor, options) {
     return scriptHint(editor, javascriptKeywords,
                       function (e, cur) {return e.getTokenAt(cur);},
                       options);
   };
+  CodeMirror.javascriptHint = javascriptHint; // deprecated
+  CodeMirror.registerHelper("hint", "javascript", javascriptHint);
 
   function getCoffeeScriptToken(editor, cur) {
   // This getToken, it is for coffeescript, imitates the behavior of
@@ -80,9 +82,11 @@
     return token;
   }
 
-  CodeMirror.coffeescriptHint = function(editor, options) {
+  function coffeescriptHint(editor, options) {
     return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
-  };
+  }
+  CodeMirror.coffeescriptHint = coffeescriptHint; // deprecated
+  CodeMirror.registerHelper("hint", "coffeescript", coffeescriptHint);
 
   var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
                      "toUpperCase toLowerCase split concat match replace search").split(" ");
diff --git a/addon/hint/pig-hint.js b/addon/hint/pig-hint.js
index d831ccfe93..155973f22d 100644
--- a/addon/hint/pig-hint.js
+++ b/addon/hint/pig-hint.js
@@ -41,9 +41,11 @@
             to: CodeMirror.Pos(cur.line, token.end)};
   }
 
-  CodeMirror.pigHint = function(editor) {
+  function pigHint(editor) {
     return scriptHint(editor, pigKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
-  };
+  }
+  CodeMirror.pigHint = pigHint; // deprecated
+  CodeMirror.registerHelper("hint", "pig", hinter);
 
   var pigKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP "
   + "JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL "
diff --git a/addon/hint/python-hint.js b/addon/hint/python-hint.js
index 60221b89ec..98d2a5897f 100644
--- a/addon/hint/python-hint.js
+++ b/addon/hint/python-hint.js
@@ -41,9 +41,11 @@
             to: CodeMirror.Pos(cur.line, token.end)};
   }
 
-  CodeMirror.pythonHint = function(editor) {
+  function pythonHint(editor) {
     return scriptHint(editor, pythonKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
-  };
+  }
+  CodeMirror.pythonHint = pythonHint; // deprecated
+  CodeMirror.registerHelper("hint", "python", pythonHint);
 
   var pythonKeywords = "and del from not while as elif global or with assert else if pass yield"
 + "break except import print class exec in raise continue finally is return def for lambda try";
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 35e5cbb721..5a34f552f7 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -4,6 +4,8 @@
   CodeMirror.showHint = function(cm, getHints, options) {
     // We want a single cursor position.
     if (cm.somethingSelected()) return;
+    if (getHints == null) getHints = cm.getHelper(cm.getCursor(), "hint");
+    if (getHints == null) return;
 
     if (cm.state.completionActive) cm.state.completionActive.close();
 
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index ea5b8d546a..b6c1da2ce2 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -3,7 +3,7 @@
 
   var Pos = CodeMirror.Pos;
 
-  CodeMirror.xmlHint = function(cm, options) {
+  function getHints(cm, options) {
     var tags = options && options.schemaInfo;
     var quote = (options && options.quoteChar) || '"';
     if (!tags) return;
@@ -61,5 +61,8 @@
       from: replaceToken ? Pos(cur.line, token.start) : cur,
       to: replaceToken ? Pos(cur.line, token.end) : cur
     };
-  };
+  }
+
+  CodeMirror.xmlHint = getHints; // deprecated
+  CodeMirror.registerHelper("hint", "xml", getHints);
 })();
diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index 820df39e90..5bb0a62a10 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -20,7 +20,7 @@ <h1>CodeMirror: Any Word Completion Demo</h1>
 
   var WORD = /[\w$]+/g, RANGE = 500;
 
-  CodeMirror.anyWordHint = function(editor, options) {
+  CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
     var word = options && options.word || WORD;
     var range = options && options.range || RANGE;
     var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
@@ -46,7 +46,7 @@ <h1>CodeMirror: Any Word Completion Demo</h1>
     scan(-1);
     scan(1);
     return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
-  };
+  });
 })();
 </textarea></form>
 
@@ -58,7 +58,7 @@ <h1>CodeMirror: Any Word Completion Demo</h1>
 
     <script>
       CodeMirror.commands.autocomplete = function(cm) {
-        CodeMirror.showHint(cm, CodeMirror.anyWordHint);
+        CodeMirror.showHint(cm, CodeMirror.hint.anyword);
       }
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
diff --git a/demo/complete.html b/demo/complete.html
index 02ce658880..1a65f6e0d9 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -59,7 +59,7 @@ <h1>CodeMirror: Autocomplete demo</h1>
 
     <script>
       CodeMirror.commands.autocomplete = function(cm) {
-        CodeMirror.showHint(cm, CodeMirror.javascriptHint);
+        CodeMirror.showHint(cm, CodeMirror.hint.javascript);
       }
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 5b2dd0de1d..9ea918228d 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -30,7 +30,7 @@ <h1>HTML completion demo</h1>
 
     <script type="text/javascript">
       CodeMirror.commands.autocomplete = function(cm) {
-          CodeMirror.showHint(cm, CodeMirror.htmlHint);
+          CodeMirror.showHint(cm, CodeMirror.hint.html);
       }
       window.onload = function() {
         editor = CodeMirror(document.getElementById("code"), {
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index fdf335b2e7..007893b966 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -67,7 +67,7 @@ <h1>CodeMirror: XML Autocomplete demo</h1>
         var cur = cm.getCursor();
         if (!pred || pred()) setTimeout(function() {
           if (!cm.state.completionActive)
-            CodeMirror.showHint(cm, CodeMirror.xmlHint, {schemaInfo: tags, completeSingle: false});
+            CodeMirror.showHint(cm, CodeMirror.hint.xml, {schemaInfo: tags, completeSingle: false});
         }, 100);
         return CodeMirror.Pass;
       }
@@ -97,7 +97,7 @@ <h1>CodeMirror: XML Autocomplete demo</h1>
           "' '": completeIfInTag,
           "'='": completeIfInTag,
           "Ctrl-Space": function(cm) {
-            CodeMirror.showHint(cm, CodeMirror.xmlHint, {schemaInfo: tags});
+            CodeMirror.showHint(cm, CodeMirror.hint.xml, {schemaInfo: tags});
           }
         }
       });
diff --git a/doc/manual.html b/doc/manual.html
index 74b2aab783..c4e2ece461 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -742,7 +742,7 @@ <h2 id="api">Programming API</h2>
 
     <p>A lot of CodeMirror features are only available through its
     API. Thus, you need to write code (or
-    use <a href="#addons">add-ons</a>) if you want to expose them to
+    use <a href="#addons">addons</a>) if you want to expose them to
     your users.</p>
 
     <p>Whenever points in the document are represented, the API uses
@@ -949,7 +949,7 @@ <h3 id="api_configuration">Configuration methods</h3>
 
       <dt id="addKeyMap"><code><strong>cm.addKeyMap</strong>(map: object, bottom: boolean)</code></dt>
       <dd>Attach an additional <a href="#keymaps">keymap</a> to the
-      editor. This is mostly useful for add-ons that need to register
+      editor. This is mostly useful for addons that need to register
       some key handlers without trampling on
       the <a href="#option_extraKeys"><code>extraKeys</code></a>
       option. Maps added in this way have a higher precedence than
@@ -969,7 +969,7 @@ <h3 id="api_configuration">Configuration methods</h3>
       <dt id="addOverlay"><code><strong>cm.addOverlay</strong>(mode: string|object, ?options: object)</code></dt>
       <dd>Enable a highlighting overlay. This is a stateless mini-mode
       that can be used to add extra highlighting. For example,
-      the <a href="../demo/search.html">search add-on</a> uses it to
+      the <a href="../demo/search.html">search addon</a> uses it to
       highlight the term that's currently being
       searched. <code>mode</code> can be a <a href="#option_mode">mode
       spec</a> or a mode object (an object with
@@ -1432,6 +1432,19 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
       unstyled tokens, and a string, potentially containing multiple
       space-separated style names, otherwise.</dd>
 
+      <dt id="getHelperAt"><code><strong>cm.getHelperAt</strong>(pos: {line, ch}, type: string) → helper</code></dt>
+      <dd>Fetch appropriate helper for the given position. Helpers
+      provide a way to look up functionality appropriate for a mode.
+      The <code>type</code> argument provides the helper namespace
+      (see
+      also <a href="#registerHelper"><code>registerHelper</code></a>),
+      in which the value will be looked up. The key that is used
+      depends on the <a href="#getMode">mode</a> active at the given
+      position. If the mode object contains a property with the same
+      name as the <code>type</code> argument, that is tried first.
+      Next, the mode's <code>helperType</code>, if any, is tried. And
+      finally, the mode's name.</dd>
+
       <dt id="getStateAfter"><code><strong>cm.getStateAfter</strong>(?line: integer, ?precise: boolean) → object</code></dt>
       <dd>Returns the mode's parser state, if any, at the end of the
       given line number. If no line number is given, the state at the
@@ -1571,6 +1584,17 @@ <h3 id="api_static">Static properties</h3>
       (with the instance as argument) whenever a new CodeMirror instance
       is initialized.</dd>
 
+      <dt id="registerHelper"><code><strong>CodeMirror.registerHelper</strong>(type: string, name: string, value: helper)</dt>
+      <dd>Registers a helper value with the given <code>name</code> in
+      the given namespace (<code>type</code>). This is used to define
+      functionality that may be looked up by mode. Will create (if it
+      doesn't already exist) a property on the <code>CodeMirror</code>
+      object for the given <code>type</code>, pointing to an object
+      that maps names to values. I.e. after
+      doing <code>CodeMirror.registerHelper("hint", "foo",
+      myFoo)</code>, the value <code>CodeMirror.hint.foo</code> will
+      point to <code>myFoo</code>.</dd>
+
       <dt id="Pos"><code><strong>CodeMirror.Pos</strong>(line: integer, ?ch: integer)</code></dt>
       <dd>A constructor for the <code>{line, ch}</code> objects that
       are used to represent positions in editor documents.</dd>
@@ -1584,7 +1608,7 @@ <h3 id="api_static">Static properties</h3>
       range, <em>after</em> the change is applied.</dd>
     </dl>
 
-    <h2 id="addons">Add-ons</h2>
+    <h2 id="addons">Addons</h2>
 
     <p>The <code>addon</code> directory in the distribution contains a
     number of reusable components that implement extra editor
@@ -1806,8 +1830,11 @@ <h2 id="addons">Add-ons</h2>
       a <code>{list, from, to}</code> object, where <code>list</code>
       is an array of strings or objects (the completions),
       and <code>from</code> and <code>to</code> give the start and end
-      of the token that is being completed. When completions aren't
-      simple strings, they should be objects with the folowing
+      of the token that is being completed. If no hinting function is
+      given, the addon will try to
+      use <a href="#getHelper"><code>getHelper</code></a> with
+      the <code>"hint"</code> type to find one. When completions
+      aren't simple strings, they should be objects with the folowing
       properties:
       <dl>
         <dt><code><strong>text</strong>: string</code></dt>
@@ -1877,13 +1904,13 @@ <h2 id="addons">Add-ons</h2>
 
       <dt id="addon_javascript-hint"><a href="../addon/hint/javascript-hint.js"><code>hint/javascript-hint.js</code></a></dt>
       <dd>Defines a simple hinting function for JavaScript
-      (<code>CodeMirror.javascriptHint</code>) and CoffeeScript
-      (<code>CodeMirror.coffeescriptHint</code>) code. This will
+      (<code>CodeMirror.hint.javascript</code>) and CoffeeScript
+      (<code>CodeMirror.hint.coffeescript</code>) code. This will
       simply use the JavaScript environment that the editor runs in as
       a source of information about objects and their properties.</dd>
 
       <dt id="addon_xml-hint"><a href="../addon/hint/xml-hint.js"><code>hint/xml-hint.js</code></a></dt>
-      <dd>Defines <code>CodeMirror.xmlHint</code>, which produces
+      <dd>Defines <code>CodeMirror.hint.xml</code>, which produces
       hints for XML tagnames, attribute names, and attribute values,
       guided by a <code>schemaInfo</code> option (a property of the
       second argument passed to the hinting function, or the third
@@ -1906,18 +1933,18 @@ <h2 id="addons">Add-ons</h2>
       documents. Defines a schema
       object <code>CodeMirror.htmlSchema</code> that you can pass to
       as a <code>schemaInfo</code> option, and
-      a <code>CodeMirror.htmlHint</code> hinting function that
-      automatically calls <code>CodeMirror.xmlHint</code> with this
+      a <code>CodeMirror.hint.html</code> hinting function that
+      automatically calls <code>CodeMirror.hint.xml</code> with this
       schema data. See
       the <a href="../demo/html5complete.html">demo</a>.</dd>
 
       <dt id="addon_python-hint"><a href="../addon/hint/python-hint.js"><code>hint/python-hint.js</code></a></dt>
       <dd>A very simple hinting function for Python code.
-      Defines <code>CodeMirror.pythonHint</code>.</dd>
+      Defines <code>CodeMirror.hint.python</code>.</dd>
 
       <dt id="addon_anyword-hint"><a href="../addon/hint/anyword-hint.js"><code>hint/anyword-hint.js</code></a></dt>
       <dd>A very simple hinting function
-      (<code>CodeMirror.anyWordHint</code>) that simply looks for
+      (<code>CodeMirror.hint.anyword</code>) that simply looks for
       words in the nearby code and completes to those. Takes two
       optional options, <code>word</code>, a regular expression that
       matches words (sequences of one or more character),
@@ -2265,7 +2292,7 @@ <h2>Contents</h2>
           <li><a href="#api_static">Static properties</a></li>
         </ul>
       </li>
-      <li><a href="#addons">Add-ons</a></li>
+      <li><a href="#addons">Addons</a></li>
       <li><a href="#modeapi">Writing CodeMirror Modes</a></li>
     </ul>
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 180594f198..a43abb9724 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2870,6 +2870,15 @@ window.CodeMirror = (function() {
       }
     },
 
+    getHelper: function(pos, type) {
+      if (!helpers.hasOwnProperty(type)) return;
+      var state = this.getTokenAt(pos).state, help = helpers[type];
+      var mode = CodeMirror.innerMode(this.getMode(), state).mode;
+      return mode.type && help[mode[type]] ||
+        mode.helperType && help[mode.helperType] ||
+        help[mode.name];
+    },
+
     getStateAfter: function(line, precise) {
       var doc = this.doc;
       line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
@@ -3258,7 +3267,7 @@ window.CodeMirror = (function() {
   };
 
   CodeMirror.getMode = function(options, spec) {
-    spec = CodeMirror.resolveMode(spec);
+    var spec = CodeMirror.resolveMode(spec);
     var mfactory = modes[spec.name];
     if (!mfactory) return CodeMirror.getMode(options, "text/plain");
     var modeObj = mfactory(options, spec);
@@ -3271,6 +3280,7 @@ window.CodeMirror = (function() {
       }
     }
     modeObj.name = spec.name;
+
     return modeObj;
   };
 
@@ -3298,6 +3308,12 @@ window.CodeMirror = (function() {
   var initHooks = [];
   CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
 
+  var helpers = CodeMirror.helpers = {};
+  CodeMirror.registerHelper = function(type, name, value) {
+    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {};
+    helpers[type][name] = value;
+  };
+
   // MODE STATE HANDLING
 
   // Utility functions for working with state. Exported because modes
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index ae71c64130..07db299039 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -316,7 +316,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     blockCommentStart: "<!--",
     blockCommentEnd: "-->",
 
-    configuration: parserConfig.htmlMode ? "html" : "xml"
+    configuration: parserConfig.htmlMode ? "html" : "xml",
+    helperType: parserConfig.htmlMode ? "html" : "xml"
   };
 });
 

From b629ba4a98dda6670c7504cfd3defc85dbd9a2ee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jul 2013 14:08:28 +0200
Subject: [PATCH 0253/4742] [fold addon] Move to registerHelper

---
 addon/fold/brace-fold.js          | 15 +++++++++------
 addon/fold/foldcode.js            |  3 ++-
 addon/fold/indent-fold.js         |  5 +++--
 addon/fold/xml-fold.js            |  5 +++--
 demo/folding.html                 | 16 +++++++---------
 doc/manual.html                   | 28 ++++++++++++++++------------
 lib/codemirror.js                 |  2 +-
 mode/clike/clike.js               |  3 ++-
 mode/coffeescript/coffeescript.js |  3 ++-
 mode/css/css.js                   |  3 ++-
 mode/groovy/groovy.js             |  3 ++-
 mode/javascript/javascript.js     |  1 +
 mode/python/python.js             |  3 ++-
 mode/rust/rust.js                 |  3 ++-
 14 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index e35115b8b9..0b4d7dc34d 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -1,4 +1,4 @@
-CodeMirror.braceRangeFinder = function(cm, start) {
+CodeMirror.registerHelper("fold", "brace", function(cm, start) {
   var line = start.line, lineText = cm.getLine(line);
   var startCh, tokenType;
 
@@ -44,9 +44,10 @@ CodeMirror.braceRangeFinder = function(cm, start) {
   if (end == null || line == end && endCh == startCh) return;
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
-};
+});
+CodeMirror.braceRangeFinder = CodeMirror.fold.brace; // deprecated
 
-CodeMirror.importRangeFinder = function(cm, start) {
+CodeMirror.registerHelper("fold", "import", function(cm, start) {
   function hasImport(line) {
     if (line < cm.firstLine() || line > cm.lastLine()) return null;
     var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
@@ -68,9 +69,10 @@ CodeMirror.importRangeFinder = function(cm, start) {
     end = next.end;
   }
   return {from: cm.clipPos(CodeMirror.Pos(start, has.startCh + 1)), to: end};
-};
+});
+CodeMirror.importRangeFinder = CodeMirror.fold["import"]; // deprecated
 
-CodeMirror.includeRangeFinder = function(cm, start) {
+CodeMirror.registerHelper("fold", "include", function(cm, start) {
   function hasInclude(line) {
     if (line < cm.firstLine() || line > cm.lastLine()) return null;
     var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
@@ -87,4 +89,5 @@ CodeMirror.includeRangeFinder = function(cm, start) {
   }
   return {from: CodeMirror.Pos(start, has + 1),
           to: cm.clipPos(CodeMirror.Pos(end))};
-};
+});
+CodeMirror.includeRangeFinder = CodeMirror.fold.include; // deprecated
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 2743d3e2c9..d83a0f49dc 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -2,7 +2,8 @@
   "use strict";
 
   function doFold(cm, pos, options) {
-    var finder = options.call ? options : (options && options.rangeFinder);
+    var finder = options && (options.call ? options : options.rangeFinder);
+    if (!finder) finder = cm.getHelper(pos, "fold");
     if (!finder) return;
     if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
     var minSize = options && options.minFoldSize || 0;
diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 94a0a1ffae..fcbff96696 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,4 +1,4 @@
-CodeMirror.indentRangeFinder = function(cm, start) {
+CodeMirror.registerHelper("fold", "indent", function(cm, start) {
   var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
   var myIndent = CodeMirror.countColumn(firstLine, null, tabSize);
   for (var i = start.line + 1, end = cm.lineCount(); i < end; ++i) {
@@ -8,4 +8,5 @@ CodeMirror.indentRangeFinder = function(cm, start) {
       return {from: CodeMirror.Pos(start.line, firstLine.length),
               to: CodeMirror.Pos(i, curLine.length)};
   }
-};
+});
+CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index bf8ca9c2ac..08a87bd0a0 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -124,7 +124,7 @@
     }
   }
 
-  CodeMirror.tagRangeFinder = function(cm, start) {
+  CodeMirror.registerHelper("fold", "xml", function(cm, start) {
     var iter = new Iter(cm, start.line, 0);
     for (;;) {
       var openTag = toNextTag(iter), end;
@@ -135,7 +135,8 @@
         return close && {from: start, to: close.from};
       }
     }
-  };
+  });
+  CodeMirror.tagRangeFinder = CodeMirror.fold.xml; // deprecated
 
   CodeMirror.findMatchingTag = function(cm, pos, range) {
     var iter = new Iter(cm, pos.line, pos.ch, range);
diff --git a/demo/folding.html b/demo/folding.html
index ffda97c1c9..d9823cf377 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -43,26 +43,24 @@ <h1>CodeMirror: Code Folding Demo</h1>
   var te_html = document.getElementById("code-html");
   te_html.value = "<html>\n  " + document.documentElement.innerHTML + "\n</html>";
 
-  function foldJS(cm, where) { cm.foldCode(where, CodeMirror.braceRangeFinder); }
   window.editor = CodeMirror.fromTextArea(te, {
     mode: "javascript",
     lineNumbers: true,
     lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){foldJS(cm, cm.getCursor());}}
+    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }}
   });
-  editor.on("gutterClick", foldJS);
-  foldJS(editor, 9);
+  editor.on("gutterClick", function(cm, n) { cm.foldCode(CodeMirror.Pos(n, 0)); });
+  editor.foldCode(CodeMirror.Pos(8, 0));
 
-  function foldHTML(cm, where) { cm.foldCode(where, CodeMirror.tagRangeFinder); }
   window.editor_html = CodeMirror.fromTextArea(te_html, {
     mode: "text/html",
     lineNumbers: true,
     lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){foldHTML(cm, cm.getCursor());}}
+    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }}
   });
-  editor_html.on("gutterClick", foldHTML);
-  foldHTML(editor_html, 13);
-  foldHTML(editor_html, 1);
+  editor_html.on("gutterClick", function(cm, n) { cm.foldCode(CodeMirror.Pos(n, 0)); });
+  editor_html.foldCode(CodeMirror.Pos(13, 0));
+  editor_html.foldCode(CodeMirror.Pos(1, 0));
 };
 </script>
   </body>
diff --git a/doc/manual.html b/doc/manual.html
index c4e2ece461..c7466ce243 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1745,24 +1745,28 @@ <h2 id="addons">Addons</h2>
       fails, line-comments it.</dd>
 
       <dt id="addon_foldcode"><a href="../addon/fold/foldcode.js"><code>fold/foldcode.js</code></a></dt>
-      <dd>Helps with code folding. Add a <code>foldCode</code> method
+      <dd>Helps with code folding. Adds a <code>foldCode</code> method
       to editor instances, which will try to do a code fold starting
       at the given line, or unfold the fold that is already present.
       The method takes as first argument the position that should be
       folded (may be a line number or
-      a <a href="#Pos"><code>Pos</code></a>), and as second argument
-      either a range-finder function, or an options object, supporting
-      the following properties:
+      a <a href="#Pos"><code>Pos</code></a>), and as second optional
+      argument either a range-finder function, or an options object,
+      supporting the following properties:
       <dl>
         <dt><code><strong>rangeFinder</strong>: fn(CodeMirror, Pos)</code></dt>
-        <dd>The function that is used to find foldable ranges. There
-        are files in the <a href="../addon/fold/"><code>addon/fold/</code></a>
-        directory providing <code>CodeMirror.braceRangeFinder</code>,
-        which finds blocks in brace languages (JavaScript, C, Java,
-        etc), <code>CodeMirror.indentRangeFinder</code>, for languages
-        where indentation determines block structure (Python,
-        Haskell), and <code>CodeMirror.tagRangeFinder</code>, for
-        XML-style languages.</dd>
+        <dd>The function that is used to find foldable ranges. If this
+        is not directly passed, it will
+        call <a href="#getHelper"><code>getHelper</code></a> with
+        a <code>"fold"</code> type to find one that's appropriate for
+        the mode. There are files in
+        the <a href="../addon/fold/"><code>addon/fold/</code></a>
+        directory providing <code>CodeMirror.fold.brace</code>, which
+        finds blocks in brace languages (JavaScript, C, Java,
+        etc), <code>CodeMirror.fold.indent</code>, for languages where
+        indentation determines block structure (Python, Haskell),
+        and <code>CodeMirror.fold.xml</code>, for XML-style
+        languages.</dd>
         <dt><code><strong>widget</strong>: string|Element</code></dt>
         <dd>The widget to show for folded ranges. Can be either a
         string, in which case it'll become a span with
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a43abb9724..659f8c96bc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2874,7 +2874,7 @@ window.CodeMirror = (function() {
       if (!helpers.hasOwnProperty(type)) return;
       var state = this.getTokenAt(pos).state, help = helpers[type];
       var mode = CodeMirror.innerMode(this.getMode(), state).mode;
-      return mode.type && help[mode[type]] ||
+      return mode[type] && help[mode[type]] ||
         mode.helperType && help[mode.helperType] ||
         help[mode.name];
     },
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 3fcc1a757b..f6626cd0ea 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -158,7 +158,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     electricChars: "{}",
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
-    lineComment: "//"
+    lineComment: "//",
+    fold: "brace"
   };
 });
 
diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 509d9207bb..4f54b0c690 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -339,7 +339,8 @@ CodeMirror.defineMode('coffeescript', function(conf) {
             return state.scopes[0].offset;
         },
 
-        lineComment: "#"
+        lineComment: "#",
+        fold: "indent"
     };
     return external;
 });
diff --git a/mode/css/css.js b/mode/css/css.js
index b38a968e5e..b52e787a70 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -289,7 +289,8 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
 
     electricChars: "}",
     blockCommentStart: "/*",
-    blockCommentEnd: "*/"
+    blockCommentEnd: "*/",
+    fold: "brace"
   };
 });
 
diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 92b948192e..6800e0aaf5 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -203,7 +203,8 @@ CodeMirror.defineMode("groovy", function(config) {
       else return ctx.indented + (closing ? 0 : config.indentUnit);
     },
 
-    electricChars: "{}"
+    electricChars: "{}",
+    fold: "brace"
   };
 });
 
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 6435e138d6..f8c710f912 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -461,6 +461,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     blockCommentStart: jsonMode ? null : "/*",
     blockCommentEnd: jsonMode ? null : "*/",
     lineComment: jsonMode ? null : "//",
+    fold: "brace",
 
     jsonMode: jsonMode
   };
diff --git a/mode/python/python.js b/mode/python/python.js
index b623972b88..565d963fdf 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -333,7 +333,8 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             return state.scopes[0].offset;
         },
 
-        lineComment: "#"
+        lineComment: "#",
+        fold: "indent"
     };
     return external;
 });
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index 7bee489b47..c7530b6cc6 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -428,7 +428,8 @@ CodeMirror.defineMode("rust", function() {
     electricChars: "{}",
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
-    lineComment: "//"
+    lineComment: "//",
+    fold: "brace"
   };
 });
 

From e0e28c5dc02b54922f8853c1560d1d1fe74b9ef1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jul 2013 14:26:22 +0200
Subject: [PATCH 0254/4742] [lint addon] Move over to registerHelper

---
 addon/lint/coffeescript-lint.js |  5 +++--
 addon/lint/javascript-lint.js   |  9 +++------
 addon/lint/json-lint.js         |  5 +++--
 addon/lint/lint.js              | 18 ++++++++++++------
 demo/lint.html                  |  6 +++---
 doc/manual.html                 | 13 ++++++++-----
 mode/javascript/javascript.js   |  1 +
 7 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
index 9c30de51c2..75f8db6565 100644
--- a/addon/lint/coffeescript-lint.js
+++ b/addon/lint/coffeescript-lint.js
@@ -1,6 +1,6 @@
 // Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
 
-CodeMirror.coffeeValidator = function(text) {
+CodeMirror.registerHelper("lint", "coffeescript", function(text) {
   var found = [];
   var parseError = function(err) {
     var loc = err.lineNumber;
@@ -21,4 +21,5 @@ CodeMirror.coffeeValidator = function(text) {
                 message: e.message});
   }
   return found;
-};
+});
+CodeMirror.coffeeValidator = CodeMirror.lint.coffeescript; // deprecated
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index 9a815c824e..d7a6f6af28 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -9,18 +9,15 @@
                  "Unmatched ", " and instead saw", " is not defined",
                  "Unclosed string", "Stopping, unable to continue" ];
 
-  function validator(options, text) {
+  function validator(text, options) {
     JSHINT(text, options);
     var errors = JSHINT.data().errors, result = [];
     if (errors) parseErrors(errors, result);
     return result;
   }
 
-  CodeMirror.javascriptValidatorWithOptions = function(options) {
-    return function(text) { return validator(options, text); };
-  };
-
-  CodeMirror.javascriptValidator = CodeMirror.javascriptValidatorWithOptions(null);
+  CodeMirror.registerHelper("lint", "javascript", validator);
+  CodeMirror.javascriptValidator = CodeMirror.lint.javascript; // deprecated
 
   function cleanup(error) {
     // All problems are warnings by default
diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index 42b36abb39..1dfc6b8fdc 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -1,6 +1,6 @@
 // Depends on jsonlint.js from https://github.com/zaach/jsonlint
 
-CodeMirror.jsonValidator = function(text) {
+CodeMirror.registerHelper("lint", "json", function(text) {
   var found = [];
   jsonlint.parseError = function(str, hash) {
     var loc = hash.loc;
@@ -11,4 +11,5 @@ CodeMirror.jsonValidator = function(text) {
   try { jsonlint.parse(text); }
   catch(e) {}
   return found;
-};
+});
+CodeMirror.jsonValidator = CodeMirror.lint.json; // deprecated
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 2e7cea1925..67a92970a3 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -1,4 +1,5 @@
-CodeMirror.validate = (function() {
+(function() {
+  "use strict";
   var GUTTER_ID = "CodeMirror-lint-markers";
   var SEVERITIES = /^(?:error|warning)$/;
 
@@ -52,9 +53,11 @@ CodeMirror.validate = (function() {
     this.onMouseOver = function(e) { onMouseOver(cm, e); };
   }
 
-  function parseOptions(options) {
+  function parseOptions(cm, options) {
     if (options instanceof Function) return {getAnnotations: options};
-    else if (!options || !options.getAnnotations) throw new Error("Required option 'getAnnotations' missing (lint addon)");
+    if (!options || options === true) options = {};
+    if (!options.getAnnotations) options.getAnnotations = cm.getHelper(CodeMirror.Pos(0, 0), "lint");
+    if (!options.getAnnotations) throw new Error("Required option 'getAnnotations' missing (lint addon)");
     return options;
   }
 
@@ -175,7 +178,7 @@ CodeMirror.validate = (function() {
     }
   }
 
-  CodeMirror.defineOption("lintWith", false, function(cm, val, old) {
+  function optionHandler(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       clearMarks(cm);
       cm.off("change", onChange);
@@ -186,12 +189,15 @@ CodeMirror.validate = (function() {
     if (val) {
       var gutters = cm.getOption("gutters"), hasLintGutter = false;
       for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
-      var state = cm.state.lint = new LintState(cm, parseOptions(val), hasLintGutter);
+      var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
       cm.on("change", onChange);
       if (state.options.tooltips != false)
         CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
 
       startLinting(cm);
     }
-  });
+  }
+
+  CodeMirror.defineOption("lintWith", false, optionHandler); // deprecated
+  CodeMirror.defineOption("lint", false, optionHandler); // deprecated
 })();
diff --git a/demo/lint.html b/demo/lint.html
index ece8b1cef7..d379c31934 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -7,7 +7,7 @@
     <script src="../lib/codemirror.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
     <script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
-    <script src="https://raw.github.com/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
+    <script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
     <link rel="stylesheet" href="../doc/docs.css">
     <link rel="stylesheet" href="../addon/lint/lint.css">
     <script src="../addon/lint/lint.js"></script>
@@ -75,14 +75,14 @@ <h1>CodeMirror: Linter Demo</h1>
     lineNumbers: true,
     mode: "javascript",
     gutters: ["CodeMirror-lint-markers"],
-    lintWith: CodeMirror.javascriptValidator
+    lint: true
   });
 
   var editor_json = CodeMirror.fromTextArea(document.getElementById("code-json"), {
     lineNumbers: true,
     mode: "application/json",
     gutters: ["CodeMirror-lint-markers"],
-    lintWith: CodeMirror.jsonValidator
+    lint: true
   });
 </script>
 
diff --git a/doc/manual.html b/doc/manual.html
index c7466ce243..d028b9615c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1974,11 +1974,14 @@ <h2 id="addons">Addons</h2>
       with pluggable warning sources
       (see <a href="../addon/lint/json-lint.js"><code>json-lint.js</code></a>
       and <a href="../addon/lint/javascript-lint.js"><code>javascript-lint.js</code></a>
-      in the same directory). Defines a <code>lintWith</code> option
-      that can be set to a warning source (for
-      example <code>CodeMirror.javascriptValidator</code>). Depends
-      on <code>addon/lint/lint.css</code>. A demo can be
-      found <a href="../demo/lint.html">here</a>.</dd>
+      in the same directory). Defines a <code>lint</code> option that
+      can be set to a warning source (for
+      example <code>CodeMirror.lint.javascript</code>), or
+      to <code>true</code>, in which
+      case <a href="#getHelper"><code>getHelper</code></a> with
+      type <code>"lint"</code> is used to determined a validator
+      function. Depends on <code>addon/lint/lint.css</code>. A demo
+      can be found <a href="../demo/lint.html">here</a>.</dd>
 
       <dt id="addon_mark-selection"><a href="../addon/selection/mark-selection.js"><code>selection/mark-selection.js</code></a></dt>
       <dd>Causes the selected text to be marked with the CSS class
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index f8c710f912..f5507ce699 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -463,6 +463,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     lineComment: jsonMode ? null : "//",
     fold: "brace",
 
+    helperType: jsonMode ? "json" : "javascript",
     jsonMode: jsonMode
   };
 });

From 348db87b65b38d0b27f1a796797ee36f2a11195c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jul 2013 14:40:45 +0200
Subject: [PATCH 0255/4742] [manual] Fix missing </code> tag

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

diff --git a/doc/manual.html b/doc/manual.html
index d028b9615c..68be9718f6 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1584,7 +1584,7 @@ <h3 id="api_static">Static properties</h3>
       (with the instance as argument) whenever a new CodeMirror instance
       is initialized.</dd>
 
-      <dt id="registerHelper"><code><strong>CodeMirror.registerHelper</strong>(type: string, name: string, value: helper)</dt>
+      <dt id="registerHelper"><code><strong>CodeMirror.registerHelper</strong>(type: string, name: string, value: helper)</code></dt>
       <dd>Registers a helper value with the given <code>name</code> in
       the given namespace (<code>type</code>). This is used to define
       functionality that may be looked up by mode. Will create (if it

From 9d6f762ebec15dd5e00157c4baf5e3f5e73513dd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Jul 2013 08:32:26 +0200
Subject: [PATCH 0256/4742] [matchtags addon] Fix inefficiency

Issue #1653
---
 addon/edit/matchtags.js | 10 +++++++---
 addon/fold/xml-fold.js  |  6 ++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index 66e57c8e9e..3eabfeb8d3 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -22,14 +22,18 @@
   }
 
   function doMatchTags(cm) {
+    cm.state.failedTagMatch = false;
     cm.operation(function() {
       clear(cm);
       var cur = cm.getCursor(), range = cm.getViewport();
       range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
       var match = CodeMirror.findMatchingTag(cm, cur, range);
-      if (cm.state.failedTagMatch = !match) return;
+      if (!match) return;
       var other = match.at == "close" ? match.open : match.close;
-      cm.state.matchedTag = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
+      if (other)
+        cm.state.matchedTag = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
+      else
+        cm.state.failedTagMatch = true;
     });
   }
 
@@ -41,7 +45,7 @@
     var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
     if (found) {
       var other = found.at == "close" ? found.open : found.close;
-      cm.setSelection(other.to, other.from);
+      if (other) cm.setSelection(other.to, other.from);
     }
   };
 })();
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 08a87bd0a0..5707701aa5 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -146,12 +146,10 @@
     var here = {from: Pos(iter.line, iter.ch), to: to, tag: start[2]};
 
     if (start[1]) { // closing tag
-      var open = findMatchingOpen(iter, start[2]);
-      return open && {open: open, close: here, at: "close"};
+      return {open: findMatchingOpen(iter, start[2]), close: here, at: "close"};
     } else { // opening tag
       iter = new Iter(cm, to.line, to.ch, range);
-      var close = findMatchingClose(iter, start[2]);
-      return close && {open: here, close: close, at: "open"};
+      return {open: here, close: findMatchingClose(iter, start[2]), at: "open"};
     }
   };
 

From 5e706977b5f67d250c12f17ba71cbd1784783b29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Jul 2013 10:58:31 +0200
Subject: [PATCH 0257/4742] [foldgutter addon] Add

---
 addon/fold/foldcode.js   |   3 +
 addon/fold/foldgutter.js | 122 +++++++++++++++++++++++++++++++++++++++
 demo/folding.html        |  30 ++++++++--
 doc/manual.html          |  33 ++++++++++-
 4 files changed, 181 insertions(+), 7 deletions(-)
 create mode 100644 addon/fold/foldgutter.js

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index d83a0f49dc..99b4c79cf5 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -16,7 +16,9 @@
         if (marks[i].__isFold) {
           if (!allowFolded) return null;
           range.cleared = true;
+          var found = marks[i].find();
           marks[i].clear();
+          CodeMirror.signal(cm, "unfold", cm, found.from, found.to);
         }
       }
       return range;
@@ -36,6 +38,7 @@
       clearOnEnter: true,
       __isFold: true
     });
+    CodeMirror.signal(cm, "fold", cm, range.from, range.to);
   }
 
   function makeWidget(options) {
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
new file mode 100644
index 0000000000..b809c93f56
--- /dev/null
+++ b/addon/fold/foldgutter.js
@@ -0,0 +1,122 @@
+(function() {
+  "use strict";
+
+  CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.clearGutter(cm.state.foldGutter.options.gutter);
+      cm.state.foldGutter = null;
+      cm.off("gutterClick", onGutterClick);
+      cm.off("change", onChange);
+      cm.off("viewportChange", onViewportChange);
+      cm.off("fold", onFold);
+      cm.off("unfold", onFold);
+    }
+    if (val) {
+      cm.state.foldGutter = new State(parseOptions(val));
+      updateInViewport(cm);
+      cm.on("gutterClick", onGutterClick);
+      cm.on("change", onChange);
+      cm.on("viewportChange", onViewportChange);
+      cm.on("fold", onFold);
+      cm.on("unfold", onFold);
+    }
+  });
+
+  var Pos = CodeMirror.Pos;
+
+  function State(options) {
+    this.options = options;
+    this.from = this.to = 0;
+  }
+
+  function parseOptions(opts) {
+    if (opts === true) opts = {};
+    if (opts.gutter == null) opts.gutter = "CodeMirror-foldgutter";
+    if (opts.indicatorOpen == null) opts.indicatorOpen = "CodeMirror-foldgutter-open";
+    if (opts.indicatorFolded == null) opts.indicatorFolded = "CodeMirror-foldgutter-folded";
+    return opts;
+  }
+
+  function isFolded(cm, line) {
+    var marks = cm.findMarksAt(Pos(line));
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold && marks[i].find().from.line == line) return true;
+  }
+
+  function marker(spec) {
+    if (typeof spec == "string") {
+      var elt = document.createElement("div");
+      elt.className = spec;
+      return elt;
+    } else {
+      return spec.cloneNode(true);
+    }
+  }
+
+  function updateFoldInfo(cm, from, to) {
+    var opts = cm.state.foldGutter.options, cur = from;
+    cm.eachLine(from, to, function(line) {
+      var mark = null;
+      if (isFolded(cm, cur)) {
+        mark = marker(opts.indicatorFolded);
+      } else {
+        var pos = Pos(cur, 0), func = opts.rangeFinder || cm.getHelper(pos, "fold");
+        var range = func && func(cm, pos);
+        if (range && range.from.line + 1 < range.to.line)
+          mark = marker(opts.indicatorOpen);
+      }
+      cm.setGutterMarker(line, opts.gutter, mark);
+      ++cur;
+    });
+  }
+
+  function updateInViewport(cm) {
+    var vp = cm.getViewport(), state = cm.state.foldGutter;
+    if (!state) return;
+    cm.operation(function() {
+      updateFoldInfo(cm, vp.from, vp.to);
+    });
+    state.from = vp.from; state.to = vp.to;
+  }
+
+  function onGutterClick(cm, line, gutter) {
+    var opts = cm.state.foldGutter.options;
+    if (gutter != opts.gutter) return;
+    cm.foldCode(Pos(line, 0), opts.rangeFinder);
+  }
+
+  function onChange(cm) {
+    var state = cm.state.foldGutter;
+    state.from = state.to = 0;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, 600);
+  }
+
+  function onViewportChange(cm) {
+    var state = cm.state.foldGutter;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() {
+      var vp = cm.getViewport();
+      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
+        updateInViewport(cm);
+      } else {
+        cm.operation(function() {
+          if (vp.from < state.from) {
+            updateFoldInfo(cm, vp.from, state.from);
+            state.from = vp.from;
+          }
+          if (vp.to > state.to) {
+            updateFoldInfo(cm, state.to, vp.to);
+            state.to = vp.to;
+          }
+        });
+      }
+    }, 400);
+  }
+
+  function onFold(cm, from) {
+    var state = cm.state.foldGutter, line = from.line;
+    if (line >= state.from && line < state.to)
+      updateFoldInfo(cm, line, line + 1);
+  }
+})();
diff --git a/demo/folding.html b/demo/folding.html
index d9823cf377..e6cecf26d0 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="../lib/codemirror.css">
     <script src="../lib/codemirror.js"></script>
     <script src="../addon/fold/foldcode.js"></script>
+    <script src="../addon/fold/foldgutter.js"></script>
     <script src="../addon/fold/brace-fold.js"></script>
     <script src="../addon/fold/xml-fold.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
@@ -21,14 +22,29 @@
         line-height: .3;
         cursor: pointer;
       }
+      .CodeMirror-foldgutter {
+        width: .7em;
+      }
+      .CodeMirror-foldgutter-open,
+      .CodeMirror-foldgutter-folded {
+        color: #555;
+        cursor: pointer;
+      }
+      .CodeMirror-foldgutter-open:after {
+        content: "\25BE";
+      }
+      .CodeMirror-foldgutter-folded:after {
+        content: "\25B8";
+      }
     </style>
   </head>
   <body>
     <h1>CodeMirror: Code Folding Demo</h1>
 
     <p>Demonstration of code folding using the code
-    in <a href="../addon/fold/foldcode.js"><code>foldcode.js</code></a>.
-    Press ctrl-q or click on the gutter to fold a block, again
+    in <a href="../doc/manual.html#addon_foldcode"><code>foldcode.js</code></a>
+    and <a href="../doc/manual.html#addon_foldgutter"><code>foldgutter.js</code></a>.
+    Press ctrl-q or click on the gutter markers to fold a block, again
     to unfold.</p>
     <form>
       <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
@@ -47,18 +63,20 @@ <h1>CodeMirror: Code Folding Demo</h1>
     mode: "javascript",
     lineNumbers: true,
     lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }}
+    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
+    foldGutter: true,
+    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   });
-  editor.on("gutterClick", function(cm, n) { cm.foldCode(CodeMirror.Pos(n, 0)); });
   editor.foldCode(CodeMirror.Pos(8, 0));
 
   window.editor_html = CodeMirror.fromTextArea(te_html, {
     mode: "text/html",
     lineNumbers: true,
     lineWrapping: true,
-    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }}
+    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
+    foldGutter: true,
+    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   });
-  editor_html.on("gutterClick", function(cm, n) { cm.foldCode(CodeMirror.Pos(n, 0)); });
   editor_html.foldCode(CodeMirror.Pos(13, 0));
   editor_html.foldCode(CodeMirror.Pos(1, 0));
 };
diff --git a/doc/manual.html b/doc/manual.html
index 68be9718f6..12e2af7359 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1432,7 +1432,7 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
       unstyled tokens, and a string, potentially containing multiple
       space-separated style names, otherwise.</dd>
 
-      <dt id="getHelperAt"><code><strong>cm.getHelperAt</strong>(pos: {line, ch}, type: string) → helper</code></dt>
+      <dt id="getHelper"><code><strong>cm.getHelper</strong>(pos: {line, ch}, type: string) → helper</code></dt>
       <dd>Fetch appropriate helper for the given position. Helpers
       provide a way to look up functionality appropriate for a mode.
       The <code>type</code> argument provides the helper namespace
@@ -1783,6 +1783,37 @@ <h2 id="addons">Addons</h2>
       See <a href="../demo/folding.html">the demo</a> for an
       example.</dd>
 
+      <dt id="addon_foldgutter"><a href="../addon/fold/foldgutter.js"><code>fold/foldgutter.js</code></a></dt>
+      <dd>Provides an option <code>foldGutter</code>, which can be
+      used to create a gutter with markers indicating the blocks that
+      can be folded. Create a gutter using
+      the <a href="#option_gutters"><code>gutters</code></a> option,
+      giving it the class <code>CodeMirror-foldgutter</code> or
+      something else if you configure the addon to use a different
+      class, and this addon will show markers next to folded and
+      foldable blocks, and handle clicks in this gutter. The option
+      can be either set to <code>true</code>, or an object containing
+      the following optional option fields:
+      <dl>
+        <dt><code><strong>gutter</strong>: string</code></dt>
+        <dd>The CSS class of the gutter. Defaults
+        to <code>"CodeMirror-foldgutter"</code>. You will have to
+        style this yourself to give it a width (and possibly a
+        background).</dd>
+        <dt><code><strong>indicatorOpen</strong>: string | Element</code></dt>
+        <dd>A CSS class or DOM element to be used as the marker for
+        open, foldable blocks. Defaults
+        to <code>"CodeMirror-foldgutter-open"</code>.</dd>
+        <dt><code><strong>indicatorFolded</strong>: string | Element</code></dt>
+        <dd>A CSS class or DOM element to be used as the marker for
+        folded blocks. Defaults to <code>"CodeMirror-foldgutter-folded"</code>.</dd>
+        <dt><code><strong>rangeFinder</strong>: fn(CodeMirror, Pos)</code></dt>
+        <dd>The range-finder function to use when determining whether
+        something can be folded. When not
+        given, <a href="#getHelper"><code>getHelper</code></a> will be
+        used to determine a default.</dd>
+      </dl></dd>
+
       <dt id="addon_runmode"><a href="../addon/runmode/runmode.js"><code>runmode/runmode.js</code></a></dt>
       <dd>Can be used to run a CodeMirror mode over text without
       actually opening an editor instance.

From 7499eace15c819055b9693daf375d9dcf4512aee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Jul 2013 11:00:56 +0200
Subject: [PATCH 0258/4742] Rename combineRangeFinders to
 CodeMirror.fold.combine

---
 addon/fold/foldcode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 99b4c79cf5..51a7f5fd0e 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -60,7 +60,7 @@
   // New-style interface
   CodeMirror.defineExtension("foldCode", function(pos, options) { doFold(this, pos, options); });
 
-  CodeMirror.combineRangeFinders = function() {
+  CodeMirror.fold.combine = function() {
     var funcs = Array.prototype.slice.call(arguments, 0);
     return function(cm, start) {
       for (var i = 0; i < funcs.length; ++i) {

From d9a839fbe29a4ad186f1175458480f3557295587 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Jul 2013 11:21:51 +0200
Subject: [PATCH 0259/4742] [match-highlighter addon] Improve showToken option

---
 addon/search/match-highlighter.js | 20 +++++++++++---------
 demo/matchhighlighter.html        |  2 +-
 doc/manual.html                   | 13 ++++++++-----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 212167580a..3df6985984 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -55,11 +55,13 @@
         cm.removeOverlay(state.overlay);
         state.overlay = null;
       }
-
       if (!cm.somethingSelected() && state.showToken) {
-        var tok = cm.getTokenAt(cm.getCursor()).string;
-        if (/\w/.test(tok))
-          cm.addOverlay(state.overlay = makeOverlay(tok, true, state.style));
+        var re = state.showToken === true ? /[\w$]/ : state.showToken;
+        var cur = cm.getCursor(), line = cm.getLine(cur.line), start = cur.ch, end = start;
+        while (start && re.test(line.charAt(start - 1))) --start;
+        while (end < line.length && re.test(line.charAt(end))) ++end;
+        if (start < end)
+          cm.addOverlay(state.overlay = makeOverlay(line.slice(start, end), re, state.style));
         return;
       }
       if (cm.getCursor("head").line != cm.getCursor("anchor").line) return;
@@ -69,15 +71,15 @@
     });
   }
 
-  function boundariesAround(stream) {
-    return (stream.start || /.\b./.test(stream.string.slice(stream.start - 1, stream.start + 1))) &&
-      (stream.pos == stream.string.length || /.\b./.test(stream.string.slice(stream.pos - 1, stream.pos + 1)));
+  function boundariesAround(stream, re) {
+    return (!stream.start || !re.test(stream.string.charAt(stream.start - 1))) &&
+      (stream.pos == stream.string.length || !re.test(stream.string.charAt(stream.pos)));
   }
 
-  function makeOverlay(query, wordBoundaries, style) {
+  function makeOverlay(query, hasBoundary, style) {
     return {token: function(stream) {
       if (stream.match(query) &&
-          (!wordBoundaries || boundariesAround(stream)))
+          (!hasBoundary || boundariesAround(stream, hasBoundary)))
         return style;
       stream.next();
       stream.skipTo(query.charAt(0)) || stream.skipToEnd();
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index c574fbae81..9d2fdd098a 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -28,7 +28,7 @@ <h1>CodeMirror: Match Highlighter Demo</h1>
     <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   lineNumbers: true,
-  highlightSelectionMatches: true
+  highlightSelectionMatches: {showToken: /\w/}
 });
 </script>
 
diff --git a/doc/manual.html b/doc/manual.html
index 12e2af7359..5b08097a90 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1812,7 +1812,8 @@ <h2 id="addons">Addons</h2>
         something can be folded. When not
         given, <a href="#getHelper"><code>getHelper</code></a> will be
         used to determine a default.</dd>
-      </dl></dd>
+      </dl>
+      Demo <a href="../demo/folding.html">here</a>.</dd>
 
       <dt id="addon_runmode"><a href="../addon/runmode/runmode.js"><code>runmode/runmode.js</code></a></dt>
       <dd>Can be used to run a CodeMirror mode over text without
@@ -1994,10 +1995,12 @@ <h2 id="addons">Addons</h2>
       minimum amount of selected characters that triggers a highlight
       (default 2), <code>style</code>, for the style to be used to
       highlight the matches (default <code>"matchhighlight"</code>,
-      which will correspond to CSS class <code>cm-matchhighlight</code>),
-      and <code>showToken</code> which, when enabled, causes the
-      current token to be highlighted when nothing is selected
-      (defaults to off).
+      which will correspond to CSS
+      class <code>cm-matchhighlight</code>),
+      and <code>showToken</code> which can be set to <code>true</code>
+      or to a regexp matching the characters that make up a word. When
+      enabled, it causes the current word to be highlighted when
+      nothing is selected (defaults to off).
       Demo <a href="../demo/matchhighlighter.html">here</a>.</dd>
 
       <dt id="addon_lint"><a href="../addon/lint/lint.js"><code>lint/lint.js</code></a></dt>

From b2b6b54b6e4617acc46a36cb1d924712c03f5237 Mon Sep 17 00:00:00 2001
From: Aurelian Oancea <oancea@gmail.com>
Date: Thu, 4 Jul 2013 16:09:28 +0200
Subject: [PATCH 0260/4742] [midnight theme] fixed syntax error

---
 theme/midnight.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/midnight.css b/theme/midnight.css
index f10edf932a..bc2d49be1c 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -2,7 +2,7 @@
 
 /*<!--match-->*/
 .cm-s-midnight span.CodeMirror-matchhighlight { background: #494949 }
-.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67; !important }
+.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
 
 /*<!--activeline-->*/
 .cm-s-midnight .activeline {background: #253540 !important;}

From 8b8b7b061e441f8409b080ade327cacbc732272c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 5 Jul 2013 08:43:04 +0200
Subject: [PATCH 0261/4742] [xml-fold addon] Add fast-case return to
 findMatchingTag

---
 addon/fold/xml-fold.js | 1 +
 lib/codemirror.js      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 5707701aa5..b87da9088c 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -140,6 +140,7 @@
 
   CodeMirror.findMatchingTag = function(cm, pos, range) {
     var iter = new Iter(cm, pos.line, pos.ch, range);
+    if (!tagAt(iter, iter.ch)) return;
     var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
     var start = end && toTagStart(iter);
     if (!end || end == "selfClose" || !start || cmp(iter, pos) > 0) return;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 659f8c96bc..96e579e753 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2862,6 +2862,7 @@ window.CodeMirror = (function() {
       pos = clipPos(this.doc, pos);
       var styles = getLineStyles(this, getLine(this.doc, pos.line));
       var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
+      if (ch == 0) return styles[2];
       for (;;) {
         var mid = (before + after) >> 1;
         if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;

From 4f43c8ce8780c531b6a1772e1e3eb34dcbfe037f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 5 Jul 2013 16:11:26 +0200
Subject: [PATCH 0262/4742] Add getModeAt method

Use it to prevent some unneeded state computation.
---
 addon/comment/comment.js |  6 +++---
 addon/fold/foldcode.js   |  4 ++--
 doc/manual.html          | 10 ++++++++--
 lib/codemirror.js        |  9 +++++++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 3c76744654..cd2123e175 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -17,7 +17,7 @@
 
   CodeMirror.defineExtension("lineComment", function(from, to, options) {
     if (!options) options = noOptions;
-    var self = this, mode = CodeMirror.innerMode(self.getMode(), self.getTokenAt(from).state).mode;
+    var self = this, mode = self.getModeAt(from);
     var commentString = options.lineComment || mode.lineComment;
     if (!commentString) {
       if (options.blockCommentStart || mode.blockCommentStart) {
@@ -52,7 +52,7 @@
 
   CodeMirror.defineExtension("blockComment", function(from, to, options) {
     if (!options) options = noOptions;
-    var self = this, mode = CodeMirror.innerMode(self.getMode(), self.getTokenAt(from).state).mode;
+    var self = this, mode = self.getModeAt(from);
     var startString = options.blockCommentStart || mode.blockCommentStart;
     var endString = options.blockCommentEnd || mode.blockCommentEnd;
     if (!startString || !endString) {
@@ -85,7 +85,7 @@
 
   CodeMirror.defineExtension("uncomment", function(from, to, options) {
     if (!options) options = noOptions;
-    var self = this, mode = CodeMirror.innerMode(self.getMode(), self.getTokenAt(from).state).mode;
+    var self = this, mode = self.getModeAt(from);
     var end = Math.min(to.line, self.lastLine()), start = Math.min(from.line, end);
 
     // Try finding line comments
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 51a7f5fd0e..69513cb8bb 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -60,7 +60,7 @@
   // New-style interface
   CodeMirror.defineExtension("foldCode", function(pos, options) { doFold(this, pos, options); });
 
-  CodeMirror.fold.combine = function() {
+  CodeMirror.registerHelper("fold", "combine", function() {
     var funcs = Array.prototype.slice.call(arguments, 0);
     return function(cm, start) {
       for (var i = 0; i < funcs.length; ++i) {
@@ -68,5 +68,5 @@
         if (found) return found;
       }
     };
-  };
+  });
 })();
diff --git a/doc/manual.html b/doc/manual.html
index 5b08097a90..64c684b10b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1401,11 +1401,17 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
 
     <dl>
       <dt id="getMode"><code><strong>doc.getMode</strong>() → object</code></dt>
-      <dd>Gets the mode object for the editor. Note that this is
-      distinct from <code>getOption("mode")</code>, which gives you
+      <dd>Gets the (outer) mode object for the editor. Note that this
+      is distinct from <code>getOption("mode")</code>, which gives you
       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>
+      <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
+      (such as <code>htmlmixed</code>).</dd>
+
       <dt id="getTokenAt"><code><strong>cm.getTokenAt</strong>(pos: {line, ch}, ?precise: boolean) → object</code></dt>
       <dd>Retrieves information about the token the current mode found
       before the given position (a <code>{line, ch}</code> object). The
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 96e579e753..1caa59d2d2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2871,10 +2871,15 @@ window.CodeMirror = (function() {
       }
     },
 
+    getModeAt: function(pos) {
+      var mode = this.doc.mode;
+      if (!mode.innerMode) return mode;
+      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;
+    },
+
     getHelper: function(pos, type) {
       if (!helpers.hasOwnProperty(type)) return;
-      var state = this.getTokenAt(pos).state, help = helpers[type];
-      var mode = CodeMirror.innerMode(this.getMode(), state).mode;
+      var help = helpers[type], mode = this.getModeAt(pos);
       return mode[type] && help[mode[type]] ||
         mode.helperType && help[mode.helperType] ||
         help[mode.name];

From 76894881e46571dc5bb8df953b32d71dc0113a0a Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 7 Jul 2013 21:11:40 -0400
Subject: [PATCH 0263/4742] [markdown] Highlight trailing spaces that affect
 line breaks

---
 mode/markdown/index.html  |  7 ++++++-
 mode/markdown/markdown.js | 27 ++++++++++++++++++++++++++-
 mode/markdown/test.js     | 14 ++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 6f97b10e73..bb785b13fc 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -8,7 +8,12 @@
     <script src="../../addon/edit/continuelist.js"></script>
     <script src="../xml/xml.js"></script>
     <script src="markdown.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <style type="text/css">
+      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+      .cm-s-default .cm-trailing-space-a:before,
+      .cm-s-default .cm-trailing-space-b:before {position: absolute; content: "\00B7"; color: #777;}
+      .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
+    </style>
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>
   <body>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 72b0d6ced2..bf1750d5b6 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -103,6 +103,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = inlineNormal;
       state.block = blockNormal;
     }
+    // Reset state.trailingSpace
+    state.trailingSpace = 0;
+    state.trailingSpaceNewLine = false;
     // Mark this line as blank
     state.thisLineHasContent = false;
     return null;
@@ -217,6 +220,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
+    if (state.trailingSpaceNewLine) {
+      styles.push("trailing-space-new-line");
+    } else if (state.trailingSpace) {
+      styles.push("trailing-space-" + (state.trailingSpace % 2 ? "a" : "b"));
+    }
+
     return styles.length ? styles.join(' ') : null;
   }
 
@@ -369,6 +378,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
+    if (ch === ' ') {
+      if (stream.match(/ +$/, false)) {
+        state.trailingSpace++;
+      } else if (state.trailingSpace) {
+        state.trailingSpaceNewLine = true;
+      }
+    }
+
     return getType(state);
   }
 
@@ -453,7 +470,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         taskList: false,
         list: false,
         listDepth: 0,
-        quote: 0
+        quote: 0,
+        trailingSpace: 0,
+        trailingSpaceNewLine: false
       };
     },
 
@@ -481,6 +500,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         list: s.list,
         listDepth: s.listDepth,
         quote: s.quote,
+        trailingSpace: s.trailingSpace,
+        trailingSpaceNewLine: s.trailingSpaceNewLine,
         md_inside: s.md_inside
       };
     },
@@ -504,6 +525,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         // Reset state.code
         state.code = false;
 
+        // Reset state.trailingSpace
+        state.trailingSpace = 0;
+        state.trailingSpaceNewLine = false;
+
         state.f = state.block;
         var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
         var difference = Math.floor((indentation - state.indentation) / 4) * 4;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 99ae056132..f167917289 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -5,6 +5,20 @@
   MT("plainText",
      "foo");
 
+  // Don't style single trailing space
+  MT("trailingSpace1",
+     "foo ");
+
+  // Two or more trailing spaces should be styled with line break character
+  MT("trailingSpace2",
+     "foo[trailing-space-a  ][trailing-space-new-line  ]");
+
+  MT("trailingSpace3",
+     "foo[trailing-space-a  ][trailing-space-b  ][trailing-space-new-line  ]");
+
+  MT("trailingSpace4",
+     "foo[trailing-space-a  ][trailing-space-b  ][trailing-space-a  ][trailing-space-new-line  ]");
+
   // Code blocks using 4 spaces (regardless of CodeMirror.tabSize value)
   MT("codeBlocksUsing4Spaces",
      "    [comment foo]");

From 25e4be044206c7b26b003df7cb8e2fcb0cbe71cf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 8 Jul 2013 09:22:56 +0200
Subject: [PATCH 0264/4742] [javascript mode] Don't get confused by empty
 brackets

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index f5507ce699..d51745d837 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -311,7 +311,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ";") return;
     if (type == "(") return cont(pushlex(")", "call"), commasep(expressionNoComma, ")"), poplex, me);
     if (type == ".") return cont(property, me);
-    if (type == "[") return cont(pushlex("]"), expression, expect("]"), poplex, me);
+    if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
   }
   function maybelabel(type) {
     if (type == ":") return cont(poplex, statement);

From e99efe2543edea09ce6780e826288add7ddec48d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 9 Jul 2013 10:36:05 +0200
Subject: [PATCH 0265/4742] [javascript mode] Fix bad indentation below if

Closes #1662
---
 mode/javascript/javascript.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d51745d837..3d04603c28 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -258,17 +258,17 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
     if (type == "{") return cont(pushlex("}"), block, poplex);
     if (type == ";") return cont();
-    if (type == "if") return cont(pushlex("form"), expression, statement, poplex, maybeelse(cx.state.indented));
+    if (type == "if") return cont(pushlex("form"), expression, statement, poplex, maybeelse);
     if (type == "function") return cont(functiondef);
     if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"),
-                                      poplex, statement, poplex);
+                                   poplex, statement, poplex);
     if (type == "variable") return cont(pushlex("stat"), maybelabel);
     if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                         block, poplex, poplex);
+                                      block, poplex, poplex);
     if (type == "case") return cont(expression, expect(":"));
     if (type == "default") return cont(expect(":"));
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                        statement, poplex, popcontext);
+                                     statement, poplex, popcontext);
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {
@@ -373,14 +373,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "=") return cont(expressionNoComma, vardef2);
     if (type == ",") return cont(vardef1);
   }
-  function maybeelse(indent) {
-    return function(type, value) {
-      if (type == "keyword b" && value == "else") {
-        cx.state.lexical = new JSLexical(indent, 0, "form", null, cx.state.lexical);
-        return cont(statement, poplex);
-      }
-      return pass();
-    };
+  function maybeelse(type, value) {
+    if (type == "keyword b" && value == "else") return cont(pushlex("form"), statement, poplex);
   }
   function forspec1(type) {
     if (type == "var") return cont(vardef1, expect(";"), forspec2);
@@ -441,6 +435,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (state.tokenize == jsTokenComment) return CodeMirror.Pass;
       if (state.tokenize != jsTokenBase) return 0;
       var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
+      // Kludge to prevent 'maybelse' from blocking lexical scope pops
+      for (var i = state.cc.length - 1; i >= 0; --i) {
+        var c = state.cc[i];
+        if (c == poplex) lexical = lexical.prev;
+        else if (c != maybeelse || /^else\b/.test(textAfter)) break;
+      }
       if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
       if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
         lexical = lexical.prev;

From c921c10de61a733a55015b5607f1c360baf2e285 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 9 Jul 2013 11:09:30 +0200
Subject: [PATCH 0266/4742] Add another exception to the spanAffectsWrapping
 hack

And turn the hack off in recent Chrome builds.

Issue #1663
---
 lib/codemirror.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1caa59d2d2..ab1cce5fb6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5391,10 +5391,12 @@ window.CodeMirror = (function() {
     spanAffectsWrapping = function(str, i) {
       return /\-[^ \-?]|\?[^ !\'\"\),.\-\/:;\?\]\}]/.test(str.slice(i - 1, i + 1));
     };
-  else if (webkit)
+  else if (webkit && !/Chrome\/(?:29|[3-9]\d|\d\d\d)\./.test(navigator.userAgent))
     spanAffectsWrapping = function(str, i) {
-      if (i > 1 && str.charCodeAt(i - 1) == 45 && /\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i)))
-        return true;
+      if (i > 1 && str.charCodeAt(i - 1) == 45) {
+        if (/\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i))) return true;
+        if (i > 2 && /[\d\.,]/.test(str.charAt(i - 2)) && /[\d\.,]/.test(str.charAt(i))) return false;
+      }
       return /[~!#%&*)=+}\]|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|…[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
     };
 

From 8068b3d55d397ad14350e6b1593fa53095927f4b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jul 2013 08:09:06 +0200
Subject: [PATCH 0267/4742] Fix removeKeyMap for string keymap values

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ab1cce5fb6..330a09e385 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2798,7 +2798,7 @@ window.CodeMirror = (function() {
     removeKeyMap: function(map) {
       var maps = this.state.keyMaps;
       for (var i = 0; i < maps.length; ++i)
-        if ((typeof map == "string" ? maps[i].name : maps[i]) == map) {
+        if (maps[i] == map || (typeof maps[i] != "string" && maps[i].name == map)) {
           maps.splice(i, 1);
           return true;
         }

From 4651de869bcd7a1503bbe14540aebc3a8879705f Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Tue, 25 Jun 2013 17:12:09 +0200
Subject: [PATCH 0268/4742] [python mode] Add MIME for Cython dialect

---
 doc/modes.html         |  1 +
 index.html             |  1 +
 mode/meta.js           |  3 ++-
 mode/python/index.html | 46 +++++++++++++++++++++++++++++++++++++++---
 mode/python/python.js  | 16 +++++++++++++++
 5 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/doc/modes.html b/doc/modes.html
index 69c7d5e9ad..1c76f2fb1b 100644
--- a/doc/modes.html
+++ b/doc/modes.html
@@ -31,6 +31,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="../mode/coffeescript/index.html">CoffeeScript</a></li>
       <li><a href="../mode/commonlisp/index.html">Common Lisp</a></li>
       <li><a href="../mode/css/index.html">CSS</a></li>
+      <li><a href="../mode/python/index.html">Cython</a></li>
       <li><a href="../mode/d/index.html">D</a></li>
       <li><a href="../mode/diff/index.html">diff</a></li>
       <li><a href="../mode/ecl/index.html">ECL</a></li>
diff --git a/index.html b/index.html
index 6a9dbcb603..544aac1200 100644
--- a/index.html
+++ b/index.html
@@ -40,6 +40,7 @@ <h2 style="margin-top: 0">Supported modes:</h2>
       <li><a href="mode/coffeescript/index.html">CoffeeScript</a></li>
       <li><a href="mode/commonlisp/index.html">Common Lisp</a></li>
       <li><a href="mode/css/index.html">CSS</a></li>
+      <li><a href="mode/python/index.html">Cython</a></li>
       <li><a href="mode/d/index.html">D</a></li>
       <li><a href="mode/diff/index.html">diff</a></li>
       <li><a href="mode/ecl/index.html">ECL</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index cb1051e68f..1ea0f672b0 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -16,7 +16,7 @@ CodeMirror.modeInfo = [
   {name: 'ECL', mime: 'text/x-ecl', mode: 'ecl'},
   {name: 'Erlang', mime: 'text/x-erlang', mode: 'erlang'},
   {name: 'Gas', mime: 'text/x-gas', mode: 'gas'},
-  {name: 'GitHub Flavored Markdown', mode: 'gfm'},
+  {name: 'GitHub Flavored Markdown', mime: 'text/x-gfm', mode: 'gfm'},
   {name: 'GO', mime: 'text/x-go', mode: 'go'},
   {name: 'Groovy', mime: 'text/x-groovy', mode: 'groovy'},
   {name: 'Haskell', mime: 'text/x-haskell', mode: 'haskell'},
@@ -47,6 +47,7 @@ CodeMirror.modeInfo = [
   {name: 'Plain Text', mime: 'text/plain', mode: 'null'},
   {name: 'Properties files', mime: 'text/x-properties', mode: 'clike'},
   {name: 'Python', mime: 'text/x-python', mode: 'python'},
+  {name: 'Cython', mime: 'text/x-cython', mode: 'python'},
   {name: 'R', mime: 'text/x-rsrc', mode: 'r'},
   {name: 'reStructuredText', mime: 'text/x-rst', mode: 'rst'},
   {name: 'Ruby', mime: 'text/x-ruby', mode: 'ruby'},
diff --git a/mode/python/index.html b/mode/python/index.html
index 4244c6fc5a..1229a8bf83 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -12,7 +12,7 @@
   </head>
   <body>
     <h1>CodeMirror: Python mode</h1>
-    
+    <h2>Python mode</h2>
     <div><textarea id="code" name="code">
 # Literals
 1234
@@ -102,6 +102,34 @@ <h1>CodeMirror: Python mode</h1>
         self.mixin = mixin
 
 </textarea></div>
+
+
+<h2>Cython mode</h2>
+
+<div><textarea id="code-cython" name="code-cython">
+
+import numpy as np
+cimport cython
+from libc.math cimport sqrt
+
+@cython.boundscheck(False)
+@cython.wraparound(False)
+def pairwise_cython(double[:, ::1] X):
+    cdef int M = X.shape[0]
+    cdef int N = X.shape[1]
+    cdef double tmp, d
+    cdef double[:, ::1] D = np.empty((M, M), dtype=np.float64)
+    for i in range(M):
+        for j in range(M):
+            d = 0.0
+            for k in range(N):
+                tmp = X[i, k] - X[j, k]
+                d += tmp * tmp
+            D[i, j] = sqrt(d)
+    return np.asarray(D)
+
+</textarea></div>
+
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: {name: "python",
@@ -111,9 +139,19 @@ <h1>CodeMirror: Python mode</h1>
         indentUnit: 4,
         tabMode: "shift",
         matchBrackets: true
+    });
+
+    CodeMirror.fromTextArea(document.getElementById("code-cython"), {
+        mode: {name: "text/x-cython",
+               version: 2,
+               singleLineStringErrors: false},
+        lineNumbers: true,
+        indentUnit: 4,
+        tabMode: "shift",
+        matchBrackets: true
       });
     </script>
-    <h2>Configuration Options:</h2>
+    <h2>Configuration Options for Python mode:</h2>
     <ul>
       <li>version - 2/3 - The version of Python to recognize.  Default is 2.</li>
       <li>singleLineStringErrors - true/false - If you have a single-line string that is not terminated at the end of the line, this will show subsequent lines as errors if true, otherwise it will consider the newline as the end of the string. Default is false.</li>
@@ -127,9 +165,11 @@ <h2>Advanced Configuration Options:</h2>
       <li>doubleDelimiters - RegEx - Regular Expressoin for double delimiters matching, default : <pre>^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&amp;=)|(\\|=)|(\\^=))</pre></li>
       <li>tripleDelimiters - RegEx - Regular Expression for triple delimiters matching, default : <pre>^((//=)|(&gt;&gt;=)|(&lt;&lt;=)|(\\*\\*=))</pre></li>
       <li>identifiers - RegEx - Regular Expression for identifier, default : <pre>^[_A-Za-z][_A-Za-z0-9]*</pre></li>
+      <li>extra_keywords - list of string - List of extra words ton consider as keywords</li>
+      <li>extra_builtins - list of string - List of extra words ton consider as builtins</li>
     </ul>
 
 
-    <p><strong>MIME types defined:</strong> <code>text/x-python</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/x-python</code> and <code>text/x-cython</code>.</p>
   </body>
 </html>
diff --git a/mode/python/python.js b/mode/python/python.js
index 565d963fdf..2c6d1d83c7 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -36,6 +36,12 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
     var py3 = {'builtins': ['ascii', 'bytes', 'exec', 'print'],
                'keywords': ['nonlocal', 'False', 'True', 'None']};
 
+    if(parserConf.extra_keywords != undefined){
+        commonkeywords = commonkeywords.concat(parserConf.extra_keywords);
+    }
+    if(parserConf.extra_builtins != undefined){
+        commonBuiltins = commonBuiltins.concat(parserConf.extra_builtins);
+    }
     if (!!parserConf.version && parseInt(parserConf.version, 10) === 3) {
         commonkeywords = commonkeywords.concat(py3.keywords);
         commonBuiltins = commonBuiltins.concat(py3.builtins);
@@ -340,3 +346,13 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
 });
 
 CodeMirror.defineMIME("text/x-python", "python");
+
+var words = function(str){return str.split(' ');};
+
+
+CodeMirror.defineMIME("text/x-cython", {
+  name: "python",
+  extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
+                        "extern gil include nogil property public"+
+                        "readonly struct union DEF IF ELIF ELSE")
+});

From 9e8199b3d604009f1a3b8df4691f9d3469c7aefe Mon Sep 17 00:00:00 2001
From: Michael Zhou <moz@google.com>
Date: Tue, 9 Jul 2013 12:42:25 -0700
Subject: [PATCH 0269/4742] Fix bug in addLineWidget.

Fixed clipping of the insertAt index.
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 330a09e385..03933ff9eb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4108,7 +4108,7 @@ window.CodeMirror = (function() {
     changeLine(cm, handle, function(line) {
       var widgets = line.widgets || (line.widgets = []);
       if (widget.insertAt == null) widgets.push(widget);
-      else widgets.splice(Math.max(widgets.length - 1, widget.insertAt), 0, widget);
+      else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
       widget.line = line;
       if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {
         var aboveVisible = heightAtLine(cm, line) < cm.doc.scrollTop;

From 486976e16d42ca9cf2b6b01bdd21912124fbc562 Mon Sep 17 00:00:00 2001
From: Michael Zhou <moz@google.com>
Date: Tue, 9 Jul 2013 15:02:43 -0700
Subject: [PATCH 0270/4742] Fix addLineWidget documentation.

Removed "pos" parameter.
---
 doc/manual.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 64c684b10b..a4f8bc060e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1253,7 +1253,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       widget again, simply use DOM methods (move it somewhere else, or
       call <code>removeChild</code> on its parent).</dd>
 
-      <dt id="addLineWidget"><code><strong>cm.addLineWidget</strong>(line: integer|LineHandle, node: Element, ?options: object, ?pos: integer) → LineWidget</code></dt>
+      <dt id="addLineWidget"><code><strong>cm.addLineWidget</strong>(line: integer|LineHandle, node: Element, ?options: object) → LineWidget</code></dt>
       <dd>Adds a line widget, an element shown below a line, spanning
       the whole of the editor's width, and moving the lines below it
       downwards. <code>line</code> should be either an integer or a

From ab2b604ed8bc64788c3590683e446f38043bb671 Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@gmail.com>
Date: Wed, 10 Jul 2013 21:16:48 +0200
Subject: [PATCH 0271/4742] Fix selecting until the start of a bidi line

---
 lib/codemirror.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 03933ff9eb..6bfd652fe5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5483,11 +5483,15 @@ window.CodeMirror = (function() {
 
   function iterateBidiSections(order, from, to, f) {
     if (!order) return f(from, to, "ltr");
+    var found = false;
     for (var i = 0; i < order.length; ++i) {
       var part = order[i];
-      if (part.from < to && part.to > from || from == to && part.to == from)
+      if (part.from < to && part.to > from || from == to && part.to == from) {
         f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
+        found = true;
+      }
     }
+    if (!found) f(from, to, "ltr");
   }
 
   function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }

From 1a028d007a50c117775aabca1e5d932115333e9f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jul 2013 10:18:01 +0200
Subject: [PATCH 0272/4742] Support 'title' option to markText

Issue #1654
---
 doc/manual.html   |  4 ++++
 lib/codemirror.js | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index a4f8bc060e..cb3bc50509 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1151,6 +1151,10 @@ <h3 id="api_marker">Text-marking methods</h3>
         is part of the marker.</dd>
         <dt id="mark_endStyle"><code><strong>endStyle</strong>: string</code></dt><dd>Equivalent
         to <code>startStyle</code>, but for the rightmost span.</dd>
+        <dt id="mark_title"><code><strong>title</strong>:
+        string</code></dt><dd>When given, will give the nodes created
+        for this span a HTML <code>title</code> attribute with the
+        given value.</dd>
         <dt id="mark_shared"><code><strong>shared</strong>: boolean</code></dt><dd>When the
         target document is <a href="#linkedDoc">linked</a> to other
         documents, you can set <code>shared</code> to true to make the
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6bfd652fe5..fe956fd81a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3791,7 +3791,7 @@ window.CodeMirror = (function() {
     }
     if (cm) {
       if (updateMaxLine) cm.curOp.updateMaxLine = true;
-      if (marker.className || marker.startStyle || marker.endStyle || marker.collapsed)
+      if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.collapsed)
         regChange(cm, from.line, to.line + 1);
       if (marker.atomic) reCheckSelection(cm);
     }
@@ -4284,7 +4284,7 @@ window.CodeMirror = (function() {
   }
 
   var tokenSpecialChars = /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\uFEFF]/g;
-  function buildToken(builder, text, style, startStyle, endStyle) {
+  function buildToken(builder, text, style, startStyle, endStyle, title) {
     if (!text) return;
     if (!tokenSpecialChars.test(text)) {
       builder.col += text.length;
@@ -4317,7 +4317,9 @@ window.CodeMirror = (function() {
       var fullStyle = style || "";
       if (startStyle) fullStyle += startStyle;
       if (endStyle) fullStyle += endStyle;
-      return builder.pre.appendChild(elt("span", [content], fullStyle));
+      var token = elt("span", [content], fullStyle);
+      if (title) token.title = title;
+      return builder.pre.appendChild(token);
     }
     builder.pre.appendChild(content);
   }
@@ -4355,8 +4357,8 @@ window.CodeMirror = (function() {
       out += " ";
       return out;
     }
-    return function(builder, text, style, startStyle, endStyle) {
-      return inner(builder, text.replace(/ {3,}/, split), style, startStyle, endStyle);
+    return function(builder, text, style, startStyle, endStyle, title) {
+      return inner(builder, text.replace(/ {3,}/, split), style, startStyle, endStyle, title);
     };
   }
 
@@ -4392,10 +4394,10 @@ window.CodeMirror = (function() {
     }
 
     var len = allText.length, pos = 0, i = 1, text = "", style;
-    var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, collapsed;
+    var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
     for (;;) {
       if (nextChange == pos) { // Update current marker set
-        spanStyle = spanEndStyle = spanStartStyle = "";
+        spanStyle = spanEndStyle = spanStartStyle = title = "";
         collapsed = null; nextChange = Infinity;
         var foundBookmark = null;
         for (var j = 0; j < spans.length; ++j) {
@@ -4405,6 +4407,7 @@ window.CodeMirror = (function() {
             if (m.className) spanStyle += " " + m.className;
             if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
             if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
+            if (m.title && !title) title = m.title;
             if (m.collapsed && (!collapsed || collapsed.marker.size < m.size))
               collapsed = sp;
           } else if (sp.from > pos && nextChange > sp.from) {
@@ -4428,7 +4431,7 @@ window.CodeMirror = (function() {
           if (!collapsed) {
             var tokenText = end > upto ? text.slice(0, upto - pos) : text;
             builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "");
+                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title);
           }
           if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
           pos = end;

From 4f85a7ef97942a31b07609b11f762c785a71a34e Mon Sep 17 00:00:00 2001
From: John Snelson <john@snelson.org.uk>
Date: Thu, 11 Jul 2013 09:50:43 +0100
Subject: [PATCH 0273/4742] Added SPARQL 1.1 keywords to the SPARQL mode.

---
 mode/sparql/sparql.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index f7237698d3..1168f23a52 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -9,7 +9,9 @@ CodeMirror.defineMode("sparql", function(config) {
                         "isblank", "isliteral", "union", "a"]);
   var keywords = wordRegexp(["base", "prefix", "select", "distinct", "reduced", "construct", "describe",
                              "ask", "from", "named", "where", "order", "limit", "offset", "filter", "optional",
-                             "graph", "by", "asc", "desc"]);
+                             "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group",
+                             "minus", "in", "not", "service", "silent", "using", "insert", "delete",
+                             "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
   var operatorChars = /[*+\-<>=&|]/;
 
   function tokenBase(stream, state) {

From ef328ed46d2a7cc5e3d47735a9725230fadc4d59 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 12 Jul 2013 10:38:17 +0200
Subject: [PATCH 0274/4742] Add convenient event methods to all event-emitting
 objects

i.e. linehandle.on, markedrange.off, etc.
---
 doc/manual.html   | 22 ++++++++++------------
 lib/codemirror.js | 34 +++++++++++++++++++++-------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index cb3bc50509..d17eb79853 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -375,14 +375,15 @@ <h2 id="config">Configuration</h2>
 
     <h2 id="events">Events</h2>
 
-    <p>A CodeMirror instance emits a number of events, which allow
-    client code to react to various situations. These are registered
-    with the <a href="#on"><code>on</code></a> method (and
-    removed with the <a href="#off"><code>off</code></a>
-    method). These are the events that fire on the instance object.
-    The name of the event is followed by the arguments that will be
-    passed to the handler. The <code>instance</code> argument always
-    refers to the editor instance.</p>
+    <p>Various CodeMirror-related objects emit events, which allow
+    client code to react to various situations. Handlers for such
+    events can be registed with the <a href="#on"><code>on</code></a>
+    and <a href="#off"><code>off</code></a> methods on the objects
+    that the event fires on.</p>
+
+    <p>An editor instance fires the following events.
+    The <code>instance</code> argument always refers to the editor
+    itself.</p>
 
     <dl>
       <dt id="event_change"><code><strong>"change"</strong> (instance: CodeMirror, changeObj: object)</code></dt>
@@ -497,10 +498,7 @@ <h2 id="events">Events</h2>
       CodeMirror should do no further handling.</dd>
     </dl>
 
-    <p>It is also possible to <a href="#on">register</a> events on
-    other objects. Use <code>CodeMirror.on(handle, "eventName",
-    func)</code> to register handlers on objects that don't have their
-    own <code>on</code> method. Document objects (instances
+    <p>Document objects (instances
     of <a href="#Doc"><code>CodeMirror.Doc</code></a>) emit the
     following events:</p>
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index fe956fd81a..35c2e30f18 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3123,9 +3123,6 @@ window.CodeMirror = (function() {
       this.refresh();
     },
 
-    on: function(type, f) {on(this, type, f);},
-    off: function(type, f) {off(this, type, f);},
-
     operation: function(f){return runInOp(this, f);},
 
     refresh: operation(null, function() {
@@ -3149,6 +3146,7 @@ window.CodeMirror = (function() {
     getScrollerElement: function(){return this.display.scroller;},
     getGutterElement: function(){return this.display.gutters;}
   };
+  eventMixin(CodeMirror);
 
   // OPTION DEFAULTS
 
@@ -3657,6 +3655,7 @@ window.CodeMirror = (function() {
     this.doc = doc;
   }
   CodeMirror.TextMarker = TextMarker;
+  eventMixin(TextMarker);
 
   TextMarker.prototype.clear = function() {
     if (this.explicitlyCleared) return;
@@ -3809,6 +3808,7 @@ window.CodeMirror = (function() {
     }
   }
   CodeMirror.SharedTextMarker = SharedTextMarker;
+  eventMixin(SharedTextMarker);
 
   SharedTextMarker.prototype.clear = function() {
     if (this.explicitlyCleared) return;
@@ -4066,6 +4066,7 @@ window.CodeMirror = (function() {
     this.cm = cm;
     this.node = node;
   };
+  eventMixin(LineWidget);
   function widgetOperation(f) {
     return function() {
       var withOp = !this.cm.curOp;
@@ -4124,12 +4125,12 @@ window.CodeMirror = (function() {
 
   // Line objects. These hold state related to a line, including
   // highlighting info (the styles array).
-  function makeLine(text, markedSpans, estimateHeight) {
-    var line = {text: text};
-    attachMarkedSpans(line, markedSpans);
-    line.height = estimateHeight ? estimateHeight(line) : 1;
-    return line;
+  function Line(text, markedSpans, estimateHeight) {
+    this.text = text;
+    attachMarkedSpans(this, markedSpans);
+    this.height = estimateHeight ? estimateHeight(this) : 1;
   }
+  eventMixin(Line);
 
   function updateLine(line, text, markedSpans, estimateHeight) {
     line.text = text;
@@ -4461,7 +4462,7 @@ window.CodeMirror = (function() {
       // This is a whole-line replace. Treated specially to make
       // sure line objects move the way they are supposed to.
       for (var i = 0, e = text.length - 1, added = []; i < e; ++i)
-        added.push(makeLine(text[i], spansFor(i), estimateHeight));
+        added.push(new Line(text[i], spansFor(i), estimateHeight));
       update(lastLine, lastLine.text, lastSpans);
       if (nlines) doc.remove(from.line, nlines);
       if (added.length) doc.insert(from.line, added);
@@ -4470,8 +4471,8 @@ window.CodeMirror = (function() {
         update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
       } else {
         for (var added = [], i = 1, e = text.length - 1; i < e; ++i)
-          added.push(makeLine(text[i], spansFor(i), estimateHeight));
-        added.push(makeLine(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
+          added.push(new Line(text[i], spansFor(i), estimateHeight));
+        added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
         update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
         doc.insert(from.line + 1, added);
       }
@@ -4482,7 +4483,7 @@ window.CodeMirror = (function() {
       update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
       update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
       for (var i = 1, e = text.length - 1, added = []; i < e; ++i)
-        added.push(makeLine(text[i], spansFor(i), estimateHeight));
+        added.push(new Line(text[i], spansFor(i), estimateHeight));
       if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
       doc.insert(from.line + 1, added);
     }
@@ -4625,7 +4626,7 @@ window.CodeMirror = (function() {
     if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
     if (firstLine == null) firstLine = 0;
 
-    BranchChunk.call(this, [new LeafChunk([makeLine("", null)])]);
+    BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
     this.first = firstLine;
     this.scrollTop = this.scrollLeft = 0;
     this.cantEdit = false;
@@ -4860,6 +4861,8 @@ window.CodeMirror = (function() {
       return function() {return method.apply(this.doc, arguments);};
     })(Doc.prototype[prop]);
 
+  eventMixin(Doc);
+
   function linkedDocs(doc, f, sharedHistOnly) {
     function propagate(doc, skip, sharedHist) {
       if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
@@ -5243,6 +5246,11 @@ window.CodeMirror = (function() {
 
   CodeMirror.on = on; CodeMirror.off = off; CodeMirror.signal = signal;
 
+  function eventMixin(ctor) {
+    ctor.prototype.on = function(type, f) {on(this, type, f);};
+    ctor.prototype.off = function(type, f) {off(this, type, f);};
+  }
+
   // MISC UTILITIES
 
   // Number of pixels added to scroller and sizer to hide scrollbar

From 649b848b91d33471ad43708dc2af3abfeebc17ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 12 Jul 2013 10:45:55 +0200
Subject: [PATCH 0275/4742] [activeline addon] Don't get confused by collapsed
 spans

Issue #1668
---
 addon/selection/active-line.js | 2 +-
 lib/codemirror.js              | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index 65fab6f162..e50508653a 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -29,7 +29,7 @@
   }
 
   function updateActiveLine(cm) {
-    var line = cm.getLineHandle(cm.getCursor().line);
+    var line = cm.getLineHandleVisualStart(cm.getCursor().line);
     if (cm.state.activeLine == line) return;
     clearActiveLine(cm);
     cm.addLineClass(line, "wrap", WRAP_CLASS);
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 35c2e30f18..9a6a932010 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4125,11 +4125,11 @@ window.CodeMirror = (function() {
 
   // Line objects. These hold state related to a line, including
   // highlighting info (the styles array).
-  function Line(text, markedSpans, estimateHeight) {
+  var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) {
     this.text = text;
     attachMarkedSpans(this, markedSpans);
     this.height = estimateHeight ? estimateHeight(this) : 1;
-  }
+  };
   eventMixin(Line);
 
   function updateLine(line, text, markedSpans, estimateHeight) {
@@ -4691,6 +4691,11 @@ window.CodeMirror = (function() {
     getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
     getLineNumber: function(line) {return lineNo(line);},
 
+    getLineHandleVisualStart: function(line) {
+      if (typeof line == "number") line = getLine(this, line);
+      return visualLine(this, line);
+    },
+
     lineCount: function() {return this.size;},
     firstLine: function() {return this.first;},
     lastLine: function() {return this.first + this.size - 1;},

From 47655e693d5d29fc549797aa0cd79800d7828427 Mon Sep 17 00:00:00 2001
From: Ruslan Osmanov <rrosmanov@gmail.com>
Date: Sat, 29 Jun 2013 19:28:16 +0500
Subject: [PATCH 0276/4742] [smartymixed mode] Add

---
 .gitignore                      |   2 +
 mode/smartymixed/index.html     | 107 ++++++++++++++++++++
 mode/smartymixed/smartymixed.js | 170 ++++++++++++++++++++++++++++++++
 3 files changed, 279 insertions(+)
 create mode 100644 mode/smartymixed/index.html
 create mode 100644 mode/smartymixed/smartymixed.js

diff --git a/.gitignore b/.gitignore
index bc20ab58d5..b471fe6e63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /npm-debug.log
 test.html
 .tern-*
+*~
+*.swp
diff --git a/mode/smartymixed/index.html b/mode/smartymixed/index.html
new file mode 100644
index 0000000000..6567b27d6b
--- /dev/null
+++ b/mode/smartymixed/index.html
@@ -0,0 +1,107 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: Smarty mixed mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <link rel="stylesheet" href="../../doc/docs.css">
+
+    <!-- smartymixed dependencies -->
+    <script src="../../mode/xml/xml.js"></script>
+    <script src="../../mode/javascript/javascript.js"></script>
+    <script src="../../mode/css/css.js"></script>
+    <script src="../../mode/htmlmixed/htmlmixed.js"></script>
+    <script src="../../mode/smarty/smarty.js"></script>
+
+    <!-- smartymixed -->
+    <script src="../../mode/smartymixed/smartymixed.js"></script>
+  </head>
+  <body>
+    <h1>CodeMirror: Smarty mixed mode</h1>
+    <form><textarea id="code" name="code">
+{**
+* @brief Smarty mixed mode
+* @author Ruslan Osmanov
+* @date 29.06.2013
+*}
+<html>
+<head>
+  <title>{$title|htmlspecialchars|truncate:30}</title>
+</head>
+<body>
+  {* Multiline smarty
+  * comment, no {$variables} here
+  *}
+  {literal}
+  {literal} is just an HTML text.
+  <script type="text/javascript">//<![CDATA[
+    var a = {$just_a_normal_js_object : "value"};
+    var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("code"), {
+      mode           : "smartymixed",
+      tabSize        : 2,
+      indentUnit     : 2,
+      indentWithTabs : false,
+      lineNumbers    : true,
+      smartyVersion  : 3
+    });
+    // ]]>
+  </script>
+  <style>
+    /* CSS content 
+    {$no_smarty} */
+    .some-class { font-weight: bolder; color: "orange"; }
+  </style>
+  {/literal}
+
+  {extends file="parent.tpl"}
+  {include file="template.tpl"}
+
+  {* some example Smarty content *}
+  {if isset($name) && $name == 'Blog'}
+    This is a {$var}.
+    {$integer = 4511}, {$array[] = "a"}, {$stringvar = "string"}
+    {$integer = 4512} {$array[] = "a"} {$stringvar = "string"}
+    {assign var='bob' value=$var.prop}
+  {elseif $name == $foo}
+    {function name=menu level=0}
+    {foreach $data as $entry}
+      {if is_array($entry)}
+      - {$entry@key}
+      {menu data=$entry level=$level+1}
+      {else}
+      {$entry}
+      {* One
+      * Two
+      * Three
+      *}
+      {/if}
+    {/foreach}
+    {/function}
+  {/if}
+  </body>
+  <!-- R.O. -->
+</html>
+</textarea></form>
+
+    <script type="text/javascript">
+      var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode           : "smartymixed",
+        tabSize        : 2,
+        indentUnit     : 2,
+        indentWithTabs : false,
+        lineNumbers    : true,
+        smartyVersion  : 3,
+        matchBrackets  : true,
+      });
+    </script>
+
+    <p>The Smarty mixed mode depends on the Smarty and HTML mixed modes. HTML
+    mixed mode itself depends on XML, JavaScript, and CSS modes.</p>
+
+    <p>It takes the same options, as Smarty and HTML mixed modes.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-smarty</code>.</p>
+  </body>
+</html>
+<!-- vim: set ft=html ts=2 sts=2 sw=2 et: -->
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
new file mode 100644
index 0000000000..c5d008885a
--- /dev/null
+++ b/mode/smartymixed/smartymixed.js
@@ -0,0 +1,170 @@
+/**
+* @file smartymixed.js
+* @brief Smarty Mixed Codemirror mode (Smarty + Mixed HTML)
+* @author Ruslan Osmanov <rrosmanov at gmail dot com>
+* @version 3.0
+* @date 05.07.2013
+*/
+CodeMirror.defineMode("smartymixed", function(config) {
+  var settings, regs, helpers, parsers,
+  htmlMixedMode = CodeMirror.getMode(config, "htmlmixed"),
+  smartyMode = CodeMirror.getMode(config, "smarty"),
+
+  settings = {
+    rightDelimiter: '}',
+    leftDelimiter: '{'
+  };
+
+  if (config.hasOwnProperty("leftDelimiter")) {
+    settings.leftDelimiter = config.leftDelimiter;
+  }
+  if (config.hasOwnProperty("rightDelimiter")) {
+    settings.rightDelimiter = config.rightDelimiter;
+  }
+
+  regs = {
+    smartyComment: new RegExp("^" + settings.leftDelimiter + "\\*"),
+    literalOpen: new RegExp(settings.leftDelimiter + "literal" + settings.rightDelimiter),
+    literalClose: new RegExp(settings.leftDelimiter + "\/literal" + settings.rightDelimiter),
+    hasLeftDelimeter: new RegExp(".*" + settings.leftDelimiter),
+    htmlHasLeftDelimeter: new RegExp("[^<>]*" + settings.leftDelimiter)
+  };
+
+  helpers = {
+    chain: function(stream, state, parser) {
+      state.tokenize = parser;
+      return parser(stream, state);
+    },
+
+    cleanChain: function(stream, state, parser) {
+      state.tokenize = null;
+      state.localState = null;
+      state.localMode = null;
+      return (typeof parser == "string") ? (parser ? parser : null) : parser(stream, state);
+    },
+
+    maybeBackup: function(stream, pat, style) {
+      var cur = stream.current();
+      var close = cur.search(pat),
+      m;
+      if (close > - 1) stream.backUp(cur.length - close);
+      else if (m = cur.match(/<\/?$/)) {
+        stream.backUp(cur.length);
+        if (!stream.match(pat, false)) stream.match(cur[0]);
+      }
+      return style;
+    }
+  };
+
+  parsers = {
+    html: function(stream, state) {
+      if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false)) {
+        state.tokenize = parsers.smarty;
+        state.localMode = smartyMode;
+        state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
+        return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState));
+      }
+      return htmlMixedMode.token(stream, state.htmlMixedState);
+    },
+
+    smarty: function(stream, state) {
+      if (stream.match(settings.leftDelimiter, false)) {
+        if (stream.match(regs.smartyComment, false)) {
+          return helpers.chain(stream, state, parsers.inBlock("comment", "*" + settings.rightDelimiter));
+        }
+      } else if (stream.match(settings.rightDelimiter, false)) {
+        stream.eat(settings.rightDelimiter);
+        state.tokenize = parsers.html;
+        state.localMode = htmlMixedMode;
+        state.localState = state.htmlMixedState;
+        return "tag";
+      }
+
+      return helpers.maybeBackup(stream, settings.rightDelimiter, smartyMode.token(stream, state.localState));
+    },
+
+    inBlock: function(style, terminator) {
+      return function(stream, state) {
+        while (!stream.eol()) {
+          if (stream.match(terminator)) {
+            helpers.cleanChain(stream, state, "");
+            break;
+          }
+          stream.next();
+        }
+        return style;
+      };
+    }
+  };
+
+  return {
+    startState: function() {
+      var state = htmlMixedMode.startState();
+      return {
+        token: parsers.html,
+        localMode: null,
+        localState: null,
+        htmlMixedState: state,
+        tokenize: null,
+        inLiteral: false
+      };
+    },
+
+    copyState: function(state) {
+      var local = null, tok = (state.tokenize || state.token);
+      if (state.localState) {
+        local = CodeMirror.copyState((tok != parsers.html ? smartyMode : htmlMixedMode), state.localState);
+      }
+      return {
+        token: state.token,
+        tokenize: state.tokenize,
+        localMode: state.localMode,
+        localState: local,
+        htmlMixedState: CodeMirror.copyState(htmlMixedMode, state.htmlMixedState),
+        inLiteral: state.inLiteral
+      };
+    },
+
+    token: function(stream, state) {
+      if (stream.match(settings.leftDelimiter, false)) {
+        if (!state.inLiteral && stream.match(regs.literalOpen, true)) {
+          state.inLiteral = true;
+          return "keyword";
+        } else if (state.inLiteral && stream.match(regs.literalClose, true)) {
+          state.inLiteral = false;
+          return "keyword";
+        }
+      }
+      if (state.inLiteral && state.localState != state.htmlMixedState) {
+        state.tokenize = parsers.html;
+        state.localMode = htmlMixedMode;
+        state.localState = state.htmlMixedState;
+      }
+
+      var style = (state.tokenize || state.token)(stream, state);
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.localMode == smartyMode
+          || (state.inLiteral && !state.localMode)
+         || regs.hasLeftDelimeter.test(textAfter)) {
+        return CodeMirror.Pass;
+      }
+      return htmlMixedMode.indent(state.htmlMixedState, textAfter);
+    },
+
+    electricChars: "/{}:",
+
+    innerMode: function(state) {
+      return {
+        state: state.localState || state.htmlMixedState,
+        mode: state.localMode || htmlMixedMode
+      };
+    }
+  };
+},
+"htmlmixed");
+
+CodeMirror.defineMIME("text/x-smarty", "smartymixed");
+// vim: et ts=2 sts=2 sw=2

From 7f560afa1ce8c6ce7a43c561e35bd43f4b9652c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 12 Jul 2013 10:50:43 +0200
Subject: [PATCH 0277/4742] [smartymixed mode] Integrate

---
 doc/compress.html | 1 +
 doc/modes.html    | 1 +
 mode/meta.js      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/doc/compress.html b/doc/compress.html
index c7eec47d5e..9ccafba4ae 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -123,6 +123,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/mode/sieve/sieve.js">sieve.js</option>
           <option value="http://codemirror.net/mode/smalltalk/smalltalk.js">smalltalk.js</option>
           <option value="http://codemirror.net/mode/smarty/smarty.js">smarty.js</option>
+          <option value="http://codemirror.net/mode/smartymixed/smartymixed.js">smartymixed.js</option>
           <option value="http://codemirror.net/mode/sql/sql.js">sql.js</option>
           <option value="http://codemirror.net/mode/sparql/sparql.js">sparql.js</option>
           <option value="http://codemirror.net/mode/stex/stex.js">stex.js</option>
diff --git a/doc/modes.html b/doc/modes.html
index 1c76f2fb1b..cb72754eb7 100644
--- a/doc/modes.html
+++ b/doc/modes.html
@@ -76,6 +76,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="../mode/sieve/index.html">Sieve</a></li>
       <li><a href="../mode/smalltalk/index.html">Smalltalk</a></li>
       <li><a href="../mode/smarty/index.html">Smarty</a></li>
+      <li><a href="../mode/smartymixed/index.html">Smarty/HTML mixed</a></li>
       <li><a href="../mode/sql/index.html">SQL</a> (several dialects)</li>
       <li><a href="../mode/sparql/index.html">SPARQL</a></li>
       <li><a href="../mode/stex/index.html">sTeX, LaTeX</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 1ea0f672b0..63123a0254 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -59,6 +59,7 @@ CodeMirror.modeInfo = [
   {name: 'Sieve', mime: 'application/sieve', mode: 'sieve'},
   {name: 'Smalltalk', mime: 'text/x-stsrc', mode: 'smalltalk'},
   {name: 'Smarty', mime: 'text/x-smarty', mode: 'smarty'},
+  {name: 'SmartyMixed', mime: 'text/x-smarty', mode: 'smartymixed'},
   {name: 'SPARQL', mime: 'application/x-sparql-query', mode: 'sparql'},
   {name: 'SQL', mime: 'text/x-sql', mode: 'sql'},
   {name: 'MariaDB', mime: 'text/x-mariadb', mode: 'sql'},

From 47f1a861d4493dc5b582b0b04d48155311301c1e Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Fri, 12 Jul 2013 22:34:09 -0400
Subject: [PATCH 0278/4742] [vim] Disable insert mode if document is readonly

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 977642ea38..ab7f757b1e 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1625,6 +1625,7 @@
         emptyMacroKeyBuffer(macroModeState);
       },
       enterInsertMode: function(cm, actionArgs, vim) {
+        if (cm.getOption('readOnly')) { return; }
         vim.insertMode = true;
         vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
         var insertAt = (actionArgs) ? actionArgs.insertAt : null;

From 13dc1753c35768c4802dfc8749b26011bf18bd42 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 13 Jul 2013 11:40:48 +0200
Subject: [PATCH 0279/4742] Fire DOM event from contextmenu handler

Issue #1674
---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index d17eb79853..55f7196aaf 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -489,7 +489,7 @@ <h2 id="events">Events</h2>
       should <em>not</em> try to change the state of the editor.</dd>
 
       <dt id="event_dom"><code><strong>"mousedown"</strong>,
-      <strong>"dblclick"</strong>, <strong>"keydown"</strong>, <strong>"keypress"</strong>,
+      <strong>"dblclick"</strong>, <strong>"contextmenu"</strong>, <strong>"keydown"</strong>, <strong>"keypress"</strong>,
       <strong>"keyup"</strong>, <strong>"dragstart"</strong>, <strong>"dragenter"</strong>,
       <strong>"dragover"</strong>, <strong>"drop"</strong>
       (instance: CodeMirror, event: Event)</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9a6a932010..4e3a07eccb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2107,6 +2107,7 @@ window.CodeMirror = (function() {
 
   var detectingSelectAll;
   function onContextMenu(cm, e) {
+    if (signalDOMEvent(cm, e, "contextmenu")) return;
     var display = cm.display, sel = cm.doc.sel;
     if (eventInWidget(display, e)) return;
 
@@ -5232,8 +5233,8 @@ window.CodeMirror = (function() {
       delayedCallbacks.push(bnd(arr[i]));
   }
 
-  function signalDOMEvent(cm, e) {
-    signal(cm, e.type, cm, e);
+  function signalDOMEvent(cm, e, override) {
+    signal(cm, override || e.type, cm, e);
     return e_defaultPrevented(e);
   }
 

From 35ae796c194fa638dde8a97da00286012f41c5c4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 13 Jul 2013 11:43:39 +0200
Subject: [PATCH 0280/4742] [real-world used] Add CodeZample

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 2150abe401..9aca75a75d 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -41,6 +41,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://code-snippets.bungeshea.com/">Code Snippets</a> (WordPress snippet management plugin)</li>
       <li><a href="http://antonmi.github.io/code_together/">Code together</a> (collaborative editing)</li>
       <li><a href="http://codev.it/">Codev</a> (collaborative IDE)</li>
+      <li><a href="http://www.codezample.com">CodeZample</a> (code snippet sharing)</li>
       <li><a href="http://ot.substance.io/demo/">Collaborative CodeMirror demo</a> (CodeMirror + operational transforms)</li>
       <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>
       <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>

From b05b96e0306d3b33b8a7810884a0d1cfb7b42969 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@chromium.org>
Date: Fri, 12 Jul 2013 12:47:00 +0400
Subject: [PATCH 0281/4742] [closebrackets addon] Do not insert pair of quotes
 right after the word

---
 addon/edit/closebrackets.js | 4 +++-
 lib/codemirror.js           | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 6fbf38ae67..88718b7729 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -54,7 +54,9 @@
         if (cm.somethingSelected()) return surround(cm);
         if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
         var cur = cm.getCursor(), ahead = CodeMirror.Pos(cur.line, cur.ch + 1);
-        var line = cm.getLine(cur.line), nextChar = line.charAt(cur.ch);
+        var line = cm.getLine(cur.line), nextChar = line.charAt(cur.ch), curChar = cur.ch > 0 ? line.charAt(cur.ch - 1) : "";
+        if (left == right && CodeMirror.isWordChar(curChar))
+          return CodeMirror.Pass;
         if (line.length == cur.ch || closingBrackets.indexOf(nextChar) >= 0 || SPACE_CHAR_REGEX.test(nextChar))
           cm.replaceSelection(left + right, {head: ahead, anchor: ahead});
         else
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4e3a07eccb..aed7e83b13 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3319,6 +3319,10 @@ window.CodeMirror = (function() {
     helpers[type][name] = value;
   };
 
+  // UTILITIES
+
+  CodeMirror.isWordChar = isWordChar;
+
   // MODE STATE HANDLING
 
   // Utility functions for working with state. Exported because modes

From 2e3cce0cd6aea4093ad72daa8e6b537f3cefe635 Mon Sep 17 00:00:00 2001
From: Leonya Khachaturov <leonidkhachaturov@gmail.com>
Date: Fri, 12 Jul 2013 12:18:19 +0200
Subject: [PATCH 0282/4742] [css mode] Add several non-standard but very common
 CSS properties

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

diff --git a/mode/css/css.js b/mode/css/css.js
index b52e787a70..70a55d30d4 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -386,15 +386,15 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "text-decoration-color", "text-decoration-line", "text-decoration-skip",
     "text-decoration-style", "text-emphasis", "text-emphasis-color",
     "text-emphasis-position", "text-emphasis-style", "text-height",
-    "text-indent", "text-justify", "text-outline", "text-shadow",
-    "text-space-collapse", "text-transform", "text-underline-position",
+    "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow", 
+    "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
     "text-wrap", "top", "transform", "transform-origin", "transform-style",
     "transition", "transition-delay", "transition-duration",
     "transition-property", "transition-timing-function", "unicode-bidi",
     "vertical-align", "visibility", "voice-balance", "voice-duration",
     "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
     "voice-volume", "volume", "white-space", "widows", "width", "word-break",
-    "word-spacing", "word-wrap", "z-index",
+    "word-spacing", "word-wrap", "z-index", "zoom",
     // SVG-specific
     "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
     "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",

From 36c356cc6166775cbc89756165465172ee423228 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 08:02:41 +0200
Subject: [PATCH 0283/4742] Remove trailing whitespace

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 70a55d30d4..a81fa40408 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -386,7 +386,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "text-decoration-color", "text-decoration-line", "text-decoration-skip",
     "text-decoration-style", "text-emphasis", "text-emphasis-color",
     "text-emphasis-position", "text-emphasis-style", "text-height",
-    "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow", 
+    "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
     "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
     "text-wrap", "top", "transform", "transform-origin", "transform-style",
     "transition", "transition-delay", "transition-duration",

From 0ca2c2546475945dca9dacfd93de8cee3a6e5492 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Mon, 15 Jul 2013 10:36:47 +0200
Subject: [PATCH 0284/4742] [base16 themes] Add

---
 theme/3024-day.css                | 33 +++++++++++++++++++++++++++++++
 theme/3024-night.css              | 33 +++++++++++++++++++++++++++++++
 theme/base16-dark.css             | 33 +++++++++++++++++++++++++++++++
 theme/base16-light.css            | 33 +++++++++++++++++++++++++++++++
 theme/tomorrow-night-eighties.css | 33 +++++++++++++++++++++++++++++++
 5 files changed, 165 insertions(+)
 create mode 100644 theme/3024-day.css
 create mode 100644 theme/3024-night.css
 create mode 100644 theme/base16-dark.css
 create mode 100644 theme/base16-light.css
 create mode 100644 theme/tomorrow-night-eighties.css

diff --git a/theme/3024-day.css b/theme/3024-day.css
new file mode 100644
index 0000000000..e931a49de4
--- /dev/null
+++ b/theme/3024-day.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       3024 day
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-day.CodeMirror {background: #f7f7f7; color: #3a3432;}
+.cm-s-3024-day div.CodeMirror-selected {background: #d6d5d4 !important;}
+.cm-s-3024-day .CodeMirror-gutters {background: #f7f7f7; border-right: 0px;}
+.cm-s-3024-day .CodeMirror-linenumber {color: #807d7c;}
+.cm-s-3024-day .CodeMirror-cursor {border-left: 1px solid #5c5855 !important;}
+
+.cm-s-3024-day span.cm-comment {color: #cdab53;}
+.cm-s-3024-day span.cm-atom {color: #a16a94;}
+.cm-s-3024-day span.cm-number {color: #a16a94;}
+
+.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute {color: #01a252;}
+.cm-s-3024-day span.cm-keyword {color: #db2d20;}
+.cm-s-3024-day span.cm-string {color: #fded02;}
+
+.cm-s-3024-day span.cm-variable {color: #01a252;}
+.cm-s-3024-day span.cm-variable-2 {color: #01a0e4;}
+.cm-s-3024-day span.cm-def {color: #e8bbd0;}
+.cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
+.cm-s-3024-day span.cm-bracket {color: #3a3432;}
+.cm-s-3024-day span.cm-tag {color: #db2d20;}
+.cm-s-3024-day span.cm-link {color: #a16a94;}
+
+.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/3024-night.css b/theme/3024-night.css
new file mode 100644
index 0000000000..87c7f8abe0
--- /dev/null
+++ b/theme/3024-night.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       3024 night
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-night.CodeMirror {background: #090300; color: #d6d5d4;}
+.cm-s-3024-night div.CodeMirror-selected {background: #3a3432 !important;}
+.cm-s-3024-night .CodeMirror-gutters {background: #090300; border-right: 0px;}
+.cm-s-3024-night .CodeMirror-linenumber {color: #5c5855;}
+.cm-s-3024-night .CodeMirror-cursor {border-left: 1px solid #807d7c !important;}
+
+.cm-s-3024-night span.cm-comment {color: #cdab53;}
+.cm-s-3024-night span.cm-atom {color: #a16a94;}
+.cm-s-3024-night span.cm-number {color: #a16a94;}
+
+.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute {color: #01a252;}
+.cm-s-3024-night span.cm-keyword {color: #db2d20;}
+.cm-s-3024-night span.cm-string {color: #fded02;}
+
+.cm-s-3024-night span.cm-variable {color: #01a252;}
+.cm-s-3024-night span.cm-variable-2 {color: #01a0e4;}
+.cm-s-3024-night span.cm-def {color: #e8bbd0;}
+.cm-s-3024-night span.cm-error {background: #db2d20; color: #807d7c;}
+.cm-s-3024-night span.cm-bracket {color: #d6d5d4;}
+.cm-s-3024-night span.cm-tag {color: #db2d20;}
+.cm-s-3024-night span.cm-link {color: #a16a94;}
+
+.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
new file mode 100644
index 0000000000..7a818b75f5
--- /dev/null
+++ b/theme/base16-dark.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       Base16 Default Dark
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
+.cm-s-base16-dark div.CodeMirror-selected {background: #202020 !important;}
+.cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
+.cm-s-base16-dark .CodeMirror-linenumber {color: #505050;}
+.cm-s-base16-dark .CodeMirror-cursor {border-left: 1px solid #b0b0b0 !important;}
+
+.cm-s-base16-dark span.cm-comment {color: #8f5536;}
+.cm-s-base16-dark span.cm-atom {color: #aa759f;}
+.cm-s-base16-dark span.cm-number {color: #aa759f;}
+
+.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute {color: #90a959;}
+.cm-s-base16-dark span.cm-keyword {color: #ac4142;}
+.cm-s-base16-dark span.cm-string {color: #f4bf75;}
+
+.cm-s-base16-dark span.cm-variable {color: #90a959;}
+.cm-s-base16-dark span.cm-variable-2 {color: #6a9fb5;}
+.cm-s-base16-dark span.cm-def {color: #d28445;}
+.cm-s-base16-dark span.cm-error {background: #ac4142; color: #b0b0b0;}
+.cm-s-base16-dark span.cm-bracket {color: #e0e0e0;}
+.cm-s-base16-dark span.cm-tag {color: #ac4142;}
+.cm-s-base16-dark span.cm-link {color: #aa759f;}
+
+.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/base16-light.css b/theme/base16-light.css
new file mode 100644
index 0000000000..a3b2d4dcba
--- /dev/null
+++ b/theme/base16-light.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       Base16 Default Light
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-light.CodeMirror {background: #f5f5f5; color: #202020;}
+.cm-s-base16-light div.CodeMirror-selected {background: #e0e0e0 !important;}
+.cm-s-base16-light .CodeMirror-gutters {background: #f5f5f5; border-right: 0px;}
+.cm-s-base16-light .CodeMirror-linenumber {color: #b0b0b0;}
+.cm-s-base16-light .CodeMirror-cursor {border-left: 1px solid #505050 !important;}
+
+.cm-s-base16-light span.cm-comment {color: #8f5536;}
+.cm-s-base16-light span.cm-atom {color: #aa759f;}
+.cm-s-base16-light span.cm-number {color: #aa759f;}
+
+.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute {color: #90a959;}
+.cm-s-base16-light span.cm-keyword {color: #ac4142;}
+.cm-s-base16-light span.cm-string {color: #f4bf75;}
+
+.cm-s-base16-light span.cm-variable {color: #90a959;}
+.cm-s-base16-light span.cm-variable-2 {color: #6a9fb5;}
+.cm-s-base16-light span.cm-def {color: #d28445;}
+.cm-s-base16-light span.cm-error {background: #ac4142; color: #505050;}
+.cm-s-base16-light span.cm-bracket {color: #202020;}
+.cm-s-base16-light span.cm-tag {color: #ac4142;}
+.cm-s-base16-light span.cm-link {color: #aa759f;}
+
+.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
new file mode 100644
index 0000000000..3aa84cc829
--- /dev/null
+++ b/theme/tomorrow-night-eighties.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       Tomorrow Night - Eighties
+    Author:     Chris Kempson
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-tomorrownight-eighties-night.CodeMirror {background: #000000; color: #CCCCCC;}
+.cm-s-tomorrownight-eighties-night div.CodeMirror-selected {background: #2D2D2D !important;}
+.cm-s-tomorrownight-eighties-night .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-tomorrownight-eighties-night .CodeMirror-linenumber {color: #515151;}
+.cm-s-tomorrownight-eighties-night .CodeMirror-cursor {border-left: 1px solid #6A6A6A !important;}
+
+.cm-s-tomorrownight-eighties-night span.cm-comment {color: #d27b53;}
+.cm-s-tomorrownight-eighties-night span.cm-atom {color: #a16a94;}
+.cm-s-tomorrownight-eighties-night span.cm-number {color: #a16a94;}
+
+.cm-s-tomorrownight-eighties-night span.cm-property, .cm-s-tomorrownight-eighties-night span.cm-attribute {color: #99cc99;}
+.cm-s-tomorrownight-eighties-night span.cm-keyword {color: #f2777a;}
+.cm-s-tomorrownight-eighties-night span.cm-string {color: #ffcc66;}
+
+.cm-s-tomorrownight-eighties-night span.cm-variable {color: #99cc99;}
+.cm-s-tomorrownight-eighties-night span.cm-variable-2 {color: #6699cc;}
+.cm-s-tomorrownight-eighties-night span.cm-def {color: #f99157;}
+.cm-s-tomorrownight-eighties-night span.cm-error {background: #f2777a; color: #6A6A6A;}
+.cm-s-tomorrownight-eighties-night span.cm-bracket {color: #CCCCCC;}
+.cm-s-tomorrownight-eighties-night span.cm-tag {color: #f2777a;}
+.cm-s-tomorrownight-eighties-night span.cm-link {color: #a16a94;}
+
+.cm-s-tomorrownight-eighties-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

From 23c845ce7cd3f13cf660caa934acd12b7e70b86c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 08:13:13 +0200
Subject: [PATCH 0285/4742] [base16 themes] Integrate

---
 demo/theme.html                   | 10 +++++++
 theme/tomorrow-night-eighties.css | 46 +++++++++++++++----------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/demo/theme.html b/demo/theme.html
index 147a89ff14..62544be1a7 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -22,6 +22,11 @@
     <link rel="stylesheet" href="../theme/solarized.css">
     <link rel="stylesheet" href="../theme/twilight.css">
     <link rel="stylesheet" href="../theme/midnight.css">
+    <link rel="stylesheet" href="../theme/3024-day.css">
+    <link rel="stylesheet" href="../theme/3024-night.css">
+    <link rel="stylesheet" href="../theme/base16-light.css">
+    <link rel="stylesheet" href="../theme/base16-dark.css">
+    <link rel="stylesheet" href="../theme/tomorrow-night-eighties.css">
     <script src="../mode/javascript/javascript.js"></script>
     <script src="../keymap/extra.js"></script>
     <link rel="stylesheet" href="../doc/docs.css">
@@ -49,7 +54,11 @@ <h1>CodeMirror: Theme demo</h1>
 
 <p>Select a theme: <select onchange="selectTheme()" id=select>
     <option selected>default</option>
+    <option>3024-day</option>
+    <option>3024-night</option>
     <option>ambiance</option>
+    <option>base16-dark</option>
+    <option>base16-light</option>
     <option>blackboard</option>
     <option>cobalt</option>
     <option>eclipse</option>
@@ -63,6 +72,7 @@ <h1>CodeMirror: Theme demo</h1>
     <option>rubyblue</option>
     <option>solarized dark</option>
     <option>solarized light</option>
+    <option>tomorrow-night-eighties</option>
     <option>twilight</option>
     <option>vibrant-ink</option>
     <option>xq-dark</option>
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index 3aa84cc829..d682120c74 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -8,26 +8,26 @@
 
 */
 
-.cm-s-tomorrownight-eighties-night.CodeMirror {background: #000000; color: #CCCCCC;}
-.cm-s-tomorrownight-eighties-night div.CodeMirror-selected {background: #2D2D2D !important;}
-.cm-s-tomorrownight-eighties-night .CodeMirror-gutters {background: #000000; border-right: 0px;}
-.cm-s-tomorrownight-eighties-night .CodeMirror-linenumber {color: #515151;}
-.cm-s-tomorrownight-eighties-night .CodeMirror-cursor {border-left: 1px solid #6A6A6A !important;}
-
-.cm-s-tomorrownight-eighties-night span.cm-comment {color: #d27b53;}
-.cm-s-tomorrownight-eighties-night span.cm-atom {color: #a16a94;}
-.cm-s-tomorrownight-eighties-night span.cm-number {color: #a16a94;}
-
-.cm-s-tomorrownight-eighties-night span.cm-property, .cm-s-tomorrownight-eighties-night span.cm-attribute {color: #99cc99;}
-.cm-s-tomorrownight-eighties-night span.cm-keyword {color: #f2777a;}
-.cm-s-tomorrownight-eighties-night span.cm-string {color: #ffcc66;}
-
-.cm-s-tomorrownight-eighties-night span.cm-variable {color: #99cc99;}
-.cm-s-tomorrownight-eighties-night span.cm-variable-2 {color: #6699cc;}
-.cm-s-tomorrownight-eighties-night span.cm-def {color: #f99157;}
-.cm-s-tomorrownight-eighties-night span.cm-error {background: #f2777a; color: #6A6A6A;}
-.cm-s-tomorrownight-eighties-night span.cm-bracket {color: #CCCCCC;}
-.cm-s-tomorrownight-eighties-night span.cm-tag {color: #f2777a;}
-.cm-s-tomorrownight-eighties-night span.cm-link {color: #a16a94;}
-
-.cm-s-tomorrownight-eighties-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-tomorrow-night-eighties.CodeMirror {background: #000000; color: #CCCCCC;}
+.cm-s-tomorrow-night-eighties div.CodeMirror-selected {background: #2D2D2D !important;}
+.cm-s-tomorrow-night-eighties .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-tomorrow-night-eighties .CodeMirror-linenumber {color: #515151;}
+.cm-s-tomorrow-night-eighties .CodeMirror-cursor {border-left: 1px solid #6A6A6A !important;}
+
+.cm-s-tomorrow-night-eighties span.cm-comment {color: #d27b53;}
+.cm-s-tomorrow-night-eighties span.cm-atom {color: #a16a94;}
+.cm-s-tomorrow-night-eighties span.cm-number {color: #a16a94;}
+
+.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute {color: #99cc99;}
+.cm-s-tomorrow-night-eighties span.cm-keyword {color: #f2777a;}
+.cm-s-tomorrow-night-eighties span.cm-string {color: #ffcc66;}
+
+.cm-s-tomorrow-night-eighties span.cm-variable {color: #99cc99;}
+.cm-s-tomorrow-night-eighties span.cm-variable-2 {color: #6699cc;}
+.cm-s-tomorrow-night-eighties span.cm-def {color: #f99157;}
+.cm-s-tomorrow-night-eighties span.cm-error {background: #f2777a; color: #6A6A6A;}
+.cm-s-tomorrow-night-eighties span.cm-bracket {color: #CCCCCC;}
+.cm-s-tomorrow-night-eighties span.cm-tag {color: #f2777a;}
+.cm-s-tomorrow-night-eighties span.cm-link {color: #a16a94;}
+
+.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

From c8f59c0410a3e2720e465740f26281a842f03f47 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 08:25:04 +0200
Subject: [PATCH 0286/4742] [foldcode addon] Make sure unfold event is always
 fired

Also adds parameters to a range's clear event.

Issue #1678
Issue #1679
---
 addon/fold/foldcode.js | 7 ++++---
 doc/manual.html        | 8 +++++---
 lib/codemirror.js      | 5 ++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 69513cb8bb..931c3726cc 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -16,9 +16,7 @@
         if (marks[i].__isFold) {
           if (!allowFolded) return null;
           range.cleared = true;
-          var found = marks[i].find();
           marks[i].clear();
-          CodeMirror.signal(cm, "unfold", cm, found.from, found.to);
         }
       }
       return range;
@@ -32,12 +30,15 @@
     if (!range || range.cleared) return;
 
     var myWidget = makeWidget(options);
-    CodeMirror.on(myWidget, "mousedown", function() {myRange.clear();});
+    CodeMirror.on(myWidget, "mousedown", function() { myRange.clear(); });
     var myRange = cm.markText(range.from, range.to, {
       replacedWith: myWidget,
       clearOnEnter: true,
       __isFold: true
     });
+    myRange.on("clear", function(from, to) {
+      CodeMirror.signal(cm, "unfold", cm, from, to);
+    });
     CodeMirror.signal(cm, "fold", cm, range.from, range.to);
   }
 
diff --git a/doc/manual.html b/doc/manual.html
index 55f7196aaf..9cba32dea9 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -555,14 +555,16 @@ <h2 id="events">Events</h2>
       event handler, the editor state may be inspected
       but <em>not</em> modified, with the exception that the range on
       which the event fires may be cleared.</dd>
-      <dt id="event_clear"><code><strong>"clear"</strong> ()</code></dt>
+      <dt id="event_clear"><code><strong>"clear"</strong> (from: {line, ch}, to: {line, ch})</code></dt>
       <dd>Fired when the range is cleared, either through cursor
       movement in combination
       with <a href="#mark_clearOnEnter"><code>clearOnEnter</code></a>
       or through a call to its <code>clear()</code> method. Will only
       be fired once per handle. Note that deleting the range through
-      text editing does not fire this event, because an undo
-      action might bring the range back into existence.</dd>
+      text editing does not fire this event, because an undo action
+      might bring the range back into existence. <code>from</code>
+      and <code>to</code> give the part of the document that the range
+      spanned when it was cleared.</dd>
       <dt id="event_hide"><code><strong>"hide"</strong> ()</code></dt>
       <dd>Fired when the last part of the marker is removed from the
       document by editing operations.</dd>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index aed7e83b13..75d9c1f2e6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3666,6 +3666,10 @@ window.CodeMirror = (function() {
     if (this.explicitlyCleared) return;
     var cm = this.doc.cm, withOp = cm && !cm.curOp;
     if (withOp) startOperation(cm);
+    if (hasHandler(this, "clear")) {
+      var found = this.find();
+      if (found) signalLater(this, "clear", found.from, found.to);
+    }
     var min = null, max = null;
     for (var i = 0; i < this.lines.length; ++i) {
       var line = this.lines[i];
@@ -3694,7 +3698,6 @@ window.CodeMirror = (function() {
       if (cm) reCheckSelection(cm);
     }
     if (withOp) endOperation(cm);
-    signalLater(this, "clear");
   };
 
   TextMarker.prototype.find = function() {

From c24f3ab7dc3dfb883422df61cbe584a37bc82d6f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 09:10:41 +0200
Subject: [PATCH 0287/4742] Do less work in setSize

Issue #1682
---
 lib/codemirror.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 75d9c1f2e6..81d768bf6a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3115,14 +3115,16 @@ window.CodeMirror = (function() {
       updateScrollPos(this, sPos.scrollLeft, sPos.scrollTop);
     }),
 
-    setSize: function(width, height) {
+    setSize: operation(null, function(width, height) {
       function interpret(val) {
         return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
       }
       if (width != null) this.display.wrapper.style.width = interpret(width);
       if (height != null) this.display.wrapper.style.height = interpret(height);
-      this.refresh();
-    },
+      if (this.options.lineWrapping)
+        cm.display.measureLineCache.length = cm.display.measureLineCachePos = 0;
+      regChange(this);
+    }),
 
     operation: function(f){return runInOp(this, f);},
 

From c0e92660b5d7ea0d272d0e715502f86fd20d1689 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 09:29:16 +0200
Subject: [PATCH 0288/4742] Add a cleaner way to force a display update without
 changed lines

Issue #1682
---
 lib/codemirror.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 81d768bf6a..948d2b7df0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -494,6 +494,7 @@ window.CodeMirror = (function() {
       else intactLines += range.to - range.from;
     }
     if (intactLines == to - from && from == display.showingFrom && to == display.showingTo) {
+      updateHeightsInViewport(cm);
       updateViewOffset(cm);
       return;
     }
@@ -518,6 +519,14 @@ window.CodeMirror = (function() {
     }
     display.showingFrom = from; display.showingTo = to;
 
+    updateHeightsInViewport(cm);
+    updateViewOffset(cm);
+
+    return true;
+  }
+
+  function updateHeightsInViewport(cm) {
+    var display = cm.display;
     var prevBottom = display.lineDiv.offsetTop;
     for (var node = display.lineDiv.firstChild, height; node; node = node.nextSibling) if (node.lineObj) {
       if (ie_lt8) {
@@ -537,9 +546,6 @@ window.CodeMirror = (function() {
           widgets[i].height = widgets[i].node.offsetHeight;
       }
     }
-    updateViewOffset(cm);
-
-    return true;
   }
 
   function updateViewOffset(cm) {
@@ -1304,6 +1310,7 @@ window.CodeMirror = (function() {
       // An array of ranges of lines that have to be updated. See
       // updateDisplay.
       changes: [],
+      forceUpdate: false,
       updateInput: null,
       userSelChange: null,
       textChanged: null,
@@ -1336,7 +1343,7 @@ window.CodeMirror = (function() {
       var coords = cursorCoords(cm, doc.sel.head);
       newScrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);
     }
-    if (op.changes.length || newScrollPos && newScrollPos.scrollTop != null) {
+    if (op.changes.length || op.forceUpdate || newScrollPos && newScrollPos.scrollTop != null) {
       updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop);
       if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
     }
@@ -3123,7 +3130,7 @@ window.CodeMirror = (function() {
       if (height != null) this.display.wrapper.style.height = interpret(height);
       if (this.options.lineWrapping)
         cm.display.measureLineCache.length = cm.display.measureLineCachePos = 0;
-      regChange(this);
+      this.curOp.forceUpdate = true;
     }),
 
     operation: function(f){return runInOp(this, f);},

From bc57892b5e20204d8c797d68942456d1f4c5b0b2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 09:55:49 +0200
Subject: [PATCH 0289/4742] [python mode] Fix bug in handling of lambda

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

diff --git a/mode/python/python.js b/mode/python/python.js
index 2c6d1d83c7..4fe4d28912 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -324,7 +324,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
 
             state.lastToken = style;
 
-            if (stream.eol() && stream.lambda) {
+            if (stream.eol() && state.lambda) {
                 state.lambda = false;
             }
 

From d59e2ae4e56b6279bbde82e5618e8013910c27b8 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@chromium.org>
Date: Thu, 18 Jul 2013 10:00:42 +0400
Subject: [PATCH 0290/4742] When pasting on Webkit, add a nonsense character to
 work around browser bug

Issue #1474
---
 lib/codemirror.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 948d2b7df0..2032b254c5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1447,6 +1447,8 @@ window.CodeMirror = (function() {
       resetInput(cm, true);
       return false;
     }
+    if (cm.state.pasteIncoming && cm.state.fakedLastChar)
+      text = text.substring(0, text.length - 1);
 
     var withOp = !cm.curOp;
     if (withOp) startOperation(cm);
@@ -1593,6 +1595,18 @@ window.CodeMirror = (function() {
       fastPoll(cm);
     });
     on(d.input, "paste", function() {
+      // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
+      // Add a char to the end of textarea before paste occur so that
+      // selection doesn't span to the end of textarea.
+      if (webkit) {
+        var start = d.input.selectionStart, end = d.input.selectionEnd;
+        d.input.value += "$";
+        d.input.selectionStart = start;
+        d.input.selectionEnd = end;
+        cm.state.fakedLastChar = true;
+      } else {
+        cm.state.fakedLastChar = false;
+      }
       cm.state.pasteIncoming = true;
       fastPoll(cm);
     });

From 34f0fa8679e0c098c359ec346a602e7654c5a337 Mon Sep 17 00:00:00 2001
From: CodeAnimal <codeanimal@outlook.com>
Date: Fri, 19 Jul 2013 11:21:52 +0100
Subject: [PATCH 0291/4742] [vbscript mode] Total rewrite

Issue #1684
---
 mode/vbscript/index.html  |   3 +-
 mode/vbscript/vbscript.js | 352 +++++++++++++++++++++++++++++++++++---
 2 files changed, 332 insertions(+), 23 deletions(-)

diff --git a/mode/vbscript/index.html b/mode/vbscript/index.html
index 8c86f9ef94..9ae46676b2 100644
--- a/mode/vbscript/index.html
+++ b/mode/vbscript/index.html
@@ -32,7 +32,8 @@ <h1>CodeMirror: VBScript mode</h1>
 
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true
+        lineNumbers: true,
+        indentUnit: 4
       });
     </script>
 
diff --git a/mode/vbscript/vbscript.js b/mode/vbscript/vbscript.js
index 3e1eedc7db..0a97fb6405 100644
--- a/mode/vbscript/vbscript.js
+++ b/mode/vbscript/vbscript.js
@@ -1,26 +1,334 @@
-CodeMirror.defineMode("vbscript", function() {
-  var regexVBScriptKeyword = /^(?:Call|Case|CDate|Clear|CInt|CLng|Const|CStr|Description|Dim|Do|Each|Else|ElseIf|End|Err|Error|Exit|False|For|Function|If|LCase|Loop|LTrim|Next|Nothing|Now|Number|On|Preserve|Quit|ReDim|Resume|RTrim|Select|Set|Sub|Then|To|Trim|True|UBound|UCase|Until|VbCr|VbCrLf|VbLf|VbTab)$/im;
-
-  return {
-    token: function(stream) {
-      if (stream.eatSpace()) return null;
-      var ch = stream.next();
-      if (ch == "'") {
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (ch == '"') {
-        stream.skipTo('"');
-        return "string";
-      }
-
-      if (/\w/.test(ch)) {
-        stream.eatWhile(/\w/);
-        if (regexVBScriptKeyword.test(stream.current())) return "keyword";
-      }
-      return null;
+/*
+For extra ASP classic objects, initialize CodeMirror instance with this option:
+    isASP: true
+
+E.G.:
+    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        isASP: true
+      });
+*/
+CodeMirror.defineMode("vbscript", function(conf, parserConf) {
+    var ERRORCLASS = 'error';
+
+    function wordRegexp(words) {
+        return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+    }
+
+    var singleOperators = new RegExp("^[\\+\\-\\*/&\\\\\\^<>=]");
+    var doubleOperators = new RegExp("^((<>)|(<=)|(>=))");
+    var singleDelimiters = new RegExp('^[\\.,]');
+    var brakets = new RegExp('^[\\(\\)]');
+    var identifiers = new RegExp("^[A-Za-z][_A-Za-z0-9]*");
+
+    var openingKeywords = ['class','sub','select','while','if','function', 'property', 'with', 'for'];
+    var middleKeywords = ['else','elseif','case'];
+    var endKeywords = ['next','loop','wend'];
+
+    var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'is', 'mod', 'eqv', 'imp']);
+    var commonkeywords = ['dim', 'redim', 'then',  'until', 'randomize',
+                          'byval','byref','new','property', 'exit', 'in',
+                          'const','private', 'public',
+                          'get','set','let', 'stop', 'on error resume next', 'on error goto 0', 'option explicit', 'call', 'me'];
+
+    //This list was from: http://msdn.microsoft.com/en-us/library/f8tbc79x(v=vs.84).aspx
+    var atomWords = ['true', 'false', 'nothing', 'empty', 'null'];
+    //This list was from: http://msdn.microsoft.com/en-us/library/3ca8tfek(v=vs.84).aspx
+    var builtinFuncsWords = ['abs', 'array', 'asc', 'atn', 'cbool', 'cbyte', 'ccur', 'cdate', 'cdbl', 'chr', 'cint', 'clng', 'cos', 'csng', 'cstr', 'date', 'dateadd', 'datediff', 'datepart',
+                        'dateserial', 'datevalue', 'day', 'escape', 'eval', 'execute', 'exp', 'filter', 'formatcurrency', 'formatdatetime', 'formatnumber', 'formatpercent', 'getlocale', 'getobject',
+                        'getref', 'hex', 'hour', 'inputbox', 'instr', 'instrrev', 'int', 'fix', 'isarray', 'isdate', 'isempty', 'isnull', 'isnumeric', 'isobject', 'join', 'lbound', 'lcase', 'left',
+                        'len', 'loadpicture', 'log', 'ltrim', 'rtrim', 'trim', 'maths', 'mid', 'minute', 'month', 'monthname', 'msgbox', 'now', 'oct', 'replace', 'rgb', 'right', 'rnd', 'round',
+                        'scriptengine', 'scriptenginebuildversion', 'scriptenginemajorversion', 'scriptengineminorversion', 'second', 'setlocale', 'sgn', 'sin', 'space', 'split', 'sqr', 'strcomp',
+                        'string', 'strreverse', 'tan', 'time', 'timer', 'timeserial', 'timevalue', 'typename', 'ubound', 'ucase', 'unescape', 'vartype', 'weekday', 'weekdayname', 'year'];
+
+    //This list was from: http://msdn.microsoft.com/en-us/library/ydz4cfk3(v=vs.84).aspx
+    var builtinConsts = ['vbBlack', 'vbRed', 'vbGreen', 'vbYellow', 'vbBlue', 'vbMagenta', 'vbCyan', 'vbWhite', 'vbBinaryCompare', 'vbTextCompare',
+                         'vbSunday', 'vbMonday', 'vbTuesday', 'vbWednesday', 'vbThursday', 'vbFriday', 'vbSaturday', 'vbUseSystemDayOfWeek', 'vbFirstJan1', 'vbFirstFourDays', 'vbFirstFullWeek',
+                         'vbGeneralDate', 'vbLongDate', 'vbShortDate', 'vbLongTime', 'vbShortTime', 'vbObjectError',
+                         'vbOKOnly', 'vbOKCancel', 'vbAbortRetryIgnore', 'vbYesNoCancel', 'vbYesNo', 'vbRetryCancel', 'vbCritical', 'vbQuestion', 'vbExclamation', 'vbInformation', 'vbDefaultButton1', 'vbDefaultButton2',
+                         'vbDefaultButton3', 'vbDefaultButton4', 'vbApplicationModal', 'vbSystemModal', 'vbOK', 'vbCancel', 'vbAbort', 'vbRetry', 'vbIgnore', 'vbYes', 'vbNo',
+                         'vbCr', 'VbCrLf', 'vbFormFeed', 'vbLf', 'vbNewLine', 'vbNullChar', 'vbNullString', 'vbTab', 'vbVerticalTab', 'vbUseDefault', 'vbTrue', 'vbFalse',
+                         'vbEmpty', 'vbNull', 'vbInteger', 'vbLong', 'vbSingle', 'vbDouble', 'vbCurrency', 'vbDate', 'vbString', 'vbObject', 'vbError', 'vbBoolean', 'vbVariant', 'vbDataObject', 'vbDecimal', 'vbByte', 'vbArray'];
+    //This list was from: http://msdn.microsoft.com/en-us/library/hkc375ea(v=vs.84).aspx
+    var builtinObjsWords = ['WScript', 'err', 'debug', 'RegExp'];
+    var knownProperties = ['description', 'firstindex', 'global', 'helpcontext', 'helpfile', 'ignorecase', 'length', 'number', 'pattern', 'source', 'value', 'count'];
+    var knownMethods = ['clear', 'execute', 'raise', 'replace', 'test', 'write', 'writeline', 'close', 'open', 'state', 'eof', 'update', 'addnew', 'end', 'createobject', 'quit'];
+
+    var aspBuiltinObjsWords = ['server', 'response', 'request', 'session', 'application'];
+    var aspKnownProperties = ['buffer', 'cachecontrol', 'charset', 'contenttype', 'expires', 'expiresabsolute', 'isclientconnected', 'pics', 'status', //response
+                              'clientcertificate', 'cookies', 'form', 'querystring', 'servervariables', 'totalbytes', //request
+                              'contents', 'staticobjects', //application
+                              'codepage', 'lcid', 'sessionid', 'timeout', //session
+                              'scripttimeout']; //server
+    var aspKnownMethods = ['addheader', 'appendtolog', 'binarywrite', 'end', 'flush', 'redirect', //response
+                           'binaryread', //request
+                           'remove', 'removeall', 'lock', 'unlock', //application
+                           'abandon', //session
+                           'getlasterror', 'htmlencode', 'mappath', 'transfer', 'urlencode']; //server
+
+    var knownWords = knownMethods.concat(knownProperties);
+
+    builtinObjsWords = builtinObjsWords.concat(builtinConsts);
+
+    if (conf.isASP){
+        builtinObjsWords = builtinObjsWords.concat(aspBuiltinObjsWords);
+        knownWords = knownWords.concat(aspKnownMethods, aspKnownProperties);
+    };
+
+    var keywords = wordRegexp(commonkeywords);
+    var atoms = wordRegexp(atomWords);
+    var builtinFuncs = wordRegexp(builtinFuncsWords);
+    var builtinObjs = wordRegexp(builtinObjsWords);
+    var known = wordRegexp(knownWords);
+    var stringPrefixes = '"';
+
+    var opening = wordRegexp(openingKeywords);
+    var middle = wordRegexp(middleKeywords);
+    var closing = wordRegexp(endKeywords);
+    var doubleClosing = wordRegexp(['end']);
+    var doOpening = wordRegexp(['do']);
+    var noIndentWords = wordRegexp(['on error resume next', 'exit']);
+    var comment = wordRegexp(['rem']);
+
+
+    function indent(_stream, state) {
+      state.currentIndent++;
+    }
+
+    function dedent(_stream, state) {
+      state.currentIndent--;
+    }
+    // tokenizers
+    function tokenBase(stream, state) {
+        if (stream.eatSpace()) {
+            return 'space';
+            //return null;
+        }
+
+        var ch = stream.peek();
+
+        // Handle Comments
+        if (ch === "'") {
+            stream.skipToEnd();
+            return 'comment';
+        }
+        if (stream.match(comment)){
+            stream.skipToEnd();
+            return 'comment';
+        }
+
+
+        // Handle Number Literals
+        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)
+            || stream.match(wordOperators)) {
+            return 'operator';
+        }
+        if (stream.match(singleDelimiters)) {
+            return null;
+        }
+
+        if (stream.match(brakets)) {
+            return "bracket";
+        }
+
+        if (stream.match(noIndentWords)) {
+            state.doInCurrentLine = true;
+
+            return 'keyword';
+        }
+
+        if (stream.match(doOpening)) {
+            indent(stream,state);
+            state.doInCurrentLine = true;
+
+            return 'keyword';
+        }
+        if (stream.match(opening)) {
+            if (! state.doInCurrentLine)
+              indent(stream,state);
+            else
+              state.doInCurrentLine = false;
+
+            return 'keyword';
+        }
+        if (stream.match(middle)) {
+            return 'keyword';
+        }
+
+
+        if (stream.match(doubleClosing)) {
+            dedent(stream,state);
+            dedent(stream,state);
+
+            return 'keyword';
+        }
+        if (stream.match(closing)) {
+            if (! state.doInCurrentLine)
+              dedent(stream,state);
+            else
+              state.doInCurrentLine = false;
+
+            return 'keyword';
+        }
+
+        if (stream.match(keywords)) {
+            return 'keyword';
+        }
+
+        if (stream.match(atoms)) {
+            return 'atom';
+        }
+
+        if (stream.match(known)) {
+            return 'variable-2';
+        }
+
+        if (stream.match(builtinFuncs)) {
+            return 'builtin';
+        }
+
+        if (stream.match(builtinObjs)){
+            return 'variable-2';
+        }
+
+        if (stream.match(identifiers)) {
+            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;
+        };
+    }
+
+
+    function tokenLexer(stream, state) {
+        var style = state.tokenize(stream, state);
+        var current = stream.current();
+
+        // Handle '.' connected identifiers
+        if (current === '.') {
+            style = state.tokenize(stream, state);
+
+            current = stream.current();
+            if (style.substr(0, 8) === 'variable' || style==='builtin' || style==='keyword'){//|| knownWords.indexOf(current.substring(1)) > -1) {
+                if (style === 'builtin' || style === 'keyword') style='variable';
+                if (knownWords.indexOf(current.substr(1)) > -1) style='variable-2';
+
+                return style;
+            } else {
+                return ERRORCLASS;
+            }
+        }
+
+        return style;
+    }
+
+    var external = {
+        electricChars:"dDpPtTfFeE ",
+        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;
+
+            return style;
+        },
+
+        indent: function(state, textAfter) {
+            var trueText = textAfter.replace(/^\s+|\s+$/g, '') ;
+            if (trueText.match(closing) || trueText.match(doubleClosing) || 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/vbscript", "vbscript");

From cff9b62d1371c4d4b839fbb0a10ab90847195ac6 Mon Sep 17 00:00:00 2001
From: sathyamoorthi <sathyamoorthi10@gmail.com>
Date: Sat, 20 Jul 2013 10:45:48 +0530
Subject: [PATCH 0292/4742] Small condition change in findMatchingTag.

---
 addon/fold/xml-fold.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index b87da9088c..88a107c4a2 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -140,7 +140,7 @@
 
   CodeMirror.findMatchingTag = function(cm, pos, range) {
     var iter = new Iter(cm, pos.line, pos.ch, range);
-    if (!tagAt(iter, iter.ch)) return;
+    if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
     var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
     var start = end && toTagStart(iter);
     if (!end || end == "selfClose" || !start || cmp(iter, pos) > 0) return;

From 4a9a24a054fc589ebef6e6e7c1e9c7abfb2bb215 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 10:17:08 +0200
Subject: [PATCH 0293/4742] [real-world uses] Add Marklight editor

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 9aca75a75d..c813e10f3c 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -75,6 +75,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <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://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light Table</a> (experimental IDE)</li>
+      <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>
       <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
       <li><a href="http://www.iunbug.com/mihtool">MIHTool</a> (iOS web-app debugging tool)</li>
       <li><a href="http://mongo-mapreduce-webbrowser.opensagres.cloudbees.net/">Mongo MapReduce WebBrowser</a></li>

From 5d479e2dc5b4a08d1ebfc3ebd1f177fde8bd5663 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 21 Jul 2013 16:34:14 -0400
Subject: [PATCH 0294/4742] [vim] Fix for ~ movement

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

diff --git a/keymap/vim.js b/keymap/vim.js
index ab7f757b1e..8db2767a9e 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -233,7 +233,8 @@
         operator: 'change',
         motion: 'moveToEol', motionArgs: { inclusive: true },
         operatorMotionArgs: { visualLine: true }},
-    { keys: ['~'], type: 'operatorMotion', operator: 'swapcase',
+    { keys: ['~'], type: 'operatorMotion',
+        operator: 'swapcase', operatorArgs: { shouldMoveCursor: true },
         motion: 'moveByCharacters', motionArgs: { forward: true }},
     // Actions
     { keys: ['<C-i>'], type: 'action', action: 'jumpListWalk',
@@ -1551,7 +1552,7 @@
         cm.setCursor(curStart);
         cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
       },
-      swapcase: function(cm, _operatorArgs, _vim, curStart, curEnd, curOriginal) {
+      swapcase: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
         var toSwap = cm.getRange(curStart, curEnd);
         var swapped = '';
         for (var i = 0; i < toSwap.length; i++) {
@@ -1560,7 +1561,9 @@
               character.toUpperCase();
         }
         cm.replaceRange(swapped, curStart, curEnd);
-        cm.setCursor(curOriginal);
+        if (!operatorArgs.shouldMoveCursor) {
+          cm.setCursor(curOriginal);
+        }
       },
       yank: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
         vimGlobalState.registerController.pushText(
diff --git a/test/vim_test.js b/test/vim_test.js
index 0e88243215..ec0fae06c0 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1023,6 +1023,11 @@ testVim('Y', function(cm, vim, helpers) {
   is(!register.linewise);
   helpers.assertCursorAt(0, 3);
 }, { value: ' word1\nword2\n word3' });
+testVim('~', function(cm, vim, helpers) {
+  helpers.doKeys('3', '~');
+  eq('ABCdefg', cm.getValue());
+  helpers.assertCursorAt(0, 3);
+}, { value: 'abcdefg' });
 
 // Action tests
 testVim('ctrl-a', function(cm, vim, helpers) {

From 5d61ed16134cb813df1d9b829aca2bbd884ff9b6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 11:20:26 +0200
Subject: [PATCH 0295/4742] [tern addon] Fetch urls for completion items

Closes #1691
---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 9155924018..42225a2944 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -163,7 +163,7 @@
   // Completion
 
   function hint(ts, cm, c) {
-    ts.request(cm, {type: "completions", types: true, docs: true}, function(error, data) {
+    ts.request(cm, {type: "completions", types: true, docs: true, urls: true}, function(error, data) {
       if (error) return showError(ts, cm, error);
       var completions = [], after = "";
       var from = data.start, to = data.end;

From 88a86282dbb75892a24cb523b7c2997714682aff Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 11:21:35 +0200
Subject: [PATCH 0296/4742] [manual] Clarify show-hint addon docs

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

diff --git a/doc/manual.html b/doc/manual.html
index 9cba32dea9..ef4bc0ff09 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1876,8 +1876,8 @@ <h2 id="addons">Addons</h2>
       a <code>{list, from, to}</code> object, where <code>list</code>
       is an array of strings or objects (the completions),
       and <code>from</code> and <code>to</code> give the start and end
-      of the token that is being completed. If no hinting function is
-      given, the addon will try to
+      of the token that is being completed as <code>{line, ch}</code>
+      objects. If no hinting function is given, the addon will try to
       use <a href="#getHelper"><code>getHelper</code></a> with
       the <code>"hint"</code> type to find one. When completions
       aren't simple strings, they should be objects with the folowing

From 79a925d8149c8dd37e78927b36c478bdb5ac06fa Mon Sep 17 00:00:00 2001
From: Micah Dubinko <micah.dubinko@marklogic.com>
Date: Tue, 23 Jul 2013 11:31:42 -0700
Subject: [PATCH 0297/4742] [sparql mode] UNION keyword in SPARQL

UNION should be a keyword (like FILTER, et.al.) not an op
---
 mode/sparql/sparql.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 1168f23a52..0329057f69 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -6,11 +6,11 @@ CodeMirror.defineMode("sparql", function(config) {
     return new RegExp("^(?:" + words.join("|") + ")$", "i");
   }
   var ops = wordRegexp(["str", "lang", "langmatches", "datatype", "bound", "sameterm", "isiri", "isuri",
-                        "isblank", "isliteral", "union", "a"]);
+                        "isblank", "isliteral", "a"]);
   var keywords = wordRegexp(["base", "prefix", "select", "distinct", "reduced", "construct", "describe",
                              "ask", "from", "named", "where", "order", "limit", "offset", "filter", "optional",
                              "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group",
-                             "minus", "in", "not", "service", "silent", "using", "insert", "delete",
+                             "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union",
                              "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
   var operatorChars = /[*+\-<>=&|]/;
 

From 3ce30d12f03b8f885b8b3c4896281e1660c3bf94 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 11:55:59 +0200
Subject: [PATCH 0298/4742] [javascript mode] Fix bug in comma-less expression
 handling

Closes #1696
---
 mode/javascript/javascript.js | 11 ++++++-----
 mode/javascript/test.js       | 10 ++++++++++
 test/index.html               |  1 +
 test/mode_test.js             |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 mode/javascript/test.js

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 3d04603c28..0be9b79f7c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -299,14 +299,15 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   function maybeoperatorComma(type, value) {
     if (type == ",") return cont(expression);
-    return maybeoperatorNoComma(type, value, maybeoperatorComma);
+    return maybeoperatorNoComma(type, value, false);
   }
-  function maybeoperatorNoComma(type, value, me) {
-    if (!me) me = maybeoperatorNoComma;
+  function maybeoperatorNoComma(type, value, noComma) {
+    var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
+    var expr = noComma == false ? expression : expressionNoComma;
     if (type == "operator") {
       if (/\+\+|--/.test(value)) return cont(me);
-      if (value == "?") return cont(expression, expect(":"), expression);
-      return cont(expression);
+      if (value == "?") return cont(expression, expect(":"), expr);
+      return cont(expr);
     }
     if (type == ";") return;
     if (type == "(") return cont(pushlex(")", "call"), commasep(expressionNoComma, ")"), poplex, me);
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
new file mode 100644
index 0000000000..a2af527bee
--- /dev/null
+++ b/mode/javascript/test.js
@@ -0,0 +1,10 @@
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("locals",
+     "[keyword function] [variable foo]([def a], [def b]) { [keyword var] [def c] = [number 10]; [keyword return] [variable-2 a] + [variable-2 c] + [variable d]; }");
+
+  MT("comma-and-binop",
+     "[keyword function](){ [keyword var] [def x] = [number 1] + [number 2], [def y]; }");
+})();
diff --git a/test/index.html b/test/index.html
index 4a827e643a..5ead383a1d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -60,6 +60,7 @@ <h1>CodeMirror: Test Suite</h1>
     <script src="doc_test.js"></script>
     <script src="comment_test.js"></script>
     <script src="mode_test.js"></script>
+    <script src="../mode/javascript/test.js"></script>
     <script src="../mode/css/css.js"></script>
     <script src="../mode/css/test.js"></script>
     <script src="../mode/css/scss_test.js"></script>
diff --git a/test/mode_test.js b/test/mode_test.js
index c759b257bf..1439cab32c 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -184,7 +184,7 @@
     }
     s += '</tr><tr>';
     for (var i = 0; i < output.length; i += 2) {
-      s += '<td class="mt-style"><span>' + output[i] + '</span></td>';
+      s += '<td class="mt-style"><span>' + (output[i] || null) + '</span></td>';
     }
     s += '</table>';
     return s;

From 35f3cbcb617a83daef4ff318b99e097834a8c321 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 21 Jul 2013 23:03:32 -0400
Subject: [PATCH 0299/4742] [css mode] Fix @media styling and indentation

Closes #1657
---
 mode/css/css.js  | 31 +++++++++++++++++++++++--------
 mode/css/test.js | 13 +++++++++++++
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index a81fa40408..bdcd500868 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -252,7 +252,6 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
       // Push/pop context stack
       if (type == "{") {
         if (context == "@media" || context == "@mediaType") {
-          state.stack.pop();
           state.stack[state.stack.length-1] = "@media{";
         }
         else {
@@ -261,8 +260,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
         }
       }
       else if (type == "}") {
-        var lastState = state.stack[state.stack.length - 1];
-        if (lastState == "interpolation") style = "operator";
+        if (context == "interpolation") style = "operator";
         state.stack.pop();
         if (context == "propertyValue") state.stack.pop();
       }
@@ -270,20 +268,37 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
       else if (type == "@media") state.stack.push("@media");
       else if (type == "@import") state.stack.push("@import");
       else if (context == "@media" && /\b(keyword|attribute)\b/.test(style))
-        state.stack.push("@mediaType");
-      else if (context == "@mediaType" && stream.current() == ",") state.stack.pop();
-      else if (context == "@mediaType" && type == "(") state.stack.push("@mediaType(");
-      else if (context == "@mediaType(" && type == ")") state.stack.pop();
+        state.stack[state.stack.length-1] = "@mediaType";
+      else if (context == "@mediaType" && stream.current() == ",")
+        state.stack[state.stack.length-1] = "@media";
+      else if (type == "(") {
+        if (context == "@media" || context == "@mediaType") {
+          // Make sure @mediaType is used to avoid error on {
+          state.stack[state.stack.length-1] = "@mediaType";
+          state.stack.push("@mediaType(");
+        }
+      }
+      else if (type == ")") {
+        if (context == "propertyValue" && state.stack[state.stack.length-2] == "@mediaType(") {
+          // In @mediaType( without closing ; after propertyValue
+          state.stack.pop();
+          state.stack.pop();
+        }
+        else if (context == "@mediaType(") {
+          state.stack.pop();
+        }
+      }
       else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
       else if (context == "propertyValue" && type == ";") state.stack.pop();
       else if (context == "@import" && type == ";") state.stack.pop();
+
       return state.lastToken = style;
     },
 
     indent: function(state, textAfter) {
       var n = state.stack.length;
       if (/^\}/.test(textAfter))
-        n -= state.stack[state.stack.length-1] == "propertyValue" ? 2 : 1;
+        n -= state.stack[n-1] == "propertyValue" ? 2 : 1;
       return state.baseIndent + n * indentUnit;
     },
 
diff --git a/mode/css/test.js b/mode/css/test.js
index 97dd0a8a34..13fc04c1b3 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -15,6 +15,12 @@
   MT("atMediaCheckStack",
      "[def @media] [attribute screen] ([property color]) { } [tag foo] { }");
 
+  MT("atMediaPropertyOnly",
+     "[def @media] ([property color]) { } [tag foo] { }");
+
+  MT("atMediaCheckStackInvalidAttribute",
+     "[def @media] [attribute&error foobarhello] { [tag foo] { } }");
+
   MT("atMediaCheckStackInvalidAttribute",
      "[def @media] [attribute&error foobarhello] { } [tag foo] { }");
 
@@ -53,6 +59,10 @@
   MT("atMediaUnknownProperty",
      "[def @media] [attribute screen] [operator and] ([property&error foobarhello]) { }");
 
+  // Make sure nesting works with media queries
+  MT("atMediaMaxWidthNested",
+     "[def @media] [attribute screen] [operator and] ([property max-width][operator :] [number 25px]) { [tag foo] { } }");
+
   MT("tagSelector",
      "[tag foo] { }");
 
@@ -108,6 +118,9 @@
   MT("tagTwoProperties",
      "[tag foo] { [property margin][operator :] [number 0]; [property padding][operator :] [number 0]; }");
 
+  MT("tagTwoPropertiesURL",
+     "[tag foo] { [property background][operator :] [string-2 url]([string //example.com/foo.png]); [property padding][operator :] [number 0]; }");
+
   MT("commentSGML",
      "[comment <!--comment-->]");
 })();

From 8035f7e7dba0e4d2f0d351eddbf8f89a535dfdf5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 13:26:56 +0200
Subject: [PATCH 0300/4742] [ruby mode] Fix interpretation of %{ modifiers

Issue #1701
---
 mode/ruby/ruby.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index af0ffe9e54..96cdd5f9dd 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -36,11 +36,11 @@ CodeMirror.defineMode("ruby", function(config) {
     } else if (ch == "/" && !stream.eol() && stream.peek() != " ") {
       return chain(readQuoted(ch, "string-2", true), stream, state);
     } else if (ch == "%") {
-      var style = "string", embed = false;
+      var style = "string", embed = true;
       if (stream.eat("s")) style = "atom";
-      else if (stream.eat(/[WQ]/)) { style = "string"; embed = true; }
-      else if (stream.eat(/[r]/)) { style = "string-2"; embed = true; }
-      else if (stream.eat(/[wxq]/)) style = "string";
+      else if (stream.eat(/[WQ]/)) style = "string";
+      else if (stream.eat(/[r]/)) style = "string-2";
+      else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; }
       var delim = stream.eat(/[^\w\s]/);
       if (!delim) return "operator";
       if (matching.propertyIsEnumerable(delim)) delim = matching[delim];

From 1d2bda8225f19d82b4a6a42dcc0f029d15bd3084 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 15:53:17 +0200
Subject: [PATCH 0301/4742] [real-world uses] Add link to WebGL academy

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

diff --git a/doc/realworld.html b/doc/realworld.html
index c813e10f3c..d83554a8e4 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -106,6 +106,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
       <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a> (code viewer)</li>
+      <li><a href="http://www.webglacademy.com/">WebGL academy</a> (learning WebGL)</li>
       <li><a href="http://webglplayground.net/">WebGL playground</a></li>
       <li><a href="https://www.webkit.org/blog/2518/state-of-web-inspector/#source-code">WebKit Web inspector</a></li>
       <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>

From fd4743a05481a8fbc5533d6fa171e78c040c4f91 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jul 2013 18:57:21 +0200
Subject: [PATCH 0302/4742] [manual] Mention CodeMirror.signal

Closes #1698
---
 doc/manual.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index ef4bc0ff09..06bd9c7ae2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -379,7 +379,9 @@ <h2 id="events">Events</h2>
     client code to react to various situations. Handlers for such
     events can be registed with the <a href="#on"><code>on</code></a>
     and <a href="#off"><code>off</code></a> methods on the objects
-    that the event fires on.</p>
+    that the event fires on. To fire your own events,
+    use <code>CodeMirror.signal(target, name, args...)</code>,
+    where <code>target</code> is a non-DOM-node object.</p>
 
     <p>An editor instance fires the following events.
     The <code>instance</code> argument always refers to the editor

From ce8d1e7cd073cce7fbbb0182608b4a03ef945f6f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Jul 2013 07:55:13 +0200
Subject: [PATCH 0303/4742] Revert "When pasting on Webkit, add a nonsense
 character to work around browser bug"

This reverts commit d59e2ae4e56b6279bbde82e5618e8013910c27b8.
---
 lib/codemirror.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2032b254c5..948d2b7df0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1447,8 +1447,6 @@ window.CodeMirror = (function() {
       resetInput(cm, true);
       return false;
     }
-    if (cm.state.pasteIncoming && cm.state.fakedLastChar)
-      text = text.substring(0, text.length - 1);
 
     var withOp = !cm.curOp;
     if (withOp) startOperation(cm);
@@ -1595,18 +1593,6 @@ window.CodeMirror = (function() {
       fastPoll(cm);
     });
     on(d.input, "paste", function() {
-      // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
-      // Add a char to the end of textarea before paste occur so that
-      // selection doesn't span to the end of textarea.
-      if (webkit) {
-        var start = d.input.selectionStart, end = d.input.selectionEnd;
-        d.input.value += "$";
-        d.input.selectionStart = start;
-        d.input.selectionEnd = end;
-        cm.state.fakedLastChar = true;
-      } else {
-        cm.state.fakedLastChar = false;
-      }
       cm.state.pasteIncoming = true;
       fastPoll(cm);
     });

From fce91cb04e386ea20e30ef9cf63d1e8637daa08f Mon Sep 17 00:00:00 2001
From: Maksym Taran <mtaran@google.com>
Date: Fri, 19 Jul 2013 16:42:01 -0700
Subject: [PATCH 0304/4742] [xml mode] Improved indentation for attributes and
 multi-line tags

Issue #1694
---
 mode/xml/xml.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 07db299039..84f34a2934 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -1,6 +1,7 @@
 CodeMirror.defineMode("xml", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
+  var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag || true;
 
   var Kludges = parserConfig.htmlMode ? {
     autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
@@ -111,6 +112,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       return "error";
     } else if (/[\'\"]/.test(ch)) {
       state.tokenize = inAttribute(ch);
+      state.stringStartCol = stream.column();
       return state.tokenize(stream, state);
     } else {
       stream.eatWhile(/[^\s\u00a0=<>\"\']/);
@@ -119,7 +121,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   }
 
   function inAttribute(quote) {
-    return function(stream, state) {
+    var closure = function(stream, state) {
       while (!stream.eol()) {
         if (stream.next() == quote) {
           state.tokenize = inTag;
@@ -128,6 +130,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       }
       return "string";
     };
+    closure.isInAttribute = true;
+    return closure;
   }
 
   function inBlock(style, terminator) {
@@ -299,10 +303,20 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
 
     indent: function(state, textAfter, fullLine) {
       var context = state.context;
+      // Indent multi-line strings (e.g. css).
+      if (state.tokenize.isInAttribute) {
+        return state.stringStartCol + 1;
+      }
       if ((state.tokenize != inTag && state.tokenize != inText) ||
           context && context.noIndent)
         return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
-      if (state.tagName) return state.tagStart + indentUnit * multilineTagIndentFactor;
+      // Indent the starts of attribute names.
+      if (state.tagName) {
+        if (multilineTagIndentPastTag)
+          return state.tagStart + state.tagName.length + 2;
+        else
+          return state.tagStart + indentUnit * multilineTagIndentFactor;
+      }
       if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
       if (context && /^<\//.test(textAfter))
         context = context.prev;

From d881293572559410cee3244f65cdc1cb176a9b42 Mon Sep 17 00:00:00 2001
From: Jason Johnston <jason+github@lojjic.com>
Date: Thu, 25 Jul 2013 12:53:22 -0600
Subject: [PATCH 0305/4742] [tern addon] Fix bug in findDoc method causing docs
 to get added with name of 'undefined'

The name var was getting clobbered in the initial for-in loop, so the
second loop would never be entered.
---
 addon/tern/tern.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 42225a2944..d1f82ff1fc 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -122,15 +122,15 @@
   }
 
   function findDoc(ts, doc, name) {
-    for (var name in ts.docs) {
-      var cur = ts.docs[name];
+    for (var n in ts.docs) {
+      var cur = ts.docs[n];
       if (cur.doc == doc) return cur;
     }
     if (!name) for (var i = 0;; ++i) {
-      var n = "[doc" + (i || "") + "]";
+      n = "[doc" + (i || "") + "]";
       if (!ts.docs[n]) { name = n; break; }
     }
-    return ts.addDoc(n, doc);
+    return ts.addDoc(name, doc);
   }
 
   function trackChange(ts, doc, change) {

From c61a604b141ffd1dc9c578656447abff55fdaa5f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Jul 2013 08:14:33 +0200
Subject: [PATCH 0306/4742] Allow DOM events to be ignored by setting
 codemirrorIgnore

Issue #1681
---
 doc/manual.html   | 3 ++-
 lib/codemirror.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 06bd9c7ae2..dc4100f70b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -496,7 +496,8 @@ <h2 id="events">Events</h2>
       <strong>"dragover"</strong>, <strong>"drop"</strong>
       (instance: CodeMirror, event: Event)</code></dt>
       <dd>Fired when CodeMirror is handling a DOM event of this type.
-      You can <code>preventDefault</code> the event to signal that
+      You can <code>preventDefault</code> the event, or give it a
+      truthy <code>codemirrorIgnore</code> property, to signal that
       CodeMirror should do no further handling.</dd>
     </dl>
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 948d2b7df0..a95f0aba62 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5251,7 +5251,7 @@ window.CodeMirror = (function() {
 
   function signalDOMEvent(cm, e, override) {
     signal(cm, override || e.type, cm, e);
-    return e_defaultPrevented(e);
+    return e_defaultPrevented(e) || e.codemirrorIgnore;
   }
 
   function fireDelayed() {

From 1abab8cccc0ba36418c08d9c47f8b275ec380abd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Jul 2013 08:27:32 +0200
Subject: [PATCH 0307/4742] Propagate forceUpdate to updateDisplayInner, never
 bail when true

This makes sure that when a DOM element changed size, we propagate
that change properly.
---
 lib/codemirror.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a95f0aba62..104a2d71b9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -401,11 +401,12 @@ window.CodeMirror = (function() {
 
   // DISPLAY DRAWING
 
-  function updateDisplay(cm, changes, viewPort) {
+  function updateDisplay(cm, changes, viewPort, forced) {
     var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
     for (;;) {
-      if (!updateDisplayInner(cm, changes, visible)) break;
+      if (!updateDisplayInner(cm, changes, visible, forced)) break;
+      forced = false;
       updated = true;
       updateSelection(cm);
       updateScrollbars(cm);
@@ -431,7 +432,7 @@ window.CodeMirror = (function() {
   // Uses a set of changes plus the current scroll position to
   // determine which DOM updates have to be made, and makes the
   // updates.
-  function updateDisplayInner(cm, changes, visible) {
+  function updateDisplayInner(cm, changes, visible, forced) {
     var display = cm.display, doc = cm.doc;
     if (!display.wrapper.clientWidth) {
       display.showingFrom = display.showingTo = doc.first;
@@ -440,7 +441,7 @@ window.CodeMirror = (function() {
     }
 
     // Bail out if the visible area is already rendered and nothing changed.
-    if (changes.length == 0 &&
+    if (!forced && changes.length == 0 &&
         visible.from > display.showingFrom && visible.to < display.showingTo)
       return;
 
@@ -493,8 +494,7 @@ window.CodeMirror = (function() {
       if (range.from >= range.to) intact.splice(i--, 1);
       else intactLines += range.to - range.from;
     }
-    if (intactLines == to - from && from == display.showingFrom && to == display.showingTo) {
-      updateHeightsInViewport(cm);
+    if (!forced && intactLines == to - from && from == display.showingFrom && to == display.showingTo) {
       updateViewOffset(cm);
       return;
     }
@@ -1344,7 +1344,7 @@ window.CodeMirror = (function() {
       newScrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);
     }
     if (op.changes.length || op.forceUpdate || newScrollPos && newScrollPos.scrollTop != null) {
-      updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop);
+      updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop, op.forceUpdate);
       if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
     }
     if (!updated && op.selectionChanged) updateSelection(cm);
@@ -3734,7 +3734,9 @@ window.CodeMirror = (function() {
         if (node.offsetHeight != line.height) updateLineHeight(line, node.offsetHeight);
         break;
       }
-      runInOp(cm, function() { cm.curOp.selectionChanged = true; });
+      runInOp(cm, function() {
+        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
+      });
     }
   };
 

From 739cd13a3fd7a9b7ea021e4f129c02bfa90a6f21 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Jul 2013 08:34:40 +0200
Subject: [PATCH 0308/4742] Add a test for marker.changed scrollbar updating

---
 test/test.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/test.js b/test/test.js
index 641818484d..67b25d00e7 100644
--- a/test/test.js
+++ b/test/test.js
@@ -841,6 +841,17 @@ testCM("wrappingInlineWidget", function(cm) {
   eq(curR.bottom, cur1.bottom);
 }, {value: "1 2 3 xxx 4", lineWrapping: true});
 
+testCM("changedInlineWidget", function(cm) {
+  cm.setSize("10em");
+  var w = document.createElement("span");
+  w.innerHTML = "x";
+  var m = cm.markText(Pos(0, 4), Pos(0, 5), {replacedWith: w});
+  w.innerHTML = "and now the widget is really really long all of a sudden and a scrollbar is needed";
+  m.changed();
+  var hScroll = byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0];
+  is(hScroll.scrollWidth > hScroll.clientWidth);
+}, {value: "hello there"});
+
 testCM("inlineWidget", function(cm) {
   var w = cm.setBookmark(Pos(0, 2), {widget: document.createTextNode("uu")});
   cm.setCursor(0, 2);

From 0e28012c6dc0c2db7e01f082942304b2274b3eff Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Jul 2013 10:04:47 +0200
Subject: [PATCH 0309/4742] [show-hint addon] Fix problem with events being
 fired on the wrong data object

Issue marijnh/tern#200
---
 addon/hint/show-hint.js | 6 ++++--
 addon/tern/tern.js      | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 5a34f552f7..300f68831d 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -27,10 +27,10 @@
   Completion.prototype = {
     close: function() {
       if (!this.active()) return;
+      this.cm.state.completionActive = null;
 
       if (this.widget) this.widget.close();
       if (this.onClose) this.onClose();
-      this.cm.state.completionActive = null;
       CodeMirror.signal(this.cm, "endCompletion", this.cm);
     },
 
@@ -76,12 +76,14 @@
 
       function update() {
         if (isDone()) return;
+        CodeMirror.signal(data, "update");
         if (completion.options.async)
           completion.getHints(completion.cm, finishUpdate, completion.options);
         else
           finishUpdate(completion.getHints(completion.cm, completion.options));
       }
-      function finishUpdate(data) {
+      function finishUpdate(data_) {
+        data = data_;
         if (isDone()) return;
         if (!data || !data.list.length) return done();
         completion.widget.close();
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index d1f82ff1fc..1be5ba7f5d 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -183,6 +183,7 @@
       var obj = {from: from, to: to, list: completions};
       var tooltip = null;
       CodeMirror.on(obj, "close", function() { remove(tooltip); });
+      CodeMirror.on(obj, "update", function() { remove(tooltip); });
       CodeMirror.on(obj, "select", function(cur, node) {
         remove(tooltip);
         var content = ts.options.completionTip ? ts.options.completionTip(cur.data) : cur.data.doc;

From 36826c23c80b0fd54ea18573844fd61b10edf905 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Jul 2013 15:32:48 +0200
Subject: [PATCH 0310/4742] Don't treat Opera 15 as opera

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 104a2d71b9..c15dead2a4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -28,6 +28,7 @@ window.CodeMirror = (function() {
 
   var opera_version = opera && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
   if (opera_version) opera_version = Number(opera_version[1]);
+  if (opera_version && opera_version >= 15) { opera = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
   var flipCtrlCmd = mac && (qtwebkit || opera && (opera_version == null || opera_version < 12.11));
   var captureMiddleClick = gecko || (ie && !ie_lt9);

From ad333b64e4245dabfc4d25246e49269e663a6839 Mon Sep 17 00:00:00 2001
From: Drew Khoury <drew.khoury@gmail.com>
Date: Mon, 29 Jul 2013 13:22:29 +1000
Subject: [PATCH 0311/4742] [nginx mode] Add

---
 mode/nginx/index.html | 168 ++++++++++++++++++++++++++++++++++++++++++
 mode/nginx/nginx.js   | 162 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 330 insertions(+)
 create mode 100644 mode/nginx/index.html
 create mode 100644 mode/nginx/nginx.js

diff --git a/mode/nginx/index.html b/mode/nginx/index.html
new file mode 100644
index 0000000000..c33a224ff4
--- /dev/null
+++ b/mode/nginx/index.html
@@ -0,0 +1,168 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CodeMirror: NGINX mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="nginx.js"></script>
+    <style>.CodeMirror {background: #f8f8f8;}</style>
+    <link rel="stylesheet" href="../../doc/docs.css">
+  </head>
+  
+  <style>
+    body {
+      margin: 0em auto;
+    }
+    
+    .CodeMirror, .CodeMirror-scroll {
+      height: 600px;
+    }
+  </style>
+  
+  <body>
+    <h1>CodeMirror: NGINX mode</h1>
+    <form><textarea id="code" name="code" style="height: 800px;">
+ server {
+    listen 173.255.219.235:80;
+    server_name website.com.au;
+    rewrite / $scheme://www.$host$request_uri permanent; ## Forcibly prepend a www
+}
+
+server {
+    listen 173.255.219.235:443;
+    server_name website.com.au;
+    rewrite / $scheme://www.$host$request_uri permanent; ## Forcibly prepend a www
+}
+
+server {
+  
+    listen      173.255.219.235:80;
+    server_name www.website.com.au;
+
+
+    
+      root        /data/www;
+      index       index.html index.php;
+
+      location / {
+          index index.html index.php;     ## Allow a static html file to be shown first
+          try_files $uri $uri/ @handler;  ## If missing pass the URI to Magento's front handler
+          expires 30d;                    ## Assume all files are cachable
+      }
+   
+      ## These locations would be hidden by .htaccess normally
+      location /app/                { deny all; }
+      location /includes/           { deny all; }
+      location /lib/                { deny all; }
+      location /media/downloadable/ { deny all; }
+      location /pkginfo/            { deny all; }
+      location /report/config.xml   { deny all; }
+      location /var/                { deny all; }
+   
+      location /var/export/ { ## Allow admins only to view export folder
+          auth_basic           "Restricted"; ## Message shown in login window
+          auth_basic_user_file /rs/passwords/testfile; ## See /etc/nginx/htpassword
+          autoindex            on;
+      }
+   
+      location  /. { ## Disable .htaccess and other hidden files
+          return 404;
+      }
+      
+       location @handler { ## Magento uses a common front handler
+          rewrite / /index.php;
+      }
+
+      location ~ .php/ { ## Forward paths like /js/index.php/x.js to relevant handler
+          rewrite ^/(.*.php)/ /$1 last;
+      }
+
+     location ~ \.php$ {
+          if (!-e $request_filename) { rewrite / /index.php last; } ## Catch 404s that try_files miss
+
+          fastcgi_pass   127.0.0.1:9000;
+          fastcgi_index  index.php;
+          fastcgi_param PATH_INFO $fastcgi_script_name;
+          fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+          include        /rs/confs/nginx/fastcgi_params;
+      }
+      
+  }
+  
+  
+  server {
+      
+      listen              173.255.219.235:443;
+      server_name         website.com.au www.website.com.au;
+      
+      root   /data/www;
+      index index.html index.php;
+     
+      ssl                 on;
+      ssl_certificate     /rs/ssl/ssl.crt;
+      ssl_certificate_key /rs/ssl/ssl.key;
+      
+      ssl_session_timeout  5m;
+      
+      ssl_protocols  SSLv2 SSLv3 TLSv1;
+      ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+      ssl_prefer_server_ciphers   on;    
+      
+      
+      
+       location / {
+          index index.html index.php; ## Allow a static html file to be shown first
+          try_files $uri $uri/ @handler; ## If missing pass the URI to Magento's front handler
+          expires 30d; ## Assume all files are cachable
+      }
+   
+      ## These locations would be hidden by .htaccess normally
+      location /app/                { deny all; }
+      location /includes/           { deny all; }
+      location /lib/                { deny all; }
+      location /media/downloadable/ { deny all; }
+      location /pkginfo/            { deny all; }
+      location /report/config.xml   { deny all; }
+      location /var/                { deny all; }
+   
+      location /var/export/ { ## Allow admins only to view export folder
+          auth_basic           "Restricted"; ## Message shown in login window
+          auth_basic_user_file htpasswd; ## See /etc/nginx/htpassword
+          autoindex            on;
+      }
+   
+      location  /. { ## Disable .htaccess and other hidden files
+          return 404;
+      }
+      
+       location @handler { ## Magento uses a common front handler
+          rewrite / /index.php;
+      }
+     
+      location ~ .php/ { ## Forward paths like /js/index.php/x.js to relevant handler
+          rewrite ^/(.*.php)/ /$1 last;
+      }
+     
+      location ~ .php$ { ## Execute PHP scripts
+          if (!-e $request_filename) { rewrite  /index.php last; } ## Catch 404s that try_files miss
+          
+          fastcgi_pass 127.0.0.1:9000;
+          fastcgi_index  index.php;
+          fastcgi_param PATH_INFO $fastcgi_script_name;                
+          fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+          include        /rs/confs/nginx/fastcgi_params;
+          
+          fastcgi_param HTTPS on;
+      }
+      
+  }       
+
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/nginx</code>.</p>
+
+  </body>
+</html>
diff --git a/mode/nginx/nginx.js b/mode/nginx/nginx.js
new file mode 100644
index 0000000000..4ea49886c3
--- /dev/null
+++ b/mode/nginx/nginx.js
@@ -0,0 +1,162 @@
+CodeMirror.defineMode("nginx", function(config) {
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  var keywords = words(
+    /* ngxDirectiveControl */ "break return rewrite set" +
+    /* ngxDirective */ " accept_mutex accept_mutex_delay access_log add_after_body add_before_body add_header addition_types aio alias allow ancient_browser ancient_browser_value auth_basic auth_basic_user_file auth_http auth_http_header auth_http_timeout autoindex autoindex_exact_size autoindex_localtime charset charset_types client_body_buffer_size client_body_in_file_only client_body_in_single_buffer client_body_temp_path client_body_timeout client_header_buffer_size client_header_timeout client_max_body_size connection_pool_size create_full_put_path daemon dav_access dav_methods debug_connection debug_points default_type degradation degrade deny devpoll_changes devpoll_events directio directio_alignment empty_gif env epoll_events error_log eventport_events expires fastcgi_bind fastcgi_buffer_size fastcgi_buffers fastcgi_busy_buffers_size fastcgi_cache fastcgi_cache_key fastcgi_cache_methods fastcgi_cache_min_uses fastcgi_cache_path fastcgi_cache_use_stale fastcgi_cache_valid fastcgi_catch_stderr fastcgi_connect_timeout fastcgi_hide_header fastcgi_ignore_client_abort fastcgi_ignore_headers fastcgi_index fastcgi_intercept_errors fastcgi_max_temp_file_size fastcgi_next_upstream fastcgi_param fastcgi_pass_header fastcgi_pass_request_body fastcgi_pass_request_headers fastcgi_read_timeout fastcgi_send_lowat fastcgi_send_timeout fastcgi_split_path_info fastcgi_store fastcgi_store_access fastcgi_temp_file_write_size fastcgi_temp_path fastcgi_upstream_fail_timeout fastcgi_upstream_max_fails flv geoip_city geoip_country google_perftools_profiles gzip gzip_buffers gzip_comp_level gzip_disable gzip_hash gzip_http_version gzip_min_length gzip_no_buffer gzip_proxied gzip_static gzip_types gzip_vary gzip_window if_modified_since ignore_invalid_headers image_filter image_filter_buffer image_filter_jpeg_quality image_filter_transparency imap_auth imap_capabilities imap_client_buffer index ip_hash keepalive_requests keepalive_timeout kqueue_changes kqueue_events large_client_header_buffers limit_conn limit_conn_log_level limit_rate limit_rate_after limit_req limit_req_log_level limit_req_zone limit_zone lingering_time lingering_timeout lock_file log_format log_not_found log_subrequest map_hash_bucket_size map_hash_max_size master_process memcached_bind memcached_buffer_size memcached_connect_timeout memcached_next_upstream memcached_read_timeout memcached_send_timeout memcached_upstream_fail_timeout memcached_upstream_max_fails merge_slashes min_delete_depth modern_browser modern_browser_value msie_padding msie_refresh multi_accept open_file_cache open_file_cache_errors open_file_cache_events open_file_cache_min_uses open_file_cache_valid open_log_file_cache output_buffers override_charset perl perl_modules perl_require perl_set pid pop3_auth pop3_capabilities port_in_redirect postpone_gzipping postpone_output protocol proxy proxy_bind proxy_buffer proxy_buffer_size proxy_buffering proxy_buffers proxy_busy_buffers_size proxy_cache proxy_cache_key proxy_cache_methods proxy_cache_min_uses proxy_cache_path proxy_cache_use_stale proxy_cache_valid proxy_connect_timeout proxy_headers_hash_bucket_size proxy_headers_hash_max_size proxy_hide_header proxy_ignore_client_abort proxy_ignore_headers proxy_intercept_errors proxy_max_temp_file_size proxy_method proxy_next_upstream proxy_pass_error_message proxy_pass_header proxy_pass_request_body proxy_pass_request_headers proxy_read_timeout proxy_redirect proxy_send_lowat proxy_send_timeout proxy_set_body proxy_set_header proxy_ssl_session_reuse proxy_store proxy_store_access proxy_temp_file_write_size proxy_temp_path proxy_timeout proxy_upstream_fail_timeout proxy_upstream_max_fails random_index read_ahead real_ip_header recursive_error_pages request_pool_size reset_timedout_connection resolver resolver_timeout rewrite_log rtsig_overflow_events rtsig_overflow_test rtsig_overflow_threshold rtsig_signo satisfy secure_link_secret send_lowat send_timeout sendfile sendfile_max_chunk server_name_in_redirect server_names_hash_bucket_size server_names_hash_max_size server_tokens set_real_ip_from smtp_auth smtp_capabilities smtp_client_buffer smtp_greeting_delay so_keepalive source_charset ssi ssi_ignore_recycled_buffers ssi_min_file_chunk ssi_silent_errors ssi_types ssi_value_length ssl ssl_certificate ssl_certificate_key ssl_ciphers ssl_client_certificate ssl_crl ssl_dhparam ssl_engine ssl_prefer_server_ciphers ssl_protocols ssl_session_cache ssl_session_timeout ssl_verify_client ssl_verify_depth starttls stub_status sub_filter sub_filter_once sub_filter_types tcp_nodelay tcp_nopush thread_stack_size timeout timer_resolution types_hash_bucket_size types_hash_max_size underscores_in_headers uninitialized_variable_warn use user userid userid_domain userid_expires userid_mark userid_name userid_p3p userid_path userid_service valid_referers variables_hash_bucket_size variables_hash_max_size worker_connections worker_cpu_affinity worker_priority worker_processes worker_rlimit_core worker_rlimit_nofile worker_rlimit_sigpending worker_threads working_directory xclient xml_entities xslt_stylesheet xslt_typesdrew@li229-23"
+    );
+
+  var keywords_block = words(
+    /* ngxDirectiveBlock */ "http mail events server types location upstream charset_map limit_except if geo map"
+    );
+
+  var keywords_important = words(
+    /* ngxDirectiveImportant */ "include root server server_name listen internal proxy_pass memcached_pass fastcgi_pass try_files"
+    );
+
+  var indentUnit = config.indentUnit, type;
+  function ret(style, tp) {type = tp; return style;}
+
+  function tokenBase(stream, state) {
+
+
+    stream.eatWhile(/[\w\$_]/);
+
+    var cur = stream.current();
+
+
+    if (keywords.propertyIsEnumerable(cur)) {
+      return "keyword";
+    }
+    else if (keywords_block.propertyIsEnumerable(cur)) {
+      return "variable-2";
+    }
+    else if (keywords_important.propertyIsEnumerable(cur)) {
+      return "string-2";
+    }
+    /**/
+
+    var ch = stream.next();
+    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("meta", stream.current());}
+    else if (ch == "/" && stream.eat("*")) {
+      state.tokenize = tokenCComment;
+      return tokenCComment(stream, state);
+    }
+    else if (ch == "<" && stream.eat("!")) {
+      state.tokenize = tokenSGMLComment;
+      return tokenSGMLComment(stream, state);
+    }
+    else if (ch == "=") ret(null, "compare");
+    else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare");
+    else if (ch == "\"" || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    else if (ch == "#") {
+      stream.skipToEnd();
+      return ret("comment", "comment");
+    }
+    else if (ch == "!") {
+      stream.match(/^\s*\w*/);
+      return ret("keyword", "important");
+    }
+    else if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w.%]/);
+      return ret("number", "unit");
+    }
+    else if (/[,.+>*\/]/.test(ch)) {
+      return ret(null, "select-op");
+    }
+    else if (/[;{}:\[\]]/.test(ch)) {
+      return ret(null, ch);
+    }
+    else {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("variable", "variable");
+    }
+  }
+
+  function tokenCComment(stream, state) {
+    var maybeEnd = false, ch;
+    while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == "/") {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return ret("comment", "comment");
+  }
+
+  function tokenSGMLComment(stream, state) {
+    var dashes = 0, ch;
+    while ((ch = stream.next()) != null) {
+      if (dashes >= 2 && ch == ">") {
+        state.tokenize = tokenBase;
+        break;
+      }
+      dashes = (ch == "-") ? dashes + 1 : 0;
+    }
+    return ret("comment", "comment");
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped)
+          break;
+        escaped = !escaped && ch == "\\";
+      }
+      if (!escaped) state.tokenize = tokenBase;
+      return ret("string", "string");
+    };
+  }
+
+  return {
+    startState: function(base) {
+      return {tokenize: tokenBase,
+              baseIndent: base || 0,
+              stack: []};
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+
+      var context = state.stack[state.stack.length-1];
+      if (type == "hash" && context == "rule") style = "atom";
+      else if (style == "variable") {
+        if (context == "rule") style = "number";
+        else if (!context || context == "@media{") style = "tag";
+      }
+
+      if (context == "rule" && /^[\{\};]$/.test(type))
+        state.stack.pop();
+      if (type == "{") {
+        if (context == "@media") state.stack[state.stack.length-1] = "@media{";
+        else state.stack.push("{");
+      }
+      else if (type == "}") state.stack.pop();
+      else if (type == "@media") state.stack.push("@media");
+      else if (context == "{" && type != "comment") state.stack.push("rule");
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var n = state.stack.length;
+      if (/^\}/.test(textAfter))
+        n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;
+      return state.baseIndent + n * indentUnit;
+    },
+
+    electricChars: "}"
+  };
+});
+
+CodeMirror.defineMIME("text/nginx", "nginx");

From 562af66579ad69425134bdbac03a82db10bf0fe3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 08:38:29 +0200
Subject: [PATCH 0312/4742] [nginx mode] Integrate

---
 doc/compress.html     |   1 +
 doc/modes.html        |   1 +
 mode/meta.js          |   1 +
 mode/nginx/index.html | 259 +++++++++++++++++++++---------------------
 mode/nginx/nginx.js   |   3 +-
 5 files changed, 134 insertions(+), 131 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 9ccafba4ae..f76629754a 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -101,6 +101,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
           <option value="http://codemirror.net/mode/mirc/mirc.js">mirc.js</option>
+          <option value="http://codemirror.net/mode/nginx/nginx.js">ntriples.js</option>
           <option value="http://codemirror.net/mode/ntriples/ntriples.js">ntriples.js</option>
           <option value="http://codemirror.net/mode/ocaml/ocaml.js">ocaml.js</option>
           <option value="http://codemirror.net/mode/pascal/pascal.js">pascal.js</option>
diff --git a/doc/modes.html b/doc/modes.html
index cb72754eb7..82738f19e6 100644
--- a/doc/modes.html
+++ b/doc/modes.html
@@ -54,6 +54,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="../mode/lua/index.html">Lua</a></li>
       <li><a href="../mode/markdown/index.html">Markdown</a> (<a href="../mode/gfm/index.html">GitHub-flavour</a>)</li>
       <li><a href="../mode/mirc/index.html">mIRC</a></li>
+      <li><a href="../mode/nginx/index.html">Nginx</a></li>
       <li><a href="../mode/ntriples/index.html">NTriples</a></li>
       <li><a href="../mode/ocaml/index.html">OCaml</a></li>
       <li><a href="../mode/pascal/index.html">Pascal</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 63123a0254..8e8c8f5f5c 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -37,6 +37,7 @@ CodeMirror.modeInfo = [
   {name: 'Lua', mime: 'text/x-lua', mode: 'lua'},
   {name: 'Markdown (GitHub-flavour)', mime: 'text/x-markdown', mode: 'markdown'},
   {name: 'mIRC', mime: 'text/mirc', mode: 'mirc'},
+  {name: 'Nginx', mime: 'text/x-nginx-conf', mode: 'nginx'},
   {name: 'NTriples', mime: 'text/n-triples', mode: 'ntriples'},
   {name: 'OCaml', mime: 'text/x-ocaml', mode: 'ocaml'},
   {name: 'Pascal', mime: 'text/x-pascal', mode: 'pascal'},
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index c33a224ff4..aa712e1e32 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -8,155 +8,154 @@
     <style>.CodeMirror {background: #f8f8f8;}</style>
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>
-  
+
   <style>
     body {
       margin: 0em auto;
     }
-    
+
     .CodeMirror, .CodeMirror-scroll {
       height: 600px;
     }
   </style>
-  
+
   <body>
     <h1>CodeMirror: NGINX mode</h1>
     <form><textarea id="code" name="code" style="height: 800px;">
- server {
-    listen 173.255.219.235:80;
-    server_name website.com.au;
-    rewrite / $scheme://www.$host$request_uri permanent; ## Forcibly prepend a www
+server {
+  listen 173.255.219.235:80;
+  server_name website.com.au;
+  rewrite / $scheme://www.$host$request_uri permanent; ## Forcibly prepend a www
 }
 
 server {
-    listen 173.255.219.235:443;
-    server_name website.com.au;
-    rewrite / $scheme://www.$host$request_uri permanent; ## Forcibly prepend a www
+  listen 173.255.219.235:443;
+  server_name website.com.au;
+  rewrite / $scheme://www.$host$request_uri permanent; ## Forcibly prepend a www
 }
 
 server {
-  
-    listen      173.255.219.235:80;
-    server_name www.website.com.au;
-
-
-    
-      root        /data/www;
-      index       index.html index.php;
-
-      location / {
-          index index.html index.php;     ## Allow a static html file to be shown first
-          try_files $uri $uri/ @handler;  ## If missing pass the URI to Magento's front handler
-          expires 30d;                    ## Assume all files are cachable
-      }
-   
-      ## These locations would be hidden by .htaccess normally
-      location /app/                { deny all; }
-      location /includes/           { deny all; }
-      location /lib/                { deny all; }
-      location /media/downloadable/ { deny all; }
-      location /pkginfo/            { deny all; }
-      location /report/config.xml   { deny all; }
-      location /var/                { deny all; }
-   
-      location /var/export/ { ## Allow admins only to view export folder
-          auth_basic           "Restricted"; ## Message shown in login window
-          auth_basic_user_file /rs/passwords/testfile; ## See /etc/nginx/htpassword
-          autoindex            on;
-      }
-   
-      location  /. { ## Disable .htaccess and other hidden files
-          return 404;
-      }
-      
-       location @handler { ## Magento uses a common front handler
-          rewrite / /index.php;
-      }
-
-      location ~ .php/ { ## Forward paths like /js/index.php/x.js to relevant handler
-          rewrite ^/(.*.php)/ /$1 last;
-      }
-
-     location ~ \.php$ {
-          if (!-e $request_filename) { rewrite / /index.php last; } ## Catch 404s that try_files miss
-
-          fastcgi_pass   127.0.0.1:9000;
-          fastcgi_index  index.php;
-          fastcgi_param PATH_INFO $fastcgi_script_name;
-          fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
-          include        /rs/confs/nginx/fastcgi_params;
-      }
-      
+
+  listen      173.255.219.235:80;
+  server_name www.website.com.au;
+
+
+
+  root        /data/www;
+  index       index.html index.php;
+
+  location / {
+    index index.html index.php;     ## Allow a static html file to be shown first
+    try_files $uri $uri/ @handler;  ## If missing pass the URI to Magento's front handler
+    expires 30d;                    ## Assume all files are cachable
+  }
+
+  ## These locations would be hidden by .htaccess normally
+  location /app/                { deny all; }
+  location /includes/           { deny all; }
+  location /lib/                { deny all; }
+  location /media/downloadable/ { deny all; }
+  location /pkginfo/            { deny all; }
+  location /report/config.xml   { deny all; }
+  location /var/                { deny all; }
+
+  location /var/export/ { ## Allow admins only to view export folder
+    auth_basic           "Restricted"; ## Message shown in login window
+    auth_basic_user_file /rs/passwords/testfile; ## See /etc/nginx/htpassword
+    autoindex            on;
   }
-  
-  
-  server {
-      
-      listen              173.255.219.235:443;
-      server_name         website.com.au www.website.com.au;
-      
-      root   /data/www;
-      index index.html index.php;
-     
-      ssl                 on;
-      ssl_certificate     /rs/ssl/ssl.crt;
-      ssl_certificate_key /rs/ssl/ssl.key;
-      
-      ssl_session_timeout  5m;
-      
-      ssl_protocols  SSLv2 SSLv3 TLSv1;
-      ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
-      ssl_prefer_server_ciphers   on;    
-      
-      
-      
-       location / {
-          index index.html index.php; ## Allow a static html file to be shown first
-          try_files $uri $uri/ @handler; ## If missing pass the URI to Magento's front handler
-          expires 30d; ## Assume all files are cachable
-      }
-   
-      ## These locations would be hidden by .htaccess normally
-      location /app/                { deny all; }
-      location /includes/           { deny all; }
-      location /lib/                { deny all; }
-      location /media/downloadable/ { deny all; }
-      location /pkginfo/            { deny all; }
-      location /report/config.xml   { deny all; }
-      location /var/                { deny all; }
-   
-      location /var/export/ { ## Allow admins only to view export folder
-          auth_basic           "Restricted"; ## Message shown in login window
-          auth_basic_user_file htpasswd; ## See /etc/nginx/htpassword
-          autoindex            on;
-      }
-   
-      location  /. { ## Disable .htaccess and other hidden files
-          return 404;
-      }
-      
-       location @handler { ## Magento uses a common front handler
-          rewrite / /index.php;
-      }
-     
-      location ~ .php/ { ## Forward paths like /js/index.php/x.js to relevant handler
-          rewrite ^/(.*.php)/ /$1 last;
-      }
-     
-      location ~ .php$ { ## Execute PHP scripts
-          if (!-e $request_filename) { rewrite  /index.php last; } ## Catch 404s that try_files miss
-          
-          fastcgi_pass 127.0.0.1:9000;
-          fastcgi_index  index.php;
-          fastcgi_param PATH_INFO $fastcgi_script_name;                
-          fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
-          include        /rs/confs/nginx/fastcgi_params;
-          
-          fastcgi_param HTTPS on;
-      }
-      
-  }       
 
+  location  /. { ## Disable .htaccess and other hidden files
+    return 404;
+  }
+
+  location @handler { ## Magento uses a common front handler
+    rewrite / /index.php;
+  }
+
+  location ~ .php/ { ## Forward paths like /js/index.php/x.js to relevant handler
+    rewrite ^/(.*.php)/ /$1 last;
+  }
+
+  location ~ \.php$ {
+    if (!-e $request_filename) { rewrite / /index.php last; } ## Catch 404s that try_files miss
+
+    fastcgi_pass   127.0.0.1:9000;
+    fastcgi_index  index.php;
+    fastcgi_param PATH_INFO $fastcgi_script_name;
+    fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    include        /rs/confs/nginx/fastcgi_params;
+  }
+
+}
+
+
+server {
+
+  listen              173.255.219.235:443;
+  server_name         website.com.au www.website.com.au;
+
+  root   /data/www;
+  index index.html index.php;
+
+  ssl                 on;
+  ssl_certificate     /rs/ssl/ssl.crt;
+  ssl_certificate_key /rs/ssl/ssl.key;
+
+  ssl_session_timeout  5m;
+
+  ssl_protocols  SSLv2 SSLv3 TLSv1;
+  ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+  ssl_prefer_server_ciphers   on;
+
+
+
+  location / {
+    index index.html index.php; ## Allow a static html file to be shown first
+    try_files $uri $uri/ @handler; ## If missing pass the URI to Magento's front handler
+    expires 30d; ## Assume all files are cachable
+  }
+
+  ## These locations would be hidden by .htaccess normally
+  location /app/                { deny all; }
+  location /includes/           { deny all; }
+  location /lib/                { deny all; }
+  location /media/downloadable/ { deny all; }
+  location /pkginfo/            { deny all; }
+  location /report/config.xml   { deny all; }
+  location /var/                { deny all; }
+
+  location /var/export/ { ## Allow admins only to view export folder
+    auth_basic           "Restricted"; ## Message shown in login window
+    auth_basic_user_file htpasswd; ## See /etc/nginx/htpassword
+    autoindex            on;
+  }
+
+  location  /. { ## Disable .htaccess and other hidden files
+    return 404;
+  }
+
+  location @handler { ## Magento uses a common front handler
+    rewrite / /index.php;
+  }
+
+  location ~ .php/ { ## Forward paths like /js/index.php/x.js to relevant handler
+    rewrite ^/(.*.php)/ /$1 last;
+  }
+
+  location ~ .php$ { ## Execute PHP scripts
+    if (!-e $request_filename) { rewrite  /index.php last; } ## Catch 404s that try_files miss
+
+    fastcgi_pass 127.0.0.1:9000;
+    fastcgi_index  index.php;
+    fastcgi_param PATH_INFO $fastcgi_script_name;
+    fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    include        /rs/confs/nginx/fastcgi_params;
+
+    fastcgi_param HTTPS on;
+  }
+
+}
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
diff --git a/mode/nginx/nginx.js b/mode/nginx/nginx.js
index 4ea49886c3..c98c8a1dd3 100644
--- a/mode/nginx/nginx.js
+++ b/mode/nginx/nginx.js
@@ -127,6 +127,7 @@ CodeMirror.defineMode("nginx", function(config) {
 
     token: function(stream, state) {
       if (stream.eatSpace()) return null;
+      type = null;
       var style = state.tokenize(stream, state);
 
       var context = state.stack[state.stack.length-1];
@@ -159,4 +160,4 @@ CodeMirror.defineMode("nginx", function(config) {
   };
 });
 
-CodeMirror.defineMIME("text/nginx", "nginx");
+CodeMirror.defineMIME("text/nginx", "text/x-nginx-conf");

From 4a3ad9b7c9526c0e13d8b5ec7961a7da1da47449 Mon Sep 17 00:00:00 2001
From: Dominator008 <zhoumotongxue008@gmail.com>
Date: Fri, 26 Jul 2013 16:59:05 -0700
Subject: [PATCH 0313/4742] Fix bug in setSize()

The function was referring to "cm", which is not necessarily defined.
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c15dead2a4..2eab65f5b7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3130,7 +3130,7 @@ window.CodeMirror = (function() {
       if (width != null) this.display.wrapper.style.width = interpret(width);
       if (height != null) this.display.wrapper.style.height = interpret(height);
       if (this.options.lineWrapping)
-        cm.display.measureLineCache.length = cm.display.measureLineCachePos = 0;
+        this.display.measureLineCache.length = this.display.measureLineCachePos = 0;
       this.curOp.forceUpdate = true;
     }),
 

From 7134e48ee91472f1811c8c9d561631359705762e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 08:47:32 +0200
Subject: [PATCH 0314/4742] [rst mode] Better innerMode implementation

Also fixes CodeMirror.innerMode to give up on null or fixpoint

Issue #1704
---
 lib/codemirror.js | 1 +
 mode/rst/rst.js   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2eab65f5b7..2fae54dbc7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3358,6 +3358,7 @@ window.CodeMirror = (function() {
   CodeMirror.innerMode = function(mode, state) {
     while (mode.innerMode) {
       var info = mode.innerMode(state);
+      if (!info || info.mode == mode) break;
       state = info.state;
       mode = info.mode;
     }
diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index db5aa6cd8f..508896d25b 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -482,7 +482,9 @@ CodeMirror.defineMode('rst-base', function (config) {
         },
 
         innerMode: function (state) {
-            return {state: state.ctx.local, mode: state.ctx.mode};
+            return state.tmp ? {state: state.tmp.local, mode: state.tmp.mode}
+                 : state.ctx ? {state: state.ctx.local, mode: state.ctx.mode}
+                             : null;
         },
 
         token: function (stream, state) {

From e2879601946bbebbe68bc1585a7ea7b16c601459 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 08:49:17 +0200
Subject: [PATCH 0315/4742] [compression helper] Fix copy-paste error

---
 doc/compress.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/compress.html b/doc/compress.html
index f76629754a..94faf7c853 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -101,7 +101,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
           <option value="http://codemirror.net/mode/mirc/mirc.js">mirc.js</option>
-          <option value="http://codemirror.net/mode/nginx/nginx.js">ntriples.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/ocaml/ocaml.js">ocaml.js</option>
           <option value="http://codemirror.net/mode/pascal/pascal.js">pascal.js</option>

From 3c36093984018c113f6dde4d2b4f5b38f17bb886 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 09:10:50 +0200
Subject: [PATCH 0316/4742] Recompute max line when a widget updates

---
 lib/codemirror.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2fae54dbc7..4b99cf74e7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1014,7 +1014,7 @@ window.CodeMirror = (function() {
 
   function measureLineInner(cm, line) {
     var display = cm.display, measure = emptyArray(line.text.length);
-    var pre = lineContent(cm, line, measure);
+    var pre = lineContent(cm, line, measure, true);
 
     // IE does not cache element positions of inline elements between
     // calls to getBoundingClientRect. This makes the loop below,
@@ -1107,7 +1107,7 @@ window.CodeMirror = (function() {
     var cached = !hasBadSpan && findCachedMeasurement(cm, line);
     if (cached) return measureChar(cm, line, line.text.length, cached.measure, "right").right;
 
-    var pre = lineContent(cm, line);
+    var pre = lineContent(cm, line, null, true);
     var end = pre.appendChild(zeroWidthElement(cm.display.measure));
     removeChildrenAndAdd(cm.display.measure, pre);
     return getRect(end).right - getRect(cm.display.lineDiv).left;
@@ -3737,7 +3737,7 @@ window.CodeMirror = (function() {
         break;
       }
       runInOp(cm, function() {
-        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
+        cm.curOp.selectionChanged = cm.curOp.forceUpdate = cm.curOp.updateMaxLine = true;
       });
     }
   };
@@ -4257,13 +4257,14 @@ window.CodeMirror = (function() {
       (styleToClassCache[style] = "cm-" + style.replace(/ +/g, " cm-"));
   }
 
-  function lineContent(cm, realLine, measure) {
+  function lineContent(cm, realLine, measure, copyWidgets) {
     var merged, line = realLine, empty = true;
     while (merged = collapsedSpanAtStart(line))
       line = getLine(cm.doc, merged.find().from.line);
 
-    var builder = {pre: elt("pre"), col: 0, pos: 0, display: !measure,
-                   measure: null, measuredSomething: false, cm: cm};
+    var builder = {pre: elt("pre"), col: 0, pos: 0,
+                   measure: null, measuredSomething: false, cm: cm,
+                   copyWidgets: copyWidgets};
     if (line.textClass) builder.pre.className = line.textClass;
 
     do {
@@ -4387,7 +4388,7 @@ window.CodeMirror = (function() {
   function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
     var widget = !ignoreWidget && marker.replacedWith;
     if (widget) {
-      if (!builder.display) widget = widget.cloneNode(true);
+      if (builder.copyWidgets) widget = widget.cloneNode(true);
       builder.pre.appendChild(widget);
       if (builder.measure) {
         if (size) {

From f5fb7e9aee2a22fa62711dd7af689eee678c077e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 09:53:44 +0200
Subject: [PATCH 0317/4742] CSS hack to make sure visible non-wrapped content
 can always be scrolled into view

(Even when the widest-line heuristic goes wrong.)
---
 lib/codemirror.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 52881f7dfd..584eecbfd3 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -192,6 +192,16 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   white-space: pre-wrap;
   word-break: normal;
 }
+.CodeMirror-code pre {
+  border-right: 30px solid transparent;
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+}
+.CodeMirror-wrap .CodeMirror-code pre {
+  border-right: none;
+  width: auto;
+}
 .CodeMirror-linebackground {
   position: absolute;
   left: 0; right: 0; top: 0; bottom: 0;

From c12eb1e726a648075234d2450bae0ba5a6b22ba9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 10:43:46 +0200
Subject: [PATCH 0318/4742] [tern addon] Add some basic info to the demo page

---
 demo/tern.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/demo/tern.html b/demo/tern.html
index 42c2b1a7bb..bbc5e478c1 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -70,6 +70,20 @@ <h1>CodeMirror: Tern Demo</h1>
 var randomInt = myMod.randomElt(myMod.intList);
 </textarea></p>
 
+<p>Demonstrates integration of <a href="http://ternjs.net/">Tern</a>
+and CodeMirror. The following keys are bound:</p>
+
+<dl>
+  <dt>Ctrl-Space</dt><dd>Autocomplete</dd>
+  <dt>Ctrl-I</dt><dd>Find type at cursor</dd>
+  <dt>Alt-.</dt><dd>Jump to definition (Alt-, to jump back)</dd>
+  <dt>Ctrl-Q</dt><dd>Rename variable</dd>
+</dl>
+
+<p>Documentation is sparse for now. See the top of
+the <a href="../addon/tern/tern.js">script</a> for a rough API
+overview.</p>
+
 <script>
   function getURL(url, c) {
     var xhr = new XMLHttpRequest();

From a61a6c7d9d25c3d05044a98dfe0985fe4180f276 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 11:00:05 +0200
Subject: [PATCH 0319/4742] Mark release 3.15.0

---
 bower.json          |  2 +-
 doc/compress.html   |  1 +
 doc/oldrelease.html | 12 ++++++++++++
 index.html          | 24 +++++++++++-------------
 lib/codemirror.js   |  2 +-
 package.json        |  2 +-
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/bower.json b/bower.json
index eb2b75b8d1..fae2426c89 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "CodeMirror",
-  "version": "3.13.0",
+  "version": "3.15.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index 94faf7c853..864f4f28cd 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -30,6 +30,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <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=3.15.0;f=">3.15</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.14.0;f=">3.14</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.13.0;f=">3.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.12;f=">3.12</option>
diff --git a/doc/oldrelease.html b/doc/oldrelease.html
index 40e15032b6..c72dc8f61a 100644
--- a/doc/oldrelease.html
+++ b/doc/oldrelease.html
@@ -19,6 +19,18 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 </pre>
 </div>
 
+  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
+
+  <ul class="rel-note">
+    <li>New mode: <a href="../mode/http/index.html">HTTP</a>.</li>
+    <li>Improved handling of selection anchor position.</li>
+    <li>Improve IE performance on longer lines.</li>
+    <li>Reduce gutter glitches during horiz. scrolling.</li>
+    <li>Add <a href="manual.html#addKeyMap"><code>addKeyMap</code></a> and <a href="manual.html#removeKeyMap"><code>removeKeyMap</code></a> methods.</li>
+    <li>Rewrite <code>formatting</code> and <code>closetag</code> add-ons.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 544aac1200..2f2ba05096 100644
--- a/index.html
+++ b/index.html
@@ -286,6 +286,17 @@ <h2>Reading material</h2>
 
   <h2 id=releases>Releases</h2>
 
+  <p class="rel">29-07-2013: <a href="http://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="mode/jade/index.html">Jade</a>, <a href="mode/nginx/index.html">Nginx</a>.</li>
+    <li>New addons: <a href="demo/tern.html">Tern</a>, <a href="doc/manual.html#addon_matchtags">matchtags</a>, and <a href="doc/manual.html#addon_foldgutter">foldgutter</a>.</li>
+    <li>Introduced <a href="doc/manual.html#getHelper"><em>helper</em></a> concept (<a href="https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ">context</a>).</li>
+    <li>New method: <a href="doc/manual.html#getModeAt"><code>getModeAt</code></a>.</li>
+    <li>New themes: base16 <a href="demo/theme.html?base16-dark">dark</a>/<a href="demo/theme.html?base16-light">light</a>, 3024 <a href="demo/theme.html?3024-night">dark</a>/<a href="demo/theme.html?3024-day">light</a>, <a href="demo/theme.html?tomorrow-night-eighties">tomorrow-night</a>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">20-06-2013: <a href="http://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
 
   <ul class="rel-note">
@@ -454,19 +465,6 @@ <h2 id=releases>Releases</h2>
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
   </ul>
   
-
-  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
-
-  <ul class="rel-note">
-    <li>New mode: <a href="mode/http/index.html">HTTP</a>.</li>
-    <li>Improved handling of selection anchor position.</li>
-    <li>Improve IE performance on longer lines.</li>
-    <li>Reduce gutter glitches during horiz. scrolling.</li>
-    <li>Add <a href="doc/manual.html#addKeyMap"><code>addKeyMap</code></a> and <a href="doc/manual.html#removeKeyMap"><code>removeKeyMap</code></a> methods.</li>
-    <li>Rewrite <code>formatting</code> and <code>closetag</code> add-ons.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
-  </ul>
-
   <p><a href="doc/oldrelease.html">Older releases...</a></p>
 
 </div></div>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4b99cf74e7..9451b6dbaf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5791,7 +5791,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.14.1";
+  CodeMirror.version = "3.15.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 17e5487f25..7fc90708b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.14.1",
+    "version":"3.15.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 24aaeff9ed81266fe61cc3da559b1429df196e25 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 11:01:09 +0200
Subject: [PATCH 0320/4742] Bump version number post-3.15

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9451b6dbaf..7c570d11f3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5791,7 +5791,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.15.0";
+  CodeMirror.version = "3.15.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 7fc90708b1..27c4f1729f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.15.0",
+    "version":"3.15.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From fbe231c8f551a9fa3baf1d75997f9e9a1d6c6eef Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 11:03:17 +0200
Subject: [PATCH 0321/4742] Add 'and others' to copyright info in LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 482d55eb73..ade341ca6e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2013 by Marijn Haverbeke <marijnh@gmail.com>
+Copyright (C) 2013 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 2b6ec0d4f48f78514ee7512078263ce33a9de6b2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 11:07:38 +0200
Subject: [PATCH 0322/4742] [real-world uses] Add Gerrit and xsd2codemirror

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

diff --git a/doc/realworld.html b/doc/realworld.html
index d83554a8e4..36c95b3ea0 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -57,6 +57,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>
       <li><a href="http://fiddlesalad.com/">Fiddle Salad</a> (web development environment)</li>
       <li><a href="http://www.firepad.io">Firepad</a> (collaborative text editor)</li>
+      <li><a href="https://code.google.com/p/gerrit/">Gerrit</a>'s diff view</a></li>
       <li><a href="http://tour.golang.org">Go language tour</a></li>
       <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
@@ -113,6 +114,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://wordpress.org/extend/plugins/codemirror-for-codeeditor/">WordPress plugin</a></li>
       <li><a href="http://www.xosystem.org/home/applications_websites/xosystem_website/xoside_EN.php">XOSide</a> (online editor)</li>
       <li><a href="http://videlibri.sourceforge.net/cgi-bin/xidelcgi">XQuery tester</a></li>
+      <li><a href="http://q42jaap.github.io/xsd2codemirror/">xsd2codemirror</a> (convert XSD to CM XML completion info)</li>
     </ul>
 
   </body>

From 5dd408071ccb1200e1b53cfa5cf93b67b8dbd69a Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@chromium.org>
Date: Thu, 18 Jul 2013 10:00:42 +0400
Subject: [PATCH 0323/4742] Workaround for issue #1474

---
 lib/codemirror.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7c570d11f3..4fa20b6a06 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1442,6 +1442,10 @@ window.CodeMirror = (function() {
   function readInput(cm) {
     var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc, sel = doc.sel;
     if (!cm.state.focused || hasSelection(input) || isReadOnly(cm) || cm.state.disableInput) return false;
+    if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
+      input.value = input.value.substring(0, input.value.length - 1);
+      cm.state.fakedLastChar = false;
+    }
     var text = input.value;
     if (text == prevInput && posEq(sel.from, sel.to)) return false;
     if (ie && !ie_lt9 && cm.display.inputHasSelection === text) {
@@ -1594,6 +1598,18 @@ window.CodeMirror = (function() {
       fastPoll(cm);
     });
     on(d.input, "paste", function() {
+      // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
+      // Add a char to the end of textarea before paste occur so that
+      // selection doesn't span to the end of textarea.
+      if (webkit) {
+        var start = d.input.selectionStart, end = d.input.selectionEnd;
+        d.input.value += "$";
+        d.input.selectionStart = start;
+        d.input.selectionEnd = end;
+        cm.state.fakedLastChar = true;
+      } else {
+        cm.state.fakedLastChar = false;
+      }
       cm.state.pasteIncoming = true;
       fastPoll(cm);
     });

From deac75cfc70429afe6c289383b39ee241aed094f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 17:33:35 +0200
Subject: [PATCH 0324/4742] [show-hint addon] Disable widget between
 cursoractivity and update

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

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 300f68831d..5af4efe1a4 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -86,7 +86,6 @@
         data = data_;
         if (isDone()) return;
         if (!data || !data.list.length) return done();
-        completion.widget.close();
         completion.widget = new Widget(completion, data);
       }
 
@@ -95,10 +94,12 @@
         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))))
+            (pos.ch && closeOn.test(line.charAt(pos.ch - 1)))) {
           completion.close();
-        else
+        } else {
           debounce = setTimeout(update, 170);
+          completion.widget.close();
+        }
       }
       this.cm.on("cursorActivity", activity);
       this.onClose = done;

From 2b180abd9f8cab2a36098673b28329437afae3ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Jul 2013 18:01:45 +0200
Subject: [PATCH 0325/4742] Start removing subdirectory LICENSE files

Moving to a situation where there's only one LICENSE for the whole
distribution.
---
 addon/hint/show-hint.js   |  2 +-
 mode/coffeescript/LICENSE | 22 ----------------------
 mode/pascal/LICENSE       |  7 -------
 mode/perl/LICENSE         | 19 -------------------
 mode/python/LICENSE.txt   | 21 ---------------------
 mode/r/LICENSE            | 24 ------------------------
 mode/rst/LICENSE.txt      | 21 ---------------------
 mode/ruby/LICENSE         | 24 ------------------------
 mode/vb/LICENSE.txt       | 21 ---------------------
 9 files changed, 1 insertion(+), 160 deletions(-)
 delete mode 100644 mode/coffeescript/LICENSE
 delete mode 100644 mode/pascal/LICENSE
 delete mode 100644 mode/perl/LICENSE
 delete mode 100644 mode/python/LICENSE.txt
 delete mode 100644 mode/r/LICENSE
 delete mode 100644 mode/rst/LICENSE.txt
 delete mode 100644 mode/ruby/LICENSE
 delete mode 100644 mode/vb/LICENSE.txt

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 5af4efe1a4..a4960ddeb0 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -98,7 +98,7 @@
           completion.close();
         } else {
           debounce = setTimeout(update, 170);
-          completion.widget.close();
+          if (completion.widget) completion.widget.close();
         }
       }
       this.cm.on("cursorActivity", activity);
diff --git a/mode/coffeescript/LICENSE b/mode/coffeescript/LICENSE
deleted file mode 100644
index 977e284e0f..0000000000
--- a/mode/coffeescript/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License
-
-Copyright (c) 2011 Jeff Pickhardt
-Modified from the Python CodeMirror mode, Copyright (c) 2010 Timothy Farrell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/mode/pascal/LICENSE b/mode/pascal/LICENSE
deleted file mode 100644
index 8e3747e748..0000000000
--- a/mode/pascal/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2011 souceLair <support@sourcelair.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/mode/perl/LICENSE b/mode/perl/LICENSE
deleted file mode 100644
index 96f4115af8..0000000000
--- a/mode/perl/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2011 by Sabaca <mail@sabaca.com> under the MIT license.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mode/python/LICENSE.txt b/mode/python/LICENSE.txt
deleted file mode 100644
index 918866b42a..0000000000
--- a/mode/python/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2010 Timothy Farrell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/mode/r/LICENSE b/mode/r/LICENSE
deleted file mode 100644
index 2510ae16cf..0000000000
--- a/mode/r/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2011, Ubalo, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Ubalo, Inc nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL UBALO, INC BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/mode/rst/LICENSE.txt b/mode/rst/LICENSE.txt
deleted file mode 100644
index c40984a84d..0000000000
--- a/mode/rst/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2013 Hasan Karahan <hasan.karahan81@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/mode/ruby/LICENSE b/mode/ruby/LICENSE
deleted file mode 100644
index ac09fc4035..0000000000
--- a/mode/ruby/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2011, Ubalo, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Ubalo, Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL UBALO, INC BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/mode/vb/LICENSE.txt b/mode/vb/LICENSE.txt
deleted file mode 100644
index 60839703a9..0000000000
--- a/mode/vb/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2012 Codility Limited, 107 Cheapside, London EC2V 6DN, UK
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

From 9476e3d66e05bf2013e9b22e0c026085dc40bfd6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 30 Jul 2013 09:23:11 +0200
Subject: [PATCH 0326/4742] Add an AUTHORS file

And a script to update it from the git data.
---
 AUTHORS        | 238 +++++++++++++++++++++++++++++++++++++++++++++++++
 bin/authors.sh |   6 ++
 2 files changed, 244 insertions(+)
 create mode 100644 AUTHORS
 create mode 100755 bin/authors.sh

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000000..2ac8905832
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,238 @@
+List of CodeMirror contributors. Updated before every release.
+
+4r2r
+Aaron Brooks
+Adam King
+adanlobato
+Adán Lobato
+aeroson
+Ahmad Amireh
+Ahmad M. Zawawi
+ahoward
+Akeksandr Motsjonov
+Albert Xing
+Alexander Pavlov
+Alexander Schepanovski
+alexey-k
+Alex Piggott
+Amy
+Ananya Sen
+Andre von Houck
+Andrey Lushnikov
+Andy Kimball
+Andy Li
+angelo.zerr@gmail.com
+Ankit Ahuja
+Ansel Santosa
+Anthony Grimes
+areos
+Atul Bhouraskar
+Aurelian Oancea
+Bastian Müller
+benbro
+Ben Keen
+boomyjee
+borawjm
+Brandon Frohs
+Brian Sletten
+Bruce Mitchener
+Chandra Sekhar Pydi
+Charles Skelton
+Chris Coyier
+Chris Granger
+Chris Morgan
+Christopher Brown
+CodeAnimal
+ComFreek
+dagsta
+Dan Heberden
+Daniel, Dao Quang Minh
+Daniel Faust
+Daniel Huigens
+Daniel Neel
+Daniel Parnell
+Danny Yoo
+David Mignot
+David Pathakjee
+deebugger
+Deep Thought
+Dominator008
+Domizio Demichelis
+Drew Bratcher
+Drew Hintz
+Drew Khoury
+Dror BG
+duralog
+edsharp
+ekhaled
+Eric Allam
+eustas
+Fauntleroy
+fbuchinger
+feizhang365
+Felipe Lalanne
+Felix Raab
+Filip Noetzel
+flack
+Ford_Lawnmower
+galambalazs
+Gautam Mehta
+Glenn Ruehle
+Golevka
+Gordon Smith
+greengiant
+Guillaume Massé
+Hans Engel
+Hardest
+Hasan Karahan
+Hocdoc
+Ian Beck
+Ian Wehrman
+Ian Wetherbee
+Ice White
+ICHIKAWA, Yuji
+Irakli Gozalishvili
+Ivan Kurnosov
+Jacob Lee
+Jakub Vrana
+James Campos
+James Thorne
+Jamie Hill
+Jan Jongboom
+jankeromnes
+Jan Keromnes
+Jan T. Sott
+Jason
+Jason Grout
+Jason Johnston
+Jason San Jose
+Jason Siefken
+Jean Boussier
+jeffkenton
+Jeff Pickhardt
+jem (graphite)
+Jochen Berger
+John Connor
+John Lees-Miller
+John Snelson
+jongalloway
+Joost-Wim Boekesteijn
+Joseph Pecoraro
+Joshua Newman
+jots
+Juan Benavides Romero
+Jucovschi Constantin
+jwallers@gmail.com
+kaniga
+Ken Newman
+Ken Rockot
+Kevin Sawicki
+Klaus Silveira
+Koh Zi Han, Cliff
+komakino
+Konstantin Lopuhin
+koops
+ks-ifware
+Lanny
+leaf corcoran
+Leonya Khachaturov
+Liam Newman
+List of contributors. Updated before every release.
+LM
+Lorenzo Stoakes
+lynschinzer
+Maksim Lin
+Maksym Taran
+Marat Dreizin
+Marco Aurélio
+Marijn Haverbeke
+Mario Pietsch
+Mark Lentczner
+Mason Malone
+Mateusz Paprocki
+mats cronqvist
+Matthew Beale
+Matthias BUSSONNIER
+Matt McDonald
+Matt Pass
+Matt Sacks
+Maximilian Hils
+Max Kirsch
+mbarkhau
+Metatheos
+Micah Dubinko
+Michael Lehenbauer
+Michael Zhou
+Mighty Guava
+Miguel Castillo
+Mike
+Mike Brevoort
+Mike Diaz
+Mike Ivanov
+Mike Kadin
+MinRK
+misfo
+mps
+Narciso Jaramillo
+Nathan Williams
+nerbert
+nguillaumin
+Niels van Groningen
+Nikita Beloglazov
+Nikita Vasilyev
+nlwillia
+pablo
+Page
+Patrick Strawderman
+Paul Garvin
+Paul Ivanov
+Pavel Feldman
+Paweł Bartkiewicz
+peteguhl
+peterkroon
+Peter Kroon
+prasanthj
+Prasanth J
+Rahul
+Randy Edmunds
+Richard Z.H. Wang
+robertop23
+Robert Plummer
+Ruslan Osmanov
+sabaca
+Samuel Ainsworth
+sandeepshetty
+santec
+Sascha Peilicke
+satchmorun
+sathyamoorthi
+shaund
+shaun gilchrist
+Shmuel Englard
+sonson
+spastorelli
+Stas Kobzar
+Stefan Borsje
+Steffen Beyer
+Steve O'Hara
+Tarmil
+tfjgeorge
+Thaddee Tyl
+think
+Thomas Dvornik
+Thomas Schmid
+Tim Baumann
+Timothy Farrell
+Timothy Hatcher
+Tomas Varaneckas
+Tom MacWright
+Tony Jian
+Vestimir Markov
+vf
+Volker Mische
+William Jamieson
+Wojtek Ptak
+Xavier Mendez
+Yunchi Luo
+Yuvi Panda
+Zachary Dremann
diff --git a/bin/authors.sh b/bin/authors.sh
new file mode 100755
index 0000000000..b3ee99c6dd
--- /dev/null
+++ b/bin/authors.sh
@@ -0,0 +1,6 @@
+# Combine existing list of authors with everyone known in git, sort, add header.
+tail --lines=+3 AUTHORS > AUTHORS.tmp
+git log --format='%aN' >> AUTHORS.tmp
+echo -e "List of CodeMirror contributors. Updated before every release.\n" > AUTHORS
+sort -u AUTHORS.tmp >> AUTHORS
+rm -f AUTHORS.tmp

From eb567f43df11e7b8cb9829f0e4dc04d8a4824fc5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 30 Jul 2013 09:44:14 +0200
Subject: [PATCH 0327/4742] Fix .changed method for bookmarks

Issue #1709
---
 lib/codemirror.js |  5 +++--
 test/test.js      | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4fa20b6a06..a7d7e6cdbe 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3745,9 +3745,10 @@ window.CodeMirror = (function() {
   TextMarker.prototype.changed = function() {
     var pos = this.find(), cm = this.doc.cm;
     if (!pos || !cm) return;
-    var line = getLine(this.doc, pos.from.line);
+    if (this.type != "bookmark") pos = pos.from;
+    var line = getLine(this.doc, pos.line);
     clearCachedMeasurement(cm, line);
-    if (pos.from.line >= cm.display.showingFrom && pos.from.line < cm.display.showingTo) {
+    if (pos.line >= cm.display.showingFrom && pos.line < cm.display.showingTo) {
       for (var node = cm.display.lineDiv.firstChild; node; node = node.nextSibling) if (node.lineObj == line) {
         if (node.offsetHeight != line.height) updateLineHeight(line, node.offsetHeight);
         break;
diff --git a/test/test.js b/test/test.js
index 67b25d00e7..88278aad8c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -852,6 +852,17 @@ testCM("changedInlineWidget", function(cm) {
   is(hScroll.scrollWidth > hScroll.clientWidth);
 }, {value: "hello there"});
 
+testCM("changedBookmark", function(cm) {
+  cm.setSize("10em");
+  var w = document.createElement("span");
+  w.innerHTML = "x";
+  var m = cm.setBookmark(Pos(0, 4), {widget: w});
+  w.innerHTML = "and now the widget is really really long all of a sudden and a scrollbar is needed";
+  m.changed();
+  var hScroll = byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0];
+  is(hScroll.scrollWidth > hScroll.clientWidth);
+});
+
 testCM("inlineWidget", function(cm) {
   var w = cm.setBookmark(Pos(0, 2), {widget: document.createTextNode("uu")});
   cm.setCursor(0, 2);

From 9025f2f6e0a6623a5ab51d653e49fdbf56c3d3d1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 30 Jul 2013 09:45:40 +0200
Subject: [PATCH 0328/4742] Fix confused test case

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

diff --git a/test/test.js b/test/test.js
index 88278aad8c..69897648dc 100644
--- a/test/test.js
+++ b/test/test.js
@@ -861,7 +861,7 @@ testCM("changedBookmark", function(cm) {
   m.changed();
   var hScroll = byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0];
   is(hScroll.scrollWidth > hScroll.clientWidth);
-});
+}, {value: "abcdefg"});
 
 testCM("inlineWidget", function(cm) {
   var w = cm.setBookmark(Pos(0, 2), {widget: document.createTextNode("uu")});

From 96400e8fc7a3d7303715d03078350036fc6f6743 Mon Sep 17 00:00:00 2001
From: Chris Granger <ibdknox@gmail.com>
Date: Mon, 29 Jul 2013 09:28:48 -0700
Subject: [PATCH 0329/4742] Allow multiple bookmarks to be shown at a point

Signed-off-by: Chris Granger <ibdknox@gmail.com>
---
 lib/codemirror.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a7d7e6cdbe..b17e7a4661 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4439,7 +4439,7 @@ window.CodeMirror = (function() {
       if (nextChange == pos) { // Update current marker set
         spanStyle = spanEndStyle = spanStartStyle = title = "";
         collapsed = null; nextChange = Infinity;
-        var foundBookmark = null;
+        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)) {
@@ -4453,14 +4453,18 @@ window.CodeMirror = (function() {
           } else if (sp.from > pos && nextChange > sp.from) {
             nextChange = sp.from;
           }
-          if (m.type == "bookmark" && sp.from == pos && m.replacedWith) foundBookmark = m;
+          if (m.type == "bookmark" && sp.from == pos && m.replacedWith) foundBookmarks.push(m);
         }
         if (collapsed && (collapsed.from || 0) == pos) {
           buildCollapsedSpan(builder, (collapsed.to == null ? len : collapsed.to) - pos,
                              collapsed.marker, collapsed.from == null);
           if (collapsed.to == null) return collapsed.marker.find();
         }
-        if (foundBookmark && !collapsed) buildCollapsedSpan(builder, 0, foundBookmark);
+        if (foundBookmarks.length && !collapsed) {
+          for(var i in foundBookmarks){
+            buildCollapsedSpan(builder, 0, foundBookmarks[i]);
+          }
+        }
       }
       if (pos >= len) break;
 

From 670464a13ace32e664e025008d88905e85cfc850 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 30 Jul 2013 09:48:55 +0200
Subject: [PATCH 0330/4742] Revise patch
 96400e8fc7a3d7303715d03078350036fc6f6743

Issue #1710
---
 lib/codemirror.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b17e7a4661..b7541826f0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4460,11 +4460,8 @@ window.CodeMirror = (function() {
                              collapsed.marker, collapsed.from == null);
           if (collapsed.to == null) return collapsed.marker.find();
         }
-        if (foundBookmarks.length && !collapsed) {
-          for(var i in foundBookmarks){
-            buildCollapsedSpan(builder, 0, foundBookmarks[i]);
-          }
-        }
+        if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
+          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
       }
       if (pos >= len) break;
 

From 88a03e386df2e3fe5f89238cff9ae763db41cdf6 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@chromium.org>
Date: Mon, 29 Jul 2013 20:56:51 +0400
Subject: [PATCH 0331/4742] Fix race condition in
 5dd408071ccb1200e1b53cfa5cf93b67b8dbd69a

---
 lib/codemirror.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b7541826f0..f1cf8e8ff8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1601,14 +1601,12 @@ window.CodeMirror = (function() {
       // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
       // Add a char to the end of textarea before paste occur so that
       // selection doesn't span to the end of textarea.
-      if (webkit) {
+      if (webkit && !cm.state.fakedLastChar) {
         var start = d.input.selectionStart, end = d.input.selectionEnd;
         d.input.value += "$";
         d.input.selectionStart = start;
         d.input.selectionEnd = end;
         cm.state.fakedLastChar = true;
-      } else {
-        cm.state.fakedLastChar = false;
       }
       cm.state.pasteIncoming = true;
       fastPoll(cm);

From 097980e6a28531d7b70fc38d2cf50610c3b63ea4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 31 Jul 2013 15:17:18 +0200
Subject: [PATCH 0332/4742] [scrollpastend addon] Add

---
 addon/scroll/scrollpastend.js | 34 ++++++++++++++++++++++++++++++++++
 lib/codemirror.js             | 10 ++++++++--
 mode/tcl/index.html           |  2 ++
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 addon/scroll/scrollpastend.js

diff --git a/addon/scroll/scrollpastend.js b/addon/scroll/scrollpastend.js
new file mode 100644
index 0000000000..14d7d5aeee
--- /dev/null
+++ b/addon/scroll/scrollpastend.js
@@ -0,0 +1,34 @@
+(function() {
+  "use strict";
+
+  CodeMirror.defineOption("scrollPastEnd", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.off("change", onChange);
+      cm.display.lineSpace.parentNode.style.paddingBottom = "";
+      cm.state.scrollPastEndPadding = null;
+    }
+    if (val) {
+      cm.on("change", onChange);
+      updateBottomMargin(cm);
+    }
+  });
+
+  function onChange(cm, change) {
+    if (CodeMirror.changeEnd(change).line == cm.lastLine())
+      updateBottomMargin(cm);
+  }
+
+  function updateBottomMargin(cm) {
+    var padding = "";
+    if (cm.lineCount() > 1) {
+      var totalH = cm.display.scroller.clientHeight - 30,
+          lastLineH = cm.getLineHandle(cm.lastLine()).height;
+      padding = (totalH - lastLineH) + "px";
+    }
+    if (cm.state.scrollPastEndPadding != padding) {
+      cm.state.scrollPastEndPadding = padding;
+      cm.display.lineSpace.parentNode.style.paddingBottom = padding;
+      cm.setSize();
+    }
+  }
+})();
diff --git a/lib/codemirror.js b/lib/codemirror.js
index f1cf8e8ff8..ba02ba63c2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -332,13 +332,19 @@ window.CodeMirror = (function() {
       d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";
       d.scrollbarV.firstChild.style.height =
         (scrollHeight - d.scroller.clientHeight + d.scrollbarV.clientHeight) + "px";
-    } else d.scrollbarV.style.display = "";
+    } else {
+      d.scrollbarV.style.display = "";
+      d.scrollbarV.firstChild.style.height = "0";
+    }
     if (needsH) {
       d.scrollbarH.style.display = "block";
       d.scrollbarH.style.right = needsV ? scrollbarWidth(d.measure) + "px" : "0";
       d.scrollbarH.firstChild.style.width =
         (d.scroller.scrollWidth - d.scroller.clientWidth + d.scrollbarH.clientWidth) + "px";
-    } else d.scrollbarH.style.display = "";
+    } else {
+      d.scrollbarH.style.display = "";
+      d.scrollbarH.firstChild.style.width = "0";
+    }
     if (needsH && needsV) {
       d.scrollbarFiller.style.display = "block";
       d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = scrollbarWidth(d.measure) + "px";
diff --git a/mode/tcl/index.html b/mode/tcl/index.html
index e2e42a04be..afdf127899 100644
--- a/mode/tcl/index.html
+++ b/mode/tcl/index.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
     <script src="tcl.js"></script>
+    <script src="../../addon/scroll/scrollpastend.js"></script>
     <link rel="stylesheet" href="../../theme/night.css">
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>
@@ -119,6 +120,7 @@ <h1>CodeMirror: Tcl mode</h1>
 		theme: "night",
         lineNumbers: true,
         indentUnit: 2,
+        scrollPastEnd: true,
         mode: "text/x-tcl"
       });
     </script>

From 730d5dd19e3dcfaa972e33060d1d58cb51bc71d9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 31 Jul 2013 15:34:04 +0200
Subject: [PATCH 0333/4742] [show-hint addon] Fix bug with updating completions
 when typing

---
 addon/hint/show-hint.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index a4960ddeb0..6247459dd0 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -69,13 +69,9 @@
         completion.cm.off("cursorActivity", activity);
         CodeMirror.signal(data, "close");
       }
-      function isDone() {
-        if (finished) return true;
-        if (!completion.widget) { done(); return true; }
-      }
 
       function update() {
-        if (isDone()) return;
+        if (finished) return;
         CodeMirror.signal(data, "update");
         if (completion.options.async)
           completion.getHints(completion.cm, finishUpdate, completion.options);
@@ -84,7 +80,7 @@
       }
       function finishUpdate(data_) {
         data = data_;
-        if (isDone()) return;
+        if (finished) return;
         if (!data || !data.list.length) return done();
         completion.widget = new Widget(completion, data);
       }

From 98394a96cd1998f4a59a1688dba662f18ae52deb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 31 Jul 2013 15:40:33 +0200
Subject: [PATCH 0334/4742] [show-hint addon] Don't try to signal event on null
 data

Closes #1714
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 6247459dd0..a33c4c3559 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -67,7 +67,7 @@
         finished = true;
         completion.close();
         completion.cm.off("cursorActivity", activity);
-        CodeMirror.signal(data, "close");
+        if (data) CodeMirror.signal(data, "close");
       }
 
       function update() {

From 3e4540fcf90495280269c4a9c0ba8aae2f0e989f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 1 Aug 2013 09:00:13 +0200
Subject: [PATCH 0335/4742] Remove remaining local LICENSE files

---
 mode/livescript/LICENSE | 23 -----------------------
 mode/sieve/LICENSE      | 19 -------------------
 mode/xquery/LICENSE     | 20 --------------------
 3 files changed, 62 deletions(-)
 delete mode 100644 mode/livescript/LICENSE
 delete mode 100644 mode/sieve/LICENSE
 delete mode 100644 mode/xquery/LICENSE

diff --git a/mode/livescript/LICENSE b/mode/livescript/LICENSE
deleted file mode 100644
index a675c40233..0000000000
--- a/mode/livescript/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-The MIT License
-
-Copyright (c) 2013 Kenneth Bentley
-Modified from the CoffeeScript CodeMirror mode, Copyright (c) 2011 Jeff Pickhardt
-Modified from the Python CodeMirror mode, Copyright (c) 2010 Timothy Farrell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mode/sieve/LICENSE b/mode/sieve/LICENSE
deleted file mode 100644
index 8a74612cba..0000000000
--- a/mode/sieve/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2012 Thomas Schmid <schmid-thomas@gmx.net>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mode/xquery/LICENSE b/mode/xquery/LICENSE
deleted file mode 100644
index 2a2d47be53..0000000000
--- a/mode/xquery/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file

From 1984f2957ff49fb8dac3491c2329ef76f86b0a33 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Wed, 31 Jul 2013 16:01:52 +0200
Subject: [PATCH 0336/4742] [paraiso theme] Add

---
 demo/theme.html         | 36 ++++++++++++++++++++----------------
 theme/paraiso-dark.css  | 33 +++++++++++++++++++++++++++++++++
 theme/paraiso-light.css | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 16 deletions(-)
 create mode 100644 theme/paraiso-dark.css
 create mode 100644 theme/paraiso-light.css

diff --git a/demo/theme.html b/demo/theme.html
index 62544be1a7..53bd90a5a4 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -5,28 +5,30 @@
     <title>CodeMirror: Theme Demo</title>
     <link rel="stylesheet" href="../lib/codemirror.css">
     <script src="../lib/codemirror.js"></script>
-    <link rel="stylesheet" href="../theme/neat.css">
+    <link rel="stylesheet" href="../theme/3024-day.css">
+    <link rel="stylesheet" href="../theme/3024-night.css">
+    <link rel="stylesheet" href="../theme/ambiance.css">
+    <link rel="stylesheet" href="../theme/base16-dark.css">
+    <link rel="stylesheet" href="../theme/base16-light.css">
+    <link rel="stylesheet" href="../theme/blackboard.css">
+    <link rel="stylesheet" href="../theme/cobalt.css">
+    <link rel="stylesheet" href="../theme/eclipse.css">
     <link rel="stylesheet" href="../theme/elegant.css">
     <link rel="stylesheet" href="../theme/erlang-dark.css">
-    <link rel="stylesheet" href="../theme/night.css">
+    <link rel="stylesheet" href="../theme/lesser-dark.css">
+    <link rel="stylesheet" href="../theme/midnight.css">
     <link rel="stylesheet" href="../theme/monokai.css">
-    <link rel="stylesheet" href="../theme/cobalt.css">
-    <link rel="stylesheet" href="../theme/eclipse.css">
+    <link rel="stylesheet" href="../theme/neat.css">
+    <link rel="stylesheet" href="../theme/night.css">
+    <link rel="stylesheet" href="../theme/paraiso-dark.css">
+    <link rel="stylesheet" href="../theme/paraiso-light.css">
     <link rel="stylesheet" href="../theme/rubyblue.css">
-    <link rel="stylesheet" href="../theme/lesser-dark.css">
-    <link rel="stylesheet" href="../theme/xq-dark.css">
-    <link rel="stylesheet" href="../theme/xq-light.css">
-    <link rel="stylesheet" href="../theme/ambiance.css">
-    <link rel="stylesheet" href="../theme/blackboard.css">
-    <link rel="stylesheet" href="../theme/vibrant-ink.css">
     <link rel="stylesheet" href="../theme/solarized.css">
-    <link rel="stylesheet" href="../theme/twilight.css">
-    <link rel="stylesheet" href="../theme/midnight.css">
-    <link rel="stylesheet" href="../theme/3024-day.css">
-    <link rel="stylesheet" href="../theme/3024-night.css">
-    <link rel="stylesheet" href="../theme/base16-light.css">
-    <link rel="stylesheet" href="../theme/base16-dark.css">
     <link rel="stylesheet" href="../theme/tomorrow-night-eighties.css">
+    <link rel="stylesheet" href="../theme/twilight.css">
+    <link rel="stylesheet" href="../theme/vibrant-ink.css">
+    <link rel="stylesheet" href="../theme/xq-dark.css">
+    <link rel="stylesheet" href="../theme/xq-light.css">
     <script src="../mode/javascript/javascript.js"></script>
     <script src="../keymap/extra.js"></script>
     <link rel="stylesheet" href="../doc/docs.css">
@@ -69,6 +71,8 @@ <h1>CodeMirror: Theme demo</h1>
     <option>monokai</option>
     <option>neat</option>
     <option>night</option>
+    <option>paraiso-dark</option>
+    <option>paraiso-light</option>
     <option>rubyblue</option>
     <option>solarized dark</option>
     <option>solarized light</option>
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
new file mode 100644
index 0000000000..1e457918de
--- /dev/null
+++ b/theme/paraiso-dark.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       Paraíso (Dark)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso.tmTheme)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-dark.CodeMirror {background: #2f1e2e; color: #b9b6b0;}
+.cm-s-paraiso-dark div.CodeMirror-selected {background: #41323f !important;}
+.cm-s-paraiso-dark .CodeMirror-gutters {background: #2f1e2e; border-right: 0px;}
+.cm-s-paraiso-dark .CodeMirror-linenumber {color: #776e71;}
+.cm-s-paraiso-dark .CodeMirror-cursor {border-left: 1px solid #8d8687 !important;}
+
+.cm-s-paraiso-dark span.cm-comment {color: #e96ba8;}
+.cm-s-paraiso-dark span.cm-atom {color: #815ba4;}
+.cm-s-paraiso-dark span.cm-number {color: #815ba4;}
+
+.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute {color: #48b685;}
+.cm-s-paraiso-dark span.cm-keyword {color: #ef6155;}
+.cm-s-paraiso-dark span.cm-string {color: #fec418;}
+
+.cm-s-paraiso-dark span.cm-variable {color: #48b685;}
+.cm-s-paraiso-dark span.cm-variable-2 {color: #06b6ef;}
+.cm-s-paraiso-dark span.cm-def {color: #f99b15;}
+.cm-s-paraiso-dark span.cm-error {background: #ef6155; color: #8d8687;}
+.cm-s-paraiso-dark span.cm-bracket {color: #b9b6b0;}
+.cm-s-paraiso-dark span.cm-tag {color: #ef6155;}
+.cm-s-paraiso-dark span.cm-link {color: #815ba4;}
+
+.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
new file mode 100644
index 0000000000..540d58b7d3
--- /dev/null
+++ b/theme/paraiso-light.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       Paraíso (Light)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso.tmTheme)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-light.CodeMirror {background: #e7e9db; color: #41323f;}
+.cm-s-paraiso-light div.CodeMirror-selected {background: #b9b6b0 !important;}
+.cm-s-paraiso-light .CodeMirror-gutters {background: #e7e9db; border-right: 0px;}
+.cm-s-paraiso-light .CodeMirror-linenumber {color: #8d8687;}
+.cm-s-paraiso-light .CodeMirror-cursor {border-left: 1px solid #776e71 !important;}
+
+.cm-s-paraiso-light span.cm-comment {color: #e96ba8;}
+.cm-s-paraiso-light span.cm-atom {color: #815ba4;}
+.cm-s-paraiso-light span.cm-number {color: #815ba4;}
+
+.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute {color: #48b685;}
+.cm-s-paraiso-light span.cm-keyword {color: #ef6155;}
+.cm-s-paraiso-light span.cm-string {color: #fec418;}
+
+.cm-s-paraiso-light span.cm-variable {color: #48b685;}
+.cm-s-paraiso-light span.cm-variable-2 {color: #06b6ef;}
+.cm-s-paraiso-light span.cm-def {color: #f99b15;}
+.cm-s-paraiso-light span.cm-error {background: #ef6155; color: #776e71;}
+.cm-s-paraiso-light span.cm-bracket {color: #41323f;}
+.cm-s-paraiso-light span.cm-tag {color: #ef6155;}
+.cm-s-paraiso-light span.cm-link {color: #815ba4;}
+
+.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

From 92c906f82687f22be78df5fd8495a0aeccabf071 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Thu, 1 Aug 2013 11:53:01 +0200
Subject: [PATCH 0337/4742] [paraiso theme] Fix url

---
 theme/paraiso-dark.css  | 2 +-
 theme/paraiso-light.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index 1e457918de..abee9ab860 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -3,7 +3,7 @@
     Name:       Paraíso (Dark)
     Author:     Jan T. Sott
 
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso.tmTheme)
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
     Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
 
 */
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index 540d58b7d3..e9da474c82 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -3,7 +3,7 @@
     Name:       Paraíso (Light)
     Author:     Jan T. Sott
 
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso.tmTheme)
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
     Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
 
 */

From 849035a1541b66a9e3ed50d371d51e8fdbd4ee09 Mon Sep 17 00:00:00 2001
From: Jochen Berger <fooberger@gmail.com>
Date: Fri, 2 Aug 2013 15:49:29 +0200
Subject: [PATCH 0338/4742] the mode for "Properties files" should be
 "properties", not "clike"

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

diff --git a/mode/meta.js b/mode/meta.js
index 8e8c8f5f5c..9c5d986f66 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -46,7 +46,7 @@ CodeMirror.modeInfo = [
   {name: 'PHP(HTML)', mime: 'application/x-httpd-php', mode: 'php'},
   {name: 'Pig', mime: 'text/x-pig', mode: 'pig'},
   {name: 'Plain Text', mime: 'text/plain', mode: 'null'},
-  {name: 'Properties files', mime: 'text/x-properties', mode: 'clike'},
+  {name: 'Properties files', mime: 'text/x-properties', mode: 'properties'},
   {name: 'Python', mime: 'text/x-python', mode: 'python'},
   {name: 'Cython', mime: 'text/x-cython', mode: 'python'},
   {name: 'R', mime: 'text/x-rsrc', mode: 'r'},

From b86ffff14a7a73b08c905641037ccdef1d25fa79 Mon Sep 17 00:00:00 2001
From: Benjamin DeCoste <bendecoste@gmail.com>
Date: Fri, 2 Aug 2013 00:57:27 -0300
Subject: [PATCH 0339/4742] [vim mode] Fix visual mode downwards movement bug

Previously, if you tried to move further down the document than exist
the cursor would not move down.  This sets selectionEnd.line to be
no greater than the total length of the document.
---
 keymap/vim.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8db2767a9e..9c9454d6c8 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1104,6 +1104,11 @@
             if (vim.visualLine) {
               if (cursorIsBefore(selectionStart, selectionEnd)) {
                 selectionStart.ch = 0;
+
+                var lastLine = cm.lastLine();
+                if (selectionEnd.line > lastLine) {
+                  selectionEnd.line = lastLine;
+                }
                 selectionEnd.ch = lineLength(cm, selectionEnd.line);
               } else {
                 selectionEnd.ch = 0;

From 455a880611641aeb01e47f0f17999c15318a7af6 Mon Sep 17 00:00:00 2001
From: Hasan Karahan <hasan.karahan81@gmail.com>
Date: Sat, 3 Aug 2013 21:57:29 +0500
Subject: [PATCH 0340/4742] [rst mode] LaTex/Python inner mode glitches

The were some minor issues w.r.t. where exactly an `stex` or `python`
inner mode starts and where the outer `rst` mode resumes; fixed.
---
 mode/rst/rst.js | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 508896d25b..54990bb257 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -124,9 +124,7 @@ CodeMirror.defineMode('rst-base', function (config) {
                     token = 'keyword';
 
                     if (stream.current().match(/^(?:math|latex)/)) {
-                        state.tmp = {
-                            mode: mode_stex, local: mode_stex.startState()
-                        };
+                        state.tmp_stex = true;
                     }
                     break;
                 case 2:
@@ -135,6 +133,12 @@ CodeMirror.defineMode('rst-base', function (config) {
                     token = 'meta';
                     break;
                 case 3:
+                    if (state.tmp_stex) {
+                        state.tmp_stex = undefined; state.tmp = {
+                            mode: mode_stex, local: mode_stex.startState()
+                        };
+                    }
+
                     if (state.tmp) {
                         if (stream.peek() == '`') {
                             change(state, to_normal, context(rx_role_pre, 4));
@@ -345,24 +349,24 @@ CodeMirror.defineMode('rst-base', function (config) {
                     change(state, to_explicit, context(rx_directive, 2));
                     assert(stream.match(rx_directive_tail));
                     token = 'meta';
-                    break;
-                default:
+
                     if (stream.match(/^latex\s*$/) || state.tmp_stex) {
-                        state.tmp_stex = undefined;
-                        change(state, to_mode, {
+                        state.tmp_stex = undefined; change(state, to_mode, {
                             mode: mode_stex, local: mode_stex.startState()
                         });
-                    } else if (stream.match(/^python\s*$/) || state.tmp_py) {
-                        state.tmp_py = undefined;
-                        change(state, to_mode, {
+                    }
+                    break;
+                case 2:
+                    change(state, to_explicit, context(rx_directive, 3));
+                    if (stream.match(/^python\s*$/) || state.tmp_py) {
+                        state.tmp_py = undefined; change(state, to_mode, {
                             mode: mode_python, local: mode_python.startState()
                         });
                     }
-
-                    else {
-                        change(state, to_normal);
-                        assert(stream.current() == '');
-                    }
+                    break;
+                default:
+                    change(state, to_normal);
+                    assert(stream.current() == '');
             }
         } else if (phase(state) == rx_link || stream.match(rx_link, false)) {
 
@@ -441,6 +445,7 @@ CodeMirror.defineMode('rst-base', function (config) {
                 return state.ctx.mode.token(stream, state.ctx.local);
             } catch (ex) {
                 change(state, to_normal);
+                console.error (ex);
                 return null;
             }
         }

From f813f18719f3e6e55794a79fe6411fac4711333b Mon Sep 17 00:00:00 2001
From: Hasan Karahan <hasan.karahan81@gmail.com>
Date: Sun, 4 Aug 2013 13:22:45 +0500
Subject: [PATCH 0341/4742] [rst mode] Removed unknown bugs catcher

---
 mode/rst/rst.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 54990bb257..75563ba982 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -441,13 +441,7 @@ CodeMirror.defineMode('rst-base', function (config) {
                 return null;
             }
 
-            try {
-                return state.ctx.mode.token(stream, state.ctx.local);
-            } catch (ex) {
-                change(state, to_normal);
-                console.error (ex);
-                return null;
-            }
+            return state.ctx.mode.token(stream, state.ctx.local);
         }
 
         change(state, to_normal);

From 29392e85975be5ed5b747966e7bff7949473685c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Aug 2013 13:15:38 +0200
Subject: [PATCH 0342/4742] Prevent onFocus/resetInput from interfering with
 nested editor

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ba02ba63c2..fccf66314e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2118,7 +2118,7 @@ window.CodeMirror = (function() {
       cm.state.focused = true;
       if (cm.display.wrapper.className.search(/\bCodeMirror-focused\b/) == -1)
         cm.display.wrapper.className += " CodeMirror-focused";
-      resetInput(cm, true);
+      if (!cm.curOp) resetInput(cm, true);
     }
     slowPoll(cm);
     restartBlink(cm);

From 36409a986e38b7f5665db94c6d7d4f3ecfe1da7f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Aug 2013 13:42:48 +0200
Subject: [PATCH 0343/4742] [brace-fold addon] Use getTokenStyleAt instead of
 getTokenAt when scanning

---
 addon/fold/brace-fold.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 0b4d7dc34d..2c76229eb1 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -12,7 +12,7 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
         continue;
       }
       if (pass == 1 && found < start.ch) break;
-      tokenType = cm.getTokenAt(CodeMirror.Pos(line, found + 1)).type;
+      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
       if (!/^(comment|string)/.test(tokenType)) return found + 1;
       at = found - 1;
     }
@@ -34,7 +34,7 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
       if (nextClose < 0) nextClose = text.length;
       pos = Math.min(nextOpen, nextClose);
       if (pos == text.length) break;
-      if (cm.getTokenAt(CodeMirror.Pos(i, pos + 1)).type == tokenType) {
+      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
         if (pos == nextOpen) ++count;
         else if (!--count) { end = i; endCh = pos; break outer; }
       }

From ba21985bfa7c2b8ad6b1ecd564a41b06083d2475 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Aug 2013 13:45:54 +0200
Subject: [PATCH 0344/4742] Use a bigger search range when finding a
 start-of-parse point in mixed modes

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fccf66314e..483819e8c2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -930,8 +930,8 @@ window.CodeMirror = (function() {
   // smallest indentation, which tends to need the least context to
   // parse correctly.
   function findStartLine(cm, n, precise) {
-    var minindent, minline, doc = cm.doc;
-    for (var search = n, lim = n - 100; search > lim; --search) {
+    var minindent, minline, doc = cm.doc, maxScan = cm.doc.mode.innerMode ? 1000 : 100;
+    for (var search = n, lim = n - maxScan; search > lim; --search) {
       if (search <= doc.first) return doc.first;
       var line = getLine(doc, search - 1);
       if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
@@ -946,7 +946,7 @@ window.CodeMirror = (function() {
 
   function getStateBefore(cm, n, precise) {
     var doc = cm.doc, display = cm.display;
-      if (!doc.mode.startState) return true;
+    if (!doc.mode.startState) return true;
     var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
     if (!state) state = startState(doc.mode);
     else state = copyState(doc.mode, state);

From fd11debd80ddf65fb783fe83a6668e9fc3fa99cc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Aug 2013 14:01:35 +0200
Subject: [PATCH 0345/4742] [brace-fold addon] Fix bad use of lastIndexOf

---
 addon/fold/brace-fold.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 2c76229eb1..2560b2b94c 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -4,7 +4,7 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
 
   function findOpening(openCh) {
     for (var at = start.ch, pass = 0;;) {
-      var found = lineText.lastIndexOf(openCh, at - 1);
+      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
       if (found == -1) {
         if (pass == 1) break;
         pass = 1;

From 0d45af397e9e02670a1b4e925ddd4fcc5d088820 Mon Sep 17 00:00:00 2001
From: Steve O'Hara <sohara@pivotal-solutions.co.uk>
Date: Sat, 3 Aug 2013 13:50:37 +0100
Subject: [PATCH 0346/4742] [velocity mode] Update

 * Updated for CodeMirror 3 - added comment clock declarations

 * Corrected handling of macro calls with a body

 * Added extra features for detecting variables within strings and
   methods & properties of objects

 * Corrected the detection of methods and properties of Java objects
---
 mode/velocity/index.html  |  4 +++
 mode/velocity/velocity.js | 66 ++++++++++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index fb59cb590d..96df4c88b8 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -62,13 +62,17 @@ <h1>CodeMirror: Velocity mode</h1>
 $someObject.getValues("this is a string split
         across lines")
 
+$someObject("This plus $something in the middle").method(7567).property
+
 #macro( tablerows $color $somelist )
     #foreach( $something in $somelist )
         <tr><td bgcolor=$color>$something</td></tr>
+        <tr><td bgcolor=$color>$bodyContent</td></tr>
     #end
 #end
 
 #tablerows("red" ["dadsdf","dsa"])
+#@tablerows("red" ["dadsdf","dsa"]) some body content #end
 
    Variable reference: #set( $monkey = $bill )
    String literal: #set( $monkey.Friend = 'monica' )
diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index 43a97ba676..968d8799e9 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -9,7 +9,7 @@ CodeMirror.defineMode("velocity", function() {
                               "#{end} #{else} #{break} #{stop}");
     var functions = parseWords("#if #elseif #foreach #set #include #parse #macro #define #evaluate " +
                                "#{if} #{elseif} #{foreach} #{set} #{include} #{parse} #{macro} #{define} #{evaluate}");
-    var specials = parseWords("$foreach.count $foreach.hasNext $foreach.first $foreach.last $foreach.topmost $foreach.parent $velocityCount");
+    var specials = parseWords("$foreach.count $foreach.hasNext $foreach.first $foreach.last $foreach.topmost $foreach.parent.count $foreach.parent.hasNext $foreach.parent.first $foreach.parent.last $foreach.parent $velocityCount $!bodyContent $bodyContent");
     var isOperatorChar = /[+\-*&%=<>!?:\/|]/;
 
     function chain(stream, state, f) {
@@ -20,30 +20,50 @@ CodeMirror.defineMode("velocity", function() {
         var beforeParams = state.beforeParams;
         state.beforeParams = false;
         var ch = stream.next();
-        // start of string?
-        if ((ch == '"' || ch == "'") && state.inParams)
+        // start of unparsed string?
+        if ((ch == "'") && state.inParams) {
+            state.lastTokenWasBuiltin = false;
             return chain(stream, state, tokenString(ch));
+        }
+        // start of parsed string?
+        else if ((ch == '"')) {
+            state.lastTokenWasBuiltin = false;
+            if (state.inString) {
+                state.inString = false;
+                return "string";
+            }
+            else if (state.inParams)
+                return chain(stream, state, tokenString(ch));
+        }
         // is it one of the special signs []{}().,;? Seperator?
         else if (/[\[\]{}\(\),;\.]/.test(ch)) {
-            if (ch == "(" && beforeParams) state.inParams = true;
-            else if (ch == ")") state.inParams = false;
+            if (ch == "(" && beforeParams)
+                state.inParams = true;
+            else if (ch == ")") {
+                state.inParams = false;
+                state.lastTokenWasBuiltin = true;
+            }
             return null;
         }
         // start of a number value?
         else if (/\d/.test(ch)) {
+            state.lastTokenWasBuiltin = false;
             stream.eatWhile(/[\w\.]/);
             return "number";
         }
         // multi line comment?
         else if (ch == "#" && stream.eat("*")) {
+            state.lastTokenWasBuiltin = false;
             return chain(stream, state, tokenComment);
         }
         // unparsed content?
         else if (ch == "#" && stream.match(/ *\[ *\[/)) {
+            state.lastTokenWasBuiltin = false;
             return chain(stream, state, tokenUnparsed);
         }
         // single line comment?
         else if (ch == "#" && stream.eat("#")) {
+            state.lastTokenWasBuiltin = false;
             stream.skipToEnd();
             return "comment";
         }
@@ -51,33 +71,44 @@ CodeMirror.defineMode("velocity", function() {
         else if (ch == "$") {
             stream.eatWhile(/[\w\d\$_\.{}]/);
             // is it one of the specials?
-            if (specials && specials.propertyIsEnumerable(stream.current().toLowerCase())) {
+            if (specials && specials.propertyIsEnumerable(stream.current())) {
                 return "keyword";
             }
             else {
+                state.lastTokenWasBuiltin = true;
                 state.beforeParams = true;
                 return "builtin";
             }
         }
         // is it a operator?
         else if (isOperatorChar.test(ch)) {
+            state.lastTokenWasBuiltin = false;
             stream.eatWhile(isOperatorChar);
             return "operator";
         }
         else {
             // get the whole word
-            stream.eatWhile(/[\w\$_{}]/);
-            var word = stream.current().toLowerCase();
+            stream.eatWhile(/[\w\$_{}@]/);
+            var word = stream.current();
             // is it one of the listed keywords?
             if (keywords && keywords.propertyIsEnumerable(word))
                 return "keyword";
             // is it one of the listed functions?
             if (functions && functions.propertyIsEnumerable(word) ||
-                stream.current().match(/^#[a-z0-9_]+ *$/i) && stream.peek()=="(") {
+                    (stream.current().match(/^#@?[a-z0-9_]+ *$/i) && stream.peek()=="(") &&
+                     !(functions && functions.propertyIsEnumerable(word.toLowerCase()))) {
                 state.beforeParams = true;
+                state.lastTokenWasBuiltin = false;
                 return "keyword";
             }
+            if (state.inString) {
+                state.lastTokenWasBuiltin = false;
+                return "string";
+            }
+            if (stream.pos > word.length && stream.string.charAt(stream.pos-word.length-1)=="." && state.lastTokenWasBuiltin)
+                return "builtin";
             // default: just a "word"
+            state.lastTokenWasBuiltin = false;
             return null;
         }
     }
@@ -86,7 +117,12 @@ CodeMirror.defineMode("velocity", function() {
         return function(stream, state) {
             var escaped = false, next, end = false;
             while ((next = stream.next()) != null) {
-                if (next == quote && !escaped) {
+                if ((next == quote) && !escaped) {
+                    end = true;
+                    break;
+                }
+                if (quote=='"' && stream.peek() == '$' && !escaped) {
+                    state.inString = true;
                     end = true;
                     break;
                 }
@@ -130,14 +166,20 @@ CodeMirror.defineMode("velocity", function() {
             return {
                 tokenize: tokenBase,
                 beforeParams: false,
-                inParams: false
+                inParams: false,
+                inString: false,
+                lastTokenWasBuiltin: false
             };
         },
 
         token: function(stream, state) {
             if (stream.eatSpace()) return null;
             return state.tokenize(stream, state);
-        }
+        },
+        blockCommentStart: "#*",
+        blockCommentEnd: "*#",
+        lineComment: "##",
+        fold: "velocity"
     };
 });
 

From 55583715087cf148be173f1eacd1840ee1a944ec Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Aug 2013 15:28:06 +0200
Subject: [PATCH 0347/4742] (Mostly) handle cursor positioning around multiple
 bookmarks in same position

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 483819e8c2..cead3e409b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4415,11 +4415,13 @@ window.CodeMirror = (function() {
         if (size) {
           builder.measure[builder.pos] = widget;
         } else {
-          var elt = builder.measure[builder.pos] = zeroWidthElement(builder.cm.display.measure);
-          if (marker.type != "bookmark" || marker.insertLeft)
-            builder.pre.insertBefore(elt, widget);
+          var elt = zeroWidthElement(builder.cm.display.measure);
+          if (marker.type == "bookmark" && !marker.insertLeft)
+            builder.measure[builder.pos] = builder.pre.appendChild(elt);
+          else if (builder.measure[builder.pos])
+            return;
           else
-            builder.pre.appendChild(elt);
+            builder.measure[builder.pos] = builder.pre.insertBefore(elt, widget);
         }
         builder.measuredSomething = true;
       }
diff --git a/test/test.js b/test/test.js
index 69897648dc..57777f86f9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -517,6 +517,23 @@ testCM("bookmarkCursor", function(cm) {
   is(cm.cursorCoords(Pos(4, 1)).left > pos41.left, "single-char bug");
 }, {value: "foo\nbar\n\n\nx\ny"});
 
+testCM("multiBookmarkCursor", function(cm) {
+  var ms = [], m;
+  function add(insertLeft) {
+    for (var i = 0; i < 3; ++i) {
+      var node = document.createElement("span");
+      node.innerHTML = "X";
+      ms.push(cm.setBookmark(Pos(0, 1), {widget: node, insertLeft: insertLeft}));
+    }
+  }
+  var base1 = cm.cursorCoords(Pos(0, 1)).left, base4 = cm.cursorCoords(Pos(0, 4)).left;
+  add(true);
+  eq(base1, cm.cursorCoords(Pos(0, 1)).left);
+  while (m = ms.pop()) m.clear();
+  add(false);
+  eq(base4, cm.cursorCoords(Pos(0, 1)).left);
+}, {value: "abcdefg"});
+
 testCM("getAllMarks", function(cm) {
   addDoc(cm, 10, 10);
   var m1 = cm.setBookmark(Pos(0, 2));

From 84d12b21be4033fb09145759ce0c7e4be12e7f9f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Aug 2013 15:31:42 +0200
Subject: [PATCH 0348/4742] Disable another test on Phantom

(Works in real browsers.)
---
 test/test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test.js b/test/test.js
index 57777f86f9..1c37b4dfe1 100644
--- a/test/test.js
+++ b/test/test.js
@@ -518,6 +518,7 @@ testCM("bookmarkCursor", function(cm) {
 }, {value: "foo\nbar\n\n\nx\ny"});
 
 testCM("multiBookmarkCursor", function(cm) {
+  if (phantom) return;
   var ms = [], m;
   function add(insertLeft) {
     for (var i = 0; i < 3; ++i) {

From 5804a9322cdb68be041ffc7a515e982cf7a63bc8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 8 Aug 2013 10:15:05 +0200
Subject: [PATCH 0349/4742] Re-reset the input right after a focus event

It seems recent versions of Chrome/Blink fire the handler first,
and then clear the selection.

Issue #1730
---
 lib/codemirror.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cead3e409b..75882a4416 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2118,7 +2118,10 @@ window.CodeMirror = (function() {
       cm.state.focused = true;
       if (cm.display.wrapper.className.search(/\bCodeMirror-focused\b/) == -1)
         cm.display.wrapper.className += " CodeMirror-focused";
-      if (!cm.curOp) resetInput(cm, true);
+      if (!cm.curOp) {
+        resetInput(cm, true);
+        if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
+      }
     }
     slowPoll(cm);
     restartBlink(cm);

From 7f82421f694e680fda16c05bfbd9c061382949ba Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@chromium.org>
Date: Wed, 7 Aug 2013 20:47:05 +0400
Subject: [PATCH 0350/4742] [xml mode] Fix value-less attributes

Issue #902
---
 mode/xml/xml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 84f34a2934..53285c848c 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -261,7 +261,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   function attribute(type) {
     if (type == "equals") return cont(attvalue, attributes);
     if (!Kludges.allowMissing) setStyle = "error";
-    else if (type == "word") setStyle = "attribute";
+    else if (type == "word") {setStyle = "attribute"; return cont(attribute, attributes);}
     return (type == "endTag" || type == "selfcloseTag") ? pass() : cont();
   }
   function attvalue(type) {

From 4e061c0b09871d4c3df9b14cae54a00e5286171a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 Aug 2013 12:40:36 +0200
Subject: [PATCH 0351/4742] Clear measure div after line measurement

To prevent a lot of DOM nodes from sticking around after measuring a
long line, easing the pressure on the GC.
---
 lib/codemirror.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 75882a4416..7946092ea1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1096,6 +1096,7 @@ window.CodeMirror = (function() {
       if (cur.measureRight) rect.right = getRect(cur.measureRight).left;
       if (cur.leftSide) rect.leftSide = measureRect(getRect(cur.leftSide));
     }
+    removeChildren(cm.display.measure);
     for (var i = 0, cur; i < data.length; ++i) if (cur = data[i]) {
       finishRect(cur);
       if (cur.leftSide) finishRect(cur.leftSide);

From d64948850d2abcf9ca1e51d712ed658ae5b12218 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 Aug 2013 12:49:38 +0200
Subject: [PATCH 0352/4742] [continuecomment addon] Move to addon/comment (from
 addon/edit)

---
 addon/{edit => comment}/continuecomment.js | 0
 doc/compress.html                          | 4 ++--
 doc/manual.html                            | 2 +-
 mode/javascript/index.html                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename addon/{edit => comment}/continuecomment.js (100%)

diff --git a/addon/edit/continuecomment.js b/addon/comment/continuecomment.js
similarity index 100%
rename from addon/edit/continuecomment.js
rename to addon/comment/continuecomment.js
diff --git a/doc/compress.html b/doc/compress.html
index 864f4f28cd..e2d79f581d 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -148,8 +148,8 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/addon/edit/closebrackets.js">closebrackets.js</option>
           <option value="http://codemirror.net/addon/edit/closetag.js">closetag.js</option>
           <option value="http://codemirror.net/addon/runmode/colorize.js">colorize.js</option>
-          <option value="http://codemirror.net/addon/edit/comment.js">comment.js</option>
-          <option value="http://codemirror.net/addon/edit/continuecomment.js">continuecomment.js</option>
+          <option value="http://codemirror.net/addon/comment/comment.js">comment.js</option>
+          <option value="http://codemirror.net/addon/comment/continuecomment.js">continuecomment.js</option>
           <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>
           <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
           <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index dc4100f70b..532285163c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2060,7 +2060,7 @@ <h2 id="addons">Addons</h2>
       editor instance to refresh its mode when the loading
       succeeded. See the <a href="../demo/loadmode.html">demo</a>.</dd>
 
-      <dt id="addon_continuecomment"><a href="../addon/edit/continuecomment.js"><code>edit/continuecomment.js</code></a></dt>
+      <dt id="addon_continuecomment"><a href="../addon/comment/continuecomment.js"><code>comment/continuecomment.js</code></a></dt>
       <dd>Adds an <code>continueComments</code> option, which can be
       set to true to have the editor prefix new lines inside C-like
       block comments with an asterisk when Enter is pressed. It can
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index db063b772d..0db35219b9 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
     <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="../../addon/edit/continuecomment.js"></script>
+    <script src="../../addon/comment/continuecomment.js"></script>
     <script src="../../addon/comment/comment.js"></script>
     <script src="javascript.js"></script>
     <link rel="stylesheet" href="../../doc/docs.css">

From 57036ab839b159632cc13404e547114f17aba415 Mon Sep 17 00:00:00 2001
From: Chris Coyier <chriscoyier@gmail.com>
Date: Fri, 9 Aug 2013 18:10:46 -0500
Subject: [PATCH 0353/4742] "grey" is an accepted named color value (same as
 "gray")

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

diff --git a/mode/css/css.js b/mode/css/css.js
index bdcd500868..c393cedff5 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -432,7 +432,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "darkslateblue", "darkslategray", "darkturquoise", "darkviolet",
     "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick",
     "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite",
-    "gold", "goldenrod", "gray", "green", "greenyellow", "honeydew",
+    "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew",
     "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender",
     "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",
     "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink",

From 3f5c8432b6080e22da5ded416c4e4d7a0f4ff341 Mon Sep 17 00:00:00 2001
From: Maksym Taran <maksym.taran@gmail.com>
Date: Sun, 11 Aug 2013 15:20:05 -0700
Subject: [PATCH 0354/4742] Python function/class definition highlighting.

---
 mode/python/python.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 4fe4d28912..28108e4c1a 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -151,6 +151,9 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         }
 
         if (stream.match(identifiers)) {
+            if (state.lastToken == 'def' || state.lastToken == 'class') {
+                return 'def';
+            }
             return 'variable';
         }
 
@@ -258,7 +261,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         // Handle '.' connected identifiers
         if (current === '.') {
             style = stream.match(identifiers, false) ? null : ERRORCLASS;
-            if (style === null && state.lastToken === 'meta') {
+            if (style === null && state.lastStyle === 'meta') {
                 // Apply 'meta' style to '.' connected identifiers when
                 // appropriate.
                 style = 'meta';
@@ -272,7 +275,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         }
 
         if ((style === 'variable' || style === 'builtin')
-            && state.lastToken === 'meta') {
+            && state.lastStyle === 'meta') {
             style = 'meta';
         }
 
@@ -313,6 +316,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             return {
               tokenize: tokenBase,
               scopes: [{offset:basecolumn || 0, type:'py'}],
+              lastStyle: null,
               lastToken: null,
               lambda: false,
               dedent: 0
@@ -322,12 +326,16 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         token: function(stream, state) {
             var style = tokenLexer(stream, state);
 
-            state.lastToken = style;
+            state.lastStyle = style;
+
+            var current = stream.current();
+            if (current && style) {
+                state.lastToken = current;
+            }
 
             if (stream.eol() && state.lambda) {
                 state.lambda = false;
             }
-
             return style;
         },
 

From b8a38503a24d143b975603c1509b9340ae9abbf2 Mon Sep 17 00:00:00 2001
From: mats cronqvist <masse@klarna.com>
Date: Sun, 11 Aug 2013 19:41:13 +0200
Subject: [PATCH 0355/4742] erlang mode bug fixes

---
 mode/erlang/erlang.js  | 56 ++++++++++++++++++++++--------------------
 mode/erlang/index.html |  2 +-
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index 79e0434d1f..f6e304c93a 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -11,18 +11,10 @@ CodeMirror.defineMIME("text/x-erlang", "erlang");
 
 CodeMirror.defineMode("erlang", function(cmCfg) {
 
-  function rval(state,stream,type) {
+  function rval(state,_stream,type) {
     // distinguish between "." as terminator and record field operator
-    if (type == "record") {
-      state.context = "record";
-    }else{
-      state.context = false;
-    }
+    state.in_record = (type == "record");
 
-    // remember last significant bit on last line for indenting
-    if (type != "whitespace" && type != "comment") {
-      state.lastToken = stream.current();
-    }
     //     erlang             -> CodeMirror tag
     switch (type) {
       case "atom":        return "atom";
@@ -133,6 +125,19 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
   }
 
   function tokenize(stream, state) {
+    // in multi-line string
+    if (state.in_string) {
+      state.in_string =  (!doubleQuote(stream));
+      return rval(state,stream,"string");
+    }
+
+    // in multi-line atom
+    if (state.in_atom) {
+      state.in_atom =  (!singleQuote(stream));
+      return rval(state,stream,"atom");
+    }
+
+    // whitespace
     if (stream.eatSpace()) {
       return rval(state,stream,"whitespace");
     }
@@ -183,20 +188,14 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
 
     // quoted atom
     if (ch == '\'') {
-      if (singleQuote(stream)) {
-        return rval(state,stream,"atom");
-      }else{
-        return rval(state,stream,"error");
-      }
+      state.in_atom = (!singleQuote(stream));
+      return rval(state,stream,"atom");
     }
 
     // string
     if (ch == '"') {
-      if (doubleQuote(stream)) {
-        return rval(state,stream,"string");
-      }else{
-        return rval(state,stream,"error");
-      }
+      state.in_string = (!doubleQuote(stream));
+      return rval(state,stream,"string");
     }
 
     // variable
@@ -282,7 +281,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     // separators
     if (greedy(stream,sepRE,separatorWords)) {
       // distinguish between "." as terminator and record field operator
-      if (state.context == false) {
+      if (!state.in_record) {
         pushToken(state,stream);
       }
       return rval(state,stream,"separator");
@@ -359,15 +358,19 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     var token = (peekToken(state)).token;
     var wordAfter = takewhile(textAfter,/[^a-z]/);
 
-    if (isMember(token,openParenWords)) {
-      return (peekToken(state)).column+token.length;
-    }else if (token == "." || token == ""){
+    if (state.in_string || state.in_atom) {
       return 0;
+    }else if (token == "." || token == "") {
+      return 0;
+    }else if (isMember(token,openParenWords)) {
+      return (peekToken(state)).column+token.length;
     }else if (token == "->") {
       if (wordAfter == "end") {
         return peekToken(state,2).column;
       }else if (peekToken(state,2).token == "fun") {
         return peekToken(state,2).column+indent;
+      }else if (peekToken(state,2).token == ".") {
+        return indent;
       }else{
         return (peekToken(state)).indent+indent;
       }
@@ -445,8 +448,9 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     startState:
       function() {
         return {tokenStack: [],
-                context: false,
-                lastToken: null};
+                in_record:  false,
+                in_string:  false,
+                in_atom:    false};
       },
 
     token:
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index fd21521c88..5bb81f669a 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -32,7 +32,7 @@ <h1>CodeMirror: Erlang mode</h1>
 rec_info(demo) -> record_info(fields,demo).
 
 demo() -> expand_recs(?MODULE,#demo{a="A",b="BB"}).
-  
+
 expand_recs(M,List) when is_list(List) ->
   [expand_recs(M,L)||L<-List];
 expand_recs(M,Tup) when is_tuple(Tup) ->

From 8a55c04f984e9a7ee0091eb1bbe277657357485a Mon Sep 17 00:00:00 2001
From: Chandra Sekhar Pydi <chandrap@google.com>
Date: Fri, 9 Aug 2013 11:32:58 -0700
Subject: [PATCH 0356/4742] Configurable delay between selection of a word to
 highlighting of word.

current delay of 100ms between selection of word to highlighting is almost instantaneous.
---
 addon/search/match-highlighter.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 3df6985984..e5cbeacab2 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -15,15 +15,18 @@
 (function() {
   var DEFAULT_MIN_CHARS = 2;
   var DEFAULT_TOKEN_STYLE = "matchhighlight";
+  var DEFAULT_DELAY = 100;
 
   function State(options) {
     if (typeof options == "object") {
       this.minChars = options.minChars;
       this.style = options.style;
       this.showToken = options.showToken;
+      this.delay = options.delay;
     }
     if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
     if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
+    if (this.delay == null) this.delay = DEFAULT_DELAY;
     this.overlay = this.timeout = null;
   }
 
@@ -45,7 +48,7 @@
   function cursorActivity(cm) {
     var state = cm.state.matchHighlighter;
     clearTimeout(state.timeout);
-    state.timeout = setTimeout(function() {highlightMatches(cm);}, 100);
+    state.timeout = setTimeout(function() {highlightMatches(cm);}, state.delay);
   }
 
   function highlightMatches(cm) {

From 1f27f945e646e08b2ca6fb53c07d2e6f9e45e764 Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@gmail.com>
Date: Fri, 12 Jul 2013 13:51:19 +0200
Subject: [PATCH 0357/4742] Fix linenumbers when undoing multiple changes

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7946092ea1..e5137c6219 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -461,7 +461,7 @@ window.CodeMirror = (function() {
     var positionsChangedFrom = Infinity;
     if (cm.options.lineNumbers)
       for (var i = 0; i < changes.length; ++i)
-        if (changes[i].diff) { positionsChangedFrom = changes[i].from; break; }
+        if (changes[i].diff && changes[i].from < positionsChangedFrom) { positionsChangedFrom = changes[i].from; }
 
     var end = doc.first + doc.size;
     var from = Math.max(visible.from - cm.options.viewportMargin, doc.first);

From 0252410f301ed01603e6ace8e5bc0b728f0fefcc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 12 Aug 2013 11:49:15 +0200
Subject: [PATCH 0358/4742] Fix bug in handling of Esc key in IE

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e5137c6219..4e610ee64b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2081,8 +2081,8 @@ window.CodeMirror = (function() {
   function onKeyDown(e) {
     var cm = this;
     if (!cm.state.focused) onFocus(cm);
-    if (ie && e.keyCode == 27) { e.returnValue = false; }
     if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
+    if (ie && e.keyCode == 27) e.returnValue = false;
     var code = e.keyCode;
     // IE does strange things with escape.
     cm.doc.sel.shift = code == 16 || e.shiftKey;

From 015b2e6399c1da1f0481f372313014e5bba74c38 Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Mon, 12 Aug 2013 18:16:52 -0700
Subject: [PATCH 0359/4742] [css mode] Add properties for CSS regions

---
 mode/css/css.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index c393cedff5..c6d34a3a97 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -366,9 +366,9 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
     "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
     "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-    "float", "float-offset", "font", "font-feature-settings", "font-family",
-    "font-kerning", "font-language-override", "font-size", "font-size-adjust",
-    "font-stretch", "font-style", "font-synthesis", "font-variant",
+    "float", "float-offset", "flow-into", "flow-from", "font", "font-feature-settings",
+    "font-family", "font-kerning", "font-language-override", "font-size",
+    "font-size-adjust", "font-stretch", "font-style", "font-synthesis", "font-variant",
     "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
     "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
     "font-weight", "grid-cell", "grid-column", "grid-column-align",
@@ -393,8 +393,8 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "perspective-origin", "pitch", "pitch-range", "play-during", "position",
     "presentation-level", "punctuation-trim", "quotes", "rendering-intent",
     "resize", "rest", "rest-after", "rest-before", "richness", "right",
-    "rotation", "rotation-point", "ruby-align", "ruby-overhang",
-    "ruby-position", "ruby-span", "size", "speak", "speak-as", "speak-header",
+    "rotation", "rotation-point", "ruby-align", "ruby-overhang", "ruby-position",
+    "ruby-span", "shape-inside", "shape-outside", "size", "speak", "speak-as", "speak-header",
     "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
     "tab-size", "table-layout", "target", "target-name", "target-new",
     "target-position", "text-align", "text-align-last", "text-decoration",
@@ -504,8 +504,8 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
     "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
-    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
-    "outside", "overlay", "overline", "padding", "padding-box", "painted",
+    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset", "outside",
+    "outside-shape", "overlay", "overline", "padding", "padding-box", "painted",
     "paused", "persian", "plus-darker", "plus-lighter", "pointer", "portrait",
     "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
     "radio", "read-only", "read-write", "read-write-plaintext-only", "relative",

From 12a25eaf34f9dc7cf0fd6f6663ad1160408c7e4f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 Aug 2013 18:34:34 +0200
Subject: [PATCH 0360/4742] Move to a new website layout

---
 demo/activeline.html                   |  41 +-
 demo/anywordhint.html                  |  44 +-
 demo/bidi.html                         |  41 +-
 demo/btree.html                        |  45 +-
 demo/buffers.html                      |  43 +-
 demo/changemode.html                   |  41 +-
 demo/closebrackets.html                |  54 +--
 demo/closetag.html                     |  55 ++-
 demo/complete.html                     |  52 +-
 demo/emacs.html                        |  53 ++-
 demo/folding.html                      |  54 ++-
 demo/fullscreen.html                   |  41 +-
 demo/html5complete.html                |  56 ++-
 demo/indentwrap.html                   |  41 +-
 demo/lint.html                         |  51 +-
 demo/loadmode.html                     |  39 +-
 demo/marker.html                       |  41 +-
 demo/markselection.html                |  41 +-
 demo/matchhighlighter.html             |  41 +-
 demo/matchtags.html                    |  45 +-
 demo/merge.html                        |  41 +-
 demo/multiplex.html                    |  41 +-
 demo/mustache.html                     |  43 +-
 demo/placeholder.html                  |  39 +-
 demo/preview.html                      |  46 +-
 demo/resize.html                       |  39 +-
 demo/runmode.html                      |  40 +-
 demo/search.html                       |  47 +-
 demo/spanaffectswrapping_shim.html     |  32 +-
 demo/tern.html                         |  76 +--
 demo/theme.html                        |  89 ++--
 demo/trailingspace.html                |  39 +-
 demo/variableheight.html               |  45 +-
 demo/vim.html                          |  47 +-
 demo/visibletabs.html                  |  39 +-
 demo/widget.html                       |  41 +-
 demo/xmlcomplete.html                  |  46 +-
 doc/activebookmark.js                  |  42 ++
 doc/baboon.png                         | Bin 23299 -> 0 bytes
 doc/baboon_vector.svg                  | 153 ------
 doc/compress.html                      |  38 +-
 doc/docs.css                           | 274 ++++++-----
 doc/internals.html                     | 108 +++--
 doc/logo.png                           | Bin 0 -> 12003 bytes
 doc/logo.svg                           | 147 ++++++
 doc/manual.html                        | 158 +++---
 doc/modes.html                         | 100 ----
 doc/realworld.html                     |  37 +-
 doc/{oldrelease.html => releases.html} | 350 +++++++++++---
 doc/reporting.html                     |  41 +-
 doc/upgrade_v2.2.html                  |  48 +-
 doc/upgrade_v3.html                    | 135 +++---
 index.html                             | 634 +++++++------------------
 mode/apl/index.html                    |  41 +-
 mode/asterisk/index.html               |  42 +-
 mode/clike/index.html                  |  41 +-
 mode/clike/scala.html                  |  54 +--
 mode/clojure/index.html                |  42 +-
 mode/cobol/index.html                  |  85 ++--
 mode/coffeescript/index.html           |  42 +-
 mode/commonlisp/index.html             |  42 +-
 mode/css/index.html                    |  42 +-
 mode/css/scss.html                     |  42 +-
 mode/d/index.html                      |  41 +-
 mode/diff/index.html                   |  42 +-
 mode/ecl/index.html                    |  43 +-
 mode/erlang/index.html                 |  43 +-
 mode/gas/index.html                    |  43 +-
 mode/gfm/index.html                    |  56 ++-
 mode/go/index.html                     |  43 +-
 mode/groovy/index.html                 |  41 +-
 mode/haml/index.html                   |  50 +-
 mode/haskell/index.html                |  43 +-
 mode/haxe/index.html                   |  41 +-
 mode/htmlembedded/index.html           |  47 +-
 mode/htmlmixed/index.html              |  50 +-
 mode/http/index.html                   |  41 +-
 mode/index.html                        | 106 +++++
 mode/jade/index.html                   |  42 +-
 mode/javascript/index.html             |  47 +-
 mode/javascript/typescript.html        |  41 +-
 mode/jinja2/index.html                 |  42 +-
 mode/less/index.html                   |  46 +-
 mode/livescript/index.html             |  43 +-
 mode/lua/index.html                    |  46 +-
 mode/markdown/index.html               |  46 +-
 mode/mirc/index.html                   |  44 +-
 mode/nginx/index.html                  |  40 +-
 mode/ntriples/index.html               |  42 +-
 mode/ocaml/index.html                  |  29 +-
 mode/pascal/index.html                 |  41 +-
 mode/perl/index.html                   |  41 +-
 mode/php/index.html                    |  51 +-
 mode/pig/index.html                    |  37 +-
 mode/properties/index.html             |  42 +-
 mode/python/index.html                 |  44 +-
 mode/q/index.html                      |  43 +-
 mode/r/index.html                      |  42 +-
 mode/rpm/changes/index.html            |  34 +-
 mode/rpm/spec/index.html               |  33 +-
 mode/rst/index.html                    |  40 +-
 mode/ruby/index.html                   |  44 +-
 mode/rust/index.html                   |  41 +-
 mode/sass/index.html                   |  44 +-
 mode/scheme/index.html                 |  42 +-
 mode/shell/index.html                  |  29 +-
 mode/sieve/index.html                  |  42 +-
 mode/smalltalk/index.html              |  41 +-
 mode/smarty/index.html                 |  44 +-
 mode/smartymixed/index.html            |  51 +-
 mode/sparql/index.html                 |  44 +-
 mode/sql/index.html                    |  57 +--
 mode/stex/index.html                   |  42 +-
 mode/tcl/index.html                    |  44 +-
 mode/tiddlywiki/index.html             |  45 +-
 mode/tiki/index.html                   |  44 +-
 mode/turtle/index.html                 |  42 +-
 mode/vb/index.html                     |  49 +-
 mode/vbscript/index.html               |  42 +-
 mode/velocity/index.html               |  44 +-
 mode/verilog/index.html                |  39 +-
 mode/xml/index.html                    |  42 +-
 mode/xquery/index.html                 |  71 ++-
 mode/yaml/index.html                   |  42 +-
 mode/z80/index.html                    |  41 +-
 test/index.html                        | 105 ++--
 126 files changed, 4225 insertions(+), 3079 deletions(-)
 create mode 100644 doc/activebookmark.js
 delete mode 100644 doc/baboon.png
 delete mode 100644 doc/baboon_vector.svg
 create mode 100644 doc/logo.png
 create mode 100644 doc/logo.svg
 delete mode 100644 doc/modes.html
 rename doc/{oldrelease.html => releases.html} (70%)
 create mode 100644 mode/index.html

diff --git a/demo/activeline.html b/demo/activeline.html
index b0ea9b9070..a9b000e65b 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -1,23 +1,33 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Active Line Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../addon/selection/active-line.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Active Line Demo</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="../mode/xml/xml.js"></script>
+<script src="../addon/selection/active-line.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror-activeline-background {background: #e8f2ff !important;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Active Line Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Active Line</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Active Line Demo</h2>
+<form><textarea id="code" name="code">
 <?xml version="1.0" encoding="UTF-8"?>
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"
      xmlns:georss="http://www.georss.org/georss"
@@ -66,5 +76,4 @@ <h1>CodeMirror: Active Line Demo</h1>
 
     <p>Styling the current cursor line.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index 5bb0a62a10..851f43000d 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -1,20 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Any Word Completion Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/hint/show-hint.js"></script>
-    <link rel="stylesheet" href="../addon/hint/show-hint.css">
-    <script src="../addon/hint/anyword-hint.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Any Word Completion Demo</h1>
 
-    <form><textarea id="code" name="code">
+<title>CodeMirror: Any Word Completion Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/hint/show-hint.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../addon/hint/show-hint.js"></script>
+<script src="../addon/hint/anyword-hint.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Any Word Completion</a>
+  </ul>
+</div>
+
+<article>
+<h2>Any Word Completion Demo</h2>
+<form><textarea id="code" name="code">
 (function() {
   "use strict";
 
@@ -65,5 +76,4 @@ <h1>CodeMirror: Any Word Completion Demo</h1>
         extraKeys: {"Ctrl-Space": "autocomplete"}
       });
     </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/bidi.html b/demo/bidi.html
index 47feb8c5aa..082e7b3e28 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -1,21 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Bi-directional Text Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
+
+<title>CodeMirror: Bi-directional Text Demo</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="../mode/xml/xml.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Bi-directional Text Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Bi-directional Text</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code"><!-- Piece of the CodeMirror manual, 'translated' into Arabic by
+<article>
+<h2>Bi-directional Text Demo</h2>
+<form><textarea id="code" name="code"><!-- Piece of the CodeMirror manual, 'translated' into Arabic by
      Google Translate -->
 
 <dl>
@@ -57,5 +67,4 @@ <h1>CodeMirror: Bi-directional Text Demo</h1>
   the <a href="http://marijnhaverbeke.nl/blog/cursor-in-bidi-text.html">related
   blog post</a> for more background.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/btree.html b/demo/btree.html
index 5e5ce0abf2..7635ca1bb4 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -1,31 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: B-Tree visualization</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: B-Tree visualization</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>
+<style type="text/css">
       .lineblock { display: inline-block; margin: 1px; height: 5px; }
       .CodeMirror {border: 1px solid #aaa; height: 400px}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: B-Tree visualization</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
 
-    <p>Shows a visual representation of the b-tree that CodeMirror
-    uses to store its document. See
-    the <a href="http://marijnhaverbeke.nl/blog/codemirror-line-tree.html">corresponding
-    blog post</a> for a description of this format. The gray blocks
-    under each leaf show the lines it holds (with their width
-    representing the line height). Add and remove content to see how
-    the nodes are split and merged to keep the tree balanced.</p>
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">B-Tree visualization</a>
+  </ul>
+</div>
 
-    <div style="position: relative">
-      <div style="width: 60%; display: inline-block; vertical-align: top">
-        <form><textarea id="code" name="code">type here, see a summary of the document b-tree to the right</textarea></form>
+<article>
+<h2>B-Tree visualization</h2>
+<form><textarea id="code" name="code">type here, see a summary of the document b-tree below</textarea></form>
       </div>
       <div style="display: inline-block; height: 402px; overflow-y: auto" id="output"></div>
     </div>
@@ -83,5 +83,4 @@ <h1>CodeMirror: B-Tree visualization</h1>
 
 <p><button onclick="fillEditor()">Add a lot of content</button></p>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/buffers.html b/demo/buffers.html
index bfd8248e43..951209cad5 100644
--- a/demo/buffers.html
+++ b/demo/buffers.html
@@ -1,20 +1,32 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Multiple Buffer & Split View Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/css/css.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css" id=style>
+
+<title>CodeMirror: Multiple Buffer & Split View Demo</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="../mode/javascript/javascript.js"></script>
+<script src="../mode/css/css.js"></script>
+<style type="text/css" id=style>
       .CodeMirror {border: 1px solid black; height: 250px;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Multiple Buffer & Split View Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Multiple Buffer & Split View</a>
+  </ul>
+</div>
+
+<article>
+<h2>Multiple Buffer & Split View Demo</h2>
+
 
     <div id=code_top></div>
     <div>
@@ -94,5 +106,4 @@ <h1>CodeMirror: Multiple Buffer & Split View Demo</h1>
     using <a href="../doc/manual.html#swapDoc"><code>swapDoc</code></a>
     to use a single editor to display multiple documents.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/changemode.html b/demo/changemode.html
index 364c5cdb07..61c1786074 100644
--- a/demo/changemode.html
+++ b/demo/changemode.html
@@ -1,22 +1,32 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Mode-Changing Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/scheme/scheme.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Mode-Changing Demo</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="../mode/javascript/javascript.js"></script>
+<script src="../mode/scheme/scheme.js"></script>
+<style type="text/css">
       .CodeMirror {border: 1px solid black;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Mode-Changing demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Mode-Changing</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Mode-Changing Demo</h2>
+<form><textarea id="code" name="code">
 ;; If there is Scheme code in here, the editor will be in Scheme mode.
 ;; If you put in JS instead, it'll switch to JS mode.
 
@@ -46,5 +56,4 @@ <h1>CodeMirror: Mode-Changing demo</h1>
     editor.setOption("mode", looksLikeScheme(editor.getValue()) ? "scheme" : "javascript");
   }
 </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index 47304ea889..8c0dc1cc3e 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -1,31 +1,32 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Closebrackets Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/edit/closebrackets.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-    <style type="text/css">
-      .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
-    </style>
-  </head>
-  <body>
-
-    <h1>CodeMirror: Closebrackets Demo</h1>
-
-    <p>Type a bracket like '[', '(', '{', '&quot;', or '''
-    and <a href="../doc/manual.html#addon_closebrackets">the addon</a>
-    will auto-close it. Type the closing variant when directly in
-    front of a matching character and it will overwrite it.</p>
 
-    <p>If you backspace over a starting bracket while inside empty brackets
-    (e.g. <code>{|}</code>), it will delete the closing bracket for you.</p>
+<title>CodeMirror: Closebrackets Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
 
-
-    <form><textarea id="code" name="code">(function() {
+<link rel="stylesheet" href="../lib/codemirror.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../addon/edit/closebrackets.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<style type="text/css">
+      .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
+    </style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Closebrackets</a>
+  </ul>
+</div>
+
+<article>
+<h2>Closebrackets Demo</h2>
+<form><textarea id="code" name="code">(function() {
   var DEFAULT_BRACKETS = "()[]{}''\"\"";
 
   CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
@@ -59,5 +60,4 @@ <h1>CodeMirror: Closebrackets Demo</h1>
     <script type="text/javascript">
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {autoCloseBrackets: true});
     </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/closetag.html b/demo/closetag.html
index 87f4f019f6..8981f7eb3a 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -1,31 +1,35 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Close-Tag Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/edit/closetag.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/css/css.js"></script>
-    <script src="../mode/htmlmixed/htmlmixed.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-    <style type="text/css">
+
+<title>CodeMirror: Close-Tag Demo</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/edit/closetag.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/css/css.js"></script>
+<script src="../mode/htmlmixed/htmlmixed.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
-  </head>
-  <body>
-    
-    <h1>Close-Tag Demo</h1>
-    <ul>
-      <li>Type an html tag.  When you type '>' or '/', the tag will auto-close/complete.  Block-level tags will indent.</li>
-      <li>There are options for disabling tag closing or customizing the list of tags to indent.</li>
-      <li>Works with "text/html" (based on htmlmixed.js or xml.js) mode.</li>
-      <li>View source for key binding details.</li>
-    </ul>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Close-Tag</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code"><html</textarea></form>
+<article>
+<h2>Close-Tag Demo</h2>
+<form><textarea id="code" name="code"><html</textarea></form>
 
     <script type="text/javascript">
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
@@ -33,5 +37,4 @@ <h1>Close-Tag Demo</h1>
         autoCloseTags: true
       });
     </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/complete.html b/demo/complete.html
index 1a65f6e0d9..56999b9cc9 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -1,20 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Autocomplete Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/hint/show-hint.js"></script>
-    <link rel="stylesheet" href="../addon/hint/show-hint.css">
-    <script src="../addon/hint/javascript-hint.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Autocomplete demo</h1>
 
-    <form><textarea id="code" name="code">
+<title>CodeMirror: Autocomplete Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/hint/show-hint.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../addon/hint/show-hint.js"></script>
+<script src="../addon/hint/javascript-hint.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Autocomplete</a>
+  </ul>
+</div>
+
+<article>
+<h2>Autocomplete Demo</h2>
+<form><textarea id="code" name="code">
 function getCompletions(token, context) {
   var found = [], start = token.string;
   function maybeAdd(str) {
@@ -52,10 +63,10 @@ <h1>CodeMirror: Autocomplete demo</h1>
 }
 </textarea></form>
 
-<p>Press <strong>ctrl-space</strong> to activate autocompletion. See
-the code (<a href="../addon/hint/show-hint.js">here</a>
-and <a href="../addon/hint/javascript-hint.js">here</a>) to figure out
-how it works.</p>
+<p>Press <strong>ctrl-space</strong> to activate autocompletion. Built
+on top of the <a href="../doc/manual.html#addon_show-hint"><code>show-hint</code></a>
+and <a href="../doc/manual.html#addon_javascript-hint"><code>javascript-hint</code></a>
+addons.</p>
 
     <script>
       CodeMirror.commands.autocomplete = function(cm) {
@@ -66,5 +77,4 @@ <h1>CodeMirror: Autocomplete demo</h1>
         extraKeys: {"Ctrl-Space": "autocomplete"}
       });
     </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/emacs.html b/demo/emacs.html
index 0a8cfc5d99..5b622a9992 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -1,28 +1,38 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Emacs bindings demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/clike/clike.js"></script>
-    <script src="../keymap/emacs.js"></script>
-    <script src="../addon/edit/matchbrackets.js"></script>
-    <script src="../addon/comment/comment.js"></script>
-    <script src="../addon/dialog/dialog.js"></script>
-    <script src="../addon/search/searchcursor.js"></script>
-    <script src="../addon/search/search.js"></script>
-    <link rel="stylesheet" href="../addon/dialog/dialog.css">
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Emacs bindings demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/dialog/dialog.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../mode/clike/clike.js"></script>
+<script src="../keymap/emacs.js"></script>
+<script src="../addon/edit/matchbrackets.js"></script>
+<script src="../addon/comment/comment.js"></script>
+<script src="../addon/dialog/dialog.js"></script>
+<script src="../addon/search/searchcursor.js"></script>
+<script src="../addon/search/search.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Emacs bindings demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Emacs bindings</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Emacs bindings demo</h2>
+<form><textarea id="code" name="code">
 #include "syscalls.h"
 /* getchar:  simple buffered version */
 int getchar(void)
@@ -62,5 +72,4 @@ <h1>CodeMirror: Emacs bindings demo</h1>
       });
     </script>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/folding.html b/demo/folding.html
index e6cecf26d0..51faf7069d 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -1,19 +1,18 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Code Folding Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/fold/foldcode.js"></script>
-    <script src="../addon/fold/foldgutter.js"></script>
-    <script src="../addon/fold/brace-fold.js"></script>
-    <script src="../addon/fold/xml-fold.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Code Folding Demo</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/fold/foldcode.js"></script>
+<script src="../addon/fold/foldgutter.js"></script>
+<script src="../addon/fold/brace-fold.js"></script>
+<script src="../addon/fold/xml-fold.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror-foldmarker {
         color: blue;
@@ -37,16 +36,22 @@
         content: "\25B8";
       }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Code Folding Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Code Folding</a>
+  </ul>
+</div>
 
-    <p>Demonstration of code folding using the code
-    in <a href="../doc/manual.html#addon_foldcode"><code>foldcode.js</code></a>
-    and <a href="../doc/manual.html#addon_foldgutter"><code>foldgutter.js</code></a>.
-    Press ctrl-q or click on the gutter markers to fold a block, again
-    to unfold.</p>
-    <form>
+<article>
+<h2>Code Folding Demo</h2>
+<form>
       <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
       <div style="max-width: 50em">HTML:<br><textarea id="code-html" name="code-html"></textarea></div>
     </form>
@@ -81,5 +86,4 @@ <h1>CodeMirror: Code Folding Demo</h1>
   editor_html.foldCode(CodeMirror.Pos(1, 0));
 };
 </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/fullscreen.html b/demo/fullscreen.html
index 2709ebb4b5..8cf8005bdb 100644
--- a/demo/fullscreen.html
+++ b/demo/fullscreen.html
@@ -1,15 +1,14 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Full Screen Editing</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <link rel="stylesheet" href="../theme/night.css">
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Full Screen Editing</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../theme/night.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<style type="text/css">
       .CodeMirror-fullscreen {
         display: block;
         position: absolute;
@@ -18,11 +17,22 @@
         z-index: 9999;
       }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Full Screen Editing</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Full Screen Editing</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code" rows="5">
+<article>
+<h2>Full Screen Editing</h2>
+<form><textarea id="code" name="code" rows="5">
   <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt>
   <dd>Whether, when indenting, the first N*8 spaces should be
   replaced by N tabs. Default is false.</dd>
@@ -143,5 +153,4 @@ <h1>CodeMirror: Full Screen Editing</h1>
   </script>
 
     <p>Press <strong>F11</strong> when cursor is in the editor to toggle full screen editing. <strong>Esc</strong> can also be used to <i>exit</i> full screen editing.</p>
-  </body>
-</html>
+  </article>
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 9ea918228d..899260aa20 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -1,27 +1,38 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: HTML completion demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/hint/show-hint.js"></script>
-    <link rel="stylesheet" href="../addon/hint/show-hint.css">
-    <script src="../addon/hint/xml-hint.js"></script>
-    <script src="../addon/hint/html-hint.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/css/css.js"></script>
-    <script src="../mode/htmlmixed/htmlmixed.js"></script>
-        
-    <link rel="stylesheet" href="../doc/docs.css">
-    <style type="text/css">
+
+<title>CodeMirror: HTML completion demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/hint/show-hint.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../addon/hint/show-hint.js"></script>
+<script src="../addon/hint/xml-hint.js"></script>
+<script src="../addon/hint/html-hint.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/css/css.js"></script>
+<script src="../mode/htmlmixed/htmlmixed.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
-  </head>
-  <body>
-    
-    <h1>HTML completion demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">HTML completion</a>
+  </ul>
+</div>
+
+<article>
+<h2>HTML completion demo</h2>
+
     <p>Shows the <a href="xmlcomplete.html">XML completer</a>
     parameterized with information about the tags in HTML.
     Press <strong>ctrl-space</strong> to activate completion.</p>
@@ -40,5 +51,4 @@ <h1>HTML completion demo</h1>
         });
       };
     </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/indentwrap.html b/demo/indentwrap.html
index c367c945de..6c1fc596e1 100644
--- a/demo/indentwrap.html
+++ b/demo/indentwrap.html
@@ -1,21 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Indented wrapped line demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
+
+<title>CodeMirror: Indented wrapped line demo</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="../mode/xml/xml.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Indented wrapped line demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Indented wrapped line</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Indented wrapped line demo</h2>
+<form><textarea id="code" name="code">
 <!doctype html>
 <body>
   <h2 id="overview">Overview</h2>
@@ -45,5 +55,4 @@ <h2 id="overview">Overview</h2>
       editor.refresh();
     </script>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/lint.html b/demo/lint.html
index d379c31934..ee64237e81 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -1,25 +1,37 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Linter Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
-    <script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-    <link rel="stylesheet" href="../addon/lint/lint.css">
-    <script src="../addon/lint/lint.js"></script>
-    <script src="../addon/lint/javascript-lint.js"></script>
-    <script src="../addon/lint/json-lint.js"></script>
 
-    <style type="text/css">
+<title>CodeMirror: Linter Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/lint/lint.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
+<script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
+<script src="../addon/lint/lint.js"></script>
+<script src="../addon/lint/javascript-lint.js"></script>
+<script src="../addon/lint/json-lint.js"></script>
+<style type="text/css">
       .CodeMirror {border: 1px solid black;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Linter Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Linter</a>
+  </ul>
+</div>
+
+<article>
+<h2>Linter Demo</h2>
+
 
     <p><textarea id="code-js">var widgets = []
 function updateHints() {
@@ -86,5 +98,4 @@ <h1>CodeMirror: Linter Demo</h1>
   });
 </script>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/loadmode.html b/demo/loadmode.html
index 1bd958f70b..be28c7a81d 100644
--- a/demo/loadmode.html
+++ b/demo/loadmode.html
@@ -1,21 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Lazy Mode Loading Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/mode/loadmode.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Lazy Mode Loading Demo</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/loadmode.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Lazy Mode Loading</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Lazy Mode Loading</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">This is the editor.
+<article>
+<h2>Lazy Mode Loading Demo</h2>
+<form><textarea id="code" name="code">This is the editor.
 // It starts out in plain text mode,
 #  use the control below to load and apply a mode
   "you'll see the highlighting of" this text /*change*/.
@@ -36,5 +46,4 @@ <h1>CodeMirror: Lazy Mode Loading</h1>
    CodeMirror.autoLoadMode(editor, modeInput.value);
 }
 </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/marker.html b/demo/marker.html
index f0981e4d5f..5cbd16257e 100644
--- a/demo/marker.html
+++ b/demo/marker.html
@@ -1,23 +1,33 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Breakpoint Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
+
+<title>CodeMirror: Breakpoint Demo</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="../mode/javascript/javascript.js"></script>
+<style type="text/css">
       .breakpoints {width: .8em;}
       .breakpoint { color: #822; }
       .CodeMirror {border: 1px solid #aaa;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Breakpoint demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Breakpoint</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Breakpoint Demo</h2>
+<form><textarea id="code" name="code">
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   lineNumbers: true,
   gutters: ["CodeMirror-linenumbers", "breakpoints"]
@@ -55,5 +65,4 @@ <h1>CodeMirror: Breakpoint demo</h1>
 }
     </script>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/markselection.html b/demo/markselection.html
index e1c054869f..2e52af930f 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -1,24 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Match Highlighter Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/search/searchcursor.js"></script>
-    <script src="../addon/selection/mark-selection.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Match Highlighter Demo</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/search/searchcursor.js"></script>
+<script src="../addon/selection/mark-selection.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror-selected  { background-color: blue !important; }
       .CodeMirror-selectedtext { color: white; }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Mark Selection Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Match Highlighter</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">Select something from here.
+<article>
+<h2>Match Highlighter Demo</h2>
+<form><textarea id="code" name="code">Select something from here.
 You'll see that the selection's foreground color changes to white!
 Since, by default, CodeMirror only puts an independent "marker" layer
 behind the text, you'll need something like this to change its colour.</textarea></form>
@@ -32,5 +42,4 @@ <h1>CodeMirror: Mark Selection Demo</h1>
 
     <p>Simple addon to easily mark (and style) selected text.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index 9d2fdd098a..170213bfc5 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -1,15 +1,14 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Match Highlighter Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/search/searchcursor.js"></script>
-    <script src="../addon/search/match-highlighter.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Match Highlighter Demo</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/search/searchcursor.js"></script>
+<script src="../addon/search/match-highlighter.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror-focused .cm-matchhighlight {
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
@@ -17,11 +16,22 @@
         background-repeat: repeat-x;
       }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Match Highlighter Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Match Highlighter</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">Select this text: hardToSpotVar
+<article>
+<h2>Match Highlighter Demo</h2>
+<form><textarea id="code" name="code">Select this text: hardToSpotVar
 	And everywhere else in your code where hardToSpotVar appears will automatically illuminate.
 Give it a try!  No more hardToSpotVars.</textarea></form>
 
@@ -34,5 +44,4 @@ <h1>CodeMirror: Match Highlighter Demo</h1>
 
     <p>Search and highlight occurences of the selected text.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/matchtags.html b/demo/matchtags.html
index 8f4217debe..40ee8c0b7e 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -1,22 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Tag Matcher Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/fold/xml-fold.js"></script>
-    <script src="../addon/edit/matchtags.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
+
+<title>CodeMirror: Tag Matcher Demo</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/fold/xml-fold.js"></script>
+<script src="../addon/edit/matchtags.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Tag Matcher Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Tag Matcher</a>
+  </ul>
+</div>
+
+<article>
+<h2>Tag Matcher Demo</h2>
+
 
     <div id="editor"></div>
 
@@ -34,5 +46,4 @@ <h1>CodeMirror: Tag Matcher Demo</h1>
     <p>Put the cursor on or inside a pair of tags to highlight them.
     Press Ctrl-J to jump to the tag that matches the one under the
     cursor.</p>
-  </body>
-</html>
+  </article>
diff --git a/demo/merge.html b/demo/merge.html
index 907f769d57..d3c8eb03cc 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -1,15 +1,16 @@
 <!doctype html>
-<head>
-  <meta charset="utf-8">
-  <link rel=stylesheet href="../lib/codemirror.css">
-  <script src="../lib/codemirror.js"></script>
-  <script src="../mode/xml/xml.js"></script>
-  <script src="../addon/merge/dep/diff_match_patch.js"></script>
-  <link rel=stylesheet href="../addon/merge/merge.css">
-  <script src="../addon/merge/merge.js"></script>
-  <link rel="stylesheet" href="../doc/docs.css">
-  <title>CodeMirror: merge view demo</title>
-  <style>
+
+<title>CodeMirror: merge view demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel=stylesheet href="../lib/codemirror.css">
+<link rel=stylesheet href="../addon/merge/merge.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<script src="../addon/merge/dep/diff_match_patch.js"></script>
+<script src="../addon/merge/merge.js"></script>
+<style>
     .CodeMirror { line-height: 1.2; }
     body { max-width: 80em; }
     span.clicky {
@@ -20,9 +21,22 @@
       border-radius: 3px;
     }
   </style>
-</head>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">merge view</a>
+  </ul>
+</div>
+
+<article>
+<h2>merge view demo</h2>
 
-<h1>CodeMirror: merge view demo</h1>
 
 <div id=view></div>
 
@@ -61,3 +75,4 @@ <h1>CodeMirror: merge view demo</h1>
   initUI(2);
 };
 </script>
+</article>
diff --git a/demo/multiplex.html b/demo/multiplex.html
index ec0519cb98..2ad9608a82 100644
--- a/demo/multiplex.html
+++ b/demo/multiplex.html
@@ -1,23 +1,33 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Multiplexing Parser Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/mode/multiplex.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Multiplexing Parser Demo</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/multiplex.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<style type="text/css">
       .CodeMirror {border: 1px solid black;}
       .cm-delimit {color: #fa4;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Multiplexing Parser Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Multiplexing Parser</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Multiplexing Parser Demo</h2>
+<form><textarea id="code" name="code">
 <html>
   <body style="<<magic>>">
     <h1><< this is not <html >></h1>
@@ -62,5 +72,4 @@ <h1><< this is not <html >></h1>
       <a href="../test/index.html#verbose,multiplexing_*">verbose</a>.
     </p>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/mustache.html b/demo/mustache.html
index 9d2081dc49..cb0291598a 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -1,23 +1,33 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Overlay Parser Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/mode/overlay.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Overlay Parser Demo</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/overlay.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<style type="text/css">
       .CodeMirror {border: 1px solid black;}
       .cm-mustache {color: #0ca;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Overlay Parser Demo</h1>
+</style>
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
 
-    <form><textarea id="code" name="code">
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Overlay Parser</a>
+  </ul>
+</div>
+
+<article>
+<h2>Overlay Parser Demo</h2>
+<form><textarea id="code" name="code">
 <html>
   <body>
     <h1>{{title}}</h1>
@@ -55,5 +65,4 @@ <h1>{{title}}</h1>
     in <a href="../addon/mode/overlay.js"><code>overlay.js</code></a>. View
     source to see the 15 lines of code needed to accomplish this.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/placeholder.html b/demo/placeholder.html
index b0f2456957..6cf098b01a 100644
--- a/demo/placeholder.html
+++ b/demo/placeholder.html
@@ -1,24 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Placeholder demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/display/placeholder.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Placeholder demo</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/display/placeholder.js"></script>
+<style type="text/css">
       .CodeMirror { border: 1px solid silver; }
       .CodeMirror-empty { outline: 1px solid #c22; }
       .CodeMirror-empty.CodeMirror-focused { outline: none; }
       .CodeMirror pre.CodeMirror-placeholder { color: #999; }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Placeholder demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Placeholder</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code" placeholder="Code goes here..."></textarea></form>
+<article>
+<h2>Placeholder demo</h2>
+<form><textarea id="code" name="code" placeholder="Code goes here..."></textarea></form>
 
     <p>The <a href="../doc/manual.html#addon_placeholder">placeholder</a>
     plug-in adds an option <code>placeholder</code> that can be set to
@@ -32,5 +42,4 @@ <h1>CodeMirror: Placeholder demo</h1>
       });
     </script>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/preview.html b/demo/preview.html
index f70cdb009a..ccf9122e9b 100644
--- a/demo/preview.html
+++ b/demo/preview.html
@@ -1,16 +1,16 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: HTML5 preview</title>
-    <script src=../lib/codemirror.js></script>
-    <script src=../mode/xml/xml.js></script>
-    <script src=../mode/javascript/javascript.js></script>
-    <script src=../mode/css/css.js></script>
-    <script src=../mode/htmlmixed/htmlmixed.js></script>
-    <link rel=stylesheet href=../lib/codemirror.css>
-    <link rel=stylesheet href=../doc/docs.css>
-    <style type=text/css>
+
+<title>CodeMirror: HTML5 preview</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=../mode/xml/xml.js></script>
+<script src=../mode/javascript/javascript.js></script>
+<script src=../mode/css/css.js></script>
+<script src=../mode/htmlmixed/htmlmixed.js></script>
+<style type=text/css>
       .CodeMirror {
         float: left;
         width: 50%;
@@ -24,9 +24,22 @@
         border-left: 0px;
       }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: HTML5 preview</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">HTML5 preview</a>
+  </ul>
+</div>
+
+<article>
+<h2>HTML5 preview</h2>
+
     <textarea id=code name=code>
 <!doctype html>
 <html>
@@ -72,5 +85,4 @@ <h1>CodeMirror: HTML5 preview</h1>
       }
       setTimeout(updatePreview, 300);
     </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/resize.html b/demo/resize.html
index 7badc2bfbb..10326ef66f 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -1,14 +1,13 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Autoresize Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/css/css.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Autoresize Demo</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="../mode/css/css.js"></script>
+<style type="text/css">
       .CodeMirror {
         border: 1px solid #eee;
         height: auto;
@@ -18,11 +17,22 @@
         overflow-x: auto;
       }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Autoresize demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Autoresize</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Autoresize Demo</h2>
+<form><textarea id="code" name="code">
 .CodeMirror {
   border: 1px solid #eee;
   height: auto;
@@ -45,5 +55,4 @@ <h1>CodeMirror: Autoresize demo</h1>
       });
     </script>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/runmode.html b/demo/runmode.html
index dba808ba7a..144783d347 100644
--- a/demo/runmode.html
+++ b/demo/runmode.html
@@ -1,16 +1,29 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Mode Runner Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/runmode/runmode.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Mode Runner Demo</h1>
+
+<title>CodeMirror: Mode Runner Demo</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/runmode/runmode.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Mode Runner</a>
+  </ul>
+</div>
+
+<article>
+<h2>Mode Runner Demo</h2>
+
 
     <textarea id="code" style="width: 90%; height: 7em; border: 1px solid black; padding: .2em .4em;">
 <foobar>
@@ -46,5 +59,4 @@ <h1>CodeMirror: Mode Runner Demo</h1>
       (through <code>innerHTML</code>).</dd>
     </dl>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/search.html b/demo/search.html
index d72107156c..4aef2a81c0 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -1,26 +1,36 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Search/Replace Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../addon/dialog/dialog.js"></script>
-    <link rel="stylesheet" href="../addon/dialog/dialog.css">
-    <script src="../addon/search/searchcursor.js"></script>
-    <script src="../addon/search/search.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Search/Replace Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/dialog/dialog.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<script src="../addon/dialog/dialog.js"></script>
+<script src="../addon/search/searchcursor.js"></script>
+<script src="../addon/search/search.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       dt {font-family: monospace; color: #666;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Search/Replace Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Search/Replace</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Search/Replace Demo</h2>
+<form><textarea id="code" name="code">
   <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt>
   <dd>Whether, when indenting, the first N*8 spaces should be
   replaced by N tabs. Default is false.</dd>
@@ -81,5 +91,4 @@ <h1>CodeMirror: Search/Replace Demo</h1>
     For good-looking input dialogs, you also want to include
     <a href="../addon/dialog/dialog.js">addon/dialog/dialog.js</a>
     and <a href="../addon/dialog/dialog.css">addon/dialog/dialog.css</a>.</p>
-  </body>
-</html>
+  </article>
diff --git a/demo/spanaffectswrapping_shim.html b/demo/spanaffectswrapping_shim.html
index 733db067ff..00de3bdc2b 100644
--- a/demo/spanaffectswrapping_shim.html
+++ b/demo/spanaffectswrapping_shim.html
@@ -1,12 +1,25 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Automatically derive odd wrapping behavior for your browser</title>
-    <link rel="stylesheet" href="../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: odd wrapping shim</h1>
+
+<title>CodeMirror: Automatically derive odd wrapping behavior for your browser</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Automatically derive odd wrapping behavior for your browser</a>
+  </ul>
+</div>
+
+<article>
+<h2>Automatically derive odd wrapping behavior for your browser</h2>
+
 
     <p>This is a hack to automatically derive
     a <code>spanAffectsWrapping</code> regexp for a browser. See the
@@ -69,5 +82,4 @@ <h1>CodeMirror: odd wrapping shim</h1>
 
       document.getElementById("output").appendChild(document.createTextNode("Your regexp is: " + (newRE || "^$")));
     </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/tern.html b/demo/tern.html
index bbc5e478c1..adc79e5c3d 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -1,39 +1,46 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Tern Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-    <script src="../addon/dialog/dialog.js"></script>
-    <link rel="stylesheet" href="../addon/dialog/dialog.css">
-    <script src="../addon/hint/show-hint.js"></script>
-    <link rel="stylesheet" href="../addon/hint/show-hint.css">
-    <script src="../addon/tern/tern.js"></script>
-    <link rel="stylesheet" href="../addon/tern/tern.css">
-
-    <!-- NOTE: if you are going to actually deploy this in production,
-         DO NOT hot-link these files. Host them yourself. -->
-    <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/lib/signal.js"></script>
-    <script src="http://ternjs.net/lib/tern.js"></script>
-    <script src="http://ternjs.net/lib/def.js"></script>
-    <script src="http://ternjs.net/lib/comment.js"></script>
-    <script src="http://ternjs.net/lib/infer.js"></script>
-    <script src="http://ternjs.net/plugin/doc_comment.js"></script>
-
-    <style>
+
+<title>CodeMirror: Tern Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/dialog/dialog.css">
+<link rel="stylesheet" href="../addon/hint/show-hint.css">
+<link rel="stylesheet" href="../addon/tern/tern.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<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/lib/signal.js"></script>
+<script src="http://ternjs.net/lib/tern.js"></script>
+<script src="http://ternjs.net/lib/def.js"></script>
+<script src="http://ternjs.net/lib/comment.js"></script>
+<script src="http://ternjs.net/lib/infer.js"></script>
+<script src="http://ternjs.net/plugin/doc_comment.js"></script>
+<style>
       .CodeMirror {border: 1px solid #ddd;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Tern Demo</h1>
-
-    <form><textarea id="code" name="code">// Use ctrl-space to complete something
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Tern</a>
+  </ul>
+</div>
+
+<article>
+<h2>Tern Demo</h2>
+<form><textarea id="code" name="code">// Use ctrl-space to complete something
 // Put the cursor in or after an expression, press ctrl-i to
 // find its type
 
@@ -118,5 +125,4 @@ <h1>CodeMirror: Tern Demo</h1>
   });
 </script>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/theme.html b/demo/theme.html
index 53bd90a5a4..936df29c87 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -1,46 +1,56 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Theme Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <link rel="stylesheet" href="../theme/3024-day.css">
-    <link rel="stylesheet" href="../theme/3024-night.css">
-    <link rel="stylesheet" href="../theme/ambiance.css">
-    <link rel="stylesheet" href="../theme/base16-dark.css">
-    <link rel="stylesheet" href="../theme/base16-light.css">
-    <link rel="stylesheet" href="../theme/blackboard.css">
-    <link rel="stylesheet" href="../theme/cobalt.css">
-    <link rel="stylesheet" href="../theme/eclipse.css">
-    <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/midnight.css">
-    <link rel="stylesheet" href="../theme/monokai.css">
-    <link rel="stylesheet" href="../theme/neat.css">
-    <link rel="stylesheet" href="../theme/night.css">
-    <link rel="stylesheet" href="../theme/paraiso-dark.css">
-    <link rel="stylesheet" href="../theme/paraiso-light.css">
-    <link rel="stylesheet" href="../theme/rubyblue.css">
-    <link rel="stylesheet" href="../theme/solarized.css">
-    <link rel="stylesheet" href="../theme/tomorrow-night-eighties.css">
-    <link rel="stylesheet" href="../theme/twilight.css">
-    <link rel="stylesheet" href="../theme/vibrant-ink.css">
-    <link rel="stylesheet" href="../theme/xq-dark.css">
-    <link rel="stylesheet" href="../theme/xq-light.css">
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../keymap/extra.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Theme Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../theme/3024-day.css">
+<link rel="stylesheet" href="../theme/3024-night.css">
+<link rel="stylesheet" href="../theme/ambiance.css">
+<link rel="stylesheet" href="../theme/base16-dark.css">
+<link rel="stylesheet" href="../theme/base16-light.css">
+<link rel="stylesheet" href="../theme/blackboard.css">
+<link rel="stylesheet" href="../theme/cobalt.css">
+<link rel="stylesheet" href="../theme/eclipse.css">
+<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/midnight.css">
+<link rel="stylesheet" href="../theme/monokai.css">
+<link rel="stylesheet" href="../theme/neat.css">
+<link rel="stylesheet" href="../theme/night.css">
+<link rel="stylesheet" href="../theme/paraiso-dark.css">
+<link rel="stylesheet" href="../theme/paraiso-light.css">
+<link rel="stylesheet" href="../theme/rubyblue.css">
+<link rel="stylesheet" href="../theme/solarized.css">
+<link rel="stylesheet" href="../theme/tomorrow-night-eighties.css">
+<link rel="stylesheet" href="../theme/twilight.css">
+<link rel="stylesheet" href="../theme/vibrant-ink.css">
+<link rel="stylesheet" href="../theme/xq-dark.css">
+<link rel="stylesheet" href="../theme/xq-light.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../keymap/extra.js"></script>
+<style type="text/css">
       .CodeMirror {border: 1px solid black; font-size:13px}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Theme demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Theme</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Theme Demo</h2>
+<form><textarea id="code" name="code">
 function findSequence(goal) {
   function find(start, history) {
     if (start == goal)
@@ -100,5 +110,4 @@ <h1>CodeMirror: Theme demo</h1>
     editor.setOption("theme", choice);
   }
 </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/trailingspace.html b/demo/trailingspace.html
index ca74152eca..c3e9c37636 100644
--- a/demo/trailingspace.html
+++ b/demo/trailingspace.html
@@ -1,14 +1,13 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Trailing Whitespace Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/edit/trailingspace.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Trailing Whitespace Demo</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/edit/trailingspace.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .cm-trailingspace {
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);
@@ -16,11 +15,22 @@
         background-repeat: repeat-x;
       }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Trailing Whitespace Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Trailing Whitespace</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">This text  
+<article>
+<h2>Trailing Whitespace Demo</h2>
+<form><textarea id="code" name="code">This text  
  has some	 
 trailing whitespace!</textarea></form>
 
@@ -35,5 +45,4 @@ <h1>CodeMirror: Trailing Whitespace Demo</h1>
 the <a href="../doc/manual.html#addon_trailingspace">trailingspace</a>
 addon to highlight trailing whitespace.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/variableheight.html b/demo/variableheight.html
index b00f7e4542..1ef8fc445d 100644
--- a/demo/variableheight.html
+++ b/demo/variableheight.html
@@ -1,24 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Variable Height Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/markdown/markdown.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
+
+<title>CodeMirror: Variable Height Demo</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="../mode/markdown/markdown.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<style type="text/css">
       .CodeMirror {border: 1px solid silver; border-width: 1px 2px; }
       .cm-header { font-size: 150%; font-family: arial; }
       .cm-strong { font-size: 140%; }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Variable Height Demo</h1>
-
-    <form><textarea id="code" name="code"># A First Level Header
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Variable Height</a>
+  </ul>
+</div>
+
+<article>
+<h2>Variable Height Demo</h2>
+<form><textarea id="code" name="code"># A First Level Header
 
 **Bold** text in a normal-size paragraph.
 
@@ -48,5 +58,4 @@ <h1>CodeMirror: Variable Height Demo</h1>
         mode: "markdown"
       });
     </script>
-  </body>
-</html>
+  </article>
diff --git a/demo/vim.html b/demo/vim.html
index 9b7a432c6b..379fac1475 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -1,25 +1,35 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Vim bindings demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/dialog/dialog.js"></script>
-    <script src="../addon/search/searchcursor.js"></script>
-    <script src="../mode/clike/clike.js"></script>
-    <script src="../keymap/vim.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-    <link rel="stylesheet" href="../addon/dialog/dialog.css">
 
-    <style type="text/css">
+<title>CodeMirror: Vim bindings demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/dialog/dialog.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../addon/dialog/dialog.js"></script>
+<script src="../addon/search/searchcursor.js"></script>
+<script src="../mode/clike/clike.js"></script>
+<script src="../keymap/vim.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Vim bindings demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Vim bindings</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Vim bindings demo</h2>
+<form><textarea id="code" name="code">
 #include "syscalls.h"
 /* getchar:  simple buffered version */
 int getchar(void)
@@ -61,5 +71,4 @@ <h1>CodeMirror: Vim bindings demo</h1>
       });
     </script>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/visibletabs.html b/demo/visibletabs.html
index 109d1a6b08..5a5a19aa01 100644
--- a/demo/visibletabs.html
+++ b/demo/visibletabs.html
@@ -1,14 +1,13 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Visible tabs demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/clike/clike.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Visible tabs demo</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="../mode/clike/clike.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
       .cm-tab {
          background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
@@ -16,11 +15,22 @@
          background-repeat: no-repeat;
       }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Visible tabs demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Visible tabs</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code">
+<article>
+<h2>Visible tabs demo</h2>
+<form><textarea id="code" name="code">
 #include "syscalls.h"
 /* getchar:  simple buffered version */
 int getchar(void)
@@ -49,5 +59,4 @@ <h1>CodeMirror: Visible tabs demo</h1>
       });
     </script>
 
-  </body>
-</html>
+  </article>
diff --git a/demo/widget.html b/demo/widget.html
index a3b27a9e47..6c4685396b 100644
--- a/demo/widget.html
+++ b/demo/widget.html
@@ -1,22 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Inline Widget Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
 
-    <style type="text/css">
+<title>CodeMirror: Inline Widget Demo</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="../mode/javascript/javascript.js"></script>
+<script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
+<style type="text/css">
       .CodeMirror {border: 1px solid black;}
       .lint-error {font-family: arial; font-size: 70%; background: #ffa; color: #a00; padding: 2px 5px 3px; }
       .lint-error-icon {color: white; background-color: red; font-weight: bold; border-radius: 50%; padding: 0 3px; margin-right: 7px;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Inline Widget Demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Inline Widget</a>
+  </ul>
+</div>
+
+<article>
+<h2>Inline Widget Demo</h2>
+
 
     <div id=code></div>
     <script id="script">var widgets = []
@@ -70,5 +82,4 @@ <h1>CodeMirror: Inline Widget Demo</h1>
 in the editor (which is the script used on this page), and
 inserts <a href="../doc/manual.html#addLineWidget">line widgets</a> to
 display the warnings that JSHint comes up with.</p>
-  </body>
-</html>
+  </article>
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index 007893b966..2f81c54cf0 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -1,23 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: XML Autocomplete Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/hint/show-hint.js"></script>
-    <link rel="stylesheet" href="../addon/hint/show-hint.css">
-    <script src="../addon/hint/xml-hint.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-    <style type="text/css">
+
+<title>CodeMirror: XML Autocomplete Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/hint/show-hint.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../addon/hint/show-hint.js"></script>
+<script src="../addon/hint/xml-hint.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<style type="text/css">
       .CodeMirror { border: 1px solid #eee; }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: XML Autocomplete demo</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">XML Autocomplete</a>
+  </ul>
+</div>
 
-    <form><textarea id="code" name="code"><!-- write some xml below -->
+<article>
+<h2>XML Autocomplete Demo</h2>
+<form><textarea id="code" name="code"><!-- write some xml below -->
 </textarea></form>
 
     <p>Press <strong>ctrl-space</strong>, or type a '<' character to
@@ -102,5 +113,4 @@ <h1>CodeMirror: XML Autocomplete demo</h1>
         }
       });
     </script>
-  </body>
-</html>
+  </article>
diff --git a/doc/activebookmark.js b/doc/activebookmark.js
new file mode 100644
index 0000000000..69a126e8ce
--- /dev/null
+++ b/doc/activebookmark.js
@@ -0,0 +1,42 @@
+(function() {
+  var pending = false, prevVal = null;
+
+  function updateSoon() {
+    if (!pending) {
+      pending = true;
+      setTimeout(update, 250);
+    }
+  }
+
+  function update() {
+    pending = false;
+    var marks = document.getElementById("nav").getElementsByTagName("a"), found;
+    for (var i = 0; i < marks.length; ++i) {
+      var mark = marks[i], m;
+      if (mark.getAttribute("data-default")) {
+        if (found == null) found = i;
+      } else if (m = mark.href.match(/#(.*)/)) {
+        var ref = document.getElementById(m[1]);
+        if (ref && ref.getBoundingClientRect().top < 50)
+          found = i;
+      }
+    }
+    if (found != null && found != prevVal) {
+      prevVal = found;
+      var lis = document.getElementById("nav").getElementsByTagName("li");
+      for (var i = 0; i < lis.length; ++i) lis[i].className = "";
+      for (var i = 0; i < marks.length; ++i) {
+        if (found == i) {
+          marks[i].className = "active";
+          for (var n = marks[i]; n; n = n.parentNode)
+            if (n.nodeName == "LI") n.className = "active";
+        } else {
+          marks[i].className = "";
+        }
+      }
+    }
+  }
+
+  window.addEventListener("scroll", updateSoon);
+  window.addEventListener("load", updateSoon);
+})();
diff --git a/doc/baboon.png b/doc/baboon.png
deleted file mode 100644
index 55d97f70b817ff2b78ebb409bf34a5147fe40d07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23299
zcmXtA2RM~|*nf^qWM`JWx9se!jBH8STe3ywi4vlWP|C<CvJzgKqfn@XtU5Tdw<LRf
z_xZl->$=|2+k1}Z{KtL&)_oF8uIf@zuu>ohLUlz?%M3wK;qdQRG7|WEstIZd{y`L|
zdBuVZenpVE#KZ5&{q(K}A_$=c{x4Jtp~C?DN0uOM>mYMqx1bQm09Pa=Bt+cP=T@Mz
zqo1p|Z-D!Yb!Aor;Y6-zX;_55T+IoIV6Yth6df`|pO&Jo_lj4Y`xQxw`h63kq<l`k
zAgwS{Q<OGQ*N4K5SmhY~=%>1gdQ2wV+9`BOW&{MU9$qEjO0G3}ueiaHZu{OP#N93A
zj(hr--M@--A-;+i12@JmElh@s^Kc6?Ka}c5EC_LD^53!yzKpLNvkN39CVucnp|=A4
zQnDM1`awivv9(bXJxWAFh8d6X$|f*LYK@7BDYx)&?q?1pqM^ulOt`Nxm4B`79;*@R
z$SXFC0e&T!aV4oZe<4&SRF++~At%Q17J4DywdM~P^*fl$&f;7VQ?2dC*aJbqvBUt^
zRTk$qg!NUqX%!*5rzBe_ySGB!^|i~lxw}Z!Q$1dU5zP~@T%7N4YxU>Y#qJ|i5YhKi
zE!N)BC(rLocVpuPjeWF*&m>j9MVv4!yFSPf6>qb*c`*ZnOLrwag(z~+t#b2fB(Em%
z`t8}L*hC8#W@p+^rLbren$Y-M*O-Wfu#4<YQnmUb+b&7Kva>k+GASE=ohI|ZX_fDR
z)I4#%h{DX|d2CTLGlO%LN$I=NY6<_opl<V-lb2#E^$hm*_O%`Z1UX8<nq^iMo7lj9
zE=ft6$B!SAojuzfOG=&OYI(Fnhhe@&`R!dh0VivwQJZ~+mJsoSfSBQA73cD^=r+U&
zRZF}u^6u8r@i8q6OTy#xmkM0_GRe-Ixtz=@i~IfCNyfM@Q|!+tj%emX8>t;PllQ%E
zFXlG6FY8$!k#~=IBA@Cswd(mq?KL_o-z8SNCq0O{xL%F3QXAu|yEUp~VZopjw1}Sn
z`l2xE_@KnDRq5r+PHN^$!OJeaV<LSL+8E})M3NjB2c$dNQS9S+>@SU=(y(;YOUw`l
zx;;U#Pye5Y;21*>tY<knEC!SM#nRq7h7A1&DJe8sy1G0{O02ZBv}EMu8g*X7I2=a)
zp}@;bu^ZV3N-0uS$?+EqtQ?6SNR7~8l>FFm-bM&|RG$cmm%2l4oP0`-EX0@SkxVc!
zh{jx}V|ysIqn!H~=lZYxl9Cd)s3_%mr6BcR|J@#_^)&xcYEG)Es%lc&dG~Q*Vxr&L
zPuZit{b~(<(*)vnE%6^dXnx7L#Pn}@_~NsLZ#kDr%s&-nO>1-il+aJrCvjf2MNaRz
zP79SAT|g=h7l;&g`;D&4nwij`@u&F=sU#gn9qAY`NqmCCIkfEjyyY=kd7f3?C+TP1
zt&e?uXRs$M(<Q@RHyZ=A-M>q~&%<JG%J@#QYiMYE?&;Cc(TTfiA<XF3pPLLX$Py~c
z&&L!Qb6}daYSpnBR%i9)`oumB(FWh;A;yGq9~k*)!%gA(JeDOI$VT?<bGyUsV*Nt1
z((eV@XDC@^$ZVVMXvdOJ;pXT0-zFU$McizQxZYo4-{6NDt+IcpQz(=^IX=!}YHAv~
zRGcO0_Jx^<h=}a%r~ZEG($doIwv*KO?gX<IICqao-jS$}+kfBcxQ#f+d(>kS1qGjd
zD5;hhcbg=~2>L~ZhTIUGU0;99WFJ9GNJ6O|6eJT98%umR@^@=1<=L~6|NF3P@;><u
z4P&B_H*enDJXookiKSLm4{cadv4bb=vX4G?U0re3av9>#508_2O(1z5!-ShcT%XXO
zIS@m>0)YUL!hDP_3x1_ZBndEnNN`03y1iX3?BDVOyVkH*mSt9(J3DbTH5aQ4=9h=d
z6z;4ti{EU>zql;#J1O(4<ZlP_$Caw~$HZsOVSfGk<&YhHykft%J!G8B_=gBB-xG>f
zPq;Thl>g+Wk_G1vWSK5?;432q#SRe<H<U6=@}zFejZyEqd?zY4xlS~S@O!ZV6A>xt
z$4{R~b8~a~|1vN#a&d8?9-civctu}7vCcx~ik=>sRh3=xowc7C`#x}>7AISqOIL&E
za=(b&9XUkRW|}{t_@K-kX79ttz;GXfh$51d=;`UV#0r-#%{*YT!<1FECAxjheswiR
zsl@!vS!HEq!}-3Ro{nngPeF0VW7W=|zkSQJQL$roRvI-53sV{#8hT|_HjTrfpQxQM
zUv&R=zi?(~xJ=#$tA2d&&xmoKmG*W`<;am_w-=&7!q(Dg=@)?9r%4@1U?nCF@1RvD
z;+5W>oSckLOw@#3WR>;0|L&cnjK_E6+qc)(22~>VOniSt&3|EGVC-psswgAFkQaTT
zc(A)s6(}+{KhLeAa^BO^Q_sKvUv`3)2nh-I6TK<a?>JNYFxAjK7z$8E3`sVt@h51r
z1BsyUNi&p*ii(O)O453CPV9S$DUb5$(O-}6Xtm7o;j(N0k`6OOJ{YeB1_j-Roel^L
zOwGwjhFcnF!K4lASsk$-&=$Onpx;`SabLVRG&Z^t@A0mvH=&3(qRSq4_KxYhm!e3A
z)>E!}ZVHOm4#-cGLT8pqu~`S4a;P^RBjqf1q0_{*w?@yNoWyB9Q0t<LZmz15aB_0O
zKa7mm4>H(oEo<v%b_%gEF$6B|?mQPS(lbfebw0o7o|2M+zJH$x+u%=V_Vr=d-MfyH
zEq9q!!fJbh1_lNcBKF=@S4q&MdcUIA|6qMY?CJbP5Xqw(XrHyx)VN2j>sLrG&1WC^
zk8y5xmWE?|e7x4Z|H1*(qtaWWl@`VNjOlZ%X(c6sHjM#%b8~ZlM%)v>d@=l4?M#|{
zK_weLGQSP=<-vMidtpIANt*?z?cT!CT!=e&Oa-yJGeTX|K$`e8)dI1c4XsQR<hE!y
z^^0;zrwZGe?Qw~J`jp||->AJO{Dy&r<qC8gw~%bE%W)=}nlT+=qQ&ptrNFV(cJ5B%
zg8uYKX*XXZR<Ce?x!iqaq#|Pf1xq;d2%X=jt>T~eOv^uS-K)qe<4%mHU01_|M<gq9
zbH~)q&dm*!m=-QJF65>c72dyp|2tIF9xE3&x51(->7oaYVSm5MQ)Nc(Z@IR$T>hL%
z{VZ_Eb?ly0`QjFWE)&bE_`mnNNoJRx{9H;0ic%4ug2LGEvjt|Qi><qpg{!OHX|d5K
z`wx}wta|)+0;gTn-0jXCIs3Ng^ok4O--*@#JJ0-~mz$nSnUEBbh&?lY#E4G7?bK@B
zdnCs9=!S7>uYmC>4X%Hp!Jo&IMat>E_W6$k1F3Ljjdn1zJ?UTD9&fatwi(`CUtfQ{
z)tM@GLG(MJdfRzsOfPReN+AP#I)b#3rigOd3!?*(JNM3zT|3a7CKgnqNYvvrK1Hnl
z%JvRcKFScemOUW^RnG&K&P4*&#WXau;ri(B#YMe@goLm;XnDOBxi?(a9#T*uCJv<C
zRnomxxW~%1I^+E(f=3(;91pCOk4^om?;M&HMf47-HH0egv)u>{Rq$+#Jp6AwSx#L1
z@oF-U?&B2wV(FDIySsCYt?yqOKL3#Q=|%ZJ^~MEj7g8N#+I?O|xm-50&Xc(%j+^n<
zC*y)PCRGOMSXqUexWYn1P5k|(#(A7SJ(g{bUHe&QaP8Z{zm@&LdY)U#hPc~E*Bu9M
zhSY281b#I-Z01EriR)wn+)ae&5RsL($itxM_PyVaB6|8#Uc7kp@+JGgzIVr)yr|v~
zB*Aq4TTa<wv;RzYL=T@D`lXZ{6-LuqDn3WE(eWIu(6l7OcIZw^n@R-B&iX{z;V*V)
zV=aa7o$|$q|MIOWY(n9f5Wk@YC}YhWVzE5g8g6Q0f*>Tu@54y0gbYY`D-k>sbA3*6
zQy~TJL~li$btS>x6{x7I)Gye=k-g*Hsjt26XWYI#yC-b<mQ26Qs_aj{+9~cKN0hp{
zI&!kVz=5FOyb-Y9lrPoY31I(b`^wMXUjrb|WcY@P;R`vc<HOyDWo07L(!I8yUpy~j
zkFRuyA5=Y$SfV^IGxRO~GbEl;?u-UdVS93?$?xV1w4a__qV*RE)356F94tyGjqv1s
zC2{s9=cUHu&N+SPO}dxkC||+Z%6-hCb`{RR_FR^|S)op{%jj2vfeR@-&C%Ahhw1M*
z5P?0`;rFh6dVM#1TV1U_DhJL}j*BcUEzPd2i7hJS+9njveU+b@?Yog)6c&%Y)r^hn
z_UZcd>qXO@HT}GZE%MvH{!6}~8lk79)zi}>6MYf^s3*-<mwb*0u`m6Z$<3(S8-=Nu
zkR8vDqh!&vk@LZNSQQ@a%{=MJeJ<r3m%ri{5K!>t%NOZ=xM=QeEfacgACj&9N66#M
z^c#m$hZ-v5gH<?KdXu;K;lY`(vUcf<7d^WY85!v5FP}Yo_WjB&K1EWD{o9>ly)K%|
z?%(f_Fp-Q3-n)0NA^KDm;gpqSl=b?7shQiPJ$H^@_;G8+6(b{UKR-z*^>>FV?b|N^
zp7?$!3Vl_~rdBdz?K1bl6IYu6$!>8JPEAkU4e%0Nta9$k%E}VUvU4_dUd17FHg0bG
zXE{`p_Vz+MKYf~kn=GeD*m1UjAYa74Y?Xn5k~N$OSwgUet}UT|xLM`A$q?uS&wT>S
zD8qMFHL}EQwHE060C~TQK8<2m@Iy$cFLb607~@t~%P%s_bSHnjPfp)E`$F24qV0I+
z#^e_C{6uJ1E0LMGxo4qVnvX~E7szYbC2BA`D<arp!M>X|wI28O|1NwS8XC&yy5sLZ
zaOuN<jdH{u4ZOEjM1=C$3(D~|?)^4vGzS3~F~l~0u?f25XXEFSx>{b{V~&Wekt?=2
zr0Uxk{+_w996mV1WHT`)as54!Z|lFz9vR&y7i2wF)%I|NqINCJUUffRPT<^T?U#EE
zzxDI;L+cbuWg4Z;WhGU6rHp@X2Xty(<3<IDLeh6qx#-QC%Y_4Yc!q0#-B!bEWMy@(
z(zcm@q2ir<42s<)DVVR|5dbjGi*XT`kk|J<NsK|?8RX`SYc@SyuDDUJr=K`{K>Fwi
zT8is36*>8<b7D3o0J`z5jDLZe-|!jdqK&>T(eMX)0woSK;q}Fbgx|3*!zD6WPEQWQ
zs*icNxo3B-iI`bkKzVq2-Y_qUcr;Dj_)*+YjuRGiqVt-KP4>9I>uck@tC~Guz7$=4
zcy{1-*CWq$Y@=&i^m`|jiPGUTif{IVk(sHf8g_PeKgzC2*t~Zk=i}oeuY3|OC?s^n
z1bf(ia!_Vyhf3A>NHq~HMUel7oum^=e$?LdL+Md=dU~FENAu2iE*O1BB?ci5r@hNQ
zHN(zrBtZw;o`Zw$T@7kjU*+X-%q=XWOW{v??^7WLI=X_a{+^x$X=&;B_!0$)JhQ1>
zjVokDyhMYyPu(p1{v=i=0c0thJHsU>m$|D1B<dRf6kO`Pt$$2gDTd_edhgo`Z>=iy
z{r&xejt_!?Y0;cl4A2Vs`Z10w{a1;Q)6MrCMn8LfLK&)Cm78PFA?jLP$PUXvrHt9?
z>&WdzS~>4Ahs|c$TO*vx%ItsVzkdAsLjGTyh^S~M5J3dlCw(&0Q!v-GAtUr;)8n(b
zT5B<V?Cqbm(?)?ONBh!w@WLdC7Yvs??>b-9GlC8pw!L@{YX3}5$fQP&5_W&?(-V$Q
z|K0xOUGX@^PZ{Zy>JICzh>uy5@>n&XVN`k*xbV$Q<dy7C8$5}^vjEtgF1SD2ZDqF2
za<KX6h6aW0<>503j^TpM>n}0)&j>a}_Iu~(54GG4oRkS!e`-5@j*jj_R>e)$!vby}
z`KbO}75`0~#*gyr^oP3}x}%l0ea@lxdgIQZza~{{1c($kI44o<qwdEn)O{ZsGGE~C
z>Ft$1G#rIPZ|(`tevSX@;y~fj>UfPy%5SHpB~$x_?g9Og-;5;b9I6q|M#`@{4@O#K
zKcwc^vbzkGw|7=VSeU!}S!u+mXrwHmALeDaPif2UWO!4;_}Z`f^s=%ttT=^sX95XE
z(BM}d_nfX_G&y$m7XIGxiNRt@l}&ebcbj?MSsi<ISP7uL*7?)f-!pcPvU-^hXRp~w
zr2D{GZF*l=P!QTTOb7D97AtJJm!$nfQ}Djh%jW7s2`vQst~eELYd+lW<x1b7*G99m
zv%K}wW}V7HB;QBUcHZdi)0+FRqum9>IFqMN#*HMTq@?iFAdZ^j@!y61!W;EIEw0P~
zbF&*NM7_h*E4E>Ohkz~gej#R#?axS0O?C9EzYRFV$kiN$ql)sS>}Do3>BAm5{n_5`
zge~6O`Q=N9K-+zAkC4<V^L!~IEr~-eR$p+8MAg|hJ>^qpvPqtBvDx(I^hfJzrw6#u
z-*HJQb7iT!qg<{1_@^*d-6xugIuyg-dEOmm#4#%THd(@8t?yK>#0$QtLj<{cZkEXq
z5QhKacP@Y+=aKsBw>#r$U&|#6J*ECBcyg#8Q|hROX2mJae;XdQTsZvJ(<8N#aZ)#G
z$5ZW*W$V>rcY1?G{wf`TQ1H>if<8I?gNIf*pPn4MZUNhmmzb(|nZLz?9&y^JQ``bX
zJp`pNcvQyy8++pfb)ufg6_c~VRhv!$F2-8asAoyBDS3HM3U!|lAlQisVlnfGb5hj?
zTU%Rrinq77mv8>&DiAFaMBxFOYCDg-PrbwW+A>4RflAv;es=UT%&g<1W!Iimc^T;J
zSlK5GRosw=zQY3|4zfA!o;UrGTCMg@9mRiqM40dZkyj43dsqcD)lEgGq+=lZ)gc>p
zG_+^g70{rx5Fjr<EEBwapH<kHl?2y>zwgVpZ#o;3t<`}GR|`EOA|gWjGh0KdR?Upn
z)YQ`NI(+I@<>n>;ZhgP`5>uEv6r^Xew=!kR%4HN36h2pcsQKcMWSMn?oOp$+bL>WB
znpF~rJ6xQc2rv{f3W~wo&zyWJ{mRXU9CCkrjrN$h;5t_0PHpp_cLG2MM}Rc^E5Hrp
z_FG@2wiXuhc#X)EUn7@gc9u0f=gnTma)?GF-oO5%vV3cy0r0W=35SFrK}n1xtBePy
z3#WrY3o1gqo{qxmet$oq&!{cRaPR2l%a?+eF1?6vnAz{FY>c{-)7r=z!shhdmxE(4
zP4n_)&+WwlnaG2n12~CGrzabyCEAb9g@uKNg_+se<qm9JtFpVjr34G-E;)6ps<k_W
zTIsI}DNny!?6X5r3oI79*qK1D)%hTsSt+Olt2##^G!^kTx%GU$85#L+Ss|x9?jI$c
ze`TKz-kP?L_@ix_?ESklftUD+K&03AF#)cW54T2Xi~6eCPrPc6Uda1y&A0naYd(*F
zH=(j`+r6($O4vVF^5cB2ln$&qFE@9cjZtg(Zf5z-OOkGP_y|eQ76CQvt^9Oxt6A~3
zDeWN>mk&FpH!3_jI@)w8dHP3w+rWn1olVIDTTjEr01!&<W_g`#ex!C)y*2)x&%SQ{
zV6E)=^L|15sC_;tWDh|k+Fl)}hl^d;@MUq)BYfMm@7rsm7m^;|IqyGw*jGw|+G9cQ
zpwn}cr2dYWh>Xc<CbwE1@1Rhq7S9XHp$-9clnBFp<|+Fh`|~^+O`Tm`Tmk~07I!0}
z4uQS1?C<Y~<vn=7Vkcxl5ttmQfR4jy@>_pl^KH4ua?uUflP<70Qo(j|^w;=NuX(A(
z9$Y8?-F4eZ_iHQz9x~SN98e(CbvF+hkij945?~|TWTSl$^Ma6-BtNyQS8$9&Gwu|3
zwYE1VVN@+cUmL)ymX?Kyi8_#~82j_lr^g|`XK)>{c*Gd8jurZA>*XbUyb*m`_`NB3
zN%-PwcjG;Eil8cPy*#)dti#R&1==n9pB|qt%hIi|`a9R7(?gp&PlkT3xlt#T@c1!5
z?8g%hwb!3N>phx4`S|$M-u>&w^_MZj=BBN!kfP%A$%wy3S9+HRiytZ8ohhG|GwE#8
z3e|LAvo9Qf?|R0QHZZ>H&&;QUCq+fP1PzxjhV8B!nZGuCWvq7mR4I75NWQ18*yl`P
z)S*1PveEMN@86n8Nyx^e&Oe2a^_Tg#K<;BN9rm(Sh3na-{O@a2ygIc(l2&WjKWIm~
zPhY+?G<qRdH?|lW9zK-Hqw4{Rft6GWqmk;tB2QD)aTBj=@akCV!Ooh9oINdCy)ikJ
zdxUYCywQk>pY7|Vjh4$cC$KnYe7rRu^NR`!(gd-N)Q+qrvmOp_ilw&&JqIqyjlOvB
z{P}Z|f8RZ1W>;?f$9`EF)ID2Olv-3P{&|c7lP?dywG@()O7)p)`x=r|fZMwIQb7ZH
zERVdrd=I6Q_Bmf)Uws3EAu2i147hy>cDyKux7cny+Lc6;JQWAN_SV?gSkAoG^mKZ!
zA2|ERQIadw0~<dv#CF1@ws(>GmC@m0MkFOIEhavm3?$D&`gGw8it6g>mM{bZA3G@e
zVO(bN#9vA`4)v>AyO^Ad!W6o?y586Z+N)QudQ7#cRNici0r?5@>C-1s6)1b}KpWB0
z(QyK?<#S)(On(s?v=BT|DY2j0BOsKD*y<6mZVD0toXy4mOYe&CwRiTNN76_rl1r<p
zuTMeizfz;3V$^Jem}qGck!#0GjCXY0yZUizaj{LlVSwK`36H>#6335mO-CwW+nmUD
zuSga1@C@c2VT_K!w{PE?LQkQ=E*P{=rrF;{n(r@K*kp>^>T7BJ`ST}e`G-(%Z*KwM
zytmhDUM~(5J$m%W=XM)<hMDoM4gn!yY54AXT86y$m}FDP#sy*$lEj|T?o1vdZEq1L
zogFlK;21bG;#a7HqUG4vL{?18GXD(A{T!xbO(r=cY)yXs2qm8=z#V$`F6ukAXa0Z(
z4Ks86M03c@ALoz0<N#1~fizXMf&0=Bm2+cY2QKMfzWVJSZ!bF08E4Co&wP49im}Ce
z0MkoL3CV2otdxhCPc3)<(tukqJL?j$*+E+H_u3t(7ieHQ`c{*`QvcvO2)!p;Sm48J
z)(90IQY2YBOYECIa7t>ulid8)f|7kL;G(_#)EoV#lmTg_55(fQC}w396_nrk3QzNI
zBkRBFsX>9(badoWJ=t@Pb(QRvjM($Di?p@14d%)wF0YGzEH(e(Mu|TW+u;S3Fb4og
zNd6h#H(f7N$bk4^Zut7UpTN;HRm}cwctM43E#V>s?KBX2U0~;#qSv`)esOj`D{}#K
z!sKK}h^hD}yD!Yl%BpVzf~l*tm~#>wa3d}3)|JbB!Uly@6*t0M4M3Dd<&#jcE~*BG
z_`lL3Vh*08B&rv!1-Yw<z63g0Ri9eO`pp18KhAFE^9p{Ld~p^Q7K_%f;K^$<ATlp)
zc}(c=7d19kc_6tnL&S*e?VnFUxiA0$stAsIwpw)C)%K4Msb9=V>*?unau<N4(zAZn
zRLj0rWOg#@@b;^_B)>is=f|&UN08v8?PCX6{gQPqgD;^o6ugdo9v^R2dGiYJ$v5zh
zDMC^Eb4&#4{VKaJ#eJf{AR<F#JqPc%w6+Gjo|17CcApsU(TZHz9W;=jMY5IeO5Y6)
zr9oIF9gu%ZLl2R4-OjP=bp%J7+XpMgPjtNDYS|w+x~b{;1b(4cjnuE&D={lhoP5i3
z+5L3u3Y3Ll_kk$5OYhm_wYT|1MUyBfC<G-Wp1^Ss;O)-~VB^y+=W&`)K$Bg2tY54N
z%s1)vt)bUcN+Ih>(;px5$jWAnQdb6#ySTb8-6^)J`ljs)wNDtYvfBP^Z%N|7F_7p6
z5iLj!GzILej>l@mHV}sY=R5USqHT`=Xj?<XzVykzs%REb_Ye2U@wEI(4m~}6aCFG(
z*no?THLhNOn;->~b+y83<>Z2#_cNc#-y;<_#@@R=S_}iiSr%BfHdcK(D2jL`;NP+(
zo(qFE@C^1OMbwtr*-A}7qhrT<c#QD%@ec6q5u?Shu&^!h{lA;I-@lZjj+jC3{V^AK
z=T4kW#mEcHgzYBLYXX5MsB2bHSI>gJ6bCwp?weaclJGuFu|XCAGXLdyEHI!9p^rU1
z<RJYt_wc;}4Po$c%L7p<+3<Z=@&bO(I`<v|ObqdvFG@}(hlDSnG7h~le)O%%Arh#<
zgYE60mV@Q8#qk;e`v69?ymx+POtRFcu?<4QpQarvYjrv_=zQ7kpO<AQ&YTHOuM-jy
zYPzglTNr_azRY_#1oE%drG|XkmwtYyD9Q`U%!nTl)(QPIV0O5zxjyDgcSPZZQqTrs
z{db{sSG)F|o3J@{2T`aa=TZn_ef&dM{eJbvkJ9w@Hdl9dXK00PmL<u<(KrmMb)nQj
zt*E%zajrK5K`#xxInyKkA^Sk^bF2p_bu7r$=lX#F2yV89F(TiKuF$LScvG6MUl6l#
zrdF5FZVOy^ye{bn)xDLl_Y@ta{@$JC47IZ9!pulU8QvfRb?^*eqwSSZYGkvE$v!`L
zWyE9b9oNapp>MfOU9W>8Aki-1b;&v#c)bS6H|3e!Gpl2Eo?r9$P2;_4@MJmqU`YUk
z<!sAWJBlwAd6tVcJGzhlG1YrzZ`9V&X|gyUt-NOJWt>l1MbTEWcQZpH@4Vq)Xh`YH
zTERvd%6e`eWX1UScm%Wm$)IZO^s7d)CNszF9W)yO4t+a%9e>VEDr{s8bCeiUQ&W|8
zJGYmHg4>RuH?oM8K}T2c|9xMBqiw|3{>|0%t+ym&_$pu4Aen#ppdIi7grGuS;xo*b
z80GxAkdlJAWSh^)Lwc57-PDw}rKN?2fq|E|k4&Vj$icbXXBBnwogBKLCcnf#ot>Wv
zUEn)RIF5lz2&<JNZq)ReEIdC>iXD}NT$``|JMRdX-yzBIXRRl*v<n%+iH!;n|Nkri
z=xYxiJV5Xz{Wr*sayEA0GW+dqPD@9bRsazoPq6h_;$5>wUKkd$sYSJ{D|~{*UXqJ?
z9(%{7iaGpn9^hY-(T(8cAGB$%h_m4s7Y)T6L16N+Bf?LZxB9Ezc;VyRubacKE|Y3h
zHyE&m!#+<`UcWsF*!XFJMh&WwzmJ_VBs7N0zM>myNN}@0^#$b;Hk55^nB_J3DUuA(
zWF3Hy?g0W0&dab%Eu3g^C3tkSqg8~GWI%Te4dvwINP)&Uae5=Hvi!*tYBMvll$S5P
zO%*9dbXR)){b_4MswmJ=BR_OI{(I)SnxIGZ4aYVIU`rwTL>U1^1Usw$^h!EE`P=$!
z>KM4y$L%{)M@L7}^u?sFbflB2r2oWF_{R3-J$ptbARqun1*f?9)rGY2w#a7jk{?aM
zD=E3TK4!*XRs$(u6|pKu*VNQ}bEozrHTvtY#48qGf~eagq<P2Ua&lG+VTz#9o@IZx
zilt{_Vu}^X03CYm*MI8H)PmFW!VL3|S5XN!6~AW7UVd^xg~)Poak1nEQ{IagWiOH}
z%Z8i$$onhF29UksZ38kL454g?_D3*o74h;R5CL27mjcGQcubC<TUwOMt*bRt+Mv~Z
z0wA9N9xq-{M1l--j2xD>3=o8N?%t!oD*5NC{=c;*rlulybGrWFt;OC9k(faW>*OK_
z?Z@njG4MjE>HsCl?xzo}G*TwU`kzT%wkRHc>;I{8et!PLuNP-RK~#Hn!#OW4t$=Ba
z5|P_t4rh`yB;Mso%gLz-Z1%`9B*5S)cC>_Tlf|a=N06PI0BhijIievF&{F*Kho;tb
zqzTnPhJcWZx8qR=6d&t)pB(METe|U@Ns)&;YqX4vuBMR`nW;d>;m9Ul=k7x&>kITL
z<T~k`qe;}WONjt%H6<&>B}H0WGZz#T&@eFxgzmn+Lu4Q3l9!uXd2t8KZHXGU({qV_
zA3C$ckx(ih50uYn#fapaqN2q%iSwwx@ac7UoV>0W8;@4>JxNFySOQ9^!c{eJt~sEV
z##9)c#eV+$##1|=#?U`b3=GfO1R~<4{<m37TqE9B2%JyqxtK{M`SOatdS%S&v)ii)
zCCpe7kwO<2m&FnLhjDSsa+;ovQO8P}nwsBh+>Kl75%Z^VJ8?QYfUqw%Xso#BCfJZT
z@Vs><ju?o&IZg0do<R7x9uCzy)kkLVPw}>-obMzhw<btKD8Gkw%DdRWh%BM!)uae_
z69+5n!C(s4<y=S+88=@VqpMv<RGsm4M@w6Kda&5w+-Ru-%Nyf7ar&jF4;_#XSGmpJ
z-4bOPCp^~_pueGa9-3x8#eUK;$k9~dGuV5|Sc&H)!%sigD4@^WQ|7SrCy<q-wZuJs
zADf+@&$&r;XL+=W8qRWOcQ?1RG@ZcJm)|1=Fd00h)uiao&dxsISb-?<kw%8;Aaiqb
z|LsLnY*TQbOB0Ha1P7L%lkQUrE8Lgo7oCz-@(q7jkwIF<hMk@LKKnXKeahYbXL6yf
zVme$t;2y2db`f{%8!mdD)HpZ2?!Zv=(r2yQRHJKlCex9jPHJ8_#>J}5X|~~8EC6s2
z9OO9`f7Ms52coLi_~du^zVH=1G&B6-#Uks);A@xz64tVqnq|t9M@$l1O`KFTeawH~
z$Ei~M_mLYq*C_IgeFWqpy?UXZXVtsAyAPo=<}20l9F~`hLK#4CBh(>lKP}ylqL2RQ
z#-`tUnBN^$GEK~wi6K3WlgCmfVGU+T8RtLh_TvP2d2u^yzgn7hHm2-%N&LWA0|bPk
zsXdZ@DK-E3#=X$@hyPYWj=&^IWBk03O%6#Hz;fG}dBUG{9UWgO`Ud+TBsLo7iP@Z%
zK3~8ozLgXZAO+c#6hlmPvG(XHo1p=jjdOeOiWNRs;ujeB5ddPf&xF#11`h57iSCrJ
zU!UkM#yCXz71y9?(npgSjf9#{D9rBWJ>Q<SK@XXjh)D>x3?;AMdlP4hnV$KEJIj;G
z&~5!o?8bjB+`)~nJ%-;hB7!`JTm58>j3)0Wg_2skD%tN<D<SIgPW`>T9{@=Nx1C(C
zaa&4KK_=qF#geD*SCl;N#}QN07w)GEs)rQ)4la5{eSxQr7xRV(eGsZNX7``>b35-)
z=ZJs9*Zcy0TkU)3);l^nHu(|rr~Jq;r*pV1MoS+4AdT!cPONJzEBvQ)cc}dp##N?L
zogIFr^(~h03MmFns29Opq~}Df(HgNN_oU)})%(uC(=>5B29}<4hL7UgSd5nk#n3-*
z?F%F`QeNs0dNw<waTRP|3DxV&qSeB-$yP?I7KZB~z4T1dkpTUMq<?(;`sYPEul8eO
zgos!>m9C=t8diak;G?50V=wVJws7t+G8~7wCzP_d7G)pjbS`Im3k%-2S1bN}`TDgB
zG>`9~^C4K9^+9@I5xymx_IsFwPx8@htfCrnR<Bs2bc0(S342g8wX$tfQ~cW!z1d)r
z(uU7u)YsQfE?Qx(+Tin0-je7^vkZYaexqzoHMKnX&igSFf0>oJ%otYLgmiY0CsTG6
zRx_K9l{rMj#2MG!D|0Z6y^v$6Ji~Z2b$Y@CQu_lC=AbLSyEQ7_nxSw!O;VNC*Fs7)
zd6{HVQ^}2!o-Os!QCe1-u)`kJ@E-z7Uq0hFlHJ_v@Ah}6qR%8UFD)!Q1R%T25`IIh
zU38r0Z#9GK^H_MufRZa+oRz$vb2SyUg`Ir|fcYi2W@Tl4yJl}<f`%8{GvysaQx99&
zCB=CbeX06G6s~_(ru2-iGHRN&p`OCN1n1?n-A>~=$}fLw#PB=$4Fs=R0b9PZu)yT7
zdYRez=#~2Z5|#S*1jZ2@s6dI;Rm|QQH&DcVDZOK#2qitMjrP~NSi{kQ;~rEMceGBu
z(E@5EG*(__|EL;fh>oh6RhiFFC&iFvZ|?m;;Y2B_M=)oxo<pw_2KNs)+DC7z)8V=u
zQ}_k5y$i$8;p>Uj61%ggJ#(;!MK9Aq5g11v1AN_@y)vQn*WI|1Zl#7)VHX4PS`b%q
zp7LEY{t*MV#ZUR3#O~=L{*-^}&851-XR{Q8>U}1fm=#R0gU*n}oapop4Gn#sY)|s;
zGeiuVP&EJD_^L11-KP2OMZDoBHq&?EMXck5%9ZTNI<eqNBG@IJ;{Fd``sE|7%B8a9
zeSNk{Ft-GyX?rGRsI8^W$(1H>bv;Q<Gaq?yF?iXcgRKL|X>p*KCsoUf7cYFwpOK6H
z`_-rPmbAfIyI22Zz?0t}N)bKJRimqe1l_iZ5!IH4QeHm<lUQYYaUoeI@p)Xz7y2$U
zIP(QazVqVxIn6bntCqlRG+zHWTlSXItlsprrXA2s>B2ow8UMtwpozP4rAE%G*Ea4K
zy8!ABD9d+H?LvOzgDV8_dUUAz4Z$<m?C@ART3QVoXjSFAwmLc_&kgMCF39>$VjXhU
z9b_1DgHWia_c77|6ert!EkYFEiU=;gy@UjWguDR~VICING~P7X;2#U7!PTVam1SBN
z67G@|ohnD2GifvG938!O=RAYdjo)8y$0m+t>D^#{_toN~W0EPzgS50NQAgJOxMPq4
zT*&dd73ftnB&5QuNJutH;(#N<Q?5mbReY8+zXL*mgL{8wmViLGtz@O8X@XsPPEk=Y
zVa*%ml#BB3?_k0fWn<$sQ@12G9^H;k9D4&lYx9Er%y_LQy{C{0>nWJ?pUwXB9_RMF
ze67?%#t*076fl=KuEfZ|@EvY}@r4T)<`+}Q^HJBQ6$K08)k`J*JI3qG#r+rFVSJ;3
zhCUM6m}r)NeKp6+UlHgivs#og9X&n1eBXcYAVIvap@A8UQf-JM;4=q-PK{NBG*`9e
z**9dqB`H%-^atd|?}bnaKcy}@`G;&G{5llV)6+$+P!^l|n}e1#%}lJV^}sDEgxmP&
zLYGCERkG^wwz>Y5D^krTkpBGH7$`7Yetig=`ok5m?KwK+xb4=;Xa#D!>*%YOy;<}B
zUDjSTE|Q?J{yG}JKGCeJr3ISDEI9lKBoliIuKaX2EgP<N`^pMffP<Kbh<Ugea(6NT
zvw8<>^-~}a^cN_B>UtH}vrN779O@Z4=7DJQDZhZ**C2t6TX#>7ckw?-U&P>N0rw8y
zAk*irR=M$beALE<n};VjugbPLv%Kry%BT=zSw^btL2liq7rWVz0>+5Cwzl@UtjMK7
zzOd;BOrlE`mpJeFG7#{)T?$&{tVdNhf=91@=X~!gED9rfJ3VpiiJm>D$%`s32%#m`
zMu4~5)K5yqsx_C;9I{~suv>J=Bm}k1v$U?V(YXp3Vor`*E(`E<x^GA#^HXiJIs@(1
z%SE~Q#IzGAzb*?_=k(f3cUC1uu0E~+)c6TfO(tblVx3*j>!ymxFv@=P?_Tg)B!@Wt
z2h^3$%KcP9N$JDzaGl|%3bEZ&+Zsm7p5#b!{>uW`mb>&<u3SOT02NlwN`Q~u`P#_r
zr>ZBOhu3-z;h+-F^<}-d@r4%Yryn@%>|#hG>b90a(qGBoH8awhYv;h=K#;1ogSTI@
zpNdGMR`K4BXKL3Np|S2R97KrH{fJZr{Ys?NMHS@0z4;fuCZJsb{?gTZMtE77MDm=v
z3~f%j)nx<|+D3G8ast7LOvbnW+1K{Jb??uG?922O+q*bLq1%^e$4^E6ixDh$UEM{w
z5@;_we#r;~rE_(veM;Xe0TKfa5cPo7Ai<w(AB-G92(N<ztym%5Leo=x#BlLbmN-NL
zLFwQ8^C#7YxLJGU-1heNj~tKJNXwsYw%2V|Hx(FZZyABLhN7oehg?XJD>%PlQ=pc|
z&K5N^JOgJ>2c9wWYCsO*_s8YRe+Y1Dn!)-;M#a!DKdbD!n-9DX`{y+tTutg97+7eK
zCC+kaM}-;sdE1KiSKm;&N|8G?TF=>@UqFCIN{SYr=7U@FXMZ8@<LD?8Xl|ST{%QO8
zh=cK$>{`#N`<T50oDZ(W1`YaIWRD#aqQ$Ff-A=~r9ED8MWvdDak%Pki0ibh5Nk*ip
zwKbkH=7{Kq+gQ7Hef&sB#VVtYcQzrM=-#fXuVp;@-Jqk%`q!8-pi^2$F!J!y2J9i;
z7`$$p@jjU8+&Rq(D-hn9AOY9_;xOd4V!&{`Zgb>@q{rXLa5?jufaa*|+0&=@p<3&|
zML&7+#Fj%aYGp+1eq7uK$Q6SHJoex17g*t*#GRvgon%%P>7CwA9pbL+?h{FL1X9^e
zw>r_x<lBDy-#8=0RA1%iBX{rK1xvFVSQfC`$F;RG%7BqTR>J3UK!%Nlo5Bt10k}1v
zzh!#U8hWN7hP(x9BZ62OC*6OTq14u=N$iSrpoq(_bV}X$U%lzR3plWABV*KTa+FZc
z>JB1BZ?6J^{<k_h_?U=cm86U%oZIYT_gU1Um*`h0$f;Rb50jE8b5ci6USwv*L7=ap
zv5`wrk!5#%;v<OKe-;OLKzQQf;rWQQlrl3%zPX<;($0-HtWzVQ@jWT9Bnx?2J4KqH
z9|1dY0=qITQ-l$?Pd5Z~5hU_pTcg6J&JWb7=XJscE-t(f_K62q%epRC*s>vTHTh*M
zJBHa=3+s}iN&F$3o&b5>ahAWRTrj#LiKdfo;@2|rzH1qBA(sJhW^Jn)X3HczzMvw!
zTO%n975M3k7X~)^q_`S^eK0Gp6b?XHs3^C2a_3Fh&6_W)Wn^b_4K1|7sz(M5#9CI?
z`h<FrI66}%X$highWHD^ga<w^A^)E4zDF?!tAP*QT39^oa=ji4$Jh~E$)?kdfkILe
z>I<TUI&omOnUq@K-CfHS&mZx>!grzavKr92SQ0bLc4W8n;zs_c#hp*e=B1-TKR{aM
zjvkQ6zm0bKCJU5*2;6P(O&)#AQ!@rd=m%usAFV&Cua}4HV=U;W0=s{ug!-~11jML0
zRAodc|C5~qj5)I8?&zSB{@#B^2Vdq5i|<;lo0cRWnlmC_k!=!5;+q^(XMOhfSP&-6
z1N0RFrv7CvbdaC#NGWoaV2lXIhR~y0DDtHc>c%Rg4W-+DJn}sg3A}0T9S;;!PG6x6
z#2Pa%g{*&vj^hcAUajLtlAjI!g<ZP>($Z-G0Rbfddq~=Mp>`bZr@nZ>22$nYT0Q>>
zv)*g=k;Ox65aX-0Q33kHz|QV1{MEYgS3}03F(=v-i6TyMnp-${SCmVO9J#dmuwlo@
z146jTd8yGg*yP&TC{=18+Xdh3pl?E#D9BX_H}m(e=4GpZvZ4iH^tz4>XmGB7*zPkx
zKvEwZK0YyefvZn#1uDK|%No2H1rMd%?4f>f0ay)xiVqFf@Ay23q9?~0Aa6R>*0W|<
zZehB*S*bB!=XWtA@`@JgS9w!wt7A#}5caxl8@$4Q=A0-e`jX)>$mVIu0q$S3T{qEB
z0alKG)l=f-y<ch9s;`CRk}vMJNHJGET)jB>-gip%#%LauII9S1uL^tH_JiusdG!`-
z{|H){K=O<_x?=r-?C3Zl62Hjm?0r$8-I}X`#Bwi5`S5v)Oy<*KlpiDd8K;yj!p;;;
zD*8}rghpK#sY2d`p4)~dXx$nni}+N10KrQV^dcG0!Oq_~b$O9HEFhNkzHAKtJ8uM+
zOyBHbF}{z%_51`8vG3*AFM5x?Ljj3=8tH7k^zR=a<M+Y;b}=k@8G;M9)>xc{kz-T@
zQGVl>W#&SqhV&&>m!wEi+?n?~gSQ)_@46m!O(Fj6ozdea^)!fY)}mmeF=P`=H%@QV
zd1-5DvB`PA`>EFr0V`0jD{LNG!*;)d(@aPE$H@Ap7Tz}<-0EiY9cwxX=ezAIh;E--
z&pWrBqlBF8ITrnz!iF?m|2O&h*w4kAp-@{jNg1iM`XNAcbCEC|HCxUHvTEA?dU6l6
z-BM^bVBd;{d>Tx6_>lA%dW4o1K8bKW__<OrfKI@B*2=He=H~e1jNMBAW9A7tm8qfr
zM_8|~vvbGwUOA!3Fs5$bIwE>DN?lqm$;M4Neur*_hJb}C!V}VzB(&E<f~Fvr24uW8
z>Nu?N($ic8MMZp!4NAv%$odPvxBvy2pSu7Ky3I{1P|!-@JUDGJ^h^kdE$UKYxEp_^
z-cO4+b2p295n}D}Co=6&qX(-eP8NxPRMdRK+PYz7=80P6Eyo<Lcl3nzHp@RsFL!ly
zS#eAlKbP)W*V(mU0fQR+&G-)=Kf0ElPJ~SHaTk~t>Ri8R1y<emw~%v!R^fql0cz*i
ze>byV5k^1e8x28jE-ukLT2IGP>(A>*8-GsbPzn-cWMmwGRqGiV`b&#u(jK8FxFoaL
z-wQrw{O6{^aHQ6yhpu@7&3OL25o8>Tz&rWbvR*$G_2T{e_mq`xbRy753-Bu6*K0=W
zs-8L=QP<YxoVA6}ZOJx11FdO?jy+ftJGncBmconx00&+w29}hR#K-sU1=SNQ5)m4_
zK@<=VVxQp4G3RAiHKYNHa&wnGX@UP;?E3rrU>@@x%Ce<FP-F<Ig|=`;@9TdMx6Q@-
zhU2m{v;dA0dYD8*@)*XWZ+!fqA~0u|h{*|k!yJB*^$}Y`!ZiYQ@S}*KrxY@ZSbYbT
z^-3S?%VN5*s+8<f1~HBSt=4h7O#EGJ9G4Bap24V(-qY87CtDg<N4*W9#h1VYmRv>P
zmuFIG6X`HU!OhL89Qy8AMDpBvI`^UP%jDc-5=^k4Kz|N_A0<Y^&yh~r8!IROEV6wz
z$|0Z+QY_Kq?;J1pLcFp>22vW^knlIjQ;q!G(b4fb$L=Z!F;uiy<eRDhzpaj1*lG3F
zmjZF6qa6Sduxs{~SV%O3cLVyIRoK}^9Jb<=c$2>&Qfyth$%6Dd31$V!B-E>Mx&*m0
zY<W2U?&TW7{YU!v_J0iK@sBEdwYOjluIAXEO-M{^Drw~~OIp`WV&*!OwbV&SO5)`%
zfE9VvGdh0upwPtm^q$u4GC4XAvnJs|gwY_Fc!{aV-{&Z=VUYPI+BzHMAuV?<1gV1h
zvAzZ^4Gi$!NsTr2_b3^z0^j&}8P;U&LL*XAQV8&7U`H*4ib2-U(hB<XTU%;Btam~}
zd)wZ?3g>}&V9!C4YuZc{c7P5yNKv|Ad}E;L^YM2V4_->FBd#$ZMDNnmD8Ah*+FH>x
zsoG_3%Oe#AprU0RW($`;JK!2w?`{R^_Dq_zZ$eFbdq&X>TT_O(Athq5ZKf%As=HMO
zl<;rYuvGPV;>wyun{Z?vM42`NU?Ai*Bxu8j4S}Pngl?*@ue^O1usS9MT}pay0{Cn~
z{Nj+Y8l$;eBl&GgPWBJFeWRHDAxr6%Rb+izwbY8HmG^B_BS$u+e8dB6&X2RMh5zv&
z%;Y#}1UOq(+~@ZL$Iu2v){Y*^f*2#Nr9~o-c@P&zM{5eC8g@THC?pMgZ0=%za&IAQ
z9bqQLnEKe}4TO_5pp!EHi=8Q0&N%$w+AuIWw_b9G|3$}n<qc|w8%rC^&QDWP)H7l8
z9<zH6pKr{t{QdiPe7vBr@Y^pT;6Vy-7d%lt(DQE0`#hocb+P}V>7Dy|1P*kop}LX{
zL*+$&e7kfv-(Z=<J{tYEVp}ekS%I@U`-7P2_kV`js*wjYwDL_M5LkpdH6YP`qzTno
z$Cj)ZpFxK;n{E3>!3RLe;^s|5EtgHsG?2f(L;mB-b!p`r>nEOWdFyA^xBn}~-Ff?K
z*dNWmy^e4Wec0KgCTe=)((b_Gv*{ZUVs$B%3P;(hrjYl#BPdBqDSSuNQ-)Rl>ebhS
zcvUfG*=*#efdJf9{0G(2YHV!$0oSH=11u;*<6PxeaP<Ov?KwkE%e@JF-bDWQV9klF
zVIMsp`R5M*VOOtTVAkge$2Ij6Vjs&id7^Tf_~c|hF_7V5G*7v=zh3~nd1y!h_6EhY
z?(XhCAs$ETf3lZl7glPR4Z~z6?NP^HDx4d!$2HOv4f6B`nQoIrer>ZGvN|iNhnlVp
z)fea1Yo+xspt*|IyUua#Gdtts#5N6nT#zP6Mohqlgb5%MGqW_s>LEs2p(LpTP#ogp
zJpfIUESS8tDAl~^_T^pCg_`=`B2MymJevoUX4~{we3owogxq{Si_*_2JcBzgwGU2N
zU&IJlarh_-Or7*b-e$A|clt6YB!v)cVKFiXqr)J!o<)`+aja9WB0ax?UCO2n%Ov=b
z>R(p#OfRRqi5CxfLj(7|+0%*FMr``V#%}<bKI&b7DZ*V9A$h1QOsvu_@paBJuCLfD
zYO3N1#3g5@&Z&MnqtlmlNZ{I3dL<ylfvwl=sZ9=op}*;JwPzVZPKvfoK?z<X<w6R^
zQ1-v%Xjy342$3+glo^)zXuDJ!$#$H->9qd0#l75{QCQ&NoE3(|1z|SQicAoE^J5{8
zfGque0gPI0ul-^=J=tyVV5Wb%04c5bgoIQxD&jxvq%_)EJPCr=eOwv9A|Z8nPpoYr
zYZ+Qhj|`+lYq^RE5iA^@k@1^|dKd9L%aojosu=nd#nq|CKzCMrOmMf%3@@riaUki<
z62eYDbk^SC_LW$K(=!-uE;%HfM{UM1xDHp^9xg)*Xd`AC{n?MUAgzBrk&Pu{diyV0
zD`?7upnGf-QLTMV2YmH&Z?7iYTVI=QW^e?a0KDWD5$VhJ5_(zyM%P$dWVjAEpAoYo
z+8vTf)ee4rLS@fVRZ=KhN-f=-r`WKAmupJRiYeMo4sNyV&%b!V?0kH8xr|~)jpzc7
z-yLgkA|_U>CW0*V5B19W(JMvM?;g0nJz2&@(I|guw7Mnb+RFftjx?R$DD6guzJ`ej
z&DA{BWC$j{#%HGfU76~7<De_qJ&BT>N-FoI8yJ+%>pgDbp1DOwxOwJFgeBBXHc#Vv
zNTeNz>G>_*%cu%TY8>@4Dz&O$g?xayme&2%CJWxu8};Ii&CM&3^Q)_dP+(rchof~)
zLhkoYh%-u!yIbPsnYvU@iDKt^A~mF^3`y2a{5s^Nm6WpYY)nEhXZiw|lIInbl;#N+
zd3XP9-dt&)lT+_@fgDN@go7(k+{o<j-`vf1bCwVr#RofO?ryoX_GgJ+*Mx{0!2a^%
z@>cAc8SP}$FB+`!%dtD(UmIQzuuoDUL#yJ>(#!q4YZtb}my;^MtpvVo9h9k{rUwD`
zr2Vp$S-;3w(m`LKqg^`h7z(-u>!my8lhkPL4=#{Q(bC$6_)|b|FdzC65P6x1z0E;S
z($Da@Xn%xUdp>YBGfPN!{Y<q0is?>}ZBWqmF$|#&K*-M%21K4de}2UVyf0mdyu~Gb
zR~h@WOk&-3{o~t!b*y68-X_=n-d;*`bF=tcXUMiacd$=n&H^yKylxv6rP_M9-n<Px
z*c=Yf?a7w?@$EU`s7O~vKhnB*l}%nIb<5U(**2O>86it7hRpkegWt{u$&WZ(=(`<n
z*aLGy0Gh$?dJP%wCE~fr#|Xmef&X5BiEv0pf=}G|`{y(*q!XK<)zi`*FQ}cqf?Xbf
z4C^9{Cg2l_;4DSU^^XSB8)y^l+6QV1wUk|p!!kKOp<`hgFMt+Z3dAd7x=*6r5Jq<y
zm#;n(s9)D%O{~Yp#T!GO0Uz&`VWkqYeuu7|ou6MmxoT)wboRW`=gP9y#2xi?j;KA2
z-Er`565>lBJ|DMLp4NO@n7e^m{=weoXJN1CUE0aQ8T@K+OKw38Hv(3CX2W{5mGj|c
z_i~Gk^HgD4o*OVU#7Lp7sGaQbz-sE*)XQbN-^~b_nzPdZ54ehn^6Su0IzD&iyub5#
zLXMGk_=)_B0Xdtct-eUqj&SIFyeci7Q2jbdWtX;(Gq2W%4<BGiBtidT=%xdKI>-ii
zaJsB&41ESnrz=(=!0k(*GrylA420Nk%+}w(p5R%>T%{J_(}{Hxa*8I%FJ@VrF}ICs
zl)%^#WB<6#2enDej!b<1r$;w8`1AM7%;omu9X3y))(DtE9r)$jZUic8(?-4TlwFt*
zR~7JdHcHHE7;l8J1&cZ_%khnS%>E#k!*-fQM6@WTY7Nc$WF^M0e~M0s=>AlDSL7C_
z3>P~?>JA-R5r$j$J}50)8^&QN$hbgugWS~zQjQ2T=)XiHB+G3g;^N%}+K;~HYY-l7
z^+_OTz#B7QNbW5bJ~1h#IQ_N-NfXGWI)hD!pHvq2y8)4IIF@k`bGg3op&W19{{dHp
zM?!)cC<F~d!EcrbX6MS0??xS7-gM7Z)1>A}k@u%&<7MbauIYpy+cUM1->3+L)6mD3
z*sh<CXVfXH0G7vVSh&#B4#L;^hK9WOR=W+kAF{1>0Dwa<`G6lKlYy*KfWQAMa(aFm
z+5u2=T-u|Y@grvtGk61422VXaAvZF+u;6~>dGMUii^TZlPxollOb?Z4g}QSWy4Qt*
zKfXsDQ8*}|mjhPZy6f1}f0-ntLPC$58}jYXdx9X>DC68s*=l(Sq_-ap{?3z1cpP75
z31(VQv|7~BGx(|smv+*)BFJdL*HZA#xz+p^P;aEIwL8bdo%hFv+bl_?-zbO7K?r>f
zY4}|6<iY5BbDzt6IwX|L>RJ|VeeF_U^uB^fO=>1wsxy@$Facy{ZeA(_s>jpg3uAf*
zJ@}J3k)=knpTt3L`J3ib237Z17(zHZa#;|-QfK+~8X9`~ScrO_`L_G*(uM;}>_D#9
z<9j{|#^b~V!HJ{El(4T1$=3&CBrPosFN#5Iefc;X1VUJyM{VMlW^K7`I3b4r!7*u=
zl<AKZrN;YHeIcis0ZcSkhn~soplS^ujwmkf0t`ld;4TbF-QwmxfDE>XFo$yzjCUKK
zVG=I_`6I=qg5Q~ei3vYXvGh5W2k!^~3RD6|;IoRpyzYtd`hTVI*N^whKQCZSS;nu?
zF*~1<Y^D~^;b+KU(pw>DF@?y6WdUaLN}zY(hnSTlobhU*HZU6#fG5~ycj+JPrZCk<
zLrZ%Pq^TJgAdZFcOJG#E<>j~OU{N{3#>1F`@!j)FRlEhXFjK*KwtK7{iQwk$vmTFr
z#ZW!2hojPyVNH7Sgekb8K`|{OLmQB(+d>E&DKOx`a?8c?xQA!i;<xk5a(}G0>OxgU
z@J`0V=ptbcP;d8Ok`2P$+?J_f;JZQ$iGHC!PrjM5&L$b6VucXtgm1xUy8qKsfdHKE
zF|I4zLuzlB4|_jq`#GA4xqW-72nhQFQ2S!RN=i_L5#$k=<{)OivTu)Kmhnho@Upas
znYB{y5bb0=H0c_<Mi;L~g-c{`1zzpAiR)M#E@Q$+)rAs&T)wp`akIg}|2lXFV|BNf
zAf6&7UKaDak2x?C)PH{(Q;LRX|1|$tBt_0?N?(J%6C&x<Nfxm?5fcCSapqfV#5no5
zF>rxbXal$gJXcy#IRzOZ4gN^D`I~FmWH_ygFb!Jw(*ZS*gdtJypS9!=9ei4jg`6xW
zXx<<Lr)88n&~;^)t2T0Ri<#qp()-lbOwdyCe+~yO)BA%QjFq^5dzo4!N~|H6UOPuG
z6%`I2Oq%!nIH5X(fZ@&XUnkJR@9jI)CKkF-7Q+i3X+*)fR4e}(3uzxzDEHl0u)DLL
zQ<)*aF&VZZ_NdRCvh}MeRsr6u-v|yAfBdgx|4vrdQxIJD)|)qYpTBE`0bIzF@D3Vk
zAlCy#@*U2>U=0uaU{$N@WjOGH;cFQ>ev|(KKA>LQ67-YKHKr(nyL)WP<bO)I4o9f}
z|9|$%ID6B{CS*lcMkSPR_Eu&>BAG|w;v&gRl8{akvX48mXLdrQ@sSZ_L>%9z-|r9L
z?%wa$csw5~-0Hgr6UNk!(-HJ+FpGd_GhWCr4ORhJv54tH-n~Ef-B-A928MSKYPMzj
z;5EPrYxBcAt`^a@4VUGJOtEWHli_0-c#sROxI3UtByLDga(TFD?9$E*Cs}`)bcyMJ
z(`+FBt-O@fkwvP!ASaIE@s+4u!<C}OQ&kl>wqY)Wu5EP+tIiGrh->)I)_k+mIBKw9
zC?@|yjmnDcUF_$X9~`e?^sV7Ps@H%Nj2%a9Qe_=qZ+A=NA3XM558{nXXUijf2s1_A
z7|?`+Aq6sDZF6%joA=7ySNs#)SNiyHO0)%8Sh*N>I38PWDzlPYCSJQj!Vp~ZuNE1m
zp%6gUx7b`?6FK`B7S-@OO3@$aJ3I(@L+qASJxk08Yo`ZFfWGpyBdo{n`S<u}F-{o$
zp3J)3dH;e5B9scG`%SjtD8!3$yYqlz;0VM3p?|ap!O!2UT4u?Xvd|{&rPvuqaf~PJ
zy9!d966$ae7;H4%+xFZLXhop`mwF;Z3Lu3n<#XX%FN?=9kTxKJ%>D$;H<hL9iD26(
zsPjEM>JZBO+bZPbtqM85yFjz#sJfN83ZmM8lnn&jcw~W{*?%hfI4w#ePRUw?M31y%
zq>vjWKbv`3B<rqAS-^*h#Ga{fehhlUFzgI0b`iqrRrcB$SM2L<n8Afy0us!yi9++$
zQ|0ODmd6q28>aJ6aeF0<dW3GZ%Gz6euZu)!Xb=dG6>Y?vU3JR(dSIT`9d=OQj!e9;
zk6zn36}N%J1c<@t`gJ)-lYwjTbviue**V{ue}mvcTkbBeh*RYCutfB8<;dq^S(ba@
zr|J7#oLE0#DM(aZ&e4ug14btS*039#C=;*o77HK|+Bn~#fqCkzx3?7F^kfX8`Guzl
zMd|VMa7L6XF8*$CLqk$`rk<hv#h7`iSJsT*g;B8F0|V1<*Oa4&VEG~tFoacEb7kZL
z{5rDr+BV!Q{-q2~2CzLHjq;^775Q`EcGTQ}=}!Q=ScSvOWMh<mAY5tM`N9#l>nn6g
zl{QjT$YP~V+PDp*eenZts;APOpF;ufEx@T)A9h8ZRhNk*choK9hj=Yk7*Qo%>WXEh
zc!$jSj}ntH6kYnd^NJ!pQi!ImzfVRhY#o7dUs=7EIgfh&*%P<wfqQTjCv8%EH9={D
z^GCc&j;Ud;m#!7OdFd94^+Z)hYv5e(GwMkqbSdh4c=xbM)@bJp8A*sYBh)AZxpP7U
zkgIC8C8y4oxh6e2mxa)?C|mjVjk?C385NhD%#@V$n%mi>^;ABFDUmFMoXv2^=|y<-
z3pw`VrPAz}C{!d0%V_)1xMoTbTxBR?+ra%W3SuO_W2LcB?laR8<<MIwex&#*5Y{OH
zCa|%wVc_zF4joZA1wrEv?-NK*PY;4i801nBAaHJ$ofMBp9MHLPBefqo<Ro3}xwpcN
z&>rYMU`Cp${wtq(LIaUwN>~09pQ-<!$pGAt5oIt^y|B7!27FjCq<Squs^lvw#U^cx
z(-NV{gP|OBb9WDqp4nNa?d3G{n}|pTlEW`GJ0uM$)l(-c22r0Y<G?p1OJ8`EOcp^j
znxKDx_zY<O_A$ZJYyxVwtG14<rB*UWTLwxAjzU0RR{9%Em<C<+KL<3Khmj>zdQuDS
zJZvNHEh-fZ>wW*uKzFzlxc>KU?;Pt%`CL-7OX^|3+RTeGnF{KI=^kd|0yb>77~u^)
zeYb%uZ(*z*@9#?2*g>|Ek3MeMuNa5ptmxz@o+G929<xlyEsP7f9%3wL&imB8RZ})r
zF^zG@R8)_>jrmU6J%rlKiHL)plaJX%dzvLRj87A5wi{>if?ERS`kMEmy<+yxcKes)
ze3+{CvV-IgoZ2sIYbOS?yv2)2CZq~<P4A6spQun(l(s**isvXithWArzqE279$d6a
z|3Rp`s}Q{ao68ElmE)CP8Bv1=k|!5zt~{^)ZSaKu+s#sm>240s`yAcVgXE~WzT0Q-
zWL1dALy%`2xRj{_d-+U9Q?5?YCf#TLc8b@M$z<IfV~-z!g+YS+5Ac}?<=AjHr-Kjn
zZ3<cP4(Fhp2Qb5T$6l68EG=|HPOKJ{OS<dAIzRr_^R)C9Mef>PVtGQEQm+HF_a3ey
zTZpcov}rO9`k89{PvZn?AU9;z8JR}2;}W7~gm&@kzn@Zh+nXJq%P3dlF4y#4!9ZXC
zBjJuR*pmw+h#1Si9hO>O83<DvHbl|W*&i0yI4ZB|IAtB;-hOOKJIA~FY2?&JPlb7_
znPYL6IM)}F6^_KE@a+}5wVC4v37`oNf@6RxGDLom-Zc?hl+>*qDm%)}hRnjApjuuZ
z;ud)>{lIjkB`T<Bl|humLV1fq>)+xFJiZZfS`LnEU}(VO?Q0Gn{@7~yihq-xr&z~*
zII6E*w;J=VgrHwh^ux3`^YG@~AE5%Dq$V$2%61rP*=WJzJv}{r0SKP_sT{uPEiWfW
zP}!Dz7Fj5E4)=E2>}$n!y3S8zJO6S@Lxc$3`T;khPQ~X^lgm3Xe@o1p?2Pz1+T)s<
z_Gq+;iAfE-D0yET6b8J(<IyhBWg1U!lzTl67P~Pznr!2{^$OMeD7UxTes}tI&5lU^
z2*LTqlV3wwQsrS&`yT|)gqqIYsOxNR_qMaknXq>HP`J}o^JlA0VIT{Z2%zCH;Ez7}
zlgMehlpL!Egjxv-TKDktJA3)oh}$Y5&XW9HtpSlgXZA2D2aY0qd_5q1n1J)7ySv*J
zgxx&dn9ug&75WfG11pl@E&2}SZ8yT4;G1B=X#e^8pXy}{OCt?~bK}e3SIUSl_IZ{|
zr5OqS0a@{v*&4QKw1kh^i*7NpzT8=R_H8Dj<Xf<<qui{E(_O!LgfdYE;2In{&mbWO
zT1$6-Kj9mT-}jaGhHLwEpGoJsva0{+NPKJ+If-B`Taq-(-=mG56Oz+2^mI@1-t7Qb
zzYDEc!0~^3k*ebkxq^XwvnP;RNMII_a;Z)DQxvk5az3i^35!_b`0jMWW1+`~k>fSw
z-RO~37moX3gDP$c<eqA)7U#d^oLR|ljX4%oHjtV+f7s4GCE5hwdV4Rzw>llZDFsaJ
zR#8>eh{aQ?Zzir>Z;dJ}h{eq))JaqIdM*qxB+)mv%WBJscq<UsY*2vh)^v>}PNwoH
zC%`l`3Pj}Ru&>NOZ+bir-O_;01hGU`N#Y!@?<KBrjS06g#X^?Vmd%+bPYrrJHcJ1!
z&iPbBOEVn27w}uS@9XAej*1BUy~N?5-V>T+SAL;if@cGXrRV(FygWT0WoC8)V+S=>
zVrR}w%dAoz7qDgCe~EW~>yY!q(6Ez2K<VlHelg=t8op$wJkeuCh_Yky_W@HuGSLGR
zjw*<1LnTo+-0;SxgqANGS*>^Jf_K*41_KVW3w^4Wh1P04rIAB}G<phQ(!A<9Omr>2
z+)gLi$BLD)<_<w6K0LH^Uz3*Z_sz0SVp{5F$n@LVjkKE`<3v_=dt%DOE6bM`jE&u(
z=s{4+J7VZ}dUjky1>SdKZ{3~^`7<uaX+ZpKcNe2;F8&}u@89Xp&#f+zTu2^@jo5X)
zE(j)mg+TfV6_v+8s6tgx1}22?2n39D@WxF&a<TY5@~@HZZrtMSg(2$mIS;!>bsbuB
zVy3+tSme){v%S%24rFeOe|YwnN$PW@+sK(|!cj+I)y?m{@7JJ}$&6&C=IcPY&$#m-
zH!?--0d`;LtuU4`ur!@lgq%gO{Easvu>^&3BUzF*^olY(K$eULM8Ym8XbLSTM<M5%
zVKBvB0LEx>SR*gykToPFzT>l5#n@kpog4qX<kZ<W@P0X$`tXYZJuybh?eAsL>-)2G
zaZMpYbfz>1$S^kgTH_kuc~;UIW)=VMsag0=Ja#7j)!6`}xG8mBg8<_Uy{?aERQO$t
zT0}h5a&pVBxxojo5jI$yE3)W>!!ToGR(+iZ^LJUZLG+bOoJs!M{adrEZNdF#jUSV$
zk$Bj-jw_b7*QW^O{8?q~s{>8D3zo?Hl+pK;_UoofvZO2aU3lLgN}~NU;^QNqRKz4V
zyswdYzT#xcN8J}X`Sh55;<@9fQN`%p0hJfe>5g6`Ks#{qR7LHD-XM}g`#ObnB2WLz
zk|CTAUKScnx@cZ}bvsU=>jRaQ&16vPEBtx1P1%yUD@wxpGm9owb*vMK0cj_O`n!WG
zTg7&pq5fzE3VP&~D{i7mT4-`?MuKo&MzaAG_JW**Z()b!JoEw?KT1#U0ck@*B4K}@
z6ye3m&CR~cqp(ZWIdO*j)DE}i(363mUe5Gk`DzJ`<H57>&#*X}Ojk$k5tO~t6Xom!
z#u)0*SH7MmW^yPYMQt}P3f-cg4@ebVS6mbD(Ko(iXTg?zk4B~;voBD_<Vx9g!VqNF
z6e<tS3ROV)FTr77@Ed-&L09ia-eRy<vj@8{ZB30gx+#U4z%4Yp<nuxI*Pi3PV0LU&
zG+DN%>-E8HH(bnfG}Yer%T9`zujxUyY`8$K=v2F5b)^$!zhRX>XF-jK?9g<2P0P$g
zg06o;Ts#eSGL(%`E+NoPPR!yjHHQ7(#q-xPwaqN~+;R#>@=?omu6((t^2GWeNU*yh
zA&;Py(^qG)#(1k~;ddx5h$wKFUchglrf7q{t@>3E16w^3+pQ<sDmk$GWjh)4n@Y%t
z0EgTOc`&js<-*N|_3-Ag%*?dO*~TbLsNQ`CZFTiX`zXUAk#)iKA(f$|NnZknZi8x^
zOV=dImPCV#*c3<mryXRZR1(i3(|(bnNMxOc4(A8_o}fHykvB(ANJ=V$5=HC;^}8TA
z(flS+o!<9G_H}Z?=|$_yQABGFwlraqzN@gO$M}~|E41uZs%7Gm{#<oGS>*3xH+j;=
zQGYbd?<o+H)m#@TehfVu0@Raz=JuO8zFKgBU9goBI>%CD+oWbj3Yx*&7vYnY((IF!
z%DfUAizxrTS|ZE)FSaUet5c&!3=E@b1ZfXw>N)nrWO8x%KcFRSz#tA&%{Lq7rvxpJ
zNqvt_+j3`zk{&M3ig>(r>5?z$0mGAHr#GsF-tuG@;W@0fE{95g;oS?xVQ+Dz@x*$N
zF8jo{?37qIIP?M81x7Xj7}T#qFP&MVj{0Q#Wa8(qynB5g-L^3JCG@yDI)rnbO~T^G
zIen!8V_}Q&2nTnn+T(&Ab1cX-bEF+k>5mEKl3LkSX_)1qg=4a)q{Q?3R8_H>re@>t
zq;r2Kb851YzP$t6efh{$>(s*sp#rh^UsmJBBvDZYrkQi)*_5v0fn|7|Qv8`!>qXQc
zt^b+!EVmuLz{J@`6)`#tFM1V(HtiUQ-Ce$R?V4(~9gw)jz?4Fb=i`3oBMkQrgD=k&
zX&T?KHn}8)I-5O@naVyz<$pZszi>y=iLmArpTQ9VGv9u@()KDRl8>>-%|-mZg{k=a
z1KY!E2ZC6eaZT9~AYD5$VEyuNa<&Vf3B5iKx@nu=8}^`TC=3B@wSFBfk$)v<wf3W(
z*baOB`*PuF-@%<;#1KNl<D#<R$6^x>X<D83dXkRyc(vN{sAx)MKo|CcN(tp$$G}H^
zQ}!+%(w%u^f0mrN`ekv?^Z-eTh534X{>D#HJ&}I-{drm8fMTDZ!ShOHq7$l~Tkqg0
z3PTTJDi;rrZX|%1VNhVyvobSj<y~6xc$^i*kx3<k3;Qfh7l|J)GOrgnXg3LHRmZP$
zeG<6KK$B11j@V-QGyUGjRd+om8=tpl@8?$Q2P;895XsOrW06YJvX-th*-*qS)n0$!
zBI-{AKAfCKR4<{}F#2gUd*L~M|HbGm{6vNGgdwy`aZVCr4nM-YDom=+jcdD--z0o<
zoYOYbZO%IEQ+YmfsBDn7VUd_31uyHdRyj6WimeD``}5)@36VOUS2p?9bMV6cof;0*
za2brf|8HY0;T2lszVx;g?*4#+kDqKVExj&zCCSd~fLy~oHddQyuP`vscVkP-tB(Bu
zg=*eep8e8srsEA}`4mILLIV@WLyLPo6sLctYaZ4%j$HL?Q`%->(MvHLpl~j}mK+g9
zMW8UH`c=FeEFu%zaARw~CFj2&@A#v;x%GUCp;^0?$jWTLC7Q|)!^M-F`u)NfVqVE~
z%CU^;@0hz9`?HX;m*`spx4rKOdaTU{@@cS-bA&NfpY>MFAo-EP>%!kO96l7ga#vB7
zY&-YWeBWV9gszs77+UsUn1SS(cLD$RS6nww_zJF5OUNlc?8U~DgiYU#INaD$X>h)i
zVrb-k(Q&i$y6a!UN~NrMEJKL)gDD3M`l6=sU>QWS&?i2aHUjHe;B&dYT8ebKs8iFq
sx1ooqzT2c(n2t;eclj@Tu-}Q1d=)#eD(-6ph1CdSqf3Tw^j+ir2c10anE(I)

diff --git a/doc/baboon_vector.svg b/doc/baboon_vector.svg
deleted file mode 100644
index dc1667af91..0000000000
--- a/doc/baboon_vector.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3181"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   width="1750"
-   height="960"
-   xml:space="preserve"
-   sodipodi:docname="baboon_vector.svg"><metadata
-     id="metadata3187"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs3185"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3195"><path
-         d="M 0,768 1400,768 1400,0 0,0 0,768 z"
-         id="path3197" /></clipPath><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3215"><path
-         d="M 0,768 1400,768 1400,0 0,0 0,768 z"
-         id="path3217" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="851"
-     id="namedview3183"
-     showgrid="false"
-     inkscape:zoom="0.20550291"
-     inkscape:cx="1534.1667"
-     inkscape:cy="795.78156"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3189" /><g
-     id="g3189"
-     inkscape:groupmode="layer"
-     inkscape:label="baboon_vector"
-     transform="matrix(1.25,0,0,-1.25,0,960)"><g
-       id="g3191"><g
-         id="g3193"
-         clip-path="url(#clipPath3195)"><g
-           id="g3199"
-           transform="translate(458.9561,569.9678)"><path
-             d="m 0,0 59.835,69.355 87.034,26.518 133.949,-7.479 c 0,0 74.116,-32.639 74.795,-34.678 0.68,-2.04 84.314,-59.155 84.314,-59.155 l 12.238,-74.795 5.439,-97.912 -13.598,-25.159 -4.76,-40.797 -18.358,-23.118 24.39,-5.561 0.501,-5.192 -14.012,-60.641 16.477,-93.368 7.223,-49.972 -208.295,-51.754 -18.552,4.005 -37.468,8.325 -10.036,4.036 -66.885,10.101 c 0,0 -14.959,74.793 -16.999,73.433 -2.039,-1.359 -42.836,56.437 -42.836,56.437 l -19.719,65.274 12.48,74.571 -7.961,9.643 -26.479,16.187 -12.716,38.309 4.08,48.277 8.769,38.985 L 6.608,-74.308 0,0 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3201" /></g><g
-           id="g3203"
-           transform="translate(78.8657,682.1582)"><path
-             d="M 0,0 142.789,40.797 259.74,52.355 313.457,-232.543 204.665,-291.698 78.194,-293.738 0,0 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3205" /></g><g
-           id="g3207"
-           transform="translate(269.5122,345.2344)"><path
-             d="M 0,0 18.801,-74.425 40.728,-85.408 59.539,-59.541 40.259,13.503 36.821,15.669 0,0 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3209" /></g></g></g><g
-       id="g3223"
-       transform="translate(741.918,109.0332)"><path
-         d="m 0,0 -17.236,-9.401 -16.452,-22.721 -0.783,12.537 6.268,17.234 13.317,6.268 L 0,7.833 14.884,3.917 0,0 z m 172.622,-21.824 c -0.031,0.271 -0.081,0.535 -0.117,0.804 -20.85,7.653 -49.59,7.327 -66.874,10.927 -13.849,2.886 -23.047,9.119 -27.032,12.298 -9.863,-8.494 -12.025,-14.377 -12.025,-14.377 0,0 -9.816,15.309 -30.17,25.76 -7.05,3.621 -17.767,5.691 -29.341,5.691 -24.297,0 -52.384,-9.155 -58.339,-32.223 -10.458,-40.511 9.697,-76.594 49.814,-77.623 1.325,-0.034 2.623,-0.12 3.894,-0.12 36.131,0 48.855,8.572 58.323,15.478 0.027,0.021 0.104,0 0.104,0 0,0 25.126,-11.506 53.529,-11.506 4.419,0 9.156,0.415 14.249,1.063 31.641,4.018 47.989,28.124 43.985,63.828"
-         style="fill:#df0019;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3225"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3227"
-       transform="translate(300.8481,270.0254)"><path
-         d="m 0,0 c -3.063,-0.691 -12.535,0.784 -12.535,0.784 l 6.267,-25.853 43.481,13.319 -9.01,27.418 C 28.203,15.668 7.867,1.777 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3229"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3231"
-       transform="translate(211.66052,615.85984)"><path
-         d="m 0,0 -16.243,-2.871 -15.462,-9.4 4.323,-10.938 14.568,9.89 L 2.75,-8.771 0,0 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3233"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3235"
-       transform="translate(274.15732,626.4084)"><path
-         d="m 0,0 -15.64,0.407 -14.279,-3.608 2.008,-9.747 14.756,4.208 L 1.111,-8.215 0,0 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3237"
-         inkscape:connector-curvature="0" /></g><path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 436.65625 22.28125 C 436.65625 22.28125 338.18375 25.385 251 42.8125 C 163.24875 60.35375 70.40625 99.65625 70.40625 99.65625 L 175.1875 495.28125 L 327.96875 492.34375 L 337.75 527.59375 C 337.75 527.59375 365.095 523.25875 373 518.78125 C 376.31375 516.90375 383.78125 508 383.78125 508 L 377.75 484.65625 L 504.21875 407.15625 L 436.65625 22.28125 z M 410.53125 55.1875 L 465.6875 393.3125 L 346.59375 456.625 L 202.75 466.46875 L 112 114.40625 L 263 79.1875 L 410.53125 55.1875 z "
-       transform="matrix(0.8,0,0,-0.8,0,768)"
-       id="path3253" /><g
-       id="g3247"
-       transform="matrix(1.199238,-0.02879331,0.02673084,1.0520756,172.41935,498.37339)"><path
-         d="m 0,0 c 0,0 -1.861,1.481 -9.143,-1.457 9.712,18.867 9.439,39.989 9.439,39.989 0,0 -3.106,-2.465 -11.311,-8.47 9.241,23.044 5.338,72.525 5.338,72.525 0,0 -17.493,40.746 -13.657,45.799 8.841,11.65 23.834,23.968 44.295,25.594 17.935,1.424 44.606,-4.953 55.865,-15.284 4.536,-4.161 23.367,-47.493 23.367,-47.493 0,0 6.104,-35.271 11.619,-54.108 5.513,-18.839 11.054,-26.674 21.284,-34.825 17.831,-14.207 27.076,-29.938 27.076,-29.938 L 143.399,3.945 c 3.655,-17.356 14.875,-34.28 27.39,-47.672 -12.863,1.507 -19.61,8.783 -19.61,8.783 0,0 2.151,-12.664 9.109,-26.554 l 28.712,15.264 -1.762,10.805 c -5.128,9.304 -9.336,15.534 -9.336,15.534 0,0 2.089,0.956 7.385,-3.572 l -2.005,12.296 c -4.814,9.391 -11.773,16.752 -25.115,31.113 5.944,-6.087 15.438,-5.379 20.751,-4.356 l -0.572,3.512 c -2.231,1.278 -5.494,3.171 -10.241,5.957 -12.43,7.299 -22.326,21.049 -22.326,21.049 0,0 12.85,1.815 20.513,11.022 -7.316,-2.641 -18.585,0.799 -18.585,0.799 -17.086,6.772 -15.022,30.217 -17.687,50.587 -2.667,20.37 -9.299,34.125 -9.299,34.125 0,0 -0.243,2.149 11.91,-5.906 -7.744,33.215 -35.545,44.94 -35.545,44.94 0,0 2.223,2.79 22.843,0.044 -16.469,15.817 -32.303,16.896 -32.303,16.896 0,0 10.077,2.25 23.611,0.24 0,0 -3.327,3.508 -7.549,6.453 L 35.985,194.291 -77.543,167.815 -8.211,-101.17 17.481,-99.413 C 8.602,-85.114 -0.371,-63.837 -2.15,-40.857 -4.911,-5.208 0,0 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3249"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3255"
-       transform="translate(204.22134,580.88353)"><path
-         d="m 0,0 c 0,-1.418 0.43,-2.736 1.168,-3.83 1.523,0.677 3.551,1.094 5.786,1.094 2.164,0 4.133,-0.39 5.639,-1.029 0.711,1.081 1.129,2.374 1.129,3.765 0,3.79 -3.072,6.861 -6.861,6.861 C 3.071,6.861 0,3.79 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3257"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3259"
-       transform="translate(256.3311,595.31646)"><path
-         d="m 0,0 c 0,-1.418 0.43,-2.736 1.168,-3.83 1.524,0.677 3.552,1.094 5.787,1.094 2.163,0 4.132,-0.39 5.638,-1.029 0.712,1.081 1.129,2.373 1.129,3.765 0,3.79 -3.072,6.861 -6.861,6.861 C 3.071,6.861 0,3.79 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3261"
-         inkscape:connector-curvature="0" /></g><g
-       id="g4174"
-       transform="matrix(0.99694509,0.07810563,-0.07810563,0.99694509,47.348748,-15.348299)"><g
-         transform="translate(222.5098,610.1558)"
-         id="g3219"><path
-           inkscape:connector-curvature="0"
-           id="path3221"
-           style="fill:#df0019;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 0,0 4.45,2.752 5.34,3.785 7.05,-8.226 7.093,-33.359 17.801,-51.259 13.86,-30.215 26.261,-1.55 -6.685,-35.653 c 0,0 -49.98,-21.871 -49.545,-21.911 -42.657,4.001 -12.553,43.066 -8.631,47.301 L 3.666,-47.869 0,0 z" /></g><g
-         transform="translate(247.626,467.3545)"
-         id="g3239"><path
-           inkscape:connector-curvature="0"
-           id="path3241"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="M 0,0 C -3.044,-0.345 -5.232,-3.092 -4.888,-6.136 -4.543,-9.18 1.576,-2.254 13.308,-4.961 13.971,-1.97 3.044,0.344 0,0" /></g><g
-         transform="translate(279.4419,476.5762)"
-         id="g3243"><path
-           inkscape:connector-curvature="0"
-           id="path3245"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="M 0,0 C 3.271,1.08 6.798,-0.697 7.88,-3.969 8.96,-7.24 -0.55,-3.044 -11.258,-11.329 -13.345,-8.586 -3.272,-1.081 0,0" /></g><g
-         transform="translate(284.1929,525.9082)"
-         id="g3263"><path
-           inkscape:connector-curvature="0"
-           id="path3265"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="M 0,0 C 0,0 -6.972,28.671 -6.972,29.355 L 1.585,2.864 9.999,-10.564 13.634,-32.697 7.922,-11.098 0,0 z M -0.633,-15.036 -9.19,-4.86 -16.478,25.776 c -0.202,0.684 9.106,-28.811 9.106,-28.811 l 8.64,-11.642 2.469,-17.336 -4.37,16.977 z m -6.339,-6.085 -10.457,16.826 -5.444,28.646 6.614,-27.842 11.311,-18.026 1.413,-9.583 -3.437,9.979 z m -53.462,-13.246 -1.437,24.944 -2.682,28.754 5.106,-29.895 1.212,-21.677 4.139,-18.236 -6.338,16.11 z m -4.265,-19.55 -6.665,15.516 0.404,29.205 -0.882,28.169 3.104,-28.396 0.808,-26.697 4.242,-15.972 2.423,-6.617 -3.434,4.792 z m -9.695,-2.967 -7.117,16.885 1.318,32.01 0,25.223 2.115,-25.061 -0.581,-31.259 5.869,-16.429 5.056,-8.671 -6.66,7.302 z m 103.144,-7.97 -6.676,20.38 2.141,11.54 L 16.499,-9.376 4.557,13.104 -5.879,53.97 c 0,0 -8.325,-7.41 -16.781,-8.08 -8.455,-0.671 -15.09,4.018 -15.09,4.018 0,0 3.592,-17.761 8.659,-37.597 5.069,-19.836 17.528,-44.866 17.528,-44.866 0,0 21.578,-8.197 24.302,-16.587 2.724,-8.391 -3.508,-22.911 -14.102,-26.551 -10.593,-3.64 -32.284,-8.262 -32.284,-8.262 0,0 -19,1.512 -20.438,14.26 0,0 4.131,16.406 10.418,19.225 6.285,2.819 21.362,11.174 21.362,11.174 l -8.254,1.332 -7.664,-1.332 c 0,0 -4.784,11.295 -10.973,35.086 -6.19,23.79 -8.967,42.485 -8.967,42.485 0,0 -3.912,-4.391 -14.199,-4.885 -10.286,-0.494 -16.031,7.988 -16.031,7.988 l 1.027,-30.185 -1.049,-25.83 -0.15,-29.22 5.102,-15.99 19.818,-30.448 c 0,0 14.102,-9.293 31.728,-9.293 16.453,1.328 51.131,18.047 51.131,18.047 l 9.536,16.687 z" /></g></g><g
-       id="g3267"
-       transform="translate(847.2637,321.5059)"><path
-         d="m 0,0 c 2.252,3.516 6.693,15.3 6.693,15.3 0,0 3.778,-13.306 1.912,-17.213 -3.056,-6.404 -23.905,-15.3 -23.905,-15.3 0,0 12.196,12.364 15.3,17.213 m -33.514,23.16 -0.757,56.352 c 0,0 11.136,-14.028 11.843,-19.739 1.176,-9.491 -11.086,-36.613 -11.086,-36.613 m -17.575,236.921 c 0,0 12.453,-15.338 14.854,-21.39 1.424,-3.591 2.286,-15.287 2.286,-15.287 l -17.14,36.677 z M -98.574,-86.136 c -9.757,-0.906 -29.836,1.016 -38.912,4.708 -7.499,3.05 -25.734,19.656 -25.734,19.656 l 24.187,-10.86 -4.701,17.627 15.272,-22.009 41.813,-5.356 c 0,0 -8.812,-3.477 -11.925,-3.766 m -74.428,157.941 c -4.518,10.057 -1.763,44.065 -1.763,44.065 0,0 7.544,-31.093 12.338,-40.541 6.978,-13.754 37.015,-49.352 37.015,-49.352 0,0 -40.824,30.759 -47.59,45.828 m -17.833,-149.47 -40.407,24.724 1.636,-17.575 0.026,-0.035 -5.178,-29.811 -2.056,-10.701 0.383,-33.34 -4.982,36.406 6.41,41.45 -11.063,8.338 -17.532,43.159 23.502,-38.779 2.351,14.101 40.634,-25.695 11.924,-5.651 13.809,-28.871 -19.457,22.28 z m -85.522,138.863 17.212,-34.424 c 0,0 -12.972,11.185 -15.299,16.257 -1.905,4.152 -1.913,18.167 -1.913,18.167 m -2.367,66.042 c 0,0 -6.206,15.581 -6.323,21.082 -0.168,7.817 4.568,23.148 7.695,30.315 0.755,1.73 4.103,6.341 4.103,6.341 0,0 -4.654,-24.542 -5.347,-32.829 -0.518,-6.205 -0.128,-24.909 -0.128,-24.909 m -7.195,-114.809 c -0.334,3.363 1.912,13.387 1.912,13.387 l 3.825,-29.643 c 0,0 -5.313,11.967 -5.737,16.256 m -20.082,53.549 c -1.394,3.571 -0.956,15.301 -0.956,15.301 l 13.388,-30.6 c 0,0 -10.639,10.71 -12.432,15.299 m -6.03,106.795 c 0,0 -0.315,35.831 4.637,46.379 4.531,9.647 29.936,30.356 29.936,30.356 0,0 -17.824,-22.47 -21.503,-31.2 -5.089,-12.077 -10.119,-51.437 -10.119,-51.437 l -2.951,5.902 z M 50.121,205.01 c 3.335,-9.155 1.168,-38.956 1.168,-38.956 0,0 -5.451,29.987 -9.221,39.366 -4.214,10.487 -23.014,38.907 -23.014,38.907 0,0 26.78,-27.546 31.067,-39.317 M 54.506,95.624 c 0,0 6.884,-18.586 5.738,-24.861 -0.773,-4.241 -9.562,-14.345 -9.562,-14.345 0,0 2.414,12.874 2.868,17.212 0.573,5.474 0.956,21.994 0.956,21.994 M 19.125,-13.389 c 0,0 9.656,22.183 11.062,30.068 1.235,6.941 0,28.203 0,28.203 0,0 8.477,-22.819 7.106,-30.538 C 35.845,6.183 19.125,-13.389 19.125,-13.389 m 441.487,-40.965 c -3.249,8.935 -6.587,17.23 -10.01,24.928 l -1.862,28.873 -8.857,-4.876 -25.862,49.457 -4.828,-10.34 c -32.69,31.48 -70.457,34.284 -111.982,31.646 -65.568,-4.163 -91.587,-41.63 -79.098,-57.241 12.49,-15.613 18.733,-5.205 40.589,5.203 21.858,10.407 74.937,26.017 110.323,-2.082 35.386,-28.1 86.383,-109.281 50.997,-169.646 -35.386,-60.365 -105.626,-105.385 -182.135,-88.465 -86.422,19.112 -126.078,60.082 -177.675,74.811 -8.311,1.334 -18.347,2.789 -24.791,3.191 -12.671,0.792 -21.6,14.727 -21.6,14.727 l 17.181,-9.327 25.763,-2.36 c 2.331,14 9.395,49.054 9.395,49.054 l -8.688,87.29 -18.668,-27.06 -7.246,10.184 -21.349,-22.915 -15.473,-1.959 14.67,6.596 21.38,29.409 6.7,-13.754 19.485,24.691 0.004,-0.011 16.47,9.525 -3.123,68.69 10.407,-10.407 -4.163,40.59 22.173,71.502 -34.662,91.899 16.652,-4.162 -19.773,35.386 -40.591,38.509 9.368,17.693 -93.671,9.368 -20.229,-7.165 -18.437,38.292 13.22,8.813 -69.039,14.69 2.938,19.095 -80.791,-23.303 -26.147,-19.191 -116.339,0 8.814,-10.188 -42.501,-40.641 -8.911,-78.491 7.344,-1.494 8.814,-45.548 23.502,-24.978 19.096,45.533 -14.689,-4.409 41.13,48.474 30.848,26.44 -14.69,-1.469 19.096,16.158 105.763,2.938 72.917,15.799 -41.623,-14.742 -30.181,-7.285 -104.079,-1.043 1.04,-11.449 -64.526,-61.403 14.571,2.081 -27.844,-63.28 c -15.017,-13.719 -28.06,-55.016 -36.687,-75.145 -9.367,-21.856 -20.816,-39.55 -20.816,-39.55 0,0 -30.182,-6.244 -61.405,-18.734 -31.224,-12.489 -43.713,4.163 -43.713,4.163 l -3.122,-8.326 c 0,0 -18.28,-9.057 -39.303,-11.825 -16.43,-2.162 -9.967,-20.946 -9.613,-26.684 0.405,-6.57 4.294,-19.774 8.325,-24.978 3.227,-4.165 12.525,-10.425 17.694,-11.448 12.039,-2.385 28.101,5.204 45.794,17.693 74.936,-6.245 103.241,-10.321 126.974,8.326 14.572,11.448 29.142,22.897 41.631,40.59 l -15.611,42.671 -8.327,-14.569 -5.807,44.931 1.841,17.863 5.547,-51.234 7.789,9.257 35.387,-70.772 11.448,4.164 c 0,0 13.515,-18.583 23.057,-32.881 l -26.02,25.006 -10.224,-5.964 -11.076,22.152 c 0,0 -13.383,-2.353 -24.727,-18.027 -15.862,-21.915 -23.503,-24.678 -17.627,-78.735 5.876,-54.055 16.452,-54.055 64.632,-121.039 11.752,-16.452 14.601,-18.465 14.601,-18.465 l -51.03,-27.365 -22.327,-5.876 -21.384,-11.28 c 0,0 4.744,-8.174 7.495,-9.369 4.739,-2.062 20.613,1.56 20.613,1.56 0,0 15.603,-6.763 36.756,-6.763 21.152,0 32.903,8.225 47.005,8.225 14.101,0 38.78,-8.225 57.582,-5.876 18.802,2.351 22.328,12.927 22.328,12.927 l -51.706,54.057 -4.675,47.096 -56.605,75.769 -3.038,9.437 65.791,-82.24 5.107,-46.75 55.161,-61.405 37.468,-8.325 c 0,0 -0.257,1.226 -0.625,3.114 -6.146,15.664 -6.986,34.894 -1.999,54.214 6.975,27.012 38.85,36.596 64.029,36.596 12.506,0 24.179,-2.312 32.025,-6.341 12.912,-6.63 21.851,-15.076 27.029,-20.917 3.673,4.516 7.133,7.194 11.833,11.11 0,0 12.143,-11.751 45.047,-14.101 27.14,-1.939 45.048,-8.226 70.901,-19.585 53.676,-23.584 102.5,-61.785 207.618,-45.132 105.119,16.651 206.073,113.444 164.442,227.929"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3269"
-         inkscape:connector-curvature="0" /></g><path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 329.26398,723.3082 -118.025,-19.2 -120.800003,-28.175 72.600003,-281.65 115.075,7.875 95.275,50.65 -44.125,270.5 z m -6.55,-10.575 40.675,-252.4 -87.85,-47.275 -106.125,-7.325 -66.95,262.8 111.4,26.275 108.85,17.925 z"
-       id="path3253-3" /></g></svg>
\ No newline at end of file
diff --git a/doc/compress.html b/doc/compress.html
index e2d79f581d..91a76b254e 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -1,23 +1,26 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Compression Helper</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-  </head>
-  <body>
 
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
+<title>CodeMirror: Compression Helper</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="docs.css">
 
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Script compression
-   helper */
-</pre>
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Compression helper</a>
+  </ul>
 </div>
 
+<article>
+
+<h2>Script compression helper</h2>
+
     <p>To optimize loading CodeMirror, especially when including a
     bunch of different modes, it is recommended that you combine and
     minify (and preferably also gzip) the scripts. This page makes
@@ -28,7 +31,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 
     <form id="form" action="http://marijnhaverbeke.nl/uglifyjs" method="post">
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
-      <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px">
+      <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=3.15.0;f=">3.15</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.14.0;f=">3.14</option>
@@ -210,5 +213,4 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
        }
     </script>
 
-  </body>
-</html>
+</article>
diff --git a/doc/docs.css b/doc/docs.css
index 170cd41244..9cd7319f38 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -1,167 +1,213 @@
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(http://themes.googleusercontent.com/static/fonts/sourcesanspro/v5/ODelI1aHBYDBqgeIAH2zlBM0YzuT7MdOe03otPbuUS0.woff) format('woff');
+}
+
+body, html { margin: 0; padding: 0; height: 100%; }
+section, article { display: block; padding: 0; }
+
 body {
-  font-family: Droid Sans, Arial, sans-serif;
-  line-height: 1.5;
-  max-width: 64.3em;
-  margin: 3em auto;
-  padding: 0 1em;
+  background: #f8f8f8;
 }
 
-h1 {
-  letter-spacing: -3px;
-  font-size: 3.23em;
-  font-weight: bold;
-  margin: 0;
+article {
+  max-width: 700px;
+  margin: 0 auto;
+  border-left: 2px solid #E30808;
+  border-right: 1px solid #ddd;
+  padding: 30px 50px 100px 50px;
+  background: white;
+  z-index: 2;
+  position: relative;
+  min-height: 100%;
+  box-sizing: border-box;
 }
 
-h2 {
-  font-size: 1.23em;
-  font-weight: bold;
-  margin: .5em 0;
-  letter-spacing: -1px;
+body {
+  font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif;
+  line-height: 1.5;
 }
 
-h3 {
-  font-size: 1.1em;
-  font-weight: bold;
-  margin: .4em 0;
+p { margin-top: 0; }
+
+h2, h3 {
+  font-weight: normal;
+  text-decoration: underline;
+  margin-bottom: .7em;
 }
+h2 { font-size: 120%; }
+h3 { font-size: 110%; }
+article > h2:first-child, section:first-child > h2 { margin-top: 0; }
 
-pre {
-  background-color: #eee;
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  border-radius: 6px;
-  padding: 1em;
+a, a:visited, a:link, .quasilink {
+  color: #A21313;
+  text-decoration: none;
 }
 
-pre.code {
-  margin: 0 1em;
+.quasilink {
+  cursor: pointer;
 }
 
-.grey {
-  background-color: #eee;
-  border-radius: 6px;
-  margin-bottom: 1.65em;
-  margin-top: 0.825em;
-  padding: 0.825em 1.65em;
-  position: relative;
+#nav {
+  position: fixed;
+  top: 30px;
+  right: 50%;
+  padding-right: 350px;
+  text-align: right;
+  z-index: 1;
 }
 
-img.logo {
-  position: absolute;
-  right: -1em;
-  bottom: 4px;
-  max-width: 23.6875em; /* Scale image down with text to prevent clipping */
+#nav ul {
+  display: block;
+  margin: 0; padding: 0;
+  margin-bottom: 32px;
 }
 
-.grey > pre {
-  background:none;
-  border-radius:0;
-  padding:0;
-  margin:0;
-  font-size:2.2em;
-  line-height:1.2em;
+#nav li {
+  display: block;
+  margin-bottom: 4px;
 }
 
-a:link, a:visited, .quasilink {
-  color: #df0019;
-  cursor: pointer;
-  text-decoration: none;
+#nav li ul {
+  font-size: 80%;
+  margin-bottom: 0;
+  display: none;
+}
+
+#nav li.active ul {
+  display: block;
 }
 
-a:hover, .quasilink:hover {
-  color: #800004;
+#nav li li a {
+  padding-right: 20px;
 }
 
-h1 a:link, h1 a:visited, h1 a:hover {
+#nav ul a {
   color: black;
+  padding: 0 7px 1px 11px;
 }
 
-ul {
-  margin: 0;
-  padding-left: 1.2em;
+#nav ul a.active, #nav ul a:hover {
+  border-bottom: 1px solid #E30808;
+  color: #E30808;
 }
 
-a.download {
-  color: white;
-  background-color: #df0019;
-  width: 100%;
-  display: block;
-  text-align: center;
-  font-size: 1.23em;
-  font-weight: bold;
-  text-decoration: none;
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  border-radius: 6px;
-  padding: .5em 0;
-  margin-bottom: 1em;
+#logo {
+  margin-right: 7px;
+  margin-bottom: 25px;
 }
 
-a.download:hover {
-  background-color: #bb0010;
+section {
+  border-top: 1px solid #E30808;
+  margin: 1.5em 0;
 }
 
-.rel {
-  margin-bottom: 0;
+section.first {
+  border: none;
+  margin-top: 0;
 }
 
-.rel-note {
-  color: #777;
-  font-size: .9em;
-  margin-top: .1em;
+#demo {
+  position: relative;
+}
+
+#demolist {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  z-index: 25;
+}
+
+#bankinfo {
+  text-align: left;
+  display: none;
+  padding: 0 .5em;
+  position: absolute;
+  border: 2px solid #aaa;
+  border-radius: 5px;
+  background: #eee;
+  top: 10px;
+  left: 30px;
+}
+
+#bankinfo_close {
+  position: absolute;
+  top: 0; right: 6px;
+  font-weight: bold;
+  cursor: pointer;
 }
 
-.logo-braces {
-  color: #df0019;
+.bigbutton {
+  cursor: pointer;
+  text-align: center;
+  padding: 0 1em;
+  display: inline-block;
+  color: white;
   position: relative;
-  top: -4px;
+  line-height: 1.9;
+  color: white !important;
+  background: #A21313;
 }
 
-.blk {
-  float: left;
+.bigbutton.right {
+  border-bottom-left-radius: 100px;
+  border-top-left-radius: 100px;
 }
 
-.left {
-  margin-right: 20.68em;
-  max-width: 37em;
-  padding-right: 6.53em;
-  padding-bottom: 1em;
+.bigbutton.left {
+  border-bottom-right-radius: 100px;
+  border-top-right-radius: 100px;
 }
 
-.left1 {
-  width: 15.24em;
-  padding-right: 6.45em;
+.bigbutton:hover {
+  background: #E30808;
 }
 
-.left2 {
-  max-width: 15.24em;
+th {
+  text-decoration: underline;
+  font-weight: normal;
+  text-align: left;
 }
 
-.right {
-  width: 20.68em;
-  margin-left: -20.68em;
+#features ul {
+  list-style: none;
+  margin: 0 0 1em;
+  padding: 0 0 0 1.2em;
 }
 
-.leftbig {
-  width: 42.44em;
-  padding-right: 6.53em;
+#features li:before {
+  content: "-";
+  width: 1em;
+  display: inline-block;
+  padding: 0;
+  margin: 0;
+  margin-left: -1em;
 }
 
-.rightsmall {
-  width: 15.24em;
+.rel {
+  margin-bottom: 0;
+}
+.rel-note {
+  margin-top: 0;
+  color: #555;
 }
 
-.clear:after {
-  visibility: hidden;
-  display: block;
-  font-size: 0;
-  content: " ";
-  clear: both;
-  height: 0;
-}
-.clear { display: inline-block; }
-/* start commented backslash hack \*/
-* html .clear { height: 1%; }
-.clear { display: block; }
-/* close commented backslash hack */
+pre {
+  padding-left: 15px;
+  border-left: 2px solid #ddd;
+}
+
+code {
+  padding: 0 2px;
+}
+
+strong {
+  text-decoration: underline;
+  font-weight: normal;
+}
+
+.field {
+  border: 1px solid #A21313;
+}
diff --git a/doc/internals.html b/doc/internals.html
index 4336ba4d1c..3f1b7de869 100644
--- a/doc/internals.html
+++ b/doc/internals.html
@@ -1,25 +1,35 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Internals</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-    <style>dl dl {margin: 0;} .update {color: #d40 !important}</style>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* (Re-) Implementing A Syntax-
-   Highlighting Editor in JavaScript */
-</pre>
+
+<title>CodeMirror: Internals</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="docs.css">
+<style>dl dl {margin: 0;} .update {color: #d40 !important}</style>
+<script src="activebookmark.js"></script>
+
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="#top">Introduction</a></li>
+    <li><a href="#approach">General Approach</a></li>
+    <li><a href="#input">Input</a></li>
+    <li><a href="#selection">Selection</a></li>
+    <li><a href="#update">Intelligent Updating</a></li>
+    <li><a href="#parse">Parsing</a></li>
+    <li><a href="#summary">What Gives?</a></li>
+    <li><a href="#btree">Content Representation</a></li>
+    <li><a href="#keymap">Key Maps</a></li>
+  </ul>
 </div>
 
-<div class="clear"><div class="leftbig blk">
+<article>
+
+<h2 id=top>(Re-) Implementing A Syntax-Highlighting Editor in JavaScript</h2>
 
 <p style="font-size: 85%" id="intro">
   <strong>Topic:</strong> JavaScript, code editor implementation<br>
@@ -103,7 +113,8 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 with <em>new</em> scary hacks in order to keep up. This was starting
 to lose its appeal.</p>
 
-<h2 id="approach">General Approach</h2>
+<section id=approach>
+  <h2>General Approach</h2>
 
 <p>What CodeMirror 2 does is try to sidestep most of the hairy hacks
 that came up in version 1. I owe a lot to the
@@ -136,8 +147,9 @@ <h2 id="approach">General Approach</h2>
 do the rest only when needed. (Fortunately, the <code>onscroll</code>
 event works almost the same on all browsers, and lends itself well to
 displaying things only as they are scrolled into view.)</p>
-
-<h2 id="input">Input</h2>
+</section>
+<section id="input">
+  <h2>Input</h2>
 
 <p>ACE uses its hidden textarea only as a text input shim, and does
 all cursor movement and things like text deletion itself by directly
@@ -165,8 +177,9 @@ <h2 id="input">Input</h2>
 <p>Of course, since only a small part of the document sits in the
 textarea, keys like page up and ctrl-end won't do the right thing.
 CodeMirror is catching those events and handling them itself.</p>
-
-<h2 id="selection">Selection</h2>
+</section>
+<section id="selection">
+  <h2>Selection</h2>
 
 <p>Getting and setting the selection range of a textarea in modern
 browsers is trivial—you just use the <code>selectionStart</code>
@@ -213,8 +226,9 @@ <h2 id="selection">Selection</h2>
 This, of course, doesn't work if the first time the key is used was
 for extending an inverted selection, but it works most of the
 time.</p>
-
-<h2 id="update">Intelligent Updating</h2>
+</section>
+<section id="update">
+  <h2>Intelligent Updating</h2>
 
 <p>One thing that always comes up when you have a complicated internal
 state that's reflected in some user-visible external representation
@@ -274,8 +288,9 @@ <h2 id="update">Intelligent Updating</h2>
 uses this to reset individual lines, the refresh updater builds an
 HTML chunk for the whole visible document at once, and then uses a
 single <code>innerHTML</code> update to do the refresh.</p>
-
-<h2 id="parse">Parsers can be Simple</h2>
+</section>
+<section id="parse">
+  <h2>Parsers can be Simple</h2>
 
 <p>When I wrote CodeMirror 1, I
 thought <a href="http://codemirror.net/story.html#parser">interruptable
@@ -315,8 +330,9 @@ <h2 id="parse">Parsers can be Simple</h2>
 manages some 1500 lines during that time on Chrome. All it has to do
 is munge strings, so there is no real reason for it to be slow
 anymore.</p>
-
-<h2 id="summary">What Gives?</h2>
+</section>
+<section id="summary">
+  <h2>What Gives?</h2>
 
 <p>Given all this, what can you expect from CodeMirror 2?</p>
 
@@ -368,8 +384,9 @@ <h2 id="summary">What Gives?</h2>
 longer be current. I've left the text intact, but added markers at the
 passages that are now inaccurate. The new situation is described
 below.</p>
-
-<h2 id="btree">Content Representation</h2>
+</section>
+<section id="btree">
+  <h2>Content Representation</h2>
 
 <p>The original implementation of CodeMirror 2 represented the
 document as a flat array of line objects. This worked well—splicing
@@ -419,8 +436,9 @@ <h2 id="btree">Content Representation</h2>
 patterns that may result in a seriously unbalanced tree, but even such
 an unbalanced tree will perform well, unless you spend a day making
 strangely repeating edits to a really big document.</p>
-
-<h2 id="keymap">Keymaps</h2>
+</section>
+<section id="keymap">
+  <h2>Keymaps</h2>
 
 <p><a href="#approach">Above</a>, I claimed that directly catching key
 events for things like cursor movement is impractical because it
@@ -482,24 +500,4 @@ <h2 id="keymap">Keymaps</h2>
 is updated <em>during</em> composition. So we poll, whenever the
 editor is focused, to provide immediate updates of the display.</p>
 
-</div><div class="rightsmall blk">
-
-    <h2>Contents</h2>
-
-    <ul>
-      <li><a href="#intro">Introduction</a></li>
-      <li><a href="#approach">General Approach</a></li>
-      <li><a href="#input">Input</a></li>
-      <li><a href="#selection">Selection</a></li>
-      <li><a href="#update">Intelligent Updating</a></li>
-      <li><a href="#parse">Parsing</a></li>
-      <li><a href="#summary">What Gives?</a></li>
-      <li><a href="#btree">Content Representation</a></li>
-      <li><a href="#keymap">Key Maps</a></li>
-    </ul>
-
-</div></div>
-
-<div style="height: 2em">&nbsp;</div>
-
-</body></html>
+</article>
diff --git a/doc/logo.png b/doc/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2334f5e0999358985862f477ce812805dd66d08d
GIT binary patch
literal 12003
zcmXY11yof{7riu6(%sV1-617NcZYO$*8@Qs1nGDnh)8#LBi&EBq@+t4{`;-<v(^hP
ztUGtkoY`mZeI{B>MIIB46b%3XOojI{8sO(w@bv{18GOfZ({BSm5Ix>0XrY2XfvA>I
z;P0<o-|KsTmxca&!ST*W)q@vFJZ1GfHC?Pdeazjh03RP8b~|SW4-0cwD|Q!mo9q)&
zQUIU^6lA2dd~=S2{Cx4X7oG#k{C{<Nc@>A!N$TKQ;*p#EPEwcD!dFKm%_M0u?{`X3
z6(`uSm^yzT9}IOPfk~oZyGcEAQRn9$F@@DegwxZ6JI*V-r~crho4ZamPa(XTi<#`n
zcpe13)PfmLc6i;dc}%Vn<9vJjiEFU9sOV|dj5DsXq(nWop!xjjV73ZJy`;+T(ALaY
zA;bUrFCQZ-t7C#n@hog^&Zx!nV8)L&CSWhu$C;eRI*t&)q7qlS+#MffVPRRypSPb4
z3k&n)&sH889W^x2(fQX<HM#+#E?}3kv$Jzp^FOS(SXwf0FKBPiiHVK<MX|H9<N0S8
zr#0}78wW>QTYK8jr9&H<mDM@`+c~qj5JGS=k%V0DPj64ZmUyfVtHd)6JReBy@9(GY
zWdGWwQGB#pZ{YMUPdsP=Jq){G+Ljj_Mk?gxVg0%y>7PSYhxKAdzzu!byn&{Hf&J*{
zXh3;&wX2WA_toj?gYaKwoEW5nt{X&o!S{BP)z#GueY#p&8)KO~!y_Z5Y%DCLiV6zR
z@87>S6ASnkZcyROTRCpsNA+?$6!!FRBaxe$dhO<r`mL~F_SI~@)ThoRaIBP#4YR6e
zneg#!0mF6Q?fA>0qM`^sKEAuqbdJ4qA`WY+rbVpRSm@dQ;OMs6rP+Tr%>GKanq6H^
zN~~A-oUUQ+3VH5N6{28~@2~4v{bf?S%L-jUv{2%)8cDHq3DYt*j=xz8s0vh;8;lr!
zeEg(YRwj|BYtZ_OZ;VAMqoQ`%G@a#bg=N$FK=j8cXnFZXi-?anWmeA0Qx_q790{L&
zio6G3;H|5e1#4zh?NYUGaH7gI_x0a-2OVGE+fQ<ZHG5kFu>lxl{7Tz@yPTFA|JpoX
zq!%t-?yYA~VV}iYHp$!hbsjwz6wtz49WXxADJ08%h&xut8Gzrg8Z79^_}1+#ack~-
z`_qJ(*+aL=B$pcXopHOz-o$1!BXoFTe0=;Z3(I}|&!7A2GIUL<2T!P-lyF8I|2@G!
zFbJk5#>UDgU#v0-*^Tsaa&jJ#$wP7u>4DXU>%*Hqs8~Sx$(??Mj{nW7PZ=IA?(@N+
z|2fiKPUzud^-2`Zn~CNSEm~T2e7oN8S3+D|Tt1Cbouz;N{7DUYSYBscy9nM0MTr5f
z&b^-MA8yY05MX!e5%QFNf7&00SlQT$LJ?4`;iCdbHgsg=60Qg(jH{@WWo~_LPNb+%
z-`RRx^2y68k444AM90Pk*gikr$)4O*>DLV+Z}6MKR0A|4wYy0y3_46+TqmJopNv+W
z_{mN>4=Z!t$R{Y#6<n4fZmN)3tY;M#$iWM$lG|9yJo!Rjpua8vU>#+CPANGQddl6n
zWlo#DXp3R({ctL&#mYn24@XnSmd25b%Zg{5Qopp+WzzD|&u4ou-lgcfQr^v;M5Ksc
zR6>Hz!S#J+T+OPCXGxI5pwC9&cy|Le8{6><gG$cr<w)vVQ~#5eJ<rNu4=Ue{Ee`p_
z3AzGuU?WN^go(KXak4mBvB*M3tmikEep(~~li?(>s!Xw9!txzw5+>l7+>e7z14n~_
z`i8ofFHxwdsOzyaKR+DUuFT1a<W6G~sr5QsurGeOJ>Nb*D9&3G@Vofa$IQ&^Kw`1f
zSVgd2*cZPWC%65l>v4ypEHCKaBC1c9Y%F1FV4M3+S(}H)%ciGc$?Ww`sB7|fc#RS{
zyy?Wa8u!fYD|-c8s{}H9Z0zce*4BFyAzshb6^}jptkF@$+!I19Go8VawYV665sSXh
zaNyo=cgQ&He3;<(IazrT0pBiRx))f0=}jG5k<=&T<0b<!WQ}^CQxijX_X}<pH-m!L
z#&6+JNkx6nUbU^B^epdB7uE$DyBteVRAz7ct(}OE(~NRM{dO~F_4V~9{bDa8laogp
zcVnYUFD@_h3>zKwGuuohB_)UKpQ~^v6f=k|K8J<DchD(ZudMs+<)Rs?OrX)$W+82!
z&kGx8&AKSd$XI?>5tuggFT1*T1I+kIF-iP`nszVD3By~!Z!v8FQc^vGS65es^z`)C
zD<EX~4eBX*%%1+-=PYaifsg34We*x@0>U6Mw5v2NB|Uw+qiKC2c*I_;#h^GA&LUcL
zDCqB1y5F-;-G>jbs+oh6%}~64w+@B0uTobCLzmmYks1Fo6Ks0L{}avk&$eg?XmE&l
z*!H*sUK7t_l{zjTllyJ<J!iY!NNF{=sMEHauQlx*d_=GRd{rPR(}lg-8=?xyIU9Lf
zMgCq{c@>(Oc^B~a`@%WaG<S(sDOa8KxWE0={dElpkv5gV=!C3Ht%3Jfq6tj@Jnar-
z0f})Y=9Yb28F(Bw$?&m^BugRGxMQRt`jOheKqpU6UM}x2o1;DW{NS%JAlOt*jk~G2
z`3rGdW|SNdl@c1LpM3SCRazlICEC1ww%O+eKilTx(hefxYC5Yv_Zu#*X$RdEk|`QF
z4>0?7b47e6P8KSHRkif>qm$mq2Va5+qsl2S8;`;CR>W7fDlyB@$Y>wqQoYI9f5M(Z
ziwwJ3q}!f?r9^9J*tu$x7#(ZDo<mz#8#71Kpmn``HXglN&s&wTmOq`NZrWB2hs)5b
zA$Qh3z#ai!#h|Qo4h;F?6OT2yah<nQxq~llZ?$>fKMJtMG{KCSpHWQ{fh=h-O_z<*
zmxa$43|+M4WMm#EV2^%<a0tkbmF4AE8-7>&)AB*%hKA~q`@16}Bb_T90Zpr`LE~9`
zL||2I5@3u6b4jnY$IK`xWzHVCAEP6f5U?c1C={PL_}lPqZz4A!2t-qYN@pu8E2g(^
zMP?1|9>|2l;VU&tN(EfjjJSdyZ<&e>t*seKV`BbQ;f7BGod}TYnwrpgZEc_5NB^Ac
zp;V<BB`Sta{MkB%B@C$}!wNG`n>#yHmC;d5HFgc^?W{Mc^vv=MrD|?QGmf!VWB{vm
z+#v}L&Y(jBzoz*nfh1QjcY$Cw9R;dooMpTmBVGvr5j??nX?l(PW$(}FOwot+I1(O)
z(<FJygG0~d8jHw^@87@Y2iaFVZQk_G6|3gG@MJ1=nYMb`rIbCy5WHny)6nw#4bl%E
z6@l#Wg?NNGrNSDiv`<zAB7V@<)gO{g&@i7kI%~OksHv%|bkc0jyaSNja-eQTtg7GN
z4BF4Uc@vUhsH3ySLrWXCcPCGyAOwgb0}0!5Znc5ocD!$n;*4F#4*5!52?+_E#r!TT
z*XQQ6fbLbF^$KuZax!yr9LFXmI@8H#1#*#sSI4;qaa~$=(ooXajY~al9^77@lRH_o
zJ5u9w=;k5YrF`T>lMv#}pI^AVvAQ=~_9o^z3wjUy{N}-}NL(Esbstv4?Yd$vm%`Ij
zUQP~_@9gN(nSC-&yO}$OH?kCUF(>zde%-<8&lu+No-2o~QyOY%p$%%x2HaqAqW9+I
zy4BX!KHr`Ctd-b!`h!KSmyp9m6yy|R&ev#{e1R49d~!keSAHTQBFoazV9_nAudjby
zNk85YHnmy~OQfYO#|@{c826CV(#kq~7`GVmFK?<{bmX<2$~W$;Twh=aIo<6oEGQ5q
zzd2cT5D9sHOot`s_aS@X07~@q5++mu&<v}Z9M>SC(Gm9HTJlLZT@kocMWhOyvh%2w
zo=w=Qk(=B3MbU?J!nQV-_0Enz7dxXSH>DMEF{Cw6uC?qukr~X-p(J6PUJWWlb=<<j
zJ%$+#=H~A-4?30$<)<S3gMJEhWo2cF4JA;N?ftuknZgWM)0EeGeJpRiMzstK{9VBs
zxbt6K$Ef_;CS)_Am4);zUB8M7F27exqkw5Mj>`nwUpw-%wY7}=&=*$u_i@G=I7K7f
zG{YD9k_BwDA3kuv0UQc-(Y6R$rE8*U=Tg4DDLNI<-l$G`Gg^dyBc$UL8d_TXkV#-b
z?bp%2^{~Ckadwt_5&+)bo`Hv&f7MK{EP2Op*m)hP!2m@8ZC_JUv)%z#`4+^!s%7rW
zi&2i)#l^+9OH~ZZD8Z}TAf$I(SA{&iozVVLuJab$-0Zk#WY`CP5npxtcZlmH?<5Nm
z5D@Ao%Y9)b)0QdWo(A4)z-yNI2qL`#x_@(N+8sEz{MZd=9j!5_;8#rE;i+RyL+^Lf
z#vPKya~&CRGt5;VcGkti?m7A=Sxlzt8RHvVjEssjeeic<gBJL;(cHfb5AT1xR8zQS
zKMEF^6EH>Y!nkx??0**axkM<G%_n4XSqxr*ES#@<UQ9%UY*SksDX!)icZkC6I@`o3
zFcaZp53xlY#cK?-B~*Pv64xBfl3F+;H_X#GiQ<CZ-Y7(D<0KN1*E?_VR6R2-9J@%H
z$4P7wn0B*exPsCKYS$0E={e6ZEL*yiJQtDwh~?y&BI!4B4Z6eo21}O=XiWNMCMWlr
z1YOU6`}OPB%W91FZosWS;uQ9Ou}ex#-4Vww04scg|JDBad+Bo>S$UK$4A;)x_0-R=
zsX8Y+$dl=&K`!onpVhQL*EOH%3q9R)`p`J=@f#>i&@l%*49cHgfqcB-#F>1EhLx3d
zhUl@L;IT2gti1d&5KJh_!<yKbn9AW=M>q(GtgQKQ&D@@?j0>M5=AG*J4zHybh%pp^
zYQ^F<n;=KW4f|YYJ&()Dsl!vflG%CXh>XGl=i#Y?6JshevSvl>-R$^5|9~kTjL+(r
zMOF<4Wyk;SHDmq!{IF%Yid!B%5pSJFQ}Xg&{)Hi-pQtD*lCD>ob_w6~_V$tj6Gb)K
zJ->atbDeo{&X-0;TIuWPMqlx;rFoGEuYMvQDgq0R$}l+$z57{Pcr}*W;&3nKBLh%A
zbNH3S)uKVJ?tJs{v6K%7C+WM!^|lZ@akm=)4AJA6)$3><bpNKVU4FAs@F|Io9<27r
zoN4bQ84&J=yZsWlVrCBD6+e71=OhN0@H#b%RmR1^ib1thkGo6~yvz+3#Y-A5w%XR(
z+xzY<u+y%fFP>HjllQ328FyQmIFPA~T~1jiC!#^n2eT7T2LGDf!k*K6jrl#$4Yz81
zS-pR)4P5-<N<s(B#v~<^$9@YA{&pMuO<W998PwWn&Wqlj<F?4dHA@M-#E7DmM5|u3
zXC?e#tnuyJx2V`ybPNoPBe$pdKN4rlY0PYF<L%btS>a#4eDOaS7#P5XxC2wjNI~>q
z$xh+RGKIHX49dvu8nlf|k6z%`Kfwh0e}@ha4^xXwy0~EqwtcrOK74pQI$GjG?xSqb
z3D6eUzMK4Iy-a`E9`SWY5YyuNnqPtCvz$k;in)2sqAhDWJu_iLgAm`hZ}WQ<3;iGn
zw|ecfq@t0KkZ`?`i_;q*CR4h8L8Kr8MGdbE9)r>u`3TN*xqjURP=B{jwD3JVJX|&s
zi{gT5bXHX&_jP_`)tv*|#i(-v*C1(D8#ie@3*aP-w)88*K7N|`HIqYj7TT$B>K0qO
zTp`zAPfBzuY&<+X#BPs^noqqPZ9=pK&rc7!OOE`Bg+QCvAt69*&t*ZhRal6CV42zD
zyjKwyF;T0>9#{_ZX*z$TFOJ?Y9-K4yM8h8S6P2ERfg3U>XA$1mx+GrLzG9I`23W$e
z4m;;zZ8Z3H1aB=>SAVKCa7vy33uu~~yL~oUck)(H2-PnRh;dsXz)WJ0u6j{=8#C}q
zc(pt?u7c!)B??ey5)zQ#gMF%;@$YC+6Km+ZhYiHEQ3)`s(Sv63*i6XkS9ZN+5*8Ll
zm7Mz^!%b&rT|qbg^CRnL;)gPQY>ngEz%ngEL&nh1u(Re7YxL5joq*Eo`%bu|q!Rlw
zFDO2?8j*ET59d-jY*MdcHUh4@Plg{p27u5pr@+J0S`8|VIp={Jj{$qS7bExN)u3Ah
zA~u{9;)?!TROFAWKh>}?ChAGlF^1f5PFmN&k~Eq?DRz&8qd%pv(bNlW#jdAim#(0f
zj+?bIo3q)&>#V3KR0IH9olme5g2I5EH2kYpk#@wL-5mj781>HF3*ahX!B#edu=1o?
zu&`d~#c!a&AC)0(G9+v#{I>F=CH`ueAc97nK|K0Z$e9Oc07hXiMQ2N267%bV1kfWO
z;Ios}NKS)jh8j4DWzTK)MV{XuR=s%sohx~<%U!y_yEU+LhyoBno8_?{locrpRKd5Q
zxVX5`3L;9gy#9Vf{*;A_ei=5L%^gCOx+6eKCOibeUe{;ufe}yz-aw84Evkd-!Blm1
z)ev~w;hpcT(}i+R@0~M1oJRsWf{Z6C?#BbiC8g<5d#O4fFFqt{Qlp`xmzZ`1A9U_k
z(et`(^()=D<KyG2DJsS+!rB`c?wka4)z#HYbjrkTV-phOTwPu51J0Aa!F)VcDO1<l
zd?1Ij6e1*=7141=Eo)||`rtZ^qrD=TZE`V9oGw-@g0~oZ@#$^^f`zgWfU^0l7SLu$
zR`|+5vhsB0-w}*z@plMGic8Ktr+?I)%1N@jX?}jb=}aclTA!5&=w?MlC!QwB+)m(z
zPBJR|?SYVKH#96;H3;L#=vt?yQ6fRE<LoMBWDvE{-d#T)Im+t3xi=o(8O?@$j!61G
z|D2F+_254!z6T<;z~S{kzh1<M_1je6U{?rhh-SsC@=jE#L-f{>Xjg7n7&Md9JZ$I~
z73DQ$y^gLfm50yiFo-+RQ3=j#?RV&Pi-C))F8xtBNs$oV;fwbSqlJR{33U3Dy4u<V
zs<o`bNWVg7brP1*3IyNJC}Hihf6#z_pH@mI&X$df_dy0JSg`1%1gW-;_cg?~VAen(
z=F8k)OWGOk{93u<fCwM~r-)1cxuXAaTdCmIk8em>+pr=V2$xC=ff^bG(wP?XU{MIy
zL%p8+qw!|I5`wk2yUXtIsq~WMQ6~e~`19*)BD+!Z*^||1+Pt9-xAj;?)a~u90{It4
zj};v30j@zsA%)T{$i2<`5%;v1{Rtt$Q2~s73!CyBE`BJnNDmw%@VJ3d+PFBO*o|!6
zl;_>L==WUCI*MnRfEUfAxYdk1_}d!5Wxm$!i9&;e{JNk~D9mKX$xRVr54O^pLk*9N
zl#??#-tj(OqF05A-nDHHB_=XPvX#zu!xRlQQ_|8JX*f8lpce+3n$n<XTwX}_oIx^o
zZSDDTmSo~$R5IHzijNE&8~d!L9*zWnLB%BI+^DWPY+xI9@nQhX;z}4*a(+uN{CF19
zH>e==@91Q-P?8;g^pQ~0aQ~^C;fN@ld-Bh2_Q$JA=g`p5=7*Cu3lfW`=>7D6yCrNO
zNhQZwbmY&5y>X@tJnJF;)Z?nEX_pZ{xZ(M!$G1YXoSPWA0ylh}m(aR_dL_r16T`@Y
zchCm4SF1QcNonjc;G~6dSS--Ws)#_cxF%3!6UK%I;1dz$iMVaaXc!n6i1l=VLn4?4
z95)PY2%>jKV@PEP8{!KHuKQ7ESqh0uSDj)NeB-W8;^Nn*T^c|T;L1<7)c+$`se>%Y
zxj>bC)lgD@B?^o&GYchun-xRbpa#kp4nA6L=s@?n(vSYx0uVWmlsW^HNme$ok2+X0
zfCa1n$x6$)fzy+;F6hagjSH+B(H1-|RI#o1Rv9t?f*^BR1@-c2V^!yU>C(J$+5E?i
z?$8bri)#alw-)QoonOZpO6iylk)7c!P^d?RX=^7M^i*&xr1~>(MDtkiu0O`nFKL%z
z_Wwq-dBl+7466~|tUqs8^GOh#EDqbo1zlY3p-Xb$%Qj~$DCvr!ffv90pDqt(i|rn7
z&xb%D6D_&69}d~L>6MY02g!Z*?Vqoz&O)9)JC}GsnQ;R0z7RJr%~AIb%|+h?^dw*L
zsPrA<FFTQbV7fvjwx&qYrBdj*{vi;fr&%pl)-D&9XqUFGHgaRL;I%Ah(!dcNk>8*b
zkJ`kgu9&LRguPD(AqjZHqLdhSR0KP8A>%ZYH2yv^qNoHF6}p`ICf!9p6nc}3^<TwK
zpP8BI{O9d43+i^29;cHrGAkL`f%3SxqjkNE*YR>49^xnd@2g<z_k(0EDQ%a+fwyPU
zos~n4ba^~eMx@-9!%{bi(lYfy58e)-#bg>ZZfYC>{|GYD1V0h}^TuW8(JQ_XCxzhk
zaUpe3EvV`2wxk{JX1nMV|M)Rs9mnVUtxmrxuZ4xhUc=w=`w#(%bw}`z!+_Qv&M8Au
z5L1Pk#4F|wob?F^cUzV)CEva44I79hVzlLjqRX-o#tuEVOdxhqjSD4#whU}%G(9o!
zpeS85t%cpRvwd%|&gKPk;{+qudC4($ho^WQBwR|xno@;#(7Hv2iiLwl+#xaP<g3o_
z8v1^Ne;34qzRwPn5<f_P?x{9P`!3S`TL{^caRc9mGljD)$lKrYk4C~a?VgsF9yj79
z7jjNY6s=G~*_u-W;SUUo``hED^%JgF?IAD0Euh=0>2os?jy21@=-5cLP-)zD@N~0Y
z<>|@j1(LeH6lP61&<a_x+`IEf`2vL<3@*_h1pH?t4C+PwsIUJVHNg!%9U8qj9qH@q
z@=NEsR?MwDJ!MN1{dgp3Q@2QL5luc69k=J>5f{HeNR($O`J<uz5v>wRL}@hoTWU~`
z*K*Ny%J%V4V%>kV??;2ny7<F?M!xiaZb{)d%kb+d^YB*yHxJJqtA6dD0~+bi<f|<n
zHewdL1+uYM3JMAb62>hWF1Z{-dXFo$wd6w%16GAxIS3c!-8XSH-FJ(N4M~tO9Oj!c
zPH#1xlJdB{7tDMBh_XHQq%BiQAt5Iq820V72mL=fMg=Md%a*)(Yr{5!!UL~E5Zp2{
zGW61YOiU;T6RAR+LE`ix4whYF_uXmzO^2dm($p10Sh@bTTf;24gv@+=UL09mtq#g)
zuU?V34^j9SeX(kxlmI;wFjDmbfySoCvJ|CO?xADtj?8~o+XTcP&-!S<Iphhh&Vc@b
ztLbnfSe6%mW#|UEiCMIJSoEN5ZYn!Ve~cSgbM3=CT&OUF^*uGy4-!ZH)XeRfBNi^@
zr0~BS7vK;yDDfxecg*nrl}s-%G&J;r0B8{qShS3$GnNYwzY||LY(tRbn=Wr39u_|&
znQcDxD2tCFeNF8MYNdR+!j^%9lejJ@*LYi835*Pb=2H6I%>BRPhddCASj4HjJvMi;
zT{`t?W40J6DRc2Dta<m)Xj$Up<Acn1$1<xp4C<Md{3aUlK=a>pAI$qbIy$<21jP?8
zuH@C3Uafv+<*d?GlcJ0<ryYoDpL?bxWYa!u)cV9jnimO2`9W&hW?WR7omG;wgVL>+
zsf_)HIzgnRsnvh0v$=Ul;^on!kb2IL7*NMQe||XCbzZ7JINaLW65FTU|I&*HfU=Dw
zu0{-G@BWI|;o0fz##w^SE6u{&6Pl`G1bn_{8v#^7SJS-S7k?<;rs@c4rR^-Glk0ja
z_;<u?-?cJWiCKus$_izRY@ec|8BLz;zCuO%(h#vtn1)Hl@4VdVg$#>u5fT#eJ*pX+
z*xlWw6!F*{TQ4gs^J%c7za;}bod)EH$jJ3ByIBS@KPhu_nt0Gc+hZ?ui+<4h1^VFv
zmAaL|-)FD&D`1Q`I67#(_^@hgspf5dY9?mpgT8dr;Ki*<M?4(kcHgA`!robR*r)r)
z1KHryoc(nL6<7hS5~~g&tIox`CVm6lt{dHXplNSZ@A`}h;Sv(M8+Y3tv^rgC7`+TL
zL#eH+V+OC8c2>SNO`0UJO??Oa-QV9onk`lhxa-$7Z(6onZS|T5TOXpSDH*qkBt1PG
z>@iUpJM?0dlI;c+(3K{abv95DjEQ(3=@r_6?L{?v`@gb)oGC1_>Zi1k$!}s}i^2bV
z(ctp|qOZlu*}FBRH8hW)tMa?eW-=ALvsTXJuNsre@^;6viqv;upQJy%d82JtQX=()
zf`!qxlV&)#=B#k``FOc$*~E7<!UNnQ&^Iw#p$_a?@)1=<cmAlr;cW3_Vnjs58Yy~S
zeq&?WXH2p*B<keH{Dh^i!lk*tqR&7qkdc>{f5=J{w&f)q%NF23mV9AA@Zt9KG)F^2
zMYUZJV?K@s6)4bPK(Xr}zC=c0kP)@Nb+X!~3KjMmftAno*f(s=>za;(2AfFG_=kW(
z9;S_V8X7b5Qc_a)V9@sC$prqnuj9;6`u<zAK@WL6AG!q7t8{pLJZO5$okA`>v?{f6
z;rrCo6i%YVvu|jm&dT8JQQc%IC<cj|bcBRiz!uoT53oPr^Y3^WmTz9upsuAQ6ZG&;
z3^Bd0qxHW(>u_M_gCMZ@1quz0ULpq5xb`*3rig%=PWC2=FW?fsReb;6*LxyIh-flT
zLbW13CI-#_=^8ewp`jrTmw)Z0{}dtI4!;I2%P-Kxekqzg_^gt_`R(CovF^?G_I4F>
z#b`PQ*onc^2IVjkxLs_}(9m>1miOGHW8GrW2b)<jLCg>N_;G9S<#A5}Dk79E>Fmr-
z&&c?Ki-W^O02zc?o$G>K-(v$kYVV`pHEhrTu=ir4C@n3`_>dJ6!U$GbXi9SONAZAv
ztPS`&WvR%Rr1db^<AaEoExPZA9yg=r>E9QHS#$P$px*<ZjkVY?T@?Q7V~yidtyL_n
zuaC43gbj5a9q-nIFUI7Z&ZNs<fitjGKnAv6jitwB)YWk?$pz1dfsU%X8=wCk#l#Gv
zs;vBEzup-H9ZG5b*4&%{4w@3p-tJ#ZKUdT$1W?l+fJ|HUM{#jL2jv)nVUu$OXt)OD
zlFReF#0*Z;Gzw=TNg;LnsXdB*WeN_?RT#t|7vyX%kpvm<ELzyqq41?WzV$mikevZo
zTK}B|klFw+P`=pV4qye@mg<^wqrXFhEW>@5YALC~@5TYLl?wLVEF?uBaIWmdSN=8%
z=ruQBv7N}~cQPn7IepS&r0pH$=*r0kJJg}G<E*IBKn|lOxj^(s6HSuLREjKV@+u<m
z9>D_xD8MfKPw@UOUzzy*y)q>Vp`4jWG`QU#fM>++<%S>h)>5~13iz-l6b~mP+FGtb
z=S*R*znx%1yx$l7vL8<sp9*ZAanTCzZHc0E$0n>F0%Nvv-m37vYv&KrK#1q%>7Fk#
z+<W*b^N11^8}7I1OXR>ABED2Bycr541o(|u<TZnE+s}&nx<R6>0!!Q7-Tl*Q;LGz9
zf)l@?McL7bXZ;3dFDohrq~w+OF2XH-cSyEOjkF8BE*wN3`yHI)z&yhvAHb0zQ*&|^
zQb%nI*N(QK0yr#ZPBuy^ySde{D&YFAd63+JPPCq~va)m&m6nv9!U@Wm_Zz=B1Z<Ri
z+>r(M*BLTyRFDHU^A*!g$INFUT_n3S1^he@0y=;*`eOz76`8Xe#b2|G!-=|}7XbxJ
zl*eVQ-QA~4Rs62M)p4=b3*4^vwW0fl<dZGRmY0z2mOIkLBQ>>5q;Db+3BfgiOc^(2
z3!E%mx;p9=L^EQD6fgpi!=Hh-&L%g>Mxw#)Mg-o#p#s6k)dO@f`qom_h0)W+`q;c`
z2A{qG_W<^{z*{y3^_11VGObd|uMEl;wp<`q{dk3rez@>n2MI`kzm3<&o>40B?M3J4
z0e(mcnbX(dKpy~N)cnCe?sZ{(99Z2haDTv=cJ(=7;~Q6qK&%+lMI8wd-#}`B3+005
zQJfQG;07)V<?M$7{!MF9F1#5&gp5KZ5(u=x9YAJ#0+WFPpny~<7wGLWZ65;+2+cp?
zIniShWSUEj8i}o?P*JMk*Sx~f>Zr#AqPI%rwu<3y5hYCpI6!a51WqkhF8tTI`og<A
z&dQ9}8|dJF@kW1)FOyeSpY8(tDEAw4C7PN>t3+Vy|4U}3P}R5ge4~p;F8m!ob_kM5
z?+OAn@rZ2&*XmytAmo#~;T^I-*Jc8DkR4%oTRziMrSVok!X6;sd<w+zq4x#=l%B72
zedJQ~vF89nI6YJ=vi7$})>3*H8`@u)6wmri;U1B@iR-9S;C>@fuWa7np>+HCt&@CZ
zqICW~h1pB<O+pffP6TodKtl^GD3Gy{&5HD~(|EB%s^0{gGTjUW0UK^iBQJgchx8pM
z=1$0)l#m5UpiA(g^Yw^43$iN_kQm`8qgAL=R<^PVmhlRil;!tH(yrGNgkSZs+mBbX
zw|y(65$-k6^FLkC6eA47nIWGErEtU0Z3x3{@=-O!A@gdT5r-<7RX{r+`=wDhxC?c|
zkSSz=UJV&Bo@PEtg&5+JAE&{i1vtAR3eHOQ@0#JHm^;x!+Q8LZJph}^L~yJqoUgk*
zz-jN<JGjO9u7wv&K@m6?>0&b3pV7bJ-y*q?h-`K3M7?l9gc#K8h1w;!(0k>9fAGzV
ztf)<3wv;&p>ZggdO6aF$&rF9Y7x*r)qPFFG65xG{^UW0<kUDTyMfi<k6&@%?3}18@
zLe#y@pzgRYdTz<|ski~41Xs92B1Ruu32;WDM(~}Zi#cuaeVJ!Pz5EtfR$?ucVU0U5
zxk2#)m?3ZuE>^(Dz@LbwZf1r5GS~1OIluSOm4XN4J?;eYrPSeEyA-d2nS`+b(Os7J
z3AYWvb1@E~weVKD$kwuvm~ue|(#{(o=Bb==n9F<*O(9tnaSU@}hv`%V>aqH$tcFo>
znk|!L)NA?{K0m|mc`k|?E~fPYFGV7yjoJ>b{lxcaMfnT<4_P-P$cv!Kx^4adQp!b!
z5z;HQ@LzU0?F$wWkqBziN&g7e-~|!?nkK-K5*GTSxf1qXePwz^VH;u^@(6e{i!-tC
zGp|h^flX7h_s^dYu@vV!tUBsu%2aNY5eb2gXitMM*)?Pwlj`3=bSIMBz~0W{iz8j<
zEJ!O(k$WG_a0lW~5?Gktu!}*U<7RVYIVg%IU=Z!zY$gapLlfHFSGHaP<L^XLZNU9b
z=|mmp!7|vlv?@6|$Eq2wfL}HqR!yo%6ifwaq9|On1oARvYJLhG@Zw3B*a*TtNhI=P
zBdd9;zy#Oid`vFYq)1x-!d=<ZeH#4o$Cv*{b?XD;b}6S&#O4v-?rDAE>Sq4n1`QqT
zH+Rcc5K}KNdJNpGA5pBlz?KD_2s9l;o023~S)g3azx=yguOH-70X4iNxZ0Igxbuq*
zyuu9|yQfPOLdQBV;Vrku&(=(eE*89NVi(u-O27s&+zX;vxIQ*+e!W@?(Ae-3-|4kY
zZls`&Id3?%k#>+leT)>6Y@RQ^BpoDj3bHnfsv->S$U@y)sh0cc(m(2TJJ85!%2=D9
z6M=7uJCMs3U#?NoPQqh2!wskS_KH76r<5$KYQ3H@XFWQSdtg>gb!zlOj&<m#j~uR*
z1pX7|5zeo2NRYFU%oX2ko_L8~g3}oo5F0utcOVS6rh2m<#yaEy!pA!UQXx9J{=#+|
z8k*2GXGvQ`hx{>Ee1yBgWF*^8A;ks@@eMz*qMbh6q(soy4f3p)5TUg;gx?1lAJ6|Q
zQe$D&Gpwj@jB<S5aVf!fkFJGJv!eFF3A)UC3t$RXY$d6AzIL&FUxS>okWV`D-pWln
zlstAy6q}fM-y8!}Kl2-<Gi!881$uB+pu?W6T(IwxE+m4CFi}!lOs>g!ZAKVQ%*2BX
zoP`z|jej0VnkKEIjtl=7d4~y+1|gdfzwC-bEvvIf?MUGl;0#uK)2~d)3i$MO)S~bM
zBf`YpKGsscq%ja#Nv?giNba2HSGvlG6YoxV(R;C&gvVd9kZ3Sso;~1Vp7!0C2py|9
zqql@2t)2(~RS_0DoJ#)fS85DK#hFN(axi9sL1KxZd(XrLPB2)+Bg0ksBwqXdhH8IH
zYRsFe&UsV(co857;I@w}6TW=UWbB0q!8LL+%ZeA49ixl691Bwe2I`%|xe2x~B@i+;
zIR}NdpTYSFsj)5!NM+X17&Qz5G1cStW)pknOqUu#6n9<wgds@y0Snk1Zg2y{FwAZX
zH91Y5Z{<Vql`4HkpJ|UO9X`joxw%m~q-||)_wkV`lcz{%)`9!%lUl1#SA+t7>{ys9
zV~T_WdAkyq)E(Z0eec*d!F5*fS0?t*kG}(ElYVMOr@)a%UL;cebuRMmH$IMfpn>2e
z2&R8ST`&dWc%ut+izc}=#qdYE?wL~VIurp@gbeUR&Coa2?OUvosd=%^aU5$=d<ssK
zk)McagpW@g5JZmH$&bm&$)Z=~pi-!#6!ZV?XU;d&)2F&NGL4!bwB<J|H6il&&;R_b
z_ia#Q*?KRTqH!-@E5{UF%)0cQN=PJklT8G7^z)mPl8omG0yGoX;UxJ+T~kw+#B+LC
zS=sU5wN~gYg+G5rX=rNd-eq+q$Qe7AeSM38ENzfTDJHsd?Jq`bVFLU767zYwC_<q^
zr?|i0cLc)%qo=1w**W5#;2ONlEGQ@_PTSkI*%@$ik~H>YKWaM7)LPETH5dj;V+_o@
zL<*4wzzS)*%9a7VjD&;~59PK}{M7qj<KS#=Ztj8f;)MXZU)wuZXEXW0sFX3a(eDkO
z*u*9!6|NQY12to9FFq-$zjTvxyptqcD|nDBo@>{~r|$M`>vwRNUQk&?{ODEA;OxoQ
zC?TzFeL)lOR4_-wz##VlkD>Da<PdT@tZ4eo0IG;m0X{rqjSTR?PTKBvv$Ks*Gg4B*
zH#Rmlk9#z2B-8PKfC>sZamGy^3_x5Qmls*x9P`vpI5QpH9|3_iUyDn+SKT0!t~_1q
zcsN~7E>=M>RmEy#Jn(Ft{>rF2QBmP^Avo%PJDc~c^}EgIRO0UcqQn^qX%5sqA{KRv
z`vzv*nP_lyx2@#QO2$93(Xp^7Z>FSQlW3JXhzwpX+T_J2Bqp9>MCLS*w8n7`3=XQ0
z@K`Iw3Xls<SD8xKHY`n7{L-|MPRIGNva*5+isR;8=@GC?g;qA-S_P^WB4fFX(z3Fy
zm#tWi$~)0hFkt$iW~-~^^ZV<#&)qu*J{ZaeMa4=hQ%c}JMx_xL_*iec_m?!ZN*-`h
zRy+Bym<ffNNWr3AI`4j1cSGPJ&kn^{)()3o81;N47@tYNGYlQ?D#9&>64XJJ>Ta4o
zN>wuJ;{kf<-$YK^FSFVNe6Eg{iEwamwhi8POoXd&D1kk7)6<ofx^I{5hH+b4AGNf#
zcj|TgbJ70OSXsbNm*&mSRG=K(_y5ls0JWVBaCPR@@|YwXG%6$02oBXz4bFsc9deKW
zCdyWC1iC49(mI9G=Ii|{(0mD_?*F$x-M2jOj_n<IBITP#N#!+piAo|njZy(qa2rU$
z!Bd}ALYUd(pF!JGH#IFScs8coi~Y7W&xu2$L<@mIIm<J&66Zr2D|2F0)GZG%@t@fI
ziwipTzmNYZLHC@LBOS5b{rv9WXfK+!k)DvjI7j{DXJljyTB^6(Gn`q)!69VTQ)>qg
zMW06hY#CzoQNC@pb9B)to5$0wFql6oN(0>+d@8D!#;Us$)Hy2y21ZBz<sO2!I!1!t
zN5nBPq~e#W)^#)z5>&B-Y%HwI%)e~q2}M|m)yvk=_ixPNt`(J(0yDOoZ^09*NuY)n
z>+MU;t~~M<fr6ceEsn0oi*UsvVMBHG8gU7UkPmnY&uE_N=I#-4g$G}=vhEY6ZI6&4
q1Ox=BJ9~Q^;O*}gVC`PKk0DS~mciXHmum1pI-nq{B2)R!EbM;<{5yaE

literal 0
HcmV?d00001

diff --git a/doc/logo.svg b/doc/logo.svg
new file mode 100644
index 0000000000..9783869c9c
--- /dev/null
+++ b/doc/logo.svg
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/home/marijn/src/js/codemirror/doc/logo.png"
+   inkscape:export-xdpi="27.450405"
+   inkscape:export-ydpi="27.450405"
+   sodipodi:docname="logo.svg">
+  <defs
+     id="defs4">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4138">
+      <path
+         transform="matrix(1.05,0,0,1,-290.76164,27.927128)"
+         d="m 705.08647,231.61324 a 70.710678,104.55079 0 1 1 -141.42135,0 70.710678,104.55079 0 1 1 141.42135,0 z"
+         sodipodi:ry="104.55079"
+         sodipodi:rx="70.710678"
+         sodipodi:cy="231.61324"
+         sodipodi:cx="634.37579"
+         id="path4140"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="291.72812"
+     inkscape:cy="789.2497"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1600"
+     inkscape:window-height="875"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#a21313;fill-opacity:1;stroke:none;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono"
+       x="247.48738"
+       y="163.42795"
+       id="text4006"
+       sodipodi:linespacing="125%"
+       clip-path="url(#clipPath4138)"
+       transform="translate(0.50507287,0.50507595)"><tspan
+         sodipodi:role="line"
+         id="tspan4008"
+         x="247.48738"
+         y="163.42795">    if (unit == &quot;char&quot;) moveOnce();</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="182.17795"
+         id="tspan4010">    else if (unit == &quot;column&quot;) moveOnce(true);</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="200.92795"
+         id="tspan4012">    else if (unit == &quot;word&quot; || unit == &quot;group&quot;) {</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="219.67795"
+         id="tspan4014">      var sawType = null, group = unit == &quot;group&quot;;</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="238.42795"
+         id="tspan4016">      for (var first = true;; first = false) {</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="257.17795"
+         id="tspan4018">        if (dir &lt; 0 &amp;&amp; !moveOnce(!first)) break;</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="275.92795"
+         id="tspan4020">        var cur = lineObj.text.charAt(ch) || &quot;\n&quot;;</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="294.67795"
+         id="tspan4022">        var type = isWordChar(cur) ? &quot;w&quot;</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="313.42795"
+         id="tspan4024">          : !group ? null</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="332.17795"
+         id="tspan4026">          : /\s/.test(cur) ? null</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="350.92795"
+         id="tspan4028">          : &quot;p&quot;; // punctuation</tspan><tspan
+         sodipodi:role="line"
+         x="247.48738"
+         y="369.67795"
+         id="tspan4046">        if (sawType &amp;&amp; sawType</tspan></text>
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 374.84375 136.8125 C 371.96854 136.71001 368.64305 137.97919 365.15625 142.03125 C 361.97051 140.84608 359.22347 140.35622 356.84375 140.375 C 346.53162 140.4564 343.3125 149.71875 343.3125 149.71875 C 326.2234 146.67934 325.625 162.59375 325.625 162.59375 C 309.43195 163.37101 312.4375 177.375 312.4375 177.375 C 295.67899 180.15651 301.1875 194 301.1875 194 C 284.10838 199.04575 293.4375 212.46875 293.4375 212.46875 C 293.4375 212.46875 277.68174 220.31271 288.1875 232.25 C 288.1875 232.25 273.81776 243.63282 285.90625 253.34375 C 285.90625 253.34375 271.57897 263.97487 286.40625 275.03125 C 286.40625 275.03125 273.84147 285.48036 289.96875 295.3125 C 289.96875 295.3125 278.92374 306.07108 295.59375 314.65625 C 295.59375 314.65625 287.70844 329.01862 305.96875 335.125 C 305.96875 335.125 300.47495 348.88874 319.09375 351.46875 C 319.09375 351.46875 315.90162 357.19564 321.59375 361.15625 C 321.59375 361.15625 310.04416 364.78661 312.5625 374.40625 C 313.83361 379.26171 316.82684 380.49158 323.53125 380.1875 C 323.53125 380.1875 329.096 395.54812 350.46875 398.96875 L 353.125 402.59375 C 353.125 402.59375 342.80592 409.64088 359.125 421.5 C 359.125 421.5 354.16126 425.74314 363.28125 433.34375 C 363.28125 433.34375 357.54117 438.3362 365.75 442.625 C 365.75 442.625 361.35822 445.96166 366.09375 448.125 C 366.09375 448.125 370.88293 490.18262 355.40625 534.4375 C 355.40625 534.4375 341.28721 542.04782 350.1875 556.96875 C 350.1875 556.96875 331.59675 562.24093 345.09375 575.53125 C 345.09375 575.53125 342.0547 585.56155 349.375 585.78125 C 349.375 585.78125 346.16048 592.54552 354.4375 594.5625 C 354.4375 594.5625 353.17883 603.88113 364.09375 602.1875 C 369.44813 608.40994 378.92733 608.70518 385.21875 602.34375 C 396.13361 604.03738 394.875 594.71875 394.875 594.71875 C 403.15197 592.70177 399.9375 585.9375 399.9375 585.9375 C 407.25781 585.7178 404.21875 575.6875 404.21875 575.6875 C 417.71573 562.39718 399.125 557.09375 399.125 557.09375 C 408.0253 542.17282 393.90625 534.5625 393.90625 534.5625 C 378.42953 490.30762 383.21875 448.28125 383.21875 448.28125 C 387.95421 446.11791 383.5625 442.78125 383.5625 442.78125 C 391.77129 438.49245 386.03125 433.5 386.03125 433.5 C 395.15125 425.89939 390.1875 421.65625 390.1875 421.65625 C 406.5066 409.79713 396.1875 402.75 396.1875 402.75 L 398.84375 399.125 C 420.21649 395.70437 425.78125 380.34375 425.78125 380.34375 C 432.48566 380.64783 435.47889 379.41796 436.75 374.5625 C 439.26834 364.94286 427.75 361.3125 427.75 361.3125 C 433.44213 357.35188 430.21875 351.59375 430.21875 351.59375 C 448.83755 349.01373 443.34375 335.28125 443.34375 335.28125 C 461.60406 329.17487 453.71875 314.78125 453.71875 314.78125 C 470.38876 306.19608 459.34375 295.46875 459.34375 295.46875 C 475.47103 285.63661 462.90625 275.1875 462.90625 275.1875 C 477.73353 264.13112 463.40625 253.5 463.40625 253.5 C 475.49474 243.78907 461.15625 232.375 461.15625 232.375 C 471.66201 220.43771 455.875 212.625 455.875 212.625 C 455.875 212.625 465.20411 199.202 448.125 194.15625 C 448.125 194.15625 453.66476 180.31276 436.90625 177.53125 C 436.90625 177.53125 439.88054 163.52726 423.6875 162.75 C 423.6875 162.75 423.0891 146.8356 406 149.875 C 406 149.875 401.14687 135.83532 384.15625 142.15625 C 384.15625 142.15625 380.33279 137.00815 374.84375 136.8125 z M 375.34375 155 C 416.3488 155 449.59375 201.78944 449.59375 259.53125 C 449.59375 317.27306 416.3488 364.09375 375.34375 364.09375 C 334.3387 364.09375 301.09375 317.27306 301.09375 259.53125 C 301.09375 201.78944 334.3387 155 375.34375 155 z "
+       id="rect3058" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text4207"
+       y="491.91403"
+       x="149.69542"
+       style="font-size:95px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#a21313;fill-opacity:1;stroke:none;font-family:Source Sans;-inkscape-font-specification:Source Sans"
+       xml:space="preserve"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"><tspan
+         y="491.91403"
+         x="149.69542"
+         id="tspan4209"
+         sodipodi:role="line">Code  Mirror</tspan></text>
+  </g>
+</svg>
diff --git a/doc/manual.html b/doc/manual.html
index 532285163c..37230f5426 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1,38 +1,63 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: User Manual</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold">
-    <link rel="stylesheet" type="text/css" href="docs.css">
-    <style>dl dl {margin: 0;}</style>
-    <script src="../lib/codemirror.js"></script>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../addon/runmode/runmode.js"></script>
-    <script src="../addon/runmode/colorize.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../mode/css/css.js"></script>
-    <script src="../mode/htmlmixed/htmlmixed.js"></script>
-    <style>
-      dt { text-indent: -1.5em; padding-left: 1.5em; }
-    </style>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo">
-<pre>
-/* User manual and
-   reference guide */
-</pre>
+
+<title>CodeMirror: User Manual</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="docs.css">
+<script src="activebookmark.js"></script>
+
+<script src="../lib/codemirror.js"></script>
+<link rel="stylesheet" href="../lib/codemirror.css">
+<script src="../addon/runmode/runmode.js"></script>
+<script src="../addon/runmode/colorize.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<script src="../mode/css/css.js"></script>
+<script src="../mode/htmlmixed/htmlmixed.js"></script>
+<style>
+  dt { text-indent: -2em; padding-left: 2em; }
+  dd { margin-left: 1.5em; }
+  dl dl {margin: 0;}
+</style>
+
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="#overview" class=active data-default="true">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="#usage">Basic Usage</a></li>
+    <li><a href="#config">Configuration</a></li>
+    <li><a href="#events">Events</a></li>
+    <li><a href="#keymaps">Keymaps</a></li>
+    <li><a href="#styling">Customized Styling</a></li>
+    <li><a href="#api">Programming API</a>
+      <ul>
+        <li><a href="#api_constructor">Constructor</a></li>
+        <li><a href="#api_content">Content manipulation</a></li>
+        <li><a href="#api_selection">Selection</a></li>
+        <li><a href="#api_configuration">Configuration</a></li>
+        <li><a href="#api_doc">Document management</a></li>
+        <li><a href="#api_history">History</a></li>
+        <li><a href="#api_marker">Text-marking</a></li>
+        <li><a href="#api_decoration">Widget, gutter, and decoration</a></li>
+        <li><a href="#api_sizing">Sizing, scrolling, and positioning</a></li>
+        <li><a href="#api_mode">Mode, state, and tokens</a></li>
+        <li><a href="#api_misc">Miscellaneous methods</a></li>
+        <li><a href="#api_static">Static properties</a></li>
+      </ul>
+    </li>
+    <li><a href="#addons">Addons</a></li>
+    <li><a href="#modeapi">Writing CodeMirror Modes</a></li>
+  </ul>
 </div>
 
-<div class="clear"><div class="leftbig blk">
+<article>
 
-    <h2 id="overview">Overview</h2>
+<section class=first id=overview>
+    <h2>User manual and reference guide</h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
     Web pages. The core library provides <em>only</em> the editor
@@ -50,8 +75,10 @@ <h2 id="overview">Overview</h2>
     of modes (see the <a href="../mode/"><code>mode/</code></a>
     directory), and it isn't hard to <a href="#modeapi">write new
     ones</a> for other languages.</p>
+</section>
 
-    <h2 id="usage">Basic Usage</h2>
+<section id=usage>
+    <h2>Basic Usage</h2>
 
     <p>The easiest way to use CodeMirror is to simply load the script
     and style sheet found under <code>lib/</code> in the distribution,
@@ -107,7 +134,9 @@ <h2 id="usage">Basic Usage</h2>
     of a form) is submitted. See the <a href="#fromTextArea">API
     reference</a> for a full description of this method.</p>
 
-    <h2 id="config">Configuration</h2>
+</section>
+<section id=config>
+    <h2>Configuration</h2>
 
     <p>Both the <a href="#CodeMirror"><code>CodeMirror</code></a>
     function and its <code>fromTextArea</code> method take as second
@@ -372,8 +401,10 @@ <h2 id="config">Configuration</h2>
       This <em>will</em> have bad effects on performance of big
       documents.</dd>
     </dl>
+</section>
 
-    <h2 id="events">Events</h2>
+<section id=events>
+    <h2>Events</h2>
 
     <p>Various CodeMirror-related objects emit events, which allow
     client code to react to various situations. Handlers for such
@@ -589,8 +620,10 @@ <h2 id="events">Events</h2>
       or the line the widget is on require the widget to be
       redrawn.</dd>
     </dl>
+</section>
 
-    <h2 id="keymaps">Keymaps</h2>
+<section id=keymaps>
+    <h2>Keymaps</h2>
 
     <p>Keymaps are ways to associate keys with functionality. A keymap
     is an object mapping strings that identify the keys to functions
@@ -661,8 +694,10 @@ <h2 id="keymaps">Keymaps</h2>
     to <code>true</code>, the default effect of inserting a character
     will be suppressed when the keymap is active as the top-level
     map.</p>
+</section>
 
-    <h2 id="styling">Customized Styling</h2>
+<section id=styling>
+    <h2>Customized Styling</h2>
 
     <p>Up to a certain extent, CodeMirror's look can be changed by
     modifying style sheet files. The style sheets supplied by modes
@@ -740,8 +775,10 @@ <h2 id="styling">Customized Styling</h2>
     <p>Themes are also simply CSS files, which define colors for
     various syntactic elements. See the files in
     the <a href="../theme/"><code>theme</code></a> directory.</p>
+</section>
 
-    <h2 id="api">Programming API</h2>
+<section id=api>
+    <h2>Programming API</h2>
 
     <p>A lot of CodeMirror features are only available through its
     API. Thus, you need to write code (or
@@ -1620,8 +1657,10 @@ <h3 id="api_static">Static properties</h3>
       returned position will be the end of the changed
       range, <em>after</em> the change is applied.</dd>
     </dl>
+</section>
 
-    <h2 id="addons">Addons</h2>
+<section id=addons>
+    <h2>Addons</h2>
 
     <p>The <code>addon</code> directory in the distribution contains a
     number of reusable components that implement extra editor
@@ -2088,8 +2127,10 @@ <h2 id="addons">Addons</h2>
       will highlight changes between the editable document and the
       original(s) (<a href="../demo/merge.html">demo</a>).</dd>
     </dl>
+</section>
 
-    <h2 id="modeapi">Writing CodeMirror Modes</h2>
+<section id=modeapi>
+    <h2>Writing CodeMirror Modes</h2>
 
     <p>Modes typically consist of a single JavaScript file. This file
     defines, in the simplest case, a lexer (tokenizer) for your
@@ -2318,43 +2359,8 @@ <h2 id="modeapi">Writing CodeMirror Modes</h2>
     specifies the properties that should be added. This is mostly
     useful to add utilities that can later be looked
     up through <a href="#getMode"><code>getMode</code></a>.</p>
+</section>
 
-</div><div class="rightsmall blk">
-
-    <h2>Contents</h2>
-
-    <ul>
-      <li><a href="#overview">Overview</a></li>
-      <li><a href="#usage">Basic Usage</a></li>
-      <li><a href="#config">Configuration</a></li>
-      <li><a href="#events">Events</a></li>
-      <li><a href="#keymaps">Keymaps</a></li>
-      <li><a href="#styling">Customized Styling</a></li>
-      <li><a href="#api">Programming API</a>
-        <ul>
-          <li><a href="#constructor">Constructor</a></li>
-          <li><a href="#api_content">Content manipulation</a></li>
-          <li><a href="#api_selection">Selection</a></li>
-          <li><a href="#api_configuration">Configuration</a></li>
-          <li><a href="#api_doc">Document management</a></li>
-          <li><a href="#api_history">History</a></li>
-          <li><a href="#api_marker">Text-marking</a></li>
-          <li><a href="#api_decoration">Widget, gutter, and decoration</a></li>
-          <li><a href="#api_sizing">Sizing, scrolling, and positioning</a></li>
-          <li><a href="#api_mode">Mode, state, and tokens</a></li>
-          <li><a href="#api_misc">Miscellaneous methods</a></li>
-          <li><a href="#api_static">Static properties</a></li>
-        </ul>
-      </li>
-      <li><a href="#addons">Addons</a></li>
-      <li><a href="#modeapi">Writing CodeMirror Modes</a></li>
-    </ul>
-
-</div></div>
-
-<div style="height: 2em">&nbsp;</div>
+</article>
 
 <script>setTimeout(function(){CodeMirror.colorize();}, 20);</script>
-
-  </body>
-</html>
diff --git a/doc/modes.html b/doc/modes.html
deleted file mode 100644
index 82738f19e6..0000000000
--- a/doc/modes.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Mode list</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Full list of
-   modes */
-</pre>
-</div>
-
-<p>Every mode in the distribution. The list on the front-page leaves
-out some of the more obscure ones.</p>
-
-<div style="-webkit-columns: 50px 3; -moz-columns: 50px 3; columns: 50px 3;">
-    <ul>
-      <li><a href="../mode/apl/index.html">APL</a></li>
-      <li><a href="../mode/asterisk/index.html">Asterisk dialplan</a></li>
-      <li><a href="../mode/clike/index.html">C, C++, C#</a></li>
-      <li><a href="../mode/clojure/index.html">Clojure</a></li>
-      <li><a href="../mode/cobol/index.html">COBOL</a></li>
-      <li><a href="../mode/coffeescript/index.html">CoffeeScript</a></li>
-      <li><a href="../mode/commonlisp/index.html">Common Lisp</a></li>
-      <li><a href="../mode/css/index.html">CSS</a></li>
-      <li><a href="../mode/python/index.html">Cython</a></li>
-      <li><a href="../mode/d/index.html">D</a></li>
-      <li><a href="../mode/diff/index.html">diff</a></li>
-      <li><a href="../mode/ecl/index.html">ECL</a></li>
-      <li><a href="../mode/erlang/index.html">Erlang</a></li>
-      <li><a href="../mode/gas/index.html">Gas</a> (AT&amp;T-style assembly)</li>
-      <li><a href="../mode/go/index.html">Go</a></li>
-      <li><a href="../mode/groovy/index.html">Groovy</a></li>
-      <li><a href="../mode/haml/index.html">HAML</a></li>
-      <li><a href="../mode/haskell/index.html">Haskell</a></li>
-      <li><a href="../mode/haxe/index.html">Haxe</a></li>
-      <li><a href="../mode/htmlembedded/index.html">HTML embedded scripts</a></li>
-      <li><a href="../mode/htmlmixed/index.html">HTML mixed-mode</a></li>
-      <li><a href="../mode/http/index.html">HTTP</a></li>
-      <li><a href="../mode/clike/index.html">Java</a></li>
-      <li><a href="../mode/jade/index.html">Jade</a></li>
-      <li><a href="../mode/javascript/index.html">JavaScript</a></li>
-      <li><a href="../mode/jinja2/index.html">Jinja2</a></li>
-      <li><a href="../mode/less/index.html">LESS</a></li>
-      <li><a href="../mode/livescript/index.html">LiveScript</a></li>
-      <li><a href="../mode/lua/index.html">Lua</a></li>
-      <li><a href="../mode/markdown/index.html">Markdown</a> (<a href="../mode/gfm/index.html">GitHub-flavour</a>)</li>
-      <li><a href="../mode/mirc/index.html">mIRC</a></li>
-      <li><a href="../mode/nginx/index.html">Nginx</a></li>
-      <li><a href="../mode/ntriples/index.html">NTriples</a></li>
-      <li><a href="../mode/ocaml/index.html">OCaml</a></li>
-      <li><a href="../mode/pascal/index.html">Pascal</a></li>
-      <li><a href="../mode/perl/index.html">Perl</a></li>
-      <li><a href="../mode/php/index.html">PHP</a></li>
-      <li><a href="../mode/pig/index.html">Pig Latin</a></li>
-      <li><a href="../mode/properties/index.html">Properties files</a></li>
-      <li><a href="../mode/python/index.html">Python</a></li>
-      <li><a href="../mode/q/index.html">Q</a></li>
-      <li><a href="../mode/r/index.html">R</a></li>
-      <li>RPM <a href="../mode/rpm/spec/index.html">spec</a> and <a href="../mode/rpm/changes/index.html">changelog</a></li>
-      <li><a href="../mode/rst/index.html">reStructuredText</a></li>
-      <li><a href="../mode/ruby/index.html">Ruby</a></li>
-      <li><a href="../mode/rust/index.html">Rust</a></li>
-      <li><a href="../mode/sass/index.html">Sass</a></li>
-      <li><a href="../mode/clike/scala.html">Scala</a></li>
-      <li><a href="../mode/scheme/index.html">Scheme</a></li>
-      <li><a href="../mode/css/scss.html">SCSS</a></li>
-      <li><a href="../mode/shell/index.html">Shell</a></li>
-      <li><a href="../mode/sieve/index.html">Sieve</a></li>
-      <li><a href="../mode/smalltalk/index.html">Smalltalk</a></li>
-      <li><a href="../mode/smarty/index.html">Smarty</a></li>
-      <li><a href="../mode/smartymixed/index.html">Smarty/HTML mixed</a></li>
-      <li><a href="../mode/sql/index.html">SQL</a> (several dialects)</li>
-      <li><a href="../mode/sparql/index.html">SPARQL</a></li>
-      <li><a href="../mode/stex/index.html">sTeX, LaTeX</a></li>
-      <li><a href="../mode/tcl/index.html">Tcl</a></li>
-      <li><a href="../mode/tiddlywiki/index.html">Tiddlywiki</a></li>
-      <li><a href="../mode/tiki/index.html">Tiki wiki</a></li>
-      <li><a href="../mode/turtle/index.html">Turtle</a></li>
-      <li><a href="../mode/vb/index.html">VB.NET</a></li>
-      <li><a href="../mode/vbscript/index.html">VBScript</a></li>
-      <li><a href="../mode/velocity/index.html">Velocity</a></li>
-      <li><a href="../mode/verilog/index.html">Verilog</a></li>
-      <li><a href="../mode/xml/index.html">XML/HTML</a></li>
-      <li><a href="../mode/xquery/index.html">XQuery</a></li>
-      <li><a href="../mode/yaml/index.html">YAML</a></li>
-      <li><a href="../mode/z80/index.html">Z80</a></li>
-    </ul>
-  </div>
-
-  </body>
-</html>
diff --git a/doc/realworld.html b/doc/realworld.html
index 36c95b3ea0..9b6d7386fb 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -1,23 +1,26 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Real-world uses</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-  </head>
-  <body>
 
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
+<title>CodeMirror: Real-world Uses</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="docs.css">
 
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Real world uses,
-   full list */
-</pre>
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Real-world uses</a>
+  </ul>
 </div>
 
+<article>
+
+<h2>CodeMirror real-world uses</h2>
+
     <p><a href="mailto:marijnh@gmail.com">Contact me</a> if you'd like
     your project to be added to this list.</p>
 
@@ -117,5 +120,5 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <li><a href="http://q42jaap.github.io/xsd2codemirror/">xsd2codemirror</a> (convert XSD to CM XML completion info)</li>
     </ul>
 
-  </body>
-</html>
+</article>
+
diff --git a/doc/oldrelease.html b/doc/releases.html
similarity index 70%
rename from doc/oldrelease.html
rename to doc/releases.html
index c72dc8f61a..93650b8fe0 100644
--- a/doc/oldrelease.html
+++ b/doc/releases.html
@@ -1,24 +1,196 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-    <link rel="alternate" href="http://twitter.com/statuses/user_timeline/242283288.rss" type="application/rss+xml"/>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Old release
-   history */
-</pre>
+
+<title>CodeMirror: Release History</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="docs.css">
+<script src="activebookmark.js"></script>
+
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active data-default="true" href="#v3">Version 3.x</a>
+    <li><a href="#v2">Version 2.x</a>
+    <li><a href="#v1">Version 0.x</a>
+  </ul>
 </div>
 
+<article>
+
+<h2>Release notes and version history</h2>
+
+<section id=v3 class=first>
+
+  <h2>Version 3.x</h2>
+
+  <p class="rel">29-07-2013: <a href="http://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="../mode/jade/index.html">Jade</a>, <a href="../mode/nginx/index.html">Nginx</a>.</li>
+    <li>New addons: <a href="../demo/tern.html">Tern</a>, <a href="manual.html#addon_matchtags">matchtags</a>, and <a href="manual.html#addon_foldgutter">foldgutter</a>.</li>
+    <li>Introduced <a href="manual.html#getHelper"><em>helper</em></a> concept (<a href="https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ">context</a>).</li>
+    <li>New method: <a href="manual.html#getModeAt"><code>getModeAt</code></a>.</li>
+    <li>New themes: base16 <a href="../demo/theme.html?base16-dark">dark</a>/<a href="../demo/theme.html?base16-light">light</a>, 3024 <a href="../demo/theme.html?3024-night">dark</a>/<a href="../demo/theme.html?3024-day">light</a>, <a href="../demo/theme.html?tomorrow-night-eighties">tomorrow-night</a>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
+  </ul>
+
+  <p class="rel">20-06-2013: <a href="http://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
+
+  <ul class="rel-note">
+    <li>New
+    addons: <a href="manual.html#addon_trailingspace">trailing
+    space highlight</a>, <a href="manual.html#addon_xml-hint">XML
+    completion</a> (rewritten),
+    and <a href="manual.html#addon_merge">diff merging</a>.</li>
+    <li><a href="manual.html#markText"><code>markText</code></a>
+    and <a href="manual.html#addLineWidget"><code>addLineWidget</code></a>
+    now take a <code>handleMouseEvents</code> option.</li>
+    <li>New methods: <a href="manual.html#lineAtHeight"><code>lineAtHeight</code></a>,
+    <a href="manual.html#getTokenTypeAt"><code>getTokenTypeAt</code></a>.</li>
+    <li>More precise cleanness-tracking
+    using <a href="manual.html#changeGeneration"><code>changeGeneration</code></a>
+    and <a href="manual.html#isClean"><code>isClean</code></a>.</li>
+    <li>Many extensions to <a href="../demo/emacs.html">Emacs</a> mode
+    (prefixes, more navigation units, and more).</li>
+    <li>New
+    events <a href="manual.html#event_keyHandled"><code>"keyHandled"</code></a>
+    and <a href="manual.html#event_inputRead"><code>"inputRead"</code></a>.</li>
+    <li>Various improvements to <a href="../mode/ruby/index.html">Ruby</a>,
+    <a href="../mode/smarty/index.html">Smarty</a>, <a href="../mode/sql/index.html">SQL</a>,
+    and <a href="../demo/vim.html">Vim</a> modes.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.13.0...3.14.0">list of patches</a>.</li>
+  </ul>
+
+  <p class="rel">20-05-2013: <a href="http://codemirror.net/codemirror-3.13.zip">Version 3.13</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="../mode/cobol/index.html">COBOL</a> and <a href="../mode/haml/index.html">HAML</a>.</li>
+    <li>New options: <a href="manual.html#option_cursorScrollMargin"><code>cursorScrollMargin</code></a> and <a href="manual.html#option_coverGutterNextToScrollbar"><code>coverGutterNextToScrollbar</code></a>.</li>
+    <li>New addon: <a href="manual.html#addon_comment">commenting</a>.</li>
+    <li>More features added to the <a href="../demo/vim.html">Vim keymap</a>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.12...3.13.0">list of patches</a>.</li>
+  </ul>
+
+  <p class="rel">19-04-2013: <a href="http://codemirror.net/codemirror-3.12.zip">Version 3.12</a>:</p>
+
+  <ul class="rel-note">
+    <li>New mode: <a href="../mode/gas/index.html">GNU assembler</a>.</li>
+    <li>New
+    options: <a href="manual.html#option_maxHighlightLength"><code>maxHighlightLength</code></a>
+    and <a href="manual.html#option_historyEventDelay"><code>historyEventDelay</code></a>.</li>
+    <li>Added <a href="manual.html#mark_addToHistory"><code>addToHistory</code></a>
+    option for <code>markText</code>.</li>
+    <li>Various fixes to JavaScript tokenization and indentation corner cases.</li>
+    <li>Further improvements to the vim mode.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.11...v3.12">list of patches</a>.</li>
+  </ul>
+
+  <p class="rel">20-03-2013: <a href="http://codemirror.net/codemirror-3.11.zip">Version 3.11</a>:</p>
+
+  <ul class="rel-note">
+    <li><strong>Removed code:</strong> <code>collapserange</code>,
+    <code>formatting</code>, and <code>simple-hint</code>
+    addons. <code>plsql</code> and <code>mysql</code> modes
+    (use <a href="../mode/sql/index.html"><code>sql</code></a> mode).</li>
+    <li><strong>Moved code:</strong> the range-finding functions for folding now have <a href="../addon/fold/">their own files</a>.</li>
+    <li><strong>Changed interface:</strong>
+    the <a href="manual.html#addon_continuecomment"><code>continuecomment</code></a>
+    addon now exposes an option, rather than a command.</li>
+    <li>New
+    modes: <a href="../mode/css/scss.html">SCSS</a>, <a href="../mode/tcl/index.html">Tcl</a>, <a href="../mode/livescript/index.html">LiveScript</a>,
+    and <a href="../mode/mirc/index.html">mIRC</a>.</li>
+    <li>New addons: <a href="../demo/placeholder.html"><code>placeholder</code></a>, <a href="../demo/html5complete.html">HTML completion</a>.</li>
+    <li>New
+    methods: <a href="manual.html#hasFocus"><code>hasFocus</code></a>, <a href="manual.html#defaultCharWidth"><code>defaultCharWidth</code></a>.</li>
+    <li>New events: <a href="manual.html#event_beforeCursorEnter"><code>beforeCursorEnter</code></a>, <a href="manual.html#event_renderLine"><code>renderLine</code></a>.</li>
+    <li>Many improvements to the <a href="manual.html#addon_show-hint"><code>show-hint</code></a> completion
+    dialog addon.</li>
+    <li>Tweak behavior of by-word cursor motion.</li>
+    <li>Further improvements to the <a href="../demo/vim.html">vim mode</a>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.1...v3.11">list of patches</a>.</li>
+  </ul>
+
+  <p class="rel">21-02-2013: <a href="http://codemirror.net/codemirror-3.1.zip">Version 3.1</a>:</p>
+
+  <ul class="rel-note">
+    <li><strong>Incompatible:</strong> key handlers may
+    now <em>return</em>, rather
+    than <em>throw</em> <code>CodeMirror.Pass</code> to signal they
+    didn't handle the key.</li>
+    <li>Make documents a <a href="manual.html#api_doc">first-class
+    construct</a>, support split views and subviews.</li>
+    <li>Add a <a href="manual.html#addon_show-hint">new module</a>
+    for showing completion hints.
+    Deprecate <code>simple-hint.js</code>.</li>
+    <li>Extend <a href="../mode/htmlmixed/index.html">htmlmixed mode</a>
+    to allow custom handling of script types.</li>
+    <li>Support an <code>insertLeft</code> option
+    to <a href="manual.html#setBookmark"><code>setBookmark</code></a>.</li>
+    <li>Add an <a href="manual.html#eachLine"><code>eachLine</code></a>
+    method to iterate over a document.</li>
+    <li>New addon modules: <a href="../demo/markselection.html">selection
+    marking</a>, <a href="../demo/lint.html">linting</a>,
+    and <a href="../demo/closebrackets.html">automatic bracket
+    closing</a>.</li>
+    <li>Add <a href="manual.html#event_beforeChange"><code>"beforeChange"</code></a>
+    and <a href="manual.html#event_beforeSelectionChange"><code>"beforeSelectionChange"</code></a>
+    events.</li>
+    <li>Add <a href="manual.html#event_hide"><code>"hide"</code></a>
+    and <a href="manual.html#event_unhide"><code>"unhide"</code></a>
+    events to marked ranges.</li>
+    <li>Fix <a href="manual.html#coordsChar"><code>coordsChar</code></a>'s
+    interpretation of its argument to match the documentation.</li>
+    <li>New modes: <a href="../mode/turtle/index.html">Turtle</a>
+    and <a href="../mode/q/index.html">Q</a>.</li>
+    <li>Further improvements to the <a href="../demo/vim.html">vim mode</a>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.01...v3.1">list of patches</a>.</li>
+  </ul>
+  
+
+  <p class="rel">25-01-2013: <a href="http://codemirror.net/codemirror-3.02.zip">Version 3.02</a>:</p>
+
+  <p class="rel-note">Single-bugfix release. Fixes a problem that
+  prevents CodeMirror instances from being garbage-collected after
+  they become unused.</p>
+
+  <p class="rel">21-01-2013: <a href="http://codemirror.net/codemirror-3.01.zip">Version 3.01</a>:</p>
+
+  <ul class="rel-note">
+    <li>Move all add-ons into an organized directory structure
+    under <a href="../addon/"><code>/addon</code></a>. <strong>You might have to adjust your
+    paths.</strong></li>
+    <li>New
+    modes: <a href="../mode/d/index.html">D</a>, <a href="../mode/sass/index.html">Sass</a>, <a href="../mode/apl/index.html">APL</a>, <a href="../mode/sql/index.html">SQL</a>
+    (configurable), and <a href="../mode/asterisk/index.html">Asterisk</a>.</li>
+    <li>Several bugfixes in right-to-left text support.</li>
+    <li>Add <a href="manual.html#option_rtlMoveVisually"><code>rtlMoveVisually</code></a> option.</li>
+    <li>Improvements to vim keymap.</li>
+    <li>Add built-in (lightweight) <a href="manual.html#addOverlay">overlay mode</a> support.</li>
+    <li>Support <code>showIfHidden</code> option for <a href="manual.html#addLineWidget">line widgets</a>.</li>
+    <li>Add simple <a href="manual.html#addon_python-hint">Python hinter</a>.</li>
+    <li>Bring back the <a href="manual.html#option_fixedGutter"><code>fixedGutter</code></a> option.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0...v3.01">list of patches</a>.</li>
+  </ul>
+
+  <p class="rel">10-12-2012: <a href="http://codemirror.net/codemirror-3.0.zip">Version 3.0</a>:</p>
+
+  <p class="rel-note"><strong>New major version</strong>. Only
+  partially backwards-compatible. See
+  the <a href="upgrade_v3.html">upgrading guide</a> for more
+  information. Changes since release candidate 2:</p>
+
+  <ul class="rel-note">
+    <li>Rewritten VIM mode.</li>
+    <li>Fix a few minor scrolling and sizing issues.</li>
+    <li>Work around Safari segfault when dragging.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
+  </ul>
+  
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
 
   <ul class="rel-note">
@@ -31,20 +203,6 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
-
-  <ul class="rel-note">
-    <li>New mode: <a href="../mode/z80/index.html">Z80 assembly</a>.</li>
-    <li>New theme: <a href="../demo/theme.html?twilight">Twilight</a>.</li>
-    <li>Add command-line compression helper.</li>
-    <li>Make <a href="manual.html#scrollIntoView"><code>scrollIntoView</code></a> public.</li>
-    <li>Add <a href="manual.html#defaultTextHeight"><code>defaultTextHeight</code></a> method.</li>
-    <li>Various extensions to the vim keymap.</li>
-    <li>Make <a href="../mode/php/index.html">PHP mode</a> build on <a href="../mode/htmlmixed/index.html">mixed HTML mode</a>.</li>
-    <li>Add <a href="manual.html#addon_continuecomment">comment-continuing</a> add-on.</li>
-    <li>Full <a href="../https://github.com/marijnh/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
-  </ul>
-
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
 
   <ul class="rel-note">
@@ -62,17 +220,6 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0beta2...v3.0rc1">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-2.35.zip">Version 2.35</a>:</p>
-
-  <ul class="rel-note">
-    <li>New (sub) mode: <a href="../mode/javascript/typescript.html">TypeScript</a>.</li>
-    <li>Don't overwrite (insert key) when pasting.</li>
-    <li>Fix several bugs in <a href="manual.html#markText"><code>markText</code></a>/undo interaction.</li>
-    <li>Better indentation of JavaScript code without semicolons.</li>
-    <li>Add <a href="manual.html#defineInitHook"><code>defineInitHook</code></a> function.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
-  </ul>
-
   <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-3.0beta2.zip">Version 3.0, beta 2</a>:</p>
 
   <ul class="rel-note">
@@ -89,6 +236,63 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0beta1...v3.0beta2">list of patches</a>.</li>
   </ul>
 
+  <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
+
+  <ul class="rel-note">
+    <li>Bi-directional text support.</li>
+    <li>More powerful gutter model.</li>
+    <li>Support for arbitrary text/widget height.</li>
+    <li>In-line widgets.</li>
+    <li>Generalized event handling.</li>
+  </ul>
+
+</section>
+
+<section id=v2>
+
+  <h2>Version 2.x</h2>
+
+  <p class="rel">21-01-2013: <a href="http://codemirror.net/codemirror-2.38.zip">Version 2.38</a>:</p>
+
+  <p class="rel-note">Integrate some bugfixes, enhancements to the vim keymap, and new
+  modes
+  (<a href="../mode/d/index.html">D</a>, <a href="../mode/sass/index.html">Sass</a>, <a href="../mode/apl/index.html">APL</a>)
+  from the v3 branch.</p>
+
+  <p class="rel">20-12-2012: <a href="http://codemirror.net/codemirror-2.37.zip">Version 2.37</a>:</p>
+
+  <ul class="rel-note">
+    <li>New mode: <a href="../mode/sql/index.html">SQL</a> (will replace <a href="../mode/plsql/index.html">plsql</a> and <a href="../mode/mysql/index.html">mysql</a> modes).</li>
+    <li>Further work on the new VIM mode.</li>
+    <li>Fix Cmd/Ctrl keys on recent Operas on OS X.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.36...v2.37">list of patches</a>.</li>
+  </ul>
+
+  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
+
+  <ul class="rel-note">
+    <li>New mode: <a href="../mode/z80/index.html">Z80 assembly</a>.</li>
+    <li>New theme: <a href="../demo/theme.html?twilight">Twilight</a>.</li>
+    <li>Add command-line compression helper.</li>
+    <li>Make <a href="manual.html#scrollIntoView"><code>scrollIntoView</code></a> public.</li>
+    <li>Add <a href="manual.html#defaultTextHeight"><code>defaultTextHeight</code></a> method.</li>
+    <li>Various extensions to the vim keymap.</li>
+    <li>Make <a href="../mode/php/index.html">PHP mode</a> build on <a href="../mode/htmlmixed/index.html">mixed HTML mode</a>.</li>
+    <li>Add <a href="manual.html#addon_continuecomment">comment-continuing</a> add-on.</li>
+    <li>Full <a href="../https://github.com/marijnh/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
+  </ul>
+
+  <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-2.35.zip">Version 2.35</a>:</p>
+
+  <ul class="rel-note">
+    <li>New (sub) mode: <a href="../mode/javascript/typescript.html">TypeScript</a>.</li>
+    <li>Don't overwrite (insert key) when pasting.</li>
+    <li>Fix several bugs in <a href="manual.html#markText"><code>markText</code></a>/undo interaction.</li>
+    <li>Better indentation of JavaScript code without semicolons.</li>
+    <li>Add <a href="manual.html#defineInitHook"><code>defineInitHook</code></a> function.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-2.34.zip">Version 2.34</a>:</p>
 
   <ul class="rel-note">
@@ -102,16 +306,6 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
     <li><a href="https://github.com/marijnh/CodeMirror/compare/v2.33...v2.34">Full list</a> of patches.</li>
   </ul>
 
-  <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
-
-  <ul class="rel-note">
-    <li>Bi-directional text support.</li>
-    <li>More powerful gutter model.</li>
-    <li>Support for arbitrary text/widget height.</li>
-    <li>In-line widgets.</li>
-    <li>Generalized event handling.</li>
-  </ul>
-
   <p class="rel">23-08-2012: <a href="http://codemirror.net/codemirror-2.33.zip">Version 2.33</a>:</p>
 
   <ul class="rel-note">
@@ -391,13 +585,6 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
   and <a href="http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580">this</a>
   for more information.</p>
 
-  <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-1.0.zip">Version 1.0</a>:</p>
-  <ul class="rel-note">
-    <li>Fix error when debug history overflows.</li>
-    <li>Refine handling of C# verbatim strings.</li>
-    <li>Fix some issues with JavaScript indentation.</li>
-  </ul>
-
   <p class="rel">22-02-2011: <a href="https://github.com/marijnh/codemirror/tree/beta2">Version 2.0 beta 2</a>:</p>
   <p class="rel-note">Somewhat more mature API, lots of bugs shaken out.</p>
 
@@ -422,6 +609,18 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
     <li>Support use of CSS classes for highlighting brackets.</li>
     <li>Fix yet another hang with line-numbering in hidden editors.</li>
   </ul>
+</section>
+
+<section id=v1>
+
+  <h2>Version 0.x</h2>
+
+  <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-1.0.zip">Version 1.0</a>:</p>
+  <ul class="rel-note">
+    <li>Fix error when debug history overflows.</li>
+    <li>Refine handling of C# verbatim strings.</li>
+    <li>Fix some issues with JavaScript indentation.</li>
+  </ul>
 
   <p class="rel">17-12-2010: <a href="http://codemirror.net/codemirror-0.92.zip">Version 0.92</a>:</p>
   <ul class="rel-note">
@@ -527,20 +726,17 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
   parser. And, as usual, add workarounds for various newly discovered
   browser incompatibilities.</p>
 
-<p class="rel"><em>31-08-2009</em>: <a
-href="http://codemirror.net/codemirror-0.63.zip">Version
-0.63</a>:</p>
-<p class="rel-note"> Overhaul of paste-handling (less fragile), fixes for several
-serious IE8 issues (cursor jumping, end-of-document bugs) and a number
-of small problems.</p>
-
-<p class="rel"><em>30-05-2009</em>: <a
-href="http://codemirror.net/codemirror-0.62.zip">Version
-0.62</a>:</p>
-<p class="rel-note">Introduces <a href="contrib/python/index.html">Python</a>
-and <a href="contrib/lua/index.html">Lua</a> parsers. Add
-<code>setParser</code> (on-the-fly mode changing) and
-<code>clearHistory</code> methods. Make parsing passes time-based
-instead of lines-based (see the <code>passTime</code> option).</p>
-
-</body></html>
+  <p class="rel"><em>31-08-2009</em>: <a href="http://codemirror.net/codemirror-0.63.zip">Version 0.63</a>:</p>
+  <p class="rel-note"> Overhaul of paste-handling (less fragile), fixes for several
+  serious IE8 issues (cursor jumping, end-of-document bugs) and a number
+  of small problems.</p>
+
+  <p class="rel"><em>30-05-2009</em>: <a href="http://codemirror.net/codemirror-0.62.zip">Version 0.62</a>:</p>
+  <p class="rel-note">Introduces <a href="contrib/python/index.html">Python</a>
+  and <a href="contrib/lua/index.html">Lua</a> parsers. Add
+  <code>setParser</code> (on-the-fly mode changing) and
+  <code>clearHistory</code> methods. Make parsing passes time-based
+  instead of lines-based (see the <code>passTime</code> option).</p>
+
+</section>
+</article>
diff --git a/doc/reporting.html b/doc/reporting.html
index a616512530..47e37a5541 100644
--- a/doc/reporting.html
+++ b/doc/reporting.html
@@ -1,24 +1,26 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Reporting Bugs</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-    <style>li { margin-top: 1em; }</style>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Reporting bugs
-   effectively */
-</pre>
+
+<title>CodeMirror: Reporting Bugs</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="docs.css">
+
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Reporting bugs</a>
+  </ul>
 </div>
 
+<article>
+
+<h2>Reporting bugs effectively</h2>
+
 <div class="left">
 
 <p>So you found a problem in CodeMirror. By all means, report it! Bug
@@ -56,5 +58,4 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 
 </div>
 
-  </body>
-</html>
+</article>
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
index 7e4d840043..a2dddef760 100644
--- a/doc/upgrade_v2.2.html
+++ b/doc/upgrade_v2.2.html
@@ -1,36 +1,37 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Upgrading to v2.2</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Upgrading to
-   v2.2 */
-</pre>
+
+<title>CodeMirror: Version 2.2 upgrade guide</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="docs.css">
+
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">2.2 upgrade guide</a>
+  </ul>
 </div>
 
-<div class="left">
+<article>
+
+<h2>Upgrading to v2.2</h2>
 
 <p>There are a few things in the 2.2 release that require some care
 when upgrading.</p>
 
-<h2>No more default.css</h2>
+<h3>No more default.css</h3>
 
 <p>The default theme is now included
 in <a href="../lib/codemirror.css"><code>codemirror.css</code></a>, so
 you do not have to included it separately anymore. (It was tiny, so
 even if you're not using it, the extra data overhead is negligible.)
 
-<h2>Different key customization</h2>
+<h3>Different key customization</h3>
 
 <p>CodeMirror has moved to a system
 where <a href="manual.html#option_keyMap">keymaps</a> are used to
@@ -81,7 +82,7 @@ <h2>Different key customization</h2>
 behaviors. Or you can write your own handler function to do something
 different altogether.</p>
 
-<h2>Tabs</h2>
+<h3>Tabs</h3>
 
 <p>Handling of tabs changed completely. The display width of tabs can
 now be set with the <code>tabSize</code> option, and tabs can
@@ -92,7 +93,4 @@ <h2>Tabs</h2>
 hard-wired into browsers. If you are relying on 8-space tabs, make
 sure you explicitly set <code>tabSize: 8</code> in your options.</p>
 
-</div>
-
-  </body>
-</html>
+</article>
diff --git a/doc/upgrade_v3.html b/doc/upgrade_v3.html
index 7e8a6b61ae..19757924c1 100644
--- a/doc/upgrade_v3.html
+++ b/doc/upgrade_v3.html
@@ -1,32 +1,44 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Upgrading to v3</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-    <script src="../lib/codemirror.js"></script>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../addon/runmode/runmode.js"></script>
-    <script src="../addon/runmode/colorize.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../mode/css/css.js"></script>
-    <script src="../mode/htmlmixed/htmlmixed.js"></script>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Upgrading to
-   version 3 */
-</pre>
+
+<title>CodeMirror: Version 3 upgrade guide</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="docs.css">
+<script src="../lib/codemirror.js"></script>
+<link rel="stylesheet" href="../lib/codemirror.css">
+<script src="../addon/runmode/runmode.js"></script>
+<script src="../addon/runmode/colorize.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<script src="../mode/css/css.js"></script>
+<script src="../mode/htmlmixed/htmlmixed.js"></script>
+<script src="activebookmark.js"></script>
+
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#upgrade">Upgrade guide</a>
+    <li><a href="#dom">DOM structure</a></li>
+    <li><a href="#gutters">Gutter model</a></li>
+    <li><a href="#events">Event handling</a></li>
+    <li><a href="#marktext">markText method arguments</a></li>
+    <li><a href="#folding">Line folding</a></li>
+    <li><a href="#lineclass">Line CSS classes</a></li>
+    <li><a href="#positions">Position properties</a></li>
+    <li><a href="#matchbrackets">Bracket matching</a></li>
+    <li><a href="#modes">Mode management</a></li>
+    <li><a href="#new">New features</a></li>
+  </ul>
 </div>
 
-<div class="clear"><div class="leftbig blk">
+<article>
+
+<h2 id=upgrade>Upgrading to version 3</h2>
 
 <p>Version 3 does not depart too much from 2.x API, and sites that use
 CodeMirror in a very simple way might be able to upgrade without
@@ -37,7 +49,8 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 Explorer 7</strong>. The editor will mostly work on that browser, but
 it'll be significantly glitchy.</p>
 
-<h2 id=dom>DOM structure</h2>
+<section id=dom>
+  <h2>DOM structure</h2>
 
 <p>This one is the most likely to cause problems. The internal
 structure of the editor has changed quite a lot, mostly to implement a
@@ -53,8 +66,9 @@ <h2 id=dom>DOM structure</h2>
 
 <p>See the <a href="manual.html#styling">styling section</a> of the
 manual for more information.</p>
-
-<h2 id=gutters>Gutter model</h2>
+</section>
+<section id=gutters>
+  <h2>Gutter model</h2>
 
 <p>In CodeMirror 2.x, there was a single gutter, and line markers
 created with <code>setMarker</code> would have to somehow coexist with
@@ -87,8 +101,9 @@ <h2 id=gutters>Gutter model</h2>
   cm.setGutterMarker(0, "note-gutter", document.createTextNode("hi"));
 &lt;/script>
 </pre>
-
-<h2 id=events>Event handling</h2>
+</section>
+<section id=events>
+  <h2>Event handling</h2>
 
 <p>Most of the <code>onXYZ</code> options have been removed. The same
 effect is now obtained by calling
@@ -107,8 +122,9 @@ <h2 id=events>Event handling</h2>
   console.log("something changed! (" + change.origin + ")");
 });
 </pre>
-
-<h2 id=marktext>markText method arguments</h2>
+</section>
+<section id=marktext>
+  <h2>markText method arguments</h2>
 
 <p>The <a href="manual.html#markText"><code>markText</code></a> method
 (which has gained some interesting new features, such as creating
@@ -124,8 +140,9 @@ <h2 id=marktext>markText method arguments</h2>
   atomic: true
 });
 </pre>
-
-<h2 id=folding>Line folding</h2>
+</section>
+<section id=folding>
+  <h2>Line folding</h2>
 
 <p>The interface for hiding lines has been
 removed. <a href="manual.html#markText"><code>markText</code></a> can
@@ -146,8 +163,9 @@ <h2 id=folding>Line folding</h2>
   console.log("boom");
 });
 </pre>
-
-<h2 id=lineclass>Line CSS classes</h2>
+</section>
+<section id=lineclass>
+  <h2>Line CSS classes</h2>
 
 <p>The <code>setLineClass</code> method has been replaced
 by <a href="manual.html#addLineClass"><code>addLineClass</code></a>
@@ -160,8 +178,9 @@ <h2 id=lineclass>Line CSS classes</h2>
   cm.removeLineClass(marked, "background", "highlighted-line");
 });
 </pre>
-
-<h2 id=positions>Position properties</h2>
+</section>
+<section id=positions>
+  <h2>Position properties</h2>
 
 <p>All methods that take or return objects that represent screen
 positions now use <code>{left, top, bottom, right}</code> properties
@@ -171,14 +190,16 @@ <h2 id=positions>Position properties</h2>
 <p>Affected methods
 are <a href="manual.html#cursorCoords"><code>cursorCoords</code></a>, <a href="manual.html#charCoords"><code>charCoords</code></a>, <a href="manual.html#coordsChar"><code>coordsChar</code></a>,
 and <a href="manual.html#getScrollInfo"><code>getScrollInfo</code></a>.</p>
-
-<h2 id=matchbrackets>Bracket matching no longer in core</h2>
+</section>
+<section id=matchbrackets>
+  <h2>Bracket matching no longer in core</h2>
 
 <p>The <a href="manual.html#addon_matchbrackets"><code>matchBrackets</code></a>
 option is no longer defined in the core editor.
 Load <code>addon/edit/matchbrackets.js</code> to enable it.</p>
-
-<h2 id=modes>Mode management</h2>
+</section>
+<section id=modes>
+  <h2>Mode management</h2>
 
 <p>The <code>CodeMirror.listModes</code>
 and <code>CodeMirror.listMIMEs</code> functions, used for listing
@@ -186,8 +207,9 @@ <h2 id=modes>Mode management</h2>
 inspect <code>CodeMirror.modes</code> (mapping mode names to mode
 constructors) and <code>CodeMirror.mimeModes</code> (mapping MIME
 strings to mode specs).</p>
-
-<h2 id=new>New features</h2>
+</section>
+<section id=new>
+  <h2>New features</h2>
 
 <p>Some more reasons to upgrade to version 3.</p>
 
@@ -202,26 +224,7 @@ <h2 id=new>New features</h2>
   <li>Defining custom options
   with <a href="manual.html#defineOption"><code>CodeMirror.defineOption</code></a>.</li>
 </ul>
-
-</div><div class="rightsmall blk">
-
-<h2>Contents</h2>
-
-<ul>
-  <li><a href="#dom">DOM structure</a></li>
-  <li><a href="#gutters">Gutter model</a></li>
-  <li><a href="#events">Event handling</a></li>
-  <li><a href="#folding">Line folding</a></li>
-  <li><a href="#marktext">markText method arguments</a></li>
-  <li><a href="#lineclass">Line CSS classes</a></li>
-  <li><a href="#positions">Position properties</a></li>
-  <li><a href="#matchbrackets">Bracket matching</a></li>
-  <li><a href="#modes">Mode management</a></li>
-  <li><a href="#new">New features</a></li>
-</ul>
-
-</div></div>
+</section>
+</article>
 
 <script>setTimeout(function(){CodeMirror.colorize();}, 20);</script>
-  </body>
-</html>
diff --git a/index.html b/index.html
index 2f2ba05096..3bd665e871 100644
--- a/index.html
+++ b/index.html
@@ -1,480 +1,186 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="doc/docs.css"/>
-    <link rel="alternate" href="https://groups.google.com/group/codemirror-announce/feed/atom_v1_0_topics.xml" type="application/atom+xml"/>
-  </head>
-  <body>
 
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
+<title>CodeMirror</title>
+<meta charset="utf-8"/>
 
-<div class="grey">
-<img src="doc/baboon.png" class="logo" alt="logo"/>
-<pre>
-/* In-browser code editing
-   made bearable */
-</pre>
-</div>
-
-<div class="clear"><div class="left blk">
-
-  <p style="margin-top: 0">CodeMirror is a JavaScript component that
-  provides a code editor in the browser. When a mode is available for
-  the language you are coding in, it will color your code, and
-  optionally help with indentation.</p>
-
-  <p>A <a href="doc/manual.html">rich programming API</a> and a CSS
-  theming system are available for customizing CodeMirror to fit your
-  application, and extending it with new functionality.</p>
-
-  <div class="clear"><div class="left1 blk">
-
-    <h2 style="margin-top: 0">Supported modes:</h2>
-
-    <ul>
-      <li><a href="mode/clike/index.html">C, C++, C#</a></li>
-      <li><a href="mode/clojure/index.html">Clojure</a></li>
-      <li><a href="mode/coffeescript/index.html">CoffeeScript</a></li>
-      <li><a href="mode/commonlisp/index.html">Common Lisp</a></li>
-      <li><a href="mode/css/index.html">CSS</a></li>
-      <li><a href="mode/python/index.html">Cython</a></li>
-      <li><a href="mode/d/index.html">D</a></li>
-      <li><a href="mode/diff/index.html">diff</a></li>
-      <li><a href="mode/ecl/index.html">ECL</a></li>
-      <li><a href="mode/erlang/index.html">Erlang</a></li>
-      <li><a href="mode/go/index.html">Go</a></li>
-      <li><a href="mode/groovy/index.html">Groovy</a></li>
-      <li><a href="mode/haskell/index.html">Haskell</a></li>
-      <li><a href="mode/haxe/index.html">Haxe</a></li>
-      <li><a href="mode/htmlmixed/index.html">HTML mixed-mode</a></li>
-      <li><a href="mode/http/index.html">HTTP</a></li>
-      <li><a href="mode/clike/index.html">Java</a></li>
-      <li><a href="mode/javascript/index.html">JavaScript</a></li>
-      <li><a href="mode/less/index.html">LESS</a></li>
-      <li><a href="mode/lua/index.html">Lua</a></li>
-      <li><a href="mode/markdown/index.html">Markdown</a> (<a href="mode/gfm/index.html">GitHub-flavour</a>)</li>
-      <li><a href="mode/ntriples/index.html">NTriples</a></li>
-      <li><a href="mode/ocaml/index.html">OCaml</a></li>
-      <li><a href="mode/pascal/index.html">Pascal</a></li>
-      <li><a href="mode/perl/index.html">Perl</a></li>
-      <li><a href="mode/php/index.html">PHP</a></li>
-      <li><a href="mode/properties/index.html">Properties files</a></li>
-      <li><a href="mode/python/index.html">Python</a></li>
-      <li><a href="mode/r/index.html">R</a></li>
-      <li><a href="mode/rst/index.html">reStructuredText</a></li>
-      <li><a href="mode/ruby/index.html">Ruby</a></li>
-      <li><a href="mode/rust/index.html">Rust</a></li>
-      <li><a href="mode/sass/index.html">Sass</a></li>
-      <li><a href="mode/clike/scala.html">Scala</a></li>
-      <li><a href="mode/scheme/index.html">Scheme</a></li>
-      <li><a href="mode/shell/index.html">Shell</a></li>
-      <li><a href="mode/smalltalk/index.html">Smalltalk</a></li>
-      <li><a href="mode/smarty/index.html">Smarty</a></li>
-      <li><a href="mode/sql/index.html">SQL</a> (several dialects)</li>
-      <li><a href="mode/sparql/index.html">SPARQL</a></li>
-      <li><a href="mode/stex/index.html">sTeX, LaTeX</a></li>
-      <li><a href="mode/tcl/index.html">Tcl</a></li>
-      <li><a href="mode/vb/index.html">VB.NET</a></li>
-      <li><a href="mode/vbscript/index.html">VBScript</a></li>
-      <li><a href="mode/velocity/index.html">Velocity</a></li>
-      <li><a href="mode/xml/index.html">XML/HTML</a></li>
-      <li><a href="mode/xquery/index.html">XQuery</a></li>
-      <li><a href="mode/yaml/index.html">YAML</a></li>
-      <li><a href="mode/z80/index.html">Z80</a></li>
-      <li><a href="doc/modes.html">Full list...</a></li>
-    </ul>
-
-  </div><div class="left2 blk">
-
-    <h2 style="margin-top: 0">Usage demos:</h2>
-
-    <ul>
-      <li><a href="demo/complete.html">Autocompletion</a> (<a href="demo/xmlcomplete.html">XML</a>)</li>
-      <li><a href="demo/search.html">Search/replace</a></li>
-      <li><a href="demo/folding.html">Code folding</a></li>
-      <li><a href="demo/bidi.html">Bi-directional text</a></li>
-      <li><a href="demo/widget.html">Line widgets</a> (via JSHint)</li>
-      <li><a href="demo/buffers.html">Split view</a></li>
-      <li><a href="demo/mustache.html">Mode overlays</a></li>
-      <li><a href="demo/multiplex.html">Mode multiplexer</a></li>
-      <li><a href="demo/preview.html">HTML editor with preview</a></li>
-      <li><a href="demo/resize.html">Auto-resizing editor</a></li>
-      <li><a href="demo/marker.html">Setting breakpoints</a></li>
-      <li><a href="demo/activeline.html">Highlighting the current line</a></li>
-      <li><a href="demo/matchhighlighter.html">Highlighting selection matches</a></li>
-      <li><a href="demo/theme.html">Theming</a></li>
-      <li><a href="demo/variableheight.html">Mixed font sizes</a></li>
-      <li><a href="demo/runmode.html">Stand-alone highlighting</a></li>
-      <li><a href="demo/fullscreen.html">Full-screen editing</a></li>
-      <li><a href="demo/changemode.html">Mode auto-changing</a></li>
-      <li><a href="demo/visibletabs.html">Visible tabs</a></li>
-      <li><a href="demo/emacs.html">Emacs keybindings</a></li>
-      <li><a href="demo/vim.html">Vim keybindings</a></li>
-      <li><a href="demo/closetag.html">Automatic xml tag closing</a></li>
-      <li><a href="demo/loadmode.html">Lazy mode loading</a></li>
-      <li><a href="demo/btree.html">Document tree visualization</a></li>
-    </ul>
-
-    <h2>Real-world uses:</h2>
-
-    <ul>
-      <li><a href="http://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light Table</a></li>
-      <li><a href="http://brackets.io">Adobe Brackets</a></li>
-      <li><a href="https://www.webkit.org/blog/2518/state-of-web-inspector/#source-code">WebKit Web inspector</a></li>
-      <li><a href="http://jsbin.com">jsbin.com</a></li>
-      <li><a href="http://jsfiddle.net">jsfiddle.net</a></li>
-      <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a></li>
-      <li><a href="https://script.google.com/">Google Apps Script</a></li>
-      <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a></li>
-      <li><a href="http://emmet.io">Emmet</a></li>
-      <li><a href="http://prose.io/">Prose.io</a></li>
-      <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a></li>
-      <li><a href="http://paperjs.org/">Paper.js</a></li>
-      <li><a href="http://codev.it/">Codev</a></li>
-      <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a></li>
-      <li><a href="http://www.wescheme.org/">WeScheme</a></li>
-      <li><a href="http://www.mergely.com/">Mergely</a></li>
-      <li><a href="http://webglplayground.net/">WebGL playground</a></li>
-      <li><a href="https://thefiletree.com">The File Tree</a></li>
-      <li><a href="http://www.jshint.com/">JSHint</a></li>
-      <li><a href="http://sqlfiddle.com">SQLFiddle</a></li>
-      <li><a href="http://cssdeck.com/">CSSDeck</a></li>
-      <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
-      <li><a href="https://notex.ch">NoTex</a></li>
-      <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
-      <li><a href="doc/realworld.html">More...</a></li>
-    </ul>
-
-  </div></div>
-
-  <h2 id="code">Getting the code</h2>
-
-  <p>All of CodeMirror is released under a <a
-  href="LICENSE">MIT-style</a> license. To get it, you can download
-  the <a href="http://codemirror.net/codemirror.zip">latest
-  release</a> or the current <a
-  href="http://codemirror.net/codemirror-latest.zip">development
-  snapshot</a> as zip files. To create a custom minified script file,
-  you can use the <a href="doc/compress.html">compression API</a>.</p>
-
-  <p>We use <a href="http://git-scm.com/">git</a> for version control.
-  The main repository can be fetched in this way:</p>
-
-  <pre class="code">git clone http://marijnhaverbeke.nl/git/codemirror</pre>
-
-  <p>CodeMirror can also be found on GitHub at <a
-  href="http://github.com/marijnh/CodeMirror">marijnh/CodeMirror</a>.
-  If you plan to hack on the code and contribute patches, the best way
-  to do it is to create a GitHub fork, and send pull requests.</p>
-
-  <h2 id="documention">Documentation</h2>
-
-  <p>The <a href="doc/manual.html">manual</a> is your first stop for
-  learning how to use this library. It starts with a quick explanation
-  of how to use the editor, and then describes the API in detail.</p>
+<link rel=stylesheet href="lib/codemirror.css">
+<link rel=stylesheet href="doc/docs.css">
+<script src="lib/codemirror.js"></script>
+<script src="mode/xml/xml.js"></script>
+<script src="mode/javascript/javascript.js"></script>
+<script src="mode/css/css.js"></script>
+<script src="mode/htmlmixed/htmlmixed.js"></script>
+<script src="addon/edit/matchbrackets.js"></script>
 
-  <p>For those who want to learn more about the code, there is
-  a <a href="http://marijnhaverbeke.nl/blog/#cm-internals">series of
-  posts</a> on CodeMirror on my blog, and the
-  old <a href="doc/internals.html">overview of the editor
-  internals</a>.
-  The <a href="http://github.com/marijnh/CodeMirror">source code</a>
-  itself is, for the most part, also very readable.</p>
+<script src="doc/activebookmark.js"></script>
 
-  <h2 id="support">Support and bug reports</h2>
+<style>
+  .CodeMirror { height: auto; border: 1px solid #ddd; }
+  .CodeMirror-scroll { max-height: 200px; }
+  .CodeMirror pre { padding-left: 7px; line-height: 1.25; }
+</style>
 
-  <p>Community discussion, questions, and informal bug reporting is
-  done on
-  the <a href="http://groups.google.com/group/codemirror">CodeMirror
-  Google group</a>. There is a separate
-  group, <a href="http://groups.google.com/group/codemirror-announce">CodeMirror-announce</a>,
-  which is lower-volume, and is only used for major announcements—new
-  versions and such. These will be cross-posted to both groups, so you
-  don't need to subscribe to both.</p>
-
-  <p>Though bug reports through e-mail are responded to, the preferred
-  way to report bugs is to use
-  the <a href="http://github.com/marijnh/CodeMirror/issues">GitHub
-  issue tracker</a>. Before reporting a
-  bug, <a href="doc/reporting.html">read these pointers</a>. Also,
-  the issue tracker is for <em>bugs</em>, not requests for help.</p>
-
-  <p>When none of these seem fitting, you can
-  simply <a href="mailto:marijnh@gmail.com">e-mail the maintainer</a>
-  directly.</p>
-
-  <h2 id="supported">Supported browsers</h2>
-
-  <p>The following <em>desktop</em> browsers are able to run CodeMirror:</p>
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="doc/logo.png"></a>
 
   <ul>
-    <li>Firefox 3 or higher</li>
-    <li>Chrome, any version</li>
-    <li>Safari 5.2 or higher</li>
-    <li>Opera 9 or higher (with some key-handling problems on OS X)</li>
-    <li>Internet Explorer 8 or higher<br>
-    <li>Internet Explorer 7 (standards mode) is usable, but buggy. It
-    has a <a href="http://therealcrisp.xs4all.nl/meuk/IE-zindexbug.html">z-index
-    bug</a> that prevents CodeMirror from working properly.</li>
+    <li><a class=active data-default="true" href="#description">Home</a>
+    <li><a href="doc/manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
   </ul>
-
-  <p>Note that CodeMirror is only supported in
-  <strong>standards</strong> mode. So not quirks mode,
-  but <em>also</em> not the quasi-standards mode that IE gives you
-  when you specify a transitional doctype. Simply using the
-  HTML5-style <code>&lt;!doctype html></code> is recommended.</li>
-
-  <p>Mobile browsers mostly kind of work, but, because of limitations
-  and their fundamentally different UI assumptions, show a lot of
-  quirks that are hard to work around.</p>
-
-  <h2 id="commercial">Commercial support</h2>
-
-  <p>CodeMirror is developed and maintained by me, Marijn Haverbeke,
-  in my own time. If your company is getting value out of CodeMirror,
-  please consider purchasing a support contract.</p>
-
   <ul>
-    <li>You'll be funding further work on CodeMirror.</li>
-    <li>You ensure that you get a quick response when you have a
-    problem, even when I am otherwise busy.</li>
+    <li><a href="#features">Features</a>
+    <li><a href="#community">Community</a>
+    <li><a href="#browsersupport">Browser support</a>
   </ul>
-
-  <p>CodeMirror support contracts exist in two
-  forms—<strong>basic</strong> at €100 per month,
-  and <strong>premium</strong> at €500 per
-  month. <a href="mailto:marijnh@gmail.com">Contact me</a> for further
-  information.</p>
-
 </div>
 
-<div class="right blk">
-
-  <a href="http://codemirror.net/codemirror.zip" class="download">Download the latest release</a>
-
-  <h2>Support CodeMirror</h2>
-
+<article>
+
+<section id=description class=first>
+  <p><strong>CodeMirror</strong> is a versatile text editor
+  implemented in JavaScript for the browser. It is specialized for
+  editing code, and comes with a number of language modes and addons
+  that implement more advanced editing functionaly.</p>
+
+  <p>A rich <a href="doc/manual.html#api">programming API</a> and a
+  CSS <a href="doc/manual.html#styling">theming</a> system are
+  available for customizing CodeMirror to fit your application, and
+  extending it with new functionality.</p>
+</section>
+
+<section id=demo>
+  <h2>This is CodeMirror</h2>
+  <form style="position: relative; margin-top: .5em;"><textarea id=demotext>
+<!-- Create a simple CodeMirror instance -->
+<link rel="stylesheet" href="lib/codemirror.css">
+<script src="lib/codemirror.js"></script>
+<script>
+  var editor = CodeMirror.fromTextArea(myTextarea, {
+    mode: "text/html"
+  });
+</script></textarea>
+  <select id="demolist" onchange="document.location = this.options[this.selectedIndex].value;">
+    <option value="#">Other demos...</option>
+    <option value="demo/complete.html">Autocompletion</option>
+    <option value="demo/folding.html">Code folding</option>
+    <option value="demo/theme.html">Themes</option>
+    <option value="demo/bidi.html">Bi-directional text</option>
+    <option value="demo/variableheight.html">Mixed font sizes</option>
+    <option value="demo/vim.html">Vim bindings</option>
+    <option value="demo/emacs.html">Emacs bindings</option>
+  </select></form>
+  <script>
+    var editor = CodeMirror.fromTextArea(document.getElementById("demotext"), {
+      lineNumbers: true,
+      mode: "text/html",
+      matchBrackets: true
+    });
+  </script>
+  <div style="position: relative; margin: 1em 0;">
+    <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
+    <div><strong>version 3.15</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div>or use the <a href="doc/compress.html">minification helper</a></div>
+    <div style="position: absolute; top: 0; right: 0; text-align: right">
+      <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
+      <div style="position: relative">
+        or <span onclick="document.getElementById('bankinfo').style.display = 'block';" class=quasilink>Bank</span>,
+        <a href="https://www.gittip.com/marijnh">Gittip</a>,
+        <a href="https://flattr.com/profile/marijnh">Flattr</a><br>
+        <div id=bankinfo>
+          <span id=bankinfo_close onclick="document.getElementById('bankinfo').style.display = '';">×</span>
+          Bank: <i>Rabobank</i><br/>
+          Country: <i>Netherlands</i><br/>
+          SWIFT: <i>RABONL2U</i><br/>
+          Account: <i>147850770</i><br/>
+          Name: <i>Marijn Haverbeke</i><br/>
+          IBAN: <i>NL26 RABO 0147 8507 70</i>
+        </div>
+        <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal">
+          <input type="hidden" name="cmd" value="_s-xclick"/>
+          <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/>
+        </form>
+      </div>
+      <div>
+        Purchase <a href="http://codemirror.com">commercial support</a>
+      </div>
+    </div>
+  </div>
+</section>
+
+<section id=features>
+  <h2>Features</h2>
   <ul>
-    <li>Donate
-    (<span onclick="document.getElementById('paypal').submit();"
-    class="quasilink">Paypal</span>,
-    <span onclick="document.getElementById('bankinfo').style.display = 'block';"
-           class="quasilink">bank</span>,
-    <a href="https://www.gittip.com/marijnh">Gittip</a>, or
-    <a href="https://flattr.com/profile/marijnh">Flattr</a>)</li>
-    <li>Purchase <a href="#commercial">commercial support</a></li>
+    <li>Support for <a href="mode/index.html">over 60 languages</a> out of the box
+    <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>
+    <li><a href="doc/manual.html#option_extraKeys">Configurable</a> keybindings
+    <li><a href="demo/vim.html">Vim</a> and <a href="demo/emacs.html">Emacs</a> bindings
+    <li><a href="doc/manual.html#addon_search">Search and replace</a> interface
+    <li><a href="doc/manual.html#addon_matchbrackets">Bracket</a> and <a href="doc/manual.html#addon_matchtags">tag</a> matching
+    <li>Support for <a href="demo/buffers.html">split views</a>
+    <li><a href="doc/manual.html#addon_lint">Linter integration</a>
+    <li><a href="demo/variableheight.html">Mixing font sizes and styles</a>
+    <li><a href="demo/theme.html">Various themes</a>
+    <li>Able to <a href="demo/resize.html">resize to fit content</a>
+    <li><a href="doc/manual.html#mark_replacedWith">Inline</a> and <a href="doc/manual.html#setLineWidget">block</a> widgets
+    <li>Programmable <a href="demo/marker.html">gutters</a>
+    <li>Making ranges of text <a href="doc/manual.html#markText">styled, read-only, or atomic</a>
+    <li><a href="demo/bidi.html">Bi-directional text</a> support
+    <li>Many other <a href="doc/manual.html#api">methods</a> and <a href="doc/manual.html#addons">addons</a>...</a>
   </ul>
+</section>
+
+<section id=community>
+  <h2>Community</h2>
+
+  <p>CodeMirror is an open-source project shared under
+  an <a href="LICENSE">MIT license</a>. It is the editor used in
+  <a href="http://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light
+  Table</a>, <a href="http://brackets.io/">Adobe
+  Brackets</a>, <a href="https://script.google.com/">Google Apps
+  Script</a>, <a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a>,
+  and <a href="doc/realworld.html">many other projects</a>.</p>
+
+  <p>Development and bug tracking happens
+  on <a href="https://github.com/marijnh/CodeMirror/">github</a>
+  (<a href="http://marijnhaverbeke.nl/git/codemirror">alternate git
+  repository</a>).
+  Please <a href="http://codemirror.net/doc/reporting.html">read these
+  pointers</a> before submitting a bug. Use pull requests to submit
+  patches. All contributions must be released under the same MIT
+  license that CodeMirror uses.</p>
+
+  <p>Discussion around the project is done on
+  a <a href="groups.google.com/group/codemirror">mailing list</a>.
+  There is also
+  the <a href="groups.google.com/group/codemirror-announce">codemirror-announce</a>
+  list, which is only used for major announcements (such as new
+  versions). If needed, you can
+  contact <a href="mailto:marijnh@gmail.com">the maintainer</a>
+  directly.</p>
 
-  <p id="bankinfo" style="display: none;">
-    Bank: <i>Rabobank</i><br/>
-    Country: <i>Netherlands</i><br/>
-    SWIFT: <i>RABONL2U</i><br/>
-    Account: <i>147850770</i><br/>
-    Name: <i>Marijn Haverbeke</i><br/>
-    IBAN: <i>NL26 RABO 0147 8507 70</i>
-  </p>
-
-  <h2>Reading material</h2>
-
-  <ul>
-    <li><a href="doc/manual.html">User manual</a></li>
-    <li><a href="http://github.com/marijnh/CodeMirror">Browse the code</a></li>
-  </ul>
-
-  <h2 id=releases>Releases</h2>
-
-  <p class="rel">29-07-2013: <a href="http://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
-
-  <ul class="rel-note">
-    <li>New modes: <a href="mode/jade/index.html">Jade</a>, <a href="mode/nginx/index.html">Nginx</a>.</li>
-    <li>New addons: <a href="demo/tern.html">Tern</a>, <a href="doc/manual.html#addon_matchtags">matchtags</a>, and <a href="doc/manual.html#addon_foldgutter">foldgutter</a>.</li>
-    <li>Introduced <a href="doc/manual.html#getHelper"><em>helper</em></a> concept (<a href="https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ">context</a>).</li>
-    <li>New method: <a href="doc/manual.html#getModeAt"><code>getModeAt</code></a>.</li>
-    <li>New themes: base16 <a href="demo/theme.html?base16-dark">dark</a>/<a href="demo/theme.html?base16-light">light</a>, 3024 <a href="demo/theme.html?3024-night">dark</a>/<a href="demo/theme.html?3024-day">light</a>, <a href="demo/theme.html?tomorrow-night-eighties">tomorrow-night</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
-  </ul>
-
-  <p class="rel">20-06-2013: <a href="http://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
-
-  <ul class="rel-note">
-    <li>New
-    addons: <a href="doc/manual.html#addon_trailingspace">trailing
-    space highlight</a>, <a href="doc/manual.html#addon_xml-hint">XML
-    completion</a> (rewritten),
-    and <a href="doc/manual.html#addon_merge">diff merging</a>.</li>
-    <li><a href="doc/manual.html#markText"><code>markText</code></a>
-    and <a href="doc/manual.html#addLineWidget"><code>addLineWidget</code></a>
-    now take a <code>handleMouseEvents</code> option.</li>
-    <li>New methods: <a href="doc/manual.html#lineAtHeight"><code>lineAtHeight</code></a>,
-    <a href="doc/manual.html#getTokenTypeAt"><code>getTokenTypeAt</code></a>.</li>
-    <li>More precise cleanness-tracking
-    using <a href="doc/manual.html#changeGeneration"><code>changeGeneration</code></a>
-    and <a href="doc/manual.html#isClean"><code>isClean</code></a>.</li>
-    <li>Many extensions to <a href="demo/emacs.html">Emacs</a> mode
-    (prefixes, more navigation units, and more).</li>
-    <li>New
-    events <a href="doc/manual.html#event_keyHandled"><code>"keyHandled"</code></a>
-    and <a href="doc/manual.html#event_inputRead"><code>"inputRead"</code></a>.</li>
-    <li>Various improvements to <a href="mode/ruby/index.html">Ruby</a>,
-    <a href="mode/smarty/index.html">Smarty</a>, <a href="mode/sql/index.html">SQL</a>,
-    and <a href="demo/vim.html">Vim</a> modes.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.13.0...3.14.0">list of patches</a>.</li>
-  </ul>
-
-  <p class="rel">20-05-2013: <a href="http://codemirror.net/codemirror-3.13.zip">Version 3.13</a>:</p>
-
-  <ul class="rel-note">
-    <li>New modes: <a href="mode/cobol/index.html">COBOL</a> and <a href="mode/haml/index.html">HAML</a>.</li>
-    <li>New options: <a href="doc/manual.html#option_cursorScrollMargin"><code>cursorScrollMargin</code></a> and <a href="doc/manual.html#option_coverGutterNextToScrollbar"><code>coverGutterNextToScrollbar</code></a>.</li>
-    <li>New addon: <a href="doc/manual.html#addon_comment">commenting</a>.</li>
-    <li>More features added to the <a href="demo/vim.html">Vim keymap</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.12...3.13.0">list of patches</a>.</li>
-  </ul>
-
-  <p class="rel">19-04-2013: <a href="http://codemirror.net/codemirror-3.12.zip">Version 3.12</a>:</p>
-
-  <ul class="rel-note">
-    <li>New mode: <a href="mode/gas/index.html">GNU assembler</a>.</li>
-    <li>New
-    options: <a href="doc/manual.html#option_maxHighlightLength"><code>maxHighlightLength</code></a>
-    and <a href="doc/manual.html#option_historyEventDelay"><code>historyEventDelay</code></a>.</li>
-    <li>Added <a href="doc/manual.html#mark_addToHistory"><code>addToHistory</code></a>
-    option for <code>markText</code>.</li>
-    <li>Various fixes to JavaScript tokenization and indentation corner cases.</li>
-    <li>Further improvements to the vim mode.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.11...v3.12">list of patches</a>.</li>
-  </ul>
-
-  <p class="rel">20-03-2013: <a href="http://codemirror.net/codemirror-3.11.zip">Version 3.11</a>:</p>
-
-  <ul class="rel-note">
-    <li><strong>Removed code:</strong> <code>collapserange</code>,
-    <code>formatting</code>, and <code>simple-hint</code>
-    addons. <code>plsql</code> and <code>mysql</code> modes
-    (use <a href="mode/sql/index.html"><code>sql</code></a> mode).</li>
-    <li><strong>Moved code:</strong> the range-finding functions for folding now have <a href="addon/fold/">their own files</a>.</li>
-    <li><strong>Changed interface:</strong>
-    the <a href="doc/manual.html#addon_continuecomment"><code>continuecomment</code></a>
-    addon now exposes an option, rather than a command.</li>
-    <li>New
-    modes: <a href="mode/css/scss.html">SCSS</a>, <a href="mode/tcl/index.html">Tcl</a>, <a href="mode/livescript/index.html">LiveScript</a>,
-    and <a href="mode/mirc/index.html">mIRC</a>.</li>
-    <li>New addons: <a href="demo/placeholder.html"><code>placeholder</code></a>, <a href="demo/html5complete.html">HTML completion</a>.</li>
-    <li>New
-    methods: <a href="doc/manual.html#hasFocus"><code>hasFocus</code></a>, <a href="doc/manual.html#defaultCharWidth"><code>defaultCharWidth</code></a>.</li>
-    <li>New events: <a href="doc/manual.html#event_beforeCursorEnter"><code>beforeCursorEnter</code></a>, <a href="doc/manual.html#event_renderLine"><code>renderLine</code></a>.</li>
-    <li>Many improvements to the <a href="doc/manual.html#addon_show-hint"><code>show-hint</code></a> completion
-    dialog addon.</li>
-    <li>Tweak behavior of by-word cursor motion.</li>
-    <li>Further improvements to the <a href="demo/vim.html">vim mode</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.1...v3.11">list of patches</a>.</li>
-  </ul>
-
-  <p class="rel">21-02-2013: <a href="http://codemirror.net/codemirror-3.1.zip">Version 3.1</a>:</p>
-
-  <ul class="rel-note">
-    <li><strong>Incompatible:</strong> key handlers may
-    now <em>return</em>, rather
-    than <em>throw</em> <code>CodeMirror.Pass</code> to signal they
-    didn't handle the key.</li>
-    <li>Make documents a <a href="doc/manual.html#api_doc">first-class
-    construct</a>, support split views and subviews.</li>
-    <li>Add a <a href="doc/manual.html#addon_show-hint">new module</a>
-    for showing completion hints.
-    Deprecate <code>simple-hint.js</code>.</li>
-    <li>Extend <a href="mode/htmlmixed/index.html">htmlmixed mode</a>
-    to allow custom handling of script types.</li>
-    <li>Support an <code>insertLeft</code> option
-    to <a href="doc/manual.html#setBookmark"><code>setBookmark</code></a>.</li>
-    <li>Add an <a href="doc/manual.html#eachLine"><code>eachLine</code></a>
-    method to iterate over a document.</li>
-    <li>New addon modules: <a href="demo/markselection.html">selection
-    marking</a>, <a href="demo/lint.html">linting</a>,
-    and <a href="demo/closebrackets.html">automatic bracket
-    closing</a>.</li>
-    <li>Add <a href="doc/manual.html#event_beforeChange"><code>"beforeChange"</code></a>
-    and <a href="doc/manual.html#event_beforeSelectionChange"><code>"beforeSelectionChange"</code></a>
-    events.</li>
-    <li>Add <a href="doc/manual.html#event_hide"><code>"hide"</code></a>
-    and <a href="doc/manual.html#event_unhide"><code>"unhide"</code></a>
-    events to marked ranges.</li>
-    <li>Fix <a href="doc/manual.html#coordsChar"><code>coordsChar</code></a>'s
-    interpretation of its argument to match the documentation.</li>
-    <li>New modes: <a href="mode/turtle/index.html">Turtle</a>
-    and <a href="mode/q/index.html">Q</a>.</li>
-    <li>Further improvements to the <a href="demo/vim.html">vim mode</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.01...v3.1">list of patches</a>.</li>
-  </ul>
-  
-
-  <p class="rel">25-01-2013: <a href="http://codemirror.net/codemirror-3.02.zip">Version 3.02</a>:</p>
-
-  <p class="rel-note">Single-bugfix release. Fixes a problem that
-  prevents CodeMirror instances from being garbage-collected after
-  they become unused.</p>
-
-  <p class="rel">21-01-2013: <a href="http://codemirror.net/codemirror-3.01.zip">Version 3.01</a>:</p>
-
-  <ul class="rel-note">
-    <li>Move all add-ons into an organized directory structure
-    under <a href="addon/"><code>/addon</code></a>. <strong>You might have to adjust your
-    paths.</strong></li>
-    <li>New
-    modes: <a href="mode/d/index.html">D</a>, <a href="mode/sass/index.html">Sass</a>, <a href="mode/apl/index.html">APL</a>, <a href="mode/sql/index.html">SQL</a>
-    (configurable), and <a href="mode/asterisk/index.html">Asterisk</a>.</li>
-    <li>Several bugfixes in right-to-left text support.</li>
-    <li>Add <a href="doc/manual.html#option_rtlMoveVisually"><code>rtlMoveVisually</code></a> option.</li>
-    <li>Improvements to vim keymap.</li>
-    <li>Add built-in (lightweight) <a href="doc/manual.html#addOverlay">overlay mode</a> support.</li>
-    <li>Support <code>showIfHidden</code> option for <a href="doc/manual.html#addLineWidget">line widgets</a>.</li>
-    <li>Add simple <a href="doc/manual.html#addon_python-hint">Python hinter</a>.</li>
-    <li>Bring back the <a href="doc/manual.html#option_fixedGutter"><code>fixedGutter</code></a> option.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0...v3.01">list of patches</a>.</li>
-  </ul>
-
-  <p class="rel">21-01-2013: <a href="http://codemirror.net/codemirror-2.38.zip">Version 2.38</a>:</p>
-
-  <p class="rel-note">Integrate some bugfixes, enhancements to the vim keymap, and new
-  modes
-  (<a href="mode/d/index.html">D</a>, <a href="mode/sass/index.html">Sass</a>, <a href="mode/apl/index.html">APL</a>)
-  from the v3 branch.</p>
-
-  <p class="rel">20-12-2012: <a href="http://codemirror.net/codemirror-2.37.zip">Version 2.37</a>:</p>
-
-  <ul class="rel-note">
-    <li>New mode: <a href="mode/sql/index.html">SQL</a> (will replace <a href="mode/plsql/index.html">plsql</a> and <a href="mode/mysql/index.html">mysql</a> modes).</li>
-    <li>Further work on the new VIM mode.</li>
-    <li>Fix Cmd/Ctrl keys on recent Operas on OS X.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.36...v2.37">list of patches</a>.</li>
-  </ul>
-
-  <p class="rel">10-12-2012: <a href="http://codemirror.net/codemirror-3.0.zip">Version 3.0</a>:</p>
-
-  <p class="rel-note"><strong>New major version</strong>. Only
-  partially backwards-compatible. See
-  the <a href="doc/upgrade_v3.html">upgrading guide</a> for more
-  information. Changes since release candidate 2:</p>
-
-  <ul class="rel-note">
-    <li>Rewritten VIM mode.</li>
-    <li>Fix a few minor scrolling and sizing issues.</li>
-    <li>Work around Safari segfault when dragging.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
-  </ul>
-  
-  <p><a href="doc/oldrelease.html">Older releases...</a></p>
-
-</div></div>
-
-<div style="height: 2em">&nbsp;</div>
-
-  <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal">
-    <input type="hidden" name="cmd" value="_s-xclick"/>
-    <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/>
-  </form>
-
-  </body>
-</html>
+  <p>A list of CodeMirror-related software that is not part of the
+  main distribution is maintained
+  on <a href="https://github.com/marijnh/CodeMirror/wiki/CodeMirror-addons">our
+  wiki</a>. Feel free to add your project.</p>
+</section>
+
+<section id=browsersupport>
+  <h2>Browser support</h2>
+  <p>The <em>desktop</em> versions of the following browsers,
+  in <em>standards mode</em> (HTML5 <code>&lt;!doctype html></code>
+  recommended) are supported:</p>
+  <table style="margin-bottom: 1em">
+    <tr><th>Firefox</th><td>version 3 and up</td></tr>
+    <tr><th>Chrome</th><td>any version</td></tr>
+    <tr><th>Safari</th><td>version 5.2 and up</td></tr>
+    <tr><th style="padding-right: 1em;">Internet Explorer</th><td>version 8 and up</td></tr>
+    <tr><th>Opera</th><td>version 9 and up</td></tr>
+  </table>
+  <p>Modern mobile browsers tend to partly work. Bug reports and
+  patches for mobile support, but the maintainer does not have the
+  time budget to actually work on it himself.</p>
+</section>
+
+</article>
diff --git a/mode/apl/index.html b/mode/apl/index.html
index 119ff17f19..f8282ac42f 100644
--- a/mode/apl/index.html
+++ b/mode/apl/index.html
@@ -1,20 +1,32 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: APL mode</title>
-    <link rel="stylesheet" href="../../doc/docs.css"> 
-    <link rel="stylesheet" href="../../lib/codemirror.css"> 
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="./apl.js"></script>
-    <style>
+
+<title>CodeMirror: APL 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/edit/matchbrackets.js"></script>
+<script src="./apl.js"></script>
+<style>
 	.CodeMirror { border: 2px inset #dee; }
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: APL mode</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">APL</a>
+  </ul>
+</div>
 
+<article>
+<h2>APL mode</h2>
 <form><textarea id="code" name="code">
 ⍝ Conway's game of life
 
@@ -57,5 +69,4 @@ <h1>CodeMirror: APL mode</h1>
     have popups etc.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/apl</code> (APL code)</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/asterisk/index.html b/mode/asterisk/index.html
index 0a796a0119..6abdecb50d 100644
--- a/mode/asterisk/index.html
+++ b/mode/asterisk/index.html
@@ -1,20 +1,33 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Asterisk dialplan mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="asterisk.js"></script>
-    <style>
+
+<title>CodeMirror: Asterisk dialplan 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="asterisk.js"></script>
+<style>
       .CodeMirror {border: 1px solid #999;}
       .cm-s-default span.cm-arrow { color: red; }
     </style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Asterisk dialplan mode</h1>
-    <form><textarea id="code" name="code">
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Asterisk dialplan</a>
+  </ul>
+</div>
+
+<article>
+<h2>Asterisk dialplan mode</h2>
+<form><textarea id="code" name="code">
 ; extensions.conf - the Asterisk dial plan
 ;
 
@@ -138,5 +151,4 @@ <h1>CodeMirror: Asterisk dialplan mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-asterisk</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 5f90394d95..58ba24c380 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -1,18 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: C-like mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="clike.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>.CodeMirror {border: 2px inset #dee;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: C-like mode</h1>
 
+<title>CodeMirror: C-like 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/edit/matchbrackets.js"></script>
+<script src="clike.js"></script>
+<style>.CodeMirror {border: 2px inset #dee;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">C-like</a>
+  </ul>
+</div>
+
+<article>
+<h2>C-like mode</h2>
 <form><textarea id="code" name="code">
 /* C demo code */
 
@@ -99,5 +111,4 @@ <h1>CodeMirror: C-like mode</h1>
     (C code), <code>text/x-c++src</code> (C++
     code), <code>text/x-java</code> (Java
     code), <code>text/x-csharp</code> (C#).</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/clike/scala.html b/mode/clike/scala.html
index f3c7eea498..e9acc049b3 100644
--- a/mode/clike/scala.html
+++ b/mode/clike/scala.html
@@ -1,29 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: C-like mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <link rel="stylesheet" href="../../theme/ambiance.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="clike.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>
-      body
-      {
-        margin: 0;
-        padding: 0;
-        max-width:inherit;
-        height: 100%;
-      }
-      html, form, .CodeMirror, .CodeMirror-scroll
-      {
-        height: 100%;        
-      }
-    </style>
-  </head>
-  <body>
+
+<title>CodeMirror: Scala mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/ambiance.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src="clike.js"></script>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Scala</a>
+  </ul>
+</div>
+
+<article>
+<h2>Scala mode</h2>
 <form>
 <textarea id="code" name="code">
 
@@ -763,5 +764,4 @@
         mode: "text/x-scala"
       });
     </script>
-  </body>
-</html>
+  </article>
diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index bfe6fc955a..5a50c566fc 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Clojure mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="clojure.js"></script>
-    <style>.CodeMirror {background: #f8f8f8;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Clojure mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Clojure 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="clojure.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Clojure</a>
+  </ul>
+</div>
+
+<article>
+<h2>Clojure mode</h2>
+<form><textarea id="code" name="code">
 ; Conway's Game of Life, based on the work of:
 ;; Laurent Petit https://gist.github.com/1200343
 ;; Christophe Grand http://clj-me.cgrand.net/2011/08/19/conways-game-of-life
@@ -72,5 +85,4 @@ <h1>CodeMirror: Clojure mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-clojure</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/cobol/index.html b/mode/cobol/index.html
index 71cc2fa151..326e398b67 100644
--- a/mode/cobol/index.html
+++ b/mode/cobol/index.html
@@ -1,35 +1,36 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: COBOL mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="cobol.js"></script>
-    <link rel="stylesheet" href="../../theme/neat.css">
-    <link rel="stylesheet" href="../../theme/elegant.css">
-    <link rel="stylesheet" href="../../theme/erlang-dark.css">
-    <link rel="stylesheet" href="../../theme/night.css">
-    <link rel="stylesheet" href="../../theme/monokai.css">
-    <link rel="stylesheet" href="../../theme/cobalt.css">
-    <link rel="stylesheet" href="../../theme/eclipse.css">
-    <link rel="stylesheet" href="../../theme/rubyblue.css">
-    <link rel="stylesheet" href="../../theme/lesser-dark.css">
-    <link rel="stylesheet" href="../../theme/xq-dark.css">
-    <link rel="stylesheet" href="../../theme/xq-light.css">
-    <link rel="stylesheet" href="../../theme/ambiance.css">
-    <link rel="stylesheet" href="../../theme/blackboard.css">
-    <link rel="stylesheet" href="../../theme/vibrant-ink.css">
-    <link rel="stylesheet" href="../../theme/solarized.css">
-    <link rel="stylesheet" href="../../theme/twilight.css">
-    <link rel="stylesheet" href="../../theme/midnight.css">
-    <link rel="stylesheet" href="../../addon/dialog/dialog.css">
-    <script src="../../addon/selection/active-line.js"></script>
-    <script src="../../addon/search/search.js"></script>
-    <script src="../../addon/dialog/dialog.js"></script>
-    <script src="../../addon/search/searchcursor.js"></script>
-    <style>
+
+<title>CodeMirror: COBOL mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/neat.css">
+<link rel="stylesheet" href="../../theme/elegant.css">
+<link rel="stylesheet" href="../../theme/erlang-dark.css">
+<link rel="stylesheet" href="../../theme/night.css">
+<link rel="stylesheet" href="../../theme/monokai.css">
+<link rel="stylesheet" href="../../theme/cobalt.css">
+<link rel="stylesheet" href="../../theme/eclipse.css">
+<link rel="stylesheet" href="../../theme/rubyblue.css">
+<link rel="stylesheet" href="../../theme/lesser-dark.css">
+<link rel="stylesheet" href="../../theme/xq-dark.css">
+<link rel="stylesheet" href="../../theme/xq-light.css">
+<link rel="stylesheet" href="../../theme/ambiance.css">
+<link rel="stylesheet" href="../../theme/blackboard.css">
+<link rel="stylesheet" href="../../theme/vibrant-ink.css">
+<link rel="stylesheet" href="../../theme/solarized.css">
+<link rel="stylesheet" href="../../theme/twilight.css">
+<link rel="stylesheet" href="../../theme/midnight.css">
+<link rel="stylesheet" href="../../addon/dialog/dialog.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src="cobol.js"></script>
+<script src="../../addon/selection/active-line.js"></script>
+<script src="../../addon/search/search.js"></script>
+<script src="../../addon/dialog/dialog.js"></script>
+<script src="../../addon/search/searchcursor.js"></script>
+<style>
         .CodeMirror {
           border: 1px solid #eee;
           font-size : 20px;
@@ -37,8 +38,23 @@
         }
         .CodeMirror-activeline-background {background: #555555 !important;}
     </style>
-  </head>
-  <body>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">COBOL</a>
+  </ul>
+</div>
+
+<article>
+<h2>COBOL mode</h2>
+
     <p> Select Theme <select onchange="selectTheme()" id="selectTheme">
         <option>default</option>
         <option>ambiance</option>
@@ -191,5 +207,4 @@
         }
       }
     </script>
-  </body>
-</html>
+  </article>
diff --git a/mode/coffeescript/index.html b/mode/coffeescript/index.html
index ee72b8d2f2..6e6fde52e4 100644
--- a/mode/coffeescript/index.html
+++ b/mode/coffeescript/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: CoffeeScript mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="coffeescript.js"></script>
-    <style>.CodeMirror {border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: CoffeeScript mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: CoffeeScript 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="coffeescript.js"></script>
+<style>.CodeMirror {border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">CoffeeScript</a>
+  </ul>
+</div>
+
+<article>
+<h2>CoffeeScript mode</h2>
+<form><textarea id="code" name="code">
 # CoffeeScript mode for CodeMirror
 # Copyright (c) 2011 Jeff Pickhardt, released under
 # the MIT License.
@@ -724,5 +737,4 @@ <h1>CodeMirror: CoffeeScript mode</h1>
 
     <p>The CoffeeScript mode was written by Jeff Pickhardt (<a href="LICENSE">license</a>).</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/commonlisp/index.html b/mode/commonlisp/index.html
index f9766a844c..d48be8d233 100644
--- a/mode/commonlisp/index.html
+++ b/mode/commonlisp/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Common Lisp mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="commonlisp.js"></script>
-    <style>.CodeMirror {background: #f8f8f8;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Common Lisp mode</h1>
-    <form><textarea id="code" name="code">(in-package :cl-postgres)
+
+<title>CodeMirror: Common Lisp 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="commonlisp.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Common Lisp</a>
+  </ul>
+</div>
+
+<article>
+<h2>Common Lisp mode</h2>
+<form><textarea id="code" name="code">(in-package :cl-postgres)
 
 ;; These are used to synthesize reader and writer names for integer
 ;; reading/writing functions when the amount of bytes and the
@@ -161,5 +174,4 @@ <h1>CodeMirror: Common Lisp mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-common-lisp</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/css/index.html b/mode/css/index.html
index ae2c3bfcee..1d1865e2e3 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: CSS mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="css.js"></script>
-    <style>.CodeMirror {background: #f8f8f8;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: CSS mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: CSS 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="css.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">CSS</a>
+  </ul>
+</div>
+
+<article>
+<h2>CSS mode</h2>
+<form><textarea id="code" name="code">
 /* Some example CSS */
 
 @import url("something.css");
@@ -54,5 +67,4 @@ <h1>CodeMirror: CSS mode</h1>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#css_*">normal</a>,  <a href="../../test/index.html#verbose,css_*">verbose</a>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/css/scss.html b/mode/css/scss.html
index b90cbe876c..72781c0dc3 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: SCSS mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="css.js"></script>
-    <style>.CodeMirror {background: #f8f8f8;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: SCSS mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: SCSS 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="css.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">SCSS</a>
+  </ul>
+</div>
+
+<article>
+<h2>SCSS mode</h2>
+<form><textarea id="code" name="code">
 /* Some example SCSS */
 
 @import "compass/css3";
@@ -141,5 +154,4 @@ <h1>CodeMirror: SCSS mode</h1>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#scss_*">normal</a>,  <a href="../../test/index.html#verbose,scss_*">verbose</a>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/d/index.html b/mode/d/index.html
index 13332727ad..8b25fcc5c9 100755
--- a/mode/d/index.html
+++ b/mode/d/index.html
@@ -1,18 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: D mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="d.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>.CodeMirror {border: 2px inset #dee;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: D mode</h1>
 
+<title>CodeMirror: D 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/edit/matchbrackets.js"></script>
+<script src="d.js"></script>
+<style>.CodeMirror {border: 2px inset #dee;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">D</a>
+  </ul>
+</div>
+
+<article>
+<h2>D mode</h2>
 <form><textarea id="code" name="code">
 /* D demo code // copied from phobos/sd/metastrings.d */
 // Written in the D programming language.
@@ -258,5 +270,4 @@ <h1>CodeMirror: D mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-d</code>
     .</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/diff/index.html b/mode/diff/index.html
index 556025204d..6ceae8b33a 100644
--- a/mode/diff/index.html
+++ b/mode/diff/index.html
@@ -1,23 +1,36 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Diff mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="diff.js"></script>
-    <style>
+
+<title>CodeMirror: Diff 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="diff.js"></script>
+<style>
       .CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}
       span.cm-meta {color: #a0b !important;}
       span.cm-error { background-color: black; opacity: 0.4;}
       span.cm-error.cm-string { background-color: red; }
       span.cm-error.cm-tag { background-color: #2b2; }
     </style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Diff mode</h1>
-    <form><textarea id="code" name="code">
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Diff</a>
+  </ul>
+</div>
+
+<article>
+<h2>Diff mode</h2>
+<form><textarea id="code" name="code">
 diff --git a/index.html b/index.html
 index c1d9156..7764744 100644
 --- a/index.html
@@ -101,5 +114,4 @@ <h1>CodeMirror: Diff mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-diff</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/ecl/index.html b/mode/ecl/index.html
index 0ba88c3995..f4b612d610 100644
--- a/mode/ecl/index.html
+++ b/mode/ecl/index.html
@@ -1,16 +1,30 @@
-<!doctype html>
-<html>
-  <head>
-    <title>CodeMirror: ECL mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="ecl.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>.CodeMirror {border: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: ECL mode</h1>
-    <form><textarea id="code" name="code">
+<!doctype html>
+
+<title>CodeMirror: ECL 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="ecl.js"></script>
+<style>.CodeMirror {border: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">ECL</a>
+  </ul>
+</div>
+
+<article>
+<h2>ECL mode</h2>
+<form><textarea id="code" name="code">
 /*
 sample useless code to demonstrate ecl syntax highlighting
 this is a multiline comment!
@@ -35,5 +49,4 @@ <h1>CodeMirror: ECL mode</h1>
     <p>Based on CodeMirror's clike mode.  For more information see <a href="http://hpccsystems.com">HPCC Systems</a> web site.</p>
     <p><strong>MIME types defined:</strong> <code>text/x-ecl</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index 5bb81f669a..e63e231201 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -1,19 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Erlang mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="erlang.js"></script>
-    <link rel="stylesheet" href="../../theme/erlang-dark.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Erlang mode</h1>
 
+<title>CodeMirror: Erlang mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/erlang-dark.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src="erlang.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Erlang</a>
+  </ul>
+</div>
+
+<article>
+<h2>Erlang mode</h2>
 <form><textarea id="code" name="code">
 %% -*- mode: erlang; erlang-indent-level: 2 -*-
 %%% Created :  7 May 2012 by mats cronqvist <masse@klarna.com>
@@ -60,5 +72,4 @@ <h1>CodeMirror: Erlang mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-erlang</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/gas/index.html b/mode/gas/index.html
index 7684bc18df..cd8a2ff5a6 100644
--- a/mode/gas/index.html
+++ b/mode/gas/index.html
@@ -1,18 +1,30 @@
 <!doctype html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <title>CodeMirror: Gas mode</title>
-        <link rel="stylesheet" href="../../lib/codemirror.css">
-        <script src="../../lib/codemirror.js"></script>
-        <script src="gas.js"></script>
-        <link rel="stylesheet" href="../../doc/docs.css">
-        <style>.CodeMirror {border: 2px inset #dee;}</style>
-    </head>
-    <body>
-        <h1>CodeMirror: Gas mode</h1>
-
-        <form>
+
+<title>CodeMirror: Gas 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="gas.js"></script>
+<style>.CodeMirror {border: 2px inset #dee;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Gas</a>
+  </ul>
+</div>
+
+<article>
+<h2>Gas mode</h2>
+<form>
 <textarea id="code" name="code">
 .syntax unified
 .global main
@@ -53,5 +65,4 @@ <h1>CodeMirror: Gas mode</h1>
         directives for the supplied architecture.
 
         <p><strong>MIME types defined:</strong> <code>text/x-gas</code></p>
-    </body>
-</html>
+    </article>
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index 826a96d2de..b71cd5c75f 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -1,27 +1,36 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: GFM mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/mode/overlay.js"></script>
-    <script src="../xml/xml.js"></script>
-    <script src="../markdown/markdown.js"></script>
-    <script src="gfm.js"></script>
-    
-    <!-- Code block highlighting modes -->
-    <script src="../javascript/javascript.js"></script>
-    <script src="../css/css.js"></script>
-    <script src="../htmlmixed/htmlmixed.js"></script>
-    <script src="../clike/clike.js"></script>
-    
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: GFM mode</h1>
 
+<title>CodeMirror: GFM 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/overlay.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../markdown/markdown.js"></script>
+<script src="gfm.js"></script>
+<script src="../javascript/javascript.js"></script>
+<script src="../css/css.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="../clike/clike.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">GFM</a>
+  </ul>
+</div>
+
+<article>
+<h2>GFM mode</h2>
 <form><textarea id="code" name="code">
 GitHub Flavored Markdown
 ========================
@@ -70,5 +79,4 @@ <h1>CodeMirror: GFM mode</h1>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#gfm_*">normal</a>,  <a href="../../test/index.html#verbose,gfm_*">verbose</a>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/go/index.html b/mode/go/index.html
index 8a6aafca29..3673fa0b06 100644
--- a/mode/go/index.html
+++ b/mode/go/index.html
@@ -1,19 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Go mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <link rel="stylesheet" href="../../theme/elegant.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="go.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Go mode</h1>
 
+<title>CodeMirror: Go mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/elegant.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src="go.js"></script>
+<style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Go</a>
+  </ul>
+</div>
+
+<article>
+<h2>Go mode</h2>
 <form><textarea id="code" name="code">
 // Prime Sieve in Go.
 // Taken from the Go specification.
@@ -70,5 +82,4 @@ <h1>CodeMirror: Go mode</h1>
     </script>
 
     <p><strong>MIME type:</strong> <code>text/x-go</code></p>
-  </body>
-</html>
+  </article>
diff --git a/mode/groovy/index.html b/mode/groovy/index.html
index 3d39595774..f5efdf758f 100644
--- a/mode/groovy/index.html
+++ b/mode/groovy/index.html
@@ -1,18 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Groovy mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="groovy.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Groovy mode</h1>
 
+<title>CodeMirror: Groovy 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/edit/matchbrackets.js"></script>
+<script src="groovy.js"></script>
+<style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Groovy</a>
+  </ul>
+</div>
+
+<article>
+<h2>Groovy mode</h2>
 <form><textarea id="code" name="code">
 //Pattern for groovy script
 def p = ~/.*\.groovy/
@@ -69,5 +81,4 @@ <h1>CodeMirror: Groovy mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-groovy</code></p>
-  </body>
-</html>
+  </article>
diff --git a/mode/haml/index.html b/mode/haml/index.html
index 7da378fc80..a73787554d 100644
--- a/mode/haml/index.html
+++ b/mode/haml/index.html
@@ -1,21 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: HAML mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../xml/xml.js"></script>
-    <script src="../htmlmixed/htmlmixed.js"></script>
-    <script src="../javascript/javascript.js"></script>
-    <script src="../ruby/ruby.js"></script>
-    <script src="haml.js"></script>
-    <style>.CodeMirror {background: #f8f8f8;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: HAML mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: HAML 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="../xml/xml.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="../javascript/javascript.js"></script>
+<script src="../ruby/ruby.js"></script>
+<script src="haml.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">HAML</a>
+  </ul>
+</div>
+
+<article>
+<h2>HAML mode</h2>
+<form><textarea id="code" name="code">
 !!!
 #content
 .left.column(title="title"){:href => "/hello", :test => "#{hello}_#{world}"}
@@ -63,5 +76,4 @@ <h1 title="HELLO">
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#haml_*">normal</a>,  <a href="../../test/index.html#verbose,haml_*">verbose</a>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/haskell/index.html b/mode/haskell/index.html
index 56307b8a95..056b01d46b 100644
--- a/mode/haskell/index.html
+++ b/mode/haskell/index.html
@@ -1,19 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Haskell mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="haskell.js"></script>
-    <link rel="stylesheet" href="../../theme/elegant.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Haskell mode</h1>
 
+<title>CodeMirror: Haskell mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/elegant.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src="haskell.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Haskell</a>
+  </ul>
+</div>
+
+<article>
+<h2>Haskell mode</h2>
 <form><textarea id="code" name="code">
 module UniquePerms (
     uniquePerms
@@ -58,5 +70,4 @@ <h1>CodeMirror: Haskell mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-haskell</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/haxe/index.html b/mode/haxe/index.html
index 1125741ad5..ec3b8e0e75 100644
--- a/mode/haxe/index.html
+++ b/mode/haxe/index.html
@@ -1,16 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Haxe mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="haxe.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Haxe mode</h1>
+
+<title>CodeMirror: Haxe 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="haxe.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Haxe</a>
+  </ul>
+</div>
+
+<article>
+<h2>Haxe mode</h2>
+
 
 <div><textarea id="code" name="code">
 import one.two.Three;
@@ -86,5 +100,4 @@ <h1>CodeMirror: Haxe mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-haxe</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index 5a37dd637d..4ab90f7d88 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -1,21 +1,33 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Html Embedded Scripts mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../xml/xml.js"></script>
-    <script src="../javascript/javascript.js"></script>
-    <script src="../css/css.js"></script>
-    <script src="../htmlmixed/htmlmixed.js"></script>
-    <script src="htmlembedded.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Html Embedded Scripts mode</h1>
 
+<title>CodeMirror: Html Embedded Scripts 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="../xml/xml.js"></script>
+<script src="../javascript/javascript.js"></script>
+<script src="../css/css.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="htmlembedded.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Html Embedded Scripts</a>
+  </ul>
+</div>
+
+<article>
+<h2>Html Embedded Scripts mode</h2>
 <form><textarea id="code" name="code">
 <%
 function hello(who) {
@@ -45,5 +57,4 @@ <h1>CodeMirror: Html Embedded Scripts mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET), 
     <code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index c56559e559..b46174351a 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -1,21 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: HTML mixed mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../xml/xml.js"></script>
-    <script src="../javascript/javascript.js"></script>
-    <script src="../css/css.js"></script>
-    <script src="../vbscript/vbscript.js"></script>
-    <script src="htmlmixed.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: HTML mixed mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: HTML mixed 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="../xml/xml.js"></script>
+<script src="../javascript/javascript.js"></script>
+<script src="../css/css.js"></script>
+<script src="../vbscript/vbscript.js"></script>
+<script src="htmlmixed.js"></script>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/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>HTML mixed mode</h2>
+<form><textarea id="code" name="code">
 <html style="color: green">
   <!-- this is a comment -->
   <head>
@@ -69,5 +82,4 @@ <h1>Mixed HTML Example</h1>
     (redefined, only takes effect if you load this parser after the
     XML parser).</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/http/index.html b/mode/http/index.html
index 124eb84f95..705085e227 100644
--- a/mode/http/index.html
+++ b/mode/http/index.html
@@ -1,16 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: HTTP mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="http.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: HTTP mode</h1>
+
+<title>CodeMirror: HTTP 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="http.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">HTTP</a>
+  </ul>
+</div>
+
+<article>
+<h2>HTTP mode</h2>
+
 
 <div><textarea id="code" name="code">
 POST /somewhere HTTP/1.1
@@ -28,5 +42,4 @@ <h1>CodeMirror: HTTP mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>message/http</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/index.html b/mode/index.html
new file mode 100644
index 0000000000..e228c343ef
--- /dev/null
+++ b/mode/index.html
@@ -0,0 +1,106 @@
+<!doctype html>
+
+<title>CodeMirror: Language Modes</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Language modes</a>
+  </ul>
+</div>
+
+<article>
+
+<h2>Language modes</h2>
+
+<p>This is a list of every mode in the distribution. Each mode lives
+in a subdirectory of the <code>mode/</code> directory, and typically
+defines a single JavaScript file that implements the mode. Loading
+such file will make the language available to CodeMirror, through
+the <a href="manual.html#option_mode"><code>mode</code></a>
+option.</p>
+
+<div style="-webkit-columns: 100px 2; -moz-columns: 100px 2; columns: 100px 2;">
+    <ul>
+      <li><a href="apl/index.html">APL</a></li>
+      <li><a href="asterisk/index.html">Asterisk dialplan</a></li>
+      <li><a href="clike/index.html">C, C++, C#</a></li>
+      <li><a href="clojure/index.html">Clojure</a></li>
+      <li><a href="cobol/index.html">COBOL</a></li>
+      <li><a href="coffeescript/index.html">CoffeeScript</a></li>
+      <li><a href="commonlisp/index.html">Common Lisp</a></li>
+      <li><a href="css/index.html">CSS</a></li>
+      <li><a href="python/index.html">Cython</a></li>
+      <li><a href="d/index.html">D</a></li>
+      <li><a href="diff/index.html">diff</a></li>
+      <li><a href="ecl/index.html">ECL</a></li>
+      <li><a href="erlang/index.html">Erlang</a></li>
+      <li><a href="gas/index.html">Gas</a> (AT&amp;T-style assembly)</li>
+      <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="haskell/index.html">Haskell</a></li>
+      <li><a href="haxe/index.html">Haxe</a></li>
+      <li><a href="htmlembedded/index.html">HTML embedded scripts</a></li>
+      <li><a href="htmlmixed/index.html">HTML mixed-mode</a></li>
+      <li><a href="http/index.html">HTTP</a></li>
+      <li><a href="clike/index.html">Java</a></li>
+      <li><a href="jade/index.html">Jade</a></li>
+      <li><a href="javascript/index.html">JavaScript</a></li>
+      <li><a href="jinja2/index.html">Jinja2</a></li>
+      <li><a href="less/index.html">LESS</a></li>
+      <li><a href="livescript/index.html">LiveScript</a></li>
+      <li><a href="lua/index.html">Lua</a></li>
+      <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="nginx/index.html">Nginx</a></li>
+      <li><a href="ntriples/index.html">NTriples</a></li>
+      <li><a href="ocaml/index.html">OCaml</a></li>
+      <li><a href="pascal/index.html">Pascal</a></li>
+      <li><a href="perl/index.html">Perl</a></li>
+      <li><a href="php/index.html">PHP</a></li>
+      <li><a href="pig/index.html">Pig Latin</a></li>
+      <li><a href="properties/index.html">Properties files</a></li>
+      <li><a href="python/index.html">Python</a></li>
+      <li><a href="q/index.html">Q</a></li>
+      <li><a href="r/index.html">R</a></li>
+      <li>RPM <a href="rpm/spec/index.html">spec</a> and <a href="rpm/changes/index.html">changelog</a></li>
+      <li><a href="rst/index.html">reStructuredText</a></li>
+      <li><a href="ruby/index.html">Ruby</a></li>
+      <li><a href="rust/index.html">Rust</a></li>
+      <li><a href="sass/index.html">Sass</a></li>
+      <li><a href="clike/scala.html">Scala</a></li>
+      <li><a href="scheme/index.html">Scheme</a></li>
+      <li><a href="css/scss.html">SCSS</a></li>
+      <li><a href="shell/index.html">Shell</a></li>
+      <li><a href="sieve/index.html">Sieve</a></li>
+      <li><a href="smalltalk/index.html">Smalltalk</a></li>
+      <li><a href="smarty/index.html">Smarty</a></li>
+      <li><a href="smartymixed/index.html">Smarty/HTML mixed</a></li>
+      <li><a href="sql/index.html">SQL</a> (several dialects)</li>
+      <li><a href="sparql/index.html">SPARQL</a></li>
+      <li><a href="stex/index.html">sTeX, LaTeX</a></li>
+      <li><a href="tcl/index.html">Tcl</a></li>
+      <li><a href="tiddlywiki/index.html">Tiddlywiki</a></li>
+      <li><a href="tiki/index.html">Tiki wiki</a></li>
+      <li><a href="turtle/index.html">Turtle</a></li>
+      <li><a href="vb/index.html">VB.NET</a></li>
+      <li><a href="vbscript/index.html">VBScript</a></li>
+      <li><a href="velocity/index.html">Velocity</a></li>
+      <li><a href="verilog/index.html">Verilog</a></li>
+      <li><a href="xml/index.html">XML/HTML</a></li>
+      <li><a href="xquery/index.html">XQuery</a></li>
+      <li><a href="yaml/index.html">YAML</a></li>
+      <li><a href="z80/index.html">Z80</a></li>
+    </ul>
+  </div>
+
+</article>
diff --git a/mode/jade/index.html b/mode/jade/index.html
index 0e68ba8ac4..e22b15e65b 100644
--- a/mode/jade/index.html
+++ b/mode/jade/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Jade Templating Mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="jade.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Jade Templating Mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Jade Templating 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="jade.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Jade Templating Mode</a>
+  </ul>
+</div>
+
+<article>
+<h2>Jade Templating Mode</h2>
+<form><textarea id="code" name="code">
 doctype 5
   html
     head
@@ -50,5 +63,4 @@ <h1>CodeMirror: Jade Templating Mode</h1>
     <h3>The Jade Templating Mode</h3>
       <p> Created by Drew Bratcher. Managed as part of an Adobe Brackets extension at <a href="https://github.com/dbratcher/brackets-jade">https://github.com/dbratcher/brackets-jade</a>.</p>
     <p><strong>MIME type defined:</strong> <code>text/x-jade</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 0db35219b9..45d70ffdbb 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -1,19 +1,33 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: JavaScript mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="../../addon/comment/continuecomment.js"></script>
-    <script src="../../addon/comment/comment.js"></script>
-    <script src="javascript.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: JavaScript mode</h1>
+
+<title>CodeMirror: JavaScript 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/edit/matchbrackets.js"></script>
+<script src="../../addon/comment/continuecomment.js"></script>
+<script src="../../addon/comment/comment.js"></script>
+<script src="javascript.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">JavaScript</a>
+  </ul>
+</div>
+
+<article>
+<h2>JavaScript mode</h2>
+
 
 <div><textarea id="code" name="code">
 // Demo code (the actual new parser character stream implementation)
@@ -90,5 +104,4 @@ <h1>CodeMirror: JavaScript mode</h1>
     </p>
 
     <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index 58315e7ac7..9cc5f49321 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -1,16 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: TypeScript mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="javascript.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: TypeScript mode</h1>
+
+<title>CodeMirror: TypeScript 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="javascript.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">TypeScript</a>
+  </ul>
+</div>
+
+<article>
+<h2>TypeScript mode</h2>
+
 
 <div><textarea id="code" name="code">
 class Greeter {
@@ -44,5 +58,4 @@ <h1>CodeMirror: TypeScript mode</h1>
     </script>
 
     <p>This is a specialization of the <a href="index.html">JavaScript mode</a>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index 7cd1da2335..66bf2ec60a 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Jinja2 mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="jinja2.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Jinja2 mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Jinja2 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="jinja2.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Jinja2</a>
+  </ul>
+</div>
+
+<article>
+<h2>Jinja2 mode</h2>
+<form><textarea id="code" name="code">
 &lt;html style="color: green"&gt;
   &lt;!-- this is a comment --&gt;
   &lt;head&gt;
@@ -34,5 +47,4 @@ <h1>CodeMirror: Jinja2 mode</h1>
       CodeMirror.fromTextArea(document.getElementById("code"), {mode:
         {name: "jinja2", htmlMode: true}});
     </script>
-  </body>
-</html>
+  </article>
diff --git a/mode/less/index.html b/mode/less/index.html
index 78c1e53074..7239143c8c 100644
--- a/mode/less/index.html
+++ b/mode/less/index.html
@@ -1,19 +1,32 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: LESS mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="less.js"></script>
-    <style>.CodeMirror {background: #f8f8f8; border: 1px solid #ddd; font-size:12px; height: 400px}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <link rel="stylesheet" href="../../theme/lesser-dark.css">
-  </head>
-  <body>
-    <h1>CodeMirror: LESS mode</h1>
-    <form><textarea id="code" name="code">@media screen and (device-aspect-ratio: 16/9) { … }
+
+<title>CodeMirror: LESS mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/lesser-dark.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src="less.js"></script>
+<style>.CodeMirror {background: #f8f8f8; border: 1px solid #ddd; font-size:12px; height: 400px}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">LESS</a>
+  </ul>
+</div>
+
+<article>
+<h2>LESS mode</h2>
+<form><textarea id="code" name="code">@media screen and (device-aspect-ratio: 16/9) { … }
 @media screen and (device-aspect-ratio: 32/18) { … }
 @media screen and (device-aspect-ratio: 1280/720) { … }
 @media screen and (device-aspect-ratio: 2560/1440) { … }
@@ -737,5 +750,4 @@ <h1>CodeMirror: LESS mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-less</code>, <code>text/css</code> (if not previously defined).</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/livescript/index.html b/mode/livescript/index.html
index 3054e35b0f..b5944697d8 100644
--- a/mode/livescript/index.html
+++ b/mode/livescript/index.html
@@ -1,17 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <title>CodeMirror: LiveScript mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="livescript.js"></script>
-    <style>.CodeMirror {font-size: 80%;border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <link rel="stylesheet" href="../../theme/solarized.css">
-  </head>
-  <body>
-    <h1>CodeMirror: LiveScript mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: LiveScript mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/solarized.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="livescript.js"></script>
+<style>.CodeMirror {font-size: 80%;border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">LiveScript</a>
+  </ul>
+</div>
+
+<article>
+<h2>LiveScript mode</h2>
+<form><textarea id="code" name="code">
 # LiveScript mode for CodeMirror
 # The following script, prelude.ls, is used to
 # demonstrate LiveScript mode for CodeMirror.
@@ -442,5 +456,4 @@ <h1>CodeMirror: LiveScript mode</h1>
 
     <p>The LiveScript mode was written by Kenneth Bentley (<a href="LICENSE">license</a>).</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/lua/index.html b/mode/lua/index.html
index a0a42d91c4..69433e44ab 100644
--- a/mode/lua/index.html
+++ b/mode/lua/index.html
@@ -1,19 +1,32 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Lua mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="../../lib/codemirror.js"></script>
-    <script src="lua.js"></script>
-    <link rel="stylesheet" href="../../theme/neat.css">
-    <style>.CodeMirror {border: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Lua mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Lua mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/neat.css">
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src="../../lib/codemirror.js"></script>
+<script src="lua.js"></script>
+<style>.CodeMirror {border: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Lua</a>
+  </ul>
+</div>
+
+<article>
+<h2>Lua mode</h2>
+<form><textarea id="code" name="code">
 --[[
 example useless code to show lua syntax highlighting
 this is multiline comment
@@ -70,5 +83,4 @@ <h1>CodeMirror: Lua mode</h1>
     the <code>lua-special</code> style.</p>
     <p><strong>MIME types defined:</strong> <code>text/x-lua</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index bb785b13fc..a6b541e2eb 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -1,25 +1,36 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Markdown mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/continuelist.js"></script>
-    <script src="../xml/xml.js"></script>
-    <script src="markdown.js"></script>
-    <style type="text/css">
+
+<title>CodeMirror: Markdown 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/edit/continuelist.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="markdown.js"></script>
+<style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .cm-s-default .cm-trailing-space-a:before,
       .cm-s-default .cm-trailing-space-b:before {position: absolute; content: "\00B7"; color: #777;}
       .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
     </style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Markdown mode</h1>
-
-<!-- source: http://daringfireball.net/projects/markdown/basics.text -->
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Markdown</a>
+  </ul>
+</div>
+
+<article>
+<h2>Markdown mode</h2>
 <form><textarea id="code" name="code">
 Markdown: Basics
 ================
@@ -345,5 +356,4 @@ <h1>CodeMirror: Markdown mode</h1>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#markdown_*">normal</a>,  <a href="../../test/index.html#verbose,markdown_*">verbose</a>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/mirc/index.html b/mode/mirc/index.html
index 0ff5ec9a20..dbd7a06d8d 100644
--- a/mode/mirc/index.html
+++ b/mode/mirc/index.html
@@ -1,18 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: mIRC mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="mirc.js"></script>
-    <link rel="stylesheet" href="../../theme/twilight.css">
-    <style>.CodeMirror {border: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: mIRC mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: mIRC mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/twilight.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="mirc.js"></script>
+<style>.CodeMirror {border: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">mIRC</a>
+  </ul>
+</div>
+
+<article>
+<h2>mIRC mode</h2>
+<form><textarea id="code" name="code">
 ;AKA Nick Tracker by Ford_Lawnmower irc.GeekShed.net #Script-Help
 ;*****************************************************************************;
 ;**Start Setup
@@ -145,5 +158,4 @@ <h1>CodeMirror: mIRC mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/mirc</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index aa712e1e32..16be1eb614 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -1,11 +1,13 @@
 <!doctype html>
-<html>
-  <head>
-    <title>CodeMirror: NGINX mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="nginx.js"></script>
-    <style>.CodeMirror {background: #f8f8f8;}</style>
+
+<title>CodeMirror: NGINX 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="nginx.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>
 
@@ -18,10 +20,23 @@
       height: 600px;
     }
   </style>
-
-  <body>
-    <h1>CodeMirror: NGINX mode</h1>
-    <form><textarea id="code" name="code" style="height: 800px;">
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">NGINX</a>
+  </ul>
+</div>
+
+<article>
+<h2>NGINX mode</h2>
+<form><textarea id="code" name="code" style="height: 800px;">
 server {
   listen 173.255.219.235:80;
   server_name website.com.au;
@@ -163,5 +178,4 @@ <h1>CodeMirror: NGINX mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/nginx</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index 052a53d86a..c8a67916d5 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -1,20 +1,33 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: NTriples mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="ntriples.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">
+
+<title>CodeMirror: NTriples 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="ntriples.js"></script>
+<style type="text/css">
       .CodeMirror {
         border: 1px solid #eee;
       }
-    </style>   
-  </head>
-  <body>
-    <h1>CodeMirror: NTriples mode</h1>
+    </style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">NTriples</a>
+  </ul>
+</div>
+
+<article>
+<h2>NTriples mode</h2>
 <form>
 <textarea id="ntriples" name="ntriples">    
 <http://Sub1>     <http://pred1>     <http://obj> .
@@ -29,5 +42,4 @@ <h1>CodeMirror: NTriples mode</h1>
       var editor = CodeMirror.fromTextArea(document.getElementById("ntriples"), {});
     </script>
     <p><strong>MIME types defined:</strong> <code>text/n-triples</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/ocaml/index.html b/mode/ocaml/index.html
index c10a84fade..5d39fadd97 100644
--- a/mode/ocaml/index.html
+++ b/mode/ocaml/index.html
@@ -1,19 +1,33 @@
 <!doctype html>
-<meta charset=utf-8>
+
 <title>CodeMirror: OCaml mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
 
 <link rel=stylesheet href=../../lib/codemirror.css>
-<link rel=stylesheet href=../../doc/docs.css>
-
+<script src=../../lib/codemirror.js></script>
+<script src=../../addon/edit/matchbrackets.js></script>
+<script src=ocaml.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"><img id=logo src="../../doc/logo.png"></a>
 
-<script src=../../lib/codemirror.js></script>
-<script src=../../addon/edit/matchbrackets.js></script>
-<script src=ocaml.js></script>
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">OCaml</a>
+  </ul>
+</div>
+
+<article>
+<h2>OCaml mode</h2>
 
-<h1>CodeMirror: OCaml mode</h1>
 
 <textarea id=code>
 (* Summing a list of integers *)
@@ -129,3 +143,4 @@ <h1>CodeMirror: OCaml mode</h1>
 </script>
 
 <p><strong>MIME types defined:</strong> <code>text/x-ocaml</code>.</p>
+</article>
diff --git a/mode/pascal/index.html b/mode/pascal/index.html
index b3016afb10..bf8ff0d635 100644
--- a/mode/pascal/index.html
+++ b/mode/pascal/index.html
@@ -1,16 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Pascal mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="pascal.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Pascal mode</h1>
+
+<title>CodeMirror: Pascal 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="pascal.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Pascal</a>
+  </ul>
+</div>
+
+<article>
+<h2>Pascal mode</h2>
+
 
 <div><textarea id="code" name="code">
 (* Example Pascal code *)
@@ -44,5 +58,4 @@ <h1>CodeMirror: Pascal mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-pascal</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/perl/index.html b/mode/perl/index.html
index 13c7af64d3..2b7578efe6 100644
--- a/mode/perl/index.html
+++ b/mode/perl/index.html
@@ -1,16 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Perl mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="perl.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Perl mode</h1>
+
+<title>CodeMirror: Perl 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="perl.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Perl</a>
+  </ul>
+</div>
+
+<article>
+<h2>Perl mode</h2>
+
 
 <div><textarea id="code" name="code">
 #!/usr/bin/perl
@@ -58,5 +72,4 @@ <h1>CodeMirror: Perl mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-perl</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/php/index.html b/mode/php/index.html
index 3d4c336ce0..aaf51c0f5a 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -1,23 +1,35 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: PHP mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="../htmlmixed/htmlmixed.js"></script>
-    <script src="../xml/xml.js"></script>
-    <script src="../javascript/javascript.js"></script>
-    <script src="../css/css.js"></script>
-    <script src="../clike/clike.js"></script>
-    <script src="php.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: PHP mode</h1>
 
+<title>CodeMirror: PHP 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/edit/matchbrackets.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../javascript/javascript.js"></script>
+<script src="../css/css.js"></script>
+<script src="../clike/clike.js"></script>
+<script src="php.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">PHP</a>
+  </ul>
+</div>
+
+<article>
+<h2>PHP mode</h2>
 <form><textarea id="code" name="code">
 <?php
 function hello($who) {
@@ -47,5 +59,4 @@ <h1>CodeMirror: PHP mode</h1>
     JavaScript, CSS, HTMLMixed, and C-like modes.</p>
 
     <p><strong>MIME types defined:</strong> <code>application/x-httpd-php</code> (HTML with PHP code), <code>text/x-php</code> (plain, non-wrapped PHP code).</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/pig/index.html b/mode/pig/index.html
index 1b0c60267f..93744ae2d9 100644
--- a/mode/pig/index.html
+++ b/mode/pig/index.html
@@ -1,17 +1,29 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Pig Latin mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="pig.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>.CodeMirror {border: 2px inset #dee;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Pig Latin mode</h1>
 
+<title>CodeMirror: Pig Latin 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="pig.js"></script>
+<style>.CodeMirror {border: 2px inset #dee;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Pig Latin</a>
+  </ul>
+</div>
+
+<article>
+<h2>Pig Latin mode</h2>
 <form><textarea id="code" name="code">
 -- Apache Pig (Pig Latin Language) Demo
 /* 
@@ -40,3 +52,4 @@ <h1>CodeMirror: Pig Latin mode</h1>
     <p><strong>MIME type defined:</strong> <code>text/x-pig</code>
     (PIG code)
 </html>
+</article>
diff --git a/mode/properties/index.html b/mode/properties/index.html
index e21e02abd2..40ee1a37b2 100644
--- a/mode/properties/index.html
+++ b/mode/properties/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Properties files mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="properties.js"></script>
-    <style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Properties files mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Properties files 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="properties.js"></script>
+<style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Properties files</a>
+  </ul>
+</div>
+
+<article>
+<h2>Properties files mode</h2>
+<form><textarea id="code" name="code">
 # This is a properties file
 a.key = A value
 another.key = http://example.com
@@ -37,5 +50,4 @@ <h1>CodeMirror: Properties files mode</h1>
     <p><strong>MIME types defined:</strong> <code>text/x-properties</code>,
     <code>text/x-ini</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/python/index.html b/mode/python/index.html
index 1229a8bf83..497734920b 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -1,18 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Python mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="python.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Python mode</h1>
-    <h2>Python mode</h2>
+
+<title>CodeMirror: Python 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/edit/matchbrackets.js"></script>
+<script src="python.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Python</a>
+  </ul>
+</div>
+
+<article>
+<h2>Python mode</h2>
+
     <div><textarea id="code" name="code">
 # Literals
 1234
@@ -171,5 +184,4 @@ <h2>Advanced Configuration Options:</h2>
 
 
     <p><strong>MIME types defined:</strong> <code>text/x-python</code> and <code>text/x-cython</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/q/index.html b/mode/q/index.html
index 303ec1d3ad..78ed3d88ff 100644
--- a/mode/q/index.html
+++ b/mode/q/index.html
@@ -1,17 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Q mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="q.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Q mode</h1>
+
+<title>CodeMirror: Q 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/edit/matchbrackets.js"></script>
+<script src="q.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Q</a>
+  </ul>
+</div>
+
+<article>
+<h2>Q mode</h2>
+
 
 <div><textarea id="code" name="code">
 / utilities to quickly load a csv file - for more exhaustive analysis of the csv contents see csvguess.q
@@ -127,5 +141,4 @@ <h1>CodeMirror: Q mode</h1>
     </script>
 
     <p><strong>MIME type defined:</strong> <code>text/x-q</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/r/index.html b/mode/r/index.html
index 12819553e9..f73e13d621 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -1,23 +1,36 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: R mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="r.js"></script>
-    <style>
+
+<title>CodeMirror: R 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="r.js"></script>
+<style>
       .CodeMirror { border-top: 1px solid silver; border-bottom: 1px solid silver; }
       .cm-s-default span.cm-semi { color: blue; font-weight: bold; }
       .cm-s-default span.cm-dollar { color: orange; font-weight: bold; }
       .cm-s-default span.cm-arrow { color: brown; }
       .cm-s-default span.cm-arg-is { color: brown; }
     </style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: R mode</h1>
-    <form><textarea id="code" name="code">
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">R</a>
+  </ul>
+</div>
+
+<article>
+<h2>R mode</h2>
+<form><textarea id="code" name="code">
 # Code from http://www.mayin.org/ajayshah/KB/R/
 
 # FIRST LEARN ABOUT LISTS --
@@ -70,5 +83,4 @@ <h1>CodeMirror: R mode</h1>
     by <a href="http://ubalo.com/">Ubalo</a>, who hold
     the <a href="LICENSE">license</a>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
index e0e2d8778b..18fe7ab7bf 100644
--- a/mode/rpm/changes/index.html
+++ b/mode/rpm/changes/index.html
@@ -1,17 +1,32 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: RPM changes mode</title>
+
+<title>CodeMirror: RPM changes 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="changes.js"></script>
     <link rel="stylesheet" href="../../../doc/docs.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: RPM changes mode</h1>
-    
+
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../../index.html">Language modes</a>
+    <li><a class=active href="#">RPM changes</a>
+  </ul>
+</div>
+
+<article>
+<h2>RPM changes mode</h2>
+
     <div><textarea id="code" name="code">
 -------------------------------------------------------------------
 Tue Oct 18 13:58:40 UTC 2011 - misterx@example.com
@@ -49,5 +64,4 @@ <h1>CodeMirror: RPM changes mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-rpm-changes</code>.</p>
-  </body>
-</html>
+</article>
diff --git a/mode/rpm/spec/index.html b/mode/rpm/spec/index.html
index 8be98b63ec..127b72ee9d 100644
--- a/mode/rpm/spec/index.html
+++ b/mode/rpm/spec/index.html
@@ -1,17 +1,32 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: RPM spec mode</title>
+
+<title>CodeMirror: RPM spec 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="spec.js"></script>
     <link rel="stylesheet" href="spec.css">
     <link rel="stylesheet" href="../../../doc/docs.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: RPM spec mode</h1>
+
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../../index.html">Language modes</a>
+    <li><a class=active href="#">RPM spec</a>
+  </ul>
+</div>
+
+<article>
+<h2>RPM spec mode</h2>
     
     <div><textarea id="code" name="code">
 #
@@ -95,5 +110,5 @@ <h1>CodeMirror: RPM spec mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-rpm-spec</code>.</p>
-  </body>
-</html>
+
+</article>
diff --git a/mode/rst/index.html b/mode/rst/index.html
index b3ab64b80e..78030ebe94 100644
--- a/mode/rst/index.html
+++ b/mode/rst/index.html
@@ -1,17 +1,29 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: reStructuredText mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="rst.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: reStructuredText mode</h1>
 
+<title>CodeMirror: reStructuredText 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="rst.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">reStructuredText</a>
+  </ul>
+</div>
+
+<article>
+<h2>reStructuredText mode</h2>
 <form><textarea id="code" name="code">
 .. This is an excerpt from Sphinx documentation: http://sphinx.pocoo.org/_sources/rest.txt
 
@@ -519,6 +531,4 @@ <h1>CodeMirror: reStructuredText mode</h1>
     </p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-rst</code>.</p>
-  </body>
-</html>
-
+  </article>
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 64cfe5ef34..2b3e1a3eb1 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -1,21 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Ruby mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="ruby.js"></script>
-    <style>
+
+<title>CodeMirror: Ruby 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/edit/matchbrackets.js"></script>
+<script src="ruby.js"></script>
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .cm-s-default span.cm-arrow { color: red; }
     </style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Ruby mode</h1>
-    <form><textarea id="code" name="code">
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Ruby</a>
+  </ul>
+</div>
+
+<article>
+<h2>Ruby mode</h2>
+<form><textarea id="code" name="code">
 # Code from http://sandbox.mc.edu/~bennet/ruby/code/poly_rb.html
 #
 # This program evaluates polynomials.  It first asks for the coefficients
@@ -169,5 +182,4 @@ <h1>CodeMirror: Ruby mode</h1>
     by <a href="http://ubalo.com/">Ubalo</a>, who hold
     the <a href="LICENSE">license</a>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/rust/index.html b/mode/rust/index.html
index a6d47fe84d..b0b4c2416c 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -1,16 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Rust mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="rust.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Rust mode</h1>
+
+<title>CodeMirror: Rust 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="rust.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Rust</a>
+  </ul>
+</div>
+
+<article>
+<h2>Rust mode</h2>
+
 
 <div><textarea id="code" name="code">
 // Demo code.
@@ -44,5 +58,4 @@ <h1>CodeMirror: Rust mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-rustsrc</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/sass/index.html b/mode/sass/index.html
index 3af7bff9ed..66d4677844 100644
--- a/mode/sass/index.html
+++ b/mode/sass/index.html
@@ -1,18 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Sass mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="sass.js"></script>
-    <style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Sass mode</h1>
-    <form><textarea id="code" name="code">// Variable Definitions
+
+<title>CodeMirror: Sass 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/edit/matchbrackets.js"></script>
+<script src="sass.js"></script>
+<style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Sass</a>
+  </ul>
+</div>
+
+<article>
+<h2>Sass mode</h2>
+<form><textarea id="code" name="code">// Variable Definitions
 
 $page-width:    800px
 $sidebar-width: 200px
@@ -50,5 +63,4 @@ <h1>CodeMirror: Sass mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-sass</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/scheme/index.html b/mode/scheme/index.html
index 5936a0241f..164d5da60d 100644
--- a/mode/scheme/index.html
+++ b/mode/scheme/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Scheme mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="scheme.js"></script>
-    <style>.CodeMirror {background: #f8f8f8;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Scheme mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Scheme 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="scheme.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Scheme</a>
+  </ul>
+</div>
+
+<article>
+<h2>Scheme mode</h2>
+<form><textarea id="code" name="code">
 ; See if the input starts with a given symbol.
 (define (match-symbol input pattern)
   (cond ((null? (remain input)) #f)
@@ -61,5 +74,4 @@ <h1>CodeMirror: Scheme mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-scheme</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/shell/index.html b/mode/shell/index.html
index 9a2ef7c4cd..cf415e832c 100644
--- a/mode/shell/index.html
+++ b/mode/shell/index.html
@@ -1,19 +1,33 @@
 <!doctype html>
-<meta charset=utf-8>
+
 <title>CodeMirror: Shell mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
 
 <link rel=stylesheet href=../../lib/codemirror.css>
-<link rel=stylesheet href=../../doc/docs.css>
-
+<script src=../../lib/codemirror.js></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src=shell.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"><img id=logo src="../../doc/logo.png"></a>
 
-<script src=../../lib/codemirror.js></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src=shell.js></script>
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Shell</a>
+  </ul>
+</div>
+
+<article>
+<h2>Shell mode</h2>
 
-<h1>CodeMirror: Shell mode</h1>
 
 <textarea id=code>
 #!/bin/bash
@@ -49,3 +63,4 @@ <h1>CodeMirror: Shell mode</h1>
 </script>
 
 <p><strong>MIME types defined:</strong> <code>text/x-sh</code>.</p>
+</article>
diff --git a/mode/sieve/index.html b/mode/sieve/index.html
index 8b549815ce..9d814a9d5a 100644
--- a/mode/sieve/index.html
+++ b/mode/sieve/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Sieve (RFC5228) mode</title>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="sieve.js"></script>
-    <style>.CodeMirror {background: #f8f8f8;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Sieve (RFC5228) mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Sieve (RFC5228) 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="sieve.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Sieve (RFC5228)</a>
+  </ul>
+</div>
+
+<article>
+<h2>Sieve (RFC5228) mode</h2>
+<form><textarea id="code" name="code">
 #
 # Example Sieve Filter
 # Declare any optional features or extension used by the script
@@ -77,5 +90,4 @@ <h1>CodeMirror: Sieve (RFC5228) mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>application/sieve</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/smalltalk/index.html b/mode/smalltalk/index.html
index b7aebdb7fb..0d2b172e17 100644
--- a/mode/smalltalk/index.html
+++ b/mode/smalltalk/index.html
@@ -1,22 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Smalltalk mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="smalltalk.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>
+
+<title>CodeMirror: Smalltalk 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/edit/matchbrackets.js"></script>
+<script src="smalltalk.js"></script>
+<style>
       .CodeMirror {border: 2px solid #dee; border-right-width: 10px;}
       .CodeMirror-gutter {border: none; background: #dee;}
       .CodeMirror-gutter pre {color: white; font-weight: bold;}
     </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Smalltalk mode</h1>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Smalltalk</a>
+  </ul>
+</div>
 
+<article>
+<h2>Smalltalk mode</h2>
 <form><textarea id="code" name="code">
 " 
     This is a test of the Smalltalk code
@@ -53,5 +65,4 @@ <h1>CodeMirror: Smalltalk mode</h1>
     <p>Simple Smalltalk mode.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-stsrc</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index 9e41733807..d458aef0ff 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -1,19 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Smarty mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="smarty.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Smarty mode</h1>
-
-	<h3>Default settings (Smarty 2, <b>{</b> and <b>}</b> delimiters)</h3>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Smarty 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="smarty.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Smarty</a>
+  </ul>
+</div>
+
+<article>
+<h2>Smarty mode</h2>
+<form><textarea id="code" name="code">
 {extends file="parent.tpl"}
 {include file="template.tpl"}
 
@@ -122,5 +133,4 @@ <h3>Smarty 3</h3>
     <p>A plain text/Smarty version 2 or 3 mode, which allows for custom delimiter tags.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-smarty</code></p>
-  </body>
-</html>
+  </article>
diff --git a/mode/smartymixed/index.html b/mode/smartymixed/index.html
index 6567b27d6b..3de9477768 100644
--- a/mode/smartymixed/index.html
+++ b/mode/smartymixed/index.html
@@ -1,25 +1,34 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Smarty mixed mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
 
-    <!-- smartymixed dependencies -->
-    <script src="../../mode/xml/xml.js"></script>
-    <script src="../../mode/javascript/javascript.js"></script>
-    <script src="../../mode/css/css.js"></script>
-    <script src="../../mode/htmlmixed/htmlmixed.js"></script>
-    <script src="../../mode/smarty/smarty.js"></script>
+<title>CodeMirror: Smarty mixed 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="../../mode/xml/xml.js"></script>
+<script src="../../mode/javascript/javascript.js"></script>
+<script src="../../mode/css/css.js"></script>
+<script src="../../mode/htmlmixed/htmlmixed.js"></script>
+<script src="../../mode/smarty/smarty.js"></script>
+<script src="../../mode/smartymixed/smartymixed.js"></script>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Smarty mixed</a>
+  </ul>
+</div>
 
-    <!-- smartymixed -->
-    <script src="../../mode/smartymixed/smartymixed.js"></script>
-  </head>
-  <body>
-    <h1>CodeMirror: Smarty mixed mode</h1>
-    <form><textarea id="code" name="code">
+<article>
+<h2>Smarty mixed mode</h2>
+<form><textarea id="code" name="code">
 {**
 * @brief Smarty mixed mode
 * @author Ruslan Osmanov
@@ -102,6 +111,4 @@ <h1>CodeMirror: Smarty mixed mode</h1>
     <p>It takes the same options, as Smarty and HTML mixed modes.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-smarty</code>.</p>
-  </body>
-</html>
-<!-- vim: set ft=html ts=2 sts=2 sw=2 et: -->
+  </article>
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index e7433871c7..7c41e17b77 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -1,18 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: SPARQL mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="sparql.js"></script>
-    <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: SPARQL mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: SPARQL 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/edit/matchbrackets.js"></script>
+<script src="sparql.js"></script>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">SPARQL</a>
+  </ul>
+</div>
+
+<article>
+<h2>SPARQL mode</h2>
+<form><textarea id="code" name="code">
 PREFIX a: &lt;http://www.w3.org/2000/10/annotation-ns#>
 PREFIX dc: &lt;http://purl.org/dc/elements/1.1/>
 PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/>
@@ -38,5 +51,4 @@ <h1>CodeMirror: SPARQL mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>application/x-sparql-query</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/sql/index.html b/mode/sql/index.html
index acf60b88c3..550e74956e 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -1,41 +1,35 @@
 <!doctype html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <title>SQL Mode for CodeMirror</title>
-        <link rel="stylesheet" href="../../lib/codemirror.css" />
-        <script src="../../lib/codemirror.js"></script>
-        <script src="sql.js"></script>
-        <style>
+
+<title>CodeMirror: SQL Mode for CodeMirror</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="sql.js"></script>
+<style>
 .CodeMirror {
     border-top: 1px solid black;
     border-bottom: 1px solid black;
 }
         </style>
-        <link rel="stylesheet" href="../../doc/docs.css">
-        <script>
-var init = function() {
-    var mime = 'text/x-mariadb';
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
 
-    // get mime type
-    if (window.location.href.indexOf('mime=') > -1) {
-        mime = window.location.href.substr(window.location.href.indexOf('mime=') + 5);
-    }
+  <ul>
+    <li><a href="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">SQL Mode for CodeMirror</a>
+  </ul>
+</div>
 
-    window.editor = CodeMirror.fromTextArea(document.getElementById('code'), {
-        mode: mime,
-        indentWithTabs: true,
-        smartIndent: true,
-        lineNumbers: true,
-        matchBrackets : true,
-        autofocus: true
-    });
-};
-        </script>
-    </head>
-    <body onload="init();">
-        <h1>SQL Mode for CodeMirror</h1>
-        <form>
+<article>
+<h2>SQL Mode for CodeMirror</h2>
+<form>
             <textarea id="code" name="code">-- SQL Mode for CodeMirror
 SELECT SQL_NO_CACHE DISTINCT
 		@var1 AS `val1`, @'val2', @global.'sql_mode',
@@ -64,5 +58,4 @@ <h1>SQL Mode for CodeMirror</h1>
             <a href="../../test/index.html#sql_*">normal</a>,
             <a href="../../test/index.html#verbose,sql_*">verbose</a>.
         </p>
-    </body>
-</html>
+    </article>
diff --git a/mode/stex/index.html b/mode/stex/index.html
index 2dafe69816..28b8f64be3 100644
--- a/mode/stex/index.html
+++ b/mode/stex/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: sTeX mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="stex.js"></script>
-    <style>.CodeMirror {background: #f8f8f8;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: sTeX mode</h1>
-     <form><textarea id="code" name="code">
+
+<title>CodeMirror: sTeX 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="stex.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">sTeX</a>
+  </ul>
+</div>
+
+<article>
+<h2>sTeX mode</h2>
+<form><textarea id="code" name="code">
 \begin{module}[id=bbt-size]
 \importmodule[balanced-binary-trees]{balanced-binary-trees}
 \importmodule[\KWARCslides{dmath/en/cardinality}]{cardinality}
@@ -94,5 +107,4 @@ <h1>CodeMirror: sTeX mode</h1>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#stex_*">normal</a>,  <a href="../../test/index.html#verbose,stex_*">verbose</a>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/tcl/index.html b/mode/tcl/index.html
index afdf127899..2c0d1a2dea 100644
--- a/mode/tcl/index.html
+++ b/mode/tcl/index.html
@@ -1,18 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Tcl mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="tcl.js"></script>
-    <script src="../../addon/scroll/scrollpastend.js"></script>
-    <link rel="stylesheet" href="../../theme/night.css">
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Tcl mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Tcl mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/night.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="tcl.js"></script>
+<script src="../../addon/scroll/scrollpastend.js"></script>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Tcl</a>
+  </ul>
+</div>
+
+<article>
+<h2>Tcl mode</h2>
+<form><textarea id="code" name="code">
 ##############################################################################################
 ##  ##     whois.tcl for eggdrop by Ford_Lawnmower irc.geekshed.net #Script-Help        ##  ##
 ##############################################################################################
@@ -127,5 +140,4 @@ <h1>CodeMirror: Tcl mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-tcl</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index 848f33a592..fc8f5d3920 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -1,18 +1,32 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: TiddlyWiki mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-    <script src="tiddlywiki.js"></script>
-    <link rel="stylesheet" href="tiddlywiki.css">
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: TiddlyWiki mode</h1>
+
+<title>CodeMirror: TiddlyWiki mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="tiddlywiki.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src="tiddlywiki.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">TiddlyWiki</a>
+  </ul>
+</div>
+
+<article>
+<h2>TiddlyWiki mode</h2>
+
 
 <div><textarea id="code" name="code">
 !TiddlyWiki Formatting
@@ -138,5 +152,4 @@ <h1>CodeMirror: TiddlyWiki mode</h1>
     <p>TiddlyWiki mode supports a single configuration.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-tiddlywiki</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/tiki/index.html b/mode/tiki/index.html
index 7b85a44a7e..5315dbfcda 100644
--- a/mode/tiki/index.html
+++ b/mode/tiki/index.html
@@ -1,16 +1,31 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Tiki wiki mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="tiki.js"></script>
-    <link rel="stylesheet" href="tiki.css">
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body style="padding: 20px;">
-    <h1>CodeMirror: Tiki wiki mode</h1>
+<!doctype html>
+
+<title>CodeMirror: Tiki wiki mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="tiki.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="tiki.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Tiki wiki</a>
+  </ul>
+</div>
+
+<article>
+<h2>Tiki wiki mode</h2>
+
 
 <div><textarea id="code" name="code">
 Headings
@@ -77,5 +92,4 @@ <h1>CodeMirror: Tiki wiki mode</h1>
     });
 </script>
 
-</body>
-</html>
+</article>
diff --git a/mode/turtle/index.html b/mode/turtle/index.html
index 5e56e5755c..74b5f896d9 100644
--- a/mode/turtle/index.html
+++ b/mode/turtle/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Turtle mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="turtle.js"></script>
-    <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Turtle mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Turtle 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="turtle.js"></script>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Turtle</a>
+  </ul>
+</div>
+
+<article>
+<h2>Turtle mode</h2>
+<form><textarea id="code" name="code">
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -35,5 +48,4 @@ <h1>CodeMirror: Turtle mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/turtle</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/vb/index.html b/mode/vb/index.html
index 74dd5e8161..42c3e5261c 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -1,21 +1,36 @@
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: VB.NET mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="vb.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <link href="http://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet" type="text/css">
-    <style>
+<!doctype html>
+
+<title>CodeMirror: VB.NET mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link href="http://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet" type="text/css">
+<script src="../../lib/codemirror.js"></script>
+<script src="vb.js"></script>
+<script type="text/javascript" src="../../addon/runmode/runmode.js"></script>
+<style>
       .CodeMirror {border: 1px solid #aaa; height:210px; height: auto;}
       .CodeMirror-scroll { overflow-x: auto; overflow-y: hidden;}
       .CodeMirror pre { font-family: Inconsolata; font-size: 14px}
-    </style> 
-    <script type="text/javascript" src="../../addon/runmode/runmode.js"></script>
-  </head>
-  <body onload="init()">
-    <h1>CodeMirror: VB.NET mode</h1>
+    </style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">VB.NET</a>
+  </ul>
+</div>
+
+<article>
+<h2>VB.NET mode</h2>
+
 <script type="text/javascript">
 function test(golden, text) {
   var ok = true;
@@ -76,13 +91,13 @@ <h1>CodeMirror: VB.NET mode</h1>
   initText(editor);
 	
 }
+document.body.onload = init;
 </script>
 
-
   <div id="edit">
   <textarea style="width:95%;height:200px;padding:5px;" name="solution" id="solution" ></textarea>
   </div>
   <pre id="testresult"></pre>
   <p>MIME type defined: <code>text/x-vb</code>.</p>
 
-</body></html>
+</article>
diff --git a/mode/vbscript/index.html b/mode/vbscript/index.html
index 9ae46676b2..9b506b7985 100644
--- a/mode/vbscript/index.html
+++ b/mode/vbscript/index.html
@@ -1,16 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: VBScript mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="vbscript.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: VBScript mode</h1>
+
+<title>CodeMirror: VBScript 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="vbscript.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">VBScript</a>
+  </ul>
+</div>
+
+<article>
+<h2>VBScript mode</h2>
+
 
 <div><textarea id="code" name="code">
 ' Pete Guhl
@@ -38,6 +52,4 @@ <h1>CodeMirror: VBScript mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/vbscript</code>.</p>
-  </body>
-</html>
-
+  </article>
diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index 96df4c88b8..023542d1d7 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -1,18 +1,31 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Velocity mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="velocity.js"></script>
-    <link rel="stylesheet" href="../../theme/night.css">
-    <style>.CodeMirror {border: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Velocity mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: Velocity mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/night.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="velocity.js"></script>
+<style>.CodeMirror {border: 1px solid black;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Velocity</a>
+  </ul>
+</div>
+
+<article>
+<h2>Velocity mode</h2>
+<form><textarea id="code" name="code">
 ## Velocity Code Demo
 #*
    based on PL/SQL mode by Peter Raganitsch, adapted to Velocity by Steve O'Hara ( http://www.pivotal-solutions.co.uk )
@@ -103,5 +116,4 @@ <h1>CodeMirror: Velocity mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/velocity</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index f7c88c6231..cc71056446 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -1,17 +1,29 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Verilog mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="verilog.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style>.CodeMirror {border: 2px inset #dee;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Verilog mode</h1>
 
+<title>CodeMirror: Verilog 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="verilog.js"></script>
+<style>.CodeMirror {border: 2px inset #dee;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Verilog</a>
+  </ul>
+</div>
+
+<article>
+<h2>Verilog mode</h2>
 <form><textarea id="code" name="code">
 /* Verilog demo code */
 
@@ -117,5 +129,4 @@ <h1>CodeMirror: Verilog mode</h1>
     object whose property names are the keywords in the language.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-verilog</code> (Verilog code).</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/xml/index.html b/mode/xml/index.html
index 9628d954c0..873099aab2 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: XML mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="xml.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: XML mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: XML 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="xml.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">XML</a>
+  </ul>
+</div>
+
+<article>
+<h2>XML mode</h2>
+<form><textarea id="code" name="code">
 &lt;html style="color: green"&gt;
   &lt;!-- this is a comment --&gt;
   &lt;head&gt;
@@ -41,5 +54,4 @@ <h1>CodeMirror: XML mode</h1>
     </dl>
 
     <p><strong>MIME types defined:</strong> <code>application/xml</code>, <code>text/html</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/mode/xquery/index.html b/mode/xquery/index.html
index 27acb89786..3baf5e3e3b 100644
--- a/mode/xquery/index.html
+++ b/mode/xquery/index.html
@@ -1,46 +1,36 @@
-<!doctype html> 
-<html> 
-<!--
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
--->
-  <head> 
-    <meta charset="utf-8">
-    <title>CodeMirror: XQuery mode</title> 
-    <link rel="stylesheet" href="../../lib/codemirror.css"> 
-    <script src="../../lib/codemirror.js"></script> 
-    <script src="xquery.js"></script> 
-    <link rel="stylesheet" href="../../doc/docs.css"> 
-    <link rel="stylesheet" href="../../theme/xq-dark.css"> 
-    <style type="text/css">
+<!doctype html>
+
+<title>CodeMirror: XQuery mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/xq-dark.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="xquery.js"></script>
+<style type="text/css">
 	.CodeMirror {
 	  border-top: 1px solid black; border-bottom: 1px solid black;
 	  height:400px;
 	}
-    </style> 
-  </head> 
-  <body> 
-    <h1>CodeMirror: XQuery mode</h1> 
+    </style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">XQuery</a>
+  </ul>
+</div>
+
+<article>
+<h2>XQuery mode</h2>
+ 
  
 <div class="cm-s-default"> 
 	<textarea id="code" name="code"> 
@@ -217,5 +207,4 @@ <h1>CodeMirror: XQuery mode</h1>
       <a href="https://twitter.com/mbrevoort">Mike Brevoort</a>.
     </p>
  
-  </body> 
-</html>
+  </article>
diff --git a/mode/yaml/index.html b/mode/yaml/index.html
index 65e1ea73fb..bbb40a3c7d 100644
--- a/mode/yaml/index.html
+++ b/mode/yaml/index.html
@@ -1,17 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: YAML mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="yaml.js"></script>
-    <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: YAML mode</h1>
-    <form><textarea id="code" name="code">
+
+<title>CodeMirror: YAML 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="yaml.js"></script>
+<style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">YAML</a>
+  </ul>
+</div>
+
+<article>
+<h2>YAML mode</h2>
+<form><textarea id="code" name="code">
 --- # Favorite movies
 - Casablanca
 - North by Northwest
@@ -64,5 +77,4 @@ <h1>CodeMirror: YAML mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-yaml</code>.</p>
 
-  </body>
-</html>
+  </article>
diff --git a/mode/z80/index.html b/mode/z80/index.html
index 133c870e32..b63c9621aa 100644
--- a/mode/z80/index.html
+++ b/mode/z80/index.html
@@ -1,16 +1,30 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Z80 assembly mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="z80.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Z80 assembly mode</h1>
+
+<title>CodeMirror: Z80 assembly 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="z80.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Z80 assembly</a>
+  </ul>
+</div>
+
+<article>
+<h2>Z80 assembly mode</h2>
+
 
 <div><textarea id="code" name="code">
 #include    "ti83plus.inc"
@@ -35,5 +49,4 @@ <h1>CodeMirror: Z80 assembly mode</h1>
     </script>
 
     <p><strong>MIME type defined:</strong> <code>text/x-z80</code>.</p>
-  </body>
-</html>
+  </article>
diff --git a/test/index.html b/test/index.html
index 5ead383a1d..8e45b6d075 100644
--- a/test/index.html
+++ b/test/index.html
@@ -1,49 +1,62 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Test Suite</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <link rel="stylesheet" href="../doc/docs.css">
-    <link rel="stylesheet" href="mode_test.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../addon/mode/overlay.js"></script>
-    <script src="../addon/mode/multiplex.js"></script>
-    <script src="../addon/search/searchcursor.js"></script>
-    <script src="../addon/dialog/dialog.js"></script>
-    <script src="../addon/edit/matchbrackets.js"></script>
-    <script src="../addon/comment/comment.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../keymap/vim.js"></script>
-    <script src="../keymap/emacs.js"></script>
 
-    <style type="text/css">
-      .ok {color: #090;}
-      .fail {color: #e00;}
-      .error {color: #c90;}
-      .done {font-weight: bold;}
-      #progress {
-        background: #45d;
-        color: white;
-        text-shadow: 0 0 1px #45d, 0 0 2px #45d, 0 0 3px #45d;
-        font-weight: bold;
-        white-space: pre;
-      }
-      #testground {
-        visibility: hidden;
-      }
-      #testground.offscreen {
-        visibility: visible;
-        position: absolute;
-        left: -10000px;
-        top: -10000px;
-      }
-      .CodeMirror { border: 1px solid black; }
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Test Suite</h1>
+<title>CodeMirror: Test Suite</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="mode_test.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../addon/mode/overlay.js"></script>
+<script src="../addon/mode/multiplex.js"></script>
+<script src="../addon/search/searchcursor.js"></script>
+<script src="../addon/dialog/dialog.js"></script>
+<script src="../addon/edit/matchbrackets.js"></script>
+<script src="../addon/comment/comment.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<script src="../keymap/vim.js"></script>
+<script src="../keymap/emacs.js"></script>
+
+<style type="text/css">
+  .ok {color: #090;}
+  .fail {color: #e00;}
+  .error {color: #c90;}
+  .done {font-weight: bold;}
+  #progress {
+  background: #45d;
+  color: white;
+  text-shadow: 0 0 1px #45d, 0 0 2px #45d, 0 0 3px #45d;
+  font-weight: bold;
+  white-space: pre;
+  }
+  #testground {
+  visibility: hidden;
+  }
+  #testground.offscreen {
+  visibility: visible;
+  position: absolute;
+  left: -10000px;
+  top: -10000px;
+  }
+  .CodeMirror { border: 1px solid black; }
+</style>
+
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Test suite</a>
+  </ul>
+</div>
+
+<article>
+  <h2>Test Suite</h2>
 
     <p>A limited set of programmatic sanity tests for CodeMirror.</p>
 
@@ -192,5 +205,5 @@ <h1>CodeMirror: Test Suite</h1>
         }
       }
     </script>
-  </body>
-</html>
+
+</article>

From 33a142f15e39133e61d042357e31b7c5293ef37b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 Aug 2013 22:29:55 +0200
Subject: [PATCH 0361/4742] [project page] Fix broken sentence

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 3bd665e871..bb3af9a68b 100644
--- a/index.html
+++ b/index.html
@@ -179,8 +179,8 @@ <h2>Browser support</h2>
     <tr><th>Opera</th><td>version 9 and up</td></tr>
   </table>
   <p>Modern mobile browsers tend to partly work. Bug reports and
-  patches for mobile support, but the maintainer does not have the
-  time budget to actually work on it himself.</p>
+  patches for mobile support are welcome, but the maintainer does not
+  have the time budget to actually work on it himself.</p>
 </section>
 
 </article>

From 1a011d20a2efb0e1695b0b853bdd5a90cbd46bb2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 14 Aug 2013 08:33:57 +0200
Subject: [PATCH 0362/4742] [project page] Tweaks based on mailing list
 feedback

---
 doc/docs.css | 40 ++++++++++++++++++++++++----------------
 index.html   |  4 +++-
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/doc/docs.css b/doc/docs.css
index 9cd7319f38..920b39e3ea 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -10,22 +10,6 @@ section, article { display: block; padding: 0; }
 
 body {
   background: #f8f8f8;
-}
-
-article {
-  max-width: 700px;
-  margin: 0 auto;
-  border-left: 2px solid #E30808;
-  border-right: 1px solid #ddd;
-  padding: 30px 50px 100px 50px;
-  background: white;
-  z-index: 2;
-  position: relative;
-  min-height: 100%;
-  box-sizing: border-box;
-}
-
-body {
   font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif;
   line-height: 1.5;
 }
@@ -50,6 +34,20 @@ a, a:visited, a:link, .quasilink {
   cursor: pointer;
 }
 
+article {
+  max-width: 700px;
+  margin: 0 auto;
+  border-left: 2px solid #E30808;
+  border-right: 1px solid #ddd;
+  padding: 30px 50px 100px 50px;
+  background: white;
+  z-index: 2;
+  position: relative;
+  min-height: 100%;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+}
+
 #nav {
   position: fixed;
   top: 30px;
@@ -59,6 +57,16 @@ a, a:visited, a:link, .quasilink {
   z-index: 1;
 }
 
+@media screen and (max-width: 1000px) {
+  article {
+    margin: 0 0 0 160px;
+  }
+  #nav {
+    left: 0; right: none;
+    width: 160px;
+  }
+}
+
 #nav ul {
   display: block;
   margin: 0; padding: 0;
diff --git a/index.html b/index.html
index bb3af9a68b..a3755f74ef 100644
--- a/index.html
+++ b/index.html
@@ -65,8 +65,9 @@ <h2>This is CodeMirror</h2>
     <option value="demo/complete.html">Autocompletion</option>
     <option value="demo/folding.html">Code folding</option>
     <option value="demo/theme.html">Themes</option>
+    <option value="mode/htmlmixed/index.html">Mixed language modes</option>
     <option value="demo/bidi.html">Bi-directional text</option>
-    <option value="demo/variableheight.html">Mixed font sizes</option>
+    <option value="demo/variableheight.html">Variable font sizes</option>
     <option value="demo/vim.html">Vim bindings</option>
     <option value="demo/emacs.html">Emacs bindings</option>
   </select></form>
@@ -112,6 +113,7 @@ <h2>This is CodeMirror</h2>
   <h2>Features</h2>
   <ul>
     <li>Support for <a href="mode/index.html">over 60 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>
     <li><a href="doc/manual.html#option_extraKeys">Configurable</a> keybindings

From 3fdc481a5eba4a8059d2dd7945d4e9e1d5b1d1c2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 14 Aug 2013 08:43:07 +0200
Subject: [PATCH 0363/4742] Add (undocumented, not yet final) extra argument to
 setSelection and extendSelection

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4e610ee64b..af20122ae9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4767,11 +4767,11 @@ window.CodeMirror = (function() {
       if (extend) extendSelection(this, pos);
       else setSelection(this, pos, pos);
     }),
-    setSelection: docOperation(function(anchor, head) {
-      setSelection(this, clipPos(this, anchor), clipPos(this, head || anchor));
+    setSelection: docOperation(function(anchor, head, bias) {
+      setSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), bias);
     }),
-    extendSelection: docOperation(function(from, to) {
-      extendSelection(this, clipPos(this, from), to && clipPos(this, to));
+    extendSelection: docOperation(function(from, to, bias) {
+      extendSelection(this, clipPos(this, from), to && clipPos(this, to), bias);
     }),
 
     getSelection: function(lineSep) {return this.getRange(this.sel.from, this.sel.to, lineSep);},

From b2ea0a5560b890780cd8fbd8b11d20f5eb51a490 Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Tue, 13 Aug 2013 10:53:16 -0700
Subject: [PATCH 0364/4742] [css mode] More properties for CSS Regions

---
 mode/css/css.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index c6d34a3a97..007479d693 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -391,7 +391,8 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "page", "page-break-after", "page-break-before", "page-break-inside",
     "page-policy", "pause", "pause-after", "pause-before", "perspective",
     "perspective-origin", "pitch", "pitch-range", "play-during", "position",
-    "presentation-level", "punctuation-trim", "quotes", "rendering-intent",
+    "presentation-level", "punctuation-trim", "quotes", "region-break-after",
+    "region-break-before", "region-break-inside", "region-fragment", "rendering-intent",
     "resize", "rest", "rest-after", "rest-before", "richness", "right",
     "rotation", "rotation-point", "ruby-align", "ruby-overhang", "ruby-position",
     "ruby-span", "shape-inside", "shape-outside", "size", "speak", "speak-as", "speak-header",
@@ -455,15 +456,16 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "above", "absolute", "activeborder", "activecaption", "afar",
     "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate",
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
-    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "background",
+    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "avoid-column",
+    "avoid-page", "avoid-region", "background",
     "backwards", "baseline", "below", "bidi-override", "binary", "bengali",
     "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
-    "both", "bottom", "break-all", "break-word", "button", "button-bevel",
+    "both", "bottom", "break", "break-all", "break-word", "button", "button-bevel",
     "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian",
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
     "cell", "center", "checkbox", "circle", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
-    "col-resize", "collapse", "compact", "condensed", "contain", "content",
+    "col-resize", "collapse", "column", "compact", "condensed", "contain", "content",
     "content-box", "context-menu", "continuous", "copy", "cover", "crop",
     "cross", "crosshair", "currentcolor", "cursive", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "destination-atop",
@@ -505,11 +507,11 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
     "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
     "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset", "outside",
-    "outside-shape", "overlay", "overline", "padding", "padding-box", "painted",
-    "paused", "persian", "plus-darker", "plus-lighter", "pointer", "portrait",
-    "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
-    "radio", "read-only", "read-write", "read-write-plaintext-only", "relative",
-    "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
+    "outside-shape", "overlay", "overline", "padding", "padding-box", "page",
+    "painted", "paused", "persian", "plus-darker", "plus-lighter", "pointer",
+    "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
+    "radio", "read-only", "read-write", "read-write-plaintext-only", "region",
+    "relative", "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
     "ridge", "right", "round", "row-resize", "rtl", "run-in", "running",
     "s-resize", "sans-serif", "scroll", "scrollbar", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",

From 304d306e3ad082acd838605451c984a6f5c447b7 Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Wed, 14 Aug 2013 17:21:21 -0700
Subject: [PATCH 0365/4742] [css mode] Even more properties

---
 mode/css/css.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 007479d693..0889c12e52 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -366,9 +366,9 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
     "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
     "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-    "float", "float-offset", "flow-into", "flow-from", "font", "font-feature-settings",
-    "font-family", "font-kerning", "font-language-override", "font-size",
-    "font-size-adjust", "font-stretch", "font-style", "font-synthesis", "font-variant",
+    "float", "float-offset", "font", "font-feature-settings", "font-family",
+    "font-kerning", "font-language-override", "font-size", "font-size-adjust",
+    "font-stretch", "font-style", "font-synthesis", "font-variant",
     "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
     "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
     "font-weight", "grid-cell", "grid-column", "grid-column-align",
@@ -392,10 +392,11 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "page-policy", "pause", "pause-after", "pause-before", "perspective",
     "perspective-origin", "pitch", "pitch-range", "play-during", "position",
     "presentation-level", "punctuation-trim", "quotes", "region-break-after",
-    "region-break-before", "region-break-inside", "region-fragment", "rendering-intent",
-    "resize", "rest", "rest-after", "rest-before", "richness", "right",
-    "rotation", "rotation-point", "ruby-align", "ruby-overhang", "ruby-position",
-    "ruby-span", "shape-inside", "shape-outside", "size", "speak", "speak-as", "speak-header",
+    "region-break-before", "region-break-inside", "region-fragment",
+    "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
+    "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
+    "ruby-position", "ruby-span", "shape-inside", "shape-outside", "size",
+    "speak", "speak-as", "speak-header",
     "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
     "tab-size", "table-layout", "target", "target-name", "target-new",
     "target-position", "text-align", "text-align-last", "text-decoration",
@@ -456,10 +457,9 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "above", "absolute", "activeborder", "activecaption", "afar",
     "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate",
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
-    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "avoid-column",
-    "avoid-page", "avoid-region", "background",
-    "backwards", "baseline", "below", "bidi-override", "binary", "bengali",
-    "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
+    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "avoid-column", "avoid-page",
+    "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
+    "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
     "both", "bottom", "break", "break-all", "break-word", "button", "button-bevel",
     "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian",
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
@@ -472,7 +472,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "destination-in", "destination-out", "destination-over", "devanagari",
     "disc", "discard", "document", "dot-dash", "dot-dot-dash", "dotted",
     "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
-    "element", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
+    "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
     "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
     "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
     "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
@@ -506,11 +506,11 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
     "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
-    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset", "outside",
-    "outside-shape", "overlay", "overline", "padding", "padding-box", "page",
-    "painted", "paused", "persian", "plus-darker", "plus-lighter", "pointer",
-    "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
-    "radio", "read-only", "read-write", "read-write-plaintext-only", "region",
+    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
+    "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
+    "painted", "page", "paused", "persian", "plus-darker", "plus-lighter", "pointer",
+    "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
+    "radio", "read-only", "read-write", "read-write-plaintext-only", "rectangle", "region",
     "relative", "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
     "ridge", "right", "round", "row-resize", "rtl", "run-in", "running",
     "s-resize", "sans-serif", "scroll", "scrollbar", "se-resize", "searchfield",

From 431a54bbc65beec9f1f89048605f5f820559cd3c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 11:29:41 +0200
Subject: [PATCH 0366/4742] [project page] Fix mailing list links

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index a3755f74ef..127672dc8b 100644
--- a/index.html
+++ b/index.html
@@ -154,9 +154,9 @@ <h2>Community</h2>
   license that CodeMirror uses.</p>
 
   <p>Discussion around the project is done on
-  a <a href="groups.google.com/group/codemirror">mailing list</a>.
+  a <a href="http://groups.google.com/group/codemirror">mailing list</a>.
   There is also
-  the <a href="groups.google.com/group/codemirror-announce">codemirror-announce</a>
+  the <a href="http://groups.google.com/group/codemirror-announce">codemirror-announce</a>
   list, which is only used for major announcements (such as new
   versions). If needed, you can
   contact <a href="mailto:marijnh@gmail.com">the maintainer</a>

From 04554917a8aebee3b10f5a992540bcb0f0648e06 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 11:59:09 +0200
Subject: [PATCH 0367/4742] [sql mode] Fix demo page

---
 mode/sql/index.html | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index 550e74956e..0dbdb6722c 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -53,9 +53,22 @@ <h2>SQL Mode for CodeMirror</h2>
             <code><a href="?mime=text/x-cassandra">text/x-cassandra</a></code>,
             <code><a href="?mime=text/x-plsql">text/x-plsql</a></code>.
         </p>
-        <p>
-            <strong>Tests:</strong>
-            <a href="../../test/index.html#sql_*">normal</a>,
-            <a href="../../test/index.html#verbose,sql_*">verbose</a>.
-        </p>
-    </article>
+<script>
+window.onload = function() {
+  var mime = 'text/x-mariadb';
+  // get mime type
+  if (window.location.href.indexOf('mime=') > -1) {
+    mime = window.location.href.substr(window.location.href.indexOf('mime=') + 5);
+  }
+  window.editor = CodeMirror.fromTextArea(document.getElementById('code'), {
+    mode: mime,
+    indentWithTabs: true,
+    smartIndent: true,
+    lineNumbers: true,
+    matchBrackets : true,
+    autofocus: true
+  });
+};
+</script>
+
+</article>

From 6d5a70140a5f27d58370f7913e8df726bb55b45b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 13:37:04 +0200
Subject: [PATCH 0368/4742] [yaml mode] More precise parsing of mapping keys

Issue #1735
---
 mode/yaml/yaml.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index 7a095b31db..efacd7d563 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -26,14 +26,6 @@ CodeMirror.defineMode("yaml", function() {
         /* array list item */
         if (stream.match(/\s*-\s+/)) { return 'meta'; }
       }
-      /* pairs (associative arrays) -> key */
-      if (!state.pair && stream.match(/^\s*([a-z0-9\._-])+(?=\s*:)/i)) {
-        state.pair = true;
-        state.keyCol = stream.indentation();
-        return "atom";
-      }
-      if (state.pair && stream.match(/^:\s*/)) { state.pairStart = true; return 'meta'; }
-
       /* inline pairs/lists */
       if (stream.match(/^(\{|\}|\[|\])/)) {
         if (ch == '{')
@@ -74,6 +66,14 @@ CodeMirror.defineMode("yaml", function() {
         if (stream.match(keywordRegex)) { return 'keyword'; }
       }
 
+      /* pairs (associative arrays) -> key */
+      if (!state.pair && stream.match(/^\s*\S+(?=\s*:($|\s))/i)) {
+        state.pair = true;
+        state.keyCol = stream.indentation();
+        return "atom";
+      }
+      if (state.pair && stream.match(/^:\s*/)) { state.pairStart = true; return 'meta'; }
+
       /* nothing found, continue */
       state.pairStart = false;
       state.escaped = (ch == '\\');

From ddf3fbd597fe83186a434f82e907c2cdee8048c2 Mon Sep 17 00:00:00 2001
From: angelozerr <angelo.zerr@gmail.com>
Date: Mon, 12 Aug 2013 16:40:20 +0200
Subject: [PATCH 0369/4742] Style activeline + matchingbrackets with the CSS
 themes.

---
 demo/theme.html                   | 6 +++++-
 theme/3024-day.css                | 1 +
 theme/3024-night.css              | 1 +
 theme/ambiance.css                | 2 ++
 theme/base16-dark.css             | 1 +
 theme/base16-light.css            | 1 +
 theme/blackboard.css              | 3 +++
 theme/cobalt.css                  | 3 +++
 theme/eclipse.css                 | 6 ++----
 theme/elegant.css                 | 3 +++
 theme/erlang-dark.css             | 3 +++
 theme/lesser-dark.css             | 3 +++
 theme/midnight.css                | 1 +
 theme/monokai.css                 | 1 +
 theme/neat.css                    | 3 +++
 theme/night.css                   | 3 +++
 theme/paraiso-dark.css            | 1 +
 theme/paraiso-light.css           | 1 +
 theme/rubyblue.css                | 2 ++
 theme/solarized.css               | 3 +++
 theme/tomorrow-night-eighties.css | 1 +
 theme/twilight.css                | 2 ++
 theme/vibrant-ink.css             | 3 +++
 theme/xq-dark.css                 | 5 ++++-
 theme/xq-light.css                | 2 +-
 25 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/demo/theme.html b/demo/theme.html
index 936df29c87..d6aba19870 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -32,6 +32,8 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../keymap/extra.js"></script>
+<script src="../addon/selection/active-line.js"></script>
+<script src="../addon/edit/matchbrackets.js"></script>
 <style type="text/css">
       .CodeMirror {border: 1px solid black; font-size:13px}
     </style>
@@ -96,7 +98,9 @@ <h2>Theme Demo</h2>
 
 <script>
   var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-    lineNumbers: true
+    lineNumbers: true,
+    styleActiveLine: true,
+    matchBrackets: true
   });
   var input = document.getElementById("select");
   function selectTheme() {
diff --git a/theme/3024-day.css b/theme/3024-day.css
index e931a49de4..5a5d8395d6 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -30,4 +30,5 @@
 .cm-s-3024-day span.cm-tag {color: #db2d20;}
 .cm-s-3024-day span.cm-link {color: #a16a94;}
 
+.cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/3024-night.css b/theme/3024-night.css
index 87c7f8abe0..ec997a32eb 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -30,4 +30,5 @@
 .cm-s-3024-night span.cm-tag {color: #db2d20;}
 .cm-s-3024-night span.cm-link {color: #a16a94;}
 
+.cm-s-3024-night .CodeMirror-activeline-background {background: #2F2F2F !important;}
 .cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/ambiance.css b/theme/ambiance.css
index 0185426f01..9c4a047da9 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -69,6 +69,8 @@
   background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
 }
 
+.cm-s-ambiance .CodeMirror-activeline-background {background: #3C3636 !important;}
+
 .cm-s-ambiance.CodeMirror,
 .cm-s-ambiance .CodeMirror-gutters {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 7a818b75f5..5ab6649010 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -30,4 +30,5 @@
 .cm-s-base16-dark span.cm-tag {color: #ac4142;}
 .cm-s-base16-dark span.cm-link {color: #aa759f;}
 
+.cm-s-base16-dark .CodeMirror-activeline-background {background: #2F2F2F !important;}
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/base16-light.css b/theme/base16-light.css
index a3b2d4dcba..d77fef808c 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -30,4 +30,5 @@
 .cm-s-base16-light span.cm-tag {color: #ac4142;}
 .cm-s-base16-light span.cm-link {color: #aa759f;}
 
+.cm-s-base16-light .CodeMirror-activeline-background {background: #DDDCDC !important;}
 .cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/blackboard.css b/theme/blackboard.css
index f2bde690c8..364112b089 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -23,3 +23,6 @@
 .cm-s-blackboard .cm-header { color: #FF6400; }
 .cm-s-blackboard .cm-hr { color: #AEAEAE; }
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
+
+.cm-s-blackboard .CodeMirror-activeline-background {background: #3C3636 !important;}
+.cm-s-blackboard .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
\ No newline at end of file
diff --git a/theme/cobalt.css b/theme/cobalt.css
index 6095799f36..2cfa22d338 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -16,3 +16,6 @@
 .cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
 .cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
 .cm-s-cobalt span.cm-link { color: #845dc4; }
+
+.cm-s-cobalt .CodeMirror-activeline-background {background: #002D57 !important;}
+.cm-s-cobalt .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
diff --git a/theme/eclipse.css b/theme/eclipse.css
index 4137bbe26e..13eb203258 100644
--- a/theme/eclipse.css
+++ b/theme/eclipse.css
@@ -19,7 +19,5 @@
 .cm-s-eclipse span.cm-attribute {color: #00c;}
 .cm-s-eclipse span.cm-link {color: #219;}
 
-.cm-s-eclipse .CodeMirror-matchingbracket {
-	outline:1px solid grey;
-	color:black !important;
-}
+.cm-s-eclipse .CodeMirror-activeline-background {background: #e8f2ff !important;}
+.cm-s-eclipse .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/theme/elegant.css b/theme/elegant.css
index d0ce0cb566..67d663bd99 100644
--- a/theme/elegant.css
+++ b/theme/elegant.css
@@ -8,3 +8,6 @@
 .cm-s-elegant span.cm-builtin {color: #30a;}
 .cm-s-elegant span.cm-error {background-color: #fdd;}
 .cm-s-elegant span.cm-link {color: #762;}
+
+.cm-s-elegant .CodeMirror-activeline-background {background: #e8f2ff !important;}
+.cm-s-elegant .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index cf5bf2bd6e..fce9f68664 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -19,3 +19,6 @@
 .cm-s-erlang-dark span.cm-tag        { color: #9effff; }
 .cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
 .cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
+
+.cm-s-erlang-dark .CodeMirror-activeline-background {background: #013461 !important;}
+.cm-s-erlang-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 0bd08f5c6d..ad0bfebfc8 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -42,3 +42,6 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-quote {color: #090;}
 .cm-s-lesser-dark span.cm-hr {color: #999;}
 .cm-s-lesser-dark span.cm-link {color: #00c;}
+
+.cm-s-lesser-dark .CodeMirror-activeline-background {background: #3C3A3A !important;}
+.cm-s-lesser-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/midnight.css b/theme/midnight.css
index bc2d49be1c..d51c915e1c 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -37,6 +37,7 @@
 .cm-s-midnight span.cm-tag {color: #008;}
 .cm-s-midnight span.cm-link {color: #AE81FF;}
 
+.cm-s-midnight .CodeMirror-activeline-background {background: #192741 !important;}
 .cm-s-midnight .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
diff --git a/theme/monokai.css b/theme/monokai.css
index a0b3c7c0af..ea68a59b50 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -22,6 +22,7 @@
 .cm-s-monokai span.cm-tag {color: #f92672;}
 .cm-s-monokai span.cm-link {color: #ae81ff;}
 
+.cm-s-monokai .CodeMirror-activeline-background {background: #373831 !important;}
 .cm-s-monokai .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
diff --git a/theme/neat.css b/theme/neat.css
index 8a307f802c..115083b812 100644
--- a/theme/neat.css
+++ b/theme/neat.css
@@ -7,3 +7,6 @@
 .cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
 .cm-s-neat span.cm-meta {color: #555;}
 .cm-s-neat span.cm-link { color: #3a3; }
+
+.cm-s-neat .CodeMirror-activeline-background {background: #e8f2ff !important;}
+.cm-s-neat .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/theme/night.css b/theme/night.css
index 8804a399a1..e820239453 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -19,3 +19,6 @@
 .cm-s-night span.cm-comment { color: #6900a1; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
 .cm-s-night span.cm-link { color: #845dc4; }
+
+.cm-s-night .CodeMirror-activeline-background {background: #1C005A !important;}
+.cm-s-night .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index abee9ab860..4e1585c5d9 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -30,4 +30,5 @@
 .cm-s-paraiso-dark span.cm-tag {color: #ef6155;}
 .cm-s-paraiso-dark span.cm-link {color: #815ba4;}
 
+.cm-s-paraiso-dark .CodeMirror-activeline-background {background: #4D344A !important;}
 .cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index e9da474c82..d24625942e 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -30,4 +30,5 @@
 .cm-s-paraiso-light span.cm-tag {color: #ef6155;}
 .cm-s-paraiso-light span.cm-link {color: #815ba4;}
 
+.cm-s-paraiso-light .CodeMirror-activeline-background {background: #CFD1C4 !important;}
 .cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index 23c0cc74e8..ed470f0edc 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -19,3 +19,5 @@
 .cm-s-rubyblue span.cm-link { color: #F4C20B; }
 .cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
 .cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
+
+.cm-s-rubyblue .CodeMirror-activeline-background {background: #173047 !important;}
diff --git a/theme/solarized.css b/theme/solarized.css
index 06a6c7fa1b..85b1f0a888 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -205,3 +205,6 @@ View-port and gutter both get little noise background to give it a real feel.
 .cm-s-solarized .CodeMirror-gutters {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
 }
+
+.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {background: #013542 !important;}
+.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {background: #EBE0C3 !important;}
\ No newline at end of file
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index d682120c74..7ba545b9ff 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -30,4 +30,5 @@
 .cm-s-tomorrow-night-eighties span.cm-tag {color: #f2777a;}
 .cm-s-tomorrow-night-eighties span.cm-link {color: #a16a94;}
 
+.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background {background: #343600 !important;}
 .cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/twilight.css b/theme/twilight.css
index fd8944ba8d..0180b222c4 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -24,3 +24,5 @@
 .cm-s-twilight .cm-hr { color: #AEAEAE; }
 .cm-s-twilight .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; } /**/
 
+.cm-s-twilight .CodeMirror-activeline-background {background: #27282E !important;}
+.cm-s-twilight .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index 4445be2d71..fdf7430cb9 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -25,3 +25,6 @@
 .cm-s-vibrant-ink .cm-header { color: #FF6400; }
 .cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
 .cm-s-vibrant-ink .cm-link { color: blue; }
+
+.cm-s-vibrant-ink .CodeMirror-activeline-background {background: #27282E !important;}
+.cm-s-vibrant-ink .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index fd9bb12abc..e493d324af 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 .cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-xq-dark span.CodeMirror-selected { background: #a8f !important; }
+.cm-s-xq-dark .CodeMirror-selected { background: #27007A !important; }
 .cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
 .cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
@@ -44,3 +44,6 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-bracket {color: #cc7;}
 .cm-s-xq-dark span.cm-tag {color: #FFBD40;}
 .cm-s-xq-dark span.cm-attribute {color: #FFF700;}
+
+.cm-s-xq-dark .CodeMirror-activeline-background {background: #27282E !important;}
+.cm-s-xq-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
\ No newline at end of file
diff --git a/theme/xq-light.css b/theme/xq-light.css
index 08784d58c4..8cd815d24c 100644
--- a/theme/xq-light.css
+++ b/theme/xq-light.css
@@ -40,4 +40,4 @@ THE SOFTWARE.
 .cm-s-xq-light span.cm-attribute {color: #7F007F;}
 
 .cm-s-xq-light .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-xq-light .CodeMirror-matchingbracket {border:1px solid grey;color:black !important;background:yellow;}
\ No newline at end of file
+.cm-s-xq-light .CodeMirror-matchingbracket {outline:1px solid grey;color:black !important;background:yellow;}
\ No newline at end of file

From 826d5cf4307a7beae09825dd48d358ed9fd24cea Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 14:33:55 +0200
Subject: [PATCH 0370/4742] [default theme] Add activeline-background style

Issue #1739
---
 demo/activeline.html | 1 -
 lib/codemirror.css   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/activeline.html b/demo/activeline.html
index a9b000e65b..14851c35e4 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -10,7 +10,6 @@
 <script src="../addon/selection/active-line.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .CodeMirror-activeline-background {background: #e8f2ff !important;}
     </style>
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 584eecbfd3..c95db6445c 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -95,6 +95,7 @@
 
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
 div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+.CodeMirror-activeline-background {background: #e8f2ff;}
 
 /* STOP */
 

From 16541af8c36c4a8723534e684cbd8f4922fadcd3 Mon Sep 17 00:00:00 2001
From: angelozerr <angelo.zerr@gmail.com>
Date: Mon, 12 Aug 2013 18:00:56 +0200
Subject: [PATCH 0371/4742] [comment-fold addon] Implement

---
 addon/fold/comment-fold.js | 44 ++++++++++++++++++++++++++++++++++++++
 demo/folding.html          | 10 +++++++--
 mode/xquery/xquery.js      |  6 +++++-
 3 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 addon/fold/comment-fold.js

diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
new file mode 100644
index 0000000000..3f42bee4bf
--- /dev/null
+++ b/addon/fold/comment-fold.js
@@ -0,0 +1,44 @@
+CodeMirror.registerHelper("fold", "comment", function(cm, start) {
+  var mode = cm.getMode(), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
+  if (!startToken || !endToken) return;
+  var line = start.line, lineText = cm.getLine(line);
+  var startCh, tokenType;
+
+  function findOpening(openCh) {
+    for (var at = start.ch, pass = 0;;) {
+      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
+      if (found == -1) {
+        if (pass == 1) break;
+        pass = 1;
+        at = lineText.length;
+        continue;
+      }
+      if (pass == 1 && found < start.ch) break;
+      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
+      if (/^(comment)/.test(tokenType)) return found + 1;
+      at = found - 1;
+    }
+  }
+
+  var startCh = findOpening(startToken);
+  if (startCh == null) return;
+  var count = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
+    for (;;) {
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+      if (nextOpen < 0) nextOpen = text.length;
+      if (nextClose < 0) nextClose = text.length;
+      pos = Math.min(nextOpen, nextClose);
+      if (pos == text.length) break;
+      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
+        if (pos == nextOpen) ++count;
+        else if (!--count) { end = i; endCh = pos; break outer; }
+      }
+      ++pos;
+    }
+  }
+  if (end == null || line == end && endCh == startCh) return;
+  return {from: CodeMirror.Pos(line, startCh),
+          to: CodeMirror.Pos(end, endCh)};
+});
\ No newline at end of file
diff --git a/demo/folding.html b/demo/folding.html
index 51faf7069d..29ddb15cb1 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -10,6 +10,7 @@
 <script src="../addon/fold/foldgutter.js"></script>
 <script src="../addon/fold/brace-fold.js"></script>
 <script src="../addon/fold/xml-fold.js"></script>
+<script src="../addon/fold/comment-fold.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <style type="text/css">
@@ -55,7 +56,10 @@ <h2>Code Folding Demo</h2>
       <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
       <div style="max-width: 50em">HTML:<br><textarea id="code-html" name="code-html"></textarea></div>
     </form>
-    <script id="script">
+    <script id="script"> 
+/*
+ * Demonstration of code folding
+ */
 window.onload = function() {
   var te = document.getElementById("code");
   var sc = document.getElementById("script");
@@ -69,7 +73,9 @@ <h2>Code Folding Demo</h2>
     lineNumbers: true,
     lineWrapping: true,
     extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
-    foldGutter: true,
+    foldGutter: {
+    	rangeFinder: new CodeMirror.fold.combine(CodeMirror.fold.brace, CodeMirror.fold.comment)
+    },    
     gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   });
   editor.foldCode(CodeMirror.Pos(8, 0));
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index 95decc11b7..f4e3362905 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -442,7 +442,11 @@ CodeMirror.defineMode("xquery", function() {
       if (stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
       return style;
-    }
+    },
+    
+    blockCommentStart: "(:",
+    blockCommentEnd: ":)"
+    
   };
 
 });

From fbd43b613841c627fcd7ee11538f95a30c88388c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 12 Aug 2013 18:00:56 +0200
Subject: [PATCH 0372/4742] [comment-fold addon] Clean up

Issue #1739
---
 addon/fold/comment-fold.js | 42 +++++++++++++++++---------------------
 doc/compress.html          |  1 +
 doc/manual.html            |  7 ++++---
 mode/xquery/xquery.js      |  4 ++--
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index 3f42bee4bf..a064cf8f57 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -1,28 +1,26 @@
 CodeMirror.registerHelper("fold", "comment", function(cm, start) {
-  var mode = cm.getMode(), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
+  var mode = cm.getModeAt(start), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
   if (!startToken || !endToken) return;
   var line = start.line, lineText = cm.getLine(line);
-  var startCh, tokenType;
 
-  function findOpening(openCh) {
-    for (var at = start.ch, pass = 0;;) {
-      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
-      if (found == -1) {
-        if (pass == 1) break;
-        pass = 1;
-        at = lineText.length;
-        continue;
-      }
-      if (pass == 1 && found < start.ch) break;
-      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
-      if (/^(comment)/.test(tokenType)) return found + 1;
-      at = found - 1;
+  var startCh;
+  for (var at = start.ch, pass = 0;;) {
+    var found = at <= 0 ? -1 : lineText.lastIndexOf(startToken, at - 1);
+    if (found == -1) {
+      if (pass == 1) return;
+      pass = 1;
+      at = lineText.length;
+      continue;
     }
+    if (pass == 1 && found < start.ch) return;
+    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1)))) {
+      startCh = found + startToken.length;
+      break;
+    }
+    at = found - 1;
   }
 
-  var startCh = findOpening(startToken);
-  if (startCh == null) return;
-  var count = 1, lastLine = cm.lastLine(), end, endCh;
+  var depth = 1, lastLine = cm.lastLine(), end, endCh;
   outer: for (var i = line; i <= lastLine; ++i) {
     var text = cm.getLine(i), pos = i == line ? startCh : 0;
     for (;;) {
@@ -31,14 +29,12 @@ CodeMirror.registerHelper("fold", "comment", function(cm, start) {
       if (nextClose < 0) nextClose = text.length;
       pos = Math.min(nextOpen, nextClose);
       if (pos == text.length) break;
-      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
-        if (pos == nextOpen) ++count;
-        else if (!--count) { end = i; endCh = pos; break outer; }
-      }
+      if (pos == nextOpen) ++depth;
+      else if (!--depth) { end = i; endCh = pos; break outer; }
       ++pos;
     }
   }
   if (end == null || line == end && endCh == startCh) return;
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
-});
\ No newline at end of file
+});
diff --git a/doc/compress.html b/doc/compress.html
index 91a76b254e..fbb559e4c1 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -152,6 +152,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/edit/closetag.js">closetag.js</option>
           <option value="http://codemirror.net/addon/runmode/colorize.js">colorize.js</option>
           <option value="http://codemirror.net/addon/comment/comment.js">comment.js</option>
+          <option value="http://codemirror.net/addon/fold/comment-fold.js">comment-fold.js</option>
           <option value="http://codemirror.net/addon/comment/continuecomment.js">continuecomment.js</option>
           <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>
           <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index 37230f5426..bb4680d30c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -14,7 +14,7 @@
 <script src="../mode/css/css.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
 <style>
-  dt { text-indent: -2em; padding-left: 2em; }
+  dt { text-indent: -2em; padding-left: 5em; }
   dd { margin-left: 1.5em; }
   dl dl {margin: 0;}
 </style>
@@ -1817,8 +1817,9 @@ <h2>Addons</h2>
         finds blocks in brace languages (JavaScript, C, Java,
         etc), <code>CodeMirror.fold.indent</code>, for languages where
         indentation determines block structure (Python, Haskell),
-        and <code>CodeMirror.fold.xml</code>, for XML-style
-        languages.</dd>
+        and <code>CodeMirror.fold.xml</code>, for XML-style languages,
+        and <code>CodeMirror.fold.comment</code>, for folding comment
+        blocks.</dd>
         <dt><code><strong>widget</strong>: string|Element</code></dt>
         <dd>The widget to show for folded ranges. Can be either a
         string, in which case it'll become a span with
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index f4e3362905..04ddb8f5ae 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -443,10 +443,10 @@ CodeMirror.defineMode("xquery", function() {
       var style = state.tokenize(stream, state);
       return style;
     },
-    
+
     blockCommentStart: "(:",
     blockCommentEnd: ":)"
-    
+
   };
 
 });

From cc56aa020df77db22c20a68132b0ec6e7508b6f6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 15:00:02 +0200
Subject: [PATCH 0373/4742] [manual] Fix accidental change

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

diff --git a/doc/manual.html b/doc/manual.html
index bb4680d30c..7a85ef7f70 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -14,7 +14,7 @@
 <script src="../mode/css/css.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
 <style>
-  dt { text-indent: -2em; padding-left: 5em; }
+  dt { text-indent: -2em; padding-left: 2em; }
   dd { margin-left: 1.5em; }
   dl dl {margin: 0;}
 </style>

From c3f4f321bf8564cb60fa8dad442985fb98a318a2 Mon Sep 17 00:00:00 2001
From: "SCLINIC\\jdecker" <josiah.decker@jardogs.com>
Date: Tue, 13 Aug 2013 09:58:55 -0500
Subject: [PATCH 0374/4742] Added ability to disable cursor blinking.

When the cursor blink rate is zero (or negative) the cursor should not
blink.  Previously, it was blinking as fast as possible when the rate
was zero.
---
 lib/codemirror.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index af20122ae9..15a3daaaef 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -877,9 +877,10 @@ window.CodeMirror = (function() {
     clearInterval(display.blinker);
     var on = true;
     display.cursor.style.visibility = display.otherCursor.style.visibility = "";
-    display.blinker = setInterval(function() {
-      display.cursor.style.visibility = display.otherCursor.style.visibility = (on = !on) ? "" : "hidden";
-    }, cm.options.cursorBlinkRate);
+    if (cm.options.cursorBlinkRate > 0)
+      display.blinker = setInterval(function() {
+        display.cursor.style.visibility = display.otherCursor.style.visibility = (on = !on) ? "" : "hidden";
+      }, cm.options.cursorBlinkRate);
   }
 
   // HIGHLIGHT WORKER

From b71833f9b264fc1c57eeb0e5b340030ed56f5f7d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 15:11:14 +0200
Subject: [PATCH 0375/4742] [manual] Mention cursorBlinkRate=0 functionality

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

diff --git a/doc/manual.html b/doc/manual.html
index 7a85ef7f70..3d0b70b6dd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -344,7 +344,7 @@ <h2>Configuration</h2>
 
       <dt id="option_cursorBlinkRate"><code><strong>cursorBlinkRate</strong>: number</code></dt>
       <dd>Half-period in milliseconds used for cursor blinking. The default blink
-      rate is 530ms.</dd>
+      rate is 530ms. By setting this to zero, blinking can be disabled.</dd>
 
       <dt id="option_cursorScrollMargin"><code><strong>cursorScrollMargin</strong>: number</code></dt>
       <dd>How much extra space to always keep above and below the

From 7b883926072d71fd2d41a7ed20c63d54ee128b6b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 15:21:55 +0200
Subject: [PATCH 0376/4742] [midnight theme] Make tag style contrast with
 background

Closes #1744
---
 theme/midnight.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/midnight.css b/theme/midnight.css
index d51c915e1c..f8016a81d8 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -34,7 +34,7 @@
 .cm-s-midnight span.cm-def {color: #4DD;}
 .cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;}
 .cm-s-midnight span.cm-bracket {color: #D1EDFF;}
-.cm-s-midnight span.cm-tag {color: #008;}
+.cm-s-midnight span.cm-tag {color: #449;}
 .cm-s-midnight span.cm-link {color: #AE81FF;}
 
 .cm-s-midnight .CodeMirror-activeline-background {background: #192741 !important;}

From 7218f45a32d9c2641ea422e41c2e3c64eed8bb7d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 15:27:05 +0200
Subject: [PATCH 0377/4742] [themes] Update existing activeline rules to use
 correct class

Rather than adding a new rule.

Issue #1747
---
 theme/ambiance.css  |  4 +---
 theme/midnight.css  |  3 +--
 theme/solarized.css | 12 ++----------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/theme/ambiance.css b/theme/ambiance.css
index 9c4a047da9..53e9ce78f7 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -65,12 +65,10 @@
   border-left: 1px solid #7991E8;
 }
 
-.cm-s-ambiance .activeline {
+.cm-s-ambiance .CodeMirror-activeline-background {
   background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
 }
 
-.cm-s-ambiance .CodeMirror-activeline-background {background: #3C3636 !important;}
-
 .cm-s-ambiance.CodeMirror,
 .cm-s-ambiance .CodeMirror-gutters {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
diff --git a/theme/midnight.css b/theme/midnight.css
index f8016a81d8..2824dfa5f7 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -5,7 +5,7 @@
 .cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
 
 /*<!--activeline-->*/
-.cm-s-midnight .activeline {background: #253540 !important;}
+.cm-s-midnight .CodeMirror-activeline-background {background: #253540 !important;}
 
 .cm-s-midnight.CodeMirror {
     background: #0F192A;
@@ -37,7 +37,6 @@
 .cm-s-midnight span.cm-tag {color: #449;}
 .cm-s-midnight span.cm-link {color: #AE81FF;}
 
-.cm-s-midnight .CodeMirror-activeline-background {background: #192741 !important;}
 .cm-s-midnight .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
diff --git a/theme/solarized.css b/theme/solarized.css
index 85b1f0a888..f6b2a3f277 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -186,15 +186,10 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 Active line. Negative margin compensates left padding of the text in the
 view-port
 */
-.cm-s-solarized .activeline {
-  margin-left: -20px;
-}
-
-.cm-s-solarized.cm-s-dark .activeline {
+.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
   background: rgba(255, 255, 255, 0.05);
-
 }
-.cm-s-solarized.cm-s-light .activeline {
+.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
   background: rgba(0, 0, 0, 0.05);
 }
 
@@ -205,6 +200,3 @@ View-port and gutter both get little noise background to give it a real feel.
 .cm-s-solarized .CodeMirror-gutters {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
 }
-
-.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {background: #013542 !important;}
-.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {background: #EBE0C3 !important;}
\ No newline at end of file

From ba9033cf06bdf8ba1c05673426e22c3a07396ec8 Mon Sep 17 00:00:00 2001
From: Maksym Taran <maksym.taran@gmail.com>
Date: Tue, 13 Aug 2013 23:52:16 -0700
Subject: [PATCH 0378/4742] [clike mode] Add syntax examples for C++ & Java.

---
 mode/clike/index.html | 89 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 85 insertions(+), 4 deletions(-)

diff --git a/mode/clike/index.html b/mode/clike/index.html
index 58ba24c380..45add4910b 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -25,7 +25,8 @@
 
 <article>
 <h2>C-like mode</h2>
-<form><textarea id="code" name="code">
+
+<div><textarea id="c-code">
 /* C demo code */
 
 #include <zmq.h>
@@ -91,14 +92,94 @@ <h2>C-like mode</h2>
   pthread_detach(thread);
   return context;
 }
-</textarea></form>
+</textarea></div>
+
+<h2>C++ example</h2>
+
+<div><textarea id="cpp-code">
+#include <iostream>
+#include "mystuff/util.h"
+
+namespace {
+enum Enum {
+  VAL1, VAL2, VAL3
+};
+
+int Helper(const MyType& param) {
+  return 0;
+}
+} // namespace
+
+class ForwardDec;
+
+template <class T, class V>
+class Class : public BaseClass {
+  const MyType<T, V> member_;
+
+ public:
+  const MyType<T, V>& Method() const {
+    return member_;
+  }
+
+  void Method2(MyType<T, V>* value);
+}
+
+template <class T, class V>
+void Class::Method2(MyType<T, V>* value) {
+  std::out << 1 >> method();
+  value->Method3(member_);
+  member_ = value;
+}
+</textarea></div>
+
+<h2>Java example</h2>
+
+<div><textarea id="java-code">
+import com.demo.util.MyType;
+import com.demo.util.MyInterface;
+
+public enum Enum {
+  VAL1, VAL2, VAL3
+}
+
+public class Class<T, V> implements MyInterface {
+  public static final MyType<T, V> member;
+  
+  private class InnerClass {
+    public int zero() {
+      return 0;
+    }
+  }
+
+  @Override
+  public MyType method() {
+    return member;
+  }
+
+  public void method2(MyType<T, V> value) {
+    method();
+    value.method3();
+    member = value;
+  }
+}
+</textarea></div>
 
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+      var editor = CodeMirror.fromTextArea(document.getElementById("c-code"), {
         lineNumbers: true,
         matchBrackets: true,
         mode: "text/x-csrc"
       });
+      var editor = CodeMirror.fromTextArea(document.getElementById("cpp-code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-c++src"
+      });
+      var javaEditor = CodeMirror.fromTextArea(document.getElementById("java-code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-java"
+      });
     </script>
 
     <p>Simple mode that tries to handle C-like languages as well as it
@@ -111,4 +192,4 @@ <h2>C-like mode</h2>
     (C code), <code>text/x-c++src</code> (C++
     code), <code>text/x-java</code> (Java
     code), <code>text/x-csharp</code> (C#).</p>
-  </article>
+</article>

From 993dceea2f84c6f43ca0da7bcd7123ea873ed5ab Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@gmail.com>
Date: Tue, 13 Aug 2013 19:09:16 +0200
Subject: [PATCH 0379/4742] [tests] Support the other format of error.stack

This makes error.stack parsing work in Firefox and Opera 12-, and maybe in Safari too (didn't test).
---
 test/driver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/driver.js b/test/driver.js
index 8c32ec7faa..5befa77278 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -84,7 +84,7 @@ function runTests(callback) {
       if (expFail) callback("expected", test.name);
       else if (e instanceof Failure) callback("fail", test.name, e.message);
       else {
-        var pos = /\bat .*?([^\/:]+):(\d+):/.exec(e.stack);
+        var pos = /(?:\bat |@).*?([^\/:]+):(\d+)/.exec(e.stack);
         callback("error", test.name, e.toString() + (pos ? " (" + pos[1] + ":" + pos[2] + ")" : ""));
       }
     }

From f790cbeeafd50c5c5956b08d98c116f10b38b3b8 Mon Sep 17 00:00:00 2001
From: Chandra Sekhar Pydi <chandrap@google.com>
Date: Wed, 14 Aug 2013 15:05:00 -0700
Subject: [PATCH 0380/4742] [continuecomment addon] Continue blocks only if
 mode has blockCommentContinue

Changes in https://github.com/marijnh/CodeMirror/pull/1731 are missing.
---
 addon/comment/continuecomment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 308026229f..9dba156189 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -10,7 +10,7 @@
     var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
     var space;
 
-    if (token.type == "comment" && mode.blockCommentStart) {
+    if (token.type == "comment" && mode.blockCommentStart && mode.blockCommentContinue) {
       var end = token.string.indexOf(mode.blockCommentEnd);
       var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
       if (end != -1 && end == token.string.length - mode.blockCommentEnd.length) {

From f2c3bf51e6be8c0388b300ab1d3915775c4fd33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= <testower@gmail.com>
Date: Wed, 14 Aug 2013 21:26:55 +0200
Subject: [PATCH 0381/4742] [css mode] Added keep-all to valueKeywords. Valid
 value of e.g. word-break

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 0889c12e52..8abfb315c2 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -488,7 +488,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
     "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
     "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert",
-    "italic", "justify", "kannada", "katakana", "katakana-iroha", "khmer",
+    "italic", "justify", "kannada", "katakana", "katakana-iroha", "keep-all", "khmer",
     "landscape", "lao", "large", "larger", "left", "level", "lighter",
     "line-through", "linear", "lines", "list-item", "listbox", "listitem",
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",

From aef141a143b477a5d1bbfa61054734771676db23 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 15:44:33 +0200
Subject: [PATCH 0382/4742] [project page] Clarify sentence

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

diff --git a/index.html b/index.html
index 127672dc8b..96e2eecd24 100644
--- a/index.html
+++ b/index.html
@@ -182,7 +182,7 @@ <h2>Browser support</h2>
   </table>
   <p>Modern mobile browsers tend to partly work. Bug reports and
   patches for mobile support are welcome, but the maintainer does not
-  have the time budget to actually work on it himself.</p>
+  have the time or budget to actually work on it himself.</p>
 </section>
 
 </article>

From 8214c1fa2c9dc34dbae56958f3a21555cb092b48 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 15:57:38 +0200
Subject: [PATCH 0383/4742] [javascript mode] Improve number tokenizing

A leading minus isn't part of the number token, but numbers can
start with a dot, which wasn't handled before.

Closes #1753
---
 mode/javascript/javascript.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 0be9b79f7c..e8ace32d89 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -78,18 +78,19 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     type = tp; content = cont;
     return style;
   }
-
   function jsTokenBase(stream, state) {
     var ch = stream.next();
     if (ch == '"' || ch == "'")
       return chain(stream, state, jsTokenString(ch));
+    else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/))
+      return ret("number", "number");
     else if (/[\[\]{}\(\),;\:\.]/.test(ch))
       return ret(ch);
     else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
     }
-    else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
+    else if (/\d/.test(ch)) {
       stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");
     }

From 3b501519ffe8a0e1380ac2d746d754626f6f3528 Mon Sep 17 00:00:00 2001
From: mats cronqvist <masse@klarna.com>
Date: Fri, 16 Aug 2013 13:43:06 +0200
Subject: [PATCH 0384/4742] [erlang-mode] Improvements

---
 mode/erlang/erlang.js | 184 +++++++++++++++++++++++-------------------
 theme/erlang-dark.css |  10 ++-
 2 files changed, 108 insertions(+), 86 deletions(-)

diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index f6e304c93a..af8953c33b 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -19,6 +19,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     switch (type) {
       case "atom":        return "atom";
       case "attribute":   return "attribute";
+      case "boolean":     return "special";
       case "builtin":     return "builtin";
       case "comment":     return "comment";
       case "fun":         return "meta";
@@ -47,6 +48,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     "after","begin","catch","case","cond","end","fun","if",
     "let","of","query","receive","try","when"];
 
+  var separatorRE        = /[\->\.,:;]/;
   var separatorWords = [
     "->",";",":",".",","];
 
@@ -54,12 +56,15 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     "and","andalso","band","bnot","bor","bsl","bsr","bxor",
     "div","not","or","orelse","rem","xor"];
 
+  var symbolRE     = /[\+\-\*\/<>=\|:!]/;
   var symbolWords = [
-    "+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-"];
+    "+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"];
 
+  var openParenRE  = /[<\(\[\{]/;
   var openParenWords = [
     "<<","(","[","{"];
 
+  var closeParenRE = /[>\)\]\}]/;
   var closeParenWords = [
     "}","]",")",">>"];
 
@@ -94,37 +99,14 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     "term_to_binary","time","throw","tl","trunc","tuple_size",
     "tuple_to_list","unlink","unregister","whereis"];
 
-  // ignored for indenting purposes
-  var ignoreWords = [
-    ",", ":", "catch", "after", "of", "cond", "let", "query"];
-
-
-  var smallRE      = /[a-z_]/;
-  var largeRE      = /[A-Z_]/;
-  var digitRE      = /[0-9]/;
-  var octitRE      = /[0-7]/;
-  var anumRE       = /[a-z_A-Z0-9]/;
-  var symbolRE     = /[\+\-\*\/<>=\|:]/;
-  var openParenRE  = /[<\(\[\{]/;
-  var closeParenRE = /[>\)\]\}]/;
-  var sepRE        = /[\->\.,:;]/;
-
-  function isMember(element,list) {
-    return (-1 < list.indexOf(element));
-  }
-
-  function isPrev(stream,string) {
-    var start = stream.start;
-    var len = string.length;
-    if (len <= start) {
-      var word = stream.string.slice(start-len,start);
-      return word == string;
-    }else{
-      return false;
-    }
-  }
+// [Ø-Þ] [À-Ö]
+// [ß-ö] [ø-ÿ]
+  var anumRE       = /[\w@Ø-ÞÀ-Öß-öø-ÿ]/;
+  var escapesRE    =
+    /[0-7]{1,3}|[bdefnrstv\\"']|\^[a-zA-Z]|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+}/;
 
   function tokenize(stream, state) {
+
     // in multi-line string
     if (state.in_string) {
       state.in_string =  (!doubleQuote(stream));
@@ -143,17 +125,13 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     }
 
     // attributes and type specs
-    if ((peekToken(state).token == "" || peekToken(state).token == ".") &&
-        stream.peek() == '-') {
-      stream.next();
-      if (stream.eat(smallRE) && stream.eatWhile(anumRE)) {
-        if (isMember(stream.current(),typeWords)) {
-          return rval(state,stream,"type");
-        }else{
-          return rval(state,stream,"attribute");
-        }
+    if ((peekToken(state).token == "") &&
+        stream.match(/-\s*[a-zß-öø-ÿ][\wØ-ÞÀ-Öß-öø-ÿ]*/)) {
+      if (isMember(stream.current(),typeWords)) {
+        return rval(state,stream,"type");
+      }else{
+        return rval(state,stream,"attribute");
       }
-      stream.backUp(1);
     }
 
     var ch = stream.next();
@@ -171,24 +149,31 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     }
 
     // record
-    if ( ch == "#") {
+    if (ch == "#") {
       stream.eatWhile(anumRE);
       return rval(state,stream,"record");
     }
 
-    // char
-    if ( ch == "$") {
-      if (stream.next() == "\\") {
-        if (!stream.eatWhile(octitRE)) {
-          stream.next();
-        }
+    // dollar escape
+    if ( ch == "$" ) {
+      if (stream.next() == "\\" && !stream.match(escapesRE)) {
+        return rval(state,stream,"error");
       }
-      return rval(state,stream,"string");
+      return rval(state,stream,"number");
     }
 
     // quoted atom
     if (ch == '\'') {
-      state.in_atom = (!singleQuote(stream));
+      if (!(state.in_atom = (!singleQuote(stream)))) {
+        if (stream.match(/\s*\/\s*[0-9]/,false)) {
+          stream.match(/\s*\/\s*[0-9]/,true);
+          popToken(state);
+          return rval(state,stream,"fun");      // 'f'/0 style fun
+        }
+        if (stream.match(/\s*\(/,false) || stream.match(/\s*:/,false)) {
+          return rval(state,stream,"function");
+        }
+      }
       return rval(state,stream,"atom");
     }
 
@@ -199,23 +184,19 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     }
 
     // variable
-    if (largeRE.test(ch)) {
+    if (/[A-Z_Ø-ÞÀ-Ö]/.test(ch)) {
       stream.eatWhile(anumRE);
       return rval(state,stream,"variable");
     }
 
     // atom/keyword/BIF/function
-    if (smallRE.test(ch)) {
+    if (/[a-z_ß-öø-ÿ]/.test(ch)) {
       stream.eatWhile(anumRE);
 
-      if (stream.peek() == "/") {
-        stream.next();
-        if (stream.eatWhile(digitRE)) {
-          return rval(state,stream,"fun");      // f/0 style fun
-        }else{
-          stream.backUp(1);
-          return rval(state,stream,"atom");
-        }
+      if (stream.match(/\s*\/\s*[0-9]/,false)) {
+        stream.match(/\s*\/\s*[0-9]/,true);
+        popToken(state);
+        return rval(state,stream,"fun");      // f/0 style fun
       }
 
       var w = stream.current();
@@ -223,37 +204,38 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
       if (isMember(w,keywordWords)) {
         pushToken(state,stream);
         return rval(state,stream,"keyword");
-      }
-      if (stream.peek() == "(") {
+      }else if (stream.match(/\s*\(/,false)) {
         // 'put' and 'erlang:put' are bifs, 'foo:put' is not
         if (isMember(w,bifWords) &&
             (!isPrev(stream,":") || isPrev(stream,"erlang:"))) {
           return rval(state,stream,"builtin");
+        }else if (isMember(w,guardWords)) {
+          return rval(state,stream,"guard");
         }else{
           return rval(state,stream,"function");
         }
-      }
-      if (isMember(w,guardWords)) {
-        return rval(state,stream,"guard");
-      }
-      if (isMember(w,operatorWords)) {
+      }else if (isMember(w,operatorWords)) {
         return rval(state,stream,"operator");
-      }
-      if (stream.peek() == ":") {
+      }else if (stream.match(/\s*:/,false)) {
         if (w == "erlang") {
           return rval(state,stream,"builtin");
         } else {
           return rval(state,stream,"function");
         }
+      }else if (isMember(w,["true","false"])) {
+        return rval(state,stream,"boolean");
+      }else{
+        return rval(state,stream,"atom");
       }
-      return rval(state,stream,"atom");
     }
 
     // number
+    var digitRE      = /[0-9]/;
+    var radixRE      = /[0-9a-zA-Z]/;         // 36#zZ style int
     if (digitRE.test(ch)) {
       stream.eatWhile(digitRE);
       if (stream.eat('#')) {
-        stream.eatWhile(digitRE);    // 16#10  style integer
+        stream.eatWhile(radixRE);    // 36#aZ  style integer
       } else {
         if (stream.eat('.')) {       // float
           stream.eatWhile(digitRE);
@@ -279,7 +261,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     }
 
     // separators
-    if (greedy(stream,sepRE,separatorWords)) {
+    if (greedy(stream,separatorRE,separatorWords)) {
       // distinguish between "." as terminator and record field operator
       if (!state.in_record) {
         pushToken(state,stream);
@@ -295,6 +277,17 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     return rval(state,stream,null);
   }
 
+  function isPrev(stream,string) {
+    var start = stream.start;
+    var len = string.length;
+    if (len <= start) {
+      var word = stream.string.slice(start-len,start);
+      return word == string;
+    }else{
+      return false;
+    }
+  }
+
   function nongreedy(stream,re,words) {
     if (stream.current().length == 1 && re.test(stream.current())) {
       stream.backUp(1);
@@ -346,35 +339,37 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     return false;
   }
 
-  function Token(stream) {
-    this.token  = stream ? stream.current() : "";
-    this.column = stream ? stream.column() : 0;
-    this.indent = stream ? stream.indentation() : 0;
+  function isMember(element,list) {
+    return (-1 < list.indexOf(element));
   }
 
+/////////////////////////////////////////////////////////////////////////////
   function myIndent(state,textAfter) {
     var indent = cmCfg.indentUnit;
-    var outdentWords = ["after","catch"];
     var token = (peekToken(state)).token;
     var wordAfter = takewhile(textAfter,/[^a-z]/);
 
     if (state.in_string || state.in_atom) {
-      return 0;
-    }else if (token == "." || token == "") {
+      return CodeMirror.Pass;
+    }else if (token == "") {
       return 0;
     }else if (isMember(token,openParenWords)) {
       return (peekToken(state)).column+token.length;
+    }else if (token == "when") {
+      return (peekToken(state)).column+token.length+1;
+    }else if (token == "fun" && wordAfter == "") {
+      return (peekToken(state)).column+token.length;
     }else if (token == "->") {
-      if (wordAfter == "end") {
+      if (isMember(wordAfter,["end","after","catch"])) {
         return peekToken(state,2).column;
       }else if (peekToken(state,2).token == "fun") {
         return peekToken(state,2).column+indent;
-      }else if (peekToken(state,2).token == ".") {
+      }else if (peekToken(state,2).token == "") {
         return indent;
       }else{
         return (peekToken(state)).indent+indent;
       }
-    }else if (isMember(wordAfter,outdentWords)) {
+    }else if (isMember(wordAfter,["after","catch","of"])) {
       return (peekToken(state)).indent;
     }else{
       return (peekToken(state)).column+indent;
@@ -386,6 +381,12 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     return m ? str.slice(0,m.index) : str;
   }
 
+  function Token(stream) {
+    this.token  = stream ? stream.current() : "";
+    this.column = stream ? stream.column() : 0;
+    this.indent = stream ? stream.indentation() : 0;
+  }
+
   function popToken(state) {
     return state.tokenStack.pop();
   }
@@ -403,7 +404,13 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
   function pushToken(state,stream) {
     var token = stream.current();
     var prev_token = peekToken(state).token;
-    if (isMember(token,ignoreWords)) {
+
+    if (token == ".") {
+      state.tokenStack = [];
+      return false;
+    }else if(isMember(token,[",", ":", "of", "cond", "let", "query"])) {
+      return false;
+    }else if (drop_last(prev_token,token)) {
       return false;
     }else if (drop_both(prev_token,token)) {
       popToken(state);
@@ -411,18 +418,25 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     }else if (drop_first(prev_token,token)) {
       popToken(state);
       return pushToken(state,stream);
+    }else if (isMember(token,["after","catch"])) {
+      return false;
     }else{
       state.tokenStack.push(new Token(stream));
       return true;
     }
   }
 
+  function drop_last(open, close) {
+    switch(open+" "+close) {
+      case "when ;": return true;
+      default: return false;
+    }
+  }
+
   function drop_first(open, close) {
     switch (open+" "+close) {
       case "when ->":       return true;
       case "-> end":        return true;
-      case "-> .":          return true;
-      case ". .":           return true;
       default:              return false;
     }
   }
@@ -439,6 +453,8 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
       case "if end":      return true;
       case "receive end": return true;
       case "try end":     return true;
+      case "-> catch":    return true;
+      case "-> after":    return true;
       case "-> ;":        return true;
       default:            return false;
     }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index fce9f68664..a4a3682647 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -4,7 +4,7 @@
 .cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 
-.cm-s-erlang-dark span.cm-atom       { color: #845dc4; }
+.cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
 .cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
 .cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
 .cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
@@ -14,11 +14,17 @@
 .cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
 .cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
 .cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
-.cm-s-erlang-dark span.cm-operator   { color: #d11; }
+.cm-s-erlang-dark span.cm-operator   { color: #d55; }
+.cm-s-erlang-dark span.cm-property   { color: #ccc; }
+.cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
+.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
+.cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
 .cm-s-erlang-dark span.cm-string     { color: #3ad900; }
+.cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
 .cm-s-erlang-dark span.cm-tag        { color: #9effff; }
 .cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
 .cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
+.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
 
 .cm-s-erlang-dark .CodeMirror-activeline-background {background: #013461 !important;}
 .cm-s-erlang-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}

From e800079f2930bd670aa936740b26e462a5e4cfb4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 16:26:45 +0200
Subject: [PATCH 0385/4742] Fix another problem caused by the hack for #1474

---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 15a3daaaef..123014b4a3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1600,7 +1600,7 @@ window.CodeMirror = (function() {
       on(d.scroller, "dragover", drag_);
       on(d.scroller, "drop", operation(cm, onDrop));
     }
-    on(d.scroller, "paste", function(e){
+    on(d.scroller, "paste", function(e) {
       if (eventInWidget(d, e)) return;
       focusInput(cm);
       fastPoll(cm);
@@ -1609,7 +1609,7 @@ window.CodeMirror = (function() {
       // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
       // Add a char to the end of textarea before paste occur so that
       // selection doesn't span to the end of textarea.
-      if (webkit && !cm.state.fakedLastChar) {
+      if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
         var start = d.input.selectionStart, end = d.input.selectionEnd;
         d.input.value += "$";
         d.input.selectionStart = start;
@@ -1679,6 +1679,7 @@ window.CodeMirror = (function() {
       if (captureMiddleClick) onContextMenu.call(cm, cm, e);
       return;
     case 2:
+      if (webkit) cm.state.lastMiddleDown = +new Date;
       if (start) extendSelection(cm.doc, start);
       setTimeout(bind(focusInput, cm), 20);
       e_preventDefault(e);

From fdc2de9de3e260c05a5e7b4d9cfbab0014cf8a48 Mon Sep 17 00:00:00 2001
From: Gabriel Nahmias <gabriel@terrasoftlabs.com>
Date: Sun, 18 Aug 2013 12:40:04 -0500
Subject: [PATCH 0386/4742] [the-matrix theme] Add

---
 theme/the-matrix.css | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 theme/the-matrix.css

diff --git a/theme/the-matrix.css b/theme/the-matrix.css
new file mode 100644
index 0000000000..e0e77ffb83
--- /dev/null
+++ b/theme/the-matrix.css
@@ -0,0 +1,24 @@
+.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
+.cm-s-the-matrix span.CodeMirror-selected { background: #a8f !important; }
+.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
+.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00 !important; }
+
+.cm-s-the-matrix span.cm-keyword {color: #008803; font-weight: bold;}
+.cm-s-the-matrix span.cm-atom {color: #3FF;}
+.cm-s-the-matrix span.cm-number {color: #FFB94F;}
+.cm-s-the-matrix span.cm-def {color: #99C;}
+.cm-s-the-matrix span.cm-variable {color: #F6C;}
+.cm-s-the-matrix span.cm-variable-2 {color: #C6F;}
+.cm-s-the-matrix span.cm-variable-3 {color: #96F;}
+.cm-s-the-matrix span.cm-property {color: #62FFA0;}
+.cm-s-the-matrix span.cm-operator {color: #999}
+.cm-s-the-matrix span.cm-comment {color: #CCCCCC;}
+.cm-s-the-matrix span.cm-string {color: #39C;}
+.cm-s-the-matrix span.cm-meta {color: #C9F;}
+.cm-s-the-matrix span.cm-error {color: #FF0000;}
+.cm-s-the-matrix span.cm-qualifier {color: #FFF700;}
+.cm-s-the-matrix span.cm-builtin {color: #30a;}
+.cm-s-the-matrix span.cm-bracket {color: #cc7;}
+.cm-s-the-matrix span.cm-tag {color: #FFBD40;}
+.cm-s-the-matrix span.cm-attribute {color: #FFF700;}

From 3d3686d51600c4785a15d95018421ea108c7b9c5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Aug 2013 16:37:29 +0200
Subject: [PATCH 0387/4742] [the-matrix theme] Integrate

---
 demo/theme.html      | 2 ++
 theme/the-matrix.css | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/demo/theme.html b/demo/theme.html
index d6aba19870..504673d865 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -24,6 +24,7 @@
 <link rel="stylesheet" href="../theme/paraiso-light.css">
 <link rel="stylesheet" href="../theme/rubyblue.css">
 <link rel="stylesheet" href="../theme/solarized.css">
+<link rel="stylesheet" href="../theme/the-matrix.css">
 <link rel="stylesheet" href="../theme/tomorrow-night-eighties.css">
 <link rel="stylesheet" href="../theme/twilight.css">
 <link rel="stylesheet" href="../theme/vibrant-ink.css">
@@ -88,6 +89,7 @@ <h2>Theme Demo</h2>
     <option>rubyblue</option>
     <option>solarized dark</option>
     <option>solarized light</option>
+    <option>the-matrix</option>
     <option>tomorrow-night-eighties</option>
     <option>twilight</option>
     <option>vibrant-ink</option>
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index e0e77ffb83..1ea26a1016 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -22,3 +22,5 @@
 .cm-s-the-matrix span.cm-bracket {color: #cc7;}
 .cm-s-the-matrix span.cm-tag {color: #FFBD40;}
 .cm-s-the-matrix span.cm-attribute {color: #FFF700;}
+
+.cm-s-the-matrix .CodeMirror-activeline-background {background: #040;}

From 612c6c9b2de394c14eb95459a5e11549912b12cd Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@gmail.com>
Date: Mon, 19 Aug 2013 18:23:33 +0200
Subject: [PATCH 0388/4742] Fix windows detection

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 123014b4a3..fed6830d29 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -24,7 +24,7 @@ window.CodeMirror = (function() {
   // This is woefully incomplete. Suggestions for alternative methods welcome.
   var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent);
   var mac = ios || /Mac/.test(navigator.platform);
-  var windows = /windows/i.test(navigator.platform);
+  var windows = /win/i.test(navigator.platform);
 
   var opera_version = opera && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
   if (opera_version) opera_version = Number(opera_version[1]);

From 569a636553a83c0bce7497314729a0a34f4add7d Mon Sep 17 00:00:00 2001
From: Ingo Richter <ingo.richter@gmail.com>
Date: Mon, 19 Aug 2013 15:27:13 -0700
Subject: [PATCH 0389/4742] [css mode] Add flow-from and flow-into properties

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 8abfb315c2..2eaa96a4a8 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -366,8 +366,8 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
     "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
     "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-    "float", "float-offset", "font", "font-feature-settings", "font-family",
-    "font-kerning", "font-language-override", "font-size", "font-size-adjust",
+    "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
+    "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust",
     "font-stretch", "font-style", "font-synthesis", "font-variant",
     "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
     "font-variant-ligatures", "font-variant-numeric", "font-variant-position",

From 35688322fac76223f0a2b840262b2ecff9b3502e Mon Sep 17 00:00:00 2001
From: Daniel Huigens <d.huigens@gmail.com>
Date: Tue, 20 Aug 2013 13:08:15 +0200
Subject: [PATCH 0390/4742] Some small editing corrections in the manual

---
 doc/manual.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 3d0b70b6dd..c1cf9f9c64 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -930,7 +930,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       <dd>Set the cursor position. You can either pass a
       single <code>{line, ch}</code> object, or the line and the
       character as two separate parameters.</dd>
-      <dt id="setSelection"><code><strong>doc.setSelection</strong>(anchor: {line, ch}, head: {line, ch})</code></dt>
+      <dt id="setSelection"><code><strong>doc.setSelection</strong>(anchor: {line, ch}, ?head: {line, ch})</code></dt>
       <dd>Set the selection range. <code>anchor</code>
       and <code>head</code> should be <code>{line, ch}</code>
       objects. <code>head</code> defaults to <code>anchor</code> when
@@ -941,7 +941,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       will, if shift is held or
       the <a href="#setExtending">extending</a> flag is set, move the
       head of the selection while leaving the anchor at its current
-      place. <code>pos2</code> is optional, and can be passed to
+      place. <code>to</code> is optional, and can be passed to
       ensure a region (for example a word or paragraph) will end up
       selected (in addition to whatever lies between that region and
       the current anchor).</dd>
@@ -2326,7 +2326,7 @@ <h2>Writing CodeMirror Modes</h2>
     state.</p>
 
     <p id="innerMode">In a nested mode, it is recommended to add an
-    extra methods, <code>innerMode</code> which, given a state object,
+    extra method, <code>innerMode</code> which, given a state object,
     returns a <code>{state, mode}</code> object with the inner mode
     and its state for the current position. These are used by utility
     scripts such as the <a href="#addon_closetag">tag closer</a> to

From 69c8610dce41eabad58ba5c20f094554c78785fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 20 Aug 2013 16:40:08 +0200
Subject: [PATCH 0391/4742] [fullscreen addon] Add

---
 addon/display/fullscreen.css |  6 +++++
 addon/display/fullscreen.js  | 26 ++++++++++++++++++++
 demo/fullscreen.html         | 46 ++++++++----------------------------
 doc/compress.html            |  1 +
 doc/manual.html              |  7 ++++++
 5 files changed, 50 insertions(+), 36 deletions(-)
 create mode 100644 addon/display/fullscreen.css
 create mode 100644 addon/display/fullscreen.js

diff --git a/addon/display/fullscreen.css b/addon/display/fullscreen.css
new file mode 100644
index 0000000000..00ad677ff5
--- /dev/null
+++ b/addon/display/fullscreen.css
@@ -0,0 +1,6 @@
+.CodeMirror-fullscreen {
+  position: fixed;
+  top: 0; left: 0; right: 0; bottom: 0;
+  height: auto;
+  z-index: 9999;
+}
diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
new file mode 100644
index 0000000000..1ceee327d5
--- /dev/null
+++ b/addon/display/fullscreen.js
@@ -0,0 +1,26 @@
+(function() {
+  "use strict";
+
+  CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
+    if (old == CodeMirror.Init) old = false;
+    if (!old == !val) return;
+    if (val) setFullscreen(cm);
+    else setNormal(cm);
+  });
+
+  function setFullscreen(cm) {
+    cm.state.restoreScreenScrollPos = {top: window.pageYOffset, left: window.pageXOffset};
+    cm.getWrapperElement().className += " CodeMirror-fullscreen";
+    document.documentElement.style.overflow = "hidden";
+    cm.refresh();
+  }
+
+  function setNormal(cm) {
+    var wrap = cm.getWrapperElement();
+    wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
+    document.documentElement.style.overflow = "";
+    var scroll = cm.state.restoreScreenScrollPos;
+    window.scrollTo(scroll.left, scroll.top);
+    cm.refresh();
+  }
+})();
diff --git a/demo/fullscreen.html b/demo/fullscreen.html
index 8cf8005bdb..827d55d0cd 100644
--- a/demo/fullscreen.html
+++ b/demo/fullscreen.html
@@ -5,18 +5,12 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/display/fullscreen.css">
 <link rel="stylesheet" href="../theme/night.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror-fullscreen {
-        display: block;
-        position: absolute;
-        top: 0; left: 0;
-        width: 100%;
-        z-index: 9999;
-      }
-    </style>
+<script src="../addon/display/fullscreen.js"></script>
+
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
 
@@ -114,43 +108,23 @@ <h2>Full Screen Editing</h2>
 
 </textarea></form>
   <script>
-    function isFullScreen(cm) {
-      return /\bCodeMirror-fullscreen\b/.test(cm.getWrapperElement().className);
-    }
-    function winHeight() {
-      return window.innerHeight || (document.documentElement || document.body).clientHeight;
-    }
-    function setFullScreen(cm, full) {
-      var wrap = cm.getWrapperElement();
-      if (full) {
-        wrap.className += " CodeMirror-fullscreen";
-        wrap.style.height = winHeight() + "px";
-        document.documentElement.style.overflow = "hidden";
-      } else {
-        wrap.className = wrap.className.replace(" CodeMirror-fullscreen", "");
-        wrap.style.height = "";
-        document.documentElement.style.overflow = "";
-      }
-      cm.refresh();
-    }
-    CodeMirror.on(window, "resize", function() {
-      var showing = document.body.getElementsByClassName("CodeMirror-fullscreen")[0];
-      if (!showing) return;
-      showing.CodeMirror.getWrapperElement().style.height = winHeight() + "px";
-    });
     var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
       lineNumbers: true,
       theme: "night",
       extraKeys: {
         "F11": function(cm) {
-          setFullScreen(cm, !isFullScreen(cm));
+          cm.setOption("fullScreen", !cm.getOption("fullScreen"));
         },
         "Esc": function(cm) {
-          if (isFullScreen(cm)) setFullScreen(cm, false);
+          if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false);
         }
       }
     });
   </script>
 
-    <p>Press <strong>F11</strong> when cursor is in the editor to toggle full screen editing. <strong>Esc</strong> can also be used to <i>exit</i> full screen editing.</p>
+    <p>Demonstration of
+    the <a href="../doc/manual.html#addon_fullscreen">fullscreen</a>
+    addon. Press <strong>F11</strong> when cursor is in the editor to
+    toggle full screen editing. <strong>Esc</strong> can also be used
+    to <i>exit</i> full screen editing.</p>
   </article>
diff --git a/doc/compress.html b/doc/compress.html
index fbb559e4c1..f4d766b8c0 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -157,6 +157,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>
           <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
           <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
+          <option value="http://codemirror.net/addon/display/fullscreen.js">fullscreen.js</option>
           <option value="http://codemirror.net/addon/hint/html-hint.js">html-hint.js</option>
           <option value="http://codemirror.net/addon/fold/indent-fold.js">indent-fold.js</option>
           <option value="http://codemirror.net/addon/hint/javascript-hint.js">javascript-hint.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index c1cf9f9c64..0541c89372 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2114,6 +2114,13 @@ <h2>Addons</h2>
       whenever it doesn't contain any text.
       See <a href="../demo/placeholder.html">the demo</a>.</dd>
 
+      <dt id="addon_fullscreen"><a href="../addon/display/fullscreen.js"><code>display/fullscreen.js</code></a></dt>
+      <dd>Defines an option <code>fullScreen</code> that, when set
+      to <code>true</code>, will make the editor full-screen (as in,
+      taking up the whole browser window). Depends
+      on <a href="../addon/display/fullscreen.css"><code>fullscreen.css</code></a>. <a href="../demo/fullscreen.html">Demo
+      here</a>.</dd>
+
       <dt id="addon_merge"><a href="../addon/merge/merge.js"><code>merge/merge.js</code></a></dt>
       <dd>Implements an interface for merging changes, using either a
       2-way or a 3-way view. The <code>CodeMirror.MergeView</code>

From 2d678ec98aabd796c262d4d20663aef99ea31ab4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 20 Aug 2013 21:19:25 +0200
Subject: [PATCH 0392/4742] [fullscreen addon] Restore width and height when
 leaving fullscreen

Issue #1761
---
 addon/display/fullscreen.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
index 1ceee327d5..ca5628c8fe 100644
--- a/addon/display/fullscreen.js
+++ b/addon/display/fullscreen.js
@@ -9,8 +9,11 @@
   });
 
   function setFullscreen(cm) {
-    cm.state.restoreScreenScrollPos = {top: window.pageYOffset, left: window.pageXOffset};
-    cm.getWrapperElement().className += " CodeMirror-fullscreen";
+    var wrap = cm.getWrapperElement();
+    cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
+                                  width: wrap.style.width, height: wrap.style.height};
+    wrap.style.width = wrap.style.height = "";
+    wrap.className += " CodeMirror-fullscreen";
     document.documentElement.style.overflow = "hidden";
     cm.refresh();
   }
@@ -19,7 +22,8 @@
     var wrap = cm.getWrapperElement();
     wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
     document.documentElement.style.overflow = "";
-    var scroll = cm.state.restoreScreenScrollPos;
+    var info = cm.state.fullScreenRestore;
+    wrap.style.width = info.width; wrap.style.height = info.height;
     window.scrollTo(scroll.left, scroll.top);
     cm.refresh();
   }

From e0556c388e781e5715627fb3924cf0ee3ed48740 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 20 Aug 2013 21:21:14 +0200
Subject: [PATCH 0393/4742] [fullscreen addon] Fix wrong variable/property name

Issue #1761
---
 addon/display/fullscreen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
index ca5628c8fe..3c31e97a33 100644
--- a/addon/display/fullscreen.js
+++ b/addon/display/fullscreen.js
@@ -24,7 +24,7 @@
     document.documentElement.style.overflow = "";
     var info = cm.state.fullScreenRestore;
     wrap.style.width = info.width; wrap.style.height = info.height;
-    window.scrollTo(scroll.left, scroll.top);
+    window.scrollTo(info.scrollLeft, info.scrollTop);
     cm.refresh();
   }
 })();

From d37ac03856bf9bb55bf7eaaeabe6c5d721b96cc0 Mon Sep 17 00:00:00 2001
From: Michael Zhou <moz@google.com>
Date: Tue, 20 Aug 2013 14:31:26 -0700
Subject: [PATCH 0394/4742] Check if "cur" is null in patchDisplay()

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fed6830d29..41dd4fe8a7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -618,7 +618,7 @@ window.CodeMirror = (function() {
       if (nextIntact && nextIntact.to == lineN) nextIntact = intact.shift();
       if (lineIsHidden(cm.doc, line)) {
         if (line.height != 0) updateLineHeight(line, 0);
-        if (line.widgets && cur.previousSibling) for (var i = 0; i < line.widgets.length; ++i) {
+        if (line.widgets && cur && cur.previousSibling) for (var i = 0; i < line.widgets.length; ++i) {
           var w = line.widgets[i];
           if (w.showIfHidden) {
             var prev = cur.previousSibling;

From 83a624d98f7517f2232e0b28681b5dd73e89dcd3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 21 Aug 2013 10:57:43 +0200
Subject: [PATCH 0395/4742] [bidi demo] Turn off line wrapping, add note about
 bug

---
 demo/bidi.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/demo/bidi.html b/demo/bidi.html
index 082e7b3e28..4f1f8f3e45 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -58,8 +58,7 @@ <h2>Bi-directional Text Demo</h2>
     <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   mode: "text/html",
-  lineNumbers: true,
-  lineWrapping: true
+  lineNumbers: true
 });
 </script>
 
@@ -67,4 +66,9 @@ <h2>Bi-directional Text Demo</h2>
   the <a href="http://marijnhaverbeke.nl/blog/cursor-in-bidi-text.html">related
   blog post</a> for more background.</p>
 
-  </article>
+  <p><strong>Note:</strong> There is
+  a <a href="https://github.com/marijnh/CodeMirror/issues/1757">known
+  bug</a> with cursor motion and mouse clicks in bi-directional lines
+  that are line wrapped.</p>
+
+</article>

From 633bd90072a034782ac2f6ef2ce97910c6bf03a7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 21 Aug 2013 17:13:49 +0200
Subject: [PATCH 0396/4742] Mark release 3.16.0

---
 AUTHORS           |  6 ++++++
 bower.json        |  2 +-
 doc/compress.html |  1 +
 doc/releases.html | 12 ++++++++++++
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2ac8905832..67fd2fdcb0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ Andre von Houck
 Andrey Lushnikov
 Andy Kimball
 Andy Li
+angelozerr
 angelo.zerr@gmail.com
 Ankit Ahuja
 Ansel Santosa
@@ -30,6 +31,7 @@ Atul Bhouraskar
 Aurelian Oancea
 Bastian Müller
 benbro
+Benjamin DeCoste
 Ben Keen
 boomyjee
 borawjm
@@ -75,6 +77,7 @@ Felix Raab
 Filip Noetzel
 flack
 Ford_Lawnmower
+Gabriel Nahmias
 galambalazs
 Gautam Mehta
 Glenn Ruehle
@@ -91,6 +94,7 @@ Ian Wehrman
 Ian Wetherbee
 Ice White
 ICHIKAWA, Yuji
+Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
 Jacob Lee
@@ -206,6 +210,7 @@ santec
 Sascha Peilicke
 satchmorun
 sathyamoorthi
+SCLINIC\jdecker
 shaund
 shaun gilchrist
 Shmuel Englard
@@ -225,6 +230,7 @@ Tim Baumann
 Timothy Farrell
 Timothy Hatcher
 Tomas Varaneckas
+Tom Erik Støwer
 Tom MacWright
 Tony Jian
 Vestimir Markov
diff --git a/bower.json b/bower.json
index fae2426c89..451d654c0c 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "CodeMirror",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index f4d766b8c0..e100e60a0d 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=3.16.0;f=">3.16</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.15.0;f=">3.15</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.14.0;f=">3.14</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.13.0;f=">3.13</option>
diff --git a/doc/releases.html b/doc/releases.html
index 93650b8fe0..d996d86066 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">21-08-2013: <a href="http://codemirror.net/codemirror-3.16.zip">Version 3.16</a>:</p>
+
+  <ul class="rel-note">
+    <li>The whole codebase is now under a single <a href="../LICENSE">license</a> file.</li>
+    <li>The project page was overhauled and redesigned.</li>
+    <li>New themes: <a href="../demo/theme.html?paraiso-dark">Paraiso</a> (<a href="../demo/theme.html?paraiso-light">light</a>), <a href="../demo/theme.html?the-matrix">The Matrix</a>.</li>
+    <li>Improved interaction between themes and <a href="manual.html#addon_active-line">active-line</a>/<a href="manual.html#addon_matchbrackets">matchbrackets</a> addons.</li>
+    <li>New <a href="manual.html#addon_foldcode">folding</a> function <code>CodeMirror.fold.comment</code>.</li>
+    <li>Added <a href="manual.html#addon_fullscreen">fullscreen</a> addon.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.15.0...3.16.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">29-07-2013: <a href="http://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
 
   <ul class="rel-note">
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 41dd4fe8a7..be262913b4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5821,7 +5821,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.15.1";
+  CodeMirror.version = "3.16.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 27c4f1729f..3d436b0f78 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.15.1",
+    "version":"3.16.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From ac4e68497d4dcf8f72369f912d2838684d83e65b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 21 Aug 2013 17:14:46 +0200
Subject: [PATCH 0397/4742] Bump version number post-3.16

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index be262913b4..7224b624cb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5821,7 +5821,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.16.0";
+  CodeMirror.version = "3.16.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 3d436b0f78..e50ba6a808 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.16.0",
+    "version":"3.16.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 4b2b7bf5a2d9a2823beb23779cdf877bbc7ec4f8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 21 Aug 2013 17:15:42 +0200
Subject: [PATCH 0398/4742] Also update version number on project page

I really should automate this.
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 96e2eecd24..0c66a37103 100644
--- a/index.html
+++ b/index.html
@@ -80,7 +80,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.15</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.16</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>

From 595468c39ccd0eab3f19d7cb1a01d4dfb54164e1 Mon Sep 17 00:00:00 2001
From: ciaranj <ciaranj@gmail.com>
Date: Wed, 21 Aug 2013 22:14:38 +0100
Subject: [PATCH 0399/4742] [merge addon] Add highlightDifferences option and
 method

Provides new option (highlightDifferences) and method highlightDifferences(bool)
to the MergeView plugin.

If true (or undefined) the original behaviour is maintained, which is to show
the differences (line highlighting and gutter graphics), if false then
the changes will not be shown.

Calling the method causes the visual change to occur 'immediately'

Signed-off-by: ciaranj <ciaranj@gmail.com>
---
 addon/merge/merge.js | 30 ++++++++++++++++++++++++++----
 demo/merge.html      | 13 +++++++++----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 16c3356c20..01bddbd18b 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -31,9 +31,20 @@
       this.diff = getDiff(orig, options.value);
       this.diffOutOfDate = false;
 
+      this.showDifferences = options.highlightDifferences === undefined ? true: !!(options.highlightDifferences);
       this.forceUpdate = registerUpdate(this);
       setScrollLock(this, true, false);
       registerScroll(this);
+    },
+    highlightDifferences: function(highlight) {
+      var originalHighlightDifferences = this.showDifferences;
+
+      if( highlight === undefined ) this.showDifferences= true;
+      else this.showDifferences = !!(highlight);
+
+      if( this.showDifferences != originalHighlightDifferences ) {
+        this.forceUpdate();
+      }
     }
   };
 
@@ -46,8 +57,9 @@
         dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
         dv.diffOutOfDate = false;
       }
-      updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
-      updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
+      if( !dv.showDifferences) edit.from = edit.to = orig.from = orig.to = 0;
+      updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes, dv.showDifferences);
+      updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes, dv.showDifferences);
       drawConnectors(dv);
     }
     function set(slow) {
@@ -143,7 +155,12 @@
   }
 
   // FIXME maybe add a margin around viewport to prevent too many updates
-  function updateMarks(editor, diff, state, type, classes) {
+  function updateMarks(editor, diff, state, type, classes, showDifferences) {
+    if(! showDifferences ) {
+      clearMarks(editor, state.marked, classes);
+      return;
+    }
+
     var vp = editor.getViewport();
     editor.operation(function() {
       if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
@@ -217,6 +234,7 @@
       attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
     }
     clear(dv.copyButtons);
+    if( !dv.showDifferences ) return;
 
     var flip = dv.type == "left";
     var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
@@ -322,7 +340,11 @@
     constuctor: MergeView,
     editor: function() { return this.edit; },
     rightOriginal: function() { return this.right && this.right.orig; },
-    leftOriginal: function() { return this.left && this.left.orig; }
+    leftOriginal: function() { return this.left && this.left.orig; },
+    highlightDifferences: function(highlight) {
+      if( this.right ) this.right.highlightDifferences(highlight);
+      if( this.left ) this.left.highlightDifferences(highlight);
+    }
   };
 
   // Operations on diffs
diff --git a/demo/merge.html b/demo/merge.html
index d3c8eb03cc..6422a83c75 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -45,15 +45,14 @@ <h2>merge view demo</h2>
 either <span class=clicky onclick="initUI(2)">two-way</span>
 or <span class=clicky onclick="initUI(3)">three-way</span>. The left
 (or center) pane is editable, and the differences with the other
-pane(s) are shown live as you edit it.</p>
+pane(s) are <span class=clicky onclick="toggleDifferences()">optionally</span> shown live as you edit it.</p>
 
 <p>This addon depends on
 the <a href="https://code.google.com/p/google-diff-match-patch/">google-diff-match-patch</a>
 library to compute the diffs.</p>
 
 <script>
-var value, orig1, orig2, dv;
-
+var value, orig1, orig2, dv, hilight= true;
 function initUI(panes) {
   if (value == null) return;
   var target = document.getElementById("view");
@@ -63,10 +62,16 @@ <h2>merge view demo</h2>
     origLeft: panes == 3 ? orig1 : null,
     orig: orig2,
     lineNumbers: true,
-    mode: "text/html"
+    mode: "text/html",
+    highlightDifferences: hilight
   });
 }
 
+function toggleDifferences() {
+  hilight= !hilight;
+  dv.highlightDifferences( hilight );
+}
+
 window.onload = function() {
   value = document.documentElement.innerHTML;
   orig1 = value.replace(/\.\.\//g, "codemirror/").replace("yellow", "orange");

From 4a7e45b16e8345c99aab2ccc42e53a8fcba76fb6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Aug 2013 08:37:13 +0200
Subject: [PATCH 0400/4742] [merge addon] Clean up showDifferences option

Issue #1765
---
 addon/merge/merge.js | 47 ++++++++++++++++++++++----------------------
 demo/merge.html      |  3 +--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 01bddbd18b..26554dbd34 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -31,19 +31,16 @@
       this.diff = getDiff(orig, options.value);
       this.diffOutOfDate = false;
 
-      this.showDifferences = options.highlightDifferences === undefined ? true: !!(options.highlightDifferences);
+      this.showDifferences = options.showDifferences !== false;
       this.forceUpdate = registerUpdate(this);
       setScrollLock(this, true, false);
       registerScroll(this);
     },
-    highlightDifferences: function(highlight) {
-      var originalHighlightDifferences = this.showDifferences;
-
-      if( highlight === undefined ) this.showDifferences= true;
-      else this.showDifferences = !!(highlight);
-
-      if( this.showDifferences != originalHighlightDifferences ) {
-        this.forceUpdate();
+    setShowDifferences: function(val) {
+      val = val !== false;
+      if (val != this.showDifferences) {
+        this.showDifferences = val;
+        this.forceUpdate("full");
       }
     }
   };
@@ -52,14 +49,22 @@
     var edit = {from: 0, to: 0, marked: []};
     var orig = {from: 0, to: 0, marked: []};
     var debounceChange;
-    function update() {
+    function update(mode) {
+      if (mode == "full") {
+        if (dv.svg) clear(dv.svg);
+        clear(dv.copyButtons);
+        clearMarks(dv.edit, edit.marked, dv.classes);
+        clearMarks(dv.orig, orig.marked, dv.classes);
+        edit.from = edit.to = orig.from = orig.to = 0;
+      }
       if (dv.diffOutOfDate) {
         dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
         dv.diffOutOfDate = false;
       }
-      if( !dv.showDifferences) edit.from = edit.to = orig.from = orig.to = 0;
-      updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes, dv.showDifferences);
-      updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes, dv.showDifferences);
+      if (dv.showDifferences) {
+        updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
+        updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
+      }
       drawConnectors(dv);
     }
     function set(slow) {
@@ -155,12 +160,7 @@
   }
 
   // FIXME maybe add a margin around viewport to prevent too many updates
-  function updateMarks(editor, diff, state, type, classes, showDifferences) {
-    if(! showDifferences ) {
-      clearMarks(editor, state.marked, classes);
-      return;
-    }
-
+  function updateMarks(editor, diff, state, type, classes) {
     var vp = editor.getViewport();
     editor.operation(function() {
       if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
@@ -228,13 +228,14 @@
   // Updating the gap between editor and original
 
   function drawConnectors(dv) {
+    if (!dv.showDifferences) return;
+
     if (dv.svg) {
       clear(dv.svg);
       var w = dv.gap.offsetWidth;
       attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
     }
     clear(dv.copyButtons);
-    if( !dv.showDifferences ) return;
 
     var flip = dv.type == "left";
     var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
@@ -341,9 +342,9 @@
     editor: function() { return this.edit; },
     rightOriginal: function() { return this.right && this.right.orig; },
     leftOriginal: function() { return this.left && this.left.orig; },
-    highlightDifferences: function(highlight) {
-      if( this.right ) this.right.highlightDifferences(highlight);
-      if( this.left ) this.left.highlightDifferences(highlight);
+    setShowDifferences: function(val) {
+      if (this.right) this.right.setShowDifferences(val);
+      if (this.left) this.left.setShowDifferences(val);
     }
   };
 
diff --git a/demo/merge.html b/demo/merge.html
index 6422a83c75..d2df900c20 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -68,8 +68,7 @@ <h2>merge view demo</h2>
 }
 
 function toggleDifferences() {
-  hilight= !hilight;
-  dv.highlightDifferences( hilight );
+  dv.setShowDifferences(hilight = !hilight);
 }
 
 window.onload = function() {

From 1ba4b55464b8fb0c18cf7feab085ee35812ccb50 Mon Sep 17 00:00:00 2001
From: Joseph Pecoraro <pecoraro@apple.com>
Date: Wed, 21 Aug 2013 17:24:25 -0700
Subject: [PATCH 0401/4742] Add "gutterContextMenu" event to capture context
 menu events in gutters

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

diff --git a/doc/manual.html b/doc/manual.html
index 0541c89372..fd67297700 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -502,6 +502,16 @@ <h2>Events</h2>
       argument, and the raw <code>mousedown</code> event object as
       fourth argument.</dd>
 
+      <dt id="event_gutterContextMenu"><code><strong>"gutterContextMenu"</strong> (instance: CodeMirror, line: integer, gutter: string, contextMenu: Event: Event)</code></dt>
+      <dd>Fires when the editor gutter (the line-number area)
+      receives a <code>contextmenu</code> event. Will pass the editor
+      instance as first argument, the (zero-based) number of the line
+      that was clicked as second argument, the CSS class of the
+      gutter that was clicked as third argument, and the raw
+      <code>contextmenu</code> mouse event object as fourth argument.
+      You can <code>preventDefault</code> the event, to signal that
+      CodeMirror should do no further handling.</dd>
+
       <dt id="event_focus"><code><strong>"focus"</strong> (instance: CodeMirror)</code></dt>
       <dd>Fires whenever the editor is focused.</dd>
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7224b624cb..45cc4e026d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1800,15 +1800,8 @@ window.CodeMirror = (function() {
     on(document, "mouseup", up);
   }
 
-  function clickInGutter(cm, e) {
+  function gutterEvent(cm, e, gutterEvent, mX, mY, signaler) {
     var display = cm.display;
-    try { var mX = e.clientX, mY = e.clientY; }
-    catch(e) { return false; }
-
-    if (mX >= Math.floor(getRect(display.gutters).right)) return false;
-    e_preventDefault(e);
-    if (!hasHandler(cm, "gutterClick")) return true;
-
     var lineBox = getRect(display.lineDiv);
     if (mY > lineBox.bottom) return true;
     mY -= lineBox.top - display.viewOffset;
@@ -1818,10 +1811,33 @@ window.CodeMirror = (function() {
       if (g && getRect(g).right >= mX) {
         var line = lineAtHeight(cm.doc, mY);
         var gutter = cm.options.gutters[i];
-        signalLater(cm, "gutterClick", cm, line, gutter, e);
-        break;
+        return signaler(cm, gutterEvent, cm, line, gutter, e);
       }
     }
+  }
+
+  function contextMenuInGutter(cm, e) {
+    if (!hasHandler(cm, "gutterContextMenu")) return false;
+
+    try { var mX = e.clientX, mY = e.clientY; }
+    catch(e) { return false; }
+    if (mX >= Math.floor(getRect(cm.display.gutters).right)) return false;
+
+    return gutterEvent(cm, e, "gutterContextMenu", mX, mY, function() {
+      signal.apply(null, arguments);
+      return e_defaultPrevented(e);
+    });
+  }
+
+  function clickInGutter(cm, e) {
+    try { var mX = e.clientX, mY = e.clientY; }
+    catch(e) { return false; }
+
+    if (mX >= Math.floor(getRect(cm.display.gutters).right)) return false;
+    e_preventDefault(e);
+    if (!hasHandler(cm, "gutterClick")) return true;
+
+    gutterEvent(cm, e, "gutterClick", mX, mY, signalLater);
     return true;
   }
 
@@ -2144,6 +2160,7 @@ window.CodeMirror = (function() {
     if (signalDOMEvent(cm, e, "contextmenu")) return;
     var display = cm.display, sel = cm.doc.sel;
     if (eventInWidget(display, e)) return;
+    if (contextMenuInGutter(cm, e)) return;
 
     var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
     if (!pos || opera) return; // Opera is difficult.

From f151bc013709becb77e6c13893728b825887c039 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Aug 2013 08:56:17 +0200
Subject: [PATCH 0402/4742] Clean up gutterContextMenu code

Issue #1766
---
 lib/codemirror.js | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 45cc4e026d..7726782391 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1800,10 +1800,15 @@ window.CodeMirror = (function() {
     on(document, "mouseup", up);
   }
 
-  function gutterEvent(cm, e, gutterEvent, mX, mY, signaler) {
+  function gutterEvent(cm, e, type, signalfn) {
+    try { var mX = e.clientX, mY = e.clientY; }
+    catch(e) { return false; }
+    if (mX >= Math.floor(getRect(cm.display.gutters).right)) return false;
+
     var display = cm.display;
     var lineBox = getRect(display.lineDiv);
-    if (mY > lineBox.bottom) return true;
+
+    if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);
     mY -= lineBox.top - display.viewOffset;
 
     for (var i = 0; i < cm.options.gutters.length; ++i) {
@@ -1811,34 +1816,20 @@ window.CodeMirror = (function() {
       if (g && getRect(g).right >= mX) {
         var line = lineAtHeight(cm.doc, mY);
         var gutter = cm.options.gutters[i];
-        return signaler(cm, gutterEvent, cm, line, gutter, e);
+        signalfn(cm, type, cm, line, gutter, e);
+        return e_defaultPrevented(e);
       }
     }
   }
 
   function contextMenuInGutter(cm, e) {
     if (!hasHandler(cm, "gutterContextMenu")) return false;
-
-    try { var mX = e.clientX, mY = e.clientY; }
-    catch(e) { return false; }
-    if (mX >= Math.floor(getRect(cm.display.gutters).right)) return false;
-
-    return gutterEvent(cm, e, "gutterContextMenu", mX, mY, function() {
-      signal.apply(null, arguments);
-      return e_defaultPrevented(e);
-    });
+    return gutterEvent(cm, e, "gutterContextMenu", signal);
   }
 
   function clickInGutter(cm, e) {
-    try { var mX = e.clientX, mY = e.clientY; }
-    catch(e) { return false; }
-
-    if (mX >= Math.floor(getRect(cm.display.gutters).right)) return false;
     e_preventDefault(e);
-    if (!hasHandler(cm, "gutterClick")) return true;
-
-    gutterEvent(cm, e, "gutterClick", mX, mY, signalLater);
-    return true;
+    return gutterEvent(cm, e, "gutterClick", signalLater);
   }
 
   // Kludge to work around strange IE behavior where it'll sometimes
@@ -2159,8 +2150,7 @@ window.CodeMirror = (function() {
   function onContextMenu(cm, e) {
     if (signalDOMEvent(cm, e, "contextmenu")) return;
     var display = cm.display, sel = cm.doc.sel;
-    if (eventInWidget(display, e)) return;
-    if (contextMenuInGutter(cm, e)) return;
+    if (eventInWidget(display, e) || contextMenuInGutter(cm, e)) return;
 
     var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
     if (!pos || opera) return; // Opera is difficult.

From 560ba1bd802ef14d48a5726c0c4532601ceccd34 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Aug 2013 09:00:00 +0200
Subject: [PATCH 0403/4742] [project page] Set border: 0 for logo

Woah, IE still defaults to a border around images in links.
---
 doc/docs.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/docs.css b/doc/docs.css
index 920b39e3ea..d1ab21bad9 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -103,6 +103,7 @@ article {
 }
 
 #logo {
+  border: 0;
   margin-right: 7px;
   margin-bottom: 25px;
 }

From ea274987acb91eb3cc15acb5cd96ba19389105b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Aug 2013 09:10:14 +0200
Subject: [PATCH 0404/4742] Fix bug introduced by previous contextmenuInGutter
 patch

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7726782391..e0b6a0324f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1800,10 +1800,11 @@ window.CodeMirror = (function() {
     on(document, "mouseup", up);
   }
 
-  function gutterEvent(cm, e, type, signalfn) {
+  function gutterEvent(cm, e, type, prevent, signalfn) {
     try { var mX = e.clientX, mY = e.clientY; }
     catch(e) { return false; }
     if (mX >= Math.floor(getRect(cm.display.gutters).right)) return false;
+    if (prevent) e_preventDefault(e);
 
     var display = cm.display;
     var lineBox = getRect(display.lineDiv);
@@ -1824,12 +1825,11 @@ window.CodeMirror = (function() {
 
   function contextMenuInGutter(cm, e) {
     if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", signal);
+    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
   }
 
   function clickInGutter(cm, e) {
-    e_preventDefault(e);
-    return gutterEvent(cm, e, "gutterClick", signalLater);
+    return gutterEvent(cm, e, "gutterClick", true, signalLater);
   }
 
   // Kludge to work around strange IE behavior where it'll sometimes

From 4e0d4232c1683925f6b07f53b930c854449cb201 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Aug 2013 10:02:34 +0200
Subject: [PATCH 0405/4742] Use zero-width space in context-menu select-all
 hack

To prevent the mouse click from landing outside of the selected
text, which broke copy in IE.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e0b6a0324f..bc238a274a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2169,8 +2169,8 @@ window.CodeMirror = (function() {
 
     function prepareSelectAllHack() {
       if (display.input.selectionStart != null) {
-        var extval = display.input.value = " " + (posEq(sel.from, sel.to) ? "" : display.input.value);
-        display.prevInput = " ";
+        var extval = display.input.value = "\u200b" + (posEq(sel.from, sel.to) ? "" : display.input.value);
+        display.prevInput = "\u200b";
         display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
       }
     }

From d87f2b60e9d92337eeff3328e784868052999d0b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Aug 2013 18:33:40 +0200
Subject: [PATCH 0406/4742] [project page] Add links to a few more demos

---
 index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/index.html b/index.html
index 0c66a37103..28641a1ba1 100644
--- a/index.html
+++ b/index.html
@@ -68,8 +68,12 @@ <h2>This is CodeMirror</h2>
     <option value="mode/htmlmixed/index.html">Mixed language modes</option>
     <option value="demo/bidi.html">Bi-directional text</option>
     <option value="demo/variableheight.html">Variable font sizes</option>
+    <option value="demo/search.html">Search interface</option>
     <option value="demo/vim.html">Vim bindings</option>
     <option value="demo/emacs.html">Emacs bindings</option>
+    <option value="demo/tern.html">Tern integration</option>
+    <option value="demo/merge.html">Merge/diff interface</option>
+    <option value="demo/fullscreen.html">Full-screen editor</option>
   </select></form>
   <script>
     var editor = CodeMirror.fromTextArea(document.getElementById("demotext"), {

From 73cde378bc8976ff4f3d2fffd01d24859b10ba85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 23 Aug 2013 13:43:19 +0200
Subject: [PATCH 0407/4742] Fix problem in workaround for Webkit's failure to
 render huge text nodes

---
 lib/codemirror.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bc238a274a..eb393c29b2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4215,8 +4215,7 @@ window.CodeMirror = (function() {
     while (!stream.eol()) {
       if (stream.pos > cm.options.maxHighlightLength) {
         flattenSpans = false;
-        // Webkit seems to refuse to render text nodes longer than 57444 characters
-        stream.pos = Math.min(text.length, stream.start + 50000);
+        stream.pos = text.length;
         style = null;
       } else {
         style = mode.token(stream, state);
@@ -4227,7 +4226,12 @@ window.CodeMirror = (function() {
       }
       stream.start = stream.pos;
     }
-    if (curStart < stream.pos) f(stream.pos, curStyle);
+    while (curStart < stream.pos) {
+      // Webkit seems to refuse to render text nodes longer than 57444 characters
+      var pos = Math.min(stream.pos, curStart + 50000);
+      f(pos, curStyle);
+      curStart = pos;
+    }
   }
 
   function highlightLine(cm, line, state) {

From b88e8c3f8077a2481b0f26c3b74a7913cacac00f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 23 Aug 2013 13:51:28 +0200
Subject: [PATCH 0408/4742] Experimental option crudeMeasuringFrom

Stopgap for #1022
---
 doc/manual.html   | 14 +++++++++++++-
 lib/codemirror.js | 20 +++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index fd67297700..3f591492b6 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -387,9 +387,21 @@ <h2>Configuration</h2>
       <dd>When highlighting long lines, in order to stay responsive,
       the editor will give up and simply style the rest of the line as
       plain text when it reaches a certain position. The default is
-      10000. You can set this to <code>Infinity</code> to turn off
+      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
diff --git a/lib/codemirror.js b/lib/codemirror.js
index eb393c29b2..f7e4a0e69b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -972,6 +972,10 @@ window.CodeMirror = (function() {
   function measureChar(cm, line, ch, data, bias) {
     var dir = -1;
     data = data || measureLine(cm, line);
+    if (data.crude) {
+      var left = data.left + ch * data.width;
+      return {left: left, right: left + data.width, top: data.top, bottom: data.bottom};
+    }
 
     for (var pos = ch;; pos += dir) {
       var r = data[pos];
@@ -1020,6 +1024,9 @@ window.CodeMirror = (function() {
   }
 
   function measureLineInner(cm, line) {
+    if (!cm.options.lineWrapping && line.text.length >= cm.options.crudeMeasuringFrom)
+      return crudelyMeasureLine(cm, line);
+
     var display = cm.display, measure = emptyArray(line.text.length);
     var pre = lineContent(cm, line, measure, true);
 
@@ -1106,6 +1113,15 @@ window.CodeMirror = (function() {
     return data;
   }
 
+  function crudelyMeasureLine(cm, line) {
+    var copy = new Line(line.text.slice(0, 100), null);
+    if (line.textClass) copy.textClass = line.textClass;
+    var measure = measureLineInner(cm, copy);
+    var left = measureChar(cm, copy, 0, measure, "left");
+    var right = measureChar(cm, copy, 99, measure, "right");
+    return {crude: true, top: left.top, left: left.left, bottom: left.bottom, width: (right.right - left.left) / 100};
+  }
+
   function measureLineWidth(cm, line) {
     var hasBadSpan = false;
     if (line.markedSpans) for (var i = 0; i < line.markedSpans; ++i) {
@@ -1113,7 +1129,8 @@ window.CodeMirror = (function() {
       if (sp.collapsed && (sp.to == null || sp.to == line.text.length)) hasBadSpan = true;
     }
     var cached = !hasBadSpan && findCachedMeasurement(cm, line);
-    if (cached) return measureChar(cm, line, line.text.length, cached.measure, "right").right;
+    if (cached || line.text.length >= cm.options.crudeMeasuringFrom)
+      return measureChar(cm, line, line.text.length, cached && cached.measure, "right").right;
 
     var pre = lineContent(cm, line, null, true);
     var end = pre.appendChild(zeroWidthElement(cm.display.measure));
@@ -3273,6 +3290,7 @@ window.CodeMirror = (function() {
   option("historyEventDelay", 500);
   option("viewportMargin", 10, function(cm){cm.refresh();}, true);
   option("maxHighlightLength", 10000, function(cm){loadMode(cm); cm.refresh();}, true);
+  option("crudeMeasuringFrom", 10000);
   option("moveInputWithCursor", true, function(cm, val) {
     if (!val) cm.display.inputDiv.style.top = cm.display.inputDiv.style.left = 0;
   });

From 2a6e38efff594469ac0e8331571d678167fc0165 Mon Sep 17 00:00:00 2001
From: Michael Zhou <moz@google.com>
Date: Fri, 23 Aug 2013 00:25:50 -0700
Subject: [PATCH 0409/4742] Remove outdated note from LICENSE

Subdirectories no longer contain separate LICENSE files. Delete
the note to them from the top level LICENSE.
---
 LICENSE | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index ade341ca6e..442d11cdce 100644
--- a/LICENSE
+++ b/LICENSE
@@ -17,7 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-Please note that some subdirectories of the CodeMirror distribution
-include their own LICENSE files, and are released under different
-licences.

From bfb6eed90bfddf81a3516023cfd7c2d4b7a18cc8 Mon Sep 17 00:00:00 2001
From: Michael Zhou <moz@google.com>
Date: Thu, 22 Aug 2013 12:37:41 -0700
Subject: [PATCH 0410/4742] Remove redundant line in AUTHORS

Removed the redundant "List of contributors..." line
---
 AUTHORS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 67fd2fdcb0..bb6f8c8c64 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -141,7 +141,6 @@ Lanny
 leaf corcoran
 Leonya Khachaturov
 Liam Newman
-List of contributors. Updated before every release.
 LM
 Lorenzo Stoakes
 lynschinzer

From 2a4c96f0e8257a239144b376045eb584c5d69997 Mon Sep 17 00:00:00 2001
From: ciaranj <ciaranj@gmail.com>
Date: Thu, 22 Aug 2013 13:11:22 +0100
Subject: [PATCH 0411/4742] [merge addon] Shows differences when the non-edit
 pane is updated

Previous behaviour was to only update the displayed differences if
the edit pane was modified.  There exists use-cases such that the
differences should be updated when any of the panes change.

I don't expect this to introduce any performance regressions due
to the existing debounce code within the update function.

Signed-off-by: ciaranj <ciaranj@gmail.com>
---
 addon/merge/merge.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 26554dbd34..391eb885fb 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -71,13 +71,15 @@
       clearTimeout(debounceChange);
       debounceChange = setTimeout(update, slow == true ? 250 : 100);
     }
-    dv.edit.on("change", function() {
+    function change() {
       if (!dv.diffOutOfDate) {
         dv.diffOutOfDate = true;
         edit.from = edit.to = orig.from = orig.to = 0;
       }
       set(true);
-    });
+    }
+    dv.edit.on("change", change);
+    dv.orig.on("change", change);
     dv.edit.on("viewportChange", set);
     dv.orig.on("viewportChange", set);
     update();

From 5c4892a6a141dadcca3cea4018c444eee9347853 Mon Sep 17 00:00:00 2001
From: ciaranj <ciaranj@gmail.com>
Date: Thu, 22 Aug 2013 11:24:53 +0100
Subject: [PATCH 0412/4742] Allow linter to run on windows

Node provides some cross-platform utility methods to enable safe
path traversal.

This change merely swaps out a hardcoded '/' (unix path separator)
to use one of these methods.

An alternative strategy would be to use the constant 'path.sep' but
this felt 'cleaner'.

Signed-off-by: ciaranj <ciaranj@gmail.com>
---
 bin/lint | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/lint b/bin/lint
index bbb85b6c26..4f70994c51 100755
--- a/bin/lint
+++ b/bin/lint
@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 
-var lint = require("../test/lint/lint");
+var lint = require("../test/lint/lint"),
+    path = require("path");
 
 if (process.argv.length > 2) {
   lint.checkDir(process.argv[2]);
 } else {
-  process.chdir(__dirname.slice(0, __dirname.lastIndexOf("/")));
+  process.chdir(path.resolve(__dirname, ".."));
   lint.checkDir("lib");
   lint.checkDir("mode");
   lint.checkDir("addon");

From fa9150c6413b80b4ff9054108c9a0bba6b0095c7 Mon Sep 17 00:00:00 2001
From: TobiasBg <git@tobias.baethge.com>
Date: Thu, 22 Aug 2013 11:29:11 +0200
Subject: [PATCH 0413/4742] Main CSS file: Clean-up and fix lint warnings

Use 0 instead of 0px, clean-up two line breaks, to fix lint warning;
Three empty CSS blocks could also be removed.
---
 lib/codemirror.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index c95db6445c..7c11ea3747 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -215,8 +215,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   overflow: auto;
 }
 
-.CodeMirror-widget {
-}
+.CodeMirror-widget {}
 
 .CodeMirror-wrap .CodeMirror-scroll {
   overflow-x: hidden;
@@ -224,7 +223,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-measure {
   position: absolute;
-  width: 100%; height: 0px;
+  width: 100%;
+  height: 0;
   overflow: hidden;
   visibility: hidden;
 }

From a71f5fced2348a617e49a84e3252feb8702e43f6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 23 Aug 2013 14:18:49 +0200
Subject: [PATCH 0414/4742] [fullscreen addon] Reduce z-index in order to not
 hide completion popups

---
 addon/display/fullscreen.css |  2 +-
 addon/lint/lint.css          | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/addon/display/fullscreen.css b/addon/display/fullscreen.css
index 00ad677ff5..437acd89be 100644
--- a/addon/display/fullscreen.css
+++ b/addon/display/fullscreen.css
@@ -2,5 +2,5 @@
   position: fixed;
   top: 0; left: 0; right: 0; bottom: 0;
   height: auto;
-  z-index: 9999;
+  z-index: 9;
 }
diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index eb15381f02..a57694e00e 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -70,27 +70,3 @@
   background-position: right bottom;
   width: 100%; height: 100%;
 }
-
-/* Styles for the overview ruler  
-.annotationOverview {
-  cursor: pointer;
-  border-radius: 2px;
-  left: 2px;
-  width: 8px;
-}
-.annotationOverview.error {
-  background-color: lightcoral;
-  border: 1px solid darkred;
-}
-.annotationOverview.warning {
-  background-color: Gold;
-  border: 1px solid black;
-}
-
-.annotationHTML.overlay {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAAXNSR0IArs4c6QAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJEAQvB2JVdrAAAAAdaVRYdENvbW1lbnQAAAAAAENyZWF0ZWQgd2l0aCBHSU1QZC5lBwAAAD1JREFUCNdtjkESADAEAzemf69f66HMqGlOIhYiFRFRtSQBWAY7mzx+EDTL6sSgb1jTk7Q87rxyqe37fXsAa78gLyZnRgEAAAAASUVORK5CYII=");
-  background-position: right bottom;
-  position: relative;
-  top: -16px;
-}
-*/
\ No newline at end of file

From 518527cd2b8c80844b785c7f75dbf8d0f23c2bf5 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Fri, 23 Aug 2013 16:42:43 -0400
Subject: [PATCH 0415/4742] [scss] Fix indentation issues

Closes #1776
---
 mode/css/css.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 2eaa96a4a8..fb582debc2 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -277,16 +277,14 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
           state.stack[state.stack.length-1] = "@mediaType";
           state.stack.push("@mediaType(");
         }
+        else state.stack.push("(");
       }
       else if (type == ")") {
-        if (context == "propertyValue" && state.stack[state.stack.length-2] == "@mediaType(") {
+        if (context == "propertyValue") {
           // In @mediaType( without closing ; after propertyValue
           state.stack.pop();
-          state.stack.pop();
-        }
-        else if (context == "@mediaType(") {
-          state.stack.pop();
         }
+        state.stack.pop();
       }
       else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
       else if (context == "propertyValue" && type == ";") state.stack.pop();
@@ -593,6 +591,12 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     valueKeywords: valueKeywords,
     allowNested: true,
     hooks: {
+      ":": function(stream, state) {
+        if (stream.match(/\s*{/)) {
+          return [null, "{"];
+        }
+        return false;
+      },
       "$": function(stream) {
         stream.match(/^[\w-]+/);
         if (stream.peek() == ":") {

From 2e28aa32c07454eea587869c7a056ae5c9c38c57 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 24 Aug 2013 10:34:28 +0200
Subject: [PATCH 0416/4742] [css mode] Fix unused variable

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

diff --git a/mode/css/css.js b/mode/css/css.js
index fb582debc2..0caebe9fac 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -591,7 +591,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     valueKeywords: valueKeywords,
     allowNested: true,
     hooks: {
-      ":": function(stream, state) {
+      ":": function(stream) {
         if (stream.match(/\s*{/)) {
           return [null, "{"];
         }

From 6d564415ce59a05200b6b6ea0d91ceb9dfefa8ca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 25 Aug 2013 14:49:06 +0200
Subject: [PATCH 0417/4742] [coffeescript mode] Stop highlighting .keyword
 (.on/.off/.in) as error

Closes #1779
---
 mode/coffeescript/coffeescript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 4f54b0c690..b7203f124b 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -259,7 +259,7 @@ CodeMirror.defineMode('coffeescript', function(conf) {
         if (current === '.') {
             style = state.tokenize(stream, state);
             current = stream.current();
-            if (style === 'variable') {
+            if (/^\.[\w$]+$/.test(current)) {
                 return 'variable';
             } else {
                 return ERRORCLASS;

From b3a1ed43076a21c4f8122807929b8a01a40fa412 Mon Sep 17 00:00:00 2001
From: sathyamoorthi <sathyamoorthi10@gmail.com>
Date: Mon, 26 Aug 2013 10:06:08 +0530
Subject: [PATCH 0418/4742] [matchtags addon] option added to highlight both
 tags

---
 addon/edit/matchtags.js | 14 +++++++++-----
 demo/matchtags.html     |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index 3eabfeb8d3..76a4370331 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -8,6 +8,7 @@
       clear(cm);
     }
     if (val) {
+      cm.state.matchBothTags = (val.bothTags);
       cm.on("cursorActivity", doMatchTags);
       cm.on("viewportChange", maybeUpdateMatch);
       doMatchTags(cm);
@@ -15,10 +16,9 @@
   });
 
   function clear(cm) {
-    if (cm.state.matchedTag) {
-      cm.state.matchedTag.clear();
-      cm.state.matchedTag = null;
-    }
+    if (cm.state.tagHit) cm.state.tagHit.clear();
+    if (cm.state.tagOther) cm.state.tagOther.clear();
+    cm.state.tagHit = null; cm.state.tagOther = null;
   }
 
   function doMatchTags(cm) {
@@ -29,9 +29,13 @@
       range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
       var match = CodeMirror.findMatchingTag(cm, cur, range);
       if (!match) return;
+      if(cm.state.matchBothTags) {
+        var hit = match.at == "open" ? match.open : match.close;
+        if(hit)cm.state.tagHit = cm.markText(hit.from, hit.to, {className: "CodeMirror-matchingtag"});
+      }
       var other = match.at == "close" ? match.open : match.close;
       if (other)
-        cm.state.matchedTag = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
+        cm.state.tagOther = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
       else
         cm.state.failedTagMatch = true;
     });
diff --git a/demo/matchtags.html b/demo/matchtags.html
index 40ee8c0b7e..9a3797e597 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -37,7 +37,7 @@ <h2>Tag Matcher Demo</h2>
   editor = CodeMirror(document.getElementById("editor"), {
     value: "<html>\n  " + document.documentElement.innerHTML + "\n</html>",
     mode: "text/html",
-    matchTags: true,
+    matchTags: {bothTags: true},
     extraKeys: {"Ctrl-J": "toMatchingTag"}
   });
 };

From 9fbdb014e25d11a54b959b9b77900035214ce50f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 26 Aug 2013 09:35:31 +0200
Subject: [PATCH 0419/4742] [matchtags addon] cleanup b3a1ed4

Issue #1781
---
 addon/edit/matchtags.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index 76a4370331..52e8460245 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -8,7 +8,7 @@
       clear(cm);
     }
     if (val) {
-      cm.state.matchBothTags = (val.bothTags);
+      cm.state.matchBothTags = typeof val == "object" && val.bothTags;
       cm.on("cursorActivity", doMatchTags);
       cm.on("viewportChange", maybeUpdateMatch);
       doMatchTags(cm);
@@ -18,7 +18,7 @@
   function clear(cm) {
     if (cm.state.tagHit) cm.state.tagHit.clear();
     if (cm.state.tagOther) cm.state.tagOther.clear();
-    cm.state.tagHit = null; cm.state.tagOther = null;
+    cm.state.tagHit = cm.state.tagOther = null;
   }
 
   function doMatchTags(cm) {
@@ -29,9 +29,9 @@
       range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
       var match = CodeMirror.findMatchingTag(cm, cur, range);
       if (!match) return;
-      if(cm.state.matchBothTags) {
+      if (cm.state.matchBothTags) {
         var hit = match.at == "open" ? match.open : match.close;
-        if(hit)cm.state.tagHit = cm.markText(hit.from, hit.to, {className: "CodeMirror-matchingtag"});
+        if (hit) cm.state.tagHit = cm.markText(hit.from, hit.to, {className: "CodeMirror-matchingtag"});
       }
       var other = match.at == "close" ? match.open : match.close;
       if (other)

From e9b20be762b6a3a4115fdce2e232d20573eba154 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 26 Aug 2013 21:10:25 +0200
Subject: [PATCH 0420/4742] [real-world uses] Add Tilemill

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 9b6d7386fb..c0570e3823 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -104,6 +104,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.solidshops.com/">SolidShops</a> (hosted e-commerce platform)</li>
       <li><a href="http://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
+      <li><a href="http://www.mapbox.com/tilemill/">Tilemill</a> (map design tool)</li>
       <li><a href="http://www.toolsverse.com/products/data-explorer/">Toolsverse Data Explorer</a> (database management)</li>
       <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a> (augmented editing)</li>
       <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>

From c202930a98227fff7dcd7c51923f980c360a0233 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 27 Aug 2013 10:07:05 +0200
Subject: [PATCH 0421/4742] [real-world uses] Add uiCod

---
 doc/realworld.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index c0570e3823..040da5910a 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -104,11 +104,12 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.solidshops.com/">SolidShops</a> (hosted e-commerce platform)</li>
       <li><a href="http://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
-      <li><a href="http://www.mapbox.com/tilemill/">Tilemill</a> (map design tool)</li>
+      <li><a href="http://www.mapbox.com/tilemill/">TileMill</a> (map design tool)</li>
       <li><a href="http://www.toolsverse.com/products/data-explorer/">Toolsverse Data Explorer</a> (database management)</li>
       <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a> (augmented editing)</li>
       <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>
       <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>
+      <li><a href="http://uicod.com/">uiCod</a> (animation demo gallery and sharing)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
       <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a> (code viewer)</li>
       <li><a href="http://www.webglacademy.com/">WebGL academy</a> (learning WebGL)</li>

From 3fcd240fe9c0eeb749c8feaaa2af28779ddca813 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 27 Aug 2013 11:59:29 +0200
Subject: [PATCH 0422/4742] [show-hint addon] Fix broken
 inside-window-positioning code

Closes #1784
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index a33c4c3559..884e0a3854 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -167,6 +167,7 @@
     // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
     var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
     var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
+    (options.container || document.body).appendChild(hints);
     var box = hints.getBoundingClientRect();
     var overlapX = box.right - winW, overlapY = box.bottom - winH;
     if (overlapX > 0) {
@@ -187,7 +188,6 @@
       }
       hints.style.top = (top = pos.bottom - overlapY) + "px";
     }
-    (options.container || document.body).appendChild(hints);
 
     cm.addKeyMap(this.keyMap = buildKeyMap(options, {
       moveFocus: function(n) { widget.changeActive(widget.selectedHint + n); },

From 980fc2cbd8c2f062cdece3c17b98eb41390e8b5d Mon Sep 17 00:00:00 2001
From: angelozerr <angelo.zerr@gmail.com>
Date: Tue, 27 Aug 2013 10:50:54 +0200
Subject: [PATCH 0423/4742] CSS lint addon with
 https://github.com/stubbornella/csslint

---
 addon/lint/css-lint.js | 16 ++++++++++
 demo/lint.html         | 71 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 addon/lint/css-lint.js

diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
new file mode 100644
index 0000000000..97990eef0c
--- /dev/null
+++ b/addon/lint/css-lint.js
@@ -0,0 +1,16 @@
+// Depends on csslint.js from https://github.com/stubbornella/csslint
+
+CodeMirror.registerHelper("lint", "css", function(text) {
+  var found = [];
+  var results = CSSLint.verify(text), messages = results.messages, message = null;
+  for ( var i = 0; i < messages.length; i++) {
+    message = messages[i];
+    var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;
+    found.push({from: CodeMirror.Pos(startLine, startCol),
+      to: CodeMirror.Pos(endLine, endCol),
+      message: message.message,
+      severity : message.type});  
+  }
+  return found;
+});
+CodeMirror.cssValidator = CodeMirror.lint.css; // deprecated
diff --git a/demo/lint.html b/demo/lint.html
index ee64237e81..05236150ef 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -8,11 +8,15 @@
 <link rel="stylesheet" href="../addon/lint/lint.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/css/css.js"></script>
 <script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
 <script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
+<script src="https://rawgithub.amrom.workers.dev/stubbornella/csslint/master/release/csslint.js"></script>
+<script src="../addon/lint/lint.js"></script>
 <script src="../addon/lint/lint.js"></script>
 <script src="../addon/lint/javascript-lint.js"></script>
 <script src="../addon/lint/json-lint.js"></script>
+<script src="../addon/lint/css-lint.js"></script>
 <style type="text/css">
       .CodeMirror {border: 1px solid black;}
     </style>
@@ -82,6 +86,66 @@ <h2>Linter Demo</h2>
 ]
 </textarea></p>
 
+    <p><textarea id="code-css">@charset "UTF-8";
+
+@import url("booya.css") print, screen;
+@import "whatup.css" screen;
+@import "wicked.css";
+
+/*Error*/
+@charset "UTF-8";
+
+
+@namespace "http://www.w3.org/1999/xhtml";
+@namespace svg "http://www.w3.org/2000/svg";
+
+/*Warning: empty ruleset */
+.foo {
+}
+
+h1 {
+    font-weight: bold;
+}
+
+/*Warning: qualified heading */
+.foo h1 {
+    font-weight: bold;
+}
+
+/*Warning: adjoining classes */
+.foo.bar {
+    zoom: 1;
+}
+
+li.inline {
+    width: 100%;  /*Warning: 100% can be problematic*/
+}
+
+li.last {
+  display: inline;
+  padding-left: 3px !important;
+  padding-right: 3px;
+  border-right: 0px;
+}
+
+@media print {
+    li.inline {
+      color: black;
+    }
+}
+
+@page {
+  margin: 10%;
+  counter-increment: page;
+
+  @top-center {
+    font-family: sans-serif;
+    font-weight: bold;
+    font-size: 2em;
+    content: counter(page);
+  }
+}
+</textarea></p>
 <script>
   var editor = CodeMirror.fromTextArea(document.getElementById("code-js"), {
     lineNumbers: true,
@@ -96,6 +160,13 @@ <h2>Linter Demo</h2>
     gutters: ["CodeMirror-lint-markers"],
     lint: true
   });
+  
+  var editor_css = CodeMirror.fromTextArea(document.getElementById("code-css"), {
+    lineNumbers: true,
+    mode: "css",
+    gutters: ["CodeMirror-lint-markers"],
+    lint: true
+  });
 </script>
 
   </article>

From be12635c1d5d7758f7422025836dc8b27eeb0746 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 27 Aug 2013 12:04:10 +0200
Subject: [PATCH 0424/4742] [css-lint addon] Don't add new deprecated code, fix
 trailing space

Issue #1782
---
 addon/lint/css-lint.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index 97990eef0c..ba650f6a22 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -6,11 +6,12 @@ CodeMirror.registerHelper("lint", "css", function(text) {
   for ( var i = 0; i < messages.length; i++) {
     message = messages[i];
     var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;
-    found.push({from: CodeMirror.Pos(startLine, startCol),
+    found.push({
+      from: CodeMirror.Pos(startLine, startCol),
       to: CodeMirror.Pos(endLine, endCol),
       message: message.message,
-      severity : message.type});  
+      severity : message.type
+    });
   }
   return found;
 });
-CodeMirror.cssValidator = CodeMirror.lint.css; // deprecated

From dec86385beca96993e4a9b40d82ccbf47655285b Mon Sep 17 00:00:00 2001
From: Chris Granger <ibdknox@gmail.com>
Date: Mon, 29 Jul 2013 09:41:56 -0700
Subject: [PATCH 0425/4742] Vim: raise mode change events

Signed-off-by: Chris Granger <ibdknox@gmail.com>
---
 keymap/vim.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9c9454d6c8..9ad17af31c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -40,6 +40,10 @@
  *   TODO: Implement the remaining special marks. They have more complex
  *       behavior.
  *
+ * Events:
+ *  'vim-mode-change' - raised on the editor anytime the current mode changes,
+ *                      Event object: {mode: "visual", subMode: "linewise"}
+ *
  * Code structure:
  *  1. Default keymap
  *  2. Variable declarations and short basic helpers
@@ -318,6 +322,7 @@
     CodeMirror.defineOption('vimMode', false, function(cm, val) {
       if (val) {
         cm.setOption('keyMap', 'vim');
+        CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
         cm.on('beforeSelectionChange', beforeSelectionChange);
         maybeInitVimState(cm);
       } else if (cm.state.vim) {
@@ -579,6 +584,7 @@
             !cursorEqual(cm.getCursor('head'), cm.getCursor('anchor'))) {
           vim.visualMode = true;
           vim.visualLine = false;
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
           cm.on('mousedown', exitVisualMode);
         }
         if (key != '0' || (key == '0' && vim.inputState.getRepeat() === 0)) {
@@ -1651,8 +1657,10 @@
           // Handle Replace-mode as a special case of insert mode.
           cm.toggleOverwrite(true);
           cm.setOption('keyMap', 'vim-replace');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
         } else {
           cm.setOption('keyMap', 'vim-insert');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
         }
         if (!vimGlobalState.macroModeState.inReplay) {
           // Only record if not replaying.
@@ -1694,6 +1702,7 @@
           } else {
             cm.setSelection(curStart, curEnd);
           }
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
         } else {
           curStart = cm.getCursor('anchor');
           curEnd = cm.getCursor('head');
@@ -1706,10 +1715,12 @@
             curEnd.ch = cursorIsBefore(curStart, curEnd) ?
                 lineLength(cm, curEnd.line) : 0;
             cm.setSelection(curStart, curEnd);
+            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: "linewise"});
           } else if (vim.visualLine && !actionArgs.linewise) {
             // v pressed in linewise visual mode. Switch to characterwise visual
             // mode instead of exiting visual mode.
             vim.visualLine = false;
+            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
           } else {
             exitVisualMode(cm);
           }
@@ -2022,6 +2033,7 @@
         // it's not supposed to be.
         cm.setCursor(clipCursorToContent(cm, selectionEnd));
       }
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
     }
 
     // Remove any trailing newlines from the selection. For
@@ -3444,6 +3456,7 @@
       vim.insertMode = false;
       cm.setOption('keyMap', 'vim');
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
     }
 
     CodeMirror.keyMap['vim-insert'] = {

From f8ca1785618fc534fe8d6dc473412d4c5ddd1bf0 Mon Sep 17 00:00:00 2001
From: kubelsmieci <kubelsmieci@gmail.com>
Date: Tue, 27 Aug 2013 18:02:01 +0200
Subject: [PATCH 0426/4742] Update markselection.html

Demo was incorrectly named as showing 'Highlighter', fixed to 'Selection'
---
 demo/markselection.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo/markselection.html b/demo/markselection.html
index 2e52af930f..454933264f 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror: Match Highlighter Demo</title>
+<title>CodeMirror: Match Selection Demo</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../doc/docs.css">
 
@@ -22,12 +22,12 @@
     <li><a href="https://github.com/marijnh/codemirror">Code</a>
   </ul>
   <ul>
-    <li><a class=active href="#">Match Highlighter</a>
+    <li><a class=active href="#">Match Selection</a>
   </ul>
 </div>
 
 <article>
-<h2>Match Highlighter Demo</h2>
+<h2>Match Selection Demo</h2>
 <form><textarea id="code" name="code">Select something from here.
 You'll see that the selection's foreground color changes to white!
 Since, by default, CodeMirror only puts an independent "marker" layer

From b5069dfdffb2de18e5fa5f8605c027d17ad84356 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 29 Aug 2013 11:13:29 +0200
Subject: [PATCH 0427/4742] Get rid of top links in CONTRIBUTING.md

Issue #1786
---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4e040ff193..8938f62046 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,12 +4,12 @@
 - [Submitting bug reports](#submitting-bug-reports-)
 - [Contributing code](#contributing-code-)
 
-## Getting help [^](#how-to-contribute)
+## Getting help
 
 Community discussion, questions, and informal bug reporting is done on the
 [CodeMirror Google group](http://groups.google.com/group/codemirror).
 
-## Submitting bug reports [^](#how-to-contribute)
+## Submitting bug reports
 
 The preferred way to report bugs is to use the
 [GitHub issue tracker](http://github.com/marijnh/CodeMirror/issues). Before
@@ -45,7 +45,7 @@ should be asked on the
   [jsbin.com](http://jsbin.com/ihunin/edit), enter it there, press save, and
   include the resulting link in your bug report.
 
-## Contributing code [^](#how-to-contribute)
+## Contributing code
 
 - Make sure you have a [GitHub Account](https://github.com/signup/free)
 - Fork [CodeMirror](https://github.com/marijnh/CodeMirror/)

From 6d1b5c4dafd60cc02eccf1d947e8c57e6afed8b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Aug 2013 09:44:16 +0200
Subject: [PATCH 0428/4742] In setSelection, default bias direction when not
 given

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f7e4a0e69b..3d3559959f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2543,6 +2543,7 @@ window.CodeMirror = (function() {
 
     var sel = doc.sel;
     sel.goalColumn = null;
+    if (bias == null) bias = posLess(sel.head, head) ? 1 : -1;
     // Skip over atomic spans.
     if (checkAtomic || !posEq(anchor, sel.anchor))
       anchor = skipAtomic(doc, anchor, bias, checkAtomic != "push");

From 1c2f261d65a97b8d3d082ea2ed02136eea5e64ee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Aug 2013 09:53:34 +0200
Subject: [PATCH 0429/4742] Fix failing tests from
 6d1b5c4dafd60cc02eccf1d947e8c57e6afed8b9

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3d3559959f..53a24639ff 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2543,7 +2543,7 @@ window.CodeMirror = (function() {
 
     var sel = doc.sel;
     sel.goalColumn = null;
-    if (bias == null) bias = posLess(sel.head, head) ? 1 : -1;
+    if (bias == null) bias = posLess(head, sel.head) ? -1 : 1;
     // Skip over atomic spans.
     if (checkAtomic || !posEq(anchor, sel.anchor))
       anchor = skipAtomic(doc, anchor, bias, checkAtomic != "push");
diff --git a/test/test.js b/test/test.js
index 1c37b4dfe1..21e09cb12e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1340,6 +1340,7 @@ testCM("atomicMarker", function(cm) {
   eqPos(cm.getCursor(), Pos(8, 3));
   m.clear();
   m = atom(1, 1, 3, 8);
+  cm.setCursor(Pos(0, 0));
   cm.setCursor(Pos(2, 0));
   eqPos(cm.getCursor(), Pos(3, 8));
   cm.execCommand("goCharLeft");

From d96f01f63f497a856e2ca20cfdca49dcbcc5ccd9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Aug 2013 10:09:45 +0200
Subject: [PATCH 0430/4742] Counteract idiot frameworks that set box-sizing to
 border-box

Issue #1060
---
 lib/codemirror.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 7c11ea3747..4e300b2be2 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -118,6 +118,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
 }
 .CodeMirror-sizer {
   position: relative;
@@ -156,6 +158,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 .CodeMirror-gutter {
   white-space: normal;
   height: 100%;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
   padding-bottom: 30px;
   margin-bottom: -32px;
   display: inline-block;

From c0e00d0933d5a69dbc596ce0360a87e637ea5e68 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Aug 2013 10:32:01 +0200
Subject: [PATCH 0431/4742] Handle remaining special case in Chrome 29+ word
 wrapping

Issue #1791
---
 lib/codemirror.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 53a24639ff..fcb6bc03dd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5489,7 +5489,12 @@ window.CodeMirror = (function() {
     spanAffectsWrapping = function(str, i) {
       return /\-[^ \-?]|\?[^ !\'\"\),.\-\/:;\?\]\}]/.test(str.slice(i - 1, i + 1));
     };
-  else if (webkit && !/Chrome\/(?:29|[3-9]\d|\d\d\d)\./.test(navigator.userAgent))
+  else if (webkit && /Chrome\/(?:29|[3-9]\d|\d\d\d)\./.test(navigator.userAgent))
+    spanAffectsWrapping = function(str, i) {
+      var code = str.charCodeAt(i - 1);
+      return code >= 8208 && code <= 8212;
+    };
+  else if (webkit)
     spanAffectsWrapping = function(str, i) {
       if (i > 1 && str.charCodeAt(i - 1) == 45) {
         if (/\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i))) return true;

From 2d51b31fa778efafa8f3e7bf547ce52631f7a6b8 Mon Sep 17 00:00:00 2001
From: ForbesLindesay <forbes@lindesay.co.uk>
Date: Thu, 29 Aug 2013 13:33:54 +0100
Subject: [PATCH 0432/4742] [toml mode] Add

---
 doc/compress.html    |  1 +
 mode/index.html      |  1 +
 mode/toml/index.html | 73 ++++++++++++++++++++++++++++++++++++++++++++
 mode/toml/toml.js    | 71 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 146 insertions(+)
 create mode 100644 mode/toml/index.html
 create mode 100644 mode/toml/toml.js

diff --git a/doc/compress.html b/doc/compress.html
index e100e60a0d..92c0987ba9 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -136,6 +136,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/tcl/tcl.js">tcl.js</option>
           <option value="http://codemirror.net/mode/tiddlywiki/tiddlywiki.js">tiddlywiki.js</option>
           <option value="http://codemirror.net/mode/tiki/tiki.js">tiki.js</option>
+          <option value="http://codemirror.net/mode/toml/toml.js">toml.js</option>
           <option value="http://codemirror.net/mode/turtle/turtle.js">turtle.js</option>
           <option value="http://codemirror.net/mode/vb/vb.js">vb.js</option>
           <option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
diff --git a/mode/index.html b/mode/index.html
index e228c343ef..5601a2c458 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -91,6 +91,7 @@ <h2>Language modes</h2>
       <li><a href="tcl/index.html">Tcl</a></li>
       <li><a href="tiddlywiki/index.html">Tiddlywiki</a></li>
       <li><a href="tiki/index.html">Tiki wiki</a></li>
+      <li><a href="toml/index.html">TOML</a></li>
       <li><a href="turtle/index.html">Turtle</a></li>
       <li><a href="vb/index.html">VB.NET</a></li>
       <li><a href="vbscript/index.html">VBScript</a></li>
diff --git a/mode/toml/index.html b/mode/toml/index.html
new file mode 100644
index 0000000000..c59b4cc085
--- /dev/null
+++ b/mode/toml/index.html
@@ -0,0 +1,73 @@
+<!doctype html>
+
+<title>CodeMirror: TOML 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="toml.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">TOML Mode</a>
+  </ul>
+</div>
+
+<article>
+<h2>TOML Mode</h2>
+<form><textarea id="code" name="code">
+# This is a TOML document. Boom.
+
+title = "TOML Example"
+
+[owner]
+name = "Tom Preston-Werner"
+organization = "GitHub"
+bio = "GitHub Cofounder &amp; CEO\nLikes tater tots and beer."
+dob = 1979-05-27T07:32:00Z # First class dates? Why not?
+
+[database]
+server = "192.168.1.1"
+ports = [ 8001, 8001, 8002 ]
+connection_max = 5000
+enabled = true
+
+[servers]
+
+  # You can indent as you please. Tabs or spaces. TOML don't care.
+  [servers.alpha]
+  ip = "10.0.0.1"
+  dc = "eqdc10"
+  
+  [servers.beta]
+  ip = "10.0.0.2"
+  dc = "eqdc10"
+  
+[clients]
+data = [ ["gamma", "delta"], [1, 2] ]
+
+# Line breaks are OK when inside arrays
+hosts = [
+  "alpha",
+  "omega"
+]
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "toml"},
+        lineNumbers: true
+      });
+    </script>
+    <h3>The TOML Mode</h3>
+      <p> Created by Forbes Lindesay.</p>
+    <p><strong>MIME type defined:</strong> <code>text/x-toml</code>.</p>
+  </article>
diff --git a/mode/toml/toml.js b/mode/toml/toml.js
new file mode 100644
index 0000000000..1d163f13bf
--- /dev/null
+++ b/mode/toml/toml.js
@@ -0,0 +1,71 @@
+CodeMirror.defineMode("toml", function () {
+  return {
+    startState: function () {
+      return {
+        inString: false,
+        stringType: "",
+        lhs: true,
+        inArray: 0
+      };
+    },
+    token: function (stream, state) {
+      //check for state changes
+      if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
+        state.stringType = stream.peek();
+        stream.next(); // Skip quote
+        state.inString = true; // Update state
+      }
+      if (stream.sol() && state.inArray === 0) {
+        state.lhs = true;
+      }
+      //return state
+      if (state.inString) {
+        while (state.inString && !stream.eol()) {
+          if (stream.peek() === state.stringType) {
+            stream.next(); // Skip quote
+            state.inString = false; // Clear flag
+          } else if (stream.peek() === '\\') {
+            stream.next();
+            stream.next();
+          } else {
+            stream.match(/^.[^\\\"\']*/);
+          }
+        }
+        return state.lhs ? "property string" : "string"; // Token style
+      } else if (state.inArray && stream.peek() === ']') {
+        stream.next();
+        state.inArray--;
+        return 'bracket';
+      } else if (state.lhs && stream.peek() === '[' && stream.skipTo(']')) {
+        stream.next();//skip closing ]
+        return "atom";
+      } else if (stream.peek() === "#") {
+        stream.skipToEnd();
+        return "comment";
+      } else if (stream.eatSpace()) {
+        return null;
+      } else if (state.lhs && stream.eatWhile(function (c) { return c != '=' && c != ' '; })) {
+        return "property";
+      } else if (state.lhs && stream.peek() === "=") {
+        stream.next();
+        state.lhs = false;
+        return null;
+      } else if (!state.lhs && stream.match(/^\d\d\d\d[\d\-\:\.T]*Z/)) {
+        return 'atom'; //date
+      } else if (!state.lhs && (stream.match('true') || stream.match('false'))) {
+        return 'atom';
+      } else if (!state.lhs && stream.peek() === '[') {
+        state.inArray++;
+        stream.next();
+        return 'bracket';
+      } else if (!state.lhs && stream.match(/^\-?\d+(?:\.\d+)?/)) {
+        return 'number';
+      } else if (!stream.eatSpace()) {
+        stream.next();
+      }
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME('text/x-toml', 'toml');

From df7ce151b4baf26ffbd0acb0d67ab9ac28b0e2eb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Sep 2013 18:01:44 +0200
Subject: [PATCH 0433/4742] [tern addon] Fix fetching of parser state

Issue #1799
---
 addon/tern/tern.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 1be5ba7f5d..4348c8d8e8 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -233,7 +233,10 @@
     closeArgHints(ts);
 
     if (cm.somethingSelected()) return;
-    var lex = cm.getTokenAt(cm.getCursor()).state.lexical;
+    var state = cm.getTokenAt(cm.getCursor()).state;
+    var inner = CodeMirror.innerMode(cm.getMode(), state);
+    if (inner.mode.name != "javascript") return;
+    var lex = inner.state.lexical;
     if (lex.info != "call") return;
 
     var ch = lex.column, pos = lex.pos || 0;

From 4f081574b95c73bec7214f3707b03a76647d6060 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Sep 2013 10:37:02 +0200
Subject: [PATCH 0434/4742] [sql mode] Add comment style properties

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

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 9016cc7aae..e9dcb7fd75 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -180,7 +180,11 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       if (!cx) return CodeMirror.Pass;
       if (cx.align) return cx.col + (textAfter.charAt(0) == cx.type ? 0 : 1);
       else return cx.indent + config.indentUnit;
-    }
+    },
+
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : null
   };
 });
 

From 36edc05b1d7386fa5d8cb6f67214896ed95123a1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Sep 2013 11:22:45 +0200
Subject: [PATCH 0435/4742] In refresh, recompute line heights when no known
 text height

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fcb6bc03dd..c9a8b9d580 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3188,9 +3188,11 @@ window.CodeMirror = (function() {
     operation: function(f){return runInOp(this, f);},
 
     refresh: operation(null, function() {
+      var badHeight = this.display.cachedTextHeight == null;
       clearCaches(this);
       updateScrollPos(this, this.doc.scrollLeft, this.doc.scrollTop);
       regChange(this);
+      if (badHeight) estimateLineHeights(this);
     }),
 
     swapDoc: operation(null, function(doc) {

From 22ea8d9dbc41c108d67675d7b3a8cbdde7e7133d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Sep 2013 11:32:33 +0200
Subject: [PATCH 0436/4742] [matchtags addon] Don't match tags when there is a
 selection

Closes #1802
---
 addon/edit/matchtags.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index 52e8460245..f189c1f8ef 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -25,6 +25,7 @@
     cm.state.failedTagMatch = false;
     cm.operation(function() {
       clear(cm);
+      if (cm.somethingSelected()) return;
       var cur = cm.getCursor(), range = cm.getViewport();
       range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
       var match = CodeMirror.findMatchingTag(cm, cur, range);

From b8e09e976015c065d7911e472bc1902d7f299940 Mon Sep 17 00:00:00 2001
From: AndersMad <thisisafish@gmail.com>
Date: Sat, 31 Aug 2013 09:57:19 +0200
Subject: [PATCH 0437/4742] [css-hint addon] Add

I have created this simple css autocomplete/hint that uses data from
the css mode. Autocomplete works for both properties and values - but
it does not filter the values by property. Better than nothing for
now.
---
 addon/hint/css-hint.js | 50 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 addon/hint/css-hint.js

diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
new file mode 100644
index 0000000000..d8fe3ebaf0
--- /dev/null
+++ b/addon/hint/css-hint.js
@@ -0,0 +1,50 @@
+(function () {
+  "use strict";
+
+  function getHints(cm) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
+    if (inner.mode.name != "css-base") return;
+
+    // If it's not a 'word-style' token, ignore the token.
+    if (!/^[\w$_-]*$/.test(token.string)) {
+      token = {
+        start: cur.ch, end: cur.ch, string: "", state: token.state,
+        type: null
+      };
+      var stack = token.state.stack;
+      var lastToken = stack && stack.length > 0 ? stack[stack.length - 1] : "";
+      if (token.string == ":" || lastToken.indexOf("property") == 0)
+        token.type = "variable";
+      else if (token.string == "{" || lastToken.indexOf("rule") == 0)
+        token.type = "property";
+    }
+
+    if (!token.type)
+      return;
+
+    var spec = CodeMirror.resolveMode("text/css");
+    var keywords = null;
+    if (token.type.indexOf("property") == 0)
+      keywords = spec.propertyKeywords;
+    else if (token.type.indexOf("variable") == 0)
+      keywords = spec.valueKeywords;
+
+    if (!keywords)
+      return;
+
+    var result = [];
+    for (var name in keywords) {
+      if (name.indexOf(token.string) == 0 /* > -1 */)
+        result.push(name);
+    }
+
+    return {
+      list: result,
+      from: CodeMirror.Pos(cur.line, token.start),
+      to: CodeMirror.Pos(cur.line, token.end)
+    };
+  }
+
+  CodeMirror.registerHelper("hint", "css", getHints);
+})();

From 90d036d610e4ba58649ec325967b3b7ef5efd15f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Sep 2013 12:34:43 +0200
Subject: [PATCH 0438/4742] [css-hint addon] Integrate

---
 addon/hint/css-hint.js |  2 +-
 doc/compress.html      |  1 +
 doc/manual.html        |  4 ++++
 mode/css/css.js        | 12 +++++-------
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index d8fe3ebaf0..2b15300d0c 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -4,7 +4,7 @@
   function getHints(cm) {
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
-    if (inner.mode.name != "css-base") return;
+    if (inner.mode.name != "css") return;
 
     // If it's not a 'word-style' token, ignore the token.
     if (!/^[\w$_-]*$/.test(token.string)) {
diff --git a/doc/compress.html b/doc/compress.html
index 92c0987ba9..5ee78bb4c5 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -157,6 +157,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/fold/comment-fold.js">comment-fold.js</option>
           <option value="http://codemirror.net/addon/comment/continuecomment.js">continuecomment.js</option>
           <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>
+          <option value="http://codemirror.net/addon/hint/css-hint.js">css-hint.js</option>
           <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
           <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
           <option value="http://codemirror.net/addon/display/fullscreen.js">fullscreen.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index 3f591492b6..9f516b7e05 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2049,6 +2049,10 @@ <h2>Addons</h2>
       schema data. See
       the <a href="../demo/html5complete.html">demo</a>.</dd>
 
+      <dt id="addon_css-hint"><a href="../addon/hint/css-hint.js"><code>hint/css-hint.js</code></a></dt>
+      <dd>A minimal hinting function for CSS code.
+      Defines <code>CodeMirror.hint.css</code>.</dd>
+
       <dt id="addon_python-hint"><a href="../addon/hint/python-hint.js"><code>hint/python-hint.js</code></a></dt>
       <dd>A very simple hinting function for Python code.
       Defines <code>CodeMirror.hint.python</code>.</dd>
diff --git a/mode/css/css.js b/mode/css/css.js
index 0caebe9fac..085b119de4 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -1,10 +1,8 @@
-CodeMirror.defineMode("css", function(config) {
-  return CodeMirror.getMode(config, "text/css");
-});
-
-CodeMirror.defineMode("css-base", function(config, parserConfig) {
+CodeMirror.defineMode("css", function(config, parserConfig) {
   "use strict";
 
+  if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
+
   var indentUnit = config.indentUnit,
       hooks = parserConfig.hooks || {},
       atMediaTypes = parserConfig.atMediaTypes || {},
@@ -580,7 +578,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
         return false;
       }
     },
-    name: "css-base"
+    name: "css"
   });
 
   CodeMirror.defineMIME("text/x-scss", {
@@ -624,6 +622,6 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
         }
       }
     },
-    name: "css-base"
+    name: "css"
   });
 })();

From 47965d3bd07e347b18e1ee4ab40617c7f1e41b12 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Sep 2013 12:47:49 +0200
Subject: [PATCH 0439/4742] [closetag addon] Restructure

---
 addon/edit/closetag.js | 55 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 454dfea5e6..0bf8881d08 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -27,9 +27,9 @@
     if (val && (old == CodeMirror.Init || !old)) {
       var map = {name: "autoCloseTags"};
       if (typeof val != "object" || val.whenClosing)
-        map["'/'"] = function(cm) { return autoCloseTag(cm, '/'); };
+        map["'/'"] = function(cm) { return autoCloseSlash(cm); };
       if (typeof val != "object" || val.whenOpening)
-        map["'>'"] = function(cm) { return autoCloseTag(cm, '>'); };
+        map["'>'"] = function(cm) { return autoCloseGT(cm); };
       cm.addKeyMap(map);
     } else if (!val && (old != CodeMirror.Init && old)) {
       cm.removeKeyMap("autoCloseTags");
@@ -41,40 +41,41 @@
   var htmlIndent = ["applet", "blockquote", "body", "button", "div", "dl", "fieldset", "form", "frameset", "h1", "h2", "h3", "h4",
                     "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
 
-  function autoCloseTag(cm, ch) {
+  function autoCloseGT(cm) {
     var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
     var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (inner.mode.name != "xml") return CodeMirror.Pass;
+    if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
 
     var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
     var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
     var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
 
-    if (ch == ">" && state.tagName) {
-      var tagName = state.tagName;
-      if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
-      var lowerTagName = tagName.toLowerCase();
-      // Don't process the '>' at the end of an end-tag or self-closing tag
-      if (tok.type == "tag" && state.type == "closeTag" ||
-          tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
-          dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)
-        return CodeMirror.Pass;
+    var tagName = state.tagName;
+    if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
+    var lowerTagName = tagName.toLowerCase();
+    // Don't process the '>' at the end of an end-tag or self-closing tag
+    if (tok.type == "tag" && state.type == "closeTag" ||
+        tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
+        dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)
+      return CodeMirror.Pass;
 
-      var doIndent = indentTags && indexOf(indentTags, lowerTagName) > -1;
-      var curPos = doIndent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1);
-      cm.replaceSelection(">" + (doIndent ? "\n\n" : "") + "</" + tagName + ">",
-                          {head: curPos, anchor: curPos});
-      if (doIndent) {
-        cm.indentLine(pos.line + 1);
-        cm.indentLine(pos.line + 2);
-      }
-      return;
-    } else if (ch == "/" && tok.string == "<") {
-      var tagName = state.context && state.context.tagName;
-      if (tagName) cm.replaceSelection("/" + tagName + ">", "end");
-      return;
+    var doIndent = indentTags && indexOf(indentTags, lowerTagName) > -1;
+    var curPos = doIndent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1);
+    cm.replaceSelection(">" + (doIndent ? "\n\n" : "") + "</" + tagName + ">",
+                        {head: curPos, anchor: curPos});
+    if (doIndent) {
+      cm.indentLine(pos.line + 1);
+      cm.indentLine(pos.line + 2);
     }
-    return CodeMirror.Pass;
+  }
+
+  function autoCloseSlash(cm) {
+    var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
+    var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+    if (tok.string != "<" || inner.mode.name != "xml") return CodeMirror.Pass;
+
+    var tagName = state.context && state.context.tagName;
+    if (tagName) cm.replaceSelection("/" + tagName + ">", "end");
   }
 
   function indexOf(collection, elt) {

From a55b506103247d6664ee2fe72e21a85cb86e164b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Sep 2013 12:51:31 +0200
Subject: [PATCH 0440/4742] [closetag addon] Allow closing by typing / even
 when before a word

Closes #1795
---
 addon/edit/closetag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 0bf8881d08..0bc3e8be17 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -72,7 +72,7 @@
   function autoCloseSlash(cm) {
     var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
     var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (tok.string != "<" || inner.mode.name != "xml") return CodeMirror.Pass;
+    if (tok.string.charAt(0) != "<" || inner.mode.name != "xml") return CodeMirror.Pass;
 
     var tagName = state.context && state.context.tagName;
     if (tagName) cm.replaceSelection("/" + tagName + ">", "end");

From f5b9d3ca9030117806a8822f48853b7ff4b8bdaa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Sep 2013 14:52:48 +0200
Subject: [PATCH 0441/4742] [haskell mode] Allow keyword sets to be overridden

---
 mode/haskell/haskell.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index b18d5ced1a..59ca7f0baa 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -1,4 +1,4 @@
-CodeMirror.defineMode("haskell", function() {
+CodeMirror.defineMode("haskell", function(_config, modeConfig) {
 
   function switchState(source, setState, f) {
     setState(f);
@@ -221,6 +221,10 @@ CodeMirror.defineMode("haskell", function() {
       "unwords", "unzip", "unzip3", "userError", "words", "writeFile", "zip",
       "zip3", "zipWith", "zipWith3");
 
+    var override = modeConfig.overrideKeywords;
+    if (override) for (var word in override) if (override.hasOwnProperty(word))
+      wkw[word] = override[word];
+
     return wkw;
   })();
 

From fab90b772626b054ba82a81f26b9caa35a356f93 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Sep 2013 15:10:51 +0200
Subject: [PATCH 0442/4742] [continuecomment addon] Clean up, support line
 comment blocks

---
 addon/comment/continuecomment.js | 40 ++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 9dba156189..94e5a3760f 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -1,35 +1,43 @@
 (function() {
   var modes = ["clike", "css", "javascript"];
   for (var i = 0; i < modes.length; ++i)
-    CodeMirror.extendMode(modes[i], {blockCommentStart: "/*",
-                                     blockCommentEnd: "*/",
-                                     blockCommentContinue: " * "});
+    CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
 
   function continueComment(cm) {
     var pos = cm.getCursor(), token = cm.getTokenAt(pos);
+    if (token.type != "comment") return CodeMirror.Pass;
     var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
-    var space;
 
-    if (token.type == "comment" && mode.blockCommentStart && mode.blockCommentContinue) {
+    var insert;
+    if (mode.blockCommentStart && mode.blockCommentContinue) {
       var end = token.string.indexOf(mode.blockCommentEnd);
       var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
       if (end != -1 && end == token.string.length - mode.blockCommentEnd.length) {
         // Comment ended, don't continue it
       } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
-        space = full.slice(0, token.start);
-        if (!/^\s*$/.test(space)) {
-          space = "";
-          for (var i = 0; i < token.start; ++i) space += " ";
+        insert = full.slice(0, token.start);
+        if (!/^\s*$/.test(insert)) {
+          insert = "";
+          for (var i = 0; i < token.start; ++i) insert += " ";
         }
       } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
                  found + mode.blockCommentContinue.length > token.start &&
                  /^\s*$/.test(full.slice(0, found))) {
-        space = full.slice(0, found);
+        insert = full.slice(0, found);
+      }
+      if (insert != null) insert += mode.blockCommentContinue;
+    }
+    if (insert == null && mode.lineComment) {
+      var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
+      if (found > -1) {
+        insert = line.slice(0, found);
+        if (/\S/.test(insert)) insert = null;
+        else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
       }
     }
 
-    if (space != null)
-      cm.replaceSelection("\n" + space + mode.blockCommentContinue, "end");
+    if (insert != null)
+      cm.replaceSelection("\n" + insert, "end");
     else
       return CodeMirror.Pass;
   }
@@ -37,8 +45,10 @@
   CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
     if (prev && prev != CodeMirror.Init)
       cm.removeKeyMap("continueComment");
-    var map = {name: "continueComment"};
-    map[typeof val == "string" ? val : "Enter"] = continueComment;
-    cm.addKeyMap(map);
+    if (val) {
+      var map = {name: "continueComment"};
+      map[typeof val == "string" ? val : "Enter"] = continueComment;
+      cm.addKeyMap(map);
+    }
   });
 })();

From f8282ccd7a17c2f9b81aa90452fe04c89cc256e7 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Thu, 5 Sep 2013 14:20:04 +0200
Subject: [PATCH 0443/4742] [less mode] Fix indentation of nested rules

Issue #1801
---
 mode/less/less.js | 98 +++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/mode/less/less.js b/mode/less/less.js
index 09f510e032..d637f6db98 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -1,7 +1,8 @@
 /*
   LESS mode - http://www.lesscss.org/
   Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues  GitHub: @peterkroon
+  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+  GitHub: @peterkroon
 */
 
 CodeMirror.defineMode("less", function(config) {
@@ -17,68 +18,60 @@ CodeMirror.defineMode("less", function(config) {
     else if (ch == "/" && stream.eat("*")) {
       state.tokenize = tokenCComment;
       return tokenCComment(stream, state);
-    }
-    else if (ch == "<" && stream.eat("!")) {
+    } else if (ch == "<" && stream.eat("!")) {
       state.tokenize = tokenSGMLComment;
       return tokenSGMLComment(stream, state);
-    }
-    else if (ch == "=") ret(null, "compare");
+    } else if (ch == "=") ret(null, "compare");
     else if (ch == "|" && stream.eat("=")) return ret(null, "compare");
     else if (ch == "\"" || ch == "'") {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
-    }
-    else if (ch == "/") { // e.g.: .png will not be parsed as a class
+    } else if (ch == "/") { // e.g.: .png will not be parsed as a class
       if(stream.eat("/")){
         state.tokenize = tokenSComment;
         return tokenSComment(stream, state);
-      }else{
-        if(type == "string" || type == "(")return ret("string", "string");
-        if(state.stack[state.stack.length-1] != undefined)return ret(null, ch);
+      } else {
+        if(type == "string" || type == "(") return ret("string", "string");
+        if(state.stack[state.stack.length-1] != undefined) return ret(null, ch);
         stream.eatWhile(/[\a-zA-Z0-9\-_.\s]/);
         if( /\/|\)|#/.test(stream.peek() || (stream.eatSpace() && stream.peek() == ")"))  || stream.eol() )return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
       }
-    }
-    else if (ch == "!") {
+    } else if (ch == "!") {
       stream.match(/^\s*\w*/);
       return ret("keyword", "important");
-    }
-    else if (/\d/.test(ch)) {
+    } else if (/\d/.test(ch)) {
       stream.eatWhile(/[\w.%]/);
       return ret("number", "unit");
-    }
-    else if (/[,+<>*\/]/.test(ch)) {
+    } else if (/[,+<>*\/]/.test(ch)) {
       if(stream.peek() == "=" || type == "a")return ret("string", "string");
+      if(ch === ",")return ret(null, ch);
       return ret(null, "select-op");
-    }
-    else if (/[;{}:\[\]()~\|]/.test(ch)) {
+    } else if (/[;{}:\[\]()~\|]/.test(ch)) {
       if(ch == ":"){
         stream.eatWhile(/[a-z\\\-]/);
         if( selectors.test(stream.current()) ){
           return ret("tag", "tag");
-        }else if(stream.peek() == ":"){//::-webkit-search-decoration
+        } else if(stream.peek() == ":"){//::-webkit-search-decoration
           stream.next();
           stream.eatWhile(/[a-z\\\-]/);
           if(stream.current().match(/\:\:\-(o|ms|moz|webkit)\-/))return ret("string", "string");
           if( selectors.test(stream.current().substring(1)) )return ret("tag", "tag");
           return ret(null, ch);
-        }else{
+        } else {
           return ret(null, ch);
         }
-      }else if(ch == "~"){
+      } else if(ch == "~"){
         if(type == "r")return ret("string", "string");
-      }else{
+      } else {
         return ret(null, ch);
       }
-    }
-    else if (ch == ".") {
+    } else if (ch == ".") {
       if(type == "(" || type == "string")return ret("string", "string"); // allow url(../image.png)
       stream.eatWhile(/[\a-zA-Z0-9\-_]/);
       if(stream.peek() == " ")stream.eatSpace();
       if(stream.peek() == ")")return ret("number", "unit");//rgba(0,0,0,.25);
       return ret("tag", "tag");
-    }
-    else if (ch == "#") {
+    } else if (ch == "#") {
       //we don't eat white-space, we want the hex color and or id only
       stream.eatWhile(/[A-Za-z0-9]/);
       //check if there is a proper hex color length e.g. #eee || #eeeEEE
@@ -93,43 +86,42 @@ CodeMirror.defineMode("less", function(config) {
           //#time { color: #aaa }
           else if(stream.peek() == "}" )return ret("number", "unit");
           //we have a valid hex color value, parse as id whenever an element/class is defined after the hex(id) value e.g. #eee aaa || #eee .aaa
-          else if( /[a-zA-Z\\]/.test(stream.peek()) )return ret("atom", "tag");
+            else if( /[a-zA-Z\\]/.test(stream.peek()) )return ret("atom", "tag");
           //when a hex value is on the end of a line, parse as id
-          else if(stream.eol())return ret("atom", "tag");
+              else if(stream.eol())return ret("atom", "tag");
           //default
-          else return ret("number", "unit");
-        }else{//when not a valid hexvalue in the current stream e.g. #footer
+                else return ret("number", "unit");
+        } else {//when not a valid hexvalue in the current stream e.g. #footer
           stream.eatWhile(/[\w\\\-]/);
           return ret("atom", "tag");
         }
-      }else{//when not a valid hexvalue length
+      } else {//when not a valid hexvalue length
         stream.eatWhile(/[\w\\\-]/);
         return ret("atom", "tag");
       }
-    }
-    else if (ch == "&") {
+    } else if (ch == "&") {
       stream.eatWhile(/[\w\-]/);
       return ret(null, ch);
-    }
-    else {
+    } else {
       stream.eatWhile(/[\w\\\-_%.{]/);
+      //console.log(type);
       if(type == "string"){
         return ret("string", "string");
-      }else if(stream.current().match(/(^http$|^https$)/) != null){
+      } else if(stream.current().match(/(^http$|^https$)/) != null){
         stream.eatWhile(/[\w\\\-_%.{:\/]/);
         return ret("string", "string");
-      }else if(stream.peek() == "<" || stream.peek() == ">"){
+      } else if(stream.peek() == "<" || stream.peek() == ">" || stream.peek() == "+"){
         return ret("tag", "tag");
-      }else if( /\(/.test(stream.peek()) ){
+      } else if( /\(/.test(stream.peek()) ){
         return ret(null, ch);
-      }else if (stream.peek() == "/" && state.stack[state.stack.length-1] != undefined){ // url(dir/center/image.png)
+      } else if (stream.peek() == "/" && state.stack[state.stack.length-1] != undefined){ // url(dir/center/image.png)
         return ret("string", "string");
-      }else if( stream.current().match(/\-\d|\-.\d/) ){ // match e.g.: -5px -0.4 etc... only colorize the minus sign
+      } else if( stream.current().match(/\-\d|\-.\d/) ){ // match e.g.: -5px -0.4 etc... only colorize the minus sign
         //commment out these 2 comment if you want the minus sign to be parsed as null -500px
         //stream.backUp(stream.current().length-1);
-        //return ret(null, ch); //console.log( stream.current() );
+        //return ret(null, ch);
         return ret("number", "unit");
-      }else if( /\/|[\s\)]/.test(stream.peek() || stream.eol() || (stream.eatSpace() && stream.peek() == "/")) && stream.current().indexOf(".") !== -1){
+      } else if( /\/|[\s\)]/.test(stream.peek() || stream.eol() || (stream.eatSpace() && stream.peek() == "/")) && stream.current().indexOf(".") !== -1){
         if(stream.current().substring(stream.current().length-1,stream.current().length) == "{"){
           stream.backUp(1);
           return ret("tag", "tag");
@@ -137,14 +129,15 @@ CodeMirror.defineMode("less", function(config) {
         stream.eatSpace();
         if( /[{<>.a-zA-Z\/]/.test(stream.peek())  || stream.eol() )return ret("tag", "tag"); // e.g. button.icon-plus
         return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
-      }else if( stream.eol() || stream.peek() == "[" || stream.peek() == "#" || type == "tag" ){
+      } else if( stream.eol() || stream.peek() == "[" || stream.peek() == "#" || type == "tag" ){
         if(stream.current().substring(stream.current().length-1,stream.current().length) == "{")stream.backUp(1);
         return ret("tag", "tag");
-      }else if(type == "compare" || type == "a" || type == "("){
+      } else if(type == "compare" || type == "a" || type == "("){
         return ret("string", "string");
-      }else if(type == "|" || stream.current() == "-" || type == "["){
+      } else if(type == "|" || stream.current() == "-" || type == "["){
+        if(type == "|" )return ret("tag", "tag");
         return ret(null, ch);
-      }else if(stream.peek() == ":") {
+      } else if(stream.peek() == ":") {
         stream.next();
         var t_v = stream.peek() == ":" ? true : false;
         if(!t_v){
@@ -156,11 +149,14 @@ CodeMirror.defineMode("less", function(config) {
             stream.backUp(new_pos-(old_pos-1));
             return ret("tag", "tag");
           } else stream.backUp(new_pos-(old_pos-1));
-        }else{
+        } else {
           stream.backUp(1);
         }
         if(t_v)return ret("tag", "tag"); else return ret("variable", "variable");
-      }else{
+      } else if(state.stack[state.stack.length-1]  === "font-family"){
+        return ret(null, null);
+      } else {
+        if(state.stack[state.stack.length-1] === "{" || type === "select-op"  || (state.stack[state.stack.length-1] === "rule" && type === ",") )return ret("tag", "tag");
         return ret("variable", "variable");
       }
     }
@@ -238,12 +234,16 @@ CodeMirror.defineMode("less", function(config) {
       }
       else if (type == "}") state.stack.pop();
       else if (type == "@media") state.stack.push("@media");
-      else if (context == "{" && type != "comment") state.stack.push("rule");
+      else if (stream.current() === "font-family") state.stack[state.stack.length-1] = "font-family";
+      else if (context == "{" && type != "comment" && type !== "tag") state.stack.push("rule");
+      else if (stream.peek() === ":" && stream.current().match(/@|#/) === null) style = type;
       return style;
     },
 
     indent: function(state, textAfter) {
       var n = state.stack.length;
+      console.log(n);
+
       if (/^\}/.test(textAfter))
         n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;
       return state.baseIndent + n * indentUnit;

From b3353e715e9ae03aa7810d5533bfcb613f81a5b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 6 Sep 2013 09:41:26 +0200
Subject: [PATCH 0444/4742] [less mode] Remove console.log

---
 mode/less/less.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mode/less/less.js b/mode/less/less.js
index d637f6db98..8384b3cd76 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -104,7 +104,6 @@ CodeMirror.defineMode("less", function(config) {
       return ret(null, ch);
     } else {
       stream.eatWhile(/[\w\\\-_%.{]/);
-      //console.log(type);
       if(type == "string"){
         return ret("string", "string");
       } else if(stream.current().match(/(^http$|^https$)/) != null){
@@ -242,7 +241,6 @@ CodeMirror.defineMode("less", function(config) {
 
     indent: function(state, textAfter) {
       var n = state.stack.length;
-      console.log(n);
 
       if (/^\}/.test(textAfter))
         n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;

From c55df0d8666b55e1d2c195c1d98770005aeb058d Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Thu, 5 Sep 2013 18:23:48 +0100
Subject: [PATCH 0445/4742] Better lint icons and in fewer bytes

Original error & warning icons had jagged edges due to being GIFs
This made them look quite poor/low quality on dark BG'd themes
So, new, better looking icons added which have been run thru TinyPNG for
compression
Result is fewer bytes than original and they look good on dark BG's too
---
 addon/lint/lint.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index a57694e00e..e592b3672a 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -57,15 +57,15 @@
 }
 
 .CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
-  background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAPVvcvWHiPVucvRuc+ttcfV6f91KVN5LU99PV/FZY/JhaM4oN84pONE4Rd1ATfJLWutVYPRgbdxpcsgWKMgZKs4lNfE/UvE/U+artcpdSc5uXveimslHPuBhW/eJhfV5efaCgO2CgP+/v+PExP///////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACUALAAAAAAQABAAAAZ+wJJwSCwaScgkySgkjTQZTkYzWhadnE5oE+pwqkSshwQqkzxfa4kkQXxEpA9J9EFI1KQGQQBAigYCBA14ExEWF0gXihETeA0QD3AkD5QQg0NsDnAJmwkOd5gYFSQKpXAFDBhqaxgLBwQBBAapq00YEg0UDRKqTGtKSL7Cw8JBADs=");
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
 }
 
 .CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
-  background-image: url("data:image/gif;base64,R0lGODlhEAAQANUAAP7bc//egf/ij/7ijv/jl/7kl//mnv7lnv/uwf7CTP7DTf7DT/7IW//Na/7Na//NbP7QdP/dmbltAIJNAF03AMSAJMSCLKqASa2DS6uBSquCSrGHTq6ETbCHT7WKUrKIUcCVXL+UXMOYX8GWXsSZYMiib6+ETbOIUcOXX86uhd3Muf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACsALAAAAAAQABAAAAZowJVwSCwaj0ihikRSJYcoBEL0XKlGkcjImQQhJBREKFnyICoThKeE/AAW6AXgdPyUAgrLJBEo0YsbAQyDhAEdRRwDDw8OaA4NDQImRBgFEJdglxAEGEQZKQcHBqOkKRpFF6mqq1WtrUEAOw==");
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
 }
 
 .CodeMirror-lint-marker-multiple {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAAXNSR0IArs4c6QAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJEAQvB2JVdrAAAAAdaVRYdENvbW1lbnQAAAAAAENyZWF0ZWQgd2l0aCBHSU1QZC5lBwAAAD1JREFUCNdtjkESADAEAzemf69f66HMqGlOIhYiFRFRtSQBWAY7mzx+EDTL6sSgb1jTk7Q87rxyqe37fXsAa78gLyZnRgEAAAAASUVORK5CYII=");
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
   background-repeat: no-repeat;
   background-position: right bottom;
   width: 100%; height: 100%;

From 30a9ee56fe988d54e3bdd435f7c37af68c5c4c21 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 6 Sep 2013 10:23:44 +0200
Subject: [PATCH 0446/4742] Don't mutate options.gutters in
 setGuttersForLineNumbers

Closes #1807
Closes #1808
---
 lib/codemirror.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c9a8b9d580..740389fc03 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -304,15 +304,13 @@ window.CodeMirror = (function() {
   // Make sure the gutters options contains the element
   // "CodeMirror-linenumbers" when the lineNumbers option is true.
   function setGuttersForLineNumbers(options) {
-    var found = false;
-    for (var i = 0; i < options.gutters.length; ++i) {
-      if (options.gutters[i] == "CodeMirror-linenumbers") {
-        if (options.lineNumbers) found = true;
-        else options.gutters.splice(i--, 1);
-      }
+    var found = indexOf(options.gutters, "CodeMirror-linenumbers");
+    if (found == -1 && options.lineNumbers) {
+      options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
+    } else if (found > -1 && !options.lineNumbers) {
+      options.gutters = options.gutters.slice(0);
+      options.gutters.splice(i, 1);
     }
-    if (!found && options.lineNumbers)
-      options.gutters.push("CodeMirror-linenumbers");
   }
 
   // SCROLLBARS

From c8c7fc18af5f025733a930fea202d98e54e12a5e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 6 Sep 2013 11:56:51 +0200
Subject: [PATCH 0447/4742] Prevent corrupted measurements due to
 vanishing/appearing scrollbar

Issue #1787
---
 lib/codemirror.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 740389fc03..b4b5549ee0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -355,6 +355,7 @@ window.CodeMirror = (function() {
 
     if (mac_geLion && scrollbarWidth(d.measure) === 0)
       d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px";
+    return needsV;
   }
 
   function visibleLines(display, doc, viewPort) {
@@ -410,11 +411,13 @@ window.CodeMirror = (function() {
     var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
     for (;;) {
+      var hadVScroll = cm.display.scroller.scrollHeight > cm.display.scroller.clientHeight + 1;
       if (!updateDisplayInner(cm, changes, visible, forced)) break;
-      forced = false;
       updated = true;
+      changes = [];
       updateSelection(cm);
-      updateScrollbars(cm);
+      if (updateScrollbars(cm) != hadVScroll) continue;
+      forced = false;
 
       // Clip forced viewport to actual scrollable area
       if (viewPort)
@@ -423,7 +426,6 @@ window.CodeMirror = (function() {
       visible = visibleLines(cm.display, cm.doc, viewPort);
       if (visible.from >= cm.display.showingFrom && visible.to <= cm.display.showingTo)
         break;
-      changes = [];
     }
 
     if (updated) {

From 7ea6f43856685f6d7ae71d3344cb2a1bdb1ab037 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Sep 2013 10:32:32 +0200
Subject: [PATCH 0448/4742] Amend c8c7fc18af5f to handle window resize-tiggered
 updated

Issue #1787
---
 lib/codemirror.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b4b5549ee0..8b6377dc50 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -355,7 +355,6 @@ window.CodeMirror = (function() {
 
     if (mac_geLion && scrollbarWidth(d.measure) === 0)
       d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px";
-    return needsV;
   }
 
   function visibleLines(display, doc, viewPort) {
@@ -411,12 +410,16 @@ window.CodeMirror = (function() {
     var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
     for (;;) {
-      var hadVScroll = cm.display.scroller.scrollHeight > cm.display.scroller.clientHeight + 1;
+      var oldWidth = cm.display.scroller.clientWidth;
       if (!updateDisplayInner(cm, changes, visible, forced)) break;
       updated = true;
       changes = [];
       updateSelection(cm);
-      if (updateScrollbars(cm) != hadVScroll) continue;
+      updateScrollbars(cm);
+      if (cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
+        forced = true;
+        continue;
+      }
       forced = false;
 
       // Clip forced viewport to actual scrollable area

From 007434607dbd4faf5c7d4c99a836e989fe8b20f5 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Mon, 9 Sep 2013 10:38:16 +0200
Subject: [PATCH 0449/4742] [dtd mode] Add

---
 doc/compress.html   |   1 +
 mode/dtd/dtd.js     | 127 ++++++++++++++++++++++++++++++++++++++++++++
 mode/dtd/index.html |  89 +++++++++++++++++++++++++++++++
 mode/index.html     |   1 +
 4 files changed, 218 insertions(+)
 create mode 100644 mode/dtd/dtd.js
 create mode 100644 mode/dtd/index.html

diff --git a/doc/compress.html b/doc/compress.html
index 5ee78bb4c5..d49c193263 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -86,6 +86,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/css/css.js">css.js</option>
           <option value="http://codemirror.net/mode/d/d.js">d.js</option>
           <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
+          <option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
           <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
           <option value="http://codemirror.net/mode/gfm/gfm.js">gfm.js</option>
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
new file mode 100644
index 0000000000..7033bf0f8b
--- /dev/null
+++ b/mode/dtd/dtd.js
@@ -0,0 +1,127 @@
+/*
+  DTD mode
+  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
+  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+  GitHub: @peterkroon
+*/
+
+CodeMirror.defineMode("dtd", function(config) {
+  var indentUnit = config.indentUnit, type;
+  function ret(style, tp) {type = tp; return style;}
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+
+    if (ch == "<" && stream.eat("!") ) {
+      if (stream.eatWhile(/[\-]/)) {
+        state.tokenize = tokenSGMLComment;
+        return tokenSGMLComment(stream, state);
+      } else if (stream.eatWhile(/[\w]/)) return ret("keyword", "doindent");
+    } else if (ch == "<" && stream.eat("?")) { //xml declaration
+      state.tokenize = inBlock("meta", "?>");
+      return ret("meta", ch);
+    } else if (ch == "#" && stream.eatWhile(/[\w]/)) return ret("atom", "tag");
+    else if (ch == "|") return ret("keyword", "seperator");
+    else if (ch.match(/[\(\)\[\]\-\.,\+\?>]/)) return ret(null, ch);//if(ch === ">") return ret(null, "endtag"); else
+    else if (ch.match(/[\[\]]/)) return ret("rule", ch);
+    else if (ch == "\"" || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    } else if (stream.eatWhile(/[a-zA-Z\?\+\d]/)) {
+      var sc = stream.current();
+      if( sc.substr(sc.length-1,sc.length).match(/\?|\+/) !== null )stream.backUp(1);
+      return ret("tag", "tag");
+    } else if (ch == "%" || ch == "*" ) return ret("number", "number");
+    else {
+      stream.eatWhile(/[\w\\\-_%.{,]/);
+      return ret(null, null);
+    }
+  }
+
+  function tokenSGMLComment(stream, state) {
+    var dashes = 0, ch;
+    while ((ch = stream.next()) != null) {
+      if (dashes >= 2 && ch == ">") {
+        state.tokenize = tokenBase;
+        break;
+      }
+      dashes = (ch == "-") ? dashes + 1 : 0;
+    }
+    return ret("comment", "comment");
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped) {
+          state.tokenize = tokenBase;
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      return ret("string", "tag");
+    };
+  }
+
+  function inBlock(style, terminator) {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.match(terminator)) {
+          state.tokenize = tokenBase;
+          break;
+        }
+        stream.next();
+      }
+      return style;
+    };
+  }
+
+  return {
+    startState: function(base) {
+      return {tokenize: tokenBase,
+              baseIndent: base || 0,
+              stack: []};
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+
+      var context = state.stack[state.stack.length-1];
+      if (stream.current() == "[" || type === "doindent" || type == "[") state.stack.push("rule");
+      else if (type === "endtag") state.stack[state.stack.length-1] = "endtag";
+      else if (stream.current() == "]" || type == "]" || (type == ">" && context == "rule")) state.stack.pop();
+      else if (type == "[") state.stack.push("[");
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var n = state.stack.length;
+
+      if( textAfter.match(/\]\s+|\]/) )n=n-1;
+      else if(textAfter.substr(textAfter.length-1, textAfter.length) === ">"){
+        if(textAfter.substr(0,1) === "<")n;
+        else if( type == "doindent" && textAfter.length > 1 )n;
+        else if( type == "doindent")n--;
+        else if( type == ">" && textAfter.length > 1)n;
+        else if( type == "tag" && textAfter !== ">")n;
+        else if( type == "tag" && state.stack[state.stack.length-1] == "rule")n--;
+        else if( type == "tag")n++;
+        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule" && type === ">")n--;
+        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule")n;
+        else if( textAfter.substr(0,1) !== "<" && textAfter.substr(0,1) === ">" )n=n-1;
+        else if( textAfter === ">")n;
+        else n=n-1;
+        //over rule them all
+        if(type == null || type == "]")n--;
+      }
+
+      return state.baseIndent + n * indentUnit;
+    },
+
+    electricChars: "]>"
+  };
+});
+
+CodeMirror.defineMIME("application/xml-dtd", "dtd");
diff --git a/mode/dtd/index.html b/mode/dtd/index.html
new file mode 100644
index 0000000000..076d827f7f
--- /dev/null
+++ b/mode/dtd/index.html
@@ -0,0 +1,89 @@
+<!doctype html>
+
+<title>CodeMirror: DTD 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="dtd.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">DTD</a>
+  </ul>
+</div>
+
+<article>
+<h2>DTD mode</h2>
+<form><textarea id="code" name="code"><?xml version="1.0" encoding="UTF-8"?>
+
+<!ATTLIST title
+  xmlns	CDATA	#FIXED	"http://docbook.org/ns/docbook"
+  role	CDATA	#IMPLIED
+  %db.common.attributes;
+  %db.common.linking.attributes;
+>
+
+<!--
+  Try: http://docbook.org/xml/5.0/dtd/docbook.dtd
+-->
+
+<!DOCTYPE xsl:stylesheet
+  [
+    <!ENTITY nbsp   "&amp;#160;">
+    <!ENTITY copy   "&amp;#169;">
+    <!ENTITY reg    "&amp;#174;">
+    <!ENTITY trade  "&amp;#8482;">
+    <!ENTITY mdash  "&amp;#8212;">
+    <!ENTITY ldquo  "&amp;#8220;">
+    <!ENTITY rdquo  "&amp;#8221;">
+    <!ENTITY pound  "&amp;#163;">
+    <!ENTITY yen    "&amp;#165;">
+    <!ENTITY euro   "&amp;#8364;">
+    <!ENTITY mathml "http://www.w3.org/1998/Math/MathML">
+  ]
+>
+
+<!ELEMENT title (#PCDATA|inlinemediaobject|remark|superscript|subscript|xref|link|olink|anchor|biblioref|alt|annotation|indexterm|abbrev|acronym|date|emphasis|footnote|footnoteref|foreignphrase|phrase|quote|wordasword|firstterm|glossterm|coref|trademark|productnumber|productname|database|application|hardware|citation|citerefentry|citetitle|citebiblioid|author|person|personname|org|orgname|editor|jobtitle|replaceable|package|parameter|termdef|nonterminal|systemitem|option|optional|property|inlineequation|tag|markup|token|symbol|literal|code|constant|email|uri|guiicon|guibutton|guimenuitem|guimenu|guisubmenu|guilabel|menuchoice|mousebutton|keycombo|keycap|keycode|keysym|shortcut|accel|prompt|envar|filename|command|computeroutput|userinput|function|varname|returnvalue|type|classname|exceptionname|interfacename|methodname|modifier|initializer|ooclass|ooexception|oointerface|errorcode|errortext|errorname|errortype)*>
+
+<!ENTITY % db.common.attributes "
+  xml:id	ID	#IMPLIED
+  version	CDATA	#IMPLIED
+  xml:lang	CDATA	#IMPLIED
+  xml:base	CDATA	#IMPLIED
+  remap	CDATA	#IMPLIED
+  xreflabel	CDATA	#IMPLIED
+  revisionflag	(changed|added|deleted|off)	#IMPLIED
+  dir	(ltr|rtl|lro|rlo)	#IMPLIED
+  arch	CDATA	#IMPLIED
+  audience	CDATA	#IMPLIED
+  condition	CDATA	#IMPLIED
+  conformance	CDATA	#IMPLIED
+  os	CDATA	#IMPLIED
+  revision	CDATA	#IMPLIED
+  security	CDATA	#IMPLIED
+  userlevel	CDATA	#IMPLIED
+  vendor	CDATA	#IMPLIED
+  wordsize	CDATA	#IMPLIED
+  annotations	CDATA	#IMPLIED
+
+"></textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "dtd", alignCDATA: true},
+        lineNumbers: true,
+        lineWrapping: true
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>application/xml-dtd</code>.</p>
+  </article>
diff --git a/mode/index.html b/mode/index.html
index 5601a2c458..2b54d60689 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -41,6 +41,7 @@ <h2>Language modes</h2>
       <li><a href="python/index.html">Cython</a></li>
       <li><a href="d/index.html">D</a></li>
       <li><a href="diff/index.html">diff</a></li>
+      <li><a href="dtd/index.html">DTD</a></li>
       <li><a href="ecl/index.html">ECL</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
       <li><a href="gas/index.html">Gas</a> (AT&amp;T-style assembly)</li>

From 1564808cf8d9c3fc0a66c4e95a53962312f6e12c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Sep 2013 10:46:14 +0200
Subject: [PATCH 0450/4742] Fix drag/drop on Chrome by setting an image src

Work around a Chrome regression where it aborts the drag if the
setDragImage image is src-less.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8b6377dc50..ce83709954 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1912,6 +1912,7 @@ window.CodeMirror = (function() {
     // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
     if (e.dataTransfer.setDragImage && !safari) {
       var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
+      img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
       if (opera) {
         img.width = img.height = 1;
         cm.display.wrapper.appendChild(img);

From 687026e00a0809dd8a836095c3d760ddc4cc1a08 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Sep 2013 11:16:55 +0200
Subject: [PATCH 0451/4742] [tern addon] Compensate for fact that call start
 pos is a column, not char offset

Closes #1811
---
 addon/tern/tern.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 4348c8d8e8..8d35f0630b 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -239,9 +239,18 @@
     var lex = inner.state.lexical;
     if (lex.info != "call") return;
 
-    var ch = lex.column, pos = lex.pos || 0;
-    for (var line = cm.getCursor().line, e = Math.max(0, line - 9), found = false; line >= e; --line)
-      if (cm.getLine(line).charAt(ch) == "(") {found = true; break;}
+    var ch, pos = lex.pos || 0, tabSize = cm.getOption("tabSize");
+    for (var line = cm.getCursor().line, e = Math.max(0, line - 9), found = false; line >= e; --line) {
+      var str = cm.getLine(line), extra = 0;
+      for (var pos = 0;;) {
+        var tab = str.indexOf("\t", pos);
+        if (tab == -1) break;
+        extra += tabSize - (tab + extra) % tabSize - 1;
+        pos = tab + 1;
+      }
+      ch = lex.column - extra;
+      if (str.charAt(ch) == "(") {found = true; break;}
+    }
     if (!found) return;
 
     var start = Pos(line, ch);

From e0b0e32ed97bdd9b4dcb559f0d383bbb197961e4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Sep 2013 12:32:03 +0200
Subject: [PATCH 0452/4742] Allow styling of lines from mode tokenizers
 (experimental)

---
 lib/codemirror.js | 37 +++++++++++++++++++++++++------------
 test/test.js      | 19 +++++++++++++++++++
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ce83709954..a14ce5358f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -666,10 +666,11 @@ window.CodeMirror = (function() {
   }
 
   function buildLineElement(cm, line, lineNo, dims, reuse) {
-    var lineElement = lineContent(cm, line);
+    var built = buildLineContent(cm, line), lineElement = built.pre;
     var markers = line.gutterMarkers, display = cm.display, wrap;
 
-    if (!cm.options.lineNumbers && !markers && !line.bgClass && !line.wrapClass && !line.widgets)
+    var bgClass = built.bgClass ? built.bgClass + " " + (line.bgClass || "") : line.bgClass;
+    if (!cm.options.lineNumbers && !markers && !bgClass && !line.wrapClass && !line.widgets)
       return lineElement;
 
     // Lines with gutter elements, widgets or a background class need
@@ -707,8 +708,8 @@ window.CodeMirror = (function() {
       wrap.appendChild(lineElement);
     }
     // Kludge to make sure the styled element lies behind the selection (by z-index)
-    if (line.bgClass)
-      wrap.insertBefore(elt("div", null, line.bgClass + " CodeMirror-linebackground"), wrap.firstChild);
+    if (bgClass)
+      wrap.insertBefore(elt("div", null, bgClass + " CodeMirror-linebackground"), wrap.firstChild);
     if (cm.options.lineNumbers || markers) {
       var gutterWrap = wrap.insertBefore(elt("div", null, null, "position: absolute; left: " +
                                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
@@ -1031,7 +1032,7 @@ window.CodeMirror = (function() {
       return crudelyMeasureLine(cm, line);
 
     var display = cm.display, measure = emptyArray(line.text.length);
-    var pre = lineContent(cm, line, measure, true);
+    var pre = buildLineContent(cm, line, measure, true).pre;
 
     // IE does not cache element positions of inline elements between
     // calls to getBoundingClientRect. This makes the loop below,
@@ -1135,7 +1136,7 @@ window.CodeMirror = (function() {
     if (cached || line.text.length >= cm.options.crudeMeasuringFrom)
       return measureChar(cm, line, line.text.length, cached && cached.measure, "right").right;
 
-    var pre = lineContent(cm, line, null, true);
+    var pre = buildLineContent(cm, line, null, true).pre;
     var end = pre.appendChild(zeroWidthElement(cm.display.measure));
     removeChildrenAndAdd(cm.display.measure, pre);
     return getRect(end).right - getRect(cm.display.lineDiv).left;
@@ -4314,13 +4315,23 @@ window.CodeMirror = (function() {
   }
 
   var styleToClassCache = {};
-  function styleToClass(style) {
+  function interpretTokenStyle(style, builder) {
     if (!style) return null;
+    for (;;) {
+      var lineClass = style.match(/(?:^|\s)line-(background-)?(\S+)/);
+      if (!lineClass) break;
+      style = style.slice(0, lineClass.index) + style.slice(lineClass.index + lineClass[0].length);
+      var prop = lineClass[1] ? "bgClass" : "textClass";
+      if (builder[prop] == null)
+        builder[prop] = lineClass[2];
+      else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(builder[prop]))
+        builder[prop] += " " + lineClass[2];
+    }
     return styleToClassCache[style] ||
       (styleToClassCache[style] = "cm-" + style.replace(/ +/g, " cm-"));
   }
 
-  function lineContent(cm, realLine, measure, copyWidgets) {
+  function buildLineContent(cm, realLine, measure, copyWidgets) {
     var merged, line = realLine, empty = true;
     while (merged = collapsedSpanAtStart(line))
       line = getLine(cm.doc, merged.find().from.line);
@@ -4328,7 +4339,6 @@ window.CodeMirror = (function() {
     var builder = {pre: elt("pre"), col: 0, pos: 0,
                    measure: null, measuredSomething: false, cm: cm,
                    copyWidgets: copyWidgets};
-    if (line.textClass) builder.pre.className = line.textClass;
 
     do {
       if (line.text) empty = false;
@@ -4365,8 +4375,11 @@ window.CodeMirror = (function() {
       }
     }
 
+    var textClass = builder.textClass ? builder.textClass + " " + (realLine.textClass || "") : realLine.textClass;
+    if (textClass) builder.pre.className = textClass;
+
     signal(cm, "renderLine", cm, realLine, builder.pre);
-    return builder.pre;
+    return builder;
   }
 
   var tokenSpecialChars = /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\uFEFF]/g;
@@ -4477,7 +4490,7 @@ window.CodeMirror = (function() {
     var spans = line.markedSpans, allText = line.text, at = 0;
     if (!spans) {
       for (var i = 1; i < styles.length; i+=2)
-        builder.addToken(builder, allText.slice(at, at = styles[i]), styleToClass(styles[i+1]));
+        builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder));
       return;
     }
 
@@ -4527,7 +4540,7 @@ window.CodeMirror = (function() {
           spanStartStyle = "";
         }
         text = allText.slice(at, at = styles[i++]);
-        style = styleToClass(styles[i++]);
+        style = interpretTokenStyle(styles[i++], builder);
       }
     }
   }
diff --git a/test/test.js b/test/test.js
index 21e09cb12e..a05b8afb42 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1539,3 +1539,22 @@ testCM("change_removedText", function(cm) {
   eq(removedText[0].join("\n"), "abc\nd");
   eq(removedText[1].join("\n"), "");
 });
+
+testCM("lineStyleFromMode", function(cm) {
+  CodeMirror.defineMode("test_mode", function() {
+    return {token: function(stream) {
+      if (stream.match(/^\[[^\]]*\]/)) return "line-brackets";
+      if (stream.match(/^\([^\]]*\)/)) return "line-background-parens";
+      stream.match(/^\s+|^\S+/);
+    }};
+  });
+  cm.setOption("mode", "test_mode");
+  var bracketElts = byClassName(cm.getWrapperElement(), "brackets");
+  eq(bracketElts.length, 1);
+  eq(bracketElts[0].nodeName, "PRE");
+  is(!/brackets.*brackets/.test(bracketElts[0].className));
+  var parenElts = byClassName(cm.getWrapperElement(), "parens");
+  eq(parenElts.length, 1);
+  eq(parenElts[0].nodeName, "DIV");
+  is(!/parens.*parens/.test(parenElts[0].className));
+}, {value: "line1: [br] [br]\nline2: (par) (par)\nline3: nothing"});

From 45d3cda933484698bfc0a8074cca717ffd2bc8eb Mon Sep 17 00:00:00 2001
From: stoskov <s.toskov@abv.bg>
Date: Mon, 9 Sep 2013 17:52:00 +0300
Subject: [PATCH 0453/4742] Add a hook to server response

---
 addon/tern/tern.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 8d35f0630b..5084539993 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -24,6 +24,9 @@
 //   no tip should be shown. By default the docstring is shown.
 // * typeTip: Like completionTip, but for the tooltips shown for type
 //   queries.
+// * responseFilter: A function(doc, query, request, error, data) that
+//   will be applied to the Tern responses before treating them
+//
 //
 // It is possible to run the Tern server in a web worker by specifying
 // these additional options:
@@ -102,8 +105,16 @@
 
     rename: function(cm) { rename(this, cm); },
 
-    request: function(cm, query, c) {
-      this.server.request(buildRequest(this, findDoc(this, cm.getDoc()), query), c);
+    request: function (cm, query, c) {
+      var self = this;
+      var doc = findDoc(this, cm.getDoc());
+      var request = buildRequest(this, doc, query);
+
+      this.server.request(request, function (error, data) {
+        if (!error && self.options.responseFilter)
+          data = self.options.responseFilter(doc, query, request, error, data);
+        c(error, data);
+      });
     }
   };
 

From 1b3f9d090503ddb6727356224c42db3a2664e088 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Tue, 10 Sep 2013 18:58:06 +0200
Subject: [PATCH 0454/4742] [lint demo] Remove duplicate script tag

---
 demo/lint.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/lint.html b/demo/lint.html
index 05236150ef..8372c52c47 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -13,7 +13,6 @@
 <script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
 <script src="https://rawgithub.amrom.workers.dev/stubbornella/csslint/master/release/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
-<script src="../addon/lint/lint.js"></script>
 <script src="../addon/lint/javascript-lint.js"></script>
 <script src="../addon/lint/json-lint.js"></script>
 <script src="../addon/lint/css-lint.js"></script>

From 6dc51c9ab3d0ba68ad794ed4971a7efc46aebc3d Mon Sep 17 00:00:00 2001
From: Brett Zamir <brettz9@yahoo.com>
Date: Wed, 11 Sep 2013 13:50:04 +0800
Subject: [PATCH 0455/4742] [lint demo] missing semicolon

---
 demo/complete.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/complete.html b/demo/complete.html
index 56999b9cc9..e256a908b4 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -71,7 +71,7 @@ <h2>Autocomplete Demo</h2>
     <script>
       CodeMirror.commands.autocomplete = function(cm) {
         CodeMirror.showHint(cm, CodeMirror.hint.javascript);
-      }
+      };
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         extraKeys: {"Ctrl-Space": "autocomplete"}

From 11ccd9c4988fa571cd877c476546655c15deadf8 Mon Sep 17 00:00:00 2001
From: Brett Zamir <brettz9@yahoo.com>
Date: Wed, 11 Sep 2013 13:46:12 +0800
Subject: [PATCH 0456/4742] [show-hint addon] Allow arrows to cause wrap-around

---
 addon/hint/show-hint.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 884e0a3854..dbf415527a 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -111,10 +111,10 @@
     var baseMap = {
       Up: function() {handle.moveFocus(-1);},
       Down: function() {handle.moveFocus(1);},
-      PageUp: function() {handle.moveFocus(-handle.menuSize());},
-      PageDown: function() {handle.moveFocus(handle.menuSize());},
+      PageUp: function() {handle.moveFocus(-handle.menuSize() + 1, true);},
+      PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);},
       Home: function() {handle.setFocus(0);},
-      End: function() {handle.setFocus(handle.length);},
+      End: function() {handle.setFocus(handle.length - 1);},
       Enter: handle.pick,
       Tab: handle.pick,
       Esc: handle.close
@@ -190,7 +190,7 @@
     }
 
     cm.addKeyMap(this.keyMap = buildKeyMap(options, {
-      moveFocus: function(n) { widget.changeActive(widget.selectedHint + n); },
+      moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
       setFocus: function(n) { widget.changeActive(n); },
       menuSize: function() { return widget.screenAmount(); },
       length: completions.length,
@@ -250,8 +250,11 @@
       this.completion.pick(this.data, this.selectedHint);
     },
 
-    changeActive: function(i) {
-      i = Math.max(0, Math.min(i, this.data.list.length - 1));
+    changeActive: function(i, avoidWrap) {
+      if (i >= this.data.list.length)
+        i = avoidWrap ? this.data.list.length - 1 : 0;
+      else if (i < 0)
+        i = avoidWrap ? 0  : this.data.list.length - 1;
       if (this.selectedHint == i) return;
       var node = this.hints.childNodes[this.selectedHint];
       node.className = node.className.replace(" CodeMirror-hint-active", "");

From 39016dee813ff3232cd5eddebcab4253e92d5acd Mon Sep 17 00:00:00 2001
From: Brett Zamir <brettz9@yahoo.com>
Date: Wed, 11 Sep 2013 11:19:59 +0800
Subject: [PATCH 0457/4742] [lint addon] Pass lint options on when not in async
 mode

---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 67a92970a3..b502ee41f1 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -112,7 +112,7 @@
     if (options.async)
       options.getAnnotations(cm, updateLinting, options);
     else
-      updateLinting(cm, options.getAnnotations(cm.getValue()));
+      updateLinting(cm, options.getAnnotations(cm.getValue(), options));
   }
 
   function updateLinting(cm, annotationsNotSorted) {

From 9bc5f545b499c2bfc9f29138de8d92a7fd3d8f65 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Sep 2013 12:38:36 +0200
Subject: [PATCH 0458/4742] [project page] Fix broken link

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

diff --git a/index.html b/index.html
index 28641a1ba1..3cb82b48c4 100644
--- a/index.html
+++ b/index.html
@@ -129,7 +129,7 @@ <h2>Features</h2>
     <li><a href="demo/variableheight.html">Mixing font sizes and styles</a>
     <li><a href="demo/theme.html">Various themes</a>
     <li>Able to <a href="demo/resize.html">resize to fit content</a>
-    <li><a href="doc/manual.html#mark_replacedWith">Inline</a> and <a href="doc/manual.html#setLineWidget">block</a> widgets
+    <li><a href="doc/manual.html#mark_replacedWith">Inline</a> and <a href="doc/manual.html#addLineWidget">block</a> widgets
     <li>Programmable <a href="demo/marker.html">gutters</a>
     <li>Making ranges of text <a href="doc/manual.html#markText">styled, read-only, or atomic</a>
     <li><a href="demo/bidi.html">Bi-directional text</a> support

From ac3391d3bdc1616ec53cc51fc532b5572fd775bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Sep 2013 12:39:59 +0200
Subject: [PATCH 0459/4742] [marker demo] Remove duplicate code

---
 demo/marker.html | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/demo/marker.html b/demo/marker.html
index 5cbd16257e..ac4dfda893 100644
--- a/demo/marker.html
+++ b/demo/marker.html
@@ -34,35 +34,19 @@ <h2>Breakpoint Demo</h2>
 });
 editor.on("gutterClick", function(cm, n) {
   var info = cm.lineInfo(n);
-  cm.setGutterMarker(n, "breakpoints", info.markers ? null : makeMarker());
+  cm.setGutterMarker(n, "breakpoints", info.gutterMarkers ? null : makeMarker());
 });
 
 function makeMarker() {
   var marker = document.createElement("div");
+  marker.style.color = "#822";
   marker.innerHTML = "●";
-  marker.className = "breakpoint";
   return marker;
 }
 </textarea></form>
 
 <p>Click the line-number gutter to add or remove 'breakpoints'.</p>
 
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true,
-  gutters: ["CodeMirror-linenumbers", "breakpoints"]
-});
-editor.on("gutterClick", function(cm, n) {
-  var info = cm.lineInfo(n);
-  cm.setGutterMarker(n, "breakpoints", info.gutterMarkers ? null : makeMarker());
-});
-
-function makeMarker() {
-  var marker = document.createElement("div");
-  marker.style.color = "#822";
-  marker.innerHTML = "●";
-  return marker;
-}
-    </script>
+    <script>eval(document.getElementById("code").value);</script>
 
   </article>

From 7579444498ba0db844f4921ee59a5dbaed9f93d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?= <mgaitan@machinalis.com>
Date: Tue, 10 Sep 2013 16:20:42 -0300
Subject: [PATCH 0460/4742] [fortran mode] Add

---
 doc/compress.html       |   1 +
 mode/fortran/fortran.js | 173 ++++++++++++++++++++++++++++++++++++++++
 mode/fortran/index.html |  81 +++++++++++++++++++
 mode/index.html         |   1 +
 4 files changed, 256 insertions(+)
 create mode 100644 mode/fortran/fortran.js
 create mode 100644 mode/fortran/index.html

diff --git a/doc/compress.html b/doc/compress.html
index d49c193263..8548991f90 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -89,6 +89,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
           <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
+          <option value="http://codemirror.net/mode/fortran/fortran.js">fortran.js</option>
           <option value="http://codemirror.net/mode/gfm/gfm.js">gfm.js</option>
           <option value="http://codemirror.net/mode/gas/gas.js">gas.js</option>
           <option value="http://codemirror.net/mode/go/go.js">go.js</option>
diff --git a/mode/fortran/fortran.js b/mode/fortran/fortran.js
new file mode 100644
index 0000000000..83fd8fde85
--- /dev/null
+++ b/mode/fortran/fortran.js
@@ -0,0 +1,173 @@
+CodeMirror.defineMode("fortran", function() {
+  function words(array) {
+    var keys = {};
+    for (var i = 0; i < array.length; ++i) {
+      keys[array[i]] = true;
+    }
+    return keys;
+  }
+
+  var keywords = words([
+                  "abstract", "accept", "allocatable", "allocate",
+                  "array", "assign", "asynchronous", "backspace",
+                  "bind", "block", "byte", "call", "case",
+                  "class", "close", "common", "contains",
+                  "continue", "cycle", "data", "deallocate",
+                  "decode", "deferred", "dimension", "do",
+                  "elemental", "else", "encode", "end",
+                  "endif", "entry", "enumerator", "equivalence",
+                  "exit", "external", "extrinsic", "final",
+                  "forall", "format", "function", "generic",
+                  "go", "goto", "if", "implicit", "import", "include",
+                  "inquire", "intent", "interface", "intrinsic",
+                  "module", "namelist", "non_intrinsic",
+                  "non_overridable", "none", "nopass",
+                  "nullify", "open", "optional", "options",
+                  "parameter", "pass", "pause", "pointer",
+                  "print", "private", "program", "protected",
+                  "public", "pure", "read", "recursive", "result",
+                  "return", "rewind", "save", "select", "sequence",
+                  "stop", "subroutine", "target", "then", "to", "type",
+                  "use", "value", "volatile", "where", "while",
+                  "write"]);
+  var builtins = words(["abort", "abs", "access", "achar", "acos",
+                          "adjustl", "adjustr", "aimag", "aint", "alarm",
+                          "all", "allocated", "alog", "amax", "amin",
+                          "amod", "and", "anint", "any", "asin",
+                          "associated", "atan", "besj", "besjn", "besy",
+                          "besyn", "bit_size", "btest", "cabs", "ccos",
+                          "ceiling", "cexp", "char", "chdir", "chmod",
+                          "clog", "cmplx", "command_argument_count",
+                          "complex", "conjg", "cos", "cosh", "count",
+                          "cpu_time", "cshift", "csin", "csqrt", "ctime",
+                          "c_funloc", "c_loc", "c_associated", "c_null_ptr",
+                          "c_null_funptr", "c_f_pointer", "c_null_char",
+                          "c_alert", "c_backspace", "c_form_feed",
+                          "c_new_line", "c_carriage_return",
+                          "c_horizontal_tab", "c_vertical_tab", "dabs",
+                          "dacos", "dasin", "datan", "date_and_time",
+                          "dbesj", "dbesj", "dbesjn", "dbesy", "dbesy",
+                          "dbesyn", "dble", "dcos", "dcosh", "ddim", "derf",
+                          "derfc", "dexp", "digits", "dim", "dint", "dlog",
+                          "dlog", "dmax", "dmin", "dmod", "dnint",
+                          "dot_product", "dprod", "dsign", "dsinh",
+                          "dsin", "dsqrt", "dtanh", "dtan", "dtime",
+                          "eoshift", "epsilon", "erf", "erfc", "etime",
+                          "exit", "exp", "exponent", "extends_type_of",
+                          "fdate", "fget", "fgetc", "float", "floor",
+                          "flush", "fnum", "fputc", "fput", "fraction",
+                          "fseek", "fstat", "ftell", "gerror", "getarg",
+                          "get_command", "get_command_argument",
+                          "get_environment_variable", "getcwd",
+                          "getenv", "getgid", "getlog", "getpid",
+                          "getuid", "gmtime", "hostnm", "huge", "iabs",
+                          "iachar", "iand", "iargc", "ibclr", "ibits",
+                          "ibset", "ichar", "idate", "idim", "idint",
+                          "idnint", "ieor", "ierrno", "ifix", "imag",
+                          "imagpart", "index", "int", "ior", "irand",
+                          "isatty", "ishft", "ishftc", "isign",
+                          "iso_c_binding", "is_iostat_end", "is_iostat_eor",
+                          "itime", "kill", "kind", "lbound", "len", "len_trim",
+                          "lge", "lgt", "link", "lle", "llt", "lnblnk", "loc",
+                          "log", "logical", "long", "lshift", "lstat", "ltime",
+                          "matmul", "max", "maxexponent", "maxloc", "maxval",
+                          "mclock", "merge", "move_alloc", "min", "minexponent",
+                          "minloc", "minval", "mod", "modulo", "mvbits",
+                          "nearest", "new_line", "nint", "not", "or", "pack",
+                          "perror", "precision", "present", "product", "radix",
+                          "rand", "random_number", "random_seed", "range",
+                          "real", "realpart", "rename", "repeat", "reshape",
+                          "rrspacing", "rshift", "same_type_as", "scale",
+                          "scan", "second", "selected_int_kind",
+                          "selected_real_kind", "set_exponent", "shape",
+                          "short", "sign", "signal", "sinh", "sin", "sleep",
+                          "sngl", "spacing", "spread", "sqrt", "srand", "stat",
+                          "sum", "symlnk", "system", "system_clock", "tan",
+                          "tanh", "time", "tiny", "transfer", "transpose",
+                          "trim", "ttynam", "ubound", "umask", "unlink",
+                          "unpack", "verify", "xor", "zabs", "zcos", "zexp",
+                          "zlog", "zsin", "zsqrt"]);
+
+    var dataTypes =  words(["c_bool", "c_char", "c_double", "c_double_complex",
+                     "c_float", "c_float_complex", "c_funptr", "c_int",
+                     "c_int16_t", "c_int32_t", "c_int64_t", "c_int8_t",
+                     "c_int_fast16_t", "c_int_fast32_t", "c_int_fast64_t",
+                     "c_int_fast8_t", "c_int_least16_t", "c_int_least32_t",
+                     "c_int_least64_t", "c_int_least8_t", "c_intmax_t",
+                     "c_intptr_t", "c_long", "c_long_double",
+                     "c_long_double_complex", "c_long_long", "c_ptr",
+                     "c_short", "c_signed_char", "c_size_t", "character",
+                     "complex", "double", "integer", "logical", "real"]);
+  var isOperatorChar = /[+\-*&=<>\/\:]/;
+  var litOperator = new RegExp("(\.and\.|\.or\.|\.eq\.|\.lt\.|\.le\.|\.gt\.|\.ge\.|\.ne\.|\.not\.|\.eqv\.|\.neqv\.)", "i");
+
+  function tokenBase(stream, state) {
+
+    if (stream.match(litOperator)){
+        return 'operator';
+    }
+
+    var ch = stream.next();
+    if (ch == "!") {
+      stream.skipToEnd();
+      return "comment";
+    }
+    if (ch == '"' || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    if (/[\[\]\(\),]/.test(ch)) {
+      return null;
+    }
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/[\w\.]/);
+      return "number";
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_]/);
+    var word = stream.current().toLowerCase();
+
+    if (keywords.hasOwnProperty(word)){
+            return 'keyword';
+    }
+    if (builtins.hasOwnProperty(word) || dataTypes.hasOwnProperty(word)) {
+            return 'builtin';
+    }
+    return "variable";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {
+            end = true;
+            break;
+        }
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !escaped) state.tokenize = null;
+      return "string";
+    };
+  }
+
+  // Interface
+
+  return {
+    startState: function() {
+      return {tokenize: null};
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment" || style == "meta") return style;
+      return style;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-fortran", "fortran");
diff --git a/mode/fortran/index.html b/mode/fortran/index.html
new file mode 100644
index 0000000000..efa55ec89a
--- /dev/null
+++ b/mode/fortran/index.html
@@ -0,0 +1,81 @@
+<!doctype html>
+
+<title>CodeMirror: Fortran 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="fortran.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Fortran</a>
+  </ul>
+</div>
+
+<article>
+<h2>Fortran mode</h2>
+
+
+<div><textarea id="code" name="code">
+! Example Fortran code
+  program average
+
+  ! Read in some numbers and take the average
+  ! As written, if there are no data points, an average of zero is returned
+  ! While this may not be desired behavior, it keeps this example simple
+
+  implicit none
+
+  real, dimension(:), allocatable :: points
+  integer                         :: number_of_points
+  real                            :: average_points=0., positive_average=0., negative_average=0.
+
+  write (*,*) "Input number of points to average:"
+  read  (*,*) number_of_points
+
+  allocate (points(number_of_points))
+
+  write (*,*) "Enter the points to average:"
+  read  (*,*) points
+
+  ! Take the average by summing points and dividing by number_of_points
+  if (number_of_points > 0) average_points = sum(points) / number_of_points
+
+  ! Now form average over positive and negative points only
+  if (count(points > 0.) > 0) then
+     positive_average = sum(points, points > 0.) / count(points > 0.)
+  end if
+
+  if (count(points < 0.) > 0) then
+     negative_average = sum(points, points < 0.) / count(points < 0.)
+  end if
+
+  deallocate (points)
+
+  ! Print result to terminal
+  write (*,'(a,g12.4)') 'Average = ', average_points
+  write (*,'(a,g12.4)') 'Average of positive points = ', positive_average
+  write (*,'(a,g12.4)') 'Average of negative points = ', negative_average
+
+  end program average
+</textarea></div>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "text/x-fortran"
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-Fortran</code>.</p>
+  </article>
diff --git a/mode/index.html b/mode/index.html
index 2b54d60689..f2bba985c2 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -44,6 +44,7 @@ <h2>Language modes</h2>
       <li><a href="dtd/index.html">DTD</a></li>
       <li><a href="ecl/index.html">ECL</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
+      <li><a href="fortran/index.html">Fortran</a></li>
       <li><a href="gas/index.html">Gas</a> (AT&amp;T-style assembly)</li>
       <li><a href="go/index.html">Go</a></li>
       <li><a href="groovy/index.html">Groovy</a></li>

From afd9b56612b6326706631e363874c731da9debd7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Sep 2013 14:56:23 +0200
Subject: [PATCH 0461/4742] Fix false positive in IE9/10 selection reset
 workaround hack

Closes #1820
---
 lib/codemirror.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a14ce5358f..10545b9573 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1605,7 +1605,10 @@ window.CodeMirror = (function() {
       if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
       if (e.keyCode == 16) cm.doc.sel.shift = false;
     }));
-    on(d.input, "input", bind(fastPoll, cm));
+    on(d.input, "input", function() {
+      if (ie && !ie_lt9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
+      fastPoll(cm);
+    });
     on(d.input, "keydown", operation(cm, onKeyDown));
     on(d.input, "keypress", operation(cm, onKeyPress));
     on(d.input, "focus", bind(onFocus, cm));

From e470d7f4ad2e3bc60ece03e43319d3d70e15337e Mon Sep 17 00:00:00 2001
From: Tomas-A <taksas027@gmail.com>
Date: Thu, 12 Sep 2013 16:53:15 +0100
Subject: [PATCH 0462/4742] [searchcursor addon] Fix multiple-line search

There must be an error in line 73 because if the phrase starts at the
same character position then conditional if will always become true
(same number is equal to same number) therefore it must be changed to
strict less than.
---
 addon/search/searchcursor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 3da3f04e8f..c034d5865b 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -69,8 +69,8 @@
         this.matches = function(reverse, pos) {
           var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(doc.getLine(ln));
           var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match));
-          if (reverse ? offsetA >= pos.ch || offsetA != match.length
-              : offsetA <= pos.ch || offsetA != line.length - match.length)
+          if (reverse ? offsetA > pos.ch || offsetA != match.length
+              : offsetA < pos.ch || offsetA != line.length - match.length)
             return;
           for (;;) {
             if (reverse ? !ln : ln == doc.lineCount() - 1) return;

From 5cd7bdcaa1498c30e6dde4bd72674345ce8e3e12 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Sep 2013 15:16:11 +0200
Subject: [PATCH 0463/4742] [sql mode] Merge functions and builtin list for
 plsql dialect

Closes #1803
---
 mode/sql/sql.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index e9dcb7fd75..63ce3fa843 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -266,7 +266,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     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 + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general global grant grants group groupby_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
-    builtin: set("bool boolean bit blob decimal double enum float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
+    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
@@ -282,7 +282,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     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 + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
-    builtin: set("bool boolean bit blob decimal double enum float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
+    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
@@ -313,8 +313,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name:       "sql",
     client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
     keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
-    functions:  set("abs acos add_months ascii asin atan atan2 average bfilename ceil chartorowid chr concat convert cos cosh count decode deref dual dump dup_val_on_index empty error exp false floor found glb greatest hextoraw initcap instr instrb isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mod months_between new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null nvl others power rawtohex reftohex round rowcount rowidtochar rpad rtrim sign sin sinh soundex sqlcode sqlerrm sqrt stddev substr substrb sum sysdate tan tanh to_char to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid upper user userenv variance vsize"),
-    builtin:    set("bfile blob character clob dec float int integer mlslabel natural naturaln nchar nclob number numeric nvarchar2 real rowtype signtype smallint string varchar varchar2"),
+    builtin:    set("bfile blob character clob dec float int integer mlslabel natural naturaln nchar nclob number numeric nvarchar2 real rowtype signtype smallint string varchar varchar2 abs acos add_months ascii asin atan atan2 average bfilename ceil chartorowid chr concat convert cos cosh count decode deref dual dump dup_val_on_index empty error exp false floor found glb greatest hextoraw initcap instr instrb isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mod months_between new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null nvl others power rawtohex reftohex round rowcount rowidtochar rpad rtrim sign sin sinh soundex sqlcode sqlerrm sqrt stddev substr substrb sum sysdate tan tanh to_char to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid upper user userenv variance vsize"),
     operatorChars: /^[*+\-%<>!=~]/,
     dateSQL:    set("date time timestamp"),
     support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")

From 1bdd4cb199082187c7f9251d10337eb413001ea8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Sep 2013 15:43:40 +0200
Subject: [PATCH 0464/4742] Don't make changes to bgClass invalidate line
 measurement caches

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 10545b9573..f4ee4b1c17 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1001,7 +1001,7 @@ window.CodeMirror = (function() {
       var memo = cache[i];
       if (memo.text == line.text && memo.markedSpans == line.markedSpans &&
           cm.display.scroller.clientWidth == memo.width &&
-          memo.classes == line.textClass + "|" + line.bgClass + "|" + line.wrapClass)
+          memo.classes == line.textClass + "|" + line.wrapClass)
         return memo;
     }
   }
@@ -1021,7 +1021,7 @@ window.CodeMirror = (function() {
     var cache = cm.display.measureLineCache;
     var memo = {text: line.text, width: cm.display.scroller.clientWidth,
                 markedSpans: line.markedSpans, measure: measure,
-                classes: line.textClass + "|" + line.bgClass + "|" + line.wrapClass};
+                classes: line.textClass + "|" + line.wrapClass};
     if (cache.length == 16) cache[++cm.display.measureLineCachePos % 16] = memo;
     else cache.push(memo);
     return measure;

From a59d5767655792c8888f3e6a093f6f887908f8ae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Sep 2013 15:55:52 +0200
Subject: [PATCH 0465/4742] [merge addon] Signal updateDiff events

---
 addon/merge/merge.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 391eb885fb..ceb48032b1 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -60,6 +60,7 @@
       if (dv.diffOutOfDate) {
         dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
         dv.diffOutOfDate = false;
+        CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
       }
       if (dv.showDifferences) {
         updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);

From ecafd26e8c3cb6de5f36fde708368505f0e1ca08 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Sep 2013 16:06:25 +0200
Subject: [PATCH 0466/4742] Fix spanAffectsWrapping regexp for Safari

Issue #1825
---
 demo/spanaffectswrapping_shim.html | 2 +-
 lib/codemirror.js                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/spanaffectswrapping_shim.html b/demo/spanaffectswrapping_shim.html
index 00de3bdc2b..e598221c0c 100644
--- a/demo/spanaffectswrapping_shim.html
+++ b/demo/spanaffectswrapping_shim.html
@@ -32,7 +32,7 @@ <h2>Automatically derive odd wrapping behavior for your browser</h2>
 
     <script id="script">
       var a = document.getElementById("area"), bad = Object.create(null);
-      var chars = "a~`!@#$%^&*()-_=+}{[]\|'\"/?.>,<:;", l = chars.length;
+      var chars = "a~`!@#$%^&*()-_=+}{[]\\|'\"/?.>,<:;", l = chars.length;
       for (var x = 0; x < l; ++x) for (var y = 0; y < l; ++y) {
         var s1 = "foooo" + chars.charAt(x), s2 = chars.charAt(y) + "br";
         a.appendChild(document.createTextNode(s1 + s2));
diff --git a/lib/codemirror.js b/lib/codemirror.js
index f4ee4b1c17..88f992d8af 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5522,7 +5522,7 @@ window.CodeMirror = (function() {
         if (/\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i))) return true;
         if (i > 2 && /[\d\.,]/.test(str.charAt(i - 2)) && /[\d\.,]/.test(str.charAt(i))) return false;
       }
-      return /[~!#%&*)=+}\]|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|…[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
+      return /[~!#%&*)=+}\]\\|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|…[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
     };
 
   var knownScrollbarWidth;

From d92d60aa2536c13b1b25df40b606abff2723aee9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Sep 2013 16:13:26 +0200
Subject: [PATCH 0467/4742] [runmode addon] Pass state object to callbacks

Issue #1824
---
 addon/runmode/runmode-standalone.js | 2 +-
 addon/runmode/runmode.js            | 2 +-
 addon/runmode/runmode.node.js       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 5be7d74405..0fb98a9e3b 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -125,7 +125,7 @@ CodeMirror.runMode = function (string, modespec, callback, options) {
     var stream = new CodeMirror.StringStream(lines[i]);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start);
+      callback(stream.current(), style, i, stream.start, state);
       stream.start = stream.pos;
     }
   }
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index a7da6d718f..7aafa2ad8f 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -49,7 +49,7 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
     var stream = new CodeMirror.StringStream(lines[i]);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start);
+      callback(stream.current(), style, i, stream.start, state);
       stream.start = stream.pos;
     }
   }
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index ffdcc16a83..0f1088fa2e 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -96,7 +96,7 @@ exports.runMode = function(string, modespec, callback) {
     var stream = new exports.StringStream(lines[i]);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start);
+      callback(stream.current(), style, i, stream.start, state);
       stream.start = stream.pos;
     }
   }

From 2bca5855047490eef93eaa4b07e34fbb9f6effd1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Sep 2013 16:14:34 +0200
Subject: [PATCH 0468/4742] [compression helper] Add foldgutter.js

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

diff --git a/doc/compress.html b/doc/compress.html
index 8548991f90..28c33026c3 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -162,6 +162,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/hint/css-hint.js">css-hint.js</option>
           <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
           <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
+          <option value="http://codemirror.net/addon/fold/foldgutter.js">foldgutter.js</option>
           <option value="http://codemirror.net/addon/display/fullscreen.js">fullscreen.js</option>
           <option value="http://codemirror.net/addon/hint/html-hint.js">html-hint.js</option>
           <option value="http://codemirror.net/addon/fold/indent-fold.js">indent-fold.js</option>

From 291ffbdf9d89a1e5d74b57ee583b878b2008b9b8 Mon Sep 17 00:00:00 2001
From: Martin Balek <martin.balek@gmail.com>
Date: Tue, 17 Sep 2013 14:10:46 +0200
Subject: [PATCH 0469/4742] [octave mode] Add

---
 doc/compress.html      |   1 +
 mode/index.html        |   1 +
 mode/octave/index.html |  95 +++++++++++++++++++++++++++++++++
 mode/octave/octave.js  | 118 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 215 insertions(+)
 create mode 100644 mode/octave/index.html
 create mode 100644 mode/octave/octave.js

diff --git a/doc/compress.html b/doc/compress.html
index 28c33026c3..d7f720fae1 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -111,6 +111,7 @@ <h2>Script compression helper</h2>
           <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/ocaml/ocaml.js">ocaml.js</option>
+          <option value="http://codemirror.net/mode/octave/octave.js">octave.js</option>
           <option value="http://codemirror.net/mode/pascal/pascal.js">pascal.js</option>
           <option value="http://codemirror.net/mode/perl/perl.js">perl.js</option>
           <option value="http://codemirror.net/mode/php/php.js">php.js</option>
diff --git a/mode/index.html b/mode/index.html
index f2bba985c2..063e69b6c7 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -66,6 +66,7 @@ <h2>Language modes</h2>
       <li><a href="nginx/index.html">Nginx</a></li>
       <li><a href="ntriples/index.html">NTriples</a></li>
       <li><a href="ocaml/index.html">OCaml</a></li>
+      <li><a href="octave/index.html">Octave</a> (MATLAB)</li>
       <li><a href="pascal/index.html">Pascal</a></li>
       <li><a href="perl/index.html">Perl</a></li>
       <li><a href="php/index.html">PHP</a></li>
diff --git a/mode/octave/index.html b/mode/octave/index.html
new file mode 100644
index 0000000000..bd5a523294
--- /dev/null
+++ b/mode/octave/index.html
@@ -0,0 +1,95 @@
+<!doctype html>
+
+<title>CodeMirror: Octave 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="octave.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Octave</a>
+  </ul>
+</div>
+
+<article>
+<h2>Octave mode</h2>
+
+    <div><textarea id="code" name="code">
+%numbers
+1234
+1234i
+1234j
+.234
+.234j
+2.23i
+23e2
+12E1j
+123D-4
+0x234
+
+%strings
+'asda''a'
+"asda""a"
+
+%identifiers
+a
+as123
+__asd__
+
+%operators
+-
++
+=
+==
+>
+<
+>=
+<=
+&
+~
+...
+break zeros default margin round ones rand
+ceil floor size clear zeros eye mean std cov
+error eval function
+abs acos atan asin cos cosh exp log prod sum
+log10 max min sign sin sinh sqrt tan reshape
+return
+case switch
+else elseif end if otherwise
+do for while
+try catch
+classdef properties events methods
+global persistent
+
+%one line comment
+...one line comment
+%{ multi 
+line commment %}
+1
+
+    </textarea></div>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "octave",
+               version: 2,
+               singleLineStringErrors: false},
+        lineNumbers: true,
+        indentUnit: 4,
+        tabMode: "shift",
+        matchBrackets: true
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-octave</code>.</p>
+</article>
diff --git a/mode/octave/octave.js b/mode/octave/octave.js
new file mode 100644
index 0000000000..23cd2fe222
--- /dev/null
+++ b/mode/octave/octave.js
@@ -0,0 +1,118 @@
+CodeMirror.defineMode("octave", function() {
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  var singleOperators = new RegExp("^[\\+\\-\\*/&|\\^~<>!@'\\\\]");
+  var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;]');
+  var doubleOperators = new RegExp("^((==)|(~=)|(<=)|(>=)|(<<)|(>>)|(\\.[\\+\\-\\*/\\^\\\\]))");
+  var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))");
+  var tripleDelimiters = new RegExp("^((>>=)|(<<=))");
+  var expressionEnd = new RegExp("^[\\]\\)]");
+  var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+
+  var builtins = wordRegexp([
+    'error', 'eval', 'function', 'abs', 'acos', 'atan', 'asin', 'cos',
+    'cosh', 'exp', 'log', 'prod', 'log10', 'max', 'min', 'sign', 'sin', 'sinh',
+    'sqrt', 'tan', 'reshape', 'break', 'zeros', 'default', 'margin', 'round', 'ones',
+    'rand', 'syn', 'ceil', 'floor', 'size', 'clear', 'zeros', 'eye', 'mean', 'std', 'cov',
+    'det', 'eig', 'inv', 'norm', 'rank', 'trace', 'expm', 'logm', 'sqrtm', 'linspace', 'plot',
+    'title', 'xlabel', 'ylabel', 'legend', 'text', 'meshgrid', 'mesh', 'num2str'
+  ]);
+
+  var keywords = wordRegexp([
+    'return', 'case', 'switch', 'else', 'elseif', 'end', 'endif', 'endfunction',
+    'if', 'otherwise', 'do', 'for', 'while', 'try', 'catch', 'classdef', 'properties', 'events',
+    'methods', 'global', 'persistent', 'endfor', 'endwhile', 'printf', 'disp', 'until', 'continue'
+  ]);
+
+
+  // tokenizers
+  function tokenTranspose(stream, state) {
+    if (!stream.sol() && stream.peek() === '\'') {
+      stream.next();
+      state.tokenize = tokenBase;
+      return 'operator';
+    }
+    state.tokenize = tokenBase;
+    return tokenBase(stream, state);
+  }
+
+
+  function tokenComment(stream, state) {
+    if (stream.match(/^.*%}/)) {
+      state.tokenize = tokenBase;
+      return 'comment';
+    };
+    stream.skipToEnd();
+    return 'comment';
+  }
+
+  function tokenBase(stream, state) {
+    // whitespaces
+    if (stream.eatSpace()) return null;
+
+    // Handle one line Comments
+    if (stream.match('%{')){
+      state.tokenize = tokenComment;
+      stream.skipToEnd();
+      return 'comment';
+    }
+
+    if (stream.match(/^(%)|(\.\.\.)/)){
+      stream.skipToEnd();
+      return 'comment';
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.+-]/, false)) {
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+[ij]?/)) {
+        stream.tokenize = tokenBase;
+        return 'number'; };
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; };
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; };
+    }
+    if (stream.match(wordRegexp(['nan','NaN','inf','Inf']))) { return 'number'; };
+
+    // Handle Strings
+    if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; } ;
+    if (stream.match(/^'([^']|(''))*'/)) { return 'string'; } ;
+
+    // Handle words
+    if (stream.match(keywords)) { return 'keyword'; } ;
+    if (stream.match(builtins)) { return 'builtin'; } ;
+    if (stream.match(identifiers)) { return 'variable'; } ;
+
+    if (stream.match(singleOperators) || stream.match(doubleOperators)) { return 'operator'; };
+    if (stream.match(singleDelimiters) || stream.match(doubleDelimiters) || stream.match(tripleDelimiters)) { return null; };
+
+    if (stream.match(expressionEnd)) {
+      state.tokenize = tokenTranspose;
+      return null;
+    };
+
+
+    // Handle non-detected items
+    stream.next();
+    return 'error';
+  };
+
+
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase
+      };
+    },
+
+    token: function(stream, state) {
+      var style = state.tokenize(stream, state);
+      if (style === 'number' || style === 'variable'){
+        state.tokenize = tokenTranspose;
+      }
+      return style;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-octave", "octave");

From 51c8aee26fd4bb175f5640307dbc41295407697f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 17 Sep 2013 17:03:29 +0200
Subject: [PATCH 0470/4742] [mode/meta.js] Add missing modes

---
 mode/meta.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mode/meta.js b/mode/meta.js
index 9c5d986f66..ce51c8ae19 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -13,12 +13,15 @@ CodeMirror.modeInfo = [
   {name: 'CSS', mime: 'text/css', mode: 'css'},
   {name: 'D', mime: 'text/x-d', mode: 'd'},
   {name: 'diff', mime: 'text/x-diff', mode: 'diff'},
+  {name: 'DTD', mime: 'application/xml-dtd', mode: 'dtd'},
   {name: 'ECL', mime: 'text/x-ecl', mode: 'ecl'},
   {name: 'Erlang', mime: 'text/x-erlang', mode: 'erlang'},
+  {name: 'Fortran', mime: 'text/x-fortran', mode: 'fortran'},
   {name: 'Gas', mime: 'text/x-gas', mode: 'gas'},
   {name: 'GitHub Flavored Markdown', mime: 'text/x-gfm', mode: 'gfm'},
   {name: 'GO', mime: 'text/x-go', mode: 'go'},
   {name: 'Groovy', mime: 'text/x-groovy', mode: 'groovy'},
+  {name: 'HAML', mime: 'text/x-haml', mode: 'haml'},
   {name: 'Haskell', mime: 'text/x-haskell', mode: 'haskell'},
   {name: 'Haxe', mime: 'text/x-haxe', mode: 'haxe'},
   {name: 'ASP.NET', mime: 'application/x-aspx', mode: 'htmlembedded'},
@@ -40,6 +43,7 @@ CodeMirror.modeInfo = [
   {name: 'Nginx', mime: 'text/x-nginx-conf', mode: 'nginx'},
   {name: 'NTriples', mime: 'text/n-triples', mode: 'ntriples'},
   {name: 'OCaml', mime: 'text/x-ocaml', mode: 'ocaml'},
+  {name: 'Octave', mime: 'text/x-octave', mode: 'octave'},
   {name: 'Pascal', mime: 'text/x-pascal', mode: 'pascal'},
   {name: 'Perl', mime: 'text/x-perl', mode: 'perl'},
   {name: 'PHP', mime: 'text/x-php', mode: 'php'},
@@ -69,6 +73,8 @@ CodeMirror.modeInfo = [
   {name: 'Tcl', mime: 'text/x-tcl', mode: 'tcl'},
   {name: 'TiddlyWiki ', mime: 'text/x-tiddlywiki', mode: 'tiddlywiki'},
   {name: 'Tiki wiki', mime: 'text/tiki', mode: 'tiki'},
+  {name: 'TOML', mime: 'text/x-toml', mode: 'toml'},
+  {name: 'Turtle', mime: 'text/turtle', mode: 'turtle'},
   {name: 'VB.NET', mime: 'text/x-vb', mode: 'vb'},
   {name: 'VBScript', mime: 'text/vbscript', mode: 'vbscript'},
   {name: 'Velocity', mime: 'text/velocity', mode: 'velocity'},

From e987409ef0c42435d8658c605f3ed2e517f475e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 19 Sep 2013 22:18:54 +0200
Subject: [PATCH 0471/4742] [d mode] Remove executable flag from mode files

Closes #1830
---
 mode/d/d.js       | 0
 mode/d/index.html | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 mode/d/d.js
 mode change 100755 => 100644 mode/d/index.html

diff --git a/mode/d/d.js b/mode/d/d.js
old mode 100755
new mode 100644
diff --git a/mode/d/index.html b/mode/d/index.html
old mode 100755
new mode 100644

From 344446ee7b1eb7747e52f6490bac1b407a0fb9a5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 08:41:48 +0200
Subject: [PATCH 0472/4742] [real-world uses] Add nodeMirror

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 040da5910a..421250162c 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -85,6 +85,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://mongo-mapreduce-webbrowser.opensagres.cloudbees.net/">Mongo MapReduce WebBrowser</a></li>
       <li><a href="https://www.my2ndgeneration.com/">My2ndGeneration</a> (social coding)</li>
       <li><a href="http://www.navigatecms.com">Navigate CMS</a></li>
+      <li><a href="https://github.com/soliton4/nodeMirror">nodeMirror</a> (IDE project)</li>
       <li><a href="https://notex.ch">NoTex</a> (rST authoring)</li>
       <li><a href="http://oakoutliner.com">Oak</a> (online outliner)</li>
       <li><a href="http://clrhome.org/asm/">ORG</a> (z80 assembly IDE)</li>

From d662cafbce9893e1232ccafaa9714a24388456ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Thu, 19 Sep 2013 17:15:38 -0400
Subject: [PATCH 0473/4742] solarized selection should match gutter

---
 theme/solarized.css | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index f6b2a3f277..1a87d2d801 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -99,36 +99,14 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   color: #586e75;
 }
 
-.cm-s-solarized.cm-s-dark .CodeMirror-focused .CodeMirror-selected {
-  background: #386774;
-  color: inherit;
-}
-
-.cm-s-solarized.cm-s-dark ::selection {
-  background: #386774;
-  color: inherit;
-}
-
 .cm-s-solarized.cm-s-dark .CodeMirror-selected {
-  background: #586e75;
-}
-
-.cm-s-solarized.cm-s-light .CodeMirror-focused .CodeMirror-selected {
-  background: #eee8d5;
-  color: inherit;
-}
-
-.cm-s-solarized.cm-s-light ::selection {
-  background: #eee8d5;
-  color: inherit;
+  background: #073642;
 }
 
 .cm-s-solarized.cm-s-light .CodeMirror-selected {
-  background: #93a1a1;
+  background: #eee8d5;
 }
 
-
-
 /* Editor styling */
 
 

From 9d67c932a266a9c5333f74bb61af5f587ae73cde Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 12:07:31 +0200
Subject: [PATCH 0474/4742] [css mode] Recognize numbers with leading dot

Closes #1833
Closes #1834
---
 mode/css/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 085b119de4..4264bc606c 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -37,7 +37,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       stream.match(/^\s*\w*/);
       return ret("keyword", "important");
     }
-    else if (/\d/.test(ch)) {
+    else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) {
       stream.eatWhile(/[\w.%]/);
       return ret("number", "unit");
     }

From d2b2ed74c55dcfe03eeaf467180041265f879009 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 12:14:56 +0200
Subject: [PATCH 0475/4742] Ensure scrollbar/width instability doesn't cause
 infinite loop

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 88f992d8af..cdf7652e72 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -409,14 +409,14 @@ window.CodeMirror = (function() {
   function updateDisplay(cm, changes, viewPort, forced) {
     var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
-    for (;;) {
+    for (var first = true;; first = false) {
       var oldWidth = cm.display.scroller.clientWidth;
       if (!updateDisplayInner(cm, changes, visible, forced)) break;
       updated = true;
       changes = [];
       updateSelection(cm);
       updateScrollbars(cm);
-      if (cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
+      if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
         forced = true;
         continue;
       }

From a3538de0decec580bc79fa0f9237973c83c8f5a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 12:30:12 +0200
Subject: [PATCH 0476/4742] Don't add null changes to history

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cdf7652e72..41b4d759ed 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2329,6 +2329,7 @@ window.CodeMirror = (function() {
   }
 
   function makeChangeNoReadonly(doc, change, selUpdate) {
+    if (change.text.length == 1 && change.text[0] == "" && posEq(change.from, change.to)) return;
     var selAfter = computeSelAfterChange(doc, change, selUpdate);
     addToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
 

From c2f2f34b6cedebf0a1ade910e17c438e2ae49623 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 13:02:14 +0200
Subject: [PATCH 0477/4742] [test suite] Fix windows/IE incompatibilities

Closes #1826
---
 test/test.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/test.js b/test/test.js
index a05b8afb42..e5d9afdedd 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,5 +1,7 @@
 var Pos = CodeMirror.Pos;
 
+CodeMirror.defaults.rtlMoveVisually = true;
+
 function forEach(arr, f) {
   for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
 }
@@ -529,10 +531,10 @@ testCM("multiBookmarkCursor", function(cm) {
   }
   var base1 = cm.cursorCoords(Pos(0, 1)).left, base4 = cm.cursorCoords(Pos(0, 4)).left;
   add(true);
-  eq(base1, cm.cursorCoords(Pos(0, 1)).left);
+  is(Math.abs(base1 - cm.cursorCoords(Pos(0, 1)).left) < .1);
   while (m = ms.pop()) m.clear();
   add(false);
-  eq(base4, cm.cursorCoords(Pos(0, 1)).left);
+  is(Math.abs(base4 - cm.cursorCoords(Pos(0, 1)).left) < .1);
 }, {value: "abcdefg"});
 
 testCM("getAllMarks", function(cm) {
@@ -1159,7 +1161,7 @@ testCM("rtlMovement", function(cm) {
       prevX = cursor.offsetLeft;
     }
   });
-}, {rtlMoveVisually: true});
+});
 
 // Verify that updating a line clears its bidi ordering
 testCM("bidiUpdate", function(cm) {

From 46bab8eab13594efcb8f6752e44013ddb1502661 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 13:50:16 +0200
Subject: [PATCH 0478/4742] Mark release 3.17

---
 AUTHORS           | 11 +++++++++++
 bower.json        |  2 +-
 doc/compress.html |  1 +
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bb6f8c8c64..ad2ec99576 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ alexey-k
 Alex Piggott
 Amy
 Ananya Sen
+AndersMad
 Andre von Houck
 Andrey Lushnikov
 Andy Kimball
@@ -36,6 +37,7 @@ Ben Keen
 boomyjee
 borawjm
 Brandon Frohs
+Brett Zamir
 Brian Sletten
 Bruce Mitchener
 Chandra Sekhar Pydi
@@ -44,6 +46,7 @@ Chris Coyier
 Chris Granger
 Chris Morgan
 Christopher Brown
+ciaranj
 CodeAnimal
 ComFreek
 dagsta
@@ -76,6 +79,7 @@ Felipe Lalanne
 Felix Raab
 Filip Noetzel
 flack
+ForbesLindesay
 Ford_Lawnmower
 Gabriel Nahmias
 galambalazs
@@ -85,6 +89,7 @@ Golevka
 Gordon Smith
 greengiant
 Guillaume Massé
+Guillaume Massé
 Hans Engel
 Hardest
 Hasan Karahan
@@ -137,6 +142,7 @@ komakino
 Konstantin Lopuhin
 koops
 ks-ifware
+kubelsmieci
 Lanny
 leaf corcoran
 Leonya Khachaturov
@@ -151,6 +157,8 @@ Marco Aurélio
 Marijn Haverbeke
 Mario Pietsch
 Mark Lentczner
+Martin Balek
+Martín Gaitán
 Mason Malone
 Mateusz Paprocki
 mats cronqvist
@@ -219,6 +227,7 @@ Stas Kobzar
 Stefan Borsje
 Steffen Beyer
 Steve O'Hara
+stoskov
 Tarmil
 tfjgeorge
 Thaddee Tyl
@@ -228,6 +237,8 @@ Thomas Schmid
 Tim Baumann
 Timothy Farrell
 Timothy Hatcher
+TobiasBg
+Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
 Tom MacWright
diff --git a/bower.json b/bower.json
index 451d654c0c..2aeffb8990 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "CodeMirror",
-  "version": "3.16.0",
+  "version": "3.17.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index d7f720fae1..30b148dd63 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=3.17.0;f=">3.17</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.16.0;f=">3.16</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.15.0;f=">3.15</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.14.0;f=">3.14</option>
diff --git a/doc/releases.html b/doc/releases.html
index d996d86066..88996e27a0 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">23-09-2013: <a href="http://codemirror.net/codemirror-3.17.zip">Version 3.17</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="../mode/fortran/index.html">Fortran</a>, <a href="../mode/octave/index.html">Octave</a> (Matlab), <a href="../mode/toml/index.html">TOML</a>, and <a href="../mode/dtd/index.html">DTD</a>.</li>
+    <li>New addons: <a href="../addon/lint/css-lint.js"><code>css-lint</code></a>, <a href="manual.html#addon_css-hint"><code>css-hint</code></a>.</li>
+    <li>Improve resilience to CSS 'frameworks' that globally mess up <code>box-sizing</code>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.16.0...3.17.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">21-08-2013: <a href="http://codemirror.net/codemirror-3.16.zip">Version 3.16</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 3cb82b48c4..26a0f07e62 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.16</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.17</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 41b4d759ed..1d7003570b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5879,7 +5879,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.16.1";
+  CodeMirror.version = "3.17.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index e50ba6a808..f5c28e0c41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.16.1",
+    "version":"3.17.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From faf4f2972cca9bf64df51670ad501b4572bcfabb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 13:51:14 +0200
Subject: [PATCH 0479/4742] Bump version number post-3.17

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1d7003570b..5856acb67a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5879,7 +5879,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.17.0";
+  CodeMirror.version = "3.17.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index f5c28e0c41..f47dc1501b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.17.0",
+    "version":"3.17.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 53e4881038c7d783c9a47c118dad81ac4d21dc2e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 15:16:40 +0200
Subject: [PATCH 0480/4742] Fix bug in gutter/linenumber syncing

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5856acb67a..a051cc2479 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -309,7 +309,7 @@ window.CodeMirror = (function() {
       options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
     } else if (found > -1 && !options.lineNumbers) {
       options.gutters = options.gutters.slice(0);
-      options.gutters.splice(i, 1);
+      options.gutters.splice(found, 1);
     }
   }
 

From 82c70e2055ba5b14ed9d7651a53b96b22583d502 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 16:11:48 +0200
Subject: [PATCH 0481/4742] Add checking of global variable access to linter

---
 addon/hint/pig-hint.js              |  4 +++-
 addon/lint/coffeescript-lint.js     |  2 ++
 addon/lint/css-lint.js              |  2 ++
 addon/lint/javascript-lint.js       |  2 ++
 addon/lint/json-lint.js             |  2 ++
 addon/merge/merge.js                |  1 +
 addon/runmode/runmode-standalone.js |  4 ++++
 addon/tern/tern.js                  |  3 ++-
 addon/tern/worker.js                |  2 ++
 keymap/emacs.js                     |  2 +-
 mode/haxe/haxe.js                   |  2 +-
 mode/python/python.js               | 20 +++++++++++---------
 mode/xquery/xquery.js               | 24 +-----------------------
 test/lint/lint.js                   | 27 +++++++++++++++++++++++++++
 14 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/addon/hint/pig-hint.js b/addon/hint/pig-hint.js
index 155973f22d..7ef336cecf 100644
--- a/addon/hint/pig-hint.js
+++ b/addon/hint/pig-hint.js
@@ -1,4 +1,6 @@
 (function () {
+  "use strict";
+
   function forEach(arr, f) {
     for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
   }
@@ -45,7 +47,7 @@
     return scriptHint(editor, pigKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
   }
   CodeMirror.pigHint = pigHint; // deprecated
-  CodeMirror.registerHelper("hint", "pig", hinter);
+  CodeMirror.registerHelper("hint", "pig", pigHint);
 
   var pigKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP "
   + "JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL "
diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
index 75f8db6565..7f55a294dd 100644
--- a/addon/lint/coffeescript-lint.js
+++ b/addon/lint/coffeescript-lint.js
@@ -1,5 +1,7 @@
 // Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
 
+// declare global: coffeelint
+
 CodeMirror.registerHelper("lint", "coffeescript", function(text) {
   var found = [];
   var parseError = function(err) {
diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index ba650f6a22..1de71fbcbd 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -1,5 +1,7 @@
 // Depends on csslint.js from https://github.com/stubbornella/csslint
 
+// declare global: CSSLint
+
 CodeMirror.registerHelper("lint", "css", function(text) {
   var found = [];
   var results = CSSLint.verify(text), messages = results.messages, message = null;
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index d7a6f6af28..7123ab7e64 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -1,4 +1,6 @@
 (function() {
+  "use strict";
+  // declare global: JSHINT
 
   var bogus = [ "Dangerous comment" ];
 
diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index 1dfc6b8fdc..e10e11bcaf 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -1,5 +1,7 @@
 // Depends on jsonlint.js from https://github.com/zaach/jsonlint
 
+// declare global: jsonlint
+
 CodeMirror.registerHelper("lint", "json", function(text) {
   var found = [];
   jsonlint.parseError = function(str, hash) {
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index ceb48032b1..70341e4d12 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -1,5 +1,6 @@
 (function() {
   "use strict";
+  // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
 
   var Pos = CodeMirror.Pos;
   var svgNS = "http://www.w3.org/2000/svg";
diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 0fb98a9e3b..d117166c98 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -2,6 +2,9 @@
 
 window.CodeMirror = {};
 
+(function() {
+"use strict";
+
 function splitLines(string){ return string.split(/\r?\n|\r/); };
 
 function StringStream(string) {
@@ -130,3 +133,4 @@ CodeMirror.runMode = function (string, modespec, callback, options) {
     }
   }
 };
+})();
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 5084539993..29ccc94886 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -42,6 +42,7 @@
 
 (function() {
   "use strict";
+  // declare global: tern
 
   CodeMirror.TernServer = function(options) {
     var self = this;
@@ -609,7 +610,7 @@
     worker.onmessage = function(e) {
       var data = e.data;
       if (data.type == "getFile") {
-        getFile(ts, name, function(err, text) {
+        getFile(ts, data.name, function(err, text) {
           send({type: "getFile", err: String(err), text: text, id: data.id});
         });
       } else if (data.type == "debug") {
diff --git a/addon/tern/worker.js b/addon/tern/worker.js
index 0164762f59..1ff63de411 100644
--- a/addon/tern/worker.js
+++ b/addon/tern/worker.js
@@ -1,3 +1,5 @@
+// declare global: tern, server
+
 var server;
 
 this.onmessage = function(e) {
diff --git a/keymap/emacs.js b/keymap/emacs.js
index 8727121ceb..7a3dfb11ac 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -353,7 +353,7 @@
     },
 
     "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": repeated("undo"), "K": "close",
-    "Delete": function(cm) { kill(cm, cm.getCursor(), sentenceEnd(cm, 1), true); },
+    "Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
     auto: "emacs", nofallthrough: true, disableInput: true
   };
 
diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 28f9b00ec3..cb761ad1ce 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -297,7 +297,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
   function metadef(type) {
     if(type == ":") return cont(metadef);
     if(type == "variable") return cont(metadef);
-    if(type == "(") return cont(pushlex(")"), comasep(metaargs, ")"), poplex, statement);
+    if(type == "(") return cont(pushlex(")"), commasep(metaargs, ")"), poplex, statement);
   }
   function metaargs(type) {
     if(type == "variable") return cont();
diff --git a/mode/python/python.js b/mode/python/python.js
index 28108e4c1a..802c2dd4ac 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -355,12 +355,14 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
 
 CodeMirror.defineMIME("text/x-python", "python");
 
-var words = function(str){return str.split(' ');};
-
-
-CodeMirror.defineMIME("text/x-cython", {
-  name: "python",
-  extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
-                        "extern gil include nogil property public"+
-                        "readonly struct union DEF IF ELIF ELSE")
-});
+(function() {
+  "use strict";
+  var words = function(str){return str.split(' ');};
+
+  CodeMirror.defineMIME("text/x-cython", {
+    name: "python",
+    extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
+                          "extern gil include nogil property public"+
+                          "readonly struct union DEF IF ELIF ELSE")
+  });
+})();
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index 04ddb8f5ae..be17984635 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -1,25 +1,3 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort <mike@brevoort.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
 CodeMirror.defineMode("xquery", function() {
 
   // The keywords object is set to the result of this self executing
@@ -348,7 +326,7 @@ CodeMirror.defineMode("xquery", function() {
       return chain(stream, state, tokenString(ch, tokenAttribute));
 
     if(!isInXmlAttributeBlock(state))
-      pushStateStack(state, { type: "attribute", name: name, tokenize: tokenAttribute});
+      pushStateStack(state, { type: "attribute", tokenize: tokenAttribute});
 
     stream.eat(/[a-zA-Z_:]/);
     stream.eatWhile(/[-a-zA-Z0-9_:.]/);
diff --git a/test/lint/lint.js b/test/lint/lint.js
index 4fc577fa01..fda737c087 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -8,10 +8,22 @@
   - missing semicolons and trailing commas
   - variables or properties that are reserved words
   - assigning to a variable you didn't declare
+  - access to non-whitelisted globals
+    (use a '// declare global: foo, bar' comment to declare extra
+    globals in a file)
 
  [1]: https://github.com/marijnh/acorn/
 */
 
+var topAllowedGlobals = Object.create(null);
+("Error RegExp Number String Array Function Object Math Date undefined " +
+ "parseInt parseFloat Infinity NaN isNaN " +
+ "window document navigator prompt alert confirm console " +
+ "FileReader Worker postMessage importScripts " +
+ "setInterval clearInterval setTimeout clearTimeout " +
+ "CodeMirror test")
+  .split(" ").forEach(function(n) { topAllowedGlobals[n] = true; });
+
 var fs = require("fs"), acorn = require("./acorn.js"), walk = require("./walk.js");
 
 var scopePasser = walk.make({
@@ -28,6 +40,8 @@ function checkFile(fileName) {
     var info = acorn.getLineInfo(file, notAllowed.index);
     fail(msg + " at line " + info.line + ", column " + info.column, {source: fileName});
   }
+  
+  var globalsSeen = Object.create(null);
 
   try {
     var parsed = acorn.parse(file, {
@@ -70,18 +84,31 @@ function checkFile(fileName) {
     UpdateExpression: function(node, scope) {checkLHS(node.argument, scope);},
     AssignmentExpression: function(node, scope) {checkLHS(node.left, scope);},
     Identifier: function(node, scope) {
+      if (node.name == "arguments") return;
       // Mark used identifiers
       for (var cur = scope; cur; cur = cur.prev)
         if (node.name in cur.vars) {
           cur.vars[node.name].used = true;
           return;
         }
+      globalsSeen[node.name] = node.loc;
     },
     FunctionExpression: function(node) {
       if (node.id) fail("Named function expression", node.loc);
     }
   }, scopePasser);
 
+  if (!globalsSeen.exports) {
+    var allowedGlobals = Object.create(topAllowedGlobals), m;
+    if (m = file.match(/\/\/ declare global:\s+(.*)/))
+      m[1].split(/,\s*/g).forEach(function(n) { allowedGlobals[n] = true; });
+    for (var glob in globalsSeen)
+      if (!(glob in allowedGlobals))
+        fail("Access to global variable " + glob + ". Add a '// declare global: " + glob +
+             "' comment or add this variable in test/lint/lint.js.", globalsSeen[glob]);
+  }
+
+
   for (var i = 0; i < scopes.length; ++i) {
     var scope = scopes[i];
     for (var name in scope.vars) {

From bf76d351e1f6aa7684e1ffe977bb412748c7303a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 16:30:00 +0200
Subject: [PATCH 0482/4742] Mark release 3.18

---
 bower.json        | 2 +-
 doc/compress.html | 2 +-
 index.html        | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bower.json b/bower.json
index 2aeffb8990..8259431c4d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "CodeMirror",
-  "version": "3.17.0",
+  "version": "3.18.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index 30b148dd63..a3e3792a18 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,7 +33,7 @@ <h2>Script compression helper</h2>
       <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=3.17.0;f=">3.17</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.18.0;f=">3.18</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.16.0;f=">3.16</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.15.0;f=">3.15</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.14.0;f=">3.14</option>
diff --git a/index.html b/index.html
index 26a0f07e62..6816c1ff82 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.17</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.18</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a051cc2479..97ab9a0cde 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5879,7 +5879,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.17.1";
+  CodeMirror.version = "3.18.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index f47dc1501b..cde46e355b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.17.1",
+    "version":"3.18.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 17aa8e15cb1d07f11d19377756cfbb9375a63514 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 16:30:54 +0200
Subject: [PATCH 0483/4742] Bump version number post-3.18

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 97ab9a0cde..fe547b69fd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5879,7 +5879,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.18.0";
+  CodeMirror.version = "3.18.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index cde46e355b..6dca63f37d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.18.0",
+    "version":"3.18.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 8a57cc0ceef1d9e077fc9783a2295d1ee73e54c4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 16:32:12 +0200
Subject: [PATCH 0484/4742] Note 3.18 in releases.html

---
 doc/releases.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/releases.html b/doc/releases.html
index 88996e27a0..61b2b4eb7e 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">23-09-2013: <a href="http://codemirror.net/codemirror-3.18.zip">Version 3.18</a>:</p>
+
+  <p class="rel-note">Emergency release to fix a problem in 3.17
+  where <code>.setOption("lineNumbers", false)</code> would raise an
+  error.</p>
+
   <p class="rel">23-09-2013: <a href="http://codemirror.net/codemirror-3.17.zip">Version 3.17</a>:</p>
 
   <ul class="rel-note">

From bc07cbddee496ebcb81c9a4d6466b112d2b14377 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Sep 2013 16:43:35 +0200
Subject: [PATCH 0485/4742] Remove unused file

---
 test/lint/parse-js.js | 1372 -----------------------------------------
 1 file changed, 1372 deletions(-)
 delete mode 100644 test/lint/parse-js.js

diff --git a/test/lint/parse-js.js b/test/lint/parse-js.js
deleted file mode 100644
index c165a273f3..0000000000
--- a/test/lint/parse-js.js
+++ /dev/null
@@ -1,1372 +0,0 @@
-/***********************************************************************
-
-  A JavaScript tokenizer / parser / beautifier / compressor.
-
-  This version is suitable for Node.js.  With minimal changes (the
-  exports stuff) it should work on any JS platform.
-
-  This file contains the tokenizer/parser.  It is a port to JavaScript
-  of parse-js [1], a JavaScript parser library written in Common Lisp
-  by Marijn Haverbeke.  Thank you Marijn!
-
-  [1] http://marijn.haverbeke.nl/parse-js/
-
-  Exported functions:
-
-    - tokenizer(code) -- returns a function.  Call the returned
-      function to fetch the next token.
-
-    - parse(code) -- returns an AST of the given JavaScript code.
-
-  -------------------------------- (C) ---------------------------------
-
-                           Author: Mihai Bazon
-                         <mihai.bazon@gmail.com>
-                       http://mihai.bazon.net/blog
-
-  Distributed under the BSD license:
-
-    Copyright 2010 (c) Mihai Bazon <mihai.bazon@gmail.com>
-    Based on parse-js (http://marijn.haverbeke.nl/parse-js/).
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-        * Redistributions of source code must retain the above
-          copyright notice, this list of conditions and the following
-          disclaimer.
-
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials
-          provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
- ***********************************************************************/
-
-/* -----[ Tokenizer (constants) ]----- */
-
-var KEYWORDS = array_to_hash([
-        "break",
-        "case",
-        "catch",
-        "const",
-        "continue",
-        "debugger",
-        "default",
-        "delete",
-        "do",
-        "else",
-        "finally",
-        "for",
-        "function",
-        "if",
-        "in",
-        "instanceof",
-        "new",
-        "return",
-        "switch",
-        "throw",
-        "try",
-        "typeof",
-        "var",
-        "void",
-        "while",
-        "with"
-]);
-
-var RESERVED_WORDS = array_to_hash([
-        "abstract",
-        "boolean",
-        "byte",
-        "char",
-        "class",
-        "double",
-        "enum",
-        "export",
-        "extends",
-        "final",
-        "float",
-        "goto",
-        "implements",
-        "import",
-        "int",
-        "interface",
-        "long",
-        "native",
-        "package",
-        "private",
-        "protected",
-        "public",
-        "short",
-        "static",
-        "super",
-        "synchronized",
-        "throws",
-        "transient",
-        "volatile"
-]);
-
-var KEYWORDS_BEFORE_EXPRESSION = array_to_hash([
-        "return",
-        "new",
-        "delete",
-        "throw",
-        "else",
-        "case"
-]);
-
-var KEYWORDS_ATOM = array_to_hash([
-        "false",
-        "null",
-        "true",
-        "undefined"
-]);
-
-var OPERATOR_CHARS = array_to_hash(characters("+-*&%=<>!?|~^"));
-
-var RE_HEX_NUMBER = /^0x[0-9a-f]+$/i;
-var RE_OCT_NUMBER = /^0[0-7]+$/;
-var RE_DEC_NUMBER = /^\d*\.?\d*(?:e[+-]?\d*(?:\d\.?|\.?\d)\d*)?$/i;
-
-var OPERATORS = array_to_hash([
-        "in",
-        "instanceof",
-        "typeof",
-        "new",
-        "void",
-        "delete",
-        "++",
-        "--",
-        "+",
-        "-",
-        "!",
-        "~",
-        "&",
-        "|",
-        "^",
-        "*",
-        "/",
-        "%",
-        ">>",
-        "<<",
-        ">>>",
-        "<",
-        ">",
-        "<=",
-        ">=",
-        "==",
-        "===",
-        "!=",
-        "!==",
-        "?",
-        "=",
-        "+=",
-        "-=",
-        "/=",
-        "*=",
-        "%=",
-        ">>=",
-        "<<=",
-        ">>>=",
-        "|=",
-        "^=",
-        "&=",
-        "&&",
-        "||"
-]);
-
-var WHITESPACE_CHARS = array_to_hash(characters(" \u00a0\n\r\t\f\u000b\u200b\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000"));
-
-var PUNC_BEFORE_EXPRESSION = array_to_hash(characters("[{(,.;:"));
-
-var PUNC_CHARS = array_to_hash(characters("[]{}(),;:"));
-
-var REGEXP_MODIFIERS = array_to_hash(characters("gmsiy"));
-
-/* -----[ Tokenizer ]----- */
-
-var UNICODE = {  // Unicode 6.1
-        letter: new RegExp("[\\u0041-\\u005A\\u0061-\\u007A\\u00AA\\u00B5\\u00BA\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u0527\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0620-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0800-\\u0815\\u081A\\u0824\\u0828\\u0840-\\u0858\\u08A0\\u08A2-\\u08AC\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971-\\u0977\\u0979-\\u097F\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0CF1\\u0CF2\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16EE-\\u16F0\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191C\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1A20-\\u1A54\\u1AA7\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5\\u1CF6\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u209C\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2160-\\u2188\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CEE\\u2CF2\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005-\\u3007\\u3021-\\u3029\\u3031-\\u3035\\u3038-\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA66E\\uA67F-\\uA697\\uA6A0-\\uA6EF\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA793\\uA7A0-\\uA7AA\\uA7F8-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9CF\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA76\\uAA7A\\uAA80-\\uAAAF\\uAAB1\\uAAB5\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEA\\uAAF2-\\uAAF4\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]"),
-        combining_mark: new RegExp("[\\u0300-\\u036F\\u0483-\\u0487\\u0591-\\u05BD\\u05BF\\u05C1\\u05C2\\u05C4\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065F\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u07A6-\\u07B0\\u07EB-\\u07F3\\u0816-\\u0819\\u081B-\\u0823\\u0825-\\u0827\\u0829-\\u082D\\u0859-\\u085B\\u08E4-\\u08FE\\u0900-\\u0903\\u093A-\\u093C\\u093E-\\u094F\\u0951-\\u0957\\u0962\\u0963\\u0981-\\u0983\\u09BC\\u09BE-\\u09C4\\u09C7\\u09C8\\u09CB-\\u09CD\\u09D7\\u09E2\\u09E3\\u0A01-\\u0A03\\u0A3C\\u0A3E-\\u0A42\\u0A47\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A70\\u0A71\\u0A75\\u0A81-\\u0A83\\u0ABC\\u0ABE-\\u0AC5\\u0AC7-\\u0AC9\\u0ACB-\\u0ACD\\u0AE2\\u0AE3\\u0B01-\\u0B03\\u0B3C\\u0B3E-\\u0B44\\u0B47\\u0B48\\u0B4B-\\u0B4D\\u0B56\\u0B57\\u0B62\\u0B63\\u0B82\\u0BBE-\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCD\\u0BD7\\u0C01-\\u0C03\\u0C3E-\\u0C44\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55\\u0C56\\u0C62\\u0C63\\u0C82\\u0C83\\u0CBC\\u0CBE-\\u0CC4\\u0CC6-\\u0CC8\\u0CCA-\\u0CCD\\u0CD5\\u0CD6\\u0CE2\\u0CE3\\u0D02\\u0D03\\u0D3E-\\u0D44\\u0D46-\\u0D48\\u0D4A-\\u0D4D\\u0D57\\u0D62\\u0D63\\u0D82\\u0D83\\u0DCA\\u0DCF-\\u0DD4\\u0DD6\\u0DD8-\\u0DDF\\u0DF2\\u0DF3\\u0E31\\u0E34-\\u0E3A\\u0E47-\\u0E4E\\u0EB1\\u0EB4-\\u0EB9\\u0EBB\\u0EBC\\u0EC8-\\u0ECD\\u0F18\\u0F19\\u0F35\\u0F37\\u0F39\\u0F3E\\u0F3F\\u0F71-\\u0F84\\u0F86\\u0F87\\u0F8D-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u102B-\\u103E\\u1056-\\u1059\\u105E-\\u1060\\u1062-\\u1064\\u1067-\\u106D\\u1071-\\u1074\\u1082-\\u108D\\u108F\\u109A-\\u109D\\u135D-\\u135F\\u1712-\\u1714\\u1732-\\u1734\\u1752\\u1753\\u1772\\u1773\\u17B4-\\u17D3\\u17DD\\u180B-\\u180D\\u18A9\\u1920-\\u192B\\u1930-\\u193B\\u19B0-\\u19C0\\u19C8\\u19C9\\u1A17-\\u1A1B\\u1A55-\\u1A5E\\u1A60-\\u1A7C\\u1A7F\\u1B00-\\u1B04\\u1B34-\\u1B44\\u1B6B-\\u1B73\\u1B80-\\u1B82\\u1BA1-\\u1BAD\\u1BE6-\\u1BF3\\u1C24-\\u1C37\\u1CD0-\\u1CD2\\u1CD4-\\u1CE8\\u1CED\\u1CF2-\\u1CF4\\u1DC0-\\u1DE6\\u1DFC-\\u1DFF\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2CEF-\\u2CF1\\u2D7F\\u2DE0-\\u2DFF\\u302A-\\u302F\\u3099\\u309A\\uA66F\\uA674-\\uA67D\\uA69F\\uA6F0\\uA6F1\\uA802\\uA806\\uA80B\\uA823-\\uA827\\uA880\\uA881\\uA8B4-\\uA8C4\\uA8E0-\\uA8F1\\uA926-\\uA92D\\uA947-\\uA953\\uA980-\\uA983\\uA9B3-\\uA9C0\\uAA29-\\uAA36\\uAA43\\uAA4C\\uAA4D\\uAA7B\\uAAB0\\uAAB2-\\uAAB4\\uAAB7\\uAAB8\\uAABE\\uAABF\\uAAC1\\uAAEB-\\uAAEF\\uAAF5\\uAAF6\\uABE3-\\uABEA\\uABEC\\uABED\\uFB1E\\uFE00-\\uFE0F\\uFE20-\\uFE26]"),
-        connector_punctuation: new RegExp("[\\u005F\\u203F\\u2040\\u2054\\uFE33\\uFE34\\uFE4D-\\uFE4F\\uFF3F]"),
-        digit: new RegExp("[\\u0030-\\u0039\\u0660-\\u0669\\u06F0-\\u06F9\\u07C0-\\u07C9\\u0966-\\u096F\\u09E6-\\u09EF\\u0A66-\\u0A6F\\u0AE6-\\u0AEF\\u0B66-\\u0B6F\\u0BE6-\\u0BEF\\u0C66-\\u0C6F\\u0CE6-\\u0CEF\\u0D66-\\u0D6F\\u0E50-\\u0E59\\u0ED0-\\u0ED9\\u0F20-\\u0F29\\u1040-\\u1049\\u1090-\\u1099\\u17E0-\\u17E9\\u1810-\\u1819\\u1946-\\u194F\\u19D0-\\u19D9\\u1A80-\\u1A89\\u1A90-\\u1A99\\u1B50-\\u1B59\\u1BB0-\\u1BB9\\u1C40-\\u1C49\\u1C50-\\u1C59\\uA620-\\uA629\\uA8D0-\\uA8D9\\uA900-\\uA909\\uA9D0-\\uA9D9\\uAA50-\\uAA59\\uABF0-\\uABF9\\uFF10-\\uFF19]")
-};
-
-function is_letter(ch) {
-        return UNICODE.letter.test(ch);
-};
-
-function is_digit(ch) {
-        ch = ch.charCodeAt(0);
-        return ch >= 48 && ch <= 57;
-};
-
-function is_unicode_digit(ch) {
-        return UNICODE.digit.test(ch);
-}
-
-function is_alphanumeric_char(ch) {
-        return is_digit(ch) || is_letter(ch);
-};
-
-function is_unicode_combining_mark(ch) {
-        return UNICODE.combining_mark.test(ch);
-};
-
-function is_unicode_connector_punctuation(ch) {
-        return UNICODE.connector_punctuation.test(ch);
-};
-
-function is_identifier_start(ch) {
-        return ch == "$" || ch == "_" || is_letter(ch);
-};
-
-function is_identifier_char(ch) {
-        return is_identifier_start(ch)
-                || is_unicode_combining_mark(ch)
-                || is_unicode_digit(ch)
-                || is_unicode_connector_punctuation(ch)
-                || ch == "\u200c" // zero-width non-joiner <ZWNJ>
-                || ch == "\u200d" // zero-width joiner <ZWJ> (in my ECMA-262 PDF, this is also 200c)
-        ;
-};
-
-function parse_js_number(num) {
-        if (RE_HEX_NUMBER.test(num)) {
-                return parseInt(num.substr(2), 16);
-        } else if (RE_OCT_NUMBER.test(num)) {
-                return parseInt(num.substr(1), 8);
-        } else if (RE_DEC_NUMBER.test(num)) {
-                return parseFloat(num);
-        }
-};
-
-function JS_Parse_Error(message, line, col, pos) {
-        this.message = message;
-        this.line = line + 1;
-        this.col = col + 1;
-        this.pos = pos + 1;
-        this.stack = new Error().stack;
-};
-
-JS_Parse_Error.prototype.toString = function() {
-        return this.message + " (line: " + this.line + ", col: " + this.col + ", pos: " + this.pos + ")" + "\n\n" + this.stack;
-};
-
-function js_error(message, line, col, pos) {
-        throw new JS_Parse_Error(message, line, col, pos);
-};
-
-function is_token(token, type, val) {
-        return token.type == type && (val == null || token.value == val);
-};
-
-var EX_EOF = {};
-
-function tokenizer($TEXT) {
-
-        var S = {
-                text            : $TEXT.replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, ''),
-                pos             : 0,
-                tokpos          : 0,
-                line            : 0,
-                tokline         : 0,
-                col             : 0,
-                tokcol          : 0,
-                newline_before  : false,
-                regex_allowed   : false,
-                comments_before : []
-        };
-
-        function peek() { return S.text.charAt(S.pos); };
-
-        function next(signal_eof, in_string) {
-                var ch = S.text.charAt(S.pos++);
-                if (signal_eof && !ch)
-                        throw EX_EOF;
-                if (ch == "\n") {
-                        S.newline_before = S.newline_before || !in_string;
-                        ++S.line;
-                        S.col = 0;
-                } else {
-                        ++S.col;
-                }
-                return ch;
-        };
-
-        function eof() {
-                return !S.peek();
-        };
-
-        function find(what, signal_eof) {
-                var pos = S.text.indexOf(what, S.pos);
-                if (signal_eof && pos == -1) throw EX_EOF;
-                return pos;
-        };
-
-        function start_token() {
-                S.tokline = S.line;
-                S.tokcol = S.col;
-                S.tokpos = S.pos;
-        };
-
-        function token(type, value, is_comment) {
-                S.regex_allowed = ((type == "operator" && !HOP(UNARY_POSTFIX, value)) ||
-                                   (type == "keyword" && HOP(KEYWORDS_BEFORE_EXPRESSION, value)) ||
-                                   (type == "punc" && HOP(PUNC_BEFORE_EXPRESSION, value)));
-                var ret = {
-                        type   : type,
-                        value  : value,
-                        line   : S.tokline,
-                        col    : S.tokcol,
-                        pos    : S.tokpos,
-                        endpos : S.pos,
-                        nlb    : S.newline_before
-                };
-                if (!is_comment) {
-                        ret.comments_before = S.comments_before;
-                        S.comments_before = [];
-                        // make note of any newlines in the comments that came before
-                        for (var i = 0, len = ret.comments_before.length; i < len; i++) {
-                                ret.nlb = ret.nlb || ret.comments_before[i].nlb;
-                        }
-                }
-                S.newline_before = false;
-                return ret;
-        };
-
-        function skip_whitespace() {
-                while (HOP(WHITESPACE_CHARS, peek()))
-                        next();
-        };
-
-        function read_while(pred) {
-                var ret = "", ch = peek(), i = 0;
-                while (ch && pred(ch, i++)) {
-                        ret += next();
-                        ch = peek();
-                }
-                return ret;
-        };
-
-        function parse_error(err) {
-                js_error(err, S.tokline, S.tokcol, S.tokpos);
-        };
-
-        function read_num(prefix) {
-                var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".";
-                var num = read_while(function(ch, i){
-                        if (ch == "x" || ch == "X") {
-                                if (has_x) return false;
-                                return has_x = true;
-                        }
-                        if (!has_x && (ch == "E" || ch == "e")) {
-                                if (has_e) return false;
-                                return has_e = after_e = true;
-                        }
-                        if (ch == "-") {
-                                if (after_e || (i == 0 && !prefix)) return true;
-                                return false;
-                        }
-                        if (ch == "+") return after_e;
-                        after_e = false;
-                        if (ch == ".") {
-                                if (!has_dot && !has_x && !has_e)
-                                        return has_dot = true;
-                                return false;
-                        }
-                        return is_alphanumeric_char(ch);
-                });
-                if (prefix)
-                        num = prefix + num;
-                var valid = parse_js_number(num);
-                if (!isNaN(valid)) {
-                        return token("num", valid);
-                } else {
-                        parse_error("Invalid syntax: " + num);
-                }
-        };
-
-        function read_escaped_char(in_string) {
-                var ch = next(true, in_string);
-                switch (ch) {
-                    case "n" : return "\n";
-                    case "r" : return "\r";
-                    case "t" : return "\t";
-                    case "b" : return "\b";
-                    case "v" : return "\u000b";
-                    case "f" : return "\f";
-                    case "0" : return "\0";
-                    case "x" : return String.fromCharCode(hex_bytes(2));
-                    case "u" : return String.fromCharCode(hex_bytes(4));
-                    case "\n": return "";
-                    default  : return ch;
-                }
-        };
-
-        function hex_bytes(n) {
-                var num = 0;
-                for (; n > 0; --n) {
-                        var digit = parseInt(next(true), 16);
-                        if (isNaN(digit))
-                                parse_error("Invalid hex-character pattern in string");
-                        num = (num << 4) | digit;
-                }
-                return num;
-        };
-
-        function read_string() {
-                return with_eof_error("Unterminated string constant", function(){
-                        var quote = next(), ret = "";
-                        for (;;) {
-                                var ch = next(true);
-                                if (ch == "\\") {
-                                        // read OctalEscapeSequence (XXX: deprecated if "strict mode")
-                                        // https://github.com/mishoo/UglifyJS/issues/178
-                                        var octal_len = 0, first = null;
-                                        ch = read_while(function(ch){
-                                                if (ch >= "0" && ch <= "7") {
-                                                        if (!first) {
-                                                                first = ch;
-                                                                return ++octal_len;
-                                                        }
-                                                        else if (first <= "3" && octal_len <= 2) return ++octal_len;
-                                                        else if (first >= "4" && octal_len <= 1) return ++octal_len;
-                                                }
-                                                return false;
-                                        });
-                                        if (octal_len > 0) ch = String.fromCharCode(parseInt(ch, 8));
-                                        else ch = read_escaped_char(true);
-                                }
-                                else if (ch == quote) break;
-                                ret += ch;
-                        }
-                        return token("string", ret);
-                });
-        };
-
-        function read_line_comment() {
-                next();
-                var i = find("\n"), ret;
-                if (i == -1) {
-                        ret = S.text.substr(S.pos);
-                        S.pos = S.text.length;
-                } else {
-                        ret = S.text.substring(S.pos, i);
-                        S.pos = i;
-                }
-                return token("comment1", ret, true);
-        };
-
-        function read_multiline_comment() {
-                next();
-                return with_eof_error("Unterminated multiline comment", function(){
-                        var i = find("*/", true),
-                            text = S.text.substring(S.pos, i);
-                        S.pos = i + 2;
-                        S.line += text.split("\n").length - 1;
-                        S.newline_before = S.newline_before || text.indexOf("\n") >= 0;
-
-                        // https://github.com/mishoo/UglifyJS/issues/#issue/100
-                        if (/^@cc_on/i.test(text)) {
-                                warn("WARNING: at line " + S.line);
-                                warn("*** Found \"conditional comment\": " + text);
-                                warn("*** UglifyJS DISCARDS ALL COMMENTS.  This means your code might no longer work properly in Internet Explorer.");
-                        }
-
-                        return token("comment2", text, true);
-                });
-        };
-
-        function read_name() {
-                var backslash = false, name = "", ch, escaped = false, hex;
-                while ((ch = peek()) != null) {
-                        if (!backslash) {
-                                if (ch == "\\") escaped = backslash = true, next();
-                                else if (is_identifier_char(ch)) name += next();
-                                else break;
-                        }
-                        else {
-                                if (ch != "u") parse_error("Expecting UnicodeEscapeSequence -- uXXXX");
-                                ch = read_escaped_char();
-                                if (!is_identifier_char(ch)) parse_error("Unicode char: " + ch.charCodeAt(0) + " is not valid in identifier");
-                                name += ch;
-                                backslash = false;
-                        }
-                }
-                if (HOP(KEYWORDS, name) && escaped) {
-                        hex = name.charCodeAt(0).toString(16).toUpperCase();
-                        name = "\\u" + "0000".substr(hex.length) + hex + name.slice(1);
-                }
-                return name;
-        };
-
-        function read_regexp(regexp) {
-                return with_eof_error("Unterminated regular expression", function(){
-                        var prev_backslash = false, ch, in_class = false;
-                        while ((ch = next(true))) if (prev_backslash) {
-                                regexp += "\\" + ch;
-                                prev_backslash = false;
-                        } else if (ch == "[") {
-                                in_class = true;
-                                regexp += ch;
-                        } else if (ch == "]" && in_class) {
-                                in_class = false;
-                                regexp += ch;
-                        } else if (ch == "/" && !in_class) {
-                                break;
-                        } else if (ch == "\\") {
-                                prev_backslash = true;
-                        } else {
-                                regexp += ch;
-                        }
-                        var mods = read_name();
-                        return token("regexp", [ regexp, mods ]);
-                });
-        };
-
-        function read_operator(prefix) {
-                function grow(op) {
-                        if (!peek()) return op;
-                        var bigger = op + peek();
-                        if (HOP(OPERATORS, bigger)) {
-                                next();
-                                return grow(bigger);
-                        } else {
-                                return op;
-                        }
-                };
-                return token("operator", grow(prefix || next()));
-        };
-
-        function handle_slash() {
-                next();
-                var regex_allowed = S.regex_allowed;
-                switch (peek()) {
-                    case "/":
-                        S.comments_before.push(read_line_comment());
-                        S.regex_allowed = regex_allowed;
-                        return next_token();
-                    case "*":
-                        S.comments_before.push(read_multiline_comment());
-                        S.regex_allowed = regex_allowed;
-                        return next_token();
-                }
-                return S.regex_allowed ? read_regexp("") : read_operator("/");
-        };
-
-        function handle_dot() {
-                next();
-                return is_digit(peek())
-                        ? read_num(".")
-                        : token("punc", ".");
-        };
-
-        function read_word() {
-                var word = read_name();
-                return !HOP(KEYWORDS, word)
-                        ? token("name", word)
-                        : HOP(OPERATORS, word)
-                        ? token("operator", word)
-                        : HOP(KEYWORDS_ATOM, word)
-                        ? token("atom", word)
-                        : token("keyword", word);
-        };
-
-        function with_eof_error(eof_error, cont) {
-                try {
-                        return cont();
-                } catch(ex) {
-                        if (ex === EX_EOF) parse_error(eof_error);
-                        else throw ex;
-                }
-        };
-
-        function next_token(force_regexp) {
-                if (force_regexp != null)
-                        return read_regexp(force_regexp);
-                skip_whitespace();
-                start_token();
-                var ch = peek();
-                if (!ch) return token("eof");
-                if (is_digit(ch)) return read_num();
-                if (ch == '"' || ch == "'") return read_string();
-                if (HOP(PUNC_CHARS, ch)) return token("punc", next());
-                if (ch == ".") return handle_dot();
-                if (ch == "/") return handle_slash();
-                if (HOP(OPERATOR_CHARS, ch)) return read_operator();
-                if (ch == "\\" || is_identifier_start(ch)) return read_word();
-                parse_error("Unexpected character '" + ch + "'");
-        };
-
-        next_token.context = function(nc) {
-                if (nc) S = nc;
-                return S;
-        };
-
-        return next_token;
-
-};
-
-/* -----[ Parser (constants) ]----- */
-
-var UNARY_PREFIX = array_to_hash([
-        "typeof",
-        "void",
-        "delete",
-        "--",
-        "++",
-        "!",
-        "~",
-        "-",
-        "+"
-]);
-
-var UNARY_POSTFIX = array_to_hash([ "--", "++" ]);
-
-var ASSIGNMENT = (function(a, ret, i){
-        while (i < a.length) {
-                ret[a[i]] = a[i].substr(0, a[i].length - 1);
-                i++;
-        }
-        return ret;
-})(
-        ["+=", "-=", "/=", "*=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&="],
-        { "=": true },
-        0
-);
-
-var PRECEDENCE = (function(a, ret){
-        for (var i = 0, n = 1; i < a.length; ++i, ++n) {
-                var b = a[i];
-                for (var j = 0; j < b.length; ++j) {
-                        ret[b[j]] = n;
-                }
-        }
-        return ret;
-})(
-        [
-                ["||"],
-                ["&&"],
-                ["|"],
-                ["^"],
-                ["&"],
-                ["==", "===", "!=", "!=="],
-                ["<", ">", "<=", ">=", "in", "instanceof"],
-                [">>", "<<", ">>>"],
-                ["+", "-"],
-                ["*", "/", "%"]
-        ],
-        {}
-);
-
-var STATEMENTS_WITH_LABELS = array_to_hash([ "for", "do", "while", "switch" ]);
-
-var ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "name" ]);
-
-/* -----[ Parser ]----- */
-
-function NodeWithToken(str, start, end) {
-        this.name = str;
-        this.start = start;
-        this.end = end;
-};
-
-NodeWithToken.prototype.toString = function() { return this.name; };
-
-function parse($TEXT, exigent_mode, embed_tokens) {
-
-        var S = {
-                input         : typeof $TEXT == "string" ? tokenizer($TEXT, true) : $TEXT,
-                token         : null,
-                prev          : null,
-                peeked        : null,
-                in_function   : 0,
-                in_directives : true,
-                in_loop       : 0,
-                labels        : []
-        };
-
-        S.token = next();
-
-        function is(type, value) {
-                return is_token(S.token, type, value);
-        };
-
-        function peek() { return S.peeked || (S.peeked = S.input()); };
-
-        function next() {
-                S.prev = S.token;
-                if (S.peeked) {
-                        S.token = S.peeked;
-                        S.peeked = null;
-                } else {
-                        S.token = S.input();
-                }
-                S.in_directives = S.in_directives && (
-                        S.token.type == "string" || is("punc", ";")
-                );
-                return S.token;
-        };
-
-        function prev() {
-                return S.prev;
-        };
-
-        function croak(msg, line, col, pos) {
-                var ctx = S.input.context();
-                js_error(msg,
-                         line != null ? line : ctx.tokline,
-                         col != null ? col : ctx.tokcol,
-                         pos != null ? pos : ctx.tokpos);
-        };
-
-        function token_error(token, msg) {
-                croak(msg, token.line, token.col);
-        };
-
-        function unexpected(token) {
-                if (token == null)
-                        token = S.token;
-                token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
-        };
-
-        function expect_token(type, val) {
-                if (is(type, val)) {
-                        return next();
-                }
-                token_error(S.token, "Unexpected token " + S.token.type + ", expected " + type);
-        };
-
-        function expect(punc) { return expect_token("punc", punc); };
-
-        function can_insert_semicolon() {
-                return !exigent_mode && (
-                        S.token.nlb || is("eof") || is("punc", "}")
-                );
-        };
-
-        function semicolon() {
-                if (is("punc", ";")) next();
-                else if (!can_insert_semicolon()) unexpected();
-        };
-
-        function as() {
-                return slice(arguments);
-        };
-
-        function parenthesised() {
-                expect("(");
-                var ex = expression();
-                expect(")");
-                return ex;
-        };
-
-        function add_tokens(str, start, end) {
-                return str instanceof NodeWithToken ? str : new NodeWithToken(str, start, end);
-        };
-
-        function maybe_embed_tokens(parser) {
-                if (embed_tokens) return function() {
-                        var start = S.token;
-                        var ast = parser.apply(this, arguments);
-                        ast[0] = add_tokens(ast[0], start, prev());
-                        return ast;
-                };
-                else return parser;
-        };
-
-        var statement = maybe_embed_tokens(function() {
-                if (is("operator", "/") || is("operator", "/=")) {
-                        S.peeked = null;
-                        S.token = S.input(S.token.value.substr(1)); // force regexp
-                }
-                switch (S.token.type) {
-                    case "string":
-                        var dir = S.in_directives, stat = simple_statement();
-                        if (dir && stat[1][0] == "string" && !is("punc", ","))
-                            return as("directive", stat[1][1]);
-                        return stat;
-                    case "num":
-                    case "regexp":
-                    case "operator":
-                    case "atom":
-                        return simple_statement();
-
-                    case "name":
-                        return is_token(peek(), "punc", ":")
-                                ? labeled_statement(prog1(S.token.value, next, next))
-                                : simple_statement();
-
-                    case "punc":
-                        switch (S.token.value) {
-                            case "{":
-                                return as("block", block_());
-                            case "[":
-                            case "(":
-                                return simple_statement();
-                            case ";":
-                                next();
-                                return as("block");
-                            default:
-                                unexpected();
-                        }
-
-                    case "keyword":
-                        switch (prog1(S.token.value, next)) {
-                            case "break":
-                                return break_cont("break");
-
-                            case "continue":
-                                return break_cont("continue");
-
-                            case "debugger":
-                                semicolon();
-                                return as("debugger");
-
-                            case "do":
-                                return (function(body){
-                                        expect_token("keyword", "while");
-                                        return as("do", prog1(parenthesised, semicolon), body);
-                                })(in_loop(statement));
-
-                            case "for":
-                                return for_();
-
-                            case "function":
-                                return function_(true);
-
-                            case "if":
-                                return if_();
-
-                            case "return":
-                                if (S.in_function == 0)
-                                        croak("'return' outside of function");
-                                return as("return",
-                                          is("punc", ";")
-                                          ? (next(), null)
-                                          : can_insert_semicolon()
-                                          ? null
-                                          : prog1(expression, semicolon));
-
-                            case "switch":
-                                return as("switch", parenthesised(), switch_block_());
-
-                            case "throw":
-                                if (S.token.nlb)
-                                        croak("Illegal newline after 'throw'");
-                                return as("throw", prog1(expression, semicolon));
-
-                            case "try":
-                                return try_();
-
-                            case "var":
-                                return prog1(var_, semicolon);
-
-                            case "const":
-                                return prog1(const_, semicolon);
-
-                            case "while":
-                                return as("while", parenthesised(), in_loop(statement));
-
-                            case "with":
-                                return as("with", parenthesised(), statement());
-
-                            default:
-                                unexpected();
-                        }
-                }
-        });
-
-        function labeled_statement(label) {
-                S.labels.push(label);
-                var start = S.token, stat = statement();
-                if (exigent_mode && !HOP(STATEMENTS_WITH_LABELS, stat[0]))
-                        unexpected(start);
-                S.labels.pop();
-                return as("label", label, stat);
-        };
-
-        function simple_statement() {
-                return as("stat", prog1(expression, semicolon));
-        };
-
-        function break_cont(type) {
-                var name;
-                if (!can_insert_semicolon()) {
-                        name = is("name") ? S.token.value : null;
-                }
-                if (name != null) {
-                        next();
-                        if (!member(name, S.labels))
-                                croak("Label " + name + " without matching loop or statement");
-                }
-                else if (S.in_loop == 0)
-                        croak(type + " not inside a loop or switch");
-                semicolon();
-                return as(type, name);
-        };
-
-        function for_() {
-                expect("(");
-                var init = null;
-                if (!is("punc", ";")) {
-                        init = is("keyword", "var")
-                                ? (next(), var_(true))
-                                : expression(true, true);
-                        if (is("operator", "in")) {
-                                if (init[0] == "var" && init[1].length > 1)
-                                        croak("Only one variable declaration allowed in for..in loop");
-                                return for_in(init);
-                        }
-                }
-                return regular_for(init);
-        };
-
-        function regular_for(init) {
-                expect(";");
-                var test = is("punc", ";") ? null : expression();
-                expect(";");
-                var step = is("punc", ")") ? null : expression();
-                expect(")");
-                return as("for", init, test, step, in_loop(statement));
-        };
-
-        function for_in(init) {
-                var lhs = init[0] == "var" ? as("name", init[1][0]) : init;
-                next();
-                var obj = expression();
-                expect(")");
-                return as("for-in", init, lhs, obj, in_loop(statement));
-        };
-
-        var function_ = function(in_statement) {
-                var name = is("name") ? prog1(S.token.value, next) : null;
-                if (in_statement && !name)
-                        unexpected();
-                expect("(");
-                return as(in_statement ? "defun" : "function",
-                          name,
-                          // arguments
-                          (function(first, a){
-                                  while (!is("punc", ")")) {
-                                          if (first) first = false; else expect(",");
-                                          if (!is("name")) unexpected();
-                                          a.push(S.token.value);
-                                          next();
-                                  }
-                                  next();
-                                  return a;
-                          })(true, []),
-                          // body
-                          (function(){
-                                  ++S.in_function;
-                                  var loop = S.in_loop;
-                                  S.in_directives = true;
-                                  S.in_loop = 0;
-                                  var a = block_();
-                                  --S.in_function;
-                                  S.in_loop = loop;
-                                  return a;
-                          })());
-        };
-
-        function if_() {
-                var cond = parenthesised(), body = statement(), belse;
-                if (is("keyword", "else")) {
-                        next();
-                        belse = statement();
-                }
-                return as("if", cond, body, belse);
-        };
-
-        function block_() {
-                expect("{");
-                var a = [];
-                while (!is("punc", "}")) {
-                        if (is("eof")) unexpected();
-                        a.push(statement());
-                }
-                next();
-                return a;
-        };
-
-        var switch_block_ = curry(in_loop, function(){
-                expect("{");
-                var a = [], cur = null;
-                while (!is("punc", "}")) {
-                        if (is("eof")) unexpected();
-                        if (is("keyword", "case")) {
-                                next();
-                                cur = [];
-                                a.push([ expression(), cur ]);
-                                expect(":");
-                        }
-                        else if (is("keyword", "default")) {
-                                next();
-                                expect(":");
-                                cur = [];
-                                a.push([ null, cur ]);
-                        }
-                        else {
-                                if (!cur) unexpected();
-                                cur.push(statement());
-                        }
-                }
-                next();
-                return a;
-        });
-
-        function try_() {
-                var body = block_(), bcatch, bfinally;
-                if (is("keyword", "catch")) {
-                        next();
-                        expect("(");
-                        if (!is("name"))
-                                croak("Name expected");
-                        var name = S.token.value;
-                        next();
-                        expect(")");
-                        bcatch = [ name, block_() ];
-                }
-                if (is("keyword", "finally")) {
-                        next();
-                        bfinally = block_();
-                }
-                if (!bcatch && !bfinally)
-                        croak("Missing catch/finally blocks");
-                return as("try", body, bcatch, bfinally);
-        };
-
-        function vardefs(no_in) {
-                var a = [];
-                for (;;) {
-                        if (!is("name"))
-                                unexpected();
-                        var name = S.token.value;
-                        next();
-                        if (is("operator", "=")) {
-                                next();
-                                a.push([ name, expression(false, no_in) ]);
-                        } else {
-                                a.push([ name ]);
-                        }
-                        if (!is("punc", ","))
-                                break;
-                        next();
-                }
-                return a;
-        };
-
-        function var_(no_in) {
-                return as("var", vardefs(no_in));
-        };
-
-        function const_() {
-                return as("const", vardefs());
-        };
-
-        function new_() {
-                var newexp = expr_atom(false), args;
-                if (is("punc", "(")) {
-                        next();
-                        args = expr_list(")");
-                } else {
-                        args = [];
-                }
-                return subscripts(as("new", newexp, args), true);
-        };
-
-        var expr_atom = maybe_embed_tokens(function(allow_calls) {
-                if (is("operator", "new")) {
-                        next();
-                        return new_();
-                }
-                if (is("punc")) {
-                        switch (S.token.value) {
-                            case "(":
-                                next();
-                                return subscripts(prog1(expression, curry(expect, ")")), allow_calls);
-                            case "[":
-                                next();
-                                return subscripts(array_(), allow_calls);
-                            case "{":
-                                next();
-                                return subscripts(object_(), allow_calls);
-                        }
-                        unexpected();
-                }
-                if (is("keyword", "function")) {
-                        next();
-                        return subscripts(function_(false), allow_calls);
-                }
-                if (HOP(ATOMIC_START_TOKEN, S.token.type)) {
-                        var atom = S.token.type == "regexp"
-                                ? as("regexp", S.token.value[0], S.token.value[1])
-                                : as(S.token.type, S.token.value);
-                        return subscripts(prog1(atom, next), allow_calls);
-                }
-                unexpected();
-        });
-
-        function expr_list(closing, allow_trailing_comma, allow_empty) {
-                var first = true, a = [];
-                while (!is("punc", closing)) {
-                        if (first) first = false; else expect(",");
-                        if (allow_trailing_comma && is("punc", closing)) break;
-                        if (is("punc", ",") && allow_empty) {
-                                a.push([ "atom", "undefined" ]);
-                        } else {
-                                a.push(expression(false));
-                        }
-                }
-                next();
-                return a;
-        };
-
-        function array_() {
-                return as("array", expr_list("]", !exigent_mode, true));
-        };
-
-        function object_() {
-                var first = true, a = [];
-                while (!is("punc", "}")) {
-                        if (first) first = false; else expect(",");
-                        if (!exigent_mode && is("punc", "}"))
-                                // allow trailing comma
-                                break;
-                        var type = S.token.type;
-                        var name = as_property_name();
-                        if (type == "name" && (name == "get" || name == "set") && !is("punc", ":")) {
-                                a.push([ as_name(), function_(false), name ]);
-                        } else {
-                                expect(":");
-                                a.push([ name, expression(false) ]);
-                        }
-                        // FIXME [!!] Line not in original parse-js,
-                        // added to be able to warn about unquoted
-                        // keyword properties
-                        a[a.length - 1].type = type;
-                }
-                next();
-                return as("object", a);
-        };
-
-        function as_property_name() {
-                switch (S.token.type) {
-                    case "num":
-                    case "string":
-                        return prog1(S.token.value, next);
-                }
-                return as_name();
-        };
-
-        function as_name() {
-                switch (S.token.type) {
-                    case "name":
-                    case "operator":
-                    case "keyword":
-                    case "atom":
-                        return prog1(S.token.value, next);
-                    default:
-                        unexpected();
-                }
-        };
-
-        function subscripts(expr, allow_calls) {
-                if (is("punc", ".")) {
-                        next();
-                        return subscripts(as("dot", expr, as_name()), allow_calls);
-                }
-                if (is("punc", "[")) {
-                        next();
-                        return subscripts(as("sub", expr, prog1(expression, curry(expect, "]"))), allow_calls);
-                }
-                if (allow_calls && is("punc", "(")) {
-                        next();
-                        return subscripts(as("call", expr, expr_list(")")), true);
-                }
-                return expr;
-        };
-
-        function maybe_unary(allow_calls) {
-                if (is("operator") && HOP(UNARY_PREFIX, S.token.value)) {
-                        return make_unary("unary-prefix",
-                                          prog1(S.token.value, next),
-                                          maybe_unary(allow_calls));
-                }
-                var val = expr_atom(allow_calls);
-                while (is("operator") && HOP(UNARY_POSTFIX, S.token.value) && !S.token.nlb) {
-                        val = make_unary("unary-postfix", S.token.value, val);
-                        next();
-                }
-                return val;
-        };
-
-        function make_unary(tag, op, expr) {
-                if ((op == "++" || op == "--") && !is_assignable(expr))
-                        croak("Invalid use of " + op + " operator");
-                return as(tag, op, expr);
-        };
-
-        function expr_op(left, min_prec, no_in) {
-                var op = is("operator") ? S.token.value : null;
-                if (op && op == "in" && no_in) op = null;
-                var prec = op != null ? PRECEDENCE[op] : null;
-                if (prec != null && prec > min_prec) {
-                        next();
-                        var right = expr_op(maybe_unary(true), prec, no_in);
-                        return expr_op(as("binary", op, left, right), min_prec, no_in);
-                }
-                return left;
-        };
-
-        function expr_ops(no_in) {
-                return expr_op(maybe_unary(true), 0, no_in);
-        };
-
-        function maybe_conditional(no_in) {
-                var expr = expr_ops(no_in);
-                if (is("operator", "?")) {
-                        next();
-                        var yes = expression(false);
-                        expect(":");
-                        return as("conditional", expr, yes, expression(false, no_in));
-                }
-                return expr;
-        };
-
-        function is_assignable(expr) {
-                if (!exigent_mode) return true;
-                switch (expr[0]+"") {
-                    case "dot":
-                    case "sub":
-                    case "new":
-                    case "call":
-                        return true;
-                    case "name":
-                        return expr[1] != "this";
-                }
-        };
-
-        function maybe_assign(no_in) {
-                var left = maybe_conditional(no_in), val = S.token.value;
-                if (is("operator") && HOP(ASSIGNMENT, val)) {
-                        if (is_assignable(left)) {
-                                next();
-                                return as("assign", ASSIGNMENT[val], left, maybe_assign(no_in));
-                        }
-                        croak("Invalid assignment");
-                }
-                return left;
-        };
-
-        var expression = maybe_embed_tokens(function(commas, no_in) {
-                if (arguments.length == 0)
-                        commas = true;
-                var expr = maybe_assign(no_in);
-                if (commas && is("punc", ",")) {
-                        next();
-                        return as("seq", expr, expression(true, no_in));
-                }
-                return expr;
-        });
-
-        function in_loop(cont) {
-                try {
-                        ++S.in_loop;
-                        return cont();
-                } finally {
-                        --S.in_loop;
-                }
-        };
-
-        return as("toplevel", (function(a){
-                while (!is("eof"))
-                        a.push(statement());
-                return a;
-        })([]));
-
-};
-
-/* -----[ Utilities ]----- */
-
-function curry(f) {
-        var args = slice(arguments, 1);
-        return function() { return f.apply(this, args.concat(slice(arguments))); };
-};
-
-function prog1(ret) {
-        if (ret instanceof Function)
-                ret = ret();
-        for (var i = 1, n = arguments.length; --n > 0; ++i)
-                arguments[i]();
-        return ret;
-};
-
-function array_to_hash(a) {
-        var ret = {};
-        for (var i = 0; i < a.length; ++i)
-                ret[a[i]] = true;
-        return ret;
-};
-
-function slice(a, start) {
-        return Array.prototype.slice.call(a, start || 0);
-};
-
-function characters(str) {
-        return str.split("");
-};
-
-function member(name, array) {
-        for (var i = array.length; --i >= 0;)
-                if (array[i] == name)
-                        return true;
-        return false;
-};
-
-function HOP(obj, prop) {
-        return Object.prototype.hasOwnProperty.call(obj, prop);
-};
-
-var warn = function() {};
-
-/* -----[ Exports ]----- */
-
-exports.tokenizer = tokenizer;
-exports.parse = parse;
-exports.slice = slice;
-exports.curry = curry;
-exports.member = member;
-exports.array_to_hash = array_to_hash;
-exports.PRECEDENCE = PRECEDENCE;
-exports.KEYWORDS_ATOM = KEYWORDS_ATOM;
-exports.RESERVED_WORDS = RESERVED_WORDS;
-exports.KEYWORDS = KEYWORDS;
-exports.ATOMIC_START_TOKEN = ATOMIC_START_TOKEN;
-exports.OPERATORS = OPERATORS;
-exports.is_alphanumeric_char = is_alphanumeric_char;
-exports.is_identifier_start = is_identifier_start;
-exports.is_identifier_char = is_identifier_char;
-exports.set_logger = function(logger) {
-        warn = logger;
-};
-
-// Local variables:
-// js-indent-level: 8
-// End:

From 6c62022d44b3660ad75204943393bd6ea78bb228 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Sep 2013 09:28:16 +0200
Subject: [PATCH 0486/4742] Make shift-delete/shift-backspace behavior match
 non-shift behavior

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fe547b69fd..dcfc1df3d4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3521,7 +3521,8 @@ window.CodeMirror = (function() {
   keyMap.basic = {
     "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
     "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
-    "Delete": "delCharAfter", "Backspace": "delCharBefore", "Tab": "defaultTab", "Shift-Tab": "indentAuto",
+    "Delete": "delCharAfter", "Shift-Delete": "delCharAfter", "Backspace": "delCharBefore",
+    "Shift-Backspace": "delCharBefore", "Tab": "defaultTab", "Shift-Tab": "indentAuto",
     "Enter": "newlineAndIndent", "Insert": "toggleOverwrite"
   };
   // Note that the save and find-related commands aren't defined by

From 3e12cbda3baff7472214f711159d7350a5456344 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Sep 2013 10:04:26 +0200
Subject: [PATCH 0487/4742] Don't bind shift-delete, only shift-backspace

See 6c62022d44b3660ad75204943393bd6ea78bb228
---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index dcfc1df3d4..19c2d76005 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3521,8 +3521,8 @@ window.CodeMirror = (function() {
   keyMap.basic = {
     "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
     "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
-    "Delete": "delCharAfter", "Shift-Delete": "delCharAfter", "Backspace": "delCharBefore",
-    "Shift-Backspace": "delCharBefore", "Tab": "defaultTab", "Shift-Tab": "indentAuto",
+    "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
+    "Tab": "defaultTab", "Shift-Tab": "indentAuto",
     "Enter": "newlineAndIndent", "Insert": "toggleOverwrite"
   };
   // Note that the save and find-related commands aren't defined by

From ca167af8c85d4813a57793078009bd50972772ec Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Sep 2013 11:49:16 +0200
Subject: [PATCH 0488/4742] [hardwrap addon] Add

---
 addon/wrap/hardwrap.js | 97 ++++++++++++++++++++++++++++++++++++++++++
 demo/hardwrap.html     | 69 ++++++++++++++++++++++++++++++
 doc/compress.html      |  1 +
 doc/manual.html        | 40 +++++++++++++++--
 4 files changed, 204 insertions(+), 3 deletions(-)
 create mode 100644 addon/wrap/hardwrap.js
 create mode 100644 demo/hardwrap.html

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
new file mode 100644
index 0000000000..0daa304b15
--- /dev/null
+++ b/addon/wrap/hardwrap.js
@@ -0,0 +1,97 @@
+(function() {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+
+  function findParagraph(cm, pos, options) {
+    var startRE = options.paragraphStart || cm.getHelper(pos, "paragraphStart");
+    for (var start = pos.line, first = cm.firstLine(); start > first; --start) {
+      var line = cm.getLine(start);
+      if (startRE && startRE.test(line)) break;
+      if (!/\S/.test(line)) { ++start; break; }
+    }
+    var endRE = options.paragraphEnd || cm.getHelper(pos, "paragraphEnd");
+    for (var end = pos.line + 1, last = cm.lastLine(); end <= last; ++end) {
+      var line = cm.getLine(end);
+      if (endRE && endRE.test(line)) { ++end; break; }
+      if (!/\S/.test(line)) break;
+    }
+    return {from: start, to: end};
+  }
+
+  function findBreakPoint(text, column, wrapOn, killTrailingSpace) {
+    for (var at = column; at > 0; --at)
+      if (wrapOn.test(text.slice(at - 1, at + 1))) break;
+    if (at == 0) at = column;
+    var endOfText = at;
+    if (killTrailingSpace)
+      while (text.charAt(endOfText - 1) == " ") --endOfText;
+    return {from: endOfText, to: at};
+  }
+
+  function wrapRange(cm, from, to, options) {
+    from = cm.clipPos(from); to = cm.clipPos(to);
+    var column = options.column || 80;
+    var wrapOn = options.wrapOn || /\s\S|-[^\.\d]/;
+    var killTrailing = options.killTrailingSpace !== false;
+    var changes = [], curLine = "", curNo = from.line;
+    var lines = cm.getRange(from, to, false);
+    for (var i = 0; i < lines.length; ++i) {
+      var text = lines[i], oldLen = curLine.length, spaceInserted = 0;
+      if (curLine && text && !wrapOn.test(curLine.charAt(curLine.length - 1) + text.charAt(0))) {
+        curLine += " ";
+        spaceInserted = 1;
+      }
+      curLine += text;
+      if (i) {
+        var firstBreak = curLine.length > column && findBreakPoint(curLine, column, wrapOn, killTrailing);
+        // If this isn't broken, or is broken at a different point, remove old break
+        if (!firstBreak || firstBreak.from != oldLen || firstBreak.to != oldLen + spaceInserted) {
+          changes.push({text: spaceInserted ? " " : "",
+                        from: Pos(curNo, oldLen),
+                        to: Pos(curNo + 1, 0)});
+        } else {
+          curLine = text;
+          ++curNo;
+        }
+      }
+      while (curLine.length > column) {
+        var bp = findBreakPoint(curLine, column, wrapOn, killTrailing);
+        changes.push({text: "\n",
+                      from: Pos(curNo, bp.from),
+                      to: Pos(curNo, bp.to)});
+        curLine = curLine.slice(bp.to);
+        ++curNo;
+      }
+    }
+    if (changes.length) cm.operation(function() {
+      for (var i = 0; i < changes.length; ++i) {
+        var change = changes[i];
+        cm.replaceRange(change.text, change.from, change.to);
+      }
+    });
+  }
+
+  CodeMirror.defineExtension("wrapParagraph", function(pos, options) {
+    options = options || {};
+    if (!pos) pos = this.getCursor();
+    var para = findParagraph(this, pos, options);
+    wrapRange(this, Pos(para.from, 0), Pos(para.to - 1), options);
+  });
+
+  CodeMirror.defineExtension("wrapRange", function(from, to, options) {
+    wrapRange(this, from, to, options || {});
+  });
+
+  CodeMirror.defineExtension("wrapParagraphsInRange", function(from, to, options) {
+    options = options || {};
+    var cm = this;
+    cm.operation(function() {
+      for (var line = from.line; line <= to.line;) {
+        var para = findParagraph(cm, Pos(line, 0), options);
+        wrapRange(cm, Pos(para.from, 0), Pos(para.to - 1), options);
+        line = para.to;
+      }
+    });
+  });
+})();
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
new file mode 100644
index 0000000000..20536bb3f9
--- /dev/null
+++ b/demo/hardwrap.html
@@ -0,0 +1,69 @@
+<!doctype html>
+
+<title>CodeMirror: Hard-wrapping Demo</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="../mode/markdown/markdown.js"></script>
+<script src="../addon/wrap/hardwrap.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Hard-wrapping</a>
+  </ul>
+</div>
+
+<article>
+<h2>Hard-wrapping Demo</h2>
+<form><textarea id="code" name="code">Lorem ipsum dolor sit amet, vim augue dictas constituto ex,
+sit falli simul viderer te. Graeco scaevola maluisset sit
+ut, in idque viris praesent sea. Ea sea eirmod indoctum
+repudiare. Vel noluisse suscipit pericula ut. In ius nulla
+alienum molestie. Mei essent discere democritum id.
+
+Equidem ponderum expetendis ius in, mea an erroribus
+constituto, congue timeam perfecto ad est. Ius ut primis
+timeam, per in ullum mediocrem. An case vero labitur pri,
+vel dicit laoreet et. An qui prompta conclusionemque, eam
+timeam sapientem in, cum dictas epicurei eu.
+
+Usu cu vide dictas deseruisse, eum choro graece adipiscing
+ut. Cibo qualisque ius ad, et dicat scripta mea, eam nihil
+mentitum aliquando cu. Debet aperiam splendide at quo, ad
+paulo nostro commodo duo. Sea adhuc utinam conclusionemque
+id, quas doming malorum nec ad. Tollit eruditi vivendum ad
+ius, eos soleat ignota ad.
+</textarea></form>
+
+<p>Demonstration of
+the <a href="../doc/manual.html#addon_hardwrap">hardwrap</a> addon.
+The above editor has its change event hooked up to
+the <code>wrapParagraphsInRange</code> method, so that the paragraphs
+are reflown as you are typing.</p>
+
+<script>
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+  mode: "markdown",
+  lineNumbers: true
+});
+var wait, options = {column: 60};
+editor.on("change", function(cm, change) {
+  clearTimeout(wait);
+  wait = setTimeout(function() {
+    cm.wrapParagraphsInRange(change.from, change.to, options);
+  }, 200);
+});
+</script>
+
+</article>
diff --git a/doc/compress.html b/doc/compress.html
index a3e3792a18..5ae53c4838 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -166,6 +166,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
           <option value="http://codemirror.net/addon/fold/foldgutter.js">foldgutter.js</option>
           <option value="http://codemirror.net/addon/display/fullscreen.js">fullscreen.js</option>
+          <option value="http://codemirror.net/addon/wrap/hardwrap.js">hardwrap.js</option>
           <option value="http://codemirror.net/addon/hint/html-hint.js">html-hint.js</option>
           <option value="http://codemirror.net/addon/fold/indent-fold.js">indent-fold.js</option>
           <option value="http://codemirror.net/addon/hint/javascript-hint.js">javascript-hint.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index 9f516b7e05..51ad9799bc 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -14,9 +14,10 @@
 <script src="../mode/css/css.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
 <style>
-  dt { text-indent: -2em; padding-left: 2em; }
-  dd { margin-left: 1.5em; }
-  dl dl {margin: 0;}
+  dt { text-indent: -2em; padding-left: 2em; margin-top: 1em; }
+  dd { margin-left: 1.5em; margin-bottom: 1em; }
+  dt {margin-top: 1em;}
+  dd dl, dd dt, dd dd, dd ul { margin-top: 0; margin-bottom: 0; }
 </style>
 
 <div id=nav>
@@ -2147,6 +2148,39 @@ <h2>Addons</h2>
       on <a href="../addon/display/fullscreen.css"><code>fullscreen.css</code></a>. <a href="../demo/fullscreen.html">Demo
       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
+      of text. Adds these methods to editor instances:
+        <dl>
+          <dt><code><strong>wrapParagraph</strong>(?pos: {line, ch}, ?options: object)</code></dt>
+          <dd>Wraps the paragraph at the given position.
+          If <code>pos</code> is not given, it defaults to the cursor
+          position.</dd>
+          <dt><code><strong>wrapRange</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>
+          <dd>Wraps the given range as one big paragraph.</dd>
+          <dt><code><strong>wrapParagraphsInRange</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>
+          <dd>Wrapps the paragraphs in (and overlapping with) the
+          given range individually.</dd>
+        </dl>
+        The following options are recognized:
+        <dl>
+          <dt><code><strong>paragraphStart</strong>, <strong>paragraphEnd</strong>: RegExp</code></dt>
+          <dd>Blank lines are always considered paragraph boundaries.
+          These options can be used to specify a pattern that causes
+          lines to be considered the start or end of a paragraph.</dd>
+          <dt><code><strong>column</strong>: number</code></dt>
+          <dd>The column to wrap at. Defaults to 80.</dd>
+          <dt><code><strong>wrapOn</strong>: RegExp</code></dt>
+          <dd>A regular expression that matches only those
+          two-character strings that allow wrapping. By default, the
+          addon wraps on whitespace and after dash characters.</dd>
+          <dt><code><strong>killTrailingSpace</strong>: boolean</code></dt>
+          <dd>Whether trailing space caused by wrapping should be
+          preserved, or deleted. Defaults to true.</dd>
+        </dl>
+        A demo of the addon is available <a href="../demo/hardwrap.html">here</a>.
+      </dd>
+
       <dt id="addon_merge"><a href="../addon/merge/merge.js"><code>merge/merge.js</code></a></dt>
       <dd>Implements an interface for merging changes, using either a
       2-way or a 3-way view. The <code>CodeMirror.MergeView</code>

From 338619879b32e24c3e59c789ebed3a056af6d695 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Sep 2013 12:19:22 +0200
Subject: [PATCH 0489/4742] [hardwrap addon] Fix bugginess when wrapping
 multiple paragraphs

---
 addon/wrap/hardwrap.js | 16 +++++++++-------
 demo/hardwrap.html     |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 0daa304b15..f252ffc9e9 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -85,13 +85,15 @@
 
   CodeMirror.defineExtension("wrapParagraphsInRange", function(from, to, options) {
     options = options || {};
-    var cm = this;
-    cm.operation(function() {
-      for (var line = from.line; line <= to.line;) {
-        var para = findParagraph(cm, Pos(line, 0), options);
-        wrapRange(cm, Pos(para.from, 0), Pos(para.to - 1), options);
-        line = para.to;
-      }
+    var cm = this, paras = [];
+    for (var line = from.line; line <= to.line;) {
+      var para = findParagraph(cm, Pos(line, 0), options);
+      paras.push(para);
+      line = para.to;
+    }
+    if (paras.length) cm.operation(function() {
+      for (var i = paras.length - 1; i >= 0; --i)
+        wrapRange(cm, Pos(paras[i].from, 0), Pos(paras[i].to - 1), options);
     });
   });
 })();
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index 20536bb3f9..a53d68dec6 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -61,7 +61,7 @@ <h2>Hard-wrapping Demo</h2>
 editor.on("change", function(cm, change) {
   clearTimeout(wait);
   wait = setTimeout(function() {
-    cm.wrapParagraphsInRange(change.from, change.to, options);
+    cm.wrapParagraphsInRange(change.from, CodeMirror.changeEnd(change), options);
   }, 200);
 });
 </script>

From 27b22ca3ef96fbd7b588c04a17c169db426c00c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Sep 2013 13:07:05 +0200
Subject: [PATCH 0490/4742] [real-world uses] Add Codio

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 421250162c..2398ca7b6d 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -45,6 +45,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://antonmi.github.io/code_together/">Code together</a> (collaborative editing)</li>
       <li><a href="http://codev.it/">Codev</a> (collaborative IDE)</li>
       <li><a href="http://www.codezample.com">CodeZample</a> (code snippet sharing)</li>
+      <li><a href="http://codeio.com">Codio</a> (Web IDE)</li>
       <li><a href="http://ot.substance.io/demo/">Collaborative CodeMirror demo</a> (CodeMirror + operational transforms)</li>
       <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>
       <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>

From fd85ce16fd53c3f061b6fbebb7f4abaf575cd064 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Sep 2013 13:44:39 +0200
Subject: [PATCH 0491/4742] [real-world uses] Fix misspelled url

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 2398ca7b6d..44183b650d 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -45,7 +45,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://antonmi.github.io/code_together/">Code together</a> (collaborative editing)</li>
       <li><a href="http://codev.it/">Codev</a> (collaborative IDE)</li>
       <li><a href="http://www.codezample.com">CodeZample</a> (code snippet sharing)</li>
-      <li><a href="http://codeio.com">Codio</a> (Web IDE)</li>
+      <li><a href="http://codio.com">Codio</a> (Web IDE)</li>
       <li><a href="http://ot.substance.io/demo/">Collaborative CodeMirror demo</a> (CodeMirror + operational transforms)</li>
       <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>
       <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>

From 437eb7c4f9303c966e317f32956c68bf56adf450 Mon Sep 17 00:00:00 2001
From: santec <santec@riseup.net>
Date: Tue, 24 Sep 2013 17:39:29 +0200
Subject: [PATCH 0492/4742] [sql_mode] added keywords

* added keywords from mysql & mariadb recent versions
---
 mode/sql/sql.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 63ce3fa843..5fbd7c7be5 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -265,7 +265,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-mysql", {
     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 + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general global grant grants group groupby_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
+    keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group groupby_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
     builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
@@ -281,7 +281,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-mariadb", {
     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 + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
+    keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
     builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,

From 39499fdd79929f5fc4a4b52bf6d25bb9071749fd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Sep 2013 22:15:32 +0200
Subject: [PATCH 0493/4742] [themes] Move error style to bottom to give it
 precedence

---
 lib/codemirror.css                |  2 +-
 theme/3024-day.css                |  2 +-
 theme/3024-night.css              |  2 +-
 theme/ambiance.css                |  2 +-
 theme/base16-dark.css             |  2 +-
 theme/base16-light.css            |  2 +-
 theme/blackboard.css              |  2 +-
 theme/cobalt.css                  |  2 +-
 theme/eclipse.css                 |  2 +-
 theme/elegant.css                 |  2 +-
 theme/erlang-dark.css             |  2 +-
 theme/lesser-dark.css             |  2 +-
 theme/midnight.css                |  2 +-
 theme/monokai.css                 |  2 +-
 theme/night.css                   |  2 +-
 theme/paraiso-dark.css            |  2 +-
 theme/paraiso-light.css           |  2 +-
 theme/rubyblue.css                |  2 +-
 theme/solarized.css               | 10 +++++-----
 theme/the-matrix.css              |  2 +-
 theme/tomorrow-night-eighties.css |  2 +-
 theme/twilight.css                |  2 +-
 theme/vibrant-ink.css             |  2 +-
 theme/xq-dark.css                 |  2 +-
 theme/xq-light.css                |  2 +-
 25 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 4e300b2be2..23eaf74d44 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -74,7 +74,6 @@
 .cm-s-default .cm-string {color: #a11;}
 .cm-s-default .cm-string-2 {color: #f50;}
 .cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-error {color: #f00;}
 .cm-s-default .cm-qualifier {color: #555;}
 .cm-s-default .cm-builtin {color: #30a;}
 .cm-s-default .cm-bracket {color: #997;}
@@ -91,6 +90,7 @@
 .cm-em {font-style: italic;}
 .cm-link {text-decoration: underline;}
 
+.cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
 
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
diff --git a/theme/3024-day.css b/theme/3024-day.css
index 5a5d8395d6..cbb9a4fa41 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -25,10 +25,10 @@
 .cm-s-3024-day span.cm-variable {color: #01a252;}
 .cm-s-3024-day span.cm-variable-2 {color: #01a0e4;}
 .cm-s-3024-day span.cm-def {color: #e8bbd0;}
-.cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
 .cm-s-3024-day span.cm-bracket {color: #3a3432;}
 .cm-s-3024-day span.cm-tag {color: #db2d20;}
 .cm-s-3024-day span.cm-link {color: #a16a94;}
+.cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
 
 .cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/3024-night.css b/theme/3024-night.css
index ec997a32eb..2c62e221b0 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -25,10 +25,10 @@
 .cm-s-3024-night span.cm-variable {color: #01a252;}
 .cm-s-3024-night span.cm-variable-2 {color: #01a0e4;}
 .cm-s-3024-night span.cm-def {color: #e8bbd0;}
-.cm-s-3024-night span.cm-error {background: #db2d20; color: #807d7c;}
 .cm-s-3024-night span.cm-bracket {color: #d6d5d4;}
 .cm-s-3024-night span.cm-tag {color: #db2d20;}
 .cm-s-3024-night span.cm-link {color: #a16a94;}
+.cm-s-3024-night span.cm-error {background: #db2d20; color: #807d7c;}
 
 .cm-s-3024-night .CodeMirror-activeline-background {background: #2F2F2F !important;}
 .cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/ambiance.css b/theme/ambiance.css
index 53e9ce78f7..a69d16e5a5 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -15,7 +15,6 @@
 .cm-s-ambiance .cm-string { color: #8f9d6a; }
 .cm-s-ambiance .cm-string-2 { color: #9d937c; }
 .cm-s-ambiance .cm-meta { color: #D2A8A1; }
-.cm-s-ambiance .cm-error { color: #AF2018; }
 .cm-s-ambiance .cm-qualifier { color: yellow; }
 .cm-s-ambiance .cm-builtin { color: #9999cc; }
 .cm-s-ambiance .cm-bracket { color: #24C2C7; }
@@ -26,6 +25,7 @@
 .cm-s-ambiance .cm-hr { color: pink; }
 .cm-s-ambiance .cm-link { color: #F4C20B; }
 .cm-s-ambiance .cm-special { color: #FF9D00; }
+.cm-s-ambiance .cm-error { color: #AF2018; }
 
 .cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
 .cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 5ab6649010..3b7b21c7a1 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -25,10 +25,10 @@
 .cm-s-base16-dark span.cm-variable {color: #90a959;}
 .cm-s-base16-dark span.cm-variable-2 {color: #6a9fb5;}
 .cm-s-base16-dark span.cm-def {color: #d28445;}
-.cm-s-base16-dark span.cm-error {background: #ac4142; color: #b0b0b0;}
 .cm-s-base16-dark span.cm-bracket {color: #e0e0e0;}
 .cm-s-base16-dark span.cm-tag {color: #ac4142;}
 .cm-s-base16-dark span.cm-link {color: #aa759f;}
+.cm-s-base16-dark span.cm-error {background: #ac4142; color: #b0b0b0;}
 
 .cm-s-base16-dark .CodeMirror-activeline-background {background: #2F2F2F !important;}
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/base16-light.css b/theme/base16-light.css
index d77fef808c..5aa4b53895 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -25,10 +25,10 @@
 .cm-s-base16-light span.cm-variable {color: #90a959;}
 .cm-s-base16-light span.cm-variable-2 {color: #6a9fb5;}
 .cm-s-base16-light span.cm-def {color: #d28445;}
-.cm-s-base16-light span.cm-error {background: #ac4142; color: #505050;}
 .cm-s-base16-light span.cm-bracket {color: #202020;}
 .cm-s-base16-light span.cm-tag {color: #ac4142;}
 .cm-s-base16-light span.cm-link {color: #aa759f;}
+.cm-s-base16-light span.cm-error {background: #ac4142; color: #505050;}
 
 .cm-s-base16-light .CodeMirror-activeline-background {background: #DDDCDC !important;}
 .cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/blackboard.css b/theme/blackboard.css
index 364112b089..8b7608472b 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -16,13 +16,13 @@
 .cm-s-blackboard .cm-string { color: #61CE3C; }
 .cm-s-blackboard .cm-string-2 { color: #61CE3C; }
 .cm-s-blackboard .cm-meta { color: #D8FA3C; }
-.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 .cm-s-blackboard .cm-builtin { color: #8DA6CE; }
 .cm-s-blackboard .cm-tag { color: #8DA6CE; }
 .cm-s-blackboard .cm-attribute { color: #8DA6CE; }
 .cm-s-blackboard .cm-header { color: #FF6400; }
 .cm-s-blackboard .cm-hr { color: #AEAEAE; }
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
+.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 
 .cm-s-blackboard .CodeMirror-activeline-background {background: #3C3636 !important;}
 .cm-s-blackboard .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
\ No newline at end of file
diff --git a/theme/cobalt.css b/theme/cobalt.css
index 2cfa22d338..b4a917736b 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -12,10 +12,10 @@
 .cm-s-cobalt span.cm-meta { color: #ff9d00; }
 .cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
 .cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
-.cm-s-cobalt span.cm-error { color: #9d1e15; }
 .cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
 .cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
 .cm-s-cobalt span.cm-link { color: #845dc4; }
+.cm-s-cobalt span.cm-error { color: #9d1e15; }
 
 .cm-s-cobalt .CodeMirror-activeline-background {background: #002D57 !important;}
 .cm-s-cobalt .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
diff --git a/theme/eclipse.css b/theme/eclipse.css
index 13eb203258..317218e3d2 100644
--- a/theme/eclipse.css
+++ b/theme/eclipse.css
@@ -11,13 +11,13 @@
 .cm-s-eclipse span.cm-comment {color: #3F7F5F;}
 .cm-s-eclipse span.cm-string {color: #2A00FF;}
 .cm-s-eclipse span.cm-string-2 {color: #f50;}
-.cm-s-eclipse span.cm-error {color: #f00;}
 .cm-s-eclipse span.cm-qualifier {color: #555;}
 .cm-s-eclipse span.cm-builtin {color: #30a;}
 .cm-s-eclipse span.cm-bracket {color: #cc7;}
 .cm-s-eclipse span.cm-tag {color: #170;}
 .cm-s-eclipse span.cm-attribute {color: #00c;}
 .cm-s-eclipse span.cm-link {color: #219;}
+.cm-s-eclipse span.cm-error {color: #f00;}
 
 .cm-s-eclipse .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-eclipse .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/theme/elegant.css b/theme/elegant.css
index 67d663bd99..dd7df7b73c 100644
--- a/theme/elegant.css
+++ b/theme/elegant.css
@@ -6,8 +6,8 @@
 .cm-s-elegant span.cm-qualifier {color: #555;}
 .cm-s-elegant span.cm-keyword {color: #730;}
 .cm-s-elegant span.cm-builtin {color: #30a;}
-.cm-s-elegant span.cm-error {background-color: #fdd;}
 .cm-s-elegant span.cm-link {color: #762;}
+.cm-s-elegant span.cm-error {background-color: #fdd;}
 
 .cm-s-elegant .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-elegant .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index a4a3682647..db56b10842 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -10,7 +10,6 @@
 .cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
 .cm-s-erlang-dark span.cm-comment    { color: #77f; }
 .cm-s-erlang-dark span.cm-def        { color: #e7a; }
-.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 .cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
 .cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
 .cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
@@ -25,6 +24,7 @@
 .cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
 .cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
 .cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
+.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
 .cm-s-erlang-dark .CodeMirror-activeline-background {background: #013461 !important;}
 .cm-s-erlang-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index ad0bfebfc8..c32559663b 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -32,7 +32,6 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-string { color: #BCD279; }
 .cm-s-lesser-dark span.cm-string-2 {color: #f50;}
 .cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 .cm-s-lesser-dark span.cm-qualifier {color: #555;}
 .cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
 .cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
@@ -42,6 +41,7 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-quote {color: #090;}
 .cm-s-lesser-dark span.cm-hr {color: #999;}
 .cm-s-lesser-dark span.cm-link {color: #00c;}
+.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 
 .cm-s-lesser-dark .CodeMirror-activeline-background {background: #3C3A3A !important;}
 .cm-s-lesser-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/midnight.css b/theme/midnight.css
index 2824dfa5f7..66126322bd 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -32,10 +32,10 @@
 .cm-s-midnight span.cm-variable {color: #FFAA3E;}
 .cm-s-midnight span.cm-variable-2 {color: #FFAA3E;}
 .cm-s-midnight span.cm-def {color: #4DD;}
-.cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;}
 .cm-s-midnight span.cm-bracket {color: #D1EDFF;}
 .cm-s-midnight span.cm-tag {color: #449;}
 .cm-s-midnight span.cm-link {color: #AE81FF;}
+.cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;}
 
 .cm-s-midnight .CodeMirror-matchingbracket {
   text-decoration: underline;
diff --git a/theme/monokai.css b/theme/monokai.css
index ea68a59b50..7ac601a137 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -17,10 +17,10 @@
 .cm-s-monokai span.cm-variable {color: #a6e22e;}
 .cm-s-monokai span.cm-variable-2 {color: #9effff;}
 .cm-s-monokai span.cm-def {color: #fd971f;}
-.cm-s-monokai span.cm-error {background: #f92672; color: #f8f8f0;}
 .cm-s-monokai span.cm-bracket {color: #f8f8f2;}
 .cm-s-monokai span.cm-tag {color: #f92672;}
 .cm-s-monokai span.cm-link {color: #ae81ff;}
+.cm-s-monokai span.cm-error {background: #f92672; color: #f8f8f0;}
 
 .cm-s-monokai .CodeMirror-activeline-background {background: #373831 !important;}
 .cm-s-monokai .CodeMirror-matchingbracket {
diff --git a/theme/night.css b/theme/night.css
index e820239453..016e55ee7c 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -14,11 +14,11 @@
 .cm-s-night span.cm-meta { color: #7678e2; }
 .cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
 .cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
-.cm-s-night span.cm-error { color: #9d1e15; }
 .cm-s-night span.cm-bracket { color: #8da6ce; }
 .cm-s-night span.cm-comment { color: #6900a1; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
 .cm-s-night span.cm-link { color: #845dc4; }
+.cm-s-night span.cm-error { color: #9d1e15; }
 
 .cm-s-night .CodeMirror-activeline-background {background: #1C005A !important;}
 .cm-s-night .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index 4e1585c5d9..ddefc55d2d 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -25,10 +25,10 @@
 .cm-s-paraiso-dark span.cm-variable {color: #48b685;}
 .cm-s-paraiso-dark span.cm-variable-2 {color: #06b6ef;}
 .cm-s-paraiso-dark span.cm-def {color: #f99b15;}
-.cm-s-paraiso-dark span.cm-error {background: #ef6155; color: #8d8687;}
 .cm-s-paraiso-dark span.cm-bracket {color: #b9b6b0;}
 .cm-s-paraiso-dark span.cm-tag {color: #ef6155;}
 .cm-s-paraiso-dark span.cm-link {color: #815ba4;}
+.cm-s-paraiso-dark span.cm-error {background: #ef6155; color: #8d8687;}
 
 .cm-s-paraiso-dark .CodeMirror-activeline-background {background: #4D344A !important;}
 .cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index d24625942e..8afb14be45 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -25,10 +25,10 @@
 .cm-s-paraiso-light span.cm-variable {color: #48b685;}
 .cm-s-paraiso-light span.cm-variable-2 {color: #06b6ef;}
 .cm-s-paraiso-light span.cm-def {color: #f99b15;}
-.cm-s-paraiso-light span.cm-error {background: #ef6155; color: #776e71;}
 .cm-s-paraiso-light span.cm-bracket {color: #41323f;}
 .cm-s-paraiso-light span.cm-tag {color: #ef6155;}
 .cm-s-paraiso-light span.cm-link {color: #815ba4;}
+.cm-s-paraiso-light span.cm-error {background: #ef6155; color: #776e71;}
 
 .cm-s-paraiso-light .CodeMirror-activeline-background {background: #CFD1C4 !important;}
 .cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index ed470f0edc..b556139d7e 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -14,10 +14,10 @@
 .cm-s-rubyblue span.cm-meta { color: #F0F; }
 .cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
 .cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
-.cm-s-rubyblue span.cm-error { color: #AF2018; }
 .cm-s-rubyblue span.cm-bracket { color: #F0F; }
 .cm-s-rubyblue span.cm-link { color: #F4C20B; }
 .cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
 .cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
+.cm-s-rubyblue span.cm-error { color: #AF2018; }
 
 .cm-s-rubyblue .CodeMirror-activeline-background {background: #173047 !important;}
diff --git a/theme/solarized.css b/theme/solarized.css
index 1a87d2d801..dfa7f6af6d 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -67,11 +67,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .cm-string-2 { color: #b58900; }
 
 .cm-s-solarized .cm-meta { color: #859900; }
-.cm-s-solarized .cm-error,
-.cm-s-solarized .cm-invalidchar {
-  color: #586e75;
-  border-bottom: 1px dotted #dc322f;
-}
 .cm-s-solarized .cm-qualifier { color: #b58900; }
 .cm-s-solarized .cm-builtin { color: #d33682; }
 .cm-s-solarized .cm-bracket { color: #cb4b16; }
@@ -98,6 +93,11 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   content: "➤";   /*visualize tab character*/
   color: #586e75;
 }
+.cm-s-solarized .cm-error,
+.cm-s-solarized .cm-invalidchar {
+  color: #586e75;
+  border-bottom: 1px dotted #dc322f;
+}
 
 .cm-s-solarized.cm-s-dark .CodeMirror-selected {
   background: #073642;
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index 1ea26a1016..9e60b7b04b 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -16,11 +16,11 @@
 .cm-s-the-matrix span.cm-comment {color: #CCCCCC;}
 .cm-s-the-matrix span.cm-string {color: #39C;}
 .cm-s-the-matrix span.cm-meta {color: #C9F;}
-.cm-s-the-matrix span.cm-error {color: #FF0000;}
 .cm-s-the-matrix span.cm-qualifier {color: #FFF700;}
 .cm-s-the-matrix span.cm-builtin {color: #30a;}
 .cm-s-the-matrix span.cm-bracket {color: #cc7;}
 .cm-s-the-matrix span.cm-tag {color: #FFBD40;}
 .cm-s-the-matrix span.cm-attribute {color: #FFF700;}
+.cm-s-the-matrix span.cm-error {color: #FF0000;}
 
 .cm-s-the-matrix .CodeMirror-activeline-background {background: #040;}
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index 7ba545b9ff..85c2a4a78c 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -25,10 +25,10 @@
 .cm-s-tomorrow-night-eighties span.cm-variable {color: #99cc99;}
 .cm-s-tomorrow-night-eighties span.cm-variable-2 {color: #6699cc;}
 .cm-s-tomorrow-night-eighties span.cm-def {color: #f99157;}
-.cm-s-tomorrow-night-eighties span.cm-error {background: #f2777a; color: #6A6A6A;}
 .cm-s-tomorrow-night-eighties span.cm-bracket {color: #CCCCCC;}
 .cm-s-tomorrow-night-eighties span.cm-tag {color: #f2777a;}
 .cm-s-tomorrow-night-eighties span.cm-link {color: #a16a94;}
+.cm-s-tomorrow-night-eighties span.cm-error {background: #f2777a; color: #6A6A6A;}
 
 .cm-s-tomorrow-night-eighties .CodeMirror-activeline-background {background: #343600 !important;}
 .cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/twilight.css b/theme/twilight.css
index 0180b222c4..19d6abaddc 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -16,13 +16,13 @@
 .cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
 .cm-s-twilight .cm-string-2 { color:#bd6b18 } /*?*/
 .cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
-.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
 .cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
 .cm-s-twilight .cm-tag { color: #997643; } /**/
 .cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
 .cm-s-twilight .cm-header { color: #FF6400; }
 .cm-s-twilight .cm-hr { color: #AEAEAE; }
 .cm-s-twilight .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; } /**/
+.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
 
 .cm-s-twilight .CodeMirror-activeline-background {background: #27282E !important;}
 .cm-s-twilight .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index fdf7430cb9..0206225bf3 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -18,13 +18,13 @@
 .cm-s-vibrant-ink .cm-string { color:  #A5C25C }
 .cm-s-vibrant-ink .cm-string-2 { color: red }
 .cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
-.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 .cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
 .cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
 .cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
 .cm-s-vibrant-ink .cm-header { color: #FF6400; }
 .cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
 .cm-s-vibrant-ink .cm-link { color: blue; }
+.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 
 .cm-s-vibrant-ink .CodeMirror-activeline-background {background: #27282E !important;}
 .cm-s-vibrant-ink .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index e493d324af..4a0b2138ca 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -38,12 +38,12 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-comment {color: gray;}
 .cm-s-xq-dark span.cm-string {color: #9FEE00;}
 .cm-s-xq-dark span.cm-meta {color: yellow;}
-.cm-s-xq-dark span.cm-error {color: #f00;}
 .cm-s-xq-dark span.cm-qualifier {color: #FFF700;}
 .cm-s-xq-dark span.cm-builtin {color: #30a;}
 .cm-s-xq-dark span.cm-bracket {color: #cc7;}
 .cm-s-xq-dark span.cm-tag {color: #FFBD40;}
 .cm-s-xq-dark span.cm-attribute {color: #FFF700;}
+.cm-s-xq-dark span.cm-error {color: #f00;}
 
 .cm-s-xq-dark .CodeMirror-activeline-background {background: #27282E !important;}
 .cm-s-xq-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
\ No newline at end of file
diff --git a/theme/xq-light.css b/theme/xq-light.css
index 8cd815d24c..20b5c79614 100644
--- a/theme/xq-light.css
+++ b/theme/xq-light.css
@@ -32,12 +32,12 @@ THE SOFTWARE.
 .cm-s-xq-light span.cm-comment {color: #0080FF; font-style: italic;}
 .cm-s-xq-light span.cm-string {color: red;}
 .cm-s-xq-light span.cm-meta {color: yellow;}
-.cm-s-xq-light span.cm-error {color: #f00;}
 .cm-s-xq-light span.cm-qualifier {color: grey}
 .cm-s-xq-light span.cm-builtin {color: #7EA656;}
 .cm-s-xq-light span.cm-bracket {color: #cc7;}
 .cm-s-xq-light span.cm-tag {color: #3F7F7F;}
 .cm-s-xq-light span.cm-attribute {color: #7F007F;}
+.cm-s-xq-light span.cm-error {color: #f00;}
 
 .cm-s-xq-light .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-xq-light .CodeMirror-matchingbracket {outline:1px solid grey;color:black !important;background:yellow;}
\ No newline at end of file

From a6c2e01fce24c960c7bf58118fce337fd054a6db Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Sep 2013 22:20:08 +0200
Subject: [PATCH 0494/4742] [xml mode] Leave old style intact when adding error
 style

Fixes a problem with matchtags getting confused.

Closes #1841
---
 mode/xml/xml.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 53285c848c..3ab55f75d4 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -76,7 +76,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         tagName = "";
         var c;
         while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c;
-        if (!tagName) return "error";
+        if (!tagName) return "tag error";
         type = isClose ? "closeTag" : "openTag";
         state.tokenize = inTag;
         return "tag";
@@ -109,7 +109,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       type = "equals";
       return null;
     } else if (ch == "<") {
-      return "error";
+      stream.match(/^\/?\w*\/?>/);
+      return "tag error";
     } else if (/[\'\"]/.test(ch)) {
       state.tokenize = inAttribute(ch);
       state.stringStartCol = stream.column();
@@ -298,7 +299,9 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         }
       }
       state.startOfLine = false;
-      return setStyle || style;
+      if (setStyle)
+        style = setStyle == "error" ? style + " error" : setStyle;
+      return style;
     },
 
     indent: function(state, textAfter, fullLine) {

From 49c881a4f87c6a9bad0aecc54116ab2203fd2dba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Sep 2013 23:14:28 +0200
Subject: [PATCH 0495/4742] [xml mode] Leave tag tokenizer when encountering
 '<'

Issue #1841
---
 mode/xml/xml.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 3ab55f75d4..4f49e07faf 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -109,8 +109,9 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       type = "equals";
       return null;
     } else if (ch == "<") {
-      stream.match(/^\/?\w*\/?>/);
-      return "tag error";
+      state.tokenize = inText;
+      var next = state.tokenize(stream, state);
+      return next ? next + " error" : "error";
     } else if (/[\'\"]/.test(ch)) {
       state.tokenize = inAttribute(ch);
       state.stringStartCol = stream.column();

From 11f4a8a797816cfa8272718cc05baaf7be345d75 Mon Sep 17 00:00:00 2001
From: Darius Roberts <darius.roberts@gmail.com>
Date: Wed, 25 Sep 2013 09:25:50 -0400
Subject: [PATCH 0496/4742] adding gherkin mode

---
 AUTHORS                 |   1 +
 doc/compress.html       |   1 +
 mode/gherkin/gherkin.js | 170 ++++++++++++++++++++++++++++++++++++++++
 mode/gherkin/index.html |  48 ++++++++++++
 mode/index.html         |   1 +
 mode/meta.js            |   3 +-
 6 files changed, 223 insertions(+), 1 deletion(-)
 create mode 100644 mode/gherkin/gherkin.js
 create mode 100644 mode/gherkin/index.html

diff --git a/AUTHORS b/AUTHORS
index ad2ec99576..260c13a864 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -84,6 +84,7 @@ Ford_Lawnmower
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
+Glenn Jorde
 Glenn Ruehle
 Golevka
 Gordon Smith
diff --git a/doc/compress.html b/doc/compress.html
index 5ae53c4838..567c68f453 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -93,6 +93,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/fortran/fortran.js">fortran.js</option>
           <option value="http://codemirror.net/mode/gfm/gfm.js">gfm.js</option>
           <option value="http://codemirror.net/mode/gas/gas.js">gas.js</option>
+          <option value="http://codemirror.net/mode/gherkin/gherkin.js">gherkin.js</option>
           <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>
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
new file mode 100644
index 0000000000..580587a02b
--- /dev/null
+++ b/mode/gherkin/gherkin.js
@@ -0,0 +1,170 @@
+/*
+Gherkin mode - http://www.cukes.info/
+Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+*/
+
+// Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js
+//var Quotes = {
+//  SINGLE: 1,
+//  DOUBLE: 2
+//};
+
+//var regex = {
+//  keywords: /(Feature| {2}(Scenario|In order to|As|I)| {4}(Given|When|Then|And))/
+//};
+
+CodeMirror.defineMode("gherkin", function () {
+  return {
+    startState: function () {
+      return {
+        lineNumber: 0,
+        tableHeaderLine: null,
+        allowFeature: true,
+        allowBackground: false,
+        allowScenario: false,
+        allowSteps: false,
+        allowPlaceholders: false,
+        inMultilineArgument: false,
+        inMultilineString: false,
+        inMultilineTable: false
+      };
+    },
+    token: function (stream, state) {
+      if (stream.sol()) {
+        state.lineNumber++;
+      }
+      stream.eatSpace();
+
+      // INSIDE OF MULTILINE ARGUMENTS
+      if (state.inMultilineArgument) {
+
+        // STRING
+        if (state.inMultilineString) {
+          if (stream.match('"""')) {
+            state.inMultilineString = false;
+            state.inMultilineArgument = false;
+          } else {
+            stream.match(/.*/);
+          }
+          return "string";
+        }
+
+        // TABLE
+        if (state.inMultilineTable) {
+          // New table, assume first row is headers
+          if (state.tableHeaderLine === null) {
+            state.tableHeaderLine = state.lineNumber;
+          }
+
+          if (stream.match(/\|\s*/)) {
+            if (stream.eol()) {
+              state.inMultilineTable = false;
+            }
+            return "bracket";
+          } else {
+            stream.match(/[^\|]*/);
+            return state.tableHeaderLine === state.lineNumber ? "property" : "string";
+          }
+        }
+
+        // DETECT START
+        if (stream.match('"""')) {
+          // String
+          state.inMultilineString = true;
+          return "string";
+        } else if (stream.match("|")) {
+          // Table
+          state.inMultilineTable = true;
+          return "bracket";
+        } else {
+          // Or abort
+          state.inMultilineArgument = false;
+          state.tableHeaderLine = null;
+        }
+
+
+        return null;
+      }
+
+      // LINE COMMENT
+      if (stream.match(/#.*/)) {
+        return "comment";
+
+      // TAG
+      } else if (stream.match(/@\S+/)) {
+        return "def";
+
+      // FEATURE
+      } else if (state.allowFeature && stream.match(/Feature:/)) {
+        state.allowScenario = true;
+        state.allowBackground = true;
+        state.allowPlaceholders = false;
+        state.allowSteps = false;
+        return "keyword";
+
+      // BACKGROUND
+      } else if (state.allowBackground && stream.match("Background:")) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        return "keyword";
+
+      // SCENARIO OUTLINE
+      } else if (state.allowScenario && stream.match("Scenario Outline:")) {
+        state.allowPlaceholders = true;
+        state.allowSteps = true;
+        return "keyword";
+
+      // EXAMPLES
+      } else if (state.allowScenario && stream.match("Examples:")) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        state.inMultilineArgument = true;
+        return "keyword";
+
+      // SCENARIO
+      } else if (state.allowScenario && stream.match(/Scenario:/)) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        return "keyword";
+
+      // STEPS
+      } else if (state.allowSteps && stream.match(/(Given|When|Then|And|But)/)) {
+        return "keyword";
+
+      // INLINE STRING
+      } else if (!state.inMultilineArgument && stream.match(/"/)) {
+        stream.match(/.*?"/);
+        return "string";
+
+      // MULTILINE ARGUMENTS
+      } else if (state.allowSteps && stream.eat(":")) {
+        if (stream.match(/\s*$/)) {
+          state.inMultilineArgument = true;
+          return "keyword";
+        } else {
+          return null;
+        }
+
+      } else if (state.allowSteps && stream.match("<")) {
+        if (stream.match(/.*?>/)) {
+          return "property";
+        } else {
+          return null;
+        }
+
+      // Fall through
+      } else {
+        stream.eatWhile(/[^":<]/);
+      }
+
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-feature", "gherkin");
+if (!CodeMirror.mimeModes.hasOwnProperty("text/x-feature"))
+  CodeMirror.defineMIME("text/x-feature", "gherkin");
diff --git a/mode/gherkin/index.html b/mode/gherkin/index.html
new file mode 100644
index 0000000000..b76877acd6
--- /dev/null
+++ b/mode/gherkin/index.html
@@ -0,0 +1,48 @@
+<!doctype html>
+
+<title>CodeMirror: Gherkin 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="gherkin.js"></script>
+<style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Gherkin</a>
+  </ul>
+</div>
+
+<article>
+<h2>Gherkin mode</h2>
+<form><textarea id="code" name="code">
+Feature: Using Google
+  Background: 
+    Something something
+    Something else
+  Scenario: Has a homepage
+    When I navigate to the google home page
+    Then the home page should contain the menu and the search form
+  Scenario: Searching for a term 
+    When I navigate to the google home page
+    When I search for Tofu
+    Then the search results page is displayed
+    Then the search results page contains 10 individual search results
+    Then the search results contain a link to the wikipedia tofu page
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-feature</code>.</p>
+
+  </article>
diff --git a/mode/index.html b/mode/index.html
index 063e69b6c7..f72b1f0622 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -46,6 +46,7 @@ <h2>Language modes</h2>
       <li><a href="erlang/index.html">Erlang</a></li>
       <li><a href="fortran/index.html">Fortran</a></li>
       <li><a href="gas/index.html">Gas</a> (AT&amp;T-style assembly)</li>
+      <li><a href="gherkin/index.html">Gherkin</a></li>
       <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>
diff --git a/mode/meta.js b/mode/meta.js
index ce51c8ae19..fe5cd848a6 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -18,8 +18,9 @@ CodeMirror.modeInfo = [
   {name: 'Erlang', mime: 'text/x-erlang', mode: 'erlang'},
   {name: 'Fortran', mime: 'text/x-fortran', mode: 'fortran'},
   {name: 'Gas', mime: 'text/x-gas', mode: 'gas'},
+  {name: 'Gherkin', mime: 'text/x-feature', mode: 'gherkin'},
   {name: 'GitHub Flavored Markdown', mime: 'text/x-gfm', mode: 'gfm'},
-  {name: 'GO', mime: 'text/x-go', mode: 'go'},
+  {name: 'Go', mime: 'text/x-go', mode: 'go'},
   {name: 'Groovy', mime: 'text/x-groovy', mode: 'groovy'},
   {name: 'HAML', mime: 'text/x-haml', mode: 'haml'},
   {name: 'Haskell', mime: 'text/x-haskell', mode: 'haskell'},

From af772f9e730d3b15ec6eb2470b2f1ae94577a763 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 25 Sep 2013 21:30:49 +0200
Subject: [PATCH 0497/4742] [gherkin mode] Remove double mime definition

---
 mode/gherkin/gherkin.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index 580587a02b..dadb58362b 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -166,5 +166,3 @@ CodeMirror.defineMode("gherkin", function () {
 });
 
 CodeMirror.defineMIME("text/x-feature", "gherkin");
-if (!CodeMirror.mimeModes.hasOwnProperty("text/x-feature"))
-  CodeMirror.defineMIME("text/x-feature", "gherkin");

From 94ccdb5250e554932b8af1c4b026686ca287b90a Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 29 Sep 2013 21:01:06 -0400
Subject: [PATCH 0498/4742] [css] Fix indentation issue in SCSS mode with mixin
 variables (closes #1846).

Also improve handling of parentheses and curly braces.
---
 mode/css/css.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 4264bc606c..843c479fdd 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -259,8 +259,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       }
       else if (type == "}") {
         if (context == "interpolation") style = "operator";
-        state.stack.pop();
-        if (context == "propertyValue") state.stack.pop();
+				// Pop off end of array until { is reached
+        while(state.stack.length){
+          var removed = state.stack.pop();
+          if(removed.indexOf("{") > -1){
+						break;
+					}
+				}
       }
       else if (type == "interpolation") state.stack.push("interpolation");
       else if (type == "@media") state.stack.push("@media");
@@ -278,11 +283,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         else state.stack.push("(");
       }
       else if (type == ")") {
-        if (context == "propertyValue") {
-          // In @mediaType( without closing ; after propertyValue
-          state.stack.pop();
-        }
-        state.stack.pop();
+				// Pop off end of array until ( is reached
+        while(state.stack.length){
+          var removed = state.stack.pop();
+          if(removed.indexOf("(") > -1){
+						break;
+					}
+				}
       }
       else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
       else if (context == "propertyValue" && type == ";") state.stack.pop();
@@ -602,6 +609,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
         return ["variable", "variable"];
       },
+      ",": function(stream, state) {
+        if (state.stack[state.stack.length - 1] == "propertyValue") {
+          return ["operator", ";"];
+				}
+      },
       "/": function(stream, state) {
         if (stream.eat("/")) {
           stream.skipToEnd();

From e6ca873eb4fcdee4d523373eefbefd9479b248f2 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 29 Sep 2013 21:04:20 -0400
Subject: [PATCH 0499/4742] [css] Add tests for indentation

---
 mode/css/css.js       |  2 +-
 mode/css/scss_test.js |  6 +++++-
 mode/css/test.js      |  6 +++++-
 test/mode_test.js     | 24 ++++++++++++++++--------
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 843c479fdd..20d81a0619 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -3,7 +3,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
 
-  var indentUnit = config.indentUnit,
+  var indentUnit = config.indentUnit || config.tabSize || 2,
       hooks = parserConfig.hooks || {},
       atMediaTypes = parserConfig.atMediaTypes || {},
       atMediaFeatures = parserConfig.atMediaFeatures || {},
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 3644f63de8..bc2a078576 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -1,6 +1,7 @@
 (function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "text/x-scss");
+  var mode = CodeMirror.getMode({tabSize: 1}, "text/x-scss");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
+  function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
 
   MT('url_with_quotation',
     "[tag foo] { [property background][operator :][string-2 url]([string test.jpg]) }");
@@ -77,4 +78,7 @@
 
   MT('nested_structure_with_id_selector',
     "[tag p] { [builtin #hello] { [property color][operator :][keyword red]; } }");
+
+  IT('mixin',
+    "@mixin container[1 (][2 $a: 10][1 , ][2 $b: 10][1 , ][2 $c: 10]) [1 {]}");
 })();
diff --git a/mode/css/test.js b/mode/css/test.js
index 13fc04c1b3..6acd2f1c5f 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -1,6 +1,7 @@
 (function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "css");
+  var mode = CodeMirror.getMode({tabSize: 1}, "css");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+  function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   // Requires at least one media query
   MT("atMediaEmpty",
@@ -123,4 +124,7 @@
 
   MT("commentSGML",
      "[comment <!--comment-->]");
+		 
+  IT("tagSelector",
+    "strong, em [1 { background][2 : rgba][3 (255, 255, 0, .2][2 )][1 ;]}");
 })();
diff --git a/test/mode_test.js b/test/mode_test.js
index 1439cab32c..4b63cf517c 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -59,6 +59,13 @@
     return {tokens: tokens, plain: plain};
   }
 
+  test.indentation = function(name, mode, tokens, modeName) {
+    var data = parseTokens(tokens);
+    return test((modeName || mode.name) + "_indent_" + name, function() {
+      return compare(data.plain, data.tokens, mode, true);
+    });
+  };
+
   test.mode = function(name, mode, tokens, modeName) {
     var data = parseTokens(tokens);
     return test((modeName || mode.name) + "_" + name, function() {
@@ -66,7 +73,7 @@
     });
   };
 
-  function compare(text, expected, mode) {
+  function compare(text, expected, mode, compareIndentation) {
 
     var expectedOutput = [];
     for (var i = 0; i < expected.length; i += 2) {
@@ -75,7 +82,7 @@
       expectedOutput.push(sty, expected[i + 1]);
     }
 
-    var observedOutput = highlight(text, mode);
+    var observedOutput = highlight(text, mode, compareIndentation);
 
     var pass, passStyle = "";
     pass = highlightOutputsEqual(expectedOutput, observedOutput);
@@ -114,7 +121,7 @@
    *
    * @return array of [style, token] pairs
    */
-  function highlight(string, mode) {
+  function highlight(string, mode, compareIndentation) {
     var state = mode.startState()
 
     var lines = string.replace(/\r\n/g,'\n').split('\n');
@@ -125,14 +132,15 @@
       if (line == "" && mode.blankLine) mode.blankLine(state);
       /* Start copied code from CodeMirror.highlight */
       while (!stream.eol()) {
-        var style = mode.token(stream, state), substr = stream.current();
-        if (style && style.indexOf(" ") > -1) style = style.split(' ').sort().join(' ');
+				var compare = mode.token(stream, state), substr = stream.current();
+				if(compareIndentation) compare = mode.indent(state) || null;
+        else if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
 
-        stream.start = stream.pos;
-        if (pos && st[pos-2] == style && !newLine) {
+				stream.start = stream.pos;
+        if (pos && st[pos-2] == compare && !newLine) {
           st[pos-1] += substr;
         } else if (substr) {
-          st[pos++] = style; st[pos++] = substr;
+          st[pos++] = compare; st[pos++] = substr;
         }
         // Give up when line is ridiculously long
         if (stream.pos > 5000) {

From 8b7a8e0d8c394fd75283b44628cdeaa8f5504b5e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 30 Sep 2013 09:15:34 +0200
Subject: [PATCH 0500/4742] [css mode] Clean up whitespace

Kill all tabs.

Issue #1851
---
 mode/css/css.js  | 20 ++++++++++----------
 mode/css/test.js |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 20d81a0619..f47aba75a1 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -259,13 +259,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       }
       else if (type == "}") {
         if (context == "interpolation") style = "operator";
-				// Pop off end of array until { is reached
+        // Pop off end of array until { is reached
         while(state.stack.length){
           var removed = state.stack.pop();
           if(removed.indexOf("{") > -1){
-						break;
-					}
-				}
+            break;
+          }
+        }
       }
       else if (type == "interpolation") state.stack.push("interpolation");
       else if (type == "@media") state.stack.push("@media");
@@ -283,13 +283,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         else state.stack.push("(");
       }
       else if (type == ")") {
-				// Pop off end of array until ( is reached
+        // Pop off end of array until ( is reached
         while(state.stack.length){
           var removed = state.stack.pop();
           if(removed.indexOf("(") > -1){
-						break;
-					}
-				}
+            break;
+          }
+        }
       }
       else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
       else if (context == "propertyValue" && type == ";") state.stack.pop();
@@ -609,10 +609,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
         return ["variable", "variable"];
       },
-      ",": function(stream, state) {
+      ",": function(_stream, state) {
         if (state.stack[state.stack.length - 1] == "propertyValue") {
           return ["operator", ";"];
-				}
+        }
       },
       "/": function(stream, state) {
         if (stream.eat("/")) {
diff --git a/mode/css/test.js b/mode/css/test.js
index 6acd2f1c5f..43647833aa 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -124,7 +124,7 @@
 
   MT("commentSGML",
      "[comment <!--comment-->]");
-		 
+
   IT("tagSelector",
     "strong, em [1 { background][2 : rgba][3 (255, 255, 0, .2][2 )][1 ;]}");
 })();

From d0a82f474eadc042767eaed6ad72191861b01db2 Mon Sep 17 00:00:00 2001
From: Brett Zamir <brettz9@yahoo.com>
Date: Sun, 29 Sep 2013 15:06:31 -0700
Subject: [PATCH 0501/4742] [manual] Fix incorrect mention of class used by
 matchtag addon

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

diff --git a/doc/manual.html b/doc/manual.html
index 51ad9799bc..023e9bf0ea 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1761,7 +1761,7 @@ <h2>Addons</h2>
       <dt id="addon_matchtags"><a href="../addon/edit/matchtags.js"><code>edit/matchtags.js</code></a></dt>
       <dd>Defines an option <code>matchTags</code> that, when enabled,
       will cause the tags around the cursor to be highlighted (using
-      the <code>CodeMirror-matchingbrackets</code> class). Also
+      the <code>CodeMirror-matchingtag</code> class). Also
       defines
       a <a href="#commands">command</a> <code>toMatchingTag</code>,
       which you can bind a key to in order to jump to the tag mathing

From 92b92f9f8eee2b7e236c223ef864373cb501bc25 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 30 Sep 2013 20:45:52 +0200
Subject: [PATCH 0502/4742] [real-world uses] Add PrinBit, complete.ly

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 44183b650d..fc64e68c4c 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -33,6 +33,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://bluegriffon.org/">BlueGriffon</a> (HTML editor)</li>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
+      <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
       <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>
       <li><a href="http://www.codebugapp.com/">Codebug</a> (PHP Xdebug front-end)</li>
       <li><a href="https://github.com/angelozerr/CodeMirror-Eclipse">CodeMirror Eclipse</a> (embed CM in Eclipse)</li>
@@ -92,6 +93,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://clrhome.org/asm/">ORG</a> (z80 assembly IDE)</li>
       <li><a href="https://github.com/mamacdon/orion-codemirror">Orion-CodeMirror integration</a> (running CodeMirror modes in Orion)</li>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
+      <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
       <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>
       <li><a href="http://qyapp.com">QiYun web app platform</a></li>

From cfb624d1eaddb9beec71f1e5430d82b5ac7cd486 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Oct 2013 11:41:14 +0200
Subject: [PATCH 0503/4742] [real-world uses] Add webappfind

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

diff --git a/doc/realworld.html b/doc/realworld.html
index fc64e68c4c..c584d2afba 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -116,6 +116,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://uicod.com/">uiCod</a> (animation demo gallery and sharing)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
       <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a> (code viewer)</li>
+      <li><a href="https://github.com/brettz9/webappfind">webappfind</a> (windows file bindings for webapps)</li>
       <li><a href="http://www.webglacademy.com/">WebGL academy</a> (learning WebGL)</li>
       <li><a href="http://webglplayground.net/">WebGL playground</a></li>
       <li><a href="https://www.webkit.org/blog/2518/state-of-web-inspector/#source-code">WebKit Web inspector</a></li>

From 5681dd090fed2bdee832f25a345cdbe47b1c94a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Oct 2013 12:11:50 +0200
Subject: [PATCH 0504/4742] [closetag addon] Fix false positive close situation

Closes #1844
---
 addon/edit/closetag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 0bc3e8be17..d6a8fafd3c 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -72,7 +72,7 @@
   function autoCloseSlash(cm) {
     var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
     var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (tok.string.charAt(0) != "<" || inner.mode.name != "xml") return CodeMirror.Pass;
+    if (tok.string.charAt(0) != "<" || tok.start != pos.ch - 1 || inner.mode.name != "xml") return CodeMirror.Pass;
 
     var tagName = state.context && state.context.tagName;
     if (tagName) cm.replaceSelection("/" + tagName + ">", "end");

From 03f92641dded22fbeba815bb7fb8db14bbb9ba78 Mon Sep 17 00:00:00 2001
From: YNH Webdev <ynhwebdev@gmail.com>
Date: Fri, 27 Sep 2013 22:20:55 +0200
Subject: [PATCH 0505/4742] [eiffel mode] Add

---
 doc/compress.html      |   1 +
 mode/eiffel/eiffel.js  | 147 ++++++++++++++
 mode/eiffel/index.html | 430 +++++++++++++++++++++++++++++++++++++++++
 mode/index.html        |   1 +
 mode/meta.js           |   1 +
 5 files changed, 580 insertions(+)
 create mode 100644 mode/eiffel/eiffel.js
 create mode 100644 mode/eiffel/index.html

diff --git a/doc/compress.html b/doc/compress.html
index 567c68f453..a9c1bce81b 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -89,6 +89,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
           <option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
+          <option value="http://codemirror.net/mode/eiffel/eiffel.js">eiffel.js</option>
           <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
           <option value="http://codemirror.net/mode/fortran/fortran.js">fortran.js</option>
           <option value="http://codemirror.net/mode/gfm/gfm.js">gfm.js</option>
diff --git a/mode/eiffel/eiffel.js b/mode/eiffel/eiffel.js
new file mode 100644
index 0000000000..15f34a9325
--- /dev/null
+++ b/mode/eiffel/eiffel.js
@@ -0,0 +1,147 @@
+CodeMirror.defineMode("eiffel", function() {
+  function wordObj(words) {
+    var o = {};
+    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
+    return o;
+  }
+  var keywords = wordObj([
+    'note',
+    'across',
+    'when',
+    'variant',
+    'until',
+    'unique',
+    'undefine',
+    'then',
+    'strip',
+    'select',
+    'retry',
+    'rescue',
+    'require',
+    'rename',
+    'reference',
+    'redefine',
+    'prefix',
+    'once',
+    'old',
+    'obsolete',
+    'loop',
+    'local',
+    'like',
+    'is',
+    'inspect',
+    'infix',
+    'include',
+    'if',
+    'frozen',
+    'from',
+    'external',
+    'export',
+    'ensure',
+    'end',
+    'elseif',
+    'else',
+    'do',
+    'creation',
+    'create',
+    'check',
+    'alias',
+    'agent',
+    'separate',
+    'invariant',
+    'inherit',
+    'indexing',
+    'feature',
+    'expanded',
+    'deferred',
+    'class',
+    'Void',
+    'True',
+    'Result',
+    'Precursor',
+    'False',
+    'Current',
+    'create',
+    'attached',
+    'detachable',
+    'as',
+    'and',
+    'implies',
+    'not',
+    'or'
+  ]);
+  var operators = wordObj([":=", "and then","and", "or","<<",">>"]);
+  var curPunc;
+
+  function chain(newtok, stream, state) {
+    state.tokenize.push(newtok);
+    return newtok(stream, state);
+  }
+
+  function tokenBase(stream, state) {
+    curPunc = null;
+    if (stream.eatSpace()) return null;
+    var ch = stream.next();
+    if (ch == '"'||ch == "'") {
+      return chain(readQuoted(ch, "string"), stream, state);
+    } else if (ch == "-"&&stream.eat("-")) {
+      stream.skipToEnd();
+      return "comment";
+    } else if (ch == ":"&&stream.eat("=")) {
+      return "operator";
+    } else if (/[0-9]/.test(ch)) {
+      stream.eatWhile(/[xXbBCc0-9\.]/);
+      stream.eat(/[\?\!]/);
+      return "ident";
+    } else if (/[a-zA-Z_0-9]/.test(ch)) {
+      stream.eatWhile(/[a-zA-Z_0-9]/);
+      stream.eat(/[\?\!]/);
+      return "ident";
+    } else if (/[=+\-\/*^%<>~]/.test(ch)) {
+      stream.eatWhile(/[=+\-\/*^%<>~]/);
+      return "operator";
+    } else {
+      return null;
+    }
+  }
+
+  function readQuoted(quote, style,  unescaped) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && (unescaped || !escaped)) {
+          state.tokenize.pop();
+          break;
+        }
+        escaped = !escaped && ch == "%";
+      }
+      return style;
+    };
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: [tokenBase]};
+    },
+
+    token: function(stream, state) {
+      var style = state.tokenize[state.tokenize.length-1](stream, state);
+      if (style == "ident") {
+        var word = stream.current();
+        style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
+          : operators.propertyIsEnumerable(stream.current()) ? "operator"
+          : /^[A-Z][A-Z_0-9]*$/g.test(word) ? "tag"
+          : /^0[bB][0-1]+$/g.test(word) ? "number"
+          : /^0[cC][0-7]+$/g.test(word) ? "number"
+          : /^0[xX][a-fA-F0-9]+$/g.test(word) ? "number"
+          : /^([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+)$/g.test(word) ? "number"
+          : /^[0-9]+$/g.test(word) ? "number"
+          : "variable";
+      }
+      return style;
+    },
+    lineComment: "--"
+  };
+});
+
+CodeMirror.defineMIME("text/x-eiffel", "eiffel");
diff --git a/mode/eiffel/index.html b/mode/eiffel/index.html
new file mode 100644
index 0000000000..5d395a05cd
--- /dev/null
+++ b/mode/eiffel/index.html
@@ -0,0 +1,430 @@
+<!doctype html>
+
+<title>CodeMirror: Eiffel mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/neat.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="eiffel.js"></script>
+<style>
+      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+      .cm-s-default span.cm-arrow { color: red; }
+    </style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Eiffel</a>
+  </ul>
+</div>
+
+<article>
+<h2>Eiffel mode</h2>
+<form><textarea id="code" name="code">
+note
+    description: "[
+        Project-wide universal properties.
+        This class is an ancestor to all developer-written classes.
+        ANY may be customized for individual projects or teams.
+        ]"
+
+    library: "Free implementation of ELKS library"
+    status: "See notice at end of class."
+    legal: "See notice at end of class."
+    date: "$Date: 2013-01-25 11:49:00 -0800 (Fri, 25 Jan 2013) $"
+    revision: "$Revision: 712 $"
+
+class
+    ANY
+
+feature -- Customization
+
+feature -- Access
+
+    generator: STRING
+            -- Name of current object's generating class
+            -- (base class of the type of which it is a direct instance)
+        external
+            "built_in"
+        ensure
+            generator_not_void: Result /= Void
+            generator_not_empty: not Result.is_empty
+        end
+
+    generating_type: TYPE [detachable like Current]
+            -- Type of current object
+            -- (type of which it is a direct instance)
+        do
+            Result := {detachable like Current}
+        ensure
+            generating_type_not_void: Result /= Void
+        end
+
+feature -- Status report
+
+    conforms_to (other: ANY): BOOLEAN
+            -- Does type of current object conform to type
+            -- of `other' (as per Eiffel: The Language, chapter 13)?
+        require
+            other_not_void: other /= Void
+        external
+            "built_in"
+        end
+
+    same_type (other: ANY): BOOLEAN
+            -- Is type of current object identical to type of `other'?
+        require
+            other_not_void: other /= Void
+        external
+            "built_in"
+        ensure
+            definition: Result = (conforms_to (other) and
+                                        other.conforms_to (Current))
+        end
+
+feature -- Comparison
+
+    is_equal (other: like Current): BOOLEAN
+            -- Is `other' attached to an object considered
+            -- equal to current object?
+        require
+            other_not_void: other /= Void
+        external
+            "built_in"
+        ensure
+            symmetric: Result implies other ~ Current
+            consistent: standard_is_equal (other) implies Result
+        end
+
+    frozen standard_is_equal (other: like Current): BOOLEAN
+            -- Is `other' attached to an object of the same type
+            -- as current object, and field-by-field identical to it?
+        require
+            other_not_void: other /= Void
+        external
+            "built_in"
+        ensure
+            same_type: Result implies same_type (other)
+            symmetric: Result implies other.standard_is_equal (Current)
+        end
+
+    frozen equal (a: detachable ANY; b: like a): BOOLEAN
+            -- Are `a' and `b' either both void or attached
+            -- to objects considered equal?
+        do
+            if a = Void then
+                Result := b = Void
+            else
+                Result := b /= Void and then
+                            a.is_equal (b)
+            end
+        ensure
+            definition: Result = (a = Void and b = Void) or else
+                        ((a /= Void and b /= Void) and then
+                        a.is_equal (b))
+        end
+
+    frozen standard_equal (a: detachable ANY; b: like a): BOOLEAN
+            -- Are `a' and `b' either both void or attached to
+            -- field-by-field identical objects of the same type?
+            -- Always uses default object comparison criterion.
+        do
+            if a = Void then
+                Result := b = Void
+            else
+                Result := b /= Void and then
+                            a.standard_is_equal (b)
+            end
+        ensure
+            definition: Result = (a = Void and b = Void) or else
+                        ((a /= Void and b /= Void) and then
+                        a.standard_is_equal (b))
+        end
+
+    frozen is_deep_equal (other: like Current): BOOLEAN
+            -- Are `Current' and `other' attached to isomorphic object structures?
+        require
+            other_not_void: other /= Void
+        external
+            "built_in"
+        ensure
+            shallow_implies_deep: standard_is_equal (other) implies Result
+            same_type: Result implies same_type (other)
+            symmetric: Result implies other.is_deep_equal (Current)
+        end
+
+    frozen deep_equal (a: detachable ANY; b: like a): BOOLEAN
+            -- Are `a' and `b' either both void
+            -- or attached to isomorphic object structures?
+        do
+            if a = Void then
+                Result := b = Void
+            else
+                Result := b /= Void and then a.is_deep_equal (b)
+            end
+        ensure
+            shallow_implies_deep: standard_equal (a, b) implies Result
+            both_or_none_void: (a = Void) implies (Result = (b = Void))
+            same_type: (Result and (a /= Void)) implies (b /= Void and then a.same_type (b))
+            symmetric: Result implies deep_equal (b, a)
+        end
+
+feature -- Duplication
+
+    frozen twin: like Current
+            -- New object equal to `Current'
+            -- `twin' calls `copy'; to change copying/twinning semantics, redefine `copy'.
+        external
+            "built_in"
+        ensure
+            twin_not_void: Result /= Void
+            is_equal: Result ~ Current
+        end
+
+    copy (other: like Current)
+            -- Update current object using fields of object attached
+            -- to `other', so as to yield equal objects.
+        require
+            other_not_void: other /= Void
+            type_identity: same_type (other)
+        external
+            "built_in"
+        ensure
+            is_equal: Current ~ other
+        end
+
+    frozen standard_copy (other: like Current)
+            -- Copy every field of `other' onto corresponding field
+            -- of current object.
+        require
+            other_not_void: other /= Void
+            type_identity: same_type (other)
+        external
+            "built_in"
+        ensure
+            is_standard_equal: standard_is_equal (other)
+        end
+
+    frozen clone (other: detachable ANY): like other
+            -- Void if `other' is void; otherwise new object
+            -- equal to `other'
+            --
+            -- For non-void `other', `clone' calls `copy';
+            -- to change copying/cloning semantics, redefine `copy'.
+        obsolete
+            "Use `twin' instead."
+        do
+            if other /= Void then
+                Result := other.twin
+            end
+        ensure
+            equal: Result ~ other
+        end
+
+    frozen standard_clone (other: detachable ANY): like other
+            -- Void if `other' is void; otherwise new object
+            -- field-by-field identical to `other'.
+            -- Always uses default copying semantics.
+        obsolete
+            "Use `standard_twin' instead."
+        do
+            if other /= Void then
+                Result := other.standard_twin
+            end
+        ensure
+            equal: standard_equal (Result, other)
+        end
+
+    frozen standard_twin: like Current
+            -- New object field-by-field identical to `other'.
+            -- Always uses default copying semantics.
+        external
+            "built_in"
+        ensure
+            standard_twin_not_void: Result /= Void
+            equal: standard_equal (Result, Current)
+        end
+
+    frozen deep_twin: like Current
+            -- New object structure recursively duplicated from Current.
+        external
+            "built_in"
+        ensure
+            deep_twin_not_void: Result /= Void
+            deep_equal: deep_equal (Current, Result)
+        end
+
+    frozen deep_clone (other: detachable ANY): like other
+            -- Void if `other' is void: otherwise, new object structure
+            -- recursively duplicated from the one attached to `other'
+        obsolete
+            "Use `deep_twin' instead."
+        do
+            if other /= Void then
+                Result := other.deep_twin
+            end
+        ensure
+            deep_equal: deep_equal (other, Result)
+        end
+
+    frozen deep_copy (other: like Current)
+            -- Effect equivalent to that of:
+            --      `copy' (`other' . `deep_twin')
+        require
+            other_not_void: other /= Void
+        do
+            copy (other.deep_twin)
+        ensure
+            deep_equal: deep_equal (Current, other)
+        end
+
+feature {NONE} -- Retrieval
+
+    frozen internal_correct_mismatch
+            -- Called from runtime to perform a proper dynamic dispatch on `correct_mismatch'
+            -- from MISMATCH_CORRECTOR.
+        local
+            l_msg: STRING
+            l_exc: EXCEPTIONS
+        do
+            if attached {MISMATCH_CORRECTOR} Current as l_corrector then
+                l_corrector.correct_mismatch
+            else
+                create l_msg.make_from_string ("Mismatch: ")
+                create l_exc
+                l_msg.append (generating_type.name)
+                l_exc.raise_retrieval_exception (l_msg)
+            end
+        end
+
+feature -- Output
+
+    io: STD_FILES
+            -- Handle to standard file setup
+        once
+            create Result
+            Result.set_output_default
+        ensure
+            io_not_void: Result /= Void
+        end
+
+    out: STRING
+            -- New string containing terse printable representation
+            -- of current object
+        do
+            Result := tagged_out
+        ensure
+            out_not_void: Result /= Void
+        end
+
+    frozen tagged_out: STRING
+            -- New string containing terse printable representation
+            -- of current object
+        external
+            "built_in"
+        ensure
+            tagged_out_not_void: Result /= Void
+        end
+
+    print (o: detachable ANY)
+            -- Write terse external representation of `o'
+            -- on standard output.
+        do
+            if o /= Void then
+                io.put_string (o.out)
+            end
+        end
+
+feature -- Platform
+
+    Operating_environment: OPERATING_ENVIRONMENT
+            -- Objects available from the operating system
+        once
+            create Result
+        ensure
+            operating_environment_not_void: Result /= Void
+        end
+
+feature {NONE} -- Initialization
+
+    default_create
+            -- Process instances of classes with no creation clause.
+            -- (Default: do nothing.)
+        do
+        end
+
+feature -- Basic operations
+
+    default_rescue
+            -- Process exception for routines with no Rescue clause.
+            -- (Default: do nothing.)
+        do
+        end
+
+    frozen do_nothing
+            -- Execute a null action.
+        do
+        end
+
+    frozen default: detachable like Current
+            -- Default value of object's type
+        do
+        end
+
+    frozen default_pointer: POINTER
+            -- Default value of type `POINTER'
+            -- (Avoid the need to write `p'.`default' for
+            -- some `p' of type `POINTER'.)
+        do
+        ensure
+            -- Result = Result.default
+        end
+
+    frozen as_attached: attached like Current
+            -- Attached version of Current
+            -- (Can be used during transitional period to convert
+            -- non-void-safe classes to void-safe ones.)
+        do
+            Result := Current
+        end
+
+invariant
+    reflexive_equality: standard_is_equal (Current)
+    reflexive_conformance: conforms_to (Current)
+
+note
+    copyright: "Copyright (c) 1984-2012, Eiffel Software and others"
+    license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+    source: "[
+            Eiffel Software
+            5949 Hollister Ave., Goleta, CA 93117 USA
+            Telephone 805-685-1006, Fax 805-685-6869
+            Website http://www.eiffel.com
+            Customer support http://support.eiffel.com
+        ]"
+
+end
+
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: "text/x-eiffel",
+        tabMode: "indent",
+        indentUnit: 4,
+        lineNumbers: true,
+        theme: "neat"
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-eiffel</code>.</p>
+ 
+ <p> Created by <a href="https://github.com/ynh">YNH</a>.</p>
+  </article>
diff --git a/mode/index.html b/mode/index.html
index f72b1f0622..cbdef24f09 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -43,6 +43,7 @@ <h2>Language modes</h2>
       <li><a href="diff/index.html">diff</a></li>
       <li><a href="dtd/index.html">DTD</a></li>
       <li><a href="ecl/index.html">ECL</a></li>
+      <li><a href="eiffel/index.html">Eiffel</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
       <li><a href="fortran/index.html">Fortran</a></li>
       <li><a href="gas/index.html">Gas</a> (AT&amp;T-style assembly)</li>
diff --git a/mode/meta.js b/mode/meta.js
index fe5cd848a6..f6bbd1b45c 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -15,6 +15,7 @@ CodeMirror.modeInfo = [
   {name: 'diff', mime: 'text/x-diff', mode: 'diff'},
   {name: 'DTD', mime: 'application/xml-dtd', mode: 'dtd'},
   {name: 'ECL', mime: 'text/x-ecl', mode: 'ecl'},
+  {name: 'Eiffel', mime: 'text/x-eiffel', mode: 'eiffel'},
   {name: 'Erlang', mime: 'text/x-erlang', mode: 'erlang'},
   {name: 'Fortran', mime: 'text/x-fortran', mode: 'fortran'},
   {name: 'Gas', mime: 'text/x-gas', mode: 'gas'},

From a52ea9c10eade7b9ca269ac005893fccfa0b0c88 Mon Sep 17 00:00:00 2001
From: Stanislav Oaserele <soaserele@gmail.com>
Date: Tue, 1 Oct 2013 13:38:53 +0300
Subject: [PATCH 0506/4742] [xml-hint addon] Allow attribute values to be
 dynamically computed

---
 addon/hint/xml-hint.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index b6c1da2ce2..a721743449 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -37,6 +37,7 @@
                                  Pos(cur.line, token.type == "string" ? token.start : token.end));
         var atName = before.match(/([^\s\u00a0=<>\"\']+)=$/), atValues;
         if (!atName || !attrs.hasOwnProperty(atName[1]) || !(atValues = attrs[atName[1]])) return;
+        if (typeof atValues == 'function') atValues = atValues.call(this, cm); // Functions can be used to supply values for autocomplete widget
         if (token.type == "string") {
           prefix = token.string;
           if (/['"]/.test(token.string.charAt(0))) {

From 496c545692b8280b61f6a0dcc7f6ab112f2da8bc Mon Sep 17 00:00:00 2001
From: Ian Dickinson <i.j.dickinson@gmail.com>
Date: Tue, 1 Oct 2013 10:50:34 +0100
Subject: [PATCH 0507/4742] [foldcode addon] Add a css file for marker and
 gutter rules

---
 addon/fold/foldgutter.css | 21 +++++++++++++++++++++
 demo/folding.html         | 28 ++++------------------------
 doc/manual.html           | 11 +++++++++--
 3 files changed, 34 insertions(+), 26 deletions(-)
 create mode 100644 addon/fold/foldgutter.css

diff --git a/addon/fold/foldgutter.css b/addon/fold/foldgutter.css
new file mode 100644
index 0000000000..49805393d0
--- /dev/null
+++ b/addon/fold/foldgutter.css
@@ -0,0 +1,21 @@
+.CodeMirror-foldmarker {
+  color: blue;
+  text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
+  font-family: arial;
+  line-height: .3;
+  cursor: pointer;
+}
+.CodeMirror-foldgutter {
+  width: .7em;
+}
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded {
+  color: #555;
+  cursor: pointer;
+}
+.CodeMirror-foldgutter-open:after {
+  content: "\25BE";
+}
+.CodeMirror-foldgutter-folded:after {
+  content: "\25B8";
+}
diff --git a/demo/folding.html b/demo/folding.html
index 29ddb15cb1..671710067b 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -5,6 +5,7 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/fold/fold-gutter.css" />
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/fold/foldcode.js"></script>
 <script src="../addon/fold/foldgutter.js"></script>
@@ -15,28 +16,7 @@
 <script src="../mode/xml/xml.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .CodeMirror-foldmarker {
-        color: blue;
-        text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
-        font-family: arial;
-        line-height: .3;
-        cursor: pointer;
-      }
-      .CodeMirror-foldgutter {
-        width: .7em;
-      }
-      .CodeMirror-foldgutter-open,
-      .CodeMirror-foldgutter-folded {
-        color: #555;
-        cursor: pointer;
-      }
-      .CodeMirror-foldgutter-open:after {
-        content: "\25BE";
-      }
-      .CodeMirror-foldgutter-folded:after {
-        content: "\25B8";
-      }
-    </style>
+</style>
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
 
@@ -56,7 +36,7 @@ <h2>Code Folding Demo</h2>
       <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
       <div style="max-width: 50em">HTML:<br><textarea id="code-html" name="code-html"></textarea></div>
     </form>
-    <script id="script"> 
+    <script id="script">
 /*
  * Demonstration of code folding
  */
@@ -75,7 +55,7 @@ <h2>Code Folding Demo</h2>
     extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
     foldGutter: {
     	rangeFinder: new CodeMirror.fold.combine(CodeMirror.fold.brace, CodeMirror.fold.comment)
-    },    
+    },
     gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   });
   editor.foldCode(CodeMirror.Pos(8, 0));
diff --git a/doc/manual.html b/doc/manual.html
index 023e9bf0ea..c11605810d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1867,7 +1867,14 @@ <h2>Addons</h2>
       giving it the class <code>CodeMirror-foldgutter</code> or
       something else if you configure the addon to use a different
       class, and this addon will show markers next to folded and
-      foldable blocks, and handle clicks in this gutter. The option
+      foldable blocks, and handle clicks in this gutter. Note that
+      CSS styles should be applied to make the gutter, and the fold
+      markers within it, visible. A default set of CSS styles are
+      available in:
+      <a href="../addon/fold/foldgutter.css">
+        <code>addon/fold/foldgutter.css</code>
+      </a>.
+      The option
       can be either set to <code>true</code>, or an object containing
       the following optional option fields:
       <dl>
@@ -1875,7 +1882,7 @@ <h2>Addons</h2>
         <dd>The CSS class of the gutter. Defaults
         to <code>"CodeMirror-foldgutter"</code>. You will have to
         style this yourself to give it a width (and possibly a
-        background).</dd>
+        background). See the default gutter style rules above.</dd>
         <dt><code><strong>indicatorOpen</strong>: string | Element</code></dt>
         <dd>A CSS class or DOM element to be used as the marker for
         open, foldable blocks. Defaults

From c89b30d4d101a43f0e1a4f4a85c876dfead0210c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Oct 2013 15:51:56 +0200
Subject: [PATCH 0508/4742] [folding demo] Repair

---
 demo/folding.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/folding.html b/demo/folding.html
index 671710067b..9461801277 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/fold/fold-gutter.css" />
+<link rel="stylesheet" href="../addon/fold/foldgutter.css" />
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/fold/foldcode.js"></script>
 <script src="../addon/fold/foldgutter.js"></script>

From 0fe898955602b48a81121d664245260486281910 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Oct 2013 15:52:52 +0200
Subject: [PATCH 0509/4742] Disable pointer events on scrollbars when on OS X +
 zero-width scrollbars

---
 lib/codemirror.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 19c2d76005..be77c473f6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -353,8 +353,10 @@ window.CodeMirror = (function() {
       d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
     } else d.gutterFiller.style.display = "";
 
-    if (mac_geLion && scrollbarWidth(d.measure) === 0)
+    if (mac_geLion && scrollbarWidth(d.measure) === 0) {
       d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px";
+      d.scrollbarV.style.pointerEvents = d.scrollbarH.style.pointerEvents = "none";
+    }
   }
 
   function visibleLines(display, doc, viewPort) {

From 99192a96f44e55eb395ad007330168e24d866c8d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Oct 2013 17:53:19 +0200
Subject: [PATCH 0510/4742] Fix bad interaction between precise param to
 getTokenAt and parser state caching

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index be77c473f6..ac80334e92 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -937,8 +937,9 @@ window.CodeMirror = (function() {
   // smallest indentation, which tends to need the least context to
   // parse correctly.
   function findStartLine(cm, n, precise) {
-    var minindent, minline, doc = cm.doc, maxScan = cm.doc.mode.innerMode ? 1000 : 100;
-    for (var search = n, lim = n - maxScan; search > lim; --search) {
+    var minindent, minline, doc = cm.doc;
+    var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
+    for (var search = n; search > lim; --search) {
       if (search <= doc.first) return doc.first;
       var line = getLine(doc, search - 1);
       if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
@@ -963,6 +964,7 @@ window.CodeMirror = (function() {
       line.stateAfter = save ? copyState(doc.mode, state) : null;
       ++pos;
     });
+    if (precise) doc.frontier = pos;
     return state;
   }
 

From 6e101a88008c552aee34343dc19fae34d76fc4b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Oct 2013 21:29:10 +0200
Subject: [PATCH 0511/4742] [real-world uses] Add Liveweave

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

diff --git a/doc/realworld.html b/doc/realworld.html
index c584d2afba..750a6a12e6 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -81,6 +81,7 @@ <h2>CodeMirror real-world uses</h2>
       <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://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light Table</a> (experimental IDE)</li>
+      <li><a href="http://liveweave.com/">Liveweave</a> (HTML/CSS/JS scratchpad)</li>
       <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>
       <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
       <li><a href="http://www.iunbug.com/mihtool">MIHTool</a> (iOS web-app debugging tool)</li>

From 23ce2a2c0927671d5a04d6fb0f4c08e383841db1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 6 Oct 2013 09:55:40 +0200
Subject: [PATCH 0512/4742] [real-world uses] Add Puzzlescript

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 750a6a12e6..95ec975e63 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -96,6 +96,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
       <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
+      <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>
       <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>
       <li><a href="http://qyapp.com">QiYun web app platform</a></li>
       <li><a href="http://ariya.ofilabs.com/2011/09/hybrid-webnative-desktop-codemirror.html">Qt+Webkit integration</a> (building a desktop CodeMirror app)</li>

From 82b62f3bce55d081f9a7c2f9bc5ed0f11f26d7b3 Mon Sep 17 00:00:00 2001
From: Brandon Wamboldt <brandon.wamboldt@gmail.com>
Date: Sun, 6 Oct 2013 22:47:16 -0300
Subject: [PATCH 0513/4742] Remove bower version

---
 bower.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bower.json b/bower.json
index 8259431c4d..66e049dfbe 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,5 @@
 {
   "name": "CodeMirror",
-  "version": "3.18.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",

From 06220c57174ce15448d426c0e699bf47da311163 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Oct 2013 10:35:24 +0200
Subject: [PATCH 0514/4742] Add swapDoc event, make foldgutter addon listen for
 it

Issue #1865
---
 addon/fold/foldgutter.js | 2 ++
 doc/manual.html          | 5 +++++
 lib/codemirror.js        | 1 +
 3 files changed, 8 insertions(+)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index b809c93f56..e3c52bc229 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -10,6 +10,7 @@
       cm.off("viewportChange", onViewportChange);
       cm.off("fold", onFold);
       cm.off("unfold", onFold);
+      cm.off("swapDoc", updateInViewport);
     }
     if (val) {
       cm.state.foldGutter = new State(parseOptions(val));
@@ -19,6 +20,7 @@
       cm.on("viewportChange", onViewportChange);
       cm.on("fold", onFold);
       cm.on("unfold", onFold);
+      cm.on("swapDoc", updateInViewport);
     }
   });
 
diff --git a/doc/manual.html b/doc/manual.html
index c11605810d..f15ec80c0c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -507,6 +507,11 @@ <h2>Events</h2>
       factor). The <code>from</code> and <code>to</code> arguments
       give the new start and end of the viewport.</dd>
 
+      <dt id="event_swapDoc"><code><strong>"swapDoc"</strong> (instance: CodeMirror, oldDoc: Doc)</code></dt>
+      <dd>This is signalled when the editor's document is replaced
+      using the <a href="#swapDoc"><code>swapDoc</code></a>
+      method.</dd>
+
       <dt id="event_gutterClick"><code><strong>"gutterClick"</strong> (instance: CodeMirror, line: integer, gutter: string, clickEvent: Event)</code></dt>
       <dd>Fires when the editor gutter (the line-number area) is
       clicked. Will pass the editor instance as first argument, the
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ac80334e92..ae257805f0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3215,6 +3215,7 @@ window.CodeMirror = (function() {
       clearCaches(this);
       resetInput(this, true);
       updateScrollPos(this, doc.scrollLeft, doc.scrollTop);
+      signalLater(this, "swapDoc", this, old);
       return old;
     }),
 

From b6ff3b98d67434e017330dfbb8d5144581260fea Mon Sep 17 00:00:00 2001
From: wenli <spacelis@gmail.com>
Date: Fri, 4 Oct 2013 12:58:17 +0200
Subject: [PATCH 0515/4742] [vim keymap] Fix yanking the last line.

When the last line in an editor has no newline char at the end, yanking it
line-wise should append one. So the last char will not be dropped when
pasting it.
---
 keymap/vim.js    | 3 +++
 test/vim_test.js | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9ad17af31c..74a7f560f2 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -695,6 +695,9 @@
         if (linewise && text.charAt(0) == '\n') {
           text = text.slice(1) + '\n';
         }
+        if(linewise && text.charAt(text.length - 1) !== '\n'){
+          text += '\n';
+        }
         // Lowercase and uppercase registers refer to the same register.
         // Uppercase just means append.
         var register = this.isValidRegister(registerName) ?
diff --git a/test/vim_test.js b/test/vim_test.js
index ec0fae06c0..16e853786c 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1175,6 +1175,13 @@ testVim('p_line', function(cm, vim, helpers) {
   eq('___\n  a\nd\n  a\nd', cm.getValue());
   helpers.assertCursorAt(1, 2);
 }, { value: '___' });
+testVim('p_lastline', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.getRegisterController().pushText('"', 'yank', '  a\nd', true);
+  helpers.doKeys('2', 'p');
+  eq('___\n  a\nd\n  a\nd', cm.getValue());
+  helpers.assertCursorAt(1, 2);
+}, { value: '___' });
 testVim('P', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);

From 2a82cfbffe50b51b0d028b7f681576fee19957ba Mon Sep 17 00:00:00 2001
From: Maxim Kraev <maxim.kraev@gmail.com>
Date: Thu, 3 Oct 2013 08:15:16 +0000
Subject: [PATCH 0516/4742] [less mode] Support for the comments addon

---
 mode/less/less.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/less/less.js b/mode/less/less.js
index 8384b3cd76..32c75db496 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -247,7 +247,10 @@ CodeMirror.defineMode("less", function(config) {
       return state.baseIndent + n * indentUnit;
     },
 
-    electricChars: "}"
+    electricChars: "}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 

From c3e84e67c4c1557e8e202747842519da72655b7c Mon Sep 17 00:00:00 2001
From: Brandon Wamboldt <brandon.wamboldt@gmail.com>
Date: Sun, 6 Oct 2013 22:08:15 -0300
Subject: [PATCH 0517/4742] [smartymixed mode] Smarty tags in HTML attributes
 break

Closes #1768
---
 mode/smartymixed/index.html     | 2 +-
 mode/smartymixed/smartymixed.js | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 mode/smartymixed/smartymixed.js

diff --git a/mode/smartymixed/index.html b/mode/smartymixed/index.html
index 3de9477768..47c805faca 100644
--- a/mode/smartymixed/index.html
+++ b/mode/smartymixed/index.html
@@ -38,7 +38,7 @@ <h2>Smarty mixed mode</h2>
 <head>
   <title>{$title|htmlspecialchars|truncate:30}</title>
 </head>
-<body>
+<body class="{$bodyclass}">
   {* Multiline smarty
   * comment, no {$variables} here
   *}
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
old mode 100644
new mode 100755
index c5d008885a..a033ab04fa
--- a/mode/smartymixed/smartymixed.js
+++ b/mode/smartymixed/smartymixed.js
@@ -58,7 +58,12 @@ CodeMirror.defineMode("smartymixed", function(config) {
 
   parsers = {
     html: function(stream, state) {
-      if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false)) {
+      if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && state.htmlMixedState.htmlState.tagName === null) {
+        state.tokenize = parsers.smarty;
+        state.localMode = smartyMode;
+        state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
+        return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState));
+      } else if (!state.inLiteral && stream.match(settings.leftDelimiter, false)) {
         state.tokenize = parsers.smarty;
         state.localMode = smartyMode;
         state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));

From 64e4c6aee01b2f496a1d45ce6a61d998ebf3e57c Mon Sep 17 00:00:00 2001
From: Brandon Wamboldt <brandon.wamboldt@gmail.com>
Date: Mon, 7 Oct 2013 12:48:07 -0300
Subject: [PATCH 0518/4742] [php mode] Add new built-in keywords/functions

---
 mode/php/php.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 mode/php/php.js

diff --git a/mode/php/php.js b/mode/php/php.js
old mode 100644
new mode 100755
index fa0db5b1fe..3555b8b145
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -18,10 +18,10 @@
                        "for foreach function global goto if implements interface instanceof namespace " +
                        "new or private protected public static switch throw trait try use var while xor " +
                        "die echo empty exit eval include include_once isset list require require_once return " +
-                       "print unset __halt_compiler self static parent"),
-    blockKeywords: keywords("catch do else elseif for foreach if switch try while"),
-    atoms: keywords("true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__"),
-    builtin: keywords("func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport echo print global static exit array empty eval isset unset die include require include_once require_once"),
+                       "print unset __halt_compiler self static parent yield insteadof finally"),
+    blockKeywords: keywords("catch do else elseif for foreach if switch try while finally"),
+    atoms: keywords("true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__"),
+    builtin: keywords("func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once"),
     multiLineStrings: true,
     hooks: {
       "$": function(stream) {

From 9ebe46e2cfefc50f5cf86ba9ceae8b4247a50e42 Mon Sep 17 00:00:00 2001
From: Jan Odvarko <odvarko@gmail.com>
Date: Tue, 1 Oct 2013 15:45:53 +0200
Subject: [PATCH 0519/4742] Add resetSelectionOnContextMenu option

---
 lib/codemirror.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ae257805f0..86b6cc1680 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2183,7 +2183,11 @@ window.CodeMirror = (function() {
 
     var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
     if (!pos || opera) return; // Opera is difficult.
-    if (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to))
+
+    // Reset the current text selection only if the click is done outside of the selection
+    // and 'resetSelectionOnContextMenu' option is true.
+    var reset = cm.options.resetSelectionOnContextMenu;
+    if (reset && (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to)))
       operation(cm, setSelection)(cm.doc, pos, pos);
 
     var oldCSS = display.input.style.cssText;
@@ -3290,6 +3294,8 @@ window.CodeMirror = (function() {
   option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true);
   option("showCursorWhenSelecting", false, updateSelection, true);
 
+  option("resetSelectionOnContextMenu", true);
+
   option("readOnly", false, function(cm, val) {
     if (val == "nocursor") {onBlur(cm); cm.display.input.blur();}
     else if (!val) resetInput(cm, true);

From 0e92520da5e5683559413622b980600bfedf77df Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 8 Oct 2013 16:39:21 +0200
Subject: [PATCH 0520/4742] Add documentation for resetSelectionOnContextMenu

Issue #1857
---
 doc/manual.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index f15ec80c0c..26db60a8f1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -359,6 +359,11 @@ <h2>Configuration</h2>
       which causes the cursor to not reach all the way to the bottom
       of the line, looks better</dd>
 
+      <dt id="option_resetSelectionOnContextMenu"><code><strong>resetSelectionOnContextMenu</strong>: boolean</dt>
+      <dd>Controls whether, when the context menu is opened with a
+      click outside of the current selection, the cursor is moved to
+      the point of the click. Defaults to <code>true</code>.</dd>
+
       <dt id="option_workTime"><code><strong>workTime</strong>, <strong>workDelay</strong>: number</code></dt>
       <dd>Highlighting is done by a pseudo background-thread that will
       work for <code>workTime</code> milliseconds, and then use

From 1a1646d53a7a6eca6e6e27a1d167e9b44baef793 Mon Sep 17 00:00:00 2001
From: Marko Bonaci <mbonaci@gmail.com>
Date: Tue, 8 Oct 2013 14:56:00 +0200
Subject: [PATCH 0521/4742] [mbo theme] Add

---
 theme/mbo.css | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 theme/mbo.css

diff --git a/theme/mbo.css b/theme/mbo.css
new file mode 100644
index 0000000000..f3250a7313
--- /dev/null
+++ b/theme/mbo.css
@@ -0,0 +1,35 @@
+/* Based on mbonaci's Brackets mbo theme */
+
+.cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffe9;}
+.cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
+.cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
+.cm-s-mbo .CodeMirror-linenumber {color: #dadada;}
+.cm-s-mbo .CodeMirror-cursor {border-left: 1px solid #ffffec !important;}
+
+.cm-s-mbo span.cm-comment {color: #95958a;}
+.cm-s-mbo span.cm-atom {color: #00a8c6;}
+.cm-s-mbo span.cm-number {color: #00a8c6;}
+
+.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute {color: #9ddfe9;}
+.cm-s-mbo span.cm-keyword {color: #ffb928;}
+.cm-s-mbo span.cm-string {color: #ffcf6c;}
+
+.cm-s-mbo span.cm-variable {color: #ffffec;}
+.cm-s-mbo span.cm-variable-2 {color: #00a8c6;}
+.cm-s-mbo span.cm-def {color: #ffffec;}
+.cm-s-mbo span.cm-bracket {color: #fffffc; font-weight: bold;}
+.cm-s-mbo span.cm-tag {color: #9ddfe9;}
+.cm-s-mbo span.cm-link {color: #f54b07;}
+.cm-s-mbo span.cm-error {background: #636363; color: #ffffec;}
+
+.cm-s-mbo .CodeMirror-activeline-background {background: #494b41 !important;}
+.cm-s-mbo .CodeMirror-matchingbracket {
+   text-decoration: underline;
+  color: #f5e107 !important;
+ }
+
+div.CodeMirror span.CodeMirror-searching {
+  background-color: none;
+  background: none;
+  box-shadow: 0 0 0 1px #ffffec;
+}

From 30287f9c63d74272c23ed621e5d4bbba10a0237d Mon Sep 17 00:00:00 2001
From: Fabio Zendhi Nagao <nagaozen@hotmail.com>
Date: Tue, 8 Oct 2013 17:28:31 -0300
Subject: [PATCH 0522/4742] [sql mode] Add text/x-mssql MIME

---
 demo/theme.html     |  2 ++
 mode/sql/index.html |  3 ++-
 mode/sql/sql.js     | 13 +++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/demo/theme.html b/demo/theme.html
index 504673d865..a6e2b2da09 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -16,6 +16,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/mbo.css">
 <link rel="stylesheet" href="../theme/midnight.css">
 <link rel="stylesheet" href="../theme/monokai.css">
 <link rel="stylesheet" href="../theme/neat.css">
@@ -80,6 +81,7 @@ <h2>Theme Demo</h2>
     <option>elegant</option>
     <option>erlang-dark</option>
     <option>lesser-dark</option>
+    <option>mbo</option>
     <option>midnight</option>
     <option>monokai</option>
     <option>neat</option>
diff --git a/mode/sql/index.html b/mode/sql/index.html
index 0dbdb6722c..e6882d79c1 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -51,7 +51,8 @@ <h2>SQL Mode for CodeMirror</h2>
             <code><a href="?mime=text/x-mysql">text/x-mysql</a></code>,
             <code><a href="?mime=text/x-mariadb">text/x-mariadb</a></code>,
             <code><a href="?mime=text/x-cassandra">text/x-cassandra</a></code>,
-            <code><a href="?mime=text/x-plsql">text/x-plsql</a></code>.
+            <code><a href="?mime=text/x-plsql">text/x-plsql</a></code>,
+            <code><a href="?mime=text/x-mssql">text/x-mssql</a></code>.
         </p>
 <script>
 window.onload = function() {
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 5fbd7c7be5..3be68caa1a 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -262,6 +262,19 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
   });
 
+  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"),
+    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: /^[*+\-%<>!=]/,
+    dateSQL: set("date datetimeoffset datetime2 smalldatetime datetime time"),
+    hooks: {
+      "@":   hookVar
+    }
+  });
+
   CodeMirror.defineMIME("text/x-mysql", {
     name: "sql",
     client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),

From d0eefcc5f606f78e13d3601043f1b0694afc3c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Mon, 23 Sep 2013 11:16:30 -0400
Subject: [PATCH 0523/4742] [solarized theme] show active line

---
 theme/solarized.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index dfa7f6af6d..af30d62130 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -165,10 +165,10 @@ Active line. Negative margin compensates left padding of the text in the
 view-port
 */
 .cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
-  background: rgba(255, 255, 255, 0.05);
+  background: rgba(255, 255, 255, 0.10);
 }
 .cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
-  background: rgba(0, 0, 0, 0.05);
+  background: rgba(0, 0, 0, 0.10);
 }
 
 /*

From f27cfd03729b9ff32dae63a726b90f2a85fb47dc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 14 Oct 2013 09:48:18 +0200
Subject: [PATCH 0524/4742] Add missing g flag to .replace regexp

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 86b6cc1680..36183dea6f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4473,7 +4473,7 @@ window.CodeMirror = (function() {
       return out;
     }
     return function(builder, text, style, startStyle, endStyle, title) {
-      return inner(builder, text.replace(/ {3,}/, split), style, startStyle, endStyle, title);
+      return inner(builder, text.replace(/ {3,}/g, split), style, startStyle, endStyle, title);
     };
   }
 

From 390a47e57436819a3c8a4d2feaca31777a4687a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 14 Oct 2013 10:03:11 +0200
Subject: [PATCH 0525/4742] [real-world uses] Add compilejava.net

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 95ec975e63..8afe73aa0a 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -49,6 +49,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://codio.com">Codio</a> (Web IDE)</li>
       <li><a href="http://ot.substance.io/demo/">Collaborative CodeMirror demo</a> (CodeMirror + operational transforms)</li>
       <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>
+      <li><a href="http://www.compilejava.net/">compilejava.net</a> (online Java sandbox)</li>
       <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>
       <li><a href="http://cssdeck.com/">CSSDeck</a> (CSS showcase)</li>
       <li><a href="http://ireneros.com/deck/deck.js-codemirror/introduction/#textarea-code">Deck.js integration</a> (slides with editors)</li>

From 6fd2965e1517d019cf349a1112c307f60fab093e Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Tue, 1 Oct 2013 14:21:02 +0200
Subject: [PATCH 0526/4742] [less mode] improve highlighting, indentation

Better handling of attributes, .2px, tags.
````
.page {
  .content {
    width: 870px;
    padding: 45px;
  }
  margin: 0 auto;
  font-family: 'Georgia', serif;
  font-size: 18px;
  line-height: 26px;
  padding: 0 60px;
  code {
    font-size: 16px;
  }
  pre {
    border-width: 1px;
    border-style: dashed;
    padding: 15px;
    margin: 15px 0;
  }
  h1 {
    text-align: left;
    font-size: 40px;
    margin-top: 15px;
    margin-bottom: 35px;
  }
  p + h1 { margin-top: 60px }
  h2, h3 {
    margin: 30px 0 15px 0;
  }
  p + h2, pre + h2, code + h2 {
    border-top: 6px solid rgba(255, 255, 255, 0.1);
    padding-top: 30px;
  }
  h3 {
    margin: 15px 0;
  }
}
````
---
 mode/less/less.js | 127 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 106 insertions(+), 21 deletions(-)

diff --git a/mode/less/less.js b/mode/less/less.js
index 32c75db496..ec62319080 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -32,9 +32,9 @@ CodeMirror.defineMode("less", function(config) {
         return tokenSComment(stream, state);
       } else {
         if(type == "string" || type == "(") return ret("string", "string");
-        if(state.stack[state.stack.length-1] != undefined) return ret(null, ch);
+        if(state.stack[state.stack.length-1] !== undefined) return ret(null, ch);
         stream.eatWhile(/[\a-zA-Z0-9\-_.\s]/);
-        if( /\/|\)|#/.test(stream.peek() || (stream.eatSpace() && stream.peek() == ")"))  || stream.eol() )return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
+        if( /\/|\)|#/.test(stream.peek() || (stream.eatSpace() && stream.peek() === ")"))  || stream.eol() )return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
       }
     } else if (ch == "!") {
       stream.match(/^\s*\w*/);
@@ -66,10 +66,11 @@ CodeMirror.defineMode("less", function(config) {
         return ret(null, ch);
       }
     } else if (ch == ".") {
-      if(type == "(" || type == "string")return ret("string", "string"); // allow url(../image.png)
+      if(type == "(")return ret("string", "string"); // allow url(../image.png)
       stream.eatWhile(/[\a-zA-Z0-9\-_]/);
-      if(stream.peek() == " ")stream.eatSpace();
-      if(stream.peek() == ")")return ret("number", "unit");//rgba(0,0,0,.25);
+      if(stream.peek() === " ")stream.eatSpace();
+      if(stream.peek() === ")" || type === ":")return ret("number", "unit");//rgba(0,0,0,.25);
+      else if(state.stack[state.stack.length-1] === "rule" && stream.peek().match(/{|,|\+|\(/) === null)return ret("number", "unit");
       return ret("tag", "tag");
     } else if (ch == "#") {
       //we don't eat white-space, we want the hex color and or id only
@@ -82,21 +83,24 @@ CodeMirror.defineMode("less", function(config) {
           //eat white-space
           stream.eatSpace();
           //when hex value declaration doesn't end with [;,] but is does with a slash/cc comment treat it as an id, just like the other hex values that don't end with[;,]
-          if( /[\/<>.(){!$%^&*_\-\\?=+\|#'~`]/.test(stream.peek()) )return ret("atom", "tag");
+          if( /[\/<>.(){!$%^&*_\-\\?=+\|#'~`]/.test(stream.peek()) ){
+            if(type === "select-op")return ret("number", "unit"); else return ret("atom", "tag");
+          }
           //#time { color: #aaa }
           else if(stream.peek() == "}" )return ret("number", "unit");
           //we have a valid hex color value, parse as id whenever an element/class is defined after the hex(id) value e.g. #eee aaa || #eee .aaa
-            else if( /[a-zA-Z\\]/.test(stream.peek()) )return ret("atom", "tag");
+          else if( /[a-zA-Z\\]/.test(stream.peek()) )return ret("atom", "tag");
           //when a hex value is on the end of a line, parse as id
-              else if(stream.eol())return ret("atom", "tag");
+          else if(stream.eol())return ret("atom", "tag");
           //default
-                else return ret("number", "unit");
+          else return ret("number", "unit");
         } else {//when not a valid hexvalue in the current stream e.g. #footer
           stream.eatWhile(/[\w\\\-]/);
-          return ret("atom", "tag");
+          return ret("atom", stream.current());
         }
       } else {//when not a valid hexvalue length
         stream.eatWhile(/[\w\\\-]/);
+        if(state.stack[state.stack.length-1] === "rule")return ret("atom", stream.current());return ret("atom", stream.current());
         return ret("atom", "tag");
       }
     } else if (ch == "&") {
@@ -104,17 +108,33 @@ CodeMirror.defineMode("less", function(config) {
       return ret(null, ch);
     } else {
       stream.eatWhile(/[\w\\\-_%.{]/);
-      if(type == "string"){
-        return ret("string", "string");
+      if(stream.current().match(/\\/) !== null){
+        if(stream.current().charAt(stream.current().length-1) === "\\"){
+          stream.eat(/\'|\"|\)|\(/);
+          while(stream.eatWhile(/[\w\\\-_%.{]/)){
+            stream.eat(/\'|\"|\)|\(/);
+          }
+          return ret("string", stream.current());
+        }
+      } //else if(type === "tag")return ret("tag", "tag");
+        else if(type == "string"){
+        if(state.stack[state.stack.length-1] === "{" && stream.peek() === ":")return ret("variable", "variable");
+        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
+        return ret(type, stream.current());
       } else if(stream.current().match(/(^http$|^https$)/) != null){
         stream.eatWhile(/[\w\\\-_%.{:\/]/);
+        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
         return ret("string", "string");
       } else if(stream.peek() == "<" || stream.peek() == ">" || stream.peek() == "+"){
+        if(type === "(" && (stream.current() === "n" || stream.current() === "-n"))return ret("string", stream.current());
         return ret("tag", "tag");
       } else if( /\(/.test(stream.peek()) ){
+        if(stream.current() === "when")return ret("variable","variable");
+        else if(state.stack[state.stack.length-1] === "@media" && stream.current() === "and")return ret("variable",stream.current());
         return ret(null, ch);
-      } else if (stream.peek() == "/" && state.stack[state.stack.length-1] != undefined){ // url(dir/center/image.png)
-        return ret("string", "string");
+      } else if (stream.peek() == "/" && state.stack[state.stack.length-1] !== undefined){ // url(dir/center/image.png)
+        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
+        return ret("string", stream.current());
       } else if( stream.current().match(/\-\d|\-.\d/) ){ // match e.g.: -5px -0.4 etc... only colorize the minus sign
         //commment out these 2 comment if you want the minus sign to be parsed as null -500px
         //stream.backUp(stream.current().length-1);
@@ -129,14 +149,33 @@ CodeMirror.defineMode("less", function(config) {
         if( /[{<>.a-zA-Z\/]/.test(stream.peek())  || stream.eol() )return ret("tag", "tag"); // e.g. button.icon-plus
         return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
       } else if( stream.eol() || stream.peek() == "[" || stream.peek() == "#" || type == "tag" ){
+
         if(stream.current().substring(stream.current().length-1,stream.current().length) == "{")stream.backUp(1);
+        else if(state.stack[state.stack.length-1] === "border-color" || state.stack[state.stack.length-1] === "background-position" || state.stack[state.stack.length-1] === "font-family")return ret(null, stream.current());
+        else if(type === "tag")return ret("tag", "tag");
+        else if((type === ":" || type === "unit") && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
+        else if(state.stack[state.stack.length-1] === "rule" && type === "tag")return ret("string", stream.current());
+        else if(state.stack[state.stack.length-1] === ";" && type === ":")return ret(null, stream.current());
+        //else if(state.stack[state.stack.length-1] === ";" || type === "")return ret("variable", stream.current());
+        else if(stream.peek() === "#" && type !== undefined && type.match(/\+|,|tag|select\-op|}|{|;/g) === null)return ret("string", stream.current());
+        else if(type === "variable")return ret(null, stream.current());
+        else if(state.stack[state.stack.length-1] === "{" && type === "comment")return ret("variable", stream.current());
+        else if(state.stack.length === 0 && (type === ";" || type === "comment"))return ret("tag", stream.current());
+        else if((state.stack[state.stack.length-1] === "{" || type === ";") && state.stack[state.stack.length-1] !== "@media{")return ret("variable", stream.current());
+        else if(state.stack[state.stack.length-2] === "{" && state.stack[state.stack.length-1] === ";")return ret("variable", stream.current());
+
         return ret("tag", "tag");
       } else if(type == "compare" || type == "a" || type == "("){
         return ret("string", "string");
       } else if(type == "|" || stream.current() == "-" || type == "["){
-        if(type == "|" )return ret("tag", "tag");
+        if(type == "|" && stream.peek().match(/\]|=|\~/) !== null)return ret("number", stream.current());
+        else if(type == "|" )return ret("tag", "tag");
+        else if(type == "["){
+          stream.eatWhile(/\w\-/);
+          return ret("number", stream.current());
+        }
         return ret(null, ch);
-      } else if(stream.peek() == ":") {
+      } else if((stream.peek() == ":") || ( stream.eatSpace() && stream.peek() == ":")) {
         stream.next();
         var t_v = stream.peek() == ":" ? true : false;
         if(!t_v){
@@ -152,11 +191,50 @@ CodeMirror.defineMode("less", function(config) {
           stream.backUp(1);
         }
         if(t_v)return ret("tag", "tag"); else return ret("variable", "variable");
-      } else if(state.stack[state.stack.length-1]  === "font-family"){
+      } else if(state.stack[state.stack.length-1]  === "font-family" || state.stack[state.stack.length-1]  === "background-position" || state.stack[state.stack.length-1]  === "border-color"){
         return ret(null, null);
       } else {
-        if(state.stack[state.stack.length-1] === "{" || type === "select-op"  || (state.stack[state.stack.length-1] === "rule" && type === ",") )return ret("tag", "tag");
-        return ret("variable", "variable");
+
+        if(state.stack[state.stack.length-1] === null && type === ":")return ret(null, stream.current());
+
+        //else if((type === ")" && state.stack[state.stack.length-1] === "rule") || (state.stack[state.stack.length-2] === "{" && state.stack[state.stack.length-1] === "rule" && type === "variable"))return ret(null, stream.current());
+
+        else if(/\^|\$/.test(stream.current()) && stream.peek().match(/\~|=/) !== null)return ret("string", "string");//att^=val
+
+        else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
+        else if(type === "unit" && state.stack[state.stack.length-1] === ";")return ret(null, "unit");
+        else if(type === ")" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
+        else if(type.match("@") !== null  && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
+        //else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
+
+        else if((type === ";" || type === "}" || type === ",") && state.stack[state.stack.length-1] === ";")return ret("tag", stream.current());
+        else if((type === ";" && stream.peek() !== undefined && stream.peek().match(/{|./) === null) || (type === ";" && stream.eatSpace() && stream.peek().match(/{|./) === null))return ret("variable", stream.current());
+        else if((type === "@media" && state.stack[state.stack.length-1] === "@media") || type === "@namespace")return ret("tag", stream.current());
+
+        else if(type === "{"  && state.stack[state.stack.length-1] === ";" && stream.peek() === "{")return ret("tag", "tag");
+        else if((type === "{" || type === ":") && state.stack[state.stack.length-1] === ";")return ret(null, stream.current());
+        else if((state.stack[state.stack.length-1] === "{" && stream.eatSpace() && stream.peek().match(/.|#/) === null) || type === "select-op"  || (state.stack[state.stack.length-1] === "rule" && type === ",") )return ret("tag", "tag");
+        else if(type === "variable" && state.stack[state.stack.length-1] === "rule")return ret("tag", "tag");
+        else if((stream.eatSpace() && stream.peek() === "{") || stream.eol() || stream.peek() === "{")return ret("tag", "tag");
+        //this one messes up indentation
+        //else if((type === "}" && stream.peek() !== ":") || (type === "}" && stream.eatSpace() && stream.peek() !== ":"))return(type, "tag");
+
+        else if(type === ")" && (stream.current() == "and" || stream.current() == "and "))return ret("variable", "variable");
+        else if(type === ")" && (stream.current() == "when" || stream.current() == "when "))return ret("variable", "variable");
+        else if(type === ")" || type === "comment" || type === "{")return ret("tag", "tag");
+        else if(stream.sol())return ret("tag", "tag");
+        else if((stream.eatSpace() && stream.peek() === "#") || stream.peek() === "#")return ret("tag", "tag");
+        else if(state.stack.length === 0)return ret("tag", "tag");
+        else if(type === ";" && stream.peek() !== undefined && stream.peek().match(/^[.|\#]/g) !== null)return ret("tag", "tag");
+
+        else if(type === ":"){stream.eatSpace();return ret(null, stream.current());}
+
+        else if(stream.current() === "and " || stream.current() === "and")return ret("variable", stream.current());
+        else if(type === ";" && state.stack[state.stack.length-1] === "{")return ret("variable", stream.current());
+
+        else if(state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
+
+        return ret("tag", stream.current());
       }
     }
   }
@@ -234,16 +312,23 @@ CodeMirror.defineMode("less", function(config) {
       else if (type == "}") state.stack.pop();
       else if (type == "@media") state.stack.push("@media");
       else if (stream.current() === "font-family") state.stack[state.stack.length-1] = "font-family";
+      else if (stream.current() === "background-position") state.stack[state.stack.length-1] = "background-position";
+      else if (stream.current() === "border-color") state.stack[state.stack.length-1] = "border-color";
       else if (context == "{" && type != "comment" && type !== "tag") state.stack.push("rule");
       else if (stream.peek() === ":" && stream.current().match(/@|#/) === null) style = type;
+      if(type === ";" && (state.stack[state.stack.length-1] == "font-family" || state.stack[state.stack.length-1] == "background-position" || state.stack[state.stack.length-1] == "border-color"))state.stack[state.stack.length-1] = stream.current();
+      else if(type === "tag" && stream.peek() === ")" && stream.current().match(/\:/) === null){type = null; style = null;}
+      // ????
+      else if((type === "variable" && stream.peek() === ")") || (type === "variable" && stream.eatSpace() && stream.peek() === ")"))return ret(null,stream.current());
       return style;
     },
 
     indent: function(state, textAfter) {
       var n = state.stack.length;
-
       if (/^\}/.test(textAfter))
-        n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;
+        n -= state.stack[state.stack.length-1] === "rule" ? 2 : 1;
+      else if (state.stack[state.stack.length-2] === "{")
+        n -= state.stack[state.stack.length-1] === "rule" ? 1 : 0;
       return state.baseIndent + n * indentUnit;
     },
 

From 98bc784b618fa7a464c725823539da08b8de33d6 Mon Sep 17 00:00:00 2001
From: Anderson Mesquita <andersonvom@thoughtworks.com>
Date: Tue, 1 Oct 2013 19:48:57 -0500
Subject: [PATCH 0527/4742] [indent-fold addon] Fix indentation folding

Fix next line after block being incorrectly folded into the block
Fix detection of the end of a code block
---
 addon/fold/indent-fold.js | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index fcbff96696..5a0bb1a850 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,12 +1,25 @@
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
-  var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
-  var myIndent = CodeMirror.countColumn(firstLine, null, tabSize);
-  for (var i = start.line + 1, end = cm.lineCount(); i < end; ++i) {
-    var curLine = cm.getLine(i);
-    if (CodeMirror.countColumn(curLine, null, tabSize) < myIndent &&
-        CodeMirror.countColumn(cm.getLine(i-1), null, tabSize) > myIndent)
+  var foldEnded = function(myIndent, curColumn, prevColumn, numLines) {
+    return ( (curColumn < myIndent) ||
+             (curColumn == myIndent && prevColumn >= myIndent) ||
+             (curColumn > myIndent && i == numLines-1) );
+  };
+
+  var numLines = cm.lineCount(),
+      tabSize = cm.getOption("tabSize"),
+      firstLine = cm.getLine(start.line),
+      myIndent = CodeMirror.countColumn(firstLine, null, tabSize);
+
+  for (var i = start.line + 1 ; i < numLines ; i++) {
+    var curColumn = CodeMirror.countColumn(cm.getLine(i), null, tabSize);
+    var prevColumn = CodeMirror.countColumn(cm.getLine(i-1), null, tabSize);
+
+    if (foldEnded(myIndent, curColumn, prevColumn, numLines)) {
+      var lastFoldLineNumber = (curColumn > myIndent && i == numLines-1) ? i : i-1;
+      var lastFoldLine = cm.getLine(lastFoldLineNumber);
       return {from: CodeMirror.Pos(start.line, firstLine.length),
-              to: CodeMirror.Pos(i, curLine.length)};
+              to: CodeMirror.Pos(lastFoldLineNumber, lastFoldLine.length)};
+    }
   }
 });
 CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated

From dad387da5bf0bc5887e607603f1fc27d586fb167 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 14 Oct 2013 10:48:17 +0200
Subject: [PATCH 0528/4742] [indent-fold addon] Fix coding style, use lastLine
 not lineCount

Issue #1859
---
 addon/fold/indent-fold.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 5a0bb1a850..b54da34777 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,25 +1,26 @@
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
-  var foldEnded = function(myIndent, curColumn, prevColumn, numLines) {
-    return ( (curColumn < myIndent) ||
-             (curColumn == myIndent && prevColumn >= myIndent) ||
-             (curColumn > myIndent && i == numLines-1) );
-  };
-
-  var numLines = cm.lineCount(),
+  var lastLine = cm.lastLine(),
       tabSize = cm.getOption("tabSize"),
       firstLine = cm.getLine(start.line),
       myIndent = CodeMirror.countColumn(firstLine, null, tabSize);
 
-  for (var i = start.line + 1 ; i < numLines ; i++) {
+  function foldEnded(curColumn, prevColumn) {
+    return curColumn < myIndent ||
+      (curColumn == myIndent && prevColumn >= myIndent) ||
+      (curColumn > myIndent && i == lastLine);
+  }
+
+  for (var i = start.line + 1; i <= lastLine; i++) {
     var curColumn = CodeMirror.countColumn(cm.getLine(i), null, tabSize);
     var prevColumn = CodeMirror.countColumn(cm.getLine(i-1), null, tabSize);
 
-    if (foldEnded(myIndent, curColumn, prevColumn, numLines)) {
-      var lastFoldLineNumber = (curColumn > myIndent && i == numLines-1) ? i : i-1;
+    if (foldEnded(curColumn, prevColumn)) {
+      var lastFoldLineNumber = curColumn > myIndent && i == lastLine ? i : i-1;
       var lastFoldLine = cm.getLine(lastFoldLineNumber);
       return {from: CodeMirror.Pos(start.line, firstLine.length),
               to: CodeMirror.Pos(lastFoldLineNumber, lastFoldLine.length)};
     }
   }
 });
+
 CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated

From 2cb1e0628c6ca837658e8db88b58cb25cb0bd685 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Oct 2013 09:55:16 +0200
Subject: [PATCH 0529/4742] [coffeescript mode] Move to linked list for scope
 tracking

---
 mode/coffeescript/coffeescript.js | 45 ++++++++++++++++---------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index b7203f124b..608bc86dc3 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -40,7 +40,7 @@ CodeMirror.defineMode('coffeescript', function(conf) {
     function tokenBase(stream, state) {
         // Handle scope changes
         if (stream.sol()) {
-            var scopeOffset = state.scopes[0].offset;
+            var scopeOffset = state.scope.offset;
             if (stream.eatSpace()) {
                 var lineOffset = stream.indentation();
                 if (lineOffset > scopeOffset) {
@@ -212,41 +212,42 @@ CodeMirror.defineMode('coffeescript', function(conf) {
         type = type || 'coffee';
         var indentUnit = 0;
         if (type === 'coffee') {
-            for (var i = 0; i < state.scopes.length; i++) {
-                if (state.scopes[i].type === 'coffee') {
-                    indentUnit = state.scopes[i].offset + conf.indentUnit;
+            for (var scope = state.scope; scope; scope = scope.prev) {
+                if (scope.type === 'coffee') {
+                    indentUnit = scope.offset + conf.indentUnit;
                     break;
                 }
             }
         } else {
             indentUnit = stream.column() + stream.current().length;
         }
-        state.scopes.unshift({
+        state.scope = {
             offset: indentUnit,
-            type: type
-        });
+            type: type,
+            prev: state.scope
+        };
     }
 
     function dedent(stream, state) {
-        if (state.scopes.length == 1) return;
-        if (state.scopes[0].type === 'coffee') {
+        if (!state.scope.prev) return;
+        if (state.scope.type === 'coffee') {
             var _indent = stream.indentation();
-            var _indent_index = -1;
-            for (var i = 0; i < state.scopes.length; ++i) {
-                if (_indent === state.scopes[i].offset) {
-                    _indent_index = i;
+            var matched = false;
+            for (var scope = state.scope; scope; scope = scope.prev) {
+                if (_indent === scope.offset) {
+                    matched = true;
                     break;
                 }
             }
-            if (_indent_index === -1) {
+            if (!matched) {
                 return true;
             }
-            while (state.scopes[0].offset !== _indent) {
-                state.scopes.shift();
+            while (state.scope.prev && state.scope.offset !== _indent) {
+                state.scope = state.scope.prev;
             }
             return false;
         } else {
-            state.scopes.shift();
+            state.scope = state.scope.prev;
             return false;
         }
     }
@@ -272,7 +273,7 @@ CodeMirror.defineMode('coffeescript', function(conf) {
         }
         if (((current === '->' || current === '=>') &&
                   !state.lambda &&
-                  state.scopes[0].type == 'coffee' &&
+                  state.scope.type == 'coffee' &&
                   stream.peek() === '')
                || style === 'indent') {
             indent(stream, state);
@@ -300,8 +301,8 @@ CodeMirror.defineMode('coffeescript', function(conf) {
                 return ERRORCLASS;
             }
         }
-        if (state.dedent > 0 && stream.eol() && state.scopes[0].type == 'coffee') {
-            if (state.scopes.length > 1) state.scopes.shift();
+        if (state.dedent > 0 && stream.eol() && state.scope.type == 'coffee') {
+            if (state.scope.prev) state.scope = state.scope.prev;
             state.dedent -= 1;
         }
 
@@ -312,7 +313,7 @@ CodeMirror.defineMode('coffeescript', function(conf) {
         startState: function(basecolumn) {
             return {
               tokenize: tokenBase,
-              scopes: [{offset:basecolumn || 0, type:'coffee'}],
+              scope: {offset:basecolumn || 0, type:'coffee', prev: null},
               lastToken: null,
               lambda: false,
               dedent: 0
@@ -336,7 +337,7 @@ CodeMirror.defineMode('coffeescript', function(conf) {
                 return 0;
             }
 
-            return state.scopes[0].offset;
+            return state.scope.offset;
         },
 
         lineComment: "#",

From a18705d01011fe84d921287f5c4142244e5fb8ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Oct 2013 10:10:36 +0200
Subject: [PATCH 0530/4742] [coffeescript mode] Style unification

---
 mode/coffeescript/coffeescript.js | 604 +++++++++++++++---------------
 1 file changed, 298 insertions(+), 306 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 608bc86dc3..1f489caecd 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -2,348 +2,340 @@
  * Link to the project's GitHub page:
  * https://github.com/pickhardt/coffeescript-codemirror-mode
  */
-CodeMirror.defineMode('coffeescript', function(conf) {
-    var ERRORCLASS = 'error';
-
-    function wordRegexp(words) {
-        return new RegExp("^((" + words.join(")|(") + "))\\b");
-    }
-
-    var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\?]");
-    var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\},:`=;\\.]');
-    var doubleOperators = new RegExp("^((\->)|(\=>)|(\\+\\+)|(\\+\\=)|(\\-\\-)|(\\-\\=)|(\\*\\*)|(\\*\\=)|(\\/\\/)|(\\/\\=)|(==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//))");
-    var doubleDelimiters = new RegExp("^((\\.\\.)|(\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
-    var tripleDelimiters = new RegExp("^((\\.\\.\\.)|(//=)|(>>=)|(<<=)|(\\*\\*=))");
-    var identifiers = new RegExp("^[_A-Za-z$][_A-Za-z$0-9]*");
-    var properties = new RegExp("^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*");
-
-    var wordOperators = wordRegexp(['and', 'or', 'not',
-                                    'is', 'isnt', 'in',
-                                    'instanceof', 'typeof']);
-    var indentKeywords = ['for', 'while', 'loop', 'if', 'unless', 'else',
-                          'switch', 'try', 'catch', 'finally', 'class'];
-    var commonKeywords = ['break', 'by', 'continue', 'debugger', 'delete',
-                          'do', 'in', 'of', 'new', 'return', 'then',
-                          'this', 'throw', 'when', 'until'];
-
-    var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
-
-    indentKeywords = wordRegexp(indentKeywords);
-
-
-    var stringPrefixes = new RegExp("^('{3}|\"{3}|['\"])");
-    var regexPrefixes = new RegExp("^(/{3}|/)");
-    var commonConstants = ['Infinity', 'NaN', 'undefined', 'null', 'true', 'false', 'on', 'off', 'yes', 'no'];
-    var constants = wordRegexp(commonConstants);
-
-    // Tokenizers
-    function tokenBase(stream, state) {
-        // Handle scope changes
-        if (stream.sol()) {
-            var scopeOffset = state.scope.offset;
-            if (stream.eatSpace()) {
-                var lineOffset = stream.indentation();
-                if (lineOffset > scopeOffset) {
-                    return 'indent';
-                } else if (lineOffset < scopeOffset) {
-                    return 'dedent';
-                }
-                return null;
-            } else {
-                if (scopeOffset > 0) {
-                    dedent(stream, state);
-                }
-            }
-        }
-        if (stream.eatSpace()) {
-            return null;
+CodeMirror.defineMode("coffeescript", function(conf) {
+  var ERRORCLASS = "error";
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?)/;
+  var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
+  var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
+  var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
+
+  var wordOperators = wordRegexp(["and", "or", "not",
+                                  "is", "isnt", "in",
+                                  "instanceof", "typeof"]);
+  var indentKeywords = ["for", "while", "loop", "if", "unless", "else",
+                        "switch", "try", "catch", "finally", "class"];
+  var commonKeywords = ["break", "by", "continue", "debugger", "delete",
+                        "do", "in", "of", "new", "return", "then",
+                        "this", "throw", "when", "until"];
+
+  var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
+
+  indentKeywords = wordRegexp(indentKeywords);
+
+
+  var stringPrefixes = /^('{3}|\"{3}|['\"])/;
+  var regexPrefixes = /^(\/{3}|\/)/;
+  var commonConstants = ["Infinity", "NaN", "undefined", "null", "true", "false", "on", "off", "yes", "no"];
+  var constants = wordRegexp(commonConstants);
+
+  // Tokenizers
+  function tokenBase(stream, state) {
+    // Handle scope changes
+    if (stream.sol()) {
+      var scopeOffset = state.scope.offset;
+      if (stream.eatSpace()) {
+        var lineOffset = stream.indentation();
+        if (lineOffset > scopeOffset) {
+          return "indent";
+        } else if (lineOffset < scopeOffset) {
+          return "dedent";
         }
-
-        var ch = stream.peek();
-
-        // Handle docco title comment (single line)
-        if (stream.match("####")) {
-            stream.skipToEnd();
-            return 'comment';
-        }
-
-        // Handle multi line comments
-        if (stream.match("###")) {
-            state.tokenize = longComment;
-            return state.tokenize(stream, state);
+        return null;
+      } else {
+        if (scopeOffset > 0) {
+          dedent(stream, state);
         }
+      }
+    }
+    if (stream.eatSpace()) {
+      return null;
+    }
 
-        // Single line comment
-        if (ch === '#') {
-            stream.skipToEnd();
-            return 'comment';
-        }
+    var ch = stream.peek();
 
-        // Handle number literals
-        if (stream.match(/^-?[0-9\.]/, false)) {
-            var floatLiteral = false;
-            // Floats
-            if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)) {
-              floatLiteral = true;
-            }
-            if (stream.match(/^-?\d+\.\d*/)) {
-              floatLiteral = true;
-            }
-            if (stream.match(/^-?\.\d+/)) {
-              floatLiteral = true;
-            }
-
-            if (floatLiteral) {
-                // prevent from getting extra . on 1..
-                if (stream.peek() == "."){
-                    stream.backUp(1);
-                }
-                return 'number';
-            }
-            // Integers
-            var intLiteral = false;
-            // Hex
-            if (stream.match(/^-?0x[0-9a-f]+/i)) {
-              intLiteral = true;
-            }
-            // Decimal
-            if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)) {
-                intLiteral = true;
-            }
-            // Zero by itself with no other piece of number.
-            if (stream.match(/^-?0(?![\dx])/i)) {
-              intLiteral = true;
-            }
-            if (intLiteral) {
-                return 'number';
-            }
-        }
+    // Handle docco title comment (single line)
+    if (stream.match("####")) {
+      stream.skipToEnd();
+      return "comment";
+    }
 
-        // Handle strings
-        if (stream.match(stringPrefixes)) {
-            state.tokenize = tokenFactory(stream.current(), 'string');
-            return state.tokenize(stream, state);
-        }
-        // Handle regex literals
-        if (stream.match(regexPrefixes)) {
-            if (stream.current() != '/' || stream.match(/^.*\//, false)) { // prevent highlight of division
-                state.tokenize = tokenFactory(stream.current(), 'string-2');
-                return state.tokenize(stream, state);
-            } else {
-                stream.backUp(1);
-            }
-        }
+    // Handle multi line comments
+    if (stream.match("###")) {
+      state.tokenize = longComment;
+      return state.tokenize(stream, state);
+    }
 
-        // Handle operators and delimiters
-        if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
-            return 'punctuation';
-        }
-        if (stream.match(doubleOperators)
-            || stream.match(singleOperators)
-            || stream.match(wordOperators)) {
-            return 'operator';
-        }
-        if (stream.match(singleDelimiters)) {
-            return 'punctuation';
-        }
+    // Single line comment
+    if (ch === "#") {
+      stream.skipToEnd();
+      return "comment";
+    }
 
-        if (stream.match(constants)) {
-            return 'atom';
+    // Handle number literals
+    if (stream.match(/^-?[0-9\.]/, false)) {
+      var floatLiteral = false;
+      // Floats
+      if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)) {
+        floatLiteral = true;
+      }
+      if (stream.match(/^-?\d+\.\d*/)) {
+        floatLiteral = true;
+      }
+      if (stream.match(/^-?\.\d+/)) {
+        floatLiteral = true;
+      }
+
+      if (floatLiteral) {
+        // prevent from getting extra . on 1..
+        if (stream.peek() == "."){
+          stream.backUp(1);
         }
+        return "number";
+      }
+      // Integers
+      var intLiteral = false;
+      // Hex
+      if (stream.match(/^-?0x[0-9a-f]+/i)) {
+        intLiteral = true;
+      }
+      // Decimal
+      if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)) {
+        intLiteral = true;
+      }
+      // Zero by itself with no other piece of number.
+      if (stream.match(/^-?0(?![\dx])/i)) {
+        intLiteral = true;
+      }
+      if (intLiteral) {
+        return "number";
+      }
+    }
 
-        if (stream.match(keywords)) {
-            return 'keyword';
-        }
+    // Handle strings
+    if (stream.match(stringPrefixes)) {
+      state.tokenize = tokenFactory(stream.current(), "string");
+      return state.tokenize(stream, state);
+    }
+    // Handle regex literals
+    if (stream.match(regexPrefixes)) {
+      if (stream.current() != "/" || stream.match(/^.*\//, false)) { // prevent highlight of division
+        state.tokenize = tokenFactory(stream.current(), "string-2");
+        return state.tokenize(stream, state);
+      } else {
+        stream.backUp(1);
+      }
+    }
 
-        if (stream.match(identifiers)) {
-            return 'variable';
-        }
+    // Handle operators and delimiters
+    if (stream.match(operators) || stream.match(wordOperators)) {
+      return "operator";
+    }
+    if (stream.match(delimiters)) {
+      return "punctuation";
+    }
 
-        if (stream.match(properties)) {
-            return 'property';
-        }
+    if (stream.match(constants)) {
+      return "atom";
+    }
 
-        // Handle non-detected items
-        stream.next();
-        return ERRORCLASS;
+    if (stream.match(keywords)) {
+      return "keyword";
     }
 
-    function tokenFactory(delimiter, outclass) {
-        var singleline = delimiter.length == 1;
-        return function(stream, state) {
-            while (!stream.eol()) {
-                stream.eatWhile(/[^'"\/\\]/);
-                if (stream.eat('\\')) {
-                    stream.next();
-                    if (singleline && stream.eol()) {
-                        return outclass;
-                    }
-                } else if (stream.match(delimiter)) {
-                    state.tokenize = tokenBase;
-                    return outclass;
-                } else {
-                    stream.eat(/['"\/]/);
-                }
-            }
-            if (singleline) {
-                if (conf.mode.singleLineStringErrors) {
-                    outclass = ERRORCLASS;
-                } else {
-                    state.tokenize = tokenBase;
-                }
-            }
-            return outclass;
-        };
+    if (stream.match(identifiers)) {
+      return "variable";
     }
 
-    function longComment(stream, state) {
-        while (!stream.eol()) {
-            stream.eatWhile(/[^#]/);
-            if (stream.match("###")) {
-                state.tokenize = tokenBase;
-                break;
-            }
-            stream.eatWhile("#");
-        }
-        return "comment";
+    if (stream.match(properties)) {
+      return "property";
     }
 
-    function indent(stream, state, type) {
-        type = type || 'coffee';
-        var indentUnit = 0;
-        if (type === 'coffee') {
-            for (var scope = state.scope; scope; scope = scope.prev) {
-                if (scope.type === 'coffee') {
-                    indentUnit = scope.offset + conf.indentUnit;
-                    break;
-                }
-            }
+    // Handle non-detected items
+    stream.next();
+    return ERRORCLASS;
+  }
+
+  function tokenFactory(delimiter, outclass) {
+    var singleline = delimiter.length == 1;
+    return function(stream, state) {
+      while (!stream.eol()) {
+        stream.eatWhile(/[^'"\/\\]/);
+        if (stream.eat("\\")) {
+          stream.next();
+          if (singleline && stream.eol()) {
+            return outclass;
+          }
+        } else if (stream.match(delimiter)) {
+          state.tokenize = tokenBase;
+          return outclass;
         } else {
-            indentUnit = stream.column() + stream.current().length;
+          stream.eat(/['"\/]/);
         }
-        state.scope = {
-            offset: indentUnit,
-            type: type,
-            prev: state.scope
-        };
-    }
-
-    function dedent(stream, state) {
-        if (!state.scope.prev) return;
-        if (state.scope.type === 'coffee') {
-            var _indent = stream.indentation();
-            var matched = false;
-            for (var scope = state.scope; scope; scope = scope.prev) {
-                if (_indent === scope.offset) {
-                    matched = true;
-                    break;
-                }
-            }
-            if (!matched) {
-                return true;
-            }
-            while (state.scope.prev && state.scope.offset !== _indent) {
-                state.scope = state.scope.prev;
-            }
-            return false;
+      }
+      if (singleline) {
+        if (conf.mode.singleLineStringErrors) {
+          outclass = ERRORCLASS;
         } else {
-            state.scope = state.scope.prev;
-            return false;
+          state.tokenize = tokenBase;
         }
+      }
+      return outclass;
+    };
+  }
+
+  function longComment(stream, state) {
+    while (!stream.eol()) {
+      stream.eatWhile(/[^#]/);
+      if (stream.match("###")) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      stream.eatWhile("#");
     }
-
-    function tokenLexer(stream, state) {
-        var style = state.tokenize(stream, state);
-        var current = stream.current();
-
-        // Handle '.' connected identifiers
-        if (current === '.') {
-            style = state.tokenize(stream, state);
-            current = stream.current();
-            if (/^\.[\w$]+$/.test(current)) {
-                return 'variable';
-            } else {
-                return ERRORCLASS;
-            }
-        }
-
-        // Handle scope changes.
-        if (current === 'return') {
-            state.dedent += 1;
+    return "comment";
+  }
+
+  function indent(stream, state, type) {
+    type = type || "coffee";
+    var indentUnit = 0;
+    if (type === "coffee") {
+      for (var scope = state.scope; scope; scope = scope.prev) {
+        if (scope.type === "coffee") {
+          indentUnit = scope.offset + conf.indentUnit;
+          break;
         }
-        if (((current === '->' || current === '=>') &&
-                  !state.lambda &&
-                  state.scope.type == 'coffee' &&
-                  stream.peek() === '')
-               || style === 'indent') {
-            indent(stream, state);
-        }
-        var delimiter_index = '[({'.indexOf(current);
-        if (delimiter_index !== -1) {
-            indent(stream, state, '])}'.slice(delimiter_index, delimiter_index+1));
-        }
-        if (indentKeywords.exec(current)){
-            indent(stream, state);
-        }
-        if (current == 'then'){
-            dedent(stream, state);
+      }
+    } else {
+      indentUnit = stream.column() + stream.current().length;
+    }
+    state.scope = {
+      offset: indentUnit,
+      type: type,
+      prev: state.scope
+    };
+  }
+
+  function dedent(stream, state) {
+    if (!state.scope.prev) return;
+    if (state.scope.type === "coffee") {
+      var _indent = stream.indentation();
+      var matched = false;
+      for (var scope = state.scope; scope; scope = scope.prev) {
+        if (_indent === scope.offset) {
+          matched = true;
+          break;
         }
+      }
+      if (!matched) {
+        return true;
+      }
+      while (state.scope.prev && state.scope.offset !== _indent) {
+        state.scope = state.scope.prev;
+      }
+      return false;
+    } else {
+      state.scope = state.scope.prev;
+      return false;
+    }
+  }
+
+  function tokenLexer(stream, state) {
+    var style = state.tokenize(stream, state);
+    var current = stream.current();
+
+    // Handle "." connected identifiers
+    if (current === ".") {
+      style = state.tokenize(stream, state);
+      current = stream.current();
+      if (/^\.[\w$]+$/.test(current)) {
+        return "variable";
+      } else {
+        return ERRORCLASS;
+      }
+    }
 
+    // Handle scope changes.
+    if (current === "return") {
+      state.dedent += 1;
+    }
+    if (((current === "->" || current === "=>") &&
+         !state.lambda &&
+         state.scope.type == "coffee" &&
+         stream.peek() === "")
+        || style === "indent") {
+      indent(stream, state);
+    }
+    var delimiter_index = "[({".indexOf(current);
+    if (delimiter_index !== -1) {
+      indent(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+    }
+    if (indentKeywords.exec(current)){
+      indent(stream, state);
+    }
+    if (current == "then"){
+      dedent(stream, state);
+    }
 
-        if (style === 'dedent') {
-            if (dedent(stream, state)) {
-                return ERRORCLASS;
-            }
-        }
-        delimiter_index = '])}'.indexOf(current);
-        if (delimiter_index !== -1) {
-            if (dedent(stream, state)) {
-                return ERRORCLASS;
-            }
-        }
-        if (state.dedent > 0 && stream.eol() && state.scope.type == 'coffee') {
-            if (state.scope.prev) state.scope = state.scope.prev;
-            state.dedent -= 1;
-        }
 
-        return style;
+    if (style === "dedent") {
+      if (dedent(stream, state)) {
+        return ERRORCLASS;
+      }
+    }
+    delimiter_index = "])}".indexOf(current);
+    if (delimiter_index !== -1) {
+      if (dedent(stream, state)) {
+        return ERRORCLASS;
+      }
+    }
+    if (state.dedent > 0 && stream.eol() && state.scope.type == "coffee") {
+      if (state.scope.prev) state.scope = state.scope.prev;
+      state.dedent -= 1;
     }
 
-    var external = {
-        startState: function(basecolumn) {
-            return {
-              tokenize: tokenBase,
-              scope: {offset:basecolumn || 0, type:'coffee', prev: null},
-              lastToken: null,
-              lambda: false,
-              dedent: 0
-          };
-        },
+    return style;
+  }
 
-        token: function(stream, state) {
-            var style = tokenLexer(stream, state);
+  var external = {
+    startState: function(basecolumn) {
+      return {
+        tokenize: tokenBase,
+        scope: {offset:basecolumn || 0, type:"coffee", prev: null},
+        lastToken: null,
+        lambda: false,
+        dedent: 0
+      };
+    },
 
-            state.lastToken = {style:style, content: stream.current()};
+    token: function(stream, state) {
+      var style = tokenLexer(stream, state);
 
-            if (stream.eol() && stream.lambda) {
-                state.lambda = false;
-            }
+      state.lastToken = {style:style, content: stream.current()};
 
-            return style;
-        },
+      if (stream.eol() && stream.lambda) {
+        state.lambda = false;
+      }
 
-        indent: function(state) {
-            if (state.tokenize != tokenBase) {
-                return 0;
-            }
+      return style;
+    },
 
-            return state.scope.offset;
-        },
+    indent: function(state) {
+      if (state.tokenize != tokenBase) {
+        return 0;
+      }
 
-        lineComment: "#",
-        fold: "indent"
-    };
-    return external;
+      return state.scope.offset;
+    },
+
+    lineComment: "#",
+    fold: "indent"
+  };
+  return external;
 });
 
-CodeMirror.defineMIME('text/x-coffeescript', 'coffeescript');
+CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");

From 1326bce60e2ec1dabdc14bb7934b5ca8e20e9b72 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Oct 2013 10:12:48 +0200
Subject: [PATCH 0531/4742] [coffeescript mode] Fix indentation after arrow

---
 mode/coffeescript/coffeescript.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 1f489caecd..8dd71ff6a9 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -263,10 +263,12 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     if (current === "return") {
       state.dedent += 1;
     }
+    if ((current === "->" || current === "=>"))
+      console.log(!state.lambda, state.scope.type == "coffee", stream.peek());
     if (((current === "->" || current === "=>") &&
          !state.lambda &&
          state.scope.type == "coffee" &&
-         stream.peek() === "")
+         !stream.peek())
         || style === "indent") {
       indent(stream, state);
     }

From 47de0a358edabf377ba0a6b79a1661ca9fe159b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Oct 2013 10:32:17 +0200
Subject: [PATCH 0532/4742] [coffeescript mode] Better indentation of bracketed
 blocks

Issue #1882
---
 mode/coffeescript/coffeescript.js | 48 +++++++++++++++++--------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 8dd71ff6a9..d29ad2b73a 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -37,10 +37,11 @@ CodeMirror.defineMode("coffeescript", function(conf) {
   function tokenBase(stream, state) {
     // Handle scope changes
     if (stream.sol()) {
+      if (state.scope.align === null) state.scope.align = false;
       var scopeOffset = state.scope.offset;
       if (stream.eatSpace()) {
         var lineOffset = stream.indentation();
-        if (lineOffset > scopeOffset) {
+        if (lineOffset > scopeOffset && state.scope.type == "coffee") {
           return "indent";
         } else if (lineOffset < scopeOffset) {
           return "dedent";
@@ -202,21 +203,23 @@ CodeMirror.defineMode("coffeescript", function(conf) {
 
   function indent(stream, state, type) {
     type = type || "coffee";
-    var indentUnit = 0;
-    if (type === "coffee") {
-      for (var scope = state.scope; scope; scope = scope.prev) {
-        if (scope.type === "coffee") {
-          indentUnit = scope.offset + conf.indentUnit;
-          break;
-        }
+    var offset = 0, align = false, alignOffset = null;
+    for (var scope = state.scope; scope; scope = scope.prev) {
+      if (scope.type === "coffee") {
+        offset = scope.offset + conf.indentUnit;
+        break;
       }
-    } else {
-      indentUnit = stream.column() + stream.current().length;
+    }
+    if (type !== "coffee") {
+      align = null;
+      alignOffset = stream.column() + stream.current().length;
     }
     state.scope = {
-      offset: indentUnit,
+      offset: offset,
       type: type,
-      prev: state.scope
+      prev: state.scope,
+      align: align,
+      alignOffset: alignOffset
     };
   }
 
@@ -263,8 +266,6 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     if (current === "return") {
       state.dedent += 1;
     }
-    if ((current === "->" || current === "=>"))
-      console.log(!state.lambda, state.scope.type == "coffee", stream.peek());
     if (((current === "->" || current === "=>") &&
          !state.lambda &&
          state.scope.type == "coffee" &&
@@ -307,7 +308,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     startState: function(basecolumn) {
       return {
         tokenize: tokenBase,
-        scope: {offset:basecolumn || 0, type:"coffee", prev: null},
+        scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false},
         lastToken: null,
         lambda: false,
         dedent: 0
@@ -315,7 +316,11 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     },
 
     token: function(stream, state) {
+      var fillAlign = state.scope.align === null && state.scope;
+      if (fillAlign && stream.sol()) fillAlign.align = false;
+
       var style = tokenLexer(stream, state);
+      if (fillAlign && style && style != "comment") fillAlign.align = true;
 
       state.lastToken = {style:style, content: stream.current()};
 
@@ -326,12 +331,13 @@ CodeMirror.defineMode("coffeescript", function(conf) {
       return style;
     },
 
-    indent: function(state) {
-      if (state.tokenize != tokenBase) {
-        return 0;
-      }
-
-      return state.scope.offset;
+    indent: function(state, text) {
+      if (state.tokenize != tokenBase) return 0;
+      var closes = state.scope.type === (text && text.charAt(0));
+      if (state.scope.align)
+        return state.scope.alignOffset - (closes ? 1 : 0);
+      else
+        return (closes ? state.scope.prev : state.scope).offset;
     },
 
     lineComment: "#",

From 764bad7eee9df4858558d8c8473ce3cb45eecd53 Mon Sep 17 00:00:00 2001
From: jsoojeon <joonsoo@webida.org>
Date: Thu, 17 Oct 2013 16:58:35 +0900
Subject: [PATCH 0533/4742] [tern addon] Fix bug in sorting of changesets

---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 29ccc94886..fe93fa7335 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -439,7 +439,7 @@
     for (var file in perFile) {
       var known = ts.docs[file], chs = perFile[file];;
       if (!known) continue;
-      chs.sort(function(a, b) { return cmpPos(b, a); });
+      chs.sort(function(a, b) { return cmpPos(b.start, a.start); });
       var origin = "*rename" + (++nextChangeOrig);
       for (var i = 0; i < chs.length; ++i) {
         var ch = chs[i];

From a9ef54cde0215b1fd4a24afe68f15325faf4a446 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Oct 2013 10:47:22 +0200
Subject: [PATCH 0534/4742] [javascript-hint addon] Remove some broken and
 infinite-loopy code

Issue #1884
---
 addon/hint/javascript-hint.js | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 042fe1325d..513fb782b0 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -33,21 +33,6 @@
       tprop = getToken(editor, Pos(cur.line, tprop.start));
       if (tprop.string != ".") return;
       tprop = getToken(editor, Pos(cur.line, tprop.start));
-      if (tprop.string == ')') {
-        var level = 1;
-        do {
-          tprop = getToken(editor, Pos(cur.line, tprop.start));
-          switch (tprop.string) {
-          case ')': level++; break;
-          case '(': level--; break;
-          default: break;
-          }
-        } while (level > 0);
-        tprop = getToken(editor, Pos(cur.line, tprop.start));
-        if (tprop.type.indexOf("variable") === 0)
-          tprop.type = "function";
-        else return; // no clue
-      }
       if (!context) var context = [];
       context.push(tprop);
     }
@@ -110,11 +95,11 @@
       for (var name in obj) maybeAdd(name);
     }
 
-    if (context) {
+    if (context && context.length) {
       // If this is a property, see if it belongs to some object we can
       // find in the current environment.
       var obj = context.pop(), base;
-      if (obj.type.indexOf("variable") === 0) {
+      if (obj.type && obj.type.indexOf("variable") === 0) {
         if (options && options.additionalContext)
           base = options.additionalContext[obj.string];
         base = base || window[obj.string];
@@ -132,8 +117,7 @@
       while (base != null && context.length)
         base = base[context.pop().string];
       if (base != null) gatherCompletions(base);
-    }
-    else {
+    } else {
       // If not, just look in the window object and any local scope
       // (reading into JS mode internals to get at the local and global variables)
       for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);

From 45a15f336ea509d1e5f0b16e18ee752bfd3e5db4 Mon Sep 17 00:00:00 2001
From: Johan Ask <jhnesk@gmail.com>
Date: Mon, 14 Oct 2013 13:08:10 +0200
Subject: [PATCH 0535/4742] [sql-hint addon] Add

Simple SQL hint. It uses keywords from the SQL mode and may be
configured with a datebase table layout.
---
 addon/hint/sql-hint.js | 105 +++++++++++++++++++++++++++++++++++++++++
 doc/compress.html      |   1 +
 2 files changed, 106 insertions(+)
 create mode 100644 addon/hint/sql-hint.js

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
new file mode 100644
index 0000000000..95f6b50a15
--- /dev/null
+++ b/addon/hint/sql-hint.js
@@ -0,0 +1,105 @@
+(function () {
+  "use strict";
+
+  var tables;
+  var keywords;
+
+  function getKeywords(editor) {
+    var mode = editor.doc.modeOption;
+    if(mode === "sql") mode = "text/x-sql";
+    return CodeMirror.resolveMode(mode).keywords;
+  }
+
+  function match(string, word) {
+    var len = string.length;
+    var sub = word.substr(0, len);
+    return string.toUpperCase() === sub.toUpperCase();
+  }
+
+  function addMatches(result, search, wordlist, formatter) {
+    for(var word in wordlist) {
+      if(!wordlist.hasOwnProperty(word)) continue;
+      if(Array.isArray(wordlist)) {
+        word = wordlist[word];
+      }
+      if(match(search, word)) {
+        result.push(formatter(word));
+      }
+    }
+  }
+
+  function columnCompletion(result, editor) {
+    var cur = editor.getCursor();
+    var token = editor.getTokenAt(cur);
+    var string = token.string.substr(1);
+    var prevCur = CodeMirror.Pos(cur.line, token.start);
+    var table = editor.getTokenAt(prevCur).string;
+    var columns = tables[table];
+    if(!columns) {
+      table = findTableByAlias(table, editor);
+    }
+    columns = tables[table];
+    if(!columns) {
+      return;
+    }
+    addMatches(result, string, columns,
+        function(w) {return "." + w;});
+  }
+
+  function eachWord(line, f) {
+    var words = line.text.split(" ");
+    for(var i = 0; i < words.length; i++) {
+      f(words[i]);
+    }
+  }
+
+  // Tries to find possible table name from alias.
+  function findTableByAlias(alias, editor) {
+    var aliasUpperCase = alias.toUpperCase();
+    var previousWord = "";
+    var table = "";
+
+    editor.eachLine(function(line) {
+      eachWord(line, function(word) {
+        var wordUpperCase = word.toUpperCase();
+        if(wordUpperCase === aliasUpperCase) {
+          if(tables.hasOwnProperty(previousWord)) {
+            table = previousWord;
+          }
+        }
+        if(wordUpperCase !== "AS") {
+          previousWord = word;
+        }
+      });
+    });
+    return table;
+  }
+
+  function sqlHint(editor, options) {
+    tables = (options && options.tables) || {};
+    keywords = keywords || getKeywords(editor);
+    var cur = editor.getCursor();
+    var token = editor.getTokenAt(cur);
+
+    var result = [];
+
+    var search = token.string.trim();
+
+    addMatches(result, search, keywords,
+        function(w) {return w.toUpperCase();});
+
+    addMatches(result, search, tables,
+        function(w) {return w;});
+
+    if(search.lastIndexOf('.') === 0) {
+      columnCompletion(result, editor);
+    }
+
+    return {
+      list: result,
+        from: CodeMirror.Pos(cur.line, token.start),
+        to: CodeMirror.Pos(cur.line, token.end)
+    };
+  }
+  CodeMirror.registerHelper("hint", "sql", sqlHint);
+})();
diff --git a/doc/compress.html b/doc/compress.html
index a9c1bce81b..f3b85694d3 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -192,6 +192,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/search/search.js">search.js</option>
           <option value="http://codemirror.net/addon/search/searchcursor.js">searchcursor.js</option>
           <option value="http://codemirror.net/addon/hint/show-hint.js">show-hint.js</option>
+          <option value="http://codemirror.net/addon/hint/sql-hint.js">sql-hint.js</option>
           <option value="http://codemirror.net/addon/edit/trailingspace.js">trailingspace.js</option>
           <option value="http://codemirror.net/addon/tern/tern.js">tern.js</option>
           <option value="http://codemirror.net/addon/fold/xml-fold.js">xml-fold.js</option>

From 69beacaaf057844966bd98fe02989cbd4dc50878 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 13 Oct 2013 21:02:30 -0400
Subject: [PATCH 0536/4742] [vim keymap] Add context support

---
 keymap/vim.js | 60 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 74a7f560f2..295e728ca6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -769,44 +769,74 @@
       matchCommand: function(key, keyMap, vim) {
         var inputState = vim.inputState;
         var keys = inputState.keyBuffer.concat(key);
+        var matchedCommands = [];
+        var selectedCharacter;
         for (var i = 0; i < keyMap.length; i++) {
           var command = keyMap[i];
           if (matchKeysPartial(keys, command.keys)) {
-            if (keys.length < command.keys.length) {
-              // Matches part of a multi-key command. Buffer and wait for next
-              // stroke.
-              inputState.keyBuffer.push(key);
-              return null;
-            }
             if (inputState.operator && command.type == 'action') {
               // Ignore matched action commands after an operator. Operators
               // only operate on motions. This check is really for text
               // objects since aW, a[ etcs conflicts with a.
               continue;
             }
-            // Matches whole comand. Return the command.
+            // Match commands that take <character> as an argument.
             if (command.keys[keys.length - 1] == 'character') {
-              inputState.selectedCharacter = keys[keys.length - 1];
-              if(inputState.selectedCharacter.length>1){
-                switch(inputState.selectedCharacter){
+              selectedCharacter = keys[keys.length - 1];
+              if(selectedCharacter.length>1){
+                switch(selectedCharacter){
                   case '<CR>':
-                    inputState.selectedCharacter='\n';
+                    selectedCharacter='\n';
                     break;
                   case '<Space>':
-                    inputState.selectedCharacter=' ';
+                    selectedCharacter=' ';
                     break;
                   default:
                     continue;
                 }
               }
             }
+            // Add the command to the list of matched commands. Choose the best
+            // command later.
+            matchedCommands.push(command);
+          }
+        }
+
+        // Returns the command if it is a full match, or null if not.
+        function getFullyMatchedCommandOrNull(command) {
+          if (keys.length < command.keys.length) {
+            // Matches part of a multi-key command. Buffer and wait for next
+            // stroke.
+            inputState.keyBuffer.push(key);
+            return null;
+          } else {
+            if (command.keys[keys.length - 1] == 'character') {
+              inputState.selectedCharacter = selectedCharacter;
+            }
+            // Clear the buffer since a full match was found.
             inputState.keyBuffer = [];
             return command;
           }
         }
-        // Clear the buffer since there are no partial matches.
-        inputState.keyBuffer = [];
-        return null;
+
+        if (!matchedCommands.length) {
+          // Clear the buffer since there were no matches.
+          inputState.keyBuffer = [];
+          return null;
+        } else if (matchedCommands.length == 1) {
+          return getFullyMatchedCommandOrNull(matchedCommands[0]);
+        } else {
+          // Find the best match in the list of matchedCommands.
+          var context = vim.visualMode ? 'visual' : 'normal';
+          var bestMatch = matchedCommands[0]; // Default to first in the list.
+          for (var i = 0; i < matchedCommands.length; i++) {
+            if (matchedCommands[i].context == context) {
+              bestMatch = matchedCommands[i];
+              break;
+            }
+          }
+          return getFullyMatchedCommandOrNull(bestMatch);
+        }
       },
       processCommand: function(cm, vim, command) {
         vim.inputState.repeatOverride = command.repeatOverride;

From b510049b57221e27ab09ea068f737ea9805233f4 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 13 Oct 2013 21:11:28 -0400
Subject: [PATCH 0537/4742] [vim keymap] Improve s and S actions in visual mode

---
 keymap/vim.js    |  6 ++++--
 test/vim_test.js | 28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 295e728ca6..8b5ceab8c7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -76,8 +76,10 @@
     { keys: ['<C-p>'], type: 'keyToKey', toKeys: ['k'] },
     { keys: ['C-['], type: 'keyToKey', toKeys: ['<Esc>'] },
     { keys: ['<C-c>'], type: 'keyToKey', toKeys: ['<Esc>'] },
-    { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'] },
-    { keys: ['S'], type: 'keyToKey', toKeys: ['c', 'c'] },
+    { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'], context: 'normal' },
+    { keys: ['s'], type: 'keyToKey', toKeys: ['x', 'i'], context: 'visual'},
+    { keys: ['S'], type: 'keyToKey', toKeys: ['c', 'c'], context: 'normal' },
+    { keys: ['S'], type: 'keyToKey', toKeys: ['d', 'c', 'c'], context: 'visual' },
     { keys: ['<Home>'], type: 'keyToKey', toKeys: ['0'] },
     { keys: ['<End>'], type: 'keyToKey', toKeys: ['$'] },
     { keys: ['<PageUp>'], type: 'keyToKey', toKeys: ['<C-b>'] },
diff --git a/test/vim_test.js b/test/vim_test.js
index 16e853786c..fe272551c5 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1486,6 +1486,34 @@ testVim('visual_blank', function(cm, vim, helpers) {
   helpers.doKeys('v', 'k');
   eq(vim.visualMode, true);
 }, { value: '\n' });
+testVim('s_normal', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('s');
+  helpers.doInsertModeKeys('Esc');
+  helpers.assertCursorAt(0, 0);
+  eq('ac', cm.getValue());
+}, { value: 'abc'});
+testVim('s_visual', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('v', 's');
+  helpers.doInsertModeKeys('Esc');
+  helpers.assertCursorAt(0, 0);
+  eq('ac', cm.getValue());
+}, { value: 'abc'});
+testVim('S_normal', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('j', 'S');
+  helpers.doInsertModeKeys('Esc');
+  helpers.assertCursorAt(1, 0);
+  eq('aa\n\ncc', cm.getValue());
+}, { value: 'aa\nbb\ncc'});
+testVim('S_visual', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('v', 'j', 'S');
+  helpers.doInsertModeKeys('Esc');
+  helpers.assertCursorAt(0, 0);
+  eq('\ncc', cm.getValue());
+}, { value: 'aa\nbb\ncc'});
 testVim('/ and n/N', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('match');
   helpers.doKeys('/');

From 9938f55eeec3f7d05fa428def16e2255e94a3d3c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Oct 2013 11:05:17 +0200
Subject: [PATCH 0538/4742] [foldcode addon] Add experimental force argument to
 foldCode method

---
 addon/fold/foldcode.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 931c3726cc..c497bc29b6 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -1,7 +1,7 @@
 (function() {
   "use strict";
 
-  function doFold(cm, pos, options) {
+  function doFold(cm, pos, options, force) {
     var finder = options && (options.call ? options : options.rangeFinder);
     if (!finder) finder = cm.getHelper(pos, "fold");
     if (!finder) return;
@@ -13,7 +13,7 @@
       if (!range || range.to.line - range.from.line < minSize) return null;
       var marks = cm.findMarksAt(range.from);
       for (var i = 0; i < marks.length; ++i) {
-        if (marks[i].__isFold) {
+        if (marks[i].__isFold && force !== "fold") {
           if (!allowFolded) return null;
           range.cleared = true;
           marks[i].clear();
@@ -27,7 +27,7 @@
       pos = CodeMirror.Pos(pos.line - 1, 0);
       range = getRange(false);
     }
-    if (!range || range.cleared) return;
+    if (!range || range.cleared || force === "unfold") return;
 
     var myWidget = makeWidget(options);
     CodeMirror.on(myWidget, "mousedown", function() { myRange.clear(); });
@@ -59,7 +59,9 @@
   };
 
   // New-style interface
-  CodeMirror.defineExtension("foldCode", function(pos, options) { doFold(this, pos, options); });
+  CodeMirror.defineExtension("foldCode", function(pos, options, force) {
+    doFold(this, pos, options, force);
+  });
 
   CodeMirror.registerHelper("fold", "combine", function() {
     var funcs = Array.prototype.slice.call(arguments, 0);

From ed971ee403f2f7570b6593cf975b180fc9d78de0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Oct 2013 11:37:46 +0200
Subject: [PATCH 0539/4742] Allow a range to be specified to scrollIntoView,
 use it in search addon

Issue #1870
---
 addon/search/search.js |  2 ++
 doc/manual.html        | 18 ++++++++++--------
 lib/codemirror.js      | 35 +++++++++++++++++++++++------------
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index c30922df4f..71ed75b500 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -70,6 +70,7 @@
       if (!cursor.find(rev)) return;
     }
     cm.setSelection(cursor.from(), cursor.to());
+    cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
     state.posFrom = cursor.from(); state.posTo = cursor.to();
   });}
   function clearSearch(cm) {cm.operation(function() {
@@ -108,6 +109,7 @@
                   (start && cursor.from().line == start.line && cursor.from().ch == start.ch)) return;
             }
             cm.setSelection(cursor.from(), cursor.to());
+            cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
             confirmDialog(cm, doReplaceConfirm, "Replace?",
                           [function() {doReplace(match);}, advance]);
           };
diff --git a/doc/manual.html b/doc/manual.html
index 26db60a8f1..aad94e2f89 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1399,14 +1399,16 @@ <h3 id="api_sizing">Sizing, scrolling and positioning methods</h3>
       clientHeight}</code> object that represents the current scroll
       position, the size of the scrollable area, and the size of the
       visible area (minus scrollbars).</dd>
-      <dt id="scrollIntoView"><code><strong>cm.scrollIntoView</strong>(pos: {line, ch}|{left, top, right, bottom}, ?margin: number)</code></dt>
-      <dd>Scrolls the given element into view. <code>pos</code> may be
-      either a <code>{line, ch}</code> position, referring to a given
-      character, <code>null</code>, to refer to the cursor, or
-      a <code>{left, top, right, bottom}</code> object, in
-      editor-local coordinates. The <code>margin</code> parameter is
-      optional. When given, it indicates the amount of pixels around
-      the given area that should be made visible as well.</dd>
+      <dt id="scrollIntoView"><code><strong>cm.scrollIntoView</strong>(what: {line, ch}|{left, top, right, bottom}|{from, to}|null, ?margin: number)</code></dt>
+      <dd>Scrolls the given position into view. <code>what</code> may
+      be <code>null</code> to scroll the cursor into view,
+      a <code>{line, ch}</code> position to scroll a character into
+      view, a <code>{left, top, right, bottom}</code> pixel range (in
+      editor-local coordinates), or a range <code>{from, to}</code>
+      containing either two character positions or two pixel squares.
+      The <code>margin</code> parameter is optional. When given, it
+      indicates the amount of vertical pixels around the given area
+      that should be made visible as well.</dd>
 
       <dt id="cursorCoords"><code><strong>cm.cursorCoords</strong>(where: boolean|{line, ch}, mode: string) → {left, top, bottom}</code></dt>
       <dd>Returns an <code>{left, top, bottom}</code> object
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 36183dea6f..774bff0a36 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1387,7 +1387,8 @@ window.CodeMirror = (function() {
       display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = newScrollPos.scrollLeft;
       alignHorizontally(cm);
       if (op.scrollToPos)
-        scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos), op.scrollToPosMargin);
+        scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
+                          clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
     } else if (newScrollPos) {
       scrollCursorIntoView(cm);
     }
@@ -2638,7 +2639,7 @@ window.CodeMirror = (function() {
   // SCROLLING
 
   function scrollCursorIntoView(cm) {
-    var coords = scrollPosIntoView(cm, cm.doc.sel.head, cm.options.cursorScrollMargin);
+    var coords = scrollPosIntoView(cm, cm.doc.sel.head, null, cm.options.cursorScrollMargin);
     if (!cm.state.focused) return;
     var display = cm.display, box = getRect(display.sizer), doScroll = null;
     if (coords.top + box.top < 0) doScroll = true;
@@ -2655,11 +2656,15 @@ window.CodeMirror = (function() {
     }
   }
 
-  function scrollPosIntoView(cm, pos, margin) {
+  function scrollPosIntoView(cm, pos, end, margin) {
     if (margin == null) margin = 0;
     for (;;) {
       var changed = false, coords = cursorCoords(cm, pos);
-      var scrollPos = calculateScrollPos(cm, coords.left, coords.top - margin, coords.left, coords.bottom + margin);
+      var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
+      var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
+                                         Math.min(coords.top, endCoords.top) - margin,
+                                         Math.max(coords.left, endCoords.left),
+                                         Math.max(coords.bottom, endCoords.bottom) + margin);
       var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
       if (scrollPos.scrollTop != null) {
         setScrollTop(cm, scrollPos.scrollTop);
@@ -3177,17 +3182,23 @@ window.CodeMirror = (function() {
               clientHeight: scroller.clientHeight - co, clientWidth: scroller.clientWidth - co};
     },
 
-    scrollIntoView: operation(null, function(pos, margin) {
-      if (typeof pos == "number") pos = Pos(pos, 0);
+    scrollIntoView: operation(null, function(range, margin) {
+      if (range == null) range = {from: this.doc.sel.head, to: null};
+      else if (typeof range == "number") range = {from: Pos(range, 0), to: null};
+      else if (range.from == null) range = {from: range, to: null};
+      if (!range.to) range.to = range.from;
       if (!margin) margin = 0;
-      var coords = pos;
 
-      if (!pos || pos.line != null) {
-        this.curOp.scrollToPos = pos ? clipPos(this.doc, pos) : this.doc.sel.head;
-        this.curOp.scrollToPosMargin = margin;
-        coords = cursorCoords(this, this.curOp.scrollToPos);
+      var coords = range;
+      if (range.from.line != null) {
+        this.curOp.scrollToPos = {from: range.from, to: range.to, margin: margin};
+        coords = {from: cursorCoords(this, range.from),
+                  to: cursorCoords(this, range.to)};
       }
-      var sPos = calculateScrollPos(this, coords.left, coords.top - margin, coords.right, coords.bottom + margin);
+      var sPos = calculateScrollPos(this, Math.min(coords.from.left, coords.to.left),
+                                    Math.min(coords.from.top, coords.to.top) - margin,
+                                    Math.max(coords.from.right, coords.to.right),
+                                    Math.max(coords.from.bottom, coords.to.bottom) + margin);
       updateScrollPos(this, sPos.scrollLeft, sPos.scrollTop);
     }),
 

From 4fa89a7025d2fa633404c1e6a0ddb577eadd8ee6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Oct 2013 11:54:50 +0200
Subject: [PATCH 0540/4742] [markdown mode] Crude hack to not overwrite
 coloring of inline links

Closes #961
---
 mode/gfm/gfm.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 1179b53dc6..1411a9382a 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -75,7 +75,8 @@ CodeMirror.defineMode("gfm", function(config) {
           return "link";
         }
       }
-      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i)) {
+      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
+         stream.string.slice(stream.start - 2, stream.start) != "](") {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
         // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine

From 51a4b579a19eb75364d4ec0075b0271400648de5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 18 Oct 2013 17:06:34 +0200
Subject: [PATCH 0541/4742] [manual] Fix typo

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

diff --git a/doc/manual.html b/doc/manual.html
index aad94e2f89..b020cd5a69 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1384,7 +1384,7 @@ <h3 id="api_sizing">Sizing, scrolling and positioning methods</h3>
       <dt id="setSize"><code><strong>cm.setSize</strong>(width: number|string, height: number|string)</code></dt>
       <dd>Programatically set the size of the editor (overriding the
       applicable <a href="#css-resize">CSS
-      rules</a>). <code>width</code> and <code>height</code> height
+      rules</a>). <code>width</code> and <code>height</code>
       can be either numbers (interpreted as pixels) or CSS units
       (<code>"100%"</code>, for example). You can
       pass <code>null</code> for either of them to indicate that that

From c2189ecc0f6748a8ca755a929e154d52bc3fb3b3 Mon Sep 17 00:00:00 2001
From: Taha Jahangir <mtjahangir@gmail.com>
Date: Thu, 17 Oct 2013 21:32:13 +0330
Subject: [PATCH 0542/4742] [lint addon] Wrap long lint messages

e.g. errors on css `input.someLongClassName {}`
---
 addon/lint/lint.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index e592b3672a..414a9a0e06 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -14,6 +14,7 @@
   padding: 2px 5px;
   position: fixed;
   white-space: pre;
+  white-space: pre-wrap;
   z-index: 100;
   max-width: 600px;
   opacity: 0;

From 5ccebee0edc3cea8cef60c5992e447880ca17a16 Mon Sep 17 00:00:00 2001
From: Michael Zhou <moz@google.com>
Date: Thu, 17 Oct 2013 02:19:54 -0400
Subject: [PATCH 0543/4742] Add handleEx() to Vim mode's API

Provide an alternative (programmatic) way to run Ex commands.
---
 keymap/vim.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8b5ceab8c7..e67a46ed7f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -611,6 +611,9 @@
           }
           commandDispatcher.processCommand(cm, vim, command);
         }
+      },
+      handleEx: function(cm, input) {
+        exCommandDispatcher.processCommand(cm, input);
       }
     };
 

From 51a45cc94f1177187c65e29590e8f4132550d237 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 20 Oct 2013 17:02:54 +0200
Subject: [PATCH 0544/4742] Document a few more addons

Issue #1894
---
 doc/manual.html | 61 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 9 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index b020cd5a69..7f73b30647 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -359,7 +359,7 @@ <h2>Configuration</h2>
       which causes the cursor to not reach all the way to the bottom
       of the line, looks better</dd>
 
-      <dt id="option_resetSelectionOnContextMenu"><code><strong>resetSelectionOnContextMenu</strong>: boolean</dt>
+      <dt id="option_resetSelectionOnContextMenu"><code><strong>resetSelectionOnContextMenu</strong>: boolean</code></dt>
       <dd>Controls whether, when the context menu is opened with a
       click outside of the current selection, the cursor is moved to
       the point of the click. Defaults to <code>true</code>.</dd>
@@ -1788,6 +1788,19 @@ <h2>Addons</h2>
       The <a href="../demo/trailingspace.html">demo</a> has a nice
       squiggly underline style for this class.</dd>
 
+      <dt id="addon_closetag"><a href="../addon/edit/closetag.js"><code>edit/closetag.js</code></a></dt>
+      <dd>Provides utility functions for adding automatic tag closing
+      to XML modes. See
+      the <a href="../demo/closetag.html">demo</a>.</dd>
+
+      <dt id="addon_continuelist"><a href="../addon/edit/continuelist.js"><code>edit/continuelist.js</code></a></dt>
+      <dd>Markdown specific. Defines
+      a <code>"newlineAndIndentContinueMarkdownList"</code> <a href="#commands">command</a>
+      command that can be bound to <code>enter</code> to automatically
+      insert the leading characters for continuing a list. See
+      the <a href="../mode/markdown/index.html">Markdown mode
+      demo</a>.</dd>
+
       <dt id="addon_comment"><a href="../addon/comment/comment.js"><code>comment/comment.js</code></a></dt>
       <dd>Addon for commenting and uncommenting code. Adds three
       methods to CodeMirror instances:
@@ -1920,6 +1933,22 @@ <h2>Addons</h2>
       for <a href="../addon/runmode/runmode.node.js">running under
       node.js</a>.</dd>
 
+      <dt id="addon_colorize"><a href="../addon/runmode/colorize.js"><code>runmode/colorize.js</code></a></dt>
+      <dd>Provides a convenient way to syntax-highlight code snippets
+      in a webpage. Depends on
+      the <a href="#addon_runmode"><code>runmode</code></a> addon (or
+      its standalone variant). Provides
+      a <code>CodeMirror.colorize</code> function that can be called
+      with an array (or other array-ish collection) of DOM nodes that
+      represent the code snippets. By default, it'll get
+      all <code>pre</code> tags. Will read the <code>data-lang</code>
+      attribute of these nodes to figure out their language, and
+      syntax-color their content using the relevant CodeMirror mode
+      (you'll have to load the scripts for the relevant modes
+      yourself). A second argument may be provided to give a default
+      mode, used when no language attribute is found for a node. Used
+      in this manual to highlight example code.</dd>
+
       <dt id="addon_overlay"><a href="../addon/mode/overlay.js"><code>mode/overlay.js</code></a></dt>
       <dd>Mode combinator that can be used to extend a mode with an
       'overlay' — a secondary mode is run over the stream, along with
@@ -2086,7 +2115,13 @@ <h2>Addons</h2>
       and <code>range</code>, which defines how many lines the addon
       should scan when completing (defaults to 500).</dd>
 
-      <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>match-highlighter.js</code></a></dt>
+      <dt id="addon_sql_hint"><a href="../addon/hint/sql-hint.js"><code>hint/sql-hint.js</code></a></dt>
+      <dd>A simple SQL hinter. Defines <code>CodeMirror.hint.sql</code>.</dd>
+
+      <dt id="addon_pig_hint"><a href="../addon/hint/pig-hint.js"><code>hint/pig-hint.js</code></a></dt>
+      <dd>A simple hinter for <a href="../mode/pig/index.html">Pig Latin</a>. Defines <code>CodeMirror.hint.pig</code>.</dd>
+
+      <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>search/match-highlighter.js</code></a></dt>
       <dd>Adds a <code>highlightSelectionMatches</code> option that
       can be enabled to highlight all instances of a currently
       selected word. Can be set either to true or to an object
@@ -2105,8 +2140,9 @@ <h2>Addons</h2>
       <dt id="addon_lint"><a href="../addon/lint/lint.js"><code>lint/lint.js</code></a></dt>
       <dd>Defines an interface component for showing linting warnings,
       with pluggable warning sources
-      (see <a href="../addon/lint/json-lint.js"><code>json-lint.js</code></a>
-      and <a href="../addon/lint/javascript-lint.js"><code>javascript-lint.js</code></a>
+      (see <a href="../addon/lint/json-lint.js"><code>json-lint.js</code></a>,
+      <a href="../addon/lint/javascript-lint.js"><code>javascript-lint.js</code></a>,
+      and <a href="../addon/lint/css-lint.js"><code>css-lint.js</code></a>
       in the same directory). Defines a <code>lint</code> option that
       can be set to a warning source (for
       example <code>CodeMirror.lint.javascript</code>), or
@@ -2128,11 +2164,6 @@ <h2>Addons</h2>
       and adds a background with the class <code>CodeMirror-activeline-background</code>.
       is enabled. See the <a href="../demo/activeline.html">demo</a>.</dd>
 
-      <dt id="addon_closetag"><a href="../addon/edit/closetag.js"><code>edit/closetag.js</code></a></dt>
-      <dd>Provides utility functions for adding automatic tag closing
-      to XML modes. See
-      the <a href="../demo/closetag.html">demo</a>.</dd>
-
       <dt id="addon_loadmode"><a href="../addon/mode/loadmode.js"><code>mode/loadmode.js</code></a></dt>
       <dd>Defines a <code>CodeMirror.requireMode(modename,
       callback)</code> function that will try to load a given mode and
@@ -2213,6 +2244,18 @@ <h2>Addons</h2>
       editor in non-editable CodeMirror instances. The merge interface
       will highlight changes between the editable document and the
       original(s) (<a href="../demo/merge.html">demo</a>).</dd>
+
+      <dt id="addon_tern"><a href="../addon/tern/tern.js"><code>tern/tern.js</code></a></dt>
+      <dd>Provides integration with
+      the <a href="http://ternjs.net">Tern</a> JavaScript analysis
+      engine, for completion, definition finding, and minor
+      refactoring help. See the <a href="../demo/tern.html">demo</a>
+      for a very simple integration. For more involved scenarios, see
+      the comments at the top of
+      the <a href="../addon/tern/tern.js">addon</a> and the
+      implementation of the
+      (multi-file) <a href="http://ternjs.net/doc/demo.html">demonstration
+      on the Tern website</a>.</dd>
     </dl>
 </section>
 

From 8232c40dc0737bd4b690f285f5b894871bb913fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 20 Oct 2013 17:22:13 +0200
Subject: [PATCH 0545/4742] Improve mode writing docs a little, document line-
 and line-background- tokens

---
 doc/manual.html | 114 +++++++++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 49 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 7f73b30647..b6ab47f6e2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2269,15 +2269,15 @@ <h2>Writing CodeMirror Modes</h2>
     advanced modes can also handle indentation for the language.</p>
 
     <p id="defineMode">The mode script should
-    call <code>CodeMirror.defineMode</code> to register itself with
-    CodeMirror. This function takes two arguments. The first should be
-    the name of the mode, for which you should use a lowercase string,
-    preferably one that is also the name of the files that define the
-    mode (i.e. <code>"xml"</code> is defined in <code>xml.js</code>). The
-    second argument should be a function that, given a CodeMirror
-    configuration object (the thing passed to
-    the <code>CodeMirror</code> function) and an optional mode
-    configuration object (as in
+    call <code><strong>CodeMirror.defineMode</strong></code> to
+    register itself with CodeMirror. This function takes two
+    arguments. The first should be the name of the mode, for which you
+    should use a lowercase string, preferably one that is also the
+    name of the files that define the mode (i.e. <code>"xml"</code> is
+    defined in <code>xml.js</code>). The second argument should be a
+    function that, given a CodeMirror configuration object (the thing
+    passed to the <code>CodeMirror</code> function) and an optional
+    mode configuration object (as in
     the <a href="#option_mode"><code>mode</code></a> option), returns
     a mode object.</p>
 
@@ -2297,30 +2297,43 @@ <h2>Writing CodeMirror Modes</h2>
     reading a token, and which can be mutated by the tokenizer.</p>
 
     <p id="startState">Modes that use a state must define
-    a <code>startState</code> method on their mode object. This is a
-    function of no arguments that produces a state object to be used
-    at the start of a document.</p>
+    a <code><strong>startState</strong></code> method on their mode
+    object. This is a function of no arguments that produces a state
+    object to be used at the start of a document.</p>
 
     <p id="token">The most important part of a mode object is
-    its <code>token(stream, state)</code> method. All modes must
-    define this method. It should read one token from the stream it is
-    given as an argument, optionally update its state, and return a
-    style string, or <code>null</code> for tokens that do not have to
-    be styled. For your styles, you are encouraged to use the
-    'standard' names defined in the themes (without
+    its <code><strong>token</strong>(stream, state)</code> method. All
+    modes must define this method. It should read one token from the
+    stream it is given as an argument, optionally update its state,
+    and return a style string, or <code>null</code> for tokens that do
+    not have to be styled. For your styles, you are encouraged to use
+    the 'standard' names defined in the themes (without
     the <code>cm-</code> prefix). If that fails, it is also possible
     to come up with your own and write your own CSS theme file.<p>
 
+    <p id="token_style_line">A typical token string would
+    be <code>"variable"</code> or <code>"comment"</code>. Multiple
+    styles can be returned (separated by spaces), for
+    example <code>"string error"</code> for a thing that looks like a
+    string but is invalid somehow (say, missing its closing quote).
+    When a style is prefixed by <code>"line-"</code>
+    or <code>"line-background-"</code>, the style will be applied to
+    the whole line, analogous to what
+    the <a href="#addLineClass"><code>addLineClass</code></a> method
+    does—styling the <code>"text"</code> in the simple case, and
+    the <code>"background"</code> element
+    when <code>"line-background-"</code> is prefixed.</p>
+
     <p id="StringStream">The stream object that's passed
     to <code>token</code> encapsulates a line of code (tokens may
     never span lines) and our current position in that line. It has
     the following API:</p>
 
     <dl>
-      <dt><code><strong></strong><strong>eol</strong>() → boolean</code></dt>
+      <dt><code><strong>eol</strong>() → boolean</code></dt>
       <dd>Returns true only if the stream is at the end of the
       line.</dd>
-      <dt><code><strong></strong><strong>sol</strong>() → boolean</code></dt>
+      <dt><code><strong>sol</strong>() → boolean</code></dt>
       <dd>Returns true only if the stream is at the start of the
       line.</dd>
 
@@ -2383,9 +2396,10 @@ <h2>Writing CodeMirror Modes</h2>
 
     <p id="blankLine">By default, blank lines are simply skipped when
     tokenizing a document. For languages that have significant blank
-    lines, you can define a <code>blankLine(state)</code> method on
-    your mode that will get called whenever a blank line is passed
-    over, so that it can update the parser state.</p>
+    lines, you can define
+    a <code><strong>blankLine</strong>(state)</code> method on your
+    mode that will get called whenever a blank line is passed over, so
+    that it can update the parser state.</p>
 
     <p id="copyState">Because state object are mutated, and CodeMirror
     needs to keep valid versions of a state around so that it can
@@ -2395,17 +2409,17 @@ <h2>Writing CodeMirror Modes</h2>
     which hold arrays get a copy of these arrays (since arrays tend to
     be used as mutable stacks). When this is not correct, for example
     because a mode mutates non-array properties of its state object, a
-    mode object should define a <code>copyState</code> method,
-    which is given a state and should return a safe copy of that
-    state.</p>
+    mode object should define
+    a <code><strong>copyState</strong></code> method, which is given a
+    state and should return a safe copy of that state.</p>
 
     <p id="indent">If you want your mode to provide smart indentation
     (through the <a href="#indentLine"><code>indentLine</code></a>
     method and the <code>indentAuto</code>
     and <code>newlineAndIndent</code> commands, to which keys can be
     <a href="#option_extraKeys">bound</a>), you must define
-    an <code>indent(state, textAfter)</code> method on your mode
-    object.</p>
+    an <code><strong>indent</strong>(state, textAfter)</code> method
+    on your mode object.</p>
 
     <p>The indentation method should inspect the given state object,
     and optionally the <code>textAfter</code> string, which contains
@@ -2418,8 +2432,9 @@ <h2>Writing CodeMirror Modes</h2>
 
     <p id="mode_comment">To work well with
     the <a href="#addon_comment">commenting addon</a>, a mode may
-    define <code>lineComment</code> (string that starts a line
-    comment), <code>blockCommentStart</code>, <code>blockCommentEnd</code>
+    define <code><strong>lineComment</strong></code> (string that
+    starts a line
+    comment), <code><strong>blockCommentStart</strong></code>, <code><strong>blockCommentEnd</strong></code>
     (strings that start and end block comments),
     and <code>blockCommentLead</code> (a string to put at the start of
     continued lines in a block comment). All of these are
@@ -2455,13 +2470,14 @@ <h2>Writing CodeMirror Modes</h2>
     state.</p>
 
     <p id="innerMode">In a nested mode, it is recommended to add an
-    extra method, <code>innerMode</code> which, given a state object,
-    returns a <code>{state, mode}</code> object with the inner mode
-    and its state for the current position. These are used by utility
-    scripts such as the <a href="#addon_closetag">tag closer</a> to
-    get context information. Use the <code>CodeMirror.innerMode</code>
-    helper function to, starting from a mode and a state, recursively
-    walk down to the innermost mode and state.</p>
+    extra method, <code><strong>innerMode</strong></code> which, given
+    a state object, returns a <code>{state, mode}</code> object with
+    the inner mode and its state for the current position. These are
+    used by utility scripts such as the <a href="#addon_closetag">tag
+    closer</a> to get context information. Use
+    the <code>CodeMirror.innerMode</code> helper function to, starting
+    from a mode and a state, recursively walk down to the innermost
+    mode and state.</p>
 
     <p>To make indentation work properly in a nested parser, it is
     advisable to give the <code>startState</code> method of modes that
@@ -2470,25 +2486,25 @@ <h2>Writing CodeMirror Modes</h2>
     parser do this, for example, to allow JavaScript and CSS code
     inside the mixed-mode HTML mode to be properly indented.</p>
 
-    <p>It is possible, and encouraged, to associate your mode, or a
-    certain configuration of your mode, with
+    <p id="defineMIME">It is possible, and encouraged, to associate
+    your mode, or a certain configuration of your mode, with
     a <a href="http://en.wikipedia.org/wiki/MIME">MIME</a> type. For
     example, the JavaScript mode associates itself
     with <code>text/javascript</code>, and its JSON variant
     with <code>application/json</code>. To do this,
-    call <code>CodeMirror.defineMIME(mime, modeSpec)</code>,
-    where <code>modeSpec</code> can be a string or object specifying a
-    mode, as in the <a href="#option_mode"><code>mode</code></a>
-    option.</p>
+    call <code><strong>CodeMirror.defineMIME</strong>(mime,
+    modeSpec)</code>, where <code>modeSpec</code> can be a string or
+    object specifying a mode, as in
+    the <a href="#option_mode"><code>mode</code></a> option.</p>
 
     <p id="extendMode">Sometimes, it is useful to add or override mode
     object properties from external code.
-    The <code>CodeMirror.extendMode</code> can be used to add
-    properties to mode objects produced for a specific mode. Its first
-    argument is the name of the mode, its second an object that
-    specifies the properties that should be added. This is mostly
-    useful to add utilities that can later be looked
-    up through <a href="#getMode"><code>getMode</code></a>.</p>
+    The <code><strong>CodeMirror.extendMode</strong></code> function
+    can be used to add properties to mode objects produced for a
+    specific mode. Its first argument is the name of the mode, its
+    second an object that specifies the properties that should be
+    added. This is mostly useful to add utilities that can later be
+    looked up through <a href="#getMode"><code>getMode</code></a>.</p>
 </section>
 
 </article>

From 72217c56218982e32bccdc8dcaa71103edc9f434 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 20 Oct 2013 17:24:04 +0200
Subject: [PATCH 0546/4742] Work around poor italic support for webfont

---
 doc/docs.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/docs.css b/doc/docs.css
index d1ab21bad9..c56289346c 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -30,6 +30,10 @@ a, a:visited, a:link, .quasilink {
   text-decoration: none;
 }
 
+em {
+  padding-right: 2px;
+}
+
 .quasilink {
   cursor: pointer;
 }

From 865bfc857315e88c5eeeae0a5a4160a391b891bd Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 20 Oct 2013 13:22:28 -0400
Subject: [PATCH 0547/4742] [continuelist addon] Should continue list even
 after special chars (space, !, etc)

---
 addon/edit/continuelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index fb1fc38ba2..826d17d716 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -6,7 +6,7 @@
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
     var pos = cm.getCursor(),
-        inList = cm.getStateAfter(pos.line).list,
+        inList = cm.getStateAfter(pos.line).list !== false,
         match;
 
     if (!inList || !(match = cm.getLine(pos.line).match(listRE))) {

From 231e235b07ce03d46baac93b2da5c3447ccfdd1f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Oct 2013 10:18:54 +0200
Subject: [PATCH 0548/4742] Mark release 3.19.0

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

diff --git a/doc/compress.html b/doc/compress.html
index f3b85694d3..e01001d2bb 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=3.19.0;f=">3.19</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.18.0;f=">3.18</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.16.0;f=">3.16</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.15.0;f=">3.15</option>
diff --git a/doc/manual.html b/doc/manual.html
index b6ab47f6e2..e5a000a5c6 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2115,10 +2115,10 @@ <h2>Addons</h2>
       and <code>range</code>, which defines how many lines the addon
       should scan when completing (defaults to 500).</dd>
 
-      <dt id="addon_sql_hint"><a href="../addon/hint/sql-hint.js"><code>hint/sql-hint.js</code></a></dt>
+      <dt id="addon_sql-hint"><a href="../addon/hint/sql-hint.js"><code>hint/sql-hint.js</code></a></dt>
       <dd>A simple SQL hinter. Defines <code>CodeMirror.hint.sql</code>.</dd>
 
-      <dt id="addon_pig_hint"><a href="../addon/hint/pig-hint.js"><code>hint/pig-hint.js</code></a></dt>
+      <dt id="addon_pig-hint"><a href="../addon/hint/pig-hint.js"><code>hint/pig-hint.js</code></a></dt>
       <dd>A simple hinter for <a href="../mode/pig/index.html">Pig Latin</a>. Defines <code>CodeMirror.hint.pig</code>.</dd>
 
       <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>search/match-highlighter.js</code></a></dt>
diff --git a/doc/releases.html b/doc/releases.html
index 61b2b4eb7e..f04b4dcad8 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">21-10-2013: <a href="http://codemirror.net/codemirror-3.19.zip">Version 3.19</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="../mode/eiffel/index.html">Eiffel</a>, <a href="../mode/gherkin/index.html">Gherkin</a>, <a href="../mode/sql/?mime=text/x-mssql">MSSQL dialect</a>.</li>
+    <li>New addons: <a href="manual.html#addon_hardwrap">hardwrap</a>, <a href="manual.html#addon_sql-hint">sql-hint</a>.</li>
+    <li>New theme: <a href="../demo/theme.html?mbo">MBO</a>.</li>
+    <li>Add <a href="manual.html#token_style_line">support</a> for line-level styling from mode tokenizers.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.18.0...3.19.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">23-09-2013: <a href="http://codemirror.net/codemirror-3.18.zip">Version 3.18</a>:</p>
 
   <p class="rel-note">Emergency release to fix a problem in 3.17
diff --git a/index.html b/index.html
index 6816c1ff82..67771e8bd4 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.18</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.19</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 774bff0a36..563f688a26 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5902,7 +5902,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.18.1";
+  CodeMirror.version = "3.19.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 6dca63f37d..8310ab1551 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.18.1",
+    "version":"3.19.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From a540182b6ae25a9c05f25422ec2dae8eaf2444e7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Oct 2013 10:19:40 +0200
Subject: [PATCH 0549/4742] Bump version number post-3.19

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 563f688a26..e316031fa5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5902,7 +5902,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.19.0";
+  CodeMirror.version = "3.19.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 8310ab1551..10e70a1b9f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.19.0",
+    "version":"3.19.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From a4452796415309ba6da2a89861d8ce9b8d0e77f5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Oct 2013 08:17:05 +0200
Subject: [PATCH 0550/4742] [manual] Mention using content form textarea in
 fromTextArea docs

---
 doc/manual.html | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index e5a000a5c6..ba8789a836 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1615,13 +1615,14 @@ <h3 id="api_static">Static properties</h3>
 
       <dt id="fromTextArea"><code><strong>CodeMirror.fromTextArea</strong>(textArea: TextAreaElement, ?config: object)</code></dt>
       <dd>
-        The method provides another way to initialize an editor. It takes a
-        textarea DOM node as first argument and an optional configuration
-        object as second. It will replace the textarea with a CodeMirror
-        instance, and wire up the form of that textarea (if any) to make
-        sure the editor contents are put into the textarea when the form
-        is submitted. A CodeMirror instance created this way has three
-        additional methods:
+        The method provides another way to initialize an editor. It
+        takes a textarea DOM node as first argument and an optional
+        configuration object as second. It will replace the textarea
+        with a CodeMirror instance, and wire up the form of that
+        textarea (if any) to make sure the editor contents are put
+        into the textarea when the form is submitted. The text in the
+        textarea will provide the content for the editor. A CodeMirror
+        instance created this way has three additional methods:
         <dl>
           <dt id="save"><code><strong>cm.save</strong>()</code></dt>
           <dd>Copy the content of the editor into the textarea.</dd>

From cdf55221a8a2fb8059f159feadc3797ba967e515 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Oct 2013 09:40:14 +0200
Subject: [PATCH 0551/4742] Allow marked ranges that are inclusive on boths
 sides to be zero-length

---
 lib/codemirror.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e316031fa5..289e8f9d78 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3850,7 +3850,9 @@ window.CodeMirror = (function() {
     if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
 
     var marker = new TextMarker(doc, type);
-    if (type == "range" && !posLess(from, to)) return marker;
+    if (posLess(to, from) || posEq(from, to) && type == "range" &&
+        !(options.inclusiveLeft && options.inclusiveRight))
+      return marker;
     if (options) copyObj(options, marker);
     if (marker.replacedWith) {
       marker.collapsed = true;
@@ -3966,7 +3968,9 @@ window.CodeMirror = (function() {
     if (old) for (var i = 0, nw; i < old.length; ++i) {
       var span = old[i], marker = span.marker;
       var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
-      if (startsBefore || marker.type == "bookmark" && span.from == startCh && (!isInsert || !span.marker.insertLeft)) {
+      if (startsBefore ||
+          (marker.inclusiveLeft && marker.inclusiveRight || marker.type == "bookmark") &&
+          span.from == startCh && (!isInsert || !span.marker.insertLeft)) {
         var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
         (nw || (nw = [])).push({from: span.from,
                                 to: endsAfter ? null : span.to,

From a6a32922952dfd2360031d0a692f6373972e8759 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Oct 2013 09:41:28 +0200
Subject: [PATCH 0552/4742] [tern demo] Include polyfill script for IE7/8

---
 demo/tern.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/tern.html b/demo/tern.html
index adc79e5c3d..6843c7f5ec 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -16,6 +16,7 @@
 <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/doc/demo/polyfill.js"></script>
 <script src="http://ternjs.net/lib/signal.js"></script>
 <script src="http://ternjs.net/lib/tern.js"></script>
 <script src="http://ternjs.net/lib/def.js"></script>

From e7b736aed0af447445a523852bb0d12dd9194833 Mon Sep 17 00:00:00 2001
From: Jon Malmaud <malmaud@gmail.com>
Date: Mon, 21 Oct 2013 19:47:08 -0400
Subject: [PATCH 0553/4742] [julia mode] Add

---
 mode/julia/index.html | 121 +++++++++++++++++++
 mode/julia/julia.js   | 268 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 389 insertions(+)
 create mode 100644 mode/julia/index.html
 create mode 100644 mode/julia/julia.js

diff --git a/mode/julia/index.html b/mode/julia/index.html
new file mode 100644
index 0000000000..a79341df7a
--- /dev/null
+++ b/mode/julia/index.html
@@ -0,0 +1,121 @@
+<!doctype html>
+
+<title>CodeMirror: Julia 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="julia.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Julia</a>
+  </ul>
+</div>
+
+<article>
+<h2>Julia mode</h2>
+
+    <div><textarea id="code" name="code">
+#numbers
+1234
+1234im
+.234
+.234im
+2.23im
+23e2
+0x234
+
+#strings
+'a'
+"asdf"
+r"regex"
+b"bytestring"
+
+#identifiers
+a
+as123
+function_name!
+
+#literal identifier multiples
+3x
+4[1, 2, 3]
+
+#dicts and indexing
+x=[1, 2, 3]
+x[end-1]
+x={"julia"=>"language of technical computing"}
+
+#types
+immutable Color{T<:Number}
+  r::T
+  g::T
+  b::T
+end
+
+#functions
+function change!(x::Vector{Float64})
+  for i = 1:length(x)
+    x[i] *= 2
+  end
+end
+
+#operators
+-
++
+=
+/
+\
+//
+->
+==
+>
+<
+|
+&
+>=
+<=
+&
+~
+.>=
+.<=
+.==
++=
+-=
+/=
+...
+
+#keywords and operators
+if else elseif while for
+in begin let end do
+try catch finally return break continue
+global local const 
+export import importall using
+function macro module baremodule 
+type immutable quote
+all true false any enumerate
+
+
+    </textarea></div>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "julia",
+               },
+        lineNumbers: true,
+        indentUnit: 4,
+        tabMode: "shift",
+        matchBrackets: true
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-julia</code>.</p>
+</article>
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
new file mode 100644
index 0000000000..e2510e37de
--- /dev/null
+++ b/mode/julia/julia.js
@@ -0,0 +1,268 @@
+CodeMirror.defineMode("julia", function(conf, parserConf) {
+  var ERRORCLASS = 'error';
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  var singleOperators = parserConf.singleOperators || /^[?:=+&\-*%|$^~<>!/\\]/;
+  var singleDelimiters = parserConf.singleDelimiters || /^[;,()[\]{}]/;
+  var doubleOperators = parserConf.doubleOperators || /^(==)|(!=)|(<=)|(<:)|(>=)|(\.>)|(\.<)|(<<)|(>>)|(->)|[//]{2}/;
+  var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=)|(-=)|(\*=)|(%=)|(\\=)|(\^=)|(&=)|(\|=)|(&=)|([//]=)/;
+  var tripleDelimiters = parserConf.tripleDelimiters || /^(>>=)|(<<=)|(\.>=)|(\.<=)|(\.==)|(>>>)/;
+  var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/
+  var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif"];
+  var blockClosers = ["end", "else", "elseif"];
+  var wordOperators = wordRegexp(['in']);
+  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'in', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote'];
+  var builtinList = ['all', 'true', 'false', 'any', 'enumerate', 'open', 'close', 'linspace', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'error', 'warn', 'info'];
+
+  //var stringPrefixes = new RegExp("^[br]?('|\")")
+  var stringPrefixes = /^[br]?('|")/;
+  var keywords = wordRegexp(keywordList);
+  var builtins = wordRegexp(builtinList);
+  var openers = wordRegexp(blockOpeners);
+  var closers = wordRegexp(blockClosers);
+  var indentInfo = null;
+
+  function in_array(state) {
+    ch = cur_scope(state);
+    if(ch=="[" || ch=="{") {
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
+
+  function cur_scope(state) {
+    if(state.scopes.length==0) {
+      return null;
+    }
+    return state.scopes[state.scopes.length - 1];
+  }
+
+  // tokenizers
+  function tokenBase(stream, state) {
+    // Handle scope changes
+    if(state.leaving_expr) {
+      if(stream.match(/^'+/)) {
+        return 'operator';
+      }
+      if(stream.match("...")) {
+        return 'operator';
+      }
+    }
+
+    if (stream.eatSpace()) {
+      return null;
+    }
+
+    var ch = stream.peek();
+    // Handle Comments
+    if (ch === '#') {
+        stream.skipToEnd();
+        return 'comment';
+    }
+    if(ch==='[') {
+      state.scopes.push("[");
+    }
+
+    if(ch==='{') {
+      state.scopes.push("{");
+    }
+
+    var scope=cur_scope(state);
+
+    if(scope==='[' && ch===']') {
+      state.scopes.pop();
+      state.leaving_expr=true;
+    }
+
+    if(scope==='{' && ch==='}') {
+      state.scopes.pop();
+      state.leaving_expr=true;
+    }
+
+    if(match=stream.match(openers, false)) {
+      state.scopes.push(match);
+    }
+
+    if(!in_array(state) && stream.match(closers, false)) {
+      state.scopes.pop();
+    }
+
+    if(in_array(state)) {
+      if(stream.match("end")) {
+        return 'number';
+      }
+
+    }
+    if(stream.match("=>")) {
+      return 'operator';
+    }
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.]/, false)) {
+      var imMatcher = RegExp(/^im\b/);
+      var floatLiteral = false;
+      // Floats
+      if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
+      if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
+      if (stream.match(/^\.\d+/)) { floatLiteral = true; }
+      if (floatLiteral) {
+          // Float literals may be "imaginary"
+          stream.match(imMatcher);
+          return 'number';
+      }
+      // Integers
+      var intLiteral = false;
+      // Hex
+      if (stream.match(/^0x[0-9a-f]+/i)) { intLiteral = true; }
+      // Binary
+      if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
+      // Octal
+      if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
+      // Decimal
+      if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
+          // 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.
+      if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
+      if (intLiteral) {
+          // Integer literals may be "long"
+          stream.match(imMatcher);
+          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(tripleDelimiters) || stream.match(doubleDelimiters)) {
+      return null;
+    }
+    if (stream.match(doubleOperators)
+      || stream.match(singleOperators)
+      || stream.match(wordOperators)) {
+      return 'operator';
+    }
+    if (stream.match(singleDelimiters)) {
+      return null;
+    }
+
+    if (stream.match(keywords)) {
+      return 'keyword';
+    }
+
+    if (stream.match(builtins)) {
+      return 'builtin';
+    }
+
+
+    if (stream.match(identifiers)) {
+      state.leaving_expr=true;
+      return 'variable';
+    }
+    // Handle non-detected items
+    stream.next();
+    return ERRORCLASS;
+  }
+
+  function tokenStringFactory(delimiter) {
+    while ('rub'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
+      delimiter = delimiter.substr(1);
+    }
+    var singleline = delimiter.length == 1;
+    var OUTCLASS = 'string';
+
+    function tokenString(stream, state) {
+      while (!stream.eol()) {
+        stream.eatWhile(/[^'"\\]/);
+        if (stream.eat('\\')) {
+            stream.next();
+            if (singleline && stream.eol()) {
+              return OUTCLASS;
+            }
+        } else 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;
+    }
+    tokenString.isString = true;
+    return tokenString;
+  }
+
+  function tokenLexer(stream, state) {
+    indentInfo = null;
+    var style = state.tokenize(stream, state);
+    var current = stream.current();
+
+    // Handle '.' connected identifiers
+    if (current === '.') {
+      style = stream.match(identifiers, false) ? null : ERRORCLASS;
+      if (style === null && state.lastStyle === 'meta') {
+          // Apply 'meta' style to '.' connected identifiers when
+          // appropriate.
+        style = 'meta';
+      }
+      return style;
+    }
+
+    // Handle macro calls
+    if (current === '@') {
+      return stream.match(identifiers, false) ? 'meta' : ERRORCLASS;
+    }
+
+    return style;
+  }
+
+  var external = {
+    startState: function(basecolumn) {
+      return {
+        tokenize: tokenBase,
+        scopes: [],
+        leaving_expr: false
+      };
+    },
+
+    token: function(stream, state) {
+      var style = tokenLexer(stream, state);
+      state.lastStyle = style;
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var delta = 0;
+      if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif") {
+        delta = -1;
+      }
+      return (state.scopes.length + delta) * 2;
+    },
+
+    lineComment: "#",
+    fold: "indent",
+    electricChars: "endlsif]}"
+  };
+  return external;
+});
+
+
+CodeMirror.defineMIME("text/x-julia", "julia");

From 0611e27f66ee93ce14efeefde6b0a51a70153839 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Oct 2013 10:34:39 +0200
Subject: [PATCH 0554/4742] [julia mode] Simplify regexps, fix lint errors

Issue #1897
---
 mode/julia/julia.js | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index e2510e37de..667ffc32d4 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -1,19 +1,15 @@
-CodeMirror.defineMode("julia", function(conf, parserConf) {
+CodeMirror.defineMode("julia", function(_conf, parserConf) {
   var ERRORCLASS = 'error';
 
   function wordRegexp(words) {
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var singleOperators = parserConf.singleOperators || /^[?:=+&\-*%|$^~<>!/\\]/;
-  var singleDelimiters = parserConf.singleDelimiters || /^[;,()[\]{}]/;
-  var doubleOperators = parserConf.doubleOperators || /^(==)|(!=)|(<=)|(<:)|(>=)|(\.>)|(\.<)|(<<)|(>>)|(->)|[//]{2}/;
-  var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=)|(-=)|(\*=)|(%=)|(\\=)|(\^=)|(&=)|(\|=)|(&=)|([//]=)/;
-  var tripleDelimiters = parserConf.tripleDelimiters || /^(>>=)|(<<=)|(\.>=)|(\.<=)|(\.==)|(>>>)/;
-  var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/
+  var operators = parserConf.operators || /^(?:[|&^\\%*+\-<>!=\/]=?|\?|~|:|$|<:|\.[<>]|<<=?|>>>?=?|\.[<>]=|->?|\/\/|in)/;
+  var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
+  var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/;
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif"];
   var blockClosers = ["end", "else", "elseif"];
-  var wordOperators = wordRegexp(['in']);
   var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'in', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote'];
   var builtinList = ['all', 'true', 'false', 'any', 'enumerate', 'open', 'close', 'linspace', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'error', 'warn', 'info'];
 
@@ -26,7 +22,7 @@ CodeMirror.defineMode("julia", function(conf, parserConf) {
   var indentInfo = null;
 
   function in_array(state) {
-    ch = cur_scope(state);
+    var ch = cur_scope(state);
     if(ch=="[" || ch=="{") {
       return true;
     }
@@ -84,6 +80,7 @@ CodeMirror.defineMode("julia", function(conf, parserConf) {
       state.leaving_expr=true;
     }
 
+    var match;
     if(match=stream.match(openers, false)) {
       state.scopes.push(match);
     }
@@ -145,15 +142,10 @@ CodeMirror.defineMode("julia", function(conf, parserConf) {
     }
 
     // Handle operators and Delimiters
-    if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
-      return null;
-    }
-    if (stream.match(doubleOperators)
-      || stream.match(singleOperators)
-      || stream.match(wordOperators)) {
+    if (stream.match(operators)) {
       return 'operator';
     }
-    if (stream.match(singleDelimiters)) {
+    if (stream.match(delimiters)) {
       return null;
     }
 
@@ -235,7 +227,7 @@ CodeMirror.defineMode("julia", function(conf, parserConf) {
   }
 
   var external = {
-    startState: function(basecolumn) {
+    startState: function() {
       return {
         tokenize: tokenBase,
         scopes: [],

From 700c239364971ac4f5e038f8c2682399a43da4c2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Oct 2013 10:36:05 +0200
Subject: [PATCH 0555/4742] [julia mode] Integrate

---
 doc/compress.html | 1 +
 mode/index.html   | 1 +
 mode/meta.js      | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/compress.html b/doc/compress.html
index e01001d2bb..d1384a76ef 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -107,6 +107,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/jade/jade.js">jade.js</option>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
+          <option value="http://codemirror.net/mode/julia/julia.js">jinja2.js</option>
           <option value="http://codemirror.net/mode/less/less.js">less.js</option>
           <option value="http://codemirror.net/mode/livescript/livescript.js">livescript.js</option>
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
diff --git a/mode/index.html b/mode/index.html
index cbdef24f09..337f3336e4 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -60,6 +60,7 @@ <h2>Language modes</h2>
       <li><a href="jade/index.html">Jade</a></li>
       <li><a href="javascript/index.html">JavaScript</a></li>
       <li><a href="jinja2/index.html">Jinja2</a></li>
+      <li><a href="julia/index.html">Julia</a></li>
       <li><a href="less/index.html">LESS</a></li>
       <li><a href="livescript/index.html">LiveScript</a></li>
       <li><a href="lua/index.html">Lua</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index f6bbd1b45c..47f042568d 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -36,7 +36,8 @@ CodeMirror.modeInfo = [
   {name: 'JSON', mime: 'application/x-json', mode: 'javascript'},
   {name: 'JSON', mime: 'application/json', mode: 'javascript'},
   {name: 'TypeScript', mime: 'application/typescript', mode: 'javascript'},
-  {name: 'Jinja2', mime: 'jinja2', mode: 'jinja2'},
+  {name: 'Jinja2', mime: null, mode: 'jinja2'},
+  {name: 'Julia', mime: 'text/x-julia', mode: 'julia'},
   {name: 'LESS', mime: 'text/x-less', mode: 'less'},
   {name: 'LiveScript', mime: 'text/x-livescript', mode: 'livescript'},
   {name: 'Lua', mime: 'text/x-lua', mode: 'lua'},

From dda5ed52ae60e920de913285d134f5d62a0d3be2 Mon Sep 17 00:00:00 2001
From: Jon Malmaud <malmaud@gmail.com>
Date: Tue, 22 Oct 2013 10:29:24 -0400
Subject: [PATCH 0556/4742] [julia mode] small tweaks

Closes #1899
---
 mode/julia/index.html | 3 +++
 mode/julia/julia.js   | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mode/julia/index.html b/mode/julia/index.html
index a79341df7a..3e42e9b9bf 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -69,6 +69,9 @@ <h2>Julia mode</h2>
   end
 end
 
+#function invocation
+f('b', (2, 3)...)
+
 #operators
 -
 +
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 667ffc32d4..0a7939a729 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -5,7 +5,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var operators = parserConf.operators || /^(?:[|&^\\%*+\-<>!=\/]=?|\?|~|:|$|<:|\.[<>]|<<=?|>>>?=?|\.[<>]=|->?|\/\/|in)/;
+  var operators = parserConf.operators || /^(?:[|&^\\%*+\-<>!=\/]=?|\?|~|:|$|<:|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|in|\.{3})/;
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
   var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/;
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif"];
@@ -41,7 +41,9 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   // tokenizers
   function tokenBase(stream, state) {
     // Handle scope changes
-    if(state.leaving_expr) {
+    leaving_expr = state.leaving_expr
+    state.leaving_expr = false
+    if(leaving_expr) {
       if(stream.match(/^'+/)) {
         return 'operator';
       }

From bc1e97f19c5e40f083d338cbfebdd2b48b0cabd7 Mon Sep 17 00:00:00 2001
From: Jon Malmaud <malmaud@gmail.com>
Date: Tue, 22 Oct 2013 11:20:19 -0400
Subject: [PATCH 0557/4742] [julia mode] add single-precision literals

---
 mode/julia/index.html | 1 +
 mode/julia/julia.js   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/julia/index.html b/mode/julia/index.html
index 3e42e9b9bf..5fa900190b 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -32,6 +32,7 @@ <h2>Julia mode</h2>
 .234
 .234im
 2.23im
+2.3f3
 23e2
 0x234
 
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 0a7939a729..0369b3ec73 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -105,7 +105,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       var imMatcher = RegExp(/^im\b/);
       var floatLiteral = false;
       // Floats
-      if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
+      if (stream.match(/^\d*\.\d+([ef][\+\-]?\d+)?/i)) { floatLiteral = true; }
       if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
       if (stream.match(/^\.\d+/)) { floatLiteral = true; }
       if (floatLiteral) {

From 3ba1029b0366768606c4a0211bb208a6b9a84e83 Mon Sep 17 00:00:00 2001
From: Jon Malmaud <malmaud@gmail.com>
Date: Tue, 22 Oct 2013 11:27:39 -0400
Subject: [PATCH 0558/4742] [julia mode] add triple-quote strings and
 exception-handling support

---
 mode/julia/index.html | 13 +++++++++++++
 mode/julia/julia.js   | 12 ++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/mode/julia/index.html b/mode/julia/index.html
index 5fa900190b..6b9db12386 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -42,6 +42,10 @@ <h2>Julia mode</h2>
 r"regex"
 b"bytestring"
 
+"""
+multiline string
+"""
+
 #identifiers
 a
 as123
@@ -56,6 +60,15 @@ <h2>Julia mode</h2>
 x[end-1]
 x={"julia"=>"language of technical computing"}
 
+#exception handling
+try
+  f()
+catch
+  @printf "Error"
+finally
+  g()
+end
+
 #types
 immutable Color{T<:Number}
   r::T
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 0369b3ec73..7b5e5b1ed7 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -8,13 +8,13 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   var operators = parserConf.operators || /^(?:[|&^\\%*+\-<>!=\/]=?|\?|~|:|$|<:|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|in|\.{3})/;
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
   var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/;
-  var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif"];
-  var blockClosers = ["end", "else", "elseif"];
-  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'in', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote'];
+  var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch"];
+  var blockClosers = ["end", "else", "elseif", "catch", "finally"];
+  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'in', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias'];
   var builtinList = ['all', 'true', 'false', 'any', 'enumerate', 'open', 'close', 'linspace', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'error', 'warn', 'info'];
 
   //var stringPrefixes = new RegExp("^[br]?('|\")")
-  var stringPrefixes = /^[br]?('|")/;
+  var stringPrefixes = /^[br]?('|"{3}|")/;
   var keywords = wordRegexp(keywordList);
   var builtins = wordRegexp(builtinList);
   var openers = wordRegexp(blockOpeners);
@@ -245,7 +245,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
     indent: function(state, textAfter) {
       var delta = 0;
-      if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif") {
+      if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") {
         delta = -1;
       }
       return (state.scopes.length + delta) * 2;
@@ -253,7 +253,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
     lineComment: "#",
     fold: "indent",
-    electricChars: "endlsif]}"
+    electricChars: "edlsifyh]}"
   };
   return external;
 });

From 4bde3e184d32345e200ea1a498ce7c31012296b6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Oct 2013 17:31:44 +0200
Subject: [PATCH 0559/4742] Fix lint errors

Issue #1900
---
 mode/julia/julia.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 7b5e5b1ed7..c0e5902f3f 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -41,8 +41,8 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   // tokenizers
   function tokenBase(stream, state) {
     // Handle scope changes
-    leaving_expr = state.leaving_expr
-    state.leaving_expr = false
+    var leaving_expr = state.leaving_expr;
+    state.leaving_expr = false;
     if(leaving_expr) {
       if(stream.match(/^'+/)) {
         return 'operator';

From 32d7db0cf78f5ed9dde3450ad885ced98851271b Mon Sep 17 00:00:00 2001
From: Narciso Jaramillo <njaramil@adobe.com>
Date: Tue, 22 Oct 2013 15:41:21 -0700
Subject: [PATCH 0560/4742] Always move cursor to end of indent even if
 whitespace didn't change

---
 lib/codemirror.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 289e8f9d78..e52c883201 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2759,7 +2759,9 @@ window.CodeMirror = (function() {
       for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
     if (pos < indentation) indentString += spaceStr(indentation - pos);
 
-    if (indentString != curSpaceString)
+    if (indentString == curSpaceString)
+      setSelection(cm.doc, Pos(n, curSpaceString.length), Pos(n, curSpaceString.length));
+    else
       replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
     line.stateAfter = null;
   }

From d88a9daf0e5df8a062793e383e69c0c07c493413 Mon Sep 17 00:00:00 2001
From: Jon Malmaud <malmaud@gmail.com>
Date: Tue, 22 Oct 2013 16:41:50 -0400
Subject: [PATCH 0561/4742] [julia mode] added additional operators and fixed
 'in' keyword

---
 mode/julia/index.html | 76 ++++++++++++++++++++++++++++++++++---------
 mode/julia/julia.js   |  4 +--
 2 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/mode/julia/index.html b/mode/julia/index.html
index 6b9db12386..bdb357bd49 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -87,29 +87,75 @@ <h2>Julia mode</h2>
 f('b', (2, 3)...)
 
 #operators
--
-+
-=
-/
-\
-//
-->
+|=
+&=
+^=
+\-
+%=
+*=
++=
+-=
+<=
+>=
+!=
 ==
->
+%
+*
++
+-
 <
+>
+!
+=
 |
 &
->=
-<=
-&
+^
+\
+?
 ~
-.>=
+:
+$
+<:
+.<
+.>
+<<
+<<=
+>>
+>>>>
+>>=
+>>>=
+<<=
+<<<=
 .<=
+.>=
 .==
-+=
--=
-/=
+->
+//
+in
 ...
+//
+:=
+.//=
+.*=
+./=
+.^=
+.%=
+.+=
+.-=
+\=
+\\=
+||
+===
+&&
+|=
+.|=
+<:
+>:
+|>
+<|
+::
+x ? y : z
+
 
 #keywords and operators
 if else elseif while for
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index c0e5902f3f..edf9dc41b5 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -5,12 +5,12 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var operators = parserConf.operators || /^(?:[|&^\\%*+\-<>!=\/]=?|\?|~|:|$|<:|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|in|\.{3})/;
+  var operators = parserConf.operators || /^(?:\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|<:|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b|\.{3})/;
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
   var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/;
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch"];
   var blockClosers = ["end", "else", "elseif", "catch", "finally"];
-  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'in', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias'];
+  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];
   var builtinList = ['all', 'true', 'false', 'any', 'enumerate', 'open', 'close', 'linspace', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'error', 'warn', 'info'];
 
   //var stringPrefixes = new RegExp("^[br]?('|\")")

From b03a9bcb927d281a8d937a4b3b71ead61fe00e3a Mon Sep 17 00:00:00 2001
From: Jon Malmaud <malmaud@gmail.com>
Date: Wed, 23 Oct 2013 10:38:58 -0400
Subject: [PATCH 0562/4742] [julia mode] added support for macros and revised
 keyword and builtin list

---
 mode/julia/index.html |  7 +++++--
 mode/julia/julia.js   | 12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mode/julia/index.html b/mode/julia/index.html
index bdb357bd49..dd567a623b 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -156,16 +156,19 @@ <h2>Julia mode</h2>
 ::
 x ? y : z
 
+#macros
+@spawnat 2 1+1
+@eval(:x)
 
 #keywords and operators
 if else elseif while for
-in begin let end do
+ begin let end do
 try catch finally return break continue
 global local const 
 export import importall using
 function macro module baremodule 
 type immutable quote
-all true false any enumerate
+true false enumerate
 
 
     </textarea></div>
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index edf9dc41b5..9ec2428cd4 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -11,7 +11,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch"];
   var blockClosers = ["end", "else", "elseif", "catch", "finally"];
   var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];
-  var builtinList = ['all', 'true', 'false', 'any', 'enumerate', 'open', 'close', 'linspace', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'error', 'warn', 'info'];
+  var builtinList = ['true', 'false', 'enumerate', 'open', 'close', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'UTF8String', 'ASCIIString', 'error', 'warn', 'info', '@printf'];
 
   //var stringPrefixes = new RegExp("^[br]?('|\")")
   var stringPrefixes = /^[br]?('|"{3}|")/;
@@ -19,6 +19,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   var builtins = wordRegexp(builtinList);
   var openers = wordRegexp(blockOpeners);
   var closers = wordRegexp(blockClosers);
+  var macro = /@[_A-Za-z][_A-Za-z0-9]*!*/;
   var indentInfo = null;
 
   function in_array(state) {
@@ -147,6 +148,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     if (stream.match(operators)) {
       return 'operator';
     }
+
     if (stream.match(delimiters)) {
       return null;
     }
@@ -159,6 +161,9 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return 'builtin';
     }
 
+    if (stream.match(macro)) {
+      return 'meta';
+    }
 
     if (stream.match(identifiers)) {
       state.leaving_expr=true;
@@ -220,11 +225,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return style;
     }
 
-    // Handle macro calls
-    if (current === '@') {
-      return stream.match(identifiers, false) ? 'meta' : ERRORCLASS;
-    }
-
     return style;
   }
 

From d64d8ba868dac600ba8572d3e4b51d612a9116fa Mon Sep 17 00:00:00 2001
From: Jason Johnston <jason+github@lojjic.com>
Date: Tue, 22 Oct 2013 13:41:45 -0600
Subject: [PATCH 0563/4742] [matchbrackets addon] add a maxScanLines
 configuration, defaulting to 100.

---
 addon/edit/matchbrackets.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 131fe831fd..9d9b3882f7 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -8,6 +8,7 @@
   function findMatchingBracket(cm, where, strict) {
     var state = cm.state.matchBrackets;
     var maxScanLen = (state && state.maxScanLineLength) || 10000;
+    var maxScanLines = (state && state.maxScanLines) || 100;
 
     var cur = where || cm.getCursor(), line = cm.getLineHandle(cur.line), pos = cur.ch - 1;
     var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
@@ -32,7 +33,7 @@
         }
       }
     }
-    for (var i = cur.line, found, e = forward ? Math.min(i + 100, cm.lineCount()) : Math.max(-1, i - 100); i != e; i+=d) {
+    for (var i = cur.line, found, e = forward ? Math.min(i + maxScanLines, cm.lineCount()) : Math.max(-1, i - maxScanLines); i != e; i+=d) {
       if (i == cur.line) found = scan(line, i, pos);
       else found = scan(cm.getLineHandle(i), i);
       if (found) break;

From 02f49478ebbe133a1567832726589f05af0d4a3f Mon Sep 17 00:00:00 2001
From: angelozerr <angelo.zerr@gmail.com>
Date: Tue, 22 Oct 2013 17:03:01 +0200
Subject: [PATCH 0564/4742] [tern addon] Make it possible to pass in explicit
 positions

Create Tern request with optionnal pos to manage for instance tern
hover. See demo at
http://codemirror-java.opensagres.eu.cloudbees.net/codemirror-javascript/demo/javascript-all.html
---
 addon/tern/tern.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index fe93fa7335..1f18a657fb 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -96,7 +96,7 @@
 
     getHint: function(cm, c) { return hint(this, cm, c); },
 
-    showType: function(cm) { showType(this, cm); },
+    showType: function(cm, pos) { showType(this, cm, pos); },
 
     updateArgHints: function(cm) { updateArgHints(this, cm); },
 
@@ -106,10 +106,10 @@
 
     rename: function(cm) { rename(this, cm); },
 
-    request: function (cm, query, c) {
+    request: function (cm, query, c, pos) {
       var self = this;
       var doc = findDoc(this, cm.getDoc());
-      var request = buildRequest(this, doc, query);
+      var request = buildRequest(this, doc, query, pos);
 
       this.server.request(request, function (error, data) {
         if (!error && self.options.responseFilter)
@@ -221,7 +221,7 @@
 
   // Type queries
 
-  function showType(ts, cm) {
+  function showType(ts, cm, pos) {
     ts.request(cm, "type", function(error, data) {
       if (error) return showError(ts, cm, error);
       if (ts.options.typeTip) {
@@ -236,7 +236,7 @@
         }
       }
       tempTooltip(cm, tip);
-    });
+    }, pos);
   }
 
   // Maintaining argument hints
@@ -450,13 +450,13 @@
 
   // Generic request-building helper
 
-  function buildRequest(ts, doc, query) {
+  function buildRequest(ts, doc, query, pos) {
     var files = [], offsetLines = 0, allowFragments = !query.fullDocs;
     if (!allowFragments) delete query.fullDocs;
     if (typeof query == "string") query = {type: query};
     query.lineCharPositions = true;
     if (query.end == null) {
-      query.end = doc.doc.getCursor("end");
+      query.end = pos || doc.doc.getCursor("end");
       if (doc.doc.somethingSelected())
         query.start = doc.doc.getCursor("start");
     }

From ae0640c4befccf946cdbe12988d59bd3572ec00e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 24 Oct 2013 14:49:43 +0200
Subject: [PATCH 0565/4742] [javascript mode] Properly handle regexp at start
 of file

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index e8ace32d89..9fca783c44 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -103,7 +103,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         return ret("comment", "comment");
       }
       else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-               /^[\[{}\(,;:]$/.test(state.lastType)) {
+               state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
         nextUntilUnescaped(stream, "/");
         stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla
         return ret("regexp", "string-2");
@@ -410,7 +410,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     startState: function(basecolumn) {
       return {
         tokenize: jsTokenBase,
-        lastType: null,
+        lastType: "sof",
         cc: [],
         lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,

From 759b3a0e9ab1ce6486341651252d968e417ffe5e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 26 Oct 2013 22:06:59 +0200
Subject: [PATCH 0566/4742] Fix undesirable selection-mangling in indentLine

Issue #1910
---
 lib/codemirror.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e52c883201..231b782971 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2759,9 +2759,7 @@ window.CodeMirror = (function() {
       for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
     if (pos < indentation) indentString += spaceStr(indentation - pos);
 
-    if (indentString == curSpaceString)
-      setSelection(cm.doc, Pos(n, curSpaceString.length), Pos(n, curSpaceString.length));
-    else
+    if (indentString != curSpaceString || doc.sel.head.line == n && doc.sel.head.ch < curSpaceString.length)
       replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
     line.stateAfter = null;
   }

From 8d000ddae0935f73e32ef517841c4df21db175e2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Oct 2013 19:40:54 +0100
Subject: [PATCH 0567/4742] [javascript mode] Fix bug in recognizing local
 variable in nested context

---
 mode/javascript/javascript.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 9fca783c44..05ae70bd2f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -165,6 +165,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function inScope(state, varname) {
     for (var v = state.localVars; v; v = v.next)
       if (v.name == varname) return true;
+    for (var cx = state.context; cx; cx = cx.prev) {
+      for (var v = cx.vars; v; v = v.next)
+        if (v.name == varname) return true;
+    }
   }
 
   function parseJS(state, style, type, content, stream) {

From bf55dac09202b4dbca190a8323ed698e0d2eff74 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Oct 2013 08:46:21 +0100
Subject: [PATCH 0568/4742] Disable textarea when readOnly=nocursor

Issue #1909
---
 lib/codemirror.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 231b782971..9e7b720781 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3308,8 +3308,14 @@ window.CodeMirror = (function() {
   option("resetSelectionOnContextMenu", true);
 
   option("readOnly", false, function(cm, val) {
-    if (val == "nocursor") {onBlur(cm); cm.display.input.blur();}
-    else if (!val) resetInput(cm, true);
+    if (val == "nocursor") {
+      onBlur(cm);
+      cm.display.input.blur();
+      cm.display.disabled = true;
+    } else {
+      cm.display.disabled = false;
+      if (!val) resetInput(cm, true);
+    }
   });
   option("dragDrop", true);
 

From 65c750e8f7b04c7b99a915d912c16f235430ca3e Mon Sep 17 00:00:00 2001
From: ilvalle <paolo.valleri@gmail.com>
Date: Mon, 28 Oct 2013 10:21:27 +0100
Subject: [PATCH 0569/4742] [indent-fold addon] Fix folding for empty files

---
 addon/fold/indent-fold.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index b54da34777..7ae005d904 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,8 +1,9 @@
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
   var lastLine = cm.lastLine(),
       tabSize = cm.getOption("tabSize"),
-      firstLine = cm.getLine(start.line),
-      myIndent = CodeMirror.countColumn(firstLine, null, tabSize);
+      firstLine = cm.getLine(start.line);
+  if (!tabSize || !firstLine) return;
+  var myIndent = CodeMirror.countColumn(firstLine, null, tabSize);
 
   function foldEnded(curColumn, prevColumn) {
     return curColumn < myIndent ||

From 701b226107b3eded05cb10575c258647854c0352 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes.lindesay@red-gate.com>
Date: Tue, 22 Oct 2013 17:17:16 +0100
Subject: [PATCH 0570/4742] Add the PEG.js language

---
 mode/peg/index.html |  66 ++++++++++++++++++++++++++++
 mode/peg/peg.js     | 103 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 169 insertions(+)
 create mode 100644 mode/peg/index.html
 create mode 100644 mode/peg/peg.js

diff --git a/mode/peg/index.html b/mode/peg/index.html
new file mode 100644
index 0000000000..3e55a5e4b5
--- /dev/null
+++ b/mode/peg/index.html
@@ -0,0 +1,66 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CodeMirror: PEG 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="../javascript/javascript.js"></script>
+    <script src="peg.js"></script>
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+  </head>
+  <body>
+    <div id=nav>
+      <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+      </ul>
+      <ul>
+        <li><a href="../index.html">Language modes</a>
+        <li><a class=active href="#">PEG Mode</a>
+      </ul>
+    </div>
+
+    <article>
+      <h2>PEG.js Mode</h2>
+      <form><textarea id="code" name="code">
+/*
+ * Classic example grammar, which recognizes simple arithmetic expressions like
+ * "2*(3+4)". The parser generated from this grammar then computes their value.
+ */
+
+start
+  = additive
+
+additive
+  = left:multiplicative "+" right:additive { return left + right; }
+  / multiplicative
+
+multiplicative
+  = left:primary "*" right:multiplicative { return left * right; }
+  / primary
+
+primary
+  = integer
+  / "(" additive:additive ")" { return additive; }
+
+integer "integer"
+  = digits:[0-9]+ { return parseInt(digits.join(""), 10); }
+
+letter = [a-z]+</textarea></form>
+      <script>
+        var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+          mode: {name: "peg"},
+          lineNumbers: true
+        });
+      </script>
+      <h3>The PEG.js Mode</h3>
+      <p> Created by Forbes Lindesay.</p>
+    </article>
+  </body>
+</html>
\ No newline at end of file
diff --git a/mode/peg/peg.js b/mode/peg/peg.js
new file mode 100644
index 0000000000..6f8b480946
--- /dev/null
+++ b/mode/peg/peg.js
@@ -0,0 +1,103 @@
+CodeMirror.defineMode("peg", function (config) {
+  var jsMode = CodeMirror.getMode(config, "javascript");
+
+  function identifier(stream) {
+    return stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/);
+  }
+
+  return {
+    startState: function () {
+      return {
+        inString: false,
+        stringType: null,
+        inComment: false,
+        inChracterClass: false,
+        braced: 0,
+        lhs: true,
+        localState: null
+      };
+    },
+    token: function (stream, state) {
+      if (stream)
+
+      //check for state changes
+      if (!state.inString && !state.inComment && ((stream.peek() == '"') || (stream.peek() == "'"))) {
+        state.stringType = stream.peek();
+        stream.next(); // Skip quote
+        state.inString = true; // Update state
+      }
+      if (!state.inString && !state.inComment && stream.match(/^\/\*/)) {
+        state.inComment = true;
+      }
+
+      //return state
+      if (state.inString) {
+        while (state.inString && !stream.eol()) {
+          if (stream.peek() === state.stringType) {
+            stream.next(); // Skip quote
+            state.inString = false; // Clear flag
+          } else if (stream.peek() === '\\') {
+            stream.next();
+            stream.next();
+          } else {
+            stream.match(/^.[^\\\"\']*/);
+          }
+        }
+        return state.lhs ? "property string" : "string"; // Token style
+      } else if (state.inComment) {
+        while (state.inComment && !stream.eol()) {
+          if (stream.match(/\*\//)) {
+            state.inComment = false; // Clear flag
+          } else {
+            stream.match(/^.[^\*]*/);
+          }
+        }
+        return "comment";
+      } else if (state.inChracterClass) {
+        if (stream.match(/^[^\]\\]+/)) {
+          return;
+        } else if (stream.match(/^\\./)) {
+          return;
+        } else {
+          stream.next();
+          state.inChracterClass = false;
+          return 'bracket';
+        }
+      } else if (stream.peek() === '[') {
+        stream.next();
+        state.inChracterClass = true;
+        return 'bracket';
+      } else if (stream.match(/^\/\//)) {
+        stream.skipToEnd();
+        return "comment";
+      } else if (state.braced || stream.peek() === '{') {
+        if (state.localState === null) {
+          state.localState = jsMode.startState();
+        }
+        var token = jsMode.token(stream, state.localState);
+        var text = stream.current();
+        if (!token) {
+          for (var i = 0; i < text.length; i++) {
+            if (text[i] === '{') {
+              state.braced++;
+            } else if (text[i] === '}') {
+              state.braced--;
+            }
+          };
+        }
+        return token;
+      } else if (identifier(stream)) {
+        if (stream.peek() === ':') {
+          return 'variable';
+        }
+        return 'variable-2';
+      } else if (['[', ']', '(', ')'].indexOf(stream.peek()) != -1) {
+        stream.next();
+        return 'bracket';
+      } else if (!stream.eatSpace()) {
+        stream.next();
+      }
+      return null;
+    }
+  };
+});

From acb16d4be0aba6edf51b97c413cd66a4e248c9e1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Oct 2013 08:58:07 +0100
Subject: [PATCH 0571/4742] [pegjs mode] Integrate

---
 doc/compress.html                   |  1 +
 mode/index.html                     |  1 +
 mode/meta.js                        |  1 +
 mode/{peg => pegjs}/index.html      | 10 +++++-----
 mode/{peg/peg.js => pegjs/pegjs.js} |  4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename mode/{peg => pegjs}/index.html (90%)
 rename mode/{peg/peg.js => pegjs/pegjs.js} (97%)

diff --git a/doc/compress.html b/doc/compress.html
index d1384a76ef..f49c978b2e 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -118,6 +118,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/ocaml/ocaml.js">ocaml.js</option>
           <option value="http://codemirror.net/mode/octave/octave.js">octave.js</option>
           <option value="http://codemirror.net/mode/pascal/pascal.js">pascal.js</option>
+          <option value="http://codemirror.net/mode/pegjs/pegjs.js">pegjs.js</option>
           <option value="http://codemirror.net/mode/perl/perl.js">perl.js</option>
           <option value="http://codemirror.net/mode/php/php.js">php.js</option>
           <option value="http://codemirror.net/mode/pig/pig.js">pig.js</option>
diff --git a/mode/index.html b/mode/index.html
index 337f3336e4..81abc42d8c 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -71,6 +71,7 @@ <h2>Language modes</h2>
       <li><a href="ocaml/index.html">OCaml</a></li>
       <li><a href="octave/index.html">Octave</a> (MATLAB)</li>
       <li><a href="pascal/index.html">Pascal</a></li>
+      <li><a href="pegjs/index.html">PEG.js</a></li>
       <li><a href="perl/index.html">Perl</a></li>
       <li><a href="php/index.html">PHP</a></li>
       <li><a href="pig/index.html">Pig Latin</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 47f042568d..226cff12e5 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -48,6 +48,7 @@ CodeMirror.modeInfo = [
   {name: 'OCaml', mime: 'text/x-ocaml', mode: 'ocaml'},
   {name: 'Octave', mime: 'text/x-octave', mode: 'octave'},
   {name: 'Pascal', mime: 'text/x-pascal', mode: 'pascal'},
+  {name: 'PEG.js', mime: null, mode: 'pegjs'},
   {name: 'Perl', mime: 'text/x-perl', mode: 'perl'},
   {name: 'PHP', mime: 'text/x-php', mode: 'php'},
   {name: 'PHP(HTML)', mime: 'application/x-httpd-php', mode: 'php'},
diff --git a/mode/peg/index.html b/mode/pegjs/index.html
similarity index 90%
rename from mode/peg/index.html
rename to mode/pegjs/index.html
index 3e55a5e4b5..678b714d8e 100644
--- a/mode/peg/index.html
+++ b/mode/pegjs/index.html
@@ -1,14 +1,14 @@
 <!doctype html>
 <html>
   <head>
-    <title>CodeMirror: PEG Mode</title>
+    <title>CodeMirror: PEG.js 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="../javascript/javascript.js"></script>
-    <script src="peg.js"></script>
+    <script src="pegjs.js"></script>
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
   </head>
   <body>
@@ -22,7 +22,7 @@
       </ul>
       <ul>
         <li><a href="../index.html">Language modes</a>
-        <li><a class=active href="#">PEG Mode</a>
+        <li><a class=active href="#">PEG.js Mode</a>
       </ul>
     </div>
 
@@ -55,7 +55,7 @@ <h2>PEG.js Mode</h2>
 letter = [a-z]+</textarea></form>
       <script>
         var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-          mode: {name: "peg"},
+          mode: {name: "pegjs"},
           lineNumbers: true
         });
       </script>
@@ -63,4 +63,4 @@ <h3>The PEG.js Mode</h3>
       <p> Created by Forbes Lindesay.</p>
     </article>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/mode/peg/peg.js b/mode/pegjs/pegjs.js
similarity index 97%
rename from mode/peg/peg.js
rename to mode/pegjs/pegjs.js
index 6f8b480946..6cdcc61f30 100644
--- a/mode/peg/peg.js
+++ b/mode/pegjs/pegjs.js
@@ -1,4 +1,4 @@
-CodeMirror.defineMode("peg", function (config) {
+CodeMirror.defineMode("pegjs", function (config) {
   var jsMode = CodeMirror.getMode(config, "javascript");
 
   function identifier(stream) {
@@ -100,4 +100,4 @@ CodeMirror.defineMode("peg", function (config) {
       return null;
     }
   };
-});
+}, "javascript");

From 0d32c1e73bd30408e4d70503aebeefdaef8fecda Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 30 Oct 2013 20:03:31 +0100
Subject: [PATCH 0572/4742] [haskell mode] Fix unintended prototype property
 access bug

Closes #1917
---
 mode/haskell/haskell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index 59ca7f0baa..68a6317e64 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -237,7 +237,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
     token: function(stream, state) {
       var t = state.f(stream, function(s) { state.f = s; });
       var w = stream.current();
-      return (w in wellKnownWords) ? wellKnownWords[w] : t;
+      return wellKnownWords.hasOwnProperty(w) ? wellKnownWords[w] : t;
     },
 
     blockCommentStart: "{-",

From de91f48272d060cfe83406280242ba469f5aba27 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 31 Oct 2013 08:23:15 +0100
Subject: [PATCH 0573/4742] [real-world uses] Add Crudzilla

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 8afe73aa0a..4e0896c377 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -51,6 +51,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>
       <li><a href="http://www.compilejava.net/">compilejava.net</a> (online Java sandbox)</li>
       <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>
+      <li><a href="http://www.crudzilla.com/">Crudzilla</a> (self-hosted web IDE)</li>
       <li><a href="http://cssdeck.com/">CSSDeck</a> (CSS showcase)</li>
       <li><a href="http://ireneros.com/deck/deck.js-codemirror/introduction/#textarea-code">Deck.js integration</a> (slides with editors)</li>
       <li><a href="http://www.dbninja.com">DbNinja</a> (MySQL access interface)</li>

From b41fc2b370c0cb530060f5f2fb7b391ef7afa5d2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 31 Oct 2013 08:53:52 +0100
Subject: [PATCH 0574/4742] [closetag addon] Don't react to > and / keys when
 in an attribute

Closes #1916
---
 addon/edit/closetag.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index d6a8fafd3c..7b0975043a 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -54,7 +54,8 @@
     if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
     var lowerTagName = tagName.toLowerCase();
     // Don't process the '>' at the end of an end-tag or self-closing tag
-    if (tok.type == "tag" && state.type == "closeTag" ||
+    if (tok.type == "string" && (tok.string.charAt(tok.string.length - 1) != '"' || tok.string.length == 1) ||
+        tok.type == "tag" && state.type == "closeTag" ||
         tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
         dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)
       return CodeMirror.Pass;
@@ -72,7 +73,9 @@
   function autoCloseSlash(cm) {
     var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
     var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (tok.string.charAt(0) != "<" || tok.start != pos.ch - 1 || inner.mode.name != "xml") return CodeMirror.Pass;
+    if (tok.type == "string" || tok.string.charAt(0) != "<" ||
+        tok.start != pos.ch - 1 || inner.mode.name != "xml")
+      return CodeMirror.Pass;
 
     var tagName = state.context && state.context.tagName;
     if (tagName) cm.replaceSelection("/" + tagName + ">", "end");

From 01e9fbb6496cda9e3e8fb3b29b4830770cebe642 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 31 Oct 2013 10:17:57 +0100
Subject: [PATCH 0575/4742] [closetag addon] Another corner case when typing in
 attribute

Issue #1916
---
 addon/edit/closetag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 7b0975043a..a0dc32618e 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -54,7 +54,7 @@
     if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
     var lowerTagName = tagName.toLowerCase();
     // Don't process the '>' at the end of an end-tag or self-closing tag
-    if (tok.type == "string" && (tok.string.charAt(tok.string.length - 1) != '"' || tok.string.length == 1) ||
+    if (tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
         tok.type == "tag" && state.type == "closeTag" ||
         tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
         dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)

From dcf0b65a89e2d8fd9cc254cb39ee58bae44650c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 3 Nov 2013 20:18:53 +0100
Subject: [PATCH 0576/4742] Another iteration on pushing the selection forward
 on no-change reindents

---
 lib/codemirror.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9e7b720781..23fc2c5bee 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2759,8 +2759,10 @@ window.CodeMirror = (function() {
       for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
     if (pos < indentation) indentString += spaceStr(indentation - pos);
 
-    if (indentString != curSpaceString || doc.sel.head.line == n && doc.sel.head.ch < curSpaceString.length)
+    if (indentString != curSpaceString)
       replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
+    else if (doc.sel.head.line == n && doc.sel.head.ch < curSpaceString.length)
+      setSelection(doc, Pos(n, curSpaceString.length), Pos(n, curSpaceString.length), 1);
     line.stateAfter = null;
   }
 

From a8c5cfb5cc0f48bed8c9f7e3e264503a17d20b07 Mon Sep 17 00:00:00 2001
From: soliton4 <matthias.behrens@gmail.com>
Date: Sat, 2 Nov 2013 17:48:11 +0100
Subject: [PATCH 0577/4742] [less mode] Bugfix

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

diff --git a/mode/less/less.js b/mode/less/less.js
index ec62319080..fb42241c8c 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -204,7 +204,7 @@ CodeMirror.defineMode("less", function(config) {
         else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
         else if(type === "unit" && state.stack[state.stack.length-1] === ";")return ret(null, "unit");
         else if(type === ")" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
-        else if(type.match("@") !== null  && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
+        else if(type && type.match("@") !== null  && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
         //else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
 
         else if((type === ";" || type === "}" || type === ",") && state.stack[state.stack.length-1] === ";")return ret("tag", stream.current());

From 36b887d52e12767212ddfb4af353a9e2ecf64366 Mon Sep 17 00:00:00 2001
From: Marko Bonaci <mbonaci@gmail.com>
Date: Sun, 3 Nov 2013 19:24:29 +0100
Subject: [PATCH 0578/4742] [mbo theme] Fix matching tag background
 highlighting

---
 theme/mbo.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/theme/mbo.css b/theme/mbo.css
index f3250a7313..93fe3ee24c 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -24,9 +24,11 @@
 
 .cm-s-mbo .CodeMirror-activeline-background {background: #494b41 !important;}
 .cm-s-mbo .CodeMirror-matchingbracket {
-   text-decoration: underline;
+  text-decoration: underline;
   color: #f5e107 !important;
  }
+ 
+.cm-s-mbo .CodeMirror-matchingtag {background: #4e4e4e;}
 
 div.CodeMirror span.CodeMirror-searching {
   background-color: none;

From 464dd7b555c6fc3eb27afc5c78b34883ba972ba4 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Mon, 4 Nov 2013 11:03:23 +0100
Subject: [PATCH 0579/4742] [less mode] Fix null dereference bug

Issue #1926
---
 mode/less/less.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/less/less.js b/mode/less/less.js
index fb42241c8c..6333a98c48 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -70,7 +70,9 @@ CodeMirror.defineMode("less", function(config) {
       stream.eatWhile(/[\a-zA-Z0-9\-_]/);
       if(stream.peek() === " ")stream.eatSpace();
       if(stream.peek() === ")" || type === ":")return ret("number", "unit");//rgba(0,0,0,.25);
-      else if(state.stack[state.stack.length-1] === "rule" && stream.peek().match(/{|,|\+|\(/) === null)return ret("number", "unit");
+      else if(stream.peek() !== undefined ){
+        if(state.stack[state.stack.length-1] === "rule" && stream.peek().match(/{|,|\+|\(/) === null)return ret("number", "unit");
+      }
       return ret("tag", "tag");
     } else if (ch == "#") {
       //we don't eat white-space, we want the hex color and or id only

From 8c42f651f15b6b43022a75b1162f7953bae0559e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 4 Nov 2013 15:07:12 +0100
Subject: [PATCH 0580/4742] [less mode] Fix null dereference bug (part 2)

Issue #1926
---
 mode/less/less.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/less/less.js b/mode/less/less.js
index 6333a98c48..da39074851 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -70,7 +70,7 @@ CodeMirror.defineMode("less", function(config) {
       stream.eatWhile(/[\a-zA-Z0-9\-_]/);
       if(stream.peek() === " ")stream.eatSpace();
       if(stream.peek() === ")" || type === ":")return ret("number", "unit");//rgba(0,0,0,.25);
-      else if(stream.peek() !== undefined ){
+      else if(stream.current().length >1){
         if(state.stack[state.stack.length-1] === "rule" && stream.peek().match(/{|,|\+|\(/) === null)return ret("number", "unit");
       }
       return ret("tag", "tag");

From bf7acd64a1a825dc077d9fcb2d90c1e961a1bebc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 4 Nov 2013 15:07:37 +0100
Subject: [PATCH 0581/4742] [javascript-hint addon] Don't fire hints in
 comments or strings

---
 addon/hint/javascript-hint.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 513fb782b0..c66b0a7a5b 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -21,6 +21,7 @@
   function scriptHint(editor, keywords, getToken, options) {
     // Find the token at the cursor
     var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
+    if (/\b(?:string|comment)\b/.test(token.type)) return;
     token.state = CodeMirror.innerMode(editor.getMode(), token.state).state;
 
     // If it's not a 'word-style' token, ignore the token.

From 977c64fbaa0c610edff107a4c13099f18858f3d6 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Mon, 4 Nov 2013 15:23:13 +0000
Subject: [PATCH 0582/4742] [pig mode] Add DUMP as keyword

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

diff --git a/mode/pig/pig.js b/mode/pig/pig.js
index c2f611a1a0..4b44e7ccc3 100644
--- a/mode/pig/pig.js
+++ b/mode/pig/pig.js
@@ -157,7 +157,7 @@ CodeMirror.defineMode("pig", function(_config, parserConfig) {
     + "JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL "
     + "PARTITION GROUP AND OR NOT GENERATE FLATTEN ASC DESC IS STREAM THROUGH STORE MAPREDUCE "
     + "SHIP CACHE INPUT OUTPUT STDERROR STDIN STDOUT LIMIT SAMPLE LEFT RIGHT FULL EQ GT LT GTE LTE "
-    + "NEQ MATCHES TRUE FALSE ";
+    + "NEQ MATCHES TRUE FALSE DUMP";
 
   // data types
   var pTypes = "BOOLEAN INT LONG FLOAT DOUBLE CHARARRAY BYTEARRAY BAG TUPLE MAP ";

From 575a29a40942229bee4f02f73f3b73c838b5b386 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 5 Nov 2013 10:12:18 +0100
Subject: [PATCH 0583/4742] Add IE11+ detection, use it to fix failing test

Closes #1826
---
 lib/codemirror.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 23fc2c5bee..254c0e03fc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7,9 +7,13 @@ window.CodeMirror = (function() {
   // Crude, but necessary to handle a number of hard-to-feature-detect
   // bugs and behavior differences.
   var gecko = /gecko\/\d/i.test(navigator.userAgent);
+  // IE11 currently doesn't count as 'ie', since it has almost none of
+  // the same bugs as earlier versions. Use ie_gt10 to handle
+  // incompatibilities in that version.
   var ie = /MSIE \d/.test(navigator.userAgent);
   var ie_lt8 = ie && (document.documentMode == null || document.documentMode < 8);
   var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
+  var ie_gt10 = /Trident\/([7-9]|\d{2,})\./;
   var webkit = /WebKit\//.test(navigator.userAgent);
   var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
   var chrome = /Chrome\//.test(navigator.userAgent);
@@ -4403,7 +4407,7 @@ window.CodeMirror = (function() {
     // Work around problem with the reported dimensions of single-char
     // direction spans on IE (issue #1129). See also the comment in
     // cursorCoords.
-    if (measure && ie && (order = getOrder(line))) {
+    if (measure && (ie || ie_gt10) && (order = getOrder(line))) {
       var l = order.length - 1;
       if (order[l].from == order[l].to) --l;
       var last = order[l], prev = order[l - 1];

From 567a94b89cbe8bf12f6a210e2e395c5c147272a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 5 Nov 2013 22:27:04 +0100
Subject: [PATCH 0584/4742] [coffeescript mode] Some refinement in indentation

Issue #1932
---
 mode/coffeescript/coffeescript.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index d29ad2b73a..93b77bcb67 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -213,6 +213,8 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     if (type !== "coffee") {
       align = null;
       alignOffset = stream.column() + stream.current().length;
+    } else if (state.scope.align) {
+      state.scope.align = false;
     }
     state.scope = {
       offset: offset,
@@ -268,7 +270,6 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     }
     if (((current === "->" || current === "=>") &&
          !state.lambda &&
-         state.scope.type == "coffee" &&
          !stream.peek())
         || style === "indent") {
       indent(stream, state);
@@ -292,9 +293,10 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     }
     delimiter_index = "])}".indexOf(current);
     if (delimiter_index !== -1) {
-      if (dedent(stream, state)) {
-        return ERRORCLASS;
-      }
+      while (state.scope.type == "coffee" && state.scope.prev)
+        state.scope = state.scope.prev;
+      if (state.scope.type == current)
+        state.scope = state.scope.prev;
     }
     if (state.dedent > 0 && stream.eol() && state.scope.type == "coffee") {
       if (state.scope.prev) state.scope = state.scope.prev;
@@ -333,11 +335,14 @@ CodeMirror.defineMode("coffeescript", function(conf) {
 
     indent: function(state, text) {
       if (state.tokenize != tokenBase) return 0;
-      var closes = state.scope.type === (text && text.charAt(0));
-      if (state.scope.align)
-        return state.scope.alignOffset - (closes ? 1 : 0);
+      var scope = state.scope;
+      var closer = "])}".indexOf(text.charAt(0)) > -1;
+      if (closer) while (scope.type == "coffee" && scope.prev) scope = scope.prev;
+      var closes = scope.type === text.charAt(0);
+      if (scope.align)
+        return scope.alignOffset - (closes ? 1 : 0);
       else
-        return (closes ? state.scope.prev : state.scope).offset;
+        return (closes ? scope.prev : scope).offset;
     },
 
     lineComment: "#",

From 4da56b598000a451423cf38598e413b10b8a4f62 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 6 Nov 2013 08:29:25 +0100
Subject: [PATCH 0585/4742] [coffeescript mode] Fix bug introduced by
 567a94b89cbe8b

Issue #1932
---
 mode/coffeescript/coffeescript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 93b77bcb67..e8bfe48a24 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -336,9 +336,9 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     indent: function(state, text) {
       if (state.tokenize != tokenBase) return 0;
       var scope = state.scope;
-      var closer = "])}".indexOf(text.charAt(0)) > -1;
+      var closer = text && "])}".indexOf(text.charAt(0)) > -1;
       if (closer) while (scope.type == "coffee" && scope.prev) scope = scope.prev;
-      var closes = scope.type === text.charAt(0);
+      var closes = closer && scope.type === text.charAt(0);
       if (scope.align)
         return scope.alignOffset - (closes ? 1 : 0);
       else

From c8639251bb6d06c1b6c4b729a6656642ae4aa8d2 Mon Sep 17 00:00:00 2001
From: Maksym Taran <mtaran@google.com>
Date: Tue, 5 Nov 2013 15:54:31 -0800
Subject: [PATCH 0586/4742] [indent-fold addon] Include empty lines

---
 addon/fold/indent-fold.js | 46 ++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 7ae005d904..fabfa4f04e 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,27 +1,29 @@
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
-  var lastLine = cm.lastLine(),
-      tabSize = cm.getOption("tabSize"),
-      firstLine = cm.getLine(start.line);
-  if (!tabSize || !firstLine) return;
-  var myIndent = CodeMirror.countColumn(firstLine, null, tabSize);
-
-  function foldEnded(curColumn, prevColumn) {
-    return curColumn < myIndent ||
-      (curColumn == myIndent && prevColumn >= myIndent) ||
-      (curColumn > myIndent && i == lastLine);
-  }
-
-  for (var i = start.line + 1; i <= lastLine; i++) {
-    var curColumn = CodeMirror.countColumn(cm.getLine(i), null, tabSize);
-    var prevColumn = CodeMirror.countColumn(cm.getLine(i-1), null, tabSize);
-
-    if (foldEnded(curColumn, prevColumn)) {
-      var lastFoldLineNumber = curColumn > myIndent && i == lastLine ? i : i-1;
-      var lastFoldLine = cm.getLine(lastFoldLineNumber);
-      return {from: CodeMirror.Pos(start.line, firstLine.length),
-              to: CodeMirror.Pos(lastFoldLineNumber, lastFoldLine.length)};
+  var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
+  var getIndent = function(lineNum) {
+    return CodeMirror.countColumn(lineNum, null, tabSize);
+  };
+  var myIndent = getIndent(firstLine);
+  var lastLineInFold = null;
+  // Go through lines until we find a line that definitely doesn't belong in
+  // the block we're folding, or to the end.
+  for (var i = start.line + 1, end = cm.lineCount(); i < end; ++i) {
+    var curLine = cm.getLine(i);
+    var curIndent = getIndent(curLine);
+    if (curIndent > myIndent) {
+      // Lines with a greater indent are considered part of the block.
+      lastLineInFold = i;
+    } else if (curIndent == 0 && curLine.length == 0) {
+      // Empty lines might be breaks within the block we're trying to fold.
+    } else {
+      // A non-empty line at an indent equal to or less than ours marks the
+      // start of another block.
+      break;
     }
   }
+  return {
+    from: CodeMirror.Pos(start.line, firstLine.length),
+    to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
+  };
 });
-
 CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated

From 5b875f598e94ee4a4eb74faf69065c84eb7b7a0e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 6 Nov 2013 08:51:57 +0100
Subject: [PATCH 0587/4742] [indent-fold addon] Consider all-whitespace lines
 empty lines

---
 addon/fold/indent-fold.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index fabfa4f04e..3787b3f378 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -13,7 +13,7 @@ CodeMirror.registerHelper("fold", "indent", function(cm, start) {
     if (curIndent > myIndent) {
       // Lines with a greater indent are considered part of the block.
       lastLineInFold = i;
-    } else if (curIndent == 0 && curLine.length == 0) {
+    } else if (!/\S/.test(curLine)) {
       // Empty lines might be breaks within the block we're trying to fold.
     } else {
       // A non-empty line at an indent equal to or less than ours marks the

From 47a3734c3286d7525ba9451ff0ce25984d22f1e5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 6 Nov 2013 08:54:57 +0100
Subject: [PATCH 0588/4742] [indent-fold addon] Return nothing on edge cases

---
 addon/fold/indent-fold.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 3787b3f378..1bd600be42 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,5 +1,6 @@
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
   var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
+  if (!/\S/.test(firstLine)) return;
   var getIndent = function(lineNum) {
     return CodeMirror.countColumn(lineNum, null, tabSize);
   };
@@ -7,7 +8,7 @@ CodeMirror.registerHelper("fold", "indent", function(cm, start) {
   var lastLineInFold = null;
   // Go through lines until we find a line that definitely doesn't belong in
   // the block we're folding, or to the end.
-  for (var i = start.line + 1, end = cm.lineCount(); i < end; ++i) {
+  for (var i = start.line + 1, end = cm.lastLine(); i <= end; ++i) {
     var curLine = cm.getLine(i);
     var curIndent = getIndent(curLine);
     if (curIndent > myIndent) {
@@ -21,7 +22,7 @@ CodeMirror.registerHelper("fold", "indent", function(cm, start) {
       break;
     }
   }
-  return {
+  if (lastLineInFold) return {
     from: CodeMirror.Pos(start.line, firstLine.length),
     to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
   };

From c63d7e342079143eed9a18fd115930366be5f6c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 08:21:55 +0100
Subject: [PATCH 0589/4742] Clip scroll positions given to scrollTo to
 scrollable space

Closes #1934
---
 lib/codemirror.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 254c0e03fc..0b65bb13cf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1387,8 +1387,10 @@ window.CodeMirror = (function() {
     }
     if (!updated && op.selectionChanged) updateSelection(cm);
     if (op.updateScrollPos) {
-      display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = newScrollPos.scrollTop;
-      display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = newScrollPos.scrollLeft;
+      var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, newScrollPos.scrollTop));
+      var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, newScrollPos.scrollLeft));
+      display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
+      display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
       alignHorizontally(cm);
       if (op.scrollToPos)
         scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),

From 66a5cd630a8a2423cd79eccb170df4d7ee1bb83c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 08:24:19 +0100
Subject: [PATCH 0590/4742] Add more extending unicode ranges

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0b65bb13cf..6d0e9d6459 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5491,7 +5491,7 @@ window.CodeMirror = (function() {
     return true;
   }
 
-  var isExtendingChar = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\uA670-\uA672\uA674-\uA67D\uA69F\udc00-\udfff]/;
+  var isExtendingChar = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\u1DC0–\u1DFF\u20D0–\u20FF\uA670-\uA672\uA674-\uA67D\uA69F\udc00-\udfff\uFE20–\uFE2F]/;
 
   // DOM UTILITIES
 

From b8d83f2e461e87f5b87773301f27792490963a35 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 08:31:25 +0100
Subject: [PATCH 0591/4742] Document execCommand

Issue #1935
---
 doc/manual.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index ba8789a836..d79265fd6b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1576,6 +1576,9 @@ <h3 id="api_misc">Miscellaneous methods</h3>
       given an argument), or sets the overwrite mode to a specific
       state (when given an argument).</dd>
 
+      <dt id="execCommand"><code><strong>cm.execCommand</strong>(name: string)</code></dt>
+      <dd>Runs the <a href="#commands">command</a> with the given name on the editor.</dd>
+
       <dt id="posFromIndex"><code><strong>doc.posFromIndex</strong>(index: integer) → {line, ch}</code></dt>
       <dd>Calculates and returns a <code>{line, ch}</code> object for a
       zero-based <code>index</code> who's value is relative to the start of the

From 398915a47ed46d86decadadf24aa7059f26e96c3 Mon Sep 17 00:00:00 2001
From: Andy Joslin <andytjoslin@gmail.com>
Date: Thu, 7 Nov 2013 13:48:24 -0500
Subject: [PATCH 0592/4742] [dialog addon] Add cm.openNotification: timed &
 unobtrusive dialog

---
 addon/dialog/dialog.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 71e2287447..14ab724849 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -77,4 +77,39 @@
       CodeMirror.on(b, "focus", function() { ++blurring; });
     }
   });
+
+  /*
+   * openNotification
+   * Opens a notification, that can be closed with an optional timer
+   * (default 5000ms timer) and always closes on click.
+   *
+   * If a notification is opened while another is opened, it will close the
+   * currently opened one and open the new one immediately.
+   */
+  var currentNotificationClose;
+  CodeMirror.defineExtension("openNotification", function(template, callback, options) {
+    var dialog = dialogDiv(this, template, options && options.bottom);
+    var duration = options && (options.duration === undefined ? 5000 : options.duration);
+    var closed = false, me = this, doneTimer;
+
+    function close() {
+      if (closed) return;
+      closed = true;
+      clearTimeout(doneTimer);
+      doneTimer = null;
+      if (callback) callback(me);
+      dialog.parentNode.removeChild(dialog);
+    }
+
+    if (currentNotificationClose) currentNotificationClose();
+    currentNotificationClose = close;
+
+    CodeMirror.on(dialog, 'click', function(e) {
+      CodeMirror.e_preventDefault(e);
+      close();
+    });
+    if (duration) {
+      doneTimer = setTimeout(close, options.duration);
+    }
+  });
 })();

From 598648f13032852b285cec6509e3c7930e15d437 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 08:46:21 +0100
Subject: [PATCH 0593/4742] [dialog addon] Slight modifications to
 openNotification

Remove callback argument, save currently open dialog in per-editor state.
---
 addon/dialog/dialog.js | 22 ++++++++++++----------
 doc/manual.html        | 13 ++++++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 14ab724849..ced394d3fc 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -14,7 +14,14 @@
     return dialog;
   }
 
+  function closeNotification(cm, newVal) {
+    if (cm.state.currentNotificationClose)
+      cm.state.currentNotificationClose();
+    cm.state.currentNotificationClose = newVal;
+  }
+
   CodeMirror.defineExtension("openDialog", function(template, callback, options) {
+    closeNotification(this, null);
     var dialog = dialogDiv(this, template, options && options.bottom);
     var closed = false, me = this;
     function close() {
@@ -51,6 +58,7 @@
   });
 
   CodeMirror.defineExtension("openConfirm", function(template, callbacks, options) {
+    closeNotification(this, null);
     var dialog = dialogDiv(this, template, options && options.bottom);
     var buttons = dialog.getElementsByTagName("button");
     var closed = false, me = this, blurring = 1;
@@ -86,30 +94,24 @@
    * If a notification is opened while another is opened, it will close the
    * currently opened one and open the new one immediately.
    */
-  var currentNotificationClose;
-  CodeMirror.defineExtension("openNotification", function(template, callback, options) {
+  CodeMirror.defineExtension("openNotification", function(template, options) {
+    closeNotification(this, close);
     var dialog = dialogDiv(this, template, options && options.bottom);
     var duration = options && (options.duration === undefined ? 5000 : options.duration);
-    var closed = false, me = this, doneTimer;
+    var closed = false, doneTimer;
 
     function close() {
       if (closed) return;
       closed = true;
       clearTimeout(doneTimer);
-      doneTimer = null;
-      if (callback) callback(me);
       dialog.parentNode.removeChild(dialog);
     }
 
-    if (currentNotificationClose) currentNotificationClose();
-    currentNotificationClose = close;
-
     CodeMirror.on(dialog, 'click', function(e) {
       CodeMirror.e_preventDefault(e);
       close();
     });
-    if (duration) {
+    if (duration)
       doneTimer = setTimeout(close, options.duration);
-    }
   });
 })();
diff --git a/doc/manual.html b/doc/manual.html
index d79265fd6b..80de6d950f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1708,11 +1708,14 @@ <h2>Addons</h2>
     <dl>
       <dt id="addon_dialog"><a href="../addon/dialog/dialog.js"><code>dialog/dialog.js</code></a></dt>
       <dd>Provides a very simple way to query users for text input.
-      Adds an <code>openDialog</code> method to CodeMirror instances,
-      which can be called with an HTML fragment that provides the
-      prompt (should include an <code>input</code> tag), and a
-      callback function that is called when text has been entered.
-      Depends on <code>addon/dialog/dialog.css</code>.</dd>
+      Adds an <strong><code>openDialog</code></strong> method to
+      CodeMirror instances, which can be called with an HTML fragment
+      that provides the prompt (should include an <code>input</code>
+      tag), and a callback function that is called when text has been
+      entered. Also adds
+      an <strong><code>openNotification</code></strong> function that
+      simply shows an HTML fragment as a notification. Depends
+      on <code>addon/dialog/dialog.css</code>.</dd>
 
       <dt id="addon_searchcursor"><a href="../addon/search/searchcursor.js"><code>search/searchcursor.js</code></a></dt>
       <dd>Adds the <code>getSearchCursor(query, start, caseFold) →

From 11c50cb69b406794eac7421b2997407a8d17528f Mon Sep 17 00:00:00 2001
From: Andy Joslin <andytjoslin@gmail.com>
Date: Thu, 7 Nov 2013 13:49:19 -0500
Subject: [PATCH 0594/4742] [vim mode] use openNotification instead of
 openConfirm for errors

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

diff --git a/keymap/vim.js b/keymap/vim.js
index e67a46ed7f..dab10e21a4 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2726,10 +2726,9 @@
       return regexp;
     }
     function showConfirm(cm, text) {
-      if (cm.openConfirm) {
-        cm.openConfirm('<span style="color: red">' + text +
-            '</span> <button type="button">OK</button>', function() {},
-            {bottom: true});
+      if (cm.openNotification) {
+        cm.openNotification('<span style="color: red">' + text + '</span>',
+                            {bottom: true, duration: 5000});
       } else {
         alert(text);
       }

From 74a3f2261d8f8646a282e089cf8d8c777e498274 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <brandon@forewordreviews.com>
Date: Thu, 7 Nov 2013 17:13:09 -0500
Subject: [PATCH 0595/4742] [markdown mode] `\n* ` should not toggle em state.

Closes #1920.
---
 mode/markdown/markdown.js | 7 ++++++-
 mode/markdown/test.js     | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index bf1750d5b6..0d60b3db8f 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -257,6 +257,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.taskOpen = false;
     state.taskClosed = false;
 
+    // Get sol() value now, before character is consumed
+    var sol = stream.sol();
+
     var ch = stream.next();
 
     if (ch === '\\') {
@@ -355,7 +358,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
     var t = getType(state);
     if (ch === '*' || (ch === '_' && !ignoreUnderscore)) {
-      if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
+      if (sol && stream.peek() === ' ') {
+        // Do nothing, surrounded by newline and space
+      } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
         state.strong = false;
         return t;
       } else if (!state.strong && stream.eat(ch)) { // Add STRONG
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index f167917289..081be96be1 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -577,6 +577,10 @@
   MT("emEscapedBySpaceOut",
      "foo _ bar[em _hello_]world");
 
+  MT("emEscapedByNewline",
+     "foo",
+     "_ bar[em _hello_]world");
+
   // Unclosed emphasis characters
   // Instead of simply marking as EM / STRONG, it would be nice to have an
   // incomplete flag for EM and STRONG, that is styled slightly different.

From a7120a79dc85e7caccc639e9192a63a6c209308f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 08:55:07 +0100
Subject: [PATCH 0596/4742] [real-world uses] Add MVC Playground

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 4e0896c377..6e23106793 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -88,6 +88,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
       <li><a href="http://www.iunbug.com/mihtool">MIHTool</a> (iOS web-app debugging tool)</li>
       <li><a href="http://mongo-mapreduce-webbrowser.opensagres.cloudbees.net/">Mongo MapReduce WebBrowser</a></li>
+      <li><a href="http://mvcplayground.apphb.com/">MVC Playground</a></li>
       <li><a href="https://www.my2ndgeneration.com/">My2ndGeneration</a> (social coding)</li>
       <li><a href="http://www.navigatecms.com">Navigate CMS</a></li>
       <li><a href="https://github.com/soliton4/nodeMirror">nodeMirror</a> (IDE project)</li>

From 8f491df2a175a942c4d3b51781998bb1ad868054 Mon Sep 17 00:00:00 2001
From: Michael Zhou <moz@google.com>
Date: Sat, 9 Nov 2013 05:03:52 -0500
Subject: [PATCH 0597/4742] [clike demo] Fix duplicate variable names for C and
 C++ editors

The C editor and the C++ editor have the same variable name, so
the latter shadows the former. Fixed by renaming both.
---
 mode/clike/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/clike/index.html b/mode/clike/index.html
index 45add4910b..93bd718a0a 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -165,12 +165,12 @@ <h2>Java example</h2>
 </textarea></div>
 
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("c-code"), {
+      var cEditor = CodeMirror.fromTextArea(document.getElementById("c-code"), {
         lineNumbers: true,
         matchBrackets: true,
         mode: "text/x-csrc"
       });
-      var editor = CodeMirror.fromTextArea(document.getElementById("cpp-code"), {
+      var cppEditor = CodeMirror.fromTextArea(document.getElementById("cpp-code"), {
         lineNumbers: true,
         matchBrackets: true,
         mode: "text/x-c++src"

From 399e98adfb7d21d04ec3f4b2d945ad34cef4261d Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Thu, 7 Nov 2013 18:25:49 -0500
Subject: [PATCH 0598/4742] [css mode] Fix more indentation issues.

Closes #1925.
---
 mode/css/css.js       |  6 +++---
 mode/css/scss_test.js |  9 +++++++++
 mode/css/test.js      | 12 ++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index f47aba75a1..d8c30cf33d 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -262,7 +262,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         // Pop off end of array until { is reached
         while(state.stack.length){
           var removed = state.stack.pop();
-          if(removed.indexOf("{") > -1){
+          if(removed.indexOf("{") > -1 || removed == "block" || removed == "rule"){
             break;
           }
         }
@@ -609,8 +609,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
         return ["variable", "variable"];
       },
-      ",": function(_stream, state) {
-        if (state.stack[state.stack.length - 1] == "propertyValue") {
+      ",": function(stream, state) {
+        if (state.stack[state.stack.length - 1] == "propertyValue" && stream.match(/^ *\$/, false)) {
           return ["operator", ";"];
         }
       },
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index bc2a078576..9998e2aacb 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -81,4 +81,13 @@
 
   IT('mixin',
     "@mixin container[1 (][2 $a: 10][1 , ][2 $b: 10][1 , ][2 $c: 10]) [1 {]}");
+
+  IT('nested',
+    "foo [1 { bar ][2 { ][1 } ]}");
+
+  IT('comma',
+    "foo [1 { font-family][2 : verdana, sans-serif][1 ; ]}");
+
+  IT('parentheses',
+    "foo [1 { color][2 : darken][3 ($blue, 9%][2 )][1 ; ]}");
 })();
diff --git a/mode/css/test.js b/mode/css/test.js
index 43647833aa..3c52460d9f 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -127,4 +127,16 @@
 
   IT("tagSelector",
     "strong, em [1 { background][2 : rgba][3 (255, 255, 0, .2][2 )][1 ;]}");
+
+  IT("atMedia",
+    "[1 @media { foo ][2 { ][1 } ]}");
+
+  IT("comma",
+    "foo [1 { font-family][2 : verdana, sans-serif][1 ; ]}");
+
+  IT("parentheses",
+    "foo [1 { background][2 : url][3 (\"bar\"][2 )][1 ; ]}");
+
+  IT("pseudo",
+    "foo:before [1 { ]}");
 })();

From caff4980d5b0d2586efc81245c65b98d96720417 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 10:48:48 +0100
Subject: [PATCH 0599/4742] Only call onFocus when the editor is really focused

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6d0e9d6459..78939b5599 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1909,7 +1909,6 @@ window.CodeMirror = (function() {
           if (cm.state.draggingText) replaceRange(cm.doc, "", curFrom, curTo, "paste");
           cm.replaceSelection(text, null, "paste");
           focusInput(cm);
-          onFocus(cm);
         }
       }
       catch(e){}
@@ -2869,7 +2868,7 @@ window.CodeMirror = (function() {
 
   CodeMirror.prototype = {
     constructor: CodeMirror,
-    focus: function(){window.focus(); focusInput(this); onFocus(this); fastPoll(this);},
+    focus: function(){window.focus(); focusInput(this); fastPoll(this);},
 
     setOption: function(option, value) {
       var options = this.options, old = options[option];

From 51d6810d35511ad96349eb6a91fe46ff43ddbd7e Mon Sep 17 00:00:00 2001
From: Thaddee Tyl <thaddee.tyl@gmail.com>
Date: Mon, 11 Nov 2013 08:35:07 +0100
Subject: [PATCH 0600/4742] [go mode] Add ')' as electric character.

As a result, the common pattern

import (
	"foo"
	"bar"
	)

will re-indent automatically to the gofmt-blessed

import (
	"foo"
	"bar"
)
---
 mode/go/go.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/go/go.js b/mode/go/go.js
index 6a458a6fe9..862c091120 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -158,7 +158,7 @@ CodeMirror.defineMode("go", function(config) {
       else return ctx.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: "{}:",
+    electricChars: "{}):",
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
     lineComment: "//"

From a98a02692a38b9092173e7a18944ad988e4950c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 13:25:22 +0100
Subject: [PATCH 0601/4742] [htmlmixed mode] Fix bug in intra-token-closetag
 detection

Issue #1943
---
 mode/htmlmixed/htmlmixed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index ec0c21d24a..b59ef37edb 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -44,7 +44,7 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
     if (close > -1) stream.backUp(cur.length - close);
     else if (m = cur.match(/<\/?$/)) {
       stream.backUp(cur.length);
-      if (!stream.match(pat, false)) stream.match(cur[0]);
+      if (!stream.match(pat, false)) stream.match(cur);
     }
     return style;
   }

From 8f87175e22bc0f4a9dab1ab6a42c4fa2e25447ee Mon Sep 17 00:00:00 2001
From: Pavel Strashkin <pavel.strashkin@mulesoft.com>
Date: Mon, 11 Nov 2013 12:57:02 -0800
Subject: [PATCH 0602/4742] [show-hint addon] Fix event delegation for UL/LI

It's possible to provide custom markup for hint elements that are LI
tags and that breaks event delegation logic that expects UL to have
text-only LI nodes. As a result if you have elements inside LI and
click/dblclick on those, nothing happens and selected hint is not
applied. The fix improves event delegation in the way to find nearest
parent element to event target that is a hint element at the same time.
---
 addon/hint/show-hint.js | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index dbf415527a..71cde2d805 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,6 +1,9 @@
 (function() {
   "use strict";
 
+  var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
+  var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
+
   CodeMirror.showHint = function(cm, getHints, options) {
     // We want a single cursor position.
     if (cm.somethingSelected()) return;
@@ -152,7 +155,7 @@
     var completions = data.list;
     for (var i = 0; i < completions.length; ++i) {
       var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
-      var className = "CodeMirror-hint" + (i ? "" : " CodeMirror-hint-active");
+      var className = HINT_ELEMENT_CLASS + (i ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
       if (cur.className != null) className = cur.className + " " + className;
       elt.className = className;
       if (cur.render) cur.render(elt, data, cur);
@@ -216,13 +219,15 @@
     });
 
     CodeMirror.on(hints, "dblclick", function(e) {
-      var t = e.target || e.srcElement;
-      if (t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
+      var t = widget.getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
     });
+
     CodeMirror.on(hints, "click", function(e) {
-      var t = e.target || e.srcElement;
-      if (t.hintId != null) widget.changeActive(t.hintId);
+      var t = widget.getHintElement(hints, e.target || e.srcElement);
+      if (t && t.hintId != null) widget.changeActive(t.hintId);
     });
+
     CodeMirror.on(hints, "mousedown", function() {
       setTimeout(function(){cm.focus();}, 20);
     });
@@ -257,9 +262,9 @@
         i = avoidWrap ? 0  : this.data.list.length - 1;
       if (this.selectedHint == i) return;
       var node = this.hints.childNodes[this.selectedHint];
-      node.className = node.className.replace(" CodeMirror-hint-active", "");
+      node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
       node = this.hints.childNodes[this.selectedHint = i];
-      node.className += " CodeMirror-hint-active";
+      node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
       if (node.offsetTop < this.hints.scrollTop)
         this.hints.scrollTop = node.offsetTop - 3;
       else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
@@ -269,6 +274,25 @@
 
     screenAmount: function() {
       return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
+    },
+
+    getHintElement: function (parentEl, el) {
+      while (el && el !== parentEl && !this.isHintElement(el)) {
+        el = el.parentNode;
+      }
+
+      return el === parentEl
+        ? void(0)
+        : el
+      ;
+    },
+
+    isHintElement: function (el) {
+      return el &&
+             el.nodeName &&
+             el.nodeName.toUpperCase() === 'LI' &&
+             el.className.indexOf(HINT_ELEMENT_CLASS) >= 0
+      ;
     }
   };
 })();

From 443f5118346223e80d57bae67bde91bd5254ea98 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 13:33:32 +0100
Subject: [PATCH 0603/4742] [show-hint addon] Style fixes

Issue #1947
---
 addon/hint/show-hint.js | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 71cde2d805..ca03fc5aaa 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -143,6 +143,13 @@
     return ourMap;
   }
 
+  function getHintElement(stopAt, el) {
+    while (el && el != stopAt) {
+      if (el.nodeName.toUpperCase() === "LI") return el;
+      el = el.parentNode;
+    }
+  }
+
   function Widget(completion, data) {
     this.completion = completion;
     this.data = data;
@@ -219,12 +226,12 @@
     });
 
     CodeMirror.on(hints, "dblclick", function(e) {
-      var t = widget.getHintElement(hints, e.target || e.srcElement);
+      var t = getHintElement(hints, e.target || e.srcElement);
       if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
     });
 
     CodeMirror.on(hints, "click", function(e) {
-      var t = widget.getHintElement(hints, e.target || e.srcElement);
+      var t = getHintElement(hints, e.target || e.srcElement);
       if (t && t.hintId != null) widget.changeActive(t.hintId);
     });
 
@@ -274,25 +281,6 @@
 
     screenAmount: function() {
       return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
-    },
-
-    getHintElement: function (parentEl, el) {
-      while (el && el !== parentEl && !this.isHintElement(el)) {
-        el = el.parentNode;
-      }
-
-      return el === parentEl
-        ? void(0)
-        : el
-      ;
-    },
-
-    isHintElement: function (el) {
-      return el &&
-             el.nodeName &&
-             el.nodeName.toUpperCase() === 'LI' &&
-             el.className.indexOf(HINT_ELEMENT_CLASS) >= 0
-      ;
     }
   };
 })();

From 1013ebb17f89375e8b3706446629332de2d407f6 Mon Sep 17 00:00:00 2001
From: Juho Vuori <juho.vuori@helsinki.fi>
Date: Tue, 12 Nov 2013 15:54:39 +0200
Subject: [PATCH 0604/4742] [show-hint addon] Allow a specific option to be
 selected by default

---
 addon/hint/show-hint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index ca03fc5aaa..70709234ca 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -157,12 +157,12 @@
 
     var hints = this.hints = document.createElement("ul");
     hints.className = "CodeMirror-hints";
-    this.selectedHint = 0;
+    this.selectedHint = options.getDefaultSelection ? options.getDefaultSelection(cm,options,data) : 0;
 
     var completions = data.list;
     for (var i = 0; i < completions.length; ++i) {
       var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
-      var className = HINT_ELEMENT_CLASS + (i ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
+      var className = HINT_ELEMENT_CLASS + (i == this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
       if (cur.className != null) className = cur.className + " " + className;
       elt.className = className;
       if (cur.render) cur.render(elt, data, cur);

From 26e955d1e564bb0ea41038709c371b48779f552e Mon Sep 17 00:00:00 2001
From: Rahul <rchoudhury@gmail.com>
Date: Tue, 12 Nov 2013 15:33:37 +0100
Subject: [PATCH 0605/4742] [real-world uses] Update link to Handcraft

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 6e23106793..a8ff3590d1 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -69,7 +69,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
       <li><a href="http://web.uvic.ca/~siefkenj/graphit/graphit.html">Graphit</a> (function graphing)</li>
-      <li><a href="http://www.handcraft2.com/">Handcraft 2</a> (HTML prototyping)</li>
+      <li><a href="http://www.handcraft.com/">Handcraft</a> (HTML prototyping)</li>
       <li><a href="http://try.haxe.org">Haxe</a> (Haxe Playground) </li>
       <li><a href="http://haxpad.com/">HaxPad</a> (editor for Win RT)</li>
       <li><a href="http://megafonweblab.github.com/histone-javascript/">Histone template engine playground</a></li>

From e327d2fd792a2ac8b022b49bcd98183c1a2be3d3 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Tue, 12 Nov 2013 01:31:23 -0800
Subject: [PATCH 0606/4742] [markdown] Emit 'header1'..'header6' styles in
 addition to 'header'.

---
 demo/variableheight.html  |  8 +++++++-
 mode/markdown/markdown.js | 16 ++++++++++------
 mode/markdown/test.js     | 26 +++++++++++++++-----------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/demo/variableheight.html b/demo/variableheight.html
index 1ef8fc445d..ab241c6d28 100644
--- a/demo/variableheight.html
+++ b/demo/variableheight.html
@@ -10,7 +10,13 @@
 <script src="../mode/xml/xml.js"></script>
 <style type="text/css">
       .CodeMirror {border: 1px solid silver; border-width: 1px 2px; }
-      .cm-header { font-size: 150%; font-family: arial; }
+      .cm-header { font-family: arial; }
+      .cm-header1 { font-size: 150%; }
+      .cm-header2 { font-size: 130%; }
+      .cm-header3 { font-size: 120%; }
+      .cm-header4 { font-size: 110%; }
+      .cm-header5 { font-size: 100%; }
+      .cm-header6 { font-size: 90%; }
       .cm-strong { font-size: 140%; }
     </style>
 <div id=nav>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 0d60b3db8f..218408fb53 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -74,7 +74,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   ulRE = /^[*\-+]\s+/
   ,   olRE = /^[0-9]+\.\s+/
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
-  ,   headerRE = /^(?:\={1,}|-{1,})$/
+  ,   atxHeaderRE = /^#+/
+  ,   setextHeaderRE = /^(?:\={1,}|-{1,})$/
   ,   textRE = /^[^!\[\]*_\\<>` "'(]+/;
 
   function switchInline(stream, state, f) {
@@ -127,14 +128,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.listDepth = 0;
     }
 
+    var match = null;
     if (state.indentationDiff >= 4) {
       state.indentation -= 4;
       stream.skipToEnd();
       return code;
     } else if (stream.eatSpace()) {
       return null;
-    } else if (stream.peek() === '#' || (state.prevLineHasContent && stream.match(headerRE)) ) {
-      state.header = true;
+    } else if (match = stream.match(atxHeaderRE)) {
+      state.header = match[0].length <= 6 ? match[0].length : 6;
+    } else if (state.prevLineHasContent && (match = stream.match(setextHeaderRE))) {
+      state.header = match[0].charAt(0) == '=' ? 1 : 2;
     } else if (stream.eat('>')) {
       state.indentation++;
       state.quote = 1;
@@ -207,7 +211,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     if (state.code) { styles.push(code); }
 
-    if (state.header) { styles.push(header); }
+    if (state.header) { styles.push(header); styles.push(header + state.header); }
     if (state.quote) { styles.push(state.quote % 2 ? quote1 : quote2); }
     if (state.list !== false) {
       var listMod = (state.listDepth - 1) % 3;
@@ -471,7 +475,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         linkTitle: false,
         em: false,
         strong: false,
-        header: false,
+        header: 0,
         taskList: false,
         list: false,
         listDepth: 0,
@@ -522,7 +526,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         }
 
         // Reset state.header
-        state.header = false;
+        state.header = 0;
 
         // Reset state.taskList
         state.taskList = false;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 081be96be1..6bf4006550 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -87,27 +87,31 @@
   // http://daringfireball.net/projects/markdown/syntax#header
 
   MT("atxH1",
-     "[header # foo]");
+     "[header&header1 # foo]");
 
   MT("atxH2",
-     "[header ## foo]");
+     "[header&header2 ## foo]");
 
   MT("atxH3",
-     "[header ### foo]");
+     "[header&header3 ### foo]");
 
   MT("atxH4",
-     "[header #### foo]");
+     "[header&header4 #### foo]");
 
   MT("atxH5",
-     "[header ##### foo]");
+     "[header&header5 ##### foo]");
 
   MT("atxH6",
-     "[header ###### foo]");
+     "[header&header6 ###### foo]");
 
   // H6 - 7x '#' should still be H6, per Dingus
   // http://daringfireball.net/projects/markdown/dingus
   MT("atxH6NotH7",
-     "[header ####### foo]");
+     "[header&header6 ####### foo]");
+
+  // Inline styles should be parsed inside headers
+  MT("atxH1inline",
+     "[header&header1 # foo ][header&header1&em *bar*]");
 
   // Setext headers - H1, H2
   // Per documentation, "Any number of underlining =’s or -’s will work."
@@ -119,22 +123,22 @@
   // Check if single underlining = works
   MT("setextH1",
      "foo",
-     "[header =]");
+     "[header&header1 =]");
 
   // Check if 3+ ='s work
   MT("setextH1",
      "foo",
-     "[header ===]");
+     "[header&header1 ===]");
 
   // Check if single underlining - works
   MT("setextH2",
      "foo",
-     "[header -]");
+     "[header&header2 -]");
 
   // Check if 3+ -'s work
   MT("setextH2",
      "foo",
-     "[header ---]");
+     "[header&header2 ---]");
 
   // Single-line blockquote with trailing space
   MT("blockquoteSpace",

From 2c553036cc1cc8938ea976f2d91c27345528151c Mon Sep 17 00:00:00 2001
From: Shiv Deepak <idlecool@gmail.com>
Date: Tue, 12 Nov 2013 23:33:17 -0800
Subject: [PATCH 0607/4742] [ambiance theme] Text selection uses default
 background color

`cm-s-ambiance` and `CodeMirror-focused` are classes to the same
element, so search for `.cm-s-ambiance .CodeMirror-focused` will fail.
---
 theme/ambiance.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/ambiance.css b/theme/ambiance.css
index a69d16e5a5..3a54b2a022 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -33,7 +33,7 @@
 .cm-s-ambiance .CodeMirror-selected {
   background: rgba(255, 255, 255, 0.15);
 }
-.cm-s-ambiance .CodeMirror-focused .CodeMirror-selected {
+.cm-s-ambiance.CodeMirror-focused .CodeMirror-selected {
   background: rgba(255, 255, 255, 0.10);
 }
 

From 4ca5380c70484d3df255e1a68cec11b2fadfa76e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 22:42:39 +0100
Subject: [PATCH 0608/4742] [docs] Remove underlines for headers

---
 doc/docs.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/docs.css b/doc/docs.css
index c56289346c..d2b0522e9f 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -18,7 +18,6 @@ p { margin-top: 0; }
 
 h2, h3 {
   font-weight: normal;
-  text-decoration: underline;
   margin-bottom: .7em;
 }
 h2 { font-size: 120%; }

From e7cb292bbfa0e5cd41b6fbfab8b5eca9805baa4e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 22:44:23 +0100
Subject: [PATCH 0609/4742] [show-hint addon] Fix bug introduced by merging
 1013ebb17f89375e

---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 70709234ca..46103b719b 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -162,7 +162,7 @@
     var completions = data.list;
     for (var i = 0; i < completions.length; ++i) {
       var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
-      var className = HINT_ELEMENT_CLASS + (i == this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
+      var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
       if (cur.className != null) className = cur.className + " " + className;
       elt.className = className;
       if (cur.render) cur.render(elt, data, cur);

From 1108748b77c23696957be341ebbf52100342fa2c Mon Sep 17 00:00:00 2001
From: mloginov <mikhail.loginov@citronium.com>
Date: Thu, 14 Nov 2013 12:55:35 +0400
Subject: [PATCH 0610/4742] [closetag addon] Fix bug in code that updated the
 autoCloseTags option

---
 addon/edit/closetag.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index a0dc32618e..1da89ba6dc 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -24,16 +24,15 @@
 
 (function() {
   CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
-    if (val && (old == CodeMirror.Init || !old)) {
-      var map = {name: "autoCloseTags"};
-      if (typeof val != "object" || val.whenClosing)
-        map["'/'"] = function(cm) { return autoCloseSlash(cm); };
-      if (typeof val != "object" || val.whenOpening)
-        map["'>'"] = function(cm) { return autoCloseGT(cm); };
-      cm.addKeyMap(map);
-    } else if (!val && (old != CodeMirror.Init && old)) {
+    if (old != CodeMirror.Init && old)
       cm.removeKeyMap("autoCloseTags");
-    }
+    if (!val) return;
+    var map = {name: "autoCloseTags"};
+    if (typeof val != "object" || val.whenClosing)
+      map["'/'"] = function(cm) { return autoCloseSlash(cm); };
+    if (typeof val != "object" || val.whenOpening)
+      map["'>'"] = function(cm) { return autoCloseGT(cm); };
+    cm.addKeyMap(map);
   });
 
   var htmlDontClose = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param",

From 39804ada3d6d14da5e0f237fa5904a5e0aaa4489 Mon Sep 17 00:00:00 2001
From: Laszlo Vidacs <lac@inf.u-szeged.hu>
Date: Thu, 14 Nov 2013 11:05:19 +0100
Subject: [PATCH 0611/4742] [javascript] Include ES6 for..of construct.

---
 mode/javascript/javascript.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 05ae70bd2f..5be5f7c119 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -19,7 +19,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
       "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "typeof": operator, "instanceof": operator,
+      "in": operator, "of": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
       "this": kw("this")
     };
@@ -385,16 +385,16 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function forspec1(type) {
     if (type == "var") return cont(vardef1, expect(";"), forspec2);
     if (type == ";") return cont(forspec2);
-    if (type == "variable") return cont(formaybein);
+    if (type == "variable") return cont(formaybeinof);
     return pass(expression, expect(";"), forspec2);
   }
-  function formaybein(_type, value) {
-    if (value == "in") return cont(expression);
+  function formaybeinof(_type, value) {
+    if (value == "in" || value == "of") return cont(expression);
     return cont(maybeoperatorComma, forspec2);
   }
   function forspec2(type, value) {
     if (type == ";") return cont(forspec3);
-    if (value == "in") return cont(expression);
+    if (value == "in" || value == "of") return cont(expression);
     return pass(expression, expect(";"), forspec3);
   }
   function forspec3(type) {

From c4caf8670061b661f204c9306c2361406620a0c7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Nov 2013 13:34:36 +0100
Subject: [PATCH 0612/4742] [javascript mode] More ES6 features (modules,
 destructuring, generators, class)

---
 mode/javascript/javascript.js | 116 ++++++++++++++++++++++++----------
 mode/javascript/test.js       |  42 ++++++++++++
 2 files changed, 125 insertions(+), 33 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 5be5f7c119..17cd1b02d6 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -19,9 +19,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
       "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "of": operator, "typeof": operator, "instanceof": operator,
+      "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
-      "this": kw("this")
+      "this": kw("this"), "module": kw("module"), "class": kw("class"), "super": kw("atom"),
+      "yield": C, "export": kw("export"), "import": kw("import")
     };
 
     // Extend the 'normal' keywords with the TypeScript language extensions
@@ -30,7 +31,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       var tsKeywords = {
         // object-like things
         "interface": kw("interface"),
-        "class": kw("class"),
         "extends": kw("extends"),
         "constructor": kw("constructor"),
 
@@ -40,8 +40,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         "protected": kw("protected"),
         "static": kw("static"),
 
-        "super": kw("super"),
-
         // types
         "string": type, "number": type, "bool": type, "any": type
       };
@@ -84,6 +82,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return chain(stream, state, jsTokenString(ch));
     else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/))
       return ret("number", "number");
+    else if (ch == "." && stream.eat(".."))
+      return ret("spread", "meta");
     else if (/[\[\]{}\(\),;\:\.]/.test(ch))
       return ret(ch);
     else if (ch == "0" && stream.eat(/x/i)) {
@@ -257,8 +257,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     };
   }
 
-  function statement(type) {
-    if (type == "var") return cont(pushlex("vardef"), vardef1, expect(";"), poplex);
+  function statement(type, value) {
+    if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
     if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
     if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
     if (type == "{") return cont(pushlex("}"), block, poplex);
@@ -274,6 +274,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "default") return cont(expect(":"));
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
                                      statement, poplex, popcontext);
+    if (type == "module") return cont(pushlex("form"), pushcontext, afterModule, popcontext, poplex);
+    if (type == "class") return cont(pushlex("form"), className, objlit, poplex);
+    if (type == "export") return cont(pushlex("form"), afterExport, poplex);
+    if (type == "import") return cont(pushlex("form"), afterImport, poplex);
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {
@@ -288,9 +292,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "function") return cont(functiondef);
     if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
-    if (type == "operator") return cont(noComma ? expressionNoComma : expression);
-    if (type == "[") return cont(pushlex("]"), commasep(expressionNoComma, "]"), poplex, maybeop);
-    if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeop);
+    if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
+    if (type == "[") return cont(commasep(expressionNoComma, "]"), maybeop);
+    if (type == "{") return cont(commasep(objprop, "}"), maybeop);
     return cont();
   }
   function maybeexpression(type) {
@@ -315,7 +319,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(expr);
     }
     if (type == ";") return;
-    if (type == "(") return cont(pushlex(")", "call"), commasep(expressionNoComma, ")"), poplex, me);
+    if (type == "(") return cont(commasep(expressionNoComma, ")", "call"), me);
     if (type == ".") return cont(property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
   }
@@ -332,16 +336,21 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (value == "get" || value == "set") return cont(getterSetter);
     } else if (type == "number" || type == "string") {
       cx.marked = type + " property";
+    } else if (type == "[") {
+      return cont(expression, expect("]"), afterprop);
     }
-    if (atomicTypes.hasOwnProperty(type)) return cont(expect(":"), expressionNoComma);
+    if (atomicTypes.hasOwnProperty(type)) return cont(afterprop);
   }
   function getterSetter(type) {
-    if (type == ":") return cont(expression);
-    if (type != "variable") return cont(expect(":"), expression);
+    if (type != "variable") return pass(afterprop);
     cx.marked = "property";
     return cont(functiondef);
   }
-  function commasep(what, end) {
+  function afterprop(type) {
+    if (type == ":") return cont(expressionNoComma);
+    if (type == "(") return pass(functiondef);
+  }
+  function commasep(what, end, info) {
     function proceed(type) {
       if (type == ",") {
         var lex = cx.state.lexical;
@@ -353,7 +362,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     return function(type) {
       if (type == end) return cont();
-      else return pass(what, proceed);
+      else return pass(pushlex(end, info), what, proceed, poplex);
     };
   }
   function block(type) {
@@ -361,51 +370,92 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(statement, block);
   }
   function maybetype(type) {
-    if (type == ":") return cont(typedef);
-    return pass();
+    if (isTS && type == ":") return cont(typedef);
   }
   function typedef(type) {
     if (type == "variable"){cx.marked = "variable-3"; return cont();}
-    return pass();
   }
-  function vardef1(type, value) {
-    if (type == "variable") {
+  function vardef() {
+    return pass(pattern, maybetype, maybeAssign, vardefCont);
+  }
+  function pattern(type, value) {
+    if (type == "variable") { register(value); return cont(); }
+    if (type == "[") return cont(commasep(pattern, "]"));
+    if (type == "{") return cont(commasep(proppattern, "}"));
+  }
+  function proppattern(type, value) {
+    if (type == "variable" && !cx.stream.match(/^\s*:/, false)) {
       register(value);
-      return isTS ? cont(maybetype, vardef2) : cont(vardef2);
+      return cont(maybeAssign);
     }
-    return pass();
+    if (type == "variable") cx.marked = "property";
+    return cont(expect(":"), pattern, maybeAssign);
+  }
+  function maybeAssign(_type, value) {
+    if (value == "=") return cont(expressionNoComma);
   }
-  function vardef2(type, value) {
-    if (value == "=") return cont(expressionNoComma, vardef2);
-    if (type == ",") return cont(vardef1);
+  function vardefCont(type) {
+    if (type == ",") return cont(vardef);
   }
   function maybeelse(type, value) {
     if (type == "keyword b" && value == "else") return cont(pushlex("form"), statement, poplex);
   }
   function forspec1(type) {
-    if (type == "var") return cont(vardef1, expect(";"), forspec2);
+    if (type == "var") return cont(vardef, expect(";"), forspec2);
     if (type == ";") return cont(forspec2);
     if (type == "variable") return cont(formaybeinof);
     return pass(expression, expect(";"), forspec2);
   }
   function formaybeinof(_type, value) {
-    if (value == "in" || value == "of") return cont(expression);
+    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
     return cont(maybeoperatorComma, forspec2);
   }
   function forspec2(type, value) {
     if (type == ";") return cont(forspec3);
-    if (value == "in" || value == "of") return cont(expression);
+    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
     return pass(expression, expect(";"), forspec3);
   }
   function forspec3(type) {
     if (type != ")") cont(expression);
   }
   function functiondef(type, value) {
+    if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
     if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, statement, popcontext);
+    if (type == "(") return cont(pushcontext, commasep(funarg, ")"), statement, popcontext);
+  }
+  function funarg(type) {
+    if (type == "spread") return cont(funarg);
+    return pass(pattern, maybetype);
+  }
+  function className(type, value) {
+    if (type == "variable") {register(value); return cont(classNameAfter);}
+  }
+  function classNameAfter(type) {
+    if (type == "(") return pass(expression);
+  }
+  function objlit(type) {
+    if (type == "{") return cont(commasep(objprop, "}"));
+  }
+  function afterModule(type, value) {
+    if (type == "string") return cont(statement);
+    if (type == "variable") { register(value); return cont(maybeFrom); }
+  }
+  function afterExport(_type, value) {
+    if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
+    if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
+    return pass(statement);
+  }
+  function afterImport(type) {
+    if (type == "string") return cont();
+    return pass(importSpec, maybeFrom);
+  }
+  function importSpec(type, value) {
+    if (type == "{") return cont(commasep(importSpec, "}"));
+    if (type == "variable") register(value);
+    return cont();
   }
-  function funarg(type, value) {
-    if (type == "variable") {register(value); return isTS ? cont(maybetype) : cont();}
+  function maybeFrom(_type, value) {
+    if (value == "from") { cx.marked = "keyword"; return cont(expression); }
   }
 
   // Interface
@@ -452,7 +502,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         lexical = lexical.prev;
       var type = lexical.type, closing = firstChar == type;
 
-      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? 4 : 0);
+      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
       else if (type == "form" && firstChar == "{") return lexical.indented;
       else if (type == "form") return lexical.indented + indentUnit;
       else if (type == "stat")
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index a2af527bee..90c4769d47 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -7,4 +7,46 @@
 
   MT("comma-and-binop",
      "[keyword function](){ [keyword var] [def x] = [number 1] + [number 2], [def y]; }");
+
+  MT("destructuring",
+     "([keyword function]([def a], [[[def b], [def c] ]]) {",
+     "  [keyword let] {[def d], [property foo]: [def c]=[number 10], [def x]} = [variable foo]([variable-2 a]);",
+     "  [[[variable-2 c], [variable y] ]] = [variable-2 c];",
+     "})();");
+
+  MT("class",
+     "[keyword class] [variable Point]([variable SuperThing]) {",
+     "  [[ [string-2 /expr/] ]]: [number 24],",
+     "  [property constructor]([def x], [def y]) {",
+     "    [keyword super]([string 'something']);",
+     "    [keyword this].[property x] = [variable-2 x];",
+     "  }",
+     "}");
+
+  MT("module",
+     "[keyword module] [string 'foo'] {",
+     "  [keyword export] [keyword let] [def x] = [number 42];",
+     "  [keyword export] [keyword *] [keyword from] [string 'somewhere'];",
+     "}");
+
+  MT("import",
+     "[keyword function] [variable foo]() {",
+     "  [keyword import] [def $] [keyword from] [string 'jquery'];",
+     "  [keyword module] [def crypto] [keyword from] [string 'crypto'];",
+     "  [keyword import] { [def encrypt], [def decrypt] } [keyword from] [string 'crypto'];",
+     "}");
+
+  MT("const",
+     "[keyword function] [variable f]() {",
+     "  [keyword const] [[ [def a], [def b] ]] = [[ [number 1], [number 2] ]];",
+     "}");
+
+  MT("for/of",
+     "[keyword for]([keyword let] [variable of] [keyword of] [variable something]) {}");
+
+  MT("generator",
+     "[keyword function*] [variable repeat]([def n]) {",
+     "  [keyword for]([keyword var] [def i] = [number 0]; [variable-2 i] < [variable-2 n]; ++[variable-2 i])",
+     "    [keyword yield] [variable-2 i];",
+     "}");
 })();

From 83aa2b8707324046166f9aef0ef0594c06ddca52 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Nov 2013 14:14:05 +0100
Subject: [PATCH 0613/4742] [javascript mode] Add ES6 fat-arrow support

---
 mode/javascript/javascript.js | 54 ++++++++++++++++++++++++++++++++++-
 mode/javascript/test.js       | 11 +++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 17cd1b02d6..001a04032f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -82,10 +82,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return chain(stream, state, jsTokenString(ch));
     else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/))
       return ret("number", "number");
-    else if (ch == "." && stream.eat(".."))
+    else if (ch == "." && stream.match(".."))
       return ret("spread", "meta");
     else if (/[\[\]{}\(\),;\:\.]/.test(ch))
       return ret(ch);
+    else if (ch == "=" && stream.eat(">"))
+      return ret("=>");
     else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
@@ -149,6 +151,38 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return ret("comment", "comment");
   }
 
+  var brackets = "([{}])";
+  // This is a crude lookahead trick to try and notice that we're
+  // parsing the argument patterns for a fat-arrow function before we
+  // actually hit the arrow token. It only works if the arrow is on
+  // the same line as the arguments and there's no strange noise
+  // (comments) in between. Fallback is to only notice when we hit the
+  // arrow, and not declare the arguments as locals for the arrow
+  // body.
+  function findFatArrow(stream, state) {
+    if (state.fatArrowAt) state.fatArrowAt = null;
+    var arrow = stream.string.indexOf("=>", stream.start);
+    if (arrow < 0) return;
+
+    var depth = 0, sawSomething = false;
+    for (var pos = arrow - 1; pos >= 0; --pos) {
+      var ch = stream.string.charAt(pos);
+      var bracket = brackets.indexOf(ch);
+      if (bracket >= 0 && bracket < 3) {
+        if (!depth) { ++pos; break; }
+        if (--depth == 0) break;
+      } else if (bracket >= 3 && bracket < 6) {
+        ++depth;
+      } else if (/[$\w]/.test(ch)) {
+        sawSomething = true;
+      } else if (sawSomething && !depth) {
+        ++pos;
+        break;
+      }
+    }
+    if (sawSomething && !depth) state.fatArrowAt = pos;
+  }
+
   // Parser
 
   var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true};
@@ -287,6 +321,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return expressionInner(type, true);
   }
   function expressionInner(type, noComma) {
+    if (cx.state.fatArrowAt == cx.stream.start) {
+      var body = noComma ? arrowBodyNoComma : arrowBody;
+      if (type == "(") return cont(pushcontext, commasep(pattern, ")"), expect("=>"), body, popcontext);
+      else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
+    }
+
     var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
     if (type == "function") return cont(functiondef);
@@ -313,6 +353,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeoperatorNoComma(type, value, noComma) {
     var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
     var expr = noComma == false ? expression : expressionNoComma;
+    if (value == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
     if (type == "operator") {
       if (/\+\+|--/.test(value)) return cont(me);
       if (value == "?") return cont(expression, expect(":"), expr);
@@ -323,6 +364,16 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ".") return cont(property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
   }
+  function arrowBody(type) {
+    findFatArrow(cx.stream, cx.state);
+    if (type == "{") return pass(statement);
+    return pass(expression);
+  }
+  function arrowBodyNoComma(type) {
+    findFatArrow(cx.stream, cx.state);
+    if (type == "{") return pass(statement);
+    return pass(expressionNoComma);
+  }
   function maybelabel(type) {
     if (type == ":") return cont(poplex, statement);
     return pass(maybeoperatorComma, expect(";"), poplex);
@@ -479,6 +530,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         if (!state.lexical.hasOwnProperty("align"))
           state.lexical.align = false;
         state.indented = stream.indentation();
+        findFatArrow(stream, state);
       }
       if (state.tokenize != jsTokenComment && stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 90c4769d47..d7f4fe5e6a 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -49,4 +49,15 @@
      "  [keyword for]([keyword var] [def i] = [number 0]; [variable-2 i] < [variable-2 n]; ++[variable-2 i])",
      "    [keyword yield] [variable-2 i];",
      "}");
+
+  MT("fatArrow",
+     "[variable array].[property filter]([def a] => [variable-2 a] + [number 1]);",
+     "[variable a];", // No longer in scope
+     "[keyword let] [variable f] = ([[ [def a], [def b] ]], [def c]) => [variable-2 a] + [variable-2 c];",
+     "[variable c];");
+
+  MT("spread",
+     "[keyword function] [variable f]([def a], [meta ...][def b]) {",
+     "  [variable something]([variable-2 a], [meta ...][variable-2 b]);",
+     "}");
 })();

From d272101f6407359c7733316f07ac7126473aab94 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Nov 2013 14:34:34 +0100
Subject: [PATCH 0614/4742] [javascript mode] Add support for ES6-style
 comprehension

---
 mode/javascript/javascript.js | 22 +++++++++++++++++-----
 mode/javascript/test.js       |  6 ++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 001a04032f..92f58e82ac 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -299,8 +299,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ";") return cont();
     if (type == "if") return cont(pushlex("form"), expression, statement, poplex, maybeelse);
     if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"),
-                                   poplex, statement, poplex);
+    if (type == "for") return cont(pushlex("form"), forspec, poplex, statement, poplex);
     if (type == "variable") return cont(pushlex("stat"), maybelabel);
     if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
                                       block, poplex, poplex);
@@ -331,9 +330,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
     if (type == "function") return cont(functiondef);
     if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
+    if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
-    if (type == "[") return cont(commasep(expressionNoComma, "]"), maybeop);
+    if (type == "[") return cont(pushlex("]"), expressionNoComma, maybeArrayComprehension, poplex, maybeop);
     if (type == "{") return cont(commasep(objprop, "}"), maybeop);
     return cont();
   }
@@ -413,7 +412,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     return function(type) {
       if (type == end) return cont();
-      else return pass(pushlex(end, info), what, proceed, poplex);
+      if (info === false) return pass(what, proceed);
+      return pass(pushlex(end, info), what, proceed, poplex);
     };
   }
   function block(type) {
@@ -451,6 +451,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeelse(type, value) {
     if (type == "keyword b" && value == "else") return cont(pushlex("form"), statement, poplex);
   }
+  function forspec(type) {
+    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"));
+  }
   function forspec1(type) {
     if (type == "var") return cont(vardef, expect(";"), forspec2);
     if (type == ";") return cont(forspec2);
@@ -508,6 +511,15 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeFrom(_type, value) {
     if (value == "from") { cx.marked = "keyword"; return cont(expression); }
   }
+  function maybeArrayComprehension(type) {
+    if (type == "for") return pass(comprehension);
+    if (type == ",") return cont(commasep(expressionNoComma, "]", false));
+    return pass(commasep(expressionNoComma, "]", false));
+  }
+  function comprehension(type) {
+    if (type == "for") return cont(forspec, comprehension);
+    if (type == "if") return cont(expression, comprehension);
+  }
 
   // Interface
 
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index d7f4fe5e6a..125cfce373 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -60,4 +60,10 @@
      "[keyword function] [variable f]([def a], [meta ...][def b]) {",
      "  [variable something]([variable-2 a], [meta ...][variable-2 b]);",
      "}");
+
+  MT("comprehension",
+     "[keyword function] [variable f]() {",
+     "  [[ [variable x] + [number 1] [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
+     "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] === [string 'blue']));",
+     "}");
 })();

From d85b8c4c980fc54a2e52950622feb939c0013e8f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 15 Nov 2013 11:03:19 +0100
Subject: [PATCH 0615/4742] [javascript mode] Add support for ES6 quasiquotes

---
 mode/javascript/javascript.js | 101 ++++++++++++++++++++--------------
 mode/javascript/test.js       |   3 +
 2 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 92f58e82ac..03824739e6 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -54,11 +54,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   var isOperatorChar = /[+\-*&%=<>!?|~^]/;
 
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
   function nextUntilUnescaped(stream, end) {
     var escaped = false, next;
     while ((next = stream.next()) != null) {
@@ -76,54 +71,51 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     type = tp; content = cont;
     return style;
   }
-  function jsTokenBase(stream, state) {
+  function tokenBase(stream, state) {
     var ch = stream.next();
-    if (ch == '"' || ch == "'")
-      return chain(stream, state, jsTokenString(ch));
-    else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/))
+    if (ch == '"' || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
       return ret("number", "number");
-    else if (ch == "." && stream.match(".."))
+    } else if (ch == "." && stream.match("..")) {
       return ret("spread", "meta");
-    else if (/[\[\]{}\(\),;\:\.]/.test(ch))
+    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
       return ret(ch);
-    else if (ch == "=" && stream.eat(">"))
+    } else if (ch == "=" && stream.eat(">")) {
       return ret("=>");
-    else if (ch == "0" && stream.eat(/x/i)) {
+    } else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
-    }
-    else if (/\d/.test(ch)) {
+    } else if (/\d/.test(ch)) {
       stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");
-    }
-    else if (ch == "/") {
+    } else if (ch == "/") {
       if (stream.eat("*")) {
-        return chain(stream, state, jsTokenComment);
-      }
-      else if (stream.eat("/")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      } else if (stream.eat("/")) {
         stream.skipToEnd();
         return ret("comment", "comment");
-      }
-      else if (state.lastType == "operator" || state.lastType == "keyword c" ||
+      } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
                state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
         nextUntilUnescaped(stream, "/");
         stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla
         return ret("regexp", "string-2");
-      }
-      else {
+      } else {
         stream.eatWhile(isOperatorChar);
         return ret("operator", null, stream.current());
       }
-    }
-    else if (ch == "#") {
+    } else if (ch == "`") {
+      state.tokenize = tokenQuasi;
+      return tokenQuasi(stream, state);
+    } else if (ch == "#") {
       stream.skipToEnd();
       return ret("error", "error");
-    }
-    else if (isOperatorChar.test(ch)) {
+    } else if (isOperatorChar.test(ch)) {
       stream.eatWhile(isOperatorChar);
       return ret("operator", null, stream.current());
-    }
-    else {
+    } else {
       stream.eatWhile(/[\w\$_]/);
       var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
       return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
@@ -131,19 +123,19 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
   }
 
-  function jsTokenString(quote) {
+  function tokenString(quote) {
     return function(stream, state) {
       if (!nextUntilUnescaped(stream, quote))
-        state.tokenize = jsTokenBase;
+        state.tokenize = tokenBase;
       return ret("string", "string");
     };
   }
 
-  function jsTokenComment(stream, state) {
+  function tokenComment(stream, state) {
     var maybeEnd = false, ch;
     while (ch = stream.next()) {
       if (ch == "/" && maybeEnd) {
-        state.tokenize = jsTokenBase;
+        state.tokenize = tokenBase;
         break;
       }
       maybeEnd = (ch == "*");
@@ -151,6 +143,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return ret("comment", "comment");
   }
 
+  function tokenQuasi(stream, state) {
+    var escaped = false, next;
+    while ((next = stream.next()) != null) {
+      if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      escaped = !escaped && next == "\\";
+    }
+    return ret("quasi", "string-2", stream.current());
+  }
+
   var brackets = "([{}])";
   // This is a crude lookahead trick to try and notice that we're
   // parsing the argument patterns for a fat-arrow function before we
@@ -249,7 +253,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       state.localVars = {name: varname, next: state.localVars};
     } else {
       if (inList(state.globalVars)) return;
-      state.globalVars = {name: varname, next: state.globalVars};
+      if (parserConfig.globalVars)
+        state.globalVars = {name: varname, next: state.globalVars};
     }
   }
 
@@ -358,11 +363,24 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (value == "?") return cont(expression, expect(":"), expr);
       return cont(expr);
     }
+    if (type == "quasi") { cx.cc.push(me); return quasi(value); }
     if (type == ";") return;
     if (type == "(") return cont(commasep(expressionNoComma, ")", "call"), me);
     if (type == ".") return cont(property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
   }
+  function quasi(value) {
+    if (!value) debugger;
+    if (value.slice(value.length - 2) != "${") return cont();
+    return cont(expression, continueQuasi);
+  }
+  function continueQuasi(type) {
+    if (type == "}") {
+      cx.marked = "string-2";
+      cx.state.tokenize = tokenQuasi;
+      return cont();
+    }
+  }
   function arrowBody(type) {
     findFatArrow(cx.stream, cx.state);
     if (type == "{") return pass(statement);
@@ -525,16 +543,17 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   return {
     startState: function(basecolumn) {
-      return {
-        tokenize: jsTokenBase,
+      var state = {
+        tokenize: tokenBase,
         lastType: "sof",
         cc: [],
         lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,
-        globalVars: parserConfig.globalVars,
         context: parserConfig.localVars && {vars: parserConfig.localVars},
         indented: 0
       };
+      if (parserConfig.globalVars) state.globalVars = parserConfig.globalVars;
+      return state;
     },
 
     token: function(stream, state) {
@@ -544,7 +563,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         state.indented = stream.indentation();
         findFatArrow(stream, state);
       }
-      if (state.tokenize != jsTokenComment && stream.eatSpace()) return null;
+      if (state.tokenize != tokenComment && stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
       if (type == "comment") return style;
       state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type;
@@ -552,8 +571,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     },
 
     indent: function(state, textAfter) {
-      if (state.tokenize == jsTokenComment) return CodeMirror.Pass;
-      if (state.tokenize != jsTokenBase) return 0;
+      if (state.tokenize == tokenComment) return CodeMirror.Pass;
+      if (state.tokenize != tokenBase) return 0;
       var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
       // Kludge to prevent 'maybelse' from blocking lexical scope pops
       for (var i = state.cc.length - 1; i >= 0; --i) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 125cfce373..8dcb20d455 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -66,4 +66,7 @@
      "  [[ [variable x] + [number 1] [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
      "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] === [string 'blue']));",
      "}");
+
+  MT("quasi",
+     "[variable re][string-2 `fofdlakj${][variable x] + ([variable re][string-2 `foo`]) + [number 1][string-2 }fdsa`] + [number 2]");
 })();

From a31c335e03a0d89cdbed2c40197c0cab7ff08b4a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 15 Nov 2013 11:10:12 +0100
Subject: [PATCH 0616/4742] [javascript mode] Use 'extends' instead of
 parenthesized syntax for inheritance

---
 mode/javascript/javascript.js | 6 +++---
 mode/javascript/test.js       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 03824739e6..fdc41877b0 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -22,7 +22,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
       "this": kw("this"), "module": kw("module"), "class": kw("class"), "super": kw("atom"),
-      "yield": C, "export": kw("export"), "import": kw("import")
+      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
     };
 
     // Extend the 'normal' keywords with the TypeScript language extensions
@@ -502,8 +502,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function className(type, value) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
-  function classNameAfter(type) {
-    if (type == "(") return pass(expression);
+  function classNameAfter(_type, value) {
+    if (value == "extends") return cont(expression);
   }
   function objlit(type) {
     if (type == "{") return cont(commasep(objprop, "}"));
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 8dcb20d455..760152499e 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -15,7 +15,7 @@
      "})();");
 
   MT("class",
-     "[keyword class] [variable Point]([variable SuperThing]) {",
+     "[keyword class] [variable Point] [keyword extends] [variable SuperThing] {",
      "  [[ [string-2 /expr/] ]]: [number 24],",
      "  [property constructor]([def x], [def y]) {",
      "    [keyword super]([string 'something']);",

From 37ee20782d8d45eeb9a536d953eb90d3a903cb5b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 18 Nov 2013 11:01:12 +0100
Subject: [PATCH 0617/4742] [javascript mode] Fix indentation of 'else' lines

Issue #1960
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fdc41877b0..f27c06346c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -578,7 +578,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       for (var i = state.cc.length - 1; i >= 0; --i) {
         var c = state.cc[i];
         if (c == poplex) lexical = lexical.prev;
-        else if (c != maybeelse || /^else\b/.test(textAfter)) break;
+        else if (c != maybeelse) break;
       }
       if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
       if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")

From 8e2454ae441dc1913f2d1c88b7627d1c0d560450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E9=B9=8F=E5=88=9A?= <weipenggang@163.com>
Date: Tue, 19 Nov 2013 14:55:52 +0800
Subject: [PATCH 0618/4742] [fullscreen addon] Set with to auto rather than ''

---
 addon/display/fullscreen.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
index 3c31e97a33..a442f6a433 100644
--- a/addon/display/fullscreen.js
+++ b/addon/display/fullscreen.js
@@ -12,7 +12,8 @@
     var wrap = cm.getWrapperElement();
     cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
                                   width: wrap.style.width, height: wrap.style.height};
-    wrap.style.width = wrap.style.height = "";
+    wrap.style.width = "";
+    wrap.style.height = "auto";
     wrap.className += " CodeMirror-fullscreen";
     document.documentElement.style.overflow = "hidden";
     cm.refresh();

From 4426841017bfc06411dd4513c77e35900e1710f2 Mon Sep 17 00:00:00 2001
From: Anton Kovalyov <anton@kovalyov.net>
Date: Mon, 18 Nov 2013 15:33:11 -0800
Subject: [PATCH 0619/4742] [dialog addon] Make dialogDiv accept a detached DOM
 node in addition to a template string

---
 addon/dialog/dialog.js | 6 +++++-
 doc/manual.html        | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index ced394d3fc..499964fdb2 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -10,7 +10,11 @@
     } else {
       dialog.className = "CodeMirror-dialog CodeMirror-dialog-top";
     }
-    dialog.innerHTML = template;
+    if (typeof template == "string") {
+      dialog.innerHTML = template;
+    } else { // Assuming it's a detached DOM element.
+      dialog.appendChild(template);
+    }
     return dialog;
   }
 
diff --git a/doc/manual.html b/doc/manual.html
index 80de6d950f..8100bb82a7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1710,9 +1710,9 @@ <h2>Addons</h2>
       <dd>Provides a very simple way to query users for text input.
       Adds an <strong><code>openDialog</code></strong> method to
       CodeMirror instances, which can be called with an HTML fragment
-      that provides the prompt (should include an <code>input</code>
-      tag), and a callback function that is called when text has been
-      entered. Also adds
+      or a detached DOM node that provides the prompt (should include
+      an <code>input</code> tag), and a callback function that is called
+      when text has been entered. Also adds
       an <strong><code>openNotification</code></strong> function that
       simply shows an HTML fragment as a notification. Depends
       on <code>addon/dialog/dialog.css</code>.</dd>

From bd374efc143ccb4515d001a647ba89d2fdd11201 Mon Sep 17 00:00:00 2001
From: Alberto Pose <albertopose@gmail.com>
Date: Mon, 18 Nov 2013 18:05:13 -0300
Subject: [PATCH 0620/4742] [foldgutter addon] Add options to customize
 change/update time spans

---
 addon/fold/foldgutter.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index e3c52bc229..57336fbff8 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -88,14 +88,14 @@
   }
 
   function onChange(cm) {
-    var state = cm.state.foldGutter;
+    var state = cm.state.foldGutter, opts = cm.state.foldGutter.options;
     state.from = state.to = 0;
     clearTimeout(state.changeUpdate);
-    state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, 600);
+    state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, opts.foldOnChangeTimeSpan || 600);
   }
 
   function onViewportChange(cm) {
-    var state = cm.state.foldGutter;
+    var state = cm.state.foldGutter, opts = cm.state.foldGutter.options;
     clearTimeout(state.changeUpdate);
     state.changeUpdate = setTimeout(function() {
       var vp = cm.getViewport();
@@ -113,7 +113,7 @@
           }
         });
       }
-    }, 400);
+    }, opts.updateViewportTimeSpan || 400);
   }
 
   function onFold(cm, from) {

From f0610e60c3b220814d80c133326adebc7339a35f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 19 Nov 2013 18:33:06 +0100
Subject: [PATCH 0621/4742] Add specialChars and specialCharPlaceholder options

Issue #649
---
 doc/manual.html   | 13 +++++++++++++
 lib/codemirror.js | 22 ++++++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8100bb82a7..a0c650e170 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -208,6 +208,19 @@ <h2>Configuration</h2>
       indentation (only works if the mode supports indentation).
       Default is true.</dd>
 
+      <dt id="option_specialChars"><code><strong>specialChars</strong>: RegExp</code></dt>
+      <dd>A regular expression used to determine which characters
+      should be replaced by a
+      special <a href="#option_specialCharPlaceholder">placeholder</a>.
+      Mostly useful for non-printing special characters. The default
+      is <code>/[\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/</code>.</dd>
+      <dt id="option_specialCharPlaceholder"><code><strong>specialCharPlaceholder</strong>: function(char) → Element</code></dt>
+      <dd>A function that, given a special character identified by
+      the <a href="#option_specialChars"><code>specialChars</code></a>
+      option, produces a DOM node that is used to represent the
+      character. By default, a red dot (<span style="color: red">•</span>)
+      is shown, with a title tooltip to indicate the character code.</dd>
+
       <dt id="option_rtlMoveVisually"><code><strong>rtlMoveVisually</strong>: boolean</code></dt>
       <dd>Determines whether horizontal cursor movement through
       right-to-left (Arabic, Hebrew) text is visual (pressing the left
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 78939b5599..8d4fbcaa26 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3281,6 +3281,11 @@ window.CodeMirror = (function() {
     clearCaches(cm);
     regChange(cm);
   }, true);
+  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/, function(cm, val) {
+    cm.options.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
+    cm.refresh();
+  }, true);
+  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
   option("electricChars", true);
   option("rtlMoveVisually", !windows);
 
@@ -4426,17 +4431,23 @@ window.CodeMirror = (function() {
     return builder;
   }
 
-  var tokenSpecialChars = /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\uFEFF]/g;
+  function defaultSpecialCharPlaceholder(ch) {
+    var token = elt("span", "\u2022", "cm-invalidchar");
+    token.title = "\\u" + ch.toString(16);
+    return token;
+  }
+
   function buildToken(builder, text, style, startStyle, endStyle, title) {
     if (!text) return;
-    if (!tokenSpecialChars.test(text)) {
+    var special = builder.cm.options.specialChars;
+    if (!special.test(text)) {
       builder.col += text.length;
       var content = document.createTextNode(text);
     } else {
       var content = document.createDocumentFragment(), pos = 0;
       while (true) {
-        tokenSpecialChars.lastIndex = pos;
-        var m = tokenSpecialChars.exec(text);
+        special.lastIndex = pos;
+        var m = special.exec(text);
         var skipped = m ? m.index - pos : text.length - pos;
         if (skipped) {
           content.appendChild(document.createTextNode(text.slice(pos, pos + skipped)));
@@ -4449,8 +4460,7 @@ window.CodeMirror = (function() {
           content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
           builder.col += tabWidth;
         } else {
-          var token = elt("span", "\u2022", "cm-invalidchar");
-          token.title = "\\u" + m[0].charCodeAt(0).toString(16);
+          var token = builder.cm.options.specialCharPlaceholder(m[0].charCodeAt(0));
           content.appendChild(token);
           builder.col += 1;
         }

From 3853222ea46bff376fca7a965d6be178ccc568fa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 19 Nov 2013 18:46:41 +0100
Subject: [PATCH 0622/4742] Fix two bugs in f0610e60c3b220

Issue #649
---
 lib/codemirror.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8d4fbcaa26..73782aa4fd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3281,7 +3281,7 @@ window.CodeMirror = (function() {
     clearCaches(cm);
     regChange(cm);
   }, true);
-  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/, function(cm, val) {
+  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/g, function(cm, val) {
     cm.options.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
     cm.refresh();
   }, true);
@@ -4433,7 +4433,7 @@ window.CodeMirror = (function() {
 
   function defaultSpecialCharPlaceholder(ch) {
     var token = elt("span", "\u2022", "cm-invalidchar");
-    token.title = "\\u" + ch.toString(16);
+    token.title = "\\u" + ch.charCodeAt(0).toString(16);
     return token;
   }
 
@@ -4460,7 +4460,7 @@ window.CodeMirror = (function() {
           content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
           builder.col += tabWidth;
         } else {
-          var token = builder.cm.options.specialCharPlaceholder(m[0].charCodeAt(0));
+          var token = builder.cm.options.specialCharPlaceholder(m[0]);
           content.appendChild(token);
           builder.col += 1;
         }

From e446407ac121532a21ef7b129b32365532529404 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 19 Nov 2013 18:56:51 +0100
Subject: [PATCH 0623/4742] Run mode over the whole line in long lines when in
 background-processing mode

Issue #1908
---
 lib/codemirror.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 73782aa4fd..1dff8d4c35 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -910,7 +910,7 @@ window.CodeMirror = (function() {
     doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.showingTo + 500), function(line) {
       if (doc.frontier >= cm.display.showingFrom) { // Visible
         var oldStyles = line.styles;
-        line.styles = highlightLine(cm, line, state);
+        line.styles = highlightLine(cm, line, state, true);
         var ischange = !oldStyles || oldStyles.length != line.styles.length;
         for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
         if (ischange) {
@@ -919,7 +919,7 @@ window.CodeMirror = (function() {
         }
         line.stateAfter = copyState(doc.mode, state);
       } else {
-        processLine(cm, line, state);
+        processLine(cm, line.text, state);
         line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
       }
       ++doc.frontier;
@@ -963,7 +963,7 @@ window.CodeMirror = (function() {
     if (!state) state = startState(doc.mode);
     else state = copyState(doc.mode, state);
     doc.iter(pos, n, function(line) {
-      processLine(cm, line, state);
+      processLine(cm, line.text, state);
       var save = pos == n - 1 || pos % 5 == 0 || pos >= display.showingFrom && pos < display.showingTo;
       line.stateAfter = save ? copyState(doc.mode, state) : null;
       ++pos;
@@ -4281,7 +4281,7 @@ window.CodeMirror = (function() {
   // Run the given mode's parser over a line, update the styles
   // array, which contains alternating fragments of text and CSS
   // classes.
-  function runMode(cm, text, mode, state, f) {
+  function runMode(cm, text, mode, state, f, forceToEnd) {
     var flattenSpans = mode.flattenSpans;
     if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
     var curStart = 0, curStyle = null;
@@ -4290,6 +4290,7 @@ window.CodeMirror = (function() {
     while (!stream.eol()) {
       if (stream.pos > cm.options.maxHighlightLength) {
         flattenSpans = false;
+        if (forceToEnd) processLine(cm, text, state, stream.pos);
         stream.pos = text.length;
         style = null;
       } else {
@@ -4309,12 +4310,14 @@ window.CodeMirror = (function() {
     }
   }
 
-  function highlightLine(cm, line, state) {
+  function highlightLine(cm, line, state, forceToEnd) {
     // A styles array always starts with a number identifying the
     // mode/overlays that it is based on (for easy invalidation).
     var st = [cm.state.modeGen];
     // Compute the base array of styles
-    runMode(cm, line.text, cm.doc.mode, state, function(end, style) {st.push(end, style);});
+    runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
+      st.push(end, style);
+    }, forceToEnd);
 
     // Run overlays, adjust style array.
     for (var o = 0; o < cm.state.overlays.length; ++o) {
@@ -4353,10 +4356,11 @@ window.CodeMirror = (function() {
 
   // Lightweight form of highlight -- proceed over this line and
   // update state, but don't save a style array.
-  function processLine(cm, line, state) {
+  function processLine(cm, text, state, startAt) {
     var mode = cm.doc.mode;
-    var stream = new StringStream(line.text, cm.options.tabSize);
-    if (line.text == "" && mode.blankLine) mode.blankLine(state);
+    var stream = new StringStream(text, cm.options.tabSize);
+    stream.start = stream.pos = startAt || 0;
+    if (text == "" && mode.blankLine) mode.blankLine(state);
     while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) {
       mode.token(stream, state);
       stream.start = stream.pos;

From 53cce13c9e67985851efb2ff96a9388204ed25e5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Nov 2013 12:27:01 +0100
Subject: [PATCH 0624/4742] Fix completely botched IE11+ check

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1dff8d4c35..1493b1a524 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -13,7 +13,7 @@ window.CodeMirror = (function() {
   var ie = /MSIE \d/.test(navigator.userAgent);
   var ie_lt8 = ie && (document.documentMode == null || document.documentMode < 8);
   var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
-  var ie_gt10 = /Trident\/([7-9]|\d{2,})\./;
+  var ie_gt10 = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
   var webkit = /WebKit\//.test(navigator.userAgent);
   var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
   var chrome = /Chrome\//.test(navigator.userAgent);

From 31a77ad4c8f2f28d153c9abf60a979784568a2dc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Nov 2013 12:34:32 +0100
Subject: [PATCH 0625/4742] Export lineNo utility

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1493b1a524..b91baacc27 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5088,7 +5088,7 @@ window.CodeMirror = (function() {
     for (var n = line; n; n = n.parent) n.height += diff;
   }
 
-  function lineNo(line) {
+  var lineNo = CodeMirror.lineNo = function(line) {
     if (line.parent == null) return null;
     var cur = line.parent, no = indexOf(cur.lines, line);
     for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
@@ -5098,7 +5098,7 @@ window.CodeMirror = (function() {
       }
     }
     return no + cur.first;
-  }
+  };
 
   function lineAtHeight(chunk, h) {
     var n = chunk.first;

From 2546a4a4775b496911d993a8b9c767b410662132 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Nov 2013 12:36:21 +0100
Subject: [PATCH 0626/4742] Make lineNo a method after all

Issue #1969
---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b91baacc27..fb2e0c5604 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4261,6 +4261,7 @@ window.CodeMirror = (function() {
     this.height = estimateHeight ? estimateHeight(this) : 1;
   };
   eventMixin(Line);
+  Line.prototype.lineNo = function() { return lineNo(this); };
 
   function updateLine(line, text, markedSpans, estimateHeight) {
     line.text = text;
@@ -5088,7 +5089,7 @@ window.CodeMirror = (function() {
     for (var n = line; n; n = n.parent) n.height += diff;
   }
 
-  var lineNo = CodeMirror.lineNo = function(line) {
+  function lineNo(line) {
     if (line.parent == null) return null;
     var cur = line.parent, no = indexOf(cur.lines, line);
     for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
@@ -5098,7 +5099,7 @@ window.CodeMirror = (function() {
       }
     }
     return no + cur.first;
-  };
+  }
 
   function lineAtHeight(chunk, h) {
     var n = chunk.first;

From d07ec7eee25e557d1109b90e82c6d09a8204127e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Nov 2013 12:52:39 +0100
Subject: [PATCH 0627/4742] Add (undocumented) wholeLineUpdateBefore option

Issue #1972
Issue #1967
---
 lib/codemirror.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fb2e0c5604..0343a176bf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3288,6 +3288,7 @@ window.CodeMirror = (function() {
   option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
   option("electricChars", true);
   option("rtlMoveVisually", !windows);
+  option("wholeLineUpdateBefore", true);
 
   option("theme", "default", function(cm) {
     themeChanged(cm);
@@ -4618,7 +4619,8 @@ window.CodeMirror = (function() {
     var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
 
     // First adjust the line structure
-    if (from.ch == 0 && to.ch == 0 && lastText == "") {
+    if (from.ch == 0 && to.ch == 0 && lastText == "" &&
+        (!doc.cm || doc.cm.options.wholeLineUpdateBefore)) {
       // This is a whole-line replace. Treated specially to make
       // sure line objects move the way they are supposed to.
       for (var i = 0, e = text.length - 1, added = []; i < e; ++i)

From 9aa224094e26b8f9badd3a9877373a9c2ea86992 Mon Sep 17 00:00:00 2001
From: Luciano Longo <luciano.longo@gmail.com>
Date: Wed, 20 Nov 2013 17:17:28 -0300
Subject: [PATCH 0628/4742] [placeholder addon] Don't hide placeholder text on
 focus

Most modern browsers now keep displaying the placeholder even if the
user has focus on the input and only hide it when the input has content.

This change is to make this addon consistent with this, so users won't
tell the difference with native inputs' placeholder behaviour.
---
 addon/display/placeholder.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 18f9dff3ab..748afe7275 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -2,12 +2,10 @@
   CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
-      cm.on("focus", onFocus);
       cm.on("blur", onBlur);
       cm.on("change", onChange);
       onChange(cm);
     } else if (!val && prev) {
-      cm.off("focus", onFocus);
       cm.off("blur", onBlur);
       cm.off("change", onChange);
       clearPlaceholder(cm);
@@ -33,9 +31,6 @@
     cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
   }
 
-  function onFocus(cm) {
-    clearPlaceholder(cm);
-  }
   function onBlur(cm) {
     if (isEmpty(cm)) setPlaceholder(cm);
   }
@@ -43,7 +38,6 @@
     var wrapper = cm.getWrapperElement(), empty = isEmpty(cm);
     wrapper.className = wrapper.className.replace(" CodeMirror-empty", "") + (empty ? " CodeMirror-empty" : "");
 
-    if (cm.hasFocus()) return;
     if (empty) setPlaceholder(cm);
     else clearPlaceholder(cm);
   }

From 0e58d2cf24d613805ee8b5fa41811a985515e924 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Nov 2013 13:34:46 +0100
Subject: [PATCH 0629/4742] Mark release 3.20

---
 doc/compress.html |  1 +
 doc/releases.html | 11 +++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index f49c978b2e..3f3bfb0465 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=3.20.0;f=">3.20</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.19.0;f=">3.19</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.18.0;f=">3.18</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.16.0;f=">3.16</option>
diff --git a/doc/releases.html b/doc/releases.html
index f04b4dcad8..e6d7ddce35 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,17 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">21-11-2013: <a href="http://codemirror.net/codemirror-3.20.zip">Version 3.20</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="../mode/julia/index.html">Julia</a> and <a href="../mode/pegjs/index.html">PEG.js</a>.</li>
+    <li>Support ECMAScript 6 in the <a href="../mode/javascript/index.html">JavaScript mode</a>.</li>
+    <li>Improved indentation for the <a href="../mode/coffeescript/index.html">CoffeeScript mode</a>.</li>
+    <li>Make non-printable-character representation <a href="manual.html#option_specialChars">configurable</a>.</li>
+    <li>Add ‘notification’ functionality to <a href="manual.html#addon_dialog">dialog</a> addon.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.19.0...3.20.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">21-10-2013: <a href="http://codemirror.net/codemirror-3.19.zip">Version 3.19</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 67771e8bd4..f9a93897fb 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.19</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.20</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0343a176bf..7b4fd00141 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5936,7 +5936,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.19.1";
+  CodeMirror.version = "3.20.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 10e70a1b9f..6c5a122ea2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.19.1",
+    "version":"3.20.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 1f7f154ab251344eb1075e6651c5f27f93de8cca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Nov 2013 13:35:50 +0100
Subject: [PATCH 0630/4742] Bump version number post-3.20

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7b4fd00141..5fec83a7f7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5936,7 +5936,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.20.0";
+  CodeMirror.version = "3.20.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 6c5a122ea2..ab323b0110 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.20.0",
+    "version":"3.20.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From bdd887155c535ec7a88481071f98299fa2bed8e4 Mon Sep 17 00:00:00 2001
From: Nikolay Kostov <admin@nikolay.it>
Date: Thu, 21 Nov 2013 17:40:08 +0200
Subject: [PATCH 0631/4742] [the-matrix theme] Fix broken CSS selector, tune
 down selection contrast.

---
 theme/the-matrix.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index 9e60b7b04b..0c3704a62f 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -1,5 +1,5 @@
 .cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
-.cm-s-the-matrix span.CodeMirror-selected { background: #a8f !important; }
+.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D !important; }
 .cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
 .cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
 .cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00 !important; }

From 410bf3dc309105bb8dcf10e40f1678957314dea3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Nov 2013 22:27:18 +0100
Subject: [PATCH 0632/4742] Fix bug in patching lines with widgets

The gutter element would end up before any 'above' widgets, causing
the widgets to hide it.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5fec83a7f7..cc5f689bcb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -719,7 +719,7 @@ window.CodeMirror = (function() {
     if (cm.options.lineNumbers || markers) {
       var gutterWrap = wrap.insertBefore(elt("div", null, null, "position: absolute; left: " +
                                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
-                                         wrap.firstChild);
+                                         lineElement);
       if (cm.options.fixedGutter) (wrap.alignable || (wrap.alignable = [])).push(gutterWrap);
       if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
         wrap.lineNumber = gutterWrap.appendChild(

From 24cbf32ee0332f84d71675b2ac1af40e7ee8b3ae Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Thu, 21 Nov 2013 14:13:06 -0800
Subject: [PATCH 0633/4742] [changemode demo] Really rate-limit
 looksLikeScheme() calls

---
 demo/changemode.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/changemode.html b/demo/changemode.html
index 61c1786074..9ea99b2d04 100644
--- a/demo/changemode.html
+++ b/demo/changemode.html
@@ -44,11 +44,11 @@ <h2>Mode-Changing Demo</h2>
     lineNumbers: true,
     tabMode: "indent"
   });
+  var pending;
   editor.on("change", function() {
     clearTimeout(pending);
-    setTimeout(update, 400);
+    pending = setTimeout(update, 400);
   });
-  var pending;
   function looksLikeScheme(code) {
     return !/^\s*\(\s*function\b/.test(code) && /^\s*[;\(]/.test(code);
   }

From 771c60cfe1b5ec776f10f469c5956ad0c0abcace Mon Sep 17 00:00:00 2001
From: John Van Der Loo <jvanderloo@atlassian.com>
Date: Fri, 22 Nov 2013 15:40:21 +1100
Subject: [PATCH 0634/4742] Add a wrapper class to gutters to offer more
 control using CSS.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cc5f689bcb..bb3c565bda 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -717,7 +717,7 @@ window.CodeMirror = (function() {
     if (bgClass)
       wrap.insertBefore(elt("div", null, bgClass + " CodeMirror-linebackground"), wrap.firstChild);
     if (cm.options.lineNumbers || markers) {
-      var gutterWrap = wrap.insertBefore(elt("div", null, null, "position: absolute; left: " +
+      var gutterWrap = wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "position: absolute; left: " +
                                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
                                          lineElement);
       if (cm.options.fixedGutter) (wrap.alignable || (wrap.alignable = [])).push(gutterWrap);

From 3e84b9e1f7c642021bdd0ed1fb76d497405959b8 Mon Sep 17 00:00:00 2001
From: Daniel KJ <github@dlkj.co.uk>
Date: Fri, 22 Nov 2013 15:28:43 +0000
Subject: [PATCH 0635/4742] [show-hint addon] Emit "pick" event when a
 completion is picked

---
 addon/hint/show-hint.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 46103b719b..324d4e7ddb 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -45,6 +45,7 @@
       var completion = data.list[i];
       if (completion.hint) completion.hint(this.cm, data, completion);
       else this.cm.replaceRange(getText(completion), data.from, data.to);
+      CodeMirror.signal(data, "pick", completion);
       this.close();
     },
 

From 28a638a984c021696d3ae9bbedb4103e0f4db4b1 Mon Sep 17 00:00:00 2001
From: ForbesLindesay <forbes@lindesay.co.uk>
Date: Fri, 22 Nov 2013 23:33:34 +0000
Subject: [PATCH 0636/4742] [pegjs mode] Quotes can appear in character classes

when they do so, they don't indicate the start of a string.
---
 mode/pegjs/pegjs.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index 6cdcc61f30..6b2e273791 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -54,15 +54,11 @@ CodeMirror.defineMode("pegjs", function (config) {
         }
         return "comment";
       } else if (state.inChracterClass) {
-        if (stream.match(/^[^\]\\]+/)) {
-          return;
-        } else if (stream.match(/^\\./)) {
-          return;
-        } else {
-          stream.next();
-          state.inChracterClass = false;
-          return 'bracket';
-        }
+          while (state.inChracterClass && !stream.eol()) {
+            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
+              state.inChracterClass = false;
+            }
+          }
       } else if (stream.peek() === '[') {
         stream.next();
         state.inChracterClass = true;

From c3b38d016f990c16e126b0fb024fbd2c92656c22 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 23 Nov 2013 19:43:27 +0100
Subject: [PATCH 0637/4742] Make textarea contextmenu shim have background:
 transparent

To prevent it from being visible on dark backgrounds.
---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bb3c565bda..9ea863bd70 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2199,7 +2199,7 @@ window.CodeMirror = (function() {
     var oldCSS = display.input.style.cssText;
     display.inputDiv.style.position = "absolute";
     display.input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-      "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: white; outline: none;" +
+      "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: transparent; outline: none;" +
       "border-width: 0; outline: none; overflow: hidden; opacity: .05; -ms-opacity: .05; filter: alpha(opacity=5);";
     focusInput(cm);
     resetInput(cm, true);
@@ -2224,7 +2224,7 @@ window.CodeMirror = (function() {
         if (!ie || ie_lt9) prepareSelectAllHack();
         clearTimeout(detectingSelectAll);
         var i = 0, poll = function(){
-          if (display.prevInput == " " && display.input.selectionStart == 0)
+          if (display.prevInput == "\u200b" && display.input.selectionStart == 0)
             operation(cm, commands.selectAll)(cm);
           else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);
           else resetInput(cm);

From 52cbe9b13cab1a2e1d3ec127c9b66b6e0412e2fd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 25 Nov 2013 11:50:53 +0100
Subject: [PATCH 0638/4742] [commend addon] Prevent bogus uncomment when
 markers not at line start

Closes #1975
---
 addon/comment/comment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index cd2123e175..b8a86a3f33 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -97,7 +97,7 @@
         var line = self.getLine(i);
         var found = line.indexOf(lineString);
         if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
-        if (i != start && found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
+        if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
         lines.push(line);
       }
       self.operation(function() {

From fd746e250f7a07f70a1e4e565c29f454da44c10a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 25 Nov 2013 15:54:22 +0100
Subject: [PATCH 0639/4742] Prevent infinite recursion in lineIsHiddenInner

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9ea863bd70..70d8091db7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4168,7 +4168,7 @@ window.CodeMirror = (function() {
       return true;
     for (var sp, i = 0; i < line.markedSpans.length; ++i) {
       sp = line.markedSpans[i];
-      if (sp.marker.collapsed && !sp.marker.replacedWith && sp.from == span.to &&
+      if (sp != span && sp.marker.collapsed && !sp.marker.replacedWith && sp.from == span.to &&
           (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
           lineIsHiddenInner(doc, line, sp)) return true;
     }

From ed26d5aa3bbe6df2223ab04c19f2a0efaeeb0403 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 25 Nov 2013 16:12:22 +0100
Subject: [PATCH 0640/4742] [website] Make things more or less run on IE8

HTML5 tag parsing hack, and invert css media query.
---
 doc/activebookmark.js | 10 ++++++++--
 doc/docs.css          | 13 +++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/doc/activebookmark.js b/doc/activebookmark.js
index 69a126e8ce..88c879cf42 100644
--- a/doc/activebookmark.js
+++ b/doc/activebookmark.js
@@ -1,3 +1,7 @@
+// Kludge in HTML5 tag recognition in IE8
+document.createElement("section");
+document.createElement("article");
+
 (function() {
   var pending = false, prevVal = null;
 
@@ -37,6 +41,8 @@
     }
   }
 
-  window.addEventListener("scroll", updateSoon);
-  window.addEventListener("load", updateSoon);
+  if (window.addEventListener) {
+    window.addEventListener("scroll", updateSoon);
+    window.addEventListener("load", updateSoon);
+  }
 })();
diff --git a/doc/docs.css b/doc/docs.css
index d2b0522e9f..c7fb6327ed 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -39,7 +39,7 @@ em {
 
 article {
   max-width: 700px;
-  margin: 0 auto;
+  margin: 0 0 0 160px;
   border-left: 2px solid #E30808;
   border-right: 1px solid #ddd;
   padding: 30px 50px 100px 50px;
@@ -54,19 +54,20 @@ article {
 #nav {
   position: fixed;
   top: 30px;
-  right: 50%;
+  left: 0; right: none;
+  width: 160px;
   padding-right: 350px;
   text-align: right;
   z-index: 1;
 }
 
-@media screen and (max-width: 1000px) {
+@media screen and (min-width: 1000px) {
   article {
-    margin: 0 0 0 160px;
+    margin: 0 auto;
   }
   #nav {
-    left: 0; right: none;
-    width: 160px;
+    right: 50%;
+    width: auto;
   }
 }
 

From ef8042e68aac996fab3823cf0b7ebfdb17eca0e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 25 Nov 2013 16:41:15 +0100
Subject: [PATCH 0641/4742] [php mode] Make double-quoted string hack also work
 for single-quoted

Closes #1992
---
 mode/php/php.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index 3555b8b145..09d2ab6122 100755
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -56,15 +56,15 @@
 
     function dispatch(stream, state) {
       var isPHP = state.curMode == phpMode;
-      if (stream.sol() && state.pending != '"') state.pending = null;
+      if (stream.sol() && state.pending && state.pending != '"' && state.pending != "'") state.pending = null;
       if (!isPHP) {
         if (stream.match(/^<\?\w*/)) {
           state.curMode = phpMode;
           state.curState = state.php;
           return "meta";
         }
-        if (state.pending == '"') {
-          while (!stream.eol() && stream.next() != '"') {}
+        if (state.pending == '"' || state.pending == "'") {
+          while (!stream.eol() && stream.next() != state.pending) {}
           var style = "string";
         } else if (state.pending && stream.pos < state.pending.end) {
           stream.pos = state.pending.end;
@@ -72,10 +72,10 @@
         } else {
           var style = htmlMode.token(stream, state.curState);
         }
-        state.pending = null;
-        var cur = stream.current(), openPHP = cur.search(/<\?/);
+        if (state.pending) state.pending = null;
+        var cur = stream.current(), openPHP = cur.search(/<\?/), m;
         if (openPHP != -1) {
-          if (style == "string" && /\"$/.test(cur) && !/\?>/.test(cur)) state.pending = '"';
+          if (style == "string" && (m = cur.match(/[\'\"]$/)) && !/\?>/.test(cur)) state.pending = m[0];
           else state.pending = {end: stream.pos, style: style};
           stream.backUp(cur.length - openPHP);
         }

From a9f5bf1010c2bd1065d97abfa0b1e885b6c657d5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 25 Nov 2013 16:46:11 +0100
Subject: [PATCH 0642/4742] [dialog addon] Add value option

---
 addon/dialog/dialog.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 499964fdb2..41d7bf8663 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -35,6 +35,7 @@
     }
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
+      if (options && options.value) inp.value = options.value;
       CodeMirror.on(inp, "keydown", function(e) {
         if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
         if (e.keyCode == 13 || e.keyCode == 27) {

From 9aa4d41c0ba97286c23cdc4f99d565fd04fbfd3a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 25 Nov 2013 16:46:33 +0100
Subject: [PATCH 0643/4742] [search addon] Default search query to current
 selection

Closes #1993
---
 addon/search/search.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 71ed75b500..ddb6eeea90 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -33,9 +33,9 @@
     // Heuristic: if the query string is all lowercase, do a case insensitive search.
     return cm.getSearchCursor(query, pos, typeof query == "string" && query == query.toLowerCase());
   }
-  function dialog(cm, text, shortText, f) {
-    if (cm.openDialog) cm.openDialog(text, f);
-    else f(prompt(shortText, ""));
+  function dialog(cm, text, shortText, deflt, f) {
+    if (cm.openDialog) cm.openDialog(text, f, {value: deflt});
+    else f(prompt(shortText, deflt));
   }
   function confirmDialog(cm, text, shortText, fs) {
     if (cm.openConfirm) cm.openConfirm(text, fs);
@@ -50,7 +50,7 @@
   function doSearch(cm, rev) {
     var state = getSearchState(cm);
     if (state.query) return findNext(cm, rev);
-    dialog(cm, queryDialog, "Search for:", function(query) {
+    dialog(cm, queryDialog, "Search for:", cm.getSelection(), function(query) {
       cm.operation(function() {
         if (!query || state.query) return;
         state.query = parseQuery(query);
@@ -85,10 +85,10 @@
   var replacementQueryDialog = 'With: <input type="text" style="width: 10em"/>';
   var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>";
   function replace(cm, all) {
-    dialog(cm, replaceQueryDialog, "Replace:", function(query) {
+    dialog(cm, replaceQueryDialog, "Replace:", cm.getSelection(), function(query) {
       if (!query) return;
       query = parseQuery(query);
-      dialog(cm, replacementQueryDialog, "Replace with:", function(text) {
+      dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {
         if (all) {
           cm.operation(function() {
             for (var cursor = getSearchCursor(cm, query); cursor.findNext();) {

From 5d752bbd7bbccf33c986dd5bf7f19ab752c6a4aa Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <speilicke@suse.com>
Date: Mon, 25 Nov 2013 10:58:53 +0100
Subject: [PATCH 0644/4742] [rpm mode] Add 'preinstall' and 'postinstall'
 sections

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

diff --git a/mode/rpm/spec/spec.js b/mode/rpm/spec/spec.js
index 9f339c21b1..0fab6c4891 100644
--- a/mode/rpm/spec/spec.js
+++ b/mode/rpm/spec/spec.js
@@ -4,7 +4,7 @@ CodeMirror.defineMode("spec", function() {
   var arch = /^(i386|i586|i686|x86_64|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
 
   var preamble = /^(Name|Version|Release|License|Summary|Url|Group|Source|BuildArch|BuildRequires|BuildRoot|AutoReqProv|Provides|Requires(\(\w+\))?|Obsoletes|Conflicts|Recommends|Source\d*|Patch\d*|ExclusiveArch|NoSource|Supplements):/;
-  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preun|postun|pre|post|triggerin|triggerun|pretrans|posttrans|verifyscript|check|triggerpostun|triggerprein|trigger)/;
+  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pre|post|triggerin|triggerun|pretrans|posttrans|verifyscript|check|triggerpostun|triggerprein|trigger)/;
   var control_flow_complex = /^%(ifnarch|ifarch|if)/; // rpm control flow macros
   var control_flow_simple = /^%(else|endif)/; // rpm control flow macros
   var operators = /^(\!|\?|\<\=|\<|\>\=|\>|\=\=|\&\&|\|\|)/; // operators in control flow macros

From c84f676ebc6302102bc8e9ac1317c59b656ee74f Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Mon, 25 Nov 2013 11:52:34 +0000
Subject: [PATCH 0645/4742] Use the github url for `repository`

This makes it easy to find the GitHub repo from https://npmjs.org/package/codemirror
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ab323b0110..27bb735827 100644
--- a/package.json
+++ b/package.json
@@ -15,5 +15,5 @@
                     "email": "marijnh@gmail.com",
                     "web": "http://marijnhaverbeke.nl"}],
     "repository": {"type": "git",
-                   "url": "http://marijnhaverbeke.nl/git/codemirror"}
+                   "url": "https://github.com/marijnh/CodeMirror.git"}
 }

From f5bcce05dceb4f60c9685733d2f074d75fb96118 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 25 Nov 2013 17:36:19 +0100
Subject: [PATCH 0646/4742] Fix a bidi cursor drawing bug

---
 lib/codemirror.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 70d8091db7..fc2e971e7b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5712,22 +5712,22 @@ window.CodeMirror = (function() {
   }
   var bidiOther;
   function getBidiPartAt(order, pos) {
+    bidiOther = null;
     for (var i = 0, found; i < order.length; ++i) {
       var cur = order[i];
-      if (cur.from < pos && cur.to > pos) { bidiOther = null; return i; }
-      if (cur.from == pos || cur.to == pos) {
+      if (cur.from < pos && cur.to > pos) return i;
+      if ((cur.from == pos || cur.to == pos)) {
         if (found == null) {
           found = i;
         } else if (compareBidiLevel(order, cur.level, order[found].level)) {
-          bidiOther = found;
+          if (cur.from != cur.to) bidiOther = found;
           return i;
         } else {
-          bidiOther = i;
+          if (cur.from != cur.to) bidiOther = i;
           return found;
         }
       }
     }
-    bidiOther = null;
     return found;
   }
 

From 3e614e48f31ed20364ffdde764049fa733f7b10f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 26 Nov 2013 10:08:59 +0100
Subject: [PATCH 0647/4742] [closetag addon] Prevent action in another corner
 case

(When slicing the part before the cursor from the tagname causes it to be empty.)

Closes #1998
---
 addon/edit/closetag.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 1da89ba6dc..bbd1c6e10c 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -53,7 +53,8 @@
     if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
     var lowerTagName = tagName.toLowerCase();
     // Don't process the '>' at the end of an end-tag or self-closing tag
-    if (tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
+    if (!tagName ||
+        tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
         tok.type == "tag" && state.type == "closeTag" ||
         tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
         dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)

From dafd825598f12dfe193ac85b17cc10372e2e4705 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 26 Nov 2013 10:23:35 +0100
Subject: [PATCH 0648/4742] Fix a bug in the bidi algorithm

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fc2e971e7b..d1e82bccbf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5861,7 +5861,7 @@ window.CodeMirror = (function() {
         if (type == ",") types[i] = "N";
         else if (type == "%") {
           for (var end = i + 1; end < len && types[end] == "%"; ++end) {}
-          var replace = (i && types[i-1] == "!") || (end < len - 1 && types[end] == "1") ? "1" : "N";
+          var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
           for (var j = i; j < end; ++j) types[j] = replace;
           i = end - 1;
         }
@@ -5886,7 +5886,7 @@ window.CodeMirror = (function() {
         if (isNeutral.test(types[i])) {
           for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
           var before = (i ? types[i-1] : outerType) == "L";
-          var after = (end < len - 1 ? types[end] : outerType) == "L";
+          var after = (end < len ? types[end] : outerType) == "L";
           var replace = before || after ? "L" : "R";
           for (var j = i; j < end; ++j) types[j] = replace;
           i = end - 1;
diff --git a/test/test.js b/test/test.js
index e5d9afdedd..dad089fa46 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1141,7 +1141,7 @@ testCM("verticalMovementCommandsWrapping", function(cm) {
 
 testCM("rtlMovement", function(cm) {
   forEach(["خحج", "خحabcخحج", "abخحخحجcd", "abخde", "abخح2342خ1حج", "خ1ح2خح3حxج",
-           "خحcd", "1خحcd", "abcdeح1ج", "خمرحبها مها!", "foobarر",
+           "خحcd", "1خحcd", "abcdeح1ج", "خمرحبها مها!", "foobarر", "خ ة ق",
            "<img src=\"/בדיקה3.jpg\">"], function(line) {
     var inv = line.charAt(0) == "خ";
     cm.setValue(line + "\n"); cm.execCommand(inv ? "goLineEnd" : "goLineStart");

From bcf48d30b9170d7cf629452119a9b8fe52bd6c30 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 26 Nov 2013 10:56:33 +0100
Subject: [PATCH 0649/4742] Fix bug in IE bidi measuring hack

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d1e82bccbf..5a8fc92b5c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1113,7 +1113,7 @@ window.CodeMirror = (function() {
         }
       }
       if (!rect) rect = data[i] = measureRect(getRect(node));
-      if (cur.measureRight) rect.right = getRect(cur.measureRight).left;
+      if (cur.measureRight) rect.right = getRect(cur.measureRight).left - outer.left;
       if (cur.leftSide) rect.leftSide = measureRect(getRect(cur.leftSide));
     }
     removeChildren(cm.display.measure);

From 755f3a7bafaff694f488c9df390528a5a578ce7e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 26 Nov 2013 11:19:25 +0100
Subject: [PATCH 0650/4742] [javascript mode] Fix context tracking for
 comma-separated bodies

Closes #2000
---
 addon/tern/tern.js            |  6 +++---
 mode/javascript/javascript.js | 30 +++++++++++++++++-------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 1f18a657fb..7f83c4e4c0 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -251,7 +251,7 @@
     var lex = inner.state.lexical;
     if (lex.info != "call") return;
 
-    var ch, pos = lex.pos || 0, tabSize = cm.getOption("tabSize");
+    var ch, argPos = lex.pos || 0, tabSize = cm.getOption("tabSize");
     for (var line = cm.getCursor().line, e = Math.max(0, line - 9), found = false; line >= e; --line) {
       var str = cm.getLine(line), extra = 0;
       for (var pos = 0;;) {
@@ -268,7 +268,7 @@
     var start = Pos(line, ch);
     var cache = ts.cachedArgHints;
     if (cache && cache.doc == cm.getDoc() && cmpPos(start, cache.start) == 0)
-      return showArgHints(ts, cm, pos);
+      return showArgHints(ts, cm, argPos);
 
     ts.request(cm, {type: "type", preferFunction: true, end: start}, function(error, data) {
       if (error || !data.type || !(/^fn\(/).test(data.type)) return;
@@ -279,7 +279,7 @@
         guess: data.guess,
         doc: cm.getDoc()
       };
-      showArgHints(ts, cm, pos);
+      showArgHints(ts, cm, argPos);
     });
   }
 
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index f27c06346c..a2974ee5c4 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -327,7 +327,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function expressionInner(type, noComma) {
     if (cx.state.fatArrowAt == cx.stream.start) {
       var body = noComma ? arrowBodyNoComma : arrowBody;
-      if (type == "(") return cont(pushcontext, commasep(pattern, ")"), expect("=>"), body, popcontext);
+      if (type == "(") return cont(pushcontext, pushlex(")"), commasep(pattern, ")"), poplex, expect("=>"), body, popcontext);
       else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
     }
 
@@ -338,7 +338,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), expressionNoComma, maybeArrayComprehension, poplex, maybeop);
-    if (type == "{") return cont(commasep(objprop, "}"), maybeop);
+    if (type == "{") return contCommasep(objprop, "}", null, maybeop);
     return cont();
   }
   function maybeexpression(type) {
@@ -365,7 +365,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     if (type == "quasi") { cx.cc.push(me); return quasi(value); }
     if (type == ";") return;
-    if (type == "(") return cont(commasep(expressionNoComma, ")", "call"), me);
+    if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
     if (type == ".") return cont(property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
   }
@@ -418,7 +418,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ":") return cont(expressionNoComma);
     if (type == "(") return pass(functiondef);
   }
-  function commasep(what, end, info) {
+  function commasep(what, end) {
     function proceed(type) {
       if (type == ",") {
         var lex = cx.state.lexical;
@@ -430,10 +430,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     return function(type) {
       if (type == end) return cont();
-      if (info === false) return pass(what, proceed);
-      return pass(pushlex(end, info), what, proceed, poplex);
+      return pass(what, proceed);
     };
   }
+  function contCommasep(what, end, info) {
+    for (var i = 3; i < arguments.length; i++)
+      cx.cc.push(arguments[i]);
+    return cont(pushlex(end, info), commasep(what, end), poplex);
+  }
   function block(type) {
     if (type == "}") return cont();
     return pass(statement, block);
@@ -449,8 +453,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function pattern(type, value) {
     if (type == "variable") { register(value); return cont(); }
-    if (type == "[") return cont(commasep(pattern, "]"));
-    if (type == "{") return cont(commasep(proppattern, "}"));
+    if (type == "[") return contCommasep(pattern, "]");
+    if (type == "{") return contCommasep(proppattern, "}");
   }
   function proppattern(type, value) {
     if (type == "variable" && !cx.stream.match(/^\s*:/, false)) {
@@ -493,7 +497,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function functiondef(type, value) {
     if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
     if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushcontext, commasep(funarg, ")"), statement, popcontext);
+    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, statement, popcontext);
   }
   function funarg(type) {
     if (type == "spread") return cont(funarg);
@@ -506,7 +510,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "extends") return cont(expression);
   }
   function objlit(type) {
-    if (type == "{") return cont(commasep(objprop, "}"));
+    if (type == "{") return contCommasep(objprop, "}");
   }
   function afterModule(type, value) {
     if (type == "string") return cont(statement);
@@ -522,7 +526,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(importSpec, maybeFrom);
   }
   function importSpec(type, value) {
-    if (type == "{") return cont(commasep(importSpec, "}"));
+    if (type == "{") return contCommasep(importSpec, "}");
     if (type == "variable") register(value);
     return cont();
   }
@@ -531,8 +535,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function maybeArrayComprehension(type) {
     if (type == "for") return pass(comprehension);
-    if (type == ",") return cont(commasep(expressionNoComma, "]", false));
-    return pass(commasep(expressionNoComma, "]", false));
+    if (type == ",") return cont(commasep(expressionNoComma, "]"));
+    return pass(commasep(expressionNoComma, "]"));
   }
   function comprehension(type) {
     if (type == "for") return cont(forspec, comprehension);

From 3e710f9162bc3a030d3a157fea5a1dbeac864d26 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 26 Nov 2013 21:40:36 +0100
Subject: [PATCH 0651/4742] [javascript mode] Fix indentation after empty array
 literal

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index a2974ee5c4..c49b873317 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -337,7 +337,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
-    if (type == "[") return cont(pushlex("]"), expressionNoComma, maybeArrayComprehension, poplex, maybeop);
+    if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
     return cont();
   }
@@ -533,6 +533,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeFrom(_type, value) {
     if (value == "from") { cx.marked = "keyword"; return cont(expression); }
   }
+  function arrayLiteral(type) {
+    if (type == "]") return cont();
+    return pass(expressionNoComma, maybeArrayComprehension);
+  }
   function maybeArrayComprehension(type) {
     if (type == "for") return pass(comprehension);
     if (type == ",") return cont(commasep(expressionNoComma, "]"));

From 4841f63e21cc31af4c91aac3d566f67950809ed0 Mon Sep 17 00:00:00 2001
From: Pavel Strashkin <pavel.strashkin@gmail.com>
Date: Tue, 26 Nov 2013 13:21:07 -0800
Subject: [PATCH 0652/4742] [docs] Make markText to be a ref within setBookmark

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

diff --git a/doc/manual.html b/doc/manual.html
index a0c650e170..796663fc88 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1273,7 +1273,7 @@ <h3 id="api_marker">Text-marking methods</h3>
         <dt><code><strong>widget</strong>: Element</code></dt><dd>Can be used to display a DOM
         node at the current location of the bookmark (analogous to
         the <a href="#mark_replacedWith"><code>replacedWith</code></a>
-        option to <code>markText</code>).</dd>
+        option to <a href="#markText"><code>markText</code></a>).</dd>
         <dt><code><strong>insertLeft</strong>: boolean</code></dt><dd>By default, text typed
         when the cursor is on top of the bookmark will end up to the
         right of the bookmark. Set this option to true to make it go

From 6b131f19e89f3656079c98ebcce67148c4244fce Mon Sep 17 00:00:00 2001
From: Enam Mijbah Noor <enammijbahnoor@gmail.com>
Date: Wed, 27 Nov 2013 05:00:30 +0600
Subject: [PATCH 0653/4742] added missing keywords in jinja2 mode

---
 mode/jinja2/jinja2.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index 16b06c48ef..b28af098d0 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -1,7 +1,17 @@
 CodeMirror.defineMode("jinja2", function() {
-    var keywords = ["block", "endblock", "for", "endfor", "in", "true", "false",
-                    "loop", "none", "self", "super", "if", "as", "not", "and",
-                    "else", "import", "with", "without", "context"];
+    var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif",
+                    "extends", "filter", "endfilter", "firstof", "for",
+                    "endfor", "if", "endif", "ifchanged", "endifchanged",
+                    "ifequal", "endifequal", "ifnotequal",
+                    "endifnotequal", "in", "include", "load", "not", "now", "or",
+                    "parsed", "regroup", "reversed", "spaceless",
+                    "endspaceless", "ssi", "templatetag", "openblock",
+                    "closeblock", "openvariable", "closevariable",
+                    "openbrace", "closebrace", "opencomment",
+                    "closecomment", "widthratio", "url", "with", "endwith",
+                    "get_current_language", "trans", "noop", "blocktrans",
+                    "endblocktrans", "get_available_languages",
+                    "get_current_language_bidi", "plural"];
     keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
 
     function tokenBase (stream, state) {

From 268cc7422b21d95e8f3db0d346d4fec346bc76ff Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 24 Nov 2013 11:48:48 -0500
Subject: [PATCH 0654/4742] [vim] Fix failing tests in ie8

---
 keymap/vim.js    | 20 +++++++++++++-------
 test/vim_test.js | 10 ++++++++--
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index dab10e21a4..164d51b1a4 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2955,6 +2955,7 @@
           exCommands[commandName](cm, params);
         } catch(e) {
           showConfirm(cm, e);
+          throw e;
         }
       },
       parseInput_: function(cm, inputStream, result) {
@@ -3115,7 +3116,7 @@
             var args = new CodeMirror.StringStream(params.argString);
             if (args.eat('!')) { reverse = true; }
             if (args.eol()) { return; }
-            if (!args.eatSpace()) { throw new Error('invalid arguments ' + args.match(/.*/)[0]); }
+            if (!args.eatSpace()) { return 'Invalid arguments'; }
             var opts = args.match(/[a-z]+/);
             if (opts) {
               opts = opts[0];
@@ -3124,13 +3125,17 @@
               var decimal = opts.indexOf('d') != -1 && 1;
               var hex = opts.indexOf('x') != -1 && 1;
               var octal = opts.indexOf('o') != -1 && 1;
-              if (decimal + hex + octal > 1) { throw new Error('invalid arguments'); }
+              if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
               number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
             }
-            if (args.eatSpace() && args.match(/\/.*\//)) { throw new Error('patterns not supported'); }
+            if (args.eatSpace() && args.match(/\/.*\//)) { 'patterns not supported'; }
           }
         }
-        parseArgs();
+        var err = parseArgs();
+        if (err) {
+          showConfirm(cm, err + ': ' + params.argString);
+          return;
+        }
         var lineStart = params.line || cm.firstLine();
         var lineEnd = params.lineEnd || params.line || cm.lastLine();
         if (lineStart == lineEnd) { return; }
@@ -3251,13 +3256,13 @@
         clearSearchHighlight(cm);
       },
       delmarks: function(cm, params) {
-        if (!params.argString || !params.argString.trim()) {
+        if (!params.argString || !trim(params.argString)) {
           showConfirm(cm, 'Argument required');
           return;
         }
 
         var state = cm.state.vim;
-        var stream = new CodeMirror.StringStream(params.argString.trim());
+        var stream = new CodeMirror.StringStream(trim(params.argString));
         while (!stream.eol()) {
           stream.eatSpace();
 
@@ -3394,7 +3399,8 @@
       // Actually do replace.
       next();
       if (done) {
-        throw new Error('No matches for ' + query.source);
+        showConfirm(cm, 'No matches for ' + query.source);
+        return;
       }
       if (!confirm) {
         replaceAll();
diff --git a/test/vim_test.js b/test/vim_test.js
index fe272551c5..c65b5cad03 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -96,6 +96,12 @@ function copyCursor(cur) {
   return { ch: cur.ch, line: cur.line };
 }
 
+function forEach(arr, func) {
+  for (var i = 0; i < arr.length; i++) {
+    func(arr[i]);
+  }
+}
+
 function testVim(name, run, opts, expectedFail) {
   var vimOpts = {
     lineNumbers: true,
@@ -1047,7 +1053,7 @@ testVim('ctrl-x', function(cm, vim, helpers) {
   eq('-3', cm.getValue());
 }, {value: '0'});
 testVim('<C-x>/<C-a> search forward', function(cm, vim, helpers) {
-  ['<C-x>', '<C-a>'].forEach(function(key) {
+  forEach(['<C-x>', '<C-a>'], function(key) {
     cm.setCursor(0, 0);
     helpers.doKeys(key);
     helpers.assertCursorAt(0, 5);
@@ -2080,7 +2086,7 @@ testVim('[(, ])', function(cm, vim, helpers) {
   helpers.assertCursorAt(8,0);
 }, { value: squareBracketMotionSandbox});
 testVim('[*, ]*, [/, ]/', function(cm, vim, helpers) {
-  ['*', '/'].forEach(function(key){
+  forEach(['*', '/'], function(key){
     cm.setCursor(7, 0);
     helpers.doKeys('2', '[', key);
     helpers.assertCursorAt(2,2);

From 8f7c87245d5c0a8841748c180b24401a51ab08d2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 28 Nov 2013 13:38:24 +0100
Subject: [PATCH 0655/4742] [search addon] Make overlay's case-sensitivity
 correspond to search

Closes #2008
---
 addon/search/search.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index ddb6eeea90..049f72f3dc 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -7,7 +7,15 @@
 // Ctrl-G.
 
 (function() {
-  function searchOverlay(query) {
+  function searchOverlay(query, caseInsensitive) {
+    var startChar;
+    if (typeof query == "string") {
+      startChar = query.charAt(0);
+      query = new RegExp("^" + query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"),
+                         caseInsensitive ? "i" : "");
+    } else {
+      query = new RegExp("^(?:" + query.source + ")", query.ignoreCase ? "i" : "");
+    }
     if (typeof query == "string") return {token: function(stream) {
       if (stream.match(query)) return "searching";
       stream.next();
@@ -17,6 +25,8 @@
       if (stream.match(query)) return "searching";
       while (!stream.eol()) {
         stream.next();
+        if (startChar)
+          stream.skipTo(startChar) || stream.skipToEnd();
         if (stream.match(query, false)) break;
       }
     }};
@@ -29,9 +39,12 @@
   function getSearchState(cm) {
     return cm.state.search || (cm.state.search = new SearchState());
   }
+  function queryCaseInsensitive(query) {
+    return typeof query == "string" && query == query.toLowerCase();
+  }
   function getSearchCursor(cm, query, pos) {
     // Heuristic: if the query string is all lowercase, do a case insensitive search.
-    return cm.getSearchCursor(query, pos, typeof query == "string" && query == query.toLowerCase());
+    return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
   }
   function dialog(cm, text, shortText, deflt, f) {
     if (cm.openDialog) cm.openDialog(text, f, {value: deflt});
@@ -54,7 +67,7 @@
       cm.operation(function() {
         if (!query || state.query) return;
         state.query = parseQuery(query);
-        cm.removeOverlay(state.overlay);
+        cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query));
         state.overlay = searchOverlay(state.query);
         cm.addOverlay(state.overlay);
         state.posFrom = state.posTo = cm.getCursor();

From 4b3cbc1f83aff39f481c07883a5b98c82bdfabf1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 28 Nov 2013 16:49:46 +0100
Subject: [PATCH 0656/4742] Prevent gutter height from forcing a scrollbar when
 none is needed

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5a8fc92b5c..0e5592fb17 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -535,6 +535,7 @@ window.CodeMirror = (function() {
     }
     display.showingFrom = from; display.showingTo = to;
 
+    display.gutters.style.height = "";
     updateHeightsInViewport(cm);
     updateViewOffset(cm);
 

From 45f673a108dabcb2d1ace294286aa233da35dfaa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 28 Nov 2013 17:48:27 +0100
Subject: [PATCH 0657/4742] [hardwrap addon] Preserve trailing whitespace

---
 addon/fold/indent-fold.js |  4 ++--
 addon/wrap/hardwrap.js    | 18 +++++++++++++-----
 demo/hardwrap.html        |  7 ++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 1bd600be42..434c2bc5ca 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,8 +1,8 @@
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
   var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
   if (!/\S/.test(firstLine)) return;
-  var getIndent = function(lineNum) {
-    return CodeMirror.countColumn(lineNum, null, tabSize);
+  var getIndent = function(line) {
+    return CodeMirror.countColumn(line, null, tabSize);
   };
   var myIndent = getIndent(firstLine);
   var lastLineInFold = null;
diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index f252ffc9e9..9260c75bbb 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -36,31 +36,39 @@
     var killTrailing = options.killTrailingSpace !== false;
     var changes = [], curLine = "", curNo = from.line;
     var lines = cm.getRange(from, to, false);
+    var leadingSpace = lines[0].match(/^[ \t]*/)[0];
+
     for (var i = 0; i < lines.length; ++i) {
       var text = lines[i], oldLen = curLine.length, spaceInserted = 0;
       if (curLine && text && !wrapOn.test(curLine.charAt(curLine.length - 1) + text.charAt(0))) {
         curLine += " ";
         spaceInserted = 1;
       }
+      var spaceTrimmed = "";
+      if (i) {
+        spaceTrimmed = text.match(/^\s*/)[0];
+        text = text.slice(spaceTrimmed.length);
+      }
       curLine += text;
       if (i) {
-        var firstBreak = curLine.length > column && findBreakPoint(curLine, column, wrapOn, killTrailing);
+        var firstBreak = curLine.length > column && leadingSpace == spaceTrimmed &&
+          findBreakPoint(curLine, column, wrapOn, killTrailing);
         // If this isn't broken, or is broken at a different point, remove old break
         if (!firstBreak || firstBreak.from != oldLen || firstBreak.to != oldLen + spaceInserted) {
           changes.push({text: spaceInserted ? " " : "",
                         from: Pos(curNo, oldLen),
-                        to: Pos(curNo + 1, 0)});
+                        to: Pos(curNo + 1, spaceTrimmed.length)});
         } else {
-          curLine = text;
+          curLine = leadingSpace + text;
           ++curNo;
         }
       }
       while (curLine.length > column) {
         var bp = findBreakPoint(curLine, column, wrapOn, killTrailing);
-        changes.push({text: "\n",
+        changes.push({text: "\n" + leadingSpace,
                       from: Pos(curNo, bp.from),
                       to: Pos(curNo, bp.to)});
-        curLine = curLine.slice(bp.to);
+        curLine = leadingSpace + curLine.slice(bp.to);
         ++curNo;
       }
     }
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index a53d68dec6..6cfd9c87c2 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -55,10 +55,15 @@ <h2>Hard-wrapping Demo</h2>
 <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   mode: "markdown",
-  lineNumbers: true
+  lineNumbers: true,
+  extraKeys: {
+    "Ctrl-Q": function(cm) { cm.wrapParagraph(cm.getCursor(), options); }
+  }
 });
 var wait, options = {column: 60};
+var done = false;
 editor.on("change", function(cm, change) {
+if (done) return; done = true;
   clearTimeout(wait);
   wait = setTimeout(function() {
     cm.wrapParagraphsInRange(change.from, CodeMirror.changeEnd(change), options);

From ccacf3e91934fc76b4777d7e71bfbe1f25d02b29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Dec 2013 14:17:05 +0100
Subject: [PATCH 0658/4742] Add clearWhenEmpty option to markText

Stop doing this automatically for marks inclusive on both
sides.

Issue #1996
---
 doc/manual.html   |  3 +++
 lib/codemirror.js | 34 +++++++++++++++++++---------------
 test/test.js      | 23 +++++++++++++++++++++++
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 796663fc88..b7b8cf7283 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1209,6 +1209,9 @@ <h3 id="api_marker">Text-marking methods</h3>
         <a href="#event_clear"><code>"clear"</code></a> event
         fired on the range handle can be used to be notified when this
         happens.</dd>
+        <dt id="mark_clearWhenEmpty"><code><strong>clearWhenEmpty</strong>: boolean</code></dt>
+        <dd>Determines whether the mark is automatically cleared when
+        it becomes empty. Default is true.</dd>
         <dt id="mark_replacedWith"><code><strong>replacedWith</strong>: Element</code></dt>
         <dd>Use a given node to display this range. Implies both
         collapsed and atomic. The given DOM node <em>must</em> be an
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0e5592fb17..d1456e60f8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3870,10 +3870,9 @@ window.CodeMirror = (function() {
     if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
 
     var marker = new TextMarker(doc, type);
-    if (posLess(to, from) || posEq(from, to) && type == "range" &&
-        !(options.inclusiveLeft && options.inclusiveRight))
-      return marker;
     if (options) copyObj(options, marker);
+    if (posLess(to, from) || posEq(from, to) && marker.clearWhenEmpty !== false)
+      return marker;
     if (marker.replacedWith) {
       marker.collapsed = true;
       marker.replacedWith = elt("span", [marker.replacedWith], "CodeMirror-widget");
@@ -3988,9 +3987,7 @@ window.CodeMirror = (function() {
     if (old) for (var i = 0, nw; i < old.length; ++i) {
       var span = old[i], marker = span.marker;
       var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
-      if (startsBefore ||
-          (marker.inclusiveLeft && marker.inclusiveRight || marker.type == "bookmark") &&
-          span.from == startCh && (!isInsert || !span.marker.insertLeft)) {
+      if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
         var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
         (nw || (nw = [])).push({from: span.from,
                                 to: endsAfter ? null : span.to,
@@ -4004,7 +4001,7 @@ window.CodeMirror = (function() {
     if (old) for (var i = 0, nw; i < old.length; ++i) {
       var span = old[i], marker = span.marker;
       var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
-      if (endsAfter || marker.type == "bookmark" && span.from == endCh && (!isInsert || span.marker.insertLeft)) {
+      if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
         var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
         (nw || (nw = [])).push({from: startsBefore ? null : span.from - endCh,
                                 to: span.to == null ? null : span.to - endCh,
@@ -4054,13 +4051,9 @@ window.CodeMirror = (function() {
         }
       }
     }
-    if (sameLine && first) {
-      // Make sure we didn't create any zero-length spans
-      for (var i = 0; i < first.length; ++i)
-        if (first[i].from != null && first[i].from == first[i].to && first[i].marker.type != "bookmark")
-          first.splice(i--, 1);
-      if (!first.length) first = null;
-    }
+    // Make sure we didn't create any zero-length spans
+    if (first) first = clearEmptySpans(first);
+    if (last && last != first) last = clearEmptySpans(last);
 
     var newMarkers = [first];
     if (!sameLine) {
@@ -4077,6 +4070,16 @@ window.CodeMirror = (function() {
     return newMarkers;
   }
 
+  function clearEmptySpans(spans) {
+    for (var i = 0; i < spans.length; ++i) {
+      var span = spans[i];
+      if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
+        spans.splice(i--, 1);
+    }
+    if (!spans.length) return null;
+    return spans;
+  }
+
   function mergeOldSpans(doc, change) {
     var old = getOldSpans(doc, change);
     var stretched = stretchSpansOverChange(doc, change);
@@ -4928,7 +4931,8 @@ window.CodeMirror = (function() {
     },
     setBookmark: function(pos, options) {
       var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
-                      insertLeft: options && options.insertLeft};
+                      insertLeft: options && options.insertLeft,
+                      clearWhenEmpty: false};
       pos = clipPos(this, pos);
       return markText(this, pos, pos, realOpts, "bookmark");
     },
diff --git a/test/test.js b/test/test.js
index dad089fa46..3c7fcb3141 100644
--- a/test/test.js
+++ b/test/test.js
@@ -436,6 +436,29 @@ testCM("markTextStayGone", function(cm) {
   eq(m1.find(), null);
 }, {value: "hello"});
 
+testCM("markTextAllowEmpty", function(cm) {
+  var m1 = cm.markText(Pos(0, 1), Pos(0, 2), {clearWhenEmpty: false});
+  is(m1.find());
+  cm.replaceRange("x", Pos(0, 0));
+  is(m1.find());
+  cm.replaceRange("y", Pos(0, 2));
+  is(m1.find());
+  cm.replaceRange("z", Pos(0, 3), Pos(0, 4));
+  is(!m1.find());
+  var m2 = cm.markText(Pos(0, 1), Pos(0, 2), {clearWhenEmpty: false,
+                                              inclusiveLeft: true,
+                                              inclusiveRight: true});
+  cm.replaceRange("q", Pos(0, 1), Pos(0, 2));
+  is(m2.find());
+  cm.replaceRange("", Pos(0, 0), Pos(0, 3));
+  is(!m2.find());
+  var m3 = cm.markText(Pos(0, 1), Pos(0, 1), {clearWhenEmpty: false});
+  cm.replaceRange("a", Pos(0, 3));
+  is(m3.find());
+  cm.replaceRange("b", Pos(0, 1));
+  is(!m3.find());
+}, {value: "abcde"});
+
 testCM("undoPreservesNewMarks", function(cm) {
   cm.markText(Pos(0, 3), Pos(0, 4));
   cm.markText(Pos(1, 1), Pos(1, 3));

From e626863f9e9005784a5922b8cd976b156ea40f6f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Dec 2013 14:32:17 +0100
Subject: [PATCH 0659/4742] Fix infinite recursion in lineIsHiddenInner for
 stacked spans

Closes #1996
---
 lib/codemirror.js | 3 ++-
 test/test.js      | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d1456e60f8..8be133ace0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4172,7 +4172,8 @@ window.CodeMirror = (function() {
       return true;
     for (var sp, i = 0; i < line.markedSpans.length; ++i) {
       sp = line.markedSpans[i];
-      if (sp != span && sp.marker.collapsed && !sp.marker.replacedWith && sp.from == span.to &&
+      if (sp.marker.collapsed && !sp.marker.replacedWith && sp.from == span.to &&
+          (sp.to == null || sp.to != span.from) &&
           (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
           lineIsHiddenInner(doc, line, sp)) return true;
     }
diff --git a/test/test.js b/test/test.js
index 3c7fcb3141..ddb5ae062c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -459,6 +459,13 @@ testCM("markTextAllowEmpty", function(cm) {
   is(!m3.find());
 }, {value: "abcde"});
 
+testCM("markTextStacked", function(cm) {
+  var m1 = cm.markText(Pos(0, 0), Pos(0, 0), {clearWhenEmpty: false});
+  var m2 = cm.markText(Pos(0, 0), Pos(0, 0), {clearWhenEmpty: false});
+  cm.replaceRange("B", Pos(0, 1));
+  is(m1.find() && m2.find());
+}, {value: "A"});
+
 testCM("undoPreservesNewMarks", function(cm) {
   cm.markText(Pos(0, 3), Pos(0, 4));
   cm.markText(Pos(1, 1), Pos(1, 3));

From 6907aaf716483dad3f3474e3cfaef0ec36475200 Mon Sep 17 00:00:00 2001
From: Abe Fettig <abe@fettig.net>
Date: Wed, 27 Nov 2013 12:06:00 -0500
Subject: [PATCH 0660/4742] [show-hint addon] Be more precise in identifying
 hint element

... to prevent misbehavior in cases where the rendered hint element
contains an LI in its child nodes
---
 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 324d4e7ddb..c6c2e20ac0 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -144,9 +144,9 @@
     return ourMap;
   }
 
-  function getHintElement(stopAt, el) {
-    while (el && el != stopAt) {
-      if (el.nodeName.toUpperCase() === "LI") return el;
+  function getHintElement(hintsElement, el) {
+    while (el && el != hintsElement) {
+      if (el.nodeName.toUpperCase() === "LI" && el.parentNode == hintsElement) return el;
       el = el.parentNode;
     }
   }

From 38321d435c8aa604d34f7a7073faddc19cb8894b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Dec 2013 17:42:16 +0100
Subject: [PATCH 0661/4742] [searchcursor addon] Deal with characters that
 multiply on case folding

And add a test suite.

Issue #2009
---
 addon/search/searchcursor.js | 72 ++++++++++++++++++++++++------------
 test/index.html              |  1 +
 test/search_test.js          | 61 ++++++++++++++++++++++++++++++
 3 files changed, 110 insertions(+), 24 deletions(-)
 create mode 100644 test/search_test.js

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index c034d5865b..711cf4ce5a 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -47,6 +47,7 @@
                   match: match};
       };
     } else { // String query
+      var origQuery = query;
       if (caseFold) query = query.toLowerCase();
       var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
       var target = query.split("\n");
@@ -58,33 +59,45 @@
           this.matches = function() {};
         } else {
           this.matches = function(reverse, pos) {
-            var line = fold(doc.getLine(pos.line)), len = query.length, match;
-            if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1)
-                        : (match = line.indexOf(query, pos.ch)) != -1)
-              return {from: Pos(pos.line, match),
-                      to: Pos(pos.line, match + len)};
+            if (reverse) {
+              var orig = doc.getLine(pos.line).slice(0, pos.ch), line = fold(orig);
+              var match = line.lastIndexOf(query);
+              if (match > -1) {
+                match = adjustPos(orig, line, match);
+                return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
+              }
+             } else {
+               var orig = doc.getLine(pos.line).slice(pos.ch), line = fold(orig);
+               var match = line.indexOf(query);
+               if (match > -1) {
+                 match = adjustPos(orig, line, match) + pos.ch;
+                 return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
+               }
+            }
           };
         }
       } else {
+        var origTarget = origQuery.split("\n");
         this.matches = function(reverse, pos) {
-          var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(doc.getLine(ln));
-          var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match));
-          if (reverse ? offsetA > pos.ch || offsetA != match.length
-              : offsetA < pos.ch || offsetA != line.length - match.length)
-            return;
-          for (;;) {
-            if (reverse ? !ln : ln == doc.lineCount() - 1) return;
-            line = fold(doc.getLine(ln += reverse ? -1 : 1));
-            match = target[reverse ? --idx : ++idx];
-            if (idx > 0 && idx < target.length - 1) {
-              if (line != match) return;
-              else continue;
-            }
-            var offsetB = (reverse ? line.lastIndexOf(match) : line.indexOf(match) + match.length);
-            if (reverse ? offsetB != line.length - match.length : offsetB != match.length)
-              return;
-            var start = Pos(pos.line, offsetA), end = Pos(ln, offsetB);
-            return {from: reverse ? end : start, to: reverse ? start : end};
+          var last = target.length - 1;
+          if (reverse) {
+            if (pos.line - (target.length - 1) < doc.firstLine()) return;
+            if (fold(doc.getLine(pos.line).slice(0, origTarget[last].length)) != target[target.length - 1]) return;
+            var to = Pos(pos.line, origTarget[last].length);
+            for (var ln = pos.line - 1, i = last - 1; i >= 1; --i, --ln)
+              if (target[i] != fold(doc.getLine(ln))) return;
+            var line = doc.getLine(ln), cut = line.length - origTarget[0].length;
+            if (fold(line.slice(cut)) != target[0]) return;
+            return {from: Pos(ln, cut), to: to};
+          } else {
+            if (pos.line + (target.length - 1) > doc.lastLine()) return;
+            var line = doc.getLine(pos.line), cut = line.length - origTarget[0].length;
+            if (fold(line.slice(cut)) != target[0]) return;
+            var from = Pos(pos.line, cut);
+            for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
+              if (target[i] != fold(doc.getLine(ln))) return;
+            if (doc.getLine(ln).slice(0, origTarget[last].length) != target[last]) return;
+            return {from: from, to: Pos(ln, origTarget[last].length)};
           }
         };
       }
@@ -106,7 +119,6 @@
 
       for (;;) {
         if (this.pos = this.matches(reverse, pos)) {
-          if (!this.pos.from || !this.pos.to) { console.log(this.matches, this.pos); }
           this.atOccurrence = true;
           return this.pos.match || true;
         }
@@ -134,6 +146,18 @@
     }
   };
 
+  // Maps a position in a case-folded line back to a position in the original line
+  // (compensating for codepoints increasing in number during folding)
+  function adjustPos(orig, folded, pos) {
+    if (orig.length == folded.length) return pos;
+    for (var pos1 = Math.min(pos, orig.length);;) {
+      var len1 = orig.slice(0, pos1).toLowerCase().length;
+      if (len1 < pos) ++pos1;
+      else if (len1 > pos) --pos1;
+      else return pos1;
+    }
+  }
+
   CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
     return new SearchCursor(this.doc, query, pos, caseFold);
   });
diff --git a/test/index.html b/test/index.html
index 8e45b6d075..bec6c0bd29 100644
--- a/test/index.html
+++ b/test/index.html
@@ -72,6 +72,7 @@ <h2>Test Suite</h2>
     <script src="test.js"></script>
     <script src="doc_test.js"></script>
     <script src="comment_test.js"></script>
+    <script src="search_test.js"></script>
     <script src="mode_test.js"></script>
     <script src="../mode/javascript/test.js"></script>
     <script src="../mode/css/css.js"></script>
diff --git a/test/search_test.js b/test/search_test.js
new file mode 100644
index 0000000000..c6aaa5809e
--- /dev/null
+++ b/test/search_test.js
@@ -0,0 +1,61 @@
+(function() {
+  "use strict";
+
+  function test(name) {
+    var text = Array.prototype.slice.call(arguments, 1, arguments.length - 1).join("\n");
+    var body = arguments[arguments.length - 1];
+    return window.test("search_" + name, function() {
+      body(new CodeMirror.Doc(text));
+    });
+  }
+
+  function run(doc, query, insensitive) {
+    var cursor = doc.getSearchCursor(query, null, insensitive);
+    for (var i = 3; i < arguments.length; i += 4) {
+      var found = cursor.findNext();
+      is(found, "not enough results (forward)");
+      eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, forward, " + (i - 3) / 4);
+      eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, forward, " + (i - 3) / 4);
+    }
+    is(!cursor.findNext(), "too many matches (forward)");
+    for (var i = arguments.length - 4; i >= 3; i -= 4) {
+      var found = cursor.findPrevious();
+      is(found, "not enough results (backwards)");
+      eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, backwards, " + (i - 3) / 4);
+      eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, backwards, " + (i - 3) / 4);
+    }
+    is(!cursor.findPrevious(), "too many matches (backwards)");
+  }
+
+  test("simple", "abcdefg", "abcdefg", function(doc) {
+    run(doc, "cde", false, 0, 2, 0, 5, 1, 2, 1, 5);
+  });
+
+  test("multiline", "hallo", "goodbye", function(doc) {
+    run(doc, "llo\ngoo", false, 0, 2, 1, 3);
+    run(doc, "blah\nhall", false);
+    run(doc, "bye\neye", false);
+  });
+
+  test("regexp", "abcde", "abcde", function(doc) {
+    run(doc, /bcd/, false, 0, 1, 0, 4, 1, 1, 1, 4);
+    run(doc, /BCD/, false);
+    run(doc, /BCD/i, false, 0, 1, 0, 4, 1, 1, 1, 4);
+  });
+
+  test("insensitive", "hallo", "HALLO", "oink", "hAllO", function(doc) {
+    run(doc, "All", false, 3, 1, 3, 4);
+    run(doc, "All", true, 0, 1, 0, 4, 1, 1, 1, 4, 3, 1, 3, 4);
+  });
+
+  test("multilineInsensitive", "zie ginds komT", "De Stoomboot", "uit Spanje weer aan", function(doc) {
+    run(doc, "komt\nde stoomboot\nuit", false);
+    run(doc, "komt\nde stoomboot\nuit", true, 0, 10, 2, 3);
+    run(doc, "kOMt\ndE stOOmboot\nuiT", true, 0, 10, 2, 3);
+  });
+
+  test("expandingCaseFold", "<b>İİ İİ</b>", "<b>uu uu</b>", function(doc) {
+    run(doc, "</b>", true, 0, 8, 0, 12, 1, 8, 1, 12);
+    run(doc, "İİ", true, 0, 3, 0, 5, 0, 6, 0, 8);
+  });
+})();

From 48d11dad21e6cca117d0568469a7a3df6d90276d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Dec 2013 21:09:56 +0100
Subject: [PATCH 0662/4742] [activeline addon] Optimize

Issue #2007
---
 addon/selection/active-line.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index e50508653a..35e989dcf8 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -12,10 +12,10 @@
   CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
-      updateActiveLine(cm);
-      cm.on("cursorActivity", updateActiveLine);
+      updateActiveLine(cm, cm.getCursor().line);
+      cm.on("beforeSelectionChange", selectionChange);
     } else if (!val && prev) {
-      cm.off("cursorActivity", updateActiveLine);
+      cm.off("beforeSelecionChange", selectionChange);
       clearActiveLine(cm);
       delete cm.state.activeLine;
     }
@@ -28,12 +28,18 @@
     }
   }
 
-  function updateActiveLine(cm) {
-    var line = cm.getLineHandleVisualStart(cm.getCursor().line);
+  function updateActiveLine(cm, selectedLine) {
+    var line = cm.getLineHandleVisualStart(selectedLine);
     if (cm.state.activeLine == line) return;
-    clearActiveLine(cm);
-    cm.addLineClass(line, "wrap", WRAP_CLASS);
-    cm.addLineClass(line, "background", BACK_CLASS);
-    cm.state.activeLine = line;
+    cm.operation(function() {
+      clearActiveLine(cm);
+      cm.addLineClass(line, "wrap", WRAP_CLASS);
+      cm.addLineClass(line, "background", BACK_CLASS);
+      cm.state.activeLine = line;
+    });
+  }
+
+  function selectionChange(cm, sel) {
+    updateActiveLine(cm, sel.head.line);
   }
 })();

From 8914577694e56be06c1239755a20a383d9841ee9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Dec 2013 21:27:37 +0100
Subject: [PATCH 0663/4742] Add an (experimental) hideFirstChars method to
 StringStream

Issue #2019
---
 lib/codemirror.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8be133ace0..a98888256b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3710,11 +3710,12 @@ window.CodeMirror = (function() {
     this.string = string;
     this.tabSize = tabSize || 8;
     this.lastColumnPos = this.lastColumnValue = 0;
+    this.lineStart = 0;
   }
 
   StringStream.prototype = {
     eol: function() {return this.pos >= this.string.length;},
-    sol: function() {return this.pos == 0;},
+    sol: function() {return this.pos == this.lineStart;},
     peek: function() {return this.string.charAt(this.pos) || undefined;},
     next: function() {
       if (this.pos < this.string.length)
@@ -3747,9 +3748,12 @@ window.CodeMirror = (function() {
         this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
         this.lastColumnPos = this.start;
       }
-      return this.lastColumnValue;
+      return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
+    },
+    indentation: function() {
+      return countColumn(this.string, null, this.tabSize) -
+        (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
     },
-    indentation: function() {return countColumn(this.string, null, this.tabSize);},
     match: function(pattern, consume, caseInsensitive) {
       if (typeof pattern == "string") {
         var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
@@ -3765,7 +3769,12 @@ window.CodeMirror = (function() {
         return match;
       }
     },
-    current: function(){return this.string.slice(this.start, this.pos);}
+    current: function(){return this.string.slice(this.start, this.pos);},
+    hideFirstChars: function(n, inner) {
+      this.lineStart += n;
+      try { return inner(); }
+      finally { this.lineStart -= n; }
+    }
   };
   CodeMirror.StringStream = StringStream;
 

From e7b737c8a470b210ac4b8fb342c126d4d19f47b0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Dec 2013 21:51:07 +0100
Subject: [PATCH 0664/4742] Disable a search test on Phantom

Due to unexplainable hanging.
---
 test/search_test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/search_test.js b/test/search_test.js
index c6aaa5809e..04a1e685ab 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -55,6 +55,7 @@
   });
 
   test("expandingCaseFold", "<b>İİ İİ</b>", "<b>uu uu</b>", function(doc) {
+    if (phantom) return; // A Phantom bug makes this hang
     run(doc, "</b>", true, 0, 8, 0, 12, 1, 8, 1, 12);
     run(doc, "İİ", true, 0, 3, 0, 5, 0, 6, 0, 8);
   });

From 004734cfbd0e1e0e109675dd9d51d985fdfe6ecb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 4 Dec 2013 15:55:05 +0100
Subject: [PATCH 0665/4742] Replace accidental emdash with dash in regexp

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a98888256b..7456147289 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5522,7 +5522,7 @@ window.CodeMirror = (function() {
     return true;
   }
 
-  var isExtendingChar = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\u1DC0–\u1DFF\u20D0–\u20FF\uA670-\uA672\uA674-\uA67D\uA69F\udc00-\udfff\uFE20–\uFE2F]/;
+  var isExtendingChar = window.ext = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\u1DC0–\u1DFF\u20D0–\u20FF\uA670-\uA672\uA674-\uA67D\uA69F\udc00-\udfff\uFE20-\uFE2F]/;
 
   // DOM UTILITIES
 

From 58ce53c1580339375d16e9111791ed5e8e3634b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 4 Dec 2013 16:05:19 +0100
Subject: [PATCH 0666/4742] Remove all non-ascii text from codemirror.js

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7456147289..dc3451b98c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5522,7 +5522,7 @@ window.CodeMirror = (function() {
     return true;
   }
 
-  var isExtendingChar = window.ext = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\u1DC0–\u1DFF\u20D0–\u20FF\uA670-\uA672\uA674-\uA67D\uA69F\udc00-\udfff\uFE20-\uFE2F]/;
+  var isExtendingChar = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\u1DC0-\u1DFF\u20D0-\u20FF\uA670-\uA672\uA674-\uA67D\uA69F\udc00-\udfff\uFE20-\uFE2F]/;
 
   // DOM UTILITIES
 
@@ -5595,7 +5595,7 @@ window.CodeMirror = (function() {
         if (/\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i))) return true;
         if (i > 2 && /[\d\.,]/.test(str.charAt(i - 2)) && /[\d\.,]/.test(str.charAt(i))) return false;
       }
-      return /[~!#%&*)=+}\]\\|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|…[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
+      return /[~!#%&*)=+}\]\\|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|\u2026[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
     };
 
   var knownScrollbarWidth;

From 6b53fa295b58b4b19a42d61034ad2f1f40c43322 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Dec 2013 12:25:49 +0100
Subject: [PATCH 0667/4742] [merge addon] Support passing in document objects
 as content

---
 addon/merge/merge.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 70341e4d12..89f852652b 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -29,7 +29,7 @@
       this.edit = this.mv.edit;
       this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: true}, copyObj(options)));
 
-      this.diff = getDiff(orig, options.value);
+      this.diff = getDiff(asString(orig), asString(options.value));
       this.diffOutOfDate = false;
 
       this.showDifferences = options.showDifferences !== false;
@@ -352,6 +352,11 @@
     }
   };
 
+  function asString(obj) {
+    if (typeof obj == "string") return obj;
+    else return obj.getValue();
+  }
+
   // Operations on diffs
 
   var dmp = new diff_match_patch();

From 524159fc16f52cbdb11b65480dc8825d3fa3e5fd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Dec 2013 15:39:32 +0100
Subject: [PATCH 0668/4742] [merge demo] Remove layout-breaking css rule

---
 demo/merge.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/merge.html b/demo/merge.html
index d2df900c20..fc272f0652 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -12,7 +12,6 @@
 <script src="../addon/merge/merge.js"></script>
 <style>
     .CodeMirror { line-height: 1.2; }
-    body { max-width: 80em; }
     span.clicky {
       cursor: pointer;
       background: #d70;

From b235f8d0e0418ceafa091281806a6d9c72d3d113 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Dec 2013 15:46:59 +0100
Subject: [PATCH 0669/4742] [less mode] Fix a few more unsafe method calls on
 .peek()

Issue #2028
---
 mode/less/less.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mode/less/less.js b/mode/less/less.js
index da39074851..da681ea67b 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -71,7 +71,7 @@ CodeMirror.defineMode("less", function(config) {
       if(stream.peek() === " ")stream.eatSpace();
       if(stream.peek() === ")" || type === ":")return ret("number", "unit");//rgba(0,0,0,.25);
       else if(stream.current().length >1){
-        if(state.stack[state.stack.length-1] === "rule" && stream.peek().match(/{|,|\+|\(/) === null)return ret("number", "unit");
+        if(state.stack[state.stack.length-1] === "rule" && !stream.match(/^[{,+(]/, false)) return ret("number", "unit");
       }
       return ret("tag", "tag");
     } else if (ch == "#") {
@@ -170,7 +170,7 @@ CodeMirror.defineMode("less", function(config) {
       } else if(type == "compare" || type == "a" || type == "("){
         return ret("string", "string");
       } else if(type == "|" || stream.current() == "-" || type == "["){
-        if(type == "|" && stream.peek().match(/\]|=|\~/) !== null)return ret("number", stream.current());
+        if (type == "|" && stream.match(/^[\]=~]/, false)) return ret("number", stream.current());
         else if(type == "|" )return ret("tag", "tag");
         else if(type == "["){
           stream.eatWhile(/\w\-/);
@@ -201,7 +201,7 @@ CodeMirror.defineMode("less", function(config) {
 
         //else if((type === ")" && state.stack[state.stack.length-1] === "rule") || (state.stack[state.stack.length-2] === "{" && state.stack[state.stack.length-1] === "rule" && type === "variable"))return ret(null, stream.current());
 
-        else if(/\^|\$/.test(stream.current()) && stream.peek().match(/\~|=/) !== null)return ret("string", "string");//att^=val
+        else if (/\^|\$/.test(stream.current()) && stream.match(/^[~=]/, false)) return ret("string", "string");//att^=val
 
         else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
         else if(type === "unit" && state.stack[state.stack.length-1] === ";")return ret(null, "unit");
@@ -210,12 +210,13 @@ CodeMirror.defineMode("less", function(config) {
         //else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
 
         else if((type === ";" || type === "}" || type === ",") && state.stack[state.stack.length-1] === ";")return ret("tag", stream.current());
-        else if((type === ";" && stream.peek() !== undefined && stream.peek().match(/{|./) === null) || (type === ";" && stream.eatSpace() && stream.peek().match(/{|./) === null))return ret("variable", stream.current());
+        else if((type === ";" && stream.peek() !== undefined && !stream.match(/^[{\.]/, false)) ||
+                (type === ";" && stream.eatSpace() && !stream.match(/^[{\.]/))) return ret("variable", stream.current());
         else if((type === "@media" && state.stack[state.stack.length-1] === "@media") || type === "@namespace")return ret("tag", stream.current());
 
         else if(type === "{"  && state.stack[state.stack.length-1] === ";" && stream.peek() === "{")return ret("tag", "tag");
         else if((type === "{" || type === ":") && state.stack[state.stack.length-1] === ";")return ret(null, stream.current());
-        else if((state.stack[state.stack.length-1] === "{" && stream.eatSpace() && stream.peek().match(/.|#/) === null) || type === "select-op"  || (state.stack[state.stack.length-1] === "rule" && type === ",") )return ret("tag", "tag");
+        else if((state.stack[state.stack.length-1] === "{" && stream.eatSpace() && !stream.match(/^[\.#]/)) || type === "select-op"  || (state.stack[state.stack.length-1] === "rule" && type === ",") )return ret("tag", "tag");
         else if(type === "variable" && state.stack[state.stack.length-1] === "rule")return ret("tag", "tag");
         else if((stream.eatSpace() && stream.peek() === "{") || stream.eol() || stream.peek() === "{")return ret("tag", "tag");
         //this one messes up indentation
@@ -227,7 +228,7 @@ CodeMirror.defineMode("less", function(config) {
         else if(stream.sol())return ret("tag", "tag");
         else if((stream.eatSpace() && stream.peek() === "#") || stream.peek() === "#")return ret("tag", "tag");
         else if(state.stack.length === 0)return ret("tag", "tag");
-        else if(type === ";" && stream.peek() !== undefined && stream.peek().match(/^[.|\#]/g) !== null)return ret("tag", "tag");
+        else if(type === ";" && stream.peek() !== undefined && stream.match(/^[\.|#]/g)) return ret("tag", "tag");
 
         else if(type === ":"){stream.eatSpace();return ret(null, stream.current());}
 

From 7bcc1d1796e54561db95f5e7149f6654b2ae7ff4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Dec 2013 16:44:11 +0100
Subject: [PATCH 0670/4742] [xml mode] Rewrite state machine to be simpler and
 faster

Tangentially related to issue #2023
---
 mode/xml/xml.js | 173 +++++++++++++++++++++++-------------------------
 1 file changed, 82 insertions(+), 91 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 4f49e07faf..c455e17e45 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -45,7 +45,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   var alignCDATA = parserConfig.alignCDATA;
 
   // Return variables for tokenizers
-  var tagName, type;
+  var tagName, type, setStyle;
 
   function inText(stream, state) {
     function chain(parser) {
@@ -169,117 +169,113 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     };
   }
 
-  var curState, curStream, setStyle;
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) curState.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-
-  function pushContext(tagName, startOfLine) {
-    var noIndent = Kludges.doNotIndent.hasOwnProperty(tagName) || (curState.context && curState.context.noIndent);
-    curState.context = {
-      prev: curState.context,
+  function pushContext(state, tagName, startOfLine) {
+    var noIndent = Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent);
+    state.context = {
+      prev: state.context,
       tagName: tagName,
-      indent: curState.indented,
+      indent: state.indented,
       startOfLine: startOfLine,
       noIndent: noIndent
     };
   }
-  function popContext() {
-    if (curState.context) curState.context = curState.context.prev;
+  function popContext(state) {
+    if (state.context) state.context = state.context.prev;
+  }
+  function maybePopContext(state, nextTagName) {
+    var parentTagName;
+    while (true) {
+      if (!state.context) {
+        return;
+      }
+      parentTagName = state.context.tagName.toLowerCase();
+      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
+          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
+        return;
+      }
+      popContext();
+    }
   }
 
-  function element(type) {
+  function baseState(type, stream, state) {
     if (type == "openTag") {
-      curState.tagName = tagName;
-      curState.tagStart = curStream.column();
-      return cont(attributes, endtag(curState.startOfLine));
+      state.tagName = tagName;
+      state.tagStart = stream.column();
+      return attrState;
     } else if (type == "closeTag") {
       var err = false;
-      if (curState.context) {
-        if (curState.context.tagName != tagName) {
-          if (Kludges.implicitlyClosed.hasOwnProperty(curState.context.tagName.toLowerCase())) {
-            popContext();
-          }
-          err = !curState.context || curState.context.tagName != tagName;
+      if (state.context) {
+        if (state.context.tagName != tagName) {
+          if (Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName.toLowerCase()))
+            popContext(state);
+          err = !state.context || state.context.tagName != tagName;
         }
       } else {
         err = true;
       }
       if (err) setStyle = "error";
-      return cont(endclosetag(err));
+      return err ? closeStateErr : closeState;
+    } else {
+      return baseState;
     }
-    return cont();
-  }
-  function endtag(startOfLine) {
-    return function(type) {
-      var tagName = curState.tagName;
-      curState.tagName = curState.tagStart = null;
-      if (type == "selfcloseTag" ||
-          (type == "endTag" && Kludges.autoSelfClosers.hasOwnProperty(tagName.toLowerCase()))) {
-        maybePopContext(tagName.toLowerCase());
-        return cont();
-      }
-      if (type == "endTag") {
-        maybePopContext(tagName.toLowerCase());
-        pushContext(tagName, startOfLine);
-        return cont();
-      }
-      return cont();
-    };
   }
-  function endclosetag(err) {
-    return function(type) {
-      if (err) setStyle = "error";
-      if (type == "endTag") { popContext(); return cont(); }
+  function closeState(type, _stream, state) {
+    if (type != "endTag") {
       setStyle = "error";
-      return cont(arguments.callee);
-    };
-  }
-  function maybePopContext(nextTagName) {
-    var parentTagName;
-    while (true) {
-      if (!curState.context) {
-        return;
-      }
-      parentTagName = curState.context.tagName.toLowerCase();
-      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
-        return;
-      }
-      popContext();
+      return closeState;
     }
+    popContext(state);
+    return baseState;
+  }
+  function closeStateErr(type, stream, state) {
+    setStyle = "error";
+    return closeState(type, stream, state);
   }
 
-  function attributes(type) {
-    if (type == "word") {setStyle = "attribute"; return cont(attribute, attributes);}
-    if (type == "endTag" || type == "selfcloseTag") return pass();
+  function attrState(type, stream, state) {
+    if (type == "word") {
+      setStyle = "attribute";
+      return attrEqState;
+    } else if (type == "endTag" || type == "selfcloseTag") {
+      var tagName = state.tagName, tagStart = state.tagStart;
+      state.tagName = state.tagStart = null;
+      if (type == "selfcloseTag" ||
+          Kludges.autoSelfClosers.hasOwnProperty(tagName.toLowerCase())) {
+        maybePopContext(state, tagName.toLowerCase());
+      } else {
+        maybePopContext(state, tagName.toLowerCase());
+        pushContext(state, tagName, tagStart == stream.indentation());
+      }
+      return baseState;
+    }
     setStyle = "error";
-    return cont(attributes);
+    return attrState;
   }
-  function attribute(type) {
-    if (type == "equals") return cont(attvalue, attributes);
+  function attrEqState(type, stream, state) {
+    if (type == "equals") return attrValueState;
     if (!Kludges.allowMissing) setStyle = "error";
-    else if (type == "word") {setStyle = "attribute"; return cont(attribute, attributes);}
-    return (type == "endTag" || type == "selfcloseTag") ? pass() : cont();
+    else if (type == "word") { setStyle = "attribute"; return attrState; }
+    return attrState(type, stream, state);
   }
-  function attvalue(type) {
-    if (type == "string") return cont(attvaluemaybe);
-    if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return cont();}
+  function attrValueState(type, stream, state) {
+    if (type == "string") return attrContinuedState;
+    if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return attrState;}
     setStyle = "error";
-    return (type == "endTag" || type == "selfCloseTag") ? pass() : cont();
+    return attrState(type, stream, state);
   }
-  function attvaluemaybe(type) {
-    if (type == "string") return cont(attvaluemaybe);
-    else return pass();
+  function attrContinuedState(type, stream, state) {
+    if (type == "string") return attrContinuedState;
+    return attrState(type, stream, state);
   }
 
   return {
     startState: function() {
-      return {tokenize: inText, cc: [], indented: 0, startOfLine: true, tagName: null, tagStart: null, context: null};
+      return {tokenize: inText,
+              state: baseState,
+              indented: 0,
+              startOfLine: true,
+              tagName: null, tagStart: null,
+              context: null};
     },
 
     token: function(stream, state) {
@@ -288,20 +284,15 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         state.indented = stream.indentation();
       }
       if (stream.eatSpace()) return null;
-
-      setStyle = type = tagName = null;
+      tagName = type = null;
       var style = state.tokenize(stream, state);
-      state.type = type;
       if ((style || type) && style != "comment") {
-        curState = state; curStream = stream;
-        while (true) {
-          var comb = state.cc.pop() || element;
-          if (comb(type || style)) break;
-        }
+        setStyle = null;
+        state.state = state.state(type || style, stream, state);
+        if (setStyle)
+          style = setStyle == "error" ? style + " error" : setStyle;
       }
       state.startOfLine = false;
-      if (setStyle)
-        style = setStyle == "error" ? style + " error" : setStyle;
       return style;
     },
 

From a6aa48eee2c8262a8763f1e39afdf8a79a130a41 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Dec 2013 16:45:46 +0100
Subject: [PATCH 0671/4742] [xml mode] Reset state when giving up on a bogus
 tag

Issue #2023
---
 mode/xml/xml.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index c455e17e45..48829eb518 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -110,6 +110,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       return null;
     } else if (ch == "<") {
       state.tokenize = inText;
+      state.state = baseState;
+      state.tagName = state.tagStart = null;
       var next = state.tokenize(stream, state);
       return next ? next + " error" : "error";
     } else if (/[\'\"]/.test(ch)) {

From a889edaedcfcba523c385a33486a7b93b142463c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Dec 2013 16:50:48 +0100
Subject: [PATCH 0672/4742] [manual] Point to extension functions from addon
 section

---
 doc/manual.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index b7b8cf7283..98d7fb88ec 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1719,7 +1719,10 @@ <h2>Addons</h2>
 
     <p>The <code>addon</code> directory in the distribution contains a
     number of reusable components that implement extra editor
-    functionality. In brief, they are:</p>
+    functionality (on top of extension functions
+    like <a href="#defineOption"><code>defineOption</code></a>, <a href="#defineExtension"><code>defineExtension</code></a>,
+    and <a href="#registerHelper"><code>registerHelper</code></a>). In
+    brief, they are:</p>
 
     <dl>
       <dt id="addon_dialog"><a href="../addon/dialog/dialog.js"><code>dialog/dialog.js</code></a></dt>

From 3ba5c3b9299d9d34df7238ff457cb2b2beb14a1e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Dec 2013 16:57:41 +0100
Subject: [PATCH 0673/4742] [xml mode] Fix bug introduced by
 a6aa48eee2c8262a8763f1e39afdf8a79a130a41

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

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 48829eb518..c296be7eb8 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -195,7 +195,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
           !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
         return;
       }
-      popContext();
+      popContext(state);
     }
   }
 

From ba5b11738adcef773fdd1a8e592770be3b7173d5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Dec 2013 16:04:24 +0100
Subject: [PATCH 0674/4742] [closetag addon] Scan forward in document to look
 for existing closing tag

Issue #2025
---
 addon/edit/closetag.js | 4 +++-
 addon/fold/xml-fold.js | 6 ++++++
 demo/closetag.html     | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index bbd1c6e10c..106448d3d7 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -57,7 +57,9 @@
         tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
         tok.type == "tag" && state.type == "closeTag" ||
         tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
-        dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)
+        dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
+        CodeMirror.scanForClosingTag && CodeMirror.scanForClosingTag(cm, pos, tagName,
+                                                                     Math.min(cm.lastLine() + 1, pos.line + 50)))
       return CodeMirror.Pass;
 
     var doIndent = indentTags && indexOf(indentTags, lowerTagName) > -1;
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 88a107c4a2..db5aed7041 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -164,4 +164,10 @@
       if (close) return {open: open, close: close};
     }
   };
+
+  // Used by addon/edit/closetag.js
+  CodeMirror.scanForClosingTag = function(cm, pos, name, end) {
+    var iter = new Iter(cm, pos.line, pos.ch, end ? {from: 0, to: end} : null);
+    return !!findMatchingClose(iter, name);
+  };
 })();
diff --git a/demo/closetag.html b/demo/closetag.html
index 8981f7eb3a..39ca8b3f51 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/edit/closetag.js"></script>
+<script src="../addon/fold/xml-fold.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/css/css.js"></script>

From fe9107ed328833794fee61e1463d164a38ae8015 Mon Sep 17 00:00:00 2001
From: Maksym Taran <mtaran@google.com>
Date: Wed, 4 Dec 2013 14:25:17 -0800
Subject: [PATCH 0675/4742] [python mode] Add support for hanging indent

---
 mode/python/index.html | 1 +
 mode/python/python.js  | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/mode/python/index.html b/mode/python/index.html
index 497734920b..e8422fb77a 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -168,6 +168,7 @@ <h2>Configuration Options for Python mode:</h2>
     <ul>
       <li>version - 2/3 - The version of Python to recognize.  Default is 2.</li>
       <li>singleLineStringErrors - true/false - If you have a single-line string that is not terminated at the end of the line, this will show subsequent lines as errors if true, otherwise it will consider the newline as the end of the string. Default is false.</li>
+      <li>hangingIndent - int - If you want to write long arguments to a function starting on a new line, how much that line should be indented. Defaults to one normal indentation unit.</li>
     </ul>
     <h2>Advanced Configuration Options:</h2>
     <p>Usefull for superset of python syntax like Enthought enaml, IPython magics and  questionmark help</p>
diff --git a/mode/python/python.js b/mode/python/python.js
index 802c2dd4ac..8bea5d19d1 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -11,6 +11,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
     var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
     var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
     var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+    var hangingIndent = parserConf.hangingIndent || parserConf.indentUnit;
 
     var wordOperators = wordRegexp(['and', 'or', 'not', 'is', 'in']);
     var commonkeywords = ['as', 'assert', 'break', 'class', 'continue',
@@ -211,6 +212,11 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
                     break;
                 }
             }
+        } else if (stream.match(/\s*($|#)/, false)) {
+            // An open paren/bracket/brace with only space or comments after it
+            // on the line will indent the next line a fixed amount, to make it
+            // easier to put arguments, list items, etc. on their own lines.
+            indentUnit = stream.indentation() + hangingIndent;
         } else {
             indentUnit = stream.column() + stream.current().length;
         }

From e596013a3f600dd33bfa02742de13b80bc39bc5a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Dec 2013 16:36:44 +0100
Subject: [PATCH 0676/4742] [comment addon] Test token type when uncommenting

To make sure it isn't seeing comments that are actually
strings.

Issue #1975
---
 addon/comment/comment.js |  6 +++++-
 test/comment_test.js     | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index b8a86a3f33..5975b0bf69 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -96,6 +96,7 @@
       for (var i = start; i <= end; ++i) {
         var line = self.getLine(i);
         var found = line.indexOf(lineString);
+        if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
         if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
         if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
         lines.push(line);
@@ -124,7 +125,10 @@
       endLine = self.getLine(--end);
       close = endLine.lastIndexOf(endString);
     }
-    if (open == -1 || close == -1) return false;
+    if (open == -1 || close == -1 ||
+        !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
+        !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
+      return false;
 
     self.operation(function() {
       self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
diff --git a/test/comment_test.js b/test/comment_test.js
index 7ab3127b43..d8ff2c866d 100644
--- a/test/comment_test.js
+++ b/test/comment_test.js
@@ -48,4 +48,16 @@ namespace = "comment_";
     cm.setCursor(1);
     cm.execCommand("toggleComment");
   }, "a;\n\nb;", "a;\n// \nb;");
+
+  test("dontMessWithStrings", "javascript", function(cm) {
+    cm.execCommand("toggleComment");
+  }, "console.log(\"/*string*/\");", "// console.log(\"/*string*/\");");
+
+  test("dontMessWithStrings2", "javascript", function(cm) {
+    cm.execCommand("toggleComment");
+  }, "console.log(\"// string\");", "// console.log(\"// string\");");
+
+  test("dontMessWithStrings3", "javascript", function(cm) {
+    cm.execCommand("toggleComment");
+  }, "// console.log(\"// string\");", "console.log(\"// string\");");
 })();

From b88d7eabc6eef72a4674356a25e3180eb3090687 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 8 Dec 2013 22:54:32 -0500
Subject: [PATCH 0677/4742] Use phantomjs from npm

---
 package.json |  3 ++-
 test/run.js  | 34 +++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 27bb735827..6e3cfde467 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
                   "url": "http://codemirror.net/LICENSE"}],
     "directories": {"lib": "./lib"},
     "scripts": {"test": "node ./test/run.js"},
-    "devDependencies": {"node-static": "0.6.0"},
+    "devDependencies": {"node-static": "0.6.0",
+                        "phantomjs": "1.9.2-5"},
     "bugs": "http://github.com/marijnh/CodeMirror/issues",
     "keywords": ["JavaScript", "CodeMirror", "Editor"],
     "homepage": "http://codemirror.net",
diff --git a/test/run.js b/test/run.js
index 52221be5a2..140539c173 100755
--- a/test/run.js
+++ b/test/run.js
@@ -9,26 +9,30 @@ lint.checkDir("keymap");
 
 var ok = lint.success();
 
-var files = new (require('node-static').Server)('.');
+var files = new (require('node-static').Server)();
 
 var server = require('http').createServer(function (req, res) {
   req.addListener('end', function () {
-    files.serve(req, res);
-  });
+    files.serve(req, res, function (err/*, result */) {
+      if (err) {
+        console.error(err);
+        process.exit(1);
+      }
+    });
+  }).resume();
 }).addListener('error', function (err) {
   throw err;
 }).listen(3000, function () {
-  var child_process = require('child_process');
-  child_process.exec("which phantomjs", function (err) {
-    if (err) {
-      console.error("PhantomJS is not installed. Download from http://phantomjs.org");
-      process.exit(1);
-    }
-    var cmd = 'phantomjs test/phantom_driver.js';
-    child_process.exec(cmd, function (err, stdout) {
-      server.close();
-      console.log(stdout);
-      process.exit(err || !ok ? 1 : 0);
-    });
+  var childProcess = require('child_process');
+  var phantomjs = require("phantomjs");
+  var childArgs = [
+    require("path").join(__dirname, 'phantom_driver.js')
+  ];
+  childProcess.execFile(phantomjs.path, childArgs, function (err, stdout, stderr) {
+    server.close();
+    console.log(stdout);
+    if (err) console.error(err);
+    if (stderr) console.error(stderr);
+    process.exit(err || stderr || !ok ? 1 : 0);
   });
 });

From a22c751b47e1c38142c7c1ab6fa96642e00e90be Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sat, 23 Nov 2013 15:03:27 -0500
Subject: [PATCH 0678/4742] [markdown] Option to highlight formatting
 characters separately

---
 mode/gfm/gfm.js           |  13 ++-
 mode/gfm/test.js          |  17 ++++
 mode/markdown/markdown.js | 194 +++++++++++++++++++++++++++++++++-----
 mode/markdown/test.js     |  55 +++++++++++
 4 files changed, 253 insertions(+), 26 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 1411a9382a..492cbc463a 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -1,4 +1,4 @@
-CodeMirror.defineMode("gfm", function(config) {
+CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var codeDepth = 0;
   function blankLine(state) {
     state.code = false;
@@ -87,11 +87,16 @@ CodeMirror.defineMode("gfm", function(config) {
     },
     blankLine: blankLine
   };
-  CodeMirror.defineMIME("gfmBase", {
-    name: "markdown",
+
+  var markdownConfig = {
     underscoresBreakWords: false,
     taskLists: true,
     fencedCodeBlocks: true
-  });
+  };
+  for (var attr in modeConfig) {
+    markdownConfig[attr] = modeConfig[attr];
+  }
+  markdownConfig.name = "markdown";
+  CodeMirror.defineMIME("gfmBase", markdownConfig);
   return CodeMirror.overlayMode(CodeMirror.getMode(config, "gfmBase"), gfmOverlay);
 }, "markdown");
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 3ccaec5010..4cf46fe5a5 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -1,6 +1,23 @@
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, "gfm");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+  var modeHighlightFormatting = CodeMirror.getMode({tabSize: 4}, {name: "gfm", highlightFormatting: true});
+  function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
+
+  FT("codeBackticks",
+     "[comment&formatting&formatting-code `][comment foo][comment&formatting&formatting-code `]");
+
+  FT("doubleBackticks",
+     "[comment&formatting&formatting-code ``][comment foo ` bar][comment&formatting&formatting-code ``]");
+
+  FT("codeBlock",
+     "[comment&formatting&formatting-code-block ```css]",
+     "[tag foo]",
+     "[comment&formatting&formatting-code-block ```]");
+
+  FT("taskList",
+     "[variable-2&formatting&formatting-list - ][meta&formatting&formatting-task [ ]]][variable-2  foo]",
+     "[variable-2&formatting&formatting-list - ][property&formatting&formatting-task [x]]][variable-2  foo]");
 
   MT("emInWordAsterisk",
      "foo[em *bar*]hello");
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 218408fb53..2469479ea0 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -42,6 +42,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     };
   }());
 
+  // Should characters that affect highlighting be highlighted separate?
+  // Does not include characters that will be output (such as `1.` and `-` for lists)
+  if (modeCfg.highlightFormatting === undefined)
+    modeCfg.highlightFormatting = false;
+
   // Should underscores in words open/close em/strong?
   if (modeCfg.underscoresBreakWords === undefined)
     modeCfg.underscoresBreakWords = true;
@@ -63,6 +68,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   list3    = 'keyword'
   ,   hr       = 'hr'
   ,   image    = 'tag'
+  ,   formatting = 'formatting'
   ,   linkinline = 'link'
   ,   linkemail = 'link'
   ,   linktext = 'link'
@@ -76,7 +82,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
   ,   atxHeaderRE = /^#+/
   ,   setextHeaderRE = /^(?:\={1,}|-{1,})$/
-  ,   textRE = /^[^!\[\]*_\\<>` "'(]+/;
+  ,   textRE = /^[^#!\[\]*_\\<>` "'(]+/;
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -137,16 +143,24 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return null;
     } else if (match = stream.match(atxHeaderRE)) {
       state.header = match[0].length <= 6 ? match[0].length : 6;
+      if (modeCfg.highlightFormatting) state.formatting = "header";
+      state.f = state.inline;
+      return getType(state);
     } else if (state.prevLineHasContent && (match = stream.match(setextHeaderRE))) {
       state.header = match[0].charAt(0) == '=' ? 1 : 2;
+      if (modeCfg.highlightFormatting) state.formatting = "header";
+      state.f = state.inline;
+      return getType(state);
     } else if (stream.eat('>')) {
       state.indentation++;
       state.quote = 1;
+      if (modeCfg.highlightFormatting) state.formatting = "quote";
       stream.eatSpace();
       while (stream.eat('>')) {
         stream.eatSpace();
         state.quote++;
       }
+      return getType(state);
     } else if (stream.peek() === '[') {
       return switchInline(stream, state, footnoteLink);
     } else if (stream.match(hrRE, true)) {
@@ -158,12 +172,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (modeCfg.taskLists && stream.match(taskListRE, false)) {
         state.taskList = true;
       }
+      state.f = state.inline;
+      if (modeCfg.highlightFormatting) state.formatting = "list";
+      return getType(state);
     } else if (modeCfg.fencedCodeBlocks && stream.match(/^```([\w+#]*)/, true)) {
       // try switching mode
       state.localMode = getMode(RegExp.$1);
       if (state.localMode) state.localState = state.localMode.startState();
       switchBlock(stream, state, local);
-      return code;
+      if (modeCfg.highlightFormatting) state.formatting = "code-block";
+      state.code = true;
+      return getType(state);
     }
 
     return switchInline(stream, state, state.inline);
@@ -188,7 +207,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.localMode = state.localState = null;
       state.f = inlineNormal;
       state.block = blockNormal;
-      return code;
+      if (modeCfg.highlightFormatting) state.formatting = "code-block";
+      state.code = true;
+      var returnType = getType(state);
+      state.code = false;
+      return returnType;
     } else if (state.localMode) {
       return state.localMode.token(stream, state.localState);
     } else {
@@ -201,8 +224,33 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   function getType(state) {
     var styles = [];
 
-    if (state.taskOpen) { return "meta"; }
-    if (state.taskClosed) { return "property"; }
+    if (state.formatting) {
+      styles.push(formatting);
+
+      if (typeof state.formatting === "string") state.formatting = [state.formatting];
+
+      for (var i = 0; i < state.formatting.length; i++) {
+        styles.push(formatting + "-" + state.formatting[i]);
+
+        if (state.formatting[i] === "header") {
+          styles.push(formatting + "-" + state.formatting[i] + state.header);
+        }
+      }
+    }
+
+    if (state.taskOpen) {
+      styles.push("meta");
+      return styles.length ? styles.join(' ') : null;
+    }
+    if (state.taskClosed) {
+      styles.push("property");
+      return styles.length ? styles.join(' ') : null;
+    }
+
+    if (state.linkHref) {
+      styles.push(linkhref);
+      return styles.length ? styles.join(' ') : null;
+    }
 
     if (state.strong) { styles.push(strong); }
     if (state.em) { styles.push(em); }
@@ -254,6 +302,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       var taskOpen = stream.match(taskListRE, true)[1] !== "x";
       if (taskOpen) state.taskOpen = true;
       else state.taskClosed = true;
+      if (modeCfg.highlightFormatting) state.formatting = "task";
       state.taskList = false;
       return getType(state);
     }
@@ -261,13 +310,24 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.taskOpen = false;
     state.taskClosed = false;
 
+    if (state.header && stream.match(/^#+$/, true)) {
+      if (modeCfg.highlightFormatting) state.formatting = "header";
+      return getType(state);
+    }
+
     // Get sol() value now, before character is consumed
     var sol = stream.sol();
 
     var ch = stream.next();
 
+    if (state.escape) {
+      state.escape = false;
+      return getType(state);
+    }
+
     if (ch === '\\') {
-      stream.next();
+      if (modeCfg.highlightFormatting) state.formatting = "escape";
+      state.escape = true;
       return getType(state);
     }
 
@@ -287,6 +347,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     // If this block is changed, it may need to be updated in GFM mode
     if (ch === '`') {
+      var previousFormatting = state.formatting;
+      if (modeCfg.highlightFormatting) state.formatting = "code";
       var t = getType(state);
       var before = stream.pos;
       stream.eatWhile('`');
@@ -300,6 +362,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
           state.code = false;
           return t;
         }
+        state.formatting = previousFormatting;
         return getType(state);
       }
     } else if (state.code) {
@@ -314,10 +377,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     if (ch === '[' && stream.match(/.*\](\(| ?\[)/, false)) {
       state.linkText = true;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
       return getType(state);
     }
 
     if (ch === ']' && state.linkText) {
+      if (modeCfg.highlightFormatting) state.formatting = "link";
       var type = getType(state);
       state.linkText = false;
       state.inline = state.f = linkHref;
@@ -325,11 +390,27 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, false)) {
-      return switchInline(stream, state, inlineElement(linkinline, '>'));
+      state.f = state.inline = linkInline;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      if (type){
+        type += " ";
+      } else {
+        type = "";
+      }
+      return type + linkinline;
     }
 
     if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
-      return switchInline(stream, state, inlineElement(linkemail, '>'));
+      state.f = state.inline = linkInline;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      if (type){
+        type += " ";
+      } else {
+        type = "";
+      }
+      return type + linkemail;
     }
 
     if (ch === '<' && stream.match(/^\w/, false)) {
@@ -360,21 +441,26 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         }
       }
     }
-    var t = getType(state);
     if (ch === '*' || (ch === '_' && !ignoreUnderscore)) {
       if (sol && stream.peek() === ' ') {
         // Do nothing, surrounded by newline and space
       } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
+        if (modeCfg.highlightFormatting) state.formatting = "strong";
+        var t = getType(state);
         state.strong = false;
         return t;
       } else if (!state.strong && stream.eat(ch)) { // Add STRONG
         state.strong = ch;
+        if (modeCfg.highlightFormatting) state.formatting = "strong";
         return getType(state);
       } else if (state.em === ch) { // Remove EM
+        if (modeCfg.highlightFormatting) state.formatting = "em";
+        var t = getType(state);
         state.em = false;
         return t;
       } else if (!state.em) { // Add EM
         state.em = ch;
+        if (modeCfg.highlightFormatting) state.formatting = "em";
         return getType(state);
       }
     } else if (ch === ' ') {
@@ -398,6 +484,26 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return getType(state);
   }
 
+  function linkInline(stream, state) {
+    var ch = stream.next();
+
+    if (ch === ">") {
+      state.f = state.inline = inlineNormal;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      if (type){
+        type += " ";
+      } else {
+        type = "";
+      }
+      return type + linkinline;
+    }
+
+    stream.match(/^[^>]+/, true);
+
+    return linkinline;
+  }
+
   function linkHref(stream, state) {
     // Check if space, and return NULL if so (to avoid marking the space)
     if(stream.eatSpace()){
@@ -405,19 +511,60 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
     var ch = stream.next();
     if (ch === '(' || ch === '[') {
-      return switchInline(stream, state, inlineElement(linkhref, ch === '(' ? ')' : ']'));
+      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]");
+      if (modeCfg.highlightFormatting) state.formatting = "link-string";
+      state.linkHref = true;
+      return getType(state);
     }
     return 'error';
   }
 
+  function getLinkHrefInside(endChar) {
+    return function(stream, state) {
+      var ch = stream.next();
+
+      if (ch === endChar) {
+        state.f = state.inline = inlineNormal;
+        if (modeCfg.highlightFormatting) state.formatting = "link-string";
+        var returnState = getType(state);
+        state.linkHref = false;
+        return returnState;
+      }
+
+      if (stream.match(inlineRE(endChar), true)) {
+        stream.backUp(1);
+      }
+
+      state.linkHref = true;
+      return getType(state);
+    };
+  }
+
   function footnoteLink(stream, state) {
-    if (stream.match(/^[^\]]*\]:/, true)) {
-      state.f = footnoteUrl;
-      return linktext;
+    if (stream.match(/^[^\]]*\]:/, false)) {
+      state.f = footnoteLinkInside;
+      stream.next(); // Consume [
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      state.linkText = true;
+      return getType(state);
     }
     return switchInline(stream, state, inlineNormal);
   }
 
+  function footnoteLinkInside(stream, state) {
+    if (stream.match(/^\]:/, true)) {
+      state.f = state.inline = footnoteUrl;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var returnType = getType(state);
+      state.linkText = false;
+      return returnType;
+    }
+
+    stream.match(/^[^\]]+/, true);
+
+    return linktext;
+  }
+
   function footnoteUrl(stream, state) {
     // Check if space, and return NULL if so (to avoid marking the space)
     if(stream.eatSpace()){
@@ -447,15 +594,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return savedInlineRE[endChar];
   }
 
-  function inlineElement(type, endChar, next) {
-    next = next || inlineNormal;
-    return function(stream, state) {
-      stream.match(inlineRE(endChar));
-      state.inline = state.f = next;
-      return type;
-    };
-  }
-
   return {
     startState: function() {
       return {
@@ -471,7 +609,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         inline: inlineNormal,
         text: handleText,
 
+        escape: false,
+        formatting: false,
         linkText: false,
+        linkHref: false,
         linkTitle: false,
         em: false,
         strong: false,
@@ -501,6 +642,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         inline: s.inline,
         text: s.text,
+        escape: false,
+        formatting: false,
         linkTitle: s.linkTitle,
         em: s.em,
         strong: s.strong,
@@ -516,6 +659,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     },
 
     token: function(stream, state) {
+
+      // Reset state.formatting
+      state.formatting = false;
+
       if (stream.sol()) {
         if (stream.match(/^\s*$/, true)) {
           state.prevLineHasContent = false;
@@ -525,6 +672,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
           state.thisLineHasContent = true;
         }
 
+        // Reset state.escape
+        state.escape = false;
+
         // Reset state.header
         state.header = 0;
 
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 6bf4006550..21ceab7650 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -1,6 +1,57 @@
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, "markdown");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+  var modeHighlightFormatting = CodeMirror.getMode({tabSize: 4}, {name: "markdown", highlightFormatting: true});
+  function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
+
+  FT("formatting_emAsterisk",
+     "[em&formatting&formatting-em *][em foo][em&formatting&formatting-em *]");
+
+  FT("formatting_emUnderscore",
+     "[em&formatting&formatting-em _][em foo][em&formatting&formatting-em _]");
+
+  FT("formatting_strongAsterisk",
+     "[strong&formatting&formatting-strong **][strong foo][strong&formatting&formatting-strong **]");
+
+  FT("formatting_strongUnderscore",
+     "[strong&formatting&formatting-strong __][strong foo][strong&formatting&formatting-strong __]");
+
+  FT("formatting_codeBackticks",
+     "[comment&formatting&formatting-code `][comment foo][comment&formatting&formatting-code `]");
+
+  FT("formatting_doubleBackticks",
+     "[comment&formatting&formatting-code ``][comment foo ` bar][comment&formatting&formatting-code ``]");
+
+  FT("formatting_atxHeader",
+     "[header&header1&formatting&formatting-header&formatting-header1 #][header&header1  foo # bar ][header&header1&formatting&formatting-header&formatting-header1 #]");
+
+  FT("formatting_setextHeader",
+     "foo",
+     "[header&header1&formatting&formatting-header&formatting-header1 =]");
+
+  FT("formatting_blockquote",
+     "[atom&formatting&formatting-quote > ][atom foo]");
+
+  FT("formatting_list",
+     "[variable-2&formatting&formatting-list - ][variable-2 foo]");
+  FT("formatting_list",
+     "[variable-2&formatting&formatting-list 1. ][variable-2 foo]");
+
+  FT("formatting_link",
+     "[link&formatting&formatting-link [][link foo][link&formatting&formatting-link ]]][string&formatting&formatting-link-string (][string http://example.com/][string&formatting&formatting-link-string )]");
+
+  FT("formatting_linkReference",
+     "[link&formatting&formatting-link [][link foo][link&formatting&formatting-link ]]][string&formatting&formatting-link-string [][string bar][string&formatting&formatting-link-string ]]]",
+     "[link&formatting&formatting-link [][link bar][link&formatting&formatting-link ]]:] [string http://example.com/]");
+
+  FT("formatting_linkWeb",
+     "[link&formatting&formatting-link <][link http://example.com/][link&formatting&formatting-link >]");
+
+  FT("formatting_linkEmail",
+     "[link&formatting&formatting-link <][link user@example.com][link&formatting&formatting-link >]");
+
+  FT("formatting_escape",
+     "[formatting&formatting-escape \\]*");
 
   MT("plainText",
      "foo");
@@ -651,6 +702,10 @@
   MT("doubleEscapeHash",
      "\\\\# foo");
 
+  MT("escapeNewline",
+     "\\",
+     "[em *foo*]");
+
 
   // Tests to make sure GFM-specific things aren't getting through
 

From 06cfa38c64e595027d8f4c455d97b2a0fb2a6176 Mon Sep 17 00:00:00 2001
From: mloginov <mikhail.loginov@citronium.com>
Date: Mon, 9 Dec 2013 12:16:26 +0400
Subject: [PATCH 0679/4742] [activeline addon] Fix typo

---
 addon/selection/active-line.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index 35e989dcf8..7cf7793c07 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -15,7 +15,7 @@
       updateActiveLine(cm, cm.getCursor().line);
       cm.on("beforeSelectionChange", selectionChange);
     } else if (!val && prev) {
-      cm.off("beforeSelecionChange", selectionChange);
+      cm.off("beforeSelectionChange", selectionChange);
       clearActiveLine(cm);
       delete cm.state.activeLine;
     }

From 11f478000a24df11c6ff9041b58bea9af0f2ef19 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Dec 2013 17:23:44 +0100
Subject: [PATCH 0680/4742] Remove executable flag from some mode scripts

Closes #2037
---
 mode/php/php.js                 | 0
 mode/smartymixed/smartymixed.js | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 mode/php/php.js
 mode change 100755 => 100644 mode/smartymixed/smartymixed.js

diff --git a/mode/php/php.js b/mode/php/php.js
old mode 100755
new mode 100644
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
old mode 100755
new mode 100644

From 6c3f6f67a4b4a6802e66d2e0691518eee9e86a2a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 10 Dec 2013 11:02:56 +0100
Subject: [PATCH 0681/4742] [real-world uses] Add kodtest

And update Light Table link
---
 doc/realworld.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index a8ff3590d1..891bbc8151 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -82,7 +82,8 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>
       <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://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light Table</a> (experimental IDE)</li>
+      <li><a href="http://kodtest.com/">Kodtest</a> (HTML/JS/CSS playground)</li>d
+      <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>
       <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>
       <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>

From 9f0e51f7add73b1157a976b03ef8216f020989e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 10 Dec 2013 11:31:50 +0100
Subject: [PATCH 0682/4742] [real-world uses] Fix stray character

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 891bbc8151..156eacd097 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -82,7 +82,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>
       <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>d
+      <li><a href="http://kodtest.com/">Kodtest</a> (HTML/JS/CSS playground)</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>
       <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>

From c40ac0b5bfe68dad69f16f34494a35386ba33041 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 10 Dec 2013 21:29:48 +0100
Subject: [PATCH 0683/4742] Properly implement overlapping collapsed span
 restriction

---
 lib/codemirror.js | 83 ++++++++++++++++++++++++++++++++++-------------
 test/test.js      | 17 ++++++++++
 2 files changed, 77 insertions(+), 23 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index dc3451b98c..358307fbac 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3826,7 +3826,7 @@ window.CodeMirror = (function() {
     if (withOp) endOperation(cm);
   };
 
-  TextMarker.prototype.find = function() {
+  TextMarker.prototype.find = function(bothSides) {
     var from, to;
     for (var i = 0; i < this.lines.length; ++i) {
       var line = this.lines[i];
@@ -3837,7 +3837,7 @@ window.CodeMirror = (function() {
         if (span.to != null) to = Pos(found, span.to);
       }
     }
-    if (this.type == "bookmark") return from;
+    if (this.type == "bookmark" && !bothSides) return from;
     return from && {from: from, to: to};
   };
 
@@ -3874,6 +3874,8 @@ window.CodeMirror = (function() {
     }
   };
 
+  var nextMarkerId = 0;
+
   function markText(doc, from, to, options, type) {
     if (options && options.shared) return markTextShared(doc, from, to, options, type);
     if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
@@ -3887,25 +3889,36 @@ window.CodeMirror = (function() {
       marker.replacedWith = elt("span", [marker.replacedWith], "CodeMirror-widget");
       if (!options.handleMouseEvents) marker.replacedWith.ignoreEvents = true;
     }
-    if (marker.collapsed) sawCollapsedSpans = true;
+    if (marker.collapsed) {
+      var atStart = collapsedSpanAtPoint(doc, from, function(sp) {
+        return sp.to != from.ch &&
+          (sp.from != from.ch ||
+           (sp.marker.inclusiveLeft || !marker.inclusiveLeft) &&
+           posLess(to, sp.marker.find(true).to));
+      });
+      var atEnd = collapsedSpanAtPoint(doc, to, function(sp) {
+        return sp.from != to.ch &&
+          (sp.from != to.ch ||
+           (sp.marker.inclusiveRight || !marker.inclusiveRight) &&
+           posLess(sp.marker.find(true).from, from));
+      });
+      if (atStart != atEnd)
+        throw new Error("Inserting collapsed marker partially overlapping an existing one");
+      sawCollapsedSpans = true;
+    }
 
     if (marker.addToHistory)
       addToHistory(doc, {from: from, to: to, origin: "markText"},
                    {head: doc.sel.head, anchor: doc.sel.anchor}, NaN);
 
-    var curLine = from.line, size = 0, collapsedAtStart, collapsedAtEnd, cm = doc.cm, updateMaxLine;
+    var curLine = from.line, cm = doc.cm, updateMaxLine;
     doc.iter(curLine, to.line + 1, function(line) {
       if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(doc, line) == cm.display.maxLine)
         updateMaxLine = true;
       var span = {from: null, to: null, marker: marker};
-      size += line.text.length;
-      if (curLine == from.line) {span.from = from.ch; size -= from.ch;}
-      if (curLine == to.line) {span.to = to.ch; size -= line.text.length - to.ch;}
-      if (marker.collapsed) {
-        if (curLine == to.line) collapsedAtEnd = collapsedSpanAt(line, to.ch);
-        if (curLine == from.line) collapsedAtStart = collapsedSpanAt(line, from.ch);
-        else updateLineHeight(line, 0);
-      }
+      if (curLine == from.line) span.from = from.ch;
+      if (curLine == to.line) span.to = to.ch;
+      if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0);
       addMarkedSpan(line, span);
       ++curLine;
     });
@@ -3921,9 +3934,7 @@ window.CodeMirror = (function() {
         doc.clearHistory();
     }
     if (marker.collapsed) {
-      if (collapsedAtStart != collapsedAtEnd)
-        throw new Error("Inserting collapsed marker overlapping an existing one");
-      marker.size = size;
+      marker.id = ++nextMarkerId;
       marker.atomic = true;
     }
     if (cm) {
@@ -4139,20 +4150,46 @@ window.CodeMirror = (function() {
     return parts;
   }
 
-  function collapsedSpanAt(line, ch) {
+  function compareCollapsedMarkers(a, b) {
+    var lenDiff = a.lines.length - b.lines.length;
+    if (lenDiff != 0) return lenDiff;
+    var aPos = a.find(), bPos = b.find();
+    var fromCmp = posLess(bPos.from, aPos.from) ? -1 : posLess(aPos.from, bPos.from) ? 1 : 0;
+    if (fromCmp != 0) return fromCmp;
+    var toCmp = posLess(bPos.to, aPos.to) ? 1 : posLess(aPos.to, bPos.to) ? -1 : 0;
+    if (toCmp != 0) return toCmp;
+    if (a.inclusiveLeft != b.inclusiveLeft) return a.inclusiveLeft ? 1 : -1;
+    if (a.inclusiveRight != b.inclusiveRight) return a.inclusiveRight ? 1 : -1;
+    return b.id - a.id;
+  }
+
+  function collapsedSpanAtSide(line, start) {
     var sps = sawCollapsedSpans && line.markedSpans, found;
     if (sps) for (var sp, i = 0; i < sps.length; ++i) {
       sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      if ((sp.from == null || sp.from < ch) &&
-          (sp.to == null || sp.to > ch) &&
-          (!found || found.width < sp.marker.width))
+      if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
+          (!found || compareCollapsedMarkers(found, sp.marker) < 0))
+        found = sp.marker;
+    }
+    return found;
+  }
+  function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }
+  function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }
+
+  function collapsedSpanAtPoint(doc, pos, filter) {
+    var line = getLine(doc, pos.line);
+    var sps = sawCollapsedSpans && line.markedSpans, found;
+    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
+      sp = sps[i];
+      if (sp.marker.collapsed &&
+          (sp.from == null || sp.from <= pos.ch) &&
+          (sp.to == null || sp.to >= pos.ch) &&
+          filter(sp) &&
+          (!found || compareCollapsedMarkers(found, sp.marker) < 0))
         found = sp.marker;
     }
     return found;
   }
-  function collapsedSpanAtStart(line) { return collapsedSpanAt(line, -1); }
-  function collapsedSpanAtEnd(line) { return collapsedSpanAt(line, line.text.length + 1); }
 
   function visualLine(doc, line) {
     var merged;
@@ -4583,7 +4620,7 @@ window.CodeMirror = (function() {
             if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
             if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
             if (m.title && !title) title = m.title;
-            if (m.collapsed && (!collapsed || collapsed.marker.size < m.size))
+            if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
               collapsed = sp;
           } else if (sp.from > pos && nextChange > sp.from) {
             nextChange = sp.from;
diff --git a/test/test.js b/test/test.js
index ddb5ae062c..dbbe0f5feb 100644
--- a/test/test.js
+++ b/test/test.js
@@ -871,6 +871,23 @@ testCM("badNestedFold", function(cm) {
   is(/overlap/i.test(caught.message), "wrong error");
 });
 
+testCM("nestedFoldOnSide", function(cm) {
+  var m1 = cm.markText(Pos(0, 1), Pos(2, 1), {collapsed: true, inclusiveRight: true});
+  var m2 = cm.markText(Pos(0, 1), Pos(0, 2), {collapsed: true});
+  cm.markText(Pos(0, 1), Pos(0, 2), {collapsed: true}).clear();
+  try { cm.markText(Pos(0, 1), Pos(0, 2), {collapsed: true, inclusiveLeft: true}); }
+  catch(e) { var caught = e; }
+  is(caught && /overlap/i.test(caught.message));
+  var m3 = cm.markText(Pos(2, 0), Pos(2, 1), {collapsed: true});
+  var m4 = cm.markText(Pos(2, 0), Pos(2, 1), {collapse: true, inclusiveRight: true});
+  m1.clear(); m4.clear();
+  m1 = cm.markText(Pos(0, 1), Pos(2, 1), {collapsed: true});
+  cm.markText(Pos(2, 0), Pos(2, 1), {collapsed: true}).clear();
+  try { cm.markText(Pos(2, 0), Pos(2, 1), {collapsed: true, inclusiveRight: true}); }
+  catch(e) { var caught = e; }
+  is(caught && /overlap/i.test(caught.message));
+}, {value: "ab\ncd\ef"});
+
 testCM("wrappingInlineWidget", function(cm) {
   cm.setSize("11em");
   var w = document.createElement("span");

From efe9509494e8623c8758e1ea6f6aec82f5afacd0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Dec 2013 09:46:21 +0100
Subject: [PATCH 0684/4742] Make vertical motion collapse selection when one
 exists

Closes #2042
---
 lib/codemirror.js | 18 +++++++++++-------
 test/test.js      | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 358307fbac..510f5ff213 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3161,14 +3161,18 @@ window.CodeMirror = (function() {
     },
 
     moveV: operation(null, function(dir, unit) {
-      var sel = this.doc.sel;
-      var pos = cursorCoords(this, sel.head, "div");
-      if (sel.goalColumn != null) pos.left = sel.goalColumn;
-      var target = findPosV(this, pos, dir, unit);
-
-      if (unit == "page") addToScrollPos(this, 0, charCoords(this, target, "div").top - pos.top);
+      var sel = this.doc.sel, target, goal;
+      if (sel.shift || sel.extend || posEq(sel.from, sel.to)) {
+        var pos = cursorCoords(this, sel.head, "div");
+        if (sel.goalColumn != null) pos.left = sel.goalColumn;
+        target = findPosV(this, pos, dir, unit);
+        if (unit == "page") addToScrollPos(this, 0, charCoords(this, target, "div").top - pos.top);
+        goal = pos.left;
+      } else {
+        target = dir < 0 ? sel.from : sel.to;
+      }
       extendSelection(this.doc, target, target, dir);
-      sel.goalColumn = pos.left;
+      if (goal != null) sel.goalColumn = goal;
     }),
 
     toggleOverwrite: function(value) {
diff --git a/test/test.js b/test/test.js
index dbbe0f5feb..3437b6274c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1020,6 +1020,24 @@ testCM("moveVstuck", function(cm) {
   eqPos(cm.getCursor(), Pos(0, 26));
 }, {lineWrapping: true}, ie_lt8 || opera_lt10);
 
+testCM("collapseOnMove", function(cm) {
+  cm.setSelection(Pos(0, 1), Pos(2, 4));
+  cm.execCommand("goLineUp");
+  is(!cm.somethingSelected());
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.setSelection(Pos(0, 1), Pos(2, 4));
+  cm.execCommand("goPageDown");
+  is(!cm.somethingSelected());
+  eqPos(cm.getCursor(), Pos(2, 4));
+  cm.execCommand("goLineUp");
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(0, 4));
+  cm.setSelection(Pos(0, 1), Pos(2, 4));
+  cm.execCommand("goCharLeft");
+  is(!cm.somethingSelected());
+  eqPos(cm.getCursor(), Pos(0, 1));
+}, {value: "aaaaa\nb\nccccc"});
+
 testCM("clickTab", function(cm) {
   var p0 = cm.charCoords(Pos(0, 0));
   eqPos(cm.coordsChar({left: p0.left + 5, top: p0.top + 5}), Pos(0, 0));

From 5deae0ca3fdb3085841fca61eb9b5d283d6fda88 Mon Sep 17 00:00:00 2001
From: Maksym Taran <mtaran@google.com>
Date: Mon, 9 Dec 2013 15:05:49 -0800
Subject: [PATCH 0685/4742] [r mode] Fix bad post-'else if' indentation.

---
 mode/r/r.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/r/r.js b/mode/r/r.js
index 6410efbb22..690cf40502 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -36,7 +36,11 @@ CodeMirror.defineMode("r", function(config) {
       var word = stream.current();
       if (atoms.propertyIsEnumerable(word)) return "atom";
       if (keywords.propertyIsEnumerable(word)) {
-        if (blockkeywords.propertyIsEnumerable(word)) curPunc = "block";
+        // Block keywords start new blocks, except 'else if', which only starts
+        // one new block for the 'if', no block for the 'else'.
+        if (blockkeywords.propertyIsEnumerable(word) &&
+            !stream.match(/\s*if(\s+|$)/, false))
+          curPunc = "block";
         return "keyword";
       }
       if (builtins.propertyIsEnumerable(word)) return "builtin";

From be5ef1c3a1259a265501328297b84cad15e193b1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Dec 2013 10:57:18 +0100
Subject: [PATCH 0686/4742] Use separate node for forcing cursor to be scrolled
 into view

Using the cursor itself was awkward already, but turns out to
also have strange effects (it was somehow treated as having height: 0
in some situations, by all browsers).
---
 lib/codemirror.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 510f5ff213..4975446e46 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2651,14 +2651,12 @@ window.CodeMirror = (function() {
     if (coords.top + box.top < 0) doScroll = true;
     else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
     if (doScroll != null && !phantom) {
-      var hidden = display.cursor.style.display == "none";
-      if (hidden) {
-        display.cursor.style.display = "";
-        display.cursor.style.left = coords.left + "px";
-        display.cursor.style.top = (coords.top - display.viewOffset) + "px";
-      }
-      display.cursor.scrollIntoView(doScroll);
-      if (hidden) display.cursor.style.display = "none";
+      var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
+                           (coords.top - display.viewOffset) + "px; height: " +
+                           (coords.bottom - coords.top) + "px; left: " + coords.left + "px");
+      cm.display.lineSpace.appendChild(scrollNode);
+      scrollNode.scrollIntoView(doScroll);
+      cm.display.lineSpace.removeChild(scrollNode);
     }
   }
 

From 987f08b4e3e6fc7640ca41db229154b8a4f6b15a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Dec 2013 12:44:38 +0100
Subject: [PATCH 0687/4742] In indentLine, clear empty lines when aggressive is
 false

---
 lib/codemirror.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4975446e46..556fd349af 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2739,7 +2739,10 @@ window.CodeMirror = (function() {
     var tabSize = cm.options.tabSize;
     var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
     var curSpaceString = line.text.match(/^\s*/)[0], indentation;
-    if (how == "smart") {
+    if (!aggressive && !/\S/.test(line.text)) {
+      indentation = 0;
+      how = "not";
+    } else if (how == "smart") {
       indentation = cm.doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
       if (indentation == Pass) {
         if (!aggressive) return;

From c2fd42ef0baf5ec3fca968390b7bc69cf64131ae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Dec 2013 13:36:05 +0100
Subject: [PATCH 0688/4742] Use inner mode's electricChars property

Also moves handling of electricChars to readInput, removing
the timeout kludge.

Issue #2029
---
 lib/codemirror.js                 | 18 ++++++++++++------
 mode/htmlembedded/htmlembedded.js |  2 --
 mode/htmlmixed/htmlmixed.js       |  2 --
 mode/php/php.js                   |  1 -
 mode/smartymixed/smartymixed.js   |  2 --
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 556fd349af..0caa8cb8b9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1500,17 +1500,27 @@ window.CodeMirror = (function() {
     var same = 0, l = Math.min(prevInput.length, text.length);
     while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
     var from = sel.from, to = sel.to;
+    var inserted = text.slice(same);
     if (same < prevInput.length)
       from = Pos(from.line, from.ch - (prevInput.length - same));
     else if (cm.state.overwrite && posEq(from, to) && !cm.state.pasteIncoming)
-      to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + (text.length - same)));
+      to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + inserted.length));
 
     var updateInput = cm.curOp.updateInput;
-    var changeEvent = {from: from, to: to, text: splitLines(text.slice(same)),
+    var changeEvent = {from: from, to: to, text: splitLines(inserted),
                        origin: cm.state.pasteIncoming ? "paste" : "+input"};
     makeChange(cm.doc, changeEvent, "end");
     cm.curOp.updateInput = updateInput;
     signalLater(cm, "inputRead", cm, changeEvent);
+    if (!cm.state.pasteIncoming && cm.options.electricChars &&
+        cm.options.smartIndent && sel.head.ch < 100) {
+      var electric = cm.getModeAt(sel.head).electricChars;
+      if (electric) for (var i = 0; i < electric.length; i++)
+        if (inserted.indexOf(electric.charAt(i)) > -1) {
+          indentLine(cm, sel.head.line, "smart");
+          break;
+        }
+    }
 
     if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
     else cm.display.prevInput = text;
@@ -2148,10 +2158,6 @@ window.CodeMirror = (function() {
     if (opera && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
     if (((opera && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
     var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
-    if (this.options.electricChars && this.doc.mode.electricChars &&
-        this.options.smartIndent && !isReadOnly(this) &&
-        this.doc.mode.electricChars.indexOf(ch) > -1)
-      setTimeout(operation(cm, function() {indentLine(cm, cm.doc.sel.to.line, "smart");}), 75);
     if (handleCharBinding(cm, e, ch)) return;
     if (ie && !ie_lt9) cm.display.inputHasSelection = null;
     fastPoll(cm);
diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index ff6dfd2f92..c316cd3406 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -58,8 +58,6 @@ CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
       };
     },
 
-    electricChars: "/{}:",
-
     innerMode: function(state) {
       if (state.token == scriptingDispatch) return {state: state.scriptState, mode: scriptingMode};
       else return {state: state.htmlState, mode: htmlMixedMode};
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index b59ef37edb..e9eab3b92d 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -93,8 +93,6 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
         return CodeMirror.Pass;
     },
 
-    electricChars: "/{}:",
-
     innerMode: function(state) {
       return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
     }
diff --git a/mode/php/php.js b/mode/php/php.js
index 09d2ab6122..946f770c9f 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -117,7 +117,6 @@
         return state.curMode.indent(state.curState, textAfter);
       },
 
-      electricChars: "/{}:",
       blockCommentStart: "/*",
       blockCommentEnd: "*/",
       lineComment: "//",
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
index a033ab04fa..48dd1a6752 100644
--- a/mode/smartymixed/smartymixed.js
+++ b/mode/smartymixed/smartymixed.js
@@ -159,8 +159,6 @@ CodeMirror.defineMode("smartymixed", function(config) {
       return htmlMixedMode.indent(state.htmlMixedState, textAfter);
     },
 
-    electricChars: "/{}:",
-
     innerMode: function(state) {
       return {
         state: state.localState || state.htmlMixedState,

From cb21b6bce19a6fff71075f1534d1b4e24f2baa2b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Dec 2013 17:02:54 +0100
Subject: [PATCH 0689/4742] Work around scrollIntoView/negative margin
 interaction

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0caa8cb8b9..63bcff0096 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2659,7 +2659,8 @@ window.CodeMirror = (function() {
     if (doScroll != null && !phantom) {
       var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
                            (coords.top - display.viewOffset) + "px; height: " +
-                           (coords.bottom - coords.top) + "px; left: " + coords.left + "px");
+                           (coords.bottom - coords.top + scrollerCutOff) + "px; left: " +
+                           coords.left + "px; width: 2px;");
       cm.display.lineSpace.appendChild(scrollNode);
       scrollNode.scrollIntoView(doScroll);
       cm.display.lineSpace.removeChild(scrollNode);

From cb47451b79e52fdc986c8fdac91a1b0fda5d71cc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Dec 2013 20:57:34 +0100
Subject: [PATCH 0690/4742] Revise algorithm for detecting overlapping ranges

---
 lib/codemirror.js | 54 ++++++++++++++++++++---------------------------
 test/test.js      |  4 ++--
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 63bcff0096..ba24bbcf3d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2513,6 +2513,7 @@ window.CodeMirror = (function() {
 
   function posEq(a, b) {return a.line == b.line && a.ch == b.ch;}
   function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);}
+  function cmp(a, b) {return a.line - b.line || a.ch - b.ch;}
   function copyPos(x) {return Pos(x.line, x.ch);}
 
   // SELECTION
@@ -3902,19 +3903,8 @@ window.CodeMirror = (function() {
       if (!options.handleMouseEvents) marker.replacedWith.ignoreEvents = true;
     }
     if (marker.collapsed) {
-      var atStart = collapsedSpanAtPoint(doc, from, function(sp) {
-        return sp.to != from.ch &&
-          (sp.from != from.ch ||
-           (sp.marker.inclusiveLeft || !marker.inclusiveLeft) &&
-           posLess(to, sp.marker.find(true).to));
-      });
-      var atEnd = collapsedSpanAtPoint(doc, to, function(sp) {
-        return sp.from != to.ch &&
-          (sp.from != to.ch ||
-           (sp.marker.inclusiveRight || !marker.inclusiveRight) &&
-           posLess(sp.marker.find(true).from, from));
-      });
-      if (atStart != atEnd)
+      if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
+          from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
         throw new Error("Inserting collapsed marker partially overlapping an existing one");
       sawCollapsedSpans = true;
     }
@@ -4162,16 +4152,17 @@ window.CodeMirror = (function() {
     return parts;
   }
 
+  function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; }
+  function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; }
+
   function compareCollapsedMarkers(a, b) {
     var lenDiff = a.lines.length - b.lines.length;
     if (lenDiff != 0) return lenDiff;
     var aPos = a.find(), bPos = b.find();
-    var fromCmp = posLess(bPos.from, aPos.from) ? -1 : posLess(aPos.from, bPos.from) ? 1 : 0;
-    if (fromCmp != 0) return fromCmp;
-    var toCmp = posLess(bPos.to, aPos.to) ? 1 : posLess(aPos.to, bPos.to) ? -1 : 0;
-    if (toCmp != 0) return toCmp;
-    if (a.inclusiveLeft != b.inclusiveLeft) return a.inclusiveLeft ? 1 : -1;
-    if (a.inclusiveRight != b.inclusiveRight) return a.inclusiveRight ? 1 : -1;
+    var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
+    if (fromCmp) return -fromCmp;
+    var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
+    if (toCmp) return toCmp;
     return b.id - a.id;
   }
 
@@ -4188,19 +4179,20 @@ window.CodeMirror = (function() {
   function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }
   function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }
 
-  function collapsedSpanAtPoint(doc, pos, filter) {
-    var line = getLine(doc, pos.line);
-    var sps = sawCollapsedSpans && line.markedSpans, found;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (sp.marker.collapsed &&
-          (sp.from == null || sp.from <= pos.ch) &&
-          (sp.to == null || sp.to >= pos.ch) &&
-          filter(sp) &&
-          (!found || compareCollapsedMarkers(found, sp.marker) < 0))
-        found = sp.marker;
+  function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
+    var line = getLine(doc, lineNo);
+    var sps = sawCollapsedSpans && line.markedSpans;
+    if (sps) for (var i = 0; i < sps.length; ++i) {
+      var sp = sps[i];
+      if (!sp.marker.collapsed) continue;
+      var found = sp.marker.find(true);
+      var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
+      var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
+      if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
+      if (fromCmp <= 0 && (cmp(found.to, from) || extraRight(sp.marker) - extraLeft(marker)) > 0 ||
+          fromCmp >= 0 && (cmp(found.from, to) || extraLeft(sp.marker) - extraRight(marker)) < 0)
+        return true;
     }
-    return found;
   }
 
   function visualLine(doc, line) {
diff --git a/test/test.js b/test/test.js
index 3437b6274c..439f2412af 100644
--- a/test/test.js
+++ b/test/test.js
@@ -742,8 +742,8 @@ testCM("collapsedRangeCoordsChar", function(cm) {
   var m1 = cm.markText(Pos(0, 0), Pos(2, 0), opts);
   eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
   m1.clear();
-  var m1 = cm.markText(Pos(0, 0), Pos(1, 1), opts);
-  var m2 = cm.markText(Pos(1, 1), Pos(2, 0), opts);
+  var m1 = cm.markText(Pos(0, 0), Pos(1, 1), {collapsed: true, inclusiveLeft: true});
+  var m2 = cm.markText(Pos(1, 1), Pos(2, 0), {collapsed: true, inclusiveRight: true});
   eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
   m1.clear(); m2.clear();
   var m1 = cm.markText(Pos(0, 0), Pos(1, 6), opts);

From 88d1326b54a7bbf131c15cdc3cdcf50e13192a3f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Dec 2013 17:14:23 +0100
Subject: [PATCH 0691/4742] Improve helper system

Add getHelpers and registerGlobalHelper, allow modes to specify arrays
of helper names, support modeProps in mode specifications.

Update foldcode and show-hint to make use of more powerful helper
system by defining an `auto` helper that tries multiple helpers, and
using that as default.
---
 addon/fold/comment-fold.js |  4 +-
 addon/fold/foldcode.js     | 15 ++++++-
 addon/fold/foldgutter.js   |  2 +-
 addon/hint/python-hint.js  |  4 --
 addon/hint/show-hint.js    | 38 ++++++++++++++++-
 demo/complete.html         |  4 +-
 demo/folding.html          | 67 ++++++++++++++++--------------
 demo/html5complete.html    | 74 +++++++++++++++++----------------
 doc/manual.html            | 85 ++++++++++++++++++++++++++++----------
 lib/codemirror.js          | 37 ++++++++++++++---
 mode/clike/clike.js        | 37 +++++++++++++----
 test/test.js               | 19 +++++++++
 12 files changed, 270 insertions(+), 116 deletions(-)

diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index a064cf8f57..26e72f09f5 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -1,4 +1,6 @@
-CodeMirror.registerHelper("fold", "comment", function(cm, start) {
+CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
+  return mode.blockCommentStart && mode.blockCommentEnd;
+}, function(cm, start) {
   var mode = cm.getModeAt(start), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
   if (!startToken || !endToken) return;
   var line = start.line, lineText = cm.getLine(line);
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index c497bc29b6..5c00d7093c 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -3,8 +3,7 @@
 
   function doFold(cm, pos, options, force) {
     var finder = options && (options.call ? options : options.rangeFinder);
-    if (!finder) finder = cm.getHelper(pos, "fold");
-    if (!finder) return;
+    if (!finder) finder = CodeMirror.fold.auto;
     if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
     var minSize = options && options.minFoldSize || 0;
 
@@ -63,6 +62,10 @@
     doFold(this, pos, options, force);
   });
 
+  CodeMirror.commands.fold = function(cm) {
+    cm.foldCode(cm.getCursor());
+  };
+
   CodeMirror.registerHelper("fold", "combine", function() {
     var funcs = Array.prototype.slice.call(arguments, 0);
     return function(cm, start) {
@@ -72,4 +75,12 @@
       }
     };
   });
+
+  CodeMirror.registerHelper("fold", "auto", function(cm, start) {
+    var helpers = cm.getHelpers(start, "fold");
+    for (var i = 0; i < helpers.length; i++) {
+      var cur = helpers[i](cm, start);
+      if (cur) return cur;
+    }
+  });
 })();
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 57336fbff8..a4f3bb3186 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -62,7 +62,7 @@
       if (isFolded(cm, cur)) {
         mark = marker(opts.indicatorFolded);
       } else {
-        var pos = Pos(cur, 0), func = opts.rangeFinder || cm.getHelper(pos, "fold");
+        var pos = Pos(cur, 0), func = opts.rangeFinder || CodeMirror.fold.auto;
         var range = func && func(cm, pos);
         if (range && range.from.line + 1 < range.to.line)
           mark = marker(opts.indicatorOpen);
diff --git a/addon/hint/python-hint.js b/addon/hint/python-hint.js
index 98d2a5897f..ace1941bd6 100644
--- a/addon/hint/python-hint.js
+++ b/addon/hint/python-hint.js
@@ -31,10 +31,6 @@
 
     var completionList = getCompletions(token, context);
     completionList = completionList.sort();
-    //prevent autocomplete for last word, instead show dropdown with one word
-    if(completionList.length == 1) {
-      completionList.push(" ");
-    }
 
     return {list: completionList,
             from: CodeMirror.Pos(cur.line, token.start),
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index c6c2e20ac0..31e919dcbb 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -7,8 +7,10 @@
   CodeMirror.showHint = function(cm, getHints, options) {
     // We want a single cursor position.
     if (cm.somethingSelected()) return;
-    if (getHints == null) getHints = cm.getHelper(cm.getCursor(), "hint");
-    if (getHints == null) return;
+    if (getHints == null) {
+      if (options && options.async) return;
+      else getHints = CodeMirror.hint.auto;
+    }
 
     if (cm.state.completionActive) cm.state.completionActive.close();
 
@@ -284,4 +286,36 @@
       return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
     }
   };
+
+  CodeMirror.registerHelper("hint", "auto", function(cm, options) {
+    var helpers = cm.getHelpers(cm.getCursor(), "hint");
+    if (helpers.length) {
+      for (var i = 0; i < helpers.length; i++) {
+        var cur = helpers[i](cm, options);
+        if (cur && cur.list.length) return cur;
+      }
+    } else {
+      var words = cm.getHelper(cm.getCursor(), "hintWords");
+      if (words) return CodeMirror.hint.fromList(cm, {words: words});
+    }
+  });
+
+  CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    if (!/^[\w$_]*$/.test(token.string)) return null;
+    var found = [];
+    for (var i = 0; i < options.words.length; i++) {
+      var word = options.words[i];
+      if (word.slice(0, token.string.length) == token.string)
+        found.push(word);
+    }
+
+    if (found.length) return {
+      list: found,
+      from: CodeMirror.Pos(cur.line, token.start),
+            to: CodeMirror.Pos(cur.line, token.end)
+    };
+  });
+
+  CodeMirror.commands.autocomplete = CodeMirror.showHint;
 })();
diff --git a/demo/complete.html b/demo/complete.html
index e256a908b4..44b3b2db73 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -10,6 +10,7 @@
 <script src="../addon/hint/show-hint.js"></script>
 <script src="../addon/hint/javascript-hint.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
+
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
 
@@ -69,9 +70,6 @@ <h2>Autocomplete Demo</h2>
 addons.</p>
 
     <script>
-      CodeMirror.commands.autocomplete = function(cm) {
-        CodeMirror.showHint(cm, CodeMirror.hint.javascript);
-      };
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         extraKeys: {"Ctrl-Space": "autocomplete"}
diff --git a/demo/folding.html b/demo/folding.html
index 9461801277..cc9f2a332d 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -1,22 +1,26 @@
 <!doctype html>
 
-<title>CodeMirror: Code Folding Demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
+<head>
+  <title>CodeMirror: Code Folding Demo</title>
+  <meta charset="utf-8"/>
+  <link rel=stylesheet href="../doc/docs.css">
 
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/fold/foldgutter.css" />
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/fold/foldcode.js"></script>
-<script src="../addon/fold/foldgutter.js"></script>
-<script src="../addon/fold/brace-fold.js"></script>
-<script src="../addon/fold/xml-fold.js"></script>
-<script src="../addon/fold/comment-fold.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-</style>
+  <link rel="stylesheet" href="../lib/codemirror.css">
+  <link rel="stylesheet" href="../addon/fold/foldgutter.css" />
+  <script src="../lib/codemirror.js"></script>
+  <script src="../addon/fold/foldcode.js"></script>
+  <script src="../addon/fold/foldgutter.js"></script>
+  <script src="../addon/fold/brace-fold.js"></script>
+  <script src="../addon/fold/xml-fold.js"></script>
+  <script src="../addon/fold/comment-fold.js"></script>
+  <script src="../mode/javascript/javascript.js"></script>
+  <script src="../mode/xml/xml.js"></script>
+  <style type="text/css">
+    .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+  </style>
+</head>
+
+<body>
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
 
@@ -31,12 +35,14 @@
 </div>
 
 <article>
-<h2>Code Folding Demo</h2>
-<form>
-      <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
-      <div style="max-width: 50em">HTML:<br><textarea id="code-html" name="code-html"></textarea></div>
-    </form>
-    <script id="script">
+  <h2>Code Folding Demo</h2>
+  <form>
+    <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br>
+    <textarea id="code" name="code"></textarea></div>
+    <div style="max-width: 50em">HTML:<br>
+    <textarea id="code-html" name="code-html"></textarea></div>
+  </form>
+  <script id="script">
 /*
  * Demonstration of code folding
  */
@@ -46,19 +52,17 @@ <h2>Code Folding Demo</h2>
   te.value = (sc.textContent || sc.innerText || sc.innerHTML).replace(/^\s*/, "");
   sc.innerHTML = "";
   var te_html = document.getElementById("code-html");
-  te_html.value = "<html>\n  " + document.documentElement.innerHTML + "\n</html>";
+  te_html.value = document.documentElement.innerHTML;
 
   window.editor = CodeMirror.fromTextArea(te, {
     mode: "javascript",
     lineNumbers: true,
     lineWrapping: true,
     extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
-    foldGutter: {
-    	rangeFinder: new CodeMirror.fold.combine(CodeMirror.fold.brace, CodeMirror.fold.comment)
-    },
+    foldGutter: true,
     gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   });
-  editor.foldCode(CodeMirror.Pos(8, 0));
+  editor.foldCode(CodeMirror.Pos(11, 0));
 
   window.editor_html = CodeMirror.fromTextArea(te_html, {
     mode: "text/html",
@@ -68,8 +72,9 @@ <h2>Code Folding Demo</h2>
     foldGutter: true,
     gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   });
-  editor_html.foldCode(CodeMirror.Pos(13, 0));
-  editor_html.foldCode(CodeMirror.Pos(1, 0));
+  editor_html.foldCode(CodeMirror.Pos(0, 0));
+  editor_html.foldCode(CodeMirror.Pos(21, 0));
 };
-</script>
-  </article>
+  </script>
+</article>
+</body>
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 899260aa20..94ced527d0 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -1,37 +1,41 @@
 <!doctype html>
 
-<title>CodeMirror: HTML completion demo</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../doc/docs.css">
-
-<link rel="stylesheet" href="../lib/codemirror.css">
-<link rel="stylesheet" href="../addon/hint/show-hint.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../addon/hint/show-hint.js"></script>
-<script src="../addon/hint/xml-hint.js"></script>
-<script src="../addon/hint/html-hint.js"></script>
-<script src="../mode/xml/xml.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<script src="../mode/css/css.js"></script>
-<script src="../mode/htmlmixed/htmlmixed.js"></script>
-<style type="text/css">
-      .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
-    </style>
-<div id=nav>
-  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">HTML completion</a>
-  </ul>
-</div>
-
-<article>
-<h2>HTML completion demo</h2>
+<head>
+  <title>CodeMirror: HTML completion demo</title>
+  <meta charset="utf-8"/>
+  <link rel=stylesheet href="../doc/docs.css">
+
+  <link rel="stylesheet" href="../lib/codemirror.css">
+  <link rel="stylesheet" href="../addon/hint/show-hint.css">
+  <script src="../lib/codemirror.js"></script>
+  <script src="../addon/hint/show-hint.js"></script>
+  <script src="../addon/hint/xml-hint.js"></script>
+  <script src="../addon/hint/html-hint.js"></script>
+  <script src="../mode/xml/xml.js"></script>
+  <script src="../mode/javascript/javascript.js"></script>
+  <script src="../mode/css/css.js"></script>
+  <script src="../mode/htmlmixed/htmlmixed.js"></script>
+  <style type="text/css">
+    .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
+  </style>
+</head>
+
+<body>
+  <div id=nav>
+    <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+    </ul>
+    <ul>
+      <li><a class=active href="#">HTML completion</a>
+    </ul>
+  </div>
+
+  <article>
+    <h2>HTML completion demo</h2>
 
     <p>Shows the <a href="xmlcomplete.html">XML completer</a>
     parameterized with information about the tags in HTML.
@@ -40,15 +44,13 @@ <h2>HTML completion demo</h2>
     <div id="code"></div>
 
     <script type="text/javascript">
-      CodeMirror.commands.autocomplete = function(cm) {
-          CodeMirror.showHint(cm, CodeMirror.hint.html);
-      }
       window.onload = function() {
         editor = CodeMirror(document.getElementById("code"), {
           mode: "text/html",
           extraKeys: {"Ctrl-Space": "autocomplete"},
-          value: "<!doctype html>\n<html>\n  " + document.documentElement.innerHTML + "\n</html>"
+          value: document.documentElement.innerHTML
         });
       };
     </script>
   </article>
+</body>
diff --git a/doc/manual.html b/doc/manual.html
index 98d7fb88ec..0dc120ddf3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1533,18 +1533,35 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
       unstyled tokens, and a string, potentially containing multiple
       space-separated style names, otherwise.</dd>
 
+      <dt id="getHelpers"><code><strong>cm.getHelpers</strong>(pos: {line, ch}, type: string) → array&lt;helper&gt;</code></dt>
+      <dd>Fetch the set of applicable helper values for the given
+      position. Helpers provide a way to look up functionality
+      appropriate for a mode. The <code>type</code> argument provides
+      the helper namespace (see
+      <a href="#registerHelper"><code>registerHelper</code></a>), in
+      which the values will be looked up. When the mode itself has a
+      property that corresponds to the <code>type</code>, that
+      directly determines the keys that are used to look up the helper
+      values (it may be either a single string, or an array of
+      strings). Failing that, the mode's <code>helperType</code>
+      property and finally the mode's name are used.</dd>
+      <dd>For example, the JavaScript mode has a
+      property <code>fold</code> containing <code>"brace"</code>. When
+      the <code>brace-fold</code> addon is loaded, that defines a
+      helper named <code>brace</code> in the <code>fold</code>
+      namespace. This is then used by
+      the <a href="#addon_foldcode"><code>foldcode</code></a> addon to
+      figure out that it can use that folding function to fold
+      JavaScript code.</dd>
+      <dd>When any <a href="#registerGlobalHelper">'global'</a>
+      helpers are defined for the given namespace, their predicates
+      are called on the current mode and editor, and all those that
+      declare they are applicable will also be added to the array that
+      is returned.</dd>
+
       <dt id="getHelper"><code><strong>cm.getHelper</strong>(pos: {line, ch}, type: string) → helper</code></dt>
-      <dd>Fetch appropriate helper for the given position. Helpers
-      provide a way to look up functionality appropriate for a mode.
-      The <code>type</code> argument provides the helper namespace
-      (see
-      also <a href="#registerHelper"><code>registerHelper</code></a>),
-      in which the value will be looked up. The key that is used
-      depends on the <a href="#getMode">mode</a> active at the given
-      position. If the mode object contains a property with the same
-      name as the <code>type</code> argument, that is tried first.
-      Next, the mode's <code>helperType</code>, if any, is tried. And
-      finally, the mode's name.</dd>
+      <dd>Returns the first applicable helper value.
+      See <a href="#getHelpers"><code>getHelpers</code></a>.</dd>
 
       <dt id="getStateAfter"><code><strong>cm.getStateAfter</strong>(?line: integer, ?precise: boolean) → object</code></dt>
       <dd>Returns the mode's parser state, if any, at the end of the
@@ -1689,7 +1706,7 @@ <h3 id="api_static">Static properties</h3>
       (with the instance as argument) whenever a new CodeMirror instance
       is initialized.</dd>
 
-      <dt id="registerHelper"><code><strong>CodeMirror.registerHelper</strong>(type: string, name: string, value: helper)</code></dt>
+      <dt id="registerHelper"><code><strong>CodeMirror.registerHelper</strong>(type: string, name: string, value: helper)</code></dt>
       <dd>Registers a helper value with the given <code>name</code> in
       the given namespace (<code>type</code>). This is used to define
       functionality that may be looked up by mode. Will create (if it
@@ -1700,6 +1717,14 @@ <h3 id="api_static">Static properties</h3>
       myFoo)</code>, the value <code>CodeMirror.hint.foo</code> will
       point to <code>myFoo</code>.</dd>
 
+      <dt id="registerGlobalHelper"><code><strong>CodeMirror.registerGlobalHelper</strong>(type: string, name: string, predicate: fn(mode, CodeMirror), value: helper)</code></dt>
+      <dd>Acts
+      like <a href="#registerHelper"><code>registerHelper</code></a>,
+      but also registers this helper as 'global', meaning that it will
+      be included by <a href="#getHelpers"><code>getHelpers</code></a>
+      whenever the given <code>predicate</code> returns true when
+      called with the local mode and editor.</dd>
+
       <dt id="Pos"><code><strong>CodeMirror.Pos</strong>(line: integer, ?ch: integer)</code></dt>
       <dd>A constructor for the <code>{line, ch}</code> objects that
       are used to represent positions in editor documents.</dd>
@@ -1881,11 +1906,12 @@ <h2>Addons</h2>
       supporting the following properties:
       <dl>
         <dt><code><strong>rangeFinder</strong>: fn(CodeMirror, Pos)</code></dt>
-        <dd>The function that is used to find foldable ranges. If this
-        is not directly passed, it will
-        call <a href="#getHelper"><code>getHelper</code></a> with
-        a <code>"fold"</code> type to find one that's appropriate for
-        the mode. There are files in
+        <dd id="helper_fold_auto">The function that is used to find
+        foldable ranges. If this is not directly passed, it will
+        default to <code>CodeMirror.fold.auto</code>, which
+        uses <a href="#getHelpers"><code>getHelpers</code></a> with
+        a <code>"fold"</code> type to find folding functions
+        appropriate for the local mode. There are files in
         the <a href="../addon/fold/"><code>addon/fold/</code></a>
         directory providing <code>CodeMirror.fold.brace</code>, which
         finds blocks in brace languages (JavaScript, C, Java,
@@ -1944,8 +1970,8 @@ <h2>Addons</h2>
         <dt><code><strong>rangeFinder</strong>: fn(CodeMirror, Pos)</code></dt>
         <dd>The range-finder function to use when determining whether
         something can be folded. When not
-        given, <a href="#getHelper"><code>getHelper</code></a> will be
-        used to determine a default.</dd>
+        given, <a href="#helper_fold_auto"><code>CodeMirror.fold.auto</code></a>
+        will be used as default.</dd>
       </dl>
       Demo <a href="../demo/folding.html">here</a>.</dd>
 
@@ -2017,9 +2043,17 @@ <h2>Addons</h2>
       is an array of strings or objects (the completions),
       and <code>from</code> and <code>to</code> give the start and end
       of the token that is being completed as <code>{line, ch}</code>
-      objects. If no hinting function is given, the addon will try to
-      use <a href="#getHelper"><code>getHelper</code></a> with
-      the <code>"hint"</code> type to find one. When completions
+      objects.</dd>
+      <dd>If no hinting function is given, the addon will
+      use <code>CodeMirror.hint.auto</code>, with
+      calls <a href="#getHelpers"><code>getHelpers</code></a> with
+      the <code>"hint"</code> type to find applicable hinting
+      functions, and tries them one by one. If that fails, it looks
+      for a <code>"hintWords"</code> helper to fetch a list of
+      completable words for the mode, and
+      uses <code>CodeMirror.hint.fromList</code> to complete from
+      those.</dd>
+      <dd>When completions
       aren't simple strings, they should be objects with the folowing
       properties:
       <dl>
@@ -2523,6 +2557,13 @@ <h2>Writing CodeMirror Modes</h2>
     object specifying a mode, as in
     the <a href="#option_mode"><code>mode</code></a> option.</p>
 
+    <p>If a mode specification wants to add some properties to the
+    resulting mode object, typically for use
+    with <a href="#getHelpers"><code>getHelpers</code></a>, it may
+    contain a <code>modeProps</code> property, which holds an object.
+    This object's properties will be copied to the actual mode
+    object.</p>
+
     <p id="extendMode">Sometimes, it is useful to add or override mode
     object properties from external code.
     The <code><strong>CodeMirror.extendMode</strong></code> function
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ba24bbcf3d..7b1b67dc0e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2977,11 +2977,31 @@ window.CodeMirror = (function() {
     },
 
     getHelper: function(pos, type) {
-      if (!helpers.hasOwnProperty(type)) return;
+      return this.getHelpers(pos, type)[0];
+    },
+
+    getHelpers: function(pos, type) {
+      var found = [];
+      if (!helpers.hasOwnProperty(type)) return helpers;
       var help = helpers[type], mode = this.getModeAt(pos);
-      return mode[type] && help[mode[type]] ||
-        mode.helperType && help[mode.helperType] ||
-        help[mode.name];
+      if (typeof mode[type] == "string") {
+        if (help[mode[type]]) found.push(help[mode[type]]);
+      } else if (mode[type]) {
+        for (var i = 0; i < mode[type].length; i++) {
+          var val = help[mode[type][i]];
+          if (val) found.push(val);
+        }
+      } else if (mode.helperType && help[mode.helperType]) {
+        found.push(help[mode.helperType]);
+      } else if (help[mode.name]) {
+        found.push(help[mode.name]);
+      }
+      for (var i = 0; i < help._global.length; i++) {
+        var cur = help._global[i];
+        if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)
+          found.push(cur.val);
+      }
+      return found;
     },
 
     getStateAfter: function(line, precise) {
@@ -3413,6 +3433,9 @@ window.CodeMirror = (function() {
       }
     }
     modeObj.name = spec.name;
+    if (spec.helperType) modeObj.helperType = spec.helperType;
+    if (spec.modeProps) for (var prop in spec.modeProps)
+      modeObj[prop] = spec.modeProps[prop];
 
     return modeObj;
   };
@@ -3443,9 +3466,13 @@ window.CodeMirror = (function() {
 
   var helpers = CodeMirror.helpers = {};
   CodeMirror.registerHelper = function(type, name, value) {
-    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {};
+    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []};
     helpers[type][name] = value;
   };
+  CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
+    CodeMirror.registerHelper(type, name, value);
+    helpers[type]._global.push({pred: predicate, val: value});
+  };
 
   // UTILITIES
 
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index f6626cd0ea..4e4988dd81 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -203,18 +203,34 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return "string";
   }
 
-  function mimes(ms, mode) {
-    for (var i = 0; i < ms.length; ++i) CodeMirror.defineMIME(ms[i], mode);
+  function def(mimes, mode) {
+    var words = [];
+    function add(obj) {
+      if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop))
+        words.push(prop);
+    }
+    add(mode.keywords);
+    add(mode.builtin);
+    add(mode.atoms);
+    if (words.length) {
+      mode.helperType = mimes[0];
+      CodeMirror.registerHelper("hintWords", mimes[0], words);
+    }
+
+    for (var i = 0; i < mimes.length; ++i)
+      CodeMirror.defineMIME(mimes[i], mode);
   }
 
-  mimes(["text/x-csrc", "text/x-c", "text/x-chdr"], {
+  def(["text/x-csrc", "text/x-c", "text/x-chdr"], {
     name: "clike",
     keywords: words(cKeywords),
     blockKeywords: words("case do else for if switch while struct"),
     atoms: words("null"),
-    hooks: {"#": cppHook}
+    hooks: {"#": cppHook},
+    modeProps: {fold: ["brace", "include"]}
   });
-  mimes(["text/x-c++src", "text/x-c++hdr"], {
+
+  def(["text/x-c++src", "text/x-c++hdr"], {
     name: "clike",
     keywords: words(cKeywords + " asm dynamic_cast namespace reinterpret_cast try bool explicit new " +
                     "static_cast typeid catch operator template typename class friend private " +
@@ -222,7 +238,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "wchar_t"),
     blockKeywords: words("catch class do else finally for if struct switch try while"),
     atoms: words("true false null"),
-    hooks: {"#": cppHook}
+    hooks: {"#": cppHook},
+    modeProps: {fold: ["brace", "include"]}
   });
   CodeMirror.defineMIME("text/x-java", {
     name: "clike",
@@ -238,7 +255,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         stream.eatWhile(/[\w\$_]/);
         return "meta";
       }
-    }
+    },
+    modeProps: {fold: ["brace", "import"]}
   });
   CodeMirror.defineMIME("text/x-csharp", {
     name: "clike",
@@ -303,7 +321,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
     }
   });
-  mimes(["x-shader/x-vertex", "x-shader/x-fragment"], {
+  def(["x-shader/x-vertex", "x-shader/x-fragment"], {
     name: "clike",
     keywords: words("float int bool void " +
                     "vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 " +
@@ -357,6 +375,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                 "gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits " +
                 "gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits " +
                 "gl_MaxDrawBuffers"),
-    hooks: {"#": cppHook}
+    hooks: {"#": cppHook},
+    modeProps: {fold: ["brace", "include"]}
   });
 }());
diff --git a/test/test.js b/test/test.js
index 439f2412af..86b0bfe178 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1625,3 +1625,22 @@ testCM("lineStyleFromMode", function(cm) {
   eq(parenElts[0].nodeName, "DIV");
   is(!/parens.*parens/.test(parenElts[0].className));
 }, {value: "line1: [br] [br]\nline2: (par) (par)\nline3: nothing"});
+
+CodeMirror.registerHelper("xxx", "a", "A");
+CodeMirror.registerHelper("xxx", "b", "B");
+CodeMirror.defineMode("yyy", function() {
+  return {
+    token: function(stream) { stream.skipToEnd(); },
+    xxx: ["a", "b", "q"]
+  };
+});
+CodeMirror.registerGlobalHelper("xxx", "c", function(m) { return m.enableC; }, "C");
+
+testCM("helpers", function(cm) {
+  cm.setOption("mode", "yyy");
+  eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "A/B");
+  cm.setOption("mode", {name: "yyy", modeProps: {xxx: "b", enableC: true}});
+  eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "B/C");
+  cm.setOption("mode", "javascript");
+  eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "");
+});

From 48b40a43680091b05e85bfcf709b32384079a874 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 10 Dec 2013 11:43:36 +0100
Subject: [PATCH 0692/4742] [css mode] Refactor, step 1 (tokenizer)

---
 mode/css/css.js       | 56 +++++++++++++++++++------------------------
 mode/css/scss_test.js | 38 ++++++++++++++---------------
 mode/css/test.js      | 36 ++++++++++++++--------------
 3 files changed, 61 insertions(+), 69 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index d8c30cf33d..655261d887 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -18,57 +18,48 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   function tokenBase(stream, state) {
     var ch = stream.next();
     if (hooks[ch]) {
-      // result[0] is style and result[1] is type
       var result = hooks[ch](stream, state);
       if (result !== false) return result;
     }
-    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("def", stream.current());}
-    else if (ch == "=") ret(null, "compare");
-    else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare");
-    else if (ch == "\"" || ch == "'") {
+    if (ch == "@") {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("def", stream.current());
+    } else if (ch == "=" || (ch == "~" || ch == "|") && stream.eat("=")) {
+      return ret(null, "compare");
+    } else if (ch == "\"" || ch == "'") {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
-    }
-    else if (ch == "#") {
+    } else if (ch == "#") {
       stream.eatWhile(/[\w\\\-]/);
       return ret("atom", "hash");
-    }
-    else if (ch == "!") {
+    } else if (ch == "!") {
       stream.match(/^\s*\w*/);
       return ret("keyword", "important");
-    }
-    else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) {
+    } else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) {
       stream.eatWhile(/[\w.%]/);
       return ret("number", "unit");
-    }
-    else if (ch === "-") {
-      if (/\d/.test(stream.peek())) {
+    } else if (ch === "-") {
+      if (/[\d.]/.test(stream.peek())) {
         stream.eatWhile(/[\w.%]/);
         return ret("number", "unit");
       } else if (stream.match(/^[^-]+-/)) {
         return ret("meta", "meta");
       }
-    }
-    else if (/[,+>*\/]/.test(ch)) {
+    } else if (/[,+>*\/]/.test(ch)) {
       return ret(null, "select-op");
-    }
-    else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
+    } else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
       return ret("qualifier", "qualifier");
-    }
-    else if (ch == ":") {
-      return ret("operator", ch);
-    }
-    else if (/[;{}\[\]\(\)]/.test(ch)) {
+    } else if (/[:;{}\[\]\(\)]/.test(ch)) {
       return ret(null, ch);
-    }
-    else if (ch == "u" && stream.match("rl(")) {
+    } else if (ch == "u" && stream.match("rl(")) {
       stream.backUp(1);
       state.tokenize = tokenParenthesized;
       return ret("property", "variable");
-    }
-    else {
+    } else if (/[\w\\\-]/.test(ch)) {
       stream.eatWhile(/[\w\\\-]/);
       return ret("property", "variable");
+    } else {
+      return ret(null, null);
     }
   }
 
@@ -106,6 +97,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     },
 
     token: function(stream, state) {
+      if (!state.tokenize && stream.eatSpace()) return null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style && typeof style == "object") {
+        type = style[1];
+        style = style[0];
+      }
 
       // Use these terms when applicable (see http://www.xanthir.com/blog/b4E50)
       //
@@ -153,11 +150,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       // sequence of selectors:
       // One or more of the named type of selector chained with commas.
 
-      state.tokenize = state.tokenize || tokenBase;
-      if (state.tokenize == tokenBase && stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (style && typeof style != "string") style = ret(style[0], style[1]);
-
       // Changing style returned based on context
       var context = state.stack[state.stack.length-1];
       if (style == "variable") {
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 9998e2aacb..ec66473f29 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -4,31 +4,31 @@
   function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
 
   MT('url_with_quotation',
-    "[tag foo] { [property background][operator :][string-2 url]([string test.jpg]) }");
+    "[tag foo] { [property background]:[string-2 url]([string test.jpg]) }");
 
   MT('url_with_double_quotes',
-    "[tag foo] { [property background][operator :][string-2 url]([string \"test.jpg\"]) }");
+    "[tag foo] { [property background]:[string-2 url]([string \"test.jpg\"]) }");
 
   MT('url_with_single_quotes',
-    "[tag foo] { [property background][operator :][string-2 url]([string \'test.jpg\']) }");
+    "[tag foo] { [property background]:[string-2 url]([string \'test.jpg\']) }");
 
   MT('string',
     "[def @import] [string \"compass/css3\"]");
 
   MT('important_keyword',
-    "[tag foo] { [property background][operator :][string-2 url]([string \'test.jpg\']) [keyword !important] }");
+    "[tag foo] { [property background]:[string-2 url]([string \'test.jpg\']) [keyword !important] }");
 
   MT('variable',
-    "[variable-2 $blue][operator :][atom #333]");
+    "[variable-2 $blue]:[atom #333]");
 
   MT('variable_as_attribute',
-    "[tag foo] { [property color][operator :][variable-2 $blue] }");
+    "[tag foo] { [property color]:[variable-2 $blue] }");
 
   MT('numbers',
-    "[tag foo] { [property padding][operator :][number 10px] [number 10] [number 10em] [number 8in] }");
+    "[tag foo] { [property padding]:[number 10px] [number 10] [number 10em] [number 8in] }");
 
   MT('number_percentage',
-    "[tag foo] { [property width][operator :][number 80%] }");
+    "[tag foo] { [property width]:[number 80%] }");
 
   MT('selector',
     "[builtin #hello][qualifier .world]{}");
@@ -40,44 +40,44 @@
     "[comment /*foobar*/]");
 
   MT('attribute_with_hyphen',
-    "[tag foo] { [property font-size][operator :][number 10px] }");
+    "[tag foo] { [property font-size]:[number 10px] }");
 
   MT('string_after_attribute',
-    "[tag foo] { [property content][operator :][string \"::\"] }");
+    "[tag foo] { [property content]:[string \"::\"] }");
 
   MT('directives',
     "[def @include] [qualifier .mixin]");
 
   MT('basic_structure',
-    "[tag p] { [property background][operator :][keyword red]; }");
+    "[tag p] { [property background]:[keyword red]; }");
 
   MT('nested_structure',
-    "[tag p] { [tag a] { [property color][operator :][keyword red]; } }");
+    "[tag p] { [tag a] { [property color]:[keyword red]; } }");
 
   MT('mixin',
     "[def @mixin] [tag table-base] {}");
 
   MT('number_without_semicolon',
-    "[tag p] {[property width][operator :][number 12]}",
-    "[tag a] {[property color][operator :][keyword red];}");
+    "[tag p] {[property width]:[number 12]}",
+    "[tag a] {[property color]:[keyword red];}");
 
   MT('atom_in_nested_block',
-    "[tag p] { [tag a] { [property color][operator :][atom #000]; } }");
+    "[tag p] { [tag a] { [property color]:[atom #000]; } }");
 
   MT('interpolation_in_property',
     "[tag foo] { [operator #{][variable-2 $hello][operator }:][number 2]; }");
 
   MT('interpolation_in_selector',
-    "[tag foo][operator #{][variable-2 $hello][operator }] { [property color][operator :][atom #000]; }");
+    "[tag foo][operator #{][variable-2 $hello][operator }] { [property color]:[atom #000]; }");
 
   MT('interpolation_error',
-    "[tag foo][operator #{][error foo][operator }] { [property color][operator :][atom #000]; }");
+    "[tag foo][operator #{][error foo][operator }] { [property color]:[atom #000]; }");
 
   MT("divide_operator",
-    "[tag foo] { [property width][operator :][number 4] [operator /] [number 2] }");
+    "[tag foo] { [property width]:[number 4] [operator /] [number 2] }");
 
   MT('nested_structure_with_id_selector',
-    "[tag p] { [builtin #hello] { [property color][operator :][keyword red]; } }");
+    "[tag p] { [builtin #hello] { [property color]:[keyword red]; } }");
 
   IT('mixin',
     "@mixin container[1 (][2 $a: 10][1 , ][2 $b: 10][1 , ][2 $c: 10]) [1 {]}");
diff --git a/mode/css/test.js b/mode/css/test.js
index 3c52460d9f..76b94327bc 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -62,7 +62,7 @@
 
   // Make sure nesting works with media queries
   MT("atMediaMaxWidthNested",
-     "[def @media] [attribute screen] [operator and] ([property max-width][operator :] [number 25px]) { [tag foo] { } }");
+     "[def @media] [attribute screen] [operator and] ([property max-width]: [number 25px]) { [tag foo] { } }");
 
   MT("tagSelector",
      "[tag foo] { }");
@@ -74,53 +74,53 @@
      "[builtin #foo] { [error #foo] }");
 
   MT("tagSelectorUnclosed",
-     "[tag foo] { [property margin][operator :] [number 0] } [tag bar] { }");
+     "[tag foo] { [property margin]: [number 0] } [tag bar] { }");
 
   MT("tagStringNoQuotes",
-     "[tag foo] { [property font-family][operator :] [variable-2 hello] [variable-2 world]; }");
+     "[tag foo] { [property font-family]: [variable-2 hello] [variable-2 world]; }");
 
   MT("tagStringDouble",
-     "[tag foo] { [property font-family][operator :] [string \"hello world\"]; }");
+     "[tag foo] { [property font-family]: [string \"hello world\"]; }");
 
   MT("tagStringSingle",
-     "[tag foo] { [property font-family][operator :] [string 'hello world']; }");
+     "[tag foo] { [property font-family]: [string 'hello world']; }");
 
   MT("tagColorKeyword",
      "[tag foo] {" +
-       "[property color][operator :] [keyword black];" +
-       "[property color][operator :] [keyword navy];" +
-       "[property color][operator :] [keyword yellow];" +
+       "[property color]: [keyword black];" +
+       "[property color]: [keyword navy];" +
+       "[property color]: [keyword yellow];" +
        "}");
 
   MT("tagColorHex3",
-     "[tag foo] { [property background][operator :] [atom #fff]; }");
+     "[tag foo] { [property background]: [atom #fff]; }");
 
   MT("tagColorHex6",
-     "[tag foo] { [property background][operator :] [atom #ffffff]; }");
+     "[tag foo] { [property background]: [atom #ffffff]; }");
 
   MT("tagColorHex4",
-     "[tag foo] { [property background][operator :] [atom&error #ffff]; }");
+     "[tag foo] { [property background]: [atom&error #ffff]; }");
 
   MT("tagColorHexInvalid",
-     "[tag foo] { [property background][operator :] [atom&error #ffg]; }");
+     "[tag foo] { [property background]: [atom&error #ffg]; }");
 
   MT("tagNegativeNumber",
-     "[tag foo] { [property margin][operator :] [number -5px]; }");
+     "[tag foo] { [property margin]: [number -5px]; }");
 
   MT("tagPositiveNumber",
-     "[tag foo] { [property padding][operator :] [number 5px]; }");
+     "[tag foo] { [property padding]: [number 5px]; }");
 
   MT("tagVendor",
-     "[tag foo] { [meta -foo-][property box-sizing][operator :] [meta -foo-][string-2 border-box]; }");
+     "[tag foo] { [meta -foo-][property box-sizing]: [meta -foo-][string-2 border-box]; }");
 
   MT("tagBogusProperty",
-     "[tag foo] { [property&error barhelloworld][operator :] [number 0]; }");
+     "[tag foo] { [property&error barhelloworld]: [number 0]; }");
 
   MT("tagTwoProperties",
-     "[tag foo] { [property margin][operator :] [number 0]; [property padding][operator :] [number 0]; }");
+     "[tag foo] { [property margin]: [number 0]; [property padding]: [number 0]; }");
 
   MT("tagTwoPropertiesURL",
-     "[tag foo] { [property background][operator :] [string-2 url]([string //example.com/foo.png]); [property padding][operator :] [number 0]; }");
+     "[tag foo] { [property background]: [string-2 url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
 
   MT("commentSGML",
      "[comment <!--comment-->]");

From c2b4f1509ead56bdbae88d5c1489ffd9503b2964 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 10 Dec 2013 14:14:30 +0100
Subject: [PATCH 0693/4742] [css mode] Refactor, step 2 (state machine)

---
 mode/css/css.js       | 491 ++++++++++++++++++++----------------------
 mode/css/scss_test.js |  10 +-
 mode/css/test.js      |  12 +-
 test/mode_test.js     |   7 +-
 4 files changed, 248 insertions(+), 272 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 655261d887..b8081e0530 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -3,22 +3,24 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
 
-  var indentUnit = config.indentUnit || config.tabSize || 2,
-      hooks = parserConfig.hooks || {},
-      atMediaTypes = parserConfig.atMediaTypes || {},
-      atMediaFeatures = parserConfig.atMediaFeatures || {},
+  var indentUnit = config.indentUnit,
+      tokenHooks = parserConfig.tokenHooks,
+      mediaTypes = parserConfig.mediaTypes || {},
+      mediaFeatures = parserConfig.mediaFeatures || {},
       propertyKeywords = parserConfig.propertyKeywords || {},
       colorKeywords = parserConfig.colorKeywords || {},
       valueKeywords = parserConfig.valueKeywords || {},
-      allowNested = !!parserConfig.allowNested,
-      type = null;
+      allowNested = parserConfig.allowNested;
 
+  var type, override;
   function ret(style, tp) { type = tp; return style; }
 
+  // Tokenizers
+
   function tokenBase(stream, state) {
     var ch = stream.next();
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
+    if (tokenHooks[ch]) {
+      var result = tokenHooks[ch](stream, state);
       if (result !== false) return result;
     }
     if (ch == "@") {
@@ -54,10 +56,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     } else if (ch == "u" && stream.match("rl(")) {
       stream.backUp(1);
       state.tokenize = tokenParenthesized;
-      return ret("property", "variable");
+      return ret("property", "word");
     } else if (/[\w\\\-]/.test(ch)) {
       stream.eatWhile(/[\w\\\-]/);
-      return ret("property", "variable");
+      return ret("property", "word");
     } else {
       return ret(null, null);
     }
@@ -73,7 +75,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       }
       if (!escaped) {
         if (nonInclusive) stream.backUp(1);
-        state.tokenize = tokenBase;
+        state.tokenize = null;
       }
       return ret("string", "string");
     };
@@ -84,16 +86,189 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     if (!stream.match(/\s*[\"\']/, false))
       state.tokenize = tokenString(")", true);
     else
-      state.tokenize = tokenBase;
+      state.tokenize = null;
     return ret(null, "(");
   }
 
+  // Context management
+
+  function Context(type, indent, prev) {
+    this.type = type;
+    this.indent = indent;
+    this.prev = prev;
+  }
+
+  function pushContext(state, type) {
+    state.context = new Context(type, state.context.indent + indentUnit, state.context);
+    return type;
+  }
+
+  function popContext(state) {
+    state.context = state.context.prev;
+    return state.context.type;
+  }
+
+  function pass(type, stream, state) {
+    return states[state.context.type](type, stream, state);
+  }
+  function popAndPass(type, stream, state, n) {
+    for (var i = n || 1; i > 0; i--)
+      state.context = state.context.prev;
+    return pass(type, stream, state);
+  }
+
+  // Parser
+
+  var states = {};
+
+  states.top = function(type, _stream, state) {
+    if (type == "{") {
+      return pushContext(state, "block");
+    } else if (type == "}" && state.context.prev) {
+      return popContext(state);
+    } else if (type == "@media") {
+      return pushContext(state, "media");
+    } else if (type && type.charAt(0) == "@") {
+      return pushContext(state, "at");
+    } else if (type == "hash") {
+      override = "builtin";
+    } else if (type == "word") {
+      override = "tag";
+    } else if (type == "variable-definition") {
+      return pushContext(state, "maybeprop");
+    } else if (type == "interpolation") {
+      return pushContext(state, "interpolation");
+    } else if (allowNested && type == "(") {
+      return pushContext(state, "params");
+    }
+    return state.context.type;
+  };
+  states.block = function(type, stream, state) {
+    if (type == "word") {
+      if (propertyKeywords.hasOwnProperty(stream.current().toLowerCase())) {
+        override = "property";
+        return "maybeprop";
+      } else if (allowNested) {
+        override = "tag";
+        return "block";
+      } else {
+        override += " error";
+        return "maybeprop";
+      }
+    } else if (type == "meta") {
+      return "block";
+    } else if (!allowNested && (type == "hash" || type == "qualifier")) {
+      override = "error";
+      return "block";
+    } else {
+      return states.top(type, stream, state);
+    }
+  };
+  states.maybeprop = function(type, _stream, state) {
+    if (type == ":") return pushContext(state, "prop");
+    else return state.context.type;
+  };
+  states.prop = function(type, stream, state) {
+    if (type == ";") return popContext(state);
+    if (type == "}" || type == "{") return popAndPass(type, stream, state);
+    if (type == "(") return pushContext(state, "parens");
+
+    if (type == "hash" && !/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
+      override += " error";
+    } else if (type == "word") {
+      var word = stream.current().toLowerCase();
+      if (valueKeywords.hasOwnProperty(word))
+        override = "string-2";
+      else if (colorKeywords.hasOwnProperty(word))
+        override = "keyword";
+      else
+        override = "variable-2";
+    } else if (type == "interpolation") {
+      return pushContext(state, "interpolation");
+    }
+    return "prop";
+  };
+  states.parens = function(type, stream, state) {
+    if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    if (type == ")") return popContext(state);
+    return "parens";
+  };
+  states.media = function(type, stream, state) {
+    if (type == "(") return "media_parens";
+    if (type == "}") return popAndPass(type, stream, state);
+    if (type == "{") return popContext(state) && pushContext(state, "top");
+    if (type == "word") {
+      var word = stream.current();
+      if (mediaTypes[word]) {
+        override = "attribute";
+        return "mediatype";
+      } else if (/^(only|not)$/.test(word)) {
+        override = "keyword";
+        return "mediatype";
+      } else if (word == "and" || mediaFeatures.hasOwnProperty(word)) {
+        override = "error";
+        return "media";
+      } else {
+        override = "attribute error";
+        return "mediatype";
+      }
+    }
+    return "media";
+  };
+  states.mediatype = function(type, stream, state) {
+    if (type == ",") return "media";
+    if (type == "(") return pushContext(state, "media_parens");
+    if (type == "}") return popAndPass(type, stream, state);
+    if (type == "{") return popContext(state) && pushContext(state, "top");
+    if (type == "word") {
+      var word = stream.current();
+      if (mediaTypes.hasOwnProperty(word))
+        override = "attribute";
+      else if (word == "and")
+        override = "operator";
+      else
+        override = "error";
+    }
+    return "mediatype";
+  };
+  states.media_parens = function(type, stream, state) {
+    if (type == ")") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
+    if (type == "word") {
+      var word = stream.current().toLowerCase();
+      if (propertyKeywords.hasOwnProperty(word))
+        override = "property";
+      else if (word == "and")
+        override = "operator";
+      else
+        override = "error";
+    }
+    return "media_parens";
+  };
+  states.at = function(type, stream, state) {
+    if (type == ";") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    if (type == "word") override = "tag";
+    else if (type == "hash") override = "atom";
+    return "at";
+  };
+  states.interpolation = function(type, stream, state) {
+    if (type == "}") return popContext(state);
+    if (type == "{" || type == ";") return popAndPass(type, stream, state);
+    if (type != "variable") override = "error";
+    return "interpolation";
+  };
+  states.params = function(type, stream, state) {
+    if (type == ")") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    return "params";
+  };
+
   return {
     startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              stack: [],
-              lastToken: null};
+      return {tokenize: null,
+              state: "top",
+              context: new Context("top", base || 0, null)};
     },
 
     token: function(stream, state) {
@@ -103,198 +278,15 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         type = style[1];
         style = style[0];
       }
-
-      // Use these terms when applicable (see http://www.xanthir.com/blog/b4E50)
-      //
-      // rule** or **ruleset:
-      // A selector + braces combo, or an at-rule.
-      //
-      // declaration block:
-      // A sequence of declarations.
-      //
-      // declaration:
-      // A property + colon + value combo.
-      //
-      // property value:
-      // The entire value of a property.
-      //
-      // component value:
-      // A single piece of a property value. Like the 5px in
-      // text-shadow: 0 0 5px blue;. Can also refer to things that are
-      // multiple terms, like the 1-4 terms that make up the background-size
-      // portion of the background shorthand.
-      //
-      // term:
-      // The basic unit of author-facing CSS, like a single number (5),
-      // dimension (5px), string ("foo"), or function. Officially defined
-      //  by the CSS 2.1 grammar (look for the 'term' production)
-      //
-      //
-      // simple selector:
-      // A single atomic selector, like a type selector, an attr selector, a
-      // class selector, etc.
-      //
-      // compound selector:
-      // One or more simple selectors without a combinator. div.example is
-      // compound, div > .example is not.
-      //
-      // complex selector:
-      // One or more compound selectors chained with combinators.
-      //
-      // combinator:
-      // The parts of selectors that express relationships. There are four
-      // currently - the space (descendant combinator), the greater-than
-      // bracket (child combinator), the plus sign (next sibling combinator),
-      // and the tilda (following sibling combinator).
-      //
-      // sequence of selectors:
-      // One or more of the named type of selector chained with commas.
-
-      // Changing style returned based on context
-      var context = state.stack[state.stack.length-1];
-      if (style == "variable") {
-        if (type == "variable-definition") state.stack.push("propertyValue");
-        return state.lastToken = "variable-2";
-      } else if (style == "property") {
-        var word = stream.current().toLowerCase();
-        if (context == "propertyValue") {
-          if (valueKeywords.hasOwnProperty(word)) {
-            style = "string-2";
-          } else if (colorKeywords.hasOwnProperty(word)) {
-            style = "keyword";
-          } else {
-            style = "variable-2";
-          }
-        } else if (context == "rule") {
-          if (!propertyKeywords.hasOwnProperty(word)) {
-            style += " error";
-          }
-        } else if (context == "block") {
-          // if a value is present in both property, value, or color, the order
-          // of preference is property -> color -> value
-          if (propertyKeywords.hasOwnProperty(word)) {
-            style = "property";
-          } else if (colorKeywords.hasOwnProperty(word)) {
-            style = "keyword";
-          } else if (valueKeywords.hasOwnProperty(word)) {
-            style = "string-2";
-          } else {
-            style = "tag";
-          }
-        } else if (!context || context == "@media{") {
-          style = "tag";
-        } else if (context == "@media") {
-          if (atMediaTypes[stream.current()]) {
-            style = "attribute"; // Known attribute
-          } else if (/^(only|not)$/.test(word)) {
-            style = "keyword";
-          } else if (word == "and") {
-            style = "error"; // "and" is only allowed in @mediaType
-          } else if (atMediaFeatures.hasOwnProperty(word)) {
-            style = "error"; // Known property, should be in @mediaType(
-          } else {
-            // Unknown, expecting keyword or attribute, assuming attribute
-            style = "attribute error";
-          }
-        } else if (context == "@mediaType") {
-          if (atMediaTypes.hasOwnProperty(word)) {
-            style = "attribute";
-          } else if (word == "and") {
-            style = "operator";
-          } else if (/^(only|not)$/.test(word)) {
-            style = "error"; // Only allowed in @media
-          } else {
-            // Unknown attribute or property, but expecting property (preceded
-            // by "and"). Should be in parentheses
-            style = "error";
-          }
-        } else if (context == "@mediaType(") {
-          if (propertyKeywords.hasOwnProperty(word)) {
-            // do nothing, remains "property"
-          } else if (atMediaTypes.hasOwnProperty(word)) {
-            style = "error"; // Known property, should be in parentheses
-          } else if (word == "and") {
-            style = "operator";
-          } else if (/^(only|not)$/.test(word)) {
-            style = "error"; // Only allowed in @media
-          } else {
-            style += " error";
-          }
-        } else if (context == "@import") {
-          style = "tag";
-        } else {
-          style = "error";
-        }
-      } else if (style == "atom") {
-        if(!context || context == "@media{" || context == "block") {
-          style = "builtin";
-        } else if (context == "propertyValue") {
-          if (!/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
-            style += " error";
-          }
-        } else {
-          style = "error";
-        }
-      } else if (context == "@media" && type == "{") {
-        style = "error";
-      }
-
-      // Push/pop context stack
-      if (type == "{") {
-        if (context == "@media" || context == "@mediaType") {
-          state.stack[state.stack.length-1] = "@media{";
-        }
-        else {
-          var newContext = allowNested ? "block" : "rule";
-          state.stack.push(newContext);
-        }
-      }
-      else if (type == "}") {
-        if (context == "interpolation") style = "operator";
-        // Pop off end of array until { is reached
-        while(state.stack.length){
-          var removed = state.stack.pop();
-          if(removed.indexOf("{") > -1 || removed == "block" || removed == "rule"){
-            break;
-          }
-        }
-      }
-      else if (type == "interpolation") state.stack.push("interpolation");
-      else if (type == "@media") state.stack.push("@media");
-      else if (type == "@import") state.stack.push("@import");
-      else if (context == "@media" && /\b(keyword|attribute)\b/.test(style))
-        state.stack[state.stack.length-1] = "@mediaType";
-      else if (context == "@mediaType" && stream.current() == ",")
-        state.stack[state.stack.length-1] = "@media";
-      else if (type == "(") {
-        if (context == "@media" || context == "@mediaType") {
-          // Make sure @mediaType is used to avoid error on {
-          state.stack[state.stack.length-1] = "@mediaType";
-          state.stack.push("@mediaType(");
-        }
-        else state.stack.push("(");
-      }
-      else if (type == ")") {
-        // Pop off end of array until ( is reached
-        while(state.stack.length){
-          var removed = state.stack.pop();
-          if(removed.indexOf("(") > -1){
-            break;
-          }
-        }
-      }
-      else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
-      else if (context == "propertyValue" && type == ";") state.stack.pop();
-      else if (context == "@import" && type == ";") state.stack.pop();
-
-      return state.lastToken = style;
+      override = style;
+      state.state = states[state.state](type, stream, state);
+      return override;
     },
 
     indent: function(state, textAfter) {
-      var n = state.stack.length;
-      if (/^\}/.test(textAfter))
-        n -= state.stack[n-1] == "propertyValue" ? 2 : 1;
-      return state.baseIndent + n * indentUnit;
+      var cx = state.context;
+      if (/^\}/.test(textAfter)) cx = cx.prev;
+      return cx.indent;
     },
 
     electricChars: "}",
@@ -313,12 +305,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return keys;
   }
 
-  var atMediaTypes = keySet([
+  var mediaTypes = keySet([
     "all", "aural", "braille", "handheld", "print", "projection", "screen",
     "tty", "tv", "embossed"
   ]);
 
-  var atMediaFeatures = keySet([
+  var mediaFeatures = keySet([
     "width", "min-width", "max-width", "height", "min-height", "max-height",
     "device-width", "min-device-width", "max-device-width", "device-height",
     "min-device-height", "max-device-height", "aspect-ratio",
@@ -545,67 +537,45 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return ["comment", "comment"];
   }
 
+  function tokenSGMLComment(stream, state) {
+    if (stream.skipTo("-->")) {
+      stream.match("-->");
+      state.tokenize = null;
+    } else {
+      stream.skipToEnd();
+    }
+    return ["comment", "comment"];
+  }
+
   CodeMirror.defineMIME("text/css", {
-    atMediaTypes: atMediaTypes,
-    atMediaFeatures: atMediaFeatures,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
     propertyKeywords: propertyKeywords,
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
-    hooks: {
+    tokenHooks: {
       "<": function(stream, state) {
-        function tokenSGMLComment(stream, state) {
-          var dashes = 0, ch;
-          while ((ch = stream.next()) != null) {
-            if (dashes >= 2 && ch == ">") {
-              state.tokenize = null;
-              break;
-            }
-            dashes = (ch == "-") ? dashes + 1 : 0;
-          }
-          return ["comment", "comment"];
-        }
-        if (stream.eat("!")) {
-          state.tokenize = tokenSGMLComment;
-          return tokenSGMLComment(stream, state);
-        }
+        if (!stream.match("!--")) return false;
+        state.tokenize = tokenSGMLComment;
+        return tokenSGMLComment(stream, state);
       },
       "/": function(stream, state) {
-        if (stream.eat("*")) {
-          state.tokenize = tokenCComment;
-          return tokenCComment(stream, state);
-        }
-        return false;
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
       }
     },
     name: "css"
   });
 
   CodeMirror.defineMIME("text/x-scss", {
-    atMediaTypes: atMediaTypes,
-    atMediaFeatures: atMediaFeatures,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
     propertyKeywords: propertyKeywords,
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
     allowNested: true,
-    hooks: {
-      ":": function(stream) {
-        if (stream.match(/\s*{/)) {
-          return [null, "{"];
-        }
-        return false;
-      },
-      "$": function(stream) {
-        stream.match(/^[\w-]+/);
-        if (stream.peek() == ":") {
-          return ["variable", "variable-definition"];
-        }
-        return ["variable", "variable"];
-      },
-      ",": function(stream, state) {
-        if (state.stack[state.stack.length - 1] == "propertyValue" && stream.match(/^ *\$/, false)) {
-          return ["operator", ";"];
-        }
-      },
+    tokenHooks: {
       "/": function(stream, state) {
         if (stream.eat("/")) {
           stream.skipToEnd();
@@ -617,13 +587,20 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
           return ["operator", "operator"];
         }
       },
+      ":": function(stream) {
+        if (stream.match(/\s*{/))
+          return [null, "{"];
+        return false;
+      },
+      "$": function(stream) {
+        stream.match(/^[\w-]+/);
+        if (stream.match(/^\s*:/, false))
+          return ["variable-2", "variable-definition"];
+        return ["variable-2", "variable"];
+      },
       "#": function(stream) {
-        if (stream.eat("{")) {
-          return ["operator", "interpolation"];
-        } else {
-          stream.eatWhile(/[\w\\\-]/);
-          return ["atom", "hash"];
-        }
+        if (!stream.eat("{")) return false;
+        return [null, "interpolation"];
       }
     },
     name: "css"
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index ec66473f29..6218974b12 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -1,5 +1,5 @@
 (function() {
-  var mode = CodeMirror.getMode({tabSize: 1}, "text/x-scss");
+  var mode = CodeMirror.getMode({indentUnit: 1}, "text/x-scss");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
   function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
 
@@ -65,13 +65,13 @@
     "[tag p] { [tag a] { [property color]:[atom #000]; } }");
 
   MT('interpolation_in_property',
-    "[tag foo] { [operator #{][variable-2 $hello][operator }:][number 2]; }");
+    "[tag foo] { #{[variable-2 $hello]}:[number 2]; }");
 
   MT('interpolation_in_selector',
-    "[tag foo][operator #{][variable-2 $hello][operator }] { [property color]:[atom #000]; }");
+    "[tag foo]#{[variable-2 $hello]} { [property color]:[atom #000]; }");
 
   MT('interpolation_error',
-    "[tag foo][operator #{][error foo][operator }] { [property color]:[atom #000]; }");
+    "[tag foo]#{[error foo]} { [property color]:[atom #000]; }");
 
   MT("divide_operator",
     "[tag foo] { [property width]:[number 4] [operator /] [number 2] }");
@@ -80,7 +80,7 @@
     "[tag p] { [builtin #hello] { [property color]:[keyword red]; } }");
 
   IT('mixin',
-    "@mixin container[1 (][2 $a: 10][1 , ][2 $b: 10][1 , ][2 $c: 10]) [1 {]}");
+    "@mixin container[1 ($a: 10, $b: 10, $c: 10]) [1 {]}");
 
   IT('nested',
     "foo [1 { bar ][2 { ][1 } ]}");
diff --git a/mode/css/test.js b/mode/css/test.js
index 76b94327bc..2fa451a624 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -1,12 +1,8 @@
 (function() {
-  var mode = CodeMirror.getMode({tabSize: 1}, "css");
+  var mode = CodeMirror.getMode({indentUnit: 1}, "css");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
   function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
-  // Requires at least one media query
-  MT("atMediaEmpty",
-     "[def @media] [error {] }");
-
   MT("atMediaMultiple",
      "[def @media] [keyword not] [attribute screen] [operator and] ([property color]), [keyword not] [attribute print] [operator and] ([property color]) { }");
 
@@ -58,7 +54,7 @@
 
   // Soft error, because "foobarhello" is not a known property or type.
   MT("atMediaUnknownProperty",
-     "[def @media] [attribute screen] [operator and] ([property&error foobarhello]) { }");
+     "[def @media] [attribute screen] [operator and] ([error foobarhello]) { }");
 
   // Make sure nesting works with media queries
   MT("atMediaMaxWidthNested",
@@ -125,6 +121,10 @@
   MT("commentSGML",
      "[comment <!--comment-->]");
 
+  MT("commentSGML2",
+     "[comment <!--comment]",
+     "[comment -->] [tag div] {}");
+
   IT("tagSelector",
     "strong, em [1 { background][2 : rgba][3 (255, 255, 0, .2][2 )][1 ;]}");
 
diff --git a/test/mode_test.js b/test/mode_test.js
index 4b63cf517c..08deab74b2 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -132,11 +132,10 @@
       if (line == "" && mode.blankLine) mode.blankLine(state);
       /* Start copied code from CodeMirror.highlight */
       while (!stream.eol()) {
-				var compare = mode.token(stream, state), substr = stream.current();
-				if(compareIndentation) compare = mode.indent(state) || null;
+        var compare = mode.token(stream, state), substr = stream.current();
+        if (compareIndentation) compare = mode.indent(state) || null;
         else if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
-
-				stream.start = stream.pos;
+        stream.start = stream.pos;
         if (pos && st[pos-2] == compare && !newLine) {
           st[pos-1] += substr;
         } else if (substr) {

From e42edbc43e338b4024811de4c454b96da5002597 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 10 Dec 2013 15:58:50 +0100
Subject: [PATCH 0694/4742] [css mode] Refactor, step 3 (Less support)

---
 mode/css/css.js       | 120 ++++++++++++++++++++-------------
 mode/css/index.html   |   2 +-
 mode/css/less.html    | 152 ++++++++++++++++++++++++++++++++++++++++++
 mode/css/less_test.js |  48 +++++++++++++
 mode/css/scss.html    |   2 +-
 mode/css/scss_test.js |  18 +++--
 mode/css/test.js      |  56 ++--------------
 mode/gfm/test.js      |   2 +-
 mode/index.html       |   2 +-
 test/index.html       |   1 +
 10 files changed, 298 insertions(+), 105 deletions(-)
 create mode 100644 mode/css/less.html
 create mode 100644 mode/css/less_test.js

diff --git a/mode/css/css.js b/mode/css/css.js
index b8081e0530..df4ab4d2c6 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -119,6 +119,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   // Parser
 
+  function wordAsValue(stream) {
+    var word = stream.current().toLowerCase();
+    if (valueKeywords.hasOwnProperty(word))
+      override = "atom";
+    else if (colorKeywords.hasOwnProperty(word))
+      override = "keyword";
+    else
+      override = "variable";
+  }
+
   var states = {};
 
   states.top = function(type, _stream, state) {
@@ -135,14 +145,17 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     } else if (type == "word") {
       override = "tag";
     } else if (type == "variable-definition") {
-      return pushContext(state, "maybeprop");
+      return "maybeprop";
     } else if (type == "interpolation") {
       return pushContext(state, "interpolation");
+    } else if (type == ":") {
+      return "pseudo";
     } else if (allowNested && type == "(") {
       return pushContext(state, "params");
     }
     return state.context.type;
   };
+
   states.block = function(type, stream, state) {
     if (type == "word") {
       if (propertyKeywords.hasOwnProperty(stream.current().toLowerCase())) {
@@ -164,10 +177,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return states.top(type, stream, state);
     }
   };
+
   states.maybeprop = function(type, _stream, state) {
     if (type == ":") return pushContext(state, "prop");
     else return state.context.type;
   };
+
   states.prop = function(type, stream, state) {
     if (type == ";") return popContext(state);
     if (type == "}" || type == "{") return popAndPass(type, stream, state);
@@ -176,91 +191,71 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     if (type == "hash" && !/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
       override += " error";
     } else if (type == "word") {
-      var word = stream.current().toLowerCase();
-      if (valueKeywords.hasOwnProperty(word))
-        override = "string-2";
-      else if (colorKeywords.hasOwnProperty(word))
-        override = "keyword";
-      else
-        override = "variable-2";
+      wordAsValue(stream);
     } else if (type == "interpolation") {
       return pushContext(state, "interpolation");
     }
     return "prop";
   };
+
   states.parens = function(type, stream, state) {
     if (type == "{" || type == "}") return popAndPass(type, stream, state);
     if (type == ")") return popContext(state);
     return "parens";
   };
-  states.media = function(type, stream, state) {
-    if (type == "(") return "media_parens";
-    if (type == "}") return popAndPass(type, stream, state);
-    if (type == "{") return popContext(state) && pushContext(state, "top");
+
+  states.pseudo = function(type, stream, state) {
     if (type == "word") {
-      var word = stream.current();
-      if (mediaTypes[word]) {
-        override = "attribute";
-        return "mediatype";
-      } else if (/^(only|not)$/.test(word)) {
-        override = "keyword";
-        return "mediatype";
-      } else if (word == "and" || mediaFeatures.hasOwnProperty(word)) {
-        override = "error";
-        return "media";
-      } else {
-        override = "attribute error";
-        return "mediatype";
-      }
+      override = "variable-2";
+      return state.context.type;
     }
-    return "media";
+    return pass(type, stream, state);
   };
-  states.mediatype = function(type, stream, state) {
-    if (type == ",") return "media";
+
+  states.media = function(type, stream, state) {
     if (type == "(") return pushContext(state, "media_parens");
     if (type == "}") return popAndPass(type, stream, state);
-    if (type == "{") return popContext(state) && pushContext(state, "top");
+    if (type == "{") return popContext(state) && pushContext(state, allowNested ? "block" : "top");
+
     if (type == "word") {
-      var word = stream.current();
-      if (mediaTypes.hasOwnProperty(word))
+      var word = stream.current().toLowerCase();
+      if (word == "only" || word == "not" || word == "and")
+        override = "keyword";
+      else if (mediaTypes.hasOwnProperty(word))
         override = "attribute";
-      else if (word == "and")
-        override = "operator";
+      else if (mediaFeatures.hasOwnProperty(word))
+        override = "property";
       else
         override = "error";
     }
-    return "mediatype";
+    return state.context.type;
   };
+
   states.media_parens = function(type, stream, state) {
     if (type == ")") return popContext(state);
     if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
-    if (type == "word") {
-      var word = stream.current().toLowerCase();
-      if (propertyKeywords.hasOwnProperty(word))
-        override = "property";
-      else if (word == "and")
-        override = "operator";
-      else
-        override = "error";
-    }
-    return "media_parens";
+    return states.media(type, stream, state);
   };
+
   states.at = function(type, stream, state) {
     if (type == ";") return popContext(state);
     if (type == "{" || type == "}") return popAndPass(type, stream, state);
     if (type == "word") override = "tag";
-    else if (type == "hash") override = "atom";
+    else if (type == "hash") override = "builtin";
     return "at";
   };
+
   states.interpolation = function(type, stream, state) {
     if (type == "}") return popContext(state);
     if (type == "{" || type == ";") return popAndPass(type, stream, state);
     if (type != "variable") override = "error";
     return "interpolation";
   };
+
   states.params = function(type, stream, state) {
     if (type == ")") return popContext(state);
     if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    if (type == "word") wordAsValue(stream);
     return "params";
   };
 
@@ -605,4 +600,37 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     },
     name: "css"
   });
+
+  CodeMirror.defineMIME("text/x-less", {
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    propertyKeywords: propertyKeywords,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    allowNested: true,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (stream.eat("/")) {
+          stream.skipToEnd();
+          return ["comment", "comment"];
+        } else if (stream.eat("*")) {
+          state.tokenize = tokenCComment;
+          return tokenCComment(stream, state);
+        } else {
+          return ["operator", "operator"];
+        }
+      },
+      "@": function(stream) {
+        if (stream.match(/^(media|import)\b/, false)) return false;
+        stream.eatWhile(/[\w\\\-]/);
+        if (stream.match(/^\s*:/, false))
+          return ["variable-2", "variable-definition"];
+        return ["variable-2", "variable"];
+      },
+      "&": function() {
+        return ["atom", "atom"];
+      }
+    },
+    name: "css"
+  });
 })();
diff --git a/mode/css/index.html b/mode/css/index.html
index 1d1865e2e3..80ef518e90 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -63,7 +63,7 @@ <h2>CSS mode</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/css</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/css</code>, <code>text/x-scss</code> (<a href="scss.html">demo</a>), <code>text/x-less</code> (<a href="less.html">demo</a>).</p>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#css_*">normal</a>,  <a href="../../test/index.html#verbose,css_*">verbose</a>.</p>
 
diff --git a/mode/css/less.html b/mode/css/less.html
new file mode 100644
index 0000000000..1030ca43fe
--- /dev/null
+++ b/mode/css/less.html
@@ -0,0 +1,152 @@
+<!doctype html>
+
+<title>CodeMirror: LESS 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/edit/matchbrackets.js"></script>
+<script src="css.js"></script>
+<style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">LESS</a>
+  </ul>
+</div>
+
+<article>
+<h2>LESS mode</h2>
+<form><textarea id="code" name="code">@media screen and (device-aspect-ratio: 16/9) { … }
+@media screen and (device-aspect-ratio: 1280/720) { … }
+@media screen and (device-aspect-ratio: 2560/1440) { … }
+
+html:lang(fr-be)
+
+tr:nth-child(2n+1) /* represents every odd row of an HTML table */
+
+img:nth-of-type(2n+1) { float: right; }
+img:nth-of-type(2n) { float: left; }
+
+body > h2:not(:first-of-type):not(:last-of-type)
+
+html|*:not(:link):not(:visited)
+*|*:not(:hover)
+p::first-line { text-transform: uppercase }
+
+@namespace foo url(http://www.example.com);
+foo|h1 { color: blue }  /* first rule */
+
+span[hello="Ocean"][goodbye="Land"]
+
+E[foo]{
+  padding:65px;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
+  padding: 0;
+  border: 0;
+}
+.btn {
+  // reset here as of 2.0.3 due to Recess property order
+  border-color: #ccc;
+  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);
+}
+fieldset span button, fieldset span input[type="file"] {
+  font-size:12px;
+	font-family:Arial, Helvetica, sans-serif;
+}
+
+.rounded-corners (@radius: 5px) {
+  border-radius: @radius;
+  -webkit-border-radius: @radius;
+  -moz-border-radius: @radius;
+}
+
+@import url("something.css");
+
+@light-blue:   hsl(190, 50%, 65%);
+
+#menu {
+  position: absolute;
+  width: 100%;
+  z-index: 3;
+  clear: both;
+  display: block;
+  background-color: @blue;
+  height: 42px;
+  border-top: 2px solid lighten(@alpha-blue, 20%);
+  border-bottom: 2px solid darken(@alpha-blue, 25%);
+  .box-shadow(0, 1px, 8px, 0.6);
+  -moz-box-shadow: 0 0 0 #000; // Because firefox sucks.
+
+  &.docked {
+    background-color: hsla(210, 60%, 40%, 0.4);
+  }
+  &:hover {
+    background-color: @blue;
+  }
+
+  #dropdown {
+    margin: 0 0 0 117px;
+    padding: 0;
+    padding-top: 5px;
+    display: none;
+    width: 190px;
+    border-top: 2px solid @medium;
+    color: @highlight;
+    border: 2px solid darken(@medium, 25%);
+    border-left-color: darken(@medium, 15%);
+    border-right-color: darken(@medium, 15%);
+    border-top-width: 0;
+    background-color: darken(@medium, 10%);
+    ul {
+      padding: 0px;  
+    }
+    li {
+      font-size: 14px;
+      display: block;
+      text-align: left;
+      padding: 0;
+      border: 0;
+      a {
+        display: block;
+        padding: 0px 15px;  
+        text-decoration: none;
+        color: white;  
+        &:hover {
+          background-color: darken(@medium, 15%);
+          text-decoration: none;
+        }
+      }
+    }
+    .border-radius(5px, bottom);
+    .box-shadow(0, 6px, 8px, 0.5);
+  }
+}
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers : true,
+        matchBrackets : true,
+        mode: "text/x-less"
+      });
+    </script>
+
+    <p>The LESS mode is a sub-mode of the <a href="index.html">CSS mode</a> (defined in <code>css.js</code>.</p>
+
+    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#less_*">normal</a>,  <a href="../../test/index.html#verbose,less_*">verbose</a>.</p>
+  </article>
diff --git a/mode/css/less_test.js b/mode/css/less_test.js
new file mode 100644
index 0000000000..9b065f23d8
--- /dev/null
+++ b/mode/css/less_test.js
@@ -0,0 +1,48 @@
+(function() {
+  "use strict";
+
+  var mode = CodeMirror.getMode({indentUnit: 1}, "text/x-less");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "less"); }
+
+  MT("variable",
+     "[variable-2 @base]: [atom #f04615];",
+     "[qualifier .class] {",
+     "  [property width]: [variable percentage]([number 0.5]); [comment // returns `50%`]",
+     "  [property color]: [variable saturate]([variable-2 @base], [number 5%]);",
+     "}");
+
+  MT("amp",
+     "[qualifier .child], [qualifier .sibling] {",
+     "  [qualifier .parent] [atom &] {",
+     "    [property color]: [keyword black];",
+     "  }",
+     "  [atom &] + [atom &] {",
+     "    [property color]: [keyword red];",
+     "  }",
+     "}");
+
+  MT("mixin",
+     "[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",
+     "  [property color]: [variable darken]([variable-2 @color], [number 10%]);",
+     "}",
+     "[qualifier .mixin] ([variable light]; [variable-2 @color]) {",
+     "  [property color]: [variable lighten]([variable-2 @color], [number 10%]);",
+     "}",
+     "[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",
+     "  [property display]: [atom block];",
+     "}",
+     "[variable-2 @switch]: [variable light];",
+     "[qualifier .class] {",
+     "  [qualifier .mixin]([variable-2 @switch]; [atom #888]);",
+     "}");
+
+  MT("nest",
+     "[qualifier .one] {",
+     "  [def @media] ([property width]: [number 400px]) {",
+     "    [property font-size]: [number 1.2em];",
+     "    [def @media] [attribute print] [keyword and] [property color] {",
+     "      [property color]: [keyword blue];",
+     "    }",
+     "  }",
+     "}");
+})();
diff --git a/mode/css/scss.html b/mode/css/scss.html
index 72781c0dc3..0677d08fe1 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -150,7 +150,7 @@ <h2>SCSS mode</h2>
       });
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/scss</code>.</p>
+    <p>The SCSS mode is a sub-mode of the <a href="index.html">CSS mode</a> (defined in <code>css.js</code>.</p>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#scss_*">normal</a>,  <a href="../../test/index.html#verbose,scss_*">verbose</a>.</p>
 
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 6218974b12..ed5de83801 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -4,19 +4,19 @@
   function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
 
   MT('url_with_quotation',
-    "[tag foo] { [property background]:[string-2 url]([string test.jpg]) }");
+    "[tag foo] { [property background]:[atom url]([string test.jpg]) }");
 
   MT('url_with_double_quotes',
-    "[tag foo] { [property background]:[string-2 url]([string \"test.jpg\"]) }");
+    "[tag foo] { [property background]:[atom url]([string \"test.jpg\"]) }");
 
   MT('url_with_single_quotes',
-    "[tag foo] { [property background]:[string-2 url]([string \'test.jpg\']) }");
+    "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) }");
 
   MT('string',
     "[def @import] [string \"compass/css3\"]");
 
   MT('important_keyword',
-    "[tag foo] { [property background]:[string-2 url]([string \'test.jpg\']) [keyword !important] }");
+    "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) [keyword !important] }");
 
   MT('variable',
     "[variable-2 $blue]:[atom #333]");
@@ -80,7 +80,7 @@
     "[tag p] { [builtin #hello] { [property color]:[keyword red]; } }");
 
   IT('mixin',
-    "@mixin container[1 ($a: 10, $b: 10, $c: 10]) [1 {]}");
+    "[1 @mixin container ($a: 10, $b: 10, $c: 10) {]}");
 
   IT('nested',
     "foo [1 { bar ][2 { ][1 } ]}");
@@ -90,4 +90,12 @@
 
   IT('parentheses',
     "foo [1 { color][2 : darken][3 ($blue, 9%][2 )][1 ; ]}");
+
+  IT('vardef',
+     "$name[1 : 'val'];",
+     "tag [1 {]",
+     "[1  inner ][2 {]",
+     "[2    margin][3 : 3px][2 ;]",
+     "[2  ][1 }]",
+     "}");
 })();
diff --git a/mode/css/test.js b/mode/css/test.js
index 2fa451a624..cbfbef46cc 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -3,62 +3,18 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
   function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
-  MT("atMediaMultiple",
-     "[def @media] [keyword not] [attribute screen] [operator and] ([property color]), [keyword not] [attribute print] [operator and] ([property color]) { }");
-
-  MT("atMediaCheckStack",
-     "[def @media] [attribute screen] { } [tag foo] { }");
-
-  MT("atMediaCheckStack",
-     "[def @media] [attribute screen] ([property color]) { } [tag foo] { }");
-
-  MT("atMediaPropertyOnly",
-     "[def @media] ([property color]) { } [tag foo] { }");
-
-  MT("atMediaCheckStackInvalidAttribute",
-     "[def @media] [attribute&error foobarhello] { [tag foo] { } }");
-
-  MT("atMediaCheckStackInvalidAttribute",
-     "[def @media] [attribute&error foobarhello] { } [tag foo] { }");
-
-  // Error, because "and" is only allowed immediately preceding a media expression
-  MT("atMediaInvalidAttribute",
-     "[def @media] [attribute&error foobarhello] { }");
-
-  // Error, because "and" is only allowed immediately preceding a media expression
-  MT("atMediaInvalidAnd",
-     "[def @media] [error and] [attribute screen] { }");
-
-  // Error, because "not" is only allowed as the first item in each media query
-  MT("atMediaInvalidNot",
-     "[def @media] [attribute screen] [error not] ([error not]) { }");
-
-  // Error, because "only" is only allowed as the first item in each media query
-  MT("atMediaInvalidOnly",
-     "[def @media] [attribute screen] [error only] ([error only]) { }");
-
   // Error, because "foobarhello" is neither a known type or property, but
   // property was expected (after "and"), and it should be in parenthese.
   MT("atMediaUnknownType",
-     "[def @media] [attribute screen] [operator and] [error foobarhello] { }");
-
-  // Error, because "color" is not a known type, but is a known property, and
-  // should be in parentheses.
-  MT("atMediaInvalidType",
-     "[def @media] [attribute screen] [operator and] [error color] { }");
-
-  // Error, because "print" is not a known property, but is a known type,
-  // and should not be in parenthese.
-  MT("atMediaInvalidProperty",
-     "[def @media] [attribute screen] [operator and] ([error print]) { }");
+     "[def @media] [attribute screen] [keyword and] [error foobarhello] { }");
 
   // Soft error, because "foobarhello" is not a known property or type.
   MT("atMediaUnknownProperty",
-     "[def @media] [attribute screen] [operator and] ([error foobarhello]) { }");
+     "[def @media] [attribute screen] [keyword and] ([error foobarhello]) { }");
 
   // Make sure nesting works with media queries
   MT("atMediaMaxWidthNested",
-     "[def @media] [attribute screen] [operator and] ([property max-width]: [number 25px]) { [tag foo] { } }");
+     "[def @media] [attribute screen] [keyword and] ([property max-width]: [number 25px]) { [tag foo] { } }");
 
   MT("tagSelector",
      "[tag foo] { }");
@@ -73,7 +29,7 @@
      "[tag foo] { [property margin]: [number 0] } [tag bar] { }");
 
   MT("tagStringNoQuotes",
-     "[tag foo] { [property font-family]: [variable-2 hello] [variable-2 world]; }");
+     "[tag foo] { [property font-family]: [variable hello] [variable world]; }");
 
   MT("tagStringDouble",
      "[tag foo] { [property font-family]: [string \"hello world\"]; }");
@@ -107,7 +63,7 @@
      "[tag foo] { [property padding]: [number 5px]; }");
 
   MT("tagVendor",
-     "[tag foo] { [meta -foo-][property box-sizing]: [meta -foo-][string-2 border-box]; }");
+     "[tag foo] { [meta -foo-][property box-sizing]: [meta -foo-][atom border-box]; }");
 
   MT("tagBogusProperty",
      "[tag foo] { [property&error barhelloworld]: [number 0]; }");
@@ -116,7 +72,7 @@
      "[tag foo] { [property margin]: [number 0]; [property padding]: [number 0]; }");
 
   MT("tagTwoPropertiesURL",
-     "[tag foo] { [property background]: [string-2 url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
+     "[tag foo] { [property background]: [atom url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
 
   MT("commentSGML",
      "[comment <!--comment-->]");
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 4cf46fe5a5..7d17517e18 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -114,7 +114,7 @@
 
   MT("notALink",
      "[comment ```css]",
-     "[tag foo] {[property color][operator :][keyword black];}",
+     "[tag foo] {[property color]:[keyword black];}",
      "[comment ```][link http://www.example.com/]");
 
   MT("notALink",
diff --git a/mode/index.html b/mode/index.html
index 81abc42d8c..e332f84f70 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -61,7 +61,7 @@ <h2>Language modes</h2>
       <li><a href="javascript/index.html">JavaScript</a></li>
       <li><a href="jinja2/index.html">Jinja2</a></li>
       <li><a href="julia/index.html">Julia</a></li>
-      <li><a href="less/index.html">LESS</a></li>
+      <li><a href="css/less.html">LESS</a></li>
       <li><a href="livescript/index.html">LiveScript</a></li>
       <li><a href="lua/index.html">Lua</a></li>
       <li><a href="markdown/index.html">Markdown</a> (<a href="gfm/index.html">GitHub-flavour</a>)</li>
diff --git a/test/index.html b/test/index.html
index bec6c0bd29..ac12b2274c 100644
--- a/test/index.html
+++ b/test/index.html
@@ -78,6 +78,7 @@ <h2>Test Suite</h2>
     <script src="../mode/css/css.js"></script>
     <script src="../mode/css/test.js"></script>
     <script src="../mode/css/scss_test.js"></script>
+    <script src="../mode/css/less_test.js"></script>
     <script src="../mode/xml/xml.js"></script>
     <script src="../mode/htmlmixed/htmlmixed.js"></script>
     <script src="../mode/ruby/ruby.js"></script>

From 6ad770675b70b08d0523e22aea1ef17161d3f8dc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 12:20:33 +0100
Subject: [PATCH 0695/4742] [css mode] Add a hintWords helper value

---
 addon/hint/show-hint.js |  1 -
 mode/css/css.js         | 23 +++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 31e919dcbb..76f020cf0a 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -302,7 +302,6 @@
 
   CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    if (!/^[\w$_]*$/.test(token.string)) return null;
     var found = [];
     for (var i = 0; i < options.words.length; i++) {
       var word = options.words[i];
diff --git a/mode/css/css.js b/mode/css/css.js
index df4ab4d2c6..2a211dc3c7 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -300,12 +300,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return keys;
   }
 
-  var mediaTypes = keySet([
+  var mediaTypes_ = [
     "all", "aural", "braille", "handheld", "print", "projection", "screen",
     "tty", "tv", "embossed"
-  ]);
+  ], mediaTypes = keySet(mediaTypes_);
 
-  var mediaFeatures = keySet([
+  var mediaFeatures_ = [
     "width", "min-width", "max-width", "height", "min-height", "max-height",
     "device-width", "min-device-width", "max-device-width", "device-height",
     "min-device-height", "max-device-height", "aspect-ratio",
@@ -314,9 +314,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "max-color", "color-index", "min-color-index", "max-color-index",
     "monochrome", "min-monochrome", "max-monochrome", "resolution",
     "min-resolution", "max-resolution", "scan", "grid"
-  ]);
+  ], mediaFeatures = keySet(mediaFeatures_);
 
-  var propertyKeywords = keySet([
+  var propertyKeywords_ = [
     "align-content", "align-items", "align-self", "alignment-adjust",
     "alignment-baseline", "anchor-point", "animation", "animation-delay",
     "animation-direction", "animation-duration", "animation-iteration-count",
@@ -404,9 +404,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
     "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
     "glyph-orientation-vertical", "kerning", "text-anchor", "writing-mode"
-  ]);
+  ], propertyKeywords = keySet(propertyKeywords_);
 
-  var colorKeywords = keySet([
+  var colorKeywords_ = [
     "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
     "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
     "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue",
@@ -433,9 +433,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",
     "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
     "whitesmoke", "yellow", "yellowgreen"
-  ]);
+  ], colorKeywords = keySet(colorKeywords_);
 
-  var valueKeywords = keySet([
+  var valueKeywords_ = [
     "above", "absolute", "activeborder", "activecaption", "afar",
     "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate",
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
@@ -518,7 +518,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
     "window", "windowframe", "windowtext", "x-large", "x-small", "xor",
     "xx-large", "xx-small"
-  ]);
+  ], valueKeywords = keySet(valueKeywords_);
+
+  var allWords = mediaTypes_.concat(mediaFeatures_).concat(propertyKeywords_).concat(colorKeywords_).concat(valueKeywords_);
+  CodeMirror.registerHelper("hintWords", "css", allWords);
 
   function tokenCComment(stream, state) {
     var maybeEnd = false, ch;

From fad3f49c26d706105969cc2d80919766a855ebbe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 12:52:50 +0100
Subject: [PATCH 0696/4742] [css-hint addon] Rewrite to work with overhauled
 css mode

---
 addon/hint/css-hint.js | 62 ++++++++++++++++++++----------------------
 doc/manual.html        |  2 +-
 mode/css/css.js        |  8 ++++--
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 2b15300d0c..43bdf5de02 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -1,50 +1,46 @@
 (function () {
   "use strict";
 
-  function getHints(cm) {
+  var pseudoClasses = {link: 1, visited: 1, active: 1, hover: 1, focus: 1,
+                       "first-letter": 1, "first-line": 1, "first-child": 1,
+                       before: 1, after: 1, lang: 1};
+
+  CodeMirror.registerHelper("hint", "css", function(cm) {
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "css") return;
 
-    // If it's not a 'word-style' token, ignore the token.
-    if (!/^[\w$_-]*$/.test(token.string)) {
-      token = {
-        start: cur.ch, end: cur.ch, string: "", state: token.state,
-        type: null
-      };
-      var stack = token.state.stack;
-      var lastToken = stack && stack.length > 0 ? stack[stack.length - 1] : "";
-      if (token.string == ":" || lastToken.indexOf("property") == 0)
-        token.type = "variable";
-      else if (token.string == "{" || lastToken.indexOf("rule") == 0)
-        token.type = "property";
+    var word = token.string, start = token.start, end = token.end;
+    if (/[^\w$_-]/.test(word)) {
+      word = ""; start = end = cur.ch;
     }
 
-    if (!token.type)
-      return;
-
     var spec = CodeMirror.resolveMode("text/css");
-    var keywords = null;
-    if (token.type.indexOf("property") == 0)
-      keywords = spec.propertyKeywords;
-    else if (token.type.indexOf("variable") == 0)
-      keywords = spec.valueKeywords;
-
-    if (!keywords)
-      return;
 
     var result = [];
-    for (var name in keywords) {
-      if (name.indexOf(token.string) == 0 /* > -1 */)
-        result.push(name);
+    function add(keywords) {
+      for (var name in keywords)
+        if (!word || name.indexOf(word) == 0)
+          result.push(name);
     }
 
-    return {
+    var st = token.state.state;
+    if (st == "pseudo" || token.type == "variable-3") {
+      add(pseudoClasses);
+    } else if (st == "block" || st == "maybeprop") {
+      add(spec.propertyKeywords);
+    } else if (st == "prop" || st == "parens" || st == "at" || st == "params") {
+      add(spec.valueKeywords);
+      add(spec.colorKeywords);
+    } else if (st == "media" || st == "media_parens") {
+      add(spec.mediaTypes);
+      add(spec.mediaFeatures);
+    }
+
+    if (result.length) return {
       list: result,
-      from: CodeMirror.Pos(cur.line, token.start),
-      to: CodeMirror.Pos(cur.line, token.end)
+      from: CodeMirror.Pos(cur.line, start),
+      to: CodeMirror.Pos(cur.line, end)
     };
-  }
-
-  CodeMirror.registerHelper("hint", "css", getHints);
+  });
 })();
diff --git a/doc/manual.html b/doc/manual.html
index 0dc120ddf3..957ab347c5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2159,7 +2159,7 @@ <h2>Addons</h2>
       the <a href="../demo/html5complete.html">demo</a>.</dd>
 
       <dt id="addon_css-hint"><a href="../addon/hint/css-hint.js"><code>hint/css-hint.js</code></a></dt>
-      <dd>A minimal hinting function for CSS code.
+      <dd>A hinting function for CSS, SCSS, or LESS code.
       Defines <code>CodeMirror.hint.css</code>.</dd>
 
       <dt id="addon_python-hint"><a href="../addon/hint/python-hint.js"><code>hint/python-hint.js</code></a></dt>
diff --git a/mode/css/css.js b/mode/css/css.js
index 2a211dc3c7..11394077ca 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -206,7 +206,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   states.pseudo = function(type, stream, state) {
     if (type == "word") {
-      override = "variable-2";
+      override = "variable-3";
       return state.context.type;
     }
     return pass(type, stream, state);
@@ -601,7 +601,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         return [null, "interpolation"];
       }
     },
-    name: "css"
+    name: "css",
+    helperType: "scss"
   });
 
   CodeMirror.defineMIME("text/x-less", {
@@ -634,6 +635,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         return ["atom", "atom"];
       }
     },
-    name: "css"
+    name: "css",
+    helperType: "less"
   });
 })();

From c1064c8d7b1c18547bfeeaece59b5992f6b64195 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 14:20:28 +0100
Subject: [PATCH 0697/4742] [css mode] Fix bad context management

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 11394077ca..1723fe84ed 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -178,9 +178,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     }
   };
 
-  states.maybeprop = function(type, _stream, state) {
+  states.maybeprop = function(type, stream, state) {
     if (type == ":") return pushContext(state, "prop");
-    else return state.context.type;
+    return pass(type, stream, state);
   };
 
   states.prop = function(type, stream, state) {
@@ -280,7 +280,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
     indent: function(state, textAfter) {
       var cx = state.context;
-      if (/^\}/.test(textAfter)) cx = cx.prev;
+      if (/^\}/.test(textAfter) && cx.prev) cx = cx.prev;
       return cx.indent;
     },
 

From b29f875bf71f2fcef9ce35f5b77c5d67adc2b5bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 14:40:01 +0100
Subject: [PATCH 0698/4742] [css mode] Tweak indentation when opening @media
 block on new line

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 1723fe84ed..478bc4132f 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -281,6 +281,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     indent: function(state, textAfter) {
       var cx = state.context;
       if (/^\}/.test(textAfter) && cx.prev) cx = cx.prev;
+      if (/^\{/.test(textAfter) && cx.type == "media") cx = cx.prev;
       return cx.indent;
     },
 

From febe3acfe42bc1f94279fe6dd81a93946d12fa32 Mon Sep 17 00:00:00 2001
From: eborden <evan@evan-borden.com>
Date: Wed, 11 Dec 2013 11:44:31 -0500
Subject: [PATCH 0699/4742] [javascript-lint addon] Put JSHint options in a
 sub-object

Passing options causes issues in jshint since lint options are also
passed. These options cause bad option errors in the annotation list.
---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index b502ee41f1..6121735d3f 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -112,7 +112,7 @@
     if (options.async)
       options.getAnnotations(cm, updateLinting, options);
     else
-      updateLinting(cm, options.getAnnotations(cm.getValue(), options));
+      updateLinting(cm, options.getAnnotations(cm.getValue(), options.options));
   }
 
   function updateLinting(cm, annotationsNotSorted) {

From d3c3a5a2b8df669ed12fe90df4d62a143c0a9d25 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 14:47:16 +0100
Subject: [PATCH 0700/4742] [css mode] Fix tokenization of paren-wrapped values

Closes #2048
---
 mode/css/css.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 478bc4132f..265b5c9d48 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -69,14 +69,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return function(stream, state) {
       var escaped = false, ch;
       while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped)
+        if (ch == quote && !escaped) {
+          if (nonInclusive) stream.backUp(1);
           break;
+        }
         escaped = !escaped && ch == "\\";
       }
-      if (!escaped) {
-        if (nonInclusive) stream.backUp(1);
-        state.tokenize = null;
-      }
+      if (!escaped) state.tokenize = null;
       return ret("string", "string");
     };
   }

From 0b17e247b036bcb484f36c9f966ea8dbbcb6fa72 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 15:04:52 +0100
Subject: [PATCH 0701/4742] [css mode] Fix previous fix
 (d3c3a5a2b8df669ed12fe90df4d62a143c0a9d25)

Issue #2048
---
 mode/css/css.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 265b5c9d48..cfeafbd5e8 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -65,17 +65,17 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     }
   }
 
-  function tokenString(quote, nonInclusive) {
+  function tokenString(quote) {
     return function(stream, state) {
       var escaped = false, ch;
       while ((ch = stream.next()) != null) {
         if (ch == quote && !escaped) {
-          if (nonInclusive) stream.backUp(1);
+          if (quote == ")") stream.backUp(1);
           break;
         }
         escaped = !escaped && ch == "\\";
       }
-      if (!escaped) state.tokenize = null;
+      if (ch == quote || !escaped && quote != ")") state.tokenize = null;
       return ret("string", "string");
     };
   }
@@ -83,7 +83,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   function tokenParenthesized(stream, state) {
     stream.next(); // Must be '('
     if (!stream.match(/\s*[\"\']/, false))
-      state.tokenize = tokenString(")", true);
+      state.tokenize = tokenString(")");
     else
       state.tokenize = null;
     return ret(null, "(");

From a76bd4f2d28068f12aff0713dd0300a51eb8d3d3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 15:30:09 +0100
Subject: [PATCH 0702/4742] [css mode] Revise indentation model

Issue #2049
---
 mode/css/css.js | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index cfeafbd5e8..d1a1def6f7 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -97,8 +97,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     this.prev = prev;
   }
 
-  function pushContext(state, type) {
-    state.context = new Context(type, state.context.indent + indentUnit, state.context);
+  function pushContext(state, stream, type) {
+    state.context = new Context(type, stream.indentation() + indentUnit, state.context);
     return type;
   }
 
@@ -130,15 +130,15 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   var states = {};
 
-  states.top = function(type, _stream, state) {
+  states.top = function(type, stream, state) {
     if (type == "{") {
-      return pushContext(state, "block");
+      return pushContext(state, stream, "block");
     } else if (type == "}" && state.context.prev) {
       return popContext(state);
     } else if (type == "@media") {
-      return pushContext(state, "media");
+      return pushContext(state, stream, "media");
     } else if (type && type.charAt(0) == "@") {
-      return pushContext(state, "at");
+      return pushContext(state, stream, "at");
     } else if (type == "hash") {
       override = "builtin";
     } else if (type == "word") {
@@ -146,11 +146,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     } else if (type == "variable-definition") {
       return "maybeprop";
     } else if (type == "interpolation") {
-      return pushContext(state, "interpolation");
+      return pushContext(state, stream, "interpolation");
     } else if (type == ":") {
       return "pseudo";
     } else if (allowNested && type == "(") {
-      return pushContext(state, "params");
+      return pushContext(state, stream, "params");
     }
     return state.context.type;
   };
@@ -178,21 +178,21 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   };
 
   states.maybeprop = function(type, stream, state) {
-    if (type == ":") return pushContext(state, "prop");
+    if (type == ":") return pushContext(state, stream, "prop");
     return pass(type, stream, state);
   };
 
   states.prop = function(type, stream, state) {
     if (type == ";") return popContext(state);
     if (type == "}" || type == "{") return popAndPass(type, stream, state);
-    if (type == "(") return pushContext(state, "parens");
+    if (type == "(") return pushContext(state, stream, "parens");
 
     if (type == "hash" && !/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
       override += " error";
     } else if (type == "word") {
       wordAsValue(stream);
     } else if (type == "interpolation") {
-      return pushContext(state, "interpolation");
+      return pushContext(state, stream, "interpolation");
     }
     return "prop";
   };
@@ -212,9 +212,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   };
 
   states.media = function(type, stream, state) {
-    if (type == "(") return pushContext(state, "media_parens");
+    if (type == "(") return pushContext(state, stream, "media_parens");
     if (type == "}") return popAndPass(type, stream, state);
-    if (type == "{") return popContext(state) && pushContext(state, allowNested ? "block" : "top");
+    if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
 
     if (type == "word") {
       var word = stream.current().toLowerCase();
@@ -278,10 +278,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     },
 
     indent: function(state, textAfter) {
-      var cx = state.context;
-      if (/^\}/.test(textAfter) && cx.prev) cx = cx.prev;
-      if (/^\{/.test(textAfter) && cx.type == "media") cx = cx.prev;
-      return cx.indent;
+      var cx = state.context, ch = textAfter && textAfter.charAt(0);
+      var indent = cx.indent;
+      if (cx.prev &&
+          (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation") ||
+           ch == ")" && (cx.type == "parens" || cx.type == "params" || cx.type == "media_parens") ||
+           ch == "{" && (cx.type == "at" || cx.type == "media"))) {
+        indent = cx.indent - indentUnit;
+        cx = cx.prev;
+      }
+      return indent;
     },
 
     electricChars: "}",

From f943b027c8646a055835b6c23f5de655ed803f0d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 16:38:37 +0100
Subject: [PATCH 0703/4742] [javascript mode] Fix bug in parsing of
 array/iterator comprehension

---
 mode/javascript/javascript.js |  9 ++++-----
 mode/javascript/test.js       | 36 ++++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c49b873317..c113fcb433 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -15,7 +15,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     var jsKeywords = {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C,
+      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, "debugger": C,
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
       "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
@@ -304,7 +304,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ";") return cont();
     if (type == "if") return cont(pushlex("form"), expression, statement, poplex, maybeelse);
     if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), forspec, poplex, statement, poplex);
+    if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
     if (type == "variable") return cont(pushlex("stat"), maybelabel);
     if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
                                       block, poplex, poplex);
@@ -370,7 +370,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
   }
   function quasi(value) {
-    if (!value) debugger;
     if (value.slice(value.length - 2) != "${") return cont();
     return cont(expression, continueQuasi);
   }
@@ -474,7 +473,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "keyword b" && value == "else") return cont(pushlex("form"), statement, poplex);
   }
   function forspec(type) {
-    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"));
+    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
   }
   function forspec1(type) {
     if (type == "var") return cont(vardef, expect(";"), forspec2);
@@ -538,7 +537,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(expressionNoComma, maybeArrayComprehension);
   }
   function maybeArrayComprehension(type) {
-    if (type == "for") return pass(comprehension);
+    if (type == "for") return pass(comprehension, expect("]"));
     if (type == ",") return cont(commasep(expressionNoComma, "]"));
     return pass(commasep(expressionNoComma, "]"));
   }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 760152499e..8abd633542 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -63,10 +63,44 @@
 
   MT("comprehension",
      "[keyword function] [variable f]() {",
-     "  [[ [variable x] + [number 1] [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
+     "  [[([variable x] + [number 1]) [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
      "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] === [string 'blue']));",
      "}");
 
   MT("quasi",
      "[variable re][string-2 `fofdlakj${][variable x] + ([variable re][string-2 `foo`]) + [number 1][string-2 }fdsa`] + [number 2]");
+
+  MT("indent_statement",
+     "[keyword var] [variable x] = [number 10]",
+     "[variable x] += [variable y] +",
+     "  [atom Infinity]",
+     "[keyword debugger];");
+
+  MT("indent_if",
+     "[keyword if] ([number 1])",
+     "  [keyword break];",
+     "[keyword else] [keyword if] ([number 2])",
+     "  [keyword continue];",
+     "[keyword else]",
+     "  [number 10];",
+     "[keyword if] ([number 1]) {",
+     "  [keyword break];",
+     "} [keyword else] [keyword if] ([number 2]) {",
+     "  [keyword continue];",
+     "} [keyword else] {",
+     "  [number 10];",
+     "}");
+
+  MT("indent_for",
+     "[keyword for] ([keyword var] [variable i] = [number 0];",
+     "     [variable i] < [number 100];",
+     "     [variable i]++)",
+     "  [variable doSomething]([variable i]);",
+     "[keyword debugger];");
+
+  MT("indent_c_style",
+     "[keyword function] [variable foo]()",
+     "{",
+     "  [keyword debugger];",
+     "}");
 })();

From d09247c69a051868fd966b5b8b19e91bc998dc8c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 16:47:45 +0100
Subject: [PATCH 0704/4742] [test driver] Different approach to indentation
 tests

All tests now check whether indentation from mode corresponds
to the indentation in the test source. test.indentation is
gone.
---
 mode/css/less_test.js |   2 +-
 mode/css/scss_test.js |  40 +++++++++-------
 mode/css/test.js      |  55 +++++++++++++---------
 mode/haml/haml.js     |   4 --
 mode/haml/test.js     |   2 +-
 test/mode_test.js     | 103 +++++++++++++++---------------------------
 6 files changed, 95 insertions(+), 111 deletions(-)

diff --git a/mode/css/less_test.js b/mode/css/less_test.js
index 9b065f23d8..ea64f91d12 100644
--- a/mode/css/less_test.js
+++ b/mode/css/less_test.js
@@ -1,7 +1,7 @@
 (function() {
   "use strict";
 
-  var mode = CodeMirror.getMode({indentUnit: 1}, "text/x-less");
+  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-less");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "less"); }
 
   MT("variable",
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index ed5de83801..c51cb42bba 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -1,7 +1,6 @@
 (function() {
-  var mode = CodeMirror.getMode({indentUnit: 1}, "text/x-scss");
+  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
-  function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
 
   MT('url_with_quotation',
     "[tag foo] { [property background]:[atom url]([string test.jpg]) }");
@@ -79,23 +78,30 @@
   MT('nested_structure_with_id_selector',
     "[tag p] { [builtin #hello] { [property color]:[keyword red]; } }");
 
-  IT('mixin',
-    "[1 @mixin container ($a: 10, $b: 10, $c: 10) {]}");
+  MT('indent_mixin',
+     "[def @mixin] [tag container] (",
+     "  [variable-2 $a]: [number 10],",
+     "  [variable-2 $b]: [number 10])",
+     "{}");
 
-  IT('nested',
-    "foo [1 { bar ][2 { ][1 } ]}");
-
-  IT('comma',
-    "foo [1 { font-family][2 : verdana, sans-serif][1 ; ]}");
+  MT('indent_nested',
+     "[tag foo] {",
+     "  [tag bar] {",
+     "  }",
+     "}");
 
-  IT('parentheses',
-    "foo [1 { color][2 : darken][3 ($blue, 9%][2 )][1 ; ]}");
+  MT('indent_parentheses',
+     "[tag foo] {",
+     "  [property color]: [variable darken]([variable-2 $blue],",
+     "    [number 9%]);",
+     "}");
 
-  IT('vardef',
-     "$name[1 : 'val'];",
-     "tag [1 {]",
-     "[1  inner ][2 {]",
-     "[2    margin][3 : 3px][2 ;]",
-     "[2  ][1 }]",
+  MT('indent_vardef',
+     "[variable-2 $name]:",
+     "  [string 'val'];",
+     "[tag tag] {",
+     "  [tag inner] {",
+     "    [property margin]: [number 3px];",
+     "  }",
      "}");
 })();
diff --git a/mode/css/test.js b/mode/css/test.js
index cbfbef46cc..425c26ed91 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -1,7 +1,6 @@
 (function() {
-  var mode = CodeMirror.getMode({indentUnit: 1}, "css");
+  var mode = CodeMirror.getMode({indentUnit: 2}, "css");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-  function IT(name) { test.indentation(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   // Error, because "foobarhello" is neither a known type or property, but
   // property was expected (after "and"), and it should be in parenthese.
@@ -38,11 +37,11 @@
      "[tag foo] { [property font-family]: [string 'hello world']; }");
 
   MT("tagColorKeyword",
-     "[tag foo] {" +
-       "[property color]: [keyword black];" +
-       "[property color]: [keyword navy];" +
-       "[property color]: [keyword yellow];" +
-       "}");
+     "[tag foo] {",
+     "  [property color]: [keyword black];",
+     "  [property color]: [keyword navy];",
+     "  [property color]: [keyword yellow];",
+     "}");
 
   MT("tagColorHex3",
      "[tag foo] { [property background]: [atom #fff]; }");
@@ -81,18 +80,32 @@
      "[comment <!--comment]",
      "[comment -->] [tag div] {}");
 
-  IT("tagSelector",
-    "strong, em [1 { background][2 : rgba][3 (255, 255, 0, .2][2 )][1 ;]}");
-
-  IT("atMedia",
-    "[1 @media { foo ][2 { ][1 } ]}");
-
-  IT("comma",
-    "foo [1 { font-family][2 : verdana, sans-serif][1 ; ]}");
-
-  IT("parentheses",
-    "foo [1 { background][2 : url][3 (\"bar\"][2 )][1 ; ]}");
-
-  IT("pseudo",
-    "foo:before [1 { ]}");
+  MT("indent_tagSelector",
+     "[tag strong], [tag em] {",
+     "  [property background]: [atom rgba](",
+     "    [number 255], [number 255], [number 0], [number .2]",
+     "  );",
+     "}");
+
+  MT("indent_atMedia",
+     "[def @media] {",
+     "  [tag foo] {",
+     "    [property color]:",
+     "      [keyword yellow];",
+     "  }",
+     "}");
+
+  MT("indent_comma",
+     "[tag foo] {",
+     "  [property font-family]: [variable verdana],",
+     "    [atom sans-serif];",
+     "}");
+
+  MT("indent_parentheses",
+     "[tag foo]:[variable-3 before] {",
+     "  [property background]: [atom url](",
+     "[string     blahblah]",
+     "[string     etc]",
+     "[string   ]) [keyword !important];",
+     "}");
 })();
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 793308f6fb..5ea4ed12c8 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -141,10 +141,6 @@
           style = null;
         }
         return style;
-      },
-
-      indent: function(state) {
-        return state.indented;
       }
     };
   }, "htmlmixed", "ruby");
diff --git a/mode/haml/test.js b/mode/haml/test.js
index b7178d40fb..163b09f8dd 100644
--- a/mode/haml/test.js
+++ b/mode/haml/test.js
@@ -1,5 +1,5 @@
 (function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "haml");
+  var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "haml");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   // Requires at least one media query
diff --git a/test/mode_test.js b/test/mode_test.js
index 08deab74b2..46174e1f78 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -59,13 +59,6 @@
     return {tokens: tokens, plain: plain};
   }
 
-  test.indentation = function(name, mode, tokens, modeName) {
-    var data = parseTokens(tokens);
-    return test((modeName || mode.name) + "_indent_" + name, function() {
-      return compare(data.plain, data.tokens, mode, true);
-    });
-  };
-
   test.mode = function(name, mode, tokens, modeName) {
     var data = parseTokens(tokens);
     return test((modeName || mode.name) + "_" + name, function() {
@@ -73,7 +66,11 @@
     });
   };
 
-  function compare(text, expected, mode, compareIndentation) {
+  function esc(str) {
+    return str.replace('&', '&amp;').replace('<', '&lt;');
+  }
+
+  function compare(text, expected, mode) {
 
     var expectedOutput = [];
     for (var i = 0; i < expected.length; i += 2) {
@@ -82,59 +79,48 @@
       expectedOutput.push(sty, expected[i + 1]);
     }
 
-    var observedOutput = highlight(text, mode, compareIndentation);
+    var observedOutput = highlight(text, mode);
 
-    var pass, passStyle = "";
-    pass = highlightOutputsEqual(expectedOutput, observedOutput);
-    passStyle = pass ? 'mt-pass' : 'mt-fail';
-
-    var s = '';
-    if (pass) {
-      s += '<div class="mt-test ' + passStyle + '">';
-      s +=   '<pre>' + text.replace('&', '&amp;').replace('<', '&lt;') + '</pre>';
-      s +=   '<div class="cm-s-default">';
-      s +=   prettyPrintOutputTable(observedOutput);
-      s +=   '</div>';
-      s += '</div>';
-      return s;
-    } else {
-      s += '<div class="mt-test ' + passStyle + '">';
-      s +=   '<pre>' + text.replace('&', '&amp;').replace('<', '&lt;') + '</pre>';
+    var s = "";
+    var diff = highlightOutputsDifferent(expectedOutput, observedOutput);
+    if (diff != null) {
+      s += '<div class="mt-test mt-fail">';
+      s +=   '<pre>' + esc(text) + '</pre>';
       s +=   '<div class="cm-s-default">';
       s += 'expected:';
-      s +=   prettyPrintOutputTable(expectedOutput);
+      s +=   prettyPrintOutputTable(expectedOutput, diff);
       s += 'observed:';
-      s +=   prettyPrintOutputTable(observedOutput);
+      s +=   prettyPrintOutputTable(observedOutput, diff);
       s +=   '</div>';
       s += '</div>';
-      throw s;
     }
+    if (observedOutput.indentFailures) {
+      for (var i = 0; i < observedOutput.indentFailures.length; i++)
+        s += "<div class='mt-test mt-fail'>" + esc(observedOutput.indentFailures[i]) + "</div>";
+    }
+    if (s) throw new Failure(s);
   }
 
-  /**
-   * Emulation of CodeMirror's internal highlight routine for testing. Multi-line
-   * input is supported.
-   *
-   * @param string to highlight
-   *
-   * @param mode the mode that will do the actual highlighting
-   *
-   * @return array of [style, token] pairs
-   */
-  function highlight(string, mode, compareIndentation) {
+  function highlight(string, mode) {
     var state = mode.startState()
 
     var lines = string.replace(/\r\n/g,'\n').split('\n');
     var st = [], pos = 0;
     for (var i = 0; i < lines.length; ++i) {
       var line = lines[i], newLine = true;
+      if (mode.indent) {
+        var ws = line.match(/^\s*/)[0];
+        var indent = mode.indent(state, line.slice(ws.length));
+        if (indent != CodeMirror.Pass && indent != ws.length)
+          (st.indentFailures || (st.indentFailures = [])).push(
+            "Indentation of line " + (i + 1) + " is " + indent + " (expected " + ws.length + ")");
+      }
       var stream = new CodeMirror.StringStream(line);
       if (line == "" && mode.blankLine) mode.blankLine(state);
       /* Start copied code from CodeMirror.highlight */
       while (!stream.eol()) {
         var compare = mode.token(stream, state), substr = stream.current();
-        if (compareIndentation) compare = mode.indent(state) || null;
-        else if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
+        if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
         stream.start = stream.pos;
         if (pos && st[pos-2] == compare && !newLine) {
           st[pos-1] += substr;
@@ -153,39 +139,22 @@
     return st;
   }
 
-  /**
-   * Compare two arrays of output from highlight.
-   *
-   * @param o1 array of [style, token] pairs
-   *
-   * @param o2 array of [style, token] pairs
-   *
-   * @return boolean; true iff outputs equal
-   */
-  function highlightOutputsEqual(o1, o2) {
-    if (o1.length != o2.length) return false;
-    for (var i = 0; i < o1.length; ++i)
-      if (o1[i] != o2[i]) return false;
-    return true;
+  function highlightOutputsDifferent(o1, o2) {
+    var minLen = Math.min(o1.length, o2.length);
+    for (var i = 0; i < minLen; ++i)
+      if (o1[i] != o2[i]) return i >> 1;
+    if (o1.length > minLen || o2.length > minLen) return minLen;
   }
 
-  /**
-   * Print tokens and corresponding styles in a table. Spaces in the token are
-   * replaced with 'interpunct' dots (&middot;).
-   *
-   * @param output array of [style, token] pairs
-   *
-   * @return html string
-   */
-  function prettyPrintOutputTable(output) {
+  function prettyPrintOutputTable(output, diffAt) {
     var s = '<table class="mt-output">';
     s += '<tr>';
     for (var i = 0; i < output.length; i += 2) {
       var style = output[i], val = output[i+1];
       s +=
-      '<td class="mt-token">' +
-        '<span class="cm-' + String(style).replace(/ +/g, " cm-") + '">' +
-        val.replace(/ /g,'\xb7').replace('&', '&amp;').replace('<', '&lt;') +
+      '<td class="mt-token"' + (i == diffAt * 2 ? " style='background: pink'" : "") + '>' +
+        '<span class="cm-' + esc(String(style)) + '">' +
+        esc(val.replace(/ /g,'\xb7')) +
         '</span>' +
         '</td>';
     }

From 72f01e8cd33808cc56a85457949bfd5a49362656 Mon Sep 17 00:00:00 2001
From: Alexander Solovyov <alexander@solovyov.net>
Date: Thu, 12 Dec 2013 23:30:47 +0200
Subject: [PATCH 0705/4742] [coffeescript mode] Allow single-quote-character
 strings to span lines

Closes #2050
---
 mode/coffeescript/coffeescript.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index e8bfe48a24..0e9e6352f8 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -119,13 +119,13 @@ CodeMirror.defineMode("coffeescript", function(conf) {
 
     // Handle strings
     if (stream.match(stringPrefixes)) {
-      state.tokenize = tokenFactory(stream.current(), "string");
+      state.tokenize = tokenFactory(stream.current(), false, "string");
       return state.tokenize(stream, state);
     }
     // Handle regex literals
     if (stream.match(regexPrefixes)) {
       if (stream.current() != "/" || stream.match(/^.*\//, false)) { // prevent highlight of division
-        state.tokenize = tokenFactory(stream.current(), "string-2");
+        state.tokenize = tokenFactory(stream.current(), true, "string-2");
         return state.tokenize(stream, state);
       } else {
         stream.backUp(1);
@@ -161,8 +161,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     return ERRORCLASS;
   }
 
-  function tokenFactory(delimiter, outclass) {
-    var singleline = delimiter.length == 1;
+  function tokenFactory(delimiter, singleline, outclass) {
     return function(stream, state) {
       while (!stream.eol()) {
         stream.eatWhile(/[^'"\/\\]/);

From b8e7854ada5c231c63e60ce0498fffbff65be46d Mon Sep 17 00:00:00 2001
From: Abe Fettig <abe@fettig.net>
Date: Wed, 27 Nov 2013 12:16:05 -0500
Subject: [PATCH 0706/4742] [show-hint addon] Add completeOnSingleClick option

... to make a single-click pick a hint option instead of just
selecting it.
---
 addon/hint/show-hint.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 76f020cf0a..1c60603ea2 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -235,7 +235,10 @@
 
     CodeMirror.on(hints, "click", function(e) {
       var t = getHintElement(hints, e.target || e.srcElement);
-      if (t && t.hintId != null) widget.changeActive(t.hintId);
+      if (t && t.hintId != null) {
+        widget.changeActive(t.hintId);
+        if (options.completeOnSingleClick) widget.pick();
+      }
     });
 
     CodeMirror.on(hints, "mousedown", function() {

From 0cf23eea94afbf735ada31a5f300e60f65425e77 Mon Sep 17 00:00:00 2001
From: hitsthings <hitsthings@gmail.com>
Date: Mon, 2 Dec 2013 10:50:04 +1100
Subject: [PATCH 0707/4742] Fix IE showing empty with 0 padding and
 resize-to-content

Fixes #2011 in at least IE8+.

When the resize-to-content styles are applied along with a removal of vertical padding on .CodeMirror-lines, IE would not display any content. Using `offsetWidth` instead of `clientWidth` fixes this for modern-ish IE.

A more complex solution is needed to solve it for older browsers.
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7b1b67dc0e..ec1bee3c28 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -450,7 +450,7 @@ window.CodeMirror = (function() {
   // updates.
   function updateDisplayInner(cm, changes, visible, forced) {
     var display = cm.display, doc = cm.doc;
-    if (!display.wrapper.clientWidth) {
+    if (!display.wrapper.offsetWidth) {
       display.showingFrom = display.showingTo = doc.first;
       display.viewOffset = 0;
       return;

From 78435a5f1d61f8ba93386e8d865c4051b2e3c0f2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 15 Dec 2013 13:43:09 +0100
Subject: [PATCH 0708/4742] [runmode addon] Add resolveMode and registerHelper
 shims

Needed for some modes to load.

Closes #2054
---
 addon/runmode/runmode-standalone.js | 21 +++++++++++++--------
 addon/runmode/runmode.node.js       | 21 +++++++++++++--------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index d117166c98..2866b252ee 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -69,17 +69,22 @@ CodeMirror.startState = function (mode, a1, a2) {
 var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
 CodeMirror.defineMode = function (name, mode) { modes[name] = mode; };
 CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
-CodeMirror.getMode = function (options, spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
+CodeMirror.resolveMode = function(spec) {
+  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
     spec = mimeModes[spec];
-  if (typeof spec == "string")
-    var mname = spec, config = {};
-  else if (spec != null)
-    var mname = spec.name, config = spec;
-  var mfactory = modes[mname];
+  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+    spec = mimeModes[spec.name];
+  }
+  if (typeof spec == "string") return {name: spec};
+  else return spec || {name: "null"};
+};
+CodeMirror.getMode = function (options, spec) {
+  spec = CodeMirror.resolveMode(spec);
+  var mfactory = modes[spec.name];
   if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, config || {});
+  return mfactory(options, spec);
 };
+CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min;
 
 CodeMirror.runMode = function (string, modespec, callback, options) {
   var mode = CodeMirror.getMode({ indentUnit: 2 }, modespec);
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 0f1088fa2e..304640fa62 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -76,17 +76,22 @@ exports.defineMode("null", function() {
 });
 exports.defineMIME("text/plain", "null");
 
-exports.getMode = function(options, spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
+exports.resolveMode = function(spec) {
+  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
     spec = mimeModes[spec];
-  if (typeof spec == "string")
-    var mname = spec, config = {};
-  else if (spec != null)
-    var mname = spec.name, config = spec;
-  var mfactory = modes[mname];
+  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+    spec = mimeModes[spec.name];
+  }
+  if (typeof spec == "string") return {name: spec};
+  else return spec || {name: "null"};
+};
+exports.getMode = function(options, spec) {
+  spec = exports.resolveMode(mimeModes[spec]);
+  var mfactory = modes[spec.name];
   if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, config || {});
+  return mfactory(options, spec);
 };
+CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min;
 
 exports.runMode = function(string, modespec, callback) {
   var mode = exports.getMode({indentUnit: 2}, modespec);

From ea7397c17662607248a83f2769cfaea1100d2d8b Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Mon, 16 Dec 2013 21:05:47 -0500
Subject: [PATCH 0709/4742] [markdown] Lists after atx headers should be
 highlighted

Closes #2040
---
 mode/markdown/markdown.js | 13 +++++++++----
 mode/markdown/test.js     |  5 +++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 2469479ea0..c959242ac6 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -664,7 +664,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.formatting = false;
 
       if (stream.sol()) {
-        if (stream.match(/^\s*$/, true)) {
+        var forceBlankLine = false;
+        if (stream.match(/^\s*$/, true) || state.header) {
+          forceBlankLine = true;
+        }
+
+        // Reset state.header
+        state.header = 0;
+
+        if (forceBlankLine) {
           state.prevLineHasContent = false;
           return blankLine(state);
         } else {
@@ -675,9 +683,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         // Reset state.escape
         state.escape = false;
 
-        // Reset state.header
-        state.header = 0;
-
         // Reset state.taskList
         state.taskList = false;
 
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 21ceab7650..bc5cc97380 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -276,6 +276,11 @@
      "1. bar",
      "2. hello");
 
+  // List after header
+  MT("listAfterHeader",
+     "[header&header1 # foo]",
+     "[variable-2 - bar]");
+
   // Formatting in lists (*)
   MT("listAsteriskFormatting",
      "[variable-2 * ][variable-2&em *foo*][variable-2  bar]",

From 8f8da43cc78f41a399d44f78b3a876b8e34a56f8 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Mon, 16 Dec 2013 21:42:09 -0500
Subject: [PATCH 0710/4742] [markdown] Specify type of list when
 highlightFormatting is enabled

Closes #2039
---
 mode/gfm/test.js          |  4 ++--
 mode/markdown/markdown.js | 11 +++++++++--
 mode/markdown/test.js     |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 7d17517e18..e5c3486ebd 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -16,8 +16,8 @@
      "[comment&formatting&formatting-code-block ```]");
 
   FT("taskList",
-     "[variable-2&formatting&formatting-list - ][meta&formatting&formatting-task [ ]]][variable-2  foo]",
-     "[variable-2&formatting&formatting-list - ][property&formatting&formatting-task [x]]][variable-2  foo]");
+     "[variable-2&formatting&formatting-list&formatting-list-ul - ][meta&formatting&formatting-task [ ]]][variable-2  foo]",
+     "[variable-2&formatting&formatting-list&formatting-list-ul - ][property&formatting&formatting-task [x]]][variable-2  foo]");
 
   MT("emInWordAsterisk",
      "foo[em *bar*]hello");
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index c959242ac6..6370462772 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -165,7 +165,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return switchInline(stream, state, footnoteLink);
     } else if (stream.match(hrRE, true)) {
       return hr;
-    } else if ((!state.prevLineHasContent || prevLineIsList) && (stream.match(ulRE, true) || stream.match(olRE, true))) {
+    } else if ((!state.prevLineHasContent || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
+      var listType = null;
+      if (stream.match(ulRE, true)) {
+        listType = 'ul';
+      } else {
+        stream.match(olRE, true);
+        listType = 'ol';
+      }
       state.indentation += 4;
       state.list = true;
       state.listDepth++;
@@ -173,7 +180,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         state.taskList = true;
       }
       state.f = state.inline;
-      if (modeCfg.highlightFormatting) state.formatting = "list";
+      if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
       return getType(state);
     } else if (modeCfg.fencedCodeBlocks && stream.match(/^```([\w+#]*)/, true)) {
       // try switching mode
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index bc5cc97380..96572025d8 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -33,9 +33,9 @@
      "[atom&formatting&formatting-quote > ][atom foo]");
 
   FT("formatting_list",
-     "[variable-2&formatting&formatting-list - ][variable-2 foo]");
+     "[variable-2&formatting&formatting-list&formatting-list-ul - ][variable-2 foo]");
   FT("formatting_list",
-     "[variable-2&formatting&formatting-list 1. ][variable-2 foo]");
+     "[variable-2&formatting&formatting-list&formatting-list-ol 1. ][variable-2 foo]");
 
   FT("formatting_link",
      "[link&formatting&formatting-link [][link foo][link&formatting&formatting-link ]]][string&formatting&formatting-link-string (][string http://example.com/][string&formatting&formatting-link-string )]");

From 4536d5a81db213a0b82f07f2bbde5b48602165ea Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 17 Dec 2013 18:19:36 +0100
Subject: [PATCH 0711/4742] [real-world uses] Add writeLaTeX

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 156eacd097..b9e35f2dfc 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -128,6 +128,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://www.webkit.org/blog/2518/state-of-web-inspector/#source-code">WebKit Web inspector</a></li>
       <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
       <li><a href="http://wordpress.org/extend/plugins/codemirror-for-codeeditor/">WordPress plugin</a></li>
+      <li><a href="https://www.writelatex.com">writeLaTeX</a> (Collaborative LaTeX Editor)</li>
       <li><a href="http://www.xosystem.org/home/applications_websites/xosystem_website/xoside_EN.php">XOSide</a> (online editor)</li>
       <li><a href="http://videlibri.sourceforge.net/cgi-bin/xidelcgi">XQuery tester</a></li>
       <li><a href="http://q42jaap.github.io/xsd2codemirror/">xsd2codemirror</a> (convert XSD to CM XML completion info)</li>

From 2f266c38a6ea69f7fff990dbd861b93f7689de22 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 18 Dec 2013 13:48:33 +0100
Subject: [PATCH 0712/4742] Don't close undo events by default in
 changeGeneration

Closes #2059
---
 doc/manual.html   |  8 ++++++--
 lib/codemirror.js |  9 +++++----
 test/test.js      | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 957ab347c5..33953c11ea 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -935,10 +935,14 @@ <h3 id="api_content">Content manipulation methods</h3>
       of <a href="#changeGeneration"><code>changeGeneration</code></a>,
       which allows multiple subsystems to track different notions of
       cleanness without interfering.</dd>
-      <dt id="changeGeneration"><code><strong>doc.changeGeneration</strong>() → integer</code></dt>
+      <dt id="changeGeneration"><code><strong>doc.changeGeneration</strong>(?closeEvent: boolean) → integer</code></dt>
       <dd>Returns a number that can later be passed
       to <a href="#isClean"><code>isClean</code></a> to test whether
-      any edits were made (and not undone) in the meantime.</dd>
+      any edits were made (and not undone) in the meantime.
+      If <code>closeEvent</code> is true, the current history event
+      will be ‘closed’, meaning it can't be combined with further
+      changes (rapid typing or deleting events are typically
+      combined).</dd>
       <dt id="isClean"><code><strong>doc.isClean</strong>(?generation: integer) → boolean</code></dt>
       <dd>Returns whether the document is currently clean — not
       modified since initialization or the last call
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ec1bee3c28..abf17eed74 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4984,10 +4984,11 @@ window.CodeMirror = (function() {
     clearHistory: function() {this.history = makeHistory(this.history.maxGeneration);},
 
     markClean: function() {
-      this.cleanGeneration = this.changeGeneration();
+      this.cleanGeneration = this.changeGeneration(true);
     },
-    changeGeneration: function() {
-      this.history.lastOp = this.history.lastOrigin = null;
+    changeGeneration: function(forceSplit) {
+      if (forceSplit)
+        this.history.lastOp = this.history.lastOrigin = null;
       return this.history.generation;
     },
     isClean: function (gen) {
@@ -5291,10 +5292,10 @@ window.CodeMirror = (function() {
              anchorBefore: doc.sel.anchor, headBefore: doc.sel.head,
              anchorAfter: selAfter.anchor, headAfter: selAfter.head};
       hist.done.push(cur);
-      hist.generation = ++hist.maxGeneration;
       while (hist.done.length > hist.undoDepth)
         hist.done.shift();
     }
+    hist.generation = ++hist.maxGeneration;
     hist.lastTime = time;
     hist.lastOp = opId;
     hist.lastOrigin = change.origin;
diff --git a/test/test.js b/test/test.js
index 86b0bfe178..3ad8d35499 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1479,6 +1479,21 @@ testCM("dirtyBit", function(cm) {
   eq(cm.isClean(), true);
 });
 
+testCM("changeGeneration", function(cm) {
+  cm.replaceSelection("x", null, "+insert");
+  var softGen = cm.changeGeneration();
+  cm.replaceSelection("x", null, "+insert");
+  cm.undo();
+  eq(cm.getValue(), "");
+  is(!cm.isClean(softGen));
+  cm.replaceSelection("x", null, "+insert");
+  var hardGen = cm.changeGeneration(true);
+  cm.replaceSelection("x", null, "+insert");
+  cm.undo();
+  eq(cm.getValue(), "x");
+  is(cm.isClean(hardGen));
+});
+
 testCM("addKeyMap", function(cm) {
   function sendKey(code) {
     cm.triggerOnKeyDown({type: "keydown", keyCode: code,

From d13582f3d8867fb39a9c154bfd4d60a17e213667 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 18 Dec 2013 14:06:53 +0100
Subject: [PATCH 0713/4742] [run-mode addon] Add hideFirstChars to stand-alone
 shims

Issue #2054
---
 addon/runmode/runmode-standalone.js | 10 ++++++++--
 addon/runmode/runmode.node.js       | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 2866b252ee..fcb3db35c8 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -10,6 +10,7 @@ function splitLines(string){ return string.split(/\r?\n|\r/); };
 function StringStream(string) {
   this.pos = this.start = 0;
   this.string = string;
+  this.lineStart = 0;
 }
 StringStream.prototype = {
   eol: function() {return this.pos >= this.string.length;},
@@ -41,7 +42,7 @@ StringStream.prototype = {
     if (found > -1) {this.pos = found; return true;}
   },
   backUp: function(n) {this.pos -= n;},
-  column: function() {return this.start;},
+  column: function() {return this.start - this.lineStart;},
   indentation: function() {return 0;},
   match: function(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
@@ -58,7 +59,12 @@ StringStream.prototype = {
       return match;
     }
   },
-  current: function(){return this.string.slice(this.start, this.pos);}
+  current: function(){return this.string.slice(this.start, this.pos);},
+  hideFirstChars: function(n, inner) {
+    this.lineStart += n;
+    try { return inner(); }
+    finally { this.lineStart -= n; }
+  }
 };
 CodeMirror.StringStream = StringStream;
 
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 304640fa62..99f72ef02e 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -5,6 +5,7 @@ function splitLines(string){ return string.split(/\r?\n|\r/); };
 function StringStream(string) {
   this.pos = this.start = 0;
   this.string = string;
+  this.lineStart = 0;
 }
 StringStream.prototype = {
   eol: function() {return this.pos >= this.string.length;},
@@ -36,7 +37,7 @@ StringStream.prototype = {
     if (found > -1) {this.pos = found; return true;}
   },
   backUp: function(n) {this.pos -= n;},
-  column: function() {return this.start;},
+  column: function() {return this.start - this.lineStart;},
   indentation: function() {return 0;},
   match: function(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
@@ -53,7 +54,12 @@ StringStream.prototype = {
       return match;
     }
   },
-  current: function(){return this.string.slice(this.start, this.pos);}
+  current: function(){return this.string.slice(this.start, this.pos);},
+  hideFirstChars: function(n, inner) {
+    this.lineStart += n;
+    try { return inner(); }
+    finally { this.lineStart -= n; }
+  }
 };
 exports.StringStream = StringStream;
 

From e3d64baf825459668f1c68e30ed11a40091df515 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Dec 2013 17:22:49 +0100
Subject: [PATCH 0714/4742] [runmode addon] Fix broken node.js version

Issue #2054
---
 addon/runmode/runmode.node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 99f72ef02e..691af8b360 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -97,7 +97,7 @@ exports.getMode = function(options, spec) {
   if (!mfactory) throw new Error("Unknown mode: " + spec);
   return mfactory(options, spec);
 };
-CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min;
+exports.registerHelper = exports.registerGlobalHelper = Math.min;
 
 exports.runMode = function(string, modespec, callback) {
   var mode = exports.getMode({indentUnit: 2}, modespec);

From 51234f9f35024f6c4f1abcf4a19b8df693826c09 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 26 Dec 2013 21:24:25 +0100
Subject: [PATCH 0715/4742] [runmode addon] Support a state option to provide a
 custom stating state

---
 addon/runmode/runmode-standalone.js | 2 +-
 addon/runmode/runmode.js            | 2 +-
 addon/runmode/runmode.node.js       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index fcb3db35c8..9ebde8b054 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -133,7 +133,7 @@ CodeMirror.runMode = function (string, modespec, callback, options) {
     };
   }
 
-  var lines = splitLines(string), state = CodeMirror.startState(mode);
+  var lines = splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
     var stream = new CodeMirror.StringStream(lines[i]);
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 7aafa2ad8f..2cafa811f8 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -43,7 +43,7 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
     };
   }
 
-  var lines = CodeMirror.splitLines(string), state = CodeMirror.startState(mode);
+  var lines = CodeMirror.splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
     var stream = new CodeMirror.StringStream(lines[i]);
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 691af8b360..e8bccb0cf2 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -101,7 +101,7 @@ exports.registerHelper = exports.registerGlobalHelper = Math.min;
 
 exports.runMode = function(string, modespec, callback) {
   var mode = exports.getMode({indentUnit: 2}, modespec);
-  var lines = splitLines(string), state = exports.startState(mode);
+  var lines = splitLines(string), state = (options && options.state) || exports.startState(mode);
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
     var stream = new exports.StringStream(lines[i]);

From 4e9d808ff6c31475c5b85ab2de72328245343d75 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Thu, 19 Dec 2013 21:03:42 +0100
Subject: [PATCH 0716/4742] Added builtin values

And put string in alphabetical order.

- varying
- xml
- bit
---
 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 3be68caa1a..53e06bab93 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -326,7 +326,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name:       "sql",
     client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
     keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
-    builtin:    set("bfile blob character clob dec float int integer mlslabel natural naturaln nchar nclob number numeric nvarchar2 real rowtype signtype smallint string varchar varchar2 abs acos add_months ascii asin atan atan2 average bfilename ceil chartorowid chr concat convert cos cosh count decode deref dual dump dup_val_on_index empty error exp false floor found glb greatest hextoraw initcap instr instrb isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mod months_between new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null nvl others power rawtohex reftohex round rowcount rowidtochar rpad rtrim sign sin sinh soundex sqlcode sqlerrm sqrt stddev substr substrb sum sysdate tan tanh to_char to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid upper user userenv variance vsize"),
+    builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid upper user userenv varchar varchar2 variance varying vsize xml"),
     operatorChars: /^[*+\-%<>!=~]/,
     dateSQL:    set("date time timestamp"),
     support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")

From b6efcb93982269cfe1707563a45bb4f11886b421 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@heppe-macbookpro.roam.corp.google.com>
Date: Wed, 27 Nov 2013 14:46:08 -0800
Subject: [PATCH 0717/4742] [vim keymap] Add support for <CR>, <C-e> and <C-y>

---
 keymap/vim.js    | 44 ++++++++++++++++++++++++++++++++++++++++++++
 test/vim_test.js | 27 +++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 164d51b1a4..efb4de48ae 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -84,6 +84,7 @@
     { keys: ['<End>'], type: 'keyToKey', toKeys: ['$'] },
     { keys: ['<PageUp>'], type: 'keyToKey', toKeys: ['<C-b>'] },
     { keys: ['<PageDown>'], type: 'keyToKey', toKeys: ['<C-f>'] },
+    { keys: ['<CR>'], type: 'keyToKey', toKeys: ['j', '^'], context: 'normal' },
     // Motions
     { keys: ['H'], type: 'motion',
         motion: 'moveToTopLine',
@@ -247,6 +248,12 @@
         actionArgs: { forward: true }},
     { keys: ['<C-o>'], type: 'action', action: 'jumpListWalk',
         actionArgs: { forward: false }},
+    { keys: ['<C-e>'], type: 'action',
+        action: 'scroll',
+        actionArgs: { forward: true, linewise: true }},
+    { keys: ['<C-y>'], type: 'action',
+        action: 'scroll',
+        actionArgs: { forward: false, linewise: true }},
     { keys: ['a'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'charAfter' }},
     { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true,
@@ -1636,6 +1643,43 @@
         markPos = markPos ? markPos : cm.getCursor();
         cm.setCursor(markPos);
       },
+      scroll: function(cm, actionArgs, vim) {
+        if (vim.visualMode) {
+          return;
+        }
+        var repeat = actionArgs.repeat || 1;
+        var lineHeight = cm.defaultTextHeight();
+        var top = cm.getScrollInfo().top;
+        var delta = lineHeight * repeat;
+        var newPos = actionArgs.forward ? top + delta : top - delta;
+        var cursor = cm.getCursor();
+        var cursorCoords = cm.charCoords(cursor, 'local');
+        if (actionArgs.forward) {
+          if (newPos > cursorCoords.top) {
+             cursor.line += (newPos - cursorCoords.top) / lineHeight;
+             cursor.line = Math.ceil(cursor.line);
+             cm.setCursor(cursor);
+             cursorCoords = cm.charCoords(cursor, 'local');
+             cm.scrollTo(null, cursorCoords.top);
+          } else {
+             // Cursor stays within bounds.  Just reposition the scroll window.
+             cm.scrollTo(null, newPos);
+          }
+        } else {
+          var newBottom = newPos + cm.getScrollInfo().clientHeight;
+          if (newBottom < cursorCoords.bottom) {
+             cursor.line -= (cursorCoords.bottom - newBottom) / lineHeight;
+             cursor.line = Math.floor(cursor.line);
+             cm.setCursor(cursor);
+             cursorCoords = cm.charCoords(cursor, 'local');
+             cm.scrollTo(
+                 null, cursorCoords.bottom - cm.getScrollInfo().clientHeight);
+          } else {
+             // Cursor stays within bounds.  Just reposition the scroll window.
+             cm.scrollTo(null, newPos);
+          }
+        }
+      },
       scrollToCursor: function(cm, actionArgs) {
         var lineNum = cm.getCursor().line;
         var charCoords = cm.charCoords({line: lineNum, ch: 0}, 'local');
diff --git a/test/vim_test.js b/test/vim_test.js
index c65b5cad03..1a5cc3ee3f 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2003,6 +2003,33 @@ testVim('zt==z<CR>', function(cm, vim, helpers){
   eq(zVals[2], zVals[5]);
 });
 
+var scrollMotionSandbox =
+  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'
+  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'
+  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'
+  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n';
+testVim('scrollMotion', function(cm, vim, helpers){
+  var prevCursor, prevScrollInfo;
+  cm.setCursor(0, 0);
+  // ctrl-y at the top of the file should have no effect.
+  helpers.doKeys('<C-y>');
+  eq(0, cm.getCursor().line);
+  prevScrollInfo = cm.getScrollInfo();
+  helpers.doKeys('<C-e>');
+  eq(1, cm.getCursor().line);
+  eq(true, prevScrollInfo.top < cm.getScrollInfo().top);
+  // Jump to the end of the sandbox.
+  cm.setCursor(1000, 0);
+  prevCursor = cm.getCursor();
+  // ctrl-e at the bottom of the file should have no effect.
+  helpers.doKeys('<C-e>');
+  eq(prevCursor.line, cm.getCursor().line);
+  prevScrollInfo = cm.getScrollInfo();
+  helpers.doKeys('<C-y>');
+  eq(prevCursor.line - 1, cm.getCursor().line);
+  eq(true, prevScrollInfo.top > cm.getScrollInfo().top);
+}, { value: scrollMotionSandbox});
+
 var squareBracketMotionSandbox = ''+
   '({\n'+//0
   '  ({\n'+//11

From d99da21fe85ac965b8ddc57b5daaa21104d650c9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 26 Dec 2013 21:55:17 +0100
Subject: [PATCH 0718/4742] Fix problems introduced by new rule for indenting
 empty lines

---
 addon/edit/closetag.js | 4 ++--
 lib/codemirror.js      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 106448d3d7..60e204bcf2 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -67,8 +67,8 @@
     cm.replaceSelection(">" + (doIndent ? "\n\n" : "") + "</" + tagName + ">",
                         {head: curPos, anchor: curPos});
     if (doIndent) {
-      cm.indentLine(pos.line + 1);
-      cm.indentLine(pos.line + 2);
+      cm.indentLine(pos.line + 1, null, true);
+      cm.indentLine(pos.line + 2, null);
     }
   }
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index abf17eed74..d66bfc4670 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2932,7 +2932,7 @@ window.CodeMirror = (function() {
     }),
     indentSelection: operation(null, function(how) {
       var sel = this.doc.sel;
-      if (posEq(sel.from, sel.to)) return indentLine(this, sel.from.line, how);
+      if (posEq(sel.from, sel.to)) return indentLine(this, sel.from.line, how, true);
       var e = sel.to.line - (sel.to.ch ? 0 : 1);
       for (var i = sel.from.line; i <= e; ++i) indentLine(this, i, how);
     }),

From 7bf3a0018c4248127c9939a6b48b8651f5088204 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 26 Dec 2013 21:57:10 +0100
Subject: [PATCH 0719/4742] [hardwrap addon] Prevent null-use error in corner
 case

Closes #2070
---
 addon/wrap/hardwrap.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 9260c75bbb..1faa3d84a6 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -36,6 +36,7 @@
     var killTrailing = options.killTrailingSpace !== false;
     var changes = [], curLine = "", curNo = from.line;
     var lines = cm.getRange(from, to, false);
+    if (!lines.length) return;
     var leadingSpace = lines[0].match(/^[ \t]*/)[0];
 
     for (var i = 0; i < lines.length; ++i) {

From ed7f8d083f52e7b58827d46410278a8688e7aa74 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 26 Dec 2013 22:03:26 +0100
Subject: [PATCH 0720/4742] [sql mode] Don't return CodeMirror.Pass when in top
 context

Issue #2064
---
 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 53e06bab93..946e7b38fa 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -177,7 +177,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
     indent: function(state, textAfter) {
       var cx = state.context;
-      if (!cx) return CodeMirror.Pass;
+      if (!cx) return 0;
       if (cx.align) return cx.col + (textAfter.charAt(0) == cx.type ? 0 : 1);
       else return cx.indent + config.indentUnit;
     },

From d50ced613d1383e7e2f6ebe04217d71804493aea Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Mon, 23 Dec 2013 21:19:43 +0100
Subject: [PATCH 0721/4742] [matchbrackets addon] Fix typos

---
 addon/edit/matchbrackets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 9d9b3882f7..465b6ccaa9 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -54,7 +54,7 @@
     var one = cm.markText(found.from, Pos(found.from.line, found.from.ch + 1), {className: style});
     var two = found.to && cm.markText(found.to, Pos(found.to.line, found.to.ch + 1), {className: style});
     // Kludge to work around the IE bug from issue #1193, where text
-    // input stops going to the textare whever this fires.
+    // input stops going to the textarea whenever this fires.
     if (ie_lt8 && cm.state.focused) cm.display.input.focus();
     var clear = function() {
       cm.operation(function() { one.clear(); two && two.clear(); });

From 6fac052cc36082d1dadfa01f76755374b3c92a20 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 27 Dec 2013 16:29:18 +0100
Subject: [PATCH 0722/4742] [gfm mode] Fix exponential running time in regexp

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

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 492cbc463a..10d5e05c06 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -75,7 +75,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
           return "link";
         }
       }
-      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
+      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
          stream.string.slice(stream.start - 2, stream.start) != "](") {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls

From 4f90bd87f1c5a20d0a40719169a02841202bdf38 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 27 Dec 2013 16:33:16 +0100
Subject: [PATCH 0723/4742] Clear input field when disableInput flag is cleared

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d66bfc4670..086f84151e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -244,6 +244,7 @@ window.CodeMirror = (function() {
     var map = keyMap[cm.options.keyMap], style = map.style;
     cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
       (style ? " cm-keymap-" + style : "");
+    if (cm.state.disableInput && !map.disableInput) resetInput(cm, true);
     cm.state.disableInput = map.disableInput;
   }
 

From f5b8e1000dcd3d2e080ee5fd845eb333eefc04a5 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@heppe-macbookpro.roam.corp.google.com>
Date: Fri, 20 Dec 2013 17:29:31 -0800
Subject: [PATCH 0724/4742] [test driver] Clean up test selection

---
 test/doc_test.js |  2 +-
 test/driver.js   | 49 ++++++++++++++++++------------------------------
 test/index.html  | 40 +++++++++++++++++++++++----------------
 test/vim_test.js |  2 +-
 4 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/test/doc_test.js b/test/doc_test.js
index 3e04e155b3..f0f40e76e0 100644
--- a/test/doc_test.js
+++ b/test/doc_test.js
@@ -57,7 +57,7 @@
         run.apply(null, editors);
         successful = true;
       } finally {
-        if ((debug && !successful) || verbose) {
+        if (!successful || verbose) {
           place.style.visibility = "visible";
         } else {
           for (var i = 0; i < editors.length; ++i)
diff --git a/test/driver.js b/test/driver.js
index 5befa77278..10088ab1ed 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -1,4 +1,4 @@
-var tests = [], debug = null, debugUsed = new Array(), allNames = [];
+var tests = [], filters = [], allNames = [];
 
 function Failure(why) {this.message = why;}
 Failure.prototype.toString = function() { return this.message; };
@@ -32,7 +32,7 @@ function testCM(name, run, opts, expectedFail) {
       run(cm);
       successful = true;
     } finally {
-      if ((debug && !successful) || verbose) {
+      if (!successful || verbose) {
         place.style.visibility = "visible";
       } else {
         place.removeChild(cm.getWrapperElement());
@@ -42,39 +42,23 @@ function testCM(name, run, opts, expectedFail) {
 }
 
 function runTests(callback) {
-  if (debug) {
-    if (indexOf(debug, "verbose") === 0) {
-      verbose = true;
-      debug.splice(0, 1);
-    }
-    if (debug.length < 1) {
-      debug = null;
-    }
-  }
   var totalTime = 0;
   function step(i) {
     if (i === tests.length){
       running = false;
       return callback("done");
-    }
+    } 
     var test = tests[i], expFail = test.expectedFail, startTime = +new Date;
-    if (debug !== null) {
-      var debugIndex = indexOf(debug, test.name);
-      if (debugIndex !== -1) {
-        // Remove from array for reporting incorrect tests later
-        debug.splice(debugIndex, 1);
-      } else {
-        var wildcardName = test.name.split("_")[0] + "_*";
-        debugIndex = indexOf(debug, wildcardName);
-        if (debugIndex !== -1) {
-          // Remove from array for reporting incorrect tests later
-          debug.splice(debugIndex, 1);
-          debugUsed.push(wildcardName);
-        } else {
-          debugIndex = indexOf(debugUsed, wildcardName);
-          if (debugIndex == -1) return step(i + 1);
+    if (filters.length) {
+      for (var j = 0; j < filters.length; j++) {
+        if (test.name.match(filters[j])) {
+          break;
         }
       }
+      if (j == filters.length) {      
+        callback("skipped", test.name, message);
+        return step(i + 1);
+      }
     }
     var threw = false;
     try {
@@ -127,13 +111,16 @@ function is(a, msg) {
 }
 
 function countTests() {
-  if (!debug) return tests.length;
+  if (!filters.length) return tests.length;
   var sum = 0;
   for (var i = 0; i < tests.length; ++i) {
     var name = tests[i].name;
-    if (indexOf(debug, name) != -1 ||
-        indexOf(debug, name.split("_")[0] + "_*") != -1)
-      ++sum;
+    for (var j = 0; j < filters.length; j++) {
+      if (name.match(filters[j])) {
+        ++sum;
+        break;
+      }
+    }
   }
   return sum;
 }
diff --git a/test/index.html b/test/index.html
index ac12b2274c..0a10f3c945 100644
--- a/test/index.html
+++ b/test/index.html
@@ -109,10 +109,11 @@ <h2>Test Suite</h2>
           progressTotal = document.getElementById("progress_total").childNodes[0];
       var count = 0,
           failed = 0,
+          skipped = 0,
           bad = "",
           running = false, // Flag that states tests are running
-         quit = false, // Flag to quit tests ASAP
-         verbose = false; // Adds message for *every* test to output
+          quit = false, // Flag to quit tests ASAP
+          verbose = false; // Adds message for *every* test to output
 
       function runHarness(){
         if (running) {
@@ -121,19 +122,26 @@ <h2>Test Suite</h2>
           setTimeout(function(){runHarness();}, 500);
           return;
         }
+        filters = [];
+        verbose = false;
         if (window.location.hash.substr(1)){
-          debug = window.location.hash.substr(1).split(",");
-        } else {
-          debug = null;
+          var strings = window.location.hash.substr(1).split(",");
+          while (strings.length) {
+            var s = strings.shift();
+            if (s === "verbose") {
+              verbose = true;
+            } else {
+              filters.push(new RegExp(decodeURIComponent(s, 'i')));
+            }
+          }
         }
         quit = false;
         running = true;
         setStatus("Loading tests...");
         count = 0;
         failed = 0;
+        skipped = 0;
         bad = "";
-        verbose = false;
-        debugUsed = Array();
         totalTests = countTests();
         progressTotal.nodeValue = " of " + totalTests;
         progressRan.nodeValue = count;
@@ -166,12 +174,16 @@ <h2>Test Suite</h2>
       }
       function displayTest(type, name, customMessage) {
         var message = "???";
-        if (type != "done") ++count;
+        if (type != "done" && type != "skipped") ++count;
         progress.style.width = (count * (progress.parentNode.clientWidth - 2) / totalTests) + "px";
         progressRan.nodeValue = count;
         if (type == "ok") {
           message = "Test '" + name + "' succeeded";
           if (!verbose) customMessage = false;
+        } else if (type == "skipped") {
+          message = "Test '" + name + "' skipped";
+          ++skipped;
+          if (!verbose) customMessage = false;
         } else if (type == "expected") {
           message = "Test '" + name + "' failed as expected";
           if (!verbose) customMessage = false;
@@ -189,15 +201,11 @@ <h2>Test Suite</h2>
           } else {
             type += " ok";
             message = "All passed";
+            if (skipped) {
+              message += " (" + skipped + " skipped)";
+            }
           }
-          if (debug && debug.length) {
-            var bogusTests = totalTests - count;
-            message += " — " + bogusTests + " nonexistent test" +
-              (bogusTests > 1 ? "s" : "") + " requested by location.hash: " +
-              "`" + debug.join("`, `") + "`";
-          } else {
-            progressTotal.nodeValue = '';
-          }
+          progressTotal.nodeValue = '';
           customMessage = true; // Hack to avoid adding to output
         }
         if (verbose && !customMessage)  customMessage = message;
diff --git a/test/vim_test.js b/test/vim_test.js
index 1a5cc3ee3f..28d492178c 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -195,7 +195,7 @@ function testVim(name, run, opts, expectedFail) {
       run(cm, vim, helpers);
       successful = true;
     } finally {
-      if ((debug && !successful) || verbose) {
+      if (!successful || verbose) {
         place.style.visibility = "visible";
       } else {
         place.removeChild(cm.getWrapperElement());

From 9228a29bc0d6fb5ada1a2186dd9a27dffecb6af6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 27 Dec 2013 17:27:31 +0100
Subject: [PATCH 0725/4742] Clean up f5b8e1000dcd3d2e080ee5fd845eb333eefc04a5

---
 test/driver.js  | 5 +++++
 test/index.html | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index 10088ab1ed..13952dcc65 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -124,3 +124,8 @@ function countTests() {
   }
   return sum;
 }
+
+function parseTestFilter(s) {
+  if (/_\*$/.test(s)) return new RegExp("^" + s.slice(0, s.length - 2), "i");
+  else return new RegExp(s, "i");
+}
diff --git a/test/index.html b/test/index.html
index 0a10f3c945..8177038e30 100644
--- a/test/index.html
+++ b/test/index.html
@@ -128,11 +128,10 @@ <h2>Test Suite</h2>
           var strings = window.location.hash.substr(1).split(",");
           while (strings.length) {
             var s = strings.shift();
-            if (s === "verbose") {
+            if (s === "verbose")
               verbose = true;
-            } else {
-              filters.push(new RegExp(decodeURIComponent(s, 'i')));
-            }
+            else
+              filters.push(parseTestFilter(decodeURIComponent(s)));;
           }
         }
         quit = false;

From b226604b1395621c69a1326a8ef12cdf02694778 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 27 Dec 2013 21:18:16 +0100
Subject: [PATCH 0726/4742] [sql mode] Another indentation tweak

Issue #2065
---
 mode/sql/sql.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 946e7b38fa..903fa6740a 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -178,8 +178,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     indent: function(state, textAfter) {
       var cx = state.context;
       if (!cx) return 0;
-      if (cx.align) return cx.col + (textAfter.charAt(0) == cx.type ? 0 : 1);
-      else return cx.indent + config.indentUnit;
+      var closing = textAfter.charAt(0) == cx.type;
+      if (cx.align) return cx.col + (closing ? 0 : 1);
+      else return cx.indent + (closing ? 0 : config.indentUnit);
     },
 
     blockCommentStart: "/*",

From 4b5195fbe5776435e64e3ef4e925f34859ac1d93 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 27 Dec 2013 21:21:48 +0100
Subject: [PATCH 0727/4742] [hardwrap demo] Remove debugging code

Closes #2080
---
 demo/hardwrap.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index 6cfd9c87c2..d3f085ad43 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -61,9 +61,7 @@ <h2>Hard-wrapping Demo</h2>
   }
 });
 var wait, options = {column: 60};
-var done = false;
 editor.on("change", function(cm, change) {
-if (done) return; done = true;
   clearTimeout(wait);
   wait = setTimeout(function() {
     cm.wrapParagraphsInRange(change.from, CodeMirror.changeEnd(change), options);

From 14877c387fe0cedff2189c421b1a39de882e3bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Haso=C5=88?= <martin.hason@gmail.com>
Date: Fri, 27 Dec 2013 12:50:33 +0100
Subject: [PATCH 0728/4742] [gherkin mode] Improve, add localizations

---
 mode/gherkin/gherkin.js | 95 +++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 50 deletions(-)

diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index dadb58362b..784afc50ce 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -18,31 +18,40 @@ CodeMirror.defineMode("gherkin", function () {
     startState: function () {
       return {
         lineNumber: 0,
-        tableHeaderLine: null,
+        tableHeaderLine: false,
         allowFeature: true,
         allowBackground: false,
         allowScenario: false,
         allowSteps: false,
         allowPlaceholders: false,
-        inMultilineArgument: false,
+        allowMultilineArgument: false,
         inMultilineString: false,
-        inMultilineTable: false
+        inMultilineTable: false,
+        inKeywordLine: false
       };
     },
     token: function (stream, state) {
       if (stream.sol()) {
         state.lineNumber++;
+        state.inKeywordLine = false;
+        if (state.inMultilineTable) {
+            state.tableHeaderLine = false;
+            if (!stream.match(/\s*\|/, false)) {
+              state.allowMultilineArgument = false;
+              state.inMultilineTable = false;
+            }
+        }
       }
+
       stream.eatSpace();
 
-      // INSIDE OF MULTILINE ARGUMENTS
-      if (state.inMultilineArgument) {
+      if (state.allowMultilineArgument) {
 
         // STRING
         if (state.inMultilineString) {
           if (stream.match('"""')) {
             state.inMultilineString = false;
-            state.inMultilineArgument = false;
+            state.allowMultilineArgument = false;
           } else {
             stream.match(/.*/);
           }
@@ -51,19 +60,11 @@ CodeMirror.defineMode("gherkin", function () {
 
         // TABLE
         if (state.inMultilineTable) {
-          // New table, assume first row is headers
-          if (state.tableHeaderLine === null) {
-            state.tableHeaderLine = state.lineNumber;
-          }
-
           if (stream.match(/\|\s*/)) {
-            if (stream.eol()) {
-              state.inMultilineTable = false;
-            }
             return "bracket";
           } else {
             stream.match(/[^\|]*/);
-            return state.tableHeaderLine === state.lineNumber ? "property" : "string";
+            return state.tableHeaderLine ? "property" : "string";
           }
         }
 
@@ -75,15 +76,10 @@ CodeMirror.defineMode("gherkin", function () {
         } else if (stream.match("|")) {
           // Table
           state.inMultilineTable = true;
+          state.tableHeaderLine = true;
           return "bracket";
-        } else {
-          // Or abort
-          state.inMultilineArgument = false;
-          state.tableHeaderLine = null;
         }
 
-
-        return null;
       }
 
       // LINE COMMENT
@@ -91,76 +87,75 @@ CodeMirror.defineMode("gherkin", function () {
         return "comment";
 
       // TAG
-      } else if (stream.match(/@\S+/)) {
-        return "def";
+      } else if (!state.inKeywordLine && stream.match(/@\S+/)) {
+        return "tag";
 
       // FEATURE
-      } else if (state.allowFeature && stream.match(/Feature:/)) {
+      } else if (!state.inKeywordLine && state.allowFeature && stream.match(/(機能|功能|フィーチャ|기능|โครงหลัก|ความสามารถ|ความต้องการทางธุรกิจ|ಹೆಚ್ಚಳ|గుణము|ਮੁਹਾਂਦਰਾ|ਨਕਸ਼ ਨੁਹਾਰ|ਖਾਸੀਅਤ|रूप लेख|وِیژگی|خاصية|תכונה|Функціонал|Функция|Функционалност|Функционал|Үзенчәлеклелек|Свойство|Особина|Мөмкинлек|Могућност|Λειτουργία|Δυνατότητα|Właściwość|Vlastnosť|Trajto|Tính năng|Savybė|Pretty much|Požiadavka|Požadavek|Potrzeba biznesowa|Özellik|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Hwæt|Hwaet|Funzionalità|Funktionalitéit|Funktionalität|Funkcja|Funkcionalnost|Funkcionalitāte|Funkcia|Fungsi|Functionaliteit|Funcționalitate|Funcţionalitate|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Fīča|Feature|Eiginleiki|Egenskap|Egenskab|Característica|Caracteristica|Business Need|Aspekt|Arwedd|Ahoy matey!|Ability):/)) {
         state.allowScenario = true;
         state.allowBackground = true;
         state.allowPlaceholders = false;
         state.allowSteps = false;
+        state.allowMultilineArgument = false;
+        state.inKeywordLine = true;
         return "keyword";
 
       // BACKGROUND
-      } else if (state.allowBackground && stream.match("Background:")) {
+      } else if (!state.inKeywordLine && state.allowBackground && stream.match(/(背景|배경|แนวคิด|ಹಿನ್ನೆಲೆ|నేపథ్యం|ਪਿਛੋਕੜ|पृष्ठभूमि|زمینه|الخلفية|רקע|Тарих|Предыстория|Предистория|Позадина|Передумова|Основа|Контекст|Кереш|Υπόβαθρο|Założenia|Yo\-ho\-ho|Tausta|Taust|Situācija|Rerefons|Pozadina|Pozadie|Pozadí|Osnova|Latar Belakang|Kontext|Konteksts|Kontekstas|Kontekst|Háttér|Hannergrond|Grundlage|Geçmiş|Fundo|Fono|First off|Dis is what went down|Dasar|Contexto|Contexte|Context|Contesto|Cenário de Fundo|Cenario de Fundo|Cefndir|Bối cảnh|Bakgrunnur|Bakgrunn|Bakgrund|Baggrund|Background|B4|Antecedents|Antecedentes|Ær|Aer|Achtergrond):/)) {
         state.allowPlaceholders = false;
         state.allowSteps = true;
         state.allowBackground = false;
+        state.allowMultilineArgument = false;
+        state.inKeywordLine = true;
         return "keyword";
 
       // SCENARIO OUTLINE
-      } else if (state.allowScenario && stream.match("Scenario Outline:")) {
+      } else if (!state.inKeywordLine && state.allowScenario && stream.match(/(場景大綱|场景大纲|劇本大綱|剧本大纲|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|시나리오 개요|สรุปเหตุการณ์|โครงสร้างของเหตุการณ์|ವಿವರಣೆ|కథనం|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਟਕਥਾ ਢਾਂਚਾ|परिदृश्य रूपरेखा|سيناريو مخطط|الگوی سناریو|תבנית תרחיש|Сценарийның төзелеше|Сценарий структураси|Структура сценарію|Структура сценария|Структура сценарија|Скица|Рамка на сценарий|Концепт|Περιγραφή Σεναρίου|Wharrimean is|Template Situai|Template Senario|Template Keadaan|Tapausaihio|Szenariogrundriss|Szablon scenariusza|Swa hwær swa|Swa hwaer swa|Struktura scenarija|Structură scenariu|Structura scenariu|Skica|Skenario konsep|Shiver me timbers|Senaryo taslağı|Schema dello scenario|Scenariomall|Scenariomal|Scenario Template|Scenario Outline|Scenario Amlinellol|Scenārijs pēc parauga|Scenarijaus šablonas|Reckon it's like|Raamstsenaarium|Plang vum Szenario|Plan du Scénario|Plan du scénario|Osnova scénáře|Osnova Scenára|Náčrt Scenáru|Náčrt Scénáře|Náčrt Scenára|MISHUN SRSLY|Menggariskan Senario|Lýsing Dæma|Lýsing Atburðarásar|Konturo de la scenaro|Koncept|Khung tình huống|Khung kịch bản|Forgatókönyv vázlat|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l'escenari|Esbozo do escenario|Delineação do Cenário|Delineacao do Cenario|All y'all|Abstrakt Scenario|Abstract Scenario):/)) {
         state.allowPlaceholders = true;
         state.allowSteps = true;
+        state.allowMultilineArgument = false;
+        state.inKeywordLine = true;
         return "keyword";
 
       // EXAMPLES
-      } else if (state.allowScenario && stream.match("Examples:")) {
+      } else if (state.allowScenario && stream.match(/(例子|例|サンプル|예|ชุดของเหตุการณ์|ชุดของตัวอย่าง|ಉದಾಹರಣೆಗಳು|ఉదాహరణలు|ਉਦਾਹਰਨਾਂ|उदाहरण|نمونه ها|امثلة|דוגמאות|Үрнәкләр|Сценарији|Примеры|Примери|Приклади|Мисоллар|Мисаллар|Σενάρια|Παραδείγματα|You'll wanna|Voorbeelden|Variantai|Tapaukset|Se þe|Se the|Se ðe|Scenarios|Scenariji|Scenarijai|Przykłady|Primjeri|Primeri|Příklady|Príklady|Piemēri|Példák|Pavyzdžiai|Paraugs|Örnekler|Juhtumid|Exemplos|Exemples|Exemple|Exempel|EXAMPLZ|Examples|Esempi|Enghreifftiau|Ekzemploj|Eksempler|Ejemplos|Dữ liệu|Dead men tell no tales|Dæmi|Contoh|Cenários|Cenarios|Beispiller|Beispiele|Atburðarásir):/)) {
         state.allowPlaceholders = false;
         state.allowSteps = true;
         state.allowBackground = false;
-        state.inMultilineArgument = true;
+        state.allowMultilineArgument = true;
         return "keyword";
 
       // SCENARIO
-      } else if (state.allowScenario && stream.match(/Scenario:/)) {
+      } else if (!state.inKeywordLine && state.allowScenario && stream.match(/(場景|场景|劇本|剧本|シナリオ|시나리오|เหตุการณ์|ಕಥಾಸಾರಾಂಶ|సన్నివేశం|ਪਟਕਥਾ|परिदृश्य|سيناريو|سناریو|תרחיש|Сценарій|Сценарио|Сценарий|Пример|Σενάριο|Tình huống|The thing of it is|Tapaus|Szenario|Swa|Stsenaarium|Skenario|Situai|Senaryo|Senario|Scenaro|Scenariusz|Scenariu|Scénario|Scenario|Scenarijus|Scenārijs|Scenarij|Scenarie|Scénář|Scenár|Primer|MISHUN|Kịch bản|Keadaan|Heave to|Forgatókönyv|Escenario|Escenari|Cenário|Cenario|Awww, look mate|Atburðarás):/)) {
         state.allowPlaceholders = false;
         state.allowSteps = true;
         state.allowBackground = false;
+        state.allowMultilineArgument = false;
+        state.inKeywordLine = true;
         return "keyword";
 
       // STEPS
-      } else if (state.allowSteps && stream.match(/(Given|When|Then|And|But)/)) {
+      } else if (!state.inKeywordLine && state.allowSteps && stream.match(/(那麼|那么|而且|當|当|并且|同時|同时|前提|假设|假設|假定|假如|但是|但し|並且|もし|ならば|ただし|しかし|かつ|하지만|조건|먼저|만일|만약|단|그리고|그러면|และ |เมื่อ |แต่ |ดังนั้น |กำหนดให้ |ಸ್ಥಿತಿಯನ್ನು |ಮತ್ತು |ನೀಡಿದ |ನಂತರ |ಆದರೆ |మరియు |చెప్పబడినది |కాని |ఈ పరిస్థితిలో |అప్పుడు |ਪਰ |ਤਦ |ਜੇਕਰ |ਜਿਵੇਂ ਕਿ |ਜਦੋਂ |ਅਤੇ |यदि |परन्तु |पर |तब |तदा |तथा |जब |चूंकि |किन्तु |कदा |और |अगर |و |هنگامی |متى |لكن |عندما |ثم |بفرض |با فرض |اما |اذاً |آنگاه |כאשר |וגם |בהינתן |אזי |אז |אבל |Якщо |Һәм |Унда |Тоді |Тогда |То |Также |Та |Пусть |Припустимо, що |Припустимо |Онда |Но |Нехай |Нәтиҗәдә |Лекин |Ләкин |Коли |Когда |Когато |Када |Кад |К тому же |І |И |Задато |Задати |Задате |Если |Допустим |Дано |Дадено |Вә |Ва |Бирок |Әмма |Әйтик |Әгәр |Аммо |Али |Але |Агар |А також |А |Τότε |Όταν |Και |Δεδομένου |Αλλά |Þurh |Þegar |Þa þe |Þá |Þa |Zatati |Zakładając |Zadato |Zadate |Zadano |Zadani |Zadan |Za předpokladu |Za predpokladu |Youse know when youse got |Youse know like when |Yna |Yeah nah |Y'know |Y |Wun |Wtedy |When y'all |When |Wenn |WEN |wann |Ve |Và |Und |Un |ugeholl |Too right |Thurh |Thì |Then y'all |Then |Tha the |Tha |Tetapi |Tapi |Tak |Tada |Tad |Stel |Soit |Siis |Și |Şi |Si |Sed |Se |Så |Quando |Quand |Quan |Pryd |Potom |Pokud |Pokiaľ |Però |Pero |Pak |Oraz |Onda |Ond |Oletetaan |Og |Och |O zaman |Niin |Nhưng |När |Når |Mutta |Men |Mas |Maka |Majd |Mając |Mais |Maar |mä |Ma |Lorsque |Lorsqu'|Logo |Let go and haul |Kun |Kuid |Kui |Kiedy |Khi |Ketika |Kemudian |Keď |Když |Kaj |Kai |Kada |Kad |Jeżeli |Jeśli |Ja |It's just unbelievable |Ir |I CAN HAZ |I |Ha |Givun |Givet |Given y'all |Given |Gitt |Gegeven |Gegeben seien |Gegeben sei |Gdy |Gangway! |Fakat |Étant donnés |Etant donnés |Étant données |Etant données |Étant donnée |Etant donnée |Étant donné |Etant donné |Et |És |Entonces |Entón |Então |Entao |En |Eğer ki |Ef |Eeldades |E |Ðurh |Duota |Dun |Donitaĵo |Donat |Donada |Do |Diyelim ki |Diberi |Dengan |Den youse gotta |DEN |De |Dato |Dați fiind |Daţi fiind |Dati fiind |Dati |Date fiind |Date |Data |Dat fiind |Dar |Dann |dann |Dan |Dados |Dado |Dadas |Dada |Ða ðe |Ða |Cuando |Cho |Cando |Când |Cand |Cal |But y'all |But at the end of the day I reckon |BUT |But |Buh |Blimey! |Biết |Bet |Bagi |Aye |awer |Avast! |Atunci |Atesa |Atès |Apabila |Anrhegedig a |Angenommen |And y'all |And |AN |An |an |Amikor |Amennyiben |Ama |Als |Alors |Allora |Ali |Aleshores |Ale |Akkor |Ak |Adott |Ac |Aber |A zároveň |A tiež |A taktiež |A také |A |a |7 |\* )/)) {
+        state.inStep = true;
+        state.allowPlaceholders = true;
+        state.allowMultilineArgument = true;
+        state.inKeywordLine = true;
         return "keyword";
 
       // INLINE STRING
-      } else if (!state.inMultilineArgument && stream.match(/"/)) {
-        stream.match(/.*?"/);
+      } else if (stream.match(/"[^"]*"?/)) {
         return "string";
 
-      // MULTILINE ARGUMENTS
-      } else if (state.allowSteps && stream.eat(":")) {
-        if (stream.match(/\s*$/)) {
-          state.inMultilineArgument = true;
-          return "keyword";
-        } else {
-          return null;
-        }
-
-      } else if (state.allowSteps && stream.match("<")) {
-        if (stream.match(/.*?>/)) {
-          return "property";
-        } else {
-          return null;
-        }
+      // PLACEHOLDER
+      } else if (state.allowPlaceholders && stream.match(/<[^>]*>?/)) {
+        return "attribute";
 
       // Fall through
       } else {
-        stream.eatWhile(/[^":<]/);
+        stream.next();
+        stream.eatWhile(/[^@"<#]/);
+        return null;
       }
-
-      return null;
     }
   };
 });

From db1753be3764e6c6ce46b74a4cdd0f2d9c90a1ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Haso=C5=88?= <martin.hason@gmail.com>
Date: Fri, 27 Dec 2013 22:53:32 +0100
Subject: [PATCH 0729/4742] [gherkin] Renamed tokens for placeholder and table
 header

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

diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index 784afc50ce..685b373df7 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -64,7 +64,7 @@ CodeMirror.defineMode("gherkin", function () {
             return "bracket";
           } else {
             stream.match(/[^\|]*/);
-            return state.tableHeaderLine ? "property" : "string";
+            return state.tableHeaderLine ? "header" : "string";
           }
         }
 
@@ -148,7 +148,7 @@ CodeMirror.defineMode("gherkin", function () {
 
       // PLACEHOLDER
       } else if (state.allowPlaceholders && stream.match(/<[^>]*>?/)) {
-        return "attribute";
+        return "variable";
 
       // Fall through
       } else {

From 74910aebed399821cb030421762fa145bbeb52ae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 29 Dec 2013 15:37:01 +0100
Subject: [PATCH 0730/4742] [markdown mode] Fix HTML embedding, add innerMode
 method

Closes #2083
Issue #2084
---
 mode/markdown/markdown.js | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 6370462772..b4322d1ca2 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -197,14 +197,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function htmlBlock(stream, state) {
     var style = htmlMode.token(stream, state.htmlState);
-    if (htmlFound && style === 'tag' && state.htmlState.type !== 'openTag' && !state.htmlState.context) {
+    if ((htmlFound && !state.htmlState.tagName && !state.htmlState.context) ||
+        (state.md_inside && stream.current().indexOf(">") > -1)) {
       state.f = inlineNormal;
       state.block = blockNormal;
-    }
-    if (state.md_inside && stream.current().indexOf(">")!=-1) {
-      state.f = inlineNormal;
-      state.block = blockNormal;
-      state.htmlState.context = undefined;
+      state.htmlState = null;
     }
     return style;
   }
@@ -421,13 +418,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (ch === '<' && stream.match(/^\w/, false)) {
-      if (stream.string.indexOf(">")!=-1) {
+      if (stream.string.indexOf(">") != -1) {
         var atts = stream.string.substring(1,stream.string.indexOf(">"));
         if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) {
           state.md_inside = true;
         }
       }
       stream.backUp(1);
+      state.htmlState = CodeMirror.startState(htmlMode);
       return switchBlock(stream, state, htmlBlock);
     }
 
@@ -601,7 +599,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return savedInlineRE[endChar];
   }
 
-  return {
+  var mode = {
     startState: function() {
       return {
         f: blockNormal,
@@ -610,7 +608,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         thisLineHasContent: false,
 
         block: blockNormal,
-        htmlState: CodeMirror.startState(htmlMode),
+        htmlState: null,
         indentation: 0,
 
         inline: inlineNormal,
@@ -641,7 +639,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         thisLineHasContent: s.thisLineHasContent,
 
         block: s.block,
-        htmlState: CodeMirror.copyState(htmlMode, s.htmlState),
+        htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),
         indentation: s.indentation,
 
         localMode: s.localMode,
@@ -671,10 +669,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.formatting = false;
 
       if (stream.sol()) {
-        var forceBlankLine = false;
-        if (stream.match(/^\s*$/, true) || state.header) {
-          forceBlankLine = true;
-        }
+        var forceBlankLine = stream.match(/^\s*$/, true) || state.header;
 
         // Reset state.header
         state.header = 0;
@@ -712,11 +707,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return state.f(stream, state);
     },
 
+    innerMode: function(state) {
+      if (state.block == htmlBlock) return {state: state.htmlState, mode: htmlMode};
+      if (state.block == local) return {state: state.localState, mode: state.localMode};
+      return {state: state, mode: mode};
+    },
+
     blankLine: blankLine,
 
     getType: getType
   };
-
+  return mode;
 }, "xml");
 
 CodeMirror.defineMIME("text/x-markdown", "markdown");

From a2d531380d71279f95a8293bbb36f2ae40ee55c1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 29 Dec 2013 16:46:48 +0100
Subject: [PATCH 0731/4742] [indentwrap demo] Fix inherited text-indent messing
 up tabs

Issue #2085
---
 demo/indentwrap.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/indentwrap.html b/demo/indentwrap.html
index 6c1fc596e1..efdba5d59e 100644
--- a/demo/indentwrap.html
+++ b/demo/indentwrap.html
@@ -9,6 +9,7 @@
 <script src="../mode/xml/xml.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+      .CodeMirror pre > * { text-indent: 0px; }
     </style>
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>

From f3ead17c63a9240d4186ca5a44a0e4071ac2f39e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 30 Dec 2013 14:06:13 +0100
Subject: [PATCH 0732/4742] [css mode] Better support for nested property
 blocks

Issue #2087
---
 mode/css/css.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index d1a1def6f7..2af14db55d 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -161,7 +161,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         override = "property";
         return "maybeprop";
       } else if (allowNested) {
-        override = "tag";
+        override = stream.match(/^\s*:/, false) ? "property" : "tag";
         return "block";
       } else {
         override += " error";
@@ -184,6 +184,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   states.prop = function(type, stream, state) {
     if (type == ";") return popContext(state);
+    if (type == "{" && allowNested) return pushContext(state, stream, "propBlock");
     if (type == "}" || type == "{") return popAndPass(type, stream, state);
     if (type == "(") return pushContext(state, stream, "parens");
 
@@ -197,6 +198,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return "prop";
   };
 
+  states.propBlock = function(type, _stream, state) {
+    if (type == "}") return popContext(state);
+    if (type == "word") { override = "property"; return "maybeprop"; }
+    return state.context.type;
+  };
+
   states.parens = function(type, stream, state) {
     if (type == "{" || type == "}") return popAndPass(type, stream, state);
     if (type == ")") return popContext(state);

From 46f69bc517ee2d00996ef97c4a02135371f5912b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 3 Jan 2014 15:07:50 +0100
Subject: [PATCH 0733/4742] [real-world uses] Add Projects IDE

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

diff --git a/doc/realworld.html b/doc/realworld.html
index b9e35f2dfc..9c12fba640 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -99,6 +99,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://github.com/mamacdon/orion-codemirror">Orion-CodeMirror integration</a> (running CodeMirror modes in Orion)</li>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
       <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
+      <li><a href="http://projects.parmleyhunt.com/">Projects</a> (experimental IDE)</li>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
       <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>
       <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>

From c8209dd14a95eddca096acd25031ec3f6a941bcd Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Sat, 4 Jan 2014 21:32:47 +0100
Subject: [PATCH 0734/4742] Fix numpad keys

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 086f84151e..f854e130dd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5740,7 +5740,7 @@ window.CodeMirror = (function() {
   CodeMirror.keyNames = keyNames;
   (function() {
     // Number keys
-    for (var i = 0; i < 10; i++) keyNames[i + 48] = String(i);
+    for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);
     // Alphabetic keys
     for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
     // Function keys

From 1093b1f2ef58da29a7fb1fc0c78a6b6961b5bea4 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Sat, 4 Jan 2014 21:46:54 +0100
Subject: [PATCH 0735/4742] Set keycode in list ascending

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f854e130dd..763f852ca8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5733,10 +5733,10 @@ window.CodeMirror = (function() {
   var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
                   19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
                   36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-                  46: "Delete", 59: ";", 91: "Mod", 92: "Mod", 93: "Mod", 109: "-", 107: "=", 127: "Delete",
+                  46: "Delete", 59: ";", 91: "Mod", 92: "Mod", 93: "Mod", 107: "=", 109: "-", 127: "Delete",
                   186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-                  221: "]", 222: "'", 63276: "PageUp", 63277: "PageDown", 63275: "End", 63273: "Home",
-                  63234: "Left", 63232: "Up", 63235: "Right", 63233: "Down", 63302: "Insert", 63272: "Delete"};
+                  221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
+                  63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"};
   CodeMirror.keyNames = keyNames;
   (function() {
     // Number keys

From 50af40255c28c366a5c8359475f066fde1bd91a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 Jan 2014 22:18:08 +0100
Subject: [PATCH 0736/4742] [smalltalk mode] Fix highlighting of collection
 literals

Issue #2105
---
 mode/smalltalk/smalltalk.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index f2d4cb3185..86f749b310 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -40,8 +40,10 @@ CodeMirror.defineMode('smalltalk', function(config) {
         stream.next();
         token = nextSymbol(stream, new Context(nextSymbol, context));
       } else {
-        stream.eatWhile(/[^ .\[\]()]/);
-        token.name = 'string-2';
+        if (stream.eatWhile(/[^ .{}\[\]()]/))
+          token.name = 'string-2';
+        else
+          token.name = 'meta';
       }
 
     } else if (aChar === '$') {

From 0ec946851648ab35a61b8037b5519c65c9168c2a Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Fri, 3 Jan 2014 19:34:13 -0500
Subject: [PATCH 0737/4742] [vim] Enter insert mode on paste

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

diff --git a/keymap/vim.js b/keymap/vim.js
index efb4de48ae..3b2ecf4ade 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -334,9 +334,11 @@
         CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
         cm.on('beforeSelectionChange', beforeSelectionChange);
         maybeInitVimState(cm);
+        CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
       } else if (cm.state.vim) {
         cm.setOption('keyMap', 'default');
         cm.off('beforeSelectionChange', beforeSelectionChange);
+        CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
         cm.state.vim = null;
       }
     });
@@ -349,6 +351,18 @@
         head.ch--;
       }
     }
+    function getOnPasteFn(cm) {
+      var vim = cm.state.vim;
+      if (!vim.onPasteFn) {
+        vim.onPasteFn = function() {
+          if (!vim.insertMode) {
+            cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
+            actions.enterInsertMode(cm, {}, vim);;
+          } 
+        }
+      }
+      return vim.onPasteFn;
+    }
 
     var numberRegex = /[\d]/;
     var wordRegexp = [(/\w/), (/[^\w\s]/)], bigWordRegexp = [(/\S/)];

From 6ebc44dfee5454effa145f209210b10666c29bf6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 Jan 2014 22:30:42 +0100
Subject: [PATCH 0738/4742] [vim keymap] Linting fixes

Issue #2097
---
 keymap/vim.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 3b2ecf4ade..c83f6f08ae 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -357,9 +357,9 @@
         vim.onPasteFn = function() {
           if (!vim.insertMode) {
             cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
-            actions.enterInsertMode(cm, {}, vim);;
-          } 
-        }
+            actions.enterInsertMode(cm, {}, vim);
+          }
+        };
       }
       return vim.onPasteFn;
     }

From 03f2f3367d2874d92fa61a56f2666e5c7ff9364b Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Wed, 1 Jan 2014 21:45:23 -0500
Subject: [PATCH 0739/4742] [markdown] Use `quote` for blockquotes.

Also add nesting depth information (via `quote-#`) and max
nesting depth option to warn user when they've nested blockquotes
too deeply.
---
 mode/markdown/markdown.js | 39 +++++++++++++++++++++++++++++++--------
 mode/markdown/test.js     | 36 ++++++++++++++++++------------------
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index b4322d1ca2..2a5e71fdd3 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -47,6 +47,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.highlightFormatting === undefined)
     modeCfg.highlightFormatting = false;
 
+  // Maximum number of nested blockquotes. Set to 0 for infinite nesting.
+  // Excess `>` will emit `error` token.
+  if (modeCfg.maxBlockquoteDepth === undefined)
+    modeCfg.maxBlockquoteDepth = 0;
+
   // Should underscores in words open/close em/strong?
   if (modeCfg.underscoresBreakWords === undefined)
     modeCfg.underscoresBreakWords = true;
@@ -61,8 +66,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var header   = 'header'
   ,   code     = 'comment'
-  ,   quote1   = 'atom'
-  ,   quote2   = 'number'
+  ,   quote    = 'quote'
   ,   list1    = 'variable-2'
   ,   list2    = 'variable-3'
   ,   list3    = 'keyword'
@@ -120,6 +124,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function blockNormal(stream, state) {
 
+    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
@@ -153,13 +159,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return getType(state);
     } else if (stream.eat('>')) {
       state.indentation++;
-      state.quote = 1;
+      state.quote = sol ? 1 : state.quote + 1;
       if (modeCfg.highlightFormatting) state.formatting = "quote";
       stream.eatSpace();
-      while (stream.eat('>')) {
-        stream.eatSpace();
-        state.quote++;
-      }
       return getType(state);
     } else if (stream.peek() === '[') {
       return switchInline(stream, state, footnoteLink);
@@ -239,6 +241,16 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         if (state.formatting[i] === "header") {
           styles.push(formatting + "-" + state.formatting[i] + state.header);
         }
+
+        // Add `formatting-quote` and `formatting-quote-#` for blockquotes
+        // Add `error` instead if the maximum blockquote nesting depth is passed
+        if (state.formatting[i] === "quote") {
+          if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
+            styles.push(formatting + "-" + state.formatting[i] + "-" + state.quote);
+          } else {
+            styles.push("error");
+          }
+        }
       }
     }
 
@@ -264,7 +276,18 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (state.code) { styles.push(code); }
 
     if (state.header) { styles.push(header); styles.push(header + state.header); }
-    if (state.quote) { styles.push(state.quote % 2 ? quote1 : quote2); }
+
+    if (state.quote) {
+      styles.push(quote);
+
+      // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth
+      if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
+        styles.push(quote + "-" + state.quote);
+      } else {
+        styles.push(quote + "-" + modeCfg.maxBlockquoteDepth);
+      }
+    }
+
     if (state.list !== false) {
       var listMod = (state.listDepth - 1) % 3;
       if (!listMod) {
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 96572025d8..30e82ca654 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -30,7 +30,7 @@
      "[header&header1&formatting&formatting-header&formatting-header1 =]");
 
   FT("formatting_blockquote",
-     "[atom&formatting&formatting-quote > ][atom foo]");
+     "[quote&quote-1&formatting&formatting-quote&formatting-quote-1 > ][quote&quote-1 foo]");
 
   FT("formatting_list",
      "[variable-2&formatting&formatting-list&formatting-list-ul - ][variable-2 foo]");
@@ -193,50 +193,50 @@
 
   // Single-line blockquote with trailing space
   MT("blockquoteSpace",
-     "[atom > foo]");
+     "[quote&quote-1 > foo]");
 
   // Single-line blockquote
   MT("blockquoteNoSpace",
-     "[atom >foo]");
+     "[quote&quote-1 >foo]");
 
   // No blank line before blockquote
   MT("blockquoteNoBlankLine",
      "foo",
-     "[atom > bar]");
+     "[quote&quote-1 > bar]");
 
   // Nested blockquote
   MT("blockquoteSpace",
-     "[atom > foo]",
-     "[number > > foo]",
-     "[atom > > > foo]");
+     "[quote&quote-1 > foo]",
+     "[quote&quote-1 >][quote&quote-2 > foo]",
+     "[quote&quote-1 >][quote&quote-2 >][quote&quote-3 > foo]");
 
   // Single-line blockquote followed by normal paragraph
   MT("blockquoteThenParagraph",
-     "[atom >foo]",
+     "[quote&quote-1 >foo]",
      "",
      "bar");
 
   // Multi-line blockquote (lazy mode)
   MT("multiBlockquoteLazy",
-     "[atom >foo]",
-     "[atom bar]");
+     "[quote&quote-1 >foo]",
+     "[quote&quote-1 bar]");
 
   // Multi-line blockquote followed by normal paragraph (lazy mode)
   MT("multiBlockquoteLazyThenParagraph",
-     "[atom >foo]",
-     "[atom bar]",
+     "[quote&quote-1 >foo]",
+     "[quote&quote-1 bar]",
      "",
      "hello");
 
   // Multi-line blockquote (non-lazy mode)
   MT("multiBlockquote",
-     "[atom >foo]",
-     "[atom >bar]");
+     "[quote&quote-1 >foo]",
+     "[quote&quote-1 >bar]");
 
   // Multi-line blockquote followed by normal paragraph (non-lazy mode)
   MT("multiBlockquoteThenParagraph",
-     "[atom >foo]",
-     "[atom >bar]",
+     "[quote&quote-1 >foo]",
+     "[quote&quote-1 >bar]",
      "",
      "hello");
 
@@ -366,7 +366,7 @@
      "",
      "[variable-2 * bar]",
      "",
-     "    [variable-2&atom > hello]");
+     "    [variable-2&quote&quote-1 > hello]");
 
   // Code block
   MT("blockquoteCode",
@@ -424,7 +424,7 @@
      "",
      "    [variable-3 + bar]",
      "",
-     "        [atom&variable-3 > hello]");
+     "        [quote&quote-1&variable-3 > hello]");
 
   MT("listCode",
      "[variable-2 * foo]",

From 462ca4c6f96f777433c69706db6292197cb4c2a0 Mon Sep 17 00:00:00 2001
From: Nikita Vasilyev <me@elv1s.ru>
Date: Thu, 2 Jan 2014 10:42:36 -0800
Subject: [PATCH 0740/4742] Use requestAnimationFrame to prevent hing pop-over
 from flickering.

Fixes #1852.
---
 addon/hint/show-hint.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 1c60603ea2..7e03d1139a 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -64,10 +64,15 @@
       this.widget = new Widget(this, data);
       CodeMirror.signal(data, "shown");
 
-      var debounce = null, completion = this, finished;
+      var debounce = 0, completion = this, finished;
       var closeOn = this.options.closeCharacters || /[\s()\[\]{};:>,]/;
       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 (finished) return;
         finished = true;
@@ -91,15 +96,22 @@
         completion.widget = new Widget(completion, data);
       }
 
+      function clearDebounce() {
+        if (debounce) {
+          cancelAnimationFrame(debounce);
+          debounce = 0;
+        }
+      }
+
       function activity() {
-        clearTimeout(debounce);
+        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 = setTimeout(update, 170);
+          debounce = requestAnimationFrame(update);
           if (completion.widget) completion.widget.close();
         }
       }

From 4a9409922d3f7d4272e336d9b7db9b31d84305de Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 Jan 2014 23:00:52 +0100
Subject: [PATCH 0741/4742] [xml mode] Remove obsolete state property

---
 mode/xml/xml.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index c296be7eb8..f6e7c08b57 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -275,16 +275,14 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       return {tokenize: inText,
               state: baseState,
               indented: 0,
-              startOfLine: true,
               tagName: null, tagStart: null,
               context: null};
     },
 
     token: function(stream, state) {
-      if (!state.tagName && stream.sol()) {
-        state.startOfLine = true;
+      if (!state.tagName && stream.sol())
         state.indented = stream.indentation();
-      }
+
       if (stream.eatSpace()) return null;
       tagName = type = null;
       var style = state.tokenize(stream, state);
@@ -294,7 +292,6 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         if (setStyle)
           style = setStyle == "error" ? style + " error" : setStyle;
       }
-      state.startOfLine = false;
       return style;
     },
 

From e4236a130b7bea241651aaa2669ac34f6a062c99 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 Jan 2014 23:08:54 +0100
Subject: [PATCH 0742/4742] [xml mode] Fix indentation inside elts whose
 opening tag spans lines

Closes #2098
---
 mode/xml/xml.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index f6e7c08b57..bf1fd14a4e 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -171,15 +171,13 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     };
   }
 
-  function pushContext(state, tagName, startOfLine) {
-    var noIndent = Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent);
-    state.context = {
-      prev: state.context,
-      tagName: tagName,
-      indent: state.indented,
-      startOfLine: startOfLine,
-      noIndent: noIndent
-    };
+  function Context(state, tagName, startOfLine) {
+    this.prev = state.context;
+    this.tagName = tagName;
+    this.indent = state.indented;
+    this.startOfLine = startOfLine;
+    if (Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
+      this.noIndent = true;
   }
   function popContext(state) {
     if (state.context) state.context = state.context.prev;
@@ -234,7 +232,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     return closeState(type, stream, state);
   }
 
-  function attrState(type, stream, state) {
+  function attrState(type, _stream, state) {
     if (type == "word") {
       setStyle = "attribute";
       return attrEqState;
@@ -246,7 +244,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         maybePopContext(state, tagName.toLowerCase());
       } else {
         maybePopContext(state, tagName.toLowerCase());
-        pushContext(state, tagName, tagStart == stream.indentation());
+        state.context = new Context(state, tagName, tagStart == state.indented);
       }
       return baseState;
     }

From 5eb4cda909bcc9d9411f12f00a2669d0bd005360 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 4 Jan 2014 23:27:15 +0100
Subject: [PATCH 0743/4742] [haskell mode] Improve tokeniziation of '[1..100]'

Closes #2099
---
 mode/haskell/haskell.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index 68a6317e64..facfd00a65 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -8,7 +8,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
   // These should all be Unicode extended, as per the Haskell 2010 report
   var smallRE = /[a-z_]/;
   var largeRE = /[A-Z]/;
-  var digitRE = /[0-9]/;
+  var digitRE = /\d/;
   var hexitRE = /[0-9A-Fa-f]/;
   var octitRE = /[0-7]/;
   var idRE = /[a-z_A-Z0-9']/;
@@ -76,9 +76,8 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
       }
       source.eatWhile(digitRE);
       var t = "number";
-      if (source.eat('.')) {
+      if (source.match(/^\.\d+/)) {
         t = "number";
-        source.eatWhile(digitRE); // should require at least 1
       }
       if (source.eat(/[eE]/)) {
         t = "number";
@@ -88,6 +87,9 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
       return t;
     }
 
+    if (ch == "." && source.eat("."))
+      return "keyword";
+
     if (symbolRE.test(ch)) {
       if (ch == '-' && source.eat(/-/)) {
         source.eatWhile(/-/);

From 7b8b8b59ab3e383b578d88af90b6657392a90a6e Mon Sep 17 00:00:00 2001
From: Sebastian Zaha <sebastian.zaha@gmail.com>
Date: Sat, 4 Jan 2014 21:31:24 +0100
Subject: [PATCH 0744/4742] [emacs keymap] Copy action now kills selection

---
 keymap/emacs.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 7a3dfb11ac..f08e2e8d48 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -249,6 +249,8 @@
     }),
     "Alt-W": function(cm) {
       addToRing(cm.getSelection());
+      cm.setExtending(false);
+      cm.setCursor(cm.getCursor());
     },
     "Ctrl-Y": function(cm) {
       var start = cm.getCursor();

From 2d2f94dcf910a62305d077a9c4af48fd2e0dfb3f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 5 Jan 2014 00:02:15 +0100
Subject: [PATCH 0745/4742] [real-world uses] Reword link

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 9c12fba640..310238c053 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -99,7 +99,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://github.com/mamacdon/orion-codemirror">Orion-CodeMirror integration</a> (running CodeMirror modes in Orion)</li>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
       <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
-      <li><a href="http://projects.parmleyhunt.com/">Projects</a> (experimental IDE)</li>
+      <li><a href="http://projects.parmleyhunt.com/">Projects online IDE</a></li>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
       <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>
       <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>

From ccae1589dd7414a8eef0826d832b4e2b7844e9d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 5 Jan 2014 12:36:37 +0100
Subject: [PATCH 0746/4742] Add atypical key codes that FF uses for - and =
 keys to keyNames

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 763f852ca8..bc5da913ce 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5733,8 +5733,8 @@ window.CodeMirror = (function() {
   var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
                   19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
                   36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-                  46: "Delete", 59: ";", 91: "Mod", 92: "Mod", 93: "Mod", 107: "=", 109: "-", 127: "Delete",
-                  186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
+                  46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod", 107: "=", 109: "-", 127: "Delete",
+                  173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
                   221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
                   63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"};
   CodeMirror.keyNames = keyNames;

From e221e3c38394b8de65c927c70bb2efe3dd2f5478 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 12:02:27 +0100
Subject: [PATCH 0747/4742] [real-world uses] Remove link again

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 310238c053..b9e35f2dfc 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -99,7 +99,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://github.com/mamacdon/orion-codemirror">Orion-CodeMirror integration</a> (running CodeMirror modes in Orion)</li>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
       <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
-      <li><a href="http://projects.parmleyhunt.com/">Projects online IDE</a></li>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
       <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>
       <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>

From de66ee90fc8c000dd7d2d6830a1b1d0ddc816b50 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 12:46:14 +0100
Subject: [PATCH 0748/4742] Add the addModeClass option

Issue #2107
---
 doc/manual.html   |  7 +++++++
 lib/codemirror.js | 22 ++++++++++++++++------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 33953c11ea..c56af630e5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -402,6 +402,13 @@ <h2>Configuration</h2>
       document looks. You can set this option to false to disable this
       behavior.</dd>
 
+      <dt id="option_addModeClass"><code><strong>addModeClass</strong>: boolean</code></dt>
+      <dd>When enabled (off by default), an extra CSS class will be
+      added to each token, indicating the
+      (<a href="#innerMode">inner</a>) mode that produced it, prefixed
+      with <code>"cm-m-"</code>. For example, tokens from the XML mode
+      will get the <code>cm-m-xml</code> class.</dd>
+
       <dt id="option_maxHighlightLength"><code><strong>maxHighlightLength</strong>: number</code></dt>
       <dd>When highlighting long lines, in order to stay responsive,
       the editor will give up and simply style the rest of the line as
diff --git a/lib/codemirror.js b/lib/codemirror.js
index bc5da913ce..2d2fb0b45c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -195,6 +195,10 @@ window.CodeMirror = (function() {
 
   function loadMode(cm) {
     cm.doc.mode = CodeMirror.getMode(cm.options, cm.doc.modeOption);
+    resetModeState(cm);
+  }
+
+  function resetModeState(cm) {
     cm.doc.iter(function(line) {
       if (line.stateAfter) line.stateAfter = null;
       if (line.styles) line.styles = null;
@@ -3312,7 +3316,7 @@ window.CodeMirror = (function() {
   option("indentWithTabs", false);
   option("smartIndent", true);
   option("tabSize", 4, function(cm) {
-    loadMode(cm);
+    resetModeState(cm);
     clearCaches(cm);
     regChange(cm);
   }, true);
@@ -3372,12 +3376,13 @@ window.CodeMirror = (function() {
   option("cursorHeight", 1);
   option("workTime", 100);
   option("workDelay", 100);
-  option("flattenSpans", true);
+  option("flattenSpans", true, resetModeState, true);
+  option("addModeClass", false, resetModeState, true);
   option("pollInterval", 100);
   option("undoDepth", 40, function(cm, val){cm.doc.history.undoDepth = val;});
   option("historyEventDelay", 500);
   option("viewportMargin", 10, function(cm){cm.refresh();}, true);
-  option("maxHighlightLength", 10000, function(cm){loadMode(cm); cm.refresh();}, true);
+  option("maxHighlightLength", 10000, resetModeState, true);
   option("crudeMeasuringFrom", 10000);
   option("moveInputWithCursor", true, function(cm, val) {
     if (!val) cm.display.inputDiv.style.top = cm.display.inputDiv.style.left = 0;
@@ -4381,6 +4386,10 @@ window.CodeMirror = (function() {
       } else {
         style = mode.token(stream, state);
       }
+      if (cm.options.addModeClass) {
+        var mName = CodeMirror.innerMode(mode, state).mode.name;
+        if (mName) style = "m-" + (style ? mName + " " + style : mName);
+      }
       if (!flattenSpans || curStyle != style) {
         if (curStart < stream.start) f(stream.start, curStyle);
         curStart = stream.start; curStyle = style;
@@ -4452,7 +4461,7 @@ window.CodeMirror = (function() {
     }
   }
 
-  var styleToClassCache = {};
+  var styleToClassCache = {}, styleToClassCacheWithMode = {};
   function interpretTokenStyle(style, builder) {
     if (!style) return null;
     for (;;) {
@@ -4465,8 +4474,9 @@ window.CodeMirror = (function() {
       else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(builder[prop]))
         builder[prop] += " " + lineClass[2];
     }
-    return styleToClassCache[style] ||
-      (styleToClassCache[style] = "cm-" + style.replace(/ +/g, " cm-"));
+    var cache = builder.cm.options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
+    return cache[style] ||
+      (cache[style] = "cm-" + style.replace(/ +/g, " cm-"));
   }
 
   function buildLineContent(cm, realLine, measure, copyWidgets) {

From 337e435328b920af0f74c9c707df9b4326b210b1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 13:23:36 +0100
Subject: [PATCH 0749/4742] Add a disableInput option, change vim keymap to use
 it.

---
 keymap/vim.js     | 5 ++++-
 lib/codemirror.js | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c83f6f08ae..78b83e5116 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -331,12 +331,14 @@
     CodeMirror.defineOption('vimMode', false, function(cm, val) {
       if (val) {
         cm.setOption('keyMap', 'vim');
+        cm.setOption('disableInput', true);
         CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
         cm.on('beforeSelectionChange', beforeSelectionChange);
         maybeInitVimState(cm);
         CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
       } else if (cm.state.vim) {
         cm.setOption('keyMap', 'default');
+        cm.setOption('disableInput', false);
         cm.off('beforeSelectionChange', beforeSelectionChange);
         CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
         cm.state.vim = null;
@@ -1749,6 +1751,7 @@
           cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
         }
         cm.setOption('keyMap', 'vim-insert');
+        cm.setOption('disableInput', false);
         if (actionArgs && actionArgs.replace) {
           // Handle Replace-mode as a special case of insert mode.
           cm.toggleOverwrite(true);
@@ -3509,7 +3512,6 @@
 
       var cmToVimKeymap = {
         'nofallthrough': true,
-        'disableInput': true,
         'style': 'fat-cursor'
       };
       function bindKeys(keys, modifier) {
@@ -3556,6 +3558,7 @@
       cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
       vim.insertMode = false;
       cm.setOption('keyMap', 'vim');
+      cm.setOption('disableInput', true);
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
     }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2d2fb0b45c..0bff9eccf4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -248,8 +248,6 @@ window.CodeMirror = (function() {
     var map = keyMap[cm.options.keyMap], style = map.style;
     cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
       (style ? " cm-keymap-" + style : "");
-    if (cm.state.disableInput && !map.disableInput) resetInput(cm, true);
-    cm.state.disableInput = map.disableInput;
   }
 
   function themeChanged(cm) {
@@ -1487,7 +1485,7 @@ window.CodeMirror = (function() {
   // supported or compatible enough yet to rely on.)
   function readInput(cm) {
     var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc, sel = doc.sel;
-    if (!cm.state.focused || hasSelection(input) || isReadOnly(cm) || cm.state.disableInput) return false;
+    if (!cm.state.focused || hasSelection(input) || isReadOnly(cm) || cm.options.disableInput) return false;
     if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
       input.value = input.value.substring(0, input.value.length - 1);
       cm.state.fakedLastChar = false;
@@ -3369,6 +3367,7 @@ window.CodeMirror = (function() {
       if (!val) resetInput(cm, true);
     }
   });
+  option("disableInput", false, function(cm, val) {if (!val) resetInput(cm, true);}, true);
   option("dragDrop", true);
 
   option("cursorBlinkRate", 530);

From 58113e8a8945cfd8f6310240c5b86564d59b0e07 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 13:28:58 +0100
Subject: [PATCH 0750/4742] Adjust addons to respect disableInput

---
 addon/comment/continuecomment.js | 2 +-
 addon/edit/closebrackets.js      | 8 +++++---
 addon/edit/closetag.js           | 5 +++--
 addon/edit/continuelist.js       | 2 ++
 lib/codemirror.js                | 4 +++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 94e5a3760f..a3370a6072 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -5,7 +5,7 @@
 
   function continueComment(cm) {
     var pos = cm.getCursor(), token = cm.getTokenAt(pos);
-    if (token.type != "comment") return CodeMirror.Pass;
+    if (token.type != "comment" || cm.getOption("disableInput")) return CodeMirror.Pass;
     var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
 
     var insert;
diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 88718b7729..0575222be6 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -28,7 +28,7 @@
     var map = {
       name : "autoCloseBrackets",
       Backspace: function(cm) {
-        if (cm.somethingSelected()) return CodeMirror.Pass;
+        if (cm.somethingSelected() || cm.getOption("disableInput")) return CodeMirror.Pass;
         var cur = cm.getCursor(), around = charsAround(cm, cur);
         if (around && pairs.indexOf(around) % 2 == 0)
           cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
@@ -49,7 +49,8 @@
         else cm.execCommand("goCharRight");
       }
       map["'" + left + "'"] = function(cm) {
-        if (left == "'" && cm.getTokenAt(cm.getCursor()).type == "comment")
+        if (left == "'" && cm.getTokenAt(cm.getCursor()).type == "comment" ||
+            cm.getOption("disableInput"))
           return CodeMirror.Pass;
         if (cm.somethingSelected()) return surround(cm);
         if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
@@ -70,7 +71,8 @@
   function buildExplodeHandler(pairs) {
     return function(cm) {
       var cur = cm.getCursor(), around = charsAround(cm, cur);
-      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+      if (!around || pairs.indexOf(around) % 2 != 0 || cm.getOption("disableInput"))
+        return CodeMirror.Pass;
       cm.operation(function() {
         var newPos = CodeMirror.Pos(cur.line + 1, 0);
         cm.replaceSelection("\n\n", {anchor: newPos, head: newPos}, "+input");
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 60e204bcf2..cad776a783 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -43,7 +43,7 @@
   function autoCloseGT(cm) {
     var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
     var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
+    if (inner.mode.name != "xml" || !state.tagName || cm.getOption("disableInput")) return CodeMirror.Pass;
 
     var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
     var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
@@ -76,7 +76,8 @@
     var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
     var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
     if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-        tok.start != pos.ch - 1 || inner.mode.name != "xml")
+        tok.start != pos.ch - 1 || inner.mode.name != "xml" ||
+        cm.getOption("disableInput"))
       return CodeMirror.Pass;
 
     var tagName = state.context && state.context.tagName;
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 826d17d716..190b41dcbe 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -5,6 +5,8 @@
       unorderedBullets = '*+-';
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+
     var pos = cm.getCursor(),
         inList = cm.getStateAfter(pos.line).list !== false,
         match;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0bff9eccf4..c728d97c45 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3582,7 +3582,9 @@ window.CodeMirror = (function() {
     indentAuto: function(cm) {cm.indentSelection("smart");},
     indentMore: function(cm) {cm.indentSelection("add");},
     indentLess: function(cm) {cm.indentSelection("subtract");},
-    insertTab: function(cm) {cm.replaceSelection("\t", "end", "+input");},
+    insertTab: function(cm) {
+      cm.replaceSelection("\t", "end", "+input");
+    },
     defaultTab: function(cm) {
       if (cm.somethingSelected()) cm.indentSelection("add");
       else cm.replaceSelection("\t", "end", "+input");

From ad2fccb4fd38344441593201f7491e15ef2d2255 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 13:48:23 +0100
Subject: [PATCH 0751/4742] [anyword-hint addon] Optimize

Issue #2109
---
 addon/hint/anyword-hint.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index 36ff618e09..67eaa0f617 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -13,22 +13,20 @@
     var curWord = start != end && curLine.slice(start, end);
 
     var list = [], seen = {};
-    function scan(dir) {
+    var re = new RegExp(word.source, "g");
+    for (var dir = -1; dir <= 1; dir += 2) {
       var line = cur.line, end = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
       for (; line != end; line += dir) {
         var text = editor.getLine(line), m;
-        var re = new RegExp(word.source, "g");
         while (m = re.exec(text)) {
           if (line == cur.line && m[0] === curWord) continue;
-          if ((!curWord || m[0].indexOf(curWord) == 0) && !seen.hasOwnProperty(m[0])) {
+          if ((!curWord || m[0].indexOf(curWord) == 0) && !Object.prototype.hasOwnProperty.call(seen, m[0])) {
             seen[m[0]] = true;
             list.push(m[0]);
           }
         }
       }
     }
-    scan(-1);
-    scan(1);
     return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
   });
 })();

From 22dd7235e352b2e1caf3fe9b1656989d5983b968 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 14:28:52 +0100
Subject: [PATCH 0752/4742] Use lastIndexOf(a, 0) to check starts-with in hint
 addons

Issue #2109
---
 addon/hint/anyword-hint.js    |  2 +-
 addon/hint/css-hint.js        |  2 +-
 addon/hint/javascript-hint.js |  2 +-
 addon/hint/pig-hint.js        |  2 +-
 addon/hint/python-hint.js     |  2 +-
 addon/hint/xml-hint.js        | 10 +++++-----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index 67eaa0f617..a144768c81 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -20,7 +20,7 @@
         var text = editor.getLine(line), m;
         while (m = re.exec(text)) {
           if (line == cur.line && m[0] === curWord) continue;
-          if ((!curWord || m[0].indexOf(curWord) == 0) && !Object.prototype.hasOwnProperty.call(seen, m[0])) {
+          if ((!curWord || m[0].lastIndexOf(curWord, 0) == 0) && !Object.prototype.hasOwnProperty.call(seen, m[0])) {
             seen[m[0]] = true;
             list.push(m[0]);
           }
diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 43bdf5de02..6789c458ba 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -20,7 +20,7 @@
     var result = [];
     function add(keywords) {
       for (var name in keywords)
-        if (!word || name.indexOf(word) == 0)
+        if (!word || name.lastIndexOf(word, 0) == 0)
           result.push(name);
     }
 
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index c66b0a7a5b..c347c206ec 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -87,7 +87,7 @@
   function getCompletions(token, context, keywords, options) {
     var found = [], start = token.string;
     function maybeAdd(str) {
-      if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
+      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
     }
     function gatherCompletions(obj) {
       if (typeof obj == "string") forEach(stringProps, maybeAdd);
diff --git a/addon/hint/pig-hint.js b/addon/hint/pig-hint.js
index 7ef336cecf..6c0c523774 100644
--- a/addon/hint/pig-hint.js
+++ b/addon/hint/pig-hint.js
@@ -84,7 +84,7 @@
   function getCompletions(token, context) {
     var found = [], start = token.string;
     function maybeAdd(str) {
-      if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
+      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
     }
 
     function gatherCompletions(obj) {
diff --git a/addon/hint/python-hint.js b/addon/hint/python-hint.js
index ace1941bd6..248284e8c5 100644
--- a/addon/hint/python-hint.js
+++ b/addon/hint/python-hint.js
@@ -62,7 +62,7 @@
   function getCompletions(token, context) {
     var found = [], start = token.string;
     function maybeAdd(str) {
-      if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
+      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
     }
 
     function gatherCompletions(_obj) {
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index a721743449..69f2b771fe 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -20,13 +20,13 @@
       var cx = inner.state.context, curTag = cx && tags[cx.tagName];
       var childList = cx ? curTag && curTag.children : tags["!top"];
       if (childList) {
-        for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].indexOf(prefix) == 0)
+        for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].lastIndexOf(prefix, 0) == 0)
           result.push("<" + childList[i]);
       } else {
-        for (var name in tags) if (tags.hasOwnProperty(name) && name != "!top" && (!prefix || name.indexOf(prefix) == 0))
+        for (var name in tags) if (tags.hasOwnProperty(name) && name != "!top" && (!prefix || name.lastIndexOf(prefix, 0) == 0))
           result.push("<" + name);
       }
-      if (cx && (!prefix || ("/" + cx.tagName).indexOf(prefix) == 0))
+      if (cx && (!prefix || ("/" + cx.tagName).lastIndexOf(prefix, 0) == 0))
         result.push("</" + cx.tagName + ">");
     } else {
       // Attribute completion
@@ -46,14 +46,14 @@
           }
           replaceToken = true;
         }
-        for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].indexOf(prefix) == 0)
+        for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].lastIndexOf(prefix, 0) == 0)
           result.push(quote + atValues[i] + quote);
       } else { // An attribute name
         if (token.type == "attribute") {
           prefix = token.string;
           replaceToken = true;
         }
-        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || attr.indexOf(prefix) == 0))
+        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || attr.lastIndexOf(prefix, 0) == 0))
           result.push(attr);
       }
     }

From d73e38fdbf43508267b257a595cd962e8572415a Mon Sep 17 00:00:00 2001
From: AtomicPages LLC <contact@atomicpages.net>
Date: Sun, 5 Jan 2014 14:41:57 -0800
Subject: [PATCH 0753/4742] [pastel-on-dark theme] Add

---
 demo/theme.html          |  2 ++
 theme/pastel-on-dark.css | 49 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 theme/pastel-on-dark.css

diff --git a/demo/theme.html b/demo/theme.html
index a6e2b2da09..e36e62eaa3 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -23,6 +23,7 @@
 <link rel="stylesheet" href="../theme/night.css">
 <link rel="stylesheet" href="../theme/paraiso-dark.css">
 <link rel="stylesheet" href="../theme/paraiso-light.css">
+<link rel="stylesheet" href="../theme/pastel-on-dark.css">
 <link rel="stylesheet" href="../theme/rubyblue.css">
 <link rel="stylesheet" href="../theme/solarized.css">
 <link rel="stylesheet" href="../theme/the-matrix.css">
@@ -88,6 +89,7 @@ <h2>Theme Demo</h2>
     <option>night</option>
     <option>paraiso-dark</option>
     <option>paraiso-light</option>
+    <option>pastel-on-dark</option>
     <option>rubyblue</option>
     <option>solarized dark</option>
     <option>solarized light</option>
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
new file mode 100644
index 0000000000..df95699a01
--- /dev/null
+++ b/theme/pastel-on-dark.css
@@ -0,0 +1,49 @@
+/**
+ * Pastel On Dark theme ported from ACE editor
+ * @license MIT
+ * @copyright AtomicPages LLC 2014
+ * @author Dennis Thompson, AtomicPages LLC
+ * @version 1.1
+ * @source https://github.com/atomicpages/codemirror-pastel-on-dark-theme
+ */
+
+.cm-s-pastel-on-dark.CodeMirror {
+	background: #2c2827;
+	color: #8F938F;
+	line-height: 1.5;
+	font-family: consolas, Courier, monospace;
+	font-size: 14px;
+}
+.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2) !important; }
+.cm-s-pastel-on-dark .CodeMirror-gutters {
+	background: #34302f;
+	border-right: 0px;
+	padding: 0 3px;
+}
+.cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
+.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
+.cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
+.cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
+.cm-s-pastel-on-dark span.cm-property { color: #8F938F; }
+.cm-s-pastel-on-dark span.cm-attribute { color: #a6e22e; }
+.cm-s-pastel-on-dark span.cm-keyword { color: #AEB2F8; }
+.cm-s-pastel-on-dark span.cm-string { color: #66A968; }
+.cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
+.cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
+.cm-s-pastel-on-dark span.cm-variable-3 { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
+.cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
+.cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
+.cm-s-pastel-on-dark span.cm-link { color: #ae81ff; }
+.cm-s-pastel-on-dark span.cm-qualifier,.cm-s-pastel-on-dark span.cm-builtin { color: #C1C144; }
+.cm-s-pastel-on-dark span.cm-error {
+	background: #757aD8;
+	color: #f8f8f0;
+}
+.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031) !important; }
+.cm-s-pastel-on-dark .CodeMirror-matchingbracket {
+	border: 1px solid rgba(255,255,255,0.25);
+	color: #8F938F !important;
+	margin: -1px -1px 0 -1px;
+}

From a8440788cdbfc79f998a84b8320d047936dda60c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 20:11:54 +0100
Subject: [PATCH 0754/4742] [multiplex addon] Support end: null to mean switch
 back at end of line

Issue #2111
---
 addon/mode/multiplex.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 32cc579c3a..614ab1add3 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -47,7 +47,11 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         return outerToken;
       } else {
         var curInner = state.innerActive, oldContent = stream.string;
-        var found = indexOf(oldContent, curInner.close, stream.pos);
+        if (!curInner.close && stream.sol()) {
+          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) {
           stream.match(curInner.close);
           state.innerActive = state.inner = null;
@@ -56,8 +60,6 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         if (found > -1) stream.string = oldContent.slice(0, found);
         var innerToken = curInner.mode.token(stream, state.inner);
         if (found > -1) stream.string = oldContent;
-        var cur = stream.current(), found = cur.indexOf(curInner.close);
-        if (found > -1) stream.backUp(cur.length - found);
 
         if (curInner.innerStyle) {
           if (innerToken) innerToken = innerToken + ' ' + curInner.innerStyle;

From c1b518e91e93c5812093810dfb5d049971d1a926 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 7 Jan 2014 12:50:19 +0100
Subject: [PATCH 0755/4742] [hardwrap addon] Make methods return true when they
 made a change

---
 addon/wrap/hardwrap.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 1faa3d84a6..3023ca5b8e 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -36,7 +36,7 @@
     var killTrailing = options.killTrailingSpace !== false;
     var changes = [], curLine = "", curNo = from.line;
     var lines = cm.getRange(from, to, false);
-    if (!lines.length) return;
+    if (!lines.length) return false;
     var leadingSpace = lines[0].match(/^[ \t]*/)[0];
 
     for (var i = 0; i < lines.length; ++i) {
@@ -79,17 +79,18 @@
         cm.replaceRange(change.text, change.from, change.to);
       }
     });
+    return changes.length > 0;
   }
 
   CodeMirror.defineExtension("wrapParagraph", function(pos, options) {
     options = options || {};
     if (!pos) pos = this.getCursor();
     var para = findParagraph(this, pos, options);
-    wrapRange(this, Pos(para.from, 0), Pos(para.to - 1), options);
+    return wrapRange(this, Pos(para.from, 0), Pos(para.to - 1), options);
   });
 
   CodeMirror.defineExtension("wrapRange", function(from, to, options) {
-    wrapRange(this, from, to, options || {});
+    return wrapRange(this, from, to, options || {});
   });
 
   CodeMirror.defineExtension("wrapParagraphsInRange", function(from, to, options) {
@@ -100,9 +101,11 @@
       paras.push(para);
       line = para.to;
     }
+    var madeChange = false;
     if (paras.length) cm.operation(function() {
       for (var i = paras.length - 1; i >= 0; --i)
-        wrapRange(cm, Pos(paras[i].from, 0), Pos(paras[i].to - 1), options);
+        madeChange = madeChange || wrapRange(cm, Pos(paras[i].from, 0), Pos(paras[i].to - 1), options);
     });
+    return madeChange;
   });
 })();

From bc5bc136b16b2df4ea3285f2bb6fd3f5a711afd4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 20:54:32 +0100
Subject: [PATCH 0756/4742] [xml mode] Fix bug with value-less attributes

Closes #2112
---
 mode/xml/xml.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index bf1fd14a4e..c75200ec7b 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -254,7 +254,6 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   function attrEqState(type, stream, state) {
     if (type == "equals") return attrValueState;
     if (!Kludges.allowMissing) setStyle = "error";
-    else if (type == "word") { setStyle = "attribute"; return attrState; }
     return attrState(type, stream, state);
   }
   function attrValueState(type, stream, state) {

From 232d819c4b17bdd6ca372fac4d32b1d101c5d0bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 8 Jan 2014 09:50:19 +0100
Subject: [PATCH 0757/4742] [mbo theme] Fix searching style

---
 theme/mbo.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/mbo.css b/theme/mbo.css
index 93fe3ee24c..bb52e6d17f 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -30,7 +30,7 @@
  
 .cm-s-mbo .CodeMirror-matchingtag {background: #4e4e4e;}
 
-div.CodeMirror span.CodeMirror-searching {
+.cm-s-mbo span.cm-searching {
   background-color: none;
   background: none;
   box-shadow: 0 0 0 1px #ffffec;

From 83df2a9ef5a4f68eefd0e1e01f5c7417c32196d7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 8 Jan 2014 11:40:10 +0100
Subject: [PATCH 0758/4742] Apply some IE workarounds to IE11 as well.

Despite the 'I am not IE!' user-agent string, it seems to have
inherited a lot of the old bugs.

Closes #2118
---
 index.html        |  2 +-
 lib/codemirror.js | 35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/index.html b/index.html
index f9a93897fb..914bb7867d 100644
--- a/index.html
+++ b/index.html
@@ -133,7 +133,7 @@ <h2>Features</h2>
     <li>Programmable <a href="demo/marker.html">gutters</a>
     <li>Making ranges of text <a href="doc/manual.html#markText">styled, read-only, or atomic</a>
     <li><a href="demo/bidi.html">Bi-directional text</a> support
-    <li>Many other <a href="doc/manual.html#api">methods</a> and <a href="doc/manual.html#addons">addons</a>...</a>
+    <li>Many other <a href="doc/manual.html#api">methods</a> and <a href="doc/manual.html#addons">addons</a>...
   </ul>
 </section>
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c728d97c45..728b7faef4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -10,10 +10,11 @@ window.CodeMirror = (function() {
   // IE11 currently doesn't count as 'ie', since it has almost none of
   // the same bugs as earlier versions. Use ie_gt10 to handle
   // incompatibilities in that version.
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt8 = ie && (document.documentMode == null || document.documentMode < 8);
-  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
+  var old_ie = /MSIE \d/.test(navigator.userAgent);
+  var ie_lt8 = old_ie && (document.documentMode == null || document.documentMode < 8);
+  var ie_lt9 = old_ie && (document.documentMode == null || document.documentMode < 9);
   var ie_gt10 = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
+  var ie = old_ie || ie_gt10;
   var webkit = /WebKit\//.test(navigator.userAgent);
   var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
   var chrome = /Chrome\//.test(navigator.userAgent);
@@ -35,7 +36,7 @@ window.CodeMirror = (function() {
   if (opera_version && opera_version >= 15) { opera = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
   var flipCtrlCmd = mac && (qtwebkit || opera && (opera_version == null || opera_version < 12.11));
-  var captureMiddleClick = gecko || (ie && !ie_lt9);
+  var captureMiddleClick = gecko || (old_ie && !ie_lt9);
 
   // Optimize some code when these features are not used
   var sawReadOnlySpans = false, sawCollapsedSpans = false;
@@ -75,7 +76,7 @@ window.CodeMirror = (function() {
 
     // Override magic textarea content restore that IE sometimes does
     // on our hidden textarea on reload
-    if (ie) setTimeout(bind(resetInput, this, true), 20);
+    if (old_ie) setTimeout(bind(resetInput, this, true), 20);
 
     registerEventHandlers(this);
     // IE throws unspecified error in certain cases, when
@@ -1057,7 +1058,7 @@ window.CodeMirror = (function() {
     // doesn't work when wrapping is on, but in that case the
     // situation is slightly better, since IE does cache line-wrapping
     // information and only recomputes per-line.
-    if (ie && !ie_lt8 && !cm.options.lineWrapping && pre.childNodes.length > 100) {
+    if (old_ie && !ie_lt8 && !cm.options.lineWrapping && pre.childNodes.length > 100) {
       var fragment = document.createDocumentFragment();
       var chunk = 10, n = pre.childNodes.length;
       for (var i = 0, chunks = Math.ceil(n / chunk); i < chunks; ++i) {
@@ -1563,7 +1564,7 @@ window.CodeMirror = (function() {
   function registerEventHandlers(cm) {
     var d = cm.display;
     on(d.scroller, "mousedown", operation(cm, onMouseDown));
-    if (ie)
+    if (old_ie)
       on(d.scroller, "dblclick", operation(cm, function(e) {
         if (signalDOMEvent(cm, e)) return;
         var pos = posFromMouse(cm, e);
@@ -1682,8 +1683,8 @@ window.CodeMirror = (function() {
 
     // Needed to handle Tab key in KHTML
     if (khtml) on(d.sizer, "mouseup", function() {
-        if (document.activeElement == d.input) d.input.blur();
-        focusInput(cm);
+      if (document.activeElement == d.input) d.input.blur();
+      focusInput(cm);
     });
   }
 
@@ -1841,7 +1842,7 @@ window.CodeMirror = (function() {
     }
 
     var move = operation(cm, function(e) {
-      if (!ie && !e_button(e)) done(e);
+      if (!old_ie && !e_button(e)) done(e);
       else extend(e);
     });
     var up = operation(cm, done);
@@ -1986,7 +1987,7 @@ window.CodeMirror = (function() {
   // know one. These don't have to be accurate -- the result of them
   // being wrong would just be a slight flicker on the first wheel
   // scroll (if it is large enough).
-  if (ie) wheelPixelsPerUnit = -.53;
+  if (old_ie) wheelPixelsPerUnit = -.53;
   else if (gecko) wheelPixelsPerUnit = 15;
   else if (chrome) wheelPixelsPerUnit = -.7;
   else if (safari) wheelPixelsPerUnit = -1/3;
@@ -2140,7 +2141,7 @@ window.CodeMirror = (function() {
     var cm = this;
     if (!cm.state.focused) onFocus(cm);
     if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
-    if (ie && e.keyCode == 27) e.returnValue = false;
+    if (old_ie && e.keyCode == 27) e.returnValue = false;
     var code = e.keyCode;
     // IE does strange things with escape.
     cm.doc.sel.shift = code == 16 || e.shiftKey;
@@ -2231,7 +2232,7 @@ window.CodeMirror = (function() {
 
       // Try to detect the user choosing select-all
       if (display.input.selectionStart != null) {
-        if (!ie || ie_lt9) prepareSelectAllHack();
+        if (!old_ie || ie_lt9) prepareSelectAllHack();
         clearTimeout(detectingSelectAll);
         var i = 0, poll = function(){
           if (display.prevInput == "\u200b" && display.input.selectionStart == 0)
@@ -2243,7 +2244,7 @@ window.CodeMirror = (function() {
       }
     }
 
-    if (ie && !ie_lt9) prepareSelectAllHack();
+    if (old_ie && !ie_lt9) prepareSelectAllHack();
     if (captureMiddleClick) {
       e_stop(e);
       var mouseup = function() {
@@ -4494,7 +4495,7 @@ window.CodeMirror = (function() {
       builder.measure = line == realLine && measure;
       builder.pos = 0;
       builder.addToken = builder.measure ? buildTokenMeasure : buildToken;
-      if ((ie || webkit) && cm.getOption("lineWrapping"))
+      if ((old_ie || webkit) && cm.getOption("lineWrapping"))
         builder.addToken = buildTokenSplitSpaces(builder.addToken);
       var next = insertLineContent(line, builder, getLineStyles(cm, line));
       if (measure && line == realLine && !builder.measuredSomething) {
@@ -4513,7 +4514,7 @@ window.CodeMirror = (function() {
     // Work around problem with the reported dimensions of single-char
     // direction spans on IE (issue #1129). See also the comment in
     // cursorCoords.
-    if (measure && (ie || ie_gt10) && (order = getOrder(line))) {
+    if (measure && ie && (order = getOrder(line))) {
       var l = order.length - 1;
       if (order[l].from == order[l].to) --l;
       var last = order[l], prev = order[l - 1];
@@ -4595,7 +4596,7 @@ window.CodeMirror = (function() {
       // In IE single-space nodes wrap differently than spaces
       // embedded in larger text nodes, except when set to
       // white-space: normal (issue #1268).
-      if (ie && wrapping && ch == " " && i && !/\s/.test(text.charAt(i - 1)) &&
+      if (old_ie && wrapping && ch == " " && i && !/\s/.test(text.charAt(i - 1)) &&
           i < text.length - 1 && !/\s/.test(text.charAt(i + 1)))
         span.style.whiteSpace = "normal";
       builder.pos += ch.length;

From d84acac4f92b14b46c16f157bdf8243ce314b2b5 Mon Sep 17 00:00:00 2001
From: zziuni <zziuni@gmail.com>
Date: Thu, 19 Dec 2013 17:22:48 +0900
Subject: [PATCH 0759/4742] [sql hint] support multi-queries on the table alias

Now, Sql-hint assume one query to search for table of alias.
It support multi-queries for alias.
---
 addon/hint/sql-hint.js | 75 ++++++++++++++++++++++++++++++++----------
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 95f6b50a15..d00781cff9 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -3,6 +3,10 @@
 
   var tables;
   var keywords;
+  var CONS = {
+    QUERY_DIV: ";",
+    ALIAS_KEYWORD: "AS"
+  };
 
   function getKeywords(editor) {
     var mode = editor.doc.modeOption;
@@ -34,11 +38,10 @@
     var string = token.string.substr(1);
     var prevCur = CodeMirror.Pos(cur.line, token.start);
     var table = editor.getTokenAt(prevCur).string;
-    var columns = tables[table];
-    if(!columns) {
+    if( !tables.hasOwnProperty( table ) ){
       table = findTableByAlias(table, editor);
     }
-    columns = tables[table];
+    var columns = tables[table];
     if(!columns) {
       return;
     }
@@ -46,32 +49,72 @@
         function(w) {return "." + w;});
   }
 
-  function eachWord(line, f) {
-    var words = line.text.split(" ");
-    for(var i = 0; i < words.length; i++) {
-      f(words[i]);
+  function eachWord(lineText, f) {
+    if( !lineText ){return;}
+    var excepted = /[,;]/g;
+    var words = lineText.split( " " );
+    for( var i = 0; i < words.length; i++ ){
+      f( words[i]?words[i].replace( excepted, '' ) : '' );
     }
   }
 
-  // Tries to find possible table name from alias.
+  function convertCurToNumber( cur ){
+    // max characters of a line is 999,999.
+    return cur.line + cur.ch / Math.pow( 10, 6 );
+  }
+
+  function convertNumberToCur( num ){
+    return CodeMirror.Pos(Math.floor( num ), +num.toString().split( '.' ).pop());
+  }
+
   function findTableByAlias(alias, editor) {
+    var doc = editor.doc;
+    var fullQuery = doc.getValue();
     var aliasUpperCase = alias.toUpperCase();
     var previousWord = "";
     var table = "";
+    var separator = [];
+    var validRange = {
+      start: CodeMirror.Pos( 0, 0 ),
+      end: CodeMirror.Pos( editor.lastLine(), editor.getLineHandle( editor.lastLine() ).length )
+    };
 
-    editor.eachLine(function(line) {
-      eachWord(line, function(word) {
+    //add separator
+    var indexOfSeparator = fullQuery.indexOf( CONS.QUERY_DIV );
+    while( indexOfSeparator != -1 ){
+      separator.push( doc.posFromIndex(indexOfSeparator));
+      indexOfSeparator = fullQuery.indexOf( CONS.QUERY_DIV, indexOfSeparator+1);
+    }
+    separator.unshift( CodeMirror.Pos( 0, 0 ) );
+    separator.push( CodeMirror.Pos( editor.lastLine(), editor.getLineHandle( editor.lastLine() ).text.length ) );
+
+    //find valieRange
+    var prevItem = 0;
+    var current = convertCurToNumber( editor.getCursor() );
+    for( var i=0; i< separator.length; i++){
+      var _v = convertCurToNumber( separator[i] );
+      if( current > prevItem && current <= _v ){
+        validRange = { start: convertNumberToCur( prevItem ), end: convertNumberToCur( _v ) };
+        break;
+      }
+      prevItem = _v;
+    }
+
+    var query = doc.getRange(validRange.start, validRange.end, false);
+
+    for(var i=0; i < query.length; i++){
+      var lineText = query[i];
+      eachWord( lineText, function( word ){
         var wordUpperCase = word.toUpperCase();
-        if(wordUpperCase === aliasUpperCase) {
-          if(tables.hasOwnProperty(previousWord)) {
+        if( wordUpperCase === aliasUpperCase && tables.hasOwnProperty( previousWord ) ){
             table = previousWord;
-          }
         }
-        if(wordUpperCase !== "AS") {
+        if( wordUpperCase !== CONS.ALIAS_KEYWORD ){
           previousWord = word;
         }
       });
-    });
+      if( table ){ break; }
+    }
     return table;
   }
 
@@ -80,9 +123,7 @@
     keywords = keywords || getKeywords(editor);
     var cur = editor.getCursor();
     var token = editor.getTokenAt(cur);
-
     var result = [];
-
     var search = token.string.trim();
 
     addMatches(result, search, keywords,

From eacf20f8bf113c546cf06ec9d1dea40bb3818dd3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 9 Jan 2014 23:36:36 +0100
Subject: [PATCH 0760/4742] Fix measuring of extending characters, include all
 extending code points

Issue #2125
Issue #2115
---
 lib/codemirror.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 728b7faef4..ad29f175a8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1294,7 +1294,7 @@ window.CodeMirror = (function() {
       if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
         var ch = x < fromX || x - fromX <= toX - x ? from : to;
         var xDiff = x - (ch == from ? fromX : toX);
-        while (isExtendingChar.test(lineObj.text.charAt(ch))) ++ch;
+        while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
         var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,
                               xDiff < 0 ? -1 : xDiff ? 1 : 0);
         return pos;
@@ -4581,13 +4581,12 @@ window.CodeMirror = (function() {
   function buildTokenMeasure(builder, text, style, startStyle, endStyle) {
     var wrapping = builder.cm.options.lineWrapping;
     for (var i = 0; i < text.length; ++i) {
-      var ch = text.charAt(i), start = i == 0;
-      if (ch >= "\ud800" && ch < "\udbff" && i < text.length - 1) {
-        ch = text.slice(i, i + 2);
-        ++i;
-      } else if (i && wrapping && spanAffectsWrapping(text, i)) {
+      var start = i == 0, to = i + 1;
+      while (to < text.length && isExtendingChar(text.charAt(to))) ++to;
+      var ch = text.slice(i, to);
+      i = to - 1;
+      if (i && wrapping && spanAffectsWrapping(text, i))
         builder.pre.appendChild(elt("wbr"));
-      }
       var old = builder.measure[builder.pos];
       var span = builder.measure[builder.pos] =
         buildToken(builder, ch, style,
@@ -5604,7 +5603,8 @@ window.CodeMirror = (function() {
     return true;
   }
 
-  var isExtendingChar = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\u1DC0-\u1DFF\u20D0-\u20FF\uA670-\uA672\uA674-\uA67D\uA69F\udc00-\udfff\uFE20-\uFE2F]/;
+  var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
+  function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); }
 
   // DOM UTILITIES
 
@@ -5831,7 +5831,7 @@ window.CodeMirror = (function() {
   function moveInLine(line, pos, dir, byUnit) {
     if (!byUnit) return pos + dir;
     do pos += dir;
-    while (pos > 0 && isExtendingChar.test(line.text.charAt(pos)));
+    while (pos > 0 && isExtendingChar(line.text.charAt(pos)));
     return pos;
   }
 
@@ -5866,7 +5866,7 @@ window.CodeMirror = (function() {
 
   function moveLogically(line, start, dir, byUnit) {
     var target = start + dir;
-    if (byUnit) while (target > 0 && isExtendingChar.test(line.text.charAt(target))) target += dir;
+    if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir;
     return target < 0 || target > line.text.length ? null : target;
   }
 

From 51f61299a8d5649e35be7812a2db586f3777c1e7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Jan 2014 09:22:06 +0100
Subject: [PATCH 0761/4742] Re-add continuing surrogate pair codes to
 extendingChars

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ad29f175a8..d2930ed270 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5603,7 +5603,7 @@ window.CodeMirror = (function() {
     return true;
   }
 
-  var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
+  var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
   function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); }
 
   // DOM UTILITIES

From 95eeb53e2a5bd91c36b0e086be64102bcb45f45d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Jan 2014 09:57:32 +0100
Subject: [PATCH 0762/4742] [javascript mode] Style operators

Closes #2123
---
 mode/javascript/javascript.js |  6 +++---
 mode/javascript/test.js       | 36 +++++++++++++++++------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c113fcb433..1985c6bbf5 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -83,7 +83,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
       return ret(ch);
     } else if (ch == "=" && stream.eat(">")) {
-      return ret("=>");
+      return ret("=>", "operator");
     } else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
@@ -104,7 +104,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         return ret("regexp", "string-2");
       } else {
         stream.eatWhile(isOperatorChar);
-        return ret("operator", null, stream.current());
+        return ret("operator", "operator", stream.current());
       }
     } else if (ch == "`") {
       state.tokenize = tokenQuasi;
@@ -114,7 +114,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return ret("error", "error");
     } else if (isOperatorChar.test(ch)) {
       stream.eatWhile(isOperatorChar);
-      return ret("operator", null, stream.current());
+      return ret("operator", "operator", stream.current());
     } else {
       stream.eatWhile(/[\w\$_]/);
       var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 8abd633542..cbb936d963 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -3,15 +3,15 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   MT("locals",
-     "[keyword function] [variable foo]([def a], [def b]) { [keyword var] [def c] = [number 10]; [keyword return] [variable-2 a] + [variable-2 c] + [variable d]; }");
+     "[keyword function] [variable foo]([def a], [def b]) { [keyword var] [def c] [operator =] [number 10]; [keyword return] [variable-2 a] [operator +] [variable-2 c] [operator +] [variable d]; }");
 
   MT("comma-and-binop",
-     "[keyword function](){ [keyword var] [def x] = [number 1] + [number 2], [def y]; }");
+     "[keyword function](){ [keyword var] [def x] [operator =] [number 1] [operator +] [number 2], [def y]; }");
 
   MT("destructuring",
      "([keyword function]([def a], [[[def b], [def c] ]]) {",
-     "  [keyword let] {[def d], [property foo]: [def c]=[number 10], [def x]} = [variable foo]([variable-2 a]);",
-     "  [[[variable-2 c], [variable y] ]] = [variable-2 c];",
+     "  [keyword let] {[def d], [property foo]: [def c][operator =][number 10], [def x]} [operator =] [variable foo]([variable-2 a]);",
+     "  [[[variable-2 c], [variable y] ]] [operator =] [variable-2 c];",
      "})();");
 
   MT("class",
@@ -19,13 +19,13 @@
      "  [[ [string-2 /expr/] ]]: [number 24],",
      "  [property constructor]([def x], [def y]) {",
      "    [keyword super]([string 'something']);",
-     "    [keyword this].[property x] = [variable-2 x];",
+     "    [keyword this].[property x] [operator =] [variable-2 x];",
      "  }",
      "}");
 
   MT("module",
      "[keyword module] [string 'foo'] {",
-     "  [keyword export] [keyword let] [def x] = [number 42];",
+     "  [keyword export] [keyword let] [def x] [operator =] [number 42];",
      "  [keyword export] [keyword *] [keyword from] [string 'somewhere'];",
      "}");
 
@@ -38,7 +38,7 @@
 
   MT("const",
      "[keyword function] [variable f]() {",
-     "  [keyword const] [[ [def a], [def b] ]] = [[ [number 1], [number 2] ]];",
+     "  [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",
      "}");
 
   MT("for/of",
@@ -46,14 +46,14 @@
 
   MT("generator",
      "[keyword function*] [variable repeat]([def n]) {",
-     "  [keyword for]([keyword var] [def i] = [number 0]; [variable-2 i] < [variable-2 n]; ++[variable-2 i])",
+     "  [keyword for]([keyword var] [def i] [operator =] [number 0]; [variable-2 i] [operator <] [variable-2 n]; [operator ++][variable-2 i])",
      "    [keyword yield] [variable-2 i];",
      "}");
 
   MT("fatArrow",
-     "[variable array].[property filter]([def a] => [variable-2 a] + [number 1]);",
+     "[variable array].[property filter]([def a] [operator =>] [variable-2 a] [operator +] [number 1]);",
      "[variable a];", // No longer in scope
-     "[keyword let] [variable f] = ([[ [def a], [def b] ]], [def c]) => [variable-2 a] + [variable-2 c];",
+     "[keyword let] [variable f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
      "[variable c];");
 
   MT("spread",
@@ -63,16 +63,16 @@
 
   MT("comprehension",
      "[keyword function] [variable f]() {",
-     "  [[([variable x] + [number 1]) [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
-     "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] === [string 'blue']));",
+     "  [[([variable x] [operator +] [number 1]) [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
+     "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] [operator ===] [string 'blue']));",
      "}");
 
   MT("quasi",
-     "[variable re][string-2 `fofdlakj${][variable x] + ([variable re][string-2 `foo`]) + [number 1][string-2 }fdsa`] + [number 2]");
+     "[variable re][string-2 `fofdlakj${][variable x] [operator +] ([variable re][string-2 `foo`]) [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
 
   MT("indent_statement",
-     "[keyword var] [variable x] = [number 10]",
-     "[variable x] += [variable y] +",
+     "[keyword var] [variable x] [operator =] [number 10]",
+     "[variable x] [operator +=] [variable y] [operator +]",
      "  [atom Infinity]",
      "[keyword debugger];");
 
@@ -92,9 +92,9 @@
      "}");
 
   MT("indent_for",
-     "[keyword for] ([keyword var] [variable i] = [number 0];",
-     "     [variable i] < [number 100];",
-     "     [variable i]++)",
+     "[keyword for] ([keyword var] [variable i] [operator =] [number 0];",
+     "     [variable i] [operator <] [number 100];",
+     "     [variable i][operator ++])",
      "  [variable doSomething]([variable i]);",
      "[keyword debugger];");
 

From 8a9142ac6dfd34e6cfc16dc6075dd4f1672ecc8a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Jan 2014 14:14:12 +0100
Subject: [PATCH 0763/4742] [markdown mode] Fix bug in innerMode

Closes #2139
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 2a5e71fdd3..da2ba93fea 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -732,7 +732,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     innerMode: function(state) {
       if (state.block == htmlBlock) return {state: state.htmlState, mode: htmlMode};
-      if (state.block == local) return {state: state.localState, mode: state.localMode};
+      if (state.localState) return {state: state.localState, mode: state.localMode};
       return {state: state, mode: mode};
     },
 

From b8beead7d21e761263fd89d8c2adfc3b3a5ba2a6 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Wed, 15 Jan 2014 23:28:40 -0500
Subject: [PATCH 0764/4742] [vim] Expose context (or mode) to the Vim API and
 add :nmap + :vmap.

Also fixed a bug in context matching.
---
 keymap/vim.js    | 55 ++++++++++++++++++++++++++++++------------------
 test/vim_test.js | 20 ++++++++++++++++++
 2 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 78b83e5116..75b4e454d0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -572,9 +572,9 @@
       maybeInitVimState_: maybeInitVimState,
 
       InsertModeKey: InsertModeKey,
-      map: function(lhs, rhs) {
+      map: function(lhs, rhs, ctx) {
         // Add user defined key bindings.
-        exCommandDispatcher.map(lhs, rhs);
+        exCommandDispatcher.map(lhs, rhs, ctx);
       },
       defineEx: function(name, prefix, func){
         if (name.indexOf(prefix) !== 0) {
@@ -856,11 +856,17 @@
         } else {
           // Find the best match in the list of matchedCommands.
           var context = vim.visualMode ? 'visual' : 'normal';
-          var bestMatch = matchedCommands[0]; // Default to first in the list.
+          var bestMatch; // Default to first in the list.
           for (var i = 0; i < matchedCommands.length; i++) {
-            if (matchedCommands[i].context == context) {
-              bestMatch = matchedCommands[i];
+            var current = matchedCommands[i];
+            if (current.context == context) {
+              bestMatch = current;
               break;
+            } else if (!bestMatch && !current.context) {
+              // Only set an imperfect match to best match if no best match is
+              // set and the imperfect match is not restricted to another
+              // context.
+              bestMatch = current;
             }
           }
           return getFullyMatchedCommandOrNull(bestMatch);
@@ -2957,14 +2963,16 @@
     // 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: 'map', type: 'builtIn' },
-      { name: 'write', shortName: 'w', type: 'builtIn' },
-      { name: 'undo', shortName: 'u', type: 'builtIn' },
-      { name: 'redo', shortName: 'red', type: 'builtIn' },
-      { name: 'sort', shortName: 'sor', type: 'builtIn'},
-      { name: 'substitute', shortName: 's', type: 'builtIn'},
-      { name: 'nohlsearch', shortName: 'noh', type: 'builtIn'},
-      { name: 'delmarks', shortName: 'delm', type: 'builtin'}
+      { name: 'map' },
+      { name: 'nmap', shortName: 'nm' },
+      { name: 'vmap', shortName: 'vm' },
+      { name: 'write', shortName: 'w' },
+      { name: 'undo', shortName: 'u' },
+      { name: 'redo', shortName: 'red' },
+      { name: 'sort', shortName: 'sor' },
+      { name: 'substitute', shortName: 's' },
+      { name: 'nohlsearch', shortName: 'noh' },
+      { name: 'delmarks', shortName: 'delm' }
     ];
     Vim.ExCommandDispatcher = function() {
       this.buildCommandMap_();
@@ -3099,8 +3107,9 @@
           this.commandMap_[key] = command;
         }
       },
-      map: function(lhs, rhs) {
+      map: function(lhs, rhs, ctx) {
         if (lhs != ':' && lhs.charAt(0) == ':') {
+          if (ctx) { throw Error('Mode not supported for ex mappings'); }
           var commandName = lhs.substring(1);
           if (rhs != ':' && rhs.charAt(0) == ':') {
             // Ex to Ex mapping
@@ -3120,17 +3129,21 @@
         } else {
           if (rhs != ':' && rhs.charAt(0) == ':') {
             // Key to Ex mapping.
-            defaultKeymap.unshift({
+            var mapping = {
               keys: parseKeyString(lhs),
               type: 'keyToEx',
-              exArgs: { input: rhs.substring(1) }});
+              exArgs: { input: rhs.substring(1) }};
+            if (ctx) { mapping.context = ctx; }
+            defaultKeymap.unshift(mapping);
           } else {
             // Key to key mapping
-            defaultKeymap.unshift({
+            var mapping = {
               keys: parseKeyString(lhs),
               type: 'keyToKey',
               toKeys: parseKeyString(rhs)
-            });
+            };
+            if (ctx) { mapping.context = ctx; }
+            defaultKeymap.unshift(mapping);
           }
         }
       }
@@ -3152,7 +3165,7 @@
     }
 
     var exCommands = {
-      map: function(cm, params) {
+      map: function(cm, params, ctx) {
         var mapArgs = params.args;
         if (!mapArgs || mapArgs.length < 2) {
           if (cm) {
@@ -3160,8 +3173,10 @@
           }
           return;
         }
-        exCommandDispatcher.map(mapArgs[0], mapArgs[1], cm);
+        exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
       },
+      nmap: function(cm, params) { this.map(cm, params, 'normal'); },
+      vmap: function(cm, params) { this.map(cm, params, 'visual'); },
       move: function(cm, params) {
         commandDispatcher.processCommand(cm, cm.state.vim, {
             type: 'motion',
diff --git a/test/vim_test.js b/test/vim_test.js
index 28d492178c..7184cb25ab 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2401,6 +2401,26 @@ testVim('ex_map_key2ex', function(cm, vim, helpers) {
   eq(written, true);
   eq(actualCm, cm);
 });
+testVim('ex_map_key2key_visual_api', function(cm, vim, helpers) {
+  CodeMirror.Vim.map('b', ':w', 'visual');
+  var tmp = CodeMirror.commands.save;
+  var written = false;
+  var actualCm;
+  CodeMirror.commands.save = function(cm) {
+    written = true;
+    actualCm = cm;
+  };
+  // Mapping should not work in normal mode.
+  helpers.doKeys('b');
+  eq(written, false);
+  // Mapping should work in visual mode.
+  helpers.doKeys('v', 'b');
+  eq(written, true);
+  eq(actualCm, cm);
+
+  CodeMirror.commands.save = tmp;
+});
+
 // Testing registration of functions as ex-commands and mapping to <Key>-keys
 testVim('ex_api_test', function(cm, vim, helpers) {
   var res=false;

From 54e25895f8b3d3b9253b5649080d5c5c18dfb8be Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 12:48:09 +0100
Subject: [PATCH 0765/4742] [css mode] Properly parse @font-face declarations

Closes #2131
---
 mode/css/css.js  | 31 ++++++++++++++++++++++++++++++-
 mode/css/test.js |  8 ++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 2af14db55d..369bb385ea 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -10,6 +10,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       propertyKeywords = parserConfig.propertyKeywords || {},
       colorKeywords = parserConfig.colorKeywords || {},
       valueKeywords = parserConfig.valueKeywords || {},
+      fontProperties = parserConfig.fontProperties || {},
       allowNested = parserConfig.allowNested;
 
   var type, override;
@@ -137,6 +138,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return popContext(state);
     } else if (type == "@media") {
       return pushContext(state, stream, "media");
+    } else if (type == "@font-face") {
+      return "font_face_before";
     } else if (type && type.charAt(0) == "@") {
       return pushContext(state, stream, "at");
     } else if (type == "hash") {
@@ -243,6 +246,24 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return states.media(type, stream, state);
   };
 
+  states.font_face_before = function(type, stream, state) {
+    if (type == "{")
+      return pushContext(state, stream, "font_face");
+    return pass(type, stream, state);
+  };
+
+  states.font_face = function(type, stream, state) {
+    if (type == "}") return popContext(state);
+    if (type == "word") {
+      if (!fontProperties.hasOwnProperty(stream.current().toLowerCase()))
+        override = "error";
+      else
+        override = "property";
+      return "maybeprop";
+    }
+    return "font_face";
+  };
+
   states.at = function(type, stream, state) {
     if (type == ";") return popContext(state);
     if (type == "{" || type == "}") return popAndPass(type, stream, state);
@@ -288,7 +309,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       var cx = state.context, ch = textAfter && textAfter.charAt(0);
       var indent = cx.indent;
       if (cx.prev &&
-          (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation") ||
+          (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "font_face") ||
            ch == ")" && (cx.type == "parens" || cx.type == "params" || cx.type == "media_parens") ||
            ch == "{" && (cx.type == "at" || cx.type == "media"))) {
         indent = cx.indent - indentUnit;
@@ -533,6 +554,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "xx-large", "xx-small"
   ], valueKeywords = keySet(valueKeywords_);
 
+  var fontProperties_ = [
+    "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
+    "font-stretch", "font-weight", "font-style"
+  ], fontProperties = keySet(fontProperties_);
+
   var allWords = mediaTypes_.concat(mediaFeatures_).concat(propertyKeywords_).concat(colorKeywords_).concat(valueKeywords_);
   CodeMirror.registerHelper("hintWords", "css", allWords);
 
@@ -564,6 +590,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     propertyKeywords: propertyKeywords,
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
+    fontProperties: fontProperties,
     tokenHooks: {
       "<": function(stream, state) {
         if (!stream.match("!--")) return false;
@@ -585,6 +612,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     propertyKeywords: propertyKeywords,
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
+    fontProperties: fontProperties,
     allowNested: true,
     tokenHooks: {
       "/": function(stream, state) {
@@ -624,6 +652,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     propertyKeywords: propertyKeywords,
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
+    fontProperties: fontProperties,
     allowNested: true,
     tokenHooks: {
       "/": function(stream, state) {
diff --git a/mode/css/test.js b/mode/css/test.js
index 425c26ed91..b3f47767e6 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -108,4 +108,12 @@
      "[string     etc]",
      "[string   ]) [keyword !important];",
      "}");
+
+  MT("font_face",
+     "[def @font-face] {",
+     "  [property font-family]: [string 'myfont'];",
+     "  [error nonsense]: [string 'abc'];",
+     "  [property src]: [atom url]([string http://blah]),",
+     "    [atom url]([string http://foo]);",
+     "}");
 })();

From 086e985bd63a55561498678ab5d3233b457de8e8 Mon Sep 17 00:00:00 2001
From: Miraculix87 <miraculix@mycraftcorner.de>
Date: Fri, 10 Jan 2014 20:52:52 +0100
Subject: [PATCH 0766/4742] Update midnight.css

Added missing semicolon
---
 theme/midnight.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/midnight.css b/theme/midnight.css
index 66126322bd..468d87daf9 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -1,7 +1,7 @@
 /* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
 
 /*<!--match-->*/
-.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949 }
+.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
 .cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
 
 /*<!--activeline-->*/

From 31b884c12701c04c27093c0875c7450c497ab3bb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 12:57:57 +0100
Subject: [PATCH 0767/4742] [hardwrap addon] Return wrapped range, rather than
 a boolean

---
 addon/wrap/hardwrap.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 3023ca5b8e..b56ebe2c39 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -36,7 +36,7 @@
     var killTrailing = options.killTrailingSpace !== false;
     var changes = [], curLine = "", curNo = from.line;
     var lines = cm.getRange(from, to, false);
-    if (!lines.length) return false;
+    if (!lines.length) return null;
     var leadingSpace = lines[0].match(/^[ \t]*/)[0];
 
     for (var i = 0; i < lines.length; ++i) {
@@ -79,7 +79,7 @@
         cm.replaceRange(change.text, change.from, change.to);
       }
     });
-    return changes.length > 0;
+    return {from: from, to: cm.clipPos(Pos(curNo))};
   }
 
   CodeMirror.defineExtension("wrapParagraph", function(pos, options) {

From 1cb34abb860a4f534fb61d150b7f489183c10a5a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 13:03:25 +0100
Subject: [PATCH 0768/4742] [hardwrap addon] Return more precise range info

---
 addon/wrap/hardwrap.js | 6 +++---
 demo/hardwrap.html     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index b56ebe2c39..f6d99212a8 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -56,7 +56,7 @@
           findBreakPoint(curLine, column, wrapOn, killTrailing);
         // If this isn't broken, or is broken at a different point, remove old break
         if (!firstBreak || firstBreak.from != oldLen || firstBreak.to != oldLen + spaceInserted) {
-          changes.push({text: spaceInserted ? " " : "",
+          changes.push({text: [spaceInserted ? " " : ""],
                         from: Pos(curNo, oldLen),
                         to: Pos(curNo + 1, spaceTrimmed.length)});
         } else {
@@ -66,7 +66,7 @@
       }
       while (curLine.length > column) {
         var bp = findBreakPoint(curLine, column, wrapOn, killTrailing);
-        changes.push({text: "\n" + leadingSpace,
+        changes.push({text: ["", leadingSpace],
                       from: Pos(curNo, bp.from),
                       to: Pos(curNo, bp.to)});
         curLine = leadingSpace + curLine.slice(bp.to);
@@ -79,7 +79,7 @@
         cm.replaceRange(change.text, change.from, change.to);
       }
     });
-    return {from: from, to: cm.clipPos(Pos(curNo))};
+    return changes.length ? {from: changes[0].from, to: CodeMirror.changeEnd(changes[changes.length - 1])} : null;
   }
 
   CodeMirror.defineExtension("wrapParagraph", function(pos, options) {
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index d3f085ad43..598bf957df 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -64,7 +64,7 @@ <h2>Hard-wrapping Demo</h2>
 editor.on("change", function(cm, change) {
   clearTimeout(wait);
   wait = setTimeout(function() {
-    cm.wrapParagraphsInRange(change.from, CodeMirror.changeEnd(change), options);
+    console.log(cm.wrapParagraphsInRange(change.from, CodeMirror.changeEnd(change), options));
   }, 200);
 });
 </script>

From 32ae45d862d71efb9dfde934b29cf8fe99fe3d04 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 13:05:55 +0100
Subject: [PATCH 0769/4742] [less mode] Don't treat @font-face as a variable

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 369bb385ea..c28d3e0a3b 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -667,7 +667,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
       },
       "@": function(stream) {
-        if (stream.match(/^(media|import)\b/, false)) return false;
+        if (stream.match(/^(font-face|media|import)\b/, false)) return false;
         stream.eatWhile(/[\w\\\-]/);
         if (stream.match(/^\s*:/, false))
           return ["variable-2", "variable-definition"];

From c3c4d4801ca61e1db351f97770a3a9a22f81d277 Mon Sep 17 00:00:00 2001
From: mats cronqvist <masse@klarna.com>
Date: Sat, 11 Jan 2014 12:19:24 +0100
Subject: [PATCH 0770/4742] [erlang] - better indenter

---
 mode/erlang/erlang.js  | 481 ++++++++++++++++++++++++++---------------
 mode/erlang/index.html |  11 +-
 2 files changed, 308 insertions(+), 184 deletions(-)

diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index af8953c33b..bc3bdce860 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -1,45 +1,24 @@
-// block; "begin", "case", "fun", "if", "receive", "try": closed by "end"
-// block internal; "after", "catch", "of"
-// guard; "when", closed by "->"
-// "->" opens a clause, closed by ";" or "."
-// "<<" opens a binary, closed by ">>"
-// "," appears in arglists, lists, tuples and terminates lines of code
-// "." resets indentation to 0
-// obsolete; "cond", "let", "query"
+/*jshint unused:true, eqnull:true, curly:true, bitwise:true */
+/*jshint undef:true, latedef:true, trailing:true */
+/*global CodeMirror:true */
+
+// erlang mode.
+// tokenizer -> token types -> CodeMirror styles
+// tokenizer maintains a parse stack
+// indenter uses the parse stack
+
+// TODO indenter:
+//   bit syntax
+//   old guard/bif/conversion clashes (e.g. "float/1")
+//   type/spec/opaque
 
 CodeMirror.defineMIME("text/x-erlang", "erlang");
 
 CodeMirror.defineMode("erlang", function(cmCfg) {
+  "use strict";
 
-  function rval(state,_stream,type) {
-    // distinguish between "." as terminator and record field operator
-    state.in_record = (type == "record");
-
-    //     erlang             -> CodeMirror tag
-    switch (type) {
-      case "atom":        return "atom";
-      case "attribute":   return "attribute";
-      case "boolean":     return "special";
-      case "builtin":     return "builtin";
-      case "comment":     return "comment";
-      case "fun":         return "meta";
-      case "function":    return "tag";
-      case "guard":       return "property";
-      case "keyword":     return "keyword";
-      case "macro":       return "variable-2";
-      case "number":      return "number";
-      case "operator":    return "operator";
-      case "record":      return "bracket";
-      case "string":      return "string";
-      case "type":        return "def";
-      case "variable":    return "variable";
-      case "error":       return "error";
-      case "separator":   return null;
-      case "open_paren":  return null;
-      case "close_paren": return null;
-      default:            return null;
-    }
-  }
+/////////////////////////////////////////////////////////////////////////////
+// constants
 
   var typeWords = [
     "-type", "-spec", "-export_type", "-opaque"];
@@ -48,23 +27,23 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     "after","begin","catch","case","cond","end","fun","if",
     "let","of","query","receive","try","when"];
 
-  var separatorRE        = /[\->\.,:;]/;
+  var separatorRE    = /[\->,;]/;
   var separatorWords = [
-    "->",";",":",".",","];
+    "->",";",","];
 
-  var operatorWords = [
+  var operatorAtomWords = [
     "and","andalso","band","bnot","bor","bsl","bsr","bxor",
     "div","not","or","orelse","rem","xor"];
 
-  var symbolRE     = /[\+\-\*\/<>=\|:!]/;
-  var symbolWords = [
-    "+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"];
+  var operatorSymbolRE    = /[\+\-\*\/<>=\|:!]/;
+  var operatorSymbolWords = [
+    "=","+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"];
 
-  var openParenRE  = /[<\(\[\{]/;
+  var openParenRE    = /[<\(\[\{]/;
   var openParenWords = [
     "<<","(","[","{"];
 
-  var closeParenRE = /[>\)\]\}]/;
+  var closeParenRE    = /[>\)\]\}]/;
   var closeParenWords = [
     "}","]",")",">>"];
 
@@ -99,23 +78,25 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     "term_to_binary","time","throw","tl","trunc","tuple_size",
     "tuple_to_list","unlink","unregister","whereis"];
 
-// [Ø-Þ] [À-Ö]
-// [ß-ö] [ø-ÿ]
+// upper case: [A-Z] [Ø-Þ] [À-Ö]
+// lower case: [a-z] [ß-ö] [ø-ÿ]
   var anumRE       = /[\w@Ø-ÞÀ-Öß-öø-ÿ]/;
   var escapesRE    =
     /[0-7]{1,3}|[bdefnrstv\\"']|\^[a-zA-Z]|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+}/;
 
-  function tokenize(stream, state) {
+/////////////////////////////////////////////////////////////////////////////
+// tokenizer
 
+  function tokenizer(stream,state) {
     // in multi-line string
     if (state.in_string) {
-      state.in_string =  (!doubleQuote(stream));
+      state.in_string = (!doubleQuote(stream));
       return rval(state,stream,"string");
     }
 
     // in multi-line atom
     if (state.in_atom) {
-      state.in_atom =  (!singleQuote(stream));
+      state.in_atom = (!singleQuote(stream));
       return rval(state,stream,"atom");
     }
 
@@ -125,9 +106,9 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     }
 
     // attributes and type specs
-    if ((peekToken(state).token == "") &&
+    if (!peekToken(state) &&
         stream.match(/-\s*[a-zß-öø-ÿ][\wØ-ÞÀ-Öß-öø-ÿ]*/)) {
-      if (isMember(stream.current(),typeWords)) {
+      if (is_member(stream.current(),typeWords)) {
         return rval(state,stream,"type");
       }else{
         return rval(state,stream,"attribute");
@@ -142,32 +123,43 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
       return rval(state,stream,"comment");
     }
 
+    // colon
+    if (ch == ":") {
+      return rval(state,stream,"colon");
+    }
+
     // macro
     if (ch == '?') {
+      stream.eatSpace();
       stream.eatWhile(anumRE);
       return rval(state,stream,"macro");
     }
 
     // record
     if (ch == "#") {
+      stream.eatSpace();
       stream.eatWhile(anumRE);
       return rval(state,stream,"record");
     }
 
     // dollar escape
-    if ( ch == "$" ) {
+    if (ch == "$") {
       if (stream.next() == "\\" && !stream.match(escapesRE)) {
         return rval(state,stream,"error");
       }
       return rval(state,stream,"number");
     }
 
+    // dot
+    if (ch == ".") {
+      return rval(state,stream,"dot");
+    }
+
     // quoted atom
     if (ch == '\'') {
       if (!(state.in_atom = (!singleQuote(stream)))) {
         if (stream.match(/\s*\/\s*[0-9]/,false)) {
           stream.match(/\s*\/\s*[0-9]/,true);
-          popToken(state);
           return rval(state,stream,"fun");      // 'f'/0 style fun
         }
         if (stream.match(/\s*\(/,false) || stream.match(/\s*:/,false)) {
@@ -195,34 +187,37 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
 
       if (stream.match(/\s*\/\s*[0-9]/,false)) {
         stream.match(/\s*\/\s*[0-9]/,true);
-        popToken(state);
         return rval(state,stream,"fun");      // f/0 style fun
       }
 
       var w = stream.current();
 
-      if (isMember(w,keywordWords)) {
-        pushToken(state,stream);
+      if (is_member(w,keywordWords)) {
         return rval(state,stream,"keyword");
+      }else if (is_member(w,operatorAtomWords)) {
+        return rval(state,stream,"operator");
       }else if (stream.match(/\s*\(/,false)) {
         // 'put' and 'erlang:put' are bifs, 'foo:put' is not
-        if (isMember(w,bifWords) &&
-            (!isPrev(stream,":") || isPrev(stream,"erlang:"))) {
+        if (is_member(w,bifWords) &&
+            ((peekToken(state).token != ":") ||
+             (peekToken(state,2).token == "erlang"))) {
           return rval(state,stream,"builtin");
-        }else if (isMember(w,guardWords)) {
+        }else if (is_member(w,guardWords)) {
           return rval(state,stream,"guard");
         }else{
           return rval(state,stream,"function");
         }
-      }else if (isMember(w,operatorWords)) {
+      }else if (is_member(w,operatorAtomWords)) {
         return rval(state,stream,"operator");
-      }else if (stream.match(/\s*:/,false)) {
+      }else if (lookahead(stream) == ":") {
         if (w == "erlang") {
           return rval(state,stream,"builtin");
         } else {
           return rval(state,stream,"function");
         }
-      }else if (isMember(w,["true","false"])) {
+      }else if (is_member(w,["true","false"])) {
+        return rval(state,stream,"boolean");
+      }else if (is_member(w,["true","false"])) {
         return rval(state,stream,"boolean");
       }else{
         return rval(state,stream,"atom");
@@ -234,15 +229,25 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     var radixRE      = /[0-9a-zA-Z]/;         // 36#zZ style int
     if (digitRE.test(ch)) {
       stream.eatWhile(digitRE);
-      if (stream.eat('#')) {
-        stream.eatWhile(radixRE);    // 36#aZ  style integer
-      } else {
-        if (stream.eat('.')) {       // float
-          stream.eatWhile(digitRE);
+      if (stream.eat('#')) {                // 36#aZ  style integer
+        if (!stream.eatWhile(radixRE)) {
+          stream.backUp(1);                 //"36#" - syntax error
         }
-        if (stream.eat(/[eE]/)) {
-          stream.eat(/[-+]/);        // float with exponent
-          stream.eatWhile(digitRE);
+      } else if (stream.eat('.')) {       // float
+        if (!stream.eatWhile(digitRE)) {
+          stream.backUp(1);        // "3." - probably end of function
+        } else {
+          if (stream.eat(/[eE]/)) {        // float with exponent
+            if (stream.eat(/[-+]/)) {
+              if (!stream.eatWhile(digitRE)) {
+                stream.backUp(2);            // "2e-" - syntax error
+              }
+            } else {
+              if (!stream.eatWhile(digitRE)) {
+                stream.backUp(1);            // "2e" - syntax error
+              }
+            }
+          }
         }
       }
       return rval(state,stream,"number");   // normal integer
@@ -250,50 +255,35 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
 
     // open parens
     if (nongreedy(stream,openParenRE,openParenWords)) {
-      pushToken(state,stream);
       return rval(state,stream,"open_paren");
     }
 
     // close parens
     if (nongreedy(stream,closeParenRE,closeParenWords)) {
-      pushToken(state,stream);
       return rval(state,stream,"close_paren");
     }
 
     // separators
     if (greedy(stream,separatorRE,separatorWords)) {
-      // distinguish between "." as terminator and record field operator
-      if (!state.in_record) {
-        pushToken(state,stream);
-      }
       return rval(state,stream,"separator");
     }
 
     // operators
-    if (greedy(stream,symbolRE,symbolWords)) {
+    if (greedy(stream,operatorSymbolRE,operatorSymbolWords)) {
       return rval(state,stream,"operator");
     }
 
     return rval(state,stream,null);
   }
 
-  function isPrev(stream,string) {
-    var start = stream.start;
-    var len = string.length;
-    if (len <= start) {
-      var word = stream.string.slice(start-len,start);
-      return word == string;
-    }else{
-      return false;
-    }
-  }
-
+/////////////////////////////////////////////////////////////////////////////
+// utilities
   function nongreedy(stream,re,words) {
     if (stream.current().length == 1 && re.test(stream.current())) {
       stream.backUp(1);
       while (re.test(stream.peek())) {
         stream.next();
-        if (isMember(stream.current(),words)) {
+        if (is_member(stream.current(),words)) {
           return true;
         }
       }
@@ -308,7 +298,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
         stream.next();
       }
       while (0 < stream.current().length) {
-        if (isMember(stream.current(),words)) {
+        if (is_member(stream.current(),words)) {
           return true;
         }else{
           stream.backUp(1);
@@ -339,144 +329,277 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     return false;
   }
 
-  function isMember(element,list) {
+  function lookahead(stream) {
+    var m = stream.match(/([\n\s]+|%[^\n]*\n)*(.)/,false);
+    return m ? m.pop() : "";
+  }
+
+  function is_member(element,list) {
     return (-1 < list.indexOf(element));
   }
 
-/////////////////////////////////////////////////////////////////////////////
-  function myIndent(state,textAfter) {
-    var indent = cmCfg.indentUnit;
-    var token = (peekToken(state)).token;
-    var wordAfter = takewhile(textAfter,/[^a-z]/);
+  function rval(state,stream,type) {
 
-    if (state.in_string || state.in_atom) {
-      return CodeMirror.Pass;
-    }else if (token == "") {
-      return 0;
-    }else if (isMember(token,openParenWords)) {
-      return (peekToken(state)).column+token.length;
-    }else if (token == "when") {
-      return (peekToken(state)).column+token.length+1;
-    }else if (token == "fun" && wordAfter == "") {
-      return (peekToken(state)).column+token.length;
-    }else if (token == "->") {
-      if (isMember(wordAfter,["end","after","catch"])) {
-        return peekToken(state,2).column;
-      }else if (peekToken(state,2).token == "fun") {
-        return peekToken(state,2).column+indent;
-      }else if (peekToken(state,2).token == "") {
-        return indent;
-      }else{
-        return (peekToken(state)).indent+indent;
-      }
-    }else if (isMember(wordAfter,["after","catch","of"])) {
-      return (peekToken(state)).indent;
-    }else{
-      return (peekToken(state)).column+indent;
+    // parse stack
+    pushToken(state,realToken(type,stream));
+
+    // map erlang token type to CodeMirror style class
+    //     erlang             -> CodeMirror tag
+    switch (type) {
+      case "atom":        return "atom";
+      case "attribute":   return "attribute";
+      case "boolean":     return "special";
+      case "builtin":     return "builtin";
+      case "close_paren": return null;
+      case "colon":       return null;
+      case "comment":     return "comment";
+      case "dot":         return null;
+      case "error":       return "error";
+      case "fun":         return "meta";
+      case "function":    return "tag";
+      case "guard":       return "property";
+      case "keyword":     return "keyword";
+      case "macro":       return "variable-2";
+      case "number":      return "number";
+      case "open_paren":  return null;
+      case "operator":    return "operator";
+      case "record":      return "bracket";
+      case "separator":   return null;
+      case "string":      return "string";
+      case "type":        return "def";
+      case "variable":    return "variable";
+      default:            return null;
     }
   }
 
-  function takewhile(str,re) {
-    var m = str.match(re);
-    return m ? str.slice(0,m.index) : str;
+  function aToken(tok,col,ind,typ) {
+    return {token:  tok,
+            column: col,
+            indent: ind,
+            type:   typ};
   }
 
-  function Token(stream) {
-    this.token  = stream ? stream.current() : "";
-    this.column = stream ? stream.column() : 0;
-    this.indent = stream ? stream.indentation() : 0;
+  function realToken(type,stream) {
+    return aToken(stream.current(),
+                 stream.column(),
+                 stream.indentation(),
+                 type);
   }
 
-  function popToken(state) {
-    return state.tokenStack.pop();
+  function fakeToken(type) {
+    return aToken(type,0,0,type);
   }
 
   function peekToken(state,depth) {
     var len = state.tokenStack.length;
     var dep = (depth ? depth : 1);
+
     if (len < dep) {
-      return new Token;
+      return false;
     }else{
       return state.tokenStack[len-dep];
     }
   }
 
-  function pushToken(state,stream) {
-    var token = stream.current();
-    var prev_token = peekToken(state).token;
+  function pushToken(state,token) {
 
-    if (token == ".") {
-      state.tokenStack = [];
-      return false;
-    }else if(isMember(token,[",", ":", "of", "cond", "let", "query"])) {
-      return false;
-    }else if (drop_last(prev_token,token)) {
-      return false;
-    }else if (drop_both(prev_token,token)) {
-      popToken(state);
-      return false;
-    }else if (drop_first(prev_token,token)) {
-      popToken(state);
-      return pushToken(state,stream);
-    }else if (isMember(token,["after","catch"])) {
-      return false;
+    if (!(token.type == "comment" || token.type == "whitespace")) {
+      state.tokenStack = maybe_drop_pre(state.tokenStack,token);
+      state.tokenStack = maybe_drop_post(state.tokenStack);
+    }
+  }
+
+  function maybe_drop_pre(s,token) {
+    var last = s.length-1;
+
+    if (0 < last && s[last].type === "record" && token.type === "dot") {
+      s.pop();
+    }else if (0 < last && s[last].type === "group") {
+      s.pop();
+      s.push(token);
     }else{
-      state.tokenStack.push(new Token(stream));
-      return true;
+      s.push(token);
     }
+    return s;
   }
 
-  function drop_last(open, close) {
-    switch(open+" "+close) {
-      case "when ;": return true;
-      default: return false;
+  function maybe_drop_post(s) {
+    var last = s.length-1;
+
+    if (s[last].type === "dot") {
+      return [];
+    }
+    if (s[last].type === "fun" && s[last-1].token === "fun") {
+      return s.slice(0,last-1);
+    }
+    switch (s[s.length-1].token) {
+      case "}":    return d(s,{g:["{"]});
+      case "]":    return d(s,{i:["["]});
+      case ")":    return d(s,{i:["("]});
+      case ">>":   return d(s,{i:["<<"]});
+      case "end":  return d(s,{i:["begin","case","fun","if","receive","try"]});
+      case ",":    return d(s,{e:["begin","try","when","->",
+                                  ",","(","[","{","<<"]});
+      case "->":   return d(s,{r:["when"],
+                               m:["try","if","case","receive"]});
+      case ";":    return d(s,{E:["case","fun","if","receive","try","when"]});
+      case "catch":return d(s,{e:["try"]});
+      case "of":   return d(s,{e:["case"]});
+      case "after":return d(s,{e:["receive","try"]});
+      default:     return s;
     }
   }
 
-  function drop_first(open, close) {
-    switch (open+" "+close) {
-      case "when ->":       return true;
-      case "-> end":        return true;
-      default:              return false;
+  function d(stack,tt) {
+    // stack is a stack of Token objects.
+    // tt is an object; {type:tokens}
+    // type is a char, tokens is a list of token strings.
+    // The function returns (possibly truncated) stack.
+    // It will descend the stack, looking for a Token such that Token.token
+    //  is a member of tokens. If it does not find that, it will normally (but
+    //  see "E" below) return stack. If it does find a match, it will remove
+    //  all the Tokens between the top and the matched Token.
+    // If type is "m", that is all it does.
+    // If type is "i", it will also remove the matched Token and the top Token.
+    // If type is "g", like "i", but add a fake "group" token at the top.
+    // If type is "r", it will remove the matched Token, but not the top Token.
+    // If type is "e", it will keep the matched Token but not the top Token.
+    // If type is "E", it behaves as for type "e", except if there is no match,
+    //  in which case it will return an empty stack.
+
+    for (var type in tt) {
+      var len = stack.length-1;
+      var tokens = tt[type];
+      for (var i = len-1; -1 < i ; i--) {
+        if (is_member(stack[i].token,tokens)) {
+          var ss = stack.slice(0,i);
+          switch (type) {
+              case "m": return ss.concat(stack[i]).concat(stack[len]);
+              case "r": return ss.concat(stack[len]);
+              case "i": return ss;
+              case "g": return ss.concat(fakeToken("group"));
+              case "E": return ss.concat(stack[i]);
+              case "e": return ss.concat(stack[i]);
+          }
+        }
+      }
     }
+    return (type == "E" ? [] : stack);
   }
 
-  function drop_both(open, close) {
-    switch (open+" "+close) {
-      case "( )":         return true;
-      case "[ ]":         return true;
-      case "{ }":         return true;
-      case "<< >>":       return true;
-      case "begin end":   return true;
-      case "case end":    return true;
-      case "fun end":     return true;
-      case "if end":      return true;
-      case "receive end": return true;
-      case "try end":     return true;
-      case "-> catch":    return true;
-      case "-> after":    return true;
-      case "-> ;":        return true;
-      default:            return false;
+/////////////////////////////////////////////////////////////////////////////
+// indenter
+
+  function indenter(state,textAfter) {
+    var t;
+    var unit = cmCfg.indentUnit;
+    var wordAfter = wordafter(textAfter);
+    var currT = peekToken(state,1);
+    var prevT = peekToken(state,2);
+
+    if (state.in_string || state.in_atom) {
+      return CodeMirror.Pass;
+    }else if (!prevT) {
+      return 0;
+    }else if (currT.token == "when") {
+      return currT.column+unit;
+    }else if (wordAfter === "when" && prevT.type === "function") {
+      return prevT.indent+unit;
+    }else if (wordAfter === "(" && currT.token === "fun") {
+      return  currT.column+3;
+    }else if (wordAfter === "catch" && (t = getToken(state,["try"]))) {
+      return t.column;
+    }else if (is_member(wordAfter,["end","after","of"])) {
+      t = getToken(state,["begin","case","fun","if","receive","try"]);
+      return t ? t.column : CodeMirror.Pass;
+    }else if (is_member(wordAfter,closeParenWords)) {
+      t = getToken(state,openParenWords);
+      return t ? t.column : CodeMirror.Pass;
+    }else if (is_member(currT.token,[",","|","||"]) ||
+              is_member(wordAfter,[",","|","||"])) {
+      t = postcommaToken(state);
+      return t ? t.column+t.token.length : unit;
+    }else if (currT.token == "->") {
+      if (is_member(prevT.token, ["receive","case","if","try"])) {
+        return prevT.column+unit+unit;
+      }else{
+        return prevT.column+unit;
+      }
+    }else if (is_member(currT.token,openParenWords)) {
+      return currT.column+currT.token.length;
+    }else{
+      t = defaultToken(state);
+      return truthy(t) ? t.column+unit : 0;
     }
   }
 
+  function wordafter(str) {
+    var m = str.match(/,|[a-z]+|\}|\]|\)|>>|\|+|\(/);
+
+    return truthy(m) && (m.index === 0) ? m[0] : "";
+  }
+
+  function postcommaToken(state) {
+    var objs = state.tokenStack.slice(0,-1);
+    var i = getTokenIndex(objs,"type",["open_paren"]);
+
+    return truthy(objs[i]) ? objs[i] : false;
+  }
+
+  function defaultToken(state) {
+    var objs = state.tokenStack;
+    var stop = getTokenIndex(objs,"type",["open_paren","separator","keyword"]);
+    var oper = getTokenIndex(objs,"type",["operator"]);
+
+    if (truthy(stop) && truthy(oper) && stop < oper) {
+      return objs[stop+1];
+    } else if (truthy(stop)) {
+      return objs[stop];
+    } else {
+      return false;
+    }
+  }
+
+  function getToken(state,tokens) {
+    var objs = state.tokenStack;
+    var i = getTokenIndex(objs,"token",tokens);
+
+    return truthy(objs[i]) ? objs[i] : false;
+  }
+
+  function getTokenIndex(objs,propname,propvals) {
+
+    for (var i = objs.length-1; -1 < i ; i--) {
+      if (is_member(objs[i][propname],propvals)) {
+        return i;
+      }
+    }
+    return false;
+  }
+
+  function truthy(x) {
+    return (x !== false) && (x != null);
+  }
+
+/////////////////////////////////////////////////////////////////////////////
+// this object defines the mode
+
   return {
     startState:
       function() {
         return {tokenStack: [],
-                in_record:  false,
                 in_string:  false,
                 in_atom:    false};
       },
 
     token:
       function(stream, state) {
-        return tokenize(stream, state);
+        return tokenizer(stream, state);
       },
 
     indent:
       function(state, textAfter) {
-        return myIndent(state,textAfter);
+        return indenter(state,textAfter);
       },
 
     lineComment: "%"
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index e63e231201..9cacb759f6 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -51,11 +51,12 @@ <h2>Erlang mode</h2>
   case tuple_size(Tup) of
     L when L < 1 -> Tup;
     L ->
-      try Fields = M:rec_info(element(1,Tup)),
-          L = length(Fields)+1,
-          lists:zip(Fields,expand_recs(M,tl(tuple_to_list(Tup))))
-      catch _:_ ->
-          list_to_tuple(expand_recs(M,tuple_to_list(Tup)))
+      try
+        Fields = M:rec_info(element(1,Tup)),
+        L = length(Fields)+1,
+        lists:zip(Fields,expand_recs(M,tl(tuple_to_list(Tup))))
+      catch
+        _:_ -> list_to_tuple(expand_recs(M,tuple_to_list(Tup)))
       end
   end;
 expand_recs(_,Term) ->

From cbce0ffe5778a663c7a52f6cb9c888a5cbee0a67 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 13:12:28 +0100
Subject: [PATCH 0771/4742] [xml mode] Return Pass when indenting cdata/pre
 content

Issue #2135
---
 mode/xml/xml.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index c75200ec7b..96b51ff970 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -298,8 +298,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       if (state.tokenize.isInAttribute) {
         return state.stringStartCol + 1;
       }
-      if ((state.tokenize != inTag && state.tokenize != inText) ||
-          context && context.noIndent)
+      if (context && context.noIndent) return CodeMirror.Pass;
+      if (state.tokenize != inTag && state.tokenize != inText)
         return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
       // Indent the starts of attribute names.
       if (state.tagName) {

From 8f10e2fb124240c3dbab66bd9b5f0ddca7558b02 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Thu, 16 Jan 2014 13:13:57 +0100
Subject: [PATCH 0772/4742] [css mode] More careful categorizing of @-names as
 variables

https://developer.mozilla.org/en-US/docs/Web/CSS/At-rule
---
 mode/css/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index c28d3e0a3b..8f6fe7df4d 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -667,7 +667,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
       },
       "@": function(stream) {
-        if (stream.match(/^(font-face|media|import)\b/, false)) return false;
+        if (stream.match(/^(charset|document|font-face|import|keyframes|media|namespace|page|supports)\b/, false)) return false;
         stream.eatWhile(/[\w\\\-]/);
         if (stream.match(/^\s*:/, false))
           return ["variable-2", "variable-definition"];

From 4c07e0b7793f6e701f14a72d5d496cfd8740b961 Mon Sep 17 00:00:00 2001
From: Wesley Wiser <wwiser@gmail.com>
Date: Sat, 11 Jan 2014 13:13:10 -0500
Subject: [PATCH 0773/4742] [mllike mode] Rename OCaml mode and extend with F#
 support

Add support for the F# programming language. Highlighting is provided
for all keywords, number literals, strings, ML-style comments and select
built-ins. C-style comments not currently supported.
---
 mode/{ocaml => mllike}/index.html         | 49 ++++++++++--
 mode/{ocaml/ocaml.js => mllike/mllike.js} | 93 ++++++++++++++++++++---
 2 files changed, 122 insertions(+), 20 deletions(-)
 rename mode/{ocaml => mllike}/index.html (80%)
 rename mode/{ocaml/ocaml.js => mllike/mllike.js} (59%)

diff --git a/mode/ocaml/index.html b/mode/mllike/index.html
similarity index 80%
rename from mode/ocaml/index.html
rename to mode/mllike/index.html
index 5d39fadd97..67bfef8581 100644
--- a/mode/ocaml/index.html
+++ b/mode/mllike/index.html
@@ -1,13 +1,13 @@
 <!doctype html>
 
-<title>CodeMirror: OCaml mode</title>
+<title>CodeMirror: ML-like 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/edit/matchbrackets.js></script>
-<script src=ocaml.js></script>
+<script src=mllike.js></script>
 <style type=text/css>
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
@@ -21,7 +21,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">OCaml</a>
+    <li><a class=active href="#">ML-like</a>
   </ul>
 </div>
 
@@ -29,7 +29,7 @@
 <h2>OCaml mode</h2>
 
 
-<textarea id=code>
+<textarea id="ocamlCode">
 (* Summing a list of integers *)
 let rec sum xs =
   match xs with
@@ -89,7 +89,7 @@ <h2>OCaml mode</h2>
 
 and insert elem = function
   | [] -&gt; [elem]
-  | x :: l -&gt; 
+  | x :: l -&gt;
       if elem &lt; x then elem :: x :: l else x :: insert elem l;;
 
 (* Imperative features *)
@@ -134,13 +134,46 @@ <h2>OCaml mode</h2>
 (* OCaml page on Wikipedia - http://en.wikipedia.org/wiki/OCaml *)
 </textarea>
 
+<h2>F# mode</h2>
+<textarea id="fsharpCode">
+module CodeMirror.FSharp
+
+let rec fib = function
+    | 0 -> 0
+    | 1 -> 1
+    | n -> fib (n - 1) + fib (n - 2)
+
+type Point =
+    {
+        x : int
+        y : int
+    }
+
+type Color =
+    | Red
+    | Green
+    | Blue
+
+[0 .. 10]
+|> List.map ((+) 2)
+|> List.fold (fun x y -> x + y) 0
+|> printf "%i"
+</textarea>
+
+
 <script>
-  var editor = CodeMirror.fromTextArea(document.getElementById('code'), {
-    mode: 'ocaml',
+  var ocamlEditor = CodeMirror.fromTextArea(document.getElementById('ocamlCode'), {
+    mode: 'text/x-ocaml',
+    lineNumbers: true,
+    matchBrackets: true
+  });
+
+  var fsharpEditor = CodeMirror.fromTextArea(document.getElementById('fsharpCode'), {
+    mode: 'text/x-fsharp',
     lineNumbers: true,
     matchBrackets: true
   });
 </script>
 
-<p><strong>MIME types defined:</strong> <code>text/x-ocaml</code>.</p>
+<p><strong>MIME types defined:</strong> <code>text/x-ocaml</code> (OCaml) and <code>text/x-fsharp</code> (F#).</p>
 </article>
diff --git a/mode/ocaml/ocaml.js b/mode/mllike/mllike.js
similarity index 59%
rename from mode/ocaml/ocaml.js
rename to mode/mllike/mllike.js
index 32cbc0b7ba..ea75ffa214 100644
--- a/mode/ocaml/ocaml.js
+++ b/mode/mllike/mllike.js
@@ -1,14 +1,11 @@
-CodeMirror.defineMode('ocaml', function() {
+CodeMirror.defineMode('mllike', function(_config, parserConfig) {
 
   var words = {
-    'true': 'atom',
-    'false': 'atom',
     'let': 'keyword',
     'rec': 'keyword',
     'in': 'keyword',
     'of': 'keyword',
     'and': 'keyword',
-    'succ': 'keyword',
     'if': 'keyword',
     'then': 'keyword',
     'else': 'keyword',
@@ -25,17 +22,19 @@ CodeMirror.defineMode('ocaml', function() {
     'match': 'keyword',
     'with': 'keyword',
     'try': 'keyword',
-    'raise': 'keyword',
-    'begin': 'keyword',
-    'end': 'keyword',
     'open': 'builtin',
-    'trace': 'builtin',
     'ignore': 'builtin',
-    'exit': 'builtin',
-    'print_string': 'builtin',
-    'print_endline': 'builtin'
+    'begin': 'keyword',
+    'end': 'keyword'
   };
 
+  var extraWords = parserConfig.extraWords || {};
+  for (var prop in extraWords) {
+    if (extraWords.hasOwnProperty(prop)) {
+      words[prop] = parserConfig.extraWords[prop];
+    }
+  }
+
   function tokenBase(stream, state) {
     var ch = stream.next();
 
@@ -113,4 +112,74 @@ CodeMirror.defineMode('ocaml', function() {
   };
 });
 
-CodeMirror.defineMIME('text/x-ocaml', 'ocaml');
+CodeMirror.defineMIME('text/x-ocaml', {
+  name: 'mllike',
+  extraWords: {
+    'succ': 'keyword',
+    'trace': 'builtin',
+    'exit': 'builtin',
+    'print_string': 'builtin',
+    'print_endline': 'builtin',
+    'true': 'atom',
+    'false': 'atom',
+    'raise': 'keyword'
+  }
+});
+
+CodeMirror.defineMIME('text/x-fsharp', {
+  name: 'mllike',
+  extraWords: {
+    'abstract': 'keyword',
+    'as': 'keyword',
+    'assert': 'keyword',
+    'base': 'keyword',
+    'class': 'keyword',
+    'default': 'keyword',
+    'delegate': 'keyword',
+    'downcast': 'keyword',
+    'downto': 'keyword',
+    'elif': 'keyword',
+    'exception': 'keyword',
+    'extern': 'keyword',
+    'finally': 'keyword',
+    'global': 'keyword',
+    'inherit': 'keyword',
+    'inline': 'keyword',
+    'interface': 'keyword',
+    'internal': 'keyword',
+    'lazy': 'keyword',
+    'let!': 'keyword',
+    'member' : 'keyword',
+    'module': 'keyword',
+    'namespace': 'keyword',
+    'new': 'keyword',
+    'null': 'keyword',
+    'override': 'keyword',
+    'private': 'keyword',
+    'public': 'keyword',
+    'return': 'keyword',
+    'return!': 'keyword',
+    'select': 'keyword',
+    'static': 'keyword',
+    'struct': 'keyword',
+    'upcast': 'keyword',
+    'use': 'keyword',
+    'use!': 'keyword',
+    'val': 'keyword',
+    'when': 'keyword',
+    'yield': 'keyword',
+    'yield!': 'keyword',
+
+    'List': 'builtin',
+    'Seq': 'builtin',
+    'Map': 'builtin',
+    'Set': 'builtin',
+    'int': 'builtin',
+    'string': 'builtin',
+    'raise': 'builtin',
+    'failwith': 'builtin',
+    'not': 'builtin',
+    'true': 'builtin',
+    'false': 'builtin'
+  }
+});
\ No newline at end of file

From 53f3aba5bf1f7faf0fbef0ef5522970d5f4942e6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 13:35:27 +0100
Subject: [PATCH 0774/4742] [mllike mode] Integrate

Add //-comment support for F#

Issue #2136
---
 doc/compress.html     |  2 +-
 mode/index.html       |  3 ++-
 mode/mllike/mllike.js | 12 +++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 3f3bfb0465..205f7839ba 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -114,9 +114,9 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
           <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/nginx/nginx.js">nginx.js</option>
           <option value="http://codemirror.net/mode/ntriples/ntriples.js">ntriples.js</option>
-          <option value="http://codemirror.net/mode/ocaml/ocaml.js">ocaml.js</option>
           <option value="http://codemirror.net/mode/octave/octave.js">octave.js</option>
           <option value="http://codemirror.net/mode/pascal/pascal.js">pascal.js</option>
           <option value="http://codemirror.net/mode/pegjs/pegjs.js">pegjs.js</option>
diff --git a/mode/index.html b/mode/index.html
index e332f84f70..7c1f740615 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -46,6 +46,7 @@ <h2>Language modes</h2>
       <li><a href="eiffel/index.html">Eiffel</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
       <li><a href="fortran/index.html">Fortran</a></li>
+      <li><a href="mllike/index.html">F#</a></li>
       <li><a href="gas/index.html">Gas</a> (AT&amp;T-style assembly)</li>
       <li><a href="gherkin/index.html">Gherkin</a></li>
       <li><a href="go/index.html">Go</a></li>
@@ -68,7 +69,7 @@ <h2>Language modes</h2>
       <li><a href="mirc/index.html">mIRC</a></li>
       <li><a href="nginx/index.html">Nginx</a></li>
       <li><a href="ntriples/index.html">NTriples</a></li>
-      <li><a href="ocaml/index.html">OCaml</a></li>
+      <li><a href="mllike/index.html">OCaml</a></li>
       <li><a href="octave/index.html">Octave</a> (MATLAB)</li>
       <li><a href="pascal/index.html">Pascal</a></li>
       <li><a href="pegjs/index.html">PEG.js</a></li>
diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index ea75ffa214..1d64789a19 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -57,6 +57,10 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
       stream.eatWhile(/\w/);
       return 'quote';
     }
+    if (ch === '/' && parserConfig.slashComments && stream.eat('/')) {
+      stream.skipToEnd();
+      return 'comment';
+    }
     if (/\d/.test(ch)) {
       stream.eatWhile(/[\d]/);
       if (stream.eat('.')) {
@@ -108,7 +112,8 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
     },
 
     blockCommentStart: "(*",
-    blockCommentEnd: "*)"
+    blockCommentEnd: "*)",
+    lineComment: parserConfig.slashComments ? "//" : null
   };
 });
 
@@ -181,5 +186,6 @@ CodeMirror.defineMIME('text/x-fsharp', {
     'not': 'builtin',
     'true': 'builtin',
     'false': 'builtin'
-  }
-});
\ No newline at end of file
+  },
+  slashComments: true
+});

From 40a973a45f8059770dae169599f90343425d7668 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 13:36:42 +0100
Subject: [PATCH 0775/4742] [mllike mode] Update mode/meta.js

Issue #2136
---
 mode/meta.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index 226cff12e5..f37cea55b5 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -18,6 +18,7 @@ CodeMirror.modeInfo = [
   {name: 'Eiffel', mime: 'text/x-eiffel', mode: 'eiffel'},
   {name: 'Erlang', mime: 'text/x-erlang', mode: 'erlang'},
   {name: 'Fortran', mime: 'text/x-fortran', mode: 'fortran'},
+  {name: 'F#', mime: 'text/x-fsharp', mode: 'mllike'},
   {name: 'Gas', mime: 'text/x-gas', mode: 'gas'},
   {name: 'Gherkin', mime: 'text/x-feature', mode: 'gherkin'},
   {name: 'GitHub Flavored Markdown', mime: 'text/x-gfm', mode: 'gfm'},
@@ -45,7 +46,7 @@ CodeMirror.modeInfo = [
   {name: 'mIRC', mime: 'text/mirc', mode: 'mirc'},
   {name: 'Nginx', mime: 'text/x-nginx-conf', mode: 'nginx'},
   {name: 'NTriples', mime: 'text/n-triples', mode: 'ntriples'},
-  {name: 'OCaml', mime: 'text/x-ocaml', mode: 'ocaml'},
+  {name: 'OCaml', mime: 'text/x-ocaml', mode: 'mllike'},
   {name: 'Octave', mime: 'text/x-octave', mode: 'octave'},
   {name: 'Pascal', mime: 'text/x-pascal', mode: 'pascal'},
   {name: 'PEG.js', mime: null, mode: 'pegjs'},

From cc23d768069bff93f8ad2bdda3e162e06fe945e1 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Mon, 13 Jan 2014 18:16:12 +0400
Subject: [PATCH 0776/4742] [runmode addon] Define text/plain mode in
 standalone script.

---
 addon/runmode/runmode-standalone.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 9ebde8b054..ec06ba11cb 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -91,6 +91,10 @@ CodeMirror.getMode = function (options, spec) {
   return mfactory(options, spec);
 };
 CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min;
+CodeMirror.defineMode("null", function() {
+  return {token: function(stream) {stream.skipToEnd();}};
+});
+CodeMirror.defineMIME("text/plain", "null");
 
 CodeMirror.runMode = function (string, modespec, callback, options) {
   var mode = CodeMirror.getMode({ indentUnit: 2 }, modespec);

From 33c40af12557ad7a58ff2ca35027733c27cdb516 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 13:50:07 +0100
Subject: [PATCH 0777/4742] Give change events for 'cut' changes origin="cut"

Issue #2140
---
 lib/codemirror.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d2930ed270..4ca2ee3889 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -62,7 +62,8 @@ window.CodeMirror = (function() {
                   overlays: [],
                   modeGen: 0,
                   overwrite: false, focused: false,
-                  suppressEdits: false, pasteIncoming: false,
+                  suppressEdits: false,
+                  pasteIncoming: false, cutIncoming: false,
                   draggingText: false,
                   highlight: new Delayed()};
 
@@ -1512,11 +1513,11 @@ window.CodeMirror = (function() {
 
     var updateInput = cm.curOp.updateInput;
     var changeEvent = {from: from, to: to, text: splitLines(inserted),
-                       origin: cm.state.pasteIncoming ? "paste" : "+input"};
+                       origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"};
     makeChange(cm.doc, changeEvent, "end");
     cm.curOp.updateInput = updateInput;
     signalLater(cm, "inputRead", cm, changeEvent);
-    if (!cm.state.pasteIncoming && cm.options.electricChars &&
+    if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
         cm.options.smartIndent && sel.head.ch < 100) {
       var electric = cm.getModeAt(sel.head).electricChars;
       if (electric) for (var i = 0; i < electric.length; i++)
@@ -1529,7 +1530,7 @@ window.CodeMirror = (function() {
     if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
     else cm.display.prevInput = text;
     if (withOp) endOperation(cm);
-    cm.state.pasteIncoming = false;
+    cm.state.pasteIncoming = cm.state.cutIncoming = false;
     return true;
   }
 
@@ -1670,13 +1671,14 @@ window.CodeMirror = (function() {
       fastPoll(cm);
     });
 
-    function prepareCopy() {
+    function prepareCopy(e) {
       if (d.inaccurateSelection) {
         d.prevInput = "";
         d.inaccurateSelection = false;
         d.input.value = cm.getSelection();
         selectInput(d.input);
       }
+      if (e.type == "cut") cm.state.cutIncoming = true;
     }
     on(d.input, "cut", prepareCopy);
     on(d.input, "copy", prepareCopy);

From 5befcdce0b7ad0d8dcada5eb1bfc81a5d5b6342e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 14:02:05 +0100
Subject: [PATCH 0778/4742] [javascript mode] Don't terminate regexp on slash
 inside of square brackets

Closes #2141
---
 mode/javascript/javascript.js | 22 ++++++++++++++--------
 mode/javascript/test.js       |  7 +++++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 1985c6bbf5..fbf574b4fe 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -54,14 +54,16 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   var isOperatorChar = /[+\-*&%=<>!?|~^]/;
 
-  function nextUntilUnescaped(stream, end) {
-    var escaped = false, next;
+  function readRegexp(stream) {
+    var escaped = false, next, inSet = false;
     while ((next = stream.next()) != null) {
-      if (next == end && !escaped)
-        return false;
+      if (!escaped) {
+        if (next == "/" && !inSet) return;
+        if (next == "[") inSet = true;
+        else if (inSet && next == "]") inSet = false;
+      }
       escaped = !escaped && next == "\\";
     }
-    return escaped;
   }
 
   // Used as scratch variables to communicate multiple values without
@@ -99,7 +101,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         return ret("comment", "comment");
       } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
                state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
-        nextUntilUnescaped(stream, "/");
+        readRegexp(stream);
         stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla
         return ret("regexp", "string-2");
       } else {
@@ -125,8 +127,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   function tokenString(quote) {
     return function(stream, state) {
-      if (!nextUntilUnescaped(stream, quote))
-        state.tokenize = tokenBase;
+      var escaped = false, next;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) break;
+        escaped = !escaped && next == "\\";
+      }
+      if (!escaped) state.tokenize = tokenBase;
       return ret("string", "string");
     };
   }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index cbb936d963..911bbbfd7b 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -103,4 +103,11 @@
      "{",
      "  [keyword debugger];",
      "}");
+
+  MT("multilinestring",
+     "[keyword var] [variable x] [operator =] [string 'foo\\]",
+     "[string bar'];");
+
+  MT("scary_regexp",
+     "[string-2 /foo[[/]]bar/];");
 })();

From ba21b55c61dd07e2c294edc75cc8a1d8aeec9504 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 14:07:56 +0100
Subject: [PATCH 0779/4742] [emacs keymap] Make ctrl-g clear mark

Closes #2142
---
 keymap/emacs.js    | 15 ++++++++++++---
 lib/codemirror.js  |  5 ++++-
 test/emacs_test.js |  3 +++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index f08e2e8d48..592238bc90 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -201,6 +201,11 @@
     cm.on("change", function() { cm.setExtending(false); });
   }
 
+  function clearMark(cm) {
+    cm.setExtending(false);
+    cm.setCursor(cm.getCursor());
+  }
+
   function getInput(cm, msg, f) {
     if (cm.openDialog)
       cm.openDialog(msg + ": <input type=\"text\" style=\"width: 10em\"/>", f, {bottom: true});
@@ -234,6 +239,11 @@
     }
   }
 
+  function quit(cm) {
+    cm.execCommand("clearSearch");
+    clearMark(cm);
+  }
+
   // Actual keymap
 
   var keyMap = CodeMirror.keyMap.emacs = {
@@ -249,8 +259,7 @@
     }),
     "Alt-W": function(cm) {
       addToRing(cm.getSelection());
-      cm.setExtending(false);
-      cm.setCursor(cm.getCursor());
+      clearMark(cm);
     },
     "Ctrl-Y": function(cm) {
       var start = cm.getCursor();
@@ -336,7 +345,7 @@
     "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
     "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
     "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
-    "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": "clearSearch", "Shift-Alt-5": "replace",
+    "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
     "Alt-/": "autocomplete",
     "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4ca2ee3889..c450c4e1d0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3154,7 +3154,10 @@ window.CodeMirror = (function() {
 
     triggerOnKeyDown: operation(null, onKeyDown),
 
-    execCommand: function(cmd) {return commands[cmd](this);},
+    execCommand: function(cmd) {
+      if (commands.hasOwnProperty(cmd))
+        return commands[cmd](this);
+    },
 
     findPosH: function(from, amount, unit, visually) {
       var dir = 1;
diff --git a/test/emacs_test.js b/test/emacs_test.js
index ab18241dee..f21605bb37 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -125,6 +125,9 @@
   sim("transposeExpr", "do foo[bar] dah",
       Pos(0, 6), "Ctrl-Alt-T", txt("do [bar]foo dah"));
 
+  sim("clearMark", "abcde", Pos(0, 2), "Ctrl-Space", "Ctrl-F", "Ctrl-F",
+      "Ctrl-G", "Ctrl-W", txt("abcde"));
+
   testCM("save", function(cm) {
     var saved = false;
     CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };

From 306f6d8d01e948009f3f6190e58986c75b01d218 Mon Sep 17 00:00:00 2001
From: Shawn A <spam@rumental.com>
Date: Wed, 15 Jan 2014 13:34:29 -0600
Subject: [PATCH 0780/4742] [compression helper] Add anyword-hint

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

diff --git a/doc/compress.html b/doc/compress.html
index 205f7839ba..beac099370 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -159,6 +159,7 @@ <h2>Script compression helper</h2>
         </optgroup>
         <optgroup label="Add-ons">
           <option value="http://codemirror.net/addon/selection/active-line.js">active-line.js</option>
+          <option value="http://codemirror.net/addon/hint/anyword-hint.js">anyword-hint.js</option>
           <option value="http://codemirror.net/addon/fold/brace-fold.js">brace-fold.js</option>
           <option value="http://codemirror.net/addon/edit/closebrackets.js">closebrackets.js</option>
           <option value="http://codemirror.net/addon/edit/closetag.js">closetag.js</option>

From bc32d2ac4288f51919cbb06e83ce1d4f5bb27e88 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 14:24:30 +0100
Subject: [PATCH 0781/4742] [ruby mode] Fix 'loop do' creating two indentation
 contexts

Closes #2146
---
 mode/ruby/ruby.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 96cdd5f9dd..1cdc9a4e43 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -12,7 +12,7 @@ CodeMirror.defineMode("ruby", function(config) {
     "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
     "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
   ]);
-  var indentWords = wordObj(["def", "class", "case", "for", "while", "do", "module", "then",
+  var indentWords = wordObj(["def", "class", "case", "for", "while", "module", "then",
                              "catch", "loop", "proc", "begin"]);
   var dedentWords = wordObj(["end", "until"]);
   var matching = {"[": "]", "{": "}", "(": ")"};
@@ -214,6 +214,8 @@ CodeMirror.defineMode("ruby", function(config) {
         else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
         else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
           kwtype = "indent";
+        else if (word == "do" && state.context.indented < state.indented)
+          kwtype = "indent";
       }
       if (curPunc || (style && style != "comment")) state.lastTok = word || curPunc || style;
       if (curPunc == "|") state.varList = !state.varList;

From 0e41639bebaa0535ab913563d0031d125ab241d4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 15:03:10 +0100
Subject: [PATCH 0782/4742] Kludge for another IE focus issue

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c450c4e1d0..210806aace 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1770,6 +1770,9 @@ window.CodeMirror = (function() {
           e_preventDefault(e2);
           extendSelection(cm.doc, start);
           focusInput(cm);
+          // Work around unexplainable focus problem in IE9 (#2127)
+          if (old_ie && !ie_lt9)
+            setTimeout(function() {document.body.focus(); focusInput(cm);}, 20);
         }
       });
       // Let the drag handler handle this.

From 81c01d196e6b0148ce3412d8f686c3039013f7c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 19:34:52 +0100
Subject: [PATCH 0783/4742] Add a script to help bring out releases

Does all the version bumping and such.
---
 bin/release | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100755 bin/release

diff --git a/bin/release b/bin/release
new file mode 100755
index 0000000000..f92ab006d5
--- /dev/null
+++ b/bin/release
@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+
+var fs = require("fs"), child = require("child_process");
+
+var number, bumpOnly;
+
+for (var i = 2; i < process.argv.length; i++) {
+  if (process.argv[i] == "-bump") bumpOnly = true;
+  else if (/^\d+\.\d+\.\d+$/.test(process.argv[i])) number = process.argv[i];
+  else { console.log("Bogus command line arg: " + process.argv[i]); process.exit(1); }
+}
+
+if (!number) { console.log("Must give a version"); process.exit(1); }
+
+function rewrite(file, f) {
+  fs.writeFileSync(file, f(fs.readFileSync(file, "utf8")), "utf8");
+}
+
+rewrite("lib/codemirror.js", function(lib) {
+  return lib.replace(/CodeMirror\.version = "\d+\.\d+\.\d+"/,
+                     "CodeMirror.version = \"" + number + "\"");
+});
+rewrite("package.json", function(pack) {
+  return pack.replace(/"version":"\d+\.\d+\.\d+"/, "\"version\":\"" + number + "\"");
+});
+
+if (bumpOnly) process.exit(0);
+
+child.exec("bash bin/authors.sh", function(){});
+
+var simple = number.slice(0, number.lastIndexOf("."));
+
+rewrite("doc/compress.html", function(cmp) {
+  return cmp.replace(/<option value="http:\/\/codemirror.net\/">HEAD<\/option>/,
+                     "<option value=\"http://codemirror.net/\">HEAD</option>\n        <option value=\"http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=" + number + ";f=\">" + simple + "</option>");
+});
+
+rewrite("index.html", function(index) {
+  return index.replace(/<strong>version 3.20<\/strong>/,
+                       "<strong>version " + simple + "</strong>");
+});

From 3a76b567e1cd5ebe7a4aca7ef139058c36f154e9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 20:05:09 +0100
Subject: [PATCH 0784/4742] Mark release 3.21

---
 AUTHORS           | 45 +++++++++++++++++++++++++++++++++++++++++++++
 doc/compress.html |  1 +
 doc/releases.html | 13 +++++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 6 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 260c13a864..737acedaba 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,7 @@ List of CodeMirror contributors. Updated before every release.
 
 4r2r
 Aaron Brooks
+Abe Fettig
 Adam King
 adanlobato
 Adán Lobato
@@ -10,16 +11,20 @@ Ahmad Amireh
 Ahmad M. Zawawi
 ahoward
 Akeksandr Motsjonov
+Alberto Pose
 Albert Xing
 Alexander Pavlov
 Alexander Schepanovski
+Alexander Solovyov
 alexey-k
 Alex Piggott
 Amy
 Ananya Sen
 AndersMad
+Anderson Mesquita
 Andre von Houck
 Andrey Lushnikov
+Andy Joslin
 Andy Kimball
 Andy Li
 angelozerr
@@ -27,16 +32,20 @@ angelo.zerr@gmail.com
 Ankit Ahuja
 Ansel Santosa
 Anthony Grimes
+Anton Kovalyov
 areos
+AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
 Bastian Müller
 benbro
+Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
 boomyjee
 borawjm
 Brandon Frohs
+Brandon Wamboldt
 Brett Zamir
 Brian Sletten
 Bruce Mitchener
@@ -54,9 +63,11 @@ Dan Heberden
 Daniel, Dao Quang Minh
 Daniel Faust
 Daniel Huigens
+Daniel KJ
 Daniel Neel
 Daniel Parnell
 Danny Yoo
+Darius Roberts
 David Mignot
 David Pathakjee
 deebugger
@@ -68,10 +79,13 @@ Drew Hintz
 Drew Khoury
 Dror BG
 duralog
+eborden
 edsharp
 ekhaled
+Enam Mijbah Noor
 Eric Allam
 eustas
+Fabio Zendhi Nagao
 Fauntleroy
 fbuchinger
 feizhang365
@@ -80,6 +94,7 @@ Felix Raab
 Filip Noetzel
 flack
 ForbesLindesay
+Forbes Lindesay
 Ford_Lawnmower
 Gabriel Nahmias
 galambalazs
@@ -94,12 +109,15 @@ Guillaume Massé
 Hans Engel
 Hardest
 Hasan Karahan
+hitsthings
 Hocdoc
 Ian Beck
+Ian Dickinson
 Ian Wehrman
 Ian Wetherbee
 Ice White
 ICHIKAWA, Yuji
+ilvalle
 Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
@@ -111,6 +129,7 @@ Jamie Hill
 Jan Jongboom
 jankeromnes
 Jan Keromnes
+Jan Odvarko
 Jan T. Sott
 Jason
 Jason Grout
@@ -122,16 +141,21 @@ jeffkenton
 Jeff Pickhardt
 jem (graphite)
 Jochen Berger
+Johan Ask
 John Connor
 John Lees-Miller
 John Snelson
+John Van Der Loo
 jongalloway
+Jon Malmaud
 Joost-Wim Boekesteijn
 Joseph Pecoraro
 Joshua Newman
 jots
+jsoojeon
 Juan Benavides Romero
 Jucovschi Constantin
+Juho Vuori
 jwallers@gmail.com
 kaniga
 Ken Newman
@@ -145,11 +169,13 @@ koops
 ks-ifware
 kubelsmieci
 Lanny
+Laszlo Vidacs
 leaf corcoran
 Leonya Khachaturov
 Liam Newman
 LM
 Lorenzo Stoakes
+Luciano Longo
 lynschinzer
 Maksim Lin
 Maksym Taran
@@ -158,8 +184,10 @@ Marco Aurélio
 Marijn Haverbeke
 Mario Pietsch
 Mark Lentczner
+Marko Bonaci
 Martin Balek
 Martín Gaitán
+Martin Hasoň
 Mason Malone
 Mateusz Paprocki
 mats cronqvist
@@ -169,6 +197,7 @@ Matt McDonald
 Matt Pass
 Matt Sacks
 Maximilian Hils
+Maxim Kraev
 Max Kirsch
 mbarkhau
 Metatheos
@@ -183,7 +212,9 @@ Mike Diaz
 Mike Ivanov
 Mike Kadin
 MinRK
+Miraculix87
 misfo
+mloginov
 mps
 Narciso Jaramillo
 Nathan Williams
@@ -192,6 +223,7 @@ nguillaumin
 Niels van Groningen
 Nikita Beloglazov
 Nikita Vasilyev
+Nikolay Kostov
 nlwillia
 pablo
 Page
@@ -199,6 +231,7 @@ Patrick Strawderman
 Paul Garvin
 Paul Ivanov
 Pavel Feldman
+Pavel Strashkin
 Paweł Bartkiewicz
 peteguhl
 peterkroon
@@ -219,16 +252,22 @@ Sascha Peilicke
 satchmorun
 sathyamoorthi
 SCLINIC\jdecker
+Sebastian Zaha
 shaund
 shaun gilchrist
+Shawn A
+Shiv Deepak
 Shmuel Englard
+soliton4
 sonson
 spastorelli
+Stanislav Oaserele
 Stas Kobzar
 Stefan Borsje
 Steffen Beyer
 Steve O'Hara
 stoskov
+Taha Jahangir
 Tarmil
 tfjgeorge
 Thaddee Tyl
@@ -244,12 +283,18 @@ Tomas Varaneckas
 Tom Erik Støwer
 Tom MacWright
 Tony Jian
+Travis Heppe
 Vestimir Markov
 vf
 Volker Mische
+wenli
+Wesley Wiser
 William Jamieson
 Wojtek Ptak
 Xavier Mendez
+YNH Webdev
 Yunchi Luo
 Yuvi Panda
 Zachary Dremann
+zziuni
+魏鹏刚
diff --git a/doc/compress.html b/doc/compress.html
index beac099370..c2ba8f7021 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=3.21.0;f=">3.21</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.20.0;f=">3.20</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.19.0;f=">3.19</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.18.0;f=">3.18</option>
diff --git a/doc/releases.html b/doc/releases.html
index e6d7ddce35..f9b2dcc814 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">21-11-2013: <a href="http://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
+
+  <ul class="rel-note">
+    <li>Auto-indenting a block will no longer add trailing whitespace to blank lines.</a>
+    <li>Marking text has a new option <a href="manual.html#markText"><code>clearWhenEmpty</code></a> to control auto-removal.</li>
+    <li>Several bugfixes in the handling of bidirectional text.</li>
+    <li>The <a href="../mode/xml/index.html">XML</a> and <a href="../mode/css/index.html">CSS</a> modes were largely rewritten. <a href="../mode/css/less.html">LESS</a> support was added to the CSS mode.</li>
+    <li>The OCaml mode was moved to an <a href="../mode/mllike/index.html">mllike</a> mode, F# support added.</li>
+    <li>Make it possible to fetch multiple applicable helper values with <a href="manual.html#getHelpers"><code>getHelpers</code></a>, and to register helpers matched on predicates with <a href="manual.html#registerGlobalHelper"><code>registerGlobalHelper</code></a>.</li>
+    <li>New theme <a href="../demo/theme.html?pastel-on-dark">pastel-on-dark</a>.</li>
+    <li>Better ECMAScript 6 support in <a href="../mode/javascript/index.html">JavaScript</a> mode.</li>
+  </ul>
+
   <p class="rel">21-11-2013: <a href="http://codemirror.net/codemirror-3.20.zip">Version 3.20</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 914bb7867d..7097608d83 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.20</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.21</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 210806aace..23ca5355b9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6041,7 +6041,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.20.1";
+  CodeMirror.version = "3.21.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 6e3cfde467..326b95890b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.20.1",
+    "version":"3.21.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 51ad9ffe405ad3f12201de1becaea70f6eee68bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 20:06:50 +0100
Subject: [PATCH 0785/4742] Bump version number post-3.21

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 23ca5355b9..d82dc0d415 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6041,7 +6041,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.21.0";
+  CodeMirror.version = "3.21.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 326b95890b..e8a7c18ac4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.21.0",
+    "version":"3.21.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 286f38806cc6d0bc31abdb7f599906473e44c743 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 20:08:35 +0100
Subject: [PATCH 0786/4742] [release notes] Fix date for 3.21

---
 doc/releases.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/releases.html b/doc/releases.html
index f9b2dcc814..4f5de8da25 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,7 +28,7 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
-  <p class="rel">21-11-2013: <a href="http://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
+  <p class="rel">16-01-2014: <a href="http://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
 
   <ul class="rel-note">
     <li>Auto-indenting a block will no longer add trailing whitespace to blank lines.</a>

From 51032ed09d0de938f5607796abe853595e425f20 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jan 2014 20:09:32 +0100
Subject: [PATCH 0787/4742] [release notes] Add link to all patches for 3.21

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

diff --git a/doc/releases.html b/doc/releases.html
index 4f5de8da25..47b3dfb61f 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -39,6 +39,7 @@ <h2>Version 3.x</h2>
     <li>Make it possible to fetch multiple applicable helper values with <a href="manual.html#getHelpers"><code>getHelpers</code></a>, and to register helpers matched on predicates with <a href="manual.html#registerGlobalHelper"><code>registerGlobalHelper</code></a>.</li>
     <li>New theme <a href="../demo/theme.html?pastel-on-dark">pastel-on-dark</a>.</li>
     <li>Better ECMAScript 6 support in <a href="../mode/javascript/index.html">JavaScript</a> mode.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.20.0...3.21.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-11-2013: <a href="http://codemirror.net/codemirror-3.20.zip">Version 3.20</a>:</p>

From a53e500bba4df665f9cd12126cbe0da736423d28 Mon Sep 17 00:00:00 2001
From: sheopory <sheopory@gmail.com>
Date: Thu, 16 Jan 2014 11:39:08 -0800
Subject: [PATCH 0788/4742] Fix bug in updateScrollbars.

On IE8 only scrollHeight - d.scroller.clientHeight + d.scrollbarV.clientHeight evaluates to -ve in some cases. Guard that with returning 0 in that case. Seems a bug in IE8, so this can be treated as a workaround.
---
 lib/codemirror.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d82dc0d415..dffa9ce9de 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -337,8 +337,9 @@ window.CodeMirror = (function() {
     if (needsV) {
       d.scrollbarV.style.display = "block";
       d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";
+      // A bug in IE8 can cause this value to be negative, so guard it.
       d.scrollbarV.firstChild.style.height =
-        (scrollHeight - d.scroller.clientHeight + d.scrollbarV.clientHeight) + "px";
+        Math.max(0, scrollHeight - d.scroller.clientHeight + d.scrollbarV.clientHeight) + "px";
     } else {
       d.scrollbarV.style.display = "";
       d.scrollbarV.firstChild.style.height = "0";

From 804a30c8d1821856e8e6ff4885791f5a7efd0860 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Thu, 16 Jan 2014 19:01:54 +0200
Subject: [PATCH 0789/4742] Don't generate <span class="cm-"> nodes when
 token() returns only line-foo/line-background-foo styles.

---
 lib/codemirror.js | 1 +
 test/test.js      | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index dffa9ce9de..0448274859 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4485,6 +4485,7 @@ window.CodeMirror = (function() {
       else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(builder[prop]))
         builder[prop] += " " + lineClass[2];
     }
+    if (!style) return null;
     var cache = builder.cm.options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
     return cache[style] ||
       (cache[style] = "cm-" + style.replace(/ +/g, " cm-"));
diff --git a/test/test.js b/test/test.js
index 3ad8d35499..c6bfd8912b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1626,7 +1626,7 @@ testCM("lineStyleFromMode", function(cm) {
   CodeMirror.defineMode("test_mode", function() {
     return {token: function(stream) {
       if (stream.match(/^\[[^\]]*\]/)) return "line-brackets";
-      if (stream.match(/^\([^\]]*\)/)) return "line-background-parens";
+      if (stream.match(/^\([^\)]*\)/)) return "line-background-parens";
       stream.match(/^\s+|^\S+/);
     }};
   });
@@ -1635,10 +1635,13 @@ testCM("lineStyleFromMode", function(cm) {
   eq(bracketElts.length, 1);
   eq(bracketElts[0].nodeName, "PRE");
   is(!/brackets.*brackets/.test(bracketElts[0].className));
+  eq(bracketElts[0].getElementsByTagName("span").length, 0);
   var parenElts = byClassName(cm.getWrapperElement(), "parens");
   eq(parenElts.length, 1);
   eq(parenElts[0].nodeName, "DIV");
   is(!/parens.*parens/.test(parenElts[0].className));
+  eq(parenElts[0].parentElement.nodeName, "DIV");
+  eq(parenElts[0].parentElement.getElementsByTagName("span").length, 0);
 }, {value: "line1: [br] [br]\nline2: (par) (par)\nline3: nothing"});
 
 CodeMirror.registerHelper("xxx", "a", "A");

From 6d2973189fba83816f5deb8d187211b10e98ee49 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 17 Jan 2014 11:59:27 +0100
Subject: [PATCH 0790/4742] Remove tests using getElementsByTagName

The method isn't present on all supported platforms, and these
tests tested someting very obscure, and already failed on the v4
branch which representes the editor content differently.

Issue #2152
---
 test/test.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/test.js b/test/test.js
index c6bfd8912b..6eeca979c0 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1635,13 +1635,11 @@ testCM("lineStyleFromMode", function(cm) {
   eq(bracketElts.length, 1);
   eq(bracketElts[0].nodeName, "PRE");
   is(!/brackets.*brackets/.test(bracketElts[0].className));
-  eq(bracketElts[0].getElementsByTagName("span").length, 0);
   var parenElts = byClassName(cm.getWrapperElement(), "parens");
   eq(parenElts.length, 1);
   eq(parenElts[0].nodeName, "DIV");
   is(!/parens.*parens/.test(parenElts[0].className));
   eq(parenElts[0].parentElement.nodeName, "DIV");
-  eq(parenElts[0].parentElement.getElementsByTagName("span").length, 0);
 }, {value: "line1: [br] [br]\nline2: (par) (par)\nline3: nothing"});
 
 CodeMirror.registerHelper("xxx", "a", "A");

From 2b61ac92b58ac62ff3d63488d5508642f11d335b Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Fri, 17 Jan 2014 03:38:45 +0200
Subject: [PATCH 0791/4742] Handle spurious spaces from token().

---
 lib/codemirror.js |  6 +++---
 test/test.js      | 13 ++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0448274859..c5d02b6e08 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4476,7 +4476,7 @@ window.CodeMirror = (function() {
   function interpretTokenStyle(style, builder) {
     if (!style) return null;
     for (;;) {
-      var lineClass = style.match(/(?:^|\s)line-(background-)?(\S+)/);
+      var lineClass = style.match(/(?:^|\s+)line-(background-)?(\S+)/);
       if (!lineClass) break;
       style = style.slice(0, lineClass.index) + style.slice(lineClass.index + lineClass[0].length);
       var prop = lineClass[1] ? "bgClass" : "textClass";
@@ -4485,10 +4485,10 @@ window.CodeMirror = (function() {
       else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(builder[prop]))
         builder[prop] += " " + lineClass[2];
     }
-    if (!style) return null;
+    if (/^\s*$/.test(style)) return null;
     var cache = builder.cm.options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
     return cache[style] ||
-      (cache[style] = "cm-" + style.replace(/ +/g, " cm-"));
+      (cache[style] = style.replace(/\S+/g, "cm-$&"));
   }
 
   function buildLineContent(cm, realLine, measure, copyWidgets) {
diff --git a/test/test.js b/test/test.js
index 6eeca979c0..1d7f80e355 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1625,8 +1625,9 @@ testCM("change_removedText", function(cm) {
 testCM("lineStyleFromMode", function(cm) {
   CodeMirror.defineMode("test_mode", function() {
     return {token: function(stream) {
-      if (stream.match(/^\[[^\]]*\]/)) return "line-brackets";
-      if (stream.match(/^\([^\)]*\)/)) return "line-background-parens";
+      if (stream.match(/^\[[^\]]*\]/)) return "  line-brackets  ";
+      if (stream.match(/^\([^\)]*\)/)) return "  line-background-parens  ";
+      if (stream.match(/^<[^>]*>/)) return "  span  line-line  line-background-bg  ";
       stream.match(/^\s+|^\S+/);
     }};
   });
@@ -1640,7 +1641,13 @@ testCM("lineStyleFromMode", function(cm) {
   eq(parenElts[0].nodeName, "DIV");
   is(!/parens.*parens/.test(parenElts[0].className));
   eq(parenElts[0].parentElement.nodeName, "DIV");
-}, {value: "line1: [br] [br]\nline2: (par) (par)\nline3: nothing"});
+
+  eq(byClassName(cm.getWrapperElement(), "bg").length, 1);
+  eq(byClassName(cm.getWrapperElement(), "line").length, 1);
+  var spanElts = byClassName(cm.getWrapperElement(), "cm-span");
+  eq(spanElts.length, 2);
+  is(/^\s*cm-span\s*$/.test(spanElts[0].className));
+}, {value: "line1: [br] [br]\nline2: (par) (par)\nline3: <tag> <tag>"});
 
 CodeMirror.registerHelper("xxx", "a", "A");
 CodeMirror.registerHelper("xxx", "b", "B");

From 087d37cb82dda413e210b00f55dd8b52ef7edbf7 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Thu, 16 Jan 2014 17:54:21 -0800
Subject: [PATCH 0792/4742] [vim keymap] Fix to moveTillCharacter

Return null from moveTillCharacter if nothing is found, so that if a
deletion operation is active but no match was found, nothing gets
deleted. Add a unit test for moveTillCharacter.
---
 keymap/vim.js    |  2 +-
 test/vim_test.js | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 75b4e454d0..a08c5c2f7c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1457,7 +1457,7 @@
             motionArgs.selectedCharacter);
         var increment = motionArgs.forward ? -1 : 1;
         recordLastCharacterSearch(increment, motionArgs);
-        if(!curEnd)return cm.getCursor();
+        if (!curEnd) return null;
         curEnd.ch += increment;
         return curEnd;
       },
diff --git a/test/vim_test.js b/test/vim_test.js
index 7184cb25ab..d39753c10c 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2003,6 +2003,45 @@ testVim('zt==z<CR>', function(cm, vim, helpers){
   eq(zVals[2], zVals[5]);
 });
 
+var moveTillCharacterSandbox =
+  'The quick brown fox \n'
+  'jumped over the lazy dog.'
+testVim('moveTillCharacter', function(cm, vim, helpers){
+  cm.setCursor(0, 0);
+  // Search for the 'q'.
+  cm.openDialog = helpers.fakeOpenDialog('q');
+  helpers.doKeys('/');
+  eq(4, cm.getCursor().ch);
+  // Jump to just before the first o in the list.
+  helpers.doKeys('t');
+  helpers.doKeys('o');
+  eq('The quick brown fox \n', cm.getValue());
+  // Delete that one character.
+  helpers.doKeys('d');
+  helpers.doKeys('t');
+  helpers.doKeys('o');
+  eq('The quick bown fox \n', cm.getValue());
+  // Delete everything until the next 'o'.
+  helpers.doKeys('.');
+  eq('The quick box \n', cm.getValue());
+  // An unmatched character should have no effect.
+  helpers.doKeys('d');
+  helpers.doKeys('t');
+  helpers.doKeys('q');
+  eq('The quick box \n', cm.getValue());
+  // Matches should only be possible on single lines.
+  helpers.doKeys('d');
+  helpers.doKeys('t');
+  helpers.doKeys('z');
+  eq('The quick box \n', cm.getValue());
+  // After all that, the search for 'q' should still be active, so the 'N' command
+  // can run it again in reverse. Use that to delete everything back to the 'q'.
+  helpers.doKeys('d');
+  helpers.doKeys('N');
+  eq('The ox \n', cm.getValue());
+  eq(4, cm.getCursor().ch);
+}, { value: moveTillCharacterSandbox});
+
 var scrollMotionSandbox =
   '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'
   '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'

From 537edc5c4a6344633823ce8935fd4b9017c8d888 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Jan 2014 10:40:14 +0100
Subject: [PATCH 0793/4742] Make hasFocus use document.activeElement, rather
 than internal flag

This way, it synchronously returns the current value, rather
than only being updated when an async focus/blur event fires.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c5d02b6e08..10fcdbe7bc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3224,7 +3224,7 @@ window.CodeMirror = (function() {
       else
         this.display.cursor.className = this.display.cursor.className.replace(" CodeMirror-overwrite", "");
     },
-    hasFocus: function() { return this.state.focused; },
+    hasFocus: function() { return document.activeElement == this.display.input; },
 
     scrollTo: operation(null, function(x, y) {
       updateScrollPos(this, x, y);

From 982beb6e81ad404441fd1c6746747c4433941cde Mon Sep 17 00:00:00 2001
From: Marco Munizaga <marco.munizaga@ufl.edu>
Date: Fri, 17 Jan 2014 16:04:35 -0500
Subject: [PATCH 0794/4742] Fixed clojure indenting, now will try to use the
 user's setting

---
 mode/clojure/clojure.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index ee22a12fed..e3d87d23a6 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -2,10 +2,11 @@
  * Author: Hans Engel
  * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
  */
-CodeMirror.defineMode("clojure", function () {
+CodeMirror.defineMode("clojure", function (options) {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
         ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword";
-    var INDENT_WORD_SKIP = 2;
+    var INDENT_WORD_SKIP = options.indentUnit || 2;
+    var NORMAL_INDENT_UNIT = options.indentUnit || 2;
 
     function makeKeywords(str) {
         var obj = {}, words = str.split(" ");
@@ -179,8 +180,8 @@ CodeMirror.defineMode("clojure", function () {
                             stream.eatSpace();
                             if (stream.eol() || stream.peek() == ";") {
                                 // nothing significant after
-                                // we restart indentation 1 space after
-                                pushStack(state, indentTemp + 1, ch);
+                                // we restart indentation the user defined spaces after
+                                pushStack(state, indentTemp + NORMAL_INDENT_UNIT, ch);
                             } else {
                                 pushStack(state, indentTemp + stream.current().length, ch); // else we match
                             }

From b2c87a4833e352b02cfca1e489fedb47245c8d36 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Jan 2014 11:02:42 +0100
Subject: [PATCH 0795/4742] More aggressively clear line heights in refresh()

Closes #2157
---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 10fcdbe7bc..ac7e4ce6aa 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3270,11 +3270,12 @@ window.CodeMirror = (function() {
     operation: function(f){return runInOp(this, f);},
 
     refresh: operation(null, function() {
-      var badHeight = this.display.cachedTextHeight == null;
+      var oldHeight = this.display.cachedTextHeight;
       clearCaches(this);
       updateScrollPos(this, this.doc.scrollLeft, this.doc.scrollTop);
       regChange(this);
-      if (badHeight) estimateLineHeights(this);
+      if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
+        estimateLineHeights(this);
     }),
 
     swapDoc: operation(null, function(doc) {

From 6dad920c6f04e656869e3f50e484dedb46a7ec8c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Jan 2014 17:02:04 +0100
Subject: [PATCH 0796/4742] [css mode] When indenting, properly pop off prop
 context before closing brace

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 8f6fe7df4d..c94f1daa54 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -308,6 +308,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     indent: function(state, textAfter) {
       var cx = state.context, ch = textAfter && textAfter.charAt(0);
       var indent = cx.indent;
+      if (cx.type == "prop" && ch == "}") cx = cx.prev;
       if (cx.prev &&
           (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "font_face") ||
            ch == ")" && (cx.type == "parens" || cx.type == "params" || cx.type == "media_parens") ||

From 9ad6218e4d9b2c510dbeeb462ae82aad66184f2a Mon Sep 17 00:00:00 2001
From: Narciso Jaramillo <njaramil@adobe.com>
Date: Mon, 20 Jan 2014 11:18:05 -0800
Subject: [PATCH 0797/4742] [closetag addon] Allow typing '/' if there's no
 matching open tag

---
 addon/edit/closetag.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index cad776a783..762a94ccbb 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -82,6 +82,7 @@
 
     var tagName = state.context && state.context.tagName;
     if (tagName) cm.replaceSelection("/" + tagName + ">", "end");
+    else return CodeMirror.Pass;
   }
 
   function indexOf(collection, elt) {

From 2dcfbd67d3b2019e03fc6ea0bd93991f170fa8b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 22 Jan 2014 17:30:15 +0100
Subject: [PATCH 0798/4742] [scrollpastend plugin] Don't get confused when the
 editor changes size

Closes #2160
---
 addon/scroll/scrollpastend.js | 2 ++
 lib/codemirror.js             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/addon/scroll/scrollpastend.js b/addon/scroll/scrollpastend.js
index 14d7d5aeee..58720ad413 100644
--- a/addon/scroll/scrollpastend.js
+++ b/addon/scroll/scrollpastend.js
@@ -4,11 +4,13 @@
   CodeMirror.defineOption("scrollPastEnd", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       cm.off("change", onChange);
+      cm.off("refresh", updateBottomMargin);
       cm.display.lineSpace.parentNode.style.paddingBottom = "";
       cm.state.scrollPastEndPadding = null;
     }
     if (val) {
       cm.on("change", onChange);
+      cm.on("refresh", updateBottomMargin);
       updateBottomMargin(cm);
     }
   });
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ac7e4ce6aa..67e5291f67 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3265,6 +3265,7 @@ window.CodeMirror = (function() {
       if (this.options.lineWrapping)
         this.display.measureLineCache.length = this.display.measureLineCachePos = 0;
       this.curOp.forceUpdate = true;
+      signal(this, "refresh", this);
     }),
 
     operation: function(f){return runInOp(this, f);},
@@ -3276,6 +3277,7 @@ window.CodeMirror = (function() {
       regChange(this);
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
         estimateLineHeights(this);
+      signal(this, "refresh", this);
     }),
 
     swapDoc: operation(null, function(doc) {

From 0cbe02fde8394b62ea106774179519246e582cba Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Mon, 20 Jan 2014 23:40:26 +0100
Subject: [PATCH 0799/4742] [mdn-like theme] Add

---
 theme/mdn-like.css | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 theme/mdn-like.css

diff --git a/theme/mdn-like.css b/theme/mdn-like.css
new file mode 100644
index 0000000000..bcd4100439
--- /dev/null
+++ b/theme/mdn-like.css
@@ -0,0 +1,44 @@
+/*
+  MDN-LIKE Theme - Mozilla
+  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
+  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+  GitHub: @peterkroon
+  
+  The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
+  
+*/
+.cm-s-mdn-like.CodeMirror { color: #999; font-family: monospace; background-color: #fff; } /**/
+.cm-s-mdn-like .CodeMirror-selected { background: #cfc !important; } /**/
+
+.cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; } /**/
+.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; margin-left: 3px; } /**/
+.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222 !important; } /**/
+
+.cm-s-mdn-like .cm-keyword {  color: #6262FF; } /**/
+.cm-s-mdn-like .cm-atom { color: #F90; } /**/
+.cm-s-mdn-like .cm-number { color:  #ca7841; } /**/
+.cm-s-mdn-like .cm-def { color: #8DA6CE; } /**/
+.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; } /**/
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; } /**/
+
+.cm-s-mdn-like .cm-variable { color: #07a; } /**/
+.cm-s-mdn-like .cm-property { color: #905; } /**/
+.cm-s-mdn-like .cm-qualifier { color: #690; } /**/
+
+.cm-s-mdn-like .cm-operator { color: #cda869; } /**/
+.cm-s-mdn-like .cm-comment { color:#777; font-weight:normal; } /**/
+.cm-s-mdn-like .cm-string { color:#07a; font-style:italic; } /**/
+.cm-s-mdn-like .cm-string-2 { color:#bd6b18; } /*?*/
+.cm-s-mdn-like .cm-meta { color: #000; } /*?*/
+.cm-s-mdn-like .cm-builtin { color: #9B7536; } /*?*/
+.cm-s-mdn-like .cm-tag { color: #997643; } /**/
+.cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
+.cm-s-mdn-like .cm-header { color: #FF6400; } /**/
+.cm-s-mdn-like .cm-hr { color: #AEAEAE; } /**/
+.cm-s-mdn-like .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; } /**/
+.cm-s-mdn-like .cm-error { border-bottom: 1px solid red; } /**/
+
+.cm-s-mdn-like .CodeMirror-activeline-background {background: #efefff !important;} /**/
+.cm-s-mdn-like .CodeMirror-matchingbracket {outline:1px solid grey; color: inherit !important;} /**/
+
+.cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }

From 524e7705311df0dcd7d9218151967c36543b2ffd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 22 Jan 2014 17:52:52 +0100
Subject: [PATCH 0800/4742] [mdn-like theme] Integrate

---
 demo/theme.html    |  2 ++
 theme/mdn-like.css | 60 +++++++++++++++++++++++-----------------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/demo/theme.html b/demo/theme.html
index e36e62eaa3..29b55df2e3 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -17,6 +17,7 @@
 <link rel="stylesheet" href="../theme/erlang-dark.css">
 <link rel="stylesheet" href="../theme/lesser-dark.css">
 <link rel="stylesheet" href="../theme/mbo.css">
+<link rel="stylesheet" href="../theme/mdn-like.css">
 <link rel="stylesheet" href="../theme/midnight.css">
 <link rel="stylesheet" href="../theme/monokai.css">
 <link rel="stylesheet" href="../theme/neat.css">
@@ -83,6 +84,7 @@ <h2>Theme Demo</h2>
     <option>erlang-dark</option>
     <option>lesser-dark</option>
     <option>mbo</option>
+    <option>mdn-like</option>
     <option>midnight</option>
     <option>monokai</option>
     <option>neat</option>
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index bcd4100439..c12cb1f94f 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -3,42 +3,42 @@
   Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
   Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
   GitHub: @peterkroon
-  
+
   The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
-  
+
 */
-.cm-s-mdn-like.CodeMirror { color: #999; font-family: monospace; background-color: #fff; } /**/
-.cm-s-mdn-like .CodeMirror-selected { background: #cfc !important; } /**/
-
-.cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; } /**/
-.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; margin-left: 3px; } /**/
-.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222 !important; } /**/
-
-.cm-s-mdn-like .cm-keyword {  color: #6262FF; } /**/
-.cm-s-mdn-like .cm-atom { color: #F90; } /**/
-.cm-s-mdn-like .cm-number { color:  #ca7841; } /**/
-.cm-s-mdn-like .cm-def { color: #8DA6CE; } /**/
-.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; } /**/
-.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; } /**/
-
-.cm-s-mdn-like .cm-variable { color: #07a; } /**/
-.cm-s-mdn-like .cm-property { color: #905; } /**/
-.cm-s-mdn-like .cm-qualifier { color: #690; } /**/
-
-.cm-s-mdn-like .cm-operator { color: #cda869; } /**/
-.cm-s-mdn-like .cm-comment { color:#777; font-weight:normal; } /**/
-.cm-s-mdn-like .cm-string { color:#07a; font-style:italic; } /**/
+.cm-s-mdn-like.CodeMirror { color: #999; font-family: monospace; background-color: #fff; }
+.cm-s-mdn-like .CodeMirror-selected { background: #cfc !important; }
+
+.cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
+.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; margin-left: 3px; }
+div.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
+
+.cm-s-mdn-like .cm-keyword {  color: #6262FF; }
+.cm-s-mdn-like .cm-atom { color: #F90; }
+.cm-s-mdn-like .cm-number { color:  #ca7841; }
+.cm-s-mdn-like .cm-def { color: #8DA6CE; }
+.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; }
+
+.cm-s-mdn-like .cm-variable { color: #07a; }
+.cm-s-mdn-like .cm-property { color: #905; }
+.cm-s-mdn-like .cm-qualifier { color: #690; }
+
+.cm-s-mdn-like .cm-operator { color: #cda869; }
+.cm-s-mdn-like .cm-comment { color:#777; font-weight:normal; }
+.cm-s-mdn-like .cm-string { color:#07a; font-style:italic; }
 .cm-s-mdn-like .cm-string-2 { color:#bd6b18; } /*?*/
 .cm-s-mdn-like .cm-meta { color: #000; } /*?*/
 .cm-s-mdn-like .cm-builtin { color: #9B7536; } /*?*/
-.cm-s-mdn-like .cm-tag { color: #997643; } /**/
+.cm-s-mdn-like .cm-tag { color: #997643; }
 .cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
-.cm-s-mdn-like .cm-header { color: #FF6400; } /**/
-.cm-s-mdn-like .cm-hr { color: #AEAEAE; } /**/
-.cm-s-mdn-like .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; } /**/
-.cm-s-mdn-like .cm-error { border-bottom: 1px solid red; } /**/
+.cm-s-mdn-like .cm-header { color: #FF6400; }
+.cm-s-mdn-like .cm-hr { color: #AEAEAE; }
+.cm-s-mdn-like .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; }
+.cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-mdn-like .CodeMirror-activeline-background {background: #efefff !important;} /**/
-.cm-s-mdn-like .CodeMirror-matchingbracket {outline:1px solid grey; color: inherit !important;} /**/
+div.cm-s-mdn-like .CodeMirror-activeline-background {background: #efefff;}
+div.cm-s-mdn-like span.CodeMirror-matchingbracket {outline:1px solid grey; color: inherit;}
 
 .cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }

From e2ccf3a8e5e4cfc8af2017df79a72176cb7f7ed2 Mon Sep 17 00:00:00 2001
From: Triangle717 <le717@hotmail.com>
Date: Tue, 21 Jan 2014 14:30:48 -0500
Subject: [PATCH 0801/4742] [css mode] Added missing animation-fill-mode
 property

Also resorted the next few lines so one would not stick out farther than
the others.

https://developer.mozilla.org/en-US/docs/Web/CSS/animation-fill-mode
---
 mode/css/css.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index c94f1daa54..2e61dcecc0 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -354,10 +354,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   var propertyKeywords_ = [
     "align-content", "align-items", "align-self", "alignment-adjust",
     "alignment-baseline", "anchor-point", "animation", "animation-delay",
-    "animation-direction", "animation-duration", "animation-iteration-count",
-    "animation-name", "animation-play-state", "animation-timing-function",
-    "appearance", "azimuth", "backface-visibility", "background",
-    "background-attachment", "background-clip", "background-color",
+    "animation-direction", "animation-duration", "animation-fill-mode",
+    "animation-iteration-count", "animation-name", "animation-play-state",
+    "animation-timing-function", "appearance", "azimuth", "backface-visibility",
+    "background", "background-attachment", "background-clip", "background-color",
     "background-image", "background-origin", "background-position",
     "background-repeat", "background-size", "baseline-shift", "binding",
     "bleed", "bookmark-label", "bookmark-level", "bookmark-state",

From 327b688dc548bb336d6a547d34530ad47fa8553b Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Wed, 22 Jan 2014 00:14:57 -0800
Subject: [PATCH 0802/4742] [vim] Fix unescaping of escaped strings for search
 and replace

Add unit tests.
---
 keymap/vim.js    | 22 ++++++++++++++++++++--
 test/vim_test.js | 21 +++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a08c5c2f7c..21c74c4cf4 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2750,10 +2750,28 @@
         if (!escapeNextChar && c == '/') {
           slashes.push(i);
         }
-        escapeNextChar = (c == '\\');
+        escapeNextChar = !escapeNextChar && (c == '\\');
       }
       return slashes;
     }
+
+    function unescapeString(str) {
+      var escapeNextChar = false;
+      var out = [];
+      for (var i = 0; i < str.length; i++) {
+        var c = str.charAt(i);
+        var next = str.charAt(i+1);
+        var slashComesNext = (next == '\\') || (next == '/');
+        if (c !== '\\' || escapeNextChar || !slashComesNext) {
+          out.push(c);
+          escapeNextChar = false;
+        } else {
+          escapeNextChar = true;
+        }
+      }
+      return out.join('');
+    }
+
     /**
      * Extract the regular expression from the query and return a Regexp object.
      * Returns null if the query is blank.
@@ -3278,7 +3296,7 @@
         var count;
         var confirm = false; // Whether to confirm each replace.
         if (slashes[1]) {
-          replacePart = argString.substring(slashes[1] + 1, slashes[2]);
+          replacePart = unescapeString(argString.substring(slashes[1] + 1, slashes[2]));
         }
         if (slashes[2]) {
           // After the 3rd slash, we can have flags followed by a space followed
diff --git a/test/vim_test.js b/test/vim_test.js
index d39753c10c..dd88bbf8c6 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2264,6 +2264,8 @@ testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
   helpers.doEx('sort! d');
   eq('a3\nb2\nc1\nz\ny', cm.getValue());
 }, { value: 'a3\nz\nc1\ny\nb2'});
+
+
 testVim('ex_substitute_same_line', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   helpers.doEx('s/one/two');
@@ -2299,6 +2301,25 @@ testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
   helpers.doEx('s//b');
   eq('abb ab2 ab3', cm.getValue());
 }, { value: 'a11 a12 a13' });
+testVim('ex_substitute_slash_regex', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('%s/\\//|');
+  eq('one|two \n three|four', cm.getValue());
+}, { value: 'one/two \n three/four'});
+testVim('ex_substitute_backslashslash_regex', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('%s/\\\\/,');
+  eq('one,two \n three,four', cm.getValue());
+}, { value: 'one\\two \n three\\four'});
+testVim('ex_substitute_slash_replacement', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('%s/,/\\/');
+  eq('one/two \n three/four', cm.getValue());
+}, { value: 'one,two \n three,four'});
+testVim('ex_substitute_backslash_replacement', function(cm, vim, helpers) {
+  helpers.doEx('%s/,/\\\\/g');
+  eq('one\\two \n three\\four', cm.getValue());
+}, { value: 'one,two \n three,four'});
 testVim('ex_substitute_count', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   helpers.doEx('s/\\d/0/i 2');

From 38c84639c3606c209b4e1aad3a56ffb85ad65051 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Jan 2014 15:12:48 +0100
Subject: [PATCH 0803/4742] [css mode] Add simple support for @keyframes

Closes #2161
---
 mode/css/css.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mode/css/css.js b/mode/css/css.js
index 2e61dcecc0..06d73455da 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -140,6 +140,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return pushContext(state, stream, "media");
     } else if (type == "@font-face") {
       return "font_face_before";
+    } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
+      return "keyframes";
     } else if (type && type.charAt(0) == "@") {
       return pushContext(state, stream, "at");
     } else if (type == "hash") {
@@ -264,6 +266,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return "font_face";
   };
 
+  states.keyframes = function(type, stream, state) {
+    if (type == "word") { override = "variable"; return "keyframes"; }
+    if (type == "{") return pushContext(state, stream, "top");
+    return pass(type, stream, state);
+  };
+
   states.at = function(type, stream, state) {
     if (type == ";") return popContext(state);
     if (type == "{" || type == "}") return popAndPass(type, stream, state);

From 253977070b51076e66e2046dd27beeed1023b1bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 12:06:58 +0100
Subject: [PATCH 0804/4742] Bump version number

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 67e5291f67..ecd0355e3d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6046,7 +6046,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.21.1";
+  CodeMirror.version = "4.0.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index e8a7c18ac4..8edf5e8a3c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.21.1",
+    "version":"4.0.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 196d5ca23dcb9b67165ffb778b74f3a47c01c7f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 5 Nov 2013 11:42:50 +0100
Subject: [PATCH 0805/4742] Wrap all cursors in a div

---
 lib/codemirror.css | 14 ++++++++------
 lib/codemirror.js  | 44 +++++++++++++++++++++-----------------------
 test/test.js       |  7 +++++--
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 23eaf74d44..c141f6d85f 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -42,7 +42,6 @@
 
 .CodeMirror div.CodeMirror-cursor {
   border-left: 1px solid black;
-  z-index: 3;
 }
 /* Shown when moving in bi-directional text */
 .CodeMirror div.CodeMirror-secondarycursor {
@@ -52,10 +51,9 @@
   width: auto;
   border: 0;
   background: #7e7;
-  z-index: 1;
 }
 /* Can style cursor different in overwrite (non-insert) mode */
-.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {}
+div.CodeMirror-overwrite div.CodeMirror-cursor {}
 
 .cm-tab { display: inline-block; }
 
@@ -236,11 +234,15 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror div.CodeMirror-cursor {
   position: absolute;
-  visibility: hidden;
   border-right: none;
   width: 0;
 }
-.CodeMirror-focused div.CodeMirror-cursor {
+
+div.CodeMirror-cursors {
+  visibility: hidden;
+  z-index: 3;
+}
+.CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
 }
 
@@ -257,7 +259,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 @media print {
   /* Hide the cursor when printing */
-  .CodeMirror div.CodeMirror-cursor {
+  .CodeMirror div.CodeMirror-cursors {
     visibility: hidden;
   }
 }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ecd0355e3d..107660eb03 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -116,15 +116,12 @@ window.CodeMirror = (function() {
     // DIVs containing the selection and the actual code
     d.lineDiv = elt("div", null, "CodeMirror-code");
     d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
-    // Blinky cursor, and element used to ensure cursor fits at the end of a line
-    d.cursor = elt("div", "\u00a0", "CodeMirror-cursor");
-    // Secondary cursor, shown when on a 'jump' in bi-directional text
-    d.otherCursor = elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor");
+    d.cursorDiv = elt("div", null, "CodeMirror-cursors");
     // Used to measure text size
     d.measure = elt("div", null, "CodeMirror-measure");
     // Wraps everything that needs to exist inside the vertically-padded coordinate system
-    d.lineSpace = elt("div", [d.measure, d.selectionDiv, d.lineDiv, d.cursor, d.otherCursor],
-                         null, "position: relative; outline: none");
+    d.lineSpace = elt("div", [d.measure, d.selectionDiv, d.lineDiv, d.cursorDiv],
+                      null, "position: relative; outline: none");
     // Moved around its parent to cover visible view
     d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
     // Set to the height of the text, causes scrolling
@@ -778,15 +775,13 @@ window.CodeMirror = (function() {
 
   function updateSelection(cm) {
     var display = cm.display;
+    removeChildren(display.cursorDiv);
+    removeChildren(display.selectionDiv);
     var collapsed = posEq(cm.doc.sel.from, cm.doc.sel.to);
     if (collapsed || cm.options.showCursorWhenSelecting)
       updateSelectionCursor(cm);
-    else
-      display.cursor.style.display = display.otherCursor.style.display = "none";
     if (!collapsed)
       updateSelectionRange(cm);
-    else
-      display.selectionDiv.style.display = "none";
 
     // Move the hidden textarea near the cursor to prevent scrolling artifacts
     if (cm.options.moveInputWithCursor) {
@@ -802,17 +797,20 @@ window.CodeMirror = (function() {
   // No selection, plain cursor
   function updateSelectionCursor(cm) {
     var display = cm.display, pos = cursorCoords(cm, cm.doc.sel.head, "div");
-    display.cursor.style.left = pos.left + "px";
-    display.cursor.style.top = pos.top + "px";
-    display.cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
-    display.cursor.style.display = "";
+
+    var cursor = display.cursorDiv.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
+    cursor.style.left = pos.left + "px";
+    cursor.style.top = pos.top + "px";
+    cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
 
     if (pos.other) {
-      display.otherCursor.style.display = "";
-      display.otherCursor.style.left = pos.other.left + "px";
-      display.otherCursor.style.top = pos.other.top + "px";
-      display.otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
-    } else { display.otherCursor.style.display = "none"; }
+      // Secondary cursor, shown when on a 'jump' in bi-directional text
+      var otherCursor = display.cursorDiv.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
+      otherCursor.style.display = "";
+      otherCursor.style.left = pos.other.left + "px";
+      otherCursor.style.top = pos.other.top + "px";
+      otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
+    }
   }
 
   // Highlight selection
@@ -893,10 +891,10 @@ window.CodeMirror = (function() {
     var display = cm.display;
     clearInterval(display.blinker);
     var on = true;
-    display.cursor.style.visibility = display.otherCursor.style.visibility = "";
+    display.cursorDiv.style.visibility = "";
     if (cm.options.cursorBlinkRate > 0)
       display.blinker = setInterval(function() {
-        display.cursor.style.visibility = display.otherCursor.style.visibility = (on = !on) ? "" : "hidden";
+        display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
       }, cm.options.cursorBlinkRate);
   }
 
@@ -3220,9 +3218,9 @@ window.CodeMirror = (function() {
     toggleOverwrite: function(value) {
       if (value != null && value == this.state.overwrite) return;
       if (this.state.overwrite = !this.state.overwrite)
-        this.display.cursor.className += " CodeMirror-overwrite";
+        this.display.cursorDiv.className += " CodeMirror-overwrite";
       else
-        this.display.cursor.className = this.display.cursor.className.replace(" CodeMirror-overwrite", "");
+        this.display.cursorDiv.className = this.display.cursorDiv.className.replace(" CodeMirror-overwrite", "");
     },
     hasFocus: function() { return document.activeElement == this.display.input; },
 
diff --git a/test/test.js b/test/test.js
index 1d7f80e355..6661645cd4 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1210,18 +1210,21 @@ testCM("rtlMovement", function(cm) {
            "<img src=\"/בדיקה3.jpg\">"], function(line) {
     var inv = line.charAt(0) == "خ";
     cm.setValue(line + "\n"); cm.execCommand(inv ? "goLineEnd" : "goLineStart");
-    var cursor = byClassName(cm.getWrapperElement(), "CodeMirror-cursor")[0];
+    var cursors = byClassName(cm.getWrapperElement(), "CodeMirror-cursors")[0];
+    var cursor = cursors.firstChild;
     var prevX = cursor.offsetLeft, prevY = cursor.offsetTop;
     for (var i = 0; i <= line.length; ++i) {
       cm.execCommand("goCharRight");
+      cursor = cursors.firstChild;
       if (i == line.length) is(cursor.offsetTop > prevY, "next line");
       else is(cursor.offsetLeft > prevX, "moved right");
       prevX = cursor.offsetLeft; prevY = cursor.offsetTop;
     }
     cm.setCursor(0, 0); cm.execCommand(inv ? "goLineStart" : "goLineEnd");
-    prevX = cursor.offsetLeft;
+    prevX = cursors.firstChild.offsetLeft;
     for (var i = 0; i < line.length; ++i) {
       cm.execCommand("goCharLeft");
+      cursor = cursors.firstChild;
       is(cursor.offsetLeft < prevX, "moved left");
       prevX = cursor.offsetLeft;
     }

From f55cf1888af6e1ccaf9fdf5cf659399bb36e18f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 5 Nov 2013 12:25:03 +0100
Subject: [PATCH 0806/4742] Move extend and shift flags out of selection
 objects

---
 lib/codemirror.js | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 107660eb03..def4991a26 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -185,6 +185,8 @@ window.CodeMirror = (function() {
     // Used for measuring wheel scrolling granularity
     d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
 
+    d.shift = false;
+
     return d;
   }
 
@@ -1500,7 +1502,7 @@ window.CodeMirror = (function() {
 
     var withOp = !cm.curOp;
     if (withOp) startOperation(cm);
-    sel.shift = false;
+    cm.display.shift = false;
     var same = 0, l = Math.min(prevInput.length, text.length);
     while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
     var from = sel.from, to = sel.to;
@@ -1629,7 +1631,7 @@ window.CodeMirror = (function() {
 
     on(d.input, "keyup", operation(cm, function(e) {
       if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
-      if (e.keyCode == 16) cm.doc.sel.shift = false;
+      if (e.keyCode == 16) cm.display.shift = false;
     }));
     on(d.input, "input", function() {
       if (ie && !ie_lt9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
@@ -1713,7 +1715,7 @@ window.CodeMirror = (function() {
   function onMouseDown(e) {
     if (signalDOMEvent(this, e)) return;
     var cm = this, display = cm.display, doc = cm.doc, sel = doc.sel;
-    sel.shift = e.shiftKey;
+    display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {
       if (!webkit) {
@@ -2072,13 +2074,13 @@ window.CodeMirror = (function() {
     // Ensure previous input has been read, so that the handler sees a
     // consistent view of the document
     if (cm.display.pollingFast && readInput(cm)) cm.display.pollingFast = false;
-    var doc = cm.doc, prevShift = doc.sel.shift, done = false;
+    var prevShift = cm.display.shift, done = false;
     try {
       if (isReadOnly(cm)) cm.state.suppressEdits = true;
-      if (dropShift) doc.sel.shift = false;
+      if (dropShift) cm.display.shift = false;
       done = bound(cm) != Pass;
     } finally {
-      doc.sel.shift = prevShift;
+      cm.display.shift = prevShift;
       cm.state.suppressEdits = false;
     }
     return done;
@@ -2148,7 +2150,7 @@ window.CodeMirror = (function() {
     if (old_ie && e.keyCode == 27) e.returnValue = false;
     var code = e.keyCode;
     // IE does strange things with escape.
-    cm.doc.sel.shift = code == 16 || e.shiftKey;
+    cm.display.shift = code == 16 || e.shiftKey;
     // First give onKeyEvent option a chance to handle this.
     var handled = handleKeyBinding(cm, e);
     if (opera) {
@@ -2193,7 +2195,7 @@ window.CodeMirror = (function() {
       cm.display.wrapper.className = cm.display.wrapper.className.replace(" CodeMirror-focused", "");
     }
     clearInterval(cm.display.blinker);
-    setTimeout(function() {if (!cm.state.focused) cm.doc.sel.shift = false;}, 150);
+    setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150);
   }
 
   var detectingSelectAll;
@@ -2544,7 +2546,7 @@ window.CodeMirror = (function() {
   // If shift is held, this will move the selection anchor. Otherwise,
   // it'll set the whole selection.
   function extendSelection(doc, pos, other, bias) {
-    if (doc.sel.shift || doc.sel.extend) {
+    if (doc.cm && doc.cm.display.shift || doc.extend) {
       var anchor = doc.sel.anchor;
       if (other) {
         var posBefore = posLess(pos, anchor);
@@ -3173,7 +3175,7 @@ window.CodeMirror = (function() {
 
     moveH: operation(null, function(dir, unit) {
       var sel = this.doc.sel, pos;
-      if (sel.shift || sel.extend || posEq(sel.from, sel.to))
+      if (this.shift || this.doc.extend || posEq(sel.from, sel.to))
         pos = findPosH(this.doc, sel.head, dir, unit, this.options.rtlMoveVisually);
       else
         pos = dir < 0 ? sel.from : sel.to;
@@ -4901,7 +4903,7 @@ window.CodeMirror = (function() {
     this.cleanGeneration = 1;
     this.frontier = firstLine;
     var start = Pos(firstLine, 0);
-    this.sel = {from: start, to: start, head: start, anchor: start, shift: false, extend: false, goalColumn: null};
+    this.sel = {from: start, to: start, head: start, anchor: start, goalColumn: null};
     this.id = ++nextDocId;
     this.modeOption = mode;
 
@@ -4998,7 +5000,7 @@ window.CodeMirror = (function() {
     undo: docOperation(function() {makeChangeFromHistory(this, "undo");}),
     redo: docOperation(function() {makeChangeFromHistory(this, "redo");}),
 
-    setExtending: function(val) {this.sel.extend = val;},
+    setExtending: function(val) {this.extend = val;},
 
     historySize: function() {
       var hist = this.history;
@@ -5083,7 +5085,8 @@ window.CodeMirror = (function() {
       var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first);
       doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
       doc.sel = {from: this.sel.from, to: this.sel.to, head: this.sel.head, anchor: this.sel.anchor,
-                 shift: this.sel.shift, extend: false, goalColumn: this.sel.goalColumn};
+                 goalColumn: this.sel.goalColumn};
+      doc.extend = false;
       if (copyHistory) {
         doc.history.undoDepth = this.history.undoDepth;
         doc.setHistory(this.getHistory());

From 71d992ba4a835fd8e56dfb76d2f5c291128039a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 16:45:54 +0100
Subject: [PATCH 0807/4742] Rename confusing variable

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index def4991a26..a18036e432 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -36,7 +36,7 @@ window.CodeMirror = (function() {
   if (opera_version && opera_version >= 15) { opera = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
   var flipCtrlCmd = mac && (qtwebkit || opera && (opera_version == null || opera_version < 12.11));
-  var captureMiddleClick = gecko || (old_ie && !ie_lt9);
+  var captureRightClick = gecko || (old_ie && !ie_lt9);
 
   // Optimize some code when these features are not used
   var sawReadOnlySpans = false, sawCollapsedSpans = false;
@@ -1583,7 +1583,7 @@ window.CodeMirror = (function() {
     // Gecko browsers fire contextmenu *after* opening the menu, at
     // which point we can't mess with it anymore. Context menu is
     // handled in onMouseDown for Gecko.
-    if (!captureMiddleClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
+    if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
 
     on(d.scroller, "scroll", function() {
       if (d.scroller.clientHeight) {
@@ -1729,7 +1729,7 @@ window.CodeMirror = (function() {
 
     switch (e_button(e)) {
     case 3:
-      if (captureMiddleClick) onContextMenu.call(cm, cm, e);
+      if (captureRightClick) onContextMenu.call(cm, cm, e);
       return;
     case 2:
       if (webkit) cm.state.lastMiddleDown = +new Date;
@@ -2251,7 +2251,7 @@ window.CodeMirror = (function() {
     }
 
     if (old_ie && !ie_lt9) prepareSelectAllHack();
-    if (captureMiddleClick) {
+    if (captureRightClick) {
       e_stop(e);
       var mouseup = function() {
         off(window, "mouseup", mouseup);

From 324ca9bed60324f6b64a4b306f4b110131c6f45a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 5 Nov 2013 13:46:59 +0100
Subject: [PATCH 0808/4742] Implement multiple selections

Issue #778
---
 keymap/vim.js     |   7 +-
 lib/codemirror.js | 694 ++++++++++++++++++++++++++++++----------------
 test/test.js      |  83 +++++-
 3 files changed, 535 insertions(+), 249 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 21c74c4cf4..9e5b257f4f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -344,13 +344,14 @@
         cm.state.vim = null;
       }
     });
-    function beforeSelectionChange(cm, cur) {
+    function beforeSelectionChange(cm, obj) {
       var vim = cm.state.vim;
       if (vim.insertMode || vim.exMode) return;
 
-      var head = cur.head;
+      var head = obj.ranges[0].head;
       if (head.ch && head.ch == cm.doc.getLine(head.line).length) {
-        head.ch--;
+        obj.update([{anchor: obj.ranges[0].anchor,
+                     head: {line: head.line, ch: head.ch - 1}}]);
       }
     }
     function getOnPasteFn(cm) {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a18036e432..d07f0007ec 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -775,19 +775,90 @@ window.CodeMirror = (function() {
 
   // SELECTION / CURSOR
 
+  function Selection(ranges, primIndex) {
+    this.ranges = ranges;
+    this.primIndex = primIndex;
+  }
+
+  Selection.prototype = {
+    primary: function() { return this.ranges[this.primIndex]; },
+    equals: function(other) {
+      if (other == this) return true;
+      if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false;
+      for (var i = 0; i < this.ranges.length; i++) {
+        var here = this.ranges[i], there = other.ranges[i];
+        if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false;
+      }
+      return true;
+    },
+    deepCopy: function() {
+      for (var out = [], i = 0; i < this.ranges.length; i++)
+        out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head));
+      return new Selection(out, this.primIndex);
+    },
+    somethingSelected: function() {
+      for (var i = 0; i < this.ranges.length; i++)
+        if (!this.ranges[i].empty()) return true;
+    },
+    contains: function(pos, end) {
+      if (!end) end = pos;
+      for (var i = 0; i < this.ranges.length; i++) {
+        var range = this.ranges[i];
+        if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
+          return true;
+      }
+    }
+  };
+
+  function normalizeSelection(ranges, primIndex) {
+    ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
+    for (var i = 1; i < ranges.length; i++) {
+      var cur = ranges[i], prev = ranges[i - 1];
+      if (cmp(prev.to(), cur.from()) >= 0) {
+        var from = prev.from(), to = cur.to(), inv = prev.head == from;
+        if (i <= primIndex) --primIndex;
+        ranges.splice(i-- - 1, 2, new Range(inv ? to : from, inv ? from : to));
+      }
+    }
+    return new Selection(ranges, primIndex);
+  }
+
+  function simpleSelection(anchor, head) {
+    return new Selection([new Range(anchor, head || anchor)], 0);
+  }
+
+  function Range(anchor, head) {
+    this.anchor = anchor; this.head = head;
+  }
+
+  Range.prototype = {
+    from: function() {
+      return cmp(this.anchor, this.head) < 0 ? this.anchor : this.head;
+    },
+    to: function() {
+      return cmp(this.anchor, this.head) > 0 ? this.anchor : this.head;
+    },
+    empty: function() {
+      return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch;
+    }
+  };
+
   function updateSelection(cm) {
-    var display = cm.display;
+    var display = cm.display, doc = cm.doc;
     removeChildren(display.cursorDiv);
     removeChildren(display.selectionDiv);
-    var collapsed = posEq(cm.doc.sel.from, cm.doc.sel.to);
-    if (collapsed || cm.options.showCursorWhenSelecting)
-      updateSelectionCursor(cm);
-    if (!collapsed)
-      updateSelectionRange(cm);
+    for (var i = 0; i < doc.sel.ranges.length; i++) {
+      var range = doc.sel.ranges[i];
+      var collapsed = range.empty();
+      if (collapsed || cm.options.showCursorWhenSelecting)
+        updateSelectionCursor(cm, range);
+      if (!collapsed)
+        updateSelectionRange(cm, range);
+    }
 
     // Move the hidden textarea near the cursor to prevent scrolling artifacts
     if (cm.options.moveInputWithCursor) {
-      var headPos = cursorCoords(cm, cm.doc.sel.head, "div");
+      var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
       var wrapOff = getRect(display.wrapper), lineOff = getRect(display.lineDiv);
       display.inputDiv.style.top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
                                                         headPos.top + lineOff.top - wrapOff.top)) + "px";
@@ -797,8 +868,8 @@ window.CodeMirror = (function() {
   }
 
   // No selection, plain cursor
-  function updateSelectionCursor(cm) {
-    var display = cm.display, pos = cursorCoords(cm, cm.doc.sel.head, "div");
+  function updateSelectionCursor(cm, range) {
+    var display = cm.display, pos = cursorCoords(cm, range.head, "div");
 
     var cursor = display.cursorDiv.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
     cursor.style.left = pos.left + "px";
@@ -816,8 +887,8 @@ window.CodeMirror = (function() {
   }
 
   // Highlight selection
-  function updateSelectionRange(cm) {
-    var display = cm.display, doc = cm.doc, sel = cm.doc.sel;
+  function updateSelectionRange(cm, range) {
+    var display = cm.display, doc = cm.doc;
     var fragment = document.createDocumentFragment();
     var clientWidth = display.lineSpace.offsetWidth, pl = paddingLeft(cm.display);
 
@@ -864,13 +935,14 @@ window.CodeMirror = (function() {
       return {start: start, end: end};
     }
 
-    if (sel.from.line == sel.to.line) {
-      drawForLine(sel.from.line, sel.from.ch, sel.to.ch);
+    var sFrom = range.from(), sTo = range.to();
+    if (sFrom.line == sTo.line) {
+      drawForLine(sFrom.line, sFrom.ch, sTo.ch);
     } else {
-      var fromLine = getLine(doc, sel.from.line), toLine = getLine(doc, sel.to.line);
+      var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
       var singleVLine = visualLine(doc, fromLine) == visualLine(doc, toLine);
-      var leftEnd = drawForLine(sel.from.line, sel.from.ch, singleVLine ? fromLine.text.length : null).end;
-      var rightStart = drawForLine(sel.to.line, singleVLine ? 0 : null, sel.to.ch).start;
+      var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length : null).end;
+      var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
       if (singleVLine) {
         if (leftEnd.top < rightStart.top - 2) {
           add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
@@ -883,7 +955,7 @@ window.CodeMirror = (function() {
         add(pl, leftEnd.bottom, null, rightStart.top);
     }
 
-    removeChildrenAndAdd(display.selectionDiv, fragment);
+    display.selectionDiv.appendChild(fragment);
     display.selectionDiv.style.display = "";
   }
 
@@ -1385,7 +1457,7 @@ window.CodeMirror = (function() {
     if (op.updateScrollPos) {
       newScrollPos = op.updateScrollPos;
     } else if (op.selectionChanged && display.scroller.clientHeight) { // don't rescroll if not visible
-      var coords = cursorCoords(cm, doc.sel.head);
+      var coords = cursorCoords(cm, doc.sel.primary().head);
       newScrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);
     }
     if (op.changes.length || op.forceUpdate || newScrollPos && newScrollPos.scrollTop != null) {
@@ -1487,14 +1559,14 @@ window.CodeMirror = (function() {
   // events that indicate IME taking place, but these are not widely
   // supported or compatible enough yet to rely on.)
   function readInput(cm) {
-    var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc, sel = doc.sel;
+    var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc;
     if (!cm.state.focused || hasSelection(input) || isReadOnly(cm) || cm.options.disableInput) return false;
     if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
       input.value = input.value.substring(0, input.value.length - 1);
       cm.state.fakedLastChar = false;
     }
     var text = input.value;
-    if (text == prevInput && posEq(sel.from, sel.to)) return false;
+    if (text == prevInput && !cm.somethingSelected()) return false;
     if (ie && !ie_lt9 && cm.display.inputHasSelection === text) {
       resetInput(cm, true);
       return false;
@@ -1505,28 +1577,32 @@ window.CodeMirror = (function() {
     cm.display.shift = false;
     var same = 0, l = Math.min(prevInput.length, text.length);
     while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-    var from = sel.from, to = sel.to;
     var inserted = text.slice(same);
-    if (same < prevInput.length)
-      from = Pos(from.line, from.ch - (prevInput.length - same));
-    else if (cm.state.overwrite && posEq(from, to) && !cm.state.pasteIncoming)
-      to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + inserted.length));
-
-    var updateInput = cm.curOp.updateInput;
-    var changeEvent = {from: from, to: to, text: splitLines(inserted),
-                       origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"};
-    makeChange(cm.doc, changeEvent, "end");
-    cm.curOp.updateInput = updateInput;
-    signalLater(cm, "inputRead", cm, changeEvent);
-    if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
-        cm.options.smartIndent && sel.head.ch < 100) {
-      var electric = cm.getModeAt(sel.head).electricChars;
-      if (electric) for (var i = 0; i < electric.length; i++)
-        if (inserted.indexOf(electric.charAt(i)) > -1) {
-          indentLine(cm, sel.head.line, "smart");
-          break;
-        }
+    for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
+      var range = doc.sel.ranges[i];
+      var from = range.from(), to = range.to();
+      if (same < prevInput.length)
+        from = Pos(from.line, from.ch - (prevInput.length - same));
+      else if (cm.state.overwrite && cmp(from, to) == 0 && !cm.state.pasteIncoming)
+        to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + inserted.length));
+
+      var updateInput = cm.curOp.updateInput;
+      var changeEvent = {from: from, to: to, text: splitLines(inserted),
+                         origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"};
+      makeChange(cm.doc, changeEvent);
+      signalLater(cm, "inputRead", cm, changeEvent);
+      if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
+          cm.options.smartIndent && range.head.ch < 100 &&
+          (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
+        var electric = cm.getModeAt(range.head).electricChars;
+        if (electric) for (var i = 0; i < electric.length; i++)
+          if (inserted.indexOf(electric.charAt(i)) > -1) {
+            indentLine(cm, range.head.line, "smart");
+            break;
+          }
+      }
     }
+    cm.curOp.updateInput = updateInput;
 
     if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
     else cm.display.prevInput = text;
@@ -1537,10 +1613,11 @@ window.CodeMirror = (function() {
 
   function resetInput(cm, user) {
     var minimal, selected, doc = cm.doc;
-    if (!posEq(doc.sel.from, doc.sel.to)) {
+    var range = doc.sel.primary();
+    if (!range.empty()) {
       cm.display.prevInput = "";
       minimal = hasCopyEvent &&
-        (doc.sel.to.line - doc.sel.from.line > 100 || (selected = cm.getSelection()).length > 1000);
+        (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
       var content = minimal ? "-" : selected || cm.getSelection();
       cm.display.input.value = content;
       if (cm.state.focused) selectInput(cm.display.input);
@@ -1549,7 +1626,7 @@ window.CodeMirror = (function() {
       cm.display.prevInput = cm.display.input.value = "";
       if (ie && !ie_lt9) cm.display.inputHasSelection = null;
     }
-    cm.display.inaccurateSelection = minimal;
+    cm.display.inaccurateSelection = minimal || doc.sel.ranges.length > 1;
   }
 
   function focusInput(cm) {
@@ -1714,7 +1791,7 @@ window.CodeMirror = (function() {
   var lastClick, lastDoubleClick;
   function onMouseDown(e) {
     if (signalDOMEvent(this, e)) return;
-    var cm = this, display = cm.display, doc = cm.doc, sel = doc.sel;
+    var cm = this, display = cm.display, doc = cm.doc;
     display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {
@@ -1746,12 +1823,12 @@ window.CodeMirror = (function() {
     if (!cm.state.focused) onFocus(cm);
 
     var now = +new Date, type = "single";
-    if (lastDoubleClick && lastDoubleClick.time > now - 400 && posEq(lastDoubleClick.pos, start)) {
+    if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
       type = "triple";
       e_preventDefault(e);
       setTimeout(bind(focusInput, cm), 20);
       selectLine(cm, start.line);
-    } else if (lastClick && lastClick.time > now - 400 && posEq(lastClick.pos, start)) {
+    } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
       type = "double";
       lastDoubleClick = {time: now, pos: start};
       e_preventDefault(e);
@@ -1759,9 +1836,9 @@ window.CodeMirror = (function() {
       extendSelection(cm.doc, word.from, word.to);
     } else { lastClick = {time: now, pos: start}; }
 
-    var last = start;
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) && !posEq(sel.from, sel.to) &&
-        !posLess(start, sel.from) && !posLess(sel.to, start) && type == "single") {
+    var last = start, range = doc.sel.primary();
+    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) && !range.empty() &&
+        type == "single" && doc.sel.contains(start) && doc.sel.somethingSelected()) {
       var dragEnd = operation(cm, function(e2) {
         if (webkit) display.scroller.draggable = false;
         cm.state.draggingText = false;
@@ -1788,10 +1865,11 @@ window.CodeMirror = (function() {
     e_preventDefault(e);
     if (type == "single") extendSelection(cm.doc, clipPos(doc, start));
 
-    var startstart = sel.from, startend = sel.to, lastPos = start;
+    // FIXME[sel] Build a consistent model for handling clicks + multisel
+    var startstart = range.from(), startend = range.to(), lastPos = start;
 
     function doSelect(cur) {
-      if (posEq(lastPos, cur)) return;
+      if (cmp(lastPos, cur) == 0) return;
       lastPos = cur;
 
       if (type == "single") {
@@ -1803,10 +1881,10 @@ window.CodeMirror = (function() {
       startend = clipPos(doc, startend);
       if (type == "double") {
         var word = findWordAt(getLine(doc, cur.line).text, cur);
-        if (posLess(cur, startstart)) extendSelection(cm.doc, word.from, startend);
+        if (cmp(cur, startstart) < 0) extendSelection(cm.doc, word.from, startend);
         else extendSelection(cm.doc, startstart, word.to);
       } else if (type == "triple") {
-        if (posLess(cur, startstart)) extendSelection(cm.doc, startend, clipPos(doc, Pos(cur.line, 0)));
+        if (cmp(cur, startstart) < 0) extendSelection(cm.doc, startend, clipPos(doc, Pos(cur.line, 0)));
         else extendSelection(cm.doc, startstart, clipPos(doc, Pos(cur.line + 1, 0)));
       }
     }
@@ -1822,7 +1900,7 @@ window.CodeMirror = (function() {
       var curCount = ++counter;
       var cur = posFromMouse(cm, e, true);
       if (!cur) return;
-      if (!posEq(cur, last)) {
+      if (cmp(cur, last) != 0) {
         if (!cm.state.focused) onFocus(cm);
         last = cur;
         doSelect(cur);
@@ -1908,7 +1986,9 @@ window.CodeMirror = (function() {
           text[i] = reader.result;
           if (++read == n) {
             pos = clipPos(cm.doc, pos);
-            makeChange(cm.doc, {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"}, "around");
+            var change = {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"};
+            makeChange(cm.doc, change);
+            setSelectionAddToHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
           }
         };
         reader.readAsText(file);
@@ -1916,7 +1996,7 @@ window.CodeMirror = (function() {
       for (var i = 0; i < n; ++i) loadFile(files[i], i);
     } else {
       // Don't do a replace if the drop happened inside of the selected text.
-      if (cm.state.draggingText && !(posLess(pos, cm.doc.sel.from) || posLess(cm.doc.sel.to, pos))) {
+      if (cm.state.draggingText && cm.doc.sel.contains(pos)) {
         cm.state.draggingText(e);
         // Ensure the editor is re-focused
         setTimeout(bind(focusInput, cm), 20);
@@ -1925,9 +2005,10 @@ window.CodeMirror = (function() {
       try {
         var text = e.dataTransfer.getData("Text");
         if (text) {
-          var curFrom = cm.doc.sel.from, curTo = cm.doc.sel.to;
-          setSelection(cm.doc, pos, pos);
-          if (cm.state.draggingText) replaceRange(cm.doc, "", curFrom, curTo, "paste");
+          var selected = cm.state.draggingText && cm.getSelection();
+          setSimpleSelection(cm.doc, pos);
+          if (selected) for (var i = 0; i < selected.length; ++i)
+            replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
           cm.replaceSelection(text, null, "paste");
           focusInput(cm);
         }
@@ -2201,7 +2282,7 @@ window.CodeMirror = (function() {
   var detectingSelectAll;
   function onContextMenu(cm, e) {
     if (signalDOMEvent(cm, e, "contextmenu")) return;
-    var display = cm.display, sel = cm.doc.sel;
+    var display = cm.display;
     if (eventInWidget(display, e) || contextMenuInGutter(cm, e)) return;
 
     var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
@@ -2210,7 +2291,7 @@ window.CodeMirror = (function() {
     // Reset the current text selection only if the click is done outside of the selection
     // and 'resetSelectionOnContextMenu' option is true.
     var reset = cm.options.resetSelectionOnContextMenu;
-    if (reset && (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to)))
+    if (reset && !cm.doc.sel.contains(pos))
       operation(cm, setSelection)(cm.doc, pos, pos);
 
     var oldCSS = display.input.style.cssText;
@@ -2221,11 +2302,12 @@ window.CodeMirror = (function() {
     focusInput(cm);
     resetInput(cm, true);
     // Adds "Select all" to context menu in FF
-    if (posEq(sel.from, sel.to)) display.input.value = display.prevInput = " ";
+    var hasSelection = cm.somethingSelected();
+    if (!hasSelection) display.input.value = display.prevInput = " ";
 
     function prepareSelectAllHack() {
       if (display.input.selectionStart != null) {
-        var extval = display.input.value = "\u200b" + (posEq(sel.from, sel.to) ? "" : display.input.value);
+        var extval = display.input.value = "\u200b" + (hasSelection ? display.input.value : "");
         display.prevInput = "\u200b";
         display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
       }
@@ -2271,44 +2353,50 @@ window.CodeMirror = (function() {
                lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
   };
 
-  // Make sure a position will be valid after the given change.
-  function clipPostChange(doc, change, pos) {
-    if (!posLess(change.from, pos)) return clipPos(doc, pos);
-    var diff = (change.text.length - 1) - (change.to.line - change.from.line);
-    if (pos.line > change.to.line + diff) {
-      var preLine = pos.line - diff, lastLine = doc.first + doc.size - 1;
-      if (preLine > lastLine) return Pos(lastLine, getLine(doc, lastLine).text.length);
-      return clipToLen(pos, getLine(doc, preLine).text.length);
-    }
-    if (pos.line == change.to.line + diff)
-      return clipToLen(pos, lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0) +
-                       getLine(doc, change.to.line).text.length - change.to.ch);
-    var inside = pos.line - change.from.line;
-    return clipToLen(pos, change.text[inside].length + (inside ? 0 : change.from.ch));
-  }
-
-  // Hint can be null|"end"|"start"|"around"|{anchor,head}
-  function computeSelAfterChange(doc, change, hint) {
-    if (hint && typeof hint == "object") // Assumed to be {anchor, head} object
-      return {anchor: clipPostChange(doc, change, hint.anchor),
-              head: clipPostChange(doc, change, hint.head)};
-
-    if (hint == "start") return {anchor: change.from, head: change.from};
-
-    var end = changeEnd(change);
-    if (hint == "around") return {anchor: change.from, head: end};
-    if (hint == "end") return {anchor: end, head: end};
-
-    // hint is null, leave the selection alone as much as possible
-    var adjustPos = function(pos) {
-      if (posLess(pos, change.from)) return pos;
-      if (!posLess(change.to, pos)) return end;
-
-      var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
-      if (pos.line == change.to.line) ch += end.ch - change.to.ch;
-      return Pos(line, ch);
-    };
-    return {anchor: adjustPos(doc.sel.anchor), head: adjustPos(doc.sel.head)};
+  function adjustForChange(pos, change) {
+    if (cmp(pos, change.from) < 0) return pos;
+    if (cmp(pos, change.to) <= 0) return changeEnd(change);
+
+    var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
+    if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch;
+    return Pos(line, ch);
+  }
+
+  function computeSelAfterChange(doc, change) {
+    var out = [];
+    for (var i = 0; i < doc.sel.ranges.length; i++) {
+      var range = doc.sel.ranges[i];
+      out.push(new Range(adjustForChange(range.anchor, change),
+                         adjustForChange(range.head, change)));
+    }
+    return normalizeSelection(out, doc.sel.primIndex);
+  }
+
+  function offsetPos(pos, old, nw) {
+    if (pos.line == old.line)
+      return Pos(nw.line, pos.ch - old.ch + nw.ch);
+    else
+      return Pos(nw.line + (pos.line - old.line), pos.ch);
+  }
+
+  // Hint can be "start"|"around"
+  function computeReplacedSel(doc, changes, hint) {
+    var out = [];
+    var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
+    for (var i = 0; i < changes.length; i++) {
+      var change = changes[i];
+      var from = offsetPos(change.from, oldPrev, newPrev);
+      var to = offsetPos(changeEnd(change), oldPrev, newPrev);
+      oldPrev = change.to;
+      newPrev = to;
+      if (hint == "around") {
+        var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
+        out[i] = new Range(inv ? to : from, inv ? from : to);
+      } else {
+        out[i] = new Range(from, from);
+      }
+    }
+    return new Selection(out, doc.sel.primIndex);
   }
 
   function filterChange(doc, change, update) {
@@ -2335,9 +2423,9 @@ window.CodeMirror = (function() {
 
   // Replace the range from from to to by the strings in replacement.
   // change is a {from, to, text [, origin]} object
-  function makeChange(doc, change, selUpdate, ignoreReadOnly) {
+  function makeChange(doc, change, ignoreReadOnly) {
     if (doc.cm) {
-      if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, selUpdate, ignoreReadOnly);
+      if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly);
       if (doc.cm.state.suppressEdits) return;
     }
 
@@ -2350,18 +2438,16 @@ window.CodeMirror = (function() {
     // of read-only spans in its range.
     var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
     if (split) {
-      for (var i = split.length - 1; i >= 1; --i)
-        makeChangeNoReadonly(doc, {from: split[i].from, to: split[i].to, text: [""]});
-      if (split.length)
-        makeChangeNoReadonly(doc, {from: split[0].from, to: split[0].to, text: change.text}, selUpdate);
+      for (var i = split.length - 1; i >= 0; --i)
+        makeChangeNoReadonly(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text});
     } else {
-      makeChangeNoReadonly(doc, change, selUpdate);
+      makeChangeNoReadonly(doc, change);
     }
   }
 
-  function makeChangeNoReadonly(doc, change, selUpdate) {
-    if (change.text.length == 1 && change.text[0] == "" && posEq(change.from, change.to)) return;
-    var selAfter = computeSelAfterChange(doc, change, selUpdate);
+  function makeChangeNoReadonly(doc, change) {
+    if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return;
+    var selAfter = computeSelAfterChange(doc, change);
     addToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
 
     makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
@@ -2383,8 +2469,7 @@ window.CodeMirror = (function() {
     var event = (type == "undo" ? hist.done : hist.undone).pop();
     if (!event) return;
 
-    var anti = {changes: [], anchorBefore: event.anchorAfter, headBefore: event.headAfter,
-                anchorAfter: event.anchorBefore, headAfter: event.headBefore,
+    var anti = {changes: [], selBefore: event.selAfter, selAfter: event.selBefore,
                 generation: hist.generation};
     (type == "undo" ? hist.undone : hist.done).push(anti);
     hist.generation = event.generation || ++hist.maxGeneration;
@@ -2401,8 +2486,7 @@ window.CodeMirror = (function() {
 
       anti.changes.push(historyChangeFromChange(doc, change));
 
-      var after = i ? computeSelAfterChange(doc, change, null)
-                    : {anchor: event.anchorBefore, head: event.headBefore};
+      var after = i ? computeSelAfterChange(doc, change, null) : event.selBefore;
       makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
       var rebased = [];
 
@@ -2417,11 +2501,12 @@ window.CodeMirror = (function() {
   }
 
   function shiftDoc(doc, distance) {
-    function shiftPos(pos) {return Pos(pos.line + distance, pos.ch);}
     doc.first += distance;
+    doc.sel = new Selection(map(doc.sel.ranges, function(range) {
+      return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
+                       Pos(range.head.line + distance, range.head.ch));
+    }), doc.sel.primIndex);
     if (doc.cm) regChange(doc.cm, doc.first, doc.first, distance);
-    doc.sel.head = shiftPos(doc.sel.head); doc.sel.anchor = shiftPos(doc.sel.anchor);
-    doc.sel.from = shiftPos(doc.sel.from); doc.sel.to = shiftPos(doc.sel.to);
   }
 
   function makeChangeSingleDoc(doc, change, selAfter, spans) {
@@ -2468,7 +2553,7 @@ window.CodeMirror = (function() {
       });
     }
 
-    if (!posLess(doc.sel.head, change.from) && !posLess(change.to, doc.sel.head))
+    if (doc.sel.contains(change.from, change.to))
       cm.curOp.cursorActivity = true;
 
     updateDoc(doc, change, spans, selAfter, estimateHeight(cm));
@@ -2508,9 +2593,9 @@ window.CodeMirror = (function() {
 
   function replaceRange(doc, code, from, to, origin) {
     if (!to) to = from;
-    if (posLess(to, from)) { var tmp = to; to = from; from = tmp; }
+    if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
     if (typeof code == "string") code = splitLines(code);
-    makeChange(doc, {from: from, to: to, text: code, origin: origin}, null);
+    makeChange(doc, {from: from, to: to, text: code, origin: origin});
   }
 
   // POSITION OBJECT
@@ -2521,9 +2606,7 @@ window.CodeMirror = (function() {
   }
   CodeMirror.Pos = Pos;
 
-  function posEq(a, b) {return a.line == b.line && a.ch == b.ch;}
-  function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);}
-  function cmp(a, b) {return a.line - b.line || a.ch - b.ch;}
+  var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; };
   function copyPos(x) {return Pos(x.line, x.ch);}
 
   // SELECTION
@@ -2543,70 +2626,113 @@ window.CodeMirror = (function() {
   }
   function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
 
-  // If shift is held, this will move the selection anchor. Otherwise,
-  // it'll set the whole selection.
-  function extendSelection(doc, pos, other, bias) {
+  function extendRange(doc, range, pos, other) {
     if (doc.cm && doc.cm.display.shift || doc.extend) {
-      var anchor = doc.sel.anchor;
+      var anchor = range.anchor;
       if (other) {
-        var posBefore = posLess(pos, anchor);
-        if (posBefore != posLess(other, anchor)) {
+        var posBefore = cmp(pos, anchor) < 0;
+        if (posBefore != (cmp(other, anchor) < 0)) {
           anchor = pos;
           pos = other;
-        } else if (posBefore != posLess(pos, other)) {
+        } else if (posBefore != (cmp(pos, other) < 0)) {
           pos = other;
         }
       }
-      setSelection(doc, anchor, pos, bias);
+      return new Range(anchor, pos);
     } else {
-      setSelection(doc, pos, other || pos, bias);
+      return new Range(pos, other || pos);
     }
+  }
+
+  // If shift is held, this will move the selection anchor. Otherwise,
+  // it'll set the whole selection.
+  function extendSelection(doc, pos, other, bias) {
+    var prim = doc.sel.primary();
+    replaceOneSelection(doc, doc.sel.primIndex, extendRange(doc, prim, pos, other), bias);
+    if (doc.cm) doc.cm.curOp.userSelChange = true;
+  }
+
+  // Extend all selections (pos is an array of selections with length
+  // equal the number of selections)
+  function extendSelections(doc, pos, other, bias) {
+    for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
+      out[i] = extendRange(doc, doc.sel.ranges[i], pos[i], other && other[i]);
+    var newSel = normalizeSelection(out, doc.sel.primIndex);
+    setSelection(doc, newSel, bias);
     if (doc.cm) doc.cm.curOp.userSelChange = true;
   }
 
-  function filterSelectionChange(doc, anchor, head) {
-    var obj = {anchor: anchor, head: head};
+  function replaceOneSelection(doc, i, range, bias) {
+    var ranges = doc.sel.ranges.slice(0);
+    ranges[i] = range;
+    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), bias);
+  }
+
+  function setSimpleSelection(doc, anchor, head, bias, checkAtomic) {
+    setSelection(doc, simpleSelection(anchor, head), bias, checkAtomic);
+  }
+
+  function setSelectionAddToHistory(doc, sel) {
+    setSelection(doc, sel);
+    lst(doc.history.done).selAfter = sel;
+  }
+
+  function filterSelectionChange(doc, sel) {
+    var obj = {
+      ranges: sel.ranges,
+      update: function(ranges) {
+        this.ranges = [];
+        for (var i = 0; i < ranges.length; i++)
+          this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
+                                     clipPos(doc, ranges[i].head));
+      }
+    };
     signal(doc, "beforeSelectionChange", doc, obj);
     if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
-    obj.anchor = clipPos(doc, obj.anchor); obj.head = clipPos(doc, obj.head);
-    return obj;
+    if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1);
+    else return sel;
   }
 
   // Update the selection. Last two args are only used by
   // updateDoc, since they have to be expressed in the line
   // numbers before the update.
-  function setSelection(doc, anchor, head, bias, checkAtomic) {
-    if (!checkAtomic && hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange")) {
-      var filtered = filterSelectionChange(doc, anchor, head);
-      head = filtered.head;
-      anchor = filtered.anchor;
-    }
+  function setSelection(doc, sel, bias) {
+    if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
+      sel = filterSelectionChange(doc, sel);
 
-    var sel = doc.sel;
-    sel.goalColumn = null;
-    if (bias == null) bias = posLess(head, sel.head) ? -1 : 1;
-    // Skip over atomic spans.
-    if (checkAtomic || !posEq(anchor, sel.anchor))
-      anchor = skipAtomic(doc, anchor, bias, checkAtomic != "push");
-    if (checkAtomic || !posEq(head, sel.head))
-      head = skipAtomic(doc, head, bias, checkAtomic != "push");
+    if (bias == null)
+      bias = cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1;
 
-    if (posEq(sel.anchor, anchor) && posEq(sel.head, head)) return;
+    setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
+  }
+
+  function setSelectionInner(doc, sel) {
+    if (sel.equals(doc.sel)) return;
 
-    sel.anchor = anchor; sel.head = head;
-    var inv = posLess(head, anchor);
-    sel.from = inv ? head : anchor;
-    sel.to = inv ? anchor : head;
+    doc.sel = sel;
 
     if (doc.cm)
       doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged =
         doc.cm.curOp.cursorActivity = true;
-
     signalLater(doc, "cursorActivity", doc);
   }
 
-  function reCheckSelection(cm) {
-    setSelection(cm.doc, cm.doc.sel.from, cm.doc.sel.to, null, "push");
+  function reCheckSelection(doc) {
+    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false));
+  }
+
+  function skipAtomicInSelection(doc, sel, bias, mayClear) {
+    var out;
+    for (var i = 0; i < sel.ranges.length; i++) {
+      var range = sel.ranges[i];
+      var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear);
+      var newHead = skipAtomic(doc, range.head, bias, mayClear);
+      if (out || newAnchor != range.anchor || newHead != range.head) {
+        if (!out) out = sel.ranges.slice(0, i);
+        out[i] = new Range(newAnchor, newHead);
+      }
+    }
+    return out ? normalizeSelection(out, sel.primIndex) : sel;
   }
 
   function skipAtomic(doc, pos, bias, mayClear) {
@@ -2629,7 +2755,7 @@ window.CodeMirror = (function() {
             }
             if (!m.atomic) continue;
             var newPos = m.find()[dir < 0 ? "from" : "to"];
-            if (posEq(newPos, curPos)) {
+            if (cmp(newPos, curPos) == 0) {
               newPos.ch += dir;
               if (newPos.ch < 0) {
                 if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
@@ -2662,7 +2788,7 @@ window.CodeMirror = (function() {
   // SCROLLING
 
   function scrollCursorIntoView(cm) {
-    var coords = scrollPosIntoView(cm, cm.doc.sel.head, null, cm.options.cursorScrollMargin);
+    var coords = scrollPosIntoView(cm, cm.doc.sel.primary().head, null, cm.options.cursorScrollMargin);
     if (!cm.state.focused) return;
     var display = cm.display, box = getRect(display.sizer), doScroll = null;
     if (coords.top + box.top < 0) doScroll = true;
@@ -2784,10 +2910,18 @@ window.CodeMirror = (function() {
       for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
     if (pos < indentation) indentString += spaceStr(indentation - pos);
 
-    if (indentString != curSpaceString)
+    if (indentString != curSpaceString) {
       replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
-    else if (doc.sel.head.line == n && doc.sel.head.ch < curSpaceString.length)
-      setSelection(doc, Pos(n, curSpaceString.length), Pos(n, curSpaceString.length), 1);
+    } else {
+      for (var i = 0; i < doc.sel.ranges.length; i++) {
+        var range = doc.sel.ranges[i];
+        if (range.head.line == n && range.head.ch < curSpaceString.length) {
+          var pos = Pos(n, curSpaceString.length);
+          replaceOneSelection(doc, i, new Range(pos, pos), 1);
+          break;
+        }
+      }
+    }
     line.stateAfter = null;
   }
 
@@ -2941,10 +3075,17 @@ window.CodeMirror = (function() {
       if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
     }),
     indentSelection: operation(null, function(how) {
-      var sel = this.doc.sel;
-      if (posEq(sel.from, sel.to)) return indentLine(this, sel.from.line, how, true);
-      var e = sel.to.line - (sel.to.ch ? 0 : 1);
-      for (var i = sel.from.line; i <= e; ++i) indentLine(this, i, how);
+      for (var i = this.doc.sel.ranges.length - 1; i >= 0; i--) {
+        var range = this.doc.sel.ranges[i];
+        if (range.empty()) {
+          indentLine(this, range.from().line, how, true);
+        } else {
+          var to = range.to();
+          var e = to.line - (to.ch ? 0 : 1);
+          for (var j = range.from().line; j <= e; ++j)
+            indentLine(this, j, how);
+        }
+      }
     }),
 
     // Fetch the parser token for a given character. Useful for hacks
@@ -3021,10 +3162,10 @@ window.CodeMirror = (function() {
     },
 
     cursorCoords: function(start, mode) {
-      var pos, sel = this.doc.sel;
-      if (start == null) pos = sel.head;
+      var pos, range = this.doc.sel.primary();
+      if (start == null) pos = range.head;
       else if (typeof start == "object") pos = clipPos(this.doc, start);
-      else pos = start ? sel.from : sel.to;
+      else pos = start ? range.from() : range.to();
       return cursorCoords(this, pos, mode || "page");
     },
 
@@ -3174,18 +3315,27 @@ window.CodeMirror = (function() {
     },
 
     moveH: operation(null, function(dir, unit) {
-      var sel = this.doc.sel, pos;
-      if (this.shift || this.doc.extend || posEq(sel.from, sel.to))
-        pos = findPosH(this.doc, sel.head, dir, unit, this.options.rtlMoveVisually);
-      else
-        pos = dir < 0 ? sel.from : sel.to;
-      extendSelection(this.doc, pos, pos, dir);
+      var sel = this.doc.sel, pos = [];
+      for (var i = 0; i < sel.ranges.length; i++) {
+        var range = sel.ranges[i];
+        if (this.shift || this.doc.extend || range.empty())
+          pos[i] = findPosH(this.doc, range.head, dir, unit, this.options.rtlMoveVisually);
+        else
+          pos[i] = dir < 0 ? range.from() : range.to();
+      }
+      extendSelections(this.doc, pos, null, dir);
     }),
 
     deleteH: operation(null, function(dir, unit) {
       var sel = this.doc.sel;
-      if (!posEq(sel.from, sel.to)) replaceRange(this.doc, "", sel.from, sel.to, "+delete");
-      else replaceRange(this.doc, "", sel.from, findPosH(this.doc, sel.head, dir, unit, false), "+delete");
+      if (sel.somethingSelected()) {
+        this.doc.replaceSelection("", null, "+delete");
+      } else {
+        for (var i = sel.ranges.length - 1; i >= 0; i--) {
+          var range = sel.ranges[i];
+          replaceRange(this.doc, "", range.head, findPosH(this.doc, range.head, dir, unit, false), "+delete");
+        }
+      }
       this.curOp.userSelChange = true;
     }),
 
@@ -3203,18 +3353,24 @@ window.CodeMirror = (function() {
     },
 
     moveV: operation(null, function(dir, unit) {
-      var sel = this.doc.sel, target, goal;
-      if (sel.shift || sel.extend || posEq(sel.from, sel.to)) {
-        var pos = cursorCoords(this, sel.head, "div");
-        if (sel.goalColumn != null) pos.left = sel.goalColumn;
-        target = findPosV(this, pos, dir, unit);
-        if (unit == "page") addToScrollPos(this, 0, charCoords(this, target, "div").top - pos.top);
-        goal = pos.left;
+      var sel = this.doc.sel, pos = [], cols = [];
+      if (sel.shift || sel.extend || !sel.somethingSelected()) {
+        for (var i = 0; i < sel.ranges.length; i++) {
+          var range = sel.ranges[i], headPos = cursorCoords(this, range.head, "div");
+          if (range.goalColumn != null) headPos.left = range.goalColumn;
+          pos[i] = findPosV(this, headPos, dir, unit);
+          cols[i] = headPos.left;
+          if (unit == "page" && i == sel.primIndex)
+            addToScrollPos(this, 0, charCoords(this, pos[i], "div").top - headPos.top);
+        }
       } else {
-        target = dir < 0 ? sel.from : sel.to;
+        for (var i = 0; i < sel.ranges.length; i++)
+          pos.push(dir < 0 ? sel.ranges[i].from() : sel.ranges[i].to());
       }
-      extendSelection(this.doc, target, target, dir);
-      if (goal != null) sel.goalColumn = goal;
+      extendSelections(this.doc, pos, null, dir);
+      sel = this.doc.sel;
+      if (cols.length) for (var i = 0; i < sel.ranges.length; i++)
+        sel.ranges[i].goalColumn = cols[i];
     }),
 
     toggleOverwrite: function(value) {
@@ -3237,7 +3393,7 @@ window.CodeMirror = (function() {
     },
 
     scrollIntoView: operation(null, function(range, margin) {
-      if (range == null) range = {from: this.doc.sel.head, to: null};
+      if (range == null) range = {from: this.doc.sel.primary().head, to: null};
       else if (typeof range == "number") range = {from: Pos(range, 0), to: null};
       else if (range.from == null) range = {from: range, to: null};
       if (!range.to) range.to = range.from;
@@ -3533,7 +3689,7 @@ window.CodeMirror = (function() {
   var commands = CodeMirror.commands = {
     selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()));},
     killLine: function(cm) {
-      var from = cm.getCursor(true), to = cm.getCursor(false), sel = !posEq(from, to);
+      var from = cm.getCursor(true), to = cm.getCursor(false), sel = cmp(from, to) != 0;
       if (!sel && cm.getLine(from.line).length == from.ch)
         cm.replaceRange("", from, Pos(from.line + 1, 0), "+delete");
       else cm.replaceRange("", from, sel ? to : Pos(from.line), "+delete");
@@ -3881,7 +4037,7 @@ window.CodeMirror = (function() {
     this.explicitlyCleared = true;
     if (this.atomic && this.doc.cantEdit) {
       this.doc.cantEdit = false;
-      if (cm) reCheckSelection(cm);
+      if (cm) reCheckSelection(cm.doc);
     }
     if (withOp) endOperation(cm);
   };
@@ -3940,9 +4096,9 @@ window.CodeMirror = (function() {
     if (options && options.shared) return markTextShared(doc, from, to, options, type);
     if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
 
-    var marker = new TextMarker(doc, type);
+    var marker = new TextMarker(doc, type), diff = cmp(from, to);
     if (options) copyObj(options, marker);
-    if (posLess(to, from) || posEq(from, to) && marker.clearWhenEmpty !== false)
+    if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
       return marker;
     if (marker.replacedWith) {
       marker.collapsed = true;
@@ -3957,8 +4113,7 @@ window.CodeMirror = (function() {
     }
 
     if (marker.addToHistory)
-      addToHistory(doc, {from: from, to: to, origin: "markText"},
-                   {head: doc.sel.head, anchor: doc.sel.anchor}, NaN);
+      addToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN);
 
     var curLine = from.line, cm = doc.cm, updateMaxLine;
     doc.iter(curLine, to.line + 1, function(line) {
@@ -3990,7 +4145,7 @@ window.CodeMirror = (function() {
       if (updateMaxLine) cm.curOp.updateMaxLine = true;
       if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.collapsed)
         regChange(cm, from.line, to.line + 1);
-      if (marker.atomic) reCheckSelection(cm);
+      if (marker.atomic) reCheckSelection(cm.doc);
     }
     return marker;
   }
@@ -4085,7 +4240,7 @@ window.CodeMirror = (function() {
     var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
     if (!oldFirst && !oldLast) return null;
 
-    var startCh = change.from.ch, endCh = change.to.ch, isInsert = posEq(change.from, change.to);
+    var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
     // Get the spans that 'stick out' on both sides
     var first = markedSpansBefore(oldFirst, startCh, isInsert);
     var last = markedSpansAfter(oldLast, endCh, isInsert);
@@ -4186,11 +4341,11 @@ window.CodeMirror = (function() {
       var mk = markers[i], m = mk.find();
       for (var j = 0; j < parts.length; ++j) {
         var p = parts[j];
-        if (posLess(p.to, m.from) || posLess(m.to, p.from)) continue;
-        var newParts = [j, 1];
-        if (posLess(p.from, m.from) || !mk.inclusiveLeft && posEq(p.from, m.from))
+        if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue;
+        var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
+        if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
           newParts.push({from: p.from, to: m.from});
-        if (posLess(m.to, p.to) || !mk.inclusiveRight && posEq(p.to, m.to))
+        if (dto > 0 || !mk.inclusiveRight && !dto)
           newParts.push({from: m.to, to: p.to});
         parts.splice.apply(parts, newParts);
         j += newParts.length - 1;
@@ -4758,7 +4913,7 @@ window.CodeMirror = (function() {
     }
 
     signalLater(doc, "change", doc, change);
-    setSelection(doc, selAfter.anchor, selAfter.head, null, true);
+    setSelection(doc, selAfter, null, true);
   }
 
   function LeafChunk(lines) {
@@ -4903,12 +5058,12 @@ window.CodeMirror = (function() {
     this.cleanGeneration = 1;
     this.frontier = firstLine;
     var start = Pos(firstLine, 0);
-    this.sel = {from: start, to: start, head: start, anchor: start, goalColumn: null};
+    this.sel = simpleSelection(start);
     this.id = ++nextDocId;
     this.modeOption = mode;
 
     if (typeof text == "string") text = splitLines(text);
-    updateDoc(this, {from: start, to: start, text: text}, null, {head: start, anchor: start});
+    updateDoc(this, {from: start, to: start, text: text}, null, simpleSelection(start));
   };
 
   Doc.prototype = createObj(BranchChunk.prototype, {
@@ -4930,12 +5085,12 @@ window.CodeMirror = (function() {
       if (lineSep === false) return lines;
       return lines.join(lineSep || "\n");
     },
-    setValue: function(code) {
+    setValue: docOperation(function(code) {
       var top = Pos(this.first, 0), last = this.first + this.size - 1;
       makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: splitLines(code), origin: "setValue"},
-                 {head: top, anchor: top}, true);
-    },
+                        text: splitLines(code), origin: "setValue"}, true);
+      setSelectionAddToHistory(this, simpleSelection(top));
+    }),
     replaceRange: function(code, from, to, origin) {
       from = clipPos(this, from);
       to = to ? clipPos(this, to) : from;
@@ -4972,30 +5127,74 @@ window.CodeMirror = (function() {
     clipPos: function(pos) {return clipPos(this, pos);},
 
     getCursor: function(start) {
-      var sel = this.sel, pos;
-      if (start == null || start == "head") pos = sel.head;
-      else if (start == "anchor") pos = sel.anchor;
-      else if (start == "end" || start === false) pos = sel.to;
-      else pos = sel.from;
+      var range = this.sel.primary(), pos;
+      if (start == null || start == "head") pos = range.head;
+      else if (start == "anchor") pos = range.anchor;
+      else if (start == "end" || start == "to" || start === false) pos = range.to();
+      else pos = range.from();
       return copyPos(pos);
     },
-    somethingSelected: function() {return !posEq(this.sel.head, this.sel.anchor);},
+    listSelections: function() { return this.sel.ranges; },
+    somethingSelected: function() {return this.sel.somethingSelected();},
 
     setCursor: docOperation(function(line, ch, extend) {
       var pos = clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line);
       if (extend) extendSelection(this, pos);
-      else setSelection(this, pos, pos);
+      else setSimpleSelection(this, pos);
     }),
     setSelection: docOperation(function(anchor, head, bias) {
-      setSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), bias);
+      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), bias);
     }),
     extendSelection: docOperation(function(from, to, bias) {
       extendSelection(this, clipPos(this, from), to && clipPos(this, to), bias);
     }),
+    setSelections: docOperation(function(ranges, primary, bias) {
+      for (var i = 0, out = []; i < ranges.length; i++)
+        out[i] = new Range(clipPos(this, ranges[i].anchor),
+                           clipPos(this, ranges[i].head));
+      if (primary == null) primary = ranges.length - 1;
+      setSelection(this, normalizeSelection(out, primary), bias);
+    }),
+    addSelection: docOperation(function(anchor, head) {
+      var ranges = this.sel.ranges.slice(0);
+      ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
+      setSelection(this, normalizeSelection(ranges, ranges.length - 1));
+    }),
 
-    getSelection: function(lineSep) {return this.getRange(this.sel.from, this.sel.to, lineSep);},
-    replaceSelection: function(code, collapse, origin) {
-      makeChange(this, {from: this.sel.from, to: this.sel.to, text: splitLines(code), origin: origin}, collapse || "around");
+    getSelection: function(lineSep) {
+      var ranges = this.sel.ranges, lines;
+      for (var i = 0; i < ranges.length; i++) {
+        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
+        lines = lines ? lines.concat(sel) : sel;
+      }
+      if (lineSep === false) return lines;
+      else return lines.join(lineSep || "\n");
+    },
+    getSelections: function(lineSep) {
+      var parts = [], ranges = this.sel.ranges;
+      for (var i = 0; i < ranges.length; i++) {
+        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
+        if (lineSep !== false) sel = sel.join(lineSep || "\n");
+        parts[i] = sel;
+      }
+      return parts;
+    },
+    replaceSelection: docOperation(function(code, collapse, origin) {
+      var dup = [];
+      for (var i = 0; i < this.sel.ranges.length; i++)
+        dup[i] = code;
+      this.replaceSelections(dup, collapse, origin);
+    }),
+    replaceSelections: function(code, collapse, origin) {
+      var changes = [], sel = this.sel;
+      for (var i = 0; i < sel.ranges.length; i++) {
+        var range = sel.ranges[i];
+        changes[i] = {from: range.from(), to: range.to(), text: splitLines(code[i]), origin: origin};
+      }
+      var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
+      for (var i = changes.length - 1; i >= 0; i--)
+        makeChange(this, changes[i]);
+      if (newSel) setSelectionAddToHistory(this, newSel);
     },
     undo: docOperation(function() {makeChangeFromHistory(this, "undo");}),
     redo: docOperation(function() {makeChangeFromHistory(this, "redo");}),
@@ -5026,8 +5225,8 @@ window.CodeMirror = (function() {
     },
     setHistory: function(histData) {
       var hist = this.history = makeHistory(this.history.maxGeneration);
-      hist.done = histData.done.slice(0);
-      hist.undone = histData.undone.slice(0);
+      hist.done = copyHistoryArray(histData.done.slice(0), null, true);
+      hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
     },
 
     markText: function(from, to, options) {
@@ -5084,8 +5283,7 @@ window.CodeMirror = (function() {
     copy: function(copyHistory) {
       var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first);
       doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
-      doc.sel = {from: this.sel.from, to: this.sel.to, head: this.sel.head, anchor: this.sel.anchor,
-                 goalColumn: this.sel.goalColumn};
+      doc.sel = this.sel;
       doc.extend = false;
       if (copyHistory) {
         doc.history.undoDepth = this.history.undoDepth;
@@ -5302,7 +5500,7 @@ window.CodeMirror = (function() {
           change.origin.charAt(0) == "*"))) {
       // Merge this change into the last event
       var last = lst(cur.changes);
-      if (posEq(change.from, change.to) && posEq(change.from, last.to)) {
+      if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
         // Optimized case for simple insertion -- don't want to add
         // new changesets for every character typed
         last.to = changeEnd(change);
@@ -5310,13 +5508,12 @@ window.CodeMirror = (function() {
         // Add new sub-event
         cur.changes.push(historyChangeFromChange(doc, change));
       }
-      cur.anchorAfter = selAfter.anchor; cur.headAfter = selAfter.head;
+      cur.selAfter = selAfter;
     } else {
       // Can not be merged, start a new event.
       cur = {changes: [historyChangeFromChange(doc, change)],
              generation: hist.generation,
-             anchorBefore: doc.sel.anchor, headBefore: doc.sel.head,
-             anchorAfter: selAfter.anchor, headAfter: selAfter.head};
+             selBefore: doc.sel, selAfter: selAfter};
       hist.done.push(cur);
       while (hist.done.length > hist.undoDepth)
         hist.done.shift();
@@ -5344,13 +5541,21 @@ window.CodeMirror = (function() {
     return nw;
   }
 
+  function copyHistorySel(sel, instantiate) {
+    if (!instantiate) return sel;
+    for (var out = [], i = 0; i < sel.ranges.length; i++)
+      out[i] = new Range(sel.ranges[i].anchor, sel.ranges[i].head);
+    return new Selection(out, sel.primIndex);
+  }
+
   // Used both to provide a JSON-safe object in .getHistory, and, when
   // detaching a document, to split the history in two
-  function copyHistoryArray(events, newGroup) {
+  function copyHistoryArray(events, newGroup, instantiateSel) {
     for (var i = 0, copy = []; i < events.length; ++i) {
       var event = events[i], changes = event.changes, newChanges = [];
-      copy.push({changes: newChanges, anchorBefore: event.anchorBefore, headBefore: event.headBefore,
-                 anchorAfter: event.anchorAfter, headAfter: event.headAfter});
+      copy.push({changes: newChanges,
+                 selBefore: copyHistorySel(event.selBefore, instantiateSel),
+                 selAfter: copyHistorySel(event.selAfter, instantiateSel)});
       for (var j = 0; j < changes.length; ++j) {
         var change = changes[j], m;
         newChanges.push({from: change.from, to: change.to, text: change.text});
@@ -5367,7 +5572,13 @@ window.CodeMirror = (function() {
 
   // Rebasing/resetting history to deal with externally-sourced changes
 
-  function rebaseHistSel(pos, from, to, diff) {
+  function rebaseHistSel(array, from, to, diff) {
+    for (var i = 0; i < array.length; i++) {
+      rebaseHistSelSingle(array[i].anchor, from, to, diff);
+      rebaseHistSelSingle(array[i].head, from, to, diff);
+    }
+  }
+  function rebaseHistSelSingle(pos, from, to, diff) {
     if (to < pos.line) {
       pos.line += diff;
     } else if (from < pos.line) {
@@ -5388,26 +5599,25 @@ window.CodeMirror = (function() {
       var sub = array[i], ok = true;
       for (var j = 0; j < sub.changes.length; ++j) {
         var cur = sub.changes[j];
-        if (!sub.copied) { cur.from = copyPos(cur.from); cur.to = copyPos(cur.to); }
         if (to < cur.from.line) {
-          cur.from.line += diff;
-          cur.to.line += diff;
+          cur.from = Pos(cur.from.line + diff, cur.from.ch);
+          cur.to = Pos(cur.to.line + diff, cur.to.ch);
         } else if (from <= cur.to.line) {
           ok = false;
           break;
         }
       }
       if (!sub.copied) {
-        sub.anchorBefore = copyPos(sub.anchorBefore); sub.headBefore = copyPos(sub.headBefore);
-        sub.anchorAfter = copyPos(sub.anchorAfter); sub.readAfter = copyPos(sub.headAfter);
+        sub.selBefore = sub.selBefore.deepCopy();
+        sub.selAfter = sub.selAfter.deepCopy();
         sub.copied = true;
       }
       if (!ok) {
         array.splice(0, i + 1);
         i = 0;
       } else {
-        rebaseHistSel(sub.anchorBefore); rebaseHistSel(sub.headBefore);
-        rebaseHistSel(sub.anchorAfter); rebaseHistSel(sub.headAfter);
+        rebaseHistSel(sub.selBefore, from, to, diff);
+        rebaseHistSel(sub.selAfter, from, to, diff);
       }
     }
   }
@@ -5581,6 +5791,12 @@ window.CodeMirror = (function() {
       if (collection[i] == elt) return i;
     return -1;
   }
+  function map(array, f) {
+    var out = [];
+    for (var i = 0; i < array.length; i++)
+      out[i] = f(array[i], i);
+    return out;
+  }
 
   function createObj(base, props) {
     function Obj() {}
diff --git a/test/test.js b/test/test.js
index 6661645cd4..7cfb61980c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -87,7 +87,7 @@ testCM("selection", function(cm) {
   is(!cm.somethingSelected());
   eq(cm.getSelection(), "");
   eqPos(cm.getCursor(true), Pos(1, 0));
-  cm.replaceSelection("abc");
+  cm.replaceSelection("abc", "around");
   eq(cm.getSelection(), "abc");
   eq(cm.getValue(), "111111\nabc222222\n333333");
   cm.replaceSelection("def", "end");
@@ -1440,14 +1440,14 @@ testCM("readOnlyMarker", function(cm) {
   eqPos(cm.getCursor(), Pos(0, 2));
   eq(cm.getLine(0), "abcde");
   cm.execCommand("selectAll");
-  cm.replaceSelection("oops");
+  cm.replaceSelection("oops", "around");
   eq(cm.getValue(), "oopsbcd");
   cm.undo();
   eqPos(m.find().from, Pos(0, 1));
   eqPos(m.find().to, Pos(0, 4));
   m.clear();
   cm.setCursor(Pos(0, 2));
-  cm.replaceSelection("hi");
+  cm.replaceSelection("hi", "around");
   eq(cm.getLine(0), "abhicde");
   eqPos(cm.getCursor(), Pos(0, 4));
   m = mark(0, 2, 2, 2, true);
@@ -1459,7 +1459,7 @@ testCM("readOnlyMarker", function(cm) {
   cm.execCommand("goCharLeft");
   eqPos(cm.getCursor(), Pos(0, 2));
   cm.setSelection(Pos(0, 1), Pos(0, 3));
-  cm.replaceSelection("xx");
+  cm.replaceSelection("xx", "around");
   eqPos(cm.getCursor(), Pos(0, 3));
   eq(cm.getLine(0), "axxhicde");
 }, {value: "abcde\nfghij\nklmno\n"});
@@ -1587,9 +1587,9 @@ testCM("beforeSelectionChange", function(cm) {
     if (!len || pos.ch == len) return Pos(pos.line, pos.ch - 1);
     return pos;
   }
-  cm.on("beforeSelectionChange", function(cm, sel) {
-    sel.head = notAtEnd(cm, sel.head);
-    sel.anchor = notAtEnd(cm, sel.anchor);
+  cm.on("beforeSelectionChange", function(cm, obj) {
+    obj.update([{anchor: notAtEnd(cm, obj.ranges[0].anchor),
+                 head: notAtEnd(cm, obj.ranges[0].head)}]);
   });
 
   addDoc(cm, 10, 10);
@@ -1670,3 +1670,72 @@ testCM("helpers", function(cm) {
   cm.setOption("mode", "javascript");
   eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "");
 });
+
+// Multiple selections
+
+function hasSelections(cm) {
+  var sels = cm.listSelections();
+  var given = (arguments.length - 1) / 4;
+  if (sels.length != given)
+    throw new Failure("expected " + given + " selections, found " + sels.length);
+  for (var i = 0, p = 1; i < given; i++, p += 4) {
+    var anchor = Pos(arguments[p], arguments[p + 1]);
+    var head = Pos(arguments[p + 2], arguments[p + 3]);
+    eqPos(sels[i].anchor, anchor, "anchor of selection " + i);
+    eqPos(sels[i].head, head, "head of selection " + i);
+  }
+}
+
+testCM("replaceMultiSelection", function(cm) {
+  var selections = [{anchor: Pos(0, 0), head: Pos(0, 1)},
+                    {anchor: Pos(0, 2), head: Pos(0, 3)},
+                    {anchor: Pos(0, 4), head: Pos(0, 5)},
+                    {anchor: Pos(2, 1), head: Pos(2, 4)},
+                    {anchor: Pos(2, 5), head: Pos(2, 6)}];
+  var val = "123456\n123456\n123456";
+  cm.setValue(val);
+  cm.setSelections(selections);
+  cm.replaceSelection("ab", "around");
+  eq(cm.getValue(), "ab2ab4ab6\n123456\n1ab5ab");
+  hasSelections(cm, 0, 0, 0, 2,
+                0, 3, 0, 5,
+                0, 6, 0, 8,
+                2, 1, 2, 3,
+                2, 4, 2, 6);
+  cm.setValue(val);
+  cm.setSelections(selections);
+  cm.replaceSelection("", "around");
+  eq(cm.getValue(), "246\n123456\n15");
+  hasSelections(cm, 0, 0, 0, 0,
+                0, 1, 0, 1,
+                0, 2, 0, 2,
+                2, 1, 2, 1,
+                2, 2, 2, 2);
+  cm.setValue(val);
+  cm.setSelections(selections);
+  cm.replaceSelection("X\nY\nZ", "around");
+  hasSelections(cm, 0, 0, 2, 1,
+                2, 2, 4, 1,
+                4, 2, 6, 1,
+                8, 1, 10, 1,
+                10, 2, 12, 1);
+  cm.replaceSelection("a", "around");
+  hasSelections(cm, 0, 0, 0, 1,
+                0, 2, 0, 3,
+                0, 4, 0, 5,
+                2, 1, 2, 2,
+                2, 3, 2, 4);
+  cm.replaceSelection("xy", "start");
+  hasSelections(cm, 0, 0, 0, 0,
+                0, 3, 0, 3,
+                0, 6, 0, 6,
+                2, 1, 2, 1,
+                2, 4, 2, 4);
+  cm.replaceSelection("z\nf");
+  hasSelections(cm, 1, 1, 1, 1,
+                2, 1, 2, 1,
+                3, 1, 3, 1,
+                6, 1, 6, 1,
+                7, 1, 7, 1);
+  eq(cm.getValue(), "z\nfxy2z\nfxy4z\nfxy6\n123456\n1z\nfxy5z\nfxy");
+});

From c6354933de236bcddb4be5fe1acb0eda1f471edd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 13:01:45 +0100
Subject: [PATCH 0809/4742] Fix selection handling in indentSelection and
 killLine

Issue #778
---
 lib/codemirror.js  |  37 +++++++++++-----
 test/index.html    |   1 +
 test/multi_test.js | 107 +++++++++++++++++++++++++++++++++++++++++++++
 test/test.js       |  69 -----------------------------
 4 files changed, 134 insertions(+), 80 deletions(-)
 create mode 100644 test/multi_test.js

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d07f0007ec..46e43bc978 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3075,15 +3075,18 @@ window.CodeMirror = (function() {
       if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
     }),
     indentSelection: operation(null, function(how) {
-      for (var i = this.doc.sel.ranges.length - 1; i >= 0; i--) {
-        var range = this.doc.sel.ranges[i];
-        if (range.empty()) {
-          indentLine(this, range.from().line, how, true);
-        } else {
+      var ranges = this.doc.sel.ranges, end = -1;
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i];
+        if (!range.empty()) {
+          var start = Math.max(end, range.from().line);
           var to = range.to();
-          var e = to.line - (to.ch ? 0 : 1);
-          for (var j = range.from().line; j <= e; ++j)
+          end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
+          for (var j = start; j < end; ++j)
             indentLine(this, j, how);
+        } else if (range.head.line > end) {
+          indentLine(this, range.head.line, how, true);
+          end = range.head.line;
         }
       }
     }),
@@ -3689,10 +3692,22 @@ window.CodeMirror = (function() {
   var commands = CodeMirror.commands = {
     selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()));},
     killLine: function(cm) {
-      var from = cm.getCursor(true), to = cm.getCursor(false), sel = cmp(from, to) != 0;
-      if (!sel && cm.getLine(from.line).length == from.ch)
-        cm.replaceRange("", from, Pos(from.line + 1, 0), "+delete");
-      else cm.replaceRange("", from, sel ? to : Pos(from.line), "+delete");
+      var ranges = cm.listSelections(), kill = [];
+      for (var i = 0; i < ranges.length; i++) {
+        var r = ranges[i], from = r.from(), to = r.to();
+        if (r.empty()) {
+          var len = cm.getLine(to.line).length;
+          if (to.ch == len) to = Pos(to.line + 1, 0);
+          else to = Pos(to.line, len);
+          if (i < ranges.length - 1 && cmp(to, ranges[i + 1].from()) > 0)
+            to = ranges[i + 1].from();
+        }
+        kill.push(from, to);
+      }
+      cm.operation(function() {
+        for (var i = kill.length - 2; i >= 0; i -= 2)
+          cm.replaceRange("", kill[i], kill[i + 1], "+delete");
+      });
     },
     deleteLine: function(cm) {
       var l = cm.getCursor().line;
diff --git a/test/index.html b/test/index.html
index 8177038e30..bdd88b0cb9 100644
--- a/test/index.html
+++ b/test/index.html
@@ -71,6 +71,7 @@ <h2>Test Suite</h2>
     <script src="driver.js"></script>
     <script src="test.js"></script>
     <script src="doc_test.js"></script>
+    <script src="multi_test.js"></script>
     <script src="comment_test.js"></script>
     <script src="search_test.js"></script>
     <script src="mode_test.js"></script>
diff --git a/test/multi_test.js b/test/multi_test.js
new file mode 100644
index 0000000000..186f0f47f7
--- /dev/null
+++ b/test/multi_test.js
@@ -0,0 +1,107 @@
+(function() {
+  namespace = "multi_";
+
+  function hasSelections(cm) {
+    var sels = cm.listSelections();
+    var given = (arguments.length - 1) / 4;
+    if (sels.length != given)
+      throw new Failure("expected " + given + " selections, found " + sels.length);
+    for (var i = 0, p = 1; i < given; i++, p += 4) {
+      var anchor = Pos(arguments[p], arguments[p + 1]);
+      var head = Pos(arguments[p + 2], arguments[p + 3]);
+      eqPos(sels[i].anchor, anchor, "anchor of selection " + i);
+      eqPos(sels[i].head, head, "head of selection " + i);
+    }
+  }
+
+  testCM("replaceSelection", function(cm) {
+    var selections = [{anchor: Pos(0, 0), head: Pos(0, 1)},
+                      {anchor: Pos(0, 2), head: Pos(0, 3)},
+                      {anchor: Pos(0, 4), head: Pos(0, 5)},
+                      {anchor: Pos(2, 1), head: Pos(2, 4)},
+                      {anchor: Pos(2, 5), head: Pos(2, 6)}];
+    var val = "123456\n123456\n123456";
+    cm.setValue(val);
+    cm.setSelections(selections);
+    cm.replaceSelection("ab", "around");
+    eq(cm.getValue(), "ab2ab4ab6\n123456\n1ab5ab");
+    hasSelections(cm, 0, 0, 0, 2,
+                  0, 3, 0, 5,
+                  0, 6, 0, 8,
+                  2, 1, 2, 3,
+                  2, 4, 2, 6);
+    cm.setValue(val);
+    cm.setSelections(selections);
+    cm.replaceSelection("", "around");
+    eq(cm.getValue(), "246\n123456\n15");
+    hasSelections(cm, 0, 0, 0, 0,
+                  0, 1, 0, 1,
+                  0, 2, 0, 2,
+                  2, 1, 2, 1,
+                  2, 2, 2, 2);
+    cm.setValue(val);
+    cm.setSelections(selections);
+    cm.replaceSelection("X\nY\nZ", "around");
+    hasSelections(cm, 0, 0, 2, 1,
+                  2, 2, 4, 1,
+                  4, 2, 6, 1,
+                  8, 1, 10, 1,
+                  10, 2, 12, 1);
+    cm.replaceSelection("a", "around");
+    hasSelections(cm, 0, 0, 0, 1,
+                  0, 2, 0, 3,
+                  0, 4, 0, 5,
+                  2, 1, 2, 2,
+                  2, 3, 2, 4);
+    cm.replaceSelection("xy", "start");
+    hasSelections(cm, 0, 0, 0, 0,
+                  0, 3, 0, 3,
+                  0, 6, 0, 6,
+                  2, 1, 2, 1,
+                  2, 4, 2, 4);
+    cm.replaceSelection("z\nf");
+    hasSelections(cm, 1, 1, 1, 1,
+                  2, 1, 2, 1,
+                  3, 1, 3, 1,
+                  6, 1, 6, 1,
+                  7, 1, 7, 1);
+    eq(cm.getValue(), "z\nfxy2z\nfxy4z\nfxy6\n123456\n1z\nfxy5z\nfxy");
+  });
+
+  function select(cm) {
+    var sels = [];
+    for (var i = 1; i < arguments.length; i++) {
+      var arg = arguments[i];
+      if (arg.head) sels.push(arg);
+      else sels.push({head: arg, anchor: arg});
+    }
+    cm.setSelections(sels);
+  }
+
+  testCM("indentSelection", function(cm) {
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.indentSelection(4);
+    eq(cm.getValue(), "    foo\n    bar\nbaz");
+
+    select(cm, Pos(0, 2), Pos(0, 3), Pos(0, 4));
+    cm.indentSelection(-2);
+    eq(cm.getValue(), "  foo\n    bar\nbaz");
+
+    select(cm, {anchor: Pos(0, 0), head: Pos(1, 2)},
+           {anchor: Pos(1, 3), head: Pos(2, 0)});
+    cm.indentSelection(-2);
+    eq(cm.getValue(), "foo\n  bar\nbaz");
+  }, {value: "foo\nbar\nbaz"});
+
+  testCM("killLine", function(cm) {
+    select(cm, Pos(0, 1), Pos(0, 2), Pos(1, 1));
+    cm.execCommand("killLine");
+    eq(cm.getValue(), "f\nb\nbaz");
+    cm.execCommand("killLine");
+    eq(cm.getValue(), "fbbaz");
+    cm.setValue("foo\nbar\nbaz");
+    select(cm, Pos(0, 1), {anchor: Pos(0, 2), head: Pos(2, 1)});
+    cm.execCommand("killLine");
+    eq(cm.getValue(), "faz");
+  }, {value: "foo\nbar\nbaz"});
+})();
diff --git a/test/test.js b/test/test.js
index 7cfb61980c..6a32ca553f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1670,72 +1670,3 @@ testCM("helpers", function(cm) {
   cm.setOption("mode", "javascript");
   eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "");
 });
-
-// Multiple selections
-
-function hasSelections(cm) {
-  var sels = cm.listSelections();
-  var given = (arguments.length - 1) / 4;
-  if (sels.length != given)
-    throw new Failure("expected " + given + " selections, found " + sels.length);
-  for (var i = 0, p = 1; i < given; i++, p += 4) {
-    var anchor = Pos(arguments[p], arguments[p + 1]);
-    var head = Pos(arguments[p + 2], arguments[p + 3]);
-    eqPos(sels[i].anchor, anchor, "anchor of selection " + i);
-    eqPos(sels[i].head, head, "head of selection " + i);
-  }
-}
-
-testCM("replaceMultiSelection", function(cm) {
-  var selections = [{anchor: Pos(0, 0), head: Pos(0, 1)},
-                    {anchor: Pos(0, 2), head: Pos(0, 3)},
-                    {anchor: Pos(0, 4), head: Pos(0, 5)},
-                    {anchor: Pos(2, 1), head: Pos(2, 4)},
-                    {anchor: Pos(2, 5), head: Pos(2, 6)}];
-  var val = "123456\n123456\n123456";
-  cm.setValue(val);
-  cm.setSelections(selections);
-  cm.replaceSelection("ab", "around");
-  eq(cm.getValue(), "ab2ab4ab6\n123456\n1ab5ab");
-  hasSelections(cm, 0, 0, 0, 2,
-                0, 3, 0, 5,
-                0, 6, 0, 8,
-                2, 1, 2, 3,
-                2, 4, 2, 6);
-  cm.setValue(val);
-  cm.setSelections(selections);
-  cm.replaceSelection("", "around");
-  eq(cm.getValue(), "246\n123456\n15");
-  hasSelections(cm, 0, 0, 0, 0,
-                0, 1, 0, 1,
-                0, 2, 0, 2,
-                2, 1, 2, 1,
-                2, 2, 2, 2);
-  cm.setValue(val);
-  cm.setSelections(selections);
-  cm.replaceSelection("X\nY\nZ", "around");
-  hasSelections(cm, 0, 0, 2, 1,
-                2, 2, 4, 1,
-                4, 2, 6, 1,
-                8, 1, 10, 1,
-                10, 2, 12, 1);
-  cm.replaceSelection("a", "around");
-  hasSelections(cm, 0, 0, 0, 1,
-                0, 2, 0, 3,
-                0, 4, 0, 5,
-                2, 1, 2, 2,
-                2, 3, 2, 4);
-  cm.replaceSelection("xy", "start");
-  hasSelections(cm, 0, 0, 0, 0,
-                0, 3, 0, 3,
-                0, 6, 0, 6,
-                2, 1, 2, 1,
-                2, 4, 2, 4);
-  cm.replaceSelection("z\nf");
-  hasSelections(cm, 1, 1, 1, 1,
-                2, 1, 2, 1,
-                3, 1, 3, 1,
-                6, 1, 6, 1,
-                7, 1, 7, 1);
-  eq(cm.getValue(), "z\nfxy2z\nfxy4z\nfxy6\n123456\n1z\nfxy5z\nfxy");
-});

From 25197f4994b8cc0bf66640416cf105cd8cf12063 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 13:56:58 +0100
Subject: [PATCH 0810/4742] Refine and add tests for selection-related deletion
 commands

Issue #778
---
 lib/codemirror.js  | 72 ++++++++++++++++++++++++++++------------------
 test/multi_test.js | 25 ++++++++++++++++
 2 files changed, 69 insertions(+), 28 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 46e43bc978..83f5aad0e6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2935,6 +2935,25 @@ window.CodeMirror = (function() {
     return line;
   }
 
+  function deleteNearSelection(cm, compute) {
+    var ranges = cm.doc.sel.ranges, kill = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var toKill = compute(ranges[i]);
+      while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
+        var replaced = kill.pop();
+        if (cmp(replaced.from, toKill.from) < 0) {
+          toKill.from = replaced.from;
+          break;
+        }
+      }
+      kill.push(toKill);
+    }
+    cm.operation(function() {
+      for (var i = kill.length - 1; i >= 0; i--)
+        replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
+    });
+  }
+
   function findPosH(doc, pos, dir, unit, visually) {
     var line = pos.line, ch = pos.ch, origDir = dir;
     var lineObj = getLine(doc, line);
@@ -3321,7 +3340,7 @@ window.CodeMirror = (function() {
       var sel = this.doc.sel, pos = [];
       for (var i = 0; i < sel.ranges.length; i++) {
         var range = sel.ranges[i];
-        if (this.shift || this.doc.extend || range.empty())
+        if (this.display.shift || this.doc.extend || range.empty())
           pos[i] = findPosH(this.doc, range.head, dir, unit, this.options.rtlMoveVisually);
         else
           pos[i] = dir < 0 ? range.from() : range.to();
@@ -3330,15 +3349,14 @@ window.CodeMirror = (function() {
     }),
 
     deleteH: operation(null, function(dir, unit) {
-      var sel = this.doc.sel;
-      if (sel.somethingSelected()) {
-        this.doc.replaceSelection("", null, "+delete");
-      } else {
-        for (var i = sel.ranges.length - 1; i >= 0; i--) {
-          var range = sel.ranges[i];
-          replaceRange(this.doc, "", range.head, findPosH(this.doc, range.head, dir, unit, false), "+delete");
-        }
-      }
+      var sel = this.doc.sel, doc = this.doc;
+      if (sel.somethingSelected())
+        doc.replaceSelection("", null, "+delete");
+      else
+        deleteNearSelection(this, function(range) {
+          var other = findPosH(doc, range.head, dir, unit, false);
+          return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other};
+        });
       this.curOp.userSelChange = true;
     }),
 
@@ -3692,30 +3710,28 @@ window.CodeMirror = (function() {
   var commands = CodeMirror.commands = {
     selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()));},
     killLine: function(cm) {
-      var ranges = cm.listSelections(), kill = [];
-      for (var i = 0; i < ranges.length; i++) {
-        var r = ranges[i], from = r.from(), to = r.to();
-        if (r.empty()) {
-          var len = cm.getLine(to.line).length;
-          if (to.ch == len) to = Pos(to.line + 1, 0);
-          else to = Pos(to.line, len);
-          if (i < ranges.length - 1 && cmp(to, ranges[i + 1].from()) > 0)
-            to = ranges[i + 1].from();
+      deleteNearSelection(cm, function(range) {
+        if (range.empty()) {
+          var len = getLine(cm.doc, range.head.line).text.length;
+          if (range.head.ch == len && range.head.line < cm.lastLine())
+            return {from: range.head, to: Pos(range.head.line + 1, 0)};
+          else
+            return {from: range.head, to: Pos(range.head.line, len)};
+        } else {
+          return {from: range.from(), to: range.to()};
         }
-        kill.push(from, to);
-      }
-      cm.operation(function() {
-        for (var i = kill.length - 2; i >= 0; i -= 2)
-          cm.replaceRange("", kill[i], kill[i + 1], "+delete");
       });
     },
     deleteLine: function(cm) {
-      var l = cm.getCursor().line;
-      cm.replaceRange("", Pos(l, 0), Pos(l), "+delete");
+      deleteNearSelection(cm, function(range) {
+        return {from: Pos(range.from().line, 0),
+                to: clipPos(cm.doc, Pos(range.to().line + 1, 0))};
+      });
     },
     delLineLeft: function(cm) {
-      var cur = cm.getCursor();
-      cm.replaceRange("", Pos(cur.line, 0), cur, "+delete");
+      deleteNearSelection(cm, function(range) {
+        return {from: Pos(range.from().line, 0), to: range.from()};
+      });
     },
     undo: function(cm) {cm.undo();},
     redo: function(cm) {cm.redo();},
diff --git a/test/multi_test.js b/test/multi_test.js
index 186f0f47f7..64e7a52122 100644
--- a/test/multi_test.js
+++ b/test/multi_test.js
@@ -104,4 +104,29 @@
     cm.execCommand("killLine");
     eq(cm.getValue(), "faz");
   }, {value: "foo\nbar\nbaz"});
+
+  testCM("deleteLine", function(cm) {
+    select(cm, Pos(0, 0),
+           {head: Pos(0, 1), anchor: Pos(2, 0)},
+           Pos(4, 0));
+    cm.execCommand("deleteLine");
+    eq(cm.getValue(), "4\n6\n7");
+    select(cm, Pos(2, 1));
+    cm.execCommand("deleteLine");
+    eq(cm.getValue(), "4\n6\n");
+  }, {value: "1\n2\n3\n4\n5\n6\n7"});
+
+  testCM("deleteH", function(cm) {
+    select(cm, Pos(0, 4), {anchor: Pos(1, 4), head: Pos(1, 5)});
+    cm.execCommand("delWordAfter");
+    eq(cm.getValue(), "foo bar baz\nabc ef ghi\n");
+    cm.execCommand("delWordAfter");
+    eq(cm.getValue(), "foo  baz\nabc  ghi\n");
+    cm.execCommand("delCharBefore");
+    cm.execCommand("delCharBefore");
+    eq(cm.getValue(), "fo baz\nab ghi\n");
+    select(cm, Pos(0, 3), Pos(0, 4), Pos(0, 5));
+    cm.execCommand("delWordAfter");
+    eq(cm.getValue(), "fo \nab ghi\n");
+  }, {value: "foo bar baz\nabc def ghi\n"});
 })();

From 246e27cfd92b4e11911614c4b2c92b95d5d8c540 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 14:20:34 +0100
Subject: [PATCH 0811/4742] Make goLineStart[Smart] and goLineEnd work in
 multi-selection env

Issue #778
---
 lib/codemirror.js  | 49 +++++++++++++++++++++++++++++++---------------
 test/multi_test.js | 14 +++++++++++++
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 83f5aad0e6..31dc010b58 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2625,6 +2625,10 @@ window.CodeMirror = (function() {
     else return pos;
   }
   function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
+  function clipPosArray(doc, array) {
+    for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]);
+    return out;
+  }
 
   function extendRange(doc, range, pos, other) {
     if (doc.cm && doc.cm.display.shift || doc.extend) {
@@ -3738,28 +3742,35 @@ window.CodeMirror = (function() {
     goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
     goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
     goLineStart: function(cm) {
-      cm.extendSelection(lineStart(cm, cm.getCursor().line));
+      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); });
     },
     goLineStartSmart: function(cm) {
-      var cur = cm.getCursor(), start = lineStart(cm, cur.line);
-      var line = cm.getLineHandle(start.line);
-      var order = getOrder(line);
-      if (!order || order[0].level == 0) {
-        var firstNonWS = Math.max(0, line.text.search(/\S/));
-        var inWS = cur.line == start.line && cur.ch <= firstNonWS && cur.ch;
-        cm.extendSelection(Pos(start.line, inWS ? 0 : firstNonWS));
-      } else cm.extendSelection(start);
+      cm.extendSelectionsBy(function(range) {
+        var start = lineStart(cm, range.head.line);
+        var line = cm.getLineHandle(start.line);
+        var order = getOrder(line);
+        if (!order || order[0].level == 0) {
+          var firstNonWS = Math.max(0, line.text.search(/\S/));
+          var inWS = range.head.line == start.line && range.head.ch <= firstNonWS && range.head.ch;
+          return Pos(start.line, inWS ? 0 : firstNonWS);
+        }
+        return start;
+      });
     },
     goLineEnd: function(cm) {
-      cm.extendSelection(lineEnd(cm, cm.getCursor().line));
+      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); });
     },
     goLineRight: function(cm) {
-      var top = cm.charCoords(cm.getCursor(), "div").top + 5;
-      cm.extendSelection(cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div"));
+      cm.extendSelectionsBy(function(range) {
+        var top = cm.charCoords(range.head, "div").top + 5;
+        return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
+      });
     },
     goLineLeft: function(cm) {
-      var top = cm.charCoords(cm.getCursor(), "div").top + 5;
-      cm.extendSelection(cm.coordsChar({left: 0, top: top}, "div"));
+      cm.extendSelectionsBy(function(range) {
+        var top = cm.charCoords(range.head, "div").top + 5;
+        cm.extendSelection(cm.coordsChar({left: 0, top: top}, "div"));
+      });
     },
     goLineUp: function(cm) {cm.moveV(-1, "line");},
     goLineDown: function(cm) {cm.moveV(1, "line");},
@@ -5179,6 +5190,12 @@ window.CodeMirror = (function() {
     extendSelection: docOperation(function(from, to, bias) {
       extendSelection(this, clipPos(this, from), to && clipPos(this, to), bias);
     }),
+    extendSelections: docOperation(function(from, to, bias) {
+      extendSelections(this, clipPosArray(this, from), to && clipPosArray(this, to), bias);
+    }),
+    extendSelectionsBy: docOperation(function(f, bias) {
+      extendSelections(this, map(this.sel.ranges, f), null, bias);
+    }),
     setSelections: docOperation(function(ranges, primary, bias) {
       for (var i = 0, out = []; i < ranges.length; i++)
         out[i] = new Range(clipPos(this, ranges[i].anchor),
@@ -5400,6 +5417,7 @@ window.CodeMirror = (function() {
     n -= chunk.first;
     while (!chunk.lines) {
       for (var i = 0;; ++i) {
+        if (!chunk.children[i]) debugger;
         var child = chunk.children[i], sz = child.chunkSize();
         if (n < sz) { chunk = child; break; }
         n -= sz;
@@ -5824,8 +5842,7 @@ window.CodeMirror = (function() {
   }
   function map(array, f) {
     var out = [];
-    for (var i = 0; i < array.length; i++)
-      out[i] = f(array[i], i);
+    for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
     return out;
   }
 
diff --git a/test/multi_test.js b/test/multi_test.js
index 64e7a52122..7d20e7cecb 100644
--- a/test/multi_test.js
+++ b/test/multi_test.js
@@ -129,4 +129,18 @@
     cm.execCommand("delWordAfter");
     eq(cm.getValue(), "fo \nab ghi\n");
   }, {value: "foo bar baz\nabc def ghi\n"});
+
+  testCM("goLineStart", function(cm) {
+    select(cm, Pos(0, 2), Pos(0, 3), Pos(1, 1));
+    cm.execCommand("goLineStart");
+    hasSelections(cm, 0, 0, 0, 0,
+                  1, 0, 1, 0);
+    select(cm, Pos(1, 1), Pos(0, 1));
+    cm.setExtending(true);
+    cm.execCommand("goLineStart");
+    hasSelections(cm, 0, 1, 0, 0,
+                  1, 1, 1, 0);
+  }, {value: "foo\nbar\nbaz"});
+
+  
 })();

From c1cb20531d3fa643fbc013dc0e16a70a6290ade6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 16:38:18 +0100
Subject: [PATCH 0812/4742] More selection command fixes and tests

Issue #778
---
 lib/codemirror.js  |  98 +++++++++++++++++-----------------
 test/multi_test.js | 127 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 174 insertions(+), 51 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 31dc010b58..0d70bd8cc2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -799,6 +799,7 @@ window.CodeMirror = (function() {
     somethingSelected: function() {
       for (var i = 0; i < this.ranges.length; i++)
         if (!this.ranges[i].empty()) return true;
+      return false;
     },
     contains: function(pos, end) {
       if (!end) end = pos;
@@ -1626,7 +1627,7 @@ window.CodeMirror = (function() {
       cm.display.prevInput = cm.display.input.value = "";
       if (ie && !ie_lt9) cm.display.inputHasSelection = null;
     }
-    cm.display.inaccurateSelection = minimal || doc.sel.ranges.length > 1;
+    cm.display.inaccurateSelection = minimal;
   }
 
   function focusInput(cm) {
@@ -2651,16 +2652,15 @@ window.CodeMirror = (function() {
   // If shift is held, this will move the selection anchor. Otherwise,
   // it'll set the whole selection.
   function extendSelection(doc, pos, other, bias) {
-    var prim = doc.sel.primary();
-    replaceOneSelection(doc, doc.sel.primIndex, extendRange(doc, prim, pos, other), bias);
+    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), pos, other)], 0), bias);
     if (doc.cm) doc.cm.curOp.userSelChange = true;
   }
 
   // Extend all selections (pos is an array of selections with length
   // equal the number of selections)
-  function extendSelections(doc, pos, other, bias) {
+  function extendSelections(doc, pos, bias) {
     for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
-      out[i] = extendRange(doc, doc.sel.ranges[i], pos[i], other && other[i]);
+      out[i] = extendRange(doc, doc.sel.ranges[i], pos[i], null);
     var newSel = normalizeSelection(out, doc.sel.primIndex);
     setSelection(doc, newSel, bias);
     if (doc.cm) doc.cm.curOp.userSelChange = true;
@@ -3341,15 +3341,13 @@ window.CodeMirror = (function() {
     },
 
     moveH: operation(null, function(dir, unit) {
-      var sel = this.doc.sel, pos = [];
-      for (var i = 0; i < sel.ranges.length; i++) {
-        var range = sel.ranges[i];
-        if (this.display.shift || this.doc.extend || range.empty())
-          pos[i] = findPosH(this.doc, range.head, dir, unit, this.options.rtlMoveVisually);
+      var cm = this;
+      cm.extendSelectionsBy(function(range) {
+        if (cm.display.shift || cm.doc.extend || range.empty())
+          return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
         else
-          pos[i] = dir < 0 ? range.from() : range.to();
-      }
-      extendSelections(this.doc, pos, null, dir);
+          return dir < 0 ? range.from() : range.to();
+      }, dir);
     }),
 
     deleteH: operation(null, function(dir, unit) {
@@ -3378,24 +3376,22 @@ window.CodeMirror = (function() {
     },
 
     moveV: operation(null, function(dir, unit) {
-      var sel = this.doc.sel, pos = [], cols = [];
-      if (sel.shift || sel.extend || !sel.somethingSelected()) {
-        for (var i = 0; i < sel.ranges.length; i++) {
-          var range = sel.ranges[i], headPos = cursorCoords(this, range.head, "div");
-          if (range.goalColumn != null) headPos.left = range.goalColumn;
-          pos[i] = findPosV(this, headPos, dir, unit);
-          cols[i] = headPos.left;
-          if (unit == "page" && i == sel.primIndex)
-            addToScrollPos(this, 0, charCoords(this, pos[i], "div").top - headPos.top);
-        }
-      } else {
-        for (var i = 0; i < sel.ranges.length; i++)
-          pos.push(dir < 0 ? sel.ranges[i].from() : sel.ranges[i].to());
-      }
-      extendSelections(this.doc, pos, null, dir);
-      sel = this.doc.sel;
-      if (cols.length) for (var i = 0; i < sel.ranges.length; i++)
-        sel.ranges[i].goalColumn = cols[i];
+      var cm = this, doc = this.doc, goals = [], addScroll;
+      var collapse = !cm.display.shift && !doc.sel.extend && doc.sel.somethingSelected();
+      doc.extendSelectionsBy(function(range) {
+        if (collapse)
+          return dir < 0 ? range.from() : range.to();
+        var headPos = cursorCoords(cm, range.head, "div");
+        if (range.goalColumn != null) headPos.left = range.goalColumn;
+        goals.push(headPos.left);
+        var pos = findPosV(cm, headPos, dir, unit);
+        if (unit == "page" && range == doc.sel.primary())
+          addScroll = charCoords(cm, pos, "div").top - headPos.top;
+        return pos;
+      });
+      if (addScroll) addToScrollPos(this, 0, addScroll);
+      if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
+        doc.sel.ranges[i].goalColumn = goals[i];
     }),
 
     toggleOverwrite: function(value) {
@@ -3769,7 +3765,7 @@ window.CodeMirror = (function() {
     goLineLeft: function(cm) {
       cm.extendSelectionsBy(function(range) {
         var top = cm.charCoords(range.head, "div").top + 5;
-        cm.extendSelection(cm.coordsChar({left: 0, top: top}, "div"));
+        return cm.coordsChar({left: 0, top: top}, "div");
       });
     },
     goLineUp: function(cm) {cm.moveV(-1, "line");},
@@ -3794,22 +3790,31 @@ window.CodeMirror = (function() {
     indentMore: function(cm) {cm.indentSelection("add");},
     indentLess: function(cm) {cm.indentSelection("subtract");},
     insertTab: function(cm) {
-      cm.replaceSelection("\t", "end", "+input");
+      cm.replaceSelection("\t", null, "+input");
     },
     defaultTab: function(cm) {
       if (cm.somethingSelected()) cm.indentSelection("add");
-      else cm.replaceSelection("\t", "end", "+input");
+      else cm.replaceSelection("\t", null, "+input");
     },
     transposeChars: function(cm) {
-      var cur = cm.getCursor(), line = cm.getLine(cur.line);
-      if (cur.ch > 0 && cur.ch < line.length - 1)
-        cm.replaceRange(line.charAt(cur.ch) + line.charAt(cur.ch - 1),
-                        Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
+      cm.operation(function() {
+        var ranges = cm.listSelections();
+        for (var i = 0; i < ranges.length; i++) {
+          var cur = ranges[i].head, line = getLine(cm.doc, cur.line);
+          if (cur.ch > 0 && cur.ch < line.length - 1)
+            cm.replaceRange(line.charAt(cur.ch) + line.charAt(cur.ch - 1),
+                            Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
+        }
+      });
     },
     newlineAndIndent: function(cm) {
       operation(cm, function() {
-        cm.replaceSelection("\n", "end", "+input");
-        cm.indentLine(cm.getCursor().line, null, true);
+        var len = cm.listSelections().length;
+        for (var i = 0; i < len; i++) {
+          var range = cm.listSelections()[i];
+          cm.replaceRange("\n", range.anchor, range.head, "+input");
+          cm.indentLine(range.from().line + 1, null, true);
+        }
       })();
     },
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}
@@ -5179,10 +5184,8 @@ window.CodeMirror = (function() {
     listSelections: function() { return this.sel.ranges; },
     somethingSelected: function() {return this.sel.somethingSelected();},
 
-    setCursor: docOperation(function(line, ch, extend) {
-      var pos = clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line);
-      if (extend) extendSelection(this, pos);
-      else setSimpleSelection(this, pos);
+    setCursor: docOperation(function(line, ch) {
+      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line));
     }),
     setSelection: docOperation(function(anchor, head, bias) {
       setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), bias);
@@ -5190,11 +5193,11 @@ window.CodeMirror = (function() {
     extendSelection: docOperation(function(from, to, bias) {
       extendSelection(this, clipPos(this, from), to && clipPos(this, to), bias);
     }),
-    extendSelections: docOperation(function(from, to, bias) {
-      extendSelections(this, clipPosArray(this, from), to && clipPosArray(this, to), bias);
+    extendSelections: docOperation(function(array, bias) {
+      extendSelections(this, clipPosArray(this, array), bias);
     }),
     extendSelectionsBy: docOperation(function(f, bias) {
-      extendSelections(this, map(this.sel.ranges, f), null, bias);
+      extendSelections(this, map(this.sel.ranges, f), bias);
     }),
     setSelections: docOperation(function(ranges, primary, bias) {
       for (var i = 0, out = []; i < ranges.length; i++)
@@ -5417,7 +5420,6 @@ window.CodeMirror = (function() {
     n -= chunk.first;
     while (!chunk.lines) {
       for (var i = 0;; ++i) {
-        if (!chunk.children[i]) debugger;
         var child = chunk.children[i], sz = child.chunkSize();
         if (n < sz) { chunk = child; break; }
         n -= sz;
diff --git a/test/multi_test.js b/test/multi_test.js
index 7d20e7cecb..b159ab058d 100644
--- a/test/multi_test.js
+++ b/test/multi_test.js
@@ -13,6 +13,76 @@
       eqPos(sels[i].head, head, "head of selection " + i);
     }
   }
+  function hasCursors(cm) {
+    var sels = cm.listSelections();
+    var given = (arguments.length - 1) / 2;
+    if (sels.length != given)
+      throw new Failure("expected " + given + " selections, found " + sels.length);
+    for (var i = 0, p = 1; i < given; i++, p += 2) {
+      eqPos(sels[i].anchor, sels[i].head, "something selected for " + i);
+      var head = Pos(arguments[p], arguments[p + 1]);
+      eqPos(sels[i].head, head, "selection " + i);
+    }
+  }
+
+  testCM("getSelection", function(cm) {
+    select(cm, {anchor: Pos(0, 0), head: Pos(1, 2)}, {anchor: Pos(2, 2), head: Pos(2, 0)});
+    eq(cm.getSelection(), "1234\n56\n90");
+    eq(cm.getSelection(false).join("|"), "1234|56|90");
+    eq(cm.getSelections().join("|"), "1234\n56|90");
+  }, {value: "1234\n5678\n90"});
+
+  testCM("setSelection", function(cm) {
+    select(cm, Pos(3, 0), Pos(0, 0), {anchor: Pos(2, 5), head: Pos(1, 0)});
+    hasSelections(cm, 0, 0, 0, 0,
+                  2, 5, 1, 0,
+                  3, 0, 3, 0);
+    cm.setSelection(Pos(1, 2), Pos(1, 1));
+    hasSelections(cm, 1, 2, 1, 1);
+    select(cm, {anchor: Pos(1, 1), head: Pos(2, 4)},
+           {anchor: Pos(0, 0), head: Pos(1, 3)},
+           Pos(3, 0), Pos(2, 2));
+    hasSelections(cm, 0, 0, 2, 4,
+                  3, 0, 3, 0);
+    cm.setSelections([{anchor: Pos(0, 1), head: Pos(0, 2)},
+                      {anchor: Pos(1, 1), head: Pos(1, 2)},
+                      {anchor: Pos(2, 1), head: Pos(2, 2)}], 1);
+    eqPos(cm.getCursor("head"), Pos(1, 2));
+    eqPos(cm.getCursor("anchor"), Pos(1, 1));
+    eqPos(cm.getCursor("from"), Pos(1, 1));
+    eqPos(cm.getCursor("to"), Pos(1, 2));
+    cm.setCursor(Pos(1, 1));
+    hasCursors(cm, 1, 1);
+  }, {value: "abcde\nabcde\nabcde\n"});
+
+  testCM("somethingSelected", function(cm) {
+    select(cm, Pos(0, 1), {anchor: Pos(0, 3), head: Pos(0, 5)});
+    eq(cm.somethingSelected(), true);
+    select(cm, Pos(0, 1), Pos(0, 3), Pos(0, 5));
+    eq(cm.somethingSelected(), false);
+  }, {value: "123456789"});
+
+  testCM("extendSelection", function(cm) {
+    select(cm, Pos(0, 1), Pos(1, 1), Pos(2, 1));
+    cm.setExtending(true);
+    cm.extendSelections([Pos(0, 2), Pos(1, 0), Pos(2, 3)]);
+    hasSelections(cm, 0, 1, 0, 2,
+                  1, 1, 1, 0,
+                  2, 1, 2, 3);
+    cm.extendSelection(Pos(2, 4), Pos(2, 0));
+    hasSelections(cm, 2, 4, 2, 0);
+  }, {value: "1234\n1234\n1234"});
+
+  testCM("addSelection", function(cm) {
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.addSelection(Pos(0, 0), Pos(0, 4));
+    hasSelections(cm, 0, 0, 0, 4,
+                  1, 1, 1, 1);
+    cm.addSelection(Pos(2, 2));
+    hasSelections(cm, 0, 0, 0, 4,
+                  1, 1, 1, 1,
+                  2, 2, 2, 2);
+  }, {value: "1234\n1234\n1234"});
 
   testCM("replaceSelection", function(cm) {
     var selections = [{anchor: Pos(0, 0), head: Pos(0, 1)},
@@ -133,8 +203,7 @@
   testCM("goLineStart", function(cm) {
     select(cm, Pos(0, 2), Pos(0, 3), Pos(1, 1));
     cm.execCommand("goLineStart");
-    hasSelections(cm, 0, 0, 0, 0,
-                  1, 0, 1, 0);
+    hasCursors(cm, 0, 0, 1, 0);
     select(cm, Pos(1, 1), Pos(0, 1));
     cm.setExtending(true);
     cm.execCommand("goLineStart");
@@ -142,5 +211,57 @@
                   1, 1, 1, 0);
   }, {value: "foo\nbar\nbaz"});
 
-  
+  testCM("moveV", function(cm) {
+    select(cm, Pos(0, 2), Pos(1, 2));
+    cm.execCommand("goLineDown");
+    hasCursors(cm, 1, 2, 2, 2);
+    cm.execCommand("goLineUp");
+    hasCursors(cm, 0, 2, 1, 2);
+    cm.execCommand("goLineUp");
+    hasCursors(cm, 0, 0, 0, 2);
+    cm.execCommand("goLineUp");
+    hasCursors(cm, 0, 0);
+    select(cm, Pos(0, 2), Pos(1, 2));
+    cm.setExtending(true);
+    cm.execCommand("goLineDown");
+    hasSelections(cm, 0, 2, 2, 2);
+  }, {value: "12345\n12345\n12345"});
+
+  testCM("moveH", function(cm) {
+    select(cm, Pos(0, 1), Pos(0, 3), Pos(0, 5), Pos(2, 3));
+    cm.execCommand("goCharRight");
+    hasCursors(cm, 0, 2, 0, 4, 1, 0, 2, 4);
+    cm.execCommand("goCharLeft");
+    hasCursors(cm, 0, 1, 0, 3, 0, 5, 2, 3);
+    for (var i = 0; i < 15; i++)
+      cm.execCommand("goCharRight");
+    hasCursors(cm, 2, 4, 2, 5);
+  }, {value: "12345\n12345\n12345"});
+
+  testCM("newlineAndIndent", function(cm) {
+    select(cm, Pos(0, 5), Pos(1, 5));
+    cm.execCommand("newlineAndIndent");
+    hasCursors(cm, 1, 2, 3, 2);
+    eq(cm.getValue(), "x = [\n  1];\ny = [\n  2];");
+    cm.undo();
+    eq(cm.getValue(), "x = [1];\ny = [2];");
+    hasCursors(cm, 0, 5, 1, 5);
+    select(cm, Pos(0, 5), Pos(0, 6));
+    cm.execCommand("newlineAndIndent");
+    hasCursors(cm, 1, 2, 2, 0);
+    eq(cm.getValue(), "x = [\n  1\n];\ny = [2];");
+  }, {value: "x = [1];\ny = [2];", mode: "javascript"});
+
+  testCM("goDocStartEnd", function(cm) {
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.execCommand("goDocStart");
+    hasCursors(cm, 0, 0);
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.execCommand("goDocEnd");
+    hasCursors(cm, 1, 3);
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.setExtending(true);
+    cm.execCommand("goDocEnd");
+    hasSelections(cm, 1, 1, 1, 3);
+  }, {value: "abc\ndef"});
 })();

From 5395b144107d7538641126416a5b6c7bfdb30ef6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 17:30:59 +0100
Subject: [PATCH 0813/4742] Simplify and organize click handling

---
 lib/codemirror.js | 134 +++++++++++++++++++++++++---------------------
 1 file changed, 73 insertions(+), 61 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0d70bd8cc2..3e83146a17 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1789,10 +1789,9 @@ window.CodeMirror = (function() {
     return coordsChar(cm, x - space.left, y - space.top);
   }
 
-  var lastClick, lastDoubleClick;
   function onMouseDown(e) {
     if (signalDOMEvent(this, e)) return;
-    var cm = this, display = cm.display, doc = cm.doc;
+    var cm = this, display = cm.display;
     display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {
@@ -1806,87 +1805,101 @@ window.CodeMirror = (function() {
     var start = posFromMouse(cm, e);
 
     switch (e_button(e)) {
-    case 3:
-      if (captureRightClick) onContextMenu.call(cm, cm, e);
-      return;
+    case 1:
+      if (start)
+        leftButtonDown(cm, e, start);
+      else if (e_target(e) == display.scroller)
+        e_preventDefault(e);
+      break;
     case 2:
       if (webkit) cm.state.lastMiddleDown = +new Date;
       if (start) extendSelection(cm.doc, start);
       setTimeout(bind(focusInput, cm), 20);
       e_preventDefault(e);
-      return;
+      break;
+    case 3:
+      if (captureRightClick) onContextMenu.call(cm, cm, e);
+      break;
     }
-    // For button 1, if it was clicked inside the editor
-    // (posFromMouse returning non-null), we have to adjust the
-    // selection.
-    if (!start) {if (e_target(e) == display.scroller) e_preventDefault(e); return;}
+  }
 
+  var lastClick, lastDoubleClick;
+  function leftButtonDown(cm, e, start) {
     if (!cm.state.focused) onFocus(cm);
 
-    var now = +new Date, type = "single";
+    var now = +new Date, type;
     if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
       type = "triple";
-      e_preventDefault(e);
-      setTimeout(bind(focusInput, cm), 20);
-      selectLine(cm, start.line);
     } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
       type = "double";
       lastDoubleClick = {time: now, pos: start};
-      e_preventDefault(e);
-      var word = findWordAt(getLine(doc, start.line).text, start);
-      extendSelection(cm.doc, word.from, word.to);
-    } else { lastClick = {time: now, pos: start}; }
-
-    var last = start, range = doc.sel.primary();
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) && !range.empty() &&
-        type == "single" && doc.sel.contains(start) && doc.sel.somethingSelected()) {
-      var dragEnd = operation(cm, function(e2) {
-        if (webkit) display.scroller.draggable = false;
-        cm.state.draggingText = false;
-        off(document, "mouseup", dragEnd);
-        off(display.scroller, "drop", dragEnd);
-        if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-          e_preventDefault(e2);
-          extendSelection(cm.doc, start);
-          focusInput(cm);
-          // Work around unexplainable focus problem in IE9 (#2127)
-          if (old_ie && !ie_lt9)
-            setTimeout(function() {document.body.focus(); focusInput(cm);}, 20);
-        }
-      });
-      // Let the drag handler handle this.
-      if (webkit) display.scroller.draggable = true;
-      cm.state.draggingText = dragEnd;
-      // IE's approach to draggable
-      if (display.scroller.dragDrop) display.scroller.dragDrop();
-      on(document, "mouseup", dragEnd);
-      on(display.scroller, "drop", dragEnd);
-      return;
+    } else {
+      type = "single";
+      lastClick = {time: now, pos: start};
     }
+
+    var sel = cm.doc.sel;
+    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) && !sel.primary().empty() &&
+        type == "single" && sel.contains(start) && sel.somethingSelected())
+      leftButtonStartDrag(cm, e, start);
+    else
+      leftButtonNoDrag(cm, e, start, type);
+  }
+
+  function leftButtonStartDrag(cm, e, start) {
+    var display = cm.display;
+    var dragEnd = operation(cm, function(e2) {
+      if (webkit) display.scroller.draggable = false;
+      cm.state.draggingText = false;
+      off(document, "mouseup", dragEnd);
+      off(display.scroller, "drop", dragEnd);
+      if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
+        e_preventDefault(e2);
+        extendSelection(cm.doc, start);
+        focusInput(cm);
+        // Work around unexplainable focus problem in IE9 (#2127)
+        if (old_ie && !ie_lt9)
+          setTimeout(function() {document.body.focus(); focusInput(cm);}, 20);
+      }
+    });
+    // Let the drag handler handle this.
+    if (webkit) display.scroller.draggable = true;
+    cm.state.draggingText = dragEnd;
+    // IE's approach to draggable
+    if (display.scroller.dragDrop) display.scroller.dragDrop();
+    on(document, "mouseup", dragEnd);
+    on(display.scroller, "drop", dragEnd);
+  }
+
+  function leftButtonNoDrag(cm, e, start, type) {
+    var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
-    if (type == "single") extendSelection(cm.doc, clipPos(doc, start));
+
+    if (type == "single") {
+      extendSelection(cm.doc, clipPos(doc, start));
+    } else if (type == "double") {
+      var word = findWordAt(getLine(cm.doc, start.line).text, start);
+      extendSelection(cm.doc, word.from, word.to);
+    } else {
+      selectLine(cm, start.line);
+    }
 
     // FIXME[sel] Build a consistent model for handling clicks + multisel
-    var startstart = range.from(), startend = range.to(), lastPos = start;
+    var startSel = doc.sel.primary(), lastPos = start;
 
     function doSelect(cur) {
       if (cmp(lastPos, cur) == 0) return;
       lastPos = cur;
 
       if (type == "single") {
-        extendSelection(cm.doc, clipPos(doc, start), cur);
-        return;
-      }
-
-      startstart = clipPos(doc, startstart);
-      startend = clipPos(doc, startend);
-      if (type == "double") {
+        extendSelection(doc, clipPos(doc, start), cur);
+      } else if (type == "double") {
         var word = findWordAt(getLine(doc, cur.line).text, cur);
-        if (cmp(cur, startstart) < 0) extendSelection(cm.doc, word.from, startend);
-        else extendSelection(cm.doc, startstart, word.to);
+        if (cmp(word.from, startSel.from()) < 0) extendSelection(doc, word.from, clipPos(doc, startSel.to()));
+        else extendSelection(doc, clipPos(doc, startSel.from()), word.to);
       } else if (type == "triple") {
-        if (cmp(cur, startstart) < 0) extendSelection(cm.doc, startend, clipPos(doc, Pos(cur.line, 0)));
-        else extendSelection(cm.doc, startstart, clipPos(doc, Pos(cur.line + 1, 0)));
+        if (cmp(cur, startSel.from()) < 0) extendSelection(doc, Pos(cur.line, 0), clipPos(doc, startSel.to()));
+        else extendSelection(doc, clipPos(doc, startSel.from()), clipPos(doc, Pos(cur.line + 1, 0)));
       }
     }
 
@@ -1901,9 +1914,8 @@ window.CodeMirror = (function() {
       var curCount = ++counter;
       var cur = posFromMouse(cm, e, true);
       if (!cur) return;
-      if (cmp(cur, last) != 0) {
+      if (cmp(cur, lastPos) != 0) {
         if (!cm.state.focused) onFocus(cm);
-        last = cur;
         doSelect(cur);
         var visible = visibleLines(display, doc);
         if (cur.line >= visible.to || cur.line < visible.from)
@@ -2006,11 +2018,11 @@ window.CodeMirror = (function() {
       try {
         var text = e.dataTransfer.getData("Text");
         if (text) {
-          var selected = cm.state.draggingText && cm.getSelection();
+          var selected = cm.state.draggingText && cm.listSelections();
           setSimpleSelection(cm.doc, pos);
           if (selected) for (var i = 0; i < selected.length; ++i)
             replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
-          cm.replaceSelection(text, null, "paste");
+          cm.replaceSelection(text, "around", "paste");
           focusInput(cm);
         }
       }

From 22f63cdbc495f2e8eb1c5ac5d550650d968a8b47 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 18:37:55 +0100
Subject: [PATCH 0814/4742] Implement ctrl-click multi-selection

Issue #778
---
 lib/codemirror.js | 113 ++++++++++++++++++++++++++--------------------
 1 file changed, 63 insertions(+), 50 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3e83146a17..d96067f84d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -806,17 +806,21 @@ window.CodeMirror = (function() {
       for (var i = 0; i < this.ranges.length; i++) {
         var range = this.ranges[i];
         if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
-          return true;
+          return i;
       }
+      return -1;
     }
   };
 
   function normalizeSelection(ranges, primIndex) {
+    var prim = ranges[primIndex];
     ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
+    primIndex = ranges.indexOf(prim);
     for (var i = 1; i < ranges.length; i++) {
       var cur = ranges[i], prev = ranges[i - 1];
       if (cmp(prev.to(), cur.from()) >= 0) {
-        var from = prev.from(), to = cur.to(), inv = prev.head == from;
+        var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
+        var inv = from == prev.head || from == cur.head;
         if (i <= primIndex) --primIndex;
         ranges.splice(i-- - 1, 2, new Range(inv ? to : from, inv ? from : to));
       }
@@ -1840,7 +1844,7 @@ window.CodeMirror = (function() {
 
     var sel = cm.doc.sel;
     if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) && !sel.primary().empty() &&
-        type == "single" && sel.contains(start) && sel.somethingSelected())
+        type == "single" && sel.contains(start) > -1 && sel.somethingSelected())
       leftButtonStartDrag(cm, e, start);
     else
       leftButtonNoDrag(cm, e, start, type);
@@ -1875,34 +1879,45 @@ window.CodeMirror = (function() {
     var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
 
-    if (type == "single") {
-      extendSelection(cm.doc, clipPos(doc, start));
-    } else if (type == "double") {
-      var word = findWordAt(getLine(cm.doc, start.line).text, start);
-      extendSelection(cm.doc, word.from, word.to);
+    if (e.ctrlKey) {
+      var inside = doc.sel.contains(start);
+      if (inside > -1)
+        setSelection(doc, new Selection(doc.sel.ranges, inside));
+      else
+        setSelection(doc, normalizeSelection(doc.sel.ranges.concat([new Range(start, start)]),
+                                             doc.sel.ranges.length));
     } else {
-      selectLine(cm, start.line);
+      extendSelection(doc, start, start);
     }
 
-    // FIXME[sel] Build a consistent model for handling clicks + multisel
-    var startSel = doc.sel.primary(), lastPos = start;
+    var lastPos = start, startSel = doc.sel;
+    function extendTo(pos, force) {
+      if (!force && cmp(lastPos, pos) == 0) return;
+      lastPos = pos;
 
-    function doSelect(cur) {
-      if (cmp(lastPos, cur) == 0) return;
-      lastPos = cur;
-
-      if (type == "single") {
-        extendSelection(doc, clipPos(doc, start), cur);
-      } else if (type == "double") {
-        var word = findWordAt(getLine(doc, cur.line).text, cur);
-        if (cmp(word.from, startSel.from()) < 0) extendSelection(doc, word.from, clipPos(doc, startSel.to()));
-        else extendSelection(doc, clipPos(doc, startSel.from()), word.to);
-      } else if (type == "triple") {
-        if (cmp(cur, startSel.from()) < 0) extendSelection(doc, Pos(cur.line, 0), clipPos(doc, startSel.to()));
-        else extendSelection(doc, clipPos(doc, startSel.from()), clipPos(doc, Pos(cur.line + 1, 0)));
+      var oldRange = startSel.primary();
+      var anchor = oldRange.anchor, head = pos;
+      if (type != "single") {
+        if (type == "double")
+          var range = findWordAt(getLine(doc, pos.line).text, pos);
+        else
+          var range = {from: Pos(pos.line, 0), to: clipPos(pos.line + 1, 0)};
+        if (cmp(range.from, anchor) < 0) {
+          head = range.from;
+          anchor = maxPos(oldRange.to(), range.to);
+        } else {
+          head = range.to;
+          anchor = minPos(oldRange.from(), range.from);
+        }
       }
+
+      var ranges = startSel.ranges.slice(0);
+      ranges[startSel.primIndex] = new Range(clipPos(doc, anchor), head);
+      setSelection(doc, normalizeSelection(ranges, startSel.primIndex));
     }
 
+    if (type != "single") { extendTo(start, true); startSel = doc.sel; }
+
     var editorSize = getRect(display.wrapper);
     // Used to ensure timeout re-tries don't fire when another extend
     // happened in the meantime (clearTimeout isn't reliable -- at
@@ -1916,7 +1931,7 @@ window.CodeMirror = (function() {
       if (!cur) return;
       if (cmp(cur, lastPos) != 0) {
         if (!cm.state.focused) onFocus(cm);
-        doSelect(cur);
+        extendTo(cur);
         var visible = visibleLines(display, doc);
         if (cur.line >= visible.to || cur.line < visible.from)
           setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150);
@@ -2009,7 +2024,7 @@ window.CodeMirror = (function() {
       for (var i = 0; i < n; ++i) loadFile(files[i], i);
     } else {
       // Don't do a replace if the drop happened inside of the selected text.
-      if (cm.state.draggingText && cm.doc.sel.contains(pos)) {
+      if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
         cm.state.draggingText(e);
         // Ensure the editor is re-focused
         setTimeout(bind(focusInput, cm), 20);
@@ -2304,7 +2319,7 @@ window.CodeMirror = (function() {
     // Reset the current text selection only if the click is done outside of the selection
     // and 'resetSelectionOnContextMenu' option is true.
     var reset = cm.options.resetSelectionOnContextMenu;
-    if (reset && !cm.doc.sel.contains(pos))
+    if (reset && !cm.doc.sel.contains(pos) > -1)
       operation(cm, setSelection)(cm.doc, pos, pos);
 
     var oldCSS = display.input.style.cssText;
@@ -2566,7 +2581,7 @@ window.CodeMirror = (function() {
       });
     }
 
-    if (doc.sel.contains(change.from, change.to))
+    if (doc.sel.contains(change.from, change.to) > -1)
       cm.curOp.cursorActivity = true;
 
     updateDoc(doc, change, spans, selAfter, estimateHeight(cm));
@@ -2621,6 +2636,8 @@ window.CodeMirror = (function() {
 
   var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; };
   function copyPos(x) {return Pos(x.line, x.ch);}
+  function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
+  function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
 
   // SELECTION
 
@@ -2643,36 +2660,36 @@ window.CodeMirror = (function() {
     return out;
   }
 
-  function extendRange(doc, range, pos, other) {
+  function extendRange(doc, range, head, other) {
     if (doc.cm && doc.cm.display.shift || doc.extend) {
       var anchor = range.anchor;
       if (other) {
-        var posBefore = cmp(pos, anchor) < 0;
+        var posBefore = cmp(head, anchor) < 0;
         if (posBefore != (cmp(other, anchor) < 0)) {
-          anchor = pos;
-          pos = other;
-        } else if (posBefore != (cmp(pos, other) < 0)) {
-          pos = other;
+          anchor = head;
+          head = other;
+        } else if (posBefore != (cmp(head, other) < 0)) {
+          head = other;
         }
       }
-      return new Range(anchor, pos);
+      return new Range(anchor, head);
     } else {
-      return new Range(pos, other || pos);
+      return new Range(other || head, head);
     }
   }
 
   // If shift is held, this will move the selection anchor. Otherwise,
   // it'll set the whole selection.
-  function extendSelection(doc, pos, other, bias) {
-    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), pos, other)], 0), bias);
+  function extendSelection(doc, head, other, bias) {
+    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), bias);
     if (doc.cm) doc.cm.curOp.userSelChange = true;
   }
 
   // Extend all selections (pos is an array of selections with length
   // equal the number of selections)
-  function extendSelections(doc, pos, bias) {
+  function extendSelections(doc, heads, bias) {
     for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
-      out[i] = extendRange(doc, doc.sel.ranges[i], pos[i], null);
+      out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
     var newSel = normalizeSelection(out, doc.sel.primIndex);
     setSelection(doc, newSel, bias);
     if (doc.cm) doc.cm.curOp.userSelChange = true;
@@ -2684,8 +2701,8 @@ window.CodeMirror = (function() {
     setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), bias);
   }
 
-  function setSimpleSelection(doc, anchor, head, bias, checkAtomic) {
-    setSelection(doc, simpleSelection(anchor, head), bias, checkAtomic);
+  function setSimpleSelection(doc, anchor, head, bias) {
+    setSelection(doc, simpleSelection(anchor, head), bias);
   }
 
   function setSelectionAddToHistory(doc, sel) {
@@ -3046,10 +3063,6 @@ window.CodeMirror = (function() {
     return {from: Pos(pos.line, start), to: Pos(pos.line, end)};
   }
 
-  function selectLine(cm, line) {
-    extendSelection(cm.doc, Pos(line, 0), clipPos(cm.doc, Pos(line + 1, 0)));
-  }
-
   // PROTOTYPE
 
   // The publicly visible API. Note that operation(null, f) means
@@ -5202,11 +5215,11 @@ window.CodeMirror = (function() {
     setSelection: docOperation(function(anchor, head, bias) {
       setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), bias);
     }),
-    extendSelection: docOperation(function(from, to, bias) {
-      extendSelection(this, clipPos(this, from), to && clipPos(this, to), bias);
+    extendSelection: docOperation(function(head, other, bias) {
+      extendSelection(this, clipPos(this, head), other && clipPos(this, other), bias);
     }),
-    extendSelections: docOperation(function(array, bias) {
-      extendSelections(this, clipPosArray(this, array), bias);
+    extendSelections: docOperation(function(heads, bias) {
+      extendSelections(this, clipPosArray(this, heads), bias);
     }),
     extendSelectionsBy: docOperation(function(f, bias) {
       extendSelections(this, map(this.sel.ranges, f), bias);

From 13364623ac9d33a6bd53dc52d055eb04b07e0176 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 21:14:10 +0100
Subject: [PATCH 0815/4742] Implement alt-drag rectangle-selection

Issue #778
---
 lib/codemirror.js | 69 +++++++++++++++++++++++++++++++----------------
 1 file changed, 46 insertions(+), 23 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d96067f84d..5f194669dd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1779,7 +1779,7 @@ window.CodeMirror = (function() {
     }
   }
 
-  function posFromMouse(cm, e, liberal) {
+  function posFromMouse(cm, e, liberal, forRect) {
     var display = cm.display;
     if (!liberal) {
       var target = e_target(e);
@@ -1789,8 +1789,12 @@ window.CodeMirror = (function() {
     }
     var x, y, space = getRect(display.lineSpace);
     // Fails unpredictably on IE[67] when mouse is dragged around quickly.
-    try { x = e.clientX; y = e.clientY; } catch (e) { return null; }
-    return coordsChar(cm, x - space.left, y - space.top);
+    try { x = e.clientX - space.left; y = e.clientY - space.top; }
+    catch (e) { return null; }
+    var coords = coordsChar(cm, x, y);
+    if (forRect && coords.ch == getLine(cm.doc, coords.line).text.length && coords.xRel == 1)
+      coords = Pos(coords.line, Math.round((x - paddingLeft(cm.display)) / charWidth(cm.display)));
+    return coords;
   }
 
   function onMouseDown(e) {
@@ -1879,13 +1883,17 @@ window.CodeMirror = (function() {
     var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
 
-    if (e.ctrlKey) {
+    if (mac ? e.metaKey : e.ctrlKey) {
       var inside = doc.sel.contains(start);
       if (inside > -1)
         setSelection(doc, new Selection(doc.sel.ranges, inside));
       else
         setSelection(doc, normalizeSelection(doc.sel.ranges.concat([new Range(start, start)]),
                                              doc.sel.ranges.length));
+    } else if (e.altKey) {
+      setSimpleSelection(doc, start, start);
+      type = "rect";
+      start = posFromMouse(cm, e, true, true);
     } else {
       extendSelection(doc, start, start);
     }
@@ -1895,28 +1903,43 @@ window.CodeMirror = (function() {
       if (!force && cmp(lastPos, pos) == 0) return;
       lastPos = pos;
 
-      var oldRange = startSel.primary();
-      var anchor = oldRange.anchor, head = pos;
-      if (type != "single") {
-        if (type == "double")
-          var range = findWordAt(getLine(doc, pos.line).text, pos);
-        else
-          var range = {from: Pos(pos.line, 0), to: clipPos(pos.line + 1, 0)};
-        if (cmp(range.from, anchor) < 0) {
-          head = range.from;
-          anchor = maxPos(oldRange.to(), range.to);
-        } else {
-          head = range.to;
-          anchor = minPos(oldRange.from(), range.from);
+      if (type == "rect") {
+        var ranges = [];
+        var left = Math.min(start.ch, pos.ch), right = Math.max(start.ch, pos.ch);
+        for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
+             line <= end; line++) {
+          var text = getLine(doc, line).text;
+          if (text.length >= left)
+            ranges.push(new Range(Pos(line, left), Pos(line, Math.min(text.length, right))));
+        }
+        if (!ranges.length) ranges.push(new Range(start, start));
+        setSelection(doc, new Selection(ranges, ranges.length - 1));
+      } else {
+        var oldRange = startSel.primary();
+        var anchor = oldRange.anchor, head = pos;
+        if (type != "single") {
+          if (type == "double")
+            var range = findWordAt(getLine(doc, pos.line).text, pos);
+          else
+            var range = {from: Pos(pos.line, 0), to: clipPos(pos.line + 1, 0)};
+          if (cmp(range.from, anchor) < 0) {
+            head = range.from;
+            anchor = maxPos(oldRange.to(), range.to);
+          } else {
+            head = range.to;
+            anchor = minPos(oldRange.from(), range.from);
+          }
         }
+        var ranges = startSel.ranges.slice(0);
+        ranges[startSel.primIndex] = new Range(clipPos(doc, anchor), head);
+        setSelection(doc, normalizeSelection(ranges, startSel.primIndex));
       }
-
-      var ranges = startSel.ranges.slice(0);
-      ranges[startSel.primIndex] = new Range(clipPos(doc, anchor), head);
-      setSelection(doc, normalizeSelection(ranges, startSel.primIndex));
     }
 
-    if (type != "single") { extendTo(start, true); startSel = doc.sel; }
+    if (type == "double" || type == "triple") {
+      extendTo(start, true);
+      startSel = doc.sel;
+    }
 
     var editorSize = getRect(display.wrapper);
     // Used to ensure timeout re-tries don't fire when another extend
@@ -1927,7 +1950,7 @@ window.CodeMirror = (function() {
 
     function extend(e) {
       var curCount = ++counter;
-      var cur = posFromMouse(cm, e, true);
+      var cur = posFromMouse(cm, e, true, type == "rect");
       if (!cur) return;
       if (cmp(cur, lastPos) != 0) {
         if (!cm.state.focused) onFocus(cm);

From e01274588d9700768c1fedeffde170fc816b00b1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 21:26:04 +0100
Subject: [PATCH 0816/4742] Implement line-per-selection paste

Issue #778
---
 lib/codemirror.js | 9 +++++----
 test/test.js      | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5f194669dd..e9aabb2332 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1582,17 +1582,18 @@ window.CodeMirror = (function() {
     cm.display.shift = false;
     var same = 0, l = Math.min(prevInput.length, text.length);
     while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-    var inserted = text.slice(same);
+    var inserted = text.slice(same), textLines = splitLines(inserted);
+    var multiPaste = cm.state.pasteIncoming && textLines.length > 1 && doc.sel.ranges.length == textLines.length;
+
     for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
       var range = doc.sel.ranges[i];
       var from = range.from(), to = range.to();
       if (same < prevInput.length)
         from = Pos(from.line, from.ch - (prevInput.length - same));
       else if (cm.state.overwrite && cmp(from, to) == 0 && !cm.state.pasteIncoming)
-        to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + inserted.length));
-
+        to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
       var updateInput = cm.curOp.updateInput;
-      var changeEvent = {from: from, to: to, text: splitLines(inserted),
+      var changeEvent = {from: from, to: to, text: multiPaste ? [textLines[i]] : textLines,
                          origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"};
       makeChange(cm.doc, changeEvent);
       signalLater(cm, "inputRead", cm, changeEvent);
diff --git a/test/test.js b/test/test.js
index 6a32ca553f..0c129e9444 100644
--- a/test/test.js
+++ b/test/test.js
@@ -132,8 +132,8 @@ testCM("extendSelection", function(cm) {
   eqPos(cm.getCursor("anchor"), Pos(4, 5));
   cm.setExtending(false);
   cm.extendSelection(Pos(0, 3), Pos(0, 4));
-  eqPos(cm.getCursor("head"), Pos(0, 4));
-  eqPos(cm.getCursor("anchor"), Pos(0, 3));
+  eqPos(cm.getCursor("head"), Pos(0, 3));
+  eqPos(cm.getCursor("anchor"), Pos(0, 4));
 });
 
 testCM("lines", function(cm) {

From 8ca09be753cefcc81a22ccb1a576add2d1866766 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 22:12:25 +0100
Subject: [PATCH 0817/4742] [comment & continuecomment addons] Make
 multi-selection aware

Issue #778
---
 addon/comment/comment.js         | 17 +++++++-
 addon/comment/continuecomment.js | 68 ++++++++++++++++++--------------
 2 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 5975b0bf69..c36e176912 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -11,8 +11,21 @@
   }
 
   CodeMirror.commands.toggleComment = function(cm) {
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-    cm.uncomment(from, to) || cm.lineComment(from, to);
+    var minLine = Infinity, ranges = cm.listSelections(), mode = null;
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      if (from.line >= minLine) continue;
+      if (to.line >= minLine) to = Pos(minLine, 0);
+      minLine = from.line;
+      if (mode == null) {
+        if (cm.uncomment(from, to)) mode = "un";
+        else { cm.lineComment(from, to); mode = "line"; }
+      } else if (mode == "un") {
+        cm.uncomment(from, to);
+      } else {
+        cm.lineComment(from, to);
+      }
+    }
   };
 
   CodeMirror.defineExtension("lineComment", function(from, to, options) {
diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index a3370a6072..0566c74e43 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -4,42 +4,50 @@
     CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
 
   function continueComment(cm) {
-    var pos = cm.getCursor(), token = cm.getTokenAt(pos);
-    if (token.type != "comment" || cm.getOption("disableInput")) return CodeMirror.Pass;
-    var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), mode, inserts = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].head, token = cm.getTokenAt(pos);
+      if (token.type != "comment") return CodeMirror.Pass;
+      var modeHere = CodeMirror.innerMode(cm.getMode(), token.state).mode;
+      if (!mode) mode = modeHere;
+      else if (mode != modeHere) return CodeMirror.Pass;
 
-    var insert;
-    if (mode.blockCommentStart && mode.blockCommentContinue) {
-      var end = token.string.indexOf(mode.blockCommentEnd);
-      var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
-      if (end != -1 && end == token.string.length - mode.blockCommentEnd.length) {
-        // Comment ended, don't continue it
-      } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
-        insert = full.slice(0, token.start);
-        if (!/^\s*$/.test(insert)) {
-          insert = "";
-          for (var i = 0; i < token.start; ++i) insert += " ";
+      var insert = null;
+      if (mode.blockCommentStart && mode.blockCommentContinue) {
+        var end = token.string.indexOf(mode.blockCommentEnd);
+        var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
+        if (end != -1 && end == token.string.length - mode.blockCommentEnd.length) {
+          // Comment ended, don't continue it
+        } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
+          insert = full.slice(0, token.start);
+          if (!/^\s*$/.test(insert)) {
+            insert = "";
+            for (var i = 0; i < token.start; ++i) insert += " ";
+          }
+        } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
+                   found + mode.blockCommentContinue.length > token.start &&
+                   /^\s*$/.test(full.slice(0, found))) {
+          insert = full.slice(0, found);
         }
-      } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
-                 found + mode.blockCommentContinue.length > token.start &&
-                 /^\s*$/.test(full.slice(0, found))) {
-        insert = full.slice(0, found);
+        if (insert != null) insert += mode.blockCommentContinue;
       }
-      if (insert != null) insert += mode.blockCommentContinue;
-    }
-    if (insert == null && mode.lineComment) {
-      var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
-      if (found > -1) {
-        insert = line.slice(0, found);
-        if (/\S/.test(insert)) insert = null;
-        else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
+      if (insert == null && mode.lineComment) {
+        var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
+        if (found > -1) {
+          insert = line.slice(0, found);
+          if (/\S/.test(insert)) insert = null;
+          else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
+        }
       }
+      if (insert == null) return CodeMirror.Pass;
+      inserts[i] = "\n" + insert;
     }
 
-    if (insert != null)
-      cm.replaceSelection("\n" + insert, "end");
-    else
-      return CodeMirror.Pass;
+    cm.operation(function() {
+      for (var i = ranges.length - 1; i >= 0; i--)
+        cm.replaceRange(inserts[i], ranges[i].from(), ranges[i].to(), "+insert");
+    });
   }
 
   CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {

From 27ebe5e74c2bdfff7ddfc55d443ee56318ea58d0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 Nov 2013 22:41:39 +0100
Subject: [PATCH 0818/4742] [matchbrackets addon] Make multi-selection aware

Issue #778
---
 addon/edit/matchbrackets.js | 53 ++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 465b6ccaa9..4d0c853a52 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -10,12 +10,12 @@
     var maxScanLen = (state && state.maxScanLineLength) || 10000;
     var maxScanLines = (state && state.maxScanLines) || 100;
 
-    var cur = where || cm.getCursor(), line = cm.getLineHandle(cur.line), pos = cur.ch - 1;
+    var line = cm.getLineHandle(where.line), pos = where.ch - 1;
     var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
     if (!match) return null;
     var forward = match.charAt(1) == ">", d = forward ? 1 : -1;
-    if (strict && forward != (pos == cur.ch)) return null;
-    var style = cm.getTokenTypeAt(Pos(cur.line, pos + 1));
+    if (strict && forward != (pos == where.ch)) return null;
+    var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
     var stack = [line.text.charAt(pos)], re = /[(){}[\]]/;
     function scan(line, lineNo, start) {
@@ -33,41 +33,50 @@
         }
       }
     }
-    for (var i = cur.line, found, e = forward ? Math.min(i + maxScanLines, cm.lineCount()) : Math.max(-1, i - maxScanLines); i != e; i+=d) {
-      if (i == cur.line) found = scan(line, i, pos);
+    for (var i = where.line, found, e = forward ? Math.min(i + maxScanLines, cm.lineCount()) : Math.max(-1, i - maxScanLines); i != e; i+=d) {
+      if (i == where.line) found = scan(line, i, pos);
       else found = scan(cm.getLineHandle(i), i);
       if (found) break;
     }
-    return {from: Pos(cur.line, pos), to: found && Pos(i, found.pos),
+    return {from: Pos(where.line, pos), to: found && Pos(i, found.pos),
             match: found && found.match, forward: forward};
   }
 
   function matchBrackets(cm, autoclear) {
     // Disable brace matching in long lines, since it'll cause hugely slow updates
     var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
-    var found = findMatchingBracket(cm);
-    if (!found || cm.getLine(found.from.line).length > maxHighlightLen ||
-       found.to && cm.getLine(found.to.line).length > maxHighlightLen)
-      return;
+    var marks = [], ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head);
+      if (match && cm.getLine(match.from.line).length <= maxHighlightLen &&
+          match.to && cm.getLine(match.to.line).length <= maxHighlightLen) {
+        var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
+        marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
+        if (match.to)
+          marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style}));
+      }
+    }
 
-    var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
-    var one = cm.markText(found.from, Pos(found.from.line, found.from.ch + 1), {className: style});
-    var two = found.to && cm.markText(found.to, Pos(found.to.line, found.to.ch + 1), {className: style});
-    // Kludge to work around the IE bug from issue #1193, where text
-    // input stops going to the textarea whenever this fires.
-    if (ie_lt8 && cm.state.focused) cm.display.input.focus();
-    var clear = function() {
-      cm.operation(function() { one.clear(); two && two.clear(); });
-    };
-    if (autoclear) setTimeout(clear, 800);
-    else return clear;
+    if (marks.length) {
+      // Kludge to work around the IE bug from issue #1193, where text
+      // input stops going to the textare whever this fires.
+      if (ie_lt8 && cm.state.focused) cm.display.input.focus();
+
+      var clear = function() {
+        cm.operation(function() {
+          for (var i = 0; i < marks.length; i++) marks[i].clear();
+        });
+      };
+      if (autoclear) setTimeout(clear, 800);
+      else return clear;
+    }
   }
 
   var currentlyHighlighted = null;
   function doMatchBrackets(cm) {
     cm.operation(function() {
       if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
-      if (!cm.somethingSelected()) currentlyHighlighted = matchBrackets(cm, false);
+      currentlyHighlighted = matchBrackets(cm, false);
     });
   }
 

From 3b9fd6060bfb5d04cbd5013f5615eb94b6d43707 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 09:35:52 +0100
Subject: [PATCH 0819/4742] [closebrackets addon] Adjust to multi-selections

And fix example code in demo.

Issue #778
---
 addon/edit/closebrackets.js | 101 +++++++++++++++++++++++-------------
 demo/closebrackets.html     |  49 +++++++----------
 2 files changed, 85 insertions(+), 65 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 0575222be6..64c56f9530 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -28,56 +28,87 @@
     var map = {
       name : "autoCloseBrackets",
       Backspace: function(cm) {
-        if (cm.somethingSelected() || cm.getOption("disableInput")) return CodeMirror.Pass;
-        var cur = cm.getCursor(), around = charsAround(cm, cur);
-        if (around && pairs.indexOf(around) % 2 == 0)
+        if (cm.getOption("disableInput")) return CodeMirror.Pass;
+        var ranges = cm.listSelections();
+        for (var i = 0; i < ranges.length; i++) {
+          if (!ranges[i].empty()) return CodeMirror.Pass;
+          var around = charsAround(cm, ranges[i].head);
+          if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+        }
+        for (var i = ranges.length - 1; i >= 0; i--) {
+          var cur = ranges[i].head;
           cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
-        else
-          return CodeMirror.Pass;
+        }
       }
     };
     var closingBrackets = "";
     for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
       if (left != right) closingBrackets += right;
-      function surround(cm) {
-        var selection = cm.getSelection();
-        cm.replaceSelection(left + selection + right);
-      }
-      function maybeOverwrite(cm) {
-        var cur = cm.getCursor(), ahead = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
-        if (ahead != right || cm.somethingSelected()) return CodeMirror.Pass;
-        else cm.execCommand("goCharRight");
-      }
       map["'" + left + "'"] = function(cm) {
-        if (left == "'" && cm.getTokenAt(cm.getCursor()).type == "comment" ||
-            cm.getOption("disableInput"))
-          return CodeMirror.Pass;
-        if (cm.somethingSelected()) return surround(cm);
-        if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
-        var cur = cm.getCursor(), ahead = CodeMirror.Pos(cur.line, cur.ch + 1);
-        var line = cm.getLine(cur.line), nextChar = line.charAt(cur.ch), curChar = cur.ch > 0 ? line.charAt(cur.ch - 1) : "";
-        if (left == right && CodeMirror.isWordChar(curChar))
-          return CodeMirror.Pass;
-        if (line.length == cur.ch || closingBrackets.indexOf(nextChar) >= 0 || SPACE_CHAR_REGEX.test(nextChar))
-          cm.replaceSelection(left + right, {head: ahead, anchor: ahead});
-        else
-          return CodeMirror.Pass;
+        if (cm.getOption("disableInput")) return CodeMirror.Pass;
+        var ranges = cm.listSelections(), type, next;
+        for (var i = 0; i < ranges.length; i++) {
+          var range = ranges[i], cur = range.head, curType;
+          if (left == "'" && cm.getTokenTypeAt(cur) == "comment")
+            return CodeMirror.Pass;
+          if (!range.empty())
+            curType = "surround";
+          else if ((next = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1))) == right)
+            curType = "skip";
+          else if (left == right && CodeMirror.isWordChar(next))
+            return CodeMirror.Pass;
+          else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next))
+            curType = "both";
+          else
+            return CodeMirror.Pass;
+          if (!type) type = curType;
+          else if (type != curType) return CodeMirror.Pass;
+        }
+
+        if (type == "skip") {
+          cm.execCommand("goCharRight");
+        } else if (type == "surround") {
+          var sels = cm.getSelections();
+          for (var i = 0; i < sels.length; i++)
+            sels[i] = left + sels[i] + right;
+          cm.replaceSelections(sels, "around", "+insert");
+        } else if (type == "both") {
+          cm.replaceSelection(left + right, null, "+insert");
+          cm.execCommand("goCharLeft");
+        }
+      };
+      if (left != right) map["'" + right + "'"] = function(cm) {
+        var ranges = cm.listSelections();
+        for (var i = 0; i < ranges.length; i++) {
+          var range = ranges[i];
+          if (!range.empty() ||
+              cm.getRange(range.head, CodeMirror.Pos(range.head.line, range.head.ch + 1)) != right)
+            return CodeMirror.Pass;
+        }
+        cm.execCommand("goCharRight");
       };
-      if (left != right) map["'" + right + "'"] = maybeOverwrite;
     })(pairs.charAt(i), pairs.charAt(i + 1));
     return map;
   }
 
   function buildExplodeHandler(pairs) {
     return function(cm) {
-      var cur = cm.getCursor(), around = charsAround(cm, cur);
-      if (!around || pairs.indexOf(around) % 2 != 0 || cm.getOption("disableInput"))
-        return CodeMirror.Pass;
+      if (cm.getOption("disableInput")) return CodeMirror.Pass;
+      var ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        if (!ranges[i].empty()) return CodeMirror.Pass;
+        var around = charsAround(cm, ranges[i].head);
+        if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+      }
       cm.operation(function() {
-        var newPos = CodeMirror.Pos(cur.line + 1, 0);
-        cm.replaceSelection("\n\n", {anchor: newPos, head: newPos}, "+input");
-        cm.indentLine(cur.line + 1, null, true);
-        cm.indentLine(cur.line + 2, null, true);
+        cm.replaceSelection("\n\n", null, "+input");
+        cm.execCommand("goCharLeft");
+        ranges = cm.listSelections();
+        for (var i = 0; i < ranges.length; i++) {
+          var line = ranges[i].head.line;
+          cm.indentLine(line, null, true);
+          cm.indentLine(line + 1, null, true);
+        }
       });
     };
   }
diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index 8c0dc1cc3e..f7d5afbd87 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -26,36 +26,25 @@
 
 <article>
 <h2>Closebrackets Demo</h2>
-<form><textarea id="code" name="code">(function() {
-  var DEFAULT_BRACKETS = "()[]{}''\"\"";
-
-  CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
-    var wasOn = old && old != CodeMirror.Init;
-    if (val && !wasOn)
-      cm.addKeyMap(buildKeymap(typeof val == "string" ? val : DEFAULT_BRACKETS));
-    else if (!val && wasOn)
-      cm.removeKeyMap("autoCloseBrackets");
-  });
-
-  function buildKeymap(pairs) {
-    var map = {name : "autoCloseBrackets"};
-    for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
-      function maybeOverwrite(cm) {
-        var cur = cm.getCursor(), ahead = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
-        if (ahead != right) return CodeMirror.Pass;
-        else cm.execCommand("goCharRight");
-      }
-      map["'" + left + "'"] = function(cm) {
-        if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
-        var cur = cm.getCursor(), ahead = CodeMirror.Pos(cur.line, cur.ch + 1);
-        cm.replaceSelection(left + right, {head: ahead, anchor: ahead});
-      };
-      if (left != right) map["'" + right + "'"] = maybeOverwrite;
-    })(pairs.charAt(i), pairs.charAt(i + 1));
-    return map;
-  }
-})();
-</textarea></form>
+<form><textarea id="code" name="code">function Grid(width, height) {
+  this.width = width;
+  this.height = height;
+  this.cells = new Array(width * height);
+}
+Grid.prototype.valueAt = function(point) {
+  return this.cells[point.y * this.width + point.x];
+};
+Grid.prototype.setValueAt = function(point, value) {
+  this.cells[point.y * this.width + point.x] = value;
+};
+Grid.prototype.isInside = function(point) {
+  return point.x >= 0 && point.y >= 0 &&
+         point.x < this.width && point.y < this.height;
+};
+Grid.prototype.moveValue = function(from, to) {
+  this.setValueAt(to, this.valueAt(from));
+  this.setValueAt(from, undefined);
+};</textarea></form>
 
     <script type="text/javascript">
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {autoCloseBrackets: true});

From 2f90a11761a7105e2d53cf44e333225244de6008 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 09:53:34 +0100
Subject: [PATCH 0820/4742] [closetag addon] Adjust to multi-selections

Issue #778
---
 addon/edit/closetag.js | 85 +++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 35 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 762a94ccbb..7047e27738 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -41,48 +41,63 @@
                     "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
 
   function autoCloseGT(cm) {
-    var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
-    var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (inner.mode.name != "xml" || !state.tagName || cm.getOption("disableInput")) return CodeMirror.Pass;
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
+      var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
+      var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
+      var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
 
-    var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
-    var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
-    var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
+      var tagName = state.tagName;
+      if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
+      var lowerTagName = tagName.toLowerCase();
+      // Don't process the '>' at the end of an end-tag or self-closing tag
+      if (!tagName ||
+          tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
+          tok.type == "tag" && state.type == "closeTag" ||
+          tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
+          dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
+          CodeMirror.scanForClosingTag && CodeMirror.scanForClosingTag(cm, pos, tagName,
+                                                                       Math.min(cm.lastLine() + 1, pos.line + 50)))
+        return CodeMirror.Pass;
 
-    var tagName = state.tagName;
-    if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
-    var lowerTagName = tagName.toLowerCase();
-    // Don't process the '>' at the end of an end-tag or self-closing tag
-    if (!tagName ||
-        tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
-        tok.type == "tag" && state.type == "closeTag" ||
-        tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
-        dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
-        CodeMirror.scanForClosingTag && CodeMirror.scanForClosingTag(cm, pos, tagName,
-                                                                     Math.min(cm.lastLine() + 1, pos.line + 50)))
-      return CodeMirror.Pass;
+      var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
+      replacements[i] = {indent: indent,
+                         text: ">" + (indent ? "\n\n" : "") + "</" + tagName + ">",
+                         newPos: indent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1)};
+    }
 
-    var doIndent = indentTags && indexOf(indentTags, lowerTagName) > -1;
-    var curPos = doIndent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1);
-    cm.replaceSelection(">" + (doIndent ? "\n\n" : "") + "</" + tagName + ">",
-                        {head: curPos, anchor: curPos});
-    if (doIndent) {
-      cm.indentLine(pos.line + 1, null, true);
-      cm.indentLine(pos.line + 2, null);
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var info = replacements[i];
+      cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, "+insert");
+      var sel = cm.listSelections().slice(0);
+      sel[i] = {head: info.newPos, anchor: info.newPos};
+      cm.setSelections(sel);
+      if (info.indent) {
+        cm.indentLine(info.newPos.line, null, true);
+        cm.indentLine(info.newPos.line + 1, null, true);
+      }
     }
   }
 
   function autoCloseSlash(cm) {
-    var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
-    var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-        tok.start != pos.ch - 1 || inner.mode.name != "xml" ||
-        cm.getOption("disableInput"))
-      return CodeMirror.Pass;
-
-    var tagName = state.context && state.context.tagName;
-    if (tagName) cm.replaceSelection("/" + tagName + ">", "end");
-    else return CodeMirror.Pass;
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), replacements = [];
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (tok.type == "string" || tok.string.charAt(0) != "<" ||
+          tok.start != pos.ch - 1 || inner.mode.name != "xml" ||
+          !state.context || !state.context.tagName)
+        return CodeMirror.Pass;
+      replacements[i] = "/" + state.context.tagName + ">";
+    }
+    cm.replaceSelections(replacements, null, "+input");
   }
 
   function indexOf(collection, elt) {

From 318593767c2620e9a11cdae9650edcbb44db6656 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 11:05:11 +0100
Subject: [PATCH 0821/4742] [continuelist addon] Adjust to multi-selections

Issue #778
---
 addon/edit/continuelist.js | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 190b41dcbe..a038345b4b 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -1,27 +1,28 @@
 (function() {
-  'use strict';
+  "use strict";
 
   var listRE = /^(\s*)([*+-]|(\d+)\.)(\s*)/,
-      unorderedBullets = '*+-';
+      unorderedBullets = "*+-";
 
   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 inList = cm.getStateAfter(pos.line).list !== false;
 
-    var pos = cm.getCursor(),
-        inList = cm.getStateAfter(pos.line).list !== false,
-        match;
+      if (!ranges[i].empty() || !inList || !(match = cm.getLine(pos.line).match(listRE))) {
+        cm.execCommand("newlineAndIndent");
+        return;
+      }
+      var indent = match[1], after = match[4];
+      var bullet = unorderedBullets.indexOf(match[2]) >= 0
+        ? match[2]
+        : (parseInt(match[3], 10) + 1) + ".";
 
-    if (!inList || !(match = cm.getLine(pos.line).match(listRE))) {
-      cm.execCommand('newlineAndIndent');
-      return;
+      replacements[i] = "\n" + indent + bullet + after;
     }
 
-    var indent = match[1], after = match[4];
-    var bullet = unorderedBullets.indexOf(match[2]) >= 0
-      ? match[2]
-      : (parseInt(match[3], 10) + 1) + '.';
-
-    cm.replaceSelection('\n' + indent + bullet + after, 'end');
+    cm.replaceSelections(replacements, null, "+insert");
   };
-
 }());

From 4290648c3ccd029691874b39ee59ce08d7be9f76 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 12:05:58 +0100
Subject: [PATCH 0822/4742] [markselection and activeline addons] Adjust to
 multi-selections

Issue #778
---
 addon/selection/active-line.js    | 44 ++++++++++++++++++++-----------
 addon/selection/mark-selection.js | 14 +++++-----
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index 7cf7793c07..c8b7001ced 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -12,34 +12,48 @@
   CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
-      updateActiveLine(cm, cm.getCursor().line);
+      cm.state.activeLines = [];
+      updateActiveLines(cm, cm.listSelections());
       cm.on("beforeSelectionChange", selectionChange);
     } else if (!val && prev) {
       cm.off("beforeSelectionChange", selectionChange);
-      clearActiveLine(cm);
-      delete cm.state.activeLine;
+      clearActiveLines(cm);
+      delete cm.state.activeLines;
     }
   });
 
-  function clearActiveLine(cm) {
-    if ("activeLine" in cm.state) {
-      cm.removeLineClass(cm.state.activeLine, "wrap", WRAP_CLASS);
-      cm.removeLineClass(cm.state.activeLine, "background", BACK_CLASS);
+  function clearActiveLines(cm) {
+    for (var i = 0; i < cm.state.activeLines.length; i++) {
+      cm.removeLineClass(cm.state.activeLines[i], "wrap", WRAP_CLASS);
+      cm.removeLineClass(cm.state.activeLines[i], "background", BACK_CLASS);
     }
   }
 
-  function updateActiveLine(cm, selectedLine) {
-    var line = cm.getLineHandleVisualStart(selectedLine);
-    if (cm.state.activeLine == line) return;
+  function sameArray(a, b) {
+    if (a.length != b.length) return false;
+    for (var i = 0; i < a.length; i++)
+      if (a[i] != b[i]) return false;
+    return true;
+  }
+
+  function updateActiveLines(cm, ranges) {
+    var active = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var line = cm.getLineHandleVisualStart(ranges[i].head.line);
+      if (active[active.length - 1] != line) active.push(line);
+    }
+    if (sameArray(cm.state.activeLines, active)) return;
     cm.operation(function() {
-      clearActiveLine(cm);
-      cm.addLineClass(line, "wrap", WRAP_CLASS);
-      cm.addLineClass(line, "background", BACK_CLASS);
-      cm.state.activeLine = line;
+      clearActiveLines(cm);
+      for (var i = 0; i < active.length; i++) {
+        cm.addLineClass(active[i], "wrap", WRAP_CLASS);
+        cm.addLineClass(active[i], "background", BACK_CLASS);
+      }
+      cm.state.activeLines = active;
     });
   }
 
   function selectionChange(cm, sel) {
-    updateActiveLine(cm, sel.head.line);
+    updateActiveLines(cm, sel.ranges);
   }
 })();
diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index c97776e492..c40a9c99bd 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -34,10 +34,7 @@
 
   var CHUNK_SIZE = 8;
   var Pos = CodeMirror.Pos;
-
-  function cmp(pos1, pos2) {
-    return pos1.line - pos2.line || pos1.ch - pos2.ch;
-  }
+  var cmp = CodeMirror.cmpPos;
 
   function coverRange(cm, from, to, addAt) {
     if (cmp(from, to) == 0) return;
@@ -63,13 +60,16 @@
 
   function reset(cm) {
     clear(cm);
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-    coverRange(cm, from, to);
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++)
+      coverRange(cm, ranges[i].from(), ranges[i].to());
   }
 
   function update(cm) {
+    if (!cm.somethingSelected()) return clear(cm);
+    if (cm.listSelections().length > 1) return reset(cm);
+
     var from = cm.getCursor("start"), to = cm.getCursor("end");
-    if (cmp(from, to) == 0) return clear(cm);
 
     var array = cm.state.markedSelection;
     if (!array.length) return coverRange(cm, from, to);

From 09006cf880274a4501d7c8f395dc4adc5b3d150d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 12:13:13 +0100
Subject: [PATCH 0823/4742] Small changes to make remaining addons play nice
 with multi-selection

Issue #778
---
 addon/hint/show-hint.js           | 2 +-
 addon/search/match-highlighter.js | 2 +-
 addon/search/search.js            | 6 +-----
 keymap/emacs.js                   | 6 +++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 7e03d1139a..831fe089da 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -6,7 +6,7 @@
 
   CodeMirror.showHint = function(cm, getHints, options) {
     // We want a single cursor position.
-    if (cm.somethingSelected()) return;
+    if (cm.listSelections().length > 1 || cm.somethingSelected()) return;
     if (getHints == null) {
       if (options && options.async) return;
       else getHints = CodeMirror.hint.auto;
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index e5cbeacab2..a2eda2e614 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -68,7 +68,7 @@
         return;
       }
       if (cm.getCursor("head").line != cm.getCursor("anchor").line) return;
-      var selection = cm.getSelection().replace(/^\s+|\s+$/g, "");
+      var selection = cm.getSelections()[0].replace(/^\s+|\s+$/g, "");
       if (selection.length >= state.minChars)
         cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
     });
diff --git a/addon/search/search.js b/addon/search/search.js
index 049f72f3dc..38b488522f 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -7,6 +7,7 @@
 // Ctrl-G.
 
 (function() {
+  "use strict";
   function searchOverlay(query, caseInsensitive) {
     var startChar;
     if (typeof query == "string") {
@@ -16,11 +17,6 @@
     } else {
       query = new RegExp("^(?:" + query.source + ")", query.ignoreCase ? "i" : "");
     }
-    if (typeof query == "string") return {token: function(stream) {
-      if (stream.match(query)) return "searching";
-      stream.next();
-      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
-    }};
     return {token: function(stream) {
       if (stream.match(query)) return "searching";
       while (!stream.eol()) {
diff --git a/keymap/emacs.js b/keymap/emacs.js
index 592238bc90..c56d7eb7e7 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -174,7 +174,7 @@
     if (dup > 1 && event.origin == "+input") {
       var one = event.text.join("\n"), txt = "";
       for (var i = 1; i < dup; ++i) txt += one;
-      cm.replaceSelection(txt, "end", "+input");
+      cm.replaceSelection(txt, null, "+input");
     }
   }
 
@@ -266,7 +266,7 @@
       cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
       cm.setSelection(start, cm.getCursor());
     },
-    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing());},
+    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around");},
 
     "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
 
@@ -323,7 +323,7 @@
       var range = cm.getRange(from, pos);
       if (range.length != 2) return;
       cm.setSelection(from, pos);
-      cm.replaceSelection(range.charAt(1) + range.charAt(0), "end");
+      cm.replaceSelection(range.charAt(1) + range.charAt(0));
     }),
 
     "Alt-C": repeated(function(cm) {

From 722a7f455fe7c08ebfa3d74438b39ff4f69ce517 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 13:04:23 +0100
Subject: [PATCH 0824/4742] [multiselect keymap] Add

---
 addon/search/searchcursor.js | 11 ++++++++
 demo/multiselect.html        | 55 ++++++++++++++++++++++++++++++++++++
 doc/compress.html            |  1 +
 keymap/multiselect.js        | 47 ++++++++++++++++++++++++++++++
 4 files changed, 114 insertions(+)
 create mode 100644 demo/multiselect.html
 create mode 100644 keymap/multiselect.js

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 711cf4ce5a..6afac80fb8 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -164,4 +164,15 @@
   CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
     return new SearchCursor(this, query, pos, caseFold);
   });
+
+  CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
+    var ranges = [], next;
+    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
+    while (next = cur.findNext()) {
+      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
+      ranges.push({anchor: cur.from(), head: cur.to()});
+    }
+    if (ranges.length)
+      this.setSelections(ranges, 0);
+  });
 })();
diff --git a/demo/multiselect.html b/demo/multiselect.html
new file mode 100644
index 0000000000..3babdb9353
--- /dev/null
+++ b/demo/multiselect.html
@@ -0,0 +1,55 @@
+<!doctype html>
+
+<title>CodeMirror: Multiple Selection Keybinding Demo</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/search/searchcursor.js"></script>
+<script src="../keymap/multiselect.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Multiselect Bindings</a>
+  </ul>
+</div>
+
+<article>
+<h2>Multiple Selection Keybindings</h2>
+
+<form><textarea id="code" name="code">abcdefghijkl
+abcdefghijkl
+abcdefghijkl
+abcdefghijkl
+
+Shift-Ctrl-L / Shift-Cmd-L:
+  Split the current selection into multiple selections, by line.
+
+Ctrl-D / Cmd-D:
+  Add next occurrence of current selection as another selection.
+
+Alt-Esc / Alt-Esc:
+  Deselect all but the primary selection.
+
+Alt-F:
+  Select the parts of the current selection that match a given query.
+</textarea>
+
+<script>
+editor = CodeMirror.fromTextArea(document.getElementById("code"));
+</script>
+
+<p>Demonstrates the extra bindings provided by
+the <a href="../keymap/multiselect.js">multiselect</a> addon.</p>
+
+</article>
diff --git a/doc/compress.html b/doc/compress.html
index c2ba8f7021..55e25f3e68 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -207,6 +207,7 @@ <h2>Script compression helper</h2>
         <optgroup label="Keymaps">
           <option value="http://codemirror.net/keymap/emacs.js">emacs.js</option>
           <option value="http://codemirror.net/keymap/vim.js">vim.js</option>
+          <option value="http://codemirror.net/keymap/multiselect.js">multiselect.js</option>
         </optgroup>
       </select>
 
diff --git a/keymap/multiselect.js b/keymap/multiselect.js
new file mode 100644
index 0000000000..f45f27254a
--- /dev/null
+++ b/keymap/multiselect.js
@@ -0,0 +1,47 @@
+// A number of extra keybindings for multiple-selection handling
+// Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
+
+(function() {
+  "use strict";
+
+  var pc = CodeMirror.keyMap.pcDefault, mac = CodeMirror.keyMap.macDefault;
+  var Pos = CodeMirror.Pos;
+
+  function dialog(cm, text, shortText, f) {
+    if (cm.openDialog) cm.openDialog(text, f);
+    else f(prompt(shortText, ""));
+  }
+
+  // Split selection
+  pc["Shift-Ctrl-L"] = mac["Shift-Cmd-L"] = function(cm) {
+    var ranges = [], from = cm.getCursor("from"), to = cm.getCursor("to");
+    for (var line = from.line; line <= to.line; ++line)
+      ranges.push({anchor: line == from.line ? from : Pos(line, 0),
+                   head: line == to.line ? to : Pos(line)});
+    cm.setSelections(ranges, 0);
+  };
+
+  // Add next occurrence to selection
+  pc["Ctrl-D"] = mac["Cmd-D"] = function(cm) {
+    var at = cm.getCursor("to");
+    var cur = cm.getSearchCursor(cm.getRange(cm.getCursor("from"), at), at);
+    if (!cur.findNext()) return;
+    cm.addSelection(cur.from(), cur.to());
+  };
+
+  // Go to a single selection
+  pc["Alt-Esc"] = mac["Alt-Esc"] = function(cm) {
+    cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"));
+  };
+
+  // Select matching parts of current selection
+  var dialogText = 'Match: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp)</span>';
+  pc["Alt-F"] = mac["Alt-F"] = function(cm) {
+    if (!cm.somethingSelected()) return;
+    dialog(cm, dialogText, "Match:", function(query) {
+      var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
+      if (isRE) query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i");
+      cm.selectMatches(query);
+    });
+  };
+})();

From 765d3a967a75c9827dcce556afeb2a8106c32f1f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 13:15:54 +0100
Subject: [PATCH 0825/4742] [tern addon] Add select-variable-instances
 functionality

---
 addon/tern/tern.js | 23 ++++++++++++++++++++++-
 demo/tern.html     |  2 ++
 lib/codemirror.js  |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 7f83c4e4c0..fa2a2c3528 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -106,6 +106,8 @@
 
     rename: function(cm) { rename(this, cm); },
 
+    selectName: function(cm) { selectName(this, cm); },
+
     request: function (cm, query, c, pos) {
       var self = this;
       var doc = findDoc(this, cm.getDoc());
@@ -429,6 +431,25 @@
     });
   }
 
+  function selectName(ts, cm) {
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    if (!/\w/.test(token.string)) showError(ts, cm, "Not at a variable");
+    var name = findDoc(ts, cm.doc).name;
+    ts.request(cm, {type: "refs"}, function(error, data) {
+      if (error) return showError(ts, cm, error);
+      var ranges = [], cur = 0;
+      for (var i = 0; i < data.refs.length; i++) {
+        var ref = data.refs[i];
+        if (ref.file == name) {
+          ranges.push({anchor: ref.start, head: ref.end});
+          if (cmpPos(cur, ref.start) >= 0 && cmpPos(cur, ref.end) <= 0)
+            cur = ranges.length - 1;
+        }
+      }
+      cm.setSelections(ranges, cur);
+    });
+  }
+
   var nextChangeOrig = 0;
   function applyChanges(ts, changes) {
     var perFile = Object.create(null);
@@ -521,7 +542,7 @@
 
   // Generic utilities
 
-  function cmpPos(a, b) { return a.line - b.line || a.ch - b.ch; }
+  var cmpPos = CodeMirror.cmpPos;
 
   function elt(tagname, cls /*, ... elts*/) {
     var e = document.createElement(tagname);
diff --git a/demo/tern.html b/demo/tern.html
index 6843c7f5ec..57027f7267 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -86,6 +86,7 @@ <h2>Tern Demo</h2>
   <dt>Ctrl-I</dt><dd>Find type at cursor</dd>
   <dt>Alt-.</dt><dd>Jump to definition (Alt-, to jump back)</dd>
   <dt>Ctrl-Q</dt><dd>Rename variable</dd>
+  <dt>Ctrl-.</dt><dd>Select all occurrences of a variable</dd>
 </dl>
 
 <p>Documentation is sparse for now. See the top of
@@ -116,6 +117,7 @@ <h2>Tern Demo</h2>
       "Alt-.": function(cm) { server.jumpToDef(cm); },
       "Alt-,": function(cm) { server.jumpBack(cm); },
       "Ctrl-Q": function(cm) { server.rename(cm); },
+      "Ctrl-.": function(cm) { server.selectName(cm); }
     })
     editor.on("cursorActivity", function(cm) { server.updateArgHints(cm); });
   });
diff --git a/lib/codemirror.js b/lib/codemirror.js
index e9aabb2332..be6ac6f999 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5249,6 +5249,7 @@ window.CodeMirror = (function() {
       extendSelections(this, map(this.sel.ranges, f), bias);
     }),
     setSelections: docOperation(function(ranges, primary, bias) {
+      if (!ranges.length) return;
       for (var i = 0, out = []; i < ranges.length; i++)
         out[i] = new Range(clipPos(this, ranges[i].anchor),
                            clipPos(this, ranges[i].head));

From 62827d68cac988c09cac7cda9fb7d56f40461a65 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 14:29:03 +0100
Subject: [PATCH 0826/4742] [doc toc script] More accurate active link
 highlighting

---
 doc/activebookmark.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/doc/activebookmark.js b/doc/activebookmark.js
index 88c879cf42..407282d02c 100644
--- a/doc/activebookmark.js
+++ b/doc/activebookmark.js
@@ -3,6 +3,7 @@ document.createElement("section");
 document.createElement("article");
 
 (function() {
+  if (!window.addEventListener) return;
   var pending = false, prevVal = null;
 
   function updateSoon() {
@@ -41,8 +42,16 @@ document.createElement("article");
     }
   }
 
-  if (window.addEventListener) {
-    window.addEventListener("scroll", updateSoon);
-    window.addEventListener("load", updateSoon);
-  }
+  window.addEventListener("scroll", updateSoon);
+  window.addEventListener("load", updateSoon);
+  window.addEventListener("hashchange", function() {
+    setTimeout(function() {
+      var hash = document.location.hash, found = null, m;
+      var marks = document.getElementById("nav").getElementsByTagName("a");
+      for (var i = 0; i < marks.length; i++)
+        if ((m = marks[i].href.match(/(#.*)/)) && m[1] == hash) { found = i; break; }
+      if (found != null) for (var i = 0; i < marks.length; i++)
+        marks[i].className = i == found ? "active" : "";
+    }, 300);
+  });
 })();

From 7f01799b236514ab4be01b72cad8730b019ac1ea Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 16:10:46 +0100
Subject: [PATCH 0827/4742] Document multiple selection API

Issue #778
---
 doc/manual.html | 95 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 69 insertions(+), 26 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index c56af630e5..bb0517fb9a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -514,14 +514,15 @@ <h2>Events</h2>
       <dd>Fired whenever new input is read from the hidden textarea
       (typed or pasted by the user).</dd>
 
-      <dt id="event_beforeSelectionChange"><code><strong>"beforeSelectionChange"</strong> (instance: CodeMirror, selection: {head, anchor})</code></dt>
+      <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 modify the resulting selection head and anchor.
-      The <code>selection</code> parameter is an object
-      with <code>head</code> and <code>anchor</code> properties
-      holding <code>{line, ch}</code> objects, which the handler can
-      read and update. Handlers for this event have the same
-      restriction
+      handler may inspect the set of selection ranges, present as an
+      array of <code>{anchor, head}</code> objects in
+      the <code>ranges</code> property of the <code>obj</code>
+      argument, and optionally change them by calling
+      the <code>update</code> method on this object, passing an array
+      of ranges in the same format. Handlers for this event have the
+      same restriction
       as <a href="#event_beforeChange"><code>"beforeChange"</code></a>
       handlers — they should not do anything to directly update the
       state of the editor.</dd>
@@ -962,46 +963,88 @@ <h3 id="api_content">Content manipulation methods</h3>
     <h3 id="api_selection">Cursor and selection methods</h3>
 
     <dl>
-      <dt id="getSelection"><code><strong>doc.getSelection</strong>() → string</code></dt>
-      <dd>Get the currently selected code.</dd>
-      <dt id="replaceSelection"><code><strong>doc.replaceSelection</strong>(replacement: string, ?collapse: string)</code></dt>
-      <dd>Replace the selection with the given string. By default, the
-      new selection will span the inserted text. The
-      optional <code>collapse</code> argument can be used to change
-      this—passing <code>"start"</code> or <code>"end"</code> will
-      collapse the selection to the start or end of the inserted
-      text.</dd>
+      <dt id="getSelection"><code><strong>doc.getSelection</strong>(?lineSep: string) → string</code></dt>
+      <dd>Get the currently selected code. Optionally pass a line
+      separator to put between the lines in the output. When multiple
+      selections are present, they are concatenated with instances
+      of <code>lineSep</code> in between.</dd>
+      <dt id="getSelections"><code><strong>doc.getSelections</strong>(?lineSep: string) → string</code></dt>
+      <dd>Returns an array containing a string for each selection,
+      representing the content of the selections.</dd>
+
+      <dt id="replaceSelection"><code><strong>doc.replaceSelection</strong>(replacement: string, ?select: string)</code></dt>
+      <dd>Replace the selection(s) with the given string. By default,
+      the new selection ends up after the inserted text. The
+      optional <code>select</code> argument can be used to change
+      this—passing <code>"around"</code> will cause the new text to be
+      selected, passing <code>"start"</code> will collapse the
+      selection to the start of the inserted text.</dd>
+      <dt id="replaceSelections"><code><strong>doc.replaceSelections</strong>(replacements: array&lt;string&gt;, ?select: string)</code></dt>
+      <dd>The length of the given array should be the same as the
+      number of active selections. Replaces the content of the
+      selections with the strings in the array.
+      The <code>select</code> argument works the same as
+      in <a href="#replaceSelection"><code>replaceSelection</code></a>.</dd>
 
       <dt id="getCursor"><code><strong>doc.getCursor</strong>(?start: string) → {line, ch}</code></dt>
-      <dd><code>start</code> is a an optional string indicating which
-      end of the selection to return. It may
-      be <code>"start"</code>, <code>"end"</code>, <code>"head"</code>
+      <dd>Retrieve one end of the <em>primary</em>
+      selection. <code>start</code> is a an optional string indicating
+      which end of the selection to return. It may
+      be <code>"from"</code>, <code>"to"</code>, <code>"head"</code>
       (the side of the selection that moves when you press
       shift+arrow), or <code>"anchor"</code> (the fixed side of the
       selection). Omitting the argument is the same as
       passing <code>"head"</code>. A <code>{line, ch}</code> object
       will be returned.</dd>
+      <dt id="listSelections"><code><strong>doc.listSelections</strong>() → array&lt;{anchor, head}&lt;</code></dt>
+      <dd>Retrieves a list of all current selections. These will
+      always be sorted, and never overlap (overlapping selections are
+      merged). Each object in the array contains <code>anchor</code>
+      and <code>head</code> properties referring to <code>{line,
+      ch}</code> objects.</dd>
+      
       <dt id="somethingSelected"><code><strong>doc.somethingSelected</strong>() → boolean</code></dt>
       <dd>Return true if any text is selected.</dd>
       <dt id="setCursor"><code><strong>doc.setCursor</strong>(pos: {line, ch})</code></dt>
       <dd>Set the cursor position. You can either pass a
       single <code>{line, ch}</code> object, or the line and the
-      character as two separate parameters.</dd>
+      character as two separate parameters. Will replace all
+      selections with a single, empty selection at the given
+      position.</dd>
+
       <dt id="setSelection"><code><strong>doc.setSelection</strong>(anchor: {line, ch}, ?head: {line, ch})</code></dt>
-      <dd>Set the selection range. <code>anchor</code>
+      <dd>Set a single selection range. <code>anchor</code>
       and <code>head</code> should be <code>{line, ch}</code>
       objects. <code>head</code> defaults to <code>anchor</code> when
       not given.</dd>
+      <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer)</code></dt>
+      <dd>Sets a new set of selections. There must be at least one
+      selection in the given array. When <code>primary</code> is
+      given, it determines which selection is the primary one
+      (defaults to the last one).</dd>
+      <dt id="addSelection"><code><strong>doc.addSelection</strong>(anchor: {line, ch}, ?head: {line, ch})</code></dt>
+      <dd>Adds a new selection to the existing set of selections, and
+      makes it the primary selection.</dd>
+
       <dt id="extendSelection"><code><strong>doc.extendSelection</strong>(from: {line, ch}, ?to: {line, ch})</code></dt>
       <dd>Similar
       to <a href="#setSelection"><code>setSelection</code></a>, but
       will, if shift is held or
       the <a href="#setExtending">extending</a> flag is set, move the
       head of the selection while leaving the anchor at its current
-      place. <code>to</code> is optional, and can be passed to
-      ensure a region (for example a word or paragraph) will end up
-      selected (in addition to whatever lies between that region and
-      the current anchor).</dd>
+      place. <code>to</code> is optional, and can be passed to ensure
+      a region (for example a word or paragraph) will end up selected
+      (in addition to whatever lies between that region and the
+      current anchor). When multiple selections are present, all but
+      the primary selection will be dropped by this method.</dd>
+      <dt id="extendSelections"><code><strong>doc.extendSelections</strong>(heads: array&lt;{line, ch}&gt;)</code></dt>
+      <dd>An equivalent
+      of <a href="#extendSelection"><code>extendSelection</code></a>
+      that acts on all selections at once.</dd>
+      <dt id="extendSelectionsBy"><code><strong>doc.extendSelectionsBy</strong>(f: function(range: {anchor, head}) → {anchor, head}))</code></dt>
+      <dd>Applies the given function to all existing selections, and
+      calls <a href="#extendSelections"><code>extendSelections</code></a>
+      on the result.</dd>
       <dt id="setExtending"><code><strong>doc.setExtending</strong>(value: boolean)</code></dt>
       <dd>Sets or clears the 'extending' flag, which acts similar to
       the shift key, in that it will cause cursor movement and calls
@@ -1011,7 +1054,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       <dt id="hasFocus"><code><strong>cm.hasFocus</strong>() → boolean</code></dt>
       <dd>Tells you whether the editor currently has focus.</dd>
 
-      <dt id="findPosH"><code><strong>cm.findPosH</strong>(start: {line, ch}, amount: integer, unit: string, visually: boolean) → {line, ch, ?hitSide: boolean}</code></dt>
+      <dt id="findPosH"><code><strong>cm.findPosH</strong>(start: {line, ch}, amount: integer, unit: string, visually: boolean) → {line, ch, ?hitSide: boolean}</code></dt>
       <dd>Used to find the target position for horizontal cursor
       motion. <code>start</code> is a <code>{line, ch}</code>
       object, <code>amount</code> an integer (may be negative),

From 61253d27ece551568397e63a32199e14e2dc4a5d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 16:21:23 +0100
Subject: [PATCH 0828/4742] Don't use .next properties in change event objects
 anymore

---
 doc/manual.html   |  7 ++-----
 lib/codemirror.js | 23 ++++++++++-------------
 test/test.js      |  9 +++++++--
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index bb0517fb9a..3e81b94c3a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -460,7 +460,7 @@ <h2>Events</h2>
       <dt id="event_change"><code><strong>"change"</strong> (instance: CodeMirror, changeObj: object)</code></dt>
       <dd>Fires every time the content of the editor is changed.
       The <code>changeObj</code> is a <code>{from, to, text, removed,
-      next}</code> object containing information about the changes
+      origin}</code> object containing information about the changes
       that occurred as second argument. <code>from</code>
       and <code>to</code> are the positions (in the pre-change
       coordinate system) where the change started and ended (for
@@ -469,10 +469,7 @@ <h2>Events</h2>
       an array of strings representing the text that replaced the
       changed range (split by line). <code>removed</code> is the text
       that used to be between <code>from</code> and <code>to</code>,
-      which is overwritten by this change. If multiple changes
-      happened during a single operation, the object will have
-      a <code>next</code> property pointing to another change object
-      (which may point to another, etc).</dd>
+      which is overwritten by this change.</dd>
 
       <dt id="event_beforeChange"><code><strong>"beforeChange"</strong> (instance: CodeMirror, changeObj: object)</code></dt>
       <dd>This event is fired before a change is applied, and its
diff --git a/lib/codemirror.js b/lib/codemirror.js
index be6ac6f999..c5a332264f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1435,7 +1435,7 @@ window.CodeMirror = (function() {
       forceUpdate: false,
       updateInput: null,
       userSelChange: null,
-      textChanged: null,
+      changeObjs: null,
       selectionChanged: false,
       cursorActivity: false,
       updateMaxLine: false,
@@ -1498,8 +1498,8 @@ window.CodeMirror = (function() {
       delayed = delayedCallbacks;
       delayedCallbacks = null;
     }
-    if (op.textChanged)
-      signal(cm, "change", cm, op.textChanged);
+    if (op.changeObjs) for (var i = 0; i < op.changeObjs.length; i++)
+      signal(cm, "change", cm, op.changeObjs[i]);
     if (op.cursorActivity) signal(cm, "cursorActivity", cm);
     if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }
@@ -2631,16 +2631,13 @@ window.CodeMirror = (function() {
     // Remember that these lines changed, for updating the display
     regChange(cm, from.line, to.line + 1, lendiff);
 
-    if (hasHandler(cm, "change")) {
-      var changeObj = {from: from, to: to,
-                       text: change.text,
-                       removed: change.removed,
-                       origin: change.origin};
-      if (cm.curOp.textChanged) {
-        for (var cur = cm.curOp.textChanged; cur.next; cur = cur.next) {}
-        cur.next = changeObj;
-      } else cm.curOp.textChanged = changeObj;
-    }
+    if (hasHandler(cm, "change"))
+      (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push({
+        from: from, to: to,
+        text: change.text,
+        removed: change.removed,
+        origin: change.origin
+      });
   }
 
   function replaceRange(doc, code, from, to, origin) {
diff --git a/test/test.js b/test/test.js
index 0c129e9444..b96824bd2d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1603,9 +1603,9 @@ testCM("beforeSelectionChange", function(cm) {
 testCM("change_removedText", function(cm) {
   cm.setValue("abc\ndef");
 
-  var removedText;
+  var removedText = [];
   cm.on("change", function(cm, change) {
-    removedText = [change.removed, change.next && change.next.removed];
+    removedText.push(change.removed);
   });
 
   cm.operation(function() {
@@ -1613,14 +1613,19 @@ testCM("change_removedText", function(cm) {
     cm.replaceRange("123", Pos(0,0));
   });
 
+  eq(removedText.length, 2);
   eq(removedText[0].join("\n"), "abc\nd");
   eq(removedText[1].join("\n"), "");
 
+  var removedText = [];
   cm.undo();
+  eq(removedText.length, 2);
   eq(removedText[0].join("\n"), "123");
   eq(removedText[1].join("\n"), "xyz");
 
+  var removedText = [];
   cm.redo();
+  eq(removedText.length, 2);
   eq(removedText[0].join("\n"), "abc\nd");
   eq(removedText[1].join("\n"), "");
 });

From 451c9a83caf1e5f9b1bc2736bf1a1432195df92e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 16:27:48 +0100
Subject: [PATCH 0829/4742] Add a v4 upgrade guide

---
 doc/upgrade_v4.html | 81 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 doc/upgrade_v4.html

diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
new file mode 100644
index 0000000000..64a838ca26
--- /dev/null
+++ b/doc/upgrade_v4.html
@@ -0,0 +1,81 @@
+<!doctype html>
+
+<title>CodeMirror: Version 4 upgrade guide</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="docs.css">
+<script src="activebookmark.js"></script>
+
+<div id=nav>
+  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+
+  <ul>
+    <li><a href="../index.html">Home</a>
+    <li><a href="manual.html">Manual</a>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#upgrade">Upgrade guide</a>
+    <li><a href="#multisel">Multiple selections</a>
+    <li><a href="#beforeSelectionChange">The beforeSelectionChange event</a>
+    <li><a href="#replaceSelection">replaceSelection and collapsing</a>
+    <li><a href="#changeEvent">change event data</a>
+  </ul>
+</div>
+
+<article>
+
+<h2 id=upgrade>Upgrading to version 4</h2>
+
+<p><strong>Note:</strong> Version 4 hasn't been released yet. The
+information here is provisional and might still change.</p>
+
+<p>CodeMirror 4's interface is <em>very</em> close version 3, but it
+does fix a few awkward details in a backwards-incompatible ways. At
+least skim the text below before upgrading.</p>
+
+<section id=multisel><h2>Multiple selections</h2>
+
+<p>The main new feature in version 4 is multiple selections. The
+single-selection variants of methods are still there, but now
+typically act only on the <em>primary</em> selection (usually the last
+one added).</p>
+
+<p>The exception to this
+is <a href="manual.html#getSelection"><strong><code>getSelection</code></strong></a>,
+which will now return the content of <em>all</em> selections
+(separated by newlines, or whatever <code>lineSep</code> parameter you passed
+it).</p>
+
+</section>
+
+<section id=beforeSelectionChange><h2>The beforeSelectionChange event</h2>
+
+<p>This event still exists, but the object it is passed has
+a <a href="manual.html#event_beforeSelectionChange">completely new
+interface</a>, because such changes now concern multiple
+selections.</p>
+
+</section>
+
+<section id=replaceSelection><h2>replaceSelection's collapsing behavior</h2>
+
+<p>By
+default, <a href="manual.html#replaceSelection"><code>replaceSelection</code></a>
+would leave the newly inserted text selected. This is only rarely what
+you want, and also (slightly) more expensive in the new model, so the
+default was changed to <code>"end"</code>, meaning the old behavior
+must be explicitly specified by passing a second argument
+of <code>"around"</code>.</p>
+
+</section>
+
+<section id=changeEvent><h2>change event data</h2>
+
+<p>Rather than forcing client code to follow <code>next</code>
+pointers from one change object to the next, the library will now
+simply fire
+multiple <a href="manual.html#event_change"><code>"change"</code></a>
+events. Existing code will probably continue to work unmodified.</p>
+
+</section>
+</article>

From 38073cd5ffadd6c19eaac8b46e3094c5238358ee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 22:42:09 +0100
Subject: [PATCH 0830/4742] Wrap all modules in AMD and CommonJS-supporting
 shims

---
 addon/comment/comment.js            |  11 +-
 addon/comment/continuecomment.js    |  11 +-
 addon/dialog/dialog.js              |  11 +-
 addon/display/fullscreen.js         |  11 +-
 addon/display/placeholder.js        |  11 +-
 addon/edit/closebrackets.js         |  11 +-
 addon/edit/closetag.js              |  11 +-
 addon/edit/continuelist.js          |  11 +-
 addon/edit/matchbrackets.js         |  11 +-
 addon/edit/matchtags.js             |  11 +-
 addon/edit/trailingspace.js         |  37 ++++---
 addon/fold/brace-fold.js            |  15 ++-
 addon/fold/comment-fold.js          |  12 +++
 addon/fold/foldcode.js              |  11 +-
 addon/fold/foldgutter.js            |  11 +-
 addon/fold/indent-fold.js           |  13 ++-
 addon/fold/xml-fold.js              |  13 ++-
 addon/hint/anyword-hint.js          |  11 +-
 addon/hint/css-hint.js              |  11 +-
 addon/hint/html-hint.js             |  14 ++-
 addon/hint/javascript-hint.js       |  13 ++-
 addon/hint/pig-hint.js              |  12 ++-
 addon/hint/python-hint.js           |  14 ++-
 addon/hint/show-hint.js             |  11 +-
 addon/hint/sql-hint.js              |  11 +-
 addon/hint/xml-hint.js              |  12 ++-
 addon/lint/coffeescript-lint.js     |  13 ++-
 addon/lint/css-lint.js              |  12 +++
 addon/lint/javascript-lint.js       |  12 ++-
 addon/lint/json-lint.js             |  13 ++-
 addon/lint/lint.js                  |  18 ++--
 addon/merge/merge.js                |  11 +-
 addon/mode/loadmode.js              |  11 +-
 addon/mode/multiplex.js             |  12 +++
 addon/mode/overlay.js               |  15 ++-
 addon/runmode/colorize.js           |  14 ++-
 addon/runmode/runmode-standalone.js |   2 -
 addon/runmode/runmode.js            |  12 +++
 addon/scroll/scrollpastend.js       |  11 +-
 addon/search/match-highlighter.js   |  13 ++-
 addon/search/search.js              |  11 +-
 addon/search/searchcursor.js        |  12 ++-
 addon/selection/active-line.js      |  11 +-
 addon/selection/mark-selection.js   |  11 +-
 addon/tern/tern.js                  |  11 +-
 addon/wrap/hardwrap.js              |  11 +-
 demo/btree.html                     |   1 -
 doc/compress.html                   |   3 +-
 doc/manual.html                     |  39 ++++++-
 doc/upgrade_v4.html                 |  16 +++
 keymap/emacs.js                     |  11 +-
 keymap/multiselect.js               |  11 +-
 keymap/vim.js                       |  12 ++-
 lib/codemirror.js                   |  13 ++-
 mode/apl/apl.js                     |  12 +++
 mode/asterisk/asterisk.js           |  12 +++
 mode/clike/clike.js                 |  12 +++
 mode/clojure/clojure.js             |  13 +++
 mode/cobol/cobol.js                 |  12 +++
 mode/coffeescript/coffeescript.js   |  12 +++
 mode/commonlisp/commonlisp.js       |  12 +++
 mode/css/css.js                     |  16 ++-
 mode/d/d.js                         |  14 ++-
 mode/diff/diff.js                   |  12 +++
 mode/dtd/dtd.js                     |  12 +++
 mode/ecl/ecl.js                     |  12 +++
 mode/eiffel/eiffel.js               |  12 +++
 mode/erlang/erlang.js               |  12 +++
 mode/fortran/fortran.js             |  12 +++
 mode/gas/gas.js                     |  12 +++
 mode/gfm/gfm.js                     |  12 +++
 mode/gherkin/gherkin.js             |  12 +++
 mode/go/go.js                       |  12 +++
 mode/groovy/groovy.js               |  12 +++
 mode/haml/haml.js                   |  12 +++
 mode/haskell/haskell.js             |  12 +++
 mode/haxe/haxe.js                   |  12 +++
 mode/htmlembedded/htmlembedded.js   |  12 +++
 mode/htmlmixed/htmlmixed.js         |  12 +++
 mode/http/http.js                   |  12 +++
 mode/index.html                     |   2 +-
 mode/jade/jade.js                   |  12 +++
 mode/javascript/javascript.js       |  12 +++
 mode/jinja2/jinja2.js               |  67 +++++++-----
 mode/julia/julia.js                 |  12 +++
 mode/less/less.js                   |  12 +++
 mode/livescript/livescript.js       |  13 +++
 mode/lua/lua.js                     |  12 +++
 mode/markdown/markdown.js           |  12 +++
 mode/mirc/mirc.js                   |  13 +++
 mode/mllike/mllike.js               |  13 ++-
 mode/nginx/nginx.js                 |  12 +++
 mode/ntriples/ntriples.js           |  13 +++
 mode/octave/octave.js               |  12 +++
 mode/pascal/pascal.js               |  12 +++
 mode/pegjs/pegjs.js                 |  12 +++
 mode/perl/perl.js                   | 157 +++++++++++++++-------------
 mode/php/php.js                     |  13 ++-
 mode/pig/pig.js                     |  12 +++
 mode/properties/properties.js       |  12 +++
 mode/python/python.js               |  32 ++++--
 mode/q/q.js                         |  12 +++
 mode/r/r.js                         |  12 +++
 mode/rpm/changes/changes.js         |  19 ----
 mode/rpm/changes/index.html         |  67 ------------
 mode/rpm/{spec => }/index.html      |  68 +++++++++---
 mode/rpm/{spec/spec.js => rpm.js}   |  36 ++++++-
 mode/rpm/spec/spec.css              |   5 -
 mode/rst/rst.js                     |  12 +++
 mode/ruby/ruby.js                   |  11 ++
 mode/rust/rust.js                   |  12 +++
 mode/sass/sass.js                   |  12 +++
 mode/scheme/scheme.js               |  13 +++
 mode/shell/shell.js                 |  12 +++
 mode/sieve/sieve.js                 |  15 ++-
 mode/smalltalk/smalltalk.js         |  12 +++
 mode/smarty/smarty.js               |  13 +++
 mode/smartymixed/smartymixed.js     |  16 ++-
 mode/sparql/sparql.js               |  12 +++
 mode/sql/sql.js                     |  12 +++
 mode/stex/stex.js                   |  12 +++
 mode/tcl/tcl.js                     |  13 +++
 mode/tiddlywiki/tiddlywiki.js       |  13 +++
 mode/tiki/tiki.js                   |  12 +++
 mode/toml/toml.js                   |  12 +++
 mode/turtle/turtle.js               |  12 +++
 mode/vb/vb.js                       |  12 +++
 mode/vbscript/vbscript.js           |  13 +++
 mode/velocity/velocity.js           |  12 +++
 mode/verilog/verilog.js             |  14 ++-
 mode/xml/xml.js                     |  12 +++
 mode/xquery/xquery.js               |  12 +++
 mode/yaml/yaml.js                   |  12 +++
 mode/z80/z80.js                     |  12 +++
 134 files changed, 1640 insertions(+), 363 deletions(-)
 delete mode 100644 mode/rpm/changes/changes.js
 delete mode 100644 mode/rpm/changes/index.html
 rename mode/rpm/{spec => }/index.html (60%)
 rename mode/rpm/{spec/spec.js => rpm.js} (70%)
 delete mode 100644 mode/rpm/spec/spec.css

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index c36e176912..1eb9a05c5d 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
 
   var noOptions = {};
@@ -159,4 +166,4 @@
     });
     return true;
   });
-})();
+});
diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 0566c74e43..6db3b0a2b9 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -1,4 +1,11 @@
-(function() {
+(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) {
   var modes = ["clike", "css", "javascript"];
   for (var i = 0; i < modes.length; ++i)
     CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
@@ -59,4 +66,4 @@
       cm.addKeyMap(map);
     }
   });
-})();
+});
diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 41d7bf8663..2c26542045 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -1,6 +1,13 @@
 // Open simple dialogs on top of an editor. Relies on dialog.css.
 
-(function() {
+(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) {
   function dialogDiv(cm, template, bottom) {
     var wrap = cm.getWrapperElement();
     var dialog;
@@ -119,4 +126,4 @@
     if (duration)
       doneTimer = setTimeout(close, options.duration);
   });
-})();
+});
diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
index a442f6a433..e39c6e162f 100644
--- a/addon/display/fullscreen.js
+++ b/addon/display/fullscreen.js
@@ -1,4 +1,11 @@
-(function() {
+(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.defineOption("fullScreen", false, function(cm, val, old) {
@@ -28,4 +35,4 @@
     window.scrollTo(info.scrollLeft, info.scrollTop);
     cm.refresh();
   }
-})();
+});
diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 748afe7275..0fdc9b0d5b 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -1,4 +1,11 @@
-(function() {
+(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) {
   CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
@@ -45,4 +52,4 @@
   function isEmpty(cm) {
     return (cm.lineCount() === 1) && (cm.getLine(0) === "");
   }
-})();
+});
diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 64c56f9530..84b2fc56f1 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -1,4 +1,11 @@
-(function() {
+(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) {
   var DEFAULT_BRACKETS = "()[]{}''\"\"";
   var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
   var SPACE_CHAR_REGEX = /\s/;
@@ -112,4 +119,4 @@
       });
     };
   }
-})();
+});
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 7047e27738..ac6c2fc6d4 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -22,7 +22,14 @@
  * See demos/closetag.html for a usage example.
  */
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
     if (old != CodeMirror.Init && old)
       cm.removeKeyMap("autoCloseTags");
@@ -106,4 +113,4 @@
       if (collection[i] == elt) return i;
     return -1;
   }
-})();
+});
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index a038345b4b..54c7340bbe 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
 
   var listRE = /^(\s*)([*+-]|(\d+)\.)(\s*)/,
@@ -25,4 +32,4 @@
 
     cm.replaceSelections(replacements, null, "+insert");
   };
-}());
+});
diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 4d0c853a52..dcdee7516b 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -1,4 +1,11 @@
-(function() {
+(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) {
   var ie_lt8 = /MSIE \d/.test(navigator.userAgent) &&
     (document.documentMode == null || document.documentMode < 8);
 
@@ -93,4 +100,4 @@
   CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
     return findMatchingBracket(this, pos, strict);
   });
-})();
+});
diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index f189c1f8ef..2b7d22ed84 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
@@ -53,4 +60,4 @@
       if (other) cm.setSelection(other.to, other.from);
     }
   };
-})();
+});
diff --git a/addon/edit/trailingspace.js b/addon/edit/trailingspace.js
index f6bb02645d..ec07221e30 100644
--- a/addon/edit/trailingspace.js
+++ b/addon/edit/trailingspace.js
@@ -1,15 +1,24 @@
-CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
-  if (prev == CodeMirror.Init) prev = false;
-  if (prev && !val)
-    cm.removeOverlay("trailingspace");
-  else if (!prev && val)
-    cm.addOverlay({
-      token: function(stream) {
-        for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
-        if (i > stream.pos) { stream.pos = i; return null; }
-        stream.pos = l;
-        return "trailingspace";
-      },
-      name: "trailingspace"
-    });
+(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) {
+  CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
+    if (prev == CodeMirror.Init) prev = false;
+    if (prev && !val)
+      cm.removeOverlay("trailingspace");
+    else if (!prev && val)
+      cm.addOverlay({
+        token: function(stream) {
+          for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
+          if (i > stream.pos) { stream.pos = i; return null; }
+          stream.pos = l;
+          return "trailingspace";
+        },
+        name: "trailingspace"
+      });
+  });
 });
diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 2560b2b94c..f0ee62029a 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -1,3 +1,13 @@
+(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.registerHelper("fold", "brace", function(cm, start) {
   var line = start.line, lineText = cm.getLine(line);
   var startCh, tokenType;
@@ -45,7 +55,6 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
 });
-CodeMirror.braceRangeFinder = CodeMirror.fold.brace; // deprecated
 
 CodeMirror.registerHelper("fold", "import", function(cm, start) {
   function hasImport(line) {
@@ -70,7 +79,6 @@ CodeMirror.registerHelper("fold", "import", function(cm, start) {
   }
   return {from: cm.clipPos(CodeMirror.Pos(start, has.startCh + 1)), to: end};
 });
-CodeMirror.importRangeFinder = CodeMirror.fold["import"]; // deprecated
 
 CodeMirror.registerHelper("fold", "include", function(cm, start) {
   function hasInclude(line) {
@@ -90,4 +98,5 @@ CodeMirror.registerHelper("fold", "include", function(cm, start) {
   return {from: CodeMirror.Pos(start, has + 1),
           to: cm.clipPos(CodeMirror.Pos(end))};
 });
-CodeMirror.includeRangeFinder = CodeMirror.fold.include; // deprecated
+
+});
diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index 26e72f09f5..d72c5479a7 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -1,3 +1,13 @@
+(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.registerGlobalHelper("fold", "comment", function(mode) {
   return mode.blockCommentStart && mode.blockCommentEnd;
 }, function(cm, start) {
@@ -40,3 +50,5 @@ CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
 });
+
+});
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 5c00d7093c..4627c81f9d 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
 
   function doFold(cm, pos, options, force) {
@@ -83,4 +90,4 @@
       if (cur) return cur;
     }
   });
-})();
+});
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index a4f3bb3186..9caba59aad 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -1,4 +1,11 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./foldcode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./foldcode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
@@ -121,4 +128,4 @@
     if (line >= state.from && line < state.to)
       updateFoldInfo(cm, line, line + 1);
   }
-})();
+});
diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 434c2bc5ca..d0130836a2 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,3 +1,13 @@
+(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.registerHelper("fold", "indent", function(cm, start) {
   var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
   if (!/\S/.test(firstLine)) return;
@@ -27,4 +37,5 @@ CodeMirror.registerHelper("fold", "indent", function(cm, start) {
     to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
   };
 });
-CodeMirror.indentRangeFinder = CodeMirror.fold.indent; // deprecated
+
+});
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index db5aed7041..d554e2fc42 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
 
   var Pos = CodeMirror.Pos;
@@ -136,8 +143,6 @@
       }
     }
   });
-  CodeMirror.tagRangeFinder = CodeMirror.fold.xml; // deprecated
-
   CodeMirror.findMatchingTag = function(cm, pos, range) {
     var iter = new Iter(cm, pos.line, pos.ch, range);
     if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
@@ -170,4 +175,4 @@
     var iter = new Iter(cm, pos.line, pos.ch, end ? {from: 0, to: end} : null);
     return !!findMatchingClose(iter, name);
   };
-})();
+});
diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index a144768c81..1570664c4f 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
 
   var WORD = /[\w$]+/, RANGE = 500;
@@ -29,4 +36,4 @@
     }
     return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
   });
-})();
+});
diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 6789c458ba..9e5b1e132d 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -1,4 +1,11 @@
-(function () {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../mode/css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var pseudoClasses = {link: 1, visited: 1, active: 1, hover: 1, focus: 1,
@@ -43,4 +50,4 @@
       to: CodeMirror.Pos(cur.line, end)
     };
   });
-})();
+});
diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index cf256851ef..cbe7c61ad4 100755
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -1,4 +1,13 @@
-(function () {
+(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";
+
   var langs = "ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" ");
   var targets = ["_blank", "_self", "_top", "_parent"];
   var charsets = ["ascii", "utf-8", "utf-16", "latin1", "latin1"];
@@ -332,6 +341,5 @@
     if (options) for (var opt in options) local[opt] = options[opt];
     return CodeMirror.hint.xml(cm, local);
   }
-  CodeMirror.htmlHint = htmlHint; // deprecated
   CodeMirror.registerHelper("hint", "html", htmlHint);
-})();
+});
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index c347c206ec..305bb85a29 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -1,4 +1,11 @@
-(function () {
+(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) {
   var Pos = CodeMirror.Pos;
 
   function forEach(arr, f) {
@@ -47,7 +54,6 @@
                       function (e, cur) {return e.getTokenAt(cur);},
                       options);
   };
-  CodeMirror.javascriptHint = javascriptHint; // deprecated
   CodeMirror.registerHelper("hint", "javascript", javascriptHint);
 
   function getCoffeeScriptToken(editor, cur) {
@@ -71,7 +77,6 @@
   function coffeescriptHint(editor, options) {
     return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
   }
-  CodeMirror.coffeescriptHint = coffeescriptHint; // deprecated
   CodeMirror.registerHelper("hint", "coffeescript", coffeescriptHint);
 
   var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
@@ -128,4 +133,4 @@
     }
     return found;
   }
-})();
+});
diff --git a/addon/hint/pig-hint.js b/addon/hint/pig-hint.js
index 6c0c523774..02342f0246 100644
--- a/addon/hint/pig-hint.js
+++ b/addon/hint/pig-hint.js
@@ -1,4 +1,11 @@
-(function () {
+(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";
 
   function forEach(arr, f) {
@@ -46,7 +53,6 @@
   function pigHint(editor) {
     return scriptHint(editor, pigKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
   }
-  CodeMirror.pigHint = pigHint; // deprecated
   CodeMirror.registerHelper("hint", "pig", pigHint);
 
   var pigKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP "
@@ -118,4 +124,4 @@
     }
     return found;
   }
-})();
+});
diff --git a/addon/hint/python-hint.js b/addon/hint/python-hint.js
index 248284e8c5..eebfcc76dc 100644
--- a/addon/hint/python-hint.js
+++ b/addon/hint/python-hint.js
@@ -1,4 +1,13 @@
-(function () {
+(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";
+
   function forEach(arr, f) {
     for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
   }
@@ -40,7 +49,6 @@
   function pythonHint(editor) {
     return scriptHint(editor, pythonKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
   }
-  CodeMirror.pythonHint = pythonHint; // deprecated
   CodeMirror.registerHelper("hint", "python", pythonHint);
 
   var pythonKeywords = "and del from not while as elif global or with assert else if pass yield"
@@ -88,4 +96,4 @@
     }
     return found;
   }
-})();
+});
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 831fe089da..6a4d74e360 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
 
   var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
@@ -332,4 +339,4 @@
   });
 
   CodeMirror.commands.autocomplete = CodeMirror.showHint;
-})();
+});
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index d00781cff9..736dbaea06 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -1,4 +1,11 @@
-(function () {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../mode/sql/sql"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../mode/sql/sql"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   var tables;
@@ -143,4 +150,4 @@
     };
   }
   CodeMirror.registerHelper("hint", "sql", sqlHint);
-})();
+});
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 69f2b771fe..857564909a 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
 
   var Pos = CodeMirror.Pos;
@@ -64,6 +71,5 @@
     };
   }
 
-  CodeMirror.xmlHint = getHints; // deprecated
   CodeMirror.registerHelper("hint", "xml", getHints);
-})();
+});
diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
index 7f55a294dd..6df17f8f84 100644
--- a/addon/lint/coffeescript-lint.js
+++ b/addon/lint/coffeescript-lint.js
@@ -2,6 +2,16 @@
 
 // declare global: coffeelint
 
+(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.registerHelper("lint", "coffeescript", function(text) {
   var found = [];
   var parseError = function(err) {
@@ -24,4 +34,5 @@ CodeMirror.registerHelper("lint", "coffeescript", function(text) {
   }
   return found;
 });
-CodeMirror.coffeeValidator = CodeMirror.lint.coffeescript; // deprecated
+
+});
diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index 1de71fbcbd..2a799ddc4f 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -2,6 +2,16 @@
 
 // declare global: CSSLint
 
+(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.registerHelper("lint", "css", function(text) {
   var found = [];
   var results = CSSLint.verify(text), messages = results.messages, message = null;
@@ -17,3 +27,5 @@ CodeMirror.registerHelper("lint", "css", function(text) {
   }
   return found;
 });
+
+});
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index 7123ab7e64..bbb51083b8 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
   // declare global: JSHINT
 
@@ -19,7 +26,6 @@
   }
 
   CodeMirror.registerHelper("lint", "javascript", validator);
-  CodeMirror.javascriptValidator = CodeMirror.lint.javascript; // deprecated
 
   function cleanup(error) {
     // All problems are warnings by default
@@ -123,4 +129,4 @@
       }
     }
   }
-})();
+});
diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index e10e11bcaf..1f5f82d0ca 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -2,6 +2,16 @@
 
 // declare global: jsonlint
 
+(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.registerHelper("lint", "json", function(text) {
   var found = [];
   jsonlint.parseError = function(str, hash) {
@@ -14,4 +24,5 @@ CodeMirror.registerHelper("lint", "json", function(text) {
   catch(e) {}
   return found;
 });
-CodeMirror.jsonValidator = CodeMirror.lint.json; // deprecated
+
+});
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 6121735d3f..db5162ee7a 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
   var GUTTER_ID = "CodeMirror-lint-markers";
   var SEVERITIES = /^(?:error|warning)$/;
@@ -178,7 +185,7 @@
     }
   }
 
-  function optionHandler(cm, val, old) {
+  CodeMirror.defineOption("lint", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       clearMarks(cm);
       cm.off("change", onChange);
@@ -196,8 +203,5 @@
 
       startLinting(cm);
     }
-  }
-
-  CodeMirror.defineOption("lintWith", false, optionHandler); // deprecated
-  CodeMirror.defineOption("lint", false, optionHandler); // deprecated
-})();
+  });
+});
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 89f852652b..99e5d075ba 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
   // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
 
@@ -476,4 +483,4 @@
   function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
   function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
   function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
-})();
+});
diff --git a/addon/mode/loadmode.js b/addon/mode/loadmode.js
index 60fafbb178..e08c281321 100644
--- a/addon/mode/loadmode.js
+++ b/addon/mode/loadmode.js
@@ -1,4 +1,11 @@
-(function() {
+(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) {
   if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
 
   var loading = {};
@@ -48,4 +55,4 @@
         instance.setOption("mode", instance.getOption("mode"));
       });
   };
-}());
+});
diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 614ab1add3..07385c35f2 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -1,3 +1,13 @@
+(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.multiplexingMode = function(outer /*, others */) {
   // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
   var others = Array.prototype.slice.call(arguments, 1);
@@ -101,3 +111,5 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
     }
   };
 };
+
+});
diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index b7928a7bbf..6f556a13a7 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -6,8 +6,17 @@
 // overlay wins, unless the combine argument was true, in which case
 // the styles are combined.
 
-// overlayParser is the old, deprecated name
-CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, combine) {
+(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.overlayMode = function(base, overlay, combine) {
   return {
     startState: function() {
       return {
@@ -57,3 +66,5 @@ CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, comb
     }
   };
 };
+
+});
diff --git a/addon/runmode/colorize.js b/addon/runmode/colorize.js
index 62286d21e4..0f9530b17b 100644
--- a/addon/runmode/colorize.js
+++ b/addon/runmode/colorize.js
@@ -1,4 +1,12 @@
-CodeMirror.colorize = (function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./runmode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./runmode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
 
   var isBlock = /^(p|li|div|h\\d|pre|blockquote|td)$/;
 
@@ -10,7 +18,7 @@ CodeMirror.colorize = (function() {
     }
   }
 
-  return function(collection, defaultMode) {
+  CodeMirror.colorize = function(collection, defaultMode) {
     if (!collection) collection = document.body.getElementsByTagName("pre");
 
     for (var i = 0; i < collection.length; ++i) {
@@ -26,4 +34,4 @@ CodeMirror.colorize = (function() {
       node.className += " cm-s-default";
     }
   };
-})();
+});
diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index ec06ba11cb..eaa2b8f2fb 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -1,5 +1,3 @@
-/* Just enough of CodeMirror to run runMode under node.js */
-
 window.CodeMirror = {};
 
 (function() {
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 2cafa811f8..351840e08e 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -1,3 +1,13 @@
+(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.runMode = function(string, modespec, callback, options) {
   var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
   var ie = /MSIE \d/.test(navigator.userAgent);
@@ -54,3 +64,5 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
     }
   }
 };
+
+});
diff --git a/addon/scroll/scrollpastend.js b/addon/scroll/scrollpastend.js
index 58720ad413..467b7aa1cf 100644
--- a/addon/scroll/scrollpastend.js
+++ b/addon/scroll/scrollpastend.js
@@ -1,4 +1,11 @@
-(function() {
+(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.defineOption("scrollPastEnd", false, function(cm, val, old) {
@@ -33,4 +40,4 @@
       cm.setSize();
     }
   }
-})();
+});
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index a2eda2e614..d9c818b838 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -12,7 +12,16 @@
 // actual CSS class name. showToken, when enabled, will cause the
 // current token to be highlighted when nothing is selected.
 
-(function() {
+(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";
+
   var DEFAULT_MIN_CHARS = 2;
   var DEFAULT_TOKEN_STYLE = "matchhighlight";
   var DEFAULT_DELAY = 100;
@@ -88,4 +97,4 @@
       stream.skipTo(query.charAt(0)) || stream.skipToEnd();
     }};
   }
-})();
+});
diff --git a/addon/search/search.js b/addon/search/search.js
index 38b488522f..3df006d4b7 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -6,7 +6,14 @@
 // replace by making sure the match is no longer selected when hitting
 // Ctrl-G.
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../dialog/dialog"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../dialog/dialog"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
   function searchOverlay(query, caseInsensitive) {
     var startChar;
@@ -139,4 +146,4 @@
   CodeMirror.commands.clearSearch = clearSearch;
   CodeMirror.commands.replace = replace;
   CodeMirror.commands.replaceAll = function(cm) {replace(cm, true);};
-})();
+});
diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 6afac80fb8..899f44c4ab 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -1,4 +1,12 @@
-(function(){
+(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";
   var Pos = CodeMirror.Pos;
 
   function SearchCursor(doc, query, pos, caseFold) {
@@ -175,4 +183,4 @@
     if (ranges.length)
       this.setSelections(ranges, 0);
   });
-})();
+});
diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index c8b7001ced..a818f109b6 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -4,7 +4,14 @@
 // active line's wrapping <div> the CSS class "CodeMirror-activeline",
 // and gives its background <div> the class "CodeMirror-activeline-background".
 
-(function() {
+(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";
   var WRAP_CLASS = "CodeMirror-activeline";
   var BACK_CLASS = "CodeMirror-activeline-background";
@@ -56,4 +63,4 @@
   function selectionChange(cm, sel) {
     updateActiveLines(cm, sel.ranges);
   }
-})();
+});
diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index c40a9c99bd..ae0d393143 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -4,7 +4,14 @@
 // selected text the CSS class given as option value, or
 // "CodeMirror-selectedtext" when the value is not a string.
 
-(function() {
+(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.defineOption("styleSelectedText", false, function(cm, val, old) {
@@ -105,4 +112,4 @@
       }
     }
   }
-})();
+});
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index fa2a2c3528..1cc7e972e5 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -40,7 +40,14 @@
 //   load. Or, if you minified those into a single script and included
 //   them in the workerScript, simply leave this undefined.
 
-(function() {
+(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";
   // declare global: tern
 
@@ -650,4 +657,4 @@
     this.delFile = function(name) { send({type: "del", name: name}); };
     this.request = function(body, c) { send({type: "req", body: body}, c); };
   }
-})();
+});
diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index f6d99212a8..f900d6e81b 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
 
   var Pos = CodeMirror.Pos;
@@ -108,4 +115,4 @@
     });
     return madeChange;
   });
-})();
+});
diff --git a/demo/btree.html b/demo/btree.html
index 7635ca1bb4..b7bd39088d 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -58,7 +58,6 @@ <h2>B-Tree visualization</h2>
         var gray = Math.min(line.text.length * 3, 230), col = gray.toString(16);
         if (col.length == 1) col = "0" + col;
         lineElt.style.background = "#" + col + col + col;
-                          console.log(line.height, line);
         lineElt.style.width = Math.max(Math.round(line.height / 3), 1) + "px";
       }
     } else {
diff --git a/doc/compress.html b/doc/compress.html
index 55e25f3e68..d4c108c516 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -128,8 +128,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/python/python.js">python.js</option>
           <option value="http://codemirror.net/mode/q/q.js">q.js</option>
           <option value="http://codemirror.net/mode/r/r.js">r.js</option>
-          <option value="http://codemirror.net/mode/rpm/changes/changes.js">rpm/changes.js</option>
-          <option value="http://codemirror.net/mode/rpm/spec/spec.js">rpm/spec.js</option>
+          <option value="http://codemirror.net/mode/rpm/rpm.js">rpm.js</option>
           <option value="http://codemirror.net/mode/rst/rst.js">rst.js</option>
           <option value="http://codemirror.net/mode/ruby/ruby.js">ruby.js</option>
           <option value="http://codemirror.net/mode/rust/rust.js">rust.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index 3e81b94c3a..9a2424eb48 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -91,6 +91,9 @@ <h2>Basic Usage</h2>
 &lt;link rel="stylesheet" href="../lib/codemirror.css">
 &lt;script src="mode/javascript/javascript.js">&lt;/script></pre>
 
+    <p>(Alternatively, use a module loader. <a href="#modloader">More
+    about that later.</a>)</p>
+
     <p>Having done this, an editor instance can be created like
     this:</p>
 
@@ -135,7 +138,41 @@ <h2>Basic Usage</h2>
     of a form) is submitted. See the <a href="#fromTextArea">API
     reference</a> for a full description of this method.</p>
 
+    <h3 id=modloader>Module loaders</h3>
+
+    <p>The files in the CodeMirror distribution contain shims for
+    loading them (and their dependencies) in AMD or CommonJS
+    environments. If the variables <code>exports</code>
+    and <code>module</code> exist and have type object, CommonJS-style
+    require will be used. If not, but there is a
+    function <code>define</code> with an <code>amd</code> property
+    present, AMD-style (RequireJS) will be used.</p>
+
+    <p>It is possible to
+    use <a href="http://browserify.org/">Browserify</a> or similar
+    tools to statically build modules using CodeMirror. Alternatively,
+    use <a href="http://requirejs.org/">RequireJS</a> to dynamically
+    load dependencies at runtime. Both of these approaches have the
+    advantage that they don't use the global namespace and can, thus,
+    do things like load multiple versions of CodeMirror alongside each
+    other.</p>
+
+    <p>Here's a simple example of using RequireJS to load CodeMirror:</p>
+
+    <pre data-lang="javascript">require([
+  "cm/lib/codemirror", "cm/mode/htmlmixed/htmlmixed"
+], function(CodeMirror) {
+  CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    mode: "htmlmixed"
+  });
+});</pre>
+
+    <p>It will automatically load the modes that the mixed HTML mode
+    depends on (XML, JavaScript, and CSS).</p>
+
 </section>
+
 <section id=config>
     <h2>Configuration</h2>
 
@@ -2168,7 +2205,7 @@ <h2>Addons</h2>
         <dt><code><strong>"close"</strong> ()</code></dt>
         <dd>Fired when the completion is finished.</dd>
       </dl>
-      This addon depends styles
+      This addon depends on styles
       from <code>addon/hint/show-hint.css</code>. Check
       out <a href="../demo/complete.html">the demo</a> for an
       example.</dd>
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index 64a838ca26..d390228682 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -19,6 +19,7 @@
     <li><a href="#beforeSelectionChange">The beforeSelectionChange event</a>
     <li><a href="#replaceSelection">replaceSelection and collapsing</a>
     <li><a href="#changeEvent">change event data</a>
+    <li><a href="#deprecated">Deprecated interfaces dropped</a>
   </ul>
 </div>
 
@@ -77,5 +78,20 @@ <h2 id=upgrade>Upgrading to version 4</h2>
 multiple <a href="manual.html#event_change"><code>"change"</code></a>
 events. Existing code will probably continue to work unmodified.</p>
 
+</section>
+
+<section id=deprecated><h2>Deprecated interfaces dropped</h2>
+
+<p>A few properties that have been deprecated for a while are now
+gone. Most notably, the names for folding and completing functions
+(<code>CodeMirror.braceRangeFinder</code>, <code>CodeMirror.javascriptHint</code>,
+etc) are now gone
+(use <code>CodeMirror.fold.brace</code>, <code>CodeMirror.hint.javascript</code>).</p>
+
+<p>The <code>className</code> property in the return value
+of <a href="manual.html#getTokenAt"><code>getTokenAt</code></a>, which
+has been superseded by the <code>type</code> property, is also no
+longer present.</p>
+
 </section>
 </article>
diff --git a/keymap/emacs.js b/keymap/emacs.js
index c56d7eb7e7..35f199cb73 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -1,4 +1,11 @@
-(function() {
+(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";
 
   var Pos = CodeMirror.Pos;
@@ -395,4 +402,4 @@
   }
   for (var i = 0; i < 10; ++i) regPrefix(String(i));
   regPrefix("-");
-})();
+});
diff --git a/keymap/multiselect.js b/keymap/multiselect.js
index f45f27254a..46379484a6 100644
--- a/keymap/multiselect.js
+++ b/keymap/multiselect.js
@@ -1,7 +1,14 @@
 // A number of extra keybindings for multiple-selection handling
 // Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
 
-(function() {
+(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";
 
   var pc = CodeMirror.keyMap.pcDefault, mac = CodeMirror.keyMap.macDefault;
@@ -44,4 +51,4 @@
       cm.selectMatches(query);
     });
   };
-})();
+});
diff --git a/keymap/vim.js b/keymap/vim.js
index 9e5b257f4f..720ef4a2c3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -56,7 +56,14 @@
  *  8. Set up Vim to work as a keymap for CodeMirror.
  */
 
-(function() {
+(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';
 
   var defaultKeymap = [
@@ -3800,5 +3807,4 @@
   };
   // Initialize Vim and make it available as an API.
   CodeMirror.Vim = Vim();
-}
-)();
+});
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c5a332264f..c4adf99f65 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1,5 +1,11 @@
-// CodeMirror is the only global var we claim
-window.CodeMirror = (function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    module.exports = mod();
+  else if (typeof define == "function" && define.amd) // AMD
+    return define([], mod);
+  else // Plain browser env
+    this.CodeMirror = mod();
+})(function() {
   "use strict";
 
   // BROWSER SNIFFING
@@ -3175,7 +3181,6 @@ window.CodeMirror = (function() {
       return {start: stream.start,
               end: stream.pos,
               string: stream.current(),
-              className: style || null, // Deprecated, use 'type' instead
               type: style || null,
               state: state};
     },
@@ -6363,4 +6368,4 @@ window.CodeMirror = (function() {
   CodeMirror.version = "4.0.0";
 
   return CodeMirror;
-})();
+});
diff --git a/mode/apl/apl.js b/mode/apl/apl.js
index 5c23af85da..2ba74c18c2 100644
--- a/mode/apl/apl.js
+++ b/mode/apl/apl.js
@@ -1,3 +1,13 @@
+(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("apl", function() {
   var builtInOps = {
     ".": "innerProduct",
@@ -158,3 +168,5 @@ CodeMirror.defineMode("apl", function() {
 });
 
 CodeMirror.defineMIME("text/apl", "apl");
+
+});
diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index 60b689d1d5..c56fc0b38a 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -14,6 +14,16 @@
  * =====================================================================================
  */
 
+(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("asterisk", function() {
   var atoms    = ["exten", "same", "include","ignorepat","switch"],
       dpcmd    = ["#include","#exec"],
@@ -181,3 +191,5 @@ CodeMirror.defineMode("asterisk", function() {
 });
 
 CodeMirror.defineMIME("text/x-asterisk", "asterisk");
+
+});
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 4e4988dd81..b869f72723 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -1,3 +1,13 @@
+(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("clike", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
@@ -379,3 +389,5 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 }());
+
+});
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index e3d87d23a6..dd2e2ce1b8 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -2,6 +2,17 @@
  * Author: Hans Engel
  * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
  */
+
+(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("clojure", function (options) {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
         ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword";
@@ -223,3 +234,5 @@ CodeMirror.defineMode("clojure", function (options) {
 });
 
 CodeMirror.defineMIME("text/x-clojure", "clojure");
+
+});
diff --git a/mode/cobol/cobol.js b/mode/cobol/cobol.js
index d92491dde8..e66e42a191 100644
--- a/mode/cobol/cobol.js
+++ b/mode/cobol/cobol.js
@@ -2,6 +2,16 @@
  * Author: Gautam Mehta
  * Branched from CodeMirror's Scheme mode
  */
+(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("cobol", function () {
   var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
       ATOM = "atom", NUMBER = "number", KEYWORD = "keyword", MODTAG = "header",
@@ -238,3 +248,5 @@ CodeMirror.defineMode("cobol", function () {
 });
 
 CodeMirror.defineMIME("text/x-cobol", "cobol");
+
+});
diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 0e9e6352f8..c6da8f2a29 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -2,6 +2,16 @@
  * Link to the project's GitHub page:
  * https://github.com/pickhardt/coffeescript-codemirror-mode
  */
+(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("coffeescript", function(conf) {
   var ERRORCLASS = "error";
 
@@ -351,3 +361,5 @@ CodeMirror.defineMode("coffeescript", function(conf) {
 });
 
 CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
+
+});
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 8fa08c8ac2..a0f0732bf6 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -1,3 +1,13 @@
+(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("commonlisp", function (config) {
   var assumeBody = /^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/;
   var numLiteral = /^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/;
@@ -103,3 +113,5 @@ CodeMirror.defineMode("commonlisp", function (config) {
 });
 
 CodeMirror.defineMIME("text/x-common-lisp", "commonlisp");
+
+});
diff --git a/mode/css/css.js b/mode/css/css.js
index 06d73455da..d63bdd0827 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -1,6 +1,14 @@
-CodeMirror.defineMode("css", function(config, parserConfig) {
-  "use strict";
+(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("css", function(config, parserConfig) {
   if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
 
   var indentUnit = config.indentUnit,
@@ -334,7 +342,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   };
 });
 
-(function() {
   function keySet(array) {
     var keys = {};
     for (var i = 0; i < array.length; ++i) {
@@ -689,4 +696,5 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     name: "css",
     helperType: "less"
   });
-})();
+
+});
diff --git a/mode/d/d.js b/mode/d/d.js
index ab345f1a0d..3ab8b42838 100644
--- a/mode/d/d.js
+++ b/mode/d/d.js
@@ -1,3 +1,13 @@
+(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("d", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
@@ -173,7 +183,6 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
   };
 });
 
-(function() {
   function words(str) {
     var obj = {}, words = str.split(" ");
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
@@ -202,4 +211,5 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
       }
     }
   });
-}());
+
+});
diff --git a/mode/diff/diff.js b/mode/diff/diff.js
index 9a0d90ea55..d43f15d51a 100644
--- a/mode/diff/diff.js
+++ b/mode/diff/diff.js
@@ -1,3 +1,13 @@
+(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("diff", function() {
 
   var TOKEN_NAMES = {
@@ -30,3 +40,5 @@ CodeMirror.defineMode("diff", function() {
 });
 
 CodeMirror.defineMIME("text/x-diff", "diff");
+
+});
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index 7033bf0f8b..b4a6cb3155 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -5,6 +5,16 @@
   GitHub: @peterkroon
 */
 
+(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("dtd", function(config) {
   var indentUnit = config.indentUnit, type;
   function ret(style, tp) {type = tp; return style;}
@@ -125,3 +135,5 @@ CodeMirror.defineMode("dtd", function(config) {
 });
 
 CodeMirror.defineMIME("application/xml-dtd", "dtd");
+
+});
diff --git a/mode/ecl/ecl.js b/mode/ecl/ecl.js
index 7601b189a0..2b841ff5f1 100644
--- a/mode/ecl/ecl.js
+++ b/mode/ecl/ecl.js
@@ -1,3 +1,13 @@
+(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("ecl", function(config) {
 
   function words(str) {
@@ -190,3 +200,5 @@ CodeMirror.defineMode("ecl", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-ecl", "ecl");
+
+});
diff --git a/mode/eiffel/eiffel.js b/mode/eiffel/eiffel.js
index 15f34a9325..c6c3c84600 100644
--- a/mode/eiffel/eiffel.js
+++ b/mode/eiffel/eiffel.js
@@ -1,3 +1,13 @@
+(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("eiffel", function() {
   function wordObj(words) {
     var o = {};
@@ -145,3 +155,5 @@ CodeMirror.defineMode("eiffel", function() {
 });
 
 CodeMirror.defineMIME("text/x-eiffel", "eiffel");
+
+});
diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index bc3bdce860..79693fca22 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -12,6 +12,16 @@
 //   old guard/bif/conversion clashes (e.g. "float/1")
 //   type/spec/opaque
 
+(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.defineMIME("text/x-erlang", "erlang");
 
 CodeMirror.defineMode("erlang", function(cmCfg) {
@@ -605,3 +615,5 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     lineComment: "%"
   };
 });
+
+});
diff --git a/mode/fortran/fortran.js b/mode/fortran/fortran.js
index 83fd8fde85..58dac127c1 100644
--- a/mode/fortran/fortran.js
+++ b/mode/fortran/fortran.js
@@ -1,3 +1,13 @@
+(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("fortran", function() {
   function words(array) {
     var keys = {};
@@ -171,3 +181,5 @@ CodeMirror.defineMode("fortran", function() {
 });
 
 CodeMirror.defineMIME("text/x-fortran", "fortran");
+
+});
diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index a6e6892908..a21d5bbe1b 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -1,3 +1,13 @@
+(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("gas", function(_config, parserConfig) {
   'use strict';
 
@@ -328,3 +338,5 @@ CodeMirror.defineMode("gas", function(_config, parserConfig) {
     blockCommentEnd: "*/"
   };
 });
+
+});
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 10d5e05c06..7bd5f5ab42 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../markdown/markdown"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../markdown/markdown"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var codeDepth = 0;
   function blankLine(state) {
@@ -100,3 +110,5 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
   CodeMirror.defineMIME("gfmBase", markdownConfig);
   return CodeMirror.overlayMode(CodeMirror.getMode(config, "gfmBase"), gfmOverlay);
 }, "markdown");
+
+});
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index 685b373df7..41003641ec 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -13,6 +13,16 @@ Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
 //  keywords: /(Feature| {2}(Scenario|In order to|As|I)| {4}(Given|When|Then|And))/
 //};
 
+(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("gherkin", function () {
   return {
     startState: function () {
@@ -161,3 +171,5 @@ CodeMirror.defineMode("gherkin", function () {
 });
 
 CodeMirror.defineMIME("text/x-feature", "gherkin");
+
+});
diff --git a/mode/go/go.js b/mode/go/go.js
index 862c091120..7ba780ead8 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -1,3 +1,13 @@
+(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("go", function(config) {
   var indentUnit = config.indentUnit;
 
@@ -166,3 +176,5 @@ CodeMirror.defineMode("go", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-go", "go");
+
+});
diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 6800e0aaf5..399452d536 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -1,3 +1,13 @@
+(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("groovy", function(config) {
   function words(str) {
     var obj = {}, words = str.split(" ");
@@ -209,3 +219,5 @@ CodeMirror.defineMode("groovy", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-groovy", "groovy");
+
+});
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 5ea4ed12c8..6b205b43e4 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 (function() {
   "use strict";
 
@@ -147,3 +157,5 @@
 
   CodeMirror.defineMIME("text/x-haml", "haml");
 })();
+
+});
diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index facfd00a65..2876172a95 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -1,3 +1,13 @@
+(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("haskell", function(_config, modeConfig) {
 
   function switchState(source, setState, f) {
@@ -250,3 +260,5 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
 });
 
 CodeMirror.defineMIME("text/x-haskell", "haskell");
+
+});
diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index cb761ad1ce..3f78a8d674 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -1,3 +1,13 @@
+(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("haxe", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
 
@@ -427,3 +437,5 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
 });
 
 CodeMirror.defineMIME("text/x-haxe", "haxe");
+
+});
diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index c316cd3406..3a07c3432e 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
 
   //config settings
@@ -69,3 +79,5 @@ CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingMode
 CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
 CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"});
 CodeMirror.defineMIME("application/x-erb", { name: "htmlembedded", scriptingModeSpec:"ruby"});
+
+});
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index e9eab3b92d..a2c3740d3d 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
   var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true});
   var cssMode = CodeMirror.getMode(config, "css");
@@ -100,3 +110,5 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
 }, "xml", "javascript", "css");
 
 CodeMirror.defineMIME("text/html", "htmlmixed");
+
+});
diff --git a/mode/http/http.js b/mode/http/http.js
index 5a51636027..d2ad5994b6 100644
--- a/mode/http/http.js
+++ b/mode/http/http.js
@@ -1,3 +1,13 @@
+(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("http", function() {
   function failFirstLine(stream, state) {
     stream.skipToEnd();
@@ -96,3 +106,5 @@ CodeMirror.defineMode("http", function() {
 });
 
 CodeMirror.defineMIME("message/http", "http");
+
+});
diff --git a/mode/index.html b/mode/index.html
index 7c1f740615..29d120d012 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -80,7 +80,7 @@ <h2>Language modes</h2>
       <li><a href="python/index.html">Python</a></li>
       <li><a href="q/index.html">Q</a></li>
       <li><a href="r/index.html">R</a></li>
-      <li>RPM <a href="rpm/spec/index.html">spec</a> and <a href="rpm/changes/index.html">changelog</a></li>
+      <li><a href="rpm/index.html">RPM</a></li>
       <li><a href="rst/index.html">reStructuredText</a></li>
       <li><a href="ruby/index.html">Ruby</a></li>
       <li><a href="rust/index.html">Rust</a></li>
diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index 61abb27ab7..020b93ec5d 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -1,3 +1,13 @@
+(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("jade", function () {
   var symbol_regex1 = /^(?:~|!|%|\^|\*|\+|=|\\|:|;|,|\/|\?|&|<|>|\|)/;
   var open_paren_regex = /^(\(|\[)/;
@@ -88,3 +98,5 @@ CodeMirror.defineMode("jade", function () {
 });
 
 CodeMirror.defineMIME('text/x-jade', 'jade');
+
+});
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fbf574b4fe..8d6035de2c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -1,5 +1,15 @@
 // TODO actually recognize syntax of TypeScript constructs
 
+(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("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var statementIndent = parserConfig.statementIndent;
@@ -628,3 +638,5 @@ CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
 CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
 CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
 CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
+
+});
diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index b28af098d0..e30ce63478 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -1,4 +1,14 @@
-CodeMirror.defineMode("jinja2", function() {
+(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("jinja2", function() {
     var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif",
                     "extends", "filter", "endfilter", "firstof", "for",
                     "endfor", "if", "endif", "ifchanged", "endifchanged",
@@ -15,38 +25,39 @@ CodeMirror.defineMode("jinja2", function() {
     keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
 
     function tokenBase (stream, state) {
-        var ch = stream.next();
-        if (ch == "{") {
-            if (ch = stream.eat(/\{|%|#/)) {
-                stream.eat("-");
-                state.tokenize = inTag(ch);
-                return "tag";
-            }
+      var ch = stream.next();
+      if (ch == "{") {
+        if (ch = stream.eat(/\{|%|#/)) {
+          stream.eat("-");
+          state.tokenize = inTag(ch);
+          return "tag";
         }
+      }
     }
     function inTag (close) {
-        if (close == "{") {
-            close = "}";
+      if (close == "{") {
+        close = "}";
+      }
+      return function (stream, state) {
+        var ch = stream.next();
+        if ((ch == close || (ch == "-" && stream.eat(close)))
+            && stream.eat("}")) {
+          state.tokenize = tokenBase;
+          return "tag";
         }
-        return function (stream, state) {
-            var ch = stream.next();
-            if ((ch == close || (ch == "-" && stream.eat(close)))
-                && stream.eat("}")) {
-                state.tokenize = tokenBase;
-                return "tag";
-            }
-            if (stream.match(keywords)) {
-                return "keyword";
-            }
-            return close == "#" ? "comment" : "string";
-        };
+        if (stream.match(keywords)) {
+          return "keyword";
+        }
+        return close == "#" ? "comment" : "string";
+      };
     }
     return {
-        startState: function () {
-            return {tokenize: tokenBase};
-        },
-        token: function (stream, state) {
-            return state.tokenize(stream, state);
-        }
+      startState: function () {
+        return {tokenize: tokenBase};
+      },
+      token: function (stream, state) {
+        return state.tokenize(stream, state);
+      }
     };
+  });
 });
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 9ec2428cd4..b603713040 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -1,3 +1,13 @@
+(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("julia", function(_conf, parserConf) {
   var ERRORCLASS = 'error';
 
@@ -260,3 +270,5 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
 
 CodeMirror.defineMIME("text/x-julia", "julia");
+
+});
diff --git a/mode/less/less.js b/mode/less/less.js
index da681ea67b..9f0d43e938 100644
--- a/mode/less/less.js
+++ b/mode/less/less.js
@@ -5,6 +5,16 @@
   GitHub: @peterkroon
 */
 
+(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("less", function(config) {
   var indentUnit = config.indentUnit, type;
   function ret(style, tp) {type = tp; return style;}
@@ -345,3 +355,5 @@ CodeMirror.defineMode("less", function(config) {
 CodeMirror.defineMIME("text/x-less", "less");
 if (!CodeMirror.mimeModes.hasOwnProperty("text/css"))
   CodeMirror.defineMIME("text/css", "less");
+
+});
diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index c000324b8c..9322ba8073 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -2,6 +2,17 @@
  * Link to the project's GitHub page:
  * https://github.com/duralog/CodeMirror
  */
+
+(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";
+
 (function() {
   CodeMirror.defineMode('livescript', function(){
     var tokenBase, external;
@@ -265,3 +276,5 @@
 })();
 
 CodeMirror.defineMIME('text/x-livescript', 'livescript');
+
+});
diff --git a/mode/lua/lua.js b/mode/lua/lua.js
index b8deaa2575..3673557c27 100644
--- a/mode/lua/lua.js
+++ b/mode/lua/lua.js
@@ -2,6 +2,16 @@
 // CodeMirror 1 mode.
 // highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting
 
+(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("lua", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
 
@@ -142,3 +152,5 @@ CodeMirror.defineMode("lua", function(config, parserConfig) {
 });
 
 CodeMirror.defineMIME("text/x-lua", "lua");
+
+});
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index da2ba93fea..cfa56b911d 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror", require("../xml/xml")));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
@@ -744,3 +754,5 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 }, "xml");
 
 CodeMirror.defineMIME("text/x-markdown", "markdown");
+
+});
diff --git a/mode/mirc/mirc.js b/mode/mirc/mirc.js
index fc88bc56fb..6b2a23a16c 100644
--- a/mode/mirc/mirc.js
+++ b/mode/mirc/mirc.js
@@ -1,4 +1,15 @@
 //mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
+
+(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.defineMIME("text/mirc", "mirc");
 CodeMirror.defineMode("mirc", function() {
   function parseWords(str) {
@@ -175,3 +186,5 @@ CodeMirror.defineMode("mirc", function() {
     }
   };
 });
+
+});
diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 1d64789a19..d4d59fceb7 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -1,5 +1,14 @@
-CodeMirror.defineMode('mllike', function(_config, parserConfig) {
+(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('mllike', function(_config, parserConfig) {
   var words = {
     'let': 'keyword',
     'rec': 'keyword',
@@ -189,3 +198,5 @@ CodeMirror.defineMIME('text/x-fsharp', {
   },
   slashComments: true
 });
+
+});
diff --git a/mode/nginx/nginx.js b/mode/nginx/nginx.js
index c98c8a1dd3..4e17cdb3c4 100644
--- a/mode/nginx/nginx.js
+++ b/mode/nginx/nginx.js
@@ -1,3 +1,13 @@
+(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("nginx", function(config) {
 
   function words(str) {
@@ -161,3 +171,5 @@ CodeMirror.defineMode("nginx", function(config) {
 });
 
 CodeMirror.defineMIME("text/nginx", "text/x-nginx-conf");
+
+});
diff --git a/mode/ntriples/ntriples.js b/mode/ntriples/ntriples.js
index ed0cee34b0..cd5eb24f07 100644
--- a/mode/ntriples/ntriples.js
+++ b/mode/ntriples/ntriples.js
@@ -25,6 +25,17 @@
              -> ERROR
          }
 */
+
+(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("ntriples", function() {
 
   var Location = {
@@ -168,3 +179,5 @@ CodeMirror.defineMode("ntriples", function() {
 });
 
 CodeMirror.defineMIME("text/n-triples", "ntriples");
+
+});
diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index 23cd2fe222..0d8f610d1d 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -1,3 +1,13 @@
+(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("octave", function() {
   function wordRegexp(words) {
     return new RegExp("^((" + words.join(")|(") + "))\\b");
@@ -116,3 +126,5 @@ CodeMirror.defineMode("octave", function() {
 });
 
 CodeMirror.defineMIME("text/x-octave", "octave");
+
+});
diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index 09d9b0617b..642dd9bf79 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -1,3 +1,13 @@
+(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("pascal", function() {
   function words(str) {
     var obj = {}, words = str.split(" ");
@@ -92,3 +102,5 @@ CodeMirror.defineMode("pascal", function() {
 });
 
 CodeMirror.defineMIME("text/x-pascal", "pascal");
+
+});
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index 6b2e273791..f74f2a4f22 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../javascript/javascript"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../javascript/javascript"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("pegjs", function (config) {
   var jsMode = CodeMirror.getMode(config, "javascript");
 
@@ -97,3 +107,5 @@ CodeMirror.defineMode("pegjs", function (config) {
     }
   };
 }, "javascript");
+
+});
diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 5954b1a61c..84392e4a81 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -1,5 +1,16 @@
 // CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
 // This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
+
+(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("perl",function(){
         // http://perldoc.perl.org
         var PERL={                                      //   null - magic touch
@@ -509,7 +520,7 @@ CodeMirror.defineMode("perl",function(){
                         return tokenSOMETHING(stream,state,'=cut');}
                 var ch=stream.next();
                 if(ch=='"'||ch=="'"){                           // NOTE: ' or " or <<'SOMETHING'\n...\nSOMETHING\n or <<"SOMETHING"\n...\nSOMETHING\n
-                        if(stream.prefix(3)=="<<"+ch){
+                        if(prefix(stream, 3)=="<<"+ch){
                                 var p=stream.pos;
                                 stream.eatWhile(/\w/);
                                 var n=stream.current().substr(1);
@@ -518,94 +529,94 @@ CodeMirror.defineMode("perl",function(){
                                 stream.pos=p;}
                         return tokenChain(stream,state,[ch],"string");}
                 if(ch=="q"){
-                        var c=stream.look(-2);
+                        var c=look(stream, -2);
                         if(!(c&&/\w/.test(c))){
-                                c=stream.look(0);
+                                c=look(stream, 0);
                                 if(c=="x"){
-                                        c=stream.look(1);
+                                        c=look(stream, 1);
                                         if(c=="("){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
                                         if(c=="["){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
                                         if(c=="{"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
                                         if(c=="<"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
                                         if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
                                 else if(c=="q"){
-                                        c=stream.look(1);
+                                        c=look(stream, 1);
                                         if(c=="("){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[")"],"string");}
                                         if(c=="["){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["]"],"string");}
                                         if(c=="{"){
-stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["}"],"string");}
                                         if(c=="<"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[">"],"string");}
                                         if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[stream.eat(c)],"string");}}
                                 else if(c=="w"){
-                                        c=stream.look(1);
+                                        c=look(stream, 1);
                                         if(c=="("){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[")"],"bracket");}
                                         if(c=="["){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["]"],"bracket");}
                                         if(c=="{"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["}"],"bracket");}
                                         if(c=="<"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[">"],"bracket");}
                                         if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[stream.eat(c)],"bracket");}}
                                 else if(c=="r"){
-                                        c=stream.look(1);
+                                        c=look(stream, 1);
                                         if(c=="("){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
                                         if(c=="["){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
                                         if(c=="{"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
                                         if(c=="<"){
-                                                stream.eatSuffix(2);
+                                                eatSuffix(stream, 2);
                                                 return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
                                         if(/[\^'"!~\/]/.test(c)){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
                                 else if(/[\^'"!~\/(\[{<]/.test(c)){
                                         if(c=="("){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[")"],"string");}
                                         if(c=="["){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,["]"],"string");}
                                         if(c=="{"){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,["}"],"string");}
                                         if(c=="<"){
-                                                stream.eatSuffix(1);
+                                                eatSuffix(stream, 1);
                                                 return tokenChain(stream,state,[">"],"string");}
                                         if(/[\^'"!~\/]/.test(c)){
                                                 return tokenChain(stream,state,[stream.eat(c)],"string");}}}}
                 if(ch=="m"){
-                        var c=stream.look(-2);
+                        var c=look(stream, -2);
                         if(!(c&&/\w/.test(c))){
                                 c=stream.eat(/[(\[{<\^'"!~\/]/);
                                 if(c){
@@ -620,7 +631,7 @@ stream.eatSuffix(2);
                                         if(c=="<"){
                                                 return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}}}}
                 if(ch=="s"){
-                        var c=/[\/>\]})\w]/.test(stream.look(-2));
+                        var c=/[\/>\]})\w]/.test(look(stream, -2));
                         if(!c){
                                 c=stream.eat(/[(\[{<\^'"!~\/]/);
                                 if(c){
@@ -634,7 +645,7 @@ stream.eatSuffix(2);
                                                 return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
                                         return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
                 if(ch=="y"){
-                        var c=/[\/>\]})\w]/.test(stream.look(-2));
+                        var c=/[\/>\]})\w]/.test(look(stream, -2));
                         if(!c){
                                 c=stream.eat(/[(\[{<\^'"!~\/]/);
                                 if(c){
@@ -648,7 +659,7 @@ stream.eatSuffix(2);
                                                 return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
                                         return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
                 if(ch=="t"){
-                        var c=/[\/>\]})\w]/.test(stream.look(-2));
+                        var c=/[\/>\]})\w]/.test(look(stream, -2));
                         if(!c){
                                 c=stream.eat("r");if(c){
                                 c=stream.eat(/[(\[{<\^'"!~\/]/);
@@ -665,7 +676,7 @@ stream.eatSuffix(2);
                 if(ch=="`"){
                         return tokenChain(stream,state,[ch],"variable-2");}
                 if(ch=="/"){
-                        if(!/~\s*$/.test(stream.prefix()))
+                        if(!/~\s*$/.test(prefix(stream)))
                                 return "operator";
                         else
                                 return tokenChain(stream,state,[ch],RXstyle,RXmodifiers);}
@@ -677,7 +688,7 @@ stream.eatSuffix(2);
                                 stream.pos=p;}
                 if(/[$@%]/.test(ch)){
                         var p=stream.pos;
-                        if(stream.eat("^")&&stream.eat(/[A-Z]/)||!/[@$%&]/.test(stream.look(-2))&&stream.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){
+                        if(stream.eat("^")&&stream.eat(/[A-Z]/)||!/[@$%&]/.test(look(stream, -2))&&stream.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){
                                 var c=stream.current();
                                 if(PERL[c])
                                         return "variable-2";}
@@ -690,7 +701,7 @@ stream.eatSuffix(2);
                                 else
                                         return "variable";}}
                 if(ch=="#"){
-                        if(stream.look(-2)!="$"){
+                        if(look(stream, -2)!="$"){
                                 stream.skipToEnd();
                                 return "comment";}}
                 if(/[:+\-\^*$&%@=<>!?|\/~\.]/.test(ch)){
@@ -702,23 +713,23 @@ stream.eatSuffix(2);
                                 stream.pos=p;}
                 if(ch=="_"){
                         if(stream.pos==1){
-                                if(stream.suffix(6)=="_END__"){
+                                if(suffix(stream, 6)=="_END__"){
                                         return tokenChain(stream,state,['\0'],"comment");}
-                                else if(stream.suffix(7)=="_DATA__"){
+                                else if(suffix(stream, 7)=="_DATA__"){
                                         return tokenChain(stream,state,['\0'],"variable-2");}
-                                else if(stream.suffix(7)=="_C__"){
+                                else if(suffix(stream, 7)=="_C__"){
                                         return tokenChain(stream,state,['\0'],"string");}}}
                 if(/\w/.test(ch)){
                         var p=stream.pos;
-                        if(stream.look(-2)=="{"&&(stream.look(0)=="}"||stream.eatWhile(/\w/)&&stream.look(0)=="}"))
+                        if(look(stream, -2)=="{"&&(look(stream, 0)=="}"||stream.eatWhile(/\w/)&&look(stream, 0)=="}"))
                                 return "string";
                         else
                                 stream.pos=p;}
                 if(/[A-Z]/.test(ch)){
-                        var l=stream.look(-2);
+                        var l=look(stream, -2);
                         var p=stream.pos;
                         stream.eatWhile(/[A-Z_]/);
-                        if(/[\da-z]/.test(stream.look(0))){
+                        if(/[\da-z]/.test(look(stream, 0))){
                                 stream.pos=p;}
                         else{
                                 var c=PERL[stream.current()];
@@ -742,7 +753,7 @@ stream.eatSuffix(2);
                                 else
                                         return "meta";}}
                 if(/[a-zA-Z_]/.test(ch)){
-                        var l=stream.look(-2);
+                        var l=look(stream, -2);
                         stream.eatWhile(/\w/);
                         var c=PERL[stream.current()];
                         if(!c)
@@ -780,37 +791,37 @@ stream.eatSuffix(2);
 CodeMirror.defineMIME("text/x-perl", "perl");
 
 // it's like "peek", but need for look-ahead or look-behind if index < 0
-CodeMirror.StringStream.prototype.look=function(c){
-        return this.string.charAt(this.pos+(c||0));};
+function look(stream, c){
+  return stream.string.charAt(stream.pos+(c||0));
+}
 
 // return a part of prefix of current stream from current position
-CodeMirror.StringStream.prototype.prefix=function(c){
-        if(c){
-                var x=this.pos-c;
-                return this.string.substr((x>=0?x:0),c);}
-        else{
-                return this.string.substr(0,this.pos-1);}};
+function prefix(stream, c){
+  if(c){
+    var x=stream.pos-c;
+    return stream.string.substr((x>=0?x:0),c);}
+  else{
+    return stream.string.substr(0,stream.pos-1);
+  }
+}
 
 // return a part of suffix of current stream from current position
-CodeMirror.StringStream.prototype.suffix=function(c){
-        var y=this.string.length;
-        var x=y-this.pos+1;
-        return this.string.substr(this.pos,(c&&c<y?c:x));};
-
-// return a part of suffix of current stream from current position and change current position
-CodeMirror.StringStream.prototype.nsuffix=function(c){
-        var p=this.pos;
-        var l=c||(this.string.length-this.pos+1);
-        this.pos+=l;
-        return this.string.substr(p,l);};
+function suffix(stream, c){
+  var y=stream.string.length;
+  var x=y-stream.pos+1;
+  return stream.string.substr(stream.pos,(c&&c<y?c:x));
+}
 
 // eating and vomiting a part of stream from current position
-CodeMirror.StringStream.prototype.eatSuffix=function(c){
-        var x=this.pos+c;
-        var y;
-        if(x<=0)
-                this.pos=0;
-        else if(x>=(y=this.string.length-1))
-                this.pos=y;
-        else
-                this.pos=x;};
+function eatSuffix(stream, c){
+  var x=stream.pos+c;
+  var y;
+  if(x<=0)
+    stream.pos=0;
+  else if(x>=(y=stream.string.length-1))
+    stream.pos=y;
+  else
+    stream.pos=x;
+}
+
+});
diff --git a/mode/php/php.js b/mode/php/php.js
index 946f770c9f..7156dbba6f 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -1,4 +1,13 @@
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../clike/clike"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../clike/clike"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
   function keywords(str) {
     var obj = {}, words = str.split(" ");
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
@@ -128,4 +137,4 @@
   CodeMirror.defineMIME("application/x-httpd-php", "php");
   CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
   CodeMirror.defineMIME("text/x-php", phpConfig);
-})();
+});
diff --git a/mode/pig/pig.js b/mode/pig/pig.js
index 4b44e7ccc3..eaf525889c 100644
--- a/mode/pig/pig.js
+++ b/mode/pig/pig.js
@@ -4,6 +4,16 @@
  *      @link   https://github.com/prasanthj/pig-codemirror-2
  *  This implementation is adapted from PL/SQL mode in CodeMirror 2.
  */
+(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("pig", function(_config, parserConfig) {
   var keywords = parserConfig.keywords,
   builtins = parserConfig.builtins,
@@ -169,3 +179,5 @@ CodeMirror.defineMode("pig", function(_config, parserConfig) {
     types: keywords(pTypes)
   });
 }());
+
+});
diff --git a/mode/properties/properties.js b/mode/properties/properties.js
index d3a13c765d..6dfe06f128 100644
--- a/mode/properties/properties.js
+++ b/mode/properties/properties.js
@@ -1,3 +1,13 @@
+(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("properties", function() {
   return {
     token: function(stream, state) {
@@ -61,3 +71,5 @@ CodeMirror.defineMode("properties", function() {
 
 CodeMirror.defineMIME("text/x-properties", "properties");
 CodeMirror.defineMIME("text/x-ini", "properties");
+
+});
diff --git a/mode/python/python.js b/mode/python/python.js
index 8bea5d19d1..36cf951bef 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -1,3 +1,14 @@
+(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("python", function(conf, parserConf) {
     var ERRORCLASS = 'error';
 
@@ -361,14 +372,13 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
 
 CodeMirror.defineMIME("text/x-python", "python");
 
-(function() {
-  "use strict";
-  var words = function(str){return str.split(' ');};
-
-  CodeMirror.defineMIME("text/x-cython", {
-    name: "python",
-    extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
-                          "extern gil include nogil property public"+
-                          "readonly struct union DEF IF ELIF ELSE")
-  });
-})();
+var words = function(str){return str.split(' ');};
+
+CodeMirror.defineMIME("text/x-cython", {
+  name: "python",
+  extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
+                        "extern gil include nogil property public"+
+                        "readonly struct union DEF IF ELIF ELSE")
+});
+
+});
diff --git a/mode/q/q.js b/mode/q/q.js
index 56017e30ad..d6e3b66610 100644
--- a/mode/q/q.js
+++ b/mode/q/q.js
@@ -1,3 +1,13 @@
+(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("q",function(config){
   var indentUnit=config.indentUnit,
       curPunc,
@@ -122,3 +132,5 @@ CodeMirror.defineMode("q",function(config){
   };
 });
 CodeMirror.defineMIME("text/x-q","q");
+
+});
diff --git a/mode/r/r.js b/mode/r/r.js
index 690cf40502..7f4feb238b 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -1,3 +1,13 @@
+(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("r", function(config) {
   function wordObj(str) {
     var words = str.split(" "), res = {};
@@ -143,3 +153,5 @@ CodeMirror.defineMode("r", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-rsrc", "r");
+
+});
diff --git a/mode/rpm/changes/changes.js b/mode/rpm/changes/changes.js
deleted file mode 100644
index 14a08d9700..0000000000
--- a/mode/rpm/changes/changes.js
+++ /dev/null
@@ -1,19 +0,0 @@
-CodeMirror.defineMode("changes", function() {
-  var headerSeperator = /^-+$/;
-  var headerLine = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)  ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /;
-  var simpleEmail = /^[\w+.-]+@[\w.-]+/;
-
-  return {
-    token: function(stream) {
-      if (stream.sol()) {
-        if (stream.match(headerSeperator)) { return 'tag'; }
-        if (stream.match(headerLine)) { return 'tag'; }
-      }
-      if (stream.match(simpleEmail)) { return 'string'; }
-      stream.next();
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-rpm-changes", "changes");
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
deleted file mode 100644
index 18fe7ab7bf..0000000000
--- a/mode/rpm/changes/index.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: RPM changes 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="changes.js"></script>
-    <link rel="stylesheet" href="../../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-
-<div id=nav>
-  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../../index.html">Language modes</a>
-    <li><a class=active href="#">RPM changes</a>
-  </ul>
-</div>
-
-<article>
-<h2>RPM changes mode</h2>
-
-    <div><textarea id="code" name="code">
--------------------------------------------------------------------
-Tue Oct 18 13:58:40 UTC 2011 - misterx@example.com
-
-- Update to r60.3
-- Fixes bug in the reflect package
-  * disallow Interface method on Value obtained via unexported name
-
--------------------------------------------------------------------
-Thu Oct  6 08:14:24 UTC 2011 - misterx@example.com
-
-- Update to r60.2
-- Fixes memory leak in certain map types
-
--------------------------------------------------------------------
-Wed Oct  5 14:34:10 UTC 2011 - misterx@example.com
-
-- Tweaks for gdb debugging
-- go.spec changes:
-  - move %go_arch definition to %prep section
-  - pass correct location of go specific gdb pretty printer and
-    functions to cpp as HOST_EXTRA_CFLAGS macro
-  - install go gdb functions & printer
-- gdb-printer.patch
-  - patch linker (src/cmd/ld/dwarf.c) to emit correct location of go
-    gdb functions and pretty printer
-</textarea></div>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "changes"},
-        lineNumbers: true,
-        indentUnit: 4,
-        tabMode: "shift"
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-rpm-changes</code>.</p>
-</article>
diff --git a/mode/rpm/spec/index.html b/mode/rpm/index.html
similarity index 60%
rename from mode/rpm/spec/index.html
rename to mode/rpm/index.html
index 127b72ee9d..4257bc77e3 100644
--- a/mode/rpm/spec/index.html
+++ b/mode/rpm/index.html
@@ -1,34 +1,71 @@
 <!doctype html>
 
-<title>CodeMirror: RPM spec mode</title>
+<title>CodeMirror: RPM changes 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="spec.js"></script>
-    <link rel="stylesheet" href="spec.css">
-    <link rel="stylesheet" href="../../../doc/docs.css">
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="rpm.js"></script>
+    <link rel="stylesheet" href="../../doc/docs.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><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="../../index.html">Home</a>
+    <li><a href="../../doc/manual.html">Manual</a>
     <li><a href="https://github.com/marijnh/codemirror">Code</a>
   </ul>
   <ul>
-    <li><a href="../../index.html">Language modes</a>
-    <li><a class=active href="#">RPM spec</a>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">RPM</a>
   </ul>
 </div>
 
 <article>
+<h2>RPM changes mode</h2>
+
+    <div><textarea id="code" name="code">
+-------------------------------------------------------------------
+Tue Oct 18 13:58:40 UTC 2011 - misterx@example.com
+
+- Update to r60.3
+- Fixes bug in the reflect package
+  * disallow Interface method on Value obtained via unexported name
+
+-------------------------------------------------------------------
+Thu Oct  6 08:14:24 UTC 2011 - misterx@example.com
+
+- Update to r60.2
+- Fixes memory leak in certain map types
+
+-------------------------------------------------------------------
+Wed Oct  5 14:34:10 UTC 2011 - misterx@example.com
+
+- Tweaks for gdb debugging
+- go.spec changes:
+  - move %go_arch definition to %prep section
+  - pass correct location of go specific gdb pretty printer and
+    functions to cpp as HOST_EXTRA_CFLAGS macro
+  - install go gdb functions & printer
+- gdb-printer.patch
+  - patch linker (src/cmd/ld/dwarf.c) to emit correct location of go
+    gdb functions and pretty printer
+</textarea></div>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "rpm-changes"},
+        lineNumbers: true,
+        indentUnit: 4,
+        tabMode: "shift"
+      });
+    </script>
+
 <h2>RPM spec mode</h2>
     
-    <div><textarea id="code" name="code">
+    <div><textarea id="code2" name="code2">
 #
 # spec file for package minidlna
 #
@@ -102,13 +139,12 @@ <h2>RPM spec mode</h2>
 
 %changelog</textarea></div>
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "spec"},
+      var editor = CodeMirror.fromTextArea(document.getElementById("code2"), {
+        mode: {name: "rpm-spec"},
         lineNumbers: true,
         indentUnit: 4
       });
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-rpm-spec</code>.</p>
-
+    <p><strong>MIME types defined:</strong> <code>text/x-rpm-spec</code>, <code>text/x-rpm-changes</code>.</p>
 </article>
diff --git a/mode/rpm/spec/spec.js b/mode/rpm/rpm.js
similarity index 70%
rename from mode/rpm/spec/spec.js
rename to mode/rpm/rpm.js
index 0fab6c4891..497997c4ff 100644
--- a/mode/rpm/spec/spec.js
+++ b/mode/rpm/rpm.js
@@ -1,6 +1,36 @@
+(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("rpm-changes", function() {
+  var headerSeperator = /^-+$/;
+  var headerLine = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)  ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /;
+  var simpleEmail = /^[\w+.-]+@[\w.-]+/;
+
+  return {
+    token: function(stream) {
+      if (stream.sol()) {
+        if (stream.match(headerSeperator)) { return 'tag'; }
+        if (stream.match(headerLine)) { return 'tag'; }
+      }
+      if (stream.match(simpleEmail)) { return 'string'; }
+      stream.next();
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-rpm-changes", "rpm-changes");
+
 // Quick and dirty spec file highlighting
 
-CodeMirror.defineMode("spec", function() {
+CodeMirror.defineMode("rpm-spec", function() {
   var arch = /^(i386|i586|i686|x86_64|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
 
   var preamble = /^(Name|Version|Release|License|Summary|Url|Group|Source|BuildArch|BuildRequires|BuildRoot|AutoReqProv|Provides|Requires(\(\w+\))?|Obsoletes|Conflicts|Recommends|Source\d*|Patch\d*|ExclusiveArch|NoSource|Supplements):/;
@@ -63,4 +93,6 @@ CodeMirror.defineMode("spec", function() {
   };
 });
 
-CodeMirror.defineMIME("text/x-rpm-spec", "spec");
+CodeMirror.defineMIME("text/x-rpm-spec", "rpm-spec");
+
+});
diff --git a/mode/rpm/spec/spec.css b/mode/rpm/spec/spec.css
deleted file mode 100644
index d0a5d430ca..0000000000
--- a/mode/rpm/spec/spec.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.cm-s-default span.cm-preamble {color: #b26818; font-weight: bold;}
-.cm-s-default span.cm-macro {color: #b218b2;}
-.cm-s-default span.cm-section {color: green; font-weight: bold;}
-.cm-s-default span.cm-script {color: red;}
-.cm-s-default span.cm-issue {color: yellow;}
diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 75563ba982..c53cbc36e8 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -1,3 +1,13 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../python/python"), require("../stex/stex"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../python/python", "../stex/stex"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode('rst-base', function (config) {
 
     ///////////////////////////////////////////////////////////////////////////
@@ -558,3 +568,5 @@ CodeMirror.defineMIME('text/x-rst', 'rst');
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
+
+});
diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 1cdc9a4e43..8ee9eec707 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -1,3 +1,13 @@
+(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("ruby", function(config) {
   function wordObj(words) {
     var o = {};
@@ -247,3 +257,4 @@ CodeMirror.defineMode("ruby", function(config) {
 
 CodeMirror.defineMIME("text/x-ruby", "ruby");
 
+});
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index c7530b6cc6..2e6e20b231 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -1,3 +1,13 @@
+(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("rust", function() {
   var indentUnit = 4, altIndentUnit = 2;
   var valKeywords = {
@@ -434,3 +444,5 @@ CodeMirror.defineMode("rust", function() {
 });
 
 CodeMirror.defineMIME("text/x-rustsrc", "rust");
+
+});
diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 9c9a0dae07..74ae91db12 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -1,3 +1,13 @@
+(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("sass", function(config) {
   var tokenRegexp = function(words){
     return new RegExp("^" + words.join("|"));
@@ -328,3 +338,5 @@ CodeMirror.defineMode("sass", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-sass", "sass");
+
+});
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index c5990ae92c..7124f7283b 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -1,6 +1,17 @@
 /**
  * Author: Koh Zi Han, based on implementation by Koh Zi Chun
  */
+
+(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("scheme", function () {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
         ATOM = "atom", NUMBER = "number", BRACKET = "bracket";
@@ -230,3 +241,5 @@ CodeMirror.defineMode("scheme", function () {
 });
 
 CodeMirror.defineMIME("text/x-scheme", "scheme");
+
+});
diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index abfd214454..7753411c98 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -1,3 +1,13 @@
+(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('shell', function() {
 
   var words = {};
@@ -116,3 +126,5 @@ CodeMirror.defineMode('shell', function() {
 });
 
 CodeMirror.defineMIME('text/x-sh', 'shell');
+
+});
diff --git a/mode/sieve/sieve.js b/mode/sieve/sieve.js
index 8ca2a4cb82..8256dda0a4 100644
--- a/mode/sieve/sieve.js
+++ b/mode/sieve/sieve.js
@@ -1,7 +1,12 @@
-/*
- * See LICENSE in this directory for the license under which this code
- * is released.
- */
+(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("sieve", function(config) {
   function words(str) {
@@ -181,3 +186,5 @@ CodeMirror.defineMode("sieve", function(config) {
 });
 
 CodeMirror.defineMIME("application/sieve", "sieve");
+
+});
diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index 86f749b310..deb78a4f7a 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -1,3 +1,13 @@
+(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('smalltalk', function(config) {
 
   var specialChars = /[+\-\/\\*~<>=@%|&?!.,:;^]/;
@@ -151,3 +161,5 @@ CodeMirror.defineMode('smalltalk', function(config) {
 });
 
 CodeMirror.defineMIME('text/x-stsrc', {name: 'smalltalk'});
+
+});
diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 826c2b966c..2a78c6d394 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -1,6 +1,17 @@
 /**
  * Smarty 2 and 3 mode.
  */
+
+(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("smarty", function(config) {
   "use strict";
 
@@ -203,3 +214,5 @@ CodeMirror.defineMode("smarty", function(config) {
 });
 
 CodeMirror.defineMIME("text/x-smarty", "smarty");
+
+});
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
index 48dd1a6752..7e5e12c0ec 100644
--- a/mode/smartymixed/smartymixed.js
+++ b/mode/smartymixed/smartymixed.js
@@ -5,6 +5,17 @@
 * @version 3.0
 * @date 05.07.2013
 */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../smarty/smarty"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../smarty/smarty"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
 CodeMirror.defineMode("smartymixed", function(config) {
   var settings, regs, helpers, parsers,
   htmlMixedMode = CodeMirror.getMode(config, "htmlmixed"),
@@ -166,8 +177,9 @@ CodeMirror.defineMode("smartymixed", function(config) {
       };
     }
   };
-},
-"htmlmixed");
+}, "htmlmixed", "smarty");
 
 CodeMirror.defineMIME("text/x-smarty", "smartymixed");
 // vim: et ts=2 sts=2 sw=2
+
+});
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 0329057f69..f228b1dffe 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -1,3 +1,13 @@
+(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("sparql", function(config) {
   var indentUnit = config.indentUnit;
   var curPunc;
@@ -143,3 +153,5 @@ CodeMirror.defineMode("sparql", function(config) {
 });
 
 CodeMirror.defineMIME("application/x-sparql-query", "sparql");
+
+});
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 903fa6740a..c43285f338 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -1,3 +1,13 @@
+(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("sql", function(config, parserConfig) {
   "use strict";
 
@@ -334,6 +344,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   });
 }());
 
+});
+
 /*
   How Properties of Mime Types are used by SQL Mode
   =================================================
diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index ca04c24f22..59a395a0fe 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -3,6 +3,16 @@
  * Licence: MIT
  */
 
+(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("stex", function() {
     "use strict";
 
@@ -244,3 +254,5 @@ CodeMirror.defineMode("stex", function() {
 
 CodeMirror.defineMIME("text/x-stex", "stex");
 CodeMirror.defineMIME("text/x-latex", "stex");
+
+});
diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index ed2c697217..4c29ee7d98 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -1,4 +1,15 @@
 //tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
+
+(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("tcl", function() {
   function parseWords(str) {
     var obj = {}, words = str.split(" ");
@@ -129,3 +140,5 @@ CodeMirror.defineMode("tcl", function() {
     };
 });
 CodeMirror.defineMIME("text/x-tcl", "tcl");
+
+});
diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index 24a24786bc..ecd1d173c0 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -14,6 +14,17 @@
     CoreVersion parameter is needed for TiddlyWiki only!
 ***/
 //{{{
+
+(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("tiddlywiki", function () {
   // Tokenizer
   var textwords = {};
@@ -350,4 +361,6 @@ CodeMirror.defineMode("tiddlywiki", function () {
 });
 
 CodeMirror.defineMIME("text/x-tiddlywiki", "tiddlywiki");
+});
+
 //}}}
diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index e789163dc7..eb9a893fde 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -1,3 +1,13 @@
+(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('tiki', function(config) {
   function inBlock(style, terminator, returnTokenizer) {
     return function(stream, state) {
@@ -306,3 +316,5 @@ return {
 });
 
 CodeMirror.defineMIME("text/tiki", "tiki");
+
+});
diff --git a/mode/toml/toml.js b/mode/toml/toml.js
index 1d163f13bf..552dd57b08 100644
--- a/mode/toml/toml.js
+++ b/mode/toml/toml.js
@@ -1,3 +1,13 @@
+(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("toml", function () {
   return {
     startState: function () {
@@ -69,3 +79,5 @@ CodeMirror.defineMode("toml", function () {
 });
 
 CodeMirror.defineMIME('text/x-toml', 'toml');
+
+});
diff --git a/mode/turtle/turtle.js b/mode/turtle/turtle.js
index e118bfbced..de9fc2b6c7 100644
--- a/mode/turtle/turtle.js
+++ b/mode/turtle/turtle.js
@@ -1,3 +1,13 @@
+(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("turtle", function(config) {
   var indentUnit = config.indentUnit;
   var curPunc;
@@ -143,3 +153,5 @@ CodeMirror.defineMode("turtle", function(config) {
 });
 
 CodeMirror.defineMIME("text/turtle", "turtle");
+
+});
diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 27b2271951..4fd80210fb 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -1,3 +1,13 @@
+(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("vb", function(conf, parserConf) {
     var ERRORCLASS = 'error';
 
@@ -257,3 +267,5 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
 });
 
 CodeMirror.defineMIME("text/x-vb", "vb");
+
+});
diff --git a/mode/vbscript/vbscript.js b/mode/vbscript/vbscript.js
index 0a97fb6405..4be7c7f2bb 100644
--- a/mode/vbscript/vbscript.js
+++ b/mode/vbscript/vbscript.js
@@ -8,6 +8,17 @@ E.G.:
         isASP: true
       });
 */
+
+(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("vbscript", function(conf, parserConf) {
     var ERRORCLASS = 'error';
 
@@ -332,3 +343,5 @@ CodeMirror.defineMode("vbscript", function(conf, parserConf) {
 });
 
 CodeMirror.defineMIME("text/vbscript", "vbscript");
+
+});
diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index 968d8799e9..b64636bb43 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -1,3 +1,13 @@
+(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("velocity", function() {
     function parseWords(str) {
         var obj = {}, words = str.split(" ");
@@ -184,3 +194,5 @@ CodeMirror.defineMode("velocity", function() {
 });
 
 CodeMirror.defineMIME("text/velocity", "velocity");
+
+});
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 708de23f49..bc4fd4feee 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -1,3 +1,13 @@
+(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("verilog", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       keywords = parserConfig.keywords || {},
@@ -146,7 +156,6 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   };
 });
 
-(function() {
   function words(str) {
     var obj = {}, words = str.split(" ");
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
@@ -179,4 +188,5 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     atoms: words("null"),
     hooks: {"`": metaHook, "$": metaHook}
   });
-}());
+
+});
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 96b51ff970..2e62b88346 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -1,3 +1,13 @@
+(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("xml", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
@@ -330,3 +340,5 @@ CodeMirror.defineMIME("text/xml", "xml");
 CodeMirror.defineMIME("application/xml", "xml");
 if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
   CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
+
+});
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index be17984635..2c7faf425a 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -1,3 +1,13 @@
+(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("xquery", function() {
 
   // The keywords object is set to the result of this self executing
@@ -430,3 +440,5 @@ CodeMirror.defineMode("xquery", function() {
 });
 
 CodeMirror.defineMIME("application/xquery", "xquery");
+
+});
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index efacd7d563..f7b3a90c03 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -1,3 +1,13 @@
+(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("yaml", function() {
 
   var cons = ['true', 'false', 'on', 'off', 'yes', 'no'];
@@ -95,3 +105,5 @@ CodeMirror.defineMode("yaml", function() {
 });
 
 CodeMirror.defineMIME("text/x-yaml", "yaml");
+
+});
diff --git a/mode/z80/z80.js b/mode/z80/z80.js
index ff43d32b52..c778803072 100644
--- a/mode/z80/z80.js
+++ b/mode/z80/z80.js
@@ -1,3 +1,13 @@
+(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('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;
@@ -83,3 +93,5 @@ CodeMirror.defineMode('z80', function() {
 });
 
 CodeMirror.defineMIME("text/x-z80", "z80");
+
+});

From 3e7781d99e330f24e07039735cb11b9647a17c29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 22:57:32 +0100
Subject: [PATCH 0831/4742] [javascript, xml, haxe modes] Fix strict-mode
 violations

---
 mode/haxe/haxe.js             | 5 +++--
 mode/javascript/javascript.js | 5 +++--
 mode/xml/xml.js               | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 3f78a8d674..53d7b1d159 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -245,11 +245,12 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
   poplex.lex = true;
 
   function expect(wanted) {
-    return function(type) {
+    function f(type) {
       if (type == wanted) return cont();
       else if (wanted == ";") return pass();
-      else return cont(arguments.callee);
+      else return cont(f);
     };
+    return f;
   }
 
   function statement(type) {
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 8d6035de2c..290c31fa6c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -305,11 +305,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   poplex.lex = true;
 
   function expect(wanted) {
-    return function(type) {
+    function exp(type) {
       if (type == wanted) return cont();
       else if (wanted == ";") return pass();
-      else return cont(arguments.callee);
+      else return cont(exp);
     };
+    return exp;
   }
 
   function statement(type, value) {
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 2e62b88346..ea5fe61b13 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -229,6 +229,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       return baseState;
     }
   }
+
   function closeState(type, _stream, state) {
     if (type != "endTag") {
       setStyle = "error";

From 90450a9ee98dd6363b115c5524d8ab659836b13d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 23:10:02 +0100
Subject: [PATCH 0832/4742] Fix bug in triple-click handling

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c4adf99f65..61a87538df 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1928,7 +1928,7 @@
           if (type == "double")
             var range = findWordAt(getLine(doc, pos.line).text, pos);
           else
-            var range = {from: Pos(pos.line, 0), to: clipPos(pos.line + 1, 0)};
+            var range = {from: Pos(pos.line, 0), to: clipPos(doc, Pos(pos.line + 1, 0))};
           if (cmp(range.from, anchor) < 0) {
             head = range.from;
             anchor = maxPos(oldRange.to(), range.to);

From 269e3ff963df837b5e054060e48b6f20e5cc67a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 Nov 2013 23:10:49 +0100
Subject: [PATCH 0833/4742] Get rid of stray remaining copyPos call

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 61a87538df..f1a471029d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5230,7 +5230,7 @@
       else if (start == "anchor") pos = range.anchor;
       else if (start == "end" || start == "to" || start === false) pos = range.to();
       else pos = range.from();
-      return copyPos(pos);
+      return pos;
     },
     listSelections: function() { return this.sel.ranges; },
     somethingSelected: function() {return this.sel.somethingSelected();},

From 7090abb14c1be99e54a40dcdaf9c862cf4623fcd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Nov 2013 13:36:50 +0100
Subject: [PATCH 0834/4742] Define 'singleSelection' command, bind Esc to it by
 default

Issue #778
---
 keymap/multiselect.js | 5 -----
 lib/codemirror.js     | 6 +++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/keymap/multiselect.js b/keymap/multiselect.js
index 46379484a6..c258685ae3 100644
--- a/keymap/multiselect.js
+++ b/keymap/multiselect.js
@@ -36,11 +36,6 @@
     cm.addSelection(cur.from(), cur.to());
   };
 
-  // Go to a single selection
-  pc["Alt-Esc"] = mac["Alt-Esc"] = function(cm) {
-    cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"));
-  };
-
   // Select matching parts of current selection
   var dialogText = 'Match: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp)</span>';
   pc["Alt-F"] = mac["Alt-F"] = function(cm) {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index f1a471029d..6e4bf30ba8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3760,6 +3760,9 @@
 
   var commands = CodeMirror.commands = {
     selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()));},
+    singleSelection: function(cm) {
+      cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"));
+    },
     killLine: function(cm) {
       deleteNearSelection(cm, function(range) {
         if (range.empty()) {
@@ -3879,7 +3882,8 @@
     "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
     "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
     "Tab": "defaultTab", "Shift-Tab": "indentAuto",
-    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite"
+    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
+    "Esc": "singleSelection"
   };
   // Note that the save and find-related commands aren't defined by
   // default. Unknown commands are simply ignored.

From 25278eaf7285e6c770378f56e2aa17c78f35f8e9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Nov 2013 13:38:09 +0100
Subject: [PATCH 0835/4742] [multiselect demo] Update binding list to reflect
 new Esc binding

---
 demo/multiselect.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/multiselect.html b/demo/multiselect.html
index 3babdb9353..aff0aebeb8 100644
--- a/demo/multiselect.html
+++ b/demo/multiselect.html
@@ -38,7 +38,7 @@ <h2>Multiple Selection Keybindings</h2>
 Ctrl-D / Cmd-D:
   Add next occurrence of current selection as another selection.
 
-Alt-Esc / Alt-Esc:
+Esc:
   Deselect all but the primary selection.
 
 Alt-F:

From 59941dadc24891303afd104b9327f8bf5fce17cc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 16 Nov 2013 10:56:58 +0100
Subject: [PATCH 0836/4742] Check for empty history in setSelectionAddToHistory

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6e4bf30ba8..ad4fdabee7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2734,7 +2734,8 @@
 
   function setSelectionAddToHistory(doc, sel) {
     setSelection(doc, sel);
-    lst(doc.history.done).selAfter = sel;
+    var lstSel = lst(doc.history.done);
+    if (lstSel) lstSel.selAfter = sel;
   }
 
   function filterSelectionChange(doc, sel) {

From 6d14685784908e76cdbebd542bea3a33ed7e2409 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 19 Nov 2013 19:03:19 +0100
Subject: [PATCH 0837/4742] Fix right-click menu

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ad4fdabee7..c4ddc491ac 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2349,8 +2349,8 @@
     // Reset the current text selection only if the click is done outside of the selection
     // and 'resetSelectionOnContextMenu' option is true.
     var reset = cm.options.resetSelectionOnContextMenu;
-    if (reset && !cm.doc.sel.contains(pos) > -1)
-      operation(cm, setSelection)(cm.doc, pos, pos);
+    if (reset && cm.doc.sel.contains(pos) == -1)
+      operation(cm, setSelection)(cm.doc, simpleSelection(pos));
 
     var oldCSS = display.input.style.cssText;
     display.inputDiv.style.position = "absolute";

From 25aee733d7a8af3cb1e31f19496ed4274b13afa4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 25 Nov 2013 16:23:53 +0100
Subject: [PATCH 0838/4742] Remove stray call to ES5-style indexOf

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c4ddc491ac..22860064a4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -821,7 +821,7 @@
   function normalizeSelection(ranges, primIndex) {
     var prim = ranges[primIndex];
     ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
-    primIndex = ranges.indexOf(prim);
+    primIndex = indexOf(ranges, prim);
     for (var i = 1; i < ranges.length; i++) {
       var cur = ranges[i], prev = ranges[i - 1];
       if (cmp(prev.to(), cur.from()) >= 0) {

From 07a8e563d6e5d960346e8ee03f8cdd50a3b05f37 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 29 Nov 2013 21:51:16 +0100
Subject: [PATCH 0839/4742] [gfm and rst modes] Mark dependencies on overlay
 addon

Closes #2015
---
 mode/gfm/gfm.js | 4 ++--
 mode/rst/rst.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 7bd5f5ab42..8fcc9f70a7 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -1,8 +1,8 @@
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../markdown/markdown"));
+    mod(require("../../lib/codemirror"), require("../markdown/markdown"), require("../../addon/mode/overlay"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../markdown/markdown"], mod);
+    define(["../../lib/codemirror", "../markdown/markdown", "../../addon/mode/overlay"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index c53cbc36e8..01c6a05650 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -1,8 +1,8 @@
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../python/python"), require("../stex/stex"));
+    mod(require("../../lib/codemirror"), require("../python/python"), require("../stex/stex"), require("../../addon/mode/overlay"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../python/python", "../stex/stex"], mod);
+    define(["../../lib/codemirror", "../python/python", "../stex/stex", "../../addon/mode/overlay"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {

From 0014d6621c986ebb06afebf8a2a751b855835da8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Dec 2013 18:53:26 +0100
Subject: [PATCH 0840/4742] Fix unintended change in anchor/head orientation on
 double-click

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 22860064a4..3c790f88e9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1929,12 +1929,12 @@
             var range = findWordAt(getLine(doc, pos.line).text, pos);
           else
             var range = {from: Pos(pos.line, 0), to: clipPos(doc, Pos(pos.line + 1, 0))};
-          if (cmp(range.from, anchor) < 0) {
-            head = range.from;
-            anchor = maxPos(oldRange.to(), range.to);
-          } else {
+          if (cmp(range.to, anchor) > 0) {
             head = range.to;
             anchor = minPos(oldRange.from(), range.from);
+          } else {
+            head = range.from;
+            anchor = maxPos(oldRange.to(), range.to);
           }
         }
         var ranges = startSel.ranges.slice(0);

From c35d06a8d5a4070f64cf05e356f7679e947646d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Dec 2013 13:51:28 +0100
Subject: [PATCH 0841/4742] Remove onDragEvent and onKeyEvent options

---
 doc/manual.html     | 37 +------------------------------------
 doc/upgrade_v4.html |  8 +++++---
 lib/codemirror.js   | 21 +++++----------------
 3 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 9a2424eb48..88ed81ef70 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -361,38 +361,6 @@ <h2>Configuration</h2>
       <dt id="option_dragDrop"><code><strong>dragDrop</strong>: boolean</code></dt>
       <dd>Controls whether drag-and-drop is enabled. On by default.</dd>
 
-      <dt id="option_onDragEvent"><code><strong>onDragEvent</strong>: function(instance: CodeMirror, event: Event) → boolean</code></dt>
-      <dd><em>Deprecated! See <a href="#event_dom">these</a> event
-      handlers for the current recommended approach.</em><br>When given,
-      this will be called when the editor is handling
-      a <code>dragenter</code>, <code>dragover</code>,
-      or <code>drop</code> event. It will be passed the editor
-      instance and the event object as arguments. The callback can
-      choose to handle the event itself, in which case it should
-      return <code>true</code> to indicate that CodeMirror should not
-      do anything further.</dd>
-
-      <dt id="option_onKeyEvent"><code><strong>onKeyEvent</strong>: function(instance: CodeMirror, event: Event) → boolean</code></dt>
-      <dd><em>Deprecated! See <a href="#event_dom">these</a> event
-      handlers for the current recommended approach.</em><br>This
-      provides a rather low-level hook into CodeMirror's key handling.
-      If provided, this function will be called on
-      every <code>keydown</code>, <code>keyup</code>,
-      and <code>keypress</code> event that CodeMirror captures. It
-      will be passed two arguments, the editor instance and the key
-      event. This key event is pretty much the raw key event, except
-      that a <code>stop()</code> method is always added to it. You
-      could feed it to, for example, <code>jQuery.Event</code> to
-      further normalize it.<br>This function can inspect the key
-      event, and handle it if it wants to. It may return true to tell
-      CodeMirror to ignore the event. Be wary that, on some browsers,
-      stopping a <code>keydown</code> does not stop
-      the <code>keypress</code> from firing, whereas on others it
-      does. If you respond to an event, you should probably inspect
-      its <code>type</code> property and only do something when it
-      is <code>keydown</code> (or <code>keypress</code> for actions
-      that need character data).</dd>
-
       <dt id="option_cursorBlinkRate"><code><strong>cursorBlinkRate</strong>: number</code></dt>
       <dd>Half-period in milliseconds used for cursor blinking. The default blink
       rate is 530ms. By setting this to zero, blinking can be disabled.</dd>
@@ -414,16 +382,13 @@ <h2>Configuration</h2>
       click outside of the current selection, the cursor is moved to
       the point of the click. Defaults to <code>true</code>.</dd>
 
-      <dt id="option_workTime"><code><strong>workTime</strong>, <strong>workDelay</strong>: number</code></dt>
+      <dt id="option_workTime"><code id="option_wordkDelay"><strong>workTime</strong>, <strong>workDelay</strong>: number</code></dt>
       <dd>Highlighting is done by a pseudo background-thread that will
       work for <code>workTime</code> milliseconds, and then use
       timeout to sleep for <code>workDelay</code> milliseconds. The
       defaults are 200 and 300, you can change these options to make
       the highlighting more or less aggressive.</dd>
 
-      <dt id="option_workDelay"><code><strong>workDelay</strong>: number</code></dt>
-      <dd>See <a href="#option_workTime"><code>workTime</code></a>.</dd>
-
       <dt id="option_pollInterval"><code><strong>pollInterval</strong>: number</code></dt>
       <dd>Indicates how quickly CodeMirror should poll its input
       textarea for changes (when focused). Most input is captured by
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index d390228682..55dbbda305 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -82,10 +82,12 @@ <h2 id=upgrade>Upgrading to version 4</h2>
 
 <section id=deprecated><h2>Deprecated interfaces dropped</h2>
 
-<p>A few properties that have been deprecated for a while are now
-gone. Most notably, the names for folding and completing functions
+<p>A few properties and methods that have been deprecated for a while
+are now gone. Most notably, the <code>onKeyEvent</code> and <code>onDragEvent</code> options (use the corresponding <a href="manual.html#event_dom">events</a> instead).</p>
+
+<p>The long names for folding and completing functions
 (<code>CodeMirror.braceRangeFinder</code>, <code>CodeMirror.javascriptHint</code>,
-etc) are now gone
+etc) are also gone
 (use <code>CodeMirror.fold.brace</code>, <code>CodeMirror.hint.javascript</code>).</p>
 
 <p>The <code>className</code> property in the return value
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3c790f88e9..aaa989dfc6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1719,7 +1719,7 @@
     setTimeout(unregister, 5000);
 
     on(d.input, "keyup", operation(cm, function(e) {
-      if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
+      if (signalDOMEvent(cm, e)) return;
       if (e.keyCode == 16) cm.display.shift = false;
     }));
     on(d.input, "input", function() {
@@ -1732,7 +1732,7 @@
     on(d.input, "blur", bind(onBlur, cm));
 
     function drag_(e) {
-      if (signalDOMEvent(cm, e) || cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))) return;
+      if (signalDOMEvent(cm, e)) return;
       e_stop(e);
     }
     if (cm.options.dragDrop) {
@@ -2030,7 +2030,7 @@
 
   function onDrop(e) {
     var cm = this;
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e) || (cm.options.onDragEvent && cm.options.onDragEvent(cm, addStop(e))))
+    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
       return;
     e_preventDefault(e);
     if (ie) lastDrop = +new Date;
@@ -2285,12 +2285,11 @@
   function onKeyDown(e) {
     var cm = this;
     if (!cm.state.focused) onFocus(cm);
-    if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
+    if (signalDOMEvent(cm, e)) return;
     if (old_ie && e.keyCode == 27) e.returnValue = false;
     var code = e.keyCode;
     // IE does strange things with escape.
     cm.display.shift = code == 16 || e.shiftKey;
-    // First give onKeyEvent option a chance to handle this.
     var handled = handleKeyBinding(cm, e);
     if (opera) {
       lastStoppedKey = handled ? code : null;
@@ -2302,7 +2301,7 @@
 
   function onKeyPress(e) {
     var cm = this;
-    if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
+    if (signalDOMEvent(cm, e)) return;
     var keyCode = e.keyCode, charCode = e.charCode;
     if (opera && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
     if (((opera && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
@@ -3576,9 +3575,6 @@
   option("keyMap", "default", keyMapChanged);
   option("extraKeys", null);
 
-  option("onKeyEvent", null);
-  option("onDragEvent", null);
-
   option("lineWrapping", false, wrappingChanged, true);
   option("gutters", [], function(cm) {
     setGuttersForLineNumbers(cm.options);
@@ -5738,13 +5734,6 @@
 
   // EVENT OPERATORS
 
-  function stopMethod() {e_stop(this);}
-  // Ensure an event has a stop method.
-  function addStop(event) {
-    if (!event.stop) event.stop = stopMethod;
-    return event;
-  }
-
   function e_preventDefault(e) {
     if (e.preventDefault) e.preventDefault();
     else e.returnValue = false;

From 06220807ee4d80f7142ff3c343a360d19b4b74a5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Dec 2013 16:12:13 +0100
Subject: [PATCH 0842/4742] Change TextMarker.find to allow more control over
 result

And use this to cut some indirection in its callers.
---
 lib/codemirror.js | 111 ++++++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 53 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index aaa989dfc6..5996ecb111 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -283,19 +283,19 @@
     gutters.style.display = i ? "" : "none";
   }
 
-  function lineLength(doc, line) {
+  function lineLength(line) {
     if (line.height == 0) return 0;
     var len = line.text.length, merged, cur = line;
     while (merged = collapsedSpanAtStart(cur)) {
-      var found = merged.find();
-      cur = getLine(doc, found.from.line);
+      var found = merged.find(0, true);
+      cur = found.from.line;
       len += found.from.ch - found.to.ch;
     }
     cur = line;
     while (merged = collapsedSpanAtEnd(cur)) {
-      var found = merged.find();
+      var found = merged.find(0, true);
       len -= cur.text.length - found.from.ch;
-      cur = getLine(doc, found.to.line);
+      cur = found.to.line;
       len += cur.text.length - found.to.ch;
     }
     return len;
@@ -304,10 +304,10 @@
   function computeMaxLength(cm) {
     var d = cm.display, doc = cm.doc;
     d.maxLine = getLine(doc, doc.first);
-    d.maxLineLength = lineLength(doc, d.maxLine);
+    d.maxLineLength = lineLength(d.maxLine);
     d.maxLineChanged = true;
     doc.iter(function(line) {
-      var len = lineLength(doc, line);
+      var len = lineLength(line);
       if (len > d.maxLineLength) {
         d.maxLineLength = len;
         d.maxLine = line;
@@ -489,7 +489,7 @@
     if (display.showingFrom < from && from - display.showingFrom < 20) from = Math.max(doc.first, display.showingFrom);
     if (display.showingTo > to && display.showingTo - to < 20) to = Math.min(end, display.showingTo);
     if (sawCollapsedSpans) {
-      from = lineNo(visualLine(doc, getLine(doc, from)));
+      from = lineNo(visualLine(getLine(doc, from)));
       while (to < end && lineIsHidden(doc, getLine(doc, to))) ++to;
     }
 
@@ -506,7 +506,7 @@
       for (var i = 0; i < intact.length; ++i) {
         var range = intact[i], merged;
         while (merged = collapsedSpanAtEnd(getLine(doc, range.to - 1))) {
-          var newTo = merged.find().from.line;
+          var newTo = merged.find(-1).line;
           if (newTo > range.from) range.to = newTo;
           else { intact.splice(i--, 1); break; }
         }
@@ -577,7 +577,7 @@
   }
 
   function updateViewOffset(cm) {
-    var off = cm.display.viewOffset = heightAtLine(cm, getLine(cm.doc, cm.display.showingFrom));
+    var off = cm.display.viewOffset = heightAtLine(getLine(cm.doc, cm.display.showingFrom));
     // Position the mover div to align with the current virtual scroll position
     cm.display.mover.style.top = off + "px";
   }
@@ -951,7 +951,7 @@
       drawForLine(sFrom.line, sFrom.ch, sTo.ch);
     } else {
       var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
-      var singleVLine = visualLine(doc, fromLine) == visualLine(doc, toLine);
+      var singleVLine = visualLine(fromLine) == visualLine(toLine);
       var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length : null).end;
       var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
       if (singleVLine) {
@@ -1258,7 +1258,7 @@
     }
     if (context == "line") return rect;
     if (!context) context = "local";
-    var yOff = heightAtLine(cm, lineObj);
+    var yOff = heightAtLine(lineObj);
     if (context == "local") yOff += paddingTop(cm.display);
     else yOff -= cm.display.viewOffset;
     if (context == "page" || context == "window") {
@@ -1337,25 +1337,25 @@
     var doc = cm.doc;
     y += cm.display.viewOffset;
     if (y < 0) return PosWithInfo(doc.first, 0, true, -1);
-    var lineNo = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
-    if (lineNo > last)
+    var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
+    if (lineN > last)
       return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);
     if (x < 0) x = 0;
 
+    var lineObj = getLine(doc, lineN);
     for (;;) {
-      var lineObj = getLine(doc, lineNo);
-      var found = coordsCharInner(cm, lineObj, lineNo, x, y);
+      var found = coordsCharInner(cm, lineObj, lineN, x, y);
       var merged = collapsedSpanAtEnd(lineObj);
-      var mergedPos = merged && merged.find();
+      var mergedPos = merged && merged.find(0, true);
       if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
-        lineNo = mergedPos.to.line;
+        lineN = lineNo(lineObj = mergedPos.to.line);
       else
         return found;
     }
   }
 
   function coordsCharInner(cm, lineObj, lineNo, x, y) {
-    var innerOff = y - heightAtLine(cm, lineObj);
+    var innerOff = y - heightAtLine(lineObj);
     var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
     var measurement = measureLine(cm, lineObj);
 
@@ -2601,7 +2601,7 @@
 
     var recomputeMaxLength = false, checkWidthStart = from.line;
     if (!cm.options.lineWrapping) {
-      checkWidthStart = lineNo(visualLine(doc, getLine(doc, from.line)));
+      checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
       doc.iter(checkWidthStart, to.line + 1, function(line) {
         if (line == display.maxLine) {
           recomputeMaxLength = true;
@@ -2617,7 +2617,7 @@
 
     if (!cm.options.lineWrapping) {
       doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
-        var len = lineLength(doc, line);
+        var len = lineLength(line);
         if (len > display.maxLineLength) {
           display.maxLine = line;
           display.maxLineLength = len;
@@ -2814,7 +2814,7 @@
               }
             }
             if (!m.atomic) continue;
-            var newPos = m.find()[dir < 0 ? "from" : "to"];
+            var newPos = m.find(dir < 0 ? -1 : 1);
             if (cmp(newPos, curPos) == 0) {
               newPos.ch += dir;
               if (newPos.ch < 0) {
@@ -4123,7 +4123,7 @@
         updateLineHeight(line, textHeight(cm.display));
     }
     if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
-      var visual = visualLine(cm.doc, this.lines[i]), len = lineLength(cm.doc, visual);
+      var visual = visualLine(this.lines[i]), len = lineLength(visual);
       if (len > cm.display.maxLineLength) {
         cm.display.maxLine = visual;
         cm.display.maxLineLength = len;
@@ -4141,28 +4141,31 @@
     if (withOp) endOperation(cm);
   };
 
-  TextMarker.prototype.find = function(bothSides) {
+  // Side can be 0 (both), -1 (left), 1 (right)
+  TextMarker.prototype.find = function(side, lineObj) {
+    if (side == null && this.type == "bookmark") side = 1;
     var from, to;
     for (var i = 0; i < this.lines.length; ++i) {
       var line = this.lines[i];
       var span = getMarkedSpanFor(line.markedSpans, this);
-      if (span.from != null || span.to != null) {
-        var found = lineNo(line);
-        if (span.from != null) from = Pos(found, span.from);
-        if (span.to != null) to = Pos(found, span.to);
+      if (span.from != null) {
+        from = Pos(lineObj ? line : lineNo(line), span.from);
+        if (side == -1) return from;
+      }
+      if (span.to != null) {
+        to = Pos(lineObj ? line : lineNo(line), span.to);
+        if (side == 1) return to;
       }
     }
-    if (this.type == "bookmark" && !bothSides) return from;
     return from && {from: from, to: to};
   };
 
   TextMarker.prototype.changed = function() {
-    var pos = this.find(), cm = this.doc.cm;
+    var pos = this.find(-1, true), cm = this.doc.cm;
     if (!pos || !cm) return;
-    if (this.type != "bookmark") pos = pos.from;
-    var line = getLine(this.doc, pos.line);
+    var line = pos.line, lineN = lineNo(pos.line);
     clearCachedMeasurement(cm, line);
-    if (pos.line >= cm.display.showingFrom && pos.line < cm.display.showingTo) {
+    if (lineN >= cm.display.showingFrom && lineN < cm.display.showingTo) {
       for (var node = cm.display.lineDiv.firstChild; node; node = node.nextSibling) if (node.lineObj == line) {
         if (node.offsetHeight != line.height) updateLineHeight(line, node.offsetHeight);
         break;
@@ -4216,7 +4219,7 @@
 
     var curLine = from.line, cm = doc.cm, updateMaxLine;
     doc.iter(curLine, to.line + 1, function(line) {
-      if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(doc, line) == cm.display.maxLine)
+      if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
         updateMaxLine = true;
       var span = {from: null, to: null, marker: marker};
       if (curLine == from.line) span.from = from.ch;
@@ -4269,8 +4272,8 @@
       this.markers[i].clear();
     signalLater(this, "clear");
   };
-  SharedTextMarker.prototype.find = function() {
-    return this.primary.find();
+  SharedTextMarker.prototype.find = function(side, lineObj) {
+    return this.primary.find(side, lineObj);
   };
 
   function markTextShared(doc, from, to, options, type) {
@@ -4437,7 +4440,7 @@
     if (!markers) return null;
     var parts = [{from: from, to: to}];
     for (var i = 0; i < markers.length; ++i) {
-      var mk = markers[i], m = mk.find();
+      var mk = markers[i], m = mk.find(0);
       for (var j = 0; j < parts.length; ++j) {
         var p = parts[j];
         if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue;
@@ -4486,7 +4489,7 @@
     if (sps) for (var i = 0; i < sps.length; ++i) {
       var sp = sps[i];
       if (!sp.marker.collapsed) continue;
-      var found = sp.marker.find(true);
+      var found = sp.marker.find(0);
       var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
       var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
       if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
@@ -4496,10 +4499,10 @@
     }
   }
 
-  function visualLine(doc, line) {
+  function visualLine(line) {
     var merged;
     while (merged = collapsedSpanAtStart(line))
-      line = getLine(doc, merged.find().from.line);
+      line = merged.find(-1, true).line;
     return line;
   }
 
@@ -4516,8 +4519,8 @@
   }
   function lineIsHiddenInner(doc, line, span) {
     if (span.to == null) {
-      var end = span.marker.find().to, endLine = getLine(doc, end.line);
-      return lineIsHiddenInner(doc, endLine, getMarkedSpanFor(endLine.markedSpans, span.marker));
+      var end = span.marker.find(1, true);
+      return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker));
     }
     if (span.marker.inclusiveRight && span.to == line.text.length)
       return true;
@@ -4568,7 +4571,7 @@
     if (no == null || !ws) return;
     for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
     if (!ws.length) this.line.widgets = null;
-    var aboveVisible = heightAtLine(this.cm, this.line) < this.cm.doc.scrollTop;
+    var aboveVisible = heightAtLine(this.line) < this.cm.doc.scrollTop;
     updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));
     if (aboveVisible) addToScrollPos(this.cm, 0, -this.height);
     regChange(this.cm, no, no + 1);
@@ -4599,7 +4602,7 @@
       else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
       widget.line = line;
       if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {
-        var aboveVisible = heightAtLine(cm, line) < cm.doc.scrollTop;
+        var aboveVisible = heightAtLine(line) < cm.doc.scrollTop;
         updateLineHeight(line, line.height + widgetHeight(widget));
         if (aboveVisible) addToScrollPos(cm, 0, widget.height);
       }
@@ -4751,7 +4754,7 @@
   function buildLineContent(cm, realLine, measure, copyWidgets) {
     var merged, line = realLine, empty = true;
     while (merged = collapsedSpanAtStart(line))
-      line = getLine(cm.doc, merged.find().from.line);
+      line = merged.find(-1, true).line;
 
     var builder = {pre: elt("pre"), col: 0, pos: 0,
                    measure: null, measuredSomething: false, cm: cm,
@@ -5216,7 +5219,7 @@
 
     getLineHandleVisualStart: function(line) {
       if (typeof line == "number") line = getLine(this, line);
-      return visualLine(this, line);
+      return visualLine(line);
     },
 
     lineCount: function() {return this.size;},
@@ -5534,8 +5537,8 @@
     return n + i;
   }
 
-  function heightAtLine(cm, lineObj) {
-    lineObj = visualLine(cm.doc, lineObj);
+  function heightAtLine(lineObj) {
+    lineObj = visualLine(lineObj);
 
     var h = 0, chunk = lineObj.parent;
     for (var i = 0; i < chunk.lines.length; ++i) {
@@ -6112,19 +6115,21 @@
 
   function lineStart(cm, lineN) {
     var line = getLine(cm.doc, lineN);
-    var visual = visualLine(cm.doc, line);
+    var visual = visualLine(line);
     if (visual != line) lineN = lineNo(visual);
     var order = getOrder(visual);
     var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual);
     return Pos(lineN, ch);
   }
   function lineEnd(cm, lineN) {
-    var merged, line;
-    while (merged = collapsedSpanAtEnd(line = getLine(cm.doc, lineN)))
-      lineN = merged.find().to.line;
+    var merged, line = getLine(cm.doc, lineN);
+    while (merged = collapsedSpanAtEnd(line)) {
+      line = merged.find(1, true).line;
+      lineN = null;
+    }
     var order = getOrder(line);
     var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
-    return Pos(lineN, ch);
+    return Pos(lineN == null ? lineNo(line) : lineN, ch);
   }
 
   function compareBidiLevel(order, a, b) {

From b9c1db55da9e2b0228d2ecc4804de7b6764580ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Dec 2013 20:37:50 +0100
Subject: [PATCH 0843/4742] Upgrade in-tree acorn

---
 test/lint/acorn.js | 636 +++++++++++++++++++++++++++++----------------
 test/lint/walk.js  | 203 +++++++++++----
 2 files changed, 555 insertions(+), 284 deletions(-)

diff --git a/test/lint/acorn.js b/test/lint/acorn.js
index 6323b1fc6a..bbd32cfcea 100644
--- a/test/lint/acorn.js
+++ b/test/lint/acorn.js
@@ -12,13 +12,24 @@
 // Please use the [github bug tracker][ghbt] to report issues.
 //
 // [ghbt]: https://github.com/marijnh/acorn/issues
-
-(function(exports) {
+//
+// This file defines the main parser interface. The library also comes
+// with a [error-tolerant parser][dammit] and an
+// [abstract syntax tree walker][walk], defined in other files.
+//
+// [dammit]: acorn_loose.js
+// [walk]: util/walk.js
+
+(function(root, mod) {
+  if (typeof exports == "object" && typeof module == "object") return mod(exports); // CommonJS
+  if (typeof define == "function" && define.amd) return define(["exports"], mod); // AMD
+  mod(root.acorn || (root.acorn = {})); // Plain browser env
+})(this, function(exports) {
   "use strict";
 
-  exports.version = "0.0.1";
+  exports.version = "0.4.1";
 
-  // The main exported interface (under `window.acorn` when in the
+  // The main exported interface (under `self.acorn` when in the
   // browser) is a `parse` function that takes a code string and
   // returns an abstract syntax tree as specified by [Mozilla parser
   // API][api], with the caveat that the SpiderMonkey-specific syntax
@@ -30,10 +41,8 @@
 
   exports.parse = function(inpt, opts) {
     input = String(inpt); inputLen = input.length;
-    options = opts || {};
-    for (var opt in defaultOptions) if (!options.hasOwnProperty(opt))
-      options[opt] = defaultOptions[opt];
-    sourceFile = options.sourceFile || null;
+    setOptions(opts);
+    initTokenState();
     return parseTopLevel(options.program);
   };
 
@@ -55,18 +64,22 @@
     // By default, reserved words are not enforced. Enable
     // `forbidReserved` to enforce them.
     forbidReserved: false,
-    // When `trackComments` is turned on, the parser will attach
-    // `commentsBefore` and `commentsAfter` properties to AST nodes
-    // holding arrays of strings. A single comment may appear in both
-    // a `commentsBefore` and `commentsAfter` array (of the nodes
-    // after and before it), but never twice in the before (or after)
-    // array of different nodes.
-    trackComments: false,
     // When `locations` is on, `loc` properties holding objects with
     // `start` and `end` properties in `{line, column}` form (with
     // line being 1-based and column 0-based) will be attached to the
     // nodes.
     locations: false,
+    // A function can be passed as `onComment` option, which will
+    // cause Acorn to call that function with `(block, text, start,
+    // end)` parameters whenever a comment is skipped. `block` is a
+    // boolean indicating whether this is a block (`/* */`) comment,
+    // `text` is the content of the comment, and `start` and `end` are
+    // character offsets that denote the start and end of the comment.
+    // When the `locations` option is on, two more parameters are
+    // passed, the full `{line, column}` locations of the start and
+    // end of the comments. Note that you are not allowed to call the
+    // parser from the callback—that will corrupt its internal state.
+    onComment: null,
     // Nodes have their start and end characters offsets recorded in
     // `start` and `end` properties (directly on the node, rather than
     // the `loc` object, which holds line/column data. To also add a
@@ -82,11 +95,21 @@
     // toplevel forms of the parsed file to the `Program` (top) node
     // of an existing parse tree.
     program: null,
-    // When `location` is on, you can pass this to record the source
+    // When `locations` is on, you can pass this to record the source
     // file in every node's `loc` object.
-    sourceFile: null
+    sourceFile: null,
+    // This value, if given, is stored in every node, whether
+    // `locations` is on or off.
+    directSourceFile: null
   };
 
+  function setOptions(opts) {
+    options = opts || {};
+    for (var opt in defaultOptions) if (!Object.prototype.hasOwnProperty.call(options, opt))
+      options[opt] = defaultOptions[opt];
+    sourceFile = options.sourceFile || null;
+  }
+
   // The `getLineInfo` function is mostly useful when the
   // `locations` option is off (for performance reasons) and you
   // want to find the line/column position for a given character
@@ -106,9 +129,44 @@
   };
 
   // Acorn is organized as a tokenizer and a recursive-descent parser.
-  // Both use (closure-)global variables to keep their state and
-  // communicate. We already saw the `options`, `input`, and
-  // `inputLen` variables above (set in `parse`).
+  // The `tokenize` export provides an interface to the tokenizer.
+  // Because the tokenizer is optimized for being efficiently used by
+  // the Acorn parser itself, this interface is somewhat crude and not
+  // very modular. Performing another parse or call to `tokenize` will
+  // reset the internal state, and invalidate existing tokenizers.
+
+  exports.tokenize = function(inpt, opts) {
+    input = String(inpt); inputLen = input.length;
+    setOptions(opts);
+    initTokenState();
+
+    var t = {};
+    function getToken(forceRegexp) {
+      readToken(forceRegexp);
+      t.start = tokStart; t.end = tokEnd;
+      t.startLoc = tokStartLoc; t.endLoc = tokEndLoc;
+      t.type = tokType; t.value = tokVal;
+      return t;
+    }
+    getToken.jumpTo = function(pos, reAllowed) {
+      tokPos = pos;
+      if (options.locations) {
+        tokCurLine = 1;
+        tokLineStart = lineBreak.lastIndex = 0;
+        var match;
+        while ((match = lineBreak.exec(input)) && match.index < pos) {
+          ++tokCurLine;
+          tokLineStart = match.index + match[0].length;
+        }
+      }
+      tokRegexpAllowed = reAllowed;
+      skipSpace();
+    };
+    return getToken;
+  };
+
+  // State is kept in (closure-)global variables. We already saw the
+  // `options`, `input`, and `inputLen` variables above.
 
   // The current position of the tokenizer in the input.
 
@@ -133,11 +191,6 @@
 
   var tokType, tokVal;
 
-  // These are used to hold arrays of comments when
-  // `options.trackComments` is true.
-
-  var tokCommentsBefore, tokCommentsAfter;
-
   // Interal state for the tokenizer. To distinguish between division
   // operators and regular expressions, it remembers whether the last
   // token was one that is allowed to be followed by an expression.
@@ -145,13 +198,13 @@
   // division operator. See the `parseStatement` function for a
   // caveat.)
 
-  var tokRegexpAllowed, tokComments;
+  var tokRegexpAllowed;
 
   // When `options.locations` is true, these are used to keep
   // track of the current line, and know when a new line has been
-  // entered. See the `curLineLoc` function.
+  // entered.
 
-  var tokCurLine, tokLineStart, tokLineStartNext;
+  var tokCurLine, tokLineStart;
 
   // These store the position of the previous token, which is useful
   // when finishing a node and assigning its `end` position.
@@ -166,17 +219,23 @@
   var inFunction, labels, strict;
 
   // This function is used to raise exceptions on parse errors. It
-  // takes either a `{line, column}` object or an offset integer (into
-  // the current `input`) as `pos` argument. It attaches the position
-  // to the end of the error message, and then raises a `SyntaxError`
-  // with that message.
+  // takes an offset integer (into the current `input`) to indicate
+  // the location of the error, attaches the position to the end
+  // of the error message, and then raises a `SyntaxError` with that
+  // message.
 
   function raise(pos, message) {
-    if (typeof pos == "number") pos = getLineInfo(input, pos);
-    message += " (" + pos.line + ":" + pos.column + ")";
-    throw new SyntaxError(message);
+    var loc = getLineInfo(input, pos);
+    message += " (" + loc.line + ":" + loc.column + ")";
+    var err = new SyntaxError(message);
+    err.pos = pos; err.loc = loc; err.raisedAt = tokPos;
+    throw err;
   }
 
+  // Reused empty array added for node fields that are always empty.
+
+  var empty = [];
+
   // ## Token types
 
   // The assignment of fine-grained, information-carrying type objects
@@ -233,10 +292,10 @@
                       "function": _function, "if": _if, "return": _return, "switch": _switch,
                       "throw": _throw, "try": _try, "var": _var, "while": _while, "with": _with,
                       "null": _null, "true": _true, "false": _false, "new": _new, "in": _in,
-                      "instanceof": {keyword: "instanceof", binop: 7}, "this": _this,
-                      "typeof": {keyword: "typeof", prefix: true},
-                      "void": {keyword: "void", prefix: true},
-                      "delete": {keyword: "delete", prefix: true}};
+                      "instanceof": {keyword: "instanceof", binop: 7, beforeExpr: true}, "this": _this,
+                      "typeof": {keyword: "typeof", prefix: true, beforeExpr: true},
+                      "void": {keyword: "void", prefix: true, beforeExpr: true},
+                      "delete": {keyword: "delete", prefix: true, beforeExpr: true}};
 
   // Punctuation token types. Again, the `type` property is purely for debugging.
 
@@ -262,13 +321,27 @@
   // in AssignmentExpression nodes.
 
   var _slash = {binop: 10, beforeExpr: true}, _eq = {isAssign: true, beforeExpr: true};
-  var _assign = {isAssign: true, beforeExpr: true}, _plusmin = {binop: 9, prefix: true, beforeExpr: true};
-  var _incdec = {postfix: true, prefix: true, isUpdate: true}, _prefix = {prefix: true, beforeExpr: true};
-  var _bin1 = {binop: 1, beforeExpr: true}, _bin2 = {binop: 2, beforeExpr: true};
-  var _bin3 = {binop: 3, beforeExpr: true}, _bin4 = {binop: 4, beforeExpr: true};
-  var _bin5 = {binop: 5, beforeExpr: true}, _bin6 = {binop: 6, beforeExpr: true};
-  var _bin7 = {binop: 7, beforeExpr: true}, _bin8 = {binop: 8, beforeExpr: true};
-  var _bin10 = {binop: 10, beforeExpr: true};
+  var _assign = {isAssign: true, beforeExpr: true};
+  var _incDec = {postfix: true, prefix: true, isUpdate: true}, _prefix = {prefix: true, beforeExpr: true};
+  var _logicalOR = {binop: 1, beforeExpr: true};
+  var _logicalAND = {binop: 2, beforeExpr: true};
+  var _bitwiseOR = {binop: 3, beforeExpr: true};
+  var _bitwiseXOR = {binop: 4, beforeExpr: true};
+  var _bitwiseAND = {binop: 5, beforeExpr: true};
+  var _equality = {binop: 6, beforeExpr: true};
+  var _relational = {binop: 7, beforeExpr: true};
+  var _bitShift = {binop: 8, beforeExpr: true};
+  var _plusMin = {binop: 9, prefix: true, beforeExpr: true};
+  var _multiplyModulo = {binop: 10, beforeExpr: true};
+
+  // Provide access to the token types for external users of the
+  // tokenizer.
+
+  exports.tokTypes = {bracketL: _bracketL, bracketR: _bracketR, braceL: _braceL, braceR: _braceR,
+                      parenL: _parenL, parenR: _parenR, comma: _comma, semi: _semi, colon: _colon,
+                      dot: _dot, question: _question, slash: _slash, eq: _eq, name: _name, eof: _eof,
+                      num: _num, regexp: _regexp, string: _string};
+  for (var kw in keywordTypes) exports.tokTypes["_" + kw] = keywordTypes[kw];
 
   // This is a trick taken from Esprima. It turns out that, on
   // non-Chrome browsers, to check whether a string is in a set, a
@@ -345,9 +418,9 @@
   // are only applied when a character is found to actually have a
   // code point above 128.
 
-  var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]/;
+  var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/;
   var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
-  var nonASCIIidentifierChars = "\u0371-\u0374\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u0620-\u0649\u0672-\u06d3\u06e7-\u06e8\u06fb-\u06fc\u0730-\u074a\u0800-\u0814\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0840-\u0857\u08e4-\u08fe\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962-\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09d7\u09df-\u09e0\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5f-\u0b60\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2-\u0ce3\u0ce6-\u0cef\u0d02\u0d03\u0d46-\u0d48\u0d57\u0d62-\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e34-\u0e3a\u0e40-\u0e45\u0e50-\u0e59\u0eb4-\u0eb9\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f41-\u0f47\u0f71-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1029\u1040-\u1049\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u170e-\u1710\u1720-\u1730\u1740-\u1750\u1772\u1773\u1780-\u17b2\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1920-\u192b\u1930-\u193b\u1951-\u196d\u19b0-\u19c0\u19c8-\u19c9\u19d0-\u19d9\u1a00-\u1a15\u1a20-\u1a53\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1b46-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1bb0-\u1bb9\u1be6-\u1bf3\u1c00-\u1c22\u1c40-\u1c49\u1c5b-\u1c7d\u1cd0-\u1cd2\u1d00-\u1dbe\u1e01-\u1f15\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2d81-\u2d96\u2de0-\u2dff\u3021-\u3028\u3099\u309a\ua640-\ua66d\ua674-\ua67d\ua69f\ua6f0-\ua6f1\ua7f8-\ua800\ua806\ua80b\ua823-\ua827\ua880-\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8f3-\ua8f7\ua900-\ua909\ua926-\ua92d\ua930-\ua945\ua980-\ua983\ua9b3-\ua9c0\uaa00-\uaa27\uaa40-\uaa41\uaa4c-\uaa4d\uaa50-\uaa59\uaa7b\uaae0-\uaae9\uaaf2-\uaaf3\uabc0-\uabe1\uabec\uabed\uabf0-\uabf9\ufb20-\ufb28\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
+  var nonASCIIidentifierChars = "\u0300-\u036f\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u0620-\u0649\u0672-\u06d3\u06e7-\u06e8\u06fb-\u06fc\u0730-\u074a\u0800-\u0814\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0840-\u0857\u08e4-\u08fe\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962-\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09d7\u09df-\u09e0\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5f-\u0b60\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2-\u0ce3\u0ce6-\u0cef\u0d02\u0d03\u0d46-\u0d48\u0d57\u0d62-\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e34-\u0e3a\u0e40-\u0e45\u0e50-\u0e59\u0eb4-\u0eb9\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f41-\u0f47\u0f71-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1029\u1040-\u1049\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u170e-\u1710\u1720-\u1730\u1740-\u1750\u1772\u1773\u1780-\u17b2\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1920-\u192b\u1930-\u193b\u1951-\u196d\u19b0-\u19c0\u19c8-\u19c9\u19d0-\u19d9\u1a00-\u1a15\u1a20-\u1a53\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1b46-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1bb0-\u1bb9\u1be6-\u1bf3\u1c00-\u1c22\u1c40-\u1c49\u1c5b-\u1c7d\u1cd0-\u1cd2\u1d00-\u1dbe\u1e01-\u1f15\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2d81-\u2d96\u2de0-\u2dff\u3021-\u3028\u3099\u309a\ua640-\ua66d\ua674-\ua67d\ua69f\ua6f0-\ua6f1\ua7f8-\ua800\ua806\ua80b\ua823-\ua827\ua880-\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8f3-\ua8f7\ua900-\ua909\ua926-\ua92d\ua930-\ua945\ua980-\ua983\ua9b3-\ua9c0\uaa00-\uaa27\uaa40-\uaa41\uaa4c-\uaa4d\uaa50-\uaa59\uaa7b\uaae0-\uaae9\uaaf2-\uaaf3\uabc0-\uabe1\uabec\uabed\uabf0-\uabf9\ufb20-\ufb28\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
   var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
   var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
 
@@ -362,17 +435,17 @@
 
   // Test whether a given character code starts an identifier.
 
-  function isIdentifierStart(code) {
+  var isIdentifierStart = exports.isIdentifierStart = function(code) {
     if (code < 65) return code === 36;
     if (code < 91) return true;
     if (code < 97) return code === 95;
     if (code < 123)return true;
     return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code));
-  }
+  };
 
   // Test whether a given character is part of an identifier.
 
-  function isIdentifierChar(code) {
+  var isIdentifierChar = exports.isIdentifierChar = function(code) {
     if (code < 48) return code === 36;
     if (code < 58) return true;
     if (code < 65) return false;
@@ -380,27 +453,16 @@
     if (code < 97) return code === 95;
     if (code < 123)return true;
     return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
-  }
+  };
 
   // ## Tokenizer
 
-  // These are used when `options.locations` is on, in order to track
-  // the current line number and start of line offset, in order to set
-  // `tokStartLoc` and `tokEndLoc`.
-
-  function nextLineStart() {
-    lineBreak.lastIndex = tokLineStart;
-    var match = lineBreak.exec(input);
-    return match ? match.index + match[0].length : input.length + 1;
-  }
+  // These are used when `options.locations` is on, for the
+  // `tokStartLoc` and `tokEndLoc` properties.
 
-  function curLineLoc() {
-    while (tokLineStartNext <= tokPos) {
-      ++tokCurLine;
-      tokLineStart = tokLineStartNext;
-      tokLineStartNext = nextLineStart();
-    }
-    return {line: tokCurLine, column: tokPos - tokLineStart};
+  function line_loc_t() {
+    this.line = tokCurLine;
+    this.column = tokPos - tokLineStart;
   }
 
   // Reset the token state. Used at the start of a parse.
@@ -408,63 +470,88 @@
   function initTokenState() {
     tokCurLine = 1;
     tokPos = tokLineStart = 0;
-    tokLineStartNext = nextLineStart();
     tokRegexpAllowed = true;
-    tokComments = null;
     skipSpace();
   }
 
-  // Called at the end of every token. Sets `tokEnd`, `tokVal`,
-  // `tokCommentsAfter`, and `tokRegexpAllowed`, and skips the space
-  // after the token, so that the next one's `tokStart` will point at
-  // the right position.
+  // Called at the end of every token. Sets `tokEnd`, `tokVal`, and
+  // `tokRegexpAllowed`, and skips the space after the token, so that
+  // the next one's `tokStart` will point at the right position.
 
   function finishToken(type, val) {
     tokEnd = tokPos;
-    if (options.locations) tokEndLoc = curLineLoc();
+    if (options.locations) tokEndLoc = new line_loc_t;
     tokType = type;
     skipSpace();
     tokVal = val;
-    tokCommentsAfter = tokComments;
     tokRegexpAllowed = type.beforeExpr;
   }
 
   function skipBlockComment() {
-    var end = input.indexOf("*/", tokPos += 2);
+    var startLoc = options.onComment && options.locations && new line_loc_t;
+    var start = tokPos, end = input.indexOf("*/", tokPos += 2);
     if (end === -1) raise(tokPos - 2, "Unterminated comment");
-    if (options.trackComments)
-      (tokComments || (tokComments = [])).push(input.slice(tokPos, end));
     tokPos = end + 2;
+    if (options.locations) {
+      lineBreak.lastIndex = start;
+      var match;
+      while ((match = lineBreak.exec(input)) && match.index < tokPos) {
+        ++tokCurLine;
+        tokLineStart = match.index + match[0].length;
+      }
+    }
+    if (options.onComment)
+      options.onComment(true, input.slice(start + 2, end), start, tokPos,
+                        startLoc, options.locations && new line_loc_t);
   }
 
   function skipLineComment() {
     var start = tokPos;
+    var startLoc = options.onComment && options.locations && new line_loc_t;
     var ch = input.charCodeAt(tokPos+=2);
-    while (tokPos < inputLen && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8329) {
+    while (tokPos < inputLen && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
       ++tokPos;
       ch = input.charCodeAt(tokPos);
     }
-    (tokComments || (tokComments = [])).push(input.slice(start, tokPos));
+    if (options.onComment)
+      options.onComment(false, input.slice(start + 2, tokPos), start, tokPos,
+                        startLoc, options.locations && new line_loc_t);
   }
 
   // Called at the start of the parse and after every token. Skips
-  // whitespace and comments, and, if `options.trackComments` is on,
-  // will store all skipped comments in `tokComments`.
+  // whitespace and comments, and.
 
   function skipSpace() {
-    tokComments = null;
     while (tokPos < inputLen) {
       var ch = input.charCodeAt(tokPos);
-      if (ch === 47) { // '/'
-        var next = input.charCodeAt(tokPos+1);
+      if (ch === 32) { // ' '
+        ++tokPos;
+      } else if (ch === 13) {
+        ++tokPos;
+        var next = input.charCodeAt(tokPos);
+        if (next === 10) {
+          ++tokPos;
+        }
+        if (options.locations) {
+          ++tokCurLine;
+          tokLineStart = tokPos;
+        }
+      } else if (ch === 10 || ch === 8232 || ch === 8233) {
+        ++tokPos;
+        if (options.locations) {
+          ++tokCurLine;
+          tokLineStart = tokPos;
+        }
+      } else if (ch > 8 && ch < 14) {
+        ++tokPos;
+      } else if (ch === 47) { // '/'
+        var next = input.charCodeAt(tokPos + 1);
         if (next === 42) { // '*'
           skipBlockComment();
         } else if (next === 47) { // '/'
           skipLineComment();
         } else break;
-      } else if (ch < 14 && ch > 8) {
-        ++tokPos;
-      } else if (ch === 32 || ch === 160) { // ' ', '\xa0'
+      } else if (ch === 160) { // '\xa0'
         ++tokPos;
       } else if (ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
         ++tokPos;
@@ -486,26 +573,89 @@
   // The `forceRegexp` parameter is used in the one case where the
   // `tokRegexpAllowed` trick does not work. See `parseStatement`.
 
-  function readToken(forceRegexp) {
-    tokStart = tokPos;
-    if (options.locations) tokStartLoc = curLineLoc();
-    tokCommentsBefore = tokComments;
-    if (forceRegexp) return readRegexp();
-    if (tokPos >= inputLen) return finishToken(_eof);
+  function readToken_dot() {
+    var next = input.charCodeAt(tokPos + 1);
+    if (next >= 48 && next <= 57) return readNumber(true);
+    ++tokPos;
+    return finishToken(_dot);
+  }
 
-    var code = input.charCodeAt(tokPos);
-    // Identifier or keyword. '\uXXXX' sequences are allowed in
-    // identifiers, so '\' also dispatches to that.
-    if (isIdentifierStart(code) || code === 92 /* '\' */) return readWord();
-    var next = input.charCodeAt(tokPos+1);
+  function readToken_slash() { // '/'
+    var next = input.charCodeAt(tokPos + 1);
+    if (tokRegexpAllowed) {++tokPos; return readRegexp();}
+    if (next === 61) return finishOp(_assign, 2);
+    return finishOp(_slash, 1);
+  }
+
+  function readToken_mult_modulo() { // '%*'
+    var next = input.charCodeAt(tokPos + 1);
+    if (next === 61) return finishOp(_assign, 2);
+    return finishOp(_multiplyModulo, 1);
+  }
+
+  function readToken_pipe_amp(code) { // '|&'
+    var next = input.charCodeAt(tokPos + 1);
+    if (next === code) return finishOp(code === 124 ? _logicalOR : _logicalAND, 2);
+    if (next === 61) return finishOp(_assign, 2);
+    return finishOp(code === 124 ? _bitwiseOR : _bitwiseAND, 1);
+  }
+
+  function readToken_caret() { // '^'
+    var next = input.charCodeAt(tokPos + 1);
+    if (next === 61) return finishOp(_assign, 2);
+    return finishOp(_bitwiseXOR, 1);
+  }
+
+  function readToken_plus_min(code) { // '+-'
+    var next = input.charCodeAt(tokPos + 1);
+    if (next === code) {
+      if (next == 45 && input.charCodeAt(tokPos + 2) == 62 &&
+          newline.test(input.slice(lastEnd, tokPos))) {
+        // A `-->` line comment
+        tokPos += 3;
+        skipLineComment();
+        skipSpace();
+        return readToken();
+      }
+      return finishOp(_incDec, 2);
+    }
+    if (next === 61) return finishOp(_assign, 2);
+    return finishOp(_plusMin, 1);
+  }
 
+  function readToken_lt_gt(code) { // '<>'
+    var next = input.charCodeAt(tokPos + 1);
+    var size = 1;
+    if (next === code) {
+      size = code === 62 && input.charCodeAt(tokPos + 2) === 62 ? 3 : 2;
+      if (input.charCodeAt(tokPos + size) === 61) return finishOp(_assign, size + 1);
+      return finishOp(_bitShift, size);
+    }
+    if (next == 33 && code == 60 && input.charCodeAt(tokPos + 2) == 45 &&
+        input.charCodeAt(tokPos + 3) == 45) {
+      // `<!--`, an XML-style comment that should be interpreted as a line comment
+      tokPos += 4;
+      skipLineComment();
+      skipSpace();
+      return readToken();
+    }
+    if (next === 61)
+      size = input.charCodeAt(tokPos + 2) === 61 ? 3 : 2;
+    return finishOp(_relational, size);
+  }
+
+  function readToken_eq_excl(code) { // '=!'
+    var next = input.charCodeAt(tokPos + 1);
+    if (next === 61) return finishOp(_equality, input.charCodeAt(tokPos + 2) === 61 ? 3 : 2);
+    return finishOp(code === 61 ? _eq : _prefix, 1);
+  }
+
+  function getTokenFromCode(code) {
     switch(code) {
       // The interpretation of a dot depends on whether it is followed
       // by a digit.
     case 46: // '.'
-      if (next >= 48 && next <= 57) return readNumber(String.fromCharCode(code));
-      ++tokPos;
-      return finishToken(_dot);
+      return readToken_dot();
 
       // Punctuation tokens.
     case 40: ++tokPos; return finishToken(_parenL);
@@ -521,11 +671,12 @@
 
       // '0x' is a hexadecimal number.
     case 48: // '0'
+      var next = input.charCodeAt(tokPos + 1);
       if (next === 120 || next === 88) return readHexNumber();
       // Anything else beginning with a digit is an integer, octal
       // number, or float.
     case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 1-9
-      return readNumber(String.fromCharCode(code));
+      return readNumber(false);
 
       // Quotes produce strings.
     case 34: case 39: // '"', "'"
@@ -537,52 +688,55 @@
     // of the type given by its first argument.
 
     case 47: // '/'
-      if (tokRegexpAllowed) {++tokPos; return readRegexp();}
-      if (next === 61) return finishOp(_assign, 2);
-      return finishOp(_slash, 1);
+      return readToken_slash(code);
 
     case 37: case 42: // '%*'
-      if (next === 61) return finishOp(_assign, 2);
-      return finishOp(_bin10, 1);
+      return readToken_mult_modulo();
 
     case 124: case 38: // '|&'
-      if (next === code) return finishOp(code === 124 ? _bin1 : _bin2, 2);
-      if (next === 61) return finishOp(_assign, 2);
-      return finishOp(code === 124 ? _bin3 : _bin5, 1);
+      return readToken_pipe_amp(code);
 
     case 94: // '^'
-      if (next === 61) return finishOp(_assign, 2);
-      return finishOp(_bin4, 1);
+      return readToken_caret();
 
     case 43: case 45: // '+-'
-      if (next === code) return finishOp(_incdec, 2);
-      if (next === 61) return finishOp(_assign, 2);
-      return finishOp(_plusmin, 1);
+      return readToken_plus_min(code);
 
     case 60: case 62: // '<>'
-      var size = 1;
-      if (next === code) {
-        size = code === 62 && input.charCodeAt(tokPos+2) === 62 ? 3 : 2;
-        if (input.charCodeAt(tokPos + size) === 61) return finishOp(_assign, size + 1);
-        return finishOp(_bin8, size);
-      }
-      if (next === 61)
-        size = input.charCodeAt(tokPos+2) === 61 ? 3 : 2;
-      return finishOp(_bin7, size);
+      return readToken_lt_gt(code);
 
     case 61: case 33: // '=!'
-      if (next === 61) return finishOp(_bin6, input.charCodeAt(tokPos+2) === 61 ? 3 : 2);
-      return finishOp(code === 61 ? _eq : _prefix, 1);
+      return readToken_eq_excl(code);
 
     case 126: // '~'
       return finishOp(_prefix, 1);
     }
 
-    // If we are here, we either found a non-ASCII identifier
-    // character, or something that's entirely disallowed.
-    var ch = String.fromCharCode(code);
-    if (ch === "\\" || nonASCIIidentifierStart.test(ch)) return readWord();
-    raise(tokPos, "Unexpected character '" + ch + "'");
+    return false;
+  }
+
+  function readToken(forceRegexp) {
+    if (!forceRegexp) tokStart = tokPos;
+    else tokPos = tokStart + 1;
+    if (options.locations) tokStartLoc = new line_loc_t;
+    if (forceRegexp) return readRegexp();
+    if (tokPos >= inputLen) return finishToken(_eof);
+
+    var code = input.charCodeAt(tokPos);
+    // Identifier or keyword. '\uXXXX' sequences are allowed in
+    // identifiers, so '\' also dispatches to that.
+    if (isIdentifierStart(code) || code === 92 /* '\' */) return readWord();
+
+    var tok = getTokenFromCode(code);
+
+    if (tok === false) {
+      // If we are here, we either found a non-ASCII identifier
+      // character, or something that's entirely disallowed.
+      var ch = String.fromCharCode(code);
+      if (ch === "\\" || nonASCIIidentifierStart.test(ch)) return readWord();
+      raise(tokPos, "Unexpected character '" + ch + "'");
+    }
+    return tok;
   }
 
   function finishOp(type, size) {
@@ -614,7 +768,13 @@
     // here (don't ask).
     var mods = readWord1();
     if (mods && !/^[gmsiy]*$/.test(mods)) raise(start, "Invalid regexp flag");
-    return finishToken(_regexp, new RegExp(content, mods));
+    try {
+      var value = new RegExp(content, mods);
+    } catch (e) {
+      if (e instanceof SyntaxError) raise(start, e.message);
+      raise(e);
+    }
+    return finishToken(_regexp, value);
   }
 
   // Read an integer in the given radix. Return null if zero digits
@@ -623,7 +783,7 @@
 
   function readInt(radix, len) {
     var start = tokPos, total = 0;
-    for (;;) {
+    for (var i = 0, e = len == null ? Infinity : len; i < e; ++i) {
       var code = input.charCodeAt(tokPos), val;
       if (code >= 97) val = code - 97 + 10; // a
       else if (code >= 65) val = code - 65 + 10; // A
@@ -647,27 +807,27 @@
   }
 
   // Read an integer, octal integer, or floating-point number.
-  
-  function readNumber(ch) {
-    var start = tokPos, isFloat = ch === ".";
-    if (!isFloat && readInt(10) == null) raise(start, "Invalid number");
-    if (isFloat || input.charAt(tokPos) === ".") {
-      var next = input.charAt(++tokPos);
-      if (next === "-" || next === "+") ++tokPos;
-      if (readInt(10) === null && ch === ".") raise(start, "Invalid number");
+
+  function readNumber(startsWithDot) {
+    var start = tokPos, isFloat = false, octal = input.charCodeAt(tokPos) === 48;
+    if (!startsWithDot && readInt(10) === null) raise(start, "Invalid number");
+    if (input.charCodeAt(tokPos) === 46) {
+      ++tokPos;
+      readInt(10);
       isFloat = true;
     }
-    if (/e/i.test(input.charAt(tokPos))) {
-      var next = input.charAt(++tokPos);
-      if (next === "-" || next === "+") ++tokPos;
-      if (readInt(10) === null) raise(start, "Invalid number")
+    var next = input.charCodeAt(tokPos);
+    if (next === 69 || next === 101) { // 'eE'
+      next = input.charCodeAt(++tokPos);
+      if (next === 43 || next === 45) ++tokPos; // '+-'
+      if (readInt(10) === null) raise(start, "Invalid number");
       isFloat = true;
     }
     if (isIdentifierStart(input.charCodeAt(tokPos))) raise(tokPos, "Identifier directly after number");
 
     var str = input.slice(start, tokPos), val;
     if (isFloat) val = parseFloat(str);
-    else if (ch !== "0" || str.length === 1) val = parseInt(str, 10);
+    else if (!octal || str.length === 1) val = parseInt(str, 10);
     else if (/[89]/.test(str) || strict) raise(start, "Invalid number");
     else val = parseInt(str, 8);
     return finishToken(_num, val);
@@ -677,45 +837,47 @@
 
   function readString(quote) {
     tokPos++;
-    var str = [];
+    var out = "";
     for (;;) {
       if (tokPos >= inputLen) raise(tokStart, "Unterminated string constant");
       var ch = input.charCodeAt(tokPos);
       if (ch === quote) {
         ++tokPos;
-        return finishToken(_string, String.fromCharCode.apply(null, str));
+        return finishToken(_string, out);
       }
       if (ch === 92) { // '\'
         ch = input.charCodeAt(++tokPos);
         var octal = /^[0-7]+/.exec(input.slice(tokPos, tokPos + 3));
         if (octal) octal = octal[0];
-        while (octal && parseInt(octal, 8) > 255) octal = octal.slice(0, octal.length - 1);
+        while (octal && parseInt(octal, 8) > 255) octal = octal.slice(0, -1);
         if (octal === "0") octal = null;
         ++tokPos;
         if (octal) {
           if (strict) raise(tokPos - 2, "Octal literal in strict mode");
-          str.push(parseInt(octal, 8));
+          out += String.fromCharCode(parseInt(octal, 8));
           tokPos += octal.length - 1;
         } else {
           switch (ch) {
-          case 110: str.push(10); break; // 'n' -> '\n'
-          case 114: str.push(13); break; // 'r' -> '\r'
-          case 120: str.push(readHexChar(2)); break; // 'x'
-          case 117: str.push(readHexChar(4)); break; // 'u'
-          case 85: str.push(readHexChar(8)); break; // 'U'
-          case 116: str.push(9); break; // 't' -> '\t'
-          case 98: str.push(8); break; // 'b' -> '\b'
-          case 118: str.push(11); break; // 'v' -> '\u000b'
-          case 102: str.push(12); break; // 'f' -> '\f'
-          case 48: str.push(0); break; // 0 -> '\0'
+          case 110: out += "\n"; break; // 'n' -> '\n'
+          case 114: out += "\r"; break; // 'r' -> '\r'
+          case 120: out += String.fromCharCode(readHexChar(2)); break; // 'x'
+          case 117: out += String.fromCharCode(readHexChar(4)); break; // 'u'
+          case 85: out += String.fromCharCode(readHexChar(8)); break; // 'U'
+          case 116: out += "\t"; break; // 't' -> '\t'
+          case 98: out += "\b"; break; // 'b' -> '\b'
+          case 118: out += "\u000b"; break; // 'v' -> '\u000b'
+          case 102: out += "\f"; break; // 'f' -> '\f'
+          case 48: out += "\0"; break; // 0 -> '\0'
           case 13: if (input.charCodeAt(tokPos) === 10) ++tokPos; // '\r\n'
-          case 10: break; // ' \n'
-          default: str.push(ch); break;
+          case 10: // ' \n'
+            if (options.locations) { tokLineStart = tokPos; ++tokCurLine; }
+            break;
+          default: out += String.fromCharCode(ch); break;
           }
         }
       } else {
-        if (ch === 13 || ch === 10 || ch === 8232 || ch === 8329) raise(tokStart, "Unterminated string constant");
-        if (ch !== 92) str.push(ch); // '\'
+        if (ch === 13 || ch === 10 || ch === 8232 || ch === 8233) raise(tokStart, "Unterminated string constant");
+        out += String.fromCharCode(ch); // '\'
         ++tokPos;
       }
     }
@@ -808,7 +970,7 @@
   // ### Parser utilities
 
   // Continue to the next token.
-  
+
   function next() {
     lastStart = tokStart;
     lastEnd = tokEnd;
@@ -821,69 +983,64 @@
 
   function setStrict(strct) {
     strict = strct;
-    tokPos = lastEnd;
+    tokPos = tokStart;
+    if (options.locations) {
+      while (tokPos < tokLineStart) {
+        tokLineStart = input.lastIndexOf("\n", tokLineStart - 2) + 1;
+        --tokCurLine;
+      }
+    }
     skipSpace();
     readToken();
   }
 
-  // Start an AST node, attaching a start offset and optionally a
-  // `commentsBefore` property to it.
+  // Start an AST node, attaching a start offset.
+
+  function node_t() {
+    this.type = null;
+    this.start = tokStart;
+    this.end = null;
+  }
+
+  function node_loc_t() {
+    this.start = tokStartLoc;
+    this.end = null;
+    if (sourceFile !== null) this.source = sourceFile;
+  }
 
   function startNode() {
-    var node = {type: null, start: tokStart, end: null};
-    if (options.trackComments && tokCommentsBefore) {
-      node.commentsBefore = tokCommentsBefore;
-      tokCommentsBefore = null;
-    }
+    var node = new node_t();
     if (options.locations)
-      node.loc = {start: tokStartLoc, end: null, source: sourceFile};
+      node.loc = new node_loc_t();
+    if (options.directSourceFile)
+      node.sourceFile = options.directSourceFile;
     if (options.ranges)
       node.range = [tokStart, 0];
     return node;
   }
 
-  // Start a node whose start offset/comments information should be
-  // based on the start of another node. For example, a binary
-  // operator node is only started after its left-hand side has
-  // already been parsed.
+  // Start a node whose start offset information should be based on
+  // the start of another node. For example, a binary operator node is
+  // only started after its left-hand side has already been parsed.
 
   function startNodeFrom(other) {
-    var node = {type: null, start: other.start};
-    if (other.commentsBefore) {
-      node.commentsBefore = other.commentsBefore;
-      other.commentsBefore = null;
+    var node = new node_t();
+    node.start = other.start;
+    if (options.locations) {
+      node.loc = new node_loc_t();
+      node.loc.start = other.loc.start;
     }
-    if (options.locations)
-      node.loc = {start: other.loc.start, end: null, source: other.loc.source};
     if (options.ranges)
       node.range = [other.range[0], 0];
 
     return node;
   }
 
-  // Finish an AST node, adding `type`, `end`, and `commentsAfter`
-  // properties.
-  //
-  // We keep track of the last node that we finished, in order
-  // 'bubble' `commentsAfter` properties up to the biggest node. I.e.
-  // in '`1 + 1 // foo', the comment should be attached to the binary
-  // operator node, not the second literal node.
-
-  var lastFinishedNode;
+  // Finish an AST node, adding `type` and `end` properties.
 
   function finishNode(node, type) {
     node.type = type;
     node.end = lastEnd;
-    if (options.trackComments) {
-      if (tokCommentsAfter) {
-        node.commentsAfter = tokCommentsAfter;
-        tokCommentsAfter = null;
-      } else if (lastFinishedNode && lastFinishedNode.end === lastEnd) {
-        node.commentsAfter = lastFinishedNode.commentsAfter;
-        lastFinishedNode.commentsAfter = null;
-      }
-      lastFinishedNode = node;
-    }
     if (options.locations)
       node.loc.end = lastEndLoc;
     if (options.ranges)
@@ -954,9 +1111,8 @@
   // to its body instead of creating a new node.
 
   function parseTopLevel(program) {
-    initTokenState();
     lastStart = lastEnd = tokPos;
-    if (options.locations) lastEndLoc = curLineLoc();
+    if (options.locations) lastEndLoc = new line_loc_t;
     inFunction = strict = null;
     labels = [];
     readToken();
@@ -970,7 +1126,7 @@
       first = false;
     }
     return finishNode(node, "Program");
-  };
+  }
 
   var loopLabel = {kind: "loop"}, switchLabel = {kind: "switch"};
 
@@ -982,7 +1138,7 @@
   // does not help.
 
   function parseStatement() {
-    if (tokType === _slash)
+    if (tokType === _slash || tokType === _assign && tokVal == "/=")
       readToken(true);
 
     var starttype = tokType, node = startNode();
@@ -1016,6 +1172,7 @@
 
     case _debugger:
       next();
+      semicolon();
       return finishNode(node, "DebuggerStatement");
 
     case _do:
@@ -1045,6 +1202,7 @@
         var init = startNode();
         next();
         parseVar(init, true);
+        finishNode(init, "VariableDeclaration");
         if (init.declarations.length === 1 && eat(_in))
           return parseForIn(node, init);
         return parseFor(node, init);
@@ -1071,7 +1229,7 @@
       // In `return` (and `break`/`continue`), the keywords with
       // optional arguments, we eagerly look for a semicolon or the
       // possibility to insert one.
-      
+
       if (eat(_semi) || canInsertSemicolon()) node.argument = null;
       else { node.argument = parseExpression(); semicolon(); }
       return finishNode(node, "ReturnStatement");
@@ -1086,7 +1244,7 @@
       // Statements under must be grouped (by label) in SwitchCase
       // nodes. `cur` is used to keep the node that we are currently
       // adding statements to.
-      
+
       for (var cur, sawDefault; tokType != _braceR;) {
         if (tokType === _case || tokType === _default) {
           var isCase = tokType === _case;
@@ -1115,13 +1273,14 @@
       if (newline.test(input.slice(lastEnd, tokStart)))
         raise(lastEnd, "Illegal newline after throw");
       node.argument = parseExpression();
+      semicolon();
       return finishNode(node, "ThrowStatement");
 
     case _try:
       next();
       node.block = parseBlock();
-      node.handlers = [];
-      while (tokType === _catch) {
+      node.handler = null;
+      if (tokType === _catch) {
         var clause = startNode();
         next();
         expect(_parenL);
@@ -1131,18 +1290,19 @@
         expect(_parenR);
         clause.guard = null;
         clause.body = parseBlock();
-        node.handlers.push(finishNode(clause, "CatchClause"));
+        node.handler = finishNode(clause, "CatchClause");
       }
+      node.guardedHandlers = empty;
       node.finalizer = eat(_finally) ? parseBlock() : null;
-      if (!node.handlers.length && !node.finalizer)
+      if (!node.handler && !node.finalizer)
         raise(node.start, "Missing catch or finally clause");
       return finishNode(node, "TryStatement");
 
     case _var:
       next();
-      node = parseVar(node);
+      parseVar(node);
       semicolon();
-      return node;
+      return finishNode(node, "VariableDeclaration");
 
     case _while:
       next();
@@ -1180,6 +1340,7 @@
         var kind = tokType.isLoop ? "loop" : tokType === _switch ? "switch" : null;
         labels.push({name: maybeName, kind: kind});
         node.body = parseStatement();
+        labels.pop();
         node.label = expr;
         return finishNode(node, "LabeledStatement");
       } else {
@@ -1211,11 +1372,11 @@
     while (!eat(_braceR)) {
       var stmt = parseStatement();
       node.body.push(stmt);
-      if (first && isUseStrict(stmt)) {
+      if (first && allowStrict && isUseStrict(stmt)) {
         oldStrict = strict;
         setStrict(strict = true);
       }
-      first = false
+      first = false;
     }
     if (strict && !oldStrict) setStrict(false);
     return finishNode(node, "BlockStatement");
@@ -1262,7 +1423,7 @@
       node.declarations.push(finishNode(decl, "VariableDeclarator"));
       if (!eat(_comma)) break;
     }
-    return finishNode(node, "VariableDeclaration");
+    return node;
   }
 
   // ### Expression parsing
@@ -1323,7 +1484,7 @@
   // Start the precedence parser.
 
   function parseExprOps(noIn) {
-    return parseExprOp(parseMaybeUnary(noIn), -1, noIn);
+    return parseExprOp(parseMaybeUnary(), -1, noIn);
   }
 
   // Parse binary operators with the operator precedence parsing
@@ -1339,10 +1500,11 @@
         var node = startNodeFrom(left);
         node.left = left;
         node.operator = tokVal;
+        var op = tokType;
         next();
-        node.right = parseExprOp(parseMaybeUnary(noIn), prec, noIn);
-        var node = finishNode(node, /&&|\|\|/.test(node.operator) ? "LogicalExpression" : "BinaryExpression");
-        return parseExprOp(node, minPrec, noIn);
+        node.right = parseExprOp(parseMaybeUnary(), prec, noIn);
+        var exprNode = finishNode(node, (op === _logicalOR || op === _logicalAND) ? "LogicalExpression" : "BinaryExpression");
+        return parseExprOp(exprNode, minPrec, noIn);
       }
     }
     return left;
@@ -1350,13 +1512,14 @@
 
   // Parse unary operators, both prefix and postfix.
 
-  function parseMaybeUnary(noIn) {
+  function parseMaybeUnary() {
     if (tokType.prefix) {
       var node = startNode(), update = tokType.isUpdate;
       node.operator = tokVal;
       node.prefix = true;
+      tokRegexpAllowed = true;
       next();
-      node.argument = parseMaybeUnary(noIn);
+      node.argument = parseMaybeUnary();
       if (update) checkLVal(node.argument);
       else if (strict && node.operator === "delete" &&
                node.argument.type === "Identifier")
@@ -1427,12 +1590,22 @@
     case _null: case _true: case _false:
       var node = startNode();
       node.value = tokType.atomValue;
+      node.raw = tokType.keyword;
       next();
       return finishNode(node, "Literal");
 
     case _parenL:
+      var tokStartLoc1 = tokStartLoc, tokStart1 = tokStart;
       next();
       var val = parseExpression();
+      val.start = tokStart1;
+      val.end = tokEnd;
+      if (options.locations) {
+        val.loc.start = tokStartLoc1;
+        val.loc.end = tokEndLoc;
+      }
+      if (options.ranges)
+        val.range = [tokStart1, tokEnd];
       expect(_parenR);
       return val;
 
@@ -1460,14 +1633,14 @@
 
   // New's precedence is slightly tricky. It must allow its argument
   // to be a `[]` or dot subscript expression, but not a call — at
-  // least, not without wrapping it in parentheses. Thus, it uses the 
+  // least, not without wrapping it in parentheses. Thus, it uses the
 
   function parseNew() {
     var node = startNode();
     next();
-    node.callee = parseSubscripts(parseExprAtom(false), true);
+    node.callee = parseSubscripts(parseExprAtom(), true);
     if (eat(_parenL)) node.arguments = parseExprList(_parenR, false);
-    else node.arguments = [];
+    else node.arguments = empty;
     return finishNode(node, "NewExpression");
   }
 
@@ -1492,7 +1665,7 @@
         isGetSet = sawGetSet = true;
         kind = prop.kind = prop.key.name;
         prop.key = parsePropertyName();
-        if (!tokType === _parenL) unexpected();
+        if (tokType !== _parenL) unexpected();
         prop.value = parseFunction(startNode(), false);
       } else unexpected();
 
@@ -1586,8 +1759,9 @@
   function parseIdent(liberal) {
     var node = startNode();
     node.name = tokType === _name ? tokVal : (liberal && !options.forbidReserved && tokType.keyword) || unexpected();
+    tokRegexpAllowed = false;
     next();
     return finishNode(node, "Identifier");
   }
 
-})(typeof exports === "undefined" ? (window.acorn = {}) : exports);
+});
diff --git a/test/lint/walk.js b/test/lint/walk.js
index 97321acfc4..4c0d9a7f88 100644
--- a/test/lint/walk.js
+++ b/test/lint/walk.js
@@ -1,6 +1,10 @@
 // AST walker module for Mozilla Parser API compatible trees
 
-(function(exports) {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") return mod(exports); // CommonJS
+  if (typeof define == "function" && define.amd) return define(["exports"], mod); // AMD
+  mod((this.acorn || (this.acorn = {})).walk = {}); // Plain browser env
+})(function(exports) {
   "use strict";
 
   // A simple walk is one where you simply specify callbacks to be
@@ -19,11 +23,11 @@
   // walker, and state can be used to give this walked an initial
   // state.
   exports.simple = function(node, visitors, base, state) {
-    if (!base) base = exports;
+    if (!base) base = exports.base;
     function c(node, st, override) {
       var type = override || node.type, found = visitors[type];
-      if (found) found(node, st);
       base[type](node, st, c);
+      if (found) found(node, st);
     }
     c(node, state);
   };
@@ -34,51 +38,140 @@
   // their child nodes (by calling their third argument on these
   // nodes).
   exports.recursive = function(node, state, funcs, base) {
-    var visitor = exports.make(funcs, base);
+    var visitor = funcs ? exports.make(funcs, base) : base;
     function c(node, st, override) {
       visitor[override || node.type](node, st, c);
     }
     c(node, state);
   };
 
+  function makeTest(test) {
+    if (typeof test == "string")
+      return function(type) { return type == test; };
+    else if (!test)
+      return function() { return true; };
+    else
+      return test;
+  }
+
+  function Found(node, state) { this.node = node; this.state = state; }
+
+  // Find a node with a given start, end, and type (all are optional,
+  // null can be used as wildcard). Returns a {node, state} object, or
+  // undefined when it doesn't find a matching node.
+  exports.findNodeAt = function(node, start, end, test, base, state) {
+    test = makeTest(test);
+    try {
+      if (!base) base = exports.base;
+      var c = function(node, st, override) {
+        var type = override || node.type;
+        if ((start == null || node.start <= start) &&
+            (end == null || node.end >= end))
+          base[type](node, st, c);
+        if (test(type, node) &&
+            (start == null || node.start == start) &&
+            (end == null || node.end == end))
+          throw new Found(node, st);
+      };
+      c(node, state);
+    } catch (e) {
+      if (e instanceof Found) return e;
+      throw e;
+    }
+  };
+
+  // Find the innermost node of a given type that contains the given
+  // position. Interface similar to findNodeAt.
+  exports.findNodeAround = function(node, pos, test, base, state) {
+    test = makeTest(test);
+    try {
+      if (!base) base = exports.base;
+      var c = function(node, st, override) {
+        var type = override || node.type;
+        if (node.start > pos || node.end < pos) return;
+        base[type](node, st, c);
+        if (test(type, node)) throw new Found(node, st);
+      };
+      c(node, state);
+    } catch (e) {
+      if (e instanceof Found) return e;
+      throw e;
+    }
+  };
+
+  // Find the outermost matching node after a given position.
+  exports.findNodeAfter = function(node, pos, test, base, state) {
+    test = makeTest(test);
+    try {
+      if (!base) base = exports.base;
+      var c = function(node, st, override) {
+        if (node.end < pos) return;
+        var type = override || node.type;
+        if (node.start >= pos && test(type, node)) throw new Found(node, st);
+        base[type](node, st, c);
+      };
+      c(node, state);
+    } catch (e) {
+      if (e instanceof Found) return e;
+      throw e;
+    }
+  };
+
+  // Find the outermost matching node before a given position.
+  exports.findNodeBefore = function(node, pos, test, base, state) {
+    test = makeTest(test);
+    if (!base) base = exports.base;
+    var max;
+    var c = function(node, st, override) {
+      if (node.start > pos) return;
+      var type = override || node.type;
+      if (node.end <= pos && (!max || max.node.end < node.end) && test(type, node))
+        max = new Found(node, st);
+      base[type](node, st, c);
+    };
+    c(node, state);
+    return max;
+  };
+
   // Used to create a custom walker. Will fill in all missing node
   // type properties with the defaults.
   exports.make = function(funcs, base) {
-    if (!base) base = exports;
+    if (!base) base = exports.base;
     var visitor = {};
-    for (var type in base)
-      visitor[type] = funcs.hasOwnProperty(type) ? funcs[type] : base[type];
+    for (var type in base) visitor[type] = base[type];
+    for (var type in funcs) visitor[type] = funcs[type];
     return visitor;
   };
 
   function skipThrough(node, st, c) { c(node, st); }
-  function ignore(node, st, c) {}
+  function ignore(_node, _st, _c) {}
 
   // Node walkers.
 
-  exports.Program = exports.BlockStatement = function(node, st, c) {
+  var base = exports.base = {};
+  base.Program = base.BlockStatement = function(node, st, c) {
     for (var i = 0; i < node.body.length; ++i)
       c(node.body[i], st, "Statement");
   };
-  exports.Statement = skipThrough;
-  exports.EmptyStatement = ignore;
-  exports.ExpressionStatement = function(node, st, c) {
+  base.Statement = skipThrough;
+  base.EmptyStatement = ignore;
+  base.ExpressionStatement = function(node, st, c) {
     c(node.expression, st, "Expression");
   };
-  exports.IfStatement = function(node, st, c) {
+  base.IfStatement = function(node, st, c) {
     c(node.test, st, "Expression");
     c(node.consequent, st, "Statement");
     if (node.alternate) c(node.alternate, st, "Statement");
   };
-  exports.LabeledStatement = function(node, st, c) {
+  base.LabeledStatement = function(node, st, c) {
     c(node.body, st, "Statement");
   };
-  exports.BreakStatement = exports.ContinueStatement = ignore;
-  exports.WithStatement = function(node, st, c) {
+  base.BreakStatement = base.ContinueStatement = ignore;
+  base.WithStatement = function(node, st, c) {
     c(node.object, st, "Expression");
     c(node.body, st, "Statement");
   };
-  exports.SwitchStatement = function(node, st, c) {
+  base.SwitchStatement = function(node, st, c) {
     c(node.discriminant, st, "Expression");
     for (var i = 0; i < node.cases.length; ++i) {
       var cs = node.cases[i];
@@ -87,101 +180,104 @@
         c(cs.consequent[j], st, "Statement");
     }
   };
-  exports.ReturnStatement = function(node, st, c) {
+  base.ReturnStatement = function(node, st, c) {
     if (node.argument) c(node.argument, st, "Expression");
   };
-  exports.ThrowStatement = function(node, st, c) {
+  base.ThrowStatement = function(node, st, c) {
     c(node.argument, st, "Expression");
   };
-  exports.TryStatement = function(node, st, c) {
+  base.TryStatement = function(node, st, c) {
     c(node.block, st, "Statement");
-    for (var i = 0; i < node.handlers.length; ++i)
-      c(node.handlers[i].body, st, "ScopeBody");
+    if (node.handler) c(node.handler.body, st, "ScopeBody");
     if (node.finalizer) c(node.finalizer, st, "Statement");
   };
-  exports.WhileStatement = function(node, st, c) {
+  base.WhileStatement = function(node, st, c) {
     c(node.test, st, "Expression");
     c(node.body, st, "Statement");
   };
-  exports.DoWhileStatement = exports.WhileStatement;
-  exports.ForStatement = function(node, st, c) {
+  base.DoWhileStatement = base.WhileStatement;
+  base.ForStatement = function(node, st, c) {
     if (node.init) c(node.init, st, "ForInit");
     if (node.test) c(node.test, st, "Expression");
     if (node.update) c(node.update, st, "Expression");
     c(node.body, st, "Statement");
   };
-  exports.ForInStatement = function(node, st, c) {
+  base.ForInStatement = function(node, st, c) {
     c(node.left, st, "ForInit");
     c(node.right, st, "Expression");
     c(node.body, st, "Statement");
   };
-  exports.ForInit = function(node, st, c) {
+  base.ForInit = function(node, st, c) {
     if (node.type == "VariableDeclaration") c(node, st);
     else c(node, st, "Expression");
   };
-  exports.DebuggerStatement = ignore;
+  base.DebuggerStatement = ignore;
 
-  exports.FunctionDeclaration = function(node, st, c) {
+  base.FunctionDeclaration = function(node, st, c) {
     c(node, st, "Function");
   };
-  exports.VariableDeclaration = function(node, st, c) {
+  base.VariableDeclaration = function(node, st, c) {
     for (var i = 0; i < node.declarations.length; ++i) {
       var decl = node.declarations[i];
       if (decl.init) c(decl.init, st, "Expression");
     }
   };
 
-  exports.Function = function(node, st, c) {
+  base.Function = function(node, st, c) {
     c(node.body, st, "ScopeBody");
   };
-  exports.ScopeBody = function(node, st, c) {
+  base.ScopeBody = function(node, st, c) {
     c(node, st, "Statement");
   };
 
-  exports.Expression = skipThrough;
-  exports.ThisExpression = ignore;
-  exports.ArrayExpression = function(node, st, c) {
+  base.Expression = skipThrough;
+  base.ThisExpression = ignore;
+  base.ArrayExpression = function(node, st, c) {
     for (var i = 0; i < node.elements.length; ++i) {
       var elt = node.elements[i];
       if (elt) c(elt, st, "Expression");
     }
   };
-  exports.ObjectExpression = function(node, st, c) {
+  base.ObjectExpression = function(node, st, c) {
     for (var i = 0; i < node.properties.length; ++i)
       c(node.properties[i].value, st, "Expression");
   };
-  exports.FunctionExpression = exports.FunctionDeclaration;
-  exports.SequenceExpression = function(node, st, c) {
+  base.FunctionExpression = base.FunctionDeclaration;
+  base.SequenceExpression = function(node, st, c) {
     for (var i = 0; i < node.expressions.length; ++i)
       c(node.expressions[i], st, "Expression");
   };
-  exports.UnaryExpression = exports.UpdateExpression = function(node, st, c) {
+  base.UnaryExpression = base.UpdateExpression = function(node, st, c) {
     c(node.argument, st, "Expression");
   };
-  exports.BinaryExpression = exports.AssignmentExpression = exports.LogicalExpression = function(node, st, c) {
+  base.BinaryExpression = base.AssignmentExpression = base.LogicalExpression = function(node, st, c) {
     c(node.left, st, "Expression");
     c(node.right, st, "Expression");
   };
-  exports.ConditionalExpression = function(node, st, c) {
+  base.ConditionalExpression = function(node, st, c) {
     c(node.test, st, "Expression");
     c(node.consequent, st, "Expression");
     c(node.alternate, st, "Expression");
   };
-  exports.NewExpression = exports.CallExpression = function(node, st, c) {
+  base.NewExpression = base.CallExpression = function(node, st, c) {
     c(node.callee, st, "Expression");
     if (node.arguments) for (var i = 0; i < node.arguments.length; ++i)
       c(node.arguments[i], st, "Expression");
   };
-  exports.MemberExpression = function(node, st, c) {
+  base.MemberExpression = function(node, st, c) {
     c(node.object, st, "Expression");
     if (node.computed) c(node.property, st, "Expression");
   };
-  exports.Identifier = exports.Literal = ignore;
+  base.Identifier = base.Literal = ignore;
 
   // A custom walker that keeps track of the scope chain and the
   // variables defined in it.
-  function makeScope(prev) {
-    return {vars: Object.create(null), prev: prev};
+  function makeScope(prev, isCatch) {
+    return {vars: Object.create(null), prev: prev, isCatch: isCatch};
+  }
+  function normalScope(scope) {
+    while (scope.isCatch) scope = scope.prev;
+    return scope;
   }
   exports.scopeVisitor = exports.make({
     Function: function(node, scope, c) {
@@ -190,27 +286,28 @@
         inner.vars[node.params[i].name] = {type: "argument", node: node.params[i]};
       if (node.id) {
         var decl = node.type == "FunctionDeclaration";
-        (decl ? scope : inner).vars[node.id.name] =
+        (decl ? normalScope(scope) : inner).vars[node.id.name] =
           {type: decl ? "function" : "function name", node: node.id};
       }
       c(node.body, inner, "ScopeBody");
     },
     TryStatement: function(node, scope, c) {
       c(node.block, scope, "Statement");
-      for (var i = 0; i < node.handlers.length; ++i) {
-        var handler = node.handlers[i], inner = makeScope(scope);
-        inner.vars[handler.param.name] = {type: "catch clause", node: handler.param};
-        c(handler.body, inner, "ScopeBody");
+      if (node.handler) {
+        var inner = makeScope(scope, true);
+        inner.vars[node.handler.param.name] = {type: "catch clause", node: node.handler.param};
+        c(node.handler.body, inner, "ScopeBody");
       }
       if (node.finalizer) c(node.finalizer, scope, "Statement");
     },
     VariableDeclaration: function(node, scope, c) {
+      var target = normalScope(scope);
       for (var i = 0; i < node.declarations.length; ++i) {
         var decl = node.declarations[i];
-        scope.vars[decl.id.name] = {type: "var", node: decl.id};
+        target.vars[decl.id.name] = {type: "var", node: decl.id};
         if (decl.init) c(decl.init, scope, "Expression");
       }
     }
   });
 
-})(typeof exports == "undefined" ? acorn.walk = {} : exports);
+});

From 73a3efe1ce0f8c50686f7f6a5961307615c77c65 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Dec 2013 20:38:42 +0100
Subject: [PATCH 0844/4742] [linter] Check for reused loop variables

---
 test/lint/lint.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/lint/lint.js b/test/lint/lint.js
index fda737c087..f14e2c4fe3 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -95,9 +95,26 @@ function checkFile(fileName) {
     },
     FunctionExpression: function(node) {
       if (node.id) fail("Named function expression", node.loc);
+    },
+    ForStatement: function(node) {
+      checkReusedIndex(node);
     }
   }, scopePasser);
 
+  function checkReusedIndex(node) {
+    if (!node.init || node.init.type != "VariableDeclaration") return;
+    var name = node.init.declarations[0].id.name;
+    walk.recursive(node.body, null, {
+      Function: function() {},
+      VariableDeclaration: function(node, st, c) {
+        for (var i = 0; i < node.declarations.length; i++)
+          if (node.declarations[i].id.name == name)
+            fail("redefined loop variable", node.declarations[i].id.loc);
+        walk.base.VariableDeclaration(node, st, c);
+      }
+    });
+  }
+
   if (!globalsSeen.exports) {
     var allowedGlobals = Object.create(topAllowedGlobals), m;
     if (m = file.match(/\/\/ declare global:\s+(.*)/))

From 010ca15eef347ef8060e083ae400055e103f0230 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Dec 2013 20:39:02 +0100
Subject: [PATCH 0845/4742] Fix reused loop variable in readInput

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5996ecb111..912c401213 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1607,8 +1607,8 @@
           cm.options.smartIndent && range.head.ch < 100 &&
           (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
         var electric = cm.getModeAt(range.head).electricChars;
-        if (electric) for (var i = 0; i < electric.length; i++)
-          if (inserted.indexOf(electric.charAt(i)) > -1) {
+        if (electric) for (var j = 0; j < electric.length; j++)
+          if (inserted.indexOf(electric.charAt(j)) > -1) {
             indentLine(cm, range.head.line, "smart");
             break;
           }

From bd79a7217fdc8f634a3e6bc82d748c58a0d84468 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Dec 2013 20:39:16 +0100
Subject: [PATCH 0846/4742] [continuecomment addon] Fix another reused loop
 variable

---
 addon/comment/continuecomment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 6db3b0a2b9..bcb4c83710 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -30,7 +30,7 @@
           insert = full.slice(0, token.start);
           if (!/^\s*$/.test(insert)) {
             insert = "";
-            for (var i = 0; i < token.start; ++i) insert += " ";
+            for (var j = 0; j < token.start; ++j) insert += " ";
           }
         } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
                    found + mode.blockCommentContinue.length > token.start &&

From 214041afa4c172c17f91b7927266bdd81cab11d1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Dec 2013 21:20:15 +0100
Subject: [PATCH 0847/4742] Change data structure used to track rendered lines

Simplifies updateDisplay, remove lineObj property on DOM nodes.

Prepares the way for smarter updating, and maybe smarter measuring.

Breaks updating of lines without redrawing their widgets (which I
intend to implement in a better way in a subsequent patch).
---
 lib/codemirror.js | 376 ++++++++++++++++++++++------------------------
 1 file changed, 183 insertions(+), 193 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 912c401213..a76fc8b14e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -157,7 +157,9 @@
 
     // Current visible range (may be bigger than the view window).
     d.viewOffset = d.lastSizeC = 0;
-    d.showingFrom = d.showingTo = docStart;
+    d.viewFrom = d.viewTo = docStart;
+    d.view = [];
+    d.updateLineNumbers = null;
 
     // Used to only resize the line number gutter when necessary (when
     // the amount of lines crosses a boundary that makes its width change)
@@ -423,14 +425,13 @@
 
   // DISPLAY DRAWING
 
-  function updateDisplay(cm, changes, viewPort, forced) {
-    var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;
+  function updateDisplay(cm, viewChanged, viewPort, forced) {
+    var oldFrom = cm.display.viewFrom, oldTo = cm.display.viewTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
     for (var first = true;; first = false) {
       var oldWidth = cm.display.scroller.clientWidth;
-      if (!updateDisplayInner(cm, changes, visible, forced)) break;
+      if (!updateDisplayInner(cm, !updated && viewChanged, visible, forced)) break;
       updated = true;
-      changes = [];
       updateSelection(cm);
       updateScrollbars(cm);
       if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
@@ -444,14 +445,15 @@
         viewPort = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight,
                             typeof viewPort == "number" ? viewPort : viewPort.top);
       visible = visibleLines(cm.display, cm.doc, viewPort);
-      if (visible.from >= cm.display.showingFrom && visible.to <= cm.display.showingTo)
+      if (visible.from >= cm.display.viewFrom && visible.to <= cm.display.viewTo)
         break;
     }
 
+    cm.display.updateLineNumbers = null;
     if (updated) {
       signalLater(cm, "update", cm);
-      if (cm.display.showingFrom != oldFrom || cm.display.showingTo != oldTo)
-        signalLater(cm, "viewportChange", cm, cm.display.showingFrom, cm.display.showingTo);
+      if (cm.display.viewFrom != oldFrom || cm.display.viewTo != oldTo)
+        signalLater(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
     }
     return updated;
   }
@@ -459,92 +461,55 @@
   // Uses a set of changes plus the current scroll position to
   // determine which DOM updates have to be made, and makes the
   // updates.
-  function updateDisplayInner(cm, changes, visible, forced) {
+  function updateDisplayInner(cm, viewChanged, visible, forced) {
     var display = cm.display, doc = cm.doc;
     if (!display.wrapper.offsetWidth) {
-      display.showingFrom = display.showingTo = doc.first;
-      display.viewOffset = 0;
+      resetView(cm);
       return;
     }
 
     // Bail out if the visible area is already rendered and nothing changed.
-    if (!forced && changes.length == 0 &&
-        visible.from > display.showingFrom && visible.to < display.showingTo)
+    if (!forced && !viewChanged &&
+        visible.from > display.viewFrom && visible.to < display.viewTo)
       return;
 
     if (maybeUpdateLineNumberWidth(cm))
-      changes = [{from: doc.first, to: doc.first + doc.size}];
+      resetView(cm);
     var gutterW = display.sizer.style.marginLeft = display.gutters.offsetWidth + "px";
     display.scrollbarH.style.left = cm.options.fixedGutter ? gutterW : "0";
 
-    // Used to determine which lines need their line numbers updated
-    var positionsChangedFrom = Infinity;
-    if (cm.options.lineNumbers)
-      for (var i = 0; i < changes.length; ++i)
-        if (changes[i].diff && changes[i].from < positionsChangedFrom) { positionsChangedFrom = changes[i].from; }
-
     var end = doc.first + doc.size;
     var from = Math.max(visible.from - cm.options.viewportMargin, doc.first);
     var to = Math.min(end, visible.to + cm.options.viewportMargin);
-    if (display.showingFrom < from && from - display.showingFrom < 20) from = Math.max(doc.first, display.showingFrom);
-    if (display.showingTo > to && display.showingTo - to < 20) to = Math.min(end, display.showingTo);
+    if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
+    if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
     if (sawCollapsedSpans) {
       from = lineNo(visualLine(getLine(doc, from)));
       while (to < end && lineIsHidden(doc, getLine(doc, to))) ++to;
     }
 
-    // Create a range of theoretically intact lines, and punch holes
-    // in that using the change info.
-    var intact = [{from: Math.max(display.showingFrom, doc.first),
-                   to: Math.min(display.showingTo, end)}];
-    if (intact[0].from >= intact[0].to) intact = [];
-    else intact = computeIntact(intact, changes);
-    // When merged lines are present, we might have to reduce the
-    // intact ranges because changes in continued fragments of the
-    // intact lines do require the lines to be redrawn.
-    if (sawCollapsedSpans)
-      for (var i = 0; i < intact.length; ++i) {
-        var range = intact[i], merged;
-        while (merged = collapsedSpanAtEnd(getLine(doc, range.to - 1))) {
-          var newTo = merged.find(-1).line;
-          if (newTo > range.from) range.to = newTo;
-          else { intact.splice(i--, 1); break; }
-        }
-      }
+    var different = from != display.viewFrom || to != display.viewTo ||
+      display.lastSizeC != display.wrapper.clientHeight;
+    adjustView(cm, from, to);
 
-    // Clip off the parts that won't be visible
-    var intactLines = 0;
-    for (var i = 0; i < intact.length; ++i) {
-      var range = intact[i];
-      if (range.from < from) range.from = from;
-      if (range.to > to) range.to = to;
-      if (range.from >= range.to) intact.splice(i--, 1);
-      else intactLines += range.to - range.from;
-    }
-    if (!forced && intactLines == to - from && from == display.showingFrom && to == display.showingTo) {
+    var toUpdate = 0;
+    for (var i = 0; i < display.view.length; i++)
+      if (!display.view[i].node) ++toUpdate;
+    if (!different && toUpdate == 0 && !forced) {
       updateViewOffset(cm);
       return;
     }
-    intact.sort(function(a, b) {return a.from - b.from;});
 
-    // Avoid crashing on IE's "unspecified error" when in iframes
-    try {
-      var focused = document.activeElement;
-    } catch(e) {}
-    if (intactLines < (to - from) * .7) display.lineDiv.style.display = "none";
-    patchDisplay(cm, from, to, intact, positionsChangedFrom);
-    display.lineDiv.style.display = "";
+    var focused = document.activeElement;
+    if (toUpdate > 4) display.lineDiv.style.display = "none";
+    patchDisplay(cm, display.updateLineNumbers);
+    if (toUpdate > 4) display.lineDiv.style.display = "";
     if (focused && document.activeElement != focused && focused.offsetHeight) focused.focus();
 
-    var different = from != display.showingFrom || to != display.showingTo ||
-      display.lastSizeC != display.wrapper.clientHeight;
-    // This is just a bogus formula that detects when the editor is
-    // resized or the font size changes.
     if (different) {
       display.lastSizeC = display.wrapper.clientHeight;
       startWorker(cm, 400);
     }
-    display.showingFrom = from; display.showingTo = to;
 
     display.gutters.style.height = "";
     updateHeightsInViewport(cm);
@@ -556,53 +521,38 @@
   function updateHeightsInViewport(cm) {
     var display = cm.display;
     var prevBottom = display.lineDiv.offsetTop;
-    for (var node = display.lineDiv.firstChild, height; node; node = node.nextSibling) if (node.lineObj) {
+    for (var i = 0; i < display.view.length; i++) {
+      var cur = display.view[i], height;
       if (ie_lt8) {
-        var bot = node.offsetTop + node.offsetHeight;
+        var bot = cur.node.offsetTop + cur.node.offsetHeight;
         height = bot - prevBottom;
         prevBottom = bot;
       } else {
-        var box = getRect(node);
+        var box = getRect(cur.node);
         height = box.bottom - box.top;
       }
-      var diff = node.lineObj.height - height;
+      var diff = cur.line.height - height;
       if (height < 2) height = textHeight(display);
       if (diff > .001 || diff < -.001) {
-        updateLineHeight(node.lineObj, height);
-        var widgets = node.lineObj.widgets;
-        if (widgets) for (var i = 0; i < widgets.length; ++i)
-          widgets[i].height = widgets[i].node.offsetHeight;
+        updateLineHeight(cur.line, height);
+        updateWidgetHeight(cur.line);
+        if (cur.cont) for (var j = 0; j < cur.cont.length; j++)
+          updateWidgetHeight(cur.cont[j]);
       }
     }
   }
 
+  function updateWidgetHeight(line) {
+    if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
+      line.widgets[i].height = line.widgets[i].node.offsetHeight;
+  }
+
   function updateViewOffset(cm) {
-    var off = cm.display.viewOffset = heightAtLine(getLine(cm.doc, cm.display.showingFrom));
+    var off = cm.display.viewOffset = heightAtLine(getLine(cm.doc, cm.display.viewFrom));
     // Position the mover div to align with the current virtual scroll position
     cm.display.mover.style.top = off + "px";
   }
 
-  function computeIntact(intact, changes) {
-    for (var i = 0, l = changes.length || 0; i < l; ++i) {
-      var change = changes[i], intact2 = [], diff = change.diff || 0;
-      for (var j = 0, l2 = intact.length; j < l2; ++j) {
-        var range = intact[j];
-        if (change.to <= range.from && change.diff) {
-          intact2.push({from: range.from + diff, to: range.to + diff});
-        } else if (change.to <= range.from || change.from >= range.to) {
-          intact2.push(range);
-        } else {
-          if (change.from > range.from)
-            intact2.push({from: range.from, to: change.from});
-          if (change.to < range.to)
-            intact2.push({from: change.to + diff, to: range.to + diff});
-        }
-      }
-      intact = intact2;
-    }
-    return intact;
-  }
-
   function getDimensions(cm) {
     var d = cm.display, left = {}, width = {};
     for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
@@ -616,111 +566,56 @@
             wrapperWidth: d.wrapper.clientWidth};
   }
 
-  function patchDisplay(cm, from, to, intact, updateNumbersFrom) {
+  function patchDisplay(cm, updateNumbersFrom) {
     var dims = getDimensions(cm);
     var display = cm.display, lineNumbers = cm.options.lineNumbers;
-    if (!intact.length && (!webkit || !cm.display.currentWheelTarget))
-      removeChildren(display.lineDiv);
     var container = display.lineDiv, cur = container.firstChild;
 
     function rm(node) {
       var next = node.nextSibling;
-      if (webkit && mac && cm.display.currentWheelTarget == node) {
+      if (webkit && mac && cm.display.currentWheelTarget == node)
         node.style.display = "none";
-        node.lineObj = null;
-      } else {
+      else
         node.parentNode.removeChild(node);
-      }
       return next;
     }
 
-    var nextIntact = intact.shift(), lineN = from;
-    cm.doc.iter(from, to, function(line) {
-      if (nextIntact && nextIntact.to == lineN) nextIntact = intact.shift();
-      if (lineIsHidden(cm.doc, line)) {
-        if (line.height != 0) updateLineHeight(line, 0);
-        if (line.widgets && cur && cur.previousSibling) for (var i = 0; i < line.widgets.length; ++i) {
-          var w = line.widgets[i];
-          if (w.showIfHidden) {
-            var prev = cur.previousSibling;
-            if (/pre/i.test(prev.nodeName)) {
-              var wrap = elt("div", null, null, "position: relative");
-              prev.parentNode.replaceChild(wrap, prev);
-              wrap.appendChild(prev);
-              prev = wrap;
-            }
-            var wnode = prev.appendChild(elt("div", [w.node], "CodeMirror-linewidget"));
-            if (!w.handleMouseEvents) wnode.ignoreEvents = true;
-            positionLineWidget(w, wnode, prev, dims);
-          }
-        }
-      } else if (nextIntact && nextIntact.from <= lineN && nextIntact.to > lineN) {
-        // This line is intact. Skip to the actual node. Update its
-        // line number if needed.
-        while (cur.lineObj != line) cur = rm(cur);
+    var view = display.view, lineN = display.viewFrom;
+    for (var i = 0; i < view.length; i++) {
+      var line = view[i];
+      if (line.node) {
+        // This line is already drawn. Skip to the actual node. Update
+        // its line number if needed.
+        while (cur != line.node) cur = rm(cur);
         if (lineNumbers && updateNumbersFrom <= lineN && cur.lineNumber)
           setTextContent(cur.lineNumber, lineNumberFor(cm.options, lineN));
         cur = cur.nextSibling;
       } else {
-        // For lines with widgets, make an attempt to find and reuse
-        // the existing element, so that widgets aren't needlessly
-        // removed and re-inserted into the dom
-        if (line.widgets) for (var j = 0, search = cur, reuse; search && j < 20; ++j, search = search.nextSibling)
-          if (search.lineObj == line && /div/i.test(search.nodeName)) { reuse = search; break; }
-        // This line needs to be generated.
-        var lineNode = buildLineElement(cm, line, lineN, dims, reuse);
-        if (lineNode != reuse) {
-          container.insertBefore(lineNode, cur);
-        } else {
-          while (cur != reuse) cur = rm(cur);
-          cur = cur.nextSibling;
-        }
-
-        lineNode.lineObj = line;
+        line.node = buildLineElement(cm, line, lineN, dims);
+        container.insertBefore(line.node, cur);
       }
-      ++lineN;
-    });
+      lineN += line.size;
+    }
     while (cur) cur = rm(cur);
   }
 
-  function buildLineElement(cm, line, lineNo, dims, reuse) {
+  function buildLineElement(cm, view, lineNo, dims) {
+    var line = view.line;
     var built = buildLineContent(cm, line), lineElement = built.pre;
     var markers = line.gutterMarkers, display = cm.display, wrap;
 
     var bgClass = built.bgClass ? built.bgClass + " " + (line.bgClass || "") : line.bgClass;
-    if (!cm.options.lineNumbers && !markers && !bgClass && !line.wrapClass && !line.widgets)
+    var hasWidgets = line.widgets;
+    if (view.cont) for (var i = 0; !hasWidgets && i < view.cont.length; ++i)
+      hasWidgets = view.cont[i].widgets;
+
+    if (!cm.options.lineNumbers && !markers && !bgClass && !line.wrapClass && !hasWidgets)
       return lineElement;
 
     // Lines with gutter elements, widgets or a background class need
     // to be wrapped again, and have the extra elements added to the
     // wrapper div
 
-    if (reuse) {
-      reuse.alignable = null;
-      var isOk = true, widgetsSeen = 0, insertBefore = null;
-      for (var n = reuse.firstChild, next; n; n = next) {
-        next = n.nextSibling;
-        if (!/\bCodeMirror-linewidget\b/.test(n.className)) {
-          reuse.removeChild(n);
-        } else {
-          for (var i = 0; i < line.widgets.length; ++i) {
-            var widget = line.widgets[i];
-            if (widget.node == n.firstChild) {
-              if (!widget.above && !insertBefore) insertBefore = n;
-              positionLineWidget(widget, n, reuse, dims);
-              ++widgetsSeen;
-              break;
-            }
-          }
-          if (i == line.widgets.length) { isOk = false; break; }
-        }
-      }
-      reuse.insertBefore(lineElement, insertBefore);
-      if (isOk && widgetsSeen == line.widgets.length) {
-        wrap = reuse;
-        reuse.className = line.wrapClass || "";
-      }
-    }
     if (!wrap) {
       wrap = elt("div", null, line.wrapClass, "position: relative");
       wrap.appendChild(lineElement);
@@ -748,17 +643,23 @@
         }
     }
     if (ie_lt8) wrap.style.zIndex = 2;
-    if (line.widgets && wrap != reuse) for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
+    addLineWidgets(cm, line, wrap, dims, lineElement);
+    if (view.cont) for (var i = 0; i < view.cont.length; i++)
+      addLineWidgets(cm, view.cont[i], wrap, dims);
+    return wrap;
+  }
+
+  function addLineWidgets(cm, line, wrap, dims, above) {
+    if (line.widgets) for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
       var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
       if (!widget.handleMouseEvents) node.ignoreEvents = true;
       positionLineWidget(widget, node, wrap, dims);
-      if (widget.above)
-        wrap.insertBefore(node, cm.options.lineNumbers && line.height != 0 ? gutterWrap : lineElement);
+      if (above && widget.above)
+        wrap.insertBefore(node, cm.options.lineNumbers && line.height != 0 ? gutterWrap : above);
       else
         wrap.appendChild(node);
       signalLater(widget, "redraw");
     }
-    return wrap;
   }
 
   function positionLineWidget(widget, node, wrap, dims) {
@@ -986,19 +887,19 @@
   // HIGHLIGHT WORKER
 
   function startWorker(cm, time) {
-    if (cm.doc.mode.startState && cm.doc.frontier < cm.display.showingTo)
+    if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
       cm.state.highlight.set(time, bind(highlightWorker, cm));
   }
 
   function highlightWorker(cm) {
     var doc = cm.doc;
     if (doc.frontier < doc.first) doc.frontier = doc.first;
-    if (doc.frontier >= cm.display.showingTo) return;
+    if (doc.frontier >= cm.display.viewTo) return;
     var end = +new Date + cm.options.workTime;
     var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
     var changed = [], prevChange;
-    doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.showingTo + 500), function(line) {
-      if (doc.frontier >= cm.display.showingFrom) { // Visible
+    doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
+      if (doc.frontier >= cm.display.viewFrom) { // Visible
         var oldStyles = line.styles;
         line.styles = highlightLine(cm, line, state, true);
         var ischange = !oldStyles || oldStyles.length != line.styles.length;
@@ -1054,7 +955,7 @@
     else state = copyState(doc.mode, state);
     doc.iter(pos, n, function(line) {
       processLine(cm, line.text, state);
-      var save = pos == n - 1 || pos % 5 == 0 || pos >= display.showingFrom && pos < display.showingTo;
+      var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo;
       line.stateAfter = save ? copyState(doc.mode, state) : null;
       ++pos;
     });
@@ -1437,7 +1338,7 @@
     cm.curOp = {
       // An array of ranges of lines that have to be updated. See
       // updateDisplay.
-      changes: [],
+      viewChanged: false,
       forceUpdate: false,
       updateInput: null,
       userSelChange: null,
@@ -1471,8 +1372,8 @@
       var coords = cursorCoords(cm, doc.sel.primary().head);
       newScrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);
     }
-    if (op.changes.length || op.forceUpdate || newScrollPos && newScrollPos.scrollTop != null) {
-      updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop, op.forceUpdate);
+    if (op.viewChanged || op.forceUpdate || newScrollPos && newScrollPos.scrollTop != null) {
+      updated = updateDisplay(cm, op.viewChanged, newScrollPos && newScrollPos.scrollTop, op.forceUpdate);
       if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
     }
     if (!updated && op.selectionChanged) updateSelection(cm);
@@ -1537,10 +1438,87 @@
     return result;
   }
 
+  // CHANGE TRACKING
+
+  // Updates the display.view data structure for a given change to
+  // the document. From and to are in pre-change coordinates. Lendiff
+  // is the amount of lines added or subtracted by the change.
   function regChange(cm, from, to, lendiff) {
     if (from == null) from = cm.doc.first;
     if (to == null) to = cm.doc.first + cm.doc.size;
-    cm.curOp.changes.push({from: from, to: to, diff: lendiff});
+    if (!lendiff) lendiff = 0;
+    var display = cm.display;
+    if (lendiff && to < display.viewTo &&
+        (display.updateLineNumbers == null || display.updateLineNumbers > from))
+      display.updateLineNumbers = from;
+
+    cm.curOp.viewChanged = true;
+
+    if (from >= display.viewTo) { // Change after
+    } else if (to <= display.viewFrom) { // Change before
+      display.viewFrom += lendiff;
+      display.viewTo += lendiff;
+    } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
+      resetView(cm);
+    } else if (from <= display.viewFrom) { // Top overlap
+      display.view = display.view.slice(findViewIndex(cm, to));
+      display.viewFrom = to;
+      display.viewTo += lendiff;
+    } else if (to >= display.viewTo) { // Bottom overlap
+      display.view = display.view.slice(0, findViewIndex(cm, from));
+      display.viewTo = from;
+    } else { // Gap in the middle
+      display.view = display.view.slice(0, findViewIndex(cm, from))
+        .concat(buildViewArray(cm, from, to + lendiff))
+        .concat(display.view.slice(findViewIndex(cm, to)));
+      display.viewTo += lendiff;
+    }
+  }
+
+  function resetView(cm) {
+    cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
+    cm.display.view = [];
+    cm.display.viewOffset = 0;
+  }
+
+  function findViewIndex(cm, n) {
+    if (n >= cm.display.viewTo) return null;
+    n -= cm.display.viewFrom;
+    if (n < 0) return null;
+    var view = cm.display.view;
+    for (var i = 0; i < view.length; i++) {
+      n -= view[i].size;
+      if (n < 0) return i;
+    }
+  }
+
+  function adjustView(cm, from, to) {
+    var display = cm.display, view = display.view;
+    if (view.length == 0 || from >= display.viewFrom || to <= display.viewTo) {
+      display.view = buildViewArray(cm, from, to);
+      display.viewFrom = from;
+    } else {
+      if (display.viewFrom > from)
+        display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view);
+      else if (display.viewFrom < from)
+        display.view = display.view.slice(findViewIndex(cm, from));
+      display.viewFrom = from;
+      if (display.viewTo < to)
+        display.view = display.view.concat(buildViewArray(cm, display.viewTo, to));
+      else if (display.viewTo > to)
+        display.view = display.view.slice(0, findViewIndex(cm, to));
+    }
+    display.viewTo = to;
+  }
+
+  function buildViewArray(cm, from, to) {
+    var array = [], nextPos;
+    for (var pos = from; pos < to; pos = nextPos) {
+      var line = getLine(cm.doc, pos), cont = visualLineContinued(line);
+      var nextPos = (cont ? lineNo(lst(cont)) : pos) + 1;
+      array.push({line: line, cont: cont, size: nextPos - pos, node: null});
+    }
+    return array;
   }
 
   // INPUT HANDLING
@@ -2101,10 +2079,10 @@
   function setScrollTop(cm, val) {
     if (Math.abs(cm.doc.scrollTop - val) < 2) return;
     cm.doc.scrollTop = val;
-    if (!gecko) updateDisplay(cm, [], val);
+    if (!gecko) updateDisplay(cm, false, val);
     if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
     if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;
-    if (gecko) updateDisplay(cm, []);
+    if (gecko) updateDisplay(cm, false);
     startWorker(cm, 100);
   }
   function setScrollLeft(cm, val, isScroller) {
@@ -2153,10 +2131,12 @@
     // This hack (see related code in patchDisplay) makes sure the
     // element is kept around.
     if (dy && mac && webkit) {
-      for (var cur = e.target; cur != scroll; cur = cur.parentNode) {
-        if (cur.lineObj) {
-          cm.display.currentWheelTarget = cur;
-          break;
+      outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
+        for (var i = 0; i < view.length; i++) {
+          if (view[i].node == cur) {
+            cm.display.currentWheelTarget = cur;
+            break outer;
+          }
         }
       }
     }
@@ -2181,7 +2161,7 @@
       var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
       if (pixels < 0) top = Math.max(0, top + pixels - 50);
       else bot = Math.min(cm.doc.height, bot + pixels + 50);
-      updateDisplay(cm, [], {top: top, bottom: bot});
+      updateDisplay(cm, false, {top: top, bottom: bot});
     }
 
     if (wheelSamples < 20) {
@@ -3339,7 +3319,7 @@
               widgets: line.widgets};
     },
 
-    getViewport: function() { return {from: this.display.showingFrom, to: this.display.showingTo};},
+    getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo};},
 
     addWidget: function(pos, node, scroll, vert, horiz) {
       var display = this.display;
@@ -4165,9 +4145,10 @@
     if (!pos || !cm) return;
     var line = pos.line, lineN = lineNo(pos.line);
     clearCachedMeasurement(cm, line);
-    if (lineN >= cm.display.showingFrom && lineN < cm.display.showingTo) {
-      for (var node = cm.display.lineDiv.firstChild; node; node = node.nextSibling) if (node.lineObj == line) {
-        if (node.offsetHeight != line.height) updateLineHeight(line, node.offsetHeight);
+    if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) {
+      for (var view = cm.display.view, i = 0; i < view.length; i++) if (view[i].line == line) {
+        if (view[i].node.offsetHeight != line.height)
+          updateLineHeight(line, view[i].node.offsetHeight);
         break;
       }
       runInOp(cm, function() {
@@ -4506,6 +4487,15 @@
     return line;
   }
 
+  function visualLineContinued(line) {
+    var merged, lines;
+    while (merged = collapsedSpanAtEnd(line)) {
+      line = merged.find(1, true).line;
+      (lines || (lines = [])).push(line);
+    }
+    return lines;
+  }
+
   function lineIsHidden(doc, line) {
     var sps = sawCollapsedSpans && line.markedSpans;
     if (sps) for (var sp, i = 0; i < sps.length; ++i) {

From df565bcd26ad28c9bc6f3b761f09902db055fc22 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Dec 2013 21:50:25 +0100
Subject: [PATCH 0848/4742] Stop adding `alignable` and `lineNumber` properties
 to DOM nodes

---
 lib/codemirror.js | 56 ++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a76fc8b14e..c8dac7312e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -388,12 +388,14 @@
   // LINE NUMBERS
 
   function alignHorizontally(cm) {
-    var display = cm.display;
+    var display = cm.display, view = display.view;
     if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
     var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
-    var gutterW = display.gutters.offsetWidth, l = comp + "px";
-    for (var n = display.lineDiv.firstChild; n; n = n.nextSibling) if (n.alignable) {
-      for (var i = 0, a = n.alignable; i < a.length; ++i) a[i].style.left = l;
+    var gutterW = display.gutters.offsetWidth, left = comp + "px";
+    for (var i = 0; i < view.length; i++) {
+      var align = view[i].alignable;
+      if (align) for (var j = 0; j < align.length; j++)
+        align[j].style.left = left;
     }
     if (cm.options.fixedGutter)
       display.gutters.style.left = (comp + gutterW) + "px";
@@ -582,35 +584,35 @@
 
     var view = display.view, lineN = display.viewFrom;
     for (var i = 0; i < view.length; i++) {
-      var line = view[i];
-      if (line.node) {
+      var lineView = view[i];
+      if (lineView.node) {
         // This line is already drawn. Skip to the actual node. Update
         // its line number if needed.
-        while (cur != line.node) cur = rm(cur);
-        if (lineNumbers && updateNumbersFrom <= lineN && cur.lineNumber)
-          setTextContent(cur.lineNumber, lineNumberFor(cm.options, lineN));
+        while (cur != lineView.node) cur = rm(cur);
+        if (lineNumbers && updateNumbersFrom <= lineN && lineView.lineNumber)
+          setTextContent(lineView.lineNumber, lineNumberFor(cm.options, lineN));
         cur = cur.nextSibling;
       } else {
-        line.node = buildLineElement(cm, line, lineN, dims);
-        container.insertBefore(line.node, cur);
+        var node = buildLineElement(cm, lineView, lineN, dims);
+        container.insertBefore(node, cur);
       }
-      lineN += line.size;
+      lineN += lineView.size;
     }
     while (cur) cur = rm(cur);
   }
 
-  function buildLineElement(cm, view, lineNo, dims) {
-    var line = view.line;
+  function buildLineElement(cm, lineView, lineNo, dims) {
+    var line = lineView.line;
     var built = buildLineContent(cm, line), lineElement = built.pre;
     var markers = line.gutterMarkers, display = cm.display, wrap;
 
     var bgClass = built.bgClass ? built.bgClass + " " + (line.bgClass || "") : line.bgClass;
     var hasWidgets = line.widgets;
-    if (view.cont) for (var i = 0; !hasWidgets && i < view.cont.length; ++i)
-      hasWidgets = view.cont[i].widgets;
+    if (lineView.cont) for (var i = 0; !hasWidgets && i < lineView.cont.length; ++i)
+      hasWidgets = lineView.cont[i].widgets;
 
     if (!cm.options.lineNumbers && !markers && !bgClass && !line.wrapClass && !hasWidgets)
-      return lineElement;
+      return lineView.node = lineElement;
 
     // Lines with gutter elements, widgets or a background class need
     // to be wrapped again, and have the extra elements added to the
@@ -627,9 +629,9 @@
       var gutterWrap = wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "position: absolute; left: " +
                                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
                                          lineElement);
-      if (cm.options.fixedGutter) (wrap.alignable || (wrap.alignable = [])).push(gutterWrap);
+      if (cm.options.fixedGutter) (lineView.alignable || (lineView.alignable = [])).push(gutterWrap);
       if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
-        wrap.lineNumber = gutterWrap.appendChild(
+        lineView.lineNumber = gutterWrap.appendChild(
           elt("div", lineNumberFor(cm.options, lineNo),
               "CodeMirror-linenumber CodeMirror-gutter-elt",
               "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
@@ -643,17 +645,17 @@
         }
     }
     if (ie_lt8) wrap.style.zIndex = 2;
-    addLineWidgets(cm, line, wrap, dims, lineElement);
-    if (view.cont) for (var i = 0; i < view.cont.length; i++)
-      addLineWidgets(cm, view.cont[i], wrap, dims);
-    return wrap;
+    addLineWidgets(cm, line, lineView, wrap, dims, lineElement);
+    if (lineView.cont) for (var i = 0; i < lineView.cont.length; i++)
+      addLineWidgets(cm, lineView.cont[i], lineView, wrap, dims);
+    return lineView.node = wrap;
   }
 
-  function addLineWidgets(cm, line, wrap, dims, above) {
+  function addLineWidgets(cm, line, lineView, wrap, dims, above) {
     if (line.widgets) for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
       var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
       if (!widget.handleMouseEvents) node.ignoreEvents = true;
-      positionLineWidget(widget, node, wrap, dims);
+      positionLineWidget(widget, node, lineView, dims);
       if (above && widget.above)
         wrap.insertBefore(node, cm.options.lineNumbers && line.height != 0 ? gutterWrap : above);
       else
@@ -662,9 +664,9 @@
     }
   }
 
-  function positionLineWidget(widget, node, wrap, dims) {
+  function positionLineWidget(widget, node, lineView, dims) {
     if (widget.noHScroll) {
-      (wrap.alignable || (wrap.alignable = [])).push(node);
+      (lineView.alignable || (lineView.alignable = [])).push(node);
       var width = dims.wrapperWidth;
       node.style.left = dims.fixedPos + "px";
       if (!widget.coverGutter) {

From 4a1c567651f3cae6fe134be2634c878668ad7788 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 14 Dec 2013 01:11:30 +0100
Subject: [PATCH 0849/4742] Implement (somewhat) intelligent updating of lines

Changes to text, widgets, classes, and gutter are now separated.

For individual line changes, the DOM is updated for only the change,
rather than doing a full redraw on the line.
---
 lib/codemirror.js | 271 ++++++++++++++++++++++++++++++++--------------
 test/test.js      |  11 ++
 2 files changed, 199 insertions(+), 83 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c8dac7312e..757d1b55d5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -393,6 +393,8 @@
     var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
     var gutterW = display.gutters.offsetWidth, left = comp + "px";
     for (var i = 0; i < view.length; i++) {
+      if (cm.options.fixedGutter && view[i].gutter)
+        view[i].gutter.style.left = left;
       var align = view[i].alignable;
       if (align) for (var j = 0; j < align.length; j++)
         align[j].style.left = left;
@@ -486,8 +488,8 @@
     if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
     if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
     if (sawCollapsedSpans) {
-      from = lineNo(visualLine(getLine(doc, from)));
-      while (to < end && lineIsHidden(doc, getLine(doc, to))) ++to;
+      from = visualLineNo(cm.doc, from);
+      to = visualLineEndNo(cm.doc, to);
     }
 
     var different = from != display.viewFrom || to != display.viewTo ||
@@ -495,8 +497,10 @@
     adjustView(cm, from, to);
 
     var toUpdate = 0;
-    for (var i = 0; i < display.view.length; i++)
-      if (!display.view[i].node) ++toUpdate;
+    for (var i = 0; i < display.view.length; i++) {
+      var v = display.view[i];
+      if (!v.node || v.changes) ++toUpdate;
+    }
     if (!different && toUpdate == 0 && !forced) {
       updateViewOffset(cm);
       return;
@@ -585,79 +589,145 @@
     var view = display.view, lineN = display.viewFrom;
     for (var i = 0; i < view.length; i++) {
       var lineView = view[i];
-      if (lineView.node) {
-        // This line is already drawn. Skip to the actual node. Update
-        // its line number if needed.
-        while (cur != lineView.node) cur = rm(cur);
-        if (lineNumbers && updateNumbersFrom <= lineN && lineView.lineNumber)
-          setTextContent(lineView.lineNumber, lineNumberFor(cm.options, lineN));
-        cur = cur.nextSibling;
-      } else {
+      if (!lineView.node) { // Not drawn yet
         var node = buildLineElement(cm, lineView, lineN, dims);
         container.insertBefore(node, cur);
+      } else { // Already drawn
+        while (cur != lineView.node) cur = rm(cur);
+        var updateNumber = lineNumbers && updateNumbersFrom <= lineN && lineView.lineNumber;
+        if (lineView.changes) {
+          for (var j = 0; j < lineView.changes.length; j++) {
+            var type = lineView.changes[j];
+            if (type == "text") updateLineText(cm, lineView);
+            else if (type == "gutter") { updateNumber = false; updateLineGutter(cm, lineView, lineN, dims); }
+            else if (type == "class") updateLineClasses(lineView);
+            else if (type == "widget") updateLineWidgets(lineView, dims);
+          }
+          lineView.changes = null;
+        }
+        if (updateNumber)
+          setTextContent(lineView.lineNumber, lineNumberFor(cm.options, lineN));
+        cur = lineView.node.nextSibling;
       }
       lineN += lineView.size;
     }
     while (cur) cur = rm(cur);
   }
 
-  function buildLineElement(cm, lineView, lineNo, dims) {
-    var line = lineView.line;
-    var built = buildLineContent(cm, line), lineElement = built.pre;
-    var markers = line.gutterMarkers, display = cm.display, wrap;
+  // Lines with gutter elements, widgets or a background class need to
+  // be wrapped, and have the extra elements added to the wrapper div
+  function ensureLineWrapped(lineView) {
+    if (lineView.node == lineView.text) {
+      lineView.node = elt("div", null, null, "position: relative");
+      if (lineView.text.parentNode)
+        lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
+      lineView.node.appendChild(lineView.text);
+      if (ie_lt8) lineView.node.style.zIndex = 2;
+    }
+    return lineView.node;
+  }
 
-    var bgClass = built.bgClass ? built.bgClass + " " + (line.bgClass || "") : line.bgClass;
-    var hasWidgets = line.widgets;
-    if (lineView.cont) for (var i = 0; !hasWidgets && i < lineView.cont.length; ++i)
-      hasWidgets = lineView.cont[i].widgets;
+  function updateLineBackground(lineView) {
+    var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
+    if (cls) cls += " CodeMirror-linebackground";
+    if (lineView.background) {
+      if (cls) lineView.background.className = cls;
+      else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
+    } else if (cls) {
+      var wrap = ensureLineWrapped(lineView);
+      lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
+    }
+  }
 
-    if (!cm.options.lineNumbers && !markers && !bgClass && !line.wrapClass && !hasWidgets)
-      return lineView.node = lineElement;
+  function updateLineText(cm, lineView) {
+    var cls = lineView.text.className;
+    var built = buildLineContent(cm, lineView.line);
+    if (lineView.text == lineView.node) lineView.node = built.pre;
+    lineView.text.parentNode.replaceChild(built.pre, lineView.text);
+    lineView.text = built.pre;
+    if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
+      lineView.bgClass = built.bgClass;
+      lineView.textClass = built.textClass;
+      updateLineClasses(lineView);
+    } else if (cls) {
+      lineView.text.className = cls;
+    }
+  }
 
-    // Lines with gutter elements, widgets or a background class need
-    // to be wrapped again, and have the extra elements added to the
-    // wrapper div
+  function updateLineClasses(lineView) {
+    updateLineBackground(lineView);
+    if (lineView.line.wrapClass)
+      ensureLineWrapped(lineView).className = lineView.line.wrapClass;
+    else if (lineView.node != lineView.text)
+      lineView.node.className = "";
+    var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
+    lineView.text.className = textClass || "";
+  }
 
-    if (!wrap) {
-      wrap = elt("div", null, line.wrapClass, "position: relative");
-      wrap.appendChild(lineElement);
+  function updateLineGutter(cm, lineView, lineN, dims) {
+    if (lineView.gutter) {
+      lineView.node.removeChild(lineView.gutter);
+      lineView.gutter = null;
     }
-    // Kludge to make sure the styled element lies behind the selection (by z-index)
-    if (bgClass)
-      wrap.insertBefore(elt("div", null, bgClass + " CodeMirror-linebackground"), wrap.firstChild);
+    var markers = lineView.line.gutterMarkers;
     if (cm.options.lineNumbers || markers) {
-      var gutterWrap = wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "position: absolute; left: " +
-                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
-                                         lineElement);
-      if (cm.options.fixedGutter) (lineView.alignable || (lineView.alignable = [])).push(gutterWrap);
+      var wrap = ensureLineWrapped(lineView);
+      var gutterWrap = lineView.gutter =
+        wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "position: absolute; left: " +
+                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
+                          lineView.text);
       if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
         lineView.lineNumber = gutterWrap.appendChild(
-          elt("div", lineNumberFor(cm.options, lineNo),
+          elt("div", lineNumberFor(cm.options, lineN),
               "CodeMirror-linenumber CodeMirror-gutter-elt",
               "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
-              + display.lineNumInnerWidth + "px"));
-      if (markers)
-        for (var k = 0; k < cm.options.gutters.length; ++k) {
-          var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
-          if (found)
-            gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
-                                       dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"));
-        }
+              + cm.display.lineNumInnerWidth + "px"));
+      if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) {
+        var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
+        if (found)
+          gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
+                                     dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"));
+      }
     }
-    if (ie_lt8) wrap.style.zIndex = 2;
-    addLineWidgets(cm, line, lineView, wrap, dims, lineElement);
+  }
+
+  function updateLineWidgets(lineView, dims) {
+    if (lineView.alignable) lineView.alignable = null;
+    for (var node = lineView.node.firstChild, next; node; node = next) {
+      var next = node.nextSibling;
+      if (node.className == "CodeMirror-linewidget")
+        lineView.node.removeChild(node);
+    }
+    insertLineWidgets(lineView, dims);
+  }
+
+  function buildLineElement(cm, lineView, lineN, dims) {
+    var built = buildLineContent(cm, lineView.line);
+    lineView.text = lineView.node = built.pre;
+    if (built.bgClass) lineView.bgClass = built.bgClass;
+    if (built.textClass) lineView.textClass = built.textClass;
+
+    updateLineClasses(lineView);
+    updateLineGutter(cm, lineView, lineN, dims);
+    insertLineWidgets(lineView, dims);
+    return lineView.node;
+  }
+
+  function insertLineWidgets(lineView, dims) {
+    insertLineWidgetsFor(lineView.line, lineView, dims, true);
     if (lineView.cont) for (var i = 0; i < lineView.cont.length; i++)
-      addLineWidgets(cm, lineView.cont[i], lineView, wrap, dims);
-    return lineView.node = wrap;
+      insertLineWidgetsFor(lineView.cont[i], lineView, dims, false);
   }
 
-  function addLineWidgets(cm, line, lineView, wrap, dims, above) {
-    if (line.widgets) for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
+  function insertLineWidgetsFor(line, lineView, dims, allowAbove) {
+    if (!line.widgets) return;
+    var wrap = ensureLineWrapped(lineView);
+    for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
       var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
       if (!widget.handleMouseEvents) node.ignoreEvents = true;
       positionLineWidget(widget, node, lineView, dims);
-      if (above && widget.above)
-        wrap.insertBefore(node, cm.options.lineNumbers && line.height != 0 ? gutterWrap : above);
+      if (allowAbove && widget.above)
+        wrap.insertBefore(node, lineView.gutter || lineView.text);
       else
         wrap.appendChild(node);
       signalLater(widget, "redraw");
@@ -899,17 +969,15 @@
     if (doc.frontier >= cm.display.viewTo) return;
     var end = +new Date + cm.options.workTime;
     var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
-    var changed = [], prevChange;
+
+    operation(cm, function() {
     doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
       if (doc.frontier >= cm.display.viewFrom) { // Visible
         var oldStyles = line.styles;
         line.styles = highlightLine(cm, line, state, true);
         var ischange = !oldStyles || oldStyles.length != line.styles.length;
         for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
-        if (ischange) {
-          if (prevChange && prevChange.end == doc.frontier) prevChange.end++;
-          else changed.push(prevChange = {start: doc.frontier, end: doc.frontier + 1});
-        }
+        if (ischange) regLineChange(cm, doc.frontier, "text");
         line.stateAfter = copyState(doc.mode, state);
       } else {
         processLine(cm, line.text, state);
@@ -921,11 +989,7 @@
         return true;
       }
     });
-    if (changed.length)
-      operation(cm, function() {
-        for (var i = 0; i < changed.length; ++i)
-          regChange(this, changed[i].start, changed[i].end);
-      })();
+    });
   }
 
   // Finds the line to start with when starting a parse. Tries to
@@ -1449,6 +1513,12 @@
     if (from == null) from = cm.doc.first;
     if (to == null) to = cm.doc.first + cm.doc.size;
     if (!lendiff) lendiff = 0;
+
+    if (sawCollapsedSpans) {
+      from = visualLineNo(cm.doc, from);
+      to = visualLineEndNo(cm.doc, to);
+    }
+
     var display = cm.display;
     if (lendiff && to < display.viewTo &&
         (display.updateLineNumbers == null || display.updateLineNumbers > from))
@@ -1464,7 +1534,7 @@
       resetView(cm);
     } else if (from <= display.viewFrom) { // Top overlap
       display.view = display.view.slice(findViewIndex(cm, to));
-      display.viewFrom = to;
+      display.viewFrom = to + lendiff;
       display.viewTo += lendiff;
     } else if (to >= display.viewTo) { // Bottom overlap
       display.view = display.view.slice(0, findViewIndex(cm, from));
@@ -1477,6 +1547,16 @@
     }
   }
 
+  // Type must be one of "text", "gutter", "class", "widget"
+  function regLineChange(cm, line, type) {
+    cm.curOp.viewChanged = true;
+    var display = cm.display;
+    if (line < display.viewFrom || line >= display.viewTo) return;
+    var lineView = display.view[findViewIndex(cm, line)];
+    var arr = lineView.changes || (lineView.changes = []);
+    if (indexOf(arr, type) == -1) arr.push(type);
+  }
+
   function resetView(cm) {
     cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
     cm.display.view = [];
@@ -1496,7 +1576,7 @@
 
   function adjustView(cm, from, to) {
     var display = cm.display, view = display.view;
-    if (view.length == 0 || from >= display.viewFrom || to <= display.viewTo) {
+    if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
       display.view = buildViewArray(cm, from, to);
       display.viewFrom = from;
     } else {
@@ -2616,7 +2696,10 @@
 
     var lendiff = change.text.length - (to.line - from.line) - 1;
     // Remember that these lines changed, for updating the display
-    regChange(cm, from.line, to.line + 1, lendiff);
+    if (from.line == to.line && !isWholeLineUpdate(cm.doc, change))
+      regLineChange(cm, from.line, "text");
+    else
+      regChange(cm, from.line, to.line + 1, lendiff);
 
     if (hasHandler(cm, "change"))
       (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push({
@@ -2967,12 +3050,12 @@
     line.stateAfter = null;
   }
 
-  function changeLine(cm, handle, op) {
+  function changeLine(cm, handle, changeType, op) {
     var no = handle, line = handle, doc = cm.doc;
     if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
     else no = lineNo(handle);
     if (no == null) return null;
-    if (op(line, no)) regChange(cm, no, no + 1);
+    if (op(line, no)) regLineChange(cm, no, changeType);
     else return null;
     return line;
   }
@@ -3254,7 +3337,7 @@
     defaultCharWidth: function() { return charWidth(this.display); },
 
     setGutterMarker: operation(null, function(line, gutterID, value) {
-      return changeLine(this, line, function(line) {
+      return changeLine(this, line, "gutter", function(line) {
         var markers = line.gutterMarkers || (line.gutterMarkers = {});
         markers[gutterID] = value;
         if (!value && isEmpty(markers)) line.gutterMarkers = null;
@@ -3267,7 +3350,7 @@
       doc.iter(function(line) {
         if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
           line.gutterMarkers[gutterID] = null;
-          regChange(cm, i, i + 1);
+          regLineChange(cm, i, "gutter");
           if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null;
         }
         ++i;
@@ -3275,7 +3358,7 @@
     }),
 
     addLineClass: operation(null, function(handle, where, cls) {
-      return changeLine(this, handle, function(line) {
+      return changeLine(this, handle, "class", function(line) {
         var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
         if (!line[prop]) line[prop] = cls;
         else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
@@ -3285,7 +3368,7 @@
     }),
 
     removeLineClass: operation(null, function(handle, where, cls) {
-      return changeLine(this, handle, function(line) {
+      return changeLine(this, handle, "class", function(line) {
         var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
         var cur = line[prop];
         if (!cur) return false;
@@ -4097,11 +4180,13 @@
     for (var i = 0; i < this.lines.length; ++i) {
       var line = this.lines[i];
       var span = getMarkedSpanFor(line.markedSpans, this);
-      if (span.to != null) max = lineNo(line);
+      if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text");
+      else if (cm) {
+        if (span.to != null) max = lineNo(line);
+        if (span.from != null) min = lineNo(line);
+      }
       line.markedSpans = removeMarkedSpan(line.markedSpans, span);
-      if (span.from != null)
-        min = lineNo(line);
-      else if (this.collapsed && !lineIsHidden(this.doc, line) && cm)
+      if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
         updateLineHeight(line, textHeight(cm.display));
     }
     if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
@@ -4113,7 +4198,7 @@
       }
     }
 
-    if (min != null && cm) regChange(cm, min, max + 1);
+    if (min != null) regChange(cm, min, max + 1);
     this.lines.length = 0;
     this.explicitlyCleared = true;
     if (this.atomic && this.doc.cantEdit) {
@@ -4228,8 +4313,10 @@
     }
     if (cm) {
       if (updateMaxLine) cm.curOp.updateMaxLine = true;
-      if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.collapsed)
+      if (marker.collapsed)
         regChange(cm, from.line, to.line + 1);
+      else if (marker.className || marker.title || marker.startStyle || marker.endStyle)
+        for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
       if (marker.atomic) reCheckSelection(cm.doc);
     }
     return marker;
@@ -4498,6 +4585,20 @@
     return lines;
   }
 
+  function visualLineNo(doc, lineN) {
+    var line = getLine(doc, lineN), vis = visualLine(line);
+    if (line == vis) return lineN;
+    return lineNo(vis);
+  }
+  function visualLineEndNo(doc, lineN) {
+    if (lineN > doc.lastLine()) return lineN;
+    var line = getLine(doc, lineN), merged;
+    if (!lineIsHidden(doc, line)) return lineN;
+    while (merged = collapsedSpanAtEnd(line))
+      line = merged.find(1, true).line;
+    return lineNo(line) + 1;
+  }
+
   function lineIsHidden(doc, line) {
     var sps = sawCollapsedSpans && line.markedSpans;
     if (sps) for (var sp, i = 0; i < sps.length; ++i) {
@@ -4566,7 +4667,7 @@
     var aboveVisible = heightAtLine(this.line) < this.cm.doc.scrollTop;
     updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));
     if (aboveVisible) addToScrollPos(this.cm, 0, -this.height);
-    regChange(this.cm, no, no + 1);
+    regLineChange(this.cm, no, "widget");
   });
   LineWidget.prototype.changed = widgetOperation(function() {
     var oldH = this.height;
@@ -4575,7 +4676,7 @@
     if (!diff) return;
     updateLineHeight(this.line, this.line.height + diff);
     var no = lineNo(this.line);
-    regChange(this.cm, no, no + 1);
+    regLineChange(this.cm, no, "widget");
   });
 
   function widgetHeight(widget) {
@@ -4588,7 +4689,7 @@
   function addLineWidget(cm, handle, node, options) {
     var widget = new LineWidget(cm, node, options);
     if (widget.noHScroll) cm.display.alignWidgets = true;
-    changeLine(cm, handle, function(line) {
+    changeLine(cm, handle, "widget", function(line) {
       var widgets = line.widgets || (line.widgets = []);
       if (widget.insertAt == null) widgets.push(widget);
       else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
@@ -4963,6 +5064,11 @@
 
   // DOCUMENT DATA STRUCTURE
 
+  function isWholeLineUpdate(doc, change) {
+    return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
+      (!doc.cm || doc.cm.options.wholeLineUpdateBefore);
+  }
+
   function updateDoc(doc, change, markedSpans, selAfter, estimateHeight) {
     function spansFor(n) {return markedSpans ? markedSpans[n] : null;}
     function update(line, text, spans) {
@@ -4975,8 +5081,7 @@
     var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
 
     // First adjust the line structure
-    if (from.ch == 0 && to.ch == 0 && lastText == "" &&
-        (!doc.cm || doc.cm.options.wholeLineUpdateBefore)) {
+    if (isWholeLineUpdate(doc, change)) {
       // This is a whole-line replace. Treated specially to make
       // sure line objects move the way they are supposed to.
       for (var i = 0, e = text.length - 1, added = []; i < e; ++i)
@@ -5495,7 +5600,7 @@
 
   function updateLineHeight(line, height) {
     var diff = height - line.height;
-    for (var n = line; n; n = n.parent) n.height += diff;
+    if (diff) for (var n = line; n; n = n.parent) n.height += diff;
   }
 
   function lineNo(line) {
diff --git a/test/test.js b/test/test.js
index b96824bd2d..0c3ac49d17 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1312,6 +1312,17 @@ testCM("lineWidgetFocus", function(cm) {
   }
 });
 
+testCM("lineWidgetCautiousRedraw", function(cm) {
+  var node = document.createElement("div");
+  node.innerHTML = "hahah";
+  var w = cm.addLineWidget(0, node);
+  var redrawn = false;
+  w.on("redraw", function() { redrawn = true; });
+  cm.replaceSelection("0");
+  is(!redrawn);
+}, {value: "123\n456"});
+
+
 testCM("getLineNumber", function(cm) {
   addDoc(cm, 2, 20);
   var h1 = cm.getLineHandle(1);

From 95dc4c84c118a587b20524f0c325df39097d53d4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Dec 2013 11:50:04 +0100
Subject: [PATCH 0850/4742] New measurement model

Uses regular rendered lines, rather than a custom one-span-per-char
rendering, to measure lines.

Also makes rendering incremental -- no longer measures all characters
in a single go, but rather measures as-needed.

In this commit, the new model is implemented alongside the old one.
Subsequent commits will rip out the old code.
---
 lib/codemirror.js | 277 ++++++++++++++++++++++++++++++++++++++--------
 test/driver.js    |   4 +
 test/test.js      |  27 +++--
 3 files changed, 249 insertions(+), 59 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 757d1b55d5..2511629275 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -125,8 +125,9 @@
     d.cursorDiv = elt("div", null, "CodeMirror-cursors");
     // Used to measure text size
     d.measure = elt("div", null, "CodeMirror-measure");
+    d.lineMeasure = elt("div", null, "CodeMirror-measure");
     // Wraps everything that needs to exist inside the vertically-padded coordinate system
-    d.lineSpace = elt("div", [d.measure, d.selectionDiv, d.lineDiv, d.cursorDiv],
+    d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.lineDiv, d.cursorDiv],
                       null, "position: relative; outline: none");
     // Moved around its parent to cover visible view
     d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
@@ -195,6 +196,8 @@
 
     d.shift = false;
 
+    d.externalMeasured = null;
+
     return d;
   }
 
@@ -392,7 +395,7 @@
     if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
     var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
     var gutterW = display.gutters.offsetWidth, left = comp + "px";
-    for (var i = 0; i < view.length; i++) {
+    for (var i = 0; i < view.length; i++) if (!view[i].hidden) {
       if (cm.options.fixedGutter && view[i].gutter)
         view[i].gutter.style.left = left;
       var align = view[i].alignable;
@@ -499,7 +502,7 @@
     var toUpdate = 0;
     for (var i = 0; i < display.view.length; i++) {
       var v = display.view[i];
-      if (!v.node || v.changes) ++toUpdate;
+      if (!v.hidden && (!v.node || v.changes)) ++toUpdate;
     }
     if (!different && toUpdate == 0 && !forced) {
       updateViewOffset(cm);
@@ -529,6 +532,7 @@
     var prevBottom = display.lineDiv.offsetTop;
     for (var i = 0; i < display.view.length; i++) {
       var cur = display.view[i], height;
+      if (cur.hidden) continue;
       if (ie_lt8) {
         var bot = cur.node.offsetTop + cur.node.offsetHeight;
         height = bot - prevBottom;
@@ -542,8 +546,8 @@
       if (diff > .001 || diff < -.001) {
         updateLineHeight(cur.line, height);
         updateWidgetHeight(cur.line);
-        if (cur.cont) for (var j = 0; j < cur.cont.length; j++)
-          updateWidgetHeight(cur.cont[j]);
+        if (cur.rest) for (var j = 0; j < cur.rest.length; j++)
+          updateWidgetHeight(cur.rest[j]);
       }
     }
   }
@@ -589,7 +593,8 @@
     var view = display.view, lineN = display.viewFrom;
     for (var i = 0; i < view.length; i++) {
       var lineView = view[i];
-      if (!lineView.node) { // Not drawn yet
+      if (lineView.hidden) {
+      } else if (!lineView.node) { // Not drawn yet
         var node = buildLineElement(cm, lineView, lineN, dims);
         container.insertBefore(node, cur);
       } else { // Already drawn
@@ -641,7 +646,7 @@
 
   function updateLineText(cm, lineView) {
     var cls = lineView.text.className;
-    var built = buildLineContent(cm, lineView.line);
+    var built = buildLineContent(cm, lineView.line, lineView);
     if (lineView.text == lineView.node) lineView.node = built.pre;
     lineView.text.parentNode.replaceChild(built.pre, lineView.text);
     lineView.text = built.pre;
@@ -702,7 +707,7 @@
   }
 
   function buildLineElement(cm, lineView, lineN, dims) {
-    var built = buildLineContent(cm, lineView.line);
+    var built = buildLineContent(cm, lineView.line, lineView);
     lineView.text = lineView.node = built.pre;
     if (built.bgClass) lineView.bgClass = built.bgClass;
     if (built.textClass) lineView.textClass = built.textClass;
@@ -715,8 +720,8 @@
 
   function insertLineWidgets(lineView, dims) {
     insertLineWidgetsFor(lineView.line, lineView, dims, true);
-    if (lineView.cont) for (var i = 0; i < lineView.cont.length; i++)
-      insertLineWidgetsFor(lineView.cont[i], lineView, dims, false);
+    if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
+      insertLineWidgetsFor(lineView.rest[i], lineView, dims, false);
   }
 
   function insertLineWidgetsFor(line, lineView, dims, allowAbove) {
@@ -1039,6 +1044,146 @@
   }
 
   function measureChar(cm, line, ch, data, bias) {
+
+    var mNew = measureCharNew(cm, line, ch, bias);
+    var mOld = measureCharOld(cm, line, ch, data, bias);
+    if (bias != "right" && Math.abs(mOld.left - mNew.left) > 1 ||
+        bias != "left" && Math.abs(mOld.right - mNew.right) > 1 ||
+        Math.abs(mOld.top - mNew.top) > 1.5 || Math.abs(mOld.bottom - mNew.bottom) > 1.5) {
+//      console.trace("MISMATCH", JSON.stringify(mOld), JSON.stringify(mNew), "line=", lineNo(line), "ch=", ch, "bias=", bias);
+//      throw "FAIL";
+    }
+    return mNew;
+
+  }
+
+  var currentLineRect, currentLineView;
+  function withMeasuringLine(lineView, f) {
+    if (lineView == currentLineView) return f();
+
+    var oldRect = currentLineRect, oldView = currentLineView;
+    currentLineRect = lineView.text.getBoundingClientRect();
+    currentLineView = lineView;
+    try { return f(); }
+    finally { currentLineRect = oldRect; currentLineView = oldView; }
+  }
+
+  function getLineRect(lineView) {
+    if (lineView == currentLineView) return currentLineRect;
+    else return lineView.text.getBoundingClientRect();
+  }
+
+  function ensureLineHeights(cm, lineView, rect) {
+    var wrapping = cm.options.lineWrapping;
+    var curWidth = wrapping && cm.display.scroller.clientWidth;
+    if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
+      var heights = lineView.measure.heights = [];
+      if (wrapping) {
+        lineView.measure.width = curWidth;
+        var rects = lineView.text.firstChild.getClientRects();
+        for (var i = 0; i < rects.length - 1; i++)
+          heights.push((rects[i].bottom + rects[i + 1].top) / 2 - rect.top);
+      }
+      heights.push(rect.bottom - rect.top);
+    }
+  }
+
+  function mapFromLineView(lineView, line, lineN, outer) {
+    if (lineView.line == line) return lineView.measure.map;
+    for (var i = 0; i < lineView.rest.length; i++)
+      if (lineView.rest[i] == line) return lineView.measure.rest[i];
+    for (var i = 0; i < lineView.rest.length; i++)
+      if (lineNo(lineView.rest[i]) > lineN) return {before: lineView.measure.rest[i]};
+  }
+
+  function updateExternalMeasurement(cm, line) {
+    line = visualLine(line);
+    var lineN = lineNo(line);
+    var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
+    view.lineN = lineN;
+    var built = buildLineContent(cm, line, view);
+    view.text = built.pre;
+    removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
+    return view;
+  }
+
+  function measureCharNew(cm, line, ch, bias) {
+    var lineN = lineNo(line), display = cm.display;
+    var view, ext = display.externalMeasured;
+    if (lineN >= display.viewFrom && lineN < display.viewTo)
+      view = display.view[findViewIndex(cm, lineN)];
+    else if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
+      view = ext;
+    if (view && (!view.text || view.changes))
+      view = null;
+    if (!view)
+      view = updateExternalMeasurement(cm, line);
+
+    var rect = getLineRect(view);
+    ensureLineHeights(cm, view, rect);
+    var map = mapFromLineView(view, line, lineN);
+    if (map.before) { map = map.before; ch = -1; }
+
+    var node, start, end, collapse;
+    for (var i = 0; i < map.length; i += 3) {
+      var mStart = map[i], mEnd = map[i + 1];
+      if (ch < mStart) {
+        start = 0; end = 1;
+        collapse = "left";
+      } else if (ch < mEnd) {
+        start = ch - mStart;
+        end = start + 1;
+      } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {
+        end = mEnd - mStart;
+        start = end - 1;
+        if (ch >= mEnd) collapse = "right";
+      }
+      if (start != null) {
+        node = map[i + 2];
+        if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
+          collapse = bias;
+        if (bias == "left" && start == 0)
+          while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {
+            node = map[(i -= 3) + 2];
+            collapse = "left";
+          }
+        if (bias == "right" && start == mEnd - mStart)
+          while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {
+            node = map[(i += 3) + 2];
+            collapse = "right";
+          }
+        break;
+      }
+    }
+
+    var inner;
+    if (node.nodeType == 3) {
+      var range = document.createRange();
+      while (start && isExtendingChar.test(line.text.charAt(mStart + start))) --start;
+      while (mStart + end < mEnd && isExtendingChar.test(line.text.charAt(mStart + end))) ++end;
+      range.setEnd(node, end);
+      range.setStart(node, start);
+      inner = range.getBoundingClientRect();
+    } else {
+      if (start > 0) collapse = bias = "right";
+      var rects;
+      if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
+        inner = rects[bias == "right" ? rects.length - 1 : 0];
+      else
+        inner = node.getBoundingClientRect();
+    }
+
+    var top, bot = inner.bottom - rect.top - 2, heights = view.measure.heights;
+    for (var i = 0; i < heights.length - 1; i++)
+      if (bot < heights[i]) break;
+    top = i ? heights[i - 1] : 0; bot = heights[i];
+    var uu = {left: (collapse == "right" ? inner.right : inner.left) - rect.left,
+            right: (collapse == "left" ? inner.left : inner.right) - rect.left,
+            top: top, bottom: bot};
+    return uu;
+  }
+
+  function measureCharOld(cm, line, ch, data, bias) {
     var dir = -1;
     data = data || measureLine(cm, line);
     if (data.crude) {
@@ -1097,7 +1242,7 @@
       return crudelyMeasureLine(cm, line);
 
     var display = cm.display, measure = emptyArray(line.text.length);
-    var pre = buildLineContent(cm, line, measure, true).pre;
+    var pre = buildLineContent(cm, line, null, measure, true).pre;
 
     // IE does not cache element positions of inline elements between
     // calls to getBoundingClientRect. This makes the loop below,
@@ -1201,7 +1346,7 @@
     if (cached || line.text.length >= cm.options.crudeMeasuringFrom)
       return measureChar(cm, line, line.text.length, cached && cached.measure, "right").right;
 
-    var pre = buildLineContent(cm, line, null, true).pre;
+    var pre = buildLineContent(cm, line, null, null, true).pre;
     var end = pre.appendChild(zeroWidthElement(cm.display.measure));
     removeChildrenAndAdd(cm.display.measure, pre);
     return getRect(end).right - getRect(cm.display.lineDiv).left;
@@ -1348,7 +1493,7 @@
         var xDiff = x - (ch == from ? fromX : toX);
         while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
         var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,
-                              xDiff < 0 ? -1 : xDiff ? 1 : 0);
+                              xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
         return pos;
       }
       var step = Math.ceil(dist / 2), middle = from + step;
@@ -1545,14 +1690,26 @@
         .concat(display.view.slice(findViewIndex(cm, to)));
       display.viewTo += lendiff;
     }
+
+    var ext = display.externalMeasured;
+    if (ext) {
+      if (to < ext.lineN)
+        ext.lineN += lendiff;
+      else if (from < ext.lineN + ext.size)
+        display.externalMeasured = null;
+    }
   }
 
   // Type must be one of "text", "gutter", "class", "widget"
   function regLineChange(cm, line, type) {
     cm.curOp.viewChanged = true;
-    var display = cm.display;
+    var display = cm.display, ext = cm.display.externalMeasured;
+    if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
+      display.externalMeasured = null;
+
     if (line < display.viewFrom || line >= display.viewTo) return;
     var lineView = display.view[findViewIndex(cm, line)];
+    if (lineView.node == null) return;
     var arr = lineView.changes || (lineView.changes = []);
     if (indexOf(arr, type) == -1) arr.push(type);
   }
@@ -1593,12 +1750,20 @@
     display.viewTo = to;
   }
 
+  function LineView(doc, line, lineN) {
+    this.line = line;
+    this.rest = visualLineContinued(line);
+    this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
+    this.node = this.text = null;
+    this.hidden = lineIsHidden(doc, line);
+  }
+
   function buildViewArray(cm, from, to) {
     var array = [], nextPos;
     for (var pos = from; pos < to; pos = nextPos) {
-      var line = getLine(cm.doc, pos), cont = visualLineContinued(line);
-      var nextPos = (cont ? lineNo(lst(cont)) : pos) + 1;
-      array.push({line: line, cont: cont, size: nextPos - pos, node: null});
+      var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
+      nextPos = pos + view.size;
+      array.push(view);
     }
     return array;
   }
@@ -2696,7 +2861,7 @@
 
     var lendiff = change.text.length - (to.line - from.line) - 1;
     // Remember that these lines changed, for updating the display
-    if (from.line == to.line && !isWholeLineUpdate(cm.doc, change))
+    if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
       regLineChange(cm, from.line, "text");
     else
       regChange(cm, from.line, to.line + 1, lendiff);
@@ -4233,11 +4398,9 @@
     var line = pos.line, lineN = lineNo(pos.line);
     clearCachedMeasurement(cm, line);
     if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) {
-      for (var view = cm.display.view, i = 0; i < view.length; i++) if (view[i].line == line) {
-        if (view[i].node.offsetHeight != line.height)
-          updateLineHeight(line, view[i].node.offsetHeight);
-        break;
-      }
+      var lineView = cm.display.view[findViewIndex(cm, lineN)];
+      if (!lineView.hidden && lineView.node && lineView.node.offsetHeight != line.height)
+        updateLineHeight(line, lineView.node.offsetHeight);
       runInOp(cm, function() {
         cm.curOp.selectionChanged = cm.curOp.forceUpdate = cm.curOp.updateMaxLine = true;
       });
@@ -4274,6 +4437,7 @@
       marker.collapsed = true;
       marker.replacedWith = elt("span", [marker.replacedWith], "CodeMirror-widget");
       if (!options.handleMouseEvents) marker.replacedWith.ignoreEvents = true;
+      if (options.insertLeft) marker.replacedWith.insertLeft = true;
     }
     if (marker.collapsed) {
       if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
@@ -4844,15 +5008,20 @@
       (cache[style] = style.replace(/\S+/g, "cm-$&"));
   }
 
-  function buildLineContent(cm, realLine, measure, copyWidgets) {
+  function buildLineContent(cm, realLine, lineView, measure, copyWidgets) {
     var merged, line = realLine, empty = true;
     while (merged = collapsedSpanAtStart(line))
       line = merged.find(-1, true).line;
 
-    var builder = {pre: elt("pre"), col: 0, pos: 0,
+    var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
+    var builder = {pre: elt("pre", [content]), content: content, col: 0, pos: 0,
                    measure: null, measuredSomething: false, cm: cm,
                    copyWidgets: copyWidgets};
 
+    if (lineView) lineView.measure = {};
+
+    // FIXME use lineView's info instead of recomputing
+
     do {
       if (line.text) empty = false;
       builder.measure = line == realLine && measure;
@@ -4860,18 +5029,25 @@
       builder.addToken = builder.measure ? buildTokenMeasure : buildToken;
       if ((old_ie || webkit) && cm.getOption("lineWrapping"))
         builder.addToken = buildTokenSplitSpaces(builder.addToken);
+      if (lineView)
+        builder.map = [];
       var next = insertLineContent(line, builder, getLineStyles(cm, line));
+      if (lineView) {
+        if (builder.map.length == 0) builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
+        if (lineView.line == line) lineView.measure.map = builder.map;
+        else (lineView.measure.rest || (lineView.measure.rest = [])).push(builder.map);
+      }
       if (measure && line == realLine && !builder.measuredSomething) {
-        measure[0] = builder.pre.appendChild(zeroWidthElement(cm.display.measure));
+        measure[0] = builder.content.appendChild(zeroWidthElement(cm.display.measure));
         builder.measuredSomething = true;
       }
       if (next) line = getLine(cm.doc, next.to.line);
     } while (next);
 
     if (measure && !builder.measuredSomething && !measure[0])
-      measure[0] = builder.pre.appendChild(empty ? elt("span", "\u00a0") : zeroWidthElement(cm.display.measure));
-    if (!builder.pre.firstChild && !lineIsHidden(cm.doc, realLine))
-      builder.pre.appendChild(document.createTextNode("\u00a0"));
+      measure[0] = builder.content.appendChild(empty ? elt("span", "\u00a0") : zeroWidthElement(cm.display.measure));
+    if (!builder.content.firstChild && !lineIsHidden(cm.doc, realLine))
+      builder.content.appendChild(document.createTextNode("\u00a0"));
 
     var order;
     // Work around problem with the reported dimensions of single-char
@@ -4907,6 +5083,8 @@
     if (!special.test(text)) {
       builder.col += text.length;
       var content = document.createTextNode(text);
+      if (builder.map) builder.map.push(builder.pos, builder.pos + text.length, content);
+      builder.pos += text.length;
     } else {
       var content = document.createDocumentFragment(), pos = 0;
       while (true) {
@@ -4914,20 +5092,24 @@
         var m = special.exec(text);
         var skipped = m ? m.index - pos : text.length - pos;
         if (skipped) {
-          content.appendChild(document.createTextNode(text.slice(pos, pos + skipped)));
+          var txt = content.appendChild(document.createTextNode(text.slice(pos, pos + skipped)));
+          if (builder.map) builder.map.push(builder.pos, builder.pos + skipped, txt);
           builder.col += skipped;
+          builder.pos += skipped;
         }
         if (!m) break;
         pos += skipped + 1;
         if (m[0] == "\t") {
           var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
-          content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
+          var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
           builder.col += tabWidth;
         } else {
-          var token = builder.cm.options.specialCharPlaceholder(m[0]);
-          content.appendChild(token);
+          var txt = builder.cm.options.specialCharPlaceholder(m[0]);
+          content.appendChild(txt);
           builder.col += 1;
         }
+        if (builder.map) builder.map.push(builder.pos, builder.pos + 1, txt);
+        builder.pos++;
       }
     }
     if (style || startStyle || endStyle || builder.measure) {
@@ -4936,22 +5118,23 @@
       if (endStyle) fullStyle += endStyle;
       var token = elt("span", [content], fullStyle);
       if (title) token.title = title;
-      return builder.pre.appendChild(token);
+      return builder.content.appendChild(token);
     }
-    builder.pre.appendChild(content);
+    builder.content.appendChild(content);
   }
 
   function buildTokenMeasure(builder, text, style, startStyle, endStyle) {
     var wrapping = builder.cm.options.lineWrapping;
     for (var i = 0; i < text.length; ++i) {
-      var start = i == 0, to = i + 1;
-      while (to < text.length && isExtendingChar(text.charAt(to))) ++to;
-      var ch = text.slice(i, to);
-      i = to - 1;
-      if (i && wrapping && spanAffectsWrapping(text, i))
-        builder.pre.appendChild(elt("wbr"));
-      var old = builder.measure[builder.pos];
-      var span = builder.measure[builder.pos] =
+      var ch = text.charAt(i), start = i == 0;
+      if (ch >= "\ud800" && ch < "\udbff" && i < text.length - 1) {
+        ch = text.slice(i, i + 2);
+        ++i;
+      } else if (i && wrapping && spanAffectsWrapping(text, i)) {
+        builder.content.appendChild(elt("wbr"));
+      }
+      var pos = builder.pos, old = builder.measure[pos];
+      var span = builder.measure[pos] =
         buildToken(builder, ch, style,
                    start && startStyle, i == text.length - 1 && endStyle);
       if (old) span.leftSide = old.leftSide || old;
@@ -4961,7 +5144,6 @@
       if (old_ie && wrapping && ch == " " && i && !/\s/.test(text.charAt(i - 1)) &&
           i < text.length - 1 && !/\s/.test(text.charAt(i + 1)))
         span.style.whiteSpace = "normal";
-      builder.pos += ch.length;
     }
     if (text.length) builder.measuredSomething = true;
   }
@@ -4981,19 +5163,20 @@
   function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
     var widget = !ignoreWidget && marker.replacedWith;
     if (widget) {
+      if (builder.map) builder.map.push(builder.pos, builder.pos + size, widget);
       if (builder.copyWidgets) widget = widget.cloneNode(true);
-      builder.pre.appendChild(widget);
+      builder.content.appendChild(widget);
       if (builder.measure) {
         if (size) {
           builder.measure[builder.pos] = widget;
         } else {
           var elt = zeroWidthElement(builder.cm.display.measure);
           if (marker.type == "bookmark" && !marker.insertLeft)
-            builder.measure[builder.pos] = builder.pre.appendChild(elt);
+            builder.measure[builder.pos] = builder.content.appendChild(elt);
           else if (builder.measure[builder.pos])
             return;
           else
-            builder.measure[builder.pos] = builder.pre.insertBefore(elt, widget);
+            builder.measure[builder.pos] = builder.content.insertBefore(elt, widget);
         }
         builder.measuredSomething = true;
       }
diff --git a/test/driver.js b/test/driver.js
index 13952dcc65..c5d15c9904 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -99,6 +99,10 @@ function label(str, msg) {
 function eq(a, b, msg) {
   if (a != b) throw new Failure(label(a + " != " + b, msg));
 }
+function near(a, b, margin, msg) {
+  if (Math.abs(a - b) > margin)
+    throw new Failure(label(a + " is not close to " + b + " (" + margin + ")", msg));
+}
 function eqPos(a, b, msg) {
   function str(p) { return "{line:" + p.line + ",ch:" + p.ch + "}"; }
   if (a == b) return;
diff --git a/test/test.js b/test/test.js
index 0c3ac49d17..65e313b11c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -541,10 +541,14 @@ testCM("bookmarkCursor", function(cm) {
   cm.setBookmark(Pos(3, 0), {widget: document.createTextNode("→")});
   var new01 = cm.cursorCoords(Pos(0, 1)), new11 = cm.cursorCoords(Pos(1, 1)),
       new20 = cm.cursorCoords(Pos(2, 0)), new30 = cm.cursorCoords(Pos(3, 0));
-  is(new01.left == pos01.left && new01.top == pos01.top, "at left, middle of line");
-  is(new11.left > pos11.left && new11.top == pos11.top, "at right, middle of line");
-  is(new20.left == pos20.left && new20.top == pos20.top, "at left, empty line");
-  is(new30.left > pos30.left && new30.top == pos30.top, "at right, empty line");
+  near(new01.left, pos01.left, 1);
+  near(new01.top, pos01.top, 1);
+  is(new11.left > pos11.left, "at right, middle of line");
+  near(new11.top == pos11.top, 1);
+  near(new20.left, pos20.left, 1);
+  near(new20.top, pos20.top, 1);
+  is(new30.left > pos30.left, "at right, empty line");
+  near(new30.top, pos30, 1);
   cm.setBookmark(Pos(4, 0), {widget: document.createTextNode("→")});
   is(cm.cursorCoords(Pos(4, 1)).left > pos41.left, "single-char bug");
 }, {value: "foo\nbar\n\n\nx\ny"});
@@ -561,10 +565,10 @@ testCM("multiBookmarkCursor", function(cm) {
   }
   var base1 = cm.cursorCoords(Pos(0, 1)).left, base4 = cm.cursorCoords(Pos(0, 4)).left;
   add(true);
-  is(Math.abs(base1 - cm.cursorCoords(Pos(0, 1)).left) < .1);
+  near(base1, cm.cursorCoords(Pos(0, 1)).left, 1);
   while (m = ms.pop()) m.clear();
   add(false);
-  is(Math.abs(base4 - cm.cursorCoords(Pos(0, 1)).left) < .1);
+  near(base4, cm.cursorCoords(Pos(0, 1)).left, 1);
 }, {value: "abcdefg"});
 
 testCM("getAllMarks", function(cm) {
@@ -1240,7 +1244,7 @@ testCM("bidiUpdate", function(cm) {
 }, {value: "abcd\n"});
 
 testCM("movebyTextUnit", function(cm) {
-  cm.setValue("בְּרֵאשִ\ńéée\n");
+  cm.setValue("בְּרֵאשִ\nééé́\n");
   cm.execCommand("goLineEnd");
   for (var i = 0; i < 4; ++i) cm.execCommand("goCharRight");
   eqPos(cm.getCursor(), Pos(0, 0));
@@ -1248,10 +1252,9 @@ testCM("movebyTextUnit", function(cm) {
   eqPos(cm.getCursor(), Pos(1, 0));
   cm.execCommand("goCharRight");
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 3));
-  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(1, 4));
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 6));
+  eqPos(cm.getCursor(), Pos(1, 7));
 });
 
 testCM("lineChangeEvents", function(cm) {
@@ -1652,11 +1655,11 @@ testCM("lineStyleFromMode", function(cm) {
   });
   cm.setOption("mode", "test_mode");
   var bracketElts = byClassName(cm.getWrapperElement(), "brackets");
-  eq(bracketElts.length, 1);
+  eq(bracketElts.length, 1, "brackets count");
   eq(bracketElts[0].nodeName, "PRE");
   is(!/brackets.*brackets/.test(bracketElts[0].className));
   var parenElts = byClassName(cm.getWrapperElement(), "parens");
-  eq(parenElts.length, 1);
+  eq(parenElts.length, 1, "parens count");
   eq(parenElts[0].nodeName, "DIV");
   is(!/parens.*parens/.test(parenElts[0].className));
   eq(parenElts[0].parentElement.nodeName, "DIV");

From 565c8f3aacd94ce54dbcac8829a1039450b30510 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 21 Dec 2013 15:25:40 +0100
Subject: [PATCH 0851/4742] Remove the old measuring code.

---
 lib/codemirror.js | 373 ++++++----------------------------------------
 1 file changed, 42 insertions(+), 331 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2511629275..fa713a2e8d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -178,8 +178,6 @@
     d.poll = new Delayed();
 
     d.cachedCharWidth = d.cachedTextHeight = null;
-    d.measureLineCache = [];
-    d.measureLineCachePos = 0;
 
     // Tracks when resetInput has punted to just putting a short
     // string instead of the (large) selection.
@@ -646,7 +644,7 @@
 
   function updateLineText(cm, lineView) {
     var cls = lineView.text.className;
-    var built = buildLineContent(cm, lineView.line, lineView);
+    var built = buildLineContent(cm, lineView);
     if (lineView.text == lineView.node) lineView.node = built.pre;
     lineView.text.parentNode.replaceChild(built.pre, lineView.text);
     lineView.text = built.pre;
@@ -707,7 +705,7 @@
   }
 
   function buildLineElement(cm, lineView, lineN, dims) {
-    var built = buildLineContent(cm, lineView.line, lineView);
+    var built = buildLineContent(cm, lineView);
     lineView.text = lineView.node = built.pre;
     if (built.bgClass) lineView.bgClass = built.bgClass;
     if (built.textClass) lineView.textClass = built.textClass;
@@ -1043,36 +1041,6 @@
     return e.offsetLeft;
   }
 
-  function measureChar(cm, line, ch, data, bias) {
-
-    var mNew = measureCharNew(cm, line, ch, bias);
-    var mOld = measureCharOld(cm, line, ch, data, bias);
-    if (bias != "right" && Math.abs(mOld.left - mNew.left) > 1 ||
-        bias != "left" && Math.abs(mOld.right - mNew.right) > 1 ||
-        Math.abs(mOld.top - mNew.top) > 1.5 || Math.abs(mOld.bottom - mNew.bottom) > 1.5) {
-//      console.trace("MISMATCH", JSON.stringify(mOld), JSON.stringify(mNew), "line=", lineNo(line), "ch=", ch, "bias=", bias);
-//      throw "FAIL";
-    }
-    return mNew;
-
-  }
-
-  var currentLineRect, currentLineView;
-  function withMeasuringLine(lineView, f) {
-    if (lineView == currentLineView) return f();
-
-    var oldRect = currentLineRect, oldView = currentLineView;
-    currentLineRect = lineView.text.getBoundingClientRect();
-    currentLineView = lineView;
-    try { return f(); }
-    finally { currentLineRect = oldRect; currentLineView = oldView; }
-  }
-
-  function getLineRect(lineView) {
-    if (lineView == currentLineView) return currentLineRect;
-    else return lineView.text.getBoundingClientRect();
-  }
-
   function ensureLineHeights(cm, lineView, rect) {
     var wrapping = cm.options.lineWrapping;
     var curWidth = wrapping && cm.display.scroller.clientWidth;
@@ -1088,7 +1056,7 @@
     }
   }
 
-  function mapFromLineView(lineView, line, lineN, outer) {
+  function mapFromLineView(lineView, line, lineN) {
     if (lineView.line == line) return lineView.measure.map;
     for (var i = 0; i < lineView.rest.length; i++)
       if (lineView.rest[i] == line) return lineView.measure.rest[i];
@@ -1101,13 +1069,13 @@
     var lineN = lineNo(line);
     var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
     view.lineN = lineN;
-    var built = buildLineContent(cm, line, view);
+    var built = buildLineContent(cm, view);
     view.text = built.pre;
     removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
     return view;
   }
 
-  function measureCharNew(cm, line, ch, bias) {
+  function measureChar(cm, line, ch, bias) {
     var lineN = lineNo(line), display = cm.display;
     var view, ext = display.externalMeasured;
     if (lineN >= display.viewFrom && lineN < display.viewTo)
@@ -1119,7 +1087,7 @@
     if (!view)
       view = updateExternalMeasurement(cm, line);
 
-    var rect = getLineRect(view);
+    var rect = view.text.getBoundingClientRect();
     ensureLineHeights(cm, view, rect);
     var map = mapFromLineView(view, line, lineN);
     if (map.before) { map = map.before; ch = -1; }
@@ -1183,177 +1151,26 @@
     return uu;
   }
 
-  function measureCharOld(cm, line, ch, data, bias) {
-    var dir = -1;
-    data = data || measureLine(cm, line);
-    if (data.crude) {
-      var left = data.left + ch * data.width;
-      return {left: left, right: left + data.width, top: data.top, bottom: data.bottom};
-    }
-
-    for (var pos = ch;; pos += dir) {
-      var r = data[pos];
-      if (r) break;
-      if (dir < 0 && pos == 0) dir = 1;
-    }
-    bias = pos > ch ? "left" : pos < ch ? "right" : bias;
-    if (bias == "left" && r.leftSide) r = r.leftSide;
-    else if (bias == "right" && r.rightSide) r = r.rightSide;
-    return {left: pos < ch ? r.right : r.left,
-            right: pos > ch ? r.left : r.right,
-            top: r.top,
-            bottom: r.bottom};
-  }
-
-  function findCachedMeasurement(cm, line) {
-    var cache = cm.display.measureLineCache;
-    for (var i = 0; i < cache.length; ++i) {
-      var memo = cache[i];
-      if (memo.text == line.text && memo.markedSpans == line.markedSpans &&
-          cm.display.scroller.clientWidth == memo.width &&
-          memo.classes == line.textClass + "|" + line.wrapClass)
-        return memo;
-    }
-  }
-
-  function clearCachedMeasurement(cm, line) {
-    var exists = findCachedMeasurement(cm, line);
-    if (exists) exists.text = exists.measure = exists.markedSpans = null;
-  }
-
-  function measureLine(cm, line) {
-    // First look in the cache
-    var cached = findCachedMeasurement(cm, line);
-    if (cached) return cached.measure;
-
-    // Failing that, recompute and store result in cache
-    var measure = measureLineInner(cm, line);
-    var cache = cm.display.measureLineCache;
-    var memo = {text: line.text, width: cm.display.scroller.clientWidth,
-                markedSpans: line.markedSpans, measure: measure,
-                classes: line.textClass + "|" + line.wrapClass};
-    if (cache.length == 16) cache[++cm.display.measureLineCachePos % 16] = memo;
-    else cache.push(memo);
-    return measure;
-  }
-
-  function measureLineInner(cm, line) {
-    if (!cm.options.lineWrapping && line.text.length >= cm.options.crudeMeasuringFrom)
-      return crudelyMeasureLine(cm, line);
-
-    var display = cm.display, measure = emptyArray(line.text.length);
-    var pre = buildLineContent(cm, line, null, measure, true).pre;
-
-    // IE does not cache element positions of inline elements between
-    // calls to getBoundingClientRect. This makes the loop below,
-    // which gathers the positions of all the characters on the line,
-    // do an amount of layout work quadratic to the number of
-    // characters. When line wrapping is off, we try to improve things
-    // by first subdividing the line into a bunch of inline blocks, so
-    // that IE can reuse most of the layout information from caches
-    // for those blocks. This does interfere with line wrapping, so it
-    // doesn't work when wrapping is on, but in that case the
-    // situation is slightly better, since IE does cache line-wrapping
-    // information and only recomputes per-line.
-    if (old_ie && !ie_lt8 && !cm.options.lineWrapping && pre.childNodes.length > 100) {
-      var fragment = document.createDocumentFragment();
-      var chunk = 10, n = pre.childNodes.length;
-      for (var i = 0, chunks = Math.ceil(n / chunk); i < chunks; ++i) {
-        var wrap = elt("div", null, null, "display: inline-block");
-        for (var j = 0; j < chunk && n; ++j) {
-          wrap.appendChild(pre.firstChild);
-          --n;
-        }
-        fragment.appendChild(wrap);
-      }
-      pre.appendChild(fragment);
-    }
-
-    removeChildrenAndAdd(display.measure, pre);
-
-    var outer = getRect(display.lineDiv);
-    var vranges = [], data = emptyArray(line.text.length), maxBot = pre.offsetHeight;
-    // Work around an IE7/8 bug where it will sometimes have randomly
-    // replaced our pre with a clone at this point.
-    if (ie_lt9 && display.measure.first != pre)
-      removeChildrenAndAdd(display.measure, pre);
-
-    function measureRect(rect) {
-      var top = rect.top - outer.top, bot = rect.bottom - outer.top;
-      if (bot > maxBot) bot = maxBot;
-      if (top < 0) top = 0;
-      for (var i = vranges.length - 2; i >= 0; i -= 2) {
-        var rtop = vranges[i], rbot = vranges[i+1];
-        if (rtop > bot || rbot < top) continue;
-        if (rtop <= top && rbot >= bot ||
-            top <= rtop && bot >= rbot ||
-            Math.min(bot, rbot) - Math.max(top, rtop) >= (bot - top) >> 1) {
-          vranges[i] = Math.min(top, rtop);
-          vranges[i+1] = Math.max(bot, rbot);
-          break;
-        }
-      }
-      if (i < 0) { i = vranges.length; vranges.push(top, bot); }
-      return {left: rect.left - outer.left,
-              right: rect.right - outer.left,
-              top: i, bottom: null};
-    }
-    function finishRect(rect) {
-      rect.bottom = vranges[rect.top+1];
-      rect.top = vranges[rect.top];
-    }
-
-    for (var i = 0, cur; i < measure.length; ++i) if (cur = measure[i]) {
-      var node = cur, rect = null;
-      // A widget might wrap, needs special care
-      if (/\bCodeMirror-widget\b/.test(cur.className) && cur.getClientRects) {
-        if (cur.firstChild.nodeType == 1) node = cur.firstChild;
-        var rects = node.getClientRects();
-        if (rects.length > 1) {
-          rect = data[i] = measureRect(rects[0]);
-          rect.rightSide = measureRect(rects[rects.length - 1]);
-        }
-      }
-      if (!rect) rect = data[i] = measureRect(getRect(node));
-      if (cur.measureRight) rect.right = getRect(cur.measureRight).left - outer.left;
-      if (cur.leftSide) rect.leftSide = measureRect(getRect(cur.leftSide));
-    }
-    removeChildren(cm.display.measure);
-    for (var i = 0, cur; i < data.length; ++i) if (cur = data[i]) {
-      finishRect(cur);
-      if (cur.leftSide) finishRect(cur.leftSide);
-      if (cur.rightSide) finishRect(cur.rightSide);
-    }
-    return data;
-  }
-
-  function crudelyMeasureLine(cm, line) {
-    var copy = new Line(line.text.slice(0, 100), null);
-    if (line.textClass) copy.textClass = line.textClass;
-    var measure = measureLineInner(cm, copy);
-    var left = measureChar(cm, copy, 0, measure, "left");
-    var right = measureChar(cm, copy, 99, measure, "right");
-    return {crude: true, top: left.top, left: left.left, bottom: left.bottom, width: (right.right - left.left) / 100};
-  }
-
   function measureLineWidth(cm, line) {
     var hasBadSpan = false;
     if (line.markedSpans) for (var i = 0; i < line.markedSpans; ++i) {
       var sp = line.markedSpans[i];
       if (sp.collapsed && (sp.to == null || sp.to == line.text.length)) hasBadSpan = true;
     }
-    var cached = !hasBadSpan && findCachedMeasurement(cm, line);
-    if (cached || line.text.length >= cm.options.crudeMeasuringFrom)
-      return measureChar(cm, line, line.text.length, cached && cached.measure, "right").right;
+    // FIXME think about caching / reusing
+    if (line.text.length >= cm.options.crudeMeasuringFrom)
+      return measureChar(cm, line, line.text.length, "right").right;
 
-    var pre = buildLineContent(cm, line, null, null, true).pre;
+    // FIXME this is currently displacing widgets
+    // FIXME new LineView is nonsense
+    var pre = buildLineContent(cm, new LineView(cm.doc, line, lineNo(line))).pre;
     var end = pre.appendChild(zeroWidthElement(cm.display.measure));
     removeChildrenAndAdd(cm.display.measure, pre);
     return getRect(end).right - getRect(cm.display.lineDiv).left;
   }
 
   function clearCaches(cm) {
-    cm.display.measureLineCache.length = cm.display.measureLineCachePos = 0;
+    // FIXME clear new measure caches
     cm.display.cachedCharWidth = cm.display.cachedTextHeight = null;
     if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
     cm.display.lineNumChars = null;
@@ -1404,14 +1221,14 @@
 
   function charCoords(cm, pos, context, lineObj, bias) {
     if (!lineObj) lineObj = getLine(cm.doc, pos.line);
-    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, null, bias), context);
+    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context);
   }
 
-  function cursorCoords(cm, pos, context, lineObj, measurement) {
+  function cursorCoords(cm, pos, context, lineObj) {
+    // FIXME allow chunking of measureChar set-up
     lineObj = lineObj || getLine(cm.doc, pos.line);
-    if (!measurement) measurement = measureLine(cm, lineObj);
     function get(ch, right) {
-      var m = measureChar(cm, lineObj, ch, measurement, right ? "right" : "left");
+      var m = measureChar(cm, lineObj, ch, right ? "right" : "left");
       if (right) m.left = m.right; else m.right = m.left;
       return intoCoordSystem(cm, lineObj, m, context);
     }
@@ -1469,11 +1286,10 @@
   function coordsCharInner(cm, lineObj, lineNo, x, y) {
     var innerOff = y - heightAtLine(lineObj);
     var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
-    var measurement = measureLine(cm, lineObj);
+    // FIXME chunk cursorCoords set-up
 
     function getX(ch) {
-      var sp = cursorCoords(cm, Pos(lineNo, ch), "line",
-                            lineObj, measurement);
+      var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj);
       wrongLine = true;
       if (innerOff > sp.bottom) return sp.left - adjust;
       else if (innerOff < sp.top) return sp.left + adjust;
@@ -3720,8 +3536,7 @@
       }
       if (width != null) this.display.wrapper.style.width = interpret(width);
       if (height != null) this.display.wrapper.style.height = interpret(height);
-      if (this.options.lineWrapping)
-        this.display.measureLineCache.length = this.display.measureLineCachePos = 0;
+      if (this.options.lineWrapping) ; // FIXME clear measuring caches
       this.curOp.forceUpdate = true;
       signal(this, "refresh", this);
     }),
@@ -4396,7 +4211,7 @@
     var pos = this.find(-1, true), cm = this.doc.cm;
     if (!pos || !cm) return;
     var line = pos.line, lineN = lineNo(pos.line);
-    clearCachedMeasurement(cm, line);
+    // FIXME clear measure cache for this line
     if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) {
       var lineView = cm.display.view[findViewIndex(cm, lineN)];
       if (!lineView.hidden && lineView.node && lineView.node.offsetHeight != line.height)
@@ -5008,66 +4823,37 @@
       (cache[style] = style.replace(/\S+/g, "cm-$&"));
   }
 
-  function buildLineContent(cm, realLine, lineView, measure, copyWidgets) {
-    var merged, line = realLine, empty = true;
-    while (merged = collapsedSpanAtStart(line))
-      line = merged.find(-1, true).line;
-
+  function buildLineContent(cm, lineView) {
     var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
-    var builder = {pre: elt("pre", [content]), content: content, col: 0, pos: 0,
-                   measure: null, measuredSomething: false, cm: cm,
-                   copyWidgets: copyWidgets};
-
-    if (lineView) lineView.measure = {};
+    var builder = {pre: elt("pre", [content]), content: content, col: 0, pos: 0, cm: cm};
+    lineView.measure = {};
 
-    // FIXME use lineView's info instead of recomputing
-
-    do {
-      if (line.text) empty = false;
-      builder.measure = line == realLine && measure;
+    for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
+      var line = i ? lineView.rest[i - 1] : lineView.line;
       builder.pos = 0;
-      builder.addToken = builder.measure ? buildTokenMeasure : buildToken;
+      builder.addToken = buildToken;
       if ((old_ie || webkit) && cm.getOption("lineWrapping"))
         builder.addToken = buildTokenSplitSpaces(builder.addToken);
       if (lineView)
         builder.map = [];
-      var next = insertLineContent(line, builder, getLineStyles(cm, line));
-      if (lineView) {
-        if (builder.map.length == 0) builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
-        if (lineView.line == line) lineView.measure.map = builder.map;
-        else (lineView.measure.rest || (lineView.measure.rest = [])).push(builder.map);
-      }
-      if (measure && line == realLine && !builder.measuredSomething) {
-        measure[0] = builder.content.appendChild(zeroWidthElement(cm.display.measure));
-        builder.measuredSomething = true;
-      }
-      if (next) line = getLine(cm.doc, next.to.line);
-    } while (next);
-
-    if (measure && !builder.measuredSomething && !measure[0])
-      measure[0] = builder.content.appendChild(empty ? elt("span", "\u00a0") : zeroWidthElement(cm.display.measure));
-    if (!builder.content.firstChild && !lineIsHidden(cm.doc, realLine))
-      builder.content.appendChild(document.createTextNode("\u00a0"));
+      insertLineContent(line, builder, getLineStyles(cm, line));
 
-    var order;
-    // Work around problem with the reported dimensions of single-char
-    // direction spans on IE (issue #1129). See also the comment in
-    // cursorCoords.
-    if (measure && ie && (order = getOrder(line))) {
-      var l = order.length - 1;
-      if (order[l].from == order[l].to) --l;
-      var last = order[l], prev = order[l - 1];
-      if (last.from + 1 == last.to && prev && last.level < prev.level) {
-        var span = measure[builder.pos - 1];
-        if (span) span.parentNode.insertBefore(span.measureRight = zeroWidthElement(cm.display.measure),
-                                               span.nextSibling);
-      }
+      if (builder.map.length == 0)
+        builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
+
+      if (i == 0)
+        lineView.measure.map = builder.map;
+      else
+        (lineView.measure.rest || (lineView.measure.rest = [])).push(builder.map);
     }
 
-    var textClass = builder.textClass ? builder.textClass + " " + (realLine.textClass || "") : realLine.textClass;
+    if (!builder.content.firstChild)
+      builder.content.appendChild(document.createTextNode("\u00a0"));
+
+    var textClass = builder.textClass ? builder.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
     if (textClass) builder.pre.className = textClass;
 
-    signal(cm, "renderLine", cm, realLine, builder.pre);
+    signal(cm, "renderLine", cm, lineView.line, builder.pre);
     return builder;
   }
 
@@ -5112,7 +4898,7 @@
         builder.pos++;
       }
     }
-    if (style || startStyle || endStyle || builder.measure) {
+    if (style || startStyle || endStyle) {
       var fullStyle = style || "";
       if (startStyle) fullStyle += startStyle;
       if (endStyle) fullStyle += endStyle;
@@ -5123,31 +4909,6 @@
     builder.content.appendChild(content);
   }
 
-  function buildTokenMeasure(builder, text, style, startStyle, endStyle) {
-    var wrapping = builder.cm.options.lineWrapping;
-    for (var i = 0; i < text.length; ++i) {
-      var ch = text.charAt(i), start = i == 0;
-      if (ch >= "\ud800" && ch < "\udbff" && i < text.length - 1) {
-        ch = text.slice(i, i + 2);
-        ++i;
-      } else if (i && wrapping && spanAffectsWrapping(text, i)) {
-        builder.content.appendChild(elt("wbr"));
-      }
-      var pos = builder.pos, old = builder.measure[pos];
-      var span = builder.measure[pos] =
-        buildToken(builder, ch, style,
-                   start && startStyle, i == text.length - 1 && endStyle);
-      if (old) span.leftSide = old.leftSide || old;
-      // In IE single-space nodes wrap differently than spaces
-      // embedded in larger text nodes, except when set to
-      // white-space: normal (issue #1268).
-      if (old_ie && wrapping && ch == " " && i && !/\s/.test(text.charAt(i - 1)) &&
-          i < text.length - 1 && !/\s/.test(text.charAt(i + 1)))
-        span.style.whiteSpace = "normal";
-    }
-    if (text.length) builder.measuredSomething = true;
-  }
-
   function buildTokenSplitSpaces(inner) {
     function split(old) {
       var out = " ";
@@ -5164,22 +4925,7 @@
     var widget = !ignoreWidget && marker.replacedWith;
     if (widget) {
       if (builder.map) builder.map.push(builder.pos, builder.pos + size, widget);
-      if (builder.copyWidgets) widget = widget.cloneNode(true);
       builder.content.appendChild(widget);
-      if (builder.measure) {
-        if (size) {
-          builder.measure[builder.pos] = widget;
-        } else {
-          var elt = zeroWidthElement(builder.cm.display.measure);
-          if (marker.type == "bookmark" && !marker.insertLeft)
-            builder.measure[builder.pos] = builder.content.appendChild(elt);
-          else if (builder.measure[builder.pos])
-            return;
-          else
-            builder.measure[builder.pos] = builder.content.insertBefore(elt, widget);
-        }
-        builder.measuredSomething = true;
-      }
     }
     builder.pos += size;
   }
@@ -5219,7 +4965,7 @@
         if (collapsed && (collapsed.from || 0) == pos) {
           buildCollapsedSpan(builder, (collapsed.to == null ? len : collapsed.to) - pos,
                              collapsed.marker, collapsed.from == null);
-          if (collapsed.to == null) return collapsed.marker.find();
+          if (collapsed.to == null) return;
         }
         if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
           buildCollapsedSpan(builder, 0, foundBookmarks[j]);
@@ -6191,11 +5937,6 @@
     return target;
   }
 
-  function emptyArray(size) {
-    for (var a = [], i = 0; i < size; ++i) a.push(undefined);
-    return a;
-  }
-
   function bind(f) {
     var args = Array.prototype.slice.call(arguments, 1);
     return function(){return f.apply(null, args);};
@@ -6259,36 +6000,6 @@
     return "draggable" in div || "dragDrop" in div;
   }();
 
-  // For a reason I have yet to figure out, some browsers disallow
-  // word wrapping between certain characters *only* if a new inline
-  // element is started between them. This makes it hard to reliably
-  // measure the position of things, since that requires inserting an
-  // extra span. This terribly fragile set of tests matches the
-  // character combinations that suffer from this phenomenon on the
-  // various browsers.
-  function spanAffectsWrapping() { return false; }
-  if (gecko) // Only for "$'"
-    spanAffectsWrapping = function(str, i) {
-      return str.charCodeAt(i - 1) == 36 && str.charCodeAt(i) == 39;
-    };
-  else if (safari && !/Version\/([6-9]|\d\d)\b/.test(navigator.userAgent))
-    spanAffectsWrapping = function(str, i) {
-      return /\-[^ \-?]|\?[^ !\'\"\),.\-\/:;\?\]\}]/.test(str.slice(i - 1, i + 1));
-    };
-  else if (webkit && /Chrome\/(?:29|[3-9]\d|\d\d\d)\./.test(navigator.userAgent))
-    spanAffectsWrapping = function(str, i) {
-      var code = str.charCodeAt(i - 1);
-      return code >= 8208 && code <= 8212;
-    };
-  else if (webkit)
-    spanAffectsWrapping = function(str, i) {
-      if (i > 1 && str.charCodeAt(i - 1) == 45) {
-        if (/\w/.test(str.charAt(i - 2)) && /[^\-?\.]/.test(str.charAt(i))) return true;
-        if (i > 2 && /[\d\.,]/.test(str.charAt(i - 2)) && /[\d\.,]/.test(str.charAt(i))) return false;
-      }
-      return /[~!#%&*)=+}\]\\|\"\.>,:;][({[<]|-[^\-?\.\u2010-\u201f\u2026]|\?[\w~`@#$%\^&*(_=+{[|><]|\u2026[\w~`@#$%\^&*(_=+{[><]/.test(str.slice(i - 1, i + 1));
-    };
-
   var knownScrollbarWidth;
   function scrollbarWidth(measure) {
     if (knownScrollbarWidth != null) return knownScrollbarWidth;

From 957771b2328f737aa42da64c8ca112568e225d95 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 21 Dec 2013 16:19:30 +0100
Subject: [PATCH 0852/4742] Set up a caching mechanism for the new measuring
 system.

---
 lib/codemirror.js | 151 ++++++++++++++++++++++++++++++----------------
 1 file changed, 98 insertions(+), 53 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fa713a2e8d..91f2b19b8a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -642,9 +642,19 @@
     }
   }
 
+  function getLineContent(cm, lineView) {
+    var ext = cm.display.externalMeasured;
+    if (ext && ext.line == lineView.line) {
+      cm.display.externalMeasured = null;
+      lineView.measure = ext.measure;
+      return ext.built;
+    }
+    return buildLineContent(cm, lineView);      
+  }
+
   function updateLineText(cm, lineView) {
     var cls = lineView.text.className;
-    var built = buildLineContent(cm, lineView);
+    var built = getLineContent(cm, lineView);
     if (lineView.text == lineView.node) lineView.node = built.pre;
     lineView.text.parentNode.replaceChild(built.pre, lineView.text);
     lineView.text = built.pre;
@@ -705,7 +715,7 @@
   }
 
   function buildLineElement(cm, lineView, lineN, dims) {
-    var built = buildLineContent(cm, lineView);
+    var built = getLineContent(cm, lineView);
     lineView.text = lineView.node = built.pre;
     if (built.bgClass) lineView.bgClass = built.bgClass;
     if (built.textClass) lineView.textClass = built.textClass;
@@ -1057,11 +1067,14 @@
   }
 
   function mapFromLineView(lineView, line, lineN) {
-    if (lineView.line == line) return lineView.measure.map;
+    if (lineView.line == line)
+      return {map: lineView.measure.map, cache: lineView.measure.cache};
     for (var i = 0; i < lineView.rest.length; i++)
-      if (lineView.rest[i] == line) return lineView.measure.rest[i];
+      if (lineView.rest[i] == line)
+        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]};
     for (var i = 0; i < lineView.rest.length; i++)
-      if (lineNo(lineView.rest[i]) > lineN) return {before: lineView.measure.rest[i]};
+      if (lineNo(lineView.rest[i]) > lineN)
+        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true};
   }
 
   function updateExternalMeasurement(cm, line) {
@@ -1069,28 +1082,59 @@
     var lineN = lineNo(line);
     var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
     view.lineN = lineN;
-    var built = buildLineContent(cm, view);
+    var built = view.built = buildLineContent(cm, view);
     view.text = built.pre;
     removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
     return view;
   }
 
   function measureChar(cm, line, ch, bias) {
-    var lineN = lineNo(line), display = cm.display;
-    var view, ext = display.externalMeasured;
-    if (lineN >= display.viewFrom && lineN < display.viewTo)
-      view = display.view[findViewIndex(cm, lineN)];
+    return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias);
+  }
+
+  function findViewForLine(cm, lineN) {
+    var ext = cm.display.externalMeasured;
+    if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
+      return cm.display.view[findViewIndex(cm, lineN)];
     else if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
-      view = ext;
+      return ext;
+  }
+
+  function prepareMeasureForLine(cm, line) {
+    var lineN = lineNo(line), display = cm.display;
+    var view = findViewForLine(cm, lineN);
     if (view && (!view.text || view.changes))
       view = null;
     if (!view)
       view = updateExternalMeasurement(cm, line);
 
-    var rect = view.text.getBoundingClientRect();
-    ensureLineHeights(cm, view, rect);
-    var map = mapFromLineView(view, line, lineN);
-    if (map.before) { map = map.before; ch = -1; }
+    var info = mapFromLineView(view, line, lineN), before = false;
+    return {
+      line: line, view: view, rect: null,
+      map: info.map, cache: info.cache, before: info.before,
+      hasHeights: false
+    };
+  }
+
+  function measureCharPrepared(cm, prepared, ch, bias) {
+    if (prepared.before) ch = -1;
+    var key = ch + (bias || ""), found;
+    if (prepared.cache.hasOwnProperty(key)) {
+      found = prepared.cache[key];
+    } else {
+      if (!prepared.rect)
+        prepared.rect = prepared.view.text.getBoundingClientRect();
+      if (!prepared.hasHeights) {
+        ensureLineHeights(cm, prepared.view, prepared.rect);
+        prepared.hasHeights = true;
+      }
+      found = prepared.cache[key] = measureCharInner(cm, prepared, ch, bias);
+    }
+    return {left: found.left, right: found.right, top: found.top, bottom: found.bottom};
+  }
+
+  function measureCharInner(cm, prepared, ch, bias) {
+    var map = prepared.map;
 
     var node, start, end, collapse;
     for (var i = 0; i < map.length; i += 3) {
@@ -1124,53 +1168,51 @@
       }
     }
 
-    var inner;
+    var rect;
     if (node.nodeType == 3) {
       var range = document.createRange();
-      while (start && isExtendingChar.test(line.text.charAt(mStart + start))) --start;
-      while (mStart + end < mEnd && isExtendingChar.test(line.text.charAt(mStart + end))) ++end;
+      while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
+      while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
       range.setEnd(node, end);
       range.setStart(node, start);
-      inner = range.getBoundingClientRect();
+      rect = range.getBoundingClientRect();
     } else {
       if (start > 0) collapse = bias = "right";
       var rects;
       if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
-        inner = rects[bias == "right" ? rects.length - 1 : 0];
+        rect = rects[bias == "right" ? rects.length - 1 : 0];
       else
-        inner = node.getBoundingClientRect();
+        rect = node.getBoundingClientRect();
     }
 
-    var top, bot = inner.bottom - rect.top - 2, heights = view.measure.heights;
+    var top, bot = rect.bottom - prepared.rect.top - 2;
+    var heights = prepared.view.measure.heights;
     for (var i = 0; i < heights.length - 1; i++)
       if (bot < heights[i]) break;
     top = i ? heights[i - 1] : 0; bot = heights[i];
-    var uu = {left: (collapse == "right" ? inner.right : inner.left) - rect.left,
-            right: (collapse == "left" ? inner.left : inner.right) - rect.left,
+    return {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
+            right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
             top: top, bottom: bot};
-    return uu;
   }
 
-  function measureLineWidth(cm, line) {
-    var hasBadSpan = false;
-    if (line.markedSpans) for (var i = 0; i < line.markedSpans; ++i) {
-      var sp = line.markedSpans[i];
-      if (sp.collapsed && (sp.to == null || sp.to == line.text.length)) hasBadSpan = true;
+  function clearLineMeasurementCacheFor(lineView) {
+    if (lineView.measure) {
+      lineView.measure.cache = {};
+      lineView.measure.heights = null;
+      if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
+        lineView.measure.caches[i] = {};
     }
-    // FIXME think about caching / reusing
-    if (line.text.length >= cm.options.crudeMeasuringFrom)
-      return measureChar(cm, line, line.text.length, "right").right;
+  }
 
-    // FIXME this is currently displacing widgets
-    // FIXME new LineView is nonsense
-    var pre = buildLineContent(cm, new LineView(cm.doc, line, lineNo(line))).pre;
-    var end = pre.appendChild(zeroWidthElement(cm.display.measure));
-    removeChildrenAndAdd(cm.display.measure, pre);
-    return getRect(end).right - getRect(cm.display.lineDiv).left;
+  function clearLineMeasurementCache(cm) {
+    cm.display.externalMeasure = null;
+    removeChildren(cm.display.lineMeasure);
+    for (var i = 0; i < cm.display.view.length; i++)
+      clearLineMeasurementCacheFor(cm.display.view[i]);
   }
 
   function clearCaches(cm) {
-    // FIXME clear new measure caches
+    clearLineMeasurementCache(cm);
     cm.display.cachedCharWidth = cm.display.cachedTextHeight = null;
     if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
     cm.display.lineNumChars = null;
@@ -1224,11 +1266,11 @@
     return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context);
   }
 
-  function cursorCoords(cm, pos, context, lineObj) {
-    // FIXME allow chunking of measureChar set-up
+  function cursorCoords(cm, pos, context, lineObj, preparedMeasure) {
     lineObj = lineObj || getLine(cm.doc, pos.line);
+    if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
     function get(ch, right) {
-      var m = measureChar(cm, lineObj, ch, right ? "right" : "left");
+      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left");
       if (right) m.left = m.right; else m.right = m.left;
       return intoCoordSystem(cm, lineObj, m, context);
     }
@@ -1286,10 +1328,10 @@
   function coordsCharInner(cm, lineObj, lineNo, x, y) {
     var innerOff = y - heightAtLine(lineObj);
     var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
-    // FIXME chunk cursorCoords set-up
+    var preparedMeasure = prepareMeasureForLine(cm, lineObj);
 
     function getX(ch) {
-      var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj);
+      var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure);
       wrongLine = true;
       if (innerOff > sp.bottom) return sp.left - adjust;
       else if (innerOff < sp.top) return sp.left + adjust;
@@ -1385,7 +1427,7 @@
 
     if (op.updateMaxLine) computeMaxLength(cm);
     if (display.maxLineChanged && !cm.options.lineWrapping && display.maxLine) {
-      var width = measureLineWidth(cm, display.maxLine);
+      var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
       display.sizer.style.minWidth = Math.max(0, width + 3 + scrollerCutOff) + "px";
       display.maxLineChanged = false;
       var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + display.sizer.offsetWidth - display.scroller.clientWidth);
@@ -3536,7 +3578,7 @@
       }
       if (width != null) this.display.wrapper.style.width = interpret(width);
       if (height != null) this.display.wrapper.style.height = interpret(height);
-      if (this.options.lineWrapping) ; // FIXME clear measuring caches
+      if (this.options.lineWrapping) clearLineMeasurementCache(this);
       this.curOp.forceUpdate = true;
       signal(this, "refresh", this);
     }),
@@ -3545,9 +3587,9 @@
 
     refresh: operation(null, function() {
       var oldHeight = this.display.cachedTextHeight;
+      regChange(this);
       clearCaches(this);
       updateScrollPos(this, this.doc.scrollLeft, this.doc.scrollTop);
-      regChange(this);
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
         estimateLineHeights(this);
       signal(this, "refresh", this);
@@ -3665,7 +3707,6 @@
   option("historyEventDelay", 500);
   option("viewportMargin", 10, function(cm){cm.refresh();}, true);
   option("maxHighlightLength", 10000, resetModeState, true);
-  option("crudeMeasuringFrom", 10000);
   option("moveInputWithCursor", true, function(cm, val) {
     if (!val) cm.display.inputDiv.style.top = cm.display.inputDiv.style.left = 0;
   });
@@ -4211,7 +4252,8 @@
     var pos = this.find(-1, true), cm = this.doc.cm;
     if (!pos || !cm) return;
     var line = pos.line, lineN = lineNo(pos.line);
-    // FIXME clear measure cache for this line
+    var view = findViewForLine(cm, lineN);
+    if (view) clearLineMeasurementCacheFor(view);
     if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) {
       var lineView = cm.display.view[findViewIndex(cm, lineN)];
       if (!lineView.hidden && lineView.node && lineView.node.offsetHeight != line.height)
@@ -4841,10 +4883,13 @@
       if (builder.map.length == 0)
         builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
 
-      if (i == 0)
+      if (i == 0) {
         lineView.measure.map = builder.map;
-      else
-        (lineView.measure.rest || (lineView.measure.rest = [])).push(builder.map);
+        lineView.measure.cache = {};
+      } else {
+        (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map);
+        (lineView.measure.caches || (lineView.measure.caches = [])).push({});
+      }
     }
 
     if (!builder.content.firstChild)

From 18fc398405e02c4ad481bc4c30b5266cb9d9b6f3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 18 Nov 2013 13:20:46 +0100
Subject: [PATCH 0853/4742] Try to arrange for no measurements to happen
 between changing and updating the doc

---
 lib/codemirror.js | 65 +++++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 91f2b19b8a..6f6991f842 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -377,13 +377,22 @@
     }
   }
 
+  // viewPort can be null, {top [, height]}, or {line, ch}
   function visibleLines(display, doc, viewPort) {
-    var top = display.scroller.scrollTop, height = display.wrapper.clientHeight;
-    if (typeof viewPort == "number") top = viewPort;
-    else if (viewPort) {top = viewPort.top; height = viewPort.bottom - viewPort.top;}
-    top = Math.floor(top - paddingTop(display));
-    var bottom = Math.ceil(top + height);
-    return {from: lineAtHeight(doc, top), to: lineAtHeight(doc, bottom)};
+    if (viewPort && viewPort.line != null) {
+      if (viewPort.line >= display.viewTo)
+        return {from: lineAtHeight(doc, heightAtLine(getLine(doc, viewPort.line)) - display.wrapper.clientHeight),
+                to: viewPort.line};
+      var top = Math.max(doc.first, Math.min(viewPort.line, display.viewFrom));
+      return {from: top,
+              to: lineAtHeight(doc, heightAtLine(getLine(doc, top)) + display.wrapper.clientHeight)};
+    } else {
+      var top = viewPort ? viewPort.top : display.scroller.scrollTop;
+      var height = viewPort && viewPort.height || display.wrapper.clientHeight;
+      top = Math.floor(top - paddingTop(display));
+      var bottom = Math.ceil(top + height);
+      return {from: lineAtHeight(doc, top), to: lineAtHeight(doc, bottom)};
+    }
   }
 
   // LINE NUMBERS
@@ -446,9 +455,8 @@
       forced = false;
 
       // Clip forced viewport to actual scrollable area
-      if (viewPort)
-        viewPort = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight,
-                            typeof viewPort == "number" ? viewPort : viewPort.top);
+      if (viewPort && viewPort.top != null)
+        viewPort = {top: Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, viewPort.top)};
       visible = visibleLines(cm.display, cm.doc, viewPort);
       if (visible.from >= cm.display.viewFrom && visible.to <= cm.display.viewTo)
         break;
@@ -649,7 +657,7 @@
       lineView.measure = ext.measure;
       return ext.built;
     }
-    return buildLineContent(cm, lineView);      
+    return buildLineContent(cm, lineView);
   }
 
   function updateLineText(cm, lineView) {
@@ -1101,14 +1109,14 @@
   }
 
   function prepareMeasureForLine(cm, line) {
-    var lineN = lineNo(line), display = cm.display;
+    var lineN = lineNo(line);
     var view = findViewForLine(cm, lineN);
     if (view && (!view.text || view.changes))
       view = null;
     if (!view)
       view = updateExternalMeasurement(cm, line);
 
-    var info = mapFromLineView(view, line, lineN), before = false;
+    var info = mapFromLineView(view, line, lineN);
     return {
       line: line, view: view, rect: null,
       map: info.map, cache: info.cache, before: info.before,
@@ -1425,6 +1433,16 @@
     var op = cm.curOp, doc = cm.doc, display = cm.display;
     cm.curOp = null;
 
+    var viewPort = op.updateScrollPos && op.updateScrollPos.scrollTop != null ?
+      {top: op.updateScrollPos.scrollTop} :
+      (op.selectionChanged && display.scroller.clientHeight && doc.sel.primary().head);
+
+    if (op.viewChanged || op.forceUpdate || viewPort && viewPort.top != null) {
+      var updated = updateDisplay(cm, op.viewChanged, viewPort, op.forceUpdate);
+      if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
+    }
+    if (!updated && op.selectionChanged) updateSelection(cm);
+
     if (op.updateMaxLine) computeMaxLength(cm);
     if (display.maxLineChanged && !cm.options.lineWrapping && display.maxLine) {
       var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
@@ -1433,29 +1451,19 @@
       var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + display.sizer.offsetWidth - display.scroller.clientWidth);
       if (maxScrollLeft < doc.scrollLeft && !op.updateScrollPos)
         setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
+      updateScrollbars(cm);
     }
-    var newScrollPos, updated;
-    if (op.updateScrollPos) {
-      newScrollPos = op.updateScrollPos;
-    } else if (op.selectionChanged && display.scroller.clientHeight) { // don't rescroll if not visible
-      var coords = cursorCoords(cm, doc.sel.primary().head);
-      newScrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);
-    }
-    if (op.viewChanged || op.forceUpdate || newScrollPos && newScrollPos.scrollTop != null) {
-      updated = updateDisplay(cm, op.viewChanged, newScrollPos && newScrollPos.scrollTop, op.forceUpdate);
-      if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
-    }
-    if (!updated && op.selectionChanged) updateSelection(cm);
+
     if (op.updateScrollPos) {
-      var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, newScrollPos.scrollTop));
-      var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, newScrollPos.scrollLeft));
+      var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.updateScrollPos.scrollTop));
+      var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.updateScrollPos.scrollLeft));
       display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
       display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
       alignHorizontally(cm);
       if (op.scrollToPos)
         scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
                           clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
-    } else if (newScrollPos) {
+    } else if (viewPort) {
       scrollCursorIntoView(cm);
     }
     if (op.selectionChanged) restartBlink(cm);
@@ -2184,7 +2192,7 @@
   function setScrollTop(cm, val) {
     if (Math.abs(cm.doc.scrollTop - val) < 2) return;
     cm.doc.scrollTop = val;
-    if (!gecko) updateDisplay(cm, false, val);
+    if (!gecko) updateDisplay(cm, false, {top: val});
     if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
     if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;
     if (gecko) updateDisplay(cm, false);
@@ -5608,6 +5616,7 @@
     return n + i;
   }
 
+
   function heightAtLine(lineObj) {
     lineObj = visualLine(lineObj);
 

From f36a26a6e46a210c84457feafdeaee41a7c0ccd0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 28 Dec 2013 15:42:54 +0100
Subject: [PATCH 0854/4742] Fix IE problems with the new measurement code.

---
 lib/codemirror.css |   3 ++
 lib/codemirror.js  | 101 ++++++++++++++++++++++++++++++++-------------
 test/index.html    |   1 +
 test/vim_test.js   |   4 +-
 4 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index c141f6d85f..110693bed9 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -257,6 +257,9 @@ div.CodeMirror-cursors {
 /* IE7 hack to prevent it from returning funny offsetTops on the spans */
 .CodeMirror span { *vertical-align: text-bottom; }
 
+/* Used to force a border model for a node */
+.cm-force-border { padding-right: .1px; }
+
 @media print {
   /* Hide the cursor when printing */
   .CodeMirror div.CodeMirror-cursors {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6f6991f842..d363423d00 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -13,9 +13,8 @@
   // Crude, but necessary to handle a number of hard-to-feature-detect
   // bugs and behavior differences.
   var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  // IE11 currently doesn't count as 'ie', since it has almost none of
-  // the same bugs as earlier versions. Use ie_gt10 to handle
-  // incompatibilities in that version.
+  // old_ie refers to any Internet Explorer before 11 (which has
+  // almost none of the same bugs as earlier versions).
   var old_ie = /MSIE \d/.test(navigator.userAgent);
   var ie_lt8 = old_ie && (document.documentMode == null || document.documentMode < 8);
   var ie_lt9 = old_ie && (document.documentMode == null || document.documentMode < 9);
@@ -24,7 +23,7 @@
   var webkit = /WebKit\//.test(navigator.userAgent);
   var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
   var chrome = /Chrome\//.test(navigator.userAgent);
-  var opera = /Opera\//.test(navigator.userAgent);
+  var presto = /Opera\//.test(navigator.userAgent);
   var safari = /Apple Computer/.test(navigator.vendor);
   var khtml = /KHTML\//.test(navigator.userAgent);
   var mac_geLion = /Mac OS X 1\d\D([7-9]|\d\d)\D/.test(navigator.userAgent);
@@ -37,11 +36,11 @@
   var mac = ios || /Mac/.test(navigator.platform);
   var windows = /win/i.test(navigator.platform);
 
-  var opera_version = opera && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
-  if (opera_version) opera_version = Number(opera_version[1]);
-  if (opera_version && opera_version >= 15) { opera = false; webkit = true; }
+  var presto_version = presto && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
+  if (presto_version) presto_version = Number(presto_version[1]);
+  if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-  var flipCtrlCmd = mac && (qtwebkit || opera && (opera_version == null || opera_version < 12.11));
+  var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
   var captureRightClick = gecko || (old_ie && !ie_lt9);
 
   // Optimize some code when these features are not used
@@ -1178,12 +1177,14 @@
 
     var rect;
     if (node.nodeType == 3) {
-      var range = document.createRange();
       while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
       while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
-      range.setEnd(node, end);
-      range.setStart(node, start);
-      rect = range.getBoundingClientRect();
+      if (ie && cm.options.lineWrapping) {
+        var rects = range(node, start, end).getClientRects();
+        rect = rects[bias == "right" ? rects.length - 1 : 0];
+      } else {
+        rect = range(node, start, end).getBoundingClientRect();
+      }
     } else {
       if (start > 0) collapse = bias = "right";
       var rects;
@@ -1669,7 +1670,7 @@
     }
     var text = input.value;
     if (text == prevInput && !cm.somethingSelected()) return false;
-    if (ie && !ie_lt9 && cm.display.inputHasSelection === text) {
+    if (old_ie && !ie_lt9 && cm.display.inputHasSelection === text) {
       resetInput(cm, true);
       return false;
     }
@@ -1724,10 +1725,10 @@
       var content = minimal ? "-" : selected || cm.getSelection();
       cm.display.input.value = content;
       if (cm.state.focused) selectInput(cm.display.input);
-      if (ie && !ie_lt9) cm.display.inputHasSelection = content;
+      if (old_ie && !ie_lt9) cm.display.inputHasSelection = content;
     } else if (user) {
       cm.display.prevInput = cm.display.input.value = "";
-      if (ie && !ie_lt9) cm.display.inputHasSelection = null;
+      if (old_ie && !ie_lt9) cm.display.inputHasSelection = null;
     }
     cm.display.inaccurateSelection = minimal;
   }
@@ -1814,7 +1815,7 @@
       if (e.keyCode == 16) cm.display.shift = false;
     }));
     on(d.input, "input", function() {
-      if (ie && !ie_lt9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
+      if (old_ie && !ie_lt9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
       fastPoll(cm);
     });
     on(d.input, "keydown", operation(cm, onKeyDown));
@@ -2124,7 +2125,7 @@
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
       return;
     e_preventDefault(e);
-    if (ie) lastDrop = +new Date;
+    if (old_ie) lastDrop = +new Date;
     var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
     if (!pos || isReadOnly(cm)) return;
     if (files && files.length && window.FileReader && window.File) {
@@ -2167,7 +2168,7 @@
   }
 
   function onDragStart(cm, e) {
-    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
+    if (old_ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
 
     var txt = cm.getSelection();
@@ -2178,14 +2179,14 @@
     if (e.dataTransfer.setDragImage && !safari) {
       var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
       img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
-      if (opera) {
+      if (presto) {
         img.width = img.height = 1;
         cm.display.wrapper.appendChild(img);
         // Force a relayout, or Opera won't use our image for some obscure reason
         img._top = img.offsetTop;
       }
       e.dataTransfer.setDragImage(img, 0, 0);
-      if (opera) img.parentNode.removeChild(img);
+      if (presto) img.parentNode.removeChild(img);
     }
   }
 
@@ -2260,7 +2261,7 @@
     // estimated pixels/delta value, we just handle horizontal
     // scrolling entirely here. It'll be slightly off from native, but
     // better than glitching out.
-    if (dx && !gecko && !opera && wheelPixelsPerUnit != null) {
+    if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
       if (dy)
         setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
       setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
@@ -2384,7 +2385,7 @@
     // IE does strange things with escape.
     cm.display.shift = code == 16 || e.shiftKey;
     var handled = handleKeyBinding(cm, e);
-    if (opera) {
+    if (presto) {
       lastStoppedKey = handled ? code : null;
       // Opera has no cut event... we try to at least catch the key combo
       if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
@@ -2396,11 +2397,11 @@
     var cm = this;
     if (signalDOMEvent(cm, e)) return;
     var keyCode = e.keyCode, charCode = e.charCode;
-    if (opera && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-    if (((opera && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
+    if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
+    if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
     var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
     if (handleCharBinding(cm, e, ch)) return;
-    if (ie && !ie_lt9) cm.display.inputHasSelection = null;
+    if (old_ie && !ie_lt9) cm.display.inputHasSelection = null;
     fastPoll(cm);
   }
 
@@ -2436,7 +2437,7 @@
     if (eventInWidget(display, e) || contextMenuInGutter(cm, e)) return;
 
     var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
-    if (!pos || opera) return; // Opera is difficult.
+    if (!pos || presto) return; // Opera is difficult.
 
     // Reset the current text selection only if the click is done outside of the selection
     // and 'resetSelectionOnContextMenu' option is true.
@@ -4040,7 +4041,7 @@
     return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
   }
   function keyName(event, noShift) {
-    if (opera && event.keyCode == 34 && event["char"]) return false;
+    if (presto && event.keyCode == 34 && event["char"]) return false;
     var name = keyNames[event.keyCode];
     if (name == null || event.altGraphKey) return false;
     if (event.altKey) name = "Alt-" + name;
@@ -4874,16 +4875,21 @@
   }
 
   function buildLineContent(cm, lineView) {
+    // The padding-right forces the element to have a 'border', which
+    // is needed on Webkit to be able to get line-level bounding
+    // rectangles for it (in measureChar).
     var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
     var builder = {pre: elt("pre", [content]), content: content, col: 0, pos: 0, cm: cm};
     lineView.measure = {};
 
     for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
-      var line = i ? lineView.rest[i - 1] : lineView.line;
+      var line = i ? lineView.rest[i - 1] : lineView.line, order;
       builder.pos = 0;
       builder.addToken = buildToken;
       if ((old_ie || webkit) && cm.getOption("lineWrapping"))
         builder.addToken = buildTokenSplitSpaces(builder.addToken);
+      if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
+        builder.addToken = buildTokenBadBidi(builder.addToken, order);
       if (lineView)
         builder.map = [];
       insertLineContent(line, builder, getLineStyles(cm, line));
@@ -4970,7 +4976,26 @@
       return out;
     }
     return function(builder, text, style, startStyle, endStyle, title) {
-      return inner(builder, text.replace(/ {3,}/g, split), style, startStyle, endStyle, title);
+      inner(builder, text.replace(/ {3,}/g, split), style, startStyle, endStyle, title);
+    };
+  }
+
+  function buildTokenBadBidi(inner, order) {
+    return function(builder, text, style, startStyle, endStyle, title) {
+      style = style ? style + " cm-force-border" : "cm-force-border";
+      var start = builder.pos, end = start + text.length;
+      for (;;) {
+        // Find the part that overlaps with the start of this text
+        for (var i = 0; i < order.length; i++) {
+          var part = order[i];
+          if (part.to > start && part.from <= start) break;
+        }
+        if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title);
+        inner(builder, text.slice(0, part.to - start), style, startStyle, null, title);
+        startStyle = null;
+        text = text.slice(part.to - start);
+        start = part.to;
+      }
     };
   }
 
@@ -6021,6 +6046,13 @@
     return e;
   }
 
+  function range(node, start, end) {
+    var r = document.createRange();
+    r.setEnd(node, end);
+    r.setStart(node, start);
+    return r;
+  }
+
   function removeChildren(e) {
     for (var count = e.childNodes.length; count > 0; --count)
       e.removeChild(e.firstChild);
@@ -6076,6 +6108,17 @@
     else return elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
   }
 
+  // Feature-detect IE's crummy client rect reporting for bidi text
+  var badBidiRects;
+  function hasBadBidiRects(measure) {
+    if (badBidiRects != null) return badBidiRects;
+    var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
+    var r0 = range(txt, 0, 1).getBoundingClientRect();
+    if (r0.left == r0.right) return false;
+    var r1 = range(txt, 1, 2).getBoundingClientRect();
+    return badBidiRects = (r1.right - r0.right < 3);
+  }
+
   // See if "".split is the broken IE version, if so, provide an
   // alternative way to split lines.
   var splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
diff --git a/test/index.html b/test/index.html
index bdd88b0cb9..152263e10d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../lib/codemirror.css">
 <link rel="stylesheet" href="mode_test.css">
+<script src="../doc/activebookmark.js"></script>
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/mode/overlay.js"></script>
 <script src="../addon/mode/multiplex.js"></script>
diff --git a/test/vim_test.js b/test/vim_test.js
index dd88bbf8c6..ee02dc0941 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2056,7 +2056,7 @@ testVim('scrollMotion', function(cm, vim, helpers){
   prevScrollInfo = cm.getScrollInfo();
   helpers.doKeys('<C-e>');
   eq(1, cm.getCursor().line);
-  eq(true, prevScrollInfo.top < cm.getScrollInfo().top);
+  is(prevScrollInfo.top < cm.getScrollInfo().top);
   // Jump to the end of the sandbox.
   cm.setCursor(1000, 0);
   prevCursor = cm.getCursor();
@@ -2066,7 +2066,7 @@ testVim('scrollMotion', function(cm, vim, helpers){
   prevScrollInfo = cm.getScrollInfo();
   helpers.doKeys('<C-y>');
   eq(prevCursor.line - 1, cm.getCursor().line);
-  eq(true, prevScrollInfo.top > cm.getScrollInfo().top);
+  is(prevScrollInfo.top > cm.getScrollInfo().top);
 }, { value: scrollMotionSandbox});
 
 var squareBracketMotionSandbox = ''+

From 224234d903c9ef0d2c4325d534d9788fdb82979b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 28 Dec 2013 18:51:20 +0100
Subject: [PATCH 0855/4742] Improve behavior on pre-15 Opera versions

---
 lib/codemirror.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d363423d00..d0b53d0e03 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1135,7 +1135,8 @@
         ensureLineHeights(cm, prepared.view, prepared.rect);
         prepared.hasHeights = true;
       }
-      found = prepared.cache[key] = measureCharInner(cm, prepared, ch, bias);
+      found = measureCharInner(cm, prepared, ch, bias);
+      if (!presto || !found.bogus) prepared.cache[key] = found;
     }
     return {left: found.left, right: found.right, top: found.top, bottom: found.bottom};
   }
@@ -1199,9 +1200,11 @@
     for (var i = 0; i < heights.length - 1; i++)
       if (bot < heights[i]) break;
     top = i ? heights[i - 1] : 0; bot = heights[i];
-    return {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
-            right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
-            top: top, bottom: bot};
+    var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
+                  right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
+                  top: top, bottom: bot};
+    if (presto && !rect.left && !rect.right) result.bogus = true;
+    return result;
   }
 
   function clearLineMeasurementCacheFor(lineView) {

From 1da7c7b8d1dec519f509be93361fc2e46cb59a82 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 28 Dec 2013 19:41:10 +0100
Subject: [PATCH 0856/4742] Workaround IE8 bugs in the new measuring system

---
 lib/codemirror.js | 44 +++++++++++++++++++++++++++++++-------------
 test/test.js      |  3 ++-
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d0b53d0e03..752ad50722 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1180,7 +1180,9 @@
     if (node.nodeType == 3) {
       while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
       while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
-      if (ie && cm.options.lineWrapping) {
+      if (ie_lt9 && start == 0 && end == mEnd - mStart) {
+        rect = node.parentNode.getBoundingClientRect();
+      } else if (ie && cm.options.lineWrapping) {
         var rects = range(node, start, end).getClientRects();
         rect = rects[bias == "right" ? rects.length - 1 : 0];
       } else {
@@ -1194,6 +1196,10 @@
       else
         rect = node.getBoundingClientRect();
     }
+    if (ie_lt9 && !start && (!rect || !rect.left && !rect.right)) {
+      var rSpan = node.parentNode.getClientRects()[0];
+      rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
+    }
 
     var top, bot = rect.bottom - prepared.rect.top - 2;
     var heights = prepared.view.measure.heights;
@@ -4893,8 +4899,7 @@
         builder.addToken = buildTokenSplitSpaces(builder.addToken);
       if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
         builder.addToken = buildTokenBadBidi(builder.addToken, order);
-      if (lineView)
-        builder.map = [];
+      builder.map = [];
       insertLineContent(line, builder, getLineStyles(cm, line));
 
       if (builder.map.length == 0)
@@ -4927,11 +4932,12 @@
 
   function buildToken(builder, text, style, startStyle, endStyle, title) {
     if (!text) return;
-    var special = builder.cm.options.specialChars;
+    var special = builder.cm.options.specialChars, mustWrap = false;
     if (!special.test(text)) {
       builder.col += text.length;
       var content = document.createTextNode(text);
-      if (builder.map) builder.map.push(builder.pos, builder.pos + text.length, content);
+      builder.map.push(builder.pos, builder.pos + text.length, content);
+      if (ie_lt9) mustWrap = true;
       builder.pos += text.length;
     } else {
       var content = document.createDocumentFragment(), pos = 0;
@@ -4940,8 +4946,10 @@
         var m = special.exec(text);
         var skipped = m ? m.index - pos : text.length - pos;
         if (skipped) {
-          var txt = content.appendChild(document.createTextNode(text.slice(pos, pos + skipped)));
-          if (builder.map) builder.map.push(builder.pos, builder.pos + skipped, txt);
+          var txt = document.createTextNode(text.slice(pos, pos + skipped));
+          if (ie_lt9) content.appendChild(elt("span", [txt]));
+          else content.appendChild(txt);
+          builder.map.push(builder.pos, builder.pos + skipped, txt);
           builder.col += skipped;
           builder.pos += skipped;
         }
@@ -4953,14 +4961,15 @@
           builder.col += tabWidth;
         } else {
           var txt = builder.cm.options.specialCharPlaceholder(m[0]);
-          content.appendChild(txt);
+          if (ie_lt9) content.appendChild(elt("span", [txt]));
+          else content.appendChild(txt);
           builder.col += 1;
         }
-        if (builder.map) builder.map.push(builder.pos, builder.pos + 1, txt);
+        builder.map.push(builder.pos, builder.pos + 1, txt);
         builder.pos++;
       }
     }
-    if (style || startStyle || endStyle) {
+    if (style || startStyle || endStyle || mustWrap) {
       var fullStyle = style || "";
       if (startStyle) fullStyle += startStyle;
       if (endStyle) fullStyle += endStyle;
@@ -5005,7 +5014,7 @@
   function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
     var widget = !ignoreWidget && marker.replacedWith;
     if (widget) {
-      if (builder.map) builder.map.push(builder.pos, builder.pos + size, widget);
+      builder.map.push(builder.pos, builder.pos + size, widget);
       builder.content.appendChild(widget);
     }
     builder.pos += size;
@@ -6049,12 +6058,21 @@
     return e;
   }
 
-  function range(node, start, end) {
+  var range;
+  if (document.createRange) range = function(node, start, end) {
     var r = document.createRange();
     r.setEnd(node, end);
     r.setStart(node, start);
     return r;
-  }
+  };
+  else range = function(node, start, end) {
+    var r = document.body.createTextRange();
+    r.moveToElementText(node.parentNode);
+    r.collapse(true);
+    r.moveEnd("character", end);
+    r.moveStart("character", start);
+    return r;
+  };
 
   function removeChildren(e) {
     for (var count = e.childNodes.length; count > 0; --count)
diff --git a/test/test.js b/test/test.js
index 65e313b11c..45104b0c27 100644
--- a/test/test.js
+++ b/test/test.js
@@ -27,6 +27,7 @@ function byClassName(elt, cls) {
 }
 
 var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
+var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
 var mac = /Mac/.test(navigator.platform);
 var phantom = /PhantomJS/.test(navigator.userAgent);
 var opera = /Opera\/\./.test(navigator.userAgent);
@@ -1233,7 +1234,7 @@ testCM("rtlMovement", function(cm) {
       prevX = cursor.offsetLeft;
     }
   });
-});
+}, null, ie_lt9);
 
 // Verify that updating a line clears its bidi ordering
 testCM("bidiUpdate", function(cm) {

From 8a5e61e7508024d224bbd89c064ae434efe5ae84 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 28 Dec 2013 22:20:08 +0100
Subject: [PATCH 0857/4742] [vim keymap] Switch to CodeMirror.Pos, fix mutation
 of shared object

---
 keymap/vim.js | 150 +++++++++++++++++++++++++-------------------------
 1 file changed, 76 insertions(+), 74 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 720ef4a2c3..c00e5702f8 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -334,6 +334,8 @@
     { keys: [':'], type: 'ex' }
   ];
 
+  var Pos = CodeMirror.Pos;
+
   var Vim = function() {
     CodeMirror.defineOption('vimMode', false, function(cm, val) {
       if (val) {
@@ -358,7 +360,7 @@
       var head = obj.ranges[0].head;
       if (head.ch && head.ch == cm.doc.getLine(head.line).length) {
         obj.update([{anchor: obj.ranges[0].anchor,
-                     head: {line: head.line, ch: head.ch - 1}}]);
+                     head: Pos(head.line, head.ch - 1)}]);
       }
     }
     function getOnPasteFn(cm) {
@@ -1107,8 +1109,8 @@
         var operator = inputState.operator;
         var operatorArgs = inputState.operatorArgs || {};
         var registerName = inputState.registerName;
-        var selectionEnd = cm.getCursor('head');
-        var selectionStart = cm.getCursor('anchor');
+        var selectionEnd = copyCursor(cm.getCursor('head'));
+        var selectionStart = copyCursor(cm.getCursor('anchor'));
         // The difference between cur and selection cursors are that cur is
         // being operated on and ignores that there is a selection.
         var curStart = copyCursor(selectionEnd);
@@ -1164,7 +1166,7 @@
           }
           // TODO: Handle null returns from motion commands better.
           if (!curEnd) {
-            curEnd = { ch: curStart.ch, line: curStart.line };
+            curEnd = Pos(curStart.line, curStart.ch);
           }
           if (vim.visualMode) {
             // Check if the selection crossed over itself. Will need to shift
@@ -1267,22 +1269,22 @@
     var motions = {
       moveToTopLine: function(cm, motionArgs) {
         var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
-        return { line: line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(line)) };
+        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
       moveToMiddleLine: function(cm) {
         var range = getUserVisibleLines(cm);
         var line = Math.floor((range.top + range.bottom) * 0.5);
-        return { line: line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(line)) };
+        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
       moveToBottomLine: function(cm, motionArgs) {
         var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
-        return { line: line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(line)) };
+        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
       expandToLine: function(cm, motionArgs) {
         // Expands forward to end of line, and then to next line if repeat is
         // >1. Does not handle backward motion!
         var cur = cm.getCursor();
-        return { line: cur.line + motionArgs.repeat - 1, ch: Infinity };
+        return Pos(cur.line + motionArgs.repeat - 1, Infinity);
       },
       findNext: function(cm, motionArgs) {
         var state = getSearchState(cm);
@@ -1337,7 +1339,7 @@
           // Vim places the cursor on the first non-whitespace character of
           // the line if there is one, else it places the cursor at the end
           // of the line, regardless of whether a mark was found.
-          best.ch = findFirstNonWhiteSpaceCharacter(cm.getLine(best.line));
+          best = Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
         }
         return best;
       },
@@ -1345,7 +1347,7 @@
         var cur = cm.getCursor();
         var repeat = motionArgs.repeat;
         var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
-        return { line: cur.line, ch: ch };
+        return Pos(cur.line, ch);
       },
       moveByLines: function(cm, motionArgs, vim) {
         var cur = cm.getCursor();
@@ -1380,8 +1382,8 @@
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
           vim.lastHPos = endCh;
         }
-        vim.lastHSPos = cm.charCoords({line:line, ch:endCh},'div').left;
-        return { line: line, ch: endCh };
+        vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
+        return Pos(line, endCh);
       },
       moveByDisplayLines: function(cm, motionArgs, vim) {
         var cur = cm.getCursor();
@@ -1403,7 +1405,7 @@
             var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
             var res = cm.coordsChar(goalCoords, 'div');
           } else {
-            var resCoords = cm.charCoords({ line: cm.firstLine(), ch: 0}, 'div');
+            var resCoords = cm.charCoords(Pos(cm.firstLine(), 0), 'div');
             resCoords.left = vim.lastHSPos;
             res = cm.coordsChar(resCoords, 'div');
           }
@@ -1436,7 +1438,7 @@
             line += inc;
           }
         }
-        return { line: line, ch: 0 };
+        return Pos(line, 0);
       },
       moveByScroll: function(cm, motionArgs, vim) {
         var scrollbox = cm.getScrollInfo();
@@ -1490,7 +1492,7 @@
       moveToEol: function(cm, motionArgs, vim) {
         var cur = cm.getCursor();
         vim.lastHPos = Infinity;
-        var retval={ line: cur.line + motionArgs.repeat - 1, ch: Infinity };
+        var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
         var end=cm.clipPos(retval);
         end.ch--;
         vim.lastHSPos = cm.charCoords(end,'div').left;
@@ -1500,8 +1502,8 @@
         // Go to the start of the line where the text begins, or the end for
         // whitespace-only lines
         var cursor = cm.getCursor();
-        return { line: cursor.line,
-            ch: findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)) };
+        return Pos(cursor.line,
+                   findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
       },
       moveToMatchedSymbol: function(cm) {
         var cursor = cm.getCursor();
@@ -1514,7 +1516,7 @@
         do {
           symbol = lineText.charAt(ch++);
           if (symbol && isMatchableSymbol(symbol)) {
-            var endContext = cm.getTokenAt({line:line, ch:ch}).type;
+            var endContext = cm.getTokenAt(Pos(line, ch)).type;
             var endCtxLevel = getContextLevel(endContext);
             if (startCtxLevel >= endCtxLevel) {
               break;
@@ -1522,22 +1524,22 @@
           }
         } while (symbol);
         if (symbol) {
-          return findMatchedSymbol(cm, {line:line, ch:ch-1}, symbol);
+          return findMatchedSymbol(cm, Pos(line, ch-1), symbol);
         } else {
           return cursor;
         }
       },
       moveToStartOfLine: function(cm) {
         var cursor = cm.getCursor();
-        return { line: cursor.line, ch: 0 };
+        return Pos(cursor.line, 0);
       },
       moveToLineOrEdgeOfDocument: function(cm, motionArgs) {
         var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
         if (motionArgs.repeatIsExplicit) {
           lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
         }
-        return { line: lineNum,
-            ch: findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)) };
+        return Pos(lineNum,
+                   findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
       },
       textObjectManipulation: function(cm, motionArgs) {
         var character = motionArgs.selectedCharacter;
@@ -1682,7 +1684,7 @@
         var top = cm.getScrollInfo().top;
         var delta = lineHeight * repeat;
         var newPos = actionArgs.forward ? top + delta : top - delta;
-        var cursor = cm.getCursor();
+        var cursor = copyCursor(cm.getCursor());
         var cursorCoords = cm.charCoords(cursor, 'local');
         if (actionArgs.forward) {
           if (newPos > cursorCoords.top) {
@@ -1712,7 +1714,7 @@
       },
       scrollToCursor: function(cm, actionArgs) {
         var lineNum = cm.getCursor().line;
-        var charCoords = cm.charCoords({line: lineNum, ch: 0}, 'local');
+        var charCoords = cm.charCoords(Pos(lineNum, 0), 'local');
         var height = cm.getScrollInfo().clientHeight;
         var y = charCoords.top;
         var lineHeight = charCoords.bottom - y;
@@ -1757,7 +1759,7 @@
         var insertAt = (actionArgs) ? actionArgs.insertAt : null;
         if (insertAt == 'eol') {
           var cursor = cm.getCursor();
-          cursor = { line: cursor.line, ch: lineLength(cm, cursor.line) };
+          cursor = Pos(cursor.line, lineLength(cm, cursor.line));
           cm.setCursor(cursor);
         } else if (insertAt == 'charAfter') {
           cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
@@ -1795,15 +1797,13 @@
           vim.visualLine = !!actionArgs.linewise;
           if (vim.visualLine) {
             curStart.ch = 0;
-            curEnd = clipCursorToContent(cm, {
-              line: curStart.line + repeat - 1,
-              ch: lineLength(cm, curStart.line)
-            }, true /** includeLineBreak */);
+            curEnd = clipCursorToContent(
+              cm, Pos(curStart.line + repeat - 1, lineLength(cm, curStart.line)),
+              true /** includeLineBreak */);
           } else {
-            curEnd = clipCursorToContent(cm, {
-              line: curStart.line,
-              ch: curStart.ch + repeat
-            }, true /** includeLineBreak */);
+            curEnd = clipCursorToContent(
+              cm, Pos(curStart.line, curStart.ch + repeat),
+              true /** includeLineBreak */);
           }
           // Make the initial selection.
           if (!actionArgs.repeatIsExplicit && !vim.visualLine) {
@@ -1853,29 +1853,29 @@
           // Repeat is the number of lines to join. Minimum 2 lines.
           var repeat = Math.max(actionArgs.repeat, 2);
           curStart = cm.getCursor();
-          curEnd = clipCursorToContent(cm, { line: curStart.line + repeat - 1,
-              ch: Infinity });
+          curEnd = clipCursorToContent(cm, Pos(curStart.line + repeat - 1,
+                                               Infinity));
         }
         var finalCh = 0;
         cm.operation(function() {
           for (var i = curStart.line; i < curEnd.line; i++) {
             finalCh = lineLength(cm, curStart.line);
-            var tmp = { line: curStart.line + 1,
-                ch: lineLength(cm, curStart.line + 1) };
+            var tmp = Pos(curStart.line + 1,
+                          lineLength(cm, curStart.line + 1));
             var text = cm.getRange(curStart, tmp);
             text = text.replace(/\n\s*/g, ' ');
             cm.replaceRange(text, curStart, tmp);
           }
-          var curFinalPos = { line: curStart.line, ch: finalCh };
+          var curFinalPos = Pos(curStart.line, finalCh);
           cm.setCursor(curFinalPos);
         });
       },
       newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
         vim.insertMode = true;
-        var insertAt = cm.getCursor();
+        var insertAt = copyCursor(cm.getCursor());
         if (insertAt.line === cm.firstLine() && !actionArgs.after) {
           // Special case for inserting newline before start of document.
-          cm.replaceRange('\n', { line: cm.firstLine(), ch: 0 });
+          cm.replaceRange('\n', Pos(cm.firstLine(), 0));
           cm.setCursor(cm.firstLine(), 0);
         } else {
           insertAt.line = (actionArgs.after) ? insertAt.line :
@@ -1889,7 +1889,7 @@
         this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
       },
       paste: function(cm, actionArgs) {
-        var cur = cm.getCursor();
+        var cur = copyCursor(cm.getCursor());
         var register = vimGlobalState.registerController.getRegister(
             actionArgs.registerName);
         if (!register.text) {
@@ -1916,11 +1916,13 @@
         var curPosFinal;
         var idx;
         if (linewise && actionArgs.after) {
-          curPosFinal = { line: cur.line + 1,
-              ch: findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)) };
+          curPosFinal = Pos(
+            cur.line + 1,
+            findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
         } else if (linewise && !actionArgs.after) {
-          curPosFinal = { line: cur.line,
-              ch: findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)) };
+          curPosFinal = Pos(
+            cur.line,
+            findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
         } else if (!linewise && actionArgs.after) {
           idx = cm.indexFromPos(cur);
           curPosFinal = cm.posFromIndex(idx + text.length - 1);
@@ -1956,14 +1958,14 @@
           curEnd=cm.getCursor('end');
           // workaround to catch the character under the cursor
           //  existing workaround doesn't cover actions
-          curEnd=cm.clipPos({line: curEnd.line, ch: curEnd.ch+1});
+          curEnd=cm.clipPos(Pos(curEnd.line, curEnd.ch+1));
         }else{
           var line = cm.getLine(curStart.line);
           replaceTo = curStart.ch + actionArgs.repeat;
           if (replaceTo > line.length) {
             replaceTo=line.length;
           }
-          curEnd = { line: curStart.line, ch: replaceTo };
+          curEnd = Pos(curStart.line, replaceTo);
         }
         if(replaceWith=='\n'){
           if(!vim.visualMode) cm.replaceRange('', curStart, curEnd);
@@ -2001,14 +2003,14 @@
         if (token) {
           var increment = actionArgs.increase ? 1 : -1;
           var number = parseInt(token) + (increment * actionArgs.repeat);
-          var from = {ch:start, line:cur.line};
-          var to = {ch:end, line:cur.line};
+          var from = Pos(cur.line, start);
+          var to = Pos(cur.line, end);
           numberStr = number.toString();
           cm.replaceRange(numberStr, from, to);
         } else {
           return;
         }
-        cm.setCursor({line: cur.line, ch: start + numberStr.length - 1});
+        cm.setCursor(Pos(cur.line, start + numberStr.length - 1));
       },
       repeatLastEdit: function(cm, actionArgs, vim) {
         var lastEditInputState = vim.lastEditInputState;
@@ -2066,7 +2068,7 @@
       var maxCh = lineLength(cm, line) - 1;
       maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
       var ch = Math.min(Math.max(0, cur.ch), maxCh);
-      return { line: line, ch: ch };
+      return Pos(line, ch);
     }
     function copyArgs(args) {
       var ret = {};
@@ -2078,7 +2080,7 @@
       return ret;
     }
     function offsetCursor(cur, offsetLine, offsetCh) {
-      return { line: cur.line + offsetLine, ch: cur.ch + offsetCh };
+      return Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
     function matchKeysPartial(pressed, mapped) {
       for (var i = 0; i < pressed.length; i++) {
@@ -2097,7 +2099,7 @@
       };
     }
     function copyCursor(cur) {
-      return { line: cur.line, ch: cur.ch };
+      return Pos(cur.line, cur.ch);
     }
     function cursorEqual(cur1, cur2) {
       return cur1.ch == cur2.ch && cur1.line == cur2.line;
@@ -2254,8 +2256,8 @@
         }
       }
 
-      return { start: { line: cur.line, ch: wordStart },
-        end: { line: cur.line, ch: wordEnd }};
+      return { start: Pos(cur.line, wordStart),
+               end: Pos(cur.line, wordEnd) };
     }
 
     function recordJumpPosition(cm, oldCur, newCur) {
@@ -2343,7 +2345,7 @@
       }
     };
     function findSymbol(cm, repeat, forward, symb) {
-      var cur = cm.getCursor();
+      var cur = copyCursor(cm.getCursor());
       var increment = forward ? 1 : -1;
       var endLine = forward ? cm.lineCount() : -1;
       var curCh = cur.ch;
@@ -2386,7 +2388,7 @@
         }
       }
       if (state.nextCh || state.curMoveThrough) {
-        return { line: line, ch: state.index };
+        return Pos(line, state.index);
       }
       return cur;
     }
@@ -2500,7 +2502,7 @@
           break;
         }
         words.push(word);
-        cur = {line: word.line, ch: forward ? (word.to - 1) : word.from};
+        cur = Pos(word.line, forward ? (word.to - 1) : word.from);
       }
       var shortCircuit = words.length != repeat;
       var firstWord = words[0];
@@ -2511,19 +2513,19 @@
           // We did not start in the middle of a word. Discard the extra word at the end.
           lastWord = words.pop();
         }
-        return {line: lastWord.line, ch: lastWord.from};
+        return Pos(lastWord.line, lastWord.from);
       } else if (forward && wordEnd) {
-        return {line: lastWord.line, ch: lastWord.to - 1};
+        return Pos(lastWord.line, lastWord.to - 1);
       } else if (!forward && wordEnd) {
         // ge
         if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
           // We did not start in the middle of a word. Discard the extra word at the end.
           lastWord = words.pop();
         }
-        return {line: lastWord.line, ch: lastWord.to};
+        return Pos(lastWord.line, lastWord.to);
       } else {
         // b
-        return {line: lastWord.line, ch: lastWord.from};
+        return Pos(lastWord.line, lastWord.from);
       }
     }
 
@@ -2539,14 +2541,14 @@
         }
         start = idx;
       }
-      return { line: cm.getCursor().line, ch: idx };
+      return Pos(cm.getCursor().line, idx);
     }
 
     function moveToColumn(cm, repeat) {
       // repeat is always >= 1, so repeat - 1 always corresponds
       // to the column we want to go to.
       var line = cm.getCursor().line;
-      return clipCursorToContent(cm, { line: line, ch: repeat - 1 });
+      return clipCursorToContent(cm, Pos(line, repeat - 1));
     }
 
     function updateMark(cm, vim, markName, pos) {
@@ -2589,7 +2591,7 @@
       var ch = cur.ch;
       symb = symb ? symb : cm.getLine(line).charAt(ch);
 
-      var symbContext = cm.getTokenAt({line:line, ch:ch+1}).type;
+      var symbContext = cm.getTokenAt(Pos(line, ch + 1)).type;
       var symbCtxLevel = getContextLevel(symbContext);
 
       var reverseSymb = ({
@@ -2625,7 +2627,7 @@
           }
           nextCh = lineText.charAt(index);
         }
-        var revSymbContext = cm.getTokenAt({line:line, ch:index+1}).type;
+        var revSymbContext = cm.getTokenAt(Pos(line, index + 1)).type;
         var revSymbCtxLevel = getContextLevel(revSymbContext);
         if (symbCtxLevel >= revSymbCtxLevel) {
           if (nextCh === symb) {
@@ -2637,7 +2639,7 @@
       }
 
       if (nextCh) {
-        return { line: line, ch: index };
+        return Pos(line, index);
       }
       return cur;
     }
@@ -2657,7 +2659,7 @@
     // have identical opening and closing symbols
     // TODO support across multiple lines
     function findBeginningAndEnd(cm, symb, inclusive) {
-      var cur = cm.getCursor();
+      var cur = copyCursor(cm.getCursor());
       var line = cm.getLine(cur.line);
       var chars = line.split('');
       var start, end, i, len;
@@ -2709,8 +2711,8 @@
       }
 
       return {
-        start: { line: cur.line, ch: start },
-        end: { line: cur.line, ch: end }
+        start: Pos(cur.line, start),
+        end: Pos(cur.line, end)
       };
     }
 
@@ -2935,7 +2937,7 @@
             // SearchCursor may have returned null because it hit EOF, wrap
             // around and try again.
             cursor = cm.getSearchCursor(query,
-                (prev) ? { line: cm.lastLine() } : {line: cm.firstLine(), ch: 0} );
+                (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
             if (!cursor.find(prev)) {
               return;
             }
@@ -3241,8 +3243,8 @@
         var lineStart = params.line || cm.firstLine();
         var lineEnd = params.lineEnd || params.line || cm.lastLine();
         if (lineStart == lineEnd) { return; }
-        var curStart = { line: lineStart, ch: 0 };
-        var curEnd = { line: lineEnd, ch: lineLength(cm, lineEnd) };
+        var curStart = Pos(lineStart, 0);
+        var curEnd = Pos(lineEnd, lineLength(cm, lineEnd));
         var text = cm.getRange(curStart, curEnd).split('\n');
         var numberRegex = (number == 'decimal') ? /(-?)([\d]+)/ :
            (number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i :
@@ -3339,7 +3341,7 @@
           lineStart = lineEnd;
           lineEnd = lineStart + count - 1;
         }
-        var startPos = clipCursorToContent(cm, { line: lineStart, ch: 0 });
+        var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
         var cursor = cm.getSearchCursor(query, startPos);
         doReplace(cm, confirm, lineStart, lineEnd, cursor, query, replacePart);
       },

From 8315fe204e69eb669b200b58730940f145ddec40 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 28 Dec 2013 22:27:48 +0100
Subject: [PATCH 0858/4742] Allow partial line updates in measureChar

This will occasionally save some work.
---
 lib/codemirror.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 752ad50722..899e3ec8a6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -606,14 +606,8 @@
         while (cur != lineView.node) cur = rm(cur);
         var updateNumber = lineNumbers && updateNumbersFrom <= lineN && lineView.lineNumber;
         if (lineView.changes) {
-          for (var j = 0; j < lineView.changes.length; j++) {
-            var type = lineView.changes[j];
-            if (type == "text") updateLineText(cm, lineView);
-            else if (type == "gutter") { updateNumber = false; updateLineGutter(cm, lineView, lineN, dims); }
-            else if (type == "class") updateLineClasses(lineView);
-            else if (type == "widget") updateLineWidgets(lineView, dims);
-          }
-          lineView.changes = null;
+          if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false;
+          updateLineForChanges(cm, lineView, lineN, dims);
         }
         if (updateNumber)
           setTextContent(lineView.lineNumber, lineNumberFor(cm.options, lineN));
@@ -624,6 +618,17 @@
     while (cur) cur = rm(cur);
   }
 
+  function updateLineForChanges(cm, lineView, lineN, dims) {
+    for (var j = 0; j < lineView.changes.length; j++) {
+      var type = lineView.changes[j];
+      if (type == "text") updateLineText(cm, lineView);
+      else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
+      else if (type == "class") updateLineClasses(lineView);
+      else if (type == "widget") updateLineWidgets(lineView, dims);
+    }
+    lineView.changes = null;
+  }
+
   // Lines with gutter elements, widgets or a background class need to
   // be wrapped, and have the extra elements added to the wrapper div
   function ensureLineWrapped(lineView) {
@@ -1100,18 +1105,20 @@
   }
 
   function findViewForLine(cm, lineN) {
-    var ext = cm.display.externalMeasured;
     if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
       return cm.display.view[findViewIndex(cm, lineN)];
-    else if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
+    var ext = cm.display.externalMeasured;
+    if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
       return ext;
   }
 
   function prepareMeasureForLine(cm, line) {
     var lineN = lineNo(line);
     var view = findViewForLine(cm, lineN);
-    if (view && (!view.text || view.changes))
+    if (view && !view.text)
       view = null;
+    else if (view && view.changes)
+      updateLineForChanges(cm, view, lineN, getDimensions(cm));
     if (!view)
       view = updateExternalMeasurement(cm, line);
 

From ae7a18e44e62c857ba8487c2da8507ae1372c609 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 28 Dec 2013 23:18:51 +0100
Subject: [PATCH 0859/4742] [test suite] Shutting up PhantomJS

---
 lib/codemirror.js | 2 +-
 test/test.js      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 899e3ec8a6..6fd1021cf2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1208,7 +1208,7 @@
       rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
     }
 
-    var top, bot = rect.bottom - prepared.rect.top - 2;
+    var top, bot = (rect.bottom + rect.top) / 2 - prepared.rect.top;
     var heights = prepared.view.measure.heights;
     for (var i = 0; i < heights.length - 1; i++)
       if (bot < heights[i]) break;
diff --git a/test/test.js b/test/test.js
index 45104b0c27..0e37d2382c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -909,6 +909,7 @@ testCM("wrappingInlineWidget", function(cm) {
   eq(curR.bottom, cur1.bottom);
   cm.replaceRange("", Pos(0, 9), Pos(0));
   curR = cm.cursorCoords(Pos(0, 9));
+  if (phantom) return;
   eq(curR.top, cur1.top);
   eq(curR.bottom, cur1.bottom);
 }, {value: "1 2 3 xxx 4", lineWrapping: true});
@@ -1338,6 +1339,7 @@ testCM("getLineNumber", function(cm) {
 });
 
 testCM("jumpTheGap", function(cm) {
+  if (phantom) return;
   var longLine = "abcdef ghiklmnop qrstuvw xyz ";
   longLine += longLine; longLine += longLine; longLine += longLine;
   cm.setLine(2, longLine);

From 2d1e9ae7700ee036144f694850a6af4a87bc096c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 31 Dec 2013 10:22:32 +0100
Subject: [PATCH 0860/4742] Get rid of getRect helper

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6fd1021cf2..af830ae2b5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -433,7 +433,7 @@
     return String(options.lineNumberFormatter(i + options.firstLineNumber));
   }
   function compensateForHScroll(display) {
-    return getRect(display.scroller).left - getRect(display.sizer).left;
+    return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left;
   }
 
   // DISPLAY DRAWING
@@ -543,7 +543,7 @@
         height = bot - prevBottom;
         prevBottom = bot;
       } else {
-        var box = getRect(cur.node);
+        var box = cur.node.getBoundingClientRect();
         height = box.bottom - box.top;
       }
       var diff = cur.line.height - height;
@@ -868,7 +868,7 @@
     // Move the hidden textarea near the cursor to prevent scrolling artifacts
     if (cm.options.moveInputWithCursor) {
       var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
-      var wrapOff = getRect(display.wrapper), lineOff = getRect(display.lineDiv);
+      var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
       display.inputDiv.style.top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
                                                         headPos.top + lineOff.top - wrapOff.top)) + "px";
       display.inputDiv.style.left = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
@@ -1258,7 +1258,7 @@
     if (context == "local") yOff += paddingTop(cm.display);
     else yOff -= cm.display.viewOffset;
     if (context == "page" || context == "window") {
-      var lOff = getRect(cm.display.lineSpace);
+      var lOff = cm.display.lineSpace.getBoundingClientRect();
       yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
       var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
       rect.left += xOff; rect.right += xOff;
@@ -1277,12 +1277,12 @@
       left -= pageScrollX();
       top -= pageScrollY();
     } else if (context == "local" || !context) {
-      var localBox = getRect(cm.display.sizer);
+      var localBox = cm.display.sizer.getBoundingClientRect();
       left += localBox.left;
       top += localBox.top;
     }
 
-    var lineSpaceBox = getRect(cm.display.lineSpace);
+    var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
     return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
   }
 
@@ -1902,7 +1902,7 @@
           target == display.scrollbarV || target == display.scrollbarV.firstChild ||
           target == display.scrollbarFiller || target == display.gutterFiller) return null;
     }
-    var x, y, space = getRect(display.lineSpace);
+    var x, y, space = display.lineSpace.getBoundingClientRect();
     // Fails unpredictably on IE[67] when mouse is dragged around quickly.
     try { x = e.clientX - space.left; y = e.clientY - space.top; }
     catch (e) { return null; }
@@ -2056,7 +2056,7 @@
       startSel = doc.sel;
     }
 
-    var editorSize = getRect(display.wrapper);
+    var editorSize = display.wrapper.getBoundingClientRect();
     // Used to ensure timeout re-tries don't fire when another extend
     // happened in the meantime (clearTimeout isn't reliable -- at
     // least on Chrome, the timeouts still happen even when cleared,
@@ -2103,18 +2103,18 @@
   function gutterEvent(cm, e, type, prevent, signalfn) {
     try { var mX = e.clientX, mY = e.clientY; }
     catch(e) { return false; }
-    if (mX >= Math.floor(getRect(cm.display.gutters).right)) return false;
+    if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
     if (prevent) e_preventDefault(e);
 
     var display = cm.display;
-    var lineBox = getRect(display.lineDiv);
+    var lineBox = display.lineDiv.getBoundingClientRect();
 
     if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);
     mY -= lineBox.top - display.viewOffset;
 
     for (var i = 0; i < cm.options.gutters.length; ++i) {
       var g = display.gutters.childNodes[i];
-      if (g && getRect(g).right >= mX) {
+      if (g && g.getBoundingClientRect().right >= mX) {
         var line = lineAtHeight(cm.doc, mY);
         var gutter = cm.options.gutters[i];
         signalfn(cm, type, cm, line, gutter, e);
@@ -2963,7 +2963,7 @@
   function scrollCursorIntoView(cm) {
     var coords = scrollPosIntoView(cm, cm.doc.sel.primary().head, null, cm.options.cursorScrollMargin);
     if (!cm.state.focused) return;
-    var display = cm.display, box = getRect(display.sizer), doScroll = null;
+    var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
     if (coords.top + box.top < 0) doScroll = true;
     else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
     if (doScroll != null && !phantom) {
@@ -6098,11 +6098,6 @@
     } else e.textContent = str;
   }
 
-  function getRect(node) {
-    return node.getBoundingClientRect();
-  }
-  CodeMirror.replaceGetRect = function(f) { getRect = f; };
-
   // FEATURE DETECTION
 
   // Detect drag-and-drop

From 06cd26a96ffa4f15e7184eac249f32c5c767ab5a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 31 Dec 2013 19:45:47 +0100
Subject: [PATCH 0861/4742] Be more careful about interleaving DOM updates and
 reads

---
 lib/codemirror.js | 127 +++++++++++++++++++++++++++-------------------
 1 file changed, 75 insertions(+), 52 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index af830ae2b5..c5cce8fcfd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -283,6 +283,9 @@
       }
     }
     gutters.style.display = i ? "" : "none";
+    var width = gutters.offsetWidth;
+    cm.display.sizer.style.marginLeft = width + "px";
+    if (i) cm.display.scrollbarH.style.left =  cm.options.fixedGutter ? 0 : width + "px";
   }
 
   function lineLength(line) {
@@ -331,22 +334,34 @@
 
   // SCROLLBARS
 
+  function measureForScrollbars(cm) {
+    var scroll = cm.display.scroller;
+    return {
+      scrollHeight: scroll.scrollHeight, clientHeight: scroll.clientHeight,
+      barHeight: cm.display.scrollbarV.clientHeight,
+      scrollWidth: scroll.scrollWidth, clientWidth: scroll.clientWidth,
+      barWidth: cm.display.scrollbarH.clientWidth,
+      paddingVert: paddingVert(cm.display)
+    };
+  }
+
   // Re-synchronize the fake scrollbars with the actual size of the
   // content. Optionally force a scrollTop.
-  function updateScrollbars(cm) {
+  function updateScrollbars(cm, measure) {
+    if (!measure) measure = measureForScrollbars(cm);
     var d = cm.display, docHeight = cm.doc.height;
-    var totalHeight = docHeight + paddingVert(d);
+    var totalHeight = docHeight + measure.paddingVert;
     d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
-    d.gutters.style.height = Math.max(totalHeight, d.scroller.clientHeight - scrollerCutOff) + "px";
-    var scrollHeight = Math.max(totalHeight, d.scroller.scrollHeight);
-    var needsH = d.scroller.scrollWidth > (d.scroller.clientWidth + 1);
-    var needsV = scrollHeight > (d.scroller.clientHeight + 1);
+    d.gutters.style.height = Math.max(totalHeight, measure.clientHeight - scrollerCutOff) + "px";
+    var scrollHeight = Math.max(totalHeight, measure.scrollHeight);
+    var needsH = measure.scrollWidth > (measure.clientWidth + 1);
+    var needsV = scrollHeight > (measure.clientHeight + 1);
     if (needsV) {
       d.scrollbarV.style.display = "block";
       d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";
       // A bug in IE8 can cause this value to be negative, so guard it.
       d.scrollbarV.firstChild.style.height =
-        Math.max(0, scrollHeight - d.scroller.clientHeight + d.scrollbarV.clientHeight) + "px";
+        Math.max(0, scrollHeight - measure.clientHeight + (measure.barHeight || d.scrollbarV.clientHeight)) + "px";
     } else {
       d.scrollbarV.style.display = "";
       d.scrollbarV.firstChild.style.height = "0";
@@ -355,7 +370,7 @@
       d.scrollbarH.style.display = "block";
       d.scrollbarH.style.right = needsV ? scrollbarWidth(d.measure) + "px" : "0";
       d.scrollbarH.firstChild.style.width =
-        (d.scroller.scrollWidth - d.scroller.clientWidth + d.scrollbarH.clientWidth) + "px";
+        (measure.scrollWidth - measure.clientWidth + (measure.barWidth || d.scrollbarH.clientWidth)) + "px";
     } else {
       d.scrollbarH.style.display = "";
       d.scrollbarH.firstChild.style.width = "0";
@@ -424,6 +439,10 @@
       display.lineNumWidth = display.lineNumInnerWidth + padding;
       display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
       display.lineGutter.style.width = display.lineNumWidth + "px";
+      var width = display.gutters.offsetWidth;
+      if (!cm.options.fixedGutter)
+        display.scrollbarH.style.left = width + "px";
+      display.sizer.style.marginLeft = width + "px";
       return true;
     }
     return false;
@@ -445,8 +464,9 @@
       var oldWidth = cm.display.scroller.clientWidth;
       if (!updateDisplayInner(cm, !updated && viewChanged, visible, forced)) break;
       updated = true;
+      var barMeasure = measureForScrollbars(cm);
       updateSelection(cm);
-      updateScrollbars(cm);
+      updateScrollbars(cm, barMeasure);
       if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
         forced = true;
         continue;
@@ -455,7 +475,7 @@
 
       // Clip forced viewport to actual scrollable area
       if (viewPort && viewPort.top != null)
-        viewPort = {top: Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, viewPort.top)};
+        viewPort = {top: Math.min(barMeasure.scrollHeight - barMeasure.clientHeight, viewPort.top)};
       visible = visibleLines(cm.display, cm.doc, viewPort);
       if (visible.from >= cm.display.viewFrom && visible.to <= cm.display.viewTo)
         break;
@@ -487,8 +507,7 @@
 
     if (maybeUpdateLineNumberWidth(cm))
       resetView(cm);
-    var gutterW = display.sizer.style.marginLeft = display.gutters.offsetWidth + "px";
-    display.scrollbarH.style.left = cm.options.fixedGutter ? gutterW : "0";
+    var dims = getDimensions(cm);
 
     var end = doc.first + doc.size;
     var from = Math.max(visible.from - cm.options.viewportMargin, doc.first);
@@ -509,25 +528,28 @@
       var v = display.view[i];
       if (!v.hidden && (!v.node || v.changes)) ++toUpdate;
     }
-    if (!different && toUpdate == 0 && !forced) {
-      updateViewOffset(cm);
-      return;
+
+    updateViewOffset(cm);
+    if (!different && toUpdate == 0 && !forced) return;
+
+    if (toUpdate > 4) {
+      var focused = document.activeElement;
+      display.lineDiv.style.display = "none";
+    }
+    patchDisplay(cm, display.updateLineNumbers, dims);
+    if (toUpdate > 4) {
+      display.lineDiv.style.display = "";
+      if (focused && document.activeElement != focused && focused.offsetHeight) focused.focus();
     }
 
-    var focused = document.activeElement;
-    if (toUpdate > 4) display.lineDiv.style.display = "none";
-    patchDisplay(cm, display.updateLineNumbers);
-    if (toUpdate > 4) display.lineDiv.style.display = "";
-    if (focused && document.activeElement != focused && focused.offsetHeight) focused.focus();
+    display.gutters.style.height = "";
 
     if (different) {
       display.lastSizeC = display.wrapper.clientHeight;
       startWorker(cm, 400);
     }
 
-    display.gutters.style.height = "";
     updateHeightsInViewport(cm);
-    updateViewOffset(cm);
 
     return true;
   }
@@ -581,8 +603,7 @@
             wrapperWidth: d.wrapper.clientWidth};
   }
 
-  function patchDisplay(cm, updateNumbersFrom) {
-    var dims = getDimensions(cm);
+  function patchDisplay(cm, updateNumbersFrom, dims) {
     var display = cm.display, lineNumbers = cm.options.lineNumbers;
     var container = display.lineDiv, cur = container.firstChild;
 
@@ -604,13 +625,16 @@
         container.insertBefore(node, cur);
       } else { // Already drawn
         while (cur != lineView.node) cur = rm(cur);
-        var updateNumber = lineNumbers && updateNumbersFrom <= lineN && lineView.lineNumber;
+        var updateNumber = lineNumbers && updateNumbersFrom != null &&
+          updateNumbersFrom <= lineN && lineView.lineNumber;
         if (lineView.changes) {
           if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false;
           updateLineForChanges(cm, lineView, lineN, dims);
         }
-        if (updateNumber)
-          setTextContent(lineView.lineNumber, lineNumberFor(cm.options, lineN));
+        if (updateNumber) {
+          removeChildren(lineView.lineNumber);
+          lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
+        }
         cur = lineView.node.nextSibling;
       }
       lineN += lineView.size;
@@ -854,40 +878,46 @@
 
   function updateSelection(cm) {
     var display = cm.display, doc = cm.doc;
-    removeChildren(display.cursorDiv);
-    removeChildren(display.selectionDiv);
+    var curFragment = document.createDocumentFragment();
+    var selFragment = document.createDocumentFragment();
+
     for (var i = 0; i < doc.sel.ranges.length; i++) {
       var range = doc.sel.ranges[i];
       var collapsed = range.empty();
       if (collapsed || cm.options.showCursorWhenSelecting)
-        updateSelectionCursor(cm, range);
+        updateSelectionCursor(cm, range, curFragment);
       if (!collapsed)
-        updateSelectionRange(cm, range);
+        updateSelectionRange(cm, range, selFragment);
     }
 
     // Move the hidden textarea near the cursor to prevent scrolling artifacts
     if (cm.options.moveInputWithCursor) {
       var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
       var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
-      display.inputDiv.style.top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                                        headPos.top + lineOff.top - wrapOff.top)) + "px";
-      display.inputDiv.style.left = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                                         headPos.left + lineOff.left - wrapOff.left)) + "px";
+      var top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
+                                     headPos.top + lineOff.top - wrapOff.top));
+      var left = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
+                                      headPos.left + lineOff.left - wrapOff.left));
+      display.inputDiv.style.top = top + "px";
+      display.inputDiv.style.left = left + "px";
     }
+
+    removeChildrenAndAdd(display.cursorDiv, curFragment);
+    removeChildrenAndAdd(display.selectionDiv, selFragment);
   }
 
   // No selection, plain cursor
-  function updateSelectionCursor(cm, range) {
-    var display = cm.display, pos = cursorCoords(cm, range.head, "div");
+  function updateSelectionCursor(cm, range, output) {
+    var pos = cursorCoords(cm, range.head, "div");
 
-    var cursor = display.cursorDiv.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
+    var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
     cursor.style.left = pos.left + "px";
     cursor.style.top = pos.top + "px";
     cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
 
     if (pos.other) {
       // Secondary cursor, shown when on a 'jump' in bi-directional text
-      var otherCursor = display.cursorDiv.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
+      var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
       otherCursor.style.display = "";
       otherCursor.style.left = pos.other.left + "px";
       otherCursor.style.top = pos.other.top + "px";
@@ -896,7 +926,7 @@
   }
 
   // Highlight selection
-  function updateSelectionRange(cm, range) {
+  function updateSelectionRange(cm, range, output) {
     var display = cm.display, doc = cm.doc;
     var fragment = document.createDocumentFragment();
     var clientWidth = display.lineSpace.offsetWidth, pl = paddingLeft(cm.display);
@@ -964,8 +994,7 @@
         add(pl, leftEnd.bottom, null, rightStart.top);
     }
 
-    display.selectionDiv.appendChild(fragment);
-    display.selectionDiv.style.display = "";
+    output.appendChild(fragment);
   }
 
   // Cursor-blinking
@@ -1463,9 +1492,10 @@
     if (op.updateMaxLine) computeMaxLength(cm);
     if (display.maxLineChanged && !cm.options.lineWrapping && display.maxLine) {
       var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
-      display.sizer.style.minWidth = Math.max(0, width + 3 + scrollerCutOff) + "px";
       display.maxLineChanged = false;
-      var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + display.sizer.offsetWidth - display.scroller.clientWidth);
+      var minWidth = Math.max(0, width + 3 + scrollerCutOff);
+      var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + minWidth - display.scroller.clientWidth);
+      display.sizer.style.minWidth = minWidth + "px";
       if (maxScrollLeft < doc.scrollLeft && !op.updateScrollPos)
         setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
       updateScrollbars(cm);
@@ -6060,7 +6090,7 @@
     var e = document.createElement(tag);
     if (className) e.className = className;
     if (style) e.style.cssText = style;
-    if (typeof content == "string") setTextContent(e, content);
+    if (typeof content == "string") e.appendChild(document.createTextNode(content));
     else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
     return e;
   }
@@ -6091,13 +6121,6 @@
     return removeChildren(parent).appendChild(e);
   }
 
-  function setTextContent(e, str) {
-    if (ie_lt9) {
-      e.innerHTML = "";
-      e.appendChild(document.createTextNode(str));
-    } else e.textContent = str;
-  }
-
   // FEATURE DETECTION
 
   // Detect drag-and-drop

From 02523fba9ecd170cc38b04f64288354073f00869 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 31 Dec 2013 23:20:35 +0100
Subject: [PATCH 0862/4742] Prevent selection from messing up scroll
 measurements

Follow-up to 0b2a68a7bc20295cd5ffe14a33ca0997f32ea29e
---
 lib/codemirror.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c5cce8fcfd..7e00a05734 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -542,7 +542,10 @@
       if (focused && document.activeElement != focused && focused.offsetHeight) focused.focus();
     }
 
+    // Prevent these from interfering with the scroll size
     display.gutters.style.height = "";
+    removeChildren(display.cursorDiv);
+    removeChildren(display.selectionDiv);
 
     if (different) {
       display.lastSizeC = display.wrapper.clientHeight;

From bd3da148902161f525e77c19b6ae44b50902e5ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 12:10:49 +0100
Subject: [PATCH 0863/4742] Fix corner case in measureChar

In IE, measuring in a hidden editor would cause a null deref
because getClientRects returned an empty array.

Issue #2095
---
 lib/codemirror.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7e00a05734..f86716dcd7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1175,11 +1175,13 @@
         prepared.hasHeights = true;
       }
       found = measureCharInner(cm, prepared, ch, bias);
-      if (!presto || !found.bogus) prepared.cache[key] = found;
+      if (!found.bogus) prepared.cache[key] = found;
     }
     return {left: found.left, right: found.right, top: found.top, bottom: found.bottom};
   }
 
+  var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
+
   function measureCharInner(cm, prepared, ch, bias) {
     var map = prepared.map;
 
@@ -1223,7 +1225,10 @@
         rect = node.parentNode.getBoundingClientRect();
       } else if (ie && cm.options.lineWrapping) {
         var rects = range(node, start, end).getClientRects();
-        rect = rects[bias == "right" ? rects.length - 1 : 0];
+        if (rects.length)
+          rect = rects[bias == "right" ? rects.length - 1 : 0];
+        else
+          rect = nullRect;
       } else {
         rect = range(node, start, end).getBoundingClientRect();
       }
@@ -1237,7 +1242,10 @@
     }
     if (ie_lt9 && !start && (!rect || !rect.left && !rect.right)) {
       var rSpan = node.parentNode.getClientRects()[0];
-      rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
+      if (rSpan)
+        rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
+      else
+        rect = nullRect;
     }
 
     var top, bot = (rect.bottom + rect.top) / 2 - prepared.rect.top;
@@ -1248,7 +1256,7 @@
     var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
                   right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
                   top: top, bottom: bot};
-    if (presto && !rect.left && !rect.right) result.bogus = true;
+    if (!rect.left && !rect.right) result.bogus = true;
     return result;
   }
 

From 0fb2a22ddc7b0264ef9d71bb3e3ea3b74f769a75 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Jan 2014 20:45:43 +0100
Subject: [PATCH 0864/4742] Fix left-alignment of horizontal scrollbar

Issue #2110
---
 lib/codemirror.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f86716dcd7..8f6738c4c7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -285,7 +285,7 @@
     gutters.style.display = i ? "" : "none";
     var width = gutters.offsetWidth;
     cm.display.sizer.style.marginLeft = width + "px";
-    if (i) cm.display.scrollbarH.style.left =  cm.options.fixedGutter ? 0 : width + "px";
+    if (i) cm.display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0;
   }
 
   function lineLength(line) {
@@ -440,8 +440,7 @@
       display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
       display.lineGutter.style.width = display.lineNumWidth + "px";
       var width = display.gutters.offsetWidth;
-      if (!cm.options.fixedGutter)
-        display.scrollbarH.style.left = width + "px";
+      display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0;
       display.sizer.style.marginLeft = width + "px";
       return true;
     }

From b17b1ebcd37f2ce0c253b9569eb7d1910ae25e6e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jan 2014 13:04:34 +0100
Subject: [PATCH 0865/4742] Remove unnecessary second operation in constructor

---
 lib/codemirror.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8f6738c4c7..57d569e6de 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -77,21 +77,23 @@
       this.display.wrapper.className += " CodeMirror-wrap";
 
     var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(options.value, options.mode);
-    operation(this, attachDoc)(this, doc);
+    if (typeof doc == "string") doc = new Doc(doc, options.mode);
 
     // Override magic textarea content restore that IE sometimes does
     // on our hidden textarea on reload
     if (old_ie) setTimeout(bind(resetInput, this, true), 20);
 
     registerEventHandlers(this);
-    // IE throws unspecified error in certain cases, when
-    // trying to access activeElement before onload
-    var hasFocus; try { hasFocus = (document.activeElement == display.input); } catch(e) { }
-    if (hasFocus || (options.autofocus && !mobile)) setTimeout(bind(onFocus, this), 20);
-    else onBlur(this);
 
     operation(this, function() {
+      attachDoc(this, doc);
+
+      // IE throws unspecified error in certain cases, when
+      // trying to access activeElement before onload
+      var hasFocus; try { hasFocus = (document.activeElement == display.input); } catch(e) { }
+      if (hasFocus || (options.autofocus && !mobile)) setTimeout(bind(onFocus, this), 20);
+      else onBlur(this);
+
       for (var opt in optionHandlers)
         if (optionHandlers.propertyIsEnumerable(opt))
           optionHandlers[opt](this, options[opt], Init);

From 2c7ae7e61f1b498c7bd374e79727a4146ac43577 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Jan 2014 13:06:17 +0100
Subject: [PATCH 0866/4742] Add control over scrolling to the cursor to
 selection methods

Stop ctrl-a from causing the doc to scroll all the way down.

Issue #1968
Issue #1936
---
 doc/manual.html   | 27 +++++++++------
 keymap/vim.js     |  2 +-
 lib/codemirror.js | 85 ++++++++++++++++++++++++++---------------------
 3 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 88ed81ef70..e1c48745e2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1004,28 +1004,31 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       
       <dt id="somethingSelected"><code><strong>doc.somethingSelected</strong>() → boolean</code></dt>
       <dd>Return true if any text is selected.</dd>
-      <dt id="setCursor"><code><strong>doc.setCursor</strong>(pos: {line, ch})</code></dt>
+      <dt id="setCursor"><code><strong>doc.setCursor</strong>(pos: {line, ch}|number, ?ch: number, ?scroll: boolean)</code></dt>
       <dd>Set the cursor position. You can either pass a
       single <code>{line, ch}</code> object, or the line and the
       character as two separate parameters. Will replace all
-      selections with a single, empty selection at the given
-      position.</dd>
+      selections with a single, empty selection at the given position.
+      The cursor is scrolled into view when <code>scroll</code> is
+      false (it defaults to true).</dd>
 
-      <dt id="setSelection"><code><strong>doc.setSelection</strong>(anchor: {line, ch}, ?head: {line, ch})</code></dt>
+      <dt id="setSelection"><code><strong>doc.setSelection</strong>(anchor: {line, ch}, ?head: {line, ch}, ?scroll: boolean)</code></dt>
       <dd>Set a single selection range. <code>anchor</code>
       and <code>head</code> should be <code>{line, ch}</code>
       objects. <code>head</code> defaults to <code>anchor</code> when
-      not given.</dd>
-      <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer)</code></dt>
+      not given. The <code>scroll</code> argument determines whether
+      the primary selection head is scrolled into view, and defaults
+      to true.</dd>
+      <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer, ?scroll: boolean)</code></dt>
       <dd>Sets a new set of selections. There must be at least one
       selection in the given array. When <code>primary</code> is
       given, it determines which selection is the primary one
-      (defaults to the last one).</dd>
+      (defaults to the last one). Unless <code>scroll</code> is false, the primary selection head is scrolled into view.</dd>
       <dt id="addSelection"><code><strong>doc.addSelection</strong>(anchor: {line, ch}, ?head: {line, ch})</code></dt>
       <dd>Adds a new selection to the existing set of selections, and
       makes it the primary selection.</dd>
 
-      <dt id="extendSelection"><code><strong>doc.extendSelection</strong>(from: {line, ch}, ?to: {line, ch})</code></dt>
+      <dt id="extendSelection"><code><strong>doc.extendSelection</strong>(from: {line, ch}, ?to: {line, ch}, ?scroll: boolean)</code></dt>
       <dd>Similar
       to <a href="#setSelection"><code>setSelection</code></a>, but
       will, if shift is held or
@@ -1035,12 +1038,14 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       a region (for example a word or paragraph) will end up selected
       (in addition to whatever lies between that region and the
       current anchor). When multiple selections are present, all but
-      the primary selection will be dropped by this method.</dd>
-      <dt id="extendSelections"><code><strong>doc.extendSelections</strong>(heads: array&lt;{line, ch}&gt;)</code></dt>
+      the primary selection will be dropped by this method.
+      Unless <code>scroll</code> is false, the primary selection head
+      is scrolled into view.</dd>
+      <dt id="extendSelections"><code><strong>doc.extendSelections</strong>(heads: array&lt;{line, ch}&gt;, ?scroll: boolean)</code></dt>
       <dd>An equivalent
       of <a href="#extendSelection"><code>extendSelection</code></a>
       that acts on all selections at once.</dd>
-      <dt id="extendSelectionsBy"><code><strong>doc.extendSelectionsBy</strong>(f: function(range: {anchor, head}) → {anchor, head}))</code></dt>
+      <dt id="extendSelectionsBy"><code><strong>doc.extendSelectionsBy</strong>(f: function(range: {anchor, head}) → {anchor, head}), ?scroll: boolean)</code></dt>
       <dd>Applies the given function to all existing selections, and
       calls <a href="#extendSelections"><code>extendSelections</code></a>
       on the result.</dd>
diff --git a/keymap/vim.js b/keymap/vim.js
index c00e5702f8..34f06bb986 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3598,7 +3598,7 @@
         vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
       }
       delete vim.insertModeRepeat;
-      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1, true);
+      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
       vim.insertMode = false;
       cm.setOption('keyMap', 'vim');
       cm.setOption('disableInput', true);
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 57d569e6de..37e1bce737 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1482,6 +1482,7 @@
       cursorActivity: false,
       updateMaxLine: false,
       updateScrollPos: false,
+      scrollToCursor: false,
       id: ++nextOpId
     };
     if (!delayedCallbackDepth++) delayedCallbacks = [];
@@ -1493,7 +1494,7 @@
 
     var viewPort = op.updateScrollPos && op.updateScrollPos.scrollTop != null ?
       {top: op.updateScrollPos.scrollTop} :
-      (op.selectionChanged && display.scroller.clientHeight && doc.sel.primary().head);
+      (op.scrollToCursor && display.scroller.clientHeight && doc.sel.primary().head);
 
     if (op.viewChanged || op.forceUpdate || viewPort && viewPort.top != null) {
       var updated = updateDisplay(cm, op.viewChanged, viewPort, op.forceUpdate);
@@ -1764,6 +1765,7 @@
           }
       }
     }
+    ensureCursorVisible(cm);
     cm.curOp.updateInput = updateInput;
 
     if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
@@ -2043,10 +2045,10 @@
     if (mac ? e.metaKey : e.ctrlKey) {
       var inside = doc.sel.contains(start);
       if (inside > -1)
-        setSelection(doc, new Selection(doc.sel.ranges, inside));
+        setSelection(doc, new Selection(doc.sel.ranges, inside), false);
       else
         setSelection(doc, normalizeSelection(doc.sel.ranges.concat([new Range(start, start)]),
-                                             doc.sel.ranges.length));
+                                             doc.sel.ranges.length), false);
     } else if (e.altKey) {
       setSimpleSelection(doc, start, start);
       type = "rect";
@@ -2501,7 +2503,7 @@
     // and 'resetSelectionOnContextMenu' option is true.
     var reset = cm.options.resetSelectionOnContextMenu;
     if (reset && cm.doc.sel.contains(pos) == -1)
-      operation(cm, setSelection)(cm.doc, simpleSelection(pos));
+      operation(cm, setSelection)(cm.doc, simpleSelection(pos), false);
 
     var oldCSS = display.input.style.cssText;
     display.inputDiv.style.position = "absolute";
@@ -2861,29 +2863,27 @@
 
   // If shift is held, this will move the selection anchor. Otherwise,
   // it'll set the whole selection.
-  function extendSelection(doc, head, other, bias) {
-    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), bias);
-    if (doc.cm) doc.cm.curOp.userSelChange = true;
+  function extendSelection(doc, head, other, scroll) {
+    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), scroll);
   }
 
   // Extend all selections (pos is an array of selections with length
   // equal the number of selections)
-  function extendSelections(doc, heads, bias) {
+  function extendSelections(doc, heads, scroll) {
     for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
       out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
     var newSel = normalizeSelection(out, doc.sel.primIndex);
-    setSelection(doc, newSel, bias);
-    if (doc.cm) doc.cm.curOp.userSelChange = true;
+    setSelection(doc, newSel, scroll);
   }
 
-  function replaceOneSelection(doc, i, range, bias) {
+  function replaceOneSelection(doc, i, range) {
     var ranges = doc.sel.ranges.slice(0);
     ranges[i] = range;
-    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), bias);
+    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex));
   }
 
-  function setSimpleSelection(doc, anchor, head, bias) {
-    setSelection(doc, simpleSelection(anchor, head), bias);
+  function setSimpleSelection(doc, anchor, head, scroll) {
+    setSelection(doc, simpleSelection(anchor, head), scroll);
   }
 
   function setSelectionAddToHistory(doc, sel) {
@@ -2911,14 +2911,17 @@
   // Update the selection. Last two args are only used by
   // updateDoc, since they have to be expressed in the line
   // numbers before the update.
-  function setSelection(doc, sel, bias) {
+  function setSelection(doc, sel, scroll) {
     if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
       sel = filterSelectionChange(doc, sel);
 
-    if (bias == null)
-      bias = cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1;
-
+    var bias = cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1;
     setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
+
+    if (scroll !== false && doc.cm) {
+      doc.cm.curOp.userSelChange = true;
+      ensureCursorVisible(doc.cm);
+    }
   }
 
   function setSelectionInner(doc, sel) {
@@ -2933,7 +2936,7 @@
   }
 
   function reCheckSelection(doc) {
-    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false));
+    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), false);
   }
 
   function skipAtomicInSelection(doc, sel, bias, mayClear) {
@@ -3002,6 +3005,10 @@
 
   // SCROLLING
 
+  function ensureCursorVisible(cm) {
+    cm.curOp.scrollToCursor = true;
+  }
+
   function scrollCursorIntoView(cm) {
     var coords = scrollPosIntoView(cm, cm.doc.sel.primary().head, null, cm.options.cursorScrollMargin);
     if (!cm.state.focused) return;
@@ -3132,7 +3139,7 @@
         var range = doc.sel.ranges[i];
         if (range.head.line == n && range.head.ch < curSpaceString.length) {
           var pos = Pos(n, curSpaceString.length);
-          replaceOneSelection(doc, i, new Range(pos, pos), 1);
+          replaceOneSelection(doc, i, new Range(pos, pos));
           break;
         }
       }
@@ -3166,6 +3173,7 @@
     cm.operation(function() {
       for (var i = kill.length - 1; i >= 0; i--)
         replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
+      ensureCursorVisible(cm);
     });
   }
 
@@ -3317,6 +3325,7 @@
         } else if (range.head.line > end) {
           indentLine(this, range.head.line, how, true);
           end = range.head.line;
+          if (i == this.doc.sel.primIndex) ensureCursorVisible(this);
         }
       }
     }),
@@ -3553,7 +3562,7 @@
           return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
         else
           return dir < 0 ? range.from() : range.to();
-      }, dir);
+      });
     }),
 
     deleteH: operation(null, function(dir, unit) {
@@ -3909,9 +3918,9 @@
   // STANDARD COMMANDS
 
   var commands = CodeMirror.commands = {
-    selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()));},
+    selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), false);},
     singleSelection: function(cm) {
-      cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"));
+      cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), false);
     },
     killLine: function(cm) {
       deleteNearSelection(cm, function(range) {
@@ -4018,6 +4027,7 @@
           var range = cm.listSelections()[i];
           cm.replaceRange("\n", range.anchor, range.head, "+input");
           cm.indentLine(range.from().line + 1, null, true);
+          ensureCursorVisible(cm);
         }
       })();
     },
@@ -5180,7 +5190,7 @@
     }
 
     signalLater(doc, "change", doc, change);
-    setSelection(doc, selAfter, null, true);
+    setSelection(doc, selAfter, false);
   }
 
   function LeafChunk(lines) {
@@ -5404,33 +5414,33 @@
     listSelections: function() { return this.sel.ranges; },
     somethingSelected: function() {return this.sel.somethingSelected();},
 
-    setCursor: docOperation(function(line, ch) {
-      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line));
+    setCursor: docOperation(function(line, ch, scroll) {
+      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, scroll);
     }),
-    setSelection: docOperation(function(anchor, head, bias) {
-      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), bias);
+    setSelection: docOperation(function(anchor, head, scroll) {
+      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), scroll);
     }),
-    extendSelection: docOperation(function(head, other, bias) {
-      extendSelection(this, clipPos(this, head), other && clipPos(this, other), bias);
+    extendSelection: docOperation(function(head, other, scroll) {
+      extendSelection(this, clipPos(this, head), other && clipPos(this, other), scroll);
     }),
-    extendSelections: docOperation(function(heads, bias) {
-      extendSelections(this, clipPosArray(this, heads), bias);
+    extendSelections: docOperation(function(heads, scroll) {
+      extendSelections(this, clipPosArray(this, heads, scroll));
     }),
-    extendSelectionsBy: docOperation(function(f, bias) {
-      extendSelections(this, map(this.sel.ranges, f), bias);
+    extendSelectionsBy: docOperation(function(f, scroll) {
+      extendSelections(this, map(this.sel.ranges, f), scroll);
     }),
-    setSelections: docOperation(function(ranges, primary, bias) {
+    setSelections: docOperation(function(ranges, primary, scroll) {
       if (!ranges.length) return;
       for (var i = 0, out = []; i < ranges.length; i++)
         out[i] = new Range(clipPos(this, ranges[i].anchor),
                            clipPos(this, ranges[i].head));
       if (primary == null) primary = ranges.length - 1;
-      setSelection(this, normalizeSelection(out, primary), bias);
+      setSelection(this, normalizeSelection(out, primary), scroll);
     }),
     addSelection: docOperation(function(anchor, head) {
       var ranges = this.sel.ranges.slice(0);
       ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
-      setSelection(this, normalizeSelection(ranges, ranges.length - 1));
+      setSelection(this, normalizeSelection(ranges, ranges.length - 1), false);
     }),
 
     getSelection: function(lineSep) {
@@ -5467,6 +5477,7 @@
       for (var i = changes.length - 1; i >= 0; i--)
         makeChange(this, changes[i]);
       if (newSel) setSelectionAddToHistory(this, newSel);
+      else if (this.cm) ensureCursorVisible(this.cm);
     },
     undo: docOperation(function() {makeChangeFromHistory(this, "undo");}),
     redo: docOperation(function() {makeChangeFromHistory(this, "redo");}),

From 995f9f639086a0c11a0c064b910a028fdcacdf11 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Jan 2014 14:38:07 +0100
Subject: [PATCH 0867/4742] [linter] Remove exception for files that touch
 exports

Since now all files refer to it, it effectively broke
the global-variable whitelist functionality.
---
 addon/runmode/runmode.node.js |  4 +++-
 test/lint/lint.js             | 20 +++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index e8bccb0cf2..c7cc848657 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -1,5 +1,7 @@
 /* Just enough of CodeMirror to run runMode under node.js */
 
+// declare global: StringStream
+
 function splitLines(string){ return string.split(/\r?\n|\r/); };
 
 function StringStream(string) {
@@ -99,7 +101,7 @@ exports.getMode = function(options, spec) {
 };
 exports.registerHelper = exports.registerGlobalHelper = Math.min;
 
-exports.runMode = function(string, modespec, callback) {
+exports.runMode = function(string, modespec, callback, options) {
   var mode = exports.getMode({indentUnit: 2}, modespec);
   var lines = splitLines(string), state = (options && options.state) || exports.startState(mode);
   for (var i = 0, e = lines.length; i < e; ++i) {
diff --git a/test/lint/lint.js b/test/lint/lint.js
index f14e2c4fe3..275113111c 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -21,7 +21,8 @@ var topAllowedGlobals = Object.create(null);
  "window document navigator prompt alert confirm console " +
  "FileReader Worker postMessage importScripts " +
  "setInterval clearInterval setTimeout clearTimeout " +
- "CodeMirror test")
+ "CodeMirror " +
+ "test exports require module define")
   .split(" ").forEach(function(n) { topAllowedGlobals[n] = true; });
 
 var fs = require("fs"), acorn = require("./acorn.js"), walk = require("./walk.js");
@@ -115,16 +116,13 @@ function checkFile(fileName) {
     });
   }
 
-  if (!globalsSeen.exports) {
-    var allowedGlobals = Object.create(topAllowedGlobals), m;
-    if (m = file.match(/\/\/ declare global:\s+(.*)/))
-      m[1].split(/,\s*/g).forEach(function(n) { allowedGlobals[n] = true; });
-    for (var glob in globalsSeen)
-      if (!(glob in allowedGlobals))
-        fail("Access to global variable " + glob + ". Add a '// declare global: " + glob +
-             "' comment or add this variable in test/lint/lint.js.", globalsSeen[glob]);
-  }
-
+  var allowedGlobals = Object.create(topAllowedGlobals), m;
+  if (m = file.match(/\/\/ declare global:\s+(.*)/))
+    m[1].split(/,\s*/g).forEach(function(n) { allowedGlobals[n] = true; });
+  for (var glob in globalsSeen)
+    if (!(glob in allowedGlobals))
+      fail("Access to global variable " + glob + ". Add a '// declare global: " + glob +
+           "' comment or add this variable in test/lint/lint.js.", globalsSeen[glob]);
 
   for (var i = 0; i < scopes.length; ++i) {
     var scope = scopes[i];

From 79035c10b3bf94540ec9fa14b8c8fc3d4f34c8ae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Jan 2014 14:53:20 +0100
Subject: [PATCH 0868/4742] Don't forget intermediate scrolling events during
 operations

So that scrolling down, and then scrolling something into view
will approach the thing scrolled into view from below.
---
 lib/codemirror.js | 141 +++++++++++++++++++++++++++-------------------
 test/test.js      |  38 ++++++++++---
 2 files changed, 111 insertions(+), 68 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 37e1bce737..9ed5e18f0e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -393,22 +393,24 @@
     }
   }
 
-  // viewPort can be null, {top [, height]}, or {line, ch}
+  // viewPort may contain top, height, and ensure (see op.scrollToPos) properties
   function visibleLines(display, doc, viewPort) {
-    if (viewPort && viewPort.line != null) {
-      if (viewPort.line >= display.viewTo)
-        return {from: lineAtHeight(doc, heightAtLine(getLine(doc, viewPort.line)) - display.wrapper.clientHeight),
-                to: viewPort.line};
-      var top = Math.max(doc.first, Math.min(viewPort.line, display.viewFrom));
-      return {from: top,
-              to: lineAtHeight(doc, heightAtLine(getLine(doc, top)) + display.wrapper.clientHeight)};
-    } else {
-      var top = viewPort ? viewPort.top : display.scroller.scrollTop;
-      var height = viewPort && viewPort.height || display.wrapper.clientHeight;
-      top = Math.floor(top - paddingTop(display));
-      var bottom = Math.ceil(top + height);
-      return {from: lineAtHeight(doc, top), to: lineAtHeight(doc, bottom)};
+    var top = viewPort ? viewPort.top : display.scroller.scrollTop;
+    var height = viewPort && viewPort.height || display.wrapper.clientHeight;
+    top = Math.floor(top - paddingTop(display));
+    var bottom = Math.ceil(top + height);
+
+    var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
+    if (viewPort.ensure) {
+      var ensureFrom = viewPort.ensure.from.line, ensureTo = viewPort.ensure.to.line;
+      if (ensureFrom < from)
+        return {from: ensureFrom,
+                to: lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) - display.wrapper.clientHeight)};
+      if (Math.min(ensureTo, doc.lastLine()) >= to)
+        return {from: lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) + display.wrapper.clientHeight),
+                to: ensureTo};
     }
+    return {from: from, to: to};
   }
 
   // LINE NUMBERS
@@ -1362,6 +1364,14 @@
     return val;
   }
 
+  function estimateCoords(cm, pos) {
+    var left = 0;
+    if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch;
+    var lineObj = getLine(cm.doc, pos.line);
+    var top = heightAtLine(lineObj) + paddingTop(cm.display);
+    return {left: left, right: left, top: top, bottom: top + lineObj.height};
+  }
+
   function PosWithInfo(line, ch, outside, xRel) {
     var pos = new Pos(line, ch);
     pos.xRel = xRel;
@@ -1481,8 +1491,8 @@
       selectionChanged: false,
       cursorActivity: false,
       updateMaxLine: false,
-      updateScrollPos: false,
-      scrollToCursor: false,
+      scrollLeft: null, scrollTop: null,
+      scrollToPos: null,
       id: ++nextOpId
     };
     if (!delayedCallbackDepth++) delayedCallbacks = [];
@@ -1492,12 +1502,10 @@
     var op = cm.curOp, doc = cm.doc, display = cm.display;
     cm.curOp = null;
 
-    var viewPort = op.updateScrollPos && op.updateScrollPos.scrollTop != null ?
-      {top: op.updateScrollPos.scrollTop} :
-      (op.scrollToCursor && display.scroller.clientHeight && doc.sel.primary().head);
-
-    if (op.viewChanged || op.forceUpdate || viewPort && viewPort.top != null) {
-      var updated = updateDisplay(cm, op.viewChanged, viewPort, op.forceUpdate);
+    if (op.viewChanged || op.forceUpdate || op.scrollTop != null ||
+        op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
+                           op.scrollToPos.to.line >= display.viewTo)) {
+      var updated = updateDisplay(cm, op.viewChanged, {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
       if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
     }
     if (!updated && op.selectionChanged) updateSelection(cm);
@@ -1509,23 +1517,26 @@
       var minWidth = Math.max(0, width + 3 + scrollerCutOff);
       var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + minWidth - display.scroller.clientWidth);
       display.sizer.style.minWidth = minWidth + "px";
-      if (maxScrollLeft < doc.scrollLeft && !op.updateScrollPos)
+      if (maxScrollLeft < doc.scrollLeft && op.scrollLeft == null)
         setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
       updateScrollbars(cm);
     }
 
-    if (op.updateScrollPos) {
-      var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.updateScrollPos.scrollTop));
-      var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.updateScrollPos.scrollLeft));
+    if (op.scrollTop != null && display.scroller.scrollTop != op.scrollTop) {
+      var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
       display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
+    }
+    if (op.scrollLeft != null && display.scroller.scrollLeft != op.scrollLeft) {
+      var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
       display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
       alignHorizontally(cm);
-      if (op.scrollToPos)
-        scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
-                          clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
-    } else if (viewPort) {
-      scrollCursorIntoView(cm);
     }
+    if (op.scrollToPos) {
+      var coords = scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
+                                     clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
+      if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
+    }
+
     if (op.selectionChanged) restartBlink(cm);
 
     if (cm.state.focused && op.updateInput)
@@ -3006,12 +3017,12 @@
   // SCROLLING
 
   function ensureCursorVisible(cm) {
-    cm.curOp.scrollToCursor = true;
+    resolveScrollToPos(cm);
+    var cur = cm.getCursor();
+    cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin, isCursor: true};
   }
 
-  function scrollCursorIntoView(cm) {
-    var coords = scrollPosIntoView(cm, cm.doc.sel.primary().head, null, cm.options.cursorScrollMargin);
-    if (!cm.state.focused) return;
+  function maybeScrollWindow(cm, coords) {
     var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
     if (coords.top + box.top < 0) doScroll = true;
     else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
@@ -3057,7 +3068,8 @@
   function calculateScrollPos(cm, x1, y1, x2, y2) {
     var display = cm.display, snapMargin = textHeight(cm.display);
     if (y1 < 0) y1 = 0;
-    var screen = display.scroller.clientHeight - scrollerCutOff, screentop = display.scroller.scrollTop, result = {};
+    var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
+    var screen = display.scroller.clientHeight - scrollerCutOff, result = {};
     var docBottom = cm.doc.height + paddingVert(display);
     var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
     if (y1 < screentop) {
@@ -3067,7 +3079,8 @@
       if (newTop != screentop) result.scrollTop = newTop;
     }
 
-    var screenw = display.scroller.clientWidth - scrollerCutOff, screenleft = display.scroller.scrollLeft;
+    var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
+    var screenw = display.scroller.clientWidth - scrollerCutOff;
     x1 += display.gutters.offsetWidth; x2 += display.gutters.offsetWidth;
     var gutterw = display.gutters.offsetWidth;
     var atLeft = x1 < gutterw + 10;
@@ -3080,16 +3093,25 @@
     return result;
   }
 
-  function updateScrollPos(cm, left, top) {
-    cm.curOp.updateScrollPos = {scrollLeft: left == null ? cm.doc.scrollLeft : left,
-                                scrollTop: top == null ? cm.doc.scrollTop : top};
+  function addToScrollPos(cm, left, top) {
+    if (left != null || top != null) resolveScrollToPos(cm);
+    if (left != null)
+      cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left;
+    if (top != null)
+      cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
   }
 
-  function addToScrollPos(cm, left, top) {
-    var pos = cm.curOp.updateScrollPos || (cm.curOp.updateScrollPos = {scrollLeft: cm.doc.scrollLeft, scrollTop: cm.doc.scrollTop});
-    var scroll = cm.display.scroller;
-    pos.scrollTop = Math.max(0, Math.min(scroll.scrollHeight - scroll.clientHeight, pos.scrollTop + top));
-    pos.scrollLeft = Math.max(0, Math.min(scroll.scrollWidth - scroll.clientWidth, pos.scrollLeft + left));
+  function resolveScrollToPos(cm) {
+    var range = cm.curOp.scrollToPos;
+    if (range) {
+      cm.curOp.scrollToPos = null;
+      var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to);
+      var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
+                                    Math.min(from.top, to.top) - range.margin,
+                                    Math.max(from.right, to.right),
+                                    Math.max(from.bottom, to.bottom) + range.margin);
+      cm.scrollTo(sPos.scrollLeft, sPos.scrollTop);
+    }
   }
 
   // API UTILITIES
@@ -3619,7 +3641,9 @@
     hasFocus: function() { return document.activeElement == this.display.input; },
 
     scrollTo: operation(null, function(x, y) {
-      updateScrollPos(this, x, y);
+      if (x != null || y != null) resolveScrollToPos(this);
+      if (x != null) this.curOp.scrollLeft = x;
+      if (y != null) this.curOp.scrollTop = y;
     }),
     getScrollInfo: function() {
       var scroller = this.display.scroller, co = scrollerCutOff;
@@ -3633,19 +3657,18 @@
       else if (typeof range == "number") range = {from: Pos(range, 0), to: null};
       else if (range.from == null) range = {from: range, to: null};
       if (!range.to) range.to = range.from;
-      if (!margin) margin = 0;
+      range.margin = margin || 0;
 
-      var coords = range;
       if (range.from.line != null) {
-        this.curOp.scrollToPos = {from: range.from, to: range.to, margin: margin};
-        coords = {from: cursorCoords(this, range.from),
-                  to: cursorCoords(this, range.to)};
-      }
-      var sPos = calculateScrollPos(this, Math.min(coords.from.left, coords.to.left),
-                                    Math.min(coords.from.top, coords.to.top) - margin,
-                                    Math.max(coords.from.right, coords.to.right),
-                                    Math.max(coords.from.bottom, coords.to.bottom) + margin);
-      updateScrollPos(this, sPos.scrollLeft, sPos.scrollTop);
+        resolveScrollToPos(this);
+        this.curOp.scrollToPos = range;
+      } else {
+        var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
+                                      Math.min(range.from.top, range.to.top) - range.margin,
+                                      Math.max(range.from.right, range.to.right),
+                                      Math.max(range.from.bottom, range.to.bottom) + range.margin);
+        this.scrollTo(sPos.scrollLeft, sPos.scrollTop);
+      }
     }),
 
     setSize: operation(null, function(width, height) {
@@ -3665,7 +3688,7 @@
       var oldHeight = this.display.cachedTextHeight;
       regChange(this);
       clearCaches(this);
-      updateScrollPos(this, this.doc.scrollLeft, this.doc.scrollTop);
+      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
         estimateLineHeights(this);
       signal(this, "refresh", this);
@@ -3677,7 +3700,7 @@
       attachDoc(this, doc);
       clearCaches(this);
       resetInput(this, true);
-      updateScrollPos(this, doc.scrollLeft, doc.scrollTop);
+      this.scrollTo(doc.scrollLeft, doc.scrollTop);
       signalLater(this, "swapDoc", this, old);
       return old;
     }),
diff --git a/test/test.js b/test/test.js
index 0e37d2382c..374e39e9fe 100644
--- a/test/test.js
+++ b/test/test.js
@@ -609,20 +609,40 @@ testCM("scrollSnap", function(cm) {
 testCM("scrollIntoView", function(cm) {
   if (phantom) return;
   var outer = cm.getWrapperElement().getBoundingClientRect();
-  function test(line, ch) {
+  function test(line, ch, msg) {
     var pos = Pos(line, ch);
     cm.scrollIntoView(pos);
     var box = cm.charCoords(pos, "window");
-    is(box.left >= outer.left && box.right <= outer.right &&
-       box.top >= outer.top && box.bottom <= outer.bottom);
+    is(box.left >= outer.left, msg + " (left)");
+    is(box.right <= outer.right, msg + " (right)");
+    is(box.top >= outer.top, msg + " (top)");
+    is(box.bottom <= outer.bottom, msg + " (bottom)");
   }
   addDoc(cm, 200, 200);
-  test(199, 199);
-  test(0, 0);
-  test(100, 100);
-  test(199, 0);
-  test(0, 199);
-  test(100, 100);
+  test(199, 199, "bottom right");
+  test(0, 0, "top left");
+  test(100, 100, "center");
+  test(199, 0, "bottom left");
+  test(0, 199, "top right");
+  test(100, 100, "center again");
+});
+
+testCM("scrollBackAndForth", function(cm) {
+  addDoc(cm, 1, 200);
+  cm.operation(function() {
+    cm.scrollIntoView(Pos(199, 0));
+    cm.scrollIntoView(Pos(4, 0));
+  });
+  is(cm.getScrollInfo().top > 0);
+});
+
+testCM("selectAllNoScroll", function(cm) {
+  addDoc(cm, 1, 200);
+  cm.execCommand("selectAll");
+  eq(cm.getScrollInfo().top, 0);
+  cm.setCursor(199);
+  cm.execCommand("selectAll");
+  is(cm.getScrollInfo().top > 0);
 });
 
 testCM("selectionPos", function(cm) {

From 7ce04a6a5511a7c3b18d75d84b747f4d61f480c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Jan 2014 15:34:42 +0100
Subject: [PATCH 0869/4742] Fixup before

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9ed5e18f0e..f72c45b7db 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -401,7 +401,7 @@
     var bottom = Math.ceil(top + height);
 
     var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
-    if (viewPort.ensure) {
+    if (viewPort && viewPort.ensure) {
       var ensureFrom = viewPort.ensure.from.line, ensureTo = viewPort.ensure.to.line;
       if (ensureFrom < from)
         return {from: ensureFrom,

From a95091e5ecaf70133bcbe77d4d95e392761f32b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Jan 2014 15:33:08 +0100
Subject: [PATCH 0870/4742] Always prefix input in textarea with a bogus
 character

Issue #1196
---
 lib/codemirror.js | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f72c45b7db..69bf56b4c7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -167,7 +167,12 @@
     // the amount of lines crosses a boundary that makes its width change)
     d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
     // See readInput and resetInput
-    d.prevInput = "";
+    if (!ie_lt9) {
+      d.prevInput = d.input.value = "_";
+      d.input.setSelectionRange(1, 1);
+    } else {
+      d.prevInput = "";
+    }
     // Set to true when a non-horizontal-scrolling widget is added. As
     // an optimization, widget aligning is skipped when d is false.
     d.alignWidgets = false;
@@ -1779,7 +1784,7 @@
     ensureCursorVisible(cm);
     cm.curOp.updateInput = updateInput;
 
-    if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
+    if (text.length > 1000 || text.indexOf("\n") > -1) clearInput(cm);
     else cm.display.prevInput = text;
     if (withOp) endOperation(cm);
     cm.state.pasteIncoming = cm.state.cutIncoming = false;
@@ -1798,12 +1803,21 @@
       if (cm.state.focused) selectInput(cm.display.input);
       if (old_ie && !ie_lt9) cm.display.inputHasSelection = content;
     } else if (user) {
-      cm.display.prevInput = cm.display.input.value = "";
-      if (old_ie && !ie_lt9) cm.display.inputHasSelection = null;
+      clearInput(cm);
     }
     cm.display.inaccurateSelection = minimal;
   }
 
+  function clearInput(cm) {
+    if (ie_lt9) {
+      cm.display.prevInput = cm.display.input.value = "_";
+      cm.display.input.setSelectionRange(1, 1);
+      if (old_ie && !ie_lt9) cm.display.inputHasSelection = null;
+    } else {
+      cm.display.prevInput = cm.display.input.value = "";
+    }
+  }
+
   function focusInput(cm) {
     if (cm.options.readOnly != "nocursor" && (!mobile || document.activeElement != cm.display.input))
       cm.display.input.focus();
@@ -2525,7 +2539,7 @@
     resetInput(cm, true);
     // Adds "Select all" to context menu in FF
     var hasSelection = cm.somethingSelected();
-    if (!hasSelection) display.input.value = display.prevInput = " ";
+    if (!hasSelection) clearInput(cm);
 
     function prepareSelectAllHack() {
       if (display.input.selectionStart != null) {

From 57c1984d19a5007f3ba8f1a5e3751e73da75a02e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Jan 2014 15:47:25 +0100
Subject: [PATCH 0871/4742] Drop setLine and removeLine from the API

---
 doc/manual.html     |  4 ----
 doc/upgrade_v4.html | 10 +++++++++-
 lib/codemirror.js   |  8 --------
 test/test.js        | 30 +++++++++++++++---------------
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index e1c48745e2..5c83fd5351 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -898,10 +898,6 @@ <h3 id="api_content">Content manipulation methods</h3>
 
       <dt id="getLine"><code><strong>doc.getLine</strong>(n: integer) → string</code></dt>
       <dd>Get the content of line <code>n</code>.</dd>
-      <dt id="setLine"><code><strong>doc.setLine</strong>(n: integer, text: string)</code></dt>
-      <dd>Set the content of line <code>n</code>.</dd>
-      <dt id="removeLine"><code><strong>doc.removeLine</strong>(n: integer)</code></dt>
-      <dd>Remove the given line from the document.</dd>
 
       <dt id="lineCount"><code><strong>doc.lineCount</strong>() → integer</code></dt>
       <dd>Get the number of lines in the editor.</dd>
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index 55dbbda305..d577dc50aa 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -83,7 +83,15 @@ <h2 id=upgrade>Upgrading to version 4</h2>
 <section id=deprecated><h2>Deprecated interfaces dropped</h2>
 
 <p>A few properties and methods that have been deprecated for a while
-are now gone. Most notably, the <code>onKeyEvent</code> and <code>onDragEvent</code> options (use the corresponding <a href="manual.html#event_dom">events</a> instead).</p>
+are now gone. Most notably, the <code>onKeyEvent</code>
+and <code>onDragEvent</code> options (use the
+corresponding <a href="manual.html#event_dom">events</a> instead).</p>
+
+<p>Two silly methods, which were mostly there to stay close to the 0.x
+API, <code>setLine</code> and <code>removeLine</code> are now gone.
+Use the more
+flexible <a href="manual.html#replaceRange"><code>replaceRange</code></a>
+method instead.</p>
 
 <p>The long names for folding and completing functions
 (<code>CodeMirror.braceRangeFinder</code>, <code>CodeMirror.javascriptHint</code>,
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 69bf56b4c7..7822eb04dd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5417,14 +5417,6 @@
     },
 
     getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
-    setLine: function(line, text) {
-      if (isLine(this, line))
-        replaceRange(this, text, Pos(line, 0), clipPos(this, Pos(line)));
-    },
-    removeLine: function(line) {
-      if (line) replaceRange(this, "", clipPos(this, Pos(line - 1)), clipPos(this, Pos(line)));
-      else replaceRange(this, "", Pos(0, 0), clipPos(this, Pos(1, 0)));
-    },
 
     getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
     getLineNumber: function(line) {return lineNo(line);},
diff --git a/test/test.js b/test/test.js
index 374e39e9fe..adbe9c655a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -141,8 +141,8 @@ testCM("lines", function(cm) {
   eq(cm.getLine(0), "111111");
   eq(cm.getLine(1), "222222");
   eq(cm.getLine(-1), null);
-  cm.removeLine(1);
-  cm.setLine(1, "abc");
+  cm.replaceRange("", Pos(1, 0), Pos(2, 0))
+  cm.replaceRange("abc", Pos(1, 0), Pos(1));
   eq(cm.getValue(), "111111\nabc");
 }, {value: "111111\n222222\n333333"});
 
@@ -265,7 +265,7 @@ testCM("posFromIndex", function(cm) {
 });
 
 testCM("undo", function(cm) {
-  cm.setLine(0, "def");
+  cm.replaceRange("def", Pos(0, 0), Pos(0));
   eq(cm.historySize().undo, 1);
   cm.undo();
   eq(cm.getValue(), "abc");
@@ -682,8 +682,8 @@ testCM("selectionPos", function(cm) {
 
 testCM("restoreHistory", function(cm) {
   cm.setValue("abc\ndef");
-  cm.setLine(1, "hello");
-  cm.setLine(0, "goop");
+  cm.replaceRange("hello", Pos(1, 0), Pos(1));
+  cm.replaceRange("goop", Pos(0, 0), Pos(0));
   cm.undo();
   var storedVal = cm.getValue(), storedHist = cm.getHistory();
   if (window.JSON) storedHist = JSON.parse(JSON.stringify(storedHist));
@@ -748,11 +748,11 @@ testCM("collapsedLines", function(cm) {
   cm.setCursor(Pos(3, 0));
   CodeMirror.commands.goLineDown(cm);
   eqPos(cm.getCursor(), Pos(5, 0));
-  cm.setLine(3, "abcdefg");
+  cm.replaceRange("abcdefg", Pos(3, 0), Pos(3));
   cm.setCursor(Pos(3, 6));
   CodeMirror.commands.goLineDown(cm);
   eqPos(cm.getCursor(), Pos(5, 4));
-  cm.setLine(3, "ab");
+  cm.replaceRange("ab", Pos(3, 0), Pos(3));
   cm.setCursor(Pos(3, 2));
   CodeMirror.commands.goLineDown(cm);
   eqPos(cm.getCursor(), Pos(5, 2));
@@ -1074,15 +1074,15 @@ testCM("verticalScroll", function(cm) {
   cm.setSize(100, 200);
   cm.setValue("foo\nbar\nbaz\n");
   var sc = cm.getScrollerElement(), baseWidth = sc.scrollWidth;
-  cm.setLine(0, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah");
+  cm.replaceRange("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah", Pos(0, 0), Pos(0));
   is(sc.scrollWidth > baseWidth, "scrollbar present");
-  cm.setLine(0, "foo");
+  cm.replaceRange("foo", Pos(0, 0), Pos(0));
   if (!phantom) eq(sc.scrollWidth, baseWidth, "scrollbar gone");
-  cm.setLine(0, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah");
-  cm.setLine(1, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbh");
+  cm.replaceRange("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah", Pos(0, 0), Pos(0));
+  cm.replaceRange("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbh", Pos(1, 0), Pos(1));
   is(sc.scrollWidth > baseWidth, "present again");
   var curWidth = sc.scrollWidth;
-  cm.setLine(0, "foo");
+  cm.replaceRange("foo", Pos(0, 0), Pos(0));
   is(sc.scrollWidth < curWidth, "scrollbar smaller");
   is(sc.scrollWidth > baseWidth, "but still present");
 });
@@ -1362,7 +1362,7 @@ testCM("jumpTheGap", function(cm) {
   if (phantom) return;
   var longLine = "abcdef ghiklmnop qrstuvw xyz ";
   longLine += longLine; longLine += longLine; longLine += longLine;
-  cm.setLine(2, longLine);
+  cm.replaceRange(longLine, Pos(2, 0), Pos(2));
   cm.setSize("200px", null);
   cm.getWrapperElement().style.lineHeight = 2;
   cm.refresh();
@@ -1606,8 +1606,8 @@ testCM("beforeChange", function(cm) {
 }, {value: "abcdefghijk"});
 
 testCM("beforeChangeUndo", function(cm) {
-  cm.setLine(0, "hi");
-  cm.setLine(0, "bye");
+  cm.replaceRange("hi", Pos(0, 0), Pos(0));
+  cm.replaceRange("bye", Pos(0, 0), Pos(0));
   eq(cm.historySize().undo, 2);
   cm.on("beforeChange", function(cm, change) {
     is(!change.update);

From 04447ab56cef12de5960b5f0a79329af9abeeae3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Jan 2014 17:25:04 +0100
Subject: [PATCH 0872/4742] Fix bug in visibleLines

This caused a nonsensical viewport to be returned in some cases,
causing the editor to show up empty.
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7822eb04dd..4959db2c67 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -400,7 +400,7 @@
 
   // viewPort may contain top, height, and ensure (see op.scrollToPos) properties
   function visibleLines(display, doc, viewPort) {
-    var top = viewPort ? viewPort.top : display.scroller.scrollTop;
+    var top = viewPort && viewPort.top != null ? viewPort.top : display.scroller.scrollTop;
     var height = viewPort && viewPort.height || display.wrapper.clientHeight;
     top = Math.floor(top - paddingTop(display));
     var bottom = Math.ceil(top + height);

From 31a264ab947e2a0992abe80f2bd4df57181ad2bb Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Thu, 23 Jan 2014 15:54:44 +0100
Subject: [PATCH 0873/4742] [less] don't confuse less mode..

..with the newly added simple support for @keyframes
---
 mode/css/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 06d73455da..b2c74a92ea 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -676,7 +676,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
       },
       "@": function(stream) {
-        if (stream.match(/^(charset|document|font-face|import|keyframes|media|namespace|page|supports)\b/, false)) return false;
+        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))
           return ["variable-2", "variable-definition"];

From 095610fc5e71b1b7e05f6eea399113dbb7bf2e45 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 24 Jan 2014 10:55:22 +0100
Subject: [PATCH 0874/4742] Fix resetInput to not confuse readInput when prim
 sel is empty but secondary is not

Closes #2172
Closes #2173
Closes #2174
---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4959db2c67..1f0f6e1292 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1793,9 +1793,9 @@
 
   function resetInput(cm, user) {
     var minimal, selected, doc = cm.doc;
-    var range = doc.sel.primary();
-    if (!range.empty()) {
+    if (cm.somethingSelected()) {
       cm.display.prevInput = "";
+      var range = doc.sel.primary();
       minimal = hasCopyEvent &&
         (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
       var content = minimal ? "-" : selected || cm.getSelection();

From a0522c12766735a033a9b7aeed21bce2922dcded Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Thu, 23 Jan 2014 18:25:34 +0400
Subject: [PATCH 0875/4742] Expose triggerOnKeyPress and triggerOnKeyUp for
 testing

---
 lib/codemirror.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 67e5291f67..c7a5c6dd1c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1629,10 +1629,7 @@ window.CodeMirror = (function() {
     }
     setTimeout(unregister, 5000);
 
-    on(d.input, "keyup", operation(cm, function(e) {
-      if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
-      if (e.keyCode == 16) cm.doc.sel.shift = false;
-    }));
+    on(d.input, "keyup", operation(cm, onKeyUp));
     on(d.input, "input", function() {
       if (ie && !ie_lt9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
       fastPoll(cm);
@@ -2142,6 +2139,12 @@ window.CodeMirror = (function() {
     return handled;
   }
 
+  function onKeyUp(e) {
+    var cm = this;
+    if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
+    if (e.keyCode == 16) cm.doc.sel.shift = false;
+  }
+
   var lastStoppedKey = null;
   function onKeyDown(e) {
     var cm = this;
@@ -3157,6 +3160,8 @@ window.CodeMirror = (function() {
     },
 
     triggerOnKeyDown: operation(null, onKeyDown),
+    triggerOnKeyPress: operation(null, onKeyPress),
+    triggerOnKeyUp: operation(null, onKeyUp),
 
     execCommand: function(cmd) {
       if (commands.hasOwnProperty(cmd))

From ccd334ce7180542c89939871875fbeb81ad1a4cc Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 23 Jan 2014 23:37:13 -0500
Subject: [PATCH 0876/4742] [vim] Use key character instead of key identifier
 to map all character keys without modifiers

---
 keymap/vim.js | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 21c74c4cf4..e837ee4994 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3513,18 +3513,10 @@
        * Shift + key modifier to the resulting letter, while preserving other
        * modifers.
        */
-      // TODO: Figure out a way to catch capslock.
       function cmKeyToVimKey(key, modifier) {
         var vimKey = key;
-        if (isUpperCase(vimKey)) {
-          // Convert to lower case if shift is not the modifier since the key
-          // we get from CodeMirror is always upper case.
-          if (modifier == 'Shift') {
-            modifier = null;
-          }
-          else {
+        if (isUpperCase(vimKey) && modifier == 'Ctrl') {
             vimKey = vimKey.toLowerCase();
-          }
         }
         if (modifier) {
           // Vim will parse modifier+key combination as a single key.
@@ -3550,9 +3542,9 @@
       function bindKeys(keys, modifier) {
         for (var i = 0; i < keys.length; i++) {
           var key = keys[i];
-          if (!modifier && inArray(key, specialSymbols)) {
-            // Wrap special symbols with '' because that's how CodeMirror binds
-            // them.
+          if (!modifier && key.length == 1) {
+            // Wrap all keys without modifiers with '' to identify them by their
+            // key characters instead of key identifiers.
             key = "'" + key + "'";
           }
           var vimKey = cmKeyToVimKey(keys[i], modifier);
@@ -3561,7 +3553,7 @@
         }
       }
       bindKeys(upperCaseAlphabet);
-      bindKeys(upperCaseAlphabet, 'Shift');
+      bindKeys(lowerCaseAlphabet);
       bindKeys(upperCaseAlphabet, 'Ctrl');
       bindKeys(specialSymbols);
       bindKeys(specialSymbols, 'Ctrl');

From 2d070ff3fbba092ebefd17c03627ec8852d700ca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 26 Jan 2014 13:07:27 +0100
Subject: [PATCH 0877/4742] Make alt-drag behavior match Ace and ST

Issue #2177
---
 lib/codemirror.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1f0f6e1292..031f5812e8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2093,8 +2093,12 @@
         for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
              line <= end; line++) {
           var text = getLine(doc, line).text;
-          if (text.length >= left)
+          if (left == right) {
+            var head = Pos(line, Math.min(left, text.length));
+            ranges.push(new Range(head, head));
+          } else if (text && text.length >= left) {
             ranges.push(new Range(Pos(line, left), Pos(line, Math.min(text.length, right))));
+          }
         }
         if (!ranges.length) ranges.push(new Range(start, start));
         setSelection(doc, new Selection(ranges, ranges.length - 1));

From e7744411cbbbd3ee3cddf87fd947c1203cf85d27 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 26 Jan 2014 13:17:18 +0100
Subject: [PATCH 0878/4742] Also set default scroll delta unit for IE11

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 031f5812e8..a4908258d9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2313,7 +2313,7 @@
   // know one. These don't have to be accurate -- the result of them
   // being wrong would just be a slight flicker on the first wheel
   // scroll (if it is large enough).
-  if (old_ie) wheelPixelsPerUnit = -.53;
+  if (ie) wheelPixelsPerUnit = -.53;
   else if (gecko) wheelPixelsPerUnit = 15;
   else if (chrome) wheelPixelsPerUnit = -.7;
   else if (safari) wheelPixelsPerUnit = -1/3;

From efec6611551361d91038f3146ef24750ed96c81c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 26 Jan 2014 13:18:10 +0100
Subject: [PATCH 0879/4742] Remove old Less mode

---
 doc/compress.html    |   1 -
 mode/less/index.html | 753 -------------------------------------------
 mode/less/less.js    | 359 ---------------------
 mode/meta.js         |   2 +-
 4 files changed, 1 insertion(+), 1114 deletions(-)
 delete mode 100644 mode/less/index.html
 delete mode 100644 mode/less/less.js

diff --git a/doc/compress.html b/doc/compress.html
index d4c108c516..8120b11999 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -110,7 +110,6 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
           <option value="http://codemirror.net/mode/julia/julia.js">jinja2.js</option>
-          <option value="http://codemirror.net/mode/less/less.js">less.js</option>
           <option value="http://codemirror.net/mode/livescript/livescript.js">livescript.js</option>
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
diff --git a/mode/less/index.html b/mode/less/index.html
deleted file mode 100644
index 7239143c8c..0000000000
--- a/mode/less/index.html
+++ /dev/null
@@ -1,753 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: LESS mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/lesser-dark.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="less.js"></script>
-<style>.CodeMirror {background: #f8f8f8; border: 1px solid #ddd; font-size:12px; height: 400px}</style>
-<div id=nav>
-  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">LESS</a>
-  </ul>
-</div>
-
-<article>
-<h2>LESS mode</h2>
-<form><textarea id="code" name="code">@media screen and (device-aspect-ratio: 16/9) { … }
-@media screen and (device-aspect-ratio: 32/18) { … }
-@media screen and (device-aspect-ratio: 1280/720) { … }
-@media screen and (device-aspect-ratio: 2560/1440) { … }
-
-html:lang(fr-be)
-html:lang(de)
-:lang(fr-be) > q
-:lang(de) > q
-
-tr:nth-child(2n+1) /* represents every odd row of an HTML table */
-tr:nth-child(odd)  /* same */
-tr:nth-child(2n+0) /* represents every even row of an HTML table */
-tr:nth-child(even) /* same */
-
-/* Alternate paragraph colours in CSS */
-p:nth-child(4n+1) { color: navy; }
-p:nth-child(4n+2) { color: green; }
-p:nth-child(4n+3) { color: maroon; }
-p:nth-child(4n+4) { color: purple; }
-
-:nth-child(10n-1)  /* represents the 9th, 19th, 29th, etc, element */
-:nth-child(10n+9)  /* Same */
-:nth-child(10n+-1) /* Syntactically invalid, and would be ignored */
-
-:nth-child( 3n + 1 )
-:nth-child( +3n - 2 )
-:nth-child( -n+ 6)
-:nth-child( +6 )
-
-html|tr:nth-child(-n+6)  /* represents the 6 first rows of XHTML tables */
-
-img:nth-of-type(2n+1) { float: right; }
-img:nth-of-type(2n) { float: left; }
-
-body > h2:nth-of-type(n+2):nth-last-of-type(n+2)
-body > h2:not(:first-of-type):not(:last-of-type)
-
-html|*:not(:link):not(:visited)
-*|*:not(:hover)
-p::first-line { text-transform: uppercase }
-
-p { color: red; font-size: 12pt }
-p::first-letter { color: green; font-size: 200% }
-p::first-line { color: blue }
-
-p { line-height: 1.1 }
-p::first-letter { font-size: 3em; font-weight: normal }
-span { font-weight: bold }
-
-*               /* a=0 b=0 c=0 -> specificity =   0 */
-LI              /* a=0 b=0 c=1 -> specificity =   1 */
-UL LI           /* a=0 b=0 c=2 -> specificity =   2 */
-UL OL+LI        /* a=0 b=0 c=3 -> specificity =   3 */
-H1 + *[REL=up]  /* a=0 b=1 c=1 -> specificity =  11 */
-UL OL LI.red    /* a=0 b=1 c=3 -> specificity =  13 */
-LI.red.level    /* a=0 b=2 c=1 -> specificity =  21 */
-#x34y           /* a=1 b=0 c=0 -> specificity = 100 */
-#s12:not(FOO)   /* a=1 b=0 c=1 -> specificity = 101 */
-
-@namespace foo url(http://www.example.com);
-foo|h1 { color: blue }  /* first rule */
-foo|* { color: yellow } /* second rule */
-|h1 { color: red }      /* ...*/
-*|h1 { color: green }
-h1 { color: green }
-
-span[hello="Ocean"][goodbye="Land"]
-
-a[rel~="copyright"] { ... }
-a[href="http://www.w3.org/"] { ... }
-
-DIALOGUE[character=romeo]
-DIALOGUE[character=juliet]
-
-[att^=val]
-[att$=val]
-[att*=val]
-
-@namespace foo "http://www.example.com";
-[foo|att=val] { color: blue }
-[*|att] { color: yellow }
-[|att] { color: green }
-[att] { color: green }
-
-
-*:target { color : red }
-*:target::before { content : url(target.png) }
-
-E[foo]{
-  padding:65px;
-}
-E[foo] ~ F{
-  padding:65px;
-}
-E#myid{
-  padding:65px;
-}
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
-  padding: 0;
-  border: 0;
-}
-.btn {
-  // reset here as of 2.0.3 due to Recess property order
-  border-color: #ccc;
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);
-}
-fieldset span button, fieldset span input[type="file"] {
-  font-size:12px;
-	font-family:Arial, Helvetica, sans-serif;
-}
-.el tr:nth-child(even):last-child td:first-child{
-	-moz-border-radius-bottomleft:3px;
-	-webkit-border-bottom-left-radius:3px;
-	border-bottom-left-radius:3px;
-}
-
-/* Some LESS code */
-
-button {
-    width:  32px;
-    height: 32px;
-    border: 0;
-    margin: 4px;
-    cursor: pointer;
-}
-button.icon-plus { background: url(http://dahlström.net/tmp/sharp-icons/svg-icon-target.svg#plus) no-repeat; }
-button.icon-chart { background: url(http://dahlström.net/tmp/sharp-icons/svg-icon-target.svg#chart) no-repeat; }
-
-button:hover { background-color: #999; }
-button:active { background-color: #666; }
-
-@test_a: #eeeQQQ;//this is not a valid hex value and thus parsed as an element id
-@test_b: #eeeFFF //this is a valid hex value but the declaration doesn't end with a semicolon and thus parsed as an element id
-
-#eee aaa .box
-{
-  #test bbb {
-    width: 500px;
-    height: 250px;
-    background-image: url(dir/output/sheep.png), url( betweengrassandsky.png );
-    background-position: center bottom, left top;
-    background-repeat: no-repeat;
-  }
-}
-
-@base: #f938ab;
-
-.box-shadow(@style, @c) when (iscolor(@c)) {
-  box-shadow:         @style @c;
-  -webkit-box-shadow: @style @c;
-  -moz-box-shadow:    @style @c;
-}
-.box-shadow(@style, @alpha: 50%) when (isnumber(@alpha)) {
-  .box-shadow(@style, rgba(0, 0, 0, @alpha));
-}
-
-@color: #4D926F;
-
-#header {
-  color: @color;
-  color: #000000;
-}
-h2 {
-  color: @color;
-}
-
-.rounded-corners (@radius: 5px) {
-  border-radius: @radius;
-  -webkit-border-radius: @radius;
-  -moz-border-radius: @radius;
-}
-
-#header {
-  .rounded-corners;
-}
-#footer {
-  .rounded-corners(10px);
-}
-
-.box-shadow (@x: 0, @y: 0, @blur: 1px, @alpha) {
-  @val: @x @y @blur rgba(0, 0, 0, @alpha);
-
-  box-shadow:         @val;
-  -webkit-box-shadow: @val;
-  -moz-box-shadow:    @val;
-}
-.box { @base: #f938ab;
-  color:        saturate(@base, 5%);
-  border-color: lighten(@base, 30%);
-  div { .box-shadow(0, 0, 5px, 0.4) }
-}
-
-@import url("something.css");
-
-@light-blue:   hsl(190, 50%, 65%);
-@light-yellow: desaturate(#fefec8, 10%);
-@dark-yellow:  desaturate(darken(@light-yellow, 10%), 40%);
-@darkest:      hsl(20, 0%, 15%);
-@dark:         hsl(190, 20%, 30%);
-@medium:       hsl(10, 60%, 30%);
-@light:        hsl(90, 40%, 20%);
-@lightest:     hsl(90, 20%, 90%);
-@highlight:    hsl(80, 50%, 90%);
-@blue:         hsl(210, 60%, 20%);
-@alpha-blue:   hsla(210, 60%, 40%, 0.5);
-
-.box-shadow (@x, @y, @blur, @alpha) {
-  @value: @x @y @blur rgba(0, 0, 0, @alpha);
-  box-shadow:         @value;
-  -moz-box-shadow:    @value;
-  -webkit-box-shadow: @value;
-}
-.border-radius (@radius) {
-  border-radius: @radius;
-  -moz-border-radius: @radius;
-  -webkit-border-radius: @radius;
-}
-
-.border-radius (@radius, bottom) {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
-  -moz-border-top-right-radius: 0;
-  -moz-border-top-left-radius: 0;
-  -webkit-border-top-left-radius: 0;
-  -webkit-border-top-right-radius: 0;
-}
-.border-radius (@radius, right) {
-  border-bottom-left-radius: 0;
-  border-top-left-radius: 0;
-  -moz-border-bottom-left-radius: 0;
-  -moz-border-top-left-radius: 0;
-  -webkit-border-bottom-left-radius: 0;
-  -webkit-border-top-left-radius: 0;
-}
-.box-shadow-inset (@x, @y, @blur, @color) {
-  box-shadow: @x @y @blur @color inset;
-  -moz-box-shadow: @x @y @blur @color inset;
-  -webkit-box-shadow: @x @y @blur @color inset;
-}
-.code () {
-  font-family: 'Bitstream Vera Sans Mono',
-               'DejaVu Sans Mono',
-               'Monaco',
-               Courier,
-               monospace !important;
-}
-.wrap () {
-  text-wrap: wrap;
-  white-space: pre-wrap;       /* css-3 */
-  white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-  white-space: -pre-wrap;      /* Opera 4-6 */
-  white-space: -o-pre-wrap;    /* Opera 7 */
-  word-wrap: break-word;       /* Internet Explorer 5.5+ */
-}
-
-html { margin: 0 }
-body {
-  background-color: @darkest;
-  margin: 0 auto;
-  font-family: Arial, sans-serif;
-  font-size: 100%;
-  overflow-x: hidden;
-}
-nav, header, footer, section, article {
-  display: block;
-}
-a {
-  color: #b83000;
-}
-h1 a {
-  color: black;
-  text-decoration: none;
-}
-a:hover {
-  text-decoration: underline;
-}
-h1, h2, h3, h4 {
-  margin: 0;
-  font-weight: normal;
-}
-ul, li {
-  list-style-type: none;
-}
-code { .code; }
-code {
-  .string, .regexp { color: @dark }
-  .keyword { font-weight: bold }
-  .comment { color: rgba(0, 0, 0, 0.5) }
-  .number { color: @blue }
-  .class, .special { color: rgba(0, 50, 100, 0.8) }
-}
-pre {
-  padding: 0 30px;
-  .wrap;
-}
-blockquote {
-  font-style: italic;
-}
-body > footer {
-  text-align: left;
-  margin-left: 10px;
-  font-style: italic;
-  font-size: 18px;
-  color: #888;
-}
-
-#logo {
-  margin-top: 30px;
-  margin-bottom: 30px;
-  display: block;
-  width: 199px;
-  height: 81px;
-  background: url(/images/logo.png) no-repeat;
-}
-nav {
-  margin-left: 15px;
-}
-nav a, #dropdown li {
-  display: inline-block;
-  color: white;
-  line-height: 42px;
-  margin: 0;
-  padding: 0px 15px;
-  text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.5);
-  text-decoration: none;
-  border: 2px solid transparent;
-  border-width: 0 2px;
-  &:hover {
-    .dark-red; 
-    text-decoration: none;
-  }
-}
-.dark-red {
-    @red: @medium;
-    border: 2px solid darken(@red, 25%);
-    border-left-color: darken(@red, 15%);
-    border-right-color: darken(@red, 15%);
-    border-bottom: 0;
-    border-top: 0;
-    background-color: darken(@red, 10%);
-}
-
-.content {
-  margin: 0 auto;
-  width: 980px;
-}
-
-#menu {
-  position: absolute;
-  width: 100%;
-  z-index: 3;
-  clear: both;
-  display: block;
-  background-color: @blue;
-  height: 42px;
-  border-top: 2px solid lighten(@alpha-blue, 20%);
-  border-bottom: 2px solid darken(@alpha-blue, 25%);
-  .box-shadow(0, 1px, 8px, 0.6);
-  -moz-box-shadow: 0 0 0 #000; // Because firefox sucks.
-
-  &.docked {
-    background-color: hsla(210, 60%, 40%, 0.4);
-  }
-  &:hover {
-    background-color: @blue;
-  }
-
-  #dropdown {
-    margin: 0 0 0 117px;
-    padding: 0;
-    padding-top: 5px;
-    display: none;
-    width: 190px;
-    border-top: 2px solid @medium;
-    color: @highlight;
-    border: 2px solid darken(@medium, 25%);
-    border-left-color: darken(@medium, 15%);
-    border-right-color: darken(@medium, 15%);
-    border-top-width: 0;
-    background-color: darken(@medium, 10%);
-    ul {
-      padding: 0px;  
-    }
-    li {
-      font-size: 14px;
-      display: block;
-      text-align: left;
-      padding: 0;
-      border: 0;
-      a {
-        display: block;
-        padding: 0px 15px;  
-        text-decoration: none;
-        color: white;  
-        &:hover {
-          background-color: darken(@medium, 15%);
-          text-decoration: none;
-        }
-      }
-    }
-    .border-radius(5px, bottom);
-    .box-shadow(0, 6px, 8px, 0.5);
-  }
-}
-
-#main {
-  margin: 0 auto;
-  width: 100%;
-  background-color: @light-blue;
-  border-top: 8px solid darken(@light-blue, 5%);
-
-  #intro {
-    background-color: lighten(@light-blue, 25%);
-    float: left;
-    margin-top: -8px;
-    margin-right: 5px;
-
-    height: 380px;
-    position: relative;
-    z-index: 2;
-    font-family: 'Droid Serif', 'Georgia';
-    width: 395px;
-    padding: 45px 20px 23px 30px;
-    border: 2px dashed darken(@light-blue, 10%);
-    .box-shadow(1px, 0px, 6px, 0.5);
-    border-bottom: 0;
-    border-top: 0;
-    #download { color: transparent; border: 0; float: left; display: inline-block; margin: 15px 0 15px -5px; }
-    #download img { display: inline-block}
-    #download-info {
-      code {
-        font-size: 13px;  
-      }
-      color: @blue + #333; display: inline; float: left; margin: 36px 0 0 15px }
-  }
-  h2 {
-    span {
-      color: @medium;  
-    }
-    color: @blue;
-    margin: 20px 0;
-    font-size: 24px;
-    line-height: 1.2em;
-  }
-  h3 {
-    color: @blue;
-    line-height: 1.4em;
-    margin: 30px 0 15px 0;
-    font-size: 1em;
-    text-shadow: 0px 0px 0px @lightest;
-    span { color: @medium }
-  }
-  #example {
-    p {
-      font-size: 18px;
-      color: @blue;
-      font-weight: bold;
-      text-shadow: 0px 1px 1px @lightest;
-    }
-    pre {
-      margin: 0;
-      text-shadow: 0 -1px 1px @darkest;
-      margin-top: 20px;
-      background-color: desaturate(@darkest, 8%);
-      border: 0;
-      width: 450px;
-      color: lighten(@lightest, 2%);
-      background-repeat: repeat;
-      padding: 15px;
-      border: 1px dashed @lightest;
-      line-height: 15px;
-      .box-shadow(0, 0px, 15px, 0.5);
-      .code;
-      .border-radius(2px);
-      code .attribute { color: hsl(40, 50%, 70%) }
-      code .variable  { color: hsl(120, 10%, 50%) }
-      code .element   { color: hsl(170, 20%, 50%) }
-
-      code .string, .regexp { color: hsl(75, 50%, 65%) }
-      code .class { color: hsl(40, 40%, 60%); font-weight: normal }
-      code .id { color: hsl(50, 40%, 60%); font-weight: normal }
-      code .comment { color: rgba(255, 255, 255, 0.2) }
-      code .number, .color { color: hsl(10, 40%, 50%) }
-      code .class, code .mixin, .special { color: hsl(190, 20%, 50%) }
-      #time { color: #aaa }
-    }
-    float: right;
-    font-size: 12px;
-    margin: 0;
-    margin-top: 15px;
-    padding: 0;
-    width: 500px;
-  }
-}
-
-
-.page {
-  .content {
-    width: 870px;
-    padding: 45px;
-  }
-  margin: 0 auto;
-  font-family: 'Georgia', serif;
-  font-size: 18px;
-  line-height: 26px;
-  padding: 0 60px;
-  code {
-    font-size: 16px;  
-  }
-  pre {
-    border-width: 1px;
-    border-style: dashed;
-    padding: 15px;
-    margin: 15px 0;
-  }
-  h1 {
-    text-align: left;
-    font-size: 40px;
-    margin-top: 15px;
-    margin-bottom: 35px;
-  }
-  p + h1 { margin-top: 60px }
-  h2, h3 {
-    margin: 30px 0 15px 0;
-  }
-  p + h2, pre + h2, code + h2 {
-    border-top: 6px solid rgba(255, 255, 255, 0.1);
-    padding-top: 30px;
-  }
-  h3 {
-    margin: 15px 0;
-  }
-}
-
-
-#docs {
-  @bg: lighten(@light-blue, 5%);
-  border-top: 2px solid lighten(@bg, 5%);
-  color: @blue;
-  background-color: @light-blue;
-  .box-shadow(0, -2px, 5px, 0.2);
-
-  h1 {
-    font-family: 'Droid Serif', 'Georgia', serif;
-    padding-top: 30px;
-    padding-left: 45px;
-    font-size: 44px;
-    text-align: left;
-    margin: 30px 0 !important;
-    text-shadow: 0px 1px 1px @lightest;
-    font-weight: bold;
-  }
-  .content {
-    clear: both;
-    border-color: transparent;
-    background-color: lighten(@light-blue, 25%);
-    .box-shadow(0, 5px, 5px, 0.4);
-  }
-  pre {
-    @background: lighten(@bg, 30%);
-    color: lighten(@blue, 10%);
-    background-color: @background;
-    border-color: lighten(@light-blue, 25%);
-    border-width: 2px;
-    code .attribute { color: hsl(40, 50%, 30%) }
-    code .variable  { color: hsl(120, 10%, 30%) }
-    code .element   { color: hsl(170, 20%, 30%) }
-
-    code .string, .regexp { color: hsl(75, 50%, 35%) }
-    code .class { color: hsl(40, 40%, 30%); font-weight: normal }
-    code .id { color: hsl(50, 40%, 30%); font-weight: normal }
-    code .comment { color: rgba(0, 0, 0, 0.4) }
-    code .number, .color { color: hsl(10, 40%, 30%) }
-    code .class, code .mixin, .special { color: hsl(190, 20%, 30%) }
-  }
-  pre code                    { font-size: 15px  }
-  p + h2, pre + h2, code + h2 { border-top-color: rgba(0, 0, 0, 0.1) }
-}
-
-td {
-  padding-right: 30px;  
-}
-#synopsis {
-  .box-shadow(0, 5px, 5px, 0.2);
-}
-#synopsis, #about {
-  h2 {
-    font-size: 30px;  
-    padding: 10px 0;
-  }
-  h1 + h2 {
-      margin-top: 15px;  
-  }
-  h3 { font-size: 22px }
-
-  .code-example {
-    border-spacing: 0;
-    border-width: 1px;
-    border-style: dashed;
-    padding: 0;
-    pre { border: 0; margin: 0 }
-    td {
-      border: 0;
-      margin: 0;
-      background-color: desaturate(darken(@darkest, 5%), 20%);
-      vertical-align: top;
-      padding: 0;
-    }
-    tr { padding: 0 }
-  }
-  .css-output {
-    td {
-      border-left: 0;  
-    }
-  }
-  .less-example {
-    //border-right: 1px dotted rgba(255, 255, 255, 0.5) !important;
-  }
-  .css-output, .less-example {
-    width: 390px;
-  }
-  pre {
-    padding: 20px;
-    line-height: 20px;
-    font-size: 14px;
-  }
-}
-#about, #synopsis, #guide {
-  a {
-    text-decoration: none;
-    color: @light-yellow;
-    border-bottom: 1px dashed rgba(255, 255, 255, 0.2);
-    &:hover {
-      text-decoration: none;
-      border-bottom: 1px dashed @light-yellow;
-    }
-  }
-  @bg: desaturate(darken(@darkest, 5%), 20%);
-  text-shadow: 0 -1px 1px lighten(@bg, 5%);
-  color: @highlight;
-  background-color: @bg;
-  .content {
-    background-color: desaturate(@darkest, 20%);
-    clear: both;
-    .box-shadow(0, 5px, 5px, 0.4);
-  }
-  h1, h2, h3 {
-    color: @dark-yellow;
-  }
-  pre {
-      code .attribute { color: hsl(40, 50%, 70%) }
-      code .variable  { color: hsl(120, 10%, 50%) }
-      code .element   { color: hsl(170, 20%, 50%) }
-
-      code .string, .regexp { color: hsl(75, 50%, 65%) }
-      code .class { color: hsl(40, 40%, 60%); font-weight: normal }
-      code .id { color: hsl(50, 40%, 60%); font-weight: normal }
-      code .comment { color: rgba(255, 255, 255, 0.2) }
-      code .number, .color { color: hsl(10, 40%, 50%) }
-      code .class, code .mixin, .special { color: hsl(190, 20%, 50%) }
-    background-color: @bg;
-    border-color: darken(@light-yellow, 5%);
-  }
-  code {
-    color: darken(@dark-yellow, 5%);
-    .string, .regexp { color: desaturate(@light-blue, 15%) }
-    .keyword { color: hsl(40, 40%, 60%); font-weight: normal }
-    .comment { color: rgba(255, 255, 255, 0.2) }
-    .number { color: lighten(@blue, 10%) }
-    .class, .special { color: hsl(190, 20%, 50%) }
-  }
-}
-#guide {
-  background-color: @darkest;
-  .content {
-    background-color: transparent;
-  }
-
-}
-
-#about {
-  background-color: @darkest !important;
-  .content {
-    background-color: desaturate(lighten(@darkest, 3%), 5%);
-  }
-}
-#synopsis {
-  background-color: desaturate(lighten(@darkest, 3%), 5%) !important;
-  .content {
-    background-color: desaturate(lighten(@darkest, 3%), 5%);
-  }
-  pre {}
-}
-#synopsis, #guide {
-  .content {
-    .box-shadow(0, 0px, 0px, 0.0);
-  }
-}
-#about footer {
-  margin-top: 30px;
-  padding-top: 30px;
-  border-top: 6px solid rgba(0, 0, 0, 0.1);
-  text-align: center;
-  font-size: 16px;
-  color: rgba(255, 255, 255, 0.35);
-  #copy { font-size: 12px }
-  text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.02);
-}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        theme: "lesser-dark",
-        lineNumbers : true,
-        matchBrackets : true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-less</code>, <code>text/css</code> (if not previously defined).</p>
-  </article>
diff --git a/mode/less/less.js b/mode/less/less.js
deleted file mode 100644
index 9f0d43e938..0000000000
--- a/mode/less/less.js
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
-  LESS mode - http://www.lesscss.org/
-  Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
-  GitHub: @peterkroon
-*/
-
-(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("less", function(config) {
-  var indentUnit = config.indentUnit, type;
-  function ret(style, tp) {type = tp; return style;}
-
-  var selectors = /(^\:root$|^\:nth\-child$|^\:nth\-last\-child$|^\:nth\-of\-type$|^\:nth\-last\-of\-type$|^\:first\-child$|^\:last\-child$|^\:first\-of\-type$|^\:last\-of\-type$|^\:only\-child$|^\:only\-of\-type$|^\:empty$|^\:link|^\:visited$|^\:active$|^\:hover$|^\:focus$|^\:target$|^\:lang$|^\:enabled^\:disabled$|^\:checked$|^\:first\-line$|^\:first\-letter$|^\:before$|^\:after$|^\:not$|^\:required$|^\:invalid$)/;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    if (ch == "@") {stream.eatWhile(/[\w\-]/); return ret("meta", stream.current());}
-    else if (ch == "/" && stream.eat("*")) {
-      state.tokenize = tokenCComment;
-      return tokenCComment(stream, state);
-    } else if (ch == "<" && stream.eat("!")) {
-      state.tokenize = tokenSGMLComment;
-      return tokenSGMLComment(stream, state);
-    } else if (ch == "=") ret(null, "compare");
-    else if (ch == "|" && stream.eat("=")) return ret(null, "compare");
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (ch == "/") { // e.g.: .png will not be parsed as a class
-      if(stream.eat("/")){
-        state.tokenize = tokenSComment;
-        return tokenSComment(stream, state);
-      } else {
-        if(type == "string" || type == "(") return ret("string", "string");
-        if(state.stack[state.stack.length-1] !== undefined) return ret(null, ch);
-        stream.eatWhile(/[\a-zA-Z0-9\-_.\s]/);
-        if( /\/|\)|#/.test(stream.peek() || (stream.eatSpace() && stream.peek() === ")"))  || stream.eol() )return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
-      }
-    } else if (ch == "!") {
-      stream.match(/^\s*\w*/);
-      return ret("keyword", "important");
-    } else if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w.%]/);
-      return ret("number", "unit");
-    } else if (/[,+<>*\/]/.test(ch)) {
-      if(stream.peek() == "=" || type == "a")return ret("string", "string");
-      if(ch === ",")return ret(null, ch);
-      return ret(null, "select-op");
-    } else if (/[;{}:\[\]()~\|]/.test(ch)) {
-      if(ch == ":"){
-        stream.eatWhile(/[a-z\\\-]/);
-        if( selectors.test(stream.current()) ){
-          return ret("tag", "tag");
-        } else if(stream.peek() == ":"){//::-webkit-search-decoration
-          stream.next();
-          stream.eatWhile(/[a-z\\\-]/);
-          if(stream.current().match(/\:\:\-(o|ms|moz|webkit)\-/))return ret("string", "string");
-          if( selectors.test(stream.current().substring(1)) )return ret("tag", "tag");
-          return ret(null, ch);
-        } else {
-          return ret(null, ch);
-        }
-      } else if(ch == "~"){
-        if(type == "r")return ret("string", "string");
-      } else {
-        return ret(null, ch);
-      }
-    } else if (ch == ".") {
-      if(type == "(")return ret("string", "string"); // allow url(../image.png)
-      stream.eatWhile(/[\a-zA-Z0-9\-_]/);
-      if(stream.peek() === " ")stream.eatSpace();
-      if(stream.peek() === ")" || type === ":")return ret("number", "unit");//rgba(0,0,0,.25);
-      else if(stream.current().length >1){
-        if(state.stack[state.stack.length-1] === "rule" && !stream.match(/^[{,+(]/, false)) return ret("number", "unit");
-      }
-      return ret("tag", "tag");
-    } else if (ch == "#") {
-      //we don't eat white-space, we want the hex color and or id only
-      stream.eatWhile(/[A-Za-z0-9]/);
-      //check if there is a proper hex color length e.g. #eee || #eeeEEE
-      if(stream.current().length == 4 || stream.current().length == 7){
-        if(stream.current().match(/[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}/,false) != null){//is there a valid hex color value present in the current stream
-          //when not a valid hex value, parse as id
-          if(stream.current().substring(1) != stream.current().match(/[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}/,false))return ret("atom", "tag");
-          //eat white-space
-          stream.eatSpace();
-          //when hex value declaration doesn't end with [;,] but is does with a slash/cc comment treat it as an id, just like the other hex values that don't end with[;,]
-          if( /[\/<>.(){!$%^&*_\-\\?=+\|#'~`]/.test(stream.peek()) ){
-            if(type === "select-op")return ret("number", "unit"); else return ret("atom", "tag");
-          }
-          //#time { color: #aaa }
-          else if(stream.peek() == "}" )return ret("number", "unit");
-          //we have a valid hex color value, parse as id whenever an element/class is defined after the hex(id) value e.g. #eee aaa || #eee .aaa
-          else if( /[a-zA-Z\\]/.test(stream.peek()) )return ret("atom", "tag");
-          //when a hex value is on the end of a line, parse as id
-          else if(stream.eol())return ret("atom", "tag");
-          //default
-          else return ret("number", "unit");
-        } else {//when not a valid hexvalue in the current stream e.g. #footer
-          stream.eatWhile(/[\w\\\-]/);
-          return ret("atom", stream.current());
-        }
-      } else {//when not a valid hexvalue length
-        stream.eatWhile(/[\w\\\-]/);
-        if(state.stack[state.stack.length-1] === "rule")return ret("atom", stream.current());return ret("atom", stream.current());
-        return ret("atom", "tag");
-      }
-    } else if (ch == "&") {
-      stream.eatWhile(/[\w\-]/);
-      return ret(null, ch);
-    } else {
-      stream.eatWhile(/[\w\\\-_%.{]/);
-      if(stream.current().match(/\\/) !== null){
-        if(stream.current().charAt(stream.current().length-1) === "\\"){
-          stream.eat(/\'|\"|\)|\(/);
-          while(stream.eatWhile(/[\w\\\-_%.{]/)){
-            stream.eat(/\'|\"|\)|\(/);
-          }
-          return ret("string", stream.current());
-        }
-      } //else if(type === "tag")return ret("tag", "tag");
-        else if(type == "string"){
-        if(state.stack[state.stack.length-1] === "{" && stream.peek() === ":")return ret("variable", "variable");
-        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
-        return ret(type, stream.current());
-      } else if(stream.current().match(/(^http$|^https$)/) != null){
-        stream.eatWhile(/[\w\\\-_%.{:\/]/);
-        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
-        return ret("string", "string");
-      } else if(stream.peek() == "<" || stream.peek() == ">" || stream.peek() == "+"){
-        if(type === "(" && (stream.current() === "n" || stream.current() === "-n"))return ret("string", stream.current());
-        return ret("tag", "tag");
-      } else if( /\(/.test(stream.peek()) ){
-        if(stream.current() === "when")return ret("variable","variable");
-        else if(state.stack[state.stack.length-1] === "@media" && stream.current() === "and")return ret("variable",stream.current());
-        return ret(null, ch);
-      } else if (stream.peek() == "/" && state.stack[state.stack.length-1] !== undefined){ // url(dir/center/image.png)
-        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
-        return ret("string", stream.current());
-      } else if( stream.current().match(/\-\d|\-.\d/) ){ // match e.g.: -5px -0.4 etc... only colorize the minus sign
-        //commment out these 2 comment if you want the minus sign to be parsed as null -500px
-        //stream.backUp(stream.current().length-1);
-        //return ret(null, ch);
-        return ret("number", "unit");
-      } else if( /\/|[\s\)]/.test(stream.peek() || stream.eol() || (stream.eatSpace() && stream.peek() == "/")) && stream.current().indexOf(".") !== -1){
-        if(stream.current().substring(stream.current().length-1,stream.current().length) == "{"){
-          stream.backUp(1);
-          return ret("tag", "tag");
-        }//end if
-        stream.eatSpace();
-        if( /[{<>.a-zA-Z\/]/.test(stream.peek())  || stream.eol() )return ret("tag", "tag"); // e.g. button.icon-plus
-        return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
-      } else if( stream.eol() || stream.peek() == "[" || stream.peek() == "#" || type == "tag" ){
-
-        if(stream.current().substring(stream.current().length-1,stream.current().length) == "{")stream.backUp(1);
-        else if(state.stack[state.stack.length-1] === "border-color" || state.stack[state.stack.length-1] === "background-position" || state.stack[state.stack.length-1] === "font-family")return ret(null, stream.current());
-        else if(type === "tag")return ret("tag", "tag");
-        else if((type === ":" || type === "unit") && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
-        else if(state.stack[state.stack.length-1] === "rule" && type === "tag")return ret("string", stream.current());
-        else if(state.stack[state.stack.length-1] === ";" && type === ":")return ret(null, stream.current());
-        //else if(state.stack[state.stack.length-1] === ";" || type === "")return ret("variable", stream.current());
-        else if(stream.peek() === "#" && type !== undefined && type.match(/\+|,|tag|select\-op|}|{|;/g) === null)return ret("string", stream.current());
-        else if(type === "variable")return ret(null, stream.current());
-        else if(state.stack[state.stack.length-1] === "{" && type === "comment")return ret("variable", stream.current());
-        else if(state.stack.length === 0 && (type === ";" || type === "comment"))return ret("tag", stream.current());
-        else if((state.stack[state.stack.length-1] === "{" || type === ";") && state.stack[state.stack.length-1] !== "@media{")return ret("variable", stream.current());
-        else if(state.stack[state.stack.length-2] === "{" && state.stack[state.stack.length-1] === ";")return ret("variable", stream.current());
-
-        return ret("tag", "tag");
-      } else if(type == "compare" || type == "a" || type == "("){
-        return ret("string", "string");
-      } else if(type == "|" || stream.current() == "-" || type == "["){
-        if (type == "|" && stream.match(/^[\]=~]/, false)) return ret("number", stream.current());
-        else if(type == "|" )return ret("tag", "tag");
-        else if(type == "["){
-          stream.eatWhile(/\w\-/);
-          return ret("number", stream.current());
-        }
-        return ret(null, ch);
-      } else if((stream.peek() == ":") || ( stream.eatSpace() && stream.peek() == ":")) {
-        stream.next();
-        var t_v = stream.peek() == ":" ? true : false;
-        if(!t_v){
-          var old_pos = stream.pos;
-          var sc = stream.current().length;
-          stream.eatWhile(/[a-z\\\-]/);
-          var new_pos = stream.pos;
-          if(stream.current().substring(sc-1).match(selectors) != null){
-            stream.backUp(new_pos-(old_pos-1));
-            return ret("tag", "tag");
-          } else stream.backUp(new_pos-(old_pos-1));
-        } else {
-          stream.backUp(1);
-        }
-        if(t_v)return ret("tag", "tag"); else return ret("variable", "variable");
-      } else if(state.stack[state.stack.length-1]  === "font-family" || state.stack[state.stack.length-1]  === "background-position" || state.stack[state.stack.length-1]  === "border-color"){
-        return ret(null, null);
-      } else {
-
-        if(state.stack[state.stack.length-1] === null && type === ":")return ret(null, stream.current());
-
-        //else if((type === ")" && state.stack[state.stack.length-1] === "rule") || (state.stack[state.stack.length-2] === "{" && state.stack[state.stack.length-1] === "rule" && type === "variable"))return ret(null, stream.current());
-
-        else if (/\^|\$/.test(stream.current()) && stream.match(/^[~=]/, false)) return ret("string", "string");//att^=val
-
-        else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
-        else if(type === "unit" && state.stack[state.stack.length-1] === ";")return ret(null, "unit");
-        else if(type === ")" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
-        else if(type && type.match("@") !== null  && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
-        //else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
-
-        else if((type === ";" || type === "}" || type === ",") && state.stack[state.stack.length-1] === ";")return ret("tag", stream.current());
-        else if((type === ";" && stream.peek() !== undefined && !stream.match(/^[{\.]/, false)) ||
-                (type === ";" && stream.eatSpace() && !stream.match(/^[{\.]/))) return ret("variable", stream.current());
-        else if((type === "@media" && state.stack[state.stack.length-1] === "@media") || type === "@namespace")return ret("tag", stream.current());
-
-        else if(type === "{"  && state.stack[state.stack.length-1] === ";" && stream.peek() === "{")return ret("tag", "tag");
-        else if((type === "{" || type === ":") && state.stack[state.stack.length-1] === ";")return ret(null, stream.current());
-        else if((state.stack[state.stack.length-1] === "{" && stream.eatSpace() && !stream.match(/^[\.#]/)) || type === "select-op"  || (state.stack[state.stack.length-1] === "rule" && type === ",") )return ret("tag", "tag");
-        else if(type === "variable" && state.stack[state.stack.length-1] === "rule")return ret("tag", "tag");
-        else if((stream.eatSpace() && stream.peek() === "{") || stream.eol() || stream.peek() === "{")return ret("tag", "tag");
-        //this one messes up indentation
-        //else if((type === "}" && stream.peek() !== ":") || (type === "}" && stream.eatSpace() && stream.peek() !== ":"))return(type, "tag");
-
-        else if(type === ")" && (stream.current() == "and" || stream.current() == "and "))return ret("variable", "variable");
-        else if(type === ")" && (stream.current() == "when" || stream.current() == "when "))return ret("variable", "variable");
-        else if(type === ")" || type === "comment" || type === "{")return ret("tag", "tag");
-        else if(stream.sol())return ret("tag", "tag");
-        else if((stream.eatSpace() && stream.peek() === "#") || stream.peek() === "#")return ret("tag", "tag");
-        else if(state.stack.length === 0)return ret("tag", "tag");
-        else if(type === ";" && stream.peek() !== undefined && stream.match(/^[\.|#]/g)) return ret("tag", "tag");
-
-        else if(type === ":"){stream.eatSpace();return ret(null, stream.current());}
-
-        else if(stream.current() === "and " || stream.current() === "and")return ret("variable", stream.current());
-        else if(type === ";" && state.stack[state.stack.length-1] === "{")return ret("variable", stream.current());
-
-        else if(state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
-
-        return ret("tag", stream.current());
-      }
-    }
-  }
-
-  function tokenSComment(stream, state) { // SComment = Slash comment
-    stream.skipToEnd();
-    state.tokenize = tokenBase;
-    return ret("comment", "comment");
-  }
-
-  function tokenCComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "/") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenSGMLComment(stream, state) {
-    var dashes = 0, ch;
-    while ((ch = stream.next()) != null) {
-      if (dashes >= 2 && ch == ">") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      dashes = (ch == "-") ? dashes + 1 : 0;
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped)
-          break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              stack: []};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-
-      var context = state.stack[state.stack.length-1];
-      if (type == "hash" && context == "rule") style = "atom";
-      else if (style == "variable") {
-        if (context == "rule") style = null; //"tag"
-        else if (!context || context == "@media{") {
-          style = stream.current() == "when"  ? "variable" :
-          /[\s,|\s\)|\s]/.test(stream.peek()) ? "tag"      : type;
-        }
-      }
-
-      if (context == "rule" && /^[\{\};]$/.test(type))
-        state.stack.pop();
-      if (type == "{") {
-        if (context == "@media") state.stack[state.stack.length-1] = "@media{";
-        else state.stack.push("{");
-      }
-      else if (type == "}") state.stack.pop();
-      else if (type == "@media") state.stack.push("@media");
-      else if (stream.current() === "font-family") state.stack[state.stack.length-1] = "font-family";
-      else if (stream.current() === "background-position") state.stack[state.stack.length-1] = "background-position";
-      else if (stream.current() === "border-color") state.stack[state.stack.length-1] = "border-color";
-      else if (context == "{" && type != "comment" && type !== "tag") state.stack.push("rule");
-      else if (stream.peek() === ":" && stream.current().match(/@|#/) === null) style = type;
-      if(type === ";" && (state.stack[state.stack.length-1] == "font-family" || state.stack[state.stack.length-1] == "background-position" || state.stack[state.stack.length-1] == "border-color"))state.stack[state.stack.length-1] = stream.current();
-      else if(type === "tag" && stream.peek() === ")" && stream.current().match(/\:/) === null){type = null; style = null;}
-      // ????
-      else if((type === "variable" && stream.peek() === ")") || (type === "variable" && stream.eatSpace() && stream.peek() === ")"))return ret(null,stream.current());
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var n = state.stack.length;
-      if (/^\}/.test(textAfter))
-        n -= state.stack[state.stack.length-1] === "rule" ? 2 : 1;
-      else if (state.stack[state.stack.length-2] === "{")
-        n -= state.stack[state.stack.length-1] === "rule" ? 1 : 0;
-      return state.baseIndent + n * indentUnit;
-    },
-
-    electricChars: "}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//"
-  };
-});
-
-CodeMirror.defineMIME("text/x-less", "less");
-if (!CodeMirror.mimeModes.hasOwnProperty("text/css"))
-  CodeMirror.defineMIME("text/css", "less");
-
-});
diff --git a/mode/meta.js b/mode/meta.js
index f37cea55b5..e048c22e10 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -39,7 +39,7 @@ CodeMirror.modeInfo = [
   {name: 'TypeScript', mime: 'application/typescript', mode: 'javascript'},
   {name: 'Jinja2', mime: null, mode: 'jinja2'},
   {name: 'Julia', mime: 'text/x-julia', mode: 'julia'},
-  {name: 'LESS', mime: 'text/x-less', mode: 'less'},
+  {name: 'LESS', mime: 'text/x-less', mode: 'css'},
   {name: 'LiveScript', mime: 'text/x-livescript', mode: 'livescript'},
   {name: 'Lua', mime: 'text/x-lua', mode: 'lua'},
   {name: 'Markdown (GitHub-flavour)', mime: 'text/x-markdown', mode: 'markdown'},

From c7e4ad741dbfc62ab2e4394c1945cd048f99a727 Mon Sep 17 00:00:00 2001
From: Grant Skinner <info@gskinner.com>
Date: Sat, 25 Jan 2014 12:22:44 -0700
Subject: [PATCH 0880/4742] Added "historyAdded" doc event.

Added a doc event "historyAdded" which is dispatched when a new entry is added to the document history. It is not dispatched when a history entry is amended. This allows CM's history to be integrated easily into application level undo/redo.

Signed-off-by: Grant Skinner <info@gskinner.com>
---
 lib/codemirror.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c7a5c6dd1c..c26d0126e7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5329,6 +5329,8 @@ window.CodeMirror = (function() {
     hist.lastTime = time;
     hist.lastOp = opId;
     hist.lastOrigin = change.origin;
+    
+    if (!last) { signal(doc, "historyAdded"); }
   }
 
   function removeClearedSpans(spans) {

From 98a28993299e948c48a8402d5b57e4c8dd3e122c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 26 Jan 2014 13:36:30 +0100
Subject: [PATCH 0881/4742] Fix trailing whitespace from
 c7e4ad741dbfc62ab2e4394c1945cd048f99a727

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c26d0126e7..bb970cd1be 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5329,8 +5329,8 @@ window.CodeMirror = (function() {
     hist.lastTime = time;
     hist.lastOp = opId;
     hist.lastOrigin = change.origin;
-    
-    if (!last) { signal(doc, "historyAdded"); }
+
+    if (!last) signal(doc, "historyAdded");
   }
 
   function removeClearedSpans(spans) {

From 5523871d2004e323d3b0e5c2e0fcd7e23d6cf212 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 26 Jan 2014 18:02:16 +0100
Subject: [PATCH 0882/4742] Fix bug in keymap table, properly bind Ctrl-Up

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bb970cd1be..15c7f9edf2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3636,7 +3636,7 @@ window.CodeMirror = (function() {
   // default. Unknown commands are simply ignored.
   keyMap.pcDefault = {
     "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Alt-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
+    "Ctrl-Home": "goDocStart", "Ctrl-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
     "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
     "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
     "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",

From 6d38609d2679078a36044afff67734f4227d21c9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Jan 2014 11:00:09 +0100
Subject: [PATCH 0883/4742] Fix scrolling outer window after pageup/pagedown

Issue #2183
---
 lib/codemirror.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a4908258d9..7c31b0f5d0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3046,7 +3046,7 @@
     else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
     if (doScroll != null && !phantom) {
       var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
-                           (coords.top - display.viewOffset) + "px; height: " +
+                           (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
                            (coords.bottom - coords.top + scrollerCutOff) + "px; left: " +
                            coords.left + "px; width: 2px;");
       cm.display.lineSpace.appendChild(scrollNode);
@@ -3631,7 +3631,7 @@
     },
 
     moveV: operation(null, function(dir, unit) {
-      var cm = this, doc = this.doc, goals = [], addScroll;
+      var cm = this, doc = this.doc, goals = [];
       var collapse = !cm.display.shift && !doc.sel.extend && doc.sel.somethingSelected();
       doc.extendSelectionsBy(function(range) {
         if (collapse)
@@ -3641,10 +3641,9 @@
         goals.push(headPos.left);
         var pos = findPosV(cm, headPos, dir, unit);
         if (unit == "page" && range == doc.sel.primary())
-          addScroll = charCoords(cm, pos, "div").top - headPos.top;
+          addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top);
         return pos;
       });
-      if (addScroll) addToScrollPos(this, 0, addScroll);
       if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
         doc.sel.ranges[i].goalColumn = goals[i];
     }),
@@ -4805,7 +4804,7 @@
     if (!ws.length) this.line.widgets = null;
     var aboveVisible = heightAtLine(this.line) < this.cm.doc.scrollTop;
     updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));
-    if (aboveVisible) addToScrollPos(this.cm, 0, -this.height);
+    if (aboveVisible) addToScrollPos(this.cm, null, -this.height);
     regLineChange(this.cm, no, "widget");
   });
   LineWidget.prototype.changed = widgetOperation(function() {
@@ -4836,7 +4835,7 @@
       if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {
         var aboveVisible = heightAtLine(line) < cm.doc.scrollTop;
         updateLineHeight(line, line.height + widgetHeight(widget));
-        if (aboveVisible) addToScrollPos(cm, 0, widget.height);
+        if (aboveVisible) addToScrollPos(cm, null, widget.height);
       }
       return true;
     });

From 3c3003cff45675b502c7536b42236739a1688e36 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Jan 2014 11:09:23 +0100
Subject: [PATCH 0884/4742] Work around setSelectionRange throwing when editor
 is hidden on FF

---
 lib/codemirror.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7c31b0f5d0..071a57ba18 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -169,7 +169,7 @@
     // See readInput and resetInput
     if (!ie_lt9) {
       d.prevInput = d.input.value = "_";
-      d.input.setSelectionRange(1, 1);
+      d.input.selectionStart = d.input.selectionEnd = 1;
     } else {
       d.prevInput = "";
     }
@@ -1809,12 +1809,13 @@
   }
 
   function clearInput(cm) {
-    if (ie_lt9) {
-      cm.display.prevInput = cm.display.input.value = "_";
-      cm.display.input.setSelectionRange(1, 1);
+    var input = cm.display.input;
+    if (!ie_lt9) {
+      cm.display.prevInput = input.value = "_";
+      input.selectionStart = input.selectionEnd = 1;
       if (old_ie && !ie_lt9) cm.display.inputHasSelection = null;
     } else {
-      cm.display.prevInput = cm.display.input.value = "";
+      cm.display.prevInput = input.value = "";
     }
   }
 

From f9aa052f92015cce3a79bd814866b0503778a4de Mon Sep 17 00:00:00 2001
From: Bernhard Sirlinger <WebsiteDeveloper@users.noreply.github.com>
Date: Sun, 26 Jan 2014 23:02:22 +0100
Subject: [PATCH 0885/4742] Signal overwriteToggle event

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 15c7f9edf2..dd94503084 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3228,6 +3228,8 @@ window.CodeMirror = (function() {
         this.display.cursor.className += " CodeMirror-overwrite";
       else
         this.display.cursor.className = this.display.cursor.className.replace(" CodeMirror-overwrite", "");
+
+      signal(this, "overwriteToggle", this, this.state.overwrite);
     },
     hasFocus: function() { return document.activeElement == this.display.input; },
 

From 55223f6003d372d84e631e3b257d1392187e58ef Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Jan 2014 11:15:58 +0100
Subject: [PATCH 0886/4742] [foldcode addon] Add an isFolded method

---
 addon/fold/foldcode.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 5c00d7093c..3c0817b8fe 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -62,6 +62,12 @@
     doFold(this, pos, options, force);
   });
 
+  CodeMirror.defineExtension("isFolded", function(pos) {
+    var marks = this.findMarksAt(pos);
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold) return true;
+  });
+
   CodeMirror.commands.fold = function(cm) {
     cm.foldCode(cm.getCursor());
   };

From 014157911ab5f55f91281fe5dca52bcea954ca86 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 27 Jan 2014 21:48:11 +0100
Subject: [PATCH 0887/4742] [css mode] Update Grid Layout property names

Some properties were outdated and some other were missing according to last
version of the CSS Grid Layout spec:
http://www.w3.org/TR/css3-grid-layout/#property-index
---
 mode/css/css.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index b2c74a92ea..6cc4b71b05 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -396,10 +396,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "font-stretch", "font-style", "font-synthesis", "font-variant",
     "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
     "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
-    "font-weight", "grid-cell", "grid-column", "grid-column-align",
-    "grid-column-sizing", "grid-column-span", "grid-columns", "grid-flow",
-    "grid-row", "grid-row-align", "grid-row-sizing", "grid-row-span",
-    "grid-rows", "grid-template", "hanging-punctuation", "height", "hyphens",
+    "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow",
+    "grid-auto-position", "grid-auto-rows", "grid-column", "grid-column-end",
+    "grid-column-start", "grid-row", "grid-row-end", "grid-row-start",
+    "grid-template", "grid-template-areas", "grid-template-columns",
+    "grid-template-rows", "hanging-punctuation", "height", "hyphens",
     "icon", "image-orientation", "image-rendering", "image-resolution",
     "inline-box-align", "justify-content", "left", "letter-spacing",
     "line-break", "line-height", "line-stacking", "line-stacking-ruby",

From b538a4ed74367cc66bc1d3067826ee60887e8d29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Jan 2014 11:25:36 +0100
Subject: [PATCH 0888/4742] Remove remaining uses of tabMode and enterMode in
 demos

---
 demo/changemode.html         |   3 +-
 demo/fullscreen.html         | 105 ++++++++++-------------------------
 demo/preview.html            |   3 +-
 demo/search.html             |  67 ++++++++++------------
 mode/eiffel/index.html       |   1 -
 mode/htmlembedded/index.html |   4 +-
 mode/htmlmixed/index.html    |   2 +-
 mode/julia/index.html        |   1 -
 mode/lua/index.html          |   1 -
 mode/mirc/index.html         |   5 +-
 mode/octave/index.html       |   1 -
 mode/php/index.html          |   4 +-
 mode/python/index.html       |   2 -
 mode/rpm/changes/index.html  |   3 +-
 mode/ruby/index.html         |   1 -
 mode/rust/index.html         |   3 +-
 mode/sparql/index.html       |   1 -
 mode/tcl/index.html          |  15 +++--
 mode/tiddlywiki/index.html   |   1 -
 mode/turtle/index.html       |   1 -
 mode/vb/index.html           |   3 +-
 mode/velocity/index.html     |   1 -
 test/test.js                 |   4 +-
 23 files changed, 78 insertions(+), 154 deletions(-)

diff --git a/demo/changemode.html b/demo/changemode.html
index 9ea99b2d04..ad4c9d1b2c 100644
--- a/demo/changemode.html
+++ b/demo/changemode.html
@@ -41,8 +41,7 @@ <h2>Mode-Changing Demo</h2>
 <script>
   var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
     mode: "scheme",
-    lineNumbers: true,
-    tabMode: "indent"
+    lineNumbers: true
   });
   var pending;
   editor.on("change", function() {
diff --git a/demo/fullscreen.html b/demo/fullscreen.html
index 827d55d0cd..0a11f31924 100644
--- a/demo/fullscreen.html
+++ b/demo/fullscreen.html
@@ -27,85 +27,38 @@
 <article>
 <h2>Full Screen Editing</h2>
 <form><textarea id="code" name="code" rows="5">
-  <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt>
-  <dd>Whether, when indenting, the first N*8 spaces should be
-  replaced by N tabs. Default is false.</dd>
+<dl>
+  <dt id="option_indentWithTabs"><code><strong>indentWithTabs</strong>: boolean</code></dt>
+  <dd>Whether, when indenting, the first N*<code>tabSize</code>
+  spaces should be replaced by N tabs. Default is false.</dd>
 
-  <dt id="option_tabMode"><code>tabMode (string)</code></dt>
-  <dd>Determines what happens when the user presses the tab key.
-  Must be one of the following:
-    <dl>
-      <dt><code>"classic" (the default)</code></dt>
-      <dd>When nothing is selected, insert a tab. Otherwise,
-      behave like the <code>"shift"</code> mode. (When shift is
-      held, this behaves like the <code>"indent"</code> mode.)</dd>
-      <dt><code>"shift"</code></dt>
-      <dd>Indent all selected lines by
-      one <a href="#option_indentUnit"><code>indentUnit</code></a>.
-      If shift was held while pressing tab, un-indent all selected
-      lines one unit.</dd>
-      <dt><code>"indent"</code></dt>
-      <dd>Indent the line the 'correctly', based on its syntactic
-      context. Only works if the
-      mode <a href="#indent">supports</a> it.</dd>
-      <dt><code>"default"</code></dt>
-      <dd>Do not capture tab presses, let the browser apply its
-      default behaviour (which usually means it skips to the next
-      control).</dd>
-    </dl></dd>
+  <dt id="option_electricChars"><code><strong>electricChars</strong>: boolean</code></dt>
+  <dd>Configures whether the editor should re-indent the current
+  line when a character is typed that might change its proper
+  indentation (only works if the mode supports indentation).
+  Default is true.</dd>
 
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
+  <dt id="option_specialChars"><code><strong>specialChars</strong>: RegExp</code></dt>
+  <dd>A regular expression used to determine which characters
+  should be replaced by a
+  special <a href="#option_specialCharPlaceholder">placeholder</a>.
+  Mostly useful for non-printing special characters. The default
+  is <code>/[\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/</code>.</dd>
+  <dt id="option_specialCharPlaceholder"><code><strong>specialCharPlaceholder</strong>: function(char) → Element</code></dt>
+  <dd>A function that, given a special character identified by
+  the <a href="#option_specialChars"><code>specialChars</code></a>
+  option, produces a DOM node that is used to represent the
+  character. By default, a red dot (<span style="color: red">•</span>)
+  is shown, with a title tooltip to indicate the character code.</dd>
 
+  <dt id="option_rtlMoveVisually"><code><strong>rtlMoveVisually</strong>: boolean</code></dt>
+  <dd>Determines whether horizontal cursor movement through
+  right-to-left (Arabic, Hebrew) text is visual (pressing the left
+  arrow moves the cursor left) or logical (pressing the left arrow
+  moves to the next lower index in the string, which is visually
+  right in right-to-left text). The default is <code>false</code>
+  on Windows, and <code>true</code> on other platforms.</dd>
+</dl>
 </textarea></form>
   <script>
     var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
diff --git a/demo/preview.html b/demo/preview.html
index ccf9122e9b..d2aada3c80 100644
--- a/demo/preview.html
+++ b/demo/preview.html
@@ -68,8 +68,7 @@ <h2>HTML5 preview</h2>
       var delay;
       // Initialize CodeMirror editor with a nice html5 canvas demo.
       var editor = CodeMirror.fromTextArea(document.getElementById('code'), {
-        mode: 'text/html',
-        tabMode: 'indent'
+        mode: 'text/html'
       });
       editor.on("change", function() {
         clearTimeout(delay);
diff --git a/demo/search.html b/demo/search.html
index 4aef2a81c0..21c9b278a9 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -31,45 +31,38 @@
 <article>
 <h2>Search/Replace Demo</h2>
 <form><textarea id="code" name="code">
-  <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt>
-  <dd>Whether, when indenting, the first N*8 spaces should be
-  replaced by N tabs. Default is false.</dd>
+<dl>
+  <dt id="option_indentWithTabs"><code><strong>indentWithTabs</strong>: boolean</code></dt>
+  <dd>Whether, when indenting, the first N*<code>tabSize</code>
+  spaces should be replaced by N tabs. Default is false.</dd>
 
-  <dt id="option_tabMode"><code>tabMode (string)</code></dt>
-  <dd>Determines what happens when the user presses the tab key.
-  Must be one of the following:
-    <dl>
-      <dt><code>"classic" (the default)</code></dt>
-      <dd>When nothing is selected, insert a tab. Otherwise,
-      behave like the <code>"shift"</code> mode. (When shift is
-      held, this behaves like the <code>"indent"</code> mode.)</dd>
-      <dt><code>"shift"</code></dt>
-      <dd>Indent all selected lines by
-      one <a href="#option_indentUnit"><code>indentUnit</code></a>.
-      If shift was held while pressing tab, un-indent all selected
-      lines one unit.</dd>
-      <dt><code>"indent"</code></dt>
-      <dd>Indent the line the 'correctly', based on its syntactic
-      context. Only works if the
-      mode <a href="#indent">supports</a> it.</dd>
-      <dt><code>"default"</code></dt>
-      <dd>Do not capture tab presses, let the browser apply its
-      default behaviour (which usually means it skips to the next
-      control).</dd>
-    </dl></dd>
+  <dt id="option_electricChars"><code><strong>electricChars</strong>: boolean</code></dt>
+  <dd>Configures whether the editor should re-indent the current
+  line when a character is typed that might change its proper
+  indentation (only works if the mode supports indentation).
+  Default is true.</dd>
 
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
+  <dt id="option_specialChars"><code><strong>specialChars</strong>: RegExp</code></dt>
+  <dd>A regular expression used to determine which characters
+  should be replaced by a
+  special <a href="#option_specialCharPlaceholder">placeholder</a>.
+  Mostly useful for non-printing special characters. The default
+  is <code>/[\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/</code>.</dd>
+  <dt id="option_specialCharPlaceholder"><code><strong>specialCharPlaceholder</strong>: function(char) → Element</code></dt>
+  <dd>A function that, given a special character identified by
+  the <a href="#option_specialChars"><code>specialChars</code></a>
+  option, produces a DOM node that is used to represent the
+  character. By default, a red dot (<span style="color: red">•</span>)
+  is shown, with a title tooltip to indicate the character code.</dd>
+
+  <dt id="option_rtlMoveVisually"><code><strong>rtlMoveVisually</strong>: boolean</code></dt>
+  <dd>Determines whether horizontal cursor movement through
+  right-to-left (Arabic, Hebrew) text is visual (pressing the left
+  arrow moves the cursor left) or logical (pressing the left arrow
+  moves to the next lower index in the string, which is visually
+  right in right-to-left text). The default is <code>false</code>
+  on Windows, and <code>true</code> on other platforms.</dd>
+</dl>
 </textarea></form>
 
     <script>
diff --git a/mode/eiffel/index.html b/mode/eiffel/index.html
index 5d395a05cd..95c5f885b0 100644
--- a/mode/eiffel/index.html
+++ b/mode/eiffel/index.html
@@ -417,7 +417,6 @@ <h2>Eiffel mode</h2>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: "text/x-eiffel",
-        tabMode: "indent",
         indentUnit: 4,
         lineNumbers: true,
         theme: "neat"
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index 4ab90f7d88..fee1196839 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -46,9 +46,7 @@ <h2>Html Embedded Scripts mode</h2>
         lineNumbers: true,
         mode: "application/x-ejs",
         indentUnit: 4,
-        indentWithTabs: true,
-        enterMode: "keep",
-        tabMode: "shift"
+        indentWithTabs: true
       });
     </script>
 
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index b46174351a..bd06bb504c 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -62,7 +62,7 @@ <h1>Mixed HTML Example</h1>
                       {matches: /(text|application)\/(x-)?vb(a|script)/i,
                        mode: "vbscript"}]
       };
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: mixedMode, tabMode: "indent"});
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: mixedMode});
     </script>
 
     <p>The HTML mixed mode depends on the XML, JavaScript, and CSS modes.</p>
diff --git a/mode/julia/index.html b/mode/julia/index.html
index dd567a623b..945e1a91fc 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -178,7 +178,6 @@ <h2>Julia mode</h2>
                },
         lineNumbers: true,
         indentUnit: 4,
-        tabMode: "shift",
         matchBrackets: true
       });
     </script>
diff --git a/mode/lua/index.html b/mode/lua/index.html
index 69433e44ab..7f4eb2c84a 100644
--- a/mode/lua/index.html
+++ b/mode/lua/index.html
@@ -69,7 +69,6 @@ <h2>Lua mode</h2>
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        tabMode: "indent",
         matchBrackets: true,
         theme: "neat"
       });
diff --git a/mode/mirc/index.html b/mode/mirc/index.html
index dbd7a06d8d..c346f1c7ef 100644
--- a/mode/mirc/index.html
+++ b/mode/mirc/index.html
@@ -147,10 +147,9 @@ <h2>mIRC mode</h2>
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        tabMode: "indent",
-		theme: "twilight",
+        theme: "twilight",
         lineNumbers: true,
-		matchBrackets: true,
+        matchBrackets: true,
         indentUnit: 4,
         mode: "text/mirc"
       });
diff --git a/mode/octave/index.html b/mode/octave/index.html
index bd5a523294..78ce42a146 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -86,7 +86,6 @@ <h2>Octave mode</h2>
                singleLineStringErrors: false},
         lineNumbers: true,
         indentUnit: 4,
-        tabMode: "shift",
         matchBrackets: true
       });
     </script>
diff --git a/mode/php/index.html b/mode/php/index.html
index aaf51c0f5a..1fb7435bb1 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -48,9 +48,7 @@ <h2>PHP mode</h2>
         matchBrackets: true,
         mode: "application/x-httpd-php",
         indentUnit: 4,
-        indentWithTabs: true,
-        enterMode: "keep",
-        tabMode: "shift"
+        indentWithTabs: true
       });
     </script>
 
diff --git a/mode/python/index.html b/mode/python/index.html
index e8422fb77a..a1d6d2d838 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -150,7 +150,6 @@ <h2>Cython mode</h2>
                singleLineStringErrors: false},
         lineNumbers: true,
         indentUnit: 4,
-        tabMode: "shift",
         matchBrackets: true
     });
 
@@ -160,7 +159,6 @@ <h2>Cython mode</h2>
                singleLineStringErrors: false},
         lineNumbers: true,
         indentUnit: 4,
-        tabMode: "shift",
         matchBrackets: true
       });
     </script>
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
index 18fe7ab7bf..0ade017966 100644
--- a/mode/rpm/changes/index.html
+++ b/mode/rpm/changes/index.html
@@ -58,8 +58,7 @@ <h2>RPM changes mode</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: {name: "changes"},
         lineNumbers: true,
-        indentUnit: 4,
-        tabMode: "shift"
+        indentUnit: 4
       });
     </script>
 
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 2b3e1a3eb1..8f0ebca8e8 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -170,7 +170,6 @@ <h2>Ruby mode</h2>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: "text/x-ruby",
-        tabMode: "indent",
         matchBrackets: true,
         indentUnit: 4
       });
diff --git a/mode/rust/index.html b/mode/rust/index.html
index b0b4c2416c..4fc0999228 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -52,8 +52,7 @@ <h2>Rust mode</h2>
 
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        tabMode: "indent"
+        lineNumbers: true
       });
     </script>
 
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 7c41e17b77..5f19d647bf 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -44,7 +44,6 @@ <h2>SPARQL mode</h2>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: "application/x-sparql-query",
-        tabMode: "indent",
         matchBrackets: true
       });
     </script>
diff --git a/mode/tcl/index.html b/mode/tcl/index.html
index 2c0d1a2dea..c48e253241 100644
--- a/mode/tcl/index.html
+++ b/mode/tcl/index.html
@@ -77,13 +77,13 @@ <h2>Tcl mode</h2>
 proc whois::311 {from key text} {
   if {[regexp -- {^[^\s]+\s(.+?)\s(.+?)\s(.+?)\s\*\s\:(.+)$} $text wholematch nick ident host realname]} {
     putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Host:${whois::textf} \
-	$nick \(${ident}@${host}\) ${whois::tagf}Realname:${whois::textf} $realname"
+        $nick \(${ident}@${host}\) ${whois::tagf}Realname:${whois::textf} $realname"
   }
 }
 proc whois::multi {from key text} {
   if {[regexp {\:(.*)$} $text match $key]} {
     putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Note:${whois::textf} [subst $$key]"
-	return 1
+        return 1
   }
 }
 proc whois::312 {from key text} {
@@ -98,7 +98,7 @@ <h2>Tcl mode</h2>
 proc whois::317 {from key text} {
   if {[regexp -- {.*\s(\d+)\s(\d+)\s\:} $text wholematch idle signon]} {
     putserv "PRIVMSG $whois::channel :${whois::logo} ${whois::tagf}Connected:${whois::textf} \
-	[ctime $signon] ${whois::tagf}Idle:${whois::textf} [duration $idle]"
+        [ctime $signon] ${whois::tagf}Idle:${whois::textf} [duration $idle]"
   }
 }
 proc whois::301 {from key text} {
@@ -108,7 +108,7 @@ <h2>Tcl mode</h2>
 }
 proc whois::318 {from key text} {
   namespace eval whois {
-	variable channel ""
+        variable channel ""
   }
   variable whois::channel ""
 }
@@ -118,8 +118,8 @@ <h2>Tcl mode</h2>
 proc whois::list {nick host hand chan text} {
   if {[lsearch -exact [channel info $chan] "+${whois::command}"] != -1} {
     namespace eval whois {
-	  variable channel ""
-	}
+          variable channel ""
+        }
     variable whois::channel $chan
     putserv "WHOIS $text"
   }
@@ -129,8 +129,7 @@ <h2>Tcl mode</h2>
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        tabMode: "indent",
-		theme: "night",
+        theme: "night",
         lineNumbers: true,
         indentUnit: 2,
         scrollPastEnd: true,
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index fc8f5d3920..6ef64a4d06 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -144,7 +144,6 @@ <h2>TiddlyWiki mode</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: 'tiddlywiki',      
         lineNumbers: true,
-        enterMode: 'keep',
         matchBrackets: true
       });
     </script>
diff --git a/mode/turtle/index.html b/mode/turtle/index.html
index 74b5f896d9..27689c34ff 100644
--- a/mode/turtle/index.html
+++ b/mode/turtle/index.html
@@ -41,7 +41,6 @@ <h2>Turtle mode</h2>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: "text/turtle",
-        tabMode: "indent",
         matchBrackets: true
       });
     </script>
diff --git a/mode/vb/index.html b/mode/vb/index.html
index 42c3e5261c..8b81a88b91 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -81,8 +81,7 @@ <h2>VB.NET mode</h2>
     editor = CodeMirror.fromTextArea(document.getElementById("solution"), {
         lineNumbers: true,
         mode: "text/x-vb",
-        readOnly: false,
-        tabMode: "shift"
+        readOnly: false
     });
     runTest();
 }
diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index 023542d1d7..bd38b886b2 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -106,7 +106,6 @@ <h2>Velocity mode</h2>
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        tabMode: "indent",
         theme: "night",
         lineNumbers: true,
         indentUnit: 4,
diff --git a/test/test.js b/test/test.js
index 1d7f80e355..78998c67cd 100644
--- a/test/test.js
+++ b/test/test.js
@@ -172,7 +172,7 @@ test("core_defaults", function() {
   for (var opt in defs) defsCopy[opt] = defs[opt];
   defs.indentUnit = 5;
   defs.value = "uu";
-  defs.enterMode = "keep";
+  defs.indentWithTabs = true;
   defs.tabindex = 55;
   var place = document.getElementById("testground"), cm = CodeMirror(place);
   try {
@@ -180,7 +180,7 @@ test("core_defaults", function() {
     cm.setOption("indentUnit", 10);
     eq(defs.indentUnit, 5);
     eq(cm.getValue(), "uu");
-    eq(cm.getOption("enterMode"), "keep");
+    eq(cm.getOption("indentWithTabs"), true);
     eq(cm.getInputField().tabIndex, 55);
   }
   finally {

From afe0dfbbb9171aee8f43708469d20b7687999fd5 Mon Sep 17 00:00:00 2001
From: Maksym Taran <mtaran@google.com>
Date: Mon, 27 Jan 2014 18:32:04 -0800
Subject: [PATCH 0889/4742] [continuecomment addon] Allow continuing block
 comment from first line.

---
 addon/comment/continuecomment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index a3370a6072..7f506c42cc 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -12,7 +12,7 @@
     if (mode.blockCommentStart && mode.blockCommentContinue) {
       var end = token.string.indexOf(mode.blockCommentEnd);
       var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
-      if (end != -1 && end == token.string.length - mode.blockCommentEnd.length) {
+      if (end != -1 && end == token.string.length - mode.blockCommentEnd.length && pos.ch >= end) {
         // Comment ended, don't continue it
       } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
         insert = full.slice(0, token.start);

From eab9b5ea2b5d9768a0f47260e12396b56fb0566c Mon Sep 17 00:00:00 2001
From: domagoj412 <domagoj.kriskovic@gmail.com>
Date: Tue, 28 Jan 2014 12:23:37 +0100
Subject: [PATCH 0890/4742] [merge addon] Add trailing semicolon too
 diff_match_patch.js

(otherwise there is an error if all is minified in one file)
---
 addon/merge/dep/diff_match_patch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/dep/diff_match_patch.js b/addon/merge/dep/diff_match_patch.js
index ac34105fc4..9d615dc9d5 100644
--- a/addon/merge/dep/diff_match_patch.js
+++ b/addon/merge/dep/diff_match_patch.js
@@ -47,4 +47,4 @@ j=!1):-1===g&&1==h.diffs.length&&0==h.diffs[0][0]&&i.length>2*b?(h.length1+=i.le
 diff_match_patch.prototype.patch_fromText=function(a){var b=[];if(!a)return b;a=a.split("\n");for(var c=0,d=/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;c<a.length;){var e=a[c].match(d);if(!e)throw Error("Invalid patch string: "+a[c]);var f=new diff_match_patch.patch_obj;b.push(f);f.start1=parseInt(e[1],10);""===e[2]?(f.start1--,f.length1=1):"0"==e[2]?f.length1=0:(f.start1--,f.length1=parseInt(e[2],10));f.start2=parseInt(e[3],10);""===e[4]?(f.start2--,f.length2=1):"0"==e[4]?f.length2=0:(f.start2--,f.length2=
 parseInt(e[4],10));for(c++;c<a.length;){e=a[c].charAt(0);try{var g=decodeURI(a[c].substring(1))}catch(h){throw Error("Illegal escape in patch_fromText: "+g);}if("-"==e)f.diffs.push([-1,g]);else if("+"==e)f.diffs.push([1,g]);else if(" "==e)f.diffs.push([0,g]);else if("@"==e)break;else if(""!==e)throw Error('Invalid patch mode "'+e+'" in: '+g);c++}}return b};diff_match_patch.patch_obj=function(){this.diffs=[];this.start2=this.start1=null;this.length2=this.length1=0};
 diff_match_patch.patch_obj.prototype.toString=function(){var a,b;a=0===this.length1?this.start1+",0":1==this.length1?this.start1+1:this.start1+1+","+this.length1;b=0===this.length2?this.start2+",0":1==this.length2?this.start2+1:this.start2+1+","+this.length2;a=["@@ -"+a+" +"+b+" @@\n"];var c;for(b=0;b<this.diffs.length;b++){switch(this.diffs[b][0]){case 1:c="+";break;case -1:c="-";break;case 0:c=" "}a[b+1]=c+encodeURI(this.diffs[b][1])+"\n"}return a.join("").replace(/%20/g," ")};
-this.diff_match_patch=diff_match_patch;this.DIFF_DELETE=-1;this.DIFF_INSERT=1;this.DIFF_EQUAL=0;})()
+this.diff_match_patch=diff_match_patch;this.DIFF_DELETE=-1;this.DIFF_INSERT=1;this.DIFF_EQUAL=0;})();

From 1a1e6a7e7156e2acf653192dd0d80b14f8c7578f Mon Sep 17 00:00:00 2001
From: ndr <ndr@qef.io>
Date: Tue, 28 Jan 2014 14:33:32 +0100
Subject: [PATCH 0891/4742] [clojure mode] Add angle brackets to symbol
 characters

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

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index e3d87d23a6..a45a95de59 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -45,7 +45,7 @@ CodeMirror.defineMode("clojure", function (options) {
         sign: /[+-]/,
         exponent: /e/i,
         keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:\/]/
+        symbol: /[\w*+!\-\._?:<>\/]/
     };
 
     function stateStack(indent, type, prev) { // represents a state stack object

From cc5ba85c78baf1f80aea41705614b7d08b6f0ad4 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Tue, 28 Jan 2014 15:12:50 +0100
Subject: [PATCH 0892/4742] [sql plsql] add keyword: elseif, returns

---
 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 903fa6740a..52becec8dc 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -326,7 +326,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-plsql", {
     name:       "sql",
     client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
-    keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
+    keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
     builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid upper user userenv varchar varchar2 variance varying vsize xml"),
     operatorChars: /^[*+\-%<>!=~]/,
     dateSQL:    set("date time timestamp"),

From 53b129bfee3d8f9b44a541906a784d81ffa383c2 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Tue, 28 Jan 2014 15:19:58 +0100
Subject: [PATCH 0893/4742] [sql plsql] Add builtin: bigserial, serial...

... UNLOGGED, add keyword: cascade
---
 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 52becec8dc..a34b393fef 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -327,7 +327,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name:       "sql",
     client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
     keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
-    builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid upper user userenv varchar varchar2 variance varying vsize xml"),
+    builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),
     operatorChars: /^[*+\-%<>!=~]/,
     dateSQL:    set("date time timestamp"),
     support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")

From 39e7c78d4677a69b66a8da9700c81970659bb9df Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Jan 2014 10:18:51 +0100
Subject: [PATCH 0894/4742] Further tweaks to input kludge

Issue #1196

Makes sure placeholder text is restored after deleting it

Fixes problem with editor that is initialized when hidden, and
thus won't allow selectionStart/End to be set.
---
 lib/codemirror.js | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 071a57ba18..402f474b4b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -167,12 +167,7 @@
     // the amount of lines crosses a boundary that makes its width change)
     d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
     // See readInput and resetInput
-    if (!ie_lt9) {
-      d.prevInput = d.input.value = "_";
-      d.input.selectionStart = d.input.selectionEnd = 1;
-    } else {
-      d.prevInput = "";
-    }
+    clearInput(d);
     // Set to true when a non-horizontal-scrolling widget is added. As
     // an optimization, widget aligning is skipped when d is false.
     d.alignWidgets = false;
@@ -1784,7 +1779,7 @@
     ensureCursorVisible(cm);
     cm.curOp.updateInput = updateInput;
 
-    if (text.length > 1000 || text.indexOf("\n") > -1) clearInput(cm);
+    if (!text || text.length > 1000 || text.indexOf("\n") > -1) clearInput(cm.display);
     else cm.display.prevInput = text;
     if (withOp) endOperation(cm);
     cm.state.pasteIncoming = cm.state.cutIncoming = false;
@@ -1803,19 +1798,20 @@
       if (cm.state.focused) selectInput(cm.display.input);
       if (old_ie && !ie_lt9) cm.display.inputHasSelection = content;
     } else if (user) {
-      clearInput(cm);
+      clearInput(cm.display);
     }
     cm.display.inaccurateSelection = minimal;
   }
 
-  function clearInput(cm) {
-    var input = cm.display.input;
+  function clearInput(display) {
+    var input = display.input;
     if (!ie_lt9) {
-      cm.display.prevInput = input.value = "_";
+      display.prevInput = input.value = "_";
       input.selectionStart = input.selectionEnd = 1;
-      if (old_ie && !ie_lt9) cm.display.inputHasSelection = null;
+      if (input.selectionEnd == 0) display.prevInput = input.value = "";
+      if (old_ie) display.inputHasSelection = null;
     } else {
-      cm.display.prevInput = input.value = "";
+      display.prevInput = input.value = "";
     }
   }
 
@@ -2544,7 +2540,7 @@
     resetInput(cm, true);
     // Adds "Select all" to context menu in FF
     var hasSelection = cm.somethingSelected();
-    if (!hasSelection) clearInput(cm);
+    if (!hasSelection) clearInput(cm.display);
 
     function prepareSelectAllHack() {
       if (display.input.selectionStart != null) {
@@ -3709,6 +3705,7 @@
       this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
         estimateLineHeights(this);
+      resetInput(this, true);
       signal(this, "refresh", this);
     }),
 

From 76c97344df8c533f311b9013affe6553c2d40635 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Jan 2014 10:23:35 +0100
Subject: [PATCH 0895/4742] [runmode addon] Fix missing parameter in
 runmode.node.js

Closes #2188
---
 addon/runmode/runmode.node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index e8bccb0cf2..870b9ea5df 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -99,7 +99,7 @@ exports.getMode = function(options, spec) {
 };
 exports.registerHelper = exports.registerGlobalHelper = Math.min;
 
-exports.runMode = function(string, modespec, callback) {
+exports.runMode = function(string, modespec, callback, options) {
   var mode = exports.getMode({indentUnit: 2}, modespec);
   var lines = splitLines(string), state = (options && options.state) || exports.startState(mode);
   for (var i = 0, e = lines.length; i < e; ++i) {

From 8e79d65e6df9e97af70383a9d1d4ec507f31c3fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Jan 2014 10:43:44 +0100
Subject: [PATCH 0896/4742] Make alt-drag selection work on columns, not string
 indices

This makes the block align properly in the face of tabs
(given a monospaced font)

Closes #2189
---
 lib/codemirror.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 402f474b4b..ae1ce3d8ce 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2085,17 +2085,17 @@
       lastPos = pos;
 
       if (type == "rect") {
-        var ranges = [];
-        var left = Math.min(start.ch, pos.ch), right = Math.max(start.ch, pos.ch);
+        var ranges = [], tabSize = cm.options.tabSize;
+        var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
+        var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
+        var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
         for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
              line <= end; line++) {
-          var text = getLine(doc, line).text;
-          if (left == right) {
-            var head = Pos(line, Math.min(left, text.length));
-            ranges.push(new Range(head, head));
-          } else if (text && text.length >= left) {
-            ranges.push(new Range(Pos(line, left), Pos(line, Math.min(text.length, right))));
-          }
+          var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
+          if (left == right)
+            ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)));
+          else if (text && text.length >= leftPos)
+            ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
         }
         if (!ranges.length) ranges.push(new Range(start, start));
         setSelection(doc, new Selection(ranges, ranges.length - 1));
@@ -6059,7 +6059,7 @@
 
   // Counts the column offset in a string, taking tabs into account.
   // Used mostly to find indentation.
-  function countColumn(string, end, tabSize, startIndex, startValue) {
+  var countColumn = CodeMirror.countColumn = function(string, end, tabSize, startIndex, startValue) {
     if (end == null) {
       end = string.search(/[^\s\u00a0]/);
       if (end == -1) end = string.length;
@@ -6069,8 +6069,12 @@
       else ++n;
     }
     return n;
+  };
+  function findColumn(string, goal, tabSize) {
+    for (var pos = 0, col = 0; col < goal && pos < string.length; pos++)
+      col += string.charAt(pos) == "\t" ? tabSize - (col % tabSize) : 1;
+    return pos;
   }
-  CodeMirror.countColumn = countColumn;
 
   var spaceStrs = [""];
   function spaceStr(n) {

From c1d75b7628cabf346ec872269aafc4bb3d5c739a Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Wed, 29 Jan 2014 10:24:48 +0700
Subject: [PATCH 0897/4742] [docs & project page] Typo fixes.

---
 doc/manual.html | 6 +++---
 index.html      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index c56af630e5..67198b1f15 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -446,7 +446,7 @@ <h2>Events</h2>
 
     <p>Various CodeMirror-related objects emit events, which allow
     client code to react to various situations. Handlers for such
-    events can be registed with the <a href="#on"><code>on</code></a>
+    events can be registered with the <a href="#on"><code>on</code></a>
     and <a href="#off"><code>off</code></a> methods on the objects
     that the event fires on. To fire your own events,
     use <code>CodeMirror.signal(target, name, args...)</code>,
@@ -1262,7 +1262,7 @@ <h3 id="api_marker">Text-marking methods</h3>
         only in its target document.</dd>
       </dl>
       The method will return an object that represents the marker
-      (with constuctor <code>CodeMirror.TextMarker</code>), which
+      (with constructor <code>CodeMirror.TextMarker</code>), which
       exposes three methods:
       <code><strong>clear</strong>()</code>, to remove the mark,
       <code><strong>find</strong>()</code>, which returns
@@ -2065,7 +2065,7 @@ <h2>Addons</h2>
       uses <code>CodeMirror.hint.fromList</code> to complete from
       those.</dd>
       <dd>When completions
-      aren't simple strings, they should be objects with the folowing
+      aren't simple strings, they should be objects with the following
       properties:
       <dl>
         <dt><code><strong>text</strong>: string</code></dt>
diff --git a/index.html b/index.html
index 7097608d83..72f8245eda 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,7 @@
   <p><strong>CodeMirror</strong> is a versatile text editor
   implemented in JavaScript for the browser. It is specialized for
   editing code, and comes with a number of language modes and addons
-  that implement more advanced editing functionaly.</p>
+  that implement more advanced editing functionality.</p>
 
   <p>A rich <a href="doc/manual.html#api">programming API</a> and a
   CSS <a href="doc/manual.html#styling">theming</a> system are

From 6d184faf14344a62848c5871c1d39702b9f98c80 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Jan 2014 12:03:37 +0100
Subject: [PATCH 0898/4742] Enable some more IE workarounds in IE11

It seems that, though they changed their userAgent string
completely, they did keep most of their bugs.

Fixes copy/select-all from context menu.

Closes #1983
---
 lib/codemirror.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index dd94503084..0aeaed392f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -36,7 +36,7 @@ window.CodeMirror = (function() {
   if (opera_version && opera_version >= 15) { opera = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
   var flipCtrlCmd = mac && (qtwebkit || opera && (opera_version == null || opera_version < 12.11));
-  var captureMiddleClick = gecko || (old_ie && !ie_lt9);
+  var captureMiddleClick = gecko || (ie && !ie_lt9);
 
   // Optimize some code when these features are not used
   var sawReadOnlySpans = false, sawCollapsedSpans = false;
@@ -1990,7 +1990,7 @@ window.CodeMirror = (function() {
   // know one. These don't have to be accurate -- the result of them
   // being wrong would just be a slight flicker on the first wheel
   // scroll (if it is large enough).
-  if (old_ie) wheelPixelsPerUnit = -.53;
+  if (ie) wheelPixelsPerUnit = -.53;
   else if (gecko) wheelPixelsPerUnit = 15;
   else if (chrome) wheelPixelsPerUnit = -.7;
   else if (safari) wheelPixelsPerUnit = -1/3;
@@ -2241,7 +2241,7 @@ window.CodeMirror = (function() {
 
       // Try to detect the user choosing select-all
       if (display.input.selectionStart != null) {
-        if (!old_ie || ie_lt9) prepareSelectAllHack();
+        if (!ie || ie_lt9) prepareSelectAllHack();
         clearTimeout(detectingSelectAll);
         var i = 0, poll = function(){
           if (display.prevInput == "\u200b" && display.input.selectionStart == 0)
@@ -2253,7 +2253,7 @@ window.CodeMirror = (function() {
       }
     }
 
-    if (old_ie && !ie_lt9) prepareSelectAllHack();
+    if (ie && !ie_lt9) prepareSelectAllHack();
     if (captureMiddleClick) {
       e_stop(e);
       var mouseup = function() {
@@ -4515,7 +4515,7 @@ window.CodeMirror = (function() {
       builder.measure = line == realLine && measure;
       builder.pos = 0;
       builder.addToken = builder.measure ? buildTokenMeasure : buildToken;
-      if ((old_ie || webkit) && cm.getOption("lineWrapping"))
+      if ((ie || webkit) && cm.getOption("lineWrapping"))
         builder.addToken = buildTokenSplitSpaces(builder.addToken);
       var next = insertLineContent(line, builder, getLineStyles(cm, line));
       if (measure && line == realLine && !builder.measuredSomething) {

From bfa2a17efe10333f46a080b8cfd7a2479e472030 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Jan 2014 19:08:28 +0100
Subject: [PATCH 0899/4742] Focus the window when the editor is clicked

Prevents issue where the cursor blinks but an iframe is focused,
so typing doesn't end up in the editor.
---
 lib/codemirror.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0aeaed392f..8bcee1443c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1723,6 +1723,7 @@ window.CodeMirror = (function() {
     }
     if (clickInGutter(cm, e)) return;
     var start = posFromMouse(cm, e);
+    window.focus();
 
     switch (e_button(e)) {
     case 3:

From e77976b417eccab0a5f607c15a9e89770d9f8ede Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Jan 2014 11:28:06 +0100
Subject: [PATCH 0900/4742] [dialog addon] Add kludge for IE focus bug

Issue #2191
---
 addon/dialog/dialog.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 41d7bf8663..d21643490c 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -39,6 +39,7 @@
       CodeMirror.on(inp, "keydown", function(e) {
         if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
         if (e.keyCode == 13 || e.keyCode == 27) {
+          inp.blur();
           CodeMirror.e_stop(e);
           close();
           me.focus();

From 532c8f3a983b94957662169bc3cd06eb2dfd41b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Jan 2014 19:36:12 +0100
Subject: [PATCH 0901/4742] Revert attempt to fix issue #1196 by keeping text
 in textarea

The Android virtual keyboard is apparently not looking
at that (at least not in a sane way).
---
 lib/codemirror.js | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f6dbcb61a2..06a0434676 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -167,7 +167,7 @@
     // the amount of lines crosses a boundary that makes its width change)
     d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
     // See readInput and resetInput
-    clearInput(d);
+    d.prevInput = "";
     // Set to true when a non-horizontal-scrolling widget is added. As
     // an optimization, widget aligning is skipped when d is false.
     d.alignWidgets = false;
@@ -1779,7 +1779,7 @@
     ensureCursorVisible(cm);
     cm.curOp.updateInput = updateInput;
 
-    if (!text || text.length > 1000 || text.indexOf("\n") > -1) clearInput(cm.display);
+    if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
     else cm.display.prevInput = text;
     if (withOp) endOperation(cm);
     cm.state.pasteIncoming = cm.state.cutIncoming = false;
@@ -1798,23 +1798,12 @@
       if (cm.state.focused) selectInput(cm.display.input);
       if (old_ie && !ie_lt9) cm.display.inputHasSelection = content;
     } else if (user) {
-      clearInput(cm.display);
+      cm.display.prevInput = cm.display.input.value = "";
+      if (old_ie && !ie_lt9) cm.display.inputHasSelection = null;
     }
     cm.display.inaccurateSelection = minimal;
   }
 
-  function clearInput(display) {
-    var input = display.input;
-    if (!ie_lt9) {
-      display.prevInput = input.value = "_";
-      input.selectionStart = input.selectionEnd = 1;
-      if (input.selectionEnd == 0) display.prevInput = input.value = "";
-      if (old_ie) display.inputHasSelection = null;
-    } else {
-      display.prevInput = input.value = "";
-    }
-  }
-
   function focusInput(cm) {
     if (cm.options.readOnly != "nocursor" && (!mobile || document.activeElement != cm.display.input))
       cm.display.input.focus();
@@ -2543,7 +2532,7 @@
     resetInput(cm, true);
     // Adds "Select all" to context menu in FF
     var hasSelection = cm.somethingSelected();
-    if (!hasSelection) clearInput(cm.display);
+    if (!hasSelection) display.input.value = display.prevInput = " ";
 
     function prepareSelectAllHack() {
       if (display.input.selectionStart != null) {
@@ -3712,7 +3701,6 @@
       this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
         estimateLineHeights(this);
-      resetInput(this, true);
       signal(this, "refresh", this);
     }),
 

From f289321f6fd0a90cbafc304ea209b5dd5cada511 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Thu, 30 Jan 2014 11:12:31 -0800
Subject: [PATCH 0902/4742] [markdown mode] Rename `header2` -> `header-2`

and `formatting-header4` -> `formatting-header-4` for consistency.
---
 mode/markdown/markdown.js |  4 ++--
 mode/markdown/test.js     | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index da2ba93fea..ebb0f023e2 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -239,7 +239,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         styles.push(formatting + "-" + state.formatting[i]);
 
         if (state.formatting[i] === "header") {
-          styles.push(formatting + "-" + state.formatting[i] + state.header);
+          styles.push(formatting + "-" + state.formatting[i] + "-" + state.header);
         }
 
         // Add `formatting-quote` and `formatting-quote-#` for blockquotes
@@ -275,7 +275,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     if (state.code) { styles.push(code); }
 
-    if (state.header) { styles.push(header); styles.push(header + state.header); }
+    if (state.header) { styles.push(header); styles.push(header + "-" + state.header); }
 
     if (state.quote) {
       styles.push(quote);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 30e82ca654..c3016d3a6a 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -23,11 +23,11 @@
      "[comment&formatting&formatting-code ``][comment foo ` bar][comment&formatting&formatting-code ``]");
 
   FT("formatting_atxHeader",
-     "[header&header1&formatting&formatting-header&formatting-header1 #][header&header1  foo # bar ][header&header1&formatting&formatting-header&formatting-header1 #]");
+     "[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",
-     "[header&header1&formatting&formatting-header&formatting-header1 =]");
+     "[header&header-1&formatting&formatting-header&formatting-header-1 =]");
 
   FT("formatting_blockquote",
      "[quote&quote-1&formatting&formatting-quote&formatting-quote-1 > ][quote&quote-1 foo]");
@@ -138,31 +138,31 @@
   // http://daringfireball.net/projects/markdown/syntax#header
 
   MT("atxH1",
-     "[header&header1 # foo]");
+     "[header&header-1 # foo]");
 
   MT("atxH2",
-     "[header&header2 ## foo]");
+     "[header&header-2 ## foo]");
 
   MT("atxH3",
-     "[header&header3 ### foo]");
+     "[header&header-3 ### foo]");
 
   MT("atxH4",
-     "[header&header4 #### foo]");
+     "[header&header-4 #### foo]");
 
   MT("atxH5",
-     "[header&header5 ##### foo]");
+     "[header&header-5 ##### foo]");
 
   MT("atxH6",
-     "[header&header6 ###### foo]");
+     "[header&header-6 ###### foo]");
 
   // H6 - 7x '#' should still be H6, per Dingus
   // http://daringfireball.net/projects/markdown/dingus
   MT("atxH6NotH7",
-     "[header&header6 ####### foo]");
+     "[header&header-6 ####### foo]");
 
   // Inline styles should be parsed inside headers
   MT("atxH1inline",
-     "[header&header1 # foo ][header&header1&em *bar*]");
+     "[header&header-1 # foo ][header&header-1&em *bar*]");
 
   // Setext headers - H1, H2
   // Per documentation, "Any number of underlining =’s or -’s will work."
@@ -174,22 +174,22 @@
   // Check if single underlining = works
   MT("setextH1",
      "foo",
-     "[header&header1 =]");
+     "[header&header-1 =]");
 
   // Check if 3+ ='s work
   MT("setextH1",
      "foo",
-     "[header&header1 ===]");
+     "[header&header-1 ===]");
 
   // Check if single underlining - works
   MT("setextH2",
      "foo",
-     "[header&header2 -]");
+     "[header&header-2 -]");
 
   // Check if 3+ -'s work
   MT("setextH2",
      "foo",
-     "[header&header2 ---]");
+     "[header&header-2 ---]");
 
   // Single-line blockquote with trailing space
   MT("blockquoteSpace",
@@ -278,7 +278,7 @@
 
   // List after header
   MT("listAfterHeader",
-     "[header&header1 # foo]",
+     "[header&header-1 # foo]",
      "[variable-2 - bar]");
 
   // Formatting in lists (*)

From 15cb1644e649fbae31abff92bd1864fb2a0b916c Mon Sep 17 00:00:00 2001
From: Jonathan Malmaud <malmaud@gmail.com>
Date: Thu, 30 Jan 2014 19:15:31 -0500
Subject: [PATCH 0903/4742] [julia mode] Various improvements

---
 mode/julia/julia.js | 70 ++++++++++++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 9ec2428cd4..cc17eb0157 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -5,21 +5,22 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var operators = parserConf.operators || /^(?:\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|<:|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b|\.{3})/;
+  var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b/;
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
   var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/;
-  var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch"];
+  var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
   var blockClosers = ["end", "else", "elseif", "catch", "finally"];
   var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];
-  var builtinList = ['true', 'false', 'enumerate', 'open', 'close', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'UTF8String', 'ASCIIString', 'error', 'warn', 'info', '@printf'];
+  var builtinList = ['true', 'false', 'enumerate', 'open', 'close', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'UTF8String', 'ASCIIString', 'error', 'warn', 'info', '@printf'];
 
   //var stringPrefixes = new RegExp("^[br]?('|\")")
-  var stringPrefixes = /^[br]?('|"{3}|")/;
+  var stringPrefixes = /^(`|'|"{3}|([br]?"))/;
   var keywords = wordRegexp(keywordList);
   var builtins = wordRegexp(builtinList);
   var openers = wordRegexp(blockOpeners);
   var closers = wordRegexp(blockClosers);
-  var macro = /@[_A-Za-z][_A-Za-z0-9]*!*/;
+  var macro = /^@[_A-Za-z][_A-Za-z0-9]*/;
+  var symbol = /^:[_A-Za-z][_A-Za-z0-9]*/;
   var indentInfo = null;
 
   function in_array(state) {
@@ -43,14 +44,19 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   function tokenBase(stream, state) {
     // Handle scope changes
     var leaving_expr = state.leaving_expr;
+    if(stream.sol()) {
+      leaving_expr = false;
+    }
     state.leaving_expr = false;
     if(leaving_expr) {
       if(stream.match(/^'+/)) {
         return 'operator';
       }
-      if(stream.match("...")) {
-        return 'operator';
-      }
+
+    }
+
+    if(stream.match(/^\.{2,3}/)) {
+      return 'operator';
     }
 
     if (stream.eatSpace()) {
@@ -83,8 +89,12 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       state.leaving_expr=true;
     }
 
+    if(ch===')') {
+      state.leaving_expr = true;
+    }
+
     var match;
-    if(match=stream.match(openers, false)) {
+    if(!in_array(state) && (match=stream.match(openers, false))) {
       state.scopes.push(match);
     }
 
@@ -93,25 +103,29 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     }
 
     if(in_array(state)) {
-      if(stream.match("end")) {
+      if(stream.match(/^end/)) {
         return 'number';
       }
 
     }
-    if(stream.match("=>")) {
+
+    if(stream.match(/^=>/)) {
       return 'operator';
     }
+
+
     // Handle Number Literals
     if (stream.match(/^[0-9\.]/, false)) {
       var imMatcher = RegExp(/^im\b/);
       var floatLiteral = false;
       // Floats
-      if (stream.match(/^\d*\.\d+([ef][\+\-]?\d+)?/i)) { floatLiteral = true; }
-      if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
+      if (stream.match(/^\d*\.(?!\.)\d+([ef][\+\-]?\d+)?/i)) { floatLiteral = true; }
+      if (stream.match(/^\d+\.(?!\.)\d*/)) { floatLiteral = true; }
       if (stream.match(/^\.\d+/)) { floatLiteral = true; }
       if (floatLiteral) {
           // Float literals may be "imaginary"
           stream.match(imMatcher);
+          state.leaving_expr = true;
           return 'number';
       }
       // Integers
@@ -124,9 +138,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
       // Decimal
       if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
-          // 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.
@@ -134,21 +145,37 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       if (intLiteral) {
           // Integer literals may be "long"
           stream.match(imMatcher);
+          state.leaving_expr = true;
           return 'number';
       }
     }
 
+    if(stream.match(/^(::)|(<:)/)) {
+      return 'operator';
+    }
+
+    // Handle symbols
+    if(!leaving_expr && stream.match(symbol)) {
+      return 'string';
+    }
+
+    // Handle operators and Delimiters
+    if (stream.match(operators)) {
+      return 'operator';
+    }
+
+
     // Handle Strings
     if (stream.match(stringPrefixes)) {
       state.tokenize = tokenStringFactory(stream.current());
       return state.tokenize(stream, state);
     }
 
-    // Handle operators and Delimiters
-    if (stream.match(operators)) {
-      return 'operator';
+    if (stream.match(macro)) {
+      return 'meta';
     }
 
+
     if (stream.match(delimiters)) {
       return null;
     }
@@ -161,9 +188,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return 'builtin';
     }
 
-    if (stream.match(macro)) {
-      return 'meta';
-    }
 
     if (stream.match(identifiers)) {
       state.leaving_expr=true;
@@ -248,7 +272,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") {
         delta = -1;
       }
-      return (state.scopes.length + delta) * 2;
+      return (state.scopes.length + delta) * 4;
     },
 
     lineComment: "#",

From 500639591eb52626c315fd56c40a94a64015b3d1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Jan 2014 10:59:09 +0100
Subject: [PATCH 0904/4742] [closebrackets addon] Fix regression introducedy
 multi-cursor support

Closes #2205
---
 addon/edit/closebrackets.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 84b2fc56f1..100e82bebf 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -58,9 +58,10 @@
           var range = ranges[i], cur = range.head, curType;
           if (left == "'" && cm.getTokenTypeAt(cur) == "comment")
             return CodeMirror.Pass;
+          var next = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
           if (!range.empty())
             curType = "surround";
-          else if ((next = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1))) == right)
+          else if (left == right && next == right)
             curType = "skip";
           else if (left == right && CodeMirror.isWordChar(next))
             return CodeMirror.Pass;

From 837cf89b5cd781accae348d6ebd7ef675262ba1b Mon Sep 17 00:00:00 2001
From: Paul Ivanov <pi@berkeley.edu>
Date: Thu, 30 Jan 2014 22:26:19 -0800
Subject: [PATCH 0905/4742] [vim] fix Ctrl-[ (escape) shortcut for visual mode

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index e837ee4994..bf3bc67b31 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -74,7 +74,7 @@
     { keys: ['<S-BS>'], type: 'keyToKey', toKeys: ['b'] },
     { keys: ['<C-n>'], type: 'keyToKey', toKeys: ['j'] },
     { keys: ['<C-p>'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['C-['], type: 'keyToKey', toKeys: ['<Esc>'] },
+    { keys: ['<C-[>'], type: 'keyToKey', toKeys: ['<Esc>'] },
     { keys: ['<C-c>'], type: 'keyToKey', toKeys: ['<Esc>'] },
     { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'], context: 'normal' },
     { keys: ['s'], type: 'keyToKey', toKeys: ['x', 'i'], context: 'visual'},

From dcdc9f8fb005006ed20639487727907373ed967b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Jan 2014 13:04:00 +0100
Subject: [PATCH 0906/4742] Add support for undoing/redoing selection

---
 doc/manual.html    |  8 +++-
 lib/codemirror.js  | 92 ++++++++++++++++++++++++++++++++++------------
 test/multi_test.js | 18 +++++++++
 test/test.js       | 25 +++++++++++++
 4 files changed, 119 insertions(+), 24 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f13687214b..1e12151e30 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -331,7 +331,8 @@ <h2>Configuration</h2>
 
       <dt id="option_undoDepth"><code><strong>undoDepth</strong>: integer</code></dt>
       <dd>The maximum number of undo levels that the editor stores.
-      Defaults to 40.</dd>
+      Note that this includes selection change events. Defaults to
+      200.</dd>
 
       <dt id="option_historyEventDelay"><code><strong>historyEventDelay</strong>: integer</code></dt>
       <dd>The period of inactivity (in milliseconds) that will cause a
@@ -1209,6 +1210,11 @@ <h3 id="api_history">History-related methods</h3>
       <dt id="redo"><code><strong>doc.redo</strong>()</code></dt>
       <dd>Redo one undone edit.</dd>
 
+      <dt id="undoSelection"><code><strong>doc.undoSelection</strong>()</code></dt>
+      <dd>Undo one edit or selection change.</dd>
+      <dt id="redoSelection"><code><strong>doc.redoSelection</strong>()</code></dt>
+      <dd>Redo one undone edit or selection change.</dd>
+
       <dt id="historySize"><code><strong>doc.historySize</strong>() → {undo: integer, redo: integer}</code></dt>
       <dd>Returns an object with <code>{undo, redo}</code> properties,
       both of which hold integers, indicating the amount of stored
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 06a0434676..de06c6fa0e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2210,7 +2210,7 @@
             pos = clipPos(cm.doc, pos);
             var change = {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"};
             makeChange(cm.doc, change);
-            setSelectionAddToHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
+            setSelection(cm.doc, simpleSelection(pos, changeEnd(change)));
           }
         };
         reader.readAsText(file);
@@ -2691,16 +2691,26 @@
     });
   }
 
-  function makeChangeFromHistory(doc, type) {
+  function makeChangeFromHistory(doc, type, allowSelectionOnly) {
     if (doc.cm && doc.cm.state.suppressEdits) return;
 
-    var hist = doc.history;
-    var event = (type == "undo" ? hist.done : hist.undone).pop();
-    if (!event) return;
+    var hist = doc.history, event;
+    var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
+    addSelectionToHistory(doc, doc.sel, dest, NaN);
+    for (;;) {
+      event = source.pop();
+      if (!event) return;
+      if (event.ranges) {
+        dest.push(event);
+        if (allowSelectionOnly && !event.equals(doc.sel))
+          return setSelection(doc, event);
+      }
+      else break;
+    }
 
     var anti = {changes: [], selBefore: event.selAfter, selAfter: event.selBefore,
                 generation: hist.generation};
-    (type == "undo" ? hist.undone : hist.done).push(anti);
+    dest.push(anti);
     hist.generation = event.generation || ++hist.maxGeneration;
 
     var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
@@ -2709,7 +2719,7 @@
       var change = event.changes[i];
       change.origin = type;
       if (filter && !filterChange(doc, change, false)) {
-        (type == "undo" ? hist.done : hist.undone).length = 0;
+        source.length = 0;
         return;
       }
 
@@ -2904,12 +2914,6 @@
     setSelection(doc, simpleSelection(anchor, head), scroll);
   }
 
-  function setSelectionAddToHistory(doc, sel) {
-    setSelection(doc, sel);
-    var lstSel = lst(doc.history.done);
-    if (lstSel) lstSel.selAfter = sel;
-  }
-
   function filterSelectionChange(doc, sel) {
     var obj = {
       ranges: sel.ranges,
@@ -2940,6 +2944,7 @@
       doc.cm.curOp.userSelChange = true;
       ensureCursorVisible(doc.cm);
     }
+    addSelectionToHistory(doc, sel, doc.history.done, doc.cm ? doc.cm.curOp.id : NaN);
   }
 
   function setSelectionInner(doc, sel) {
@@ -3812,7 +3817,7 @@
   option("flattenSpans", true, resetModeState, true);
   option("addModeClass", false, resetModeState, true);
   option("pollInterval", 100);
-  option("undoDepth", 40, function(cm, val){cm.doc.history.undoDepth = val;});
+  option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
   option("historyEventDelay", 500);
   option("viewportMargin", 10, function(cm){cm.refresh();}, true);
   option("maxHighlightLength", 10000, resetModeState, true);
@@ -3981,6 +3986,8 @@
     },
     undo: function(cm) {cm.undo();},
     redo: function(cm) {cm.redo();},
+    undoSelection: function(cm) {cm.undoSelection();},
+    redoSelection: function(cm) {cm.redoSelection();},
     goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
     goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
     goLineStart: function(cm) {
@@ -4087,6 +4094,7 @@
     "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
     "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
     "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
+    "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
     fallthrough: "basic"
   };
   keyMap.macDefault = {
@@ -4096,6 +4104,7 @@
     "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
     "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
     "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delLineLeft",
+    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection",
     fallthrough: ["basic", "emacsy"]
   };
   keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
@@ -5399,7 +5408,7 @@
       var top = Pos(this.first, 0), last = this.first + this.size - 1;
       makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
                         text: splitLines(code), origin: "setValue"}, true);
-      setSelectionAddToHistory(this, simpleSelection(top));
+      setSelection(this, simpleSelection(top));
     }),
     replaceRange: function(code, from, to, origin) {
       from = clipPos(this, from);
@@ -5501,17 +5510,21 @@
       var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
       for (var i = changes.length - 1; i >= 0; i--)
         makeChange(this, changes[i]);
-      if (newSel) setSelectionAddToHistory(this, newSel);
+      if (newSel) setSelection(this, newSel);
       else if (this.cm) ensureCursorVisible(this.cm);
     },
     undo: docOperation(function() {makeChangeFromHistory(this, "undo");}),
     redo: docOperation(function() {makeChangeFromHistory(this, "redo");}),
+    undoSelection: docOperation(function() {makeChangeFromHistory(this, "undo", true);}),
+    redoSelection: docOperation(function() {makeChangeFromHistory(this, "redo", true);}),
 
     setExtending: function(val) {this.extend = val;},
 
     historySize: function() {
-      var hist = this.history;
-      return {undo: hist.done.length, redo: hist.undone.length};
+      var hist = this.history, done = 0, undone = 0;
+      for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done;
+      for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
+      return {undo: done, redo: undone};
     },
     clearHistory: function() {this.history = makeHistory(this.history.maxGeneration);},
 
@@ -5797,16 +5810,24 @@
     return histChange;
   }
 
+  function lastChangeEvent(hist) {
+    for (;;) {
+      var last = lst(hist.done);
+      if (last && last.ranges) hist.done.pop();
+      else return last;
+    }
+  }
+
   function addToHistory(doc, change, selAfter, opId) {
     var hist = doc.history;
     hist.undone.length = 0;
-    var time = +new Date, cur = lst(hist.done);
+    var time = +new Date, cur;
 
-    if (cur &&
-        (hist.lastOp == opId ||
+    if ((hist.lastOp == opId ||
          hist.lastOrigin == change.origin && change.origin &&
          ((change.origin.charAt(0) == "+" && doc.cm && hist.lastTime > time - doc.cm.options.historyEventDelay) ||
-          change.origin.charAt(0) == "*"))) {
+          change.origin.charAt(0) == "*")) &&
+        (cur = lastChangeEvent(hist))) {
       // Merge this change into the last event
       var last = lst(cur.changes);
       if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
@@ -5835,6 +5856,21 @@
     if (!last) signal(doc, "historyAdded");
   }
 
+  function addSelectionToHistory(doc, cur, dest, opId) {
+    var prev = lst(dest);
+    if (prev && !prev.ranges) {
+      if (doc.history.lastOp == opId)
+        prev.selAfter = cur;
+      else
+        dest.push(cur);
+    } else if (dest.length < 2 || prev.ranges.length != cur.ranges.length ||
+               cur.somethingSelected() != prev.somethingSelected()) {
+      dest.push(cur);
+    } else {
+      dest[dest.length - 1] = cur;
+    }
+  }
+
   function removeClearedSpans(spans) {
     if (!spans) return null;
     for (var i = 0, out; i < spans.length; ++i) {
@@ -5863,7 +5899,12 @@
   // detaching a document, to split the history in two
   function copyHistoryArray(events, newGroup, instantiateSel) {
     for (var i = 0, copy = []; i < events.length; ++i) {
-      var event = events[i], changes = event.changes, newChanges = [];
+      var event = events[i];
+      if (event.ranges) {
+        copy.push(copyHistorySel(event, instantiateSel));
+        continue;
+      }
+      var changes = event.changes, newChanges = [];
       copy.push({changes: newChanges,
                  selBefore: copyHistorySel(event.selBefore, instantiateSel),
                  selAfter: copyHistorySel(event.selAfter, instantiateSel)});
@@ -5908,6 +5949,11 @@
   function rebaseHistArray(array, from, to, diff) {
     for (var i = 0; i < array.length; ++i) {
       var sub = array[i], ok = true;
+      if (sub.ranges) {
+        if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
+        rebaseHistSel(sub, from, to, diff);
+        continue;
+      }
       for (var j = 0; j < sub.changes.length; ++j) {
         var cur = sub.changes[j];
         if (to < cur.from.line) {
diff --git a/test/multi_test.js b/test/multi_test.js
index b159ab058d..6b5b1df821 100644
--- a/test/multi_test.js
+++ b/test/multi_test.js
@@ -264,4 +264,22 @@
     cm.execCommand("goDocEnd");
     hasSelections(cm, 1, 1, 1, 3);
   }, {value: "abc\ndef"});
+
+  testCM("selectionHistory", function(cm) {
+    for (var i = 0; i < 3; ++i)
+      cm.addSelection(Pos(0, i * 2), Pos(0, i * 2 + 1));
+    cm.execCommand("undoSelection");
+    eq(cm.getSelection(), "1\n2");
+    cm.execCommand("undoSelection");
+    eq(cm.getSelection(), "1");
+    cm.execCommand("undoSelection");
+    eq(cm.getSelection(), "");
+    eqPos(cm.getCursor(), Pos(0, 0));
+    cm.execCommand("redoSelection");
+    eq(cm.getSelection(), "1");
+    cm.execCommand("redoSelection");
+    eq(cm.getSelection(), "1\n2");
+    cm.execCommand("redoSelection");
+    eq(cm.getSelection(), "1\n2\n3");
+  }, {value: "1 2 3"});
 })();
diff --git a/test/test.js b/test/test.js
index 25e2b5ab37..b975c99fd7 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1712,3 +1712,28 @@ testCM("helpers", function(cm) {
   cm.setOption("mode", "javascript");
   eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "");
 });
+
+testCM("selectionHistory", function(cm) {
+  for (var i = 0; i < 3; i++) {
+    cm.setExtending(true);
+    cm.execCommand("goCharRight");
+    cm.setExtending(false);
+    cm.execCommand("goCharRight");
+    cm.execCommand("goCharRight");
+  }
+  cm.execCommand("undoSelection");
+  eq(cm.getSelection(), "c");
+  cm.execCommand("undoSelection");
+  eq(cm.getSelection(), "");
+  eqPos(cm.getCursor(), Pos(0, 4));
+  cm.execCommand("undoSelection");
+  eq(cm.getSelection(), "b");
+  cm.execCommand("redoSelection");
+  eq(cm.getSelection(), "");
+  eqPos(cm.getCursor(), Pos(0, 4));
+  cm.execCommand("redoSelection");
+  eq(cm.getSelection(), "c");
+  cm.execCommand("redoSelection");
+  eq(cm.getSelection(), "");
+  eqPos(cm.getCursor(), Pos(0, 6));
+}, {value: "a b c d"});

From c78da36faa35aa12a4f042a46d17dae6cd904721 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Jan 2014 13:27:38 +0100
Subject: [PATCH 0907/4742] Add a findMarks method

Closes #2200
---
 doc/manual.html   |  3 +++
 lib/codemirror.js | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 1e12151e30..25db83a140 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1343,6 +1343,9 @@ <h3 id="api_marker">Text-marking methods</h3>
         to the left instead.</dd>
       </dl></dd>
 
+      <dt id="findMarks"><code><strong>doc.findMarks</strong>(from: {line, ch}, to: {line, ch}) → array&lt;TextMarker&gt;</code></dt>
+      <dd>Returns an array of all the bookmarks and marked ranges
+      found between the given positions.</dd>
       <dt id="findMarksAt"><code><strong>doc.findMarksAt</strong>(pos: {line, ch}) → array&lt;TextMarker&gt;</code></dt>
       <dd>Returns an array of all the bookmarks and marked ranges
       present at the given position.</dd>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index de06c6fa0e..25d385a964 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5571,6 +5571,22 @@
       }
       return markers;
     },
+    findMarks: function(from, to) {
+      from = clipPos(this, from); to = clipPos(this, to);
+      var found = [], lineNo = from.line;
+      this.iter(from.line, to.line + 1, function(line) {
+        var spans = line.markedSpans;
+        if (spans) for (var i = 0; i < spans.length; i++) {
+          var span = spans[i];
+          if (!(lineNo == from.line && from.ch > span.to ||
+                span.from == null && lineNo != from.line||
+                lineNo == to.line && span.from > to.ch))
+            found.push(span.marker.parent || span.marker);
+        }
+        ++lineNo;
+      });
+      return found;
+    },
     getAllMarks: function() {
       var markers = [];
       this.iter(function(line) {

From 6aff0a6bdd07f3a8dd387b65fadb8682a29d9f14 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Jan 2014 16:39:01 +0100
Subject: [PATCH 0908/4742] Fix charWidth to give accurate, fractional result

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 25d385a964..b7a4ea9318 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1463,10 +1463,10 @@
 
   function charWidth(display) {
     if (display.cachedCharWidth != null) return display.cachedCharWidth;
-    var anchor = elt("span", "x");
+    var anchor = elt("span", "xxxxxxxxxx");
     var pre = elt("pre", [anchor]);
     removeChildrenAndAdd(display.measure, pre);
-    var width = anchor.offsetWidth;
+    var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
     if (width > 2) display.cachedCharWidth = width;
     return width || 10;
   }

From f35fd4e2844925da1cabc7442595912269384bc1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Jan 2014 17:02:01 +0100
Subject: [PATCH 0909/4742] Optimize countColumn and findColumn

---
 lib/codemirror.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b7a4ea9318..37ac285321 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6123,16 +6123,27 @@
       end = string.search(/[^\s\u00a0]/);
       if (end == -1) end = string.length;
     }
-    for (var i = startIndex || 0, n = startValue || 0; i < end; ++i) {
-      if (string.charAt(i) == "\t") n += tabSize - (n % tabSize);
-      else ++n;
+    for (var i = startIndex || 0, n = startValue || 0;;) {
+      var nextTab = string.indexOf("\t", i);
+      if (nextTab < 0 || nextTab >= end)
+        return n + (end - i);
+      n += nextTab - i;
+      n += tabSize - (n % tabSize);
+      i = nextTab + 1;
     }
-    return n;
   };
   function findColumn(string, goal, tabSize) {
-    for (var pos = 0, col = 0; col < goal && pos < string.length; pos++)
-      col += string.charAt(pos) == "\t" ? tabSize - (col % tabSize) : 1;
-    return pos;
+    for (var pos = 0, col = 0;;) {
+      var nextTab = string.indexOf("\t", pos);
+      if (nextTab == -1) nextTab = string.length;
+      var skipped = nextTab - pos;
+      if (nextTab == string.length || col + skipped >= goal)
+        return pos + Math.min(skipped, goal - col);
+      col += nextTab - pos;
+      col += tabSize - (col % tabSize);
+      pos = nextTab + 1;
+      if (col >= goal) return pos;
+    }
   }
 
   var spaceStrs = [""];

From 5df3bcc403b3242494c214a52b7629309db40fbe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Jan 2014 17:59:30 +0100
Subject: [PATCH 0910/4742] [test driver] Sanitize skipping tests

---
 test/driver.js | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index c5d15c9904..f073f4909b 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -44,23 +44,25 @@ function testCM(name, run, opts, expectedFail) {
 function runTests(callback) {
   var totalTime = 0;
   function step(i) {
-    if (i === tests.length){
-      running = false;
-      return callback("done");
-    } 
-    var test = tests[i], expFail = test.expectedFail, startTime = +new Date;
-    if (filters.length) {
-      for (var j = 0; j < filters.length; j++) {
-        if (test.name.match(filters[j])) {
-          break;
-        }
+    for (;;) {
+      if (i === tests.length) {
+        running = false;
+        return callback("done");
+      }
+      var test = tests[i], skip = false;
+      if (filters.length) {
+        skip = true;
+        for (var j = 0; j < filters.length; j++)
+          if (test.name.match(filters[j])) skip = false;
       }
-      if (j == filters.length) {      
+      if (skip) {
         callback("skipped", test.name, message);
-        return step(i + 1);
+        i++;
+      } else {
+        break;
       }
     }
-    var threw = false;
+    var expFail = test.expectedFail, startTime = +new Date, threw = false;
     try {
       var message = test.func();
     } catch(e) {

From 396e722d12a63fa04012f12fd8306bd005b17b05 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Jan 2014 19:07:14 +0100
Subject: [PATCH 0911/4742] Make alt-drag deal properly with tabs

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 37ac285321..c0814bda95 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1958,9 +1958,11 @@
     // Fails unpredictably on IE[67] when mouse is dragged around quickly.
     try { x = e.clientX - space.left; y = e.clientY - space.top; }
     catch (e) { return null; }
-    var coords = coordsChar(cm, x, y);
-    if (forRect && coords.ch == getLine(cm.doc, coords.line).text.length && coords.xRel == 1)
-      coords = Pos(coords.line, Math.round((x - paddingLeft(cm.display)) / charWidth(cm.display)));
+    var coords = coordsChar(cm, x, y), line;
+    if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
+      var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
+      coords = Pos(coords.line, Math.round((x - paddingLeft(cm.display)) / charWidth(cm.display)) - colDiff);
+    }
     return coords;
   }
 
@@ -2080,7 +2082,7 @@
           var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
           if (left == right)
             ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)));
-          else if (text && text.length >= leftPos)
+          else if (text.length > leftPos)
             ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
         }
         if (!ranges.length) ranges.push(new Range(start, start));

From 5a0ebbe2f2898da7667b9757b64415052ac0017c Mon Sep 17 00:00:00 2001
From: Billy Moon <billy@itaccess.org>
Date: Sun, 2 Feb 2014 23:08:59 +0000
Subject: [PATCH 0912/4742] use correct classes for headers

The header classes for specific levels of headers, which should set the size of each header did not match the classes in the editor. This commit fixes that.
---
 demo/variableheight.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/demo/variableheight.html b/demo/variableheight.html
index ab241c6d28..98f2fd29d0 100644
--- a/demo/variableheight.html
+++ b/demo/variableheight.html
@@ -11,12 +11,12 @@
 <style type="text/css">
       .CodeMirror {border: 1px solid silver; border-width: 1px 2px; }
       .cm-header { font-family: arial; }
-      .cm-header1 { font-size: 150%; }
-      .cm-header2 { font-size: 130%; }
-      .cm-header3 { font-size: 120%; }
-      .cm-header4 { font-size: 110%; }
-      .cm-header5 { font-size: 100%; }
-      .cm-header6 { font-size: 90%; }
+      .cm-header-1 { font-size: 150%; }
+      .cm-header-2 { font-size: 130%; }
+      .cm-header-3 { font-size: 120%; }
+      .cm-header-4 { font-size: 110%; }
+      .cm-header-5 { font-size: 100%; }
+      .cm-header-6 { font-size: 90%; }
       .cm-strong { font-size: 140%; }
     </style>
 <div id=nav>

From 53df1102acc3e5047fdba5c0df86b258aad55e86 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Feb 2014 10:50:31 +0100
Subject: [PATCH 0913/4742] [show-hint addon] Don't cover cursor when taking up
 full screen height

Closes #2213
---
 addon/hint/show-hint.js | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 7e03d1139a..fa2ab6a89e 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -193,8 +193,24 @@
     var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
     var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
     (options.container || document.body).appendChild(hints);
-    var box = hints.getBoundingClientRect();
-    var overlapX = box.right - winW, overlapY = box.bottom - winH;
+    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
+    if (overlapY > 0) {
+      var height = box.bottom - box.top, curTop = box.top - (pos.bottom - pos.top);
+      if (curTop - height > 0) { // Fits above cursor
+        hints.style.top = (top = curTop - height) + "px";
+        below = false;
+      } else if (height > winH) {
+        hints.style.height = (winH - 5) + "px";
+        hints.style.top = (top = pos.bottom - box.top) + "px";
+        var cursor = cm.getCursor();
+        if (data.from.ch != cursor.ch) {
+          pos = cm.cursorCoords(cursor);
+          hints.style.left = (left = pos.left) + "px";
+          box = hints.getBoundingClientRect();
+        }
+      }
+    }
+    var overlapX = box.left - winW;
     if (overlapX > 0) {
       if (box.right - box.left > winW) {
         hints.style.width = (winW - 5) + "px";
@@ -202,17 +218,6 @@
       }
       hints.style.left = (left = pos.left - overlapX) + "px";
     }
-    if (overlapY > 0) {
-      var height = box.bottom - box.top;
-      if (box.top - (pos.bottom - pos.top) - height > 0) {
-        overlapY = height + (pos.bottom - pos.top);
-        below = false;
-      } else if (height > winH) {
-        hints.style.height = (winH - 5) + "px";
-        overlapY -= height - winH;
-      }
-      hints.style.top = (top = pos.bottom - overlapY) + "px";
-    }
 
     cm.addKeyMap(this.keyMap = buildKeyMap(options, {
       moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },

From 17734419506fcac52a5f380f54287c590d32e8cc Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Sun, 2 Feb 2014 17:47:18 +0100
Subject: [PATCH 0914/4742] expose full completion data to extraKeys in show
 hints.

---
 addon/hint/show-hint.js | 3 ++-
 doc/manual.html         | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index fa2ab6a89e..00aadc575e 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -225,7 +225,8 @@
       menuSize: function() { return widget.screenAmount(); },
       length: completions.length,
       close: function() { completion.close(); },
-      pick: function() { widget.pick(); }
+      pick: function() { widget.pick(); },
+      data: data
     }));
 
     if (options.closeOnUnfocus !== false) {
diff --git a/doc/manual.html b/doc/manual.html
index 67198b1f15..8ebfeefeba 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2110,7 +2110,11 @@ <h2>Addons</h2>
         has <code>moveFocus(n)</code>, <code>setFocus(n)</code>, <code>pick()</code>,
         and <code>close()</code> methods (see the source for details),
         that can be used to change the focused element, pick the
-        current element or close the menu.</dd>
+        current element or close the menu. Additionnaly <code>menuSize()</code>
+        can give you access to the size of the current dropdown menu,
+        <code>length</code> give you the number of availlable completions, and
+        <code>data</code> give you full access to the completion returned by the
+        hinting function.</dd>
         <dt><code><strong>extraKeys</strong>: keymap</code></dt>
         <dd>Like <code>customKeys</code> above, but the bindings will
         be added to the set of default bindings, instead of replacing

From a497336cbf892d330cc1d5fa1e4ac68fbfc4b74b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Feb 2014 11:18:25 +0100
Subject: [PATCH 0915/4742] Fix highlightWorker to actually perform work

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c0814bda95..397e608477 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1030,7 +1030,7 @@
     var end = +new Date + cm.options.workTime;
     var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
 
-    operation(cm, function() {
+    runInOp(cm, function() {
     doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
       if (doc.frontier >= cm.display.viewFrom) { // Visible
         var oldStyles = line.styles;

From bed5c81881bb0b106579e47352113136ac5a0ee9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Feb 2014 11:21:24 +0100
Subject: [PATCH 0916/4742] Fix another case of bootstrap blues

(Border-sizing on the CodeMirror-linenumber class)

Issue #2210
---
 lib/codemirror.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 23eaf74d44..3df9948513 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -36,6 +36,8 @@
   min-width: 20px;
   text-align: right;
   color: #999;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
 }
 
 /* CURSOR */

From 5581979d2c624d6c32342e50bb417749ad799ee7 Mon Sep 17 00:00:00 2001
From: Amsul <reach@amsul.ca>
Date: Fri, 31 Jan 2014 11:20:08 -0500
Subject: [PATCH 0917/4742] [runmode addon] Fixed resolveMode in runmode.node

This fix has been modelled after the getMode function in runmode.node in
v3.20.0
---
 addon/runmode/runmode.node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 870b9ea5df..ecb2ea56f1 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -92,7 +92,7 @@ exports.resolveMode = function(spec) {
   else return spec || {name: "null"};
 };
 exports.getMode = function(options, spec) {
-  spec = exports.resolveMode(mimeModes[spec]);
+  spec = exports.resolveMode(spec);
   var mfactory = modes[spec.name];
   if (!mfactory) throw new Error("Unknown mode: " + spec);
   return mfactory(options, spec);

From 26eabb06ab44ab2c7cbff9598bc4b74cccae2213 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Feb 2014 17:02:42 +0100
Subject: [PATCH 0918/4742] Documentation pass, part 1 (up to updateDisplay)

---
 lib/codemirror.js | 255 +++++++++++++++++++++++++++++-----------------
 1 file changed, 160 insertions(+), 95 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 397e608477..cfc4dcf2fc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1,3 +1,9 @@
+// This is CodeMirror (http://codemirror.net), a code editor
+// implemented in JavaScript on top of the browser's DOM.
+//
+// You can find some technical background for some of the code below
+// at http://marijnhaverbeke.nl/blog/#cm-internals .
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     module.exports = mod();
@@ -10,16 +16,16 @@
 
   // BROWSER SNIFFING
 
-  // Crude, but necessary to handle a number of hard-to-feature-detect
-  // bugs and behavior differences.
+  // Kludges for bugs and behavior differences that can't be feature
+  // detected are enabled based on userAgent etc sniffing.
+
   var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  // old_ie refers to any Internet Explorer before 11 (which has
-  // almost none of the same bugs as earlier versions).
-  var old_ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt8 = old_ie && (document.documentMode == null || document.documentMode < 8);
-  var ie_lt9 = old_ie && (document.documentMode == null || document.documentMode < 9);
-  var ie_gt10 = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
-  var ie = old_ie || ie_gt10;
+  // ie_uptoN means Internet Explorer version N or lower
+  var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
+  var ie_upto7 = ie_upto10 && (document.documentMode == null || document.documentMode < 8);
+  var ie_upto8 = ie_upto10 && (document.documentMode == null || document.documentMode < 9);
+  var ie_11up = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
+  var ie = ie_upto10 || ie_11up;
   var webkit = /WebKit\//.test(navigator.userAgent);
   var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
   var chrome = /Chrome\//.test(navigator.userAgent);
@@ -41,126 +47,153 @@
   if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
   var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
-  var captureRightClick = gecko || (ie && !ie_lt9);
+  var captureRightClick = gecko || (ie && !ie_upto8);
 
-  // Optimize some code when these features are not used
+  // Optimize some code when these features are not used.
   var sawReadOnlySpans = false, sawCollapsedSpans = false;
 
-  // CONSTRUCTOR
+  // EDITOR CONSTRUCTOR
+
+  // A CodeMirror instance represents an editor. This is the object
+  // that user code is usually dealing with.
 
   function CodeMirror(place, options) {
     if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
 
     this.options = options = options || {};
     // Determine effective options based on given values and defaults.
-    for (var opt in defaults) if (!options.hasOwnProperty(opt) && defaults.hasOwnProperty(opt))
+    for (var opt in defaults) if (!options.hasOwnProperty(opt))
       options[opt] = defaults[opt];
     setGuttersForLineNumbers(options);
 
     var docStart = typeof options.value == "string" ? 0 : options.value.first;
-    var display = this.display = makeDisplay(place, docStart);
+    var display = this.display = new Display(place, docStart);
     display.wrapper.CodeMirror = this;
     updateGutters(this);
-    if (options.autofocus && !mobile) focusInput(this);
-
-    this.state = {keyMaps: [],
-                  overlays: [],
-                  modeGen: 0,
-                  overwrite: false, focused: false,
-                  suppressEdits: false,
-                  pasteIncoming: false, cutIncoming: false,
-                  draggingText: false,
-                  highlight: new Delayed()};
-
     themeChanged(this);
     if (options.lineWrapping)
       this.display.wrapper.className += " CodeMirror-wrap";
+    if (options.autofocus && !mobile) focusInput(this);
+
+    this.state = {
+      keyMaps: [],  // stores maps added by addKeyMap
+      overlays: [], // highlighting overlays, as added by addOverlay
+      modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
+      overwrite: false, focused: false,
+      suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
+      pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in readInput
+      draggingText: false,
+      highlight: new Delayed() // stores highlight worker timeout
+    };
 
     var doc = options.value;
     if (typeof doc == "string") doc = new Doc(doc, options.mode);
 
     // Override magic textarea content restore that IE sometimes does
     // on our hidden textarea on reload
-    if (old_ie) setTimeout(bind(resetInput, this, true), 20);
+    if (ie_upto10) setTimeout(bind(resetInput, this, true), 20);
 
     registerEventHandlers(this);
 
     operation(this, function() {
       attachDoc(this, doc);
 
-      // IE throws unspecified error in certain cases, when
-      // trying to access activeElement before onload
-      var hasFocus; try { hasFocus = (document.activeElement == display.input); } catch(e) { }
-      if (hasFocus || (options.autofocus && !mobile)) setTimeout(bind(onFocus, this), 20);
-      else onBlur(this);
+      if ((options.autofocus && !mobile) || activeElt() == display.input)
+        setTimeout(bind(onFocus, this), 20);
+      else
+        onBlur(this);
 
-      for (var opt in optionHandlers)
-        if (optionHandlers.propertyIsEnumerable(opt))
-          optionHandlers[opt](this, options[opt], Init);
+      for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
+        optionHandlers[opt](this, options[opt], Init);
       for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
     })();
   }
 
   // DISPLAY CONSTRUCTOR
 
-  function makeDisplay(place, docStart) {
-    var d = {};
+  // The display handles the DOM integration, both for input reading
+  // and content drawing. It holds references to DOM nodes and
+  // display-related state.
 
+  function Display(place, docStart) {
+    var d = this;
+
+    // The semihidden textarea that is focused when the editor is
+    // focused, and receives input.
     var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none; font-size: 4px;");
+    // The textarea is kept positioned near the cursor to prevent the
+    // fact that it'll be scrolled into view on input from scrolling
+    // our fake cursor out of view. On webkit, when wrap=off, paste is
+    // very slow. So make the area wide instead.
     if (webkit) input.style.width = "1000px";
     else input.setAttribute("wrap", "off");
-    // if border: 0; -- iOS fails to open keyboard (issue #1287)
+    // If border: 0; -- iOS fails to open keyboard (issue #1287)
     if (ios) input.style.border = "1px solid black";
     input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off"); input.setAttribute("spellcheck", "false");
 
     // Wraps and hides input textarea
     d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The actual fake scrollbars.
+    // The fake scrollbar elements.
     d.scrollbarH = elt("div", [elt("div", null, null, "height: 1px")], "CodeMirror-hscrollbar");
     d.scrollbarV = elt("div", [elt("div", null, null, "width: 1px")], "CodeMirror-vscrollbar");
+    // Covers bottom-right square when both scrollbars are present.
     d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
+    // Covers bottom of gutter when coverGutterNextToScrollbar is on
+    // and h scrollbar is present.
     d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
-    // DIVs containing the selection and the actual code
+    // Will contain the actual code, positioned to cover the viewport.
     d.lineDiv = elt("div", null, "CodeMirror-code");
+    // Elements are added to these to represent selection and cursors.
     d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
     d.cursorDiv = elt("div", null, "CodeMirror-cursors");
-    // Used to measure text size
+    // A visibility: hidden element used to find the size of things.
     d.measure = elt("div", null, "CodeMirror-measure");
+    // When lines outside of the viewport are measured, they are drawn in this.
     d.lineMeasure = elt("div", null, "CodeMirror-measure");
     // Wraps everything that needs to exist inside the vertically-padded coordinate system
     d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.lineDiv, d.cursorDiv],
                       null, "position: relative; outline: none");
-    // Moved around its parent to cover visible view
+    // Moved around its parent to cover visible view.
     d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
-    // Set to the height of the text, causes scrolling
+    // Set to the height of the document, allowing scrolling.
     d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
-    // D is needed because behavior of elts with overflow: auto and padding is inconsistent across browsers
+    // Behavior of elts with overflow: auto and padding is
+    // inconsistent across browsers. This is used to ensure the
+    // scrollable area is big enough.
     d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerCutOff + "px; width: 1px;");
-    // Will contain the gutters, if any
+    // Will contain the gutters, if any.
     d.gutters = elt("div", null, "CodeMirror-gutters");
     d.lineGutter = null;
-    // Provides scrolling
+    // Actual scrollable element.
     d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
     d.scroller.setAttribute("tabIndex", "-1");
     // The element in which the editor lives.
     d.wrapper = elt("div", [d.inputDiv, d.scrollbarH, d.scrollbarV,
                             d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
-    // Work around IE7 z-index bug
-    if (ie_lt8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-    if (place.appendChild) place.appendChild(d.wrapper); else place(d.wrapper);
 
+    // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
+    if (ie_upto7) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
     // Needed to hide big blue blinking cursor on Mobile Safari
     if (ios) input.style.width = "0px";
     if (!webkit) d.scroller.draggable = true;
     // Needed to handle Tab key in KHTML
     if (khtml) { d.inputDiv.style.height = "1px"; d.inputDiv.style.position = "absolute"; }
     // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    else if (ie_lt8) d.scrollbarH.style.minWidth = d.scrollbarV.style.minWidth = "18px";
+    if (ie_upto7) d.scrollbarH.style.minHeight = d.scrollbarV.style.minWidth = "18px";
+
+    if (place.appendChild) place.appendChild(d.wrapper);
+    else place(d.wrapper);
 
-    // Current visible range (may be bigger than the view window).
-    d.viewOffset = d.lastSizeC = 0;
+    // Current rendered range (may be bigger than the view window).
     d.viewFrom = d.viewTo = docStart;
+    // Information about the rendered lines.
     d.view = [];
+    // Holds info about a single rendered line when it was rendered
+    // for measurement, while not in view.
+    d.externalMeasured = null;
+    // Empty space (in pixels) above the view
+    d.viewOffset = 0;
+    d.lastSizeC = 0;
     d.updateLineNumbers = null;
 
     // Used to only resize the line number gutter when necessary (when
@@ -168,12 +201,13 @@
     d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
     // See readInput and resetInput
     d.prevInput = "";
-    // Set to true when a non-horizontal-scrolling widget is added. As
-    // an optimization, widget aligning is skipped when d is false.
+    // Set to true when a non-horizontal-scrolling line widget is
+    // added. As an optimization, line widget aligning is skipped when
+    // this is false.
     d.alignWidgets = false;
-    // Flag that indicates whether we currently expect input to appear
-    // (after some event like 'keypress' or 'input') and are polling
-    // intensively.
+    // Flag that indicates whether we expect input to appear real soon
+    // now (after some event like 'keypress' or 'input') and are
+    // polling intensively.
     d.pollingFast = false;
     // Self-resetting timeout for the poller
     d.poll = new Delayed();
@@ -181,7 +215,7 @@
     d.cachedCharWidth = d.cachedTextHeight = null;
 
     // Tracks when resetInput has punted to just putting a short
-    // string instead of the (large) selection.
+    // string into the textarea instead of the full selection.
     d.inaccurateSelection = false;
 
     // Tracks the maximum line length so that the horizontal scrollbar
@@ -193,11 +227,8 @@
     // Used for measuring wheel scrolling granularity
     d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
 
+    // True when shift is held down.
     d.shift = false;
-
-    d.externalMeasured = null;
-
-    return d;
   }
 
   // STATE UPDATES
@@ -234,6 +265,9 @@
     setTimeout(function(){updateScrollbars(cm);}, 100);
   }
 
+  // Returns a function that estimates the height of a line, to use as
+  // first approximation until the line becomes visible (and is thus
+  // properly measurable).
   function estimateHeight(cm) {
     var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
     var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
@@ -273,6 +307,8 @@
     setTimeout(function(){alignHorizontally(cm);}, 20);
   }
 
+  // Rebuild the gutter elements, ensure the margin to the left of the
+  // code matches their width.
   function updateGutters(cm) {
     var gutters = cm.display.gutters, specs = cm.options.gutters;
     removeChildren(gutters);
@@ -290,6 +326,9 @@
     if (i) cm.display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0;
   }
 
+  // Compute the character length of a line, taking into account
+  // collapsed ranges (see markText) that might hide parts, and join
+  // other lines onto it.
   function lineLength(line) {
     if (line.height == 0) return 0;
     var len = line.text.length, merged, cur = line;
@@ -308,6 +347,7 @@
     return len;
   }
 
+  // Find the longest line in the document.
   function computeMaxLength(cm) {
     var d = cm.display, doc = cm.doc;
     d.maxLine = getLine(doc, doc.first);
@@ -336,6 +376,8 @@
 
   // SCROLLBARS
 
+  // Prepare DOM reads needed to update the scrollbars. Done in one
+  // shot to minimize update/measure roundtrips.
   function measureForScrollbars(cm) {
     var scroll = cm.display.scroller;
     return {
@@ -348,7 +390,7 @@
   }
 
   // Re-synchronize the fake scrollbars with the actual size of the
-  // content. Optionally force a scrollTop.
+  // content.
   function updateScrollbars(cm, measure) {
     if (!measure) measure = measureForScrollbars(cm);
     var d = cm.display, docHeight = cm.doc.height;
@@ -393,7 +435,9 @@
     }
   }
 
-  // viewPort may contain top, height, and ensure (see op.scrollToPos) properties
+  // Compute the lines that are visible in a given viewport (defaults
+  // the the current scroll position). viewPort may contain top,
+  // height, and ensure (see op.scrollToPos) properties.
   function visibleLines(display, doc, viewPort) {
     var top = viewPort && viewPort.top != null ? viewPort.top : display.scroller.scrollTop;
     var height = viewPort && viewPort.height || display.wrapper.clientHeight;
@@ -401,6 +445,8 @@
     var bottom = Math.ceil(top + height);
 
     var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
+    // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
+    // forces those lines into the viewport (if possible).
     if (viewPort && viewPort.ensure) {
       var ensureFrom = viewPort.ensure.from.line, ensureTo = viewPort.ensure.to.line;
       if (ensureFrom < from)
@@ -415,6 +461,8 @@
 
   // LINE NUMBERS
 
+  // Re-align line numbers and gutter marks to compensate for
+  // horizontal scrolling.
   function alignHorizontally(cm) {
     var display = cm.display, view = display.view;
     if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
@@ -431,6 +479,9 @@
       display.gutters.style.left = (comp + gutterW) + "px";
   }
 
+  // Used to ensure that the line number gutter is still the right
+  // size for the current document size. Returns true when an update
+  // is needed.
   function maybeUpdateLineNumberWidth(cm) {
     if (!cm.options.lineNumbers) return false;
     var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
@@ -454,12 +505,20 @@
   function lineNumberFor(options, i) {
     return String(options.lineNumberFormatter(i + options.firstLineNumber));
   }
+
+  // Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
+  // but using getBoundingClientRect to get a sub-pixel-accurate
+  // result.
   function compensateForHScroll(display) {
     return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left;
   }
 
   // DISPLAY DRAWING
 
+  // Updates the display, selection, and scrollbars, using the
+  // information in display.view to find out which nodes are no longer
+  // up-to-date. Tries to bail out early when no changes are needed,
+  // unless forced is true.
   function updateDisplay(cm, viewChanged, viewPort, forced) {
     var oldFrom = cm.display.viewFrom, oldTo = cm.display.viewTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
@@ -536,13 +595,13 @@
     if (!different && toUpdate == 0 && !forced) return;
 
     if (toUpdate > 4) {
-      var focused = document.activeElement;
+      var focused = activeElt();
       display.lineDiv.style.display = "none";
     }
     patchDisplay(cm, display.updateLineNumbers, dims);
     if (toUpdate > 4) {
       display.lineDiv.style.display = "";
-      if (focused && document.activeElement != focused && focused.offsetHeight) focused.focus();
+      if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
     }
 
     // Prevent these from interfering with the scroll size
@@ -566,7 +625,7 @@
     for (var i = 0; i < display.view.length; i++) {
       var cur = display.view[i], height;
       if (cur.hidden) continue;
-      if (ie_lt8) {
+      if (ie_upto7) {
         var bot = cur.node.offsetTop + cur.node.offsetHeight;
         height = bot - prevBottom;
         prevBottom = bot;
@@ -667,7 +726,7 @@
       if (lineView.text.parentNode)
         lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
       lineView.node.appendChild(lineView.text);
-      if (ie_lt8) lineView.node.style.zIndex = 2;
+      if (ie_upto7) lineView.node.style.zIndex = 2;
     }
     return lineView.node;
   }
@@ -1224,7 +1283,7 @@
     if (node.nodeType == 3) {
       while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
       while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
-      if (ie_lt9 && start == 0 && end == mEnd - mStart) {
+      if (ie_upto8 && start == 0 && end == mEnd - mStart) {
         rect = node.parentNode.getBoundingClientRect();
       } else if (ie && cm.options.lineWrapping) {
         var rects = range(node, start, end).getClientRects();
@@ -1243,7 +1302,7 @@
       else
         rect = node.getBoundingClientRect();
     }
-    if (ie_lt9 && !start && (!rect || !rect.left && !rect.right)) {
+    if (ie_upto8 && !start && (!rect || !rect.left && !rect.right)) {
       var rSpan = node.parentNode.getClientRects()[0];
       if (rSpan)
         rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
@@ -1740,7 +1799,7 @@
     }
     var text = input.value;
     if (text == prevInput && !cm.somethingSelected()) return false;
-    if (old_ie && !ie_lt9 && cm.display.inputHasSelection === text) {
+    if (ie_upto10 && !ie_upto8 && cm.display.inputHasSelection === text) {
       resetInput(cm, true);
       return false;
     }
@@ -1796,16 +1855,16 @@
       var content = minimal ? "-" : selected || cm.getSelection();
       cm.display.input.value = content;
       if (cm.state.focused) selectInput(cm.display.input);
-      if (old_ie && !ie_lt9) cm.display.inputHasSelection = content;
+      if (ie_upto10 && !ie_upto8) cm.display.inputHasSelection = content;
     } else if (user) {
       cm.display.prevInput = cm.display.input.value = "";
-      if (old_ie && !ie_lt9) cm.display.inputHasSelection = null;
+      if (ie_upto10 && !ie_upto8) cm.display.inputHasSelection = null;
     }
     cm.display.inaccurateSelection = minimal;
   }
 
   function focusInput(cm) {
-    if (cm.options.readOnly != "nocursor" && (!mobile || document.activeElement != cm.display.input))
+    if (cm.options.readOnly != "nocursor" && (!mobile || activeElt() != cm.display.input))
       cm.display.input.focus();
   }
 
@@ -1818,7 +1877,7 @@
   function registerEventHandlers(cm) {
     var d = cm.display;
     on(d.scroller, "mousedown", operation(cm, onMouseDown));
-    if (old_ie)
+    if (ie_upto10)
       on(d.scroller, "dblclick", operation(cm, function(e) {
         if (signalDOMEvent(cm, e)) return;
         var pos = posFromMouse(cm, e);
@@ -1883,7 +1942,7 @@
 
     on(d.input, "keyup", operation(cm, onKeyUp));
     on(d.input, "input", function() {
-      if (old_ie && !ie_lt9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
+      if (ie_upto10 && !ie_upto8 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
       fastPoll(cm);
     });
     on(d.input, "keydown", operation(cm, onKeyDown));
@@ -1935,7 +1994,7 @@
 
     // Needed to handle Tab key in KHTML
     if (khtml) on(d.sizer, "mouseup", function() {
-      if (document.activeElement == d.input) d.input.blur();
+      if (activeElt() == d.input) d.input.blur();
       focusInput(cm);
     });
   }
@@ -2035,7 +2094,7 @@
         extendSelection(cm.doc, start);
         focusInput(cm);
         // Work around unexplainable focus problem in IE9 (#2127)
-        if (old_ie && !ie_lt9)
+        if (ie_upto10 && !ie_upto8)
           setTimeout(function() {document.body.focus(); focusInput(cm);}, 20);
       }
     });
@@ -2150,7 +2209,7 @@
     }
 
     var move = operation(cm, function(e) {
-      if (!old_ie && !e_button(e)) done(e);
+      if (!ie_upto10 && !e_button(e)) done(e);
       else extend(e);
     });
     var up = operation(cm, done);
@@ -2199,7 +2258,7 @@
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
       return;
     e_preventDefault(e);
-    if (old_ie) lastDrop = +new Date;
+    if (ie_upto10) lastDrop = +new Date;
     var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
     if (!pos || isReadOnly(cm)) return;
     if (files && files.length && window.FileReader && window.File) {
@@ -2242,7 +2301,7 @@
   }
 
   function onDragStart(cm, e) {
-    if (old_ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
+    if (ie_upto10 && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
 
     var txt = cm.getSelection();
@@ -2432,7 +2491,7 @@
     if (handled) {
       e_preventDefault(e);
       restartBlink(cm);
-      if (ie_lt9) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
+      if (ie_upto8) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
       signalLater(cm, "keyHandled", cm, name, e);
     }
     return handled;
@@ -2460,7 +2519,7 @@
     var cm = this;
     if (!cm.state.focused) onFocus(cm);
     if (signalDOMEvent(cm, e)) return;
-    if (old_ie && e.keyCode == 27) e.returnValue = false;
+    if (ie_upto10 && e.keyCode == 27) e.returnValue = false;
     var code = e.keyCode;
     // IE does strange things with escape.
     cm.display.shift = code == 16 || e.shiftKey;
@@ -2481,7 +2540,7 @@
     if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
     var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
     if (handleCharBinding(cm, e, ch)) return;
-    if (old_ie && !ie_lt9) cm.display.inputHasSelection = null;
+    if (ie_upto10 && !ie_upto8) cm.display.inputHasSelection = null;
     fastPoll(cm);
   }
 
@@ -2546,12 +2605,12 @@
     function rehide() {
       display.inputDiv.style.position = "relative";
       display.input.style.cssText = oldCSS;
-      if (ie_lt9) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos;
+      if (ie_upto8) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos;
       slowPoll(cm);
 
       // Try to detect the user choosing select-all
       if (display.input.selectionStart != null) {
-        if (!ie || ie_lt9) prepareSelectAllHack();
+        if (!ie || ie_upto8) prepareSelectAllHack();
         clearTimeout(detectingSelectAll);
         var i = 0, poll = function(){
           if (display.prevInput == "\u200b" && display.input.selectionStart == 0)
@@ -2563,7 +2622,7 @@
       }
     }
 
-    if (ie && !ie_lt9) prepareSelectAllHack();
+    if (ie && !ie_upto8) prepareSelectAllHack();
     if (captureRightClick) {
       e_stop(e);
       var mouseup = function() {
@@ -3655,7 +3714,7 @@
 
       signal(this, "overwriteToggle", this, this.state.overwrite);
     },
-    hasFocus: function() { return document.activeElement == this.display.input; },
+    hasFocus: function() { return activeElt() == this.display.input; },
 
     scrollTo: operation(null, function(x, y) {
       if (x != null || y != null) resolveScrollToPos(this);
@@ -4178,9 +4237,7 @@
     // Set autofocus to true if this textarea is focused, or if it has
     // autofocus and no other element is focused.
     if (options.autofocus == null) {
-      var hasFocus = document.body;
-      // doc.activeElement occasionally throws on IE
-      try { hasFocus = document.activeElement; } catch(e) {}
+      var hasFocus = activeElt();
       options.autofocus = hasFocus == textarea ||
         textarea.getAttribute("autofocus") != null && hasFocus == document.body;
     }
@@ -5040,7 +5097,7 @@
       builder.col += text.length;
       var content = document.createTextNode(text);
       builder.map.push(builder.pos, builder.pos + text.length, content);
-      if (ie_lt9) mustWrap = true;
+      if (ie_upto8) mustWrap = true;
       builder.pos += text.length;
     } else {
       var content = document.createDocumentFragment(), pos = 0;
@@ -5050,7 +5107,7 @@
         var skipped = m ? m.index - pos : text.length - pos;
         if (skipped) {
           var txt = document.createTextNode(text.slice(pos, pos + skipped));
-          if (ie_lt9) content.appendChild(elt("span", [txt]));
+          if (ie_upto8) content.appendChild(elt("span", [txt]));
           else content.appendChild(txt);
           builder.map.push(builder.pos, builder.pos + skipped, txt);
           builder.col += skipped;
@@ -5064,7 +5121,7 @@
           builder.col += tabWidth;
         } else {
           var txt = builder.cm.options.specialCharPlaceholder(m[0]);
-          if (ie_lt9) content.appendChild(elt("span", [txt]));
+          if (ie_upto8) content.appendChild(elt("span", [txt]));
           else content.appendChild(txt);
           builder.col += 1;
         }
@@ -6250,13 +6307,21 @@
     return removeChildren(parent).appendChild(e);
   }
 
+  function activeElt() { return document.activeElement; }
+  // Older versions of IE throws unspecified error when touching
+  // document.activeElement in some cases (during loading, in iframe)
+  if (ie_upto10) activeElt = function() {
+    try { return document.activeElement; }
+    catch(e) { return document.body; }
+  };
+
   // FEATURE DETECTION
 
   // Detect drag-and-drop
   var dragAndDrop = function() {
     // There is *some* kind of drag-and-drop support in IE6-8, but I
     // couldn't get it to work yet.
-    if (ie_lt9) return false;
+    if (ie_upto8) return false;
     var div = elt('div');
     return "draggable" in div || "dragDrop" in div;
   }();
@@ -6277,7 +6342,7 @@
       var test = elt("span", "\u200b");
       removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
       if (measure.firstChild.offsetHeight != 0)
-        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !ie_lt8;
+        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !ie_upto7;
     }
     if (zwspSupported) return elt("span", "\u200b");
     else return elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");

From 32c263022042726d2df60f31541a3ea3ce4df2aa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Feb 2014 18:31:16 +0100
Subject: [PATCH 0919/4742] Get rid of the viewChanged argument to
 updateDisplay

Use a more accurate way to determine whether a redraw is needed.
---
 lib/codemirror.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cfc4dcf2fc..09627512ee 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -519,12 +519,12 @@
   // information in display.view to find out which nodes are no longer
   // up-to-date. Tries to bail out early when no changes are needed,
   // unless forced is true.
-  function updateDisplay(cm, viewChanged, viewPort, forced) {
+  function updateDisplay(cm, viewPort, forced) {
     var oldFrom = cm.display.viewFrom, oldTo = cm.display.viewTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
     for (var first = true;; first = false) {
       var oldWidth = cm.display.scroller.clientWidth;
-      if (!updateDisplayInner(cm, !updated && viewChanged, visible, forced)) break;
+      if (!updateDisplayInner(cm, visible, forced)) break;
       updated = true;
       var barMeasure = measureForScrollbars(cm);
       updateSelection(cm);
@@ -555,7 +555,7 @@
   // Uses a set of changes plus the current scroll position to
   // determine which DOM updates have to be made, and makes the
   // updates.
-  function updateDisplayInner(cm, viewChanged, visible, forced) {
+  function updateDisplayInner(cm, visible, forced) {
     var display = cm.display, doc = cm.doc;
     if (!display.wrapper.offsetWidth) {
       resetView(cm);
@@ -563,8 +563,8 @@
     }
 
     // Bail out if the visible area is already rendered and nothing changed.
-    if (!forced && !viewChanged &&
-        visible.from > display.viewFrom && visible.to < display.viewTo)
+    if (!forced && visible.from >= display.viewFrom && visible.to <= display.viewTo &&
+        countDirtyView(cm) == 0)
       return;
 
     if (maybeUpdateLineNumberWidth(cm))
@@ -584,12 +584,7 @@
     var different = from != display.viewFrom || to != display.viewTo ||
       display.lastSizeC != display.wrapper.clientHeight;
     adjustView(cm, from, to);
-
-    var toUpdate = 0;
-    for (var i = 0; i < display.view.length; i++) {
-      var v = display.view[i];
-      if (!v.hidden && (!v.node || v.changes)) ++toUpdate;
-    }
+    var toUpdate = countDirtyView(cm);
 
     updateViewOffset(cm);
     if (!different && toUpdate == 0 && !forced) return;
@@ -1564,7 +1559,7 @@
     if (op.viewChanged || op.forceUpdate || op.scrollTop != null ||
         op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
                            op.scrollToPos.to.line >= display.viewTo)) {
-      var updated = updateDisplay(cm, op.viewChanged, {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
+      var updated = updateDisplay(cm, {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
       if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
     }
     if (!updated && op.selectionChanged) updateSelection(cm);
@@ -1746,6 +1741,15 @@
     display.viewTo = to;
   }
 
+  function countDirtyView(cm) {
+    var view = cm.display.view, dirty = 0;
+    for (var i = 0; i < view.length; i++) {
+      var lineView = view[i];
+      if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty;
+    }
+    return dirty;
+  }
+
   function LineView(doc, line, lineN) {
     this.line = line;
     this.rest = visualLineContinued(line);

From 83be10ac07722740f873edaa84d001e95f7f7f7b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Feb 2014 11:22:48 +0100
Subject: [PATCH 0920/4742] Documentation pass, part 2 (up to startOperation)

---
 lib/codemirror.js | 541 +++++++++++++++++++++++++++-------------------
 1 file changed, 317 insertions(+), 224 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 09627512ee..cddfe8b71d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -519,6 +519,7 @@
   // information in display.view to find out which nodes are no longer
   // up-to-date. Tries to bail out early when no changes are needed,
   // unless forced is true.
+  // Returns true if an actual update happened, false otherwise.
   function updateDisplay(cm, viewPort, forced) {
     var oldFrom = cm.display.viewFrom, oldTo = cm.display.viewTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
@@ -535,9 +536,11 @@
       }
       forced = false;
 
-      // Clip forced viewport to actual scrollable area
+      // Clip forced viewport to actual scrollable area.
       if (viewPort && viewPort.top != null)
         viewPort = {top: Math.min(barMeasure.scrollHeight - barMeasure.clientHeight, viewPort.top)};
+      // Updated line heights might result in the drawn area not
+      // actually covering the viewport. Keep looping until it does.
       visible = visibleLines(cm.display, cm.doc, viewPort);
       if (visible.from >= cm.display.viewFrom && visible.to <= cm.display.viewTo)
         break;
@@ -552,9 +555,9 @@
     return updated;
   }
 
-  // Uses a set of changes plus the current scroll position to
-  // determine which DOM updates have to be made, and makes the
-  // updates.
+  // Does the actual updating of the line display. Bails out
+  // (returning false) when there is nothing to be done and forced is
+  // false.
   function updateDisplayInner(cm, visible, forced) {
     var display = cm.display, doc = cm.doc;
     if (!display.wrapper.offsetWidth) {
@@ -571,6 +574,7 @@
       resetView(cm);
     var dims = getDimensions(cm);
 
+    // Compute a suitable new viewport (from & to)
     var end = doc.first + doc.size;
     var from = Math.max(visible.from - cm.options.viewportMargin, doc.first);
     var to = Math.min(end, visible.to + cm.options.viewportMargin);
@@ -584,11 +588,16 @@
     var different = from != display.viewFrom || to != display.viewTo ||
       display.lastSizeC != display.wrapper.clientHeight;
     adjustView(cm, from, to);
-    var toUpdate = countDirtyView(cm);
 
-    updateViewOffset(cm);
+    display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
+    // Position the mover div to align with the current scroll position
+    cm.display.mover.style.top = display.viewOffset + "px";
+
+    var toUpdate = countDirtyView(cm);
     if (!different && toUpdate == 0 && !forced) return;
 
+    // For big changes, we hide the enclosing element during the
+    // update, since that speeds up the operations on most browsers.
     if (toUpdate > 4) {
       var focused = activeElt();
       display.lineDiv.style.display = "none";
@@ -596,10 +605,13 @@
     patchDisplay(cm, display.updateLineNumbers, dims);
     if (toUpdate > 4) {
       display.lineDiv.style.display = "";
+      // There might have been a widget with a focused element in the
+      // hidden nodes, if so re-focus it.
       if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
     }
 
-    // Prevent these from interfering with the scroll size
+    // Prevent these from interfering with the scroll size during
+    // subsequent call to updateScrollbars
     display.gutters.style.height = "";
     removeChildren(display.cursorDiv);
     removeChildren(display.selectionDiv);
@@ -614,6 +626,8 @@
     return true;
   }
 
+  // Read the actual heights of the rendered lines, and update their
+  // stored heights to match.
   function updateHeightsInViewport(cm) {
     var display = cm.display;
     var prevBottom = display.lineDiv.offsetTop;
@@ -639,17 +653,15 @@
     }
   }
 
+  // Read and store the height of line widgets associated with the
+  // given line.
   function updateWidgetHeight(line) {
     if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
       line.widgets[i].height = line.widgets[i].node.offsetHeight;
   }
 
-  function updateViewOffset(cm) {
-    var off = cm.display.viewOffset = heightAtLine(getLine(cm.doc, cm.display.viewFrom));
-    // Position the mover div to align with the current virtual scroll position
-    cm.display.mover.style.top = off + "px";
-  }
-
+  // Do a bulk-read of the DOM positions and sizes needed to draw the
+  // view, so that we don't interleave reading and writing to the DOM.
   function getDimensions(cm) {
     var d = cm.display, left = {}, width = {};
     for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
@@ -663,12 +675,17 @@
             wrapperWidth: d.wrapper.clientWidth};
   }
 
+  // Sync the actual display DOM structure with display.view, removing
+  // nodes for lines that are no longer in view, and creating the ones
+  // that are not there yet, and updating the ones that are out of
+  // date.
   function patchDisplay(cm, updateNumbersFrom, dims) {
     var display = cm.display, lineNumbers = cm.options.lineNumbers;
     var container = display.lineDiv, cur = container.firstChild;
 
     function rm(node) {
       var next = node.nextSibling;
+      // Works around a throw-scroll bug in OS X Webkit
       if (webkit && mac && cm.display.currentWheelTarget == node)
         node.style.display = "none";
       else
@@ -677,6 +694,8 @@
     }
 
     var view = display.view, lineN = display.viewFrom;
+    // Loop over the elements in the view, syncing cur (the DOM nodes
+    // in display.lineDiv) with the view as we go.
     for (var i = 0; i < view.length; i++) {
       var lineView = view[i];
       if (lineView.hidden) {
@@ -702,6 +721,9 @@
     while (cur) cur = rm(cur);
   }
 
+  // When an aspect of a line changes, a string is added to
+  // lineView.changes. This updates the relevant part of the line's
+  // DOM structure.
   function updateLineForChanges(cm, lineView, lineN, dims) {
     for (var j = 0; j < lineView.changes.length; j++) {
       var type = lineView.changes[j];
@@ -738,6 +760,8 @@
     }
   }
 
+  // Wrapper around buildLineContent which will reuse the structure
+  // in display.externalMeasured when possible.
   function getLineContent(cm, lineView) {
     var ext = cm.display.externalMeasured;
     if (ext && ext.line == lineView.line) {
@@ -748,6 +772,9 @@
     return buildLineContent(cm, lineView);
   }
 
+  // Redraw the line's text. Interacts with the background and text
+  // classes because the mode may output tokens that influence these
+  // classes.
   function updateLineText(cm, lineView) {
     var cls = lineView.text.className;
     var built = getLineContent(cm, lineView);
@@ -810,6 +837,7 @@
     insertLineWidgets(lineView, dims);
   }
 
+  // Build a line's DOM representation from scratch
   function buildLineElement(cm, lineView, lineN, dims) {
     var built = getLineContent(cm, lineView);
     lineView.text = lineView.node = built.pre;
@@ -822,6 +850,8 @@
     return lineView.node;
   }
 
+  // A lineView may contain multiple logical lines (when merged by
+  // collapsed spans). The widgets for all of them need to be drawn.
   function insertLineWidgets(lineView, dims) {
     insertLineWidgetsFor(lineView.line, lineView, dims, true);
     if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
@@ -861,8 +891,29 @@
     }
   }
 
+  // POSITION OBJECT
+
+  // A Pos instance represents a position within the text.
+  var Pos = CodeMirror.Pos = function(line, ch) {
+    if (!(this instanceof Pos)) return new Pos(line, ch);
+    this.line = line; this.ch = ch;
+  };
+
+  // Compare two positions, return 0 if they are the same, a negative
+  // number when a is less, and a positive number otherwise.
+  var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; };
+
+  function copyPos(x) {return Pos(x.line, x.ch);}
+  function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
+  function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
+
   // SELECTION / CURSOR
 
+  // Selection objects are immutable. A new one is created every time
+  // the selection changes. A selection is one or more non-overlapping
+  // (and non-touching) ranges, sorted, and an integer that indicates
+  // which one is the primary selection (the one that's scrolled into
+  // view, that getCursor returns, etc).
   function Selection(ranges, primIndex) {
     this.ranges = ranges;
     this.primIndex = primIndex;
@@ -900,6 +951,21 @@
     }
   };
 
+  function Range(anchor, head) {
+    this.anchor = anchor; this.head = head;
+  }
+
+  Range.prototype = {
+    from: function() { return minPos(this.anchor, this.head); },
+    to: function() { return maxPos(this.anchor, this.head); },
+    empty: function() {
+      return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch;
+    }
+  };
+
+  // Take an unsorted, potentially overlapping set of ranges, and
+  // build a selection out of it. 'Consumes' ranges array (modifying
+  // it).
   function normalizeSelection(ranges, primIndex) {
     var prim = ranges[primIndex];
     ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
@@ -920,22 +986,201 @@
     return new Selection([new Range(anchor, head || anchor)], 0);
   }
 
-  function Range(anchor, head) {
-    this.anchor = anchor; this.head = head;
+  // Most of the external API clips given positions to make sure they
+  // actually exist within the document.
+  function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));}
+  function clipPos(doc, pos) {
+    if (pos.line < doc.first) return Pos(doc.first, 0);
+    var last = doc.first + doc.size - 1;
+    if (pos.line > last) return Pos(last, getLine(doc, last).text.length);
+    return clipToLen(pos, getLine(doc, pos.line).text.length);
+  }
+  function clipToLen(pos, linelen) {
+    var ch = pos.ch;
+    if (ch == null || ch > linelen) return Pos(pos.line, linelen);
+    else if (ch < 0) return Pos(pos.line, 0);
+    else return pos;
+  }
+  function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
+  function clipPosArray(doc, array) {
+    for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]);
+    return out;
   }
 
-  Range.prototype = {
-    from: function() {
-      return cmp(this.anchor, this.head) < 0 ? this.anchor : this.head;
-    },
-    to: function() {
-      return cmp(this.anchor, this.head) > 0 ? this.anchor : this.head;
-    },
-    empty: function() {
-      return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch;
+  // SELECTION UPDATES
+
+  // The 'scroll' parameter given to many of these indicated whether
+  // the new cursor position should be scrolled into view after
+  // modifying the selection.
+
+  // If shift is held or the extend flag is set, extends a range to
+  // include a given position (and optionally a second position).
+  // Otherwise, simply returns the range between the given positions.
+  // Used for cursor motion and such.
+  function extendRange(doc, range, head, other) {
+    if (doc.cm && doc.cm.display.shift || doc.extend) {
+      var anchor = range.anchor;
+      if (other) {
+        var posBefore = cmp(head, anchor) < 0;
+        if (posBefore != (cmp(other, anchor) < 0)) {
+          anchor = head;
+          head = other;
+        } else if (posBefore != (cmp(head, other) < 0)) {
+          head = other;
+        }
+      }
+      return new Range(anchor, head);
+    } else {
+      return new Range(other || head, head);
     }
-  };
+  }
+
+  // Extend the primary selection range, discard the rest.
+  function extendSelection(doc, head, other, scroll) {
+    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), scroll);
+  }
+
+  // Extend all selections (pos is an array of selections with length
+  // equal the number of selections)
+  function extendSelections(doc, heads, scroll) {
+    for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
+      out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
+    var newSel = normalizeSelection(out, doc.sel.primIndex);
+    setSelection(doc, newSel, scroll);
+  }
+
+  // Updates a single range in the selection.
+  function replaceOneSelection(doc, i, range) {
+    var ranges = doc.sel.ranges.slice(0);
+    ranges[i] = range;
+    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex));
+  }
+
+  // Reset the selection to a single range.
+  function setSimpleSelection(doc, anchor, head, scroll) {
+    setSelection(doc, simpleSelection(anchor, head), scroll);
+  }
+
+  // Give beforeSelectionChange handlers a change to influence a
+  // selection update.
+  function filterSelectionChange(doc, sel) {
+    var obj = {
+      ranges: sel.ranges,
+      update: function(ranges) {
+        this.ranges = [];
+        for (var i = 0; i < ranges.length; i++)
+          this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
+                                     clipPos(doc, ranges[i].head));
+      }
+    };
+    signal(doc, "beforeSelectionChange", doc, obj);
+    if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
+    if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1);
+    else return sel;
+  }
+
+  // Set a new selection.
+  function setSelection(doc, sel, scroll) {
+    if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
+      sel = filterSelectionChange(doc, sel);
+
+    var bias = cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1;
+    setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
+
+    if (scroll !== false && doc.cm) {
+      doc.cm.curOp.userSelChange = true;
+      ensureCursorVisible(doc.cm);
+    }
+    addSelectionToHistory(doc, sel, doc.history.done, doc.cm ? doc.cm.curOp.id : NaN);
+  }
+
+  function setSelectionInner(doc, sel) {
+    if (sel.equals(doc.sel)) return;
+
+    doc.sel = sel;
+
+    if (doc.cm)
+      doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged =
+        doc.cm.curOp.cursorActivity = true;
+    signalLater(doc, "cursorActivity", doc);
+  }
+
+  // Verify that the selection does not partially select any atomic
+  // marked ranges.
+  function reCheckSelection(doc) {
+    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), false);
+  }
+
+  // Return a selection that does not partially select any atomic
+  // ranges.
+  function skipAtomicInSelection(doc, sel, bias, mayClear) {
+    var out;
+    for (var i = 0; i < sel.ranges.length; i++) {
+      var range = sel.ranges[i];
+      var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear);
+      var newHead = skipAtomic(doc, range.head, bias, mayClear);
+      if (out || newAnchor != range.anchor || newHead != range.head) {
+        if (!out) out = sel.ranges.slice(0, i);
+        out[i] = new Range(newAnchor, newHead);
+      }
+    }
+    return out ? normalizeSelection(out, sel.primIndex) : sel;
+  }
+
+  // Ensure a given position is not inside an atomic range.
+  function skipAtomic(doc, pos, bias, mayClear) {
+    var flipped = false, curPos = pos;
+    var dir = bias || 1;
+    doc.cantEdit = false;
+    search: for (;;) {
+      var line = getLine(doc, curPos.line);
+      if (line.markedSpans) {
+        for (var i = 0; i < line.markedSpans.length; ++i) {
+          var sp = line.markedSpans[i], m = sp.marker;
+          if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&
+              (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {
+            if (mayClear) {
+              signal(m, "beforeCursorEnter");
+              if (m.explicitlyCleared) {
+                if (!line.markedSpans) break;
+                else {--i; continue;}
+              }
+            }
+            if (!m.atomic) continue;
+            var newPos = m.find(dir < 0 ? -1 : 1);
+            if (cmp(newPos, curPos) == 0) {
+              newPos.ch += dir;
+              if (newPos.ch < 0) {
+                if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
+                else newPos = null;
+              } else if (newPos.ch > line.text.length) {
+                if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0);
+                else newPos = null;
+              }
+              if (!newPos) {
+                if (flipped) {
+                  // Driven in a corner -- no valid cursor position found at all
+                  // -- try again *with* clearing, if we didn't already
+                  if (!mayClear) return skipAtomic(doc, pos, bias, true);
+                  // Otherwise, turn off editing until further notice, and return the start of the doc
+                  doc.cantEdit = true;
+                  return Pos(doc.first, 0);
+                }
+                flipped = true; newPos = pos; dir = -dir;
+              }
+            }
+            curPos = newPos;
+            continue search;
+          }
+        }
+      }
+      return curPos;
+    }
+  }
 
+  // SELECTION DRAWING
+
+  // Redraw the selection and/or cursor
   function updateSelection(cm) {
     var display = cm.display, doc = cm.doc;
     var curFragment = document.createDocumentFragment();
@@ -966,7 +1211,7 @@
     removeChildrenAndAdd(display.selectionDiv, selFragment);
   }
 
-  // No selection, plain cursor
+  // Draws a cursor for the given range
   function updateSelectionCursor(cm, range, output) {
     var pos = cursorCoords(cm, range.head, "div");
 
@@ -985,7 +1230,7 @@
     }
   }
 
-  // Highlight selection
+  // Draws the given range as a highlighted selection
   function updateSelectionRange(cm, range, output) {
     var display = cm.display, doc = cm.doc;
     var fragment = document.createDocumentFragment();
@@ -1152,6 +1397,10 @@
     return e.offsetLeft;
   }
 
+  // Ensure the lineView.wrapping.heights array is populated. This is
+  // an array of bottom offsets for the lines that make up a drawn
+  // line. When lineWrapping is on, there might be more than one
+  // height.
   function ensureLineHeights(cm, lineView, rect) {
     var wrapping = cm.options.lineWrapping;
     var curWidth = wrapping && cm.display.scroller.clientWidth;
@@ -1167,6 +1416,9 @@
     }
   }
 
+  // Find a line map (mapping character offsets to text nodes) and a
+  // measurement cache for the given line number. (A line view might
+  // contain multiple lines when collapsed ranges are present.)
   function mapFromLineView(lineView, line, lineN) {
     if (lineView.line == line)
       return {map: lineView.measure.map, cache: lineView.measure.cache};
@@ -1178,6 +1430,8 @@
         return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true};
   }
 
+  // Render a line into the hidden node display.externalMeasured. Used
+  // when measurement is needed for a line that's not in the viewport.
   function updateExternalMeasurement(cm, line) {
     line = visualLine(line);
     var lineN = lineNo(line);
@@ -1189,10 +1443,13 @@
     return view;
   }
 
+  // Get a {top, bottom, left, right} box (in line-local coordinates)
+  // for a given character.
   function measureChar(cm, line, ch, bias) {
     return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias);
   }
 
+  // Find a line view that corresponds to the given line number.
   function findViewForLine(cm, lineN) {
     if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
       return cm.display.view[findViewIndex(cm, lineN)];
@@ -1201,6 +1458,11 @@
       return ext;
   }
 
+  // Measurement can be split in two steps, the set-up work that
+  // applies to the whole line, and the measurement of the actual
+  // character. Functions like coordsChar, that need to do a lot of
+  // measurements in a row, can thus ensure that the set-up work is
+  // only done once.
   function prepareMeasureForLine(cm, line) {
     var lineN = lineNo(line);
     var view = findViewForLine(cm, lineN);
@@ -1219,6 +1481,8 @@
     };
   }
 
+  // Given a prepared measurement object, measures the position of an
+  // actual character (or fetches it from the cache).
   function measureCharPrepared(cm, prepared, ch, bias) {
     if (prepared.before) ch = -1;
     var key = ch + (bias || ""), found;
@@ -1243,6 +1507,8 @@
     var map = prepared.map;
 
     var node, start, end, collapse;
+    // First, search the line map for the text node corresponding to,
+    // or closest to, the target character.
     for (var i = 0; i < map.length; i += 3) {
       var mStart = map[i], mEnd = map[i + 1];
       if (ch < mStart) {
@@ -1275,7 +1541,7 @@
     }
 
     var rect;
-    if (node.nodeType == 3) {
+    if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
       while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
       while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
       if (ie_upto8 && start == 0 && end == mEnd - mStart) {
@@ -1289,7 +1555,7 @@
       } else {
         rect = range(node, start, end).getBoundingClientRect();
       }
-    } else {
+    } else { // If it is a widget, simply get the box for the whole widget.
       if (start > 0) collapse = bias = "right";
       var rects;
       if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
@@ -1343,7 +1609,9 @@
   function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }
   function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }
 
-  // Context is one of "line", "div" (display.lineDiv), "local"/null (editor), or "page"
+  // Converts a {top, bottom, left, right} box from line-local
+  // coordinates into another coordinate system. Context may be one of
+  // "line", "div" (display.lineDiv), "local"/null (editor), or "page".
   function intoCoordSystem(cm, lineObj, rect, context) {
     if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
       var size = widgetHeight(lineObj.widgets[i]);
@@ -1364,8 +1632,8 @@
     return rect;
   }
 
-  // Context may be "window", "page", "div", or "local"/null
-  // Result is in "div" coords
+  // Coverts a box from "div" coords to another coordinate system.
+  // Context may be "window", "page", "div", or "local"/null.
   function fromCoordSystem(cm, coords, context) {
     if (context == "div") return coords;
     var left = coords.left, top = coords.top;
@@ -1388,6 +1656,9 @@
     return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context);
   }
 
+  // Returns a box for a given cursor position, which may have an
+  // 'other' property containing the position of the secondary cursor
+  // on a bidi boundary.
   function cursorCoords(cm, pos, context, lineObj, preparedMeasure) {
     lineObj = lineObj || getLine(cm.doc, pos.line);
     if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
@@ -1418,6 +1689,8 @@
     return val;
   }
 
+  // Used to cheaply estimate the coordinates for a position. Used for
+  // intermediate scroll updates.
   function estimateCoords(cm, pos) {
     var left = 0;
     if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch;
@@ -1426,14 +1699,21 @@
     return {left: left, right: left, top: top, bottom: top + lineObj.height};
   }
 
+  // Positions returned by coordsChar contain some extra information.
+  // xRel is the relative x position of the input coordinates compared
+  // to the found position (so xRel > 0 means the coordinates are to
+  // the right of the character position, for example). When outside
+  // is true, that means the coordinates lie outside the line's
+  // vertical range.
   function PosWithInfo(line, ch, outside, xRel) {
-    var pos = new Pos(line, ch);
+    var pos = Pos(line, ch);
     pos.xRel = xRel;
     if (outside) pos.outside = true;
     return pos;
   }
 
-  // Coords must be lineSpace-local
+  // Compute the character position closest to the given coordinates.
+  // Input must be lineSpace-local ("div" coordinate system).
   function coordsChar(cm, x, y) {
     var doc = cm.doc;
     y += cm.display.viewOffset;
@@ -1496,6 +1776,7 @@
   }
 
   var measureText;
+  // Compute the default text height.
   function textHeight(display) {
     if (display.cachedTextHeight != null) return display.cachedTextHeight;
     if (measureText == null) {
@@ -1515,6 +1796,7 @@
     return height || 1;
   }
 
+  // Compute the default character width.
   function charWidth(display) {
     if (display.cachedCharWidth != null) return display.cachedCharWidth;
     var anchor = elt("span", "xxxxxxxxxx");
@@ -2079,7 +2361,7 @@
     }
 
     var sel = cm.doc.sel;
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) && !sel.primary().empty() &&
+    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
         type == "single" && sel.contains(start) > -1 && sel.somethingSelected())
       leftButtonStartDrag(cm, e, start);
     else
@@ -2902,195 +3184,6 @@
     makeChange(doc, {from: from, to: to, text: code, origin: origin});
   }
 
-  // POSITION OBJECT
-
-  function Pos(line, ch) {
-    if (!(this instanceof Pos)) return new Pos(line, ch);
-    this.line = line; this.ch = ch;
-  }
-  CodeMirror.Pos = Pos;
-
-  var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; };
-  function copyPos(x) {return Pos(x.line, x.ch);}
-  function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
-  function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
-
-  // SELECTION
-
-  function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));}
-  function clipPos(doc, pos) {
-    if (pos.line < doc.first) return Pos(doc.first, 0);
-    var last = doc.first + doc.size - 1;
-    if (pos.line > last) return Pos(last, getLine(doc, last).text.length);
-    return clipToLen(pos, getLine(doc, pos.line).text.length);
-  }
-  function clipToLen(pos, linelen) {
-    var ch = pos.ch;
-    if (ch == null || ch > linelen) return Pos(pos.line, linelen);
-    else if (ch < 0) return Pos(pos.line, 0);
-    else return pos;
-  }
-  function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
-  function clipPosArray(doc, array) {
-    for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]);
-    return out;
-  }
-
-  function extendRange(doc, range, head, other) {
-    if (doc.cm && doc.cm.display.shift || doc.extend) {
-      var anchor = range.anchor;
-      if (other) {
-        var posBefore = cmp(head, anchor) < 0;
-        if (posBefore != (cmp(other, anchor) < 0)) {
-          anchor = head;
-          head = other;
-        } else if (posBefore != (cmp(head, other) < 0)) {
-          head = other;
-        }
-      }
-      return new Range(anchor, head);
-    } else {
-      return new Range(other || head, head);
-    }
-  }
-
-  // If shift is held, this will move the selection anchor. Otherwise,
-  // it'll set the whole selection.
-  function extendSelection(doc, head, other, scroll) {
-    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), scroll);
-  }
-
-  // Extend all selections (pos is an array of selections with length
-  // equal the number of selections)
-  function extendSelections(doc, heads, scroll) {
-    for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
-      out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
-    var newSel = normalizeSelection(out, doc.sel.primIndex);
-    setSelection(doc, newSel, scroll);
-  }
-
-  function replaceOneSelection(doc, i, range) {
-    var ranges = doc.sel.ranges.slice(0);
-    ranges[i] = range;
-    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex));
-  }
-
-  function setSimpleSelection(doc, anchor, head, scroll) {
-    setSelection(doc, simpleSelection(anchor, head), scroll);
-  }
-
-  function filterSelectionChange(doc, sel) {
-    var obj = {
-      ranges: sel.ranges,
-      update: function(ranges) {
-        this.ranges = [];
-        for (var i = 0; i < ranges.length; i++)
-          this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
-                                     clipPos(doc, ranges[i].head));
-      }
-    };
-    signal(doc, "beforeSelectionChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
-    if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1);
-    else return sel;
-  }
-
-  // Update the selection. Last two args are only used by
-  // updateDoc, since they have to be expressed in the line
-  // numbers before the update.
-  function setSelection(doc, sel, scroll) {
-    if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-      sel = filterSelectionChange(doc, sel);
-
-    var bias = cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1;
-    setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
-
-    if (scroll !== false && doc.cm) {
-      doc.cm.curOp.userSelChange = true;
-      ensureCursorVisible(doc.cm);
-    }
-    addSelectionToHistory(doc, sel, doc.history.done, doc.cm ? doc.cm.curOp.id : NaN);
-  }
-
-  function setSelectionInner(doc, sel) {
-    if (sel.equals(doc.sel)) return;
-
-    doc.sel = sel;
-
-    if (doc.cm)
-      doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged =
-        doc.cm.curOp.cursorActivity = true;
-    signalLater(doc, "cursorActivity", doc);
-  }
-
-  function reCheckSelection(doc) {
-    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), false);
-  }
-
-  function skipAtomicInSelection(doc, sel, bias, mayClear) {
-    var out;
-    for (var i = 0; i < sel.ranges.length; i++) {
-      var range = sel.ranges[i];
-      var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear);
-      var newHead = skipAtomic(doc, range.head, bias, mayClear);
-      if (out || newAnchor != range.anchor || newHead != range.head) {
-        if (!out) out = sel.ranges.slice(0, i);
-        out[i] = new Range(newAnchor, newHead);
-      }
-    }
-    return out ? normalizeSelection(out, sel.primIndex) : sel;
-  }
-
-  function skipAtomic(doc, pos, bias, mayClear) {
-    var flipped = false, curPos = pos;
-    var dir = bias || 1;
-    doc.cantEdit = false;
-    search: for (;;) {
-      var line = getLine(doc, curPos.line);
-      if (line.markedSpans) {
-        for (var i = 0; i < line.markedSpans.length; ++i) {
-          var sp = line.markedSpans[i], m = sp.marker;
-          if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&
-              (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {
-            if (mayClear) {
-              signal(m, "beforeCursorEnter");
-              if (m.explicitlyCleared) {
-                if (!line.markedSpans) break;
-                else {--i; continue;}
-              }
-            }
-            if (!m.atomic) continue;
-            var newPos = m.find(dir < 0 ? -1 : 1);
-            if (cmp(newPos, curPos) == 0) {
-              newPos.ch += dir;
-              if (newPos.ch < 0) {
-                if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
-                else newPos = null;
-              } else if (newPos.ch > line.text.length) {
-                if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0);
-                else newPos = null;
-              }
-              if (!newPos) {
-                if (flipped) {
-                  // Driven in a corner -- no valid cursor position found at all
-                  // -- try again *with* clearing, if we didn't already
-                  if (!mayClear) return skipAtomic(doc, pos, bias, true);
-                  // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit = true;
-                  return Pos(doc.first, 0);
-                }
-                flipped = true; newPos = pos; dir = -dir;
-              }
-            }
-            curPos = newPos;
-            continue search;
-          }
-        }
-      }
-      return curPos;
-    }
-  }
-
   // SCROLLING
 
   function ensureCursorVisible(cm) {

From 630c4ad9cf7d148b8205242b2d7f22d95a99f3a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Feb 2014 12:44:51 +0100
Subject: [PATCH 0921/4742] [source-highlight script] Fix bug in HTML-escaping

---
 bin/source-highlight | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/source-highlight b/bin/source-highlight
index 7596ed776c..1373f6626f 100755
--- a/bin/source-highlight
+++ b/bin/source-highlight
@@ -40,7 +40,7 @@ function ensureMode(name) {
 ensureMode(modeName);
 
 function esc(str) {
-  return str.replace(/[<&]/, function(ch) { return ch == "&" ? "&amp;" : "&lt;"; });
+  return str.replace(/[<&]/g, function(ch) { return ch == "&" ? "&amp;" : "&lt;"; });
 }
 
 var code = fs.readFileSync("/dev/stdin", "utf8");

From 100ad84de37c145aafdf6f80179efe9a7f936160 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Feb 2014 14:22:09 +0100
Subject: [PATCH 0922/4742] [bidi algorithm] Properly categorize zero-width
 non-joiners

Issue #2218
---
 lib/codemirror.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cddfe8b71d..db0a8f1362 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6651,14 +6651,16 @@
   // objects) in the order in which they occur visually.
   var bidiOrdering = (function() {
     // Character types for codepoints 0 to 0xff
-    var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLL";
+    var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
     // Character types for codepoints 0x600 to 0x6ff
-    var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmmrrrrrrrrrrrrrrrrrr";
+    var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm";
     function charType(code) {
-      if (code <= 0xff) return lowTypes.charAt(code);
+      if (code <= 0xf7) return lowTypes.charAt(code);
       else if (0x590 <= code && code <= 0x5f4) return "R";
-      else if (0x600 <= code && code <= 0x6ff) return arabicTypes.charAt(code - 0x600);
-      else if (0x700 <= code && code <= 0x8ac) return "r";
+      else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600);
+      else if (0x6ee <= code && code <= 0x8ac) return "r";
+      else if (0x2000 <= code && code <= 0x200b) return "w";
+      else if (code == 0x200c) return "b";
       else return "L";
     }
 

From 77d8b7e57aafe73d93463ae7fdccda4e85fb811e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Feb 2014 17:42:41 +0100
Subject: [PATCH 0923/4742] Documentation pass, part 3 (up to replaceRange)

---
 lib/codemirror.js | 450 +++++++++++++++++++++++++++++-----------------
 1 file changed, 288 insertions(+), 162 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index db0a8f1362..cce334ad37 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -95,18 +95,19 @@
 
     registerEventHandlers(this);
 
-    operation(this, function() {
-      attachDoc(this, doc);
+    var cm = this;
+    runInOp(this, function() {
+      attachDoc(cm, doc);
 
       if ((options.autofocus && !mobile) || activeElt() == display.input)
-        setTimeout(bind(onFocus, this), 20);
+        setTimeout(bind(onFocus, cm), 20);
       else
-        onBlur(this);
+        onBlur(cm);
 
       for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
-        optionHandlers[opt](this, options[opt], Init);
-      for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
-    })();
+        optionHandlers[opt](cm, options[opt], Init);
+      for (var i = 0; i < initHooks.length; ++i) initHooks[i](cm);
+    });
   }
 
   // DISPLAY CONSTRUCTOR
@@ -1087,10 +1088,8 @@
     var bias = cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1;
     setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
 
-    if (scroll !== false && doc.cm) {
-      doc.cm.curOp.userSelChange = true;
+    if (scroll !== false && doc.cm)
       ensureCursorVisible(doc.cm);
-    }
     addSelectionToHistory(doc, sel, doc.history.done, doc.cm ? doc.cm.curOp.id : NaN);
   }
 
@@ -1809,44 +1808,49 @@
 
   // OPERATIONS
 
-  // Operations are used to wrap changes in such a way that each
-  // change won't have to update the cursor and display (which would
-  // be awkward, slow, and error-prone), but instead updates are
-  // batched and then all combined and executed at once.
+  // Operations are used to wrap a series of changes to the editor
+  // state in such a way that each change won't have to update the
+  // cursor and display (which would be awkward, slow, and
+  // error-prone). Instead, display updates are batched and then all
+  // combined and executed at once.
 
   var nextOpId = 0;
+  // Start a new operation.
   function startOperation(cm) {
     cm.curOp = {
-      // An array of ranges of lines that have to be updated. See
-      // updateDisplay.
-      viewChanged: false,
-      forceUpdate: false,
-      updateInput: null,
-      userSelChange: null,
-      changeObjs: null,
-      selectionChanged: false,
-      cursorActivity: false,
-      updateMaxLine: false,
-      scrollLeft: null, scrollTop: null,
-      scrollToPos: null,
-      id: ++nextOpId
+      viewChanged: false,      // Flag that indicates that lines might need to be redrawn
+      forceUpdate: false,      // Used to force a redraw
+      updateInput: null,       // Whether to reset the input textarea
+      typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
+      changeObjs: null,        // Accumulated changes, for firing change events
+      cursorActivity: false,   // Whether to fire a cursorActivity event
+      selectionChanged: false, // Whether the selection needs to be redrawn
+      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
+      id: ++nextOpId           // Unique ID
     };
     if (!delayedCallbackDepth++) delayedCallbacks = [];
   }
 
+  // Finish an operation, updating the display and signalling delayed events
   function endOperation(cm) {
     var op = cm.curOp, doc = cm.doc, display = cm.display;
     cm.curOp = null;
 
+    // If it looks like an update might be needed, call updateDisplay
     if (op.viewChanged || op.forceUpdate || op.scrollTop != null ||
         op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
                            op.scrollToPos.to.line >= display.viewTo)) {
       var updated = updateDisplay(cm, {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
       if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
     }
+    // If no update was run, but the selection changed, redraw that.
     if (!updated && op.selectionChanged) updateSelection(cm);
 
     if (op.updateMaxLine) computeMaxLength(cm);
+    // If the max line changed since it was last measured, measure it,
+    // and ensure the document's width matches it.
     if (display.maxLineChanged && !cm.options.lineWrapping && display.maxLine) {
       var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
       display.maxLineChanged = false;
@@ -1858,6 +1862,7 @@
       updateScrollbars(cm);
     }
 
+    // Propagate the scroll position to the actual DOM scroller
     if (op.scrollTop != null && display.scroller.scrollTop != op.scrollTop) {
       var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
       display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
@@ -1867,6 +1872,7 @@
       display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
       alignHorizontally(cm);
     }
+    // If we need to scroll a specific position into view, do so.
     if (op.scrollToPos) {
       var coords = scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
                                      clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
@@ -1876,8 +1882,10 @@
     if (op.selectionChanged) restartBlink(cm);
 
     if (cm.state.focused && op.updateInput)
-      resetInput(cm, op.userSelChange);
+      resetInput(cm, op.typing);
 
+    // Fire events for markers that are hidden/unidden by editing or
+    // undoing
     var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
     if (hidden) for (var i = 0; i < hidden.length; ++i)
       if (!hidden[i].lines.length) signal(hidden[i], "hide");
@@ -1889,44 +1897,82 @@
       delayed = delayedCallbacks;
       delayedCallbacks = null;
     }
+    // Fire change events, and delayed event handlers
     if (op.changeObjs) for (var i = 0; i < op.changeObjs.length; i++)
       signal(cm, "change", cm, op.changeObjs[i]);
     if (op.cursorActivity) signal(cm, "cursorActivity", cm);
     if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }
 
+  // Run the given function in an operation
+  function runInOp(cm, f) {
+    if (cm.curOp) return f();
+    startOperation(cm);
+    try { return f(); }
+    finally { endOperation(cm); }
+  }
   // Wraps a function in an operation. Returns the wrapped function.
-  function operation(cm1, f) {
+  function operation(cm, f) {
     return function() {
-      var cm = cm1 || this, withOp = !cm.curOp;
-      if (withOp) startOperation(cm);
-      try { var result = f.apply(cm, arguments); }
-      finally { if (withOp) endOperation(cm); }
-      return result;
+      if (cm.curOp) return f.apply(cm, arguments);
+      startOperation(cm);
+      try { return f.apply(cm, arguments); }
+      finally { endOperation(cm); }
     };
   }
-  function docOperation(f) {
+  // Used to add methods to editor and doc instances, wrapping them in
+  // operations.
+  function methodOp(f) {
     return function() {
-      var withOp = this.cm && !this.cm.curOp, result;
-      if (withOp) startOperation(this.cm);
-      try { result = f.apply(this, arguments); }
-      finally { if (withOp) endOperation(this.cm); }
-      return result;
+      if (this.curOp) return f.apply(this, arguments);
+      startOperation(this);
+      try { return f.apply(this, arguments); }
+      finally { endOperation(this); }
     };
   }
-  function runInOp(cm, f) {
-    var withOp = !cm.curOp, result;
-    if (withOp) startOperation(cm);
-    try { result = f(); }
-    finally { if (withOp) endOperation(cm); }
-    return result;
+  function docMethodOp(f) {
+    return function() {
+      var cm = this.cm;
+      if (!cm || cm.curOp) return f.apply(this, arguments);
+      startOperation(cm);
+      try { return f.apply(this, arguments); }
+      finally { endOperation(cm); }
+    };
   }
 
-  // CHANGE TRACKING
+  // VIEW TRACKING
 
-  // Updates the display.view data structure for a given change to
-  // the document. From and to are in pre-change coordinates. Lendiff
-  // is the amount of lines added or subtracted by the change.
+  // These objects are used to represent the visible (currently drawn)
+  // part of the document. A LineView may correspond to multiple
+  // logical lines, if those are connected by collapsed ranges.
+  function LineView(doc, line, lineN) {
+    // The starting line
+    this.line = line;
+    // Continuing lines, if any
+    this.rest = visualLineContinued(line);
+    // Number of logical lines in this visual line
+    this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
+    this.node = this.text = null;
+    this.hidden = lineIsHidden(doc, line);
+  }
+
+  // Create a range of LineView objects for the given lines.
+  function buildViewArray(cm, from, to) {
+    var array = [], nextPos;
+    for (var pos = from; pos < to; pos = nextPos) {
+      var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
+      nextPos = pos + view.size;
+      array.push(view);
+    }
+    return array;
+  }
+
+  // Updates the display.view data structure for a given change to the
+  // document. From and to are in pre-change coordinates. Lendiff is
+  // the amount of lines added or subtracted by the change. This is
+  // used for changes that span multiple lines, or change the way
+  // lines are divided into visual lines. regLineChange (below)
+  // registers single-line changes.
   function regChange(cm, from, to, lendiff) {
     if (from == null) from = cm.doc.first;
     if (to == null) to = cm.doc.first + cm.doc.size;
@@ -1973,7 +2019,8 @@
     }
   }
 
-  // Type must be one of "text", "gutter", "class", "widget"
+  // Register a change to a single line. Type must be one of "text",
+  // "gutter", "class", "widget"
   function regLineChange(cm, line, type) {
     cm.curOp.viewChanged = true;
     var display = cm.display, ext = cm.display.externalMeasured;
@@ -1987,12 +2034,15 @@
     if (indexOf(arr, type) == -1) arr.push(type);
   }
 
+  // Clear the view.
   function resetView(cm) {
     cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
     cm.display.view = [];
     cm.display.viewOffset = 0;
   }
 
+  // Find the view element corresponding to a given line. Return null
+  // when the line isn't visible.
   function findViewIndex(cm, n) {
     if (n >= cm.display.viewTo) return null;
     n -= cm.display.viewFrom;
@@ -2004,6 +2054,8 @@
     }
   }
 
+  // Force the view to cover a given range, adding empty view element
+  // or clipping off existing ones as needed.
   function adjustView(cm, from, to) {
     var display = cm.display, view = display.view;
     if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
@@ -2023,6 +2075,8 @@
     display.viewTo = to;
   }
 
+  // Count the number of lines in the view whose DOM representation is
+  // out of date (or nonexistent).
   function countDirtyView(cm) {
     var view = cm.display.view, dirty = 0;
     for (var i = 0; i < view.length; i++) {
@@ -2032,26 +2086,10 @@
     return dirty;
   }
 
-  function LineView(doc, line, lineN) {
-    this.line = line;
-    this.rest = visualLineContinued(line);
-    this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
-    this.node = this.text = null;
-    this.hidden = lineIsHidden(doc, line);
-  }
-
-  function buildViewArray(cm, from, to) {
-    var array = [], nextPos;
-    for (var pos = from; pos < to; pos = nextPos) {
-      var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
-      nextPos = pos + view.size;
-      array.push(view);
-    }
-    return array;
-  }
-
   // INPUT HANDLING
 
+  // Poll for input changes, using the normal rate of polling. This
+  // runs as long as the editor is focused.
   function slowPoll(cm) {
     if (cm.display.pollingFast) return;
     cm.display.poll.set(cm.options.pollInterval, function() {
@@ -2060,6 +2098,9 @@
     });
   }
 
+  // When an event has just come in that is likely to add or change
+  // something in the input textarea, we poll faster, to ensure that
+  // the change appears on the screen quickly.
   function fastPoll(cm) {
     var missed = false;
     cm.display.pollingFast = true;
@@ -2071,45 +2112,61 @@
     cm.display.poll.set(20, p);
   }
 
-  // prevInput is a hack to work with IME. If we reset the textarea
-  // on every change, that breaks IME. So we look for changes
-  // compared to the previous content instead. (Modern browsers have
-  // events that indicate IME taking place, but these are not widely
-  // supported or compatible enough yet to rely on.)
+  // Read input from the textarea, and update the document to match.
+  // When something is selected, it is present in the textarea, and
+  // selected (unless it is huge, in which case a placeholder is
+  // used). When nothing is selected, the cursor sits after previously
+  // seen text (can be empty), which is stored in prevInput (we must
+  // not reset the textarea when typing, because that breaks IME).
   function readInput(cm) {
     var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc;
+    // Since this is called a *lot*, try to bail out as cheaply as
+    // 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) || isReadOnly(cm) || cm.options.disableInput) return false;
+    // See paste handler for more on the fakedLastChar kludge
     if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
       input.value = input.value.substring(0, input.value.length - 1);
       cm.state.fakedLastChar = false;
     }
     var text = input.value;
+    // If nothing changed, bail.
     if (text == prevInput && !cm.somethingSelected()) return false;
+    // Work around nonsensical selection resetting in IE9/10
     if (ie_upto10 && !ie_upto8 && cm.display.inputHasSelection === text) {
-      resetInput(cm, true);
+      resetInput(cm);
       return false;
     }
 
     var withOp = !cm.curOp;
     if (withOp) startOperation(cm);
     cm.display.shift = false;
+
+    // Find the part of the input that is actually new
     var same = 0, l = Math.min(prevInput.length, text.length);
     while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
     var inserted = text.slice(same), textLines = splitLines(inserted);
+
+    // When pasing N lines into N selections, insert one line per selection
     var multiPaste = cm.state.pasteIncoming && textLines.length > 1 && doc.sel.ranges.length == textLines.length;
 
+    // Normal behavior is to insert the new text into every selection
     for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
       var range = doc.sel.ranges[i];
       var from = range.from(), to = range.to();
+      // Handle deletion
       if (same < prevInput.length)
         from = Pos(from.line, from.ch - (prevInput.length - same));
-      else if (cm.state.overwrite && cmp(from, to) == 0 && !cm.state.pasteIncoming)
+      // Handle overwrite
+      else if (cm.state.overwrite && range.empty() && !cm.state.pasteIncoming)
         to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
       var updateInput = cm.curOp.updateInput;
       var changeEvent = {from: from, to: to, text: multiPaste ? [textLines[i]] : textLines,
                          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
       if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
           cm.options.smartIndent && range.head.ch < 100 &&
           (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
@@ -2123,7 +2180,9 @@
     }
     ensureCursorVisible(cm);
     cm.curOp.updateInput = updateInput;
+    cm.curOp.typing = true;
 
+    // Don't leave long text in the textarea, since it makes further polling slow
     if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
     else cm.display.prevInput = text;
     if (withOp) endOperation(cm);
@@ -2131,7 +2190,9 @@
     return true;
   }
 
-  function resetInput(cm, user) {
+  // Reset the input to correspond to the selection (or to be empty,
+  // when not typing and nothing is selected)
+  function resetInput(cm, typing) {
     var minimal, selected, doc = cm.doc;
     if (cm.somethingSelected()) {
       cm.display.prevInput = "";
@@ -2142,7 +2203,7 @@
       cm.display.input.value = content;
       if (cm.state.focused) selectInput(cm.display.input);
       if (ie_upto10 && !ie_upto8) cm.display.inputHasSelection = content;
-    } else if (user) {
+    } else if (!typing) {
       cm.display.prevInput = cm.display.input.value = "";
       if (ie_upto10 && !ie_upto8) cm.display.inputHasSelection = null;
     }
@@ -2160,9 +2221,11 @@
 
   // EVENT HANDLERS
 
+  // Attach the necessary event handlers when initializing the editor
   function registerEventHandlers(cm) {
     var d = cm.display;
     on(d.scroller, "mousedown", operation(cm, onMouseDown));
+    // Older IE's will not fire a second mousedown for a double click
     if (ie_upto10)
       on(d.scroller, "dblclick", operation(cm, function(e) {
         if (signalDOMEvent(cm, e)) return;
@@ -2174,14 +2237,17 @@
       }));
     else
       on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
+    // Prevent normal selection in the editor (we handle our own)
     on(d.lineSpace, "selectstart", function(e) {
       if (!eventInWidget(d, e)) e_preventDefault(e);
     });
-    // Gecko browsers fire contextmenu *after* opening the menu, at
+    // Some browsers fire contextmenu *after* opening the menu, at
     // which point we can't mess with it anymore. Context menu is
-    // handled in onMouseDown for Gecko.
+    // handled in onMouseDown for these browsers.
     if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
 
+    // Sync scrolling between fake scrollbars and real scrollable
+    // area, ensure viewport is updated when scrolling.
     on(d.scroller, "scroll", function() {
       if (d.scroller.clientHeight) {
         setScrollTop(cm, d.scroller.scrollTop);
@@ -2196,15 +2262,18 @@
       if (d.scroller.clientHeight) setScrollLeft(cm, d.scrollbarH.scrollLeft);
     });
 
+    // Listen to wheel events in order to try and update the viewport on time.
     on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
     on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
 
+    // Prevent clicks in the scrollbars from killing focus
     function reFocus() { if (cm.state.focused) setTimeout(bind(focusInput, cm), 0); }
     on(d.scrollbarH, "mousedown", reFocus);
     on(d.scrollbarV, "mousedown", reFocus);
     // Prevent wrapper from ever scrolling
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
+    // When the window resizes, we need to refresh active editors.
     var resizeTimer;
     function onResize() {
       if (resizeTimer == null) resizeTimer = setTimeout(function() {
@@ -2216,9 +2285,9 @@
       }, 100);
     }
     on(window, "resize", onResize);
-    // Above handler holds on to the editor and its data structures.
-    // Here we poll to unregister it when the editor is no longer in
-    // the document, so that it can be garbage-collected.
+    // The above handler holds on to the editor and its data
+    // structures. Here we poll to unregister it when the editor is no
+    // longer in the document, so that it can be garbage-collected.
     function unregister() {
       for (var p = d.wrapper.parentNode; p && p != document.body; p = p.parentNode) {}
       if (p) setTimeout(unregister, 5000);
@@ -2237,8 +2306,7 @@
     on(d.input, "blur", bind(onBlur, cm));
 
     function drag_(e) {
-      if (signalDOMEvent(cm, e)) return;
-      e_stop(e);
+      if (!signalDOMEvent(cm, e)) e_stop(e);
     }
     if (cm.options.dragDrop) {
       on(d.scroller, "dragstart", function(e){onDragStart(cm, e);});
@@ -2248,6 +2316,7 @@
     }
     on(d.scroller, "paste", function(e) {
       if (eventInWidget(d, e)) return;
+      cm.state.pasteIncoming = true;
       focusInput(cm);
       fastPoll(cm);
     });
@@ -2285,12 +2354,20 @@
     });
   }
 
+  // MOUSE EVENTS
+
+  // Return true when the given mouse event happened in a widget
   function eventInWidget(display, e) {
     for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
       if (!n || n.ignoreEvents || n.parentNode == display.sizer && n != display.mover) return true;
     }
   }
 
+  // Given a mouse event, find the corresponding position. If liberal
+  // is false, it checks whether a gutter or scrollbar was clicked,
+  // and returns null if it was. forRect is used by rectangular
+  // selections, and tries to estimate a character position even for
+  // coordinates beyond the right of the text.
   function posFromMouse(cm, e, liberal, forRect) {
     var display = cm.display;
     if (!liberal) {
@@ -2311,6 +2388,11 @@
     return coords;
   }
 
+  // A mouse down can be a single click, double click, triple click,
+  // start of selection drag, start of text drag, new cursor
+  // (ctrl-click), rectangle drag (alt-drag), or xwin
+  // middle-click-paste. Or it might be a click on something we should
+  // not interfere with, such as a scrollbar or widget.
   function onMouseDown(e) {
     if (signalDOMEvent(this, e)) return;
     var cm = this, display = cm.display;
@@ -2318,6 +2400,8 @@
 
     if (eventInWidget(display, e)) {
       if (!webkit) {
+        // Briefly turn off draggability, to allow widgets to do
+        // normal dragging things.
         display.scroller.draggable = false;
         setTimeout(function(){display.scroller.draggable = true;}, 100);
       }
@@ -2340,7 +2424,7 @@
       e_preventDefault(e);
       break;
     case 3:
-      if (captureRightClick) onContextMenu.call(cm, cm, e);
+      if (captureRightClick) onContextMenu(cm, e);
       break;
     }
   }
@@ -2368,6 +2452,8 @@
       leftButtonNoDrag(cm, e, start, type);
   }
 
+  // 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) {
     var display = cm.display;
     var dragEnd = operation(cm, function(e2) {
@@ -2393,6 +2479,7 @@
     on(display.scroller, "drop", dragEnd);
   }
 
+  // Normal selection, as opposed to text dragging.
   function leftButtonNoDrag(cm, e, start, type) {
     var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
@@ -2503,6 +2590,8 @@
     on(document, "mouseup", up);
   }
 
+  // Determines whether an event happened in the gutter, and fires the
+  // handlers for the corresponding event.
   function gutterEvent(cm, e, type, prevent, signalfn) {
     try { var mX = e.clientX, mY = e.clientY; }
     catch(e) { return false; }
@@ -2526,11 +2615,6 @@
     }
   }
 
-  function contextMenuInGutter(cm, e) {
-    if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
-  }
-
   function clickInGutter(cm, e) {
     return gutterEvent(cm, e, "gutterClick", true, signalLater);
   }
@@ -2547,6 +2631,8 @@
     if (ie_upto10) lastDrop = +new Date;
     var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
     if (!pos || isReadOnly(cm)) return;
+    // Might be a file drop, in which case we simply extract the text
+    // and insert it.
     if (files && files.length && window.FileReader && window.File) {
       var n = files.length, text = Array(n), read = 0;
       var loadFile = function(file, i) {
@@ -2563,7 +2649,7 @@
         reader.readAsText(file);
       };
       for (var i = 0; i < n; ++i) loadFile(files[i], i);
-    } else {
+    } else { // Normal drop
       // Don't do a replace if the drop happened inside of the selected text.
       if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
         cm.state.draggingText(e);
@@ -2590,8 +2676,7 @@
     if (ie_upto10 && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
 
-    var txt = cm.getSelection();
-    e.dataTransfer.setData("Text", txt);
+    e.dataTransfer.setData("Text", cm.getSelection());
 
     // Use dummy image instead of default browsers image.
     // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
@@ -2609,6 +2694,10 @@
     }
   }
 
+  // SCROLL EVENTS
+
+  // Sync the scrollable area and scrollbars, ensure the viewport
+  // covers the visible area.
   function setScrollTop(cm, val) {
     if (Math.abs(cm.doc.scrollTop - val) < 2) return;
     cm.doc.scrollTop = val;
@@ -2618,6 +2707,8 @@
     if (gecko) updateDisplay(cm, false);
     startWorker(cm, 100);
   }
+  // Sync scroller and scrollbar, ensure the gutter elements are
+  // aligned.
   function setScrollLeft(cm, val, isScroller) {
     if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;
     val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
@@ -2689,6 +2780,8 @@
       return;
     }
 
+    // 'Project' the visible viewport to cover the area that is being
+    // scrolled into view (if we know enough to estimate it).
     if (dy && wheelPixelsPerUnit != null) {
       var pixels = dy * wheelPixelsPerUnit;
       var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
@@ -2718,6 +2811,9 @@
     }
   }
 
+  // KEY EVENTS
+
+  // Run a handler that was bound to a key.
   function doHandleBinding(cm, bound, dropShift) {
     if (typeof bound == "string") {
       bound = commands[bound];
@@ -2738,6 +2834,7 @@
     return done;
   }
 
+  // Collect the currently active keymaps.
   function allKeyMaps(cm) {
     var maps = cm.state.keyMaps.slice(0);
     if (cm.options.extraKeys) maps.push(cm.options.extraKeys);
@@ -2746,8 +2843,9 @@
   }
 
   var maybeTransition;
+  // Handle a key from the keydown event.
   function handleKeyBinding(cm, e) {
-    // Handle auto keymap transitions
+    // Handle automatic keymap transitions
     var startMap = getKeyMap(cm.options.keyMap), next = startMap.auto;
     clearTimeout(maybeTransition);
     if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
@@ -2777,12 +2875,12 @@
     if (handled) {
       e_preventDefault(e);
       restartBlink(cm);
-      if (ie_upto8) { e.oldKeyCode = e.keyCode; e.keyCode = 0; }
       signalLater(cm, "keyHandled", cm, name, e);
     }
     return handled;
   }
 
+  // Handle a key from the keypress event
   function handleCharBinding(cm, e, ch) {
     var handled = lookupKey("'" + ch + "'", allKeyMaps(cm),
                             function(b) { return doHandleBinding(cm, b, true); });
@@ -2794,20 +2892,14 @@
     return handled;
   }
 
-  function onKeyUp(e) {
-    var cm = this;
-    if (signalDOMEvent(cm, e)) return;
-    if (e.keyCode == 16) cm.doc.sel.shift = false;
-  }
-
   var lastStoppedKey = null;
   function onKeyDown(e) {
     var cm = this;
     if (!cm.state.focused) onFocus(cm);
     if (signalDOMEvent(cm, e)) return;
+    // IE does strange things with escape.
     if (ie_upto10 && e.keyCode == 27) e.returnValue = false;
     var code = e.keyCode;
-    // IE does strange things with escape.
     cm.display.shift = code == 16 || e.shiftKey;
     var handled = handleKeyBinding(cm, e);
     if (presto) {
@@ -2818,6 +2910,11 @@
     }
   }
 
+  function onKeyUp(e) {
+    if (signalDOMEvent(this, e)) return;
+    if (e.keyCode == 16) this.doc.sel.shift = false;
+  }
+
   function onKeyPress(e) {
     var cm = this;
     if (signalDOMEvent(cm, e)) return;
@@ -2830,6 +2927,8 @@
     fastPoll(cm);
   }
 
+  // FOCUS/BLUR EVENTS
+
   function onFocus(cm) {
     if (cm.options.readOnly == "nocursor") return;
     if (!cm.state.focused) {
@@ -2838,7 +2937,7 @@
       if (cm.display.wrapper.className.search(/\bCodeMirror-focused\b/) == -1)
         cm.display.wrapper.className += " CodeMirror-focused";
       if (!cm.curOp) {
-        resetInput(cm, true);
+        resetInput(cm);
         if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
       }
     }
@@ -2855,7 +2954,12 @@
     setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150);
   }
 
+  // CONTEXT MENU HANDLING
+
   var detectingSelectAll;
+  // To make the context menu work, we need to briefly unhide the
+  // textarea (making it as unobtrusive as possible) to let the
+  // right-click take effect on it.
   function onContextMenu(cm, e) {
     if (signalDOMEvent(cm, e, "contextmenu")) return;
     var display = cm.display;
@@ -2876,11 +2980,14 @@
       "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: transparent; outline: none;" +
       "border-width: 0; outline: none; overflow: hidden; opacity: .05; -ms-opacity: .05; filter: alpha(opacity=5);";
     focusInput(cm);
-    resetInput(cm, true);
+    resetInput(cm);
     // Adds "Select all" to context menu in FF
     var hasSelection = cm.somethingSelected();
     if (!hasSelection) display.input.value = display.prevInput = " ";
 
+    // Select-all will be greyed out if there's nothing to select, so
+    // this adds a zero-width space so that we can later check whether
+    // it got selected.
     function prepareSelectAllHack() {
       if (display.input.selectionStart != null) {
         var extval = display.input.value = "\u200b" + (hasSelection ? display.input.value : "");
@@ -2921,14 +3028,23 @@
     }
   }
 
+  function contextMenuInGutter(cm, e) {
+    if (!hasHandler(cm, "gutterContextMenu")) return false;
+    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
+  }
+
   // UPDATING
 
+  // Compute the position of the end of a change (its 'to' property
+  // refers to the pre-change end).
   var changeEnd = CodeMirror.changeEnd = function(change) {
     if (!change.text) return change.to;
     return Pos(change.from.line + change.text.length - 1,
                lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
   };
 
+  // Adjust a position to refer to the post-change position of the
+  // same text, or the end of the change if the change covers it.
   function adjustForChange(pos, change) {
     if (cmp(pos, change.from) < 0) return pos;
     if (cmp(pos, change.to) <= 0) return changeEnd(change);
@@ -2955,7 +3071,8 @@
       return Pos(nw.line + (pos.line - old.line), pos.ch);
   }
 
-  // Hint can be "start"|"around"
+  // Used by replaceSelections to allow moving the selection to the
+  // start or around the replaced test. Hint may be "start" or "around".
   function computeReplacedSel(doc, changes, hint) {
     var out = [];
     var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
@@ -2975,6 +3092,7 @@
     return new Selection(out, doc.sel.primIndex);
   }
 
+  // Allow "beforeChange" event handlers to influence a change
   function filterChange(doc, change, update) {
     var obj = {
       canceled: false,
@@ -2997,8 +3115,8 @@
     return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin};
   }
 
-  // Replace the range from from to to by the strings in replacement.
-  // change is a {from, to, text [, origin]} object
+  // Apply a change to a document, and add it to the document's
+  // history, and propagating it to all linked documents.
   function makeChange(doc, change, ignoreReadOnly) {
     if (doc.cm) {
       if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly);
@@ -3015,13 +3133,13 @@
     var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
     if (split) {
       for (var i = split.length - 1; i >= 0; --i)
-        makeChangeNoReadonly(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text});
+        makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text});
     } else {
-      makeChangeNoReadonly(doc, change);
+      makeChangeInner(doc, change);
     }
   }
 
-  function makeChangeNoReadonly(doc, change) {
+  function makeChangeInner(doc, change) {
     if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return;
     var selAfter = computeSelAfterChange(doc, change);
     addToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
@@ -3038,6 +3156,7 @@
     });
   }
 
+  // Revert a change stored in a document's history.
   function makeChangeFromHistory(doc, type, allowSelectionOnly) {
     if (doc.cm && doc.cm.state.suppressEdits) return;
 
@@ -3055,6 +3174,8 @@
       else break;
     }
 
+    // Build up a reverse change object to add to the opposite history
+    // stack (redo when undoing, and vice versa).
     var anti = {changes: [], selBefore: event.selAfter, selAfter: event.selBefore,
                 generation: hist.generation};
     dest.push(anti);
@@ -3076,6 +3197,7 @@
       makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
       var rebased = [];
 
+      // Propagate to the linked documents
       linkedDocs(doc, function(doc, sharedHist) {
         if (!sharedHist && indexOf(rebased, doc.history) == -1) {
           rebaseHist(doc.history, change);
@@ -3086,6 +3208,8 @@
     }
   }
 
+  // Sub-views need their line numbers shifted when text is added
+  // above or below them in the parent document.
   function shiftDoc(doc, distance) {
     doc.first += distance;
     doc.sel = new Selection(map(doc.sel.ranges, function(range) {
@@ -3095,6 +3219,8 @@
     if (doc.cm) regChange(doc.cm, doc.first, doc.first, distance);
   }
 
+  // More lower-level change function, handling only a single document
+  // (not linked ones).
   function makeChangeSingleDoc(doc, change, selAfter, spans) {
     if (doc.cm && !doc.cm.curOp)
       return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans);
@@ -3125,6 +3251,8 @@
     else updateDoc(doc, change, spans, selAfter);
   }
 
+  // Handle the interaction of a change to a document with the editor
+  // that this document is part of.
   function makeChangeSingleDocInEditor(cm, change, spans, selAfter) {
     var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
 
@@ -3184,7 +3312,7 @@
     makeChange(doc, {from: from, to: to, text: code, origin: origin});
   }
 
-  // SCROLLING
+  // SCROLLING THINGS INTO VIEW
 
   function ensureCursorVisible(cm) {
     resolveScrollToPos(cm);
@@ -3362,7 +3490,7 @@
       }
       kill.push(toKill);
     }
-    cm.operation(function() {
+    runInOp(cm, function() {
       for (var i = kill.length - 1; i >= 0; i--)
         replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
       ensureCursorVisible(cm);
@@ -3447,7 +3575,7 @@
 
   // PROTOTYPE
 
-  // The publicly visible API. Note that operation(null, f) means
+  // The publicly visible API. Note that methodOp(f) means
   // 'wrap f in an operation, performed on its `this` parameter'
 
   CodeMirror.prototype = {
@@ -3477,14 +3605,14 @@
         }
     },
 
-    addOverlay: operation(null, function(spec, options) {
+    addOverlay: methodOp(function(spec, options) {
       var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
       if (mode.startState) throw new Error("Overlays may not be stateful.");
       this.state.overlays.push({mode: mode, modeSpec: spec, opaque: options && options.opaque});
       this.state.modeGen++;
       regChange(this);
     }),
-    removeOverlay: operation(null, function(spec) {
+    removeOverlay: methodOp(function(spec) {
       var overlays = this.state.overlays;
       for (var i = 0; i < overlays.length; ++i) {
         var cur = overlays[i].modeSpec;
@@ -3497,14 +3625,14 @@
       }
     }),
 
-    indentLine: operation(null, function(n, dir, aggressive) {
+    indentLine: methodOp(function(n, dir, aggressive) {
       if (typeof dir != "string" && typeof dir != "number") {
         if (dir == null) dir = this.options.smartIndent ? "smart" : "prev";
         else dir = dir ? "add" : "subtract";
       }
       if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
     }),
-    indentSelection: operation(null, function(how) {
+    indentSelection: methodOp(function(how) {
       var ranges = this.doc.sel.ranges, end = -1;
       for (var i = 0; i < ranges.length; i++) {
         var range = ranges[i];
@@ -3627,7 +3755,7 @@
     defaultTextHeight: function() { return textHeight(this.display); },
     defaultCharWidth: function() { return charWidth(this.display); },
 
-    setGutterMarker: operation(null, function(line, gutterID, value) {
+    setGutterMarker: methodOp(function(line, gutterID, value) {
       return changeLine(this, line, "gutter", function(line) {
         var markers = line.gutterMarkers || (line.gutterMarkers = {});
         markers[gutterID] = value;
@@ -3636,7 +3764,7 @@
       });
     }),
 
-    clearGutter: operation(null, function(gutterID) {
+    clearGutter: methodOp(function(gutterID) {
       var cm = this, doc = cm.doc, i = doc.first;
       doc.iter(function(line) {
         if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
@@ -3648,7 +3776,7 @@
       });
     }),
 
-    addLineClass: operation(null, function(handle, where, cls) {
+    addLineClass: methodOp(function(handle, where, cls) {
       return changeLine(this, handle, "class", function(line) {
         var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
         if (!line[prop]) line[prop] = cls;
@@ -3658,7 +3786,7 @@
       });
     }),
 
-    removeLineClass: operation(null, function(handle, where, cls) {
+    removeLineClass: methodOp(function(handle, where, cls) {
       return changeLine(this, handle, "class", function(line) {
         var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
         var cur = line[prop];
@@ -3674,7 +3802,7 @@
       });
     }),
 
-    addLineWidget: operation(null, function(handle, node, options) {
+    addLineWidget: methodOp(function(handle, node, options) {
       return addLineWidget(this, handle, node, options);
     }),
 
@@ -3730,9 +3858,9 @@
         scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight);
     },
 
-    triggerOnKeyDown: operation(null, onKeyDown),
-    triggerOnKeyPress: operation(null, onKeyPress),
-    triggerOnKeyUp: operation(null, onKeyUp),
+    triggerOnKeyDown: methodOp(onKeyDown),
+    triggerOnKeyPress: methodOp(onKeyPress),
+    triggerOnKeyUp: methodOp(onKeyUp),
 
     execCommand: function(cmd) {
       if (commands.hasOwnProperty(cmd))
@@ -3749,7 +3877,7 @@
       return cur;
     },
 
-    moveH: operation(null, function(dir, unit) {
+    moveH: methodOp(function(dir, unit) {
       var cm = this;
       cm.extendSelectionsBy(function(range) {
         if (cm.display.shift || cm.doc.extend || range.empty())
@@ -3759,7 +3887,7 @@
       });
     }),
 
-    deleteH: operation(null, function(dir, unit) {
+    deleteH: methodOp(function(dir, unit) {
       var sel = this.doc.sel, doc = this.doc;
       if (sel.somethingSelected())
         doc.replaceSelection("", null, "+delete");
@@ -3768,7 +3896,6 @@
           var other = findPosH(doc, range.head, dir, unit, false);
           return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other};
         });
-      this.curOp.userSelChange = true;
     }),
 
     findPosV: function(from, amount, unit, goalColumn) {
@@ -3784,7 +3911,7 @@
       return cur;
     },
 
-    moveV: operation(null, function(dir, unit) {
+    moveV: methodOp(function(dir, unit) {
       var cm = this, doc = this.doc, goals = [];
       var collapse = !cm.display.shift && !doc.sel.extend && doc.sel.somethingSelected();
       doc.extendSelectionsBy(function(range) {
@@ -3813,7 +3940,7 @@
     },
     hasFocus: function() { return activeElt() == this.display.input; },
 
-    scrollTo: operation(null, function(x, y) {
+    scrollTo: methodOp(function(x, y) {
       if (x != null || y != null) resolveScrollToPos(this);
       if (x != null) this.curOp.scrollLeft = x;
       if (y != null) this.curOp.scrollTop = y;
@@ -3825,7 +3952,7 @@
               clientHeight: scroller.clientHeight - co, clientWidth: scroller.clientWidth - co};
     },
 
-    scrollIntoView: operation(null, function(range, margin) {
+    scrollIntoView: methodOp(function(range, margin) {
       if (range == null) range = {from: this.doc.sel.primary().head, to: null};
       else if (typeof range == "number") range = {from: Pos(range, 0), to: null};
       else if (range.from == null) range = {from: range, to: null};
@@ -3844,7 +3971,7 @@
       }
     }),
 
-    setSize: operation(null, function(width, height) {
+    setSize: methodOp(function(width, height) {
       function interpret(val) {
         return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
       }
@@ -3857,7 +3984,7 @@
 
     operation: function(f){return runInOp(this, f);},
 
-    refresh: operation(null, function() {
+    refresh: methodOp(function() {
       var oldHeight = this.display.cachedTextHeight;
       regChange(this);
       clearCaches(this);
@@ -3867,12 +3994,12 @@
       signal(this, "refresh", this);
     }),
 
-    swapDoc: operation(null, function(doc) {
+    swapDoc: methodOp(function(doc) {
       var old = this.doc;
       old.cm = null;
       attachDoc(this, doc);
       clearCaches(this);
-      resetInput(this, true);
+      resetInput(this);
       this.scrollTo(doc.scrollLeft, doc.scrollTop);
       signalLater(this, "swapDoc", this, old);
       return old;
@@ -3961,10 +4088,10 @@
       cm.display.disabled = true;
     } else {
       cm.display.disabled = false;
-      if (!val) resetInput(cm, true);
+      if (!val) resetInput(cm);
     }
   });
-  option("disableInput", false, function(cm, val) {if (!val) resetInput(cm, true);}, true);
+  option("disableInput", false, function(cm, val) {if (!val) resetInput(cm);}, true);
   option("dragDrop", true);
 
   option("cursorBlinkRate", 530);
@@ -4208,7 +4335,7 @@
       else cm.replaceSelection("\t", null, "+input");
     },
     transposeChars: function(cm) {
-      cm.operation(function() {
+      runInOp(cm, function() {
         var ranges = cm.listSelections();
         for (var i = 0; i < ranges.length; i++) {
           var cur = ranges[i].head, line = getLine(cm.doc, cur.line);
@@ -4219,7 +4346,7 @@
       });
     },
     newlineAndIndent: function(cm) {
-      operation(cm, function() {
+      runInOp(cm, function() {
         var len = cm.listSelections().length;
         for (var i = 0; i < len; i++) {
           var range = cm.listSelections()[i];
@@ -4227,7 +4354,7 @@
           cm.indentLine(range.from().line + 1, null, true);
           ensureCursorVisible(cm);
         }
-      })();
+      });
     },
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}
   };
@@ -4946,16 +5073,15 @@
     this.node = node;
   };
   eventMixin(LineWidget);
-  function widgetOperation(f) {
+  function widgetMethodOp(f) {
     return function() {
-      var withOp = !this.cm.curOp;
-      if (withOp) startOperation(this.cm);
-      try {var result = f.apply(this, arguments);}
-      finally {if (withOp) endOperation(this.cm);}
-      return result;
+      if (this.cm.curOp) return f.apply(this, arguments);
+      startOperation(this.cm);
+      try { return f.apply(this, arguments); }
+      finally { endOperation(this.cm); }
     };
   }
-  LineWidget.prototype.clear = widgetOperation(function() {
+  LineWidget.prototype.clear = widgetMethodOp(function() {
     var ws = this.line.widgets, no = lineNo(this.line);
     if (no == null || !ws) return;
     for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
@@ -4965,7 +5091,7 @@
     if (aboveVisible) addToScrollPos(this.cm, null, -this.height);
     regLineChange(this.cm, no, "widget");
   });
-  LineWidget.prototype.changed = widgetOperation(function() {
+  LineWidget.prototype.changed = widgetMethodOp(function() {
     var oldH = this.height;
     this.height = null;
     var diff = widgetHeight(this) - oldH;
@@ -5560,7 +5686,7 @@
       if (lineSep === false) return lines;
       return lines.join(lineSep || "\n");
     },
-    setValue: docOperation(function(code) {
+    setValue: docMethodOp(function(code) {
       var top = Pos(this.first, 0), last = this.first + this.size - 1;
       makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
                         text: splitLines(code), origin: "setValue"}, true);
@@ -5604,22 +5730,22 @@
     listSelections: function() { return this.sel.ranges; },
     somethingSelected: function() {return this.sel.somethingSelected();},
 
-    setCursor: docOperation(function(line, ch, scroll) {
+    setCursor: docMethodOp(function(line, ch, scroll) {
       setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, scroll);
     }),
-    setSelection: docOperation(function(anchor, head, scroll) {
+    setSelection: docMethodOp(function(anchor, head, scroll) {
       setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), scroll);
     }),
-    extendSelection: docOperation(function(head, other, scroll) {
+    extendSelection: docMethodOp(function(head, other, scroll) {
       extendSelection(this, clipPos(this, head), other && clipPos(this, other), scroll);
     }),
-    extendSelections: docOperation(function(heads, scroll) {
+    extendSelections: docMethodOp(function(heads, scroll) {
       extendSelections(this, clipPosArray(this, heads, scroll));
     }),
-    extendSelectionsBy: docOperation(function(f, scroll) {
+    extendSelectionsBy: docMethodOp(function(f, scroll) {
       extendSelections(this, map(this.sel.ranges, f), scroll);
     }),
-    setSelections: docOperation(function(ranges, primary, scroll) {
+    setSelections: docMethodOp(function(ranges, primary, scroll) {
       if (!ranges.length) return;
       for (var i = 0, out = []; i < ranges.length; i++)
         out[i] = new Range(clipPos(this, ranges[i].anchor),
@@ -5627,7 +5753,7 @@
       if (primary == null) primary = ranges.length - 1;
       setSelection(this, normalizeSelection(out, primary), scroll);
     }),
-    addSelection: docOperation(function(anchor, head) {
+    addSelection: docMethodOp(function(anchor, head) {
       var ranges = this.sel.ranges.slice(0);
       ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
       setSelection(this, normalizeSelection(ranges, ranges.length - 1), false);
@@ -5651,7 +5777,7 @@
       }
       return parts;
     },
-    replaceSelection: docOperation(function(code, collapse, origin) {
+    replaceSelection: docMethodOp(function(code, collapse, origin) {
       var dup = [];
       for (var i = 0; i < this.sel.ranges.length; i++)
         dup[i] = code;
@@ -5669,10 +5795,10 @@
       if (newSel) setSelection(this, newSel);
       else if (this.cm) ensureCursorVisible(this.cm);
     },
-    undo: docOperation(function() {makeChangeFromHistory(this, "undo");}),
-    redo: docOperation(function() {makeChangeFromHistory(this, "redo");}),
-    undoSelection: docOperation(function() {makeChangeFromHistory(this, "undo", true);}),
-    redoSelection: docOperation(function() {makeChangeFromHistory(this, "redo", true);}),
+    undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
+    redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
+    undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
+    redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
 
     setExtending: function(val) {this.extend = val;},
 

From cdece7bfb4121a54c80ebd44b1a29a35a5fe9c4f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 10:59:04 +0100
Subject: [PATCH 0924/4742] Fix calls to updateDisplay passing bogus arguments

Broken by 32c2630
Closes #2222
---
 lib/codemirror.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cce334ad37..6b6a0e9ca3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2701,10 +2701,10 @@
   function setScrollTop(cm, val) {
     if (Math.abs(cm.doc.scrollTop - val) < 2) return;
     cm.doc.scrollTop = val;
-    if (!gecko) updateDisplay(cm, false, {top: val});
+    if (!gecko) updateDisplay(cm, {top: val});
     if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
     if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;
-    if (gecko) updateDisplay(cm, false);
+    if (gecko) updateDisplay(cm);
     startWorker(cm, 100);
   }
   // Sync scroller and scrollbar, ensure the gutter elements are
@@ -2787,7 +2787,7 @@
       var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
       if (pixels < 0) top = Math.max(0, top + pixels - 50);
       else bot = Math.min(cm.doc.height, bot + pixels + 50);
-      updateDisplay(cm, false, {top: top, bottom: bot});
+      updateDisplay(cm, {top: top, bottom: bot});
     }
 
     if (wheelSamples < 20) {

From 94e4a4b4dafacf0187c0ae46f0452147c89fb421 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 11:09:56 +0100
Subject: [PATCH 0925/4742] [rst mode] Fix innerMode and copyState

Issue #2221
---
 mode/rst/rst.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 75563ba982..e8ebb63e2a 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -477,13 +477,18 @@ CodeMirror.defineMode('rst-base', function (config) {
         },
 
         copyState: function (state) {
-            return {tok: state.tok, ctx: state.ctx};
+            var ctx = state.ctx, tmp = state.tmp;
+            if (ctx.local)
+              ctx = {mode: ctx.mode, local: CodeMirror.copyState(ctx.mode, ctx.local)};
+            if (tmp)
+              tmp = {mode: tmp.mode, local: CodeMirror.copyState(tmp.mode, tmp.local)};
+            return {tok: state.tok, ctx: ctx, tmp: tmp};
         },
 
         innerMode: function (state) {
-            return state.tmp ? {state: state.tmp.local, mode: state.tmp.mode}
-                 : state.ctx ? {state: state.ctx.local, mode: state.ctx.mode}
-                             : null;
+            return state.tmp      ? {state: state.tmp.local, mode: state.tmp.mode}
+                 : state.ctx.mode ? {state: state.ctx.local, mode: state.ctx.mode}
+                                  : null;
         },
 
         token: function (stream, state) {

From ca66aab89444eca940fc3e90d003a395702be63d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 11:14:22 +0100
Subject: [PATCH 0926/4742] [rst mode] Swap mode definitions

So that the default mode when this is loaded first is actually a
working mode.

Also: indent the file to correspond to the rest of the codebase.

Closes #2223
---
 mode/rst/rst.js | 1042 +++++++++++++++++++++++------------------------
 1 file changed, 520 insertions(+), 522 deletions(-)

diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index e8ebb63e2a..bef3cc1598 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -1,559 +1,557 @@
-CodeMirror.defineMode('rst-base', function (config) {
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
+CodeMirror.defineMode('rst', function (config, options) {
 
-    function format(string) {
-        var args = Array.prototype.slice.call(arguments, 1);
-        return string.replace(/{(\d+)}/g, function (match, n) {
-            return typeof args[n] != 'undefined' ? args[n] : match;
-        });
+  var rx_strong = /^\*\*[^\*\s](?:[^\*]*[^\*\s])?\*\*/;
+  var rx_emphasis = /^\*[^\*\s](?:[^\*]*[^\*\s])?\*/;
+  var rx_literal = /^``[^`\s](?:[^`]*[^`\s])``/;
+
+  var rx_number = /^(?:[\d]+(?:[\.,]\d+)*)/;
+  var rx_positive = /^(?:\s\+[\d]+(?:[\.,]\d+)*)/;
+  var rx_negative = /^(?:\s\-[\d]+(?:[\.,]\d+)*)/;
+
+  var rx_uri_protocol = "[Hh][Tt][Tt][Pp][Ss]?://";
+  var rx_uri_domain = "(?:[\\d\\w.-]+)\\.(?:\\w{2,6})";
+  var rx_uri_path = "(?:/[\\d\\w\\#\\%\\&\\-\\.\\,\\/\\:\\=\\?\\~]+)*";
+  var rx_uri = new RegExp("^" + rx_uri_protocol + rx_uri_domain + rx_uri_path);
+
+  var overlay = {
+    token: function (stream) {
+
+      if (stream.match(rx_strong) && stream.match (/\W+|$/, false))
+        return 'strong';
+      if (stream.match(rx_emphasis) && stream.match (/\W+|$/, false))
+        return 'em';
+      if (stream.match(rx_literal) && stream.match (/\W+|$/, false))
+        return 'string-2';
+      if (stream.match(rx_number))
+        return 'number';
+      if (stream.match(rx_positive))
+        return 'positive';
+      if (stream.match(rx_negative))
+        return 'negative';
+      if (stream.match(rx_uri))
+        return 'link';
+
+      while (stream.next() != null) {
+        if (stream.match(rx_strong, false)) break;
+        if (stream.match(rx_emphasis, false)) break;
+        if (stream.match(rx_literal, false)) break;
+        if (stream.match(rx_number, false)) break;
+        if (stream.match(rx_positive, false)) break;
+        if (stream.match(rx_negative, false)) break;
+        if (stream.match(rx_uri, false)) break;
+      }
+
+      return null;
     }
+  };
 
-    function AssertException(message) {
-        this.message = message;
-    }
+  var mode = CodeMirror.getMode(
+    config, options.backdrop || 'rst-base'
+  );
 
-    AssertException.prototype.toString = function () {
-        return 'AssertException: ' + this.message;
-    };
+  return CodeMirror.overlayMode(mode, overlay, true); // combine
+}, 'python', 'stex');
 
-    function assert(expression, message) {
-        if (!expression) throw new AssertException(message);
-        return expression;
-    }
+///////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    var mode_python = CodeMirror.getMode(config, 'python');
-    var mode_stex = CodeMirror.getMode(config, 'stex');
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    var SEPA = "\\s+";
-    var TAIL = "(?:\\s*|\\W|$)",
-        rx_TAIL = new RegExp(format('^{0}', TAIL));
-
-    var NAME =
-        "(?:[^\\W\\d_](?:[\\w!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)",
-        rx_NAME = new RegExp(format('^{0}', NAME));
-    var NAME_WWS =
-        "(?:[^\\W\\d_](?:[\\w\\s!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)";
-    var REF_NAME = format('(?:{0}|`{1}`)', NAME, NAME_WWS);
-
-    var TEXT1 = "(?:[^\\s\\|](?:[^\\|]*[^\\s\\|])?)";
-    var TEXT2 = "(?:[^\\`]+)",
-        rx_TEXT2 = new RegExp(format('^{0}', TEXT2));
-
-    var rx_section = new RegExp(
-        "^([!'#$%&\"()*+,-./:;<=>?@\\[\\\\\\]^_`{|}~])\\1{3,}\\s*$");
-    var rx_explicit = new RegExp(
-        format('^\\.\\.{0}', SEPA));
-    var rx_link = new RegExp(
-        format('^_{0}:{1}|^__:{1}', REF_NAME, TAIL));
-    var rx_directive = new RegExp(
-        format('^{0}::{1}', REF_NAME, TAIL));
-    var rx_substitution = new RegExp(
-        format('^\\|{0}\\|{1}{2}::{3}', TEXT1, SEPA, REF_NAME, TAIL));
-    var rx_footnote = new RegExp(
-        format('^\\[(?:\\d+|#{0}?|\\*)]{1}', REF_NAME, TAIL));
-    var rx_citation = new RegExp(
-        format('^\\[{0}\\]{1}', REF_NAME, TAIL));
-
-    var rx_substitution_ref = new RegExp(
-        format('^\\|{0}\\|', TEXT1));
-    var rx_footnote_ref = new RegExp(
-        format('^\\[(?:\\d+|#{0}?|\\*)]_', REF_NAME));
-    var rx_citation_ref = new RegExp(
-        format('^\\[{0}\\]_', REF_NAME));
-    var rx_link_ref1 = new RegExp(
-        format('^{0}__?', REF_NAME));
-    var rx_link_ref2 = new RegExp(
-        format('^`{0}`_', TEXT2));
-
-    var rx_role_pre = new RegExp(
-        format('^:{0}:`{1}`{2}', NAME, TEXT2, TAIL));
-    var rx_role_suf = new RegExp(
-        format('^`{1}`:{0}:{2}', NAME, TEXT2, TAIL));
-    var rx_role = new RegExp(
-        format('^:{0}:{1}', NAME, TAIL));
-
-    var rx_directive_name = new RegExp(format('^{0}', REF_NAME));
-    var rx_directive_tail = new RegExp(format('^::{0}', TAIL));
-    var rx_substitution_text = new RegExp(format('^\\|{0}\\|', TEXT1));
-    var rx_substitution_sepa = new RegExp(format('^{0}', SEPA));
-    var rx_substitution_name = new RegExp(format('^{0}', REF_NAME));
-    var rx_substitution_tail = new RegExp(format('^::{0}', TAIL));
-    var rx_link_head = new RegExp("^_");
-    var rx_link_name = new RegExp(format('^{0}|_', REF_NAME));
-    var rx_link_tail = new RegExp(format('^:{0}', TAIL));
-
-    var rx_verbatim = new RegExp('^::\\s*$');
-    var rx_examples = new RegExp('^\\s+(?:>>>|In \\[\\d+\\]:)\\s');
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function to_normal(stream, state) {
-        var token = null;
-
-        if (stream.sol() && stream.match(rx_examples, false)) {
-            change(state, to_mode, {
-                mode: mode_python, local: mode_python.startState()
-            });
-        } else if (stream.sol() && stream.match(rx_explicit)) {
-            change(state, to_explicit);
-            token = 'meta';
-        } else if (stream.sol() && stream.match(rx_section)) {
-            change(state, to_normal);
-            token = 'header';
-        } else if (phase(state) == rx_role_pre ||
-            stream.match(rx_role_pre, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_normal, context(rx_role_pre, 1));
-                    assert(stream.match(/^:/));
-                    token = 'meta';
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_role_pre, 2));
-                    assert(stream.match(rx_NAME));
-                    token = 'keyword';
-
-                    if (stream.current().match(/^(?:math|latex)/)) {
-                        state.tmp_stex = true;
-                    }
-                    break;
-                case 2:
-                    change(state, to_normal, context(rx_role_pre, 3));
-                    assert(stream.match(/^:`/));
-                    token = 'meta';
-                    break;
-                case 3:
-                    if (state.tmp_stex) {
-                        state.tmp_stex = undefined; state.tmp = {
-                            mode: mode_stex, local: mode_stex.startState()
-                        };
-                    }
-
-                    if (state.tmp) {
-                        if (stream.peek() == '`') {
-                            change(state, to_normal, context(rx_role_pre, 4));
-                            state.tmp = undefined;
-                            break;
-                        }
-
-                        token = state.tmp.mode.token(stream, state.tmp.local);
-                        break;
-                    }
-
-                    change(state, to_normal, context(rx_role_pre, 4));
-                    assert(stream.match(rx_TEXT2));
-                    token = 'string';
-                    break;
-                case 4:
-                    change(state, to_normal, context(rx_role_pre, 5));
-                    assert(stream.match(/^`/));
-                    token = 'meta';
-                    break;
-                case 5:
-                    change(state, to_normal, context(rx_role_pre, 6));
-                    assert(stream.match(rx_TAIL));
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_role_suf ||
-            stream.match(rx_role_suf, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_normal, context(rx_role_suf, 1));
-                    assert(stream.match(/^`/));
-                    token = 'meta';
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_role_suf, 2));
-                    assert(stream.match(rx_TEXT2));
-                    token = 'string';
-                    break;
-                case 2:
-                    change(state, to_normal, context(rx_role_suf, 3));
-                    assert(stream.match(/^`:/));
-                    token = 'meta';
-                    break;
-                case 3:
-                    change(state, to_normal, context(rx_role_suf, 4));
-                    assert(stream.match(rx_NAME));
-                    token = 'keyword';
-                    break;
-                case 4:
-                    change(state, to_normal, context(rx_role_suf, 5));
-                    assert(stream.match(/^:/));
-                    token = 'meta';
-                    break;
-                case 5:
-                    change(state, to_normal, context(rx_role_suf, 6));
-                    assert(stream.match(rx_TAIL));
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_role || stream.match(rx_role, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_normal, context(rx_role, 1));
-                    assert(stream.match(/^:/));
-                    token = 'meta';
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_role, 2));
-                    assert(stream.match(rx_NAME));
-                    token = 'keyword';
-                    break;
-                case 2:
-                    change(state, to_normal, context(rx_role, 3));
-                    assert(stream.match(/^:/));
-                    token = 'meta';
-                    break;
-                case 3:
-                    change(state, to_normal, context(rx_role, 4));
-                    assert(stream.match(rx_TAIL));
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_substitution_ref ||
-            stream.match(rx_substitution_ref, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_normal, context(rx_substitution_ref, 1));
-                    assert(stream.match(rx_substitution_text));
-                    token = 'variable-2';
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_substitution_ref, 2));
-                    if (stream.match(/^_?_?/)) token = 'link';
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (stream.match(rx_footnote_ref)) {
-            change(state, to_normal);
-            token = 'quote';
-        } else if (stream.match(rx_citation_ref)) {
-            change(state, to_normal);
-            token = 'quote';
-        } else if (stream.match(rx_link_ref1)) {
-            change(state, to_normal);
-            if (!stream.peek() || stream.peek().match(/^\W$/)) {
-                token = 'link';
-            }
-        } else if (phase(state) == rx_link_ref2 ||
-            stream.match(rx_link_ref2, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    if (!stream.peek() || stream.peek().match(/^\W$/)) {
-                        change(state, to_normal, context(rx_link_ref2, 1));
-                    } else {
-                        stream.match(rx_link_ref2);
-                    }
-                    break;
-                case 1:
-                    change(state, to_normal, context(rx_link_ref2, 2));
-                    assert(stream.match(/^`/));
-                    token = 'link';
-                    break;
-                case 2:
-                    change(state, to_normal, context(rx_link_ref2, 3));
-                    assert(stream.match(rx_TEXT2));
-                    break;
-                case 3:
-                    change(state, to_normal, context(rx_link_ref2, 4));
-                    assert(stream.match(/^`_/));
-                    token = 'link';
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (stream.match(rx_verbatim)) {
-            change(state, to_verbatim);
-        }
+CodeMirror.defineMode('rst-base', function (config) {
 
-        else {
-            if (stream.next()) change(state, to_normal);
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function format(string) {
+    var args = Array.prototype.slice.call(arguments, 1);
+    return string.replace(/{(\d+)}/g, function (match, n) {
+      return typeof args[n] != 'undefined' ? args[n] : match;
+    });
+  }
+
+  function AssertException(message) {
+    this.message = message;
+  }
+
+  AssertException.prototype.toString = function () {
+    return 'AssertException: ' + this.message;
+  };
+
+  function assert(expression, message) {
+    if (!expression) throw new AssertException(message);
+    return expression;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  var mode_python = CodeMirror.getMode(config, 'python');
+  var mode_stex = CodeMirror.getMode(config, 'stex');
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  var SEPA = "\\s+";
+  var TAIL = "(?:\\s*|\\W|$)",
+  rx_TAIL = new RegExp(format('^{0}', TAIL));
+
+  var NAME =
+    "(?:[^\\W\\d_](?:[\\w!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)",
+  rx_NAME = new RegExp(format('^{0}', NAME));
+  var NAME_WWS =
+    "(?:[^\\W\\d_](?:[\\w\\s!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)";
+  var REF_NAME = format('(?:{0}|`{1}`)', NAME, NAME_WWS);
+
+  var TEXT1 = "(?:[^\\s\\|](?:[^\\|]*[^\\s\\|])?)";
+  var TEXT2 = "(?:[^\\`]+)",
+  rx_TEXT2 = new RegExp(format('^{0}', TEXT2));
+
+  var rx_section = new RegExp(
+    "^([!'#$%&\"()*+,-./:;<=>?@\\[\\\\\\]^_`{|}~])\\1{3,}\\s*$");
+  var rx_explicit = new RegExp(
+    format('^\\.\\.{0}', SEPA));
+  var rx_link = new RegExp(
+    format('^_{0}:{1}|^__:{1}', REF_NAME, TAIL));
+  var rx_directive = new RegExp(
+    format('^{0}::{1}', REF_NAME, TAIL));
+  var rx_substitution = new RegExp(
+    format('^\\|{0}\\|{1}{2}::{3}', TEXT1, SEPA, REF_NAME, TAIL));
+  var rx_footnote = new RegExp(
+    format('^\\[(?:\\d+|#{0}?|\\*)]{1}', REF_NAME, TAIL));
+  var rx_citation = new RegExp(
+    format('^\\[{0}\\]{1}', REF_NAME, TAIL));
+
+  var rx_substitution_ref = new RegExp(
+    format('^\\|{0}\\|', TEXT1));
+  var rx_footnote_ref = new RegExp(
+    format('^\\[(?:\\d+|#{0}?|\\*)]_', REF_NAME));
+  var rx_citation_ref = new RegExp(
+    format('^\\[{0}\\]_', REF_NAME));
+  var rx_link_ref1 = new RegExp(
+    format('^{0}__?', REF_NAME));
+  var rx_link_ref2 = new RegExp(
+    format('^`{0}`_', TEXT2));
+
+  var rx_role_pre = new RegExp(
+    format('^:{0}:`{1}`{2}', NAME, TEXT2, TAIL));
+  var rx_role_suf = new RegExp(
+    format('^`{1}`:{0}:{2}', NAME, TEXT2, TAIL));
+  var rx_role = new RegExp(
+    format('^:{0}:{1}', NAME, TAIL));
+
+  var rx_directive_name = new RegExp(format('^{0}', REF_NAME));
+  var rx_directive_tail = new RegExp(format('^::{0}', TAIL));
+  var rx_substitution_text = new RegExp(format('^\\|{0}\\|', TEXT1));
+  var rx_substitution_sepa = new RegExp(format('^{0}', SEPA));
+  var rx_substitution_name = new RegExp(format('^{0}', REF_NAME));
+  var rx_substitution_tail = new RegExp(format('^::{0}', TAIL));
+  var rx_link_head = new RegExp("^_");
+  var rx_link_name = new RegExp(format('^{0}|_', REF_NAME));
+  var rx_link_tail = new RegExp(format('^:{0}', TAIL));
+
+  var rx_verbatim = new RegExp('^::\\s*$');
+  var rx_examples = new RegExp('^\\s+(?:>>>|In \\[\\d+\\]:)\\s');
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function to_normal(stream, state) {
+    var token = null;
+
+    if (stream.sol() && stream.match(rx_examples, false)) {
+      change(state, to_mode, {
+        mode: mode_python, local: mode_python.startState()
+      });
+    } else if (stream.sol() && stream.match(rx_explicit)) {
+      change(state, to_explicit);
+      token = 'meta';
+    } else if (stream.sol() && stream.match(rx_section)) {
+      change(state, to_normal);
+      token = 'header';
+    } else if (phase(state) == rx_role_pre ||
+               stream.match(rx_role_pre, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_normal, context(rx_role_pre, 1));
+        assert(stream.match(/^:/));
+        token = 'meta';
+        break;
+      case 1:
+        change(state, to_normal, context(rx_role_pre, 2));
+        assert(stream.match(rx_NAME));
+        token = 'keyword';
+
+        if (stream.current().match(/^(?:math|latex)/)) {
+          state.tmp_stex = true;
+        }
+        break;
+      case 2:
+        change(state, to_normal, context(rx_role_pre, 3));
+        assert(stream.match(/^:`/));
+        token = 'meta';
+        break;
+      case 3:
+        if (state.tmp_stex) {
+          state.tmp_stex = undefined; state.tmp = {
+            mode: mode_stex, local: mode_stex.startState()
+          };
         }
 
-        return token;
-    }
+        if (state.tmp) {
+          if (stream.peek() == '`') {
+            change(state, to_normal, context(rx_role_pre, 4));
+            state.tmp = undefined;
+            break;
+          }
 
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function to_explicit(stream, state) {
-        var token = null;
-
-        if (phase(state) == rx_substitution ||
-            stream.match(rx_substitution, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_explicit, context(rx_substitution, 1));
-                    assert(stream.match(rx_substitution_text));
-                    token = 'variable-2';
-                    break;
-                case 1:
-                    change(state, to_explicit, context(rx_substitution, 2));
-                    assert(stream.match(rx_substitution_sepa));
-                    break;
-                case 2:
-                    change(state, to_explicit, context(rx_substitution, 3));
-                    assert(stream.match(rx_substitution_name));
-                    token = 'keyword';
-                    break;
-                case 3:
-                    change(state, to_explicit, context(rx_substitution, 4));
-                    assert(stream.match(rx_substitution_tail));
-                    token = 'meta';
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_directive ||
-            stream.match(rx_directive, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_explicit, context(rx_directive, 1));
-                    assert(stream.match(rx_directive_name));
-                    token = 'keyword';
-
-                    if (stream.current().match(/^(?:math|latex)/))
-                        state.tmp_stex = true;
-                    else if (stream.current().match(/^python/))
-                        state.tmp_py = true;
-                    break;
-                case 1:
-                    change(state, to_explicit, context(rx_directive, 2));
-                    assert(stream.match(rx_directive_tail));
-                    token = 'meta';
-
-                    if (stream.match(/^latex\s*$/) || state.tmp_stex) {
-                        state.tmp_stex = undefined; change(state, to_mode, {
-                            mode: mode_stex, local: mode_stex.startState()
-                        });
-                    }
-                    break;
-                case 2:
-                    change(state, to_explicit, context(rx_directive, 3));
-                    if (stream.match(/^python\s*$/) || state.tmp_py) {
-                        state.tmp_py = undefined; change(state, to_mode, {
-                            mode: mode_python, local: mode_python.startState()
-                        });
-                    }
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (phase(state) == rx_link || stream.match(rx_link, false)) {
-
-            switch (stage(state)) {
-                case 0:
-                    change(state, to_explicit, context(rx_link, 1));
-                    assert(stream.match(rx_link_head));
-                    assert(stream.match(rx_link_name));
-                    token = 'link';
-                    break;
-                case 1:
-                    change(state, to_explicit, context(rx_link, 2));
-                    assert(stream.match(rx_link_tail));
-                    token = 'meta';
-                    break;
-                default:
-                    change(state, to_normal);
-                    assert(stream.current() == '');
-            }
-        } else if (stream.match(rx_footnote)) {
-            change(state, to_normal);
-            token = 'quote';
-        } else if (stream.match(rx_citation)) {
-            change(state, to_normal);
-            token = 'quote';
+          token = state.tmp.mode.token(stream, state.tmp.local);
+          break;
         }
 
-        else {
-            stream.eatSpace();
-            if (stream.eol()) {
-                change(state, to_normal);
-            } else {
-                stream.skipToEnd();
-                change(state, to_comment);
-                token = 'comment';
-            }
+        change(state, to_normal, context(rx_role_pre, 4));
+        assert(stream.match(rx_TEXT2));
+        token = 'string';
+        break;
+      case 4:
+        change(state, to_normal, context(rx_role_pre, 5));
+        assert(stream.match(/^`/));
+        token = 'meta';
+        break;
+      case 5:
+        change(state, to_normal, context(rx_role_pre, 6));
+        assert(stream.match(rx_TAIL));
+        break;
+      default:
+        change(state, to_normal);
+        assert(stream.current() == '');
+      }
+    } else if (phase(state) == rx_role_suf ||
+               stream.match(rx_role_suf, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_normal, context(rx_role_suf, 1));
+        assert(stream.match(/^`/));
+        token = 'meta';
+        break;
+      case 1:
+        change(state, to_normal, context(rx_role_suf, 2));
+        assert(stream.match(rx_TEXT2));
+        token = 'string';
+        break;
+      case 2:
+        change(state, to_normal, context(rx_role_suf, 3));
+        assert(stream.match(/^`:/));
+        token = 'meta';
+        break;
+      case 3:
+        change(state, to_normal, context(rx_role_suf, 4));
+        assert(stream.match(rx_NAME));
+        token = 'keyword';
+        break;
+      case 4:
+        change(state, to_normal, context(rx_role_suf, 5));
+        assert(stream.match(/^:/));
+        token = 'meta';
+        break;
+      case 5:
+        change(state, to_normal, context(rx_role_suf, 6));
+        assert(stream.match(rx_TAIL));
+        break;
+      default:
+        change(state, to_normal);
+        assert(stream.current() == '');
+      }
+    } else if (phase(state) == rx_role || stream.match(rx_role, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_normal, context(rx_role, 1));
+        assert(stream.match(/^:/));
+        token = 'meta';
+        break;
+      case 1:
+        change(state, to_normal, context(rx_role, 2));
+        assert(stream.match(rx_NAME));
+        token = 'keyword';
+        break;
+      case 2:
+        change(state, to_normal, context(rx_role, 3));
+        assert(stream.match(/^:/));
+        token = 'meta';
+        break;
+      case 3:
+        change(state, to_normal, context(rx_role, 4));
+        assert(stream.match(rx_TAIL));
+        break;
+      default:
+        change(state, to_normal);
+        assert(stream.current() == '');
+      }
+    } else if (phase(state) == rx_substitution_ref ||
+               stream.match(rx_substitution_ref, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_normal, context(rx_substitution_ref, 1));
+        assert(stream.match(rx_substitution_text));
+        token = 'variable-2';
+        break;
+      case 1:
+        change(state, to_normal, context(rx_substitution_ref, 2));
+        if (stream.match(/^_?_?/)) token = 'link';
+        break;
+      default:
+        change(state, to_normal);
+        assert(stream.current() == '');
+      }
+    } else if (stream.match(rx_footnote_ref)) {
+      change(state, to_normal);
+      token = 'quote';
+    } else if (stream.match(rx_citation_ref)) {
+      change(state, to_normal);
+      token = 'quote';
+    } else if (stream.match(rx_link_ref1)) {
+      change(state, to_normal);
+      if (!stream.peek() || stream.peek().match(/^\W$/)) {
+        token = 'link';
+      }
+    } else if (phase(state) == rx_link_ref2 ||
+               stream.match(rx_link_ref2, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        if (!stream.peek() || stream.peek().match(/^\W$/)) {
+          change(state, to_normal, context(rx_link_ref2, 1));
+        } else {
+          stream.match(rx_link_ref2);
         }
-
-        return token;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function to_comment(stream, state) {
-        return as_block(stream, state, 'comment');
+        break;
+      case 1:
+        change(state, to_normal, context(rx_link_ref2, 2));
+        assert(stream.match(/^`/));
+        token = 'link';
+        break;
+      case 2:
+        change(state, to_normal, context(rx_link_ref2, 3));
+        assert(stream.match(rx_TEXT2));
+        break;
+      case 3:
+        change(state, to_normal, context(rx_link_ref2, 4));
+        assert(stream.match(/^`_/));
+        token = 'link';
+        break;
+      default:
+        change(state, to_normal);
+        assert(stream.current() == '');
+      }
+    } else if (stream.match(rx_verbatim)) {
+      change(state, to_verbatim);
     }
 
-    function to_verbatim(stream, state) {
-        return as_block(stream, state, 'meta');
+    else {
+      if (stream.next()) change(state, to_normal);
     }
 
-    function as_block(stream, state, token) {
-        if (stream.eol() || stream.eatSpace()) {
-            stream.skipToEnd();
-            return token;
-        } else {
-            change(state, to_normal);
-            return null;
+    return token;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function to_explicit(stream, state) {
+    var token = null;
+
+    if (phase(state) == rx_substitution ||
+        stream.match(rx_substitution, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_explicit, context(rx_substitution, 1));
+        assert(stream.match(rx_substitution_text));
+        token = 'variable-2';
+        break;
+      case 1:
+        change(state, to_explicit, context(rx_substitution, 2));
+        assert(stream.match(rx_substitution_sepa));
+        break;
+      case 2:
+        change(state, to_explicit, context(rx_substitution, 3));
+        assert(stream.match(rx_substitution_name));
+        token = 'keyword';
+        break;
+      case 3:
+        change(state, to_explicit, context(rx_substitution, 4));
+        assert(stream.match(rx_substitution_tail));
+        token = 'meta';
+        break;
+      default:
+        change(state, to_normal);
+        assert(stream.current() == '');
+      }
+    } else if (phase(state) == rx_directive ||
+               stream.match(rx_directive, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_explicit, context(rx_directive, 1));
+        assert(stream.match(rx_directive_name));
+        token = 'keyword';
+
+        if (stream.current().match(/^(?:math|latex)/))
+          state.tmp_stex = true;
+        else if (stream.current().match(/^python/))
+          state.tmp_py = true;
+        break;
+      case 1:
+        change(state, to_explicit, context(rx_directive, 2));
+        assert(stream.match(rx_directive_tail));
+        token = 'meta';
+
+        if (stream.match(/^latex\s*$/) || state.tmp_stex) {
+          state.tmp_stex = undefined; change(state, to_mode, {
+            mode: mode_stex, local: mode_stex.startState()
+          });
         }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    function to_mode(stream, state) {
-
-        if (state.ctx.mode && state.ctx.local) {
-
-            if (stream.sol()) {
-                if (!stream.eatSpace()) change(state, to_normal);
-                return null;
-            }
-
-            return state.ctx.mode.token(stream, state.ctx.local);
+        break;
+      case 2:
+        change(state, to_explicit, context(rx_directive, 3));
+        if (stream.match(/^python\s*$/) || state.tmp_py) {
+          state.tmp_py = undefined; change(state, to_mode, {
+            mode: mode_python, local: mode_python.startState()
+          });
         }
+        break;
+      default:
+        change(state, to_normal);
+        assert(stream.current() == '');
+      }
+    } else if (phase(state) == rx_link || stream.match(rx_link, false)) {
+
+      switch (stage(state)) {
+      case 0:
+        change(state, to_explicit, context(rx_link, 1));
+        assert(stream.match(rx_link_head));
+        assert(stream.match(rx_link_name));
+        token = 'link';
+        break;
+      case 1:
+        change(state, to_explicit, context(rx_link, 2));
+        assert(stream.match(rx_link_tail));
+        token = 'meta';
+        break;
+      default:
+        change(state, to_normal);
+        assert(stream.current() == '');
+      }
+    } else if (stream.match(rx_footnote)) {
+      change(state, to_normal);
+      token = 'quote';
+    } else if (stream.match(rx_citation)) {
+      change(state, to_normal);
+      token = 'quote';
+    }
 
+    else {
+      stream.eatSpace();
+      if (stream.eol()) {
         change(state, to_normal);
-        return null;
+      } else {
+        stream.skipToEnd();
+        change(state, to_comment);
+        token = 'comment';
+      }
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
+    return token;
+  }
 
-    function context(phase, stage, mode, local) {
-        return {phase: phase, stage: stage, mode: mode, local: local};
-    }
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
 
-    function change(state, tok, ctx) {
-        state.tok = tok;
-        state.ctx = ctx || {};
-    }
+  function to_comment(stream, state) {
+    return as_block(stream, state, 'comment');
+  }
 
-    function stage(state) {
-        return state.ctx.stage || 0;
-    }
+  function to_verbatim(stream, state) {
+    return as_block(stream, state, 'meta');
+  }
 
-    function phase(state) {
-        return state.ctx.phase;
+  function as_block(stream, state, token) {
+    if (stream.eol() || stream.eatSpace()) {
+      stream.skipToEnd();
+      return token;
+    } else {
+      change(state, to_normal);
+      return null;
     }
+  }
 
-    ///////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////////////////////////////////////////////////
-
-    return {
-        startState: function () {
-            return {tok: to_normal, ctx: context(undefined, 0)};
-        },
-
-        copyState: function (state) {
-            var ctx = state.ctx, tmp = state.tmp;
-            if (ctx.local)
-              ctx = {mode: ctx.mode, local: CodeMirror.copyState(ctx.mode, ctx.local)};
-            if (tmp)
-              tmp = {mode: tmp.mode, local: CodeMirror.copyState(tmp.mode, tmp.local)};
-            return {tok: state.tok, ctx: ctx, tmp: tmp};
-        },
-
-        innerMode: function (state) {
-            return state.tmp      ? {state: state.tmp.local, mode: state.tmp.mode}
-                 : state.ctx.mode ? {state: state.ctx.local, mode: state.ctx.mode}
-                                  : null;
-        },
-
-        token: function (stream, state) {
-            return state.tok(stream, state);
-        }
-    };
-}, 'python', 'stex');
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
+  function to_mode(stream, state) {
 
-CodeMirror.defineMode('rst', function (config, options) {
+    if (state.ctx.mode && state.ctx.local) {
 
-    var rx_strong = /^\*\*[^\*\s](?:[^\*]*[^\*\s])?\*\*/;
-    var rx_emphasis = /^\*[^\*\s](?:[^\*]*[^\*\s])?\*/;
-    var rx_literal = /^``[^`\s](?:[^`]*[^`\s])``/;
-
-    var rx_number = /^(?:[\d]+(?:[\.,]\d+)*)/;
-    var rx_positive = /^(?:\s\+[\d]+(?:[\.,]\d+)*)/;
-    var rx_negative = /^(?:\s\-[\d]+(?:[\.,]\d+)*)/;
-
-    var rx_uri_protocol = "[Hh][Tt][Tt][Pp][Ss]?://";
-    var rx_uri_domain = "(?:[\\d\\w.-]+)\\.(?:\\w{2,6})";
-    var rx_uri_path = "(?:/[\\d\\w\\#\\%\\&\\-\\.\\,\\/\\:\\=\\?\\~]+)*";
-    var rx_uri = new RegExp("^" +
-        rx_uri_protocol + rx_uri_domain + rx_uri_path
-    );
-
-    var overlay = {
-        token: function (stream) {
-
-            if (stream.match(rx_strong) && stream.match (/\W+|$/, false))
-                return 'strong';
-            if (stream.match(rx_emphasis) && stream.match (/\W+|$/, false))
-                return 'em';
-            if (stream.match(rx_literal) && stream.match (/\W+|$/, false))
-                return 'string-2';
-            if (stream.match(rx_number))
-                return 'number';
-            if (stream.match(rx_positive))
-                return 'positive';
-            if (stream.match(rx_negative))
-                return 'negative';
-            if (stream.match(rx_uri))
-                return 'link';
-
-            while (stream.next() != null) {
-                if (stream.match(rx_strong, false)) break;
-                if (stream.match(rx_emphasis, false)) break;
-                if (stream.match(rx_literal, false)) break;
-                if (stream.match(rx_number, false)) break;
-                if (stream.match(rx_positive, false)) break;
-                if (stream.match(rx_negative, false)) break;
-                if (stream.match(rx_uri, false)) break;
-            }
-
-            return null;
-        }
-    };
+      if (stream.sol()) {
+        if (!stream.eatSpace()) change(state, to_normal);
+        return null;
+      }
 
-    var mode = CodeMirror.getMode(
-        config, options.backdrop || 'rst-base'
-    );
+      return state.ctx.mode.token(stream, state.ctx.local);
+    }
 
-    return CodeMirror.overlayMode(mode, overlay, true); // combine
+    change(state, to_normal);
+    return null;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  function context(phase, stage, mode, local) {
+    return {phase: phase, stage: stage, mode: mode, local: local};
+  }
+
+  function change(state, tok, ctx) {
+    state.tok = tok;
+    state.ctx = ctx || {};
+  }
+
+  function stage(state) {
+    return state.ctx.stage || 0;
+  }
+
+  function phase(state) {
+    return state.ctx.phase;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////
+
+  return {
+    startState: function () {
+      return {tok: to_normal, ctx: context(undefined, 0)};
+    },
+
+    copyState: function (state) {
+      var ctx = state.ctx, tmp = state.tmp;
+      if (ctx.local)
+        ctx = {mode: ctx.mode, local: CodeMirror.copyState(ctx.mode, ctx.local)};
+      if (tmp)
+        tmp = {mode: tmp.mode, local: CodeMirror.copyState(tmp.mode, tmp.local)};
+      return {tok: state.tok, ctx: ctx, tmp: tmp};
+    },
+
+    innerMode: function (state) {
+      return state.tmp      ? {state: state.tmp.local, mode: state.tmp.mode}
+      : state.ctx.mode ? {state: state.ctx.local, mode: state.ctx.mode}
+      : null;
+    },
+
+    token: function (stream, state) {
+      return state.tok(stream, state);
+    }
+  };
 }, 'python', 'stex');
 
 ///////////////////////////////////////////////////////////////////////////////

From a6111be729bd81587424d2eaa6754328d9c5f722 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 11:16:45 +0100
Subject: [PATCH 0927/4742] [rst mode] Fix demo

Issue #2223
---
 mode/rst/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/rst/index.html b/mode/rst/index.html
index 78030ebe94..cb8269751a 100644
--- a/mode/rst/index.html
+++ b/mode/rst/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/mode/overlay.js"></script>
 <script src="rst.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>

From 0c35969191a6c7bbea3ab24f0ea2dce82bbb5965 Mon Sep 17 00:00:00 2001
From: Curtis Gagliardi <cgag@riseup.net>
Date: Tue, 4 Feb 2014 01:50:10 -0800
Subject: [PATCH 0928/4742] [vim] Make text objects work with },), and ].

Previously commands like da<object> only worked with the opening side of the
pair, so you could do da{ but not da}.

I also removed some duplication of calls to selectCompanionObject (at the cost
of switching from map lookup to an if-else chain).
---
 keymap/vim.js    | 80 +++++++++++++++++++++++++-----------------------
 test/vim_test.js | 34 ++++++++++++++++++++
 2 files changed, 76 insertions(+), 38 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index bf3bc67b31..badcf513a3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1532,22 +1532,44 @@
             ch: findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)) };
       },
       textObjectManipulation: function(cm, motionArgs) {
+        // TODO: lots of possible exceptions that can be thrown here. Try da(
+        //     outside of a () block.
+
+        // TODO: adding <> >< to this map doesn't work, presumably because
+        // they're operators
+        var mirroredPairs = {'(': ')', ')': '(',
+                             '{': '}', '}': '{',
+                             '[': ']', ']': '['};
+        var selfPaired = {'\'': true, '"': true};
+
         var character = motionArgs.selectedCharacter;
+
         // Inclusive is the difference between a and i
         // TODO: Instead of using the additional text object map to perform text
         //     object operations, merge the map into the defaultKeyMap and use
         //     motionArgs to define behavior. Define separate entries for 'aw',
         //     'iw', 'a[', 'i[', etc.
         var inclusive = !motionArgs.textObjectInner;
-        if (!textObjects[character]) {
+
+        var tmp;
+        if (mirroredPairs[character]) {
+          tmp = selectCompanionObject(cm, mirroredPairs[character], inclusive);
+        } else if (selfPaired[character]) {
+          tmp = findBeginningAndEnd(cm, character, inclusive);
+        } else if (character === 'W') {
+          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
+                                                     true /** bigWord */);
+        } else if (character === 'w') {
+          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
+                                                     false /** bigWord */);
+        } else {
           // No text object defined for this, don't move.
           return null;
         }
-        var tmp = textObjects[character](cm, inclusive);
-        var start = tmp.start;
-        var end = tmp.end;
-        return [start, end];
+
+        return [tmp.start, tmp.end];
       },
+
       repeatLastCharacterSearch: function(cm, motionArgs) {
         var lastSearch = vimGlobalState.lastChararacterSearch;
         var repeat = motionArgs.repeat;
@@ -2015,36 +2037,6 @@
       }
     };
 
-    var textObjects = {
-      // TODO: lots of possible exceptions that can be thrown here. Try da(
-      //     outside of a () block.
-      // TODO: implement text objects for the reverse like }. Should just be
-      //     an additional mapping after moving to the defaultKeyMap.
-      'w': function(cm, inclusive) {
-        return expandWordUnderCursor(cm, inclusive, true /** forward */,
-            false /** bigWord */);
-      },
-      'W': function(cm, inclusive) {
-        return expandWordUnderCursor(cm, inclusive,
-            true /** forward */, true /** bigWord */);
-      },
-      '{': function(cm, inclusive) {
-        return selectCompanionObject(cm, '}', inclusive);
-      },
-      '(': function(cm, inclusive) {
-        return selectCompanionObject(cm, ')', inclusive);
-      },
-      '[': function(cm, inclusive) {
-        return selectCompanionObject(cm, ']', inclusive);
-      },
-      '\'': function(cm, inclusive) {
-        return findBeginningAndEnd(cm, "'", inclusive);
-      },
-      '"': function(cm, inclusive) {
-        return findBeginningAndEnd(cm, '"', inclusive);
-      }
-    };
-
     /*
      * Below are miscellaneous utility functions used by vim.js
      */
@@ -2634,13 +2626,25 @@
       return cur;
     }
 
+    // TODO: perhaps this finagling of start and end positions belonds
+    // in codmirror/replaceRange?
     function selectCompanionObject(cm, revSymb, inclusive) {
       var cur = cm.getCursor();
-
       var end = findMatchedSymbol(cm, cur, revSymb);
       var start = findMatchedSymbol(cm, end);
-      start.ch += inclusive ? 1 : 0;
-      end.ch += inclusive ? 0 : 1;
+
+      if((start.line == end.line && start.ch > end.ch)
+          || (start.line > end.line)) {
+        var tmp = start;
+        start = end;
+        end = tmp;
+      }
+
+      if(inclusive) {
+        end.ch += 1;
+      } else {
+        start.ch += 1;
+      }
 
       return { start: start, end: end };
     }
diff --git a/test/vim_test.js b/test/vim_test.js
index dd88bbf8c6..be0e0cb651 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -997,6 +997,40 @@ testEdit('diW_end_spc', 'foo \tbAr', /A/, 'diW', 'foo \t');
 testEdit('daW_end_spc', 'foo \tbAr', /A/, 'daW', 'foo');
 testEdit('diW_end_punct', 'foo \tbAr.', /A/, 'diW', 'foo \t');
 testEdit('daW_end_punct', 'foo \tbAr.', /A/, 'daW', 'foo');
+// Deleting text objects
+//    Open and close on same line
+testEdit('di(_open_spc', 'foo (bAr) baz', /\(/, 'di(', 'foo () baz');
+testEdit('di)_open_spc', 'foo (bAr) baz', /\(/, 'di)', 'foo () baz');
+testEdit('da(_open_spc', 'foo (bAr) baz', /\(/, 'da(', 'foo  baz');
+testEdit('da)_open_spc', 'foo (bAr) baz', /\(/, 'da)', 'foo  baz');
+
+testEdit('di(_middle_spc', 'foo (bAr) baz', /A/, 'di(', 'foo () baz');
+testEdit('di)_middle_spc', 'foo (bAr) baz', /A/, 'di)', 'foo () baz');
+testEdit('da(_middle_spc', 'foo (bAr) baz', /A/, 'da(', 'foo  baz');
+testEdit('da)_middle_spc', 'foo (bAr) baz', /A/, 'da)', 'foo  baz');
+
+testEdit('di(_close_spc', 'foo (bAr) baz', /\)/, 'di(', 'foo () baz');
+testEdit('di)_close_spc', 'foo (bAr) baz', /\)/, 'di)', 'foo () baz');
+testEdit('da(_close_spc', 'foo (bAr) baz', /\)/, 'da(', 'foo  baz');
+testEdit('da)_close_spc', 'foo (bAr) baz', /\)/, 'da)', 'foo  baz');
+
+//  Open and close on different lines, equally indented
+testEdit('di{_middle_spc', 'a{\n\tbar\n}b', /r/, 'di{', 'a{}b');
+testEdit('di}_middle_spc', 'a{\n\tbar\n}b', /r/, 'di}', 'a{}b');
+testEdit('da{_middle_spc', 'a{\n\tbar\n}b', /r/, 'da{', 'ab');
+testEdit('da}_middle_spc', 'a{\n\tbar\n}b', /r/, 'da}', 'ab');
+
+// open and close on diff lines, open indented less than close
+testEdit('di{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di{', 'a{}b');
+testEdit('di}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di}', 'a{}b');
+testEdit('da{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da{', 'ab');
+testEdit('da}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da}', 'ab');
+
+// open and close on diff lines, open indented more than close
+testEdit('di[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di[', 'a\t[]b');
+testEdit('di]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di]', 'a\t[]b');
+testEdit('da[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da[', 'a\tb');
+testEdit('da]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da]', 'a\tb');
 
 // Operator-motion tests
 testVim('D', function(cm, vim, helpers) {

From 5c32af4ee4159b871b15b4e23ac723103613d136 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 11:22:23 +0100
Subject: [PATCH 0929/4742] [real-world uses] Add i-MOS

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

diff --git a/doc/realworld.html b/doc/realworld.html
index b9e35f2dfc..96d4df1956 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -74,6 +74,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://haxpad.com/">HaxPad</a> (editor for Win RT)</li>
       <li><a href="http://megafonweblab.github.com/histone-javascript/">Histone template engine playground</a></li>
       <li><a href="http://icecoder.net">ICEcoder</a> (web IDE)</li>
+      <li><a href="http://i-mos.org/imos/">i-MOS</a> (modeling and simulation platform)</li>
       <li><a href="http://www.janvas.com/">Janvas</a> (vector graphics editor)</li>
       <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>
       <li><a href="http://jqfundamentals.com/">jQuery fundamentals</a> (interactive tutorial)</li>

From 42b671659e4a6244fd919081da18ba78b3d548ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 11:28:33 +0100
Subject: [PATCH 0930/4742] [rst mode] Fix creating of start states

So that it doesn't error when inner modes are missing.

Issue #2224
---
 mode/rst/rst.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index bef3cc1598..4bb2219fab 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -158,7 +158,7 @@ CodeMirror.defineMode('rst-base', function (config) {
 
     if (stream.sol() && stream.match(rx_examples, false)) {
       change(state, to_mode, {
-        mode: mode_python, local: mode_python.startState()
+        mode: mode_python, local: CodeMirror.startState(mode_python)
       });
     } else if (stream.sol() && stream.match(rx_explicit)) {
       change(state, to_explicit);
@@ -192,7 +192,7 @@ CodeMirror.defineMode('rst-base', function (config) {
       case 3:
         if (state.tmp_stex) {
           state.tmp_stex = undefined; state.tmp = {
-            mode: mode_stex, local: mode_stex.startState()
+            mode: mode_stex, local: CodeMirror.startState(mode_stex)
           };
         }
 
@@ -409,7 +409,7 @@ CodeMirror.defineMode('rst-base', function (config) {
 
         if (stream.match(/^latex\s*$/) || state.tmp_stex) {
           state.tmp_stex = undefined; change(state, to_mode, {
-            mode: mode_stex, local: mode_stex.startState()
+            mode: mode_stex, local: CodeMirror.startState(mode_stex)
           });
         }
         break;
@@ -417,7 +417,7 @@ CodeMirror.defineMode('rst-base', function (config) {
         change(state, to_explicit, context(rx_directive, 3));
         if (stream.match(/^python\s*$/) || state.tmp_py) {
           state.tmp_py = undefined; change(state, to_mode, {
-            mode: mode_python, local: mode_python.startState()
+            mode: mode_python, local: CodeMirror.startState(mode_python)
           });
         }
         break;

From d4bc44877f84975852fcd61b51d741cabc2d8b38 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 11:33:00 +0100
Subject: [PATCH 0931/4742] [anyword-hint addon] Fix variable clash

Closes #2225
---
 addon/hint/anyword-hint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index a144768c81..c3358cd9b5 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -15,8 +15,8 @@
     var list = [], seen = {};
     var re = new RegExp(word.source, "g");
     for (var dir = -1; dir <= 1; dir += 2) {
-      var line = cur.line, end = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
-      for (; line != end; line += dir) {
+      var line = cur.line, endLine = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
+      for (; line != endLine; line += dir) {
         var text = editor.getLine(line), m;
         while (m = re.exec(text)) {
           if (line == cur.line && m[0] === curWord) continue;

From 7fbe5383680e1d1ff263368c12f7c1c8ede58517 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 15:41:41 +0100
Subject: [PATCH 0932/4742] [runmode.node addon] Integrate with node's require
 mechanism

Mode dependencies are now loaded in a saner way.
---
 addon/runmode/runmode.node.js |  2 ++
 bin/source-highlight          | 16 +++-------------
 mode/meta.js                  | 13 ++++++++++++-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 3bfd11a93e..74c39be7e7 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -114,3 +114,5 @@ exports.runMode = function(string, modespec, callback, options) {
     }
   }
 };
+
+require.cache[require.resolve("../../lib/codemirror")] = require.cache[require.resolve("./runmode.node")];
diff --git a/bin/source-highlight b/bin/source-highlight
index 1373f6626f..6d15f1ae3f 100755
--- a/bin/source-highlight
+++ b/bin/source-highlight
@@ -8,7 +8,7 @@
 
 var fs = require("fs");
 
-CodeMirror = require("../addon/runmode/runmode.node.js");
+var CodeMirror = require("../addon/runmode/runmode.node.js");
 require("../mode/meta.js");
 
 var sPos = process.argv.indexOf("-s");
@@ -26,18 +26,8 @@ CodeMirror.modeInfo.forEach(function(info) {
   }
 });
 
-function ensureMode(name) {
-  if (CodeMirror.modes[name] || name == "null") return;
-  try {
-    require("../mode/" + name + "/" + name + ".js");
-  } catch(e) {
-    console.error("Could not load mode " + name + ".");
-    process.exit(1);
-  }
-  var obj = CodeMirror.modes[name];
-  if (obj.dependencies) obj.dependencies.forEach(ensureMode);
-}
-ensureMode(modeName);
+if (!CodeMirror.modes[modeName])
+  require("../mode/" + modeName + "/" + modeName + ".js");
 
 function esc(str) {
   return str.replace(/[<&]/g, function(ch) { return ch == "&" ? "&amp;" : "&lt;"; });
diff --git a/mode/meta.js b/mode/meta.js
index e048c22e10..84ae8070b6 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -1,3 +1,13 @@
+(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.modeInfo = [
   {name: 'APL', mime: 'text/apl', mode: 'apl'},
   {name: 'Asterisk', mime: 'text/x-asterisk', mode: 'asterisk'},
@@ -85,8 +95,9 @@ CodeMirror.modeInfo = [
   {name: 'Velocity', mime: 'text/velocity', mode: 'velocity'},
   {name: 'Verilog', mime: 'text/x-verilog', mode: 'verilog'},
   {name: 'XML', mime: 'application/xml', mode: 'xml'},
-  {name: 'HTML', mime: 'text/html', mode: 'xml'},
   {name: 'XQuery', mime: 'application/xquery', mode: 'xquery'},
   {name: 'YAML', mime: 'text/x-yaml', mode: 'yaml'},
   {name: 'Z80', mime: 'text/x-z80', mode: 'z80'}
 ];
+
+});

From 7a371ab8042c634e6a401a970c5f88b1485de2ac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 15:55:57 +0100
Subject: [PATCH 0933/4742] [vim keymap] Add missing copyCursor call

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 74d711cda8..aab45d22fa 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2639,7 +2639,7 @@
     // TODO: perhaps this finagling of start and end positions belonds
     // in codmirror/replaceRange?
     function selectCompanionObject(cm, revSymb, inclusive) {
-      var cur = cm.getCursor();
+      var cur = copyCursor(cm.getCursor());
       var end = findMatchedSymbol(cm, cur, revSymb);
       var start = findMatchedSymbol(cm, end);
 

From ff48d116fa41b1458dbb04a0c9743c153535a7f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Feb 2014 20:06:41 +0100
Subject: [PATCH 0934/4742] Ensure that indentLine resets a line's stateAfter

So that calling it on a block in sequence won't get stuck with an
outdated state after lines whose indentation doesn't change.

Closes #2227
---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8bcee1443c..99efcadd7f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2751,15 +2751,16 @@ window.CodeMirror = (function() {
   // API UTILITIES
 
   function indentLine(cm, n, how, aggressive) {
-    var doc = cm.doc;
+    var doc = cm.doc, state;
     if (how == null) how = "add";
     if (how == "smart") {
       if (!cm.doc.mode.indent) how = "prev";
-      else var state = getStateBefore(cm, n);
+      else state = getStateBefore(cm, n);
     }
 
     var tabSize = cm.options.tabSize;
     var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
+    if (line.stateAfter) line.stateAfter = null;
     var curSpaceString = line.text.match(/^\s*/)[0], indentation;
     if (!aggressive && !/\S/.test(line.text)) {
       indentation = 0;

From 53ae9a060900f44980b58267a2b80abeccdc04c1 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 6 Feb 2014 23:35:11 +0100
Subject: [PATCH 0935/4742] [vim] Add multi-line support to testEdit()

---
 keymap/vim.js    |  6 ++++--
 test/vim_test.js | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index aab45d22fa..5f7118d86c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -358,9 +358,11 @@
       if (vim.insertMode || vim.exMode) return;
 
       var head = obj.ranges[0].head;
+      var anchor = obj.ranges[0].anchor;
       if (head.ch && head.ch == cm.doc.getLine(head.line).length) {
-        obj.update([{anchor: obj.ranges[0].anchor,
-                     head: Pos(head.line, head.ch - 1)}]);
+        var pos = Pos(head.line, head.ch - 1);
+        obj.update([{anchor: cursorEqual(head, anchor) ? pos : anchor,
+                     head: pos}]);
       }
     }
     function getOnPasteFn(cm) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 8008f499fb..ea489581a4 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -959,7 +959,12 @@ testVim('<<', function(cm, vim, helpers) {
 // Edit tests
 function testEdit(name, before, pos, edit, after) {
   return testVim(name, function(cm, vim, helpers) {
-             cm.setCursor(0, before.search(pos));
+             var ch = before.search(pos)
+             var line = before.substring(0, ch).split('\n').length - 1;
+             if (line) {
+               ch = before.substring(0, ch).split('\n').pop().length;
+             }
+             cm.setCursor(line, ch);
              helpers.doKeys.apply(this, edit.split(''));
              eq(after, cm.getValue());
            }, {value: before});
@@ -2536,3 +2541,9 @@ testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
   eq('bc', cm.getValue());
 }, { value: 'abc' });
+
+// Test event handlers
+testVim('beforeSelectionChange', function(cm, vim, helpers) {
+  cm.setCursor(0, 100);
+  eqPos(cm.getCursor('head'), cm.getCursor('anchor'));
+}, { value: 'abc' });

From 689479a26a636c8b908b427bc817952f89de0c42 Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Thu, 6 Feb 2014 20:02:20 +0100
Subject: [PATCH 0936/4742] allow completion to have an independant from/to
 range

---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 00aadc575e..90faf9db35 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -46,7 +46,7 @@
     pick: function(data, i) {
       var completion = data.list[i];
       if (completion.hint) completion.hint(this.cm, data, completion);
-      else this.cm.replaceRange(getText(completion), data.from, data.to);
+      else this.cm.replaceRange(getText(completion), completion.from||data.from, completion.to||data.to);
       CodeMirror.signal(data, "pick", completion);
       this.close();
     },

From 773b84badfc77e604b83285a5a89f5e6a775f247 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Fri, 24 Jan 2014 17:26:38 -0800
Subject: [PATCH 0937/4742] [vim] Make unescaping for strings a bit cleaner and
 more general.

adds escaping for '|' to bridge a difference between javascript and
vim regex flavors.

take the escaping a little lower level so that it affects '/' searches
as well, not just '%s/<regex>/<replacement>' searches.
---
 keymap/vim.js    | 34 +++++++++++++++++++++++++++++-----
 test/vim_test.js | 13 +++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index badcf513a3..fcaf14d0b9 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2759,14 +2759,20 @@
       return slashes;
     }
 
-    function unescapeString(str) {
+    // Removes a '\' before any character that matches one of the specials.
+    function unescapeString(str, specials) {
       var escapeNextChar = false;
       var out = [];
       for (var i = 0; i < str.length; i++) {
         var c = str.charAt(i);
-        var next = str.charAt(i+1);
-        var slashComesNext = (next == '\\') || (next == '/');
-        if (c !== '\\' || escapeNextChar || !slashComesNext) {
+        var specialComesNext = false;
+        for (var j = 0; j < specials.length; j++) {
+          if (str.charAt(i+1) === specials[j]) {
+            specialComesNext = true;
+            break;
+          }
+        }
+        if (c !== '\\' || escapeNextChar || !specialComesNext) {
           out.push(c);
           escapeNextChar = false;
         } else {
@@ -2776,6 +2782,22 @@
       return out.join('');
     }
 
+    // Inserts a '\' before any character that matches one of the specials
+    function escapeString(str, specials) {
+      var out = [];
+      for (var i = 0; i < str.length; i++) {
+        var c = str.charAt(i);
+        for (var j = 0; j < specials.length; j++) {
+          if (c === specials[j]) {
+            out.push('\\');
+            break;
+          }
+        }
+        out.push(c);
+      }
+      return out.join('');
+    }
+
     /**
      * Extract the regular expression from the query and return a Regexp object.
      * Returns null if the query is blank.
@@ -2807,6 +2829,7 @@
       if (!regexPart) {
         return null;
       }
+      regexPart = escapeString(regexPart, ['|']);
       if (smartCase) {
         ignoreCase = (/^[^A-Z]*$/).test(regexPart);
       }
@@ -3300,7 +3323,8 @@
         var count;
         var confirm = false; // Whether to confirm each replace.
         if (slashes[1]) {
-          replacePart = unescapeString(argString.substring(slashes[1] + 1, slashes[2]));
+          replacePart = argString.substring(slashes[1] + 1, slashes[2]);
+          replacePart = unescapeString(replacePart, ['\\', '/']);
         }
         if (slashes[2]) {
           // After the 3rd slash, we can have flags followed by a space followed
diff --git a/test/vim_test.js b/test/vim_test.js
index be0e0cb651..5454669549 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2075,6 +2075,14 @@ testVim('moveTillCharacter', function(cm, vim, helpers){
   eq('The ox \n', cm.getValue());
   eq(4, cm.getCursor().ch);
 }, { value: moveTillCharacterSandbox});
+testVim('searchForPipe', function(cm, vim, helpers){
+  cm.setCursor(0, 0);
+  // Search for the '|'.
+  cm.openDialog = helpers.fakeOpenDialog('|');
+  helpers.doKeys('/');
+  eq(4, cm.getCursor().ch);
+}, { value: 'this|that'});
+
 
 var scrollMotionSandbox =
   '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'
@@ -2340,6 +2348,11 @@ testVim('ex_substitute_slash_regex', function(cm, vim, helpers) {
   helpers.doEx('%s/\\//|');
   eq('one|two \n three|four', cm.getValue());
 }, { value: 'one/two \n three/four'});
+testVim('ex_substitute_pipe_regex', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('%s/|/,');
+  eq('one,two \n three,four', cm.getValue());
+}, { value: 'one|two \n three|four'});
 testVim('ex_substitute_backslashslash_regex', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   helpers.doEx('%s/\\\\/,');

From 712f28ce25eaf1573f1fc3bdfccc6cced90bdea7 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Fri, 31 Jan 2014 10:09:17 -0800
Subject: [PATCH 0938/4742] [vim] Add flipEscaping

... so that '|' can be used as an OR in regular expressions or as a literal
character, depending on whether it was escaped or not.

1) fix the escaping of '(' and ')' in search expressions.
2) get the correct placement of the '\' in characters that need to introduce escaping.
3) change the capture unit test to expect that '(' and ')' should be escaped, as does real vim.
---
 keymap/vim.js    | 52 ++++++++++++++++++++++++------------------------
 test/vim_test.js | 12 ++++++++++-
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fcaf14d0b9..2a11ec88ab 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2759,41 +2759,41 @@
       return slashes;
     }
 
-    // Removes a '\' before any character that matches one of the specials.
-    function unescapeString(str, specials) {
+    // For any character in the string that matches one of the specials,
+    // adds a '\' if unescaped, or removes one if escaped.
+    function flipEscaping(str, specials) {
       var escapeNextChar = false;
       var out = [];
-      for (var i = 0; i < str.length; i++) {
-        var c = str.charAt(i);
+      for (var i = -1; i < str.length; i++) {
+        var c = str.charAt(i) || '';
+        var n = str.charAt(i+1) || '';
         var specialComesNext = false;
         for (var j = 0; j < specials.length; j++) {
-          if (str.charAt(i+1) === specials[j]) {
+          if (n === specials[j]) {
             specialComesNext = true;
             break;
           }
         }
-        if (c !== '\\' || escapeNextChar || !specialComesNext) {
-          out.push(c);
-          escapeNextChar = false;
+        if (escapeNextChar) {
+          if (c !== '\\' || !specialComesNext) {
+            out.push(c);
+            escapeNextChar = false;
+          } else {
+            escapeNextChar = true;
+          }
         } else {
-          escapeNextChar = true;
-        }
-      }
-      return out.join('');
-    }
-
-    // Inserts a '\' before any character that matches one of the specials
-    function escapeString(str, specials) {
-      var out = [];
-      for (var i = 0; i < str.length; i++) {
-        var c = str.charAt(i);
-        for (var j = 0; j < specials.length; j++) {
-          if (c === specials[j]) {
-            out.push('\\');
-            break;
+          if (c === '\\') {
+            escapeNextChar = true;
+            if (!specialComesNext) {
+              out.push('\\');
+            }
+          } else {
+            out.push(c);
+            if (specialComesNext && n !== '\\') {
+              out.push('\\');
+            }
           }
         }
-        out.push(c);
       }
       return out.join('');
     }
@@ -2829,7 +2829,7 @@
       if (!regexPart) {
         return null;
       }
-      regexPart = escapeString(regexPart, ['|']);
+      regexPart = flipEscaping(regexPart, ['|', '(', ')']);
       if (smartCase) {
         ignoreCase = (/^[^A-Z]*$/).test(regexPart);
       }
@@ -3324,7 +3324,7 @@
         var confirm = false; // Whether to confirm each replace.
         if (slashes[1]) {
           replacePart = argString.substring(slashes[1] + 1, slashes[2]);
-          replacePart = unescapeString(replacePart, ['\\', '/']);
+          replacePart = flipEscaping(replacePart, ['\\', '/']);
         }
         if (slashes[2]) {
           // After the 3rd slash, we can have flags followed by a space followed
diff --git a/test/vim_test.js b/test/vim_test.js
index 5454669549..2ab1427093 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2332,7 +2332,7 @@ testVim('ex_substitute_visual_range', function(cm, vim, helpers) {
 }, { value: '1\n2\n3\n4\n5' });
 testVim('ex_substitute_capture', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
-  helpers.doEx('s/(\\d+)/$1$1/')
+  helpers.doEx('s/\\(\\d+\\)/$1$1/')
   eq('a1111 a1212 a1313', cm.getValue());
 }, { value: 'a11 a12 a13' });
 testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
@@ -2353,6 +2353,16 @@ testVim('ex_substitute_pipe_regex', function(cm, vim, helpers) {
   helpers.doEx('%s/|/,');
   eq('one,two \n three,four', cm.getValue());
 }, { value: 'one|two \n three|four'});
+testVim('ex_substitute_or_regex', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('%s/o\\|e\\|u/a');
+  eq('ana|twa \n thraa|faar', cm.getValue());
+}, { value: 'one|two \n three|four'});
+testVim('ex_substitute_or_word_regex', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('%s/\\(one\\|two\\)/five');
+  eq('five|five \n three|four', cm.getValue());
+}, { value: 'one|two \n three|four'});
 testVim('ex_substitute_backslashslash_regex', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   helpers.doEx('%s/\\\\/,');

From 91d93fdb988457b7021d49007c25a31f3bbdf81c Mon Sep 17 00:00:00 2001
From: nextrevision <notarobot@nextrevision.net>
Date: Sat, 8 Feb 2014 15:18:33 -0500
Subject: [PATCH 0939/4742] [puppet mode] Add

---
 doc/compress.html      |   1 +
 mode/index.html        |   1 +
 mode/meta.js           |   1 +
 mode/puppet/index.html | 121 ++++++++++++++++++++++++
 mode/puppet/puppet.js  | 204 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 328 insertions(+)
 create mode 100644 mode/puppet/index.html
 create mode 100644 mode/puppet/puppet.js

diff --git a/doc/compress.html b/doc/compress.html
index c2ba8f7021..c6915d6244 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -126,6 +126,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/pig/pig.js">pig.js</option>
           <option value="http://codemirror.net/mode/properties/properties.js">properties.js</option>
           <option value="http://codemirror.net/mode/python/python.js">python.js</option>
+          <option value="http://codemirror.net/mode/puppet/puppet.js">puppet.js</option>
           <option value="http://codemirror.net/mode/q/q.js">q.js</option>
           <option value="http://codemirror.net/mode/r/r.js">r.js</option>
           <option value="http://codemirror.net/mode/rpm/changes/changes.js">rpm/changes.js</option>
diff --git a/mode/index.html b/mode/index.html
index 7c1f740615..831ad20ea4 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -77,6 +77,7 @@ <h2>Language modes</h2>
       <li><a href="php/index.html">PHP</a></li>
       <li><a href="pig/index.html">Pig Latin</a></li>
       <li><a href="properties/index.html">Properties files</a></li>
+      <li><a href="puppet/index.html">Puppet</a></li>
       <li><a href="python/index.html">Python</a></li>
       <li><a href="q/index.html">Q</a></li>
       <li><a href="r/index.html">R</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index f37cea55b5..5b8ce7a1db 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -57,6 +57,7 @@ CodeMirror.modeInfo = [
   {name: 'Plain Text', mime: 'text/plain', mode: 'null'},
   {name: 'Properties files', mime: 'text/x-properties', mode: 'properties'},
   {name: 'Python', mime: 'text/x-python', mode: 'python'},
+  {name: 'Puppet', mime: 'text/x-puppet', mode: 'puppet'},
   {name: 'Cython', mime: 'text/x-cython', mode: 'python'},
   {name: 'R', mime: 'text/x-rsrc', mode: 'r'},
   {name: 'reStructuredText', mime: 'text/x-rst', mode: 'rst'},
diff --git a/mode/puppet/index.html b/mode/puppet/index.html
new file mode 100644
index 0000000000..f307636b2e
--- /dev/null
+++ b/mode/puppet/index.html
@@ -0,0 +1,121 @@
+<!doctype html>
+
+<title>CodeMirror: Puppet 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/edit/matchbrackets.js"></script>
+<script src="puppet.js"></script>
+<style>
+      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+      .cm-s-default span.cm-arrow { color: red; }
+    </style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Puppet</a>
+  </ul>
+</div>
+
+<article>
+<h2>Puppet mode</h2>
+<form><textarea id="code" name="code">
+# == Class: automysqlbackup
+#
+# Puppet module to install AutoMySQLBackup for periodic MySQL backups.
+#
+# class { 'automysqlbackup':
+#   backup_dir => '/mnt/backups',
+# }
+#
+
+class automysqlbackup (
+  $bin_dir = $automysqlbackup::params::bin_dir,
+  $etc_dir = $automysqlbackup::params::etc_dir,
+  $backup_dir = $automysqlbackup::params::backup_dir,
+  $install_multicore = undef,
+  $config = {},
+  $config_defaults = {},
+) inherits automysqlbackup::params {
+
+# Ensure valid paths are assigned
+  validate_absolute_path($bin_dir)
+  validate_absolute_path($etc_dir)
+  validate_absolute_path($backup_dir)
+
+# Create a subdirectory in /etc for config files
+  file { $etc_dir:
+    ensure => directory,
+    owner => 'root',
+    group => 'root',
+    mode => '0750',
+  }
+
+# Create an example backup file, useful for reference
+  file { "${etc_dir}/automysqlbackup.conf.example":
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0660',
+    source => 'puppet:///modules/automysqlbackup/automysqlbackup.conf',
+  }
+
+# Add files from the developer
+  file { "${etc_dir}/AMB_README":
+    ensure => file,
+    source => 'puppet:///modules/automysqlbackup/AMB_README',
+  }
+  file { "${etc_dir}/AMB_LICENSE":
+    ensure => file,
+    source => 'puppet:///modules/automysqlbackup/AMB_LICENSE',
+  }
+
+# Install the actual binary file
+  file { "${bin_dir}/automysqlbackup":
+    ensure => file,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+    source => 'puppet:///modules/automysqlbackup/automysqlbackup',
+  }
+
+# Create the base backup directory
+  file { $backup_dir:
+    ensure => directory,
+    owner => 'root',
+    group => 'root',
+    mode => '0755',
+  }
+
+# If you'd like to keep your config in hiera and pass it to this class
+  if !empty($config) {
+    create_resources('automysqlbackup::backup', $config, $config_defaults)
+  }
+
+# If using RedHat family, must have the RPMforge repo's enabled
+  if $install_multicore {
+    package { ['pigz', 'pbzip2']: ensure => installed }
+  }
+
+}
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: "text/x-puppet",
+        matchBrackets: true,
+        indentUnit: 4
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-puppet</code>.</p>
+
+  </article>
diff --git a/mode/puppet/puppet.js b/mode/puppet/puppet.js
new file mode 100644
index 0000000000..0153c80120
--- /dev/null
+++ b/mode/puppet/puppet.js
@@ -0,0 +1,204 @@
+CodeMirror.defineMode("puppet", function () {
+  // Stores the words from the define method
+  var words = {};
+  // Taken, mostly, from the Puppet official variable standards regex
+  var variable_regex = /({)?([a-z][a-z0-9_]*)?((::[a-z][a-z0-9_]*)*::)?[a-zA-Z0-9_]+(})?/;
+
+  // Takes a string of words separated by spaces and adds them as
+  // keys with the value of the first argument 'style'
+  function define(style, string) {
+    var split = string.split(' ');
+    for (var i = 0; i < split.length; i++) {
+      words[split[i]] = style;
+    }
+  }
+
+  // Takes commonly known puppet types/words and classifies them to a style
+  define('keyword', 'class define site node include import inherits');
+  define('keyword', 'case if else in and elsif default or');
+  define('atom', 'false true running present absent file directory undef');
+  define('builtin', 'action augeas burst chain computer cron destination dport exec ' +
+    'file filebucket group host icmp iniface interface jump k5login limit log_level ' +
+    'log_prefix macauthorization mailalias maillist mcx mount nagios_command ' +
+    'nagios_contact nagios_contactgroup nagios_host nagios_hostdependency ' +
+    'nagios_hostescalation nagios_hostextinfo nagios_hostgroup nagios_service ' +
+    'nagios_servicedependency nagios_serviceescalation nagios_serviceextinfo ' +
+    'nagios_servicegroup nagios_timeperiod name notify outiface package proto reject ' +
+    'resources router schedule scheduled_task selboolean selmodule service source ' +
+    'sport ssh_authorized_key sshkey stage state table tidy todest toports tosource ' +
+    'user vlan yumrepo zfs zone zpool');
+
+  // After finding a start of a string ('|") this function attempts to find the end;
+  // If a variable is encountered along the way, we display it differently when it
+  // is encapsulated in a double-quoted string.
+  function tokenString(stream, state) {
+    var current, prev, found_var = false;
+    while (!stream.eol() && (current = stream.next()) != state.pending) {
+      if (current === '$' && prev != '\\' && state.pending == '"') {
+        found_var = true;
+        break;
+      }
+      prev = current;
+    }
+    if (found_var) {
+      stream.backUp(1);
+    }
+    if (current == state.pending) {
+      state.continueString = false;
+    } else {
+      state.continueString = true;
+    }
+    return "string";
+  }
+
+  // Main function
+  function tokenize(stream, state) {
+    // Matches one whole word
+    var word = stream.match(/[\w]+/, false);
+    // Matches attributes (i.e. ensure => present ; 'ensure' would be matched)
+    var attribute = stream.match(/(\s+)?\w+\s+=>.*/, false);
+    // Matches non-builtin resource declarations
+    // (i.e. "apache::vhost {" or "mycustomclasss {" would be matched)
+    var resource = stream.match(/(\s+)?[\w:_]+(\s+)?{/, false);
+    // Matches virtual and exported resources (i.e. @@user { ; and the like)
+    var special_resource = stream.match(/(\s+)?[@]{1,2}[\w:_]+(\s+)?{/, false);
+
+    // Finally advance the stream
+    var ch = stream.next();
+
+    // Have we found a variable?
+    if (ch === '$') {
+      if (stream.match(variable_regex)) {
+        // If so, and its in a string, assign it a different color
+        return state.continueString ? 'variable-2' : 'variable';
+      }
+      // Otherwise return an invalid variable
+      return "error";
+    }
+    // Should we still be looking for the end of a string?
+    if (state.continueString) {
+      // If so, go through the loop again
+      stream.backUp(1);
+      return tokenString(stream, state);
+    }
+    // Are we in a definition (class, node, define)?
+    if (state.inDefinition) {
+      // If so, return def (i.e. for 'class myclass {' ; 'myclass' would be matched)
+      if (stream.match(/(\s+)?[\w:_]+(\s+)?/)) {
+        return 'def';
+      }
+      // Match the rest it the next time around
+      stream.match(/\s+{/);
+      state.inDefinition = false;
+    }
+    // Are we in an 'include' statement?
+    if (state.inInclude) {
+      // Match and return the included class
+      stream.match(/(\s+)?\S+(\s+)?/);
+      state.inInclude = false;
+      return 'def';
+    }
+    // Do we just have a function on our hands?
+    // In 'ensure_resource("myclass")', 'ensure_resource' is matched
+    if (stream.match(/(\s+)?\w+\(/)) {
+      stream.backUp(1);
+      return 'def';
+    }
+    // Have we matched the prior attribute regex?
+    if (attribute) {
+      stream.match(/(\s+)?\w+/);
+      return 'tag';
+    }
+    // Do we have Puppet specific words?
+    if (word && words.hasOwnProperty(word)) {
+      // Negates the initial next()
+      stream.backUp(1);
+      // Acutally move the stream
+      stream.match(/[\w]+/);
+      // We want to process these words differently
+      // do to the importance they have in Puppet
+      if (stream.match(/\s+\S+\s+{/, false)) {
+        state.inDefinition = true;
+      }
+      if (word == 'include') {
+        state.inInclude = true;
+      }
+      // Returns their value as state in the prior define methods
+      return words[word];
+    }
+    // Is there a match on a reference?
+    if (/(\s+)?[A-Z]/.test(word)) {
+      // Negate the next()
+      stream.backUp(1);
+      // Match the full reference
+      stream.match(/(\s+)?[A-Z][\w:_]+/);
+      return 'def';
+    }
+    // Have we matched the prior resource regex?
+    if (resource) {
+      stream.match(/(\s+)?[\w:_]+/);
+      return 'def';
+    }
+    // Have we matched the prior special_resource regex?
+    if (special_resource) {
+      stream.match(/(\s+)?[@]{1,2}/);
+      return 'special';
+    }
+    // Match all the comments. All of them.
+    if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    }
+    // Have we found a string?
+    if (ch == "'" || ch == '"') {
+      // Store the type (single or double)
+      state.pending = ch;
+      // Perform the looping function to find the end
+      return tokenString(stream, state);
+    }
+    // Match all the brackets
+    if (ch == '{' || ch == '}') {
+      return 'bracket';
+    }
+    // Match characters that we are going to assume
+    // are trying to be regex
+    if (ch == '/') {
+      stream.match(/.*\//);
+      return 'variable-3';
+    }
+    // Match all the numbers
+    if (ch.match(/[0-9]/)) {
+      stream.eatWhile(/[0-9]+/);
+      return 'number';
+    }
+    // Match the '=' and '=>' operators
+    if (ch == '=') {
+      if (stream.peek() == '>') {
+          stream.next();
+      }
+      return "operator";
+    }
+    // Keep advancing through all the rest
+    stream.eatWhile(/[\w-]/);
+    // Return a blank line for everything else
+    return null;
+  }
+  // Start it all
+  return {
+    startState: function () {
+      var state = {};
+      state.inDefinition = false;
+      state.inInclude = false;
+      state.continueString = false;
+      state.pending = false;
+      return state;
+    },
+    token: function (stream, state) {
+      // Strip the spaces, but regex will account for them eitherway
+      if (stream.eatSpace()) return null;
+      // Go through the main process
+      return tokenize(stream, state);
+    }
+  };
+});
+CodeMirror.defineMIME("text/x-puppet", "puppet");

From 9cc134aaa7a42c7155dd781a9b7d89e20593dcf5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Feb 2014 11:49:58 +0100
Subject: [PATCH 0940/4742] Ensure initial op does a full draw

Even when the editor it set to resize to fit content.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 497f68e89a..3174703af9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -97,6 +97,7 @@
 
     var cm = this;
     runInOp(this, function() {
+      cm.curOp.forceUpdate = true;
       attachDoc(cm, doc);
 
       if ((options.autofocus && !mobile) || activeElt() == display.input)

From 1f29b8e6746e6a87875bb4cb18d75edefc888a46 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Feb 2014 12:03:53 +0100
Subject: [PATCH 0941/4742] Remove tiny font on hidden textarea

It causes autozooming on some mobile platforms.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 99efcadd7f..09cf46a880 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -99,7 +99,7 @@ window.CodeMirror = (function() {
   function makeDisplay(place, docStart) {
     var d = {};
 
-    var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none; font-size: 4px;");
+    var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
     if (webkit) input.style.width = "1000px";
     else input.setAttribute("wrap", "off");
     // if border: 0; -- iOS fails to open keyboard (issue #1287)

From 9f366d76085b625296fad3af1de2616539d08f7b Mon Sep 17 00:00:00 2001
From: Nicholas Bollweg <nicholas.bollweg@gtri.gatech.edu>
Date: Thu, 6 Feb 2014 17:44:18 -0500
Subject: [PATCH 0942/4742] [javascript mode] Add json-ld dialect

---
 mode/javascript/index.html    |  8 ++--
 mode/javascript/javascript.js | 16 ++++++--
 mode/javascript/json-ld.html  | 72 +++++++++++++++++++++++++++++++++++
 mode/javascript/test.js       | 38 ++++++++++++++++++
 4 files changed, 127 insertions(+), 7 deletions(-)
 create mode 100644 mode/javascript/json-ld.html

diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 45d70ffdbb..faf50363e8 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -89,11 +89,13 @@ <h2>JavaScript mode</h2>
     </script>
 
     <p>
-      JavaScript mode supports a two configuration
-      options:
+      JavaScript mode supports several configuration options:
       <ul>
         <li><code>json</code> which will set the mode to expect JSON
         data rather than a JavaScript program.</li>
+        <li><code>jsonld</code> which will set the mode to expect
+        <a href="http://json-ld.org">JSON-LD</a> linked data rather
+        than a JavaScript program (<a href="json-ld.html">demo</a>).</li>
         <li><code>typescript</code> which will activate additional
         syntax highlighting and some other things for TypeScript code
         (<a href="typescript.html">demo</a>).</li>
@@ -103,5 +105,5 @@ <h2>JavaScript mode</h2>
       </ul>
     </p>
 
-    <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>, <code>application/ld+json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>
   </article>
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fbf574b4fe..11ffeb86fc 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -3,7 +3,8 @@
 CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var statementIndent = parserConfig.statementIndent;
-  var jsonMode = parserConfig.json;
+  var jsonldMode = parserConfig.jsonld;
+  var jsonMode = parserConfig.json || jsonldMode;
   var isTS = parserConfig.typescript;
 
   // Tokenizer
@@ -53,6 +54,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }();
 
   var isOperatorChar = /[+\-*&%=<>!?|~^]/;
+  var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;
 
   function readRegexp(stream) {
     var escaped = false, next, inSet = false;
@@ -128,6 +130,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function tokenString(quote) {
     return function(stream, state) {
       var escaped = false, next;
+      if(jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){
+        state.tokenize = tokenBase;
+        return ret("jsonld-keyword", "meta");
+      }
       while ((next = stream.next()) != null) {
         if (next == quote && !escaped) break;
         escaped = !escaped && next == "\\";
@@ -195,7 +201,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   // Parser
 
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true};
+  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true};
 
   function JSLexical(indented, column, type, align, prev, info) {
     this.indented = indented;
@@ -408,7 +414,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);
     } else if (type == "number" || type == "string") {
-      cx.marked = type + " property";
+      cx.marked = jsonldMode ? "property" : (type + " property");
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
     }
@@ -609,13 +615,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       else return lexical.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: ":{}",
+    electricChars: ":{}@",
     blockCommentStart: jsonMode ? null : "/*",
     blockCommentEnd: jsonMode ? null : "*/",
     lineComment: jsonMode ? null : "//",
     fold: "brace",
 
     helperType: jsonMode ? "json" : "javascript",
+    jsonldMode: jsonldMode,
     jsonMode: jsonMode
   };
 });
@@ -626,5 +633,6 @@ CodeMirror.defineMIME("application/javascript", "javascript");
 CodeMirror.defineMIME("application/ecmascript", "javascript");
 CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
 CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
+CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true});
 CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
 CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
diff --git a/mode/javascript/json-ld.html b/mode/javascript/json-ld.html
new file mode 100644
index 0000000000..256bb0f624
--- /dev/null
+++ b/mode/javascript/json-ld.html
@@ -0,0 +1,72 @@
+<!doctype html>
+
+<title>CodeMirror: JSON-LD 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/edit/matchbrackets.js"></script>
+<script src="../../addon/comment/continuecomment.js"></script>
+<script src="../../addon/comment/comment.js"></script>
+<script src="javascript.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">JSON-LD</a>
+  </ul>
+</div>
+
+<article>
+<h2>JSON-LD mode</h2>
+
+
+<div><textarea id="code" name="code">
+{
+  "@context": {
+    "name": "http://schema.org/name",
+    "description": "http://schema.org/description",
+    "image": {
+      "@id": "http://schema.org/image",
+      "@type": "@id"
+    },
+    "geo": "http://schema.org/geo",
+    "latitude": {
+      "@id": "http://schema.org/latitude",
+      "@type": "xsd:float"
+    },
+    "longitude": {
+      "@id": "http://schema.org/longitude",
+      "@type": "xsd:float"
+    },
+    "xsd": "http://www.w3.org/2001/XMLSchema#"
+  },
+  "name": "The Empire State Building",
+  "description": "The Empire State Building is a 102-story landmark in New York City.",
+  "image": "http://www.civil.usherbrooke.ca/cours/gci215a/empire-state-building.jpg",
+  "geo": {
+    "latitude": "40.75",
+    "longitude": "73.98"
+  }
+}
+</textarea></div>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        matchBrackets: true,
+        autoCloseBrackets: true,
+        mode: "application/ld+json",
+        lineWrapping: true
+      });
+    </script>
+    
+    <p>This is a specialization of the <a href="index.html">JavaScript mode</a>.</p>
+  </article>
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 911bbbfd7b..3f73196118 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -110,4 +110,42 @@
 
   MT("scary_regexp",
      "[string-2 /foo[[/]]bar/];");
+
+  var jsonld_mode = CodeMirror.getMode(
+    {indentUnit: 2},
+    {name: "javascript", jsonld: true}
+  );
+  function LD(name) {
+    test.mode(name, jsonld_mode, Array.prototype.slice.call(arguments, 1));
+  }
+
+  LD("json_ld_keywords",
+    '{',
+    '  [meta "@context"]: {',
+    '    [meta "@base"]: [string "http://example.com"],',
+    '    [meta "@vocab"]: [string "http://xmlns.com/foaf/0.1/"],',
+    '    [property "likesFlavor"]: {',
+    '      [meta "@container"]: [meta "@list"]',
+    '      [meta "@reverse"]: [string "@beFavoriteOf"]',
+    '    },',
+    '    [property "nick"]: { [meta "@container"]: [meta "@set"] },',
+    '    [property "nick"]: { [meta "@container"]: [meta "@index"] }',
+    '  },',
+    '  [meta "@graph"]: [[ {',
+    '    [meta "@id"]: [string "http://dbpedia.org/resource/John_Lennon"],',
+    '    [property "name"]: [string "John Lennon"],',
+    '    [property "modified"]: {',
+    '      [meta "@value"]: [string "2010-05-29T14:17:39+02:00"],',
+    '      [meta "@type"]: [string "http://www.w3.org/2001/XMLSchema#dateTime"]',
+    '    }',
+    '  } ]]',
+    '}');
+
+  LD("json_ld_fake",
+    '{',
+    '  [property "@fake"]: [string "@fake"],',
+    '  [property "@contextual"]: [string "@identifier"],',
+    '  [property "user@domain.com"]: [string "@graphical"],',
+    '  [property "@ID"]: [string "@@ID"]',
+    '}');
 })();

From 98ccc2edcacba2b2e355a94fcfb34ccf503424bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Feb 2014 12:17:13 +0100
Subject: [PATCH 0943/4742] Add json-ld mode to to meta.js

---
 mode/javascript/javascript.js | 4 ++--
 mode/meta.js                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 11ffeb86fc..07ba8a6f4b 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -130,7 +130,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function tokenString(quote) {
     return function(stream, state) {
       var escaped = false, next;
-      if(jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){
+      if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){
         state.tokenize = tokenBase;
         return ret("jsonld-keyword", "meta");
       }
@@ -615,7 +615,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       else return lexical.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: ":{}@",
+    electricChars: ":{}",
     blockCommentStart: jsonMode ? null : "/*",
     blockCommentEnd: jsonMode ? null : "*/",
     lineComment: jsonMode ? null : "//",
diff --git a/mode/meta.js b/mode/meta.js
index 5b8ce7a1db..42e8ebb9ca 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -36,6 +36,7 @@ CodeMirror.modeInfo = [
   {name: 'JavaScript', mime: 'text/javascript', mode: 'javascript'},
   {name: 'JSON', mime: 'application/x-json', mode: 'javascript'},
   {name: 'JSON', mime: 'application/json', mode: 'javascript'},
+  {name: 'JSON-LD', mime: 'application/ld+json', mode: 'javascript'},
   {name: 'TypeScript', mime: 'application/typescript', mode: 'javascript'},
   {name: 'Jinja2', mime: null, mode: 'jinja2'},
   {name: 'Julia', mime: 'text/x-julia', mode: 'julia'},

From e1dcbebb3c8c989229e3f90a81d68a9ac3582796 Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Fri, 7 Feb 2014 12:56:36 +0100
Subject: [PATCH 0944/4742] [show-hint addon] Docs for #2228

add docs that when completions are object they can have a from: and to:
that will be used by pick.

Make sidebar in manual scrollable for small screen especially usefull
when `Programming API` is unfolded

seem to look nice on Chrome and Firefox Osx, (scrollbar do not appear,
except when scrolling on Chrome) but should maybe be tested on linux.
---
 doc/docs.css    |  4 +++-
 doc/manual.html | 13 +++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/doc/docs.css b/doc/docs.css
index c7fb6327ed..86e61d7b9a 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -53,7 +53,9 @@ article {
 
 #nav {
   position: fixed;
-  top: 30px;
+  padding-top: 30px;
+  max-height: 100%;
+  overflow-y:scroll;
   left: 0; right: none;
   width: 160px;
   padding-right: 350px;
diff --git a/doc/manual.html b/doc/manual.html
index 8ebfeefeba..635088b6b1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -22,11 +22,10 @@
 
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
-
   <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="#overview" class=active data-default="true">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="../index.html">Home</a></li>
+    <li><a href="#overview" class=active data-default="true">Manual</a></li>
+    <li><a href="https://github.com/marijnh/codemirror">Code</a></li>
   </ul>
   <ul>
     <li><a href="#usage">Basic Usage</a></li>
@@ -2082,6 +2081,12 @@ <h2>Addons</h2>
         <dt><code><strong>hint</strong>: fn(CodeMirror, self, data)</code></dt>
         <dd>A method used to actually apply the completion, instead of
         the default behavior.</dd>
+        <dt><code><strong>from</strong>: {line, ch}</code></dt>
+        <dd>Optional <code>from</code> position that will be used by <code>pick()</code> instead
+        of the global one passed with the full list of completions.</dd>
+        <dt><code><strong>to</strong>: {line, ch}</code></dt>
+        <dd>Optional <code>to</code> position that will be used by <code>pick()</code> instead
+        of the global one passed with the full list of completions.</dd>
       </dl>
       The plugin understands the following options (the options object
       will also be passed along to the hinting function, which may

From 628e914e1056ba6d8bd03a42f3163d5f6319121e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Feb 2014 12:34:56 +0100
Subject: [PATCH 0945/4742] Change makeHistory to be a regular constructor

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3174703af9..9c0c76f4ae 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5657,7 +5657,7 @@
     this.first = firstLine;
     this.scrollTop = this.scrollLeft = 0;
     this.cantEdit = false;
-    this.history = makeHistory();
+    this.history = new History();
     this.cleanGeneration = 1;
     this.frontier = firstLine;
     var start = Pos(firstLine, 0);
@@ -5810,7 +5810,7 @@
       for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
       return {undo: done, redo: undone};
     },
-    clearHistory: function() {this.history = makeHistory(this.history.maxGeneration);},
+    clearHistory: function() {this.history = new History(this.history.maxGeneration);},
 
     markClean: function() {
       this.cleanGeneration = this.changeGeneration(true);
@@ -5829,7 +5829,7 @@
               undone: copyHistoryArray(this.history.undone)};
     },
     setHistory: function(histData) {
-      var hist = this.history = makeHistory(this.history.maxGeneration);
+      var hist = this.history = new History(this.history.maxGeneration);
       hist.done = copyHistoryArray(histData.done.slice(0), null, true);
       hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
     },
@@ -5937,7 +5937,7 @@
       if (other.history == this.history) {
         var splitIds = [other.id];
         linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
-        other.history = makeHistory();
+        other.history = new History();
         other.history.done = copyHistoryArray(this.history.done, splitIds);
         other.history.undone = copyHistoryArray(this.history.undone, splitIds);
       }
@@ -6079,18 +6079,19 @@
 
   // HISTORY
 
-  function makeHistory(startGen) {
-    return {
-      // Arrays of history events. Doing something adds an event to
-      // done and clears undo. Undoing moves events from done to
-      // undone, redoing moves them in the other direction.
-      done: [], undone: [], undoDepth: Infinity,
-      // Used to track when changes can be merged into a single undo
-      // event
-      lastTime: 0, lastOp: null, lastOrigin: null,
-      // Used by the isClean() method
-      generation: startGen || 1, maxGeneration: startGen || 1
-    };
+  function History(startGen) {
+    // Arrays of history events. Doing something adds an event to
+    // done and clears undo. Undoing moves events from done to
+    // undone, redoing moves them in the other direction.
+    this.done = []; this.undone = [];
+    this.undoDepth = Infinity;
+    // Used to track when changes can be merged into a single undo
+    // event
+    this.lastTime = 0;
+    this.lastOp = null;
+    this.lastOrigin = null;
+    // Used by the isClean() method
+    this.generation = this.maxGeneration = startGen || 1;
   }
 
   function attachLocalSpans(doc, change, from, to) {

From 0455a7fdcb30ef1042628b95d1ec864e4c8e461c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Feb 2014 15:52:20 +0100
Subject: [PATCH 0946/4742] Fix selection undo, chunk 1

---
 lib/codemirror.js | 75 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9c0c76f4ae..ada7d53199 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1083,6 +1083,11 @@
 
   // Set a new selection.
   function setSelection(doc, sel, scroll) {
+    setSelectionNoUndo(doc, sel, scroll);
+    addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN);
+  }
+
+  function setSelectionNoUndo(doc, sel, scroll) {
     if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
       sel = filterSelectionChange(doc, sel);
 
@@ -1091,7 +1096,6 @@
 
     if (scroll !== false && doc.cm)
       ensureCursorVisible(doc.cm);
-    addSelectionToHistory(doc, sel, doc.history.done, doc.cm ? doc.cm.curOp.id : NaN);
   }
 
   function setSelectionInner(doc, sel) {
@@ -2485,6 +2489,8 @@
   function leftButtonNoDrag(cm, e, start, type) {
     var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
+    pushPendingSelection(doc, doc.history.done);
+    doc.history.atomicSelection = true;
 
     if (mac ? e.metaKey : e.ctrlKey) {
       var inside = doc.sel.contains(start);
@@ -2581,6 +2587,7 @@
       focusInput(cm);
       off(document, "mousemove", move);
       off(document, "mouseup", up);
+      doc.history.atomicSelection = false;
     }
 
     var move = operation(cm, function(e) {
@@ -3164,14 +3171,16 @@
 
     var hist = doc.history, event;
     var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
-    addSelectionToHistory(doc, doc.sel, dest, NaN);
+    pushPendingSelection(doc, dest);
     for (;;) {
       event = source.pop();
       if (!event) return;
       if (event.ranges) {
         dest.push(event);
-        if (allowSelectionOnly && !event.equals(doc.sel))
-          return setSelection(doc, event);
+        if (allowSelectionOnly && !event.equals(doc.sel)) {
+          hist.pendingSelection = event;
+          return setSelectionNoUndo(doc, event);
+        }
       }
       else break;
     }
@@ -4106,6 +4115,7 @@
   option("pollInterval", 100);
   option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
   option("historyEventDelay", 500);
+  option("historySelectionEventDelay", 1000);
   option("viewportMargin", 10, function(cm){cm.refresh();}, true);
   option("maxHighlightLength", 10000, resetModeState, true);
   option("moveInputWithCursor", true, function(cm, val) {
@@ -5657,11 +5667,11 @@
     this.first = firstLine;
     this.scrollTop = this.scrollLeft = 0;
     this.cantEdit = false;
-    this.history = new History();
     this.cleanGeneration = 1;
     this.frontier = firstLine;
     var start = Pos(firstLine, 0);
     this.sel = simpleSelection(start);
+    this.history = new History(null, this);
     this.id = ++nextDocId;
     this.modeOption = mode;
 
@@ -5810,7 +5820,7 @@
       for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
       return {undo: done, redo: undone};
     },
-    clearHistory: function() {this.history = new History(this.history.maxGeneration);},
+    clearHistory: function() {this.history = new History(this.history.maxGeneration, this);},
 
     markClean: function() {
       this.cleanGeneration = this.changeGeneration(true);
@@ -5829,7 +5839,7 @@
               undone: copyHistoryArray(this.history.undone)};
     },
     setHistory: function(histData) {
-      var hist = this.history = new History(this.history.maxGeneration);
+      var hist = this.history = new History(this.history.maxGeneration, this);
       hist.done = copyHistoryArray(histData.done.slice(0), null, true);
       hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
     },
@@ -5937,7 +5947,7 @@
       if (other.history == this.history) {
         var splitIds = [other.id];
         linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
-        other.history = new History();
+        other.history = new History(null, other);
         other.history.done = copyHistoryArray(this.history.done, splitIds);
         other.history.undone = copyHistoryArray(this.history.undone, splitIds);
       }
@@ -6079,7 +6089,7 @@
 
   // HISTORY
 
-  function History(startGen) {
+  function History(startGen, doc) {
     // Arrays of history events. Doing something adds an event to
     // done and clears undo. Undoing moves events from done to
     // undone, redoing moves them in the other direction.
@@ -6087,11 +6097,13 @@
     this.undoDepth = Infinity;
     // Used to track when changes can be merged into a single undo
     // event
-    this.lastTime = 0;
+    this.lastModTime = this.pendingSelTime = 0;
     this.lastOp = null;
     this.lastOrigin = null;
+    this.pendingSelection = doc.sel;
     // Used by the isClean() method
     this.generation = this.maxGeneration = startGen || 1;
+    this.atomicSelection = false;
   }
 
   function attachLocalSpans(doc, change, from, to) {
@@ -6122,11 +6134,12 @@
   function addToHistory(doc, change, selAfter, opId) {
     var hist = doc.history;
     hist.undone.length = 0;
+    hist.pendingSelection = null;
     var time = +new Date, cur;
 
     if ((hist.lastOp == opId ||
          hist.lastOrigin == change.origin && change.origin &&
-         ((change.origin.charAt(0) == "+" && doc.cm && hist.lastTime > time - doc.cm.options.historyEventDelay) ||
+         ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
           change.origin.charAt(0) == "*")) &&
         (cur = lastChangeEvent(hist))) {
       // Merge this change into the last event
@@ -6150,26 +6163,40 @@
         hist.done.shift();
     }
     hist.generation = ++hist.maxGeneration;
-    hist.lastTime = time;
+    hist.lastModTime = time;
     hist.lastOp = opId;
     hist.lastOrigin = change.origin;
 
     if (!last) signal(doc, "historyAdded");
   }
 
-  function addSelectionToHistory(doc, cur, dest, opId) {
-    var prev = lst(dest);
-    if (prev && !prev.ranges) {
-      if (doc.history.lastOp == opId)
-        prev.selAfter = cur;
-      else
-        dest.push(cur);
-    } else if (dest.length < 2 || prev.ranges.length != cur.ranges.length ||
-               cur.somethingSelected() != prev.somethingSelected()) {
-      dest.push(cur);
-    } else {
-      dest[dest.length - 1] = cur;
+  function addSelectionToHistory(doc, sel, opId) {
+    var hist = doc.history, top = lst(hist.done);
+    if (top && !top.ranges && hist.lastOp == opId) {
+      hist.pendingSelection = null;
+      top.selAfter = sel;
+      return;
     }
+
+    var pend = hist.pendingSelection, now = +new Date;
+    if (pend && !hist.atomicSelection &&
+        (pend.ranges.length != sel.ranges.length ||
+         sel.somethingSelected() != pend.somethingSelected() ||
+         now - hist.pendingSelTime > (doc.cm ? doc.cm.options.historySelectionEventDelay : 1000)))
+      pushPendingSelection(doc, hist.done);
+    hist.pendingSelection = sel;
+    hist.pendingSelTime = now;
+  }
+
+  function pushPendingSelection(doc, dest) {
+    var hist = doc.history, top = lst(dest);
+    if (hist.pendingSelection && !(top && top.ranges && top.equals(hist.pendingSelection))) {
+      dest.push(hist.pendingSelection);
+      hist.pendingSelection = null;
+    }
+  }
+
+  function startSelectionEvent(doc) {
   }
 
   function removeClearedSpans(spans) {

From e6097a1c05ee658ed9fd420c77d9d7542ec932dd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Feb 2014 17:07:25 +0100
Subject: [PATCH 0947/4742] Add a more serious implementation of selection
 history

---
 lib/codemirror.js | 108 +++++++++++++++++++++++++---------------------
 test/test.js      |   9 +++-
 2 files changed, 66 insertions(+), 51 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ada7d53199..775a1fc2de 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1081,6 +1081,16 @@
     else return sel;
   }
 
+  function setSelectionReplaceHistory(doc, sel, scroll) {
+    var done = doc.history.done, last = lst(done);
+    if (last && last.ranges) {
+      done[done.length - 1] = sel;
+      setSelectionNoUndo(doc, sel, scroll);
+    } else {
+      setSelection(doc, sel, scroll);
+    }
+  }
+
   // Set a new selection.
   function setSelection(doc, sel, scroll) {
     setSelectionNoUndo(doc, sel, scroll);
@@ -2587,6 +2597,7 @@
       focusInput(cm);
       off(document, "mousemove", move);
       off(document, "mouseup", up);
+      pushPendingSelection(doc, doc.history.done);
       doc.history.atomicSelection = false;
     }
 
@@ -2652,7 +2663,7 @@
             pos = clipPos(cm.doc, pos);
             var change = {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"};
             makeChange(cm.doc, change);
-            setSelection(cm.doc, simpleSelection(pos, changeEnd(change)));
+            setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
           }
         };
         reader.readAsText(file);
@@ -2670,7 +2681,7 @@
         var text = e.dataTransfer.getData("Text");
         if (text) {
           var selected = cm.state.draggingText && cm.listSelections();
-          setSimpleSelection(cm.doc, pos);
+          setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
           if (selected) for (var i = 0; i < selected.length; ++i)
             replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
           cm.replaceSelection(text, "around", "paste");
@@ -3151,7 +3162,7 @@
   function makeChangeInner(doc, change) {
     if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return;
     var selAfter = computeSelAfterChange(doc, change);
-    addToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
+    addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
 
     makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
     var rebased = [];
@@ -3169,27 +3180,34 @@
   function makeChangeFromHistory(doc, type, allowSelectionOnly) {
     if (doc.cm && doc.cm.state.suppressEdits) return;
 
-    var hist = doc.history, event;
+    var hist = doc.history, event, selAfter = doc.sel;
     var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
+
+    // Verify that there is a useable event (so that ctrl-z won't
+    // needlessly clear selection events)
+    for (var i = 0; i < source.length; i++)
+      if (allowSelectionOnly || !source[i].ranges) break;
+    if (i == source.length) return;
+
     pushPendingSelection(doc, dest);
     for (;;) {
       event = source.pop();
-      if (!event) return;
       if (event.ranges) {
         dest.push(event);
         if (allowSelectionOnly && !event.equals(doc.sel)) {
           hist.pendingSelection = event;
           return setSelectionNoUndo(doc, event);
         }
+        selAfter = event;
       }
       else break;
     }
 
     // Build up a reverse change object to add to the opposite history
     // stack (redo when undoing, and vice versa).
-    var anti = {changes: [], selBefore: event.selAfter, selAfter: event.selBefore,
-                generation: hist.generation};
-    dest.push(anti);
+    var antiChanges = [];
+    pushSelectionToHistory(selAfter, dest);
+    dest.push({changes: antiChanges, generation: hist.generation});
     hist.generation = event.generation || ++hist.maxGeneration;
 
     var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
@@ -3202,9 +3220,9 @@
         return;
       }
 
-      anti.changes.push(historyChangeFromChange(doc, change));
+      antiChanges.push(historyChangeFromChange(doc, change));
 
-      var after = i ? computeSelAfterChange(doc, change, null) : event.selBefore;
+      var after = i ? computeSelAfterChange(doc, change, null) : lst(source);
       makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
       var rebased = [];
 
@@ -4718,7 +4736,7 @@
     }
 
     if (marker.addToHistory)
-      addToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN);
+      addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN);
 
     var curLine = from.line, cm = doc.cm, updateMaxLine;
     doc.iter(curLine, to.line + 1, function(line) {
@@ -5804,7 +5822,7 @@
       var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
       for (var i = changes.length - 1; i >= 0; i--)
         makeChange(this, changes[i]);
-      if (newSel) setSelection(this, newSel);
+      if (newSel) setSelectionReplaceHistory(this, newSel);
       else if (this.cm) ensureCursorVisible(this.cm);
     },
     undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
@@ -6103,6 +6121,7 @@
     this.pendingSelection = doc.sel;
     // Used by the isClean() method
     this.generation = this.maxGeneration = startGen || 1;
+    // Used to enforce that a selection-drag only adds one selection to the history
     this.atomicSelection = false;
   }
 
@@ -6131,10 +6150,10 @@
     }
   }
 
-  function addToHistory(doc, change, selAfter, opId) {
+  function addChangeToHistory(doc, change, selAfter, opId) {
     var hist = doc.history;
     hist.undone.length = 0;
-    hist.pendingSelection = null;
+    pushPendingSelection(doc, hist.done);
     var time = +new Date, cur;
 
     if ((hist.lastOp == opId ||
@@ -6152,16 +6171,20 @@
         // Add new sub-event
         cur.changes.push(historyChangeFromChange(doc, change));
       }
-      cur.selAfter = selAfter;
     } else {
+      var before = lst(hist.done);
+      if (!before || !before.ranges)
+        pushSelectionToHistory(doc.sel, hist.done);
       // Can not be merged, start a new event.
       cur = {changes: [historyChangeFromChange(doc, change)],
-             generation: hist.generation,
-             selBefore: doc.sel, selAfter: selAfter};
+             generation: hist.generation};
       hist.done.push(cur);
-      while (hist.done.length > hist.undoDepth)
+      while (hist.done.length > hist.undoDepth) {
         hist.done.shift();
+        if (!hist.done[0].ranges) hist.done.shift();
+      }
     }
+    hist.done.push(selAfter);
     hist.generation = ++hist.maxGeneration;
     hist.lastModTime = time;
     hist.lastOp = opId;
@@ -6171,34 +6194,32 @@
   }
 
   function addSelectionToHistory(doc, sel, opId) {
-    var hist = doc.history, top = lst(hist.done);
-    if (top && !top.ranges && hist.lastOp == opId) {
-      hist.pendingSelection = null;
-      top.selAfter = sel;
-      return;
-    }
+    var hist = doc.history, pend = hist.pendingSelection, now = +new Date;
 
-    var pend = hist.pendingSelection, now = +new Date;
-    if (pend && !hist.atomicSelection &&
+    if (pend && !hist.atomicSelection && opId != hist.lastOp &&
         (pend.ranges.length != sel.ranges.length ||
          sel.somethingSelected() != pend.somethingSelected() ||
          now - hist.pendingSelTime > (doc.cm ? doc.cm.options.historySelectionEventDelay : 1000)))
       pushPendingSelection(doc, hist.done);
     hist.pendingSelection = sel;
     hist.pendingSelTime = now;
+    hist.lastOp = opId;
+  }
+
+  function pushSelectionToHistory(sel, dest) {
+    var top = lst(dest);
+    if (!(top && top.ranges && top.equals(sel)))
+      dest.push(sel);
   }
 
   function pushPendingSelection(doc, dest) {
-    var hist = doc.history, top = lst(dest);
-    if (hist.pendingSelection && !(top && top.ranges && top.equals(hist.pendingSelection))) {
-      dest.push(hist.pendingSelection);
+    var hist = doc.history;
+    if (hist.pendingSelection) {
+      pushSelectionToHistory(hist.pendingSelection, dest);
       hist.pendingSelection = null;
     }
   }
 
-  function startSelectionEvent(doc) {
-  }
-
   function removeClearedSpans(spans) {
     if (!spans) return null;
     for (var i = 0, out; i < spans.length; ++i) {
@@ -6233,9 +6254,7 @@
         continue;
       }
       var changes = event.changes, newChanges = [];
-      copy.push({changes: newChanges,
-                 selBefore: copyHistorySel(event.selBefore, instantiateSel),
-                 selAfter: copyHistorySel(event.selAfter, instantiateSel)});
+      copy.push({changes: newChanges});
       for (var j = 0; j < changes.length; ++j) {
         var change = changes[j], m;
         newChanges.push({from: change.from, to: change.to, text: change.text});
@@ -6252,12 +6271,6 @@
 
   // Rebasing/resetting history to deal with externally-sourced changes
 
-  function rebaseHistSel(array, from, to, diff) {
-    for (var i = 0; i < array.length; i++) {
-      rebaseHistSelSingle(array[i].anchor, from, to, diff);
-      rebaseHistSelSingle(array[i].head, from, to, diff);
-    }
-  }
   function rebaseHistSelSingle(pos, from, to, diff) {
     if (to < pos.line) {
       pos.line += diff;
@@ -6279,7 +6292,10 @@
       var sub = array[i], ok = true;
       if (sub.ranges) {
         if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
-        rebaseHistSel(sub, from, to, diff);
+        for (var j = 0; j < sub.ranges.length; j++) {
+          rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
+          rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
+        }
         continue;
       }
       for (var j = 0; j < sub.changes.length; ++j) {
@@ -6292,17 +6308,9 @@
           break;
         }
       }
-      if (!sub.copied) {
-        sub.selBefore = sub.selBefore.deepCopy();
-        sub.selAfter = sub.selAfter.deepCopy();
-        sub.copied = true;
-      }
       if (!ok) {
         array.splice(0, i + 1);
         i = 0;
-      } else {
-        rebaseHistSel(sub.selBefore, from, to, diff);
-        rebaseHistSel(sub.selAfter, from, to, diff);
       }
     }
   }
diff --git a/test/test.js b/test/test.js
index b975c99fd7..a1b1b6e814 100644
--- a/test/test.js
+++ b/test/test.js
@@ -295,7 +295,7 @@ testCM("undoDepth", function(cm) {
   cm.replaceRange("f", Pos(0));
   cm.undo(); cm.undo(); cm.undo();
   eq(cm.getValue(), "abcd");
-}, {value: "abc", undoDepth: 2});
+}, {value: "abc", undoDepth: 4});
 
 testCM("undoDoesntClearValue", function(cm) {
   cm.undo();
@@ -352,6 +352,13 @@ testCM("undoSelection", function(cm) {
   eqPos(cm.getCursor(false), Pos(0, 2));
 }, {value: "abcdefgh\n"});
 
+testCM("undoSelectionAsBefore", function(cm) {
+  cm.replaceSelection("abc", "around");
+  cm.undo();
+  cm.redo();
+  eq(cm.getSelection(), "abc");
+});
+
 testCM("markTextSingleLine", function(cm) {
   forEach([{a: 0, b: 1, c: "", f: 2, t: 5},
            {a: 0, b: 4, c: "", f: 0, t: 2},

From b2eb4e838dec7845212634064969376fe5ecaea0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Feb 2014 17:27:50 +0100
Subject: [PATCH 0948/4742] Fix drag-outside-of-iframe confusion in IE9+

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 09cf46a880..68bb718a9e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1846,7 +1846,7 @@ window.CodeMirror = (function() {
     }
 
     var move = operation(cm, function(e) {
-      if (!old_ie && !e_button(e)) done(e);
+      if (!ie_lt9 && (ie ? !e.buttons : !e_button(e))) done(e);
       else extend(e);
     });
     var up = operation(cm, done);

From ac8a75c9ae1b9549c14c1972f66403583c0b7fee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Feb 2014 17:53:08 +0100
Subject: [PATCH 0949/4742] Use a uniform export pattern

---
 lib/codemirror.js | 78 ++++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 48 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 775a1fc2de..82274e868b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4232,15 +4232,11 @@
     helpers[type]._global.push({pred: predicate, val: value});
   };
 
-  // UTILITIES
-
-  CodeMirror.isWordChar = isWordChar;
-
   // MODE STATE HANDLING
 
   // Utility functions for working with state. Exported because modes
   // sometimes need to do this.
-  function copyState(mode, state) {
+  var copyState = CodeMirror.copyState = function(mode, state) {
     if (state === true) return state;
     if (mode.copyState) return mode.copyState(state);
     var nstate = {};
@@ -4250,13 +4246,11 @@
       nstate[n] = val;
     }
     return nstate;
-  }
-  CodeMirror.copyState = copyState;
+  };
 
-  function startState(mode, a1, a2) {
+  var startState = CodeMirror.startState = function(mode, a1, a2) {
     return mode.startState ? mode.startState(a1, a2) : true;
-  }
-  CodeMirror.startState = startState;
+  };
 
   CodeMirror.innerMode = function(mode, state) {
     while (mode.innerMode) {
@@ -4437,7 +4431,7 @@
     else return val;
   }
 
-  function lookupKey(name, maps, handle) {
+  var lookupKey = CodeMirror.lookupKey = function(name, maps, handle) {
     function lookup(map) {
       map = getKeyMap(map);
       var found = map[name];
@@ -4460,12 +4454,12 @@
       var done = lookup(maps[i]);
       if (done) return done != "stop";
     }
-  }
-  function isModifierKey(event) {
+  };
+  var isModifierKey = CodeMirror.isModifierKey = function(event) {
     var name = keyNames[event.keyCode];
     return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
-  }
-  function keyName(event, noShift) {
+  };
+  var keyName = CodeMirror.keyName = function(event, noShift) {
     if (presto && event.keyCode == 34 && event["char"]) return false;
     var name = keyNames[event.keyCode];
     if (name == null || event.altGraphKey) return false;
@@ -4474,10 +4468,7 @@
     if (flipCtrlCmd ? event.ctrlKey : event.metaKey) name = "Cmd-" + name;
     if (!noShift && event.shiftKey) name = "Shift-" + name;
     return name;
-  }
-  CodeMirror.lookupKey = lookupKey;
-  CodeMirror.isModifierKey = isModifierKey;
-  CodeMirror.keyName = keyName;
+  };
 
   // FROMTEXTAREA
 
@@ -4538,13 +4529,13 @@
   // parsers more succinct.
 
   // The character stream used by a mode's parser.
-  function StringStream(string, tabSize) {
+  var StringStream = CodeMirror.StringStream = function(string, tabSize) {
     this.pos = this.start = 0;
     this.string = string;
     this.tabSize = tabSize || 8;
     this.lastColumnPos = this.lastColumnValue = 0;
     this.lineStart = 0;
-  }
+  };
 
   StringStream.prototype = {
     eol: function() {return this.pos >= this.string.length;},
@@ -4609,16 +4600,14 @@
       finally { this.lineStart -= n; }
     }
   };
-  CodeMirror.StringStream = StringStream;
 
   // TEXTMARKERS
 
-  function TextMarker(doc, type) {
+  var TextMarker = CodeMirror.TextMarker = function(doc, type) {
     this.lines = [];
     this.type = type;
     this.doc = doc;
-  }
-  CodeMirror.TextMarker = TextMarker;
+  };
   eventMixin(TextMarker);
 
   TextMarker.prototype.clear = function() {
@@ -4777,15 +4766,14 @@
 
   // SHARED TEXTMARKERS
 
-  function SharedTextMarker(markers, primary) {
+  var SharedTextMarker = CodeMirror.SharedTextMarker = function(markers, primary) {
     this.markers = markers;
     this.primary = primary;
     for (var i = 0, me = this; i < markers.length; ++i) {
       markers[i].parent = this;
       on(markers[i], "clear", function(){me.clear();});
     }
-  }
-  CodeMirror.SharedTextMarker = SharedTextMarker;
+  };
   eventMixin(SharedTextMarker);
 
   SharedTextMarker.prototype.clear = function() {
@@ -6323,21 +6311,18 @@
 
   // EVENT OPERATORS
 
-  function e_preventDefault(e) {
+  var e_preventDefault = CodeMirror.e_preventDefault = function(e) {
     if (e.preventDefault) e.preventDefault();
     else e.returnValue = false;
-  }
-  function e_stopPropagation(e) {
+  };
+  var e_stopPropagation = CodeMirror.e_stopPropagation = function(e) {
     if (e.stopPropagation) e.stopPropagation();
     else e.cancelBubble = true;
-  }
+  };
   function e_defaultPrevented(e) {
     return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;
   }
-  function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
-  CodeMirror.e_stop = e_stop;
-  CodeMirror.e_preventDefault = e_preventDefault;
-  CodeMirror.e_stopPropagation = e_stopPropagation;
+  var e_stop = CodeMirror.e_stop = function(e) {e_preventDefault(e); e_stopPropagation(e);};
 
   function e_target(e) {return e.target || e.srcElement;}
   function e_button(e) {
@@ -6353,7 +6338,7 @@
 
   // EVENT HANDLING
 
-  function on(emitter, type, f) {
+  var on = CodeMirror.on = function(emitter, type, f) {
     if (emitter.addEventListener)
       emitter.addEventListener(type, f, false);
     else if (emitter.attachEvent)
@@ -6363,9 +6348,9 @@
       var arr = map[type] || (map[type] = []);
       arr.push(f);
     }
-  }
+  };
 
-  function off(emitter, type, f) {
+  var off = CodeMirror.off = function(emitter, type, f) {
     if (emitter.removeEventListener)
       emitter.removeEventListener(type, f, false);
     else if (emitter.detachEvent)
@@ -6376,14 +6361,14 @@
       for (var i = 0; i < arr.length; ++i)
         if (arr[i] == f) { arr.splice(i, 1); break; }
     }
-  }
+  };
 
-  function signal(emitter, type /*, values...*/) {
+  var signal = CodeMirror.signal = function(emitter, type /*, values...*/) {
     var arr = emitter._handlers && emitter._handlers[type];
     if (!arr) return;
     var args = Array.prototype.slice.call(arguments, 2);
     for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
-  }
+  };
 
   var delayedCallbacks, delayedCallbackDepth = 0;
   function signalLater(emitter, type /*, values...*/) {
@@ -6417,8 +6402,6 @@
     return arr && arr.length > 0;
   }
 
-  CodeMirror.on = on; CodeMirror.off = off; CodeMirror.signal = signal;
-
   function eventMixin(ctor) {
     ctor.prototype.on = function(type, f) {on(this, type, f);};
     ctor.prototype.off = function(type, f) {off(this, type, f);};
@@ -6518,10 +6501,10 @@
   }
 
   var nonASCIISingleCaseWordChar = /[\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
-  function isWordChar(ch) {
+  var isWordChar = CodeMirror.isWordChar = function(ch) {
     return /\w/.test(ch) || ch > "\x80" &&
       (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
-  }
+  };
 
   function isEmpty(obj) {
     for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false;
@@ -6622,7 +6605,7 @@
 
   // See if "".split is the broken IE version, if so, provide an
   // alternative way to split lines.
-  var splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
+  var splitLines = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
     var pos = 0, result = [], l = string.length;
     while (pos <= l) {
       var nl = string.indexOf("\n", pos);
@@ -6639,7 +6622,6 @@
     }
     return result;
   } : function(string){return string.split(/\r\n?|\n/);};
-  CodeMirror.splitLines = splitLines;
 
   var hasSelection = window.getSelection ? function(te) {
     try { return te.selectionStart != te.selectionEnd; }

From 47444cdacbdacfdf7fabf304f4389a6c3434afc8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Feb 2014 23:24:27 +0100
Subject: [PATCH 0950/4742] Documentation pass, part 4 (the rest)

---
 lib/codemirror.js | 611 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 439 insertions(+), 172 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 82274e868b..c7eea2d9cb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3276,13 +3276,14 @@
     change.removed = getBetween(doc, change.from, change.to);
 
     if (!selAfter) selAfter = computeSelAfterChange(doc, change, null);
-    if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans, selAfter);
-    else updateDoc(doc, change, spans, selAfter);
+    if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
+    else updateDoc(doc, change, spans);
+    setSelection(doc, selAfter, false);
   }
 
   // Handle the interaction of a change to a document with the editor
   // that this document is part of.
-  function makeChangeSingleDocInEditor(cm, change, spans, selAfter) {
+  function makeChangeSingleDocInEditor(cm, change, spans) {
     var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
 
     var recomputeMaxLength = false, checkWidthStart = from.line;
@@ -3299,7 +3300,7 @@
     if (doc.sel.contains(change.from, change.to) > -1)
       cm.curOp.cursorActivity = true;
 
-    updateDoc(doc, change, spans, selAfter, estimateHeight(cm));
+    updateDoc(doc, change, spans, estimateHeight(cm));
 
     if (!cm.options.lineWrapping) {
       doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
@@ -3343,12 +3344,8 @@
 
   // SCROLLING THINGS INTO VIEW
 
-  function ensureCursorVisible(cm) {
-    resolveScrollToPos(cm);
-    var cur = cm.getCursor();
-    cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin, isCursor: true};
-  }
-
+  // If an editor sits on the top or bottom of the window, partially
+  // scrolled out of view, this ensures that the cursor is visible.
   function maybeScrollWindow(cm, coords) {
     var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
     if (coords.top + box.top < 0) doScroll = true;
@@ -3364,6 +3361,9 @@
     }
   }
 
+  // Scroll a given position into view (immediately), verifying that
+  // it actually became visible (as line heights are accurately
+  // measured, the position of something may 'drift' during drawing).
   function scrollPosIntoView(cm, pos, end, margin) {
     if (margin == null) margin = 0;
     for (;;) {
@@ -3386,12 +3386,17 @@
     }
   }
 
+  // Scroll a given set of coordinates into view (immediately).
   function scrollIntoView(cm, x1, y1, x2, y2) {
     var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2);
     if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop);
     if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft);
   }
 
+  // Calculate a new scroll position needed to scroll the given
+  // rectangle into view. Returns an object with scrollTop and
+  // scrollLeft properties. When these are undefined, the
+  // vertical/horizontal position does not need to be adjusted.
   function calculateScrollPos(cm, x1, y1, x2, y2) {
     var display = cm.display, snapMargin = textHeight(cm.display);
     if (y1 < 0) y1 = 0;
@@ -3420,6 +3425,8 @@
     return result;
   }
 
+  // Store a relative adjustment to the scroll position in the current
+  // operation (to be applied when the operation finishes).
   function addToScrollPos(cm, left, top) {
     if (left != null || top != null) resolveScrollToPos(cm);
     if (left != null)
@@ -3428,6 +3435,18 @@
       cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
   }
 
+  // Make sure that at the end of the operation the current cursor is
+  // shown.
+  function ensureCursorVisible(cm) {
+    resolveScrollToPos(cm);
+    var cur = cm.getCursor();
+    cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin, isCursor: true};
+  }
+
+  // When an operation has its scrollToPos property set, and another
+  // scroll action is applied before the end of the operation, this
+  // 'simulates' scrolling that position into view in a cheap way, so
+  // that the effect of intermediate scroll commands is not ignored.
   function resolveScrollToPos(cm) {
     var range = cm.curOp.scrollToPos;
     if (range) {
@@ -3443,10 +3462,17 @@
 
   // API UTILITIES
 
+  // Indent the given line. The how parameter can be "smart",
+  // "add"/null, "subtract", or "prev". When aggressive is false
+  // (typically set to true for forced single-line indents), empty
+  // lines are not indented, and places where the mode returns Pass
+  // are left alone.
   function indentLine(cm, n, how, aggressive) {
     var doc = cm.doc;
     if (how == null) how = "add";
     if (how == "smart") {
+      // Fall back to "prev" when the mode doesn't have an indentation
+      // method.
       if (!cm.doc.mode.indent) how = "prev";
       else var state = getStateBefore(cm, n);
     }
@@ -3484,6 +3510,8 @@
     if (indentString != curSpaceString) {
       replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
     } 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.
       for (var i = 0; i < doc.sel.ranges.length; i++) {
         var range = doc.sel.ranges[i];
         if (range.head.line == n && range.head.ch < curSpaceString.length) {
@@ -3496,6 +3524,9 @@
     line.stateAfter = null;
   }
 
+  // Utility for applying a change to a line by handle or number,
+  // returning the number and optionally registering the line as
+  // changed.
   function changeLine(cm, handle, changeType, op) {
     var no = handle, line = handle, doc = cm.doc;
     if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
@@ -3506,8 +3537,12 @@
     return line;
   }
 
+  // Helper for deleting text near the selection(s), used to implement
+  // backspace, delete, and similar functionality.
   function deleteNearSelection(cm, compute) {
     var ranges = cm.doc.sel.ranges, kill = [];
+    // Build up a set of ranges to kill first, merging overlapping
+    // ranges.
     for (var i = 0; i < ranges.length; i++) {
       var toKill = compute(ranges[i]);
       while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
@@ -3519,6 +3554,7 @@
       }
       kill.push(toKill);
     }
+    // Next, remove those actual ranges.
     runInOp(cm, function() {
       for (var i = kill.length - 1; i >= 0; i--)
         replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
@@ -3526,6 +3562,15 @@
     });
   }
 
+  // Used for horizontal relative motion. Dir is -1 or 1 (left or
+  // right), unit can be "char", "column" (like char, but doesn't
+  // cross line boundaries), "word" (across next word), or "group" (to
+  // the start of next group of word or non-word-non-whitespace
+  // chars). The visually param controls whether, in right-to-left
+  // text, direction 1 means to move towards the next index in the
+  // string, or towards the character to the right of the current
+  // position. The resulting position will have a hitSide=true
+  // property if it reached the end of the document.
   function findPosH(doc, pos, dir, unit, visually) {
     var line = pos.line, ch = pos.ch, origDir = dir;
     var lineObj = getLine(doc, line);
@@ -3571,6 +3616,9 @@
     return result;
   }
 
+  // For relative vertical movement. Dir may be -1 or 1. Unit can be
+  // "page" or "line". The resulting position will have a hitSide=true
+  // property if it reached the end of the document.
   function findPosV(cm, pos, dir, unit) {
     var doc = cm.doc, x = pos.left, y;
     if (unit == "page") {
@@ -3588,6 +3636,7 @@
     return target;
   }
 
+  // Find the word at the given position (as returned by coordsChar).
   function findWordAt(line, pos) {
     var start = pos.ch, end = pos.ch;
     if (line) {
@@ -3602,10 +3651,15 @@
     return {from: Pos(pos.line, start), to: Pos(pos.line, end)};
   }
 
-  // PROTOTYPE
+  // EDITOR METHODS
 
   // The publicly visible API. Note that methodOp(f) means
-  // 'wrap f in an operation, performed on its `this` parameter'
+  // 'wrap f in an operation, performed on its `this` parameter'.
+
+  // This is not the complete set of editor methods. Most of the
+  // methods defined on the Doc type are also injected into
+  // CodeMirror.prototype, for backwards compatibility and
+  // convenience.
 
   CodeMirror.prototype = {
     constructor: CodeMirror,
@@ -4043,10 +4097,10 @@
 
   // OPTION DEFAULTS
 
-  var optionHandlers = CodeMirror.optionHandlers = {};
-
   // The default configuration options.
   var defaults = CodeMirror.defaults = {};
+  // Functions to run when options are changed.
+  var optionHandlers = CodeMirror.optionHandlers = {};
 
   function option(name, deflt, handle, notOnInit) {
     CodeMirror.defaults[name] = deflt;
@@ -4054,6 +4108,7 @@
       notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle;
   }
 
+  // Passed to option handlers when there is no old value.
   var Init = CodeMirror.Init = {toString: function(){return "CodeMirror.Init";}};
 
   // These two are, on init, called from the constructor because they
@@ -4150,6 +4205,9 @@
   // Known modes, by name and by MIME
   var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
 
+  // Extra arguments are stored as the mode's dependencies, which is
+  // used by (legacy) mechanisms like loadmode.js to automatically
+  // load a mode. (Preferred mechanism is the require/define calls.)
   CodeMirror.defineMode = function(name, mode) {
     if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
     if (arguments.length > 2) {
@@ -4163,6 +4221,8 @@
     mimeModes[mime] = spec;
   };
 
+  // Given a MIME type, a {name, ...options} config object, or a name
+  // string, return a mode config object.
   CodeMirror.resolveMode = function(spec) {
     if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
       spec = mimeModes[spec];
@@ -4177,6 +4237,8 @@
     else return spec || {name: "null"};
   };
 
+  // Given a mode spec (anything that resolveMode accepts), find and
+  // initialize an actual mode object.
   CodeMirror.getMode = function(options, spec) {
     var spec = CodeMirror.resolveMode(spec);
     var mfactory = modes[spec.name];
@@ -4198,11 +4260,14 @@
     return modeObj;
   };
 
+  // Minimal default mode.
   CodeMirror.defineMode("null", function() {
     return {token: function(stream) {stream.skipToEnd();}};
   });
   CodeMirror.defineMIME("text/plain", "null");
 
+  // This can be used to attach properties to mode objects from
+  // outside the actual mode definition.
   var modeExtensions = CodeMirror.modeExtensions = {};
   CodeMirror.extendMode = function(mode, properties) {
     var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
@@ -4234,8 +4299,9 @@
 
   // MODE STATE HANDLING
 
-  // Utility functions for working with state. Exported because modes
-  // sometimes need to do this.
+  // Utility functions for working with state. Exported because nested
+  // modes need to do this for their inner modes.
+
   var copyState = CodeMirror.copyState = function(mode, state) {
     if (state === true) return state;
     if (mode.copyState) return mode.copyState(state);
@@ -4252,6 +4318,8 @@
     return mode.startState ? mode.startState(a1, a2) : true;
   };
 
+  // Given a mode and a state (for that mode), find the inner mode and
+  // state at the position that the state refers to.
   CodeMirror.innerMode = function(mode, state) {
     while (mode.innerMode) {
       var info = mode.innerMode(state);
@@ -4264,6 +4332,8 @@
 
   // STANDARD COMMANDS
 
+  // Commands are parameter-less actions that can be performed on an
+  // editor, mostly used for keybindings.
   var commands = CodeMirror.commands = {
     selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), false);},
     singleSelection: function(cm) {
@@ -4395,7 +4465,8 @@
     "Esc": "singleSelection"
   };
   // Note that the save and find-related commands aren't defined by
-  // default. Unknown commands are simply ignored.
+  // default. User code or addons can define them. Unknown commands
+  // are simply ignored.
   keyMap.pcDefault = {
     "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
     "Ctrl-Home": "goDocStart", "Ctrl-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
@@ -4416,13 +4487,14 @@
     "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection",
     fallthrough: ["basic", "emacsy"]
   };
-  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
+  // Very basic readline/emacs-style bindings, which are standard on Mac.
   keyMap.emacsy = {
     "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
     "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
     "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
     "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
   };
+  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
 
   // KEYMAP DISPATCH
 
@@ -4431,6 +4503,10 @@
     else return val;
   }
 
+  // Given an array of keymaps and a key name, call handle on any
+  // bindings found, until that returns a truthy value, at which point
+  // we consider the key handled. Implements things like binding a key
+  // to false stopping further handling and keymap fallthrough.
   var lookupKey = CodeMirror.lookupKey = function(name, maps, handle) {
     function lookup(map) {
       map = getKeyMap(map);
@@ -4443,7 +4519,7 @@
       if (fallthrough == null) return false;
       if (Object.prototype.toString.call(fallthrough) != "[object Array]")
         return lookup(fallthrough);
-      for (var i = 0, e = fallthrough.length; i < e; ++i) {
+      for (var i = 0; i < fallthrough.length; ++i) {
         var done = lookup(fallthrough[i]);
         if (done) return done;
       }
@@ -4455,10 +4531,15 @@
       if (done) return done != "stop";
     }
   };
+
+  // Modifier key presses don't count as 'real' key presses for the
+  // purpose of keymap fallthrough.
   var isModifierKey = CodeMirror.isModifierKey = function(event) {
     var name = keyNames[event.keyCode];
     return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
   };
+
+  // Look up the name of a key as indicated by an event object.
   var keyName = CodeMirror.keyName = function(event, noShift) {
     if (presto && event.keyCode == 34 && event["char"]) return false;
     var name = keyNames[event.keyCode];
@@ -4528,7 +4609,6 @@
   // Fed to the mode parsers, provides helper functions to make
   // parsers more succinct.
 
-  // The character stream used by a mode's parser.
   var StringStream = CodeMirror.StringStream = function(string, tabSize) {
     this.pos = this.start = 0;
     this.string = string;
@@ -4603,6 +4683,16 @@
 
   // TEXTMARKERS
 
+  // Created with markText and setBookmark methods. A TextMarker is a
+  // handle that can be used to clear or find a marked position in the
+  // document. Line objects hold arrays (markedSpans) containing
+  // {from, to, marker} object pointing to such marker objects, and
+  // indicating that such a marker is present on that line. Multiple
+  // lines may point to the same marker when it spans across lines.
+  // The spans will have null for their from/to properties when the
+  // marker continues beyond the start/end of the line. Markers have
+  // links back to the lines they currently touch.
+
   var TextMarker = CodeMirror.TextMarker = function(doc, type) {
     this.lines = [];
     this.type = type;
@@ -4610,6 +4700,7 @@
   };
   eventMixin(TextMarker);
 
+  // Clear the marker.
   TextMarker.prototype.clear = function() {
     if (this.explicitlyCleared) return;
     var cm = this.doc.cm, withOp = cm && !cm.curOp;
@@ -4640,7 +4731,7 @@
       }
     }
 
-    if (min != null) regChange(cm, min, max + 1);
+    if (min != null && cm && this.collapsed) regChange(cm, min, max + 1);
     this.lines.length = 0;
     this.explicitlyCleared = true;
     if (this.atomic && this.doc.cantEdit) {
@@ -4650,7 +4741,11 @@
     if (withOp) endOperation(cm);
   };
 
-  // Side can be 0 (both), -1 (left), 1 (right)
+  // Find the position of the marker in the document. Returns a {from,
+  // to} object by default. Side can be passed to get a specific side
+  // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
+  // Pos objects returned contain a line object, rather than a line
+  // number (used to prevent looking up the same line twice).
   TextMarker.prototype.find = function(side, lineObj) {
     if (side == null && this.type == "bookmark") side = 1;
     var from, to;
@@ -4669,6 +4764,8 @@
     return from && {from: from, to: to};
   };
 
+  // Signals that the marker's widget changed, and surrounding layout
+  // should be recomputed.
   TextMarker.prototype.changed = function() {
     var pos = this.find(-1, true), cm = this.doc.cm;
     if (!pos || !cm) return;
@@ -4701,21 +4798,31 @@
     }
   };
 
+  // Collapsed markers have unique ids, in order to be able to order
+  // them, which is needed for uniquely determining an outer marker
+  // when they overlap (they may nest, but not partially overlap).
   var nextMarkerId = 0;
 
+  // Create a marker, wire it up to the right lines, and
   function markText(doc, from, to, options, type) {
+    // Shared markers (across linked documents) are handled separately
+    // (markTextShared will call out to this again, once per
+    // document).
     if (options && options.shared) return markTextShared(doc, from, to, options, type);
+    // Ensure we are in an operation.
     if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
 
     var marker = new TextMarker(doc, type), diff = cmp(from, to);
     if (options) copyObj(options, marker);
+    // Don't connect empty markers unless clearWhenEmpty is false
     if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
       return marker;
     if (marker.replacedWith) {
+      // Showing up as a widget implies collapsed (widget replaces text)
       marker.collapsed = true;
-      marker.replacedWith = elt("span", [marker.replacedWith], "CodeMirror-widget");
-      if (!options.handleMouseEvents) marker.replacedWith.ignoreEvents = true;
-      if (options.insertLeft) marker.replacedWith.insertLeft = true;
+      marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
+      if (!options.handleMouseEvents) marker.widgetNode.ignoreEvents = true;
+      if (options.insertLeft) marker.widgetNode.insertLeft = true;
     }
     if (marker.collapsed) {
       if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
@@ -4731,13 +4838,13 @@
     doc.iter(curLine, to.line + 1, function(line) {
       if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
         updateMaxLine = true;
-      var span = {from: null, to: null, marker: marker};
-      if (curLine == from.line) span.from = from.ch;
-      if (curLine == to.line) span.to = to.ch;
       if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0);
-      addMarkedSpan(line, span);
+      addMarkedSpan(line, new MarkedSpan(marker,
+                                         curLine == from.line ? from.ch : null,
+                                         curLine == to.line ? to.ch : null));
       ++curLine;
     });
+    // lineIsHidden depends on the presence of the spans, so needs a second pass
     if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
       if (lineIsHidden(doc, line)) updateLineHeight(line, 0);
     });
@@ -4754,6 +4861,7 @@
       marker.atomic = true;
     }
     if (cm) {
+      // Sync editor state
       if (updateMaxLine) cm.curOp.updateMaxLine = true;
       if (marker.collapsed)
         regChange(cm, from.line, to.line + 1);
@@ -4766,6 +4874,9 @@
 
   // SHARED TEXTMARKERS
 
+  // A shared marker spans multiple linked documents. It is
+  // implemented as a meta-marker-object controlling multiple normal
+  // markers.
   var SharedTextMarker = CodeMirror.SharedTextMarker = function(markers, primary) {
     this.markers = markers;
     this.primary = primary;
@@ -4791,9 +4902,9 @@
     options = copyObj(options);
     options.shared = false;
     var markers = [markText(doc, from, to, options, type)], primary = markers[0];
-    var widget = options.replacedWith;
+    var widget = options.widgetNode;
     linkedDocs(doc, function(doc) {
-      if (widget) options.replacedWith = widget.cloneNode(true);
+      if (widget) options.widgetNode = widget.cloneNode(true);
       markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
       for (var i = 0; i < doc.linked.length; ++i)
         if (doc.linked[i].isParent) return;
@@ -4804,50 +4915,65 @@
 
   // TEXTMARKER SPANS
 
+  function MarkedSpan(marker, from, to) {
+    this.marker = marker;
+    this.from = from; this.to = to;
+  }
+
+  // Search an array of spans for a span matching the given marker.
   function getMarkedSpanFor(spans, marker) {
     if (spans) for (var i = 0; i < spans.length; ++i) {
       var span = spans[i];
       if (span.marker == marker) return span;
     }
   }
+  // Remove a span from an array, returning undefined if no spans are
+  // left (we don't store arrays for lines without spans).
   function removeMarkedSpan(spans, span) {
     for (var r, i = 0; i < spans.length; ++i)
       if (spans[i] != span) (r || (r = [])).push(spans[i]);
     return r;
   }
+  // Add a span to a line.
   function addMarkedSpan(line, span) {
     line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
     span.marker.attachLine(line);
   }
 
+  // Used for the algorithm that adjusts markers for a change in the
+  // document. These functions cut an array of spans at a given
+  // character position, returning an array of remaining chunks (or
+  // undefined if nothing remains).
   function markedSpansBefore(old, startCh, isInsert) {
     if (old) for (var i = 0, nw; i < old.length; ++i) {
       var span = old[i], marker = span.marker;
       var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
       if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
         var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
-        (nw || (nw = [])).push({from: span.from,
-                                to: endsAfter ? null : span.to,
-                                marker: marker});
+        (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
       }
     }
     return nw;
   }
-
   function markedSpansAfter(old, endCh, isInsert) {
     if (old) for (var i = 0, nw; i < old.length; ++i) {
       var span = old[i], marker = span.marker;
       var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
       if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
         var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
-        (nw || (nw = [])).push({from: startsBefore ? null : span.from - endCh,
-                                to: span.to == null ? null : span.to - endCh,
-                                marker: marker});
+        (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
+                                              span.to == null ? null : span.to - endCh));
       }
     }
     return nw;
   }
 
+  // Given a change object, compute the new set of marker spans that
+  // cover the line in which the change took place. Removes spans
+  // entirely within the change, reconnects spans belonging to the
+  // same marker that appear on both sides of the change, and cuts off
+  // spans partially within the change. Returns an array of span
+  // arrays with one element for each line in (after) the change.
   function stretchSpansOverChange(doc, change) {
     var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
     var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
@@ -4899,7 +5025,7 @@
       if (gap > 0 && first)
         for (var i = 0; i < first.length; ++i)
           if (first[i].to == null)
-            (gapMarkers || (gapMarkers = [])).push({from: null, to: null, marker: first[i].marker});
+            (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null));
       for (var i = 0; i < gap; ++i)
         newMarkers.push(gapMarkers);
       newMarkers.push(last);
@@ -4907,6 +5033,8 @@
     return newMarkers;
   }
 
+  // Remove spans that are empty and don't have a clearWhenEmpty
+  // option of false.
   function clearEmptySpans(spans) {
     for (var i = 0; i < spans.length; ++i) {
       var span = spans[i];
@@ -4917,6 +5045,10 @@
     return spans;
   }
 
+  // Used for un/re-doing changes from the history. Combines the
+  // result of computing the existing spans with the set of spans that
+  // existed in the history (so that deleting around a span and then
+  // undoing brings back the span).
   function mergeOldSpans(doc, change) {
     var old = getOldSpans(doc, change);
     var stretched = stretchSpansOverChange(doc, change);
@@ -4939,6 +5071,7 @@
     return old;
   }
 
+  // Used to 'clip' out readOnly ranges when making a change.
   function removeReadOnlyRanges(doc, from, to) {
     var markers = null;
     doc.iter(from.line, to.line + 1, function(line) {
@@ -4967,9 +5100,29 @@
     return parts;
   }
 
+  // Connect or disconnect spans from a line.
+  function detachMarkedSpans(line) {
+    var spans = line.markedSpans;
+    if (!spans) return;
+    for (var i = 0; i < spans.length; ++i)
+      spans[i].marker.detachLine(line);
+    line.markedSpans = null;
+  }
+  function attachMarkedSpans(line, spans) {
+    if (!spans) return;
+    for (var i = 0; i < spans.length; ++i)
+      spans[i].marker.attachLine(line);
+    line.markedSpans = spans;
+  }
+
+  // Helpers used when computing which overlapping collapsed span
+  // counts as the larger one.
   function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; }
   function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; }
 
+  // Returns a number indicating which of two overlapping collapsed
+  // spans is larger (and thus includes the other). Falls back to
+  // comparing ids when the spans cover exactly the same range.
   function compareCollapsedMarkers(a, b) {
     var lenDiff = a.lines.length - b.lines.length;
     if (lenDiff != 0) return lenDiff;
@@ -4981,6 +5134,8 @@
     return b.id - a.id;
   }
 
+  // Find out whether a line ends or starts in a collapsed span. If
+  // so, return the marker for that span.
   function collapsedSpanAtSide(line, start) {
     var sps = sawCollapsedSpans && line.markedSpans, found;
     if (sps) for (var sp, i = 0; i < sps.length; ++i) {
@@ -4994,6 +5149,9 @@
   function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }
   function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }
 
+  // Test whether there exists a collapsed span that partially
+  // overlaps (covers the start or end, but not both) of a new span.
+  // Such overlap is not allowed.
   function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
     var line = getLine(doc, lineNo);
     var sps = sawCollapsedSpans && line.markedSpans;
@@ -5010,6 +5168,10 @@
     }
   }
 
+  // A visual line is a line as drawn on the screen. Folding, for
+  // example, can cause multiple logical lines to appear on the same
+  // visual line. This finds the start of the visual line that the
+  // given line is part of (usually that is the line itself).
   function visualLine(line) {
     var merged;
     while (merged = collapsedSpanAtStart(line))
@@ -5017,6 +5179,8 @@
     return line;
   }
 
+  // Returns an array of logical lines that continue the visual line
+  // started by the argument, or undefined if there are no such lines.
   function visualLineContinued(line) {
     var merged, lines;
     while (merged = collapsedSpanAtEnd(line)) {
@@ -5026,11 +5190,15 @@
     return lines;
   }
 
+  // Get the line number of the start of the visual line that the
+  // given line number is part of.
   function visualLineNo(doc, lineN) {
     var line = getLine(doc, lineN), vis = visualLine(line);
     if (line == vis) return lineN;
     return lineNo(vis);
   }
+  // Get the line number of the start of the next visual line after
+  // the given line.
   function visualLineEndNo(doc, lineN) {
     if (lineN > doc.lastLine()) return lineN;
     var line = getLine(doc, lineN), merged;
@@ -5040,13 +5208,16 @@
     return lineNo(line) + 1;
   }
 
+  // Compute whether a line is hidden. Lines count as hidden when they
+  // are part of a visual line that starts with another line, or when
+  // they are entirely covered by collapsed, non-widget span.
   function lineIsHidden(doc, line) {
     var sps = sawCollapsedSpans && line.markedSpans;
     if (sps) for (var sp, i = 0; i < sps.length; ++i) {
       sp = sps[i];
       if (!sp.marker.collapsed) continue;
       if (sp.from == null) return true;
-      if (sp.marker.replacedWith) continue;
+      if (sp.marker.widgetNode) continue;
       if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
         return true;
     }
@@ -5060,30 +5231,17 @@
       return true;
     for (var sp, i = 0; i < line.markedSpans.length; ++i) {
       sp = line.markedSpans[i];
-      if (sp.marker.collapsed && !sp.marker.replacedWith && sp.from == span.to &&
+      if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
           (sp.to == null || sp.to != span.from) &&
           (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
           lineIsHiddenInner(doc, line, sp)) return true;
     }
   }
 
-  function detachMarkedSpans(line) {
-    var spans = line.markedSpans;
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.detachLine(line);
-    line.markedSpans = null;
-  }
-
-  function attachMarkedSpans(line, spans) {
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.attachLine(line);
-    line.markedSpans = spans;
-  }
-
   // LINE WIDGETS
 
+  // Line widgets are block elements displayed above or below a line.
+
   var LineWidget = CodeMirror.LineWidget = function(cm, node, options) {
     if (options) for (var opt in options) if (options.hasOwnProperty(opt))
       this[opt] = options[opt];
@@ -5091,33 +5249,26 @@
     this.node = node;
   };
   eventMixin(LineWidget);
-  function widgetMethodOp(f) {
-    return function() {
-      if (this.cm.curOp) return f.apply(this, arguments);
-      startOperation(this.cm);
-      try { return f.apply(this, arguments); }
-      finally { endOperation(this.cm); }
-    };
-  }
-  LineWidget.prototype.clear = widgetMethodOp(function() {
-    var ws = this.line.widgets, no = lineNo(this.line);
+
+  LineWidget.prototype.clear = function() {
+    var cm = this.cm, ws = this.line.widgets, no = lineNo(this.line);
     if (no == null || !ws) return;
     for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
     if (!ws.length) this.line.widgets = null;
-    var aboveVisible = heightAtLine(this.line) < this.cm.doc.scrollTop;
+    var aboveVisible = heightAtLine(this.line) < cm.doc.scrollTop;
     updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));
-    if (aboveVisible) addToScrollPos(this.cm, null, -this.height);
-    regLineChange(this.cm, no, "widget");
-  });
-  LineWidget.prototype.changed = widgetMethodOp(function() {
-    var oldH = this.height;
+    if (aboveVisible) addToScrollPos(cm, null, -this.height);
+    runInOp(cm, function() { regLineChange(cm, no, "widget"); });
+  };
+  LineWidget.prototype.changed = function() {
+    var oldH = this.height, cm = this.cm;
     this.height = null;
     var diff = widgetHeight(this) - oldH;
     if (!diff) return;
     updateLineHeight(this.line, this.line.height + diff);
     var no = lineNo(this.line);
-    regLineChange(this.cm, no, "widget");
-  });
+    runInOp(cm, function() { regLineChange(cm, no, "widget"); });
+  };
 
   function widgetHeight(widget) {
     if (widget.height != null) return widget.height;
@@ -5156,6 +5307,9 @@
   eventMixin(Line);
   Line.prototype.lineNo = function() { return lineNo(this); };
 
+  // Change the content (text, markers) of a line. Automatically
+  // invalidates cached information and tries to re-estimate the
+  // line's height.
   function updateLine(line, text, markedSpans, estimateHeight) {
     line.text = text;
     if (line.stateAfter) line.stateAfter = null;
@@ -5167,14 +5321,13 @@
     if (estHeight != line.height) updateLineHeight(line, estHeight);
   }
 
+  // Detach a line from the document tree and its markers.
   function cleanUpLine(line) {
     line.parent = null;
     detachMarkedSpans(line);
   }
 
-  // Run the given mode's parser over a line, update the styles
-  // array, which contains alternating fragments of text and CSS
-  // classes.
+  // Run the given mode's parser over a line, calling f for each token.
   function runMode(cm, text, mode, state, f, forceToEnd) {
     var flattenSpans = mode.flattenSpans;
     if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
@@ -5208,6 +5361,10 @@
     }
   }
 
+  // Compute a style array (an array starting with a mode generation
+  // -- for invalidation -- followed by pairs of end positions and
+  // style strings), which is used to highlight the tokens on the
+  // line.
   function highlightLine(cm, line, state, forceToEnd) {
     // A styles array always starts with a number identifying the
     // mode/overlays that it is based on (for easy invalidation).
@@ -5253,7 +5410,8 @@
   }
 
   // Lightweight form of highlight -- proceed over this line and
-  // update state, but don't save a style array.
+  // update state, but don't save a style array. Used for lines that
+  // aren't currently visible.
   function processLine(cm, text, state, startAt) {
     var mode = cm.doc.mode;
     var stream = new StringStream(text, cm.options.tabSize);
@@ -5265,6 +5423,9 @@
     }
   }
 
+  // Convert a style as returned by a mode (either null, or a string
+  // containing one or more styles) to a CSS style. This is cached,
+  // and also looks for line-wide styles.
   var styleToClassCache = {}, styleToClassCacheWithMode = {};
   function interpretTokenStyle(style, builder) {
     if (!style) return null;
@@ -5284,6 +5445,11 @@
       (cache[style] = style.replace(/\S+/g, "cm-$&"));
   }
 
+  // Render the DOM representation of the text of a line. Also builds
+  // up a 'line map', which points at the DOM nodes that represent
+  // specific stretches of text, and is used by the measuring code.
+  // The returned object contains the DOM node, this map, and
+  // information about line-wide styles that were set by the mode.
   function buildLineContent(cm, lineView) {
     // The padding-right forces the element to have a 'border', which
     // is needed on Webkit to be able to get line-level bounding
@@ -5292,10 +5458,13 @@
     var builder = {pre: elt("pre", [content]), content: content, col: 0, pos: 0, cm: cm};
     lineView.measure = {};
 
+    // Iterate over the logical lines that make up this visual line.
     for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
       var line = i ? lineView.rest[i - 1] : lineView.line, order;
       builder.pos = 0;
       builder.addToken = buildToken;
+      // Optionally wire in some hacks into the token-rendering
+      // algorithm, to deal with browser quirks.
       if ((ie || webkit) && cm.getOption("lineWrapping"))
         builder.addToken = buildTokenSplitSpaces(builder.addToken);
       if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
@@ -5303,9 +5472,11 @@
       builder.map = [];
       insertLineContent(line, builder, getLineStyles(cm, line));
 
+      // Ensure at least a single node is present, for measuring.
       if (builder.map.length == 0)
         builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
 
+      // Store the map and a cache object for the current logical line
       if (i == 0) {
         lineView.measure.map = builder.map;
         lineView.measure.cache = {};
@@ -5315,12 +5486,6 @@
       }
     }
 
-    if (!builder.content.firstChild)
-      builder.content.appendChild(document.createTextNode("\u00a0"));
-
-    var textClass = builder.textClass ? builder.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
-    if (textClass) builder.pre.className = textClass;
-
     signal(cm, "renderLine", cm, lineView.line, builder.pre);
     return builder;
   }
@@ -5331,6 +5496,8 @@
     return token;
   }
 
+  // Build up the DOM representation for a single token, and add it to
+  // the line map. Takes care to render special characters separately.
   function buildToken(builder, text, style, startStyle, endStyle, title) {
     if (!text) return;
     var special = builder.cm.options.specialChars, mustWrap = false;
@@ -5393,6 +5560,8 @@
     };
   }
 
+  // Work around nonsense dimensions being reported for stretches of
+  // right-to-left text.
   function buildTokenBadBidi(inner, order) {
     return function(builder, text, style, startStyle, endStyle, title) {
       style = style ? style + " cm-force-border" : "cm-force-border";
@@ -5413,7 +5582,7 @@
   }
 
   function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
-    var widget = !ignoreWidget && marker.replacedWith;
+    var widget = !ignoreWidget && marker.widgetNode;
     if (widget) {
       builder.map.push(builder.pos, builder.pos + size, widget);
       builder.content.appendChild(widget);
@@ -5451,7 +5620,7 @@
           } else if (sp.from > pos && nextChange > sp.from) {
             nextChange = sp.from;
           }
-          if (m.type == "bookmark" && sp.from == pos && m.replacedWith) foundBookmarks.push(m);
+          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) foundBookmarks.push(m);
         }
         if (collapsed && (collapsed.from || 0) == pos) {
           buildCollapsedSpan(builder, (collapsed.to == null ? len : collapsed.to) - pos,
@@ -5484,12 +5653,16 @@
 
   // DOCUMENT DATA STRUCTURE
 
+  // By default, updates that start and end at the beginning of a line
+  // are treated specially, in order to make the association of line
+  // widgets and marker elements with the text behave more intuitive.
   function isWholeLineUpdate(doc, change) {
     return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
       (!doc.cm || doc.cm.options.wholeLineUpdateBefore);
   }
 
-  function updateDoc(doc, change, markedSpans, selAfter, estimateHeight) {
+  // Perform a change on the document data structure.
+  function updateDoc(doc, change, markedSpans, estimateHeight) {
     function spansFor(n) {return markedSpans ? markedSpans[n] : null;}
     function update(line, text, spans) {
       updateLine(line, text, spans, estimateHeight);
@@ -5500,11 +5673,11 @@
     var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
     var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
 
-    // First adjust the line structure
+    // Adjust the line structure
     if (isWholeLineUpdate(doc, change)) {
       // This is a whole-line replace. Treated specially to make
       // sure line objects move the way they are supposed to.
-      for (var i = 0, e = text.length - 1, added = []; i < e; ++i)
+      for (var i = 0, added = []; i < text.length - 1; ++i)
         added.push(new Line(text[i], spansFor(i), estimateHeight));
       update(lastLine, lastLine.text, lastSpans);
       if (nlines) doc.remove(from.line, nlines);
@@ -5513,7 +5686,7 @@
       if (text.length == 1) {
         update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
       } else {
-        for (var added = [], i = 1, e = text.length - 1; i < e; ++i)
+        for (var added = [], i = 1; i < text.length - 1; ++i)
           added.push(new Line(text[i], spansFor(i), estimateHeight));
         added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
         update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
@@ -5525,20 +5698,32 @@
     } else {
       update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
       update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
-      for (var i = 1, e = text.length - 1, added = []; i < e; ++i)
+      for (var i = 1, added = []; i < text.length - 1; ++i)
         added.push(new Line(text[i], spansFor(i), estimateHeight));
       if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
       doc.insert(from.line + 1, added);
     }
 
     signalLater(doc, "change", doc, change);
-    setSelection(doc, selAfter, false);
   }
 
+  // The document is represented as a BTree consisting of leaves, with
+  // chunk of lines in them, and branches, with up to ten leaves or
+  // other branch nodes below them. The top node is always a branch
+  // node, and is the document object itself (meaning it has
+  // additional methods and properties).
+  //
+  // All nodes have parent links. The tree is used both to go from
+  // line numbers to line objects, and to go from objects to numbers.
+  // It also indexes by height, and is used to convert between height
+  // and line object, and to find the total height of the document.
+  //
+  // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
+
   function LeafChunk(lines) {
     this.lines = lines;
     this.parent = null;
-    for (var i = 0, e = lines.length, height = 0; i < e; ++i) {
+    for (var i = 0, height = 0; i < lines.length; ++i) {
       lines[i].parent = this;
       height += lines[i].height;
     }
@@ -5547,6 +5732,7 @@
 
   LeafChunk.prototype = {
     chunkSize: function() { return this.lines.length; },
+    // Remove the n lines at offset 'at'.
     removeInner: function(at, n) {
       for (var i = at, e = at + n; i < e; ++i) {
         var line = this.lines[i];
@@ -5556,14 +5742,18 @@
       }
       this.lines.splice(at, n);
     },
+    // Helper used to collapse a small branch into a single leaf.
     collapse: function(lines) {
-      lines.splice.apply(lines, [lines.length, 0].concat(this.lines));
+      lines.push.apply(lines, this.lines);
     },
+    // Insert the given array of lines at offset 'at', count them as
+    // having the given height.
     insertInner: function(at, lines, height) {
       this.height += height;
       this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
-      for (var i = 0, e = lines.length; i < e; ++i) lines[i].parent = this;
+      for (var i = 0; i < lines.length; ++i) lines[i].parent = this;
     },
+    // Used to iterate over a part of the tree.
     iterN: function(at, n, op) {
       for (var e = at + n; at < e; ++at)
         if (op(this.lines[at])) return true;
@@ -5573,7 +5763,7 @@
   function BranchChunk(children) {
     this.children = children;
     var size = 0, height = 0;
-    for (var i = 0, e = children.length; i < e; ++i) {
+    for (var i = 0; i < children.length; ++i) {
       var ch = children[i];
       size += ch.chunkSize(); height += ch.height;
       ch.parent = this;
@@ -5598,7 +5788,10 @@
           at = 0;
         } else at -= sz;
       }
-      if (this.size - n < 25) {
+      // If the result is smaller than 25 lines, ensure that it is a
+      // single leaf node.
+      if (this.size - n < 25 &&
+          (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
         var lines = [];
         this.collapse(lines);
         this.children = [new LeafChunk(lines)];
@@ -5606,12 +5799,12 @@
       }
     },
     collapse: function(lines) {
-      for (var i = 0, e = this.children.length; i < e; ++i) this.children[i].collapse(lines);
+      for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines);
     },
     insertInner: function(at, lines, height) {
       this.size += lines.length;
       this.height += height;
-      for (var i = 0, e = this.children.length; i < e; ++i) {
+      for (var i = 0; i < this.children.length; ++i) {
         var child = this.children[i], sz = child.chunkSize();
         if (at <= sz) {
           child.insertInner(at, lines, height);
@@ -5630,6 +5823,7 @@
         at -= sz;
       }
     },
+    // When a node has grown, check whether it should be split.
     maybeSpill: function() {
       if (this.children.length <= 10) return;
       var me = this;
@@ -5652,7 +5846,7 @@
       me.parent.maybeSpill();
     },
     iterN: function(at, n, op) {
-      for (var i = 0, e = this.children.length; i < e; ++i) {
+      for (var i = 0; i < this.children.length; ++i) {
         var child = this.children[i], sz = child.chunkSize();
         if (at < sz) {
           var used = Math.min(n, sz - at);
@@ -5682,23 +5876,32 @@
     this.modeOption = mode;
 
     if (typeof text == "string") text = splitLines(text);
-    updateDoc(this, {from: start, to: start, text: text}, null, simpleSelection(start));
+    updateDoc(this, {from: start, to: start, text: text});
+    setSelection(this, simpleSelection(start), false);
   };
 
   Doc.prototype = createObj(BranchChunk.prototype, {
     constructor: Doc,
+    // Iterate over the document. Supports two forms -- with only one
+    // argument, it calls that for each line in the document. With
+    // three, it iterates over the range given by the first two (with
+    // the second being non-inclusive).
     iter: function(from, to, op) {
       if (op) this.iterN(from - this.first, to - from, op);
       else this.iterN(this.first, this.first + this.size, from);
     },
 
+    // Non-public interface for adding and removing lines.
     insert: function(at, lines) {
       var height = 0;
-      for (var i = 0, e = lines.length; i < e; ++i) height += lines[i].height;
+      for (var i = 0; i < lines.length; ++i) height += lines[i].height;
       this.insertInner(at - this.first, lines, height);
     },
     remove: function(at, n) { this.removeInner(at - this.first, n); },
 
+    // From here, the methods are part of the public interface. Most
+    // are also available from CodeMirror (editor) instances.
+
     getValue: function(lineSep) {
       var lines = getLines(this, this.first, this.first + this.size);
       if (lineSep === false) return lines;
@@ -5964,9 +6167,10 @@
     getEditor: function() {return this.cm;}
   });
 
+  // Public alias.
   Doc.prototype.eachLine = Doc.prototype.iter;
 
-  // The Doc methods that should be available on CodeMirror instances
+  // Set up methods on CodeMirror's prototype to redirect to the editor's document.
   var dontDelegate = "iter insert remove copy getEditor".split(" ");
   for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
     CodeMirror.prototype[prop] = (function(method) {
@@ -5975,6 +6179,7 @@
 
   eventMixin(Doc);
 
+  // Call f for all linked documents.
   function linkedDocs(doc, f, sharedHistOnly) {
     function propagate(doc, skip, sharedHist) {
       if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
@@ -5989,6 +6194,7 @@
     propagate(doc, null, true);
   }
 
+  // Attach a document to an editor.
   function attachDoc(cm, doc) {
     if (doc.cm) throw new Error("This document is already in use.");
     cm.doc = doc;
@@ -6002,9 +6208,11 @@
 
   // LINE UTILITIES
 
-  function getLine(chunk, n) {
-    n -= chunk.first;
-    while (!chunk.lines) {
+  // Find the line object corresponding to the given line number.
+  function getLine(doc, n) {
+    n -= doc.first;
+    if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.");
+    for (var chunk = doc; !chunk.lines;) {
       for (var i = 0;; ++i) {
         var child = chunk.children[i], sz = child.chunkSize();
         if (n < sz) { chunk = child; break; }
@@ -6014,6 +6222,8 @@
     return chunk.lines[n];
   }
 
+  // Get the part of a document between two positions, as an array of
+  // strings.
   function getBetween(doc, start, end) {
     var out = [], n = start.line;
     doc.iter(start.line, end.line + 1, function(line) {
@@ -6025,17 +6235,22 @@
     });
     return out;
   }
+  // Get the lines between from and to, as array of strings.
   function getLines(doc, from, to) {
     var out = [];
     doc.iter(from, to, function(line) { out.push(line.text); });
     return out;
   }
 
+  // Update the height of a line, propagating the height change
+  // upwards to parent nodes.
   function updateLineHeight(line, height) {
     var diff = height - line.height;
     if (diff) for (var n = line; n; n = n.parent) n.height += diff;
   }
 
+  // Given a line object, find its line number by walking up through
+  // its parent links.
   function lineNo(line) {
     if (line.parent == null) return null;
     var cur = line.parent, no = indexOf(cur.lines, line);
@@ -6048,10 +6263,12 @@
     return no + cur.first;
   }
 
+  // Find the line at the given vertical position, using the height
+  // information in the document tree.
   function lineAtHeight(chunk, h) {
     var n = chunk.first;
     outer: do {
-      for (var i = 0, e = chunk.children.length; i < e; ++i) {
+      for (var i = 0; i < chunk.children.length; ++i) {
         var child = chunk.children[i], ch = child.height;
         if (h < ch) { chunk = child; continue outer; }
         h -= ch;
@@ -6059,7 +6276,7 @@
       }
       return n;
     } while (!chunk.lines);
-    for (var i = 0, e = chunk.lines.length; i < e; ++i) {
+    for (var i = 0; i < chunk.lines.length; ++i) {
       var line = chunk.lines[i], lh = line.height;
       if (h < lh) break;
       h -= lh;
@@ -6068,6 +6285,7 @@
   }
 
 
+  // Find the height above the given line.
   function heightAtLine(lineObj) {
     lineObj = visualLine(lineObj);
 
@@ -6087,6 +6305,9 @@
     return h;
   }
 
+  // Get the bidi ordering for the given line (and cache it). Returns
+  // false for lines that are fully left-to-right, and an array of
+  // BidiSpan objects otherwise.
   function getOrder(line) {
     var order = line.order;
     if (order == null) order = line.order = bidiOrdering(line.text);
@@ -6096,9 +6317,9 @@
   // HISTORY
 
   function History(startGen, doc) {
-    // Arrays of history events. Doing something adds an event to
-    // done and clears undo. Undoing moves events from done to
-    // undone, redoing moves them in the other direction.
+    // Arrays of change events and selections. Doing something adds an
+    // event to done and clears undo. Undoing moves events from done
+    // to undone, redoing moves them in the other direction.
     this.done = []; this.undone = [];
     this.undoDepth = Infinity;
     // Used to track when changes can be merged into a single undo
@@ -6106,30 +6327,29 @@
     this.lastModTime = this.pendingSelTime = 0;
     this.lastOp = null;
     this.lastOrigin = null;
+    // Selection changes are first set as pending, and merged with
+    // subsequent similar selections (when close enough in time -- see
+    // pendingSelTime). When a 'different' selection appears, they are
+    // pushed onto the done array.
     this.pendingSelection = doc.sel;
     // Used by the isClean() method
     this.generation = this.maxGeneration = startGen || 1;
-    // Used to enforce that a selection-drag only adds one selection to the history
+    // Used to enforce that a selection-drag only adds one selection
+    // to the history
     this.atomicSelection = false;
   }
 
-  function attachLocalSpans(doc, change, from, to) {
-    var existing = change["spans_" + doc.id], n = 0;
-    doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
-      if (line.markedSpans)
-        (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans;
-      ++n;
-    });
-  }
-
+  // Create a history change event from an updateDoc-style change
+  // object.
   function historyChangeFromChange(doc, change) {
-    var from = { line: change.from.line, ch: change.from.ch };
-    var histChange = {from: from, to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
+    var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
     attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
     linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
     return histChange;
   }
 
+  // Find the top change event in the history. Pop off selection
+  // events that are in the way.
   function lastChangeEvent(hist) {
     for (;;) {
       var last = lst(hist.done);
@@ -6138,6 +6358,9 @@
     }
   }
 
+  // Register a change in the history. Merges changes that are within
+  // a single operation, ore are close together with an origin that
+  // allows merging (starting with "+") into a single event.
   function addChangeToHistory(doc, change, selAfter, opId) {
     var hist = doc.history;
     hist.undone.length = 0;
@@ -6160,10 +6383,10 @@
         cur.changes.push(historyChangeFromChange(doc, change));
       }
     } else {
+      // Can not be merged, start a new event.
       var before = lst(hist.done);
       if (!before || !before.ranges)
         pushSelectionToHistory(doc.sel, hist.done);
-      // Can not be merged, start a new event.
       cur = {changes: [historyChangeFromChange(doc, change)],
              generation: hist.generation};
       hist.done.push(cur);
@@ -6181,6 +6404,10 @@
     if (!last) signal(doc, "historyAdded");
   }
 
+  // Called whenever the selection changes, sets the new selection as
+  // the pending selection in the history, and pushes the old pending
+  // selection into the 'done' array when it was significantly
+  // different (in number of selected ranges, emptiness, or time).
   function addSelectionToHistory(doc, sel, opId) {
     var hist = doc.history, pend = hist.pendingSelection, now = +new Date;
 
@@ -6208,6 +6435,18 @@
     }
   }
 
+  // Used to store marked span information in the history.
+  function attachLocalSpans(doc, change, from, to) {
+    var existing = change["spans_" + doc.id], n = 0;
+    doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
+      if (line.markedSpans)
+        (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans;
+      ++n;
+    });
+  }
+
+  // When un/re-doing restores text containing marked spans, those
+  // that have been explicitly cleared should not be restored.
   function removeClearedSpans(spans) {
     if (!spans) return null;
     for (var i = 0, out; i < spans.length; ++i) {
@@ -6217,6 +6456,7 @@
     return !out ? spans : out.length ? out : null;
   }
 
+  // Retrieve and filter the old marked spans stored in a change event.
   function getOldSpans(doc, change) {
     var found = change["spans_" + doc.id];
     if (!found) return null;
@@ -6225,20 +6465,13 @@
     return nw;
   }
 
-  function copyHistorySel(sel, instantiate) {
-    if (!instantiate) return sel;
-    for (var out = [], i = 0; i < sel.ranges.length; i++)
-      out[i] = new Range(sel.ranges[i].anchor, sel.ranges[i].head);
-    return new Selection(out, sel.primIndex);
-  }
-
   // Used both to provide a JSON-safe object in .getHistory, and, when
   // detaching a document, to split the history in two
   function copyHistoryArray(events, newGroup, instantiateSel) {
     for (var i = 0, copy = []; i < events.length; ++i) {
       var event = events[i];
       if (event.ranges) {
-        copy.push(copyHistorySel(event, instantiateSel));
+        copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
         continue;
       }
       var changes = event.changes, newChanges = [];
@@ -6309,7 +6542,10 @@
     rebaseHistArray(hist.undone, from, to, diff);
   }
 
-  // EVENT OPERATORS
+  // EVENT UTILITIES
+
+  // Due to the fact that we still support jurassic IE versions, some
+  // compatibility wrappers are needed.
 
   var e_preventDefault = CodeMirror.e_preventDefault = function(e) {
     if (e.preventDefault) e.preventDefault();
@@ -6338,6 +6574,9 @@
 
   // EVENT HANDLING
 
+  // Lightweight event framework. on/off also work on DOM nodes,
+  // registering native DOM handlers.
+
   var on = CodeMirror.on = function(emitter, type, f) {
     if (emitter.addEventListener)
       emitter.addEventListener(type, f, false);
@@ -6370,6 +6609,13 @@
     for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
   };
 
+  // Often, we want to signal events at a point where we are in the
+  // middle of some work, but don't want the handler to start calling
+  // other methods on the editor, which might be in an inconsistent
+  // state or simply not expect any other events to happen.
+  // signalLater looks whether there are any handlers, and schedules
+  // them to be executed when the last operation ends, or, if no
+  // operation is active, when a timeout fires.
   var delayedCallbacks, delayedCallbackDepth = 0;
   function signalLater(emitter, type /*, values...*/) {
     var arr = emitter._handlers && emitter._handlers[type];
@@ -6385,11 +6631,6 @@
       delayedCallbacks.push(bnd(arr[i]));
   }
 
-  function signalDOMEvent(cm, e, override) {
-    signal(cm, override || e.type, cm, e);
-    return e_defaultPrevented(e) || e.codemirrorIgnore;
-  }
-
   function fireDelayed() {
     --delayedCallbackDepth;
     var delayed = delayedCallbacks;
@@ -6397,11 +6638,21 @@
     for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }
 
+  // The DOM events that CodeMirror handles can be overridden by
+  // registering a (non-DOM) handler on the editor for the event name,
+  // and preventDefault-ing the event in that handler.
+  function signalDOMEvent(cm, e, override) {
+    signal(cm, override || e.type, cm, e);
+    return e_defaultPrevented(e) || e.codemirrorIgnore;
+  }
+
   function hasHandler(emitter, type) {
     var arr = emitter._handlers && emitter._handlers[type];
     return arr && arr.length > 0;
   }
 
+  // Add on and off methods to a constructor's prototype, to make
+  // registering events on such objects more convenient.
   function eventMixin(ctor) {
     ctor.prototype.on = function(type, f) {on(this, type, f);};
     ctor.prototype.off = function(type, f) {off(this, type, f);};
@@ -6417,7 +6668,10 @@
   var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
 
   function Delayed() {this.id = null;}
-  Delayed.prototype = {set: function(ms, f) {clearTimeout(this.id); this.id = setTimeout(f, ms);}};
+  Delayed.prototype.set = function(ms, f) {
+    clearTimeout(this.id);
+    this.id = setTimeout(f, ms);
+  };
 
   // Counts the column offset in a string, taking tabs into account.
   // Used mostly to find indentation.
@@ -6435,6 +6689,9 @@
       i = nextTab + 1;
     }
   };
+
+  // The inverse of countColumn -- find the offset that corresponds to
+  // a particular column.
   function findColumn(string, goal, tabSize) {
     for (var pos = 0, col = 0;;) {
       var nextTab = string.indexOf("\t", pos);
@@ -6458,36 +6715,37 @@
 
   function lst(arr) { return arr[arr.length-1]; }
 
-  function selectInput(node) {
-    if (ios) { // Mobile Safari apparently has a bug where select() is broken.
-      node.selectionStart = 0;
-      node.selectionEnd = node.value.length;
-    } else {
-      // Suppress mysterious IE10 errors
-      try { node.select(); }
-      catch(_e) {}
-    }
-  }
+  var selectInput = function(node) { node.select(); };
+  if (ios) // Mobile Safari apparently has a bug where select() is broken.
+    selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; };
+  else if (ie) // Suppress mysterious IE10 errors
+    selectInput = function(node) { try { node.select(); } catch(_e) {} };
 
-  function indexOf(collection, elt) {
-    if (collection.indexOf) return collection.indexOf(elt);
-    for (var i = 0, e = collection.length; i < e; ++i)
-      if (collection[i] == elt) return i;
+  function indexOf(array, elt) {
+    for (var i = 0; i < array.length; ++i)
+      if (array[i] == elt) return i;
     return -1;
   }
+  if ([].indexOf) indexOf = function(array, elt) { return array.indexOf(elt); };
   function map(array, f) {
     var out = [];
     for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
     return out;
   }
+  if ([].map) map = function(array, f) { return array.map(f); };
 
   function createObj(base, props) {
-    function Obj() {}
-    Obj.prototype = base;
-    var inst = new Obj();
+    var inst;
+    if (Object.create) {
+      inst = Object.create(base);
+    } else {
+      var ctor = function() {};
+      ctor.prototype = base;
+      inst = new ctor();
+    }
     if (props) copyObj(props, inst);
     return inst;
-  }
+  };
 
   function copyObj(obj, target) {
     if (!target) target = {};
@@ -6511,6 +6769,11 @@
     return true;
   }
 
+  // Extending unicode characters. A series of a non-extending char +
+  // any number of extending chars is treated as a single unit as far
+  // as editing and measuring is concerned. This is not fully correct,
+  // since some scripts/fonts/browsers also treat other configurations
+  // of code points as a group.
   var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
   function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); }
 
@@ -6637,10 +6900,10 @@
     var e = elt("div");
     if ("oncopy" in e) return true;
     e.setAttribute("oncopy", "return;");
-    return typeof e.oncopy == 'function';
+    return typeof e.oncopy == "function";
   })();
 
-  // KEY NAMING
+  // KEY NAMES
 
   var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
                   19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
@@ -6737,12 +7000,11 @@
     return pos;
   }
 
-  // This is somewhat involved. It is needed in order to move
-  // 'visually' through bi-directional text -- i.e., pressing left
-  // should make the cursor go left, even when in RTL text. The
-  // tricky part is the 'jumps', where RTL and LTR text touch each
-  // other. This often requires the cursor offset to move more than
-  // one unit, in order to visually move one unit.
+  // This is needed in order to move 'visually' through bi-directional
+  // text -- i.e., pressing left should make the cursor go left, even
+  // when in RTL text. The tricky part is the 'jumps', where RTL and
+  // LTR text touch each other. This often requires the cursor offset
+  // to move more than one unit, in order to visually move one unit.
   function moveVisually(line, start, dir, byUnit) {
     var bidi = getOrder(line);
     if (!bidi) return moveLogically(line, start, dir, byUnit);
@@ -6815,6 +7077,11 @@
     // Browsers seem to always treat the boundaries of block elements as being L.
     var outerType = "L";
 
+    function BidiSpan(level, from, to) {
+      this.level = level;
+      this.from = from; this.to = to;
+    }
+
     return function(str) {
       if (!bidiRE.test(str)) return false;
       var len = str.length, types = [];
@@ -6904,32 +7171,32 @@
         if (countsAsLeft.test(types[i])) {
           var start = i;
           for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
-          order.push({from: start, to: i, level: 0});
+          order.push(new BidiSpan(0, start, i));
         } else {
           var pos = i, at = order.length;
           for (++i; i < len && types[i] != "L"; ++i) {}
           for (var j = pos; j < i;) {
             if (countsAsNum.test(types[j])) {
-              if (pos < j) order.splice(at, 0, {from: pos, to: j, level: 1});
+              if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j));
               var nstart = j;
               for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
-              order.splice(at, 0, {from: nstart, to: j, level: 2});
+              order.splice(at, 0, new BidiSpan(2, nstart, j));
               pos = j;
             } else ++j;
           }
-          if (pos < i) order.splice(at, 0, {from: pos, to: i, level: 1});
+          if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i));
         }
       }
       if (order[0].level == 1 && (m = str.match(/^\s+/))) {
         order[0].from = m[0].length;
-        order.unshift({from: 0, to: m[0].length, level: 0});
+        order.unshift(new BidiSpan(0, 0, m[0].length));
       }
       if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
         lst(order).to -= m[0].length;
-        order.push({from: len - m[0].length, to: len, level: 0});
+        order.push(new BidiSpan(0, len - m[0].length, len));
       }
       if (order[0].level != lst(order).level)
-        order.push({from: len, to: len, level: order[0].level});
+        order.push(new BidiSpan(order[0].level, len, len));
 
       return order;
     };

From c8ecc9aafc57261cd727a92d610398e9bcb23884 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Feb 2014 18:41:09 +0100
Subject: [PATCH 0951/4742] Work around unexpected rectangles from
 getClientRects in bidi text in FF

Closes #2248
---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c7eea2d9cb..4caa5a0cf0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1423,8 +1423,11 @@
       if (wrapping) {
         lineView.measure.width = curWidth;
         var rects = lineView.text.firstChild.getClientRects();
-        for (var i = 0; i < rects.length - 1; i++)
-          heights.push((rects[i].bottom + rects[i + 1].top) / 2 - rect.top);
+        for (var i = 0; i < rects.length - 1; i++) {
+          var cur = rects[i], next = rects[i + 1];
+          if (Math.abs(cur.bottom - next.bottom) > 2)
+            heights.push((cur.bottom + next.top) / 2 - rect.top);
+        }
       }
       heights.push(rect.bottom - rect.top);
     }

From 2a1e042ded94e90c64d81617312a61a04e55aa3c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Feb 2014 22:23:37 +0100
Subject: [PATCH 0952/4742] Fix selection being drawn over cursor

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4caa5a0cf0..f50a803f2d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -146,7 +146,7 @@
     // Will contain the actual code, positioned to cover the viewport.
     d.lineDiv = elt("div", null, "CodeMirror-code");
     // Elements are added to these to represent selection and cursors.
-    d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
+    d.selectionDiv = elt("div", null, null, "z-index: 1");
     d.cursorDiv = elt("div", null, "CodeMirror-cursors");
     // A visibility: hidden element used to find the size of things.
     d.measure = elt("div", null, "CodeMirror-measure");

From 58dfe3bdc7da8d4c76791aab0f2fc41918f6dfe6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Feb 2014 22:40:03 +0100
Subject: [PATCH 0953/4742] Fix problem in resize handler

Issue #2233
---
 lib/codemirror.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f50a803f2d..be90652bbe 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -400,8 +400,8 @@
     d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
     d.gutters.style.height = Math.max(totalHeight, measure.clientHeight - scrollerCutOff) + "px";
     var scrollHeight = Math.max(totalHeight, measure.scrollHeight);
-    var needsH = measure.scrollWidth > (measure.clientWidth + 1);
-    var needsV = scrollHeight > (measure.clientHeight + 1);
+    var needsH = measure.scrollWidth > measure.clientWidth;
+    var needsV = scrollHeight > measure.clientHeight;
     if (needsV) {
       d.scrollbarV.style.display = "block";
       d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";
@@ -2298,8 +2298,7 @@
         resizeTimer = null;
         // Might be a text scaling operation, clear size caches.
         d.cachedCharWidth = d.cachedTextHeight = knownScrollbarWidth = null;
-        clearCaches(cm);
-        runInOp(cm, bind(regChange, cm));
+        cm.setSize();
       }, 100);
     }
     on(window, "resize", onResize);

From d492a304c2b2fddbff0d807430cf53eb8a6acab9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Feb 2014 22:57:12 +0100
Subject: [PATCH 0954/4742] Fix confusion in measuring code

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index be90652bbe..bbf3965376 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5625,7 +5625,7 @@
           if (m.type == "bookmark" && sp.from == pos && m.widgetNode) foundBookmarks.push(m);
         }
         if (collapsed && (collapsed.from || 0) == pos) {
-          buildCollapsedSpan(builder, (collapsed.to == null ? len : collapsed.to) - pos,
+          buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
                              collapsed.marker, collapsed.from == null);
           if (collapsed.to == null) return;
         }

From c264a212ece5099de1802d37d96389da51190de9 Mon Sep 17 00:00:00 2001
From: Maksym Taran <mtaran@google.com>
Date: Mon, 27 Jan 2014 18:52:42 -0800
Subject: [PATCH 0955/4742] [continuecomment addon] Made line comment
 continuation disableable.

---
 addon/comment/continuecomment.js | 15 +++++++++++++--
 doc/manual.html                  | 13 ++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 7f506c42cc..7d13f7514e 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -1,5 +1,7 @@
 (function() {
   var modes = ["clike", "css", "javascript"];
+  var continueLineComment = true;
+
   for (var i = 0; i < modes.length; ++i)
     CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
 
@@ -27,7 +29,7 @@
       }
       if (insert != null) insert += mode.blockCommentContinue;
     }
-    if (insert == null && mode.lineComment) {
+    if (insert == null && mode.lineComment && continueLineComment) {
       var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
       if (found > -1) {
         insert = line.slice(0, found);
@@ -46,8 +48,17 @@
     if (prev && prev != CodeMirror.Init)
       cm.removeKeyMap("continueComment");
     if (val) {
+      var key = "Enter";
+      if (typeof val == "string") {
+        key = val;
+      } else if (typeof val == "object") {
+        if (val.key)
+          key = val.key;
+        if (val.continueLineComment != undefined)
+          continueLineComment = val.continueLineComment
+      }
       var map = {name: "continueComment"};
-      map[typeof val == "string" ? val : "Enter"] = continueComment;
+      map[key] = continueComment;
       cm.addKeyMap(map);
     }
   });
diff --git a/doc/manual.html b/doc/manual.html
index 635088b6b1..4ff938a07e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2258,11 +2258,14 @@ <h2>Addons</h2>
       succeeded. See the <a href="../demo/loadmode.html">demo</a>.</dd>
 
       <dt id="addon_continuecomment"><a href="../addon/comment/continuecomment.js"><code>comment/continuecomment.js</code></a></dt>
-      <dd>Adds an <code>continueComments</code> option, which can be
-      set to true to have the editor prefix new lines inside C-like
-      block comments with an asterisk when Enter is pressed. It can
-      also be set to a string in order to bind this functionality to a
-      specific key..</dd>
+      <dd>Adds a <code>continueComments</code> option, which sets whether the
+      editor will make the next line continue a comment when you press Enter
+      inside a comment block. Can be set to a boolean to enable/disable this
+      functionality. Set to a string, it will continue comments using a custom
+      shortcut. Set to an object, it will use the <code>key</code> property for
+      a custom shortcut and the boolean <code>continueLineComment</code>
+      property to determine whether single-line comments should be continued
+      (defaulting to <code>true</code>).</dd>
 
       <dt id="addon_placeholder"><a href="../addon/display/placeholder.js"><code>display/placeholder.js</code></a></dt>
       <dd>Adds a <code>placeholder</code> option that can be used to

From 1850ef46f3632fb297cf109cfbc367c2e7c7f87f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Feb 2014 23:10:22 +0100
Subject: [PATCH 0956/4742] [continuecomment addon] Don't make the line-comment
 option global

Issue #2182
---
 addon/comment/continuecomment.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 7d13f7514e..c59cee1aa2 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -1,6 +1,5 @@
 (function() {
   var modes = ["clike", "css", "javascript"];
-  var continueLineComment = true;
 
   for (var i = 0; i < modes.length; ++i)
     CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
@@ -29,7 +28,7 @@
       }
       if (insert != null) insert += mode.blockCommentContinue;
     }
-    if (insert == null && mode.lineComment && continueLineComment) {
+    if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
       var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
       if (found > -1) {
         insert = line.slice(0, found);
@@ -44,19 +43,22 @@
       return CodeMirror.Pass;
   }
 
+  function continueLineCommentEnabled(cm) {
+    var opt = cm.getOption("continueComments");
+    if (opt && typeof opt == "object")
+      return opt.continueLineComment !== false;
+    return true;
+  }
+
   CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
     if (prev && prev != CodeMirror.Init)
       cm.removeKeyMap("continueComment");
     if (val) {
       var key = "Enter";
-      if (typeof val == "string") {
+      if (typeof val == "string")
         key = val;
-      } else if (typeof val == "object") {
-        if (val.key)
-          key = val.key;
-        if (val.continueLineComment != undefined)
-          continueLineComment = val.continueLineComment
-      }
+      else if (typeof val == "object" && val.key)
+        key = val.key;
       var map = {name: "continueComment"};
       map[key] = continueComment;
       cm.addKeyMap(map);

From b19b03ab9d42b8eb7b69ee130999e17ef612c283 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Feb 2014 23:17:30 +0100
Subject: [PATCH 0957/4742] [gas mode] Default to x86 when no parser config is
 given

Closes #2075
---
 mode/gas/gas.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index a6e6892908..0606b18e32 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -211,7 +211,7 @@ CodeMirror.defineMode("gas", function(_config, parserConfig) {
     });
   }
 
-  var arch = parserConfig.architecture.toLowerCase();
+  var arch = (parserConfig.architecture || "x86").toLowerCase();
   if (arch === "x86") {
     x86(parserConfig);
   } else if (arch === "arm" || arch === "armv6") {

From e1727acbd2f703811f1332efa5cbb5b619d4c4ef Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Feb 2014 08:46:41 +0100
Subject: [PATCH 0958/4742] Make selection position: relative again, same for
 cursor

Issue #2237
---
 lib/codemirror.css | 3 ++-
 lib/codemirror.js  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index fcc023b753..9e2d06c2c8 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -242,7 +242,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 div.CodeMirror-cursors {
   visibility: hidden;
-  z-index: 3;
+  position: relative;
+  z-index: 1;
 }
 .CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6ba250cc96..01e73e0b25 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -146,14 +146,14 @@
     // Will contain the actual code, positioned to cover the viewport.
     d.lineDiv = elt("div", null, "CodeMirror-code");
     // Elements are added to these to represent selection and cursors.
-    d.selectionDiv = elt("div", null, null, "z-index: 1");
+    d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
     d.cursorDiv = elt("div", null, "CodeMirror-cursors");
     // A visibility: hidden element used to find the size of things.
     d.measure = elt("div", null, "CodeMirror-measure");
     // When lines outside of the viewport are measured, they are drawn in this.
     d.lineMeasure = elt("div", null, "CodeMirror-measure");
     // Wraps everything that needs to exist inside the vertically-padded coordinate system
-    d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.lineDiv, d.cursorDiv],
+    d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
                       null, "position: relative; outline: none");
     // Moved around its parent to cover visible view.
     d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");

From a8498f1c1eece1b4e0cf6c39cb29f0c6934190ff Mon Sep 17 00:00:00 2001
From: Blaine G <bgilb@seas.upenn.edu>
Date: Thu, 13 Feb 2014 01:12:09 -0500
Subject: [PATCH 0959/4742] [ruby mode] Fixes /= operator for highlighting

relates to https://github.com/marijnh/CodeMirror/issues/314
---
 mode/ruby/ruby.js |  1 +
 mode/ruby/test.js | 11 +++++++++++
 test/index.html   |  1 +
 3 files changed, 13 insertions(+)
 create mode 100644 mode/ruby/test.js

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 8ee9eec707..4ef08b1552 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -44,6 +44,7 @@ CodeMirror.defineMode("ruby", function(config) {
     if (ch == "`" || ch == "'" || ch == '"') {
       return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
     } else if (ch == "/" && !stream.eol() && stream.peek() != " ") {
+      if (stream.eat("=")) return "operator";
       return chain(readQuoted(ch, "string-2", true), stream, state);
     } else if (ch == "%") {
       var style = "string", embed = true;
diff --git a/mode/ruby/test.js b/mode/ruby/test.js
new file mode 100644
index 0000000000..c97d106686
--- /dev/null
+++ b/mode/ruby/test.js
@@ -0,0 +1,11 @@
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "ruby");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("divide_equal_operator",
+     "[variable bar] [operator /=] [variable foo]");
+
+  MT("divide_equal_operator_no_spacing",
+     "[variable foo][operator /=][number 42]");
+
+})();
diff --git a/test/index.html b/test/index.html
index 152263e10d..5f1231e366 100644
--- a/test/index.html
+++ b/test/index.html
@@ -84,6 +84,7 @@ <h2>Test Suite</h2>
     <script src="../mode/xml/xml.js"></script>
     <script src="../mode/htmlmixed/htmlmixed.js"></script>
     <script src="../mode/ruby/ruby.js"></script>
+    <script src="../mode/ruby/test.js"></script>
     <script src="../mode/haml/haml.js"></script>
     <script src="../mode/haml/test.js"></script>
     <script src="../mode/markdown/markdown.js"></script>

From e6dc18a0f5297180e8a59cd0cf18afa36e9fea24 Mon Sep 17 00:00:00 2001
From: Blaine G <bgilb@seas.upenn.edu>
Date: Thu, 13 Feb 2014 01:12:09 -0500
Subject: [PATCH 0960/4742] [ruby mode] Fixes /= operator for highlighting

relates to https://github.com/marijnh/CodeMirror/issues/314
---
 mode/ruby/ruby.js |  1 +
 mode/ruby/test.js | 11 +++++++++++
 test/index.html   |  1 +
 3 files changed, 13 insertions(+)
 create mode 100644 mode/ruby/test.js

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 1cdc9a4e43..6a77e2d2a2 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -34,6 +34,7 @@ CodeMirror.defineMode("ruby", function(config) {
     if (ch == "`" || ch == "'" || ch == '"') {
       return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
     } else if (ch == "/" && !stream.eol() && stream.peek() != " ") {
+      if (stream.eat("=")) return "operator";
       return chain(readQuoted(ch, "string-2", true), stream, state);
     } else if (ch == "%") {
       var style = "string", embed = true;
diff --git a/mode/ruby/test.js b/mode/ruby/test.js
new file mode 100644
index 0000000000..c97d106686
--- /dev/null
+++ b/mode/ruby/test.js
@@ -0,0 +1,11 @@
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "ruby");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("divide_equal_operator",
+     "[variable bar] [operator /=] [variable foo]");
+
+  MT("divide_equal_operator_no_spacing",
+     "[variable foo][operator /=][number 42]");
+
+})();
diff --git a/test/index.html b/test/index.html
index 8177038e30..7f278cc5c2 100644
--- a/test/index.html
+++ b/test/index.html
@@ -82,6 +82,7 @@ <h2>Test Suite</h2>
     <script src="../mode/xml/xml.js"></script>
     <script src="../mode/htmlmixed/htmlmixed.js"></script>
     <script src="../mode/ruby/ruby.js"></script>
+    <script src="../mode/ruby/test.js"></script>
     <script src="../mode/haml/haml.js"></script>
     <script src="../mode/haml/test.js"></script>
     <script src="../mode/markdown/markdown.js"></script>

From 633f829e205dc972af0b258e0247649d59ee1457 Mon Sep 17 00:00:00 2001
From: Rasmus Erik Voel Jensen <github-rasmuserik@solsort.dk>
Date: Thu, 13 Feb 2014 08:45:12 +0100
Subject: [PATCH 0961/4742] [markdown-fold addon] Add

---
 addon/fold/markdown-fold.js | 23 +++++++++++++++++++++++
 demo/folding.html           | 17 ++++++++++++++++-
 mode/markdown/markdown.js   |  4 +++-
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 addon/fold/markdown-fold.js

diff --git a/addon/fold/markdown-fold.js b/addon/fold/markdown-fold.js
new file mode 100644
index 0000000000..f11e0d546a
--- /dev/null
+++ b/addon/fold/markdown-fold.js
@@ -0,0 +1,23 @@
+CodeMirror.registerHelper("fold", "markdown", function(cm, start) {
+  var level, end, maxDepth = 100, firstLine = cm.getLine(start.line), lastLine = cm.lastLine();
+
+  function headerLevel(line) {
+    if (!line) return maxDepth;
+    var match = line.match(/^#+/);
+    return match ? match[0].length : maxDepth;
+  }
+
+  level = headerLevel(firstLine);
+  if (level === maxDepth) return undefined;
+
+  for (end = start.line + 1; end < lastLine; ++end) {
+    if (headerLevel(cm.getLine(end + 1)) <= level) {
+      break;
+    }
+  }
+
+  return {
+    from: CodeMirror.Pos(start.line, cm.getLine(start.line).length),
+    to: CodeMirror.Pos(end, cm.getLine(end).length)
+  };
+});
diff --git a/demo/folding.html b/demo/folding.html
index cc9f2a332d..84ef510f7c 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -12,9 +12,11 @@
   <script src="../addon/fold/foldgutter.js"></script>
   <script src="../addon/fold/brace-fold.js"></script>
   <script src="../addon/fold/xml-fold.js"></script>
+  <script src="../addon/fold/markdown-fold.js"></script>
   <script src="../addon/fold/comment-fold.js"></script>
   <script src="../mode/javascript/javascript.js"></script>
   <script src="../mode/xml/xml.js"></script>
+  <script src="../mode/markdown/markdown.js"></script>
   <style type="text/css">
     .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
   </style>
@@ -39,8 +41,10 @@ <h2>Code Folding Demo</h2>
   <form>
     <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br>
     <textarea id="code" name="code"></textarea></div>
-    <div style="max-width: 50em">HTML:<br>
+    <div style="max-width: 50em; margin-bottom: 1em">HTML:<br>
     <textarea id="code-html" name="code-html"></textarea></div>
+    <div style="max-width: 50em">Markdown:<br>
+    <textarea id="code-markdown" name="code"></textarea></div>
   </form>
   <script id="script">
 /*
@@ -53,6 +57,8 @@ <h2>Code Folding Demo</h2>
   sc.innerHTML = "";
   var te_html = document.getElementById("code-html");
   te_html.value = document.documentElement.innerHTML;
+  var te_markdown = document.getElementById("code-markdown");
+  te_markdown.value = "# Foo\n## Bar\n\nblah blah\n\n## Baz\n\nblah blah\n\n# Quux\n\nblah blah\n"
 
   window.editor = CodeMirror.fromTextArea(te, {
     mode: "javascript",
@@ -74,6 +80,15 @@ <h2>Code Folding Demo</h2>
   });
   editor_html.foldCode(CodeMirror.Pos(0, 0));
   editor_html.foldCode(CodeMirror.Pos(21, 0));
+
+  window.editor_markdown = CodeMirror.fromTextArea(te_markdown, {
+    mode: "markdown",
+    lineNumbers: true,
+    lineWrapping: true,
+    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
+    foldGutter: true,
+    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
+  });
 };
   </script>
 </article>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index ebb0f023e2..a571df2949 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -738,7 +738,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     blankLine: blankLine,
 
-    getType: getType
+    getType: getType,
+
+    fold: "markdown"
   };
   return mode;
 }, "xml");

From 573ad2a4ec9cbbe937c9fe38a847767662ce966a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 13 Feb 2014 10:31:07 +0100
Subject: [PATCH 0962/4742] [markdown-fold addon] Add support for undelined
 headers

Issue #2253
---
 addon/fold/markdown-fold.js | 33 ++++++++++++++++++++++-----------
 doc/compress.html           |  1 +
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/addon/fold/markdown-fold.js b/addon/fold/markdown-fold.js
index f11e0d546a..aeb3c04565 100644
--- a/addon/fold/markdown-fold.js
+++ b/addon/fold/markdown-fold.js
@@ -1,23 +1,34 @@
 CodeMirror.registerHelper("fold", "markdown", function(cm, start) {
-  var level, end, maxDepth = 100, firstLine = cm.getLine(start.line), lastLine = cm.lastLine();
+  var maxDepth = 100;
 
-  function headerLevel(line) {
-    if (!line) return maxDepth;
-    var match = line.match(/^#+/);
-    return match ? match[0].length : maxDepth;
+  function isHeader(lineNo) {
+    var tokentype = cm.getTokenTypeAt(CodeMirror.Pos(lineNo, 0));
+    return tokentype && /\bheader\b/.test(tokentype);
   }
 
-  level = headerLevel(firstLine);
+  function headerLevel(lineNo, line, nextLine) {
+    var match = line && line.match(/^#+/);
+    if (match && isHeader(lineNo)) return match[0].length;
+    match = nextLine && nextLine.match(/^[=\-]+\s*$/);
+    if (match && isHeader(lineNo + 1)) return nextLine[0] == "=" ? 1 : 2;
+    return maxDepth;
+  }
+
+  var firstLine = cm.getLine(start.line), nextLine = cm.getLine(start.line + 1);
+  var level = headerLevel(start.line, firstLine, nextLine);
   if (level === maxDepth) return undefined;
 
-  for (end = start.line + 1; end < lastLine; ++end) {
-    if (headerLevel(cm.getLine(end + 1)) <= level) {
-      break;
-    }
+  var lastLineNo = cm.lastLine();
+  var end = start.line, nextNextLine = cm.getLine(end + 2);
+  while (end < lastLineNo) {
+    if (headerLevel(end + 1, nextLine, nextNextLine) <= level) break;
+    ++end;
+    nextLine = nextNextLine;
+    nextNextLine = cm.getLine(end + 2);
   }
 
   return {
-    from: CodeMirror.Pos(start.line, cm.getLine(start.line).length),
+    from: CodeMirror.Pos(start.line, firstLine.length),
     to: CodeMirror.Pos(end, cm.getLine(end).length)
   };
 });
diff --git a/doc/compress.html b/doc/compress.html
index c6915d6244..b13b8530dc 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -183,6 +183,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/lint/json-lint.js">json-lint.js</option>
           <option value="http://codemirror.net/addon/lint/lint.js">lint.js</option>
           <option value="http://codemirror.net/addon/mode/loadmode.js">loadmode.js</option>
+          <option value="http://codemirror.net/addon/fold/markdown-fold.js">markdown-fold.js</option>
           <option value="http://codemirror.net/addon/selection/mark-selection.js">mark-selection.js</option>
           <option value="http://codemirror.net/addon/search/match-highlighter.js">match-highlighter.js</option>
           <option value="http://codemirror.net/addon/edit/matchbrackets.js">matchbrackets.js</option>

From 992c939fb44ac4791748fdff6f512c287162f837 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 11:30:04 +0100
Subject: [PATCH 0963/4742] Upgrade Acorn, use forbidReserved="everywhere" in
 linter

---
 test/lint/acorn.js | 35 +++++++++++++++++++++++++----------
 test/lint/lint.js  |  2 +-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/test/lint/acorn.js b/test/lint/acorn.js
index bbd32cfcea..0f11931752 100644
--- a/test/lint/acorn.js
+++ b/test/lint/acorn.js
@@ -62,8 +62,13 @@
     // trailing commas in array and object literals.
     allowTrailingCommas: true,
     // By default, reserved words are not enforced. Enable
-    // `forbidReserved` to enforce them.
+    // `forbidReserved` to enforce them. When this option has the
+    // value "everywhere", reserved words and keywords can also not be
+    // used as property names.
     forbidReserved: false,
+    // When enabled, a return at the top level is not considered an
+    // error.
+    allowReturnOutsideFunction: false,
     // When `locations` is on, `loc` properties holding objects with
     // `start` and `end` properties in `{line, column}` form (with
     // line being 1-based and column 0-based) will be attached to the
@@ -142,6 +147,7 @@
 
     var t = {};
     function getToken(forceRegexp) {
+      lastEnd = tokEnd;
       readToken(forceRegexp);
       t.start = tokStart; t.end = tokEnd;
       t.startLoc = tokStartLoc; t.endLoc = tokEndLoc;
@@ -937,13 +943,8 @@
   function readWord() {
     var word = readWord1();
     var type = _name;
-    if (!containsEsc) {
-      if (isKeyword(word)) type = keywordTypes[word];
-      else if (options.forbidReserved &&
-               (options.ecmaVersion === 3 ? isReservedWord3 : isReservedWord5)(word) ||
-               strict && isStrictReservedWord(word))
-        raise(tokStart, "The keyword '" + word + "' is reserved");
-    }
+    if (!containsEsc && isKeyword(word))
+      type = keywordTypes[word];
     return finishToken(type, word);
   }
 
@@ -1223,7 +1224,8 @@
       return finishNode(node, "IfStatement");
 
     case _return:
-      if (!inFunction) raise(tokStart, "'return' outside of function");
+      if (!inFunction && !options.allowReturnOutsideFunction)
+        raise(tokStart, "'return' outside of function");
       next();
 
       // In `return` (and `break`/`continue`), the keywords with
@@ -1758,7 +1760,20 @@
 
   function parseIdent(liberal) {
     var node = startNode();
-    node.name = tokType === _name ? tokVal : (liberal && !options.forbidReserved && tokType.keyword) || unexpected();
+    if (liberal && options.forbidReserved == "everywhere") liberal = false;
+    if (tokType === _name) {
+      if (!liberal &&
+          (options.forbidReserved &&
+           (options.ecmaVersion === 3 ? isReservedWord3 : isReservedWord5)(tokVal) ||
+           strict && isStrictReservedWord(tokVal)) &&
+          input.slice(tokStart, tokEnd).indexOf("\\") == -1)
+        raise(tokStart, "The keyword '" + tokVal + "' is reserved");
+      node.name = tokVal;
+    } else if (liberal && tokType.keyword) {
+      node.name = tokType.keyword;
+    } else {
+      unexpected();
+    }
     tokRegexpAllowed = false;
     next();
     return finishNode(node, "Identifier");
diff --git a/test/lint/lint.js b/test/lint/lint.js
index 275113111c..0f117d9638 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -50,7 +50,7 @@ function checkFile(fileName) {
       ecmaVersion: 3,
       strictSemicolons: true,
       allowTrailingCommas: false,
-      forbidReserved: true,
+      forbidReserved: "everywhere",
       sourceFile: fileName
     });
   } catch (e) {

From 60ee4fea9b91efca69aa0e249de3a9c14b3a9bbc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 12:03:27 +0100
Subject: [PATCH 0964/4742] Scroll at least one character around the cursor
 into view

(When lineWrapping is off.)

Issue #2254
---
 lib/codemirror.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 01e73e0b25..8e1718530b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3441,8 +3441,12 @@
   // shown.
   function ensureCursorVisible(cm) {
     resolveScrollToPos(cm);
-    var cur = cm.getCursor();
-    cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin, isCursor: true};
+    var cur = cm.getCursor(), from = cur, to = cur;
+    if (!cm.options.lineWrapping) {
+      from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur;
+      to = Pos(cur.line, cur.ch + 1);
+    }
+    cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true};
   }
 
   // When an operation has its scrollToPos property set, and another

From 3c429a52ec4d108839d087a1ff457e1d8e354e56 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Mon, 10 Feb 2014 08:09:26 -0800
Subject: [PATCH 0965/4742] [vim] Translate regex backreferences from vim form
 to javascript form

... so that users can use \1, \2, etc in the replace expressions.
---
 keymap/vim.js    | 16 +++++++++++-----
 test/vim_test.js | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 2a11ec88ab..6628236a95 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2760,8 +2760,9 @@
     }
 
     // For any character in the string that matches one of the specials,
-    // adds a '\' if unescaped, or removes one if escaped.
-    function flipEscaping(str, specials) {
+    // adds a '\' if unescaped, or removes one if escaped. If fixBackReferences
+    // is true, translates '\[0..9]' to '$[0..9]'
+    function flipEscaping(str, specials, fixBackReferences) {
       var escapeNextChar = false;
       var out = [];
       for (var i = -1; i < str.length; i++) {
@@ -2784,10 +2785,15 @@
         } else {
           if (c === '\\') {
             escapeNextChar = true;
-            if (!specialComesNext) {
+            if (fixBackReferences && (isNumber(n) || n === '$')) {
+              out.push('$');
+            } else if (!specialComesNext) {
               out.push('\\');
             }
           } else {
+            if (fixBackReferences && c === '$') {
+              out.push('$');
+            }
             out.push(c);
             if (specialComesNext && n !== '\\') {
               out.push('\\');
@@ -2829,7 +2835,7 @@
       if (!regexPart) {
         return null;
       }
-      regexPart = flipEscaping(regexPart, ['|', '(', ')']);
+      regexPart = flipEscaping(regexPart, ['|', '(', ')'], false);
       if (smartCase) {
         ignoreCase = (/^[^A-Z]*$/).test(regexPart);
       }
@@ -3324,7 +3330,7 @@
         var confirm = false; // Whether to confirm each replace.
         if (slashes[1]) {
           replacePart = argString.substring(slashes[1] + 1, slashes[2]);
-          replacePart = flipEscaping(replacePart, ['\\', '/']);
+          replacePart = flipEscaping(replacePart, ['\\', '/'], true);
         }
         if (slashes[2]) {
           // After the 3rd slash, we can have flags followed by a space followed
diff --git a/test/vim_test.js b/test/vim_test.js
index 2ab1427093..6ff75fb220 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2332,9 +2332,40 @@ testVim('ex_substitute_visual_range', function(cm, vim, helpers) {
 }, { value: '1\n2\n3\n4\n5' });
 testVim('ex_substitute_capture', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
-  helpers.doEx('s/\\(\\d+\\)/$1$1/')
+  // \n should be a backreference.
+  helpers.doEx('s/\\(\\d+\\)/\\1\\1/')
   eq('a1111 a1212 a1313', cm.getValue());
 }, { value: 'a11 a12 a13' });
+testVim('ex_substitute_capture2', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  // \n should be a backreference, even if followed by '$'
+  helpers.doEx('s/\\(\\d+\\)/$\\1\\1/')
+  eq('a $00 b', cm.getValue());
+}, { value: 'a 0 b' });
+testVim('ex_substitute_javascript', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  // Throw all the things that javascript likes to treat as special values
+  // into the replace part. All should be literal (this is VIM).
+  helpers.doEx('s/\\(\\d+\\)/$$ $\' $` $& \\1/')
+  eq('a $$ $\' $` $& 0 b', cm.getValue());
+}, { value: 'a 0 b' });
+testVim('ex_substitute_nocapture', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  // $n should be literal, since that is the javascript form, not VIM.
+  helpers.doEx('s/\\(\\d+\\)/$1$1/')
+  eq('a$1$1 a$1$1 a$1$1', cm.getValue());
+}, { value: 'a11 a12 a13' });
+testVim('ex_substitute_nocapture2', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  // \$n should be literal, since that is the javascript form, not VIM. 
+  helpers.doEx('s/\\(\\d+\\)/\\$1\\1/')
+  eq('a $10 b', cm.getValue());
+}, { value: 'a 0 b' });
+testVim('ex_substitute_nocapture', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('s/b/$/')
+  eq('a $ c', cm.getValue());
+}, { value: 'a b c' });
 testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
   // If the query is empty, use last query.
   cm.setCursor(1, 0);

From 1221eef59e0e13171238ca2418f9bf20b3d5f311 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 12:56:12 +0100
Subject: [PATCH 0966/4742] Use a saner (and cheaper) way to pad the selection

Issue #2256
---
 lib/codemirror.js | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 68bb718a9e..e5324c0070 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -171,7 +171,7 @@ window.CodeMirror = (function() {
     // Self-resetting timeout for the poller
     d.poll = new Delayed();
 
-    d.cachedCharWidth = d.cachedTextHeight = null;
+    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
     d.measureLineCache = [];
     d.measureLineCachePos = 0;
 
@@ -819,12 +819,12 @@ window.CodeMirror = (function() {
   function updateSelectionRange(cm) {
     var display = cm.display, doc = cm.doc, sel = cm.doc.sel;
     var fragment = document.createDocumentFragment();
-    var clientWidth = display.lineSpace.offsetWidth, pl = paddingLeft(cm.display);
+    var padding = paddingH(cm.display), leftSide = padding.left, rightSide = display.lineSpace.offsetWidth - padding.right;
 
     function add(left, top, width, bottom) {
       if (top < 0) top = 0;
       fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
-                               "px; top: " + top + "px; width: " + (width == null ? clientWidth - left : width) +
+                               "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) +
                                "px; height: " + (bottom - top) + "px"));
     }
 
@@ -847,18 +847,18 @@ window.CodeMirror = (function() {
           left = leftPos.left;
           right = rightPos.right;
         }
-        if (fromArg == null && from == 0) left = pl;
+        if (fromArg == null && from == 0) left = leftSide;
         if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
           add(left, leftPos.top, null, leftPos.bottom);
-          left = pl;
+          left = leftSide;
           if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);
         }
-        if (toArg == null && to == lineLen) right = clientWidth;
+        if (toArg == null && to == lineLen) right = rightSide;
         if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
           start = leftPos;
         if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
           end = rightPos;
-        if (left < pl + 1) left = pl;
+        if (left < leftSide + 1) left = leftSide;
         add(left, rightPos.top, right - left, rightPos.bottom);
       });
       return {start: start, end: end};
@@ -874,13 +874,13 @@ window.CodeMirror = (function() {
       if (singleVLine) {
         if (leftEnd.top < rightStart.top - 2) {
           add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
-          add(pl, rightStart.top, rightStart.left, rightStart.bottom);
+          add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
         } else {
           add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
         }
       }
       if (leftEnd.bottom < rightStart.top)
-        add(pl, leftEnd.bottom, null, rightStart.top);
+        add(leftSide, leftEnd.bottom, null, rightStart.top);
     }
 
     removeChildrenAndAdd(display.selectionDiv, fragment);
@@ -983,9 +983,12 @@ window.CodeMirror = (function() {
 
   function paddingTop(display) {return display.lineSpace.offsetTop;}
   function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;}
-  function paddingLeft(display) {
-    var e = removeChildrenAndAdd(display.measure, elt("pre", null, null, "text-align: left")).appendChild(elt("span", "x"));
-    return e.offsetLeft;
+  function paddingH(display) {
+    if (display.cachedPaddingH) return display.cachedPaddingH;
+    var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
+    var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
+    return display.cachedPaddingH = {left: parseInt(style.paddingLeft),
+                                     right: parseInt(style.paddingRight)};
   }
 
   function measureChar(cm, line, ch, data, bias) {
@@ -1159,7 +1162,7 @@ window.CodeMirror = (function() {
 
   function clearCaches(cm) {
     cm.display.measureLineCache.length = cm.display.measureLineCachePos = 0;
-    cm.display.cachedCharWidth = cm.display.cachedTextHeight = null;
+    cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
     if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
     cm.display.lineNumChars = null;
   }
@@ -1613,7 +1616,7 @@ window.CodeMirror = (function() {
       if (resizeTimer == null) resizeTimer = setTimeout(function() {
         resizeTimer = null;
         // Might be a text scaling operation, clear size caches.
-        d.cachedCharWidth = d.cachedTextHeight = knownScrollbarWidth = null;
+        d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = knownScrollbarWidth = null;
         clearCaches(cm);
         runInOp(cm, bind(regChange, cm));
       }, 100);

From 8a4cc91b9bf55755dfa116158ea496c5a27cac08 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 14:16:20 +0100
Subject: [PATCH 0967/4742] Improve support for ctrl-click selection creation

Now supports double/triple clicks and alt-drag to create
word/line/rectangle selections in addition to the existing
selection.

Issue #2257
---
 lib/codemirror.js | 96 +++++++++++++++++++++++++++++------------------
 1 file changed, 60 insertions(+), 36 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8e1718530b..9a7eec439f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2250,8 +2250,8 @@
         var pos = posFromMouse(cm, e);
         if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
         e_preventDefault(e);
-        var word = findWordAt(getLine(cm.doc, pos.line).text, pos);
-        extendSelection(cm.doc, word.from, word.to);
+        var word = findWordAt(cm.doc, pos);
+        extendSelection(cm.doc, word.anchor, word.head);
       }));
     else
       on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
@@ -2462,12 +2462,12 @@
       lastClick = {time: now, pos: start};
     }
 
-    var sel = cm.doc.sel;
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
+    var sel = cm.doc.sel, addNew = mac ? e.metaKey : e.ctrlKey;
+    if (cm.options.dragDrop && dragAndDrop && !addNew && !isReadOnly(cm) &&
         type == "single" && sel.contains(start) > -1 && sel.somethingSelected())
       leftButtonStartDrag(cm, e, start);
     else
-      leftButtonNoDrag(cm, e, start, type);
+      leftButtonSelect(cm, e, start, type, addNew);
   }
 
   // Start a text drag. When it ends, see if any dragging actually
@@ -2498,30 +2498,58 @@
   }
 
   // Normal selection, as opposed to text dragging.
-  function leftButtonNoDrag(cm, e, start, type) {
+  function leftButtonSelect(cm, e, start, type, addNew) {
     var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
     pushPendingSelection(doc, doc.history.done);
     doc.history.atomicSelection = true;
 
-    if (mac ? e.metaKey : e.ctrlKey) {
-      var inside = doc.sel.contains(start);
-      if (inside > -1)
-        setSelection(doc, new Selection(doc.sel.ranges, inside), false);
+    var ourRange, ourIndex, startSel = doc.sel;
+    if (addNew) {
+      ourIndex = doc.sel.contains(start);
+      if (ourIndex > -1)
+        ourRange = doc.sel.ranges[ourIndex];
       else
-        setSelection(doc, normalizeSelection(doc.sel.ranges.concat([new Range(start, start)]),
-                                             doc.sel.ranges.length), false);
-    } else if (e.altKey) {
-      setSimpleSelection(doc, start, start);
+        ourRange = new Range(start, start);
+    } else {
+      ourRange = doc.sel.primary();
+    }
+
+    if (e.altKey) {
       type = "rect";
+      if (!addNew) ourRange = new Range(start, start);
       start = posFromMouse(cm, e, true, true);
+      ourIndex = -1;
+    } else if (type == "double") {
+      var word = findWordAt(doc, start);
+      if (cm.display.shift || doc.extend)
+        ourRange = extendRange(doc, ourRange, word.anchor, word.head);
+      else
+        ourRange = word;
+    } else if (type == "triple") {
+      var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)));
+      if (cm.display.shift || doc.extend)
+        ourRange = extendRange(doc, ourRange, line.anchor, line.head);
+      else
+        ourRange = line;
     } else {
-      extendSelection(doc, start, start);
+      ourRange = extendRange(doc, ourRange, start);
     }
 
-    var lastPos = start, startSel = doc.sel;
-    function extendTo(pos, force) {
-      if (!force && cmp(lastPos, pos) == 0) return;
+    if (!addNew) {
+      ourIndex = 0;
+      setSelection(doc, new Selection([ourRange], 0));
+    } else if (ourIndex > -1) {
+      replaceOneSelection(doc, ourIndex, ourRange);
+    } else {
+      ourIndex = doc.sel.ranges.length;
+      setSelection(doc, normalizeSelection(doc.sel.ranges.concat([ourRange]),
+                                           ourIndex), false);
+    }
+
+    var lastPos = start;
+    function extendTo(pos) {
+      if (cmp(lastPos, pos) == 0) return;
       lastPos = pos;
 
       if (type == "rect") {
@@ -2538,34 +2566,29 @@
             ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
         }
         if (!ranges.length) ranges.push(new Range(start, start));
-        setSelection(doc, new Selection(ranges, ranges.length - 1));
+        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex));
       } else {
-        var oldRange = startSel.primary();
+        var oldRange = ourRange;
         var anchor = oldRange.anchor, head = pos;
         if (type != "single") {
           if (type == "double")
-            var range = findWordAt(getLine(doc, pos.line).text, pos);
+            var range = findWordAt(doc, pos);
           else
-            var range = {from: Pos(pos.line, 0), to: clipPos(doc, Pos(pos.line + 1, 0))};
-          if (cmp(range.to, anchor) > 0) {
-            head = range.to;
-            anchor = minPos(oldRange.from(), range.from);
+            var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
+          if (cmp(range.anchor, anchor) > 0) {
+            head = range.head;
+            anchor = minPos(oldRange.from(), range.anchor);
           } else {
-            head = range.from;
-            anchor = maxPos(oldRange.to(), range.to);
+            head = range.anchor;
+            anchor = maxPos(oldRange.to(), range.head);
           }
         }
         var ranges = startSel.ranges.slice(0);
-        ranges[startSel.primIndex] = new Range(clipPos(doc, anchor), head);
-        setSelection(doc, normalizeSelection(ranges, startSel.primIndex));
+        ranges[ourIndex] = new Range(clipPos(doc, anchor), head);
+        setSelection(doc, normalizeSelection(ranges, ourIndex));
       }
     }
 
-    if (type == "double" || type == "triple") {
-      extendTo(start, true);
-      startSel = doc.sel;
-    }
-
     var editorSize = display.wrapper.getBoundingClientRect();
     // Used to ensure timeout re-tries don't fire when another extend
     // happened in the meantime (clearTimeout isn't reliable -- at
@@ -3644,7 +3667,8 @@
   }
 
   // Find the word at the given position (as returned by coordsChar).
-  function findWordAt(line, pos) {
+  function findWordAt(doc, pos) {
+    var line = getLine(doc, pos.line).text;
     var start = pos.ch, end = pos.ch;
     if (line) {
       if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
@@ -3655,7 +3679,7 @@
       while (start > 0 && check(line.charAt(start - 1))) --start;
       while (end < line.length && check(line.charAt(end))) ++end;
     }
-    return {from: Pos(pos.line, start), to: Pos(pos.line, end)};
+    return new Range(Pos(pos.line, start), Pos(pos.line, end));
   }
 
   // EDITOR METHODS

From 7eb9ee931bd21104da0eb1cb9113a420adc133ab Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 14:22:29 +0100
Subject: [PATCH 0968/4742] [searchcursor addon] Refuse to search for queries
 that match everything

It doesn't do anything useful, and makes replace-all loop
forever.

Closes #2259
---
 addon/search/searchcursor.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 711cf4ce5a..f64019228c 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -8,6 +8,10 @@
     pos = pos ? doc.clipPos(pos) : Pos(0, 0);
     this.pos = {from: pos, to: pos};
 
+    // Prevent nonsensical behavior from queries that match everything.
+    if (typeof query == "string" ? query == "" : query.test(""))
+      query = /x^/;
+
     // The matches method is filled in based on the type of query.
     // It takes a position and a direction, and returns an object
     // describing the next occurrence of the query, or null if no

From cd261fa94b1988d90e1bd8aeaa1ab8ca3cba6857 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Thu, 13 Feb 2014 17:35:07 -0800
Subject: [PATCH 0969/4742] Make deleteLine delete the whole line with \n.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e5324c0070..d33001f1ca 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3552,7 +3552,7 @@ window.CodeMirror = (function() {
     },
     deleteLine: function(cm) {
       var l = cm.getCursor().line;
-      cm.replaceRange("", Pos(l, 0), Pos(l), "+delete");
+      cm.replaceRange("", Pos(l, 0), Pos(l + 1, 0), "+delete");
     },
     delLineLeft: function(cm) {
       var cur = cm.getCursor();

From a919c2d704b6c9a262cb86a90525b158e8862b0d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 14:30:02 +0100
Subject: [PATCH 0970/4742] Move query-checking logic to search.js

The vim mode was making sensible use of a searchcursor with
a match-everything regexp as cursor.

Issue #2259
---
 addon/search/search.js       | 8 +++++++-
 addon/search/searchcursor.js | 4 ----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 049f72f3dc..25b214fd96 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -56,7 +56,13 @@
   }
   function parseQuery(query) {
     var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
-    return isRE ? new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i") : query;
+    if (isRE) {
+      query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i");
+      if (query.test("")) query = /x^/;
+    } else if (query == "") {
+      query = /x^/;
+    }
+    return query;
   }
   var queryDialog =
     'Search: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp search)</span>';
diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index f64019228c..711cf4ce5a 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -8,10 +8,6 @@
     pos = pos ? doc.clipPos(pos) : Pos(0, 0);
     this.pos = {from: pos, to: pos};
 
-    // Prevent nonsensical behavior from queries that match everything.
-    if (typeof query == "string" ? query == "" : query.test(""))
-      query = /x^/;
-
     // The matches method is filled in based on the type of query.
     // It takes a position and a direction, and returns an object
     // describing the next occurrence of the query, or null if no

From fa74bdda161dcf1aa4c7c7b50a5ce44a3bf7a61b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 14:52:33 +0100
Subject: [PATCH 0971/4742] Make sure a mouseclick causes a resetInput on IE9

Issue #2260
---
 lib/codemirror.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d33001f1ca..663fc49b2a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1560,6 +1560,10 @@ window.CodeMirror = (function() {
       cm.display.input.focus();
   }
 
+  function ensureFocus(cm) {
+    if (!cm.state.focused) { focusInput(cm); onFocus(cm); }
+  }
+
   function isReadOnly(cm) {
     return cm.options.readOnly || cm.doc.cantEdit;
   }
@@ -1744,7 +1748,7 @@ window.CodeMirror = (function() {
     // selection.
     if (!start) {if (e_target(e) == display.scroller) e_preventDefault(e); return;}
 
-    if (!cm.state.focused) onFocus(cm);
+    setTimeout(bind(ensureFocus, cm), 0);
 
     var now = +new Date, type = "single";
     if (lastDoubleClick && lastDoubleClick.time > now - 400 && posEq(lastDoubleClick.pos, start)) {
@@ -1824,7 +1828,7 @@ window.CodeMirror = (function() {
       var cur = posFromMouse(cm, e, true);
       if (!cur) return;
       if (!posEq(cur, last)) {
-        if (!cm.state.focused) onFocus(cm);
+        ensureFocus(cm);
         last = cur;
         doSelect(cur);
         var visible = visibleLines(display, doc);
@@ -2152,7 +2156,7 @@ window.CodeMirror = (function() {
   var lastStoppedKey = null;
   function onKeyDown(e) {
     var cm = this;
-    if (!cm.state.focused) onFocus(cm);
+    ensureFocus(cm);
     if (signalDOMEvent(cm, e) || cm.options.onKeyEvent && cm.options.onKeyEvent(cm, addStop(e))) return;
     if (old_ie && e.keyCode == 27) e.returnValue = false;
     var code = e.keyCode;

From 7a788cbbab65f67834e34131176a44d4237c3e66 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 15:00:26 +0100
Subject: [PATCH 0972/4742] Fix drag-selection on IE9

It apparently does not have a working buttons property on its mouse
events.
---
 lib/codemirror.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 663fc49b2a..09fa29c1c8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -13,6 +13,7 @@ window.CodeMirror = (function() {
   var old_ie = /MSIE \d/.test(navigator.userAgent);
   var ie_lt8 = old_ie && (document.documentMode == null || document.documentMode < 8);
   var ie_lt9 = old_ie && (document.documentMode == null || document.documentMode < 9);
+  var ie_lt10 = old_ie && (document.documentMode == null || document.documentMode < 10);
   var ie_gt10 = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
   var ie = old_ie || ie_gt10;
   var webkit = /WebKit\//.test(navigator.userAgent);
@@ -1853,7 +1854,7 @@ window.CodeMirror = (function() {
     }
 
     var move = operation(cm, function(e) {
-      if (!ie_lt9 && (ie ? !e.buttons : !e_button(e))) done(e);
+      if ((ie && !ie_lt10) ?  !e.buttons : !e_button(e)) done(e);
       else extend(e);
     });
     var up = operation(cm, done);

From 992abf3d3d5adbfaf9875e8ad457eab279b512bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 22:15:04 +0100
Subject: [PATCH 0973/4742] [xml mode] Make it actually possible to disable
 multilineTagIndentPastTag

Closes #2262
---
 mode/xml/xml.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 96b51ff970..fc6fd1b71d 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -1,7 +1,8 @@
 CodeMirror.defineMode("xml", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
-  var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag || true;
+  var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag;
+  if (multilineTagIndentPastTag == null) multilineTagIndentPastTag = true;
 
   var Kludges = parserConfig.htmlMode ? {
     autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,

From b1aa60ef4acb6efc94a1863d8f9faf4dfe350167 Mon Sep 17 00:00:00 2001
From: Fabien O'Carroll <fabien@allou.is>
Date: Fri, 14 Feb 2014 15:56:39 +0000
Subject: [PATCH 0974/4742] [solarized theme] Fixing tab character visual

Doesn't take up any space now, so that a tab of width 2 is 2 em width
rather than 3.
---
 theme/solarized.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/solarized.css b/theme/solarized.css
index af30d62130..9c2e914833 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -92,6 +92,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .cm-tab:before {
   content: "➤";   /*visualize tab character*/
   color: #586e75;
+  position:absolute;
 }
 .cm-s-solarized .cm-error,
 .cm-s-solarized .cm-invalidchar {

From 68d4632ff0cd58f47426b83147402963461aad47 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Feb 2014 22:42:25 +0100
Subject: [PATCH 0975/4742] [show-hint addon] Default to hinting with anyword,
 when nothing else is found

(Only works if anyword-hint.js is loaded.)
---
 addon/hint/show-hint.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 90faf9db35..9b143fdd04 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -309,15 +309,16 @@
   };
 
   CodeMirror.registerHelper("hint", "auto", function(cm, options) {
-    var helpers = cm.getHelpers(cm.getCursor(), "hint");
+    var helpers = cm.getHelpers(cm.getCursor(), "hint"), words;
     if (helpers.length) {
       for (var i = 0; i < helpers.length; i++) {
         var cur = helpers[i](cm, options);
         if (cur && cur.list.length) return cur;
       }
-    } else {
-      var words = cm.getHelper(cm.getCursor(), "hintWords");
+    } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
       if (words) return CodeMirror.hint.fromList(cm, {words: words});
+    } else if (CodeMirror.hint.anyword) {
+      return CodeMirror.hint.anyword(cm, options);
     }
   });
 

From a5a08d161bc60a0b1c566f552199fcec623420f7 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouseknecht@me.com>
Date: Sat, 15 Feb 2014 03:31:52 -0500
Subject: [PATCH 0976/4742] [yaml-lint addon] Add

Added a wrapper for js-yaml.js to enable YAML lint support. Followed
json-lint.js pattern. Unfortunately js-yaml.js only shows one error at
a time, but something is better nothing. Checked code with linter and
ran tests. All came back clean.
---
 addon/lint/yaml-lint.js | 14 ++++++++++++++
 doc/compress.html       |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 addon/lint/yaml-lint.js

diff --git a/addon/lint/yaml-lint.js b/addon/lint/yaml-lint.js
new file mode 100644
index 0000000000..b7d6a3de11
--- /dev/null
+++ b/addon/lint/yaml-lint.js
@@ -0,0 +1,14 @@
+// Depends on js-yaml.js from https://github.com/nodeca/js-yaml
+
+// declare global: jsyaml
+
+CodeMirror.registerHelper("lint", "yaml", function(text) {
+  var found = [];
+  try { jsyaml.load(text); }
+  catch(e) {
+      var loc = e.mark;
+      found.push({ from: CodeMirror.Pos(loc.line, loc.column), to: CodeMirror.Pos(loc.line, loc.column), message: e.message });
+  }
+  return found;
+});
+CodeMirror.yamlValidator = CodeMirror.lint.yaml; // deprecated
diff --git a/doc/compress.html b/doc/compress.html
index b13b8530dc..b874e05f52 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -205,6 +205,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/tern/tern.js">tern.js</option>
           <option value="http://codemirror.net/addon/fold/xml-fold.js">xml-fold.js</option>
           <option value="http://codemirror.net/addon/hint/xml-hint.js">xml-hint.js</option>
+          <option value="http://codemirror.net/addon/hint/yaml-lint.js">yaml-lint.js</option>
         </optgroup>
         <optgroup label="Keymaps">
           <option value="http://codemirror.net/keymap/emacs.js">emacs.js</option>

From 38762229b170d34882e77e1e86f1233fed459ab6 Mon Sep 17 00:00:00 2001
From: Jakob Miland <saebekassebil@gmail.com>
Date: Sat, 15 Feb 2014 11:33:03 +0100
Subject: [PATCH 0977/4742] [sold mode] Add

---
 mode/index.html      |  1 +
 mode/meta.js         |  1 +
 mode/solr/index.html | 57 ++++++++++++++++++++++++++++
 mode/solr/solr.js    | 89 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 148 insertions(+)
 create mode 100644 mode/solr/index.html
 create mode 100644 mode/solr/solr.js

diff --git a/mode/index.html b/mode/index.html
index 831ad20ea4..26ea93ef02 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -94,6 +94,7 @@ <h2>Language modes</h2>
       <li><a href="smalltalk/index.html">Smalltalk</a></li>
       <li><a href="smarty/index.html">Smarty</a></li>
       <li><a href="smartymixed/index.html">Smarty/HTML mixed</a></li>
+      <li><a href="solr/index.html">Solr</a></li>
       <li><a href="sql/index.html">SQL</a> (several dialects)</li>
       <li><a href="sparql/index.html">SPARQL</a></li>
       <li><a href="stex/index.html">sTeX, LaTeX</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 42e8ebb9ca..a3989c5538 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -72,6 +72,7 @@ CodeMirror.modeInfo = [
   {name: 'Smalltalk', mime: 'text/x-stsrc', mode: 'smalltalk'},
   {name: 'Smarty', mime: 'text/x-smarty', mode: 'smarty'},
   {name: 'SmartyMixed', mime: 'text/x-smarty', mode: 'smartymixed'},
+  {name: 'Solr', mime: 'text/x-solr', mode: 'solr'},
   {name: 'SPARQL', mime: 'application/x-sparql-query', mode: 'sparql'},
   {name: 'SQL', mime: 'text/x-sql', mode: 'sql'},
   {name: 'MariaDB', mime: 'text/x-mariadb', mode: 'sql'},
diff --git a/mode/solr/index.html b/mode/solr/index.html
new file mode 100644
index 0000000000..cb880244be
--- /dev/null
+++ b/mode/solr/index.html
@@ -0,0 +1,57 @@
+<!doctype html>
+
+<title>CodeMirror: Solr 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="solr.js"></script>
+<style type="text/css">
+  .CodeMirror {
+    border-top: 1px solid black;
+    border-bottom: 1px solid black;
+  }
+
+  .CodeMirror .cm-operator {
+    color: orange;
+  }
+</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Solr</a>
+  </ul>
+</div>
+
+<article>
+  <h2>Solr mode</h2>
+
+  <div>
+    <textarea id="code" name="code">author:Camus
+
+title:"The Rebel" and author:Camus
+
+philosophy:Existentialism -author:Kierkegaard
+
+hardToSpell:Dostoevsky~
+
+published:[194* TO 1960] and author:(Sartre or "Simone de Beauvoir")</textarea>
+  </div>
+
+  <script>
+    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+      mode: 'solr',
+      lineNumbers: true
+    });
+  </script>
+
+  <p><strong>MIME types defined:</strong> <code>text/x-solr</code>.</p>
+</article>
diff --git a/mode/solr/solr.js b/mode/solr/solr.js
new file mode 100644
index 0000000000..c732ff479e
--- /dev/null
+++ b/mode/solr/solr.js
@@ -0,0 +1,89 @@
+CodeMirror.defineMode("solr", function() {
+  "use strict";
+
+  var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\^\"\\]/;
+  var isOperatorChar = /[\|\!\+\-\*\?\~\^\&]/;
+  var isOperatorString = /^(OR|AND|NOT|TO)$/i;
+
+  function isNumber(word) {
+    return parseFloat(word, 10).toString() === word;
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) break;
+        escaped = !escaped && next == "\\";
+      }
+
+      if (!escaped) state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+
+  function tokenOperator(operator) {
+    return function(stream, state) {
+      var style = "operator";
+      if (operator == "+")
+        style += " positive";
+      else if (operator == "-")
+        style += " negative";
+      else if (operator == "|")
+        stream.eat(/\|/);
+      else if (operator == "&")
+        stream.eat(/\&/);
+      else if (operator == "^")
+        style += " boost";
+
+      state.tokenize = tokenBase;
+      return style;
+    };
+  }
+
+  function tokenWord(ch) {
+    return function(stream, state) {
+      var word = ch;
+      while ((ch = stream.peek()) && ch.match(isStringChar) != null) {
+        word += stream.next();
+      }
+
+      state.tokenize = tokenBase;
+      if (isOperatorString.test(word))
+        return "operator";
+      else if (isNumber(word))
+        return "number";
+      else if (stream.peek() == ":")
+        return "field";
+      else
+        return "string";
+    };
+  }
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (ch == '"')
+      state.tokenize = tokenString(ch);
+    else if (isOperatorChar.test(ch))
+      state.tokenize = tokenOperator(ch);
+    else if (isStringChar.test(ch))
+      state.tokenize = tokenWord(ch);
+
+    return (state.tokenize != tokenBase) ? state.tokenize(stream, state) : null;
+  }
+
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase
+      };
+    },
+
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return state.tokenize(stream, state);
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-solr", "solr");

From 11967c7b5a239e9cd4669e90e4fceea661b31e00 Mon Sep 17 00:00:00 2001
From: anaran <adrian.aichner@gmail.com>
Date: Sat, 15 Feb 2014 14:46:36 +0100
Subject: [PATCH 0978/4742] [search addon] Fix replacement of multiple groups

Closes #2268
---
 addon/search/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 25b214fd96..b5611ab41d 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -113,7 +113,7 @@
             for (var cursor = getSearchCursor(cm, query); cursor.findNext();) {
               if (typeof query != "string") {
                 var match = cm.getRange(cursor.from(), cursor.to()).match(query);
-                cursor.replace(text.replace(/\$(\d)/, function(_, i) {return match[i];}));
+                cursor.replace(text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
               } else cursor.replace(text);
             }
           });
@@ -134,7 +134,7 @@
           };
           var doReplace = function(match) {
             cursor.replace(typeof query == "string" ? text :
-                           text.replace(/\$(\d)/, function(_, i) {return match[i];}));
+                           text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
             advance();
           };
           advance();

From 9f834a94de21e9298e12e8b5d2f7ca4267129ef2 Mon Sep 17 00:00:00 2001
From: Ryan Prior <ryanprior@gmail.com>
Date: Sun, 16 Feb 2014 14:07:54 -0600
Subject: [PATCH 0979/4742] [octave mode] added more builtins, fixed comments

(removed non-octave ... comments, added octave's # comments)
---
 mode/octave/index.html | 19 ++++---------------
 mode/octave/octave.js  | 10 ++++++----
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/mode/octave/index.html b/mode/octave/index.html
index 78ce42a146..573ce42382 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -27,25 +27,16 @@ <h2>Octave mode</h2>
 
     <div><textarea id="code" name="code">
 %numbers
-1234
-1234i
-1234j
-.234
-.234j
-2.23i
-23e2
-12E1j
-123D-4
-0x234
+[1234 1234i 1234j]
+[.234 .234j 2.23i]
+[23e2 12E1j 123D-4 0x234]
 
 %strings
 'asda''a'
 "asda""a"
 
 %identifiers
-a
-as123
-__asd__
+a + as123 - __asd__
 
 %operators
 -
@@ -73,10 +64,8 @@ <h2>Octave mode</h2>
 global persistent
 
 %one line comment
-...one line comment
 %{ multi 
 line commment %}
-1
 
     </textarea></div>
     <script>
diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index 23cd2fe222..dbf4ce1d17 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -13,17 +13,19 @@ CodeMirror.defineMode("octave", function() {
 
   var builtins = wordRegexp([
     'error', 'eval', 'function', 'abs', 'acos', 'atan', 'asin', 'cos',
-    'cosh', 'exp', 'log', 'prod', 'log10', 'max', 'min', 'sign', 'sin', 'sinh',
+    'cosh', 'exp', 'log', 'prod', 'sum', 'log10', 'max', 'min', 'sign', 'sin', 'sinh',
     'sqrt', 'tan', 'reshape', 'break', 'zeros', 'default', 'margin', 'round', 'ones',
     'rand', 'syn', 'ceil', 'floor', 'size', 'clear', 'zeros', 'eye', 'mean', 'std', 'cov',
     'det', 'eig', 'inv', 'norm', 'rank', 'trace', 'expm', 'logm', 'sqrtm', 'linspace', 'plot',
-    'title', 'xlabel', 'ylabel', 'legend', 'text', 'meshgrid', 'mesh', 'num2str'
+    'title', 'xlabel', 'ylabel', 'legend', 'text', 'grid', 'meshgrid', 'mesh', 'num2str',
+    'fft', 'ifft', 'arrayfun', 'cellfun', 'input', 'fliplr', 'flipud', 'ismember'
   ]);
 
   var keywords = wordRegexp([
     'return', 'case', 'switch', 'else', 'elseif', 'end', 'endif', 'endfunction',
     'if', 'otherwise', 'do', 'for', 'while', 'try', 'catch', 'classdef', 'properties', 'events',
-    'methods', 'global', 'persistent', 'endfor', 'endwhile', 'printf', 'disp', 'until', 'continue'
+    'methods', 'global', 'persistent', 'endfor', 'endwhile', 'printf', 'sprintf', 'disp', 'until',
+    'continue', 'pkg'
   ]);
 
 
@@ -59,7 +61,7 @@ CodeMirror.defineMode("octave", function() {
       return 'comment';
     }
 
-    if (stream.match(/^(%)|(\.\.\.)/)){
+    if (stream.match(/^[%#]/)){
       stream.skipToEnd();
       return 'comment';
     }

From 1c18acc65717d348daa397ca8bda3b5ca1bd1c3e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Feb 2014 09:42:50 +0100
Subject: [PATCH 0980/4742] Fix resolveMode's handling of MIME types in name
 fields

Also configure the htmlmixed option to pass through xml-mode-specific
options to its inner xml mode.

Issue #2265
---
 lib/codemirror.js           | 1 +
 mode/htmlmixed/htmlmixed.js | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 09fa29c1c8..37c081981e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3445,6 +3445,7 @@ window.CodeMirror = (function() {
       spec = mimeModes[spec];
     } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
       var found = mimeModes[spec.name];
+      if (typeof found == "string") found = {name: found};
       spec = createObj(found, spec);
       spec.name = found.name;
     } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index e9eab3b92d..8cc9c4e723 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -1,5 +1,8 @@
 CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
-  var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true});
+  var htmlMode = CodeMirror.getMode(config, {name: "xml",
+                                             htmlMode: true,
+                                             multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
+                                             multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag});
   var cssMode = CodeMirror.getMode(config, "css");
 
   var scriptTypes = [], scriptTypesConf = parserConfig && parserConfig.scriptTypes;

From fa037e606301d73fcdea00b03350862c94456380 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Feb 2014 10:18:31 +0100
Subject: [PATCH 0981/4742] Make by-group motion stop after groups of 1+ space,
 newlines

Issue #2255
---
 lib/codemirror.js |  6 ++++--
 test/test.js      | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 37c081981e..3dee86f162 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2843,13 +2843,15 @@ window.CodeMirror = (function() {
         if (dir < 0 && !moveOnce(!first)) break;
         var cur = lineObj.text.charAt(ch) || "\n";
         var type = isWordChar(cur) ? "w"
-          : !group ? null
-          : /\s/.test(cur) ? null
+          : group && cur == "\n" ? "n"
+          : !group || /\s/.test(cur) ? null
           : "p";
+        if (group && !first && !type) type = "s";
         if (sawType && sawType != type) {
           if (dir < 0) {dir = 1; moveOnce();}
           break;
         }
+
         if (type) sawType = type;
         if (dir > 0 && !moveOnce(!first)) break;
       }
diff --git a/test/test.js b/test/test.js
index 78998c67cd..9c582c055d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1133,13 +1133,32 @@ testCM("groupMovementCommands", function(cm) {
   cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight");
   eqPos(cm.getCursor(), Pos(0, 20));
   cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(1, 0));
+  cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(1, 2));
+  cm.execCommand("goGroupRight");
   eqPos(cm.getCursor(), Pos(1, 5));
   cm.execCommand("goGroupLeft"); cm.execCommand("goGroupLeft");
   eqPos(cm.getCursor(), Pos(1, 0));
   cm.execCommand("goGroupLeft");
+  eqPos(cm.getCursor(), Pos(0, 20));
+  cm.execCommand("goGroupLeft");
   eqPos(cm.getCursor(), Pos(0, 16));
 }, {value: "booo ba---quux. ffff\n  abc d"});
 
+testCM("groupsAndWhitespace", function(cm) {
+  var positions = [Pos(0, 0), Pos(0, 2), Pos(0, 5), Pos(0, 9), Pos(0, 11),
+                   Pos(1, 0), Pos(1, 2), Pos(1, 5)];
+  for (var i = 1; i < positions.length; i++) {
+    cm.execCommand("goGroupRight");
+    eqPos(cm.getCursor(), positions[i]);
+  }
+  for (var i = positions.length - 2; i >= 0; i--) {
+    cm.execCommand("goGroupLeft");
+    eqPos(cm.getCursor(), i == 2 ? Pos(0, 6) : positions[i]);
+  }
+}, {value: "  foo +++  \n  bar"});
+
 testCM("charMovementCommands", function(cm) {
   cm.execCommand("goCharLeft"); cm.execCommand("goColumnLeft");
   eqPos(cm.getCursor(), Pos(0, 0));

From e1cfb7fd68e7988f508076063ebc17ddbabe2c92 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Feb 2014 11:13:57 +0100
Subject: [PATCH 0982/4742] Use a transparent border on the sizer to force
 scroll width

This produces saner widths for most elements, and removes
the need for the border/fit-width hack on the pre elements.

Issue #2256

Conflicts:
	lib/codemirror.js
---
 lib/codemirror.css | 16 +++++-----------
 lib/codemirror.js  |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 3df9948513..8332c50197 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -116,7 +116,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   /* 30px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
   margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px; padding-right: 30px;
+  padding-bottom: 30px;
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
@@ -125,6 +125,9 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 .CodeMirror-sizer {
   position: relative;
+  border-right: 30px solid transparent;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
@@ -199,16 +202,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   white-space: pre-wrap;
   word-break: normal;
 }
-.CodeMirror-code pre {
-  border-right: 30px solid transparent;
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-}
-.CodeMirror-wrap .CodeMirror-code pre {
-  border-right: none;
-  width: auto;
-}
+
 .CodeMirror-linebackground {
   position: absolute;
   left: 0; right: 0; top: 0; bottom: 0;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3dee86f162..58557263b4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1379,7 +1379,7 @@ window.CodeMirror = (function() {
     if (op.updateMaxLine) computeMaxLength(cm);
     if (display.maxLineChanged && !cm.options.lineWrapping && display.maxLine) {
       var width = measureLineWidth(cm, display.maxLine);
-      display.sizer.style.minWidth = Math.max(0, width + 3 + scrollerCutOff) + "px";
+      display.sizer.style.minWidth = Math.max(0, width + 3) + "px";
       display.maxLineChanged = false;
       var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + display.sizer.offsetWidth - display.scroller.clientWidth);
       if (maxScrollLeft < doc.scrollLeft && !op.updateScrollPos)

From 77cf502474f800f815fe3276d844cb9c4f122a40 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Feb 2014 12:01:57 +0100
Subject: [PATCH 0983/4742] Fix inverted logic in visibleLines

Prevents one pointless display update when scrolling a position
into view.
---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4d95b2043a..380532aec1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -456,9 +456,9 @@
       var ensureFrom = viewPort.ensure.from.line, ensureTo = viewPort.ensure.to.line;
       if (ensureFrom < from)
         return {from: ensureFrom,
-                to: lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) - display.wrapper.clientHeight)};
+                to: lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)};
       if (Math.min(ensureTo, doc.lastLine()) >= to)
-        return {from: lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) + display.wrapper.clientHeight),
+        return {from: lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight),
                 to: ensureTo};
     }
     return {from: from, to: to};

From 1976d03646ada8e3ca58fb81a4fa8a9c34f1f4ab Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Fri, 14 Feb 2014 14:06:33 -0800
Subject: [PATCH 0984/4742] [vim] More escaping fixes

1) Fix a bug whereby multiple '\'es in the replace part of a search and replace
string were getting collapsed into a single one.
2) Split flipEscaping into two specialized functions -- one for the regex part,
and one for the replace part.
---
 keymap/vim.js    | 60 +++++++++++++++++++++++++++++++++---------------
 test/vim_test.js |  4 ++++
 2 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 6628236a95..b508d370ae 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2759,43 +2759,65 @@
       return slashes;
     }
 
-    // For any character in the string that matches one of the specials,
-    // adds a '\' if unescaped, or removes one if escaped. If fixBackReferences
-    // is true, translates '\[0..9]' to '$[0..9]'
-    function flipEscaping(str, specials, fixBackReferences) {
+    // Translates a search string from ex (vim) syntax into javascript form.
+    // For any character in the string that matches one of the specials, adds a '\'
+    // if unescaped, or removes one if escaped.
+    function fixRegex(str) {
+      var specials = ['|', '(', ')'];
       var escapeNextChar = false;
       var out = [];
       for (var i = -1; i < str.length; i++) {
         var c = str.charAt(i) || '';
         var n = str.charAt(i+1) || '';
-        var specialComesNext = false;
-        for (var j = 0; j < specials.length; j++) {
-          if (n === specials[j]) {
-            specialComesNext = true;
-            break;
-          }
-        }
+        var specialComesNext = (specials.indexOf(n) != -1);
         if (escapeNextChar) {
           if (c !== '\\' || !specialComesNext) {
             out.push(c);
-            escapeNextChar = false;
-          } else {
+          }
+          escapeNextChar = false;
+        } else {
+          if (c === '\\') {
             escapeNextChar = true;
+            if (!specialComesNext || n === '\\') {
+              out.push('\\');
+            }
+          } else {
+            out.push(c);
+            if (specialComesNext && n !== '\\') {
+              out.push('\\');
+            }
           }
+        }
+      }
+      return out.join('');
+    }
+
+    // Translates the replace part of a search and replace from ex (vim) syntax into
+    // javascript form.  Similar to fixRegex, but additionally fixes back references
+    // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'.
+    function fixRegexReplace(str) {
+      var escapeNextChar = false;
+      var out = [];
+      for (var i = -1; i < str.length; i++) {
+        var c = str.charAt(i) || '';
+        var n = str.charAt(i+1) || '';
+        if (escapeNextChar) {
+          out.push(c);
+          escapeNextChar = false;
         } else {
           if (c === '\\') {
             escapeNextChar = true;
-            if (fixBackReferences && (isNumber(n) || n === '$')) {
+            if ((isNumber(n) || n === '$')) {
               out.push('$');
-            } else if (!specialComesNext) {
+            } else if (n !== '/' && n !== '\\') {
               out.push('\\');
             }
           } else {
-            if (fixBackReferences && c === '$') {
+            if (c === '$') {
               out.push('$');
             }
             out.push(c);
-            if (specialComesNext && n !== '\\') {
+            if (n === '/') {
               out.push('\\');
             }
           }
@@ -2835,7 +2857,7 @@
       if (!regexPart) {
         return null;
       }
-      regexPart = flipEscaping(regexPart, ['|', '(', ')'], false);
+      regexPart = fixRegex(regexPart);
       if (smartCase) {
         ignoreCase = (/^[^A-Z]*$/).test(regexPart);
       }
@@ -3330,7 +3352,7 @@
         var confirm = false; // Whether to confirm each replace.
         if (slashes[1]) {
           replacePart = argString.substring(slashes[1] + 1, slashes[2]);
-          replacePart = flipEscaping(replacePart, ['\\', '/'], true);
+          replacePart = fixRegexReplace(replacePart);
         }
         if (slashes[2]) {
           // After the 3rd slash, we can have flags followed by a space followed
diff --git a/test/vim_test.js b/test/vim_test.js
index 6ff75fb220..38b1c37222 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2408,6 +2408,10 @@ testVim('ex_substitute_backslash_replacement', function(cm, vim, helpers) {
   helpers.doEx('%s/,/\\\\/g');
   eq('one\\two \n three\\four', cm.getValue());
 }, { value: 'one,two \n three,four'});
+testVim('ex_substitute_multibackslash_replacement', function(cm, vim, helpers) {
+  helpers.doEx('%s/,/\\\\\\\\\\\\\\\\/g'); // 16 backslashes.
+  eq('one\\\\\\\\two \n three\\\\\\\\four', cm.getValue()); // 2*8 backslashes.
+}, { value: 'one,two \n three,four'});
 testVim('ex_substitute_count', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   helpers.doEx('s/\\d/0/i 2');

From a55732d9cfca939baa213d80c76ad51ef384a93a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Feb 2014 11:15:20 +0100
Subject: [PATCH 0985/4742] Fix ordering of doc width adjustment and selection
 drawing

The selection's width depends on the doc width, so it has to
be drawn after adjusting that.

Issue #2256
---
 lib/codemirror.js | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 380532aec1..576817f90a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -260,7 +260,7 @@
       cm.display.sizer.style.minWidth = "";
     } else {
       cm.display.wrapper.className = cm.display.wrapper.className.replace(" CodeMirror-wrap", "");
-      computeMaxLength(cm);
+      findMaxLine(cm);
     }
     estimateLineHeights(cm);
     regChange(cm);
@@ -351,7 +351,7 @@
   }
 
   // Find the longest line in the document.
-  function computeMaxLength(cm) {
+  function findMaxLine(cm) {
     var d = cm.display, doc = cm.doc;
     d.maxLine = getLine(doc, doc.first);
     d.maxLineLength = lineLength(d.maxLine);
@@ -532,6 +532,12 @@
       var oldWidth = cm.display.scroller.clientWidth;
       if (!updateDisplayInner(cm, visible, forced)) break;
       updated = true;
+
+      // If the max line changed since it was last measured, measure it,
+      // and ensure the document's width matches it.
+      if (cm.display.maxLineChanged && !cm.options.lineWrapping)
+        adjustContentWidth(cm);
+
       var barMeasure = measureForScrollbars(cm);
       updateSelection(cm);
       updateScrollbars(cm, barMeasure);
@@ -631,6 +637,17 @@
     return true;
   }
 
+  function adjustContentWidth(cm) {
+    var display = cm.display;
+    var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
+    display.maxLineChanged = false;
+    var minWidth = Math.max(0, width + 3);
+    var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + minWidth - display.scroller.clientWidth);
+    display.sizer.style.minWidth = minWidth + "px";
+    if (maxScrollLeft < cm.doc.scrollLeft)
+      setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
+  }
+
   // Read the actual heights of the rendered lines, and update their
   // stored heights to match.
   function updateHeightsInViewport(cm) {
@@ -1862,30 +1879,19 @@
     var op = cm.curOp, doc = cm.doc, display = cm.display;
     cm.curOp = null;
 
+    if (op.updateMaxLine) findMaxLine(cm);
+
     // If it looks like an update might be needed, call updateDisplay
     if (op.viewChanged || op.forceUpdate || op.scrollTop != null ||
         op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
-                           op.scrollToPos.to.line >= display.viewTo)) {
+                           op.scrollToPos.to.line >= display.viewTo) ||
+        display.maxLineChanged && cm.options.lineWrapping) {
       var updated = updateDisplay(cm, {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
       if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
     }
     // If no update was run, but the selection changed, redraw that.
     if (!updated && op.selectionChanged) updateSelection(cm);
 
-    if (op.updateMaxLine) computeMaxLength(cm);
-    // If the max line changed since it was last measured, measure it,
-    // and ensure the document's width matches it.
-    if (display.maxLineChanged && !cm.options.lineWrapping && display.maxLine) {
-      var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
-      display.maxLineChanged = false;
-      var minWidth = Math.max(0, width + 3);
-      var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + minWidth - display.scroller.clientWidth);
-      display.sizer.style.minWidth = minWidth + "px";
-      if (maxScrollLeft < doc.scrollLeft && op.scrollLeft == null)
-        setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
-      updateScrollbars(cm);
-    }
-
     // Propagate the scroll position to the actual DOM scroller
     if (op.scrollTop != null && display.scroller.scrollTop != op.scrollTop) {
       var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
@@ -6245,7 +6251,7 @@
     doc.cm = cm;
     estimateLineHeights(cm);
     loadMode(cm);
-    if (!cm.options.lineWrapping) computeMaxLength(cm);
+    if (!cm.options.lineWrapping) findMaxLine(cm);
     cm.options.mode = doc.modeOption;
     regChange(cm);
   }

From 3c2e512fd44ee1213e96bbcb450587c2ec9d5b6b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Feb 2014 12:22:36 +0100
Subject: [PATCH 0986/4742] [livescript mode] Remove reference to separate
 license

Closes #2272
---
 mode/livescript/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/livescript/index.html b/mode/livescript/index.html
index b5944697d8..3ce8974854 100644
--- a/mode/livescript/index.html
+++ b/mode/livescript/index.html
@@ -454,6 +454,6 @@ <h2>LiveScript mode</h2>
 
     <p><strong>MIME types defined:</strong> <code>text/x-livescript</code>.</p>
 
-    <p>The LiveScript mode was written by Kenneth Bentley (<a href="LICENSE">license</a>).</p>
+    <p>The LiveScript mode was written by Kenneth Bentley.</p>
 
   </article>

From 9b53832f0fdcc5250b2ec2847029b3519572ee42 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Feb 2014 14:59:43 +0100
Subject: [PATCH 0987/4742] [python mode] Highlight 'self' variable

Closes #2274
---
 mode/python/python.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/python/python.js b/mode/python/python.js
index 8bea5d19d1..71230beedd 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -151,6 +151,10 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             return 'builtin';
         }
 
+        if (stream.match(/^self\b/)) {
+            return "variable-2";
+        }
+
         if (stream.match(identifiers)) {
             if (state.lastToken == 'def' || state.lastToken == 'class') {
                 return 'def';

From 9d94ec4975aaf7539b5fde608800f5f497422fb1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Feb 2014 15:50:48 +0100
Subject: [PATCH 0988/4742] [mode list] Remove top margin from column-spanning
 list

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

diff --git a/mode/index.html b/mode/index.html
index f3af29bc2e..8a1a62967f 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -29,7 +29,7 @@ <h2>Language modes</h2>
 option.</p>
 
 <div style="-webkit-columns: 100px 2; -moz-columns: 100px 2; columns: 100px 2;">
-    <ul>
+    <ul style="margin-top: 0">
       <li><a href="apl/index.html">APL</a></li>
       <li><a href="asterisk/index.html">Asterisk dialplan</a></li>
       <li><a href="clike/index.html">C, C++, C#</a></li>

From 2a1cf9af5e7c0f42daba52b987431d0e4e5f49d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Feb 2014 15:58:18 +0100
Subject: [PATCH 0989/4742] Fix sidebar layout

As screwed up by e1dcbebb3c8c989229e3
---
 doc/docs.css | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/docs.css b/doc/docs.css
index 86e61d7b9a..01ece719ab 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -55,10 +55,11 @@ article {
   position: fixed;
   padding-top: 30px;
   max-height: 100%;
-  overflow-y:scroll;
+  box-sizing: -moz-border-box;
+  box-sizing: border-box;
+  overflow-y: auto;
   left: 0; right: none;
   width: 160px;
-  padding-right: 350px;
   text-align: right;
   z-index: 1;
 }
@@ -70,6 +71,7 @@ article {
   #nav {
     right: 50%;
     width: auto;
+    border-right: 349px solid transparent;
   }
 }
 
@@ -96,6 +98,7 @@ article {
 
 #nav li li a {
   padding-right: 20px;
+  display: inline-block;
 }
 
 #nav ul a {
@@ -105,6 +108,7 @@ article {
 
 #nav ul a.active, #nav ul a:hover {
   border-bottom: 1px solid #E30808;
+  margin-bottom: -1px;
   color: #E30808;
 }
 

From 919a3bebe1d795821a2a0576f30fe8e12f259c1c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Feb 2014 16:51:22 +0100
Subject: [PATCH 0990/4742] [manual] Add a section on commands and default
 keybindings

---
 doc/manual.html | 252 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 218 insertions(+), 34 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index db32d22400..7fab648bd8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -18,6 +18,9 @@
   dd { margin-left: 1.5em; margin-bottom: 1em; }
   dt {margin-top: 1em;}
   dd dl, dd dt, dd dd, dd ul { margin-top: 0; margin-bottom: 0; }
+  dt + dt { margin-top: 0; }
+  dt.command { position: relative; }
+  span.keybinding { position: absolute; right: 0; font-size: 80%; color: #555; text-indent: 0; }
 </style>
 
 <div id=nav>
@@ -31,7 +34,8 @@
     <li><a href="#usage">Basic Usage</a></li>
     <li><a href="#config">Configuration</a></li>
     <li><a href="#events">Events</a></li>
-    <li><a href="#keymaps">Keymaps</a></li>
+    <li><a href="#keymaps">Key maps</a></li>
+    <li><a href="#commands">Commands</a></li>
     <li><a href="#styling">Customized Styling</a></li>
     <li><a href="#api">Programming API</a>
       <ul>
@@ -266,18 +270,18 @@ <h2>Configuration</h2>
       on Windows, and <code>true</code> on other platforms.</dd>
 
       <dt id="option_keyMap"><code><strong>keyMap</strong>: string</code></dt>
-      <dd>Configures the keymap to use. The default
-      is <code>"default"</code>, which is the only keymap defined
-      in <code>codemirror.js</code> itself. Extra keymaps are found in
-      the <a href="../keymap/"><code>keymap</code></a> directory. See
-      the <a href="#keymaps">section on keymaps</a> for more
+      <dd>Configures the key map to use. The default
+      is <code>"default"</code>, which is the only key map defined
+      in <code>codemirror.js</code> itself. Extra key maps are found in
+      the <a href="../keymap/"><code>key map</code></a> directory. See
+      the <a href="#keymaps">section on key maps</a> for more
       information.</dd>
 
       <dt id="option_extraKeys"><code><strong>extraKeys</strong>: object</code></dt>
-      <dd>Can be used to specify extra keybindings for the editor,
+      <dd>Can be used to specify extra key bindings for the editor,
       alongside the ones defined
       by <a href="#option_keyMap"><code>keyMap</code></a>. Should be
-      either null, or a valid <a href="#keymaps">keymap</a> value.</dd>
+      either null, or a valid <a href="#keymaps">key map</a> value.</dd>
 
       <dt id="option_lineWrapping"><code><strong>lineWrapping</strong>: boolean</code></dt>
       <dd>Whether CodeMirror should scroll or wrap for long lines.
@@ -504,7 +508,7 @@ <h2>Events</h2>
 
       <dt id="event_keyHandled"><code><strong>"keyHandled"</strong> (instance: CodeMirror, name: string, event: Event)</code></dt>
       <dd>Fired after a key is handled through a
-      keymap. <code>name</code> is the name of the handled key (for
+      key map. <code>name</code> is the name of the handled key (for
       example <code>"Ctrl-X"</code> or <code>"'q'"</code>),
       and <code>event</code> is the DOM <code>keydown</code>
       or <code>keypress</code> event.</dd>
@@ -676,9 +680,9 @@ <h2>Events</h2>
 </section>
 
 <section id=keymaps>
-    <h2>Keymaps</h2>
+    <h2>Key Maps</h2>
 
-    <p>Keymaps are ways to associate keys with functionality. A keymap
+    <p>Key maps are ways to associate keys with functionality. A key map
     is an object mapping strings that identify the keys to functions
     that implement their functionality.</p>
 
@@ -708,23 +712,22 @@ <h2>Keymaps</h2>
     or <code>'q'</code>. Due to limitations in the way browsers fire
     key events, these may not be prefixed with modifiers.</p>
 
-    <p>The <code>CodeMirror.keyMap</code> object associates keymaps
-    with names. User code and keymap definitions can assign extra
-    properties to this object. Anywhere where a keymap is expected, a
+    <p>The <code>CodeMirror.keyMap</code> object associates key maps
+    with names. User code and key map definitions can assign extra
+    properties to this object. Anywhere where a key map is expected, a
     string can be given, which will be looked up in this object. It
-    also contains the <code>"default"</code> keymap holding the
+    also contains the <code>"default"</code> key map holding the
     default bindings.</p>
 
-    <p id="commands">The values of properties in keymaps can be either functions of
+    <p>The values of properties in key maps can be either functions of
     a single argument (the CodeMirror instance), strings, or
-    <code>false</code>. Such strings refer to properties of the
-    <code>CodeMirror.commands</code> object, which defines a number of
-    common commands that are used by the default keybindings, and maps
-    them to functions. If the property is set to <code>false</code>,
-    CodeMirror leaves handling of the key up to the browser. A key
-    handler function may return <code>CodeMirror.Pass</code> to indicate
-    that it has decided not to handle the key, and other handlers (or
-    the default behavior) should be given a turn.</p>
+    <code>false</code>. Strings refer
+    to <a href="#commands">commands</a>, which are described below. If
+    the property is set to <code>false</code>, CodeMirror leaves
+    handling of the key up to the browser. A key handler function may
+    return <code>CodeMirror.Pass</code> to indicate that it has
+    decided not to handle the key, and other handlers (or the default
+    behavior) should be given a turn.</p>
 
     <p>Keys mapped to command names that start with the
     characters <code>"go"</code> (which should be used for
@@ -733,22 +736,203 @@ <h2>Keymaps</h2>
     "goLineUp"</code> matches both up and shift-up). This is used to
     easily implement shift-selection.</p>
 
-    <p>Keymaps can defer to each other by defining
+    <p>Key maps can defer to each other by defining
     a <code>fallthrough</code> property. This indicates that when a
     key is not found in the map itself, one or more other maps should
-    be searched. It can hold either a single keymap or an array of
-    keymaps.</p>
+    be searched. It can hold either a single key map or an array of
+    key maps.</p>
 
-    <p>When a keymap contains a <code>nofallthrough</code> property
+    <p>When a key map contains a <code>nofallthrough</code> property
     set to <code>true</code>, keys matched against that map will be
     ignored if they don't match any of the bindings in the map (no
     further child maps will be tried). When
     the <code>disableInput</code> property is set
     to <code>true</code>, the default effect of inserting a character
-    will be suppressed when the keymap is active as the top-level
+    will be suppressed when the key map is active as the top-level
     map.</p>
 </section>
 
+<section id=commands>
+    <h2>Commands</h2>
+
+    <p>Commands are parameter-less actions that can be performed on an
+    editor. Their main use is for key bindings. Commands are defined by
+    adding properties to the <code>CodeMirror.commands</code> object.
+    A number of common commands are defined by the library itself,
+    most of them used by the default key bindings. The value of a
+    command property must be a function of one argument (an editor
+    instance).</p>
+
+    <p>Some of the commands below are referenced in the default
+    key map, but not defined by the core library. These are intended to
+    be defined by user code or addons.</p>
+
+    <p>Commands can also be run with
+    the <a href="#execCommand"><code>execCommand</code></a>
+    method.</p>
+
+    <dl>
+      <dt class=command id=command_selectAll><code><strong>selectAll</strong></code><span class=keybinding>Ctrl-A (PC), Cmd-A (Mac)</span></dt>
+      <dd>Select the whole content of the editor.</dd>
+
+      <dt class=command id=command_singleSelection><code><strong>singleSelection</strong></code><span class=keybinding>Esc</span></dt>
+      <dd>When multiple selections are present, this deselects all but
+      the primary selection.</dd>
+
+      <dt class=command id=command_killLine><code><strong>killLine</strong></code><span class=keybinding>Ctrl-K (Mac)</span></dt>
+      <dd>Emacs-style line killing. Deletes the part of the line after
+      the cursor. If that consists only of whitespace, the newline at
+      the end of the line is also deleted.</dd>
+
+      <dt class=command id=command_deleteLine><code><strong>deleteLine</strong></code><span class=keybinding>Ctrl-D (PC), Cmd-D (Mac)</span></dt>
+      <dd>Deletes the whole line under the cursor, including newline at the end.</dd>
+
+      <dt class=command id=command_delLineLeft><code><strong>delLineLeft</strong></code><span class=keybinding>Cmd-Backspace (Mac)</span></dt>
+      <dd>Delete the part of the line before the cursor.</dd>
+
+      <dt class=command id=command_undo><code><strong>undo</strong></code><span class=keybinding>Ctrl-Z (PC), Cmd-Z (Mac)</span></dt>
+      <dd>Undo the last change.</dd>
+
+      <dt class=command id=command_redo><code><strong>redo</strong></code><span class=keybinding>Ctrl-Y (PC), Shift-Cmd-Z (Mac), Cmd-Y (Mac)</span></dt>
+      <dd>Redo the last undone change.</dd>
+
+      <dt class=command id=command_undoSelection><code><strong>undoSelection</strong></code><span class=keybinding>Ctrl-U (PC), Cmd-U (Mac)</span></dt>
+      <dd>Undo the last change to the selection, or if there are no
+      selection-only changes at the top of the history, undo the last
+      change.</dd>
+
+      <dt class=command id=command_redoSelection><code><strong>redoSelection</strong></code><span class=keybinding>Alt-U (PC), Shift-Cmd-U (Mac)</span></dt>
+      <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)</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>
+      <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), Cmd-Left (Mac), Ctrl-A (Mac)</span></dt>
+      <dd>Move the cursor to the start of the line.</dd>
+
+      <dt class=command id=command_goLineStartSmart><code><strong>goLineStartSmart</strong></code><span class=keybinding>Home</span></dt>
+      <dd>Move to the start of the text on the line, or if we are
+      already there, to the actual start of the line (including
+      whitespace).</dd>
+
+      <dt class=command id=command_goLineEnd><code><strong>goLineEnd</strong></code><span class=keybinding>Alt-Right (PC), Cmd-Right (Mac), Ctrl-E (Mac)</span></dt>
+      <dd>Move the cursor to the end of the line.</dd>
+
+      <dt class=command id=command_goLineLeft><code><strong>goLineLeft</strong></code></dt>
+      <dd>Move the cursor to the left side of the visual line it is on. If
+      this line is wrapped, that may not be the start of the line.</dd>
+
+      <dt class=command id=command_goLineRight><code><strong>goLineRight</strong></code></dt>
+      <dd>Move the cursor to the right side of the visual line it is on.</dd>
+
+      <dt class=command id=command_goLineUp><code><strong>goLineUp</strong></code><span class=keybinding>Up, Ctrl-P (Mac)</span></dt>
+      <dd>Move the cursor up one line.</dd>
+
+      <dt class=command id=command_goLineDown><code><strong>goLineDown</strong></code><span class=keybinding>Down, Ctrl-N (Mac)</span></dt>
+      <dd>Move down one line.</dd>
+
+      <dt class=command id=command_goPageUp><code><strong>goPageUp</strong></code><span class=keybinding>PageUp, Shift-Ctrl-V (Mac)</span></dt>
+      <dd>Move the cursor up one screen, and scroll up by the same distance.</dd>
+
+      <dt class=command id=command_goPageDown><code><strong>goPageDown</strong></code><span class=keybinding>PageDown, Ctrl-V (Mac)</span></dt>
+      <dd>Move the cursor down one screen, and scroll down by the same distance.</dd>
+
+      <dt class=command id=command_goCharLeft><code><strong>goCharLeft</strong></code><span class=keybinding>Left, Ctrl-B (Mac)</span></dt>
+      <dd>Move the cursor one character left, going to the previous line
+      when hitting the start of line.</dd>
+
+      <dt class=command id=command_goCharRight><code><strong>goCharRight</strong></code><span class=keybinding>Right, Ctrl-F (Mac)</span></dt>
+      <dd>Move the cursor one character right, going to the next line
+      when hitting the end of line.</dd>
+
+      <dt class=command id=command_goColumnLeft><code><strong>goColumnLeft</strong></code></dt>
+      <dd>Move the cursor one character left, but don't cross line boundaries.</dd>
+
+      <dt class=command id=command_goColumnRight><code><strong>goColumnRight</strong></code></dt>
+      <dd>Move the cursor one character right, don't cross line boundaries.</dd>
+
+      <dt class=command id=command_goWordLeft><code><strong>goWordLeft</strong></code><span class=keybinding>Alt-B (Mac)</span></dt>
+      <dd>Move the cursor to the start of the previous word.</dd>
+
+      <dt class=command id=command_goWordRight><code><strong>goWordRight</strong></code><span class=keybinding>Alt-F (Mac)</span></dt>
+      <dd>Move the cursor to the end of the next word.</dd>
+
+      <dt class=command id=command_goGroupLeft><code><strong>goGroupLeft</strong></code><span class=keybinding>Ctrl-Left (PC), Alt-Left (Mac)</span></dt>
+      <dd>Move to the left of the group before the cursor. A group is
+      a stretch of word characters, a stretch of punctuation
+      characters, a newline, or a stretch of <em>more than one</em>
+      whitespace character.</dd>
+
+      <dt class=command id=command_goGroupRight><code><strong>goGroupRight</strong></code><span class=keybinding>Ctrl-Right (PC), Alt-Right (Mac)</span></dt>
+      <dd>Move to the right of the group after the cursor
+      (see <a href="#command_goGroupLeft">above</a>).</dd>
+
+      <dt class=command id=command_delCharBefore><code><strong>delCharBefore</strong></code><span class=keybinding>Shift-Backspace, Ctrl-H (Mac)</span></dt>
+      <dd>Delete the character before the cursor.</dd>
+
+      <dt class=command id=command_delCharAfter><code><strong>delCharAfter</strong></code><span class=keybinding>Delete, Ctrl-D (Mac)</span></dt>
+      <dd>Delete the character after the cursor.</dd>
+
+      <dt class=command id=command_delWordBefore><code><strong>delWordBefore</strong></code><span class=keybinding>Alt-Backspace (Mac)</span></dt>
+      <dd>Delete up to the start of the word before the cursor.</dd>
+
+      <dt class=command id=command_delWordAfter><code><strong>delWordAfter</strong></code><span class=keybinding>Alt-D (Mac)</span></dt>
+      <dd>Delete up to the end of the word after the cursor.</dd>
+
+      <dt class=command id=command_delGroupBefore><code><strong>delGroupBefore</strong></code><span class=keybinding>Ctrl-Backspace (PC), Alt-Backspace (Mac)</span></dt>
+      <dd>Delete to the left of the <a href="#command_goGroupLeft">group</a> before the cursor.</dd>
+
+      <dt class=command id=command_delGroupAfter><code><strong>delGroupAfter</strong></code><span class=keybinding>Ctrl-Delete (PC), Ctrl-Alt-Backspace (Mac), Alt-Delete (Mac)</span></dt>
+      <dd>Delete to the start of the <a href="#command_goGroupLeft">group</a> after the cursor.</dd>
+
+      <dt class=command id=command_indentAuto><code><strong>indentAuto</strong></code><span class=keybinding>Shift-Tab</span></dt>
+      <dd>Auto-indent the current line or selection.</dd>
+
+      <dt class=command id=command_indentMore><code><strong>indentMore</strong></code><span class=keybinding>Ctrl-] (PC), Cmd-] (Mac)</span></dt>
+      <dd>Indent the current line or selection by one <a href="#option_indentUnit">indent unit</a>.</dd>
+
+      <dt class=command id=command_indentLess><code><strong>indentLess</strong></code><span class=keybinding>Ctrl-[ (PC), Cmd-[ (Mac)</span></dt>
+      <dd>Dedent the current line or selection by one <a href="#option_indentUnit">indent unit</a>.</dd>
+
+      <dt class=command id=command_insertTab><code><strong>insertTab</strong></code></dt>
+      <dd>Insert a tab character at the cursor.</dd>
+
+      <dt class=command id=command_defaultTab><code><strong>defaultTab</strong></code><span class=keybinding>Tab</span></dt>
+      <dd>If something is selected, indent it by
+      one <a href="#option_indentUnit">indent unit</a>. If nothing is
+      selected, insert a tab character.</dd>
+
+      <dt class=command id=command_transposeChars><code><strong>transposeChars</strong></code><span class=keybinding>Ctrl-T (Mac)</span></dt>
+      <dd>Swap the characters before and after the cursor.</dd>
+
+      <dt class=command id=command_newlineAndIndent><code><strong>newlineAndIndent</strong></code><span class=keybinding>Enter</span></dt>
+      <dd>Insert a newline and auto-indent the new line.</dd>
+
+      <dt class=command id=command_toggleOverwrite><code><strong>toggleOverwrite</strong></code><span class=keybinding>Insert</span></dt>
+      <dd>Flip the <a href="#toggleOverwrite">overwrite</a> flag.</dd>
+
+      <dt class=command id=command_save><code><strong>save</strong></code><span class=keybinding>Ctrl-S (PC), Cmd-S (Mac)</span></dt>
+      <dd>Not defined by the core library, only referred to in
+      key maps. Intended to provide an easy way for user code to define
+      a save command.</dd>
+
+      <dt class=command id=command_find><code><strong>find</strong></code><span class=keybinding>Ctrl-F (PC), Cmd-F (Mac)</span></dt>
+      <dt class=command id=command_findNext><code><strong>findNext</strong></code><span class=keybinding>Ctrl-G (PC), Cmd-G (Mac)</span></dt>
+      <dt class=command id=command_findPrev><code><strong>findPrev</strong></code><span class=keybinding>Shift-Ctrl-G (PC), Shift-Cmd-G (Mac)</span></dt>
+      <dt class=command id=command_replace><code><strong>replace</strong></code><span class=keybinding>Shift-Ctrl-F (PC), Cmd-Alt-F (Mac)</span></dt>
+      <dt class=command id=command_replaceAll><code><strong>replaceAll</strong></code><span class=keybinding>Shift-Ctrl-R (PC), Shift-Cmd-Alt-F (Mac)</span></dt>
+      <dd>Not defined by the core library, but defined in
+      the <a href="#addon_search">search addon</a> (or custom client
+      addons).</dd>
+
+    </dl>
+
+</section>
+
 <section id=styling>
     <h2>Customized Styling</h2>
 
@@ -1088,7 +1272,7 @@ <h3 id="api_configuration">Configuration methods</h3>
       editor instance.</dd>
 
       <dt id="addKeyMap"><code><strong>cm.addKeyMap</strong>(map: object, bottom: boolean)</code></dt>
-      <dd>Attach an additional <a href="#keymaps">keymap</a> to the
+      <dd>Attach an additional <a href="#keymaps">key map</a> to the
       editor. This is mostly useful for addons that need to register
       some key handlers without trampling on
       the <a href="#option_extraKeys"><code>extraKeys</code></a>
@@ -1097,14 +1281,14 @@ <h3 id="api_configuration">Configuration methods</h3>
       and <a href="#option_keyMap"><code>keyMap</code></a> options,
       and between them, the maps added earlier have a lower precedence
       than those added later, unless the <code>bottom</code> argument
-      was passed, in which case they end up below other keymaps added
+      was passed, in which case they end up below other key maps added
       with this method.</dd>
       <dt id="removeKeyMap"><code><strong>cm.removeKeyMap</strong>(map: object)</code></dt>
       <dd>Disable a keymap added
       with <a href="#addKeyMap"><code>addKeyMap</code></a>. Either
-      pass in the keymap object itself, or a string, which will be
+      pass in the key map object itself, or a string, which will be
       compared against the <code>name</code> property of the active
-      keymaps.</dd>
+      key maps.</dd>
 
       <dt id="addOverlay"><code><strong>cm.addOverlay</strong>(mode: string|object, ?options: object)</code></dt>
       <dd>Enable a highlighting overlay. This is a stateless mini-mode
@@ -2161,7 +2345,7 @@ <h2>Addons</h2>
         <dd>When enabled (which is the default), the pop-up will close
         when the editor is unfocused.</dd>
         <dt><code><strong>customKeys</strong>: keymap</code></dt>
-        <dd>Allows you to provide a custom keymap of keys to be active
+        <dd>Allows you to provide a custom key map of keys to be active
         when the pop-up is active. The handlers will be called with an
         extra argument, a handle to the completion menu, which
         has <code>moveFocus(n)</code>, <code>setFocus(n)</code>, <code>pick()</code>,

From eb55df76403cb28e81df9ff3843c0201817bbd03 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Feb 2014 10:52:35 +0100
Subject: [PATCH 0991/4742] [python mode] Also highlight the cls variable

Closes #2275
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 71230beedd..2a7445209a 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -151,7 +151,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             return 'builtin';
         }
 
-        if (stream.match(/^self\b/)) {
+        if (stream.match(/^(self|cls)\b/)) {
             return "variable-2";
         }
 

From 846e7b6e48a9a28e22199a294704db9414a349a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Feb 2014 18:05:21 +0100
Subject: [PATCH 0992/4742] [sublime keymap] Add

---
 demo/multiselect.html |  55 ------
 demo/sublime.html     |  73 ++++++++
 doc/compress.html     |   2 +-
 keymap/multiselect.js |  49 ------
 keymap/sublime.js     | 390 ++++++++++++++++++++++++++++++++++++++++++
 keymap/vim.js         |   4 +-
 test/index.html       |   2 +
 test/sublime_test.js  | 232 +++++++++++++++++++++++++
 8 files changed, 700 insertions(+), 107 deletions(-)
 delete mode 100644 demo/multiselect.html
 create mode 100644 demo/sublime.html
 delete mode 100644 keymap/multiselect.js
 create mode 100644 keymap/sublime.js
 create mode 100644 test/sublime_test.js

diff --git a/demo/multiselect.html b/demo/multiselect.html
deleted file mode 100644
index aff0aebeb8..0000000000
--- a/demo/multiselect.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Multiple Selection Keybinding Demo</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/search/searchcursor.js"></script>
-<script src="../keymap/multiselect.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"><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/marijnh/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Multiselect Bindings</a>
-  </ul>
-</div>
-
-<article>
-<h2>Multiple Selection Keybindings</h2>
-
-<form><textarea id="code" name="code">abcdefghijkl
-abcdefghijkl
-abcdefghijkl
-abcdefghijkl
-
-Shift-Ctrl-L / Shift-Cmd-L:
-  Split the current selection into multiple selections, by line.
-
-Ctrl-D / Cmd-D:
-  Add next occurrence of current selection as another selection.
-
-Esc:
-  Deselect all but the primary selection.
-
-Alt-F:
-  Select the parts of the current selection that match a given query.
-</textarea>
-
-<script>
-editor = CodeMirror.fromTextArea(document.getElementById("code"));
-</script>
-
-<p>Demonstrates the extra bindings provided by
-the <a href="../keymap/multiselect.js">multiselect</a> addon.</p>
-
-</article>
diff --git a/demo/sublime.html b/demo/sublime.html
new file mode 100644
index 0000000000..3b72927ca1
--- /dev/null
+++ b/demo/sublime.html
@@ -0,0 +1,73 @@
+<!doctype html>
+
+<title>CodeMirror: Sublime Text bindings demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/fold/foldgutter.css">
+<link rel="stylesheet" href="../addon/dialog/dialog.css">
+<link rel="stylesheet" href="../theme/monokai.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../addon/search/searchcursor.js"></script>
+<script src="../addon/search/search.js"></script>
+<script src="../addon/dialog/dialog.js"></script>
+<script src="../addon/edit/matchbrackets.js"></script>
+<script src="../addon/edit/closebrackets.js"></script>
+<script src="../addon/comment/comment.js"></script>
+<script src="../addon/wrap/hardwrap.js"></script>
+<script src="../addon/fold/foldcode.js"></script>
+<script src="../addon/fold/brace-fold.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../keymap/sublime.js"></script>
+<style type="text/css">
+  .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee; line-height: 1.3; height: 500px}
+  .CodeMirror-linenumbers { padding: 0 8px; }
+</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Sublime bindings</a>
+  </ul>
+</div>
+
+<article>
+<h2>Sublime Text bindings demo</h2>
+
+<p>The <code>sublime</code> keymap defines many Sublime Text-specific
+bindings for CodeMirror. See the code below for an overview.</p>
+
+<p>(A lot of the search functionality is still missing.)</p>
+
+<script>
+  var value = "// The bindings defined specifically in the Sublime Text mode\nvar bindings = {\n";
+  var map = CodeMirror.keyMap.sublime, mapK = CodeMirror.keyMap["sublime-Ctrl-K"];
+  for (var key in map) {
+    if (key != "Ctrl-K" && key != "fallthrough" && !/find/.test(map[key]))
+      value += "  \"" + key + "\": \"" + map[key] + "\",\n";
+  }
+  for (var key in mapK) {
+    if (key != "auto" && key != "nofallthrough")
+      value += "  \"Ctrl-K " + key + "\": \"" + mapK[key] + "\",\n";
+  }
+  value += "}\n\n// The implementation of joinLines\n";
+  value += CodeMirror.commands.joinLines.toString().replace(/^function\s*\(/, "function joinLines(").replace(/\n  /g, "\n") + "\n";
+  var editor = CodeMirror(document.body.getElementsByTagName("article")[0], {
+    value: value,
+    lineNumbers: true,
+    mode: "javascript",
+    keyMap: "sublime",
+    autoCloseBrackets: true,
+    matchBrackets: true,
+    showCursorWhenSelecting: true,
+    theme: "monokai"
+  });
+</script>
+
+</article>
diff --git a/doc/compress.html b/doc/compress.html
index b6f6e7a81a..675aebfc47 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -207,8 +207,8 @@ <h2>Script compression helper</h2>
         </optgroup>
         <optgroup label="Keymaps">
           <option value="http://codemirror.net/keymap/emacs.js">emacs.js</option>
+          <option value="http://codemirror.net/keymap/sublime.js">sublime.js</option>
           <option value="http://codemirror.net/keymap/vim.js">vim.js</option>
-          <option value="http://codemirror.net/keymap/multiselect.js">multiselect.js</option>
         </optgroup>
       </select>
 
diff --git a/keymap/multiselect.js b/keymap/multiselect.js
deleted file mode 100644
index c258685ae3..0000000000
--- a/keymap/multiselect.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// A number of extra keybindings for multiple-selection handling
-// Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
-
-(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";
-
-  var pc = CodeMirror.keyMap.pcDefault, mac = CodeMirror.keyMap.macDefault;
-  var Pos = CodeMirror.Pos;
-
-  function dialog(cm, text, shortText, f) {
-    if (cm.openDialog) cm.openDialog(text, f);
-    else f(prompt(shortText, ""));
-  }
-
-  // Split selection
-  pc["Shift-Ctrl-L"] = mac["Shift-Cmd-L"] = function(cm) {
-    var ranges = [], from = cm.getCursor("from"), to = cm.getCursor("to");
-    for (var line = from.line; line <= to.line; ++line)
-      ranges.push({anchor: line == from.line ? from : Pos(line, 0),
-                   head: line == to.line ? to : Pos(line)});
-    cm.setSelections(ranges, 0);
-  };
-
-  // Add next occurrence to selection
-  pc["Ctrl-D"] = mac["Cmd-D"] = function(cm) {
-    var at = cm.getCursor("to");
-    var cur = cm.getSearchCursor(cm.getRange(cm.getCursor("from"), at), at);
-    if (!cur.findNext()) return;
-    cm.addSelection(cur.from(), cur.to());
-  };
-
-  // Select matching parts of current selection
-  var dialogText = 'Match: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp)</span>';
-  pc["Alt-F"] = mac["Alt-F"] = function(cm) {
-    if (!cm.somethingSelected()) return;
-    dialog(cm, dialogText, "Match:", function(query) {
-      var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
-      if (isRE) query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i");
-      cm.selectMatches(query);
-    });
-  };
-});
diff --git a/keymap/sublime.js b/keymap/sublime.js
new file mode 100644
index 0000000000..2941977976
--- /dev/null
+++ b/keymap/sublime.js
@@ -0,0 +1,390 @@
+// A rough approximation of Sublime Text's keybindings
+// Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/edit/matchbrackets"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/edit/matchbrackets"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var map = CodeMirror.keyMap.sublime = {fallthrough: "default"};
+  var cmds = CodeMirror.commands;
+  var Pos = CodeMirror.Pos;
+  var ctrl = CodeMirror.keyMap["default"] == CodeMirror.keyMap.pcDefault ? "Ctrl-" : "Cmd-";
+
+  // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that.
+  function findPosSubword(doc, start, dir) {
+    if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1));
+    var line = doc.getLine(start.line);
+    if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0));
+    var state = "start", type;
+    for (var pos = start.ch, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) {
+      var next = line.charAt(dir < 0 ? pos - 1 : pos);
+      var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o";
+      if (cat == "w" && next.toUpperCase() == next) cat = "W";
+      if (state == "start") {
+        if (cat != "o") { state = "in"; type = cat; }
+      } else if (state == "in") {
+        if (type != cat) {
+          if (type == "w" && cat == "W" && dir < 0) pos--;
+          if (type == "W" && cat == "w" && dir > 0) { type = "w"; continue; }
+          break;
+        }
+      }
+    }
+    return Pos(start.line, pos);
+  }
+
+  function moveSubword(cm, dir) {
+    cm.extendSelectionsBy(function(range) {
+      if (cm.display.shift || cm.doc.extend || range.empty())
+        return findPosSubword(cm.doc, range.head, dir);
+      else
+        return dir < 0 ? range.from() : range.to();
+    });
+  }
+
+  cmds[map["Alt-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
+  cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
+
+  cmds[map[ctrl + "Up"] = "scrollLineUp"] = function(cm) {
+    cm.scrollTo(null, cm.getScrollInfo().top - cm.defaultTextHeight());
+  };
+  cmds[map[ctrl + "Down"] = "scrollLineDown"] = function(cm) {
+    cm.scrollTo(null, cm.getScrollInfo().top + cm.defaultTextHeight());
+  };
+
+  cmds[map["Shift-" + ctrl + "L"] = "splitSelectionByLine"] = function(cm) {
+    var ranges = cm.listSelections(), lineRanges = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      for (var line = from.line; line <= to.line; ++line)
+        lineRanges.push({anchor: line == from.line ? from : Pos(line, 0),
+                         head: line == to.line ? to : Pos(line)});
+    }
+    cm.setSelections(lineRanges, 0);
+  };
+
+  map["Shift-Tab"] = "indentLess";
+
+  cmds[map[ctrl + "L"] = "selectLine"] = function(cm) {
+    var ranges = cm.listSelections(), prim = cm.getCursor(), primIndex, extended = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      if (range.head == prim) primIndex = i;
+      extended.push({anchor: Pos(range.from().line, 0),
+                     head: Pos(range.to().line + 1, 0)});
+    }
+    cm.setSelections(extended, primIndex);
+  };
+
+  cmds[map[ctrl + "D"] = "selectNextOccurrence"] = function(cm) {
+    var at = cm.getCursor("to");
+    var cur = cm.getSearchCursor(cm.getRange(cm.getCursor("from"), at), at);
+    if (!cur.findNext()) return;
+    cm.addSelection(cur.from(), cur.to());
+  };
+
+  var mirror = "(){}[]";
+  function selectBetweenBrackets(cm) {
+    var pos = cm.getCursor(), opening = cm.scanForBracket(pos, -1);
+    if (!opening) return;
+    for (;;) {
+      var closing = cm.scanForBracket(pos, 1);
+      if (!closing) return;
+      if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) {
+        cm.setSelection(Pos(opening.pos.line, opening.pos.ch + 1), closing.pos, false);
+        return true;
+      }
+      pos = Pos(closing.pos.line, closing.pos.ch + 1);
+    }
+  }
+
+  cmds[map["Shift-" + ctrl + "Space"] = "selectScope"] = function(cm) {
+    selectBetweenBrackets(cm) || cm.execCommand("selectAll");
+  };
+  cmds[map["Shift-" + ctrl + "M"] = "selectBetweenBrackets"] = function(cm) {
+    if (!selectBetweenBrackets(cm)) return CodeMirror.Pass;
+  };
+
+  cmds[map[ctrl + "M"] = "goToBracket"] = function(cm) {
+    cm.extendSelectionsBy(function(range) {
+      var next = cm.scanForBracket(range.head, 1);
+      if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos;
+      var prev = cm.scanForBracket(range.head, -1);
+      return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head;
+    });
+  };
+
+  cmds[map["Shift-" + ctrl + "Up"] = "swapLineUp"] = function(cm) {
+    var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], from = range.from().line - 1, to = range.to().line;
+      if (from > at) linesToMove.push(from, to);
+      else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
+      at = to;
+    }
+    cm.operation(function() {
+      for (var i = 0; i < linesToMove.length; i += 2) {
+        var from = linesToMove[i], to = linesToMove[i + 1];
+        var line = cm.getLine(from);
+        cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0));
+        cm.replaceRange(line + "\n", Pos(to, 0));
+      }
+    });
+  };
+
+  cmds[map["Shift-" + ctrl + "Down"] = "swapLineDown"] = function(cm) {
+    var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var range = ranges[i], from = range.to().line + 1, to = range.from().line;
+      if (from < at) linesToMove.push(from, to);
+      else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
+      at = to;
+    }
+    cm.operation(function() {
+      for (var i = linesToMove.length - 2; i >= 0; i -= 2) {
+        var from = linesToMove[i], to = linesToMove[i + 1];
+        var line = cm.getLine(from);
+        if (from == cm.lastLine())
+          cm.replaceRange("", Pos(from - 1), Pos(from));
+        else
+          cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0));
+        cm.replaceRange(line + "\n", Pos(to, 0));
+      }
+    });
+  };
+
+  map[ctrl + "/"] = "toggleComment";
+
+  cmds[map[ctrl + "J"] = "joinLines"] = function(cm) {
+    var ranges = cm.listSelections(), joined = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], from = range.from();
+      var start = from.line, end = range.to().line;
+      while (i < ranges.length - 1 && ranges[i + 1].from().line == end)
+        end = ranges[++i].to().line;
+      joined.push({start: start, end: end, anchor: !range.empty() && from});
+    }
+    cm.operation(function() {
+      var offset = 0, ranges = [];
+      for (var i = 0; i < joined.length; i++) {
+        var obj = joined[i];
+        var anchor = obj.anchor && Pos(obj.anchor.line - offset, obj.anchor.ch), head;
+        for (var line = obj.start; line <= obj.end; line++) {
+          var actual = line - offset;
+          if (line == obj.end) head = Pos(actual, cm.getLine(actual).length + 1);
+          if (actual < cm.lastLine()) {
+            cm.replaceRange(" ", Pos(actual), Pos(actual + 1, /^\s*/.exec(cm.getLine(actual + 1))[0].length));
+            ++offset;
+          }
+        }
+        ranges.push({anchor: anchor || head, head: head});
+      }
+      cm.setSelections(ranges, 0);
+    });
+  };
+
+  cmds[map["Shift-" + ctrl + "D"] = "duplicateLine"] = function(cm) {
+    var ranges = cm.listSelections(), lines = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var start = ranges[i].from().line;
+      if (!lines.length || start > lines[lines.length - 1])
+        lines.push(start);
+    }
+    cm.operation(function() {
+      for (var i = lines.length - 1; i >= 0; i--) {
+        var line = lines[i];
+        cm.replaceRange(cm.getLine(line) + "\n", Pos(line, 0));
+      }
+    });
+  };
+
+  map[ctrl + "T"] = "transposeChars";
+
+  function sortLines(cm, caseSensitive) {
+    var ranges = cm.listSelections(), toSort = [], selected;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      if (range.empty()) continue;
+      var from = range.from().line, to = range.to().line;
+      while (i < ranges.length - 1 && ranges[i + 1].from().line == to)
+        to = range[++i].to().line;
+      toSort.push(from, to);
+    }
+    if (toSort.length) selected = true;
+    else toSort.push(cm.firstLine(), cm.lastLine());
+
+    cm.operation(function() {
+      var ranges = [];
+      for (var i = 0; i < toSort.length; i += 2) {
+        var from = toSort[i], to = toSort[i + 1];
+        var start = Pos(from, 0), end = Pos(to);
+        var lines = cm.getRange(start, end, false);
+        if (caseSensitive)
+          lines.sort();
+        else
+          lines.sort(function(a, b) {
+            var au = a.toUpperCase(), bu = b.toUpperCase();
+            if (au != bu) { a = au; b = bu; }
+            return a < b ? -1 : a == b ? 0 : 1;
+          });
+        cm.replaceRange(lines, start, end);
+        if (selected) ranges.push({anchor: start, head: end});
+      }
+      if (selected) cm.setSelections(ranges, 0);
+    });
+  }
+
+  cmds[map["F9"] = "sortLines"] = function(cm) { sortLines(cm, true); };
+  cmds[map[ctrl + "F9"] = "sortLinesInsensitive"] = function(cm) { sortLines(cm, false); };
+
+  cmds[map["F2"] = "nextBookmark"] = function(cm) {
+    var marks = cm.state.sublimeBookmarks;
+    if (marks) while (marks.length) {
+      var current = marks.shift();
+      var found = current.find();
+      if (found) {
+        marks.push(current);
+        return cm.setSelection(found.from, found.to);
+      }
+    }
+  };
+
+  cmds[map["Shift-F2"] = "prevBookmark"] = function(cm) {
+    var marks = cm.state.sublimeBookmarks;
+    if (marks) while (marks.length) {
+      marks.unshift(marks.pop());
+      var found = marks[marks.length - 1].find();
+      if (!found)
+        marks.pop();
+      else
+        return cm.setSelection(found.from, found.to);
+    }
+  };
+
+  cmds[map[ctrl + "F2"] = "toggleBookmark"] = function(cm) {
+    var ranges = cm.listSelections();
+    var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []);
+    for (var i = 0; i < ranges.length; i++) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      var found = cm.findMarks(from, to);
+      for (var j = 0; j < found.length; j++) {
+        if (found[j].sublimeBookmark) {
+          found[j].clear();
+          for (var k = 0; k < marks.length; k++)
+            if (marks[k] == found[j])
+              marks.splice(k--, 1);
+          break;
+        }
+      }
+      if (j == found.length)
+        marks.push(cm.markText(from, to, {sublimeBookmark: true, clearWhenEmpty: false}));
+    }
+  };
+
+  cmds[map["Shift-" + ctrl + "F2"] = "clearBookmarks"] = function(cm) {
+    var marks = cm.state.sublimeBookmarks;
+    if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
+    marks.length = 0;
+  };
+
+  cmds[map["Alt-F2"] = "selectBookmarks"] = function(cm) {
+    var marks = cm.state.sublimeBookmarks, ranges = [];
+    if (marks) for (var i = 0; i < marks.length; i++) {
+      var found = marks[i].find();
+      if (!found)
+        marks.splice(i--, 0);
+      else
+        ranges.push({anchor: found.from, head: found.to});
+    }
+    if (ranges.length)
+      cm.setSelections(ranges, 0);
+  };
+
+  map["Alt-Q"] = "wrapLines";
+
+  var mapK = CodeMirror.keyMap["sublime-Ctrl-K"] = {auto: "sublime", nofallthrough: true};
+
+  map[ctrl + "K"] = function(cm) {cm.setOption("keyMap", "sublime-Ctrl-K");};
+
+  function modifyWordOrSelection(cm, mod) {
+    cm.operation(function() {
+      var ranges = cm.listSelections(), indices = [], replacements = [];
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i];
+        if (range.empty()) { indices.push(i); replacements.push(""); }
+        else replacements.push(mod(cm.getRange(range.from(), range.to())));
+      }
+      cm.replaceSelections(replacements, "around");
+      for (var i = indices.length - 1, at; i >= 0; i--) {
+        var range = ranges[indices[i]];
+        if (at && CodeMirror.cmpPos(range.head, at) > 0) continue;
+        var start = range.head.ch, end = start, line = cm.getLine(range.head.line);
+        while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start;
+        while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end;
+        at = Pos(range.head.line, start);
+        cm.replaceRange(mod(line.slice(start, end)),
+                        at, Pos(range.head.line, end));
+      }
+    });
+  }
+
+  cmds[mapK[ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
+    modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
+  };
+  cmds[mapK[ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
+    modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); });
+  };
+
+  cmds[mapK[ctrl + "Space"] = "setSublimeMark"] = function(cm) {
+    if (cm.state.sublimeMark) cm.state.sublimeMark.clear();
+    cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
+  };
+  cmds[mapK[ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
+    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
+    if (found) cm.setSelection(cm.getCursor(), found);
+  };
+  cmds[mapK[ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
+    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
+    if (found) {
+      var from = cm.getCursor(), to = found;
+      if (CodeMirror.cmpPos(from, to) > 0) { var tmp = to; to = from; from = tmp; }
+      cm.state.sublimeKilled = cm.getRange(from, to);
+      cm.replaceRange("", from, to);
+    }
+  };
+  cmds[mapK[ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
+    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
+    if (found) {
+      cm.state.sublimeMark.clear();
+      cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
+      cm.setCursor(found);
+    }
+  };
+  cmds[mapK[ctrl + "Y"] = "sublimeYank"] = function(cm) {
+    if (cm.state.sublimeKilled != null)
+      cm.replaceSelection(cm.state.sublimeKilled);
+  };
+
+  mapK[ctrl + "G"] = "clearBookmarks";
+  cmds[mapK[ctrl + "C"] = "showInCenter"] = function(cm) {
+    var pos = cm.cursorCoords(null, "local");
+    cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
+  };
+
+  map["Shift-" + ctrl + "["] = "fold";
+  map["Shift-" + ctrl + "]"] = "unfold";
+  mapK[ctrl + "0"] = mapK[ctrl + "j"] = "unfoldAll";
+
+  map[ctrl + "I"] = "findIncremental";
+  map["Shift-" + ctrl + "I"] = "findIncrementalReverse";
+  map[ctrl + "H"] = "replace";
+  map["F3"] = "findNext";
+  map["Shift-F3"] = "findPrev";
+
+});
diff --git a/keymap/vim.js b/keymap/vim.js
index 590b9aff11..763dec426d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -58,9 +58,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../lib/codemirror"));
+    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../lib/codemirror"], mod);
+    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
diff --git a/test/index.html b/test/index.html
index 5f1231e366..62a9838cb3 100644
--- a/test/index.html
+++ b/test/index.html
@@ -18,6 +18,7 @@
 <script src="../mode/xml/xml.js"></script>
 <script src="../keymap/vim.js"></script>
 <script src="../keymap/emacs.js"></script>
+<script src="../keymap/sublime.js"></script>
 
 <style type="text/css">
   .ok {color: #090;}
@@ -98,6 +99,7 @@ <h2>Test Suite</h2>
     <script src="../addon/mode/multiplex_test.js"></script>
     <script src="vim_test.js"></script>
     <script src="emacs_test.js"></script>
+    <script src="sublime_test.js"></script>
     <script>
       window.onload = runHarness;
       CodeMirror.on(window, 'hashchange', runHarness);
diff --git a/test/sublime_test.js b/test/sublime_test.js
new file mode 100644
index 0000000000..b9df65e696
--- /dev/null
+++ b/test/sublime_test.js
@@ -0,0 +1,232 @@
+(function() {
+  "use strict";
+  
+  var Pos = CodeMirror.Pos;
+  namespace = "sublime_";
+
+  function stTest(name) {
+    var actions = Array.prototype.slice.call(arguments, 1);
+    testCM(name, function(cm) {
+      for (var i = 0; i < actions.length; i++) {
+        var action = actions[i];
+        if (typeof action == "string" && i == 0)
+          cm.setValue(action);
+        else if (typeof action == "string")
+          cm.execCommand(action);
+        else if (action instanceof Pos)
+          cm.setCursor(action);
+        else
+          action(cm);
+      }
+    });
+  }
+
+  function at(line, ch, msg) {
+    return function(cm) {
+      eq(cm.listSelections().length, 1);
+      eqPos(cm.getCursor("head"), Pos(line, ch), msg);
+      eqPos(cm.getCursor("anchor"), Pos(line, ch), msg);
+    };
+  }
+
+  function val(content, msg) {
+    return function(cm) { eq(cm.getValue(), content, msg); };
+  }
+
+  function argsToRanges(args) {
+    if (args.length % 4) throw new Error("Wrong number of arguments for ranges.");
+    var ranges = [];
+    for (var i = 0; i < args.length; i += 4)
+      ranges.push({anchor: Pos(args[i], args[i + 1]),
+                   head: Pos(args[i + 2], args[i + 3])});
+    return ranges;
+  }
+
+  function setSel() {
+    var ranges = argsToRanges(arguments);
+    return function(cm) { cm.setSelections(ranges, 0); };
+  }
+
+  function hasSel() {
+    var ranges = argsToRanges(arguments);
+    return function(cm) {
+      var sels = cm.listSelections();
+      if (sels.length != ranges.length)
+        throw new Failure("Expected " + ranges.length + " selections, but found " + sels.length);
+      for (var i = 0; i < sels.length; i++) {
+        eqPos(sels[i].anchor, ranges[i].anchor, "anchor " + i);
+        eqPos(sels[i].head, ranges[i].head, "head " + i);
+      }
+    };
+  }
+
+  stTest("bySubword", "the foo_bar DooDahBah \n a",
+         "goSubwordLeft", at(0, 0),
+         "goSubwordRight", at(0, 3),
+         "goSubwordRight", at(0, 7),
+         "goSubwordRight", at(0, 11),
+         "goSubwordRight", at(0, 15),
+         "goSubwordRight", at(0, 18),
+         "goSubwordRight", at(0, 21),
+         "goSubwordRight", at(0, 22),
+         "goSubwordRight", at(1, 0),
+         "goSubwordRight", at(1, 2),
+         "goSubwordRight", at(1, 2),
+         "goSubwordLeft", at(1, 1),
+         "goSubwordLeft", at(1, 0),
+         "goSubwordLeft", at(0, 22),
+         "goSubwordLeft", at(0, 18),
+         "goSubwordLeft", at(0, 15),
+         "goSubwordLeft", at(0, 12),
+         "goSubwordLeft", at(0, 8),
+         "goSubwordLeft", at(0, 4),
+         "goSubwordLeft", at(0, 0));
+
+  stTest("splitSelectionByLine", "abc\ndef\nghi",
+         setSel(0, 1, 2, 2),
+         "splitSelectionByLine",
+         hasSel(0, 1, 0, 3,
+                1, 0, 1, 3,
+                2, 0, 2, 2));
+
+  stTest("splitSelectionByLineMulti", "abc\ndef\nghi\njkl",
+         setSel(0, 1, 1, 1,
+                1, 2, 3, 2,
+                3, 3, 3, 3),
+         "splitSelectionByLine",
+         hasSel(0, 1, 0, 3,
+                1, 0, 1, 1,
+                1, 2, 1, 3,
+                2, 0, 2, 3,
+                3, 0, 3, 2,
+                3, 3, 3, 3));
+
+  stTest("selectLine", "abc\ndef\nghi",
+         setSel(0, 1, 0, 1,
+                2, 0, 2, 1),
+         "selectLine",
+         hasSel(0, 0, 1, 0,
+                2, 0, 2, 3),
+         setSel(0, 1, 1, 0),
+         "selectLine",
+         hasSel(0, 0, 2, 0));
+
+  stTest("selectNextOccurrence", "a foo bar\nfoo foo",
+         setSel(0, 2, 0, 5),
+         "selectNextOccurrence",
+         hasSel(0, 2, 0, 5,
+                1, 0, 1, 3),
+         "selectNextOccurrence",
+         hasSel(0, 2, 0, 5,
+                1, 0, 1, 3,
+                1, 4, 1, 7),
+         "selectNextOccurrence",
+         hasSel(0, 2, 0, 5,
+                1, 0, 1, 3,
+                1, 4, 1, 7));
+
+  stTest("selectScope", "foo(a) {\n  bar[1, 2];\n}",
+         "selectScope", hasSel(0, 0, 2, 1),
+         Pos(0, 4), "selectScope", hasSel(0, 4, 0, 5),
+         Pos(0, 5), "selectScope", hasSel(0, 4, 0, 5),
+         Pos(0, 6), "selectScope", hasSel(0, 0, 2, 1),
+         Pos(0, 8), "selectScope", hasSel(0, 8, 2, 0),
+         Pos(1, 2), "selectScope", hasSel(0, 8, 2, 0),
+         Pos(1, 6), "selectScope", hasSel(1, 6, 1, 10),
+         Pos(1, 9), "selectScope", hasSel(1, 6, 1, 10));
+
+  stTest("goToBracket", "foo(a) {\n  bar[1, 2];\n}",
+         Pos(0, 0), "goToBracket", at(0, 0),
+         Pos(0, 4), "goToBracket", at(0, 5), "goToBracket", at(0, 4),
+         Pos(0, 8), "goToBracket", at(2, 0), "goToBracket", at(0, 8),
+         Pos(1, 2), "goToBracket", at(2, 0),
+         Pos(1, 7), "goToBracket", at(1, 10), "goToBracket", at(1, 6));
+
+  stTest("swapLine", "1\n2\n3---\n4\n5",
+         "swapLineDown", val("2\n1\n3---\n4\n5"),
+         "swapLineUp", val("1\n2\n3---\n4\n5"),
+         "swapLineUp", val("1\n2\n3---\n4\n5"),
+         Pos(4, 1), "swapLineDown", val("1\n2\n3---\n4\n5"),
+         setSel(0, 1, 0, 1,
+                1, 0, 2, 0,
+                2, 2, 2, 2),
+         "swapLineDown", val("4\n1\n2\n3---\n5"),
+         hasSel(1, 1, 1, 1,
+                2, 0, 3, 0,
+                3, 2, 3, 2),
+         "swapLineUp", val("1\n2\n3---\n4\n5"),
+         hasSel(0, 1, 0, 1,
+                1, 0, 2, 0,
+                2, 2, 2, 2));
+
+  stTest("joinLines", "abc\ndef\nghi\njkl",
+         "joinLines", val("abc def\nghi\njkl"), at(0, 4),
+         "undo",
+         setSel(0, 2, 1, 1), "joinLines",
+         val("abc def ghi\njkl"), hasSel(0, 2, 0, 8),
+         "undo",
+         setSel(0, 1, 0, 1,
+                1, 1, 1, 1,
+                3, 1, 3, 1), "joinLines",
+         val("abc def ghi\njkl"), hasSel(0, 4, 0, 4,
+                                         0, 8, 0, 8,
+                                         1, 3, 1, 3));
+
+  stTest("duplicateLine", "abc\ndef\nghi",
+         Pos(1, 0), "duplicateLine", val("abc\ndef\ndef\nghi"), at(2, 0),
+         "undo",
+         setSel(0, 1, 0, 1,
+                1, 1, 1, 1,
+                2, 1, 2, 1), "duplicateLine",
+         val("abc\nabc\ndef\ndef\nghi\nghi"), hasSel(1, 1, 1, 1,
+                                                     3, 1, 3, 1,
+                                                     5, 1, 5, 1));
+  stTest("sortLines", "c\nb\na\nC\nB\nA",
+         "sortLines", val("A\nB\nC\na\nb\nc"),
+         "undo",
+         setSel(0, 0, 2, 0,
+                3, 0, 5, 0),
+         "sortLines", val("a\nb\nc\nA\nB\nC"),
+         hasSel(0, 0, 2, 1,
+                3, 0, 5, 1),
+         "undo",
+         setSel(1, 0, 4, 0), "sortLinesInsensitive", val("c\na\nB\nb\nC\nA"));
+
+  stTest("bookmarks", "abc\ndef\nghi\njkl",
+         Pos(0, 1), "toggleBookmark",
+         setSel(1, 1, 1, 2), "toggleBookmark",
+         setSel(2, 1, 2, 2), "toggleBookmark",
+         "nextBookmark", hasSel(0, 1, 0, 1),
+         "nextBookmark", hasSel(1, 1, 1, 2),
+         "nextBookmark", hasSel(2, 1, 2, 2),
+         "prevBookmark", hasSel(1, 1, 1, 2),
+         "prevBookmark", hasSel(0, 1, 0, 1),
+         "prevBookmark", hasSel(2, 1, 2, 2),
+         "prevBookmark", hasSel(1, 1, 1, 2),
+         "toggleBookmark",
+         "prevBookmark", hasSel(2, 1, 2, 2),
+         "prevBookmark", hasSel(0, 1, 0, 1),
+         "selectBookmarks", hasSel(0, 1, 0, 1,
+                                   2, 1, 2, 2),
+         "clearBookmarks",
+         Pos(0, 0), "selectBookmarks", at(0, 0));
+
+  stTest("upAndDowncaseAtCursor", "abc\ndef  x\nghI",
+         setSel(0, 1, 0, 3,
+                1, 1, 1, 1,
+                1, 4, 1, 4), "upcaseAtCursor",
+         val("aBC\nDEF  x\nghI"), hasSel(0, 1, 0, 3,
+                                         1, 3, 1, 3,
+                                         1, 4, 1, 4),
+         "downcaseAtCursor",
+         val("abc\ndef  x\nghI"), hasSel(0, 1, 0, 3,
+                                         1, 3, 1, 3,
+                                         1, 4, 1, 4));
+
+  stTest("mark", "abc\ndef\nghi",
+         Pos(1, 1), "setSublimeMark",
+         Pos(2, 1), "selectToSublimeMark", hasSel(2, 1, 1, 1),
+         Pos(0, 1), "swapWithSublimeMark", at(1, 1), "swapWithSublimeMark", at(0, 1),
+         "deleteToSublimeMark", val("aef\nghi"),
+         "sublimeYank", val("abc\ndef\nghi"), at(1, 1));
+})();

From 98326d16a1a9fc6e399c9e55bba2f544c1c70731 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Feb 2014 22:32:30 +0100
Subject: [PATCH 0993/4742] [matchbrackets addon] Export scanForBracket method

---
 addon/edit/matchbrackets.js | 61 ++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index dcdee7516b..576ec143aa 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -12,49 +12,51 @@
   var Pos = CodeMirror.Pos;
 
   var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
-  function findMatchingBracket(cm, where, strict) {
-    var state = cm.state.matchBrackets;
-    var maxScanLen = (state && state.maxScanLineLength) || 10000;
-    var maxScanLines = (state && state.maxScanLines) || 100;
 
+  function findMatchingBracket(cm, where, strict, config) {
     var line = cm.getLineHandle(where.line), pos = where.ch - 1;
     var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
     if (!match) return null;
-    var forward = match.charAt(1) == ">", d = forward ? 1 : -1;
-    if (strict && forward != (pos == where.ch)) return null;
+    var dir = match.charAt(1) == ">" ? 1 : -1;
+    if (strict && (dir > 0) != (pos == where.ch)) return null;
     var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
-    var stack = [line.text.charAt(pos)], re = /[(){}[\]]/;
-    function scan(line, lineNo, start) {
-      if (!line.text) return;
-      var pos = forward ? 0 : line.text.length - 1, end = forward ? line.text.length : -1;
-      if (line.text.length > maxScanLen) return null;
-      if (start != null) pos = start + d;
-      for (; pos != end; pos += d) {
-        var ch = line.text.charAt(pos);
-        if (re.test(ch) && cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style) {
+    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
+    return {from: Pos(where.line, pos), to: found && found.pos,
+            match: found && found.ch == match.charAt(0), forward: dir > 0};
+  }
+
+  function scanForBracket(cm, where, dir, style, config) {
+    var maxScanLen = (config && config.maxScanLineLength) || 10000;
+    var maxScanLines = (config && config.maxScanLines) || 500;
+
+    var stack = [], re = /[(){}[\]]/;
+    var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
+                          : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
+    for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
+      var line = cm.getLine(lineNo);
+      if (!line) continue;
+      var pos = dir > 0 ? 0 : line.length - 1, end = dir > 0 ? line.length : -1;
+      if (line.length > maxScanLen) continue;
+      if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0);
+      for (; pos != end; pos += dir) {
+        var ch = line.charAt(pos);
+        if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) {
           var match = matching[ch];
-          if (match.charAt(1) == ">" == forward) stack.push(ch);
-          else if (stack.pop() != match.charAt(0)) return {pos: pos, match: false};
-          else if (!stack.length) return {pos: pos, match: true};
+          if ((match.charAt(1) == ">") == (dir > 0)) stack.push(ch);
+          else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch};
+          else stack.pop();
         }
       }
     }
-    for (var i = where.line, found, e = forward ? Math.min(i + maxScanLines, cm.lineCount()) : Math.max(-1, i - maxScanLines); i != e; i+=d) {
-      if (i == where.line) found = scan(line, i, pos);
-      else found = scan(cm.getLineHandle(i), i);
-      if (found) break;
-    }
-    return {from: Pos(where.line, pos), to: found && Pos(i, found.pos),
-            match: found && found.match, forward: forward};
   }
 
-  function matchBrackets(cm, autoclear) {
+  function matchBrackets(cm, autoclear, config) {
     // Disable brace matching in long lines, since it'll cause hugely slow updates
     var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
     var marks = [], ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
-      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head);
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config);
       if (match && cm.getLine(match.from.line).length <= maxHighlightLen &&
           match.to && cm.getLine(match.to.line).length <= maxHighlightLen) {
         var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
@@ -83,7 +85,7 @@
   function doMatchBrackets(cm) {
     cm.operation(function() {
       if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
-      currentlyHighlighted = matchBrackets(cm, false);
+      currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
     });
   }
 
@@ -100,4 +102,7 @@
   CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
     return findMatchingBracket(this, pos, strict);
   });
+  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style){
+    return scanForBracket(this, pos, dir, style);
+  });
 });

From 1a4186f321c0b4de3dd8358dbacd83d68ed26076 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Feb 2014 13:53:45 +0100
Subject: [PATCH 0994/4742] [hardwrap addon] Add wrapLine command

---
 addon/wrap/hardwrap.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index f900d6e81b..87aab1b8f6 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -96,6 +96,24 @@
     return wrapRange(this, Pos(para.from, 0), Pos(para.to - 1), options);
   });
 
+  CodeMirror.commands.wrapLines = function(cm) {
+    cm.operation(function() {
+      var ranges = cm.listSelections(), at = cm.lastLine() + 1;
+      for (var i = ranges.length - 1; i >= 0; i--) {
+        var range = ranges[i], span;
+        if (range.empty()) {
+          var para = findParagraph(cm, range.head, {});
+          span = {from: Pos(para.from, 0), to: Pos(para.to - 1)};
+        } else {
+          span = {from: range.from(), to: range.to()};
+        }
+        if (span.to.line >= at) continue;
+        at = span.from.line;
+        wrapRange(cm, span.from, span.to, {});
+      }
+    });
+  };
+
   CodeMirror.defineExtension("wrapRange", function(from, to, options) {
     return wrapRange(this, from, to, options || {});
   });

From de327de31501829b93bac007dfe03ef04e4493e0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Feb 2014 15:45:23 +0100
Subject: [PATCH 0995/4742] [foldcode addon] Add more commands

---
 addon/fold/foldcode.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 7f89c431fd..d7a0bb5e2d 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -75,9 +75,27 @@
       if (marks[i].__isFold) return true;
   });
 
-  CodeMirror.commands.fold = function(cm) {
+  CodeMirror.commands.toggleFold = function(cm) {
     cm.foldCode(cm.getCursor());
   };
+  CodeMirror.commands.fold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "fold");
+  };
+  CodeMirror.commands.unfold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "unfold");
+  };
+  CodeMirror.commands.foldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
+    });
+  };
+  CodeMirror.commands.unfoldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
+    });
+  };
 
   CodeMirror.registerHelper("fold", "combine", function() {
     var funcs = Array.prototype.slice.call(arguments, 0);

From 192fd6494b51609a55d1642a39745d8eeb435e76 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Feb 2014 15:50:08 +0100
Subject: [PATCH 0996/4742] Add note about Sublime Text keymap to docs

---
 demo/sublime.html | 8 +++++++-
 doc/manual.html   | 4 ++++
 index.html        | 3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/demo/sublime.html b/demo/sublime.html
index 3b72927ca1..d942cc4409 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -43,7 +43,13 @@ <h2>Sublime Text bindings demo</h2>
 <p>The <code>sublime</code> keymap defines many Sublime Text-specific
 bindings for CodeMirror. See the code below for an overview.</p>
 
-<p>(A lot of the search functionality is still missing.)</p>
+<p>Enable the keymap by
+loading <a href="../keymap/sublime.js"><code>keymap/sublime.js</code></a>
+and setting
+the <a href="../doc/manual.html#option_keyMap"><code>keyMap</code></a>
+option to <code>"sublime"</code>.</p>
+
+<p>(A lot of the search functionality is still missing.)
 
 <script>
   var value = "// The bindings defined specifically in the Sublime Text mode\nvar bindings = {\n";
diff --git a/doc/manual.html b/doc/manual.html
index 7fab648bd8..c33250591b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -686,6 +686,10 @@ <h2>Key Maps</h2>
     is an object mapping strings that identify the keys to functions
     that implement their functionality.</p>
 
+    <p>The CodeMirror distributions comes
+    with <a href="../demo/emacs.html">Emacs</a>, <a href="../demo/vim.html">Vim</a>,
+    and <a href="../demo/sublime.html">Sublime Text</a>-style keymaps.</p>
+
     <p>Keys are identified either by name or by character.
     The <code>CodeMirror.keyNames</code> object defines names for
     common keys and associates them with their key codes. Examples of
diff --git a/index.html b/index.html
index 72f8245eda..9ec9b8017e 100644
--- a/index.html
+++ b/index.html
@@ -71,6 +71,7 @@ <h2>This is CodeMirror</h2>
     <option value="demo/search.html">Search interface</option>
     <option value="demo/vim.html">Vim bindings</option>
     <option value="demo/emacs.html">Emacs bindings</option>
+    <option value="demo/sublime.html">Sublime Text bindings</option>
     <option value="demo/tern.html">Tern integration</option>
     <option value="demo/merge.html">Merge/diff interface</option>
     <option value="demo/fullscreen.html">Full-screen editor</option>
@@ -121,7 +122,7 @@ <h2>Features</h2>
     <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>
     <li><a href="doc/manual.html#option_extraKeys">Configurable</a> keybindings
-    <li><a href="demo/vim.html">Vim</a> and <a href="demo/emacs.html">Emacs</a> bindings
+    <li><a href="demo/vim.html">Vim</a>, <a href="demo/emacs.html">Emacs</a>, and <a href="demo/sublime.html">Sublime Text</a> bindings
     <li><a href="doc/manual.html#addon_search">Search and replace</a> interface
     <li><a href="doc/manual.html#addon_matchbrackets">Bracket</a> and <a href="doc/manual.html#addon_matchtags">tag</a> matching
     <li>Support for <a href="demo/buffers.html">split views</a>

From e9cc1e22e80cd22f2da41c42483eeaedffb36d20 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Feb 2014 16:25:06 +0100
Subject: [PATCH 0997/4742] [sublime keymap] Add by-word mode to
 selectNextOccurrence

---
 keymap/sublime.js    | 35 +++++++++++++++++++++++++----------
 lib/codemirror.js    |  4 ++--
 test/sublime_test.js | 27 +++++++++++++++------------
 3 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 2941977976..c171f5f387 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -82,11 +82,29 @@
     cm.setSelections(extended, primIndex);
   };
 
+  function wordAt(cm, pos) {
+    var start = pos.ch, end = start, line = cm.getLine(pos.line);
+    while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start;
+    while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end;
+    return {from: Pos(pos.line, start), to: Pos(pos.line, end), word: line.slice(start, end)};
+  }
+
   cmds[map[ctrl + "D"] = "selectNextOccurrence"] = function(cm) {
-    var at = cm.getCursor("to");
-    var cur = cm.getSearchCursor(cm.getRange(cm.getCursor("from"), at), at);
-    if (!cur.findNext()) return;
-    cm.addSelection(cur.from(), cur.to());
+    var from = cm.getCursor("from"), to = cm.getCursor("to");
+    var fullWord = cm.state.sublimeFindFullWord == cm.doc.sel;
+    if (CodeMirror.cmpPos(from, to) == 0) {
+      var word = wordAt(cm, from);
+      if (!word.word) return;
+      cm.setSelection(word.from, word.to);
+      fullWord = true;
+    } else {
+      var query = cm.getRange(from, to);
+      var cur = cm.getSearchCursor(fullWord ? new RegExp("\\b" + query + "\\b") : query, to);
+      if (cur.findNext())
+        cm.addSelection(cur.from(), cur.to());
+    }
+    if (fullWord)
+      cm.state.sublimeFindFullWord = cm.doc.sel;
   };
 
   var mirror = "(){}[]";
@@ -324,12 +342,9 @@
       for (var i = indices.length - 1, at; i >= 0; i--) {
         var range = ranges[indices[i]];
         if (at && CodeMirror.cmpPos(range.head, at) > 0) continue;
-        var start = range.head.ch, end = start, line = cm.getLine(range.head.line);
-        while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start;
-        while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end;
-        at = Pos(range.head.line, start);
-        cm.replaceRange(mod(line.slice(start, end)),
-                        at, Pos(range.head.line, end));
+        var word = wordAt(cm, range.head);
+        at = word.from;
+        cm.replaceRange(mod(word.word), word.from, word.to);
       }
     });
   }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 576817f90a..a2ee5b7758 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6024,10 +6024,10 @@
       if (primary == null) primary = ranges.length - 1;
       setSelection(this, normalizeSelection(out, primary), scroll);
     }),
-    addSelection: docMethodOp(function(anchor, head) {
+    addSelection: docMethodOp(function(anchor, head, scroll) {
       var ranges = this.sel.ranges.slice(0);
       ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
-      setSelection(this, normalizeSelection(ranges, ranges.length - 1), false);
+      setSelection(this, normalizeSelection(ranges, ranges.length - 1), scroll);
     }),
 
     getSelection: function(lineSep) {
diff --git a/test/sublime_test.js b/test/sublime_test.js
index b9df65e696..639b640043 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -111,19 +111,22 @@
          "selectLine",
          hasSel(0, 0, 2, 0));
 
-  stTest("selectNextOccurrence", "a foo bar\nfoo foo",
+  stTest("selectNextOccurrence", "a foo bar\nfoobar foo",
          setSel(0, 2, 0, 5),
-         "selectNextOccurrence",
-         hasSel(0, 2, 0, 5,
-                1, 0, 1, 3),
-         "selectNextOccurrence",
-         hasSel(0, 2, 0, 5,
-                1, 0, 1, 3,
-                1, 4, 1, 7),
-         "selectNextOccurrence",
-         hasSel(0, 2, 0, 5,
-                1, 0, 1, 3,
-                1, 4, 1, 7));
+         "selectNextOccurrence", hasSel(0, 2, 0, 5,
+                                        1, 0, 1, 3),
+         "selectNextOccurrence", hasSel(0, 2, 0, 5,
+                                        1, 0, 1, 3,
+                                        1, 7, 1, 10),
+         "selectNextOccurrence", hasSel(0, 2, 0, 5,
+                                        1, 0, 1, 3,
+                                        1, 7, 1, 10),
+         Pos(0, 3), "selectNextOccurrence", hasSel(0, 2, 0, 5),
+        "selectNextOccurrence", hasSel(0, 2, 0, 5,
+                                       1, 7, 1, 10),
+         setSel(0, 6, 0, 9),
+         "selectNextOccurrence", hasSel(0, 6, 0, 9,
+                                        1, 3, 1, 6));
 
   stTest("selectScope", "foo(a) {\n  bar[1, 2];\n}",
          "selectScope", hasSel(0, 0, 2, 1),

From b0ce795ff0048591b37f7f97cde11b50580d69bf Mon Sep 17 00:00:00 2001
From: Narciso Jaramillo <njaramil@adobe.com>
Date: Wed, 19 Feb 2014 19:04:06 -0800
Subject: [PATCH 0998/4742] Always check/restore focus around call to
 `patchDisplay()`

Prevents focus loss in line widgets when they're updated.
---
 lib/codemirror.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a2ee5b7758..6a68b103ee 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -609,17 +609,13 @@
 
     // For big changes, we hide the enclosing element during the
     // update, since that speeds up the operations on most browsers.
-    if (toUpdate > 4) {
-      var focused = activeElt();
-      display.lineDiv.style.display = "none";
-    }
+    var focused = activeElt();
+    if (toUpdate > 4) display.lineDiv.style.display = "none";
     patchDisplay(cm, display.updateLineNumbers, dims);
-    if (toUpdate > 4) {
-      display.lineDiv.style.display = "";
-      // There might have been a widget with a focused element in the
-      // hidden nodes, if so re-focus it.
-      if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
-    }
+    if (toUpdate > 4) display.lineDiv.style.display = "";
+    // There might have been a widget with a focused element that got
+    // hidden or updated, if so re-focus it.
+    if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
 
     // Prevent these from interfering with the scroll size during
     // subsequent call to updateScrollbars

From d8c123eb546e20ea490ad130c19239d5bd4368be Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Feb 2014 09:07:46 +0100
Subject: [PATCH 0999/4742] Scroll cursor into view after un/redo

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6a68b103ee..2d9c3bfdb7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3261,6 +3261,7 @@
 
       var after = i ? computeSelAfterChange(doc, change, null) : lst(source);
       makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
+      if (doc.cm) ensureCursorVisible(doc.cm);
       var rebased = [];
 
       // Propagate to the linked documents

From 98bd6cf68dc3be85e32ec39fdb647aab8b3be878 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Feb 2014 09:14:09 +0100
Subject: [PATCH 1000/4742] Fix bug in estimateCoords

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2d9c3bfdb7..d8cb905ab3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1728,7 +1728,7 @@
   // Used to cheaply estimate the coordinates for a position. Used for
   // intermediate scroll updates.
   function estimateCoords(cm, pos) {
-    var left = 0;
+    var left = 0, pos = clipPos(cm.doc, pos);
     if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch;
     var lineObj = getLine(cm.doc, pos.line);
     var top = heightAtLine(lineObj) + paddingTop(cm.display);

From c1418446011e4459c83ea1a291007945f3427440 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Feb 2014 11:12:35 +0100
Subject: [PATCH 1001/4742] [real-world uses] Add FF & Chrome dev tools,
 Laborate

---
 doc/realworld.html | 3 +++
 index.html         | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index 96d4df1956..d08e64f955 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -32,6 +32,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://buzz.blogger.com/2013/04/improvements-to-blogger-template-html.html">Blogger's template editor</a></li>
       <li><a href="http://bluegriffon.org/">BlueGriffon</a> (HTML editor)</li>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
+      <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
       <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>
@@ -63,6 +64,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://metacpan.org/module/Farabi">Farabi</a> (modern Perl IDE)</li>
       <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>
       <li><a href="http://fiddlesalad.com/">Fiddle Salad</a> (web development environment)</li>
+      <li><a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox Developer Tools</a></li>
       <li><a href="http://www.firepad.io">Firepad</a> (collaborative text editor)</li>
       <li><a href="https://code.google.com/p/gerrit/">Gerrit</a>'s diff view</a></li>
       <li><a href="http://tour.golang.org">Go language tour</a></li>
@@ -84,6 +86,7 @@ <h2>CodeMirror real-world uses</h2>
       <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="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>
       <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>
diff --git a/index.html b/index.html
index 72f8245eda..49c28339a4 100644
--- a/index.html
+++ b/index.html
@@ -141,11 +141,12 @@ <h2>Features</h2>
   <h2>Community</h2>
 
   <p>CodeMirror is an open-source project shared under
-  an <a href="LICENSE">MIT license</a>. It is the editor used in
-  <a href="http://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light
+  an <a href="LICENSE">MIT license</a>. It is the editor used in the
+  dev tools for
+  both <a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox</a>
+  and <a href="https://developers.google.com/chrome-developer-tools/">Chrome</a>, <a href="http://www.lighttable.com/">Light
   Table</a>, <a href="http://brackets.io/">Adobe
-  Brackets</a>, <a href="https://script.google.com/">Google Apps
-  Script</a>, <a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a>,
+  Brackets</a>, <a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a>,
   and <a href="doc/realworld.html">many other projects</a>.</p>
 
   <p>Development and bug tracking happens

From a216af9cf395c209a60fb578712bbf335a7601c2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Feb 2014 11:33:05 +0100
Subject: [PATCH 1002/4742] Force a scrollbar update when adding a visible line
 widget

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 58557263b4..be43f4b2bd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4368,6 +4368,7 @@ window.CodeMirror = (function() {
         var aboveVisible = heightAtLine(cm, line) < cm.doc.scrollTop;
         updateLineHeight(line, line.height + widgetHeight(widget));
         if (aboveVisible) addToScrollPos(cm, 0, widget.height);
+        cm.curOp.forceUpdate = true;
       }
       return true;
     });

From 54861af2b627c9c685a61a88b79728598f670cbb Mon Sep 17 00:00:00 2001
From: Frank Wiegand <wiegand@bbaw.de>
Date: Thu, 20 Feb 2014 13:19:08 +0100
Subject: [PATCH 1003/4742] add LATIN SMALL LETTER SHARP S (U+00DF) as
 nonASCIISingleCaseWordChar

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index be43f4b2bd..7f193d1d05 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5628,7 +5628,7 @@ window.CodeMirror = (function() {
     return function(){return f.apply(null, args);};
   }
 
-  var nonASCIISingleCaseWordChar = /[\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+  var nonASCIISingleCaseWordChar = /[\u00df\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
   function isWordChar(ch) {
     return /\w/.test(ch) || ch > "\x80" &&
       (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));

From 997ab42b40804cb1765e214f5344d48f39294302 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Thu, 20 Feb 2014 00:57:52 -0800
Subject: [PATCH 1004/4742] [vim] Support for \{n\}, \{n,m\} and \{n} syntax
 for counted matches in regex.

Issue #2283
---
 keymap/vim.js    | 14 ++++++++++----
 test/vim_test.js | 28 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b508d370ae..a5d6812a19 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2760,10 +2760,11 @@
     }
 
     // Translates a search string from ex (vim) syntax into javascript form.
-    // For any character in the string that matches one of the specials, adds a '\'
-    // if unescaped, or removes one if escaped.
     function fixRegex(str) {
-      var specials = ['|', '(', ')'];
+      // When these match, add a '\' if unescaped or remove one if escaped.
+      var specials = ['|', '(', ')', '{'];
+      // Remove, but never add, a '\' for these.
+      var unescape = ['}'];
       var escapeNextChar = false;
       var out = [];
       for (var i = -1; i < str.length; i++) {
@@ -2778,8 +2779,13 @@
         } else {
           if (c === '\\') {
             escapeNextChar = true;
+            // Treat the unescape list as special for removing, but not adding '\'.
+            if (unescape.indexOf(n) != -1) {
+              specialComesNext = true;
+            }
+            // Not passing this test means removing a '\'.
             if (!specialComesNext || n === '\\') {
-              out.push('\\');
+              out.push(c);
             }
           } else {
             out.push(c);
diff --git a/test/vim_test.js b/test/vim_test.js
index 38b1c37222..7fe52ae307 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -267,6 +267,7 @@ testJumplist('jumplist_skip_delted_mark<c-o>',
 testJumplist('jumplist_skip_delted_mark<c-i>',
              ['*', 'n', 'n', 'k', 'd', 'k', '<C-o>', '<C-i>', '<C-i>'],
              [1,0], [0,2]);
+
 /**
  * @param name Name of the test
  * @param keys An array of keys or a string with a single key to simulate.
@@ -1572,6 +1573,13 @@ testVim('/_case', function(cm, vim, helpers) {
   helpers.doKeys('/');
   helpers.assertCursorAt(1, 6);
 }, { value: 'match nope match \n nope Match' });
+testVim('/_2', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('\\(word\\)\\{2}');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(1, 9);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(2, 1);
+}, { value: 'word\n another wordword\n wordwordword\n' });
 testVim('/_nongreedy', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('aa');
   helpers.doKeys('/');
@@ -2412,6 +2420,26 @@ testVim('ex_substitute_multibackslash_replacement', function(cm, vim, helpers) {
   helpers.doEx('%s/,/\\\\\\\\\\\\\\\\/g'); // 16 backslashes.
   eq('one\\\\\\\\two \n three\\\\\\\\four', cm.getValue()); // 2*8 backslashes.
 }, { value: 'one,two \n three,four'});
+testVim('ex_substitute_braces_word', function(cm, vim, helpers) {
+  helpers.doEx('%s/\\(ab\\)\\{2\\}//g');
+  eq('ab abb ab{2}', cm.getValue());
+}, { value: 'ababab abb ab{2}'});
+testVim('ex_substitute_braces_range', function(cm, vim, helpers) {
+  helpers.doEx('%s/a\\{2,3\\}//g');
+  eq('a   a', cm.getValue());
+}, { value: 'a aa aaa aaaa'});
+testVim('ex_substitute_braces_literal', function(cm, vim, helpers) {
+  helpers.doEx('%s/ab{2}//g');
+  eq('ababab abb ', cm.getValue());
+}, { value: 'ababab abb ab{2}'});
+testVim('ex_substitute_braces_char', function(cm, vim, helpers) {
+  helpers.doEx('%s/ab\\{2\\}//g');
+  eq('ababab  ab{2}', cm.getValue());
+}, { value: 'ababab abb ab{2}'});
+testVim('ex_substitute_braces_no_escape', function(cm, vim, helpers) {
+  helpers.doEx('%s/ab\\{2}//g');
+  eq('ababab  ab{2}', cm.getValue());
+}, { value: 'ababab abb ab{2}'});
 testVim('ex_substitute_count', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   helpers.doEx('s/\\d/0/i 2');

From ae2647c292f310457b0722143a2aa4a4d5cc2df6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Feb 2014 20:35:16 +0100
Subject: [PATCH 1005/4742] Add the "changes" event

Issue #2281
---
 doc/manual.html   | 20 +++++++++++---------
 lib/codemirror.js |  7 +++++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index c33250591b..5ebc772497 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -477,18 +477,22 @@ <h2>Events</h2>
       that used to be between <code>from</code> and <code>to</code>,
       which is overwritten by this change.</dd>
 
+      <dt id="event_changes"><code><strong>"changes"</strong> (instance: CodeMirror, changes: array&lt;object&lt;)</dt>
+      <dd>Like the <a href="#event_change"><code>"change"</code></a>
+      event, but batched per <a href="#operation">operation</a>,
+      passing an array containing all the changes that happened in the
+      operation.</dd>
+
       <dt id="event_beforeChange"><code><strong>"beforeChange"</strong> (instance: CodeMirror, changeObj: object)</code></dt>
       <dd>This event is fired before a change is applied, and its
       handler may choose to modify or cancel the change.
       The <code>changeObj</code> object
       has <code>from</code>, <code>to</code>, and <code>text</code>
       properties, as with
-      the <a href="#event_change"><code>"change"</code></a> event, but
-      never a <code>next</code> property, since this is fired for each
-      individual change, and not batched per operation. It also has
-      a <code>cancel()</code> method, which can be called to cancel
-      the change, and, <strong>if</strong> the change isn't coming
-      from an undo or redo event, an <code>update(from, to,
+      the <a href="#event_change"><code>"change"</code></a> event. It
+      also has a <code>cancel()</code> method, which can be called to
+      cancel the change, and, <strong>if</strong> the change isn't
+      coming from an undo or redo event, an <code>update(from, to,
       text)</code> method, which may be used to modify the change.
       Undo or redo changes can't be modified, because they hold some
       metainformation for restoring old marked ranges that is only
@@ -599,9 +603,7 @@ <h2>Events</h2>
       document. <code>changeObj</code> has a similar type as the
       object passed to the
       editor's <a href="#event_change"><code>"change"</code></a>
-      event, but it never has a <code>next</code> property, because
-      document change events are not batched (whereas editor change
-      events are).</dd>
+      event.</dd>
 
       <dt id="event_doc_beforeChange"><code><strong>"beforeChange"</strong> (doc: CodeMirror.Doc, change: object)</code></dt>
       <dd>See the <a href="#event_beforeChange">description of the
diff --git a/lib/codemirror.js b/lib/codemirror.js
index d8cb905ab3..0d1de36dc3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1924,8 +1924,11 @@
       delayedCallbacks = null;
     }
     // Fire change events, and delayed event handlers
-    if (op.changeObjs) for (var i = 0; i < op.changeObjs.length; i++)
-      signal(cm, "change", cm, op.changeObjs[i]);
+    if (op.changeObjs) {
+      for (var i = 0; i < op.changeObjs.length; i++)
+        signal(cm, "change", cm, op.changeObjs[i]);
+      signal(cm, "changes", cm, op.changeObjs);
+    }
     if (op.cursorActivity) signal(cm, "cursorActivity", cm);
     if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }

From 5c27de5894471dc033b1015564ab90c337e33f6e Mon Sep 17 00:00:00 2001
From: Narciso Jaramillo <njaramil@adobe.com>
Date: Thu, 20 Feb 2014 17:52:25 -0800
Subject: [PATCH 1006/4742] Record change objects even if only 'changes' event
 has a handler

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0d1de36dc3..0d513f8b98 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3367,7 +3367,7 @@
     else
       regChange(cm, from.line, to.line + 1, lendiff);
 
-    if (hasHandler(cm, "change"))
+    if (hasHandler(cm, "change") || hasHandler(cm, "changes"))
       (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push({
         from: from, to: to,
         text: change.text,

From 9de3e54be01e06659863a29f7f20f480e9983ec1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Jan 2014 13:27:38 +0100
Subject: [PATCH 1007/4742] Add a findMarks method

Closes #2200
---
 doc/manual.html   |  3 +++
 lib/codemirror.js | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 4ff938a07e..f0cdfc3b6f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1293,6 +1293,9 @@ <h3 id="api_marker">Text-marking methods</h3>
         to the left instead.</dd>
       </dl></dd>
 
+      <dt id="findMarks"><code><strong>doc.findMarks</strong>(from: {line, ch}, to: {line, ch}) → array&lt;TextMarker&gt;</code></dt>
+      <dd>Returns an array of all the bookmarks and marked ranges
+      found between the given positions.</dd>
       <dt id="findMarksAt"><code><strong>doc.findMarksAt</strong>(pos: {line, ch}) → array&lt;TextMarker&gt;</code></dt>
       <dd>Returns an array of all the bookmarks and marked ranges
       present at the given position.</dd>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7f193d1d05..3e5a65d8b3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5072,6 +5072,22 @@ window.CodeMirror = (function() {
       }
       return markers;
     },
+    findMarks: function(from, to) {
+      from = clipPos(this, from); to = clipPos(this, to);
+      var found = [], lineNo = from.line;
+      this.iter(from.line, to.line + 1, function(line) {
+        var spans = line.markedSpans;
+        if (spans) for (var i = 0; i < spans.length; i++) {
+          var span = spans[i];
+          if (!(lineNo == from.line && from.ch > span.to ||
+                span.from == null && lineNo != from.line||
+                lineNo == to.line && span.from > to.ch))
+            found.push(span.marker.parent || span.marker);
+        }
+        ++lineNo;
+      });
+      return found;
+    },
     getAllMarks: function() {
       var markers = [];
       this.iter(function(line) {

From 00d11c16bf6c0ab850ec382de9673268c983c17e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Feb 2014 15:07:24 +0100
Subject: [PATCH 1008/4742] [rulers addon] Add

---
 addon/display/rulers.js | 47 +++++++++++++++++++++++++++++++++++
 demo/rulers.html        | 54 +++++++++++++++++++++++++++++++++++++++++
 doc/compress.html       |  1 +
 doc/manual.html         | 10 ++++++++
 lib/codemirror.css      |  5 ++++
 5 files changed, 117 insertions(+)
 create mode 100644 addon/display/rulers.js
 create mode 100644 demo/rulers.html

diff --git a/addon/display/rulers.js b/addon/display/rulers.js
new file mode 100644
index 0000000000..958c8eaf8d
--- /dev/null
+++ b/addon/display/rulers.js
@@ -0,0 +1,47 @@
+(function() {
+  "use strict";
+
+  CodeMirror.defineOption("rulers", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      clearRulers(cm);
+      cm.off("refresh", refreshRulers);
+    }
+    if (val && val.length) {
+      setRulers(cm);
+      cm.on("refresh", refreshRulers);
+    }
+  });
+
+  function clearRulers(cm) {
+    for (var i = cm.display.lineSpace.childNodes.length - 1; i >= 0; i--) {
+      var node = cm.display.lineSpace.childNodes[i];
+      if (/(^|\s)CodeMirror-ruler($|\s)/.test(node.className))
+        node.parentNode.removeChild(node);
+    }
+  }
+
+  function setRulers(cm) {
+    var val = cm.getOption("rulers");
+    var cw = cm.defaultCharWidth();
+    var left = cm.charCoords(CodeMirror.Pos(cm.firstLine(), 0), "div").left;
+    var bot = -cm.display.scroller.offsetHeight;
+    for (var i = 0; i < val.length; i++) {
+      var elt = document.createElement("div");
+      var col, cls = null;
+      if (typeof val[i] == "number") {
+        col = val[i];
+      } else {
+        col = val[i].column;
+        cls = val[i].className;
+      }
+      elt.className = "CodeMirror-ruler" + (cls ? " " + cls : "");
+      elt.style.cssText = "left: " + (left + col * cw) + "px; top: -50px; bottom: " + bot + "px";
+      cm.display.lineSpace.insertBefore(elt, cm.display.cursorDiv);
+    }
+  }
+
+  function refreshRulers(cm) {
+    clearRulers(cm);
+    setRulers(cm);
+  }
+})();
diff --git a/demo/rulers.html b/demo/rulers.html
new file mode 100644
index 0000000000..d75fd080e9
--- /dev/null
+++ b/demo/rulers.html
@@ -0,0 +1,54 @@
+<!doctype html>
+
+<title>CodeMirror: Ruler Demo</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/display/rulers.js"></script>
+<style type="text/css">
+  .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
+  .ruler1 { border-left: 1px solid #fcc; }
+  .ruler2 { border-left: 1px solid #f5f577; }
+  .ruler3 { border-left: 1px solid #cfc; }
+  .ruler4 { border-left: 1px solid #aff; }
+  .ruler5 { border-left: 1px solid #ccf; }
+  .ruler6 { border-left: 1px solid #fcf; }
+</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a class=active href="#">Ruler demo</a>
+  </ul>
+</div>
+
+<article>
+<h2>Ruler Demo</h2>
+
+<script type="text/javascript">
+  var nums = "0123456789", space = "          ";
+  var rulers = [], value = "";
+  for (var i = 1; i <= 6; i++) {
+    rulers.push({className: "ruler" + i, column: i * 10});
+    for (var j = 1; j < i; j++) value += space;
+    value += nums + "\n";
+  }
+  var editor = CodeMirror(document.body.lastChild, {
+    rulers: rulers,
+    value: value + value + value,
+    lineNumbers: true
+});
+</script>
+
+<p>Demonstration of
+the <a href="../doc/manual.html#addon_rulers">rulers</a> addon, which
+displays vertical lines at given column offsets.</p>
+
+</article>
diff --git a/doc/compress.html b/doc/compress.html
index b874e05f52..d318ab80ee 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -194,6 +194,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/hint/pig-hint.js">pig-hint.js</option>
           <option value="http://codemirror.net/addon/display/placeholder.js">placeholder.js</option>
           <option value="http://codemirror.net/addon/hint/python-hint.js">python-hint.js</option>
+          <option value="http://codemirror.net/addon/display/rulers.js">rulers.js</option>
           <option value="http://codemirror.net/addon/runmode/runmode.js">runmode.js</option>
           <option value="http://codemirror.net/addon/runmode/runmode.node.js">runmode.node.js</option>
           <option value="http://codemirror.net/addon/runmode/runmode-standalone.js">runmode-standalone.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index f0cdfc3b6f..6d5cce50e0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2284,6 +2284,16 @@ <h2>Addons</h2>
       on <a href="../addon/display/fullscreen.css"><code>fullscreen.css</code></a>. <a href="../demo/fullscreen.html">Demo
       here</a>.</dd>
 
+      <dt id="addon_rulers"><a href="../addon/display/rulers.js"><code>display/rulers.js</code></a></dt>
+      <dd>Adds a <code>rulers</code> option, which can be used to show
+      one or more vertical rulers in the editor. The option, if
+      defined, should be given an array of <code>{column,
+      className}</code> objects or numbers. The ruler will be
+      displayed at the column indicated by the number or
+      the <code>column</code> property. The <code>className</code>
+      property can be used to assign a custom style to a
+      ruler. <a href="../demo/rulers.html">Demo 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
       of text. Adds these methods to editor instances:
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 8332c50197..2b050e19f2 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -61,6 +61,11 @@
 
 .cm-tab { display: inline-block; }
 
+.CodeMirror-ruler {
+  border-left: 1px solid #ccc;
+  position: absolute;
+}
+
 /* DEFAULT THEME */
 
 .cm-s-default .cm-keyword {color: #708;}

From 1f92654dbb6f7235c3d6536c48ac230d9afe085e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Feb 2014 15:11:25 +0100
Subject: [PATCH 1009/4742] Fix bug in release script

---
 bin/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/release b/bin/release
index f92ab006d5..4fac4f0485 100755
--- a/bin/release
+++ b/bin/release
@@ -36,6 +36,6 @@ rewrite("doc/compress.html", function(cmp) {
 });
 
 rewrite("index.html", function(index) {
-  return index.replace(/<strong>version 3.20<\/strong>/,
+  return index.replace(/<strong>version \d+\.\d+<\/strong>/,
                        "<strong>version " + simple + "</strong>");
 });

From 0982655fa717b5ebd43d3e1c9bc35236e48c0867 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Feb 2014 15:20:41 +0100
Subject: [PATCH 1010/4742] Mark release 3.22

---
 AUTHORS           | 23 +++++++++++++++++++++++
 doc/compress.html |  1 +
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 6 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 737acedaba..9af00e54e4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,8 +18,10 @@ Alexander Schepanovski
 Alexander Solovyov
 alexey-k
 Alex Piggott
+Amsul
 Amy
 Ananya Sen
+anaran
 AndersMad
 Anderson Mesquita
 Andre von Houck
@@ -42,6 +44,9 @@ benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
+Bernhard Sirlinger
+Billy Moon
+Blaine G
 boomyjee
 borawjm
 Brandon Frohs
@@ -53,11 +58,13 @@ Chandra Sekhar Pydi
 Charles Skelton
 Chris Coyier
 Chris Granger
+Chris Houseknecht
 Chris Morgan
 Christopher Brown
 ciaranj
 CodeAnimal
 ComFreek
+Curtis Gagliardi
 dagsta
 Dan Heberden
 Daniel, Dao Quang Minh
@@ -72,6 +79,7 @@ David Mignot
 David Pathakjee
 deebugger
 Deep Thought
+domagoj412
 Dominator008
 Domizio Demichelis
 Drew Bratcher
@@ -85,6 +93,7 @@ ekhaled
 Enam Mijbah Noor
 Eric Allam
 eustas
+Fabien O'Carroll
 Fabio Zendhi Nagao
 Fauntleroy
 fbuchinger
@@ -96,6 +105,7 @@ flack
 ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
+Frank Wiegand
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
@@ -103,6 +113,7 @@ Glenn Jorde
 Glenn Ruehle
 Golevka
 Gordon Smith
+Grant Skinner
 greengiant
 Guillaume Massé
 Guillaume Massé
@@ -122,6 +133,7 @@ Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
 Jacob Lee
+Jakob Miland
 Jakub Vrana
 James Campos
 James Thorne
@@ -146,6 +158,7 @@ John Connor
 John Lees-Miller
 John Snelson
 John Van Der Loo
+Jonathan Malmaud
 jongalloway
 Jon Malmaud
 Joost-Wim Boekesteijn
@@ -179,8 +192,10 @@ Luciano Longo
 lynschinzer
 Maksim Lin
 Maksym Taran
+Manuel Rego Casasnovas
 Marat Dreizin
 Marco Aurélio
+Marco Munizaga
 Marijn Haverbeke
 Mario Pietsch
 Mark Lentczner
@@ -216,10 +231,14 @@ Miraculix87
 misfo
 mloginov
 mps
+mtaran-google
 Narciso Jaramillo
 Nathan Williams
+ndr
 nerbert
+nextrevision
 nguillaumin
+Nicholas Bollweg
 Niels van Groningen
 Nikita Beloglazov
 Nikita Vasilyev
@@ -240,10 +259,12 @@ prasanthj
 Prasanth J
 Rahul
 Randy Edmunds
+Rasmus Erik Voel Jensen
 Richard Z.H. Wang
 robertop23
 Robert Plummer
 Ruslan Osmanov
+Ryan Prior
 sabaca
 Samuel Ainsworth
 sandeepshetty
@@ -256,6 +277,7 @@ Sebastian Zaha
 shaund
 shaun gilchrist
 Shawn A
+sheopory
 Shiv Deepak
 Shmuel Englard
 soliton4
@@ -284,6 +306,7 @@ Tom Erik Støwer
 Tom MacWright
 Tony Jian
 Travis Heppe
+Triangle717
 Vestimir Markov
 vf
 Volker Mische
diff --git a/doc/compress.html b/doc/compress.html
index d318ab80ee..018018747c 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=3.22.0;f=">3.22</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.20.0;f=">3.20</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.19.0;f=">3.19</option>
diff --git a/doc/releases.html b/doc/releases.html
index 47b3dfb61f..840439daca 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-3.22.zip">Version 3.22</a>:</p>
+
+  <ul class="rel-note">
+    <li>Adds the <a href="doc/manual.html#findMarks"><code>findMarks</code></a> method.</li>
+    <li>New addons: <a href="doc/manual.html#addon_rulers">rulers</a>, markdown-fold, yaml-lint.</li>
+    <li>New theme: <a href="demo/theme.html?mdn-like">mdn-like</a>.</li>
+    <li>New mode: <a href="mode/sold/index.html">Sold</a>.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">16-01-2014: <a href="http://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 49c28339a4..53c1bde705 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.21</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.22</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3e5a65d8b3..2eecf811d3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6085,7 +6085,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.21.1";
+  CodeMirror.version = "3.22.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index e8a7c18ac4..ca23ff7ed2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.21.1",
+    "version":"3.22.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 6f7298799091995ee4bf11ed5ea2cbf9f6ebf8da Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Feb 2014 15:22:12 +0100
Subject: [PATCH 1011/4742] Bump version number post-3.22

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2eecf811d3..96fff189c9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6085,7 +6085,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.22.0";
+  CodeMirror.version = "3.22.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index ca23ff7ed2..4209057376 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.22.0",
+    "version":"3.22.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 4edd73de8c9ec64a22eb2d5db7ba385e6ca95f07 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Feb 2014 16:14:21 +0100
Subject: [PATCH 1012/4742] [release notes] Fix links in 3.22 notes

---
 doc/releases.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/releases.html b/doc/releases.html
index 840439daca..a2f2e469b9 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -31,10 +31,10 @@ <h2>Version 3.x</h2>
   <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-3.22.zip">Version 3.22</a>:</p>
 
   <ul class="rel-note">
-    <li>Adds the <a href="doc/manual.html#findMarks"><code>findMarks</code></a> method.</li>
-    <li>New addons: <a href="doc/manual.html#addon_rulers">rulers</a>, markdown-fold, yaml-lint.</li>
-    <li>New theme: <a href="demo/theme.html?mdn-like">mdn-like</a>.</li>
-    <li>New mode: <a href="mode/sold/index.html">Sold</a>.</li>
+    <li>Adds the <a href="manual.html#findMarks"><code>findMarks</code></a> method.</li>
+    <li>New addons: <a href="manual.html#addon_rulers">rulers</a>, markdown-fold, yaml-lint.</li>
+    <li>New theme: <a href="../demo/theme.html?mdn-like">mdn-like</a>.</li>
+    <li>New mode: <a href="../mode/sold/index.html">Sold</a>.</li>
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
   </ul>
 

From ef0b8eeebb68335b73fe335e230cad72098a8760 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 23 Feb 2014 21:17:08 +0100
Subject: [PATCH 1013/4742] [real-world uses] Add Cruncher and jscpd

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

diff --git a/doc/realworld.html b/doc/realworld.html
index d08e64f955..661c556c21 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -35,6 +35,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
+      <li><a href="http://rsnous.com/cruncher/">Cruncher</a> (notepad with calculation features)</li>
       <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>
       <li><a href="http://www.codebugapp.com/">Codebug</a> (PHP Xdebug front-end)</li>
       <li><a href="https://github.com/angelozerr/CodeMirror-Eclipse">CodeMirror Eclipse</a> (embed CM in Eclipse)</li>
@@ -81,6 +82,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>
       <li><a href="http://jqfundamentals.com/">jQuery fundamentals</a> (interactive tutorial)</li>
       <li><a href="http://jsbin.com">jsbin.com</a> (JS playground)</li>
+      <li><a href="https://github.com/kucherenko/jscpd">jscpd</a> (code duplication detector)</li>
       <li><a href="http://jsfiddle.com">jsfiddle.com</a> (another JS playground)</li>
       <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>
       <li><a href="http://jumpseller.com/">Jumpseller</a> (online store builder)</li>

From 28997110abf68e747cfa8358c0f9a497956e7794 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 23 Feb 2014 21:43:30 +0100
Subject: [PATCH 1014/4742] Fix bug in visibleLines, which could cause
 flickering during throw-scroll

Issue #2290
---
 lib/codemirror.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0d513f8b98..b90f5fc929 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -445,9 +445,8 @@
   // height, and ensure (see op.scrollToPos) properties.
   function visibleLines(display, doc, viewPort) {
     var top = viewPort && viewPort.top != null ? viewPort.top : display.scroller.scrollTop;
-    var height = viewPort && viewPort.height || display.wrapper.clientHeight;
     top = Math.floor(top - paddingTop(display));
-    var bottom = Math.ceil(top + height);
+    var bottom = viewPort && viewPort.bottom != null ? viewPort.bottom : top + display.wrapper.clientHeight;
 
     var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
     // Ensure is a {from: {line, ch}, to: {line, ch}} object, and

From aee0471d039e578bfeeedb774525089979e67e75 Mon Sep 17 00:00:00 2001
From: Adrian Aichner <adrian.aichner@gmail.com>
Date: Sat, 22 Feb 2014 14:31:01 +0100
Subject: [PATCH 1015/4742] Fix broken link in release notes for solr mode.

---
 doc/releases.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/releases.html b/doc/releases.html
index a2f2e469b9..57514884d7 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,7 +34,7 @@ <h2>Version 3.x</h2>
     <li>Adds the <a href="manual.html#findMarks"><code>findMarks</code></a> method.</li>
     <li>New addons: <a href="manual.html#addon_rulers">rulers</a>, markdown-fold, yaml-lint.</li>
     <li>New theme: <a href="../demo/theme.html?mdn-like">mdn-like</a>.</li>
-    <li>New mode: <a href="../mode/sold/index.html">Sold</a>.</li>
+    <li>New mode: <a href="../mode/solr/index.html">Solr</a>.</li>
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
   </ul>
 

From 74c8d30637c1cf6cbc97646fca38c1bd212de8a0 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Sun, 23 Feb 2014 22:49:25 +0000
Subject: [PATCH 1016/4742] [toml mode] Fix new array of objects syntax

---
 mode/toml/toml.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/toml/toml.js b/mode/toml/toml.js
index 1d163f13bf..3f95bf9ba0 100644
--- a/mode/toml/toml.js
+++ b/mode/toml/toml.js
@@ -38,6 +38,8 @@ CodeMirror.defineMode("toml", function () {
         return 'bracket';
       } else if (state.lhs && stream.peek() === '[' && stream.skipTo(']')) {
         stream.next();//skip closing ]
+        // array of objects has an extra open & close []
+        if (stream.peek() === ']') stream.next();
         return "atom";
       } else if (stream.peek() === "#") {
         stream.skipToEnd();

From e5b0028ad63a1f2d40fc040c705a542ebb794801 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Feb 2014 08:52:53 +0100
Subject: [PATCH 1017/4742] [xml mode] Make tag names case-insensitive in html
 mode

Issue #2304
---
 mode/xml/index.html |  2 +-
 mode/xml/xml.js     | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mode/xml/index.html b/mode/xml/index.html
index 873099aab2..60ebd20177 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -38,7 +38,7 @@ <h2>XML mode</h2>
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "xml", alignCDATA: true},
+        mode: "text/html",
         lineNumbers: true
       });
     </script>
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index fc6fd1b71d..d9b04e89e1 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -34,14 +34,16 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     },
     doNotIndent: {"pre": true},
     allowUnquoted: true,
-    allowMissing: true
+    allowMissing: true,
+    caseFold: true
   } : {
     autoSelfClosers: {},
     implicitlyClosed: {},
     contextGrabbers: {},
     doNotIndent: {},
     allowUnquoted: false,
-    allowMissing: false
+    allowMissing: false,
+    caseFold: false
   };
   var alignCDATA = parserConfig.alignCDATA;
 
@@ -77,6 +79,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         tagName = "";
         var c;
         while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c;
+        if (Kludges.caseFold) tagName = tagName.toLowerCase();
         if (!tagName) return "tag error";
         type = isClose ? "closeTag" : "openTag";
         state.tokenize = inTag;
@@ -189,7 +192,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       if (!state.context) {
         return;
       }
-      parentTagName = state.context.tagName.toLowerCase();
+      parentTagName = state.context.tagName;
       if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
           !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
         return;
@@ -207,7 +210,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       var err = false;
       if (state.context) {
         if (state.context.tagName != tagName) {
-          if (Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName.toLowerCase()))
+          if (Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName))
             popContext(state);
           err = !state.context || state.context.tagName != tagName;
         }
@@ -241,10 +244,10 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       var tagName = state.tagName, tagStart = state.tagStart;
       state.tagName = state.tagStart = null;
       if (type == "selfcloseTag" ||
-          Kludges.autoSelfClosers.hasOwnProperty(tagName.toLowerCase())) {
-        maybePopContext(state, tagName.toLowerCase());
+          Kludges.autoSelfClosers.hasOwnProperty(tagName)) {
+        maybePopContext(state, tagName);
       } else {
-        maybePopContext(state, tagName.toLowerCase());
+        maybePopContext(state, tagName);
         state.context = new Context(state, tagName, tagStart == state.indented);
       }
       return baseState;

From 45bfdc2d3c9cdc1f62409aaafc14def2a0d8a41c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Feb 2014 11:21:11 +0100
Subject: [PATCH 1018/4742] Make adding something to selection history clear
 selection redo

Issue #2305
---
 lib/codemirror.js | 31 ++++++++++++++++++++-----------
 test/test.js      | 12 ++++++++++++
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index eb815ce5dd..3f40858a8b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3228,7 +3228,7 @@
       if (allowSelectionOnly || !source[i].ranges) break;
     if (i == source.length) return;
 
-    pushPendingSelection(doc, dest);
+    pushPendingSelection(doc, dest, false);
     for (;;) {
       event = source.pop();
       if (event.ranges) {
@@ -3245,7 +3245,7 @@
     // Build up a reverse change object to add to the opposite history
     // stack (redo when undoing, and vice versa).
     var antiChanges = [];
-    pushSelectionToHistory(selAfter, dest);
+    pushSelectionToHistory(doc, selAfter, dest);
     dest.push({changes: antiChanges, generation: hist.generation});
     hist.generation = event.generation || ++hist.maxGeneration;
 
@@ -6398,14 +6398,21 @@
     return histChange;
   }
 
+  // Pop all selection events off the end of a history array. Stop at
+  // a change event.
+  function clearSelectionEvents(array) {
+    while (array.length) {
+      var last = lst(array);
+      if (last.ranges) array.pop();
+      else break;
+    }
+  }
+
   // Find the top change event in the history. Pop off selection
   // events that are in the way.
   function lastChangeEvent(hist) {
-    for (;;) {
-      var last = lst(hist.done);
-      if (last && last.ranges) hist.done.pop();
-      else return last;
-    }
+    clearSelectionEvents(hist.done);
+    return lst(hist.done);
   }
 
   // Register a change in the history. Merges changes that are within
@@ -6436,7 +6443,7 @@
       // Can not be merged, start a new event.
       var before = lst(hist.done);
       if (!before || !before.ranges)
-        pushSelectionToHistory(doc.sel, hist.done);
+        pushSelectionToHistory(doc, doc.sel, hist.done);
       cur = {changes: [historyChangeFromChange(doc, change)],
              generation: hist.generation};
       hist.done.push(cur);
@@ -6471,17 +6478,19 @@
     hist.lastOp = opId;
   }
 
-  function pushSelectionToHistory(sel, dest) {
+  function pushSelectionToHistory(doc, sel, dest) {
     var top = lst(dest);
     if (!(top && top.ranges && top.equals(sel)))
       dest.push(sel);
   }
 
-  function pushPendingSelection(doc, dest) {
+  function pushPendingSelection(doc, dest, clearOpposite) {
     var hist = doc.history;
     if (hist.pendingSelection) {
-      pushSelectionToHistory(hist.pendingSelection, dest);
+      pushSelectionToHistory(doc, hist.pendingSelection, dest);
       hist.pendingSelection = null;
+      if (clearOpposite !== false)
+        clearSelectionEvents(dest == hist.done ? hist.undone : hist.done);
     }
   }
 
diff --git a/test/test.js b/test/test.js
index 5d32217810..c7ed3d7a84 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1763,3 +1763,15 @@ testCM("selectionHistory", function(cm) {
   eq(cm.getSelection(), "");
   eqPos(cm.getCursor(), Pos(0, 6));
 }, {value: "a b c d"});
+
+testCM("selectionChangeReducesRedo", function(cm) {
+  cm.replaceSelection("X");
+  cm.execCommand("goCharRight");
+  cm.undoSelection();
+  cm.execCommand("selectAll");
+  cm.undoSelection();
+  eq(cm.getValue(), "Xabc");
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.undoSelection();
+  eq(cm.getValue(), "abc");
+}, {value: "abc"});

From 2bc45f6d90c1b7e1647923cb05e862745178e0c2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Feb 2014 11:46:36 +0100
Subject: [PATCH 1019/4742] Don't merge non-overlapping selections in history

Issue #2305
---
 lib/codemirror.js | 22 +++++++++++++++++-----
 test/test.js      |  8 ++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3f40858a8b..f5081f075a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6468,11 +6468,23 @@
   function addSelectionToHistory(doc, sel, opId) {
     var hist = doc.history, pend = hist.pendingSelection, now = +new Date;
 
-    if (pend && !hist.atomicSelection && opId != hist.lastOp &&
-        (pend.ranges.length != sel.ranges.length ||
-         sel.somethingSelected() != pend.somethingSelected() ||
-         now - hist.pendingSelTime > (doc.cm ? doc.cm.options.historySelectionEventDelay : 1000)))
-      pushPendingSelection(doc, hist.done);
+    var push = false;
+    if (pend && !hist.atomicSelection && opId != hist.lastOp) {
+      // A new event is started when the number of selections changed,
+      // the selection moves from empty to non-empty or the other way
+      // around, or when a historySelectionEventDelay has elapsed.
+      var different = pend.ranges.length != sel.ranges.length ||
+        sel.somethingSelected() != pend.somethingSelected() ||
+        now - hist.pendingSelTime > (doc.cm ? doc.cm.options.historySelectionEventDelay : 1000);
+      // Non-overlapping, non-empty selections also start a new event.
+      for (var i = 0; !different && i < sel.ranges.length; i++) {
+        var selRange = sel.ranges[i], pendRange = pend.ranges[i];
+        if (!selRange.empty())
+          different = cmp(selRange.from(), pendRange.to()) > 0 ||
+                      cmp(selRange.to(), pendRange.from()) < 0;
+      }
+      if (different) pushPendingSelection(doc, hist.done);
+    }
     hist.pendingSelection = sel;
     hist.pendingSelTime = now;
     hist.lastOp = opId;
diff --git a/test/test.js b/test/test.js
index c7ed3d7a84..a2c658e3fa 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1775,3 +1775,11 @@ testCM("selectionChangeReducesRedo", function(cm) {
   cm.undoSelection();
   eq(cm.getValue(), "abc");
 }, {value: "abc"});
+
+testCM("selectionHistoryNonOverlapping", function(cm) {
+  cm.setSelection(Pos(0, 0), Pos(0, 1));
+  cm.setSelection(Pos(0, 2), Pos(0, 3));
+  cm.execCommand("undoSelection");
+  eqPos(cm.getCursor("anchor"), Pos(0, 0));
+  eqPos(cm.getCursor("head"), Pos(0, 1));
+}, {value: "1234"});

From 479d4b241f6942dbbc88be3161263c2ccd50ee56 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Feb 2014 11:50:23 +0100
Subject: [PATCH 1020/4742] Fix linter errors

---
 lib/codemirror.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f5081f075a..a44bd2d245 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3245,7 +3245,7 @@
     // Build up a reverse change object to add to the opposite history
     // stack (redo when undoing, and vice versa).
     var antiChanges = [];
-    pushSelectionToHistory(doc, selAfter, dest);
+    pushSelectionToHistory(selAfter, dest);
     dest.push({changes: antiChanges, generation: hist.generation});
     hist.generation = event.generation || ++hist.maxGeneration;
 
@@ -6443,7 +6443,7 @@
       // Can not be merged, start a new event.
       var before = lst(hist.done);
       if (!before || !before.ranges)
-        pushSelectionToHistory(doc, doc.sel, hist.done);
+        pushSelectionToHistory(doc.sel, hist.done);
       cur = {changes: [historyChangeFromChange(doc, change)],
              generation: hist.generation};
       hist.done.push(cur);
@@ -6468,7 +6468,6 @@
   function addSelectionToHistory(doc, sel, opId) {
     var hist = doc.history, pend = hist.pendingSelection, now = +new Date;
 
-    var push = false;
     if (pend && !hist.atomicSelection && opId != hist.lastOp) {
       // A new event is started when the number of selections changed,
       // the selection moves from empty to non-empty or the other way
@@ -6490,7 +6489,7 @@
     hist.lastOp = opId;
   }
 
-  function pushSelectionToHistory(doc, sel, dest) {
+  function pushSelectionToHistory(sel, dest) {
     var top = lst(dest);
     if (!(top && top.ranges && top.equals(sel)))
       dest.push(sel);
@@ -6499,7 +6498,7 @@
   function pushPendingSelection(doc, dest, clearOpposite) {
     var hist = doc.history;
     if (hist.pendingSelection) {
-      pushSelectionToHistory(doc, hist.pendingSelection, dest);
+      pushSelectionToHistory(hist.pendingSelection, dest);
       hist.pendingSelection = null;
       if (clearOpposite !== false)
         clearSelectionEvents(dest == hist.done ? hist.undone : hist.done);

From 686115279acb4bde81cdfe867eb3745474586c55 Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel.horner@gmail.com>
Date: Thu, 20 Feb 2014 08:53:22 -0500
Subject: [PATCH 1021/4742] [vim] Add reselect-Visual - 'gv'

---
 keymap/vim.js    | 23 ++++++++++++++++++++++-
 test/vim_test.js | 13 ++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a5d6812a19..cc8f2ab9b7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -271,6 +271,7 @@
     { keys: ['v'], type: 'action', action: 'toggleVisualMode' },
     { keys: ['V'], type: 'action', action: 'toggleVisualMode',
         actionArgs: { linewise: true }},
+    { keys: ['g', 'v'], type: 'action', action: 'reselectLastSelection' },
     { keys: ['J'], type: 'action', action: 'joinLines', isEdit: true },
     { keys: ['p'], type: 'action', action: 'paste', isEdit: true,
         actionArgs: { after: true, isEdit: true }},
@@ -531,7 +532,8 @@
           insertModeRepeat: undefined,
           visualMode: false,
           // If we are in visual line mode. No effect if visualMode is false.
-          visualLine: false
+          visualLine: false,
+          lastSelection: null
         };
       }
       return cm.state.vim;
@@ -1857,6 +1859,21 @@
         updateMark(cm, vim, '>', cursorIsBefore(curStart, curEnd) ? curEnd
             : curStart);
       },
+      reselectLastSelection: function(cm, _actionArgs, vim) {
+        if (vim.lastSelection) {
+          var lastSelection = vim.lastSelection;
+          cm.setSelection(lastSelection.curStart, lastSelection.curEnd);
+          if (lastSelection.visualLine) {
+            vim.visualMode = true;
+            vim.visualLine = true;
+          }
+          else {
+            vim.visualMode = true;
+            vim.visualLine = false;
+          }
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
+        }
+      },
       joinLines: function(cm, actionArgs, vim) {
         var curStart, curEnd;
         if (vim.visualMode) {
@@ -2120,6 +2137,10 @@
     function exitVisualMode(cm) {
       cm.off('mousedown', exitVisualMode);
       var vim = cm.state.vim;
+      // can't use selection state here because yank has already reset its cursor
+      vim.lastSelection = {'curStart': vim.marks['<'].find(),
+        'curEnd': vim.marks['>'].find(), 'visualMode': vim.visualMode,
+        'visualLine': vim.visualLine};
       vim.visualMode = false;
       vim.visualLine = false;
       var selectionStart = cm.getCursor('anchor');
diff --git a/test/vim_test.js b/test/vim_test.js
index 7fe52ae307..811f495a67 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1527,6 +1527,17 @@ testVim('visual_blank', function(cm, vim, helpers) {
   helpers.doKeys('v', 'k');
   eq(vim.visualMode, true);
 }, { value: '\n' });
+testVim('reselect_visual', function(cm, vim, helpers) {
+  helpers.doKeys('l', 'v', 'l', 'l', 'y', 'g', 'v');
+  helpers.assertCursorAt(0, 3);
+  eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
+  helpers.doKeys('d');
+  eq('15', cm.getValue());
+}, { value: '12345' });
+testVim('reselect_visual_line', function(cm, vim, helpers) {
+  helpers.doKeys('l', 'V', 'l', 'j', 'j', 'V', 'g', 'v', 'd');
+  eq(' 4\n 5', cm.getValue());
+}, { value: ' 1\n 2\n 3\n 4\n 5' });
 testVim('s_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('s');
@@ -2365,7 +2376,7 @@ testVim('ex_substitute_nocapture', function(cm, vim, helpers) {
 }, { value: 'a11 a12 a13' });
 testVim('ex_substitute_nocapture2', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
-  // \$n should be literal, since that is the javascript form, not VIM. 
+  // \$n should be literal, since that is the javascript form, not VIM.
   helpers.doEx('s/\\(\\d+\\)/\\$1\\1/')
   eq('a $10 b', cm.getValue());
 }, { value: 'a 0 b' });

From 60d4f1e5e48b416ebd73092aa7fe09a03888a7cc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Feb 2014 14:15:57 +0100
Subject: [PATCH 1022/4742] Enable selection-restoration hack for IE11

---
 lib/codemirror.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a44bd2d245..7e55b5c175 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2162,7 +2162,7 @@
     // If nothing changed, bail.
     if (text == prevInput && !cm.somethingSelected()) return false;
     // Work around nonsensical selection resetting in IE9/10
-    if (ie_upto10 && !ie_upto8 && cm.display.inputHasSelection === text) {
+    if (ie && !ie_upto8 && cm.display.inputHasSelection === text) {
       resetInput(cm);
       return false;
     }
@@ -2230,10 +2230,10 @@
       var content = minimal ? "-" : selected || cm.getSelection();
       cm.display.input.value = content;
       if (cm.state.focused) selectInput(cm.display.input);
-      if (ie_upto10 && !ie_upto8) cm.display.inputHasSelection = content;
+      if (ie && !ie_upto8) cm.display.inputHasSelection = content;
     } else if (!typing) {
       cm.display.prevInput = cm.display.input.value = "";
-      if (ie_upto10 && !ie_upto8) cm.display.inputHasSelection = null;
+      if (ie && !ie_upto8) cm.display.inputHasSelection = null;
     }
     cm.display.inaccurateSelection = minimal;
   }
@@ -2328,7 +2328,7 @@
 
     on(d.input, "keyup", operation(cm, onKeyUp));
     on(d.input, "input", function() {
-      if (ie_upto10 && !ie_upto8 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
+      if (ie && !ie_upto8 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
       fastPoll(cm);
     });
     on(d.input, "keydown", operation(cm, onKeyDown));
@@ -2982,7 +2982,7 @@
     if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
     var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
     if (handleCharBinding(cm, e, ch)) return;
-    if (ie_upto10 && !ie_upto8) cm.display.inputHasSelection = null;
+    if (ie && !ie_upto8) cm.display.inputHasSelection = null;
     fastPoll(cm);
   }
 

From e4363b86d695af9f16dd70452abaa09738776923 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 26 Feb 2014 15:15:21 +0100
Subject: [PATCH 1023/4742] Fix problem in clipping the view for changes

To account for the fact that the set of folded lines might be
different post-change and pre-change.
---
 lib/codemirror.js | 75 ++++++++++++++++++++++++++++++++++++-----------
 test/test.js      |  9 ++++++
 2 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7e55b5c175..06050d984d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2006,11 +2006,6 @@
     if (to == null) to = cm.doc.first + cm.doc.size;
     if (!lendiff) lendiff = 0;
 
-    if (sawCollapsedSpans) {
-      from = visualLineNo(cm.doc, from);
-      to = visualLineEndNo(cm.doc, to);
-    }
-
     var display = cm.display;
     if (lendiff && to < display.viewTo &&
         (display.updateLineNumbers == null || display.updateLineNumbers > from))
@@ -2019,23 +2014,45 @@
     cm.curOp.viewChanged = true;
 
     if (from >= display.viewTo) { // Change after
+      if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
+        resetView(cm);
     } else if (to <= display.viewFrom) { // Change before
-      display.viewFrom += lendiff;
-      display.viewTo += lendiff;
+      if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
+        resetView(cm);
+      } else {
+        display.viewFrom += lendiff;
+        display.viewTo += lendiff;
+      }
     } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
       resetView(cm);
     } else if (from <= display.viewFrom) { // Top overlap
-      display.view = display.view.slice(findViewIndex(cm, to));
-      display.viewFrom = to + lendiff;
-      display.viewTo += lendiff;
+      var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
+      if (cut) {
+        display.view = display.view.slice(cut.index);
+        display.viewFrom = cut.lineN;
+        display.viewTo += lendiff;
+      } else {
+        resetView(cm);
+      }
     } else if (to >= display.viewTo) { // Bottom overlap
-      display.view = display.view.slice(0, findViewIndex(cm, from));
-      display.viewTo = from;
+      var cut = viewCuttingPoint(cm, from, from, -1);
+      if (cut) {
+        display.view = display.view.slice(0, cut.index);
+        display.viewTo = cut.lineN;
+      } else {
+        resetView(cm);
+      }
     } else { // Gap in the middle
-      display.view = display.view.slice(0, findViewIndex(cm, from))
-        .concat(buildViewArray(cm, from, to + lendiff))
-        .concat(display.view.slice(findViewIndex(cm, to)));
-      display.viewTo += lendiff;
+      var cutTop = viewCuttingPoint(cm, from, from, -1);
+      var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
+      if (cutTop && cutBot) {
+        display.view = display.view.slice(0, cutTop.index)
+          .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
+          .concat(display.view.slice(cutBot.index));
+        display.viewTo += lendiff;
+      } else {
+        resetView(cm);
+      }
     }
 
     var ext = display.externalMeasured;
@@ -2082,6 +2099,30 @@
     }
   }
 
+  function viewCuttingPoint(cm, oldN, newN, dir) {
+    var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
+    if (!sawCollapsedSpans) return {index: index, lineN: newN};
+    for (var i = 0, n = cm.display.viewFrom; i < index; i++)
+      n += view[i].size;
+    if (n != oldN) {
+      if (dir > 0) {
+        if (index == view.length - 1) return null;
+        diff = (n + view[index].size) - oldN;
+      } else {
+        if (index == 0) return null;
+        diff = oldN - n;
+      }
+      oldN += diff; newN += diff;
+      index += dir;
+    }
+    while (visualLineNo(cm.doc, newN) != newN) {
+      if (index == (dir < 0 ? 0 : view.length - 1)) return null;
+      newN += view[index - (dir < 0 ? 1 : 0)].size;
+      index += dir;
+    }
+    return {index: index, lineN: newN};
+  }
+
   // Force the view to cover a given range, adding empty view element
   // or clipping off existing ones as needed.
   function adjustView(cm, from, to) {
@@ -3285,7 +3326,7 @@
       return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
                        Pos(range.head.line + distance, range.head.ch));
     }), doc.sel.primIndex);
-    if (doc.cm) regChange(doc.cm, doc.first, doc.first, distance);
+    if (doc.cm) regChange(doc.cm, doc.first, doc.first - distance, distance);
   }
 
   // More lower-level change function, handling only a single document
diff --git a/test/test.js b/test/test.js
index a2c658e3fa..10e1a7f62d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -920,6 +920,15 @@ testCM("nestedFoldOnSide", function(cm) {
   is(caught && /overlap/i.test(caught.message));
 }, {value: "ab\ncd\ef"});
 
+testCM("editInFold", function(cm) {
+  addDoc(cm, 4, 6);
+  var m = cm.markText(Pos(1, 2), Pos(3, 2), {collapsed: true});
+  cm.replaceRange("", Pos(0, 0), Pos(1, 3));
+  cm.replaceRange("", Pos(2, 1), Pos(3, 3));
+  cm.replaceRange("a\nb\nc\nd", Pos(0, 1), Pos(1, 0));
+  cm.cursorCoords(Pos(0, 0));
+});
+
 testCM("wrappingInlineWidget", function(cm) {
   cm.setSize("11em");
   var w = document.createElement("span");

From 98dd8090fd3eb63db8f50e031709e5c8119a78e3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 26 Feb 2014 15:31:41 +0100
Subject: [PATCH 1024/4742] Fix delayed update of scroll height

Due to some elements still being stuck at the old height.
---
 lib/codemirror.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 06050d984d..35e6f85aad 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -382,9 +382,9 @@
   // Prepare DOM reads needed to update the scrollbars. Done in one
   // shot to minimize update/measure roundtrips.
   function measureForScrollbars(cm) {
-    if (cm.display.gutters.style.height)
-      cm.display.gutters.style.height = "";
-    var scroll = cm.display.scroller;
+    var d = cm.display, scroll = d.scroller;
+    if (d.gutters.style.height || d.sizer.style.minHeight || d.heightForcer.style.top)
+      d.gutters.style.height = d.sizer.style.minHeight = d.heightForcer.style.top = "";
     return {
       scrollHeight: scroll.scrollHeight, clientHeight: scroll.clientHeight,
       barHeight: cm.display.scrollbarV.clientHeight,
@@ -618,7 +618,7 @@
 
     // Prevent these from interfering with the scroll size during
     // subsequent call to updateScrollbars
-    display.gutters.style.height = "";
+    display.gutters.style.height = display.sizer.style.minHeight = display.heightForcer.style.top = "";
     removeChildren(display.cursorDiv);
     removeChildren(display.selectionDiv);
 

From 71ec021e52910933883f5a50c45f7a40d70cf546 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 26 Feb 2014 16:31:43 +0100
Subject: [PATCH 1025/4742] Initialize doc before display

Slightly simplifies constructor logic.
---
 lib/codemirror.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 35e6f85aad..5b4e1f6438 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -67,8 +67,10 @@
       options[opt] = defaults[opt];
     setGuttersForLineNumbers(options);
 
-    var docStart = typeof options.value == "string" ? 0 : options.value.first;
-    var display = this.display = new Display(place, docStart);
+    var doc = options.value;
+    if (typeof doc == "string") doc = new Doc(doc, options.mode);
+
+    var display = this.display = new Display(place, doc);
     display.wrapper.CodeMirror = this;
     updateGutters(this);
     themeChanged(this);
@@ -87,9 +89,6 @@
       highlight: new Delayed() // stores highlight worker timeout
     };
 
-    var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(doc, options.mode);
-
     // Override magic textarea content restore that IE sometimes does
     // on our hidden textarea on reload
     if (ie_upto10) setTimeout(bind(resetInput, this, true), 20);
@@ -118,7 +117,7 @@
   // and content drawing. It holds references to DOM nodes and
   // display-related state.
 
-  function Display(place, docStart) {
+  function Display(place, doc) {
     var d = this;
 
     // The semihidden textarea that is focused when the editor is
@@ -188,7 +187,7 @@
     else place(d.wrapper);
 
     // Current rendered range (may be bigger than the view window).
-    d.viewFrom = d.viewTo = docStart;
+    d.viewFrom = d.viewTo = doc.first;
     // Information about the rendered lines.
     d.view = [];
     // Holds info about a single rendered line when it was rendered

From 2fccf8278496889d8a9517eb63026e345e1c1c0d Mon Sep 17 00:00:00 2001
From: Patil Arpith <arpith.patil@gmail.com>
Date: Wed, 26 Feb 2014 18:53:28 +0530
Subject: [PATCH 1026/4742] [clike mode] Added C++11 keywords

---
 mode/clike/clike.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 4e4988dd81..e5f311d4a8 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -235,7 +235,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     keywords: words(cKeywords + " asm dynamic_cast namespace reinterpret_cast try bool explicit new " +
                     "static_cast typeid catch operator template typename class friend private " +
                     "this using const_cast inline public throw virtual delete mutable protected " +
-                    "wchar_t"),
+                    "wchar_t alignas alignof constexpr decltype nullptr noexcept thread_local final " +
+                    "static_assert override"),
     blockKeywords: words("catch class do else finally for if struct switch try while"),
     atoms: words("true false null"),
     hooks: {"#": cppHook},

From 48c68098574ab66cb469849465be9c7164abc46c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 26 Feb 2014 22:36:21 +0100
Subject: [PATCH 1027/4742] [search addon] Fix case-insensitive highlighting

Closes #2309
---
 addon/search/search.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index b5611ab41d..690db3f5ef 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -16,16 +16,11 @@
     } else {
       query = new RegExp("^(?:" + query.source + ")", query.ignoreCase ? "i" : "");
     }
-    if (typeof query == "string") return {token: function(stream) {
-      if (stream.match(query)) return "searching";
-      stream.next();
-      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
-    }};
     return {token: function(stream) {
       if (stream.match(query)) return "searching";
       while (!stream.eol()) {
         stream.next();
-        if (startChar)
+        if (startChar && !caseInsensitive)
           stream.skipTo(startChar) || stream.skipToEnd();
         if (stream.match(query, false)) break;
       }
@@ -74,7 +69,7 @@
         if (!query || state.query) return;
         state.query = parseQuery(query);
         cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query));
-        state.overlay = searchOverlay(state.query);
+        state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query));
         cm.addOverlay(state.overlay);
         state.posFrom = state.posTo = cm.getCursor();
         findNext(cm, rev);

From a0e536d12ad7507ae0867eb8f4574f70f8d0b9a6 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 27 Feb 2014 00:42:24 +0100
Subject: [PATCH 1028/4742] [vim] Add simple vim-specific options system

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

diff --git a/keymap/vim.js b/keymap/vim.js
index cc8f2ab9b7..a98b03847d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -412,6 +412,40 @@
       return false;
     }
 
+    var options = {};
+    function defineOption(name, defaultValue, type) {
+      if (defaultValue === undefined) { throw Error('defaultValue is required'); }
+      if (!type) { type = 'boolean'; }
+      options[name] = {
+        type: type,
+        value: defaultValue
+      };
+    }
+
+    function setOption(name, value) {
+      var option = options[name];
+      if (!option) {
+        throw Error('Unknown option: ' + name);
+      }
+      if (option.type == 'boolean') {
+        if (value && value !== true) {
+          throw Error('Invalid argument: ' + name + '=' + value);
+        } else if (value !== false) {
+          // Boolean options are set to true if value is not defined.
+          value = true;
+        }
+      }
+      option.value = option.type == 'boolean' ? !!value : value;
+    }
+
+    function getOption(name) {
+      var option = options[name];
+      if (!option) {
+        throw Error('Unknown option: ' + name);
+      }
+      return option.value;
+    }
+
     var createCircularJumpList = function() {
       var size = 100;
       var pointer = -1;
@@ -3069,6 +3103,7 @@
       { name: 'write', shortName: 'w' },
       { name: 'undo', shortName: 'u' },
       { name: 'redo', shortName: 'red' },
+      { name: 'set', shortName: 'set' },
       { name: 'sort', shortName: 'sor' },
       { name: 'substitute', shortName: 's' },
       { name: 'nohlsearch', shortName: 'noh' },
@@ -3285,6 +3320,49 @@
               linewise: true },
             repeatOverride: params.line+1});
       },
+      set: function(cm, params) {
+        var setArgs = params.args;
+        if (!setArgs || setArgs.length < 1) {
+          if (cm) {
+            showConfirm(cm, 'Invalid mapping: ' + params.input);
+          }
+          return;
+        }
+        var expr = setArgs[0].split('=');
+        var optionName = expr[0];
+        var value = expr[1];
+        var forceGet = false;
+
+        if (optionName.charAt(optionName.length - 1) == '?') {
+          // If post-fixed with ?, then the set is actually a get.
+          if (value) { throw Error('Trailing characters: ' + params.argString); }
+          optionName = optionName.substring(0, optionName.length - 1);
+          forceGet = true;
+        }
+        var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
+        if (optionIsBoolean) {
+          if(!value && optionName.substring(0, 2) == 'no') {
+            // To set boolean options to false, the option name is prefixed with
+            // 'no'.
+            optionName = optionName.substring(2);
+            value = false;
+          } else if (value == undefined) {
+            // Calling set with a boolean option sets it to true.
+            value = true;
+          }
+        }
+        if (!optionIsBoolean && !value || forceGet) {
+          var oldValue = getOption(optionName);
+          // If no value is provided, then we assume this is a get.
+          if (oldValue === true || oldValue === false) {
+            showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
+          } else {
+            showConfirm(cm, '  ' + optionName + '=' + oldValue);
+          }
+        } else {
+          setOption(optionName, value);
+        }
+      },
       sort: function(cm, params) {
         var reverse, ignoreCase, unique, number;
         function parseArgs() {

From b6141f8d2a6fddab14119024c4e3b78f4822b189 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 27 Feb 2014 10:24:29 +0100
Subject: [PATCH 1029/4742] [vim] Add pcre option, expose option API

---
 keymap/vim.js    |  75 +++++++++---
 test/vim_test.js | 295 ++++++++++++++++++++++++++++++-----------------
 2 files changed, 247 insertions(+), 123 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a98b03847d..7f7539e3cb 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -415,11 +415,12 @@
     var options = {};
     function defineOption(name, defaultValue, type) {
       if (defaultValue === undefined) { throw Error('defaultValue is required'); }
-      if (!type) { type = 'boolean'; }
+      if (!type) { type = 'string'; }
       options[name] = {
         type: type,
-        value: defaultValue
+        defaultValue: defaultValue
       };
+      setOption(name, defaultValue);
     }
 
     function setOption(name, value) {
@@ -585,6 +586,10 @@
         lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
         registerController: new RegisterController({})
       };
+      for (var optionName in options) {
+        var option = options[optionName];
+        option.value = option.defaultValue;
+      }
     }
 
     var vimApi= {
@@ -612,6 +617,9 @@
         // Add user defined key bindings.
         exCommandDispatcher.map(lhs, rhs, ctx);
       },
+      setOption: setOption,
+      getOption: getOption,
+      defineOption: defineOption,
       defineEx: function(name, prefix, func){
         if (name.indexOf(prefix) !== 0) {
           throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
@@ -2766,6 +2774,7 @@
     }
 
     // Search functions
+    defineOption('pcre', true, 'boolean');
     function SearchState() {}
     SearchState.prototype = {
       getQuery: function() {
@@ -2815,7 +2824,7 @@
     }
 
     // Translates a search string from ex (vim) syntax into javascript form.
-    function fixRegex(str) {
+    function translateRegex(str) {
       // When these match, add a '\' if unescaped or remove one if escaped.
       var specials = ['|', '(', ')', '{'];
       // Remove, but never add, a '\' for these.
@@ -2854,15 +2863,17 @@
     }
 
     // Translates the replace part of a search and replace from ex (vim) syntax into
-    // javascript form.  Similar to fixRegex, but additionally fixes back references
+    // javascript form.  Similar to translateRegex, but additionally fixes back references
     // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'.
-    function fixRegexReplace(str) {
+    function translateRegexReplace(str) {
       var escapeNextChar = false;
       var out = [];
       for (var i = -1; i < str.length; i++) {
         var c = str.charAt(i) || '';
         var n = str.charAt(i+1) || '';
         if (escapeNextChar) {
+          // At any point in the loop, escapeNextChar is true if the previous
+          // character was a '\' and was not escaped.
           out.push(c);
           escapeNextChar = false;
         } else {
@@ -2887,6 +2898,29 @@
       return out.join('');
     }
 
+    // Unescape \ and / in the replace part, for PCRE mode.
+    function unescapeRegexReplace(str) {
+      var stream = new CodeMirror.StringStream(str);
+      var output = [];
+      while (!stream.eol()) {
+        // Search for \.
+        while (stream.peek() && stream.peek() != '\\') {
+          output.push(stream.next());
+        }
+        if (stream.match('\\/', true)) {
+          // \/ => /
+          output.push('/');
+        } else if (stream.match('\\\\', true)) {
+          // \\ => \
+          output.push('\\');
+        } else {
+          // Don't change anything
+          output.push(stream.next());
+        }
+      }
+      return output.join('');
+    }
+
     /**
      * Extract the regular expression from the query and return a Regexp object.
      * Returns null if the query is blank.
@@ -2918,7 +2952,9 @@
       if (!regexPart) {
         return null;
       }
-      regexPart = fixRegex(regexPart);
+      if (!getOption('pcre')) {
+        regexPart = translateRegex(regexPart);
+      }
       if (smartCase) {
         ignoreCase = (/^[^A-Z]*$/).test(regexPart);
       }
@@ -3125,7 +3161,7 @@
           this.parseInput_(cm, inputStream, params);
         } catch(e) {
           showConfirm(cm, e);
-          return;
+          throw e;
         }
         var commandName;
         if (!params.commandName) {
@@ -3339,17 +3375,16 @@
           optionName = optionName.substring(0, optionName.length - 1);
           forceGet = true;
         }
+        if (value === undefined && optionName.substring(0, 2) == 'no') {
+          // To set boolean options to false, the option name is prefixed with
+          // 'no'.
+          optionName = optionName.substring(2);
+          value = false;
+        }
         var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
-        if (optionIsBoolean) {
-          if(!value && optionName.substring(0, 2) == 'no') {
-            // To set boolean options to false, the option name is prefixed with
-            // 'no'.
-            optionName = optionName.substring(2);
-            value = false;
-          } else if (value == undefined) {
-            // Calling set with a boolean option sets it to true.
-            value = true;
-          }
+        if (optionIsBoolean && value == undefined) {
+          // Calling set with a boolean option sets it to true.
+          value = true;
         }
         if (!optionIsBoolean && !value || forceGet) {
           var oldValue = getOption(optionName);
@@ -3457,7 +3492,11 @@
         var confirm = false; // Whether to confirm each replace.
         if (slashes[1]) {
           replacePart = argString.substring(slashes[1] + 1, slashes[2]);
-          replacePart = fixRegexReplace(replacePart);
+          if (getOption('pcre')) {
+            replacePart = unescapeRegexReplace(replacePart);
+          } else {
+            replacePart = translateRegexReplace(replacePart);
+          }
         }
         if (slashes[2]) {
           // After the 3rd slash, we can have flags followed by a space followed
diff --git a/test/vim_test.js b/test/vim_test.js
index 811f495a67..0dbecaadbe 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1566,6 +1566,7 @@ testVim('S_visual', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
   eq('\ncc', cm.getValue());
 }, { value: 'aa\nbb\ncc'});
+
 testVim('/ and n/N', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('match');
   helpers.doKeys('/');
@@ -1584,7 +1585,16 @@ testVim('/_case', function(cm, vim, helpers) {
   helpers.doKeys('/');
   helpers.assertCursorAt(1, 6);
 }, { value: 'match nope match \n nope Match' });
-testVim('/_2', function(cm, vim, helpers) {
+testVim('/_2_pcre', function(cm, vim, helpers) {
+  CodeMirror.Vim.setOption('pcre', true);
+  cm.openDialog = helpers.fakeOpenDialog('(word){2}');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(1, 9);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(2, 1);
+}, { value: 'word\n another wordword\n wordwordword\n' });
+testVim('/_2_nopcre', function(cm, vim, helpers) {
+  CodeMirror.Vim.setOption('pcre', false);
   cm.openDialog = helpers.fakeOpenDialog('\\(word\\)\\{2}');
   helpers.doKeys('/');
   helpers.assertCursorAt(1, 9);
@@ -2095,6 +2105,7 @@ testVim('moveTillCharacter', function(cm, vim, helpers){
   eq(4, cm.getCursor().ch);
 }, { value: moveTillCharacterSandbox});
 testVim('searchForPipe', function(cm, vim, helpers){
+  CodeMirror.Vim.setOption('pcre', false);
   cm.setCursor(0, 0);
   // Search for the '|'.
   cm.openDialog = helpers.fakeOpenDialog('|');
@@ -2326,7 +2337,7 @@ testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
   eq('a3\nb2\nc1\nz\ny', cm.getValue());
 }, { value: 'a3\nz\nc1\ny\nb2'});
 
-
+// Basic substitute tests.
 testVim('ex_substitute_same_line', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   helpers.doEx('s/one/two');
@@ -2349,42 +2360,6 @@ testVim('ex_substitute_visual_range', function(cm, vim, helpers) {
   helpers.doEx('\'<,\'>s/\\d/0');
   eq('1\n0\n0\n0\n5', cm.getValue());
 }, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_capture', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  // \n should be a backreference.
-  helpers.doEx('s/\\(\\d+\\)/\\1\\1/')
-  eq('a1111 a1212 a1313', cm.getValue());
-}, { value: 'a11 a12 a13' });
-testVim('ex_substitute_capture2', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  // \n should be a backreference, even if followed by '$'
-  helpers.doEx('s/\\(\\d+\\)/$\\1\\1/')
-  eq('a $00 b', cm.getValue());
-}, { value: 'a 0 b' });
-testVim('ex_substitute_javascript', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  // Throw all the things that javascript likes to treat as special values
-  // into the replace part. All should be literal (this is VIM).
-  helpers.doEx('s/\\(\\d+\\)/$$ $\' $` $& \\1/')
-  eq('a $$ $\' $` $& 0 b', cm.getValue());
-}, { value: 'a 0 b' });
-testVim('ex_substitute_nocapture', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  // $n should be literal, since that is the javascript form, not VIM.
-  helpers.doEx('s/\\(\\d+\\)/$1$1/')
-  eq('a$1$1 a$1$1 a$1$1', cm.getValue());
-}, { value: 'a11 a12 a13' });
-testVim('ex_substitute_nocapture2', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  // \$n should be literal, since that is the javascript form, not VIM.
-  helpers.doEx('s/\\(\\d+\\)/\\$1\\1/')
-  eq('a $10 b', cm.getValue());
-}, { value: 'a 0 b' });
-testVim('ex_substitute_nocapture', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('s/b/$/')
-  eq('a $ c', cm.getValue());
-}, { value: 'a b c' });
 testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
   // If the query is empty, use last query.
   cm.setCursor(1, 0);
@@ -2393,74 +2368,127 @@ testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
   helpers.doEx('s//b');
   eq('abb ab2 ab3', cm.getValue());
 }, { value: 'a11 a12 a13' });
-testVim('ex_substitute_slash_regex', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('%s/\\//|');
-  eq('one|two \n three|four', cm.getValue());
-}, { value: 'one/two \n three/four'});
-testVim('ex_substitute_pipe_regex', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('%s/|/,');
-  eq('one,two \n three,four', cm.getValue());
-}, { value: 'one|two \n three|four'});
-testVim('ex_substitute_or_regex', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('%s/o\\|e\\|u/a');
-  eq('ana|twa \n thraa|faar', cm.getValue());
-}, { value: 'one|two \n three|four'});
-testVim('ex_substitute_or_word_regex', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('%s/\\(one\\|two\\)/five');
-  eq('five|five \n three|four', cm.getValue());
-}, { value: 'one|two \n three|four'});
-testVim('ex_substitute_backslashslash_regex', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('%s/\\\\/,');
-  eq('one,two \n three,four', cm.getValue());
-}, { value: 'one\\two \n three\\four'});
-testVim('ex_substitute_slash_replacement', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('%s/,/\\/');
-  eq('one/two \n three/four', cm.getValue());
-}, { value: 'one,two \n three,four'});
-testVim('ex_substitute_backslash_replacement', function(cm, vim, helpers) {
-  helpers.doEx('%s/,/\\\\/g');
-  eq('one\\two \n three\\four', cm.getValue());
-}, { value: 'one,two \n three,four'});
-testVim('ex_substitute_multibackslash_replacement', function(cm, vim, helpers) {
-  helpers.doEx('%s/,/\\\\\\\\\\\\\\\\/g'); // 16 backslashes.
-  eq('one\\\\\\\\two \n three\\\\\\\\four', cm.getValue()); // 2*8 backslashes.
-}, { value: 'one,two \n three,four'});
-testVim('ex_substitute_braces_word', function(cm, vim, helpers) {
-  helpers.doEx('%s/\\(ab\\)\\{2\\}//g');
-  eq('ab abb ab{2}', cm.getValue());
-}, { value: 'ababab abb ab{2}'});
-testVim('ex_substitute_braces_range', function(cm, vim, helpers) {
-  helpers.doEx('%s/a\\{2,3\\}//g');
-  eq('a   a', cm.getValue());
-}, { value: 'a aa aaa aaaa'});
-testVim('ex_substitute_braces_literal', function(cm, vim, helpers) {
-  helpers.doEx('%s/ab{2}//g');
-  eq('ababab abb ', cm.getValue());
-}, { value: 'ababab abb ab{2}'});
-testVim('ex_substitute_braces_char', function(cm, vim, helpers) {
-  helpers.doEx('%s/ab\\{2\\}//g');
-  eq('ababab  ab{2}', cm.getValue());
-}, { value: 'ababab abb ab{2}'});
-testVim('ex_substitute_braces_no_escape', function(cm, vim, helpers) {
-  helpers.doEx('%s/ab\\{2}//g');
-  eq('ababab  ab{2}', cm.getValue());
-}, { value: 'ababab abb ab{2}'});
-testVim('ex_substitute_count', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('s/\\d/0/i 2');
-  eq('1\n0\n0\n4', cm.getValue());
-}, { value: '1\n2\n3\n4' });
-testVim('ex_substitute_count_with_range', function(cm, vim, helpers) {
+testVim('ex_substitute_javascript', function(cm, vim, helpers) {
+  CodeMirror.Vim.setOption('pcre', false);
   cm.setCursor(1, 0);
-  helpers.doEx('1,3s/\\d/0/ 3');
-  eq('1\n2\n0\n0', cm.getValue());
-}, { value: '1\n2\n3\n4' });
+  // Throw all the things that javascript likes to treat as special values
+  // into the replace part. All should be literal (this is VIM).
+  helpers.doEx('s/\\(\\d+\\)/$$ $\' $` $& \\1/')
+  eq('a $$ $\' $` $& 0 b', cm.getValue());
+}, { value: 'a 0 b' });
+
+// More complex substitute tests that test both pcre and nopcre options.
+function testSubstitute(name, options) {
+  testVim(name + '_pcre', function(cm, vim, helpers) {
+    cm.setCursor(1, 0);
+    CodeMirror.Vim.setOption('pcre', true);
+    helpers.doEx(options.expr);
+    eq(options.expectedValue, cm.getValue());
+  }, options);
+  // If no noPcreExpr is defined, assume that it's the same as the expr.
+  var noPcreExpr = options.noPcreExpr ? options.noPcreExpr : options.expr;
+  testVim(name + '_nopcre', function(cm, vim, helpers) {
+    cm.setCursor(1, 0);
+    CodeMirror.Vim.setOption('pcre', false);
+    helpers.doEx(noPcreExpr);
+    eq(options.expectedValue, cm.getValue());
+  }, options);
+}
+testSubstitute('ex_substitute_capture', {
+  value: 'a11 a12 a13',
+  expectedValue: 'a1111 a1212 a1313',
+  // $n is a backreference
+  expr: 's/(\\d+)/$1$1/',
+  // \n is a backreference.
+  noPcreExpr: 's/\\(\\d+\\)/\\1\\1/'});
+testSubstitute('ex_substitute_capture2', {
+  value: 'a 0 b',
+  expectedValue: 'a $00 b',
+  expr: 's/(\\d+)/$$$1$1/',
+  noPcreExpr: 's/\\(\\d+\\)/$\\1\\1/'});
+testSubstitute('ex_substitute_nocapture', {
+  value: 'a11 a12 a13',
+  expectedValue: 'a$1$1 a$1$1 a$1$1',
+  expr: 's/(\\d+)/$$1$$1',
+  noPcreExpr: 's/\\(\\d+\\)/$1$1/'});
+testSubstitute('ex_substitute_nocapture2', {
+  value: 'a 0 b',
+  expectedValue: 'a $10 b',
+  expr: 's/(\\d+)/$$1$1',
+  noPcreExpr: 's/\\(\\d+\\)/\\$1\\1/'});
+testSubstitute('ex_substitute_nocapture', {
+  value: 'a b c',
+  expectedValue: 'a $ c',
+  expr: 's/b/$$/',
+  noPcreExpr: 's/b/$/'});
+testSubstitute('ex_substitute_slash_regex', {
+  value: 'one/two \n three/four',
+  expectedValue: 'one|two \n three|four',
+  expr: '%s/\\//|'});
+testSubstitute('ex_substitute_pipe_regex', {
+  value: 'one|two \n three|four',
+  expectedValue: 'one,two \n three,four',
+  expr: '%s/\\|/,/',
+  noPcreExpr: '%s/|/,/'});
+testSubstitute('ex_substitute_or_regex', {
+  value: 'one|two \n three|four',
+  expectedValue: 'ana|twa \n thraa|faar',
+  expr: '%s/o|e|u/a',
+  noPcreExpr: '%s/o\\|e\\|u/a'});
+testSubstitute('ex_substitute_or_word_regex', {
+  value: 'one|two \n three|four',
+  expectedValue: 'five|five \n three|four',
+  expr: '%s/(one|two)/five/',
+  noPcreExpr: '%s/\\(one\\|two\\)/five'});
+testSubstitute('ex_substitute_backslashslash_regex', {
+  value: 'one\\two \n three\\four',
+  expectedValue: 'one,two \n three,four',
+  expr: '%s/\\\\/,'});
+testSubstitute('ex_substitute_slash_replacement', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one/two \n three/four',
+  expr: '%s/,/\\/'});
+testSubstitute('ex_substitute_backslash_replacement', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one\\two \n three\\four',
+  expr: '%s/,/\\\\/g'});
+testSubstitute('ex_substitute_multibackslash_replacement', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one\\\\\\\\two \n three\\\\\\\\four', // 2*8 backslashes.
+  expr: '%s/,/\\\\\\\\\\\\\\\\/g'}); // 16 backslashes.
+testSubstitute('ex_substitute_braces_word', {
+  value: 'ababab abb ab{2}',
+  expectedValue: 'ab abb ab{2}',
+  expr: '%s/(ab){2}//g',
+  noPcreExpr: '%s/\\(ab\\)\\{2\\}//g'});
+testSubstitute('ex_substitute_braces_range', {
+  value: 'a aa aaa aaaa',
+  expectedValue: 'a   a',
+  expr: '%s/a{2,3}//g',
+  noPcreExpr: '%s/a\\{2,3\\}//g'});
+testSubstitute('ex_substitute_braces_literal', {
+  value: 'ababab abb ab{2}',
+  expectedValue: 'ababab abb ',
+  expr: '%s/ab\\{2\\}//g',
+  noPcreExpr: '%s/ab{2}//g'});
+testSubstitute('ex_substitute_braces_char', {
+  value: 'ababab abb ab{2}',
+  expectedValue: 'ababab  ab{2}',
+  expr: '%s/ab{2}//g',
+  noPcreExpr: '%s/ab\\{2\\}//g'});
+testSubstitute('ex_substitute_braces_no_escape', {
+  value: 'ababab abb ab{2}',
+  expectedValue: 'ababab  ab{2}',
+  expr: '%s/ab{2}//g',
+  noPcreExpr: '%s/ab\\{2}//g'});
+testSubstitute('ex_substitute_count', {
+  value: '1\n2\n3\n4',
+  expectedValue: '1\n0\n0\n4',
+  expr: 's/\\d/0/i 2'});
+testSubstitute('ex_substitute_count_with_range', {
+  value: '1\n2\n3\n4',
+  expectedValue: '1\n2\n0\n0',
+  expr: '1,3s/\\d/0/ 3'});
 function testSubstituteConfirm(name, command, initialValue, expectedValue, keys, finalPos) {
   testVim(name, function(cm, vim, helpers) {
     var savedOpenDialog = cm.openDialog;
@@ -2542,6 +2570,63 @@ testVim('ex_noh_clearSearchHighlight', function(cm, vim, helpers) {
   helpers.doKeys('n');
   helpers.assertCursorAt(0, 11,'can\'t resume search after clearing highlighting');
 }, { value: 'match nope match \n nope Match' });
+testVim('set_boolean', function(cm, vim, helpers) {
+  CodeMirror.Vim.defineOption('testoption', true, 'boolean');
+  // Test default value is set.
+  is(CodeMirror.Vim.getOption('testoption'));
+  try {
+    // Test fail to set to non-boolean
+    CodeMirror.Vim.setOption('testoption', '5');
+    fail();
+  } catch (expected) {};
+  // Test setOption
+  CodeMirror.Vim.setOption('testoption', false);
+  is(!CodeMirror.Vim.getOption('testoption'));
+});
+testVim('ex_set_boolean', function(cm, vim, helpers) {
+  CodeMirror.Vim.defineOption('testoption', true, 'boolean');
+  // Test default value is set.
+  is(CodeMirror.Vim.getOption('testoption'));
+  try {
+    // Test fail to set to non-boolean
+    helpers.doEx('set testoption=22');
+    fail();
+  } catch (expected) {};
+  // Test setOption
+  helpers.doEx('set notestoption');
+  is(!CodeMirror.Vim.getOption('testoption'));
+});
+testVim('set_string', function(cm, vim, helpers) {
+  CodeMirror.Vim.defineOption('testoption', 'a', 'string');
+  // Test default value is set.
+  eq('a', CodeMirror.Vim.getOption('testoption'));
+  try {
+    // Test fail to set non-string.
+    CodeMirror.Vim.setOption('testoption', true);
+    fail();
+  } catch (expected) {};
+  try {
+    // Test fail to set 'notestoption'
+    CodeMirror.Vim.setOption('notestoption', 'b');
+    fail();
+  } catch (expected) {};
+  // Test setOption
+  CodeMirror.Vim.setOption('testoption', 'c');
+  eq('c', CodeMirror.Vim.getOption('testoption'));
+});
+testVim('ex_set_string', function(cm, vim, helpers) {
+  CodeMirror.Vim.defineOption('testoption', 'a', 'string');
+  // Test default value is set.
+  eq('a', CodeMirror.Vim.getOption('testoption'));
+  try {
+    // Test fail to set 'notestoption'
+    helpers.doEx('set notestoption=b');
+    fail();
+  } catch (expected) {};
+  // Test setOption
+  helpers.doEx('set testoption=c')
+  eq('c', CodeMirror.Vim.getOption('testoption'));
+});
 // TODO: Reset key maps after each test.
 testVim('ex_map_key2key', function(cm, vim, helpers) {
   helpers.doEx('map a x');

From 3cbc201ff054fcd8832259fca841ab3db13ce329 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Feb 2014 17:19:47 +0100
Subject: [PATCH 1030/4742] Fix bug in drawing selection behind collaping
 widget at end of line

---
 lib/codemirror.js |  3 ++-
 test/test.js      | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5b4e1f6438..cf9d8b03dd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1263,6 +1263,7 @@
     var display = cm.display, doc = cm.doc;
     var fragment = document.createDocumentFragment();
     var padding = paddingH(cm.display), leftSide = padding.left, rightSide = display.lineSpace.offsetWidth - padding.right;
+    console.log("Draw range");
 
     function add(left, top, width, bottom) {
       if (top < 0) top = 0;
@@ -1313,7 +1314,7 @@
     } else {
       var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
       var singleVLine = visualLine(fromLine) == visualLine(toLine);
-      var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length : null).end;
+      var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
       var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
       if (singleVLine) {
         if (leftEnd.top < rightStart.top - 2) {
diff --git a/test/test.js b/test/test.js
index 10e1a7f62d..9d3450849a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -782,6 +782,17 @@ testCM("collapsedRangeCoordsChar", function(cm) {
   eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
 }, {value: "123456\nabcdef\nghijkl\nmnopqr\n"});
 
+testCM("collapsedRangeBetweenLinesSelected", function(cm) {
+  var widget = document.createElement("span");
+  widget.textContent = "\u2194";
+  cm.markText(Pos(0, 3), Pos(1, 0), {replacedWith: widget});
+  cm.setSelection(Pos(0, 3), Pos(1, 0));
+  var selElts = byClassName(cm.getWrapperElement(), "CodeMirror-selected");
+  for (var i = 0, w = 0; i < selElts.length; i++)
+    w += selElts[i].offsetWidth;
+  is(w > 0);
+}, {value: "one\ntwo"});
+
 testCM("hiddenLinesAutoUnfold", function(cm) {
   var range = foldLines(cm, 1, 3, true), cleared = 0;
   CodeMirror.on(range, "clear", function() {cleared++;});

From 8ba3a664159fb5941c1feb8158ffc60e824333b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Feb 2014 17:27:57 +0100
Subject: [PATCH 1031/4742] Remove stray console.log

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cf9d8b03dd..d49e7c653f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1263,7 +1263,6 @@
     var display = cm.display, doc = cm.doc;
     var fragment = document.createDocumentFragment();
     var padding = paddingH(cm.display), leftSide = padding.left, rightSide = display.lineSpace.offsetWidth - padding.right;
-    console.log("Draw range");
 
     function add(left, top, width, bottom) {
       if (top < 0) top = 0;

From 485ab2327128f3ebcd2684ec8272ac49810e309c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Feb 2014 17:34:09 +0100
Subject: [PATCH 1032/4742] [linter] Warn on console.* and debugger statements

---
 addon/tern/tern.js | 4 ++--
 test/lint/lint.js  | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 1cc7e972e5..6fbd10c55d 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -176,7 +176,7 @@
 
   function sendDoc(ts, doc) {
     ts.server.request({files: [{type: "full", name: doc.name, text: docValue(ts, doc)}]}, function(error) {
-      if (error) console.error(error);
+      if (error) window.console.error(error);
       else doc.changed = null;
     });
   }
@@ -642,7 +642,7 @@
           send({type: "getFile", err: String(err), text: text, id: data.id});
         });
       } else if (data.type == "debug") {
-        console.log(data.message);
+        window.console.log(data.message);
       } else if (data.id && pending[data.id]) {
         pending[data.id](data.err, data.body);
         delete pending[data.id];
diff --git a/test/lint/lint.js b/test/lint/lint.js
index 0f117d9638..a65deb60be 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -99,6 +99,13 @@ function checkFile(fileName) {
     },
     ForStatement: function(node) {
       checkReusedIndex(node);
+    },
+    MemberExpression: function(node) {
+      if (node.object.type == "Identifier" && node.object.name == "console" && !node.computed)
+        fail("Found console." + node.property.name, node.loc);
+    },
+    DebuggerStatement: function(node) {
+      fail("Found debugger statement", node.loc);
     }
   }, scopePasser);
 

From 9ea15f576fbf7de0593f0b100143b61eff86f90c Mon Sep 17 00:00:00 2001
From: twifkak <me@twifkak.com>
Date: Wed, 26 Feb 2014 15:14:28 -0800
Subject: [PATCH 1033/4742] [manual] Document show-hint "pick" event

Per change authored in https://github.com/marijnh/CodeMirror/pull/1979.
---
 doc/manual.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 6d5cce50e0..9374b6de1a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2137,6 +2137,9 @@ <h2>Addons</h2>
         <dd>Fired when a completion is selected. Passed the completion
         value (string or object) and the DOM node that represents it
         in the menu.</dd>
+        <dt><code><strong>"pick"</strong> (completion)</code></dt>
+        <dd>Fired when a completion is picked. Passed the completion value
+        (string or object).</dd>
         <dt><code><strong>"close"</strong> ()</code></dt>
         <dd>Fired when the completion is finished.</dd>
       </dl>

From 023532406d2ae3ccc098e44da9ce0a8ee3c35f0f Mon Sep 17 00:00:00 2001
From: Narciso Jaramillo <njaramil@adobe.com>
Date: Wed, 26 Feb 2014 15:38:51 -0800
Subject: [PATCH 1034/4742] [sublime keymap] When splitting selection, ignore
 last line if selection ends at beginning of line

---
 keymap/sublime.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index c171f5f387..61098525f9 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -63,8 +63,9 @@
     for (var i = 0; i < ranges.length; i++) {
       var from = ranges[i].from(), to = ranges[i].to();
       for (var line = from.line; line <= to.line; ++line)
-        lineRanges.push({anchor: line == from.line ? from : Pos(line, 0),
-                         head: line == to.line ? to : Pos(line)});
+        if (!(to.line > from.line && line == to.line && to.ch == 0))
+          lineRanges.push({anchor: line == from.line ? from : Pos(line, 0),
+                           head: line == to.line ? to : Pos(line)});
     }
     cm.setSelections(lineRanges, 0);
   };

From 9f0622eb8214ccc74c8a3fc5f0cbe24591265f31 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Feb 2014 18:29:41 +0100
Subject: [PATCH 1035/4742] Add markerCleared, markerAdded events

And listen for them in the merge addon.
---
 addon/merge/merge.js | 8 ++++++++
 lib/codemirror.js    | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 89f852652b..7c58424fbe 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -80,8 +80,16 @@
       }
       set(true);
     }
+    function markChange(_cm, marker) {
+      if (!marker.className || !/\bCodeMirror-merge-/.test(marker.className))
+        set(true);
+    }
     dv.edit.on("change", change);
     dv.orig.on("change", change);
+    dv.edit.on("markerAdded", markChange);
+    dv.edit.on("markerCleared", markChange);
+    dv.orig.on("markerAdded", markChange);
+    dv.orig.on("markerCleared", markChange);
     dv.edit.on("viewportChange", set);
     dv.orig.on("viewportChange", set);
     update();
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 96fff189c9..6862f07de5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3903,6 +3903,7 @@ window.CodeMirror = (function() {
       this.doc.cantEdit = false;
       if (cm) reCheckSelection(cm);
     }
+    signalLater(cm, "markerCleared", cm, this);
     if (withOp) endOperation(cm);
   };
 
@@ -4012,6 +4013,7 @@ window.CodeMirror = (function() {
         regChange(cm, from.line, to.line + 1);
       if (marker.atomic) reCheckSelection(cm);
     }
+    signalLater(cm, "markerAdded", cm, marker);
     return marker;
   }
 

From 4c782baa654eca6a235ab8f7a30965d813e5c208 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Feb 2014 22:56:50 +0100
Subject: [PATCH 1036/4742] [merge addon] React more quickly to marker changes

---
 addon/merge/merge.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 7c58424fbe..ce16e258d9 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -80,16 +80,12 @@
       }
       set(true);
     }
-    function markChange(_cm, marker) {
-      if (!marker.className || !/\bCodeMirror-merge-/.test(marker.className))
-        set(true);
-    }
     dv.edit.on("change", change);
     dv.orig.on("change", change);
-    dv.edit.on("markerAdded", markChange);
-    dv.edit.on("markerCleared", markChange);
-    dv.orig.on("markerAdded", markChange);
-    dv.orig.on("markerCleared", markChange);
+    dv.edit.on("markerAdded", set);
+    dv.edit.on("markerCleared", set);
+    dv.orig.on("markerAdded", set);
+    dv.orig.on("markerCleared", set);
     dv.edit.on("viewportChange", set);
     dv.orig.on("viewportChange", set);
     update();

From 105c4b174791ed605f570da1cc59d623b1833d84 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Mar 2014 10:47:50 +0100
Subject: [PATCH 1037/4742] Include scrollerCutOff when computing scroll height

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d49e7c653f..837c344a29 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -401,7 +401,7 @@
     var totalHeight = docHeight + measure.paddingVert;
     d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
     d.gutters.style.height = Math.max(totalHeight, measure.clientHeight - scrollerCutOff) + "px";
-    var scrollHeight = Math.max(totalHeight, measure.scrollHeight);
+    var scrollHeight = Math.max(totalHeight + scrollerCutOff, measure.scrollHeight);
     var needsH = measure.scrollWidth > measure.clientWidth;
     var needsV = scrollHeight > measure.clientHeight;
     if (needsV) {

From 7d01407ef00d94392da27acf41fbabc1c96ac307 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Mar 2014 11:38:31 +0100
Subject: [PATCH 1038/4742] Move height setting out of updateScrollBars

Issue #2321
---
 lib/codemirror.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 837c344a29..935744b254 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -381,15 +381,13 @@
   // Prepare DOM reads needed to update the scrollbars. Done in one
   // shot to minimize update/measure roundtrips.
   function measureForScrollbars(cm) {
-    var d = cm.display, scroll = d.scroller;
-    if (d.gutters.style.height || d.sizer.style.minHeight || d.heightForcer.style.top)
-      d.gutters.style.height = d.sizer.style.minHeight = d.heightForcer.style.top = "";
+    var scroll = cm.display.scroller;
     return {
-      scrollHeight: scroll.scrollHeight, clientHeight: scroll.clientHeight,
+      clientHeight: scroll.clientHeight,
       barHeight: cm.display.scrollbarV.clientHeight,
       scrollWidth: scroll.scrollWidth, clientWidth: scroll.clientWidth,
       barWidth: cm.display.scrollbarH.clientWidth,
-      paddingVert: paddingVert(cm.display)
+      docHeight: cm.doc.height + paddingVert(cm.display)
     };
   }
 
@@ -397,11 +395,8 @@
   // content.
   function updateScrollbars(cm, measure) {
     if (!measure) measure = measureForScrollbars(cm);
-    var d = cm.display, docHeight = cm.doc.height;
-    var totalHeight = docHeight + measure.paddingVert;
-    d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
-    d.gutters.style.height = Math.max(totalHeight, measure.clientHeight - scrollerCutOff) + "px";
-    var scrollHeight = Math.max(totalHeight + scrollerCutOff, measure.scrollHeight);
+    var d = cm.display;
+    var scrollHeight = measure.docHeight + scrollerCutOff;
     var needsH = measure.scrollWidth > measure.clientWidth;
     var needsV = scrollHeight > measure.clientHeight;
     if (needsV) {
@@ -538,6 +533,7 @@
 
       var barMeasure = measureForScrollbars(cm);
       updateSelection(cm);
+      setDocumentHeight(cm, barMeasure);
       updateScrollbars(cm, barMeasure);
       if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
         forced = true;
@@ -547,7 +543,7 @@
 
       // Clip forced viewport to actual scrollable area.
       if (viewPort && viewPort.top != null)
-        viewPort = {top: Math.min(barMeasure.scrollHeight - barMeasure.clientHeight, viewPort.top)};
+        viewPort = {top: Math.min(barMeasure.docHeight - scrollerCutOff - barMeasure.clientHeight, viewPort.top)};
       // Updated line heights might result in the drawn area not
       // actually covering the viewport. Keep looping until it does.
       visible = visibleLines(cm.display, cm.doc, viewPort);
@@ -615,9 +611,8 @@
     // hidden or updated, if so re-focus it.
     if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
 
-    // Prevent these from interfering with the scroll size during
-    // subsequent call to updateScrollbars
-    display.gutters.style.height = display.sizer.style.minHeight = display.heightForcer.style.top = "";
+    // Prevent selection and cursors from interfering with the scroll
+    // width.
     removeChildren(display.cursorDiv);
     removeChildren(display.selectionDiv);
 
@@ -642,6 +637,11 @@
       setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
   }
 
+  function setDocumentHeight(cm, measure) {
+    cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top =
+      cm.display.gutters.style.height = measure.docHeight + "px";
+  }
+
   // Read the actual heights of the rendered lines, and update their
   // stored heights to match.
   function updateHeightsInViewport(cm) {

From 8cdb38c54b54c655606534c0fb3c55345418b5b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Mar 2014 12:59:51 +0100
Subject: [PATCH 1039/4742] Pass an options object to selection methods

Require explicit turning on of history event merging.

Issue #2305
---
 addon/edit/matchtags.js |   2 +-
 doc/manual.html         |  39 +++++++-----
 lib/codemirror.js       | 136 +++++++++++++++++++---------------------
 3 files changed, 89 insertions(+), 88 deletions(-)

diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index 2b7d22ed84..76a7b87c9a 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -57,7 +57,7 @@
     var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
     if (found) {
       var other = found.at == "close" ? found.open : found.close;
-      if (other) cm.setSelection(other.to, other.from);
+      if (other) cm.extendSelection(other.to, other.from);
     }
   };
 });
diff --git a/doc/manual.html b/doc/manual.html
index 0995750559..310eab7e8b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -477,7 +477,7 @@ <h2>Events</h2>
       that used to be between <code>from</code> and <code>to</code>,
       which is overwritten by this change.</dd>
 
-      <dt id="event_changes"><code><strong>"changes"</strong> (instance: CodeMirror, changes: array&lt;object&lt;)</dt>
+      <dt id="event_changes"><code><strong>"changes"</strong> (instance: CodeMirror, changes: array&lt;object&lt;)</code></dt>
       <dd>Like the <a href="#event_change"><code>"change"</code></a>
       event, but batched per <a href="#operation">operation</a>,
       passing an array containing all the changes that happened in the
@@ -1190,31 +1190,41 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       
       <dt id="somethingSelected"><code><strong>doc.somethingSelected</strong>() → boolean</code></dt>
       <dd>Return true if any text is selected.</dd>
-      <dt id="setCursor"><code><strong>doc.setCursor</strong>(pos: {line, ch}|number, ?ch: number, ?scroll: boolean)</code></dt>
+      <dt id="setCursor"><code><strong>doc.setCursor</strong>(pos: {line, ch}|number, ?ch: number, ?options: object)</code></dt>
       <dd>Set the cursor position. You can either pass a
       single <code>{line, ch}</code> object, or the line and the
       character as two separate parameters. Will replace all
       selections with a single, empty selection at the given position.
-      The cursor is scrolled into view when <code>scroll</code> is
-      false (it defaults to true).</dd>
+      The supported options are the same as for <a href="#setSelection"><code>setSelection</code></a>.</dd>
 
-      <dt id="setSelection"><code><strong>doc.setSelection</strong>(anchor: {line, ch}, ?head: {line, ch}, ?scroll: boolean)</code></dt>
+      <dt id="setSelection"><code><strong>doc.setSelection</strong>(anchor: {line, ch}, ?head: {line, ch}, ?options: object)</code></dt>
       <dd>Set a single selection range. <code>anchor</code>
       and <code>head</code> should be <code>{line, ch}</code>
       objects. <code>head</code> defaults to <code>anchor</code> when
-      not given. The <code>scroll</code> argument determines whether
-      the primary selection head is scrolled into view, and defaults
-      to true.</dd>
-      <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer, ?scroll: boolean)</code></dt>
+      not given. These options are supported:
+      <dl>
+        <dt><code><strong>scroll</strong>: boolean</code></dt>
+        <dd>Determines whether the selection head shoul be scrolled
+        into view. Defaults to true.</dd>
+        <dt><code><strong>merge</strong>: boolean|string</code></dt>
+        <dd>Controls whether the selection history event may be merged
+        with the previous one. Defaults to false.
+        When <code>true</code>, it may be merged when it is similar,
+        and close in <a href="#option_historyEventDelay">time</a> to a
+        previous mergeable event. When it has the value <code>"always"</code>, it
+        will be merged regardless of similarity.</dd>
+      </dl></dd>
+
+      <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer, ?options: object)</code></dt>
       <dd>Sets a new set of selections. There must be at least one
       selection in the given array. When <code>primary</code> is
       given, it determines which selection is the primary one
-      (defaults to the last one). Unless <code>scroll</code> is false, the primary selection head is scrolled into view.</dd>
+      (defaults to the last one). Supports the same options as <a href="#setSelection"><code>setSelection</code></a>.</dd>
       <dt id="addSelection"><code><strong>doc.addSelection</strong>(anchor: {line, ch}, ?head: {line, ch})</code></dt>
       <dd>Adds a new selection to the existing set of selections, and
       makes it the primary selection.</dd>
 
-      <dt id="extendSelection"><code><strong>doc.extendSelection</strong>(from: {line, ch}, ?to: {line, ch}, ?scroll: boolean)</code></dt>
+      <dt id="extendSelection"><code><strong>doc.extendSelection</strong>(from: {line, ch}, ?to: {line, ch}, ?options: object)</code></dt>
       <dd>Similar
       to <a href="#setSelection"><code>setSelection</code></a>, but
       will, if shift is held or
@@ -1225,13 +1235,12 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       (in addition to whatever lies between that region and the
       current anchor). When multiple selections are present, all but
       the primary selection will be dropped by this method.
-      Unless <code>scroll</code> is false, the primary selection head
-      is scrolled into view.</dd>
-      <dt id="extendSelections"><code><strong>doc.extendSelections</strong>(heads: array&lt;{line, ch}&gt;, ?scroll: boolean)</code></dt>
+      Supports the same options as <a href="#setSelection"><code>setSelection</code></a>.</dd>
+      <dt id="extendSelections"><code><strong>doc.extendSelections</strong>(heads: array&lt;{line, ch}&gt;, ?options: object)</code></dt>
       <dd>An equivalent
       of <a href="#extendSelection"><code>extendSelection</code></a>
       that acts on all selections at once.</dd>
-      <dt id="extendSelectionsBy"><code><strong>doc.extendSelectionsBy</strong>(f: function(range: {anchor, head}) → {anchor, head}), ?scroll: boolean)</code></dt>
+      <dt id="extendSelectionsBy"><code><strong>doc.extendSelectionsBy</strong>(f: function(range: {anchor, head}) → {anchor, head}), ?options: object)</code></dt>
       <dd>Applies the given function to all existing selections, and
       calls <a href="#extendSelections"><code>extendSelections</code></a>
       on the result.</dd>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 935744b254..0b9490a5f6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1052,29 +1052,29 @@
   }
 
   // Extend the primary selection range, discard the rest.
-  function extendSelection(doc, head, other, scroll) {
-    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), scroll);
+  function extendSelection(doc, head, other, options) {
+    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options);
   }
 
   // Extend all selections (pos is an array of selections with length
   // equal the number of selections)
-  function extendSelections(doc, heads, scroll) {
+  function extendSelections(doc, heads, options) {
     for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
       out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
     var newSel = normalizeSelection(out, doc.sel.primIndex);
-    setSelection(doc, newSel, scroll);
+    setSelection(doc, newSel, options);
   }
 
   // Updates a single range in the selection.
-  function replaceOneSelection(doc, i, range) {
+  function replaceOneSelection(doc, i, range, options) {
     var ranges = doc.sel.ranges.slice(0);
     ranges[i] = range;
-    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex));
+    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options);
   }
 
   // Reset the selection to a single range.
-  function setSimpleSelection(doc, anchor, head, scroll) {
-    setSelection(doc, simpleSelection(anchor, head), scroll);
+  function setSimpleSelection(doc, anchor, head, options) {
+    setSelection(doc, simpleSelection(anchor, head), options);
   }
 
   // Give beforeSelectionChange handlers a change to influence a
@@ -1095,30 +1095,30 @@
     else return sel;
   }
 
-  function setSelectionReplaceHistory(doc, sel, scroll) {
+  function setSelectionReplaceHistory(doc, sel, options) {
     var done = doc.history.done, last = lst(done);
     if (last && last.ranges) {
       done[done.length - 1] = sel;
-      setSelectionNoUndo(doc, sel, scroll);
+      setSelectionNoUndo(doc, sel, options);
     } else {
-      setSelection(doc, sel, scroll);
+      setSelection(doc, sel, options);
     }
   }
 
   // Set a new selection.
-  function setSelection(doc, sel, scroll) {
-    setSelectionNoUndo(doc, sel, scroll);
-    addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN);
+  function setSelection(doc, sel, options) {
+    setSelectionNoUndo(doc, sel, options);
+    addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
   }
 
-  function setSelectionNoUndo(doc, sel, scroll) {
+  function setSelectionNoUndo(doc, sel, options) {
     if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
       sel = filterSelectionChange(doc, sel);
 
     var bias = cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1;
     setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
 
-    if (scroll !== false && doc.cm)
+    if (!(options && options.scroll === false) && doc.cm)
       ensureCursorVisible(doc.cm);
   }
 
@@ -1136,7 +1136,7 @@
   // Verify that the selection does not partially select any atomic
   // marked ranges.
   function reCheckSelection(doc) {
-    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), false);
+    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll);
   }
 
   // Return a selection that does not partially select any atomic
@@ -2556,7 +2556,6 @@
     var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
     pushPendingSelection(doc, doc.history.done);
-    doc.history.atomicSelection = true;
 
     var ourRange, ourIndex, startSel = doc.sel;
     if (addNew) {
@@ -2592,13 +2591,13 @@
 
     if (!addNew) {
       ourIndex = 0;
-      setSelection(doc, new Selection([ourRange], 0));
+      setSelection(doc, new Selection([ourRange], 0), sel_alwaysMerge);
     } else if (ourIndex > -1) {
-      replaceOneSelection(doc, ourIndex, ourRange);
+      replaceOneSelection(doc, ourIndex, ourRange, sel_alwaysMerge);
     } else {
       ourIndex = doc.sel.ranges.length;
-      setSelection(doc, normalizeSelection(doc.sel.ranges.concat([ourRange]),
-                                           ourIndex), false);
+      setSelection(doc, normalizeSelection(doc.sel.ranges.concat([ourRange]), ourIndex),
+                   {scroll: false, merge: "always"});
     }
 
     var lastPos = start;
@@ -2620,7 +2619,7 @@
             ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
         }
         if (!ranges.length) ranges.push(new Range(start, start));
-        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex));
+        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex), sel_alwaysMerge);
       } else {
         var oldRange = ourRange;
         var anchor = oldRange.anchor, head = pos;
@@ -2639,7 +2638,7 @@
         }
         var ranges = startSel.ranges.slice(0);
         ranges[ourIndex] = new Range(clipPos(doc, anchor), head);
-        setSelection(doc, normalizeSelection(ranges, ourIndex));
+        setSelection(doc, normalizeSelection(ranges, ourIndex), sel_alwaysMerge);
       }
     }
 
@@ -2677,7 +2676,6 @@
       off(document, "mousemove", move);
       off(document, "mouseup", up);
       pushPendingSelection(doc, doc.history.done);
-      doc.history.atomicSelection = false;
     }
 
     var move = operation(cm, function(e) {
@@ -3071,7 +3069,7 @@
     // and 'resetSelectionOnContextMenu' option is true.
     var reset = cm.options.resetSelectionOnContextMenu;
     if (reset && cm.doc.sel.contains(pos) == -1)
-      operation(cm, setSelection)(cm.doc, simpleSelection(pos), false);
+      operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
 
     var oldCSS = display.input.style.cssText;
     display.inputDiv.style.position = "absolute";
@@ -3358,7 +3356,7 @@
     if (!selAfter) selAfter = computeSelAfterChange(doc, change, null);
     if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
     else updateDoc(doc, change, spans);
-    setSelection(doc, selAfter, false);
+    setSelection(doc, selAfter, sel_dontScroll);
   }
 
   // Handle the interaction of a change to a document with the editor
@@ -4055,7 +4053,7 @@
           return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
         else
           return dir < 0 ? range.from() : range.to();
-      });
+      }, sel_mayMerge);
     }),
 
     deleteH: methodOp(function(dir, unit) {
@@ -4095,7 +4093,7 @@
         if (unit == "page" && range == doc.sel.primary())
           addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top);
         return pos;
-      });
+      }, sel_mayMerge);
       if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
         doc.sel.ranges[i].goalColumn = goals[i];
     }),
@@ -4276,7 +4274,6 @@
   option("pollInterval", 100);
   option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
   option("historyEventDelay", 500);
-  option("historySelectionEventDelay", 1000);
   option("viewportMargin", 10, function(cm){cm.refresh();}, true);
   option("maxHighlightLength", 10000, resetModeState, true);
   option("moveInputWithCursor", true, function(cm, val) {
@@ -4424,9 +4421,9 @@
   // Commands are parameter-less actions that can be performed on an
   // editor, mostly used for keybindings.
   var commands = CodeMirror.commands = {
-    selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), false);},
+    selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);},
     singleSelection: function(cm) {
-      cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), false);
+      cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll);
     },
     killLine: function(cm) {
       deleteNearSelection(cm, function(range) {
@@ -4459,7 +4456,7 @@
     goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
     goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
     goLineStart: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); });
+      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); }, sel_mayMerge);
     },
     goLineStartSmart: function(cm) {
       cm.extendSelectionsBy(function(range) {
@@ -4472,22 +4469,22 @@
           return Pos(start.line, inWS ? 0 : firstNonWS);
         }
         return start;
-      });
+      }, sel_mayMerge);
     },
     goLineEnd: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); });
+      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); }, sel_mayMerge);
     },
     goLineRight: function(cm) {
       cm.extendSelectionsBy(function(range) {
         var top = cm.charCoords(range.head, "div").top + 5;
         return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-      });
+      }, sel_mayMerge);
     },
     goLineLeft: function(cm) {
       cm.extendSelectionsBy(function(range) {
         var top = cm.charCoords(range.head, "div").top + 5;
         return cm.coordsChar({left: 0, top: top}, "div");
-      });
+      }, sel_mayMerge);
     },
     goLineUp: function(cm) {cm.moveV(-1, "line");},
     goLineDown: function(cm) {cm.moveV(1, "line");},
@@ -5967,7 +5964,7 @@
 
     if (typeof text == "string") text = splitLines(text);
     updateDoc(this, {from: start, to: start, text: text});
-    setSelection(this, simpleSelection(start), false);
+    setSelection(this, simpleSelection(start), sel_dontScroll);
   };
 
   Doc.prototype = createObj(BranchChunk.prototype, {
@@ -6041,33 +6038,33 @@
     listSelections: function() { return this.sel.ranges; },
     somethingSelected: function() {return this.sel.somethingSelected();},
 
-    setCursor: docMethodOp(function(line, ch, scroll) {
-      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, scroll);
+    setCursor: docMethodOp(function(line, ch, options) {
+      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
     }),
-    setSelection: docMethodOp(function(anchor, head, scroll) {
-      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), scroll);
+    setSelection: docMethodOp(function(anchor, head, options) {
+      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
     }),
-    extendSelection: docMethodOp(function(head, other, scroll) {
-      extendSelection(this, clipPos(this, head), other && clipPos(this, other), scroll);
+    extendSelection: docMethodOp(function(head, other, options) {
+      extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
     }),
-    extendSelections: docMethodOp(function(heads, scroll) {
-      extendSelections(this, clipPosArray(this, heads, scroll));
+    extendSelections: docMethodOp(function(heads, options) {
+      extendSelections(this, clipPosArray(this, heads, options));
     }),
-    extendSelectionsBy: docMethodOp(function(f, scroll) {
-      extendSelections(this, map(this.sel.ranges, f), scroll);
+    extendSelectionsBy: docMethodOp(function(f, options) {
+      extendSelections(this, map(this.sel.ranges, f), options);
     }),
-    setSelections: docMethodOp(function(ranges, primary, scroll) {
+    setSelections: docMethodOp(function(ranges, primary, options) {
       if (!ranges.length) return;
       for (var i = 0, out = []; i < ranges.length; i++)
         out[i] = new Range(clipPos(this, ranges[i].anchor),
                            clipPos(this, ranges[i].head));
       if (primary == null) primary = ranges.length - 1;
-      setSelection(this, normalizeSelection(out, primary), scroll);
+      setSelection(this, normalizeSelection(out, primary), options);
     }),
-    addSelection: docMethodOp(function(anchor, head, scroll) {
+    addSelection: docMethodOp(function(anchor, head, options) {
       var ranges = this.sel.ranges.slice(0);
       ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
-      setSelection(this, normalizeSelection(ranges, ranges.length - 1), scroll);
+      setSelection(this, normalizeSelection(ranges, ranges.length - 1), options);
     }),
 
     getSelection: function(lineSep) {
@@ -6424,9 +6421,6 @@
     this.pendingSelection = doc.sel;
     // Used by the isClean() method
     this.generation = this.maxGeneration = startGen || 1;
-    // Used to enforce that a selection-drag only adds one selection
-    // to the history
-    this.atomicSelection = false;
   }
 
   // Create a history change event from an updateDoc-style change
@@ -6505,25 +6499,20 @@
   // the pending selection in the history, and pushes the old pending
   // selection into the 'done' array when it was significantly
   // different (in number of selected ranges, emptiness, or time).
-  function addSelectionToHistory(doc, sel, opId) {
+  function addSelectionToHistory(doc, sel, opId, options) {
     var hist = doc.history, pend = hist.pendingSelection, now = +new Date;
+    var merge = options && options.merge;
+
+    // A new event is started when merge is false, the number of
+    // selections changed, the selection moved from empty to non-empty
+    // or the other way around, or when a historyEventDelay has
+    // elapsed.
+    if (pend && merge != "always" && opId != hist.lastOp &&
+        (!merge || pend.ranges.length != sel.ranges.length ||
+         sel.somethingSelected() != pend.somethingSelected() ||
+         now - hist.pendingSelTime > (doc.cm ? doc.cm.options.historyEventDelay : 500)))
+      pushPendingSelection(doc, hist.done);
 
-    if (pend && !hist.atomicSelection && opId != hist.lastOp) {
-      // A new event is started when the number of selections changed,
-      // the selection moves from empty to non-empty or the other way
-      // around, or when a historySelectionEventDelay has elapsed.
-      var different = pend.ranges.length != sel.ranges.length ||
-        sel.somethingSelected() != pend.somethingSelected() ||
-        now - hist.pendingSelTime > (doc.cm ? doc.cm.options.historySelectionEventDelay : 1000);
-      // Non-overlapping, non-empty selections also start a new event.
-      for (var i = 0; !different && i < sel.ranges.length; i++) {
-        var selRange = sel.ranges[i], pendRange = pend.ranges[i];
-        if (!selRange.empty())
-          different = cmp(selRange.from(), pendRange.to()) > 0 ||
-                      cmp(selRange.to(), pendRange.from()) < 0;
-      }
-      if (different) pushPendingSelection(doc, hist.done);
-    }
     hist.pendingSelection = sel;
     hist.pendingSelTime = now;
     hist.lastOp = opId;
@@ -6777,6 +6766,9 @@
   // handling this'.
   var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
 
+  // Reused option objects for setSelection & friends
+  var sel_dontScroll = {scroll: false}, sel_alwaysMerge = {merge: "always"}, sel_mayMerge = {merge: true};
+
   function Delayed() {this.id = null;}
   Delayed.prototype.set = function(ms, f) {
     clearTimeout(this.id);

From 3d225b5a201096de2f5e14db7d1e57c680fde042 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Fri, 28 Feb 2014 12:37:18 -0800
Subject: [PATCH 1040/4742] [vim] A basic working implementation of macros that
 exercise insert mode

---
 keymap/vim.js    | 180 ++++++++++++++++++++++++++++-------------------
 test/vim_test.js |  25 ++++++-
 2 files changed, 132 insertions(+), 73 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 7f7539e3cb..18e5caa273 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -513,17 +513,33 @@
       };
     };
 
+    // Returns an object to track the changes associated insert mode.  It
+    // clones the object that is passed in, or creates an empty object one if
+    // none is provided.
+    var createInsertModeChanges = function(c) {
+      if (c) {
+        // Copy construction
+        return {
+          changes: c.changes,
+          expectCursorActivityForChange: c.expectCursorActivityForChange
+        };
+      }
+      return {
+        // Change list
+        changes: [],
+        // Set to true on change, false on cursorActivity.
+        expectCursorActivityForChange: false
+      };
+    };
+
     var createMacroState = function() {
       return {
-        macroKeyBuffer: [],
+        keyBuffer: [],
+        insertModeBuffer: [],
         latestRegister: undefined,
         inReplay: false,
-        lastInsertModeChanges: {
-          changes: [], // Change list
-          expectCursorActivityForChange: false // Set to true on change, false on cursorActivity.
-        },
+        lastInsertModeChanges: createInsertModeChanges(),
         enteredMacroMode: undefined,
-        isMacroPlaying: false,
         toggle: function(cm, registerName) {
           if (this.enteredMacroMode) { //onExit
             this.enteredMacroMode(); // close dialog
@@ -725,16 +741,16 @@
      */
     function Register(text, linewise) {
       this.clear();
-      if (text) {
-        this.set(text, linewise);
-      }
+      this.text = text || '';
+      this.linewise = !!linewise;
+      this.insertModeChanges = [];
     }
     Register.prototype = {
-      set: function(text, linewise) {
+      setText: function(text, linewise) {
         this.text = text;
         this.linewise = !!linewise;
       },
-      append: function(text, linewise) {
+      appendText: function(text, linewise) {
         // if this register has ever been set to linewise, use linewise.
         if (linewise || this.linewise) {
           this.text += '\n' + text;
@@ -746,6 +762,7 @@
       clear: function() {
         this.text = '';
         this.linewise = false;
+        this.insertModeChanges = [];
       },
       toString: function() { return this.text; }
     };
@@ -767,7 +784,7 @@
         if (linewise && text.charAt(0) == '\n') {
           text = text.slice(1) + '\n';
         }
-        if(linewise && text.charAt(text.length - 1) !== '\n'){
+        if (linewise && text.charAt(text.length - 1) !== '\n'){
           text += '\n';
         }
         // Lowercase and uppercase registers refer to the same register.
@@ -796,7 +813,7 @@
               break;
           }
           // Make sure the unnamed register is set to what just happened
-          this.unamedRegister.set(text, linewise);
+          this.unamedRegister.setText(text, linewise);
           return;
         }
 
@@ -808,13 +825,10 @@
           // register.
           this.unamedRegister.append(text, linewise);
         } else {
-          register.set(text, linewise);
-          this.unamedRegister.set(text, linewise);
+          register.setText(text, linewise);
+          this.unamedRegister.setText(text, linewise);
         }
       },
-      setRegisterText: function(name, text, linewise) {
-        this.getRegister(name).set(text, linewise);
-      },
       // Gets the register named @name.  If one of @name doesn't already exist,
       // create it.  If @name is invalid, return the unamedRegister.
       getRegister: function(name) {
@@ -855,7 +869,7 @@
             // Match commands that take <character> as an argument.
             if (command.keys[keys.length - 1] == 'character') {
               selectedCharacter = keys[keys.length - 1];
-              if(selectedCharacter.length>1){
+              if (selectedCharacter.length>1){
                 switch(selectedCharacter){
                   case '<CR>':
                     selectedCharacter='\n';
@@ -1412,7 +1426,7 @@
             (line > last && cur.line == last)) {
           return;
         }
-        if(motionArgs.toFirstChar){
+        if (motionArgs.toFirstChar){
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
           vim.lastHPos = endCh;
         }
@@ -1784,23 +1798,21 @@
         }
         cm.scrollTo(null, y);
       },
-      replayMacro: function(cm, actionArgs) {
+      replayMacro: function(cm, actionArgs, vim) {
         var registerName = actionArgs.selectedCharacter;
         var repeat = actionArgs.repeat;
         var macroModeState = vimGlobalState.macroModeState;
         if (registerName == '@') {
           registerName = macroModeState.latestRegister;
         }
-        var keyBuffer = parseRegisterToKeyBuffer(macroModeState, registerName);
         while(repeat--){
-          executeMacroKeyBuffer(cm, macroModeState, keyBuffer);
+          executeMacroRegister(cm, vim, macroModeState, registerName);
         }
       },
       exitMacroRecordMode: function() {
         var macroModeState = vimGlobalState.macroModeState;
         macroModeState.toggle();
-        parseKeyBufferToRegister(macroModeState.latestRegister,
-                                 macroModeState.macroKeyBuffer);
+        saveMacroToRegister(macroModeState);
       },
       enterMacroRecordMode: function(cm, actionArgs) {
         var macroModeState = vimGlobalState.macroModeState;
@@ -2024,7 +2036,7 @@
         var curStart = cm.getCursor();
         var replaceTo;
         var curEnd;
-        if(vim.visualMode){
+        if (vim.visualMode){
           curStart=cm.getCursor('start');
           curEnd=cm.getCursor('end');
           // workaround to catch the character under the cursor
@@ -2038,8 +2050,8 @@
           }
           curEnd = { line: curStart.line, ch: replaceTo };
         }
-        if(replaceWith=='\n'){
-          if(!vim.visualMode) cm.replaceRange('', curStart, curEnd);
+        if (replaceWith=='\n'){
+          if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
           // special case, where vim help says to replace by just one line-break
           (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
         }else {
@@ -2047,7 +2059,7 @@
           //replace all characters in range by selected, but keep linebreaks
           replaceWithStr=replaceWithStr.replace(/[^\n]/g,replaceWith);
           cm.replaceRange(replaceWithStr, curStart, curEnd);
-          if(vim.visualMode){
+          if (vim.visualMode){
             cm.setCursor(curStart);
             exitVisualMode(cm);
           }else{
@@ -2068,9 +2080,9 @@
           token = match[0];
           start = match.index;
           end = start + token.length;
-          if(cur.ch < end)break;
+          if (cur.ch < end)break;
         }
-        if(!actionArgs.backtrack && (end <= cur.ch))return;
+        if (!actionArgs.backtrack && (end <= cur.ch))return;
         if (token) {
           var increment = actionArgs.increase ? 1 : -1;
           var number = parseInt(token) + (increment * actionArgs.repeat);
@@ -2306,7 +2318,7 @@
     }
 
     function recordJumpPosition(cm, oldCur, newCur) {
-      if(!cursorEqual(oldCur, newCur)) {
+      if (!cursorEqual(oldCur, newCur)) {
         vimGlobalState.jumpList.add(cm, oldCur, newCur);
       }
     }
@@ -2329,7 +2341,7 @@
         isComplete: function(state) {
           if (state.nextCh === state.symb) {
             state.depth++;
-            if(state.depth >= 1)return true;
+            if (state.depth >= 1)return true;
           } else if (state.nextCh === state.reverseSymb) {
             state.depth--;
           }
@@ -2361,7 +2373,7 @@
           state.reverseSymb = state.symb === '{' ? '}' : '{';
         },
         isComplete: function(state) {
-          if(state.nextCh === state.symb)return true;
+          if (state.nextCh === state.symb)return true;
           return false;
         }
       },
@@ -2383,7 +2395,7 @@
               }
               state.depth--;
             }
-            if(token === 'else' && state.depth === 0)return true;
+            if (token === 'else' && state.depth === 0)return true;
           }
           return false;
         }
@@ -2408,10 +2420,10 @@
         curMoveThrough: false
       };
       var mode = symbolToMode[symb];
-      if(!mode)return cur;
+      if (!mode)return cur;
       var init = findSymbolModes[mode].init;
       var isComplete = findSymbolModes[mode].isComplete;
-      if(init)init(state);
+      if (init) { init(state); }
       while (line !== endLine && repeat) {
         state.index += increment;
         state.nextCh = state.lineText.charAt(state.index);
@@ -2696,14 +2708,14 @@
       var end = findMatchedSymbol(cm, cur, revSymb);
       var start = findMatchedSymbol(cm, end);
 
-      if((start.line == end.line && start.ch > end.ch)
+      if ((start.line == end.line && start.ch > end.ch)
           || (start.line > end.line)) {
         var tmp = start;
         start = end;
         end = tmp;
       }
 
-      if(inclusive) {
+      if (inclusive) {
         end.ch += 1;
       } else {
         start.ch += 1;
@@ -3327,7 +3339,7 @@
       var keys = [];
       while (str) {
         match = (/<\w+-.+?>|<\w+>|./).exec(str);
-        if(match === null)break;
+        if (match === null)break;
         key = match[0];
         str = str.substring(match.index + key.length);
         keys.push(key);
@@ -3767,7 +3779,8 @@
 
     function exitInsertMode(cm) {
       var vim = cm.state.vim;
-      var inReplay = vimGlobalState.macroModeState.inReplay;
+      var macroModeState = vimGlobalState.macroModeState;
+      var inReplay = macroModeState.inReplay;
       if (!inReplay) {
         cm.off('change', onChange);
         cm.off('cursorActivity', onCursorActivity);
@@ -3786,6 +3799,9 @@
       cm.setOption('disableInput', true);
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      if (macroModeState.enteredMacroMode) {
+        logInsertModeChange(macroModeState);
+      }
     }
 
     CodeMirror.keyMap['vim-insert'] = {
@@ -3813,41 +3829,56 @@
       var match, key;
       var register = vimGlobalState.registerController.getRegister(registerName);
       var text = register.toString();
-      var macroKeyBuffer = macroModeState.macroKeyBuffer;
+      var keyBuffer = macroModeState.keyBuffer;
       emptyMacroKeyBuffer(macroModeState);
       do {
         match = (/<\w+-.+?>|<\w+>|./).exec(text);
-        if(match === null)break;
+        if (match === null)break;
         key = match[0];
         text = text.substring(match.index + key.length);
-        macroKeyBuffer.push(key);
+        keyBuffer.push(key);
       } while (text);
-      return macroKeyBuffer;
+      return keyBuffer;
     }
 
-    function parseKeyBufferToRegister(registerName, keyBuffer) {
-      var text = keyBuffer.join('');
-      vimGlobalState.registerController.setRegisterText(registerName, text);
+    function saveMacroToRegister(macroModeState) {
+      var name = macroModeState.latestRegister;
+      var text = macroModeState.keyBuffer.join('');
+      var register = vimGlobalState.registerController.getRegister(name);
+      register.setText(text, false);
+      register.insertModeChanges = macroModeState.insertModeBuffer;
+      macroModeState.insertModeBuffer = [];
     }
 
     function emptyMacroKeyBuffer(macroModeState) {
-      if(macroModeState.isMacroPlaying)return;
-      var macroKeyBuffer = macroModeState.macroKeyBuffer;
-      macroKeyBuffer.length = 0;
+      if (macroModeState.inReplay) { return; }
+      macroModeState.keyBuffer.length = 0;
     }
 
-    function executeMacroKeyBuffer(cm, macroModeState, keyBuffer) {
-      macroModeState.isMacroPlaying = true;
+    function executeMacroRegister(cm, vim, macroModeState, registerName) {
+      var keyBuffer = parseRegisterToKeyBuffer(macroModeState, registerName);
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      var j = 0;
+      macroModeState.inReplay = true;
       for (var i = 0, len = keyBuffer.length; i < len; i++) {
         CodeMirror.Vim.handleKey(cm, keyBuffer[i]);
+        if (vim.insertMode) {
+          repeatInsertModeChanges(cm, register.insertModeChanges[j++].changes, 1);
+          exitInsertMode(cm);
+        }
       };
-      macroModeState.isMacroPlaying = false;
+      macroModeState.inReplay = false;
     }
 
     function logKey(macroModeState, key) {
-      if(macroModeState.isMacroPlaying)return;
-      var macroKeyBuffer = macroModeState.macroKeyBuffer;
-      macroKeyBuffer.push(key);
+      if (macroModeState.inReplay) { return; }
+      macroModeState.keyBuffer.push(key);
+    }
+
+    function logInsertModeChange(macroModeState) {
+      if (macroModeState.inReplay) { return; }
+      macroModeState.insertModeBuffer.push(
+        createInsertModeChanges(macroModeState.lastInsertModeChanges));
     }
 
     /**
@@ -3857,15 +3888,17 @@
     function onChange(_cm, changeObj) {
       var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
-      while (changeObj) {
-        lastChange.expectCursorActivityForChange = true;
-        if (changeObj.origin == '+input' || changeObj.origin == 'paste'
-            || changeObj.origin === undefined /* only in testing */) {
-          var text = changeObj.text.join('\n');
-          lastChange.changes.push(text);
+      if (!macroModeState.inReplay) {
+        while(changeObj) {
+          lastChange.expectCursorActivityForChange = true;
+          if (changeObj.origin == '+input' || changeObj.origin == 'paste'
+              || changeObj.origin === undefined /* only in testing */) {
+            var text = changeObj.text.join('\n');
+            lastChange.changes.push(text);
+          }
+          // Change objects may be chained with next.
+          changeObj = changeObj.next;
         }
-        // Change objects may be chained with next.
-        changeObj = changeObj.next;
       }
     }
 
@@ -3876,6 +3909,7 @@
     */
     function onCursorActivity() {
       var macroModeState = vimGlobalState.macroModeState;
+      if (macroModeState.inReplay) { return; }
       var lastChange = macroModeState.lastInsertModeChanges;
       if (lastChange.expectCursorActivityForChange) {
         lastChange.expectCursorActivityForChange = false;
@@ -3931,10 +3965,15 @@
       }
       function repeatInsert(repeat) {
         if (macroModeState.lastInsertModeChanges.changes.length > 0) {
-          // For some reason, repeat cw in desktop VIM will does not repeat
+          // For some reason, repeat cw in desktop VIM does not repeat
           // insert mode changes. Will conform to that behavior.
           repeat = !vim.lastEditActionCommand ? 1 : repeat;
-          repeatLastInsertModeChanges(cm, repeat, macroModeState);
+          var changeObject = macroModeState.lastInsertModeChanges;
+          // This isn't strictly necessary, but since lastInsertModeChanges is
+          // supposed to be immutable during replay, this helps catch bugs.
+          macroModeState.lastInsertModeChanges = {};
+          repeatInsertModeChanges(cm, changeObject.changes, repeat);
+          macroModeState.lastInsertModeChanges = changeObject;
         }
       }
       vim.inputState = vim.lastEditInputState;
@@ -3963,8 +4002,7 @@
       macroModeState.inReplay = false;
     };
 
-    function repeatLastInsertModeChanges(cm, repeat, macroModeState) {
-      var lastChange = macroModeState.lastInsertModeChanges;
+    function repeatInsertModeChanges(cm, changes, repeat) {
       function keyHandler(binding) {
         if (typeof binding == 'string') {
           CodeMirror.commands[binding](cm);
@@ -3974,8 +4012,8 @@
         return true;
       }
       for (var i = 0; i < repeat; i++) {
-        for (var j = 0; j < lastChange.changes.length; j++) {
-          var change = lastChange.changes[j];
+        for (var j = 0; j < changes.length; j++) {
+          var change = changes[j];
           if (change instanceof InsertModeKey) {
             CodeMirror.lookupKey(change.keyName, ['vim-insert'], keyHandler);
           } else {
diff --git a/test/vim_test.js b/test/vim_test.js
index 0dbecaadbe..ba4f8f88d3 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1197,14 +1197,14 @@ testVim('p', function(cm, vim, helpers) {
 }, { value: '___' });
 testVim('p_register', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
-  helpers.getRegisterController().getRegister('a').set('abc\ndef', false);
+  helpers.getRegisterController().getRegister('a').setText('abc\ndef', false);
   helpers.doKeys('"', 'a', 'p');
   eq('__abc\ndef_', cm.getValue());
   helpers.assertCursorAt(1, 2);
 }, { value: '___' });
 testVim('p_wrong_register', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
-  helpers.getRegisterController().getRegister('a').set('abc\ndef', false);
+  helpers.getRegisterController().getRegister('a').setText('abc\ndef', false);
   helpers.doKeys('p');
   eq('___', cm.getValue());
   helpers.assertCursorAt(0, 1);
@@ -1724,6 +1724,27 @@ testVim('#', function(cm, vim, helpers) {
   helpers.doKeys('#');
   helpers.assertCursorAt(1, 8);
 }, { value: '    :=  match nomatch match \nnomatch Match' });
+testVim('macro_insert', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', '0', 'i');
+  cm.replaceRange('foo', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('q', '@', 'a');
+  eq('foofoo', cm.getValue());
+}, { value: ''});
+testVim('macro_parens', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'z', 'i');
+  cm.replaceRange('(', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('e', 'a');
+  cm.replaceRange(')', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('q');
+  helpers.doKeys('w', '@', 'z');
+  helpers.doKeys('w', '@', 'z');
+  eq('(see) (spot) (run)', cm.getValue());
+}, { value: 'see spot run'});
 testVim('.', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('2', 'd', 'w');

From 2160f4a4d5da0bd1bfe713a27dade45b6139d4a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Mar 2014 10:29:09 +0100
Subject: [PATCH 1041/4742] [sql-hint addon] Work slightly better on namespaced
 table names

Issue #2323
---
 addon/hint/sql-hint.js | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index d00781cff9..baa3f83369 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -7,6 +7,7 @@
     QUERY_DIV: ";",
     ALIAS_KEYWORD: "AS"
   };
+  var Pos = CodeMirror.Pos;
 
   function getKeywords(editor) {
     var mode = editor.doc.modeOption;
@@ -36,7 +37,7 @@
     var cur = editor.getCursor();
     var token = editor.getTokenAt(cur);
     var string = token.string.substr(1);
-    var prevCur = CodeMirror.Pos(cur.line, token.start);
+    var prevCur = Pos(cur.line, token.start);
     var table = editor.getTokenAt(prevCur).string;
     if( !tables.hasOwnProperty( table ) ){
       table = findTableByAlias(table, editor);
@@ -64,7 +65,7 @@
   }
 
   function convertNumberToCur( num ){
-    return CodeMirror.Pos(Math.floor( num ), +num.toString().split( '.' ).pop());
+    return Pos(Math.floor( num ), +num.toString().split( '.' ).pop());
   }
 
   function findTableByAlias(alias, editor) {
@@ -75,8 +76,8 @@
     var table = "";
     var separator = [];
     var validRange = {
-      start: CodeMirror.Pos( 0, 0 ),
-      end: CodeMirror.Pos( editor.lastLine(), editor.getLineHandle( editor.lastLine() ).length )
+      start: Pos( 0, 0 ),
+      end: Pos( editor.lastLine(), editor.getLineHandle( editor.lastLine() ).length )
     };
 
     //add separator
@@ -85,8 +86,8 @@
       separator.push( doc.posFromIndex(indexOfSeparator));
       indexOfSeparator = fullQuery.indexOf( CONS.QUERY_DIV, indexOfSeparator+1);
     }
-    separator.unshift( CodeMirror.Pos( 0, 0 ) );
-    separator.push( CodeMirror.Pos( editor.lastLine(), editor.getLineHandle( editor.lastLine() ).text.length ) );
+    separator.unshift( Pos( 0, 0 ) );
+    separator.push( Pos( editor.lastLine(), editor.getLineHandle( editor.lastLine() ).text.length ) );
 
     //find valieRange
     var prevItem = 0;
@@ -122,24 +123,31 @@
     tables = (options && options.tables) || {};
     keywords = keywords || getKeywords(editor);
     var cur = editor.getCursor();
-    var token = editor.getTokenAt(cur);
+    var token = editor.getTokenAt(cur), end = token.end;
     var result = [];
     var search = token.string.trim();
 
-    addMatches(result, search, keywords,
-        function(w) {return w.toUpperCase();});
-
-    addMatches(result, search, tables,
-        function(w) {return w;});
-
-    if(search.lastIndexOf('.') === 0) {
+    if (search.charAt(0) == ".") {
       columnCompletion(result, editor);
+      if (!result.length) {
+        while (token.start && search.charAt(0) == ".") {
+          token = editor.getTokenAt(Pos(cur.line, token.start - 1));
+          search = token.string + search;
+        }
+        addMatches(result, search, tables,
+                   function(w) {return w;});
+      }
+    } else {
+      addMatches(result, search, keywords,
+                 function(w) {return w.toUpperCase();});
+      addMatches(result, search, tables,
+                 function(w) {return w;});
     }
 
     return {
       list: result,
-        from: CodeMirror.Pos(cur.line, token.start),
-        to: CodeMirror.Pos(cur.line, token.end)
+        from: Pos(cur.line, token.start),
+        to: Pos(cur.line, end)
     };
   }
   CodeMirror.registerHelper("hint", "sql", sqlHint);

From 0c78b3c2df28b73bcd5129af05fc98caed6d9789 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Mar 2014 10:34:54 +0100
Subject: [PATCH 1042/4742] Bump historyEventDelay's default value to 1250

Issue #2305
---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 310eab7e8b..3ba8ac5bcd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -340,7 +340,7 @@ <h2>Configuration</h2>
       <dt id="option_historyEventDelay"><code><strong>historyEventDelay</strong>: integer</code></dt>
       <dd>The period of inactivity (in milliseconds) that will cause a
       new history event to be started when typing or deleting.
-      Defaults to 500.</dd>
+      Defaults to 1250.</dd>
 
       <dt id="option_tabindex"><code><strong>tabindex</strong>: integer</code></dt>
       <dd>The <a href="http://www.w3.org/TR/html401/interact/forms.html#adef-tabindex">tab
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0b9490a5f6..a602de440a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4273,7 +4273,7 @@
   option("addModeClass", false, resetModeState, true);
   option("pollInterval", 100);
   option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
-  option("historyEventDelay", 500);
+  option("historyEventDelay", 1250);
   option("viewportMargin", 10, function(cm){cm.refresh();}, true);
   option("maxHighlightLength", 10000, resetModeState, true);
   option("moveInputWithCursor", true, function(cm, val) {

From c261544ff1a4f3733315e91ac65e36c76e28030c Mon Sep 17 00:00:00 2001
From: Narciso Jaramillo <njaramil@adobe.com>
Date: Mon, 3 Mar 2014 13:49:39 -0800
Subject: [PATCH 1043/4742] [manual] Minor typo fix

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

diff --git a/doc/manual.html b/doc/manual.html
index 3ba8ac5bcd..01d0b00814 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1204,7 +1204,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       not given. These options are supported:
       <dl>
         <dt><code><strong>scroll</strong>: boolean</code></dt>
-        <dd>Determines whether the selection head shoul be scrolled
+        <dd>Determines whether the selection head should be scrolled
         into view. Defaults to true.</dd>
         <dt><code><strong>merge</strong>: boolean|string</code></dt>
         <dd>Controls whether the selection history event may be merged

From 401885cb1ad23a30466ab7edb397d135bffe2753 Mon Sep 17 00:00:00 2001
From: Adam Ahmed <aahmed@atlassian.com>
Date: Tue, 4 Mar 2014 17:18:35 +1100
Subject: [PATCH 1044/4742] Fixes #2329 - include widget heights in estimates

If a line has widgets with heights, use them when estimating line height.

This prevents a .refresh() call from reverting to less accurate line
heights.
---
 lib/codemirror.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6862f07de5..6fb06eed0c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -230,12 +230,17 @@ window.CodeMirror = (function() {
     var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
     var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
     return function(line) {
-      if (lineIsHidden(cm.doc, line))
-        return 0;
-      else if (wrapping)
-        return (Math.ceil(line.text.length / perLine) || 1) * th;
+      if (lineIsHidden(cm.doc, line)) return 0;
+
+      var widgetsHeight = 0;
+      if (line.widgets) for (var i = 0; i < line.widgets.length; i++) {
+        if (line.widgets[i].height) widgetsHeight += line.widgets[i].height;
+      }
+
+      if (wrapping)
+        return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th;
       else
-        return th;
+        return widgetsHeight + th;
     };
   }
 

From 669901be9f8ebbc263517589b03cc40493231290 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Mar 2014 12:17:06 +0100
Subject: [PATCH 1045/4742] Fix unstable horizontal scrolling near right side

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a602de440a..b478863b83 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -631,7 +631,7 @@
     var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
     display.maxLineChanged = false;
     var minWidth = Math.max(0, width + 3);
-    var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + minWidth - display.scroller.clientWidth);
+    var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + minWidth + scrollerCutOff - display.scroller.clientWidth);
     display.sizer.style.minWidth = minWidth + "px";
     if (maxScrollLeft < cm.doc.scrollLeft)
       setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);

From 0b34cccdfe5890ed9a26d0f51dff3ae2cb2f9922 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Mar 2014 12:27:09 +0100
Subject: [PATCH 1046/4742] Work around broken Opera (Presto)
 getBoundingClientRect

Closes #2331
---
 lib/codemirror.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6fb06eed0c..ee8951591c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1163,7 +1163,12 @@ window.CodeMirror = (function() {
     var pre = buildLineContent(cm, line, null, true).pre;
     var end = pre.appendChild(zeroWidthElement(cm.display.measure));
     removeChildrenAndAdd(cm.display.measure, pre);
-    return getRect(end).right - getRect(cm.display.lineDiv).left;
+    var rect = getRect(end);
+    if (rect.right == 0 && rect.bottom == 0) {
+      end = pre.appendChild(elt("span", "\u00a0"));
+      rect = getRect(end);
+    }
+    return rect.left - getRect(cm.display.lineDiv).left;
   }
 
   function clearCaches(cm) {

From 0271023f20b085a0029aceb1d9e1afdd01574515 Mon Sep 17 00:00:00 2001
From: Ng Zhi An <ngzhian@gmail.com>
Date: Mon, 3 Mar 2014 01:24:01 +0800
Subject: [PATCH 1047/4742] [vim] Add :nunmap and a simple test

In Vim, defaults keymap cannot be unmapped. They must be explicityly
set to <NOP>. In this case we allow that because
user defined maps are stored in the same map as the defaults.
---
 keymap/vim.js    | 55 ++++++++++++++++++++++++++++++++++++++++++++----
 test/vim_test.js | 13 ++++++++++++
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 18e5caa273..bb9fc49c52 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3148,6 +3148,7 @@
       { name: 'map' },
       { name: 'nmap', shortName: 'nm' },
       { name: 'vmap', shortName: 'vm' },
+      { name: 'unmap' },
       { name: 'write', shortName: 'w' },
       { name: 'undo', shortName: 'u' },
       { name: 'redo', shortName: 'red' },
@@ -3299,14 +3300,16 @@
             this.commandMap_[commandName] = {
               name: commandName,
               type: 'exToEx',
-              toInput: rhs.substring(1)
+              toInput: rhs.substring(1),
+              user: true
             };
           } else {
             // Ex to key mapping
             this.commandMap_[commandName] = {
               name: commandName,
               type: 'exToKey',
-              toKeys: parseKeyString(rhs)
+              toKeys: parseKeyString(rhs),
+              user: true
             };
           }
         } else {
@@ -3315,7 +3318,8 @@
             var mapping = {
               keys: parseKeyString(lhs),
               type: 'keyToEx',
-              exArgs: { input: rhs.substring(1) }};
+              exArgs: { input: rhs.substring(1) },
+              user: true};
             if (ctx) { mapping.context = ctx; }
             defaultKeymap.unshift(mapping);
           } else {
@@ -3323,12 +3327,45 @@
             var mapping = {
               keys: parseKeyString(lhs),
               type: 'keyToKey',
-              toKeys: parseKeyString(rhs)
+              toKeys: parseKeyString(rhs),
+              user: true
             };
             if (ctx) { mapping.context = ctx; }
             defaultKeymap.unshift(mapping);
           }
         }
+      },
+      unmap: function(lhs, ctx) {
+        var arrayEquals = function(a, b) {
+          if (a === b) return true;
+          if (a == null || b == null) return true;
+          if (a.length != b.length) return false;
+          for (var i = 0; i < a.length; i++) {
+            if (a[i] !== b[i]) return false;
+          }
+          return true;
+        };
+        if (lhs != ':' && lhs.charAt(0) == ':') {
+          // Ex to Ex or Ex to key mapping
+          if (ctx) { throw Error('Mode not supported for ex mappings'); }
+          var commandName = lhs.substring(1);
+          if (this.commandMap_[commandName] && this.commandMap_[commandName].user) {
+            delete this.commandMap_[commandName];
+            return;
+          }
+        } else {
+          // Key to Ex or key to key mapping
+          var keys = parseKeyString(lhs);
+          for (var i = 0; i < defaultKeymap.length; i++) {
+            if (arrayEquals(keys, defaultKeymap[i].keys)
+                && defaultKeymap[i].context === ctx
+                && defaultKeymap[i].user) {
+              defaultKeymap.splice(i, 1);
+              return;
+            }
+          }
+        }
+        throw Error('No such mapping.');
       }
     };
 
@@ -3360,6 +3397,16 @@
       },
       nmap: function(cm, params) { this.map(cm, params, 'normal'); },
       vmap: function(cm, params) { this.map(cm, params, 'visual'); },
+      unmap: function(cm, params, ctx) {
+        var mapArgs = params.args;
+        if (!mapArgs || mapArgs.length < 1) {
+          if (cm) {
+            showConfirm(cm, 'No such mapping: ' + params.input);
+          }
+          return;
+        }
+        exCommandDispatcher.unmap(mapArgs[0], ctx);
+      },
       move: function(cm, params) {
         commandDispatcher.processCommand(cm, cm.state.vim, {
             type: 'motion',
diff --git a/test/vim_test.js b/test/vim_test.js
index ba4f8f88d3..9312d95d79 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2655,6 +2655,19 @@ testVim('ex_map_key2key', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
   eq('bc', cm.getValue());
 }, { value: 'abc' });
+testVim('ex_unmap_key2key', function(cm, vim, helpers) {
+  helpers.doEx('unmap a');
+  helpers.doKeys('a');
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: 'abc' });
+testVim('ex_unmap_key2key_does_not_remove_default', function(cm, vim, helpers) {
+  try {
+    helpers.doEx('unmap a');
+    fail();
+  } catch (expected) {}
+  helpers.doKeys('a');
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: 'abc' });
 testVim('ex_map_key2key_to_colon', function(cm, vim, helpers) {
   helpers.doEx('map ; :');
   var dialogOpened = false;

From 72d044c9a3852880996aef84e8c713e0be9a2f79 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Tue, 4 Mar 2014 16:57:42 -0800
Subject: [PATCH 1048/4742] [clike mode] Support C++11 unicode & raw strings

---
 mode/clike/clike.js   | 45 ++++++++++++++++++++++++++++++++++++++++++-
 mode/clike/index.html |  5 +++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index e5f311d4a8..1fbccc6d01 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -191,6 +191,30 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return "meta";
   }
 
+  function cpp11StringHook(stream, state) {
+    stream.backUp(1);
+    // Raw strings.
+    if (stream.match(/(R|u8R|uR|UR|LR)/)) {
+      var match = stream.match(/"(.{0,16})\(/);
+      if (!match) {
+        return false;
+      }
+      state.cpp11RawStringDelim = match[1];
+      state.tokenize = tokenRawString;
+      return tokenRawString(stream, state);
+    }
+    // Unicode strings/chars.
+    if (stream.match(/(u8|u|U|L)/)) {
+      if (stream.match(/["']/, /* eat */ false)) {
+        return "string"
+      }
+      return false;
+    }
+    // Ignore this hook.
+    stream.next();
+    return false;
+  }
+
   // C#-style strings where "" escapes a quote.
   function tokenAtString(stream, state) {
     var next;
@@ -203,6 +227,19 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return "string";
   }
 
+  // C++11 raw string literal is <prefix>"<delim>( anything )<delim>", where
+  // <delim> can be a string up to 16 characters long.
+  function tokenRawString(stream, state) {
+    var closingSequence = new RegExp(".*?\\)" + state.cpp11RawStringDelim + '"');
+    var match = stream.match(closingSequence);
+    if (match) {
+      state.tokenize = null;
+    } else {
+      stream.skipToEnd();
+    }
+    return "string";
+  }
+
   function def(mimes, mode) {
     var words = [];
     function add(obj) {
@@ -239,7 +276,13 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "static_assert override"),
     blockKeywords: words("catch class do else finally for if struct switch try while"),
     atoms: words("true false null"),
-    hooks: {"#": cppHook},
+    hooks: {
+      "#": cppHook,
+      "u": cpp11StringHook,
+      "U": cpp11StringHook,
+      "L": cpp11StringHook,
+      "R": cpp11StringHook
+    },
     modeProps: {fold: ["brace", "include"]}
   });
   CodeMirror.defineMIME("text/x-java", {
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 93bd718a0a..d892fddbdb 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -105,6 +105,11 @@ <h2>C++ example</h2>
   VAL1, VAL2, VAL3
 };
 
+char32_t unicode_string = U"\U0010FFFF";
+string raw_string = R"delim(anything
+you
+want)delim";
+
 int Helper(const MyType& param) {
   return 0;
 }

From bf8681a71b45daefd7b1167a6543a2fad28ad903 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Mar 2014 08:32:26 +0100
Subject: [PATCH 1049/4742] Fix linting (missing semicolon)

---
 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 1fbccc6d01..48f8b133e9 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -206,7 +206,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     // Unicode strings/chars.
     if (stream.match(/(u8|u|U|L)/)) {
       if (stream.match(/["']/, /* eat */ false)) {
-        return "string"
+        return "string";
       }
       return false;
     }

From 858e6a0c4629421badd81b8bbdd6138c051fa3ee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Mar 2014 12:21:58 +0100
Subject: [PATCH 1050/4742] Fix bug in viewCuttingPoint

Issue #2332
---
 lib/codemirror.js |  7 +++----
 test/test.js      | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b478863b83..30301f26f0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2107,16 +2107,15 @@
       if (dir > 0) {
         if (index == view.length - 1) return null;
         diff = (n + view[index].size) - oldN;
+        index++;
       } else {
-        if (index == 0) return null;
-        diff = oldN - n;
+        diff = n - oldN;
       }
       oldN += diff; newN += diff;
-      index += dir;
     }
     while (visualLineNo(cm.doc, newN) != newN) {
       if (index == (dir < 0 ? 0 : view.length - 1)) return null;
-      newN += view[index - (dir < 0 ? 1 : 0)].size;
+      newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
       index += dir;
     }
     return {index: index, lineN: newN};
diff --git a/test/test.js b/test/test.js
index 9d3450849a..aef1e94283 100644
--- a/test/test.js
+++ b/test/test.js
@@ -793,6 +793,20 @@ testCM("collapsedRangeBetweenLinesSelected", function(cm) {
   is(w > 0);
 }, {value: "one\ntwo"});
 
+testCM("randomCollapsedRanges", function(cm) {
+  addDoc(cm, 20, 500);
+  cm.operation(function() {
+    for (var i = 0; i < 200; i++) {
+      var start = Pos(Math.floor(Math.random() * 500), Math.floor(Math.random() * 20));
+      if (i % 4)
+        try { cm.markText(start, Pos(start.line + 2, 1), {collapsed: true}); }
+        catch(e) { if (!/overlapping/.test(String(e))) throw e; }
+      else
+        cm.markText(start, Pos(start.line, start.ch + 4), {"className": "foo"});
+    }
+  });
+});
+
 testCM("hiddenLinesAutoUnfold", function(cm) {
   var range = foldLines(cm, 1, 3, true), cleared = 0;
   CodeMirror.on(range, "clear", function() {cleared++;});

From 47e59986c82a1b40418ab5b1f00d176d5a183ad7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Mar 2014 12:43:34 +0100
Subject: [PATCH 1051/4742] Make cursor motion between input cause separate
 history events

Issue #2305
---
 lib/codemirror.js | 15 +++++++++++----
 test/test.js      | 13 +++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 30301f26f0..6e8ba4a7b6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6443,9 +6443,16 @@
 
   // Find the top change event in the history. Pop off selection
   // events that are in the way.
-  function lastChangeEvent(hist) {
-    clearSelectionEvents(hist.done);
-    return lst(hist.done);
+  function lastChangeEvent(hist, force) {
+    if (force) {
+      clearSelectionEvents(hist.done);
+      return lst(hist.done);
+    } else if (hist.done.length && !lst(hist.done).ranges) {
+      return lst(hist.done);
+    } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
+      hist.done.pop();
+      return lst(hist.done);
+    }
   }
 
   // Register a change in the history. Merges changes that are within
@@ -6461,7 +6468,7 @@
          hist.lastOrigin == change.origin && change.origin &&
          ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
           change.origin.charAt(0) == "*")) &&
-        (cur = lastChangeEvent(hist))) {
+        (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
       // Merge this change into the last event
       var last = lst(cur.changes);
       if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
diff --git a/test/test.js b/test/test.js
index aef1e94283..b2af770f84 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1817,3 +1817,16 @@ testCM("selectionHistoryNonOverlapping", function(cm) {
   eqPos(cm.getCursor("anchor"), Pos(0, 0));
   eqPos(cm.getCursor("head"), Pos(0, 1));
 }, {value: "1234"});
+
+testCM("cursorMotionSplitsHistory", function(cm) {
+  cm.replaceSelection("a", null, "+input");
+  cm.execCommand("goCharRight");
+  cm.replaceSelection("b", null, "+input");
+  cm.replaceSelection("c", null, "+input");
+  cm.undo();
+  eq(cm.getValue(), "a1234");
+  eqPos(cm.getCursor(), Pos(0, 2));
+  cm.undo();
+  eq(cm.getValue(), "1234");
+  eqPos(cm.getCursor(), Pos(0, 0));
+}, {value: "1234"});

From 9227120703f7c12255342b0120985fb99d96a58b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Mar 2014 12:49:20 +0100
Subject: [PATCH 1052/4742] Default the origin of replaceSelection to +input

Since it's what you want most of the time, and easy to forget.
---
 addon/edit/closebrackets.js |  6 +++---
 addon/edit/closetag.js      |  2 +-
 addon/edit/continuelist.js  |  2 +-
 doc/manual.html             |  2 +-
 keymap/emacs.js             |  6 +++---
 keymap/sublime.js           |  4 ++--
 lib/codemirror.js           | 10 ++++------
 test/test.js                | 20 ++++++++++----------
 8 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 100e82bebf..f48ad881aa 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -79,9 +79,9 @@
           var sels = cm.getSelections();
           for (var i = 0; i < sels.length; i++)
             sels[i] = left + sels[i] + right;
-          cm.replaceSelections(sels, "around", "+insert");
+          cm.replaceSelections(sels, "around");
         } else if (type == "both") {
-          cm.replaceSelection(left + right, null, "+insert");
+          cm.replaceSelection(left + right, null);
           cm.execCommand("goCharLeft");
         }
       };
@@ -109,7 +109,7 @@
         if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
       }
       cm.operation(function() {
-        cm.replaceSelection("\n\n", null, "+input");
+        cm.replaceSelection("\n\n", null);
         cm.execCommand("goCharLeft");
         ranges = cm.listSelections();
         for (var i = 0; i < ranges.length; i++) {
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index ac6c2fc6d4..c7c0701ba5 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -104,7 +104,7 @@
         return CodeMirror.Pass;
       replacements[i] = "/" + state.context.tagName + ">";
     }
-    cm.replaceSelections(replacements, null, "+input");
+    cm.replaceSelections(replacements);
   }
 
   function indexOf(collection, elt) {
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 54c7340bbe..2946aa6a24 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -30,6 +30,6 @@
       replacements[i] = "\n" + indent + bullet + after;
     }
 
-    cm.replaceSelections(replacements, null, "+insert");
+    cm.replaceSelections(replacements);
   };
 });
diff --git a/doc/manual.html b/doc/manual.html
index 01d0b00814..75922f14a0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -709,7 +709,7 @@ <h2>Key Maps</h2>
 {
   Tab: function(cm) {
     var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
-    cm.replaceSelection(spaces, "end", "+input");
+    cm.replaceSelection(spaces);
   }
 }</pre>
 
diff --git a/keymap/emacs.js b/keymap/emacs.js
index 35f199cb73..2d86b5d9af 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -181,7 +181,7 @@
     if (dup > 1 && event.origin == "+input") {
       var one = event.text.join("\n"), txt = "";
       for (var i = 1; i < dup; ++i) txt += one;
-      cm.replaceSelection(txt, null, "+input");
+      cm.replaceSelection(txt);
     }
   }
 
@@ -273,7 +273,7 @@
       cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
       cm.setSelection(start, cm.getCursor());
     },
-    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around");},
+    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around", "paste");},
 
     "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
 
@@ -330,7 +330,7 @@
       var range = cm.getRange(from, pos);
       if (range.length != 2) return;
       cm.setSelection(from, pos);
-      cm.replaceSelection(range.charAt(1) + range.charAt(0));
+      cm.replaceSelection(range.charAt(1) + range.charAt(0), null, "+transpose");
     }),
 
     "Alt-C": repeated(function(cm) {
diff --git a/keymap/sublime.js b/keymap/sublime.js
index 61098525f9..44ddb5e5e5 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -339,7 +339,7 @@
         if (range.empty()) { indices.push(i); replacements.push(""); }
         else replacements.push(mod(cm.getRange(range.from(), range.to())));
       }
-      cm.replaceSelections(replacements, "around");
+      cm.replaceSelections(replacements, "around", "case");
       for (var i = indices.length - 1, at; i >= 0; i--) {
         var range = ranges[indices[i]];
         if (at && CodeMirror.cmpPos(range.head, at) > 0) continue;
@@ -384,7 +384,7 @@
   };
   cmds[mapK[ctrl + "Y"] = "sublimeYank"] = function(cm) {
     if (cm.state.sublimeKilled != null)
-      cm.replaceSelection(cm.state.sublimeKilled);
+      cm.replaceSelection(cm.state.sublimeKilled, null, "paste");
   };
 
   mapK[ctrl + "G"] = "clearBookmarks";
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6e8ba4a7b6..1f69fe9dae 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3002,7 +3002,7 @@
       lastStoppedKey = handled ? code : null;
       // Opera has no cut event... we try to at least catch the key combo
       if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
-        cm.replaceSelection("");
+        cm.replaceSelection("", null, "cut");
     }
   }
 
@@ -4506,12 +4506,10 @@
     indentAuto: function(cm) {cm.indentSelection("smart");},
     indentMore: function(cm) {cm.indentSelection("add");},
     indentLess: function(cm) {cm.indentSelection("subtract");},
-    insertTab: function(cm) {
-      cm.replaceSelection("\t", null, "+input");
-    },
+    insertTab: function(cm) {cm.replaceSelection("\t");},
     defaultTab: function(cm) {
       if (cm.somethingSelected()) cm.indentSelection("add");
-      else cm.replaceSelection("\t", null, "+input");
+      else cm.execCommand("insertTab");
     },
     transposeChars: function(cm) {
       runInOp(cm, function() {
@@ -6088,7 +6086,7 @@
       var dup = [];
       for (var i = 0; i < this.sel.ranges.length; i++)
         dup[i] = code;
-      this.replaceSelections(dup, collapse, origin);
+      this.replaceSelections(dup, collapse, origin || "+input");
     }),
     replaceSelections: function(code, collapse, origin) {
       var changes = [], sel = this.sel;
diff --git a/test/test.js b/test/test.js
index b2af770f84..b9e1ea8bfe 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1563,12 +1563,12 @@ testCM("readOnlyMarker", function(cm) {
 
 testCM("dirtyBit", function(cm) {
   eq(cm.isClean(), true);
-  cm.replaceSelection("boo");
+  cm.replaceSelection("boo", null, "test");
   eq(cm.isClean(), false);
   cm.undo();
   eq(cm.isClean(), true);
-  cm.replaceSelection("boo");
-  cm.replaceSelection("baz");
+  cm.replaceSelection("boo", null, "test");
+  cm.replaceSelection("baz", null, "test");
   cm.undo();
   eq(cm.isClean(), false);
   cm.markClean();
@@ -1580,15 +1580,15 @@ testCM("dirtyBit", function(cm) {
 });
 
 testCM("changeGeneration", function(cm) {
-  cm.replaceSelection("x", null, "+insert");
+  cm.replaceSelection("x");
   var softGen = cm.changeGeneration();
-  cm.replaceSelection("x", null, "+insert");
+  cm.replaceSelection("x");
   cm.undo();
   eq(cm.getValue(), "");
   is(!cm.isClean(softGen));
-  cm.replaceSelection("x", null, "+insert");
+  cm.replaceSelection("x");
   var hardGen = cm.changeGeneration(true);
-  cm.replaceSelection("x", null, "+insert");
+  cm.replaceSelection("x");
   cm.undo();
   eq(cm.getValue(), "x");
   is(cm.isClean(hardGen));
@@ -1819,10 +1819,10 @@ testCM("selectionHistoryNonOverlapping", function(cm) {
 }, {value: "1234"});
 
 testCM("cursorMotionSplitsHistory", function(cm) {
-  cm.replaceSelection("a", null, "+input");
+  cm.replaceSelection("a");
   cm.execCommand("goCharRight");
-  cm.replaceSelection("b", null, "+input");
-  cm.replaceSelection("c", null, "+input");
+  cm.replaceSelection("b");
+  cm.replaceSelection("c");
   cm.undo();
   eq(cm.getValue(), "a1234");
   eqPos(cm.getCursor(), Pos(0, 2));

From 370c204c9c43807b61b110656699f13312651ca9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Mar 2014 13:00:44 +0100
Subject: [PATCH 1053/4742] [pig-hint addon] Remove

It was broken and confused.

Make the mode register a list of completable words instead.

Issue #2324
---
 addon/hint/pig-hint.js | 121 -----------------------------------------
 doc/compress.html      |   1 -
 doc/manual.html        |   3 -
 mode/pig/pig.js        |   2 +
 4 files changed, 2 insertions(+), 125 deletions(-)
 delete mode 100644 addon/hint/pig-hint.js

diff --git a/addon/hint/pig-hint.js b/addon/hint/pig-hint.js
deleted file mode 100644
index 6c0c523774..0000000000
--- a/addon/hint/pig-hint.js
+++ /dev/null
@@ -1,121 +0,0 @@
-(function () {
-  "use strict";
-
-  function forEach(arr, f) {
-    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
-  }
-
-  function arrayContains(arr, item) {
-    if (!Array.prototype.indexOf) {
-      var i = arr.length;
-      while (i--) {
-        if (arr[i] === item) {
-          return true;
-        }
-      }
-      return false;
-    }
-    return arr.indexOf(item) != -1;
-  }
-
-  function scriptHint(editor, _keywords, getToken) {
-    // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
-    // If it's not a 'word-style' token, ignore the token.
-
-    if (!/^[\w$_]*$/.test(token.string)) {
-        token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-                         className: token.string == ":" ? "pig-type" : null};
-    }
-
-    if (!context) var context = [];
-    context.push(tprop);
-
-    var completionList = getCompletions(token, context);
-    completionList = completionList.sort();
-    //prevent autocomplete for last word, instead show dropdown with one word
-    if(completionList.length == 1) {
-      completionList.push(" ");
-    }
-
-    return {list: completionList,
-            from: CodeMirror.Pos(cur.line, token.start),
-            to: CodeMirror.Pos(cur.line, token.end)};
-  }
-
-  function pigHint(editor) {
-    return scriptHint(editor, pigKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
-  }
-  CodeMirror.pigHint = pigHint; // deprecated
-  CodeMirror.registerHelper("hint", "pig", pigHint);
-
-  var pigKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP "
-  + "JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL "
-  + "PARTITION GROUP AND OR NOT GENERATE FLATTEN ASC DESC IS STREAM THROUGH STORE MAPREDUCE "
-  + "SHIP CACHE INPUT OUTPUT STDERROR STDIN STDOUT LIMIT SAMPLE LEFT RIGHT FULL EQ GT LT GTE LTE "
-  + "NEQ MATCHES TRUE FALSE";
-  var pigKeywordsU = pigKeywords.split(" ");
-  var pigKeywordsL = pigKeywords.toLowerCase().split(" ");
-
-  var pigTypes = "BOOLEAN INT LONG FLOAT DOUBLE CHARARRAY BYTEARRAY BAG TUPLE MAP";
-  var pigTypesU = pigTypes.split(" ");
-  var pigTypesL = pigTypes.toLowerCase().split(" ");
-
-  var pigBuiltins = "ABS ACOS ARITY ASIN ATAN AVG BAGSIZE BINSTORAGE BLOOM BUILDBLOOM CBRT CEIL "
-  + "CONCAT COR COS COSH COUNT COUNT_STAR COV CONSTANTSIZE CUBEDIMENSIONS DIFF DISTINCT DOUBLEABS "
-  + "DOUBLEAVG DOUBLEBASE DOUBLEMAX DOUBLEMIN DOUBLEROUND DOUBLESUM EXP FLOOR FLOATABS FLOATAVG "
-  + "FLOATMAX FLOATMIN FLOATROUND FLOATSUM GENERICINVOKER INDEXOF INTABS INTAVG INTMAX INTMIN "
-  + "INTSUM INVOKEFORDOUBLE INVOKEFORFLOAT INVOKEFORINT INVOKEFORLONG INVOKEFORSTRING INVOKER "
-  + "ISEMPTY JSONLOADER JSONMETADATA JSONSTORAGE LAST_INDEX_OF LCFIRST LOG LOG10 LOWER LONGABS "
-  + "LONGAVG LONGMAX LONGMIN LONGSUM MAX MIN MAPSIZE MONITOREDUDF NONDETERMINISTIC OUTPUTSCHEMA  "
-  + "PIGSTORAGE PIGSTREAMING RANDOM REGEX_EXTRACT REGEX_EXTRACT_ALL REPLACE ROUND SIN SINH SIZE "
-  + "SQRT STRSPLIT SUBSTRING SUM STRINGCONCAT STRINGMAX STRINGMIN STRINGSIZE TAN TANH TOBAG "
-  + "TOKENIZE TOMAP TOP TOTUPLE TRIM TEXTLOADER TUPLESIZE UCFIRST UPPER UTF8STORAGECONVERTER";
-  var pigBuiltinsU = pigBuiltins.split(" ").join("() ").split(" ");
-  var pigBuiltinsL = pigBuiltins.toLowerCase().split(" ").join("() ").split(" ");
-  var pigBuiltinsC = ("BagSize BinStorage Bloom BuildBloom ConstantSize CubeDimensions DoubleAbs "
-  + "DoubleAvg DoubleBase DoubleMax DoubleMin DoubleRound DoubleSum FloatAbs FloatAvg FloatMax "
-  + "FloatMin FloatRound FloatSum GenericInvoker IntAbs IntAvg IntMax IntMin IntSum "
-  + "InvokeForDouble InvokeForFloat InvokeForInt InvokeForLong InvokeForString Invoker "
-  + "IsEmpty JsonLoader JsonMetadata JsonStorage LongAbs LongAvg LongMax LongMin LongSum MapSize "
-  + "MonitoredUDF Nondeterministic OutputSchema PigStorage PigStreaming StringConcat StringMax "
-  + "StringMin StringSize TextLoader TupleSize Utf8StorageConverter").split(" ").join("() ").split(" ");
-
-  function getCompletions(token, context) {
-    var found = [], start = token.string;
-    function maybeAdd(str) {
-      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
-    }
-
-    function gatherCompletions(obj) {
-      if(obj == ":") {
-        forEach(pigTypesL, maybeAdd);
-      }
-      else {
-        forEach(pigBuiltinsU, maybeAdd);
-        forEach(pigBuiltinsL, maybeAdd);
-        forEach(pigBuiltinsC, maybeAdd);
-        forEach(pigTypesU, maybeAdd);
-        forEach(pigTypesL, maybeAdd);
-        forEach(pigKeywordsU, maybeAdd);
-        forEach(pigKeywordsL, maybeAdd);
-      }
-    }
-
-    if (context) {
-      // If this is a property, see if it belongs to some object we can
-      // find in the current environment.
-      var obj = context.pop(), base;
-
-      if (obj.type == "variable")
-          base = obj.string;
-      else if(obj.type == "variable-3")
-          base = ":" + obj.string;
-
-      while (base != null && context.length)
-        base = base[context.pop().string];
-      if (base != null) gatherCompletions(base);
-    }
-    return found;
-  }
-})();
diff --git a/doc/compress.html b/doc/compress.html
index 018018747c..9e86230a94 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -192,7 +192,6 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/merge/merge.js">merge.js</option>
           <option value="http://codemirror.net/addon/mode/multiplex.js">multiplex.js</option>
           <option value="http://codemirror.net/addon/mode/overlay.js">overlay.js</option>
-          <option value="http://codemirror.net/addon/hint/pig-hint.js">pig-hint.js</option>
           <option value="http://codemirror.net/addon/display/placeholder.js">placeholder.js</option>
           <option value="http://codemirror.net/addon/hint/python-hint.js">python-hint.js</option>
           <option value="http://codemirror.net/addon/display/rulers.js">rulers.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index 9374b6de1a..ac8b7dcfd3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2204,9 +2204,6 @@ <h2>Addons</h2>
       <dt id="addon_sql-hint"><a href="../addon/hint/sql-hint.js"><code>hint/sql-hint.js</code></a></dt>
       <dd>A simple SQL hinter. Defines <code>CodeMirror.hint.sql</code>.</dd>
 
-      <dt id="addon_pig-hint"><a href="../addon/hint/pig-hint.js"><code>hint/pig-hint.js</code></a></dt>
-      <dd>A simple hinter for <a href="../mode/pig/index.html">Pig Latin</a>. Defines <code>CodeMirror.hint.pig</code>.</dd>
-
       <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>search/match-highlighter.js</code></a></dt>
       <dd>Adds a <code>highlightSelectionMatches</code> option that
       can be enabled to highlight all instances of a currently
diff --git a/mode/pig/pig.js b/mode/pig/pig.js
index 4b44e7ccc3..69e5e2758a 100644
--- a/mode/pig/pig.js
+++ b/mode/pig/pig.js
@@ -168,4 +168,6 @@ CodeMirror.defineMode("pig", function(_config, parserConfig) {
     keywords: keywords(pKeywords),
     types: keywords(pTypes)
   });
+
+  CodeMirror.registerHelper("hintWords", "pig", (pBuiltins + pTypes + pKeywords).split(" "));
 }());

From 365911d430a0196903316f9460116b212142cd52 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 5 Mar 2014 13:17:34 +0100
Subject: [PATCH 1054/4742] Fix bug in setting gutter height

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1f69fe9dae..376989b1a4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -638,8 +638,8 @@
   }
 
   function setDocumentHeight(cm, measure) {
-    cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top =
-      cm.display.gutters.style.height = measure.docHeight + "px";
+    cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = measure.docHeight + "px";
+    cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight) + "px";
   }
 
   // Read the actual heights of the rendered lines, and update their

From 9cff2b6e42f826d68259a94a0baa2126af9da6bc Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Sun, 2 Mar 2014 02:49:31 +0530
Subject: [PATCH 1055/4742] [vim] Implement visual_o

---
 keymap/vim.js    | 12 ++++++++++++
 test/vim_test.js | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index bb9fc49c52..2c8ea49d33 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -210,6 +210,7 @@
     { keys: ['|'], type: 'motion',
         motion: 'moveToColumn',
         motionArgs: { }},
+    { keys: ['o'], type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: { },context:'visual'},
     // Operators
     { keys: ['d'], type: 'operator', operator: 'delete' },
     { keys: ['y'], type: 'operator', operator: 'yank' },
@@ -1232,6 +1233,7 @@
               selectionStart.ch -= 1;
             }
             selectionEnd = curEnd;
+            selectionStart = (motionResult instanceof Array) ? curStart : selectionStart;
             if (vim.visualLine) {
               if (cursorIsBefore(selectionStart, selectionEnd)) {
                 selectionStart.ch = 0;
@@ -1353,6 +1355,16 @@
         }
         return null;
       },
+      moveToOtherHighlightedEnd: function(cm) {
+        var curEnd = copyCursor(cm.getCursor('head'));
+        var curStart = copyCursor(cm.getCursor('anchor'));
+        if (cursorIsBefore(curStart, curEnd)) {
+           curEnd.ch += 1;
+        } else if (cursorIsBefore(curEnd, curStart)) {
+           curStart.ch -= 1;
+        }
+        return ([curEnd,curStart]);
+      },
       jumpToMark: function(cm, motionArgs, vim) {
         var best = cm.getCursor();
         for (var i = 0; i < motionArgs.repeat; i++) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 9312d95d79..013a612b7e 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1552,6 +1552,19 @@ testVim('s_visual', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
   eq('ac', cm.getValue());
 }, { value: 'abc'});
+testVim('o_visual', function(cm,vim,helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys('v','l','l','l','o');
+  helpers.assertCursorAt(0,0);
+  helpers.doKeys('v','v','j','j','j','o');
+  helpers.assertCursorAt(0,0);
+  helpers.doKeys('o');
+  helpers.doKeys('l','l')
+  helpers.assertCursorAt(3,2);
+  helpers.doKeys('d');
+  eq('p',cm.getValue());
+}, { value: 'abcd\nefgh\nijkl\nmnop'});
+  
 testVim('S_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('j', 'S');

From 0e3d59c1332ed0f06a18f2584721afb87d523abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20Gonz=C3=A1lez=20Palomo?= <bugs@sentido-labs.com>
Date: Wed, 5 Mar 2014 17:59:37 +0100
Subject: [PATCH 1056/4742] [emacs keymap] Make setMark() be a toggle like in
 Emacs

pressing Ctrl-Space once starts the selection extension mode,
pressing it again cancels that
---
 doc/manual.html   | 2 ++
 keymap/emacs.js   | 2 +-
 lib/codemirror.js | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index ac8b7dcfd3..3452ed9db3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1006,6 +1006,8 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       the shift key, in that it will cause cursor movement and calls
       to <a href="#extendSelection"><code>extendSelection</code></a>
       to leave the selection anchor in place.</dd>
+      <dt id="getExtending"><code><strong>doc.getExtending</strong>() → boolean</code></dt>
+      <dd>Get the value of the 'extending' flag.</dd>
 
       <dt id="hasFocus"><code><strong>cm.hasFocus</strong>() → boolean</code></dt>
       <dd>Tells you whether the editor currently has focus.</dd>
diff --git a/keymap/emacs.js b/keymap/emacs.js
index 592238bc90..441f214651 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -197,7 +197,7 @@
 
   function setMark(cm) {
     cm.setCursor(cm.getCursor());
-    cm.setExtending(true);
+    cm.setExtending(!cm.getExtending());
     cm.on("change", function() { cm.setExtending(false); });
   }
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ee8951591c..6e72ecfc83 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5034,6 +5034,7 @@ window.CodeMirror = (function() {
     redo: docOperation(function() {makeChangeFromHistory(this, "redo");}),
 
     setExtending: function(val) {this.sel.extend = val;},
+    getExtending: function() {return this.sel.extend;},
 
     historySize: function() {
       var hist = this.history;

From b3bf93dd53e439f5a4d092d15d7927545ed1b62d Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Thu, 6 Mar 2014 05:15:47 +0530
Subject: [PATCH 1057/4742] [vim] Added support for reg[isters] command

---
 keymap/vim.js | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 2c8ea49d33..eb82f8e939 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3168,7 +3168,8 @@
       { name: 'sort', shortName: 'sor' },
       { name: 'substitute', shortName: 's' },
       { name: 'nohlsearch', shortName: 'noh' },
-      { name: 'delmarks', shortName: 'delm' }
+      { name: 'delmarks', shortName: 'delm' },
+      { name: 'registers', shortName: 'reg' }
     ];
     Vim.ExCommandDispatcher = function() {
       this.buildCommandMap_();
@@ -3469,6 +3470,31 @@
           setOption(optionName, value);
         }
       },
+      registers: function(cm,params) {
+        var regArgs = params.args;
+        var registers = vimGlobalState.registerController.registers;
+        var regInfo = '----------Registers----------<br><br>';
+        if (!regArgs) {
+          for (var registerName in registers) {
+            var text = registers[registerName].text;
+            if (text.length) {
+              regInfo += '"' + registerName + '    ' + text + '<br>';
+            }
+          }
+        } else {
+          var registerName;
+          regArgs = regArgs.join('');
+          for (var i = 0; i < regArgs.length; i++) {
+            registerName = regArgs.charAt(i);
+            if (!vimGlobalState.registerController.isValidRegister(registerName)) {
+              continue;
+            }
+            var register = registers[registerName] || new Register();
+            regInfo += '"' + registerName + '    ' + register.text + '<br>';
+          }
+        }
+        showConfirm(cm, regInfo);
+      },
       sort: function(cm, params) {
         var reverse, ignoreCase, unique, number;
         function parseArgs() {

From 10901c3f3f685531b362ea982a0914a04188975c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Mar 2014 14:40:27 +0100
Subject: [PATCH 1058/4742] Remove single pixel extra leeway in
 updateScrollBars

It causes noticeable missinge scrollbar in some cases.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6e72ecfc83..1efc0fd227 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -338,8 +338,8 @@ window.CodeMirror = (function() {
     d.sizer.style.minHeight = d.heightForcer.style.top = totalHeight + "px";
     d.gutters.style.height = Math.max(totalHeight, d.scroller.clientHeight - scrollerCutOff) + "px";
     var scrollHeight = Math.max(totalHeight, d.scroller.scrollHeight);
-    var needsH = d.scroller.scrollWidth > (d.scroller.clientWidth + 1);
-    var needsV = scrollHeight > (d.scroller.clientHeight + 1);
+    var needsH = d.scroller.scrollWidth > d.scroller.clientWidth;
+    var needsV = scrollHeight > d.scroller.clientHeight;
     if (needsV) {
       d.scrollbarV.style.display = "block";
       d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";

From 8eaab795bf3cc34ce0f474422fcbbfa215cada97 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Mar 2014 15:05:25 +0100
Subject: [PATCH 1059/4742] Change the way selection history is built, again

Issue #2305
---
 lib/codemirror.js | 110 +++++++++++++++++++++-------------------------
 test/test.js      |  13 ++++++
 2 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 376989b1a4..7b12fbd23b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2554,7 +2554,6 @@
   function leftButtonSelect(cm, e, start, type, addNew) {
     var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
-    pushPendingSelection(doc, doc.history.done);
 
     var ourRange, ourIndex, startSel = doc.sel;
     if (addNew) {
@@ -2590,13 +2589,13 @@
 
     if (!addNew) {
       ourIndex = 0;
-      setSelection(doc, new Selection([ourRange], 0), sel_alwaysMerge);
+      setSelection(doc, new Selection([ourRange], 0), sel_mouse);
     } else if (ourIndex > -1) {
-      replaceOneSelection(doc, ourIndex, ourRange, sel_alwaysMerge);
+      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
     } else {
       ourIndex = doc.sel.ranges.length;
       setSelection(doc, normalizeSelection(doc.sel.ranges.concat([ourRange]), ourIndex),
-                   {scroll: false, merge: "always"});
+                   {scroll: false, origin: "*mouse"});
     }
 
     var lastPos = start;
@@ -2618,7 +2617,7 @@
             ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
         }
         if (!ranges.length) ranges.push(new Range(start, start));
-        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex), sel_alwaysMerge);
+        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex), sel_mouse);
       } else {
         var oldRange = ourRange;
         var anchor = oldRange.anchor, head = pos;
@@ -2637,7 +2636,7 @@
         }
         var ranges = startSel.ranges.slice(0);
         ranges[ourIndex] = new Range(clipPos(doc, anchor), head);
-        setSelection(doc, normalizeSelection(ranges, ourIndex), sel_alwaysMerge);
+        setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse);
       }
     }
 
@@ -2674,7 +2673,7 @@
       focusInput(cm);
       off(document, "mousemove", move);
       off(document, "mouseup", up);
-      pushPendingSelection(doc, doc.history.done);
+      doc.history.lastSelOrigin = null;
     }
 
     var move = operation(cm, function(e) {
@@ -3264,15 +3263,15 @@
     for (var i = 0; i < source.length; i++)
       if (allowSelectionOnly || !source[i].ranges) break;
     if (i == source.length) return;
+    hist.lastOrigin = hist.lastSelOrigin = null;
 
-    pushPendingSelection(doc, dest, false);
     for (;;) {
       event = source.pop();
       if (event.ranges) {
-        dest.push(event);
+        pushSelectionToHistory(event, dest);
         if (allowSelectionOnly && !event.equals(doc.sel)) {
-          hist.pendingSelection = event;
-          return setSelectionNoUndo(doc, event);
+          setSelection(doc, event);
+          return;
         }
         selAfter = event;
       }
@@ -3355,7 +3354,7 @@
     if (!selAfter) selAfter = computeSelAfterChange(doc, change, null);
     if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
     else updateDoc(doc, change, spans);
-    setSelection(doc, selAfter, sel_dontScroll);
+    setSelectionNoUndo(doc, selAfter, sel_dontScroll);
   }
 
   // Handle the interaction of a change to a document with the editor
@@ -4052,7 +4051,7 @@
           return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
         else
           return dir < 0 ? range.from() : range.to();
-      }, sel_mayMerge);
+      }, sel_move);
     }),
 
     deleteH: methodOp(function(dir, unit) {
@@ -4092,7 +4091,7 @@
         if (unit == "page" && range == doc.sel.primary())
           addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top);
         return pos;
-      }, sel_mayMerge);
+      }, sel_move);
       if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
         doc.sel.ranges[i].goalColumn = goals[i];
     }),
@@ -4455,7 +4454,7 @@
     goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
     goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
     goLineStart: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); }, sel_mayMerge);
+      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); }, sel_move);
     },
     goLineStartSmart: function(cm) {
       cm.extendSelectionsBy(function(range) {
@@ -4468,22 +4467,22 @@
           return Pos(start.line, inWS ? 0 : firstNonWS);
         }
         return start;
-      }, sel_mayMerge);
+      }, sel_move);
     },
     goLineEnd: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); }, sel_mayMerge);
+      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); }, sel_move);
     },
     goLineRight: function(cm) {
       cm.extendSelectionsBy(function(range) {
         var top = cm.charCoords(range.head, "div").top + 5;
         return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-      }, sel_mayMerge);
+      }, sel_move);
     },
     goLineLeft: function(cm) {
       cm.extendSelectionsBy(function(range) {
         var top = cm.charCoords(range.head, "div").top + 5;
         return cm.coordsChar({left: 0, top: top}, "div");
-      }, sel_mayMerge);
+      }, sel_move);
     },
     goLineUp: function(cm) {cm.moveV(-1, "line");},
     goLineDown: function(cm) {cm.moveV(1, "line");},
@@ -5955,7 +5954,7 @@
     this.frontier = firstLine;
     var start = Pos(firstLine, 0);
     this.sel = simpleSelection(start);
-    this.history = new History(null, this);
+    this.history = new History(null);
     this.id = ++nextDocId;
     this.modeOption = mode;
 
@@ -6113,7 +6112,7 @@
       for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
       return {undo: done, redo: undone};
     },
-    clearHistory: function() {this.history = new History(this.history.maxGeneration, this);},
+    clearHistory: function() {this.history = new History(this.history.maxGeneration);},
 
     markClean: function() {
       this.cleanGeneration = this.changeGeneration(true);
@@ -6132,7 +6131,7 @@
               undone: copyHistoryArray(this.history.undone)};
     },
     setHistory: function(histData) {
-      var hist = this.history = new History(this.history.maxGeneration, this);
+      var hist = this.history = new History(this.history.maxGeneration);
       hist.done = copyHistoryArray(histData.done.slice(0), null, true);
       hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
     },
@@ -6240,7 +6239,7 @@
       if (other.history == this.history) {
         var splitIds = [other.id];
         linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
-        other.history = new History(null, other);
+        other.history = new History(null);
         other.history.done = copyHistoryArray(this.history.done, splitIds);
         other.history.undone = copyHistoryArray(this.history.undone, splitIds);
       }
@@ -6400,7 +6399,7 @@
 
   // HISTORY
 
-  function History(startGen, doc) {
+  function History(startGen) {
     // Arrays of change events and selections. Doing something adds an
     // event to done and clears undo. Undoing moves events from done
     // to undone, redoing moves them in the other direction.
@@ -6408,14 +6407,9 @@
     this.undoDepth = Infinity;
     // Used to track when changes can be merged into a single undo
     // event
-    this.lastModTime = this.pendingSelTime = 0;
+    this.lastModTime = this.lastSelTime = 0;
     this.lastOp = null;
-    this.lastOrigin = null;
-    // Selection changes are first set as pending, and merged with
-    // subsequent similar selections (when close enough in time -- see
-    // pendingSelTime). When a 'different' selection appears, they are
-    // pushed onto the done array.
-    this.pendingSelection = doc.sel;
+    this.lastOrigin = this.lastSelOrigin = null;
     // Used by the isClean() method
     this.generation = this.maxGeneration = startGen || 1;
   }
@@ -6459,7 +6453,6 @@
   function addChangeToHistory(doc, change, selAfter, opId) {
     var hist = doc.history;
     hist.undone.length = 0;
-    pushPendingSelection(doc, hist.done);
     var time = +new Date, cur;
 
     if ((hist.lastOp == opId ||
@@ -6494,31 +6487,40 @@
     hist.generation = ++hist.maxGeneration;
     hist.lastModTime = time;
     hist.lastOp = opId;
-    hist.lastOrigin = change.origin;
+    hist.lastOrigin = hist.lastSelOrigin = change.origin;
 
     if (!last) signal(doc, "historyAdded");
   }
 
+  function selectionEventCanBeMerged(doc, origin, prev, sel) {
+    var ch = origin.charAt(0);
+    return ch == "*" ||
+      ch == "+" &&
+      prev.ranges.length == sel.ranges.length &&
+      prev.somethingSelected() == sel.somethingSelected() &&
+      new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500);
+  }
+
   // Called whenever the selection changes, sets the new selection as
   // the pending selection in the history, and pushes the old pending
   // selection into the 'done' array when it was significantly
   // different (in number of selected ranges, emptiness, or time).
   function addSelectionToHistory(doc, sel, opId, options) {
-    var hist = doc.history, pend = hist.pendingSelection, now = +new Date;
-    var merge = options && options.merge;
-
-    // A new event is started when merge is false, the number of
-    // selections changed, the selection moved from empty to non-empty
-    // or the other way around, or when a historyEventDelay has
-    // elapsed.
-    if (pend && merge != "always" && opId != hist.lastOp &&
-        (!merge || pend.ranges.length != sel.ranges.length ||
-         sel.somethingSelected() != pend.somethingSelected() ||
-         now - hist.pendingSelTime > (doc.cm ? doc.cm.options.historyEventDelay : 500)))
-      pushPendingSelection(doc, hist.done);
-
-    hist.pendingSelection = sel;
-    hist.pendingSelTime = now;
+    var hist = doc.history, origin = options && options.origin;
+
+    // A new event is started when the previous origin does not match
+    // the current, or the origins don't allow matching. Origins
+    // starting with * are always merged, those starting with + are
+    // merged when similar and close together in time.
+    if (opId == hist.lastOp ||
+        (origin && hist.lastSelOrigin == origin &&
+         selectionEventCanBeMerged(doc, origin, lst(hist.done), sel)))
+      hist.done[hist.done.length - 1] = sel;
+    else
+      pushSelectionToHistory(sel, hist.done);
+
+    hist.lastSelTime = +new Date;
+    hist.lastSelOrigin = origin;
     hist.lastOp = opId;
   }
 
@@ -6528,16 +6530,6 @@
       dest.push(sel);
   }
 
-  function pushPendingSelection(doc, dest, clearOpposite) {
-    var hist = doc.history;
-    if (hist.pendingSelection) {
-      pushSelectionToHistory(hist.pendingSelection, dest);
-      hist.pendingSelection = null;
-      if (clearOpposite !== false)
-        clearSelectionEvents(dest == hist.done ? hist.undone : hist.done);
-    }
-  }
-
   // Used to store marked span information in the history.
   function attachLocalSpans(doc, change, from, to) {
     var existing = change["spans_" + doc.id], n = 0;
@@ -6771,7 +6763,7 @@
   var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
 
   // Reused option objects for setSelection & friends
-  var sel_dontScroll = {scroll: false}, sel_alwaysMerge = {merge: "always"}, sel_mayMerge = {merge: true};
+  var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"};
 
   function Delayed() {this.id = null;}
   Delayed.prototype.set = function(ms, f) {
diff --git a/test/test.js b/test/test.js
index b9e1ea8bfe..3837abdf18 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1830,3 +1830,16 @@ testCM("cursorMotionSplitsHistory", function(cm) {
   eq(cm.getValue(), "1234");
   eqPos(cm.getCursor(), Pos(0, 0));
 }, {value: "1234"});
+
+testCM("selChangeInOperationDoesNotSplit", function(cm) {
+  for (var i = 0; i < 4; i++) {
+    cm.operation(function() {
+      cm.replaceSelection("x");
+      cm.setCursor(Pos(0, cm.getCursor().ch - 1));
+    });
+  }
+  eqPos(cm.getCursor(), Pos(0, 0));
+  eq(cm.getValue(), "xxxxa");
+  cm.undo();
+  eq(cm.getValue(), "a");
+}, {value: "a"});

From e44da18183e0191b3c9c6f3aff13a1fb27f37b2b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Mar 2014 15:35:03 +0100
Subject: [PATCH 1060/4742] Log stack traces of test errors to the console

---
 test/driver.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/driver.js b/test/driver.js
index f073f4909b..be013a7701 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -71,6 +71,7 @@ function runTests(callback) {
       else if (e instanceof Failure) callback("fail", test.name, e.message);
       else {
         var pos = /(?:\bat |@).*?([^\/:]+):(\d+)/.exec(e.stack);
+        if (pos) console["log"](e.stack);
         callback("error", test.name, e.toString() + (pos ? " (" + pos[1] + ":" + pos[2] + ")" : ""));
       }
     }

From 8cbff723bc3956287d9963dcde72d23d01a2422b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Mar 2014 15:45:12 +0100
Subject: [PATCH 1061/4742] Properly document change and selection origins

Issue #2305
---
 doc/manual.html | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 75922f14a0..35633eefec 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1079,12 +1079,17 @@ <h3 id="api_content">Content manipulation methods</h3>
       should be <code>{line, ch}</code> objects. An optional third
       argument can be given to indicate the line separator string to
       use (defaults to <code>"\n"</code>).</dd>
-      <dt id="replaceRange"><code><strong>doc.replaceRange</strong>(replacement: string, from: {line, ch}, to: {line, ch})</code></dt>
+      <dt id="replaceRange"><code><strong>doc.replaceRange</strong>(replacement: string, from: {line, ch}, to: {line, ch}, ?origin: string)</code></dt>
       <dd>Replace the part of the document between <code>from</code>
       and <code>to</code> with the given string. <code>from</code>
       and <code>to</code> must be <code>{line, ch}</code>
       objects. <code>to</code> can be left off to simply insert the
-      string at position <code>from</code>.</dd>
+      string at position <code>from</code>. When <code>origin</code>
+      is given, it will be passed on
+      to <a href="#event_change"><code>"change"</code> events</a>, and
+      its first letter will be used to determine whether this change
+      can be merged with previous history events, in the way described
+      for <a href="#selection_origin">selection origins</a>.</dd>
 
       <dt id="getLine"><code><strong>doc.getLine</strong>(n: integer) → string</code></dt>
       <dd>Get the content of line <code>n</code>.</dd>
@@ -1203,16 +1208,19 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       objects. <code>head</code> defaults to <code>anchor</code> when
       not given. These options are supported:
       <dl>
-        <dt><code><strong>scroll</strong>: boolean</code></dt>
+        <dt id="selection_scroll"><code><strong>scroll</strong>: boolean</code></dt>
         <dd>Determines whether the selection head should be scrolled
         into view. Defaults to true.</dd>
-        <dt><code><strong>merge</strong>: boolean|string</code></dt>
-        <dd>Controls whether the selection history event may be merged
-        with the previous one. Defaults to false.
-        When <code>true</code>, it may be merged when it is similar,
-        and close in <a href="#option_historyEventDelay">time</a> to a
-        previous mergeable event. When it has the value <code>"always"</code>, it
-        will be merged regardless of similarity.</dd>
+        <dt id="selection_origin"><code><strong>origin</strong>: string</code></dt>
+        <dd>Detemines whether the selection history event may be
+        merged with the previous one. When an origin starts with the
+        character <code>+</code>, and the last recorded selection had
+        the same origin and was similar (close
+        in <a href="#option_historyEventDelay">time</a>, both
+        collapsed or both non-collapsed), the new one will replace the
+        old one. When it starts with <code>*</code>, it will always
+        replace the previous event (if that had the same origin).
+        Built-in motion uses the <code>"+move"</code> origin.</dd>
       </dl></dd>
 
       <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer, ?options: object)</code></dt>

From f2fc9c639e7593683907f09467ec5aa3aee72887 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Mar 2014 15:53:47 +0100
Subject: [PATCH 1062/4742] Add version number to manual

---
 bin/release     | 3 +++
 doc/manual.html | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/release b/bin/release
index 4fac4f0485..3c33290f3f 100755
--- a/bin/release
+++ b/bin/release
@@ -23,6 +23,9 @@ rewrite("lib/codemirror.js", function(lib) {
 rewrite("package.json", function(pack) {
   return pack.replace(/"version":"\d+\.\d+\.\d+"/, "\"version\":\"" + number + "\"");
 });
+rewrite("doc/manual.html", function(manual) {
+  return manual.replace(/>version \d+\.\d+\.\d+<\/span>/, ">version " + number + "</span>");
+});
 
 if (bumpOnly) process.exit(0);
 
diff --git a/doc/manual.html b/doc/manual.html
index 3452ed9db3..5bc7154931 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -57,7 +57,10 @@
 <article>
 
 <section class=first id=overview>
-    <h2>User manual and reference guide</h2>
+    <h2 style="position: relative">
+      User manual and reference guide
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 3.22.1</span>
+    </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
     Web pages. The core library provides <em>only</em> the editor

From a12b1741ba819e52c49bd62ab0e68979dd67492a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Mar 2014 16:30:32 +0100
Subject: [PATCH 1063/4742] Fix scrollbar-dragging on Chrome 34 Mac

Issue #2326
---
 lib/codemirror.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1efc0fd227..6013eb606b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -110,8 +110,8 @@ window.CodeMirror = (function() {
     // Wraps and hides input textarea
     d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
     // The actual fake scrollbars.
-    d.scrollbarH = elt("div", [elt("div", null, null, "height: 1px")], "CodeMirror-hscrollbar");
-    d.scrollbarV = elt("div", [elt("div", null, null, "width: 1px")], "CodeMirror-vscrollbar");
+    d.scrollbarH = elt("div", [elt("div", null, null, "height: 100%")], "CodeMirror-hscrollbar");
+    d.scrollbarV = elt("div", [elt("div", null, null, "width: 100%")], "CodeMirror-vscrollbar");
     d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
     d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
     // DIVs containing the selection and the actual code
@@ -371,7 +371,12 @@ window.CodeMirror = (function() {
 
     if (mac_geLion && scrollbarWidth(d.measure) === 0) {
       d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px";
-      d.scrollbarV.style.pointerEvents = d.scrollbarH.style.pointerEvents = "none";
+      var barMouseDown = function(e) {
+        if (e_target(e) != d.scrollbarV && e_target(e) != d.scrollbarH)
+          operation(cm, onMouseDown)(e);
+      };
+      on(d.scrollbarV, "mousedown", barMouseDown);
+      on(d.scrollbarH, "mousedown", barMouseDown);
     }
   }
 
@@ -1716,8 +1721,7 @@ window.CodeMirror = (function() {
     var display = cm.display;
     if (!liberal) {
       var target = e_target(e);
-      if (target == display.scrollbarH || target == display.scrollbarH.firstChild ||
-          target == display.scrollbarV || target == display.scrollbarV.firstChild ||
+      if (target == display.scrollbarH || target == display.scrollbarV ||
           target == display.scrollbarFiller || target == display.gutterFiller) return null;
     }
     var x, y, space = getRect(display.lineSpace);

From f452cabf2ea2a41f3bf2fffdd7e7da62ab64a1ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Mar 2014 16:43:39 +0100
Subject: [PATCH 1064/4742] Fix breaking of horizontal scrollbar by
 a12b1741ba819e52c49bd62ab0e68979dd67492a

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6013eb606b..7d43ac49ed 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -110,8 +110,8 @@ window.CodeMirror = (function() {
     // Wraps and hides input textarea
     d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
     // The actual fake scrollbars.
-    d.scrollbarH = elt("div", [elt("div", null, null, "height: 100%")], "CodeMirror-hscrollbar");
-    d.scrollbarV = elt("div", [elt("div", null, null, "width: 100%")], "CodeMirror-vscrollbar");
+    d.scrollbarH = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
+    d.scrollbarV = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
     d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
     d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
     // DIVs containing the selection and the actual code

From 96b8519b09c7c440ac09bc86e207017ac28c07d7 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Wed, 5 Mar 2014 17:41:15 -0800
Subject: [PATCH 1065/4742] [vim] Refactor macro handling

Use CreateInsertModeChanges to make a copy of the latest
insert mode changes in pushInsertModeChanges so that the
latest insert mode changes can safely be modified without
bashing previously recorded macros.

Fix the :register command and add unit tests. Add a fakeOpenNotification for matching the notification text.
---
 keymap/vim.js    | 206 +++++++++++++++++++++++------------------------
 test/vim_test.js | 147 +++++++++++++++++++++++++--------
 2 files changed, 214 insertions(+), 139 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index eb82f8e939..07765f843f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -32,7 +32,7 @@
  *   ESC - leave insert mode, visual mode, and clear input state.
  *   Ctrl-[, Ctrl-c - same as ESC.
  *
- * Registers: unamed, -, a-z, A-Z, 0-9
+ * Registers: unnamed, -, a-z, A-Z, 0-9
  *   (Does not respect the special case for number registers when delete
  *    operator is made with these commands: %, (, ),  , /, ?, n, N, {, } )
  *   TODO: Implement the remaining registers.
@@ -533,28 +533,33 @@
       };
     };
 
-    var createMacroState = function() {
-      return {
-        keyBuffer: [],
-        insertModeBuffer: [],
-        latestRegister: undefined,
-        inReplay: false,
-        lastInsertModeChanges: createInsertModeChanges(),
-        enteredMacroMode: undefined,
-        toggle: function(cm, registerName) {
-          if (this.enteredMacroMode) { //onExit
-            this.enteredMacroMode(); // close dialog
-            this.enteredMacroMode = undefined;
-          } else { //onEnter
-            this.latestRegister = registerName;
-            this.enteredMacroMode = cm.openDialog(
+    function MacroModeState() {
+      this.latestRegister = undefined;
+      this.isPlaying = false;
+      this.isRecording = false;
+      this.onRecordingDone = undefined;
+      this.lastInsertModeChanges = createInsertModeChanges();
+    }
+    MacroModeState.prototype = {
+      exitMacroRecordMode: function() {
+        var macroModeState = vimGlobalState.macroModeState;
+        macroModeState.onRecordingDone(); // close dialog
+        macroModeState.onRecordingDone = undefined;
+        macroModeState.isRecording = false;
+      },
+      enterMacroRecordMode: function(cm, registerName) {
+        var register =
+            vimGlobalState.registerController.getRegister(registerName);
+        if (register) {
+          register.clear();
+          this.latestRegister = registerName;
+          this.onRecordingDone = cm.openDialog(
               '(recording)['+registerName+']', null, {bottom:true});
-          }
+          this.isRecording = true;
         }
-      };
+      }
     };
 
-
     function maybeInitVimState(cm) {
       if (!cm.state.vim) {
         // Store instance state in the CodeMirror object.
@@ -598,7 +603,7 @@
         // Whether we are searching backwards.
         searchIsReversed: false,
         jumpList: createCircularJumpList(),
-        macroModeState: createMacroState(),
+        macroModeState: new MacroModeState,
         // Recording latest f, t, F or T motion command.
         lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
         registerController: new RegisterController({})
@@ -650,9 +655,9 @@
         var command;
         var vim = maybeInitVimState(cm);
         var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.enteredMacroMode) {
+        if (macroModeState.isRecording) {
           if (key == 'q') {
-            actions.exitMacroRecordMode();
+            macroModeState.exitMacroRecordMode();
             vim.inputState = new InputState();
             return;
           }
@@ -682,6 +687,9 @@
             // Increment count unless count is 0 and key is 0.
             vim.inputState.pushRepeatDigit(key);
           }
+          if (macroModeState.isRecording) {
+            logKey(macroModeState, key);
+          }
           return;
         }
         if (command.type == 'keyToKey') {
@@ -690,7 +698,7 @@
             this.handleKey(cm, command.toKeys[i]);
           }
         } else {
-          if (macroModeState.enteredMacroMode) {
+          if (macroModeState.isRecording) {
             logKey(macroModeState, key);
           }
           commandDispatcher.processCommand(cm, vim, command);
@@ -711,7 +719,7 @@
       this.motion = null;
       this.motionArgs = null;
       this.keyBuffer = []; // For matching multi-key commands.
-      this.registerName = null; // Defaults to the unamed register.
+      this.registerName = null; // Defaults to the unnamed register.
     }
     InputState.prototype.pushRepeatDigit = function(n) {
       if (!this.operator) {
@@ -742,30 +750,34 @@
      */
     function Register(text, linewise) {
       this.clear();
-      this.text = text || '';
-      this.linewise = !!linewise;
+      this.keyBuffer = [text || ''];
       this.insertModeChanges = [];
+      this.linewise = !!linewise;
     }
     Register.prototype = {
       setText: function(text, linewise) {
-        this.text = text;
+        this.keyBuffer = [text || ''];
         this.linewise = !!linewise;
       },
-      appendText: function(text, linewise) {
+      pushText: function(text, linewise) {
         // if this register has ever been set to linewise, use linewise.
         if (linewise || this.linewise) {
-          this.text += '\n' + text;
+          this.keyBuffer.push('\n');
           this.linewise = true;
-        } else {
-          this.text += text;
         }
+        this.keyBuffer.push(text);
+      },
+      pushInsertModeChanges: function(changes) {
+        this.insertModeChanges.push(createInsertModeChanges(changes));
       },
       clear: function() {
-        this.text = '';
-        this.linewise = false;
+        this.keyBuffer = [];
         this.insertModeChanges = [];
+        this.linewise = false;
       },
-      toString: function() { return this.text; }
+      toString: function() {
+        return this.keyBuffer.join('');
+      }
     };
 
     /*
@@ -778,7 +790,7 @@
      */
     function RegisterController(registers) {
       this.registers = registers;
-      this.unamedRegister = registers['"'] = new Register();
+      this.unnamedRegister = registers['"'] = new Register();
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise) {
@@ -814,7 +826,7 @@
               break;
           }
           // Make sure the unnamed register is set to what just happened
-          this.unamedRegister.setText(text, linewise);
+          this.unnamedRegister.setText(text, linewise);
           return;
         }
 
@@ -822,19 +834,19 @@
         var append = isUpperCase(registerName);
         if (append) {
           register.append(text, linewise);
-          // The unamed register always has the same value as the last used
+          // The unnamed register always has the same value as the last used
           // register.
-          this.unamedRegister.append(text, linewise);
+          this.unnamedRegister.append(text, linewise);
         } else {
           register.setText(text, linewise);
-          this.unamedRegister.setText(text, linewise);
+          this.unnamedRegister.setText(text, linewise);
         }
       },
       // Gets the register named @name.  If one of @name doesn't already exist,
-      // create it.  If @name is invalid, return the unamedRegister.
+      // create it.  If @name is invalid, return the unnamedRegister.
       getRegister: function(name) {
         if (!this.isValidRegister(name)) {
-          return this.unamedRegister;
+          return this.unnamedRegister;
         }
         name = name.toLowerCase();
         if (!this.registers[name]) {
@@ -1303,7 +1315,7 @@
       },
       recordLastEdit: function(vim, inputState, actionCommand) {
         var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.inReplay) { return; }
+        if (macroModeState.isPlaying) { return; }
         vim.lastEditInputState = inputState;
         vim.lastEditActionCommand = actionCommand;
         macroModeState.lastInsertModeChanges.changes = [];
@@ -1821,16 +1833,10 @@
           executeMacroRegister(cm, vim, macroModeState, registerName);
         }
       },
-      exitMacroRecordMode: function() {
-        var macroModeState = vimGlobalState.macroModeState;
-        macroModeState.toggle();
-        saveMacroToRegister(macroModeState);
-      },
       enterMacroRecordMode: function(cm, actionArgs) {
         var macroModeState = vimGlobalState.macroModeState;
         var registerName = actionArgs.selectedCharacter;
-        macroModeState.toggle(cm, registerName);
-        emptyMacroKeyBuffer(macroModeState);
+        macroModeState.enterMacroRecordMode(cm, registerName);
       },
       enterInsertMode: function(cm, actionArgs, vim) {
         if (cm.getOption('readOnly')) { return; }
@@ -1857,7 +1863,7 @@
           cm.setOption('keyMap', 'vim-insert');
           CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
         }
-        if (!vimGlobalState.macroModeState.inReplay) {
+        if (!vimGlobalState.macroModeState.isPlaying) {
           // Only record if not replaying.
           cm.on('change', onChange);
           cm.on('cursorActivity', onCursorActivity);
@@ -1989,11 +1995,12 @@
         var cur = cm.getCursor();
         var register = vimGlobalState.registerController.getRegister(
             actionArgs.registerName);
-        if (!register.text) {
+        var text = register.toString();
+        if (!text) {
           return;
         }
-        for (var text = '', i = 0; i < actionArgs.repeat; i++) {
-          text += register.text;
+        if (actionArgs.repeat > 1) {
+          var text = Array(actionArgs.repeat + 1).join(text);
         }
         var linewise = register.linewise;
         if (linewise) {
@@ -3476,7 +3483,7 @@
         var regInfo = '----------Registers----------<br><br>';
         if (!regArgs) {
           for (var registerName in registers) {
-            var text = registers[registerName].text;
+            var text = registers[registerName].toString();
             if (text.length) {
               regInfo += '"' + registerName + '    ' + text + '<br>';
             }
@@ -3865,13 +3872,13 @@
     function exitInsertMode(cm) {
       var vim = cm.state.vim;
       var macroModeState = vimGlobalState.macroModeState;
-      var inReplay = macroModeState.inReplay;
-      if (!inReplay) {
+      var isPlaying = macroModeState.isPlaying;
+      if (!isPlaying) {
         cm.off('change', onChange);
         cm.off('cursorActivity', onCursorActivity);
         CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
       }
-      if (!inReplay && vim.insertModeRepeat > 1) {
+      if (!isPlaying && vim.insertModeRepeat > 1) {
         // Perform insert mode repeat for commands like 3,a and 3,o.
         repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
             true /** repeatForInsert */);
@@ -3884,7 +3891,7 @@
       cm.setOption('disableInput', true);
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-      if (macroModeState.enteredMacroMode) {
+      if (macroModeState.isRecording) {
         logInsertModeChange(macroModeState);
       }
     }
@@ -3910,60 +3917,47 @@
       fallthrough: ['vim-insert']
     };
 
-    function parseRegisterToKeyBuffer(macroModeState, registerName) {
-      var match, key;
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      var text = register.toString();
-      var keyBuffer = macroModeState.keyBuffer;
-      emptyMacroKeyBuffer(macroModeState);
-      do {
-        match = (/<\w+-.+?>|<\w+>|./).exec(text);
-        if (match === null)break;
-        key = match[0];
-        text = text.substring(match.index + key.length);
-        keyBuffer.push(key);
-      } while (text);
-      return keyBuffer;
-    }
-
-    function saveMacroToRegister(macroModeState) {
-      var name = macroModeState.latestRegister;
-      var text = macroModeState.keyBuffer.join('');
-      var register = vimGlobalState.registerController.getRegister(name);
-      register.setText(text, false);
-      register.insertModeChanges = macroModeState.insertModeBuffer;
-      macroModeState.insertModeBuffer = [];
-    }
-
-    function emptyMacroKeyBuffer(macroModeState) {
-      if (macroModeState.inReplay) { return; }
-      macroModeState.keyBuffer.length = 0;
-    }
-
     function executeMacroRegister(cm, vim, macroModeState, registerName) {
-      var keyBuffer = parseRegisterToKeyBuffer(macroModeState, registerName);
       var register = vimGlobalState.registerController.getRegister(registerName);
-      var j = 0;
-      macroModeState.inReplay = true;
-      for (var i = 0, len = keyBuffer.length; i < len; i++) {
-        CodeMirror.Vim.handleKey(cm, keyBuffer[i]);
-        if (vim.insertMode) {
-          repeatInsertModeChanges(cm, register.insertModeChanges[j++].changes, 1);
-          exitInsertMode(cm);
+      var keyBuffer = register.keyBuffer;
+      var imc = 0;
+      macroModeState.isPlaying = true;
+      for (var i = 0; i < keyBuffer.length; i++) {
+        var text = keyBuffer[i];
+        var match, key;
+        while (text) {
+          // Pull off one command key, which is either a single character
+          // or a special sequence wrapped in '<' and '>', e.g. '<Space>'.
+          match = (/<\w+-.+?>|<\w+>|./).exec(text);
+          key = match[0];
+          text = text.substring(match.index + key.length);
+          CodeMirror.Vim.handleKey(cm, key);
+          if (vim.insertMode) {
+            repeatInsertModeChanges(
+                cm, register.insertModeChanges[imc++].changes, 1);
+            exitInsertMode(cm);
+          }
         }
       };
-      macroModeState.inReplay = false;
+      macroModeState.isPlaying = false;
     }
 
     function logKey(macroModeState, key) {
-      if (macroModeState.inReplay) { return; }
-      macroModeState.keyBuffer.push(key);
+      if (macroModeState.isPlaying) { return; }
+      var registerName = macroModeState.latestRegister;
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (register) {
+        register.pushText(key);
+      }
     }
 
     function logInsertModeChange(macroModeState) {
-      if (macroModeState.inReplay) { return; }
-      macroModeState.insertModeBuffer.push(
-        createInsertModeChanges(macroModeState.lastInsertModeChanges));
+      if (macroModeState.isPlaying) { return; }
+      var registerName = macroModeState.latestRegister;
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (register) {
+        register.pushInsertModeChanges(macroModeState.lastInsertModeChanges);
+      }
     }
 
     /**
@@ -3973,7 +3967,7 @@
     function onChange(_cm, changeObj) {
       var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
-      if (!macroModeState.inReplay) {
+      if (!macroModeState.isPlaying) {
         while(changeObj) {
           lastChange.expectCursorActivityForChange = true;
           if (changeObj.origin == '+input' || changeObj.origin == 'paste'
@@ -3994,7 +3988,7 @@
     */
     function onCursorActivity() {
       var macroModeState = vimGlobalState.macroModeState;
-      if (macroModeState.inReplay) { return; }
+      if (macroModeState.isPlaying) { return; }
       var lastChange = macroModeState.lastInsertModeChanges;
       if (lastChange.expectCursorActivityForChange) {
         lastChange.expectCursorActivityForChange = false;
@@ -4038,7 +4032,7 @@
      */
     function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
       var macroModeState = vimGlobalState.macroModeState;
-      macroModeState.inReplay = true;
+      macroModeState.isPlaying = true;
       var isAction = !!vim.lastEditActionCommand;
       var cachedInputState = vim.inputState;
       function repeatCommand() {
@@ -4084,7 +4078,7 @@
         // were called by an exitInsertMode call lower on the stack.
         exitInsertMode(cm);
       }
-      macroModeState.inReplay = false;
+      macroModeState.isPlaying = false;
     };
 
     function repeatInsertModeChanges(cm, changes, repeat) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 013a612b7e..ae9aac2f8f 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -176,6 +176,11 @@ function testVim(name, run, opts, expectedFail) {
         return callback(result);
       }
     }
+    function fakeOpenNotification(matcher) {
+      return function(text) {
+        matcher(text);
+      }
+    }
     var helpers = {
       doKeys: doKeysFn(cm),
       // Warning: Only emulates keymap events, not character insertions. Use
@@ -185,16 +190,19 @@ function testVim(name, run, opts, expectedFail) {
       doEx: doExFn(cm),
       assertCursorAt: assertCursorAtFn(cm),
       fakeOpenDialog: fakeOpenDialog,
+      fakeOpenNotification: fakeOpenNotification,
       getRegisterController: function() {
         return CodeMirror.Vim.getRegisterController();
       }
     }
     CodeMirror.Vim.resetVimGlobalState_();
     var successful = false;
+    var savedOpenNotification = cm.openNotification;
     try {
       run(cm, vim, helpers);
       successful = true;
     } finally {
+      cm.openNotification = savedOpenNotification;
       if (!successful || verbose) {
         place.style.visibility = "visible";
       } else {
@@ -502,7 +510,7 @@ testVim('dl', function(cm, vim, helpers) {
   helpers.doKeys('d', 'l');
   eq('word1 ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq(' ', register.text);
+  eq(' ', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
@@ -511,7 +519,7 @@ testVim('dl_eol', function(cm, vim, helpers) {
   helpers.doKeys('d', 'l');
   eq(' word1', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq(' ', register.text);
+  eq(' ', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 5);
 }, { value: ' word1 ' });
@@ -521,7 +529,7 @@ testVim('dl_repeat', function(cm, vim, helpers) {
   helpers.doKeys('2', 'd', 'l');
   eq('ord1 ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq(' w', register.text);
+  eq(' w', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
@@ -531,7 +539,7 @@ testVim('dh', function(cm, vim, helpers) {
   helpers.doKeys('d', 'h');
   eq(' wrd1 ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('o', register.text);
+  eq('o', register.toString());
   is(!register.linewise);
   eqPos(offsetCursor(curStart, 0 , -1), cm.getCursor());
 }, { value: ' word1 ' });
@@ -541,7 +549,7 @@ testVim('dj', function(cm, vim, helpers) {
   helpers.doKeys('d', 'j');
   eq(' word3', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq(' word1\nword2\n', register.text);
+  eq(' word1\nword2\n', register.toString());
   is(register.linewise);
   helpers.assertCursorAt(0, 1);
 }, { value: ' word1\nword2\n word3' });
@@ -551,7 +559,7 @@ testVim('dj_end_of_document', function(cm, vim, helpers) {
   helpers.doKeys('d', 'j');
   eq(' word1 ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.text);
+  eq('', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 3);
 }, { value: ' word1 ' });
@@ -561,7 +569,7 @@ testVim('dk', function(cm, vim, helpers) {
   helpers.doKeys('d', 'k');
   eq(' word3', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq(' word1\nword2\n', register.text);
+  eq(' word1\nword2\n', register.toString());
   is(register.linewise);
   helpers.assertCursorAt(0, 1);
 }, { value: ' word1\nword2\n word3' });
@@ -571,7 +579,7 @@ testVim('dk_start_of_document', function(cm, vim, helpers) {
   helpers.doKeys('d', 'k');
   eq(' word1 ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.text);
+  eq('', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 3);
 }, { value: ' word1 ' });
@@ -581,7 +589,7 @@ testVim('dw_space', function(cm, vim, helpers) {
   helpers.doKeys('d', 'w');
   eq('word1 ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq(' ', register.text);
+  eq(' ', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
@@ -591,7 +599,7 @@ testVim('dw_word', function(cm, vim, helpers) {
   helpers.doKeys('d', 'w');
   eq(' word2', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('word1 ', register.text);
+  eq('word1 ', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1 word2' });
@@ -602,7 +610,7 @@ testVim('dw_only_word', function(cm, vim, helpers) {
   helpers.doKeys('d', 'w');
   eq(' ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('word1 ', register.text);
+  eq('word1 ', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 0);
 }, { value: ' word1 ' });
@@ -613,7 +621,7 @@ testVim('dw_eol', function(cm, vim, helpers) {
   helpers.doKeys('d', 'w');
   eq(' \nword2', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('word1', register.text);
+  eq('word1', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 0);
 }, { value: ' word1\nword2' });
@@ -624,7 +632,7 @@ testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
   helpers.doKeys('d', 'w');
   eq(' \n\nword2', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('word1', register.text);
+  eq('word1', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 0);
 }, { value: ' word1\n\nword2' });
@@ -670,7 +678,7 @@ testVim('dw_repeat', function(cm, vim, helpers) {
   helpers.doKeys('d', '2', 'w');
   eq(' ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('word1\nword2', register.text);
+  eq('word1\nword2', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 0);
 }, { value: ' word1\nword2' });
@@ -751,7 +759,7 @@ testVim('d_inclusive', function(cm, vim, helpers) {
   helpers.doKeys('d', 'e');
   eq('  ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('word1', register.text);
+  eq('word1', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
@@ -761,7 +769,7 @@ testVim('d_reverse', function(cm, vim, helpers) {
   helpers.doKeys('d', 'b');
   eq(' word2 ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('word1\n', register.text);
+  eq('word1\n', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 1);
 }, { value: ' word1\nword2 ' });
@@ -773,7 +781,7 @@ testVim('dd', function(cm, vim, helpers) {
   helpers.doKeys('d', 'd');
   eq(expectedLineCount, cm.lineCount());
   var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.text);
+  eq(expectedBuffer, register.toString());
   is(register.linewise);
   helpers.assertCursorAt(0, lines[1].textStart);
 });
@@ -785,7 +793,7 @@ testVim('dd_prefix_repeat', function(cm, vim, helpers) {
   helpers.doKeys('2', 'd', 'd');
   eq(expectedLineCount, cm.lineCount());
   var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.text);
+  eq(expectedBuffer, register.toString());
   is(register.linewise);
   helpers.assertCursorAt(0, lines[2].textStart);
 });
@@ -797,7 +805,7 @@ testVim('dd_motion_repeat', function(cm, vim, helpers) {
   helpers.doKeys('d', '2', 'd');
   eq(expectedLineCount, cm.lineCount());
   var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.text);
+  eq(expectedBuffer, register.toString());
   is(register.linewise);
   helpers.assertCursorAt(0, lines[2].textStart);
 });
@@ -809,7 +817,7 @@ testVim('dd_multiply_repeat', function(cm, vim, helpers) {
   helpers.doKeys('2', 'd', '3', 'd');
   eq(expectedLineCount, cm.lineCount());
   var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.text);
+  eq(expectedBuffer, register.toString());
   is(register.linewise);
   helpers.assertCursorAt(0, lines[6].textStart);
 });
@@ -830,7 +838,7 @@ testVim('yw_repeat', function(cm, vim, helpers) {
   helpers.doKeys('y', '2', 'w');
   eq(' word1\nword2', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('word1\nword2', register.text);
+  eq('word1\nword2', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2' });
@@ -843,7 +851,7 @@ testVim('yy_multiply_repeat', function(cm, vim, helpers) {
   helpers.doKeys('2', 'y', '3', 'y');
   eq(expectedLineCount, cm.lineCount());
   var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.text);
+  eq(expectedBuffer, register.toString());
   is(register.linewise);
   eqPos(curStart, cm.getCursor());
 });
@@ -864,7 +872,7 @@ testVim('cw_repeat', function(cm, vim, helpers) {
   helpers.doKeys('c', '2', 'w');
   eq(' ', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('word1\nword2', register.text);
+  eq('word1\nword2', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
   eq('vim-insert', cm.getOption('keyMap'));
@@ -877,7 +885,7 @@ testVim('cc_multiply_repeat', function(cm, vim, helpers) {
   helpers.doKeys('2', 'c', '3', 'c');
   eq(expectedLineCount, cm.lineCount());
   var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.text);
+  eq(expectedBuffer, register.toString());
   is(register.linewise);
   eq('vim-insert', cm.getOption('keyMap'));
 });
@@ -896,7 +904,7 @@ testVim('g~w_repeat', function(cm, vim, helpers) {
   helpers.doKeys('g', '~', '2', 'w');
   eq(' WORD1\nWORD2', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.text);
+  eq('', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2' });
@@ -908,7 +916,7 @@ testVim('g~g~', function(cm, vim, helpers) {
   helpers.doKeys('2', 'g', '~', '3', 'g', '~');
   eq(expectedValue, cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.text);
+  eq('', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
@@ -919,7 +927,7 @@ testVim('>{motion}', function(cm, vim, helpers) {
   helpers.doKeys('>', 'k');
   eq(expectedValue, cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.text);
+  eq('', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 3);
 }, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
@@ -930,7 +938,7 @@ testVim('>>', function(cm, vim, helpers) {
   helpers.doKeys('2', '>', '>');
   eq(expectedValue, cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.text);
+  eq('', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 3);
 }, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
@@ -941,7 +949,7 @@ testVim('<{motion}', function(cm, vim, helpers) {
   helpers.doKeys('<', 'k');
   eq(expectedValue, cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.text);
+  eq('', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 1);
 }, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
@@ -952,7 +960,7 @@ testVim('<<', function(cm, vim, helpers) {
   helpers.doKeys('2', '<', '<');
   eq(expectedValue, cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.text);
+  eq('', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 1);
 }, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
@@ -1039,7 +1047,7 @@ testVim('D', function(cm, vim, helpers) {
   helpers.doKeys('D');
   eq(' wo\nword2\n word3', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('rd1', register.text);
+  eq('rd1', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 2);
 }, { value: ' word1\nword2\n word3' });
@@ -1049,7 +1057,7 @@ testVim('C', function(cm, vim, helpers) {
   helpers.doKeys('C');
   eq(' wo\nword2\n word3', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('rd1', register.text);
+  eq('rd1', register.toString());
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
   eq('vim-insert', cm.getOption('keyMap'));
@@ -1060,7 +1068,7 @@ testVim('Y', function(cm, vim, helpers) {
   helpers.doKeys('Y');
   eq(' word1\nword2\n word3', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('rd1', register.text);
+  eq('rd1', register.toString());
   is(!register.linewise);
   helpers.assertCursorAt(0, 3);
 }, { value: ' word1\nword2\n word3' });
@@ -1745,6 +1753,17 @@ testVim('macro_insert', function(cm, vim, helpers) {
   helpers.doKeys('q', '@', 'a');
   eq('foofoo', cm.getValue());
 }, { value: ''});
+testVim('macro_space', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('<Space>', '<Space>');
+  helpers.assertCursorAt(0, 2);
+  helpers.doKeys('q', 'a', '<Space>', '<Space>', 'q');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('@', 'a');
+  helpers.assertCursorAt(0, 6);
+  helpers.doKeys('@', 'a');
+  helpers.assertCursorAt(0, 8);
+}, { value: 'one line of text.'});
 testVim('macro_parens', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'z', 'i');
@@ -1758,6 +1777,68 @@ testVim('macro_parens', function(cm, vim, helpers) {
   helpers.doKeys('w', '@', 'z');
   eq('(see) (spot) (run)', cm.getValue());
 }, { value: 'see spot run'});
+testVim('macro_overwrite', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'z', '0', 'i');
+  cm.replaceRange('I ', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('q');
+  helpers.doKeys('e');
+  // Now replace the macro with something else.
+  helpers.doKeys('q', 'z', 'a');
+  cm.replaceRange('.', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('q');
+  helpers.doKeys('e', '@', 'z');
+  helpers.doKeys('e', '@', 'z');
+  eq('I see. spot. run.', cm.getValue());
+}, { value: 'see spot run'});
+testVim('macro_search_f', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', 'f', ' ');
+  helpers.assertCursorAt(0,3);
+  helpers.doKeys('q', '0');
+  helpers.assertCursorAt(0,0);
+  helpers.doKeys('@', 'a');
+  helpers.assertCursorAt(0,3);
+}, { value: 'The quick brown fox jumped over the lazy dog.'});
+testVim('macro_search_2f', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', '2', 'f', ' ');
+  helpers.assertCursorAt(0,9);
+  helpers.doKeys('q', '0');
+  helpers.assertCursorAt(0,0);
+  helpers.doKeys('@', 'a');
+  helpers.assertCursorAt(0,9);
+}, { value: 'The quick brown fox jumped over the lazy dog.'});
+testVim('yank_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'y');
+  helpers.doKeys('j', '"', 'b', 'y', 'y');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    eq(false, text.match('a\\s+foo') == null);
+    eq(false, text.match('b\\s+bar') == null);
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('macro_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', 'i');
+  cm.replaceRange('gangnam', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('q');
+  helpers.doKeys('q', 'b', 'o');
+  cm.replaceRange('style', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('q');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    eq(false, text.match('a\\s+i') == null);
+    eq(false, text.match('b\\s+o') == null);
+  });
+  helpers.doKeys(':');
+}, { value: ''});
 testVim('.', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('2', 'd', 'w');

From 809fe262184b433fb38c202628d27d81d90c401a Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 8 Mar 2014 22:14:16 +0100
Subject: [PATCH 1066/4742] [vim] Fix :registers unit tests

---
 test/vim_test.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/vim_test.js b/test/vim_test.js
index ae9aac2f8f..3c675d0326 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1572,7 +1572,7 @@ testVim('o_visual', function(cm,vim,helpers) {
   helpers.doKeys('d');
   eq('p',cm.getValue());
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
-  
+
 testVim('S_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('j', 'S');
@@ -1817,8 +1817,8 @@ testVim('yank_register', function(cm, vim, helpers) {
   helpers.doKeys('j', '"', 'b', 'y', 'y');
   cm.openDialog = helpers.fakeOpenDialog('registers');
   cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    eq(false, text.match('a\\s+foo') == null);
-    eq(false, text.match('b\\s+bar') == null);
+    is(/a\s+foo/.test(text));
+    is(/b\s+bar/.test(text));
   });
   helpers.doKeys(':');
 }, { value: 'foo\nbar'});
@@ -1834,8 +1834,8 @@ testVim('macro_register', function(cm, vim, helpers) {
   helpers.doKeys('q');
   cm.openDialog = helpers.fakeOpenDialog('registers');
   cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    eq(false, text.match('a\\s+i') == null);
-    eq(false, text.match('b\\s+o') == null);
+    is(/a\s+i/.test(text));
+    is(/b\s+o/.test(text));
   });
   helpers.doKeys(':');
 }, { value: ''});

From b92c57caa7da59901aa46325be9d15574030e26c Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Sat, 8 Mar 2014 19:57:05 -0800
Subject: [PATCH 1067/4742] Add some unit tests for enforcing the search
 behavior with 't' and 'f' from within macros.

---
 test/vim_test.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/vim_test.js b/test/vim_test.js
index 3c675d0326..abb191f0d0 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1764,6 +1764,24 @@ testVim('macro_space', function(cm, vim, helpers) {
   helpers.doKeys('@', 'a');
   helpers.assertCursorAt(0, 8);
 }, { value: 'one line of text.'});
+testVim('macro_t_search', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', 't', 'e', 'q');
+  helpers.assertCursorAt(0, 1);
+  helpers.doKeys('l', '@', 'a');
+  helpers.assertCursorAt(0, 6);
+  helpers.doKeys('l', '@', 'a');
+  helpers.assertCursorAt(0, 12);
+}, { value: 'one line of text.'});
+testVim('macro_f_search', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'b', 'f', 'e', 'q');
+  helpers.assertCursorAt(0, 2);
+  helpers.doKeys('@', 'b');
+  helpers.assertCursorAt(0, 7);
+  helpers.doKeys('@', 'b');
+  helpers.assertCursorAt(0, 13);
+}, { value: 'one line of text.'});
 testVim('macro_parens', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'z', 'i');

From 5289b00d2568c8d4a8ef562bb24e37b48d7845d1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 9 Mar 2014 12:36:23 +0100
Subject: [PATCH 1068/4742] Restore redo selection history clearing when adding
 a selection to history

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 67a80a8317..3a4f5a135f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3275,7 +3275,7 @@
       if (event.ranges) {
         pushSelectionToHistory(event, dest);
         if (allowSelectionOnly && !event.equals(doc.sel)) {
-          setSelection(doc, event);
+          setSelection(doc, event, {clearRedo: false});
           return;
         }
         selAfter = event;
@@ -6530,6 +6530,8 @@
     hist.lastSelTime = +new Date;
     hist.lastSelOrigin = origin;
     hist.lastOp = opId;
+    if (options && options.clearRedo !== false)
+      clearSelectionEvents(hist.undone);
   }
 
   function pushSelectionToHistory(sel, dest) {

From a21c491b4e7d393f618cf1236a62b8debfb7a206 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 9 Mar 2014 18:04:17 +0100
Subject: [PATCH 1069/4742] [merge addon] Add leftChunks and rightChunks
 methods

Issue #2334
---
 addon/merge/merge.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index ce16e258d9..f2d100754f 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -353,6 +353,12 @@
     setShowDifferences: function(val) {
       if (this.right) this.right.setShowDifferences(val);
       if (this.left) this.left.setShowDifferences(val);
+    },
+    rightChunks: function() {
+      return this.right && getChunks(this.right.diff);
+    },
+    leftChunks: function() {
+      return this.left && getChunks(this.left.diff);
     }
   };
 
@@ -403,6 +409,15 @@
       f(startOrig, orig.line + 1, startEdit, edit.line + 1);
   }
 
+  function getChunks(diff) {
+    var collect = [];
+    iterateChunks(diff, function(topOrig, botOrig, topEdit, botEdit) {
+      collect.push({origFrom: topOrig, origTo: botOrig,
+                    editFrom: topEdit, editTo: botEdit});
+    });
+    return collect;
+  }
+
   function endOfLineClean(diff, i) {
     if (i == diff.length - 1) return true;
     var next = diff[i + 1][1];

From 11b4e40e21949b44b70172d4485775c2b7104e48 Mon Sep 17 00:00:00 2001
From: Malay Majithia <malay@msquarelive.com>
Date: Sun, 9 Mar 2014 17:13:34 +0530
Subject: [PATCH 1070/4742] [sql mode] Added support for Hive

---
 mode/sql/index.html |  3 ++-
 mode/sql/sql.js     | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index e6882d79c1..79a2e74e0f 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -52,7 +52,8 @@ <h2>SQL Mode for CodeMirror</h2>
             <code><a href="?mime=text/x-mariadb">text/x-mariadb</a></code>,
             <code><a href="?mime=text/x-cassandra">text/x-cassandra</a></code>,
             <code><a href="?mime=text/x-plsql">text/x-plsql</a></code>,
-            <code><a href="?mime=text/x-mssql">text/x-mssql</a></code>.
+            <code><a href="?mime=text/x-mssql">text/x-mssql</a></code>,
+            <code><a href="?mime=text/x-hive">text/x-hive</a></code>.
         </p>
 <script>
 window.onload = function() {
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index a34b393fef..176f80677f 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -332,6 +332,17 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     dateSQL:    set("date time timestamp"),
     support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")
   });
+
+  // Created to support specific hive keywords
+  CodeMirror.defineMIME("text/x-hive", {
+    name: "sql",
+    keywords: set("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"),
+    builtin: set("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"),
+    atoms: set("false true null unknown"),
+    operatorChars: /^[*+\-%<>!=]/,
+    dateSQL: set("date timestamp"),
+    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
+  });
 }());
 
 /*

From 2054ec8bc43c12b7b6ad903e38e4140e9d5efc67 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Sun, 9 Mar 2014 23:43:14 -0700
Subject: [PATCH 1071/4742] account for Ex dialog prompts in search queries
 recorded into macros.

---
 keymap/vim.js    | 40 +++++++++++++++++++++++++++++++++-------
 test/vim_test.js | 26 ++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 07765f843f..b630b7c764 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -537,6 +537,7 @@
       this.latestRegister = undefined;
       this.isPlaying = false;
       this.isRecording = false;
+      this.replaySearchQueries = [];
       this.onRecordingDone = undefined;
       this.lastInsertModeChanges = createInsertModeChanges();
     }
@@ -752,6 +753,7 @@
       this.clear();
       this.keyBuffer = [text || ''];
       this.insertModeChanges = [];
+      this.searchQueries = [];
       this.linewise = !!linewise;
     }
     Register.prototype = {
@@ -770,9 +772,13 @@
       pushInsertModeChanges: function(changes) {
         this.insertModeChanges.push(createInsertModeChanges(changes));
       },
+      pushSearchQuery: function(query) {
+        this.searchQueries.push(query);
+      },
       clear: function() {
         this.keyBuffer = [];
         this.insertModeChanges = [];
+        this.searchQueries = [];
         this.linewise = false;
       },
       toString: function() {
@@ -1064,6 +1070,10 @@
         function onPromptClose(query) {
           cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
           handleQuery(query, true /** ignoreCase */, true /** smartCase */);
+          var macroModeState = vimGlobalState.macroModeState;
+          if (macroModeState.isRecording) {
+            logSearchQuery(macroModeState, query);
+          }
         }
         function onPromptKeyUp(_e, query) {
           var parsedQuery;
@@ -1094,13 +1104,19 @@
         }
         switch (command.searchArgs.querySrc) {
           case 'prompt':
-            showPrompt(cm, {
-                onClose: onPromptClose,
-                prefix: promptPrefix,
-                desc: searchPromptDesc,
-                onKeyUp: onPromptKeyUp,
-                onKeyDown: onPromptKeyDown
-            });
+            var macroModeState = vimGlobalState.macroModeState;
+            if (macroModeState.isPlaying) {
+              var query = macroModeState.replaySearchQueries.shift();
+              handleQuery(query, true /** ignoreCase */, false /** smartCase */);
+            } else {
+              showPrompt(cm, {
+                  onClose: onPromptClose,
+                  prefix: promptPrefix,
+                  desc: searchPromptDesc,
+                  onKeyUp: onPromptKeyUp,
+                  onKeyDown: onPromptKeyDown
+              });
+            }
             break;
           case 'wordUnderCursor':
             var word = expandWordUnderCursor(cm, false /** inclusive */,
@@ -3922,6 +3938,7 @@
       var keyBuffer = register.keyBuffer;
       var imc = 0;
       macroModeState.isPlaying = true;
+      macroModeState.replaySearchQueries = register.searchQueries.slice(0);
       for (var i = 0; i < keyBuffer.length; i++) {
         var text = keyBuffer[i];
         var match, key;
@@ -3960,6 +3977,15 @@
       }
     }
 
+    function logSearchQuery(macroModeState, query) {
+      if (macroModeState.isPlaying) { return; }
+      var registerName = macroModeState.latestRegister;
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (register) {
+        register.pushSearchQuery(query);
+      }
+    }
+
     /**
      * Listens for changes made in insert mode.
      * Should only be active in insert mode.
diff --git a/test/vim_test.js b/test/vim_test.js
index abb191f0d0..0a82987389 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1770,7 +1770,7 @@ testVim('macro_t_search', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 1);
   helpers.doKeys('l', '@', 'a');
   helpers.assertCursorAt(0, 6);
-  helpers.doKeys('l', '@', 'a');
+  helpers.doKeys('l', ';');
   helpers.assertCursorAt(0, 12);
 }, { value: 'one line of text.'});
 testVim('macro_f_search', function(cm, vim, helpers) {
@@ -1779,9 +1779,31 @@ testVim('macro_f_search', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 2);
   helpers.doKeys('@', 'b');
   helpers.assertCursorAt(0, 7);
-  helpers.doKeys('@', 'b');
+  helpers.doKeys(';');
+  helpers.assertCursorAt(0, 13);
+}, { value: 'one line of text.'});
+testVim('macro_slash_search', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'c');
+  cm.openDialog = helpers.fakeOpenDialog('e');
+  helpers.doKeys('/', 'q');
+  helpers.assertCursorAt(0, 2);
+  helpers.doKeys('@', 'c');
+  helpers.assertCursorAt(0, 7);
+  helpers.doKeys('n');
   helpers.assertCursorAt(0, 13);
 }, { value: 'one line of text.'});
+testVim('macro_multislash_search', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'd');
+  cm.openDialog = helpers.fakeOpenDialog('e');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('t');
+  helpers.doKeys('/', 'q');
+  helpers.assertCursorAt(0, 12);
+  helpers.doKeys('@', 'd');
+  helpers.assertCursorAt(0, 15);
+}, { value: 'one line of text to rule them all.'});
 testVim('macro_parens', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'z', 'i');

From bdbaaec3969688f5c886cf6a09ebaa30b6229e9d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Mar 2014 09:33:16 +0100
Subject: [PATCH 1072/4742] Better heuristic for inverting ranges in
 normalizeSelection

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3a4f5a135f..0b5caa03ad 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -995,9 +995,9 @@
       var cur = ranges[i], prev = ranges[i - 1];
       if (cmp(prev.to(), cur.from()) >= 0) {
         var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
-        var inv = from == prev.head || from == cur.head;
+        var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
         if (i <= primIndex) --primIndex;
-        ranges.splice(i-- - 1, 2, new Range(inv ? to : from, inv ? from : to));
+        ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
       }
     }
     return new Selection(ranges, primIndex);

From c7f2e70629e94ef7659c307b3b44cdfa05dc4967 Mon Sep 17 00:00:00 2001
From: B Krishna Chaitanya <bkchaitan94@gmail.com>
Date: Mon, 10 Mar 2014 08:50:09 +0100
Subject: [PATCH 1073/4742] [sublime keymap] Add support for shift-alt-up/down

---
 keymap/sublime.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 44ddb5e5e5..fc9cdc961c 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -393,6 +393,20 @@
     cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
   };
 
+  cmds[map["Shift-Alt-Up"] = "selectLinesUpward"] = function(cm) {
+    var curs = cm.listSelections();
+    for (var i = 0; i < curs.length; i++) {
+      if(curs[i].anchor.line>0)
+        cm.addSelection({line:curs[i].anchor.line-1,ch:curs[i].anchor.ch});
+    };
+  };
+  cmds[map["Shift-Alt-Down"] = "selectLinesDownward"] = function(cm) {
+    var curs = cm.listSelections();
+    for (var i = 0; i < curs.length; i++) {
+      cm.addSelection({line:curs[i].anchor.line+1,ch:curs[i].anchor.ch});
+    };
+  };
+
   map["Shift-" + ctrl + "["] = "fold";
   map["Shift-" + ctrl + "]"] = "unfold";
   mapK[ctrl + "0"] = mapK[ctrl + "j"] = "unfoldAll";

From 1bf22d0e24f3969d2e39b710f50f81eeee31815f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Mar 2014 08:53:14 +0100
Subject: [PATCH 1074/4742] [sublime keymap] Fix coding style in
 8eb523db08b80b0ff70728d9b71475cadb2bcf93

Also, wrap the command in an operation and use the head rather than
the anchor of the selections.
---
 keymap/sublime.js    | 25 ++++++++++++++++---------
 test/sublime_test.js | 25 +++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index fc9cdc961c..a9faa09811 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -394,17 +394,24 @@
   };
 
   cmds[map["Shift-Alt-Up"] = "selectLinesUpward"] = function(cm) {
-    var curs = cm.listSelections();
-    for (var i = 0; i < curs.length; i++) {
-      if(curs[i].anchor.line>0)
-        cm.addSelection({line:curs[i].anchor.line-1,ch:curs[i].anchor.ch});
-    };
+    cm.operation(function() {
+      var ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i];
+        if (range.head.line > cm.firstLine())
+          cm.addSelection(Pos(range.head.line - 1, range.head.ch));
+      }
+    });
   };
   cmds[map["Shift-Alt-Down"] = "selectLinesDownward"] = function(cm) {
-    var curs = cm.listSelections();
-    for (var i = 0; i < curs.length; i++) {
-      cm.addSelection({line:curs[i].anchor.line+1,ch:curs[i].anchor.ch});
-    };
+    cm.operation(function() {
+      var ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i];
+        if (range.head.line < cm.lastLine())
+          cm.addSelection(Pos(range.head.line + 1, range.head.ch));
+      }
+    });
   };
 
   map["Shift-" + ctrl + "["] = "fold";
diff --git a/test/sublime_test.js b/test/sublime_test.js
index 639b640043..89c73fa234 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -184,6 +184,31 @@
          val("abc\nabc\ndef\ndef\nghi\nghi"), hasSel(1, 1, 1, 1,
                                                      3, 1, 3, 1,
                                                      5, 1, 5, 1));
+  stTest("selectLinesUpward", "123\n345\n789\n012",
+         setSel(0, 1, 0, 1,
+                1, 1, 1, 3,
+                2, 0, 2, 0,
+                3, 0, 3, 0),
+         "selectLinesUpward",
+         hasSel(0, 1, 0, 1,
+                0, 3, 0, 3,
+                1, 0, 1, 0,
+                1, 1, 1, 3,
+                2, 0, 2, 0,
+                3, 0, 3, 0));
+
+  stTest("selectLinesDownward", "123\n345\n789\n012",
+         setSel(0, 1, 0, 1,
+                1, 1, 1, 3,
+                2, 0, 2, 0,
+                3, 0, 3, 0),
+         "selectLinesDownward",
+         hasSel(0, 1, 0, 1,
+                1, 1, 1, 3,
+                2, 0, 2, 0,
+                2, 3, 2, 3,
+                3, 0, 3, 0));
+
   stTest("sortLines", "c\nb\na\nC\nB\nA",
          "sortLines", val("A\nB\nC\na\nb\nc"),
          "undo",

From 3cb266d7c5f395b448f5a7eb8afdb97105bcd78f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Mar 2014 08:59:09 +0100
Subject: [PATCH 1075/4742] [sublime keymap] Fix shift-ctrl-d binding

It should duplicate for every selection, and for non-empty selections
only duplicate the selected text.
---
 keymap/sublime.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index a9faa09811..b2ba0ce3f0 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -209,16 +209,14 @@
   };
 
   cmds[map["Shift-" + ctrl + "D"] = "duplicateLine"] = function(cm) {
-    var ranges = cm.listSelections(), lines = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var start = ranges[i].from().line;
-      if (!lines.length || start > lines[lines.length - 1])
-        lines.push(start);
-    }
     cm.operation(function() {
-      for (var i = lines.length - 1; i >= 0; i--) {
-        var line = lines[i];
-        cm.replaceRange(cm.getLine(line) + "\n", Pos(line, 0));
+      var rangeCount = cm.listSelections().length;
+      for (var i = 0; i < rangeCount; i++) {
+        var range = cm.listSelections()[i];
+        if (range.empty())
+          cm.replaceRange(cm.getLine(range.head.line) + "\n", Pos(range.head.line, 0));
+        else
+          cm.replaceRange(cm.getRange(range.from(), range.to()), range.from());
       }
     });
   };

From 9245ce92cd8d26e51f13cd4c534285048eecad1a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Mar 2014 10:23:35 +0100
Subject: [PATCH 1076/4742] [sublime keymap] Add test for
 duplicateLineSelection

---
 test/sublime_test.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/sublime_test.js b/test/sublime_test.js
index 89c73fa234..372a1a0899 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -184,6 +184,15 @@
          val("abc\nabc\ndef\ndef\nghi\nghi"), hasSel(1, 1, 1, 1,
                                                      3, 1, 3, 1,
                                                      5, 1, 5, 1));
+  stTest("duplicateLineSelection", "abcdef",
+         setSel(0, 1, 0, 1,
+                0, 2, 0, 4,
+                0, 5, 0, 5),
+         "duplicateLine",
+         val("abcdef\nabcdcdef\nabcdcdef"), hasSel(2, 1, 2, 1,
+                                                   2, 4, 2, 6,
+                                                   2, 7, 2, 7));
+
   stTest("selectLinesUpward", "123\n345\n789\n012",
          setSel(0, 1, 0, 1,
                 1, 1, 1, 3,

From e993d32d593ca4b3a6a77a6f6a2f106d78da2296 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Mar 2014 10:27:35 +0100
Subject: [PATCH 1077/4742] [complete demo] Enable global variable tracking for
 JavaScript mode

---
 demo/complete.html            | 3 ++-
 mode/javascript/javascript.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/demo/complete.html b/demo/complete.html
index 44b3b2db73..047a7ecca4 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -72,7 +72,8 @@ <h2>Autocomplete Demo</h2>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
-        extraKeys: {"Ctrl-Space": "autocomplete"}
+        extraKeys: {"Ctrl-Space": "autocomplete"},
+        mode: {name: "javascript", globalVars: true}
       });
     </script>
   </article>
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 07ba8a6f4b..37f48cbfae 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -571,7 +571,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         context: parserConfig.localVars && {vars: parserConfig.localVars},
         indented: 0
       };
-      if (parserConfig.globalVars) state.globalVars = parserConfig.globalVars;
+      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
+        state.globalVars = parserConfig.globalVars;
       return state;
     },
 

From 5dee39fa4f6447f1f3359f254795325ed282eb8e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Mar 2014 11:35:37 +0100
Subject: [PATCH 1078/4742] Tag 4.0 release candidate 1

---
 AUTHORS           | 10 ++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 9af00e54e4..464249d710 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,14 +3,17 @@ List of CodeMirror contributors. Updated before every release.
 4r2r
 Aaron Brooks
 Abe Fettig
+Adam Ahmed
 Adam King
 adanlobato
 Adán Lobato
+Adrian Aichner
 aeroson
 Ahmad Amireh
 Ahmad M. Zawawi
 ahoward
 Akeksandr Motsjonov
+Alberto González Palomo
 Alberto Pose
 Albert Xing
 Alexander Pavlov
@@ -46,6 +49,8 @@ Benjamin DeCoste
 Ben Keen
 Bernhard Sirlinger
 Billy Moon
+binny
+B Krishna Chaitanya
 Blaine G
 boomyjee
 borawjm
@@ -106,6 +111,7 @@ ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
 Frank Wiegand
+Gabriel Horner
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
@@ -192,6 +198,7 @@ Luciano Longo
 lynschinzer
 Maksim Lin
 Maksym Taran
+Malay Majithia
 Manuel Rego Casasnovas
 Marat Dreizin
 Marco Aurélio
@@ -238,6 +245,7 @@ ndr
 nerbert
 nextrevision
 nguillaumin
+Ng Zhi An
 Nicholas Bollweg
 Niels van Groningen
 Nikita Beloglazov
@@ -246,6 +254,7 @@ Nikolay Kostov
 nlwillia
 pablo
 Page
+Patil Arpith
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
@@ -307,6 +316,7 @@ Tom MacWright
 Tony Jian
 Travis Heppe
 Triangle717
+twifkak
 Vestimir Markov
 vf
 Volker Mische
diff --git a/doc/compress.html b/doc/compress.html
index bb2d8915bd..e5a77c5022 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=4.0.1;f=">4.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.22.0;f=">3.22</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.20.0;f=">3.20</option>
diff --git a/doc/manual.html b/doc/manual.html
index 345d81fefa..c41c4d9bc1 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 4.0.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.0.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 57514884d7..3e2932b411 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -26,6 +26,14 @@ <h2>Release notes and version history</h2>
 
 <section id=v3 class=first>
 
+  <h2>Version 4.x</h2>
+
+  <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-4.0rc1.zip">Version 4.0 release candidate 1</a>:</p>
+
+  <p class="rel-note">First release candidate for 4.0, which supports
+  multiple selections, selection undo, and improved (faster, less
+  kludgy) character measuring.</p>
+
   <h2>Version 3.x</h2>
 
   <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-3.22.zip">Version 3.22</a>:</p>
diff --git a/index.html b/index.html
index d6c0c015b1..911382b825 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.22</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.0</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 96270f2395..364c2cb019 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7316,7 +7316,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.0.0";
+  CodeMirror.version = "4.0.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 8edf5e8a3c..484f7cdc4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.0.0",
+    "version":"4.0.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From c4f8fd3236adfd4e0c4caa6c170587c8a5bc7540 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Mar 2014 11:56:57 +0100
Subject: [PATCH 1079/4742] Mention module loaders in upgrade_v4.html

---
 doc/upgrade_v4.html | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index d577dc50aa..9b461a9153 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -19,6 +19,7 @@
     <li><a href="#beforeSelectionChange">The beforeSelectionChange event</a>
     <li><a href="#replaceSelection">replaceSelection and collapsing</a>
     <li><a href="#changeEvent">change event data</a>
+    <li><a href="#module">Module loaders</a>
     <li><a href="#deprecated">Deprecated interfaces dropped</a>
   </ul>
 </div>
@@ -80,6 +81,22 @@ <h2 id=upgrade>Upgrading to version 4</h2>
 
 </section>
 
+<section id=module><h2>Module loaders</h2>
+
+<p>All modules in the CodeMirror distribution are now wrapped in a
+shim function to make them compatible with both AMD
+(<a href="http://requirejs.org">requirejs</a>) and CommonJS (as used
+by <a href="http://nodejs.org/">node</a>
+and <a href="http://browserify.org/">browserify</a>) module loaders.
+When neither of these is present, they fall back to simply using the
+global <code>CodeMirror</code> variable.</p>
+
+<p>If you have a module loader present in your environment, CodeMirror
+will attempt to use it, and you might need to change the way you load
+CodeMirror modules.</p>
+
+</section>
+
 <section id=deprecated><h2>Deprecated interfaces dropped</h2>
 
 <p>A few properties and methods that have been deprecated for a while

From 37d31d53b699bdfe92ffa5142c2c311be4882c6c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Mar 2014 14:51:28 +0100
Subject: [PATCH 1080/4742] [lint addon] Fix tooltips when page is scrolled

---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index db5162ee7a..393a689036 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -177,7 +177,7 @@
     if (!/\bCodeMirror-lint-mark-/.test((e.target || e.srcElement).className)) return;
     for (var i = 0; i < nearby.length; i += 2) {
       var spans = cm.findMarksAt(cm.coordsChar({left: e.clientX + nearby[i],
-                                                top: e.clientY + nearby[i + 1]}));
+                                                top: e.clientY + nearby[i + 1]}, "client"));
       for (var j = 0; j < spans.length; ++j) {
         var span = spans[j], ann = span.__annotation;
         if (ann) return popupSpanTooltip(ann, e);

From 238015d4235920540dbfdd56bed738af0a9674a8 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Mon, 10 Mar 2014 05:49:17 +0530
Subject: [PATCH 1081/4742]  : and . registers implemented

---
 keymap/vim.js    | 16 ++++++++++++++--
 test/vim_test.js | 13 +++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b630b7c764..a2cefc4401 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -384,7 +384,7 @@
     var specialKeys = ['Left', 'Right', 'Up', 'Down', 'Space', 'Backspace',
         'Esc', 'Home', 'End', 'PageUp', 'PageDown', 'Enter'];
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
-    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"']);
+    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"','.',':']);
 
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
@@ -797,6 +797,8 @@
     function RegisterController(registers) {
       this.registers = registers;
       this.unnamedRegister = registers['"'] = new Register();
+      registers['.'] = new Register();
+      registers[':'] = new Register();
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise) {
@@ -3200,10 +3202,14 @@
     Vim.ExCommandDispatcher.prototype = {
       processCommand: function(cm, input) {
         var vim = cm.state.vim;
+        var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
+        var previousCommand = commandHistoryRegister.toString();
         if (vim.visualMode) {
           exitVisualMode(cm);
         }
         var inputStream = new CodeMirror.StringStream(input);
+        // update ": with the latest command whether valid or invalid
+        commandHistoryRegister.setText(inputStream.string);
         var params = {};
         params.input = input;
         try {
@@ -3222,6 +3228,9 @@
           var command = this.matchCommand_(params.commandName);
           if (command) {
             commandName = command.name;
+            if (commandName == 'registers') {
+              commandHistoryRegister.setText(previousCommand);
+            }
             this.parseCommandArgs_(inputStream, params, command);
             if (command.type == 'exToKey') {
               // Handle Ex to Key mapping.
@@ -3513,7 +3522,7 @@
               continue;
             }
             var register = registers[registerName] || new Register();
-            regInfo += '"' + registerName + '    ' + register.text + '<br>';
+            regInfo += '"' + registerName + '    ' + register.toString() + '<br>';
           }
         }
         showConfirm(cm, regInfo);
@@ -3888,6 +3897,7 @@
     function exitInsertMode(cm) {
       var vim = cm.state.vim;
       var macroModeState = vimGlobalState.macroModeState;
+      var imcRegister = vimGlobalState.registerController.getRegister('.');
       var isPlaying = macroModeState.isPlaying;
       if (!isPlaying) {
         cm.off('change', onChange);
@@ -3906,6 +3916,8 @@
       cm.setOption('keyMap', 'vim');
       cm.setOption('disableInput', true);
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
+      // update the ". register before exiting insert mode
+      imcRegister.setText(macroModeState.lastInsertModeChanges.changes.join(''));
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (macroModeState.isRecording) {
         logInsertModeChange(macroModeState);
diff --git a/test/vim_test.js b/test/vim_test.js
index 0a82987389..e57cc22d53 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1879,6 +1879,19 @@ testVim('macro_register', function(cm, vim, helpers) {
   });
   helpers.doKeys(':');
 }, { value: ''});
+testVim('ro_registers', function(cm,vim,helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys('i');
+  cm.replaceRange('foo',cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doEx('sort');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/\.\s+foo/.test(text));
+    is(/:\s+sort/.test(text));
+  });
+  helpers.doKeys(':');
+}, {value: ''});
 testVim('.', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('2', 'd', 'w');

From dd873fb73bc10d75f7df70c3e48983b4f4e2c5e8 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Tue, 11 Mar 2014 03:57:04 +0530
Subject: [PATCH 1082/4742] ro_registers with corrections

---
 keymap/vim.js    | 12 ++++++------
 test/vim_test.js | 12 +++++++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a2cefc4401..bb6c55b12d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -384,7 +384,7 @@
     var specialKeys = ['Left', 'Right', 'Up', 'Down', 'Space', 'Backspace',
         'Esc', 'Home', 'End', 'PageUp', 'PageDown', 'Enter'];
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
-    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"','.',':']);
+    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':']);
 
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
@@ -3194,7 +3194,7 @@
       { name: 'substitute', shortName: 's' },
       { name: 'nohlsearch', shortName: 'noh' },
       { name: 'delmarks', shortName: 'delm' },
-      { name: 'registers', shortName: 'reg' }
+      { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true }
     ];
     Vim.ExCommandDispatcher = function() {
       this.buildCommandMap_();
@@ -3209,7 +3209,7 @@
         }
         var inputStream = new CodeMirror.StringStream(input);
         // update ": with the latest command whether valid or invalid
-        commandHistoryRegister.setText(inputStream.string);
+        commandHistoryRegister.setText(input);
         var params = {};
         params.input = input;
         try {
@@ -3228,7 +3228,7 @@
           var command = this.matchCommand_(params.commandName);
           if (command) {
             commandName = command.name;
-            if (commandName == 'registers') {
+            if (command.excludeFromCommandHistory) {
               commandHistoryRegister.setText(previousCommand);
             }
             this.parseCommandArgs_(inputStream, params, command);
@@ -3897,7 +3897,7 @@
     function exitInsertMode(cm) {
       var vim = cm.state.vim;
       var macroModeState = vimGlobalState.macroModeState;
-      var imcRegister = vimGlobalState.registerController.getRegister('.');
+      var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
       var isPlaying = macroModeState.isPlaying;
       if (!isPlaying) {
         cm.off('change', onChange);
@@ -3917,7 +3917,7 @@
       cm.setOption('disableInput', true);
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
       // update the ". register before exiting insert mode
-      imcRegister.setText(macroModeState.lastInsertModeChanges.changes.join(''));
+      insertModeChangeRegister.setText(macroModeState.lastInsertModeChanges.changes.join(''));
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (macroModeState.isRecording) {
         logInsertModeChange(macroModeState);
diff --git a/test/vim_test.js b/test/vim_test.js
index e57cc22d53..b51d47cd8b 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1879,16 +1879,22 @@ testVim('macro_register', function(cm, vim, helpers) {
   });
   helpers.doKeys(':');
 }, { value: ''});
-testVim('ro_registers', function(cm,vim,helpers) {
+testVim('._register', function(cm,vim,helpers) {
   cm.setCursor(0,0);
   helpers.doKeys('i');
   cm.replaceRange('foo',cm.getCursor());
   helpers.doInsertModeKeys('Esc');
-  helpers.doEx('sort');
   cm.openDialog = helpers.fakeOpenDialog('registers');
   cm.openNotification = helpers.fakeOpenNotification(function(text) {
     is(/\.\s+foo/.test(text));
-    is(/:\s+sort/.test(text));
+  });
+  helpers.doKeys(':');
+}, {value: ''});
+testVim(':_register', function(cm,vim,helpers) {
+  helpers.doEx('bar');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/:\s+bar/.test(text));
   });
   helpers.doKeys(':');
 }, {value: ''});

From af4dedbf880673a2e616f9c180f54aa9c214cc60 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Sat, 8 Mar 2014 19:57:05 -0800
Subject: [PATCH 1083/4742] [dylan mode] Add

---
 doc/compress.html     |   1 +
 mode/dylan/dylan.js   | 302 ++++++++++++++++++++++++++++++
 mode/dylan/index.html | 417 ++++++++++++++++++++++++++++++++++++++++++
 mode/index.html       |   1 +
 mode/meta.js          |   1 +
 5 files changed, 722 insertions(+)
 create mode 100644 mode/dylan/dylan.js
 create mode 100755 mode/dylan/index.html

diff --git a/doc/compress.html b/doc/compress.html
index 9e86230a94..d2ac91b1c0 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -92,6 +92,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/d/d.js">d.js</option>
           <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
           <option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
+          <option value="http://codemirror.net/mode/dylan/dylan.js">dylan.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
           <option value="http://codemirror.net/mode/eiffel/eiffel.js">eiffel.js</option>
           <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
new file mode 100644
index 0000000000..a8e584e196
--- /dev/null
+++ b/mode/dylan/dylan.js
@@ -0,0 +1,302 @@
+CodeMirror.defineMode("dylan", function (config, parserConfig) {
+  // Words
+  var words = {
+    // Words that introduce unnamed definitions like "define interface"
+    unnamedDefinition: ["interface"],
+
+    // Words that introduce simple named definitions like "define library"
+    namedDefinition: ["module", "library", "macro",
+                      "C-struct", "C-union",
+                      "C-function", "C-callable-wrapper"
+                     ],
+
+    // Words that introduce type definitions like "define class".
+    // These are also parameterized like "define method" and are
+    // appended to otherParameterizedDefinitionWords
+    typeParameterizedDefinition: ["class", "C-subtype", "C-mapped-subtype"],
+
+    // Words that introduce trickier definitions like "define method".
+    // These require special definitions to be added to startExpressions
+    otherParameterizedDefinition: ["method", "function",
+                                   "C-variable", "C-address"
+                                  ],
+
+    // Words that introduce module constant definitions.
+    // These must also be simple definitions and are
+    // appended to otherSimpleDefinitionWords
+    constantSimpleDefinition: ["constant"],
+
+    // Words that introduce module variable definitions.
+    // These must also be simple definitions and are
+    // appended to otherSimpleDefinitionWords
+    variableSimpleDefinition: ["variable"],
+
+    // Other words that introduce simple definitions
+    // (without implicit bodies).
+    otherSimpleDefinition: ["generic", "domain",
+                            "C-pointer-type",
+                            "table"
+                           ],
+
+    // Words that begin statements with implicit bodies.
+    statement: ["if", "block", "begin", "method", "case",
+                "for", "select", "when", "unless", "until",
+                "while", "iterate", "profiling", "dynamic-bind"
+               ],
+
+    // Patterns that act as separators in compound statements.
+    // This may include any general pattern that must be indented
+    // specially.
+    separator: ["finally", "exception", "cleanup", "else",
+                "elseif", "afterwards"
+               ],
+
+    // Keywords that do not require special indentation handling,
+    // but which should be highlighted
+    other: ["above", "below", "by", "from", "handler", "in",
+            "instance", "let", "local", "otherwise", "slot",
+            "subclass", "then", "to", "keyed-by", "virtual"
+           ],
+
+    // Condition signaling function calls
+    signalingCalls: ["signal", "error", "cerror",
+                     "break", "check-type", "abort"
+                    ]
+  };
+
+  words["otherDefinition"] =
+    words["unnamedDefinition"]
+    .concat(words["namedDefinition"])
+    .concat(words["otherParameterizedDefinition"]);
+
+  words["definition"] =
+    words["typeParameterizedDefinition"]
+    .concat(words["otherDefinition"]);
+
+  words["parameterizedDefinition"] =
+    words["typeParameterizedDefinition"]
+    .concat(words["otherParameterizedDefinition"]);
+
+  words["simpleDefinition"] =
+    words["constantSimpleDefinition"]
+    .concat(words["variableSimpleDefinition"])
+    .concat(words["otherSimpleDefinition"]);
+
+  words["keyword"] =
+    words["statement"]
+    .concat(words["separator"])
+    .concat(words["other"]);
+
+  // Patterns
+  var symbolPattern = "[-_a-zA-Z?!*@<>$%]+";
+  var symbol = new RegExp("^" + symbolPattern);
+  var patterns = {
+    // Symbols with special syntax
+    symbolKeyword: symbolPattern + ":",
+    symbolClass: "<" + symbolPattern + ">",
+    symbolGlobal: "\\*" + symbolPattern + "\\*",
+    symbolConstant: "\\$" + symbolPattern
+  };
+  var patternStyles = {
+    symbolKeyword: "atom",
+    symbolClass: "tag",
+    symbolGlobal: "variable-2",
+    symbolConstant: "variable-3"
+  };
+
+  // Compile all patterns to regular expressions
+  for (var patternName in patterns)
+    if (patterns.hasOwnProperty(patternName))
+      patterns[patternName] = new RegExp("^" + patterns[patternName]);
+
+  // Names beginning "with-" and "without-" are commonly
+  // used as statement macro
+  patterns["keyword"] = [/^with(?:out)?-[-_a-zA-Z?!*@<>$%]+/];
+
+  var styles = {};
+  styles["keyword"] = "keyword";
+  styles["definition"] = "def";
+  styles["simpleDefinition"] = "def";
+  styles["signalingCalls"] = "builtin";
+
+  // protected words lookup table
+  var wordLookup = {};
+  var styleLookup = {};
+
+  [
+    "keyword",
+    "definition",
+    "simpleDefinition",
+    "signalingCalls"
+  ].forEach(function (type) {
+    words[type].forEach(function (word) {
+      wordLookup[word] = type;
+      styleLookup[word] = styles[type];
+    });
+  });
+
+
+  function chain(stream, state, f) {
+    state.tokenize = f;
+    return f(stream, state);
+  }
+
+  var type, content;
+
+  function ret(_type, style, _content) {
+    type = _type;
+    content = _content;
+    return style;
+  }
+
+  function indent(_stream, state) {
+    state.currentIndent++;
+  }
+
+  function dedent(_stream, state) {
+    state.currentIndent--;
+  }
+
+  function tokenBase(stream, state) {
+    // String
+    var ch = stream.peek();
+    if (ch == "'" || ch == '"') {
+      stream.next();
+      return chain(stream, state, tokenString(ch, "string", "string"));
+    }
+    // Comment
+    else if (ch == "/") {
+      stream.next();
+      if (stream.eat("*")) {
+        return chain(stream, state, tokenComment);
+      } else if (stream.eat("/")) {
+        stream.skipToEnd();
+        return ret("comment", "comment");
+      } else {
+        stream.skipTo(" ");
+        return ret("operator", "operator");
+      }
+    }
+    // Decimal
+    else if (/\d/.test(ch)) {
+      stream.match(/^\d*(?:\.\d*)?(?:e[+\-]?\d+)?/);
+      return ret("number", "number");
+    }
+    // Hash
+    else if (ch == "#") {
+      stream.next();
+      // Symbol with string syntax
+      ch = stream.peek();
+      if (ch == '"') {
+        stream.next();
+        return chain(stream, state, tokenString('"', "symbol", "string-2"));
+      }
+      // Binary number
+      else if (ch == "b") {
+        stream.next();
+        stream.eatWhile(/[01]/);
+        return ret("number", "number");
+      }
+      // Hex number
+      else if (ch == "x") {
+        stream.next();
+        stream.eatWhile(/[\da-f]/i);
+        return ret("number", "number");
+      }
+      // Octal number
+      else if (ch == "o") {
+        stream.next();
+        stream.eatWhile(/[0-7]/);
+        return ret("number", "number");
+      }
+      // Hash symbol
+      else {
+        stream.eatWhile(/[-a-zA-Z]/);
+        return ret("hash", "keyword");
+      }
+    } else if (stream.match("end")) {
+      dedent(stream, state);
+      return ret("end", "keyword");
+    }
+    for (var name in patterns) {
+      if (patterns.hasOwnProperty(name)) {
+        var pattern = patterns[name];
+        if ((pattern instanceof Array && pattern.some(function (p) {
+          return stream.match(p);
+        })) || stream.match(pattern))
+          return ret(name, patternStyles[name], stream.current());
+      }
+    }
+    if (stream.match("define")) {
+      indent(stream, state);
+      return ret("definition", "def");
+    } else {
+      stream.eatWhile(/[\w\-]/);
+      // Keyword
+      if (wordLookup[stream.current()]) {
+        return ret(wordLookup[stream.current()], styleLookup[stream.current()], stream.current());
+      } else if (stream.current().match(symbol)) {
+        return ret("variable", "variable");
+      } else {
+        stream.next();
+        return ret("other", "variable-2");
+      }
+    }
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false,
+    ch;
+    while ((ch = stream.next())) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return ret("comment", "comment");
+  }
+
+  function tokenString(quote, type, style) {
+    return function (stream, state) {
+      var next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote) {
+          end = true;
+          break;
+        }
+      }
+      if (end)
+        state.tokenize = tokenBase;
+      return ret(type, style);
+    };
+  }
+
+  // Interface
+  return {
+    startState: function (baseColumn) {
+      return {
+        tokenize: tokenBase,
+        currentIndent: 0
+      };
+    },
+    token: function (stream, state) {
+      if (stream.eatSpace())
+        return null;
+      var style = state.tokenize(stream, state);
+      return style;
+    },
+    /*
+    // This isn't working for me.
+    indent: function (state, textAfter) {
+      if (state.tokenize != tokenBase)
+        return 0;
+      return state.currentIndent * config.indentUnit;
+    },
+    */
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/"
+  };
+});
+
+CodeMirror.defineMIME("text/x-dylan", "dylan");
diff --git a/mode/dylan/index.html b/mode/dylan/index.html
new file mode 100755
index 0000000000..d4f0a2cc6e
--- /dev/null
+++ b/mode/dylan/index.html
@@ -0,0 +1,417 @@
+<!doctype html>
+
+<title>CodeMirror: Dylan 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/edit/matchbrackets.js"></script>
+<script src="../../addon/comment/continuecomment.js"></script>
+<script src="../../addon/comment/comment.js"></script>
+<script src="dylan.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Dylan</a>
+  </ul>
+</div>
+
+<article>
+<h2>Dylan mode</h2>
+
+
+<div><textarea id="code" name="code">
+Module:       locators-internals
+Synopsis:     Abstract modeling of locations
+Author:       Andy Armstrong
+Copyright:    Original Code is Copyright (c) 1995-2004 Functional Objects, Inc.
+              All rights reserved.
+License:      See License.txt in this distribution for details.
+Warranty:     Distributed WITHOUT WARRANTY OF ANY KIND
+
+define open generic locator-server
+    (locator :: <locator>) => (server :: false-or(<server-locator>));
+define open generic locator-host
+    (locator :: <locator>) => (host :: false-or(<string>));
+define open generic locator-volume
+    (locator :: <locator>) => (volume :: false-or(<string>));
+define open generic locator-directory
+    (locator :: <locator>) => (directory :: false-or(<directory-locator>));
+define open generic locator-relative?
+    (locator :: <locator>) => (relative? :: <boolean>);
+define open generic locator-path
+    (locator :: <locator>) => (path :: <sequence>);
+define open generic locator-base
+    (locator :: <locator>) => (base :: false-or(<string>));
+define open generic locator-extension
+    (locator :: <locator>) => (extension :: false-or(<string>));
+
+
+/// Locator classes
+
+define open abstract class <directory-locator> (<physical-locator>)
+end class <directory-locator>;
+
+define open abstract class <file-locator> (<physical-locator>)
+end class <file-locator>;
+
+define method as
+    (class == <directory-locator>, string :: <string>)
+ => (locator :: <directory-locator>)
+  as(<native-directory-locator>, string)
+end method as;
+
+define method make
+    (class == <directory-locator>,
+     #key server :: false-or(<server-locator>) = #f,
+          path :: <sequence> = #[],
+          relative? :: <boolean> = #f,
+          name :: false-or(<string>) = #f)
+ => (locator :: <directory-locator>)
+  make(<native-directory-locator>,
+       server:    server,
+       path:      path,
+       relative?: relative?,
+       name:      name)
+end method make;
+
+define method as
+    (class == <file-locator>, string :: <string>)
+ => (locator :: <file-locator>)
+  as(<native-file-locator>, string)
+end method as;
+
+define method make
+    (class == <file-locator>,
+     #key directory :: false-or(<directory-locator>) = #f,
+          base :: false-or(<string>) = #f,
+          extension :: false-or(<string>) = #f,
+          name :: false-or(<string>) = #f)
+ => (locator :: <file-locator>)
+  make(<native-file-locator>,
+       directory: directory,
+       base:      base,
+       extension: extension,
+       name:      name)
+end method make;
+
+
+/// Locator coercion
+
+//---*** andrewa: This caching scheme doesn't work yet, so disable it.
+define constant $cache-locators?        = #f;
+define constant $cache-locator-strings? = #f;
+
+define constant $locator-to-string-cache = make(<object-table>, weak: #"key");
+define constant $string-to-locator-cache = make(<string-table>, weak: #"value");
+
+define open generic locator-as-string
+    (class :: subclass(<string>), locator :: <locator>)
+ => (string :: <string>);
+
+define open generic string-as-locator
+    (class :: subclass(<locator>), string :: <string>)
+ => (locator :: <locator>);
+
+define sealed sideways method as
+    (class :: subclass(<string>), locator :: <locator>)
+ => (string :: <string>)
+  let string = element($locator-to-string-cache, locator, default: #f);
+  if (string)
+    as(class, string)
+  else
+    let string = locator-as-string(class, locator);
+    if ($cache-locator-strings?)
+      element($locator-to-string-cache, locator) := string;
+    else
+      string
+    end
+  end
+end method as;
+
+define sealed sideways method as
+    (class :: subclass(<locator>), string :: <string>)
+ => (locator :: <locator>)
+  let locator = element($string-to-locator-cache, string, default: #f);
+  if (instance?(locator, class))
+    locator
+  else
+    let locator = string-as-locator(class, string);
+    if ($cache-locators?)
+      element($string-to-locator-cache, string) := locator;
+    else
+      locator
+    end
+  end
+end method as;
+
+
+/// Locator conditions
+
+define class <locator-error> (<format-string-condition>, <error>)
+end class <locator-error>;
+
+define function locator-error
+    (format-string :: <string>, #rest format-arguments)
+  error(make(<locator-error>, 
+             format-string:    format-string,
+             format-arguments: format-arguments))
+end function locator-error;
+
+
+/// Useful locator protocols
+
+define open generic locator-test
+    (locator :: <directory-locator>) => (test :: <function>);
+
+define method locator-test
+    (locator :: <directory-locator>) => (test :: <function>)
+  \=
+end method locator-test;
+
+define open generic locator-might-have-links?
+    (locator :: <directory-locator>) => (links? :: <boolean>);
+
+define method locator-might-have-links?
+    (locator :: <directory-locator>) => (links? :: singleton(#f))
+  #f
+end method locator-might-have-links?;
+
+define method locator-relative?
+    (locator :: <file-locator>) => (relative? :: <boolean>)
+  let directory = locator.locator-directory;
+  ~directory | directory.locator-relative?
+end method locator-relative?;
+
+define method current-directory-locator?
+    (locator :: <directory-locator>) => (current-directory? :: <boolean>)
+  locator.locator-relative?
+    & locator.locator-path = #[#"self"]
+end method current-directory-locator?;
+
+define method locator-directory
+    (locator :: <directory-locator>) => (parent :: false-or(<directory-locator>))
+  let path = locator.locator-path;
+  unless (empty?(path))
+    make(object-class(locator),
+         server:    locator.locator-server,
+         path:      copy-sequence(path, end: path.size - 1),
+         relative?: locator.locator-relative?)
+  end
+end method locator-directory;
+
+
+/// Simplify locator
+
+define open generic simplify-locator
+    (locator :: <physical-locator>)
+ => (simplified-locator :: <physical-locator>);
+
+define method simplify-locator
+    (locator :: <directory-locator>)
+ => (simplified-locator :: <directory-locator>)
+  let path = locator.locator-path;
+  let relative? = locator.locator-relative?;
+  let resolve-parent? = ~locator.locator-might-have-links?;
+  let simplified-path
+    = simplify-path(path, 
+                    resolve-parent?: resolve-parent?,
+                    relative?: relative?);
+  if (path ~= simplified-path)
+    make(object-class(locator),
+         server:    locator.locator-server,
+         path:      simplified-path,
+         relative?: locator.locator-relative?)
+  else
+    locator
+  end
+end method simplify-locator;
+
+define method simplify-locator
+    (locator :: <file-locator>) => (simplified-locator :: <file-locator>)
+  let directory = locator.locator-directory;
+  let simplified-directory = directory & simplify-locator(directory);
+  if (directory ~= simplified-directory)
+    make(object-class(locator),
+         directory: simplified-directory,
+         base:      locator.locator-base,
+         extension: locator.locator-extension)
+  else
+    locator
+  end
+end method simplify-locator;
+
+
+/// Subdirectory locator
+
+define open generic subdirectory-locator
+    (locator :: <directory-locator>, #rest sub-path)
+ => (subdirectory :: <directory-locator>);
+
+define method subdirectory-locator
+    (locator :: <directory-locator>, #rest sub-path)
+ => (subdirectory :: <directory-locator>)
+  let old-path = locator.locator-path;
+  let new-path = concatenate-as(<simple-object-vector>, old-path, sub-path);
+  make(object-class(locator),
+       server:    locator.locator-server,
+       path:      new-path,
+       relative?: locator.locator-relative?)
+end method subdirectory-locator;
+
+
+/// Relative locator
+
+define open generic relative-locator
+    (locator :: <physical-locator>, from-locator :: <physical-locator>)
+ => (relative-locator :: <physical-locator>);
+
+define method relative-locator
+    (locator :: <directory-locator>, from-locator :: <directory-locator>)
+ => (relative-locator :: <directory-locator>)
+  let path = locator.locator-path;
+  let from-path = from-locator.locator-path;
+  case
+    ~locator.locator-relative? & from-locator.locator-relative? =>
+      locator-error
+        ("Cannot find relative path of absolute locator %= from relative locator %=",
+         locator, from-locator);
+    locator.locator-server ~= from-locator.locator-server =>
+      locator;
+    path = from-path =>
+      make(object-class(locator),
+           path: vector(#"self"),
+           relative?: #t);
+    otherwise =>
+      make(object-class(locator),
+           path: relative-path(path, from-path, test: locator.locator-test),
+           relative?: #t);
+  end
+end method relative-locator;
+
+define method relative-locator
+    (locator :: <file-locator>, from-directory :: <directory-locator>)
+ => (relative-locator :: <file-locator>)
+  let directory = locator.locator-directory;
+  let relative-directory = directory & relative-locator(directory, from-directory);
+  if (relative-directory ~= directory)
+    simplify-locator
+      (make(object-class(locator),
+            directory: relative-directory,
+            base:      locator.locator-base,
+            extension: locator.locator-extension))
+  else
+    locator
+  end
+end method relative-locator;
+
+define method relative-locator
+    (locator :: <physical-locator>, from-locator :: <file-locator>)
+ => (relative-locator :: <physical-locator>)
+  let from-directory = from-locator.locator-directory;
+  case
+    from-directory =>
+      relative-locator(locator, from-directory);
+    ~locator.locator-relative? =>
+      locator-error
+        ("Cannot find relative path of absolute locator %= from relative locator %=",
+         locator, from-locator);
+    otherwise =>
+      locator;
+  end
+end method relative-locator;
+
+
+/// Merge locators
+
+define open generic merge-locators
+    (locator :: <physical-locator>, from-locator :: <physical-locator>)
+ => (merged-locator :: <physical-locator>);
+
+
+/// Merge locators
+
+define method merge-locators
+    (locator :: <directory-locator>, from-locator :: <directory-locator>)
+ => (merged-locator :: <directory-locator>)
+  if (locator.locator-relative?)
+    let path = concatenate(from-locator.locator-path, locator.locator-path);
+    simplify-locator
+      (make(object-class(locator),
+            server:    from-locator.locator-server,
+            path:      path,
+            relative?: from-locator.locator-relative?))
+  else
+    locator
+  end
+end method merge-locators;
+
+define method merge-locators
+    (locator :: <file-locator>, from-locator :: <directory-locator>)
+ => (merged-locator :: <file-locator>)
+  let directory = locator.locator-directory;
+  let merged-directory 
+    = if (directory)
+        merge-locators(directory, from-locator)
+      else
+        simplify-locator(from-locator)
+      end;
+  if (merged-directory ~= directory)
+    make(object-class(locator),
+         directory: merged-directory,
+         base:      locator.locator-base,
+         extension: locator.locator-extension)
+  else
+    locator
+  end
+end method merge-locators;
+
+define method merge-locators
+    (locator :: <physical-locator>, from-locator :: <file-locator>)
+ => (merged-locator :: <physical-locator>)
+  let from-directory = from-locator.locator-directory;
+  if (from-directory)
+    merge-locators(locator, from-directory)
+  else
+    locator
+  end
+end method merge-locators;
+
+
+/// Locator protocols
+
+define sideways method supports-open-locator?
+    (locator :: <file-locator>) => (openable? :: <boolean>)
+  ~locator.locator-relative?
+end method supports-open-locator?;
+
+define sideways method open-locator
+    (locator :: <file-locator>, #rest keywords, #key, #all-keys)
+ => (stream :: <stream>)
+  apply(open-file-stream, locator, keywords)
+end method open-locator;
+</textarea></div>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: "text/x-dylan",
+        lineNumbers: true,
+        matchBrackets: true,
+        continueComments: "Enter",
+        extraKeys: {"Ctrl-Q": "toggleComment"},
+        tabMode: "indent",
+        indentUnit: 2
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-dylan</code>.</p>
+</article>
diff --git a/mode/index.html b/mode/index.html
index 26ea93ef02..1e7e59a5b9 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -42,6 +42,7 @@ <h2>Language modes</h2>
       <li><a href="d/index.html">D</a></li>
       <li><a href="diff/index.html">diff</a></li>
       <li><a href="dtd/index.html">DTD</a></li>
+      <li><a href="dylan/index.html">Dylan</a></li>
       <li><a href="ecl/index.html">ECL</a></li>
       <li><a href="eiffel/index.html">Eiffel</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index a3989c5538..c9498644ca 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -14,6 +14,7 @@ CodeMirror.modeInfo = [
   {name: 'D', mime: 'text/x-d', mode: 'd'},
   {name: 'diff', mime: 'text/x-diff', mode: 'diff'},
   {name: 'DTD', mime: 'application/xml-dtd', mode: 'dtd'},
+  {name: 'Dylan', mime: 'text/x-dylan', mode: 'dylan'},
   {name: 'ECL', mime: 'text/x-ecl', mode: 'ecl'},
   {name: 'Eiffel', mime: 'text/x-eiffel', mode: 'eiffel'},
   {name: 'Erlang', mime: 'text/x-erlang', mode: 'erlang'},

From 4d9be849acb748ba4792f2ef6d307c3a2adb3c5c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Mar 2014 15:50:49 +0100
Subject: [PATCH 1084/4742] [dylan mode] Clean up

Issue #2352
---
 mode/dylan/dylan.js   | 32 +++++++-------------------------
 mode/dylan/index.html | 10 ----------
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index a8e584e196..d81ef0cbcb 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -1,4 +1,4 @@
-CodeMirror.defineMode("dylan", function (config, parserConfig) {
+CodeMirror.defineMode("dylan", function(_config) {
   // Words
   var words = {
     // Words that introduce unnamed definitions like "define interface"
@@ -128,8 +128,8 @@ CodeMirror.defineMode("dylan", function (config, parserConfig) {
     "definition",
     "simpleDefinition",
     "signalingCalls"
-  ].forEach(function (type) {
-    words[type].forEach(function (word) {
+  ].forEach(function(type) {
+    words[type].forEach(function(word) {
       wordLookup[word] = type;
       styleLookup[word] = styles[type];
     });
@@ -149,14 +149,6 @@ CodeMirror.defineMode("dylan", function (config, parserConfig) {
     return style;
   }
 
-  function indent(_stream, state) {
-    state.currentIndent++;
-  }
-
-  function dedent(_stream, state) {
-    state.currentIndent--;
-  }
-
   function tokenBase(stream, state) {
     // String
     var ch = stream.peek();
@@ -215,20 +207,18 @@ CodeMirror.defineMode("dylan", function (config, parserConfig) {
         return ret("hash", "keyword");
       }
     } else if (stream.match("end")) {
-      dedent(stream, state);
       return ret("end", "keyword");
     }
     for (var name in patterns) {
       if (patterns.hasOwnProperty(name)) {
         var pattern = patterns[name];
-        if ((pattern instanceof Array && pattern.some(function (p) {
+        if ((pattern instanceof Array && pattern.some(function(p) {
           return stream.match(p);
         })) || stream.match(pattern))
           return ret(name, patternStyles[name], stream.current());
       }
     }
     if (stream.match("define")) {
-      indent(stream, state);
       return ret("definition", "def");
     } else {
       stream.eatWhile(/[\w\-]/);
@@ -258,7 +248,7 @@ CodeMirror.defineMode("dylan", function (config, parserConfig) {
   }
 
   function tokenString(quote, type, style) {
-    return function (stream, state) {
+    return function(stream, state) {
       var next, end = false;
       while ((next = stream.next()) != null) {
         if (next == quote) {
@@ -274,26 +264,18 @@ CodeMirror.defineMode("dylan", function (config, parserConfig) {
 
   // Interface
   return {
-    startState: function (baseColumn) {
+    startState: function() {
       return {
         tokenize: tokenBase,
         currentIndent: 0
       };
     },
-    token: function (stream, state) {
+    token: function(stream, state) {
       if (stream.eatSpace())
         return null;
       var style = state.tokenize(stream, state);
       return style;
     },
-    /*
-    // This isn't working for me.
-    indent: function (state, textAfter) {
-      if (state.tokenize != tokenBase)
-        return 0;
-      return state.currentIndent * config.indentUnit;
-    },
-    */
     blockCommentStart: "/*",
     blockCommentEnd: "*/"
   };
diff --git a/mode/dylan/index.html b/mode/dylan/index.html
index d4f0a2cc6e..049f93cc63 100755
--- a/mode/dylan/index.html
+++ b/mode/dylan/index.html
@@ -55,7 +55,6 @@ <h2>Dylan mode</h2>
 define open generic locator-extension
     (locator :: <locator>) => (extension :: false-or(<string>));
 
-
 /// Locator classes
 
 define open abstract class <directory-locator> (<physical-locator>)
@@ -104,7 +103,6 @@ <h2>Dylan mode</h2>
        name:      name)
 end method make;
 
-
 /// Locator coercion
 
 //---*** andrewa: This caching scheme doesn't work yet, so disable it.
@@ -154,7 +152,6 @@ <h2>Dylan mode</h2>
   end
 end method as;
 
-
 /// Locator conditions
 
 define class <locator-error> (<format-string-condition>, <error>)
@@ -167,7 +164,6 @@ <h2>Dylan mode</h2>
              format-arguments: format-arguments))
 end function locator-error;
 
-
 /// Useful locator protocols
 
 define open generic locator-test
@@ -209,7 +205,6 @@ <h2>Dylan mode</h2>
   end
 end method locator-directory;
 
-
 /// Simplify locator
 
 define open generic simplify-locator
@@ -250,7 +245,6 @@ <h2>Dylan mode</h2>
   end
 end method simplify-locator;
 
-
 /// Subdirectory locator
 
 define open generic subdirectory-locator
@@ -268,7 +262,6 @@ <h2>Dylan mode</h2>
        relative?: locator.locator-relative?)
 end method subdirectory-locator;
 
-
 /// Relative locator
 
 define open generic relative-locator
@@ -330,14 +323,12 @@ <h2>Dylan mode</h2>
   end
 end method relative-locator;
 
-
 /// Merge locators
 
 define open generic merge-locators
     (locator :: <physical-locator>, from-locator :: <physical-locator>)
  => (merged-locator :: <physical-locator>);
 
-
 /// Merge locators
 
 define method merge-locators
@@ -386,7 +377,6 @@ <h2>Dylan mode</h2>
   end
 end method merge-locators;
 
-
 /// Locator protocols
 
 define sideways method supports-open-locator?

From 0e857ad2bbb90a1f804f3be20d0995f055bedbb0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Mar 2014 13:49:10 +0100
Subject: [PATCH 1085/4742] [real-world uses] Add TagSpaces

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 661c556c21..08f0267856 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -119,6 +119,7 @@ <h2>CodeMirror real-world uses</h2>
       <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://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
+      <li><a href="http://www.tagspaces.org/">TagSpaces</a> (personal data manager)</li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
       <li><a href="http://www.mapbox.com/tilemill/">TileMill</a> (map design tool)</li>
       <li><a href="http://www.toolsverse.com/products/data-explorer/">Toolsverse Data Explorer</a> (database management)</li>

From 4eca7048c5cc2ff5f4505e8cd6d5bf4e8fb4c943 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Mar 2014 16:25:59 +0100
Subject: [PATCH 1086/4742] [xml mode] Style brackets with extra style

Add tests. Adjust addons that depended on previous token structure.

Also improve indentation around implicit end tags in HTML.

Issue #2176
Issue #2333
---
 addon/hint/xml-hint.js | 28 +++++++++-----
 mode/xml/test.js       | 43 ++++++++++++++++++++++
 mode/xml/xml.js        | 83 ++++++++++++++++++++++++++++--------------
 test/index.html        |  1 +
 4 files changed, 118 insertions(+), 37 deletions(-)
 create mode 100644 mode/xml/test.js

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 69f2b771fe..f93db7a71e 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -11,22 +11,30 @@
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "xml") return;
     var result = [], replaceToken = false, prefix;
-    var isTag = token.string.charAt(0) == "<";
-    if (!inner.state.tagName || isTag) { // Tag completion
-      if (isTag) {
-        prefix = token.string.slice(1);
-        replaceToken = true;
-      }
+    var tag = /\btag\b/.test(token.type), tagName = tag && /^\w/.test(token.string), tagStart;
+    if (tagName) {
+      var before = cm.getLine(cur.line).slice(Math.max(0, token.start - 2), token.start);
+      var tagType = /<\/$/.test(before) ? "close" : /<$/.test(before) ? "open" : null;
+      if (tagType) tagStart = token.start - (tagType == "close" ? 2 : 1);
+    } else if (tag && token.string == "<") {
+      tagType = "open";
+    } else if (tag && token.string == "</") {
+      tagType = "close";
+    }
+    if (!tag && !inner.state.tagName || tagType) {
+      if (tagName)
+        prefix = token.string;
+      replaceToken = tagType;
       var cx = inner.state.context, curTag = cx && tags[cx.tagName];
       var childList = cx ? curTag && curTag.children : tags["!top"];
-      if (childList) {
+      if (childList && tagType != "close") {
         for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].lastIndexOf(prefix, 0) == 0)
           result.push("<" + childList[i]);
-      } else {
+      } else if (tagType != "close") {
         for (var name in tags) if (tags.hasOwnProperty(name) && name != "!top" && (!prefix || name.lastIndexOf(prefix, 0) == 0))
           result.push("<" + name);
       }
-      if (cx && (!prefix || ("/" + cx.tagName).lastIndexOf(prefix, 0) == 0))
+      if (cx && (!prefix || tagType == "close" && cx.tagName.lastIndexOf(prefix, 0) == 0))
         result.push("</" + cx.tagName + ">");
     } else {
       // Attribute completion
@@ -59,7 +67,7 @@
     }
     return {
       list: result,
-      from: replaceToken ? Pos(cur.line, token.start) : cur,
+      from: replaceToken ? Pos(cur.line, tagStart == null ? token.start : tagStart) : cur,
       to: replaceToken ? Pos(cur.line, token.end) : cur
     };
   }
diff --git a/mode/xml/test.js b/mode/xml/test.js
new file mode 100644
index 0000000000..e0dfde0f25
--- /dev/null
+++ b/mode/xml/test.js
@@ -0,0 +1,43 @@
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "xml"), mname = "xml";
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), mname); }
+
+  MT("matching",
+     "[tag&bracket <][tag top][tag&bracket >]",
+     "  text",
+     "  [tag&bracket <][tag inner][tag&bracket />]",
+     "[tag&bracket </][tag top][tag&bracket >]");
+
+  MT("nonmatching",
+     "[tag&bracket <][tag top][tag&bracket >]",
+     "  [tag&bracket <][tag inner][tag&bracket />]",
+     "  [tag&bracket </][tag&error tip][tag&bracket&error >]");
+
+  MT("doctype",
+     "[meta <!doctype foobar>]",
+     "[tag&bracket <][tag top][tag&bracket />]");
+
+  MT("cdata",
+     "[tag&bracket <][tag top][tag&bracket >]",
+     "  [atom <![CDATA[foo]",
+     "[atom barbazguh]]]]>]",
+     "[tag&bracket </][tag top][tag&bracket >]");
+
+  // HTML tests
+  mode = CodeMirror.getMode({indentUnit: 2}, "text/html"); mname = "html";
+
+  MT("selfclose",
+     "[tag&bracket <][tag html][tag&bracket >]",
+     "  [tag&bracket <][tag link] [attribute rel]=[string stylesheet] [attribute href]=[string \"/foobar\"][tag&bracket >]",
+     "[tag&bracket </][tag html][tag&bracket >]");
+
+  MT("list",
+     "[tag&bracket <][tag ol][tag&bracket >]",
+     "  [tag&bracket <][tag li][tag&bracket >]one",
+     "  [tag&bracket <][tag li][tag&bracket >]two",
+     "[tag&bracket </][tag ol][tag&bracket >]");
+
+  MT("valueless",
+     "[tag&bracket <][tag input] [attribute type]=[string checkbox] [attribute checked][tag&bracket />]");
+
+})();
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index d9b04e89e1..1fbbbddd72 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -48,7 +48,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   var alignCDATA = parserConfig.alignCDATA;
 
   // Return variables for tokenizers
-  var tagName, type, setStyle;
+  var type, setStyle;
 
   function inText(stream, state) {
     function chain(parser) {
@@ -75,15 +75,9 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         state.tokenize = inBlock("meta", "?>");
         return "meta";
       } else {
-        var isClose = stream.eat("/");
-        tagName = "";
-        var c;
-        while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c;
-        if (Kludges.caseFold) tagName = tagName.toLowerCase();
-        if (!tagName) return "tag error";
-        type = isClose ? "closeTag" : "openTag";
+        type = stream.eat("/") ? "closeTag" : "openTag";
         state.tokenize = inTag;
-        return "tag";
+        return "tag bracket";
       }
     } else if (ch == "&") {
       var ok;
@@ -108,7 +102,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     if (ch == ">" || (ch == "/" && stream.eat(">"))) {
       state.tokenize = inText;
       type = ch == ">" ? "endTag" : "selfcloseTag";
-      return "tag";
+      return "tag bracket";
     } else if (ch == "=") {
       type = "equals";
       return null;
@@ -123,7 +117,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       state.stringStartCol = stream.column();
       return state.tokenize(stream, state);
     } else {
-      stream.eatWhile(/[^\s\u00a0=<>\"\']/);
+      stream.eatWhile(/[^\s\u00a0=<>\"\'\/]/);
       return "word";
     }
   }
@@ -203,24 +197,40 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
 
   function baseState(type, stream, state) {
     if (type == "openTag") {
-      state.tagName = tagName;
       state.tagStart = stream.column();
-      return attrState;
+      return tagNameState;
     } else if (type == "closeTag") {
-      var err = false;
-      if (state.context) {
-        if (state.context.tagName != tagName) {
-          if (Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName))
-            popContext(state);
-          err = !state.context || state.context.tagName != tagName;
-        }
+      return closeTagNameState;
+    } else {
+      return baseState;
+    }
+  }
+  function tagNameState(type, stream, state) {
+    if (type == "word") {
+      state.tagName = stream.current();
+      setStyle = "tag";
+      return attrState;
+    } else {
+      setStyle = "error";
+      return tagNameState;
+    }
+  }
+  function closeTagNameState(type, stream, state) {
+    if (type == "word") {
+      var tagName = stream.current();
+      if (state.context && state.context.tagName != tagName &&
+          Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName))
+        popContext(state);
+      if (state.context && state.context.tagName == tagName) {
+        setStyle = "tag";
+        return closeState;
       } else {
-        err = true;
+        setStyle = "tag error";
+        return closeStateErr;
       }
-      if (err) setStyle = "error";
-      return err ? closeStateErr : closeState;
     } else {
-      return baseState;
+      setStyle = "error";
+      return closeStateErr;
     }
   }
   function closeState(type, _stream, state) {
@@ -285,7 +295,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         state.indented = stream.indentation();
 
       if (stream.eatSpace()) return null;
-      tagName = type = null;
+      type = null;
       var style = state.tokenize(stream, state);
       if ((style || type) && style != "comment") {
         setStyle = null;
@@ -313,8 +323,27 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
           return state.tagStart + indentUnit * multilineTagIndentFactor;
       }
       if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
-      if (context && /^<\//.test(textAfter))
-        context = context.prev;
+      var tagAfter = textAfter && /^<(\/)?(\w*)/.exec(textAfter);
+      if (tagAfter && tagAfter[1]) { // Closing tag spotted
+        while (context) {
+          if (context.tagName == tagAfter[2]) {
+            context = context.prev;
+            break;
+          } else if (Kludges.implicitlyClosed.hasOwnProperty(context.tagName)) {
+            context = context.prev;
+          } else {
+            break;
+          }
+        }
+      } else if (tagAfter) { // Opening tag spotted
+        while (context) {
+          var grabbers = Kludges.contextGrabbers[tagAfter[2]];
+          if (grabbers && grabbers.hasOwnProperty(context.tagName))
+            context = context.prev;
+          else
+            break;
+        }
+      }
       while (context && !context.startOfLine)
         context = context.prev;
       if (context) return context.indent + indentUnit;
diff --git a/test/index.html b/test/index.html
index 7f278cc5c2..06d2b43a1b 100644
--- a/test/index.html
+++ b/test/index.html
@@ -80,6 +80,7 @@ <h2>Test Suite</h2>
     <script src="../mode/css/scss_test.js"></script>
     <script src="../mode/css/less_test.js"></script>
     <script src="../mode/xml/xml.js"></script>
+    <script src="../mode/xml/test.js"></script>
     <script src="../mode/htmlmixed/htmlmixed.js"></script>
     <script src="../mode/ruby/ruby.js"></script>
     <script src="../mode/ruby/test.js"></script>

From da218666d28c8ddd373e839be9d68f84fd99e789 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Mar 2014 16:35:01 +0100
Subject: [PATCH 1087/4742] [haml mode] Fix test that depended on XML mode
 token structure

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

diff --git a/mode/haml/test.js b/mode/haml/test.js
index 163b09f8dd..75d0e7710f 100644
--- a/mode/haml/test.js
+++ b/mode/haml/test.js
@@ -28,7 +28,7 @@
      "[tag %a]([variable title][operator =][string \"test\"]){[atom :title] [operator =>] [string \"test\"]}");
 
   MT("htmlCode",
-     "[tag <h1>]Title[tag </h1>]");
+     "[tag&bracket <][tag h1][tag&bracket >]Title[tag&bracket </][tag h1][tag&bracket >]");
 
   MT("rubyBlock",
      "[operator =][variable-2 @item]");

From c6700d8608e76f0506b25831d953ade26589345a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 13 Mar 2014 11:35:24 +0100
Subject: [PATCH 1088/4742] Fix context menu (when no selection) on IE

---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7d43ac49ed..ee1e418b65 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2242,8 +2242,9 @@ window.CodeMirror = (function() {
     var oldCSS = display.input.style.cssText;
     display.inputDiv.style.position = "absolute";
     display.input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-      "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: transparent; outline: none;" +
-      "border-width: 0; outline: none; overflow: hidden; opacity: .05; -ms-opacity: .05; filter: alpha(opacity=5);";
+      "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
+      (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
+      "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
     focusInput(cm);
     resetInput(cm, true);
     // Adds "Select all" to context menu in FF

From 906ff22140cac2dcdf786d2bb801e89a1c97e998 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 13 Mar 2014 11:35:24 +0100
Subject: [PATCH 1089/4742] Fix context menu (when no selection) on IE

---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 364c2cb019..c4291cbc66 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3081,8 +3081,9 @@
     var oldCSS = display.input.style.cssText;
     display.inputDiv.style.position = "absolute";
     display.input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-      "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: transparent; outline: none;" +
-      "border-width: 0; outline: none; overflow: hidden; opacity: .05; -ms-opacity: .05; filter: alpha(opacity=5);";
+      "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
+      (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
+      "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
     focusInput(cm);
     resetInput(cm);
     // Adds "Select all" to context menu in FF

From a67f6e1b0ee652b50c7a2ab8c877220c647395b2 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Thu, 13 Mar 2014 15:07:30 +0530
Subject: [PATCH 1090/4742] [vim] Update :substitute to use last substitution
 if no arguments

---
 keymap/vim.js    | 68 +++++++++++++++++++++++++++---------------------
 test/vim_test.js |  7 +++++
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index bb6c55b12d..899c6c0e83 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -603,6 +603,8 @@
         searchQuery: null,
         // Whether we are searching backwards.
         searchIsReversed: false,
+        // Replace part of the last substituted pattern
+        lastSubstituteReplacePart: undefined,
         jumpList: createCircularJumpList(),
         macroModeState: new MacroModeState,
         // Recording latest f, t, F or T motion command.
@@ -3608,38 +3610,41 @@
               'any other getSearchCursor implementation.');
         }
         var argString = params.argString;
-        var slashes = findUnescapedSlashes(argString);
-        if (slashes[0] !== 0) {
-          showConfirm(cm, 'Substitutions should be of the form ' +
-              ':s/pattern/replace/');
-          return;
-        }
-        var regexPart = argString.substring(slashes[0] + 1, slashes[1]);
+        var slashes = argString ? findUnescapedSlashes(argString) : [];
         var replacePart = '';
-        var flagsPart;
-        var count;
-        var confirm = false; // Whether to confirm each replace.
-        if (slashes[1]) {
-          replacePart = argString.substring(slashes[1] + 1, slashes[2]);
-          if (getOption('pcre')) {
-            replacePart = unescapeRegexReplace(replacePart);
-          } else {
-            replacePart = translateRegexReplace(replacePart);
+        if (slashes.length) {
+          if (slashes[0] !== 0) {
+            showConfirm(cm, 'Substitutions should be of the form ' +
+                ':s/pattern/replace/');
+            return;
           }
-        }
-        if (slashes[2]) {
-          // After the 3rd slash, we can have flags followed by a space followed
-          // by count.
-          var trailing = argString.substring(slashes[2] + 1).split(' ');
-          flagsPart = trailing[0];
-          count = parseInt(trailing[1]);
-        }
-        if (flagsPart) {
-          if (flagsPart.indexOf('c') != -1) {
-            confirm = true;
-            flagsPart.replace('c', '');
+          var regexPart = argString.substring(slashes[0] + 1, slashes[1]);
+          var flagsPart;
+          var count;
+          var confirm = false; // Whether to confirm each replace.
+          if (slashes[1]) {
+            replacePart = argString.substring(slashes[1] + 1, slashes[2]);
+            if (getOption('pcre')) {
+              replacePart = unescapeRegexReplace(replacePart);
+            } else {
+              replacePart = translateRegexReplace(replacePart);
+            }
+            vimGlobalState.lastSubstituteReplacePart = replacePart;
+          }
+          if (slashes[2]) {
+            // After the 3rd slash, we can have flags followed by a space followed
+            // by count.
+            var trailing = argString.substring(slashes[2] + 1).split(' ');
+            flagsPart = trailing[0];
+            count = parseInt(trailing[1]);
+          }
+          if (flagsPart) {
+            if (flagsPart.indexOf('c') != -1) {
+              confirm = true;
+              flagsPart.replace('c', '');
+            }
+            regexPart = regexPart + '/' + flagsPart;
           }
-          regexPart = regexPart + '/' + flagsPart;
         }
         if (regexPart) {
           // If regex part is empty, then use the previous query. Otherwise use
@@ -3652,6 +3657,11 @@
             return;
           }
         }
+        replacePart = replacePart || vimGlobalState.lastSubstituteReplacePart;
+        if (replacePart === undefined) {
+          showConfirm(cm, 'No previous substitute regular expression');
+          return;
+        }
         var state = getSearchState(cm);
         var query = state.getQuery();
         var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
diff --git a/test/vim_test.js b/test/vim_test.js
index b51d47cd8b..4d9525e15e 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2550,6 +2550,13 @@ testVim('ex_substitute_javascript', function(cm, vim, helpers) {
   helpers.doEx('s/\\(\\d+\\)/$$ $\' $` $& \\1/')
   eq('a $$ $\' $` $& 0 b', cm.getValue());
 }, { value: 'a 0 b' });
+testVim('ex_substitute_empty_arguments', function(cm,vim,helpers) {
+  cm.setCursor(0, 0);
+  helpers.doEx('s/a/b');
+  cm.setCursor(1, 0);
+  helpers.doEx('s');
+  eq('b b\nb b', cm.getValue());
+}, {value: 'a a\na a'});
 
 // More complex substitute tests that test both pcre and nopcre options.
 function testSubstitute(name, options) {

From 43252705d1e634ce8f7273d75f4d0c7c41c8438f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Mar 2014 08:53:04 +0100
Subject: [PATCH 1091/4742] Support 'shared' option to setBookmark

Issue #2360
---
 doc/manual.html   |  3 +++
 lib/codemirror.js |  2 +-
 test/doc_test.js  | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index c41c4d9bc1..a3207ea08e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1552,6 +1552,9 @@ <h3 id="api_marker">Text-marking methods</h3>
         when the cursor is on top of the bookmark will end up to the
         right of the bookmark. Set this option to true to make it go
         to the left instead.</dd>
+        <dt><code><strong>shared</strong>: boolean</code></dt><dd>See
+        the corresponding <a href="#mark_shared">option</a>
+        to <code>markText</code>.</dd>
       </dl></dd>
 
       <dt id="findMarks"><code><strong>doc.findMarks</strong>(from: {line, ch}, to: {line, ch}) → array&lt;TextMarker&gt;</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c4291cbc66..9ec1cfb00e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6155,7 +6155,7 @@
     setBookmark: function(pos, options) {
       var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
                       insertLeft: options && options.insertLeft,
-                      clearWhenEmpty: false};
+                      clearWhenEmpty: false, shared: options && options.shared};
       pos = clipPos(this, pos);
       return markText(this, pos, pos, realOpts, "bookmark");
     },
diff --git a/test/doc_test.js b/test/doc_test.js
index f0f40e76e0..ab0350ebd0 100644
--- a/test/doc_test.js
+++ b/test/doc_test.js
@@ -320,6 +320,25 @@
     eq(cleared, 1);
   });
 
+  testDoc("sharedBookmark", "A='ab\ncd\nef\ngh' B<A C<~A/1-2", function(a, b, c) {
+    var mark = b.setBookmark(Pos(1, 1), {shared: true});
+    var found = a.findMarksAt(Pos(1, 1));
+    eq(found.length, 1);
+    eq(found[0], mark);
+    eq(c.findMarksAt(Pos(1, 1)).length, 1);
+    eqPos(mark.find(), Pos(1, 1));
+    b.replaceRange("x\ny\n", Pos(0, 0));
+    eqPos(mark.find(), Pos(3, 1));
+    var cleared = 0;
+    CodeMirror.on(mark, "clear", function() {++cleared;});
+    b.operation(function() {mark.clear();});
+    eq(a.findMarks(Pos(0, 0), Pos(5)).length, 0);
+    eq(b.findMarks(Pos(0, 0), Pos(5)).length, 0);
+    eq(c.findMarks(Pos(0, 0), Pos(5)).length, 0);
+    eq(mark.find(), null);
+    eq(cleared, 1);
+  });
+
   testDoc("undoInSubview", "A='line 0\nline 1\nline 2\nline 3\nline 4' B<A/1-4", function(a, b) {
     b.replaceRange("x", Pos(2, 0));
     a.undo();

From 18e04b40b1b80d482a7d3812a2e49acf25d6d6e5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Mar 2014 09:05:21 +0100
Subject: [PATCH 1092/4742] Always merge matching-origin selection event after
 change

Issue #2305
---
 lib/codemirror.js |  5 +++--
 test/test.js      | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9ec1cfb00e..b77e93599e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6498,7 +6498,7 @@
     }
     hist.done.push(selAfter);
     hist.generation = ++hist.maxGeneration;
-    hist.lastModTime = time;
+    hist.lastModTime = hist.lastSelTime = time;
     hist.lastOp = opId;
     hist.lastOrigin = hist.lastSelOrigin = change.origin;
 
@@ -6527,7 +6527,8 @@
     // merged when similar and close together in time.
     if (opId == hist.lastOp ||
         (origin && hist.lastSelOrigin == origin &&
-         selectionEventCanBeMerged(doc, origin, lst(hist.done), sel)))
+         (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
+          selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
       hist.done[hist.done.length - 1] = sel;
     else
       pushSelectionToHistory(sel, hist.done);
diff --git a/test/test.js b/test/test.js
index 3837abdf18..a4caa47a8f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1843,3 +1843,14 @@ testCM("selChangeInOperationDoesNotSplit", function(cm) {
   cm.undo();
   eq(cm.getValue(), "a");
 }, {value: "a"});
+
+testCM("alwaysMergeSelEventWithChangeOrigin", function(cm) {
+  cm.replaceSelection("U", null, "foo");
+  cm.setSelection(Pos(0, 0), Pos(0, 1), {origin: "foo"});
+  cm.undoSelection();
+  eq(cm.getValue(), "a");
+  cm.replaceSelection("V", null, "foo");
+  cm.setSelection(Pos(0, 0), Pos(0, 1), {origin: "bar"});
+  cm.undoSelection();
+  eq(cm.getValue(), "Va");
+}, {value: "a"});

From 4e24624ed5481106f7c1ed12f680c09a834cae69 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Mar 2014 09:11:21 +0100
Subject: [PATCH 1093/4742] Fix error when running undoSelection on empty
 history

---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b77e93599e..279411d145 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3270,8 +3270,11 @@
 
     // Verify that there is a useable event (so that ctrl-z won't
     // needlessly clear selection events)
-    for (var i = 0; i < source.length; i++)
-      if (allowSelectionOnly || !source[i].ranges) break;
+    for (var i = 0; i < source.length; i++) {
+      event = source[i];
+      if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
+        break;
+    }
     if (i == source.length) return;
     hist.lastOrigin = hist.lastSelOrigin = null;
 

From 4f385e60ac0fd9e69557a2c010985a052676a7e0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Mar 2014 09:47:56 +0100
Subject: [PATCH 1094/4742] Re-query selection state in onContextMenu

Issue #2369
---
 lib/codemirror.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 279411d145..ba1b6a1c3e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3087,15 +3087,14 @@
     focusInput(cm);
     resetInput(cm);
     // Adds "Select all" to context menu in FF
-    var hasSelection = cm.somethingSelected();
-    if (!hasSelection) display.input.value = display.prevInput = " ";
+    if (!cm.somethingSelected()) display.input.value = display.prevInput = " ";
 
     // Select-all will be greyed out if there's nothing to select, so
     // this adds a zero-width space so that we can later check whether
     // it got selected.
     function prepareSelectAllHack() {
       if (display.input.selectionStart != null) {
-        var extval = display.input.value = "\u200b" + (hasSelection ? display.input.value : "");
+        var extval = display.input.value = "\u200b" + (cm.somethingSelected() ? display.input.value : "");
         display.prevInput = "\u200b";
         display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
       }

From 2007b3c7c10043b09576dc64af563fc720b2d12f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Mar 2014 09:57:45 +0100
Subject: [PATCH 1095/4742] Size gutters properly when no scrollbar is present

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ba1b6a1c3e..fbd7bcafa2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -649,7 +649,7 @@
 
   function setDocumentHeight(cm, measure) {
     cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = measure.docHeight + "px";
-    cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight) + "px";
+    cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight - scrollerCutOff) + "px";
   }
 
   // Read the actual heights of the rendered lines, and update their

From 9ebe69980acd82aa13590a8e1b9d1174ec3edce9 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Fri, 14 Mar 2014 16:41:51 +0100
Subject: [PATCH 1096/4742] [LICENCE] use current year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 442d11cdce..d21bbea5a6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2013 by Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 00e4259be767733f0076f240db4ed13b2d4a2b0c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Mar 2014 11:09:27 +0100
Subject: [PATCH 1097/4742] In setSelections, default primary to old primary if
 not given

This makes it easier to update selections by mapping over them.
---
 keymap/sublime.js | 5 ++---
 lib/codemirror.js | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index b2ba0ce3f0..04240b19a5 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -73,14 +73,13 @@
   map["Shift-Tab"] = "indentLess";
 
   cmds[map[ctrl + "L"] = "selectLine"] = function(cm) {
-    var ranges = cm.listSelections(), prim = cm.getCursor(), primIndex, extended = [];
+    var ranges = cm.listSelections(), extended = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i];
-      if (range.head == prim) primIndex = i;
       extended.push({anchor: Pos(range.from().line, 0),
                      head: Pos(range.to().line + 1, 0)});
     }
-    cm.setSelections(extended, primIndex);
+    cm.setSelections(extended);
   };
 
   function wordAt(cm, pos) {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index fbd7bcafa2..070173b512 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6068,7 +6068,7 @@
       for (var i = 0, out = []; i < ranges.length; i++)
         out[i] = new Range(clipPos(this, ranges[i].anchor),
                            clipPos(this, ranges[i].head));
-      if (primary == null) primary = ranges.length - 1;
+      if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex);
       setSelection(this, normalizeSelection(out, primary), options);
     }),
     addSelection: docMethodOp(function(anchor, head, options) {

From 3e745fab6267d563f685192e8ea8d40bb07f004a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Mar 2014 11:12:35 +0100
Subject: [PATCH 1098/4742] [sublime keymap] Fix behavior of swapLineUp from
 last line

Issue #2362

Also add origins to the changes generated.
---
 keymap/sublime.js    | 18 +++++++++++++-----
 test/sublime_test.js |  4 ++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 04240b19a5..33729f45d0 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -150,8 +150,16 @@
       for (var i = 0; i < linesToMove.length; i += 2) {
         var from = linesToMove[i], to = linesToMove[i + 1];
         var line = cm.getLine(from);
-        cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0));
-        cm.replaceRange(line + "\n", Pos(to, 0));
+        cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
+        if (to > cm.lastLine()) {
+          cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine");
+          var sels = cm.listSelections(), last = sels[sels.length - 1];
+          var head = last.head.line == to ? Pos(to - 1) : last.head;
+          var anchor = last.anchor.line == to ? Pos(to - 1) : last.anchor;
+          cm.setSelections(sels.slice(0, sels.length - 1).concat([{head: head, anchor: anchor}]));
+        } else {
+          cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
+        }
       }
     });
   };
@@ -169,10 +177,10 @@
         var from = linesToMove[i], to = linesToMove[i + 1];
         var line = cm.getLine(from);
         if (from == cm.lastLine())
-          cm.replaceRange("", Pos(from - 1), Pos(from));
+          cm.replaceRange("", Pos(from - 1), Pos(from), "+swapLine");
         else
-          cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0));
-        cm.replaceRange(line + "\n", Pos(to, 0));
+          cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
+        cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
       }
     });
   };
diff --git a/test/sublime_test.js b/test/sublime_test.js
index 372a1a0899..3cdaa51e65 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -162,6 +162,10 @@
                 1, 0, 2, 0,
                 2, 2, 2, 2));
 
+  stTest("swapLineUpFromEnd", "a\nb\nc",
+         Pos(2, 1), "swapLineUp",
+         hasSel(1, 1, 1, 1), val("a\nc\nb"));
+
   stTest("joinLines", "abc\ndef\nghi\njkl",
          "joinLines", val("abc def\nghi\njkl"), at(0, 4),
          "undo",

From 8fc924ea090d125be07be09ca0384f264ea33cc8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Mar 2014 11:22:52 +0100
Subject: [PATCH 1099/4742] Fix test suite for 00e4259be767733f

---
 doc/manual.html    | 4 ++--
 test/multi_test.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index a3207ea08e..50407bb001 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1229,8 +1229,8 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer, ?options: object)</code></dt>
       <dd>Sets a new set of selections. There must be at least one
       selection in the given array. When <code>primary</code> is
-      given, it determines which selection is the primary one
-      (defaults to the last one). Supports the same options as <a href="#setSelection"><code>setSelection</code></a>.</dd>
+      given, it determines which selection is the primary one.
+      Supports the same options as <a href="#setSelection"><code>setSelection</code></a>.</dd>
       <dt id="addSelection"><code><strong>doc.addSelection</strong>(anchor: {line, ch}, ?head: {line, ch})</code></dt>
       <dd>Adds a new selection to the existing set of selections, and
       makes it the primary selection.</dd>
diff --git a/test/multi_test.js b/test/multi_test.js
index 6b5b1df821..a8e760d27f 100644
--- a/test/multi_test.js
+++ b/test/multi_test.js
@@ -145,7 +145,7 @@
       if (arg.head) sels.push(arg);
       else sels.push({head: arg, anchor: arg});
     }
-    cm.setSelections(sels);
+    cm.setSelections(sels, sels.length - 1);
   }
 
   testCM("indentSelection", function(cm) {

From 19541139b486b9dfc5605015c90c7a09878b4071 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Mar 2014 18:14:21 +0100
Subject: [PATCH 1100/4742] Prevent rounding errors from causing a phantom
 scrollbar on Firefox

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 070173b512..19856cc6f3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -392,7 +392,7 @@
       barHeight: cm.display.scrollbarV.clientHeight,
       scrollWidth: scroll.scrollWidth, clientWidth: scroll.clientWidth,
       barWidth: cm.display.scrollbarH.clientWidth,
-      docHeight: cm.doc.height + paddingVert(cm.display)
+      docHeight: Math.round(cm.doc.height + paddingVert(cm.display))
     };
   }
 

From 7ccbfaceec1580ae03006550b852ecc40e77df2f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 11:44:57 +0100
Subject: [PATCH 1101/4742] Mention restriction on mutating internal data in
 upgrade guide

---
 doc/upgrade_v4.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index 9b461a9153..88a02066d1 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -20,6 +20,7 @@
     <li><a href="#replaceSelection">replaceSelection and collapsing</a>
     <li><a href="#changeEvent">change event data</a>
     <li><a href="#module">Module loaders</a>
+    <li><a href="#shareddata">Mutating shared data structures</a></li>
     <li><a href="#deprecated">Deprecated interfaces dropped</a>
   </ul>
 </div>
@@ -97,6 +98,17 @@ <h2 id=upgrade>Upgrading to version 4</h2>
 
 </section>
 
+<section id=shareddata><h2>Mutating shared data structures</h2>
+
+<p>Data structures produced by the library should not be mutated
+unless explicitly allowed, in general. This is slightly more strict in
+4.0 than it was in earlier versions, which copied the position objects
+returned by <a href="manual.html#getCursor"><code>getCursor</code></a>
+for nebulous, historic reasons. In 4.0, mutating these
+objects <em>will</em> corrupt your editor's selection.</p>
+
+</section>
+
 <section id=deprecated><h2>Deprecated interfaces dropped</h2>
 
 <p>A few properties and methods that have been deprecated for a while

From dac3b43f7b85163a5b428ddb77405860a08d51f8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 11:49:11 +0100
Subject: [PATCH 1102/4742] [lint addons] Don't error on missing dependencies

Closes #2376
---
 addon/lint/css-lint.js        | 1 +
 addon/lint/javascript-lint.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index 1de71fbcbd..51567c11e0 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -4,6 +4,7 @@
 
 CodeMirror.registerHelper("lint", "css", function(text) {
   var found = [];
+  if (!window.CSSLint) return found;
   var results = CSSLint.verify(text), messages = results.messages, message = null;
   for ( var i = 0; i < messages.length; i++) {
     message = messages[i];
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index 7123ab7e64..73066fb3da 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -12,6 +12,7 @@
                  "Unclosed string", "Stopping, unable to continue" ];
 
   function validator(text, options) {
+    if (!window.JSHINT) return [];
     JSHINT(text, options);
     var errors = JSHINT.data().errors, result = [];
     if (errors) parseErrors(errors, result);

From d03267a340a7e1d01e5e75f5c7211c22bf647c0b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 11:59:35 +0100
Subject: [PATCH 1103/4742] [xml mode] Fix indentation after 'context grabber'

Closes #2374
---
 mode/xml/test.js | 7 ++++++-
 mode/xml/xml.js  | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mode/xml/test.js b/mode/xml/test.js
index e0dfde0f25..1b9d9d1760 100644
--- a/mode/xml/test.js
+++ b/mode/xml/test.js
@@ -24,7 +24,7 @@
      "[tag&bracket </][tag top][tag&bracket >]");
 
   // HTML tests
-  mode = CodeMirror.getMode({indentUnit: 2}, "text/html"); mname = "html";
+  mode = CodeMirror.getMode({indentUnit: 2}, "text/html");
 
   MT("selfclose",
      "[tag&bracket <][tag html][tag&bracket >]",
@@ -40,4 +40,9 @@
   MT("valueless",
      "[tag&bracket <][tag input] [attribute type]=[string checkbox] [attribute checked][tag&bracket />]");
 
+  MT("pThenArticle",
+     "[tag&bracket <][tag p][tag&bracket >]",
+     "  foo",
+     "[tag&bracket <][tag article][tag&bracket >]bar");
+
 })();
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 1fbbbddd72..c51b5ea596 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -337,8 +337,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         }
       } else if (tagAfter) { // Opening tag spotted
         while (context) {
-          var grabbers = Kludges.contextGrabbers[tagAfter[2]];
-          if (grabbers && grabbers.hasOwnProperty(context.tagName))
+          var grabbers = Kludges.contextGrabbers[context.tagName];
+          if (grabbers && grabbers.hasOwnProperty(tagAfter[2]))
             context = context.prev;
           else
             break;

From 362476cdeb3cc2ac6b805136cb5b746b1e57ac93 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 12:11:19 +0100
Subject: [PATCH 1104/4742] [xml mode] Fix parsing of quote-less attribute
 values

Issue #2373
---
 mode/xml/xml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index c51b5ea596..4253da9b63 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -117,7 +117,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       state.stringStartCol = stream.column();
       return state.tokenize(stream, state);
     } else {
-      stream.eatWhile(/[^\s\u00a0=<>\"\'\/]/);
+      stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/);
       return "word";
     }
   }

From efc576b8418a35dccdc15e3d77c3b8b7f2ff8ed9 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Sun, 16 Mar 2014 15:27:28 +0100
Subject: [PATCH 1105/4742] [bidi demo] Fix html highlighting in demo

---
 demo/bidi.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/bidi.html b/demo/bidi.html
index 4f1f8f3e45..569693c875 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -46,7 +46,7 @@ <h2>Bi-directional Text Demo</h2>
   <dt id=option_theme><code>theme (string)</code></dt>
   <dd>موضوع لنمط المحرر مع. يجب عليك التأكد من الملف CSS تحديد
   المقابلة <code>.cm-s-[name]</code> يتم تحميل أنماط (انظر
-  <a href=../theme/><code>theme</code></a> الدليل في التوزيع).
+  <a href="../theme/"><code>theme</code></a> الدليل في التوزيع).
   الافتراضي هو <code>"default"</code> ، والتي تم تضمينها في
   الألوان <code>codemirror.css</code>. فمن الممكن استخدام فئات متعددة
   في تطبيق السمات مرة واحدة على سبيل المثال <code>"foo bar"</code>

From 567d5d5c0bd6a8111cf7a135446838734266de55 Mon Sep 17 00:00:00 2001
From: srajanpaliwal <srajanpaliwal@gmail.com>
Date: Wed, 12 Mar 2014 02:14:09 +0530
Subject: [PATCH 1106/4742] [sublime keymap] Add Ctrl-Enter and
 Shift-Ctrl-Enter

---
 keymap/sublime.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 33729f45d0..ca276d1bc2 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -82,6 +82,35 @@
     cm.setSelections(extended);
   };
 
+  function insertLine(cm,above) {
+    var len = cm.listSelections().length,cursorPos=[],posNewLine;
+    cm.operation(function (){
+      for (var i = 0; i < len; i++) {
+        var range =cm.listSelections()[i];
+        if(above){
+          posNewLine=range.head.line;
+        }
+        else{
+          posNewLine=range.head.line+1;
+        }
+        cm.replaceRange("\n",  Pos(posNewLine,0), Pos(posNewLine,0), "+input");
+        cursorPos[i]=posNewLine;
+      }
+    });
+    for (var j = 0; j < cursorPos.length; j++) {
+      if(j==0)
+        cm.setCursor(cursorPos[j],0,null);
+      else{
+        cm.addSelection({line:cursorPos[j],ch:0});
+      }
+      cm.indentLine(cursorPos[j], null, true);
+    }
+  }
+
+  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { insertLine(cm,false); };
+
+  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { insertLine(cm,true); };
+
   function wordAt(cm, pos) {
     var start = pos.ch, end = start, line = cm.getLine(pos.line);
     while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start;

From ec129392e5c6a11fe46028d2ff417a409920d846 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 12:49:55 +0100
Subject: [PATCH 1107/4742] [sublime keymap] Clean up ctrl-enter patch, add
 tests

Issue #2354
---
 keymap/sublime.js    | 35 +++++++++++++----------------------
 test/sublime_test.js | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index ca276d1bc2..4b1de56a39 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -82,34 +82,25 @@
     cm.setSelections(extended);
   };
 
-  function insertLine(cm,above) {
-    var len = cm.listSelections().length,cursorPos=[],posNewLine;
-    cm.operation(function (){
+  function insertLine(cm, above) {
+    cm.operation(function() {
+      var len = cm.listSelections().length, newSelection = [], last = -1;
       for (var i = 0; i < len; i++) {
-        var range =cm.listSelections()[i];
-        if(above){
-          posNewLine=range.head.line;
-        }
-        else{
-          posNewLine=range.head.line+1;
-        }
-        cm.replaceRange("\n",  Pos(posNewLine,0), Pos(posNewLine,0), "+input");
-        cursorPos[i]=posNewLine;
+        var head = cm.listSelections()[i].head;
+        if (head.line <= last) continue;
+        var at = Pos(head.line + (above ? 0 : 1), 0);
+        cm.replaceRange("\n", at, null, "+insertLine");
+        cm.indentLine(at.line, null, true);
+        newSelection.push({head: at, anchor: at});
+        last = head.line + 1;
       }
+      cm.setSelections(newSelection);
     });
-    for (var j = 0; j < cursorPos.length; j++) {
-      if(j==0)
-        cm.setCursor(cursorPos[j],0,null);
-      else{
-        cm.addSelection({line:cursorPos[j],ch:0});
-      }
-      cm.indentLine(cursorPos[j], null, true);
-    }
   }
 
-  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { insertLine(cm,false); };
+  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { insertLine(cm, false); };
 
-  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { insertLine(cm,true); };
+  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { insertLine(cm, true); };
 
   function wordAt(cm, pos) {
     var start = pos.ch, end = start, line = cm.getLine(pos.line);
diff --git a/test/sublime_test.js b/test/sublime_test.js
index 3cdaa51e65..0c78c4c345 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -111,6 +111,22 @@
          "selectLine",
          hasSel(0, 0, 2, 0));
 
+  stTest("insertLineAfter", "abcde\nfghijkl\nmn",
+         setSel(0, 1, 0, 1,
+                0, 3, 0, 3,
+                1, 2, 1, 2,
+                1, 3, 1, 5), "insertLineAfter",
+         hasSel(1, 0, 1, 0,
+                3, 0, 3, 0), val("abcde\n\nfghijkl\n\nmn"));
+
+  stTest("insertLineBefore", "abcde\nfghijkl\nmn",
+         setSel(0, 1, 0, 1,
+                0, 3, 0, 3,
+                1, 2, 1, 2,
+                1, 3, 1, 5), "insertLineBefore",
+         hasSel(0, 0, 0, 0,
+                2, 0, 2, 0), val("\nabcde\n\nfghijkl\nmn"));
+
   stTest("selectNextOccurrence", "a foo bar\nfoobar foo",
          setSel(0, 2, 0, 5),
          "selectNextOccurrence", hasSel(0, 2, 0, 5,

From 7ec7ec081bb8c06ff1f2bd0145fd1b4dcc9fe3eb Mon Sep 17 00:00:00 2001
From: srajanpaliwal <srajanpaliwal@gmail.com>
Date: Sat, 15 Mar 2014 01:30:35 +0530
Subject: [PATCH 1108/4742] [sublime keymap] Added new bindings and corrected
 swaplines

"Shift-Ctrl-K"            Delete line
"Ctrl-K Ctrl-K"           Delete line to right
"Ctrl-K Ctrl-Backspace"   Delete line to left
Swapline                  scrolls with the cursor
---
 keymap/sublime.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 4b1de56a39..59e18d7e4a 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -82,6 +82,8 @@
     cm.setSelections(extended);
   };
 
+  map["Shift-"+ctrl+"K"]="deleteLine";
+
   function insertLine(cm, above) {
     cm.operation(function() {
       var len = cm.listSelections().length, newSelection = [], last = -1;
@@ -166,6 +168,7 @@
       else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
       at = to;
     }
+    cm.scrollIntoView(null,cm.defaultTextHeight());
     cm.operation(function() {
       for (var i = 0; i < linesToMove.length; i += 2) {
         var from = linesToMove[i], to = linesToMove[i + 1];
@@ -192,6 +195,7 @@
       else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
       at = to;
     }
+    cm.scrollIntoView(null,cm.defaultTextHeight());
     cm.operation(function() {
       for (var i = linesToMove.length - 2; i >= 0; i -= 2) {
         var from = linesToMove[i], to = linesToMove[i + 1];
@@ -375,6 +379,13 @@
     });
   }
 
+  mapK[ctrl + "Backspace"] = "delLineLeft";
+
+  cmds[mapK[ctrl + "K"] = "delLineRight"] = function(cm) {
+      var cur = cm.getCursor();
+      cm.replaceRange("",cur ,Pos(cur.line,cur.line.length), "+delete");
+  };
+
   cmds[mapK[ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
     modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
   };

From 05ed5650ecfd00d781efc9425c6bc79c6fce482a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 13:04:19 +0100
Subject: [PATCH 1109/4742] [sublime keymap] Fix formatting, delLineRight
 binding

Issue #2354
---
 keymap/sublime.js | 15 ++++++++++-----
 lib/codemirror.js | 11 ++++++++---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 59e18d7e4a..5710b98825 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -82,7 +82,7 @@
     cm.setSelections(extended);
   };
 
-  map["Shift-"+ctrl+"K"]="deleteLine";
+  map["Shift-" + ctrl + "K"] = "deleteLine";
 
   function insertLine(cm, above) {
     cm.operation(function() {
@@ -168,7 +168,6 @@
       else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
       at = to;
     }
-    cm.scrollIntoView(null,cm.defaultTextHeight());
     cm.operation(function() {
       for (var i = 0; i < linesToMove.length; i += 2) {
         var from = linesToMove[i], to = linesToMove[i + 1];
@@ -184,6 +183,7 @@
           cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
         }
       }
+      cm.scrollIntoView();
     });
   };
 
@@ -195,7 +195,6 @@
       else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
       at = to;
     }
-    cm.scrollIntoView(null,cm.defaultTextHeight());
     cm.operation(function() {
       for (var i = linesToMove.length - 2; i >= 0; i -= 2) {
         var from = linesToMove[i], to = linesToMove[i + 1];
@@ -206,6 +205,7 @@
           cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
         cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
       }
+      cm.scrollIntoView();
     });
   };
 
@@ -249,6 +249,7 @@
         else
           cm.replaceRange(cm.getRange(range.from(), range.to()), range.from());
       }
+      cm.scrollIntoView();
     });
   };
 
@@ -382,8 +383,12 @@
   mapK[ctrl + "Backspace"] = "delLineLeft";
 
   cmds[mapK[ctrl + "K"] = "delLineRight"] = function(cm) {
-      var cur = cm.getCursor();
-      cm.replaceRange("",cur ,Pos(cur.line,cur.line.length), "+delete");
+    cm.operation(function() {
+      var ranges = cm.listSelections();
+      for (var i = ranges.length - 1; i >= 0; i--)
+        cm.replaceRange("", ranges[i].anchor, Pos(ranges[i].to().line), "+delete");
+      cm.scrollIntoView();
+    });
   };
 
   cmds[mapK[ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 19856cc6f3..5fd7efe58b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4132,9 +4132,14 @@
     },
 
     scrollIntoView: methodOp(function(range, margin) {
-      if (range == null) range = {from: this.doc.sel.primary().head, to: null};
-      else if (typeof range == "number") range = {from: Pos(range, 0), to: null};
-      else if (range.from == null) range = {from: range, to: null};
+      if (range == null) {
+        range = {from: this.doc.sel.primary().head, to: null};
+        if (margin == null) margin = this.options.cursorScrollMargin;
+      } else if (typeof range == "number") {
+        range = {from: Pos(range, 0), to: null};
+      } else if (range.from == null) {
+        range = {from: range, to: null};
+      }
       if (!range.to) range.to = range.from;
       range.margin = margin || 0;
 

From fe9a348ede5250be50f64ee08e0c2dd0ff685b54 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 13:34:50 +0100
Subject: [PATCH 1110/4742] [css mode] Add nonStandardPropertyKeywords list

And style them differently from unknown properties.

Issue #2356
---
 mode/css/css.js | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 6cc4b71b05..108ec8bc29 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -8,6 +8,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       mediaTypes = parserConfig.mediaTypes || {},
       mediaFeatures = parserConfig.mediaFeatures || {},
       propertyKeywords = parserConfig.propertyKeywords || {},
+      nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {},
       colorKeywords = parserConfig.colorKeywords || {},
       valueKeywords = parserConfig.valueKeywords || {},
       fontProperties = parserConfig.fontProperties || {},
@@ -162,9 +163,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   states.block = function(type, stream, state) {
     if (type == "word") {
-      if (propertyKeywords.hasOwnProperty(stream.current().toLowerCase())) {
+      var word = stream.current().toLowerCase();
+      if (propertyKeywords.hasOwnProperty(word)) {
         override = "property";
         return "maybeprop";
+      } else if (nonStandardPropertyKeywords.hasOwnProperty(word)) {
+        override = "string-2";
+        return "maybeprop";
       } else if (allowNested) {
         override = stream.match(/^\s*:/, false) ? "property" : "tag";
         return "block";
@@ -437,7 +442,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "vertical-align", "visibility", "voice-balance", "voice-duration",
     "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
     "voice-volume", "volume", "white-space", "widows", "width", "word-break",
-    "word-spacing", "word-wrap", "z-index", "zoom",
+    "word-spacing", "word-wrap", "z-index",
     // SVG-specific
     "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
     "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
@@ -450,6 +455,14 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "glyph-orientation-vertical", "kerning", "text-anchor", "writing-mode"
   ], propertyKeywords = keySet(propertyKeywords_);
 
+  var nonStandardPropertyKeywords = [
+    "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
+    "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
+    "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
+    "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
+    "searchfield-results-decoration", "zoom"
+  ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords);
+
   var colorKeywords_ = [
     "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
     "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
@@ -569,7 +582,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "font-stretch", "font-weight", "font-style"
   ], fontProperties = keySet(fontProperties_);
 
-  var allWords = mediaTypes_.concat(mediaFeatures_).concat(propertyKeywords_).concat(colorKeywords_).concat(valueKeywords_);
+  var allWords = mediaTypes_.concat(mediaFeatures_).concat(propertyKeywords_)
+    .concat(nonStandardPropertyKeywords).concat(colorKeywords_).concat(valueKeywords_);
   CodeMirror.registerHelper("hintWords", "css", allWords);
 
   function tokenCComment(stream, state) {
@@ -598,6 +612,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
     propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
     fontProperties: fontProperties,
@@ -620,6 +635,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
     propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
     fontProperties: fontProperties,
@@ -660,6 +676,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
     propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
     fontProperties: fontProperties,

From afb56fa0526c24b5c54d049d298ab69d191ccbcf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 13:50:25 +0100
Subject: [PATCH 1111/4742] Mark 4.0 release candidate 2

---
 AUTHORS           | 1 +
 doc/compress.html | 1 +
 doc/manual.html   | 2 +-
 doc/releases.html | 8 +++++++-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 464249d710..be29dbbf2d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -292,6 +292,7 @@ Shmuel Englard
 soliton4
 sonson
 spastorelli
+srajanpaliwal
 Stanislav Oaserele
 Stas Kobzar
 Stefan Borsje
diff --git a/doc/compress.html b/doc/compress.html
index e5a77c5022..cb1dfcc9e6 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=4.0.2;f=">4.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.1;f=">4.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.22.0;f=">3.22</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
diff --git a/doc/manual.html b/doc/manual.html
index 50407bb001..7450476361 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 4.0.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.0.2</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 3e2932b411..0a2551984f 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,7 +28,13 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
-  <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-4.0rc1.zip">Version 4.0 release candidate 1</a>:</p>
+  <p class="rel">17-03-2014: <a href="http://codemirror.net/codemirror-4.0rc2.zip">Version 4.0 release candidate 2</a>:</p>
+
+  <p class="rel-note">Second release candidate for 4.0. Fixes some
+  context menu bugs, a wheel-scrolling glitch, and several missing
+  cases in the Sublime Text bindings.</p>
+
+  <p class="rel">10-03-2014: <a href="http://codemirror.net/codemirror-4.0rc1.zip">Version 4.0 release candidate 1</a>:</p>
 
   <p class="rel-note">First release candidate for 4.0, which supports
   multiple selections, selection undo, and improved (faster, less
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5fd7efe58b..e32bfe9b1f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7325,7 +7325,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.0.1";
+  CodeMirror.version = "4.0.2";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 484f7cdc4d..7ee1d9e508 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.0.1",
+    "version":"4.0.2",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From afcede21236076a91a5602490bf0a1345c4eed90 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Fri, 14 Mar 2014 03:21:43 +0530
Subject: [PATCH 1112/4742] [vim] Fix 'mark to move to first nonwhitespace

---
 keymap/vim.js    |  7 ++++---
 test/vim_test.js | 16 +++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 899c6c0e83..732c9e4a03 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -194,7 +194,7 @@
     { keys: [','], type: 'motion', motion: 'repeatLastCharacterSearch',
         motionArgs: { forward: false }},
     { keys: ['\'', 'character'], type: 'motion', motion: 'goToMark',
-        motionArgs: {toJumplist: true}},
+        motionArgs: {toJumplist: true, linewise: true}},
     { keys: ['`', 'character'], type: 'motion', motion: 'goToMark',
         motionArgs: {toJumplist: true}},
     { keys: [']', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
@@ -1380,10 +1380,11 @@
         highlightSearchMatches(cm, query);
         return findNext(cm, prev/** prev */, query, motionArgs.repeat);
       },
-      goToMark: function(_cm, motionArgs, vim) {
+      goToMark: function(cm, motionArgs, vim) {
         var mark = vim.marks[motionArgs.selectedCharacter];
         if (mark) {
-          return mark.find();
+          var pos = mark.find();
+          return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos;
         }
         return null;
       },
diff --git a/test/vim_test.js b/test/vim_test.js
index 4d9525e15e..10eda070c6 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -258,7 +258,7 @@ testJumplist('jumplist_gg', ['g', 'g', '<C-o>'], [5,2], [5,2]);
 testJumplist('jumplist_%', ['%', '<C-o>'], [1,5], [1,5]);
 testJumplist('jumplist_{', ['{', '<C-o>'], [1,5], [1,5]);
 testJumplist('jumplist_}', ['}', '<C-o>'], [1,5], [1,5]);
-testJumplist('jumplist_\'', ['m', 'a', 'h', '\'', 'a', 'h', '<C-i>'], [1,5], [1,5]);
+testJumplist('jumplist_\'', ['m', 'a', 'h', '\'', 'a', 'h', '<C-i>'], [1,0], [1,5]);
 testJumplist('jumplist_`', ['m', 'a', 'h', '`', 'a', 'h', '<C-i>'], [1,5], [1,5]);
 testJumplist('jumplist_*_cachedCursor', ['*', '<C-o>'], [1,3], [1,3]);
 testJumplist('jumplist_#_cachedCursor', ['#', '<C-o>'], [1,3], [1,3]);
@@ -1265,11 +1265,13 @@ testVim('mark', function(cm, vim, helpers) {
   cm.setCursor(2, 2);
   helpers.doKeys('m', 't');
   cm.setCursor(0, 0);
-  helpers.doKeys('\'', 't');
-  helpers.assertCursorAt(2, 2);
-  cm.setCursor(0, 0);
   helpers.doKeys('`', 't');
   helpers.assertCursorAt(2, 2);
+  cm.setCursor(2, 0);
+  cm.replaceRange('   h', cm.getCursor());
+  cm.setCursor(0, 0);
+  helpers.doKeys('\'', 't');
+  helpers.assertCursorAt(2, 3);
 });
 testVim('jumpToMark_next', function(cm, vim, helpers) {
   cm.setCursor(2, 2);
@@ -1519,13 +1521,13 @@ testVim('visual_line', function(cm, vim, helpers) {
   eq(' 4\n 5', cm.getValue());
 }, { value: ' 1\n 2\n 3\n 4\n 5' });
 testVim('visual_marks', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l', 'v');
+  helpers.doKeys('l', 'v', 'l', 'l', 'j', 'j', 'v');
   // Test visual mode marks
-  cm.setCursor(0, 0);
+  cm.setCursor(2, 1);
   helpers.doKeys('\'', '<');
   helpers.assertCursorAt(0, 1);
   helpers.doKeys('\'', '>');
-  helpers.assertCursorAt(0, 3);
+  helpers.assertCursorAt(2, 0);
 });
 testVim('visual_join', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'J');

From 0afc1a55e72adf5d2945c9bf2549683b567424b6 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Sun, 16 Mar 2014 21:38:10 +0530
Subject: [PATCH 1113/4742] [vim] Implement gstar and ghash

---
 keymap/vim.js    | 11 +++++++----
 test/vim_test.js | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 732c9e4a03..7e7accb608 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -322,9 +322,11 @@
     { keys: ['?'], type: 'search',
         searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
     { keys: ['*'], type: 'search',
-        searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
+        searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
     { keys: ['#'], type: 'search',
-        searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
+        searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: ['g', '*'], type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
+    { keys: ['g', '#'], type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
     // Ex command
     { keys: [':'], type: 'ex' }
   ];
@@ -1054,6 +1056,7 @@
           return;
         }
         var forward = command.searchArgs.forward;
+        var wholeWordOnly = command.searchArgs.wholeWordOnly;
         getSearchState(cm).setReversed(!forward);
         var promptPrefix = (forward) ? '/' : '?';
         var originalQuery = getSearchState(cm).getQuery();
@@ -1138,8 +1141,8 @@
             }
             var query = cm.getLine(word.start.line).substring(word.start.ch,
                 word.end.ch);
-            if (isKeyword) {
-              query = '\\b' + query + '\\b';
+            if (isKeyword && wholeWordOnly) {
+                query = '\\b' + query + '\\b';
             } else {
               query = escapeRegex(query);
             }
diff --git a/test/vim_test.js b/test/vim_test.js
index 10eda070c6..7393abfea6 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1747,6 +1747,22 @@ testVim('#', function(cm, vim, helpers) {
   helpers.doKeys('#');
   helpers.assertCursorAt(1, 8);
 }, { value: '    :=  match nomatch match \nnomatch Match' });
+testVim('g*', function(cm, vim, helpers) {
+  cm.setCursor(0, 8);
+  helpers.doKeys('g', '*');
+  helpers.assertCursorAt(0, 18);
+  cm.setCursor(0, 8);
+  helpers.doKeys('3', 'g', '*');
+  helpers.assertCursorAt(1, 8);
+}, { value: 'matches match alsoMatch\nmatchme matching' });
+testVim('g#', function(cm, vim, helpers) {
+  cm.setCursor(0, 8);
+  helpers.doKeys('g', '#');
+  helpers.assertCursorAt(0, 0);
+  cm.setCursor(0, 8);
+  helpers.doKeys('3', 'g', '#');
+  helpers.assertCursorAt(1, 0);
+}, { value: 'matches match alsoMatch\nmatchme matching' });
 testVim('macro_insert', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'a', '0', 'i');

From eda588eb27b5dd0297b421396050eddc269b9161 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Mar 2014 22:18:32 +0100
Subject: [PATCH 1114/4742] Remove extra.js keymap experiment

It has been superceded by keymap/sublime.js.
---
 demo/theme.html |  1 -
 keymap/extra.js | 43 -------------------------------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 keymap/extra.js

diff --git a/demo/theme.html b/demo/theme.html
index 29b55df2e3..20e273cf59 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -35,7 +35,6 @@
 <link rel="stylesheet" href="../theme/xq-light.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
-<script src="../keymap/extra.js"></script>
 <script src="../addon/selection/active-line.js"></script>
 <script src="../addon/edit/matchbrackets.js"></script>
 <style type="text/css">
diff --git a/keymap/extra.js b/keymap/extra.js
deleted file mode 100644
index 18dd5a979d..0000000000
--- a/keymap/extra.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// A number of additional default bindings that are too obscure to
-// include in the core codemirror.js file.
-
-(function() {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-
-  function moveLines(cm, start, end, dist) {
-    if (!dist || start > end) return 0;
-
-    var from = cm.clipPos(Pos(start, 0)), to = cm.clipPos(Pos(end));
-    var text = cm.getRange(from, to);
-
-    if (start <= cm.firstLine())
-      cm.replaceRange("", from, Pos(to.line + 1, 0));
-    else
-      cm.replaceRange("", Pos(from.line - 1), to);
-    var target = from.line + dist;
-    if (target <= cm.firstLine()) {
-      cm.replaceRange(text + "\n", Pos(target, 0));
-      return cm.firstLine() - from.line;
-    } else {
-      var targetPos = cm.clipPos(Pos(target - 1));
-      cm.replaceRange("\n" + text, targetPos);
-      return targetPos.line + 1 - from.line;
-    }
-  }
-
-  function moveSelectedLines(cm, dist) {
-    var head = cm.getCursor("head"), anchor = cm.getCursor("anchor");
-    cm.operation(function() {
-      var moved = moveLines(cm, Math.min(head.line, anchor.line), Math.max(head.line, anchor.line), dist);
-      cm.setSelection(Pos(anchor.line + moved, anchor.ch), Pos(head.line + moved, head.ch));
-    });
-  }
-
-  CodeMirror.commands.moveLinesUp = function(cm) { moveSelectedLines(cm, -1); };
-  CodeMirror.commands.moveLinesDown = function(cm) { moveSelectedLines(cm, 1); };
-
-  CodeMirror.keyMap["default"]["Alt-Up"] = "moveLinesUp";
-  CodeMirror.keyMap["default"]["Alt-Down"] = "moveLinesDown";
-})();

From ef1b02eb1f2f0abef019eda80b04a752fd777c20 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Mar 2014 09:39:12 +0100
Subject: [PATCH 1115/4742] Remove fakedLastChar hack

Issue #1474 was the cause of this hack
Issue #2384 was apparently caused by it

Recent Webkit-ish browsers seem to no longer have the problem that
it was working around.
---
 lib/codemirror.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ee1e418b65..e106648583 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1508,10 +1508,6 @@ window.CodeMirror = (function() {
   function readInput(cm) {
     var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc, sel = doc.sel;
     if (!cm.state.focused || hasSelection(input) || isReadOnly(cm) || cm.options.disableInput) return false;
-    if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
-      input.value = input.value.substring(0, input.value.length - 1);
-      cm.state.fakedLastChar = false;
-    }
     var text = input.value;
     if (text == prevInput && posEq(sel.from, sel.to)) return false;
     if (ie && !ie_lt9 && cm.display.inputHasSelection === text) {
@@ -1678,16 +1674,6 @@ window.CodeMirror = (function() {
       fastPoll(cm);
     });
     on(d.input, "paste", function() {
-      // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
-      // Add a char to the end of textarea before paste occur so that
-      // selection doesn't span to the end of textarea.
-      if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
-        var start = d.input.selectionStart, end = d.input.selectionEnd;
-        d.input.value += "$";
-        d.input.selectionStart = start;
-        d.input.selectionEnd = end;
-        cm.state.fakedLastChar = true;
-      }
       cm.state.pasteIncoming = true;
       fastPoll(cm);
     });

From 475b2be0da668724fa910dc70579820eb3ad905e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Mar 2014 09:39:12 +0100
Subject: [PATCH 1116/4742] Remove fakedLastChar hack

Issue #1474 was the cause of this hack
Issue #2384 was apparently caused by it

Recent Webkit-ish browsers seem to no longer have the problem that
it was working around.
---
 lib/codemirror.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e32bfe9b1f..1b29cc0819 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2202,11 +2202,6 @@
     // 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) || isReadOnly(cm) || cm.options.disableInput) return false;
-    // See paste handler for more on the fakedLastChar kludge
-    if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
-      input.value = input.value.substring(0, input.value.length - 1);
-      cm.state.fakedLastChar = false;
-    }
     var text = input.value;
     // If nothing changed, bail.
     if (text == prevInput && !cm.somethingSelected()) return false;
@@ -2401,16 +2396,6 @@
       fastPoll(cm);
     });
     on(d.input, "paste", function() {
-      // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
-      // Add a char to the end of textarea before paste occur so that
-      // selection doesn't span to the end of textarea.
-      if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
-        var start = d.input.selectionStart, end = d.input.selectionEnd;
-        d.input.value += "$";
-        d.input.selectionStart = start;
-        d.input.selectionEnd = end;
-        cm.state.fakedLastChar = true;
-      }
       cm.state.pasteIncoming = true;
       fastPoll(cm);
     });

From fbf533cf31bc9391a7862f28ea0d6109adc4b415 Mon Sep 17 00:00:00 2001
From: dignifiedquire <dignifiedquire@gmail.com>
Date: Mon, 17 Mar 2014 16:48:16 +0100
Subject: [PATCH 1117/4742] [solarized theme] Remove shadow, conform to other
 solarized themes

---
 theme/solarized.css | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index 9c2e914833..c9c84097d0 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -121,8 +121,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 /* Gutter border and some shadow from it  */
 .cm-s-solarized .CodeMirror-gutters {
-  padding: 0 15px 0 10px;
-  box-shadow: 0 10px 20px black;
   border-right: 1px solid;
 }
 
@@ -130,7 +128,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 /* Dark */
 .cm-s-solarized.cm-s-dark .CodeMirror-gutters {
-  background-color: #073642;
+  background-color:  #002b36;
   border-color: #00232c;
 }
 
@@ -140,23 +138,20 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 /* Light */
 .cm-s-solarized.cm-s-light .CodeMirror-gutters {
-  background-color: #eee8d5;
+  background-color: #fdf6e3;
   border-color: #eee8d5;
 }
 
 /* Common */
 .cm-s-solarized .CodeMirror-linenumber {
   color: #586e75;
+  padding: 0 5px;
 }
 
 .cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
   color: #586e75;
 }
 
-.cm-s-solarized .CodeMirror-lines {
-  padding-left: 5px;
-}
-
 .cm-s-solarized .CodeMirror-lines .CodeMirror-cursor {
   border-left: 1px solid #819090;
 }
@@ -171,11 +166,3 @@ view-port
 .cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
   background: rgba(0, 0, 0, 0.10);
 }
-
-/*
-View-port and gutter both get little noise background to give it a real feel.
-*/
-.cm-s-solarized.CodeMirror,
-.cm-s-solarized .CodeMirror-gutters {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
-}

From 8ee76358edd8bef3ae2d833e5131192adb07efe8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Mar 2014 09:47:15 +0100
Subject: [PATCH 1118/4742] Better documentation for 'primary' arg to
 setSelections

---
 doc/manual.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 7450476361..5295ec79ea 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1228,9 +1228,12 @@ <h3 id="api_selection">Cursor and selection methods</h3>
 
       <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer, ?options: object)</code></dt>
       <dd>Sets a new set of selections. There must be at least one
-      selection in the given array. When <code>primary</code> is
-      given, it determines which selection is the primary one.
-      Supports the same options as <a href="#setSelection"><code>setSelection</code></a>.</dd>
+      selection in the given array. When <code>primary</code> is a
+      number, it determines which selection is the primary one. When
+      it is not given, the primary index is taken from the previous
+      selection, or set to the last range if the previous selection
+      had less ranges than the new one. Supports the same options
+      as <a href="#setSelection"><code>setSelection</code></a>.</dd>
       <dt id="addSelection"><code><strong>doc.addSelection</strong>(anchor: {line, ch}, ?head: {line, ch})</code></dt>
       <dd>Adds a new selection to the existing set of selections, and
       makes it the primary selection.</dd>

From 7c134914ecbe9d4236cdcd25ab3b11278bf05f3a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Mar 2014 10:00:50 +0100
Subject: [PATCH 1119/4742] [javascript mode] Fix parsing of ops and derefs
 after function literal

Closes #2381
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 37f48cbfae..64a6bf0040 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -345,7 +345,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
-    if (type == "function") return cont(functiondef);
+    if (type == "function") return cont(functiondef, maybeop);
     if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);

From 38afa1e5210bdaf12d75bd7625468121603a1092 Mon Sep 17 00:00:00 2001
From: B Krishna Chaitanya <bkchaitan94@gmail.com>
Date: Mon, 17 Mar 2014 19:30:26 +0530
Subject: [PATCH 1120/4742] [sublime keymap] Ctrl-F3 and Ctrl-Shift-F3 bindings

---
 keymap/sublime.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 5710b98825..7662a82aff 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -455,6 +455,41 @@
     });
   };
 
+  function findAndGoTo(cm,next){
+    var from = cm.getCursor("from"), to = cm.getCursor("to");
+    var selected = CodeMirror.cmpPos(from, to);
+    if (!selected) {
+      var word = wordAt(cm, from);
+      if (!word.word) return;
+      cm.setSelection(word.from, word.to);
+      from = word.from;
+      to = word.to;
+      selected = true;
+    }
+    if (selected){
+      var query = cm.getRange(from, to);
+      var searchstart = (next ? to : {line:from.line,ch:from.ch-1});
+      var cur = cm.getSearchCursor(query, searchstart);
+      var found;
+      if(next) found = cur.findNext();
+      else found = cur.findPrevious();
+      if (found)
+        cm.setSelection(cur.from(), cur.to());
+      else{
+        if(next){
+          cur = cm.getSearchCursor(query, Pos(cm.firstLine(),0));
+          cur.findNext();
+        } else {
+          cur = cm.getSearchCursor(query, Pos(cm.lastLine()+1,0));
+          cur.findPrevious();
+        }
+        cm.setSelection(cur.from(), cur.to());
+      }
+    }
+  };
+  cmds[map[ctrl+"F3"] = "findUnder"] = function(cm) {findAndGoTo(cm,true);};
+  cmds[map[ctrl+"Shift-F3"] = "findUnderPrevious"] = function(cm) {findAndGoTo(cm,false);};
+
   map["Shift-" + ctrl + "["] = "fold";
   map["Shift-" + ctrl + "]"] = "unfold";
   mapK[ctrl + "0"] = mapK[ctrl + "j"] = "unfoldAll";

From 1696785c3fb6a1b00d3ceef81b5f61250dc1742d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Mar 2014 11:05:34 +0100
Subject: [PATCH 1121/4742] [sublime keymap] Fix findUnder, add test

Issue #2380
---
 keymap/sublime.js    | 41 ++++++++++++++++-------------------------
 test/sublime_test.js |  8 ++++++++
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 7662a82aff..a739ddc826 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -455,40 +455,31 @@
     });
   };
 
-  function findAndGoTo(cm,next){
+  function findAndGoTo(cm, forward) {
     var from = cm.getCursor("from"), to = cm.getCursor("to");
-    var selected = CodeMirror.cmpPos(from, to);
-    if (!selected) {
+    if (CodeMirror.cmpPos(from, to) == 0) {
       var word = wordAt(cm, from);
       if (!word.word) return;
-      cm.setSelection(word.from, word.to);
       from = word.from;
       to = word.to;
-      selected = true;
     }
-    if (selected){
-      var query = cm.getRange(from, to);
-      var searchstart = (next ? to : {line:from.line,ch:from.ch-1});
-      var cur = cm.getSearchCursor(query, searchstart);
-      var found;
-      if(next) found = cur.findNext();
-      else found = cur.findPrevious();
-      if (found)
-        cm.setSelection(cur.from(), cur.to());
-      else{
-        if(next){
-          cur = cm.getSearchCursor(query, Pos(cm.firstLine(),0));
-          cur.findNext();
-        } else {
-          cur = cm.getSearchCursor(query, Pos(cm.lastLine()+1,0));
-          cur.findPrevious();
-        }
+
+    var query = cm.getRange(from, to);
+    var cur = cm.getSearchCursor(query, forward ? to : from);
+
+    if (forward ? cur.findNext() : cur.findPrevious()) {
+      cm.setSelection(cur.from(), cur.to());
+    } else {
+      cur = cm.getSearchCursor(query, forward ? Pos(cm.firstLine(), 0)
+                                              : cm.clipPos(Pos(cm.lastLine())));
+      if (forward ? cur.findNext() : cur.findPrevious())
         cm.setSelection(cur.from(), cur.to());
-      }
+      else if (word)
+        cm.setSelection(from, to);
     }
   };
-  cmds[map[ctrl+"F3"] = "findUnder"] = function(cm) {findAndGoTo(cm,true);};
-  cmds[map[ctrl+"Shift-F3"] = "findUnderPrevious"] = function(cm) {findAndGoTo(cm,false);};
+  cmds[map[ctrl + "F3"] = "findUnder"] = function(cm) { findAndGoTo(cm, true); };
+  cmds[map["Shift-" + ctrl + "F3"] = "findUnderPrevious"] = function(cm) { findAndGoTo(cm,false); };
 
   map["Shift-" + ctrl + "["] = "fold";
   map["Shift-" + ctrl + "]"] = "unfold";
diff --git a/test/sublime_test.js b/test/sublime_test.js
index 0c78c4c345..f09504c51a 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -286,4 +286,12 @@
          Pos(0, 1), "swapWithSublimeMark", at(1, 1), "swapWithSublimeMark", at(0, 1),
          "deleteToSublimeMark", val("aef\nghi"),
          "sublimeYank", val("abc\ndef\nghi"), at(1, 1));
+
+  stTest("findUnder", "foo foobar  a",
+         "findUnder", hasSel(0, 4, 0, 7),
+         "findUnder", hasSel(0, 0, 0, 3),
+         "findUnderPrevious", hasSel(0, 4, 0, 7),
+         "findUnderPrevious", hasSel(0, 0, 0, 3),
+         Pos(0, 4), "findUnder", hasSel(0, 4, 0, 10),
+         Pos(0, 11), "findUnder", hasSel(0, 11, 0, 11));
 })();

From f320103a3e7bac0c63643e2562446d18e385f6a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Mar 2014 11:11:13 +0100
Subject: [PATCH 1122/4742] [sublime demo] Make findUnder bindings show up

---
 demo/sublime.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/sublime.html b/demo/sublime.html
index d942cc4409..f9115f57be 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -55,7 +55,7 @@ <h2>Sublime Text bindings demo</h2>
   var value = "// The bindings defined specifically in the Sublime Text mode\nvar bindings = {\n";
   var map = CodeMirror.keyMap.sublime, mapK = CodeMirror.keyMap["sublime-Ctrl-K"];
   for (var key in map) {
-    if (key != "Ctrl-K" && key != "fallthrough" && !/find/.test(map[key]))
+    if (key != "Ctrl-K" && key != "fallthrough" && (!/find/.test(map[key]) || /findUnder/.test(map[key])))
       value += "  \"" + key + "\": \"" + map[key] + "\",\n";
   }
   for (var key in mapK) {

From 37fcffb1007683f2d49ff0eddf2810cfa272ff46 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Mar 2014 14:51:11 +0100
Subject: [PATCH 1123/4742] Fix bug in transposeChars command

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1b29cc0819..bc46e6ba18 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4516,7 +4516,7 @@
       runInOp(cm, function() {
         var ranges = cm.listSelections();
         for (var i = 0; i < ranges.length; i++) {
-          var cur = ranges[i].head, line = getLine(cm.doc, cur.line);
+          var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
           if (cur.ch > 0 && cur.ch < line.length - 1)
             cm.replaceRange(line.charAt(cur.ch) + line.charAt(cur.ch - 1),
                             Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));

From cca65b072099c090159db8b3108978f7704a6070 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Mar 2014 16:01:56 +0100
Subject: [PATCH 1124/4742] Fix read from wrong property in moveV method

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bc46e6ba18..0fc68da3b9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4077,7 +4077,7 @@
 
     moveV: methodOp(function(dir, unit) {
       var cm = this, doc = this.doc, goals = [];
-      var collapse = !cm.display.shift && !doc.sel.extend && doc.sel.somethingSelected();
+      var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected();
       doc.extendSelectionsBy(function(range) {
         if (collapse)
           return dir < 0 ? range.from() : range.to();

From 01e7ab9ce94bbc97328f76c0325bdfe99ed66000 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 18 Mar 2014 20:47:36 +0100
Subject: [PATCH 1125/4742] [vim] Update documentation to set vimMode instead
 of keyMap

---
 demo/vim.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index 379fac1475..f7445ed6c6 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -51,9 +51,10 @@ <h2>Vim bindings demo</h2>
 
 <p>The vim keybindings are enabled by
 including <a href="../keymap/vim.js">keymap/vim.js</a> and setting
-the <code>keyMap</code> option to <code>"vim"</code>. Because
-CodeMirror's internal API is quite different from Vim, they are only
-a loose approximation of actual vim bindings, though.</p>
+the <code>vimMode</code> option to <code>true</code>. This will also
+automatically change the <code>keyMap</code> option to <code>"vim"</code>.
+Because CodeMirror's internal API is quite different from Vim, they are only a
+loose approximation of actual vim bindings, though.</p>
 
     <script>
       CodeMirror.commands.save = function(){ alert("Saving"); };

From bc6d7db3ec11b02fd8e9d1ec7999d31bfeac98a7 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 18 Mar 2014 22:39:22 +0100
Subject: [PATCH 1126/4742] [vim] Update documentation to better reflect vim
 mode maturity

---
 demo/vim.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index f7445ed6c6..0918bce45b 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -52,9 +52,11 @@ <h2>Vim bindings demo</h2>
 <p>The vim keybindings are enabled by
 including <a href="../keymap/vim.js">keymap/vim.js</a> and setting
 the <code>vimMode</code> option to <code>true</code>. This will also
-automatically change the <code>keyMap</code> option to <code>"vim"</code>.
-Because CodeMirror's internal API is quite different from Vim, they are only a
-loose approximation of actual vim bindings, though.</p>
+automatically change the <code>keyMap</code> option to <code>"vim"</code>.</p>
+
+<p>Note that while the vim mode tries to emulate the most useful features of
+vim as faithfully as possible, it does not strive to become a complete vim
+implementation</p>
 
     <script>
       CodeMirror.commands.save = function(){ alert("Saving"); };

From f903d6e802802854d66d84b759f0c4348fb77731 Mon Sep 17 00:00:00 2001
From: dignifiedquire <dignifiedquire@gmail.com>
Date: Wed, 19 Mar 2014 12:17:45 +0100
Subject: [PATCH 1127/4742] Only call signalLater for "markerCleared" if cm
 exists.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e106648583..f890304b10 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3904,7 +3904,7 @@ window.CodeMirror = (function() {
       this.doc.cantEdit = false;
       if (cm) reCheckSelection(cm);
     }
-    signalLater(cm, "markerCleared", cm, this);
+    if (cm) signalLater(cm, "markerCleared", cm, this);
     if (withOp) endOperation(cm);
   };
 

From 7e53bcce830c432bbd8a85247db8770c269e7b96 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Mar 2014 12:47:03 +0100
Subject: [PATCH 1128/4742] Only call signalLater for "markerAdded" when cm
 exists

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f890304b10..026ec7533b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4013,8 +4013,8 @@ window.CodeMirror = (function() {
       if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.collapsed)
         regChange(cm, from.line, to.line + 1);
       if (marker.atomic) reCheckSelection(cm);
+      signalLater(cm, "markerAdded", cm, marker);
     }
-    signalLater(cm, "markerAdded", cm, marker);
     return marker;
   }
 

From c563bc9d7f82ebfcbead98f8ebdd27e96dabcb4b Mon Sep 17 00:00:00 2001
From: dignifiedquire <dignifiedquire@gmail.com>
Date: Wed, 19 Mar 2014 12:17:45 +0100
Subject: [PATCH 1129/4742] Only call signalLater for "markerCleared" if cm
 exists.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0fc68da3b9..002994f3d2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4822,7 +4822,7 @@
       this.doc.cantEdit = false;
       if (cm) reCheckSelection(cm.doc);
     }
-    signalLater(cm, "markerCleared", cm, this);
+    if (cm) signalLater(cm, "markerCleared", cm, this);
     if (withOp) endOperation(cm);
   };
 

From 9d8070161f1b38de56847c0f751cf88882505074 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Mar 2014 12:47:03 +0100
Subject: [PATCH 1130/4742] Only call signalLater for "markerAdded" when cm
 exists

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 002994f3d2..ae4de0b718 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4953,8 +4953,8 @@
       else if (marker.className || marker.title || marker.startStyle || marker.endStyle)
         for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
       if (marker.atomic) reCheckSelection(cm.doc);
+      signalLater(cm, "markerAdded", cm, marker);
     }
-    signalLater(cm, "markerAdded", cm, marker);
     return marker;
   }
 

From 3f695290630d5ebe7547111069fa174ece45408e Mon Sep 17 00:00:00 2001
From: Josh Watzman <jwatzman@fb.com>
Date: Tue, 18 Mar 2014 15:12:52 -0700
Subject: [PATCH 1131/4742] [show-hint addon] Fix race with async enabled

Summary: If `options.async` is enabled, it's possible for `activity` to
be called a second time before the first call's paired `finishUpdate` is
triggered. Then, when the second call to `finishUpdate` happens, the
still-active widget in `completion.widget` is unceremoneously
overwritten and can now never be closed. This leads to a lot of weird
and broken behavior, notably an autocomplete window in the browser that
never goes away and can insert its text over and over and over.

Test Plan: This is really hard to trigger. My project consists of a
webworker providing autocomplete, which has some latency before it calls
the `finishUpdate` callback. But it depends on the exact latency and
even the user's typing speed to whether things happen in just the right
order. I basically just added and deleted characters with the
autocomplete prompt open a bunch until it eventually reproduced. After
applying this patch, several minutes of bashing didn't trigger the issue
again.
---
 addon/hint/show-hint.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 9b143fdd04..c9f2dd1ef9 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -93,6 +93,7 @@
         data = data_;
         if (finished) return;
         if (!data || !data.list.length) return done();
+        if (completion.widget) completion.widget.close();
         completion.widget = new Widget(completion, data);
       }
 

From 690226b34d762a6655737efca8a95d982733d188 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Mar 2014 14:35:31 +0100
Subject: [PATCH 1132/4742] Remove showIfHidden option to addLineWidget

(It wasn't working in the first place.)
---
 doc/manual.html     |  3 ---
 doc/upgrade_v4.html | 11 +++++++++++
 lib/codemirror.js   |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 5295ec79ea..d20d07424e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1644,9 +1644,6 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
           <dt><code><strong>above</strong>: boolean</code></dt>
           <dd>Causes the widget to be placed above instead of below
           the text of the line.</dd>
-          <dt><code><strong>showIfHidden</strong>: boolean</code></dt>
-          <dd>When true, will cause the widget to be rendered even if
-          the line it is associated with is hidden.</dd>
           <dt><code><strong>handleMouseEvents</strong>: boolean</code></dt>
           <dd>Determines whether the editor will capture mouse and
           drag events occurring in this widget. Default is false—the
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index 88a02066d1..9680151a0b 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -19,6 +19,7 @@
     <li><a href="#beforeSelectionChange">The beforeSelectionChange event</a>
     <li><a href="#replaceSelection">replaceSelection and collapsing</a>
     <li><a href="#changeEvent">change event data</a>
+    <li><a href="#showIfHidden">showIfHidden option to line widgets</a>
     <li><a href="#module">Module loaders</a>
     <li><a href="#shareddata">Mutating shared data structures</a></li>
     <li><a href="#deprecated">Deprecated interfaces dropped</a>
@@ -82,6 +83,16 @@ <h2 id=upgrade>Upgrading to version 4</h2>
 
 </section>
 
+<section id=showIfHidden><h2>showIfHidden option to line widgets</h2>
+
+<p>This option, which conceptually caused line widgets to be visible
+even if their line was hidden, was never really well-defined, and was
+buggy from the start. It would be a rather expensive feature, both in
+code complexity and run-time performance, to implement properly. It
+has been dropped entirely in 4.0.</p>
+
+</section>
+
 <section id=module><h2>Module loaders</h2>
 
 <p>All modules in the CodeMirror distribution are now wrapped in a
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ae4de0b718..e9896eea50 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5371,7 +5371,7 @@
       if (widget.insertAt == null) widgets.push(widget);
       else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
       widget.line = line;
-      if (!lineIsHidden(cm.doc, line) || widget.showIfHidden) {
+      if (!lineIsHidden(cm.doc, line)) {
         var aboveVisible = heightAtLine(line) < cm.doc.scrollTop;
         updateLineHeight(line, line.height + widgetHeight(widget));
         if (aboveVisible) addToScrollPos(cm, null, widget.height);

From 7c9097982aefe3336908bf9bb0366b9c7e558fc0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Mar 2014 14:49:30 +0100
Subject: [PATCH 1133/4742] Notice height changes outside of viewport, update
 scrollbar whey they happen

---
 lib/codemirror.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e9896eea50..1a4369ef04 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -69,6 +69,7 @@
 
     var doc = options.value;
     if (typeof doc == "string") doc = new Doc(doc, options.mode);
+    this.doc = doc;
 
     var display = this.display = new Display(place, doc);
     display.wrapper.CodeMirror = this;
@@ -1864,6 +1865,7 @@
   function startOperation(cm) {
     cm.curOp = {
       viewChanged: false,      // Flag that indicates that lines might need to be redrawn
+      startHeight: cm.doc.height, // Used to detect need to update scrollbar
       forceUpdate: false,      // Used to force a redraw
       updateInput: null,       // Whether to reset the input textarea
       typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
@@ -1895,6 +1897,7 @@
     }
     // If no update was run, but the selection changed, redraw that.
     if (!updated && op.selectionChanged) updateSelection(cm);
+    if (!updated && op.startHeight != cm.doc.height) updateScrollbars(cm);
 
     // Propagate the scroll position to the actual DOM scroller
     if (op.scrollTop != null && display.scroller.scrollTop != op.scrollTop) {

From 6095fbf3bf7bb3d678dc3e4cb09a4097b86d38c2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Mar 2014 15:13:31 +0100
Subject: [PATCH 1134/4742] Fix lineAtHeight when asking past end, but last
 line is collapsed

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 026ec7533b..0b3c231d3e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3063,7 +3063,7 @@ window.CodeMirror = (function() {
       else if (line > last) { line = last; end = true; }
       var lineObj = getLine(this.doc, line);
       return intoCoordSystem(this, getLine(this.doc, line), {top: 0, left: 0}, mode || "page").top +
-        (end ? lineObj.height : 0);
+        (end ? this.doc.height - heightAtLine(this, lineObj) : 0);
     },
 
     defaultTextHeight: function() { return textHeight(this.display); },

From 3d7cf66d4a2cab58b7686b4bd3d4c19544adbe51 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Mar 2014 15:16:14 +0100
Subject: [PATCH 1135/4742] Fix lineAtHeight when asking past end, but last
 line is collapsed

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1a4369ef04..443b443917 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3915,8 +3915,8 @@
       if (line < this.doc.first) line = this.doc.first;
       else if (line > last) { line = last; end = true; }
       var lineObj = getLine(this.doc, line);
-      return intoCoordSystem(this, getLine(this.doc, line), {top: 0, left: 0}, mode || "page").top +
-        (end ? lineObj.height : 0);
+      return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
+        (end ? this.doc.height - heightAtLine(lineObj) : 0);
     },
 
     defaultTextHeight: function() { return textHeight(this.display); },

From 26bb8c4dfd6f8b47b396ed9c221d20a82c05a2e9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 08:09:07 +0100
Subject: [PATCH 1136/4742] [sublime keymap] Make Esc behavior conform to
 Sublime Text

Closes #2348
---
 keymap/sublime.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index a739ddc826..7515cfa589 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -72,6 +72,11 @@
 
   map["Shift-Tab"] = "indentLess";
 
+  cmds[map["Esc"] = "singleSelectionTop"] = function(cm) {
+    var range = cm.listSelections()[0];
+    cm.setSelection(range.anchor, range.head, {scroll: false});
+  };
+
   cmds[map[ctrl + "L"] = "selectLine"] = function(cm) {
     var ranges = cm.listSelections(), extended = [];
     for (var i = 0; i < ranges.length; i++) {

From bdb0f16f2a5dfcbbc6ef62fdb2b8d3f4acf44e04 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 10:35:36 +0100
Subject: [PATCH 1137/4742] Improve handling of changing widget height in
 changed() method

Issue #2355
---
 lib/codemirror.js | 70 ++++++++++++++++++++++++++++++-----------------
 test/test.js      | 22 +++++++++++++++
 2 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 443b443917..cac613e518 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2367,8 +2367,7 @@
     // structures. Here we poll to unregister it when the editor is no
     // longer in the document, so that it can be garbage-collected.
     function unregister() {
-      for (var p = d.wrapper.parentNode; p && p != document.body; p = p.parentNode) {}
-      if (p) setTimeout(unregister, 5000);
+      if (contains(document.body, d.wrapper)) setTimeout(unregister, 5000);
       else off(window, "resize", onResize);
     }
     setTimeout(unregister, 5000);
@@ -4855,19 +4854,24 @@
   // Signals that the marker's widget changed, and surrounding layout
   // should be recomputed.
   TextMarker.prototype.changed = function() {
-    var pos = this.find(-1, true), cm = this.doc.cm;
+    var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
     if (!pos || !cm) return;
-    var line = pos.line, lineN = lineNo(pos.line);
-    var view = findViewForLine(cm, lineN);
-    if (view) clearLineMeasurementCacheFor(view);
-    if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) {
-      var lineView = cm.display.view[findViewIndex(cm, lineN)];
-      if (!lineView.hidden && lineView.node && lineView.node.offsetHeight != line.height)
-        updateLineHeight(line, lineView.node.offsetHeight);
-      runInOp(cm, function() {
-        cm.curOp.selectionChanged = cm.curOp.forceUpdate = cm.curOp.updateMaxLine = true;
-      });
-    }
+    runInOp(cm, function() {
+      var line = pos.line, lineN = lineNo(pos.line);
+      var view = findViewForLine(cm, lineN);
+      if (view) {
+        clearLineMeasurementCacheFor(view);
+        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
+      }
+      cm.curOp.updateMaxLine = true;
+      if (!lineIsHidden(widget.doc, line) && widget.height != null) {
+        var oldHeight = widget.height;
+        widget.height = null;
+        var dHeight = widgetHeight(widget) - oldHeight;
+        if (dHeight)
+          updateLineHeight(line, line.height + dHeight);
+      }
+    });
   };
 
   TextMarker.prototype.attachLine = function(line) {
@@ -5339,29 +5343,38 @@
   };
   eventMixin(LineWidget);
 
+  function adjustScrollWhenAboveVisible(cm, line, diff) {
+    if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
+      addToScrollPos(cm, null, diff);
+  }
+
   LineWidget.prototype.clear = function() {
-    var cm = this.cm, ws = this.line.widgets, no = lineNo(this.line);
+    var cm = this.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
     if (no == null || !ws) return;
     for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
-    if (!ws.length) this.line.widgets = null;
-    var aboveVisible = heightAtLine(this.line) < cm.doc.scrollTop;
-    updateLineHeight(this.line, Math.max(0, this.line.height - widgetHeight(this)));
-    if (aboveVisible) addToScrollPos(cm, null, -this.height);
-    runInOp(cm, function() { regLineChange(cm, no, "widget"); });
+    if (!ws.length) line.widgets = null;
+    var height = widgetHeight(this);
+    runInOp(cm, function() {
+      adjustScrollWhenAboveVisible(cm, line, -height);
+      regLineChange(cm, no, "widget");
+      updateLineHeight(line, Math.max(0, line.height - height));
+    });
   };
   LineWidget.prototype.changed = function() {
-    var oldH = this.height, cm = this.cm;
+    var oldH = this.height, cm = this.cm, line = this.line;
     this.height = null;
     var diff = widgetHeight(this) - oldH;
     if (!diff) return;
-    updateLineHeight(this.line, this.line.height + diff);
-    var no = lineNo(this.line);
-    runInOp(cm, function() { regLineChange(cm, no, "widget"); });
+    runInOp(cm, function() {
+      cm.curOp.forceUpdate = true;
+      adjustScrollWhenAboveVisible(cm, line, diff);
+      updateLineHeight(line, line.height + diff);
+    });
   };
 
   function widgetHeight(widget) {
     if (widget.height != null) return widget.height;
-    if (!widget.node.parentNode || widget.node.parentNode.nodeType != 1)
+    if (!contains(document.body, widget.node))
       removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, "position: relative"));
     return widget.height = widget.node.offsetHeight;
   }
@@ -6923,6 +6936,13 @@
     return removeChildren(parent).appendChild(e);
   }
 
+  function contains(parent, child) {
+    if (parent.contains)
+      return parent.contains(child);
+    while (child = child.parentNode)
+      if (child == parent) return true;
+  }
+
   function activeElt() { return document.activeElement; }
   // Older versions of IE throws unspecified error when touching
   // document.activeElement in some cases (during loading, in iframe)
diff --git a/test/test.js b/test/test.js
index a4caa47a8f..b1b5594d2d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1407,6 +1407,28 @@ testCM("lineWidgetCautiousRedraw", function(cm) {
   is(!redrawn);
 }, {value: "123\n456"});
 
+testCM("lineWidgetChanged", function(cm) {
+  addDoc(cm, 2, 300);
+  cm.setSize(null, cm.defaultTextHeight() * 50);
+  cm.scrollTo(null, cm.heightAtLine(125, "local"));
+  function w() {
+    var node = document.createElement("div");
+    node.style.cssText = "background: yellow; height: 50px;";
+    return node;
+  }
+  var info0 = cm.getScrollInfo();
+  var w0 = cm.addLineWidget(0, w());
+  var w150 = cm.addLineWidget(150, w());
+  var w300 = cm.addLineWidget(300, w());
+  var info1 = cm.getScrollInfo();
+  eq(info0.height + 150, info1.height);
+  eq(info0.top + 50, info1.top);
+  w0.node.style.height = w150.node.style.height = w300.node.style.height = "10px";
+  w0.changed(); w150.changed(); w300.changed();
+  var info2 = cm.getScrollInfo();
+  eq(info0.height + 30, info2.height);
+  eq(info0.top + 10, info2.top);
+});
 
 testCM("getLineNumber", function(cm) {
   addDoc(cm, 2, 20);

From 337e9771ab7f649b8c1f4abfce5c3346180610b5 Mon Sep 17 00:00:00 2001
From: B Krishna Chaitanya <bkchaitan94@gmail.com>
Date: Mon, 10 Mar 2014 22:27:43 +0530
Subject: [PATCH 1138/4742] [sublime keymap] Ctrl+d should go back to top after
 reaching bottom

---
 keymap/sublime.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 7515cfa589..48e255347e 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -129,6 +129,11 @@
       var cur = cm.getSearchCursor(fullWord ? new RegExp("\\b" + query + "\\b") : query, to);
       if (cur.findNext())
         cm.addSelection(cur.from(), cur.to());
+      else{
+        cur = cm.getSearchCursor(fullWord ? new RegExp("\\b" + query + "\\b") : query, Pos(cm.firstLine(),0));
+        if (cur.findNext())
+          cm.addSelection(cur.from(), cur.to());
+      }
     }
     if (fullWord)
       cm.state.sublimeFindFullWord = cm.doc.sel;

From f55a1364b066e8a9248a5d49ab8345d024da29b0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 10:44:15 +0100
Subject: [PATCH 1139/4742] [sublime keymap] Touch up
 337e9771ab7f649b8c1f4abfce5c3346180610b5

---
 keymap/sublime.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 48e255347e..4d9211533e 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -125,12 +125,13 @@
       cm.setSelection(word.from, word.to);
       fullWord = true;
     } else {
-      var query = cm.getRange(from, to);
-      var cur = cm.getSearchCursor(fullWord ? new RegExp("\\b" + query + "\\b") : query, to);
-      if (cur.findNext())
+      var text = cm.getRange(from, to);
+      var query = fullWord ? new RegExp("\\b" + text + "\\b") : text;
+      var cur = cm.getSearchCursor(query, to);
+      if (cur.findNext()) {
         cm.addSelection(cur.from(), cur.to());
-      else{
-        cur = cm.getSearchCursor(fullWord ? new RegExp("\\b" + query + "\\b") : query, Pos(cm.firstLine(),0));
+      } else {
+        cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0));
         if (cur.findNext())
           cm.addSelection(cur.from(), cur.to());
       }

From b593ebb825888218f6f5379a26f98ad3c5af5547 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 10:52:09 +0100
Subject: [PATCH 1140/4742] Fix typo in compression helper

---
 doc/compress.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/compress.html b/doc/compress.html
index cb1dfcc9e6..a1d9da3ccd 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -112,7 +112,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/jade/jade.js">jade.js</option>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
-          <option value="http://codemirror.net/mode/julia/julia.js">jinja2.js</option>
+          <option value="http://codemirror.net/mode/julia/julia.js">julia.js</option>
           <option value="http://codemirror.net/mode/livescript/livescript.js">livescript.js</option>
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>

From e113da8bf2908687dc595ecc5b55c5ca5201a0e0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 11:23:13 +0100
Subject: [PATCH 1141/4742] Mark release 3.23

---
 AUTHORS           | 11 +++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 9af00e54e4..ebf4a96dc9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,14 +3,17 @@ List of CodeMirror contributors. Updated before every release.
 4r2r
 Aaron Brooks
 Abe Fettig
+Adam Ahmed
 Adam King
 adanlobato
 Adán Lobato
+Adrian Aichner
 aeroson
 Ahmad Amireh
 Ahmad M. Zawawi
 ahoward
 Akeksandr Motsjonov
+Alberto González Palomo
 Alberto Pose
 Albert Xing
 Alexander Pavlov
@@ -46,6 +49,7 @@ Benjamin DeCoste
 Ben Keen
 Bernhard Sirlinger
 Billy Moon
+binny
 Blaine G
 boomyjee
 borawjm
@@ -79,6 +83,7 @@ David Mignot
 David Pathakjee
 deebugger
 Deep Thought
+dignifiedquire
 domagoj412
 Dominator008
 Domizio Demichelis
@@ -106,6 +111,7 @@ ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
 Frank Wiegand
+Gabriel Horner
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
@@ -164,6 +170,7 @@ Jon Malmaud
 Joost-Wim Boekesteijn
 Joseph Pecoraro
 Joshua Newman
+Josh Watzman
 jots
 jsoojeon
 Juan Benavides Romero
@@ -192,6 +199,7 @@ Luciano Longo
 lynschinzer
 Maksim Lin
 Maksym Taran
+Malay Majithia
 Manuel Rego Casasnovas
 Marat Dreizin
 Marco Aurélio
@@ -238,6 +246,7 @@ ndr
 nerbert
 nextrevision
 nguillaumin
+Ng Zhi An
 Nicholas Bollweg
 Niels van Groningen
 Nikita Beloglazov
@@ -246,6 +255,7 @@ Nikolay Kostov
 nlwillia
 pablo
 Page
+Patil Arpith
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
@@ -307,6 +317,7 @@ Tom MacWright
 Tony Jian
 Travis Heppe
 Triangle717
+twifkak
 Vestimir Markov
 vf
 Volker Mische
diff --git a/doc/compress.html b/doc/compress.html
index d2ac91b1c0..01232b2fe7 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=3.23.0;f=">3.23</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.22.0;f=">3.22</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.20.0;f=">3.20</option>
diff --git a/doc/manual.html b/doc/manual.html
index 5bc7154931..e5cb6363a3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -59,7 +59,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 3.22.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 3.23.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 57514884d7..69a29b30ef 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,6 +28,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 3.x</h2>
 
+  <p class="rel">20-03-2014: <a href="http://codemirror.net/codemirror-3.23.zip">Version 3.23</a>:</p>
+
+  <ul class="rel-note">
+    <li>In the <a href="../mode/xml/index.html">XML mode</a>,
+    add <code>brackets</code> style to angle brackets, fix
+    case-sensitivity of tags for HTML.</li>
+    <li>New mode: <a href="../mode/dylan/index.html">Dylan</a>.</li>
+    <li>Many improvements to the <a href="../demo/vim.html">Vim bindings</a>.</li>
+  </ul>
+
   <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-3.22.zip">Version 3.22</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 53c1bde705..2f0acbff05 100644
--- a/index.html
+++ b/index.html
@@ -84,7 +84,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 3.22</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 3.23</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0b3c231d3e..6f08c9871e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6089,7 +6089,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.22.1";
+  CodeMirror.version = "3.23.0";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 4209057376..734ddbfae5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.22.1",
+    "version":"3.23.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 8d87f56b80810e150aa604522dcde25d0e749d02 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 11:24:07 +0100
Subject: [PATCH 1142/4742] Bump version number post-3.23

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index e5cb6363a3..516ace716a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -59,7 +59,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 3.23.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 3.23.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6f08c9871e..f5ac3f704b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6089,7 +6089,7 @@ window.CodeMirror = (function() {
 
   // THE END
 
-  CodeMirror.version = "3.23.0";
+  CodeMirror.version = "3.23.1";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 734ddbfae5..6ef41787be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"3.23.0",
+    "version":"3.23.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 9d6fa77818f8bd9b90d2cc3d6e7566373f4a3809 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 11:37:40 +0100
Subject: [PATCH 1143/4742] Mark release 4.0

---
 AUTHORS           |  1 +
 doc/compress.html |  3 +--
 doc/manual.html   |  2 +-
 doc/releases.html | 22 +++++++++++++---------
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index be29dbbf2d..a7e3335b45 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -84,6 +84,7 @@ David Mignot
 David Pathakjee
 deebugger
 Deep Thought
+dignifiedquire
 domagoj412
 Dominator008
 Domizio Demichelis
diff --git a/doc/compress.html b/doc/compress.html
index a1d9da3ccd..ebe81723c8 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,8 +33,7 @@ <h2>Script compression helper</h2>
       <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=4.0.2;f=">4.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.1;f=">4.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.3;f=">4.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.22.0;f=">3.22</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.20.0;f=">3.20</option>
diff --git a/doc/manual.html b/doc/manual.html
index d20d07424e..09a7362c35 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 4.0.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.0.3</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 0a2551984f..16958c697f 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,17 +28,21 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
-  <p class="rel">17-03-2014: <a href="http://codemirror.net/codemirror-4.0rc2.zip">Version 4.0 release candidate 2</a>:</p>
+  <p class="rel">20-03-2014: <a href="http://codemirror.net/codemirror-4.0.zip">Version 4.0</a>:</p>
 
-  <p class="rel-note">Second release candidate for 4.0. Fixes some
-  context menu bugs, a wheel-scrolling glitch, and several missing
-  cases in the Sublime Text bindings.</p>
+  <p class="rel-note">This is a new major version of CodeMirror. There
+  are a few <strong>incompatible</strong> changes in the API. Upgrade
+  with care, and read the <a href="upgrade_v4.html">upgrading
+  guide</a>.</p>
 
-  <p class="rel">10-03-2014: <a href="http://codemirror.net/codemirror-4.0rc1.zip">Version 4.0 release candidate 1</a>:</p>
-
-  <p class="rel-note">First release candidate for 4.0, which supports
-  multiple selections, selection undo, and improved (faster, less
-  kludgy) character measuring.</p>
+  <ul class="rel-note">
+    <li>Multiple selections (ctrl-click, alt-drag, <a href="manual.html#setSelections">API</a>).</li>
+    <li>Sublime Text <a href="../demo/sublime.html">bindings</a>.</li>
+    <li><a href="manual.html#modloader">Module loader shims</a> wrapped around all modules.</li>
+    <li>Selection <a href="manual.html#command_undoSelection">undo</a>/<a href="manual.html#command_redoSelection">redo</a>.</li>
+    <li>Improved character measuring (faster, handles wrapped lines more robustly).</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.23.0...4.0.3">list of patches</a>.</li>
+  </ul>
 
   <h2>Version 3.x</h2>
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index cac613e518..c3205cc189 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7333,7 +7333,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.0.2";
+  CodeMirror.version = "4.0.3";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 7ee1d9e508..496581b179 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.0.2",
+    "version":"4.0.3",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 2af72ea8a6e489a21e6b0e3f7168f058bffb64ee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 11:39:15 +0100
Subject: [PATCH 1144/4742] Bump version number post-4.0

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 09a7362c35..2fe8b703aa 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 4.0.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.0.4</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c3205cc189..744cca2596 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7333,7 +7333,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.0.3";
+  CodeMirror.version = "4.0.4";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 496581b179..39946f35f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.0.3",
+    "version":"4.0.4",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 7c0d2080cf519f4afa3b53fb92667cf0015b5ff4 Mon Sep 17 00:00:00 2001
From: Bert Chang <jrweizhang@gmail.com>
Date: Mon, 17 Mar 2014 20:00:42 +0800
Subject: [PATCH 1145/4742] [vim] Use matchbracket.js for text objects

---
 addon/edit/matchbrackets.js | 11 ++++---
 demo/vim.html               |  3 ++
 keymap/vim.js               | 59 ++++++++++++++++++++++++++-----------
 test/vim_test.js            |  7 +++++
 4 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 576ec143aa..96415b8d8d 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -26,11 +26,14 @@
             match: found && found.ch == match.charAt(0), forward: dir > 0};
   }
 
-  function scanForBracket(cm, where, dir, style, config) {
+  // specifiedRegExp is used to specify which type of bracket to scan
+  // should be a regexp, e.g. /[[\]]/
+  function scanForBracket(cm, where, dir, style, config, specifiedRegExp) {
     var maxScanLen = (config && config.maxScanLineLength) || 10000;
     var maxScanLines = (config && config.maxScanLines) || 500;
 
-    var stack = [], re = /[(){}[\]]/;
+    var stack = [];
+    var re = typeof specifiedRegExp == "undefined" ? /[(){}[\]]/ : specifiedRegExp;
     var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
                           : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
     for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
@@ -102,7 +105,7 @@
   CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
     return findMatchingBracket(this, pos, strict);
   });
-  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style){
-    return scanForBracket(this, pos, dir, style);
+  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, specifiedRegExp){
+    return scanForBracket(this, pos, dir, style, null, specifiedRegExp);
   });
 });
diff --git a/demo/vim.html b/demo/vim.html
index 0918bce45b..ad34660892 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -10,6 +10,7 @@
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/search/searchcursor.js"></script>
 <script src="../mode/clike/clike.js"></script>
+<script src="../addon/edit/matchbrackets.js"></script>
 <script src="../keymap/vim.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
@@ -64,12 +65,14 @@ <h2>Vim bindings demo</h2>
         lineNumbers: true,
         mode: "text/x-csrc",
         vimMode: true,
+        matchBrackets: true,
         showCursorWhenSelecting: true
       });
       var editor2 = CodeMirror.fromTextArea(document.getElementById("code2"), {
         lineNumbers: true,
         mode: "text/x-csrc",
         vimMode: true,
+        matchBrackets: true,
         showCursorWhenSelecting: true
       });
     </script>
diff --git a/keymap/vim.js b/keymap/vim.js
index 73ede4fdac..b1123493c2 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -58,9 +58,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"));
+    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/edit/matchbrackets.js"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog"], mod);
+    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/edit/matchbrackets"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
@@ -1671,7 +1671,7 @@
 
         var tmp;
         if (mirroredPairs[character]) {
-          tmp = selectCompanionObject(cm, mirroredPairs[character], inclusive);
+          tmp = selectCompanionObject(cm, character, inclusive);
         } else if (selfPaired[character]) {
           tmp = findBeginningAndEnd(cm, character, inclusive);
         } else if (character === 'W') {
@@ -2711,6 +2711,11 @@
         '[': ']', ']': '[',
         '{': '}', '}': '{'})[symb];
 
+      // Try to match the current char under cursor first
+      if (cm.getLine(line).charAt(ch) === reverseSymb) {
+        return cur;
+      }
+
       // Couldn't find a matching symbol, abort
       if (!reverseSymb) {
         return cur;
@@ -2758,22 +2763,42 @@
 
     // TODO: perhaps this finagling of start and end positions belonds
     // in codmirror/replaceRange?
-    function selectCompanionObject(cm, revSymb, inclusive) {
-      var cur = copyCursor(cm.getCursor());
-      var end = findMatchedSymbol(cm, cur, revSymb);
-      var start = findMatchedSymbol(cm, end);
-
-      if ((start.line == end.line && start.ch > end.ch)
-          || (start.line > end.line)) {
-        var tmp = start;
-        start = end;
-        end = tmp;
-      }
+    function selectCompanionObject(cm, symb, inclusive) {
+      var cur = cm.getCursor(), start, end;
 
-      if (inclusive) {
-        end.ch += 1;
+      var specifiedRegExp = ({
+        '(': /[()]/, ')': /[()]/,
+        '[': /[[\]]/, ']': /[[\]]/,
+        '{': /[{}]/, '}': /[{}]/})[symb];
+      var openSym = ({
+        '(': '(', ')': '(',
+        '[': '[', ']': '[',
+        '{': '{', '}': '{'})[symb];
+      var curChar = cm.getLine(cur.line).charAt(cur.ch);
+      var offset = curChar === openSym ? 1 : 0;
+
+      start = cm.scanForBracket(Pos(cur.line, cur.ch+offset), -1, null, specifiedRegExp);
+      end   = cm.scanForBracket(Pos(cur.line, cur.ch+offset), 1, null, specifiedRegExp);
+
+      if (typeof start == "undefined" || typeof end == "undefined") {
+        start = cur;
+        end   = cur;
       } else {
-        start.ch += 1;
+        start = start.pos;
+        end   = end.pos;
+
+        if ((start.line == end.line && start.ch > end.ch)
+            || (start.line > end.line)) {
+          var tmp = start;
+          start = end;
+          end = tmp;
+        }
+
+        if (inclusive) {
+          end.ch += 1;
+        } else {
+          start.ch += 1;
+        }
       }
 
       return { start: start, end: end };
diff --git a/test/vim_test.js b/test/vim_test.js
index 4962e39399..104707d269 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1028,6 +1028,13 @@ testEdit('di)_close_spc', 'foo (bAr) baz', /\)/, 'di)', 'foo () baz');
 testEdit('da(_close_spc', 'foo (bAr) baz', /\)/, 'da(', 'foo  baz');
 testEdit('da)_close_spc', 'foo (bAr) baz', /\)/, 'da)', 'foo  baz');
 
+testEdit('da{_on_{_should_delete_inner_block', 'o{ in{abc} }', /{a/, 'da{', 'o{ in }');
+testEdit('di[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'di[', 'foo (bAr) baz');
+testEdit('di[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'di[', 'foo (bAr) baz');
+testEdit('da[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'da[', 'foo (bAr) baz');
+testEdit('da[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'da[', 'foo (bAr) baz');
+testMotion('di(_outside_should_stay', ['d', 'i', '('], { line: 0, ch: 0}, { line: 0, ch: 0});
+
 //  Open and close on different lines, equally indented
 testEdit('di{_middle_spc', 'a{\n\tbar\n}b', /r/, 'di{', 'a{}b');
 testEdit('di}_middle_spc', 'a{\n\tbar\n}b', /r/, 'di}', 'a{}b');

From 0820321cf07e79682b0bf74bf583e6798da6f52c Mon Sep 17 00:00:00 2001
From: Bert Chang <jrweizhang@gmail.com>
Date: Thu, 20 Mar 2014 20:35:01 +0800
Subject: [PATCH 1146/4742] [matchbrackets addon] Add comment to matchbrackets'
 scanForBracket.

---
 addon/edit/matchbrackets.js | 2 ++
 keymap/vim.js               | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 96415b8d8d..e7edf1bdc0 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -28,6 +28,8 @@
 
   // specifiedRegExp is used to specify which type of bracket to scan
   // should be a regexp, e.g. /[[\]]/
+  //
+  // Boundary case: if current cursor is on an open bracket, then the where.ch should add one
   function scanForBracket(cm, where, dir, style, config, specifiedRegExp) {
     var maxScanLen = (config && config.maxScanLineLength) || 10000;
     var maxScanLines = (config && config.maxScanLines) || 500;
diff --git a/keymap/vim.js b/keymap/vim.js
index b1123493c2..c5342f3068 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2775,6 +2775,7 @@
         '[': '[', ']': '[',
         '{': '{', '}': '{'})[symb];
       var curChar = cm.getLine(cur.line).charAt(cur.ch);
+      // Due to the behavior of scanForBracket, we need an offset in boundary case.
       var offset = curChar === openSym ? 1 : 0;
 
       start = cm.scanForBracket(Pos(cur.line, cur.ch+offset), -1, null, specifiedRegExp);

From a6cdacd18ee92c6cf0bafbb9ed5e3d2c8d63e2eb Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 20 Mar 2014 18:59:37 +0100
Subject: [PATCH 1147/4742] [matchbrackets addon] Cleanup addition of bracket
 regex

---
 addon/edit/matchbrackets.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index e7edf1bdc0..ac8166fd17 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -21,21 +21,21 @@
     if (strict && (dir > 0) != (pos == where.ch)) return null;
     var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
-    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
+    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, null, config);
     return {from: Pos(where.line, pos), to: found && found.pos,
             match: found && found.ch == match.charAt(0), forward: dir > 0};
   }
 
-  // specifiedRegExp is used to specify which type of bracket to scan
+  // bracketRegex is used to specify which type of bracket to scan
   // should be a regexp, e.g. /[[\]]/
   //
-  // Boundary case: if current cursor is on an open bracket, then the where.ch should add one
-  function scanForBracket(cm, where, dir, style, config, specifiedRegExp) {
+  // Note: If "where" is on an open bracket, then this bracket is ignored.
+  function scanForBracket(cm, where, dir, style, bracketRegex, config) {
     var maxScanLen = (config && config.maxScanLineLength) || 10000;
     var maxScanLines = (config && config.maxScanLines) || 500;
 
     var stack = [];
-    var re = typeof specifiedRegExp == "undefined" ? /[(){}[\]]/ : specifiedRegExp;
+    var re = bracketRegex ? bracketRegex : /[(){}[\]]/;
     var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
                           : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
     for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
@@ -107,7 +107,7 @@
   CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
     return findMatchingBracket(this, pos, strict);
   });
-  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, specifiedRegExp){
-    return scanForBracket(this, pos, dir, style, null, specifiedRegExp);
+  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, bracketRegex){
+    return scanForBracket(this, pos, dir, style, bracketRegex);
   });
 });

From 28c2f3ee0af54db2b62f72fe1a55cd9343167a16 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 20 Mar 2014 19:00:10 +0100
Subject: [PATCH 1148/4742] [vim] Clean up and simplify selectCompanionObject a
 bit

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

diff --git a/keymap/vim.js b/keymap/vim.js
index c5342f3068..3c9eb486e2 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2766,7 +2766,7 @@
     function selectCompanionObject(cm, symb, inclusive) {
       var cur = cm.getCursor(), start, end;
 
-      var specifiedRegExp = ({
+      var bracketRegexp = ({
         '(': /[()]/, ')': /[()]/,
         '[': /[[\]]/, ']': /[[\]]/,
         '{': /[{}]/, '}': /[{}]/})[symb];
@@ -2775,31 +2775,31 @@
         '[': '[', ']': '[',
         '{': '{', '}': '{'})[symb];
       var curChar = cm.getLine(cur.line).charAt(cur.ch);
-      // Due to the behavior of scanForBracket, we need an offset in boundary case.
+      // Due to the behavior of scanForBracket, we need to add an offset if the
+      // cursor is on a matching open bracket.
       var offset = curChar === openSym ? 1 : 0;
 
-      start = cm.scanForBracket(Pos(cur.line, cur.ch+offset), -1, null, specifiedRegExp);
-      end   = cm.scanForBracket(Pos(cur.line, cur.ch+offset), 1, null, specifiedRegExp);
+      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, null, bracketRegexp);
+      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, null, bracketRegexp);
 
-      if (typeof start == "undefined" || typeof end == "undefined") {
-        start = cur;
-        end   = cur;
-      } else {
-        start = start.pos;
-        end   = end.pos;
+      if (!start || !end) {
+        return { start: cur, end: cur };
+      }
 
-        if ((start.line == end.line && start.ch > end.ch)
-            || (start.line > end.line)) {
-          var tmp = start;
-          start = end;
-          end = tmp;
-        }
+      start = start.pos;
+      end = end.pos;
 
-        if (inclusive) {
-          end.ch += 1;
-        } else {
-          start.ch += 1;
-        }
+      if ((start.line == end.line && start.ch > end.ch)
+          || (start.line > end.line)) {
+        var tmp = start;
+        start = end;
+        end = tmp;
+      }
+
+      if (inclusive) {
+        end.ch += 1;
+      } else {
+        start.ch += 1;
       }
 
       return { start: start, end: end };

From 041341b8fc1ea9128975a6bdc3fbdb3abfce0efd Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 20 Mar 2014 21:38:05 +0100
Subject: [PATCH 1149/4742] [mac] Turn mouse cursor into crosshair when Alt
 held

---
 lib/codemirror.css |  1 +
 lib/codemirror.js  | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index d263e44b71..13eb137918 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -250,6 +250,7 @@ div.CodeMirror-cursors {
 
 .CodeMirror-selected { background: #d9d9d9; }
 .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+.CodeMirror-crosshair { cursor: crosshair; }
 
 .cm-searching {
   background: #ffa;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 744cca2596..227fb04a80 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2999,6 +2999,20 @@
       if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
         cm.replaceSelection("", null, "cut");
     }
+    // Turn mouse into crosshair when Alt is held on Mac.
+    var lineDiv = cm.display.lineDiv;
+    function up(e) {
+      if (e.keyCode == 18 || !e.altKey) {
+        lineDiv.className = lineDiv.className.replace(" CodeMirror-crosshair", "");
+        off(document, "keyup", up);
+        off(document, "mouseover", up);
+      }
+    }
+    if (mac && code == 18 && lineDiv.className.search(/\bCodeMirror-crosshair\b/) == -1) {
+      lineDiv.className += " CodeMirror-crosshair";
+      on(document, "keyup", up);
+      on(document, "mouseover", up);
+    }
   }
 
   function onKeyUp(e) {

From 70a71e592c390ed12728a17976555a8b1d9e851d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 22:45:19 +0100
Subject: [PATCH 1150/4742] Clean up c85a138ee21941b04b7838c2e4f40d8ce8ba2cf2

---
 lib/codemirror.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 227fb04a80..703ac2fb68 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2999,8 +2999,16 @@
       if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
         cm.replaceSelection("", null, "cut");
     }
+
     // Turn mouse into crosshair when Alt is held on Mac.
+    if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
+      showCrossHair(cm);
+  }
+
+  function showCrossHair(cm) {
     var lineDiv = cm.display.lineDiv;
+    lineDiv.className += " CodeMirror-crosshair";
+
     function up(e) {
       if (e.keyCode == 18 || !e.altKey) {
         lineDiv.className = lineDiv.className.replace(" CodeMirror-crosshair", "");
@@ -3008,11 +3016,8 @@
         off(document, "mouseover", up);
       }
     }
-    if (mac && code == 18 && lineDiv.className.search(/\bCodeMirror-crosshair\b/) == -1) {
-      lineDiv.className += " CodeMirror-crosshair";
-      on(document, "keyup", up);
-      on(document, "mouseover", up);
-    }
+    on(document, "keyup", up);
+    on(document, "mouseover", up);
   }
 
   function onKeyUp(e) {

From 5b63f3103def1bea42406c3915477365157d3889 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Mar 2014 23:04:11 +0100
Subject: [PATCH 1151/4742] [closebracket addon] Deal more gracefully with
 triple quotes

Issue #2385
---
 addon/edit/closebrackets.js | 52 ++++++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index f48ad881aa..6cabed6eca 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -10,6 +10,8 @@
   var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
   var SPACE_CHAR_REGEX = /\s/;
 
+  var Pos = CodeMirror.Pos;
+
   CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
     if (old != CodeMirror.Init && old)
       cm.removeKeyMap("autoCloseBrackets");
@@ -26,8 +28,8 @@
   });
 
   function charsAround(cm, pos) {
-    var str = cm.getRange(CodeMirror.Pos(pos.line, pos.ch - 1),
-                          CodeMirror.Pos(pos.line, pos.ch + 1));
+    var str = cm.getRange(Pos(pos.line, pos.ch - 1),
+                          Pos(pos.line, pos.ch + 1));
     return str.length == 2 ? str : null;
   }
 
@@ -44,7 +46,7 @@
         }
         for (var i = ranges.length - 1; i >= 0; i--) {
           var cur = ranges[i].head;
-          cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
+          cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
         }
       }
     };
@@ -58,11 +60,17 @@
           var range = ranges[i], cur = range.head, curType;
           if (left == "'" && cm.getTokenTypeAt(cur) == "comment")
             return CodeMirror.Pass;
-          var next = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
+          var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
           if (!range.empty())
             curType = "surround";
-          else if (left == right && next == right)
-            curType = "skip";
+          else if (left == right && next == right) {
+            if (cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == left + left + left)
+              curType = "skipThree";
+            else
+              curType = "skip";
+          } else if (left == right && cur.ch > 1 &&
+                     cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left)
+            curType = "addFour";
           else if (left == right && CodeMirror.isWordChar(next))
             return CodeMirror.Pass;
           else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next))
@@ -73,24 +81,32 @@
           else if (type != curType) return CodeMirror.Pass;
         }
 
-        if (type == "skip") {
-          cm.execCommand("goCharRight");
-        } else if (type == "surround") {
-          var sels = cm.getSelections();
-          for (var i = 0; i < sels.length; i++)
-            sels[i] = left + sels[i] + right;
-          cm.replaceSelections(sels, "around");
-        } else if (type == "both") {
-          cm.replaceSelection(left + right, null);
-          cm.execCommand("goCharLeft");
-        }
+        cm.operation(function() {
+          if (type == "skip") {
+            cm.execCommand("goCharRight");
+          } else if (type == "skipThree") {
+            for (var i = 0; i < 3; i++)
+              cm.execCommand("goCharRight");
+          } else if (type == "surround") {
+            var sels = cm.getSelections();
+            for (var i = 0; i < sels.length; i++)
+              sels[i] = left + sels[i] + right;
+            cm.replaceSelections(sels, "around");
+          } else if (type == "both") {
+            cm.replaceSelection(left + right, null);
+            cm.execCommand("goCharLeft");
+          } else if (type == "addFour") {
+            cm.replaceSelection(left + left + left + left, "before");
+            cm.execCommand("goCharRight");
+          }
+        });
       };
       if (left != right) map["'" + right + "'"] = function(cm) {
         var ranges = cm.listSelections();
         for (var i = 0; i < ranges.length; i++) {
           var range = ranges[i];
           if (!range.empty() ||
-              cm.getRange(range.head, CodeMirror.Pos(range.head.line, range.head.ch + 1)) != right)
+              cm.getRange(range.head, Pos(range.head.line, range.head.ch + 1)) != right)
             return CodeMirror.Pass;
         }
         cm.execCommand("goCharRight");

From f5195dcd4ebbe5ed0f257c9079c44338112a35d5 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 20 Mar 2014 23:07:27 +0100
Subject: [PATCH 1152/4742] [matchbrackets addon] Expose config option

---
 addon/edit/matchbrackets.js | 14 +++++++-------
 keymap/vim.js               |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index ac8166fd17..b889fa3ae5 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -21,7 +21,7 @@
     if (strict && (dir > 0) != (pos == where.ch)) return null;
     var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
-    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, null, config);
+    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
     return {from: Pos(where.line, pos), to: found && found.pos,
             match: found && found.ch == match.charAt(0), forward: dir > 0};
   }
@@ -30,12 +30,12 @@
   // should be a regexp, e.g. /[[\]]/
   //
   // Note: If "where" is on an open bracket, then this bracket is ignored.
-  function scanForBracket(cm, where, dir, style, bracketRegex, config) {
+  function scanForBracket(cm, where, dir, style, config) {
     var maxScanLen = (config && config.maxScanLineLength) || 10000;
     var maxScanLines = (config && config.maxScanLines) || 500;
 
     var stack = [];
-    var re = bracketRegex ? bracketRegex : /[(){}[\]]/;
+    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/;
     var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
                           : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
     for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
@@ -104,10 +104,10 @@
   });
 
   CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
-  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict){
-    return findMatchingBracket(this, pos, strict);
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict, config){
+    return findMatchingBracket(this, pos, strict, config);
   });
-  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, bracketRegex){
-    return scanForBracket(this, pos, dir, style, bracketRegex);
+  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
+    return scanForBracket(this, pos, dir, style, config);
   });
 });
diff --git a/keymap/vim.js b/keymap/vim.js
index 3c9eb486e2..774cc30e28 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2779,8 +2779,8 @@
       // cursor is on a matching open bracket.
       var offset = curChar === openSym ? 1 : 0;
 
-      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, null, bracketRegexp);
-      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, null, bracketRegexp);
+      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, null, {'bracketRegex': bracketRegexp});
+      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, null, {'bracketRegex': bracketRegexp});
 
       if (!start || !end) {
         return { start: cur, end: cur };

From b3414d5a1b8d786b163831ab9082f251351680af Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Mar 2014 11:27:40 +0100
Subject: [PATCH 1153/4742] [upgrade guide] Fix not about 4.0 not being out
 yet. It is.

---
 demo/merge.html     | 26 ++++++++++++++++++++++++++
 doc/upgrade_v4.html |  3 ---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/demo/merge.html b/demo/merge.html
index fc272f0652..d9b7e6b085 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -77,5 +77,31 @@ <h2>merge view demo</h2>
     .replace("white", "purple;\n      font: comic sans;\n      text-decoration: underline;\n      height: 15em");
   initUI(2);
 };
+
+function mergeViewHeight(mergeView) {
+  function editorHeight(editor) {
+    if (!editor) return 0;
+    return editor.getScrollInfo().height;
+  }
+  return Math.max(editorHeight(mergeView.leftOriginal()),
+                  editorHeight(mergeView.editor()),
+                  editorHeight(mergeView.rightOriginal()));
+}
+
+function resize(mergeView) {
+  var height = mergeViewHeight(mergeView);
+  for(;;) {
+    if (mergeView.leftOriginal())
+      mergeView.leftOriginal().setSize(null, height);
+    mergeView.editor().setSize(null, height);
+    if (mergeView.rightOriginal())
+      mergeView.rightOriginal().setSize(null, height);
+
+    var newHeight = mergeViewHeight(mergeView);
+    if (newHeight >= height) break;
+    else height = newHeight;
+  }
+  mergeView.wrap.style.height = height + "px";
+}
 </script>
 </article>
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index 9680151a0b..c35be5b7fc 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -30,9 +30,6 @@
 
 <h2 id=upgrade>Upgrading to version 4</h2>
 
-<p><strong>Note:</strong> Version 4 hasn't been released yet. The
-information here is provisional and might still change.</p>
-
 <p>CodeMirror 4's interface is <em>very</em> close version 3, but it
 does fix a few awkward details in a backwards-incompatible ways. At
 least skim the text below before upgrading.</p>

From bc75b8f834ed6abd4b581aa49702b6dbf668cefb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Mar 2014 12:42:54 +0100
Subject: [PATCH 1154/4742] Keep shared markers consistent when documents are
 linked/unlinked

Issue #2360
---
 lib/codemirror.js | 54 ++++++++++++++++++++++++++++++++++++++---------
 test/doc_test.js  | 23 ++++++++++++++++++++
 2 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 703ac2fb68..e22578ebe1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -63,8 +63,7 @@
 
     this.options = options = options || {};
     // Determine effective options based on given values and defaults.
-    for (var opt in defaults) if (!options.hasOwnProperty(opt))
-      options[opt] = defaults[opt];
+    copyObj(defaults, options, false);
     setGuttersForLineNumbers(options);
 
     var doc = options.value;
@@ -4845,6 +4844,7 @@
     }
     if (cm) signalLater(cm, "markerCleared", cm, this);
     if (withOp) endOperation(cm);
+    if (this.parent) this.parent.clear();
   };
 
   // Find the position of the marker in the document. Returns a {from,
@@ -4924,7 +4924,7 @@
     if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
 
     var marker = new TextMarker(doc, type), diff = cmp(from, to);
-    if (options) copyObj(options, marker);
+    if (options) copyObj(options, marker, false);
     // Don't connect empty markers unless clearWhenEmpty is false
     if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
       return marker;
@@ -4992,10 +4992,8 @@
   var SharedTextMarker = CodeMirror.SharedTextMarker = function(markers, primary) {
     this.markers = markers;
     this.primary = primary;
-    for (var i = 0, me = this; i < markers.length; ++i) {
+    for (var i = 0; i < markers.length; ++i)
       markers[i].parent = this;
-      on(markers[i], "clear", function(){me.clear();});
-    }
   };
   eventMixin(SharedTextMarker);
 
@@ -5025,6 +5023,37 @@
     return new SharedTextMarker(markers, primary);
   }
 
+  function findSharedMarkers(doc) {
+    return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())),
+                         function(m) { return m.parent; });
+  }
+
+  function copySharedMarkers(doc, markers) {
+    for (var i = 0; i < markers.length; i++) {
+      var marker = markers[i], pos = marker.find();
+      var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
+      if (cmp(mFrom, mTo)) {
+        var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
+        marker.markers.push(subMark);
+        subMark.parent = marker;
+      }
+    }
+  }
+
+  function detachSharedMarkers(markers) {
+    for (var i = 0; i < markers.length; i++) {
+      var marker = markers[i], linked = [marker.primary.doc];;
+      linkedDocs(marker.primary.doc, function(d) { linked.push(d); });
+      for (var j = 0; j < marker.markers.length; j++) {
+        var subMarker = marker.markers[j];
+        if (indexOf(linked, subMarker.doc) == -1) {
+          subMarker.parent = null;
+          marker.markers.splice(j--, 1);
+        }
+      }
+    }
+  }
+
   // TEXTMARKER SPANS
 
   function MarkedSpan(marker, from, to) {
@@ -6197,7 +6226,7 @@
       }
       return markers;
     },
-    findMarks: function(from, to) {
+    findMarks: function(from, to, filter) {
       from = clipPos(this, from); to = clipPos(this, to);
       var found = [], lineNo = from.line;
       this.iter(from.line, to.line + 1, function(line) {
@@ -6206,7 +6235,8 @@
           var span = spans[i];
           if (!(lineNo == from.line && from.ch > span.to ||
                 span.from == null && lineNo != from.line||
-                lineNo == to.line && span.from > to.ch))
+                lineNo == to.line && span.from > to.ch) &&
+              (!filter || filter(span.marker)))
             found.push(span.marker.parent || span.marker);
         }
         ++lineNo;
@@ -6264,6 +6294,7 @@
       if (options.sharedHist) copy.history = this.history;
       (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
       copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
+      copySharedMarkers(copy, findSharedMarkers(this));
       return copy;
     },
     unlinkDoc: function(other) {
@@ -6273,6 +6304,7 @@
         if (link.doc != other) continue;
         this.linked.splice(i, 1);
         other.unlinkDoc(this);
+        detachSharedMarkers(findSharedMarkers(this));
         break;
       }
       // If the histories were shared, split them again
@@ -6888,9 +6920,11 @@
     return inst;
   };
 
-  function copyObj(obj, target) {
+  function copyObj(obj, target, overwrite) {
     if (!target) target = {};
-    for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
+    for (var prop in obj)
+      if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
+        target[prop] = obj[prop];
     return target;
   }
 
diff --git a/test/doc_test.js b/test/doc_test.js
index ab0350ebd0..5f242f658d 100644
--- a/test/doc_test.js
+++ b/test/doc_test.js
@@ -320,6 +320,29 @@
     eq(cleared, 1);
   });
 
+  testDoc("sharedMarkerCopy", "A='abcde'", function(a) {
+    var shared = a.markText(Pos(0, 1), Pos(0, 3), {shared: true});
+    var b = a.linkedDoc();
+    var found = b.findMarksAt(Pos(0, 2));
+    eq(found.length, 1);
+    eq(found[0], shared);
+    shared.clear();
+    eq(b.findMarksAt(Pos(0, 2)), 0);
+  });
+
+  testDoc("sharedMarkerDetach", "A='abcde' B<A C<B", function(a, b, c) {
+    var shared = a.markText(Pos(0, 1), Pos(0, 3), {shared: true});
+    a.unlinkDoc(b);
+    var inB = b.findMarksAt(Pos(0, 2));
+    eq(inB.length, 1);
+    is(inB[0] != shared);
+    var inC = c.findMarksAt(Pos(0, 2));
+    eq(inC.length, 1);
+    is(inC[0] != shared);
+    inC[0].clear();
+    is(shared.find());
+  });
+
   testDoc("sharedBookmark", "A='ab\ncd\nef\ngh' B<A C<~A/1-2", function(a, b, c) {
     var mark = b.setBookmark(Pos(1, 1), {shared: true});
     var found = a.findMarksAt(Pos(1, 1));

From 12e3efe4aeff5c02e8299d62a80ec481ea14b6bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Mar 2014 12:58:42 +0100
Subject: [PATCH 1155/4742] Make cut and copy act on whole lines when there is
 no selection

Issue #2382
---
 lib/codemirror.js | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e22578ebe1..d68164f3f1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2401,17 +2401,34 @@
       fastPoll(cm);
     });
 
-    function prepareCopy(e) {
-      if (d.inaccurateSelection) {
-        d.prevInput = "";
-        d.inaccurateSelection = false;
-        d.input.value = cm.getSelection();
-        selectInput(d.input);
+    function prepareCopyCut(e) {
+      if (cm.somethingSelected()) {
+        if (d.inaccurateSelection) {
+          d.prevInput = "";
+          d.inaccurateSelection = false;
+          d.input.value = cm.getSelection();
+          selectInput(d.input);
+        }
+      } else {
+        var text = "", ranges = [];
+        for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
+          var line = cm.doc.sel.ranges[i].head.line;
+          var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
+          ranges.push(lineRange);
+          text += cm.getRange(lineRange.anchor, lineRange.head);
+        }
+        if (e.type == "cut") {
+          cm.setSelections(ranges, null, sel_dontScroll);
+        } else {
+          d.prevInput = "";
+          d.input.value = text;
+          selectInput(d.input);
+        }
       }
       if (e.type == "cut") cm.state.cutIncoming = true;
     }
-    on(d.input, "cut", prepareCopy);
-    on(d.input, "copy", prepareCopy);
+    on(d.input, "cut", prepareCopyCut);
+    on(d.input, "copy", prepareCopyCut);
 
     // Needed to handle Tab key in KHTML
     if (khtml) on(d.sizer, "mouseup", function() {

From ba7fc3e9e899918f559d30080062f654e271fdd6 Mon Sep 17 00:00:00 2001
From: Bert Chang <jrweizhang@gmail.com>
Date: Fri, 21 Mar 2014 20:22:06 +0800
Subject: [PATCH 1156/4742] [vim] Remove findMatchedSymbol and getContextLevel

---
 keymap/vim.js | 78 ++++-----------------------------------------------
 1 file changed, 5 insertions(+), 73 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 774cc30e28..f4a4491fdb 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1619,20 +1619,19 @@
         var ch = cursor.ch;
         var lineText = cm.getLine(line);
         var symbol;
-        var startContext = cm.getTokenAt(cursor).type;
-        var startCtxLevel = getContextLevel(startContext);
         do {
           symbol = lineText.charAt(ch++);
           if (symbol && isMatchableSymbol(symbol)) {
-            var endContext = cm.getTokenAt(Pos(line, ch)).type;
-            var endCtxLevel = getContextLevel(endContext);
-            if (startCtxLevel >= endCtxLevel) {
+            var ignoreStyle = ["string", "comment"];
+            var style = cm.getTokenTypeAt(Pos(line, ch));
+            if (ignoreStyle.indexOf(style) < 0) {
               break;
             }
           }
         } while (symbol);
         if (symbol) {
-          return findMatchedSymbol(cm, Pos(line, ch-1), symbol);
+          var matched = cm.findMatchingBracket(Pos(line, ch-1));
+          return matched.to;
         } else {
           return cursor;
         }
@@ -2694,73 +2693,6 @@
       return idx;
     }
 
-    function getContextLevel(ctx) {
-      return (ctx === 'string' || ctx === 'comment') ? 1 : 0;
-    }
-
-    function findMatchedSymbol(cm, cur, symb) {
-      var line = cur.line;
-      var ch = cur.ch;
-      symb = symb ? symb : cm.getLine(line).charAt(ch);
-
-      var symbContext = cm.getTokenAt(Pos(line, ch + 1)).type;
-      var symbCtxLevel = getContextLevel(symbContext);
-
-      var reverseSymb = ({
-        '(': ')', ')': '(',
-        '[': ']', ']': '[',
-        '{': '}', '}': '{'})[symb];
-
-      // Try to match the current char under cursor first
-      if (cm.getLine(line).charAt(ch) === reverseSymb) {
-        return cur;
-      }
-
-      // Couldn't find a matching symbol, abort
-      if (!reverseSymb) {
-        return cur;
-      }
-
-      // set our increment to move forward (+1) or backwards (-1)
-      // depending on which bracket we're matching
-      var increment = ({'(': 1, '{': 1, '[': 1})[symb] || -1;
-      var endLine = increment === 1 ? cm.lineCount() : -1;
-      var depth = 1, nextCh = symb, index = ch, lineText = cm.getLine(line);
-      // Simple search for closing paren--just count openings and closings till
-      // we find our match
-      // TODO: use info from CodeMirror to ignore closing brackets in comments
-      // and quotes, etc.
-      while (line !== endLine && depth > 0) {
-        index += increment;
-        nextCh = lineText.charAt(index);
-        if (!nextCh) {
-          line += increment;
-          lineText = cm.getLine(line) || '';
-          if (increment > 0) {
-            index = 0;
-          } else {
-            var lineLen = lineText.length;
-            index = (lineLen > 0) ? (lineLen-1) : 0;
-          }
-          nextCh = lineText.charAt(index);
-        }
-        var revSymbContext = cm.getTokenAt(Pos(line, index + 1)).type;
-        var revSymbCtxLevel = getContextLevel(revSymbContext);
-        if (symbCtxLevel >= revSymbCtxLevel) {
-          if (nextCh === symb) {
-            depth++;
-          } else if (nextCh === reverseSymb) {
-            depth--;
-          }
-        }
-      }
-
-      if (nextCh) {
-        return Pos(line, index);
-      }
-      return cur;
-    }
-
     // TODO: perhaps this finagling of start and end positions belonds
     // in codmirror/replaceRange?
     function selectCompanionObject(cm, symb, inclusive) {

From d2a4d2cebb579b2b96da5e02a0937bbfd694eca8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 22 Mar 2014 13:08:45 +0100
Subject: [PATCH 1157/4742] [haxe mode] Add comment styles

---
 mode/haxe/haxe.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 53d7b1d159..8582796404 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -433,7 +433,10 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
       else return lexical.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: "{}"
+    electricChars: "{}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 

From af66a8e64e2295c073c97d0166661605441a787e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 22 Mar 2014 23:54:45 +0100
Subject: [PATCH 1158/4742] Add Bitcoin donation option

---
 doc/docs.css | 4 ++--
 index.html   | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/docs.css b/doc/docs.css
index 01ece719ab..568a730f43 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -139,7 +139,7 @@ section.first {
   z-index: 25;
 }
 
-#bankinfo {
+.bankinfo {
   text-align: left;
   display: none;
   padding: 0 .5em;
@@ -151,7 +151,7 @@ section.first {
   left: 30px;
 }
 
-#bankinfo_close {
+.bankinfo_close {
   position: absolute;
   top: 0; right: 6px;
   font-weight: bold;
diff --git a/index.html b/index.html
index 911382b825..df8098565b 100644
--- a/index.html
+++ b/index.html
@@ -91,10 +91,11 @@ <h2>This is CodeMirror</h2>
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
       <div style="position: relative">
         or <span onclick="document.getElementById('bankinfo').style.display = 'block';" class=quasilink>Bank</span>,
+        <span onclick="document.getElementById('bcinfo').style.display = 'block';" class=quasilink>Bitcoin</span>,
         <a href="https://www.gittip.com/marijnh">Gittip</a>,
         <a href="https://flattr.com/profile/marijnh">Flattr</a><br>
-        <div id=bankinfo>
-          <span id=bankinfo_close onclick="document.getElementById('bankinfo').style.display = '';">×</span>
+        <div id=bankinfo class=bankinfo>
+          <span class=bankinfo_close onclick="document.getElementById('bankinfo').style.display = '';">×</span>
           Bank: <i>Rabobank</i><br/>
           Country: <i>Netherlands</i><br/>
           SWIFT: <i>RABONL2U</i><br/>
@@ -102,6 +103,10 @@ <h2>This is CodeMirror</h2>
           Name: <i>Marijn Haverbeke</i><br/>
           IBAN: <i>NL26 RABO 0147 8507 70</i>
         </div>
+        <div id=bcinfo class=bankinfo>
+          <span class=bankinfo_close onclick="document.getElementById('bcinfo').style.display = '';">×</span>
+          Bitcoin address: 1HVnnU8E9yLPeFyNgNtUPB5deXBvUmZ6Nx
+        </div>
         <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal">
           <input type="hidden" name="cmd" value="_s-xclick"/>
           <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/>

From 97b1153f27ecda84d05844dd635b1d4af3ee6e06 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Mar 2014 11:57:36 +0100
Subject: [PATCH 1159/4742] Add insertSoftTab command

Issue #988
---
 doc/manual.html   | 4 ++++
 lib/codemirror.js | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 2fe8b703aa..3d67530393 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -910,6 +910,10 @@ <h2>Commands</h2>
       <dt class=command id=command_insertTab><code><strong>insertTab</strong></code></dt>
       <dd>Insert a tab character at the cursor.</dd>
 
+      <dt class=command id=command_insertSoftTab><code><strong>insertSoftTab</strong></code></dt>
+      <dd>Insert the amount of spaces that match the width a tab at
+      the cursor position would have.</dd>
+
       <dt class=command id=command_defaultTab><code><strong>defaultTab</strong></code><span class=keybinding>Tab</span></dt>
       <dd>If something is selected, indent it by
       one <a href="#option_indentUnit">indent unit</a>. If nothing is
diff --git a/lib/codemirror.js b/lib/codemirror.js
index d68164f3f1..81afc4c0ae 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4545,6 +4545,15 @@
     indentMore: function(cm) {cm.indentSelection("add");},
     indentLess: function(cm) {cm.indentSelection("subtract");},
     insertTab: function(cm) {cm.replaceSelection("\t");},
+    insertSoftTab: function(cm) {
+      var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
+      for (var i = 0; i < ranges.length; i++) {
+        var pos = ranges[i].from();
+        var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
+        spaces.push(new Array(tabSize - col % tabSize + 1).join(" "));
+      }
+      cm.replaceSelections(spaces);
+    },
     defaultTab: function(cm) {
       if (cm.somethingSelected()) cm.indentSelection("add");
       else cm.execCommand("insertTab");

From 0d698fcd5244092cac151efa2b5c8ce28691757c Mon Sep 17 00:00:00 2001
From: paris <pariskasidiaris@gmail.com>
Date: Mon, 24 Mar 2014 02:09:18 +0000
Subject: [PATCH 1160/4742] [django mode] Add

Added django.js which implements the following modes

  - django (text/x-django)
  - django:inner
---
 doc/compress.html      |  1 +
 mode/django/django.js  | 64 ++++++++++++++++++++++++++++++++++++++++++
 mode/django/index.html | 63 +++++++++++++++++++++++++++++++++++++++++
 mode/index.html        |  1 +
 4 files changed, 129 insertions(+)
 create mode 100644 mode/django/django.js
 create mode 100644 mode/django/index.html

diff --git a/doc/compress.html b/doc/compress.html
index 49dd234e0d..4e4cd4a6ac 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -93,6 +93,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/css/css.js">css.js</option>
           <option value="http://codemirror.net/mode/d/d.js">d.js</option>
           <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
+          <option value="http://codemirror.net/mode/django/django.js">django.js</option>
           <option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
           <option value="http://codemirror.net/mode/dylan/dylan.js">dylan.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
diff --git a/mode/django/django.js b/mode/django/django.js
new file mode 100644
index 0000000000..38de7d5ee3
--- /dev/null
+++ b/mode/django/django.js
@@ -0,0 +1,64 @@
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
+        require("../../addon/mode/overlay"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
+            "../../addon/mode/overlay"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "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",
+                    "else", "import", "with", "endwith", "without", "context", "ifequal", "endifequal",
+                    "ifnotequal", "endifnotequal", "extends", "include", "load", "length", "comment",
+                    "endcomment", "empty"];
+    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
+
+    function tokenBase (stream, state) {
+      stream.eatWhile(/[^\{]/);
+      var ch = stream.next();
+      if (ch == "{") {
+        if (ch = stream.eat(/\{|%|#/)) {
+          state.tokenize = inTag(ch);
+          return "tag";
+        }
+      }
+    }
+    function inTag (close) {
+      if (close == "{") {
+        close = "}";
+      }
+      return function (stream, state) {
+        var ch = stream.next();
+        if ((ch == close) && stream.eat("}")) {
+          state.tokenize = tokenBase;
+          return "tag";
+        }
+        if (stream.match(keywords)) {
+          return "keyword";
+        }
+        return close == "#" ? "comment" : "string";
+      };
+    }
+    return {
+      startState: function () {
+        return {tokenize: tokenBase};
+      },
+      token: function (stream, state) {
+        return state.tokenize(stream, state);
+      }
+    };
+  });
+
+  CodeMirror.defineMode("django", function(config) {
+    var htmlBase = CodeMirror.getMode(config, "text/html");
+    var djangoInner = CodeMirror.getMode(config, "django:inner");
+    return CodeMirror.overlayMode(htmlBase, djangoInner);
+  });
+
+  CodeMirror.defineMIME("text/x-django", "django");
+});
diff --git a/mode/django/index.html b/mode/django/index.html
new file mode 100644
index 0000000000..07963bc611
--- /dev/null
+++ b/mode/django/index.html
@@ -0,0 +1,63 @@
+<!doctype html>
+
+<title>CodeMirror: Django template 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/overlay.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="django.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Django</a>
+  </ul>
+</div>
+
+<article>
+<h2>Django template mode</h2>
+<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>
+</html>
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "django",
+        indentUnit: 4,
+        indentWithTabs: true
+      });
+    </script>
+
+    <p>Mode for HTML with embedded Django template markup.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-django</code></p>
+  </article>
diff --git a/mode/index.html b/mode/index.html
index ecf77de17f..8b043b9cfc 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -40,6 +40,7 @@ <h2>Language modes</h2>
       <li><a href="css/index.html">CSS</a></li>
       <li><a href="python/index.html">Cython</a></li>
       <li><a href="d/index.html">D</a></li>
+      <li><a href="django/index.html">Django</a> (templating language)</li>
       <li><a href="diff/index.html">diff</a></li>
       <li><a href="dtd/index.html">DTD</a></li>
       <li><a href="dylan/index.html">Dylan</a></li>

From 0149b520842f00902d0a0d824d5c4b8518d927d6 Mon Sep 17 00:00:00 2001
From: as3boyan <denis.flash.as3@gmail.com>
Date: Tue, 25 Mar 2014 18:00:33 +0200
Subject: [PATCH 1161/4742] [haxe mode] Fix indentation for types

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

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 8582796404..d7ed7e6568 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -322,6 +322,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
   function typedef (type, value)
   {
   if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
+  else if (type == "type" && /[A-Z]/.test(value.charAt(0))) { return cont(); }
   }
 
   function maybelabel(type) {

From 35eb77422ec53d4b33005a6a506b4a00c92aff74 Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel.horner@gmail.com>
Date: Fri, 14 Mar 2014 12:19:49 -0400
Subject: [PATCH 1162/4742] [vim] Implement indented paste

- Adjusting indent of pasted block to current line
- Handle multi-line case, subsequent lines have their indent adjusted by their offset
to the first line.
- Add two tests for ]p to demonstrate this.
- Add [p to indent paste above
---
 keymap/vim.js    | 17 +++++++++++++++++
 test/vim_test.js | 15 +++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index f4a4491fdb..34a30e0f52 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -208,6 +208,11 @@
     { keys: ['[', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
     { keys: [']', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
     { keys: ['[', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
+    // the next two aren't motions but must come before more general motion declarations
+    { keys: [']', 'p'], type: 'action', action: 'paste', isEdit: true,
+        actionArgs: { after: true, isEdit: true, matchIndent: true}},
+    { keys: ['[', 'p'], type: 'action', action: 'paste', isEdit: true,
+        actionArgs: { after: false, isEdit: true, matchIndent: true}},
     { keys: [']', 'character'], type: 'motion',
         motion: 'moveToSymbol',
         motionArgs: { forward: true, toJumplist: true}},
@@ -2032,6 +2037,18 @@
         if (!text) {
           return;
         }
+        if (actionArgs.matchIndent) {
+          var indent = findFirstNonWhiteSpaceCharacter(cm.getLine(cm.getCursor().line));
+          // chomp last newline b/c don't want it to match /^\s*/gm
+          var chompedText = text.replace(/\n$/, '');
+          var wasChomped = text !== chompedText;
+          var firstIndent = text.match(/^\s*/)[0].length;
+          var text = chompedText.replace(/^\s*/gm, function(wspace) {
+            var newIndent = indent + (wspace.length - firstIndent);
+            return (newIndent < 0) ? "" : Array(newIndent + 1).join(' ');
+          });
+          text += wasChomped ? "\n" : "";
+        }
         if (actionArgs.repeat > 1) {
           var text = Array(actionArgs.repeat + 1).join(text);
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index 104707d269..0117193084 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1243,6 +1243,21 @@ testVim('p_lastline', function(cm, vim, helpers) {
   eq('___\n  a\nd\n  a\nd', cm.getValue());
   helpers.assertCursorAt(1, 2);
 }, { value: '___' });
+testVim(']p_first_indent_is_smaller', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
+  helpers.doKeys(']', 'p');
+  eq('  ___\n  abc\n    def', cm.getValue());
+}, { value: '  ___' });
+testVim(']p_first_indent_is_larger', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '    abc\n  def\n', true);
+  helpers.doKeys(']', 'p');
+  eq('  ___\n  abc\ndef', cm.getValue());
+}, { value: '  ___' });
+testVim('[p', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
+  helpers.doKeys('[', 'p');
+  eq('  abc\n    def\n  ___', cm.getValue());
+}, { value: '  ___' });
 testVim('P', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);

From ebffc6b4db1c0a7e04030db021f1df8b4619aebe Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel.horner@gmail.com>
Date: Fri, 21 Mar 2014 17:36:04 -0400
Subject: [PATCH 1163/4742] [vim] Indented paste respects indentWithTabs and
 tabSize

---
 keymap/vim.js    | 24 ++++++++++++++++++++----
 test/vim_test.js | 10 ++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 34a30e0f52..45bc6ad945 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2038,14 +2038,30 @@
           return;
         }
         if (actionArgs.matchIndent) {
-          var indent = findFirstNonWhiteSpaceCharacter(cm.getLine(cm.getCursor().line));
+          // length that considers tabs and cm.options.tabSize
+          var whitespaceLength = function(str) {
+            var tabs = (str.split("\t").length - 1);
+            var spaces = (str.split(" ").length - 1);
+            return tabs * cm.options.tabSize + spaces * 1;
+          };
+          var currentLine = cm.getLine(cm.getCursor().line);
+          var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
           // chomp last newline b/c don't want it to match /^\s*/gm
           var chompedText = text.replace(/\n$/, '');
           var wasChomped = text !== chompedText;
-          var firstIndent = text.match(/^\s*/)[0].length;
+          var firstIndent = whitespaceLength(text.match(/^\s*/)[0]);
           var text = chompedText.replace(/^\s*/gm, function(wspace) {
-            var newIndent = indent + (wspace.length - firstIndent);
-            return (newIndent < 0) ? "" : Array(newIndent + 1).join(' ');
+            var newIndent = indent + (whitespaceLength(wspace) - firstIndent);
+            if (newIndent < 0) {
+              return "";
+            }
+            else if (cm.options.indentWithTabs) {
+              var quotient = Math.floor(newIndent / cm.options.tabSize);
+              return Array(quotient + 1).join('\t');
+            }
+            else {
+              return Array(newIndent + 1).join(' ');
+            }
           });
           text += wasChomped ? "\n" : "";
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index 0117193084..2dbbb13ec3 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1253,6 +1253,16 @@ testVim(']p_first_indent_is_larger', function(cm, vim, helpers) {
   helpers.doKeys(']', 'p');
   eq('  ___\n  abc\ndef', cm.getValue());
 }, { value: '  ___' });
+testVim(']p_with_tab_indents', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '\t\tabc\n\t\t\tdef\n', true);
+  helpers.doKeys(']', 'p');
+  eq('\t___\n\tabc\n\t\tdef', cm.getValue());
+}, { value: '\t___', indentWithTabs: true});
+testVim(']p_with_spaces_translated_to_tabs', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
+  helpers.doKeys(']', 'p');
+  eq('\t___\n\tabc\n\t\tdef', cm.getValue());
+}, { value: '\t___', indentWithTabs: true, tabSize: 2 });
 testVim('[p', function(cm, vim, helpers) {
   helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
   helpers.doKeys('[', 'p');

From f005c725ff23c0a6364741f0ec3794be0eba2c52 Mon Sep 17 00:00:00 2001
From: Shubham Jain <sj.iitr@gmail.com>
Date: Fri, 21 Mar 2014 05:24:00 +0530
Subject: [PATCH 1164/4742] [vim] Reset lastHPos tracking on click

---
 keymap/vim.js     | 16 +++++++++++++---
 lib/codemirror.js |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 45bc6ad945..4d9f554c73 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -352,12 +352,14 @@
         cm.setOption('disableInput', true);
         CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
         cm.on('beforeSelectionChange', beforeSelectionChange);
+        cm.on('cursorActivity', onCursorActivity);
         maybeInitVimState(cm);
         CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
       } else if (cm.state.vim) {
         cm.setOption('keyMap', 'default');
         cm.setOption('disableInput', false);
         cm.off('beforeSelectionChange', beforeSelectionChange);
+        cm.off('cursorActivity', onCursorActivity);
         CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
         cm.state.vim = null;
       }
@@ -374,6 +376,14 @@
                      head: pos}]);
       }
     }
+    function onCursorActivity(cm, origin) {
+      if (origin == '*mouse') {
+        var cur = cm.doc.getCursor();
+        var vim = cm.state.vim;
+        if (vim.insertMode || vim.exMode) return;
+        vim.lastHPos = cur.ch;
+      }
+    }
     function getOnPasteFn(cm) {
       var vim = cm.state.vim;
       if (!vim.onPasteFn) {
@@ -1906,7 +1916,7 @@
         if (!vimGlobalState.macroModeState.isPlaying) {
           // Only record if not replaying.
           cm.on('change', onChange);
-          cm.on('cursorActivity', onCursorActivity);
+          cm.on('cursorActivity', onCursorActivityInInsertMode);
           CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
         }
       },
@@ -3918,7 +3928,7 @@
       var isPlaying = macroModeState.isPlaying;
       if (!isPlaying) {
         cm.off('change', onChange);
-        cm.off('cursorActivity', onCursorActivity);
+        cm.off('cursorActivity', onCursorActivityInInsertMode);
         CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
       }
       if (!isPlaying && vim.insertModeRepeat > 1) {
@@ -4041,7 +4051,7 @@
     * - For tracking cursor activity in insert mode.
     * - Should only be active in insert mode.
     */
-    function onCursorActivity() {
+    function onCursorActivityInInsertMode() {
       var macroModeState = vimGlobalState.macroModeState;
       if (macroModeState.isPlaying) { return; }
       var lastChange = macroModeState.lastInsertModeChanges;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 81afc4c0ae..c7bc95ab69 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1117,6 +1117,7 @@
 
   // Set a new selection.
   function setSelection(doc, sel, options) {
+    if(options && options.origin && doc.cm) doc.cm.curOp.origin = options.origin;
     setSelectionNoUndo(doc, sel, options);
     addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
   }
@@ -1869,6 +1870,7 @@
       updateInput: null,       // Whether to reset the input textarea
       typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
       changeObjs: null,        // Accumulated changes, for firing change events
+      origin: null,            // Selection's origin
       cursorActivity: false,   // Whether to fire a cursorActivity event
       selectionChanged: false, // Whether the selection needs to be redrawn
       updateMaxLine: false,    // Set when the widest line needs to be determined anew
@@ -1939,7 +1941,7 @@
         signal(cm, "change", cm, op.changeObjs[i]);
       signal(cm, "changes", cm, op.changeObjs);
     }
-    if (op.cursorActivity) signal(cm, "cursorActivity", cm);
+    if (op.cursorActivity) signal(cm, "cursorActivity", cm, op.origin);
     if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }
 

From 9e6cbfa331a2c73b64391702b1e450dc45483e50 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 25 Mar 2014 18:55:37 +0100
Subject: [PATCH 1165/4742] [vim] Merge cursorActivity handlers + cleanup

---
 keymap/vim.js     | 39 +++++++++++++++++----------------------
 lib/codemirror.js |  2 +-
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 4d9f554c73..9996687cc3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -376,14 +376,6 @@
                      head: pos}]);
       }
     }
-    function onCursorActivity(cm, origin) {
-      if (origin == '*mouse') {
-        var cur = cm.doc.getCursor();
-        var vim = cm.state.vim;
-        if (vim.insertMode || vim.exMode) return;
-        vim.lastHPos = cur.ch;
-      }
-    }
     function getOnPasteFn(cm) {
       var vim = cm.state.vim;
       if (!vim.onPasteFn) {
@@ -1916,7 +1908,6 @@
         if (!vimGlobalState.macroModeState.isPlaying) {
           // Only record if not replaying.
           cm.on('change', onChange);
-          cm.on('cursorActivity', onCursorActivityInInsertMode);
           CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
         }
       },
@@ -3928,7 +3919,6 @@
       var isPlaying = macroModeState.isPlaying;
       if (!isPlaying) {
         cm.off('change', onChange);
-        cm.off('cursorActivity', onCursorActivityInInsertMode);
         CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
       }
       if (!isPlaying && vim.insertModeRepeat > 1) {
@@ -3938,8 +3928,8 @@
         vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
       }
       delete vim.insertModeRepeat;
-      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
       vim.insertMode = false;
+      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
       cm.setOption('keyMap', 'vim');
       cm.setOption('disableInput', true);
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
@@ -4048,18 +4038,23 @@
 
     /**
     * Listens for any kind of cursor activity on CodeMirror.
-    * - For tracking cursor activity in insert mode.
-    * - Should only be active in insert mode.
     */
-    function onCursorActivityInInsertMode() {
-      var macroModeState = vimGlobalState.macroModeState;
-      if (macroModeState.isPlaying) { return; }
-      var lastChange = macroModeState.lastInsertModeChanges;
-      if (lastChange.expectCursorActivityForChange) {
-        lastChange.expectCursorActivityForChange = false;
-      } else {
-        // Cursor moved outside the context of an edit. Reset the change.
-        lastChange.changes = [];
+    function onCursorActivity(cm, origin) {
+      var vim = cm.state.vim;
+      if (vim.insertMode) {
+        // Tracking cursor activity in insert mode (for macro support).
+        var macroModeState = vimGlobalState.macroModeState;
+        if (macroModeState.isPlaying) { return; }
+        var lastChange = macroModeState.lastInsertModeChanges;
+        if (lastChange.expectCursorActivityForChange) {
+          lastChange.expectCursorActivityForChange = false;
+        } else {
+          // Cursor moved outside the context of an edit. Reset the change.
+          lastChange.changes = [];
+        }
+      } else if (origin == '*mouse') {
+        // Reset lastHPos if mouse click was done in normal mode.
+        vim.lastHPos = cm.doc.getCursor().ch;
       }
     }
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c7bc95ab69..c8ff38fca2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1117,7 +1117,7 @@
 
   // Set a new selection.
   function setSelection(doc, sel, options) {
-    if(options && options.origin && doc.cm) doc.cm.curOp.origin = options.origin;
+    if (options && options.origin && doc.cm) doc.cm.curOp.origin = options.origin;
     setSelectionNoUndo(doc, sel, options);
     addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
   }

From dcfa81998e96f7d1803d1974ae6f94caab0f3dce Mon Sep 17 00:00:00 2001
From: Faiza Alsaied <sunrise987@gmail.com>
Date: Sun, 23 Mar 2014 14:13:08 +0100
Subject: [PATCH 1166/4742] [vim] Implement aB, iB, ab and ib text objects.

---
 keymap/vim.js    |  7 +++++++
 test/vim_test.js | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9996687cc3..7e9064af9c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1667,6 +1667,13 @@
         var selfPaired = {'\'': true, '"': true};
 
         var character = motionArgs.selectedCharacter;
+        // 'b' refers to  '()' block.
+        // 'B' refers to  '{}' block.
+        if (character == 'b') {
+          character = '(';
+        } else if (character == 'B') {
+          character = '{';
+        }
 
         // Inclusive is the difference between a and i
         // TODO: Instead of using the additional text object map to perform text
diff --git a/test/vim_test.js b/test/vim_test.js
index 2dbbb13ec3..44a8b8b902 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1015,18 +1015,32 @@ testEdit('daW_end_punct', 'foo \tbAr.', /A/, 'daW', 'foo');
 //    Open and close on same line
 testEdit('di(_open_spc', 'foo (bAr) baz', /\(/, 'di(', 'foo () baz');
 testEdit('di)_open_spc', 'foo (bAr) baz', /\(/, 'di)', 'foo () baz');
+testEdit('dib_open_spc', 'foo (bAr) baz', /\(/, 'dib', 'foo () baz');
 testEdit('da(_open_spc', 'foo (bAr) baz', /\(/, 'da(', 'foo  baz');
 testEdit('da)_open_spc', 'foo (bAr) baz', /\(/, 'da)', 'foo  baz');
+testEdit('dab_open_spc', 'foo (bAr) baz', /\(/, 'dab', 'foo  baz');
 
 testEdit('di(_middle_spc', 'foo (bAr) baz', /A/, 'di(', 'foo () baz');
 testEdit('di)_middle_spc', 'foo (bAr) baz', /A/, 'di)', 'foo () baz');
+testEdit('dib_middle_spc', 'foo (bAr) baz', /A/, 'dib', 'foo () baz');
 testEdit('da(_middle_spc', 'foo (bAr) baz', /A/, 'da(', 'foo  baz');
 testEdit('da)_middle_spc', 'foo (bAr) baz', /A/, 'da)', 'foo  baz');
+testEdit('dab_middle_spc', 'foo (bAr) baz', /A/, 'dab', 'foo  baz');
 
 testEdit('di(_close_spc', 'foo (bAr) baz', /\)/, 'di(', 'foo () baz');
 testEdit('di)_close_spc', 'foo (bAr) baz', /\)/, 'di)', 'foo () baz');
+testEdit('dib_close_spc', 'foo (bAr) baz', /\)/, 'dib', 'foo () baz');
 testEdit('da(_close_spc', 'foo (bAr) baz', /\)/, 'da(', 'foo  baz');
 testEdit('da)_close_spc', 'foo (bAr) baz', /\)/, 'da)', 'foo  baz');
+testEdit('dab_close_spc', 'foo (bAr) baz', /\)/, 'dab', 'foo  baz');
+
+//  delete around and inner b.
+testEdit('dab_on_(_should_delete_around_()block', 'o( in(abc) )', /\(a/, 'dab', 'o( in )');
+testEdit('dib_on_(_should_delete_inner_()block', 'o( in(abc) )', /\(a/, 'dib', 'o( in() )');
+
+//  delete around and inner B.
+testEdit('daB_on_{_should_delete_around_{}block', 'o{ in{abc} }', /{a/, 'daB', 'o{ in }');
+testEdit('diB_on_{_should_delete_inner_{}block', 'o{ in{abc} }', /{a/, 'diB', 'o{ in{} }');
 
 testEdit('da{_on_{_should_delete_inner_block', 'o{ in{abc} }', /{a/, 'da{', 'o{ in }');
 testEdit('di[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'di[', 'foo (bAr) baz');
@@ -1038,14 +1052,18 @@ testMotion('di(_outside_should_stay', ['d', 'i', '('], { line: 0, ch: 0}, { line
 //  Open and close on different lines, equally indented
 testEdit('di{_middle_spc', 'a{\n\tbar\n}b', /r/, 'di{', 'a{}b');
 testEdit('di}_middle_spc', 'a{\n\tbar\n}b', /r/, 'di}', 'a{}b');
+testEdit('diB_middle_spc', 'a{\n\tbar\n}b', /r/, 'diB', 'a{}b');
 testEdit('da{_middle_spc', 'a{\n\tbar\n}b', /r/, 'da{', 'ab');
 testEdit('da}_middle_spc', 'a{\n\tbar\n}b', /r/, 'da}', 'ab');
+testEdit('daB_middle_spc', 'a{\n\tbar\n}b', /r/, 'daB', 'ab');
 
 // open and close on diff lines, open indented less than close
 testEdit('di{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di{', 'a{}b');
 testEdit('di}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di}', 'a{}b');
+testEdit('diB_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'diB', 'a{}b');
 testEdit('da{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da{', 'ab');
 testEdit('da}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da}', 'ab');
+testEdit('daB_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'daB', 'ab');
 
 // open and close on diff lines, open indented more than close
 testEdit('di[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di[', 'a\t[]b');

From 3b6fa1c1fbd46b4bc37aab01d3f524cbb168e5c8 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 25 Mar 2014 19:14:33 +0100
Subject: [PATCH 1167/4742] [vim] Delete unnecessary aB/iB/ab/ib tests

---
 test/vim_test.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/test/vim_test.js b/test/vim_test.js
index 44a8b8b902..0d1cc066d4 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1018,25 +1018,19 @@ testEdit('di)_open_spc', 'foo (bAr) baz', /\(/, 'di)', 'foo () baz');
 testEdit('dib_open_spc', 'foo (bAr) baz', /\(/, 'dib', 'foo () baz');
 testEdit('da(_open_spc', 'foo (bAr) baz', /\(/, 'da(', 'foo  baz');
 testEdit('da)_open_spc', 'foo (bAr) baz', /\(/, 'da)', 'foo  baz');
-testEdit('dab_open_spc', 'foo (bAr) baz', /\(/, 'dab', 'foo  baz');
 
 testEdit('di(_middle_spc', 'foo (bAr) baz', /A/, 'di(', 'foo () baz');
 testEdit('di)_middle_spc', 'foo (bAr) baz', /A/, 'di)', 'foo () baz');
-testEdit('dib_middle_spc', 'foo (bAr) baz', /A/, 'dib', 'foo () baz');
 testEdit('da(_middle_spc', 'foo (bAr) baz', /A/, 'da(', 'foo  baz');
 testEdit('da)_middle_spc', 'foo (bAr) baz', /A/, 'da)', 'foo  baz');
-testEdit('dab_middle_spc', 'foo (bAr) baz', /A/, 'dab', 'foo  baz');
 
 testEdit('di(_close_spc', 'foo (bAr) baz', /\)/, 'di(', 'foo () baz');
 testEdit('di)_close_spc', 'foo (bAr) baz', /\)/, 'di)', 'foo () baz');
-testEdit('dib_close_spc', 'foo (bAr) baz', /\)/, 'dib', 'foo () baz');
 testEdit('da(_close_spc', 'foo (bAr) baz', /\)/, 'da(', 'foo  baz');
 testEdit('da)_close_spc', 'foo (bAr) baz', /\)/, 'da)', 'foo  baz');
-testEdit('dab_close_spc', 'foo (bAr) baz', /\)/, 'dab', 'foo  baz');
 
 //  delete around and inner b.
 testEdit('dab_on_(_should_delete_around_()block', 'o( in(abc) )', /\(a/, 'dab', 'o( in )');
-testEdit('dib_on_(_should_delete_inner_()block', 'o( in(abc) )', /\(a/, 'dib', 'o( in() )');
 
 //  delete around and inner B.
 testEdit('daB_on_{_should_delete_around_{}block', 'o{ in{abc} }', /{a/, 'daB', 'o{ in }');
@@ -1052,7 +1046,6 @@ testMotion('di(_outside_should_stay', ['d', 'i', '('], { line: 0, ch: 0}, { line
 //  Open and close on different lines, equally indented
 testEdit('di{_middle_spc', 'a{\n\tbar\n}b', /r/, 'di{', 'a{}b');
 testEdit('di}_middle_spc', 'a{\n\tbar\n}b', /r/, 'di}', 'a{}b');
-testEdit('diB_middle_spc', 'a{\n\tbar\n}b', /r/, 'diB', 'a{}b');
 testEdit('da{_middle_spc', 'a{\n\tbar\n}b', /r/, 'da{', 'ab');
 testEdit('da}_middle_spc', 'a{\n\tbar\n}b', /r/, 'da}', 'ab');
 testEdit('daB_middle_spc', 'a{\n\tbar\n}b', /r/, 'daB', 'ab');
@@ -1060,10 +1053,8 @@ testEdit('daB_middle_spc', 'a{\n\tbar\n}b', /r/, 'daB', 'ab');
 // open and close on diff lines, open indented less than close
 testEdit('di{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di{', 'a{}b');
 testEdit('di}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di}', 'a{}b');
-testEdit('diB_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'diB', 'a{}b');
 testEdit('da{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da{', 'ab');
 testEdit('da}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da}', 'ab');
-testEdit('daB_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'daB', 'ab');
 
 // open and close on diff lines, open indented more than close
 testEdit('di[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di[', 'a\t[]b');

From 5b366e64fbe970128ab530a77c192358e18d9db7 Mon Sep 17 00:00:00 2001
From: Faiza Alsaied <sunrise987@gmail.com>
Date: Sat, 22 Mar 2014 23:55:22 +0100
Subject: [PATCH 1168/4742] [vim] Fixed append to register feature.

---
 keymap/vim.js    | 15 ++++++++-------
 test/vim_test.js | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 7e9064af9c..9ad027a0d6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -786,8 +786,10 @@
       },
       pushText: function(text, linewise) {
         // if this register has ever been set to linewise, use linewise.
-        if (linewise || this.linewise) {
-          this.keyBuffer.push('\n');
+        if (linewise) {
+          if (!this.linewise) {
+            this.keyBuffer.push('\n');
+          }
           this.linewise = true;
         }
         this.keyBuffer.push(text);
@@ -864,14 +866,13 @@
         // If we've gotten to this point, we've actually specified a register
         var append = isUpperCase(registerName);
         if (append) {
-          register.append(text, linewise);
-          // The unnamed register always has the same value as the last used
-          // register.
-          this.unnamedRegister.append(text, linewise);
+          register.pushText(text, linewise);
         } else {
           register.setText(text, linewise);
-          this.unnamedRegister.setText(text, linewise);
         }
+        // The unnamed register always has the same value as the last used
+        // register.
+        this.unnamedRegister.setText(register.toString(), linewise);
       },
       // Gets the register named @name.  If one of @name doesn't already exist,
       // create it.  If @name is invalid, return the unnamedRegister.
diff --git a/test/vim_test.js b/test/vim_test.js
index 0d1cc066d4..5d50d84ef0 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1926,6 +1926,50 @@ testVim('yank_register', function(cm, vim, helpers) {
   });
   helpers.doKeys(':');
 }, { value: 'foo\nbar'});
+testVim('yank_append_line_to_line_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'y');
+  helpers.doKeys('j', '"', 'A', 'y', 'y');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+foo\nbar/.test(text));
+    is(/"\s+foo\nbar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('yank_append_word_to_word_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'w');
+  helpers.doKeys('j', '"', 'A', 'y', 'w');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+foobar/.test(text));
+    is(/"\s+foobar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('yank_append_line_to_word_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'w');
+  helpers.doKeys('j', '"', 'A', 'y', 'y');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+foo\nbar/.test(text));
+    is(/"\s+foo\nbar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('yank_append_word_to_line_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'y');
+  helpers.doKeys('j', '"', 'A', 'y', 'w');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+foo\nbar/.test(text));
+    is(/"\s+foo\nbar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
 testVim('macro_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'a', 'i');
@@ -2982,3 +3026,5 @@ testVim('beforeSelectionChange', function(cm, vim, helpers) {
   cm.setCursor(0, 100);
   eqPos(cm.getCursor('head'), cm.getCursor('anchor'));
 }, { value: 'abc' });
+
+

From bfc600a27cc738870203dcb331ad0fb75595df7f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 26 Mar 2014 08:37:32 +0100
Subject: [PATCH 1169/4742] [show-hint addon] Add an origin string to
 completion changes

Issue #2406
---
 addon/hint/show-hint.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index a90c8f2aa3..8d291d4b0a 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -53,7 +53,8 @@
     pick: function(data, i) {
       var completion = data.list[i];
       if (completion.hint) completion.hint(this.cm, data, completion);
-      else this.cm.replaceRange(getText(completion), completion.from||data.from, completion.to||data.to);
+      else this.cm.replaceRange(getText(completion), completion.from || data.from,
+                                completion.to || data.to, "complete");
       CodeMirror.signal(data, "pick", completion);
       this.close();
     },

From 5b2d8991884480c4f498afabd55daa2c57bb76e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 26 Mar 2014 18:11:47 +0100
Subject: [PATCH 1170/4742] Fix file dropping

Wrap FileReader.onload in operation.
---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c8ff38fca2..6284cf8ff2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2746,7 +2746,7 @@
       var n = files.length, text = Array(n), read = 0;
       var loadFile = function(file, i) {
         var reader = new FileReader;
-        reader.onload = function() {
+        reader.onload = operation(cm, function() {
           text[i] = reader.result;
           if (++read == n) {
             pos = clipPos(cm.doc, pos);
@@ -2754,7 +2754,7 @@
             makeChange(cm.doc, change);
             setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
           }
-        };
+        });
         reader.readAsText(file);
       };
       for (var i = 0; i < n; ++i) loadFile(files[i], i);

From 47814e172aa47fe9f99f69db166f3b966ce052b7 Mon Sep 17 00:00:00 2001
From: Shubham Jain <sj.iitr@gmail.com>
Date: Sun, 23 Mar 2014 04:10:04 +0530
Subject: [PATCH 1171/4742] [vim] Partial fix for . in visual mode

---
 keymap/vim.js    | 18 +++++++++++++++++-
 test/vim_test.js |  8 ++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9ad027a0d6..8dec665d95 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1326,17 +1326,33 @@
             motionArgs.inclusive = true;
           }
           // Swap start and end if motion was backward.
-          if (cursorIsBefore(curEnd, curStart)) {
+          if (curEnd && cursorIsBefore(curEnd, curStart)) {
             var tmp = curStart;
             curStart = curEnd;
             curEnd = tmp;
             inverted = true;
+          } else if (!curEnd) {
+            curEnd = copyCursor(curStart);
           }
           if (motionArgs.inclusive && !(vim.visualMode && inverted)) {
             // Move the selection end one to the right to include the last
             // character.
             curEnd.ch++;
           }
+          if (operatorArgs.relCurEnd) {
+            curEnd.line = curStart.line + operatorArgs.relCurEnd.line;
+            if (operatorArgs.relCurEnd.line) curEnd.ch = operatorArgs.relCurEnd.ch;
+            else curEnd.ch = curStart.ch + operatorArgs.relCurEnd.ch;
+          }
+          else if (vim.visualMode) {
+            // Set relative curEnd position w.r.t. curStart in operatorArgs
+            // to be used by repeatLastEdit action.
+            var relCurEnd = Pos();
+            relCurEnd.line = curEnd.line - curStart.line;
+            if (relCurEnd.line) relCurEnd.ch = curEnd.ch;
+            else relCurEnd.ch = curEnd.ch - curStart.ch;
+            operatorArgs.relCurEnd = relCurEnd;
+          }
           var linewise = motionArgs.linewise ||
               (vim.visualMode && vim.visualLine);
           if (linewise) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 5d50d84ef0..445e79bf85 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2109,6 +2109,14 @@ testVim('._delete_repeat', function(cm, vim, helpers) {
   eq('zzce', cm.getValue());
   helpers.assertCursorAt(0, 1);
 }, { value: 'zzabcde'});
+testVim('._visual_>', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('V', 'j', '>');
+  cm.setCursor(2, 0)
+  helpers.doKeys('.');
+  eq('  1\n  2\n  3\n  4', cm.getValue());
+  helpers.assertCursorAt(2, 2);
+}, { value: '1\n2\n3\n4'});
 testVim('f;', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('f', 'x');

From 88b26fca6c2df158bd0fe4c8d32be6029ffc503f Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Wed, 26 Mar 2014 18:20:47 +0100
Subject: [PATCH 1172/4742] [vim] Clean up visual mode . fix a bit, fix
 linewise

---
 keymap/vim.js | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8dec665d95..d1a9a033d6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1339,19 +1339,17 @@
             // character.
             curEnd.ch++;
           }
-          if (operatorArgs.relCurEnd) {
-            curEnd.line = curStart.line + operatorArgs.relCurEnd.line;
-            if (operatorArgs.relCurEnd.line) curEnd.ch = operatorArgs.relCurEnd.ch;
-            else curEnd.ch = curStart.ch + operatorArgs.relCurEnd.ch;
-          }
-          else if (vim.visualMode) {
-            // Set relative curEnd position w.r.t. curStart in operatorArgs
-            // to be used by repeatLastEdit action.
-            var relCurEnd = Pos();
-            relCurEnd.line = curEnd.line - curStart.line;
-            if (relCurEnd.line) relCurEnd.ch = curEnd.ch;
-            else relCurEnd.ch = curEnd.ch - curStart.ch;
-            operatorArgs.relCurEnd = relCurEnd;
+          if (operatorArgs.selOffset) {
+            // Replaying a visual mode operation
+            curEnd.line = curStart.line + operatorArgs.selOffset.line;
+            if (operatorArgs.selOffset.line) {curEnd.ch = operatorArgs.selOffset.ch; }
+            else { curEnd.ch = curStart.ch + operatorArgs.selOffset.ch; }
+          } else if (vim.visualMode) {
+            var selOffset = Pos();
+            selOffset.line = curEnd.line - curStart.line;
+            if (selOffset.line) { selOffset.ch = curEnd.ch; }
+            else { selOffset.ch = curEnd.ch - curStart.ch; }
+            operatorArgs.selOffset = selOffset;
           }
           var linewise = motionArgs.linewise ||
               (vim.visualMode && vim.visualLine);
@@ -1364,7 +1362,7 @@
           }
           operatorArgs.registerName = registerName;
           // Keep track of linewise as it affects how paste and change behave.
-          operatorArgs.linewise = linewise;
+          operatorArgs.linewise = linewise || operatorArgs.linewise;
           operators[operator](cm, operatorArgs, vim, curStart,
               curEnd, curOriginal);
           if (vim.visualMode) {

From 6bda3bcbbd7c1fb59d817de0ee09635da39eff65 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 29 Mar 2014 21:00:44 +0100
Subject: [PATCH 1173/4742] [vim] Fix linewise visual repeat

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

diff --git a/keymap/vim.js b/keymap/vim.js
index d1a9a033d6..6fedf93292 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1352,7 +1352,8 @@
             operatorArgs.selOffset = selOffset;
           }
           var linewise = motionArgs.linewise ||
-              (vim.visualMode && vim.visualLine);
+              (vim.visualMode && vim.visualLine) ||
+              operatorArgs.linewise;
           if (linewise) {
             // Expand selection to entire line.
             expandSelectionToLine(cm, curStart, curEnd);
@@ -1362,7 +1363,7 @@
           }
           operatorArgs.registerName = registerName;
           // Keep track of linewise as it affects how paste and change behave.
-          operatorArgs.linewise = linewise || operatorArgs.linewise;
+          operatorArgs.linewise = linewise;
           operators[operator](cm, operatorArgs, vim, curStart,
               curEnd, curOriginal);
           if (vim.visualMode) {

From 156ea7a6a2b2779e5e9c29ca56ae52b8c97a61bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Apr 2014 11:40:33 +0200
Subject: [PATCH 1174/4742] Make refresh recompute the space the gutter takes
 up

When line numbers are off, and the editor was initialized in
a hidden position, the gutters would sit on top of the text.

Issue #2365
---
 lib/codemirror.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6284cf8ff2..331b29aed2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -328,9 +328,13 @@
       }
     }
     gutters.style.display = i ? "" : "none";
-    var width = gutters.offsetWidth;
+    updateGutterSpace(cm);
+  }
+
+  function updateGutterSpace(cm) {
+    var width = cm.display.gutters.offsetWidth;
     cm.display.sizer.style.marginLeft = width + "px";
-    if (i) cm.display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0;
+    cm.display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0;
   }
 
   // Compute the character length of a line, taking into account
@@ -502,9 +506,7 @@
       display.lineNumWidth = display.lineNumInnerWidth + padding;
       display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
       display.lineGutter.style.width = display.lineNumWidth + "px";
-      var width = display.gutters.offsetWidth;
-      display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0;
-      display.sizer.style.marginLeft = width + "px";
+      updateGutterSpace(cm);
       return true;
     }
     return false;
@@ -4197,6 +4199,7 @@
       regChange(this);
       clearCaches(this);
       this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
+      updateGutterSpace(this);
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
         estimateLineHeights(this);
       signal(this, "refresh", this);

From 3f1a7bb2f901f65fd5c1d4992153ec1975373c5a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Apr 2014 12:17:55 +0200
Subject: [PATCH 1175/4742] [overlay addon] Fix bug when overlay mode is itself
 multiplexed

It assumed it saw all parts of the stream, and started
doing bad things when that was not the case.

Issue #2410
---
 addon/mode/overlay.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index 6f556a13a7..c16b0c822d 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -23,7 +23,8 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
         base: CodeMirror.startState(base),
         overlay: CodeMirror.startState(overlay),
         basePos: 0, baseCur: null,
-        overlayPos: 0, overlayCur: null
+        overlayPos: 0, overlayCur: null,
+        lineSeen: null
       };
     },
     copyState: function(state) {
@@ -36,6 +37,12 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
     },
 
     token: function(stream, state) {
+      if (stream.sol() || stream.string != state.lineSeen ||
+          Math.min(state.basePos, state.overlayPos) < stream.start) {
+        state.lineSeen = stream.string;
+        state.basePos = state.overlayPos = stream.start;
+      }
+
       if (stream.start == state.basePos) {
         state.baseCur = base.token(stream, state.base);
         state.basePos = stream.pos;
@@ -46,7 +53,6 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
         state.overlayPos = stream.pos;
       }
       stream.pos = Math.min(state.basePos, state.overlayPos);
-      if (stream.eol()) state.basePos = state.overlayPos = 0;
 
       if (state.overlayCur == null) return state.baseCur;
       if (state.baseCur != null && combine) return state.baseCur + " " + state.overlayCur;

From 32342a6a3d31ce700b8ada708f779c8f77b0e886 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Apr 2014 17:17:02 +0200
Subject: [PATCH 1176/4742] Allow blankLine to return line-* and
 line-background-* strings

(Experimental for now. Prompted by indentation guide discussion.)
---
 lib/codemirror.js | 109 +++++++++++++++++++++++++++++++---------------
 test/test.js      |  14 ++++++
 2 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 331b29aed2..265879dbad 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -255,10 +255,10 @@
 
   function wrappingChanged(cm) {
     if (cm.options.lineWrapping) {
-      cm.display.wrapper.className += " CodeMirror-wrap";
+      addClass(cm.display.wrapper, "CodeMirror-wrap");
       cm.display.sizer.style.minWidth = "";
     } else {
-      cm.display.wrapper.className = cm.display.wrapper.className.replace(" CodeMirror-wrap", "");
+      rmClass(cm.display.wrapper, "CodeMirror-wrap");
       findMaxLine(cm);
     }
     estimateLineHeights(cm);
@@ -1374,7 +1374,10 @@
     doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
       if (doc.frontier >= cm.display.viewFrom) { // Visible
         var oldStyles = line.styles;
-        line.styles = highlightLine(cm, line, state, true);
+        var highlighted = highlightLine(cm, line, state, true);
+        line.styles = highlighted.styles;
+        if (highlighted.classes) line.styleClasses = highlighted.classes;
+        else if (line.styleClasses) line.styleClasses = null;
         var ischange = !oldStyles || oldStyles.length != line.styles.length;
         for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
         if (ischange) regLineChange(cm, doc.frontier, "text");
@@ -3027,11 +3030,11 @@
 
   function showCrossHair(cm) {
     var lineDiv = cm.display.lineDiv;
-    lineDiv.className += " CodeMirror-crosshair";
+    addClass(lineDiv, "CodeMirror-crosshair");
 
     function up(e) {
       if (e.keyCode == 18 || !e.altKey) {
-        lineDiv.className = lineDiv.className.replace(" CodeMirror-crosshair", "");
+        rmClass(lineDiv, "CodeMirror-crosshair");
         off(document, "keyup", up);
         off(document, "mouseover", up);
       }
@@ -3064,8 +3067,7 @@
     if (!cm.state.focused) {
       signal(cm, "focus", cm);
       cm.state.focused = true;
-      if (cm.display.wrapper.className.search(/\bCodeMirror-focused\b/) == -1)
-        cm.display.wrapper.className += " CodeMirror-focused";
+      addClass(cm.display.wrapper, "CodeMirror-focused");
       if (!cm.curOp) {
         resetInput(cm);
         if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
@@ -3078,7 +3080,7 @@
     if (cm.state.focused) {
       signal(cm, "blur", cm);
       cm.state.focused = false;
-      cm.display.wrapper.className = cm.display.wrapper.className.replace(" CodeMirror-focused", "");
+      rmClass(cm.display.wrapper, "CodeMirror-focused");
     }
     clearInterval(cm.display.blinker);
     setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150);
@@ -4137,9 +4139,9 @@
     toggleOverwrite: function(value) {
       if (value != null && value == this.state.overwrite) return;
       if (this.state.overwrite = !this.state.overwrite)
-        this.display.cursorDiv.className += " CodeMirror-overwrite";
+        addClass(this.display.cursorDiv, "CodeMirror-overwrite");
       else
-        this.display.cursorDiv.className = this.display.cursorDiv.className.replace(" CodeMirror-overwrite", "");
+        rmClass(this.display.cursorDiv, "CodeMirror-overwrite");
 
       signal(this, "overwriteToggle", this, this.state.overwrite);
     },
@@ -5509,13 +5511,34 @@
     detachMarkedSpans(line);
   }
 
+  function extractLineClasses(type, output) {
+    if (type) for (;;) {
+      var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
+      if (!lineClass) break;
+      type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
+      var prop = lineClass[1] ? "bgClass" : "textClass";
+      if (output[prop] == null)
+        output[prop] = lineClass[2];
+      else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
+        output[prop] += " " + lineClass[2];
+    }
+    return type;
+  }
+
+  function callBlankLine(mode, state) {
+    if (mode.blankLine) return mode.blankLine(state);
+    if (!mode.innerMode) return;
+    var inner = CodeMirror.innerMode(mode, state);
+    if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
+  }
+
   // Run the given mode's parser over a line, calling f for each token.
-  function runMode(cm, text, mode, state, f, forceToEnd) {
+  function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
     var flattenSpans = mode.flattenSpans;
     if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
     var curStart = 0, curStyle = null;
     var stream = new StringStream(text, cm.options.tabSize), style;
-    if (text == "" && mode.blankLine) mode.blankLine(state);
+    if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
     while (!stream.eol()) {
       if (stream.pos > cm.options.maxHighlightLength) {
         flattenSpans = false;
@@ -5523,7 +5546,7 @@
         stream.pos = text.length;
         style = null;
       } else {
-        style = mode.token(stream, state);
+        style = extractLineClasses(mode.token(stream, state), lineClasses);
       }
       if (cm.options.addModeClass) {
         var mName = CodeMirror.innerMode(mode, state).mode.name;
@@ -5550,11 +5573,11 @@
   function highlightLine(cm, line, state, forceToEnd) {
     // A styles array always starts with a number identifying the
     // mode/overlays that it is based on (for easy invalidation).
-    var st = [cm.state.modeGen];
+    var st = [cm.state.modeGen], lineClasses = {};
     // Compute the base array of styles
     runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
       st.push(end, style);
-    }, forceToEnd);
+    }, lineClasses, forceToEnd);
 
     // Run overlays, adjust style array.
     for (var o = 0; o < cm.state.overlays.length; ++o) {
@@ -5579,15 +5602,19 @@
             st[start+1] = cur ? cur + " " + style : style;
           }
         }
-      });
+      }, lineClasses);
     }
 
-    return st;
+    return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
   }
 
   function getLineStyles(cm, line) {
-    if (!line.styles || line.styles[0] != cm.state.modeGen)
-      line.styles = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
+    if (!line.styles || line.styles[0] != cm.state.modeGen) {
+      var result = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
+      line.styles = result.styles;
+      if (result.classes) line.styleClasses = result.classes;
+      else if (line.styleClasses) line.styleClasses = null;
+    }
     return line.styles;
   }
 
@@ -5598,7 +5625,7 @@
     var mode = cm.doc.mode;
     var stream = new StringStream(text, cm.options.tabSize);
     stream.start = stream.pos = startAt || 0;
-    if (text == "" && mode.blankLine) mode.blankLine(state);
+    if (text == "") callBlankLine(mode, state);
     while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) {
       mode.token(stream, state);
       stream.start = stream.pos;
@@ -5609,20 +5636,9 @@
   // containing one or more styles) to a CSS style. This is cached,
   // and also looks for line-wide styles.
   var styleToClassCache = {}, styleToClassCacheWithMode = {};
-  function interpretTokenStyle(style, builder) {
-    if (!style) return null;
-    for (;;) {
-      var lineClass = style.match(/(?:^|\s+)line-(background-)?(\S+)/);
-      if (!lineClass) break;
-      style = style.slice(0, lineClass.index) + style.slice(lineClass.index + lineClass[0].length);
-      var prop = lineClass[1] ? "bgClass" : "textClass";
-      if (builder[prop] == null)
-        builder[prop] = lineClass[2];
-      else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(builder[prop]))
-        builder[prop] += " " + lineClass[2];
-    }
-    if (/^\s*$/.test(style)) return null;
-    var cache = builder.cm.options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
+  function interpretTokenStyle(style, options) {
+    if (!style || /^\s*$/.test(style)) return null;
+    var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
     return cache[style] ||
       (cache[style] = style.replace(/\S+/g, "cm-$&"));
   }
@@ -5653,6 +5669,12 @@
         builder.addToken = buildTokenBadBidi(builder.addToken, order);
       builder.map = [];
       insertLineContent(line, builder, getLineStyles(cm, line));
+      if (line.styleClasses) {
+        if (line.styleClasses.bgClass)
+          builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");
+        if (line.styleClasses.textClass)
+          builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "");
+      }
 
       // Ensure at least a single node is present, for measuring.
       if (builder.map.length == 0)
@@ -5778,7 +5800,7 @@
     var spans = line.markedSpans, allText = line.text, at = 0;
     if (!spans) {
       for (var i = 1; i < styles.length; i+=2)
-        builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder));
+        builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options));
       return;
     }
 
@@ -5828,7 +5850,7 @@
           spanStartStyle = "";
         }
         text = allText.slice(at, at = styles[i++]);
-        style = interpretTokenStyle(styles[i++], builder);
+        style = interpretTokenStyle(styles[i++], builder.cm.options);
       }
     }
   }
@@ -7035,6 +7057,21 @@
     catch(e) { return document.body; }
   };
 
+  function classTest(cls) { return new RegExp("\\b" + cls + "\\b\\s*"); }
+  function rmClass(node, cls) {
+    var test = classTest(cls);
+    if (test.test(node.className)) node.className = node.className.replace(test, "");
+  }
+  function addClass(node, cls) {
+    if (!classTest(cls).test(node.className)) node.className += " " + cls;
+  }
+  function joinClasses(a, b) {
+    var as = a.split(" ");
+    for (var i = 0; i < as.length; i++)
+      if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i];
+    return b;
+  }
+
   // FEATURE DETECTION
 
   // Detect drag-and-drop
diff --git a/test/test.js b/test/test.js
index b1b5594d2d..8c3a307d53 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1776,6 +1776,20 @@ testCM("lineStyleFromMode", function(cm) {
   is(/^\s*cm-span\s*$/.test(spanElts[0].className));
 }, {value: "line1: [br] [br]\nline2: (par) (par)\nline3: <tag> <tag>"});
 
+testCM("lineStyleFromBlankLine", function(cm) {
+  CodeMirror.defineMode("lineStyleFromBlankLine_mode", function() {
+    return {token: function(stream) { stream.skipToEnd(); return "comment"; },
+            blankLine: function() { return "line-blank"; }};
+  });
+  cm.setOption("mode", "lineStyleFromBlankLine_mode");
+  var blankElts = byClassName(cm.getWrapperElement(), "blank");
+  eq(blankElts.length, 1);
+  eq(blankElts[0].nodeName, "PRE");
+  cm.replaceRange("x", Pos(1, 0));
+  blankElts = byClassName(cm.getWrapperElement(), "blank");
+  eq(blankElts.length, 0);
+}, {value: "foo\n\nbar"});
+
 CodeMirror.registerHelper("xxx", "a", "A");
 CodeMirror.registerHelper("xxx", "b", "B");
 CodeMirror.defineMode("yyy", function() {

From 82bcf271aba6cb14776a3517f54d5d53428070d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Apr 2014 17:29:31 +0200
Subject: [PATCH 1177/4742] [real-world uses] Add Filemanager

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 08f0267856..ceb1b8ca2c 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -65,6 +65,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://metacpan.org/module/Farabi">Farabi</a> (modern Perl IDE)</li>
       <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>
       <li><a href="http://fiddlesalad.com/">Fiddle Salad</a> (web development environment)</li>
+      <li><a href="https://github.com/simogeo/Filemanager">Filemanager</a></li>
       <li><a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox Developer Tools</a></li>
       <li><a href="http://www.firepad.io">Firepad</a> (collaborative text editor)</li>
       <li><a href="https://code.google.com/p/gerrit/">Gerrit</a>'s diff view</a></li>

From f77e7915edb2b4f2f9f9fbc295aaa3de7bdd332c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Apr 2014 17:31:39 +0200
Subject: [PATCH 1178/4742] Drop font-family rules from themes

Closes #2415
---
 theme/ambiance.css       | 1 -
 theme/lesser-dark.css    | 4 ----
 theme/mdn-like.css       | 2 +-
 theme/pastel-on-dark.css | 1 -
 theme/rubyblue.css       | 2 --
 theme/solarized.css      | 1 -
 6 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/theme/ambiance.css b/theme/ambiance.css
index 3a54b2a022..48ba091fb3 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -41,7 +41,6 @@
 
 .cm-s-ambiance.CodeMirror {
   line-height: 1.40em;
-  font-family: Monaco, Menlo,"Andale Mono","lucida console","Courier New",monospace !important;
   color: #E6E1DC;
   background-color: #202020;
   -webkit-box-shadow: inset 0 0 10px black;
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index c32559663b..b8e77c2794 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -5,10 +5,6 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark {
   line-height: 1.3em;
 }
-.cm-s-lesser-dark {
-  font-family: 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', Courier, monospace !important;
-}
-
 .cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
 .cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/
 .cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index c12cb1f94f..1e20b9e21b 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -7,7 +7,7 @@
   The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
 
 */
-.cm-s-mdn-like.CodeMirror { color: #999; font-family: monospace; background-color: #fff; }
+.cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
 .cm-s-mdn-like .CodeMirror-selected { background: #cfc !important; }
 
 .cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index df95699a01..72a247527e 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -11,7 +11,6 @@
 	background: #2c2827;
 	color: #8F938F;
 	line-height: 1.5;
-	font-family: consolas, Courier, monospace;
 	font-size: 14px;
 }
 .cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2) !important; }
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index b556139d7e..47fae0da9d 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -1,5 +1,3 @@
-.cm-s-rubyblue { font-family: Trebuchet, Verdana, sans-serif; }	/* - customized editor font - */
-
 .cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
 .cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
 .cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
diff --git a/theme/solarized.css b/theme/solarized.css
index c9c84097d0..39fc83d7cd 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -29,7 +29,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 .cm-s-solarized {
   line-height: 1.45em;
-  font-family: Menlo,Monaco,"Andale Mono","lucida console","Courier New",monospace !important;
   color-profile: sRGB;
   rendering-intent: auto;
 }

From 87036ed9bb356d09e4ef20cc4ed270d9dfbb983b Mon Sep 17 00:00:00 2001
From: as3boyan <denis.flash.as3@gmail.com>
Date: Mon, 31 Mar 2014 01:08:42 +0300
Subject: [PATCH 1179/4742] [haxe mode] Add 'abstract' keyword

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

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index d7ed7e6568..b8f8408d14 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -26,7 +26,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
       "function": kw("function"), "catch": kw("catch"), "untyped": kw("untyped"), "callback": kw("cb"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
       "in": operator, "never": kw("property_access"), "trace":kw("trace"),
-    "class": type, "enum":type, "interface":type, "typedef":type, "extends":type, "implements":type, "dynamic":type,
+    "class": type, "abstract":type, "enum":type, "interface":type, "typedef":type, "extends":type, "implements":type, "dynamic":type,
       "true": atom, "false": atom, "null": atom
     };
   }();

From 58a75ce53780a3e7dcb3ee257545b08cad92c710 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Apr 2014 17:57:11 +0200
Subject: [PATCH 1180/4742] Round top/bottom coords when drawing selection

To prevent gaps when browsers interpret fractional numbers oddly.
---
 lib/codemirror.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 265879dbad..0356766aed 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1279,6 +1279,8 @@
 
     function add(left, top, width, bottom) {
       if (top < 0) top = 0;
+      top = Math.round(top);
+      bottom = Math.round(bottom);
       fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
                                "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) +
                                "px; height: " + (bottom - top) + "px"));

From 12be7a0cdbef9d51f490b64af2a689f845501436 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Apr 2014 17:58:04 +0200
Subject: [PATCH 1181/4742] Use more meaningful names for drawSelection*
 functions

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0356766aed..ae7f5f4cc7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1231,9 +1231,9 @@
       var range = doc.sel.ranges[i];
       var collapsed = range.empty();
       if (collapsed || cm.options.showCursorWhenSelecting)
-        updateSelectionCursor(cm, range, curFragment);
+        drawSelectionCursor(cm, range, curFragment);
       if (!collapsed)
-        updateSelectionRange(cm, range, selFragment);
+        drawSelectionRange(cm, range, selFragment);
     }
 
     // Move the hidden textarea near the cursor to prevent scrolling artifacts
@@ -1253,7 +1253,7 @@
   }
 
   // Draws a cursor for the given range
-  function updateSelectionCursor(cm, range, output) {
+  function drawSelectionCursor(cm, range, output) {
     var pos = cursorCoords(cm, range.head, "div");
 
     var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
@@ -1272,7 +1272,7 @@
   }
 
   // Draws the given range as a highlighted selection
-  function updateSelectionRange(cm, range, output) {
+  function drawSelectionRange(cm, range, output) {
     var display = cm.display, doc = cm.doc;
     var fragment = document.createDocumentFragment();
     var padding = paddingH(cm.display), leftSide = padding.left, rightSide = display.lineSpace.offsetWidth - padding.right;

From 5b085aea17121919d8caaa0794d1bea1b453fb2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Pi=C3=B3rkowski?= <radek25c@gmail.com>
Date: Tue, 1 Apr 2014 02:09:47 +0200
Subject: [PATCH 1182/4742] [closebracket addon] Fix: Trigger auto-close-triple
 behaviour after exactly 3 quotes.

Issue #2385
---
 addon/edit/closebrackets.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 6cabed6eca..3cea887d1d 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -69,7 +69,8 @@
             else
               curType = "skip";
           } else if (left == right && cur.ch > 1 &&
-                     cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left)
+                     cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
+                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left))
             curType = "addFour";
           else if (left == right && CodeMirror.isWordChar(next))
             return CodeMirror.Pass;

From b1bc7bac1f8707aa2e3f07cf775f9df3da20e6d8 Mon Sep 17 00:00:00 2001
From: Jan Keromnes <janx@linux.com>
Date: Tue, 1 Apr 2014 00:39:41 +0000
Subject: [PATCH 1183/4742] Better looking SVG badges in README.md.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 61f6b64525..6a0011b6be 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # CodeMirror
-[![Build Status](https://secure.travis-ci.org/marijnh/CodeMirror.png?branch=master)](http://travis-ci.org/marijnh/CodeMirror)
-[![NPM version](https://badge.fury.io/js/codemirror.png)](http://badge.fury.io/js/codemirror)
+[![Build Status](https://travis-ci.org/marijnh/CodeMirror.svg)](https://travis-ci.org/marijnh/CodeMirror)
+[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a JavaScript component that provides a code editor in
 the browser. When a mode is available for the language you are coding

From 75e8f5278f502b66b7ba47f01ee3b52fd715fdcf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Apr 2014 18:29:53 +0200
Subject: [PATCH 1184/4742] [xml-hint addon] Support attributes that apply to
 all tags

---
 addon/hint/xml-hint.js | 11 ++++++++++-
 demo/xmlcomplete.html  |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index fc025a2ded..9ebec05344 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -46,7 +46,16 @@
     } else {
       // Attribute completion
       var curTag = tags[inner.state.tagName], attrs = curTag && curTag.attrs;
-      if (!attrs) return;
+      var globalAttrs = tags["!attrs"];
+      if (!attrs && !globalAttrs) return;
+      if (!attrs) {
+        attrs = globalAttrs;
+      } else if (globalAttrs) { // Combine tag-local and global attributes
+        var set = {};
+        for (var nm in globalAttrs) if (globalAttrs.hasOwnProperty(nm)) set[nm] = globalAttrs[nm];
+        for (var nm in attrs) if (attrs.hasOwnProperty(nm)) set[nm] = attrs[nm];
+        attrs = set;
+      }
       if (token.type == "string" || token.string == "=") { // A value
         var before = cm.getRange(Pos(cur.line, Math.max(0, cur.ch - 60)),
                                  Pos(cur.line, token.type == "string" ? token.start : token.end));
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index 2f81c54cf0..dea23adf84 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -52,6 +52,10 @@ <h2>XML Autocomplete Demo</h2>
 
       var tags = {
         "!top": ["top"],
+        "!attrs": {
+          id: null,
+          class: ["A", "B", "C"]
+        },
         top: {
           attrs: {
             lang: ["en", "de", "fr", "nl"],

From 81b81d8f9b6d1deaaa1435553316aa6c887741b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Apr 2014 21:22:41 +0200
Subject: [PATCH 1185/4742] Support electricInput as well as electricChars on
 mode objects

Issue #2412
---
 doc/manual.html   | 18 +++++++++++++-----
 lib/codemirror.js | 16 +++++++++++-----
 mode/xml/xml.js   |  2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 3d67530393..1279fcadd4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2804,12 +2804,20 @@ <h2>Writing CodeMirror Modes</h2>
     continued lines in a block comment). All of these are
     optional.</p>
 
-    <p id="electricChars">Finally, a mode may define
-    an <code>electricChars</code> property, which should hold a string
-    containing all the characters that should trigger the behaviour
-    described for
+    <p id="electricChars">Finally, a mode may define either
+    an <code>electricChars</code> or an <code>electricInput</code>
+    property, which are used to automatically reindent the line when
+    certain patterns are typed and
     the <a href="#option_electricChars"><code>electricChars</code></a>
-    option.</p>
+    option is enabled. <code>electricChars</code> may be a string, and
+    will trigger a reindent whenever one of the characters in that
+    string are typed. Often, it is more appropriate to
+    use <code>electricInput</code>, which should hold a regular
+    expression, and will trigger indentation when the part of the
+    line <em>before</em> the cursor matches the expression. It should
+    usually end with a <code>$</code> character, so that it only
+    matches when the indentation-changing pattern was just typed, not when something was
+    typed after the pattern.</p>
 
     <p>So, to summarize, a mode <em>must</em> provide
     a <code>token</code> method, and it <em>may</em>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ae7f5f4cc7..41bf2e6658 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2253,12 +2253,18 @@
       if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
           cm.options.smartIndent && range.head.ch < 100 &&
           (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
-        var electric = cm.getModeAt(range.head).electricChars;
-        if (electric) for (var j = 0; j < electric.length; j++)
-          if (inserted.indexOf(electric.charAt(j)) > -1) {
+        var mode = cm.getModeAt(range.head);
+        if (mode.electricChars) {
+          for (var j = 0; j < mode.electricChars.length; j++)
+            if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
+              indentLine(cm, range.head.line, "smart");
+              break;
+            }
+        } else if (mode.electricInput) {
+          var end = changeEnd(changeEvent);
+          if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
             indentLine(cm, range.head.line, "smart");
-            break;
-          }
+        }
       }
     }
     ensureCursorVisible(cm);
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index c626ce2b9a..3fc0cb5056 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -361,7 +361,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       else return 0;
     },
 
-    electricChars: "/",
+    electricInput: /<\/[\s\w:]+>$/,
     blockCommentStart: "<!--",
     blockCommentEnd: "-->",
 

From ee9f33b981a49d02beeed2243bb7006342e5cc44 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Apr 2014 16:08:02 +0200
Subject: [PATCH 1186/4742] [xml-hint addon] Filter out !attrs from top level
 completions

---
 addon/hint/xml-hint.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 9ebec05344..9cfd1e884f 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -38,8 +38,9 @@
         for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].lastIndexOf(prefix, 0) == 0)
           result.push("<" + childList[i]);
       } else if (tagType != "close") {
-        for (var name in tags) if (tags.hasOwnProperty(name) && name != "!top" && (!prefix || name.lastIndexOf(prefix, 0) == 0))
-          result.push("<" + name);
+        for (var name in tags)
+          if (tags.hasOwnProperty(name) && name != "!top" && name != "!attrs" && (!prefix || name.lastIndexOf(prefix, 0) == 0))
+            result.push("<" + name);
       }
       if (cx && (!prefix || tagType == "close" && cx.tagName.lastIndexOf(prefix, 0) == 0))
         result.push("</" + cx.tagName + ">");

From 91e02be407d8ccff5928d2b9ad4f590b803ca321 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Apr 2014 11:31:40 +0200
Subject: [PATCH 1187/4742] Work around Webkit bug where sometimes the sizer
 gets the wrong width

(It'll leave space for a scrollbar to the right of the sizer, though the
scroller does not actually have a scrollbar.)

Issue #2420
---
 lib/codemirror.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 41bf2e6658..ea58167227 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -652,6 +652,13 @@
   function setDocumentHeight(cm, measure) {
     cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = measure.docHeight + "px";
     cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight - scrollerCutOff) + "px";
+    // Work around Webkit bug where it sometimes reserves space for a
+    // non-existing phantom scrollbar in the scroller (Issue #2420)
+    if (webkit && cm.options.lineWrapping &&
+        cm.display.sizer.offsetWidth + cm.display.gutters.offsetWidth < cm.display.scroller.clientWidth - 1) {
+      cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = "0px";
+      cm.display.gutters.style.height = measure.docHeight + "px";
+    }
   }
 
   // Read the actual heights of the rendered lines, and update their

From 17a9de99ed61dbcc78fc54bc77bfe5b4ea140e9f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Apr 2014 11:32:13 +0200
Subject: [PATCH 1188/4742] Set forceUpdate flag in refresh method

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ea58167227..2e7735bb4f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4214,6 +4214,7 @@
     refresh: methodOp(function() {
       var oldHeight = this.display.cachedTextHeight;
       regChange(this);
+      this.curOp.forceUpdate = true;
       clearCaches(this);
       this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
       updateGutterSpace(this);

From 6b8ddd012f0d10f18f59355ee5bd5bc6c8e58457 Mon Sep 17 00:00:00 2001
From: Doug Wikle <dwikle@gmail.com>
Date: Fri, 7 Mar 2014 09:01:19 -0500
Subject: [PATCH 1189/4742] [verilog mode] Rewrite

---
 mode/index.html         |   2 +-
 mode/meta.js            |   1 +
 mode/verilog/index.html | 190 ++++++++++++------------
 mode/verilog/test.js    | 114 +++++++++++++++
 mode/verilog/verilog.js | 315 ++++++++++++++++++++++++++++++----------
 test/index.html         |   2 +
 6 files changed, 444 insertions(+), 180 deletions(-)
 create mode 100644 mode/verilog/test.js

diff --git a/mode/index.html b/mode/index.html
index 8b043b9cfc..4dc5fea180 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -108,7 +108,7 @@ <h2>Language modes</h2>
       <li><a href="vb/index.html">VB.NET</a></li>
       <li><a href="vbscript/index.html">VBScript</a></li>
       <li><a href="velocity/index.html">Velocity</a></li>
-      <li><a href="verilog/index.html">Verilog</a></li>
+      <li><a href="verilog/index.html">Verilog/SystemVerilog</a></li>
       <li><a href="xml/index.html">XML/HTML</a></li>
       <li><a href="xquery/index.html">XQuery</a></li>
       <li><a href="yaml/index.html">YAML</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index bada12c712..b8bfebda2e 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -89,6 +89,7 @@ CodeMirror.modeInfo = [
   {name: 'MariaDB', mime: 'text/x-mariadb', mode: 'sql'},
   {name: 'sTeX', mime: 'text/x-stex', mode: 'stex'},
   {name: 'LaTeX', mime: 'text/x-latex', mode: 'stex'},
+  {name: 'SystemVerilog', mime: 'text/x-systemverilog', mode: 'verilog'},
   {name: 'Tcl', mime: 'text/x-tcl', mode: 'tcl'},
   {name: 'TiddlyWiki ', mime: 'text/x-tiddlywiki', mode: 'tiddlywiki'},
   {name: 'Tiki wiki', mime: 'text/tiki', mode: 'tiki'},
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index cc71056446..4c06cdaecf 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -1,13 +1,14 @@
 <!doctype html>
 
-<title>CodeMirror: Verilog mode</title>
+<title>CodeMirror: Verilog/SystemVerilog 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/edit/matchbrackets.js"></script>
 <script src="verilog.js"></script>
-<style>.CodeMirror {border: 2px inset #dee;}</style>
+<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
 
@@ -18,115 +19,102 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Verilog</a>
+    <li><a class=active href="#">Verilog/SystemVerilog</a>
   </ul>
 </div>
 
 <article>
-<h2>Verilog mode</h2>
-<form><textarea id="code" name="code">
-/* Verilog demo code */
+<h2>SystemVerilog mode</h2>
 
-module butterfly
-  #(
-    parameter WIDTH = 32,
-    parameter MWIDTH = 1
-    )
-   (
-    input wire                     clk,
-    input wire                     rst_n,
-    // m_in contains data that passes through this block with no change.
-    input wire [MWIDTH-1:0]        m_in,
-    // The twiddle factor.
-    input wire signed [WIDTH-1:0]  w,
-    // XA
-    input wire signed [WIDTH-1:0]  xa,
-    // XB
-    input wire signed [WIDTH-1:0]  xb,
-    // Set to 1 when new data is present on inputs.
-    input wire                     x_nd,
-    // delayed version of m_in.
-    output reg [MWIDTH-1:0]        m_out,
-    // YA = XA + W*XB
-    // YB = XA - W*XB
-    output wire signed [WIDTH-1:0] ya,
-    output wire signed [WIDTH-1:0] yb,
-    output reg                     y_nd,
-    output reg                     error
-    );
+<div><textarea id="code" name="code">
+// Literals
+1'b0
+1'bx
+1'bz
+16'hDC78
+'hdeadbeef
+'b0011xxzz
+1234
+32'd5678
+3.4e6
+-128.7
 
-   // Set wire to the real and imag parts for convenience.
-   wire signed [WIDTH/2-1:0]        xa_re;
-   wire signed [WIDTH/2-1:0]        xa_im;
-   assign xa_re = xa[WIDTH-1:WIDTH/2];
-   assign xa_im = xa[WIDTH/2-1:0];
-   wire signed [WIDTH/2-1: 0]       ya_re;
-   wire signed [WIDTH/2-1: 0]       ya_im;
-   assign ya = {ya_re, ya_im};
-   wire signed [WIDTH/2-1: 0]       yb_re;
-   wire signed [WIDTH/2-1: 0]       yb_im;
-   assign yb = {yb_re, yb_im};
+// Macro definition
+`define BUS_WIDTH = 8;
 
-   // Delayed stuff.
-   reg signed [WIDTH/2-1:0]         xa_re_z;
-   reg signed [WIDTH/2-1:0]         xa_im_z;
-   // Output of multiplier
-   wire signed [WIDTH-1:0]          xbw;
-   wire signed [WIDTH/2-1:0]        xbw_re;
-   wire signed [WIDTH/2-1:0]        xbw_im;
-   assign xbw_re = xbw[WIDTH-1:WIDTH/2];
-   assign xbw_im = xbw[WIDTH/2-1:0];
-   // Do summing
-   // I don't think we should get overflow here because of the
-   // size of the twiddle factors.
-   // If we do testing should catch it.
-   assign ya_re = xa_re_z + xbw_re;
-   assign ya_im = xa_im_z + xbw_im;
-   assign yb_re = xa_re_z - xbw_re;
-   assign yb_im = xa_im_z - xbw_im;
-   
-   // Create the multiply module.
-   multiply_complex #(WIDTH) multiply_complex_0
-     (.clk(clk),
-      .rst_n(rst_n),
-      .x(xb),
-      .y(w),
-      .z(xbw)
-      );
+// Module definition
+module block(
+  input                   clk,
+  input                   rst_n,
+  input  [`BUS_WIDTH-1:0] data_in,
+  output [`BUS_WIDTH-1:0] data_out
+);
+  
+  always @(posedge clk or negedge rst_n) begin
 
-  always @ (posedge clk)
-    begin
-       if (!rst_n)
-         begin
-            y_nd <= 1'b0;
-            error <= 1'b0;
-         end
-       else
-         begin
-            // Set delay for x_nd_old and m.
-            y_nd <= x_nd;
-            m_out <= m_in;
-            if (x_nd)
-              begin
-                 xa_re_z <= xa_re/2;
-                 xa_im_z <= xa_im/2;
-              end
-         end
+    if (~rst_n) begin
+      data_out <= 8'b0;
+    end else begin
+      data_out <= data_in;
     end
-   
+    
+    if (~rst_n)
+      data_out <= 8'b0;
+    else
+      data_out <= data_in;
+    
+    if (~rst_n)
+      begin
+        data_out <= 8'b0;
+      end
+    else
+      begin
+        data_out <= data_in;
+      end
+
+  end
+  
 endmodule
-</textarea></form>
 
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "text/x-verilog"
-      });
-    </script>
+// Class definition
+class test;
+
+  /**
+   * Sum two integers
+   */
+  function int sum(int a, int b);
+    int result = a + b;
+    string msg = $sformatf("%d + %d = %d", a, b, result);
+    $display(msg);
+    return result;
+  endfunction
+  
+  task delay(int num_cycles);
+    repeat(num_cycles) #1;
+  endtask
+  
+endclass
+
+</textarea></div>
 
-    <p>Simple mode that tries to handle Verilog-like languages as well as it
-    can. Takes one configuration parameters: <code>keywords</code>, an
-    object whose property names are the keywords in the language.</p>
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    matchBrackets: true,
+    mode: {
+      name: "verilog",
+      noIndentKeywords: ["package"]
+    }
+  });
+</script>
+
+<p>
+Syntax highlighting and indentation for the Verilog and SystemVerilog languages (IEEE 1800).
+<h2>Configuration options:</h2>
+  <ul>
+    <li><strong>noIndentKeywords</strong> - List of keywords which should not cause identation to increase. E.g. ["package", "module"]. Default: None</li>
+  </ul>
+</p>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-verilog</code> (Verilog code).</p>
-  </article>
+<p><strong>MIME types defined:</strong> <code>text/x-verilog</code> and <code>text/x-systemverilog</code>.</p>
+</article>
diff --git a/mode/verilog/test.js b/mode/verilog/test.js
new file mode 100644
index 0000000000..6f5770b848
--- /dev/null
+++ b/mode/verilog/test.js
@@ -0,0 +1,114 @@
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 4}, "verilog");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("Binary literals",
+     "[number 1'b0]",
+     "[number 1'b1]",
+     "[number 1'bx]",
+     "[number 1'bz]",
+     "[number 1'bX]",
+     "[number 1'bZ]",
+     "[number 1'B0]",
+     "[number 1'B1]",
+     "[number 1'Bx]",
+     "[number 1'Bz]",
+     "[number 1'BX]",
+     "[number 1'BZ]",
+     "[number 1'b0]",
+     "[number 1'b1]",
+     "[number 2'b01]",
+     "[number 2'bxz]",
+     "[number 2'b11]",
+     "[number 2'b10]",
+     "[number 2'b1Z]",
+     "[number 12'b0101_0101_0101]",
+     "[number 1'b 0]",
+     "[number 'b0101]"
+  );
+
+  MT("Octal literals",
+     "[number 3'o7]",
+     "[number 3'O7]",
+     "[number 3'so7]",
+     "[number 3'SO7]"
+  );
+
+  MT("Decimal literals",
+     "[number 0]",
+     "[number 1]",
+     "[number 7]",
+     "[number 123_456]",
+     "[number 'd33]",
+     "[number 8'd255]",
+     "[number 8'D255]",
+     "[number 8'sd255]",
+     "[number 8'SD255]",
+     "[number 32'd123]",
+     "[number 32 'd123]",
+     "[number 32 'd 123]"
+  );
+
+  MT("Hex literals",
+     "[number 4'h0]",
+     "[number 4'ha]",
+     "[number 4'hF]",
+     "[number 4'hx]",
+     "[number 4'hz]",
+     "[number 4'hX]",
+     "[number 4'hZ]",
+     "[number 32'hdc78]",
+     "[number 32'hDC78]",
+     "[number 32 'hDC78]",
+     "[number 32'h DC78]",
+     "[number 32 'h DC78]",
+     "[number 32'h44x7]",
+     "[number 32'hFFF?]"
+  );
+
+  MT("Real number literals",
+     "[number 1.2]",
+     "[number 0.1]",
+     "[number 2394.26331]",
+     "[number 1.2E12]",
+     "[number 1.2e12]",
+     "[number 1.30e-2]",
+     "[number 0.1e-0]",
+     "[number 23E10]",
+     "[number 29E-2]",
+     "[number 236.123_763_e-12]"
+  );
+
+  MT("Operators",
+     "[meta ^]"
+  );
+
+  MT("Keywords",
+     "[keyword logic]",
+     "[keyword logic] [variable foo]",
+     "[keyword reg] [variable abc]"
+  );
+
+  MT("Variables",
+     "[variable _leading_underscore]",
+     "[variable _if]",
+     "[number 12] [variable foo]",
+     "[variable foo] [number 14]"
+  );
+
+  MT("Tick defines",
+     "[def `FOO]",
+     "[def `foo]",
+     "[def `FOO_bar]"
+  );
+
+  MT("System calls",
+     "[meta $display]",
+     "[meta $vpi_printf]"
+  );
+
+  MT("Line comment", "[comment // Hello world]");
+
+
+
+})();
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index bc4fd4feee..d52ecea2a3 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -9,35 +9,141 @@
 "use strict";
 
 CodeMirror.defineMode("verilog", function(config, parserConfig) {
+
   var indentUnit = config.indentUnit,
-      keywords = parserConfig.keywords || {},
-      blockKeywords = parserConfig.blockKeywords || {},
-      atoms = parserConfig.atoms || {},
-      hooks = parserConfig.hooks || {},
+      statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
+      dontAlignCalls = parserConfig.dontAlignCalls,
+      noIndentKeywords = parserConfig.noIndentKeywords || [],
       multiLineStrings = parserConfig.multiLineStrings;
-  var isOperatorChar = /[&|~><!\)\(*#%@+\/=?\:;}{,\.\^\-\[\]]/;
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  /**
+   * Keywords from IEEE 1800-2012
+   */
+  var keywords = words(
+    "accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind " +
+    "bins binsof bit break buf bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config " +
+    "const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable " +
+    "dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup " +
+    "endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask " +
+    "enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin " +
+    "function generate genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import " +
+    "incdir include initial inout input inside instance int integer interconnect interface intersect join join_any " +
+    "join_none large let liblist library local localparam logic longint macromodule matches medium modport module " +
+    "nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or output package packed " +
+    "parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup " +
+    "pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg " +
+    "reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime " +
+    "s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify " +
+    "specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on " +
+    "table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior " +
+    "trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void " +
+    "wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor");
+
+  /** Operators from IEEE 1800-2012
+     unary_operator ::=
+       + | - | ! | ~ | & | ~& | | | ~| | ^ | ~^ | ^~
+     binary_operator ::=
+       + | - | * | / | % | == | != | === | !== | ==? | !=? | && | || | **
+       | < | <= | > | >= | & | | | ^ | ^~ | ~^ | >> | << | >>> | <<<
+       | -> | <->
+     inc_or_dec_operator ::= ++ | --
+     unary_module_path_operator ::=
+       ! | ~ | & | ~& | | | ~| | ^ | ~^ | ^~
+     binary_module_path_operator ::=
+       == | != | && | || | & | | | ^ | ^~ | ~^
+  */
+  var isOperatorChar = /[\+\-\*\/!~&|^%=?:]/;
+  var isBracketChar = /[\[\]{}()]/;
+
+  var unsignedNumber = /\d[0-9_]*/;
+  var decimalLiteral = /\d*\s*'s?d\s*\d[0-9_]*/i;
+  var binaryLiteral = /\d*\s*'s?b\s*[xz01][xz01_]*/i;
+  var octLiteral = /\d*\s*'s?o\s*[xz0-7][xz0-7_]*/i;
+  var hexLiteral = /\d*\s*'s?h\s*[0-9a-fxz?][0-9a-fxz?_]*/i;
+  var realLiteral = /(\d[\d_]*(\.\d[\d_]*)?E-?[\d_]+)|(\d[\d_]*\.\d[\d_]*)/i;
+
+  var closingBracketOrWord = /^((\w+)|[)}\]])/;
+  var closingBracket = /[)}\]]/;
 
   var curPunc;
+  var curKeyword;
+
+  // Block openings which are closed by a matching keyword in the form of ("end" + keyword)
+  // E.g. "task" => "endtask"
+  var blockKeywords = words(
+    "case checker class clocking config function generate group interface module package" +
+    "primitive program property specify sequence table task"
+  );
+
+  // Opening/closing pairs
+  var openClose = {};
+  for (var keyword in blockKeywords) {
+    openClose[keyword] = "end" + keyword;
+  }
+  openClose["begin"] = "end";
+  openClose["casex"] = "endcase";
+  openClose["casez"] = "endcase";
+  openClose["do"   ] = "while";
+  openClose["fork" ] = "join;join_any;join_none";
+
+  for (var i in noIndentKeywords) {
+    var keyword = noIndentKeywords[i];
+    if (openClose[keyword]) {
+      openClose[keyword] = undefined;
+    }
+  }
+
+  var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else for foreach forever if initial repeat while");
 
   function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
+    var ch = stream.peek();
+    if (/[,;:\.]/.test(ch)) {
+      curPunc = stream.next();
+      return null;
+    }
+    if (isBracketChar.test(ch)) {
+      curPunc = stream.next();
+      return "bracket";
+    }
+    // Macros (tick-defines)
+    if (ch == '`') {
+      stream.next();
+      if (stream.eatWhile(/[\w\$_]/)) {
+        return "def";
+      } else {
+        return null;
+      }
+    }
+    // System calls
+    if (ch == '$') {
+      stream.next();
+      if (stream.eatWhile(/[\w\$_]/)) {
+        return "meta";
+      } else {
+        return null;
+      }
     }
+    // Time literals
+    if (ch == '#') {
+      stream.next();
+      stream.eatWhile(/[\d_.]/);
+      return "def";
+    }
+    // Strings
     if (ch == '"') {
+      stream.next();
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
     }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/[\d']/.test(ch)) {
-      stream.eatWhile(/[\w\.']/);
-      return "number";
-    }
+    // Comments
     if (ch == "/") {
+      stream.next();
       if (stream.eat("*")) {
         state.tokenize = tokenComment;
         return tokenComment(stream, state);
@@ -46,19 +152,43 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
         stream.skipToEnd();
         return "comment";
       }
+      stream.backUp(1);
+    }
+
+    // Numeric literals
+    if (stream.match(realLiteral) ||
+        stream.match(decimalLiteral) ||
+        stream.match(binaryLiteral) ||
+        stream.match(octLiteral) ||
+        stream.match(hexLiteral) ||
+        stream.match(unsignedNumber) ||
+        stream.match(realLiteral)) {
+      return "number";
     }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
+
+    // Operators
+    if (stream.eatWhile(isOperatorChar)) {
+      return "meta";
     }
-    stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
+
+    // Keywords / plain variables
+    if (stream.eatWhile(/[\w\$_]/)) {
+      var cur = stream.current();
+      if (keywords[cur]) {
+        if (openClose[cur]) {
+          curPunc = "newblock";
+        }
+        if (statementKeywords[cur]) {
+          curPunc = "newstatement";
+        }
+        curKeyword = cur;
+        return "keyword";
+      }
+      return "variable";
     }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
+
+    stream.next();
+    return null;
   }
 
   function tokenString(quote) {
@@ -94,18 +224,56 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     this.prev = prev;
   }
   function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
+    var indent = state.indented;
+    var c = new Context(indent, col, type, null, state.context);
+    return state.context = c;
   }
   function popContext(state) {
     var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
+    if (t == ")" || t == "]" || t == "}") {
       state.indented = state.context.indented;
+    }
     return state.context = state.context.prev;
   }
 
-  // Interface
+  function isClosing(text, contextClosing) {
+    if (text == contextClosing) {
+      return true;
+    } else {
+      // contextClosing may be mulitple keywords separated by ;
+      var closingKeywords = contextClosing.split(";");
+      for (var i in closingKeywords) {
+        if (text == closingKeywords[i]) {
+          return true;
+        }
+      }
+      return false;
+    }
+  }
+
+  function buildElectricInputRegEx() {
+    // Reindentation should occur on any bracket char: {}()[]
+    // or on a match of any of the block closing keywords, at
+    // the end of a line
+    var allClosings = [];
+    for (var i in openClose) {
+      if (openClose[i]) {
+        var closings = openClose[i].split(";");
+        for (var j in closings) {
+          allClosings.push(closings[j]);
+        }
+      }
+    }
+    var re = new RegExp("[{}()\\[\\]]|(" + allClosings.join("|") + ")$");
+    return re;
+  }
 
+  // Interface
   return {
+
+    // Regex to force current line to reindent
+    electricInput: buildElectricInputRegEx(),
+
     startState: function(basecolumn) {
       return {
         tokenize: null,
@@ -124,69 +292,60 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       }
       if (stream.eatSpace()) return null;
       curPunc = null;
+      curKeyword = null;
       var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
+      if (style == "comment" || style == "meta" || style == "variable") return style;
       if (ctx.align == null) ctx.align = true;
 
-      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
+      if (curPunc == ctx.type) {
+        popContext(state);
+      }
+      else if ((curPunc == ";" && ctx.type == "statement") ||
+               (ctx.type && isClosing(curKeyword, ctx.type))) {
+        ctx = popContext(state);
+        while (ctx && ctx.type == "statement") ctx = popContext(state);
       }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
+      else if (curPunc == "{") { pushContext(state, stream.column(), "}"); }
+      else if (curPunc == "[") { pushContext(state, stream.column(), "]"); }
+      else if (curPunc == "(") { pushContext(state, stream.column(), ")"); }
+      else if (ctx && ctx.type == "endcase" && curPunc == ":") { pushContext(state, stream.column(), "statement"); }
+      else if (curPunc == "newstatement") {
         pushContext(state, stream.column(), "statement");
+      } else if (curPunc == "newblock") {
+        var close = openClose[curKeyword];
+        pushContext(state, stream.column(), close);
+      }
+
       state.startOfLine = false;
       return style;
     },
 
     indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context, closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
+      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
+      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
+      var closing = false;
+      var possibleClosing = textAfter.match(closingBracketOrWord);
+      if (possibleClosing) {
+        closing = isClosing(possibleClosing[0], ctx.type);
+      }
+      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
+      else if (closingBracket.test(ctx.type) && ctx.align && !dontAlignCalls) return ctx.column + (closing ? 0 : 1);
+      else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
       else return ctx.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: "{}"
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var verilogKeywords = "always and assign automatic begin buf bufif0 bufif1 case casex casez cell cmos config " +
-    "deassign default defparam design disable edge else end endcase endconfig endfunction endgenerate endmodule " +
-    "endprimitive endspecify endtable endtask event for force forever fork function generate genvar highz0 " +
-    "highz1 if ifnone incdir include initial inout input instance integer join large liblist library localparam " +
-    "macromodule medium module nand negedge nmos nor noshowcancelled not notif0 notif1 or output parameter pmos " +
-    "posedge primitive pull0 pull1 pulldown pullup pulsestyle_onevent pulsestyle_ondetect rcmos real realtime " +
-    "reg release repeat rnmos rpmos rtran rtranif0 rtranif1 scalared showcancelled signed small specify specparam " +
-    "strong0 strong1 supply0 supply1 table task time tran tranif0 tranif1 tri tri0 tri1 triand trior trireg " +
-    "unsigned use vectored wait wand weak0 weak1 while wire wor xnor xor";
-
-  var verilogBlockKeywords = "begin bufif0 bufif1 case casex casez config else end endcase endconfig endfunction " +
-    "endgenerate endmodule endprimitive endspecify endtable endtask for forever function generate if ifnone " +
-    "macromodule module primitive repeat specify table task while";
-
-  function metaHook(stream) {
-    stream.eatWhile(/[\w\$_]/);
-    return "meta";
-  }
-
-  CodeMirror.defineMIME("text/x-verilog", {
-    name: "verilog",
-    keywords: words(verilogKeywords),
-    blockKeywords: words(verilogBlockKeywords),
-    atoms: words("null"),
-    hooks: {"`": metaHook, "$": metaHook}
-  });
+CodeMirror.defineMIME("text/x-verilog", {
+  name: "verilog"
+});
+CodeMirror.defineMIME("text/x-systemverilog", {
+  name: "systemverilog"
+});
 
 });
diff --git a/test/index.html b/test/index.html
index 4fcc028dce..76fd835f28 100644
--- a/test/index.html
+++ b/test/index.html
@@ -95,6 +95,8 @@ <h2>Test Suite</h2>
     <script src="../mode/gfm/test.js"></script>
     <script src="../mode/stex/stex.js"></script>
     <script src="../mode/stex/test.js"></script>
+    <script src="../mode/verilog/verilog.js"></script>
+    <script src="../mode/verilog/test.js"></script>
     <script src="../mode/xquery/xquery.js"></script>
     <script src="../mode/xquery/test.js"></script>
     <script src="../addon/mode/multiplex_test.js"></script>

From 66b842d064a95f37047fe1823582df9285dd99a1 Mon Sep 17 00:00:00 2001
From: as3boyan <denis.flash.as3@gmail.com>
Date: Tue, 1 Apr 2014 23:03:46 +0300
Subject: [PATCH 1190/4742] [haxe mode] Support imports with wildcards

Haxe supports imports with willcard
http://haxe.org/manual/modules#import-whole-package
---
 mode/haxe/haxe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index b8f8408d14..83224d86e4 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -316,7 +316,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
 
   function importdef (type, value) {
   if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
-  else if(type == "variable" || type == "property" || type == ".") return cont(importdef);
+  else if(type == "variable" || type == "property" || type == "." || value == "*") return cont(importdef);
   }
 
   function typedef (type, value)

From 82fbd5d6f4acf0b81677ba937811f27b45bb6e29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Apr 2014 10:17:37 +0200
Subject: [PATCH 1191/4742] Throw an error when a tokenizer doesn't advance the
 stream

Issue #2427
---
 lib/codemirror.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2e7735bb4f..90b827365c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3882,7 +3882,7 @@
       var stream = new StringStream(line.text, this.options.tabSize);
       while (stream.pos < pos.ch && !stream.eol()) {
         stream.start = stream.pos;
-        var style = mode.token(stream, state);
+        var style = readToken(mode, stream, state);
       }
       return {start: stream.start,
               end: stream.pos,
@@ -5548,6 +5548,13 @@
     if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
   }
 
+  function readToken(mode, stream, state) {
+    var style = mode.token(stream, state);
+    if (stream.pos <= stream.start)
+      throw new Error("Mode " + mode.name + " failed to advance stream.");
+    return style;
+  }
+
   // Run the given mode's parser over a line, calling f for each token.
   function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
     var flattenSpans = mode.flattenSpans;
@@ -5562,7 +5569,7 @@
         stream.pos = text.length;
         style = null;
       } else {
-        style = extractLineClasses(mode.token(stream, state), lineClasses);
+        style = extractLineClasses(readToken(mode, stream, state), lineClasses);
       }
       if (cm.options.addModeClass) {
         var mName = CodeMirror.innerMode(mode, state).mode.name;
@@ -5643,7 +5650,7 @@
     stream.start = stream.pos = startAt || 0;
     if (text == "") callBlankLine(mode, state);
     while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) {
-      mode.token(stream, state);
+      readToken(mode, stream, state);
       stream.start = stream.pos;
     }
   }

From 264ae319a31af6d79846c570a35fddb4413be6e2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Apr 2014 11:01:36 +0200
Subject: [PATCH 1192/4742] [javascript mode] Improve indentation of hanging
 else clauses

Closes #2429
---
 mode/javascript/javascript.js | 10 +++++++---
 mode/javascript/test.js       | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c45e04bb8c..9318aabe99 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -325,7 +325,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
     if (type == "{") return cont(pushlex("}"), block, poplex);
     if (type == ";") return cont();
-    if (type == "if") return cont(pushlex("form"), expression, statement, poplex, maybeelse);
+    if (type == "if") {
+      if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
+        cx.state.cc.pop()();
+      return cont(pushlex("form"), expression, statement, poplex, maybeelse);
+    }
     if (type == "function") return cont(functiondef);
     if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
     if (type == "variable") return cont(pushlex("stat"), maybelabel);
@@ -493,7 +497,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ",") return cont(vardef);
   }
   function maybeelse(type, value) {
-    if (type == "keyword b" && value == "else") return cont(pushlex("form"), statement, poplex);
+    if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
   }
   function forspec(type) {
     if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
@@ -606,7 +610,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (state.tokenize != tokenBase) return 0;
       var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
       // Kludge to prevent 'maybelse' from blocking lexical scope pops
-      for (var i = state.cc.length - 1; i >= 0; --i) {
+      if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
         var c = state.cc[i];
         if (c == poplex) lexical = lexical.prev;
         else if (c != maybeelse) break;
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 3f73196118..36341862f0 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -104,6 +104,22 @@
      "  [keyword debugger];",
      "}");
 
+  MT("indent_else",
+     "[keyword for] (;;)",
+     "  [keyword if] ([variable foo])",
+     "    [keyword if] ([variable bar])",
+     "      [number 1];",
+     "    [keyword else]",
+     "      [number 2];",
+     "  [keyword else]",
+     "    [number 3];");
+
+  MT("indent_below_if",
+     "[keyword for] (;;)",
+     "  [keyword if] ([variable foo])",
+     "    [number 1];",
+     "[number 2];");
+
   MT("multilinestring",
      "[keyword var] [variable x] [operator =] [string 'foo\\]",
      "[string bar'];");

From a1432781943d8499e76f8f7e51124747b1ea54b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Apr 2014 11:10:06 +0200
Subject: [PATCH 1193/4742] Fix extra layout round-trip introduced by fix for
 issue #2420

---
 lib/codemirror.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 90b827365c..a37c921391 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -547,6 +547,8 @@
       updateSelection(cm);
       setDocumentHeight(cm, barMeasure);
       updateScrollbars(cm, barMeasure);
+      if (webkit && cm.options.lineWrapping)
+        checkForWebkitWidthBug(cm, barMeasure); // (Issue #2420)
       if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
         forced = true;
         continue;
@@ -652,10 +654,13 @@
   function setDocumentHeight(cm, measure) {
     cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = measure.docHeight + "px";
     cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight - scrollerCutOff) + "px";
+  }
+
+
+  function checkForWebkitWidthBug(cm, measure) {
     // Work around Webkit bug where it sometimes reserves space for a
     // non-existing phantom scrollbar in the scroller (Issue #2420)
-    if (webkit && cm.options.lineWrapping &&
-        cm.display.sizer.offsetWidth + cm.display.gutters.offsetWidth < cm.display.scroller.clientWidth - 1) {
+    if (cm.display.sizer.offsetWidth + cm.display.gutters.offsetWidth < cm.display.scroller.clientWidth - 1) {
       cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = "0px";
       cm.display.gutters.style.height = measure.docHeight + "px";
     }

From e496a0d880a2e0f18af79d7cb081fae544c0fb79 Mon Sep 17 00:00:00 2001
From: mauricio <mauricio@medallia.com>
Date: Thu, 3 Apr 2014 23:12:26 -0300
Subject: [PATCH 1194/4742] [xml mode] Fix closing tag regexp

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

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 3fc0cb5056..b8c4297976 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -334,7 +334,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
           return state.tagStart + indentUnit * multilineTagIndentFactor;
       }
       if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
-      var tagAfter = textAfter && /^<(\/)?(\w*)/.exec(textAfter);
+      var tagAfter = textAfter && /^<(\/)?([\w_:\.-]*)/.exec(textAfter);
       if (tagAfter && tagAfter[1]) { // Closing tag spotted
         while (context) {
           if (context.tagName == tagAfter[2]) {

From 4d748d7872024d89addf1e1f93509b137e8a276e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Apr 2014 11:20:38 +0200
Subject: [PATCH 1195/4742] [merge addon] Verify that diff is up to date in
 left/rightChunks

Issue #2438
---
 addon/merge/merge.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index fc1cb2f5a1..c8619e7394 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -53,6 +53,14 @@
     }
   };
 
+  function ensureDiff(dv) {
+    if (dv.diffOutOfDate) {
+      dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
+      dv.diffOutOfDate = false;
+      CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
+    }
+  }
+
   function registerUpdate(dv) {
     var edit = {from: 0, to: 0, marked: []};
     var orig = {from: 0, to: 0, marked: []};
@@ -65,11 +73,7 @@
         clearMarks(dv.orig, orig.marked, dv.classes);
         edit.from = edit.to = orig.from = orig.to = 0;
       }
-      if (dv.diffOutOfDate) {
-        dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
-        dv.diffOutOfDate = false;
-        CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
-      }
+      ensureDiff(dv);
       if (dv.showDifferences) {
         updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
         updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
@@ -362,10 +366,10 @@
       if (this.left) this.left.setShowDifferences(val);
     },
     rightChunks: function() {
-      return this.right && getChunks(this.right.diff);
+      return this.right && getChunks(this.right);
     },
     leftChunks: function() {
-      return this.left && getChunks(this.left.diff);
+      return this.left && getChunks(this.left);
     }
   };
 
@@ -416,9 +420,10 @@
       f(startOrig, orig.line + 1, startEdit, edit.line + 1);
   }
 
-  function getChunks(diff) {
+  function getChunks(dv) {
+    ensureDiff(dv);
     var collect = [];
-    iterateChunks(diff, function(topOrig, botOrig, topEdit, botEdit) {
+    iterateChunks(dv.diff, function(topOrig, botOrig, topEdit, botEdit) {
       collect.push({origFrom: topOrig, origTo: botOrig,
                     editFrom: topEdit, editTo: botEdit});
     });

From 72f00862d3487bc76c07a987ef7a9dce3365c26e Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Sun, 6 Apr 2014 15:09:30 -0700
Subject: [PATCH 1196/4742] [r mode] Add lineComment property

---
 mode/r/r.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/r/r.js b/mode/r/r.js
index 7f4feb238b..281d7fa40f 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -148,7 +148,9 @@ CodeMirror.defineMode("r", function(config) {
       if (ctx.type == "block") return ctx.indent + (firstChar == "{" ? 0 : config.indentUnit);
       else if (ctx.align) return ctx.column + (closing ? 0 : 1);
       else return ctx.indent + (closing ? 0 : config.indentUnit);
-    }
+    },
+
+    lineComment: "#"
   };
 });
 

From 1eafe973de552c1c70163d3fa60ce23e2d1952ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Apr 2014 16:10:51 +0200
Subject: [PATCH 1197/4742] List punctuation in default theme, don't set color
 for default color styles

Also fix Erlang mode to not return a non-standard token type.

Issue #2435
---
 lib/codemirror.css    | 7 ++++---
 mode/erlang/erlang.js | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 13eb137918..098a317a22 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -70,11 +70,12 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-s-default .cm-atom {color: #219;}
 .cm-s-default .cm-number {color: #164;}
 .cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable {color: black;}
+.cm-s-default .cm-variable,
+.cm-s-default .cm-punctuation,
+.cm-s-default .cm-property,
+.cm-s-default .cm-operator {}
 .cm-s-default .cm-variable-2 {color: #05a;}
 .cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-property {color: black;}
-.cm-s-default .cm-operator {color: black;}
 .cm-s-default .cm-comment {color: #a50;}
 .cm-s-default .cm-string {color: #a11;}
 .cm-s-default .cm-string-2 {color: #f50;}
diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index 79693fca22..3d4b1ba92e 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -358,7 +358,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     switch (type) {
       case "atom":        return "atom";
       case "attribute":   return "attribute";
-      case "boolean":     return "special";
+      case "boolean":     return "atom";
       case "builtin":     return "builtin";
       case "close_paren": return null;
       case "colon":       return null;

From 3be0f06e00f1afc0868b5d52a68214dc236ea3b4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Apr 2014 21:29:43 +0200
Subject: [PATCH 1198/4742] [rulers addon] Fix bug where rulers cause
 unnecessary vertical scroll

Issue #2439
---
 addon/display/rulers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index eb0ff06e3a..a5386aa510 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -31,7 +31,7 @@
     var val = cm.getOption("rulers");
     var cw = cm.defaultCharWidth();
     var left = cm.charCoords(CodeMirror.Pos(cm.firstLine(), 0), "div").left;
-    var bot = -cm.display.scroller.offsetHeight;
+    var minH = cm.display.scroller.offsetHeight + 30;
     for (var i = 0; i < val.length; i++) {
       var elt = document.createElement("div");
       var col, cls = null;
@@ -42,7 +42,7 @@
         cls = val[i].className;
       }
       elt.className = "CodeMirror-ruler" + (cls ? " " + cls : "");
-      elt.style.cssText = "left: " + (left + col * cw) + "px; top: -50px; bottom: " + bot + "px";
+      elt.style.cssText = "left: " + (left + col * cw) + "px; top: -50px; bottom: -20px; min-height: " + minH + "px";
       cm.display.lineSpace.insertBefore(elt, cm.display.cursorDiv);
     }
   }

From df33eaf3b7cc3c9cffe42e6276564b837528d66d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Apr 2014 21:50:57 +0200
Subject: [PATCH 1199/4742] [markdown mode] Fix for token sometimes not
 advancing the stream

Issue #2447
---
 mode/markdown/markdown.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 199c7a7155..ff466be86f 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -709,7 +709,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         if (forceBlankLine) {
           state.prevLineHasContent = false;
-          return blankLine(state);
+          blankLine(state);
+          return this.token(stream, state);
         } else {
           state.prevLineHasContent = state.thisLineHasContent;
           state.thisLineHasContent = true;
@@ -737,7 +738,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         state.indentation = adjustedIndentation;
         if (indentation > 0) return null;
       }
-      return state.f(stream, state);
+      var result = state.f(stream, state);
+      if (stream.start == stream.pos) return this.token(stream, state);
+      else return result;
     },
 
     innerMode: function(state) {

From 72f0e188def243041e4e748a193c29f5b38d660b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Apr 2014 21:51:20 +0200
Subject: [PATCH 1200/4742] Add check for stream advancement to mode test
 runner

Issue #2447
---
 test/mode_test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/mode_test.js b/test/mode_test.js
index 46174e1f78..dc20a0523e 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -120,6 +120,8 @@
       /* Start copied code from CodeMirror.highlight */
       while (!stream.eol()) {
         var compare = mode.token(stream, state), substr = stream.current();
+        if (stream.start >= stream.pos)
+          throw new Failure("Failed to advance the stream." + stream.string + " " + stream.pos);
         if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
         stream.start = stream.pos;
         if (pos && st[pos-2] == compare && !newLine) {

From a97d436143f0346091fd391f4d682e30ab206437 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Apr 2014 21:58:46 +0200
Subject: [PATCH 1201/4742] [haml mode] Fix tokenizer not advancing stream when
 switching modes

---
 mode/haml/haml.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 6b205b43e4..59a86e7cec 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -8,9 +8,6 @@
 })(function(CodeMirror) {
 "use strict";
 
-(function() {
-  "use strict";
-
   // full haml mode. This handled embeded ruby and html fragments too
   CodeMirror.defineMode("haml", function(config) {
     var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"});
@@ -75,7 +72,7 @@
       // donot handle --> as valid ruby, make it HTML close comment instead
       if (state.startOfLine && !stream.match("-->", false) && (ch == "=" || ch == "-" )) {
         state.tokenize = ruby;
-        return null;
+        return state.tokenize(stream, state);
       }
 
       if (state.previousToken.style == "hamlTag" ||
@@ -83,10 +80,10 @@
           state.previousToken.style == "hamlAttribute") {
         if (ch == "(") {
           state.tokenize = rubyInQuote(")");
-          return null;
+          return state.tokenize(stream, state);
         } else if (ch == "{") {
           state.tokenize = rubyInQuote("}");
-          return null;
+          return state.tokenize(stream, state);
         }
       }
 
@@ -156,6 +153,4 @@
   }, "htmlmixed", "ruby");
 
   CodeMirror.defineMIME("text/x-haml", "haml");
-})();
-
 });

From 90e0c283f7ba61f45b3c9d632de98a1c9a7ce538 Mon Sep 17 00:00:00 2001
From: B Krishna Chaitanya <bkchaitan94@gmail.com>
Date: Tue, 8 Apr 2014 00:53:20 +0530
Subject: [PATCH 1202/4742] [sublime keymap] Keep cursor in view while
 scrolling with Ctrl+Up or Ctrl+Down

---
 keymap/sublime.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 4d9211533e..ae33d48d5a 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -52,9 +52,23 @@
   cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
 
   cmds[map[ctrl + "Up"] = "scrollLineUp"] = function(cm) {
+    if(!cm.somethingSelected()){
+      var visibleBottomLine = cm.lineAtHeight(cm.getScrollInfo().top + cm.getScrollInfo().clientHeight, "local");
+      var cur = cm.getCursor();
+      if(cur.line >= visibleBottomLine){
+        cm.setCursor({line:visibleBottomLine-1, ch:cur.ch});
+      }
+    }
     cm.scrollTo(null, cm.getScrollInfo().top - cm.defaultTextHeight());
   };
   cmds[map[ctrl + "Down"] = "scrollLineDown"] = function(cm) {
+    if(!cm.somethingSelected()){
+      var visibleTopLine = cm.lineAtHeight(cm.getScrollInfo().top, "local")+1;
+      var cur = cm.getCursor();
+      if(cur.line-1 < visibleTopLine){
+        cm.setCursor({line:visibleTopLine+1, ch:cur.ch});
+      }
+    }
     cm.scrollTo(null, cm.getScrollInfo().top + cm.defaultTextHeight());
   };
 

From 0cb9b1daa7f40f9eb58e94a1520ad06fdb1446de Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 8 Apr 2014 08:50:25 +0200
Subject: [PATCH 1203/4742] Clean up 90e0c283f7ba61f45b3c9d632de98a1c9a7ce538

Issue #2448
---
 keymap/sublime.js | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index ae33d48d5a..eea46347fd 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -52,24 +52,22 @@
   cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
 
   cmds[map[ctrl + "Up"] = "scrollLineUp"] = function(cm) {
-    if(!cm.somethingSelected()){
-      var visibleBottomLine = cm.lineAtHeight(cm.getScrollInfo().top + cm.getScrollInfo().clientHeight, "local");
-      var cur = cm.getCursor();
-      if(cur.line >= visibleBottomLine){
-        cm.setCursor({line:visibleBottomLine-1, ch:cur.ch});
-      }
+    var info = cm.getScrollInfo();
+    if (!cm.somethingSelected()) {
+      var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local");
+      if (cm.getCursor().line >= visibleBottomLine)
+        cm.execCommand("goLineUp");
     }
-    cm.scrollTo(null, cm.getScrollInfo().top - cm.defaultTextHeight());
+    cm.scrollTo(null, info.top - cm.defaultTextHeight());
   };
   cmds[map[ctrl + "Down"] = "scrollLineDown"] = function(cm) {
-    if(!cm.somethingSelected()){
-      var visibleTopLine = cm.lineAtHeight(cm.getScrollInfo().top, "local")+1;
-      var cur = cm.getCursor();
-      if(cur.line-1 < visibleTopLine){
-        cm.setCursor({line:visibleTopLine+1, ch:cur.ch});
-      }
+    var info = cm.getScrollInfo();
+    if (!cm.somethingSelected()) {
+      var visibleTopLine = cm.lineAtHeight(info.top, "local")+1;
+      if (cm.getCursor().line <= visibleTopLine)
+        cm.execCommand("goLineDown");
     }
-    cm.scrollTo(null, cm.getScrollInfo().top + cm.defaultTextHeight());
+    cm.scrollTo(null, info.top + cm.defaultTextHeight());
   };
 
   cmds[map["Shift-" + ctrl + "L"] = "splitSelectionByLine"] = function(cm) {

From d77a0440c3ed1d3ac5f5e2877346528c51330751 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 8 Apr 2014 10:29:38 +0200
Subject: [PATCH 1204/4742] [merge addon] Don't try to remove line class on
 lines that aren't in doc anymore

Issue #2438
---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index c8619e7394..fe3fcf4282 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -169,7 +169,7 @@
       var mark = arr[i];
       if (mark instanceof CodeMirror.TextMarker) {
         mark.clear();
-      } else {
+      } else if (mark.parent) {
         editor.removeLineClass(mark, "background", classes.chunk);
         editor.removeLineClass(mark, "background", classes.start);
         editor.removeLineClass(mark, "background", classes.end);

From aa90eb2f8c1bc5c73c6255ce7733b8cd351e0036 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 8 Apr 2014 10:37:19 +0200
Subject: [PATCH 1205/4742] [clike mode] Remove obsolete function namespace

---
 mode/clike/clike.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 0e61020845..ff0c91d9fe 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -173,7 +173,6 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   };
 });
 
-(function() {
   function words(str) {
     var obj = {}, words = str.split(" ");
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
@@ -432,6 +431,5 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     hooks: {"#": cppHook},
     modeProps: {fold: ["brace", "include"]}
   });
-}());
 
 });

From 3d5211dff75aabaab56f148a60d8fbaa14c29205 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 8 Apr 2014 10:39:42 +0200
Subject: [PATCH 1206/4742] [clike mode] Enable autocompletion in mode demo

---
 mode/clike/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/clike/index.html b/mode/clike/index.html
index d892fddbdb..d1abf9359d 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -7,6 +7,8 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
+<link rel="stylesheet" href="../../addon/hint/show-hint.css">
+<script src="../../addon/hint/show-hint.js"></script>
 <script src="clike.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
@@ -185,6 +187,8 @@ <h2>Java example</h2>
         matchBrackets: true,
         mode: "text/x-java"
       });
+      var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
+      CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
     </script>
 
     <p>Simple mode that tries to handle C-like languages as well as it

From 9fb57bc70bf5e339436984e03a1e376241b61e4f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 8 Apr 2014 10:47:22 +0200
Subject: [PATCH 1207/4742] Add simple completion helper for php, scala, java,
 c#

Issue #2441
---
 mode/clike/clike.js |  7 ++++---
 mode/php/php.js     | 23 +++++++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index ff0c91d9fe..60b88bf1aa 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -250,6 +250,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   }
 
   function def(mimes, mode) {
+    if (typeof mimes == "string") mimes = [mimes];
     var words = [];
     function add(obj) {
       if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop))
@@ -294,7 +295,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     },
     modeProps: {fold: ["brace", "include"]}
   });
-  CodeMirror.defineMIME("text/x-java", {
+  def("text/x-java", {
     name: "clike",
     keywords: words("abstract assert boolean break byte case catch char class const continue default " +
                     "do double else enum extends final finally float for goto if implements import " +
@@ -311,7 +312,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     },
     modeProps: {fold: ["brace", "import"]}
   });
-  CodeMirror.defineMIME("text/x-csharp", {
+  def("text/x-csharp", {
     name: "clike",
     keywords: words("abstract as base break case catch checked class const continue" +
                     " default delegate do else enum event explicit extern finally fixed for" +
@@ -337,7 +338,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
     }
   });
-  CodeMirror.defineMIME("text/x-scala", {
+  def("text/x-scala", {
     name: "clike",
     keywords: words(
 
diff --git a/mode/php/php.js b/mode/php/php.js
index 7156dbba6f..bcec3ebb22 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -20,17 +20,24 @@
       return "string";
     };
   }
+
+  var phpKeywords = "abstract and array as break case catch class clone const continue declare default " +
+    "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " +
+    "for foreach function global goto if implements interface instanceof namespace " +
+    "new or private protected public static switch throw trait try use var while xor " +
+    "die echo empty exit eval include include_once isset list require require_once return " +
+    "print unset __halt_compiler self static parent yield insteadof finally";
+  var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
+  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once";
+  CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
+
   var phpConfig = {
     name: "clike",
-    keywords: keywords("abstract and array as break case catch class clone const continue declare default " +
-                       "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " +
-                       "for foreach function global goto if implements interface instanceof namespace " +
-                       "new or private protected public static switch throw trait try use var while xor " +
-                       "die echo empty exit eval include include_once isset list require require_once return " +
-                       "print unset __halt_compiler self static parent yield insteadof finally"),
+    helperType: "php",
+    keywords: keywords(phpKeywords),
     blockKeywords: keywords("catch do else elseif for foreach if switch try while finally"),
-    atoms: keywords("true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__"),
-    builtin: keywords("func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once"),
+    atoms: keywords(phpAtoms),
+    builtin: keywords(phpBuiltin),
     multiLineStrings: true,
     hooks: {
       "$": function(stream) {

From 908342c7504f9ff440d7e5bec51399f776a6fec4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 8 Apr 2014 11:04:36 +0200
Subject: [PATCH 1208/4742] [matchbrackets addon] Fix highlighting of brackets
 when scan reaches end/start of doc

Issue #2442
---
 addon/edit/matchbrackets.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index b889fa3ae5..dcdde81dfe 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -22,6 +22,7 @@
     var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
     var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
+    if (found == null) return null;
     return {from: Pos(where.line, pos), to: found && found.pos,
             match: found && found.ch == match.charAt(0), forward: dir > 0};
   }
@@ -30,9 +31,12 @@
   // should be a regexp, e.g. /[[\]]/
   //
   // Note: If "where" is on an open bracket, then this bracket is ignored.
+  //
+  // Returns false when no bracket was found, null when it reached
+  // maxScanLines and gave up
   function scanForBracket(cm, where, dir, style, config) {
     var maxScanLen = (config && config.maxScanLineLength) || 10000;
-    var maxScanLines = (config && config.maxScanLines) || 500;
+    var maxScanLines = (config && config.maxScanLines) || 1000;
 
     var stack = [];
     var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/;
@@ -54,6 +58,7 @@
         }
       }
     }
+    return lineNo - dir == (dir > 0 ? cm.lastLine() : cm.firstLine()) ? false : null;
   }
 
   function matchBrackets(cm, autoclear, config) {
@@ -62,11 +67,10 @@
     var marks = [], ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
       var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config);
-      if (match && cm.getLine(match.from.line).length <= maxHighlightLen &&
-          match.to && cm.getLine(match.to.line).length <= maxHighlightLen) {
+      if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
         var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
         marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
-        if (match.to)
+        if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)
           marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style}));
       }
     }

From e9cd523ea1340ce73d6642a6703ea810c498c5f8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 8 Apr 2014 14:49:19 +0200
Subject: [PATCH 1209/4742] Fix addLineClass (and similar) returning null on
 no-op

When the call didn't result in an actual change (for example
line already had the given class), changeLine would return null.

This doesn't seem useful, and caused issue #2438. It now always
returns the line handle (as documented).
---
 lib/codemirror.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a37c921391..1a70cd68de 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3674,7 +3674,6 @@
     else no = lineNo(handle);
     if (no == null) return null;
     if (op(line, no)) regLineChange(cm, no, changeType);
-    else return null;
     return line;
   }
 

From 981a01f3e0857e6f98cbbe4b753471729c42017e Mon Sep 17 00:00:00 2001
From: as3boyan <denis.flash.as3@gmail.com>
Date: Wed, 9 Apr 2014 10:17:53 +0300
Subject: [PATCH 1210/4742] [haxe mode] Add HXML mode

---
 mode/haxe/haxe.js    | 68 ++++++++++++++++++++++++++++++++++++++++++++
 mode/haxe/index.html | 29 ++++++++++++++++---
 2 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 83224d86e4..e4d7347219 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -443,4 +443,72 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
 
 CodeMirror.defineMIME("text/x-haxe", "haxe");
 
+CodeMirror.defineMode("hxml", function () {
+
+  return {
+    startState: function () {
+      return {
+        define: false,
+        inString: false
+      };
+    },
+    token: function (stream, state) {
+      var ch = stream.peek();
+      var sol = stream.sol();
+
+      ///* comments */
+      if (ch == "#") {
+        stream.skipToEnd();
+        return "comment";
+      }
+      if (sol && ch == "-") {
+        var style = "variable-2";
+
+        stream.eat(/-/);
+
+        if (stream.peek() == "-") {
+          stream.eat(/-/);
+          style = "keyword a";
+        }
+
+        if (stream.peek() == "D") {
+          stream.eat(/[D]/);
+          style = "keyword c";
+          state.define = true;
+        }
+
+        stream.eatWhile(/[A-Z]/i);
+        return style;
+      }
+
+      var ch = stream.peek();
+
+      if (state.inString == false && ch == "'") {
+        state.inString = true;
+        ch = stream.next();
+      }
+
+      if (state.inString == true) {
+        if (stream.skipTo("'")) {
+
+        } else {
+          stream.skipToEnd();
+        }
+
+        if (stream.peek() == "'") {
+          stream.next();
+          state.inString = false;
+        }
+
+        return "string";
+      }
+
+      stream.next();
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-hxml", "hxml");
+
 });
diff --git a/mode/haxe/index.html b/mode/haxe/index.html
index ec3b8e0e75..4c3b9783bb 100644
--- a/mode/haxe/index.html
+++ b/mode/haxe/index.html
@@ -26,7 +26,7 @@
 <h2>Haxe mode</h2>
 
 
-<div><textarea id="code" name="code">
+<div><p><textarea id="code-haxe" name="code">
 import one.two.Three;
 
 @attr("test")
@@ -89,15 +89,36 @@ <h2>Haxe mode</h2>
 	grey( v : Int );
 	rgb (r:Int,g:Int,b:Int);
 }
-</textarea></div>
+</textarea></p>
+
+<p>Hxml mode:</p>
+
+<p><textarea id="code-hxml">
+-cp test
+-js path/to/file.js
+#-remap nme:flash
+--next
+-D source-map-content
+-cmd 'test'
+-lib lime
+</textarea></p>
+</div>
 
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+      var editor = CodeMirror.fromTextArea(document.getElementById("code-haxe"), {
+      	mode: "haxe",
+        lineNumbers: true,
+        indentUnit: 4,
+        indentWithTabs: true
+      });
+      
+      editor = CodeMirror.fromTextArea(document.getElementById("code-hxml"), {
+      	mode: "hxml",
         lineNumbers: true,
         indentUnit: 4,
         indentWithTabs: true
       });
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-haxe</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/x-haxe, text/x-hxml</code>.</p>
   </article>

From 08b4d1e27f67fe1d86d2be526a646e82909b295c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 9 Apr 2014 15:53:29 +0200
Subject: [PATCH 1211/4742] [runmode addon] Call blankLine when available

---
 addon/runmode/runmode-standalone.js | 1 +
 addon/runmode/runmode.js            | 1 +
 addon/runmode/runmode.node.js       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index eaa2b8f2fb..aba6f0e139 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -139,6 +139,7 @@ CodeMirror.runMode = function (string, modespec, callback, options) {
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
     var stream = new CodeMirror.StringStream(lines[i]);
+    if (!stream.string && mode.blankLine) mode.blankLine();
     while (!stream.eol()) {
       var style = mode.token(stream, state);
       callback(stream.current(), style, i, stream.start, state);
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 351840e08e..44c17b1a48 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -57,6 +57,7 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
     var stream = new CodeMirror.StringStream(lines[i]);
+    if (!stream.string && mode.blankLine) mode.blankLine();
     while (!stream.eol()) {
       var style = mode.token(stream, state);
       callback(stream.current(), style, i, stream.start, state);
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 74c39be7e7..54be6e930a 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -107,6 +107,7 @@ exports.runMode = function(string, modespec, callback, options) {
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
     var stream = new exports.StringStream(lines[i]);
+    if (!stream.string && mode.blankLine) mode.blankLine();
     while (!stream.eol()) {
       var style = mode.token(stream, state);
       callback(stream.current(), style, i, stream.start, state);

From 8a6778baf496da5c80fe785304fdd0e3d5ec8adb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 9 Apr 2014 22:26:50 +0200
Subject: [PATCH 1212/4742] Revert "Remove fakedLastChar hack"

This reverts commit 475b2be0da668724fa910dc70579820eb3ad905e.

Issue #2452
Issue #2384
---
 lib/codemirror.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1a70cd68de..911d0aa21c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2225,6 +2225,11 @@
     // 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) || isReadOnly(cm) || cm.options.disableInput) return false;
+    // See paste handler for more on the fakedLastChar kludge
+    if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
+      input.value = input.value.substring(0, input.value.length - 1);
+      cm.state.fakedLastChar = false;
+    }
     var text = input.value;
     // If nothing changed, bail.
     if (text == prevInput && !cm.somethingSelected()) return false;
@@ -2424,6 +2429,16 @@
       fastPoll(cm);
     });
     on(d.input, "paste", function() {
+      // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
+      // Add a char to the end of textarea before paste occur so that
+      // selection doesn't span to the end of textarea.
+      if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
+        var start = d.input.selectionStart, end = d.input.selectionEnd;
+        d.input.value += "$";
+        d.input.selectionStart = start;
+        d.input.selectionEnd = end;
+        cm.state.fakedLastChar = true;
+      }
       cm.state.pasteIncoming = true;
       fastPoll(cm);
     });

From 17eb93d8cce970ebc62a4a7589a5204b6aa74dc4 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Thu, 10 Apr 2014 15:40:38 -0700
Subject: [PATCH 1213/4742] [go mode] Set Go mode to use brace folding

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

diff --git a/mode/go/go.js b/mode/go/go.js
index 7ba780ead8..82463052f6 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -169,6 +169,7 @@ CodeMirror.defineMode("go", function(config) {
     },
 
     electricChars: "{}):",
+    fold: "brace",
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
     lineComment: "//"

From 2d8719ac5732f7d66d58d8c95bdf028dc2cc8f4c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Apr 2014 11:24:47 +0200
Subject: [PATCH 1214/4742] Prevent overlay token types from showing up in
 getTokenTypeAt output

Issue #2457
---
 lib/codemirror.js | 13 ++++++++-----
 test/test.js      | 13 +++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 911d0aa21c..50a20b657c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3914,13 +3914,16 @@
       pos = clipPos(this.doc, pos);
       var styles = getLineStyles(this, getLine(this.doc, pos.line));
       var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
-      if (ch == 0) return styles[2];
-      for (;;) {
+      var type;
+      if (ch == 0) type = styles[2];
+      else for (;;) {
         var mid = (before + after) >> 1;
         if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
         else if (styles[mid * 2 + 1] < ch) before = mid + 1;
-        else return styles[mid * 2 + 2];
+        else { type = styles[mid * 2 + 2]; break; }
       }
+      var cut = type ? type.indexOf("cm-overlay ") : -1;
+      return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1);
     },
 
     getModeAt: function(pos) {
@@ -5636,12 +5639,12 @@
         }
         if (!style) return;
         if (overlay.opaque) {
-          st.splice(start, i - start, end, style);
+          st.splice(start, i - start, end, "cm-overlay " + style);
           i = start + 2;
         } else {
           for (; start < i; start += 2) {
             var cur = st[start+1];
-            st[start+1] = cur ? cur + " " + style : style;
+            st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style;
           }
         }
       }, lineClasses);
diff --git a/test/test.js b/test/test.js
index 8c3a307d53..7d597688a8 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1890,3 +1890,16 @@ testCM("alwaysMergeSelEventWithChangeOrigin", function(cm) {
   cm.undoSelection();
   eq(cm.getValue(), "Va");
 }, {value: "a"});
+
+testCM("getTokenTypeAt", function(cm) {
+  eq(cm.getTokenTypeAt(Pos(0, 0)), "number");
+  eq(cm.getTokenTypeAt(Pos(0, 6)), "string");
+  cm.addOverlay({
+    token: function(stream) {
+      if (stream.match("foo")) return "foo";
+      else stream.next();
+    }
+  });
+  eq(byClassName(cm.getWrapperElement(), "cm-foo").length, 1);
+  eq(cm.getTokenTypeAt(Pos(0, 6)), "string");
+}, {value: "1 + 'foo'", mode: "javascript"});

From 6c4d1054e162d8cd862505ed20d161327f81b735 Mon Sep 17 00:00:00 2001
From: Takuji Shimokawa <takuji.shimokawa@gmail.com>
Date: Sat, 29 Mar 2014 15:57:59 +0900
Subject: [PATCH 1215/4742] Refines the text selection detection in readInput
 function.

This change is for enabling the display update while inputting text via the input method.
---
 lib/codemirror.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 50a20b657c..f655e27b61 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2224,7 +2224,8 @@
     // 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) || isReadOnly(cm) || cm.options.disableInput) return false;
+    if (!cm.state.focused || (hasSelection(input) && !prevInput) || isReadOnly(cm) || cm.options.disableInput)
+      return false;
     // See paste handler for more on the fakedLastChar kludge
     if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
       input.value = input.value.substring(0, input.value.length - 1);

From 9d2eeed774cfcf93393ff56530c4f9d3d1a37e69 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Apr 2014 12:09:54 +0200
Subject: [PATCH 1216/4742] Fix context menu select-all in IE11

Issue #2463
---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f655e27b61..9a47f3aa46 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3104,7 +3104,10 @@
       signal(cm, "focus", cm);
       cm.state.focused = true;
       addClass(cm.display.wrapper, "CodeMirror-focused");
-      if (!cm.curOp) {
+      // The prevInput test prevents this from firing when a context
+      // menu is closed (since the resetInput would kill the
+      // select-all detection hack)
+      if (!cm.curOp && cm.display.prevInput != "\u200b") {
         resetInput(cm);
         if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
       }
@@ -3173,7 +3176,7 @@
       if (display.input.selectionStart != null) {
         if (!ie || ie_upto8) prepareSelectAllHack();
         clearTimeout(detectingSelectAll);
-        var i = 0, poll = function(){
+        var i = 0, poll = function() {
           if (display.prevInput == "\u200b" && display.input.selectionStart == 0)
             operation(cm, commands.selectAll)(cm);
           else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);

From e546c8e4fffe67b918761617291e15ccae23544a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Apr 2014 12:34:44 +0200
Subject: [PATCH 1217/4742] Be more accurate about which handlers to fire
 change events for

I.e. don't fire for a handler that wasn't registered when the change happened.
---
 lib/codemirror.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9a47f3aa46..33b9811599 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1955,11 +1955,8 @@
       delayedCallbacks = null;
     }
     // Fire change events, and delayed event handlers
-    if (op.changeObjs) {
-      for (var i = 0; i < op.changeObjs.length; i++)
-        signal(cm, "change", cm, op.changeObjs[i]);
+    if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);
-    }
     if (op.cursorActivity) signal(cm, "cursorActivity", cm, op.origin);
     if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }
@@ -3481,13 +3478,17 @@
     else
       regChange(cm, from.line, to.line + 1, lendiff);
 
-    if (hasHandler(cm, "change") || hasHandler(cm, "changes"))
-      (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push({
+    var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
+    if (changeHandler || changesHandler) {
+      var obj = {
         from: from, to: to,
         text: change.text,
         removed: change.removed,
         origin: change.origin
-      });
+      };
+      if (changeHandler) signalLater(cm, "change", cm, obj);
+      if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj);
+    }
   }
 
   function replaceRange(doc, code, from, to, origin) {

From 8b1a5bb7b72e4987893f2402aa36fbf79d09b905 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Apr 2014 13:06:22 +0200
Subject: [PATCH 1218/4742] Be more precise about which cursorActivity handlers
 to fire

Issue #2464
---
 keymap/vim.js     |  4 ++--
 lib/codemirror.js | 25 +++++++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 6fedf93292..42e4522693 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4062,7 +4062,7 @@
     /**
     * Listens for any kind of cursor activity on CodeMirror.
     */
-    function onCursorActivity(cm, origin) {
+    function onCursorActivity(cm) {
       var vim = cm.state.vim;
       if (vim.insertMode) {
         // Tracking cursor activity in insert mode (for macro support).
@@ -4075,7 +4075,7 @@
           // Cursor moved outside the context of an edit. Reset the change.
           lastChange.changes = [];
         }
-      } else if (origin == '*mouse') {
+      } else if (cm.doc.history.lastSelOrigin == '*mouse') {
         // Reset lastHPos if mouse click was done in normal mode.
         vim.lastHPos = cm.doc.getCursor().ch;
       }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 33b9811599..cb80d8c7c0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1131,7 +1131,6 @@
 
   // Set a new selection.
   function setSelection(doc, sel, options) {
-    if (options && options.origin && doc.cm) doc.cm.curOp.origin = options.origin;
     setSelectionNoUndo(doc, sel, options);
     addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
   }
@@ -1152,9 +1151,10 @@
 
     doc.sel = sel;
 
-    if (doc.cm)
-      doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged =
-        doc.cm.curOp.cursorActivity = true;
+    if (doc.cm) {
+      doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;
+      signalCursorActivity(doc.cm);
+    }
     signalLater(doc, "cursorActivity", doc);
   }
 
@@ -1889,8 +1889,7 @@
       updateInput: null,       // Whether to reset the input textarea
       typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
       changeObjs: null,        // Accumulated changes, for firing change events
-      origin: null,            // Selection's origin
-      cursorActivity: false,   // Whether to fire a cursorActivity event
+      cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
       selectionChanged: false, // Whether the selection needs to be redrawn
       updateMaxLine: false,    // Set when the widest line needs to be determined anew
       scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
@@ -1957,7 +1956,9 @@
     // Fire change events, and delayed event handlers
     if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);
-    if (op.cursorActivity) signal(cm, "cursorActivity", cm, op.origin);
+    if (op.cursorActivityHandlers)
+      for (var i = 0; i < op.cursorActivityHandlers.length; i++)
+        op.cursorActivityHandlers[i](cm);
     if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }
 
@@ -3450,7 +3451,7 @@
     }
 
     if (doc.sel.contains(change.from, change.to) > -1)
-      cm.curOp.cursorActivity = true;
+      signalCursorActivity(cm);
 
     updateDoc(doc, change, spans, estimateHeight(cm));
 
@@ -6919,6 +6920,14 @@
     return e_defaultPrevented(e) || e.codemirrorIgnore;
   }
 
+  function signalCursorActivity(cm) {
+    var arr = cm._handlers && cm._handlers.cursorActivity;
+    if (!arr) return;
+    var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
+    for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1)
+      set.push(arr[i]);
+  }
+
   function hasHandler(emitter, type) {
     var arr = emitter._handlers && emitter._handlers[type];
     return arr && arr.length > 0;

From 357cf2d9652f495d741c129b63ff7892a5caf3ef Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Apr 2014 13:18:59 +0200
Subject: [PATCH 1219/4742] [css mode] Fix tokenizing of empty url() token

Issue #2465
---
 mode/css/css.js  | 2 +-
 mode/css/test.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 3426732cdc..7a396ee451 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -92,7 +92,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   function tokenParenthesized(stream, state) {
     stream.next(); // Must be '('
-    if (!stream.match(/\s*[\"\']/, false))
+    if (!stream.match(/\s*[\"\')]/, false))
       state.tokenize = tokenString(")");
     else
       state.tokenize = null;
diff --git a/mode/css/test.js b/mode/css/test.js
index b3f47767e6..f9f667295c 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -116,4 +116,7 @@
      "  [property src]: [atom url]([string http://blah]),",
      "    [atom url]([string http://foo]);",
      "}");
+
+  MT("empty_url",
+     "[def @import] [tag url]() [tag screen];");
 })();

From 973b776d04ac40fc434731488786cca37dc5e5cc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Apr 2014 13:26:11 +0200
Subject: [PATCH 1220/4742] Guard against NaN when computing horiz padding

Issue #2467
---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cb80d8c7c0..cfac7fab7c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1454,8 +1454,9 @@
     if (display.cachedPaddingH) return display.cachedPaddingH;
     var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
     var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
-    return display.cachedPaddingH = {left: parseInt(style.paddingLeft),
-                                     right: parseInt(style.paddingRight)};
+    var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
+    if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data;
+    return data;
   }
 
   // Ensure the lineView.wrapping.heights array is populated. This is

From eed9a2c8c782711fc25c0002d643f016f20061ef Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Apr 2014 14:21:53 +0200
Subject: [PATCH 1221/4742] Call cursorActivity handlers after other handlers

To preserve existing change/cursorActivity handler ordering
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cfac7fab7c..bd03fdb36f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1957,10 +1957,10 @@
     // Fire change events, and delayed event handlers
     if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);
+    if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
     if (op.cursorActivityHandlers)
       for (var i = 0; i < op.cursorActivityHandlers.length; i++)
         op.cursorActivityHandlers[i](cm);
-    if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }
 
   // Run the given function in an operation

From 6f7127d685174d44fbe956193c8a4cdf32c17658 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Apr 2014 17:02:24 +0200
Subject: [PATCH 1222/4742] [r mode] Remove license link

All of the distribution is under a single license.
---
 mode/r/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mode/r/index.html b/mode/r/index.html
index f73e13d621..397d5858a3 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -80,7 +80,6 @@ <h2>R mode</h2>
     <p><strong>MIME types defined:</strong> <code>text/x-rsrc</code>.</p>
 
     <p>Development of the CodeMirror R mode was kindly sponsored
-    by <a href="http://ubalo.com/">Ubalo</a>, who hold
-    the <a href="LICENSE">license</a>.</p>
+    by <a href="http://ubalo.com/">Ubalo</a>.</p>
 
   </article>

From 306a09020ff570c2a75216da470ed6b1e7c6f452 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Apr 2014 09:37:21 +0200
Subject: [PATCH 1223/4742] [javascript mode] Properly parse quasi quotes
 without prefix

Closes #2472
---
 mode/javascript/javascript.js | 10 ++++++----
 mode/javascript/test.js       |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 9318aabe99..daf138ba8d 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -366,6 +366,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
+    if (type == "quasi") { return pass(quasi, maybeop); }
     return cont();
   }
   function maybeexpression(type) {
@@ -390,21 +391,22 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (value == "?") return cont(expression, expect(":"), expr);
       return cont(expr);
     }
-    if (type == "quasi") { cx.cc.push(me); return quasi(value); }
+    if (type == "quasi") { return pass(quasi, me); }
     if (type == ";") return;
     if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
     if (type == ".") return cont(property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
   }
-  function quasi(value) {
-    if (value.slice(value.length - 2) != "${") return cont();
+  function quasi(type, value) {
+    if (type != "quasi") return pass();
+    if (value.slice(value.length - 2) != "${") return cont(quasi);
     return cont(expression, continueQuasi);
   }
   function continueQuasi(type) {
     if (type == "}") {
       cx.marked = "string-2";
       cx.state.tokenize = tokenQuasi;
-      return cont();
+      return cont(quasi);
     }
   }
   function arrowBody(type) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 36341862f0..782f0457f9 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -70,6 +70,9 @@
   MT("quasi",
      "[variable re][string-2 `fofdlakj${][variable x] [operator +] ([variable re][string-2 `foo`]) [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
 
+  MT("quasi_no_function",
+     "[variable x] [operator =] [string-2 `fofdlakj${][variable x] [operator +] [string-2 `foo`] [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
+
   MT("indent_statement",
      "[keyword var] [variable x] [operator =] [number 10]",
      "[variable x] [operator +=] [variable y] [operator +]",

From 5c6366faaeca35662fff50af3e943b0b91a419e0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Apr 2014 15:39:58 +0200
Subject: [PATCH 1224/4742] [xml mode] Fix giant indentation when continuing an
 attribute on a long line

Closes #2473
---
 mode/xml/xml.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index b8c4297976..3248c454d1 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -321,7 +321,10 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       var context = state.context;
       // Indent multi-line strings (e.g. css).
       if (state.tokenize.isInAttribute) {
-        return state.stringStartCol + 1;
+        if (state.tagStart == state.indented)
+          return state.stringStartCol + 1;
+        else
+          return state.indented + indentUnit;
       }
       if (context && context.noIndent) return CodeMirror.Pass;
       if (state.tokenize != inTag && state.tokenize != inText)

From beb975f7e76c734044fa35a2c9a64b97f9eb5c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Pi=C3=B3rkowski?= <radek25c@gmail.com>
Date: Tue, 15 Apr 2014 21:13:31 +0200
Subject: [PATCH 1225/4742] [php mode] Add support for interpolated variables
 in double-quoted strings.

---
 mode/php/index.html |   6 +-
 mode/php/php.js     |  97 ++++++++++++++++++++++++++++-
 mode/php/test.js    | 145 ++++++++++++++++++++++++++++++++++++++++++++
 test/index.html     |   3 +
 4 files changed, 249 insertions(+), 2 deletions(-)
 create mode 100644 mode/php/test.js

diff --git a/mode/php/index.html b/mode/php/index.html
index 1fb7435bb1..dd25a5e788 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -32,8 +32,12 @@
 <h2>PHP mode</h2>
 <form><textarea id="code" name="code">
 <?php
+$a = array('a' => 1, 'b' => 2, 3 => 'c');
+
+echo "$a[a] ${a[3] /* } comment */} {$a[b]} \$a[a]";
+
 function hello($who) {
-	return "Hello " . $who;
+	return "Hello $who!";
 }
 ?>
 <p>The program says <?= hello("World") ?>.</p>
diff --git a/mode/php/php.js b/mode/php/php.js
index bcec3ebb22..184293b62b 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -21,6 +21,82 @@
     };
   }
 
+  // Two helper functions for encapsList
+  function matchFirst(list) {
+    return function (stream) {
+      for (var i = 0; i < list.length; ++i)
+        if (stream.match(list[i][0]))
+          return list[i][1];
+      return false;
+    };
+  }
+  function matchSequence(list) {
+    if (list.length == 0) return encapsList;
+    return function (stream, state) {
+      var result = list[0](stream, state);
+      if (result !== false) {
+        state.tokenize = matchSequence(list.slice(1));
+        return result;
+      }
+      else {
+        state.tokenize = encapsList;
+        return "string";
+      }
+    };
+  }
+  function encapsList(stream, state) {
+    var escaped = false, next, end = false;
+
+    if (stream.current() == '"') return "string";
+
+    // "Complex" syntax
+    if (stream.match("${", false) || stream.match("{$", false)) {
+      state.tokenize = null;
+      return "string";
+    }
+
+    // Simple syntax
+    if (stream.match(/\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
+      // After the variable name there may appear array or object operator.
+      if (stream.match("[", false)) {
+        // Match array operator
+        state.tokenize = matchSequence([
+          matchFirst([["[", null]]),
+          matchFirst([
+            [/\d[\w\.]*/, "number"],
+            [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
+            [/[\w\$]+/, "variable"]
+          ]),
+          matchFirst([["]", null]])
+        ]);
+      }
+      if (stream.match(/\-\>\w/, false)) {
+        // Match object operator
+        state.tokenize = matchSequence([
+          matchFirst([["->", null]]),
+          matchFirst([[/[\w]+/, "variable"]])
+        ]);
+      }
+      return "variable-2";
+    }
+
+    // Normal string
+    while (
+      !stream.eol() &&
+      (!stream.match("{$", false)) &&
+      (!stream.match(/(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false) || escaped)
+    ) {
+      next = stream.next();
+      if (!escaped && next == '"') { end = true; break; }
+      escaped = !escaped && next == "\\";
+    }
+    if (end) {
+      state.tokenize = null;
+      state.phpEncapsStack.pop();
+    }
+    return "string";
+  }
+
   var phpKeywords = "abstract and array as break case catch class clone const continue declare default " +
     "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " +
     "for foreach function global goto if implements interface instanceof namespace " +
@@ -62,6 +138,24 @@
           return "comment";
         }
         return false;
+      },
+      '"': function(stream, state) {
+        if (!state.phpEncapsStack)
+          state.phpEncapsStack = [];
+        state.phpEncapsStack.push(0);
+        state.tokenize = encapsList;
+        return state.tokenize(stream, state);
+      },
+      "{": function(_stream, state) {
+        if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
+          state.phpEncapsStack[state.phpEncapsStack.length - 1]++;
+        return false;
+      },
+      "}": function(_stream, state) {
+        if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
+          if (--state.phpEncapsStack[state.phpEncapsStack.length - 1] == 0)
+            state.tokenize = encapsList;
+        return false;
       }
     }
   };
@@ -101,7 +195,8 @@
         state.curState = state.html;
         return "meta";
       } else {
-        return phpMode.token(stream, state.curState);
+        var result = phpMode.token(stream, state.curState);
+        return (stream.pos <= stream.start) ? phpMode.token(stream, state.curState) : result;
       }
     }
 
diff --git a/mode/php/test.js b/mode/php/test.js
new file mode 100644
index 0000000000..db68d75de3
--- /dev/null
+++ b/mode/php/test.js
@@ -0,0 +1,145 @@
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "php");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT('simple_test',
+     '[meta <?php] ' +
+     '[keyword echo] [string "aaa"]; ' +
+     '[meta ?>]');
+
+  MT('variable_interpolation_non_alphanumeric',
+     '[meta <?php]',
+     '[keyword echo] [string "aaa$~$!$@$#$$$%$^$&$*$($)$.$<$>$/$\\$}$\\\"$:$;$?$|$[[$]]$+$=aaa"]',
+     '[meta ?>]');
+
+  MT('variable_interpolation_digits',
+     '[meta <?php]',
+     '[keyword echo] [string "aaa$1$2$3$4$5$6$7$8$9$0aaa"]',
+     '[meta ?>]');
+
+  MT('variable_interpolation_simple_syntax_1',
+     '[meta <?php]',
+     '[keyword echo] [string "aaa][variable-2 $aaa][string .aaa"];',
+     '[meta ?>]');
+
+  MT('variable_interpolation_simple_syntax_2',
+     '[meta <?php]',
+     '[keyword echo] [string "][variable-2 $aaaa][[','[number 2]',         ']][string aa"];',
+     '[keyword echo] [string "][variable-2 $aaaa][[','[number 2345]',      ']][string aa"];',
+     '[keyword echo] [string "][variable-2 $aaaa][[','[number 2.3]',       ']][string aa"];',
+     '[keyword echo] [string "][variable-2 $aaaa][[','[variable aaaaa]',   ']][string aa"];',
+     '[keyword echo] [string "][variable-2 $aaaa][[','[variable-2 $aaaaa]',']][string aa"];',
+
+     '[keyword echo] [string "1aaa][variable-2 $aaaa][[','[number 2]',         ']][string aa"];',
+     '[keyword echo] [string "aaa][variable-2 $aaaa][[','[number 2345]',      ']][string aa"];',
+     '[keyword echo] [string "aaa][variable-2 $aaaa][[','[number 2.3]',       ']][string aa"];',
+     '[keyword echo] [string "aaa][variable-2 $aaaa][[','[variable aaaaa]',   ']][string aa"];',
+     '[keyword echo] [string "aaa][variable-2 $aaaa][[','[variable-2 $aaaaa]',']][string aa"];',
+     '[meta ?>]');
+
+  MT('variable_interpolation_simple_syntax_3',
+     '[meta <?php]',
+     '[keyword echo] [string "aaa][variable-2 $aaaa]->[variable aaaaa][string .aaaaaa"];',
+     '[keyword echo] [string "aaa][variable-2 $aaaa][string ->][variable-2 $aaaaa][string .aaaaaa"];',
+     '[keyword echo] [string "aaa][variable-2 $aaaa]->[variable aaaaa][string [[2]].aaaaaa"];',
+     '[keyword echo] [string "aaa][variable-2 $aaaa]->[variable aaaaa][string ->aaaa2.aaaaaa"];',
+     '[meta ?>]');
+
+  MT('variable_interpolation_escaping',
+     '[meta <?php] [comment /* Escaping */]',
+     '[keyword echo] [string "aaa\\$aaaa->aaa.aaa"];',
+     '[keyword echo] [string "aaa\\$aaaa[[2]]aaa.aaa"];',
+     '[keyword echo] [string "aaa\\$aaaa[[asd]]aaa.aaa"];',
+     '[keyword echo] [string "aaa{\\$aaaa->aaa.aaa"];',
+     '[keyword echo] [string "aaa{\\$aaaa[[2]]aaa.aaa"];',
+     '[keyword echo] [string "aaa{\\aaaaa[[asd]]aaa.aaa"];',
+     '[keyword echo] [string "aaa\\${aaaa->aaa.aaa"];',
+     '[keyword echo] [string "aaa\\${aaaa[[2]]aaa.aaa"];',
+     '[keyword echo] [string "aaa\\${aaaa[[asd]]aaa.aaa"];',
+     '[meta ?>]');
+
+  MT('variable_interpolation_complex_syntax_1',
+     '[meta <?php]',
+     '[keyword echo] [string "aaa][variable-2 $]{[variable aaaa]}[string ->aaa.aaa"];',
+     '[keyword echo] [string "aaa][variable-2 $]{[variable-2 $aaaa]}[string ->aaa.aaa"];',
+     '[keyword echo] [string "aaa][variable-2 $]{[variable-2 $aaaa][[','  [number 42]',']]}[string ->aaa.aaa"];',
+     '[keyword echo] [string "aaa][variable-2 $]{[variable aaaa][meta ?>]aaaaaa');
+
+  MT('variable_interpolation_complex_syntax_2',
+     '[meta <?php] [comment /* Monsters */]',
+     '[keyword echo] [string "][variable-2 $]{[variable aaa][comment /*}?>} $aaa<?php } */]}[string ->aaa.aaa"];',
+     '[keyword echo] [string "][variable-2 $]{[variable aaa][comment /*}?>*/][[','  [string "aaa][variable-2 $aaa][string {}][variable-2 $]{[variable aaa]}[string "]',']]}[string ->aaa.aaa"];',
+     '[keyword echo] [string "][variable-2 $]{[variable aaa][comment /*} } $aaa } */]}[string ->aaa.aaa"];');
+
+
+  function build_recursive_monsters(nt, t, n){
+    var monsters = [t];
+    for (var i = 1; i <= n; ++i)
+      monsters[i] = nt.join(monsters[i - 1]);
+    return monsters;
+  }
+
+  var m1 = build_recursive_monsters(
+    ['[string "][variable-2 $]{[variable aaa] [operator +] ', '}[string "]'],
+    '[comment /* }?>} */] [string "aaa][variable-2 $aaa][string .aaa"]',
+    10
+  );
+
+  MT('variable_interpolation_complex_syntax_3_1',
+     '[meta <?php] [comment /* Recursive monsters */]',
+     '[keyword echo] ' + m1[4] + ';',
+     '[keyword echo] ' + m1[7] + ';',
+     '[keyword echo] ' + m1[8] + ';',
+     '[keyword echo] ' + m1[5] + ';',
+     '[keyword echo] ' + m1[1] + ';',
+     '[keyword echo] ' + m1[6] + ';',
+     '[keyword echo] ' + m1[9] + ';',
+     '[keyword echo] ' + m1[0] + ';',
+     '[keyword echo] ' + m1[10] + ';',
+     '[keyword echo] ' + m1[2] + ';',
+     '[keyword echo] ' + m1[3] + ';',
+     '[keyword echo] [string "end"];',
+     '[meta ?>]');
+
+  var m2 = build_recursive_monsters(
+    ['[string "a][variable-2 $]{[variable aaa] [operator +] ', ' [operator +] ', '}[string .a"]'],
+    '[comment /* }?>{{ */] [string "a?>}{{aa][variable-2 $aaa][string .a}a?>a"]',
+    5
+  );
+
+  MT('variable_interpolation_complex_syntax_3_2',
+     '[meta <?php] [comment /* Recursive monsters 2 */]',
+     '[keyword echo] ' + m2[0] + ';',
+     '[keyword echo] ' + m2[1] + ';',
+     '[keyword echo] ' + m2[5] + ';',
+     '[keyword echo] ' + m2[4] + ';',
+     '[keyword echo] ' + m2[2] + ';',
+     '[keyword echo] ' + m2[3] + ';',
+     '[keyword echo] [string "end"];',
+     '[meta ?>]');
+
+  function build_recursive_monsters_2(mf1, mf2, nt, t, n){
+    var monsters = [t];
+    for (var i = 1; i <= n; ++i)
+      monsters[i] = nt[0] + mf1[i - 1] + nt[1] + mf2[i - 1] + nt[2] + monsters[i - 1] + nt[3];
+    return monsters;
+  }
+
+  var m3 = build_recursive_monsters_2(
+    m1,
+    m2,
+    ['[string "a][variable-2 $]{[variable aaa] [operator +] ', ' [operator +] ', ' [operator +] ', '}[string .a"]'],
+    '[comment /* }?>{{ */] [string "a?>}{{aa][variable-2 $aaa][string .a}a?>a"]',
+    4
+  );
+
+  MT('variable_interpolation_complex_syntax_3_3',
+     '[meta <?php] [comment /* Recursive monsters 2 */]',
+     '[keyword echo] ' + m3[4] + ';',
+     '[keyword echo] ' + m3[0] + ';',
+     '[keyword echo] ' + m3[3] + ';',
+     '[keyword echo] ' + m3[1] + ';',
+     '[keyword echo] ' + m3[2] + ';',
+     '[keyword echo] [string "end"];',
+     '[meta ?>]');
+})();
diff --git a/test/index.html b/test/index.html
index 76fd835f28..752971fe48 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,6 +15,8 @@
 <script src="../addon/edit/matchbrackets.js"></script>
 <script src="../addon/comment/comment.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/clike/clike.js"></script>
+<script src="../mode/php/php.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <script src="../keymap/vim.js"></script>
 <script src="../keymap/emacs.js"></script>
@@ -78,6 +80,7 @@ <h2>Test Suite</h2>
     <script src="search_test.js"></script>
     <script src="mode_test.js"></script>
     <script src="../mode/javascript/test.js"></script>
+    <script src="../mode/php/test.js"></script>
     <script src="../mode/css/css.js"></script>
     <script src="../mode/css/test.js"></script>
     <script src="../mode/css/scss_test.js"></script>

From ef2293517ab2d09b3e56b1967e1c683d583937a0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Apr 2014 16:16:57 +0200
Subject: [PATCH 1226/4742] [php mode] Follow up on
 beb975f7e76c734044fa35a2c9a64b97f9eb5c94

Simplify some things, change a name.

Issue #2468
---
 mode/php/php.js | 46 +++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index 184293b62b..db3672d88f 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -21,30 +21,20 @@
     };
   }
 
-  // Two helper functions for encapsList
-  function matchFirst(list) {
-    return function (stream) {
-      for (var i = 0; i < list.length; ++i)
-        if (stream.match(list[i][0]))
-          return list[i][1];
-      return false;
-    };
-  }
+  // Helper for stringWithEscapes
   function matchSequence(list) {
-    if (list.length == 0) return encapsList;
+    if (list.length == 0) return stringWithEscapes;
     return function (stream, state) {
-      var result = list[0](stream, state);
-      if (result !== false) {
+      var patterns = list[0];
+      for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0])) {
         state.tokenize = matchSequence(list.slice(1));
-        return result;
-      }
-      else {
-        state.tokenize = encapsList;
-        return "string";
+        return patterns[i][1];
       }
+      state.tokenize = stringWithEscapes;
+      return "string";
     };
   }
-  function encapsList(stream, state) {
+  function stringWithEscapes(stream, state) {
     var escaped = false, next, end = false;
 
     if (stream.current() == '"') return "string";
@@ -61,20 +51,18 @@
       if (stream.match("[", false)) {
         // Match array operator
         state.tokenize = matchSequence([
-          matchFirst([["[", null]]),
-          matchFirst([
-            [/\d[\w\.]*/, "number"],
-            [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
-            [/[\w\$]+/, "variable"]
-          ]),
-          matchFirst([["]", null]])
+          [["[", null]],
+          [[/\d[\w\.]*/, "number"],
+           [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
+           [/[\w\$]+/, "variable"]],
+          [["]", null]]
         ]);
       }
       if (stream.match(/\-\>\w/, false)) {
         // Match object operator
         state.tokenize = matchSequence([
-          matchFirst([["->", null]]),
-          matchFirst([[/[\w]+/, "variable"]])
+          [["->", null]],
+          [[/[\w]+/, "variable"]]
         ]);
       }
       return "variable-2";
@@ -143,7 +131,7 @@
         if (!state.phpEncapsStack)
           state.phpEncapsStack = [];
         state.phpEncapsStack.push(0);
-        state.tokenize = encapsList;
+        state.tokenize = stringWithEscapes;
         return state.tokenize(stream, state);
       },
       "{": function(_stream, state) {
@@ -154,7 +142,7 @@
       "}": function(_stream, state) {
         if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
           if (--state.phpEncapsStack[state.phpEncapsStack.length - 1] == 0)
-            state.tokenize = encapsList;
+            state.tokenize = stringWithEscapes;
         return false;
       }
     }

From 606f55f1f45bb80f69e007534bd51793a86fe750 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 10:12:27 +0200
Subject: [PATCH 1227/4742] Wrap replaceSelections in an operation

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bd03fdb36f..63f83be779 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6254,13 +6254,13 @@
       }
       return parts;
     },
-    replaceSelection: docMethodOp(function(code, collapse, origin) {
+    replaceSelection: function(code, collapse, origin) {
       var dup = [];
       for (var i = 0; i < this.sel.ranges.length; i++)
         dup[i] = code;
       this.replaceSelections(dup, collapse, origin || "+input");
-    }),
-    replaceSelections: function(code, collapse, origin) {
+    },
+    replaceSelections: docMethodOp(function(code, collapse, origin) {
       var changes = [], sel = this.sel;
       for (var i = 0; i < sel.ranges.length; i++) {
         var range = sel.ranges[i];
@@ -6271,7 +6271,7 @@
         makeChange(this, changes[i]);
       if (newSel) setSelectionReplaceHistory(this, newSel);
       else if (this.cm) ensureCursorVisible(this.cm);
-    },
+    }),
     undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
     redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
     undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),

From afcbdb6b4cbbbd057706ff9e0eb4a4cec054c499 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 10:23:01 +0200
Subject: [PATCH 1228/4742] Fix bug in posFromMouse for rectangular coords

It was returning negative values in the ch field.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 63f83be779..138f10d224 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2507,7 +2507,7 @@
     var coords = coordsChar(cm, x, y), line;
     if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
       var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
-      coords = Pos(coords.line, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff);
+      coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
     }
     return coords;
   }

From d3ba3a2d73fd992d2ee5055ea1c47c95871bac78 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 10:33:55 +0200
Subject: [PATCH 1229/4742] Fix problem with drag-select not clearning multiple
 cursors

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 138f10d224..03ddeb3931 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2644,6 +2644,7 @@
     if (!addNew) {
       ourIndex = 0;
       setSelection(doc, new Selection([ourRange], 0), sel_mouse);
+      startSel = doc.sel;
     } else if (ourIndex > -1) {
       replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
     } else {

From 0ffe3e9056a10442baef3cb50146144633ba19d4 Mon Sep 17 00:00:00 2001
From: Gergely Hegykozi <leonuh@Gergelys-Mac-mini.local>
Date: Mon, 21 Apr 2014 16:57:59 +0200
Subject: [PATCH 1230/4742] [jinja2 mode] Improve

---
 mode/jinja2/index.html |  36 +++++-----
 mode/jinja2/jinja2.js  | 146 +++++++++++++++++++++++++++++++----------
 2 files changed, 131 insertions(+), 51 deletions(-)

diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index 66bf2ec60a..c99daf6c4a 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -25,22 +25,26 @@
 <article>
 <h2>Jinja2 mode</h2>
 <form><textarea id="code" name="code">
-&lt;html style="color: green"&gt;
-  &lt;!-- this is a comment --&gt;
-  &lt;head&gt;
-    &lt;title&gt;Jinja2 Example&lt;/title&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    &lt;ul&gt;
-    {# this is a comment #}
-    {%- for item in li -%}
-      &lt;li&gt;
-        {{ item.label }}
-      &lt;/li&gt;
-    {% endfor -%}
-    &lt;/ul&gt;
-  &lt;/body&gt;
-&lt;/html&gt;
+{# this is a comment #}
+{%- for item in li -%}
+  &lt;li&gt;{{ item.label }}&lt;/li&gt;
+{% endfor -%}
+{{ item.sand == true and item.keyword == false ? 1 : 0 }}
+{{ app.get(55, 1.2, true) }}
+{% if app.get(&#39;_route&#39;) == (&#39;_home&#39;) %}home{% endif %}
+{% if app.session.flashbag.has(&#39;message&#39;) %}
+  {% for message in app.session.flashbag.get(&#39;message&#39;) %}
+    {{ message.content }}
+  {% endfor %}
+{% endif %}
+{{ path(&#39;_home&#39;, {&#39;section&#39;: app.request.get(&#39;section&#39;)}) }}
+{{ path(&#39;_home&#39;, {
+    &#39;section&#39;: app.request.get(&#39;section&#39;),
+    &#39;boolean&#39;: true,
+    &#39;number&#39;: 55.33
+  })
+}}
+{% include (&#39;test.incl.html.twig&#39;) %}
 </textarea></form>
     <script>
       var editor =
diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index e30ce63478..4b535e5322 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -10,47 +10,123 @@
 
   CodeMirror.defineMode("jinja2", function() {
     var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif",
-                    "extends", "filter", "endfilter", "firstof", "for",
-                    "endfor", "if", "endif", "ifchanged", "endifchanged",
-                    "ifequal", "endifequal", "ifnotequal",
-                    "endifnotequal", "in", "include", "load", "not", "now", "or",
-                    "parsed", "regroup", "reversed", "spaceless",
-                    "endspaceless", "ssi", "templatetag", "openblock",
-                    "closeblock", "openvariable", "closevariable",
-                    "openbrace", "closebrace", "opencomment",
-                    "closecomment", "widthratio", "url", "with", "endwith",
-                    "get_current_language", "trans", "noop", "blocktrans",
-                    "endblocktrans", "get_available_languages",
-                    "get_current_language_bidi", "plural"];
-    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
+      "extends", "filter", "endfilter", "firstof", "for",
+      "endfor", "if", "endif", "ifchanged", "endifchanged",
+      "ifequal", "endifequal", "ifnotequal",
+      "endifnotequal", "in", "include", "load", "not", "now", "or",
+      "parsed", "regroup", "reversed", "spaceless",
+      "endspaceless", "ssi", "templatetag", "openblock",
+      "closeblock", "openvariable", "closevariable",
+      "openbrace", "closebrace", "opencomment",
+      "closecomment", "widthratio", "url", "with", "endwith",
+      "get_current_language", "trans", "endtrans", "noop", "blocktrans",
+      "endblocktrans", "get_available_languages",
+      "get_current_language_bidi", "plural"],
+    operator = /^[+\-*&%=<>!?|~^]/,
+    sign = /^[:\[\(\{]/,
+    atom = ["true", "false"],
+    number = /^(\d[+\-\*\/])?\d+(\.\d+)?/;
+
+    keywords = new RegExp("((" + keywords.join(")|(") + "))\\b");
+    atom = new RegExp("((" + atom.join(")|(") + "))\\b");
 
     function tokenBase (stream, state) {
-      var ch = stream.next();
-      if (ch == "{") {
-        if (ch = stream.eat(/\{|%|#/)) {
-          stream.eat("-");
-          state.tokenize = inTag(ch);
-          return "tag";
+      var ch = stream.peek();
+
+      //Comment
+      if (state.incomment) {
+        if(!stream.skipTo("#}")) {
+          stream.skipToEnd();
+        } else {
+          stream.eatWhile(/\#|}/);
+          state.incomment = false;
         }
-      }
-    }
-    function inTag (close) {
-      if (close == "{") {
-        close = "}";
-      }
-      return function (stream, state) {
-        var ch = stream.next();
-        if ((ch == close || (ch == "-" && stream.eat(close)))
-            && stream.eat("}")) {
-          state.tokenize = tokenBase;
+        return "comment";
+      //Tag
+      } else if (state.intag) {
+        //After operator
+        if(state.operator) {
+          state.operator = false;
+          if(stream.match(atom)) {
+            return "atom";
+          }
+          if(stream.match(number)) {
+            return "number";
+          }
+        }
+        //After sign
+        if(state.sign) {
+          state.sign = false;
+          if(stream.match(atom)) {
+            return "atom";
+          }
+          if(stream.match(number)) {
+            return "number";
+          }
+        }
+
+        if(state.instring) {
+          if(ch == state.instring) {
+            state.instring = false;
+          }
+          stream.next();
+          return "string";
+        } else if(ch == "'" || ch == '"') {
+          state.instring = ch;
+          stream.next();
+          return "string";
+        } else if(stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
+          state.intag = false;
           return "tag";
+        } else if(stream.match(operator)) {
+          state.operator = true;
+          return "operator";
+        } else if(stream.match(sign)) {
+          state.sign = true;
+        } else {
+          if(stream.eat(" ") || stream.sol()) {
+            if(stream.match(keywords)) {
+              return "keyword";
+            }
+            if(stream.match(atom)) {
+              return "atom";
+            }
+            if(stream.match(number)) {
+              return "number";
+            }
+            if(stream.sol()) {
+              stream.next();
+            }
+          } else {
+            stream.next();
+          }
+
         }
-        if (stream.match(keywords)) {
-          return "keyword";
+        return "variable";
+      } else if (stream.eat("{")) {
+        if (ch = stream.eat("#")) {
+          state.incomment = true;
+          if(!stream.skipTo("#}")) {
+            stream.skipToEnd();
+          } else {
+            stream.eatWhile(/\#|}/);
+            state.incomment = false;
+          }
+          return "comment";
+        //Open tag
+        } else if (ch = stream.eat(/\{|%/)) {
+          //Cache close tag
+          state.intag = ch;
+          if(ch == "{") {
+            state.intag = "}";
+          }
+          stream.eat("-");
+          return "tag";
         }
-        return close == "#" ? "comment" : "string";
-      };
-    }
+      }
+      stream.next();
+    };
+
     return {
       startState: function () {
         return {tokenize: tokenBase};

From 244a7bf485e6aa5c68c83a1cf93e49a8ca93619c Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Mon, 21 Apr 2014 13:47:39 +0400
Subject: [PATCH 1231/4742] [css mode] remove SVG leftovers

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 7a396ee451..a2b80df5f7 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -453,13 +453,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     // SVG-specific
     "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
     "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
-    "color-interpolation", "color-interpolation-filters", "color-profile",
+    "color-interpolation", "color-interpolation-filters",
     "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",
     "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke",
     "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin",
     "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
     "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
-    "glyph-orientation-vertical", "kerning", "text-anchor", "writing-mode"
+    "glyph-orientation-vertical", "text-anchor", "writing-mode"
   ], propertyKeywords = keySet(propertyKeywords_);
 
   var nonStandardPropertyKeywords = [

From bd69455b9d01f8f5dd1942883796095ac7ead178 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 10:54:27 +0200
Subject: [PATCH 1232/4742] [css-hint addon] Use inner state, rather than token
 state

Closes #2482
---
 addon/hint/css-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 9e5b1e132d..96d9d52e1b 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -31,7 +31,7 @@
           result.push(name);
     }
 
-    var st = token.state.state;
+    var st = inner.state.state;
     if (st == "pseudo" || token.type == "variable-3") {
       add(pseudoClasses);
     } else if (st == "block" || st == "maybeprop") {

From 18fbcd2b88a5fb71122128644e6887556edf8305 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 11:08:01 +0200
Subject: [PATCH 1233/4742] Check for overlay scrollbars on all platforms

Make sure the code that fixes the scrollbar style only fires once.

Issue #2451
---
 lib/codemirror.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 03ddeb3931..35d91750fd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -33,7 +33,6 @@
   var presto = /Opera\//.test(navigator.userAgent);
   var safari = /Apple Computer/.test(navigator.vendor);
   var khtml = /KHTML\//.test(navigator.userAgent);
-  var mac_geLion = /Mac OS X 1\d\D([7-9]|\d\d)\D/.test(navigator.userAgent);
   var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
   var phantom = /PhantomJS/.test(navigator.userAgent);
 
@@ -437,14 +436,18 @@
       d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
     } else d.gutterFiller.style.display = "";
 
-    if (mac_geLion && scrollbarWidth(d.measure) === 0) {
-      d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px";
-      var barMouseDown = function(e) {
-        if (e_target(e) != d.scrollbarV && e_target(e) != d.scrollbarH)
-          operation(cm, onMouseDown)(e);
-      };
-      on(d.scrollbarV, "mousedown", barMouseDown);
-      on(d.scrollbarH, "mousedown", barMouseDown);
+    if (!cm.state.checkedOverlayScrollbar && measure.clientHeight > 0) {
+      if (scrollbarWidth(d.measure) === 0) {
+        var w = mac && !mac_geMountainLion ? "12px" : "18px";
+        d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = w;
+        var barMouseDown = function(e) {
+          if (e_target(e) != d.scrollbarV && e_target(e) != d.scrollbarH)
+            operation(cm, onMouseDown)(e);
+        };
+        on(d.scrollbarV, "mousedown", barMouseDown);
+        on(d.scrollbarH, "mousedown", barMouseDown);
+      }
+      cm.state.checkedOverlayScrollbar = true;
     }
   }
 

From 6c22112b309a4e152c6f5849158c73b8b6e98b1a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 12:32:43 +0200
Subject: [PATCH 1234/4742] Fix bogus readInput firing on context menu

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 35d91750fd..848dfce281 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3110,7 +3110,7 @@
       // The prevInput test prevents this from firing when a context
       // menu is closed (since the resetInput would kill the
       // select-all detection hack)
-      if (!cm.curOp && cm.display.prevInput != "\u200b") {
+      if (!cm.curOp && cm.display.selForContextMenu == cm.doc.sel) {
         resetInput(cm);
         if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
       }
@@ -3158,14 +3158,16 @@
     resetInput(cm);
     // Adds "Select all" to context menu in FF
     if (!cm.somethingSelected()) display.input.value = display.prevInput = " ";
+    display.selForContextMenu = cm.doc.sel;
 
     // Select-all will be greyed out if there's nothing to select, so
     // this adds a zero-width space so that we can later check whether
     // it got selected.
     function prepareSelectAllHack() {
       if (display.input.selectionStart != null) {
-        var extval = display.input.value = "\u200b" + (cm.somethingSelected() ? display.input.value : "");
-        display.prevInput = "\u200b";
+        var selected = cm.somethingSelected();
+        var extval = display.input.value = "\u200b" + (selected ? display.input.value : "");
+        display.prevInput = selected ? "" : "\u200b";
         display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
       }
     }
@@ -3180,7 +3182,7 @@
         if (!ie || ie_upto8) prepareSelectAllHack();
         clearTimeout(detectingSelectAll);
         var i = 0, poll = function() {
-          if (display.prevInput == "\u200b" && display.input.selectionStart == 0)
+          if (display.selForContextMenu == cm.doc.sel && display.input.selectionStart == 0)
             operation(cm, commands.selectAll)(cm);
           else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);
           else resetInput(cm);

From 736ec212545a3708369bcade3445c9714fd4dbdd Mon Sep 17 00:00:00 2001
From: Gustavo Rodrigues <qgustavor@gmail.com>
Date: Fri, 18 Apr 2014 19:20:22 -0300
Subject: [PATCH 1235/4742] [livescript mode] Fix string and comment
 highlighting

Only change `state.next` if `r.next` is defined, check if `r.regex` is
a String before converting it into a RegExp (in the optimization
step).

Closes #2474.
---
 mode/livescript/livescript.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index 9322ba8073..756181fafb 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -24,7 +24,7 @@
           for (i$ = 0, len$ = nr.length; i$ < len$; ++i$) {
             r = nr[i$];
             if (r.regex && (m = stream.match(r.regex))) {
-              state.next = r.next;
+              state.next = r.next || state.next;
               return r.token;
             }
           }
@@ -203,7 +203,7 @@
         next: 'start'
       }, {
         token: 'text',
-        regex: '.',
+        regex: '',
         next: 'start'
       }
     ],
@@ -265,11 +265,11 @@
     if (Array.isArray(r)) {
       for (var i = 0, len = r.length; i < len; ++i) {
         var rr = r[i];
-        if (rr.regex) {
+        if (typeof rr.regex === 'string') {
           Rules[idx][i].regex = new RegExp('^' + rr.regex);
         }
       }
-    } else if (r.regex) {
+    } else if (typeof rr.regex === 'string') {
       Rules[idx].regex = new RegExp('^' + r.regex);
     }
   }

From 99dbd74d0866532ac466bc633f2cf4d2e932b09e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 13:01:17 +0200
Subject: [PATCH 1236/4742] Make shift-ctrl-click extend the primary selection

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 848dfce281..d155c81b1a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2613,7 +2613,7 @@
     e_preventDefault(e);
 
     var ourRange, ourIndex, startSel = doc.sel;
-    if (addNew) {
+    if (addNew && !e.shiftKey) {
       ourIndex = doc.sel.contains(start);
       if (ourIndex > -1)
         ourRange = doc.sel.ranges[ourIndex];

From cfebc98d51ac6d9d2da748bf91444616b315a4f2 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Fri, 18 Apr 2014 11:47:51 +0200
Subject: [PATCH 1237/4742] [cobol mode] Fix function selectFontsize() in demo
 for FireFox

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

diff --git a/mode/cobol/index.html b/mode/cobol/index.html
index 326e398b67..a6c5c339ca 100644
--- a/mode/cobol/index.html
+++ b/mode/cobol/index.html
@@ -193,7 +193,7 @@ <h2>COBOL mode</h2>
       function selectFontsize() {
         var fontSizeInput = document.getElementById("selectFontSize");
         var fontSize = fontSizeInput.options[fontSizeInput.selectedIndex].innerHTML;
-        editor.getWrapperElement().style["font-size"] = fontSize;
+        editor.getWrapperElement().style.fontSize = fontSize;
         editor.refresh();
       }
       function selectReadOnly() {

From c8bb745032a4f29696a5dfe0151bf4291ebacdc7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 13:14:58 +0200
Subject: [PATCH 1238/4742] Enable drop bug workaround for IE11 and up

Another bug that is carried on from ie10 to ie11.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d155c81b1a..0a07ed91ae 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2781,7 +2781,7 @@
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
       return;
     e_preventDefault(e);
-    if (ie_upto10) lastDrop = +new Date;
+    if (ie) lastDrop = +new Date;
     var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
     if (!pos || isReadOnly(cm)) return;
     // Might be a file drop, in which case we simply extract the text
@@ -2826,7 +2826,7 @@
   }
 
   function onDragStart(cm, e) {
-    if (ie_upto10 && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
+    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
 
     e.dataTransfer.setData("Text", cm.getSelection());

From 7b51bfbb6dca3f55b34bbca1ada7aa08675c6045 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 13:25:08 +0200
Subject: [PATCH 1239/4742] [search addon] Fix highlighting around \b markers
 in regexp search

Issue #2475
---
 addon/search/search.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 19f51f1dcd..7a1db6ee09 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -16,21 +16,21 @@
 })(function(CodeMirror) {
   "use strict";
   function searchOverlay(query, caseInsensitive) {
-    var startChar;
-    if (typeof query == "string") {
-      startChar = query.charAt(0);
-      query = new RegExp("^" + query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"),
-                         caseInsensitive ? "i" : "");
-    } else {
-      query = new RegExp("^(?:" + query.source + ")", query.ignoreCase ? "i" : "");
-    }
+    if (typeof query == "string")
+      query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), caseInsensitive ? "gi" : "g");
+    else if (!query.global)
+      query = new RegExp(query.source, query.ignoreCase ? "gi" : "g");
+
     return {token: function(stream) {
-      if (stream.match(query)) return "searching";
-      while (!stream.eol()) {
-        stream.next();
-        if (startChar && !caseInsensitive)
-          stream.skipTo(startChar) || stream.skipToEnd();
-        if (stream.match(query, false)) break;
+      query.lastIndex = stream.pos;
+      var match = query.exec(stream.string);
+      if (match && match.index == stream.pos) {
+        stream.pos += match[0].length;
+        return "searching";
+      } else if (match) {
+        stream.pos = match.index;
+      } else {
+        stream.skipToEnd();
       }
     }};
   }

From d196d4578b30fafebb6186782cedc38f61f78d37 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 14:23:20 +0200
Subject: [PATCH 1240/4742] Mark version 4.1

---
 AUTHORS           | 12 ++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 28 +++++++++++++++++++++++++---
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 09b9523f9b..85f999f42e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,6 +39,7 @@ Ansel Santosa
 Anthony Grimes
 Anton Kovalyov
 areos
+as3boyan
 AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
@@ -48,6 +49,7 @@ Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
 Bernhard Sirlinger
+Bert Chang
 Billy Moon
 binny
 B Krishna Chaitanya
@@ -88,6 +90,7 @@ dignifiedquire
 domagoj412
 Dominator008
 Domizio Demichelis
+Doug Wikle
 Drew Bratcher
 Drew Hintz
 Drew Khoury
@@ -101,6 +104,7 @@ Eric Allam
 eustas
 Fabien O'Carroll
 Fabio Zendhi Nagao
+Faiza Alsaied
 Fauntleroy
 fbuchinger
 feizhang365
@@ -116,6 +120,7 @@ Gabriel Horner
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
+Gergely Hegykozi
 Glenn Jorde
 Glenn Ruehle
 Golevka
@@ -124,6 +129,7 @@ Grant Skinner
 greengiant
 Guillaume Massé
 Guillaume Massé
+Gustavo Rodrigues
 Hans Engel
 Hardest
 Hasan Karahan
@@ -220,6 +226,7 @@ Matthias BUSSONNIER
 Matt McDonald
 Matt Pass
 Matt Sacks
+mauricio
 Maximilian Hils
 Maxim Kraev
 Max Kirsch
@@ -256,6 +263,7 @@ Nikolay Kostov
 nlwillia
 pablo
 Page
+paris
 Patil Arpith
 Patrick Strawderman
 Paul Garvin
@@ -268,6 +276,7 @@ peterkroon
 Peter Kroon
 prasanthj
 Prasanth J
+Radek Piórkowski
 Rahul
 Randy Edmunds
 Rasmus Erik Voel Jensen
@@ -291,6 +300,7 @@ Shawn A
 sheopory
 Shiv Deepak
 Shmuel Englard
+Shubham Jain
 soliton4
 sonson
 spastorelli
@@ -302,6 +312,7 @@ Steffen Beyer
 Steve O'Hara
 stoskov
 Taha Jahangir
+Takuji Shimokawa
 Tarmil
 tfjgeorge
 Thaddee Tyl
@@ -322,6 +333,7 @@ Triangle717
 twifkak
 Vestimir Markov
 vf
+Vincent Woo
 Volker Mische
 wenli
 Wesley Wiser
diff --git a/doc/compress.html b/doc/compress.html
index 4e4cd4a6ac..de3053ded6 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -33,6 +33,7 @@ <h2>Script compression helper</h2>
       <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=4.1.0;f=">4.1</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.3;f=">4.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.23.0;f=">3.23</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.22.0;f=">3.22</option>
diff --git a/doc/manual.html b/doc/manual.html
index 1279fcadd4..f47e437ede 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 4.0.4</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.1.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 9de2147bc8..63397e7924 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -14,7 +14,8 @@
     <li><a href="https://github.com/marijnh/codemirror">Code</a>
   </ul>
   <ul>
-    <li><a class=active data-default="true" href="#v3">Version 3.x</a>
+    <li><a class=active data-default="true" href="#v4">Version 4.x</a>
+    <li><a href="#v3">Version 3.x</a>
     <li><a href="#v2">Version 2.x</a>
     <li><a href="#v1">Version 0.x</a>
   </ul>
@@ -26,7 +27,22 @@ <h2>Release notes and version history</h2>
 
 <section id=v3 class=first>
 
-  <h2>Version 4.x</h2>
+  <h2 id="v4">Version 4.x</h2>
+
+  <p class="rel">22-04-2014: <a href="http://codemirror.net/codemirror-4.1.zip">Version 4.1</a>:</p>
+
+  <ul class="rel-note">
+    <li><em>Slightly incompatible</em>:
+    The <a href="manual.html#event_cursorActivity"><code>"cursorActivity"</code></a>
+    event now fires after all other events for the operation (and only
+    for handlers that were actually registered at the time the
+    activity happened).</li>
+    <li>New command: <a href="manual.html#command_insertSoftTab"><code>insertSoftTab</code></a>.</li>
+    <li>New mode: <a href="../mode/django/index.html">Django</a>.</li>
+    <li>Improved modes: <a href="../mode/verilog/index.html">Verilog</a> (rewritten), <a href="../mode/jinja2/index.html">Jinja2</a>, <a href="../mode/haxe/index.html">Haxe</a>, <a href="../mode/php/index.html">PHP</a> (string interpolation highlighted), <a href="../mode/javascript/index.html">JavaScript</a> (indentation of trailing else, template strings), <a href="../mode/livescript/index.html">LiveScript</a> (multi-line strings).</li>
+    <li>Many small issues from the 3.x→4.x transition were found and fixed.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.0.3...4.1.0">list of patches</a>.</li>
+  </ul>
 
   <p class="rel">20-03-2014: <a href="http://codemirror.net/codemirror-4.0.zip">Version 4.0</a>:</p>
 
@@ -44,7 +60,13 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.23.0...4.0.3">list of patches</a>.</li>
   </ul>
 
-  <h2>Version 3.x</h2>
+  <h2 id="v3">Version 3.x</h2>
+
+  <p class="rel">22-04-2014: <a href="http://codemirror.net/codemirror-3.24.zip">Version 3.24</a>:</p>
+
+  <p class="rel-note">Merges the improvements from 4.1 that could
+  easily be applied to the 3.x code. Also improves the way the editor
+  size is updated when line widgets change.</p>
 
   <p class="rel">20-03-2014: <a href="http://codemirror.net/codemirror-3.23.zip">Version 3.23</a>:</p>
 
diff --git a/index.html b/index.html
index df8098565b..0c91ecaf72 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.0</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.1</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0a07ed91ae..0ab217711e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7520,7 +7520,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.0.4";
+  CodeMirror.version = "4.1.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 39946f35f8..26d7053629 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.0.4",
+    "version":"4.1.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 295c1aff82ad31e465c7ba391dde51d818b45a7c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 14:24:13 +0200
Subject: [PATCH 1241/4742] Bump version number post-4.1

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f47e437ede..910d521ce6 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 4.1.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.1.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0ab217711e..e4e92a06f6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7520,7 +7520,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.1.0";
+  CodeMirror.version = "4.1.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 26d7053629..8377f5a93e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.1.0",
+    "version":"4.1.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From ce4a4d8032105ab25f3065b88f274c56e2ba20c9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 15:18:39 +0200
Subject: [PATCH 1242/4742] [livescript mode] Fix empty tokens, clean up style

Remove .ls source file
---
 mode/livescript/livescript.js |  31 ++--
 mode/livescript/livescript.ls | 266 ----------------------------------
 2 files changed, 14 insertions(+), 283 deletions(-)
 delete mode 100644 mode/livescript/livescript.ls

diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index 756181fafb..1efc3ecf66 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -11,18 +11,17 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
+  "use strict";
 
-(function() {
   CodeMirror.defineMode('livescript', function(){
-    var tokenBase, external;
-    tokenBase = function(stream, state){
-      var next_rule, nr, i$, len$, r, m;
-      if (next_rule = state.next || 'start') {
+    var tokenBase = function(stream, state) {
+      var next_rule = state.next || "start";
+      if (next_rule) {
         state.next = state.next;
-        if (Array.isArray(nr = Rules[next_rule])) {
-          for (i$ = 0, len$ = nr.length; i$ < len$; ++i$) {
-            r = nr[i$];
+        var nr = Rules[next_rule];
+        if (nr.splice) {
+          for (var i$ = 0; i$ < nr.length; ++i$) {
+            var r = nr[i$], m;
             if (r.regex && (m = stream.match(r.regex))) {
               state.next = r.next || state.next;
               return r.token;
@@ -44,7 +43,7 @@
       stream.next();
       return 'error';
     };
-    external = {
+    var external = {
       startState: function(){
         return {
           next: 'start',
@@ -52,8 +51,8 @@
         };
       },
       token: function(stream, state){
-        var style;
-        style = tokenBase(stream, state);
+        while (stream.pos == stream.start)
+          var style = tokenBase(stream, state);
         state.lastToken = {
           style: style,
           indent: stream.indentation(),
@@ -62,8 +61,7 @@
         return style.replace(/\./g, ' ');
       },
       indent: function(state){
-        var indentation;
-        indentation = state.lastToken.indent;
+        var indentation = state.lastToken.indent;
         if (state.lastToken.content.match(indenter)) {
           indentation += 2;
         }
@@ -262,7 +260,7 @@
   };
   for (var idx in Rules) {
     var r = Rules[idx];
-    if (Array.isArray(r)) {
+    if (r.splice) {
       for (var i = 0, len = r.length; i < len; ++i) {
         var rr = r[i];
         if (typeof rr.regex === 'string') {
@@ -273,8 +271,7 @@
       Rules[idx].regex = new RegExp('^' + r.regex);
     }
   }
-})();
 
-CodeMirror.defineMIME('text/x-livescript', 'livescript');
+  CodeMirror.defineMIME('text/x-livescript', 'livescript');
 
 });
diff --git a/mode/livescript/livescript.ls b/mode/livescript/livescript.ls
deleted file mode 100644
index 065242312a..0000000000
--- a/mode/livescript/livescript.ls
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * Link to the project's GitHub page:
- * https://github.com/duralog/CodeMirror
- */
-CodeMirror.defineMode 'livescript', (conf) ->
-  tokenBase = (stream, state) ->
-    #indent =
-    if next_rule = state.next or \start
-      state.next = state.next
-      if Array.isArray nr = Rules[next_rule]
-        for r in nr
-          if r.regex and m = stream.match r.regex
-            state.next = r.next
-            return r.token
-        stream.next!
-        return \error
-      if stream.match r = Rules[next_rule]
-        if r.regex and stream.match r.regex
-          state.next = r.next
-          return r.token
-        else
-          stream.next!
-          return \error
-    stream.next!
-    return 'error'
-  external = {
-    startState: (basecolumn) ->
-      {
-        next: \start
-        lastToken: null
-      }
-    token: (stream, state) ->
-      style = tokenBase stream, state #tokenLexer stream, state
-      state.lastToken = {
-        style: style
-        indent: stream.indentation!
-        content: stream.current!
-      }
-      style.replace /\./g, ' '
-    indent: (state, textAfter) ->
-      # XXX this won't work with backcalls
-      indentation = state.lastToken.indent
-      if state.lastToken.content.match indenter then indentation += 2
-      return indentation
-  }
-  external
-
-### Highlight Rules
-# taken from mode-ls.ls
-
-indenter = // (?
-    : [({[=:]
-    | [-~]>
-    | \b (?: e(?:lse|xport) | d(?:o|efault) | t(?:ry|hen) | finally |
-             import (?:\s* all)? | const | var |
-             let | new | catch (?:\s* #identifier)? )
-  ) \s* $ //
-
-identifier = /(?![\d\s])[$\w\xAA-\uFFDC](?:(?!\s)[$\w\xAA-\uFFDC]|-[A-Za-z])*/$
-keywordend = /(?![$\w]|-[A-Za-z]|\s*:(?![:=]))/$
-stringfill = token: \string, regex: '.+'
-
-Rules =
-  start:
-    * token: \comment.doc
-      regex: '/\\*'
-      next : \comment
-
-    * token: \comment
-      regex: '#.*'
-
-    * token: \keyword
-      regex: //(?
-        :t(?:h(?:is|row|en)|ry|ypeof!?)
-        |c(?:on(?:tinue|st)|a(?:se|tch)|lass)
-        |i(?:n(?:stanceof)?|mp(?:ort(?:\s+all)?|lements)|[fs])
-        |d(?:e(?:fault|lete|bugger)|o)
-        |f(?:or(?:\s+own)?|inally|unction)
-        |s(?:uper|witch)
-        |e(?:lse|x(?:tends|port)|val)
-        |a(?:nd|rguments)
-        |n(?:ew|ot)
-        |un(?:less|til)
-        |w(?:hile|ith)
-        |o[fr]|return|break|let|var|loop
-      )//$ + keywordend
-
-    * token: \constant.language
-      regex: '(?:true|false|yes|no|on|off|null|void|undefined)' + keywordend
-
-    * token: \invalid.illegal
-      regex: '(?
-        :p(?:ackage|r(?:ivate|otected)|ublic)
-        |i(?:mplements|nterface)
-        |enum|static|yield
-      )' + keywordend
-
-    * token: \language.support.class
-      regex: '(?
-        :R(?:e(?:gExp|ferenceError)|angeError)
-        |S(?:tring|yntaxError)
-        |E(?:rror|valError)
-        |Array|Boolean|Date|Function|Number|Object|TypeError|URIError
-      )' + keywordend
-
-    * token: \language.support.function
-      regex: '(?
-        :is(?:NaN|Finite)
-        |parse(?:Int|Float)
-        |Math|JSON
-        |(?:en|de)codeURI(?:Component)?
-      )' + keywordend
-
-    * token: \variable.language
-      regex: '(?:t(?:hat|il|o)|f(?:rom|allthrough)|it|by|e)' + keywordend
-
-    * token: \identifier
-      regex: identifier + /\s*:(?![:=])/$
-
-    * token: \variable
-      regex: identifier
-
-    * token: \keyword.operator
-      regex: /(?:\.{3}|\s+\?)/$
-
-    * token: \keyword.variable
-      regex: /(?:@+|::|\.\.)/$
-      next : \key
-
-    * token: \keyword.operator
-      regex: /\.\s*/$
-      next : \key
-
-    * token: \string
-      regex: /\\\S[^\s,;)}\]]*/$
-
-    * token: \string.doc
-      regex: \'''
-      next : \qdoc
-
-    * token: \string.doc
-      regex: \"""
-      next : \qqdoc
-
-    * token: \string
-      regex: \'
-      next : \qstring
-
-    * token: \string
-      regex: \"
-      next : \qqstring
-
-    * token: \string
-      regex: \`
-      next : \js
-
-    * token: \string
-      regex: '<\\['
-      next : \words
-
-    * token: \string.regex
-      regex: \//
-      next : \heregex
-
-    * token: \string.regex
-      regex: //
-        /(?: [^ [ / \n \\ ]*
-          (?: (?: \\.
-                | \[ [^\]\n\\]* (?:\\.[^\]\n\\]*)* \]
-              ) [^ [ / \n \\ ]*
-          )*
-        )/ [gimy$]{0,4}
-      //$
-      next : \key
-
-    * token: \constant.numeric
-      regex: '(?:0x[\\da-fA-F][\\da-fA-F_]*
-                |(?:[2-9]|[12]\\d|3[0-6])r[\\da-zA-Z][\\da-zA-Z_]*
-                |(?:\\d[\\d_]*(?:\\.\\d[\\d_]*)?|\\.\\d[\\d_]*)
-                 (?:e[+-]?\\d[\\d_]*)?[\\w$]*)'
-
-    * token: \lparen
-      regex: '[({[]'
-
-    * token: \rparen
-      regex: '[)}\\]]'
-      next : \key
-
-    * token: \keyword.operator
-      regex: \\\S+
-
-    * token: \text
-      regex: \\\s+
-
-  heregex:
-    * token: \string.regex
-      regex: '.*?//[gimy$?]{0,4}'
-      next : \start
-    * token: \string.regex
-      regex: '\\s*#{'
-    * token: \comment.regex
-      regex: '\\s+(?:#.*)?'
-    * token: \string.regex
-      regex: '\\S+'
-
-  key:
-    * token: \keyword.operator
-      regex: '[.?@!]+'
-    * token: \identifier
-      regex: identifier
-      next : \start
-    * token: \text
-      regex: '.'
-      next : \start
-
-  comment:
-    * token: \comment.doc
-      regex: '.*?\\*/'
-      next : \start
-    * token: \comment.doc
-      regex: '.+'
-
-  qdoc:
-    token: \string
-    regex: ".*?'''"
-    next : \key
-    stringfill
-
-  qqdoc:
-    token: \string
-    regex: '.*?"""'
-    next : \key
-    stringfill
-
-  qstring:
-    token: \string
-    regex: /[^\\']*(?:\\.[^\\']*)*'/$
-    next : \key
-    stringfill
-
-  qqstring:
-    token: \string
-    regex: /[^\\"]*(?:\\.[^\\"]*)*"/$
-    next : \key
-    stringfill
-
-  js:
-    token: \string
-    regex: /[^\\`]*(?:\\.[^\\`]*)*`/$
-    next : \key
-    stringfill
-
-  words:
-    token: \string
-    regex: '.*?\\]>'
-    next : \key
-    stringfill
-
-# for optimization, precompile the regexps
-for idx, r of Rules
-  if Array.isArray r
-    for rr, i in r
-      if rr.regex then Rules[idx][i].regex = new RegExp '^'+rr.regex
-  else if r.regex then Rules[idx].regex = new RegExp '^'+r.regex
-
-CodeMirror.defineMIME 'text/x-livescript', 'livescript'

From 513fba04e227bf8cdcf2f9877c7626778243873e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 16:50:30 +0200
Subject: [PATCH 1243/4742] Register select-all detection timeout per editor

So that a subsequent context menu handler can cancel it

Issue #2491
---
 lib/codemirror.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e4e92a06f6..8ca3b12ad7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3130,7 +3130,6 @@
 
   // CONTEXT MENU HANDLING
 
-  var detectingSelectAll;
   // To make the context menu work, we need to briefly unhide the
   // textarea (making it as unobtrusive as possible) to let the
   // right-click take effect on it.
@@ -3180,14 +3179,14 @@
       // Try to detect the user choosing select-all
       if (display.input.selectionStart != null) {
         if (!ie || ie_upto8) prepareSelectAllHack();
-        clearTimeout(detectingSelectAll);
+        clearTimeout(display.detectingSelectAll);
         var i = 0, poll = function() {
           if (display.selForContextMenu == cm.doc.sel && display.input.selectionStart == 0)
             operation(cm, commands.selectAll)(cm);
-          else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);
+          else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
           else resetInput(cm);
         };
-        detectingSelectAll = setTimeout(poll, 200);
+        display.detectingSelectAll = setTimeout(poll, 200);
       }
     }
 

From 6ab1283f659a305b89167bce08b3ccde4d065074 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Apr 2014 17:37:56 +0200
Subject: [PATCH 1244/4742] More proper prevention of select-all race condition

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8ca3b12ad7..2e615bd74a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3158,6 +3158,7 @@
     // Adds "Select all" to context menu in FF
     if (!cm.somethingSelected()) display.input.value = display.prevInput = " ";
     display.selForContextMenu = cm.doc.sel;
+    clearTimeout(display.detectingSelectAll);
 
     // Select-all will be greyed out if there's nothing to select, so
     // this adds a zero-width space so that we can later check whether
@@ -3179,7 +3180,6 @@
       // Try to detect the user choosing select-all
       if (display.input.selectionStart != null) {
         if (!ie || ie_upto8) prepareSelectAllHack();
-        clearTimeout(display.detectingSelectAll);
         var i = 0, poll = function() {
           if (display.selForContextMenu == cm.doc.sel && display.input.selectionStart == 0)
             operation(cm, commands.selectAll)(cm);

From 708f68cb338bcf577bef1091a7a101b5953edf50 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Apr 2014 13:16:53 +0200
Subject: [PATCH 1245/4742] Fix logic error in onFocus

Issue #2494
---
 demo/complete.html | 8 ++++++++
 lib/codemirror.js  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/demo/complete.html b/demo/complete.html
index 047a7ecca4..41c244b9a8 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -75,5 +75,13 @@ <h2>Autocomplete Demo</h2>
         extraKeys: {"Ctrl-Space": "autocomplete"},
         mode: {name: "javascript", globalVars: true}
       });
+document.querySelector("img#logo").addEventListener("click", function(e) {
+    editor.setSelection(CodeMirror.Pos(0, 0), CodeMirror.Pos(0, 10));
+      console.log("before focus", editor.display.input.selectionEnd);
+    editor.focus();
+      console.log("after focus", editor.display.input.selectionEnd);
+    e.stopPropagation();
+    e.preventDefault();
+}, false);
     </script>
   </article>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2e615bd74a..fa31adc161 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3110,7 +3110,7 @@
       // The prevInput test prevents this from firing when a context
       // menu is closed (since the resetInput would kill the
       // select-all detection hack)
-      if (!cm.curOp && cm.display.selForContextMenu == cm.doc.sel) {
+      if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
         resetInput(cm);
         if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
       }

From 1e3321f4c335569425900ab566a088c896a51ea0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Apr 2014 13:17:12 +0200
Subject: [PATCH 1246/4742] Remove debugging code

---
 demo/complete.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/demo/complete.html b/demo/complete.html
index 41c244b9a8..047a7ecca4 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -75,13 +75,5 @@ <h2>Autocomplete Demo</h2>
         extraKeys: {"Ctrl-Space": "autocomplete"},
         mode: {name: "javascript", globalVars: true}
       });
-document.querySelector("img#logo").addEventListener("click", function(e) {
-    editor.setSelection(CodeMirror.Pos(0, 0), CodeMirror.Pos(0, 10));
-      console.log("before focus", editor.display.input.selectionEnd);
-    editor.focus();
-      console.log("after focus", editor.display.input.selectionEnd);
-    e.stopPropagation();
-    e.preventDefault();
-}, false);
     </script>
   </article>

From fb1fc604aad3ebd8848b7630947c9b8952add500 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Apr 2014 17:08:28 +0200
Subject: [PATCH 1247/4742] Prevent select-all hack from confusing readInput
 when there is a selection

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fa31adc161..02c25d40be 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2246,6 +2246,8 @@
     if (withOp) startOperation(cm);
     cm.display.shift = false;
 
+    if (text.charCodeAt(0) == 0x200b && doc.sel == cm.display.selForContextMenu && !prevInput)
+      prevInput = "\u200b";
     // Find the part of the input that is actually new
     var same = 0, l = Math.min(prevInput.length, text.length);
     while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;

From 0558dfe76ceae8764011c982d13a766087c9dd20 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Apr 2014 17:12:32 +0200
Subject: [PATCH 1248/4742] Another fix around the select-all hack

Issue #2495
---
 lib/codemirror.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 02c25d40be..ca9be7acab 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -230,6 +230,10 @@
 
     // True when shift is held down.
     d.shift = false;
+
+    // Used to track whether anything happened since the context menu
+    // was opened.
+    d.selForContextMenu = null;
   }
 
   // STATE UPDATES
@@ -3498,6 +3502,7 @@
       if (changeHandler) signalLater(cm, "change", cm, obj);
       if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj);
     }
+    cm.display.selForContextMenu = null;
   }
 
   function replaceRange(doc, code, from, to, origin) {

From 4ea847025f65bc49ea1157100917f5da67433960 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 24 Apr 2014 10:09:27 +0200
Subject: [PATCH 1249/4742] Scroll change, rather than cursor, into view on
 undo/redo

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ca9be7acab..f636832fff 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3388,7 +3388,7 @@
 
       var after = i ? computeSelAfterChange(doc, change, null) : lst(source);
       makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
-      if (doc.cm) ensureCursorVisible(doc.cm);
+      if (!i && doc.cm) doc.cm.scrollIntoView(change);
       var rebased = [];
 
       // Propagate to the linked documents

From 068227e4e9dd04c29da343ac2440c6b9a6e945ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 24 Apr 2014 10:22:06 +0200
Subject: [PATCH 1250/4742] Fall back to nullRect in measureCharInner to work
 around Safari issue

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f636832fff..0aec28d822 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1625,7 +1625,7 @@
         else
           rect = nullRect;
       } else {
-        rect = range(node, start, end).getBoundingClientRect();
+        rect = range(node, start, end).getBoundingClientRect() || nullRect;
       }
     } else { // If it is a widget, simply get the box for the whole widget.
       if (start > 0) collapse = bias = "right";

From 9fa870fef10b8389e0592cd0b6b831bc265b1839 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes.lindesay@red-gate.com>
Date: Tue, 22 Apr 2014 14:56:25 +0100
Subject: [PATCH 1251/4742] [jade mode] Re-write to match the jade lexer

---
 mode/jade/index.html |   8 +-
 mode/jade/jade.js    | 650 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 574 insertions(+), 84 deletions(-)

diff --git a/mode/jade/index.html b/mode/jade/index.html
index e22b15e65b..8bfd5620c0 100644
--- a/mode/jade/index.html
+++ b/mode/jade/index.html
@@ -6,6 +6,10 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../javascript/javascript.js"></script>
+<script src="../css/css.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
 <script src="jade.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
@@ -25,7 +29,7 @@
 <article>
 <h2>Jade Templating Mode</h2>
 <form><textarea id="code" name="code">
-doctype 5
+doctype html
   html
     head
       title= "Jade Templating CodeMirror Mode Example"
@@ -61,6 +65,6 @@ <h2>Jade Templating Mode</h2>
       });
     </script>
     <h3>The Jade Templating Mode</h3>
-      <p> Created by Drew Bratcher. Managed as part of an Adobe Brackets extension at <a href="https://github.com/dbratcher/brackets-jade">https://github.com/dbratcher/brackets-jade</a>.</p>
+      <p> Created by Forbes Lindesay. Managed as part of a Brackets extension at <a href="https://github.com/ForbesLindesay/jade-brackets">https://github.com/ForbesLindesay/jade-brackets</a>.</p>
     <p><strong>MIME type defined:</strong> <code>text/x-jade</code>.</p>
   </article>
diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index 020b93ec5d..8be10c937a 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -1,100 +1,586 @@
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), require("../javascript/javascript"), require("../css/css"), require("../htmlmixed/htmlmixed"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "../javascript/javascript", "../css/css", "../htmlmixed/htmlmixed"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode("jade", function () {
-  var symbol_regex1 = /^(?:~|!|%|\^|\*|\+|=|\\|:|;|,|\/|\?|&|<|>|\|)/;
-  var open_paren_regex = /^(\(|\[)/;
-  var close_paren_regex = /^(\)|\])/;
-  var keyword_regex1 = /^(if|else|return|var|function|include|doctype|each)/;
-  var keyword_regex2 = /^(#|{|}|\.)/;
-  var keyword_regex3 = /^(in)/;
-  var html_regex1 = /^(html|head|title|meta|link|script|body|br|div|input|span|a|img)/;
-  var html_regex2 = /^(h1|h2|h3|h4|h5|p|strong|em)/;
-  return {
-    startState: function () {
-      return {
-        inString: false,
-        stringType: "",
-        beforeTag: true,
-        justMatchedKeyword: false,
-        afterParen: false
-      };
-    },
-    token: function (stream, state) {
-      //check for state changes
-      if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
-        state.stringType = stream.peek();
-        stream.next(); // Skip quote
-        state.inString = true; // Update state
-      }
-
-      //return state
-      if (state.inString) {
-        if (stream.skipTo(state.stringType)) { // Quote found on this line
-          stream.next(); // Skip quote
-          state.inString = false; // Clear flag
-        } else {
-          stream.skipToEnd(); // Rest of line is string
+CodeMirror.defineMode('jade', function (config) {
+  // token types
+  var KEYWORD = 'keyword';
+  var DOCTYPE = 'meta';
+  var ID = 'builtin';
+  var CLASS = 'qualifier';
+ 
+  var ATTRS_NEST = {
+    '{': '}',
+    '(': ')',
+    '[': ']'
+  };
+  
+  var jsMode = CodeMirror.getMode(config, 'javascript');
+  
+  function State() {
+    this.javaScriptLine = false;
+    this.javaScriptLineExcludesColon = false;
+    
+    this.javaScriptArguments = false;
+    this.javaScriptArgumentsDepth = 0;
+    
+    this.isInterpolating = false;
+    this.interpolationNesting = 0;
+    
+    this.jsState = jsMode.startState();
+    
+    this.restOfLine = '';
+    
+    this.isIncludeFiltered = false;
+    this.isEach = false;
+    
+    this.lastTag = '';
+    this.scriptType = '';
+    
+    // Attributes Mode
+    this.isAttrs = false;
+    this.attrsNest = [];
+    this.inAttributeName = true;
+    this.attributeIsType = false;
+    this.attrValue = '';
+    
+    // Indented Mode
+    this.indentOf = Infinity;
+    this.indentToken = '';
+
+    this.innerMode = null;
+    this.innerState = null;
+
+    this.innerModeForLine = false;
+  }
+  /**
+   * Safely copy a state
+   *
+   * @return {State}
+   */
+  State.prototype.copy = function () {
+    var res = new State();
+    res.javaScriptLine = this.javaScriptLine;
+    res.javaScriptLineExcludesColon = this.javaScriptLineExcludesColon;
+    res.javaScriptArguments = this.javaScriptArguments;
+    res.javaScriptArgumentsDepth = this.javaScriptArgumentsDepth;
+    res.isInterpolating = this.isInterpolating;
+    res.interpolationNesting = this.intpolationNesting;
+
+    res.jsState = CodeMirror.copyState(jsMode, this.jsState);
+
+    res.innerMode = this.innerMode;
+    if (this.innerMode && this.innerState) {
+      res.innerState = CodeMirror.copyState(this.innerMode, this.innerState);
+    }
+    
+    res.restOfLine = this.restOfLine;
+    
+    res.isIncludeFiltered = this.isIncludeFiltered;
+    res.isEach = this.isEach;
+    res.lastTag = this.lastTag;
+    res.scriptType = this.scriptType;
+    res.isAttrs = this.isAttrs;
+    res.attrsNest = this.attrsNest.slice();
+    res.inAttributeName = this.inAttributeName;
+    res.attributeIsType = this.attributeIsType;
+    res.attrValue = this.attrValue;
+    res.indentOf = this.indentOf;
+    res.indentToken = this.indentToken;
+
+    res.innerModeForLine = this.innerModeForLine;
+
+    return res;
+  }
+
+  function javaScript(stream, state) {
+    if (stream.sol()) {
+      // if javaScriptLine was set at end of line, ignore it
+      state.javaScriptLine = false;
+      state.javaScriptLineExcludesColon = false;
+    }
+    if (state.javaScriptLine) {
+      if (state.javaScriptLineExcludesColon && stream.peek() === ':') {
+        state.javaScriptLine = false;
+        state.javaScriptLineExcludesColon = false;
+        return;
+      }
+      var tok = jsMode.token(stream, state.jsState);
+      if (stream.eol()) state.javaScriptLine = false;
+      return tok || true;
+    }
+  }
+  function javaScriptArguments(stream, state) {
+    if (state.javaScriptArguments) {
+      if (state.javaScriptArgumentsDepth === 0 && stream.peek() !== '(') {
+        state.javaScriptArguments = false;
+        return;
+      }
+      if (stream.peek() === '(') {
+        state.javaScriptArgumentsDepth++;
+      } else if (stream.peek() === ')') {
+        state.javaScriptArgumentsDepth--;
+      }
+      if (state.javaScriptArgumentsDepth === 0) {
+        state.javaScriptArguments = false;
+        return;
+      }
+
+      var tok = jsMode.token(stream, state.jsState);
+      return tok || true;
+    }
+  }
+  
+  function yieldStatement(stream, state) {
+    if (stream.match(/^yield\b/)) {
+        return 'keyword';
+    }
+  }
+
+  function doctype(stream, state) {
+    if (stream.match(/^(?:doctype) *([^\n]+)?/)) {
+        return DOCTYPE;
+    }
+  }
+  
+  function interpolation(stream, state) {
+    if (stream.match('#{')) {
+      state.isInterpolating = true;
+      state.interpolationNesting = 0;
+      return 'punctuation';
+    }
+  }
+
+  function interpolationContinued(stream, state) {
+    if (state.isInterpolating) {
+      if (stream.peek() === '}') {
+        state.interpolationNesting--;
+        if (state.interpolationNesting < 0) {
+          stream.next();
+          state.isInterpolating = false;
+          return 'puncutation';
         }
-        state.justMatchedKeyword = false;
-        return "string"; // Token style
-      } else if (stream.sol() && stream.eatSpace()) {
-        if (stream.match(keyword_regex1)) {
-          state.justMatchedKeyword = true;
-          stream.eatSpace();
-          return "keyword";
+      } else if (stream.peek() === '{') {
+        state.interpolationNesting++;
+      }
+      return jsMode.token(stream, state.jsState) || true;
+    }
+  }
+  
+  function caseStatement(stream, state) {
+    if (stream.match(/^case\b/)) {
+      state.javaScriptLine = true;
+      return KEYWORD;
+    }
+  }
+  
+  function when(stream, state) {
+    if (stream.match(/^when\b/)) {
+      state.javaScriptLine = true;
+      state.javaScriptLineExcludesColon = true;
+      return KEYWORD;
+    }
+  }
+  
+  function defaultStatement(stream, state) {
+    if (stream.match(/^default\b/)) {
+      return KEYWORD;
+    }
+  }
+  
+  function extendsStatement(stream, state) {
+    if (stream.match(/^extends?\b/)) {
+      state.restOfLine = 'string';
+      return KEYWORD;
+    }
+  }
+  
+  function append(stream, state) {
+    if (stream.match(/^append\b/)) {
+      state.restOfLine = 'variable';
+      return KEYWORD;
+    }
+  }
+  function prepend(stream, state) {
+    if (stream.match(/^prepend\b/)) {
+      state.restOfLine = 'variable';
+      return KEYWORD;
+    }
+  }
+  function block(stream, state) {
+    if (stream.match(/^block\b *(?:(prepend|append)\b)?/)) {
+      state.restOfLine = 'variable';
+      return KEYWORD;
+    }
+  }
+  
+  function include(stream, state) {
+    if (stream.match(/^include\b/)) {
+      state.restOfLine = 'string';
+      return KEYWORD;
+    }
+  }
+  
+  function includeFiltered(stream, state) {
+    if (stream.match(/^include:([a-zA-Z0-9\-]+)/, false) && stream.match('include')) {
+      state.isIncludeFiltered = true;
+      return KEYWORD;
+    }
+  }
+
+  function includeFilteredContinued(stream, state) {
+    if (state.isIncludeFiltered) {
+      var tok = filter(stream, state);
+      state.isIncludeFiltered = false;
+      state.restOfLine = 'string';
+      return tok;
+    }
+  }
+  
+  function mixin(stream, state) {
+    if (stream.match(/^mixin\b/)) {
+      state.javaScriptLine = true;
+      return KEYWORD;
+    }
+  }
+  
+  function call(stream, state) {
+    if (stream.match(/^\+([-\w]+)/)) {
+      if (!stream.match(/^\( *[-\w]+ *=/, false)) {
+        state.javaScriptArguments = true;
+        state.javaScriptArgumentsDepth = 0;
+      }
+      return 'variable';
+    }
+    if (stream.match(/^\+#{/, false)) {
+      stream.next();
+      state.mixinCallAfter = true;
+      return interpolation(stream, state);
+    }
+  }
+  function callArguments(stream, state) {
+    if (state.mixinCallAfter) {
+      state.mixinCallAfter = false;
+      if (!stream.match(/^\( *[-\w]+ *=/, false)) {
+        state.javaScriptArguments = true;
+        state.javaScriptArgumentsDepth = 0;
+      }
+      return true;
+    }
+  }
+  
+  function conditional(stream, state) {
+    if (stream.match(/^(if|unless|else if|else)\b/)) {
+      state.javaScriptLine = true;
+      return KEYWORD;
+    }
+  }
+  
+  function each(stream, state) {
+    var captures;
+    if (stream.match(/^(- *)?(each|for)\b/)) {
+      state.isEach = true;
+      return KEYWORD;
+    }
+  }
+  function eachContinued(stream, state) {
+    if (state.isEach) {
+      if (stream.match(/^ in\b/)) {
+        state.javaScriptLine = true;
+        state.isEach = false;
+        return KEYWORD;
+      } else if (stream.sol() || stream.eol()) {
+        state.isEach = false;
+      } else if (stream.next()) {
+        while (!stream.match(/^ in\b/, false) && stream.next());
+        return 'variable';
+      }
+    }
+  }
+  
+  function whileStatement(stream, state) {
+    if (stream.match(/^while\b/)) {
+      state.javaScriptLine = true;
+      return KEYWORD;
+    }
+  }
+  
+  function tag(stream, state) {
+    var captures;
+    if (captures = stream.match(/^(\w(?:[-:\w]*\w)?)\/?/)) {
+      state.lastTag = captures[1].toLowerCase();
+      if (state.lastTag === 'script') {
+        state.scriptType = 'application/javascript';
+      }
+      return 'tag';
+    }
+  }
+  
+  function filter(stream, state) {
+    if (stream.match(/^:([\w\-]+)/)) {
+      var innerMode;
+      if (config && config.innerModes) {
+        innerMode = config.innerModes(stream.current().substring(1));
+      }
+      if (!innerMode) {
+        innerMode = stream.current().substring(1);
+      }
+      if (typeof innerMode === 'string') {
+        innerMode = CodeMirror.getMode(config, innerMode);
+      }
+      setInnerMode(stream, state, innerMode);
+      return 'atom';
+    }
+  }
+  
+  function code(stream, state) {
+    if (stream.match(/^(!?=|-)/)) {
+      state.javaScriptLine = true;
+      return 'punctuation';
+    }
+  }
+  
+  function id(stream, state) {
+    if (stream.match(/^#([\w-]+)/)) {
+      return ID;
+    }
+  }
+  
+  function className(stream, state) {
+    if (stream.match(/^\.([\w-]+)/)) {
+      return CLASS;
+    }
+  }
+  
+  function attrs(stream, state) {
+    if (stream.peek() == '(') {
+      stream.next();
+      state.isAttrs = true;
+      state.attrsNest = [];
+      state.inAttributeName = true;
+      state.attrValue = '';
+      state.attributeIsType = false;
+      return 'punctuation';
+    }
+  }
+  
+  function attrsContinued(stream, state) {
+    if (state.isAttrs) {
+      if (ATTRS_NEST[stream.peek()]) {
+        state.attrsNest.push(ATTRS_NEST[stream.peek()]);
+      }
+      if (state.attrsNest[state.attrsNest.length - 1] === stream.peek()) {
+        state.attrsNest.pop();
+      } else  if (stream.eat(')')) {
+        state.isAttrs = false;
+        return 'punctuation';
+      }
+      if (state.inAttributeName && stream.match(/^[^=,\)!]+/)) {
+        if (stream.peek() === '=' || stream.peek() === '!') {
+          state.inAttributeName = false;
+          state.jsState = jsMode.startState();
+          if (state.lastTag === 'script' && stream.current().trim().toLowerCase() === 'type') {
+            state.attributeIsType = true;
+          } else {
+            state.attributeIsType = false;
+          }
         }
-        if (stream.match(html_regex1) || stream.match(html_regex2)) {
-          state.justMatchedKeyword = true;
-          return "variable";
+        return 'attribute';
+      }
+      
+      var tok = jsMode.token(stream, state.jsState);
+      if (state.attributeIsType && tok === 'string') {
+        state.scriptType = stream.current().toString();
+      }
+      if (state.attrsNest.length === 0 && (tok === 'string' || tok === 'variable' || tok === 'keyword')) {
+        try {
+          Function('', 'var x ' + state.attrValue.replace(/,\s*$/, '').replace(/^!/, ''));
+          state.inAttributeName = true;
+          state.attrValue = '';
+          stream.backUp(stream.current().length);
+          return attrsContinued(stream, state);
+        } catch (ex) {
+          //not the end of an attribute
         }
-      } else if (stream.sol() && stream.match(keyword_regex1)) {
-        state.justMatchedKeyword = true;
-        stream.eatSpace();
-        return "keyword";
-      } else if (stream.sol() && (stream.match(html_regex1) || stream.match(html_regex2))) {
-        state.justMatchedKeyword = true;
-        return "variable";
-      } else if (stream.eatSpace()) {
-        state.justMatchedKeyword = false;
-        if (stream.match(keyword_regex3) && stream.eatSpace()) {
-          state.justMatchedKeyword = true;
-          return "keyword";
+      }
+      state.attrValue += stream.current();
+      return tok || true;
+    }
+  }
+  
+  function attributesBlock(stream, state) {
+    if (stream.match(/^&attributes\b/)) {
+      state.javaScriptArguments = true;
+      state.javaScriptArgumentsDepth = 0;
+      return 'keyword';
+    }
+  }
+  
+  function indent(stream, state) {
+    if (stream.sol() && stream.eatSpace()) {
+      return 'indent';
+    }
+  }
+  
+  function comment(stream, state) {
+    if (stream.match(/^ *\/\/(-)?([^\n]*)/)) {
+      state.indentOf = stream.indentation();
+      state.indentToken = 'comment';
+      return 'comment';
+    }
+  }
+  
+  function colon(stream, state) {
+    if (stream.match(/^: */)) {
+      return 'colon';
+    }
+  }
+  
+  function text(stream, state) {
+    if (stream.match(/^(?:\| ?| )([^\n]+)/)) {
+      return 'string';
+    }
+    if (stream.match(/^(<[^\n]*)/, false)) {
+      // html string
+      setInnerMode(stream, state, 'htmlmixed');
+      state.innerModeForLine = true;
+      return innerMode(stream, state, true);
+    }
+  }
+  
+  function dot(stream, state) {
+    if (stream.eat('.')) {
+      var innerMode = null;
+      if (state.lastTag === 'script' && state.scriptType.toLowerCase().indexOf('javascript') != -1) {
+        innerMode = state.scriptType.toLowerCase().replace(/"|'/g, '');
+      } else if (state.lastTag === 'style') {
+        innerMode = 'css';
+      }
+      setInnerMode(stream, state, innerMode);
+      return 'dot';
+    }
+  }
+  
+  function fail(stream, state) {
+    stream.next();
+    return null;
+  }
+ 
+  
+  function setInnerMode(stream, state, mode) {
+    mode = CodeMirror.mimeModes[mode] || mode;
+    mode = config.innerModes ? config.innerModes(mode) || mode : mode;
+    mode = CodeMirror.mimeModes[mode] || mode;
+    mode = CodeMirror.getMode(config, mode);
+    state.indentOf = stream.indentation();
+    
+    if (mode && mode.name !== 'null') {
+      state.innerMode = mode;
+    } else {
+      state.indentToken = 'string';
+    }
+  }
+  function innerMode(stream, state, force) {
+    if (stream.indentation() > state.indentOf || (state.innerModeForLine && !stream.sol()) || force) {
+      if (state.innerMode) {
+        if (!state.innerState) {
+          state.innerState = state.innerMode.startState ? state.innerMode.startState(stream.indentation()) : {};
         }
-      } else if (stream.match(symbol_regex1)) {
-        state.justMatchedKeyword = false;
-        return "atom";
-      } else if (stream.match(open_paren_regex)) {
-        state.afterParen = true;
-        state.justMatchedKeyword = true;
-        return "def";
-      } else if (stream.match(close_paren_regex)) {
-        state.afterParen = false;
-        state.justMatchedKeyword = true;
-        return "def";
-      } else if (stream.match(keyword_regex2)) {
-        state.justMatchedKeyword = true;
-        return "keyword";
-      } else if (stream.eatSpace()) {
-        state.justMatchedKeyword = false;
+        return stream.hideFirstChars(state.indentOf + 2, function () {
+          return state.innerMode.token(stream, state.innerState) || true;
+        });
       } else {
-        stream.next();
-        if (state.justMatchedKeyword) {
-          return "property";
-        } else if (state.afterParen) {
-          return "property";
-        }
+        stream.skipToEnd();
+        return state.indentToken;
       }
-      return null;
+    } else if (stream.sol()) {
+      state.indentOf = Infinity;
+      state.indentToken = null;
+      state.innerMode = null;
+      state.innerState = null;
     }
-  };
+  }
+  function restOfLine(stream, state) {
+    if (stream.sol()) {
+      // if restOfLine was set at end of line, ignore it
+      state.restOfLine = '';
+    }
+    if (state.restOfLine) {
+      stream.skipToEnd();
+      var tok = state.restOfLine;
+      state.restOfLine = '';
+      return tok;
+    }
+  }
+  
+  
+  function startState() {
+    return new State();
+  }
+  function copyState(state) {
+    return state.copy();
+  }
+  /**
+   * Get the next token in the stream
+   *
+   * @param {Stream} stream
+   * @param {State} state
+   */
+  function nextToken(stream, state) {
+    var tok = innerMode(stream, state)
+      || restOfLine(stream, state)
+      || interpolationContinued(stream, state)
+      || includeFilteredContinued(stream, state)
+      || eachContinued(stream, state)
+      || attrsContinued(stream, state)
+      || javaScript(stream, state)
+      || javaScriptArguments(stream, state)
+      || callArguments(stream, state)
+
+      || yieldStatement(stream, state)
+      || doctype(stream, state)
+      || interpolation(stream, state)
+      || caseStatement(stream, state)
+      || when(stream, state)
+      || defaultStatement(stream, state)
+      || extendsStatement(stream, state)
+      || append(stream, state)
+      || prepend(stream, state)
+      || block(stream, state)
+      || include(stream, state)
+      || includeFiltered(stream, state)
+      || mixin(stream, state)
+      || call(stream, state)
+      || conditional(stream, state)
+      || each(stream, state)
+      || whileStatement(stream, state)
+      || tag(stream, state)
+      || filter(stream, state)
+      || code(stream, state)
+      || id(stream, state)
+      || className(stream, state)
+      || attrs(stream, state)
+      || attributesBlock(stream, state)
+      || indent(stream, state)
+      || text(stream, state)
+      || comment(stream, state)
+      || colon(stream, state)
+      || dot(stream, state)
+      || fail(stream, state);
+
+    return tok === true ? null : tok;
+  }
+  return {
+    startState: startState,
+    copyState: copyState,
+    token: nextToken
+  }
 });
 
 CodeMirror.defineMIME('text/x-jade', 'jade');

From d291fdb836b62ce49fe93d14e39aa1c072a80a0d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 24 Apr 2014 10:33:37 +0200
Subject: [PATCH 1252/4742] [jade mode] Fix linter errors

Issue #2490
---
 mode/jade/jade.js | 115 +++++++++++++++++++++++-----------------------
 1 file changed, 57 insertions(+), 58 deletions(-)

diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index 8be10c937a..64d4d2f4be 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -14,42 +14,42 @@ CodeMirror.defineMode('jade', function (config) {
   var DOCTYPE = 'meta';
   var ID = 'builtin';
   var CLASS = 'qualifier';
- 
+
   var ATTRS_NEST = {
     '{': '}',
     '(': ')',
     '[': ']'
   };
-  
+
   var jsMode = CodeMirror.getMode(config, 'javascript');
-  
+
   function State() {
     this.javaScriptLine = false;
     this.javaScriptLineExcludesColon = false;
-    
+
     this.javaScriptArguments = false;
     this.javaScriptArgumentsDepth = 0;
-    
+
     this.isInterpolating = false;
     this.interpolationNesting = 0;
-    
+
     this.jsState = jsMode.startState();
-    
+
     this.restOfLine = '';
-    
+
     this.isIncludeFiltered = false;
     this.isEach = false;
-    
+
     this.lastTag = '';
     this.scriptType = '';
-    
+
     // Attributes Mode
     this.isAttrs = false;
     this.attrsNest = [];
     this.inAttributeName = true;
     this.attributeIsType = false;
     this.attrValue = '';
-    
+
     // Indented Mode
     this.indentOf = Infinity;
     this.indentToken = '';
@@ -79,9 +79,9 @@ CodeMirror.defineMode('jade', function (config) {
     if (this.innerMode && this.innerState) {
       res.innerState = CodeMirror.copyState(this.innerMode, this.innerState);
     }
-    
+
     res.restOfLine = this.restOfLine;
-    
+
     res.isIncludeFiltered = this.isIncludeFiltered;
     res.isEach = this.isEach;
     res.lastTag = this.lastTag;
@@ -97,7 +97,7 @@ CodeMirror.defineMode('jade', function (config) {
     res.innerModeForLine = this.innerModeForLine;
 
     return res;
-  }
+  };
 
   function javaScript(stream, state) {
     if (stream.sol()) {
@@ -136,19 +136,19 @@ CodeMirror.defineMode('jade', function (config) {
       return tok || true;
     }
   }
-  
-  function yieldStatement(stream, state) {
+
+  function yieldStatement(stream) {
     if (stream.match(/^yield\b/)) {
         return 'keyword';
     }
   }
 
-  function doctype(stream, state) {
+  function doctype(stream) {
     if (stream.match(/^(?:doctype) *([^\n]+)?/)) {
         return DOCTYPE;
     }
   }
-  
+
   function interpolation(stream, state) {
     if (stream.match('#{')) {
       state.isInterpolating = true;
@@ -172,14 +172,14 @@ CodeMirror.defineMode('jade', function (config) {
       return jsMode.token(stream, state.jsState) || true;
     }
   }
-  
+
   function caseStatement(stream, state) {
     if (stream.match(/^case\b/)) {
       state.javaScriptLine = true;
       return KEYWORD;
     }
   }
-  
+
   function when(stream, state) {
     if (stream.match(/^when\b/)) {
       state.javaScriptLine = true;
@@ -187,20 +187,20 @@ CodeMirror.defineMode('jade', function (config) {
       return KEYWORD;
     }
   }
-  
-  function defaultStatement(stream, state) {
+
+  function defaultStatement(stream) {
     if (stream.match(/^default\b/)) {
       return KEYWORD;
     }
   }
-  
+
   function extendsStatement(stream, state) {
     if (stream.match(/^extends?\b/)) {
       state.restOfLine = 'string';
       return KEYWORD;
     }
   }
-  
+
   function append(stream, state) {
     if (stream.match(/^append\b/)) {
       state.restOfLine = 'variable';
@@ -219,14 +219,14 @@ CodeMirror.defineMode('jade', function (config) {
       return KEYWORD;
     }
   }
-  
+
   function include(stream, state) {
     if (stream.match(/^include\b/)) {
       state.restOfLine = 'string';
       return KEYWORD;
     }
   }
-  
+
   function includeFiltered(stream, state) {
     if (stream.match(/^include:([a-zA-Z0-9\-]+)/, false) && stream.match('include')) {
       state.isIncludeFiltered = true;
@@ -242,14 +242,14 @@ CodeMirror.defineMode('jade', function (config) {
       return tok;
     }
   }
-  
+
   function mixin(stream, state) {
     if (stream.match(/^mixin\b/)) {
       state.javaScriptLine = true;
       return KEYWORD;
     }
   }
-  
+
   function call(stream, state) {
     if (stream.match(/^\+([-\w]+)/)) {
       if (!stream.match(/^\( *[-\w]+ *=/, false)) {
@@ -274,16 +274,15 @@ CodeMirror.defineMode('jade', function (config) {
       return true;
     }
   }
-  
+
   function conditional(stream, state) {
     if (stream.match(/^(if|unless|else if|else)\b/)) {
       state.javaScriptLine = true;
       return KEYWORD;
     }
   }
-  
+
   function each(stream, state) {
-    var captures;
     if (stream.match(/^(- *)?(each|for)\b/)) {
       state.isEach = true;
       return KEYWORD;
@@ -303,14 +302,14 @@ CodeMirror.defineMode('jade', function (config) {
       }
     }
   }
-  
+
   function whileStatement(stream, state) {
     if (stream.match(/^while\b/)) {
       state.javaScriptLine = true;
       return KEYWORD;
     }
   }
-  
+
   function tag(stream, state) {
     var captures;
     if (captures = stream.match(/^(\w(?:[-:\w]*\w)?)\/?/)) {
@@ -321,7 +320,7 @@ CodeMirror.defineMode('jade', function (config) {
       return 'tag';
     }
   }
-  
+
   function filter(stream, state) {
     if (stream.match(/^:([\w\-]+)/)) {
       var innerMode;
@@ -338,26 +337,26 @@ CodeMirror.defineMode('jade', function (config) {
       return 'atom';
     }
   }
-  
+
   function code(stream, state) {
     if (stream.match(/^(!?=|-)/)) {
       state.javaScriptLine = true;
       return 'punctuation';
     }
   }
-  
-  function id(stream, state) {
+
+  function id(stream) {
     if (stream.match(/^#([\w-]+)/)) {
       return ID;
     }
   }
-  
-  function className(stream, state) {
+
+  function className(stream) {
     if (stream.match(/^\.([\w-]+)/)) {
       return CLASS;
     }
   }
-  
+
   function attrs(stream, state) {
     if (stream.peek() == '(') {
       stream.next();
@@ -369,7 +368,7 @@ CodeMirror.defineMode('jade', function (config) {
       return 'punctuation';
     }
   }
-  
+
   function attrsContinued(stream, state) {
     if (state.isAttrs) {
       if (ATTRS_NEST[stream.peek()]) {
@@ -393,7 +392,7 @@ CodeMirror.defineMode('jade', function (config) {
         }
         return 'attribute';
       }
-      
+
       var tok = jsMode.token(stream, state.jsState);
       if (state.attributeIsType && tok === 'string') {
         state.scriptType = stream.current().toString();
@@ -413,7 +412,7 @@ CodeMirror.defineMode('jade', function (config) {
       return tok || true;
     }
   }
-  
+
   function attributesBlock(stream, state) {
     if (stream.match(/^&attributes\b/)) {
       state.javaScriptArguments = true;
@@ -421,13 +420,13 @@ CodeMirror.defineMode('jade', function (config) {
       return 'keyword';
     }
   }
-  
-  function indent(stream, state) {
+
+  function indent(stream) {
     if (stream.sol() && stream.eatSpace()) {
       return 'indent';
     }
   }
-  
+
   function comment(stream, state) {
     if (stream.match(/^ *\/\/(-)?([^\n]*)/)) {
       state.indentOf = stream.indentation();
@@ -435,13 +434,13 @@ CodeMirror.defineMode('jade', function (config) {
       return 'comment';
     }
   }
-  
-  function colon(stream, state) {
+
+  function colon(stream) {
     if (stream.match(/^: */)) {
       return 'colon';
     }
   }
-  
+
   function text(stream, state) {
     if (stream.match(/^(?:\| ?| )([^\n]+)/)) {
       return 'string';
@@ -453,7 +452,7 @@ CodeMirror.defineMode('jade', function (config) {
       return innerMode(stream, state, true);
     }
   }
-  
+
   function dot(stream, state) {
     if (stream.eat('.')) {
       var innerMode = null;
@@ -466,20 +465,20 @@ CodeMirror.defineMode('jade', function (config) {
       return 'dot';
     }
   }
-  
-  function fail(stream, state) {
+
+  function fail(stream) {
     stream.next();
     return null;
   }
- 
-  
+
+
   function setInnerMode(stream, state, mode) {
     mode = CodeMirror.mimeModes[mode] || mode;
     mode = config.innerModes ? config.innerModes(mode) || mode : mode;
     mode = CodeMirror.mimeModes[mode] || mode;
     mode = CodeMirror.getMode(config, mode);
     state.indentOf = stream.indentation();
-    
+
     if (mode && mode.name !== 'null') {
       state.innerMode = mode;
     } else {
@@ -518,8 +517,8 @@ CodeMirror.defineMode('jade', function (config) {
       return tok;
     }
   }
-  
-  
+
+
   function startState() {
     return new State();
   }
@@ -580,7 +579,7 @@ CodeMirror.defineMode('jade', function (config) {
     startState: startState,
     copyState: copyState,
     token: nextToken
-  }
+  };
 });
 
 CodeMirror.defineMIME('text/x-jade', 'jade');

From 237b5f3cf28eb63b4f474cd93f005987bb47daf1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Apr 2014 11:21:53 +0200
Subject: [PATCH 1253/4742] Make sure gutter is redrawn when a document is
 shifted

Issue #2498
---
 lib/codemirror.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0aec28d822..e351813e71 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3405,12 +3405,17 @@
   // Sub-views need their line numbers shifted when text is added
   // above or below them in the parent document.
   function shiftDoc(doc, distance) {
+    if (distance == 0) return;
     doc.first += distance;
     doc.sel = new Selection(map(doc.sel.ranges, function(range) {
       return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
                        Pos(range.head.line + distance, range.head.ch));
     }), doc.sel.primIndex);
-    if (doc.cm) regChange(doc.cm, doc.first, doc.first - distance, distance);
+    if (doc.cm) {
+      regChange(doc.cm, doc.first, doc.first - distance, distance);
+      for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
+        regLineChange(doc.cm, l, "gutter");
+    }
   }
 
   // More lower-level change function, handling only a single document

From a3ae0e99449991e151a64595c6fdce2f6c3de127 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Apr 2014 15:34:33 +0200
Subject: [PATCH 1254/4742] [compression helper] Use CodeMirror for code field

Dog food, and all that.
---
 doc/compress.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/compress.html b/doc/compress.html
index de3053ded6..34279fb69b 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -3,6 +3,9 @@
 <title>CodeMirror: Compression Helper</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="docs.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<link rel=stylesheet href="../lib/codemirror.css">
 
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
@@ -222,10 +225,12 @@ <h2>Script compression helper</h2>
         <button type="submit">Compress</button> with <a href="http://github.com/mishoo/UglifyJS/">UglifyJS</a>
       </p>
 
-      <p>Custom code to add to the compressed file:<textarea name="js_code" style="width: 100%; height: 15em;" class="field"></textarea></p>
+      <p>Custom code to add to the compressed file:<textarea name="js_code" style="width: 100%; height: 15em;" class="field" id="js_code"></textarea></p>
     </form>
 
     <script type="text/javascript">
+      CodeMirror.fromTextArea(document.getElementById("js_code")).getWrapperElement().className += " field";
+
       function setVersion(ver) {
         var urlprefix = ver.options[ver.selectedIndex].value;
         var select = document.getElementById("files"), m;

From 91e351e90d83d8de0a46d8eb4fb0303d139da245 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Apr 2014 18:45:18 +0200
Subject: [PATCH 1255/4742] [runmode addon] Pass state to blankLine

Issue #2502
---
 addon/runmode/runmode-standalone.js | 2 +-
 addon/runmode/runmode.js            | 2 +-
 addon/runmode/runmode.node.js       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index aba6f0e139..e36e00fbc6 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -139,7 +139,7 @@ CodeMirror.runMode = function (string, modespec, callback, options) {
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
     var stream = new CodeMirror.StringStream(lines[i]);
-    if (!stream.string && mode.blankLine) mode.blankLine();
+    if (!stream.string && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
       callback(stream.current(), style, i, stream.start, state);
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 44c17b1a48..5592a99a60 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -57,7 +57,7 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
     var stream = new CodeMirror.StringStream(lines[i]);
-    if (!stream.string && mode.blankLine) mode.blankLine();
+    if (!stream.string && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
       callback(stream.current(), style, i, stream.start, state);
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 54be6e930a..15bf392313 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -107,7 +107,7 @@ exports.runMode = function(string, modespec, callback, options) {
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
     var stream = new exports.StringStream(lines[i]);
-    if (!stream.string && mode.blankLine) mode.blankLine();
+    if (!stream.string && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
       callback(stream.current(), style, i, stream.start, state);

From 350e8b7d9cc16a4e75b25fb8d2deaea972920a13 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Apr 2014 23:26:33 +0200
Subject: [PATCH 1256/4742] [foldcode addon] preventDefault clicks on widgets

So that the click doesn't kill editor focus.

Closes #2505
---
 addon/fold/foldcode.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index d7a0bb5e2d..9c0969e6e5 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -36,7 +36,10 @@
     if (!range || range.cleared || force === "unfold") return;
 
     var myWidget = makeWidget(options);
-    CodeMirror.on(myWidget, "mousedown", function() { myRange.clear(); });
+    CodeMirror.on(myWidget, "mousedown", function(e) {
+      myRange.clear();
+      CodeMirror.e_preventDefault(e);
+    });
     var myRange = cm.markText(range.from, range.to, {
       replacedWith: myWidget,
       clearOnEnter: true,

From b614431c5168928cd2753324d136a89e03655f95 Mon Sep 17 00:00:00 2001
From: as3boyan <denis.flash.as3@gmail.com>
Date: Sat, 26 Apr 2014 16:33:20 +0300
Subject: [PATCH 1257/4742] [haxe mode] Line comments for Hxml

---
 mode/haxe/haxe.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index e4d7347219..ffde5991ad 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -505,7 +505,8 @@ CodeMirror.defineMode("hxml", function () {
 
       stream.next();
       return null;
-    }
+    },
+    lineComment: "#"
   };
 });
 

From de6fd114997562dae299ab7367061e486a7e05bc Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Thu, 24 Apr 2014 17:50:36 -0700
Subject: [PATCH 1258/4742] [vim]: IE8 fixes.  - avoid array .indexOf - fixes %
 key and non-pcre searches.  - avoid array .map - fixes a couple of
 non-running tests.

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 42e4522693..ea43edfb0d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1645,9 +1645,8 @@
         do {
           symbol = lineText.charAt(ch++);
           if (symbol && isMatchableSymbol(symbol)) {
-            var ignoreStyle = ["string", "comment"];
             var style = cm.getTokenTypeAt(Pos(line, ch));
-            if (ignoreStyle.indexOf(style) < 0) {
+            if (style !== "string" && style !== "comment") {
               break;
             }
           }
@@ -2908,15 +2907,15 @@
     // Translates a search string from ex (vim) syntax into javascript form.
     function translateRegex(str) {
       // When these match, add a '\' if unescaped or remove one if escaped.
-      var specials = ['|', '(', ')', '{'];
+      var specials = '|(){';
       // Remove, but never add, a '\' for these.
-      var unescape = ['}'];
+      var unescape = '}';
       var escapeNextChar = false;
       var out = [];
       for (var i = -1; i < str.length; i++) {
         var c = str.charAt(i) || '';
         var n = str.charAt(i+1) || '';
-        var specialComesNext = (specials.indexOf(n) != -1);
+        var specialComesNext = (n && specials.indexOf(n) != -1);
         if (escapeNextChar) {
           if (c !== '\\' || !specialComesNext) {
             out.push(c);
@@ -2926,7 +2925,7 @@
           if (c === '\\') {
             escapeNextChar = true;
             // Treat the unescape list as special for removing, but not adding '\'.
-            if (unescape.indexOf(n) != -1) {
+            if (n && unescape.indexOf(n) != -1) {
               specialComesNext = true;
             }
             // Not passing this test means removing a '\'.
diff --git a/test/vim_test.js b/test/vim_test.js
index 445e79bf85..909671ec7f 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -98,7 +98,7 @@ function copyCursor(cur) {
 
 function forEach(arr, func) {
   for (var i = 0; i < arr.length; i++) {
-    func(arr[i]);
+    func(arr[i], i, arr);
   }
 }
 
@@ -2325,7 +2325,8 @@ testVim('HML', function(cm, vim, helpers) {
   return upper + lower;
 })()});
 
-var zVals = ['zb','zz','zt','z-','z.','z<CR>'].map(function(e, idx){
+var zVals = [];
+forEach(['zb','zz','zt','z-','z.','z<CR>'], function(e, idx){
   var lineNum = 250;
   var lines = 35;
   testVim(e, function(cm, vim, helpers) {

From b96e1aedd8fccc9f04997f1defbb1cb4d0c72e96 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Apr 2014 22:47:30 +0200
Subject: [PATCH 1259/4742] [shell mode] Fix empty token bug

Issue #2506
---
 mode/shell/shell.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 7753411c98..c9f5483618 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -120,7 +120,10 @@ CodeMirror.defineMode('shell', function() {
     startState: function() {return {tokens:[]};},
     token: function(stream, state) {
       if (stream.eatSpace()) return null;
-      return tokenize(stream, state);
+      for (;;) {
+        var type = tokenize(stream, state);
+        if (stream.pos > stream.start) return type;
+      }
     }
   };
 });

From 1e42d9ad377779016bfe5d16d493605bd9228b7c Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Mon, 28 Apr 2014 23:58:05 +0200
Subject: [PATCH 1260/4742] [vim] Fix bracket matching off-by-one

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index ea43edfb0d..1009ade0ab 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1652,7 +1652,7 @@
           }
         } while (symbol);
         if (symbol) {
-          var matched = cm.findMatchingBracket(Pos(line, ch-1));
+          var matched = cm.findMatchingBracket(Pos(line, ch));
           return matched.to;
         } else {
           return cursor;

From d320196a91182197be601c3d457216fc64f384d3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Apr 2014 12:45:59 +0200
Subject: [PATCH 1261/4742] Use a different approach to handling window events

One that's less scary, and allows immediate garbage collection
(rather than waiting up to 500 ms). Does not work in IE8, though.

Also shows editors as blurred when the window loses focus.
---
 lib/codemirror.js | 66 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e351813e71..99c763265c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -93,6 +93,7 @@
     if (ie_upto10) setTimeout(bind(resetInput, this, true), 20);
 
     registerEventHandlers(this);
+    ensureGlobalHandlers();
 
     var cm = this;
     runInOp(this, function() {
@@ -2392,26 +2393,6 @@
     // Prevent wrapper from ever scrolling
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
-    // When the window resizes, we need to refresh active editors.
-    var resizeTimer;
-    function onResize() {
-      if (resizeTimer == null) resizeTimer = setTimeout(function() {
-        resizeTimer = null;
-        // Might be a text scaling operation, clear size caches.
-        d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = knownScrollbarWidth = null;
-        cm.setSize();
-      }, 100);
-    }
-    on(window, "resize", onResize);
-    // The above handler holds on to the editor and its data
-    // structures. Here we poll to unregister it when the editor is no
-    // longer in the document, so that it can be garbage-collected.
-    function unregister() {
-      if (contains(document.body, d.wrapper)) setTimeout(unregister, 5000);
-      else off(window, "resize", onResize);
-    }
-    setTimeout(unregister, 5000);
-
     on(d.input, "keyup", operation(cm, onKeyUp));
     on(d.input, "input", function() {
       if (ie && !ie_upto8 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
@@ -2488,6 +2469,14 @@
     });
   }
 
+  // Called when the window resizes
+  function onResize(cm) {
+    // Might be a text scaling operation, clear size caches.
+    var d = cm.display;
+    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+    cm.setSize();
+  }
+
   // MOUSE EVENTS
 
   // Return true when the given mouse event happened in a widget
@@ -7149,6 +7138,43 @@
     return b;
   }
 
+  // WINDOW-WIDE EVENTS
+
+  // These must be handled carefully, because naively registering a
+  // handler for each editor will cause the editors to never be
+  // garbage collected.
+
+  function forEachCodeMirror(f) {
+    if (!document.body.getElementsByClassName) return;
+    var byClass = document.body.getElementsByClassName("CodeMirror");
+    for (var i = 0; i < byClass.length; i++) {
+      var cm = byClass[i].CodeMirror;
+      if (cm) f(cm);
+    }
+  }
+
+  var globalsRegistered = false;
+  function ensureGlobalHandlers() {
+    if (globalsRegistered) return;
+    registerGlobalHandlers();
+    globalsRegistered = true;
+  }
+  function registerGlobalHandlers() {
+    // When the window resizes, we need to refresh active editors.
+    var resizeTimer;
+    on(window, "resize", function() {
+      if (resizeTimer == null) resizeTimer = setTimeout(function() {
+        resizeTimer = null;
+        knownScrollbarWidth = null;
+        forEachCodeMirror(onResize);
+      }, 100);
+    });
+    // When the window loses focus, we want to show the editor as blurred
+    on(window, "blur", function() {
+      forEachCodeMirror(onBlur);
+    });
+  }
+
   // FEATURE DETECTION
 
   // Detect drag-and-drop

From 1f2bc90ee7720ef3a192f550a9ddc13a8c8ef67d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Apr 2014 17:08:47 +0200
Subject: [PATCH 1262/4742] [css mode] Fix empty token bug

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

diff --git a/mode/css/css.js b/mode/css/css.js
index a2b80df5f7..7725677542 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -86,6 +86,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         escaped = !escaped && ch == "\\";
       }
       if (ch == quote || !escaped && quote != ")") state.tokenize = null;
+      if (stream.pos == stream.start) return tokenBase(stream, state);
       return ret("string", "string");
     };
   }

From 2c60a2831b21e40be0a42ad99925dec868996362 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Apr 2014 21:20:21 +0200
Subject: [PATCH 1263/4742] Loosen restriction on empty tokens

It is turning into a major headache, since apparently a
lot of modes are written with the assumption that empty
tokens are okay.

Closes #2517
---
 lib/codemirror.js   | 9 +++++----
 mode/css/css.js     | 1 -
 mode/php/php.js     | 3 +--
 mode/shell/shell.js | 5 +----
 test/mode_test.js   | 6 ++++--
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 99c763265c..0440d9d701 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5584,10 +5584,11 @@
   }
 
   function readToken(mode, stream, state) {
-    var style = mode.token(stream, state);
-    if (stream.pos <= stream.start)
-      throw new Error("Mode " + mode.name + " failed to advance stream.");
-    return style;
+    for (var i = 0; i < 10; i++) {
+      var style = mode.token(stream, state);
+      if (stream.pos > stream.start) return style;
+    }
+    throw new Error("Mode " + mode.name + " failed to advance stream.");
   }
 
   // Run the given mode's parser over a line, calling f for each token.
diff --git a/mode/css/css.js b/mode/css/css.js
index 7725677542..a2b80df5f7 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -86,7 +86,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         escaped = !escaped && ch == "\\";
       }
       if (ch == quote || !escaped && quote != ")") state.tokenize = null;
-      if (stream.pos == stream.start) return tokenBase(stream, state);
       return ret("string", "string");
     };
   }
diff --git a/mode/php/php.js b/mode/php/php.js
index db3672d88f..096500fab5 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -183,8 +183,7 @@
         state.curState = state.html;
         return "meta";
       } else {
-        var result = phpMode.token(stream, state.curState);
-        return (stream.pos <= stream.start) ? phpMode.token(stream, state.curState) : result;
+        return phpMode.token(stream, state.curState);
       }
     }
 
diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index c9f5483618..7753411c98 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -120,10 +120,7 @@ CodeMirror.defineMode('shell', function() {
     startState: function() {return {tokens:[]};},
     token: function(stream, state) {
       if (stream.eatSpace()) return null;
-      for (;;) {
-        var type = tokenize(stream, state);
-        if (stream.pos > stream.start) return type;
-      }
+      return tokenize(stream, state);
     }
   };
 });
diff --git a/test/mode_test.js b/test/mode_test.js
index dc20a0523e..d4eff2e537 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -119,9 +119,11 @@
       if (line == "" && mode.blankLine) mode.blankLine(state);
       /* Start copied code from CodeMirror.highlight */
       while (!stream.eol()) {
-        var compare = mode.token(stream, state), substr = stream.current();
-        if (stream.start >= stream.pos)
+        for (var j = 0; j < 10 && stream.start >= stream.pos; j++)
+          var compare = mode.token(stream, state);
+        if (j == 10)
           throw new Failure("Failed to advance the stream." + stream.string + " " + stream.pos);
+        var substr = stream.current();
         if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
         stream.start = stream.pos;
         if (pos && st[pos-2] == compare && !newLine) {

From 74e1cdb5927fb1c1eb93e8a5ed178757c3638527 Mon Sep 17 00:00:00 2001
From: Dave Myers <dmyers@squarespace.com>
Date: Tue, 29 Apr 2014 14:57:36 -0400
Subject: [PATCH 1264/4742] Generate description of included files for comment
 block at top of compressed code mirror

---
 doc/compress.html | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 34279fb69b..e69b702a77 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -32,7 +32,7 @@ <h2>Script compression helper</h2>
     click <strong>Compress</strong> to download the minified script
     file.</p>
 
-    <form id="form" action="http://marijnhaverbeke.nl/uglifyjs" method="post">
+    <form id="form" action="http://marijnhaverbeke.nl/uglifyjs" method="post" onsubmit="return generateCommentDescription();">
       <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>
@@ -224,7 +224,7 @@ <h2>Script compression helper</h2>
       <p>
         <button type="submit">Compress</button> with <a href="http://github.com/mishoo/UglifyJS/">UglifyJS</a>
       </p>
-
+        <input type="hidden" id="comment_description" name="comment_description" />
       <p>Custom code to add to the compressed file:<textarea name="js_code" style="width: 100%; height: 15em;" class="field" id="js_code"></textarea></p>
     </form>
 
@@ -244,6 +244,41 @@ <h2>Script compression helper</h2>
               opt.value = urlprefix + m[1];
           }
        }
+       
+       function generateCommentDescription() {
+          var cr = '\n';
+          var versionNode = document.getElementById('version');
+          var version = versionNode.options[versionNode.selectedIndex].label
+          var filesNode = document.getElementById("files");
+          var optGroupHeaderIncluded;
+
+          //Generate the comment
+          var str = '/* CodeMirror - Minified & Bundled' + cr;
+          str += 'Generated on ' + new Date().toLocaleDateString() + ' with: http://codemirror.net/doc/compress.html' + cr;
+          str += 'Version: ' + version + cr;
+          str += cr;
+
+          for (var group = filesNode.firstChild; group; group = group.nextSibling) {
+            optGroupHeaderIncluded = false;
+            for (var option = group.firstChild; option; option = option.nextSibling) {
+              if (option.nodeName !== 'OPTION') {
+                continue;
+              } else if (option.selected) {
+                if (!optGroupHeaderIncluded) {
+                  str += group.label + ':' + cr;
+                  optGroupHeaderIncluded = true;
+                }
+                str += '- ' + option.label + cr;
+              }
+            }
+          }
+          str += '*/';
+          str += cr;
+          str += cr;
+
+         document.getElementById('comment_description').value = str;
+         return true;
+       }
     </script>
 
 </article>

From 67cce6e29f02dd13636bad720e13f15ec2f1ff6a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 30 Apr 2014 11:29:04 +0200
Subject: [PATCH 1265/4742] Clean up previous patch

Issue #2519
---
 doc/compress.html | 59 ++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index e69b702a77..2d190220c4 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -32,7 +32,7 @@ <h2>Script compression helper</h2>
     click <strong>Compress</strong> to download the minified script
     file.</p>
 
-    <form id="form" action="http://marijnhaverbeke.nl/uglifyjs" method="post" onsubmit="return generateCommentDescription();">
+    <form id="form" action="http://marijnhaverbeke.nl/uglifyjs" method="post" onsubmit="generateHeader();">
       <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>
@@ -224,7 +224,7 @@ <h2>Script compression helper</h2>
       <p>
         <button type="submit">Compress</button> with <a href="http://github.com/mishoo/UglifyJS/">UglifyJS</a>
       </p>
-        <input type="hidden" id="comment_description" name="comment_description" />
+      <input type="hidden" id="header" name="header">
       <p>Custom code to add to the compressed file:<textarea name="js_code" style="width: 100%; height: 15em;" class="field" id="js_code"></textarea></p>
     </form>
 
@@ -245,39 +245,34 @@ <h2>Script compression helper</h2>
           }
        }
        
-       function generateCommentDescription() {
-          var cr = '\n';
-          var versionNode = document.getElementById('version');
-          var version = versionNode.options[versionNode.selectedIndex].label
-          var filesNode = document.getElementById("files");
-          var optGroupHeaderIncluded;
+       function generateHeader() {
+         var versionNode = document.getElementById("version");
+         var version = versionNode.options[versionNode.selectedIndex].label
+         var filesNode = document.getElementById("files");
+         var optGroupHeaderIncluded;
 
-          //Generate the comment
-          var str = '/* CodeMirror - Minified & Bundled' + cr;
-          str += 'Generated on ' + new Date().toLocaleDateString() + ' with: http://codemirror.net/doc/compress.html' + cr;
-          str += 'Version: ' + version + cr;
-          str += cr;
+         // Generate the comment
+         var str = "/* CodeMirror - Minified & Bundled\n";
+         str += "   Generated on " + new Date().toLocaleDateString() + " with http://codemirror.net/doc/compress.html\n";
+         str += "   Version: " + version + "\n\n";
 
-          for (var group = filesNode.firstChild; group; group = group.nextSibling) {
-            optGroupHeaderIncluded = false;
-            for (var option = group.firstChild; option; option = option.nextSibling) {
-              if (option.nodeName !== 'OPTION') {
-                continue;
-              } else if (option.selected) {
-                if (!optGroupHeaderIncluded) {
-                  str += group.label + ':' + cr;
-                  optGroupHeaderIncluded = true;
-                }
-                str += '- ' + option.label + cr;
-              }
-            }
-          }
-          str += '*/';
-          str += cr;
-          str += cr;
+         for (var group = filesNode.firstChild; group; group = group.nextSibling) {
+           optGroupHeaderIncluded = false;
+           for (var option = group.firstChild; option; option = option.nextSibling) {
+             if (option.nodeName !== "OPTION") {
+               continue;
+             } else if (option.selected) {
+               if (!optGroupHeaderIncluded) {
+                 str += "   " + group.label + ":\n";
+                 optGroupHeaderIncluded = true;
+               }
+               str += "   - " + option.label + "\n";
+             }
+           }
+         }
+         str += " */\n\n";
 
-         document.getElementById('comment_description').value = str;
-         return true;
+         document.getElementById("header").value = str;
        }
     </script>
 

From 96d99ed9ac07cce8b2df7816edffce3bd522fe53 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Tue, 29 Apr 2014 22:06:11 -0400
Subject: [PATCH 1266/4742] [gfm mode] Ignore * at end of URLs (for em/strong)

---
 mode/gfm/gfm.js  | 2 +-
 mode/gfm/test.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 8fcc9f70a7..d9956b80f2 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -85,7 +85,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
           return "link";
         }
       }
-      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
+      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
          stream.string.slice(stream.start - 2, stream.start) != "](") {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index e5c3486ebd..2699aff1da 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -112,6 +112,9 @@
   MT("vanillaLinkExtension",
      "foo [link http://www.example.com/index.html] bar");
 
+  MT("vanillaLinkEmphasis",
+     "foo [em *][link http://www.example.com/index.html][em *] bar");
+
   MT("notALink",
      "[comment ```css]",
      "[tag foo] {[property color]:[keyword black];}",

From d85e0439e97dbdc2fddaff119503fb3d311afb91 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Mon, 28 Apr 2014 22:43:00 -0700
Subject: [PATCH 1267/4742] [shell mode] Add tests.  Not very thorough but
 touch most functionality.

---
 mode/shell/test.js | 50 ++++++++++++++++++++++++++++++++++++++++++++++
 test/index.html    |  2 ++
 2 files changed, 52 insertions(+)
 create mode 100644 mode/shell/test.js

diff --git a/mode/shell/test.js b/mode/shell/test.js
new file mode 100644
index 0000000000..de1cbca4ff
--- /dev/null
+++ b/mode/shell/test.js
@@ -0,0 +1,50 @@
+(function() {
+  var mode = CodeMirror.getMode({}, "shell");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("var",
+     "text [def $var] text");
+  MT("varBraces",
+     "text[def ${var}]text");
+  MT("varVar",
+     "text [def $a$b] text");
+  MT("varBracesVarBraces",
+     "text[def ${a}${b}]text");
+
+  MT("singleQuotedVar",
+     "[string 'text $var text']");
+  MT("singleQuotedVarBraces",
+     "[string 'text ${var} text']");
+
+  // TODO: would be better to style spaces after interpolation as string.
+  MT("doubleQuotedVar",
+     '[string "text ][def $var] [string text"]');
+  MT("doubleQuotedVarBraces",
+     '[string "text][def ${var}][string text"]');
+  MT("doubleQuotedVarPunct",
+     '[string "text ][def $@] [string text"]');
+  MT("doubleQuotedVarVar",
+     '[string "][def $a$b][string "]');
+  MT("doubleQuotedVarBracesVarBraces",
+     '[string "][def ${a}${b}][string "]');
+
+  MT("subshell",
+     "[builtin echo] [quote $(whoami)] s log, stardate [quote `date`].");
+  MT("doubleQuotedSubshell",
+     "[builtin echo] [string \"][quote $(whoami)][string 's log, stardate `date`.\"]");
+
+  MT("hashbang",
+     "[meta #!/bin/bash]");
+  MT("comment",
+     "text [comment # Blurb]");
+
+  // TODO: numbers at EOL are not styled 'number'
+  MT("keywords",
+     "[keyword while] [atom true]; [keyword do]",
+     "  [builtin sleep] 3",
+     "[keyword done]");
+  MT("options",
+     "[builtin ls] [attribute -l] [attribute --human-readable]");
+  MT("operator",
+     "[def var][operator =]value");
+})();
diff --git a/test/index.html b/test/index.html
index 752971fe48..9930301eb5 100644
--- a/test/index.html
+++ b/test/index.html
@@ -96,6 +96,8 @@ <h2>Test Suite</h2>
     <script src="../mode/markdown/test.js"></script>
     <script src="../mode/gfm/gfm.js"></script>
     <script src="../mode/gfm/test.js"></script>
+    <script src="../mode/shell/shell.js"></script>
+    <script src="../mode/shell/test.js"></script>
     <script src="../mode/stex/stex.js"></script>
     <script src="../mode/stex/test.js"></script>
     <script src="../mode/verilog/verilog.js"></script>

From 097ef7eab556542f9c064d34956848e2321fd183 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Mon, 28 Apr 2014 17:55:15 -0700
Subject: [PATCH 1268/4742] [shell mode] Fix highlight of spaces after
 variables in double quoted strings.

---
 mode/shell/shell.js | 2 +-
 mode/shell/test.js  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 7753411c98..bc5fb0d11a 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -33,6 +33,7 @@ CodeMirror.defineMode('shell', function() {
     'touch vi vim wall wc wget who write yes zsh');
 
   function tokenBase(stream, state) {
+    if (stream.eatSpace()) return null;
 
     var sol = stream.sol();
     var ch = stream.next();
@@ -119,7 +120,6 @@ CodeMirror.defineMode('shell', function() {
   return {
     startState: function() {return {tokens:[]};},
     token: function(stream, state) {
-      if (stream.eatSpace()) return null;
       return tokenize(stream, state);
     }
   };
diff --git a/mode/shell/test.js b/mode/shell/test.js
index de1cbca4ff..696f521195 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -16,13 +16,12 @@
   MT("singleQuotedVarBraces",
      "[string 'text ${var} text']");
 
-  // TODO: would be better to style spaces after interpolation as string.
   MT("doubleQuotedVar",
-     '[string "text ][def $var] [string text"]');
+     '[string "text ][def $var][string  text"]');
   MT("doubleQuotedVarBraces",
      '[string "text][def ${var}][string text"]');
   MT("doubleQuotedVarPunct",
-     '[string "text ][def $@] [string text"]');
+     '[string "text ][def $@][string  text"]');
   MT("doubleQuotedVarVar",
      '[string "][def $a$b][string "]');
   MT("doubleQuotedVarBracesVarBraces",

From b6fb1fc7ab66ef5d89394030371acbfd452b8df0 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Mon, 28 Apr 2014 21:37:37 -0700
Subject: [PATCH 1269/4742] [shell mode] Fix number highlight at end of line.

---
 mode/shell/shell.js | 2 +-
 mode/shell/test.js  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index bc5fb0d11a..9145a72c0d 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -64,7 +64,7 @@ CodeMirror.defineMode('shell', function() {
     }
     if (/\d/.test(ch)) {
       stream.eatWhile(/\d/);
-      if(!/\w/.test(stream.peek())) {
+      if(stream.eol() || !/\w/.test(stream.peek())) {
         return 'number';
       }
     }
diff --git a/mode/shell/test.js b/mode/shell/test.js
index 696f521195..f3e592d14d 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -37,10 +37,11 @@
   MT("comment",
      "text [comment # Blurb]");
 
-  // TODO: numbers at EOL are not styled 'number'
+  MT("numbers",
+     "[number 0] [number 1] [number 2]");
   MT("keywords",
      "[keyword while] [atom true]; [keyword do]",
-     "  [builtin sleep] 3",
+     "  [builtin sleep] [number 3]",
      "[keyword done]");
   MT("options",
      "[builtin ls] [attribute -l] [attribute --human-readable]");

From 1cb9eb49c60c7f30fef1ea79d8634e3b029cc4fb Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Tue, 29 Apr 2014 11:28:43 -0700
Subject: [PATCH 1270/4742] [shell mode] Understand backslash escaping outside
 strings.

---
 mode/shell/shell.js | 4 ++++
 mode/shell/test.js  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 9145a72c0d..5abb44711f 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -38,6 +38,10 @@ CodeMirror.defineMode('shell', function() {
     var sol = stream.sol();
     var ch = stream.next();
 
+    if (ch === '\\') {
+      stream.next();
+      return null;
+    }
     if (ch === '\'' || ch === '"' || ch === '`') {
       state.tokens.unshift(tokenString(ch));
       return tokenize(stream, state);
diff --git a/mode/shell/test.js b/mode/shell/test.js
index f3e592d14d..3ab045c087 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -27,6 +27,11 @@
   MT("doubleQuotedVarBracesVarBraces",
      '[string "][def ${a}${b}][string "]');
 
+  MT("notAString",
+     "text\\'text");
+  MT("escapes",
+     "outside\\'\\\"\\`\\\\[string \"inside\\`\\'\\\"\\\\`\\$notAVar\"]outside\\$\\(notASubShell\\)");
+
   MT("subshell",
      "[builtin echo] [quote $(whoami)] s log, stardate [quote `date`].");
   MT("doubleQuotedSubshell",

From 8e634f048007bf2c9518fd2f5c799715f91992d0 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Wed, 30 Apr 2014 19:20:13 +0530
Subject: [PATCH 1271/4742] [vim] resolved PageUp/PageDown issue  in visual
 mode

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 1009ade0ab..c21d208554 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1550,8 +1550,7 @@
         // will move the cursor to where it should be in the end.
         var curStart = cm.getCursor();
         var repeat = motionArgs.repeat;
-        cm.moveV((motionArgs.forward ? repeat : -repeat), 'page');
-        var curEnd = cm.getCursor();
+        var curEnd = cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
         cm.setCursor(curStart);
         return curEnd;
       },

From 998a1b6abf104996c4fbc03231dbe1d1f9eed2d6 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <yunchiluo@google.com>
Date: Wed, 30 Apr 2014 16:19:29 +0200
Subject: [PATCH 1272/4742] [vim] Remove obsolete setCursor from moveByPage

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

diff --git a/keymap/vim.js b/keymap/vim.js
index c21d208554..fcc639213e 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1550,9 +1550,7 @@
         // will move the cursor to where it should be in the end.
         var curStart = cm.getCursor();
         var repeat = motionArgs.repeat;
-        var curEnd = cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
-        cm.setCursor(curStart);
-        return curEnd;
+        return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
       },
       moveByParagraph: function(cm, motionArgs) {
         var line = cm.getCursor().line;

From c26ba1c58082828ddf21ed9515c0f95548fd2f4a Mon Sep 17 00:00:00 2001
From: Tomas-A <taksas027@gmail.com>
Date: Fri, 2 May 2014 00:17:42 +0100
Subject: [PATCH 1273/4742] [css mode] Fixing a vendor prefix highlighting bug

A more detailed problem description in issue #2523
---
 mode/css/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index a2b80df5f7..3fae9687fd 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -54,7 +54,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       if (/[\d.]/.test(stream.peek())) {
         stream.eatWhile(/[\w.%]/);
         return ret("number", "unit");
-      } else if (stream.match(/^[^-]+-/)) {
+      } else if (stream.match(/^\w+-/)) {
         return ret("meta", "meta");
       }
     } else if (/[,+>*\/]/.test(ch)) {

From 9b1fe0c211734543041d4990b52e1a75512d4eb8 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Thu, 1 May 2014 23:44:29 -0400
Subject: [PATCH 1274/4742] [gfm mode] Stack link tokens in overlay with base
 tokens.

Added `combineTokens` for overlays that can override default
`combine` argument.
---
 addon/mode/overlay.js | 12 +++++++++---
 mode/gfm/gfm.js       |  5 +++++
 mode/gfm/test.js      | 20 +++++++++++++++++++-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index c16b0c822d..e32fa830b3 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -3,8 +3,9 @@
 // functionality, but a second (typically simple) mode is used, which
 // can override the style of text. Both modes get to parse all of the
 // text, but when both assign a non-null style to a piece of code, the
-// overlay wins, unless the combine argument was true, in which case
-// the styles are combined.
+// overlay wins, unless the combine argument was true and not overridden,
+// or state.overlay.combineTokens was true, in which case the styles are
+// combined.
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -54,8 +55,13 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
       }
       stream.pos = Math.min(state.basePos, state.overlayPos);
 
+      // state.overlay.combineTokens always takes precedence over combine,
+      // unless set to null
       if (state.overlayCur == null) return state.baseCur;
-      if (state.baseCur != null && combine) return state.baseCur + " " + state.overlayCur;
+      else if (state.baseCur != null &&
+               state.overlay.combineTokens ||
+               combine && state.overlay.combineTokens == null)
+        return state.baseCur + " " + state.overlayCur;
       else return state.overlayCur;
     },
 
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index d9956b80f2..5a028c48b4 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -30,6 +30,8 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
       };
     },
     token: function(stream, state) {
+      state.combineTokens = null;
+
       // Hack to prevent formatting override inside code blocks (block and inline)
       if (state.codeBlock) {
         if (stream.match(/^```/)) {
@@ -77,11 +79,13 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
           // User/Project@SHA
           // User@SHA
           // SHA
+          state.combineTokens = true;
           return "link";
         } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) {
           // User/Project#Num
           // User#Num
           // #Num
+          state.combineTokens = true;
           return "link";
         }
       }
@@ -90,6 +94,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
         // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine
+        state.combineTokens = true;
         return "link";
       }
       stream.next();
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 2699aff1da..d06a219240 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -73,6 +73,9 @@
   MT("SHA",
      "foo [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] bar");
 
+  MT("SHAEmphasis",
+     "[em *foo ][em&link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2][em *]");
+
   MT("shortSHA",
      "foo [link be6a8cc] bar");
 
@@ -88,21 +91,36 @@
   MT("userSHA",
      "foo [link bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] hello");
 
+  MT("userSHAEmphasis",
+     "[em *foo ][em&link bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2][em *]");
+
   MT("userProjectSHA",
      "foo [link bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] world");
 
+  MT("userProjectSHAEmphasis",
+     "[em *foo ][em&link bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2][em *]");
+
   MT("num",
      "foo [link #1] bar");
 
+  MT("numEmphasis",
+     "[em *foo ][em&link #1][em *]");
+
   MT("badNum",
      "foo #1bar hello");
 
   MT("userNum",
      "foo [link bar#1] hello");
 
+  MT("userNumEmphasis",
+     "[em *foo ][em&link bar#1][em *]");
+
   MT("userProjectNum",
      "foo [link bar/hello#1] world");
 
+  MT("userProjectNumEmphasis",
+     "[em *foo ][em&link bar/hello#1][em *]");
+
   MT("vanillaLink",
      "foo [link http://www.example.com/] bar");
 
@@ -113,7 +131,7 @@
      "foo [link http://www.example.com/index.html] bar");
 
   MT("vanillaLinkEmphasis",
-     "foo [em *][link http://www.example.com/index.html][em *] bar");
+     "foo [em *][em&link http://www.example.com/index.html][em *] bar");
 
   MT("notALink",
      "[comment ```css]",

From 5a2bfc16e46f78ea37d145000f6c438825ad5ff9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 09:13:35 +0200
Subject: [PATCH 1275/4742] [real-world uses] Add ecsspert.com

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

diff --git a/doc/realworld.html b/doc/realworld.html
index ceb1b8ca2c..ccfbf4be41 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -58,6 +58,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://ireneros.com/deck/deck.js-codemirror/introduction/#textarea-code">Deck.js integration</a> (slides with editors)</li>
       <li><a href="http://www.dbninja.com">DbNinja</a> (MySQL access interface)</li>
       <li><a href="https://chat.echoplex.us/">Echoplexus</a> (chat and collaborative coding)</li>
+      <li><a href="http://www.ecsspert.com/">eCSSpert</a> (CSS demos and experiments)</li>
       <li><a href="http://elm-lang.org/Examples.elm">Elm language examples</a></li>
       <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
       <li><a href="http://emmet.io">Emmet</a> (fast XML editing)</li>

From 2328627e0261bac0f6fea7739d892157b6d0bdde Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 10:09:42 +0200
Subject: [PATCH 1276/4742] Ensure current target is scrolled into view when
 alt-drag selecting

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0440d9d701..91baa83fd1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2670,7 +2670,9 @@
             ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
         }
         if (!ranges.length) ranges.push(new Range(start, start));
-        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex), sel_mouse);
+        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
+                     {origin: "*mouse", scroll: false});
+        cm.scrollIntoView(pos);
       } else {
         var oldRange = ourRange;
         var anchor = oldRange.anchor, head = pos;

From 37323b5f707bf1d341d35f67735101dafa80a1db Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 10:38:08 +0200
Subject: [PATCH 1277/4742] More closer mimic Emacs behavior in transposeChars
 command

Issue #2507
---
 keymap/emacs.js   |  2 ++
 lib/codemirror.js | 20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 8d3ab62da1..4b8d5c4154 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -324,6 +324,8 @@
     },
     "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }),
     "Ctrl-T": repeated(function(cm) {
+      cm.execCommand("transposeChars");
+      return;
       var pos = cm.getCursor();
       if (pos.ch < cm.getLine(pos.line).length) pos = Pos(pos.line, pos.ch + 1);
       var from = cm.findPosH(pos, -2, "char");
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 91baa83fd1..e026248cbd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4620,13 +4620,25 @@
     },
     transposeChars: function(cm) {
       runInOp(cm, function() {
-        var ranges = cm.listSelections();
+        var ranges = cm.listSelections(), newSel = [];
         for (var i = 0; i < ranges.length; i++) {
           var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
-          if (cur.ch > 0 && cur.ch < line.length - 1)
-            cm.replaceRange(line.charAt(cur.ch) + line.charAt(cur.ch - 1),
-                            Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
+          if (line) {
+            if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1);
+            if (cur.ch > 0) {
+              cur = new Pos(cur.line, cur.ch + 1);
+              cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
+                              Pos(cur.line, cur.ch - 2), cur, "+transpose");
+            } else if (cur.line > cm.doc.first) {
+              var prev = getLine(cm.doc, cur.line - 1).text;
+              if (prev)
+                cm.replaceRange(line.charAt(0) + "\n" + prev.charAt(prev.charAt(prev.length - 1)),
+                                Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
+            }
+          }
+          newSel.push(new Range(cur, cur));
         }
+        cm.setSelections(newSel);
       });
     },
     newlineAndIndent: function(cm) {

From 4bfb40211c92fbcc62583de7010067175c87bc47 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 10:38:36 +0200
Subject: [PATCH 1278/4742] Remove replaced code

Issue #2507
---
 keymap/emacs.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 4b8d5c4154..7cecf1f627 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -325,14 +325,6 @@
     "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }),
     "Ctrl-T": repeated(function(cm) {
       cm.execCommand("transposeChars");
-      return;
-      var pos = cm.getCursor();
-      if (pos.ch < cm.getLine(pos.line).length) pos = Pos(pos.line, pos.ch + 1);
-      var from = cm.findPosH(pos, -2, "char");
-      var range = cm.getRange(from, pos);
-      if (range.length != 2) return;
-      cm.setSelection(from, pos);
-      cm.replaceSelection(range.charAt(1) + range.charAt(0), null, "+transpose");
     }),
 
     "Alt-C": repeated(function(cm) {

From a7fb965c0e64ef186f76885f70fce8f7b822f5f8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 10:51:12 +0200
Subject: [PATCH 1279/4742] [python mode] Adjust coding style, add hintWords
 helper

---
 mode/python/python.js | 636 +++++++++++++++++++++---------------------
 1 file changed, 319 insertions(+), 317 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index f5530bcfdb..7cea39d24a 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -6,383 +6,385 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
-
-
-CodeMirror.defineMode("python", function(conf, parserConf) {
-    var ERRORCLASS = 'error';
-
-    function wordRegexp(words) {
-        return new RegExp("^((" + words.join(")|(") + "))\\b");
-    }
+  "use strict";
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  var wordOperators = wordRegexp(["and", "or", "not", "is", "in"]);
+  var commonKeywords = ["as", "assert", "break", "class", "continue",
+                        "def", "del", "elif", "else", "except", "finally",
+                        "for", "from", "global", "if", "import",
+                        "lambda", "pass", "raise", "return",
+                        "try", "while", "with", "yield"];
+  var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
+                        "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
+                        "enumerate", "eval", "filter", "float", "format", "frozenset",
+                        "getattr", "globals", "hasattr", "hash", "help", "hex", "id",
+                        "input", "int", "isinstance", "issubclass", "iter", "len",
+                        "list", "locals", "map", "max", "memoryview", "min", "next",
+                        "object", "oct", "open", "ord", "pow", "property", "range",
+                        "repr", "reversed", "round", "set", "setattr", "slice",
+                        "sorted", "staticmethod", "str", "sum", "super", "tuple",
+                        "type", "vars", "zip", "__import__", "NotImplemented",
+                        "Ellipsis", "__debug__"];
+  var py2 = {builtins: ["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
+                        "file", "intern", "long", "raw_input", "reduce", "reload",
+                        "unichr", "unicode", "xrange", "False", "True", "None"],
+             keywords: ["exec", "print"]};
+  var py3 = {builtins: ["ascii", "bytes", "exec", "print"],
+             keywords: ["nonlocal", "False", "True", "None"]};
+
+  CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
+
+  CodeMirror.defineMode("python", function(conf, parserConf) {
+    var ERRORCLASS = "error";
 
     var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
-    var singleDelimiters = parserConf.singleDelimiters || new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
+    var singleDelimiters = parserConf.singleDelimiters || new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]");
     var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
     var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
     var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
     var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
     var hangingIndent = parserConf.hangingIndent || parserConf.indentUnit;
 
-    var wordOperators = wordRegexp(['and', 'or', 'not', 'is', 'in']);
-    var commonkeywords = ['as', 'assert', 'break', 'class', 'continue',
-                          'def', 'del', 'elif', 'else', 'except', 'finally',
-                          'for', 'from', 'global', 'if', 'import',
-                          'lambda', 'pass', 'raise', 'return',
-                          'try', 'while', 'with', 'yield'];
-    var commonBuiltins = ['abs', 'all', 'any', 'bin', 'bool', 'bytearray', 'callable', 'chr',
-                          'classmethod', 'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod',
-                          'enumerate', 'eval', 'filter', 'float', 'format', 'frozenset',
-                          'getattr', 'globals', 'hasattr', 'hash', 'help', 'hex', 'id',
-                          'input', 'int', 'isinstance', 'issubclass', 'iter', 'len',
-                          'list', 'locals', 'map', 'max', 'memoryview', 'min', 'next',
-                          'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
-                          'repr', 'reversed', 'round', 'set', 'setattr', 'slice',
-                          'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple',
-                          'type', 'vars', 'zip', '__import__', 'NotImplemented',
-                          'Ellipsis', '__debug__'];
-    var py2 = {'builtins': ['apply', 'basestring', 'buffer', 'cmp', 'coerce', 'execfile',
-                            'file', 'intern', 'long', 'raw_input', 'reduce', 'reload',
-                            'unichr', 'unicode', 'xrange', 'False', 'True', 'None'],
-               'keywords': ['exec', 'print']};
-    var py3 = {'builtins': ['ascii', 'bytes', 'exec', 'print'],
-               'keywords': ['nonlocal', 'False', 'True', 'None']};
-
+    var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
     if(parserConf.extra_keywords != undefined){
-        commonkeywords = commonkeywords.concat(parserConf.extra_keywords);
+      myKeywords = myKeywords.concat(parserConf.extra_keywords);
     }
     if(parserConf.extra_builtins != undefined){
-        commonBuiltins = commonBuiltins.concat(parserConf.extra_builtins);
+      myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
     }
     if (!!parserConf.version && parseInt(parserConf.version, 10) === 3) {
-        commonkeywords = commonkeywords.concat(py3.keywords);
-        commonBuiltins = commonBuiltins.concat(py3.builtins);
-        var stringPrefixes = new RegExp("^(([rb]|(br))?('{3}|\"{3}|['\"]))", "i");
+      myKeywords = myKeywords.concat(py3.keywords);
+      myBuiltins = myBuiltins.concat(py3.builtins);
+      var stringPrefixes = new RegExp("^(([rb]|(br))?('{3}|\"{3}|['\"]))", "i");
     } else {
-        commonkeywords = commonkeywords.concat(py2.keywords);
-        commonBuiltins = commonBuiltins.concat(py2.builtins);
-        var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
+      myKeywords = myKeywords.concat(py2.keywords);
+      myBuiltins = myBuiltins.concat(py2.builtins);
+      var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
     }
-    var keywords = wordRegexp(commonkeywords);
-    var builtins = wordRegexp(commonBuiltins);
+    var keywords = wordRegexp(myKeywords);
+    var builtins = wordRegexp(myBuiltins);
 
     var indentInfo = null;
 
     // tokenizers
     function tokenBase(stream, state) {
-        // Handle scope changes
-        if (stream.sol()) {
-            var scopeOffset = state.scopes[0].offset;
-            if (stream.eatSpace()) {
-                var lineOffset = stream.indentation();
-                if (lineOffset > scopeOffset) {
-                    indentInfo = 'indent';
-                } else if (lineOffset < scopeOffset) {
-                    indentInfo = 'dedent';
-                }
-                return null;
-            } else {
-                if (scopeOffset > 0) {
-                    dedent(stream, state);
-                }
-            }
-        }
+      // Handle scope changes
+      if (stream.sol()) {
+        var scopeOffset = state.scopes[0].offset;
         if (stream.eatSpace()) {
-            return null;
-        }
-
-        var ch = stream.peek();
-
-        // Handle Comments
-        if (ch === '#') {
-            stream.skipToEnd();
-            return 'comment';
-        }
-
-        // Handle Number Literals
-        if (stream.match(/^[0-9\.]/, false)) {
-            var floatLiteral = false;
-            // Floats
-            if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
-            if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
-            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(/^0x[0-9a-f]+/i)) { intLiteral = true; }
-            // Binary
-            if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
-            // Octal
-            if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
-            // Decimal
-            if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
-                // 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.
-            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);
+          var lineOffset = stream.indentation();
+          if (lineOffset > scopeOffset) {
+            indentInfo = "indent";
+          } else if (lineOffset < scopeOffset) {
+            indentInfo = "dedent";
+          }
+          return null;
+        } else {
+          if (scopeOffset > 0) {
+            dedent(stream, state);
+          }
         }
-
-        // Handle operators and Delimiters
-        if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
-            return null;
+      }
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      var ch = stream.peek();
+
+      // Handle Comments
+      if (ch === "#") {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      // Handle Number Literals
+      if (stream.match(/^[0-9\.]/, false)) {
+        var floatLiteral = false;
+        // Floats
+        if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
+        if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
+        if (stream.match(/^\.\d+/)) { floatLiteral = true; }
+        if (floatLiteral) {
+          // Float literals may be "imaginary"
+          stream.eat(/J/i);
+          return "number";
         }
-        if (stream.match(doubleOperators)
-            || stream.match(singleOperators)
-            || stream.match(wordOperators)) {
-            return 'operator';
+        // Integers
+        var intLiteral = false;
+        // Hex
+        if (stream.match(/^0x[0-9a-f]+/i)) { intLiteral = true; }
+        // Binary
+        if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
+        // Octal
+        if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
+        // Decimal
+        if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
+          // Decimal literals may be "imaginary"
+          stream.eat(/J/i);
+          // TODO - Can you have imaginary longs?
+          intLiteral = true;
         }
-        if (stream.match(singleDelimiters)) {
-            return null;
+        // Zero by itself with no other piece of number.
+        if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
+        if (intLiteral) {
+          // Integer literals may be "long"
+          stream.eat(/L/i);
+          return "number";
         }
-
-        if (stream.match(keywords)) {
-            return 'keyword';
-        }
-
-        if (stream.match(builtins)) {
-            return 'builtin';
+      }
+
+      // Handle Strings
+      if (stream.match(stringPrefixes)) {
+        state.tokenize = tokenStringFactory(stream.current());
+        return state.tokenize(stream, state);
+      }
+
+      // Handle operators and Delimiters
+      if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
+        return null;
+      }
+      if (stream.match(doubleOperators)
+          || stream.match(singleOperators)
+          || stream.match(wordOperators)) {
+        return "operator";
+      }
+      if (stream.match(singleDelimiters)) {
+        return null;
+      }
+
+      if (stream.match(keywords)) {
+        return "keyword";
+      }
+
+      if (stream.match(builtins)) {
+        return "builtin";
+      }
+
+      if (stream.match(/^(self|cls)\b/)) {
+        return "variable-2";
+      }
+
+      if (stream.match(identifiers)) {
+        if (state.lastToken == "def" || state.lastToken == "class") {
+          return "def";
         }
+        return "variable";
+      }
 
-        if (stream.match(/^(self|cls)\b/)) {
-            return "variable-2";
-        }
-
-        if (stream.match(identifiers)) {
-            if (state.lastToken == 'def' || state.lastToken == 'class') {
-                return 'def';
-            }
-            return 'variable';
-        }
-
-        // Handle non-detected items
-        stream.next();
-        return ERRORCLASS;
+      // Handle non-detected items
+      stream.next();
+      return ERRORCLASS;
     }
 
     function tokenStringFactory(delimiter) {
-        while ('rub'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
-            delimiter = delimiter.substr(1);
-        }
-        var singleline = delimiter.length == 1;
-        var OUTCLASS = 'string';
-
-        function tokenString(stream, state) {
-            while (!stream.eol()) {
-                stream.eatWhile(/[^'"\\]/);
-                if (stream.eat('\\')) {
-                    stream.next();
-                    if (singleline && stream.eol()) {
-                        return OUTCLASS;
-                    }
-                } else if (stream.match(delimiter)) {
-                    state.tokenize = tokenBase;
-                    return OUTCLASS;
-                } else {
-                    stream.eat(/['"]/);
-                }
-            }
-            if (singleline) {
-                if (parserConf.singleLineStringErrors) {
-                    return ERRORCLASS;
-                } else {
-                    state.tokenize = tokenBase;
-                }
+      while ("rub".indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
+        delimiter = delimiter.substr(1);
+      }
+      var singleline = delimiter.length == 1;
+      var OUTCLASS = "string";
+
+      function tokenString(stream, state) {
+        while (!stream.eol()) {
+          stream.eatWhile(/[^'"\\]/);
+          if (stream.eat("\\")) {
+            stream.next();
+            if (singleline && stream.eol()) {
+              return OUTCLASS;
             }
+          } else if (stream.match(delimiter)) {
+            state.tokenize = tokenBase;
             return OUTCLASS;
+          } else {
+            stream.eat(/['"]/);
+          }
+        }
+        if (singleline) {
+          if (parserConf.singleLineStringErrors) {
+            return ERRORCLASS;
+          } else {
+            state.tokenize = tokenBase;
+          }
         }
-        tokenString.isString = true;
-        return tokenString;
+        return OUTCLASS;
+      }
+      tokenString.isString = true;
+      return tokenString;
     }
 
     function indent(stream, state, type) {
-        type = type || 'py';
-        var indentUnit = 0;
-        if (type === 'py') {
-            if (state.scopes[0].type !== 'py') {
-                state.scopes[0].offset = stream.indentation();
-                return;
-            }
-            for (var i = 0; i < state.scopes.length; ++i) {
-                if (state.scopes[i].type === 'py') {
-                    indentUnit = state.scopes[i].offset + conf.indentUnit;
-                    break;
-                }
-            }
-        } else if (stream.match(/\s*($|#)/, false)) {
-            // An open paren/bracket/brace with only space or comments after it
-            // on the line will indent the next line a fixed amount, to make it
-            // easier to put arguments, list items, etc. on their own lines.
-            indentUnit = stream.indentation() + hangingIndent;
-        } else {
-            indentUnit = stream.column() + stream.current().length;
+      type = type || "py";
+      var indentUnit = 0;
+      if (type === "py") {
+        if (state.scopes[0].type !== "py") {
+          state.scopes[0].offset = stream.indentation();
+          return;
+        }
+        for (var i = 0; i < state.scopes.length; ++i) {
+          if (state.scopes[i].type === "py") {
+            indentUnit = state.scopes[i].offset + conf.indentUnit;
+            break;
+          }
         }
-        state.scopes.unshift({
-            offset: indentUnit,
-            type: type
-        });
+      } else if (stream.match(/\s*($|#)/, false)) {
+        // An open paren/bracket/brace with only space or comments after it
+        // on the line will indent the next line a fixed amount, to make it
+        // easier to put arguments, list items, etc. on their own lines.
+        indentUnit = stream.indentation() + hangingIndent;
+      } else {
+        indentUnit = stream.column() + stream.current().length;
+      }
+      state.scopes.unshift({
+        offset: indentUnit,
+        type: type
+      });
     }
 
     function dedent(stream, state, type) {
-        type = type || 'py';
-        if (state.scopes.length == 1) return;
-        if (state.scopes[0].type === 'py') {
-            var _indent = stream.indentation();
-            var _indent_index = -1;
-            for (var i = 0; i < state.scopes.length; ++i) {
-                if (_indent === state.scopes[i].offset) {
-                    _indent_index = i;
-                    break;
-                }
-            }
-            if (_indent_index === -1) {
-                return true;
-            }
-            while (state.scopes[0].offset !== _indent) {
-                state.scopes.shift();
-            }
-            return false;
-        } else {
-            if (type === 'py') {
-                state.scopes[0].offset = stream.indentation();
-                return false;
-            } else {
-                if (state.scopes[0].type != type) {
-                    return true;
-                }
-                state.scopes.shift();
-                return false;
-            }
+      type = type || "py";
+      if (state.scopes.length == 1) return;
+      if (state.scopes[0].type === "py") {
+        var _indent = stream.indentation();
+        var _indent_index = -1;
+        for (var i = 0; i < state.scopes.length; ++i) {
+          if (_indent === state.scopes[i].offset) {
+            _indent_index = i;
+            break;
+          }
         }
-    }
-
-    function tokenLexer(stream, state) {
-        indentInfo = null;
-        var style = state.tokenize(stream, state);
-        var current = stream.current();
-
-        // Handle '.' connected identifiers
-        if (current === '.') {
-            style = stream.match(identifiers, false) ? null : ERRORCLASS;
-            if (style === null && state.lastStyle === 'meta') {
-                // Apply 'meta' style to '.' connected identifiers when
-                // appropriate.
-                style = 'meta';
-            }
-            return style;
+        if (_indent_index === -1) {
+          return true;
         }
-
-        // Handle decorators
-        if (current === '@') {
-            return stream.match(identifiers, false) ? 'meta' : ERRORCLASS;
+        while (state.scopes[0].offset !== _indent) {
+          state.scopes.shift();
         }
-
-        if ((style === 'variable' || style === 'builtin')
-            && state.lastStyle === 'meta') {
-            style = 'meta';
+        return false;
+      } else {
+        if (type === "py") {
+          state.scopes[0].offset = stream.indentation();
+          return false;
+        } else {
+          if (state.scopes[0].type != type) {
+            return true;
+          }
+          state.scopes.shift();
+          return false;
         }
+      }
+    }
 
-        // Handle scope changes.
-        if (current === 'pass' || current === 'return') {
-            state.dedent += 1;
-        }
-        if (current === 'lambda') state.lambda = true;
-        if ((current === ':' && !state.lambda && state.scopes[0].type == 'py')
-            || indentInfo === 'indent') {
-            indent(stream, state);
-        }
-        var delimiter_index = '[({'.indexOf(current);
-        if (delimiter_index !== -1) {
-            indent(stream, state, '])}'.slice(delimiter_index, delimiter_index+1));
-        }
-        if (indentInfo === 'dedent') {
-            if (dedent(stream, state)) {
-                return ERRORCLASS;
-            }
+    function tokenLexer(stream, state) {
+      indentInfo = null;
+      var style = state.tokenize(stream, state);
+      var current = stream.current();
+
+      // Handle '.' connected identifiers
+      if (current === ".") {
+        style = stream.match(identifiers, false) ? null : ERRORCLASS;
+        if (style === null && state.lastStyle === "meta") {
+          // Apply 'meta' style to '.' connected identifiers when
+          // appropriate.
+          style = "meta";
         }
-        delimiter_index = '])}'.indexOf(current);
-        if (delimiter_index !== -1) {
-            if (dedent(stream, state, current)) {
-                return ERRORCLASS;
-            }
+        return style;
+      }
+
+      // Handle decorators
+      if (current === "@") {
+        return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
+      }
+
+      if ((style === "variable" || style === "builtin")
+          && state.lastStyle === "meta") {
+        style = "meta";
+      }
+
+      // Handle scope changes.
+      if (current === "pass" || current === "return") {
+        state.dedent += 1;
+      }
+      if (current === "lambda") state.lambda = true;
+      if ((current === ":" && !state.lambda && state.scopes[0].type == "py")
+          || indentInfo === "indent") {
+        indent(stream, state);
+      }
+      var delimiter_index = "[({".indexOf(current);
+      if (delimiter_index !== -1) {
+        indent(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+      }
+      if (indentInfo === "dedent") {
+        if (dedent(stream, state)) {
+          return ERRORCLASS;
         }
-        if (state.dedent > 0 && stream.eol() && state.scopes[0].type == 'py') {
-            if (state.scopes.length > 1) state.scopes.shift();
-            state.dedent -= 1;
+      }
+      delimiter_index = "])}".indexOf(current);
+      if (delimiter_index !== -1) {
+        if (dedent(stream, state, current)) {
+          return ERRORCLASS;
         }
+      }
+      if (state.dedent > 0 && stream.eol() && state.scopes[0].type == "py") {
+        if (state.scopes.length > 1) state.scopes.shift();
+        state.dedent -= 1;
+      }
 
-        return style;
+      return style;
     }
 
     var external = {
-        startState: function(basecolumn) {
-            return {
-              tokenize: tokenBase,
-              scopes: [{offset:basecolumn || 0, type:'py'}],
-              lastStyle: null,
-              lastToken: null,
-              lambda: false,
-              dedent: 0
-          };
-        },
-
-        token: function(stream, state) {
-            var style = tokenLexer(stream, state);
-
-            state.lastStyle = style;
-
-            var current = stream.current();
-            if (current && style) {
-                state.lastToken = current;
-            }
+      startState: function(basecolumn) {
+        return {
+          tokenize: tokenBase,
+          scopes: [{offset: basecolumn || 0, type: "py"}],
+          lastStyle: null,
+          lastToken: null,
+          lambda: false,
+          dedent: 0
+        };
+      },
+
+      token: function(stream, state) {
+        var style = tokenLexer(stream, state);
+
+        state.lastStyle = style;
 
-            if (stream.eol() && state.lambda) {
-                state.lambda = false;
-            }
-            return style;
-        },
+        var current = stream.current();
+        if (current && style) {
+          state.lastToken = current;
+        }
 
-        indent: function(state) {
-            if (state.tokenize != tokenBase) {
-                return state.tokenize.isString ? CodeMirror.Pass : 0;
-            }
+        if (stream.eol() && state.lambda) {
+          state.lambda = false;
+        }
+        return style;
+      },
 
-            return state.scopes[0].offset;
-        },
+      indent: function(state) {
+        if (state.tokenize != tokenBase) {
+          return state.tokenize.isString ? CodeMirror.Pass : 0;
+        }
+
+        return state.scopes[0].offset;
+      },
 
-        lineComment: "#",
-        fold: "indent"
+      lineComment: "#",
+      fold: "indent"
     };
     return external;
-});
+  });
 
-CodeMirror.defineMIME("text/x-python", "python");
+  CodeMirror.defineMIME("text/x-python", "python");
 
-var words = function(str){return str.split(' ');};
+  var words = function(str){return str.split(" ");};
 
-CodeMirror.defineMIME("text/x-cython", {
-  name: "python",
-  extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
-                        "extern gil include nogil property public"+
-                        "readonly struct union DEF IF ELIF ELSE")
-});
+  CodeMirror.defineMIME("text/x-cython", {
+    name: "python",
+    extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
+                          "extern gil include nogil property public"+
+                          "readonly struct union DEF IF ELIF ELSE")
+  });
 
 });

From 3fb77a30c1394a0acec1ce8fe554e3cea74fe207 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 11:03:41 +0200
Subject: [PATCH 1280/4742] [emacs mode] Fix test, and issue caused by test

For tranposeChars

Issue #2507
---
 lib/codemirror.js  | 2 +-
 test/emacs_test.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e026248cbd..1d144ce9f9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4632,7 +4632,7 @@
             } else if (cur.line > cm.doc.first) {
               var prev = getLine(cm.doc, cur.line - 1).text;
               if (prev)
-                cm.replaceRange(line.charAt(0) + "\n" + prev.charAt(prev.charAt(prev.length - 1)),
+                cm.replaceRange(line.charAt(0) + "\n" + prev.charAt(prev.length - 1),
                                 Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
             }
           }
diff --git a/test/emacs_test.js b/test/emacs_test.js
index f21605bb37..c49e480375 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -108,10 +108,10 @@
 
   sim("openLine", "foo bar", "Alt-F", "Ctrl-O", txt("foo\n bar"))
 
-  sim("transposeChar", "abcd\n\ne",
-      "Ctrl-F", "Ctrl-T", "Ctrl-T", txt("bcad\n\ne"), at(0, 3),
-      "Ctrl-F", "Ctrl-T", "Ctrl-T", "Ctrl-T", txt("bcda\n\ne"), at(0, 4),
-      "Ctrl-F", "Ctrl-T", txt("bcd\na\ne"), at(1, 1));
+  sim("transposeChar", "abcd\ne",
+      "Ctrl-F", "Ctrl-T", "Ctrl-T", txt("bcad\ne"), at(0, 3),
+      "Ctrl-F", "Ctrl-T", "Ctrl-T", "Ctrl-T", txt("bcda\ne"), at(0, 4),
+      "Ctrl-F", "Ctrl-T", txt("bcde\na"), at(1, 0));
 
   sim("manipWordCase", "foo BAR bAZ",
       "Alt-C", "Alt-L", "Alt-U", txt("Foo bar BAZ"),

From 21e96c005ccd8f8850c3a058d7da50346fb38f6e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 12:02:47 +0200
Subject: [PATCH 1281/4742] [python mode] Clean up indentation and scope
 tracking

Issue #2503
---
 mode/python/python.js | 216 +++++++++++++++---------------------------
 1 file changed, 79 insertions(+), 137 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 7cea39d24a..4fc4354ff7 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -38,6 +38,10 @@
 
   CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
 
+  function top(state) {
+    return state.scopes[state.scopes.length - 1];
+  }
+
   CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = "error";
 
@@ -56,7 +60,7 @@
     if(parserConf.extra_builtins != undefined){
       myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
     }
-    if (!!parserConf.version && parseInt(parserConf.version, 10) === 3) {
+    if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
       myKeywords = myKeywords.concat(py3.keywords);
       myBuiltins = myBuiltins.concat(py3.builtins);
       var stringPrefixes = new RegExp("^(([rb]|(br))?('{3}|\"{3}|['\"]))", "i");
@@ -68,35 +72,28 @@
     var keywords = wordRegexp(myKeywords);
     var builtins = wordRegexp(myBuiltins);
 
-    var indentInfo = null;
-
     // tokenizers
     function tokenBase(stream, state) {
       // Handle scope changes
-      if (stream.sol()) {
-        var scopeOffset = state.scopes[0].offset;
+      if (stream.sol() && top(state).type == "py") {
+        var scopeOffset = top(state).offset;
         if (stream.eatSpace()) {
           var lineOffset = stream.indentation();
-          if (lineOffset > scopeOffset) {
-            indentInfo = "indent";
-          } else if (lineOffset < scopeOffset) {
-            indentInfo = "dedent";
-          }
+          if (lineOffset > scopeOffset)
+            pushScope(stream, state, "py");
+          else if (lineOffset < scopeOffset)
+            return dedent(stream, state) ? ERRORCLASS : null;
           return null;
-        } else {
-          if (scopeOffset > 0) {
-            dedent(stream, state);
-          }
+        } else if (scopeOffset > 0 && dedent(stream, state)) {
+          return state.tokenize(stream, state) + " " + ERRORCLASS;
         }
       }
-      if (stream.eatSpace()) {
-        return null;
-      }
+      if (stream.eatSpace()) return null;
 
       var ch = stream.peek();
 
       // Handle Comments
-      if (ch === "#") {
+      if (ch == "#") {
         stream.skipToEnd();
         return "comment";
       }
@@ -116,11 +113,11 @@
         // Integers
         var intLiteral = false;
         // Hex
-        if (stream.match(/^0x[0-9a-f]+/i)) { intLiteral = true; }
+        if (stream.match(/^0x[0-9a-f]+/i)) intLiteral = true;
         // Binary
-        if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
+        if (stream.match(/^0b[01]+/i)) intLiteral = true;
         // Octal
-        if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
+        if (stream.match(/^0o[0-7]+/i)) intLiteral = true;
         // Decimal
         if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
           // Decimal literals may be "imaginary"
@@ -129,7 +126,7 @@
           intLiteral = true;
         }
         // Zero by itself with no other piece of number.
-        if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
+        if (stream.match(/^0(?![\dx])/i)) intLiteral = true;
         if (intLiteral) {
           // Integer literals may be "long"
           stream.eat(/L/i);
@@ -144,34 +141,29 @@
       }
 
       // Handle operators and Delimiters
-      if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
+      if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
         return null;
-      }
+
       if (stream.match(doubleOperators)
           || stream.match(singleOperators)
-          || stream.match(wordOperators)) {
+          || stream.match(wordOperators))
         return "operator";
-      }
-      if (stream.match(singleDelimiters)) {
+
+      if (stream.match(singleDelimiters))
         return null;
-      }
 
-      if (stream.match(keywords)) {
+      if (stream.match(keywords))
         return "keyword";
-      }
 
-      if (stream.match(builtins)) {
+      if (stream.match(builtins))
         return "builtin";
-      }
 
-      if (stream.match(/^(self|cls)\b/)) {
+      if (stream.match(/^(self|cls)\b/))
         return "variable-2";
-      }
 
       if (stream.match(identifiers)) {
-        if (state.lastToken == "def" || state.lastToken == "class") {
+        if (state.lastToken == "def" || state.lastToken == "class")
           return "def";
-        }
         return "variable";
       }
 
@@ -181,9 +173,9 @@
     }
 
     function tokenStringFactory(delimiter) {
-      while ("rub".indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
+      while ("rub".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
         delimiter = delimiter.substr(1);
-      }
+
       var singleline = delimiter.length == 1;
       var OUTCLASS = "string";
 
@@ -192,9 +184,8 @@
           stream.eatWhile(/[^'"\\]/);
           if (stream.eat("\\")) {
             stream.next();
-            if (singleline && stream.eol()) {
+            if (singleline && stream.eol())
               return OUTCLASS;
-            }
           } else if (stream.match(delimiter)) {
             state.tokenize = tokenBase;
             return OUTCLASS;
@@ -203,11 +194,10 @@
           }
         }
         if (singleline) {
-          if (parserConf.singleLineStringErrors) {
+          if (parserConf.singleLineStringErrors)
             return ERRORCLASS;
-          } else {
+          else
             state.tokenize = tokenBase;
-          }
         }
         return OUTCLASS;
       }
@@ -215,76 +205,35 @@
       return tokenString;
     }
 
-    function indent(stream, state, type) {
-      type = type || "py";
-      var indentUnit = 0;
-      if (type === "py") {
-        if (state.scopes[0].type !== "py") {
-          state.scopes[0].offset = stream.indentation();
-          return;
-        }
-        for (var i = 0; i < state.scopes.length; ++i) {
-          if (state.scopes[i].type === "py") {
-            indentUnit = state.scopes[i].offset + conf.indentUnit;
-            break;
-          }
-        }
-      } else if (stream.match(/\s*($|#)/, false)) {
-        // An open paren/bracket/brace with only space or comments after it
-        // on the line will indent the next line a fixed amount, to make it
-        // easier to put arguments, list items, etc. on their own lines.
-        indentUnit = stream.indentation() + hangingIndent;
-      } else {
-        indentUnit = stream.column() + stream.current().length;
+    function pushScope(stream, state, type) {
+      var offset = 0, align = null;
+      if (type == "py") {
+        while (top(state).type != "py")
+          state.scopes.pop();
       }
-      state.scopes.unshift({
-        offset: indentUnit,
-        type: type
-      });
+      offset = top(state).offset + (type == "py" ? conf.indentUnit : hangingIndent);
+      if (type != "py" && !stream.match(/^(\s|#.*)*$/, false))
+        align = stream.column() + 1;
+      state.scopes.push({offset: offset, type: type, align: align});
     }
 
-    function dedent(stream, state, type) {
-      type = type || "py";
-      if (state.scopes.length == 1) return;
-      if (state.scopes[0].type === "py") {
-        var _indent = stream.indentation();
-        var _indent_index = -1;
-        for (var i = 0; i < state.scopes.length; ++i) {
-          if (_indent === state.scopes[i].offset) {
-            _indent_index = i;
-            break;
-          }
-        }
-        if (_indent_index === -1) {
-          return true;
-        }
-        while (state.scopes[0].offset !== _indent) {
-          state.scopes.shift();
-        }
-        return false;
-      } else {
-        if (type === "py") {
-          state.scopes[0].offset = stream.indentation();
-          return false;
-        } else {
-          if (state.scopes[0].type != type) {
-            return true;
-          }
-          state.scopes.shift();
-          return false;
-        }
+    function dedent(stream, state) {
+      var indented = stream.indentation();
+      while (top(state).offset > indented) {
+        if (top(state).type != "py") return true;
+        state.scopes.pop();
       }
+      return top(state).offset == indented;
     }
 
     function tokenLexer(stream, state) {
-      indentInfo = null;
       var style = state.tokenize(stream, state);
       var current = stream.current();
 
       // Handle '.' connected identifiers
-      if (current === ".") {
+      if (current == ".") {
         style = stream.match(identifiers, false) ? null : ERRORCLASS;
-        if (style === null && state.lastStyle === "meta") {
+        if (style == null && state.lastStyle == "meta") {
           // Apply 'meta' style to '.' connected identifiers when
           // appropriate.
           style = "meta";
@@ -293,41 +242,32 @@
       }
 
       // Handle decorators
-      if (current === "@") {
+      if (current == "@")
         return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
-      }
 
-      if ((style === "variable" || style === "builtin")
-          && state.lastStyle === "meta") {
+      if ((style == "variable" || style == "builtin")
+          && state.lastStyle == "meta")
         style = "meta";
-      }
 
       // Handle scope changes.
-      if (current === "pass" || current === "return") {
+      if (current == "pass" || current == "return")
         state.dedent += 1;
-      }
-      if (current === "lambda") state.lambda = true;
-      if ((current === ":" && !state.lambda && state.scopes[0].type == "py")
-          || indentInfo === "indent") {
-        indent(stream, state);
-      }
+
+      if (current == "lambda") state.lambda = true;
+      if (current == ":" && !state.lambda && top(state).type == "py")
+        pushScope(stream, state, "py");
+
       var delimiter_index = "[({".indexOf(current);
-      if (delimiter_index !== -1) {
-        indent(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
-      }
-      if (indentInfo === "dedent") {
-        if (dedent(stream, state)) {
-          return ERRORCLASS;
-        }
-      }
+      if (delimiter_index != -1)
+        pushScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+
       delimiter_index = "])}".indexOf(current);
-      if (delimiter_index !== -1) {
-        if (dedent(stream, state, current)) {
-          return ERRORCLASS;
-        }
+      if (delimiter_index != -1) {
+        if (top(state).type == current) state.scopes.pop();
+        else return ERRORCLASS;
       }
-      if (state.dedent > 0 && stream.eol() && state.scopes[0].type == "py") {
-        if (state.scopes.length > 1) state.scopes.shift();
+      if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
+        if (state.scopes.length > 1) state.scopes.pop();
         state.dedent -= 1;
       }
 
@@ -338,7 +278,7 @@
       startState: function(basecolumn) {
         return {
           tokenize: tokenBase,
-          scopes: [{offset: basecolumn || 0, type: "py"}],
+          scopes: [{offset: basecolumn || 0, type: "py", align: null}],
           lastStyle: null,
           lastToken: null,
           lambda: false,
@@ -352,22 +292,24 @@
         state.lastStyle = style;
 
         var current = stream.current();
-        if (current && style) {
+        if (current && style)
           state.lastToken = current;
-        }
 
-        if (stream.eol() && state.lambda) {
+        if (stream.eol() && state.lambda)
           state.lambda = false;
-        }
         return style;
       },
 
-      indent: function(state) {
-        if (state.tokenize != tokenBase) {
+      indent: function(state, textAfter) {
+        if (state.tokenize != tokenBase)
           return state.tokenize.isString ? CodeMirror.Pass : 0;
-        }
 
-        return state.scopes[0].offset;
+        var scope = top(state);
+        var closing = textAfter && textAfter.charAt(0) == scope.type;
+        if (scope.align != null)
+          return scope.align - (closing ? 1 : 0);
+        else
+          return scope.offset - (closing ? conf.indentUnit : 0);
       },
 
       lineComment: "#",
@@ -378,7 +320,7 @@
 
   CodeMirror.defineMIME("text/x-python", "python");
 
-  var words = function(str){return str.split(" ");};
+  var words = function(str) { return str.split(" "); };
 
   CodeMirror.defineMIME("text/x-cython", {
     name: "python",

From ae386fb3602743e8950cdb641046430641c6f589 Mon Sep 17 00:00:00 2001
From: Anders Nawroth <anders@neotechnology.com>
Date: Fri, 2 May 2014 12:05:34 +0200
Subject: [PATCH 1282/4742] [neo theme] Add

---
 demo/theme.html |  2 ++
 theme/neo.css   | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 theme/neo.css

diff --git a/demo/theme.html b/demo/theme.html
index 20e273cf59..4d59d24359 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -21,6 +21,7 @@
 <link rel="stylesheet" href="../theme/midnight.css">
 <link rel="stylesheet" href="../theme/monokai.css">
 <link rel="stylesheet" href="../theme/neat.css">
+<link rel="stylesheet" href="../theme/neo.css">
 <link rel="stylesheet" href="../theme/night.css">
 <link rel="stylesheet" href="../theme/paraiso-dark.css">
 <link rel="stylesheet" href="../theme/paraiso-light.css">
@@ -87,6 +88,7 @@ <h2>Theme Demo</h2>
     <option>midnight</option>
     <option>monokai</option>
     <option>neat</option>
+    <option>neo</option>
     <option>night</option>
     <option>paraiso-dark</option>
     <option>paraiso-light</option>
diff --git a/theme/neo.css b/theme/neo.css
new file mode 100644
index 0000000000..b013770b99
--- /dev/null
+++ b/theme/neo.css
@@ -0,0 +1,40 @@
+/* neo theme for codemirror */
+
+/* Color scheme */
+
+.cm-s-neo.CodeMirror {
+  background-color:#ffffff;
+  color:#2e383c;
+  line-height:1.4375;
+}
+.cm-s-neo .cm-comment {color:#75787b}
+.cm-s-neo .cm-keyword, .cm-s-neo .cm-property {color:#1d75b3}
+.cm-s-neo .cm-atom,.cm-s-neo .cm-number {color:#75438a}
+.cm-s-neo .cm-node,.cm-s-neo .cm-tag {color:#9c3328}
+.cm-s-neo .cm-string {color:#b35e14}
+.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier {color:#047d65}
+
+
+/* Editor styling */
+
+.cm-s-neo pre {
+  padding:0;
+}
+
+.cm-s-neo .CodeMirror-gutters {
+  border:none;
+  border-right:10px solid transparent;
+  background-color:transparent;
+}
+
+.cm-s-neo .CodeMirror-linenumber {
+  padding:0;
+  color:#e0e2e5;
+}
+
+.cm-s-neo div.CodeMirror-cursor {
+  width: auto;
+  border: 0;
+  background: rgba(155,157,162,0.37);
+  z-index: 1;
+}

From d38aab86f994fca7aececf99b6ce632e38810bdd Mon Sep 17 00:00:00 2001
From: Anders Nawroth <anders@neotechnology.com>
Date: Fri, 2 May 2014 12:12:54 +0200
Subject: [PATCH 1283/4742] [cypher mode] Add

---
 mode/cypher/cypher.js  | 172 +++++++++++++++++++++++++++++++++++++++++
 mode/cypher/index.html |  63 +++++++++++++++
 mode/index.html        |   1 +
 mode/meta.js           |   1 +
 4 files changed, 237 insertions(+)
 create mode 100644 mode/cypher/cypher.js
 create mode 100644 mode/cypher/index.html

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
new file mode 100644
index 0000000000..c55860a87e
--- /dev/null
+++ b/mode/cypher/cypher.js
@@ -0,0 +1,172 @@
+// By the Neo4j Team and contributors.
+// https://github.com/neo4j-contrib/CodeMirror
+
+(function() {
+  var wordRegexp;
+
+  wordRegexp = function(words) {
+    return new RegExp("^(?:" + words.join("|") + ")$", "i");
+  };
+
+  CodeMirror.defineMode("cypher", function(config) {
+    var curPunc, funcs, indentUnit, keywords, operatorChars, popContext, preds, pushContext, tokenBase, tokenLiteral;
+    tokenBase = function(stream/*, state*/) {
+      var ch, curPunc, type, word;
+      ch = stream.next();
+      curPunc = null;
+      if (ch === "\"" || ch === "'") {
+        stream.match(/.+?["']/);
+        return "string";
+      }
+      if (/[{}\(\),\.;\[\]]/.test(ch)) {
+        curPunc = ch;
+        return "node";
+      } else if (ch === "/" && stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      } else if (operatorChars.test(ch)) {
+        stream.eatWhile(operatorChars);
+        return null;
+      } else {
+        stream.eatWhile(/[_\w\d]/);
+        if (stream.eat(":")) {
+          stream.eatWhile(/[\w\d_\-]/);
+          return "atom";
+        }
+        word = stream.current();
+        type = void 0;
+        if (funcs.test(word)) {
+          return "builtin";
+        }
+        if (preds.test(word)) {
+          return "def";
+        } else if (keywords.test(word)) {
+          return "keyword";
+        } else {
+          return "variable";
+        }
+      }
+    };
+    tokenLiteral = function(quote) {
+      return function(stream, state) {
+        var ch, escaped;
+        escaped = false;
+        ch = void 0;
+        while ((ch = stream.next()) != null) {
+          if (ch === quote && !escaped) {
+            state.tokenize = tokenBase;
+            break;
+          }
+          escaped = !escaped && ch === "\\";
+        }
+        return "string";
+      };
+    };
+    pushContext = function(state, type, col) {
+      return state.context = {
+        prev: state.context,
+        indent: state.indent,
+        col: col,
+        type: type
+      };
+    };
+    popContext = function(state) {
+      state.indent = state.context.indent;
+      return state.context = state.context.prev;
+    };
+    indentUnit = config.indentUnit;
+    curPunc = void 0;
+    funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
+    preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]);
+    keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "false", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "using", "when", "where", "with"]);
+    operatorChars = /[*+\-<>=&|~%^]/;
+    return {
+      startState: function(/*base*/) {
+        return {
+          tokenize: tokenBase,
+          context: null,
+          indent: 0,
+          col: 0
+        };
+      },
+      token: function(stream, state) {
+        var style;
+        if (stream.sol()) {
+          if (state.context && (state.context.align == null)) {
+            state.context.align = false;
+          }
+          state.indent = stream.indentation();
+        }
+        if (stream.eatSpace()) {
+          return null;
+        }
+        style = state.tokenize(stream, state);
+        if (style !== "comment" && state.context && (state.context.align == null) && state.context.type !== "pattern") {
+          state.context.align = true;
+        }
+        if (curPunc === "(") {
+          pushContext(state, ")", stream.column());
+        } else if (curPunc === "[") {
+          pushContext(state, "]", stream.column());
+        } else if (curPunc === "{") {
+          pushContext(state, "}", stream.column());
+        } else if (/[\]\}\)]/.test(curPunc)) {
+          while (state.context && state.context.type === "pattern") {
+            popContext(state);
+          }
+          if (state.context && curPunc === state.context.type) {
+            popContext(state);
+          }
+        } else if (curPunc === "." && state.context && state.context.type === "pattern") {
+          popContext(state);
+        } else if (/atom|string|variable/.test(style) && state.context) {
+          if (/[\}\]]/.test(state.context.type)) {
+            pushContext(state, "pattern", stream.column());
+          } else if (state.context.type === "pattern" && !state.context.align) {
+            state.context.align = true;
+            state.context.col = stream.column();
+          }
+        }
+        return style;
+      },
+      indent: function(state, textAfter) {
+        var closing, context, firstChar;
+        firstChar = textAfter && textAfter.charAt(0);
+        context = state.context;
+        if (/[\]\}]/.test(firstChar)) {
+          while (context && context.type === "pattern") {
+            context = context.prev;
+          }
+        }
+        closing = context && firstChar === context.type;
+        if (!context) {
+          return 0;
+        } else if (context.type === "keywords") {
+          return CodeMirror.commands.newlineAndIndent;
+        } else if (context.align) {
+          return context.col + (closing ? 0 : 1);
+        } else {
+          return context.indent + (closing ? 0 : indentUnit);
+        }
+      }
+    };
+  });
+
+  CodeMirror.modeExtensions["cypher"] = {
+    autoFormatLineBreaks: function(text) {
+      var i, lines, reProcessedPortion;
+      lines = text.split("\n");
+      reProcessedPortion = /\s+\b(return|where|order by|match|with|skip|limit|create|delete|set)\b\s/g;
+      i = 0;
+      while (i < lines.length) {
+        lines[i] = lines[i].replace(reProcessedPortion, " \n$1 ").trim();
+        i++;
+      }
+      return lines.join("\n");
+    }
+  };
+
+  CodeMirror.defineMIME("application/x-cypher-query", "cypher");
+
+}).call(this);
+
diff --git a/mode/cypher/index.html b/mode/cypher/index.html
new file mode 100644
index 0000000000..2b765fe5aa
--- /dev/null
+++ b/mode/cypher/index.html
@@ -0,0 +1,63 @@
+<!doctype html>
+
+<title>CodeMirror: Cypher Mode for CodeMirror</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css" />
+<link rel="stylesheet" href="../../theme/neo.css" />
+<script src="../../lib/codemirror.js"></script>
+<script src="cypher.js"></script>
+<style>
+.CodeMirror {
+    border-top: 1px solid black;
+    border-bottom: 1px solid black;
+}
+        </style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Cypher Mode for CodeMirror</a>
+  </ul>
+</div>
+
+<article>
+<h2>Cypher Mode for CodeMirror</h2>
+<form>
+            <textarea id="code" name="code">// Cypher Mode for CodeMirror, using the neo theme
+MATCH (joe { name: 'Joe' })-[:knows*2..2]-(friend_of_friend)
+WHERE NOT (joe)-[:knows]-(friend_of_friend)
+RETURN friend_of_friend.name, COUNT(*)
+ORDER BY COUNT(*) DESC , friend_of_friend.name
+</textarea>
+            </form>
+            <p><strong>MIME types defined:</strong> 
+            <code><a href="?mime=application/x-cypher-query">application/x-cypher-query</a></code>
+        </p>
+<script>
+window.onload = function() {
+  var mime = 'application/x-cypher-query';
+  // get mime type
+  if (window.location.href.indexOf('mime=') > -1) {
+    mime = window.location.href.substr(window.location.href.indexOf('mime=') + 5);
+  }
+  window.editor = CodeMirror.fromTextArea(document.getElementById('code'), {
+    mode: mime,
+    indentWithTabs: true,
+    smartIndent: true,
+    lineNumbers: true,
+    matchBrackets : true,
+    autofocus: true,
+    theme: 'neo'
+  });
+};
+</script>
+
+</article>
diff --git a/mode/index.html b/mode/index.html
index 4dc5fea180..91fb92bff8 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -38,6 +38,7 @@ <h2>Language modes</h2>
       <li><a href="coffeescript/index.html">CoffeeScript</a></li>
       <li><a href="commonlisp/index.html">Common Lisp</a></li>
       <li><a href="css/index.html">CSS</a></li>
+      <li><a href="cypher/index.html">Cypher</a></li>
       <li><a href="python/index.html">Cython</a></li>
       <li><a href="d/index.html">D</a></li>
       <li><a href="django/index.html">Django</a> (templating language)</li>
diff --git a/mode/meta.js b/mode/meta.js
index b8bfebda2e..5fc51ebeec 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -20,6 +20,7 @@ CodeMirror.modeInfo = [
   {name: 'Clojure', mime: 'text/x-clojure', mode: 'clojure'},
   {name: 'CoffeeScript', mime: 'text/x-coffeescript', mode: 'coffeescript'},
   {name: 'Common Lisp', mime: 'text/x-common-lisp', mode: 'commonlisp'},
+  {name: 'Cypher', mime: 'application/x-cypher-query', mode: 'cypher'},
   {name: 'CSS', mime: 'text/css', mode: 'css'},
   {name: 'D', mime: 'text/x-d', mode: 'd'},
   {name: 'diff', mime: 'text/x-diff', mode: 'diff'},

From 3984c5a285ec5c371bf464e2f070572ab3bf0f59 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 12:15:27 +0200
Subject: [PATCH 1284/4742] [cypher mode] Fix coding style, remove unused code

Issue #2501
---
 doc/compress.html     |   1 +
 mode/cypher/cypher.js | 105 +++++++++++++++---------------------------
 2 files changed, 39 insertions(+), 67 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 2d190220c4..d6c0125544 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -95,6 +95,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/coffeescript/coffeescript.js">coffeescript.js</option>
           <option value="http://codemirror.net/mode/commonlisp/commonlisp.js">commonlisp.js</option>
           <option value="http://codemirror.net/mode/css/css.js">css.js</option>
+          <option value="http://codemirror.net/mode/cypher/cypher.js">cypher.js</option>
           <option value="http://codemirror.net/mode/d/d.js">d.js</option>
           <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
           <option value="http://codemirror.net/mode/django/django.js">django.js</option>
diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index c55860a87e..da6f3acaae 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -1,19 +1,22 @@
 // By the Neo4j Team and contributors.
 // https://github.com/neo4j-contrib/CodeMirror
 
-(function() {
-  var wordRegexp;
-
-  wordRegexp = function(words) {
+(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";
+  var wordRegexp = function(words) {
     return new RegExp("^(?:" + words.join("|") + ")$", "i");
   };
 
   CodeMirror.defineMode("cypher", function(config) {
-    var curPunc, funcs, indentUnit, keywords, operatorChars, popContext, preds, pushContext, tokenBase, tokenLiteral;
-    tokenBase = function(stream/*, state*/) {
-      var ch, curPunc, type, word;
-      ch = stream.next();
-      curPunc = null;
+    var tokenBase = function(stream/*, state*/) {
+      var ch = stream.next(), curPunc = null;
       if (ch === "\"" || ch === "'") {
         stream.match(/.+?["']/);
         return "string";
@@ -33,36 +36,14 @@
           stream.eatWhile(/[\w\d_\-]/);
           return "atom";
         }
-        word = stream.current();
-        type = void 0;
-        if (funcs.test(word)) {
-          return "builtin";
-        }
-        if (preds.test(word)) {
-          return "def";
-        } else if (keywords.test(word)) {
-          return "keyword";
-        } else {
-          return "variable";
-        }
+        var word = stream.current();
+        if (funcs.test(word)) return "builtin";
+        if (preds.test(word)) return "def";
+        if (keywords.test(word)) return "keyword";
+        return "variable";
       }
     };
-    tokenLiteral = function(quote) {
-      return function(stream, state) {
-        var ch, escaped;
-        escaped = false;
-        ch = void 0;
-        while ((ch = stream.next()) != null) {
-          if (ch === quote && !escaped) {
-            state.tokenize = tokenBase;
-            break;
-          }
-          escaped = !escaped && ch === "\\";
-        }
-        return "string";
-      };
-    };
-    pushContext = function(state, type, col) {
+    var pushContext = function(state, type, col) {
       return state.context = {
         prev: state.context,
         indent: state.indent,
@@ -70,16 +51,17 @@
         type: type
       };
     };
-    popContext = function(state) {
+    var popContext = function(state) {
       state.indent = state.context.indent;
       return state.context = state.context.prev;
     };
-    indentUnit = config.indentUnit;
-    curPunc = void 0;
-    funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
-    preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]);
-    keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "false", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "using", "when", "where", "with"]);
-    operatorChars = /[*+\-<>=&|~%^]/;
+    var indentUnit = config.indentUnit;
+    var curPunc;
+    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
+    var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "false", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "using", "when", "where", "with"]);
+    var operatorChars = /[*+\-<>=&|~%^]/;
+
     return {
       startState: function(/*base*/) {
         return {
@@ -90,7 +72,6 @@
         };
       },
       token: function(stream, state) {
-        var style;
         if (stream.sol()) {
           if (state.context && (state.context.align == null)) {
             state.context.align = false;
@@ -100,7 +81,7 @@
         if (stream.eatSpace()) {
           return null;
         }
-        style = state.tokenize(stream, state);
+        var style = state.tokenize(stream, state);
         if (style !== "comment" && state.context && (state.context.align == null) && state.context.type !== "pattern") {
           state.context.align = true;
         }
@@ -130,24 +111,18 @@
         return style;
       },
       indent: function(state, textAfter) {
-        var closing, context, firstChar;
-        firstChar = textAfter && textAfter.charAt(0);
-        context = state.context;
+        var firstChar = textAfter && textAfter.charAt(0);
+        var context = state.context;
         if (/[\]\}]/.test(firstChar)) {
           while (context && context.type === "pattern") {
             context = context.prev;
           }
         }
-        closing = context && firstChar === context.type;
-        if (!context) {
-          return 0;
-        } else if (context.type === "keywords") {
-          return CodeMirror.commands.newlineAndIndent;
-        } else if (context.align) {
-          return context.col + (closing ? 0 : 1);
-        } else {
-          return context.indent + (closing ? 0 : indentUnit);
-        }
+        var closing = context && firstChar === context.type;
+        if (!context) return 0;
+        if (context.type === "keywords") return CodeMirror.commands.newlineAndIndent;
+        if (context.align) return context.col + (closing ? 0 : 1);
+        return context.indent + (closing ? 0 : indentUnit);
       }
     };
   });
@@ -155,18 +130,14 @@
   CodeMirror.modeExtensions["cypher"] = {
     autoFormatLineBreaks: function(text) {
       var i, lines, reProcessedPortion;
-      lines = text.split("\n");
-      reProcessedPortion = /\s+\b(return|where|order by|match|with|skip|limit|create|delete|set)\b\s/g;
-      i = 0;
-      while (i < lines.length) {
+      var lines = text.split("\n");
+      var reProcessedPortion = /\s+\b(return|where|order by|match|with|skip|limit|create|delete|set)\b\s/g;
+      for (var i = 0; i < lines.length; i++)
         lines[i] = lines[i].replace(reProcessedPortion, " \n$1 ").trim();
-        i++;
-      }
       return lines.join("\n");
     }
   };
 
   CodeMirror.defineMIME("application/x-cypher-query", "cypher");
 
-}).call(this);
-
+});

From 1b9be4146adc4bc3c834c0e602669ccd40ffd72d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 13:02:30 +0200
Subject: [PATCH 1285/4742] Make the set of characters that count as word
 characters customizeable with a helper

Issue #2426
---
 lib/codemirror.js             | 24 ++++++++++++++++--------
 mode/javascript/javascript.js |  2 ++
 mode/php/php.js               |  1 +
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1d144ce9f9..7c87c604c1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2352,7 +2352,7 @@
         var pos = posFromMouse(cm, e);
         if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
         e_preventDefault(e);
-        var word = findWordAt(cm.doc, pos);
+        var word = findWordAt(cm, pos);
         extendSelection(cm.doc, word.anchor, word.head);
       }));
     else
@@ -2624,7 +2624,7 @@
       start = posFromMouse(cm, e, true, true);
       ourIndex = -1;
     } else if (type == "double") {
-      var word = findWordAt(doc, start);
+      var word = findWordAt(cm, start);
       if (cm.display.shift || doc.extend)
         ourRange = extendRange(doc, ourRange, word.anchor, word.head);
       else
@@ -2678,7 +2678,7 @@
         var anchor = oldRange.anchor, head = pos;
         if (type != "single") {
           if (type == "double")
-            var range = findWordAt(doc, pos);
+            var range = findWordAt(cm, pos);
           else
             var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
           if (cmp(range.anchor, anchor) > 0) {
@@ -3766,10 +3766,11 @@
     else if (unit == "column") moveOnce(true);
     else if (unit == "word" || unit == "group") {
       var sawType = null, group = unit == "group";
+      var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
       for (var first = true;; first = false) {
         if (dir < 0 && !moveOnce(!first)) break;
         var cur = lineObj.text.charAt(ch) || "\n";
-        var type = isWordChar(cur) ? "w"
+        var type = isWordChar(cur, helper) ? "w"
           : group && cur == "\n" ? "n"
           : !group || /\s/.test(cur) ? null
           : "p";
@@ -3809,13 +3810,15 @@
   }
 
   // Find the word at the given position (as returned by coordsChar).
-  function findWordAt(doc, pos) {
-    var line = getLine(doc, pos.line).text;
+  function findWordAt(cm, pos) {
+    var doc = cm.doc, line = getLine(doc, pos.line).text;
     var start = pos.ch, end = pos.ch;
     if (line) {
+      var helper = cm.getHelper(pos, "wordChars");
       if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
       var startChar = line.charAt(start);
-      var check = isWordChar(startChar) ? isWordChar
+      var check = isWordChar(startChar, helper)
+        ? function(ch) { return isWordChar(ch, helper); }
         : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
         : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
       while (start > 0 && check(line.charAt(start - 1))) --start;
@@ -7068,10 +7071,15 @@
   }
 
   var nonASCIISingleCaseWordChar = /[\u00df\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
-  var isWordChar = CodeMirror.isWordChar = function(ch) {
+  var isWordCharBasic = CodeMirror.isWordChar = function(ch) {
     return /\w/.test(ch) || ch > "\x80" &&
       (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
   };
+  function isWordChar(ch, helper) {
+    if (!helper) return isWordCharBasic(ch);
+    if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true;
+    return helper.test(ch);
+  }
 
   function isEmpty(obj) {
     for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false;
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index daf138ba8d..e719089349 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -645,6 +645,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   };
 });
 
+CodeMirror.registerHelper("wordChars", "javascript", /[\\w$]/);
+
 CodeMirror.defineMIME("text/javascript", "javascript");
 CodeMirror.defineMIME("text/ecmascript", "javascript");
 CodeMirror.defineMIME("application/javascript", "javascript");
diff --git a/mode/php/php.js b/mode/php/php.js
index 096500fab5..81591e4d65 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -94,6 +94,7 @@
   var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
   var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once";
   CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
+  CodeMirror.registerHelper("wordChars", "php", /[\\w$]/);
 
   var phpConfig = {
     name: "clike",

From 38cc619c0f3edc636131239392eb8b899657c1ff Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Mon, 28 Apr 2014 20:17:05 +0530
Subject: [PATCH 1286/4742] [vim] Added support for uppercase/lowercase
 conversions in visual mode

---
 keymap/vim.js    | 32 ++++++++++++++++++++++++++++++++
 test/vim_test.js | 15 ++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fcc639213e..7d62de4919 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -297,6 +297,8 @@
     { keys: ['R'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { replace: true }},
     { keys: ['u'], type: 'action', action: 'undo' },
+    { keys: ['u'], type: 'action', action: 'convertSelectedTextToLowerCase', context: 'visual' },
+    { keys: ['U'],type: 'action', action: 'convertSelectedTextToUpperCase', context: 'visual'},
     { keys: ['<C-r>'], type: 'action', action: 'redo' },
     { keys: ['m', 'character'], type: 'action', action: 'setMark' },
     { keys: ['"', 'character'], type: 'action', action: 'setRegister' },
@@ -2212,6 +2214,36 @@
           repeat = vim.lastEditInputState.repeatOverride || repeat;
         }
         repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
+      },
+      convertSelectedTextToLowerCase: function(cm, _vim) {
+        var selectionStart = cm.getCursor('anchor');
+        var selectionEnd = cm.getCursor('head');
+        if (cursorIsBefore(selectionEnd, selectionStart)) {
+          var tmp = selectionStart;
+          selectionStart = selectionEnd;
+          selectionEnd = tmp;
+        } else {
+          selectionEnd = cm.clipPos(Pos(selectionEnd.line, selectionEnd.ch+1));
+        }
+        var text = cm.getRange(selectionStart, selectionEnd);
+        cm.replaceRange(text.toLowerCase(), selectionStart, selectionEnd);
+        cm.setCursor(selectionStart);
+        exitVisualMode(cm);
+      },
+      convertSelectedTextToUpperCase: function(cm, _vim) {
+        var selectionStart = cm.getCursor('anchor');
+        var selectionEnd = cm.getCursor('head');
+        if (cursorIsBefore(selectionEnd, selectionStart)) {
+          var tmp = selectionStart;
+          selectionStart = selectionEnd;
+          selectionEnd = tmp;
+        } else {
+          selectionEnd = cm.clipPos(Pos(selectionEnd.line, selectionEnd.ch+1));
+        }
+        var text = cm.getRange(selectionStart, selectionEnd);
+        cm.replaceRange(text.toUpperCase(), selectionStart, selectionEnd);
+        cm.setCursor(selectionStart);
+        exitVisualMode(cm);
       }
     };
 
diff --git a/test/vim_test.js b/test/vim_test.js
index 909671ec7f..42dc7f9f2f 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1620,7 +1620,20 @@ testVim('o_visual', function(cm,vim,helpers) {
   helpers.doKeys('d');
   eq('p',cm.getValue());
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
-
+testVim('U_visual', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'l', 'j', 'l');
+  helpers.doKeys('U');
+  helpers.assertCursorAt(0, 0);
+  eq('AB\nCD', cm.getValue());
+}, { value: 'ab\ncd'});
+testVim('u_visual', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'l', 'j', 'l');
+  helpers.doKeys('u');
+  helpers.assertCursorAt(0, 0);
+  eq('ab\ncd', cm.getValue());
+}, { value: 'AB\nCD'});
 testVim('S_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('j', 'S');

From f7f506fe572940f63e43493f6e0dda77953596a7 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Mon, 28 Apr 2014 21:19:10 +0530
Subject: [PATCH 1287/4742] [vim] Clean up visual_U/u and add tests.

---
 keymap/vim.js    | 46 ++++++++++++++++++++++++----------------------
 test/vim_test.js | 23 ++++++++++++++---------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 7d62de4919..c78d76af94 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -297,8 +297,8 @@
     { keys: ['R'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { replace: true }},
     { keys: ['u'], type: 'action', action: 'undo' },
-    { keys: ['u'], type: 'action', action: 'convertSelectedTextToLowerCase', context: 'visual' },
-    { keys: ['U'],type: 'action', action: 'convertSelectedTextToUpperCase', context: 'visual'},
+    { keys: ['u'], type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
+    { keys: ['U'],type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
     { keys: ['<C-r>'], type: 'action', action: 'redo' },
     { keys: ['m', 'character'], type: 'action', action: 'setMark' },
     { keys: ['"', 'character'], type: 'action', action: 'setRegister' },
@@ -2215,9 +2215,11 @@
         }
         repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
       },
-      convertSelectedTextToLowerCase: function(cm, _vim) {
-        var selectionStart = cm.getCursor('anchor');
-        var selectionEnd = cm.getCursor('head');
+      changeCase: function(cm, actionArgs, vim) {
+        var selectedAreaRange = getSelectedAreaRange(cm, vim);
+        var selectionStart = selectedAreaRange[0];
+        var selectionEnd = selectedAreaRange[1];
+        var toLower = actionArgs.toLower;
         if (cursorIsBefore(selectionEnd, selectionStart)) {
           var tmp = selectionStart;
           selectionStart = selectionEnd;
@@ -2226,24 +2228,8 @@
           selectionEnd = cm.clipPos(Pos(selectionEnd.line, selectionEnd.ch+1));
         }
         var text = cm.getRange(selectionStart, selectionEnd);
-        cm.replaceRange(text.toLowerCase(), selectionStart, selectionEnd);
+        cm.replaceRange(toLower ? text.toLowerCase() : text.toUpperCase(), selectionStart, selectionEnd);
         cm.setCursor(selectionStart);
-        exitVisualMode(cm);
-      },
-      convertSelectedTextToUpperCase: function(cm, _vim) {
-        var selectionStart = cm.getCursor('anchor');
-        var selectionEnd = cm.getCursor('head');
-        if (cursorIsBefore(selectionEnd, selectionStart)) {
-          var tmp = selectionStart;
-          selectionStart = selectionEnd;
-          selectionEnd = tmp;
-        } else {
-          selectionEnd = cm.clipPos(Pos(selectionEnd.line, selectionEnd.ch+1));
-        }
-        var text = cm.getRange(selectionStart, selectionEnd);
-        cm.replaceRange(text.toUpperCase(), selectionStart, selectionEnd);
-        cm.setCursor(selectionStart);
-        exitVisualMode(cm);
       }
     };
 
@@ -2326,6 +2312,22 @@
     function escapeRegex(s) {
       return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
     }
+    function getSelectedAreaRange(cm, vim) {
+      var selectionStart = cm.getCursor('anchor');
+      var selectionEnd = cm.getCursor('head');
+      var lastSelection = vim.lastSelection;
+      if (!vim.visualMode) {
+        var line = lastSelection.curEnd.line - lastSelection.curStart.line;
+        var ch = line ? lastSelection.curEnd.ch : lastSelection.curEnd.ch - lastSelection.curStart.ch;
+        selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
+        if (lastSelection.visualLine) {
+          return [{line: selectionStart.line, ch: 0}, {line: selectionEnd.line, ch: lineLength(cm, selectionEnd.line)}];
+        }
+      } else {
+        exitVisualMode(cm);
+      }
+      return [selectionStart, selectionEnd];
+    }
 
     function exitVisualMode(cm) {
       cm.off('mousedown', exitVisualMode);
diff --git a/test/vim_test.js b/test/vim_test.js
index 42dc7f9f2f..71cd5ed941 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1620,20 +1620,25 @@ testVim('o_visual', function(cm,vim,helpers) {
   helpers.doKeys('d');
   eq('p',cm.getValue());
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
-testVim('U_visual', function(cm, vim, helpers) {
+testVim('uppercase/lowercase_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
-  helpers.doKeys('v', 'l', 'j', 'l');
+  helpers.doKeys('v', 'l', 'l');
   helpers.doKeys('U');
   helpers.assertCursorAt(0, 0);
-  eq('AB\nCD', cm.getValue());
-}, { value: 'ab\ncd'});
-testVim('u_visual', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'l', 'j', 'l');
+  helpers.doKeys('v', 'l', 'l');
   helpers.doKeys('u');
   helpers.assertCursorAt(0, 0);
-  eq('ab\ncd', cm.getValue());
-}, { value: 'AB\nCD'});
+  helpers.doKeys('l', 'l', 'l', '.');
+  helpers.assertCursorAt(0, 3);
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', 'v', 'j', 'U', 'q');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('j', '@', 'a');
+  helpers.assertCursorAt(1, 0);
+  cm.setCursor(3, 0);
+  helpers.doKeys('V', 'U', 'j', '.');
+  eq('ABCDEF\nGHIJKL\nMnopq\nSHORT LINE\nLONG LINE OF TEXT', cm.getValue());
+}, { value: 'abcdef\nghijkl\nmnopq\nshort line\nlong line of text'});
 testVim('S_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('j', 'S');

From 08054b149521fab7bb94b03b179c108c7c03a11c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 May 2014 20:50:44 +0200
Subject: [PATCH 1288/4742] [perl mode] Include $ in wordChars

Issue #2426
---
 mode/perl/perl.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 84392e4a81..0126d3ea36 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -788,6 +788,8 @@ CodeMirror.defineMode("perl",function(){
                         return (state.tokenize||tokenPerl)(stream,state);},
                 electricChars:"{}"};});
 
+CodeMirror.registerHelper("wordChars", "perl", /[\\w$]/);
+
 CodeMirror.defineMIME("text/x-perl", "perl");
 
 // it's like "peek", but need for look-ahead or look-behind if index < 0

From 44efdb494cf46cb8a0be7b94288df749b1c5e103 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 3 May 2014 20:34:39 +0200
Subject: [PATCH 1289/4742] Remove diff_match_patch file from distribution,
 link cdnjs instead

Issue #2529
---
 addon/merge/dep/diff_match_patch.js | 50 -----------------------------
 demo/merge.html                     |  2 +-
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 addon/merge/dep/diff_match_patch.js

diff --git a/addon/merge/dep/diff_match_patch.js b/addon/merge/dep/diff_match_patch.js
deleted file mode 100644
index 9d615dc9d5..0000000000
--- a/addon/merge/dep/diff_match_patch.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// From https://code.google.com/p/google-diff-match-patch/ , licensed under the Apache License 2.0
-(function(){function diff_match_patch(){this.Diff_Timeout=1;this.Diff_EditCost=4;this.Match_Threshold=0.5;this.Match_Distance=1E3;this.Patch_DeleteThreshold=0.5;this.Patch_Margin=4;this.Match_MaxBits=32}
-diff_match_patch.prototype.diff_main=function(a,b,c,d){"undefined"==typeof d&&(d=0>=this.Diff_Timeout?Number.MAX_VALUE:(new Date).getTime()+1E3*this.Diff_Timeout);if(null==a||null==b)throw Error("Null input. (diff_main)");if(a==b)return a?[[0,a]]:[];"undefined"==typeof c&&(c=!0);var e=c,f=this.diff_commonPrefix(a,b);c=a.substring(0,f);a=a.substring(f);b=b.substring(f);var f=this.diff_commonSuffix(a,b),g=a.substring(a.length-f);a=a.substring(0,a.length-f);b=b.substring(0,b.length-f);a=this.diff_compute_(a,
-b,e,d);c&&a.unshift([0,c]);g&&a.push([0,g]);this.diff_cleanupMerge(a);return a};
-diff_match_patch.prototype.diff_compute_=function(a,b,c,d){if(!a)return[[1,b]];if(!b)return[[-1,a]];var e=a.length>b.length?a:b,f=a.length>b.length?b:a,g=e.indexOf(f);return-1!=g?(c=[[1,e.substring(0,g)],[0,f],[1,e.substring(g+f.length)]],a.length>b.length&&(c[0][0]=c[2][0]=-1),c):1==f.length?[[-1,a],[1,b]]:(e=this.diff_halfMatch_(a,b))?(f=e[0],a=e[1],g=e[2],b=e[3],e=e[4],f=this.diff_main(f,g,c,d),c=this.diff_main(a,b,c,d),f.concat([[0,e]],c)):c&&100<a.length&&100<b.length?this.diff_lineMode_(a,b,
-d):this.diff_bisect_(a,b,d)};
-diff_match_patch.prototype.diff_lineMode_=function(a,b,c){var d=this.diff_linesToChars_(a,b);a=d.chars1;b=d.chars2;d=d.lineArray;a=this.diff_main(a,b,!1,c);this.diff_charsToLines_(a,d);this.diff_cleanupSemantic(a);a.push([0,""]);for(var e=d=b=0,f="",g="";b<a.length;){switch(a[b][0]){case 1:e++;g+=a[b][1];break;case -1:d++;f+=a[b][1];break;case 0:if(1<=d&&1<=e){a.splice(b-d-e,d+e);b=b-d-e;d=this.diff_main(f,g,!1,c);for(e=d.length-1;0<=e;e--)a.splice(b,0,d[e]);b+=d.length}d=e=0;g=f=""}b++}a.pop();return a};
-diff_match_patch.prototype.diff_bisect_=function(a,b,c){for(var d=a.length,e=b.length,f=Math.ceil((d+e)/2),g=f,h=2*f,j=Array(h),i=Array(h),k=0;k<h;k++)j[k]=-1,i[k]=-1;j[g+1]=0;i[g+1]=0;for(var k=d-e,q=0!=k%2,r=0,t=0,p=0,w=0,v=0;v<f&&!((new Date).getTime()>c);v++){for(var n=-v+r;n<=v-t;n+=2){var l=g+n,m;m=n==-v||n!=v&&j[l-1]<j[l+1]?j[l+1]:j[l-1]+1;for(var s=m-n;m<d&&s<e&&a.charAt(m)==b.charAt(s);)m++,s++;j[l]=m;if(m>d)t+=2;else if(s>e)r+=2;else if(q&&(l=g+k-n,0<=l&&l<h&&-1!=i[l])){var u=d-i[l];if(m>=
-u)return this.diff_bisectSplit_(a,b,m,s,c)}}for(n=-v+p;n<=v-w;n+=2){l=g+n;u=n==-v||n!=v&&i[l-1]<i[l+1]?i[l+1]:i[l-1]+1;for(m=u-n;u<d&&m<e&&a.charAt(d-u-1)==b.charAt(e-m-1);)u++,m++;i[l]=u;if(u>d)w+=2;else if(m>e)p+=2;else if(!q&&(l=g+k-n,0<=l&&(l<h&&-1!=j[l])&&(m=j[l],s=g+m-l,u=d-u,m>=u)))return this.diff_bisectSplit_(a,b,m,s,c)}}return[[-1,a],[1,b]]};
-diff_match_patch.prototype.diff_bisectSplit_=function(a,b,c,d,e){var f=a.substring(0,c),g=b.substring(0,d);a=a.substring(c);b=b.substring(d);f=this.diff_main(f,g,!1,e);e=this.diff_main(a,b,!1,e);return f.concat(e)};
-diff_match_patch.prototype.diff_linesToChars_=function(a,b){function c(a){for(var b="",c=0,f=-1,g=d.length;f<a.length-1;){f=a.indexOf("\n",c);-1==f&&(f=a.length-1);var r=a.substring(c,f+1),c=f+1;(e.hasOwnProperty?e.hasOwnProperty(r):void 0!==e[r])?b+=String.fromCharCode(e[r]):(b+=String.fromCharCode(g),e[r]=g,d[g++]=r)}return b}var d=[],e={};d[0]="";var f=c(a),g=c(b);return{chars1:f,chars2:g,lineArray:d}};
-diff_match_patch.prototype.diff_charsToLines_=function(a,b){for(var c=0;c<a.length;c++){for(var d=a[c][1],e=[],f=0;f<d.length;f++)e[f]=b[d.charCodeAt(f)];a[c][1]=e.join("")}};diff_match_patch.prototype.diff_commonPrefix=function(a,b){if(!a||!b||a.charAt(0)!=b.charAt(0))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(f,e)==b.substring(f,e)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
-diff_match_patch.prototype.diff_commonSuffix=function(a,b){if(!a||!b||a.charAt(a.length-1)!=b.charAt(b.length-1))return 0;for(var c=0,d=Math.min(a.length,b.length),e=d,f=0;c<e;)a.substring(a.length-e,a.length-f)==b.substring(b.length-e,b.length-f)?f=c=e:d=e,e=Math.floor((d-c)/2+c);return e};
-diff_match_patch.prototype.diff_commonOverlap_=function(a,b){var c=a.length,d=b.length;if(0==c||0==d)return 0;c>d?a=a.substring(c-d):c<d&&(b=b.substring(0,c));c=Math.min(c,d);if(a==b)return c;for(var d=0,e=1;;){var f=a.substring(c-e),f=b.indexOf(f);if(-1==f)return d;e+=f;if(0==f||a.substring(c-e)==b.substring(0,e))d=e,e++}};
-diff_match_patch.prototype.diff_halfMatch_=function(a,b){function c(a,b,c){for(var d=a.substring(c,c+Math.floor(a.length/4)),e=-1,g="",h,j,n,l;-1!=(e=b.indexOf(d,e+1));){var m=f.diff_commonPrefix(a.substring(c),b.substring(e)),s=f.diff_commonSuffix(a.substring(0,c),b.substring(0,e));g.length<s+m&&(g=b.substring(e-s,e)+b.substring(e,e+m),h=a.substring(0,c-s),j=a.substring(c+m),n=b.substring(0,e-s),l=b.substring(e+m))}return 2*g.length>=a.length?[h,j,n,l,g]:null}if(0>=this.Diff_Timeout)return null;
-var d=a.length>b.length?a:b,e=a.length>b.length?b:a;if(4>d.length||2*e.length<d.length)return null;var f=this,g=c(d,e,Math.ceil(d.length/4)),d=c(d,e,Math.ceil(d.length/2)),h;if(!g&&!d)return null;h=d?g?g[4].length>d[4].length?g:d:d:g;var j;a.length>b.length?(g=h[0],d=h[1],e=h[2],j=h[3]):(e=h[0],j=h[1],g=h[2],d=h[3]);h=h[4];return[g,d,e,j,h]};
-diff_match_patch.prototype.diff_cleanupSemantic=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=0,h=0,j=0,i=0;f<a.length;)0==a[f][0]?(c[d++]=f,g=j,h=i,i=j=0,e=a[f][1]):(1==a[f][0]?j+=a[f][1].length:i+=a[f][1].length,e&&(e.length<=Math.max(g,h)&&e.length<=Math.max(j,i))&&(a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,d--,f=0<d?c[d-1]:-1,i=j=h=g=0,e=null,b=!0)),f++;b&&this.diff_cleanupMerge(a);this.diff_cleanupSemanticLossless(a);for(f=1;f<a.length;){if(-1==a[f-1][0]&&1==a[f][0]){b=a[f-1][1];c=a[f][1];
-d=this.diff_commonOverlap_(b,c);e=this.diff_commonOverlap_(c,b);if(d>=e){if(d>=b.length/2||d>=c.length/2)a.splice(f,0,[0,c.substring(0,d)]),a[f-1][1]=b.substring(0,b.length-d),a[f+1][1]=c.substring(d),f++}else if(e>=b.length/2||e>=c.length/2)a.splice(f,0,[0,b.substring(0,e)]),a[f-1][0]=1,a[f-1][1]=c.substring(0,c.length-e),a[f+1][0]=-1,a[f+1][1]=b.substring(e),f++;f++}f++}};
-diff_match_patch.prototype.diff_cleanupSemanticLossless=function(a){function b(a,b){if(!a||!b)return 6;var c=a.charAt(a.length-1),d=b.charAt(0),e=c.match(diff_match_patch.nonAlphaNumericRegex_),f=d.match(diff_match_patch.nonAlphaNumericRegex_),g=e&&c.match(diff_match_patch.whitespaceRegex_),h=f&&d.match(diff_match_patch.whitespaceRegex_),c=g&&c.match(diff_match_patch.linebreakRegex_),d=h&&d.match(diff_match_patch.linebreakRegex_),i=c&&a.match(diff_match_patch.blanklineEndRegex_),j=d&&b.match(diff_match_patch.blanklineStartRegex_);
-return i||j?5:c||d?4:e&&!g&&h?3:g||h?2:e||f?1:0}for(var c=1;c<a.length-1;){if(0==a[c-1][0]&&0==a[c+1][0]){var d=a[c-1][1],e=a[c][1],f=a[c+1][1],g=this.diff_commonSuffix(d,e);if(g)var h=e.substring(e.length-g),d=d.substring(0,d.length-g),e=h+e.substring(0,e.length-g),f=h+f;for(var g=d,h=e,j=f,i=b(d,e)+b(e,f);e.charAt(0)===f.charAt(0);){var d=d+e.charAt(0),e=e.substring(1)+f.charAt(0),f=f.substring(1),k=b(d,e)+b(e,f);k>=i&&(i=k,g=d,h=e,j=f)}a[c-1][1]!=g&&(g?a[c-1][1]=g:(a.splice(c-1,1),c--),a[c][1]=
-h,j?a[c+1][1]=j:(a.splice(c+1,1),c--))}c++}};diff_match_patch.nonAlphaNumericRegex_=/[^a-zA-Z0-9]/;diff_match_patch.whitespaceRegex_=/\s/;diff_match_patch.linebreakRegex_=/[\r\n]/;diff_match_patch.blanklineEndRegex_=/\n\r?\n$/;diff_match_patch.blanklineStartRegex_=/^\r?\n\r?\n/;
-diff_match_patch.prototype.diff_cleanupEfficiency=function(a){for(var b=!1,c=[],d=0,e=null,f=0,g=!1,h=!1,j=!1,i=!1;f<a.length;){if(0==a[f][0])a[f][1].length<this.Diff_EditCost&&(j||i)?(c[d++]=f,g=j,h=i,e=a[f][1]):(d=0,e=null),j=i=!1;else if(-1==a[f][0]?i=!0:j=!0,e&&(g&&h&&j&&i||e.length<this.Diff_EditCost/2&&3==g+h+j+i))a.splice(c[d-1],0,[-1,e]),a[c[d-1]+1][0]=1,d--,e=null,g&&h?(j=i=!0,d=0):(d--,f=0<d?c[d-1]:-1,j=i=!1),b=!0;f++}b&&this.diff_cleanupMerge(a)};
-diff_match_patch.prototype.diff_cleanupMerge=function(a){a.push([0,""]);for(var b=0,c=0,d=0,e="",f="",g;b<a.length;)switch(a[b][0]){case 1:d++;f+=a[b][1];b++;break;case -1:c++;e+=a[b][1];b++;break;case 0:1<c+d?(0!==c&&0!==d&&(g=this.diff_commonPrefix(f,e),0!==g&&(0<b-c-d&&0==a[b-c-d-1][0]?a[b-c-d-1][1]+=f.substring(0,g):(a.splice(0,0,[0,f.substring(0,g)]),b++),f=f.substring(g),e=e.substring(g)),g=this.diff_commonSuffix(f,e),0!==g&&(a[b][1]=f.substring(f.length-g)+a[b][1],f=f.substring(0,f.length-
-g),e=e.substring(0,e.length-g))),0===c?a.splice(b-d,c+d,[1,f]):0===d?a.splice(b-c,c+d,[-1,e]):a.splice(b-c-d,c+d,[-1,e],[1,f]),b=b-c-d+(c?1:0)+(d?1:0)+1):0!==b&&0==a[b-1][0]?(a[b-1][1]+=a[b][1],a.splice(b,1)):b++,c=d=0,f=e=""}""===a[a.length-1][1]&&a.pop();c=!1;for(b=1;b<a.length-1;)0==a[b-1][0]&&0==a[b+1][0]&&(a[b][1].substring(a[b][1].length-a[b-1][1].length)==a[b-1][1]?(a[b][1]=a[b-1][1]+a[b][1].substring(0,a[b][1].length-a[b-1][1].length),a[b+1][1]=a[b-1][1]+a[b+1][1],a.splice(b-1,1),c=!0):a[b][1].substring(0,
-a[b+1][1].length)==a[b+1][1]&&(a[b-1][1]+=a[b+1][1],a[b][1]=a[b][1].substring(a[b+1][1].length)+a[b+1][1],a.splice(b+1,1),c=!0)),b++;c&&this.diff_cleanupMerge(a)};diff_match_patch.prototype.diff_xIndex=function(a,b){var c=0,d=0,e=0,f=0,g;for(g=0;g<a.length;g++){1!==a[g][0]&&(c+=a[g][1].length);-1!==a[g][0]&&(d+=a[g][1].length);if(c>b)break;e=c;f=d}return a.length!=g&&-1===a[g][0]?f:f+(b-e)};
-diff_match_patch.prototype.diff_prettyHtml=function(a){for(var b=[],c=/&/g,d=/</g,e=/>/g,f=/\n/g,g=0;g<a.length;g++){var h=a[g][0],j=a[g][1],j=j.replace(c,"&amp;").replace(d,"&lt;").replace(e,"&gt;").replace(f,"&para;<br>");switch(h){case 1:b[g]='<ins style="background:#e6ffe6;">'+j+"</ins>";break;case -1:b[g]='<del style="background:#ffe6e6;">'+j+"</del>";break;case 0:b[g]="<span>"+j+"</span>"}}return b.join("")};
-diff_match_patch.prototype.diff_text1=function(a){for(var b=[],c=0;c<a.length;c++)1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_text2=function(a){for(var b=[],c=0;c<a.length;c++)-1!==a[c][0]&&(b[c]=a[c][1]);return b.join("")};diff_match_patch.prototype.diff_levenshtein=function(a){for(var b=0,c=0,d=0,e=0;e<a.length;e++){var f=a[e][0],g=a[e][1];switch(f){case 1:c+=g.length;break;case -1:d+=g.length;break;case 0:b+=Math.max(c,d),d=c=0}}return b+=Math.max(c,d)};
-diff_match_patch.prototype.diff_toDelta=function(a){for(var b=[],c=0;c<a.length;c++)switch(a[c][0]){case 1:b[c]="+"+encodeURI(a[c][1]);break;case -1:b[c]="-"+a[c][1].length;break;case 0:b[c]="="+a[c][1].length}return b.join("\t").replace(/%20/g," ")};
-diff_match_patch.prototype.diff_fromDelta=function(a,b){for(var c=[],d=0,e=0,f=b.split(/\t/g),g=0;g<f.length;g++){var h=f[g].substring(1);switch(f[g].charAt(0)){case "+":try{c[d++]=[1,decodeURI(h)]}catch(j){throw Error("Illegal escape in diff_fromDelta: "+h);}break;case "-":case "=":var i=parseInt(h,10);if(isNaN(i)||0>i)throw Error("Invalid number in diff_fromDelta: "+h);h=a.substring(e,e+=i);"="==f[g].charAt(0)?c[d++]=[0,h]:c[d++]=[-1,h];break;default:if(f[g])throw Error("Invalid diff operation in diff_fromDelta: "+
-f[g]);}}if(e!=a.length)throw Error("Delta length ("+e+") does not equal source text length ("+a.length+").");return c};diff_match_patch.prototype.match_main=function(a,b,c){if(null==a||null==b||null==c)throw Error("Null input. (match_main)");c=Math.max(0,Math.min(c,a.length));return a==b?0:a.length?a.substring(c,c+b.length)==b?c:this.match_bitap_(a,b,c):-1};
-diff_match_patch.prototype.match_bitap_=function(a,b,c){function d(a,d){var e=a/b.length,g=Math.abs(c-d);return!f.Match_Distance?g?1:e:e+g/f.Match_Distance}if(b.length>this.Match_MaxBits)throw Error("Pattern too long for this browser.");var e=this.match_alphabet_(b),f=this,g=this.Match_Threshold,h=a.indexOf(b,c);-1!=h&&(g=Math.min(d(0,h),g),h=a.lastIndexOf(b,c+b.length),-1!=h&&(g=Math.min(d(0,h),g)));for(var j=1<<b.length-1,h=-1,i,k,q=b.length+a.length,r,t=0;t<b.length;t++){i=0;for(k=q;i<k;)d(t,c+
-k)<=g?i=k:q=k,k=Math.floor((q-i)/2+i);q=k;i=Math.max(1,c-k+1);var p=Math.min(c+k,a.length)+b.length;k=Array(p+2);for(k[p+1]=(1<<t)-1;p>=i;p--){var w=e[a.charAt(p-1)];k[p]=0===t?(k[p+1]<<1|1)&w:(k[p+1]<<1|1)&w|((r[p+1]|r[p])<<1|1)|r[p+1];if(k[p]&j&&(w=d(t,p-1),w<=g))if(g=w,h=p-1,h>c)i=Math.max(1,2*c-h);else break}if(d(t+1,c)>g)break;r=k}return h};
-diff_match_patch.prototype.match_alphabet_=function(a){for(var b={},c=0;c<a.length;c++)b[a.charAt(c)]=0;for(c=0;c<a.length;c++)b[a.charAt(c)]|=1<<a.length-c-1;return b};
-diff_match_patch.prototype.patch_addContext_=function(a,b){if(0!=b.length){for(var c=b.substring(a.start2,a.start2+a.length1),d=0;b.indexOf(c)!=b.lastIndexOf(c)&&c.length<this.Match_MaxBits-this.Patch_Margin-this.Patch_Margin;)d+=this.Patch_Margin,c=b.substring(a.start2-d,a.start2+a.length1+d);d+=this.Patch_Margin;(c=b.substring(a.start2-d,a.start2))&&a.diffs.unshift([0,c]);(d=b.substring(a.start2+a.length1,a.start2+a.length1+d))&&a.diffs.push([0,d]);a.start1-=c.length;a.start2-=c.length;a.length1+=
-c.length+d.length;a.length2+=c.length+d.length}};
-diff_match_patch.prototype.patch_make=function(a,b,c){var d;if("string"==typeof a&&"string"==typeof b&&"undefined"==typeof c)d=a,b=this.diff_main(d,b,!0),2<b.length&&(this.diff_cleanupSemantic(b),this.diff_cleanupEfficiency(b));else if(a&&"object"==typeof a&&"undefined"==typeof b&&"undefined"==typeof c)b=a,d=this.diff_text1(b);else if("string"==typeof a&&b&&"object"==typeof b&&"undefined"==typeof c)d=a;else if("string"==typeof a&&"string"==typeof b&&c&&"object"==typeof c)d=a,b=c;else throw Error("Unknown call format to patch_make.");
-if(0===b.length)return[];c=[];a=new diff_match_patch.patch_obj;for(var e=0,f=0,g=0,h=d,j=0;j<b.length;j++){var i=b[j][0],k=b[j][1];!e&&0!==i&&(a.start1=f,a.start2=g);switch(i){case 1:a.diffs[e++]=b[j];a.length2+=k.length;d=d.substring(0,g)+k+d.substring(g);break;case -1:a.length1+=k.length;a.diffs[e++]=b[j];d=d.substring(0,g)+d.substring(g+k.length);break;case 0:k.length<=2*this.Patch_Margin&&e&&b.length!=j+1?(a.diffs[e++]=b[j],a.length1+=k.length,a.length2+=k.length):k.length>=2*this.Patch_Margin&&
-e&&(this.patch_addContext_(a,h),c.push(a),a=new diff_match_patch.patch_obj,e=0,h=d,f=g)}1!==i&&(f+=k.length);-1!==i&&(g+=k.length)}e&&(this.patch_addContext_(a,h),c.push(a));return c};diff_match_patch.prototype.patch_deepCopy=function(a){for(var b=[],c=0;c<a.length;c++){var d=a[c],e=new diff_match_patch.patch_obj;e.diffs=[];for(var f=0;f<d.diffs.length;f++)e.diffs[f]=d.diffs[f].slice();e.start1=d.start1;e.start2=d.start2;e.length1=d.length1;e.length2=d.length2;b[c]=e}return b};
-diff_match_patch.prototype.patch_apply=function(a,b){if(0==a.length)return[b,[]];a=this.patch_deepCopy(a);var c=this.patch_addPadding(a);b=c+b+c;this.patch_splitMax(a);for(var d=0,e=[],f=0;f<a.length;f++){var g=a[f].start2+d,h=this.diff_text1(a[f].diffs),j,i=-1;if(h.length>this.Match_MaxBits){if(j=this.match_main(b,h.substring(0,this.Match_MaxBits),g),-1!=j&&(i=this.match_main(b,h.substring(h.length-this.Match_MaxBits),g+h.length-this.Match_MaxBits),-1==i||j>=i))j=-1}else j=this.match_main(b,h,g);
-if(-1==j)e[f]=!1,d-=a[f].length2-a[f].length1;else if(e[f]=!0,d=j-g,g=-1==i?b.substring(j,j+h.length):b.substring(j,i+this.Match_MaxBits),h==g)b=b.substring(0,j)+this.diff_text2(a[f].diffs)+b.substring(j+h.length);else if(g=this.diff_main(h,g,!1),h.length>this.Match_MaxBits&&this.diff_levenshtein(g)/h.length>this.Patch_DeleteThreshold)e[f]=!1;else{this.diff_cleanupSemanticLossless(g);for(var h=0,k,i=0;i<a[f].diffs.length;i++){var q=a[f].diffs[i];0!==q[0]&&(k=this.diff_xIndex(g,h));1===q[0]?b=b.substring(0,
-j+k)+q[1]+b.substring(j+k):-1===q[0]&&(b=b.substring(0,j+k)+b.substring(j+this.diff_xIndex(g,h+q[1].length)));-1!==q[0]&&(h+=q[1].length)}}}b=b.substring(c.length,b.length-c.length);return[b,e]};
-diff_match_patch.prototype.patch_addPadding=function(a){for(var b=this.Patch_Margin,c="",d=1;d<=b;d++)c+=String.fromCharCode(d);for(d=0;d<a.length;d++)a[d].start1+=b,a[d].start2+=b;var d=a[0],e=d.diffs;if(0==e.length||0!=e[0][0])e.unshift([0,c]),d.start1-=b,d.start2-=b,d.length1+=b,d.length2+=b;else if(b>e[0][1].length){var f=b-e[0][1].length;e[0][1]=c.substring(e[0][1].length)+e[0][1];d.start1-=f;d.start2-=f;d.length1+=f;d.length2+=f}d=a[a.length-1];e=d.diffs;0==e.length||0!=e[e.length-1][0]?(e.push([0,
-c]),d.length1+=b,d.length2+=b):b>e[e.length-1][1].length&&(f=b-e[e.length-1][1].length,e[e.length-1][1]+=c.substring(0,f),d.length1+=f,d.length2+=f);return c};
-diff_match_patch.prototype.patch_splitMax=function(a){for(var b=this.Match_MaxBits,c=0;c<a.length;c++)if(!(a[c].length1<=b)){var d=a[c];a.splice(c--,1);for(var e=d.start1,f=d.start2,g="";0!==d.diffs.length;){var h=new diff_match_patch.patch_obj,j=!0;h.start1=e-g.length;h.start2=f-g.length;""!==g&&(h.length1=h.length2=g.length,h.diffs.push([0,g]));for(;0!==d.diffs.length&&h.length1<b-this.Patch_Margin;){var g=d.diffs[0][0],i=d.diffs[0][1];1===g?(h.length2+=i.length,f+=i.length,h.diffs.push(d.diffs.shift()),
-j=!1):-1===g&&1==h.diffs.length&&0==h.diffs[0][0]&&i.length>2*b?(h.length1+=i.length,e+=i.length,j=!1,h.diffs.push([g,i]),d.diffs.shift()):(i=i.substring(0,b-h.length1-this.Patch_Margin),h.length1+=i.length,e+=i.length,0===g?(h.length2+=i.length,f+=i.length):j=!1,h.diffs.push([g,i]),i==d.diffs[0][1]?d.diffs.shift():d.diffs[0][1]=d.diffs[0][1].substring(i.length))}g=this.diff_text2(h.diffs);g=g.substring(g.length-this.Patch_Margin);i=this.diff_text1(d.diffs).substring(0,this.Patch_Margin);""!==i&&
-(h.length1+=i.length,h.length2+=i.length,0!==h.diffs.length&&0===h.diffs[h.diffs.length-1][0]?h.diffs[h.diffs.length-1][1]+=i:h.diffs.push([0,i]));j||a.splice(++c,0,h)}}};diff_match_patch.prototype.patch_toText=function(a){for(var b=[],c=0;c<a.length;c++)b[c]=a[c];return b.join("")};
-diff_match_patch.prototype.patch_fromText=function(a){var b=[];if(!a)return b;a=a.split("\n");for(var c=0,d=/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;c<a.length;){var e=a[c].match(d);if(!e)throw Error("Invalid patch string: "+a[c]);var f=new diff_match_patch.patch_obj;b.push(f);f.start1=parseInt(e[1],10);""===e[2]?(f.start1--,f.length1=1):"0"==e[2]?f.length1=0:(f.start1--,f.length1=parseInt(e[2],10));f.start2=parseInt(e[3],10);""===e[4]?(f.start2--,f.length2=1):"0"==e[4]?f.length2=0:(f.start2--,f.length2=
-parseInt(e[4],10));for(c++;c<a.length;){e=a[c].charAt(0);try{var g=decodeURI(a[c].substring(1))}catch(h){throw Error("Illegal escape in patch_fromText: "+g);}if("-"==e)f.diffs.push([-1,g]);else if("+"==e)f.diffs.push([1,g]);else if(" "==e)f.diffs.push([0,g]);else if("@"==e)break;else if(""!==e)throw Error('Invalid patch mode "'+e+'" in: '+g);c++}}return b};diff_match_patch.patch_obj=function(){this.diffs=[];this.start2=this.start1=null;this.length2=this.length1=0};
-diff_match_patch.patch_obj.prototype.toString=function(){var a,b;a=0===this.length1?this.start1+",0":1==this.length1?this.start1+1:this.start1+1+","+this.length1;b=0===this.length2?this.start2+",0":1==this.length2?this.start2+1:this.start2+1+","+this.length2;a=["@@ -"+a+" +"+b+" @@\n"];var c;for(b=0;b<this.diffs.length;b++){switch(this.diffs[b][0]){case 1:c="+";break;case -1:c="-";break;case 0:c=" "}a[b+1]=c+encodeURI(this.diffs[b][1])+"\n"}return a.join("").replace(/%20/g," ")};
-this.diff_match_patch=diff_match_patch;this.DIFF_DELETE=-1;this.DIFF_INSERT=1;this.DIFF_EQUAL=0;})();
diff --git a/demo/merge.html b/demo/merge.html
index d9b7e6b085..e592ab3627 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -8,7 +8,7 @@
 <link rel=stylesheet href="../addon/merge/merge.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<script src="../addon/merge/dep/diff_match_patch.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"></script>
 <script src="../addon/merge/merge.js"></script>
 <style>
     .CodeMirror { line-height: 1.2; }

From 45b0c7dcee74916c32e772ee73f4fa26d72b07e7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 May 2014 09:47:43 +0200
Subject: [PATCH 1290/4742] [rulers addon] Support color, width, and lineStyle
 options

---
 addon/display/rulers.js | 19 +++++++++++++------
 demo/rulers.html        |  9 ++-------
 doc/manual.html         | 13 +++++++------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index a5386aa510..42cc2b9a90 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -34,15 +34,22 @@
     var minH = cm.display.scroller.offsetHeight + 30;
     for (var i = 0; i < val.length; i++) {
       var elt = document.createElement("div");
-      var col, cls = null;
-      if (typeof val[i] == "number") {
-        col = val[i];
+      elt.className = "CodeMirror-ruler";
+      var col, cls = null, conf = val[i];
+      if (typeof conf == "number") {
+        col = conf;
       } else {
-        col = val[i].column;
+        col = conf.column;
+        if (conf.className) elt.className = " " + conf.className;
+        if (conf.color) elt.style.borderColor = conf.color;
+        if (conf.lineStyle) elt.style.borderLeftStyle = conf.lineStyle;
+        if (conf.width) elt.style.borderLeftWidth = conf.width;
         cls = val[i].className;
       }
-      elt.className = "CodeMirror-ruler" + (cls ? " " + cls : "");
-      elt.style.cssText = "left: " + (left + col * cw) + "px; top: -50px; bottom: -20px; min-height: " + minH + "px";
+      elt.style.left = (left + col * cw) + "px";
+      elt.style.top = "-50px";
+      elt.style.bottom = "-20px";
+      elt.style.minHeight = minH + "px";
       cm.display.lineSpace.insertBefore(elt, cm.display.cursorDiv);
     }
   }
diff --git a/demo/rulers.html b/demo/rulers.html
index d75fd080e9..0f8397af20 100644
--- a/demo/rulers.html
+++ b/demo/rulers.html
@@ -9,12 +9,6 @@
 <script src="../addon/display/rulers.js"></script>
 <style type="text/css">
   .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
-  .ruler1 { border-left: 1px solid #fcc; }
-  .ruler2 { border-left: 1px solid #f5f577; }
-  .ruler3 { border-left: 1px solid #cfc; }
-  .ruler4 { border-left: 1px solid #aff; }
-  .ruler5 { border-left: 1px solid #ccf; }
-  .ruler6 { border-left: 1px solid #fcf; }
 </style>
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
@@ -34,9 +28,10 @@ <h2>Ruler Demo</h2>
 
 <script type="text/javascript">
   var nums = "0123456789", space = "          ";
+  var colors = ["#fcc", "#f5f577", "#cfc", "#aff", "#ccf", "#fcf"];
   var rulers = [], value = "";
   for (var i = 1; i <= 6; i++) {
-    rulers.push({className: "ruler" + i, column: i * 10});
+    rulers.push({color: colors[i], column: i * 10, lineStyle: "dashed"});
     for (var j = 1; j < i; j++) value += space;
     value += nums + "\n";
   }
diff --git a/doc/manual.html b/doc/manual.html
index 910d521ce6..2a48976390 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2555,12 +2555,13 @@ <h2>Addons</h2>
       <dt id="addon_rulers"><a href="../addon/display/rulers.js"><code>display/rulers.js</code></a></dt>
       <dd>Adds a <code>rulers</code> option, which can be used to show
       one or more vertical rulers in the editor. The option, if
-      defined, should be given an array of <code>{column,
-      className}</code> objects or numbers. The ruler will be
-      displayed at the column indicated by the number or
-      the <code>column</code> property. The <code>className</code>
-      property can be used to assign a custom style to a
-      ruler. <a href="../demo/rulers.html">Demo here</a>.</dd>
+      defined, should be given an array of <code>{column [, className,
+      color, lineStyle, width]}</code> objects or numbers (wich
+      indicate a column). The ruler will be displayed at the column
+      indicated by the number or the <code>column</code> property.
+      The <code>className</code> property can be used to assign a
+      custom style to a ruler. <a href="../demo/rulers.html">Demo
+      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 dd1e07fababc3e564d3ae1b6ba9e8945c212c5c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 May 2014 10:00:33 +0200
Subject: [PATCH 1291/4742] [foldcode addon] Support foldOptions option for
 per-editor defaults

---
 addon/fold/foldcode.js | 36 +++++++++++++++++++++++++++++-------
 demo/folding.html      |  2 +-
 doc/manual.html        |  2 ++
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 9c0969e6e5..81094e2543 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -9,10 +9,14 @@
   "use strict";
 
   function doFold(cm, pos, options, force) {
-    var finder = options && (options.call ? options : options.rangeFinder);
-    if (!finder) finder = CodeMirror.fold.auto;
+    if (options && options.call) {
+      var finder = options;
+      options = null;
+    } else {
+      var finder = getOption(cm, options, "rangeFinder");
+    }
     if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
-    var minSize = options && options.minFoldSize || 0;
+    var minSize = getOption(cm, options, "minFoldSize");
 
     function getRange(allowFolded) {
       var range = finder(cm, pos);
@@ -29,13 +33,13 @@
     }
 
     var range = getRange(true);
-    if (options && options.scanUp) while (!range && pos.line > cm.firstLine()) {
+    if (getOption(cm, options, "scanUp")) while (!range && pos.line > cm.firstLine()) {
       pos = CodeMirror.Pos(pos.line - 1, 0);
       range = getRange(false);
     }
     if (!range || range.cleared || force === "unfold") return;
 
-    var myWidget = makeWidget(options);
+    var myWidget = makeWidget(cm, options);
     CodeMirror.on(myWidget, "mousedown", function(e) {
       myRange.clear();
       CodeMirror.e_preventDefault(e);
@@ -51,8 +55,8 @@
     CodeMirror.signal(cm, "fold", cm, range.from, range.to);
   }
 
-  function makeWidget(options) {
-    var widget = (options && options.widget) || "\u2194";
+  function makeWidget(cm, options) {
+    var widget = getOption(cm, options, "widget");
     if (typeof widget == "string") {
       var text = document.createTextNode(widget);
       widget = document.createElement("span");
@@ -117,4 +121,22 @@
       if (cur) return cur;
     }
   });
+
+  var defaultOptions = {
+    rangeFinder: CodeMirror.fold.auto,
+    widget: "\u2194",
+    minFoldSize: 0,
+    scanUp: false
+  };
+
+  CodeMirror.defineOption("foldOptions", null);
+
+  function getOption(cm, options, name) {
+    if (options && options[name] !== undefined)
+      return options[name];
+    var editorOptions = cm.options.foldOptions;
+    if (editorOptions && editorOptions[name] !== undefined)
+      return editorOptions[name];
+    return defaultOptions[name];
+  }
 });
diff --git a/demo/folding.html b/demo/folding.html
index 84ef510f7c..8126c5c705 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -68,7 +68,7 @@ <h2>Code Folding Demo</h2>
     foldGutter: true,
     gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   });
-  editor.foldCode(CodeMirror.Pos(11, 0));
+  editor.foldCode(CodeMirror.Pos(13, 0));
 
   window.editor_html = CodeMirror.fromTextArea(te_html, {
     mode: "text/html",
diff --git a/doc/manual.html b/doc/manual.html
index 2a48976390..c26b2a205a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2254,6 +2254,8 @@ <h2>Addons</h2>
         given, <a href="#helper_fold_auto"><code>CodeMirror.fold.auto</code></a>
         will be used as default.</dd>
       </dl>
+      The <code>foldOptions</code> editor option can be set to an
+      object to provide an editor-wide default configuration.
       Demo <a href="../demo/folding.html">here</a>.</dd>
 
       <dt id="addon_runmode"><a href="../addon/runmode/runmode.js"><code>runmode/runmode.js</code></a></dt>

From e78ac77b0c7c17678ff620726d1ad7ff89dd0f05 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 May 2014 11:51:44 +0200
Subject: [PATCH 1292/4742] [show-hint addon] Add hintOptions option, sanitize
 interface

---
 addon/hint/show-hint.js | 107 ++++++++++++++++++++++++++--------------
 addon/tern/tern.js      |   8 +--
 demo/anywordhint.html   |   2 +-
 demo/xmlcomplete.html   |   9 ++--
 doc/manual.html         |  25 +++++-----
 5 files changed, 93 insertions(+), 58 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 8d291d4b0a..46b55648cb 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -11,28 +11,35 @@
   var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
   var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
 
+  // This is the old interface, kept around for now to stay
+  // backwards-compatible.
   CodeMirror.showHint = function(cm, getHints, options) {
+    if (!getHints) return cm.showHint(options);
+    if (options && options.async) getHints.async = true;
+    var newOpts = {hint: getHints};
+    if (options) for (var prop in options) newOpts[prop] = options[prop];
+    return cm.showHint(newOpts);
+  };
+
+  CodeMirror.defineExtension("showHint", function(options) {
     // We want a single cursor position.
-    if (cm.listSelections().length > 1 || cm.somethingSelected()) return;
-    if (getHints == null) {
-      if (options && options.async) return;
-      else getHints = CodeMirror.hint.auto;
-    }
+    if (this.listSelections().length > 1 || this.somethingSelected()) return;
 
-    if (cm.state.completionActive) cm.state.completionActive.close();
+    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;
 
-    var completion = cm.state.completionActive = new Completion(cm, getHints, options || {});
-    CodeMirror.signal(cm, "startCompletion", cm);
-    if (completion.options.async)
-      getHints(cm, function(hints) { completion.showHints(hints); }, completion.options);
+    CodeMirror.signal(this, "startCompletion", this);
+    if (getHints.async)
+      getHints(this, function(hints) { completion.showHints(hints); }, completion.options);
     else
-      return completion.showHints(getHints(cm, completion.options));
-  };
+      return completion.showHints(getHints(this, completion.options));
+  });
 
-  function Completion(cm, getHints, options) {
+  function Completion(cm, options) {
     this.cm = cm;
-    this.getHints = getHints;
-    this.options = options;
+    this.options = this.buildOptions(options);
     this.widget = this.onClose = null;
   }
 
@@ -62,7 +69,7 @@
     showHints: function(data) {
       if (!data || !data.list.length || !this.active()) return this.close();
 
-      if (this.options.completeSingle != false && data.list.length == 1)
+      if (this.options.completionSingle && data.list.length == 1)
         this.pick(data, 0);
       else
         this.showWidget(data);
@@ -73,7 +80,7 @@
       CodeMirror.signal(data, "shown");
 
       var debounce = 0, completion = this, finished;
-      var closeOn = this.options.closeCharacters || /[\s()\[\]{};:>,]/;
+      var closeOn = this.options.closeCharacters;
       var startPos = this.cm.getCursor(), startLen = this.cm.getLine(startPos.line).length;
 
       var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
@@ -92,10 +99,11 @@
       function update() {
         if (finished) return;
         CodeMirror.signal(data, "update");
-        if (completion.options.async)
-          completion.getHints(completion.cm, finishUpdate, completion.options);
+        var getHints = completion.options.hint;
+        if (getHints.async)
+          getHints(completion.cm, finishUpdate, completion.options);
         else
-          finishUpdate(completion.getHints(completion.cm, completion.options));
+          finishUpdate(getHints(completion.cm, completion.options));
       }
       function finishUpdate(data_) {
         data = data_;
@@ -126,6 +134,17 @@
       }
       this.cm.on("cursorActivity", activity);
       this.onClose = done;
+    },
+
+    buildOptions: function(options) {
+      var editor = this.cm.options.hintOptions;
+      var out = {};
+      for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
+      if (editor) for (var prop in editor)
+        if (editor[prop] !== undefined) out[prop] = editor[prop];
+      if (options) for (var prop in options)
+        if (options[prop] !== undefined) out[prop] = options[prop];
+      return out;
     }
   };
 
@@ -134,7 +153,7 @@
     else return completion.text;
   }
 
-  function buildKeyMap(options, handle) {
+  function buildKeyMap(completion, handle) {
     var baseMap = {
       Up: function() {handle.moveFocus(-1);},
       Down: function() {handle.moveFocus(1);},
@@ -146,7 +165,8 @@
       Tab: handle.pick,
       Esc: handle.close
     };
-    var ourMap = options.customKeys ? {} : baseMap;
+    var custom = completion.options.customKeys;
+    var ourMap = custom ? {} : baseMap;
     function addBinding(key, val) {
       var bound;
       if (typeof val != "string")
@@ -158,12 +178,13 @@
         bound = val;
       ourMap[key] = bound;
     }
-    if (options.customKeys)
-      for (var key in options.customKeys) if (options.customKeys.hasOwnProperty(key))
-        addBinding(key, options.customKeys[key]);
-    if (options.extraKeys)
-      for (var key in options.extraKeys) if (options.extraKeys.hasOwnProperty(key))
-        addBinding(key, options.extraKeys[key]);
+    if (custom)
+      for (var key in custom) if (custom.hasOwnProperty(key))
+        addBinding(key, custom[key]);
+    var extra = completion.options.extraKeys;
+    if (extra)
+      for (var key in extra) if (extra.hasOwnProperty(key))
+        addBinding(key, extra[key]);
     return ourMap;
   }
 
@@ -177,11 +198,11 @@
   function Widget(completion, data) {
     this.completion = completion;
     this.data = data;
-    var widget = this, cm = completion.cm, options = completion.options;
+    var widget = this, cm = completion.cm;
 
     var hints = this.hints = document.createElement("ul");
     hints.className = "CodeMirror-hints";
-    this.selectedHint = options.getDefaultSelection ? options.getDefaultSelection(cm,options,data) : 0;
+    this.selectedHint = data.selectedHint || 0;
 
     var completions = data.list;
     for (var i = 0; i < completions.length; ++i) {
@@ -194,14 +215,14 @@
       elt.hintId = i;
     }
 
-    var pos = cm.cursorCoords(options.alignWithWord !== false ? data.from : null);
+    var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null);
     var left = pos.left, top = pos.bottom, below = true;
     hints.style.left = left + "px";
     hints.style.top = top + "px";
     // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
     var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
     var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
-    (options.container || document.body).appendChild(hints);
+    (completion.options.container || document.body).appendChild(hints);
     var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
     if (overlapY > 0) {
       var height = box.bottom - box.top, curTop = box.top - (pos.bottom - pos.top);
@@ -228,7 +249,7 @@
       hints.style.left = (left = pos.left - overlapX) + "px";
     }
 
-    cm.addKeyMap(this.keyMap = buildKeyMap(options, {
+    cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
       moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
       setFocus: function(n) { widget.changeActive(n); },
       menuSize: function() { return widget.screenAmount(); },
@@ -238,7 +259,7 @@
       data: data
     }));
 
-    if (options.closeOnUnfocus !== false) {
+    if (completion.options.closeOnUnfocus) {
       var closingOnBlur;
       cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
       cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
@@ -264,7 +285,7 @@
       var t = getHintElement(hints, e.target || e.srcElement);
       if (t && t.hintId != null) {
         widget.changeActive(t.hintId);
-        if (options.completeOnSingleClick) widget.pick();
+        if (completion.options.completeOnSingleClick) widget.pick();
       }
     });
 
@@ -284,7 +305,7 @@
       this.completion.cm.removeKeyMap(this.keyMap);
 
       var cm = this.completion.cm;
-      if (this.completion.options.closeOnUnfocus !== false) {
+      if (this.completion.options.closeOnUnfocus) {
         cm.off("blur", this.onBlur);
         cm.off("focus", this.onFocus);
       }
@@ -348,4 +369,18 @@
   });
 
   CodeMirror.commands.autocomplete = CodeMirror.showHint;
+
+  var defaultOptions = {
+    hint: CodeMirror.hint.auto,
+    completionSingle: true,
+    alignWithWord: true,
+    closeCharacters: /[\s()\[\]{};:>,]/,
+    closeOnUnfocus: true,
+    completeOnSignleClick: false,
+    container: null,
+    customKeys: null,
+    extraKeys: null
+  };
+
+  CodeMirror.defineOption("hintOptions", null);
 });
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 6fbd10c55d..2f450ed024 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -72,6 +72,9 @@
     this.cachedArgHints = null;
     this.activeArgHints = null;
     this.jumpStack = [];
+
+    this.getHint = function(cm, c) { return hint(self, cm, c); };
+    this.getHint.async = true;
   };
 
   CodeMirror.TernServer.prototype = {
@@ -97,12 +100,9 @@
     },
 
     complete: function(cm) {
-      var self = this;
-      CodeMirror.showHint(cm, function(cm, c) { return hint(self, cm, c); }, {async: true});
+      cm.showHint({hint: this.getHint});
     },
 
-    getHint: function(cm, c) { return hint(this, cm, c); },
-
     showType: function(cm, pos) { showType(this, cm, pos); },
 
     updateArgHints: function(cm) { updateArgHints(this, cm); },
diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index 851f43000d..c76b997bf5 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -69,7 +69,7 @@ <h2>Any Word Completion Demo</h2>
 
     <script>
       CodeMirror.commands.autocomplete = function(cm) {
-        CodeMirror.showHint(cm, CodeMirror.hint.anyword);
+        cm.showHint({hint: CodeMirror.hint.anyword});
       }
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index dea23adf84..b1ff1fe26b 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -82,7 +82,7 @@ <h2>XML Autocomplete Demo</h2>
         var cur = cm.getCursor();
         if (!pred || pred()) setTimeout(function() {
           if (!cm.state.completionActive)
-            CodeMirror.showHint(cm, CodeMirror.hint.xml, {schemaInfo: tags, completeSingle: false});
+            cm.showHint({completeSingle: false});
         }, 100);
         return CodeMirror.Pass;
       }
@@ -111,10 +111,9 @@ <h2>XML Autocomplete Demo</h2>
           "'/'": completeIfAfterLt,
           "' '": completeIfInTag,
           "'='": completeIfInTag,
-          "Ctrl-Space": function(cm) {
-            CodeMirror.showHint(cm, CodeMirror.hint.xml, {schemaInfo: tags});
-          }
-        }
+          "Ctrl-Space": "autocomplete"
+        },
+        hintOptions: {schemaInfo: tags}
       });
     </script>
   </article>
diff --git a/doc/manual.html b/doc/manual.html
index c26b2a205a..59c81f3456 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2317,11 +2317,11 @@ <h2>Addons</h2>
 
       <dt id="addon_show-hint"><a href="../addon/hint/show-hint.js"><code>hint/show-hint.js</code></a></dt>
       <dd>Provides a framework for showing autocompletion hints.
-      Defines <code>CodeMirror.showHint</code>, which takes a
-      CodeMirror instance, a hinting function, and optionally an
+      Defines <code>editor.showHint</code>, which takes an optional
       options object, and pops up a widget that allows the user to
-      select a completion. Hinting functions are function that take an
-      editor instance and an optional options object, and return
+      select a completion. Finding hints is done with a hinting
+      functions (the <code>hint</code> option), which is a function
+      that take an editor instance and options object, and return
       a <code>{list, from, to}</code> object, where <code>list</code>
       is an array of strings or objects (the completions),
       and <code>from</code> and <code>to</code> give the start and end
@@ -2336,9 +2336,8 @@ <h2>Addons</h2>
       completable words for the mode, and
       uses <code>CodeMirror.hint.fromList</code> to complete from
       those.</dd>
-      <dd>When completions
-      aren't simple strings, they should be objects with the following
-      properties:
+      <dd>When completions aren't simple strings, they should be
+      objects with the following properties:
       <dl>
         <dt><code><strong>text</strong>: string</code></dt>
         <dd>The completion text. This is the only required
@@ -2365,11 +2364,13 @@ <h2>Addons</h2>
       will also be passed along to the hinting function, which may
       understand additional options):
       <dl>
-        <dt><code><strong>async</strong>: boolean</code></dt>
-        <dd>When set to true, the hinting function's signature should
-        be <code>(cm, callback, ?options)</code>, and the completion
-        interface will only be popped up when the hinting function
-        calls the callback, passing it the object holding the
+        <dt><code><strong>hint</strong>: function</code></dt>
+        <dd>A hinting function, as specified above. It is possible to
+        set the <code>async</code> property on a hinting function to
+        true, in which case it will be called with
+        arguments <code>(cm, callback, ?options)</code>, and the
+        completion interface will only be popped up when the hinting
+        function calls the callback, passing it the object holding the
         completions.</dd>
         <dt><code><strong>completeSingle</strong>: boolean</code></dt>
         <dd>Determines whether, when only a single completion is

From f23e54ae506a1a805f4ef92a2393dc0593e19b36 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 May 2014 12:06:32 +0200
Subject: [PATCH 1293/4742] Prevent error when trying to find a view cutting
 point at end of document

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7c87c604c1..4a843d3f63 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2140,7 +2140,8 @@
 
   function viewCuttingPoint(cm, oldN, newN, dir) {
     var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
-    if (!sawCollapsedSpans) return {index: index, lineN: newN};
+    if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
+      return {index: index, lineN: newN};
     for (var i = 0, n = cm.display.viewFrom; i < index; i++)
       n += view[i].size;
     if (n != oldN) {

From 8e5c2a97060adbc7c50bab567a64825d15ed92bc Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Sun, 20 Apr 2014 12:14:11 -0700
Subject: [PATCH 1294/4742] mode_test.js: refactor to use array of objects.

---
 test/mode_test.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/mode_test.js b/test/mode_test.js
index d4eff2e537..82364eaec7 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -52,7 +52,7 @@
           pos = end;
         }
         text = text.replace(/\[\[|\]\]/g, function(s) {return s.charAt(0);});
-        tokens.push(style, text);
+        tokens.push({style: style, text: text});
         plain += text;
       }
     }
@@ -73,10 +73,10 @@
   function compare(text, expected, mode) {
 
     var expectedOutput = [];
-    for (var i = 0; i < expected.length; i += 2) {
-      var sty = expected[i];
+    for (var i = 0; i < expected.length; ++i) {
+      var sty = expected[i].style;
       if (sty && sty.indexOf(" ")) sty = sty.split(' ').sort().join(' ');
-      expectedOutput.push(sty, expected[i + 1]);
+      expectedOutput.push({style: sty, text: expected[i].text});
     }
 
     var observedOutput = highlight(text, mode);
@@ -102,7 +102,7 @@
   }
 
   function highlight(string, mode) {
-    var state = mode.startState()
+    var state = mode.startState();
 
     var lines = string.replace(/\r\n/g,'\n').split('\n');
     var st = [], pos = 0;
@@ -126,14 +126,14 @@
         var substr = stream.current();
         if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
         stream.start = stream.pos;
-        if (pos && st[pos-2] == compare && !newLine) {
-          st[pos-1] += substr;
+        if (pos && st[pos-1].style == compare && !newLine) {
+          st[pos-1].text += substr;
         } else if (substr) {
-          st[pos++] = compare; st[pos++] = substr;
+          st[pos++] = {style: compare, text: substr};
         }
         // Give up when line is ridiculously long
         if (stream.pos > 5000) {
-          st[pos++] = null; st[pos++] = this.text.slice(stream.pos);
+          st[pos++] = {style: null, text: this.text.slice(stream.pos)};
           break;
         }
         newLine = false;
@@ -146,15 +146,15 @@
   function highlightOutputsDifferent(o1, o2) {
     var minLen = Math.min(o1.length, o2.length);
     for (var i = 0; i < minLen; ++i)
-      if (o1[i] != o2[i]) return i >> 1;
+      if (o1[i].style != o2[i].style || o1[i].text != o2[i].text) return i;
     if (o1.length > minLen || o2.length > minLen) return minLen;
   }
 
   function prettyPrintOutputTable(output, diffAt) {
     var s = '<table class="mt-output">';
     s += '<tr>';
-    for (var i = 0; i < output.length; i += 2) {
-      var style = output[i], val = output[i+1];
+    for (var i = 0; i < output.length; ++i) {
+      var style = output[i].style, val = output[i].text;
       s +=
       '<td class="mt-token"' + (i == diffAt * 2 ? " style='background: pink'" : "") + '>' +
         '<span class="cm-' + esc(String(style)) + '">' +
@@ -163,8 +163,8 @@
         '</td>';
     }
     s += '</tr><tr>';
-    for (var i = 0; i < output.length; i += 2) {
-      s += '<td class="mt-style"><span>' + (output[i] || null) + '</span></td>';
+    for (var i = 0; i < output.length; ++i) {
+      s += '<td class="mt-style"><span>' + (output[i].style || null) + '</span></td>';
     }
     s += '</table>';
     return s;

From eab52760ffe9baa44eb4175059f24f720da7cdd8 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Thu, 1 May 2014 14:27:21 -0700
Subject: [PATCH 1295/4742] mode tests: optionally show mode state after every
 token.

Doesn't show states (but shouldn't crash) on old browsers.
---
 test/mode_test.css | 12 ++++++++++++
 test/mode_test.js  | 30 +++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/test/mode_test.css b/test/mode_test.css
index 1ac66737fb..7ae3b0ada8 100644
--- a/test/mode_test.css
+++ b/test/mode_test.css
@@ -8,3 +8,15 @@
 .mt-output .mt-style {
   font-size: x-small;
 }
+
+.mt-output .mt-state {
+  font-size: x-small;
+}
+
+.mt-output .mt-state-row {
+  display: none;
+}
+
+.mt-state-unhide .mt-output .mt-state-row {
+  display: table-row;
+}
diff --git a/test/mode_test.js b/test/mode_test.js
index 82364eaec7..2e16eba0ee 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -67,7 +67,8 @@
   };
 
   function esc(str) {
-    return str.replace('&', '&amp;').replace('<', '&lt;');
+    return str.replace('&', '&amp;').replace('<', '&lt;').replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+;
   }
 
   function compare(text, expected, mode) {
@@ -89,7 +90,7 @@
       s +=   '<div class="cm-s-default">';
       s += 'expected:';
       s +=   prettyPrintOutputTable(expectedOutput, diff);
-      s += 'observed:';
+      s += 'observed: [<a onclick="this.parentElement.className+=\' mt-state-unhide\'">display states</a>]';
       s +=   prettyPrintOutputTable(observedOutput, diff);
       s +=   '</div>';
       s += '</div>';
@@ -101,6 +102,19 @@
     if (s) throw new Failure(s);
   }
 
+  function stringify(obj) {
+    function replacer(key, obj) {
+      if (typeof obj == "function") {
+        var m = obj.toString().match(/function\s*[^\s(]*/);
+        return m ? m[0] : "function";
+      }
+      return obj;
+    }
+    if (window.JSON && JSON.stringify)
+      return JSON.stringify(obj, replacer, 2);
+    return "[unsupported]";  // Fail safely if no native JSON.
+  }
+
   function highlight(string, mode) {
     var state = mode.startState();
 
@@ -129,7 +143,7 @@
         if (pos && st[pos-1].style == compare && !newLine) {
           st[pos-1].text += substr;
         } else if (substr) {
-          st[pos++] = {style: compare, text: substr};
+          st[pos++] = {style: compare, text: substr, state: stringify(state)};
         }
         // Give up when line is ridiculously long
         if (stream.pos > 5000) {
@@ -158,7 +172,7 @@
       s +=
       '<td class="mt-token"' + (i == diffAt * 2 ? " style='background: pink'" : "") + '>' +
         '<span class="cm-' + esc(String(style)) + '">' +
-        esc(val.replace(/ /g,'\xb7')) +
+        esc(val.replace(/ /g,'\xb7')) +  // · MIDDLE DOT
         '</span>' +
         '</td>';
     }
@@ -166,7 +180,13 @@
     for (var i = 0; i < output.length; ++i) {
       s += '<td class="mt-style"><span>' + (output[i].style || null) + '</span></td>';
     }
-    s += '</table>';
+    if(output[0].state) {
+      s += '</tr><tr class="mt-state-row" title="State AFTER each token">';
+      for (var i = 0; i < output.length; ++i) {
+        s += '<td class="mt-state"><pre>' + esc(output[i].state) + '</pre></td>';
+      }
+    }
+    s += '</tr></table>';
     return s;
   }
 })();

From 579a6e015aea4c3858f2e04230d172660deecf15 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 May 2014 12:15:34 +0200
Subject: [PATCH 1296/4742] [test runner] Top-align mode test states

---
 mode/javascript/test.js | 2 +-
 test/mode_test.css      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 782f0457f9..f5ddcc43de 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -9,7 +9,7 @@
      "[keyword function](){ [keyword var] [def x] [operator =] [number 1] [operator +] [number 2], [def y]; }");
 
   MT("destructuring",
-     "([keyword function]([def a], [[[def b], [def c] ]]) {",
+     "([keywordo function]([def a], [[[def b], [def c] ]]) {",
      "  [keyword let] {[def d], [property foo]: [def c][operator =][number 10], [def x]} [operator =] [variable foo]([variable-2 a]);",
      "  [[[variable-2 c], [variable y] ]] [operator =] [variable-2 c];",
      "})();");
diff --git a/test/mode_test.css b/test/mode_test.css
index 7ae3b0ada8..f83271b4e2 100644
--- a/test/mode_test.css
+++ b/test/mode_test.css
@@ -11,6 +11,7 @@
 
 .mt-output .mt-state {
   font-size: x-small;
+  vertical-align: top;
 }
 
 .mt-output .mt-state-row {

From 39788f1d77762668e435fef908dc152a0c98a52f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 May 2014 12:18:57 +0200
Subject: [PATCH 1297/4742] Revert intentionally broken but unintentionally
 committed test

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

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index f5ddcc43de..782f0457f9 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -9,7 +9,7 @@
      "[keyword function](){ [keyword var] [def x] [operator =] [number 1] [operator +] [number 2], [def y]; }");
 
   MT("destructuring",
-     "([keywordo function]([def a], [[[def b], [def c] ]]) {",
+     "([keyword function]([def a], [[[def b], [def c] ]]) {",
      "  [keyword let] {[def d], [property foo]: [def c][operator =][number 10], [def x]} [operator =] [variable foo]([variable-2 a]);",
      "  [[[variable-2 c], [variable y] ]] [operator =] [variable-2 c];",
      "})();");

From a0bd44226e24694d96fd100452b67da1f5d1c4ec Mon Sep 17 00:00:00 2001
From: Anders Nawroth <anders@neotechnology.com>
Date: Mon, 5 May 2014 10:24:01 +0200
Subject: [PATCH 1298/4742] [cypher mode] Add UNWIND keyword

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

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index da6f3acaae..f102c9ec1a 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -59,7 +59,7 @@
     var curPunc;
     var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
     var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]);
-    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "false", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "using", "when", "where", "with"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "false", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
     var operatorChars = /[*+\-<>=&|~%^]/;
 
     return {

From 0c3da1a0c937fee28fc9169ee02e8301c9984903 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 6 May 2014 10:54:20 +0200
Subject: [PATCH 1299/4742] [match-highlighter addon] Use primary selection,
 not first one

Closes #2539
---
 addon/search/match-highlighter.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index d9c818b838..83ab8c33c7 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -76,8 +76,9 @@
           cm.addOverlay(state.overlay = makeOverlay(line.slice(start, end), re, state.style));
         return;
       }
-      if (cm.getCursor("head").line != cm.getCursor("anchor").line) return;
-      var selection = cm.getSelections()[0].replace(/^\s+|\s+$/g, "");
+      var from = cm.getCursor("from"), to = cm.getCursor("to");
+      if (from.line != to.line) return;
+      var selection = cm.getRange(from, to).replace(/^\s+|\s+$/g, "");
       if (selection.length >= state.minChars)
         cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
     });

From 1adf6180d0f0297ac314f87ff89d2de84cdc938a Mon Sep 17 00:00:00 2001
From: Panupong Pasupat <ppasupat@stanford.edu>
Date: Mon, 5 May 2014 21:29:32 -0700
Subject: [PATCH 1300/4742] [markdown mode] Fix code block styling after
 indented line

---
 mode/markdown/markdown.js | 3 +--
 mode/markdown/test.js     | 8 ++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index ff466be86f..92f71275f4 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -709,8 +709,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         if (forceBlankLine) {
           state.prevLineHasContent = false;
-          blankLine(state);
-          return this.token(stream, state);
+          return blankLine(state);
         } else {
           state.prevLineHasContent = state.thisLineHasContent;
           state.thisLineHasContent = true;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index c3016d3a6a..984d876e38 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -89,6 +89,14 @@
      "        [comment hello]",
      "    [comment world]");
 
+  // Code blocks should end even after extra indented lines
+  MT("codeBlocksWithTrailingIndentedLine",
+     "    [comment foo]",
+     "        [comment bar]",
+     "    [comment baz]",
+     "    ",
+     "hello");
+
   // Code blocks using 1 tab (regardless of CodeMirror.indentWithTabs value)
   MT("codeBlocksUsing1Tab",
      "\t[comment foo]");

From 90650c649327da228ed4f384da512089ac38f8ce Mon Sep 17 00:00:00 2001
From: Panupong Pasupat <ppasupat@stanford.edu>
Date: Mon, 5 May 2014 21:49:49 -0700
Subject: [PATCH 1301/4742] [markdown mode] Fix XML styling in Markdown mode

Fix the condition when XML styling should be invoked.
Also add test cases.
---
 mode/markdown/markdown.js |  2 +-
 mode/markdown/test.js     | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 92f71275f4..84ea4d46b9 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -209,7 +209,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function htmlBlock(stream, state) {
     var style = htmlMode.token(stream, state.htmlState);
-    if ((htmlFound && !state.htmlState.tagName && !state.htmlState.context) ||
+    if ((htmlFound && state.htmlState.tagStart === null && !state.htmlState.context) ||
         (state.md_inside && stream.current().indexOf(">") > -1)) {
       state.f = inlineNormal;
       state.block = blockNormal;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 984d876e38..4d1d70ad14 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -729,4 +729,23 @@
      "[comment ```]",
      "foo",
      "[comment ```]");
+
+  // Tests that require XML mode
+
+  MT("xmlMode",
+     "[tag&bracket <][tag div][tag&bracket >]",
+     "*foo*",
+     "[tag&bracket <][tag http://github.com][tag&bracket />]",
+     "[tag&bracket </][tag div][tag&bracket >]",
+     "[link <http://github.com/>]");
+
+  MT("xmlModeWithMarkdownInside",
+     "[tag&bracket <][tag div] [attribute markdown]=[string 1][tag&bracket >]",
+     "[em *foo*]",
+     "[link <http://github.com/>]",
+     "[tag </div>]",
+     "[link <http://github.com/>]",
+     "[tag&bracket <][tag div][tag&bracket >]",
+     "[tag&bracket </][tag div][tag&bracket >]");
+
 })();

From 60ab165bfa2bfc81b97d3b2b2d16c9665002adf5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 6 May 2014 11:04:27 +0200
Subject: [PATCH 1302/4742] [dylan mode] Add module loading shim

Closes #2533
---
 mode/dylan/dylan.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index d81ef0cbcb..ccf9679181 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -1,3 +1,13 @@
+(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("dylan", function(_config) {
   // Words
   var words = {
@@ -282,3 +292,5 @@ CodeMirror.defineMode("dylan", function(_config) {
 });
 
 CodeMirror.defineMIME("text/x-dylan", "dylan");
+
+});

From 6abb339705fd234de93b14c28f37a5a212b65629 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Mon, 5 May 2014 21:55:30 +0530
Subject: [PATCH 1303/4742] [vim] Visual paste operation with unit tests

---
 keymap/vim.js    | 61 +++++++++++++++++++++++++++++-------------------
 test/vim_test.js | 25 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c78d76af94..1ea39c1ef0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2051,7 +2051,7 @@
         }
         this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
       },
-      paste: function(cm, actionArgs) {
+      paste: function(cm, actionArgs, vim) {
         var cur = copyCursor(cm.getCursor());
         var register = vimGlobalState.registerController.getRegister(
             actionArgs.registerName);
@@ -2092,7 +2092,9 @@
         }
         var linewise = register.linewise;
         if (linewise) {
-          if (actionArgs.after) {
+          if(vim.visualMode) {
+            text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
+          } else if (actionArgs.after) {
             // Move the newline at the end to the start instead, and paste just
             // before the newline character of the line we are on right now.
             text = '\n' + text.slice(0, text.length - 1);
@@ -2103,24 +2105,35 @@
         } else {
           cur.ch += actionArgs.after ? 1 : 0;
         }
-        cm.replaceRange(text, cur);
-        // Now fine tune the cursor to where we want it.
         var curPosFinal;
         var idx;
-        if (linewise && actionArgs.after) {
-          curPosFinal = Pos(
-            cur.line + 1,
-            findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
-        } else if (linewise && !actionArgs.after) {
-          curPosFinal = Pos(
-            cur.line,
-            findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
-        } else if (!linewise && actionArgs.after) {
-          idx = cm.indexFromPos(cur);
-          curPosFinal = cm.posFromIndex(idx + text.length - 1);
+        if (vim.visualMode) {
+          var selectedArea = getSelectedAreaRange(cm, vim);
+          var selectionStart = selectedArea[0];
+          var selectionEnd = selectedArea[1];
+          // push the previously selected text to unnamed register
+          vimGlobalState.registerController.unnamedRegister.setText(cm.getRange(selectionStart, selectionEnd));
+          cm.replaceRange(text, selectionStart, selectionEnd);
+          curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
+          if(linewise)curPosFinal.ch=0;
         } else {
-          idx = cm.indexFromPos(cur);
-          curPosFinal = cm.posFromIndex(idx + text.length);
+          cm.replaceRange(text, cur);
+          // Now fine tune the cursor to where we want it.
+          if (linewise && actionArgs.after) {
+            curPosFinal = Pos(
+              cur.line + 1,
+              findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
+          } else if (linewise && !actionArgs.after) {
+            curPosFinal = Pos(
+              cur.line,
+              findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
+          } else if (!linewise && actionArgs.after) {
+            idx = cm.indexFromPos(cur);
+            curPosFinal = cm.posFromIndex(idx + text.length - 1);
+          } else {
+            idx = cm.indexFromPos(cur);
+            curPosFinal = cm.posFromIndex(idx + text.length);
+          }
         }
         cm.setCursor(curPosFinal);
       },
@@ -2220,13 +2233,6 @@
         var selectionStart = selectedAreaRange[0];
         var selectionEnd = selectedAreaRange[1];
         var toLower = actionArgs.toLower;
-        if (cursorIsBefore(selectionEnd, selectionStart)) {
-          var tmp = selectionStart;
-          selectionStart = selectionEnd;
-          selectionEnd = tmp;
-        } else {
-          selectionEnd = cm.clipPos(Pos(selectionEnd.line, selectionEnd.ch+1));
-        }
         var text = cm.getRange(selectionStart, selectionEnd);
         cm.replaceRange(toLower ? text.toLowerCase() : text.toUpperCase(), selectionStart, selectionEnd);
         cm.setCursor(selectionStart);
@@ -2324,6 +2330,13 @@
           return [{line: selectionStart.line, ch: 0}, {line: selectionEnd.line, ch: lineLength(cm, selectionEnd.line)}];
         }
       } else {
+        if (cursorIsBefore(selectionEnd, selectionStart)) {
+          var tmp = selectionStart;
+          selectionStart = selectionEnd;
+          selectionEnd = tmp;
+        } else {
+          selectionEnd = cm.clipPos(Pos(selectionEnd.line, selectionEnd.ch+1));
+        }
         exitVisualMode(cm);
       }
       return [selectionStart, selectionEnd];
diff --git a/test/vim_test.js b/test/vim_test.js
index 71cd5ed941..a3f3fed3ad 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1639,6 +1639,31 @@ testVim('uppercase/lowercase_visual', function(cm, vim, helpers) {
   helpers.doKeys('V', 'U', 'j', '.');
   eq('ABCDEF\nGHIJKL\nMnopq\nSHORT LINE\nLONG LINE OF TEXT', cm.getValue());
 }, { value: 'abcdef\nghijkl\nmnopq\nshort line\nlong line of text'});
+testVim('visual_paste', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'l', 'l', 'y', 'j', 'v', 'l', 'p');
+  helpers.assertCursorAt(1, 4);
+  eq('this is a\nunthi test for visual paste', cm.getValue());
+  cm.setCursor(0, 0);
+  // in case of pasting whole line
+  helpers.doKeys('y', 'y');
+  cm.setCursor(1, 6);
+  helpers.doKeys('v', 'l', 'l', 'l', 'p');
+  helpers.assertCursorAt(2, 0);
+  eq('this is a\nunthi \nthis is a\n for visual paste', cm.getValue());
+}, { value: 'this is a\nunit test for visual paste'});
+
+// This checks the contents of the register used to paste the text
+testVim('v_paste_from_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'w');
+  cm.setCursor(1, 0);
+  helpers.doKeys('v', 'p');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+register/.test(text));
+  });
+}, { value: 'register contents\nare not erased'});
 testVim('S_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('j', 'S');

From 6db5ec2870fc78977c817e35440185e26bff9175 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Wed, 30 Apr 2014 06:01:39 +0530
Subject: [PATCH 1304/4742] [vim] support for append action command in visual
 mode added

---
 keymap/vim.js    | 8 ++++++++
 test/vim_test.js | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 1ea39c1ef0..c48506adaa 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -271,6 +271,7 @@
         actionArgs: { insertAt: 'charAfter' }},
     { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'eol' }},
+    { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
     { keys: ['i'], type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'inplace' }},
     { keys: ['I'], type: 'action', action: 'enterInsertMode', isEdit: true,
@@ -1914,6 +1915,13 @@
           cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
         } else if (insertAt == 'firstNonBlank') {
           cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+        } else if (insertAt == 'endOfSelectedArea') {
+          var selectionEnd = cm.getCursor('head');
+          var selectionStart = cm.getCursor('anchor');
+          var cursor = cm.getCursor();
+          cursor = cursorIsBefore(selectionStart, selectionEnd) ? Pos(cursor.line, selectionEnd.ch+1) : Pos(cursor.line, selectionEnd.ch);
+          cm.setCursor(cursor);
+          exitVisualMode(cm);
         }
         cm.setOption('keyMap', 'vim-insert');
         cm.setOption('disableInput', false);
diff --git a/test/vim_test.js b/test/vim_test.js
index a3f3fed3ad..fecc52ba35 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1141,6 +1141,13 @@ testVim('a_eol', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, lines[0].length);
   eq('vim-insert', cm.getOption('keyMap'));
 });
+testVim('a_endOfSelectedArea', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'j', 'l');
+  helpers.doKeys('A');
+  helpers.assertCursorAt(1, 2);
+  eq('vim-insert', cm.getOption('keyMap'));
+}, {value: 'foo\nbar'});
 testVim('i', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('i');

From 546eb6ce365d860d1649f0b6e22cd6b1f7879a21 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Fri, 2 May 2014 03:32:33 +0530
Subject: [PATCH 1305/4742] [vim] Resolve upward selection bug

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

diff --git a/keymap/vim.js b/keymap/vim.js
index c48506adaa..e33d269089 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1918,9 +1918,8 @@
         } else if (insertAt == 'endOfSelectedArea') {
           var selectionEnd = cm.getCursor('head');
           var selectionStart = cm.getCursor('anchor');
-          var cursor = cm.getCursor();
-          cursor = cursorIsBefore(selectionStart, selectionEnd) ? Pos(cursor.line, selectionEnd.ch+1) : Pos(cursor.line, selectionEnd.ch);
-          cm.setCursor(cursor);
+          selectionEnd = cursorIsBefore(selectionStart, selectionEnd) ? Pos(selectionEnd.line, selectionEnd.ch+1) : (selectionEnd.line < selectionStart.line ? Pos(selectionStart.line, 0) : selectionEnd);
+          cm.setCursor(selectionEnd);
           exitVisualMode(cm);
         }
         cm.setOption('keyMap', 'vim-insert');

From 41a29b0132445f8f10a5fc4b83f7c1e456171d03 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 8 May 2014 12:22:20 +0200
Subject: [PATCH 1306/4742] Abort wheel delta measurement when scrolling
 explicitly

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4a843d3f63..0bf6f2d8e8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1927,6 +1927,10 @@
     if (!updated && op.selectionChanged) updateSelection(cm);
     if (!updated && op.startHeight != cm.doc.height) updateScrollbars(cm);
 
+    // Abort mouse wheel delta measurement, when scrolling explicitly
+    if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
+      display.wheelStartX = display.wheelStartY = null;
+
     // Propagate the scroll position to the actual DOM scroller
     if (op.scrollTop != null && display.scroller.scrollTop != op.scrollTop) {
       var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));

From 0efe7a57115a252abf033e16ea1d1a375cd5a229 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 May 2014 14:48:38 +0200
Subject: [PATCH 1307/4742] [sublime keybindings] Don't include zero-char
 selection bottoms in swapLine*

Issue #2542
---
 keymap/sublime.js    | 16 ++++++++--------
 test/sublime_test.js |  6 ++++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index eea46347fd..9158e27944 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -184,9 +184,12 @@
   };
 
   cmds[map["Shift-" + ctrl + "Up"] = "swapLineUp"] = function(cm) {
-    var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1;
+    var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i], from = range.from().line - 1, to = range.to().line;
+      newSels.push({anchor: Pos(range.anchor.line - 1, range.anchor.ch),
+                    head: Pos(range.head.line - 1, range.head.ch)});
+      if (range.to().ch == 0 && !range.empty()) --to;
       if (from > at) linesToMove.push(from, to);
       else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
       at = to;
@@ -196,16 +199,12 @@
         var from = linesToMove[i], to = linesToMove[i + 1];
         var line = cm.getLine(from);
         cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
-        if (to > cm.lastLine()) {
+        if (to > cm.lastLine())
           cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine");
-          var sels = cm.listSelections(), last = sels[sels.length - 1];
-          var head = last.head.line == to ? Pos(to - 1) : last.head;
-          var anchor = last.anchor.line == to ? Pos(to - 1) : last.anchor;
-          cm.setSelections(sels.slice(0, sels.length - 1).concat([{head: head, anchor: anchor}]));
-        } else {
+        else
           cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
-        }
       }
+      cm.setSelections(newSels);
       cm.scrollIntoView();
     });
   };
@@ -214,6 +213,7 @@
     var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
     for (var i = ranges.length - 1; i >= 0; i--) {
       var range = ranges[i], from = range.to().line + 1, to = range.from().line;
+      if (range.to().ch == 0 && !range.empty()) from--;
       if (from < at) linesToMove.push(from, to);
       else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
       at = to;
diff --git a/test/sublime_test.js b/test/sublime_test.js
index f09504c51a..c93e041b87 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -178,6 +178,12 @@
                 1, 0, 2, 0,
                 2, 2, 2, 2));
 
+  stTest("swapLineEmptyBottomSel", "1\n2\n3",
+         setSel(0, 1, 1, 0),
+         "swapLineDown", val("2\n1\n3"), hasSel(1, 1, 2, 0),
+         "swapLineUp", val("1\n2\n3"), hasSel(0, 1, 1, 0),
+         "swapLineUp", val("1\n2\n3"), hasSel(0, 0, 0, 0));
+
   stTest("swapLineUpFromEnd", "a\nb\nc",
          Pos(2, 1), "swapLineUp",
          hasSel(1, 1, 1, 1), val("a\nc\nb"));

From fea31914767042d0d42800ab82dc29b3e76a6a2b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 May 2014 15:18:36 +0200
Subject: [PATCH 1308/4742] [javascript-hint addon] Support an option that
 disables use of the current global scope

---
 addon/hint/javascript-hint.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 305bb85a29..baf20b45dc 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -108,7 +108,8 @@
       if (obj.type && obj.type.indexOf("variable") === 0) {
         if (options && options.additionalContext)
           base = options.additionalContext[obj.string];
-        base = base || window[obj.string];
+        if (!options || options.useGlobalScope !== false)
+          base = base || window[obj.string];
       } else if (obj.type == "string") {
         base = "";
       } else if (obj.type == "atom") {
@@ -128,7 +129,8 @@
       // (reading into JS mode internals to get at the local and global variables)
       for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
       for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
-      gatherCompletions(window);
+      if (!options || options.useGlobalScope !== false)
+        gatherCompletions(window);
       forEach(keywords, maybeAdd);
     }
     return found;

From a6faf989152a86a22f6155a775f3c16d724d1a88 Mon Sep 17 00:00:00 2001
From: Bem Jones-Bey <bjonesbe@adobe.com>
Date: Tue, 6 May 2014 15:00:32 -0700
Subject: [PATCH 1309/4742] [css mode] Add more CSS Shapes properties

Add shape-image-threshold and shape-margin.
---
 mode/css/css.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 3fae9687fd..8828329fc4 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -433,8 +433,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "region-break-before", "region-break-inside", "region-fragment",
     "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
     "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
-    "ruby-position", "ruby-span", "shape-inside", "shape-outside", "size",
-    "speak", "speak-as", "speak-header",
+    "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin",
+    "shape-outside", "size", "speak", "speak-as", "speak-header",
     "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
     "tab-size", "table-layout", "target", "target-name", "target-new",
     "target-position", "text-align", "text-align-last", "text-decoration",

From 81aeea3757b2c9826af68fb21fd5a170684f0aac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 May 2014 15:24:47 +0200
Subject: [PATCH 1310/4742] [real-world uses] Add Better Text Viewer and
 CrossUI

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

diff --git a/doc/realworld.html b/doc/realworld.html
index ccfbf4be41..e6649b1f02 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -28,6 +28,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
       <li><a href="http://amber-lang.net/">Amber</a> (JavaScript-based Smalltalk system)</li>
       <li><a href="http://apeye.org/">APEye</a> (tool for testing &amp; documenting APIs)</li>
+      <li><a href="https://chrome.google.com/webstore/detail/better-text-viewer/lcaidopdffhfemoefoaadecppnjdknkc">Better Text Viewer</a> (plain text reader app for Chrome)</li>
       <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a> (code hosting)</li>
       <li><a href="http://buzz.blogger.com/2013/04/improvements-to-blogger-template-html.html">Blogger's template editor</a></li>
       <li><a href="http://bluegriffon.org/">BlueGriffon</a> (HTML editor)</li>
@@ -35,6 +36,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
+      <li><a href="http://www.crossui.com/">CrossUI</a> (cross-platform UI builder)</li>
       <li><a href="http://rsnous.com/cruncher/">Cruncher</a> (notepad with calculation features)</li>
       <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>
       <li><a href="http://www.codebugapp.com/">Codebug</a> (PHP Xdebug front-end)</li>

From 01e844f09eb74ad55a987779ead1c1fb17d5aea9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 May 2014 15:52:39 +0200
Subject: [PATCH 1311/4742] Add license and version comment to all scripts

---
 addon/comment/comment.js            |  3 +++
 addon/comment/continuecomment.js    |  3 +++
 addon/dialog/dialog.js              |  3 +++
 addon/display/fullscreen.js         |  3 +++
 addon/display/placeholder.js        |  3 +++
 addon/display/rulers.js             |  3 +++
 addon/edit/closebrackets.js         |  3 +++
 addon/edit/closetag.js              |  3 +++
 addon/edit/continuelist.js          |  3 +++
 addon/edit/matchbrackets.js         |  3 +++
 addon/edit/matchtags.js             |  3 +++
 addon/edit/trailingspace.js         |  3 +++
 addon/fold/brace-fold.js            |  3 +++
 addon/fold/comment-fold.js          |  3 +++
 addon/fold/foldcode.js              |  3 +++
 addon/fold/foldgutter.js            |  3 +++
 addon/fold/indent-fold.js           |  3 +++
 addon/fold/markdown-fold.js         |  3 +++
 addon/fold/xml-fold.js              |  3 +++
 addon/hint/anyword-hint.js          |  3 +++
 addon/hint/css-hint.js              |  3 +++
 addon/hint/html-hint.js             |  3 +++
 addon/hint/javascript-hint.js       |  3 +++
 addon/hint/python-hint.js           |  3 +++
 addon/hint/show-hint.js             |  3 +++
 addon/hint/sql-hint.js              |  3 +++
 addon/hint/xml-hint.js              |  3 +++
 addon/lint/coffeescript-lint.js     |  3 +++
 addon/lint/css-lint.js              |  3 +++
 addon/lint/javascript-lint.js       |  3 +++
 addon/lint/json-lint.js             |  3 +++
 addon/lint/lint.js                  |  3 +++
 addon/lint/yaml-lint.js             |  3 +++
 addon/merge/merge.js                |  3 +++
 addon/mode/loadmode.js              |  3 +++
 addon/mode/multiplex.js             |  3 +++
 addon/mode/multiplex_test.js        |  3 +++
 addon/mode/overlay.js               |  3 +++
 addon/runmode/colorize.js           |  3 +++
 addon/runmode/runmode-standalone.js |  3 +++
 addon/runmode/runmode.js            |  3 +++
 addon/runmode/runmode.node.js       |  3 +++
 addon/scroll/scrollpastend.js       |  3 +++
 addon/search/match-highlighter.js   |  3 +++
 addon/search/search.js              |  3 +++
 addon/search/searchcursor.js        |  3 +++
 addon/selection/active-line.js      |  3 +++
 addon/selection/mark-selection.js   |  3 +++
 addon/tern/tern.js                  |  3 +++
 addon/tern/worker.js                |  3 +++
 addon/wrap/hardwrap.js              |  3 +++
 bin/release                         | 15 +++++++++++++++
 keymap/emacs.js                     |  3 +++
 keymap/sublime.js                   |  3 +++
 keymap/vim.js                       |  3 +++
 lib/codemirror.js                   |  3 +++
 mode/apl/apl.js                     |  3 +++
 mode/asterisk/asterisk.js           |  3 +++
 mode/clike/clike.js                 |  3 +++
 mode/clojure/clojure.js             |  3 +++
 mode/cobol/cobol.js                 |  3 +++
 mode/coffeescript/coffeescript.js   |  3 +++
 mode/commonlisp/commonlisp.js       |  3 +++
 mode/css/css.js                     |  3 +++
 mode/css/less_test.js               |  3 +++
 mode/css/scss_test.js               |  3 +++
 mode/css/test.js                    |  3 +++
 mode/cypher/cypher.js               |  3 +++
 mode/d/d.js                         |  3 +++
 mode/diff/diff.js                   |  3 +++
 mode/django/django.js               |  3 +++
 mode/dtd/dtd.js                     |  3 +++
 mode/dylan/dylan.js                 |  3 +++
 mode/ecl/ecl.js                     |  3 +++
 mode/eiffel/eiffel.js               |  3 +++
 mode/erlang/erlang.js               |  3 +++
 mode/fortran/fortran.js             |  3 +++
 mode/gas/gas.js                     |  3 +++
 mode/gfm/gfm.js                     |  3 +++
 mode/gfm/test.js                    |  3 +++
 mode/gherkin/gherkin.js             |  3 +++
 mode/go/go.js                       |  3 +++
 mode/groovy/groovy.js               |  3 +++
 mode/haml/haml.js                   |  3 +++
 mode/haml/test.js                   |  3 +++
 mode/haskell/haskell.js             |  3 +++
 mode/haxe/haxe.js                   |  3 +++
 mode/htmlembedded/htmlembedded.js   |  3 +++
 mode/htmlmixed/htmlmixed.js         |  3 +++
 mode/http/http.js                   |  3 +++
 mode/jade/jade.js                   |  3 +++
 mode/javascript/javascript.js       |  3 +++
 mode/javascript/test.js             |  3 +++
 mode/jinja2/jinja2.js               |  3 +++
 mode/julia/julia.js                 |  3 +++
 mode/livescript/livescript.js       |  3 +++
 mode/lua/lua.js                     |  3 +++
 mode/markdown/markdown.js           |  3 +++
 mode/markdown/test.js               |  3 +++
 mode/meta.js                        |  3 +++
 mode/mirc/mirc.js                   |  3 +++
 mode/mllike/mllike.js               |  3 +++
 mode/nginx/nginx.js                 |  3 +++
 mode/ntriples/ntriples.js           |  3 +++
 mode/octave/octave.js               |  3 +++
 mode/pascal/pascal.js               |  3 +++
 mode/pegjs/pegjs.js                 |  3 +++
 mode/perl/perl.js                   |  3 +++
 mode/php/php.js                     |  3 +++
 mode/php/test.js                    |  3 +++
 mode/pig/pig.js                     |  3 +++
 mode/properties/properties.js       |  3 +++
 mode/puppet/puppet.js               |  3 +++
 mode/python/python.js               |  3 +++
 mode/q/q.js                         |  3 +++
 mode/r/r.js                         |  3 +++
 mode/rpm/rpm.js                     |  3 +++
 mode/rst/rst.js                     |  3 +++
 mode/ruby/ruby.js                   |  3 +++
 mode/ruby/test.js                   |  3 +++
 mode/rust/rust.js                   |  3 +++
 mode/sass/sass.js                   |  3 +++
 mode/scheme/scheme.js               |  3 +++
 mode/shell/shell.js                 |  3 +++
 mode/shell/test.js                  |  3 +++
 mode/sieve/sieve.js                 |  3 +++
 mode/smalltalk/smalltalk.js         |  3 +++
 mode/smarty/smarty.js               |  3 +++
 mode/smartymixed/smartymixed.js     |  3 +++
 mode/solr/solr.js                   |  3 +++
 mode/sparql/sparql.js               |  3 +++
 mode/sql/sql.js                     |  3 +++
 mode/stex/stex.js                   |  3 +++
 mode/stex/test.js                   |  3 +++
 mode/tcl/tcl.js                     |  3 +++
 mode/tiddlywiki/tiddlywiki.js       |  3 +++
 mode/tiki/tiki.js                   |  3 +++
 mode/toml/toml.js                   |  3 +++
 mode/turtle/turtle.js               |  3 +++
 mode/vb/vb.js                       |  3 +++
 mode/vbscript/vbscript.js           |  3 +++
 mode/velocity/velocity.js           |  3 +++
 mode/verilog/test.js                |  3 +++
 mode/verilog/verilog.js             |  3 +++
 mode/xml/test.js                    |  3 +++
 mode/xml/xml.js                     |  3 +++
 mode/xquery/test.js                 |  3 +++
 mode/xquery/xquery.js               |  3 +++
 mode/yaml/yaml.js                   |  3 +++
 mode/z80/z80.js                     |  3 +++
 test/lint/lint.js                   |  7 ++++++-
 151 files changed, 468 insertions(+), 1 deletion(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 1eb9a05c5d..f56721206e 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 42277267f5..5247a845c4 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 586b7370dc..8fbdea168d 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Open simple dialogs on top of an editor. Relies on dialog.css.
 
 (function(mod) {
diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
index e39c6e162f..e7f22a7936 100644
--- a/addon/display/fullscreen.js
+++ b/addon/display/fullscreen.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 0fdc9b0d5b..fbc0a8bdf0 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index 42cc2b9a90..e025415b51 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 3cea887d1d..4caac60b98 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index c7c0701ba5..d64045ab1b 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Tag-closer extension for CodeMirror.
  *
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 2946aa6a24..3dcf757397 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index dcdde81dfe..c1221ca4c0 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index 76a7b87c9a..a91d578365 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../fold/xml-fold"));
diff --git a/addon/edit/trailingspace.js b/addon/edit/trailingspace.js
index ec07221e30..e12162d33c 100644
--- a/addon/edit/trailingspace.js
+++ b/addon/edit/trailingspace.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index f0ee62029a..a0161e2c19 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index d72c5479a7..593539affd 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 81094e2543..51cc3939b3 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 9caba59aad..04ce8493e8 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("./foldcode"));
diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index d0130836a2..126ed4953c 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/fold/markdown-fold.js b/addon/fold/markdown-fold.js
index 3bbf5b6077..ecee9e7e27 100644
--- a/addon/fold/markdown-fold.js
+++ b/addon/fold/markdown-fold.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index d554e2fc42..e1fd5756d8 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index 3ef979b524..0b6d872f3d 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 96d9d52e1b..a93458819c 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../../mode/css/css"));
diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index cbe7c61ad4..cfdcff9de2 100755
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index baf20b45dc..29f3960902 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/hint/python-hint.js b/addon/hint/python-hint.js
index eebfcc76dc..49dfb08f3a 100644
--- a/addon/hint/python-hint.js
+++ b/addon/hint/python-hint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 46b55648cb..4bede1fb03 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index a48d2b3cea..e527a878b9 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../../mode/sql/sql"));
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 9cfd1e884f..de9f79eb3b 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
index 6df17f8f84..2cc6314f06 100644
--- a/addon/lint/coffeescript-lint.js
+++ b/addon/lint/coffeescript-lint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
 
 // declare global: coffeelint
diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index de9cd20d7a..93f2e5f5d8 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Depends on csslint.js from https://github.com/stubbornella/csslint
 
 // declare global: CSSLint
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index 86c863a4a2..ed62dd989c 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index 1f5f82d0ca..b548a8e439 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Depends on jsonlint.js from https://github.com/zaach/jsonlint
 
 // declare global: jsonlint
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 393a689036..1682acf6ea 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/lint/yaml-lint.js b/addon/lint/yaml-lint.js
index b53673af4b..3ada0eaf9f 100644
--- a/addon/lint/yaml-lint.js
+++ b/addon/lint/yaml-lint.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index fe3fcf4282..61e25e5d36 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/mode/loadmode.js b/addon/mode/loadmode.js
index e08c281321..e49421b8fc 100644
--- a/addon/mode/loadmode.js
+++ b/addon/mode/loadmode.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 07385c35f2..40601f4dfa 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/mode/multiplex_test.js b/addon/mode/multiplex_test.js
index c0656357c7..a10012ce8c 100644
--- a/addon/mode/multiplex_test.js
+++ b/addon/mode/multiplex_test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   CodeMirror.defineMode("markdown_with_stex", function(){
     var inner = CodeMirror.getMode({}, "stex");
diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index e32fa830b3..82f754c461 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Utility function that allows modes to be combined. The mode given
 // as the base argument takes care of most of the normal mode
 // functionality, but a second (typically simple) mode is used, which
diff --git a/addon/runmode/colorize.js b/addon/runmode/colorize.js
index 0f9530b17b..eb99f29945 100644
--- a/addon/runmode/colorize.js
+++ b/addon/runmode/colorize.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("./runmode"));
diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index e36e00fbc6..3e1e746e95 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 window.CodeMirror = {};
 
 (function() {
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 5592a99a60..5406ff72fd 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 15bf392313..f8c467f381 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /* Just enough of CodeMirror to run runMode under node.js */
 
 // declare global: StringStream
diff --git a/addon/scroll/scrollpastend.js b/addon/scroll/scrollpastend.js
index 467b7aa1cf..e9f4ecb68a 100644
--- a/addon/scroll/scrollpastend.js
+++ b/addon/scroll/scrollpastend.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 83ab8c33c7..0dc28c10ba 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Highlighting text that matches the selection
 //
 // Defines an option highlightSelectionMatches, which, when enabled,
diff --git a/addon/search/search.js b/addon/search/search.js
index 7a1db6ee09..7bc3414c7b 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Define search commands. Depends on dialog.js or another
 // implementation of the openDialog method.
 
diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 899f44c4ab..f6df00a94e 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index a818f109b6..bafcb6b8c3 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Because sometimes you need to style the cursor's line.
 //
 // Adds an option 'styleActiveLine' which, when enabled, gives the
diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index ae0d393143..f621c0704a 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Because sometimes you need to mark the selected *text*.
 //
 // Adds an option 'styleSelectedText' which, when enabled, gives
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 2f450ed024..318f1484d9 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Glue code between CodeMirror and Tern.
 //
 // Create a CodeMirror.TernServer to wrap an actual Tern server,
diff --git a/addon/tern/worker.js b/addon/tern/worker.js
index 1ff63de411..615ce61e6a 100644
--- a/addon/tern/worker.js
+++ b/addon/tern/worker.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // declare global: tern, server
 
 var server;
diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 87aab1b8f6..fb0b5f2fcf 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/bin/release b/bin/release
index 3c33290f3f..91451faae5 100755
--- a/bin/release
+++ b/bin/release
@@ -27,6 +27,21 @@ rewrite("doc/manual.html", function(manual) {
   return manual.replace(/>version \d+\.\d+\.\d+<\/span>/, ">version " + number + "</span>");
 });
 
+function walkDir(dir) {
+  fs.readdirSync(dir).forEach(function(file) {
+    var fname = dir + "/" + file;
+    if (/\.js$/.test(file)) rewrite(file, function(script) {
+      return script.replace(/^\/\/ CodeMirror \d+\.\d+\.\d+, copyright/,
+                            "// CodeMirror " + number + ", copyright");
+    });
+    else if (fs.lstatSync(fname).isDirectory()) walkDir(fname);
+  });
+}
+walkDir("mode");
+walkDir("lib");
+walkDir("addon");
+walkDir("keymap");
+
 if (bumpOnly) process.exit(0);
 
 child.exec("bash bin/authors.sh", function(){});
diff --git a/keymap/emacs.js b/keymap/emacs.js
index 7cecf1f627..b1b70254d8 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/keymap/sublime.js b/keymap/sublime.js
index 9158e27944..0681fa3e2b 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // A rough approximation of Sublime Text's keybindings
 // Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
 
diff --git a/keymap/vim.js b/keymap/vim.js
index e33d269089..9dce29e253 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Supported keybindings:
  *
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0bf6f2d8e8..50bccb38a9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // This is CodeMirror (http://codemirror.net), a code editor
 // implemented in JavaScript on top of the browser's DOM.
 //
diff --git a/mode/apl/apl.js b/mode/apl/apl.js
index 2ba74c18c2..0a318dad61 100644
--- a/mode/apl/apl.js
+++ b/mode/apl/apl.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index c56fc0b38a..f34471d4eb 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /*
  * =====================================================================================
  *
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 60b88bf1aa..a114344f87 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 3b596ad607..f8e8879d42 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Author: Hans Engel
  * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
diff --git a/mode/cobol/cobol.js b/mode/cobol/cobol.js
index e66e42a191..231218509a 100644
--- a/mode/cobol/cobol.js
+++ b/mode/cobol/cobol.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Author: Gautam Mehta
  * Branched from CodeMirror's Scheme mode
diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index c6da8f2a29..5350f6099c 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Link to the project's GitHub page:
  * https://github.com/pickhardt/coffeescript-codemirror-mode
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index a0f0732bf6..ffb3c96493 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/css/css.js b/mode/css/css.js
index 8828329fc4..6b49e473f0 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/css/less_test.js b/mode/css/less_test.js
index ea64f91d12..a569e107dd 100644
--- a/mode/css/less_test.js
+++ b/mode/css/less_test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   "use strict";
 
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index c51cb42bba..85077532dc 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
diff --git a/mode/css/test.js b/mode/css/test.js
index f9f667295c..85f597b570 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "css");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index f102c9ec1a..902430c2b0 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // By the Neo4j Team and contributors.
 // https://github.com/neo4j-contrib/CodeMirror
 
diff --git a/mode/d/d.js b/mode/d/d.js
index 3ab8b42838..cb9a674cec 100644
--- a/mode/d/d.js
+++ b/mode/d/d.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/diff/diff.js b/mode/diff/diff.js
index d43f15d51a..ad62f2fcef 100644
--- a/mode/diff/diff.js
+++ b/mode/diff/diff.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/django/django.js b/mode/django/django.js
index 38de7d5ee3..3fe57cdea3 100644
--- a/mode/django/django.js
+++ b/mode/django/django.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../htmlmixed/htmlmixed"),
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index b4a6cb3155..7c3b6a1cab 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /*
   DTD mode
   Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index ccf9679181..b4526f6fad 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/ecl/ecl.js b/mode/ecl/ecl.js
index 2b841ff5f1..18d60899e0 100644
--- a/mode/ecl/ecl.js
+++ b/mode/ecl/ecl.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/eiffel/eiffel.js b/mode/eiffel/eiffel.js
index c6c3c84600..52c54e7863 100644
--- a/mode/eiffel/eiffel.js
+++ b/mode/eiffel/eiffel.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index 3d4b1ba92e..7e2a1d4ad3 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /*jshint unused:true, eqnull:true, curly:true, bitwise:true */
 /*jshint undef:true, latedef:true, trailing:true */
 /*global CodeMirror:true */
diff --git a/mode/fortran/fortran.js b/mode/fortran/fortran.js
index 58dac127c1..66b9c9ad70 100644
--- a/mode/fortran/fortran.js
+++ b/mode/fortran/fortran.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index ba5f195a11..6bf66b6f49 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 5a028c48b4..5de044807d 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../markdown/markdown"), require("../../addon/mode/overlay"));
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index d06a219240..f3d72bfadf 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, "gfm");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index 41003641ec..c94efcb6aa 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /*
 Gherkin mode - http://www.cukes.info/
 Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
diff --git a/mode/go/go.js b/mode/go/go.js
index 82463052f6..46e13b6c54 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 399452d536..4a867d8337 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 59a86e7cec..1ab5001fc2 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../htmlmixed/htmlmixed"), require("../ruby/ruby"));
diff --git a/mode/haml/test.js b/mode/haml/test.js
index 75d0e7710f..0a8fc55696 100644
--- a/mode/haml/test.js
+++ b/mode/haml/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "haml");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index 2876172a95..4d923568d0 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index ffde5991ad..487a88ddf3 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index 3a07c3432e..7b3b9be725 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../htmlmixed/htmlmixed"));
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index d80ef9c64c..1dacbe8098 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../xml/xml"), require("../javascript/javascript"), require("../css/css"));
diff --git a/mode/http/http.js b/mode/http/http.js
index d2ad5994b6..bd0cb574d3 100644
--- a/mode/http/http.js
+++ b/mode/http/http.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index 64d4d2f4be..b7c99b083d 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../javascript/javascript"), require("../css/css"), require("../htmlmixed/htmlmixed"));
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index e719089349..71e8a09c6f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // TODO actually recognize syntax of TypeScript constructs
 
 (function(mod) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 782f0457f9..4411a98452 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index 4b535e5322..e80c772929 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index d37ab503ed..79b47fb3ef 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index 1efc3ecf66..8e822bd6d3 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Link to the project's GitHub page:
  * https://github.com/duralog/CodeMirror
diff --git a/mode/lua/lua.js b/mode/lua/lua.js
index 3673557c27..6121b86b38 100644
--- a/mode/lua/lua.js
+++ b/mode/lua/lua.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's
 // CodeMirror 1 mode.
 // highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 84ea4d46b9..81472f02f7 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../xml/xml")));
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 4d1d70ad14..ba1b15fc82 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, "markdown");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/meta.js b/mode/meta.js
index 5fc51ebeec..5cccf7e9ab 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/mirc/mirc.js b/mode/mirc/mirc.js
index 6b2a23a16c..321830baf7 100644
--- a/mode/mirc/mirc.js
+++ b/mode/mirc/mirc.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 //mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
 
 (function(mod) {
diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index d4d59fceb7..18771467a8 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/nginx/nginx.js b/mode/nginx/nginx.js
index 4e17cdb3c4..22c266384d 100644
--- a/mode/nginx/nginx.js
+++ b/mode/nginx/nginx.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/ntriples/ntriples.js b/mode/ntriples/ntriples.js
index cd5eb24f07..1f9ba451cb 100644
--- a/mode/ntriples/ntriples.js
+++ b/mode/ntriples/ntriples.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**********************************************************
 * This script provides syntax highlighting support for
 * the Ntriples format.
diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index 16fe4dfd78..e5a50bce3b 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index 642dd9bf79..652addd2c2 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index f74f2a4f22..725579d5a0 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../javascript/javascript"));
diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 0126d3ea36..9b02783a1d 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
 // This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
 
diff --git a/mode/php/php.js b/mode/php/php.js
index 81591e4d65..4185804791 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../htmlmixed/htmlmixed"), require("../clike/clike"));
diff --git a/mode/php/test.js b/mode/php/test.js
index db68d75de3..2d901cf08d 100644
--- a/mode/php/test.js
+++ b/mode/php/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "php");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/pig/pig.js b/mode/pig/pig.js
index 64ac506a79..52ad349c41 100644
--- a/mode/pig/pig.js
+++ b/mode/pig/pig.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /*
  *      Pig Latin Mode for CodeMirror 2
  *      @author Prasanth Jayachandran
diff --git a/mode/properties/properties.js b/mode/properties/properties.js
index 6dfe06f128..b91191a7b5 100644
--- a/mode/properties/properties.js
+++ b/mode/properties/properties.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/puppet/puppet.js b/mode/puppet/puppet.js
index da8823e5ed..bba431eb3d 100644
--- a/mode/puppet/puppet.js
+++ b/mode/puppet/puppet.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/python/python.js b/mode/python/python.js
index 4fc4354ff7..1fb32a7c16 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/q/q.js b/mode/q/q.js
index d6e3b66610..ff788d9d52 100644
--- a/mode/q/q.js
+++ b/mode/q/q.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/r/r.js b/mode/r/r.js
index 281d7fa40f..d04eca3899 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/rpm/rpm.js b/mode/rpm/rpm.js
index 497997c4ff..bad1b3e024 100644
--- a/mode/rpm/rpm.js
+++ b/mode/rpm/rpm.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 0763d4b999..11c3678428 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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("../python/python"), require("../stex/stex"), require("../../addon/mode/overlay"));
diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 4ef08b1552..8ffd2d7e8a 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/ruby/test.js b/mode/ruby/test.js
index c97d106686..1a6067d027 100644
--- a/mode/ruby/test.js
+++ b/mode/ruby/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "ruby");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index 2e6e20b231..e7abed3520 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 74ae91db12..8cdb1365f9 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 7124f7283b..97979057ef 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Author: Koh Zi Han, based on implementation by Koh Zi Chun
  */
diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 5abb44711f..c1893a4dd1 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/shell/test.js b/mode/shell/test.js
index 3ab045c087..8bdb82103d 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({}, "shell");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/sieve/sieve.js b/mode/sieve/sieve.js
index 8256dda0a4..d74c839e01 100644
--- a/mode/sieve/sieve.js
+++ b/mode/sieve/sieve.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index deb78a4f7a..42fdc67830 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 2a78c6d394..8c4bd13b61 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Smarty 2 and 3 mode.
  */
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
index 7e5e12c0ec..3be014b872 100644
--- a/mode/smartymixed/smartymixed.js
+++ b/mode/smartymixed/smartymixed.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
 * @file smartymixed.js
 * @brief Smarty Mixed Codemirror mode (Smarty + Mixed HTML)
diff --git a/mode/solr/solr.js b/mode/solr/solr.js
index 25d928ec1b..ed7eff6eb6 100644
--- a/mode/solr/solr.js
+++ b/mode/solr/solr.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index f228b1dffe..f4453e6864 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 417db06282..59510ffa08 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 59a395a0fe..b5ef7898f3 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /*
  * Author: Constantin Jucovschi (c.jucovschi@jacobs-university.de)
  * Licence: MIT
diff --git a/mode/stex/test.js b/mode/stex/test.js
index ab629e81ea..6eaf0f6881 100644
--- a/mode/stex/test.js
+++ b/mode/stex/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, "stex");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index 4c29ee7d98..49c555b108 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 //tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
 
 (function(mod) {
diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index ecd1d173c0..31dff8cb93 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /***
     |''Name''|tiddlywiki.js|
     |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror|
diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index eb9a893fde..02c2f1b74b 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/toml/toml.js b/mode/toml/toml.js
index 2c722b3752..593807a900 100644
--- a/mode/toml/toml.js
+++ b/mode/toml/toml.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/turtle/turtle.js b/mode/turtle/turtle.js
index de9fc2b6c7..b2c7023c16 100644
--- a/mode/turtle/turtle.js
+++ b/mode/turtle/turtle.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 4fd80210fb..6fa42d97eb 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/vbscript/vbscript.js b/mode/vbscript/vbscript.js
index 4be7c7f2bb..9293c0af34 100644
--- a/mode/vbscript/vbscript.js
+++ b/mode/vbscript/vbscript.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /*
 For extra ASP classic objects, initialize CodeMirror instance with this option:
     isASP: true
diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index b64636bb43..fd0292920b 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/verilog/test.js b/mode/verilog/test.js
index 6f5770b848..42d4f618cf 100644
--- a/mode/verilog/test.js
+++ b/mode/verilog/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4}, "verilog");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index d52ecea2a3..c575ac5f51 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/xml/test.js b/mode/xml/test.js
index 1b9d9d1760..122e1675ce 100644
--- a/mode/xml/test.js
+++ b/mode/xml/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "xml"), mname = "xml";
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), mname); }
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 3248c454d1..946757fc57 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/xquery/test.js b/mode/xquery/test.js
index 41719dd169..511a879d90 100644
--- a/mode/xquery/test.js
+++ b/mode/xquery/test.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Don't take these too seriously -- the expected results appear to be
 // based on the results of actual runs without any serious manual
 // verification. If a change you made causes them to fail, the test is
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index 2c7faf425a..0426bf66a5 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index f7b3a90c03..41679f1eea 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/mode/z80/z80.js b/mode/z80/z80.js
index c778803072..d441e383ac 100644
--- a/mode/z80/z80.js
+++ b/mode/z80/z80.js
@@ -1,3 +1,6 @@
+// CodeMirror 4.1.1, 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"));
diff --git a/test/lint/lint.js b/test/lint/lint.js
index a65deb60be..ba8900f7d7 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -31,6 +31,8 @@ var scopePasser = walk.make({
   ScopeBody: function(node, prev, c) { c(node, node.scope); }
 });
 
+var cBlob = /^\/\/ CodeMirror \d+\.\d+\.\d+, copyright \(c\) by Marijn Haverbeke and others\n\/\/ Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n/;
+
 function checkFile(fileName) {
   var file = fs.readFileSync(fileName, "utf8"), notAllowed;
   if (notAllowed = file.match(/[\x00-\x08\x0b\x0c\x0e-\x19\uFEFF\t]|[ \t]\n/)) {
@@ -41,6 +43,9 @@ function checkFile(fileName) {
     var info = acorn.getLineInfo(file, notAllowed.index);
     fail(msg + " at line " + info.line + ", column " + info.column, {source: fileName});
   }
+
+  if (!cBlob.test(file))
+    fail("Missing license blob", {source: fileName});
   
   var globalsSeen = Object.create(null);
 
@@ -152,7 +157,7 @@ function checkDir(dir) {
   fs.readdirSync(dir).forEach(function(file) {
     var fname = dir + "/" + file;
     if (/\.js$/.test(file)) checkFile(fname);
-    else if (file != "dep" && fs.lstatSync(fname).isDirectory()) checkDir(fname);
+    else if (fs.lstatSync(fname).isDirectory()) checkDir(fname);
   });
 }
 

From 01fb28518dd76a7848606669020bc1b85a81c899 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 May 2014 15:56:59 +0200
Subject: [PATCH 1312/4742] Fix bug in release script

---
 bin/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/release b/bin/release
index 91451faae5..c26d290f94 100755
--- a/bin/release
+++ b/bin/release
@@ -30,7 +30,7 @@ rewrite("doc/manual.html", function(manual) {
 function walkDir(dir) {
   fs.readdirSync(dir).forEach(function(file) {
     var fname = dir + "/" + file;
-    if (/\.js$/.test(file)) rewrite(file, function(script) {
+    if (/\.js$/.test(file)) rewrite(fname, function(script) {
       return script.replace(/^\/\/ CodeMirror \d+\.\d+\.\d+, copyright/,
                             "// CodeMirror " + number + ", copyright");
     });

From a5b79b5c30fd8694fcb1fdaafeb70ab0bd335ca9 Mon Sep 17 00:00:00 2001
From: as3boyan <denis.flash.as3@gmail.com>
Date: Sat, 10 May 2014 22:00:23 +0300
Subject: [PATCH 1313/4742] [show-hint addon] Fix a typo

---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 4bede1fb03..59322749ce 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -379,7 +379,7 @@
     alignWithWord: true,
     closeCharacters: /[\s()\[\]{};:>,]/,
     closeOnUnfocus: true,
-    completeOnSignleClick: false,
+    completeOnSingleClick: false,
     container: null,
     customKeys: null,
     extraKeys: null

From a0edb5ba6f5d6ccb289ab6ab2ef2b6b4ad98762b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 12 May 2014 09:20:28 +0200
Subject: [PATCH 1314/4742] Don't mess up the display when updateDisplay is
 given a negative top offset

Issue #2554
---
 lib/codemirror.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 50bccb38a9..ddb2514618 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -463,7 +463,7 @@
   // the the current scroll position). viewPort may contain top,
   // height, and ensure (see op.scrollToPos) properties.
   function visibleLines(display, doc, viewPort) {
-    var top = viewPort && viewPort.top != null ? viewPort.top : display.scroller.scrollTop;
+    var top = viewPort && viewPort.top != null ? Math.max(0, viewPort.top) : display.scroller.scrollTop;
     top = Math.floor(top - paddingTop(display));
     var bottom = viewPort && viewPort.bottom != null ? viewPort.bottom : top + display.wrapper.clientHeight;
 
@@ -667,7 +667,6 @@
     cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight - scrollerCutOff) + "px";
   }
 
-
   function checkForWebkitWidthBug(cm, measure) {
     // Work around Webkit bug where it sometimes reserves space for a
     // non-existing phantom scrollbar in the scroller (Issue #2420)

From bb0725b52fd9a1bcf19c623e0fb19f43ace40522 Mon Sep 17 00:00:00 2001
From: Bem Jones-Bey <bjonesbe@adobe.com>
Date: Fri, 9 May 2014 10:28:00 -0700
Subject: [PATCH 1315/4742] [css mode] Add object-fit and object-position
 properties

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 6b49e473f0..e5ed6ad5f5 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -425,7 +425,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "marker-offset", "marks", "marquee-direction", "marquee-loop",
     "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
     "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
-    "nav-left", "nav-right", "nav-up", "opacity", "order", "orphans", "outline",
+    "nav-left", "nav-right", "nav-up", "object-fit", "object-position",
+    "opacity", "order", "orphans", "outline",
     "outline-color", "outline-offset", "outline-style", "outline-width",
     "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
     "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",

From 33eb40146574312f7de39c697af3b18c86d0d902 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 12 May 2014 10:07:27 +0200
Subject: [PATCH 1316/4742] [css mode] Better handling of parentheses in
 property values

Issue #2551
---
 mode/css/css.js  | 15 +++++----------
 mode/css/test.js | 10 ++++++++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index e5ed6ad5f5..00d3785bcf 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -167,7 +167,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     } else if (type == ":") {
       return "pseudo";
     } else if (allowNested && type == "(") {
-      return pushContext(state, stream, "params");
+      return pushContext(state, stream, "parens");
     }
     return state.context.type;
   };
@@ -228,6 +228,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   states.parens = function(type, stream, state) {
     if (type == "{" || type == "}") return popAndPass(type, stream, state);
     if (type == ")") return popContext(state);
+    if (type == "(") return pushContext(state, stream, "parens");
+    if (type == "word") wordAsValue(stream);
     return "parens";
   };
 
@@ -303,13 +305,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return "interpolation";
   };
 
-  states.params = function(type, stream, state) {
-    if (type == ")") return popContext(state);
-    if (type == "{" || type == "}") return popAndPass(type, stream, state);
-    if (type == "word") wordAsValue(stream);
-    return "params";
-  };
-
   return {
     startState: function(base) {
       return {tokenize: null,
@@ -332,10 +327,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     indent: function(state, textAfter) {
       var cx = state.context, ch = textAfter && textAfter.charAt(0);
       var indent = cx.indent;
-      if (cx.type == "prop" && ch == "}") cx = cx.prev;
+      if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
       if (cx.prev &&
           (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "font_face") ||
-           ch == ")" && (cx.type == "parens" || cx.type == "params" || cx.type == "media_parens") ||
+           ch == ")" && (cx.type == "parens" || cx.type == "media_parens") ||
            ch == "{" && (cx.type == "at" || cx.type == "media"))) {
         indent = cx.indent - indentUnit;
         cx = cx.prev;
diff --git a/mode/css/test.js b/mode/css/test.js
index 85f597b570..1a75e08ea4 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -122,4 +122,14 @@
 
   MT("empty_url",
      "[def @import] [tag url]() [tag screen];");
+
+  MT("parens",
+     "[qualifier .foo] {",
+     "  [property background-image]: [variable fade]([atom #000], [number 20%]);",
+     "  [property border-image]: [variable linear-gradient](",
+     "    [atom to] [atom bottom],",
+     "    [variable fade]([atom #000], [number 20%]) [number 0%],",
+     "    [variable fade]([atom #000], [number 20%]) [number 100%]",
+     "  );",
+     "}");
 })();

From 687fb51f4a6547942b08efee81e8b84393d99a5b Mon Sep 17 00:00:00 2001
From: daines <daines@email.unc.edu>
Date: Mon, 12 May 2014 09:24:07 -0400
Subject: [PATCH 1317/4742] Fix typo in manual

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

diff --git a/doc/manual.html b/doc/manual.html
index 59c81f3456..d78797dadd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2328,7 +2328,7 @@ <h2>Addons</h2>
       of the token that is being completed as <code>{line, ch}</code>
       objects.</dd>
       <dd>If no hinting function is given, the addon will
-      use <code>CodeMirror.hint.auto</code>, with
+      use <code>CodeMirror.hint.auto</code>, which
       calls <a href="#getHelpers"><code>getHelpers</code></a> with
       the <code>"hint"</code> type to find applicable hinting
       functions, and tries them one by one. If that fails, it looks

From 87df1c6e7f2a07c42689c6afba4b7192445196c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 May 2014 11:20:30 +0200
Subject: [PATCH 1318/4742] [closetag addon] Improve heuristic for seeing if
 closing tag already exists

Issue #2557
---
 addon/edit/closetag.js | 28 +++++++++++++++++++++++++---
 addon/fold/xml-fold.js |  2 +-
 mode/xml/xml.js        |  2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index d64045ab1b..db31b0eb02 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -58,6 +58,7 @@
       var pos = ranges[i].head, tok = cm.getTokenAt(pos);
       var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
       if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
+
       var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
       var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
       var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
@@ -71,8 +72,7 @@
           tok.type == "tag" && state.type == "closeTag" ||
           tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
           dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
-          CodeMirror.scanForClosingTag && CodeMirror.scanForClosingTag(cm, pos, tagName,
-                                                                       Math.min(cm.lastLine() + 1, pos.line + 50)))
+          closingTagExists(cm, tagName, pos, state, true))
         return CodeMirror.Pass;
 
       var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
@@ -103,7 +103,8 @@
       var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
       if (tok.type == "string" || tok.string.charAt(0) != "<" ||
           tok.start != pos.ch - 1 || inner.mode.name != "xml" ||
-          !state.context || !state.context.tagName)
+          !state.context || !state.context.tagName ||
+          closingTagExists(cm, state.context.tagName, pos, state))
         return CodeMirror.Pass;
       replacements[i] = "/" + state.context.tagName + ">";
     }
@@ -116,4 +117,25 @@
       if (collection[i] == elt) return i;
     return -1;
   }
+
+  // If xml-fold is loaded, we use its functionality to try and verify
+  // whether a given tag is actually unclosed.
+  function closingTagExists(cm, tagName, pos, state, newTag) {
+    if (!CodeMirror.scanForClosingTag) return false;
+    var end = Math.min(cm.lastLine() + 1, pos.line + 500);
+    var nextClose = CodeMirror.scanForClosingTag(cm, pos, null, end);
+    if (!nextClose || nextClose.tag != tagName) return false;
+    var cx = state.context;
+    // If the immediate wrapping context contains onCx instances of
+    // the same tag, a closing tag only exists if there are at least
+    // that many closing tags of that type following.
+    for (var onCx = newTag ? 1 : 0; cx && cx.tagName == tagName; cx = cx.prev) ++onCx;
+    pos = nextClose.to;
+    for (var i = 1; i < onCx; i++) {
+      var next = CodeMirror.scanForClosingTag(cm, pos, null, end);
+      if (!next || next.tag != tagName) return false;
+      pos = next.to;
+    }
+    return true;
+  }
 });
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index e1fd5756d8..33d6e07b53 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -176,6 +176,6 @@
   // Used by addon/edit/closetag.js
   CodeMirror.scanForClosingTag = function(cm, pos, name, end) {
     var iter = new Iter(cm, pos.line, pos.ch, end ? {from: 0, to: end} : null);
-    return !!findMatchingClose(iter, name);
+    return findMatchingClose(iter, name);
   };
 });
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 946757fc57..9a84b632aa 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -124,7 +124,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       state.state = baseState;
       state.tagName = state.tagStart = null;
       var next = state.tokenize(stream, state);
-      return next ? next + " error" : "error";
+      return next ? next + " tag error" : "tag error";
     } else if (/[\'\"]/.test(ch)) {
       state.tokenize = inAttribute(ch);
       state.stringStartCol = stream.column();

From 5b5c813680f3f69affc472942e3000c1b714e0db Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 May 2014 11:32:21 +0200
Subject: [PATCH 1319/4742] Make ctrl-drag copy text

Issue #2556
---
 lib/codemirror.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ddb2514618..ba39b4e9a3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2574,17 +2574,17 @@
       lastClick = {time: now, pos: start};
     }
 
-    var sel = cm.doc.sel, addNew = mac ? e.metaKey : e.ctrlKey;
-    if (cm.options.dragDrop && dragAndDrop && !addNew && !isReadOnly(cm) &&
+    var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey;
+    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
         type == "single" && sel.contains(start) > -1 && sel.somethingSelected())
-      leftButtonStartDrag(cm, e, start);
+      leftButtonStartDrag(cm, e, start, modifier);
     else
-      leftButtonSelect(cm, e, start, type, addNew);
+      leftButtonSelect(cm, e, start, type, modifier);
   }
 
   // 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) {
+  function leftButtonStartDrag(cm, e, start, modifier) {
     var display = cm.display;
     var dragEnd = operation(cm, function(e2) {
       if (webkit) display.scroller.draggable = false;
@@ -2593,7 +2593,8 @@
       off(display.scroller, "drop", dragEnd);
       if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
         e_preventDefault(e2);
-        extendSelection(cm.doc, start);
+        if (!modifier)
+          extendSelection(cm.doc, start);
         focusInput(cm);
         // Work around unexplainable focus problem in IE9 (#2127)
         if (ie_upto10 && !ie_upto8)
@@ -2817,7 +2818,8 @@
       try {
         var text = e.dataTransfer.getData("Text");
         if (text) {
-          var selected = cm.state.draggingText && cm.listSelections();
+          if (cm.state.draggingText && !(mac ? e.metaKey : e.ctrlKey))
+            var selected = cm.listSelections();
           setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
           if (selected) for (var i = 0; i < selected.length; ++i)
             replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");

From e6eed2510342b43bdc869f860385a49f8e4061a0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 May 2014 11:53:02 +0200
Subject: [PATCH 1320/4742] Ensure a viewport always contains a single line

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ba39b4e9a3..371c37651f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -479,7 +479,7 @@
         return {from: lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight),
                 to: ensureTo};
     }
-    return {from: from, to: to};
+    return {from: from, to: Math.max(to, from + 1)};
   }
 
   // LINE NUMBERS

From 02725ae5464565178884059639e791ca42aee266 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 May 2014 13:18:48 +0200
Subject: [PATCH 1321/4742] [tern addon] Improve alignment of completion docs

---
 addon/tern/tern.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/tern/tern.css b/addon/tern/tern.css
index eacc2f053a..76fba33d4a 100644
--- a/addon/tern/tern.css
+++ b/addon/tern/tern.css
@@ -76,6 +76,7 @@
 
 .CodeMirror-Tern-hint-doc {
   max-width: 25em;
+  margin-top: -3px;
 }
 
 .CodeMirror-Tern-fname { color: black; }

From 9556bdd640d17ffccaa40d80939cfbce0e36b160 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 May 2014 13:34:43 +0200
Subject: [PATCH 1322/4742] [tern addon] Remove unnecessary error check

---
 addon/tern/tern.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 318f1484d9..3508f18130 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -432,7 +432,7 @@
 
   function rename(ts, cm) {
     var token = cm.getTokenAt(cm.getCursor());
-    if (!/\w/.test(token.string)) showError(ts, cm, "Not at a variable");
+    if (!/\w/.test(token.string)) return showError(ts, cm, "Not at a variable");
     dialog(cm, "New name for " + token.string, function(newName) {
       ts.request(cm, {type: "rename", newName: newName, fullDocs: true}, function(error, data) {
         if (error) return showError(ts, cm, error);
@@ -443,7 +443,6 @@
 
   function selectName(ts, cm) {
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    if (!/\w/.test(token.string)) showError(ts, cm, "Not at a variable");
     var name = findDoc(ts, cm.doc).name;
     ts.request(cm, {type: "refs"}, function(error, data) {
       if (error) return showError(ts, cm, error);

From 09c8a0b09afe6eab99ea297a2d2bc1c737546b80 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 May 2014 13:41:49 +0200
Subject: [PATCH 1323/4742] [tern addon] Lint fix

---
 addon/tern/tern.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 3508f18130..9bae94b27e 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -442,7 +442,6 @@
   }
 
   function selectName(ts, cm) {
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
     var name = findDoc(ts, cm.doc).name;
     ts.request(cm, {type: "refs"}, function(error, data) {
       if (error) return showError(ts, cm, error);

From 714954d744e74626b38a87834c7e46a589133f01 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 15 May 2014 12:34:58 +0200
Subject: [PATCH 1324/4742] [tern addon] Allow hiding and deleting docs by
 identity, not just name

---
 addon/tern/tern.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 9bae94b27e..27d6421512 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -17,7 +17,7 @@
 //   indicate that a file is not available.
 // * fileFilter: A function(value, docName, doc) that will be applied
 //   to documents before passing them on to Tern.
-// * switchToDoc: A function(name) that should, when providing a
+// * switchToDoc: A function(name, doc) that should, when providing a
 //   multi-file view, switch the view or focus to the named file.
 // * showError: A function(editor, message) that can be used to
 //   override the way errors are displayed.
@@ -88,17 +88,17 @@
       return this.docs[name] = data;
     },
 
-    delDoc: function(name) {
-      var found = this.docs[name];
+    delDoc: function(id) {
+      var found = resolveDoc(this, id);
       if (!found) return;
       CodeMirror.off(found.doc, "change", this.trackChange);
-      delete this.docs[name];
-      this.server.delFile(name);
+      delete this.docs[found.name];
+      this.server.delFile(found.name);
     },
 
-    hideDoc: function(name) {
+    hideDoc: function(id) {
       closeArgHints(this);
-      var found = this.docs[name];
+      var found = resolveDoc(this, id);
       if (found && found.changed) sendDoc(this, found);
     },
 
@@ -157,6 +157,12 @@
     return ts.addDoc(name, doc);
   }
 
+  function resolveDoc(ts, id) {
+    if (typeof id == "string") return ts.docs[id];
+    if (id instanceof CodeMirror) id = id.getDoc();
+    if (id instanceof CodeMirror.Doc) return findDoc(ts, id);
+  }
+
   function trackChange(ts, doc, change) {
     var data = findDoc(ts, doc);
 
@@ -387,7 +393,7 @@
     doc.doc.setSelection(end, start);
     if (curDoc != doc && ts.options.switchToDoc) {
       closeArgHints(ts);
-      ts.options.switchToDoc(doc.name);
+      ts.options.switchToDoc(doc.name, doc.doc);
     }
   }
 

From c6e7cd1bd76cb42fe67199cd643d2b17cc3d0372 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Fri, 9 May 2014 20:42:08 +0200
Subject: [PATCH 1325/4742] [vim] Add vim keypress and command done events

---
 demo/vim.html | 11 +++++++++++
 keymap/vim.js | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index ad34660892..f92ff9e6d8 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -45,6 +45,7 @@ <h2>Vim bindings demo</h2>
   return (--n >= 0) ? (unsigned char) *bufp++ : EOF;
 }
 </textarea></form>
+<div id="command-display" style="width: 300px; height: 30px;"></div>
 
     <form><textarea id="code2" name="code2">
         I am another file! You can yank from my neighbor and paste here.
@@ -75,6 +76,16 @@ <h2>Vim bindings demo</h2>
         matchBrackets: true,
         showCursorWhenSelecting: true
       });
+      var commandDisplay = document.getElementById('command-display');
+      var keys = '';
+      CodeMirror.on(editor, 'vim-keypress', function(key) {
+        keys = keys + key;
+        commandDisplay.innerHTML = keys;
+      });
+      CodeMirror.on(editor, 'vim-command-done', function(e) {
+        keys = '';
+        commandDisplay.innerHTML = keys;
+      });
     </script>
 
   </article>
diff --git a/keymap/vim.js b/keymap/vim.js
index 9dce29e253..f83d2a557e 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -688,13 +688,13 @@
         if (macroModeState.isRecording) {
           if (key == 'q') {
             macroModeState.exitMacroRecordMode();
-            vim.inputState = new InputState();
+            clearInputState(cm);
             return;
           }
         }
         if (key == '<Esc>') {
           // Clear input state and get back to normal mode.
-          vim.inputState = new InputState();
+          clearInputState(cm);
           if (vim.visualMode) {
             exitVisualMode(cm);
           }
@@ -772,6 +772,11 @@
       return repeat;
     };
 
+    function clearInputState(cm, reason) {
+      cm.state.vim.inputState = new InputState();
+      CodeMirror.signal(cm, 'vim-command-done', reason);
+    }
+
     /*
      * Register stores information about copy and paste registers.  Besides
      * text, a register must store whether it is linewise (i.e., when it is
@@ -1024,7 +1029,7 @@
             return;
           } else {
             // 2 different operators in a row doesn't make sense.
-            vim.inputState = new InputState();
+            clearInputState(cm);
           }
         }
         inputState.operator = command.operator;
@@ -1069,7 +1074,7 @@
         actionArgs.repeat = repeat || 1;
         actionArgs.repeatIsExplicit = repeatIsExplicit;
         actionArgs.registerName = inputState.registerName;
-        vim.inputState = new InputState();
+        clearInputState(cm);
         vim.lastMotion = null;
         if (command.isEdit) {
           this.recordLastEdit(vim, inputState, command);
@@ -1250,7 +1255,7 @@
               inputState.selectedCharacter;
         }
         motionArgs.repeat = repeat;
-        vim.inputState = new InputState();
+        clearInputState(cm);
         if (motion) {
           var motionResult = motions[motion](cm, motionArgs, vim);
           vim.lastMotion = motions[motion];
@@ -3954,6 +3959,7 @@
       // Closure to bind CodeMirror, key, modifier.
       function keyMapper(vimKey) {
         return function(cm) {
+          CodeMirror.signal(cm, 'vim-keypress', vimKey);
           CodeMirror.Vim.handleKey(cm, vimKey);
         };
       }

From 10c5fb58c658db503def73f8e321afc69d9a880b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 17 May 2014 18:58:15 +0200
Subject: [PATCH 1326/4742] [tern addon] When jumping to definition, set a
 forward selection

---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 27d6421512..a6f1e32791 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -390,7 +390,7 @@
   }
 
   function moveTo(ts, curDoc, doc, start, end) {
-    doc.doc.setSelection(end, start);
+    doc.doc.setSelection(start, end);
     if (curDoc != doc && ts.options.switchToDoc) {
       closeArgHints(ts);
       ts.options.switchToDoc(doc.name, doc.doc);

From dc8307ebf2d2c66457bc81d67e129aa126541438 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 17 May 2014 18:58:32 +0200
Subject: [PATCH 1327/4742] [show-hint addon] Fix accidentally renamed option

---
 addon/hint/show-hint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 59322749ce..40eeb0648d 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -72,7 +72,7 @@
     showHints: function(data) {
       if (!data || !data.list.length || !this.active()) return this.close();
 
-      if (this.options.completionSingle && data.list.length == 1)
+      if (this.options.completeSingle && data.list.length == 1)
         this.pick(data, 0);
       else
         this.showWidget(data);
@@ -375,7 +375,7 @@
 
   var defaultOptions = {
     hint: CodeMirror.hint.auto,
-    completionSingle: true,
+    completeSingle: true,
     alignWithWord: true,
     closeCharacters: /[\s()\[\]{};:>,]/,
     closeOnUnfocus: true,

From 355688b2293851c9444cad7adde5b6466104fcfb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 17 May 2014 19:09:17 +0200
Subject: [PATCH 1328/4742] [real-world uses] Add Montage Studio and Apache GUI

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

diff --git a/doc/realworld.html b/doc/realworld.html
index e6649b1f02..d3e4c07f6a 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -27,6 +27,7 @@ <h2>CodeMirror real-world uses</h2>
     <ul>
       <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
       <li><a href="http://amber-lang.net/">Amber</a> (JavaScript-based Smalltalk system)</li>
+      <li><a href="http://apachegui.ca/">Apache GUI</a></li>
       <li><a href="http://apeye.org/">APEye</a> (tool for testing &amp; documenting APIs)</li>
       <li><a href="https://chrome.google.com/webstore/detail/better-text-viewer/lcaidopdffhfemoefoaadecppnjdknkc">Better Text Viewer</a> (plain text reader app for Chrome)</li>
       <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a> (code hosting)</li>
@@ -99,6 +100,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
       <li><a href="http://www.iunbug.com/mihtool">MIHTool</a> (iOS web-app debugging tool)</li>
       <li><a href="http://mongo-mapreduce-webbrowser.opensagres.cloudbees.net/">Mongo MapReduce WebBrowser</a></li>
+      <li><a href="http://montagestudio.com/">Montage Studio</a> (web app creator suite)</li>
       <li><a href="http://mvcplayground.apphb.com/">MVC Playground</a></li>
       <li><a href="https://www.my2ndgeneration.com/">My2ndGeneration</a> (social coding)</li>
       <li><a href="http://www.navigatecms.com">Navigate CMS</a></li>

From 080aebdde5653a1fd4a51d7c6d7ccfe622b978cb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 17 May 2014 23:27:44 +0200
Subject: [PATCH 1329/4742] [python mode] Fix indentation-breaking bug

Issue #2503
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 1fb32a7c16..0f13c887dd 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -54,7 +54,7 @@
     var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
     var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
     var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
-    var hangingIndent = parserConf.hangingIndent || parserConf.indentUnit;
+    var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
 
     var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
     if(parserConf.extra_keywords != undefined){

From d9d3524d93e7a7d8937aed091e2df47943a86109 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 17 May 2014 23:55:52 +0200
Subject: [PATCH 1330/4742] [python mode] Fix handling of scope end by dedent

Issue #2503
---
 mode/python/python.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 0f13c887dd..96eb7e2424 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -84,13 +84,20 @@
           var lineOffset = stream.indentation();
           if (lineOffset > scopeOffset)
             pushScope(stream, state, "py");
-          else if (lineOffset < scopeOffset)
-            return dedent(stream, state) ? ERRORCLASS : null;
+          else if (lineOffset < scopeOffset && dedent(stream, state))
+            state.errorToken = true;
           return null;
-        } else if (scopeOffset > 0 && dedent(stream, state)) {
-          return state.tokenize(stream, state) + " " + ERRORCLASS;
+        } else {
+          var style = tokenBaseInner(stream, state);
+          if (scopeOffset > 0 && dedent(stream, state))
+            style += " " + ERRORCLASS;
+          return style;
         }
       }
+      return tokenBaseInner(stream, state);
+    }
+
+    function tokenBaseInner(stream, state) {
       if (stream.eatSpace()) return null;
 
       var ch = stream.peek();
@@ -226,7 +233,7 @@
         if (top(state).type != "py") return true;
         state.scopes.pop();
       }
-      return top(state).offset == indented;
+      return top(state).offset != indented;
     }
 
     function tokenLexer(stream, state) {
@@ -260,7 +267,7 @@
       if (current == ":" && !state.lambda && top(state).type == "py")
         pushScope(stream, state, "py");
 
-      var delimiter_index = "[({".indexOf(current);
+      var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1;
       if (delimiter_index != -1)
         pushScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
 
@@ -290,6 +297,8 @@
       },
 
       token: function(stream, state) {
+        var addErr = state.errorToken;
+        if (addErr) state.errorToken = false;
         var style = tokenLexer(stream, state);
 
         state.lastStyle = style;
@@ -300,7 +309,7 @@
 
         if (stream.eol() && state.lambda)
           state.lambda = false;
-        return style;
+        return addErr ? style + " " + ERRORCLASS : style;
       },
 
       indent: function(state, textAfter) {

From 08b0256be89c67a9920b007b65e36ef211edb88d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 18 May 2014 23:13:59 +0200
Subject: [PATCH 1331/4742] In context menu handler, keep selForContextMenu up
 to date

So that the added zero-width space doesn't confuse readinput, even
if some other event handler messed with the selection in the meantime.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 371c37651f..0441e3260b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3175,6 +3175,9 @@
         var extval = display.input.value = "\u200b" + (selected ? display.input.value : "");
         display.prevInput = selected ? "" : "\u200b";
         display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
+        // Re-set this, in case some other handler touched the
+        // selection in the meantime.
+        display.selForContextMenu = cm.doc.sel;
       }
     }
     function rehide() {

From 24a6c79b3dfb43dde588e8c4d2189b76d37fba60 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 May 2014 10:45:08 +0200
Subject: [PATCH 1332/4742] Preserve class name added by renderLine event
 handler

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0441e3260b..934ed67129 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5779,6 +5779,8 @@
     }
 
     signal(cm, "renderLine", cm, lineView.line, builder.pre);
+    if (builder.pre.className)
+      builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
     return builder;
   }
 

From eb64d4266e1395c38ac0919fe2fc49417349f2a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 May 2014 10:56:21 +0200
Subject: [PATCH 1333/4742] Add a bias option for selection operations

Issue #2560
---
 doc/manual.html   |  8 ++++++++
 lib/codemirror.js |  3 ++-
 test/test.js      | 13 +++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index d78797dadd..dcc22fefb9 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1228,6 +1228,14 @@ <h3 id="api_selection">Cursor and selection methods</h3>
         old one. When it starts with <code>*</code>, it will always
         replace the previous event (if that had the same origin).
         Built-in motion uses the <code>"+move"</code> origin.</dd>
+        <dt id="selection_bias"><code><strong>bias</strong>: number</code></dt>
+        <dd>Determine the direction into which the selection endpoints
+        should be adjusted when they fall inside
+        an <a href="#mark_atomic">atomic</a> range. Can be either -1
+        (backward) or 1 (forward). When not given, the bias will be
+        based on the relative position of the old selection—the editor
+        will try to move further away from that, to prevent getting
+        stuck.</dd>
       </dl></dd>
 
       <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer, ?options: object)</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 934ed67129..4349e8b086 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1149,7 +1149,8 @@
     if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
       sel = filterSelectionChange(doc, sel);
 
-    var bias = cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1;
+    var bias = options && options.bias ||
+      (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
     setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
 
     if (!(options && options.scroll === false) && doc.cm)
diff --git a/test/test.js b/test/test.js
index 7d597688a8..dd4d62639f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1548,6 +1548,19 @@ testCM("atomicMarker", function(cm) {
   eq(cm.getValue().length, 53, "del chunk");
 });
 
+testCM("selectionBias", function(cm) {
+  cm.markText(Pos(0, 1), Pos(0, 3), {atomic: true});
+  cm.setCursor(Pos(0, 2));
+  eqPos(cm.getCursor(), Pos(0, 3));
+  cm.setCursor(Pos(0, 2));
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.setCursor(Pos(0, 2), null, {bias: -1});
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.setCursor(Pos(0, 4));
+  cm.setCursor(Pos(0, 2), null, {bias: 1});
+  eqPos(cm.getCursor(), Pos(0, 3), "A");
+}, {value: "12345"});
+
 testCM("readOnlyMarker", function(cm) {
   function mark(ll, cl, lr, cr, at) {
     return cm.markText(Pos(ll, cl), Pos(lr, cr),

From 2e89708faf489216d99aa519ed877f9bed2b2590 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 May 2014 21:13:23 +0200
Subject: [PATCH 1334/4742] [comment addon] Adjust docs for padding

Closes #2391
Closes #2387
---
 doc/manual.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index dcc22fefb9..1111db8e7d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2165,8 +2165,9 @@ <h2>Addons</h2>
         <dd>Override the <a href="#mode_comment">comment string
         properties</a> of the mode with custom comment strings.</dd>
         <dt><code><strong>padding</strong>: string</code></dt>
-        <dd>A string that will be inserted after opening and before
-        closing comment markers. Defaults to a single space.</dd>
+        <dd>A string that will be inserted after opening and leading
+        markers, and before closing comment markers. Defaults to a
+        single space.</dd>
         <dt><code><strong>commentBlankLines</strong>: boolean</code></dt>
         <dd>Whether, when adding line comments, to also comment lines
         that contain only whitespace.</dd>

From fc41788dd765feaaddd07958250f315f56314574 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 May 2014 21:52:52 +0200
Subject: [PATCH 1335/4742] Remove version numbers from script headers again

Bumping them for every release just adds too much git
noise and history blowup.
---
 addon/comment/comment.js            |  2 +-
 addon/comment/continuecomment.js    |  2 +-
 addon/dialog/dialog.js              |  2 +-
 addon/display/fullscreen.js         |  2 +-
 addon/display/placeholder.js        |  2 +-
 addon/display/rulers.js             |  2 +-
 addon/edit/closebrackets.js         |  2 +-
 addon/edit/closetag.js              |  2 +-
 addon/edit/continuelist.js          |  2 +-
 addon/edit/matchbrackets.js         |  2 +-
 addon/edit/matchtags.js             |  2 +-
 addon/edit/trailingspace.js         |  2 +-
 addon/fold/brace-fold.js            |  2 +-
 addon/fold/comment-fold.js          |  2 +-
 addon/fold/foldcode.js              |  2 +-
 addon/fold/foldgutter.js            |  2 +-
 addon/fold/indent-fold.js           |  2 +-
 addon/fold/markdown-fold.js         |  2 +-
 addon/fold/xml-fold.js              |  2 +-
 addon/hint/anyword-hint.js          |  2 +-
 addon/hint/css-hint.js              |  2 +-
 addon/hint/html-hint.js             |  2 +-
 addon/hint/javascript-hint.js       |  2 +-
 addon/hint/python-hint.js           |  2 +-
 addon/hint/show-hint.js             |  2 +-
 addon/hint/sql-hint.js              |  2 +-
 addon/hint/xml-hint.js              |  2 +-
 addon/lint/coffeescript-lint.js     |  2 +-
 addon/lint/css-lint.js              |  2 +-
 addon/lint/javascript-lint.js       |  2 +-
 addon/lint/json-lint.js             |  2 +-
 addon/lint/lint.js                  |  2 +-
 addon/lint/yaml-lint.js             |  2 +-
 addon/merge/merge.js                |  2 +-
 addon/mode/loadmode.js              |  2 +-
 addon/mode/multiplex.js             |  2 +-
 addon/mode/multiplex_test.js        |  2 +-
 addon/mode/overlay.js               |  2 +-
 addon/runmode/colorize.js           |  2 +-
 addon/runmode/runmode-standalone.js |  2 +-
 addon/runmode/runmode.js            |  2 +-
 addon/runmode/runmode.node.js       |  2 +-
 addon/scroll/scrollpastend.js       |  2 +-
 addon/search/match-highlighter.js   |  2 +-
 addon/search/search.js              |  2 +-
 addon/search/searchcursor.js        |  2 +-
 addon/selection/active-line.js      |  2 +-
 addon/selection/mark-selection.js   |  2 +-
 addon/tern/tern.js                  |  2 +-
 addon/tern/worker.js                |  2 +-
 addon/wrap/hardwrap.js              |  2 +-
 bin/release                         | 15 ---------------
 keymap/emacs.js                     |  2 +-
 keymap/sublime.js                   |  2 +-
 keymap/vim.js                       |  2 +-
 lib/codemirror.js                   |  2 +-
 mode/apl/apl.js                     |  2 +-
 mode/asterisk/asterisk.js           |  2 +-
 mode/clike/clike.js                 |  2 +-
 mode/clojure/clojure.js             |  2 +-
 mode/cobol/cobol.js                 |  2 +-
 mode/coffeescript/coffeescript.js   |  2 +-
 mode/commonlisp/commonlisp.js       |  2 +-
 mode/css/css.js                     |  2 +-
 mode/css/less_test.js               |  2 +-
 mode/css/scss_test.js               |  2 +-
 mode/css/test.js                    |  2 +-
 mode/cypher/cypher.js               |  2 +-
 mode/d/d.js                         |  2 +-
 mode/diff/diff.js                   |  2 +-
 mode/django/django.js               |  2 +-
 mode/dtd/dtd.js                     |  2 +-
 mode/dylan/dylan.js                 |  2 +-
 mode/ecl/ecl.js                     |  2 +-
 mode/eiffel/eiffel.js               |  2 +-
 mode/erlang/erlang.js               |  2 +-
 mode/fortran/fortran.js             |  2 +-
 mode/gas/gas.js                     |  2 +-
 mode/gfm/gfm.js                     |  2 +-
 mode/gfm/test.js                    |  2 +-
 mode/gherkin/gherkin.js             |  2 +-
 mode/go/go.js                       |  2 +-
 mode/groovy/groovy.js               |  2 +-
 mode/haml/haml.js                   |  2 +-
 mode/haml/test.js                   |  2 +-
 mode/haskell/haskell.js             |  2 +-
 mode/haxe/haxe.js                   |  2 +-
 mode/htmlembedded/htmlembedded.js   |  2 +-
 mode/htmlmixed/htmlmixed.js         |  2 +-
 mode/http/http.js                   |  2 +-
 mode/jade/jade.js                   |  2 +-
 mode/javascript/javascript.js       |  2 +-
 mode/javascript/test.js             |  2 +-
 mode/jinja2/jinja2.js               |  2 +-
 mode/julia/julia.js                 |  2 +-
 mode/livescript/livescript.js       |  2 +-
 mode/lua/lua.js                     |  2 +-
 mode/markdown/markdown.js           |  2 +-
 mode/markdown/test.js               |  2 +-
 mode/meta.js                        |  2 +-
 mode/mirc/mirc.js                   |  2 +-
 mode/mllike/mllike.js               |  2 +-
 mode/nginx/nginx.js                 |  2 +-
 mode/ntriples/ntriples.js           |  2 +-
 mode/octave/octave.js               |  2 +-
 mode/pascal/pascal.js               |  2 +-
 mode/pegjs/pegjs.js                 |  2 +-
 mode/perl/perl.js                   |  2 +-
 mode/php/php.js                     |  2 +-
 mode/php/test.js                    |  2 +-
 mode/pig/pig.js                     |  2 +-
 mode/properties/properties.js       |  2 +-
 mode/puppet/puppet.js               |  2 +-
 mode/python/python.js               |  2 +-
 mode/q/q.js                         |  2 +-
 mode/r/r.js                         |  2 +-
 mode/rpm/rpm.js                     |  2 +-
 mode/rst/rst.js                     |  2 +-
 mode/ruby/ruby.js                   |  2 +-
 mode/ruby/test.js                   |  2 +-
 mode/rust/rust.js                   |  2 +-
 mode/sass/sass.js                   |  2 +-
 mode/scheme/scheme.js               |  2 +-
 mode/shell/shell.js                 |  2 +-
 mode/shell/test.js                  |  2 +-
 mode/sieve/sieve.js                 |  2 +-
 mode/smalltalk/smalltalk.js         |  2 +-
 mode/smarty/smarty.js               |  2 +-
 mode/smartymixed/smartymixed.js     |  2 +-
 mode/solr/solr.js                   |  2 +-
 mode/sparql/sparql.js               |  2 +-
 mode/sql/sql.js                     |  2 +-
 mode/stex/stex.js                   |  2 +-
 mode/stex/test.js                   |  2 +-
 mode/tcl/tcl.js                     |  2 +-
 mode/tiddlywiki/tiddlywiki.js       |  2 +-
 mode/tiki/tiki.js                   |  2 +-
 mode/toml/toml.js                   |  2 +-
 mode/turtle/turtle.js               |  2 +-
 mode/vb/vb.js                       |  2 +-
 mode/vbscript/vbscript.js           |  2 +-
 mode/velocity/velocity.js           |  2 +-
 mode/verilog/test.js                |  2 +-
 mode/verilog/verilog.js             |  2 +-
 mode/xml/test.js                    |  2 +-
 mode/xml/xml.js                     |  2 +-
 mode/xquery/test.js                 |  2 +-
 mode/xquery/xquery.js               |  2 +-
 mode/yaml/yaml.js                   |  2 +-
 mode/z80/z80.js                     |  2 +-
 test/lint/lint.js                   |  2 +-
 151 files changed, 150 insertions(+), 165 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index f56721206e..3ac476452d 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 5247a845c4..b11d51e6ca 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 8fbdea168d..b99c6778e9 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Open simple dialogs on top of an editor. Relies on dialog.css.
diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
index e7f22a7936..cd3673b96c 100644
--- a/addon/display/fullscreen.js
+++ b/addon/display/fullscreen.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index fbc0a8bdf0..bb0c3931e4 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index e025415b51..7624b78c83 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 4caac60b98..83d4229f47 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index db31b0eb02..414498bcd9 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 3dcf757397..3485c4b797 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index c1221ca4c0..fa1ae030a5 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index a91d578365..fb1911a8db 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/edit/trailingspace.js b/addon/edit/trailingspace.js
index e12162d33c..fa7b56be51 100644
--- a/addon/edit/trailingspace.js
+++ b/addon/edit/trailingspace.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index a0161e2c19..1605f6c2a9 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index 593539affd..b75db7ea25 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 51cc3939b3..3abeb83e76 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 04ce8493e8..4db8259294 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 126ed4953c..e29f15e9da 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/fold/markdown-fold.js b/addon/fold/markdown-fold.js
index ecee9e7e27..ce84c946ce 100644
--- a/addon/fold/markdown-fold.js
+++ b/addon/fold/markdown-fold.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 33d6e07b53..a45da58422 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index 0b6d872f3d..be72e2bc75 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index a93458819c..3300f4bd5a 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index cfdcff9de2..addd9b7bc0 100755
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 29f3960902..c7292468a0 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/hint/python-hint.js b/addon/hint/python-hint.js
index 49dfb08f3a..1b97f6ab0a 100644
--- a/addon/hint/python-hint.js
+++ b/addon/hint/python-hint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 40eeb0648d..f43ca00c03 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index e527a878b9..fd58b8834e 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index de9f79eb3b..1e8e50cf72 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
index 2cc6314f06..7e39428f7a 100644
--- a/addon/lint/coffeescript-lint.js
+++ b/addon/lint/coffeescript-lint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index 93f2e5f5d8..1f61b479b2 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Depends on csslint.js from https://github.com/stubbornella/csslint
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index ed62dd989c..3d65ba695b 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index b548a8e439..9dbb616b3b 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Depends on jsonlint.js from https://github.com/zaach/jsonlint
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 1682acf6ea..604e2e6058 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/lint/yaml-lint.js b/addon/lint/yaml-lint.js
index 3ada0eaf9f..3f77e525b7 100644
--- a/addon/lint/yaml-lint.js
+++ b/addon/lint/yaml-lint.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 61e25e5d36..3583936198 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/mode/loadmode.js b/addon/mode/loadmode.js
index e49421b8fc..804215877f 100644
--- a/addon/mode/loadmode.js
+++ b/addon/mode/loadmode.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 40601f4dfa..6a95b323c1 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/mode/multiplex_test.js b/addon/mode/multiplex_test.js
index a10012ce8c..d33943420e 100644
--- a/addon/mode/multiplex_test.js
+++ b/addon/mode/multiplex_test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index 82f754c461..393054dfa4 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Utility function that allows modes to be combined. The mode given
diff --git a/addon/runmode/colorize.js b/addon/runmode/colorize.js
index eb99f29945..eb7060d0a2 100644
--- a/addon/runmode/colorize.js
+++ b/addon/runmode/colorize.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 3e1e746e95..0dd0c289b0 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 window.CodeMirror = {};
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 5406ff72fd..07d2279f74 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index f8c467f381..f64b8a152d 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /* Just enough of CodeMirror to run runMode under node.js */
diff --git a/addon/scroll/scrollpastend.js b/addon/scroll/scrollpastend.js
index e9f4ecb68a..008ae4c7ba 100644
--- a/addon/scroll/scrollpastend.js
+++ b/addon/scroll/scrollpastend.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 0dc28c10ba..14dd4d4184 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Highlighting text that matches the selection
diff --git a/addon/search/search.js b/addon/search/search.js
index 7bc3414c7b..3ce7cc95d8 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Define search commands. Depends on dialog.js or another
diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index f6df00a94e..2783308858 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index bafcb6b8c3..28b9e018b3 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Because sometimes you need to style the cursor's line.
diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index f621c0704a..5c42d21eb2 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Because sometimes you need to mark the selected *text*.
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index a6f1e32791..7a0845350d 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Glue code between CodeMirror and Tern.
diff --git a/addon/tern/worker.js b/addon/tern/worker.js
index 615ce61e6a..48277af8e7 100644
--- a/addon/tern/worker.js
+++ b/addon/tern/worker.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // declare global: tern, server
diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index fb0b5f2fcf..fe9b4dd669 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/bin/release b/bin/release
index c26d290f94..3c33290f3f 100755
--- a/bin/release
+++ b/bin/release
@@ -27,21 +27,6 @@ rewrite("doc/manual.html", function(manual) {
   return manual.replace(/>version \d+\.\d+\.\d+<\/span>/, ">version " + number + "</span>");
 });
 
-function walkDir(dir) {
-  fs.readdirSync(dir).forEach(function(file) {
-    var fname = dir + "/" + file;
-    if (/\.js$/.test(file)) rewrite(fname, function(script) {
-      return script.replace(/^\/\/ CodeMirror \d+\.\d+\.\d+, copyright/,
-                            "// CodeMirror " + number + ", copyright");
-    });
-    else if (fs.lstatSync(fname).isDirectory()) walkDir(fname);
-  });
-}
-walkDir("mode");
-walkDir("lib");
-walkDir("addon");
-walkDir("keymap");
-
 if (bumpOnly) process.exit(0);
 
 child.exec("bash bin/authors.sh", function(){});
diff --git a/keymap/emacs.js b/keymap/emacs.js
index b1b70254d8..ba8149c70e 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/keymap/sublime.js b/keymap/sublime.js
index 0681fa3e2b..4d46938415 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // A rough approximation of Sublime Text's keybindings
diff --git a/keymap/vim.js b/keymap/vim.js
index f83d2a557e..a257b23939 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4349e8b086..1b938589c6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // This is CodeMirror (http://codemirror.net), a code editor
diff --git a/mode/apl/apl.js b/mode/apl/apl.js
index 0a318dad61..4357bed475 100644
--- a/mode/apl/apl.js
+++ b/mode/apl/apl.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index f34471d4eb..a1ead1157a 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /*
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index a114344f87..e5b4854d63 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index f8e8879d42..f81bd2c140 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**
diff --git a/mode/cobol/cobol.js b/mode/cobol/cobol.js
index 231218509a..897022b18c 100644
--- a/mode/cobol/cobol.js
+++ b/mode/cobol/cobol.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**
diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 5350f6099c..1695650126 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index ffb3c96493..8878e26f45 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/css/css.js b/mode/css/css.js
index 00d3785bcf..1fd46df35b 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/css/less_test.js b/mode/css/less_test.js
index a569e107dd..2ba69984f3 100644
--- a/mode/css/less_test.js
+++ b/mode/css/less_test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 85077532dc..8dcea9e86e 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/css/test.js b/mode/css/test.js
index 1a75e08ea4..d236e2a738 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 902430c2b0..5c6bd41997 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // By the Neo4j Team and contributors.
diff --git a/mode/d/d.js b/mode/d/d.js
index cb9a674cec..2a0631203a 100644
--- a/mode/d/d.js
+++ b/mode/d/d.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/diff/diff.js b/mode/diff/diff.js
index ad62f2fcef..fe0305e7b6 100644
--- a/mode/diff/diff.js
+++ b/mode/diff/diff.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/django/django.js b/mode/django/django.js
index 3fe57cdea3..d70b2fe948 100644
--- a/mode/django/django.js
+++ b/mode/django/django.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index 7c3b6a1cab..1df9fc8b32 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /*
diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index b4526f6fad..be2986adb5 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/ecl/ecl.js b/mode/ecl/ecl.js
index 18d60899e0..18778f1691 100644
--- a/mode/ecl/ecl.js
+++ b/mode/ecl/ecl.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/eiffel/eiffel.js b/mode/eiffel/eiffel.js
index 52c54e7863..fcdf295cbc 100644
--- a/mode/eiffel/eiffel.js
+++ b/mode/eiffel/eiffel.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index 7e2a1d4ad3..fbca292f03 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /*jshint unused:true, eqnull:true, curly:true, bitwise:true */
diff --git a/mode/fortran/fortran.js b/mode/fortran/fortran.js
index 66b9c9ad70..4d88f006aa 100644
--- a/mode/fortran/fortran.js
+++ b/mode/fortran/fortran.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index 6bf66b6f49..0c74bedc57 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 5de044807d..eb0b7c193b 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index f3d72bfadf..78ffff2d7b 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index c94efcb6aa..ed7ba7978e 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /*
diff --git a/mode/go/go.js b/mode/go/go.js
index 46e13b6c54..51b07c7c55 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 4a867d8337..89b8224cf5 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 1ab5001fc2..8fe63b0203 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/haml/test.js b/mode/haml/test.js
index 0a8fc55696..3a6100a352 100644
--- a/mode/haml/test.js
+++ b/mode/haml/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index 4d923568d0..66020788d1 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 487a88ddf3..d49ad70f99 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index 7b3b9be725..e8f7ba803f 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 1dacbe8098..dc48978eb2 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/http/http.js b/mode/http/http.js
index bd0cb574d3..9a3c5f9fd8 100644
--- a/mode/http/http.js
+++ b/mode/http/http.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index b7c99b083d..96fadb19e5 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 71e8a09c6f..b522ec4831 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // TODO actually recognize syntax of TypeScript constructs
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 4411a98452..fd399a7f5a 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index e80c772929..ed195581cf 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 79b47fb3ef..5dd1afce90 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index 8e822bd6d3..55882efc3b 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**
diff --git a/mode/lua/lua.js b/mode/lua/lua.js
index 6121b86b38..0b19abd304 100644
--- a/mode/lua/lua.js
+++ b/mode/lua/lua.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 81472f02f7..81ed24e8d3 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index ba1b15fc82..77a3b659c0 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/meta.js b/mode/meta.js
index 5cccf7e9ab..281028d7ab 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/mirc/mirc.js b/mode/mirc/mirc.js
index 321830baf7..f0d5c6ad50 100644
--- a/mode/mirc/mirc.js
+++ b/mode/mirc/mirc.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 //mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 18771467a8..04ab1c98ec 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/nginx/nginx.js b/mode/nginx/nginx.js
index 22c266384d..135b9cc7f8 100644
--- a/mode/nginx/nginx.js
+++ b/mode/nginx/nginx.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/ntriples/ntriples.js b/mode/ntriples/ntriples.js
index 1f9ba451cb..0524b1e8ab 100644
--- a/mode/ntriples/ntriples.js
+++ b/mode/ntriples/ntriples.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**********************************************************
diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index e5a50bce3b..94314c4822 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index 652addd2c2..2d0c3d4240 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index 725579d5a0..306e3768c9 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 9b02783a1d..ab86e846a4 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
diff --git a/mode/php/php.js b/mode/php/php.js
index 4185804791..72c19d8d11 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/php/test.js b/mode/php/test.js
index 2d901cf08d..8305496571 100644
--- a/mode/php/test.js
+++ b/mode/php/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/pig/pig.js b/mode/pig/pig.js
index 52ad349c41..c74b2cc866 100644
--- a/mode/pig/pig.js
+++ b/mode/pig/pig.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /*
diff --git a/mode/properties/properties.js b/mode/properties/properties.js
index b91191a7b5..0740084209 100644
--- a/mode/properties/properties.js
+++ b/mode/properties/properties.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/puppet/puppet.js b/mode/puppet/puppet.js
index bba431eb3d..66698bb6ad 100644
--- a/mode/puppet/puppet.js
+++ b/mode/puppet/puppet.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/python/python.js b/mode/python/python.js
index 96eb7e2424..3a86c278a1 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/q/q.js b/mode/q/q.js
index ff788d9d52..a4af9383e7 100644
--- a/mode/q/q.js
+++ b/mode/q/q.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/r/r.js b/mode/r/r.js
index d04eca3899..1ab4a9565a 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/rpm/rpm.js b/mode/rpm/rpm.js
index bad1b3e024..3bb7cd2f62 100644
--- a/mode/rpm/rpm.js
+++ b/mode/rpm/rpm.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 11c3678428..2a1e28b556 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 8ffd2d7e8a..b68ee2912a 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/ruby/test.js b/mode/ruby/test.js
index 1a6067d027..cade864ff9 100644
--- a/mode/ruby/test.js
+++ b/mode/ruby/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index e7abed3520..4ca1a76af6 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 8cdb1365f9..2ff5003c0a 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 97979057ef..979edc0963 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**
diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index c1893a4dd1..77be75b97d 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/shell/test.js b/mode/shell/test.js
index 8bdb82103d..a413b5a406 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/sieve/sieve.js b/mode/sieve/sieve.js
index d74c839e01..f67db2f553 100644
--- a/mode/sieve/sieve.js
+++ b/mode/sieve/sieve.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index 42fdc67830..50f41cc615 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 8c4bd13b61..bb053245d3 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
index 3be014b872..31cfd2bdae 100644
--- a/mode/smartymixed/smartymixed.js
+++ b/mode/smartymixed/smartymixed.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /**
diff --git a/mode/solr/solr.js b/mode/solr/solr.js
index ed7eff6eb6..f7f7087891 100644
--- a/mode/solr/solr.js
+++ b/mode/solr/solr.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index f4453e6864..64dbb612c2 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 59510ffa08..6c02f4e947 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index b5ef7898f3..09a33e56da 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /*
diff --git a/mode/stex/test.js b/mode/stex/test.js
index 6eaf0f6881..22f027ec7b 100644
--- a/mode/stex/test.js
+++ b/mode/stex/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index 49c555b108..7be7b9b148 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 //tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index 31dff8cb93..88c9768a72 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /***
diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index 02c2f1b74b..c90aac9ec7 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/toml/toml.js b/mode/toml/toml.js
index 593807a900..baeca15568 100644
--- a/mode/toml/toml.js
+++ b/mode/toml/toml.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/turtle/turtle.js b/mode/turtle/turtle.js
index b2c7023c16..a4727ed572 100644
--- a/mode/turtle/turtle.js
+++ b/mode/turtle/turtle.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 6fa42d97eb..902203e0c0 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/vbscript/vbscript.js b/mode/vbscript/vbscript.js
index 9293c0af34..bff2594477 100644
--- a/mode/vbscript/vbscript.js
+++ b/mode/vbscript/vbscript.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 /*
diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index fd0292920b..8fc4f95d05 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/verilog/test.js b/mode/verilog/test.js
index 42d4f618cf..e78860deb9 100644
--- a/mode/verilog/test.js
+++ b/mode/verilog/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index c575ac5f51..3414ec022e 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/xml/test.js b/mode/xml/test.js
index 122e1675ce..f48156b517 100644
--- a/mode/xml/test.js
+++ b/mode/xml/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 9a84b632aa..786507d2e4 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/xquery/test.js b/mode/xquery/test.js
index 511a879d90..1f148cdbbd 100644
--- a/mode/xquery/test.js
+++ b/mode/xquery/test.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // Don't take these too seriously -- the expected results appear to be
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index 0426bf66a5..c8f3d90a9f 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index 41679f1eea..4ebe5c81cf 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/mode/z80/z80.js b/mode/z80/z80.js
index d441e383ac..ec41d050ac 100644
--- a/mode/z80/z80.js
+++ b/mode/z80/z80.js
@@ -1,4 +1,4 @@
-// CodeMirror 4.1.1, copyright (c) by Marijn Haverbeke and others
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
diff --git a/test/lint/lint.js b/test/lint/lint.js
index ba8900f7d7..ef4c13bd9a 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -31,7 +31,7 @@ var scopePasser = walk.make({
   ScopeBody: function(node, prev, c) { c(node, node.scope); }
 });
 
-var cBlob = /^\/\/ CodeMirror \d+\.\d+\.\d+, copyright \(c\) by Marijn Haverbeke and others\n\/\/ Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n/;
+var cBlob = /^\/\/ CodeMirror, copyright \(c\) by Marijn Haverbeke and others\n\/\/ Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n/;
 
 function checkFile(fileName) {
   var file = fs.readFileSync(fileName, "utf8"), notAllowed;

From 7e666ecdd1c9e316225bc3d78ae13f0261bb6838 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 May 2014 22:08:06 +0200
Subject: [PATCH 1336/4742] Mark release 4.2

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

diff --git a/AUTHORS b/AUTHORS
index 85f999f42e..f1d6b58a85 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ Amy
 Ananya Sen
 anaran
 AndersMad
+Anders Nawroth
 Anderson Mesquita
 Andre von Houck
 Andrey Lushnikov
@@ -44,6 +45,7 @@ AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
 Bastian Müller
+Bem Jones-Bey
 benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
@@ -73,6 +75,7 @@ CodeAnimal
 ComFreek
 Curtis Gagliardi
 dagsta
+daines
 Dan Heberden
 Daniel, Dao Quang Minh
 Daniel Faust
@@ -82,6 +85,7 @@ Daniel Neel
 Daniel Parnell
 Danny Yoo
 Darius Roberts
+Dave Myers
 David Mignot
 David Pathakjee
 deebugger
@@ -263,6 +267,7 @@ Nikolay Kostov
 nlwillia
 pablo
 Page
+Panupong Pasupat
 paris
 Patil Arpith
 Patrick Strawderman
diff --git a/doc/compress.html b/doc/compress.html
index d6c0125544..8fb4b5fe92 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.2.0;f=">4.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.1.0;f=">4.1</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.3;f=">4.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.23.0;f=">3.23</option>
diff --git a/doc/manual.html b/doc/manual.html
index 1111db8e7d..77d1cc3404 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 4.1.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.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 63397e7924..5e6829b406 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,23 @@ <h2>Release notes and version history</h2>
 
   <h2 id="v4">Version 4.x</h2>
 
+  <p class="rel">19-05-2014: <a href="http://codemirror.net/codemirror-4.2.zip">Version 4.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix problem where some modes were broken by the fact that empty tokens were forbidden.</li>
+    <li>Several fixes to context menu handling.</li>
+    <li>On undo, scroll <em>change</em>, not cursor, into view.</li>
+    <li>Rewritten <a href="../mode/jade/index.html">Jade</a> mode.</li>
+    <li>Various improvements to <a href="../mode/shell/index.html">Shell</a> (support for more syntax) and <a href="../mode/python/index.html">Python</a> (better indentation) modes.</li>
+    <li>New mode: <a href="../mode/cypher/index.html">Cypher</a>.</li>
+    <li>New theme: <a href="../demo/theme.html?neo">Neo</a>.</li>
+    <li>Support direct styling options (color, line style, width) in the <a href="manual.html#addon_rulers">rulers</a> addon.</li>
+    <li>Recognize per-editor configuration for the <a href="manual.html#addon_show-hint">show-hint</a> and <a href="manual.html#addon_foldcode">foldcode</a> addons.</li>
+    <li>More intelligent scanning for existing close tags in <a href="manual.html#addon_closetag">closetag</a> addon.</li>
+    <li>In the <a href="../demo/vim.html">Vim bindings</a>: Fix bracket matching, support case conversion in visual mode, visual paste, append action.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.1.0...4.2.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">22-04-2014: <a href="http://codemirror.net/codemirror-4.1.zip">Version 4.1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 0c91ecaf72..19b9529781 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.1</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.2</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1b938589c6..104ccd7d8e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7595,7 +7595,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.1.1";
+  CodeMirror.version = "4.2.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 8377f5a93e..ef4968b9b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.1.1",
+    "version":"4.2.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From aba7f0c4f057940b82655fdb469d3613eb627b86 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 May 2014 22:20:46 +0200
Subject: [PATCH 1337/4742] Bump version number post-4.2

---
 doc/compress.html | 1 +
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 8fb4b5fe92..c79a3beaeb 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.2.1;f=">4.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.2.0;f=">4.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.1.0;f=">4.1</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.3;f=">4.0</option>
diff --git a/doc/manual.html b/doc/manual.html
index 77d1cc3404..660cf4a374 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 4.2.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.2.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 104ccd7d8e..95cc6b9660 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7595,7 +7595,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.2.0";
+  CodeMirror.version = "4.2.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index ef4968b9b7..b5e1639a2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.2.0",
+    "version":"4.2.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 1dc82bc233973405804dd1c0650a14c2539232b6 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Fri, 25 Apr 2014 04:36:23 +0530
Subject: [PATCH 1338/4742] [vim] last_search register added

---
 keymap/vim.js    |  6 +++++-
 test/vim_test.js | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a257b23939..af16b3d81b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -411,7 +411,7 @@
     var specialKeys = ['Left', 'Right', 'Up', 'Down', 'Space', 'Backspace',
         'Esc', 'Home', 'End', 'PageUp', 'PageDown', 'Enter'];
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
-    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':']);
+    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
 
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
@@ -835,6 +835,7 @@
       this.unnamedRegister = registers['"'] = new Register();
       registers['.'] = new Register();
       registers[':'] = new Register();
+      registers['/'] = new Register();
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise) {
@@ -3072,6 +3073,9 @@
      *   through to the Regex object.
      */
     function parseQuery(query, ignoreCase, smartCase) {
+      // First update the last search register
+      var lastSearchRegister = vimGlobalState.registerController.getRegister('/');
+      lastSearchRegister.setText(query);
       // Check if the query is already a regex.
       if (query instanceof RegExp) { return query; }
       // First try to extract regex + flags from the input. If no flags found,
diff --git a/test/vim_test.js b/test/vim_test.js
index fecc52ba35..57fa9eb3a8 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2056,6 +2056,46 @@ testVim(':_register', function(cm,vim,helpers) {
   });
   helpers.doKeys(':');
 }, {value: ''});
+testVim('search_register_escape', function(cm, vim, helpers) {
+  // Check that the register is restored if the user escapes rather than confirms.
+  cm.openDialog = helpers.fakeOpenDialog('waldo');
+  helpers.doKeys('/');
+  var onKeyDown;
+  cm.openDialog = function(template, callback, options) {
+    var onKeyDown = options.onKeyDown;
+    var onKeyUp = options.onKeyUp;
+    var KEYCODES = {
+      f: 70,
+      o: 79,
+      Esc: 27
+    };
+    var close = function() {};
+    // Fake some keyboard events coming in.
+    onKeyDown({keyCode: KEYCODES.f}, '', close);
+    onKeyUp({keyCode: KEYCODES.f}, '', close);
+    onKeyDown({keyCode: KEYCODES.o}, 'f', close);
+    onKeyUp({keyCode: KEYCODES.o}, 'f', close);
+    onKeyDown({keyCode: KEYCODES.o}, 'fo', close);
+    onKeyUp({keyCode: KEYCODES.o}, 'fo', close);
+    onKeyDown({keyCode: KEYCODES.Esc}, 'foo', close);
+  };
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/waldo/.test(text));
+    is(!/foo/.test(text));
+  });
+  helpers.doKeys(':');
+}, {value: ''});
+testVim('search_register', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('foo');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/\/\s+foo/.test(text));
+  });
+  helpers.doKeys(':');
+}, {value: ''});
 testVim('.', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('2', 'd', 'w');

From 81787e8e09e874d375e10be5b3f12ea99a029a3a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 25 May 2014 11:08:51 +0200
Subject: [PATCH 1339/4742] Stop trying to use event.buttons in recent IEs

It is unreliable, and cleared for no apparent reason if when buttons
are still held.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 95cc6b9660..b33e8f0e5d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2741,7 +2741,7 @@
     }
 
     var move = operation(cm, function(e) {
-      if ((ie && !ie_upto9) ?  !e.buttons : !e_button(e)) done(e);
+      if (!e_button(e)) done(e);
       else extend(e);
     });
     var up = operation(cm, done);

From bbefd22af3bd463f709c015f86fce2985f74c3e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 25 May 2014 11:27:53 +0200
Subject: [PATCH 1340/4742] Use an ie_version variable, instead of multiple
 ie_uptoX flags

This makes the version tests more readable (though also more verbose).
---
 lib/codemirror.js | 56 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b33e8f0e5d..575cffeca8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -25,11 +25,9 @@
   var gecko = /gecko\/\d/i.test(navigator.userAgent);
   // ie_uptoN means Internet Explorer version N or lower
   var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
-  var ie_upto7 = ie_upto10 && (document.documentMode == null || document.documentMode < 8);
-  var ie_upto8 = ie_upto10 && (document.documentMode == null || document.documentMode < 9);
-  var ie_upto9 = ie_upto10 && (document.documentMode == null || document.documentMode < 10);
-  var ie_11up = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
+  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
   var ie = ie_upto10 || ie_11up;
+  var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
   var webkit = /WebKit\//.test(navigator.userAgent);
   var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
   var chrome = /Chrome\//.test(navigator.userAgent);
@@ -50,7 +48,7 @@
   if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
   var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
-  var captureRightClick = gecko || (ie && !ie_upto8);
+  var captureRightClick = gecko || (ie && ie_version >= 9);
 
   // Optimize some code when these features are not used.
   var sawReadOnlySpans = false, sawCollapsedSpans = false;
@@ -93,7 +91,7 @@
 
     // Override magic textarea content restore that IE sometimes does
     // on our hidden textarea on reload
-    if (ie_upto10) setTimeout(bind(resetInput, this, true), 20);
+    if (ie && ie_version < 11) setTimeout(bind(resetInput, this, true), 20);
 
     registerEventHandlers(this);
     ensureGlobalHandlers();
@@ -177,14 +175,14 @@
                             d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
 
     // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
-    if (ie_upto7) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
+    if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
     // Needed to hide big blue blinking cursor on Mobile Safari
     if (ios) input.style.width = "0px";
     if (!webkit) d.scroller.draggable = true;
     // Needed to handle Tab key in KHTML
     if (khtml) { d.inputDiv.style.height = "1px"; d.inputDiv.style.position = "absolute"; }
     // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    if (ie_upto7) d.scrollbarH.style.minHeight = d.scrollbarV.style.minWidth = "18px";
+    if (ie && ie_version < 8) d.scrollbarH.style.minHeight = d.scrollbarV.style.minWidth = "18px";
 
     if (place.appendChild) place.appendChild(d.wrapper);
     else place(d.wrapper);
@@ -684,7 +682,7 @@
     for (var i = 0; i < display.view.length; i++) {
       var cur = display.view[i], height;
       if (cur.hidden) continue;
-      if (ie_upto7) {
+      if (ie && ie_version < 8) {
         var bot = cur.node.offsetTop + cur.node.offsetHeight;
         height = bot - prevBottom;
         prevBottom = bot;
@@ -793,7 +791,7 @@
       if (lineView.text.parentNode)
         lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
       lineView.node.appendChild(lineView.text);
-      if (ie_upto7) lineView.node.style.zIndex = 2;
+      if (ie && ie_version < 8) lineView.node.style.zIndex = 2;
     }
     return lineView.node;
   }
@@ -1620,7 +1618,7 @@
     if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
       while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
       while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
-      if (ie_upto8 && start == 0 && end == mEnd - mStart) {
+      if (ie && ie_version < 9 && start == 0 && end == mEnd - mStart) {
         rect = node.parentNode.getBoundingClientRect();
       } else if (ie && cm.options.lineWrapping) {
         var rects = range(node, start, end).getClientRects();
@@ -1639,7 +1637,7 @@
       else
         rect = node.getBoundingClientRect();
     }
-    if (ie_upto8 && !start && (!rect || !rect.left && !rect.right)) {
+    if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
       var rSpan = node.parentNode.getClientRects()[0];
       if (rSpan)
         rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
@@ -2250,7 +2248,7 @@
     // If nothing changed, bail.
     if (text == prevInput && !cm.somethingSelected()) return false;
     // Work around nonsensical selection resetting in IE9/10
-    if (ie && !ie_upto8 && cm.display.inputHasSelection === text) {
+    if (ie && ie_version >= 9 && cm.display.inputHasSelection === text) {
       resetInput(cm);
       return false;
     }
@@ -2326,10 +2324,10 @@
       var content = minimal ? "-" : selected || cm.getSelection();
       cm.display.input.value = content;
       if (cm.state.focused) selectInput(cm.display.input);
-      if (ie && !ie_upto8) cm.display.inputHasSelection = content;
+      if (ie && ie_version >= 9) cm.display.inputHasSelection = content;
     } else if (!typing) {
       cm.display.prevInput = cm.display.input.value = "";
-      if (ie && !ie_upto8) cm.display.inputHasSelection = null;
+      if (ie && ie_version >= 9) cm.display.inputHasSelection = null;
     }
     cm.display.inaccurateSelection = minimal;
   }
@@ -2354,7 +2352,7 @@
     var d = cm.display;
     on(d.scroller, "mousedown", operation(cm, onMouseDown));
     // Older IE's will not fire a second mousedown for a double click
-    if (ie_upto10)
+    if (ie && ie_version < 11)
       on(d.scroller, "dblclick", operation(cm, function(e) {
         if (signalDOMEvent(cm, e)) return;
         var pos = posFromMouse(cm, e);
@@ -2403,7 +2401,7 @@
 
     on(d.input, "keyup", operation(cm, onKeyUp));
     on(d.input, "input", function() {
-      if (ie && !ie_upto8 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
+      if (ie && ie_version >= 9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
       fastPoll(cm);
     });
     on(d.input, "keydown", operation(cm, onKeyDown));
@@ -2598,7 +2596,7 @@
           extendSelection(cm.doc, start);
         focusInput(cm);
         // Work around unexplainable focus problem in IE9 (#2127)
-        if (ie_upto10 && !ie_upto8)
+        if (ie && ie_version == 9)
           setTimeout(function() {document.body.focus(); focusInput(cm);}, 20);
       }
     });
@@ -3058,7 +3056,7 @@
     ensureFocus(cm);
     if (signalDOMEvent(cm, e)) return;
     // IE does strange things with escape.
-    if (ie_upto10 && e.keyCode == 27) e.returnValue = false;
+    if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false;
     var code = e.keyCode;
     cm.display.shift = code == 16 || e.shiftKey;
     var handled = handleKeyBinding(cm, e);
@@ -3102,7 +3100,7 @@
     if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
     var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
     if (handleCharBinding(cm, e, ch)) return;
-    if (ie && !ie_upto8) cm.display.inputHasSelection = null;
+    if (ie && ie_version >= 9) cm.display.inputHasSelection = null;
     fastPoll(cm);
   }
 
@@ -3184,12 +3182,12 @@
     function rehide() {
       display.inputDiv.style.position = "relative";
       display.input.style.cssText = oldCSS;
-      if (ie_upto8) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos;
+      if (ie && ie_version < 9) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos;
       slowPoll(cm);
 
       // Try to detect the user choosing select-all
       if (display.input.selectionStart != null) {
-        if (!ie || ie_upto8) prepareSelectAllHack();
+        if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
         var i = 0, poll = function() {
           if (display.selForContextMenu == cm.doc.sel && display.input.selectionStart == 0)
             operation(cm, commands.selectAll)(cm);
@@ -3200,7 +3198,7 @@
       }
     }
 
-    if (ie && !ie_upto8) prepareSelectAllHack();
+    if (ie && ie_version >= 9) prepareSelectAllHack();
     if (captureRightClick) {
       e_stop(e);
       var mouseup = function() {
@@ -5800,7 +5798,7 @@
       builder.col += text.length;
       var content = document.createTextNode(text);
       builder.map.push(builder.pos, builder.pos + text.length, content);
-      if (ie_upto8) mustWrap = true;
+      if (ie && ie_version < 9) mustWrap = true;
       builder.pos += text.length;
     } else {
       var content = document.createDocumentFragment(), pos = 0;
@@ -5810,7 +5808,7 @@
         var skipped = m ? m.index - pos : text.length - pos;
         if (skipped) {
           var txt = document.createTextNode(text.slice(pos, pos + skipped));
-          if (ie_upto8) content.appendChild(elt("span", [txt]));
+          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
           else content.appendChild(txt);
           builder.map.push(builder.pos, builder.pos + skipped, txt);
           builder.col += skipped;
@@ -5824,7 +5822,7 @@
           builder.col += tabWidth;
         } else {
           var txt = builder.cm.options.specialCharPlaceholder(m[0]);
-          if (ie_upto8) content.appendChild(elt("span", [txt]));
+          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
           else content.appendChild(txt);
           builder.col += 1;
         }
@@ -7156,7 +7154,7 @@
   function activeElt() { return document.activeElement; }
   // Older versions of IE throws unspecified error when touching
   // document.activeElement in some cases (during loading, in iframe)
-  if (ie_upto10) activeElt = function() {
+  if (ie && ie_version < 11) activeElt = function() {
     try { return document.activeElement; }
     catch(e) { return document.body; }
   };
@@ -7219,7 +7217,7 @@
   var dragAndDrop = function() {
     // There is *some* kind of drag-and-drop support in IE6-8, but I
     // couldn't get it to work yet.
-    if (ie_upto8) return false;
+    if (ie && ie_version < 9) return false;
     var div = elt('div');
     return "draggable" in div || "dragDrop" in div;
   }();
@@ -7240,7 +7238,7 @@
       var test = elt("span", "\u200b");
       removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
       if (measure.firstChild.offsetHeight != 0)
-        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !ie_upto7;
+        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && (ie && ie_version < 8);
     }
     if (zwspSupported) return elt("span", "\u200b");
     else return elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");

From a860fbeb0dbb41ae0bf2188a2b93f48951db849d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 25 May 2014 11:28:58 +0200
Subject: [PATCH 1341/4742] Fix copy-pased title in demo/markselection.html

---
 demo/markselection.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo/markselection.html b/demo/markselection.html
index 454933264f..93e38ec833 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror: Match Selection Demo</title>
+<title>CodeMirror: Selection Marking Demo</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../doc/docs.css">
 
@@ -22,12 +22,12 @@
     <li><a href="https://github.com/marijnh/codemirror">Code</a>
   </ul>
   <ul>
-    <li><a class=active href="#">Match Selection</a>
+    <li><a class=active href="#">Selection Marking</a>
   </ul>
 </div>
 
 <article>
-<h2>Match Selection Demo</h2>
+<h2>Selection Marking Demo</h2>
 <form><textarea id="code" name="code">Select something from here.
 You'll see that the selection's foreground color changes to white!
 Since, by default, CodeMirror only puts an independent "marker" layer

From 501f9d014de684f79743a1d945996979b2238cf1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 25 May 2014 11:52:22 +0200
Subject: [PATCH 1342/4742] Introduce singleCursorHeightPerLine option

Not official/documented for now.
---
 lib/codemirror.js | 16 +++++++++++-----
 test/test.js      |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 575cffeca8..954d9ded9f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1572,7 +1572,9 @@
       found = measureCharInner(cm, prepared, ch, bias);
       if (!found.bogus) prepared.cache[key] = found;
     }
-    return {left: found.left, right: found.right, top: found.top, bottom: found.bottom};
+    var copy = {left: found.left, right: found.right, top: found.top, bottom: found.bottom};
+    if (!cm.options.singleCursorHeightPerLine) { copy.rtop = found.rtop; copy.rbottom = found.rbottom; }
+    return copy;
   }
 
   var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
@@ -1645,15 +1647,17 @@
         rect = nullRect;
     }
 
-    var top, bot = (rect.bottom + rect.top) / 2 - prepared.rect.top;
+    var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
+    var mid = (rtop + rbot) / 2;
     var heights = prepared.view.measure.heights;
     for (var i = 0; i < heights.length - 1; i++)
-      if (bot < heights[i]) break;
-    top = i ? heights[i - 1] : 0; bot = heights[i];
+      if (mid < heights[i]) break;
+    var top = i ? heights[i - 1] : 0, bot = heights[i];
     var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
                   right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
                   top: top, bottom: bot};
     if (!rect.left && !rect.right) result.bogus = true;
+    if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
     return result;
   }
 
@@ -1739,6 +1743,7 @@
     function get(ch, right) {
       var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left");
       if (right) m.left = m.right; else m.right = m.left;
+      if (!cm.options.singleCursorHeightPerLine) { m.top = m.rtop; m.bottom = m.rbottom; }
       return intoCoordSystem(cm, lineObj, m, context);
     }
     function getBidi(ch, partPos) {
@@ -4377,7 +4382,8 @@
 
   option("cursorBlinkRate", 530);
   option("cursorScrollMargin", 0);
-  option("cursorHeight", 1);
+  option("cursorHeight", 1, updateSelection, true);
+  option("singleCursorHeightPerLine", true, updateSelection, true);
   option("workTime", 100);
   option("workDelay", 100);
   option("flattenSpans", true, resetModeState, true);
diff --git a/test/test.js b/test/test.js
index dd4d62639f..b5c4b3e714 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1558,7 +1558,7 @@ testCM("selectionBias", function(cm) {
   eqPos(cm.getCursor(), Pos(0, 1));
   cm.setCursor(Pos(0, 4));
   cm.setCursor(Pos(0, 2), null, {bias: 1});
-  eqPos(cm.getCursor(), Pos(0, 3), "A");
+  eqPos(cm.getCursor(), Pos(0, 3));
 }, {value: "12345"});
 
 testCM("readOnlyMarker", function(cm) {

From 71b42b2e9db92ecc40b65ab45ae6a0bcc20ab377 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 25 May 2014 23:06:38 +0200
Subject: [PATCH 1343/4742] Clean up singleCursorHeightPerLine implementation

---
 lib/codemirror.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 954d9ded9f..c9ffcf0bff 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1275,7 +1275,7 @@
 
   // Draws a cursor for the given range
   function drawSelectionCursor(cm, range, output) {
-    var pos = cursorCoords(cm, range.head, "div");
+    var pos = cursorCoords(cm, range.head, "div", null, null, !cm.options.singleCursorHeightPerLine);
 
     var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
     cursor.style.left = pos.left + "px";
@@ -1557,7 +1557,7 @@
 
   // Given a prepared measurement object, measures the position of an
   // actual character (or fetches it from the cache).
-  function measureCharPrepared(cm, prepared, ch, bias) {
+  function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
     if (prepared.before) ch = -1;
     var key = ch + (bias || ""), found;
     if (prepared.cache.hasOwnProperty(key)) {
@@ -1572,9 +1572,9 @@
       found = measureCharInner(cm, prepared, ch, bias);
       if (!found.bogus) prepared.cache[key] = found;
     }
-    var copy = {left: found.left, right: found.right, top: found.top, bottom: found.bottom};
-    if (!cm.options.singleCursorHeightPerLine) { copy.rtop = found.rtop; copy.rbottom = found.rbottom; }
-    return copy;
+    return {left: found.left, right: found.right,
+            top: varHeight ? found.rtop : found.top,
+            bottom: varHeight ? found.rbottom : found.bottom};
   }
 
   var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
@@ -1737,13 +1737,12 @@
   // Returns a box for a given cursor position, which may have an
   // 'other' property containing the position of the secondary cursor
   // on a bidi boundary.
-  function cursorCoords(cm, pos, context, lineObj, preparedMeasure) {
+  function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
     lineObj = lineObj || getLine(cm.doc, pos.line);
     if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
     function get(ch, right) {
-      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left");
+      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
       if (right) m.left = m.right; else m.right = m.left;
-      if (!cm.options.singleCursorHeightPerLine) { m.top = m.rtop; m.bottom = m.rbottom; }
       return intoCoordSystem(cm, lineObj, m, context);
     }
     function getBidi(ch, partPos) {

From ecd29290ef6dde7b8992e6e6124421ac8f4a1bac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 25 May 2014 23:18:09 +0200
Subject: [PATCH 1344/4742] Fix jsbin link in reporting.html

---
 doc/reporting.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/reporting.html b/doc/reporting.html
index 47e37a5541..84da6111d9 100644
--- a/doc/reporting.html
+++ b/doc/reporting.html
@@ -51,7 +51,7 @@ <h2>Reporting bugs effectively</h2>
   <li>If the problem can not be reproduced in any of the demos
   included in the CodeMirror distribution, please provide an HTML
   document that demonstrates the problem. The best way to do this is
-  to go to <a href="http://jsbin.com/ihunin/edit">jsbin.com</a>, enter
+  to go to <a href="http://jsbin.com/ihunin/1/edit">jsbin.com</a>, enter
   it there, press save, and include the resulting link in your bug
   report.</li>
 </ol>

From 67f0229244446e9ea7a155cef4c634ebee338193 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Thu, 22 May 2014 15:27:39 +0200
Subject: [PATCH 1345/4742] [coffeescript] remove license link

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

diff --git a/mode/coffeescript/index.html b/mode/coffeescript/index.html
index 6e6fde52e4..fc0a770581 100644
--- a/mode/coffeescript/index.html
+++ b/mode/coffeescript/index.html
@@ -735,6 +735,6 @@ <h2>CoffeeScript mode</h2>
 
     <p><strong>MIME types defined:</strong> <code>text/x-coffeescript</code>.</p>
 
-    <p>The CoffeeScript mode was written by Jeff Pickhardt (<a href="LICENSE">license</a>).</p>
+    <p>The CoffeeScript mode was written by Jeff Pickhardt.</p>
 
   </article>

From 050f15cd2d152fc2a49334d5262a02aa176a4f31 Mon Sep 17 00:00:00 2001
From: Peter Kroon <plakroon@gmail.com>
Date: Thu, 22 May 2014 15:33:24 +0200
Subject: [PATCH 1346/4742] [r] update link to twitter..

..website isn't available
---
 mode/r/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/r/index.html b/mode/r/index.html
index 397d5858a3..6e1d371968 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -80,6 +80,6 @@ <h2>R mode</h2>
     <p><strong>MIME types defined:</strong> <code>text/x-rsrc</code>.</p>
 
     <p>Development of the CodeMirror R mode was kindly sponsored
-    by <a href="http://ubalo.com/">Ubalo</a>.</p>
+    by <a href="https://twitter.com/ubalo">Ubalo</a>.</p>
 
   </article>

From 49ea6ad433f2fff3f5bacd8ffdfbfae0bee6a4f8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 26 May 2014 00:09:31 +0200
Subject: [PATCH 1347/4742] Restore version field in bower.json

---
 bin/release | 6 ++++--
 bower.json  | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/release b/bin/release
index 3c33290f3f..ba6630aaa8 100755
--- a/bin/release
+++ b/bin/release
@@ -20,9 +20,11 @@ rewrite("lib/codemirror.js", function(lib) {
   return lib.replace(/CodeMirror\.version = "\d+\.\d+\.\d+"/,
                      "CodeMirror.version = \"" + number + "\"");
 });
-rewrite("package.json", function(pack) {
+function rewriteJSON(pack) {
   return pack.replace(/"version":"\d+\.\d+\.\d+"/, "\"version\":\"" + number + "\"");
-});
+}
+rewrite("package.json", rewriteJSON);
+rewrite("bower.json", rewriteJSON);
 rewrite("doc/manual.html", function(manual) {
   return manual.replace(/>version \d+\.\d+\.\d+<\/span>/, ">version " + number + "</span>");
 });
diff --git a/bower.json b/bower.json
index 66e049dfbe..237898dc73 100644
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,6 @@
 {
   "name": "CodeMirror",
+  "version":"4.2.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",

From 43b94e94c51783aed2905993c9b9d7e8ef1aac62 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 26 May 2014 00:12:12 +0200
Subject: [PATCH 1348/4742] Make changeLine take a document, not an editor

Issue #2573
---
 lib/codemirror.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c9ffcf0bff..8cac230c7d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3713,12 +3713,12 @@
   // Utility for applying a change to a line by handle or number,
   // returning the number and optionally registering the line as
   // changed.
-  function changeLine(cm, handle, changeType, op) {
-    var no = handle, line = handle, doc = cm.doc;
+  function changeLine(doc, handle, changeType, op) {
+    var no = handle, line = handle;
     if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
     else no = lineNo(handle);
     if (no == null) return null;
-    if (op(line, no)) regLineChange(cm, no, changeType);
+    if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType);
     return line;
   }
 
@@ -4033,7 +4033,7 @@
     defaultCharWidth: function() { return charWidth(this.display); },
 
     setGutterMarker: methodOp(function(line, gutterID, value) {
-      return changeLine(this, line, "gutter", function(line) {
+      return changeLine(this.doc, line, "gutter", function(line) {
         var markers = line.gutterMarkers || (line.gutterMarkers = {});
         markers[gutterID] = value;
         if (!value && isEmpty(markers)) line.gutterMarkers = null;
@@ -4054,7 +4054,7 @@
     }),
 
     addLineClass: methodOp(function(handle, where, cls) {
-      return changeLine(this, handle, "class", function(line) {
+      return changeLine(this.doc, handle, "class", function(line) {
         var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
         if (!line[prop]) line[prop] = cls;
         else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
@@ -4064,7 +4064,7 @@
     }),
 
     removeLineClass: methodOp(function(handle, where, cls) {
-      return changeLine(this, handle, "class", function(line) {
+      return changeLine(this.doc, handle, "class", function(line) {
         var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
         var cur = line[prop];
         if (!cur) return false;
@@ -5547,7 +5547,7 @@
   function addLineWidget(cm, handle, node, options) {
     var widget = new LineWidget(cm, node, options);
     if (widget.noHScroll) cm.display.alignWidgets = true;
-    changeLine(cm, handle, "widget", function(line) {
+    changeLine(cm.doc, handle, "widget", function(line) {
       var widgets = line.widgets || (line.widgets = []);
       if (widget.insertAt == null) widgets.push(widget);
       else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);

From dbd3a6c838efc8b7620e28b7afa6af3e4370da8c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 26 May 2014 00:14:56 +0200
Subject: [PATCH 1349/4742] Move add/removeLineClass methods to document

The editor instances will inherit them from there.

Issue #2573
---
 doc/manual.html   |  4 ++--
 lib/codemirror.js | 51 +++++++++++++++++++++++------------------------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 660cf4a374..762ae70af8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1598,7 +1598,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       <dd>Remove all gutter markers in
       the <a href="#option_gutters">gutter</a> with the given ID.</dd>
 
-      <dt id="addLineClass"><code><strong>cm.addLineClass</strong>(line: integer|LineHandle, where: string, class: string) → LineHandle</code></dt>
+      <dt id="addLineClass"><code><strong>doc.addLineClass</strong>(line: integer|LineHandle, where: string, class: string) → LineHandle</code></dt>
       <dd>Set a CSS class name for the given line. <code>line</code>
       can be a number or a line handle. <code>where</code> determines
       to which element this class should be applied, can can be one
@@ -1609,7 +1609,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       gutter elements). <code>class</code> should be the name of the
       class to apply.</dd>
 
-      <dt id="removeLineClass"><code><strong>cm.removeLineClass</strong>(line: integer|LineHandle, where: string, class: string) → LineHandle</code></dt>
+      <dt id="removeLineClass"><code><strong>doc.removeLineClass</strong>(line: integer|LineHandle, where: string, class: string) → LineHandle</code></dt>
       <dd>Remove a CSS class from a line. <code>line</code> can be a
       line handle or number. <code>where</code> should be one
       of <code>"text"</code>, <code>"background"</code>,
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8cac230c7d..1cf813384a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4053,32 +4053,6 @@
       });
     }),
 
-    addLineClass: methodOp(function(handle, where, cls) {
-      return changeLine(this.doc, handle, "class", function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
-        if (!line[prop]) line[prop] = cls;
-        else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
-        else line[prop] += " " + cls;
-        return true;
-      });
-    }),
-
-    removeLineClass: methodOp(function(handle, where, cls) {
-      return changeLine(this.doc, handle, "class", function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
-        var cur = line[prop];
-        if (!cur) return false;
-        else if (cls == null) line[prop] = null;
-        else {
-          var found = cur.match(new RegExp("(?:^|\\s+)" + cls + "(?:$|\\s+)"));
-          if (!found) return false;
-          var end = found.index + found[0].length;
-          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
-        }
-        return true;
-      });
-    }),
-
     addLineWidget: methodOp(function(handle, node, options) {
       return addLineWidget(this, handle, node, options);
     }),
@@ -6352,6 +6326,31 @@
       hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
     },
 
+    addLineClass: docMethodOp(function(handle, where, cls) {
+      return changeLine(this, handle, "class", function(line) {
+        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
+        if (!line[prop]) line[prop] = cls;
+        else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
+        else line[prop] += " " + cls;
+        return true;
+      });
+    }),
+    removeLineClass: docMethodOp(function(handle, where, cls) {
+      return changeLine(this, handle, "class", function(line) {
+        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
+        var cur = line[prop];
+        if (!cur) return false;
+        else if (cls == null) line[prop] = null;
+        else {
+          var found = cur.match(new RegExp("(?:^|\\s+)" + cls + "(?:$|\\s+)"));
+          if (!found) return false;
+          var end = found.index + found[0].length;
+          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
+        }
+        return true;
+      });
+    }),
+
     markText: function(from, to, options) {
       return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
     },

From a6f596d7af9eac1f19b5627665e132ebe3c8a7e5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 26 May 2014 00:19:42 +0200
Subject: [PATCH 1350/4742] [real-world uses] Add Coderpad

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

diff --git a/doc/realworld.html b/doc/realworld.html
index d3e4c07f6a..47a4ffde83 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -46,6 +46,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://code.google.com/p/codemirror2-gwt/">CodeMirror2-GWT</a> (Google Web Toolkit wrapper)</li>
       <li><a href="http://www.crunchzilla.com/code-monster">Code Monster</a> & <a href="http://www.crunchzilla.com/code-maven">Code Maven</a> (learning environment)</li>
       <li><a href="http://codepen.io">Codepen</a> (gallery of animations)</li>
+      <li><a href="https://coderpad.io/">Coderpad</a> (interviewing tool)</li>
       <li><a href="http://sasstwo.codeschool.com/levels/1/challenges/1">Code School</a> (online tech learning environment)</li>
       <li><a href="http://code-snippets.bungeshea.com/">Code Snippets</a> (WordPress snippet management plugin)</li>
       <li><a href="http://antonmi.github.io/code_together/">Code together</a> (collaborative editing)</li>

From fac94560d2a1fb26902ea74df8de0fefc87d2457 Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Sat, 24 May 2014 12:50:06 +0800
Subject: [PATCH 1351/4742] [active-line addon] Don't highlight line(s) with a
 selection.

This fixes non-empty selections having 2 highlights: the selection highlight
and the active-line highlight. Non-empty selections should only have the
selection highlight.
---
 addon/selection/active-line.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index 28b9e018b3..22da2e0aac 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -49,7 +49,9 @@
   function updateActiveLines(cm, ranges) {
     var active = [];
     for (var i = 0; i < ranges.length; i++) {
-      var line = cm.getLineHandleVisualStart(ranges[i].head.line);
+      var range = ranges[i];
+      if (!range.empty()) continue;
+      var line = cm.getLineHandleVisualStart(range.head.line);
       if (active[active.length - 1] != line) active.push(line);
     }
     if (sameArray(cm.state.activeLines, active)) return;

From c09f54c1b72d2c302c360120522815d159609261 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Fri, 23 May 2014 11:49:36 +0530
Subject: [PATCH 1352/4742] [vim keymap] visual_gv reimplementation

---
 keymap/vim.js    | 63 +++++++++++++++++++++++++++++++++++++++---------
 test/vim_test.js | 33 +++++++++++++++++++------
 2 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index af16b3d81b..687945d14c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -618,7 +618,8 @@
           visualMode: false,
           // If we are in visual line mode. No effect if visualMode is false.
           visualLine: false,
-          lastSelection: null
+          lastSelection: null,
+          lastPastedText: null
         };
       }
       return cm.state.vim;
@@ -2008,9 +2009,20 @@
             : curStart);
       },
       reselectLastSelection: function(cm, _actionArgs, vim) {
-        if (vim.lastSelection) {
-          var lastSelection = vim.lastSelection;
-          cm.setSelection(lastSelection.curStart, lastSelection.curEnd);
+        var lastSelection = vim.lastSelection;
+        if (lastSelection) {
+          var curStart = lastSelection.curStartMark.find();
+          var curEnd = lastSelection.curEndMark.find();
+          cm.setSelection(curStart, curEnd);
+          if (vim.visualMode) {
+            updateLastSelection(cm, vim);
+            var selectionStart = cm.getCursor('anchor');
+            var selectionEnd = cm.getCursor('head');
+            updateMark(cm, vim, '<', cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
+            : selectionEnd);
+            updateMark(cm, vim, '>', cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
+            : selectionStart);
+          }
           if (lastSelection.visualLine) {
             vim.visualMode = true;
             vim.visualLine = true;
@@ -2124,12 +2136,19 @@
         var curPosFinal;
         var idx;
         if (vim.visualMode) {
+          //  save the pasted text for reselection if the need arises
+          vim.lastPastedText = text;
+          var lastSelectionCurEnd;
           var selectedArea = getSelectedAreaRange(cm, vim);
           var selectionStart = selectedArea[0];
           var selectionEnd = selectedArea[1];
+          // save the curEnd marker before it get cleared due to cm.replaceRange.
+          if (vim.lastSelection) lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
           // push the previously selected text to unnamed register
           vimGlobalState.registerController.unnamedRegister.setText(cm.getRange(selectionStart, selectionEnd));
           cm.replaceRange(text, selectionStart, selectionEnd);
+          // restore the the curEnd marker
+          if(lastSelectionCurEnd) vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
           curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
           if(linewise)curPosFinal.ch=0;
         } else {
@@ -2248,9 +2267,13 @@
         var selectedAreaRange = getSelectedAreaRange(cm, vim);
         var selectionStart = selectedAreaRange[0];
         var selectionEnd = selectedAreaRange[1];
+        // save the curEnd marker to avoid its removal due to cm.replaceRange
+        var lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
         var toLower = actionArgs.toLower;
         var text = cm.getRange(selectionStart, selectionEnd);
         cm.replaceRange(toLower ? text.toLowerCase() : text.toUpperCase(), selectionStart, selectionEnd);
+        // restore the last selection curEnd marker
+        vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
         cm.setCursor(selectionStart);
       }
     };
@@ -2339,8 +2362,10 @@
       var selectionEnd = cm.getCursor('head');
       var lastSelection = vim.lastSelection;
       if (!vim.visualMode) {
-        var line = lastSelection.curEnd.line - lastSelection.curStart.line;
-        var ch = line ? lastSelection.curEnd.ch : lastSelection.curEnd.ch - lastSelection.curStart.ch;
+        var lastSelectionCurStart = vim.lastSelection.curStartMark.find();
+        var lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
+        var line = lastSelectionCurEnd.line - lastSelectionCurStart.line;
+        var ch = line ? lastSelectionCurEnd.ch : lastSelectionCurEnd.ch - lastSelectionCurStart.ch;
         selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
         if (lastSelection.visualLine) {
           return [{line: selectionStart.line, ch: 0}, {line: selectionEnd.line, ch: lineLength(cm, selectionEnd.line)}];
@@ -2357,18 +2382,32 @@
       }
       return [selectionStart, selectionEnd];
     }
+    function updateLastSelection(cm, vim) {
+      // We need the vim mark '<' to get the selection in case of yank and put
+      var selectionStart =  vim.marks['<'].find() || cm.getCursor('anchor');
+      var selectionEnd =  vim.marks['>'].find() ||cm.getCursor('head');
+      // To accommodate the effect lastPastedText in the last selection
+      if (vim.lastPastedText) {
+        selectionEnd = cm.posFromIndex(cm.indexFromPos(selectionStart) + vim.lastPastedText.length-1);
+        vim.lastPastedText = null;
+      }
+      // can't use selection state here because yank has already reset its cursor
+      // Also, Bookmarks make the visual selections robust to edit operations
+      vim.lastSelection = {'curStartMark': cm.setBookmark(selectionStart), 'curEndMark': cm.setBookmark(selectionEnd), 'visualMode': vim.visualMode, 'visualLine': vim.visualLine};
+      if (cursorIsBefore(selectionEnd, selectionStart)) {
+        vim.lastSelection.curStartMark = cm.setBookmark(selectionEnd);
+        vim.lastSelection.curEndMark = cm.setBookmark(selectionStart);
+      }
+    }
 
     function exitVisualMode(cm) {
       cm.off('mousedown', exitVisualMode);
       var vim = cm.state.vim;
-      // can't use selection state here because yank has already reset its cursor
-      vim.lastSelection = {'curStart': vim.marks['<'].find(),
-        'curEnd': vim.marks['>'].find(), 'visualMode': vim.visualMode,
-        'visualLine': vim.visualLine};
-      vim.visualMode = false;
-      vim.visualLine = false;
       var selectionStart = cm.getCursor('anchor');
       var selectionEnd = cm.getCursor('head');
+      updateLastSelection(cm, vim);
+      vim.visualMode = false;
+      vim.visualLine = false;
       if (!cursorEqual(selectionStart, selectionEnd)) {
         // Clear the selection and set the cursor only if the selection has not
         // already been cleared. Otherwise we risk moving the cursor somewhere
diff --git a/test/vim_test.js b/test/vim_test.js
index 57fa9eb3a8..89e1a40c8c 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1591,16 +1591,35 @@ testVim('visual_blank', function(cm, vim, helpers) {
   eq(vim.visualMode, true);
 }, { value: '\n' });
 testVim('reselect_visual', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l', 'y', 'g', 'v');
-  helpers.assertCursorAt(0, 3);
+  helpers.doKeys('l', 'v', 'l', 'l', 'l', 'y', 'g', 'v');
+  helpers.assertCursorAt(0, 4);
   eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
-  helpers.doKeys('d');
-  eq('15', cm.getValue());
-}, { value: '12345' });
+  helpers.doKeys('v');
+  cm.setCursor(1, 0);
+  helpers.doKeys('v', 'l', 'l', 'p');
+  eq('123456\n2345\nbar', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('g', 'v');
+  helpers.assertCursorAt(1, 3);
+  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
+  helpers.doKeys('v');
+  cm.setCursor(2, 0);
+  helpers.doKeys('v', 'l', 'l', 'g', 'v');
+  helpers.assertCursorAt(1, 3);
+  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
+  helpers.doKeys('g', 'v');
+  helpers.assertCursorAt(2, 2);
+  eqPos(makeCursor(2, 0), cm.getCursor('anchor'));
+  eq('123456\n2345\nbar', cm.getValue());
+}, { value: '123456\nfoo\nbar' });
 testVim('reselect_visual_line', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'V', 'g', 'v', 'd');
-  eq(' 4\n 5', cm.getValue());
-}, { value: ' 1\n 2\n 3\n 4\n 5' });
+  eq(' foo\n and\n bar', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('V', 'y', 'j');
+  helpers.doKeys('V', 'p' , 'g', 'v', 'd');
+  eq(' foo\n bar', cm.getValue());
+}, { value: ' hello\n this\n is \n foo\n and\n bar' });
 testVim('s_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('s');

From c9192fc9b1ca26ea1f140d1098c391f8785e59a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 26 May 2014 11:19:41 +0200
Subject: [PATCH 1353/4742] Try to work around nonsense horizontal scrollbar
 issue in Chrome

Issue #2562
---
 lib/codemirror.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1cf813384a..aec908d105 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -392,6 +392,10 @@
 
   // SCROLLBARS
 
+  function hScrollbarTakesSpace(cm) {
+    return cm.display.scroller.clientHeight - cm.display.wrapper.clientHeight < scrollerCutOff - 3;
+  }
+
   // Prepare DOM reads needed to update the scrollbars. Done in one
   // shot to minimize update/measure roundtrips.
   function measureForScrollbars(cm) {
@@ -400,6 +404,7 @@
       clientHeight: scroll.clientHeight,
       barHeight: cm.display.scrollbarV.clientHeight,
       scrollWidth: scroll.scrollWidth, clientWidth: scroll.clientWidth,
+      hScrollbarTakesSpace: hScrollbarTakesSpace(cm),
       barWidth: cm.display.scrollbarH.clientWidth,
       docHeight: Math.round(cm.doc.height + paddingVert(cm.display))
     };
@@ -409,13 +414,17 @@
   // content.
   function updateScrollbars(cm, measure) {
     if (!measure) measure = measureForScrollbars(cm);
-    var d = cm.display;
+    var d = cm.display, sWidth = scrollbarWidth(d.measure);
     var scrollHeight = measure.docHeight + scrollerCutOff;
     var needsH = measure.scrollWidth > measure.clientWidth;
+    if (needsH && measure.scrollWidth <= measure.clientWidth + 1 &&
+        sWidth > 0 && !measure.hScrollbarTakesSpace)
+      needsH = false; // (Issue #2562)
     var needsV = scrollHeight > measure.clientHeight;
+
     if (needsV) {
       d.scrollbarV.style.display = "block";
-      d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";
+      d.scrollbarV.style.bottom = needsH ? sWidth + "px" : "0";
       // A bug in IE8 can cause this value to be negative, so guard it.
       d.scrollbarV.firstChild.style.height =
         Math.max(0, scrollHeight - measure.clientHeight + (measure.barHeight || d.scrollbarV.clientHeight)) + "px";
@@ -425,7 +434,7 @@
     }
     if (needsH) {
       d.scrollbarH.style.display = "block";
-      d.scrollbarH.style.right = needsV ? scrollbarWidth(d.measure) + "px" : "0";
+      d.scrollbarH.style.right = needsV ? sWidth + "px" : "0";
       d.scrollbarH.firstChild.style.width =
         (measure.scrollWidth - measure.clientWidth + (measure.barWidth || d.scrollbarH.clientWidth)) + "px";
     } else {
@@ -434,16 +443,16 @@
     }
     if (needsH && needsV) {
       d.scrollbarFiller.style.display = "block";
-      d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = scrollbarWidth(d.measure) + "px";
+      d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = sWidth + "px";
     } else d.scrollbarFiller.style.display = "";
     if (needsH && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
       d.gutterFiller.style.display = "block";
-      d.gutterFiller.style.height = scrollbarWidth(d.measure) + "px";
+      d.gutterFiller.style.height = sWidth + "px";
       d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
     } else d.gutterFiller.style.display = "";
 
     if (!cm.state.checkedOverlayScrollbar && measure.clientHeight > 0) {
-      if (scrollbarWidth(d.measure) === 0) {
+      if (sWidth === 0) {
         var w = mac && !mac_geMountainLion ? "12px" : "18px";
         d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = w;
         var barMouseDown = function(e) {
@@ -558,6 +567,10 @@
       updateScrollbars(cm, barMeasure);
       if (webkit && cm.options.lineWrapping)
         checkForWebkitWidthBug(cm, barMeasure); // (Issue #2420)
+      if (webkit && barMeasure.scrollWidth > barMeasure.clientWidth &&
+          barMeasure.scrollWidth < barMeasure.clientWidth + 1 &&
+          !hScrollbarTakesSpace(cm))
+        updateScrollbars(cm); // (Issue #2562)
       if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
         forced = true;
         continue;

From 4a6f4268ae7fd3ded7d1d47c4ac7c72fb7fb3664 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Wed, 28 May 2014 15:49:25 -0700
Subject: [PATCH 1354/4742] [clike mode] Fix C++11 multiline string parsing bug

The issue can be seen on http://codemirror.net/mode/clike/index.html. In the C++ raw_string line, place the cursor after 'delim(' and type '('. Currently this causes a regexp error, which this patch fixes.
---
 mode/clike/clike.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index e5b4854d63..1e7c12d390 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -242,7 +242,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   // C++11 raw string literal is <prefix>"<delim>( anything )<delim>", where
   // <delim> can be a string up to 16 characters long.
   function tokenRawString(stream, state) {
-    var closingSequence = new RegExp(".*?\\)" + state.cpp11RawStringDelim + '"');
+    var closingSequence = new RegExp(
+      ".*?\\)" +
+      // Escape characters that have special regex meanings.
+      state.cpp11RawStringDelim.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') +
+      '"');
     var match = stream.match(closingSequence);
     if (match) {
       state.tokenize = null;

From 8385570338c225f56249d58b5b345a1bfd05fa4b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 29 May 2014 22:58:05 +0200
Subject: [PATCH 1355/4742] [clike mode] Simplify regexp character escaping

Issue #2594
---
 mode/clike/clike.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 1e7c12d390..24f8762508 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -242,17 +242,13 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   // C++11 raw string literal is <prefix>"<delim>( anything )<delim>", where
   // <delim> can be a string up to 16 characters long.
   function tokenRawString(stream, state) {
-    var closingSequence = new RegExp(
-      ".*?\\)" +
-      // Escape characters that have special regex meanings.
-      state.cpp11RawStringDelim.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') +
-      '"');
-    var match = stream.match(closingSequence);
-    if (match) {
+    // Escape characters that have special regex meanings.
+    var delim = state.cpp11RawStringDelim.replace(/[^\w\s]/g, '\\$&');
+    var match = stream.match(new RegExp(".*?\\)" + delim + '"'));
+    if (match)
       state.tokenize = null;
-    } else {
+    else
       stream.skipToEnd();
-    }
     return "string";
   }
 

From d4c0fffb36cb3aa281e42eaaea2219b79236b08a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 29 May 2014 23:30:01 +0200
Subject: [PATCH 1356/4742] Don't handle character bindings when ctrl is down

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index aec908d105..1683a488c5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3111,7 +3111,7 @@
 
   function onKeyPress(e) {
     var cm = this;
-    if (signalDOMEvent(cm, e)) return;
+    if (signalDOMEvent(cm, e) || e.ctrlKey) return;
     var keyCode = e.keyCode, charCode = e.charCode;
     if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
     if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;

From 34ec60cd09b05c48af6c6c71eff418dae5d1c488 Mon Sep 17 00:00:00 2001
From: Maksym Taran <mtaran@google.com>
Date: Tue, 27 May 2014 17:46:27 -0700
Subject: [PATCH 1357/4742] Enable hiding the cursor

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

diff --git a/doc/manual.html b/doc/manual.html
index 762ae70af8..bc1b2b5c26 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -370,7 +370,8 @@ <h2>Configuration</h2>
 
       <dt id="option_cursorBlinkRate"><code><strong>cursorBlinkRate</strong>: number</code></dt>
       <dd>Half-period in milliseconds used for cursor blinking. The default blink
-      rate is 530ms. By setting this to zero, blinking can be disabled.</dd>
+      rate is 530ms. By setting this to zero, blinking can be disabled. A
+      negative value hides the cursor entirely.</dd>
 
       <dt id="option_cursorScrollMargin"><code><strong>cursorScrollMargin</strong>: number</code></dt>
       <dd>How much extra space to always keep above and below the
@@ -1199,7 +1200,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       merged). Each object in the array contains <code>anchor</code>
       and <code>head</code> properties referring to <code>{line,
       ch}</code> objects.</dd>
-      
+
       <dt id="somethingSelected"><code><strong>doc.somethingSelected</strong>() → boolean</code></dt>
       <dd>Return true if any text is selected.</dd>
       <dt id="setCursor"><code><strong>doc.setCursor</strong>(pos: {line, ch}|number, ?ch: number, ?options: object)</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1683a488c5..fe0a0d2df5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1390,6 +1390,8 @@
       display.blinker = setInterval(function() {
         display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
       }, cm.options.cursorBlinkRate);
+    else if (cm.options.cursorBlinkRate < 0)
+      display.cursorDiv.style.visibility = "hidden";
   }
 
   // HIGHLIGHT WORKER

From c268cb836228be53893e2c6fe49fdd957228bb1b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 1 Jun 2014 09:20:49 +0200
Subject: [PATCH 1358/4742] Also bail out of keypress events when on mac and
 metaKey is down

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fe0a0d2df5..bcb5836ab7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3113,7 +3113,7 @@
 
   function onKeyPress(e) {
     var cm = this;
-    if (signalDOMEvent(cm, e) || e.ctrlKey) return;
+    if (signalDOMEvent(cm, e) || e.ctrlKey || mac && e.metaKey) return;
     var keyCode = e.keyCode, charCode = e.charCode;
     if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
     if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;

From 4b047883fe42798020a241d195f8c0b4a8b6eb66 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Tue, 27 May 2014 11:49:15 -0700
Subject: [PATCH 1359/4742] repeat insert mode for macros

---
 keymap/vim.js    | 69 +++++++++++-------------------------------------
 test/vim_test.js | 51 ++++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 79 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 687945d14c..30e128082b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -618,8 +618,7 @@
           visualMode: false,
           // If we are in visual line mode. No effect if visualMode is false.
           visualLine: false,
-          lastSelection: null,
-          lastPastedText: null
+          lastSelection: null
         };
       }
       return cm.state.vim;
@@ -2009,20 +2008,9 @@
             : curStart);
       },
       reselectLastSelection: function(cm, _actionArgs, vim) {
-        var lastSelection = vim.lastSelection;
-        if (lastSelection) {
-          var curStart = lastSelection.curStartMark.find();
-          var curEnd = lastSelection.curEndMark.find();
-          cm.setSelection(curStart, curEnd);
-          if (vim.visualMode) {
-            updateLastSelection(cm, vim);
-            var selectionStart = cm.getCursor('anchor');
-            var selectionEnd = cm.getCursor('head');
-            updateMark(cm, vim, '<', cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
-            : selectionEnd);
-            updateMark(cm, vim, '>', cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
-            : selectionStart);
-          }
+        if (vim.lastSelection) {
+          var lastSelection = vim.lastSelection;
+          cm.setSelection(lastSelection.curStart, lastSelection.curEnd);
           if (lastSelection.visualLine) {
             vim.visualMode = true;
             vim.visualLine = true;
@@ -2136,19 +2124,12 @@
         var curPosFinal;
         var idx;
         if (vim.visualMode) {
-          //  save the pasted text for reselection if the need arises
-          vim.lastPastedText = text;
-          var lastSelectionCurEnd;
           var selectedArea = getSelectedAreaRange(cm, vim);
           var selectionStart = selectedArea[0];
           var selectionEnd = selectedArea[1];
-          // save the curEnd marker before it get cleared due to cm.replaceRange.
-          if (vim.lastSelection) lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
           // push the previously selected text to unnamed register
           vimGlobalState.registerController.unnamedRegister.setText(cm.getRange(selectionStart, selectionEnd));
           cm.replaceRange(text, selectionStart, selectionEnd);
-          // restore the the curEnd marker
-          if(lastSelectionCurEnd) vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
           curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
           if(linewise)curPosFinal.ch=0;
         } else {
@@ -2267,13 +2248,9 @@
         var selectedAreaRange = getSelectedAreaRange(cm, vim);
         var selectionStart = selectedAreaRange[0];
         var selectionEnd = selectedAreaRange[1];
-        // save the curEnd marker to avoid its removal due to cm.replaceRange
-        var lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
         var toLower = actionArgs.toLower;
         var text = cm.getRange(selectionStart, selectionEnd);
         cm.replaceRange(toLower ? text.toLowerCase() : text.toUpperCase(), selectionStart, selectionEnd);
-        // restore the last selection curEnd marker
-        vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
         cm.setCursor(selectionStart);
       }
     };
@@ -2362,10 +2339,8 @@
       var selectionEnd = cm.getCursor('head');
       var lastSelection = vim.lastSelection;
       if (!vim.visualMode) {
-        var lastSelectionCurStart = vim.lastSelection.curStartMark.find();
-        var lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
-        var line = lastSelectionCurEnd.line - lastSelectionCurStart.line;
-        var ch = line ? lastSelectionCurEnd.ch : lastSelectionCurEnd.ch - lastSelectionCurStart.ch;
+        var line = lastSelection.curEnd.line - lastSelection.curStart.line;
+        var ch = line ? lastSelection.curEnd.ch : lastSelection.curEnd.ch - lastSelection.curStart.ch;
         selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
         if (lastSelection.visualLine) {
           return [{line: selectionStart.line, ch: 0}, {line: selectionEnd.line, ch: lineLength(cm, selectionEnd.line)}];
@@ -2382,32 +2357,18 @@
       }
       return [selectionStart, selectionEnd];
     }
-    function updateLastSelection(cm, vim) {
-      // We need the vim mark '<' to get the selection in case of yank and put
-      var selectionStart =  vim.marks['<'].find() || cm.getCursor('anchor');
-      var selectionEnd =  vim.marks['>'].find() ||cm.getCursor('head');
-      // To accommodate the effect lastPastedText in the last selection
-      if (vim.lastPastedText) {
-        selectionEnd = cm.posFromIndex(cm.indexFromPos(selectionStart) + vim.lastPastedText.length-1);
-        vim.lastPastedText = null;
-      }
-      // can't use selection state here because yank has already reset its cursor
-      // Also, Bookmarks make the visual selections robust to edit operations
-      vim.lastSelection = {'curStartMark': cm.setBookmark(selectionStart), 'curEndMark': cm.setBookmark(selectionEnd), 'visualMode': vim.visualMode, 'visualLine': vim.visualLine};
-      if (cursorIsBefore(selectionEnd, selectionStart)) {
-        vim.lastSelection.curStartMark = cm.setBookmark(selectionEnd);
-        vim.lastSelection.curEndMark = cm.setBookmark(selectionStart);
-      }
-    }
 
     function exitVisualMode(cm) {
       cm.off('mousedown', exitVisualMode);
       var vim = cm.state.vim;
-      var selectionStart = cm.getCursor('anchor');
-      var selectionEnd = cm.getCursor('head');
-      updateLastSelection(cm, vim);
+      // can't use selection state here because yank has already reset its cursor
+      vim.lastSelection = {'curStart': vim.marks['<'].find(),
+        'curEnd': vim.marks['>'].find(), 'visualMode': vim.visualMode,
+        'visualLine': vim.visualLine};
       vim.visualMode = false;
       vim.visualLine = false;
+      var selectionStart = cm.getCursor('anchor');
+      var selectionEnd = cm.getCursor('head');
       if (!cursorEqual(selectionStart, selectionEnd)) {
         // Clear the selection and set the cursor only if the selection has not
         // already been cleared. Otherwise we risk moving the cursor somewhere
@@ -4104,8 +4065,10 @@
           text = text.substring(match.index + key.length);
           CodeMirror.Vim.handleKey(cm, key);
           if (vim.insertMode) {
-            repeatInsertModeChanges(
-                cm, register.insertModeChanges[imc++].changes, 1);
+            var changes = register.insertModeChanges[imc++].changes;
+            vimGlobalState.macroModeState.lastInsertModeChanges.changes =
+                changes;
+            repeatInsertModeChanges(cm, changes, 1);
             exitInsertMode(cm);
           }
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index 89e1a40c8c..7e720ebc82 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1591,35 +1591,16 @@ testVim('visual_blank', function(cm, vim, helpers) {
   eq(vim.visualMode, true);
 }, { value: '\n' });
 testVim('reselect_visual', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l', 'l', 'y', 'g', 'v');
-  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('l', 'v', 'l', 'l', 'y', 'g', 'v');
+  helpers.assertCursorAt(0, 3);
   eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
-  helpers.doKeys('v');
-  cm.setCursor(1, 0);
-  helpers.doKeys('v', 'l', 'l', 'p');
-  eq('123456\n2345\nbar', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('g', 'v');
-  helpers.assertCursorAt(1, 3);
-  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
-  helpers.doKeys('v');
-  cm.setCursor(2, 0);
-  helpers.doKeys('v', 'l', 'l', 'g', 'v');
-  helpers.assertCursorAt(1, 3);
-  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
-  helpers.doKeys('g', 'v');
-  helpers.assertCursorAt(2, 2);
-  eqPos(makeCursor(2, 0), cm.getCursor('anchor'));
-  eq('123456\n2345\nbar', cm.getValue());
-}, { value: '123456\nfoo\nbar' });
+  helpers.doKeys('d');
+  eq('15', cm.getValue());
+}, { value: '12345' });
 testVim('reselect_visual_line', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'V', 'g', 'v', 'd');
-  eq(' foo\n and\n bar', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('V', 'y', 'j');
-  helpers.doKeys('V', 'p' , 'g', 'v', 'd');
-  eq(' foo\n bar', cm.getValue());
-}, { value: ' hello\n this\n is \n foo\n and\n bar' });
+  eq(' 4\n 5', cm.getValue());
+}, { value: ' 1\n 2\n 3\n 4\n 5' });
 testVim('s_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('s');
@@ -1886,6 +1867,24 @@ testVim('macro_insert', function(cm, vim, helpers) {
   helpers.doKeys('q', '@', 'a');
   eq('foofoo', cm.getValue());
 }, { value: ''});
+testVim('macro_insert_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', '$', 'a');
+  cm.replaceRange('larry.', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('a');
+  cm.replaceRange('curly.', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('q');
+  helpers.doKeys('a');
+  cm.replaceRange('moe.', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('@', 'a');
+  // At this point, the most recent edit should be the 2nd insert change
+  // inside the macro, i.e. "curly.".
+  helpers.doKeys('.');
+  eq('larry.curly.moe.larry.curly.curly.', cm.getValue());
+}, { value: ''});
 testVim('macro_space', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('<Space>', '<Space>');

From aca3ddd870283d9d20715557b6a406b6eda1865b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Mon, 2 Jun 2014 14:37:49 -0700
Subject: [PATCH 1360/4742] Revert "repeat insert mode for macros"

This reverts commit 4b047883fe42798020a241d195f8c0b4a8b6eb66.
---
 keymap/vim.js    | 69 +++++++++++++++++++++++++++++++++++++-----------
 test/vim_test.js | 51 +++++++++++++++++------------------
 2 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 30e128082b..687945d14c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -618,7 +618,8 @@
           visualMode: false,
           // If we are in visual line mode. No effect if visualMode is false.
           visualLine: false,
-          lastSelection: null
+          lastSelection: null,
+          lastPastedText: null
         };
       }
       return cm.state.vim;
@@ -2008,9 +2009,20 @@
             : curStart);
       },
       reselectLastSelection: function(cm, _actionArgs, vim) {
-        if (vim.lastSelection) {
-          var lastSelection = vim.lastSelection;
-          cm.setSelection(lastSelection.curStart, lastSelection.curEnd);
+        var lastSelection = vim.lastSelection;
+        if (lastSelection) {
+          var curStart = lastSelection.curStartMark.find();
+          var curEnd = lastSelection.curEndMark.find();
+          cm.setSelection(curStart, curEnd);
+          if (vim.visualMode) {
+            updateLastSelection(cm, vim);
+            var selectionStart = cm.getCursor('anchor');
+            var selectionEnd = cm.getCursor('head');
+            updateMark(cm, vim, '<', cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
+            : selectionEnd);
+            updateMark(cm, vim, '>', cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
+            : selectionStart);
+          }
           if (lastSelection.visualLine) {
             vim.visualMode = true;
             vim.visualLine = true;
@@ -2124,12 +2136,19 @@
         var curPosFinal;
         var idx;
         if (vim.visualMode) {
+          //  save the pasted text for reselection if the need arises
+          vim.lastPastedText = text;
+          var lastSelectionCurEnd;
           var selectedArea = getSelectedAreaRange(cm, vim);
           var selectionStart = selectedArea[0];
           var selectionEnd = selectedArea[1];
+          // save the curEnd marker before it get cleared due to cm.replaceRange.
+          if (vim.lastSelection) lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
           // push the previously selected text to unnamed register
           vimGlobalState.registerController.unnamedRegister.setText(cm.getRange(selectionStart, selectionEnd));
           cm.replaceRange(text, selectionStart, selectionEnd);
+          // restore the the curEnd marker
+          if(lastSelectionCurEnd) vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
           curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
           if(linewise)curPosFinal.ch=0;
         } else {
@@ -2248,9 +2267,13 @@
         var selectedAreaRange = getSelectedAreaRange(cm, vim);
         var selectionStart = selectedAreaRange[0];
         var selectionEnd = selectedAreaRange[1];
+        // save the curEnd marker to avoid its removal due to cm.replaceRange
+        var lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
         var toLower = actionArgs.toLower;
         var text = cm.getRange(selectionStart, selectionEnd);
         cm.replaceRange(toLower ? text.toLowerCase() : text.toUpperCase(), selectionStart, selectionEnd);
+        // restore the last selection curEnd marker
+        vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
         cm.setCursor(selectionStart);
       }
     };
@@ -2339,8 +2362,10 @@
       var selectionEnd = cm.getCursor('head');
       var lastSelection = vim.lastSelection;
       if (!vim.visualMode) {
-        var line = lastSelection.curEnd.line - lastSelection.curStart.line;
-        var ch = line ? lastSelection.curEnd.ch : lastSelection.curEnd.ch - lastSelection.curStart.ch;
+        var lastSelectionCurStart = vim.lastSelection.curStartMark.find();
+        var lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
+        var line = lastSelectionCurEnd.line - lastSelectionCurStart.line;
+        var ch = line ? lastSelectionCurEnd.ch : lastSelectionCurEnd.ch - lastSelectionCurStart.ch;
         selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
         if (lastSelection.visualLine) {
           return [{line: selectionStart.line, ch: 0}, {line: selectionEnd.line, ch: lineLength(cm, selectionEnd.line)}];
@@ -2357,18 +2382,32 @@
       }
       return [selectionStart, selectionEnd];
     }
+    function updateLastSelection(cm, vim) {
+      // We need the vim mark '<' to get the selection in case of yank and put
+      var selectionStart =  vim.marks['<'].find() || cm.getCursor('anchor');
+      var selectionEnd =  vim.marks['>'].find() ||cm.getCursor('head');
+      // To accommodate the effect lastPastedText in the last selection
+      if (vim.lastPastedText) {
+        selectionEnd = cm.posFromIndex(cm.indexFromPos(selectionStart) + vim.lastPastedText.length-1);
+        vim.lastPastedText = null;
+      }
+      // can't use selection state here because yank has already reset its cursor
+      // Also, Bookmarks make the visual selections robust to edit operations
+      vim.lastSelection = {'curStartMark': cm.setBookmark(selectionStart), 'curEndMark': cm.setBookmark(selectionEnd), 'visualMode': vim.visualMode, 'visualLine': vim.visualLine};
+      if (cursorIsBefore(selectionEnd, selectionStart)) {
+        vim.lastSelection.curStartMark = cm.setBookmark(selectionEnd);
+        vim.lastSelection.curEndMark = cm.setBookmark(selectionStart);
+      }
+    }
 
     function exitVisualMode(cm) {
       cm.off('mousedown', exitVisualMode);
       var vim = cm.state.vim;
-      // can't use selection state here because yank has already reset its cursor
-      vim.lastSelection = {'curStart': vim.marks['<'].find(),
-        'curEnd': vim.marks['>'].find(), 'visualMode': vim.visualMode,
-        'visualLine': vim.visualLine};
-      vim.visualMode = false;
-      vim.visualLine = false;
       var selectionStart = cm.getCursor('anchor');
       var selectionEnd = cm.getCursor('head');
+      updateLastSelection(cm, vim);
+      vim.visualMode = false;
+      vim.visualLine = false;
       if (!cursorEqual(selectionStart, selectionEnd)) {
         // Clear the selection and set the cursor only if the selection has not
         // already been cleared. Otherwise we risk moving the cursor somewhere
@@ -4065,10 +4104,8 @@
           text = text.substring(match.index + key.length);
           CodeMirror.Vim.handleKey(cm, key);
           if (vim.insertMode) {
-            var changes = register.insertModeChanges[imc++].changes;
-            vimGlobalState.macroModeState.lastInsertModeChanges.changes =
-                changes;
-            repeatInsertModeChanges(cm, changes, 1);
+            repeatInsertModeChanges(
+                cm, register.insertModeChanges[imc++].changes, 1);
             exitInsertMode(cm);
           }
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index 7e720ebc82..89e1a40c8c 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1591,16 +1591,35 @@ testVim('visual_blank', function(cm, vim, helpers) {
   eq(vim.visualMode, true);
 }, { value: '\n' });
 testVim('reselect_visual', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l', 'y', 'g', 'v');
-  helpers.assertCursorAt(0, 3);
+  helpers.doKeys('l', 'v', 'l', 'l', 'l', 'y', 'g', 'v');
+  helpers.assertCursorAt(0, 4);
   eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
-  helpers.doKeys('d');
-  eq('15', cm.getValue());
-}, { value: '12345' });
+  helpers.doKeys('v');
+  cm.setCursor(1, 0);
+  helpers.doKeys('v', 'l', 'l', 'p');
+  eq('123456\n2345\nbar', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('g', 'v');
+  helpers.assertCursorAt(1, 3);
+  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
+  helpers.doKeys('v');
+  cm.setCursor(2, 0);
+  helpers.doKeys('v', 'l', 'l', 'g', 'v');
+  helpers.assertCursorAt(1, 3);
+  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
+  helpers.doKeys('g', 'v');
+  helpers.assertCursorAt(2, 2);
+  eqPos(makeCursor(2, 0), cm.getCursor('anchor'));
+  eq('123456\n2345\nbar', cm.getValue());
+}, { value: '123456\nfoo\nbar' });
 testVim('reselect_visual_line', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'V', 'g', 'v', 'd');
-  eq(' 4\n 5', cm.getValue());
-}, { value: ' 1\n 2\n 3\n 4\n 5' });
+  eq(' foo\n and\n bar', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('V', 'y', 'j');
+  helpers.doKeys('V', 'p' , 'g', 'v', 'd');
+  eq(' foo\n bar', cm.getValue());
+}, { value: ' hello\n this\n is \n foo\n and\n bar' });
 testVim('s_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('s');
@@ -1867,24 +1886,6 @@ testVim('macro_insert', function(cm, vim, helpers) {
   helpers.doKeys('q', '@', 'a');
   eq('foofoo', cm.getValue());
 }, { value: ''});
-testVim('macro_insert_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', '$', 'a');
-  cm.replaceRange('larry.', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
-  helpers.doKeys('a');
-  cm.replaceRange('curly.', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
-  helpers.doKeys('q');
-  helpers.doKeys('a');
-  cm.replaceRange('moe.', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
-  helpers.doKeys('@', 'a');
-  // At this point, the most recent edit should be the 2nd insert change
-  // inside the macro, i.e. "curly.".
-  helpers.doKeys('.');
-  eq('larry.curly.moe.larry.curly.curly.', cm.getValue());
-}, { value: ''});
 testVim('macro_space', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('<Space>', '<Space>');

From ad83f54544f7ca540cf5a176e3e0586ef622e77a Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Tue, 27 May 2014 11:49:15 -0700
Subject: [PATCH 1361/4742] [vim] Repeat insert mode for macros

---
 keymap/vim.js    |  6 ++++--
 test/vim_test.js | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 687945d14c..8ec674bd57 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4104,8 +4104,10 @@
           text = text.substring(match.index + key.length);
           CodeMirror.Vim.handleKey(cm, key);
           if (vim.insertMode) {
-            repeatInsertModeChanges(
-                cm, register.insertModeChanges[imc++].changes, 1);
+            var changes = register.insertModeChanges[imc++].changes;
+            vimGlobalState.macroModeState.lastInsertModeChanges.changes =
+                changes;
+            repeatInsertModeChanges(cm, changes, 1);
             exitInsertMode(cm);
           }
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index 89e1a40c8c..8782f1c5d9 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1886,6 +1886,24 @@ testVim('macro_insert', function(cm, vim, helpers) {
   helpers.doKeys('q', '@', 'a');
   eq('foofoo', cm.getValue());
 }, { value: ''});
+testVim('macro_insert_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', '$', 'a');
+  cm.replaceRange('larry.', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('a');
+  cm.replaceRange('curly.', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('q');
+  helpers.doKeys('a');
+  cm.replaceRange('moe.', cm.getCursor());
+  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('@', 'a');
+  // At this point, the most recent edit should be the 2nd insert change
+  // inside the macro, i.e. "curly.".
+  helpers.doKeys('.');
+  eq('larry.curly.moe.larry.curly.curly.', cm.getValue());
+}, { value: ''});
 testVim('macro_space', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('<Space>', '<Space>');

From ae9a5dc4f815c6c06be821134181e9ed744d48fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Jun 2014 11:12:11 +0200
Subject: [PATCH 1362/4742] [real-world uses] Add ServePHP

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 47a4ffde83..5ea168f66c 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -120,6 +120,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.quivive-file-manager.com">Quivive File Manager</a></li>
       <li><a href="http://rascalmicro.com/docs/basic-tutorial-getting-started.html">Rascal</a> (tiny computer)</li>
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
+      <li><a href="https://chrome.google.com/webstore/detail/servephp/mnpikomdchjhkhbhmbboehfdjkobbfpo">ServePHP</a> (PHP code testing in Chrome dev tools)</li>
       <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
       <li><a href="http://www.skulpt.org/">Skulpt</a> (in-browser Python environment)</li>

From 68cae6842393ca2545746b387a8a54b5cd55c020 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Thu, 29 May 2014 14:30:02 -0700
Subject: [PATCH 1363/4742] [clike mode] Be more strict about raw string
 delimiters

Fixes #2596
---
 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 24f8762508..3e253624b4 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -207,7 +207,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     stream.backUp(1);
     // Raw strings.
     if (stream.match(/(R|u8R|uR|UR|LR)/)) {
-      var match = stream.match(/"(.{0,16})\(/);
+      var match = stream.match(/"([^\s\\()]{0,16})\(/);
       if (!match) {
         return false;
       }

From 8841fac0de8a45d71bb08d136784a120a8ae9bf2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Jun 2014 11:18:42 +0200
Subject: [PATCH 1364/4742] [rulers addon] Don't override basic classname when
 adding one

Closes #2598
---
 addon/display/rulers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index 7624b78c83..13185d30b4 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -43,7 +43,7 @@
         col = conf;
       } else {
         col = conf.column;
-        if (conf.className) elt.className = " " + conf.className;
+        if (conf.className) elt.className += " " + conf.className;
         if (conf.color) elt.style.borderColor = conf.color;
         if (conf.lineStyle) elt.style.borderLeftStyle = conf.lineStyle;
         if (conf.width) elt.style.borderLeftWidth = conf.width;

From d9f01b63ae77d18d2ffbfacea330797892232279 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Jun 2014 22:16:40 +0200
Subject: [PATCH 1365/4742] Redraw widgets with fixed with on setSize

Issue #2604
---
 lib/codemirror.js | 17 ++++++++++++-----
 test/test.js      | 10 ++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bcb5836ab7..8f186706c1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4243,14 +4243,21 @@
     }),
 
     setSize: methodOp(function(width, height) {
+      var cm = this;
       function interpret(val) {
         return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
       }
-      if (width != null) this.display.wrapper.style.width = interpret(width);
-      if (height != null) this.display.wrapper.style.height = interpret(height);
-      if (this.options.lineWrapping) clearLineMeasurementCache(this);
-      this.curOp.forceUpdate = true;
-      signal(this, "refresh", this);
+      if (width != null) cm.display.wrapper.style.width = interpret(width);
+      if (height != null) cm.display.wrapper.style.height = interpret(height);
+      if (cm.options.lineWrapping) clearLineMeasurementCache(this);
+      var lineNo = cm.display.viewFrom;
+      cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
+        if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
+          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; }
+        ++lineNo;
+      });
+      cm.curOp.forceUpdate = true;
+      signal(cm, "refresh", this);
     }),
 
     operation: function(f){return runInOp(this, f);},
diff --git a/test/test.js b/test/test.js
index b5c4b3e714..526e1c377b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1916,3 +1916,13 @@ testCM("getTokenTypeAt", function(cm) {
   eq(byClassName(cm.getWrapperElement(), "cm-foo").length, 1);
   eq(cm.getTokenTypeAt(Pos(0, 6)), "string");
 }, {value: "1 + 'foo'", mode: "javascript"});
+
+testCM("resizeLineWidget", function(cm) {
+  addDoc(cm, 200, 3);
+  var widget = document.createElement("pre");
+  widget.innerHTML = "imwidget";
+  widget.style.background = "yellow";
+  cm.addLineWidget(1, widget, {noHScroll: true});
+  cm.setSize(40);
+  is(widget.parentNode.offsetWidth < 42);
+});

From 247f7057087565c722ca9bc263bc88f80f14286b Mon Sep 17 00:00:00 2001
From: as3boyan <denis.flash.as3@gmail.com>
Date: Fri, 30 May 2014 20:01:47 +0300
Subject: [PATCH 1366/4742] [xml-hint addon] Don't get confused by closed
 quotes

---
 addon/hint/xml-hint.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 1e8e50cf72..e31b09b5fc 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -68,9 +68,16 @@
         if (typeof atValues == 'function') atValues = atValues.call(this, cm); // Functions can be used to supply values for autocomplete widget
         if (token.type == "string") {
           prefix = token.string;
+          var n = 0;
           if (/['"]/.test(token.string.charAt(0))) {
             quote = token.string.charAt(0);
             prefix = token.string.slice(1);
+            n++;
+          }
+          var len = token.string.length;
+          if (/['"]/.test(token.string.charAt(len - 1))) {
+            quote = token.string.charAt(len - 1);
+            prefix = token.string.substr(n, len - 2);
           }
           replaceToken = true;
         }

From 685061675b5ce26a9b19b1d18f542710cae57364 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Wed, 28 May 2014 04:15:52 +0530
Subject: [PATCH 1367/4742] [vim] Search history implementation

---
 addon/dialog/dialog.js | 12 ++++---
 keymap/vim.js          | 62 +++++++++++++++++++++++++++++++---
 test/vim_test.js       | 75 +++++++++++++++++++++++++++++++++---------
 3 files changed, 124 insertions(+), 25 deletions(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index b99c6778e9..622d689ed1 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -38,10 +38,14 @@
     closeNotification(this, null);
     var dialog = dialogDiv(this, template, options && options.bottom);
     var closed = false, me = this;
-    function close() {
-      if (closed) return;
-      closed = true;
-      dialog.parentNode.removeChild(dialog);
+    function close(newVal) {
+      if (typeof newVal == 'string') {
+        inp.value = newVal;
+      } else {
+        if (closed) return;
+        closed = true;
+        dialog.parentNode.removeChild(dialog);
+      }
     }
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
diff --git a/keymap/vim.js b/keymap/vim.js
index 8ec674bd57..99dc99cc86 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -637,7 +637,9 @@
         macroModeState: new MacroModeState,
         // Recording latest f, t, F or T motion command.
         lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
-        registerController: new RegisterController({})
+        registerController: new RegisterController({}),
+        // search history buffers
+        searchHistoryController: new SearchHistoryController({})
       };
       for (var optionName in options) {
         var option = options[optionName];
@@ -908,7 +910,45 @@
         }
       }
     };
-
+    function SearchHistoryController() {
+        this.historyBuffer = [];
+        this.iterator;
+        this.initialPrefix = null;
+    }
+    SearchHistoryController.prototype = {
+      // the query argument here acts a user entered prefix for a small time
+      // until we start autocompletion in which case it is the autocompleted.
+      nextMatch: function (query, up) {
+        var historyBuffer = this.historyBuffer;
+        var dir = up ? -1 : 1;
+        if (this.initialPrefix === null) this.initialPrefix = query;
+        for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) {
+          var element = historyBuffer[i];
+          for (var j = 0; j <= element.length; j++) {
+            if (this.initialPrefix == element.substring(0, j)) {
+              this.iterator = i;
+              return element;
+            }
+          }
+        }
+        // should return the user input in case we reach the end of buffer.
+        if (i >= historyBuffer.length) {
+          this.iterator = historyBuffer.length;
+          return this.initialPrefix;
+        }
+        // return the last autocompleted query as it is.
+        if (i < 0 ) return query;
+      },
+      pushQuery: function(query) {
+        var index = this.historyBuffer.indexOf(query);
+        if (index > -1) this.historyBuffer.splice(index, 1);
+        if (query.length) this.historyBuffer.push(query);
+      },
+      reset: function() {
+        this.initialPrefix = null;
+        this.iterator = this.historyBuffer.length;
+      }
+    };
     var commandDispatcher = {
       matchCommand: function(key, keyMap, vim) {
         var inputState = vim.inputState;
@@ -1095,6 +1135,8 @@
         var originalQuery = getSearchState(cm).getQuery();
         var originalScrollPos = cm.getScrollInfo();
         function handleQuery(query, ignoreCase, smartCase) {
+          vimGlobalState.searchHistoryController.pushQuery(query);
+          vimGlobalState.searchHistoryController.reset();
           try {
             updateSearchQuery(cm, query, ignoreCase, smartCase);
           } catch (e) {
@@ -1115,7 +1157,16 @@
             logSearchQuery(macroModeState, query);
           }
         }
-        function onPromptKeyUp(_e, query) {
+        function onPromptKeyUp(e, query, close) {
+          var keyName = CodeMirror.keyName(e), up;
+          if (keyName == 'Up' || keyName == 'Down') {
+            up = keyName == 'Up' ? true : false;
+            query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
+            close(query);
+          } else {
+            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
+              vimGlobalState.searchHistoryController.reset();
+          }
           var parsedQuery;
           try {
             parsedQuery = updateSearchQuery(cm, query,
@@ -1130,13 +1181,14 @@
             cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
           }
         }
-        function onPromptKeyDown(e, _query, close) {
+        function onPromptKeyDown(e, query, close) {
           var keyName = CodeMirror.keyName(e);
           if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
+            vimGlobalState.searchHistoryController.pushQuery(query);
+            vimGlobalState.searchHistoryController.reset();
             updateSearchQuery(cm, originalQuery);
             clearSearchHighlight(cm);
             cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-
             CodeMirror.e_stop(e);
             close();
             cm.focus();
diff --git a/test/vim_test.js b/test/vim_test.js
index 8782f1c5d9..27c1eb47ab 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2098,25 +2098,26 @@ testVim('search_register_escape', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('waldo');
   helpers.doKeys('/');
   var onKeyDown;
+  var onKeyUp;
+  var KEYCODES = {
+    f: 70,
+    o: 79,
+    Esc: 27
+  };
   cm.openDialog = function(template, callback, options) {
-    var onKeyDown = options.onKeyDown;
-    var onKeyUp = options.onKeyUp;
-    var KEYCODES = {
-      f: 70,
-      o: 79,
-      Esc: 27
-    };
-    var close = function() {};
-    // Fake some keyboard events coming in.
-    onKeyDown({keyCode: KEYCODES.f}, '', close);
-    onKeyUp({keyCode: KEYCODES.f}, '', close);
-    onKeyDown({keyCode: KEYCODES.o}, 'f', close);
-    onKeyUp({keyCode: KEYCODES.o}, 'f', close);
-    onKeyDown({keyCode: KEYCODES.o}, 'fo', close);
-    onKeyUp({keyCode: KEYCODES.o}, 'fo', close);
-    onKeyDown({keyCode: KEYCODES.Esc}, 'foo', close);
+    onKeyDown = options.onKeyDown;
+    onKeyUp = options.onKeyUp;
   };
+  var close = function() {};
   helpers.doKeys('/');
+  // Fake some keyboard events coming in.
+  onKeyDown({keyCode: KEYCODES.f}, '', close);
+  onKeyUp({keyCode: KEYCODES.f}, '', close);
+  onKeyDown({keyCode: KEYCODES.o}, 'f', close);
+  onKeyUp({keyCode: KEYCODES.o}, 'f', close);
+  onKeyDown({keyCode: KEYCODES.o}, 'fo', close);
+  onKeyUp({keyCode: KEYCODES.o}, 'fo', close);
+  onKeyDown({keyCode: KEYCODES.Esc}, 'foo', close);
   cm.openDialog = helpers.fakeOpenDialog('registers');
   cm.openNotification = helpers.fakeOpenNotification(function(text) {
     is(/waldo/.test(text));
@@ -2133,6 +2134,48 @@ testVim('search_register', function(cm, vim, helpers) {
   });
   helpers.doKeys(':');
 }, {value: ''});
+testVim('search_history', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('this');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('checks');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('search');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('history');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('checks');
+  helpers.doKeys('/');
+  var onKeyDown;
+  var onKeyUp;
+  var query = '';
+  var keyCodes = {
+    Up: 38,
+    Down: 40
+  };
+  cm.openDialog = function(template, callback, options) {
+    onKeyUp = options.onKeyUp;
+    onKeyDown = options.onKeyDown;
+  };
+  var close = function(newVal) {
+    if (typeof newVal == 'string') query = newVal;
+  }
+  helpers.doKeys('/');
+  onKeyDown({keyCode: keyCodes.Up}, query, close);
+  onKeyUp({keyCode: keyCodes.Up}, query, close);
+  eq(query, 'checks');
+  onKeyDown({keyCode: keyCodes.Up}, query, close);
+  onKeyUp({keyCode: keyCodes.Up}, query, close);
+  eq(query, 'history');
+  onKeyDown({keyCode: keyCodes.Up}, query, close);
+  onKeyUp({keyCode: keyCodes.Up}, query, close);
+  eq(query, 'search');
+  onKeyDown({keyCode: keyCodes.Up}, query, close);
+  onKeyUp({keyCode: keyCodes.Up}, query, close);
+  eq(query, 'this');
+  onKeyDown({keyCode: keyCodes.Down}, query, close);
+  onKeyUp({keyCode: keyCodes.Down}, query, close);
+  eq(query, 'search');
+}, {value: ''});
 testVim('.', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('2', 'd', 'w');

From d1afdbee0e75d6233b4d04c924a5eaa3e7683a62 Mon Sep 17 00:00:00 2001
From: Anders Nawroth <anders@neotechnology.com>
Date: Wed, 4 Jun 2014 16:39:54 +0200
Subject: [PATCH 1368/4742] [cypher mode] Add 'fieldterminator' keyword.

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

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 5c6bd41997..a39c227d9c 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -62,7 +62,7 @@
     var curPunc;
     var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
     var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]);
-    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "false", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
     var operatorChars = /[*+\-<>=&|~%^]/;
 
     return {

From 222d8b7adafdef94ec15c54452dc765dcfbf02c8 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Wed, 4 Jun 2014 23:46:10 +0530
Subject: [PATCH 1369/4742] [vim] exCommand History Implementation

---
 keymap/vim.js    | 46 ++++++++++++++++++++++++++++++----------------
 test/vim_test.js | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 99dc99cc86..bbeb597162 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -638,8 +638,10 @@
         // Recording latest f, t, F or T motion command.
         lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
         registerController: new RegisterController({}),
-        // search history buffers
-        searchHistoryController: new SearchHistoryController({})
+        // search history buffer
+        searchHistoryController: new HistoryController({}),
+        // ex Command history buffer
+        exCommandHistoryController : new HistoryController({})
       };
       for (var optionName in options) {
         var option = options[optionName];
@@ -910,18 +912,18 @@
         }
       }
     };
-    function SearchHistoryController() {
+    function HistoryController() {
         this.historyBuffer = [];
         this.iterator;
         this.initialPrefix = null;
     }
-    SearchHistoryController.prototype = {
-      // the query argument here acts a user entered prefix for a small time
+    HistoryController.prototype = {
+      // the input argument here acts a user entered prefix for a small time
       // until we start autocompletion in which case it is the autocompleted.
-      nextMatch: function (query, up) {
+      nextMatch: function (input, up) {
         var historyBuffer = this.historyBuffer;
         var dir = up ? -1 : 1;
-        if (this.initialPrefix === null) this.initialPrefix = query;
+        if (this.initialPrefix === null) this.initialPrefix = input;
         for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) {
           var element = historyBuffer[i];
           for (var j = 0; j <= element.length; j++) {
@@ -936,13 +938,13 @@
           this.iterator = historyBuffer.length;
           return this.initialPrefix;
         }
-        // return the last autocompleted query as it is.
-        if (i < 0 ) return query;
+        // return the last autocompleted query or exCommand as it is.
+        if (i < 0 ) return input;
       },
-      pushQuery: function(query) {
-        var index = this.historyBuffer.indexOf(query);
+      pushInput: function(input) {
+        var index = this.historyBuffer.indexOf(input);
         if (index > -1) this.historyBuffer.splice(index, 1);
-        if (query.length) this.historyBuffer.push(query);
+        if (input.length) this.historyBuffer.push(input);
       },
       reset: function() {
         this.initialPrefix = null;
@@ -1135,7 +1137,7 @@
         var originalQuery = getSearchState(cm).getQuery();
         var originalScrollPos = cm.getScrollInfo();
         function handleQuery(query, ignoreCase, smartCase) {
-          vimGlobalState.searchHistoryController.pushQuery(query);
+          vimGlobalState.searchHistoryController.pushInput(query);
           vimGlobalState.searchHistoryController.reset();
           try {
             updateSearchQuery(cm, query, ignoreCase, smartCase);
@@ -1184,7 +1186,7 @@
         function onPromptKeyDown(e, query, close) {
           var keyName = CodeMirror.keyName(e);
           if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
-            vimGlobalState.searchHistoryController.pushQuery(query);
+            vimGlobalState.searchHistoryController.pushInput(query);
             vimGlobalState.searchHistoryController.reset();
             updateSearchQuery(cm, originalQuery);
             clearSearchHighlight(cm);
@@ -1246,15 +1248,27 @@
         function onPromptClose(input) {
           // Give the prompt some time to close so that if processCommand shows
           // an error, the elements don't overlap.
+          vimGlobalState.exCommandHistoryController.pushInput(input);
+          vimGlobalState.exCommandHistoryController.reset();
           exCommandDispatcher.processCommand(cm, input);
         }
-        function onPromptKeyDown(e, _input, close) {
-          var keyName = CodeMirror.keyName(e);
+        function onPromptKeyDown(e, input, close) {
+          var keyName = CodeMirror.keyName(e), up;
           if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
+            vimGlobalState.exCommandHistoryController.pushInput(input);
+            vimGlobalState.exCommandHistoryController.reset();
             CodeMirror.e_stop(e);
             close();
             cm.focus();
           }
+          if (keyName == 'Up' || keyName == 'Down') {
+            up = keyName == 'Up' ? true : false;
+            input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
+            close(input);
+          } else {
+            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
+              vimGlobalState.exCommandHistoryController.reset();
+          }
         }
         if (command.type == 'keyToEx') {
           // Handle user defined Ex to Ex mappings
diff --git a/test/vim_test.js b/test/vim_test.js
index 27c1eb47ab..1013ccdd71 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2176,6 +2176,44 @@ testVim('search_history', function(cm, vim, helpers) {
   onKeyUp({keyCode: keyCodes.Down}, query, close);
   eq(query, 'search');
 }, {value: ''});
+testVim('exCommand_history', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  helpers.doKeys(':');
+  cm.openDialog = helpers.fakeOpenDialog('sort');
+  helpers.doKeys(':');
+  cm.openDialog = helpers.fakeOpenDialog('map');
+  helpers.doKeys(':');
+  cm.openDialog = helpers.fakeOpenDialog('invalid');
+  helpers.doKeys(':');
+  var onKeyDown;
+  var onKeyUp;
+  var input = '';
+  var keyCodes = {
+    Up: 38,
+    Down: 40,
+    s: 115
+  };
+  cm.openDialog = function(template, callback, options) {
+    onKeyUp = options.onKeyUp;
+    onKeyDown = options.onKeyDown;
+  };
+  var close = function(newVal) {
+    if (typeof newVal == 'string') input = newVal;
+  }
+  helpers.doKeys(':');
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'invalid');
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'map');
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'sort');
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'registers');
+  onKeyDown({keyCode: keyCodes.s}, '', close);
+  input = 's';
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'sort');
+}, {value: ''});
 testVim('.', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('2', 'd', 'w');

From bb4dcda5c258ab08884513f4bab66c7cb0e3649d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 6 Jun 2014 23:16:51 +0200
Subject: [PATCH 1370/4742] [javascript mode] Highlight keywords used as props
 in object literals as properties

Closes #2619
---
 mode/javascript/javascript.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index b522ec4831..74e1b2751a 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -238,7 +238,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var cc = state.cc;
     // Communicate our context to the combinators.
     // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
+    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style;
 
     if (!state.lexical.hasOwnProperty("align"))
       state.lexical.align = true;
@@ -430,15 +430,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {cx.marked = "property"; return cont();}
   }
   function objprop(type, value) {
-    if (type == "variable") {
+    if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);
+      return cont(afterprop);
     } else if (type == "number" || type == "string") {
-      cx.marked = jsonldMode ? "property" : (type + " property");
+      cx.marked = jsonldMode ? "property" : (cx.style + " property");
+      return cont(afterprop);
+    } else if (type == "jsonld-keyword") {
+      return cont(afterprop);
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
     }
-    if (atomicTypes.hasOwnProperty(type)) return cont(afterprop);
   }
   function getterSetter(type) {
     if (type != "variable") return pass(afterprop);

From 1a821113ff727268460f950089b6c10d777f78f8 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Fri, 6 Jun 2014 04:43:05 +0530
Subject: [PATCH 1371/4742] [vim] :global excommand implementation

---
 keymap/vim.js    | 89 ++++++++++++++++++++++++++++++++++++++++++++++--
 test/vim_test.js |  7 +++-
 2 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index bbeb597162..308f204c1a 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3394,10 +3394,13 @@
       { name: 'substitute', shortName: 's' },
       { name: 'nohlsearch', shortName: 'noh' },
       { name: 'delmarks', shortName: 'delm' },
-      { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true }
+      { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
+      { name: 'global', shortName: 'g' }
     ];
     Vim.ExCommandDispatcher = function() {
       this.buildCommandMap_();
+      // range specified by :g command
+      this.range = null;
     };
     Vim.ExCommandDispatcher.prototype = {
       processCommand: function(cm, input) {
@@ -3802,11 +3805,83 @@
         }
         cm.replaceRange(text.join('\n'), curStart, curEnd);
       },
+      global: function(cm, params) {
+        // a global ex command is of the form :[range]g/pattern/[cmd]
+        if (!cm.getSearchCursor) {
+          throw new Error('Search feature not available. Requires searchcursor.js or ' +
+              'any other getSearchCursor implementation.');
+        }
+        if (this.range) {
+          showConfirm(cm, 'Cannot call global recursive!');
+          this.range = null;
+          return;
+        }
+        // set to true if no cmd is specified or no slash at the first position in the argString
+        var onlyQuery = true;
+        var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
+        var lineEnd = params.lineEnd || cm.lastLine();
+        var argString = params.argString;
+        if (!argString) {
+          showConfirm (cm, 'Regular expression missing from global');
+          return;
+        }
+        var slashes = findUnescapedSlashes(argString);
+        var cmd;
+        var regexPart = '';
+        if (slashes.length) {
+          if (slashes[0] == 0) {
+            regexPart = argString.substring(slashes[0] + 1, slashes[1]);
+          } else {
+            regexPart = argString.substring(2, argString.length);
+          }
+          if (slashes[1]) {
+            cmd = slashes[0] == 0 ? argString.substring(slashes[1] + 1, argString.length) : cmd;
+          }
+          if (cmd) onlyQuery = false;
+        } else {
+          regexPart = argString.substring(2, argString.length);
+        }
+        if (regexPart) {
+          try {
+            updateSearchQuery(cm, regexPart, true /** ignoreCase */,
+              true /** smartCase */);
+          } catch (e) {
+            showConfirm(cm, 'Invalid regex: ' + regexPart);
+            return;
+          }
+        }
+        var state = getSearchState(cm);
+        var query = state.getQuery();
+        if (onlyQuery) {
+          var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
+          var cursor = cm.getSearchCursor(query, startPos);
+          var content = '';
+          var done = false;
+          while(!done) {
+            if (!cursor.findNext()) {
+              done = true;
+            } else if (isInRange(cursor.from(), lineStart, lineEnd)) {
+              content+= cm.getLine(cursor.from().line) + '<br>';
+              done = false;
+            } else {
+              done = true;
+            }
+          }
+          if (done) {
+            showConfirm(cm, content.length ? content : 'no matches for ' + query.source);
+            return;
+          }
+        }
+        this.range = {lineStart: lineStart, lineEnd: lineEnd};
+        exCommandDispatcher.processCommand(cm, cmd);
+      },
       substitute: function(cm, params) {
         if (!cm.getSearchCursor) {
           throw new Error('Search feature not available. Requires searchcursor.js or ' +
               'any other getSearchCursor implementation.');
         }
+        // range specified by the :global command
+        var range = this.range;
         var argString = params.argString;
         var slashes = argString ? findUnescapedSlashes(argString) : [];
         var replacePart = '';
@@ -3862,8 +3937,15 @@
         }
         var state = getSearchState(cm);
         var query = state.getQuery();
-        var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
-        var lineEnd = params.lineEnd || lineStart;
+        var lineStart, lineEnd;
+        lineStart = lineEnd = cm.getCursor().line;
+        if (params.line !== undefined) {
+          lineStart = params.line;
+          lineEnd = params.lineEnd || lineStart;
+        } else if (range) {
+          lineStart = range.lineStart;
+          lineEnd = range.lineEnd;
+        }
         if (count) {
           lineStart = lineEnd;
           lineEnd = lineStart + count - 1;
@@ -3871,6 +3953,7 @@
         var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
         var cursor = cm.getSearchCursor(query, startPos);
         doReplace(cm, confirm, lineStart, lineEnd, cursor, query, replacePart);
+        this.range = null;
       },
       redo: CodeMirror.commands.redo,
       undo: CodeMirror.commands.undo,
diff --git a/test/vim_test.js b/test/vim_test.js
index 1013ccdd71..cd484d596e 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2835,7 +2835,12 @@ testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
   helpers.doEx('sort! d');
   eq('a3\nb2\nc1\nz\ny', cm.getValue());
 }, { value: 'a3\nz\nc1\ny\nb2'});
-
+// test for :global command
+testVim('ex_global', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doEx('g/one/s//two');
+  eq('two two\n two two', cm.getValue());
+}, {value: 'one one\n one one'});
 // Basic substitute tests.
 testVim('ex_substitute_same_line', function(cm, vim, helpers) {
   cm.setCursor(1, 0);

From a93f14a56275d02b787809ca6b71fa8dfd68d725 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Sat, 7 Jun 2014 02:33:03 +0530
Subject: [PATCH 1372/4742] [vim] modified substitute to use splitBySlash,
 checked corner cases

---
 keymap/vim.js    | 162 +++++++++++++++++++++--------------------------
 test/vim_test.js |   6 +-
 2 files changed, 76 insertions(+), 92 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 308f204c1a..eb056319dc 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3055,6 +3055,18 @@
         onClose(prompt(shortText, ''));
       }
     }
+    function splitBySlash(argString) {
+      var slashes = findUnescapedSlashes(argString) || [];
+      if (!slashes.length) return [];
+      var tokens = [];
+      // in case of strings like foo/bar
+      if (slashes[0] !== 0) return;
+      for (var i = 0; i < slashes.length; i++) {
+        if (typeof slashes[i] == 'number')
+          tokens.push(argString.substring(slashes[i] + 1, slashes[i+1]));
+      }
+      return tokens;
+    }
 
     function findUnescapedSlashes(str) {
       var escapeNextChar = false;
@@ -3399,8 +3411,6 @@
     ];
     Vim.ExCommandDispatcher = function() {
       this.buildCommandMap_();
-      // range specified by :g command
-      this.range = null;
     };
     Vim.ExCommandDispatcher.prototype = {
       processCommand: function(cm, input) {
@@ -3806,97 +3816,68 @@
         cm.replaceRange(text.join('\n'), curStart, curEnd);
       },
       global: function(cm, params) {
-        // a global ex command is of the form :[range]g/pattern/[cmd]
-        if (!cm.getSearchCursor) {
-          throw new Error('Search feature not available. Requires searchcursor.js or ' +
-              'any other getSearchCursor implementation.');
-        }
-        if (this.range) {
-          showConfirm(cm, 'Cannot call global recursive!');
-          this.range = null;
-          return;
-        }
-        // set to true if no cmd is specified or no slash at the first position in the argString
-        var onlyQuery = true;
-        var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
-        var lineEnd = params.lineEnd || cm.lastLine();
+        // a global command is of the form
+        // :[range]g/pattern/[cmd]
+        // argString holds the string /pattern/[cmd]
         var argString = params.argString;
         if (!argString) {
-          showConfirm (cm, 'Regular expression missing from global');
+          showConfirm(cm, 'Regular Expression missing from global');
           return;
         }
-        var slashes = findUnescapedSlashes(argString);
-        var cmd;
-        var regexPart = '';
-        if (slashes.length) {
-          if (slashes[0] == 0) {
-            regexPart = argString.substring(slashes[0] + 1, slashes[1]);
-          } else {
-            regexPart = argString.substring(2, argString.length);
-          }
-          if (slashes[1]) {
-            cmd = slashes[0] == 0 ? argString.substring(slashes[1] + 1, argString.length) : cmd;
-          }
-          if (cmd) onlyQuery = false;
-        } else {
-          regexPart = argString.substring(2, argString.length);
+        // range is specified here
+        var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
+        var lineEnd = params.lineEnd || params.line || cm.lastLine();
+        // get the tokens from argString
+        var tokens = splitBySlash(argString);
+        var regexPart = argString, cmd;
+        if (tokens.length) {
+          regexPart = tokens[0];
+          cmd = tokens.slice(1, tokens.length).join('/');
         }
         if (regexPart) {
+        // If regex part is empty, then use the previous query. Otherwise use
+        // the regex part as the new query.
           try {
-            updateSearchQuery(cm, regexPart, true /** ignoreCase */,
-              true /** smartCase */);
+           updateSearchQuery(cm, regexPart, true /** ignoreCase */,
+             true /** smartCase */);
           } catch (e) {
-            showConfirm(cm, 'Invalid regex: ' + regexPart);
-            return;
+           showConfirm(cm, 'Invalid regex: ' + regexPart);
+           return;
           }
         }
-        var state = getSearchState(cm);
-        var query = state.getQuery();
-        if (onlyQuery) {
-          var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
-          var cursor = cm.getSearchCursor(query, startPos);
-          var content = '';
-          var done = false;
-          while(!done) {
-            if (!cursor.findNext()) {
-              done = true;
-            } else if (isInRange(cursor.from(), lineStart, lineEnd)) {
-              content+= cm.getLine(cursor.from().line) + '<br>';
-              done = false;
-            } else {
-              done = true;
-            }
-          }
-          if (done) {
-            showConfirm(cm, content.length ? content : 'no matches for ' + query.source);
-            return;
+        // now that we have the regexPart, search for regex matches in the specified range of lines
+        var query = getSearchState(cm).getQuery();
+        var matchedLines = [], content = '';
+        for (var i = lineStart; i <= lineEnd; i++) {
+          var matched = query.test(cm.getLine(i));
+          if (matched) {
+            matchedLines.push(i+1);
+            content+= cm.getLine(i) + '<br>';
           }
         }
-        this.range = {lineStart: lineStart, lineEnd: lineEnd};
-        exCommandDispatcher.processCommand(cm, cmd);
+        // if there is no [cmd], just display the list of matched lines
+        if (!cmd) {
+          showConfirm(cm, content);
+          return;
+        }
+        for (var i = 0; i < matchedLines.length ; i++) {
+          var command = matchedLines[i] + cmd;
+          exCommandDispatcher.processCommand(cm, command);
+        }
       },
       substitute: function(cm, params) {
         if (!cm.getSearchCursor) {
           throw new Error('Search feature not available. Requires searchcursor.js or ' +
               'any other getSearchCursor implementation.');
         }
-        // range specified by the :global command
-        var range = this.range;
         var argString = params.argString;
-        var slashes = argString ? findUnescapedSlashes(argString) : [];
-        var replacePart = '';
-        if (slashes.length) {
-          if (slashes[0] !== 0) {
-            showConfirm(cm, 'Substitutions should be of the form ' +
-                ':s/pattern/replace/');
-            return;
-          }
-          var regexPart = argString.substring(slashes[0] + 1, slashes[1]);
-          var flagsPart;
-          var count;
-          var confirm = false; // Whether to confirm each replace.
-          if (slashes[1]) {
-            replacePart = argString.substring(slashes[1] + 1, slashes[2]);
+        var tokens = argString ? splitBySlash(argString) : [];
+        var regexPart, replacePart = '', trailing, flagsPart, count;
+        var confirm = false; // Whether to confirm each replace.
+        if (tokens.length) {
+          regexPart = tokens[0];
+          replacePart = tokens[1];
+          if (replacePart !== undefined) {
             if (getOption('pcre')) {
               replacePart = unescapeRegexReplace(replacePart);
             } else {
@@ -3904,13 +3885,22 @@
             }
             vimGlobalState.lastSubstituteReplacePart = replacePart;
           }
-          if (slashes[2]) {
-            // After the 3rd slash, we can have flags followed by a space followed
-            // by count.
-            var trailing = argString.substring(slashes[2] + 1).split(' ');
-            flagsPart = trailing[0];
-            count = parseInt(trailing[1]);
+          trailing = tokens[2] ? tokens[2].split(' ') : [];
+        } else {
+          // either the argString is empty or its of the form ' hello/world'
+          // actually splitBySlash returns a list of tokens
+          // only if the string starts with a '/'
+          if (argString && argString.length) {
+            showConfirm(cm, 'Substitutions should be of the form ' +
+                ':s/pattern/replace/');
+            return;
           }
+        }
+        // After the 3rd slash, we can have flags followed by a space followed
+        // by count.
+        if (trailing) {
+          flagsPart = trailing[0];
+          count = parseInt(trailing[1]);
           if (flagsPart) {
             if (flagsPart.indexOf('c') != -1) {
               confirm = true;
@@ -3937,15 +3927,8 @@
         }
         var state = getSearchState(cm);
         var query = state.getQuery();
-        var lineStart, lineEnd;
-        lineStart = lineEnd = cm.getCursor().line;
-        if (params.line !== undefined) {
-          lineStart = params.line;
-          lineEnd = params.lineEnd || lineStart;
-        } else if (range) {
-          lineStart = range.lineStart;
-          lineEnd = range.lineEnd;
-        }
+        var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
+        var lineEnd = params.lineEnd || lineStart;
         if (count) {
           lineStart = lineEnd;
           lineEnd = lineStart + count - 1;
@@ -3953,7 +3936,6 @@
         var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
         var cursor = cm.getSearchCursor(query, startPos);
         doReplace(cm, confirm, lineStart, lineEnd, cursor, query, replacePart);
-        this.range = null;
       },
       redo: CodeMirror.commands.redo,
       undo: CodeMirror.commands.undo,
diff --git a/test/vim_test.js b/test/vim_test.js
index cd484d596e..f011d72f19 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2839,8 +2839,10 @@ testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
 testVim('ex_global', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doEx('g/one/s//two');
-  eq('two two\n two two', cm.getValue());
-}, {value: 'one one\n one one'});
+  eq('two two\n two two\n two two', cm.getValue());
+  helpers.doEx('1,2g/two/s//one');
+  eq('one one\n one one\n two two', cm.getValue());
+}, {value: 'one one\n one one\n one one'});
 // Basic substitute tests.
 testVim('ex_substitute_same_line', function(cm, vim, helpers) {
   cm.setCursor(1, 0);

From 5ba05207896ad12e3f5d5ddc700fec4528b320a7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 8 Jun 2014 22:30:00 +0200
Subject: [PATCH 1373/4742] [javascript mode] Fix parsing of ES6 class bodies

Issue #2622
---
 mode/javascript/javascript.js | 26 +++++++++++++++++++++-----
 mode/javascript/test.js       | 10 +++++++++-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 74e1b2751a..4b9829aa2a 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -343,7 +343,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
                                      statement, poplex, popcontext);
     if (type == "module") return cont(pushlex("form"), pushcontext, afterModule, popcontext, poplex);
-    if (type == "class") return cont(pushlex("form"), className, objlit, poplex);
+    if (type == "class") return cont(pushlex("form"), className, poplex);
     if (type == "export") return cont(pushlex("form"), afterExport, poplex);
     if (type == "import") return cont(pushlex("form"), afterImport, poplex);
     return pass(pushlex("stat"), expression, expect(";"), poplex);
@@ -540,11 +540,27 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function className(type, value) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
-  function classNameAfter(_type, value) {
-    if (value == "extends") return cont(expression);
+  function classNameAfter(type, value) {
+    if (value == "extends") return cont(expression, classNameAfter);
+    if (type == "{") return cont(pushlex("}"), classBody, poplex);
   }
-  function objlit(type) {
-    if (type == "{") return contCommasep(objprop, "}");
+  function classBody(type, value) {
+    if (type == "variable" || cx.style == "keyword") {
+      cx.marked = "property";
+      if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody);
+      return cont(functiondef, classBody);
+    }
+    if (value == "*") {
+      cx.marked = "keyword";
+      return cont(classBody);
+    }
+    if (type == ";") return cont(classBody);
+    if (type == "}") return cont();
+  }
+  function classGetterSetter(type) {
+    if (type != "variable") return pass();
+    cx.marked = "property";
+    return cont();
   }
   function afterModule(type, value) {
     if (type == "string") return cont(statement);
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index fd399a7f5a..a9cc993d3d 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -17,9 +17,17 @@
      "  [[[variable-2 c], [variable y] ]] [operator =] [variable-2 c];",
      "})();");
 
+  MT("class_body",
+     "[keyword class] [variable Foo] {",
+     "  [property constructor]() {}",
+     "  [property sayName]() {",
+     "    [keyword return] [string-2 `foo${][variable foo][string-2 }oo`];",
+     "  }",
+     "}");
+
   MT("class",
      "[keyword class] [variable Point] [keyword extends] [variable SuperThing] {",
-     "  [[ [string-2 /expr/] ]]: [number 24],",
+     "  [property get] [property prop]() { [keyword return] [number 24]; }",
      "  [property constructor]([def x], [def y]) {",
      "    [keyword super]([string 'something']);",
      "    [keyword this].[property x] [operator =] [variable-2 x];",

From e33210ed177d39ae2998718378329ba06af81f22 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Jun 2014 23:42:51 +0200
Subject: [PATCH 1374/4742] Check for line-wide class changes in
 highlightWorker

Issue #2624
---
 lib/codemirror.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8f186706c1..34923fb2f8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1414,9 +1414,11 @@
         var oldStyles = line.styles;
         var highlighted = highlightLine(cm, line, state, true);
         line.styles = highlighted.styles;
-        if (highlighted.classes) line.styleClasses = highlighted.classes;
-        else if (line.styleClasses) line.styleClasses = null;
-        var ischange = !oldStyles || oldStyles.length != line.styles.length;
+        var oldCls = line.styleClasses, newCls = highlighted.classes;
+        if (newCls) line.styleClasses = newCls;
+        else if (oldCls) line.styleClasses = null;
+        var ischange = !oldStyles || oldStyles.length != line.styles.length ||
+          oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
         for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
         if (ischange) regLineChange(cm, doc.frontier, "text");
         line.stateAfter = copyState(doc.mode, state);

From e3e455b25c3fde3152a65cc4a10ed76fb017d067 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Mon, 9 Jun 2014 06:50:59 -0700
Subject: [PATCH 1375/4742] [vim] Asynchronous confirm for :global when the
 confirm option is specified.

---
 keymap/vim.js    | 52 +++++++++++++++++++++++++++++++++++-------------
 test/vim_test.js | 27 +++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index eb056319dc..90727e582f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3403,7 +3403,7 @@
       { name: 'redo', shortName: 'red' },
       { name: 'set', shortName: 'set' },
       { name: 'sort', shortName: 'sor' },
-      { name: 'substitute', shortName: 's' },
+      { name: 'substitute', shortName: 's', possiblyAsync: true },
       { name: 'nohlsearch', shortName: 'noh' },
       { name: 'delmarks', shortName: 'delm' },
       { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
@@ -3413,7 +3413,7 @@
       this.buildCommandMap_();
     };
     Vim.ExCommandDispatcher.prototype = {
-      processCommand: function(cm, input) {
+      processCommand: function(cm, input, opt_params) {
         var vim = cm.state.vim;
         var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
         var previousCommand = commandHistoryRegister.toString();
@@ -3423,7 +3423,7 @@
         var inputStream = new CodeMirror.StringStream(input);
         // update ": with the latest command whether valid or invalid
         commandHistoryRegister.setText(input);
-        var params = {};
+        var params = opt_params || {};
         params.input = input;
         try {
           this.parseInput_(cm, inputStream, params);
@@ -3431,6 +3431,7 @@
           showConfirm(cm, e);
           throw e;
         }
+        var command;
         var commandName;
         if (!params.commandName) {
           // If only a line range is defined, move to the line.
@@ -3438,7 +3439,7 @@
             commandName = 'move';
           }
         } else {
-          var command = this.matchCommand_(params.commandName);
+          command = this.matchCommand_(params.commandName);
           if (command) {
             commandName = command.name;
             if (command.excludeFromCommandHistory) {
@@ -3464,6 +3465,12 @@
         }
         try {
           exCommands[commandName](cm, params);
+          // Possibly asynchronous commands (e.g. substitute, which might have a
+          // user confirmation), are responsible for calling the callback when
+          // done. All others have it taken care of for them here.
+          if ((!command || !command.possiblyAsync) && params.callback) {
+            params.callback();
+          }
         } catch(e) {
           showConfirm(cm, e);
           throw e;
@@ -3835,8 +3842,8 @@
           cmd = tokens.slice(1, tokens.length).join('/');
         }
         if (regexPart) {
-        // If regex part is empty, then use the previous query. Otherwise use
-        // the regex part as the new query.
+          // If regex part is empty, then use the previous query. Otherwise
+          // use the regex part as the new query.
           try {
            updateSearchQuery(cm, regexPart, true /** ignoreCase */,
              true /** smartCase */);
@@ -3845,7 +3852,8 @@
            return;
           }
         }
-        // now that we have the regexPart, search for regex matches in the specified range of lines
+        // now that we have the regexPart, search for regex matches in the
+        // specified range of lines
         var query = getSearchState(cm).getQuery();
         var matchedLines = [], content = '';
         for (var i = lineStart; i <= lineEnd; i++) {
@@ -3860,10 +3868,17 @@
           showConfirm(cm, content);
           return;
         }
-        for (var i = 0; i < matchedLines.length ; i++) {
-          var command = matchedLines[i] + cmd;
-          exCommandDispatcher.processCommand(cm, command);
-        }
+        var index = 0;
+        var nextCommand = function() {
+          if (index < matchedLines.length) {
+            var command = matchedLines[index] + cmd;
+            exCommandDispatcher.processCommand(cm, command, {
+              callback: nextCommand
+            });
+          }
+          index++;
+        };
+        nextCommand();
       },
       substitute: function(cm, params) {
         if (!cm.getSearchCursor) {
@@ -3935,7 +3950,7 @@
         }
         var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
         var cursor = cm.getSearchCursor(query, startPos);
-        doReplace(cm, confirm, lineStart, lineEnd, cursor, query, replacePart);
+        doReplace(cm, confirm, lineStart, lineEnd, cursor, query, replacePart, params.callback);
       },
       redo: CodeMirror.commands.redo,
       undo: CodeMirror.commands.undo,
@@ -4024,9 +4039,10 @@
     * @param {RegExp} query Query for performing matches with.
     * @param {string} replaceWith Text to replace matches with. May contain $1,
     *     $2, etc for replacing captured groups using Javascript replace.
+    * @param {function()} callback A callback for when the replace is done.
     */
     function doReplace(cm, confirm, lineStart, lineEnd, searchCursor, query,
-        replaceWith) {
+        replaceWith, callback) {
       // Set up all the functions.
       cm.state.vim.exMode = true;
       var done = false;
@@ -4067,6 +4083,7 @@
           vim.exMode = false;
           vim.lastHPos = vim.lastHSPos = lastPos.ch;
         }
+        if (callback) { callback(); };
       }
       function onPromptKeyDown(e, _value, close) {
         // Swallow all keys.
@@ -4078,7 +4095,13 @@
           case 'N':
             next(); break;
           case 'A':
-            cm.operation(replaceAll); break;
+            // replaceAll contains a call to close of its own. We don't want it
+            // to fire too early or multiple times.
+            var savedCallback = callback;
+            callback = undefined;
+            cm.operation(replaceAll);
+            callback = savedCallback;
+            break;
           case 'L':
             replace();
             // fall through and exit.
@@ -4100,6 +4123,7 @@
       }
       if (!confirm) {
         replaceAll();
+        if (callback) { callback(); };
         return;
       }
       showPrompt(cm, {
diff --git a/test/vim_test.js b/test/vim_test.js
index f011d72f19..b385a90ceb 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2843,6 +2843,33 @@ testVim('ex_global', function(cm, vim, helpers) {
   helpers.doEx('1,2g/two/s//one');
   eq('one one\n one one\n two two', cm.getValue());
 }, {value: 'one one\n one one\n one one'});
+testVim('ex_global_confirm', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  var onKeyDown;
+  var openDialogSave = cm.openDialog;
+  var KEYCODES = {
+    a: 65,
+    n: 78,
+    q: 81,
+    y: 89
+  };
+  // Intercept the ex command, 'global'
+  cm.openDialog = function(template, callback, options) {
+    // Intercept the prompt for the embedded ex command, 'substitute'
+    cm.openDialog = function(template, callback, options) {
+      onKeyDown = options.onKeyDown;
+    };
+    callback('g/one/s//two/gc');
+  };
+  helpers.doKeys(':');
+  var close = function() {};
+  onKeyDown({keyCode: KEYCODES.n}, '', close);
+  onKeyDown({keyCode: KEYCODES.y}, '', close);
+  onKeyDown({keyCode: KEYCODES.a}, '', close);
+  onKeyDown({keyCode: KEYCODES.q}, '', close);
+  onKeyDown({keyCode: KEYCODES.y}, '', close);
+  eq('one two\n two two\n one one\n two one\n one one', cm.getValue());
+}, {value: 'one one\n one one\n one one\n one one\n one one'});
 // Basic substitute tests.
 testVim('ex_substitute_same_line', function(cm, vim, helpers) {
   cm.setCursor(1, 0);

From a5a0a40de82708cba521eea669492e25fe48897c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Jun 2014 12:22:45 +0200
Subject: [PATCH 1376/4742] Be more https friendly

---
 demo/lint.html   | 2 +-
 demo/widget.html | 2 +-
 doc/docs.css     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo/lint.html b/demo/lint.html
index 8372c52c47..2129885298 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -9,7 +9,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/css/css.js"></script>
-<script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
 <script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
 <script src="https://rawgithub.amrom.workers.dev/stubbornella/csslint/master/release/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
diff --git a/demo/widget.html b/demo/widget.html
index 6c4685396b..cc06968d8c 100644
--- a/demo/widget.html
+++ b/demo/widget.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
-<script src="http://ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
 <style type="text/css">
       .CodeMirror {border: 1px solid black;}
       .lint-error {font-family: arial; font-size: 70%; background: #ffa; color: #a00; padding: 2px 5px 3px; }
diff --git a/doc/docs.css b/doc/docs.css
index 568a730f43..ede5540c32 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -2,7 +2,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(http://themes.googleusercontent.com/static/fonts/sourcesanspro/v5/ODelI1aHBYDBqgeIAH2zlBM0YzuT7MdOe03otPbuUS0.woff) format('woff');
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(//themes.googleusercontent.com/static/fonts/sourcesanspro/v5/ODelI1aHBYDBqgeIAH2zlBM0YzuT7MdOe03otPbuUS0.woff) format('woff');
 }
 
 body, html { margin: 0; padding: 0; height: 100%; }

From 5dc442368d695f15826c2479c1e1909a65fee8d5 Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Tue, 17 Jun 2014 11:17:51 +0200
Subject: [PATCH 1377/4742] [css mode] Fix unescaped meta char in regex

It's intended to match a literal `{`, but that must be escaped as it's
a meta character in JS regex.
---
 mode/css/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 1fd46df35b..ca27e25819 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -659,7 +659,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
       },
       ":": function(stream) {
-        if (stream.match(/\s*{/))
+        if (stream.match(/\s*\{/))
           return [null, "{"];
         return false;
       },

From cb50e1a7cf1fb3eced3dc93c58680e1f26dd90bd Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 17 Jun 2014 13:37:41 +0000
Subject: [PATCH 1378/4742] [vim] Add support for global flag in :substitute

---
 keymap/vim.js    | 27 ++++++++++++++++++---------
 test/vim_test.js | 10 +++++++---
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 90727e582f..9ded7c270b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3889,6 +3889,7 @@
         var tokens = argString ? splitBySlash(argString) : [];
         var regexPart, replacePart = '', trailing, flagsPart, count;
         var confirm = false; // Whether to confirm each replace.
+        var global = true; // True to replace all instances on a line, false to replace only 1.
         if (tokens.length) {
           regexPart = tokens[0];
           replacePart = tokens[1];
@@ -3921,6 +3922,10 @@
               confirm = true;
               flagsPart.replace('c', '');
             }
+            if (flagsPart.indexOf('g') != -1) {
+              global = false;
+              flagsPart.replace('g', '');
+            }
             regexPart = regexPart + '/' + flagsPart;
           }
         }
@@ -3950,7 +3955,7 @@
         }
         var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
         var cursor = cm.getSearchCursor(query, startPos);
-        doReplace(cm, confirm, lineStart, lineEnd, cursor, query, replacePart, params.callback);
+        doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback);
       },
       redo: CodeMirror.commands.redo,
       undo: CodeMirror.commands.undo,
@@ -4041,7 +4046,7 @@
     *     $2, etc for replacing captured groups using Javascript replace.
     * @param {function()} callback A callback for when the replace is done.
     */
-    function doReplace(cm, confirm, lineStart, lineEnd, searchCursor, query,
+    function doReplace(cm, confirm, global, lineStart, lineEnd, searchCursor, query,
         replaceWith, callback) {
       // Set up all the functions.
       cm.state.vim.exMode = true;
@@ -4062,17 +4067,21 @@
         searchCursor.replace(newText);
       }
       function next() {
-        var found = searchCursor.findNext();
-        if (!found) {
-          done = true;
-        } else if (isInRange(searchCursor.from(), lineStart, lineEnd)) {
+        var found;
+        // The below only loops to skip over multiple occurrences on the same
+        // line when 'global' is not true.
+        while(found = searchCursor.findNext() &&
+              isInRange(searchCursor.from(), lineStart, lineEnd)) {
+          if (!global && lastPos && searchCursor.from().line == lastPos.line) {
+            continue;
+          }
           cm.scrollIntoView(searchCursor.from(), 30);
           cm.setSelection(searchCursor.from(), searchCursor.to());
           lastPos = searchCursor.from();
           done = false;
-        } else {
-          done = true;
+          return;
         }
+        done = true;
       }
       function stop(close) {
         if (close) { close(); }
@@ -4083,7 +4092,7 @@
           vim.exMode = false;
           vim.lastHPos = vim.lastHSPos = lastPos.ch;
         }
-        if (callback) { callback(); };
+        if (callback) { callback(); }
       }
       function onPromptKeyDown(e, _value, close) {
         // Swallow all keys.
diff --git a/test/vim_test.js b/test/vim_test.js
index b385a90ceb..ca9c8c6511 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2859,7 +2859,7 @@ testVim('ex_global_confirm', function(cm, vim, helpers) {
     cm.openDialog = function(template, callback, options) {
       onKeyDown = options.onKeyDown;
     };
-    callback('g/one/s//two/gc');
+    callback('g/one/s//two/c');
   };
   helpers.doKeys(':');
   var close = function() {};
@@ -3004,8 +3004,8 @@ testSubstitute('ex_substitute_braces_word', {
 testSubstitute('ex_substitute_braces_range', {
   value: 'a aa aaa aaaa',
   expectedValue: 'a   a',
-  expr: '%s/a{2,3}//g',
-  noPcreExpr: '%s/a\\{2,3\\}//g'});
+  expr: '%s/a{2,3}//',
+  noPcreExpr: '%s/a\\{2,3\\}//'});
 testSubstitute('ex_substitute_braces_literal', {
   value: 'ababab abb ab{2}',
   expectedValue: 'ababab abb ',
@@ -3029,6 +3029,10 @@ testSubstitute('ex_substitute_count_with_range', {
   value: '1\n2\n3\n4',
   expectedValue: '1\n2\n0\n0',
   expr: '1,3s/\\d/0/ 3'});
+testSubstitute('ex_substitute_not_global', {
+  value: 'aaa\nbaa\ncaa',
+  expectedValue: 'xaa\nbxa\ncxa',
+  expr: '%s/a/x/g'});
 function testSubstituteConfirm(name, command, initialValue, expectedValue, keys, finalPos) {
   testVim(name, function(cm, vim, helpers) {
     var savedOpenDialog = cm.openDialog;

From 9021584af5b28b1903d13fc1b44c2e37a31418f7 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 17 Jun 2014 13:55:00 +0000
Subject: [PATCH 1379/4742] [vim] Disable default /g for :substitute

---
 keymap/vim.js    |  4 +--
 test/vim_test.js | 74 ++++++++++++++++++++++++------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9ded7c270b..c7d6c97230 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3889,7 +3889,7 @@
         var tokens = argString ? splitBySlash(argString) : [];
         var regexPart, replacePart = '', trailing, flagsPart, count;
         var confirm = false; // Whether to confirm each replace.
-        var global = true; // True to replace all instances on a line, false to replace only 1.
+        var global = false; // True to replace all instances on a line, false to replace only 1.
         if (tokens.length) {
           regexPart = tokens[0];
           replacePart = tokens[1];
@@ -3923,7 +3923,7 @@
               flagsPart.replace('c', '');
             }
             if (flagsPart.indexOf('g') != -1) {
-              global = false;
+              global = true;
               flagsPart.replace('g', '');
             }
             regexPart = regexPart + '/' + flagsPart;
diff --git a/test/vim_test.js b/test/vim_test.js
index ca9c8c6511..9c325540b4 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2859,7 +2859,7 @@ testVim('ex_global_confirm', function(cm, vim, helpers) {
     cm.openDialog = function(template, callback, options) {
       onKeyDown = options.onKeyDown;
     };
-    callback('g/one/s//two/c');
+    callback('g/one/s//two/gc');
   };
   helpers.doKeys(':');
   var close = function() {};
@@ -2873,24 +2873,24 @@ testVim('ex_global_confirm', function(cm, vim, helpers) {
 // Basic substitute tests.
 testVim('ex_substitute_same_line', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
-  helpers.doEx('s/one/two');
+  helpers.doEx('s/one/two/g');
   eq('one one\n two two', cm.getValue());
 }, { value: 'one one\n one one'});
-testVim('ex_substitute_global', function(cm, vim, helpers) {
+testVim('ex_substitute_full_file', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
-  helpers.doEx('%s/one/two');
+  helpers.doEx('%s/one/two/g');
   eq('two two\n two two', cm.getValue());
 }, { value: 'one one\n one one'});
 testVim('ex_substitute_input_range', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
-  helpers.doEx('1,3s/\\d/0');
+  helpers.doEx('1,3s/\\d/0/g');
   eq('0\n0\n0\n4', cm.getValue());
 }, { value: '1\n2\n3\n4' });
 testVim('ex_substitute_visual_range', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   // Set last visual mode selection marks '< and '> at lines 2 and 4
   helpers.doKeys('V', '2', 'j', 'v');
-  helpers.doEx('\'<,\'>s/\\d/0');
+  helpers.doEx('\'<,\'>s/\\d/0/g');
   eq('1\n0\n0\n0\n5', cm.getValue());
 }, { value: '1\n2\n3\n4\n5' });
 testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
@@ -2898,7 +2898,7 @@ testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   cm.openDialog = helpers.fakeOpenDialog('1');
   helpers.doKeys('/');
-  helpers.doEx('s//b');
+  helpers.doEx('s//b/g');
   eq('abb ab2 ab3', cm.getValue());
 }, { value: 'a11 a12 a13' });
 testVim('ex_substitute_javascript', function(cm, vim, helpers) {
@@ -2906,15 +2906,15 @@ testVim('ex_substitute_javascript', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   // Throw all the things that javascript likes to treat as special values
   // into the replace part. All should be literal (this is VIM).
-  helpers.doEx('s/\\(\\d+\\)/$$ $\' $` $& \\1/')
+  helpers.doEx('s/\\(\\d+\\)/$$ $\' $` $& \\1/g')
   eq('a $$ $\' $` $& 0 b', cm.getValue());
 }, { value: 'a 0 b' });
 testVim('ex_substitute_empty_arguments', function(cm,vim,helpers) {
   cm.setCursor(0, 0);
-  helpers.doEx('s/a/b');
+  helpers.doEx('s/a/b/g');
   cm.setCursor(1, 0);
   helpers.doEx('s');
-  eq('b b\nb b', cm.getValue());
+  eq('b b\nb a', cm.getValue());
 }, {value: 'a a\na a'});
 
 // More complex substitute tests that test both pcre and nopcre options.
@@ -2938,24 +2938,24 @@ testSubstitute('ex_substitute_capture', {
   value: 'a11 a12 a13',
   expectedValue: 'a1111 a1212 a1313',
   // $n is a backreference
-  expr: 's/(\\d+)/$1$1/',
+  expr: 's/(\\d+)/$1$1/g',
   // \n is a backreference.
-  noPcreExpr: 's/\\(\\d+\\)/\\1\\1/'});
+  noPcreExpr: 's/\\(\\d+\\)/\\1\\1/g'});
 testSubstitute('ex_substitute_capture2', {
   value: 'a 0 b',
   expectedValue: 'a $00 b',
-  expr: 's/(\\d+)/$$$1$1/',
-  noPcreExpr: 's/\\(\\d+\\)/$\\1\\1/'});
+  expr: 's/(\\d+)/$$$1$1/g',
+  noPcreExpr: 's/\\(\\d+\\)/$\\1\\1/g'});
 testSubstitute('ex_substitute_nocapture', {
   value: 'a11 a12 a13',
   expectedValue: 'a$1$1 a$1$1 a$1$1',
-  expr: 's/(\\d+)/$$1$$1',
-  noPcreExpr: 's/\\(\\d+\\)/$1$1/'});
+  expr: 's/(\\d+)/$$1$$1/g',
+  noPcreExpr: 's/\\(\\d+\\)/$1$1/g'});
 testSubstitute('ex_substitute_nocapture2', {
   value: 'a 0 b',
   expectedValue: 'a $10 b',
-  expr: 's/(\\d+)/$$1$1',
-  noPcreExpr: 's/\\(\\d+\\)/\\$1\\1/'});
+  expr: 's/(\\d+)/$$1$1/g',
+  noPcreExpr: 's/\\(\\d+\\)/\\$1\\1/g'});
 testSubstitute('ex_substitute_nocapture', {
   value: 'a b c',
   expectedValue: 'a $ c',
@@ -2973,13 +2973,13 @@ testSubstitute('ex_substitute_pipe_regex', {
 testSubstitute('ex_substitute_or_regex', {
   value: 'one|two \n three|four',
   expectedValue: 'ana|twa \n thraa|faar',
-  expr: '%s/o|e|u/a',
-  noPcreExpr: '%s/o\\|e\\|u/a'});
+  expr: '%s/o|e|u/a/g',
+  noPcreExpr: '%s/o\\|e\\|u/a/g'});
 testSubstitute('ex_substitute_or_word_regex', {
   value: 'one|two \n three|four',
   expectedValue: 'five|five \n three|four',
-  expr: '%s/(one|two)/five/',
-  noPcreExpr: '%s/\\(one\\|two\\)/five'});
+  expr: '%s/(one|two)/five/g',
+  noPcreExpr: '%s/\\(one\\|two\\)/five/g'});
 testSubstitute('ex_substitute_backslashslash_regex', {
   value: 'one\\two \n three\\four',
   expectedValue: 'one,two \n three,four',
@@ -3004,8 +3004,8 @@ testSubstitute('ex_substitute_braces_word', {
 testSubstitute('ex_substitute_braces_range', {
   value: 'a aa aaa aaaa',
   expectedValue: 'a   a',
-  expr: '%s/a{2,3}//',
-  noPcreExpr: '%s/a\\{2,3\\}//'});
+  expr: '%s/a{2,3}//g',
+  noPcreExpr: '%s/a\\{2,3\\}//g'});
 testSubstitute('ex_substitute_braces_literal', {
   value: 'ababab abb ab{2}',
   expectedValue: 'ababab abb ',
@@ -3032,7 +3032,7 @@ testSubstitute('ex_substitute_count_with_range', {
 testSubstitute('ex_substitute_not_global', {
   value: 'aaa\nbaa\ncaa',
   expectedValue: 'xaa\nbxa\ncxa',
-  expr: '%s/a/x/g'});
+  expr: '%s/a/x/'});
 function testSubstituteConfirm(name, command, initialValue, expectedValue, keys, finalPos) {
   testVim(name, function(cm, vim, helpers) {
     var savedOpenDialog = cm.openDialog;
@@ -3082,29 +3082,29 @@ testSubstituteConfirm('ex_substitute_confirm_emptydoc',
 testSubstituteConfirm('ex_substitute_confirm_nomatch',
     '%s/x/b/c', 'ba a\nbab', 'ba a\nbab', '', makeCursor(0, 0));
 testSubstituteConfirm('ex_substitute_confirm_accept',
-    '%s/a/b/c', 'ba a\nbab', 'bb b\nbbb', 'yyy', makeCursor(1, 1));
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'yyy', makeCursor(1, 1));
 testSubstituteConfirm('ex_substitute_confirm_random_keys',
-    '%s/a/b/c', 'ba a\nbab', 'bb b\nbbb', 'ysdkywerty', makeCursor(1, 1));
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'ysdkywerty', makeCursor(1, 1));
 testSubstituteConfirm('ex_substitute_confirm_some',
-    '%s/a/b/c', 'ba a\nbab', 'bb a\nbbb', 'yny', makeCursor(1, 1));
+    '%s/a/b/cg', 'ba a\nbab', 'bb a\nbbb', 'yny', makeCursor(1, 1));
 testSubstituteConfirm('ex_substitute_confirm_all',
-    '%s/a/b/c', 'ba a\nbab', 'bb b\nbbb', 'a', makeCursor(1, 1));
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'a', makeCursor(1, 1));
 testSubstituteConfirm('ex_substitute_confirm_accept_then_all',
-    '%s/a/b/c', 'ba a\nbab', 'bb b\nbbb', 'ya', makeCursor(1, 1));
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'ya', makeCursor(1, 1));
 testSubstituteConfirm('ex_substitute_confirm_quit',
-    '%s/a/b/c', 'ba a\nbab', 'bb a\nbab', 'yq', makeCursor(0, 3));
+    '%s/a/b/cg', 'ba a\nbab', 'bb a\nbab', 'yq', makeCursor(0, 3));
 testSubstituteConfirm('ex_substitute_confirm_last',
-    '%s/a/b/c', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
 testSubstituteConfirm('ex_substitute_confirm_oneline',
-    '1s/a/b/c', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
+    '1s/a/b/cg', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
 testSubstituteConfirm('ex_substitute_confirm_range_accept',
-    '1,2s/a/b/c', 'aa\na \na\na', 'bb\nb \na\na', 'yyy', makeCursor(1, 0));
+    '1,2s/a/b/cg', 'aa\na \na\na', 'bb\nb \na\na', 'yyy', makeCursor(1, 0));
 testSubstituteConfirm('ex_substitute_confirm_range_some',
-    '1,3s/a/b/c', 'aa\na \na\na', 'ba\nb \nb\na', 'ynyy', makeCursor(2, 0));
+    '1,3s/a/b/cg', 'aa\na \na\na', 'ba\nb \nb\na', 'ynyy', makeCursor(2, 0));
 testSubstituteConfirm('ex_substitute_confirm_range_all',
-    '1,3s/a/b/c', 'aa\na \na\na', 'bb\nb \nb\na', 'a', makeCursor(2, 0));
+    '1,3s/a/b/cg', 'aa\na \na\na', 'bb\nb \nb\na', 'a', makeCursor(2, 0));
 testSubstituteConfirm('ex_substitute_confirm_range_last',
-    '1,3s/a/b/c', 'aa\na \na\na', 'bb\nb \na\na', 'yyl', makeCursor(1, 0));
+    '1,3s/a/b/cg', 'aa\na \na\na', 'bb\nb \na\na', 'yyl', makeCursor(1, 0));
 //:noh should clear highlighting of search-results but allow to resume search through n
 testVim('ex_noh_clearSearchHighlight', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('match');

From 461a3033397e2fa0b51b17247470e03b42d06d56 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Wed, 18 Jun 2014 01:39:03 +0530
Subject: [PATCH 1380/4742] [vim] Update vim visual mode selection to match
 CodeMirror selection

Remove off-by-one in vim when head is further forward in the document than the anchor, where vim's selection becomes 1 less than CodeMirror's. This was originally done because the cursor showed past the anchor and looked like an additional character selection.
---
 keymap/vim.js    | 36 ++++++++++--------------------------
 test/vim_test.js | 28 ++++++++++++++--------------
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c7d6c97230..bbfbadd6d8 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -356,6 +356,7 @@
       if (val) {
         cm.setOption('keyMap', 'vim');
         cm.setOption('disableInput', true);
+        cm.setOption('showCursorWhenSelecting', false);
         CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
         cm.on('beforeSelectionChange', beforeSelectionChange);
         cm.on('cursorActivity', onCursorActivity);
@@ -370,17 +371,9 @@
         cm.state.vim = null;
       }
     });
-    function beforeSelectionChange(cm, obj) {
+    function beforeSelectionChange(cm, _obj) {
       var vim = cm.state.vim;
       if (vim.insertMode || vim.exMode) return;
-
-      var head = obj.ranges[0].head;
-      var anchor = obj.ranges[0].anchor;
-      if (head.ch && head.ch == cm.doc.getLine(head.line).length) {
-        var pos = Pos(head.line, head.ch - 1);
-        obj.update([{anchor: cursorEqual(head, anchor) ? pos : anchor,
-                     head: pos}]);
-      }
     }
     function getOnPasteFn(cm) {
       var vim = cm.state.vim;
@@ -1360,12 +1353,15 @@
               // The end of the selection has moved from after the start to
               // before the start. We will shift the start right by 1.
               selectionStart.ch += 1;
+              curEnd.ch -= 1;
             } else if (cursorIsBefore(selectionEnd, selectionStart) &&
                 (cursorEqual(selectionStart, curEnd) ||
                     cursorIsBefore(selectionStart, curEnd))) {
               // The opposite happened. We will shift the start left by 1.
               selectionStart.ch -= 1;
+              curEnd.ch += 1;
             }
+            vim.lastHPos = curEnd.ch;
             selectionEnd = curEnd;
             selectionStart = (motionResult instanceof Array) ? curStart : selectionStart;
             if (vim.visualLine) {
@@ -1413,7 +1409,7 @@
           } else if (!curEnd) {
             curEnd = copyCursor(curStart);
           }
-          if (motionArgs.inclusive && !(vim.visualMode && inverted)) {
+          if (motionArgs.inclusive && !vim.visualMode) {
             // Move the selection end one to the right to include the last
             // character.
             curEnd.ch++;
@@ -1994,7 +1990,9 @@
         } else if (insertAt == 'endOfSelectedArea') {
           var selectionEnd = cm.getCursor('head');
           var selectionStart = cm.getCursor('anchor');
-          selectionEnd = cursorIsBefore(selectionStart, selectionEnd) ? Pos(selectionEnd.line, selectionEnd.ch+1) : (selectionEnd.line < selectionStart.line ? Pos(selectionStart.line, 0) : selectionEnd);
+          if (selectionEnd.line < selectionStart.line) {
+            selectionEnd = Pos(selectionStart.line, 0);
+          }
           cm.setCursor(selectionEnd);
           exitVisualMode(cm);
         }
@@ -2036,16 +2034,7 @@
               cm, Pos(curStart.line, curStart.ch + repeat),
               true /** includeLineBreak */);
           }
-          // Make the initial selection.
-          if (!actionArgs.repeatIsExplicit && !vim.visualLine) {
-            // This is a strange case. Here the implicit repeat is 1. The
-            // following commands lets the cursor hover over the 1 character
-            // selection.
-            cm.setCursor(curEnd);
-            cm.setSelection(curEnd, curStart);
-          } else {
-            cm.setSelection(curStart, curEnd);
-          }
+          cm.setSelection(curStart, curEnd);
           CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
         } else {
           curStart = cm.getCursor('anchor');
@@ -2262,9 +2251,6 @@
         if (vim.visualMode){
           curStart=cm.getCursor('start');
           curEnd=cm.getCursor('end');
-          // workaround to catch the character under the cursor
-          //  existing workaround doesn't cover actions
-          curEnd=cm.clipPos(Pos(curEnd.line, curEnd.ch+1));
         }else{
           var line = cm.getLine(curStart.line);
           replaceTo = curStart.ch + actionArgs.repeat;
@@ -2441,8 +2427,6 @@
           var tmp = selectionStart;
           selectionStart = selectionEnd;
           selectionEnd = tmp;
-        } else {
-          selectionEnd = cm.clipPos(Pos(selectionEnd.line, selectionEnd.ch+1));
         }
         exitVisualMode(cm);
       }
diff --git a/test/vim_test.js b/test/vim_test.js
index 9c325540b4..932db70136 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -521,7 +521,7 @@ testVim('dl_eol', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq(' ', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 5);
+  helpers.assertCursorAt(0, 6);
 }, { value: ' word1 ' });
 testVim('dl_repeat', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 0);
@@ -612,7 +612,7 @@ testVim('dw_only_word', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1 ', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
+  helpers.assertCursorAt(0, 1);
 }, { value: ' word1 ' });
 testVim('dw_eol', function(cm, vim, helpers) {
   // Assert that dw does not delete the newline if last word to delete is at end
@@ -623,7 +623,7 @@ testVim('dw_eol', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
+  helpers.assertCursorAt(0, 1);
 }, { value: ' word1\nword2' });
 testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
   // Assert that dw does not delete the newline if last word to delete is at end
@@ -634,7 +634,7 @@ testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
+  helpers.assertCursorAt(0, 1);
 }, { value: ' word1\n\nword2' });
 testVim('dw_empty_line_followed_by_whitespace', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -680,7 +680,7 @@ testVim('dw_repeat', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1\nword2', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
+  helpers.assertCursorAt(0, 1);
 }, { value: ' word1\nword2' });
 testVim('de_word_start_and_empty_lines', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -1070,7 +1070,7 @@ testVim('D', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('rd1', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 2);
+  helpers.assertCursorAt(0, 3);
 }, { value: ' word1\nword2\n word3' });
 testVim('C', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);
@@ -1564,7 +1564,7 @@ testVim('delmark_all', function(cm, vim, helpers) {
 });
 testVim('visual', function(cm, vim, helpers) {
   helpers.doKeys('l', 'v', 'l', 'l');
-  helpers.assertCursorAt(0, 3);
+  helpers.assertCursorAt(0, 4);
   eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
   helpers.doKeys('d');
   eq('15', cm.getValue());
@@ -1592,7 +1592,7 @@ testVim('visual_blank', function(cm, vim, helpers) {
 }, { value: '\n' });
 testVim('reselect_visual', function(cm, vim, helpers) {
   helpers.doKeys('l', 'v', 'l', 'l', 'l', 'y', 'g', 'v');
-  helpers.assertCursorAt(0, 4);
+  helpers.assertCursorAt(0, 5);
   eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
   helpers.doKeys('v');
   cm.setCursor(1, 0);
@@ -1605,10 +1605,10 @@ testVim('reselect_visual', function(cm, vim, helpers) {
   helpers.doKeys('v');
   cm.setCursor(2, 0);
   helpers.doKeys('v', 'l', 'l', 'g', 'v');
-  helpers.assertCursorAt(1, 3);
+  helpers.assertCursorAt(1, 4);
   eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
   helpers.doKeys('g', 'v');
-  helpers.assertCursorAt(2, 2);
+  helpers.assertCursorAt(2, 3);
   eqPos(makeCursor(2, 0), cm.getCursor('anchor'));
   eq('123456\n2345\nbar', cm.getValue());
 }, { value: '123456\nfoo\nbar' });
@@ -1642,7 +1642,7 @@ testVim('o_visual', function(cm,vim,helpers) {
   helpers.assertCursorAt(0,0);
   helpers.doKeys('o');
   helpers.doKeys('l','l')
-  helpers.assertCursorAt(3,2);
+  helpers.assertCursorAt(3, 3);
   helpers.doKeys('d');
   eq('p',cm.getValue());
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
@@ -1668,15 +1668,15 @@ testVim('uppercase/lowercase_visual', function(cm, vim, helpers) {
 testVim('visual_paste', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('v', 'l', 'l', 'y', 'j', 'v', 'l', 'p');
-  helpers.assertCursorAt(1, 4);
-  eq('this is a\nunthi test for visual paste', cm.getValue());
+  helpers.assertCursorAt(1, 5);
+  eq('this is a\nunithitest for visual paste', cm.getValue());
   cm.setCursor(0, 0);
   // in case of pasting whole line
   helpers.doKeys('y', 'y');
   cm.setCursor(1, 6);
   helpers.doKeys('v', 'l', 'l', 'l', 'p');
   helpers.assertCursorAt(2, 0);
-  eq('this is a\nunthi \nthis is a\n for visual paste', cm.getValue());
+  eq('this is a\nunithi\nthis is a\n for visual paste', cm.getValue());
 }, { value: 'this is a\nunit test for visual paste'});
 
 // This checks the contents of the register used to paste the text

From 8726ab67273bb19b4d7e295ee0afa45f7201cd19 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 19 Jun 2014 18:31:17 +0000
Subject: [PATCH 1381/4742] [vim] Update LastHPos in visual only if not
 infinity

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

diff --git a/keymap/vim.js b/keymap/vim.js
index bbfbadd6d8..438e20547c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1361,7 +1361,9 @@
               selectionStart.ch -= 1;
               curEnd.ch += 1;
             }
-            vim.lastHPos = curEnd.ch;
+            if (vim.lastHPos != Infinity) {
+              vim.lastHPos = curEnd.ch;
+            }
             selectionEnd = curEnd;
             selectionStart = (motionResult instanceof Array) ? curStart : selectionStart;
             if (vim.visualLine) {

From d662f18251db00a286a8c3c51a186bf524b3de49 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Fri, 20 Jun 2014 04:45:50 +0530
Subject: [PATCH 1382/4742] [vim] Added CSS3 animated fat cursor

---
 keymap/vim.js      | 19 +++++++++++++++++++
 lib/codemirror.css | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 438e20547c..2efbf1b4ff 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -604,6 +604,8 @@
           // executed in between.
           lastMotion: null,
           marks: {},
+          // fake cursor for visual mode
+          fakeCursor: null,
           insertMode: false,
           // Repeat count for changes made in insert mode, triggered by key
           // sequences like 3,i. Only exists when insertMode is true.
@@ -2467,6 +2469,9 @@
         cm.setCursor(clipCursorToContent(cm, selectionEnd));
       }
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      if (vim.fakeCursor) {
+        vim.fakeCursor.clear();
+      }
     }
 
     // Remove any trailing newlines from the selection. For
@@ -4332,6 +4337,20 @@
       } else if (cm.doc.history.lastSelOrigin == '*mouse') {
         // Reset lastHPos if mouse click was done in normal mode.
         vim.lastHPos = cm.doc.getCursor().ch;
+      } else if (vim.visualMode) {
+        var from, head;
+        from = head = cm.getCursor('head');
+        var anchor = cm.getCursor('anchor');
+        var to = Pos(head.line, from.ch + (cursorIsBefore(anchor, head) ? -1 : 1));
+        if (cursorIsBefore(to, from)) {
+          var temp = from;
+          from = to;
+          to = temp;
+        }
+        if (vim.fakeCursor) {
+          vim.fakeCursor.clear();
+        }
+        vim.fakeCursor = cm.markText(from, to, {className: 'fake-fat-cursor'});
       }
     }
 
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 098a317a22..5141666b46 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -63,7 +63,45 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
   border-left: 1px solid #ccc;
   position: absolute;
 }
+.fake-fat-cursor {
+  width: auto;
+  border: 0;
+  background: #7e7;
+
+  -webkit-animation: blink 1s infinite;
+  -moz-animation: blink 1s infinite;
+  animation: blink 1s infinite;
+}
 
+@-moz-keyframes blink {  
+  0% { 
+    visibility: visible;
+   }
+  100% {
+   visibility: hidden;
+   background: white;
+   }
+}
+
+@-webkit-keyframes blink {  
+  0% { 
+    visibility: visible;
+   }
+  100% {
+   visibility: hidden;
+   background: white;
+   }
+}
+
+@keyframes blink {  
+  0% { 
+    visibility: visible;
+   }
+  100% {
+   visibility: hidden;
+   background: white;
+   }
+}
 /* DEFAULT THEME */
 
 .cm-s-default .cm-keyword {color: #708;}

From 02274d3a088df71f37f0ec71c9942bfe14e0f918 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Fri, 20 Jun 2014 00:17:26 +0000
Subject: [PATCH 1383/4742] [vim] Polish css3 animated fat cursor

---
 keymap/vim.js      |  6 +++--
 lib/codemirror.css | 62 +++++++++++++++++-----------------------------
 2 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 2efbf1b4ff..522c4edf57 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -604,7 +604,7 @@
           // executed in between.
           lastMotion: null,
           marks: {},
-          // fake cursor for visual mode
+          // Mark for rendering fake cursor for visual mode.
           fakeCursor: null,
           insertMode: false,
           // Repeat count for changes made in insert mode, triggered by key
@@ -2471,6 +2471,7 @@
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (vim.fakeCursor) {
         vim.fakeCursor.clear();
+        cm.setOption('showCursorWhenSelecting', true);
       }
     }
 
@@ -4350,7 +4351,8 @@
         if (vim.fakeCursor) {
           vim.fakeCursor.clear();
         }
-        vim.fakeCursor = cm.markText(from, to, {className: 'fake-fat-cursor'});
+        vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
+        cm.setOption('showCursorWhenSelecting', false);
       }
     }
 
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 5141666b46..d33dc05a65 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -54,6 +54,29 @@
   border: 0;
   background: #7e7;
 }
+.cm-animate-fat-cursor {
+  width: auto;
+  border: 0;
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  -moz-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+}
+@-moz-keyframes blink {
+  0% { background: #7e7; }
+  50% { background: none; }
+  100% { background: #7e7; }
+}
+@-webkit-keyframes blink {
+  0% { background: #7e7; }
+  50% { background: none; }
+  100% { background: #7e7; }
+}
+@keyframes blink {
+  0% { background: #7e7; }
+  50% { background: none; }
+  100% { background: #7e7; }
+}
+
 /* Can style cursor different in overwrite (non-insert) mode */
 div.CodeMirror-overwrite div.CodeMirror-cursor {}
 
@@ -63,45 +86,6 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
   border-left: 1px solid #ccc;
   position: absolute;
 }
-.fake-fat-cursor {
-  width: auto;
-  border: 0;
-  background: #7e7;
-
-  -webkit-animation: blink 1s infinite;
-  -moz-animation: blink 1s infinite;
-  animation: blink 1s infinite;
-}
-
-@-moz-keyframes blink {  
-  0% { 
-    visibility: visible;
-   }
-  100% {
-   visibility: hidden;
-   background: white;
-   }
-}
-
-@-webkit-keyframes blink {  
-  0% { 
-    visibility: visible;
-   }
-  100% {
-   visibility: hidden;
-   background: white;
-   }
-}
-
-@keyframes blink {  
-  0% { 
-    visibility: visible;
-   }
-  100% {
-   visibility: hidden;
-   background: white;
-   }
-}
 /* DEFAULT THEME */
 
 .cm-s-default .cm-keyword {color: #708;}

From 0fc59fd9e27e765aaf92386095054702e985a684 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Fri, 20 Jun 2014 00:34:32 +0000
Subject: [PATCH 1384/4742] [vim] Fix visual mode mouse bugs

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 522c4edf57..c20ced02b0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4338,7 +4338,12 @@
       } else if (cm.doc.history.lastSelOrigin == '*mouse') {
         // Reset lastHPos if mouse click was done in normal mode.
         vim.lastHPos = cm.doc.getCursor().ch;
-      } else if (vim.visualMode) {
+      }
+      if (cm.somethingSelected()) {
+        vim.visualMode = true;
+        cm.setOption('showCursorWhenSelecting', false);
+      }
+      if (vim.visualMode) {
         var from, head;
         from = head = cm.getCursor('head');
         var anchor = cm.getCursor('anchor');
@@ -4352,7 +4357,6 @@
           vim.fakeCursor.clear();
         }
         vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
-        cm.setOption('showCursorWhenSelecting', false);
       }
     }
 

From e5e2e16faf5f7805cafe46169ca2b03d07c78a1a Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Fri, 20 Jun 2014 00:49:39 +0000
Subject: [PATCH 1385/4742] [vim] Fix a few tests

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

diff --git a/keymap/vim.js b/keymap/vim.js
index c20ced02b0..9c38e3a568 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -358,14 +358,12 @@
         cm.setOption('disableInput', true);
         cm.setOption('showCursorWhenSelecting', false);
         CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-        cm.on('beforeSelectionChange', beforeSelectionChange);
         cm.on('cursorActivity', onCursorActivity);
         maybeInitVimState(cm);
         CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
       } else if (cm.state.vim) {
         cm.setOption('keyMap', 'default');
         cm.setOption('disableInput', false);
-        cm.off('beforeSelectionChange', beforeSelectionChange);
         cm.off('cursorActivity', onCursorActivity);
         CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
         cm.state.vim = null;
@@ -2471,7 +2469,6 @@
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (vim.fakeCursor) {
         vim.fakeCursor.clear();
-        cm.setOption('showCursorWhenSelecting', true);
       }
     }
 
@@ -4338,10 +4335,10 @@
       } else if (cm.doc.history.lastSelOrigin == '*mouse') {
         // Reset lastHPos if mouse click was done in normal mode.
         vim.lastHPos = cm.doc.getCursor().ch;
-      }
-      if (cm.somethingSelected()) {
-        vim.visualMode = true;
-        cm.setOption('showCursorWhenSelecting', false);
+        if (cm.somethingSelected()) {
+          // If something is still selected, enter visual mode.
+          vim.visualMode = true;
+        }
       }
       if (vim.visualMode) {
         var from, head;

From 357e9411a0019e9c6cca78dff766ea98cb5134bc Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Wed, 4 Jun 2014 14:05:05 -0700
Subject: [PATCH 1386/4742] [paste] Fix #2384 and #1883

As described in the comment, there was actually an intermediate selection being created, which clobbered the middle-click paste buffer and thus resulted in a $ being pasted instead of the actual content the user wanted. It's still a mystery why you couldn't repro it, but my guess is that due to some configuration (maybe in your window manager) your system wasn't updating the paste buffer as eagerly as Debian and Unity do by default.
---
 lib/codemirror.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 34923fb2f8..8f5de17d3e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2452,8 +2452,12 @@
       if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
         var start = d.input.selectionStart, end = d.input.selectionEnd;
         d.input.value += "$";
-        d.input.selectionStart = start;
+        // The selection end needs to be set before the start, otherwise there
+        // can be an intermediate non-empty selection between the two, which
+        // can override the middle-click paste buffer on linux and cause the
+        // wrong thing to get pasted.
         d.input.selectionEnd = end;
+        d.input.selectionStart = start;
         cm.state.fakedLastChar = true;
       }
       cm.state.pasteIncoming = true;

From b1a256bd2ae6cd56a3ea3ab953c016e063c23de9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 15:36:33 +0200
Subject: [PATCH 1387/4742] [vim keymap] Remove unused function to please
 linter

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 9c38e3a568..3a099a0663 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -369,10 +369,6 @@
         cm.state.vim = null;
       }
     });
-    function beforeSelectionChange(cm, _obj) {
-      var vim = cm.state.vim;
-      if (vim.insertMode || vim.exMode) return;
-    }
     function getOnPasteFn(cm) {
       var vim = cm.state.vim;
       if (!vim.onPasteFn) {

From 9d02d3a7ee7d4fa3203823d73e09d5ab2b11c679 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Wed, 4 Jun 2014 14:34:50 -0700
Subject: [PATCH 1388/4742] [python mode] Return to parent indentation level
 when scope is closed.

This makes it work correctly when the hanging indent is different from the indent unit.
---
 mode/python/python.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 3a86c278a1..45dd63ba48 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -320,8 +320,10 @@
         var closing = textAfter && textAfter.charAt(0) == scope.type;
         if (scope.align != null)
           return scope.align - (closing ? 1 : 0);
+        else if (closing && state.scopes.length > 1)
+          return state.scopes[state.scopes.length - 2].offset;
         else
-          return scope.offset - (closing ? conf.indentUnit : 0);
+          return scope.offset;
       },
 
       lineComment: "#",

From 2477a1f7fc536d392d4b7d2bd142ae9e112de813 Mon Sep 17 00:00:00 2001
From: Adam Ahmed <aahmed@atlassian.com>
Date: Thu, 5 Jun 2014 17:00:45 +1000
Subject: [PATCH 1389/4742] Failing test for #2611 - measure div + coverGutter
 bug

Modified the lineWidgetChanged test to also test for #2611
---
 test/test.js | 72 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 62 insertions(+), 10 deletions(-)

diff --git a/test/test.js b/test/test.js
index 526e1c377b..153ec280fb 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1407,27 +1407,79 @@ testCM("lineWidgetCautiousRedraw", function(cm) {
   is(!redrawn);
 }, {value: "123\n456"});
 
+
+var knownScrollbarWidth;
+function scrollbarWidth(measure) {
+  if (knownScrollbarWidth != null) return knownScrollbarWidth;
+  var div = document.createElement('div');
+  div.style.cssText = "width: 50px; height: 50px; overflow-x: scroll";
+  document.body.appendChild(div);
+  knownScrollbarWidth = div.offsetHeight - div.clientHeight;
+  document.body.removeChild(div);
+  return knownScrollbarWidth || 0;
+}
+
 testCM("lineWidgetChanged", function(cm) {
   addDoc(cm, 2, 300);
-  cm.setSize(null, cm.defaultTextHeight() * 50);
+  var halfScrollbarWidth = scrollbarWidth(cm.display.measure)/2;
+  cm.setOption('lineNumbers', true);
+  cm.setSize(600, cm.defaultTextHeight() * 50);
   cm.scrollTo(null, cm.heightAtLine(125, "local"));
+
+  var expectedWidgetHeight = 60;
+  var expectedLinesInWidget = 3;
   function w() {
     var node = document.createElement("div");
-    node.style.cssText = "background: yellow; height: 50px;";
+    // we use these children with just under half width of the line to check measurements are made with correct width
+    // when placed in the measure div.
+    // If the widget is measured at a width much narrower than it is displayed at, the underHalf children will span two lines and break the test.
+    // If the widget is measured at a width much wider than it is displayed at, the overHalf children will combine and break the test.
+    // Note that this test only checks widgets where coverGutter is true, because these require extra styling to get the width right.
+    // It may also be worthwhile to check this for non-coverGutter widgets.
+    // Visually:
+    // Good:
+    // | ------------- display width ------------- |
+    // | ------- widget-width when measured ------ |
+    // | | -- under-half -- | | -- under-half -- | | 
+    // | | --- over-half --- |                     |
+    // | | --- over-half --- |                     |
+    // Height: measured as 3 lines, same as it will be when actually displayed
+
+    // Bad (too narrow):
+    // | ------------- display width ------------- |
+    // | ------ widget-width when measured ----- |  < -- uh oh
+    // | | -- under-half -- |                    |
+    // | | -- under-half -- |                    |  < -- when measured, shoved to next line
+    // | | --- over-half --- |                   |
+    // | | --- over-half --- |                   |
+    // Height: measured as 4 lines, more than expected . Will be displayed as 3 lines!
+
+    // Bad (too wide):
+    // | ------------- display width ------------- |
+    // | -------- widget-width when measured ------- | < -- uh oh
+    // | | -- under-half -- | | -- under-half -- |   | 
+    // | | --- over-half --- | | --- over-half --- | | < -- when measured, combined on one line
+    // Height: measured as 2 lines, less than expected. Will be displayed as 3 lines!
+
+    var barelyUnderHalfWidthHtml = '<div style="display: inline-block; height: 1px; width: '+(285 - halfScrollbarWidth)+'px;"></div>';
+    var barelyOverHalfWidthHtml = '<div style="display: inline-block; height: 1px; width: '+(305 - halfScrollbarWidth)+'px;"></div>';
+    node.innerHTML = new Array(3).join(barelyUnderHalfWidthHtml) + new Array(3).join(barelyOverHalfWidthHtml);
+    node.style.cssText = "background: yellow;font-size:0;line-height: " + (expectedWidgetHeight/expectedLinesInWidget) + "px;";
     return node;
   }
   var info0 = cm.getScrollInfo();
-  var w0 = cm.addLineWidget(0, w());
-  var w150 = cm.addLineWidget(150, w());
-  var w300 = cm.addLineWidget(300, w());
+  var w0 = cm.addLineWidget(0, w(), { coverGutter: true });
+  var w150 = cm.addLineWidget(150, w(), { coverGutter: true });
+  var w300 = cm.addLineWidget(300, w(), { coverGutter: true });
   var info1 = cm.getScrollInfo();
-  eq(info0.height + 150, info1.height);
-  eq(info0.top + 50, info1.top);
-  w0.node.style.height = w150.node.style.height = w300.node.style.height = "10px";
+  eq(info0.height + (3 * expectedWidgetHeight), info1.height);
+  eq(info0.top + expectedWidgetHeight, info1.top);
+  expectedWidgetHeight = 12;
+  w0.node.style.lineHeight = w150.node.style.lineHeight = w300.node.style.lineHeight = (expectedWidgetHeight/expectedLinesInWidget) + "px";
   w0.changed(); w150.changed(); w300.changed();
   var info2 = cm.getScrollInfo();
-  eq(info0.height + 30, info2.height);
-  eq(info0.top + 10, info2.top);
+  eq(info0.height + (3 * expectedWidgetHeight), info2.height);
+  eq(info0.top + expectedWidgetHeight, info2.top);
 });
 
 testCM("getLineNumber", function(cm) {

From 4def0b27db5b98ce1a490379131541124b7a90a1 Mon Sep 17 00:00:00 2001
From: Adam Ahmed <aahmed@atlassian.com>
Date: Thu, 5 Jun 2014 17:02:34 +1000
Subject: [PATCH 1390/4742] Set parent width for coverGutter widgets in measure
 div

When using the measure div to measure a LineWidget with coverGutter: true,
set the parent's width to include the gutter. Otherwise, the widget will
be measured as if it were not meant to cover the gutter (it will be
measured at a narrower width).

Fixes #2611
---
 lib/codemirror.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8f5de17d3e..52bbce2341 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5541,8 +5541,12 @@
 
   function widgetHeight(widget) {
     if (widget.height != null) return widget.height;
-    if (!contains(document.body, widget.node))
-      removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, "position: relative"));
+    if (!contains(document.body, widget.node)) {
+      var parentStyle = "position: relative;";
+      if (widget.coverGutter)
+        parentStyle += "margin-left: -" + widget.cm.getGutterElement().offsetWidth + "px;";
+      removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, parentStyle));
+    }
     return widget.height = widget.node.offsetHeight;
   }
 

From b67a6e88f6705c3f81158851ca48ef0bae20b8aa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 16:25:19 +0200
Subject: [PATCH 1391/4742] Allow theme-sensitive styling of gutter markers

Using the CodeMirror-guttermarker and CodeMirror-guttermarker-subtle CSS
classes to give the markers their color.

Issue #2602
---
 addon/fold/foldgutter.css         | 1 -
 addon/fold/foldgutter.js          | 2 +-
 lib/codemirror.css                | 6 ++++++
 theme/3024-day.css                | 4 ++++
 theme/3024-night.css              | 3 +++
 theme/ambiance.css                | 5 ++++-
 theme/base16-dark.css             | 2 ++
 theme/base16-light.css            | 2 ++
 theme/blackboard.css              | 2 ++
 theme/cobalt.css                  | 2 ++
 theme/erlang-dark.css             | 2 ++
 theme/lesser-dark.css             | 2 ++
 theme/mbo.css                     | 2 ++
 theme/midnight.css                | 2 ++
 theme/monokai.css                 | 2 ++
 theme/neo.css                     | 3 +++
 theme/night.css                   | 2 ++
 theme/paraiso-dark.css            | 2 ++
 theme/paraiso-light.css           | 2 ++
 theme/pastel-on-dark.css          | 2 ++
 theme/rubyblue.css                | 2 ++
 theme/solarized.css               | 3 +++
 theme/the-matrix.css              | 2 ++
 theme/tomorrow-night-eighties.css | 2 ++
 theme/twilight.css                | 2 ++
 theme/vibrant-ink.css             | 2 ++
 theme/xq-dark.css                 | 2 ++
 27 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/addon/fold/foldgutter.css b/addon/fold/foldgutter.css
index 49805393d0..ad19ae2d3e 100644
--- a/addon/fold/foldgutter.css
+++ b/addon/fold/foldgutter.css
@@ -10,7 +10,6 @@
 }
 .CodeMirror-foldgutter-open,
 .CodeMirror-foldgutter-folded {
-  color: #555;
   cursor: pointer;
 }
 .CodeMirror-foldgutter-open:after {
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 4db8259294..bd31ec4d9b 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -58,7 +58,7 @@
   function marker(spec) {
     if (typeof spec == "string") {
       var elt = document.createElement("div");
-      elt.className = spec;
+      elt.className = spec + " CodeMirror-guttermarker-subtle";
       return elt;
     } else {
       return spec.cloneNode(true);
diff --git a/lib/codemirror.css b/lib/codemirror.css
index d33dc05a65..0948ad594f 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -40,6 +40,9 @@
   box-sizing: content-box;
 }
 
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
 /* CURSOR */
 
 .CodeMirror div.CodeMirror-cursor {
@@ -86,6 +89,7 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
   border-left: 1px solid #ccc;
   position: absolute;
 }
+
 /* DEFAULT THEME */
 
 .cm-s-default .cm-keyword {color: #708;}
@@ -121,6 +125,8 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
 
+/* Default styles for common addons */
+
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
 div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 .CodeMirror-activeline-background {background: #e8f2ff;}
diff --git a/theme/3024-day.css b/theme/3024-day.css
index cbb9a4fa41..ebf46fb4a5 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -10,8 +10,12 @@
 
 .cm-s-3024-day.CodeMirror {background: #f7f7f7; color: #3a3432;}
 .cm-s-3024-day div.CodeMirror-selected {background: #d6d5d4 !important;}
+
 .cm-s-3024-day .CodeMirror-gutters {background: #f7f7f7; border-right: 0px;}
+.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
 .cm-s-3024-day .CodeMirror-linenumber {color: #807d7c;}
+
 .cm-s-3024-day .CodeMirror-cursor {border-left: 1px solid #5c5855 !important;}
 
 .cm-s-3024-day span.cm-comment {color: #cdab53;}
diff --git a/theme/3024-night.css b/theme/3024-night.css
index 2c62e221b0..631757fc47 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -11,7 +11,10 @@
 .cm-s-3024-night.CodeMirror {background: #090300; color: #d6d5d4;}
 .cm-s-3024-night div.CodeMirror-selected {background: #3a3432 !important;}
 .cm-s-3024-night .CodeMirror-gutters {background: #090300; border-right: 0px;}
+.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
 .cm-s-3024-night .CodeMirror-linenumber {color: #5c5855;}
+
 .cm-s-3024-night .CodeMirror-cursor {border-left: 1px solid #807d7c !important;}
 
 .cm-s-3024-night span.cm-comment {color: #cdab53;}
diff --git a/theme/ambiance.css b/theme/ambiance.css
index 48ba091fb3..c844566eac 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -56,10 +56,13 @@
 
 .cm-s-ambiance .CodeMirror-linenumber {
   text-shadow: 0px 1px 1px #4d4d4d;
-  color: #222;
+  color: #111;
   padding: 0 5px;
 }
 
+.cm-s-ambiance .CodeMirror-guttermarker { color: #aaa; }
+.cm-s-ambiance .CodeMirror-guttermarker-subtle { color: #111; }
+
 .cm-s-ambiance .CodeMirror-lines .CodeMirror-cursor {
   border-left: 1px solid #7991E8;
 }
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 3b7b21c7a1..199997abdc 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -11,6 +11,8 @@
 .cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
 .cm-s-base16-dark div.CodeMirror-selected {background: #202020 !important;}
 .cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
+.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
 .cm-s-base16-dark .CodeMirror-linenumber {color: #505050;}
 .cm-s-base16-dark .CodeMirror-cursor {border-left: 1px solid #b0b0b0 !important;}
 
diff --git a/theme/base16-light.css b/theme/base16-light.css
index 5aa4b53895..12ff2eb06f 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -11,6 +11,8 @@
 .cm-s-base16-light.CodeMirror {background: #f5f5f5; color: #202020;}
 .cm-s-base16-light div.CodeMirror-selected {background: #e0e0e0 !important;}
 .cm-s-base16-light .CodeMirror-gutters {background: #f5f5f5; border-right: 0px;}
+.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
 .cm-s-base16-light .CodeMirror-linenumber {color: #b0b0b0;}
 .cm-s-base16-light .CodeMirror-cursor {border-left: 1px solid #505050 !important;}
 
diff --git a/theme/blackboard.css b/theme/blackboard.css
index 8b7608472b..d7a2dc9695 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -3,6 +3,8 @@
 .cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
 .cm-s-blackboard .CodeMirror-selected { background: #253B76 !important; }
 .cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
+.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
+.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
 .cm-s-blackboard .CodeMirror-linenumber { color: #888; }
 .cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
 
diff --git a/theme/cobalt.css b/theme/cobalt.css
index b4a917736b..47440531a0 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -1,6 +1,8 @@
 .cm-s-cobalt.CodeMirror { background: #002240; color: white; }
 .cm-s-cobalt div.CodeMirror-selected { background: #b36539 !important; }
 .cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
+.cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white !important; }
 
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index db56b10842..ff47d7f8de 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -1,6 +1,8 @@
 .cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
 .cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
 .cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index b8e77c2794..a782474739 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -13,6 +13,8 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
 
 .cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
+.cm-s-lesser-dark .CodeMirror-guttermarker { color: #599eff; }
+.cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
 .cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
 
 .cm-s-lesser-dark span.cm-keyword { color: #599eff; }
diff --git a/theme/mbo.css b/theme/mbo.css
index bb52e6d17f..4446c87a33 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -3,6 +3,8 @@
 .cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffe9;}
 .cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
 .cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
+.cm-s-mbo .CodeMirror-guttermarker { color: white; }
+.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
 .cm-s-mbo .CodeMirror-linenumber {color: #dadada;}
 .cm-s-mbo .CodeMirror-cursor {border-left: 1px solid #ffffec !important;}
 
diff --git a/theme/midnight.css b/theme/midnight.css
index 468d87daf9..4567d29399 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -16,6 +16,8 @@
 
 .cm-s-midnight div.CodeMirror-selected {background: #314D67 !important;}
 .cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;}
+.cm-s-midnight .CodeMirror-guttermarker { color: white; }
+.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-midnight .CodeMirror-linenumber {color: #D0D0D0;}
 .cm-s-midnight .CodeMirror-cursor {
     border-left: 1px solid #F8F8F0 !important;
diff --git a/theme/monokai.css b/theme/monokai.css
index 7ac601a137..548d2dfff6 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -3,6 +3,8 @@
 .cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2;}
 .cm-s-monokai div.CodeMirror-selected {background: #49483E !important;}
 .cm-s-monokai .CodeMirror-gutters {background: #272822; border-right: 0px;}
+.cm-s-monokai .CodeMirror-guttermarker { color: white; }
+.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-monokai .CodeMirror-linenumber {color: #d0d0d0;}
 .cm-s-monokai .CodeMirror-cursor {border-left: 1px solid #f8f8f0 !important;}
 
diff --git a/theme/neo.css b/theme/neo.css
index b013770b99..cecaaf2801 100644
--- a/theme/neo.css
+++ b/theme/neo.css
@@ -32,6 +32,9 @@
   color:#e0e2e5;
 }
 
+.cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
+.cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
+
 .cm-s-neo div.CodeMirror-cursor {
   width: auto;
   border: 0;
diff --git a/theme/night.css b/theme/night.css
index 016e55ee7c..a0bf8cfa78 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -3,6 +3,8 @@
 .cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
 .cm-s-night div.CodeMirror-selected { background: #447 !important; }
 .cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-night .CodeMirror-guttermarker { color: white; }
+.cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
 .cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
 .cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; }
 
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index ddefc55d2d..53dcdf7a2a 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -11,6 +11,8 @@
 .cm-s-paraiso-dark.CodeMirror {background: #2f1e2e; color: #b9b6b0;}
 .cm-s-paraiso-dark div.CodeMirror-selected {background: #41323f !important;}
 .cm-s-paraiso-dark .CodeMirror-gutters {background: #2f1e2e; border-right: 0px;}
+.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
+.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
 .cm-s-paraiso-dark .CodeMirror-linenumber {color: #776e71;}
 .cm-s-paraiso-dark .CodeMirror-cursor {border-left: 1px solid #8d8687 !important;}
 
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index 8afb14be45..07ca325978 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -11,6 +11,8 @@
 .cm-s-paraiso-light.CodeMirror {background: #e7e9db; color: #41323f;}
 .cm-s-paraiso-light div.CodeMirror-selected {background: #b9b6b0 !important;}
 .cm-s-paraiso-light .CodeMirror-gutters {background: #e7e9db; border-right: 0px;}
+.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
+.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
 .cm-s-paraiso-light .CodeMirror-linenumber {color: #8d8687;}
 .cm-s-paraiso-light .CodeMirror-cursor {border-left: 1px solid #776e71 !important;}
 
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index 72a247527e..7992ac7d2d 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -19,6 +19,8 @@
 	border-right: 0px;
 	padding: 0 3px;
 }
+.cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
 .cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
 .cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
 .cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index 47fae0da9d..5349838940 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -1,6 +1,8 @@
 .cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
 .cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
 .cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
+.cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
+.cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
 .cm-s-rubyblue .CodeMirror-linenumber { color: white; }
 .cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }
 
diff --git a/theme/solarized.css b/theme/solarized.css
index 39fc83d7cd..36d5f79048 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -146,6 +146,9 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   color: #586e75;
   padding: 0 5px;
 }
+.cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
+.cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
+.cm-s-solarized.cm-s-light .CodeMirror-guttermarker { color: #cb4b16; }
 
 .cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
   color: #586e75;
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index 0c3704a62f..01474ca94d 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -1,6 +1,8 @@
 .cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
 .cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D !important; }
 .cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
+.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
+.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
 .cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
 .cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00 !important; }
 
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index 85c2a4a78c..841413546c 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -11,6 +11,8 @@
 .cm-s-tomorrow-night-eighties.CodeMirror {background: #000000; color: #CCCCCC;}
 .cm-s-tomorrow-night-eighties div.CodeMirror-selected {background: #2D2D2D !important;}
 .cm-s-tomorrow-night-eighties .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
 .cm-s-tomorrow-night-eighties .CodeMirror-linenumber {color: #515151;}
 .cm-s-tomorrow-night-eighties .CodeMirror-cursor {border-left: 1px solid #6A6A6A !important;}
 
diff --git a/theme/twilight.css b/theme/twilight.css
index 19d6abaddc..9ca50576d8 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -2,6 +2,8 @@
 .cm-s-twilight .CodeMirror-selected { background: #323232 !important; } /**/
 
 .cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
+.cm-s-twilight .CodeMirror-guttermarker { color: white; }
+.cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
 .cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
 .cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white !important; }
 
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index 0206225bf3..5177282325 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -4,6 +4,8 @@
 .cm-s-vibrant-ink .CodeMirror-selected { background: #35493c !important; }
 
 .cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
+.cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white !important; }
 
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index 4a0b2138ca..116eccf21b 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -23,6 +23,8 @@ THE SOFTWARE.
 .cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-selected { background: #27007A !important; }
 .cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
+.cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 

From 1858a7a2d42376e4554d40943bee33c1103438ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 16:27:56 +0200
Subject: [PATCH 1392/4742] [continuelist addon] Don't treat markers without
 whitespace after them as lists

Issue #2621
---
 addon/edit/continuelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 3485c4b797..8cee761aee 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -11,7 +11,7 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var listRE = /^(\s*)([*+-]|(\d+)\.)(\s*)/,
+  var listRE = /^(\s*)([*+-]|(\d+)\.)(\s+)/,
       unorderedBullets = "*+-";
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {

From 11b74a0815c70d99029d6074026f62748bc34294 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 16:33:46 +0200
Subject: [PATCH 1393/4742] [mbo theme] Remove background-blocking styles

Closes #2623
---
 demo/matchtags.html | 1 -
 lib/codemirror.css  | 1 +
 theme/mbo.css       | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo/matchtags.html b/demo/matchtags.html
index 9a3797e597..ba4b3645d9 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -11,7 +11,6 @@
 <script src="../mode/xml/xml.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
     </style>
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 0948ad594f..c0897771aa 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -129,6 +129,7 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
 div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
 .CodeMirror-activeline-background {background: #e8f2ff;}
 
 /* STOP */
diff --git a/theme/mbo.css b/theme/mbo.css
index 4446c87a33..6cb2b18d9b 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -22,7 +22,7 @@
 .cm-s-mbo span.cm-bracket {color: #fffffc; font-weight: bold;}
 .cm-s-mbo span.cm-tag {color: #9ddfe9;}
 .cm-s-mbo span.cm-link {color: #f54b07;}
-.cm-s-mbo span.cm-error {background: #636363; color: #ffffec;}
+.cm-s-mbo span.cm-error {border-bottom: #636363; color: #ffffec;}
 
 .cm-s-mbo .CodeMirror-activeline-background {background: #494b41 !important;}
 .cm-s-mbo .CodeMirror-matchingbracket {
@@ -30,7 +30,7 @@
   color: #f5e107 !important;
  }
  
-.cm-s-mbo .CodeMirror-matchingtag {background: #4e4e4e;}
+.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
 
 .cm-s-mbo span.cm-searching {
   background-color: none;

From f7b4edfa221f12d3ddce506219bc4839e158c1c7 Mon Sep 17 00:00:00 2001
From: Alexandre Bique <bique.alexandre@gmail.com>
Date: Tue, 10 Jun 2014 16:51:40 +0200
Subject: [PATCH 1394/4742] Add mime-type application/x-javascript

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 4b9829aa2a..315674be74 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -672,6 +672,7 @@ CodeMirror.registerHelper("wordChars", "javascript", /[\\w$]/);
 CodeMirror.defineMIME("text/javascript", "javascript");
 CodeMirror.defineMIME("text/ecmascript", "javascript");
 CodeMirror.defineMIME("application/javascript", "javascript");
+CodeMirror.defineMIME("application/x-javascript", "javascript");
 CodeMirror.defineMIME("application/ecmascript", "javascript");
 CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
 CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});

From 25bcc712a887e91aa677928249036c04b17a641a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 16:56:50 +0200
Subject: [PATCH 1395/4742] Fix atomic marker comparison logic

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 52bbce2341..2e04801658 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5422,8 +5422,8 @@
       var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
       var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
       if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
-      if (fromCmp <= 0 && (cmp(found.to, from) || extraRight(sp.marker) - extraLeft(marker)) > 0 ||
-          fromCmp >= 0 && (cmp(found.from, to) || extraLeft(sp.marker) - extraRight(marker)) < 0)
+      if (fromCmp <= 0 && (cmp(found.to, from) > 0 || (sp.marker.inclusiveRight && marker.inclusiveLeft)) ||
+          fromCmp >= 0 && (cmp(found.from, to) < 0 || (sp.marker.inclusiveLeft && marker.inclusiveRight)))
         return true;
     }
   }

From 9e7a26a90072786b81b6b2c3b959775958c81d71 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 17:12:49 +0200
Subject: [PATCH 1396/4742] Take line number updates into account when bailing
 early from updateDisplay

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2e04801658..205eb701de 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -608,6 +608,7 @@
 
     // Bail out if the visible area is already rendered and nothing changed.
     if (!forced && visible.from >= display.viewFrom && visible.to <= display.viewTo &&
+        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
         countDirtyView(cm) == 0)
       return;
 

From c49c329ef9ece7296b388dcd4839510a0ca1dff4 Mon Sep 17 00:00:00 2001
From: Brian Grinstead <briangrinstead@gmail.com>
Date: Wed, 18 Jun 2014 13:03:11 -0500
Subject: [PATCH 1397/4742] [tern addon] add optional callback to showType

---
 addon/tern/tern.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 7a0845350d..abb8ab35a4 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -106,7 +106,7 @@
       cm.showHint({hint: this.getHint});
     },
 
-    showType: function(cm, pos) { showType(this, cm, pos); },
+    showType: function(cm, pos, cb) { showType(this, cm, pos, cb); },
 
     updateArgHints: function(cm) { updateArgHints(this, cm); },
 
@@ -239,7 +239,7 @@
 
   // Type queries
 
-  function showType(ts, cm, pos) {
+  function showType(ts, cm, pos, cb) {
     ts.request(cm, "type", function(error, data) {
       if (error) return showError(ts, cm, error);
       if (ts.options.typeTip) {
@@ -254,6 +254,7 @@
         }
       }
       tempTooltip(cm, tip);
+      if (cb) cb();
     }, pos);
   }
 

From fd4cb73c9dc6498b7874c5fe36b1078b99daab89 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 17:16:25 +0200
Subject: [PATCH 1398/4742] [tern addon] Adjust callback variable name to match
 rest of file

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

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index abb8ab35a4..9bd69446a2 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -106,7 +106,7 @@
       cm.showHint({hint: this.getHint});
     },
 
-    showType: function(cm, pos, cb) { showType(this, cm, pos, cb); },
+    showType: function(cm, pos, c) { showType(this, cm, pos, c); },
 
     updateArgHints: function(cm) { updateArgHints(this, cm); },
 
@@ -239,7 +239,7 @@
 
   // Type queries
 
-  function showType(ts, cm, pos, cb) {
+  function showType(ts, cm, pos, c) {
     ts.request(cm, "type", function(error, data) {
       if (error) return showError(ts, cm, error);
       if (ts.options.typeTip) {
@@ -254,7 +254,7 @@
         }
       }
       tempTooltip(cm, tip);
-      if (cb) cb();
+      if (c) c();
     }, pos);
   }
 

From 87e0f150845762e7ec4f79411720c09cafe4ec48 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 17:23:04 +0200
Subject: [PATCH 1399/4742] [real-world uses] Add more links

---
 doc/realworld.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index 5ea168f66c..6b44c5e67b 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -21,8 +21,9 @@
 
 <h2>CodeMirror real-world uses</h2>
 
-    <p><a href="mailto:marijnh@gmail.com">Contact me</a> if you'd like
-    your project to be added to this list.</p>
+    <p>Create a <a href="https://github.com/marijnh/codemirror">pull
+    request</a> or <a href="mailto:marijnh@gmail.com">email me</a> if
+    you'd like your project to be added to this list.</p>
 
     <ul>
       <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
@@ -66,6 +67,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://elm-lang.org/Examples.elm">Elm language examples</a></li>
       <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
       <li><a href="http://emmet.io">Emmet</a> (fast XML editing)</li>
+      <li><a href="https://github.com/espruino/EspruinoWebIDE">Espruino Web IDE</a> (Chrome App for writing code on Espruino devices)</li>
       <li><a href="http://www.fastfig.com/">Fastfig</a> (online computation/math tool)</li>
       <li><a href="https://metacpan.org/module/Farabi">Farabi</a> (modern Perl IDE)</li>
       <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>
@@ -73,7 +75,8 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://github.com/simogeo/Filemanager">Filemanager</a></li>
       <li><a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox Developer Tools</a></li>
       <li><a href="http://www.firepad.io">Firepad</a> (collaborative text editor)</li>
-      <li><a href="https://code.google.com/p/gerrit/">Gerrit</a>'s diff view</a></li>
+      <li><a href="https://code.google.com/p/gerrit/">Gerrit</a>'s diff view</li>
+      <li><a href="https://github.com/maks/git-crx">Git Crx</a> (Chrome App for browsing local git repos)</li>
       <li><a href="http://tour.golang.org">Go language tour</a></li>
       <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>

From 9a843eece97ed12049291c5368d5c57823cabc1e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 17:31:58 +0200
Subject: [PATCH 1400/4742] Make goLineStart and goLineEnd pass in an explicit
 bias for skipping atomics

Issue #2635
---
 lib/codemirror.js |  8 +++++---
 test/test.js      | 10 ++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 205eb701de..329e0ece93 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4575,7 +4575,8 @@
     goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
     goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
     goLineStart: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); }, sel_move);
+      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); },
+                            {origin: "+move", bias: 1});
     },
     goLineStartSmart: function(cm) {
       cm.extendSelectionsBy(function(range) {
@@ -4588,10 +4589,11 @@
           return Pos(start.line, inWS ? 0 : firstNonWS);
         }
         return start;
-      }, sel_move);
+      }, {origin: "+move", bias: 1});
     },
     goLineEnd: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); }, sel_move);
+      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); },
+                            {origin: "+move", bias: -1});
     },
     goLineRight: function(cm) {
       cm.extendSelectionsBy(function(range) {
diff --git a/test/test.js b/test/test.js
index 153ec280fb..4ef4ef547d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1613,6 +1613,16 @@ testCM("selectionBias", function(cm) {
   eqPos(cm.getCursor(), Pos(0, 3));
 }, {value: "12345"});
 
+testCM("selectionHomeEnd", function(cm) {
+  cm.markText(Pos(1, 0), Pos(1, 1), {atomic: true, inclusiveLeft: true});
+  cm.markText(Pos(1, 3), Pos(1, 4), {atomic: true, inclusiveRight: true});
+  cm.setCursor(Pos(1, 2));
+  cm.execCommand("goLineStart");
+  eqPos(cm.getCursor(), Pos(1, 1));
+  cm.execCommand("goLineEnd");
+  eqPos(cm.getCursor(), Pos(1, 3));
+}, {value: "ab\ncdef\ngh"});
+
 testCM("readOnlyMarker", function(cm) {
   function mark(ll, cl, lr, cr, at) {
     return cm.markText(Pos(ll, cl), Pos(lr, cr),

From eedd97a7f3ba0571c96401d964699db6c1bc0df5 Mon Sep 17 00:00:00 2001
From: Peter Flynn <pflynn@adobe.com>
Date: Fri, 20 Jun 2014 15:23:10 -0700
Subject: [PATCH 1401/4742] Fix CodeMirror bug #2620 (One pixel wide selection
 appears on empty line) - Lost negation operator when converting to new IE
 flags in bbefd22.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 329e0ece93..91d5bb550b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7277,7 +7277,7 @@
       var test = elt("span", "\u200b");
       removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
       if (measure.firstChild.offsetHeight != 0)
-        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && (ie && ie_version < 8);
+        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
     }
     if (zwspSupported) return elt("span", "\u200b");
     else return elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");

From a1d1c4a3d373dbcc60b40ede2dc9ff653687ad49 Mon Sep 17 00:00:00 2001
From: Mathias Bynens <mathias@qiwi.be>
Date: Sat, 21 Jun 2014 17:59:18 +0200
Subject: [PATCH 1402/4742] [css mode] Add `rebeccapurple` to the list of named
 colors

http://lists.w3.org/Archives/Public/www-style/2014Jun/0312.html
---
 mode/css/css.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index ca27e25819..2678c57d59 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -491,8 +491,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered",
     "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred",
     "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue",
-    "purple", "red", "rosybrown", "royalblue", "saddlebrown", "salmon",
-    "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
+    "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown",
+    "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
     "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",
     "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
     "whitesmoke", "yellow", "yellowgreen"

From fe51575290369ad27eea6732d65ba3af8ab3489d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 18:10:14 +0200
Subject: [PATCH 1403/4742] Mark release 4.3

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

diff --git a/AUTHORS b/AUTHORS
index f1d6b58a85..f5f569721e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,6 +19,7 @@ Albert Xing
 Alexander Pavlov
 Alexander Schepanovski
 Alexander Solovyov
+Alexandre Bique
 alexey-k
 Alex Piggott
 Amsul
@@ -61,10 +62,12 @@ borawjm
 Brandon Frohs
 Brandon Wamboldt
 Brett Zamir
+Brian Grinstead
 Brian Sletten
 Bruce Mitchener
 Chandra Sekhar Pydi
 Charles Skelton
+Cheah Chu Yeow
 Chris Coyier
 Chris Granger
 Chris Houseknecht
@@ -215,6 +218,7 @@ Manuel Rego Casasnovas
 Marat Dreizin
 Marco Aurélio
 Marco Munizaga
+Marcus Bointon
 Marijn Haverbeke
 Mario Pietsch
 Mark Lentczner
@@ -224,6 +228,7 @@ Martín Gaitán
 Martin Hasoň
 Mason Malone
 Mateusz Paprocki
+Mathias Bynens
 mats cronqvist
 Matthew Beale
 Matthias BUSSONNIER
@@ -277,6 +282,7 @@ Pavel Feldman
 Pavel Strashkin
 Paweł Bartkiewicz
 peteguhl
+Peter Flynn
 peterkroon
 Peter Kroon
 prasanthj
diff --git a/bower.json b/bower.json
index 237898dc73..80b379f14b 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "CodeMirror",
-  "version":"4.2.1",
+  "version":"4.3.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index c79a3beaeb..5762aa442b 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.3.0;f=">4.3</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.2.1;f=">4.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.2.0;f=">4.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.1.0;f=">4.1</option>
diff --git a/doc/manual.html b/doc/manual.html
index bc1b2b5c26..0f77ca8503 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 4.2.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.3.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 5e6829b406..ea5f98d3d8 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,19 @@ <h2>Release notes and version history</h2>
 
   <h2 id="v4">Version 4.x</h2>
 
+  <p class="rel">23-06-2014: <a href="http://codemirror.net/codemirror-4.3.zip">Version 4.3</a>:</p>
+
+  <ul class="rel-note">
+    <li>Several <a href="../demo/vim.html">vim bindings</a>
+    improvements: search and exCommand history, global flag
+    for <code>:substitute</code>, <code>:global</code> command.
+    <li>Allow hiding the cursor by
+    setting <a href="manual.html#option_cursorBlinkRate"><code>cursorBlinkRate</code></a>
+    to a negative value.</li>
+    <li>Make gutter markers themeable, use this in foldgutter.</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.2.0...4.3.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">19-05-2014: <a href="http://codemirror.net/codemirror-4.2.zip">Version 4.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 19b9529781..d5cbece193 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.2</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.3</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 91d5bb550b..bafc9fa142 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7632,7 +7632,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.2.1";
+  CodeMirror.version = "4.3.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index b5e1639a2b..eea46775d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.2.1",
+    "version":"4.3.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From f8cf3194bf2f810dee6b3cbbbb724be84b408bc3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Jun 2014 18:10:48 +0200
Subject: [PATCH 1404/4742] Bump version number post-4.3

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

diff --git a/bower.json b/bower.json
index 80b379f14b..b103179156 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "CodeMirror",
-  "version":"4.3.0",
+  "version":"4.3.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 0f77ca8503..2deb8422a5 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 4.3.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.3.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index bafc9fa142..390cb37866 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7632,7 +7632,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.3.0";
+  CodeMirror.version = "4.3.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index eea46775d5..a496af340e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.3.0",
+    "version":"4.3.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From aa43a39f7f8f855f0d33be26d031904db3fe344e Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Sun, 22 Jun 2014 04:33:55 +0530
Subject: [PATCH 1405/4742] [vim] visual Block with delete functionality

---
 keymap/vim.js    | 154 ++++++++++++++++++++++++++++++++++++++++-------
 test/vim_test.js |  24 ++++++--
 2 files changed, 152 insertions(+), 26 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 3a099a0663..a72c5c0a3d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -288,6 +288,8 @@
     { keys: ['v'], type: 'action', action: 'toggleVisualMode' },
     { keys: ['V'], type: 'action', action: 'toggleVisualMode',
         actionArgs: { linewise: true }},
+    { keys: ['<C-v>'], type: 'action', action: 'toggleVisualMode',
+        actionArgs: { blockwise: true }},
     { keys: ['g', 'v'], type: 'action', action: 'reselectLastSelection' },
     { keys: ['J'], type: 'action', action: 'joinLines', isEdit: true },
     { keys: ['p'], type: 'action', action: 'paste', isEdit: true,
@@ -607,6 +609,7 @@
           visualMode: false,
           // If we are in visual line mode. No effect if visualMode is false.
           visualLine: false,
+          visualBlock: false,
           lastSelection: null,
           lastPastedText: null
         };
@@ -1343,19 +1346,28 @@
           if (vim.visualMode) {
             // Check if the selection crossed over itself. Will need to shift
             // the start point if that happened.
+            // offset is set to -1 or 1 to shift the curEnd
+            // left or right
+            var offset = 0;
             if (cursorIsBefore(selectionStart, selectionEnd) &&
                 (cursorEqual(selectionStart, curEnd) ||
                     cursorIsBefore(curEnd, selectionStart))) {
               // The end of the selection has moved from after the start to
               // before the start. We will shift the start right by 1.
               selectionStart.ch += 1;
-              curEnd.ch -= 1;
+              offset = -1;
             } else if (cursorIsBefore(selectionEnd, selectionStart) &&
                 (cursorEqual(selectionStart, curEnd) ||
                     cursorIsBefore(selectionStart, curEnd))) {
               // The opposite happened. We will shift the start left by 1.
               selectionStart.ch -= 1;
-              curEnd.ch += 1;
+              offset = 1;
+            }
+            // in case of visual Block
+            // selectionStart and curEnd
+            // may not be on the same line
+            if (!vim.visualBlock) {
+              curEnd.ch += offset;
             }
             if (vim.lastHPos != Infinity) {
               vim.lastHPos = curEnd.ch;
@@ -1375,8 +1387,12 @@
                 selectionEnd.ch = 0;
                 selectionStart.ch = lineLength(cm, selectionStart.line);
               }
+            } else if (vim.visualBlock) {
+              selectBlock(cm, selectionEnd);
+            }
+            if (!vim.visualBlock) {
+              cm.setSelection(selectionStart, selectionEnd);
             }
-            cm.setSelection(selectionStart, selectionEnd);
             updateMark(cm, vim, '<',
                 cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
                     : selectionEnd);
@@ -1830,7 +1846,7 @@
         cm.setCursor(curStart);
       },
       // delete is a javascript keyword.
-      'delete': function(cm, operatorArgs, _vim, curStart, curEnd) {
+      'delete': function(cm, operatorArgs, vim, curStart, curEnd) {
         // If the ending line is past the last line, inclusive, instead of
         // including the trailing \n, include the \n before the starting line
         if (operatorArgs.linewise &&
@@ -1841,7 +1857,14 @@
         vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'delete', cm.getRange(curStart, curEnd),
             operatorArgs.linewise);
-        cm.replaceRange('', curStart, curEnd);
+        if (vim.visualBlock) {
+          var selections = cm.listSelections();
+          curStart = selections[0].anchor;
+          var replacement = new Array(selections.length).join('1').split('1');
+          cm.replaceSelections(replacement);
+        } else {
+          cm.replaceRange('', curStart, curEnd);
+        }
         if (operatorArgs.linewise) {
           cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
         } else {
@@ -2022,6 +2045,7 @@
           cm.on('mousedown', exitVisualMode);
           vim.visualMode = true;
           vim.visualLine = !!actionArgs.linewise;
+          vim.visualBlock = !!actionArgs.blockwise;
           if (vim.visualLine) {
             curStart.ch = 0;
             curEnd = clipCursorToContent(
@@ -2037,24 +2061,47 @@
         } else {
           curStart = cm.getCursor('anchor');
           curEnd = cm.getCursor('head');
-          if (!vim.visualLine && actionArgs.linewise) {
-            // Shift-V pressed in characterwise visual mode. Switch to linewise
-            // visual mode instead of exiting visual mode.
-            vim.visualLine = true;
-            curStart.ch = cursorIsBefore(curStart, curEnd) ? 0 :
+          if (vim.visualLine) {
+            vim.visualLine = false;
+            if (actionArgs.blockwise) {
+              // This means Ctrl-V pressed in linewise visual
+              vim.visualBlock = true;
+              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'blockwise'});
+            } else if (!actionArgs.linewise) {
+              // v pressed in linewise, switch to characterwise visual mode
+              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual'});
+            } else {
+              exitVisualMode(cm);
+            }
+          } else if (vim.visualBlock) {
+            vim.visualBlock = false;
+            if (actionArgs.linewise) {
+              // Shift-V pressed in blockwise visual mode
+              vim.visualLine = true;
+              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'linewise'});
+            } else if (!actionArgs.blockwise) {
+              // v pressed in blockwise mode, Switch to characterwise
+              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual'});
+            } else {
+              exitVisualMode(cm);
+            }
+          } else if (actionArgs.linewise) {
+              // Shift-V pressed in characterwise visual mode. Switch to linewise
+              // visual mode instead of exiting visual mode.
+              vim.visualLine = true;
+              curStart.ch = cursorIsBefore(curStart, curEnd) ? 0 :
                 lineLength(cm, curStart.line);
-            curEnd.ch = cursorIsBefore(curStart, curEnd) ?
+              curEnd.ch = cursorIsBefore(curStart, curEnd) ?
                 lineLength(cm, curEnd.line) : 0;
-            cm.setSelection(curStart, curEnd);
-            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: "linewise"});
-          } else if (vim.visualLine && !actionArgs.linewise) {
-            // v pressed in linewise visual mode. Switch to characterwise visual
-            // mode instead of exiting visual mode.
-            vim.visualLine = false;
-            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-          } else {
-            exitVisualMode(cm);
-          }
+              cm.setSelection(curStart, curEnd);
+              CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: "linewise"});
+            } else if (actionArgs.blockwise) {
+              vim.visualBlock = true;
+              // write code for block selection;
+              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'blockwise'});
+            } else {
+              exitVisualMode(cm);
+            }
         }
         updateMark(cm, vim, '<', cursorIsBefore(curStart, curEnd) ? curStart
             : curEnd);
@@ -2407,6 +2454,70 @@
     function escapeRegex(s) {
       return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
     }
+    // This functions selects a rectangular block
+    // of text with selectionEnd as any of its corner
+    // Height of block:
+    // Difference in selectionEnd.line and first/last selection.line
+    // Width of the block:
+    // Distance between selectionEnd.ch and any(first considered here) selection.ch
+    function selectBlock(cm, selectionEnd) {
+      var selections = [], ranges = cm.listSelections();
+      var firstRange = ranges[0].anchor, lastRange = ranges[ranges.length-1].anchor;
+      var start, end;
+      var primIndex = getIndex(ranges, cm.getCursor('head'));
+      // sets to true when selectionEnd already lies inside the existing selections
+      var contains = getIndex(ranges, selectionEnd) < 0 ? false : true;
+      selectionEnd = cm.clipPos(selectionEnd);
+      // difference in distance of selectionEnd from each end of the block.
+      var near  = Math.abs(firstRange.line - selectionEnd.line) - Math.abs(lastRange.line - selectionEnd.line);
+      if (near > 0) {
+        end = selectionEnd.line;
+        start = firstRange.line;
+        if (lastRange.line == selectionEnd.line && contains) {
+          start = end;
+        }
+      } else if (near < 0) {
+        start = selectionEnd.line;
+        end = lastRange.line;
+        if (firstRange.line == selectionEnd.line && contains) {
+          end = start;
+        }
+      } else {
+        // Case where selectionEnd line is halfway between the 2 ends.
+        // We remove the primary selection in this case
+        if (primIndex == 0) {
+          start = selectionEnd.line;
+          end = lastRange.line;
+        } else {
+          start = firstRange.line;
+          end = selectionEnd.line;
+        }
+      }
+      if (start > end) {
+        var tmp = start;
+        start = end;
+        end = tmp;
+      }
+      while (start <= end) {
+        var anchor = {line: start, ch: (near > 0) ? firstRange.ch : lastRange.ch};
+        var head = {line: start, ch: selectionEnd.ch};
+        var range = {anchor: anchor, head: head};
+        selections.push(range);
+        if (cursorEqual(head, selectionEnd)) {
+            primIndex = selections.indexOf(range);
+        }
+        start++;
+      }
+      cm.setSelections(selections, primIndex);
+    }
+    function getIndex(ranges, head) {
+      for (var i = 0; i < ranges.length; i++) {
+        if (cursorEqual(ranges[i].head, head)) {
+          return i;
+        }
+      }
+      return -1;
+    }
     function getSelectedAreaRange(cm, vim) {
       var selectionStart = cm.getCursor('anchor');
       var selectionEnd = cm.getCursor('head');
@@ -2456,6 +2567,7 @@
       updateLastSelection(cm, vim);
       vim.visualMode = false;
       vim.visualLine = false;
+      vim.visualBlock = false;
       if (!cursorEqual(selectionStart, selectionEnd)) {
         // Clear the selection and set the cursor only if the selection has not
         // already been cleared. Otherwise we risk moving the cursor somewhere
diff --git a/test/vim_test.js b/test/vim_test.js
index 932db70136..e437e8fe57 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1573,6 +1573,20 @@ testVim('visual_line', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'd');
   eq(' 4\n 5', cm.getValue());
 }, { value: ' 1\n 2\n 3\n 4\n 5' });
+testVim('visual_block', function(cm, vim, helpers) {
+  // test the block selection with lines of different length
+  // i.e. extending the selection
+  // till the end of the longest line.
+  helpers.doKeys('<C-v>', 'l', 'j', 'j', '6', 'l', 'd');
+  helpers.doKeys('d', 'd', 'd', 'd');
+  eq('', cm.getValue());
+  // check for left side selection in case
+  // of moving up to a shorter line.
+  cm.replaceRange('hello world\n{\nthis is\nsparta!', cm.getCursor());
+  cm.setCursor(3, 4);
+  helpers.doKeys('<C-v>', 'l', 'k', 'k', 'd');
+  eq('hello world\n{\nt is\nsta!', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
 testVim('visual_marks', function(cm, vim, helpers) {
   helpers.doKeys('l', 'v', 'l', 'l', 'j', 'j', 'v');
   // Test visual mode marks
@@ -1613,13 +1627,13 @@ testVim('reselect_visual', function(cm, vim, helpers) {
   eq('123456\n2345\nbar', cm.getValue());
 }, { value: '123456\nfoo\nbar' });
 testVim('reselect_visual_line', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'V', 'l', 'j', 'j', 'V', 'g', 'v', 'd');
-  eq(' foo\n and\n bar', cm.getValue());
-  cm.setCursor(0, 0);
+  helpers.doKeys('l', 'V', 'j', 'j', 'V', 'g', 'v', 'd');
+  eq('\nfoo\nand\nbar', cm.getValue());
+  cm.setCursor(1, 0);
   helpers.doKeys('V', 'y', 'j');
   helpers.doKeys('V', 'p' , 'g', 'v', 'd');
-  eq(' foo\n bar', cm.getValue());
-}, { value: ' hello\n this\n is \n foo\n and\n bar' });
+  eq('\nfoo\nbar', cm.getValue());
+}, { value: 'hello\nthis\nis\nfoo\nand\nbar' });
 testVim('s_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('s');

From 2516fe1f4c311f1eee278d47d3cdc34b499c7b08 Mon Sep 17 00:00:00 2001
From: William Stein <wstein@uw.edu>
Date: Mon, 23 Jun 2014 10:08:53 -0700
Subject: [PATCH 1406/4742] Add SageMathCloud to real world examples

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 6b44c5e67b..e495cfbba6 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -123,6 +123,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.quivive-file-manager.com">Quivive File Manager</a></li>
       <li><a href="http://rascalmicro.com/docs/basic-tutorial-getting-started.html">Rascal</a> (tiny computer)</li>
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
+      <li><a href="https://cloud.sagemath.com/">SageMathCloud</a> (interactive mathematical software environment)</li>
       <li><a href="https://chrome.google.com/webstore/detail/servephp/mnpikomdchjhkhbhmbboehfdjkobbfpo">ServePHP</a> (PHP code testing in Chrome dev tools)</li>
       <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>

From 009deb76dc7a99fd0a225e9ffc4c7a78410be774 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Wed, 11 Jun 2014 19:08:20 -0700
Subject: [PATCH 1407/4742] [comment addon] Avoid killing block comments
 outside selection

Currently, if you perform the uncomment command with the cursor outside a single-line block comment, it will uncomment that block comment. This is unfortunate behavior for cases where the block comment is used to describe the parameter to a function like "foo(/* index */ 0)". It's also inconsistent: if you have a selection and a single-line block comment after the end of the selection, uncomment() will do nothing, however if you have a selection with a single-line block comment *before* the selection, it will line-comment out all the lines of the selection instead.

This also isn't a complete fix, but significantly reduces the scope of the problem. For example if you have "/* foo */ bar /* baz */", uncomment() still does the wrong thing when the cursor is on foo or baz.
---
 addon/comment/comment.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 3ac476452d..cb78340231 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -153,6 +153,17 @@
         !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
       return false;
 
+    // Avoid killing block comments completely outside the selection.
+    // Positions of the last startString before the start of the selection, and the first endString after it.
+    var lastStart = startLine.lastIndexOf(startString, from.ch);
+    var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
+    if (lastStart != -1 && firstEnd != -1) return false;
+    // Positions of the first endString after the end of the selection, and the last startString before it.
+    firstEnd = endLine.indexOf(endString, to.ch);
+    var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
+    lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
+    if (firstEnd != -1 && lastStart != -1) return false;
+
     self.operation(function() {
       self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
                         Pos(end, close + endString.length));

From 1e78035dd3a7fedc762210a57c852073dbe3d19d Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Mon, 23 Jun 2014 17:21:18 -0700
Subject: [PATCH 1408/4742] [comment tests] Test ctrl+/ on inline block
 comments

---
 test/comment_test.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/test/comment_test.js b/test/comment_test.js
index d8ff2c866d..8bd3959ee9 100644
--- a/test/comment_test.js
+++ b/test/comment_test.js
@@ -9,6 +9,9 @@ namespace = "comment_";
   }
 
   var simpleProg = "function foo() {\n  return bar;\n}";
+  var inlineBlock = "foo(/* bar */ true);";
+  var inlineBlocks = "foo(/* bar */ true, /* baz */ false);";
+  var multiLineInlineBlock = ["above();", "foo(/* bar */ true);", "below();"];
 
   test("block", "javascript", function(cm) {
     cm.blockComment(Pos(0, 3), Pos(3, 0), {blockCommentLead: " *"});
@@ -19,6 +22,17 @@ namespace = "comment_";
     cm.uncomment(Pos(0, 3), Pos(2, 0), {blockCommentLead: " *"});
   }, simpleProg, simpleProg);
 
+  test("blockToggle2", "javascript", function(cm) {
+    cm.setCursor({line: 0, ch: 7 /* inside the block comment */});
+    cm.execCommand("toggleComment");
+  }, inlineBlock, "foo(bar true);");
+
+  // This test should work but currently fails.
+  // test("blockToggle3", "javascript", function(cm) {
+  //   cm.setCursor({line: 0, ch: 7 /* inside the first block comment */});
+  //   cm.execCommand("toggleComment");
+  // }, inlineBlocks, "foo(bar true, /* baz */ false);");
+
   test("line", "javascript", function(cm) {
     cm.lineComment(Pos(1, 1), Pos(1, 1));
   }, simpleProg, "function foo() {\n//   return bar;\n}");
@@ -36,6 +50,29 @@ namespace = "comment_";
     cm.blockComment(Pos(0, 0), Pos(1));
   }, "def blah()\n  return hah\n", "# def blah()\n#   return hah\n");
 
+  test("ignoreExternalBlockComments", "javascript", function(cm) {
+    cm.execCommand("toggleComment");
+  }, inlineBlocks, "// " + inlineBlocks);
+
+  test("ignoreExternalBlockComments2", "javascript", function(cm) {
+    cm.setCursor({line: 0, ch: null /* eol */});
+    cm.execCommand("toggleComment");
+  }, inlineBlocks, "// " + inlineBlocks);
+
+  test("ignoreExternalBlockCommentsMultiLineAbove", "javascript", function(cm) {
+    cm.setSelection({line: 0, ch: 0}, {line: 1, ch: 1});
+    cm.execCommand("toggleComment");
+  }, multiLineInlineBlock.join("\n"), ["// " + multiLineInlineBlock[0],
+                                       "// " + multiLineInlineBlock[1],
+                                       multiLineInlineBlock[2]].join("\n"));
+
+  test("ignoreExternalBlockCommentsMultiLineBelow", "javascript", function(cm) {
+    cm.setSelection({line: 1, ch: 13 /* after end of block comment */}, {line: 2, ch: 1});
+    cm.execCommand("toggleComment");
+  }, multiLineInlineBlock.join("\n"), [multiLineInlineBlock[0],
+                                       "// " + multiLineInlineBlock[1],
+                                       "// " + multiLineInlineBlock[2]].join("\n"));
+
   test("commentRange", "javascript", function(cm) {
     cm.blockComment(Pos(1, 2), Pos(1, 13), {fullLines: false});
   }, simpleProg, "function foo() {\n  /*return bar;*/\n}");

From 0abae990ec1e981ac1181a7637a6b333714278f5 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Mon, 23 Jun 2014 18:09:22 -0700
Subject: [PATCH 1409/4742] [sublime] Add findAllUnder command

---
 keymap/sublime.js | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 4d46938415..4ac03287e6 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -481,7 +481,7 @@
     });
   };
 
-  function findAndGoTo(cm, forward) {
+  function getTarget(cm) {
     var from = cm.getCursor("from"), to = cm.getCursor("to");
     if (CodeMirror.cmpPos(from, to) == 0) {
       var word = wordAt(cm, from);
@@ -489,9 +489,13 @@
       from = word.from;
       to = word.to;
     }
+    return {from: from, to: to, query: cm.getRange(from, to), word: word};
+  }
 
-    var query = cm.getRange(from, to);
-    var cur = cm.getSearchCursor(query, forward ? to : from);
+  function findAndGoTo(cm, forward) {
+    var target = getTarget(cm);
+    var query = target.query;
+    var cur = cm.getSearchCursor(query, forward ? target.to : target.from);
 
     if (forward ? cur.findNext() : cur.findPrevious()) {
       cm.setSelection(cur.from(), cur.to());
@@ -500,12 +504,24 @@
                                               : cm.clipPos(Pos(cm.lastLine())));
       if (forward ? cur.findNext() : cur.findPrevious())
         cm.setSelection(cur.from(), cur.to());
-      else if (word)
-        cm.setSelection(from, to);
+      else if (target.word)
+        cm.setSelection(target.from, target.to);
     }
   };
   cmds[map[ctrl + "F3"] = "findUnder"] = function(cm) { findAndGoTo(cm, true); };
   cmds[map["Shift-" + ctrl + "F3"] = "findUnderPrevious"] = function(cm) { findAndGoTo(cm,false); };
+  cmds[map["Alt-F3"] = "findAllUnder"] = function(cm) {
+    var target = getTarget(cm);
+    var cur = cm.getSearchCursor(target.query);
+    var matches = [];
+    var primaryIndex = -1;
+    while (cur.findNext()) {
+      matches.push({anchor: cur.from(), head: cur.to()});
+      if (cur.from().line <= target.from.line && cur.from().ch <= target.from.ch)
+        primaryIndex++;
+    }
+    cm.setSelections(matches, primaryIndex);
+  };
 
   map["Shift-" + ctrl + "["] = "fold";
   map["Shift-" + ctrl + "]"] = "unfold";

From da716e0bda0a00429f072309f55435b95f7496e4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Jun 2014 21:14:47 +0200
Subject: [PATCH 1410/4742] [sublime] Fix null dereference bug introduced by
 #2655

---
 keymap/sublime.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 4ac03287e6..7a3a1e5f0e 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -494,6 +494,7 @@
 
   function findAndGoTo(cm, forward) {
     var target = getTarget(cm);
+    if (!target) return;
     var query = target.query;
     var cur = cm.getSearchCursor(query, forward ? target.to : target.from);
 
@@ -512,6 +513,7 @@
   cmds[map["Shift-" + ctrl + "F3"] = "findUnderPrevious"] = function(cm) { findAndGoTo(cm,false); };
   cmds[map["Alt-F3"] = "findAllUnder"] = function(cm) {
     var target = getTarget(cm);
+    if (!target) return;
     var cur = cm.getSearchCursor(target.query);
     var matches = [];
     var primaryIndex = -1;

From e20d175f6294e3f5f6c18f7e9c2ce505aa040d17 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Wed, 25 Jun 2014 03:28:34 +0530
Subject: [PATCH 1411/4742] [vim] Update unit tests for switching between
 visual modes

---
 keymap/vim.js    | 26 ++++++++++++++++++++++++--
 test/vim_test.js | 30 ++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a72c5c0a3d..fb79140bed 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2066,6 +2066,7 @@
             if (actionArgs.blockwise) {
               // This means Ctrl-V pressed in linewise visual
               vim.visualBlock = true;
+              selectBlock(cm, curEnd);
               CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'blockwise'});
             } else if (!actionArgs.linewise) {
               // v pressed in linewise, switch to characterwise visual mode
@@ -2078,9 +2079,20 @@
             if (actionArgs.linewise) {
               // Shift-V pressed in blockwise visual mode
               vim.visualLine = true;
+              var selections = cm.listSelections();
+              curStart = Pos(selections[0].anchor.line, 0);
+              curEnd = Pos(selections[selections.length-1].anchor.line, lineLength(cm, selections[selections.length-1].anchor.line));
+              cm.setSelection(curStart, curEnd);
               CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'linewise'});
             } else if (!actionArgs.blockwise) {
               // v pressed in blockwise mode, Switch to characterwise
+              var selections = cm.listSelections();
+              if (curEnd != selections[0].head) {
+                curStart = selections[0].anchor;
+              } else {
+                curStart = selections[selections.length-1].anchor;
+              }
+              cm.setSelection(curStart, curEnd);
               CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual'});
             } else {
               exitVisualMode(cm);
@@ -2097,7 +2109,7 @@
               CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: "linewise"});
             } else if (actionArgs.blockwise) {
               vim.visualBlock = true;
-              // write code for block selection;
+              selectBlock(cm, curEnd);
               CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'blockwise'});
             } else {
               exitVisualMode(cm);
@@ -2464,7 +2476,8 @@
       var selections = [], ranges = cm.listSelections();
       var firstRange = ranges[0].anchor, lastRange = ranges[ranges.length-1].anchor;
       var start, end;
-      var primIndex = getIndex(ranges, cm.getCursor('head'));
+      var curEnd = cm.getCursor('head');
+      var primIndex = getIndex(ranges, curEnd);
       // sets to true when selectionEnd already lies inside the existing selections
       var contains = getIndex(ranges, selectionEnd) < 0 ? false : true;
       selectionEnd = cm.clipPos(selectionEnd);
@@ -2501,6 +2514,15 @@
       while (start <= end) {
         var anchor = {line: start, ch: (near > 0) ? firstRange.ch : lastRange.ch};
         var head = {line: start, ch: selectionEnd.ch};
+        // Shift the anchor right or left
+        // as each selection crosses itself.
+        if ((anchor.ch < curEnd.ch) && ((head.ch == anchor.ch) || (anchor.ch - head.ch == 1))) {
+          anchor.ch++;
+          head.ch--;
+        } else if ((anchor.ch > curEnd.ch) && ((head.ch == anchor.ch) || (anchor.ch - head.ch == -1))) {
+          anchor.ch--;
+          head.ch++;
+        }
         var range = {anchor: anchor, head: head};
         selections.push(range);
         if (cursorEqual(head, selectionEnd)) {
diff --git a/test/vim_test.js b/test/vim_test.js
index e437e8fe57..ff5c7c56c9 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1586,6 +1586,36 @@ testVim('visual_block', function(cm, vim, helpers) {
   cm.setCursor(3, 4);
   helpers.doKeys('<C-v>', 'l', 'k', 'k', 'd');
   eq('hello world\n{\nt is\nsta!', cm.getValue());
+  cm.replaceRange('12345\n67891\nabcde', {line: 0, ch: 0}, {line: cm.lastLine(), ch: 6});
+  cm.setCursor(1, 2);
+  helpers.doKeys('<C-v>', '2', 'l', 'k');
+  // circle around the anchor
+  // and check the selections
+  var selections = cm.getSelections();
+  eq('345891', selections.join(''));
+  helpers.doKeys('4', 'h');
+  selections = cm.getSelections();
+  eq('123678', selections.join(''));
+  helpers.doKeys('j', 'j');
+  selections = cm.getSelections();
+  eq('678abc', selections.join(''));
+  helpers.doKeys('4', 'l');
+  selections = cm.getSelections();
+  eq('891cde', selections.join(''));
+  // switch between visual modes
+  cm.setCursor(1, 1);
+  // blockwise to characterwise visual
+  helpers.doKeys('<C-v>', '<C-v>', 'j', 'l', 'v');
+  selections = cm.getSelections();
+  eq('7891\nabc', selections.join(''));
+  // characterwise to blockwise
+  helpers.doKeys('<C-v>');
+  selections = cm.getSelections();
+  eq('78bc', selections.join(''));
+  // blockwise to linewise visual
+  helpers.doKeys('V');
+  selections = cm.getSelections();
+  eq('67891\nabcde', selections.join(''));
 }, {value: '1234\n5678\nabcdefg'});
 testVim('visual_marks', function(cm, vim, helpers) {
   helpers.doKeys('l', 'v', 'l', 'l', 'j', 'j', 'v');

From 4cc9d2a1f6427585ed847be83ff4d345716f417f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 27 Jun 2014 09:25:35 +0200
Subject: [PATCH 1412/4742] Add note about JSHint/Lint to CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8938f62046..3624a39e2b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -70,3 +70,7 @@ should be asked on the
 - Note that the linter (`bin/lint`) which is run after each commit
   complains about unused variables and functions. Prefix their names
   with an underscore to muffle it.
+
+- CodeMirror does *not* follow JSHint or JSLint prescribed style.
+  Patches that try to 'fix' code to pass one of these linters will be
+  unceremoniously discarded.

From 2a8480e7eff68295059aba3e6a2e4c88e8b34f89 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Thu, 26 Jun 2014 02:04:27 +0530
Subject: [PATCH 1413/4742] [vim] visual block yank

Also updated select block to return selectionStart.
Operators from now on will stop using curStart and curEnd, and rely on the current selection instead. The selection will be generated in evalInput if needed.
---
 keymap/vim.js    | 21 ++++++++++++++-------
 test/vim_test.js |  6 ++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fb79140bed..2c0c52de85 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1388,7 +1388,9 @@
                 selectionStart.ch = lineLength(cm, selectionStart.line);
               }
             } else if (vim.visualBlock) {
-              selectBlock(cm, selectionEnd);
+              // Select a block and
+              // return the diagonally opposite end.
+              selectionStart = selectBlock(cm, selectionEnd);
             }
             if (!vim.visualBlock) {
               cm.setSelection(selectionStart, selectionEnd);
@@ -1453,6 +1455,9 @@
           operatorArgs.registerName = registerName;
           // Keep track of linewise as it affects how paste and change behave.
           operatorArgs.linewise = linewise;
+          if (!vim.visualBlock) {
+            cm.extendSelection(curStart, curEnd);
+          }
           operators[operator](cm, operatorArgs, vim, curStart,
               curEnd, curOriginal);
           if (vim.visualMode) {
@@ -1904,10 +1909,11 @@
           cm.setCursor(curOriginal);
         }
       },
-      yank: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
+      yank: function(cm, operatorArgs, _vim, _curStart, _curEnd, curOriginal) {
+        var text = cm.getSelection();
         vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'yank',
-            cm.getRange(curStart, curEnd), operatorArgs.linewise);
+            text, operatorArgs.linewise);
         cm.setCursor(curOriginal);
       }
     };
@@ -2038,6 +2044,7 @@
         var repeat = actionArgs.repeat;
         var curStart = cm.getCursor();
         var curEnd;
+        var selections = cm.listSelections();
         // TODO: The repeat should actually select number of characters/lines
         //     equal to the repeat times the size of the previous visual
         //     operation.
@@ -2079,14 +2086,12 @@
             if (actionArgs.linewise) {
               // Shift-V pressed in blockwise visual mode
               vim.visualLine = true;
-              var selections = cm.listSelections();
               curStart = Pos(selections[0].anchor.line, 0);
               curEnd = Pos(selections[selections.length-1].anchor.line, lineLength(cm, selections[selections.length-1].anchor.line));
               cm.setSelection(curStart, curEnd);
               CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'linewise'});
             } else if (!actionArgs.blockwise) {
               // v pressed in blockwise mode, Switch to characterwise
-              var selections = cm.listSelections();
               if (curEnd != selections[0].head) {
                 curStart = selections[0].anchor;
               } else {
@@ -2475,7 +2480,7 @@
     function selectBlock(cm, selectionEnd) {
       var selections = [], ranges = cm.listSelections();
       var firstRange = ranges[0].anchor, lastRange = ranges[ranges.length-1].anchor;
-      var start, end;
+      var start, end, selectionStart;
       var curEnd = cm.getCursor('head');
       var primIndex = getIndex(ranges, curEnd);
       // sets to true when selectionEnd already lies inside the existing selections
@@ -2511,8 +2516,9 @@
         start = end;
         end = tmp;
       }
+      selectionStart = (near > 0) ? firstRange : lastRange;
       while (start <= end) {
-        var anchor = {line: start, ch: (near > 0) ? firstRange.ch : lastRange.ch};
+        var anchor = {line: start, ch: selectionStart.ch};
         var head = {line: start, ch: selectionEnd.ch};
         // Shift the anchor right or left
         // as each selection crosses itself.
@@ -2531,6 +2537,7 @@
         start++;
       }
       cm.setSelections(selections, primIndex);
+      return selectionStart;
     }
     function getIndex(ranges, head) {
       for (var i = 0; i < ranges.length; i++) {
diff --git a/test/vim_test.js b/test/vim_test.js
index ff5c7c56c9..250898942a 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2056,6 +2056,12 @@ testVim('yank_register', function(cm, vim, helpers) {
     is(/b\s+bar/.test(text));
   });
   helpers.doKeys(':');
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>', 'l', 'j', '"', 'a', 'y');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+oo\nar/.test(text));
+  });
+  helpers.doKeys(':');
 }, { value: 'foo\nbar'});
 testVim('yank_append_line_to_line_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);

From 44592dacc9992e7886486212f5919166204153c4 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Fri, 27 Jun 2014 09:33:13 -0700
Subject: [PATCH 1414/4742] [vim] Separate yank and yank visual block tests

---
 test/vim_test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/vim_test.js b/test/vim_test.js
index 250898942a..391d381979 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2056,6 +2056,8 @@ testVim('yank_register', function(cm, vim, helpers) {
     is(/b\s+bar/.test(text));
   });
   helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('yank_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', 'l', 'j', '"', 'a', 'y');
   cm.openNotification = helpers.fakeOpenNotification(function(text) {

From 6654b706656e5355f80a3842640047ae9866c73a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 27 Jun 2014 21:59:04 +0200
Subject: [PATCH 1415/4742] [smartymixed mode] Fix regexp escaping

Issue #2659
---
 mode/smartymixed/smartymixed.js | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
index 31cfd2bdae..3290d17d80 100644
--- a/mode/smartymixed/smartymixed.js
+++ b/mode/smartymixed/smartymixed.js
@@ -9,6 +9,9 @@
 * @date 05.07.2013
 */
 
+// Warning: Don't base other modes on this one. This here is a
+// terrible way to write a mixed mode.
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../smarty/smarty"));
@@ -20,11 +23,10 @@
 "use strict";
 
 CodeMirror.defineMode("smartymixed", function(config) {
-  var settings, regs, helpers, parsers,
-  htmlMixedMode = CodeMirror.getMode(config, "htmlmixed"),
-  smartyMode = CodeMirror.getMode(config, "smarty"),
+  var htmlMixedMode = CodeMirror.getMode(config, "htmlmixed");
+  var smartyMode = CodeMirror.getMode(config, "smarty");
 
-  settings = {
+  var settings = {
     rightDelimiter: '}',
     leftDelimiter: '{'
   };
@@ -36,15 +38,18 @@ CodeMirror.defineMode("smartymixed", function(config) {
     settings.rightDelimiter = config.rightDelimiter;
   }
 
-  regs = {
-    smartyComment: new RegExp("^" + settings.leftDelimiter + "\\*"),
-    literalOpen: new RegExp(settings.leftDelimiter + "literal" + settings.rightDelimiter),
-    literalClose: new RegExp(settings.leftDelimiter + "\/literal" + settings.rightDelimiter),
-    hasLeftDelimeter: new RegExp(".*" + settings.leftDelimiter),
-    htmlHasLeftDelimeter: new RegExp("[^<>]*" + settings.leftDelimiter)
+  function reEsc(str) { return str.replace(/[^\s\w]/g, "\\$&"); }
+
+  var reLeft = reEsc(settings.leftDelimiter), reRight = reEsc(settings.rightDelimiter);
+  var regs = {
+    smartyComment: new RegExp("^" + reRight + "\\*"),
+    literalOpen: new RegExp(reLeft + "literal" + reRight),
+    literalClose: new RegExp(reLeft + "\/literal" + reRight),
+    hasLeftDelimeter: new RegExp(".*" + reLeft),
+    htmlHasLeftDelimeter: new RegExp("[^<>]*" + reLeft)
   };
 
-  helpers = {
+  var helpers = {
     chain: function(stream, state, parser) {
       state.tokenize = parser;
       return parser(stream, state);
@@ -70,7 +75,7 @@ CodeMirror.defineMode("smartymixed", function(config) {
     }
   };
 
-  parsers = {
+  var parsers = {
     html: function(stream, state) {
       if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && state.htmlMixedState.htmlState.tagName === null) {
         state.tokenize = parsers.smarty;

From b4a619855c92c15cd1b0138bd95c8d87a5a02077 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 27 Jun 2014 22:08:07 +0200
Subject: [PATCH 1416/4742] Move update of delayedCallbackDepth to start of
 endOperation

To make it less likely that an error will corrupt its value and
break all further signalLater events.

Issue #2626
---
 lib/codemirror.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 390cb37866..1aee422b42 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1935,6 +1935,11 @@
   function endOperation(cm) {
     var op = cm.curOp, doc = cm.doc, display = cm.display;
     cm.curOp = null;
+    var delayed;
+    if (!--delayedCallbackDepth) {
+      delayed = delayedCallbacks;
+      delayedCallbacks = null;
+    }
 
     if (op.updateMaxLine) findMaxLine(cm);
 
@@ -1984,11 +1989,6 @@
     if (unhidden) for (var i = 0; i < unhidden.length; ++i)
       if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
 
-    var delayed;
-    if (!--delayedCallbackDepth) {
-      delayed = delayedCallbacks;
-      delayedCallbacks = null;
-    }
     // Fire change events, and delayed event handlers
     if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);

From 73aaf3f0ef0496a03d49921049a3822a0c8614be Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 27 Jun 2014 22:49:02 +0200
Subject: [PATCH 1417/4742] [show-hint addon] Fix offset computation when
 moving list above cursor

Issue #2663
---
 addon/hint/show-hint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index f43ca00c03..27b770bdef 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -228,9 +228,9 @@
     (completion.options.container || document.body).appendChild(hints);
     var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
     if (overlapY > 0) {
-      var height = box.bottom - box.top, curTop = box.top - (pos.bottom - pos.top);
+      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
       if (curTop - height > 0) { // Fits above cursor
-        hints.style.top = (top = curTop - height) + "px";
+        hints.style.top = (top = pos.top - height) + "px";
         below = false;
       } else if (height > winH) {
         hints.style.height = (winH - 5) + "px";

From bc9c42b4af78a345dc73edd425f3718dbb37f142 Mon Sep 17 00:00:00 2001
From: Leonya Khachaturov <leonidkhachaturov@gmail.com>
Date: Fri, 27 Jun 2014 18:05:19 +0200
Subject: [PATCH 1418/4742] [css mode] Fix nonStandardPropertyKeywords
 definition for consistency

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 2678c57d59..2695d08150 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -461,13 +461,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "glyph-orientation-vertical", "text-anchor", "writing-mode"
   ], propertyKeywords = keySet(propertyKeywords_);
 
-  var nonStandardPropertyKeywords = [
+  var nonStandardPropertyKeywords_ = [
     "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
     "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
     "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
     "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
     "searchfield-results-decoration", "zoom"
-  ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords);
+  ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
 
   var colorKeywords_ = [
     "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
@@ -589,7 +589,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   ], fontProperties = keySet(fontProperties_);
 
   var allWords = mediaTypes_.concat(mediaFeatures_).concat(propertyKeywords_)
-    .concat(nonStandardPropertyKeywords).concat(colorKeywords_).concat(valueKeywords_);
+    .concat(nonStandardPropertyKeywords_).concat(colorKeywords_).concat(valueKeywords_);
   CodeMirror.registerHelper("hintWords", "css", allWords);
 
   function tokenCComment(stream, state) {

From 0320b3fb609f46c6703d70a64ebe63d68dd13780 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 28 Jun 2014 19:03:34 +0200
Subject: [PATCH 1419/4742] [real-world uses] Add CodeWorld

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

diff --git a/doc/realworld.html b/doc/realworld.html
index e495cfbba6..d730e411b2 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -37,6 +37,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
+      <li><a href="http://codeworld.info/">CodeWorld</a> (Haskell playground)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
       <li><a href="http://www.crossui.com/">CrossUI</a> (cross-platform UI builder)</li>
       <li><a href="http://rsnous.com/cruncher/">Cruncher</a> (notepad with calculation features)</li>

From cfc0801a22e2ea657a37612c6054d3143b022224 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Sat, 28 Jun 2014 06:14:12 +0530
Subject: [PATCH 1420/4742] [vim] swap case in visual block

---
 keymap/vim.js    | 37 +++++++++++++++++++++++++++----------
 test/vim_test.js | 13 ++++++++++++-
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 2c0c52de85..3cd6f05fdc 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1415,6 +1415,7 @@
             curStart = selectionStart;
             curEnd = selectionEnd;
             motionArgs.inclusive = true;
+            operatorArgs.shouldMoveCursor = false;
           }
           // Swap start and end if motion was backward.
           if (curEnd && cursorIsBefore(curEnd, curStart)) {
@@ -1896,17 +1897,33 @@
         cm.setCursor(curStart);
         cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
       },
-      swapcase: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
-        var toSwap = cm.getRange(curStart, curEnd);
-        var swapped = '';
-        for (var i = 0; i < toSwap.length; i++) {
-          var character = toSwap.charAt(i);
-          swapped += isUpperCase(character) ? character.toLowerCase() :
-              character.toUpperCase();
-        }
-        cm.replaceRange(swapped, curStart, curEnd);
+      swapcase: function(cm, operatorArgs, _vim, _curStart, _curEnd, _curOriginal) {
+        var selections = cm.getSelections();
+        var ranges = cm.listSelections();
+        var curStart  = ranges[0].anchor;
+        var curEnd = ranges[0].head;
+        // extendSelection swaps curStart and
+        // curEnd, so make sure
+        // curStart < curEnd
+        if (cursorIsBefore(curEnd, curStart)) {
+          var cur = curStart;
+          curStart = curEnd;
+          curEnd = cur;
+        }
+        var swapped = [];
+        for (var j = 0; j < selections.length; j++) {
+          var toSwap = selections[j];
+          var text = '';
+          for (var i = 0; i < toSwap.length; i++) {
+            var character = toSwap.charAt(i);
+            text += isUpperCase(character) ? character.toLowerCase() :
+                character.toUpperCase();
+          }
+          swapped.push(text);
+        }
+        cm.replaceSelections(swapped);
         if (!operatorArgs.shouldMoveCursor) {
-          cm.setCursor(curOriginal);
+          cm.setCursor(curStart);
         }
       },
       yank: function(cm, operatorArgs, _vim, _curStart, _curEnd, curOriginal) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 391d381979..e68c3e3c7a 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -918,8 +918,19 @@ testVim('g~g~', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqPos({line: curStart.line, ch:0}, cm.getCursor());
 }, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
+testVim('visual_block_~', function(cm, vim, helpers) {
+  cm.setCursor(1, 1);
+  helpers.doKeys('<C-v>', 'l', 'l', 'j', '~');
+  helpers.assertCursorAt(1, 1);
+  eq('hello\nwoRLd\naBCDe', cm.getValue());
+  cm.setCursor(2, 0);
+  helpers.doKeys('v', 'l', 'l', '~');
+  helpers.assertCursorAt(2, 0);
+  eq('hello\nwoRLd\nAbcDe', cm.getValue());
+},{value: 'hello\nwOrld\nabcde' });
+
 testVim('>{motion}', function(cm, vim, helpers) {
   cm.setCursor(1, 3);
   var expectedLineCount = cm.lineCount();

From 6aadaaeb87d7b3a44ed31ca35b69fb189bb3b719 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 29 Jun 2014 11:55:43 -0700
Subject: [PATCH 1421/4742] [vim] Simplify swapcase logic

---
 keymap/vim.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 3cd6f05fdc..e1a76de6bf 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1900,16 +1900,6 @@
       swapcase: function(cm, operatorArgs, _vim, _curStart, _curEnd, _curOriginal) {
         var selections = cm.getSelections();
         var ranges = cm.listSelections();
-        var curStart  = ranges[0].anchor;
-        var curEnd = ranges[0].head;
-        // extendSelection swaps curStart and
-        // curEnd, so make sure
-        // curStart < curEnd
-        if (cursorIsBefore(curEnd, curStart)) {
-          var cur = curStart;
-          curStart = curEnd;
-          curEnd = cur;
-        }
         var swapped = [];
         for (var j = 0; j < selections.length; j++) {
           var toSwap = selections[j];
@@ -1922,8 +1912,12 @@
           swapped.push(text);
         }
         cm.replaceSelections(swapped);
+        var curStart  = ranges[0].anchor;
+        var curEnd = ranges[0].head;
         if (!operatorArgs.shouldMoveCursor) {
-          cm.setCursor(curStart);
+          // extendSelection swaps curStart and curEnd, so make sure
+          // curStart < curEnd
+          cm.setCursor(cursorIsBefore(curStart, curEnd) ? curStart : curEnd);
         }
       },
       yank: function(cm, operatorArgs, _vim, _curStart, _curEnd, curOriginal) {

From d08aa03ecc8a566cdc51ebf6da2a995bb8cbba5b Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Thu, 3 Jul 2014 03:55:03 +0530
Subject: [PATCH 1422/4742] visual_o updated for blockwise visual

---
 keymap/vim.js    | 33 +++++++++++++++++++--------------
 test/vim_test.js | 13 +++++++++++--
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index e1a76de6bf..6ff5edce4c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -225,7 +225,8 @@
     { keys: ['|'], type: 'motion',
         motion: 'moveToColumn',
         motionArgs: { }},
-    { keys: ['o'], type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: { },context:'visual'},
+    { keys: ['o'], type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: { }, context:'visual'},
+    { keys: ['O'], type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
     // Operators
     { keys: ['d'], type: 'operator', operator: 'delete' },
     { keys: ['y'], type: 'operator', operator: 'yank' },
@@ -1363,10 +1364,10 @@
               selectionStart.ch -= 1;
               offset = 1;
             }
-            // in case of visual Block
-            // selectionStart and curEnd
-            // may not be on the same line
-            if (!vim.visualBlock) {
+            // in case of visual Block selectionStart and curEnd
+            // may not be on the same line,
+            // Also, In case of v_o this should not happen.
+            if (!vim.visualBlock && !(motionResult instanceof Array)) {
               curEnd.ch += offset;
             }
             if (vim.lastHPos != Infinity) {
@@ -1521,15 +1522,19 @@
         }
         return null;
       },
-      moveToOtherHighlightedEnd: function(cm) {
-        var curEnd = copyCursor(cm.getCursor('head'));
-        var curStart = copyCursor(cm.getCursor('anchor'));
-        if (cursorIsBefore(curStart, curEnd)) {
-           curEnd.ch += 1;
-        } else if (cursorIsBefore(curEnd, curStart)) {
-           curStart.ch -= 1;
-        }
-        return ([curEnd,curStart]);
+      moveToOtherHighlightedEnd: function(cm, motionArgs, vim) {
+        var ranges = cm.listSelections();
+        var curEnd = cm.getCursor('head');
+        var curStart = ranges[0].anchor;
+        var curIndex = cursorEqual(ranges[0].head, curEnd) ? ranges.length-1 : 0;
+        if (motionArgs.sameLine && vim.visualBlock) {
+          curStart = Pos(curEnd.line, ranges[curIndex].anchor.ch);
+          curEnd = Pos(ranges[curIndex].head.line, curEnd.ch);
+        } else {
+          curStart = ranges[curIndex].anchor;
+        }
+        cm.setCursor(curEnd);
+        return ([curEnd, curStart]);
       },
       jumpToMark: function(cm, motionArgs, vim) {
         var best = cm.getCursor();
diff --git a/test/vim_test.js b/test/vim_test.js
index e68c3e3c7a..b09d730d50 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1689,18 +1689,27 @@ testVim('s_visual', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
   eq('ac', cm.getValue());
 }, { value: 'abc'});
-testVim('o_visual', function(cm,vim,helpers) {
+testVim('o_visual', function(cm, vim, helpers) {
   cm.setCursor(0,0);
   helpers.doKeys('v','l','l','l','o');
   helpers.assertCursorAt(0,0);
   helpers.doKeys('v','v','j','j','j','o');
   helpers.assertCursorAt(0,0);
-  helpers.doKeys('o');
+  helpers.doKeys('O');
   helpers.doKeys('l','l')
   helpers.assertCursorAt(3, 3);
   helpers.doKeys('d');
   eq('p',cm.getValue());
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
+testVim('o_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>','3','j','l','l', 'o');
+  helpers.assertCursorAt(0, 1);
+  helpers.doKeys('O');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('o');
+  helpers.assertCursorAt(3, 1);
+}, { value: 'abcd\nefgh\nijkl\nmnop'});
 testVim('uppercase/lowercase_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('v', 'l', 'l');

From c6eb304f390f3d32c81c0f8107ce2e1e3ae9a61b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 4 Jul 2014 11:29:53 +0200
Subject: [PATCH 1423/4742] [closebrackets addon] Add more refined heuristics
 for when to close quote characters

Looks at token types to determine whether the quote would actually open a string

Issue #2657
---
 addon/edit/closebrackets.js | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 83d4229f47..1a04f3664e 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -36,6 +36,22 @@
     return str.length == 2 ? str : null;
   }
 
+  // Project the token type that will exists after the given char is
+  // typed, and use it to determine whether it would cause the start
+  // of a string token.
+  function enteringString(cm, pos, ch) {
+    var line = cm.getLine(pos.line);
+    var token = cm.getTokenAt(pos);
+    if (/\bstring2?\b/.test(token.type)) return false;
+    var stream = new CodeMirror.StringStream(line.slice(0, pos.ch) + ch + line.slice(pos.ch), 4);
+    stream.pos = stream.start = token.start;
+    for (;;) {
+      var type1 = cm.getMode().token(stream, token.state);
+      if (stream.pos >= pos.ch + 1) return /\bstring2?\b/.test(type1);
+      stream.start = stream.pos;
+    }
+  }
+
   function buildKeymap(pairs) {
     var map = {
       name : "autoCloseBrackets",
@@ -61,8 +77,6 @@
         var ranges = cm.listSelections(), type, next;
         for (var i = 0; i < ranges.length; i++) {
           var range = ranges[i], cur = range.head, curType;
-          if (left == "'" && cm.getTokenTypeAt(cur) == "comment")
-            return CodeMirror.Pass;
           var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
           if (!range.empty())
             curType = "surround";
@@ -75,9 +89,10 @@
                      cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
                      (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left))
             curType = "addFour";
-          else if (left == right && CodeMirror.isWordChar(next))
-            return CodeMirror.Pass;
-          else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next))
+          else if (left == '"' || left == "'") {
+            if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, left)) curType = "both";
+            else return CodeMirror.Pass;
+          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next))
             curType = "both";
           else
             return CodeMirror.Pass;

From afc1e5c790ffe79ee1afa96b68208c956370c096 Mon Sep 17 00:00:00 2001
From: Alexander Shvets <neochief@shvetsgroup.com>
Date: Thu, 3 Jul 2014 16:10:24 +0300
Subject: [PATCH 1424/4742] [searchcursor addon] Fix reverse case-insensitive
 searching for multiline strings

---
 addon/search/searchcursor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 2783308858..55c108b5a3 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -107,7 +107,7 @@
             var from = Pos(pos.line, cut);
             for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
               if (target[i] != fold(doc.getLine(ln))) return;
-            if (doc.getLine(ln).slice(0, origTarget[last].length) != target[last]) return;
+            if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
             return {from: from, to: Pos(ln, origTarget[last].length)};
           }
         };

From 9826cafc3955412a5270169c7b381fe985c1aff5 Mon Sep 17 00:00:00 2001
From: nilp0inter <robertomartinezp@gmail.com>
Date: Thu, 3 Jul 2014 22:35:41 +0200
Subject: [PATCH 1425/4742] [mode/meta.js] Map application/javascript to
 javascript mode

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

diff --git a/mode/meta.js b/mode/meta.js
index 281028d7ab..4e42cb32df 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -49,6 +49,7 @@ CodeMirror.modeInfo = [
   {name: 'HTTP', mime: 'message/http', mode: 'http'},
   {name: 'Jade', mime: 'text/x-jade', mode: 'jade'},
   {name: 'JavaScript', mime: 'text/javascript', mode: 'javascript'},
+  {name: 'JavaScript', mime: 'application/javascript', mode: 'javascript'},
   {name: 'JSON', mime: 'application/x-json', mode: 'javascript'},
   {name: 'JSON', mime: 'application/json', mode: 'javascript'},
   {name: 'JSON-LD', mime: 'application/ld+json', mode: 'javascript'},

From fc3bb8f34b141f39073f038398c5bd0ded932e49 Mon Sep 17 00:00:00 2001
From: Leonid Khachaturov <leonidkhachaturov@gmail.com>
Date: Fri, 4 Jul 2014 10:23:15 +0200
Subject: [PATCH 1426/4742] Kotlin mode

---
 mode/kotlin/index.html |  88 +++++++++++++
 mode/kotlin/kotlin.js  | 280 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 368 insertions(+)
 create mode 100644 mode/kotlin/index.html
 create mode 100644 mode/kotlin/kotlin.js

diff --git a/mode/kotlin/index.html b/mode/kotlin/index.html
new file mode 100644
index 0000000000..24fb46706f
--- /dev/null
+++ b/mode/kotlin/index.html
@@ -0,0 +1,88 @@
+<!doctype html>
+
+<title>CodeMirror: Kotlin 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="kotlin.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Kotlin</a>
+  </ul>
+</div>
+
+<article>
+<h2>Kotlin mode</h2>
+
+
+<div><textarea id="code" name="code">
+package org.wasabi.http
+
+import java.util.concurrent.Executors
+import java.net.InetSocketAddress
+import org.wasabi.app.AppConfiguration
+import io.netty.bootstrap.ServerBootstrap
+import io.netty.channel.nio.NioEventLoopGroup
+import io.netty.channel.socket.nio.NioServerSocketChannel
+import org.wasabi.app.AppServer
+
+public class HttpServer(private val appServer: AppServer) {
+
+    val bootstrap: ServerBootstrap
+    val primaryGroup: NioEventLoopGroup
+    val workerGroup:  NioEventLoopGroup
+
+    {
+        // Define worker groups
+        primaryGroup = NioEventLoopGroup()
+        workerGroup = NioEventLoopGroup()
+
+        // Initialize bootstrap of server
+        bootstrap = ServerBootstrap()
+
+        bootstrap.group(primaryGroup, workerGroup)
+        bootstrap.channel(javaClass<NioServerSocketChannel>())
+        bootstrap.childHandler(NettyPipelineInitializer(appServer))
+    }
+
+    public fun start(wait: Boolean = true) {
+        val channel = bootstrap.bind(appServer.configuration.port)?.sync()?.channel()
+
+        if (wait) {
+            channel?.closeFuture()?.sync()
+        }
+    }
+
+    public fun stop() {
+        // Shutdown all event loops
+        primaryGroup.shutdownGracefully()
+        workerGroup.shutdownGracefully()
+
+        // Wait till all threads are terminated
+        primaryGroup.terminationFuture().sync()
+        workerGroup.terminationFuture().sync()
+    }
+}
+</textarea></div>
+
+    <script>
+        var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+            mode: {name: "kotlin"},
+            lineNumbers: true
+        });
+    </script>
+    <h3>Mode for Kotlin (http://kotlin.jetbrains.org/)</h3>
+    <p>Developed by Hadi Hariri (https://github.com/hhariri).</p>
+    <p><strong>MIME type defined:</strong> <code>text/x-kotlin</code>.</p>
+</article>
diff --git a/mode/kotlin/kotlin.js b/mode/kotlin/kotlin.js
new file mode 100644
index 0000000000..73c84f6c4f
--- /dev/null
+++ b/mode/kotlin/kotlin.js
@@ -0,0 +1,280 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("kotlin", function (config, parserConfig) {
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  var multiLineStrings = parserConfig.multiLineStrings;
+
+  var keywords = words(
+          "package continue return object while break class data trait throw super" +
+          " when type this else This try val var fun for is in if do as true false null get set");
+  var softKeywords = words("import" +
+      " where by get set abstract enum open annotation override private public internal" +
+      " protected catch out vararg inline finally final ref");
+  var blockKeywords = words("catch class do else finally for if where try while enum");
+  var atoms = words("null true false this");
+
+  var curPunc;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (ch == '"' || ch == "'") {
+      return startString(ch, stream, state);
+    }
+    // Wildcard import w/o trailing semicolon (import smth.*)
+    if (ch == "." && stream.eat("*")) {
+      return "word";
+    }
+    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
+    if (/\d/.test(ch)) {
+      if (stream.eat(/eE/)) {
+        stream.eat(/\+\-/);
+        stream.eatWhile(/\d/);
+      }
+      return "number";
+    }
+    if (ch == "/") {
+      if (stream.eat("*")) {
+        state.tokenize.push(tokenComment);
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+      if (expectExpression(state.lastToken)) {
+        return startString(ch, stream, state);
+      }
+    }
+    // Commented
+    if (ch == "-" && stream.eat(">")) {
+      curPunc = "->";
+      return null;
+    }
+    if (/[\-+*&%=<>!?|\/~]/.test(ch)) {
+      stream.eatWhile(/[\-+*&%=<>|~]/);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_]/);
+
+    var cur = stream.current();
+    if (atoms.propertyIsEnumerable(cur)) {
+      return "atom";
+    }
+    if (softKeywords.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "softKeyword";
+    }
+
+    if (keywords.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "keyword";
+    }
+    return "word";
+  }
+
+  tokenBase.isBase = true;
+
+  function startString(quote, stream, state) {
+    var tripleQuoted = false;
+    if (quote != "/" && stream.eat(quote)) {
+      if (stream.eat(quote)) tripleQuoted = true;
+      else return "string";
+    }
+    function t(stream, state) {
+      var escaped = false, next, end = !tripleQuoted;
+
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {
+          if (!tripleQuoted) {
+            break;
+          }
+          if (stream.match(quote + quote)) {
+            end = true;
+            break;
+          }
+        }
+
+        if (quote == '"' && next == "$" && !escaped && stream.eat("{")) {
+          state.tokenize.push(tokenBaseUntilBrace());
+          return "string";
+        }
+
+        if (next == "$" && !escaped && !stream.eat(" ")) {
+          state.tokenize.push(tokenBaseUntilSpace());
+          return "string";
+        }
+        escaped = !escaped && next == "\\";
+      }
+      if (multiLineStrings)
+        state.tokenize.push(t);
+      if (end) state.tokenize.pop();
+      return "string";
+    }
+
+    state.tokenize.push(t);
+    return t(stream, state);
+  }
+
+  function tokenBaseUntilBrace() {
+    var depth = 1;
+
+    function t(stream, state) {
+      if (stream.peek() == "}") {
+        depth--;
+        if (depth == 0) {
+          state.tokenize.pop();
+          return state.tokenize[state.tokenize.length - 1](stream, state);
+        }
+      } else if (stream.peek() == "{") {
+        depth++;
+      }
+      return tokenBase(stream, state);
+    }
+
+    t.isBase = true;
+    return t;
+  }
+
+  function tokenBaseUntilSpace() {
+    function t(stream, state) {
+      if (stream.eat(/[\w]/)) {
+        var isWord = stream.eatWhile(/[\w]/);
+        if (isWord) {
+          state.tokenize.pop();
+          return "word";
+        }
+      }
+      state.tokenize.pop();
+      return "string";
+    }
+
+    t.isBase = true;
+    return t;
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize.pop();
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function expectExpression(last) {
+    return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) ||
+        last == "newstatement" || last == "keyword" || last == "proplabel";
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+
+  function popContext(state) {
+    var t = state.context.type;
+    if (t == ")" || t == "]" || t == "}")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+
+  return {
+    startState: function (basecolumn) {
+      return {
+        tokenize: [tokenBase],
+        context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true,
+        lastToken: null
+      };
+    },
+
+    token: function (stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+        // Automatic semicolon insertion
+        if (ctx.type == "statement" && !expectExpression(state.lastToken)) {
+          popContext(state);
+          ctx = state.context;
+        }
+      }
+      if (stream.eatSpace()) return null;
+      curPunc = null;
+      var style = state.tokenize[state.tokenize.length - 1](stream, state);
+      if (style == "comment") return style;
+      if (ctx.align == null) ctx.align = true;
+      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
+      // Handle indentation for {x -> \n ... }
+      else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") {
+        popContext(state);
+        state.context.align = false;
+      }
+      else if (curPunc == "{") pushContext(state, stream.column(), "}");
+      else if (curPunc == "[") pushContext(state, stream.column(), "]");
+      else if (curPunc == "(") pushContext(state, stream.column(), ")");
+      else if (curPunc == "}") {
+        while (ctx.type == "statement") ctx = popContext(state);
+        if (ctx.type == "}") ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
+      }
+      else if (curPunc == ctx.type) popContext(state);
+      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
+        pushContext(state, stream.column(), "statement");
+      state.startOfLine = false;
+      state.lastToken = curPunc || style;
+      return style;
+    },
+
+    indent: function (state, textAfter) {
+      if (!state.tokenize[state.tokenize.length - 1].isBase) return 0;
+      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
+      if (ctx.type == "statement" && !expectExpression(state.lastToken)) ctx = ctx.prev;
+      var closing = firstChar == ctx.type;
+      if (ctx.type == "statement") {
+        return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit);
+      }
+      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : config.indentUnit);
+    },
+
+    electricChars: "{}"
+  };
+});
+
+CodeMirror.defineMIME("text/x-kotlin", "kotlin");
+
+});

From 4928d37fb9650ce76e1dcba8ad593f1a579b1f70 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 4 Jul 2014 11:54:03 +0200
Subject: [PATCH 1427/4742] [kotlin mode] Integrate

Issue #2678
---
 doc/compress.html      |   1 +
 mode/index.html        |   1 +
 mode/kotlin/index.html |   3 +-
 mode/meta.js           | 193 +++++++++++++++++++++--------------------
 4 files changed, 101 insertions(+), 97 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 5762aa442b..ede45e1c6e 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -123,6 +123,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
           <option value="http://codemirror.net/mode/julia/julia.js">julia.js</option>
+          <option value="http://codemirror.net/mode/kotlin/kotlin.js">kotlin.js</option>
           <option value="http://codemirror.net/mode/livescript/livescript.js">livescript.js</option>
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
diff --git a/mode/index.html b/mode/index.html
index 91fb92bff8..1aa0b8d821 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -65,6 +65,7 @@ <h2>Language modes</h2>
       <li><a href="javascript/index.html">JavaScript</a></li>
       <li><a href="jinja2/index.html">Jinja2</a></li>
       <li><a href="julia/index.html">Julia</a></li>
+      <li><a href="kotlin/index.html">Kotlin</a></li>
       <li><a href="css/less.html">LESS</a></li>
       <li><a href="livescript/index.html">LiveScript</a></li>
       <li><a href="lua/index.html">Lua</a></li>
diff --git a/mode/kotlin/index.html b/mode/kotlin/index.html
index 24fb46706f..38700f3226 100644
--- a/mode/kotlin/index.html
+++ b/mode/kotlin/index.html
@@ -79,7 +79,8 @@ <h2>Kotlin mode</h2>
     <script>
         var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
             mode: {name: "kotlin"},
-            lineNumbers: true
+            lineNumbers: true,
+            indentUnit: 4
         });
     </script>
     <h3>Mode for Kotlin (http://kotlin.jetbrains.org/)</h3>
diff --git a/mode/meta.js b/mode/meta.js
index 4e42cb32df..3627cd7470 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -12,102 +12,103 @@
   "use strict";
 
 CodeMirror.modeInfo = [
-  {name: 'APL', mime: 'text/apl', mode: 'apl'},
-  {name: 'Asterisk', mime: 'text/x-asterisk', mode: 'asterisk'},
-  {name: 'C', mime: 'text/x-csrc', mode: 'clike'},
-  {name: 'C++', mime: 'text/x-c++src', mode: 'clike'},
-  {name: 'Cobol', mime: 'text/x-cobol', mode: 'cobol'},
-  {name: 'Java', mime: 'text/x-java', mode: 'clike'},
-  {name: 'C#', mime: 'text/x-csharp', mode: 'clike'},
-  {name: 'Scala', mime: 'text/x-scala', mode: 'clike'},
-  {name: 'Clojure', mime: 'text/x-clojure', mode: 'clojure'},
-  {name: 'CoffeeScript', mime: 'text/x-coffeescript', mode: 'coffeescript'},
-  {name: 'Common Lisp', mime: 'text/x-common-lisp', mode: 'commonlisp'},
-  {name: 'Cypher', mime: 'application/x-cypher-query', mode: 'cypher'},
-  {name: 'CSS', mime: 'text/css', mode: 'css'},
-  {name: 'D', mime: 'text/x-d', mode: 'd'},
-  {name: 'diff', mime: 'text/x-diff', mode: 'diff'},
-  {name: 'DTD', mime: 'application/xml-dtd', mode: 'dtd'},
-  {name: 'Dylan', mime: 'text/x-dylan', mode: 'dylan'},
-  {name: 'ECL', mime: 'text/x-ecl', mode: 'ecl'},
-  {name: 'Eiffel', mime: 'text/x-eiffel', mode: 'eiffel'},
-  {name: 'Erlang', mime: 'text/x-erlang', mode: 'erlang'},
-  {name: 'Fortran', mime: 'text/x-fortran', mode: 'fortran'},
-  {name: 'F#', mime: 'text/x-fsharp', mode: 'mllike'},
-  {name: 'Gas', mime: 'text/x-gas', mode: 'gas'},
-  {name: 'Gherkin', mime: 'text/x-feature', mode: 'gherkin'},
-  {name: 'GitHub Flavored Markdown', mime: 'text/x-gfm', mode: 'gfm'},
-  {name: 'Go', mime: 'text/x-go', mode: 'go'},
-  {name: 'Groovy', mime: 'text/x-groovy', mode: 'groovy'},
-  {name: 'HAML', mime: 'text/x-haml', mode: 'haml'},
-  {name: 'Haskell', mime: 'text/x-haskell', mode: 'haskell'},
-  {name: 'Haxe', mime: 'text/x-haxe', mode: 'haxe'},
-  {name: 'ASP.NET', mime: 'application/x-aspx', mode: 'htmlembedded'},
-  {name: 'Embedded Javascript', mime: 'application/x-ejs', mode: 'htmlembedded'},
-  {name: 'JavaServer Pages', mime: 'application/x-jsp', mode: 'htmlembedded'},
-  {name: 'HTML', mime: 'text/html', mode: 'htmlmixed'},
-  {name: 'HTTP', mime: 'message/http', mode: 'http'},
-  {name: 'Jade', mime: 'text/x-jade', mode: 'jade'},
-  {name: 'JavaScript', mime: 'text/javascript', mode: 'javascript'},
-  {name: 'JavaScript', mime: 'application/javascript', mode: 'javascript'},
-  {name: 'JSON', mime: 'application/x-json', mode: 'javascript'},
-  {name: 'JSON', mime: 'application/json', mode: 'javascript'},
-  {name: 'JSON-LD', mime: 'application/ld+json', mode: 'javascript'},
-  {name: 'TypeScript', mime: 'application/typescript', mode: 'javascript'},
-  {name: 'Jinja2', mime: null, mode: 'jinja2'},
-  {name: 'Julia', mime: 'text/x-julia', mode: 'julia'},
-  {name: 'LESS', mime: 'text/x-less', mode: 'css'},
-  {name: 'LiveScript', mime: 'text/x-livescript', mode: 'livescript'},
-  {name: 'Lua', mime: 'text/x-lua', mode: 'lua'},
-  {name: 'Markdown (GitHub-flavour)', mime: 'text/x-markdown', mode: 'markdown'},
-  {name: 'mIRC', mime: 'text/mirc', mode: 'mirc'},
-  {name: 'Nginx', mime: 'text/x-nginx-conf', mode: 'nginx'},
-  {name: 'NTriples', mime: 'text/n-triples', mode: 'ntriples'},
-  {name: 'OCaml', mime: 'text/x-ocaml', mode: 'mllike'},
-  {name: 'Octave', mime: 'text/x-octave', mode: 'octave'},
-  {name: 'Pascal', mime: 'text/x-pascal', mode: 'pascal'},
-  {name: 'PEG.js', mime: null, mode: 'pegjs'},
-  {name: 'Perl', mime: 'text/x-perl', mode: 'perl'},
-  {name: 'PHP', mime: 'text/x-php', mode: 'php'},
-  {name: 'PHP(HTML)', mime: 'application/x-httpd-php', mode: 'php'},
-  {name: 'Pig', mime: 'text/x-pig', mode: 'pig'},
-  {name: 'Plain Text', mime: 'text/plain', mode: 'null'},
-  {name: 'Properties files', mime: 'text/x-properties', mode: 'properties'},
-  {name: 'Python', mime: 'text/x-python', mode: 'python'},
-  {name: 'Puppet', mime: 'text/x-puppet', mode: 'puppet'},
-  {name: 'Cython', mime: 'text/x-cython', mode: 'python'},
-  {name: 'R', mime: 'text/x-rsrc', mode: 'r'},
-  {name: 'reStructuredText', mime: 'text/x-rst', mode: 'rst'},
-  {name: 'Ruby', mime: 'text/x-ruby', mode: 'ruby'},
-  {name: 'Rust', mime: 'text/x-rustsrc', mode: 'rust'},
-  {name: 'Sass', mime: 'text/x-sass', mode: 'sass'},
-  {name: 'Scheme', mime: 'text/x-scheme', mode: 'scheme'},
-  {name: 'SCSS', mime: 'text/x-scss', mode: 'css'},
-  {name: 'Shell', mime: 'text/x-sh', mode: 'shell'},
-  {name: 'Sieve', mime: 'application/sieve', mode: 'sieve'},
-  {name: 'Smalltalk', mime: 'text/x-stsrc', mode: 'smalltalk'},
-  {name: 'Smarty', mime: 'text/x-smarty', mode: 'smarty'},
-  {name: 'SmartyMixed', mime: 'text/x-smarty', mode: 'smartymixed'},
-  {name: 'Solr', mime: 'text/x-solr', mode: 'solr'},
-  {name: 'SPARQL', mime: 'application/x-sparql-query', mode: 'sparql'},
-  {name: 'SQL', mime: 'text/x-sql', mode: 'sql'},
-  {name: 'MariaDB', mime: 'text/x-mariadb', mode: 'sql'},
-  {name: 'sTeX', mime: 'text/x-stex', mode: 'stex'},
-  {name: 'LaTeX', mime: 'text/x-latex', mode: 'stex'},
-  {name: 'SystemVerilog', mime: 'text/x-systemverilog', mode: 'verilog'},
-  {name: 'Tcl', mime: 'text/x-tcl', mode: 'tcl'},
-  {name: 'TiddlyWiki ', mime: 'text/x-tiddlywiki', mode: 'tiddlywiki'},
-  {name: 'Tiki wiki', mime: 'text/tiki', mode: 'tiki'},
-  {name: 'TOML', mime: 'text/x-toml', mode: 'toml'},
-  {name: 'Turtle', mime: 'text/turtle', mode: 'turtle'},
-  {name: 'VB.NET', mime: 'text/x-vb', mode: 'vb'},
-  {name: 'VBScript', mime: 'text/vbscript', mode: 'vbscript'},
-  {name: 'Velocity', mime: 'text/velocity', mode: 'velocity'},
-  {name: 'Verilog', mime: 'text/x-verilog', mode: 'verilog'},
-  {name: 'XML', mime: 'application/xml', mode: 'xml'},
-  {name: 'XQuery', mime: 'application/xquery', mode: 'xquery'},
-  {name: 'YAML', mime: 'text/x-yaml', mode: 'yaml'},
-  {name: 'Z80', mime: 'text/x-z80', mode: 'z80'}
+  {name: "APL", mime: "text/apl", mode: "apl"},
+  {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk"},
+  {name: "C", mime: "text/x-csrc", mode: "clike"},
+  {name: "C++", mime: "text/x-c++src", mode: "clike"},
+  {name: "Cobol", mime: "text/x-cobol", mode: "cobol"},
+  {name: "Java", mime: "text/x-java", mode: "clike"},
+  {name: "C#", mime: "text/x-csharp", mode: "clike"},
+  {name: "Scala", mime: "text/x-scala", mode: "clike"},
+  {name: "Clojure", mime: "text/x-clojure", mode: "clojure"},
+  {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript"},
+  {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp"},
+  {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher"},
+  {name: "CSS", mime: "text/css", mode: "css"},
+  {name: "D", mime: "text/x-d", mode: "d"},
+  {name: "diff", mime: "text/x-diff", mode: "diff"},
+  {name: "DTD", mime: "application/xml-dtd", mode: "dtd"},
+  {name: "Dylan", mime: "text/x-dylan", mode: "dylan"},
+  {name: "ECL", mime: "text/x-ecl", mode: "ecl"},
+  {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel"},
+  {name: "Erlang", mime: "text/x-erlang", mode: "erlang"},
+  {name: "Fortran", mime: "text/x-fortran", mode: "fortran"},
+  {name: "F#", mime: "text/x-fsharp", mode: "mllike"},
+  {name: "Gas", mime: "text/x-gas", mode: "gas"},
+  {name: "Gherkin", mime: "text/x-feature", mode: "gherkin"},
+  {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm"},
+  {name: "Go", mime: "text/x-go", mode: "go"},
+  {name: "Groovy", mime: "text/x-groovy", mode: "groovy"},
+  {name: "HAML", mime: "text/x-haml", mode: "haml"},
+  {name: "Haskell", mime: "text/x-haskell", mode: "haskell"},
+  {name: "Haxe", mime: "text/x-haxe", mode: "haxe"},
+  {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded"},
+  {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded"},
+  {name: "JavaServer Pages", mime: "application/x-jsp", mode: "htmlembedded"},
+  {name: "HTML", mime: "text/html", mode: "htmlmixed"},
+  {name: "HTTP", mime: "message/http", mode: "http"},
+  {name: "Jade", mime: "text/x-jade", mode: "jade"},
+  {name: "JavaScript", mime: "text/javascript", mode: "javascript"},
+  {name: "JavaScript", mime: "application/javascript", mode: "javascript"},
+  {name: "JSON", mime: "application/x-json", mode: "javascript"},
+  {name: "JSON", mime: "application/json", mode: "javascript"},
+  {name: "JSON-LD", mime: "application/ld+json", mode: "javascript"},
+  {name: "TypeScript", mime: "application/typescript", mode: "javascript"},
+  {name: "Jinja2", mime: null, mode: "jinja2"},
+  {name: "Julia", mime: "text/x-julia", mode: "julia"},
+  {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin"},
+  {name: "LESS", mime: "text/x-less", mode: "css"},
+  {name: "LiveScript", mime: "text/x-livescript", mode: "livescript"},
+  {name: "Lua", mime: "text/x-lua", mode: "lua"},
+  {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown"},
+  {name: "mIRC", mime: "text/mirc", mode: "mirc"},
+  {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx"},
+  {name: "NTriples", mime: "text/n-triples", mode: "ntriples"},
+  {name: "OCaml", mime: "text/x-ocaml", mode: "mllike"},
+  {name: "Octave", mime: "text/x-octave", mode: "octave"},
+  {name: "Pascal", mime: "text/x-pascal", mode: "pascal"},
+  {name: "PEG.js", mime: null, mode: "pegjs"},
+  {name: "Perl", mime: "text/x-perl", mode: "perl"},
+  {name: "PHP", mime: "text/x-php", mode: "php"},
+  {name: "PHP(HTML)", mime: "application/x-httpd-php", mode: "php"},
+  {name: "Pig", mime: "text/x-pig", mode: "pig"},
+  {name: "Plain Text", mime: "text/plain", mode: "null"},
+  {name: "Properties files", mime: "text/x-properties", mode: "properties"},
+  {name: "Python", mime: "text/x-python", mode: "python"},
+  {name: "Puppet", mime: "text/x-puppet", mode: "puppet"},
+  {name: "Cython", mime: "text/x-cython", mode: "python"},
+  {name: "R", mime: "text/x-rsrc", mode: "r"},
+  {name: "reStructuredText", mime: "text/x-rst", mode: "rst"},
+  {name: "Ruby", mime: "text/x-ruby", mode: "ruby"},
+  {name: "Rust", mime: "text/x-rustsrc", mode: "rust"},
+  {name: "Sass", mime: "text/x-sass", mode: "sass"},
+  {name: "Scheme", mime: "text/x-scheme", mode: "scheme"},
+  {name: "SCSS", mime: "text/x-scss", mode: "css"},
+  {name: "Shell", mime: "text/x-sh", mode: "shell"},
+  {name: "Sieve", mime: "application/sieve", mode: "sieve"},
+  {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk"},
+  {name: "Smarty", mime: "text/x-smarty", mode: "smarty"},
+  {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
+  {name: "Solr", mime: "text/x-solr", mode: "solr"},
+  {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql"},
+  {name: "SQL", mime: "text/x-sql", mode: "sql"},
+  {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
+  {name: "sTeX", mime: "text/x-stex", mode: "stex"},
+  {name: "LaTeX", mime: "text/x-latex", mode: "stex"},
+  {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog"},
+  {name: "Tcl", mime: "text/x-tcl", mode: "tcl"},
+  {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
+  {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
+  {name: "TOML", mime: "text/x-toml", mode: "toml"},
+  {name: "Turtle", mime: "text/turtle", mode: "turtle"},
+  {name: "VB.NET", mime: "text/x-vb", mode: "vb"},
+  {name: "VBScript", mime: "text/vbscript", mode: "vbscript"},
+  {name: "Velocity", mime: "text/velocity", mode: "velocity"},
+  {name: "Verilog", mime: "text/x-verilog", mode: "verilog"},
+  {name: "XML", mime: "application/xml", mode: "xml"},
+  {name: "XQuery", mime: "application/xquery", mode: "xquery"},
+  {name: "YAML", mime: "text/x-yaml", mode: "yaml"},
+  {name: "Z80", mime: "text/x-z80", mode: "z80"}
 ];
 
 });

From b55cc7f5cd0b1128508dda51f525538dd1897f29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Jul 2014 15:05:42 +0200
Subject: [PATCH 1428/4742] [multi-editor operations] Set up operation grouping

Now nested operations from different editors end at the same time
---
 lib/codemirror.js | 66 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1aee422b42..85cfea9d7b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1911,10 +1911,13 @@
   // error-prone). Instead, display updates are batched and then all
   // combined and executed at once.
 
+  var operationGroup = null;
+
   var nextOpId = 0;
   // Start a new operation.
   function startOperation(cm) {
     cm.curOp = {
+      cm: cm,
       viewChanged: false,      // Flag that indicates that lines might need to be redrawn
       startHeight: cm.doc.height, // Used to detect need to update scrollbar
       forceUpdate: false,      // Used to force a redraw
@@ -1928,19 +1931,32 @@
       scrollToPos: null,       // Used to scroll to a specific position
       id: ++nextOpId           // Unique ID
     };
-    if (!delayedCallbackDepth++) delayedCallbacks = [];
+    if (operationGroup) {
+      operationGroup.ops.push(cm.curOp);
+    } else {
+      cm.curOp.ownsGroup = operationGroup = {
+        ops: [cm.curOp],
+        delayedCallbacks: []
+      };
+    }
   }
 
   // Finish an operation, updating the display and signalling delayed events
   function endOperation(cm) {
-    var op = cm.curOp, doc = cm.doc, display = cm.display;
-    cm.curOp = null;
-    var delayed;
-    if (!--delayedCallbackDepth) {
-      delayed = delayedCallbacks;
-      delayedCallbacks = null;
-    }
+    var op = cm.curOp, group = op.ownsGroup;
+    if (!group) return;
+
+    cm.curOp = operationGroup = null;
 
+    for (var i = 0; i < group.ops.length; i++)
+      endOperationInner(group.ops[i]);
+    
+    for (var i = 0; i < group.delayedCallbacks.length; ++i)
+      group.delayedCallbacks[i]();
+  }
+
+  function endOperationInner(op) {
+    var cm = op.cm, display = cm.display, doc = cm.doc;
     if (op.updateMaxLine) findMaxLine(cm);
 
     // If it looks like an update might be needed, call updateDisplay
@@ -1949,11 +1965,11 @@
                            op.scrollToPos.to.line >= display.viewTo) ||
         display.maxLineChanged && cm.options.lineWrapping) {
       var updated = updateDisplay(cm, {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
-      if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
+      if (cm.display.scroller.offsetHeight) doc.scrollTop = cm.display.scroller.scrollTop;
     }
     // If no update was run, but the selection changed, redraw that.
     if (!updated && op.selectionChanged) updateSelection(cm);
-    if (!updated && op.startHeight != cm.doc.height) updateScrollbars(cm);
+    if (!updated && op.startHeight != doc.height) updateScrollbars(cm);
 
     // Abort mouse wheel delta measurement, when scrolling explicitly
     if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
@@ -1971,8 +1987,8 @@
     }
     // If we need to scroll a specific position into view, do so.
     if (op.scrollToPos) {
-      var coords = scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
-                                     clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
+      var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+                                     clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
       if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
     }
 
@@ -1992,7 +2008,6 @@
     // Fire change events, and delayed event handlers
     if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);
-    if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
     if (op.cursorActivityHandlers)
       for (var i = 0; i < op.cursorActivityHandlers.length; i++)
         op.cursorActivityHandlers[i](cm);
@@ -6960,6 +6975,8 @@
     for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
   };
 
+  var orphanDelayedCallbacks = null;
+
   // Often, we want to signal events at a point where we are in the
   // middle of some work, but don't want the handler to start calling
   // other methods on the editor, which might be in an inconsistent
@@ -6967,25 +6984,26 @@
   // signalLater looks whether there are any handlers, and schedules
   // them to be executed when the last operation ends, or, if no
   // operation is active, when a timeout fires.
-  var delayedCallbacks, delayedCallbackDepth = 0;
   function signalLater(emitter, type /*, values...*/) {
     var arr = emitter._handlers && emitter._handlers[type];
     if (!arr) return;
-    var args = Array.prototype.slice.call(arguments, 2);
-    if (!delayedCallbacks) {
-      ++delayedCallbackDepth;
-      delayedCallbacks = [];
-      setTimeout(fireDelayed, 0);
+    var args = Array.prototype.slice.call(arguments, 2), list;
+    if (operationGroup) {
+      list = operationGroup.delayedCallbacks;
+    } else if (orphanDelayedCallbacks) {
+      list = orphanDelayedCallbacks;
+    } else {
+      list = orphanDelayedCallbacks = [];
+      setTimeout(fireOrphanDelayed, 0);
     }
     function bnd(f) {return function(){f.apply(null, args);};};
     for (var i = 0; i < arr.length; ++i)
-      delayedCallbacks.push(bnd(arr[i]));
+      list.push(bnd(arr[i]));
   }
 
-  function fireDelayed() {
-    --delayedCallbackDepth;
-    var delayed = delayedCallbacks;
-    delayedCallbacks = null;
+  function fireOrphanDelayed() {
+    var delayed = orphanDelayedCallbacks;
+    orphanDelayedCallbacks = null;
     for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }
 

From 0bdd5ea0b31aade11c0f2a385cdd720aab90eea4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Jul 2014 15:32:10 +0200
Subject: [PATCH 1429/4742] [multi-editor operations] Fire delayed events
 before the operation ends

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 85cfea9d7b..b9c63a226d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1925,6 +1925,7 @@
       typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
       changeObjs: null,        // Accumulated changes, for firing change events
       cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
+      cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
       selectionChanged: false, // Whether the selection needs to be redrawn
       updateMaxLine: false,    // Set when the widest line needs to be determined anew
       scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
@@ -1941,18 +1942,33 @@
     }
   }
 
+  function fireCallbacksForOps(group) {
+    // Calls delayed callbacks and cursorActivity handlers until no
+    // new ones appear
+    var callbacks = group.delayedCallbacks, i = 0;
+    do {
+      for (; i < callbacks.length; i++)
+        callbacks[i]();
+      for (var j = 0; j < group.ops.length; j++) {
+        var op = group.ops[j];
+        if (op.cursorActivityHandlers)
+          while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
+            op.cursorActivityHandlers[op.cursorActivityCalled++](op.cm);
+      }
+    } while (i < callbacks.length);
+  }
+
   // Finish an operation, updating the display and signalling delayed events
   function endOperation(cm) {
     var op = cm.curOp, group = op.ownsGroup;
     if (!group) return;
 
-    cm.curOp = operationGroup = null;
-
-    for (var i = 0; i < group.ops.length; i++)
-      endOperationInner(group.ops[i]);
-    
-    for (var i = 0; i < group.delayedCallbacks.length; ++i)
-      group.delayedCallbacks[i]();
+    try { fireCallbacksForOps(group); }
+    finally {      
+      cm.curOp = operationGroup = null;
+      for (var i = 0; i < group.ops.length; i++)
+        endOperationInner(group.ops[i]);
+    }
   }
 
   function endOperationInner(op) {
@@ -2008,9 +2024,6 @@
     // Fire change events, and delayed event handlers
     if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);
-    if (op.cursorActivityHandlers)
-      for (var i = 0; i < op.cursorActivityHandlers.length; i++)
-        op.cursorActivityHandlers[i](cm);
   }
 
   // Run the given function in an operation

From 55e1ed94dc83539dcecc4abb56935c3b411da557 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Jul 2014 15:54:08 +0200
Subject: [PATCH 1430/4742] Run operations cautiously again in highlightWorker

---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b9c63a226d..089a3e9f3b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1408,8 +1408,8 @@
     if (doc.frontier >= cm.display.viewTo) return;
     var end = +new Date + cm.options.workTime;
     var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
+    var changedLines = [];
 
-    runInOp(cm, function() {
     doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
       if (doc.frontier >= cm.display.viewFrom) { // Visible
         var oldStyles = line.styles;
@@ -1421,7 +1421,7 @@
         var ischange = !oldStyles || oldStyles.length != line.styles.length ||
           oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
         for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
-        if (ischange) regLineChange(cm, doc.frontier, "text");
+        if (ischange) changedLines.push(doc.frontier);
         line.stateAfter = copyState(doc.mode, state);
       } else {
         processLine(cm, line.text, state);
@@ -1433,6 +1433,9 @@
         return true;
       }
     });
+    if (changedLines.length) runInOp(cm, function() {
+      for (var i = 0; i < changedLines.length; i++)
+        regLineChange(cm, changedLines[i], "text");
     });
   }
 

From 24920fb8a247a6079bc41d92af08f64cfe82b4b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Jul 2014 15:55:22 +0200
Subject: [PATCH 1431/4742] Don't wrap onKeyUp in an operation

It doesn't need it
---
 lib/codemirror.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 089a3e9f3b..b2e194273f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2452,7 +2452,7 @@
     // Prevent wrapper from ever scrolling
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
-    on(d.input, "keyup", operation(cm, onKeyUp));
+    on(d.input, "keyup", function(e) { onKeyUp.call(cm, e); });
     on(d.input, "input", function() {
       if (ie && ie_version >= 9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
       fastPoll(cm);
@@ -3145,8 +3145,8 @@
   }
 
   function onKeyUp(e) {
-    if (signalDOMEvent(this, e)) return;
     if (e.keyCode == 16) this.doc.sel.shift = false;
+    signalDOMEvent(this, e);
   }
 
   function onKeyPress(e) {
@@ -4164,7 +4164,7 @@
 
     triggerOnKeyDown: methodOp(onKeyDown),
     triggerOnKeyPress: methodOp(onKeyPress),
-    triggerOnKeyUp: methodOp(onKeyUp),
+    triggerOnKeyUp: onKeyUp,
 
     execCommand: function(cmd) {
       if (commands.hasOwnProperty(cmd))

From e72560be12964597656fdf05d775893c46b81b14 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Jul 2014 18:03:27 +0200
Subject: [PATCH 1432/4742] [multi-editor operations] Split actions at op end
 into steps, call in order

---
 lib/codemirror.js | 295 ++++++++++++++++++++++++++++------------------
 1 file changed, 181 insertions(+), 114 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b2e194273f..1bf02d2089 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -108,6 +108,7 @@
 
       for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
         optionHandlers[opt](cm, options[opt], Init);
+      maybeUpdateLineNumberWidth(cm);
       for (var i = 0; i < initHooks.length; ++i) initHooks[i](cm);
     });
   }
@@ -467,18 +468,18 @@
   }
 
   // Compute the lines that are visible in a given viewport (defaults
-  // the the current scroll position). viewPort may contain top,
+  // the the current scroll position). viewport may contain top,
   // height, and ensure (see op.scrollToPos) properties.
-  function visibleLines(display, doc, viewPort) {
-    var top = viewPort && viewPort.top != null ? Math.max(0, viewPort.top) : display.scroller.scrollTop;
+  function visibleLines(display, doc, viewport) {
+    var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
     top = Math.floor(top - paddingTop(display));
-    var bottom = viewPort && viewPort.bottom != null ? viewPort.bottom : top + display.wrapper.clientHeight;
+    var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
 
     var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
     // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
     // forces those lines into the viewport (if possible).
-    if (viewPort && viewPort.ensure) {
-      var ensureFrom = viewPort.ensure.from.line, ensureTo = viewPort.ensure.to.line;
+    if (viewport && viewport.ensure) {
+      var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
       if (ensureFrom < from)
         return {from: ensureFrom,
                 to: lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)};
@@ -543,83 +544,46 @@
 
   // DISPLAY DRAWING
 
-  // Updates the display, selection, and scrollbars, using the
-  // information in display.view to find out which nodes are no longer
-  // up-to-date. Tries to bail out early when no changes are needed,
-  // unless forced is true.
-  // Returns true if an actual update happened, false otherwise.
-  function updateDisplay(cm, viewPort, forced) {
-    var oldFrom = cm.display.viewFrom, oldTo = cm.display.viewTo, updated;
-    var visible = visibleLines(cm.display, cm.doc, viewPort);
-    for (var first = true;; first = false) {
-      var oldWidth = cm.display.scroller.clientWidth;
-      if (!updateDisplayInner(cm, visible, forced)) break;
-      updated = true;
-
-      // If the max line changed since it was last measured, measure it,
-      // and ensure the document's width matches it.
-      if (cm.display.maxLineChanged && !cm.options.lineWrapping)
-        adjustContentWidth(cm);
-
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
-      updateScrollbars(cm, barMeasure);
-      if (webkit && cm.options.lineWrapping)
-        checkForWebkitWidthBug(cm, barMeasure); // (Issue #2420)
-      if (webkit && barMeasure.scrollWidth > barMeasure.clientWidth &&
-          barMeasure.scrollWidth < barMeasure.clientWidth + 1 &&
-          !hScrollbarTakesSpace(cm))
-        updateScrollbars(cm); // (Issue #2562)
-      if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
-        forced = true;
-        continue;
-      }
-      forced = false;
-
-      // Clip forced viewport to actual scrollable area.
-      if (viewPort && viewPort.top != null)
-        viewPort = {top: Math.min(barMeasure.docHeight - scrollerCutOff - barMeasure.clientHeight, viewPort.top)};
-      // Updated line heights might result in the drawn area not
-      // actually covering the viewport. Keep looping until it does.
-      visible = visibleLines(cm.display, cm.doc, viewPort);
-      if (visible.from >= cm.display.viewFrom && visible.to <= cm.display.viewTo)
-        break;
-    }
+  function DisplayUpdate(cm, viewport, force) {
+    var display = cm.display;
 
-    cm.display.updateLineNumbers = null;
-    if (updated) {
-      signalLater(cm, "update", cm);
-      if (cm.display.viewFrom != oldFrom || cm.display.viewTo != oldTo)
-        signalLater(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
-    }
-    return updated;
+    this.viewport = viewport;
+    // Store some values that we'll need later (but don't want to force a relayout for)
+    this.visible = visibleLines(display, cm.doc, viewport);
+    this.editorIsHidden = !display.wrapper.offsetWidth;
+    this.wrapperHeight = display.wrapper.clientHeight;
+    this.oldViewFrom = display.viewFrom; this.oldViewTo = display.viewTo;
+    this.oldScrollerWidth = display.scroller.clientWidth;
+    this.force = force;
+    this.dims = getDimensions(cm);
   }
 
   // Does the actual updating of the line display. Bails out
   // (returning false) when there is nothing to be done and forced is
   // false.
-  function updateDisplayInner(cm, visible, forced) {
+  function updateDisplayIfNeeded(cm, update) {
     var display = cm.display, doc = cm.doc;
-    if (!display.wrapper.offsetWidth) {
+    if (update.editorIsHidden) {
       resetView(cm);
-      return;
+      return false;
     }
 
     // Bail out if the visible area is already rendered and nothing changed.
-    if (!forced && visible.from >= display.viewFrom && visible.to <= display.viewTo &&
+    if (!update.force &&
+        update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
         (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
         countDirtyView(cm) == 0)
-      return;
+      return false;
 
-    if (maybeUpdateLineNumberWidth(cm))
+    if (maybeUpdateLineNumberWidth(cm)) {
       resetView(cm);
-    var dims = getDimensions(cm);
+      update.dims = getDimensions(cm);
+    }
 
     // Compute a suitable new viewport (from & to)
     var end = doc.first + doc.size;
-    var from = Math.max(visible.from - cm.options.viewportMargin, doc.first);
-    var to = Math.min(end, visible.to + cm.options.viewportMargin);
+    var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
+    var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
     if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
     if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
     if (sawCollapsedSpans) {
@@ -628,7 +592,7 @@
     }
 
     var different = from != display.viewFrom || to != display.viewTo ||
-      display.lastSizeC != display.wrapper.clientHeight;
+      display.lastSizeC != update.wrapperHeight;
     adjustView(cm, from, to);
 
     display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
@@ -636,13 +600,15 @@
     cm.display.mover.style.top = display.viewOffset + "px";
 
     var toUpdate = countDirtyView(cm);
-    if (!different && toUpdate == 0 && !forced) return;
+    if (!different && toUpdate == 0 && !update.force &&
+        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
+      return false;
 
     // For big changes, we hide the enclosing element during the
     // update, since that speeds up the operations on most browsers.
     var focused = activeElt();
     if (toUpdate > 4) display.lineDiv.style.display = "none";
-    patchDisplay(cm, display.updateLineNumbers, dims);
+    patchDisplay(cm, display.updateLineNumbers, update.dims);
     if (toUpdate > 4) display.lineDiv.style.display = "";
     // There might have been a widget with a focused element that got
     // hidden or updated, if so re-focus it.
@@ -654,24 +620,50 @@
     removeChildren(display.selectionDiv);
 
     if (different) {
-      display.lastSizeC = display.wrapper.clientHeight;
+      display.lastSizeC = update.wrapperHeight;
       startWorker(cm, 400);
     }
 
-    updateHeightsInViewport(cm);
+    display.updateLineNumbers = null;
 
     return true;
   }
 
-  function adjustContentWidth(cm) {
-    var display = cm.display;
-    var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
-    display.maxLineChanged = false;
-    var minWidth = Math.max(0, width + 3);
-    var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + minWidth + scrollerCutOff - display.scroller.clientWidth);
-    display.sizer.style.minWidth = minWidth + "px";
-    if (maxScrollLeft < cm.doc.scrollLeft)
-      setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
+  function postUpdateDisplay(cm, update) {
+    var force = update.force, viewport = update.viewport;
+    for (var first = true;; first = false) {
+      updateHeightsInViewport(cm);
+      if (first && cm.options.lineWrapping && update.oldScrollerWidth != cm.display.scroller.clientWidth) {
+        force = true;
+      } else {
+        force = false;
+        // Clip forced viewport to actual scrollable area.
+        if (viewport && viewport.top != null)
+          viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - scrollerCutOff -
+                                    cm.display.scroller.clientHeight, viewport.top)};
+        // Updated line heights might result in the drawn area not
+        // actually covering the viewport. Keep looping until it does.
+        var visible = visibleLines(cm.display, cm.doc, viewport);
+        if (visible.from >= cm.display.viewFrom && visible.to <= cm.display.viewTo)
+          break;
+      }
+      if (!updateDisplayIfNeeded(cm, update)) break;
+    }
+
+    signalLater(cm, "update", cm);
+    if (cm.display.viewFrom != update.oldViewFrom || cm.display.viewTo != update.oldViewTo)
+      signalLater(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
+  }
+
+  function updateDisplaySimple(cm, viewport) {
+    var update = new DisplayUpdate(cm, viewport);
+    if (updateDisplayIfNeeded(cm, update)) {
+      postUpdateDisplay(cm, update);
+      var barMeasure = measureForScrollbars(cm);
+      updateSelection(cm);
+      setDocumentHeight(cm, barMeasure);
+      updateScrollbars(cm, barMeasure);
+    }
   }
 
   function setDocumentHeight(cm, measure) {
@@ -1257,10 +1249,10 @@
   // SELECTION DRAWING
 
   // Redraw the selection and/or cursor
-  function updateSelection(cm) {
-    var display = cm.display, doc = cm.doc;
-    var curFragment = document.createDocumentFragment();
-    var selFragment = document.createDocumentFragment();
+  function drawSelection(cm) {
+    var display = cm.display, doc = cm.doc, result = {};
+    var curFragment = result.cursors = document.createDocumentFragment();
+    var selFragment = result.selection = document.createDocumentFragment();
 
     for (var i = 0; i < doc.sel.ranges.length; i++) {
       var range = doc.sel.ranges[i];
@@ -1275,16 +1267,23 @@
     if (cm.options.moveInputWithCursor) {
       var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
       var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
-      var top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                     headPos.top + lineOff.top - wrapOff.top));
-      var left = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                      headPos.left + lineOff.left - wrapOff.left));
-      display.inputDiv.style.top = top + "px";
-      display.inputDiv.style.left = left + "px";
+      result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
+                                          headPos.top + lineOff.top - wrapOff.top));
+      result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
+                                           headPos.left + lineOff.left - wrapOff.left));
     }
 
-    removeChildrenAndAdd(display.cursorDiv, curFragment);
-    removeChildrenAndAdd(display.selectionDiv, selFragment);
+    return result;
+  }
+
+  function updateSelection(cm, drawn) {
+    if (!drawn) drawn = drawSelection(cm);
+    removeChildrenAndAdd(cm.display.cursorDiv, drawn.cursors);
+    removeChildrenAndAdd(cm.display.selectionDiv, drawn.selection);
+    if (drawn.teTop != null) {
+      cm.display.inputDiv.style.top = drawn.teTop + "px";
+      cm.display.inputDiv.style.left = drawn.teLeft + "px";
+    }
   }
 
   // Draws a cursor for the given range
@@ -1967,28 +1966,88 @@
     if (!group) return;
 
     try { fireCallbacksForOps(group); }
-    finally {      
-      cm.curOp = operationGroup = null;
+    finally {
+      operationGroup = null;
       for (var i = 0; i < group.ops.length; i++)
-        endOperationInner(group.ops[i]);
+        group.ops[i].cm.curOp = null;
+      endOperations(group);
     }
   }
 
-  function endOperationInner(op) {
-    var cm = op.cm, display = cm.display, doc = cm.doc;
+  // The DOM updates done when an operation finishes are batched so
+  // that the minimum number of relayouts are required.
+  function endOperations(group) {
+    var ops = group.ops;
+    for (var i = 0; i < ops.length; i++) // Read DOM
+      endOperation_R1(ops[i]);
+    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+      endOperation_W1(ops[i]);
+    for (var i = 0; i < ops.length; i++) // Read DOM
+      endOperation_R2(ops[i]);
+    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+      endOperation_W2(ops[i]);
+    for (var i = 0; i < ops.length; i++) // Read DOM
+      endOperation_finish(ops[i]);
+  }
+
+  function endOperation_R1(op) {
+    var cm = op.cm, display = cm.display;
     if (op.updateMaxLine) findMaxLine(cm);
 
-    // If it looks like an update might be needed, call updateDisplay
-    if (op.viewChanged || op.forceUpdate || op.scrollTop != null ||
-        op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
-                           op.scrollToPos.to.line >= display.viewTo) ||
-        display.maxLineChanged && cm.options.lineWrapping) {
-      var updated = updateDisplay(cm, {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
-      if (cm.display.scroller.offsetHeight) doc.scrollTop = cm.display.scroller.scrollTop;
+    op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
+      op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
+                         op.scrollToPos.to.line >= display.viewTo) ||
+      display.maxLineChanged && cm.options.lineWrapping;
+    op.update = op.mustUpdate &&
+      new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
+  }
+
+  function endOperation_W1(op) {
+    op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
+  }
+
+  function endOperation_R2(op) {
+    var cm = op.cm, display = cm.display;
+    if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
+
+    // If the max line changed since it was last measured, measure it,
+    // and ensure the document's width matches it.
+    // updateDisplayIfNeeded will use these properties to do the actual resizing
+    if (display.maxLineChanged && !cm.options.lineWrapping) {
+      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
+      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo +
+                                  scrollerCutOff - display.scroller.clientWidth);
     }
-    // If no update was run, but the selection changed, redraw that.
-    if (!updated && op.selectionChanged) updateSelection(cm);
-    if (!updated && op.startHeight != doc.height) updateScrollbars(cm);
+
+    op.barMeasure = measureForScrollbars(cm);
+    if (op.updatedDisplay || op.selectionChanged)
+      op.newSelectionNodes = drawSelection(cm);
+  }
+
+  function endOperation_W2(op) {
+    var cm = op.cm;
+
+    if (op.adjustWidthTo != null) {
+      cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
+      if (op.maxScrollLeft < cm.doc.scrollLeft)
+        setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
+    }
+
+    if (op.newSelectionNodes)
+      updateSelection(cm, op.newSelectionNodes);
+    if (op.updatedDisplay)
+      setDocumentHeight(cm, op.barMeasure);
+    if (op.updatedDisplay || op.startHeight != cm.doc.height)
+      updateScrollbars(cm, op.barMeasure);
+
+    if (op.selectionChanged) restartBlink(cm);
+
+    if (cm.state.focused && op.updateInput)
+      resetInput(cm, op.typing);
+  }
+
+  function endOperation_finish(op) {
+    var cm = op.cm, display = cm.display, doc = cm.doc;
 
     // Abort mouse wheel delta measurement, when scrolling explicitly
     if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
@@ -2011,11 +2070,6 @@
       if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
     }
 
-    if (op.selectionChanged) restartBlink(cm);
-
-    if (cm.state.focused && op.updateInput)
-      resetInput(cm, op.typing);
-
     // Fire events for markers that are hidden/unidden by editing or
     // undoing
     var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
@@ -2024,6 +2078,19 @@
     if (unhidden) for (var i = 0; i < unhidden.length; ++i)
       if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
 
+    if (display.wrapper.offsetHeight)
+      doc.scrollTop = cm.display.scroller.scrollTop;
+
+    // Apply workaround for two webkit bugs
+    if (op.updatedDisplay && webkit) {
+      if (cm.options.lineWrapping)
+        checkForWebkitWidthBug(cm, op.barMeasure); // (Issue #2420)
+      if (op.barMeasure.scrollWidth > op.barMeasure.clientWidth &&
+          op.barMeasure.scrollWidth < op.barMeasure.clientWidth + 1 &&
+          !hScrollbarTakesSpace(cm))
+        updateScrollbars(cm); // (Issue #2562)
+    }
+
     // Fire change events, and delayed event handlers
     if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);
@@ -2916,10 +2983,10 @@
   function setScrollTop(cm, val) {
     if (Math.abs(cm.doc.scrollTop - val) < 2) return;
     cm.doc.scrollTop = val;
-    if (!gecko) updateDisplay(cm, {top: val});
+    if (!gecko) updateDisplaySimple(cm, {top: val});
     if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
     if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;
-    if (gecko) updateDisplay(cm);
+    if (gecko) updateDisplaySimple(cm);
     startWorker(cm, 100);
   }
   // Sync scroller and scrollbar, ensure the gutter elements are
@@ -3002,7 +3069,7 @@
       var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
       if (pixels < 0) top = Math.max(0, top + pixels - 50);
       else bot = Math.min(cm.doc.height, bot + pixels + 50);
-      updateDisplay(cm, {top: top, bottom: bot});
+      updateDisplaySimple(cm, {top: top, bottom: bot});
     }
 
     if (wheelSamples < 20) {

From c698ab758b4682c2aca55135c9948735dd75a05f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 4 Jul 2014 12:26:41 +0200
Subject: [PATCH 1433/4742] [multi-editor operations] Add a few tests

---
 test/test.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/test/test.js b/test/test.js
index 4ef4ef547d..dcfffb7c07 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1988,3 +1988,38 @@ testCM("resizeLineWidget", function(cm) {
   cm.setSize(40);
   is(widget.parentNode.offsetWidth < 42);
 });
+
+testCM("combinedOperations", function(cm) {
+  var place = document.getElementById("testground");
+  var other = CodeMirror(place, {value: "123"});
+  try {
+    cm.operation(function() {
+      cm.addLineClass(0, "wrap", "foo");
+      other.addLineClass(0, "wrap", "foo");
+    });
+    eq(byClassName(cm.getWrapperElement(), "foo").length, 1);
+    eq(byClassName(other.getWrapperElement(), "foo").length, 1);
+    cm.operation(function() {
+      cm.removeLineClass(0, "wrap", "foo");
+      other.removeLineClass(0, "wrap", "foo");
+    });
+    eq(byClassName(cm.getWrapperElement(), "foo").length, 0);
+    eq(byClassName(other.getWrapperElement(), "foo").length, 0);
+  } finally {
+    place.removeChild(other.getWrapperElement());
+  }
+}, {value: "abc"});
+
+testCM("eventOrder", function(cm) {
+  var seen = [];
+  cm.on("change", function() {
+    if (!seen.length) cm.replaceSelection(".");
+    seen.push("change");
+  });
+  cm.on("cursorActivity", function() {
+    cm.replaceSelection("!");
+    seen.push("activity");
+  });
+  cm.replaceSelection("/");
+  eq(seen.join(","), "change,change,activity,change");
+});

From 63591907b0dcd51c2f64dc967143e044ecac6923 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Jul 2014 14:30:27 +0200
Subject: [PATCH 1434/4742] Work around IE10- client rect + zoom issue

Issue #2665
---
 lib/codemirror.js | 24 ++++++++++++++++++++++++
 test/lint/lint.js |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1bf02d2089..cc7caace19 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1667,6 +1667,8 @@
         rect = nullRect;
     }
 
+    if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
+
     var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
     var mid = (rtop + rbot) / 2;
     var heights = prepared.view.measure.heights;
@@ -1678,9 +1680,22 @@
                   top: top, bottom: bot};
     if (!rect.left && !rect.right) result.bogus = true;
     if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
+
     return result;
   }
 
+  // Work around problem with bounding client rects on ranges being
+  // returned incorrectly when zoomed on IE10 and below.
+  function maybeUpdateRectForZooming(measure, rect) {
+    if (!window.screen || screen.logicalXDPI == null ||
+        screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
+      return rect;
+    var scaleX = screen.logicalXDPI / screen.deviceXDPI;
+    var scaleY = screen.logicalYDPI / screen.deviceYDPI;
+    return {left: rect.left * scaleX, right: rect.right * scaleX,
+            top: rect.top * scaleY, bottom: rect.bottom * scaleY};
+  }
+
   function clearLineMeasurementCacheFor(lineView) {
     if (lineView.measure) {
       lineView.measure.cache = {};
@@ -7432,6 +7447,15 @@
     return typeof e.oncopy == "function";
   })();
 
+  var badZoomedRects = null;
+  function hasBadZoomedRects(measure) {
+    if (badZoomedRects != null) return badZoomedRects;
+    var node = removeChildrenAndAdd(measure, elt("span", "x"));
+    var normal = node.getBoundingClientRect();
+    var fromRange = range(node, 0, 1).getBoundingClientRect();
+    return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1;
+  }
+
   // KEY NAMES
 
   var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
diff --git a/test/lint/lint.js b/test/lint/lint.js
index ef4c13bd9a..c2c45262a6 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -19,7 +19,7 @@ var topAllowedGlobals = Object.create(null);
 ("Error RegExp Number String Array Function Object Math Date undefined " +
  "parseInt parseFloat Infinity NaN isNaN " +
  "window document navigator prompt alert confirm console " +
- "FileReader Worker postMessage importScripts " +
+ "screen FileReader Worker postMessage importScripts " +
  "setInterval clearInterval setTimeout clearTimeout " +
  "CodeMirror " +
  "test exports require module define")

From 57761d076413ad7e49f1e45d94b122dd8dfb2c55 Mon Sep 17 00:00:00 2001
From: Jaydeep Solanki <jaydp17@gmail.com>
Date: Sat, 5 Jul 2014 06:06:24 +0530
Subject: [PATCH 1435/4742] [ruby mode] Better heuristic for distinguishing
 division from regexps

---
 mode/ruby/ruby.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index b68ee2912a..d6c9d8796e 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -46,9 +46,23 @@ CodeMirror.defineMode("ruby", function(config) {
     var ch = stream.next(), m;
     if (ch == "`" || ch == "'" || ch == '"') {
       return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
-    } else if (ch == "/" && !stream.eol() && stream.peek() != " ") {
-      if (stream.eat("=")) return "operator";
-      return chain(readQuoted(ch, "string-2", true), stream, state);
+    } else if (ch == "/") {
+      var currentIndex = stream.current().length;
+      if (stream.skipTo("/")) {
+        var search_till = stream.current().length;
+        stream.backUp(stream.current().length - currentIndex);
+        var balance = 0;  // balance brackets
+        while (stream.current().length < search_till) {
+          var chchr = stream.next();
+          if (chchr == "(") balance += 1;
+          else if (chchr == ")") balance -= 1;
+          if (balance < 0) break;
+        }
+        stream.backUp(stream.current().length - currentIndex);
+        if (balance == 0)
+          return chain(readQuoted(ch, "string-2", true), stream, state);
+      }
+      return "operator";
     } else if (ch == "%") {
       var style = "string", embed = true;
       if (stream.eat("s")) style = "atom";

From 347affcf2784dc8ed6e13abba517f7bd4968e715 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Jul 2014 23:22:38 +0200
Subject: [PATCH 1436/4742] Handle altGr in early return from onKeyPress

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cc7caace19..dcbacc258b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3233,7 +3233,7 @@
 
   function onKeyPress(e) {
     var cm = this;
-    if (signalDOMEvent(cm, e) || e.ctrlKey || mac && e.metaKey) return;
+    if (signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
     var keyCode = e.keyCode, charCode = e.charCode;
     if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
     if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;

From 93c846bd2b3190459aed37399a3b5583d578911a Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Wed, 2 Jul 2014 00:09:42 +0530
Subject: [PATCH 1437/4742] [vim] reselectSelection for visualBlock

---
 keymap/vim.js    | 78 ++++++++++++++++++++++++++++++++----------------
 test/vim_test.js | 24 ++++++++++++---
 2 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 6ff5edce4c..ab61e17afb 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1858,6 +1858,8 @@
       },
       // delete is a javascript keyword.
       'delete': function(cm, operatorArgs, vim, curStart, curEnd) {
+        // Save the '>' mark before cm.replaceRange clears it.
+        var selectionEnd = vim.visualMode ? vim.marks['>'].find() : null;
         // If the ending line is past the last line, inclusive, instead of
         // including the trailing \n, include the \n before the starting line
         if (operatorArgs.linewise &&
@@ -1876,6 +1878,10 @@
         } else {
           cm.replaceRange('', curStart, curEnd);
         }
+        // restore the saved bookmark
+        if (selectionEnd) {
+          vim.marks['>'] = cm.setBookmark(selectionEnd);
+        }
         if (operatorArgs.linewise) {
           cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
         } else {
@@ -2085,7 +2091,6 @@
           curStart = cm.getCursor('anchor');
           curEnd = cm.getCursor('head');
           if (vim.visualLine) {
-            vim.visualLine = false;
             if (actionArgs.blockwise) {
               // This means Ctrl-V pressed in linewise visual
               vim.visualBlock = true;
@@ -2097,8 +2102,8 @@
             } else {
               exitVisualMode(cm);
             }
+            vim.visualLine = false;
           } else if (vim.visualBlock) {
-            vim.visualBlock = false;
             if (actionArgs.linewise) {
               // Shift-V pressed in blockwise visual mode
               vim.visualLine = true;
@@ -2118,6 +2123,7 @@
             } else {
               exitVisualMode(cm);
             }
+            vim.visualBlock = false;
           } else if (actionArgs.linewise) {
               // Shift-V pressed in characterwise visual mode. Switch to linewise
               // visual mode instead of exiting visual mode.
@@ -2142,27 +2148,40 @@
             : curStart);
       },
       reselectLastSelection: function(cm, _actionArgs, vim) {
+        var curStart = vim.marks['<'].find();
+        var curEnd = vim.marks['>'].find();
         var lastSelection = vim.lastSelection;
         if (lastSelection) {
-          var curStart = lastSelection.curStartMark.find();
-          var curEnd = lastSelection.curEndMark.find();
-          cm.setSelection(curStart, curEnd);
+          // Set the selections as per last selection
+          var selectionStart = lastSelection.curStartMark.find();
+          var selectionEnd = lastSelection.curEndMark.find();
+          var blockwise = lastSelection.visualBlock;
+          // update last selection
+          updateLastSelection(cm, vim, curStart, curEnd);
+          if (blockwise) {
+            cm.setCursor(selectionStart);
+            selectionStart = selectBlock(cm, selectionEnd);
+          } else {
+            cm.setSelection(selectionStart, selectionEnd);
+            selectionStart = cm.getCursor('anchor');
+            selectionEnd = cm.getCursor('head');
+          }
           if (vim.visualMode) {
-            updateLastSelection(cm, vim);
-            var selectionStart = cm.getCursor('anchor');
-            var selectionEnd = cm.getCursor('head');
             updateMark(cm, vim, '<', cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
-            : selectionEnd);
+              : selectionEnd);
             updateMark(cm, vim, '>', cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
-            : selectionStart);
+              : selectionStart);
           }
+          // Last selection is updated now
+          vim.visualMode = true;
           if (lastSelection.visualLine) {
-            vim.visualMode = true;
             vim.visualLine = true;
-          }
-          else {
-            vim.visualMode = true;
+            vim.visualBlock = false;
+          } else if (lastSelection.visualBlock) {
             vim.visualLine = false;
+            vim.visualBlock = true;
+          } else {
+            vim.visualBlock = vim.visualLine = false;
           }
           CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
         }
@@ -2552,6 +2571,10 @@
         }
         start++;
       }
+      // Update selectionEnd and selectionStart
+      // after selection crossing
+      selectionEnd.ch = selections[0].head.ch;
+      selectionStart.ch = selections[0].anchor.ch;
       cm.setSelections(selections, primIndex);
       return selectionStart;
     }
@@ -2586,22 +2609,27 @@
       }
       return [selectionStart, selectionEnd];
     }
-    function updateLastSelection(cm, vim) {
-      // We need the vim mark '<' to get the selection in case of yank and put
-      var selectionStart =  vim.marks['<'].find() || cm.getCursor('anchor');
-      var selectionEnd =  vim.marks['>'].find() ||cm.getCursor('head');
-      // To accommodate the effect lastPastedText in the last selection
+    function updateLastSelection(cm, vim, selectionStart, selectionEnd) {
+      if (!selectionStart || !selectionEnd) {
+        selectionStart = vim.marks['<'].find() || cm.getCursor('anchor');
+        selectionEnd = vim.marks['>'].find() || cm.getCursor('head');
+      }
+      // To accommodate the effect of lastPastedText in the last selection
       if (vim.lastPastedText) {
-        selectionEnd = cm.posFromIndex(cm.indexFromPos(selectionStart) + vim.lastPastedText.length-1);
+        selectionEnd = cm.posFromIndex(cm.indexFromPos(selectionStart) + vim.lastPastedText.length);
         vim.lastPastedText = null;
       }
+      var ranges = cm.listSelections();
+      // This check ensures to set the cursor
+      // position where we left off in previous selection
+      var swap = getIndex(ranges, selectionStart) > -1;
       // can't use selection state here because yank has already reset its cursor
       // Also, Bookmarks make the visual selections robust to edit operations
-      vim.lastSelection = {'curStartMark': cm.setBookmark(selectionStart), 'curEndMark': cm.setBookmark(selectionEnd), 'visualMode': vim.visualMode, 'visualLine': vim.visualLine};
-      if (cursorIsBefore(selectionEnd, selectionStart)) {
-        vim.lastSelection.curStartMark = cm.setBookmark(selectionEnd);
-        vim.lastSelection.curEndMark = cm.setBookmark(selectionStart);
-      }
+      vim.lastSelection = {'curStartMark': cm.setBookmark(swap ? selectionEnd : selectionStart),
+                           'curEndMark': cm.setBookmark(swap ? selectionStart : selectionEnd),
+                           'visualMode': vim.visualMode,
+                           'visualLine': vim.visualLine,
+                           'visualBlock': vim.visualBlock};
     }
 
     function exitVisualMode(cm) {
diff --git a/test/vim_test.js b/test/vim_test.js
index b09d730d50..1c9e8c3c9a 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1655,7 +1655,8 @@ testVim('reselect_visual', function(cm, vim, helpers) {
   eq('123456\n2345\nbar', cm.getValue());
   cm.setCursor(0, 0);
   helpers.doKeys('g', 'v');
-  helpers.assertCursorAt(1, 3);
+  // here the fake cursor is at (1, 3)
+  helpers.assertCursorAt(2, 0);
   eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
   helpers.doKeys('v');
   cm.setCursor(2, 0);
@@ -1669,17 +1670,32 @@ testVim('reselect_visual', function(cm, vim, helpers) {
 }, { value: '123456\nfoo\nbar' });
 testVim('reselect_visual_line', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'j', 'j', 'V', 'g', 'v', 'd');
-  eq('\nfoo\nand\nbar', cm.getValue());
+  eq('foo\nand\nbar', cm.getValue());
   cm.setCursor(1, 0);
   helpers.doKeys('V', 'y', 'j');
   helpers.doKeys('V', 'p' , 'g', 'v', 'd');
-  eq('\nfoo\nbar', cm.getValue());
+  eq('foo\nand', cm.getValue());
 }, { value: 'hello\nthis\nis\nfoo\nand\nbar' });
+testVim('reselect_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('<C-v>', 'k', 'h', '<C-v>');
+  cm.setCursor(2, 1);
+  helpers.doKeys('v', 'l', 'g', 'v');
+  helpers.assertCursorAt(0, 1);
+  // Ensure selection is done with visual block mode rather than one
+  // continuous range.
+  eq(cm.getSelections().join(''), '23oo')
+  helpers.doKeys('g', 'v');
+  helpers.assertCursorAt(2, 3);
+  // Ensure selection of deleted range
+  cm.setCursor(1, 1);
+  helpers.doKeys('v', '<C-v>', 'j', 'd', 'g', 'v');
+  eq(cm.getSelections().join(''), 'or');
+}, { value: '123456\nfoo\nbar' });
 testVim('s_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('s');
   helpers.doInsertModeKeys('Esc');
-  helpers.assertCursorAt(0, 0);
   eq('ac', cm.getValue());
 }, { value: 'abc'});
 testVim('s_visual', function(cm, vim, helpers) {

From 238b451301227eb8987a4204fc726e1f1207777f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 8 Jul 2014 23:44:59 +0200
Subject: [PATCH 1438/4742] Fix broken double-checking of display coverage

Both a potential infinite loop, due to updateDisplayIfNeeded not using
the updated set of visibile lines, and the fact that the current check
wasn't really covering changing document size, due to it happening before
the call to setDocumentHeight

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index dcbacc258b..19abaf50b7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -632,7 +632,6 @@
   function postUpdateDisplay(cm, update) {
     var force = update.force, viewport = update.viewport;
     for (var first = true;; first = false) {
-      updateHeightsInViewport(cm);
       if (first && cm.options.lineWrapping && update.oldScrollerWidth != cm.display.scroller.clientWidth) {
         force = true;
       } else {
@@ -643,11 +642,16 @@
                                     cm.display.scroller.clientHeight, viewport.top)};
         // Updated line heights might result in the drawn area not
         // actually covering the viewport. Keep looping until it does.
-        var visible = visibleLines(cm.display, cm.doc, viewport);
-        if (visible.from >= cm.display.viewFrom && visible.to <= cm.display.viewTo)
+        update.visible = visibleLines(cm.display, cm.doc, viewport);
+        if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
           break;
       }
       if (!updateDisplayIfNeeded(cm, update)) break;
+      updateHeightsInViewport(cm);
+      var barMeasure = measureForScrollbars(cm);
+      updateSelection(cm);
+      setDocumentHeight(cm, barMeasure);
+      updateScrollbars(cm, barMeasure);
     }
 
     signalLater(cm, "update", cm);
@@ -2023,7 +2027,7 @@
 
   function endOperation_R2(op) {
     var cm = op.cm, display = cm.display;
-    if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
+    if (op.updatedDisplay) updateHeightsInViewport(cm);
 
     // If the max line changed since it was last measured, measure it,
     // and ensure the document's width matches it.
@@ -2064,6 +2068,8 @@
   function endOperation_finish(op) {
     var cm = op.cm, display = cm.display, doc = cm.doc;
 
+    if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
+
     // Abort mouse wheel delta measurement, when scrolling explicitly
     if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
       display.wheelStartX = display.wheelStartY = null;

From 6c0cd2b56b50837a010bd27f322a57edfbe9fee9 Mon Sep 17 00:00:00 2001
From: Richard van der Meer <richard@richardvandermeer.nl>
Date: Tue, 8 Jul 2014 11:51:35 +0200
Subject: [PATCH 1439/4742] [vbscript mode] Fixed "Cannot read property
 'substr' of null"

Error occurs when entering multiple dots
---
 mode/vbscript/vbscript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/vbscript/vbscript.js b/mode/vbscript/vbscript.js
index bff2594477..b66df2239a 100644
--- a/mode/vbscript/vbscript.js
+++ b/mode/vbscript/vbscript.js
@@ -291,7 +291,7 @@ CodeMirror.defineMode("vbscript", function(conf, parserConf) {
             style = state.tokenize(stream, state);
 
             current = stream.current();
-            if (style.substr(0, 8) === 'variable' || style==='builtin' || style==='keyword'){//|| knownWords.indexOf(current.substring(1)) > -1) {
+            if (style && (style.substr(0, 8) === 'variable' || style==='builtin' || style==='keyword')){//|| knownWords.indexOf(current.substring(1)) > -1) {
                 if (style === 'builtin' || style === 'keyword') style='variable';
                 if (knownWords.indexOf(current.substr(1)) > -1) style='variable-2';
 

From e92998af5dd97c771821f03c223b88442974bc6b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 8 Jul 2014 20:35:07 -0700
Subject: [PATCH 1440/4742] [vim] Add features list to demo page

---
 demo/vim.html | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index f92ff9e6d8..cc616759f0 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -45,17 +45,32 @@ <h2>Vim bindings demo</h2>
   return (--n >= 0) ? (unsigned char) *bufp++ : EOF;
 }
 </textarea></form>
-<div id="command-display" style="width: 300px; height: 30px;"></div>
-
-    <form><textarea id="code2" name="code2">
-        I am another file! You can yank from my neighbor and paste here.
-</textarea></form>
+<div style="font-size: 13px; width: 300px; height: 30px;">Key buffer: <span id="command-display"></span></div>
 
 <p>The vim keybindings are enabled by
 including <a href="../keymap/vim.js">keymap/vim.js</a> and setting
 the <code>vimMode</code> option to <code>true</code>. This will also
 automatically change the <code>keyMap</code> option to <code>"vim"</code>.</p>
 
+<p><strong>Features</strong></p>
+
+<ul>
+  <li>All common motions and operators, including text objects</li>
+  <li>Operator motion orthogonality</li>
+  <li>Visual mode - characterwise, linewise, partial support for blockwise</li>
+  <li>Full macro support (q, @)</li>
+  <li>Incremental highlighted search (/, ?, #, *, g#, g*)</li>
+  <li>Search/replace with confirm (:substitute, :%s)</li>
+  <li>Search history</li>
+  <li>Jump lists (Ctrl-o, Ctrl-i)</li>
+  <li>Key/command mapping with API (:map, :nmap, :vmap)</li>
+  <li>Sort (:sort)</li>
+  <li>Marks (`, ')</li>
+  <li>:global</li>
+  <li>Insert mode behaves identical to base CodeMirror</li>
+  <li>Cross-buffer yank/paste</li>
+</ul>
+
 <p>Note that while the vim mode tries to emulate the most useful features of
 vim as faithfully as possible, it does not strive to become a complete vim
 implementation</p>
@@ -69,13 +84,6 @@ <h2>Vim bindings demo</h2>
         matchBrackets: true,
         showCursorWhenSelecting: true
       });
-      var editor2 = CodeMirror.fromTextArea(document.getElementById("code2"), {
-        lineNumbers: true,
-        mode: "text/x-csrc",
-        vimMode: true,
-        matchBrackets: true,
-        showCursorWhenSelecting: true
-      });
       var commandDisplay = document.getElementById('command-display');
       var keys = '';
       CodeMirror.on(editor, 'vim-keypress', function(key) {

From 770c0970cf2e3541ad21ee6fa0c7d78b21b368e0 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Wed, 9 Jul 2014 19:15:58 +0530
Subject: [PATCH 1441/4742] [vim] change for blockwise visual

---
 keymap/vim.js    | 51 ++++++++++++++++++++++++++++++++++++------------
 test/vim_test.js | 14 +++++++++++++
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index ab61e17afb..c1b0df4683 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1831,17 +1831,39 @@
     };
 
     var operators = {
-      change: function(cm, operatorArgs, _vim, curStart, curEnd) {
+      change: function(cm, operatorArgs, vim) {
+        var selections = cm.listSelections();
+        var start = selections[0], end = selections[selections.length-1];
+        var curStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
+        var curEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
+        var text = cm.getSelection();
+        var replacement = new Array(selections.length).join('1').split('1');
         vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'change', cm.getRange(curStart, curEnd),
+            operatorArgs.registerName, 'change', text,
             operatorArgs.linewise);
         if (operatorArgs.linewise) {
-          // Push the next line back down, if there is a next line.
-          var replacement = curEnd.line > cm.lastLine() ? '' : '\n';
-          cm.replaceRange(replacement, curStart, curEnd);
-          cm.indentLine(curStart.line, 'smart');
-          // null ch so setCursor moves to end of line.
-          curStart.ch = null;
+          // 'C' in visual block extends the block till eol for all lines
+          if (vim.visualBlock){
+            var startLine = curStart.line;
+            while (startLine <= curEnd.line) {
+              var endCh = lineLength(cm, startLine);
+              var head = Pos(startLine, endCh);
+              var anchor = Pos(startLine, curStart.ch);
+              startLine++;
+              cm.replaceRange('', anchor, head);
+            }
+          } else {
+            // Push the next line back down, if there is a next line.
+            replacement = '\n';
+            if (curEnd.line == curStart.line && curEnd.line == cm.lastLine()) {
+              replacement = '';
+            }
+            cm.replaceRange(replacement, curStart, curEnd);
+            cm.indentLine(curStart.line, 'smart');
+            // null ch so setCursor moves to end of line.
+            curStart.ch = null;
+            cm.setCursor(curStart);
+          }
         } else {
           // Exclude trailing whitespace if the range is not all whitespace.
           var text = cm.getRange(curStart, curEnd);
@@ -1851,15 +1873,20 @@
               curEnd = offsetCursor(curEnd, 0, - match[0].length);
             }
           }
-          cm.replaceRange('', curStart, curEnd);
+          if (vim.visualBlock) {
+            cm.replaceSelections(replacement);
+          } else {
+            cm.setCursor(curStart);
+            cm.replaceRange('', curStart, curEnd);
+          }
         }
         actions.enterInsertMode(cm, {}, cm.state.vim);
-        cm.setCursor(curStart);
       },
       // delete is a javascript keyword.
       'delete': function(cm, operatorArgs, vim, curStart, curEnd) {
         // Save the '>' mark before cm.replaceRange clears it.
         var selectionEnd = vim.visualMode ? vim.marks['>'].find() : null;
+        var text = cm.getSelection();
         // If the ending line is past the last line, inclusive, instead of
         // including the trailing \n, include the \n before the starting line
         if (operatorArgs.linewise &&
@@ -1868,7 +1895,7 @@
           curStart.ch = lineLength(cm, curStart.line);
         }
         vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'delete', cm.getRange(curStart, curEnd),
+            operatorArgs.registerName, 'delete', text,
             operatorArgs.linewise);
         if (vim.visualBlock) {
           var selections = cm.listSelections();
@@ -1926,8 +1953,6 @@
         var curStart  = ranges[0].anchor;
         var curEnd = ranges[0].head;
         if (!operatorArgs.shouldMoveCursor) {
-          // extendSelection swaps curStart and curEnd, so make sure
-          // curStart < curEnd
           cm.setCursor(cursorIsBefore(curStart, curEnd) ? curStart : curEnd);
         }
       },
diff --git a/test/vim_test.js b/test/vim_test.js
index 1c9e8c3c9a..76a2699780 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -895,6 +895,20 @@ testVim('cc_append', function(cm, vim, helpers) {
   helpers.doKeys('c', 'c');
   eq(expectedLineCount, cm.lineCount());
 });
+testVim('c_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'c');
+  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
+  replacement.pop();
+  cm.replaceSelections(replacement);
+  eq('1hello\n5hello\nahellofg', cm.getValue());
+  cm.setCursor(2, 3);
+  helpers.doKeys('<C-v>', '2', 'k', 'h', 'C');
+  replacement = new Array(cm.listSelections().length+1).join('world ').split(' ');
+  replacement.pop();
+  cm.replaceSelections(replacement);
+  eq('1hworld\n5hworld\nahworld', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
 // Swapcase commands edit in place and do not modify registers.
 testVim('g~w_repeat', function(cm, vim, helpers) {
   // Assert that dw does delete newline if it should go to the next line, and

From 5285494ab15ba444bc95f956c389502796b0bce1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 11 Jul 2014 08:51:22 +0200
Subject: [PATCH 1442/4742] Ignore auto indentation beyond column 80

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 19abaf50b7..49fd45a084 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3812,7 +3812,7 @@
       how = "not";
     } else if (how == "smart") {
       indentation = cm.doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
-      if (indentation == Pass) {
+      if (indentation == Pass || indentation > 80) {
         if (!aggressive) return;
         how = "prev";
       }

From ce7536377698f682eaf3959408c70df665f690cf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 11 Jul 2014 08:56:12 +0200
Subject: [PATCH 1443/4742] Bump indentation-ignoring threshold to 150

You might actually want to align things on long lines

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 49fd45a084..ad77be2cb9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3812,7 +3812,7 @@
       how = "not";
     } else if (how == "smart") {
       indentation = cm.doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
-      if (indentation == Pass || indentation > 80) {
+      if (indentation == Pass || indentation > 150) {
         if (!aggressive) return;
         how = "prev";
       }

From ae978a7e9372f7bae489510c68740741dfe67e05 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 11 Jul 2014 11:20:31 +0200
Subject: [PATCH 1444/4742] Bind Cmd-Home to goDocStart on Mac

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

diff --git a/doc/manual.html b/doc/manual.html
index 2deb8422a5..490143e31b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -815,7 +815,7 @@ <h2>Commands</h2>
       <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)</span></dt>
+      <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>
       <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>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ad77be2cb9..bf5d6baa2e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4824,7 +4824,7 @@
   };
   keyMap.macDefault = {
     "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
-    "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
+    "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
     "Alt-Right": "goGroupRight", "Cmd-Left": "goLineStart", "Cmd-Right": "goLineEnd", "Alt-Backspace": "delGroupBefore",
     "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
     "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",

From 0b3d49f4cfc458d481a21b38d7be44fb48c1b46f Mon Sep 17 00:00:00 2001
From: Tim Alby <timothee.alby@gmail.com>
Date: Thu, 10 Jul 2014 17:31:43 +0100
Subject: [PATCH 1445/4742] Fix key-binding behaviour on Mac in wrap mode

Bind Cmd-Left to goLineLeft and Cmd-right to goLineRight instead of goLineStart and goLineEnd
Create and bind delVisualLeft and delVisualRight to Cmd-Backspace and Cmd-Delete
---
 doc/manual.html   | 16 +++++++++++-----
 lib/codemirror.js | 18 ++++++++++++++++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 490143e31b..ed0d076a9f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -797,9 +797,15 @@ <h2>Commands</h2>
       <dt class=command id=command_deleteLine><code><strong>deleteLine</strong></code><span class=keybinding>Ctrl-D (PC), Cmd-D (Mac)</span></dt>
       <dd>Deletes the whole line under the cursor, including newline at the end.</dd>
 
-      <dt class=command id=command_delLineLeft><code><strong>delLineLeft</strong></code><span class=keybinding>Cmd-Backspace (Mac)</span></dt>
+      <dt class=command id=command_delLineLeft><code><strong>delLineLeft</strong></code></dt>
       <dd>Delete the part of the line before the cursor.</dd>
 
+      <dt class=command id=command_delWrappedLineLeft><code><strong>delWrappedLineLeft</strong></code><span class=keybinding>Cmd-Backspace (Mac)</span></dt>
+      <dd>Delete the part of the line from the left side of the visual line the cursor is on to the cursor.</dd>
+
+      <dt class=command id=command_delWrappedLineRight><code><strong>delWrappedLineRight</strong></code><span class=keybinding>Cmd-Delete (Mac)</span></dt>
+      <dd>Delete the part of the line from the cursor to the right side of the visual line the cursor is on.</dd>
+
       <dt class=command id=command_undo><code><strong>undo</strong></code><span class=keybinding>Ctrl-Z (PC), Cmd-Z (Mac)</span></dt>
       <dd>Undo the last change.</dd>
 
@@ -821,7 +827,7 @@ <h2>Commands</h2>
       <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>
       <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), Cmd-Left (Mac), Ctrl-A (Mac)</span></dt>
+      <dt class=command id=command_goLineStart><code><strong>goLineStart</strong></code><span class=keybinding>Alt-Left (PC), Ctrl-A (Mac)</span></dt>
       <dd>Move the cursor to the start of the line.</dd>
 
       <dt class=command id=command_goLineStartSmart><code><strong>goLineStartSmart</strong></code><span class=keybinding>Home</span></dt>
@@ -829,14 +835,14 @@ <h2>Commands</h2>
       already there, to the actual start of the line (including
       whitespace).</dd>
 
-      <dt class=command id=command_goLineEnd><code><strong>goLineEnd</strong></code><span class=keybinding>Alt-Right (PC), Cmd-Right (Mac), Ctrl-E (Mac)</span></dt>
+      <dt class=command id=command_goLineEnd><code><strong>goLineEnd</strong></code><span class=keybinding>Alt-Right (PC), Ctrl-E (Mac)</span></dt>
       <dd>Move the cursor to the end of the line.</dd>
 
-      <dt class=command id=command_goLineLeft><code><strong>goLineLeft</strong></code></dt>
+      <dt class=command id=command_goLineLeft><code><strong>goLineLeft</strong></code><span class=keybinding>Cmd-Left (Mac)</span></dt>
       <dd>Move the cursor to the left side of the visual line it is on. If
       this line is wrapped, that may not be the start of the line.</dd>
 
-      <dt class=command id=command_goLineRight><code><strong>goLineRight</strong></code></dt>
+      <dt class=command id=command_goLineRight><code><strong>goLineRight</strong></code><span class=keybinding>Cmd-Right (Mac)</span></dt>
       <dd>Move the cursor to the right side of the visual line it is on.</dd>
 
       <dt class=command id=command_goLineUp><code><strong>goLineUp</strong></code><span class=keybinding>Up, Ctrl-P (Mac)</span></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index bf5d6baa2e..3fef17d95e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4687,6 +4687,20 @@
         return {from: Pos(range.from().line, 0), to: range.from()};
       });
     },
+    delWrappedLineLeft: function(cm) {
+      deleteNearSelection(cm, function(range) {
+        var top = cm.charCoords(range.head, "div").top + 5;
+        var leftPos = cm.coordsChar({left: 0, top: top}, "div");
+        return {from: leftPos, to: range.from()};
+      });
+    },
+    delWrappedLineRight: function(cm) {
+      deleteNearSelection(cm, function(range) {
+        var top = cm.charCoords(range.head, "div").top + 5;
+        var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
+        return {from: range.from(), to: rightPos };
+      });
+    },
     undo: function(cm) {cm.undo();},
     redo: function(cm) {cm.redo();},
     undoSelection: function(cm) {cm.undoSelection();},
@@ -4825,10 +4839,10 @@
   keyMap.macDefault = {
     "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
     "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
-    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineStart", "Cmd-Right": "goLineEnd", "Alt-Backspace": "delGroupBefore",
+    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
     "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
     "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
-    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delLineLeft",
+    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
     "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection",
     fallthrough: ["basic", "emacsy"]
   };

From 0392fd3bb51fe8b2ac0f385ff12e18299900630d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 11 Jul 2014 11:55:55 +0200
Subject: [PATCH 1446/4742] Catch and suppress input of certain code point on
 Mac

Ctrl-arrow key presses were, for some reason, inserting such characters
into our textarea.

Issue #2689
---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3fef17d95e..f52f7865c6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2388,8 +2388,11 @@
     var text = input.value;
     // If nothing changed, bail.
     if (text == prevInput && !cm.somethingSelected()) return false;
-    // Work around nonsensical selection resetting in IE9/10
-    if (ie && ie_version >= 9 && cm.display.inputHasSelection === text) {
+    // Work around nonsensical selection resetting in IE9/10, and
+    // inexplicable appearance of private area unicode characters on
+    // some key combos in Mac (#2689).
+    if (ie && ie_version >= 9 && cm.display.inputHasSelection === text ||
+        mac && /[\uf700-\uf7ff]/.test(text)) {
       resetInput(cm);
       return false;
     }

From f02df0b41300a1069ab5e0e3ebae3431b6b507b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Abdelkader=20Mart=C3=ADnez=20P=C3=A9rez?=
 <robertomartinezp@gmail.com>
Date: Sun, 6 Jul 2014 04:30:44 +0200
Subject: [PATCH 1447/4742] [lint addon] Do not constrain severity names

Issue #2681
---
 addon/lint/lint.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 604e2e6058..a87e70c09e 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -11,7 +11,6 @@
 })(function(CodeMirror) {
   "use strict";
   var GUTTER_ID = "CodeMirror-lint-markers";
-  var SEVERITIES = /^(?:error|warning)$/;
 
   function showTooltip(e, content) {
     var tt = document.createElement("div");
@@ -110,7 +109,7 @@
 
   function annotationTooltip(ann) {
     var severity = ann.severity;
-    if (!SEVERITIES.test(severity)) severity = "error";
+    if (!severity) severity = "error";
     var tip = document.createElement("div");
     tip.className = "CodeMirror-lint-message-" + severity;
     tip.appendChild(document.createTextNode(ann.message));
@@ -141,7 +140,7 @@
       for (var i = 0; i < anns.length; ++i) {
         var ann = anns[i];
         var severity = ann.severity;
-        if (!SEVERITIES.test(severity)) severity = "error";
+        if (!severity) severity = "error";
         maxSeverity = getMaxSeverity(maxSeverity, severity);
 
         if (options.formatAnnotation) ann = options.formatAnnotation(ann);

From 13acf661b6976badca64e69861f054111757084b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 14 Jul 2014 11:07:30 +0200
Subject: [PATCH 1448/4742] Don't treat %= as the start of a string

Closes #2692
---
 mode/ruby/ruby.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index d6c9d8796e..e7de7b57f1 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -69,7 +69,7 @@ CodeMirror.defineMode("ruby", function(config) {
       else if (stream.eat(/[WQ]/)) style = "string";
       else if (stream.eat(/[r]/)) style = "string-2";
       else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; }
-      var delim = stream.eat(/[^\w\s]/);
+      var delim = stream.eat(/[^\w\s=]/);
       if (!delim) return "operator";
       if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
       return chain(readQuoted(delim, style, embed, true), stream, state);

From f4ae5b42c929edc78c2df0888ae1b0179098652a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 15 Jul 2014 11:13:36 +0200
Subject: [PATCH 1449/4742] Track last copied text, in order to find selection
 boundaries on paste

Issue #2697
---
 lib/codemirror.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f52f7865c6..fcaaab28bd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2366,6 +2366,11 @@
     cm.display.poll.set(20, p);
   }
 
+  // This will be set to an array of strings when copying, so that,
+  // when pasting, we know what kind of selections the copied text
+  // was made out of.
+  var lastCopied = null;
+
   // Read input from the textarea, and update the document to match.
   // When something is selected, it is present in the textarea, and
   // selected (unless it is huge, in which case a placeholder is
@@ -2409,7 +2414,13 @@
     var inserted = text.slice(same), textLines = splitLines(inserted);
 
     // When pasing N lines into N selections, insert one line per selection
-    var multiPaste = cm.state.pasteIncoming && textLines.length > 1 && doc.sel.ranges.length == textLines.length;
+    var multiPaste = null;
+    if (cm.state.pasteIncoming && doc.sel.ranges.length > 1) {
+      if (lastCopied && lastCopied.join("\n") == inserted)
+        multiPaste = lastCopied.length == doc.sel.ranges.length && map(lastCopied, splitLines);
+      else if (textLines.length == doc.sel.ranges.length)
+        multiPaste = map(textLines, function(l) { return [l]; });
+    }
 
     // Normal behavior is to insert the new text into every selection
     for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
@@ -2422,7 +2433,7 @@
       else if (cm.state.overwrite && range.empty() && !cm.state.pasteIncoming)
         to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
       var updateInput = cm.curOp.updateInput;
-      var changeEvent = {from: from, to: to, text: multiPaste ? [textLines[i]] : textLines,
+      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i] : textLines,
                          origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"};
       makeChange(cm.doc, changeEvent);
       signalLater(cm, "inputRead", cm, changeEvent);
@@ -2589,27 +2600,29 @@
 
     function prepareCopyCut(e) {
       if (cm.somethingSelected()) {
+        lastCopied = cm.getSelections();
         if (d.inaccurateSelection) {
           d.prevInput = "";
           d.inaccurateSelection = false;
-          d.input.value = cm.getSelection();
+          d.input.value = lastCopied.join("\n");
           selectInput(d.input);
         }
       } else {
-        var text = "", ranges = [];
+        var text = [], ranges = [];
         for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
           var line = cm.doc.sel.ranges[i].head.line;
           var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
           ranges.push(lineRange);
-          text += cm.getRange(lineRange.anchor, lineRange.head);
+          text.push(cm.getRange(lineRange.anchor, lineRange.head));
         }
         if (e.type == "cut") {
           cm.setSelections(ranges, null, sel_dontScroll);
         } else {
           d.prevInput = "";
-          d.input.value = text;
+          d.input.value = text.join("\n");
           selectInput(d.input);
         }
+        lastCopied = text;
       }
       if (e.type == "cut") cm.state.cutIncoming = true;
     }

From bc87689c02950857049470355f20e8a29eb19639 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Jul 2014 10:04:41 +0200
Subject: [PATCH 1450/4742] Remove unused extra argument to
 computeSelAfterChange

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fcaaab28bd..0aad3fda68 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3549,7 +3549,7 @@
 
       antiChanges.push(historyChangeFromChange(doc, change));
 
-      var after = i ? computeSelAfterChange(doc, change, null) : lst(source);
+      var after = i ? computeSelAfterChange(doc, change) : lst(source);
       makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
       if (!i && doc.cm) doc.cm.scrollIntoView(change);
       var rebased = [];
@@ -3608,7 +3608,7 @@
 
     change.removed = getBetween(doc, change.from, change.to);
 
-    if (!selAfter) selAfter = computeSelAfterChange(doc, change, null);
+    if (!selAfter) selAfter = computeSelAfterChange(doc, change);
     if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
     else updateDoc(doc, change, spans);
     setSelectionNoUndo(doc, selAfter, sel_dontScroll);

From 59138ec896618d730046fda7002d57eef02bd6a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Jul 2014 12:55:59 +0200
Subject: [PATCH 1451/4742] [javascript mode] Indent properly in case of
 function arg in wrapped arg list

---
 mode/javascript/javascript.js | 2 ++
 mode/javascript/test.js       | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 315674be74..fdb066eb1f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -298,6 +298,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var result = function() {
       var state = cx.state, indent = state.indented;
       if (state.lexical.type == "stat") indent = state.lexical.indented;
+      else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev)
+        indent = outer.indented;
       state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
     };
     result.lex = true;
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index a9cc993d3d..77cc695fef 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -128,6 +128,12 @@
      "  [keyword else]",
      "    [number 3];");
 
+  MT("indent_funarg",
+     "[variable foo]([number 10000],",
+     "    [keyword function]([def a]) {",
+     "  [keyword debugger];",
+     "};");
+
   MT("indent_below_if",
      "[keyword for] (;;)",
      "  [keyword if] ([variable foo])",

From 2fa988d3b46d47a732bdbf6d5ac1f52f49b6a6e0 Mon Sep 17 00:00:00 2001
From: Sander AKA Redsandro <redsandro@gmail.com>
Date: Thu, 17 Jul 2014 16:44:50 +0200
Subject: [PATCH 1452/4742] Disable replace for readOnly content

Disable the `replace()` when the selected `CodeMirror` is `readOnly`.
---
 addon/search/search.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/search/search.js b/addon/search/search.js
index 3ce7cc95d8..b177dce6ed 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -110,6 +110,7 @@
   var replacementQueryDialog = 'With: <input type="text" style="width: 10em"/>';
   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) {
       if (!query) return;
       query = parseQuery(query);

From ddd36cb0b085358e797cd64ff08ed819005b9f60 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Sat, 5 Jul 2014 07:02:00 +0530
Subject: [PATCH 1453/4742] [vim] visual block replace

---
 keymap/vim.js    | 33 ++++++++++++++++++++++-----------
 test/vim_test.js | 13 +++++++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c1b0df4683..b239929f07 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2370,10 +2370,11 @@
         var curStart = cm.getCursor();
         var replaceTo;
         var curEnd;
-        if (vim.visualMode){
-          curStart=cm.getCursor('start');
-          curEnd=cm.getCursor('end');
-        }else{
+        var selections = cm.listSelections();
+        if (vim.visualMode) {
+          curStart = cm.getCursor('start');
+          curEnd = cm.getCursor('end');
+        } else {
           var line = cm.getLine(curStart.line);
           replaceTo = curStart.ch + actionArgs.repeat;
           if (replaceTo > line.length) {
@@ -2381,19 +2382,29 @@
           }
           curEnd = Pos(curStart.line, replaceTo);
         }
-        if (replaceWith=='\n'){
+        if (replaceWith=='\n') {
           if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
           // special case, where vim help says to replace by just one line-break
           (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
-        }else {
-          var replaceWithStr=cm.getRange(curStart, curEnd);
+        } else {
+          var replaceWithStr = cm.getRange(curStart, curEnd);
           //replace all characters in range by selected, but keep linebreaks
-          replaceWithStr=replaceWithStr.replace(/[^\n]/g,replaceWith);
-          cm.replaceRange(replaceWithStr, curStart, curEnd);
-          if (vim.visualMode){
+          replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
+          if (vim.visualBlock) {
+            // Tabs are split in visua block before replacing
+            var spaces = new Array(cm.options.tabSize+1).join(' ');
+            replaceWithStr = cm.getSelection();
+            replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
+            cm.replaceSelections(replaceWithStr);
+          } else {
+            cm.replaceRange(replaceWithStr, curStart, curEnd);
+          }
+          if (vim.visualMode) {
+            curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ?
+                         selections[0].anchor : selections[0].head;
             cm.setCursor(curStart);
             exitVisualMode(cm);
-          }else{
+          } else {
             cm.setCursor(offsetCursor(curEnd, 0, -1));
           }
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index 76a2699780..342737de52 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1332,6 +1332,19 @@ testVim('r', function(cm, vim, helpers) {
   helpers.doKeys('v', 'j', 'h', 'r', '<Space>');
   eq('wuuu  \n    her', cm.getValue(),'Replacing selection by space-characters failed');
 }, { value: 'wordet\nanother' });
+testVim('r_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(2, 3);
+  helpers.doKeys('<C-v>', 'k', 'k', 'h', 'h', 'r', 'l');
+  eq('1lll\n5lll\nalllefg', cm.getValue());
+  helpers.doKeys('<C-v>', 'l', 'j', 'r', '<Space>');
+  eq('1  l\n5  l\nalllefg', cm.getValue());
+  cm.setCursor(2, 0);
+  helpers.doKeys('o');
+  helpers.doInsertModeKeys('Esc');
+  cm.replaceRange('\t\t', cm.getCursor());
+  helpers.doKeys('<C-v>', 'h', 'h', 'r', 'r');
+  eq('1  l\n5  l\nalllefg\nrrrrrrrr', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
 testVim('R', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('R');

From bce69920dfdce2b5eeb910bf7a7cff147a3bd5ca Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Tue, 15 Jul 2014 05:32:25 +0530
Subject: [PATCH 1454/4742] [vim] changeCase for blockwise visual

---
 keymap/vim.js    | 89 +++++++++++++++++++++++++++++++++++-------------
 test/vim_test.js | 16 +++++++--
 2 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b239929f07..e7bb885bf2 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2348,6 +2348,9 @@
           }
         }
         cm.setCursor(curPosFinal);
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
       },
       undo: function(cm, actionArgs) {
         cm.operation(function() {
@@ -2449,17 +2452,26 @@
         repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
       },
       changeCase: function(cm, actionArgs, vim) {
-        var selectedAreaRange = getSelectedAreaRange(cm, vim);
-        var selectionStart = selectedAreaRange[0];
-        var selectionEnd = selectedAreaRange[1];
+        var selectionStart = getSelectedAreaRange(cm, vim)[0];
+        var text = cm.getSelection();
+        var lastSelectionCurEnd;
+        var blockSelection;
+        if (vim.lastSelection) {
         // save the curEnd marker to avoid its removal due to cm.replaceRange
-        var lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
+          lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
+          blockSelection = vim.lastSelection.visualBlock;
+        }
         var toLower = actionArgs.toLower;
-        var text = cm.getRange(selectionStart, selectionEnd);
-        cm.replaceRange(toLower ? text.toLowerCase() : text.toUpperCase(), selectionStart, selectionEnd);
+        text = toLower ? text.toLowerCase() : text.toUpperCase();
+        cm.replaceSelections(vim.visualBlock || blockSelection ? text.split('\n') : [text]);
         // restore the last selection curEnd marker
-        vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
+        if (lastSelectionCurEnd) {
+          vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
+        }
         cm.setCursor(selectionStart);
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
       }
     };
 
@@ -2623,27 +2635,56 @@
       return -1;
     }
     function getSelectedAreaRange(cm, vim) {
-      var selectionStart = cm.getCursor('anchor');
-      var selectionEnd = cm.getCursor('head');
       var lastSelection = vim.lastSelection;
-      if (!vim.visualMode) {
-        var lastSelectionCurStart = vim.lastSelection.curStartMark.find();
-        var lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
-        var line = lastSelectionCurEnd.line - lastSelectionCurStart.line;
-        var ch = line ? lastSelectionCurEnd.ch : lastSelectionCurEnd.ch - lastSelectionCurStart.ch;
-        selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
-        if (lastSelection.visualLine) {
-          return [{line: selectionStart.line, ch: 0}, {line: selectionEnd.line, ch: lineLength(cm, selectionEnd.line)}];
+      var getCurrentSelectedAreaRange = function() {
+        var selections = cm.listSelections();
+        var start =  selections[0];
+        var end = selections[selections.length-1];
+        var selectionStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
+        var selectionEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
+        return [selectionStart, selectionEnd];
+      };
+      var getLastSelectedAreaRange = function() {
+        var start = lastSelection.curStartMark.find();
+        var end = lastSelection.curEndMark.find();
+        var selectionStart = cm.getCursor();
+        var selectionEnd = cm.getCursor();
+        if (lastSelection.visualBlock) {
+          var anchor = Pos(Math.min(start.line, end.line), Math.min(start.ch, end.ch));
+          var head = Pos(Math.max(start.line, end.line), Math.max(start.ch, end.ch));
+          var width = head.ch - anchor.ch;
+          var height = head.line - anchor.line;
+          selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
+          var endCh = cm.clipPos(selectionEnd).ch;
+          // We do not want selection crossing while selecting here.
+          // So, we cut down the selection.
+          while (endCh != selectionEnd.ch) {
+            if (endCh-1 == selectionStart.ch) {
+              break;
+            }
+            selectionEnd.line--;
+            endCh = cm.clipPos(selectionEnd).ch;
+          }
+          cm.setCursor(selectionStart);
+          selectBlock(cm, selectionEnd);
+        } else {
+          var line = end.line - start.line;
+          var ch = end.ch - start.ch;
+          selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
+          if (lastSelection.visualLine) {
+            selectionStart = Pos(selectionStart.line, 0);
+            selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
+          }
+          cm.setSelection(selectionStart, selectionEnd);
         }
+        return [selectionStart, selectionEnd];
+      };
+      if (!vim.visualMode) {
+      // In case of replaying the action.
+        return getLastSelectedAreaRange();
       } else {
-        if (cursorIsBefore(selectionEnd, selectionStart)) {
-          var tmp = selectionStart;
-          selectionStart = selectionEnd;
-          selectionEnd = tmp;
-        }
-        exitVisualMode(cm);
+        return getCurrentSelectedAreaRange();
       }
-      return [selectionStart, selectionEnd];
     }
     function updateLastSelection(cm, vim, selectionStart, selectionEnd) {
       if (!selectionStart || !selectionEnd) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 342737de52..2fb1843169 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1683,7 +1683,7 @@ testVim('reselect_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('g', 'v');
   // here the fake cursor is at (1, 3)
-  helpers.assertCursorAt(2, 0);
+  helpers.assertCursorAt(1, 4);
   eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
   helpers.doKeys('v');
   cm.setCursor(2, 0);
@@ -1753,7 +1753,7 @@ testVim('o_visual_block', function(cm, vim, helpers) {
   helpers.doKeys('o');
   helpers.assertCursorAt(3, 1);
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
-testVim('uppercase/lowercase_visual', function(cm, vim, helpers) {
+testVim('changeCase_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('v', 'l', 'l');
   helpers.doKeys('U');
@@ -1772,6 +1772,18 @@ testVim('uppercase/lowercase_visual', function(cm, vim, helpers) {
   helpers.doKeys('V', 'U', 'j', '.');
   eq('ABCDEF\nGHIJKL\nMnopq\nSHORT LINE\nLONG LINE OF TEXT', cm.getValue());
 }, { value: 'abcdef\nghijkl\nmnopq\nshort line\nlong line of text'});
+testVim('changeCase_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(2, 1);
+  helpers.doKeys('<C-v>', 'k', 'k', 'h', 'U');
+  eq('ABcdef\nGHijkl\nMNopq\nfoo', cm.getValue());
+  cm.setCursor(0, 2);
+  helpers.doKeys('.');
+  eq('ABCDef\nGHIJkl\nMNOPq\nfoo', cm.getValue());
+  // check when last line is shorter.
+  cm.setCursor(2, 2);
+  helpers.doKeys('.');
+  eq('ABCDef\nGHIJkl\nMNOPq\nfoO', cm.getValue());
+}, { value: 'abcdef\nghijkl\nmnopq\nfoo'});
 testVim('visual_paste', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('v', 'l', 'l', 'y', 'j', 'v', 'l', 'p');

From 9312c712a80d665e569e29ea8448e6bb52c03b69 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Fri, 18 Jul 2014 05:30:15 +0530
Subject: [PATCH 1455/4742] [vim] using dot to replay actions and operators

---
 keymap/vim.js    | 111 ++++++++++++++++++++++++++++++++---------------
 test/vim_test.js |  17 +++++++-
 2 files changed, 92 insertions(+), 36 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index e7bb885bf2..16f51b3bf1 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1411,6 +1411,7 @@
         if (operator) {
           var inverted = false;
           vim.lastMotion = null;
+          var lastSelection = vim.lastSelection;
           operatorArgs.repeat = repeat; // Indent in visual mode needs this.
           if (vim.visualMode) {
             curStart = selectionStart;
@@ -1437,6 +1438,24 @@
             curEnd.line = curStart.line + operatorArgs.selOffset.line;
             if (operatorArgs.selOffset.line) {curEnd.ch = operatorArgs.selOffset.ch; }
             else { curEnd.ch = curStart.ch + operatorArgs.selOffset.ch; }
+            // In case of blockwise visual
+            if (lastSelection && lastSelection.visualBlock) {
+              var block = lastSelection.visualBlock;
+              var width = block.width;
+              var height = block.height;
+              curEnd = Pos(curStart.line + height, curStart.ch + width);
+              // selectBlock creates a 'proper' rectangular block.
+              // We do not want that in all cases, so we manually set selections.
+              var selections = [];
+              for (var i = curStart.line; i < curEnd.line; i++) {
+                var anchor = Pos(i, curStart.ch);
+                var head = Pos(i, curEnd.ch);
+                var range = {anchor: anchor, head: head};
+                selections.push(range);
+              }
+              cm.setSelections(selections);
+              var blockSelected = true;
+            }
           } else if (vim.visualMode) {
             var selOffset = Pos();
             selOffset.line = curEnd.line - curStart.line;
@@ -1457,8 +1476,8 @@
           operatorArgs.registerName = registerName;
           // Keep track of linewise as it affects how paste and change behave.
           operatorArgs.linewise = linewise;
-          if (!vim.visualBlock) {
-            cm.extendSelection(curStart, curEnd);
+          if (!vim.visualBlock && !blockSelected) {
+            cm.setSelection(curStart, curEnd);
           }
           operators[operator](cm, operatorArgs, vim, curStart,
               curEnd, curOriginal);
@@ -1838,6 +1857,8 @@
         var curEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
         var text = cm.getSelection();
         var replacement = new Array(selections.length).join('1').split('1');
+        // save the selectionEnd mark
+        var selectionEnd = vim.marks['>'] ? vim.marks['>'].find() : cm.getCursor('head');
         vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'change', text,
             operatorArgs.linewise);
@@ -1880,34 +1901,52 @@
             cm.replaceRange('', curStart, curEnd);
           }
         }
+        vim.marks['>'] = cm.setBookmark(selectionEnd);
         actions.enterInsertMode(cm, {}, cm.state.vim);
       },
       // delete is a javascript keyword.
-      'delete': function(cm, operatorArgs, vim, curStart, curEnd) {
+      'delete': function(cm, operatorArgs, vim) {
+        var selections = cm.listSelections();
+        var start = selections[0], end = selections[selections.length-1];
+        var curStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
+        var curEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
         // Save the '>' mark before cm.replaceRange clears it.
-        var selectionEnd = vim.visualMode ? vim.marks['>'].find() : null;
+        var selectionEnd, selectionStart;
+        if (vim.visualMode) {
+          selectionEnd = vim.marks['>'].find();
+          selectionStart = vim.marks['<'].find();
+        } else if (vim.lastSelection) {
+          selectionEnd = vim.lastSelection.curStartMark.find();
+          selectionStart = vim.lastSelection.curEndMark.find();
+        }
         var text = cm.getSelection();
+        vimGlobalState.registerController.pushText(
+            operatorArgs.registerName, 'delete', text,
+            operatorArgs.linewise);
+        var replacement = new Array(selections.length).join('1').split('1');
         // If the ending line is past the last line, inclusive, instead of
         // including the trailing \n, include the \n before the starting line
         if (operatorArgs.linewise &&
-            curEnd.line > cm.lastLine() && curStart.line > cm.firstLine()) {
+            curEnd.line == cm.lastLine() && curStart.line == curEnd.line) {
+          var tmp = copyCursor(curEnd);
           curStart.line--;
           curStart.ch = lineLength(cm, curStart.line);
-        }
-        vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'delete', text,
-            operatorArgs.linewise);
-        if (vim.visualBlock) {
-          var selections = cm.listSelections();
-          curStart = selections[0].anchor;
-          var replacement = new Array(selections.length).join('1').split('1');
-          cm.replaceSelections(replacement);
-        } else {
+          curEnd = tmp;
           cm.replaceRange('', curStart, curEnd);
+        } else {
+          cm.replaceSelections(replacement);
         }
         // restore the saved bookmark
         if (selectionEnd) {
-          vim.marks['>'] = cm.setBookmark(selectionEnd);
+          var curStartMark = cm.setBookmark(selectionStart);
+          var curEndMark = cm.setBookmark(selectionEnd);
+          if (vim.visualMode) {
+            vim.marks['<'] = curStartMark;
+            vim.marks['>'] = curEndMark;
+          } else {
+            vim.lastSelection.curStartMark = curStartMark;
+            vim.lastSelection.curEndMark = curEndMark;
+          }
         }
         if (operatorArgs.linewise) {
           cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
@@ -2645,29 +2684,26 @@
         return [selectionStart, selectionEnd];
       };
       var getLastSelectedAreaRange = function() {
-        var start = lastSelection.curStartMark.find();
-        var end = lastSelection.curEndMark.find();
         var selectionStart = cm.getCursor();
         var selectionEnd = cm.getCursor();
-        if (lastSelection.visualBlock) {
-          var anchor = Pos(Math.min(start.line, end.line), Math.min(start.ch, end.ch));
-          var head = Pos(Math.max(start.line, end.line), Math.max(start.ch, end.ch));
-          var width = head.ch - anchor.ch;
-          var height = head.line - anchor.line;
+        var block = lastSelection.visualBlock;
+        if (block) {
+          var width = block.width;
+          var height = block.height;
           selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
-          var endCh = cm.clipPos(selectionEnd).ch;
-          // We do not want selection crossing while selecting here.
-          // So, we cut down the selection.
-          while (endCh != selectionEnd.ch) {
-            if (endCh-1 == selectionStart.ch) {
-              break;
-            }
-            selectionEnd.line--;
-            endCh = cm.clipPos(selectionEnd).ch;
+          var selections = [];
+          // selectBlock creates a 'proper' rectangular block.
+          // We do not want that in all cases, so we manually set selections.
+          for (var i = selectionStart.line; i < selectionEnd.line; i++) {
+            var anchor = Pos(i, selectionStart.ch);
+            var head = Pos(i, selectionEnd.ch);
+            var range = {anchor: anchor, head: head};
+            selections.push(range);
           }
-          cm.setCursor(selectionStart);
-          selectBlock(cm, selectionEnd);
+          cm.setSelections(selections);
         } else {
+          var start = lastSelection.curStartMark.find();
+          var end = lastSelection.curEndMark.find();
           var line = end.line - start.line;
           var ch = end.ch - start.ch;
           selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
@@ -2700,13 +2736,18 @@
       // This check ensures to set the cursor
       // position where we left off in previous selection
       var swap = getIndex(ranges, selectionStart) > -1;
+      if (vim.visualBlock) {
+        var height = Math.abs(selectionStart.line - selectionEnd.line)+1;
+        var width =  Math.abs(selectionStart.ch - selectionEnd.ch);
+        var block = {height: height, width: width};
+      }
       // can't use selection state here because yank has already reset its cursor
       // Also, Bookmarks make the visual selections robust to edit operations
       vim.lastSelection = {'curStartMark': cm.setBookmark(swap ? selectionEnd : selectionStart),
                            'curEndMark': cm.setBookmark(swap ? selectionStart : selectionEnd),
                            'visualMode': vim.visualMode,
                            'visualLine': vim.visualLine,
-                           'visualBlock': vim.visualBlock};
+                           'visualBlock': block};
     }
 
     function exitVisualMode(cm) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 2fb1843169..7c24634a89 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -944,7 +944,22 @@ testVim('visual_block_~', function(cm, vim, helpers) {
   helpers.assertCursorAt(2, 0);
   eq('hello\nwoRLd\nAbcDe', cm.getValue());
 },{value: 'hello\nwOrld\nabcde' });
-
+testVim('._swapCase_visualBlock', function(cm, vim, helpers) {
+  helpers.doKeys('<C-v>', 'j', 'j', 'l', '~');
+  cm.setCursor(0, 3);
+  helpers.doKeys('.');
+  eq('HelLO\nWorLd\nAbcdE', cm.getValue());
+},{value: 'hEllo\nwOrlD\naBcDe' });
+testVim('._delete_visualBlock', function(cm, vim, helpers) {
+  helpers.doKeys('<C-v>', 'j', 'x');
+  eq('ive\ne\nsome\nsugar', cm.getValue());
+  helpers.doKeys('.');
+  eq('ve\n\nsome\nsugar', cm.getValue());
+  helpers.doKeys('j', 'j', '.');
+  eq('ve\n\nome\nugar', cm.getValue());
+  helpers.doKeys('u', '<C-r>', '.');
+  eq('ve\n\nme\ngar', cm.getValue());
+},{value: 'give\nme\nsome\nsugar' });
 testVim('>{motion}', function(cm, vim, helpers) {
   cm.setCursor(1, 3);
   var expectedLineCount = cm.lineCount();

From 252a9d6cb8afd782762bf10c75760cbbd75a5c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Sat, 12 Jul 2014 20:20:08 -0400
Subject: [PATCH 1456/4742] [clike mode] Enable multilineString for scala

It is a good approximation
---
 mode/clike/clike.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 3e253624b4..2873e3629b 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -369,6 +369,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
 
     ),
+    multiLineStrings: true,
     blockKeywords: words("catch class do else finally for forSome if match switch try while"),
     atoms: words("true false null"),
     hooks: {

From 58d2a8a8b28e6f45ca98729952870de92184cf05 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 20 Jul 2014 09:34:51 +0200
Subject: [PATCH 1457/4742] [yaml mode] Be less restrictive about keys in front
 of colons

Issue #2695
---
 mode/yaml/yaml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index 4ebe5c81cf..15a5916df1 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -80,7 +80,7 @@ CodeMirror.defineMode("yaml", function() {
       }
 
       /* pairs (associative arrays) -> key */
-      if (!state.pair && stream.match(/^\s*\S+(?=\s*:($|\s))/i)) {
+      if (!state.pair && stream.match(/^\s*[^\-:{}"\[\]][^:{}"\[\]]*(?=\s*:($|\s))/i)) {
         state.pair = true;
         state.keyCol = stream.indentation();
         return "atom";

From dff9738301bedfc57e0a3f3a2168edb05fd5dcf9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 20 Jul 2014 09:41:56 +0200
Subject: [PATCH 1458/4742] [puppet mode] Make regexp for regexps non-greedy

Issue #2696
---
 mode/puppet/puppet.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/puppet/puppet.js b/mode/puppet/puppet.js
index 66698bb6ad..b407ded883 100644
--- a/mode/puppet/puppet.js
+++ b/mode/puppet/puppet.js
@@ -176,7 +176,7 @@ CodeMirror.defineMode("puppet", function () {
     // Match characters that we are going to assume
     // are trying to be regex
     if (ch == '/') {
-      stream.match(/.*\//);
+      stream.match(/.*?\//);
       return 'variable-3';
     }
     // Match all the numbers

From 4e7e863c0e34f9fc450351d408a3f585d3843549 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 20 Jul 2014 10:26:22 +0200
Subject: [PATCH 1459/4742] Remove a few unneccesary property accesses

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0aad3fda68..8b3feac507 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3815,7 +3815,7 @@
     if (how == "smart") {
       // Fall back to "prev" when the mode doesn't have an indentation
       // method.
-      if (!cm.doc.mode.indent) how = "prev";
+      if (!doc.mode.indent) how = "prev";
       else state = getStateBefore(cm, n);
     }
 
@@ -3827,7 +3827,7 @@
       indentation = 0;
       how = "not";
     } else if (how == "smart") {
-      indentation = cm.doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
+      indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
       if (indentation == Pass || indentation > 150) {
         if (!aggressive) return;
         how = "prev";
@@ -3851,7 +3851,7 @@
     if (pos < indentation) indentString += spaceStr(indentation - pos);
 
     if (indentString != curSpaceString) {
-      replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
+      replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
     } 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.

From 1ddba34bb6e467282eeda6a79bd16c9650668169 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 20 Jul 2014 10:56:24 +0200
Subject: [PATCH 1460/4742] Force stable y scroll when focusing textarea in
 onContextMenu

Closes #2712
---
 lib/codemirror.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8b3feac507..09ea0a3134 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3319,7 +3319,9 @@
       "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
       (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
       "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
+    if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
     focusInput(cm);
+    if (webkit) window.scrollTo(null, oldScrollY);
     resetInput(cm);
     // Adds "Select all" to context menu in FF
     if (!cm.somethingSelected()) display.input.value = display.prevInput = " ";

From 1d35536ee0f23be031beba12309a38db9f49b4d5 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 20 Jul 2014 14:01:11 -0700
Subject: [PATCH 1461/4742] [vim] Do not open prompt if no cm.openDialog

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 16f51b3bf1..a47b005d02 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -561,7 +561,9 @@
     MacroModeState.prototype = {
       exitMacroRecordMode: function() {
         var macroModeState = vimGlobalState.macroModeState;
-        macroModeState.onRecordingDone(); // close dialog
+        if (macroModeState.onRecordingDone) {
+          macroModeState.onRecordingDone(); // close dialog
+        }
         macroModeState.onRecordingDone = undefined;
         macroModeState.isRecording = false;
       },
@@ -571,8 +573,10 @@
         if (register) {
           register.clear();
           this.latestRegister = registerName;
-          this.onRecordingDone = cm.openDialog(
-              '(recording)['+registerName+']', null, {bottom:true});
+          if (cm.openDialog) {
+            this.onRecordingDone = cm.openDialog(
+                '(recording)['+registerName+']', null, {bottom:true});
+          }
           this.isRecording = true;
         }
       }

From 1d4b525f8127e79aaee811ff2b6972a3fa76a7bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Jul 2014 08:28:07 +0200
Subject: [PATCH 1462/4742] [yaml mode] Tweak key regexp

Issue #2695
---
 mode/yaml/yaml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index 15a5916df1..332aef6a23 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -80,7 +80,7 @@ CodeMirror.defineMode("yaml", function() {
       }
 
       /* pairs (associative arrays) -> key */
-      if (!state.pair && stream.match(/^\s*[^\-:{}"\[\]][^:{}"\[\]]*(?=\s*:($|\s))/i)) {
+      if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)) {
         state.pair = true;
         state.keyCol = stream.indentation();
         return "atom";

From e02b946bfdf68ac4c3933b99e119a8fa9898efb6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Jul 2014 08:33:42 +0200
Subject: [PATCH 1463/4742] Also split pasted content by selection when
 selection length is a multiple of clipboard length

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 09ea0a3134..31c6d71be5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2417,7 +2417,7 @@
     var multiPaste = null;
     if (cm.state.pasteIncoming && doc.sel.ranges.length > 1) {
       if (lastCopied && lastCopied.join("\n") == inserted)
-        multiPaste = lastCopied.length == doc.sel.ranges.length && map(lastCopied, splitLines);
+        multiPaste = doc.sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
       else if (textLines.length == doc.sel.ranges.length)
         multiPaste = map(textLines, function(l) { return [l]; });
     }
@@ -2433,7 +2433,7 @@
       else if (cm.state.overwrite && range.empty() && !cm.state.pasteIncoming)
         to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
       var updateInput = cm.curOp.updateInput;
-      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i] : textLines,
+      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
                          origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"};
       makeChange(cm.doc, changeEvent);
       signalLater(cm, "inputRead", cm, changeEvent);

From ee088bc36b3fca2771835cc42febcabeb19e791c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Haso=C5=88?= <martin.hason@gmail.com>
Date: Mon, 14 Jul 2014 08:32:17 +0200
Subject: [PATCH 1464/4742] [bower.json] Normalized a package name

The package name on http://bower.io/search/ is lowercase.
---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index b103179156..407b86d649 100644
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "CodeMirror",
+  "name": "codemirror",
   "version":"4.3.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [

From 485a7da897e378025268e686f4eb79377973219e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Jul 2014 08:51:28 +0200
Subject: [PATCH 1465/4742] Mark release 4.4

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

diff --git a/AUTHORS b/AUTHORS
index f5f569721e..0c2f67c31a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ Alberto Pose
 Albert Xing
 Alexander Pavlov
 Alexander Schepanovski
+Alexander Shvets
 Alexander Solovyov
 Alexandre Bique
 alexey-k
@@ -168,6 +169,7 @@ Jason Grout
 Jason Johnston
 Jason San Jose
 Jason Siefken
+Jaydeep Solanki
 Jean Boussier
 jeffkenton
 Jeff Pickhardt
@@ -205,6 +207,7 @@ kubelsmieci
 Lanny
 Laszlo Vidacs
 leaf corcoran
+Leonid Khachaturov
 Leonya Khachaturov
 Liam Newman
 LM
@@ -269,6 +272,7 @@ Niels van Groningen
 Nikita Beloglazov
 Nikita Vasilyev
 Nikolay Kostov
+nilp0inter
 nlwillia
 pablo
 Page
@@ -291,7 +295,9 @@ Radek Piórkowski
 Rahul
 Randy Edmunds
 Rasmus Erik Voel Jensen
+Richard van der Meer
 Richard Z.H. Wang
+Roberto Abdelkader Martínez Pérez
 robertop23
 Robert Plummer
 Ruslan Osmanov
@@ -299,6 +305,7 @@ Ryan Prior
 sabaca
 Samuel Ainsworth
 sandeepshetty
+Sander AKA Redsandro
 santec
 Sascha Peilicke
 satchmorun
@@ -330,6 +337,7 @@ Thaddee Tyl
 think
 Thomas Dvornik
 Thomas Schmid
+Tim Alby
 Tim Baumann
 Timothy Farrell
 Timothy Hatcher
@@ -349,6 +357,7 @@ Volker Mische
 wenli
 Wesley Wiser
 William Jamieson
+William Stein
 Wojtek Ptak
 Xavier Mendez
 YNH Webdev
diff --git a/bower.json b/bower.json
index 407b86d649..8c57fcdd4b 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.3.1",
+  "version":"4.4.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index ede45e1c6e..859210c45c 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.4.0;f=">4.4</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.3.0;f=">4.3</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.2.1;f=">4.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.2.0;f=">4.2</option>
diff --git a/doc/manual.html b/doc/manual.html
index ed0d076a9f..31d08f5e99 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 4.3.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.4.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 ea5f98d3d8..354084b0da 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,20 @@ <h2>Release notes and version history</h2>
 
   <h2 id="v4">Version 4.x</h2>
 
+  <p class="rel">21-07-2014: <a href="http://codemirror.net/codemirror-4.4.zip">Version 4.4</a>:</p>
+
+  <ul class="rel-note">
+    <li><strong>Note:</strong> Some events might now fire in slightly
+    different order (<code>"change"</code> is still guaranteed to fire
+    before <code>"cursorActivity"</code>)</li>
+    <li>Nested operations in multiple editors are now synced (complete
+    at same time, reducing DOM reflows)</li>
+    <li>Visual block mode for <a href="../demo/vim.html">vim</a> (&lt;C-v>) is nearly complete</li>
+    <li>New mode: <a href="../mode/kotlin/index.html">Kotlin</a></li>
+    <li>Better multi-selection paste for text copied from multiple CodeMirror selections</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.3.0...4.4.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">23-06-2014: <a href="http://codemirror.net/codemirror-4.3.zip">Version 4.3</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index d5cbece193..19f0365a38 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.3</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.4</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 31c6d71be5..95856424c9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7795,7 +7795,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.3.1";
+  CodeMirror.version = "4.4.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index a496af340e..d3bcbb7556 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.3.1",
+    "version":"4.4.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From d894811c14be2f6a74fa31520f74ba1487894054 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Jul 2014 08:52:35 +0200
Subject: [PATCH 1466/4742] Bump version number post-4.4

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

diff --git a/bower.json b/bower.json
index 8c57fcdd4b..3ea24094d7 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.4.0",
+  "version":"4.4.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 31d08f5e99..5f1b0dcc46 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 4.4.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.4.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 95856424c9..96878b219d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7795,7 +7795,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.4.0";
+  CodeMirror.version = "4.4.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index d3bcbb7556..467658ddf3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.4.0",
+    "version":"4.4.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 466319fc1648b6c65d3886ce0f984dc9905fbc56 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Jul 2014 14:56:01 +0200
Subject: [PATCH 1467/4742] [real-world uses] Add Codeanywhere

---
 doc/realworld.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index d730e411b2..5d902a0f6b 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -39,8 +39,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
       <li><a href="http://codeworld.info/">CodeWorld</a> (Haskell playground)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
-      <li><a href="http://www.crossui.com/">CrossUI</a> (cross-platform UI builder)</li>
-      <li><a href="http://rsnous.com/cruncher/">Cruncher</a> (notepad with calculation features)</li>
+      <li><a href="https://codeanywhere.com/">Codeanywhere</a> (multi-platform cloud editor)</li>
       <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>
       <li><a href="http://www.codebugapp.com/">Codebug</a> (PHP Xdebug front-end)</li>
       <li><a href="https://github.com/angelozerr/CodeMirror-Eclipse">CodeMirror Eclipse</a> (embed CM in Eclipse)</li>
@@ -59,6 +58,8 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>
       <li><a href="http://www.compilejava.net/">compilejava.net</a> (online Java sandbox)</li>
       <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>
+      <li><a href="http://www.crossui.com/">CrossUI</a> (cross-platform UI builder)</li>
+      <li><a href="http://rsnous.com/cruncher/">Cruncher</a> (notepad with calculation features)</li>
       <li><a href="http://www.crudzilla.com/">Crudzilla</a> (self-hosted web IDE)</li>
       <li><a href="http://cssdeck.com/">CSSDeck</a> (CSS showcase)</li>
       <li><a href="http://ireneros.com/deck/deck.js-codemirror/introduction/#textarea-code">Deck.js integration</a> (slides with editors)</li>

From 2ae5509706110cd679e6640b633a463a2c85b467 Mon Sep 17 00:00:00 2001
From: gekkoe <gekkoe808@gmail.com>
Date: Tue, 22 Jul 2014 06:33:45 -0700
Subject: [PATCH 1468/4742] [vim] Generalized two-letter ESC sequences for
 insert mode

You can now edit vim.js and set enableEscKeymap to true and tweak
any related settings that you see fit and have a two-character
sequence to ESC from insert mode.
---
 keymap/vim.js | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a47b005d02..7b980c4222 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -638,7 +638,19 @@
         // search history buffer
         searchHistoryController: new HistoryController({}),
         // ex Command history buffer
-        exCommandHistoryController : new HistoryController({})
+        exCommandHistoryController : new HistoryController({}),
+        // To enable a special two-character keymap sequence for ESC, set this to true.
+        enableEscKeymap: false,
+        // Use these two variables to customize the two-character ESC keymap.
+        // If you want to use characters other than i j or k you'll have to add
+        // lines to the vim-insert and await-second keymaps later in this file.
+        firstEscCharacter: 'k',
+        secondEscCharacter: 'j',
+        // The timeout in milliseconds for the two-character ESC keymap should be
+        // adjusted according to your typing speed to prevent false positives.
+        escSequenceTimeout: 100,
+        // Used by two-character ESC keymap routines. Should not be changed from false here.
+        awaitingEscapeSecondCharacter: false
       };
       for (var optionName in options) {
         var option = options[optionName];
@@ -4522,6 +4534,42 @@
       }
     }
 
+    function firstEscCharacterHandler(ch){
+      if(vimGlobalState.enableEscKeymap === false || vimGlobalState.firstEscCharacter !== ch){
+        // This is not the handler you're looking for. Just insert as usual.
+        return function(cm){
+          cm.replaceRange(ch, cm.getCursor(), cm.getCursor(), "+input");
+        };
+      } else {
+        return function(cm){
+          cm.replaceRange(ch, cm.getCursor(), cm.getCursor(), "+input");
+          cm.setOption('keyMap', 'await-second');
+          vimGlobalState.awaitingEscapeSecondCharacter = true;
+          setTimeout(function(){
+                if(vimGlobalState.awaitingEscapeSecondCharacter === true) {
+                    vimGlobalState.awaitingEscapeSecondCharacter = false;
+                    cm.setOption('keyMap', 'vim-insert');
+                }
+            }, vimGlobalState.escSequenceTimeout);
+        };
+      }
+    }
+    function secondEscCharacterHandler(ch){
+      if(vimGlobalState.enableEscKeymap === false || vimGlobalState.secondEscCharacter !== ch) {
+        // This is not the handler you're looking for. Just insert as usual.
+        return function(cm){
+          cm.replaceRange(ch, cm.getCursor(), cm.getCursor(), "+input");
+        };
+      } else {
+        return function(cm) {
+          vimGlobalState.awaitingEscapeSecondCharacter = false;
+          cm.replaceRange('', {ch: cm.getCursor().ch - 1, line: cm.getCursor().line},
+                          cm.getCursor(), "+input");
+          exitInsertMode(cm);
+        };
+      }
+    }
+
     CodeMirror.keyMap['vim-insert'] = {
       // TODO: override navigation keys so that Esc will cancel automatic
       // indentation from o, O, i_<CR>
@@ -4535,9 +4583,30 @@
             CodeMirror.commands.newlineAndIndent;
         fn(cm);
       },
+      // The next few lines are where you'd add additional handlers if
+      // you wanted to use keys other than i j and k for two-character
+      // escape sequences. Don't forget to add them in the await-second
+      // section as well.
+      //
+      // Known Issue: Macro recording becomes polluted with the first
+      //              character of your sequence each time you use it.
+      //              Until this is fixed, use the actual ESC key during
+      //              macro recording. Most likely the removal of the
+      //              first character from the buffer in the function
+      //              secondEscCharacterHandler is what needs fixing.
+      "'i'": function(cm){var f = firstEscCharacterHandler('i'); f(cm);},
+      "'j'": function(cm){var f = firstEscCharacterHandler('j'); f(cm);},
+      "'k'": function(cm){var f = firstEscCharacterHandler('k'); f(cm);},
       fallthrough: ['default']
     };
 
+    CodeMirror.keyMap['await-second'] = {
+      "'i'": function(cm){var f = secondEscCharacterHandler('i'); f(cm);},
+      "'j'": function(cm){var f = secondEscCharacterHandler('j'); f(cm);},
+      "'k'": function(cm){var f = secondEscCharacterHandler('k'); f(cm);},
+      fallthrough: ['vim-insert']
+    };
+
     CodeMirror.keyMap['vim-replace'] = {
       'Backspace': 'goCharLeft',
       fallthrough: ['vim-insert']

From 4d257877e326fac07f114e43b4b051c9a613ed08 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 22 Jul 2014 11:23:46 -0700
Subject: [PATCH 1469/4742] [vim] Add vim options for insert mode esc keys and
 cleanup

---
 keymap/vim.js | 83 +++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 7b980c4222..837c1814bb 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -616,7 +616,9 @@
           visualLine: false,
           visualBlock: false,
           lastSelection: null,
-          lastPastedText: null
+          lastPastedText: null,
+          // Used by two-character ESC keymap routines. Should not be changed from false here.
+          awaitingEscapeSecondCharacter: false
         };
       }
       return cm.state.vim;
@@ -638,19 +640,7 @@
         // search history buffer
         searchHistoryController: new HistoryController({}),
         // ex Command history buffer
-        exCommandHistoryController : new HistoryController({}),
-        // To enable a special two-character keymap sequence for ESC, set this to true.
-        enableEscKeymap: false,
-        // Use these two variables to customize the two-character ESC keymap.
-        // If you want to use characters other than i j or k you'll have to add
-        // lines to the vim-insert and await-second keymaps later in this file.
-        firstEscCharacter: 'k',
-        secondEscCharacter: 'j',
-        // The timeout in milliseconds for the two-character ESC keymap should be
-        // adjusted according to your typing speed to prevent false positives.
-        escSequenceTimeout: 100,
-        // Used by two-character ESC keymap routines. Should not be changed from false here.
-        awaitingEscapeSecondCharacter: false
+        exCommandHistoryController : new HistoryController({})
       };
       for (var optionName in options) {
         var option = options[optionName];
@@ -4534,39 +4524,48 @@
       }
     }
 
+    // Use this option to customize the two-character ESC keymap.
+    // If you want to use characters other than i j or k you'll have to add
+    // lines to the vim-insert and await-second keymaps later in this file.
+    defineOption('enableInsertModeEscKeys', false, 'boolean');
+    defineOption('insertModeEscKeys', 'kj', 'string');
+    // The timeout in milliseconds for the two-character ESC keymap should be
+    // adjusted according to your typing speed to prevent false positives.
+    defineOption('insertModeEscKeysTimeout', 200, 'number');
     function firstEscCharacterHandler(ch){
-      if(vimGlobalState.enableEscKeymap === false || vimGlobalState.firstEscCharacter !== ch){
-        // This is not the handler you're looking for. Just insert as usual.
-        return function(cm){
-          cm.replaceRange(ch, cm.getCursor(), cm.getCursor(), "+input");
-        };
-      } else {
-        return function(cm){
+      return function(cm){
+        var keys = getOption('insertModeEscKeys');
+        var firstEscCharacter = keys && keys.length > 1 && keys.charAt(0);
+        if (!getOption('enableInsertModeEscKeys')|| firstEscCharacter !== ch) {
+          return CodeMirror.Pass;
+        } else {
           cm.replaceRange(ch, cm.getCursor(), cm.getCursor(), "+input");
           cm.setOption('keyMap', 'await-second');
-          vimGlobalState.awaitingEscapeSecondCharacter = true;
-          setTimeout(function(){
-                if(vimGlobalState.awaitingEscapeSecondCharacter === true) {
-                    vimGlobalState.awaitingEscapeSecondCharacter = false;
+          cm.state.vim.awaitingEscapeSecondCharacter = true;
+          setTimeout(
+              function(){
+                if(cm.state.vim.awaitingEscapeSecondCharacter) {
+                    cm.state.vim.awaitingEscapeSecondCharacter = false;
                     cm.setOption('keyMap', 'vim-insert');
                 }
-            }, vimGlobalState.escSequenceTimeout);
-        };
+              },
+              getOption('insertModeEscKeysTimeout'));
+        }
       }
     }
     function secondEscCharacterHandler(ch){
-      if(vimGlobalState.enableEscKeymap === false || vimGlobalState.secondEscCharacter !== ch) {
-        // This is not the handler you're looking for. Just insert as usual.
-        return function(cm){
-          cm.replaceRange(ch, cm.getCursor(), cm.getCursor(), "+input");
-        };
-      } else {
-        return function(cm) {
-          vimGlobalState.awaitingEscapeSecondCharacter = false;
+      return function(cm) {
+        var keys = getOption('insertModeEscKeys');
+        var secondEscCharacter = keys && keys.length > 1 && keys.charAt(1);
+        if (!getOption('enableInsertModeEscKeys')|| secondEscCharacter !== ch) {
+          return CodeMirror.Pass;
+          // This is not the handler you're looking for. Just insert as usual.
+        } else {
+          cm.state.vim.awaitingEscapeSecondCharacter = false;
           cm.replaceRange('', {ch: cm.getCursor().ch - 1, line: cm.getCursor().line},
                           cm.getCursor(), "+input");
           exitInsertMode(cm);
-        };
+        }
       }
     }
 
@@ -4594,16 +4593,16 @@
       //              macro recording. Most likely the removal of the
       //              first character from the buffer in the function
       //              secondEscCharacterHandler is what needs fixing.
-      "'i'": function(cm){var f = firstEscCharacterHandler('i'); f(cm);},
-      "'j'": function(cm){var f = firstEscCharacterHandler('j'); f(cm);},
-      "'k'": function(cm){var f = firstEscCharacterHandler('k'); f(cm);},
+      "'i'": firstEscCharacterHandler('i'),
+      "'j'": firstEscCharacterHandler('j'),
+      "'k'": firstEscCharacterHandler('k'),
       fallthrough: ['default']
     };
 
     CodeMirror.keyMap['await-second'] = {
-      "'i'": function(cm){var f = secondEscCharacterHandler('i'); f(cm);},
-      "'j'": function(cm){var f = secondEscCharacterHandler('j'); f(cm);},
-      "'k'": function(cm){var f = secondEscCharacterHandler('k'); f(cm);},
+      "'i'": secondEscCharacterHandler('i'),
+      "'j'": secondEscCharacterHandler('j'),
+      "'k'": secondEscCharacterHandler('k'),
       fallthrough: ['vim-insert']
     };
 

From 45fe0a109d02f682ee435a4093843d5124cf95b9 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 22 Jul 2014 11:46:18 -0700
Subject: [PATCH 1470/4742] [vim] Fix macro recording for insert mode keys esc

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 837c1814bb..0f1f786ea4 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4527,7 +4527,7 @@
     // Use this option to customize the two-character ESC keymap.
     // If you want to use characters other than i j or k you'll have to add
     // lines to the vim-insert and await-second keymaps later in this file.
-    defineOption('enableInsertModeEscKeys', false, 'boolean');
+    defineOption('enableInsertModeEscKeys', true, 'boolean');
     defineOption('insertModeEscKeys', 'kj', 'string');
     // The timeout in milliseconds for the two-character ESC keymap should be
     // adjusted according to your typing speed to prevent false positives.
@@ -4561,6 +4561,12 @@
           return CodeMirror.Pass;
           // This is not the handler you're looking for. Just insert as usual.
         } else {
+          if (cm.state.vim.insertMode) {
+            var lastChange = vimGlobalState.macroModeState.lastInsertModeChanges;
+            if (lastChange && lastChange.changes.length) {
+              lastChange.changes.pop();
+            }
+          }
           cm.state.vim.awaitingEscapeSecondCharacter = false;
           cm.replaceRange('', {ch: cm.getCursor().ch - 1, line: cm.getCursor().line},
                           cm.getCursor(), "+input");

From 23302baed4a49e2945d25788c50bb301dab46a1c Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 22 Jul 2014 11:49:37 -0700
Subject: [PATCH 1471/4742] [vim] Default insert mode esc keys back to false

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0f1f786ea4..b5fa3ab861 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4527,7 +4527,7 @@
     // Use this option to customize the two-character ESC keymap.
     // If you want to use characters other than i j or k you'll have to add
     // lines to the vim-insert and await-second keymaps later in this file.
-    defineOption('enableInsertModeEscKeys', true, 'boolean');
+    defineOption('enableInsertModeEscKeys', false, 'boolean');
     defineOption('insertModeEscKeys', 'kj', 'string');
     // The timeout in milliseconds for the two-character ESC keymap should be
     // adjusted according to your typing speed to prevent false positives.

From e4e7c19551966df7aaf494ec0d01209ed85ec928 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 22 Jul 2014 14:31:05 -0700
Subject: [PATCH 1472/4742] [vim] Lint run

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

diff --git a/keymap/vim.js b/keymap/vim.js
index b5fa3ab861..bba5b69b71 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4532,7 +4532,7 @@
     // The timeout in milliseconds for the two-character ESC keymap should be
     // adjusted according to your typing speed to prevent false positives.
     defineOption('insertModeEscKeysTimeout', 200, 'number');
-    function firstEscCharacterHandler(ch){
+    function firstEscCharacterHandler(ch) {
       return function(cm){
         var keys = getOption('insertModeEscKeys');
         var firstEscCharacter = keys && keys.length > 1 && keys.charAt(0);
@@ -4551,7 +4551,7 @@
               },
               getOption('insertModeEscKeysTimeout'));
         }
-      }
+      };
     }
     function secondEscCharacterHandler(ch){
       return function(cm) {
@@ -4572,7 +4572,7 @@
                           cm.getCursor(), "+input");
           exitInsertMode(cm);
         }
-      }
+      };
     }
 
     CodeMirror.keyMap['vim-insert'] = {

From dc97f2a1e9ea3b0e0fe00e2c38ec6e1906d7e501 Mon Sep 17 00:00:00 2001
From: gekkoe <gekkoe@users.noreply.github.com>
Date: Tue, 22 Jul 2014 18:16:24 -0700
Subject: [PATCH 1473/4742] [vim] Move slightly misplaced comment.

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index bba5b69b71..235198f4d8 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4524,10 +4524,10 @@
       }
     }
 
+    defineOption('enableInsertModeEscKeys', false, 'boolean');
     // Use this option to customize the two-character ESC keymap.
     // If you want to use characters other than i j or k you'll have to add
     // lines to the vim-insert and await-second keymaps later in this file.
-    defineOption('enableInsertModeEscKeys', false, 'boolean');
     defineOption('insertModeEscKeys', 'kj', 'string');
     // The timeout in milliseconds for the two-character ESC keymap should be
     // adjusted according to your typing speed to prevent false positives.

From 58e1048e4a76ba2547842bffe8b28d2021bb6551 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Jul 2014 11:56:35 +0200
Subject: [PATCH 1474/4742] Fix problem where a change to the selection causes
 unwanted history event merging

Issue #2717
---
 lib/codemirror.js | 10 +++++-----
 test/test.js      |  9 +++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 96878b219d..b9ddc496b9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6495,7 +6495,7 @@
     },
     changeGeneration: function(forceSplit) {
       if (forceSplit)
-        this.history.lastOp = this.history.lastOrigin = null;
+        this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null;
       return this.history.generation;
     },
     isClean: function (gen) {
@@ -6812,7 +6812,7 @@
     // Used to track when changes can be merged into a single undo
     // event
     this.lastModTime = this.lastSelTime = 0;
-    this.lastOp = null;
+    this.lastOp = this.lastSelOp = null;
     this.lastOrigin = this.lastSelOrigin = null;
     // Used by the isClean() method
     this.generation = this.maxGeneration = startGen || 1;
@@ -6890,7 +6890,7 @@
     hist.done.push(selAfter);
     hist.generation = ++hist.maxGeneration;
     hist.lastModTime = hist.lastSelTime = time;
-    hist.lastOp = opId;
+    hist.lastOp = hist.lastSelOp = opId;
     hist.lastOrigin = hist.lastSelOrigin = change.origin;
 
     if (!last) signal(doc, "historyAdded");
@@ -6916,7 +6916,7 @@
     // the current, or the origins don't allow matching. Origins
     // starting with * are always merged, those starting with + are
     // merged when similar and close together in time.
-    if (opId == hist.lastOp ||
+    if (opId == hist.lastSelOp ||
         (origin && hist.lastSelOrigin == origin &&
          (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
           selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
@@ -6926,7 +6926,7 @@
 
     hist.lastSelTime = +new Date;
     hist.lastSelOrigin = origin;
-    hist.lastOp = opId;
+    hist.lastSelOp = opId;
     if (options && options.clearRedo !== false)
       clearSelectionEvents(hist.undone);
   }
diff --git a/test/test.js b/test/test.js
index dcfffb7c07..4e7de08818 100644
--- a/test/test.js
+++ b/test/test.js
@@ -359,6 +359,15 @@ testCM("undoSelectionAsBefore", function(cm) {
   eq(cm.getSelection(), "abc");
 });
 
+testCM("selectionChangeConfusesHistory", function(cm) {
+  cm.replaceSelection("abc", null, "dontmerge");
+  cm.operation(function() {
+    cm.setCursor(Pos(0, 0));
+    cm.replaceSelection("abc", null, "dontmerge");
+  });
+  eq(cm.historySize().undo, 2);
+});
+
 testCM("markTextSingleLine", function(cm) {
   forEach([{a: 0, b: 1, c: "", f: 2, t: 5},
            {a: 0, b: 4, c: "", f: 0, t: 2},

From edb5a983e59c2b89304eb6f4bff6c2e180e82b5e Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Tue, 22 Jul 2014 08:27:11 +0530
Subject: [PATCH 1475/4742] [vim] blockwise insert and append

---
 keymap/vim.js    | 43 +++++++++++++++++++++++++++++++++++--------
 test/vim_test.js | 16 ++++++++++++++++
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 235198f4d8..346f74a37b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2098,6 +2098,11 @@
         vim.insertMode = true;
         vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
         var insertAt = (actionArgs) ? actionArgs.insertAt : null;
+        if (vim.visualMode) {
+          var selections = getSelectedAreaRange(cm, vim);
+          var selectionStart = selections[0];
+          var selectionEnd = selections[1];
+        }
         if (insertAt == 'eol') {
           var cursor = cm.getCursor();
           cursor = Pos(cursor.line, lineLength(cm, cursor.line));
@@ -2105,15 +2110,34 @@
         } else if (insertAt == 'charAfter') {
           cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
         } else if (insertAt == 'firstNonBlank') {
-          cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+          if (vim.visualMode && !vim.visualBlock) {
+            if (selectionEnd.line < selectionStart.line) {
+              cm.setCursor(selectionEnd);
+            } else {
+              selectionStart = Pos(selectionStart.line, 0);
+              cm.setCursor(selectionStart);
+            }
+            cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+          } else if (vim.visualBlock) {
+            selectionEnd = Pos(selectionEnd.line, selectionStart.ch);
+            cm.setCursor(selectionStart);
+            selectBlock(cm, selectionEnd);
+          } else {
+            cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+          }
         } else if (insertAt == 'endOfSelectedArea') {
-          var selectionEnd = cm.getCursor('head');
-          var selectionStart = cm.getCursor('anchor');
-          if (selectionEnd.line < selectionStart.line) {
+          if (vim.visualBlock) {
+            selectionStart = Pos(selectionStart.line, selectionEnd.ch);
+            cm.setCursor(selectionStart);
+            selectBlock(cm, selectionEnd);
+          } else if (selectionEnd.line < selectionStart.line) {
             selectionEnd = Pos(selectionStart.line, 0);
+            cm.setCursor(selectionEnd);
+          }
+        } else if (insertAt == 'inplace') {
+          if (vim.visualMode){
+            return;
           }
-          cm.setCursor(selectionEnd);
-          exitVisualMode(cm);
         }
         cm.setOption('keyMap', 'vim-insert');
         cm.setOption('disableInput', false);
@@ -2131,6 +2155,9 @@
           cm.on('change', onChange);
           CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
         }
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
       },
       toggleVisualMode: function(cm, actionArgs, vim) {
         var repeat = actionArgs.repeat;
@@ -2764,13 +2791,13 @@
       updateLastSelection(cm, vim);
       vim.visualMode = false;
       vim.visualLine = false;
-      vim.visualBlock = false;
-      if (!cursorEqual(selectionStart, selectionEnd)) {
+      if (!cursorEqual(selectionStart, selectionEnd) && !vim.visualBlock) {
         // Clear the selection and set the cursor only if the selection has not
         // already been cleared. Otherwise we risk moving the cursor somewhere
         // it's not supposed to be.
         cm.setCursor(clipCursorToContent(cm, selectionEnd));
       }
+      vim.visualBlock = false;
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (vim.fakeCursor) {
         vim.fakeCursor.clear();
diff --git a/test/vim_test.js b/test/vim_test.js
index 7c24634a89..d10e364a93 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1214,6 +1214,14 @@ testVim('A', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, lines[0].length);
   eq('vim-insert', cm.getOption('keyMap'));
 });
+testVim('A_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'A');
+  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
+  replacement.pop();
+  cm.replaceSelections(replacement);
+  eq('testhello\nmehello\npleahellose', cm.getValue());
+}, {value: 'test\nme\nplease'});
 testVim('I', function(cm, vim, helpers) {
   cm.setCursor(0, 4);
   helpers.doKeys('I');
@@ -1228,6 +1236,14 @@ testVim('I_repeat', function(cm, vim, helpers) {
   eq('testtesttestblah', cm.getValue());
   helpers.assertCursorAt(0, 11);
 }, { value: 'blah' });
+testVim('I_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'I');
+  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
+  replacement.pop();
+  cm.replaceSelections(replacement);
+  eq('hellotest\nhellome\nhelloplease', cm.getValue());
+}, {value: 'test\nme\nplease'});
 testVim('o', function(cm, vim, helpers) {
   cm.setCursor(0, 4);
   helpers.doKeys('o');

From 81f771f9b7bf28c9a4fbcb4346467d82152e5c04 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Jul 2014 08:40:04 +0200
Subject: [PATCH 1476/4742] [ruby mode] Don't treat property names as keywords

Closes #2724
---
 mode/ruby/ruby.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index e7de7b57f1..6c9977b531 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -141,7 +141,8 @@ CodeMirror.defineMode("ruby", function(config) {
     } else if (ch == "-" && stream.eat(">")) {
       return "arrow";
     } else if (/[=+\-\/*:\.^%<>~|]/.test(ch)) {
-      stream.eatWhile(/[=+\-\/*:\.^%<>~|]/);
+      var more = stream.eatWhile(/[=+\-\/*:\.^%<>~|]/);
+      if (ch == "." && !more) curPunc = ".";
       return "operator";
     } else {
       return null;
@@ -232,20 +233,25 @@ CodeMirror.defineMode("ruby", function(config) {
     token: function(stream, state) {
       if (stream.sol()) state.indented = stream.indentation();
       var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
+      var thisTok = curPunc;
       if (style == "ident") {
         var word = stream.current();
-        style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
+        style = state.lastTok == "." ? "property"
+          : keywords.propertyIsEnumerable(stream.current()) ? "keyword"
           : /^[A-Z]/.test(word) ? "tag"
           : (state.lastTok == "def" || state.lastTok == "class" || state.varList) ? "def"
           : "variable";
-        if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
-        else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
-        else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
-          kwtype = "indent";
-        else if (word == "do" && state.context.indented < state.indented)
-          kwtype = "indent";
+        if (style == "keyword") {
+          thisTok = word;
+          if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
+          else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
+          else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
+            kwtype = "indent";
+          else if (word == "do" && state.context.indented < state.indented)
+            kwtype = "indent";
+        }
       }
-      if (curPunc || (style && style != "comment")) state.lastTok = word || curPunc || style;
+      if (curPunc || (style && style != "comment")) state.lastTok = thisTok;
       if (curPunc == "|") state.varList = !state.varList;
 
       if (kwtype == "indent" || /[\(\[\{]/.test(curPunc))

From d20daf6bc1a72d03734687954a237aeb593bfbc1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Jul 2014 08:52:42 +0200
Subject: [PATCH 1477/4742] Add goLineLeftSmart command

Issue #1544
---
 doc/manual.html   |  9 +++++++--
 lib/codemirror.js | 29 ++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 5f1b0dcc46..e2fe2b2964 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -838,12 +838,17 @@ <h2>Commands</h2>
       <dt class=command id=command_goLineEnd><code><strong>goLineEnd</strong></code><span class=keybinding>Alt-Right (PC), Ctrl-E (Mac)</span></dt>
       <dd>Move the cursor to the end of the line.</dd>
 
+      <dt class=command id=command_goLineRight><code><strong>goLineRight</strong></code><span class=keybinding>Cmd-Right (Mac)</span></dt>
+      <dd>Move the cursor to the right side of the visual line it is on.</dd>
+
       <dt class=command id=command_goLineLeft><code><strong>goLineLeft</strong></code><span class=keybinding>Cmd-Left (Mac)</span></dt>
       <dd>Move the cursor to the left side of the visual line it is on. If
       this line is wrapped, that may not be the start of the line.</dd>
 
-      <dt class=command id=command_goLineRight><code><strong>goLineRight</strong></code><span class=keybinding>Cmd-Right (Mac)</span></dt>
-      <dd>Move the cursor to the right side of the visual line it is on.</dd>
+      <dt class=command id=command_goLineLeftSmart><code><strong>goLineLeftSmart</strong></code></dt>
+      <dd>Move the cursor to the left side of the visual line it is
+      on. If that takes it to the start of the line, behave
+      like <a href="#command_goLineStartSmart"><code>goLineStartSmart</code></a>.</dd>
 
       <dt class=command id=command_goLineUp><code><strong>goLineUp</strong></code><span class=keybinding>Up, Ctrl-P (Mac)</span></dt>
       <dd>Move the cursor up one line.</dd>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index b9ddc496b9..5d8c9255ff 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4731,15 +4731,7 @@
     },
     goLineStartSmart: function(cm) {
       cm.extendSelectionsBy(function(range) {
-        var start = lineStart(cm, range.head.line);
-        var line = cm.getLineHandle(start.line);
-        var order = getOrder(line);
-        if (!order || order[0].level == 0) {
-          var firstNonWS = Math.max(0, line.text.search(/\S/));
-          var inWS = range.head.line == start.line && range.head.ch <= firstNonWS && range.head.ch;
-          return Pos(start.line, inWS ? 0 : firstNonWS);
-        }
-        return start;
+        return lineStartSmart(cm, range.head);
       }, {origin: "+move", bias: 1});
     },
     goLineEnd: function(cm) {
@@ -4758,6 +4750,14 @@
         return cm.coordsChar({left: 0, top: top}, "div");
       }, sel_move);
     },
+    goLineLeftSmart: function(cm) {
+      cm.extendSelectionsBy(function(range) {
+        var top = cm.charCoords(range.head, "div").top + 5;
+        var pos = cm.coordsChar({left: 0, top: top}, "div");
+        if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head);
+        return pos;
+      }, sel_move);
+    },
     goLineUp: function(cm) {cm.moveV(-1, "line");},
     goLineDown: function(cm) {cm.moveV(1, "line");},
     goPageUp: function(cm) {cm.moveV(-1, "page");},
@@ -7556,6 +7556,17 @@
     var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
     return Pos(lineN == null ? lineNo(line) : lineN, ch);
   }
+  function lineStartSmart(cm, pos) {
+    var start = lineStart(cm, pos.line);
+    var line = getLine(cm.doc, start.line);
+    var order = getOrder(line);
+    if (!order || order[0].level == 0) {
+      var firstNonWS = Math.max(0, line.text.search(/\S/));
+      var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
+      return Pos(start.line, inWS ? 0 : firstNonWS);
+    }
+    return start;
+  }
 
   function compareBidiLevel(order, a, b) {
     var linedir = order[0].level;

From de0e0e822f14a9aa21af3b5986b2d329e3734fc2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Jul 2014 08:55:07 +0200
Subject: [PATCH 1478/4742] [haml mode] Adjust test to correspond to changed
 ruby mode output

---
 mode/haml/test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/haml/test.js b/mode/haml/test.js
index 3a6100a352..508458a437 100644
--- a/mode/haml/test.js
+++ b/mode/haml/test.js
@@ -53,9 +53,9 @@
       "  [comment -# this is a comment]",
       "     [comment and this is a comment too]",
       "  Date/Time",
-      "  [operator -] [variable now] [operator =] [tag DateTime][operator .][variable now]",
+      "  [operator -] [variable now] [operator =] [tag DateTime][operator .][property now]",
       "  [tag %strong=] [variable now]",
-      "  [operator -] [keyword if] [variable now] [operator >] [tag DateTime][operator .][variable parse]([string \"December 31, 2006\"])",
+      "  [operator -] [keyword if] [variable now] [operator >] [tag DateTime][operator .][property parse]([string \"December 31, 2006\"])",
       "     [operator =][string \"Happy\"]",
       "     [operator =][string \"Belated\"]",
       "     [operator =][string \"Birthday\"]");

From c07ddbbf43f00887f09ea8d01faedb00acd1a018 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakubvrana@google.com>
Date: Tue, 15 Jul 2014 18:09:38 -0700
Subject: [PATCH 1479/4742] Preserve selection after indenting

---
 lib/codemirror.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5d8c9255ff..8b2f25c81a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4070,11 +4070,14 @@
       for (var i = 0; i < ranges.length; i++) {
         var range = ranges[i];
         if (!range.empty()) {
-          var start = Math.max(end, range.from().line);
+          var from = range.from();
+          var start = Math.max(end, from.line);
           var to = range.to();
           end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
           for (var j = start; j < end; ++j)
             indentLine(this, j, how);
+          if (from.ch == 0 && to.ch == 0)
+            replaceOneSelection(this.doc, i, new Range(from, to));
         } else if (range.head.line > end) {
           indentLine(this, range.head.line, how, true);
           end = range.head.line;

From ff472c49392fbeda67a02f06ae9b4b5085aef937 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Jul 2014 12:30:54 +0200
Subject: [PATCH 1480/4742] Amend c07ddbbf43f00887f09ea8d01faedb00acd1a018

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8b2f25c81a..4898f34e01 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4070,14 +4070,14 @@
       for (var i = 0; i < ranges.length; i++) {
         var range = ranges[i];
         if (!range.empty()) {
-          var from = range.from();
+          var from = range.from(), to = range.to();
           var start = Math.max(end, from.line);
-          var to = range.to();
           end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
           for (var j = start; j < end; ++j)
             indentLine(this, j, how);
-          if (from.ch == 0 && to.ch == 0)
-            replaceOneSelection(this.doc, i, new Range(from, to));
+          var newRanges = this.doc.sel.ranges;
+          if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
+            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()));
         } else if (range.head.line > end) {
           indentLine(this, range.head.line, how, true);
           end = range.head.line;

From 903aab0108948081dfa2485db281778b0b38d7d2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Jul 2014 12:35:05 +0200
Subject: [PATCH 1481/4742] Fix bad backslashes in wordChars helpers

Issue #2721
---
 mode/javascript/javascript.js | 2 +-
 mode/perl/perl.js             | 2 +-
 mode/php/php.js               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fdb066eb1f..7523f72920 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -669,7 +669,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   };
 });
 
-CodeMirror.registerHelper("wordChars", "javascript", /[\\w$]/);
+CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/);
 
 CodeMirror.defineMIME("text/javascript", "javascript");
 CodeMirror.defineMIME("text/ecmascript", "javascript");
diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index ab86e846a4..c12677d249 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -791,7 +791,7 @@ CodeMirror.defineMode("perl",function(){
                         return (state.tokenize||tokenPerl)(stream,state);},
                 electricChars:"{}"};});
 
-CodeMirror.registerHelper("wordChars", "perl", /[\\w$]/);
+CodeMirror.registerHelper("wordChars", "perl", /[\w$]/);
 
 CodeMirror.defineMIME("text/x-perl", "perl");
 
diff --git a/mode/php/php.js b/mode/php/php.js
index 72c19d8d11..75b003ff75 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -97,7 +97,7 @@
   var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
   var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once";
   CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
-  CodeMirror.registerHelper("wordChars", "php", /[\\w$]/);
+  CodeMirror.registerHelper("wordChars", "php", /[\w$]/);
 
   var phpConfig = {
     name: "clike",

From 804498b87bb9a437a69ac4cc7e264d9d96f53918 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Jul 2014 12:40:26 +0200
Subject: [PATCH 1482/4742] [sublime keymap] Fix bindings for swapLineUp/Down

Closes #2723
---
 keymap/sublime.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 7a3a1e5f0e..f70a1f98f2 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -17,7 +17,8 @@
   var map = CodeMirror.keyMap.sublime = {fallthrough: "default"};
   var cmds = CodeMirror.commands;
   var Pos = CodeMirror.Pos;
-  var ctrl = CodeMirror.keyMap["default"] == CodeMirror.keyMap.pcDefault ? "Ctrl-" : "Cmd-";
+  var mac = CodeMirror.keyMap["default"] == CodeMirror.keyMap.macDefault;
+  var ctrl = mac ? "Cmd-" : "Ctrl-";
 
   // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that.
   function findPosSubword(doc, start, dir) {
@@ -186,7 +187,9 @@
     });
   };
 
-  cmds[map["Shift-" + ctrl + "Up"] = "swapLineUp"] = function(cm) {
+  var swapLineCombo = mac ? "Cmd-Ctrl-" : "Shift-Ctrl-";
+
+  cmds[map[swapLineCombo + "Up"] = "swapLineUp"] = function(cm) {
     var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i], from = range.from().line - 1, to = range.to().line;
@@ -212,7 +215,7 @@
     });
   };
 
-  cmds[map["Shift-" + ctrl + "Down"] = "swapLineDown"] = function(cm) {
+  cmds[map[swapLineCombo + "Down"] = "swapLineDown"] = function(cm) {
     var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
     for (var i = ranges.length - 1; i >= 0; i--) {
       var range = ranges[i], from = range.to().line + 1, to = range.from().line;

From ac1d40005886af31751ed7dbe8147fea45cf385d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Jul 2014 17:04:41 +0200
Subject: [PATCH 1483/4742] Work around optional-argument bug with
 updateSelection

Closes #2725
---
 lib/codemirror.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4898f34e01..683df8859e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1280,8 +1280,7 @@
     return result;
   }
 
-  function updateSelection(cm, drawn) {
-    if (!drawn) drawn = drawSelection(cm);
+  function showSelection(cm, drawn) {
     removeChildrenAndAdd(cm.display.cursorDiv, drawn.cursors);
     removeChildrenAndAdd(cm.display.selectionDiv, drawn.selection);
     if (drawn.teTop != null) {
@@ -1290,6 +1289,10 @@
     }
   }
 
+  function updateSelection(cm) {
+    showSelection(cm, drawSelection(cm));
+  }
+
   // Draws a cursor for the given range
   function drawSelectionCursor(cm, range, output) {
     var pos = cursorCoords(cm, range.head, "div", null, null, !cm.options.singleCursorHeightPerLine);
@@ -2053,7 +2056,7 @@
     }
 
     if (op.newSelectionNodes)
-      updateSelection(cm, op.newSelectionNodes);
+      showSelection(cm, op.newSelectionNodes);
     if (op.updatedDisplay)
       setDocumentHeight(cm, op.barMeasure);
     if (op.updatedDisplay || op.startHeight != cm.doc.height)

From 945360c68c47a22144dcb59f32366a835e31531d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Jul 2014 11:18:19 +0200
Subject: [PATCH 1484/4742] Fix bug that caused width computation to happen for
 every operation

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 683df8859e..e9cfd9de9a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2034,7 +2034,7 @@
 
     // If the max line changed since it was last measured, measure it,
     // and ensure the document's width matches it.
-    // updateDisplayIfNeeded will use these properties to do the actual resizing
+    // updateDisplay_W2 will use these properties to do the actual resizing
     if (display.maxLineChanged && !cm.options.lineWrapping) {
       op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
       op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo +
@@ -2053,6 +2053,7 @@
       cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
       if (op.maxScrollLeft < cm.doc.scrollLeft)
         setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
+      cm.display.maxLineChanged = false;
     }
 
     if (op.newSelectionNodes)

From 2f14f52e24b35323081878d598465f390db1e955 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Jul 2014 11:50:40 +0200
Subject: [PATCH 1485/4742] Fix problem caused by ordering of scroll width
 measurement and width adjustment

Closes #2730
---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e9cfd9de9a..1ed1391194 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2032,16 +2032,19 @@
     var cm = op.cm, display = cm.display;
     if (op.updatedDisplay) updateHeightsInViewport(cm);
 
+    op.barMeasure = measureForScrollbars(cm);
+
     // If the max line changed since it was last measured, measure it,
     // and ensure the document's width matches it.
     // updateDisplay_W2 will use these properties to do the actual resizing
     if (display.maxLineChanged && !cm.options.lineWrapping) {
-      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
+      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
       op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo +
                                   scrollerCutOff - display.scroller.clientWidth);
+      var wDiff = op.adjustWidthTo - parseInt(display.sizer.style.minWidth || "0");
+      op.barMeasure.scrollWidth += wDiff;
     }
 
-    op.barMeasure = measureForScrollbars(cm);
     if (op.updatedDisplay || op.selectionChanged)
       op.newSelectionNodes = drawSelection(cm);
   }

From fce7eb4b66d0c0deb6c7b24d2d2bf56377a55fba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Jul 2014 21:33:46 +0200
Subject: [PATCH 1486/4742] Fix initialization problem introduced by
 2f14f52e24b35

---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1ed1391194..9cfc6dc6be 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2041,8 +2041,9 @@
       op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
       op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo +
                                   scrollerCutOff - display.scroller.clientWidth);
-      var wDiff = op.adjustWidthTo - parseInt(display.sizer.style.minWidth || "0");
-      op.barMeasure.scrollWidth += wDiff;
+      var prevMinWidth = display.sizer.style.minWidth;
+      if (prevMinWidth)
+        op.barMeasure.scrollWidth += op.adjustWidthTo - parseInt(prevMinWidth);
     }
 
     if (op.updatedDisplay || op.selectionChanged)

From 75e63beef2b8a1542dab7783296d024bc3dd41c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Jul 2014 22:00:53 +0200
Subject: [PATCH 1487/4742] Another fix to the width measuring kludge

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9cfc6dc6be..4dc2a7eaf8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2042,7 +2042,7 @@
       op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo +
                                   scrollerCutOff - display.scroller.clientWidth);
       var prevMinWidth = display.sizer.style.minWidth;
-      if (prevMinWidth)
+      if (prevMinWidth && op.barMeasure.scrollWidth > op.barMeasure.clientWidth)
         op.barMeasure.scrollWidth += op.adjustWidthTo - parseInt(prevMinWidth);
     }
 

From 6e3b8ed1054a2d57907ab259cdec93f7cdeffbc0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Jul 2014 22:03:06 +0200
Subject: [PATCH 1488/4742] [closetag addon] Reindent line when a tag is closed
 by /

Issue #2735
---
 addon/edit/closetag.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 414498bcd9..69ea4446be 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -109,6 +109,10 @@
       replacements[i] = "/" + state.context.tagName + ">";
     }
     cm.replaceSelections(replacements);
+    ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++)
+      if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
+        cm.indentLine(ranges[i].head.line);
   }
 
   function indexOf(collection, elt) {

From b5e19db4d330ce55db369e6d0c9c4f71d3664bc3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Jul 2014 09:58:54 +0200
Subject: [PATCH 1489/4742] [clojure mode] Fix null dereference bug

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

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index f81bd2c140..73bfcd39b5 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -114,7 +114,7 @@ CodeMirror.defineMode("clojure", function (options) {
         var first = stream.next();
         // Read special literals: backspace, newline, space, return.
         // Just read all lowercase letters.
-        if (first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) {
+        if (first && first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) {
             return;
         }
         // Read unicode character: \u1000 \uA0a1

From 70ebf9f6674469d97392aaf932a993cbca9364e4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Jul 2014 10:40:24 +0200
Subject: [PATCH 1490/4742] Sanitize scrolling code, make it deal with being
 asked to show rect larger than view

Issue #2736
---
 lib/codemirror.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4dc2a7eaf8..adad6a25f6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3750,6 +3750,7 @@
     if (y1 < 0) y1 = 0;
     var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
     var screen = display.scroller.clientHeight - scrollerCutOff, result = {};
+    if (y2 - y1 > screen) y2 = y1 + screen;
     var docBottom = cm.doc.height + paddingVert(display);
     var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
     if (y1 < screentop) {
@@ -3761,15 +3762,15 @@
 
     var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
     var screenw = display.scroller.clientWidth - scrollerCutOff;
-    x1 += display.gutters.offsetWidth; x2 += display.gutters.offsetWidth;
-    var gutterw = display.gutters.offsetWidth;
-    var atLeft = x1 < gutterw + 10;
-    if (x1 < screenleft + gutterw || atLeft) {
-      if (atLeft) x1 = 0;
-      result.scrollLeft = Math.max(0, x1 - 10 - gutterw);
-    } else if (x2 > screenw + screenleft - 3) {
-      result.scrollLeft = x2 + 10 - screenw;
-    }
+    var tooWide = x2 - x1 > screenw;
+    if (tooWide) x2 = y1 + screen;
+    if (x1 < display.gutters.offsetWidth + 10)
+      result.scrollLeft = 0;
+    else if (x1 < screenleft)
+      result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
+    else if (x2 > screenw + screenleft - 3)
+      result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
+
     return result;
   }
 

From 95ec53662a6bf47182f69faa372c6d86d3cab630 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Jul 2014 10:43:07 +0200
Subject: [PATCH 1491/4742] Scroll correct positions into view after undo/redo

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index adad6a25f6..e363c5ed21 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3561,7 +3561,7 @@
 
       var after = i ? computeSelAfterChange(doc, change) : lst(source);
       makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
-      if (!i && doc.cm) doc.cm.scrollIntoView(change);
+      if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)});
       var rebased = [];
 
       // Propagate to the linked documents

From d17eadeb9804ee10e65eeec96e611c3fcfdf607c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Jul 2014 10:52:12 +0200
Subject: [PATCH 1492/4742] [xml-fold addon] Make doMatchTags also return info
 about self-closing tags

This way, the matchtags addon highlights them the same as normal tags.

Closes #2737
---
 addon/fold/xml-fold.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index a45da58422..504727f38c 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -151,8 +151,9 @@
     if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
     var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
     var start = end && toTagStart(iter);
-    if (!end || end == "selfClose" || !start || cmp(iter, pos) > 0) return;
+    if (!end || !start || cmp(iter, pos) > 0) return;
     var here = {from: Pos(iter.line, iter.ch), to: to, tag: start[2]};
+    if (end == "selfClose") return {open: here, close: null, at: "open"};
 
     if (start[1]) { // closing tag
       return {open: findMatchingOpen(iter, start[2]), close: here, at: "close"};

From 996b37a281aaee8e7698892fba0739437b6df101 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Jul 2014 11:34:12 +0200
Subject: [PATCH 1493/4742] Also update line heights from updateDisplaySimple

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e363c5ed21..5bb1677afc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -662,6 +662,7 @@
   function updateDisplaySimple(cm, viewport) {
     var update = new DisplayUpdate(cm, viewport);
     if (updateDisplayIfNeeded(cm, update)) {
+      updateHeightsInViewport(cm);
       postUpdateDisplay(cm, update);
       var barMeasure = measureForScrollbars(cm);
       updateSelection(cm);

From 41bd14d66caf5ae948234fd2f9b0c6dbc02413fa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Jul 2014 15:29:59 +0200
Subject: [PATCH 1494/4742] [real-world uses] Add IPython

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 5d902a0f6b..e5ae339817 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -88,6 +88,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://haxpad.com/">HaxPad</a> (editor for Win RT)</li>
       <li><a href="http://megafonweblab.github.com/histone-javascript/">Histone template engine playground</a></li>
       <li><a href="http://icecoder.net">ICEcoder</a> (web IDE)</li>
+      <li><a href="http://ipython.org/">IPython</a> (interactive computing shell)</li>
       <li><a href="http://i-mos.org/imos/">i-MOS</a> (modeling and simulation platform)</li>
       <li><a href="http://www.janvas.com/">Janvas</a> (vector graphics editor)</li>
       <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>

From a7117799ba3a6efd89c15459e07ebf5e4284e1ca Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Tue, 22 Jul 2014 05:18:38 +0530
Subject: [PATCH 1495/4742] [vim] replay change for blockwise visual

---
 keymap/vim.js    | 57 ++++++++++++++++++++++++++++++++++++++++++------
 test/vim_test.js | 13 +++++++++++
 2 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 346f74a37b..30a1396275 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1862,6 +1862,12 @@
         var curStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
         var curEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
         var text = cm.getSelection();
+        var visualBlock = vim.visualBlock;
+        if (vim.lastSelection && !vim.visualMode) {
+          visualBlock = vim.lastSelection.visualBlock ? true : visualBlock;
+        }
+        var lastInsertModeChanges = vimGlobalState.macroModeState.lastInsertModeChanges;
+        lastInsertModeChanges.inVisualBlock = visualBlock;
         var replacement = new Array(selections.length).join('1').split('1');
         // save the selectionEnd mark
         var selectionEnd = vim.marks['>'] ? vim.marks['>'].find() : cm.getCursor('head');
@@ -1870,7 +1876,7 @@
             operatorArgs.linewise);
         if (operatorArgs.linewise) {
           // 'C' in visual block extends the block till eol for all lines
-          if (vim.visualBlock){
+          if (visualBlock){
             var startLine = curStart.line;
             while (startLine <= curEnd.line) {
               var endCh = lineLength(cm, startLine);
@@ -1900,7 +1906,7 @@
               curEnd = offsetCursor(curEnd, 0, - match[0].length);
             }
           }
-          if (vim.visualBlock) {
+          if (visualBlock) {
             cm.replaceSelections(replacement);
           } else {
             cm.setCursor(curStart);
@@ -4527,7 +4533,32 @@
       var macroModeState = vimGlobalState.macroModeState;
       var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
       var isPlaying = macroModeState.isPlaying;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      // In case of visual block, the insertModeChanges are not saved as a
+      // single word, so we convert them to a single word
+      // so as to update the ". register as expected in real vim.
+      var text = [];
       if (!isPlaying) {
+        var selLength = lastChange.inVisualBlock ? vim.lastSelection.visualBlock.height : 1;
+        var changes = lastChange.changes;
+        var text = [];
+        var i = 0;
+        // In case of multiple selections in blockwise visual,
+        // the inserted text, for example: 'f<Backspace>oo', is stored as
+        // 'f', 'f', InsertModeKey 'o', 'o', 'o', 'o'. (if you have a block with 2 lines).
+        // We push the contents of the changes array as per the following:
+        // 1. In case of InsertModeKey, just increment by 1.
+        // 2. In case of a character, jump by selLength (2 in the example).
+        while (i < changes.length) {
+          // This loop will convert 'ff<bs>oooo' to 'f<bs>oo'.
+          text.push(changes[i]);
+          if (changes[i] instanceof InsertModeKey) {
+             i++;
+          } else {
+             i+= selLength;
+          }
+        }
+        lastChange.changes = text;
         cm.off('change', onChange);
         CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
       }
@@ -4544,7 +4575,7 @@
       cm.setOption('disableInput', true);
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
       // update the ". register before exiting insert mode
-      insertModeChangeRegister.setText(macroModeState.lastInsertModeChanges.changes.join(''));
+      insertModeChangeRegister.setText(lastChange.changes.join(''));
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (macroModeState.isRecording) {
         logInsertModeChange(macroModeState);
@@ -4811,11 +4842,7 @@
           // insert mode changes. Will conform to that behavior.
           repeat = !vim.lastEditActionCommand ? 1 : repeat;
           var changeObject = macroModeState.lastInsertModeChanges;
-          // This isn't strictly necessary, but since lastInsertModeChanges is
-          // supposed to be immutable during replay, this helps catch bugs.
-          macroModeState.lastInsertModeChanges = {};
           repeatInsertModeChanges(cm, changeObject.changes, repeat);
-          macroModeState.lastInsertModeChanges = changeObject;
         }
       }
       vim.inputState = vim.lastEditInputState;
@@ -4853,6 +4880,18 @@
         }
         return true;
       }
+      var curStart = cm.getCursor();
+      var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
+      if (inVisualBlock) {
+        // Set up block selection again for repeating the changes.
+        var vim = cm.state.vim;
+        var block = vim.lastSelection.visualBlock;
+        var curEnd = Pos(curStart.line + block.height-1, curStart.ch);
+        cm.setCursor(curStart);
+        selectBlock(cm, curEnd);
+        repeat = cm.listSelections().length;
+        cm.setCursor(curStart);
+      }
       for (var i = 0; i < repeat; i++) {
         for (var j = 0; j < changes.length; j++) {
           var change = changes[j];
@@ -4863,6 +4902,10 @@
             cm.replaceRange(change, cur, cur);
           }
         }
+        if (inVisualBlock) {
+          curStart.line++;
+          cm.setCursor(curStart);
+        }
       }
     }
 
diff --git a/test/vim_test.js b/test/vim_test.js
index d10e364a93..6b9bbac17a 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -909,6 +909,19 @@ testVim('c_visual_block', function(cm, vim, helpers) {
   cm.replaceSelections(replacement);
   eq('1hworld\n5hworld\nahworld', cm.getValue());
 }, {value: '1234\n5678\nabcdefg'});
+testVim('c_visual_block_replay', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
+  var replacement = new Array(cm.listSelections().length+1).join('fo ').split(' ');
+  replacement.pop();
+  cm.replaceSelections(replacement);
+  eq('1fo4\n5fo8\nafodefg', cm.getValue());
+  helpers.doInsertModeKeys('Esc');
+  cm.setCursor(0, 0);
+  helpers.doKeys('.');
+  eq('foo4\nfoo8\nfoodefg', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+
 // Swapcase commands edit in place and do not modify registers.
 testVim('g~w_repeat', function(cm, vim, helpers) {
   // Assert that dw does delete newline if it should go to the next line, and

From 59691404418843b5edd05a0478ade03557b2cd84 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Fri, 1 Aug 2014 03:11:30 +0530
Subject: [PATCH 1496/4742] [vim] remove visualBlock check in exitVisualMode

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 30a1396275..4065f77383 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2797,13 +2797,10 @@
       updateLastSelection(cm, vim);
       vim.visualMode = false;
       vim.visualLine = false;
-      if (!cursorEqual(selectionStart, selectionEnd) && !vim.visualBlock) {
-        // Clear the selection and set the cursor only if the selection has not
-        // already been cleared. Otherwise we risk moving the cursor somewhere
-        // it's not supposed to be.
+      vim.visualBlock = false;
+      if (!cursorEqual(selectionStart, selectionEnd)) {
         cm.setCursor(clipCursorToContent(cm, selectionEnd));
       }
-      vim.visualBlock = false;
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (vim.fakeCursor) {
         vim.fakeCursor.clear();
diff --git a/test/vim_test.js b/test/vim_test.js
index 6b9bbac17a..32c4fa6fc8 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1651,6 +1651,11 @@ testVim('visual', function(cm, vim, helpers) {
   helpers.doKeys('d');
   eq('15', cm.getValue());
 }, { value: '12345' });
+testVim('visual_exit', function(cm, vim, helpers) {
+  helpers.doKeys('<C-v>', 'l', 'j', 'j', '<Esc>');
+  eq(cm.getCursor('anchor'), cm.getCursor('head'));
+  eq(vim.visualMode, false);
+}, { value: 'hello\nworld\nfoo' });
 testVim('visual_line', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'd');
   eq(' 4\n 5', cm.getValue());

From b4ecdded6357d0364fc9a51240675c9f040f039c Mon Sep 17 00:00:00 2001
From: gekkoe <gekkoe@users.noreply.github.com>
Date: Mon, 4 Aug 2014 20:26:23 -0700
Subject: [PATCH 1497/4742] [vim] Removed defunct comment.

@mightyguava fixed this issue in https://github.com/marijnh/CodeMirror/commit/45fe0a109d02f682ee435a4093843d5124cf95b9
---
 keymap/vim.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 4065f77383..a2d38719a1 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4647,13 +4647,6 @@
       // you wanted to use keys other than i j and k for two-character
       // escape sequences. Don't forget to add them in the await-second
       // section as well.
-      //
-      // Known Issue: Macro recording becomes polluted with the first
-      //              character of your sequence each time you use it.
-      //              Until this is fixed, use the actual ESC key during
-      //              macro recording. Most likely the removal of the
-      //              first character from the buffer in the function
-      //              secondEscCharacterHandler is what needs fixing.
       "'i'": firstEscCharacterHandler('i'),
       "'j'": firstEscCharacterHandler('j'),
       "'k'": firstEscCharacterHandler('k'),

From a7201ac119645198023ec2a44eeeec968a2f419d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 9 Aug 2014 12:49:06 +0200
Subject: [PATCH 1498/4742] Fix gutter width compensation in calculateScrollPos

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5bb1677afc..d7eb25e797 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3762,10 +3762,10 @@
     }
 
     var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
-    var screenw = display.scroller.clientWidth - scrollerCutOff;
+    var screenw = display.scroller.clientWidth - scrollerCutOff - display.gutters.offsetWidth;
     var tooWide = x2 - x1 > screenw;
     if (tooWide) x2 = y1 + screen;
-    if (x1 < display.gutters.offsetWidth + 10)
+    if (x1 < 10)
       result.scrollLeft = 0;
     else if (x1 < screenleft)
       result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));

From a183fa6bb190d6bacb287c3efe5da078b7b5bc74 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 9 Aug 2014 13:07:15 +0200
Subject: [PATCH 1499/4742] Less fragile way to deal with updating the
 scrollbar during editor width changes

Issue #2745
---
 lib/codemirror.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d7eb25e797..882b17b925 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2042,9 +2042,6 @@
       op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
       op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo +
                                   scrollerCutOff - display.scroller.clientWidth);
-      var prevMinWidth = display.sizer.style.minWidth;
-      if (prevMinWidth && op.barMeasure.scrollWidth > op.barMeasure.clientWidth)
-        op.barMeasure.scrollWidth += op.adjustWidthTo - parseInt(prevMinWidth);
     }
 
     if (op.updatedDisplay || op.selectionChanged)
@@ -2077,6 +2074,9 @@
   function endOperation_finish(op) {
     var cm = op.cm, display = cm.display, doc = cm.doc;
 
+    if (op.adjustWidthTo != null && Math.abs(op.barMeasure.scrollWidth - cm.display.scroller.scrollWidth) > 1)
+      updateScrollbars(cm);
+
     if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
 
     // Abort mouse wheel delta measurement, when scrolling explicitly

From 9de315b8a480c0d85625ead4453b30bf9934b8f6 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Wed, 6 Aug 2014 01:12:38 +0530
Subject: [PATCH 1500/4742] [vim] blockwise paste

---
 keymap/vim.js    | 109 ++++++++++++++++++++++++++++++++++-------------
 test/vim_test.js |  36 ++++++++++++++++
 2 files changed, 116 insertions(+), 29 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a2d38719a1..0344e8a70a 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -787,17 +787,19 @@
      * pasted, should it insert itself into a new line, or should the text be
      * inserted at the cursor position.)
      */
-    function Register(text, linewise) {
+    function Register(text, linewise, blockwise) {
       this.clear();
       this.keyBuffer = [text || ''];
       this.insertModeChanges = [];
       this.searchQueries = [];
       this.linewise = !!linewise;
+      this.blockwise = !!blockwise;
     }
     Register.prototype = {
-      setText: function(text, linewise) {
+      setText: function(text, linewise, blockwise) {
         this.keyBuffer = [text || ''];
         this.linewise = !!linewise;
+        this.blockwise = !!blockwise;
       },
       pushText: function(text, linewise) {
         // if this register has ever been set to linewise, use linewise.
@@ -842,7 +844,7 @@
       registers['/'] = new Register();
     }
     RegisterController.prototype = {
-      pushText: function(registerName, operator, text, linewise) {
+      pushText: function(registerName, operator, text, linewise, blockwise) {
         if (linewise && text.charAt(0) == '\n') {
           text = text.slice(1) + '\n';
         }
@@ -859,7 +861,7 @@
           switch (operator) {
             case 'yank':
               // The 0 register contains the text from the most recent yank.
-              this.registers['0'] = new Register(text, linewise);
+              this.registers['0'] = new Register(text, linewise, blockwise);
               break;
             case 'delete':
             case 'change':
@@ -875,7 +877,7 @@
               break;
           }
           // Make sure the unnamed register is set to what just happened
-          this.unnamedRegister.setText(text, linewise);
+          this.unnamedRegister.setText(text, linewise, blockwise);
           return;
         }
 
@@ -884,7 +886,7 @@
         if (append) {
           register.pushText(text, linewise);
         } else {
-          register.setText(text, linewise);
+          register.setText(text, linewise, blockwise);
         }
         // The unnamed register always has the same value as the last used
         // register.
@@ -1924,17 +1926,19 @@
         var curEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
         // Save the '>' mark before cm.replaceRange clears it.
         var selectionEnd, selectionStart;
+        var blockwise = vim.visualBlock;
         if (vim.visualMode) {
           selectionEnd = vim.marks['>'].find();
           selectionStart = vim.marks['<'].find();
         } else if (vim.lastSelection) {
           selectionEnd = vim.lastSelection.curStartMark.find();
           selectionStart = vim.lastSelection.curEndMark.find();
+          blockwise = vim.lastSelection.visualBlock;
         }
         var text = cm.getSelection();
         vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'delete', text,
-            operatorArgs.linewise);
+            operatorArgs.linewise, blockwise);
         var replacement = new Array(selections.length).join('1').split('1');
         // If the ending line is past the last line, inclusive, instead of
         // including the trailing \n, include the \n before the starting line
@@ -2007,11 +2011,11 @@
           cm.setCursor(cursorIsBefore(curStart, curEnd) ? curStart : curEnd);
         }
       },
-      yank: function(cm, operatorArgs, _vim, _curStart, _curEnd, curOriginal) {
+      yank: function(cm, operatorArgs, vim, _curStart, _curEnd, curOriginal) {
         var text = cm.getSelection();
         vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'yank',
-            text, operatorArgs.linewise);
+            text, operatorArgs.linewise, vim.visualBlock);
         cm.setCursor(curOriginal);
       }
     };
@@ -2374,6 +2378,7 @@
           var text = Array(actionArgs.repeat + 1).join(text);
         }
         var linewise = register.linewise;
+        var blockwise = register.blockwise;
         if (linewise) {
           if(vim.visualMode) {
             text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
@@ -2386,6 +2391,7 @@
             cur.ch = 0;
           }
         } else {
+          text = blockwise ? text.split('\n') : text;
           cur.ch += actionArgs.after ? 1 : 0;
         }
         var curPosFinal;
@@ -2397,32 +2403,71 @@
           var selectedArea = getSelectedAreaRange(cm, vim);
           var selectionStart = selectedArea[0];
           var selectionEnd = selectedArea[1];
+          var selectedText = cm.getSelection();
+          var selections = cm.listSelections();
+          var emptyStrings = new Array(selections.length).join('1').split('1');
           // save the curEnd marker before it get cleared due to cm.replaceRange.
-          if (vim.lastSelection) lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
+          if (vim.lastSelection) {
+            lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
+          }
           // push the previously selected text to unnamed register
-          vimGlobalState.registerController.unnamedRegister.setText(cm.getRange(selectionStart, selectionEnd));
-          cm.replaceRange(text, selectionStart, selectionEnd);
+          vimGlobalState.registerController.unnamedRegister.setText(selectedText);
+          if (blockwise) {
+            // first delete the selected text
+            cm.replaceSelections(emptyStrings);
+            // Set new selections as per the block length of the yanked text
+            selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch);
+            cm.setCursor(selectionStart);
+            selectBlock(cm, selectionEnd);
+            cm.replaceSelections(text);
+            curPosFinal = selectionStart;
+          } else if (vim.visualBlock) {
+            cm.replaceSelections(emptyStrings);
+            cm.setCursor(selectionStart);
+            cm.replaceRange(text, selectionStart, selectionStart);
+            curPosFinal = selectionStart;
+          } else {
+            cm.replaceRange(text, selectionStart, selectionEnd);
+            curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
+          }
           // restore the the curEnd marker
-          if(lastSelectionCurEnd) vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
-          curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
-          if(linewise)curPosFinal.ch=0;
+          if(lastSelectionCurEnd) {
+            vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
+          }
+          if (linewise) {
+            curPosFinal.ch=0;
+          }
         } else {
-          cm.replaceRange(text, cur);
-          // Now fine tune the cursor to where we want it.
-          if (linewise && actionArgs.after) {
-            curPosFinal = Pos(
+          if (blockwise) {
+            cm.setCursor(cur);
+            for (var i = 0; i < text.length; i++) {
+              var lastCh = lineLength(cm, cur.line+i);
+              if (lastCh < cur.ch) {
+                extendLineToColumn(cm, cur.line+i, cur.ch);
+              }
+            }
+            cm.setCursor(cur);
+            selectBlock(cm, Pos(cur.line + text.length-1, cur.ch));
+            cm.replaceSelections(text);
+            curPosFinal = cur;
+          } else {
+            cm.replaceRange(text, cur);
+            // Now fine tune the cursor to where we want it.
+            if (linewise && actionArgs.after) {
+              curPosFinal = Pos(
               cur.line + 1,
               findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
-          } else if (linewise && !actionArgs.after) {
-            curPosFinal = Pos(
-              cur.line,
-              findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
-          } else if (!linewise && actionArgs.after) {
-            idx = cm.indexFromPos(cur);
-            curPosFinal = cm.posFromIndex(idx + text.length - 1);
-          } else {
-            idx = cm.indexFromPos(cur);
-            curPosFinal = cm.posFromIndex(idx + text.length);
+            } else if (linewise && !actionArgs.after) {
+              curPosFinal = Pos(
+                cur.line,
+                findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
+            } else if (!linewise && actionArgs.after) {
+              idx = cm.indexFromPos(cur);
+              curPosFinal = cm.posFromIndex(idx + text.length - 1);
+            } else {
+              idx = cm.indexFromPos(cur);
+              curPosFinal = cm.posFromIndex(idx + text.length);
+            }
           }
         }
         cm.setCursor(curPosFinal);
@@ -2632,6 +2677,12 @@
     function escapeRegex(s) {
       return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
     }
+    function extendLineToColumn(cm, lineNum, column) {
+      var endCh = lineLength(cm, lineNum);
+      var spaces = new Array(column-endCh+1).join(' ');
+      cm.setCursor(Pos(lineNum, endCh));
+      cm.replaceRange(spaces, cm.getCursor());
+    }
     // This functions selects a rectangular block
     // of text with selectionEnd as any of its corner
     // Height of block:
diff --git a/test/vim_test.js b/test/vim_test.js
index 32c4fa6fc8..ce666721d0 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1865,6 +1865,42 @@ testVim('S_normal', function(cm, vim, helpers) {
   helpers.assertCursorAt(1, 0);
   eq('aa\n\ncc', cm.getValue());
 }, { value: 'aa\nbb\ncc'});
+testVim('blockwise_paste', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-v>', '3', 'j', 'l', 'y');
+  cm.setCursor(0, 2);
+  // paste one char after the current cursor position
+  helpers.doKeys('p');
+  eq('helhelo\nworwold\nfoofo\nbarba', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', '4', 'l', 'y');
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-v>', '3', 'j', 'p');
+  eq('helheelhelo\norwold\noofo\narba', cm.getValue());
+}, { value: 'hello\nworld\nfoo\nbar'});
+testVim('blockwise_paste_long/short_line', function(cm, vim, helpers) {
+  // extend short lines in case of different line lengths.
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-v>', 'j', 'j', 'y');
+  cm.setCursor(0, 3);
+  helpers.doKeys('p');
+  eq('hellho\nfoo f\nbar b', cm.getValue());
+}, { value: 'hello\nfoo\nbar'});
+testVim('blockwise_paste_cut_paste', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-v>', '2', 'j', 'x');
+  cm.setCursor(0, 0);
+  helpers.doKeys('P');
+  eq('cut\nand\npaste\nme', cm.getValue());
+}, { value: 'cut\nand\npaste\nme'});
+testVim('blockwise_paste_from_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-v>', '2', 'j', '"', 'a', 'y');
+  cm.setCursor(0, 3);
+  helpers.doKeys('"', 'a', 'p');
+  eq('foobfar\nhellho\nworlwd', cm.getValue());
+}, { value: 'foobar\nhello\nworld'});
+
 testVim('S_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('v', 'j', 'S');

From 1a58ac568989ffdc24dffdff8440e922b7055f9e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Aug 2014 13:42:41 +0200
Subject: [PATCH 1501/4742] Bump supported Firefox to 4

Range.getBoundingClientRect is not supported in FF 3.x
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 19f0365a38..dce4e12a31 100644
--- a/index.html
+++ b/index.html
@@ -185,7 +185,7 @@ <h2>Browser support</h2>
   in <em>standards mode</em> (HTML5 <code>&lt;!doctype html></code>
   recommended) are supported:</p>
   <table style="margin-bottom: 1em">
-    <tr><th>Firefox</th><td>version 3 and up</td></tr>
+    <tr><th>Firefox</th><td>version 4 and up</td></tr>
     <tr><th>Chrome</th><td>any version</td></tr>
     <tr><th>Safari</th><td>version 5.2 and up</td></tr>
     <tr><th style="padding-right: 1em;">Internet Explorer</th><td>version 8 and up</td></tr>

From 8432b6d2db93823abe7fba1b6c1fb49e46917549 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Aug 2014 13:46:53 +0200
Subject: [PATCH 1502/4742] [sass mode] Clean up coding style

---
 mode/sass/sass.js | 172 ++++++++++++++++++++--------------------------
 1 file changed, 74 insertions(+), 98 deletions(-)

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 2ff5003c0a..7b50e90d99 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -12,9 +12,9 @@
 "use strict";
 
 CodeMirror.defineMode("sass", function(config) {
-  var tokenRegexp = function(words){
+  function tokenRegexp(words) {
     return new RegExp("^" + words.join("|"));
-  };
+  }
 
   var keywords = ["true", "false", "null", "auto"];
   var keywordsRegexp = new RegExp("^" + keywords.join("|"));
@@ -24,246 +24,228 @@ CodeMirror.defineMode("sass", function(config) {
 
   var pseudoElementsRegexp = /^::?[\w\-]+/;
 
-  var urlTokens = function(stream, state){
+  function urlTokens(stream, state) {
     var ch = stream.peek();
 
-    if (ch === ")"){
+    if (ch === ")") {
       stream.next();
       state.tokenizer = tokenBase;
       return "operator";
-    }else if (ch === "("){
+    } else if (ch === "(") {
       stream.next();
       stream.eatSpace();
 
       return "operator";
-    }else if (ch === "'" || ch === '"'){
+    } else if (ch === "'" || ch === '"') {
       state.tokenizer = buildStringTokenizer(stream.next());
       return "string";
-    }else{
+    } else {
       state.tokenizer = buildStringTokenizer(")", false);
       return "string";
     }
-  };
-  var multilineComment = function(stream, state) {
-    if (stream.skipTo("*/")){
+  }
+  function multilineComment(stream, state) {
+    if (stream.skipTo("*/")) {
       stream.next();
       stream.next();
       state.tokenizer = tokenBase;
-    }else {
+    } else {
       stream.next();
     }
 
     return "comment";
-  };
+  }
 
-  var buildStringTokenizer = function(quote, greedy){
-    if(greedy == null){ greedy = true; }
+  function buildStringTokenizer(quote, greedy) {
+    if(greedy == null) { greedy = true; }
 
-    function stringTokenizer(stream, state){
+    function stringTokenizer(stream, state) {
       var nextChar = stream.next();
       var peekChar = stream.peek();
       var previousChar = stream.string.charAt(stream.pos-2);
 
       var endingString = ((nextChar !== "\\" && peekChar === quote) || (nextChar === quote && previousChar !== "\\"));
 
-      /*
-      console.log("previousChar: " + previousChar);
-      console.log("nextChar: " + nextChar);
-      console.log("peekChar: " + peekChar);
-      console.log("ending: " + endingString);
-      */
-
-      if (endingString){
+      if (endingString) {
         if (nextChar !== quote && greedy) { stream.next(); }
         state.tokenizer = tokenBase;
         return "string";
-      }else if (nextChar === "#" && peekChar === "{"){
+      } else if (nextChar === "#" && peekChar === "{") {
         state.tokenizer = buildInterpolationTokenizer(stringTokenizer);
         stream.next();
         return "operator";
-      }else {
+      } else {
         return "string";
       }
     }
 
     return stringTokenizer;
-  };
+  }
 
-  var buildInterpolationTokenizer = function(currentTokenizer){
-    return function(stream, state){
-      if (stream.peek() === "}"){
+  function buildInterpolationTokenizer(currentTokenizer) {
+    return function(stream, state) {
+      if (stream.peek() === "}") {
         stream.next();
         state.tokenizer = currentTokenizer;
         return "operator";
-      }else{
+      } else {
         return tokenBase(stream, state);
       }
     };
-  };
+  }
 
-  var indent = function(state){
-    if (state.indentCount == 0){
+  function indent(state) {
+    if (state.indentCount == 0) {
       state.indentCount++;
       var lastScopeOffset = state.scopes[0].offset;
       var currentOffset = lastScopeOffset + config.indentUnit;
       state.scopes.unshift({ offset:currentOffset });
     }
-  };
+  }
 
-  var dedent = function(state){
-    if (state.scopes.length == 1) { return; }
+  function dedent(state) {
+    if (state.scopes.length == 1) return;
 
     state.scopes.shift();
-  };
+  }
 
-  var tokenBase = function(stream, state) {
+  function tokenBase(stream, state) {
     var ch = stream.peek();
 
     // Single line Comment
-    if (stream.match('//')) {
+    if (stream.match("//")) {
       stream.skipToEnd();
       return "comment";
     }
 
     // Multiline Comment
-    if (stream.match('/*')){
+    if (stream.match("/*")) {
       state.tokenizer = multilineComment;
       return state.tokenizer(stream, state);
     }
 
     // Interpolation
-    if (stream.match('#{')){
-    state.tokenizer = buildInterpolationTokenizer(tokenBase);
+    if (stream.match("#{")) {
+      state.tokenizer = buildInterpolationTokenizer(tokenBase);
       return "operator";
     }
 
-    if (ch === "."){
+    if (ch === ".") {
       stream.next();
 
       // Match class selectors
-      if (stream.match(/^[\w-]+/)){
+      if (stream.match(/^[\w-]+/)) {
         indent(state);
         return "atom";
-      }else if (stream.peek() === "#"){
+      } else if (stream.peek() === "#") {
         indent(state);
         return "atom";
-      }else{
+      } else {
         return "operator";
       }
     }
 
-    if (ch === "#"){
+    if (ch === "#") {
       stream.next();
 
       // Hex numbers
-      if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
+      if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/))
         return "number";
-      }
 
       // ID selectors
-      if (stream.match(/^[\w-]+/)){
+      if (stream.match(/^[\w-]+/)) {
         indent(state);
         return "atom";
       }
 
-      if (stream.peek() === "#"){
+      if (stream.peek() === "#") {
         indent(state);
         return "atom";
       }
     }
 
     // Numbers
-    if (stream.match(/^-?[0-9\.]+/)){
+    if (stream.match(/^-?[0-9\.]+/))
       return "number";
-    }
 
     // Units
-    if (stream.match(/^(px|em|in)\b/)){
+    if (stream.match(/^(px|em|in)\b/))
       return "unit";
-    }
 
-    if (stream.match(keywordsRegexp)){
+    if (stream.match(keywordsRegexp))
       return "keyword";
-    }
 
-    if (stream.match(/^url/) && stream.peek() === "("){
+    if (stream.match(/^url/) && stream.peek() === "(") {
       state.tokenizer = urlTokens;
       return "atom";
     }
 
     // Variables
-    if (ch === "$"){
+    if (ch === "$") {
       stream.next();
       stream.eatWhile(/[\w-]/);
 
-      if (stream.peek() === ":"){
+      if (stream.peek() === ":") {
         stream.next();
         return "variable-2";
-      }else{
+      } else {
         return "variable-3";
       }
     }
 
-    if (ch === "!"){
+    if (ch === "!") {
       stream.next();
-
-      if (stream.match(/^[\w]+/)){
-        return "keyword";
-      }
-
-      return "operator";
+      return stream.match(/^[\w]+/) ? "keyword": "operator";
     }
 
-    if (ch === "="){
+    if (ch === "=") {
       stream.next();
 
       // Match shortcut mixin definition
-      if (stream.match(/^[\w-]+/)){
+      if (stream.match(/^[\w-]+/)) {
         indent(state);
         return "meta";
-      }else {
+      } else {
         return "operator";
       }
     }
 
-    if (ch === "+"){
+    if (ch === "+") {
       stream.next();
 
       // Match shortcut mixin definition
-      if (stream.match(/^[\w-]+/)){
+      if (stream.match(/^[\w-]+/))
         return "variable-3";
-      }else {
+      else
         return "operator";
-      }
     }
 
     // Indent Directives
-    if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)){
+    if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
       indent(state);
       return "meta";
     }
 
     // Other Directives
-    if (ch === "@"){
+    if (ch === "@") {
       stream.next();
       stream.eatWhile(/[\w-]/);
       return "meta";
     }
 
     // Strings
-    if (ch === '"' || ch === "'"){
+    if (ch === '"' || ch === "'") {
       stream.next();
       state.tokenizer = buildStringTokenizer(ch);
       return "string";
     }
 
     // Pseudo element selectors
-    if (ch == ':' && stream.match(pseudoElementsRegexp)){
+    if (ch == ":" && stream.match(pseudoElementsRegexp))
       return "keyword";
-    }
 
     // atoms
-    if (stream.eatWhile(/[\w-&]/)){
+    if (stream.eatWhile(/[\w-&]/)) {
       // matches a property definition
       if (stream.peek() === ":" && !stream.match(pseudoElementsRegexp, false))
         return "property";
@@ -271,43 +253,37 @@ CodeMirror.defineMode("sass", function(config) {
         return "atom";
     }
 
-    if (stream.match(opRegexp)){
+    if (stream.match(opRegexp))
       return "operator";
-    }
 
     // If we haven't returned by now, we move 1 character
     // and return an error
     stream.next();
     return null;
-  };
+  }
 
-  var tokenLexer = function(stream, state) {
-    if (stream.sol()){
-      state.indentCount = 0;
-    }
+  function tokenLexer(stream, state) {
+    if (stream.sol()) state.indentCount = 0;
     var style = state.tokenizer(stream, state);
     var current = stream.current();
 
-    if (current === "@return"){
+    if (current === "@return")
       dedent(state);
-    }
 
-    if (style === "atom"){
+    if (style === "atom")
       indent(state);
-    }
 
-    if (style !== null){
+    if (style !== null) {
       var startOfToken = stream.pos - current.length;
       var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);
 
       var newScopes = [];
 
-      for (var i = 0; i < state.scopes.length; i++){
+      for (var i = 0; i < state.scopes.length; i++) {
         var scope = state.scopes[i];
 
-        if (scope.offset <= withCurrentIndent){
+        if (scope.offset <= withCurrentIndent)
           newScopes.push(scope);
-        }
       }
 
       state.scopes = newScopes;
@@ -315,13 +291,13 @@ CodeMirror.defineMode("sass", function(config) {
 
 
     return style;
-  };
+  }
 
   return {
     startState: function() {
       return {
         tokenizer: tokenBase,
-        scopes: [{offset: 0, type: 'sass'}],
+        scopes: [{offset: 0, type: "sass"}],
         definedVars: [],
         definedMixins: []
       };

From f2a917e5cdef3ebffeaca1fd1afab0b9cda6d58b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Aug 2014 13:51:37 +0200
Subject: [PATCH 1503/4742] [sass mode] Terminate multiline comments on
 dedentation

Closes #2752
---
 mode/sass/sass.js | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 7b50e90d99..4326f183cf 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -44,16 +44,23 @@ CodeMirror.defineMode("sass", function(config) {
       return "string";
     }
   }
-  function multilineComment(stream, state) {
-    if (stream.skipTo("*/")) {
-      stream.next();
-      stream.next();
-      state.tokenizer = tokenBase;
-    } else {
-      stream.next();
-    }
+  function multilineComment(indentation) {
+    return function(stream, state) {
+      if (stream.sol() && stream.indentation() < indentation) {
+        state.tokenizer = tokenBase;
+        return tokenBase(stream, state);
+      }
 
-    return "comment";
+      if (stream.skipTo("*/")) {
+        stream.next();
+        stream.next();
+        state.tokenizer = tokenBase;
+      } else {
+        stream.next();
+      }
+
+      return "comment";
+    };
   }
 
   function buildStringTokenizer(quote, greedy) {
@@ -120,7 +127,7 @@ CodeMirror.defineMode("sass", function(config) {
 
     // Multiline Comment
     if (stream.match("/*")) {
-      state.tokenizer = multilineComment;
+      state.tokenizer = multilineComment(stream.indentation());
       return state.tokenizer(stream, state);
     }
 

From 0d45a4d15479ae12b8d2ce0658972828bf9887ae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Aug 2014 13:54:53 +0200
Subject: [PATCH 1504/4742] [sass mode] Add support for indented single-line
 comments

Issue #2752
---
 mode/sass/sass.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 4326f183cf..68df323e18 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -44,14 +44,14 @@ CodeMirror.defineMode("sass", function(config) {
       return "string";
     }
   }
-  function multilineComment(indentation) {
+  function comment(indentation, multiLine) {
     return function(stream, state) {
-      if (stream.sol() && stream.indentation() < indentation) {
+      if (stream.sol() && stream.indentation() <= indentation) {
         state.tokenizer = tokenBase;
         return tokenBase(stream, state);
       }
 
-      if (stream.skipTo("*/")) {
+      if (multiLine && stream.skipTo("*/")) {
         stream.next();
         stream.next();
         state.tokenizer = tokenBase;
@@ -119,15 +119,13 @@ CodeMirror.defineMode("sass", function(config) {
   function tokenBase(stream, state) {
     var ch = stream.peek();
 
-    // Single line Comment
-    if (stream.match("//")) {
-      stream.skipToEnd();
-      return "comment";
-    }
-
-    // Multiline Comment
+    // Comment
     if (stream.match("/*")) {
-      state.tokenizer = multilineComment(stream.indentation());
+      state.tokenizer = comment(stream.indentation(), true);
+      return state.tokenizer(stream, state);
+    }
+    if (stream.match("//")) {
+      state.tokenizer = comment(stream.indentation(), false);
       return state.tokenizer(stream, state);
     }
 

From 2f2fcf92a37739f78d8248f7423798a32a0f6c52 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Aug 2014 14:11:24 +0200
Subject: [PATCH 1505/4742] [merge addon] Add a revertButtons option to turn
 off revert buttons

Closes #2754
---
 addon/merge/merge.js | 32 +++++++++++++++++++-------------
 doc/manual.html      |  4 +++-
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 3583936198..bde461fcea 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -71,7 +71,7 @@
     function update(mode) {
       if (mode == "full") {
         if (dv.svg) clear(dv.svg);
-        clear(dv.copyButtons);
+        if (dv.copyButtons) clear(dv.copyButtons);
         clearMarks(dv.edit, edit.marked, dv.classes);
         clearMarks(dv.orig, orig.marked, dv.classes);
         edit.from = edit.to = orig.from = orig.to = 0;
@@ -257,7 +257,7 @@
       var w = dv.gap.offsetWidth;
       attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
     }
-    clear(dv.copyButtons);
+    if (dv.copyButtons) clear(dv.copyButtons);
 
     var flip = dv.type == "left";
     var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
@@ -279,11 +279,13 @@
               "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
               "class", dv.classes.connect);
       }
-      var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
-                                                "CodeMirror-merge-copy"));
-      copy.title = "Revert chunk";
-      copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
-      copy.style.top = top + "px";
+      if (dv.copyButtons) {
+        var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
+                                                  "CodeMirror-merge-copy"));
+        copy.title = "Revert chunk";
+        copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
+        copy.style.top = top + "px";
+      }
     });
   }
 
@@ -298,6 +300,7 @@
   var MergeView = CodeMirror.MergeView = function(node, options) {
     if (!(this instanceof MergeView)) return new MergeView(node, options);
 
+    this.options = options;
     var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
     var hasLeft = origLeft != null, hasRight = origRight != null;
     var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
@@ -345,12 +348,15 @@
     lock.title = "Toggle locked scrolling";
     var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
     CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
-    dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
-    CodeMirror.on(dv.copyButtons, "click", function(e) {
-      var node = e.target || e.srcElement;
-      if (node.chunk) copyChunk(dv, node.chunk);
-    });
-    var gapElts = [dv.copyButtons, lockWrap];
+    var gapElts = [lockWrap];
+    if (dv.mv.options.revertButtons !== false) {
+      dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
+      CodeMirror.on(dv.copyButtons, "click", function(e) {
+        var node = e.target || e.srcElement;
+        if (node.chunk) copyChunk(dv, node.chunk);
+      });
+      gapElts.unshift(dv.copyButtons);
+    }
     var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
     if (svg && !svg.createSVGRect) svg = null;
     dv.svg = svg;
diff --git a/doc/manual.html b/doc/manual.html
index e2fe2b2964..673dfba4c7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2632,7 +2632,9 @@ <h2>Addons</h2>
       document, which will be shown to the left and right of the
       editor in non-editable CodeMirror instances. The merge interface
       will highlight changes between the editable document and the
-      original(s) (<a href="../demo/merge.html">demo</a>).</dd>
+      original(s), and, unless a <code>revertButtons</code> option
+      of <code>false</code> is given, show buttons that allow the user
+      to revert changes (<a href="../demo/merge.html">demo</a>).</dd>
 
       <dt id="addon_tern"><a href="../addon/tern/tern.js"><code>tern/tern.js</code></a></dt>
       <dd>Provides integration with

From 11d1a2355b3da68d2006b844c197eb2bcca34b4a Mon Sep 17 00:00:00 2001
From: Andreas Reischuck <andreas.reischuck@hicknhack-software.com>
Date: Sun, 10 Aug 2014 00:31:27 +0200
Subject: [PATCH 1506/4742] [slim mode] Add

---
 mode/slim/index.html |  96 ++++++++
 mode/slim/slim.js    | 575 +++++++++++++++++++++++++++++++++++++++++++
 mode/slim/test.js    |  96 ++++++++
 test/index.html      |   2 +
 4 files changed, 769 insertions(+)
 create mode 100644 mode/slim/index.html
 create mode 100644 mode/slim/slim.js
 create mode 100644 mode/slim/test.js

diff --git a/mode/slim/index.html b/mode/slim/index.html
new file mode 100644
index 0000000000..1a3b6ac867
--- /dev/null
+++ b/mode/slim/index.html
@@ -0,0 +1,96 @@
+<!doctype html>
+
+<title>CodeMirror: SLIM mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/ambiance.css">
+<script src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
+<script src="https://code.jquery.com/ui/1.11.0/jquery-ui.min.js"></script>
+<link rel="stylesheet" href="https://code.jquery.com/ui/1.11.0/themes/smoothness/jquery-ui.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../htmlembedded/htmlembedded.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="../coffeescript/coffeescript.js"></script>
+<script src="../javascript/javascript.js"></script>
+<script src="../ruby/ruby.js"></script>
+<script src="../markdown/markdown.js"></script>
+<script src="slim.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">SLIM</a>
+  </ul>
+</div>
+
+<article>
+  <h2>SLIM mode</h2>
+  <form><textarea id="code" name="code">
+body
+  table
+    - for user in users
+      td id="user_#{user.id}" class=user.role
+        a href=user_action(user, :edit) Edit #{user.name}
+        a href=(path_to_user user) = user.name
+body
+  h1(id="logo") = page_logo
+  h2[id="tagline" class="small tagline"] = page_tagline
+
+h2[id="tagline"
+   class="small tagline"] = page_tagline
+
+h1 id = "logo" = page_logo
+h2 [ id = "tagline" ] = page_tagline
+
+/ comment
+  second line
+/! html comment
+   second line
+<!-- html comment -->
+<a href="#{'hello' if set}">link</a>
+a.slim href="work" disabled=false running==:atom Text <b>bold</b>
+.clazz data-id="test" == 'hello' unless quark
+ | Text mode #{12}
+   Second line
+= x ||= :ruby_atom
+#menu.left
+  - @env.each do |x|
+    li: a = x
+*@dyntag attr="val"
+.first *{:class => [:second, :third]} Text
+.second class=["text","more"]
+.third class=:text,:symbol
+
+  </textarea></form>
+  <script>
+    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+      lineNumbers: true,
+      theme: "ambiance",
+      mode: "application/x-slim"
+    });
+    $('.CodeMirror').resizable({
+      resize: function() {
+        editor.setSize($(this).width(), $(this).height());
+        //editor.refresh();
+      }
+    });
+  </script>
+
+  <p><strong>MIME types defined:</strong> <code>application/x-slim</code>.</p>
+
+  <p>
+    <strong>Parsing/Highlighting Tests:</strong>
+    <a href="../../test/index.html#slim_*">normal</a>,
+    <a href="../../test/index.html#verbose,slim_*">verbose</a>.
+  </p>
+</article>
diff --git a/mode/slim/slim.js b/mode/slim/slim.js
new file mode 100644
index 0000000000..5e737131aa
--- /dev/null
+++ b/mode/slim/slim.js
@@ -0,0 +1,575 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+  CodeMirror.defineMode("slim", function(config) {
+    var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"});
+    var rubyMode = CodeMirror.getMode(config, "ruby");
+    var modes = { html: htmlMode, ruby: rubyMode };
+    var embedded = {
+      ruby: "ruby",
+      javascript: "javascript",
+      css: "text/css",
+      sass: "text/x-sass",
+      scss: "text/x-scss",
+      less: "text/x-less",
+      styl: "text/x-styl", // no highlighting so far
+      coffee: "coffeescript",
+      asciidoc: "text/x-asciidoc",
+      markdown: "text/x-markdown",
+      textile: "text/x-textile", // no highlighting so far
+      creole: "text/x-creole", // no highlighting so far
+      wiki: "text/x-wiki", // no highlighting so far
+      mediawiki: "text/x-mediawiki", // no highlighting so far
+      rdoc: "text/x-rdoc", // no highlighting so far
+      builder: "text/x-builder", // no highlighting so far
+      nokogiri: "text/x-nokogiri", // no highlighting so far
+      erb: "application/x-erb"
+    };
+    var embeddedRegexp = function(map){
+      var arr = [];
+      for(var key in map) arr.push(key);
+      return new RegExp("^("+arr.join('|')+"):");
+    }(embedded);
+
+    var styleMap = {
+      "commentLine": "comment",
+      "slimSwitch": "operator special",
+      "slimTag": "tag",
+      "slimId": "attribute def",
+      "slimClass": "attribute qualifier",
+      "slimAttribute": "attribute",
+      "slimSubmode": "keyword special",
+      "closeAttributeTag": null,
+      "slimDoctype": null,
+      "lineContinuation": null
+    };
+    var closing = {
+      "{": "}",
+      "[": "]",
+      "(": ")"
+    };
+
+    var nameStartChar = "_a-zA-Z\xC0-\xD6\xD8-\xF6\xF8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD";
+    var nameChar = nameStartChar + "\\-0-9\xB7\u0300-\u036F\u203F-\u2040";
+    var nameRegexp = new RegExp("^[:"+nameStartChar+"](?::["+nameChar+"]|["+nameChar+"]*)");
+    var attributeNameRegexp = new RegExp("^[:"+nameStartChar+"][:\\."+nameChar+"]*(?=\\s*=)");
+    var wrappedAttributeNameRegexp = new RegExp("^[:"+nameStartChar+"][:\\."+nameChar+"]*");
+    var classNameRegexp = /^\.-?[_a-zA-Z]+[\w\-]*/;
+    var classIdRegexp = /^#[_a-zA-Z]+[\w\-]*/;
+
+    function backup(pos, tokenize, style) {
+      var restore = function(stream, state) {
+        state.tokenize = tokenize;
+        if (stream.pos < pos) {
+          stream.pos = pos;
+          return style;
+        }
+        return state.tokenize(stream, state);
+      };
+      return function(stream, state) {
+        state.tokenize = restore;
+        return tokenize(stream, state);
+      };
+    }
+
+    function maybeBackup(stream, state, pat, offset, style) {
+      var cur = stream.current();
+      var idx = cur.search(pat);
+      if (idx > -1) {
+        state.tokenize = backup(stream.pos, state.tokenize, style);
+        stream.backUp(cur.length - idx - offset);
+      }
+      return style;
+    }
+
+    function continueLine(state, column) {
+      state.stack = {
+        parent: state.stack,
+        style: "continuation",
+        indented: column,
+        tokenize: state.line
+      };
+      state.line = state.tokenize;
+    }
+    function finishContinue(state) {
+        if (state.line == state.tokenize) {
+          state.line = state.stack.tokenize;
+          state.stack = state.stack.parent;
+        }
+    }
+
+    function lineContinuable(column, tokenize) {
+      return function(stream, state) {
+        finishContinue(state);
+        if (stream.match(/^\\$/)) {
+          continueLine(state, column);
+          return "lineContinuation";
+        }
+        var style = tokenize(stream, state);
+        if (stream.eol() && stream.current().match(/(?:^|[^\\])(?:\\\\)*\\$/)) {
+          stream.backUp(1);
+        }
+        return style;
+      };
+    }
+    function commaContinuable(column, tokenize) {
+      return function(stream, state) {
+        finishContinue(state);
+        var style = tokenize(stream, state);
+        if (stream.eol() && stream.current().match(/,$/)) {
+          continueLine(state, column);
+        }
+        return style;
+      };
+    }
+
+    function rubyInQuote(endQuote, tokenize) {
+      // TODO: add multi line support
+      return function(stream, state) {
+        var ch = stream.peek();
+        if (ch == endQuote && state.rubyState.tokenize.length == 1) {
+          // step out of ruby context as it seems to complete processing all the braces
+          stream.next();
+          state.tokenize = tokenize;
+          return "closeAttributeTag";
+        } else {
+          return ruby(stream, state);
+        }
+      };
+    }
+    function startRubySplat(tokenize) {
+      var rubyState;
+      var runSplat = function(stream, state) {
+        if (state.rubyState.tokenize.length == 1 && !state.rubyState.context.prev) {
+          stream.backUp(1);
+          if (stream.eatSpace()) {
+            state.rubyState = rubyState;
+            state.tokenize = tokenize;
+            return tokenize(stream, state);
+          }
+          stream.next();
+        }
+        return ruby(stream, state);
+      };
+      return function(stream, state) {
+        rubyState = state.rubyState;
+        state.rubyState = rubyMode.startState();
+        state.tokenize = runSplat;
+        return ruby(stream, state);
+      };
+    }
+
+    function ruby(stream, state) {
+      return rubyMode.token(stream, state.rubyState);
+    }
+
+    function htmlLine(stream, state) {
+      if (stream.match(/^\\$/)) {
+        return "lineContinuation";
+      }
+      return html(stream, state);
+    }
+    function html(stream, state) {
+      if (stream.match(/^#\{/)) {
+        state.tokenize = rubyInQuote("}", state.tokenize);
+        return null;
+      }
+      return maybeBackup(stream, state, /[^\\]#\{/, 1, htmlMode.token(stream, state.htmlState));
+    }
+
+    function startHtmlLine(lastTokenize) {
+      return function(stream, state) {
+        var style = htmlLine(stream, state);
+        if (stream.eol()) state.tokenize = lastTokenize;
+        return style;
+      };
+    }
+
+    function startHtmlMode(stream, state, offset) {
+      state.stack = {
+        parent: state.stack,
+        style: "html",
+        indented: stream.column() + offset, // pipe + space
+        tokenize: state.line
+      };
+      state.line = state.tokenize = html;
+      return null;
+    }
+
+    function comment(stream, state) {
+      stream.skipToEnd();
+      return state.stack.style;
+    }
+
+    function commentMode(stream, state) {
+      state.stack = {
+        parent: state.stack,
+        style: "comment",
+        indented: state.indented + 1,
+        tokenize: state.line
+      };
+      state.line = comment;
+      return comment(stream, state);
+    }
+
+    function attributeWrapper(stream, state) {
+      if (stream.eat(state.stack.endQuote)) {
+        state.line = state.stack.line;
+        state.tokenize = state.stack.tokenize;
+        state.stack = state.stack.parent;
+        return null;
+      }
+      if (stream.match(wrappedAttributeNameRegexp)) {
+        state.tokenize = attributeWrapperAssign;
+        return "slimAttribute";
+      }
+      stream.next();
+      return null;
+    }
+    function attributeWrapperAssign(stream, state) {
+      if (stream.match(/^==?/)) {
+        state.tokenize = attributeWrapperValue;
+        return null;
+      }
+      return attributeWrapper(stream, state);
+    }
+    function attributeWrapperValue(stream, state) {
+      var ch = stream.peek();
+      if (ch == '"' || ch == "\'") {
+        state.tokenize = readQuoted(ch, "string", true, false, attributeWrapper);
+        stream.next();
+        return state.tokenize(stream, state);
+      }
+      if (ch == '[') {
+        return startRubySplat(attributeWrapper)(stream, state);
+      }
+      if (stream.match(/^(true|false|nil)\b/)) {
+        state.tokenize = attributeWrapper;
+        return "keyword";
+      }
+      return startRubySplat(attributeWrapper)(stream, state);
+    }
+
+    function startAttributeWrapperMode(state, endQuote, tokenize) {
+      state.stack = {
+        parent: state.stack,
+        style: "wrapper",
+        indented: state.indented + 1,
+        tokenize: tokenize,
+        line: state.line,
+        endQuote: endQuote
+      };
+      state.line = state.tokenize = attributeWrapper;
+      return null;
+    }
+
+    function sub(stream, state) {
+      if (stream.match(/^#\{/)) {
+        state.tokenize = rubyInQuote("}", state.tokenize);
+        return null;
+      }
+      var subStream = new CodeMirror.StringStream(stream.string.slice(state.stack.indented), stream.tabSize);
+      subStream.pos = stream.pos - state.stack.indented;
+      subStream.start = stream.start - state.stack.indented;
+      subStream.lastColumnPos = stream.lastColumnPos - state.stack.indented;
+      subStream.lastColumnValue = stream.lastColumnValue - state.stack.indented;
+      var style = state.subMode.token(subStream, state.subState);
+      stream.pos = subStream.pos + state.stack.indented;
+      return style;
+    }
+    function firstSub(stream, state) {
+      state.stack.indented = stream.column();
+      state.line = state.tokenize = sub;
+      return state.tokenize(stream, state);
+    }
+
+    function createMode(mode) {
+      var query = embedded[mode];
+      var spec = CodeMirror.mimeModes[query];
+      if (spec) {
+        return CodeMirror.getMode(config, spec);
+      }
+      var factory = CodeMirror.modes[query];
+      if (factory) {
+        return factory(config, {name: query});
+      }
+      return CodeMirror.getMode(config, "null");
+    }
+
+    function getMode(mode) {
+      if (!modes.hasOwnProperty(mode)) {
+        return modes[mode] = createMode(mode);
+      }
+      return modes[mode];
+    }
+
+    function startSubMode(mode, state) {
+      var subMode = getMode(mode);
+      var subState = subMode.startState && subMode.startState();
+
+      state.subMode = subMode;
+      state.subState = subState;
+
+      state.stack = {
+        parent: state.stack,
+        style: "sub",
+        indented: state.indented + 1,
+        tokenize: state.line
+      };
+      state.line = state.tokenize = firstSub;
+      return "slimSubmode";
+    }
+
+    function doctypeLine(stream, _state) {
+      stream.skipToEnd();
+      return "slimDoctype";
+    }
+
+    function startLine(stream, state) {
+      var ch = stream.peek();
+      if (ch == '<') {
+        return (state.tokenize = startHtmlLine(state.tokenize))(stream, state);
+      }
+      if (stream.match(/^[|']/)) {
+        return startHtmlMode(stream, state, 1);
+      }
+      if (stream.match(/^\/(!|\[\w+])?/)) {
+        return commentMode(stream, state);
+      }
+      if (stream.match(/^(-|==?[<>]?)/)) {
+        state.tokenize = lineContinuable(stream.column(), commaContinuable(stream.column(), ruby));
+        return "slimSwitch";
+      }
+      if (stream.match(/^doctype\b/)) {
+        state.tokenize = doctypeLine;
+        return "keyword";
+      }
+
+      var m = stream.match(embeddedRegexp);
+      if (m) {
+        return startSubMode(m[1], state);
+      }
+
+      return slimTag(stream, state);
+    }
+
+    function slim(stream, state) {
+      if (state.startOfLine) {
+        return startLine(stream, state);
+      }
+      return slimTag(stream, state);
+    }
+
+    function slimTag(stream, state) {
+      if (stream.eat('*')) {
+        state.tokenize = startRubySplat(slimTagExtras);
+        return null;
+      }
+      if (stream.match(nameRegexp)) {
+        state.tokenize = slimTagExtras;
+        return "slimTag";
+      }
+      return slimClass(stream, state);
+    }
+    function slimTagExtras(stream, state) {
+      if (stream.match(/^(<>?|><?)/)) {
+        state.tokenize = slimClass;
+        return null;
+      }
+      return slimClass(stream, state);
+    }
+    function slimClass(stream, state) {
+      if (stream.match(classIdRegexp)) {
+        state.tokenize = slimClass;
+        return "slimId";
+      }
+      if (stream.match(classNameRegexp)) {
+        state.tokenize = slimClass;
+        return "slimClass";
+      }
+      return slimAttribute(stream, state);
+    }
+    function slimAttribute(stream, state) {
+      if (stream.match(/^([\[\{\(])/)) {
+        return startAttributeWrapperMode(state, closing[RegExp.$1], slimAttribute);
+      }
+      if (stream.match(attributeNameRegexp)) {
+        state.tokenize = slimAttributeAssign;
+        return "slimAttribute";
+      }
+      if (stream.peek() == '*') {
+        stream.next();
+        state.tokenize = startRubySplat(slimContent);
+        return null;
+      }
+      return slimContent(stream, state);
+    }
+    function slimAttributeAssign(stream, state) {
+      if (stream.match(/^==?/)) {
+        state.tokenize = slimAttributeValue;
+        return null;
+      }
+      // should never happen, because of forward lookup
+      return slimAttribute(stream, state);
+    }
+
+    function slimAttributeValue(stream, state) {
+      var ch = stream.peek();
+      if (ch == '"' || ch == "\'") {
+        state.tokenize = readQuoted(ch, "string", true, false, slimAttribute);
+        stream.next();
+        return state.tokenize(stream, state);
+      }
+      if (ch == '[') {
+        return startRubySplat(slimAttribute)(stream, state);
+      }
+      if (ch == ':') {
+        return startRubySplat(slimAttributeSymbols)(stream, state);
+      }
+      if (stream.match(/^(true|false|nil)\b/)) {
+        state.tokenize = slimAttribute;
+        return "keyword";
+      }
+      return startRubySplat(slimAttribute)(stream, state);
+    }
+    function slimAttributeSymbols(stream, state) {
+      stream.backUp(1);
+      if (stream.match(/^[^\s],(?=:)/)) {
+        state.tokenize = startRubySplat(slimAttributeSymbols);
+        return null;
+      }
+      stream.next();
+      return slimAttribute(stream, state);
+    }
+    function readQuoted(quote, style, embed, unescaped, nextTokenize) {
+      return function(stream, state) {
+        finishContinue(state);
+        var fresh = stream.current().length == 0;
+        if (stream.match(/^\\$/, fresh)) {
+          if (!fresh) return style;
+          continueLine(state, state.indented);
+          return "lineContinuation";
+        }
+        if (stream.match(/^#\{/, fresh)) {
+          if (!fresh) return style;
+          state.tokenize = rubyInQuote("}", state.tokenize);
+          return null;
+        }
+        var escaped = false, ch;
+        while ((ch = stream.next()) != null) {
+          if (ch == quote && (unescaped || !escaped)) {
+            state.tokenize = nextTokenize;
+            break;
+          }
+          if (embed && ch == "#" && !escaped) {
+            if (stream.eat("{")) {
+              stream.backUp(2);
+              break;
+            }
+          }
+          escaped = !escaped && ch == "\\";
+        }
+        if (stream.eol() && escaped) {
+          stream.backUp(1);
+        }
+        return style;
+      };
+    }
+    function slimContent(stream, state) {
+      if (stream.match(/^==?/)) {
+        state.tokenize = ruby;
+        return "slimSwitch";
+      }
+      if (stream.match(/^\/$/)) { // tag close hint
+        state.tokenize = slim;
+        return null;
+      }
+      if (stream.match(/^:/)) { // inline tag
+        state.tokenize = slimTag;
+        return "slimSwitch";
+      }
+      startHtmlMode(stream, state, 0);
+      return state.tokenize(stream, state);
+    }
+
+    var mode = {
+      // default to html mode
+      startState: function() {
+        var htmlState = htmlMode.startState();
+        var rubyState = rubyMode.startState();
+        return {
+          htmlState: htmlState,
+          rubyState: rubyState,
+          stack: null,
+          last: null,
+          tokenize: slim,
+          line: slim,
+          indented: 0
+        };
+      },
+
+      copyState: function(state) {
+        return {
+          htmlState : CodeMirror.copyState(htmlMode, state.htmlState),
+          rubyState: CodeMirror.copyState(rubyMode, state.rubyState),
+          subMode: state.subMode,
+          subState: state.subMode && CodeMirror.copyState(state.subMode, state.subState),
+          stack: state.stack,
+          last: state.last,
+          tokenize: state.tokenize,
+          line: state.line
+        };
+      },
+
+      token: function(stream, state) {
+        if (stream.sol()) {
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+          state.tokenize = state.line;
+          while (state.stack && state.stack.indented > state.indented && state.last != "slimSubmode") {
+            state.line = state.tokenize = state.stack.tokenize;
+            state.stack = state.stack.parent;
+            state.subMode = null;
+            state.subState = null;
+          }
+        }
+        if (stream.eatSpace()) return null;
+        var style = state.tokenize(stream, state);
+        state.startOfLine = false;
+        if (style) state.last = style;
+        return styleMap.hasOwnProperty(style) ? styleMap[style] : style;
+      },
+
+      blankLine: function(state) {
+        if (state.subMode && state.subMode.blankLine) {
+          return state.subMode.blankLine(state.subState);
+        }
+      },
+
+      innerMode: function(state) {
+        if (state.subMode) return {state: state.subState, mode: state.subMode};
+        return {state: state, mode: mode};
+      }
+
+      //indent: function(state) {
+      //  return state.indented;
+      //}
+    };
+    return mode;
+  }, "htmlmixed", "ruby");
+
+  CodeMirror.defineMIME("text/x-slim", "slim");
+  CodeMirror.defineMIME("application/x-slim", "slim");
+});
diff --git a/mode/slim/test.js b/mode/slim/test.js
new file mode 100644
index 0000000000..be4ddacb62
--- /dev/null
+++ b/mode/slim/test.js
@@ -0,0 +1,96 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
+
+(function() {
+  var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "slim");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  // Requires at least one media query
+  MT("elementName",
+     "[tag h1] Hey There");
+
+  MT("oneElementPerLine",
+     "[tag h1] Hey There .h2");
+
+  MT("idShortcut",
+     "[attribute&def #test] Hey There");
+
+  MT("tagWithIdShortcuts",
+     "[tag h1][attribute&def #test] Hey There");
+
+  MT("classShortcut",
+     "[attribute&qualifier .hello] Hey There");
+
+  MT("tagWithIdAndClassShortcuts",
+     "[tag h1][attribute&def #test][attribute&qualifier .hello] Hey There");
+
+  MT("docType",
+     "[keyword doctype] xml");
+
+  MT("comment",
+     "[comment / Hello WORLD]");
+
+  MT("notComment",
+     "[tag h1] This is not a / comment ");
+
+  MT("attributes",
+     "[tag a]([attribute title]=[string \"test\"]) [attribute href]=[string \"link\"]}");
+
+  MT("multiLineAttributes",
+     "[tag a]([attribute title]=[string \"test\"]",
+     "  ) [attribute href]=[string \"link\"]}");
+
+  MT("htmlCode",
+     "[tag&bracket <][tag h1][tag&bracket >]Title[tag&bracket </][tag h1][tag&bracket >]");
+
+  MT("rubyBlock",
+     "[operator&special =][variable-2 @item]");
+
+  MT("selectorRubyBlock",
+     "[tag a][attribute&qualifier .test][operator&special =] [variable-2 @item]");
+
+  MT("nestedRubyBlock",
+      "[tag a]",
+      "  [operator&special =][variable puts] [string \"test\"]");
+
+  MT("multilinePlaintext",
+      "[tag p]",
+      "  | Hello,",
+      "    World");
+
+  MT("multilineRuby",
+      "[tag p]",
+      "  [comment /# this is a comment]",
+      "     [comment and this is a comment too]",
+      "  | Date/Time",
+      "  [operator&special -] [variable now] [operator =] [tag DateTime][operator .][property now]",
+      "  [tag strong][operator&special =] [variable now]",
+      "  [operator&special -] [keyword if] [variable now] [operator >] [tag DateTime][operator .][property parse]([string \"December 31, 2006\"])",
+      "     [operator&special =][string \"Happy\"]",
+      "     [operator&special =][string \"Belated\"]",
+      "     [operator&special =][string \"Birthday\"]");
+
+  MT("multilineComment",
+      "[comment /]",
+      "  [comment Multiline]",
+      "  [comment Comment]");
+
+  MT("hamlAfterRubyTag",
+    "[attribute&qualifier .block]",
+    "  [tag strong][operator&special =] [variable now]",
+    "  [attribute&qualifier .test]",
+    "     [operator&special =][variable now]",
+    "  [attribute&qualifier .right]");
+
+  MT("stretchedRuby",
+     "[operator&special =] [variable puts] [string \"Hello\"],",
+     "   [string \"World\"]");
+
+  MT("interpolationInHashAttribute",
+     "[tag div]{[attribute id] = [string \"]#{[variable test]}[string _]#{[variable ting]}[string \"]} test");
+
+  MT("interpolationInHTMLAttribute",
+     "[tag div]([attribute title]=[string \"]#{[variable test]}[string _]#{[variable ting]()}[string \"]) Test");
+})();
diff --git a/test/index.html b/test/index.html
index 9930301eb5..a10bd182d4 100644
--- a/test/index.html
+++ b/test/index.html
@@ -94,6 +94,8 @@ <h2>Test Suite</h2>
     <script src="../mode/haml/test.js"></script>
     <script src="../mode/markdown/markdown.js"></script>
     <script src="../mode/markdown/test.js"></script>
+    <script src="../mode/slim/slim.js"></script>
+    <script src="../mode/slim/test.js"></script>
     <script src="../mode/gfm/gfm.js"></script>
     <script src="../mode/gfm/test.js"></script>
     <script src="../mode/shell/shell.js"></script>

From b6e9eea8bb4daec6a0ff23f97104d251a0940414 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Aug 2014 14:17:48 +0200
Subject: [PATCH 1507/4742] [slim mode] Integrate

Issue #2755
---
 doc/compress.html | 1 +
 mode/index.html   | 1 +
 mode/meta.js      | 1 +
 mode/slim/slim.js | 8 ++++----
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 859210c45c..8d25e4b4e9 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -152,6 +152,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/scheme/scheme.js">scheme.js</option>
           <option value="http://codemirror.net/mode/shell/shell.js">shell.js</option>
           <option value="http://codemirror.net/mode/sieve/sieve.js">sieve.js</option>
+          <option value="http://codemirror.net/mode/slim/slim.js">slim.js</option>
           <option value="http://codemirror.net/mode/smalltalk/smalltalk.js">smalltalk.js</option>
           <option value="http://codemirror.net/mode/smarty/smarty.js">smarty.js</option>
           <option value="http://codemirror.net/mode/smartymixed/smartymixed.js">smartymixed.js</option>
diff --git a/mode/index.html b/mode/index.html
index 1aa0b8d821..1c106ae8e0 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -95,6 +95,7 @@ <h2>Language modes</h2>
       <li><a href="css/scss.html">SCSS</a></li>
       <li><a href="shell/index.html">Shell</a></li>
       <li><a href="sieve/index.html">Sieve</a></li>
+      <li><a href="slim/index.html">Slim</a></li>
       <li><a href="smalltalk/index.html">Smalltalk</a></li>
       <li><a href="smarty/index.html">Smarty</a></li>
       <li><a href="smartymixed/index.html">Smarty/HTML mixed</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 3627cd7470..e3c32b6f6c 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -86,6 +86,7 @@ CodeMirror.modeInfo = [
   {name: "SCSS", mime: "text/x-scss", mode: "css"},
   {name: "Shell", mime: "text/x-sh", mode: "shell"},
   {name: "Sieve", mime: "application/sieve", mode: "sieve"},
+  {name: "Slim", mime: "text/x-slim", mode: "slim"},
   {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk"},
   {name: "Smarty", mime: "text/x-smarty", mode: "smarty"},
   {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
diff --git a/mode/slim/slim.js b/mode/slim/slim.js
index 5e737131aa..164464d066 100644
--- a/mode/slim/slim.js
+++ b/mode/slim/slim.js
@@ -104,10 +104,10 @@
       state.line = state.tokenize;
     }
     function finishContinue(state) {
-        if (state.line == state.tokenize) {
-          state.line = state.stack.tokenize;
-          state.stack = state.stack.parent;
-        }
+      if (state.line == state.tokenize) {
+        state.line = state.stack.tokenize;
+        state.stack = state.stack.parent;
+      }
     }
 
     function lineContinuable(column, tokenize) {

From bbc53ebda20b9a0a5b889d10a3ca4a44a43b3c9a Mon Sep 17 00:00:00 2001
From: Hakan Tunc <hakan.tunc@vanderbilt.edu>
Date: Mon, 28 Jul 2014 14:36:45 -0500
Subject: [PATCH 1508/4742] Add mimetype text/x-nesc

---
 mode/clike/clike.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 2873e3629b..ee2c77a025 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -437,4 +437,15 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 
+  def("text/x-nesc", {
+    name: "clike",
+    keywords: words(cKeywords + "as atomic async call command component components configuration event generic " +
+                    "implementation includes interface module new norace nx_struct nx_union post provides " +
+                    "signal task uses abstract extends"),
+    blockKeywords: words("case do else for if switch while struct"),
+    atoms: words("null"),
+    hooks: {"#": cppHook},
+    modeProps: {fold: ["brace", "include"]}
+  });
+
 });

From a46ad916a6f40a0208c3f04b9fb35dcb7153f691 Mon Sep 17 00:00:00 2001
From: amuntean <m@ioalex.net>
Date: Mon, 28 Jul 2014 13:31:06 +0200
Subject: [PATCH 1509/4742] [merge] new allowEditingOriginals option to edit
 all compared files

---
 addon/merge/merge.css |  6 ++++++
 addon/merge/merge.js  | 27 ++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/addon/merge/merge.css b/addon/merge/merge.css
index 63237fc8e9..5d24b9bb7f 100644
--- a/addon/merge/merge.css
+++ b/addon/merge/merge.css
@@ -62,6 +62,12 @@
   color: #44c;
 }
 
+.CodeMirror-merge-copy-reverse {
+  position: absolute;
+  cursor: pointer;
+  color: #44c;
+}
+
 .CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
 .CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
 
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index bde461fcea..d9b277664b 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -37,7 +37,7 @@
     constructor: DiffView,
     init: function(pane, orig, options) {
       this.edit = this.mv.edit;
-      this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: true}, copyObj(options)));
+      this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
 
       this.diff = getDiff(asString(orig), asString(options.value));
       this.diffOutOfDate = false;
@@ -282,16 +282,27 @@
       if (dv.copyButtons) {
         var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
                                                   "CodeMirror-merge-copy"));
-        copy.title = "Revert chunk";
+        var editOriginals = dv.mv.options.allowEditingOriginals;
+        copy.title = editOriginals ? "Push to left" : "Revert chunk";
         copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
         copy.style.top = top + "px";
+
+        if (editOriginals) {
+          var topReverse = dv.orig.heightAtLine(topEdit, "local") - sTopEdit;
+          var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
+                                                           "CodeMirror-merge-copy-reverse"));
+          copyReverse.title = "Push to right";
+          copyReverse.chunk = {topEdit: topOrig, botEdit: botOrig, topOrig: topEdit, botOrig: botEdit};
+          copyReverse.style.top = topReverse + "px";
+          dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
+        }
       }
     });
   }
 
-  function copyChunk(dv, chunk) {
+  function copyChunk(dv, to, from, chunk) {
     if (dv.diffOutOfDate) return;
-    dv.edit.replaceRange(dv.orig.getRange(Pos(chunk.topOrig, 0), Pos(chunk.botOrig, 0)),
+    to.replaceRange(from.getRange(Pos(chunk.topOrig, 0), Pos(chunk.botOrig, 0)),
                          Pos(chunk.topEdit, 0), Pos(chunk.botEdit, 0));
   }
 
@@ -326,6 +337,7 @@
     (hasRight ? rightPane : editPane).className += " CodeMirror-merge-pane-rightmost";
 
     wrap.push(elt("div", null, null, "height: 0; clear: both;"));
+
     var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
     this.edit = CodeMirror(editPane, copyObj(options));
 
@@ -353,7 +365,12 @@
       dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
       CodeMirror.on(dv.copyButtons, "click", function(e) {
         var node = e.target || e.srcElement;
-        if (node.chunk) copyChunk(dv, node.chunk);
+        if (!node.chunk) return;
+        if (node.className == "CodeMirror-merge-copy-reverse") {
+          copyChunk(dv, dv.orig, dv.edit, node.chunk);
+          return;
+        }
+        copyChunk(dv, dv.edit, dv.orig, node.chunk);
       });
       gapElts.unshift(dv.copyButtons);
     }

From 162c6073e60fcc6635ba31e8ed7a0d35da68a5e0 Mon Sep 17 00:00:00 2001
From: Doug Wikle <dwikle@gmail.com>
Date: Mon, 21 Jul 2014 08:29:29 -0400
Subject: [PATCH 1510/4742] [verilog mode] Addressed indentation issue

Blocking indentation for import/export keywords
---
 mode/verilog/test.js    | 144 +++++++++++++++++++++++++++++++++++++---
 mode/verilog/verilog.js |   5 ++
 2 files changed, 138 insertions(+), 11 deletions(-)

diff --git a/mode/verilog/test.js b/mode/verilog/test.js
index e78860deb9..376d198685 100644
--- a/mode/verilog/test.js
+++ b/mode/verilog/test.js
@@ -5,7 +5,7 @@
   var mode = CodeMirror.getMode({indentUnit: 4}, "verilog");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
-  MT("Binary literals",
+  MT("binary_literals",
      "[number 1'b0]",
      "[number 1'b1]",
      "[number 1'bx]",
@@ -30,14 +30,14 @@
      "[number 'b0101]"
   );
 
-  MT("Octal literals",
+  MT("octal_literals",
      "[number 3'o7]",
      "[number 3'O7]",
      "[number 3'so7]",
      "[number 3'SO7]"
   );
 
-  MT("Decimal literals",
+  MT("decimal_literals",
      "[number 0]",
      "[number 1]",
      "[number 7]",
@@ -52,7 +52,7 @@
      "[number 32 'd 123]"
   );
 
-  MT("Hex literals",
+  MT("hex_literals",
      "[number 4'h0]",
      "[number 4'ha]",
      "[number 4'hF]",
@@ -69,7 +69,7 @@
      "[number 32'hFFF?]"
   );
 
-  MT("Real number literals",
+  MT("real_number_literals",
      "[number 1.2]",
      "[number 0.1]",
      "[number 2394.26331]",
@@ -82,36 +82,158 @@
      "[number 236.123_763_e-12]"
   );
 
-  MT("Operators",
+  MT("operators",
      "[meta ^]"
   );
 
-  MT("Keywords",
+  MT("keywords",
      "[keyword logic]",
      "[keyword logic] [variable foo]",
      "[keyword reg] [variable abc]"
   );
 
-  MT("Variables",
+  MT("variables",
      "[variable _leading_underscore]",
      "[variable _if]",
      "[number 12] [variable foo]",
      "[variable foo] [number 14]"
   );
 
-  MT("Tick defines",
+  MT("tick_defines",
      "[def `FOO]",
      "[def `foo]",
      "[def `FOO_bar]"
   );
 
-  MT("System calls",
+  MT("system_calls",
      "[meta $display]",
      "[meta $vpi_printf]"
   );
 
-  MT("Line comment", "[comment // Hello world]");
+  MT("line_comment", "[comment // Hello world]");
 
+  // Alignment tests
+  MT("align_port_map_style1",
+     /**
+      * mod mod(.a(a),
+      *         .b(b)
+      *        );
+      */
+     "[variable mod] [variable mod][bracket (].[variable a][bracket (][variable a][bracket )],",
+     "        .[variable b][bracket (][variable b][bracket )]",
+     "       [bracket )];",
+     ""
+  );
+
+  MT("align_port_map_style2",
+     /**
+      * mod mod(
+      *     .a(a),
+      *     .b(b)
+      * );
+      */
+     "[variable mod] [variable mod][bracket (]",
+     "    .[variable a][bracket (][variable a][bracket )],",
+     "    .[variable b][bracket (][variable b][bracket )]",
+     "[bracket )];",
+     ""
+  );
+
+  // Indentation tests
+  MT("indent_single_statement_if",
+      "[keyword if] [bracket (][variable foo][bracket )]",
+      "    [keyword break];",
+      ""
+  );
+
+  MT("no_indent_after_single_line_if",
+      "[keyword if] [bracket (][variable foo][bracket )] [keyword break];",
+      ""
+  );
+
+  MT("indent_after_if_begin_same_line",
+      "[keyword if] [bracket (][variable foo][bracket )] [keyword begin]",
+      "    [keyword break];",
+      "    [keyword break];",
+      "[keyword end]",
+      ""
+  );
+
+  MT("indent_after_if_begin_next_line",
+      "[keyword if] [bracket (][variable foo][bracket )]",
+      "    [keyword begin]",
+      "        [keyword break];",
+      "        [keyword break];",
+      "    [keyword end]",
+      ""
+  );
+
+  MT("indent_single_statement_if_else",
+      "[keyword if] [bracket (][variable foo][bracket )]",
+      "    [keyword break];",
+      "[keyword else]",
+      "    [keyword break];",
+      ""
+  );
+
+  MT("indent_if_else_begin_same_line",
+      "[keyword if] [bracket (][variable foo][bracket )] [keyword begin]",
+      "    [keyword break];",
+      "    [keyword break];",
+      "[keyword end] [keyword else] [keyword begin]",
+      "    [keyword break];",
+      "    [keyword break];",
+      "[keyword end]",
+      ""
+  );
+
+  MT("indent_if_else_begin_next_line",
+      "[keyword if] [bracket (][variable foo][bracket )]",
+      "    [keyword begin]",
+      "        [keyword break];",
+      "        [keyword break];",
+      "    [keyword end]",
+      "[keyword else]",
+      "    [keyword begin]",
+      "        [keyword break];",
+      "        [keyword break];",
+      "    [keyword end]",
+      ""
+  );
+
+  MT("indent_if_nested_without_begin",
+      "[keyword if] [bracket (][variable foo][bracket )]",
+      "    [keyword if] [bracket (][variable foo][bracket )]",
+      "        [keyword if] [bracket (][variable foo][bracket )]",
+      "            [keyword break];",
+      ""
+  );
+
+  MT("indent_case",
+      "[keyword case] [bracket (][variable state][bracket )]",
+      "    [variable FOO]:",
+      "        [keyword break];",
+      "    [variable BAR]:",
+      "        [keyword break];",
+      "[keyword endcase]",
+      ""
+  );
+
+  MT("unindent_after_end_with_preceding_text",
+      "[keyword begin]",
+      "    [keyword break]; [keyword end]",
+      ""
+  );
+
+  MT("export_function_does_not_indent",
+     "[keyword export] [string \"DPI-C\"] [keyword function] [variable helloFromSV];",
+     ""
+  );
+
+  MT("export_task_does_not_indent",
+     "[keyword export] [string \"DPI-C\"] [keyword task] [variable helloFromSV];",
+     ""
+  );
 
 
 })();
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 3414ec022e..46209b2492 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -95,6 +95,11 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   openClose["do"   ] = "while";
   openClose["fork" ] = "join;join_any;join_none";
 
+  // This is a bit of a hack but will work to not indent after import/epxort statements
+  // as long as the function/task name is on the same line
+  openClose["import"] = "function;task";
+  openClose["export"] = "function;task";
+
   for (var i in noIndentKeywords) {
     var keyword = noIndentKeywords[i];
     if (openClose[keyword]) {

From d0916042da46ae396e3cba45de623f2a24c137f1 Mon Sep 17 00:00:00 2001
From: TheHowl <dahhowl@gmail.com>
Date: Sun, 25 May 2014 14:49:59 +0200
Subject: [PATCH 1511/4742] [php mode] Add json, curl, mysqli extensions

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

diff --git a/mode/php/php.js b/mode/php/php.js
index 75b003ff75..f8821ed651 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -95,7 +95,7 @@
     "die echo empty exit eval include include_once isset list require require_once return " +
     "print unset __halt_compiler self static parent yield insteadof finally";
   var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
-  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once";
+  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
   CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
   CodeMirror.registerHelper("wordChars", "php", /[\w$]/);
 

From d46fd84445330c370d61c9cf38fc5e2c90236e08 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 Aug 2014 18:02:28 +0200
Subject: [PATCH 1512/4742] [sql-hint addon] Clean up, fix handling of
 whitespace

Closes #2761
---
 addon/hint/sql-hint.js | 110 ++++++++++++++++++++---------------------
 mode/sql/index.html    |  10 +++-
 2 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index fd58b8834e..cc756a2485 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -21,7 +21,7 @@
 
   function getKeywords(editor) {
     var mode = editor.doc.modeOption;
-    if(mode === "sql") mode = "text/x-sql";
+    if (mode === "sql") mode = "text/x-sql";
     return CodeMirror.resolveMode(mode).keywords;
   }
 
@@ -32,12 +32,12 @@
   }
 
   function addMatches(result, search, wordlist, formatter) {
-    for(var word in wordlist) {
-      if(!wordlist.hasOwnProperty(word)) continue;
-      if(Array.isArray(wordlist)) {
+    for (var word in wordlist) {
+      if (!wordlist.hasOwnProperty(word)) continue;
+      if (Array.isArray(wordlist)) {
         word = wordlist[word];
       }
-      if(match(search, word)) {
+      if (match(search, word)) {
         result.push(formatter(word));
       }
     }
@@ -49,33 +49,30 @@
     var string = token.string.substr(1);
     var prevCur = Pos(cur.line, token.start);
     var table = editor.getTokenAt(prevCur).string;
-    if( !tables.hasOwnProperty( table ) ){
+    if (!tables.hasOwnProperty(table))
       table = findTableByAlias(table, editor);
-    }
     var columns = tables[table];
-    if(!columns) {
-      return;
-    }
-    addMatches(result, string, columns,
-        function(w) {return "." + w;});
+    if (!columns) return;
+
+    addMatches(result, string, columns, function(w) {return "." + w;});
   }
 
   function eachWord(lineText, f) {
-    if( !lineText ){return;}
+    if (!lineText) return;
     var excepted = /[,;]/g;
-    var words = lineText.split( " " );
-    for( var i = 0; i < words.length; i++ ){
-      f( words[i]?words[i].replace( excepted, '' ) : '' );
+    var words = lineText.split(" ");
+    for (var i = 0; i < words.length; i++) {
+      f(words[i]?words[i].replace(excepted, '') : '');
     }
   }
 
-  function convertCurToNumber( cur ){
+  function convertCurToNumber(cur) {
     // max characters of a line is 999,999.
-    return cur.line + cur.ch / Math.pow( 10, 6 );
+    return cur.line + cur.ch / Math.pow(10, 6);
   }
 
-  function convertNumberToCur( num ){
-    return Pos(Math.floor( num ), +num.toString().split( '.' ).pop());
+  function convertNumberToCur(num) {
+    return Pos(Math.floor(num), +num.toString().split('.').pop());
   }
 
   function findTableByAlias(alias, editor) {
@@ -86,26 +83,26 @@
     var table = "";
     var separator = [];
     var validRange = {
-      start: Pos( 0, 0 ),
-      end: Pos( editor.lastLine(), editor.getLineHandle( editor.lastLine() ).length )
+      start: Pos(0, 0),
+      end: Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).length)
     };
 
     //add separator
-    var indexOfSeparator = fullQuery.indexOf( CONS.QUERY_DIV );
-    while( indexOfSeparator != -1 ){
-      separator.push( doc.posFromIndex(indexOfSeparator));
-      indexOfSeparator = fullQuery.indexOf( CONS.QUERY_DIV, indexOfSeparator+1);
+    var indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV);
+    while(indexOfSeparator != -1) {
+      separator.push(doc.posFromIndex(indexOfSeparator));
+      indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV, indexOfSeparator+1);
     }
-    separator.unshift( Pos( 0, 0 ) );
-    separator.push( Pos( editor.lastLine(), editor.getLineHandle( editor.lastLine() ).text.length ) );
+    separator.unshift(Pos(0, 0));
+    separator.push(Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).text.length));
 
-    //find valieRange
+    //find valid range
     var prevItem = 0;
-    var current = convertCurToNumber( editor.getCursor() );
-    for( var i=0; i< separator.length; i++){
-      var _v = convertCurToNumber( separator[i] );
-      if( current > prevItem && current <= _v ){
-        validRange = { start: convertNumberToCur( prevItem ), end: convertNumberToCur( _v ) };
+    var current = convertCurToNumber(editor.getCursor());
+    for (var i=0; i< separator.length; i++) {
+      var _v = convertCurToNumber(separator[i]);
+      if (current > prevItem && current <= _v) {
+        validRange = { start: convertNumberToCur(prevItem), end: convertNumberToCur(_v) };
         break;
       }
       prevItem = _v;
@@ -113,52 +110,51 @@
 
     var query = doc.getRange(validRange.start, validRange.end, false);
 
-    for(var i=0; i < query.length; i++){
+    for (var i = 0; i < query.length; i++) {
       var lineText = query[i];
-      eachWord( lineText, function( word ){
+      eachWord(lineText, function(word) {
         var wordUpperCase = word.toUpperCase();
-        if( wordUpperCase === aliasUpperCase && tables.hasOwnProperty( previousWord ) ){
+        if (wordUpperCase === aliasUpperCase && tables.hasOwnProperty(previousWord)) {
             table = previousWord;
         }
-        if( wordUpperCase !== CONS.ALIAS_KEYWORD ){
+        if (wordUpperCase !== CONS.ALIAS_KEYWORD) {
           previousWord = word;
         }
       });
-      if( table ){ break; }
+      if (table) break;
     }
     return table;
   }
 
-  function sqlHint(editor, options) {
+  CodeMirror.registerHelper("hint", "sql", function(editor, options) {
     tables = (options && options.tables) || {};
     keywords = keywords || getKeywords(editor);
     var cur = editor.getCursor();
-    var token = editor.getTokenAt(cur), end = token.end;
     var result = [];
-    var search = token.string.trim();
-
+    var token = editor.getTokenAt(cur), start, end, search;
+    if (token.string.match(/^\.?[\w@]+$/)) {
+      search = token.string;
+      start = token.start;
+      end = token.end;
+    } else {
+      start = end = cur.ch;
+      search = "";
+    }
     if (search.charAt(0) == ".") {
       columnCompletion(result, editor);
       if (!result.length) {
-        while (token.start && search.charAt(0) == ".") {
+        while (start && search.charAt(0) == ".") {
           token = editor.getTokenAt(Pos(cur.line, token.start - 1));
+          start = token.start;
           search = token.string + search;
         }
-        addMatches(result, search, tables,
-                   function(w) {return w;});
+        addMatches(result, search, tables, function(w) {return w;});
       }
     } else {
-      addMatches(result, search, keywords,
-                 function(w) {return w.toUpperCase();});
-      addMatches(result, search, tables,
-                 function(w) {return w;});
+      addMatches(result, search, tables, function(w) {return w;});
+      addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
     }
 
-    return {
-      list: result,
-        from: Pos(cur.line, token.start),
-        to: Pos(cur.line, end)
-    };
-  }
-  CodeMirror.registerHelper("hint", "sql", sqlHint);
+    return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
+  });
 });
diff --git a/mode/sql/index.html b/mode/sql/index.html
index 79a2e74e0f..7dd5f3075e 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -7,6 +7,9 @@
 <link rel="stylesheet" href="../../lib/codemirror.css" />
 <script src="../../lib/codemirror.js"></script>
 <script src="sql.js"></script>
+<link rel="stylesheet" href="../../addon/hint/show-hint.css" />
+<script src="../../addon/hint/show-hint.js"></script>
+<script src="../../addon/hint/sql-hint.js"></script>
 <style>
 .CodeMirror {
     border-top: 1px solid black;
@@ -68,7 +71,12 @@ <h2>SQL Mode for CodeMirror</h2>
     smartIndent: true,
     lineNumbers: true,
     matchBrackets : true,
-    autofocus: true
+    autofocus: true,
+    extraKeys: {"Ctrl-Space": "autocomplete"},
+    hintOptions: {tables: {
+      users: {name: null, score: null, birthDate: null},
+      countries: {name: null, population: null, size: null}
+    }}
   });
 };
 </script>

From ca8ac0856795d26ad71b0e24f2bd723c399d3182 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 15 Aug 2014 11:03:35 +0200
Subject: [PATCH 1513/4742] [sql-hint addon] Properly complete on dot tokens

---
 addon/hint/sql-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index cc756a2485..20653b5318 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -132,7 +132,7 @@
     var cur = editor.getCursor();
     var result = [];
     var token = editor.getTokenAt(cur), start, end, search;
-    if (token.string.match(/^\.?[\w@]+$/)) {
+    if (token.string.match(/^[.\w@]\w*$/)) {
       search = token.string;
       start = token.start;
       end = token.end;

From 7827588a4aafb09f732f383a044ba871e96c66c6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 15 Aug 2014 11:11:14 +0200
Subject: [PATCH 1514/4742] Include rtl and ltr marks as special chars, don't
 render them

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 882b17b925..c8f48092f4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4483,7 +4483,7 @@
     clearCaches(cm);
     regChange(cm);
   }, true);
-  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/g, function(cm, val) {
+  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val) {
     cm.options.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
     cm.refresh();
   }, true);

From 2b30a049fd0aa35a884a8e083d72ad33af4aa2be Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 15 Aug 2014 11:14:35 +0200
Subject: [PATCH 1515/4742] [real-world uses] Add Phantomus and Wamer

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

diff --git a/doc/realworld.html b/doc/realworld.html
index e5ae339817..899fcc3502 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -73,6 +73,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.fastfig.com/">Fastfig</a> (online computation/math tool)</li>
       <li><a href="https://metacpan.org/module/Farabi">Farabi</a> (modern Perl IDE)</li>
       <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>
+      <li><a href="https://phantomus.com/">Phantomus</a> (blogging platform)</li>
       <li><a href="http://fiddlesalad.com/">Fiddle Salad</a> (web development environment)</li>
       <li><a href="https://github.com/simogeo/Filemanager">Filemanager</a></li>
       <li><a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox Developer Tools</a></li>
@@ -144,6 +145,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://uicod.com/">uiCod</a> (animation demo gallery and sharing)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
       <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a> (code viewer)</li>
+      <li><a href="http://wamer.net/">Wamer</a> (web application builder)</li>
       <li><a href="https://github.com/brettz9/webappfind">webappfind</a> (windows file bindings for webapps)</li>
       <li><a href="http://www.webglacademy.com/">WebGL academy</a> (learning WebGL)</li>
       <li><a href="http://webglplayground.net/">WebGL playground</a></li>

From 9b06427715ec386f46a22a69f334903d143b57d2 Mon Sep 17 00:00:00 2001
From: binny <hackbinnyarora@gmail.com>
Date: Mon, 18 Aug 2014 22:03:02 +0530
Subject: [PATCH 1516/4742] [vim] visual block bugs

---
 keymap/vim.js    | 152 ++++++++++++++++++++++++++++++++---------------
 test/vim_test.js |  25 +++++++-
 2 files changed, 129 insertions(+), 48 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0344e8a70a..0bf2c78248 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2391,7 +2391,12 @@
             cur.ch = 0;
           }
         } else {
-          text = blockwise ? text.split('\n') : text;
+          if (blockwise) {
+            text = text.split('\n');
+            for (var i = 0; i < text.length; i++) {
+              text[i] = (text[i] == '') ? ' ' : text[i];
+            }
+          }
           cur.ch += actionArgs.after ? 1 : 0;
         }
         var curPosFinal;
@@ -2441,9 +2446,13 @@
           if (blockwise) {
             cm.setCursor(cur);
             for (var i = 0; i < text.length; i++) {
-              var lastCh = lineLength(cm, cur.line+i);
+              var line = cur.line+i;
+              if (line > cm.lastLine()) {
+                cm.replaceRange('\n',  Pos(line, 0));
+              }
+              var lastCh = lineLength(cm, line);
               if (lastCh < cur.ch) {
-                extendLineToColumn(cm, cur.line+i, cur.ch);
+                extendLineToColumn(cm, line, cur.ch);
               }
             }
             cm.setCursor(cur);
@@ -2692,55 +2701,86 @@
     function selectBlock(cm, selectionEnd) {
       var selections = [], ranges = cm.listSelections();
       var firstRange = ranges[0].anchor, lastRange = ranges[ranges.length-1].anchor;
-      var start, end, selectionStart;
+      var start, end, direction, selectionStart;
       var curEnd = cm.getCursor('head');
+      var originalSelectionEnd = copyCursor(selectionEnd);
+      start = firstRange.line;
+      end = lastRange.line;
+      if (selectionEnd.line < curEnd.line) {
+        direction = 'up';
+      } else if (selectionEnd.line > curEnd.line) {
+        direction = 'down';
+      } else {
+        if (selectionEnd.ch != curEnd.ch) {
+          direction = selectionEnd.ch > curEnd.ch ? 'right' : 'left';
+        }
+        selectionStart = cm.getCursor('anchor');
+      }
       var primIndex = getIndex(ranges, curEnd);
       // sets to true when selectionEnd already lies inside the existing selections
-      var contains = getIndex(ranges, selectionEnd) < 0 ? false : true;
       selectionEnd = cm.clipPos(selectionEnd);
-      // difference in distance of selectionEnd from each end of the block.
-      var near  = Math.abs(firstRange.line - selectionEnd.line) - Math.abs(lastRange.line - selectionEnd.line);
-      if (near > 0) {
-        end = selectionEnd.line;
-        start = firstRange.line;
-        if (lastRange.line == selectionEnd.line && contains) {
-          start = end;
-        }
-      } else if (near < 0) {
-        start = selectionEnd.line;
-        end = lastRange.line;
-        if (firstRange.line == selectionEnd.line && contains) {
-          end = start;
+      var contains = getIndex(ranges, selectionEnd) < 0 ? false : true;
+      var isClipped = !cursorEqual(originalSelectionEnd, selectionEnd);
+      // This function helps to check selection crossing
+      // in case of short lines.
+      var processSelectionCrossing = function() {
+        if (isClipped) {
+          if (curEnd.ch >= selectionStart.ch) {
+            selectionStart.ch++;
+          }
+        } else if (curEnd.ch == lineLength(cm, curEnd.line)) {
+          if (cursorEqual(ranges[primIndex].anchor, ranges[primIndex].head) && ranges.length>1) {
+            if (direction == 'up') {
+              if (contains || primIndex>0) {
+              start = firstRange.line;
+              end = selectionEnd.line;
+              selectionStart = ranges[primIndex-1].anchor;
+            }
+          } else {
+              if (contains || primIndex == 0) {
+                end = lastRange.line;
+                start = selectionEnd.line;
+                selectionStart = ranges[primIndex+1].anchor;
+              }
+            }
+            if (selectionEnd.ch >= selectionStart.ch) {
+              selectionStart.ch--;
+            }
+          }
         }
-      } else {
-        // Case where selectionEnd line is halfway between the 2 ends.
-        // We remove the primary selection in this case
-        if (primIndex == 0) {
-          start = selectionEnd.line;
-          end = lastRange.line;
-        } else {
-          start = firstRange.line;
+      };
+      switch(direction) {
+        case 'up':
+          start = contains ? firstRange.line : selectionEnd.line;
+          end = contains ? selectionEnd.line : lastRange.line;
+          selectionStart = lastRange;
+          processSelectionCrossing();
+          break;
+        case 'down':
+          start = contains ? selectionEnd.line : firstRange.line;
+          end = contains ? lastRange.line : selectionEnd.line;
+          selectionStart = firstRange;
+          processSelectionCrossing();
+          break;
+        case 'left':
+          if ((selectionEnd.ch <= selectionStart.ch) && (curEnd.ch > selectionStart.ch)) {
+            selectionStart.ch++;
+            selectionEnd.ch--;
+          }
+          break;
+        case 'right':
+          if ((selectionStart.ch <= selectionEnd.ch) && (curEnd.ch < selectionStart.ch)) {
+            selectionStart.ch--;
+            selectionEnd.ch++;
+          }
+          break;
+        default:
+          start = selectionStart.line;
           end = selectionEnd.line;
-        }
       }
-      if (start > end) {
-        var tmp = start;
-        start = end;
-        end = tmp;
-      }
-      selectionStart = (near > 0) ? firstRange : lastRange;
       while (start <= end) {
         var anchor = {line: start, ch: selectionStart.ch};
         var head = {line: start, ch: selectionEnd.ch};
-        // Shift the anchor right or left
-        // as each selection crosses itself.
-        if ((anchor.ch < curEnd.ch) && ((head.ch == anchor.ch) || (anchor.ch - head.ch == 1))) {
-          anchor.ch++;
-          head.ch--;
-        } else if ((anchor.ch > curEnd.ch) && ((head.ch == anchor.ch) || (anchor.ch - head.ch == -1))) {
-          anchor.ch--;
-          head.ch++;
-        }
         var range = {anchor: anchor, head: head};
         selections.push(range);
         if (cursorEqual(head, selectionEnd)) {
@@ -2752,16 +2792,29 @@
       // after selection crossing
       selectionEnd.ch = selections[0].head.ch;
       selectionStart.ch = selections[0].anchor.ch;
+      if (cursorEqual(selectionEnd, selections[0].head)) {
+        selectionStart.line = selections[selections.length-1].anchor.line;
+      } else {
+        selectionStart.line = selections[0].anchor.line;
+      }
       cm.setSelections(selections, primIndex);
       return selectionStart;
     }
-    function getIndex(ranges, head) {
+    // getIndex returns the index of the cursor in the selections.
+    function getIndex(ranges, cursor, end) {
+      var pos = -1;
       for (var i = 0; i < ranges.length; i++) {
-        if (cursorEqual(ranges[i].head, head)) {
-          return i;
+        var atAnchor = cursorEqual(ranges[i].anchor, cursor);
+        var atHead = cursorEqual(ranges[i].head, cursor);
+        if (end == 'head') {
+        pos = atHead ? i : pos;
+        } else if (end == 'anchor') {
+          pos = atAnchor ? i : pos;
+        } else {
+          pos = (atAnchor || atHead) ? i : pos;
         }
       }
-      return -1;
+      return pos;
     }
     function getSelectedAreaRange(cm, vim) {
       var lastSelection = vim.lastSelection;
@@ -2825,7 +2878,7 @@
       var ranges = cm.listSelections();
       // This check ensures to set the cursor
       // position where we left off in previous selection
-      var swap = getIndex(ranges, selectionStart) > -1;
+      var swap = getIndex(ranges, selectionStart, 'head') > -1;
       if (vim.visualBlock) {
         var height = Math.abs(selectionStart.line - selectionEnd.line)+1;
         var width =  Math.abs(selectionStart.ch - selectionEnd.ch);
@@ -2845,6 +2898,11 @@
       var vim = cm.state.vim;
       var selectionStart = cm.getCursor('anchor');
       var selectionEnd = cm.getCursor('head');
+      // hack to place the cursor at the right place
+      // in case of visual block
+      if (vim.visualBlock && (cursorIsBefore(selectionStart, selectionEnd))) {
+          selectionEnd.ch--;
+      }
       updateLastSelection(cm, vim);
       vim.visualMode = false;
       vim.visualLine = false;
diff --git a/test/vim_test.js b/test/vim_test.js
index ce666721d0..3e9b7ae66d 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1672,7 +1672,7 @@ testVim('visual_block', function(cm, vim, helpers) {
   cm.replaceRange('hello world\n{\nthis is\nsparta!', cm.getCursor());
   cm.setCursor(3, 4);
   helpers.doKeys('<C-v>', 'l', 'k', 'k', 'd');
-  eq('hello world\n{\nt is\nsta!', cm.getValue());
+  eq('hello world\n{\ntis\nsa!', cm.getValue());
   cm.replaceRange('12345\n67891\nabcde', {line: 0, ch: 0}, {line: cm.lastLine(), ch: 6});
   cm.setCursor(1, 2);
   helpers.doKeys('<C-v>', '2', 'l', 'k');
@@ -1704,6 +1704,22 @@ testVim('visual_block', function(cm, vim, helpers) {
   selections = cm.getSelections();
   eq('67891\nabcde', selections.join(''));
 }, {value: '1234\n5678\nabcdefg'});
+testVim('visual_block_crossing_short_line', function(cm, vim, helpers) {
+  // visual block with long and short lines
+  cm.setCursor(0, 3);
+  helpers.doKeys('<C-v>', 'j', 'j', 'j');
+  var selections = cm.getSelections().join();
+  eq('4,,d,b', selections);
+  helpers.doKeys('3', 'k');
+  selections = cm.getSelections().join();
+  eq('4', selections);
+}, {value: '123456\n78\nabcdefg\nfoobar'});
+testVim('visual_block_curPos_on_exit', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-v>', '3' , 'l', '<Esc>');
+  eqPos(makeCursor(0, 3), cm.getCursor());
+}, {value: '123456\n78\nabcdefg\nfoobar'});
+
 testVim('visual_marks', function(cm, vim, helpers) {
   helpers.doKeys('l', 'v', 'l', 'l', 'j', 'j', 'v');
   // Test visual mode marks
@@ -1900,6 +1916,13 @@ testVim('blockwise_paste_from_register', function(cm, vim, helpers) {
   helpers.doKeys('"', 'a', 'p');
   eq('foobfar\nhellho\nworlwd', cm.getValue());
 }, { value: 'foobar\nhello\nworld'});
+testVim('blockwise_paste_last_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'y');
+  cm.setCursor(3, 0);
+  helpers.doKeys('p');
+  eq('cut\nand\npaste\nmcue\n an\n pa', cm.getValue());
+}, { value: 'cut\nand\npaste\nme'});
 
 testVim('S_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 1);

From 85e8aa148867388ca73c93946127298a753027a0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Aug 2014 12:06:24 +0200
Subject: [PATCH 1517/4742] Add a wordCharacters option to the JavaScript mode

---
 mode/javascript/index.html    | 5 +++++
 mode/javascript/javascript.js | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index faf50363e8..59e3924e1c 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -102,6 +102,11 @@ <h2>JavaScript mode</h2>
         <li><code>statementIndent</code> which (given a number) will
         determine the amount of indentation to use for statements
         continued on a new line.</li>
+        <li><code>wordCharacters</code>, a regexp that indicates which
+        characters should be considered part of an identifier.
+        Defaults to <code>/[\w$]/</code>, which does not handle
+        non-ASCII identifiers. Can be set to something more elaborate
+        to improve Unicode support.</li>
       </ul>
     </p>
 
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 7523f72920..46616bc021 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -19,6 +19,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var jsonldMode = parserConfig.jsonld;
   var jsonMode = parserConfig.json || jsonldMode;
   var isTS = parserConfig.typescript;
+  var wordRE = parserConfig.wordCharacters || /[\w$]/;
 
   // Tokenizer
 
@@ -132,8 +133,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (isOperatorChar.test(ch)) {
       stream.eatWhile(isOperatorChar);
       return ret("operator", "operator", stream.current());
-    } else {
-      stream.eatWhile(/[\w\$_]/);
+    } else if (wordRE.test(ch)) {
+      stream.eatWhile(wordRE);
       var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
       return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
                      ret("variable", "variable", word);
@@ -202,7 +203,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         if (--depth == 0) break;
       } else if (bracket >= 3 && bracket < 6) {
         ++depth;
-      } else if (/[$\w]/.test(ch)) {
+      } else if (wordRE.test(ch)) {
         sawSomething = true;
       } else if (sawSomething && !depth) {
         ++pos;

From f1456764dd2da1fb87d8452ce32921bdcaae5c44 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Sat, 16 Aug 2014 19:06:12 +0400
Subject: [PATCH 1518/4742] [comment addon] Fix two border cases

Issue #2768
---
 addon/comment/comment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index cb78340231..d7f569cc00 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -157,12 +157,12 @@
     // Positions of the last startString before the start of the selection, and the first endString after it.
     var lastStart = startLine.lastIndexOf(startString, from.ch);
     var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
-    if (lastStart != -1 && firstEnd != -1) return false;
+    if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false;
     // Positions of the first endString after the end of the selection, and the last startString before it.
     firstEnd = endLine.indexOf(endString, to.ch);
     var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
     lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
-    if (firstEnd != -1 && lastStart != -1) return false;
+    if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false;
 
     self.operation(function() {
       self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),

From 5460e4dc0969d1f02e252373e1dcb07b8302d0c5 Mon Sep 17 00:00:00 2001
From: Nick Small <nick@shopify.com>
Date: Wed, 20 Aug 2014 18:22:14 -0400
Subject: [PATCH 1519/4742] [dialog addon] Add more options

* closeOnEnter: whether or not the dialog should be closed when you
  press enter with it focused. Defaults to true.

* closeOnBlur: whether or not the dialog should be closed when the
  textfield or button loses focus. Defaults to true.

* onClose: a callback that will be called when the close function
  completes.

* onInput: very similar to onKeyDown, but uses the input event instead
  of keydown. Just an additional event handler basically.
---
 addon/dialog/dialog.js | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 622d689ed1..16dcec51a3 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -35,8 +35,13 @@
   }
 
   CodeMirror.defineExtension("openDialog", function(template, callback, options) {
+    if (!options) options = {};
+    if (typeof options.closeOnBlur == 'undefined') options.closeOnBlur = true;
+    if (typeof options.closeOnEnter == 'undefined') options.closeOnEnter = true;
+
     closeNotification(this, null);
-    var dialog = dialogDiv(this, template, options && options.bottom);
+
+    var dialog = dialogDiv(this, template, options.bottom);
     var closed = false, me = this;
     function close(newVal) {
       if (typeof newVal == 'string') {
@@ -45,34 +50,46 @@
         if (closed) return;
         closed = true;
         dialog.parentNode.removeChild(dialog);
+        me.focus();
+
+        if (options.onClose) options.onClose(dialog);
       }
     }
+
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
-      if (options && options.value) inp.value = options.value;
+      if (options.value) inp.value = options.value;
+
+      if (options.onInput) {
+        CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});
+      }
+
+      if (options.onKeyUp) {
+        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
+      }
+
       CodeMirror.on(inp, "keydown", function(e) {
         if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
-        if (e.keyCode == 13 || e.keyCode == 27) {
+        if (e.keyCode == 27 || (options.closeOnEnter && e.keyCode == 13)) {
           inp.blur();
           CodeMirror.e_stop(e);
           close();
-          me.focus();
-          if (e.keyCode == 13) callback(inp.value);
         }
+        if (e.keyCode == 13) callback(inp.value);
       });
-      if (options && options.onKeyUp) {
-        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
-      }
-      if (options && options.value) inp.value = options.value;
+
+      if (options.closeOnBlur) CodeMirror.on(inp, "blur", close);
+
       inp.focus();
-      CodeMirror.on(inp, "blur", close);
     } else if (button = dialog.getElementsByTagName("button")[0]) {
       CodeMirror.on(button, "click", function() {
         close();
         me.focus();
       });
+
+      if (options.closeOnBlur) CodeMirror.on(button, "blur", close);
+
       button.focus();
-      CodeMirror.on(button, "blur", close);
     }
     return close;
   });

From dee145ad509aed81cca7f144cbf84ef615920635 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Aug 2014 21:50:34 +0200
Subject: [PATCH 1520/4742] [dialog addon] Small style tweaks

Issue #2777
---
 addon/dialog/dialog.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 16dcec51a3..946040cb91 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -15,11 +15,11 @@
     var wrap = cm.getWrapperElement();
     var dialog;
     dialog = wrap.appendChild(document.createElement("div"));
-    if (bottom) {
+    if (bottom)
       dialog.className = "CodeMirror-dialog CodeMirror-dialog-bottom";
-    } else {
+    else
       dialog.className = "CodeMirror-dialog CodeMirror-dialog-top";
-    }
+
     if (typeof template == "string") {
       dialog.innerHTML = template;
     } else { // Assuming it's a detached DOM element.
@@ -36,8 +36,6 @@
 
   CodeMirror.defineExtension("openDialog", function(template, callback, options) {
     if (!options) options = {};
-    if (typeof options.closeOnBlur == 'undefined') options.closeOnBlur = true;
-    if (typeof options.closeOnEnter == 'undefined') options.closeOnEnter = true;
 
     closeNotification(this, null);
 
@@ -60,17 +58,14 @@
     if (inp) {
       if (options.value) inp.value = options.value;
 
-      if (options.onInput) {
+      if (options.onInput)
         CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});
-      }
-
-      if (options.onKeyUp) {
+      if (options.onKeyUp)
         CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
-      }
 
       CodeMirror.on(inp, "keydown", function(e) {
         if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
-        if (e.keyCode == 27 || (options.closeOnEnter && e.keyCode == 13)) {
+        if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) {
           inp.blur();
           CodeMirror.e_stop(e);
           close();
@@ -78,7 +73,7 @@
         if (e.keyCode == 13) callback(inp.value);
       });
 
-      if (options.closeOnBlur) CodeMirror.on(inp, "blur", close);
+      if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);
 
       inp.focus();
     } else if (button = dialog.getElementsByTagName("button")[0]) {
@@ -87,7 +82,7 @@
         me.focus();
       });
 
-      if (options.closeOnBlur) CodeMirror.on(button, "blur", close);
+      if (options.closeOnBlur !== false) CodeMirror.on(button, "blur", close);
 
       button.focus();
     }

From c4175a04d02aa7df28bb7f20ab360b5f0ebcc41d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Aug 2014 21:56:32 +0200
Subject: [PATCH 1521/4742] [search addon] Add classes to styled elements in
 dialogs

Closes #2776
---
 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 b177dce6ed..c25aeda8b2 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -71,7 +71,7 @@
     return query;
   }
   var queryDialog =
-    'Search: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp search)</span>';
+    'Search: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
   function doSearch(cm, rev) {
     var state = getSearchState(cm);
     if (state.query) return findNext(cm, rev);
@@ -106,8 +106,8 @@
   });}
 
   var replaceQueryDialog =
-    'Replace: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp search)</span>';
-  var replacementQueryDialog = 'With: <input type="text" style="width: 10em"/>';
+    'Replace: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
+  var replacementQueryDialog = 'With: <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
   var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>";
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;

From e3da5be216e9453ec1b7f9f4b8a2f369d376ff53 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Aug 2014 21:58:25 +0200
Subject: [PATCH 1522/4742] Make indentSelection not scroll cursor into view

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c8f48092f4..7f9a529977 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4087,7 +4087,7 @@
             indentLine(this, j, how);
           var newRanges = this.doc.sel.ranges;
           if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
-            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()));
+            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll);
         } else if (range.head.line > end) {
           indentLine(this, range.head.line, how, true);
           end = range.head.line;

From 7792d88e30336e0737fdf247e370d89cb95cf41b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Aug 2014 22:36:59 +0200
Subject: [PATCH 1523/4742] Work around Webkit returning a null rectangle for a
 zero-size wrapped space

Issue #2775
---
 lib/codemirror.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7f9a529977..c02a32f2ba 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1646,18 +1646,24 @@
 
     var rect;
     if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
-      while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
-      while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
-      if (ie && ie_version < 9 && start == 0 && end == mEnd - mStart) {
-        rect = node.parentNode.getBoundingClientRect();
-      } else if (ie && cm.options.lineWrapping) {
-        var rects = range(node, start, end).getClientRects();
-        if (rects.length)
-          rect = rects[bias == "right" ? rects.length - 1 : 0];
-        else
-          rect = nullRect;
-      } else {
-        rect = range(node, start, end).getBoundingClientRect() || nullRect;
+      for (;;) {
+        while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
+        while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
+        if (ie && ie_version < 9 && start == 0 && end == mEnd - mStart) {
+          rect = node.parentNode.getBoundingClientRect();
+        } else if (ie && cm.options.lineWrapping) {
+          var rects = range(node, start, end).getClientRects();
+          if (rects.length)
+            rect = rects[bias == "right" ? rects.length - 1 : 0];
+          else
+            rect = nullRect;
+        } else {
+          rect = range(node, start, end).getBoundingClientRect() || nullRect;
+        }
+        if (rect.left || rect.right || start == 0) break;
+        end = start;
+        start = start - 1;
+        collapse = "right";
       }
     } else { // If it is a widget, simply get the box for the whole widget.
       if (start > 0) collapse = bias = "right";

From 43e88d47524fc1941fe3b74c13987be23e0feb02 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Aug 2014 22:55:30 +0200
Subject: [PATCH 1524/4742] Mark release 4.5.0

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

diff --git a/AUTHORS b/AUTHORS
index 0c2f67c31a..acc10fe16d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,12 +24,14 @@ Alexandre Bique
 alexey-k
 Alex Piggott
 Amsul
+amuntean
 Amy
 Ananya Sen
 anaran
 AndersMad
 Anders Nawroth
 Anderson Mesquita
+Andreas Reischuck
 Andre von Houck
 Andrey Lushnikov
 Andy Joslin
@@ -128,6 +130,7 @@ Gabriel Horner
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
+gekkoe
 Gergely Hegykozi
 Glenn Jorde
 Glenn Ruehle
@@ -138,6 +141,7 @@ greengiant
 Guillaume Massé
 Guillaume Massé
 Gustavo Rodrigues
+Hakan Tunc
 Hans Engel
 Hardest
 Hasan Karahan
@@ -268,6 +272,7 @@ nextrevision
 nguillaumin
 Ng Zhi An
 Nicholas Bollweg
+Nick Small
 Niels van Groningen
 Nikita Beloglazov
 Nikita Vasilyev
@@ -334,6 +339,7 @@ Takuji Shimokawa
 Tarmil
 tfjgeorge
 Thaddee Tyl
+TheHowl
 think
 Thomas Dvornik
 Thomas Schmid
diff --git a/bower.json b/bower.json
index 3ea24094d7..9cf2abecfe 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.4.1",
+  "version":"4.5.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index 8d25e4b4e9..46c102af47 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.5.0;f=">4.5</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.4.0;f=">4.4</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.3.0;f=">4.3</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.2.1;f=">4.2</option>
diff --git a/doc/manual.html b/doc/manual.html
index 673dfba4c7..a511d9bc5b 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 4.4.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.5.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 354084b0da..4b6d384b9e 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,16 @@ <h2>Release notes and version history</h2>
 
   <h2 id="v4">Version 4.x</h2>
 
+  <p class="rel">21-08-2014: <a href="http://codemirror.net/codemirror-4.5.zip">Version 4.5</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix several serious bugs with horizontal scrolling</li>
+    <li>New mode: <a href="../mode/slim/index.html">Slim</a></li>
+    <li>New command: <a href="manual.html#command_goLineLeftSmart"><code>goLineLeftSmart</code></a></li>
+    <li>More fixes and extensions for the <a href="../demo/vim.html">Vim</a> visual block mode</li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.4.0...4.5.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">21-07-2014: <a href="http://codemirror.net/codemirror-4.4.zip">Version 4.4</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index dce4e12a31..391ee507cf 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.4</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.5</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c02a32f2ba..61e8c41eb3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7825,7 +7825,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.4.1";
+  CodeMirror.version = "4.5.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 467658ddf3..47f05587aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.4.1",
+    "version":"4.5.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 01b8a8860c29a4d5e3aace33250159d2ccf64d7f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 21 Aug 2014 23:03:46 +0200
Subject: [PATCH 1525/4742] Bump version number post-4.5.0

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

diff --git a/bower.json b/bower.json
index 9cf2abecfe..534021cc1e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.5.0",
+  "version":"4.5.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index a511d9bc5b..a81e7d2791 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 4.5.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.5.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 61e8c41eb3..34eaeebe18 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7825,7 +7825,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.5.0";
+  CodeMirror.version = "4.5.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 47f05587aa..34a1ecb52a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.5.0",
+    "version":"4.5.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From b62d6b0e84c879326cff987ea5fe08e69e9fe818 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 23 Aug 2014 22:05:18 +0200
Subject: [PATCH 1526/4742] Bound retry count in measureCharInner hack for
 wrapping characters

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 34eaeebe18..c5c0443601 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1646,7 +1646,7 @@
 
     var rect;
     if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
-      for (;;) {
+      for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
         while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
         while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
         if (ie && ie_version < 9 && start == 0 && end == mEnd - mStart) {

From b3134823f85e3d87193614110554d6670d4cf094 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 23 Aug 2014 22:07:06 +0200
Subject: [PATCH 1527/4742] Work around odd safari behavior in bad bidi rect
 feature detection

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c5c0443601..2c3b17df67 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7462,7 +7462,7 @@
     if (badBidiRects != null) return badBidiRects;
     var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
     var r0 = range(txt, 0, 1).getBoundingClientRect();
-    if (r0.left == r0.right) return false;
+    if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
     var r1 = range(txt, 1, 2).getBoundingClientRect();
     return badBidiRects = (r1.right - r0.right < 3);
   }

From 76db4c110b6f20a190958aeb4e341fd91a964b13 Mon Sep 17 00:00:00 2001
From: Nick Small <nick@shopify.com>
Date: Thu, 21 Aug 2014 18:12:00 -0400
Subject: [PATCH 1528/4742] [dialog addon] Document openDialog options and
 openNotification function

---
 addon/dialog/dialog.js |  2 ++
 doc/manual.html        | 45 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 946040cb91..56aaf3e4e1 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -145,5 +145,7 @@
     });
     if (duration)
       doneTimer = setTimeout(close, options.duration);
+
+    return close;
   });
 });
diff --git a/doc/manual.html b/doc/manual.html
index a81e7d2791..6069fa6aea 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2053,14 +2053,43 @@ <h2>Addons</h2>
     <dl>
       <dt id="addon_dialog"><a href="../addon/dialog/dialog.js"><code>dialog/dialog.js</code></a></dt>
       <dd>Provides a very simple way to query users for text input.
-      Adds an <strong><code>openDialog</code></strong> method to
-      CodeMirror instances, which can be called with an HTML fragment
-      or a detached DOM node that provides the prompt (should include
-      an <code>input</code> tag), and a callback function that is called
-      when text has been entered. Also adds
-      an <strong><code>openNotification</code></strong> function that
-      simply shows an HTML fragment as a notification. Depends
-      on <code>addon/dialog/dialog.css</code>.</dd>
+      Adds the <strong><code>openDialog(template, callback, options) →
+      closeFunction</code></strong> method to CodeMirror instances,
+      which can be called with an HTML fragment or a detached DOM
+      node that provides the prompt (should include an <code>input</code>
+      or <code>button</code> tag), and a callback function that is called
+      when the user presses enter. It returns a function <code>closeFunction</code>
+      which, if called, will close the dialog immediately.
+      <strong><code>openDialog</code></strong> takes the following options:
+        <dl>
+          <dt><code><strong>closeOnEnter</strong></code>:</dt>
+          <dd>If true, the dialog will be closed when the user presses
+          enter in the input. Defaults to <code>true</code>.</dd>
+          <dt><code><strong>onKeyDown</strong></code>:</dt>
+          <dd>An event handler of the signature <code>(event, value, closeFunction)</code>
+          that will be called whenever <code>keydown</code> fires in the
+          dialog's input. If your callback returns <code>true</code>,
+          the dialog will not do any further processing of the event.</dd>
+          <dt><code><strong>onKeyUp</strong></code>:</dt>
+          <dd>Same as <code>onKeyDown</code> but for the
+          <code>keyup</code> event.</dd>
+          <dt><code><strong>onInput</strong></code>:</dt>
+          <dd>Same as <code>onKeyDown</code> but for the
+          <code>input</code> event.</dd>
+          <dt><code><strong>onClose</strong></code>:</dt>
+          <dd>A callback of the signature <code>(dialogInstance)</code>
+          that will be called after the dialog has been closed and
+          removed from the DOM. No return value.</dd>
+        </dl>
+
+      <p>Also adds an <strong><code>openNotification(template, options) →
+      closeFunction</code></strong> function that simply shows an HTML
+      fragment as a notification at the top of the editor. It takes a
+      single option: <code>duration</code>, the amount of time after
+      which the notification will be automatically closed. If <code>
+      duration</code> is zero, the dialog will not be closed automatically.</p>
+
+      <p>Depends on <code>addon/dialog/dialog.css</code>.</p></dd>
 
       <dt id="addon_searchcursor"><a href="../addon/search/searchcursor.js"><code>search/searchcursor.js</code></a></dt>
       <dd>Adds the <code>getSearchCursor(query, start, caseFold) →

From 5e0692ffd181a1aa935e637ce918cc796fa45039 Mon Sep 17 00:00:00 2001
From: Nick Small <nick@shopify.com>
Date: Thu, 21 Aug 2014 18:20:22 -0400
Subject: [PATCH 1529/4742] [dialog addon] Fix default openNotification
 duration

---
 addon/dialog/dialog.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 56aaf3e4e1..35a6103c2d 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -129,8 +129,8 @@
   CodeMirror.defineExtension("openNotification", function(template, options) {
     closeNotification(this, close);
     var dialog = dialogDiv(this, template, options && options.bottom);
-    var duration = options && (options.duration === undefined ? 5000 : options.duration);
     var closed = false, doneTimer;
+    var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
 
     function close() {
       if (closed) return;
@@ -143,8 +143,9 @@
       CodeMirror.e_preventDefault(e);
       close();
     });
+
     if (duration)
-      doneTimer = setTimeout(close, options.duration);
+      doneTimer = setTimeout(close, duration);
 
     return close;
   });

From bcb3737540279128a2e42194f9b76f4237e36549 Mon Sep 17 00:00:00 2001
From: lochel <lennart.ochel@fh-bielefeld.de>
Date: Fri, 15 Aug 2014 13:38:35 +0200
Subject: [PATCH 1530/4742] [modelica mode] Add

---
 doc/compress.html         |   1 +
 mode/index.html           |   1 +
 mode/meta.js              |   1 +
 mode/modelica/index.html  |  67 +++++++++++
 mode/modelica/modelica.js | 245 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 315 insertions(+)
 create mode 100644 mode/modelica/index.html
 create mode 100644 mode/modelica/modelica.js

diff --git a/doc/compress.html b/doc/compress.html
index 46c102af47..e4178a2d80 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -131,6 +131,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
           <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/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 1c106ae8e0..e3339ad085 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -71,6 +71,7 @@ <h2>Language modes</h2>
       <li><a href="lua/index.html">Lua</a></li>
       <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="nginx/index.html">Nginx</a></li>
       <li><a href="ntriples/index.html">NTriples</a></li>
       <li><a href="mllike/index.html">OCaml</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index e3c32b6f6c..d8ddd474c5 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -62,6 +62,7 @@ CodeMirror.modeInfo = [
   {name: "Lua", mime: "text/x-lua", mode: "lua"},
   {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown"},
   {name: "mIRC", mime: "text/mirc", mode: "mirc"},
+  {name: "Modelica", mime: "text/x-modelica", mode: "modelica"},
   {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx"},
   {name: "NTriples", mime: "text/n-triples", mode: "ntriples"},
   {name: "OCaml", mime: "text/x-ocaml", mode: "mllike"},
diff --git a/mode/modelica/index.html b/mode/modelica/index.html
new file mode 100644
index 0000000000..eb4f08c57d
--- /dev/null
+++ b/mode/modelica/index.html
@@ -0,0 +1,67 @@
+<!doctype html>
+
+<title>CodeMirror: Modelica 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/edit/matchbrackets.js"></script>
+<link rel="stylesheet" href="../../addon/hint/show-hint.css">
+<script src="../../addon/hint/show-hint.js"></script>
+<script src="modelica.js"></script>
+<style>.CodeMirror {border: 2px inset #dee;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Modelica</a>
+  </ul>
+</div>
+
+<article>
+<h2>Modelica mode</h2>
+
+<div><textarea id="modelica">
+model BouncingBall
+  parameter Real e = 0.7;
+  parameter Real g = 9.81;
+  Real h(start=1);
+  Real v;
+  Boolean flying(start=true);
+  Boolean impact;
+  Real v_new;
+equation
+  impact = h <= 0.0;
+  der(v) = if flying then -g else 0;
+  der(h) = v;
+  when {h <= 0.0 and v <= 0.0, impact} then
+    v_new = if edge(impact) then -e*pre(v) else 0;
+    flying = v_new > 0;
+    reinit(v, v_new);
+  end when;
+  annotation (uses(Modelica(version="3.2")));
+end BouncingBall;
+</textarea></div>
+
+    <script>
+      var modelicaEditor = CodeMirror.fromTextArea(document.getElementById("modelica"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-modelica"
+      });
+      var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
+      CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
+    </script>
+
+    <p>Simple mode that tries to handle Modelica as well as it can.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-modelica</code>
+    (Modlica code).</p>
+</article>
diff --git a/mode/modelica/modelica.js b/mode/modelica/modelica.js
new file mode 100644
index 0000000000..77ec7a3c18
--- /dev/null
+++ b/mode/modelica/modelica.js
@@ -0,0 +1,245 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Modelica support for CodeMirror, copyright (c) by Lennart Ochel
+
+(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("modelica", function(config, parserConfig) {
+
+    var indentUnit = config.indentUnit;
+    var keywords = parserConfig.keywords || {};
+    var builtin = parserConfig.builtin || {};
+    var atoms = parserConfig.atoms || {};
+
+    var isSingleOperatorChar = /[;=\(:\),{}.*<>+\-\/^\[\]]/;
+    var isDoubleOperatorChar = /(:=|<=|>=|==|<>|\.\+|\.\-|\.\*|\.\/|\.\^)/;
+    var isDigit = /[0-9]/;
+    var isNonDigit = /[_a-zA-Z]/;
+
+    function tokenLineComment(stream, state) {
+      stream.skipToEnd();
+      state.tokenize = null;
+      return "comment";
+    }
+
+    function tokenBlockComment(stream, state) {
+      var maybeEnd = false, ch;
+      while (ch = stream.next()) {
+        if (maybeEnd && ch == "/") {
+          state.tokenize = null;
+          break;
+        }
+        maybeEnd = (ch == "*");
+      }
+      return "comment";
+    }
+
+    function tokenString(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == '"' && !escaped) {
+          state.tokenize = null;
+          state.sol = false;
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+
+      return "string";
+    }
+
+    function tokenIdent(stream, state) {
+      stream.eatWhile(isDigit);
+      while (stream.eat(isDigit) || stream.eat(isNonDigit)) { }
+
+
+      var cur = stream.current();
+
+      if(state.sol && (cur == "package" || cur == "model" || cur == "when" || cur == "connector")) state.level++;
+      else if(state.sol && cur == "end" && state.level > 0) state.level--;
+
+      state.tokenize = null;
+      state.sol = false;
+
+      if (keywords.propertyIsEnumerable(cur)) return "keyword";
+      else if (builtin.propertyIsEnumerable(cur)) return "builtin";
+      else if (atoms.propertyIsEnumerable(cur)) return "atom";
+      else return "variable";
+    }
+
+    function tokenQIdent(stream, state) {
+      while (stream.eat(/[^']/)) { }
+
+      state.tokenize = null;
+      state.sol = false;
+
+      if(stream.eat("'"))
+        return "variable";
+      else
+        return "error";
+    }
+
+    function tokenUnsignedNuber(stream, state) {
+      stream.eatWhile(isDigit);
+      if (stream.eat('.')) {
+        stream.eatWhile(isDigit);
+      }
+      if (stream.eat('e') || stream.eat('E')) {
+        if (!stream.eat('-'))
+          stream.eat('+');
+        stream.eatWhile(isDigit);
+      }
+
+      state.tokenize = null;
+      state.sol = false;
+      return "number";
+    }
+
+    // Interface
+    return {
+      startState: function() {
+        return {
+          tokenize: null,
+          level: 0,
+          sol: true
+        };
+      },
+
+      token: function(stream, state) {
+        if(state.tokenize != null) {
+          return state.tokenize(stream, state);
+        }
+
+        if(stream.sol()) {
+          state.sol = true;
+        }
+
+        // WHITESPACE
+        if(stream.eatSpace()) {
+          state.tokenize = null;
+          return null;
+        }
+
+        var ch = stream.next();
+
+        // LINECOMMENT
+        if(ch == '/' && stream.eat('/')) {
+          state.tokenize = tokenLineComment;
+        }
+        // BLOCKCOMMENT
+        else if(ch == '/' && stream.eat('*')) {
+          state.tokenize = tokenBlockComment;
+        }
+        // TWO SYMBOL TOKENS
+        else if(isDoubleOperatorChar.test(ch+stream.peek())) {
+          stream.next();
+          state.tokenize = null;
+          return "operator";
+        }
+        // SINGLE SYMBOL TOKENS
+        else if(isSingleOperatorChar.test(ch)) {
+          state.tokenize = null;
+          return "operator";
+        }
+        // IDENT
+        else if(isNonDigit.test(ch)) {
+          state.tokenize = tokenIdent;
+        }
+        // Q-IDENT
+        else if(ch == "'" && stream.peek() && stream.peek() != "'") {
+          state.tokenize = tokenQIdent;
+        }
+        // STRING
+        else if(ch == '"') {
+          state.tokenize = tokenString;
+        }
+        // UNSIGNED_NUBER
+        else if(isDigit.test(ch)) {
+          state.tokenize = tokenUnsignedNuber;
+        }
+        // ERROR
+        else {
+          state.tokenize = null;
+          return "error";
+        }
+
+        return state.tokenize(stream, state);
+      },
+
+      indent: function(state, textAfter) {
+        if (state.tokenize != null) return CodeMirror.Pass;
+
+        var level = state.level;
+        if(/(algorithm)/.test(textAfter)) level--;
+        if(/(equation)/.test(textAfter)) level--;
+        if(/(initial algorithm)/.test(textAfter)) level--;
+        if(/(initial equation)/.test(textAfter)) level--;
+        if(/(end)/.test(textAfter)) level--;
+
+        if(level > 0)
+          return indentUnit*level;
+        else
+          return 0;
+      },
+
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      lineComment: "//"
+    };
+  });
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i=0; i<words.length; ++i)
+      obj[words[i]] = true;
+    return obj;
+  }
+
+  var modelicaKeywords = "algorithm and annotation assert block break class connect connector constant constrainedby der discrete each else elseif elsewhen encapsulated end enumeration equation expandable extends external false final flow for function if import impure in initial inner input loop model not operator or outer output package parameter partial protected public pure record redeclare replaceable return stream then true type when while within";
+  var modelicaBuiltin = "abs acos actualStream asin atan atan2 cardinality ceil cos cosh delay div edge exp floor getInstanceName homotopy inStream integer log log10 mod pre reinit rem semiLinear sign sin sinh spatialDistribution sqrt tan tanh";
+  var modelicaAtoms = "Real Boolean Integer String";
+
+  function def(mimes, mode) {
+    if (typeof mimes == "string")
+      mimes = [mimes];
+
+    var words = [];
+
+    function add(obj) {
+      if (obj)
+        for (var prop in obj)
+          if (obj.hasOwnProperty(prop))
+            words.push(prop);
+    }
+
+    add(mode.keywords);
+    add(mode.builtin);
+    add(mode.atoms);
+
+    if (words.length) {
+      mode.helperType = mimes[0];
+      CodeMirror.registerHelper("hintWords", mimes[0], words);
+    }
+
+    for (var i=0; i<mimes.length; ++i)
+      CodeMirror.defineMIME(mimes[i], mode);
+  }
+
+  def(["text/x-modelica"], {
+    name: "modelica",
+    keywords: words(modelicaKeywords),
+    builtin: words(modelicaBuiltin),
+    atoms: words(modelicaAtoms)
+  });
+});

From 027e57732fb00ca9a1f60daafd382c9f8055e442 Mon Sep 17 00:00:00 2001
From: Andrey Fedorov <anfedorov@gmail.com>
Date: Wed, 27 Aug 2014 00:39:53 -0700
Subject: [PATCH 1531/4742] [python mode] Make 'in' a keyword

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

diff --git a/mode/python/python.js b/mode/python/python.js
index 45dd63ba48..4e1f296ae1 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -15,12 +15,12 @@
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var wordOperators = wordRegexp(["and", "or", "not", "is", "in"]);
+  var wordOperators = wordRegexp(["and", "or", "not", "is"]);
   var commonKeywords = ["as", "assert", "break", "class", "continue",
                         "def", "del", "elif", "else", "except", "finally",
                         "for", "from", "global", "if", "import",
                         "lambda", "pass", "raise", "return",
-                        "try", "while", "with", "yield"];
+                        "try", "while", "with", "yield", "in"];
   var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
                         "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
                         "enumerate", "eval", "filter", "float", "format", "frozenset",

From 43379968f6a62b89e2b350acd9174971e3e50706 Mon Sep 17 00:00:00 2001
From: Hiroyuki Makino <kumaki0@gmail.com>
Date: Thu, 28 Aug 2014 23:03:04 +0900
Subject: [PATCH 1532/4742] [release notes] Fix section structure

---
 doc/releases.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/releases.html b/doc/releases.html
index 4b6d384b9e..f88a0373a6 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -25,9 +25,9 @@
 
 <h2>Release notes and version history</h2>
 
-<section id=v3 class=first>
+<section id=v4 class=first>
 
-  <h2 id="v4">Version 4.x</h2>
+  <h2>Version 4.x</h2>
 
   <p class="rel">21-08-2014: <a href="http://codemirror.net/codemirror-4.5.zip">Version 4.5</a>:</p>
 
@@ -114,7 +114,11 @@ <h2 id="v4">Version 4.x</h2>
     <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.23.0...4.0.3">list of patches</a>.</li>
   </ul>
 
-  <h2 id="v3">Version 3.x</h2>
+</section>
+
+<section id=v3>
+
+  <h2>Version 3.x</h2>
 
   <p class="rel">22-04-2014: <a href="http://codemirror.net/codemirror-3.24.zip">Version 3.24</a>:</p>
 

From 3d8c1e506fd80feeb28a873a6dc6d1087d82327a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Sep 2014 13:32:06 +0200
Subject: [PATCH 1533/4742] Export findWordAt

Closes #2790
---
 doc/manual.html   |  4 ++++
 lib/codemirror.js | 42 +++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 6069fa6aea..02f3a59aaf 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1312,6 +1312,10 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       be <code>"line"</code> or <code>"page"</code>. The other
       arguments and the returned value have the same interpretation as
       they have in <code>findPosH</code>.</dd>
+
+      <dt id="findWordAt"><code><strong>cm.findWordAt</strong>(pos: {line, ch}) → {anchor: {line, ch}, head: {line, ch}}</code></dt>
+      <dd>Returns the start and end of the 'word' (the stretch of
+      letters, whitespace, or punctuation) at the given position.</dd>
     </dl>
 
     <h3 id="api_configuration">Configuration methods</h3>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2c3b17df67..4270b98a45 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2528,7 +2528,7 @@
         var pos = posFromMouse(cm, e);
         if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
         e_preventDefault(e);
-        var word = findWordAt(cm, pos);
+        var word = cm.findWordAt(pos);
         extendSelection(cm.doc, word.anchor, word.head);
       }));
     else
@@ -2807,7 +2807,7 @@
       start = posFromMouse(cm, e, true, true);
       ourIndex = -1;
     } else if (type == "double") {
-      var word = findWordAt(cm, start);
+      var word = cm.findWordAt(start);
       if (cm.display.shift || doc.extend)
         ourRange = extendRange(doc, ourRange, word.anchor, word.head);
       else
@@ -2861,7 +2861,7 @@
         var anchor = oldRange.anchor, head = pos;
         if (type != "single") {
           if (type == "double")
-            var range = findWordAt(cm, pos);
+            var range = cm.findWordAt(pos);
           else
             var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
           if (cmp(range.anchor, anchor) > 0) {
@@ -3999,24 +3999,6 @@
     return target;
   }
 
-  // Find the word at the given position (as returned by coordsChar).
-  function findWordAt(cm, pos) {
-    var doc = cm.doc, line = getLine(doc, pos.line).text;
-    var start = pos.ch, end = pos.ch;
-    if (line) {
-      var helper = cm.getHelper(pos, "wordChars");
-      if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
-      var startChar = line.charAt(start);
-      var check = isWordChar(startChar, helper)
-        ? function(ch) { return isWordChar(ch, helper); }
-        : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
-        : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-      while (start > 0 && check(line.charAt(start - 1))) --start;
-      while (end < line.length && check(line.charAt(end))) ++end;
-    }
-    return new Range(Pos(pos.line, start), Pos(pos.line, end));
-  }
-
   // EDITOR METHODS
 
   // The publicly visible API. Note that methodOp(f) means
@@ -4358,6 +4340,24 @@
         doc.sel.ranges[i].goalColumn = goals[i];
     }),
 
+    // Find the word at the given position (as returned by coordsChar).
+    findWordAt: function(pos) {
+      var doc = this.doc, line = getLine(doc, pos.line).text;
+      var start = pos.ch, end = pos.ch;
+      if (line) {
+        var helper = this.getHelper(pos, "wordChars");
+        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
+        var startChar = line.charAt(start);
+        var check = isWordChar(startChar, helper)
+          ? function(ch) { return isWordChar(ch, helper); }
+          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
+          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
+        while (start > 0 && check(line.charAt(start - 1))) --start;
+        while (end < line.length && check(line.charAt(end))) ++end;
+      }
+      return new Range(Pos(pos.line, start), Pos(pos.line, end));
+    },
+
     toggleOverwrite: function(value) {
       if (value != null && value == this.state.overwrite) return;
       if (this.state.overwrite = !this.state.overwrite)

From 9b87ca9ca4f8c81f84ff755e921ddaf3aa7373fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Sep 2014 13:34:35 +0200
Subject: [PATCH 1534/4742] [merge addon] Add diff_match_patch as explicit
 dependency

Closes #2783
---
 addon/merge/merge.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index d9b277664b..da3ea47ccf 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -1,17 +1,17 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
+// declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), require("diff_match_patch"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "diff_match_patch"], mod);
   else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
+    mod(CodeMirror, diff_match_patch);
+})(function(CodeMirror, diff_match_patch) {
   "use strict";
-  // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
-
   var Pos = CodeMirror.Pos;
   var svgNS = "http://www.w3.org/2000/svg";
 

From 59b7b9082be50d51e9b5589e6957668c5d3cb35a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Sep 2014 13:44:22 +0200
Subject: [PATCH 1535/4742] Add Hebrew code range to nonASCIISingleCaseWordChar
 regexp

Fixes detection of Hebrew letters as word characters

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4270b98a45..f06b99bd72 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7295,7 +7295,7 @@
     return function(){return f.apply(null, args);};
   }
 
-  var nonASCIISingleCaseWordChar = /[\u00df\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+  var nonASCIISingleCaseWordChar = /[\u00df\u0590-\u05f4\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 623eb7badb58f5d7bc9bbd836f86f046180e2a1c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Sep 2014 17:59:23 +0200
Subject: [PATCH 1536/4742] Force scroll update from swapDoc

Issue #2714
---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f06b99bd72..c865bc560b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2090,11 +2090,11 @@
       display.wheelStartX = display.wheelStartY = null;
 
     // Propagate the scroll position to the actual DOM scroller
-    if (op.scrollTop != null && display.scroller.scrollTop != op.scrollTop) {
+    if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
       var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
       display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
     }
-    if (op.scrollLeft != null && display.scroller.scrollLeft != op.scrollLeft) {
+    if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
       var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
       display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
       alignHorizontally(cm);
@@ -4444,6 +4444,7 @@
       clearCaches(this);
       resetInput(this);
       this.scrollTo(doc.scrollLeft, doc.scrollTop);
+      this.curOp.forceScroll = true;
       signalLater(this, "swapDoc", this, old);
       return old;
     }),

From 376f3ec90d05272459bf0b79d4ff9005a284705e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Sep 2014 18:04:52 +0200
Subject: [PATCH 1537/4742] [sass mode] Make sure indentCount is initialized
 propertly

Issue #2786
---
 mode/sass/sass.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 68df323e18..b792a02aa3 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -303,6 +303,7 @@ CodeMirror.defineMode("sass", function(config) {
       return {
         tokenizer: tokenBase,
         scopes: [{offset: 0, type: "sass"}],
+        indentCount: 0,
         definedVars: [],
         definedMixins: []
       };

From cb5416f1229e2c8555784cb089916a5953c07b1b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Sep 2014 08:36:11 +0200
Subject: [PATCH 1538/4742] [markdown mode] Fix handling of escaped characters

Issue #2792
---
 mode/markdown/markdown.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 81ed24e8d3..90a9282f85 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -360,15 +360,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     var ch = stream.next();
 
-    if (state.escape) {
-      state.escape = false;
-      return getType(state);
-    }
-
     if (ch === '\\') {
-      if (modeCfg.highlightFormatting) state.formatting = "escape";
-      state.escape = true;
-      return getType(state);
+      stream.next();
+      if (modeCfg.highlightFormatting) return getType(state) + " escape";
     }
 
     // Matches link titles present on next line
@@ -650,7 +644,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         inline: inlineNormal,
         text: handleText,
 
-        escape: false,
         formatting: false,
         linkText: false,
         linkHref: false,
@@ -683,7 +676,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         inline: s.inline,
         text: s.text,
-        escape: false,
         formatting: false,
         linkTitle: s.linkTitle,
         em: s.em,
@@ -718,9 +710,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
           state.thisLineHasContent = true;
         }
 
-        // Reset state.escape
-        state.escape = false;
-
         // Reset state.taskList
         state.taskList = false;
 

From 31319ee225a60dcc750ba01a40e70bdedaaaafc7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Sep 2014 08:42:11 +0200
Subject: [PATCH 1539/4742] [markdown mode] Make test pass

---
 mode/markdown/markdown.js | 5 ++++-
 mode/markdown/test.js     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 90a9282f85..1bad78d65e 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -362,7 +362,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     if (ch === '\\') {
       stream.next();
-      if (modeCfg.highlightFormatting) return getType(state) + " escape";
+      if (modeCfg.highlightFormatting) {
+        var type = getType(state);
+        return type ? type + " formatting-escape" : "formatting-escape";
+      }
     }
 
     // Matches link titles present on next line
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 77a3b659c0..96ca1aefc7 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -54,7 +54,7 @@
      "[link&formatting&formatting-link <][link user@example.com][link&formatting&formatting-link >]");
 
   FT("formatting_escape",
-     "[formatting&formatting-escape \\]*");
+     "[formatting-escape \\*]");
 
   MT("plainText",
      "foo");

From f593e03a09a156f1a7824757beaa001369f11422 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Sep 2014 22:23:25 +0200
Subject: [PATCH 1540/4742] Set a min height on the lines element to prevent
 collapsing of wrapper

Issue #2765
---
 lib/codemirror.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index c0897771aa..1ab8acb296 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -213,6 +213,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-lines {
   cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
 }
 .CodeMirror pre {
   /* Reset some styles that the rest of the page might have set */

From 17c992e979daf3a3aa75926d38144e3c9d4dc064 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Sep 2014 08:44:24 +0200
Subject: [PATCH 1541/4742] Only apply IE<11 zooming compensation for client
 rects when getting rect from a range

It does not happen when measuring a node

Issue #2665
---
 lib/codemirror.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c865bc560b..151ee91a66 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1665,6 +1665,7 @@
         start = start - 1;
         collapse = "right";
       }
+      if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
     } else { // If it is a widget, simply get the box for the whole widget.
       if (start > 0) collapse = bias = "right";
       var rects;
@@ -1681,8 +1682,6 @@
         rect = nullRect;
     }
 
-    if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
-
     var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
     var mid = (rtop + rbot) / 2;
     var heights = prepared.view.measure.heights;

From 616339b47245b3a044057afa460a3768ffa0369c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 8 Sep 2014 12:52:49 +0200
Subject: [PATCH 1542/4742] [closetag addon] Work better with htmlmixed mode

It now closes script and style tags when the slash is typed

Closes #2797
---
 addon/edit/closetag.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 69ea4446be..a0bec7dd43 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -102,11 +102,25 @@
       var pos = ranges[i].head, tok = cm.getTokenAt(pos);
       var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
       if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-          tok.start != pos.ch - 1 || inner.mode.name != "xml" ||
-          !state.context || !state.context.tagName ||
-          closingTagExists(cm, state.context.tagName, pos, state))
+          tok.start != pos.ch - 1)
         return CodeMirror.Pass;
-      replacements[i] = "/" + state.context.tagName + ">";
+      // Kludge to get around the fact that we are not in XML mode
+      // when completing in JS/CSS snippet in htmlmixed mode. Does not
+      // work for other XML embedded languages (there is no general
+      // way to go from a mixed mode to its current XML state).
+      if (inner.mode.name != "xml") {
+        if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
+          replacements[i] = "/script>";
+        else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
+          replacements[i] = "/style>";
+        else
+          return CodeMirror.Pass;
+      } else {
+        if (!state.context || !state.context.tagName ||
+            closingTagExists(cm, state.context.tagName, pos, state))
+          return CodeMirror.Pass;
+        replacements[i] = "/" + state.context.tagName + ">";
+      }
     }
     cm.replaceSelections(replacements);
     ranges = cm.listSelections();

From 7817708c3165f1ca376bdc7181df6d036cb90ad8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 8 Sep 2014 13:03:54 +0200
Subject: [PATCH 1543/4742] [javascript mode] Fix parsing of argument-less fat
 arrow functions

Closes #2794
---
 mode/javascript/javascript.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 46616bc021..2e24d3a55b 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -391,7 +391,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeoperatorNoComma(type, value, noComma) {
     var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
     var expr = noComma == false ? expression : expressionNoComma;
-    if (value == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
+    if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
     if (type == "operator") {
       if (/\+\+|--/.test(value)) return cont(me);
       if (value == "?") return cont(expression, expect(":"), expr);
@@ -417,13 +417,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function arrowBody(type) {
     findFatArrow(cx.stream, cx.state);
-    if (type == "{") return pass(statement);
-    return pass(expression);
+    return pass(type == "{" ? statement : expression);
   }
   function arrowBodyNoComma(type) {
     findFatArrow(cx.stream, cx.state);
-    if (type == "{") return pass(statement);
-    return pass(expressionNoComma);
+    return pass(type == "{" ? statement : expressionNoComma);
   }
   function maybelabel(type) {
     if (type == ":") return cont(poplex, statement);

From 0a91c1427a2771a94731384f3537c78468be44f8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 8 Sep 2014 13:22:02 +0200
Subject: [PATCH 1544/4742] [smalltalk mode] Use \s instead of space in regexps
 that denote whitespace

Closes #2796
---
 mode/smalltalk/smalltalk.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index 50f41cc615..bb510ba2e1 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -53,7 +53,7 @@ CodeMirror.defineMode('smalltalk', function(config) {
         stream.next();
         token = nextSymbol(stream, new Context(nextSymbol, context));
       } else {
-        if (stream.eatWhile(/[^ .{}\[\]()]/))
+        if (stream.eatWhile(/[^\s.{}\[\]()]/))
           token.name = 'string-2';
         else
           token.name = 'meta';
@@ -61,7 +61,7 @@ CodeMirror.defineMode('smalltalk', function(config) {
 
     } else if (aChar === '$') {
       if (stream.next() === '<') {
-        stream.eatWhile(/[^ >]/);
+        stream.eatWhile(/[^\s>]/);
         stream.next();
       }
       token.name = 'string-2';

From 1adaa01dbf7fb030b61731314dd245d9dbf8014e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 9 Sep 2014 16:22:11 +0200
Subject: [PATCH 1545/4742] Add a requireJS demo

---
 addon/hint/html-hint.js |  4 ++--
 demo/requirejs.html     | 52 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 demo/requirejs.html

diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index addd9b7bc0..992218f288 100755
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -3,9 +3,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror", "./xml-hint"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "./xml-hint"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
diff --git a/demo/requirejs.html b/demo/requirejs.html
new file mode 100644
index 0000000000..6399f8d769
--- /dev/null
+++ b/demo/requirejs.html
@@ -0,0 +1,52 @@
+<!doctype html>
+
+<head>
+  <title>CodeMirror: HTML completion demo</title>
+  <meta charset="utf-8"/>
+  <link rel=stylesheet href="../doc/docs.css">
+
+  <link rel="stylesheet" href="../lib/codemirror.css">
+  <link rel="stylesheet" href="../addon/hint/show-hint.css">
+  <script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.14/require.min.js"></script>
+  <style type="text/css">
+    .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
+  </style>
+</head>
+
+<body>
+  <div id=nav>
+    <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+    </ul>
+    <ul>
+      <li><a class=active href="#">HTML completion</a>
+    </ul>
+  </div>
+
+  <article>
+    <h2>RequireJS module loading demo</h2>
+
+    <p>This demo does the same thing as
+    the <a href="html5complete.html">HTML5 completion demo</a>, but
+    loads its dependencies
+    with <a href="http://requirejs.org/">Require.js</a>, rather than
+    explicitly. Press <strong>ctrl-space</strong> to activate
+    completion.</p>
+
+    <div id="code"></div>
+
+    <script type="text/javascript">
+      require(["../lib/codemirror", "../mode/htmlmixed/htmlmixed",
+               "../addon/hint/show-hint", "../addon/hint/html-hint"], function(CodeMirror) {
+        editor = CodeMirror(document.getElementById("code"), {
+          mode: "text/html",
+          extraKeys: {"Ctrl-Space": "autocomplete"},
+          value: document.documentElement.innerHTML
+        });
+      });
+    </script>
+  </article>
+</body>

From c012f411ee01c9802d046c2d76dc3b4b0001d67b Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Tue, 9 Sep 2014 12:23:51 +0200
Subject: [PATCH 1546/4742] Improve isWordChar() for Arabic language

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 151ee91a66..ea2caaff62 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7295,7 +7295,7 @@
     return function(){return f.apply(null, args);};
   }
 
-  var nonASCIISingleCaseWordChar = /[\u00df\u0590-\u05f4\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+  var nonASCIISingleCaseWordChar = /[\u00df\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 8fac50ac265de832e08d428faffb36d464cb5bda Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Sep 2014 11:32:38 +0200
Subject: [PATCH 1547/4742] Fix handling of electricChars in multi-line edits

Closes #2804
---
 lib/codemirror.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ea2caaff62..246492a9fb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2456,16 +2456,16 @@
           cm.options.smartIndent && range.head.ch < 100 &&
           (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
         var mode = cm.getModeAt(range.head);
+        var end = changeEnd(changeEvent);
         if (mode.electricChars) {
           for (var j = 0; j < mode.electricChars.length; j++)
             if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
-              indentLine(cm, range.head.line, "smart");
+              indentLine(cm, end.line, "smart");
               break;
             }
         } else if (mode.electricInput) {
-          var end = changeEnd(changeEvent);
           if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
-            indentLine(cm, range.head.line, "smart");
+            indentLine(cm, end.line, "smart");
         }
       }
     }

From c2ee5a6ec55f4542adc9838b467861019a3cad9b Mon Sep 17 00:00:00 2001
From: Marko Bonaci <mbonaci@gmail.com>
Date: Fri, 12 Sep 2014 19:14:38 +0200
Subject: [PATCH 1548/4742] Make parentheses visible while under
 `matchingbracket` rule

Code: Brackets now become black when they are highlighted as "matching".
JSON: key names are now in "white" (json was a bit saturated with orange - keys and string values).
Cleanup: removed some unnecessary rules.
Default face color normalized to #ffffec (was #ffffe9).
---
 theme/mbo.css | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/theme/mbo.css b/theme/mbo.css
index 6cb2b18d9b..0ad6360b50 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -1,6 +1,10 @@
-/* Based on mbonaci's Brackets mbo theme */
+/****************************************************************/
+/*   Based on mbonaci's Brackets mbo theme                      */
+/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
+/*   Create your own: http://tmtheme-editor.herokuapp.com       */
+/****************************************************************/
 
-.cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffe9;}
+.cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffec;}
 .cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
 .cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
 .cm-s-mbo .CodeMirror-guttermarker { color: white; }
@@ -15,6 +19,7 @@
 .cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute {color: #9ddfe9;}
 .cm-s-mbo span.cm-keyword {color: #ffb928;}
 .cm-s-mbo span.cm-string {color: #ffcf6c;}
+.cm-s-mbo span.cm-string.cm-property {color: #ffffec;}
 
 .cm-s-mbo span.cm-variable {color: #ffffec;}
 .cm-s-mbo span.cm-variable-2 {color: #00a8c6;}
@@ -23,17 +28,8 @@
 .cm-s-mbo span.cm-tag {color: #9ddfe9;}
 .cm-s-mbo span.cm-link {color: #f54b07;}
 .cm-s-mbo span.cm-error {border-bottom: #636363; color: #ffffec;}
+.cm-s-mbo span.cm-qualifier {color: #ffffec;}
 
 .cm-s-mbo .CodeMirror-activeline-background {background: #494b41 !important;}
-.cm-s-mbo .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: #f5e107 !important;
- }
- 
-.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
-
-.cm-s-mbo span.cm-searching {
-  background-color: none;
-  background: none;
-  box-shadow: 0 0 0 1px #ffffec;
-}
+.cm-s-mbo .CodeMirror-matchingbracket {color: #222 !important;}
+.cm-s-mbo .CodeMirror-matchingtag {background: rgba(255, 255, 255, .37);}

From fcacef102486908b4331c8db9dc084daff7562bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Sep 2014 15:29:33 +0200
Subject: [PATCH 1549/4742] [show-hint addon] Give active hint color more
 precedence

To make it easy for client code to color completions without clashing
with the selected styling.
---
 addon/hint/show-hint.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.css b/addon/hint/show-hint.css
index 8a4ff052e3..924e638f7f 100644
--- a/addon/hint/show-hint.css
+++ b/addon/hint/show-hint.css
@@ -32,7 +32,7 @@
   cursor: pointer;
 }
 
-.CodeMirror-hint-active {
+li.CodeMirror-hint-active {
   background: #08f;
   color: white;
 }

From 640fbb28abf7dc4014c8c5ee6efe9309c091a98a Mon Sep 17 00:00:00 2001
From: snasa <saurabh.nasa@gmail.com>
Date: Mon, 15 Sep 2014 22:30:25 -0700
Subject: [PATCH 1550/4742] Update shell.js

---
 mode/shell/shell.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 77be75b97d..8e31f6f30b 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -128,7 +128,8 @@ CodeMirror.defineMode('shell', function() {
     startState: function() {return {tokens:[]};},
     token: function(stream, state) {
       return tokenize(stream, state);
-    }
+    },
+    lineComment: '#'
   };
 });
 

From f09b6c5ec7bf2d7a7b2ee1ac8cc5c53b27f76f62 Mon Sep 17 00:00:00 2001
From: Daniele Di Sarli <danieleds0@gmail.com>
Date: Mon, 1 Sep 2014 21:53:17 +0200
Subject: [PATCH 1551/4742] Added wordsOnly option. Updated documentation.

---
 addon/search/match-highlighter.js | 32 +++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 14dd4d4184..e9a22721f7 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -8,12 +8,15 @@
 // document.
 //
 // The option can be set to true to simply enable it, or to a
-// {minChars, style, showToken} object to explicitly configure it.
-// minChars is the minimum amount of characters that should be
+// {minChars, style, wordsOnly, showToken, delay} object to explicitly
+// configure it. minChars is the minimum amount of characters that should be
 // selected for the behavior to occur, and style is the token style to
 // apply to the matches. This will be prefixed by "cm-" to create an
-// actual CSS class name. showToken, when enabled, will cause the
-// current token to be highlighted when nothing is selected.
+// actual CSS class name. If wordsOnly is enabled, the matches will be
+// highlighted only if the selected text is a word. showToken, when enabled,
+// will cause the current token to be highlighted when nothing is selected.
+// delay is used to specify how much time to wait, in milliseconds, before
+// highlighting the matches.
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -28,6 +31,7 @@
   var DEFAULT_MIN_CHARS = 2;
   var DEFAULT_TOKEN_STYLE = "matchhighlight";
   var DEFAULT_DELAY = 100;
+  var DEFAULT_WORDS_ONLY = false;
 
   function State(options) {
     if (typeof options == "object") {
@@ -35,10 +39,12 @@
       this.style = options.style;
       this.showToken = options.showToken;
       this.delay = options.delay;
+      this.wordsOnly = options.wordsOnly;
     }
     if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
     if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
     if (this.delay == null) this.delay = DEFAULT_DELAY;
+    if (this.wordsOnly == null) this.wordsOnly = DEFAULT_WORDS_ONLY;
     this.overlay = this.timeout = null;
   }
 
@@ -81,12 +87,30 @@
       }
       var from = cm.getCursor("from"), to = cm.getCursor("to");
       if (from.line != to.line) return;
+      if (state.wordsOnly && !isWord(cm, from, to)) return;
       var selection = cm.getRange(from, to).replace(/^\s+|\s+$/g, "");
       if (selection.length >= state.minChars)
         cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
     });
   }
 
+  function isWord(cm, from, to) {
+    var str = cm.getRange(from, to);
+    if (str.match(/^\w+$/) !== null) {
+        if (from.ch > 0) {
+            var pos = {line: from.line, ch: from.ch - 1};
+            var chr = cm.getRange(pos, from);
+            if (chr.match(/\W/) === null) return false;
+        }
+        if (to.ch < cm.getLine(from.line).length) {
+            var pos = {line: to.line, ch: to.ch + 1};
+            var chr = cm.getRange(to, pos);
+            if (chr.match(/\W/) === null) return false;
+        }
+        return true;
+    } else return false;
+  }
+
   function boundariesAround(stream, re) {
     return (!stream.start || !re.test(stream.string.charAt(stream.start - 1))) &&
       (stream.pos == stream.string.length || !re.test(stream.string.charAt(stream.pos)));

From cf15c70108b65fda224510177c9ac18e6727f9c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 18 Sep 2014 14:59:08 +0200
Subject: [PATCH 1552/4742] Add example of using markselection to style
 background to demo

---
 demo/markselection.html | 15 +++++++++++----
 lib/codemirror.css      |  9 ++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/demo/markselection.html b/demo/markselection.html
index 93e38ec833..a182217fd5 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -12,6 +12,7 @@
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror-selected  { background-color: blue !important; }
       .CodeMirror-selectedtext { color: white; }
+      .styled-background { background-color: #ff7; }
     </style>
 <div id=nav>
   <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
@@ -28,16 +29,22 @@
 
 <article>
 <h2>Selection Marking Demo</h2>
-<form><textarea id="code" name="code">Select something from here.
-You'll see that the selection's foreground color changes to white!
-Since, by default, CodeMirror only puts an independent "marker" layer
-behind the text, you'll need something like this to change its colour.</textarea></form>
+<form><textarea id="code" name="code">
+Select something from here. You'll see that the selection's foreground
+color changes to white! Since, by default, CodeMirror only puts an
+independent "marker" layer behind the text, you'll need something like
+this to change its colour.
+
+Also notice that turning this addon on (with the default style) allows
+you to safely give text a background color without screwing up the
+visibility of the selection.</textarea></form>
 
     <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   lineNumbers: true,
   styleSelectedText: true
 });
+editor.markText({line: 6, ch: 26}, {line: 6, ch: 42}, {className: "styled-background"});
 </script>
 
     <p>Simple addon to easily mark (and style) selected text.</p>
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 1ab8acb296..6b9ca0238d 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -57,6 +57,10 @@
   border: 0;
   background: #7e7;
 }
+.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
+
 .cm-animate-fat-cursor {
   width: auto;
   border: 0;
@@ -273,7 +277,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 div.CodeMirror-cursors {
   visibility: hidden;
   position: relative;
-  z-index: 1;
+  z-index: 3;
 }
 .CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
@@ -300,3 +304,6 @@ div.CodeMirror-cursors {
     visibility: hidden;
   }
 }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }

From 081ba77e3125c2cded1db2293a89943408b14a0e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 18 Sep 2014 15:03:00 +0200
Subject: [PATCH 1553/4742] Add links to addon docs in mark-selection demo

---
 demo/markselection.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/markselection.html b/demo/markselection.html
index a182217fd5..d729515e58 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -47,6 +47,6 @@ <h2>Selection Marking Demo</h2>
 editor.markText({line: 6, ch: 26}, {line: 6, ch: 42}, {className: "styled-background"});
 </script>
 
-    <p>Simple addon to easily mark (and style) selected text.</p>
+    <p>Simple addon to easily mark (and style) selected text. <a href="../doc/manual.html#addon_mark-selection">Docs</a>.</p>
 
   </article>

From 8292921e328a45903c0da84cc99fb3e107567915 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Thu, 18 Sep 2014 17:17:31 +0400
Subject: [PATCH 1554/4742] Support upper-case SCRIPT tags in htmlmixed mode

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

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index dc48978eb2..250ef8cd24 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -30,6 +30,7 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
 
   function html(stream, state) {
     var tagName = state.htmlState.tagName;
+    if (tagName) tagName = tagName.toLowerCase();
     var style = htmlMode.token(stream, state.htmlState);
     if (tagName == "script" && /\btag\b/.test(style) && stream.current() == ">") {
       // Script block: mode to change to depends on type attribute

From a49b0fdb76e518122579dc4d6426ca8d34e4db63 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Sep 2014 09:57:34 +0200
Subject: [PATCH 1555/4742] [xml mode] Mark <menuitem> as self-closing tag

Closes #2810
---
 mode/xml/xml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 786507d2e4..2f3b8f87a0 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -21,7 +21,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
                       'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
                       'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true},
+                      'track': true, 'wbr': true, 'menuitem': true},
     implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
                        'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
                        'th': true, 'tr': true},

From 6338ef802dfa8fe2d85413fae9f934d94018fc0b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Sep 2014 10:06:13 +0200
Subject: [PATCH 1556/4742] [rst mode] Remove assertion mechanism

Throwing exceptions is a really bad way to deal with unexpected
syntax in a highlighting mode.

Closes #2805
---
 mode/rst/rst.js | 79 ++++++++++++++++++-------------------------------
 1 file changed, 29 insertions(+), 50 deletions(-)

diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index 2a1e28b556..bcf110c1a5 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -80,19 +80,6 @@ CodeMirror.defineMode('rst-base', function (config) {
     });
   }
 
-  function AssertException(message) {
-    this.message = message;
-  }
-
-  AssertException.prototype.toString = function () {
-    return 'AssertException: ' + this.message;
-  };
-
-  function assert(expression, message) {
-    if (!expression) throw new AssertException(message);
-    return expression;
-  }
-
   ///////////////////////////////////////////////////////////////////////////
   ///////////////////////////////////////////////////////////////////////////
 
@@ -185,12 +172,12 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_normal, context(rx_role_pre, 1));
-        assert(stream.match(/^:/));
+        stream.match(/^:/);
         token = 'meta';
         break;
       case 1:
         change(state, to_normal, context(rx_role_pre, 2));
-        assert(stream.match(rx_NAME));
+        stream.match(rx_NAME);
         token = 'keyword';
 
         if (stream.current().match(/^(?:math|latex)/)) {
@@ -199,7 +186,7 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       case 2:
         change(state, to_normal, context(rx_role_pre, 3));
-        assert(stream.match(/^:`/));
+        stream.match(/^:`/);
         token = 'meta';
         break;
       case 3:
@@ -221,21 +208,20 @@ CodeMirror.defineMode('rst-base', function (config) {
         }
 
         change(state, to_normal, context(rx_role_pre, 4));
-        assert(stream.match(rx_TEXT2));
+        stream.match(rx_TEXT2);
         token = 'string';
         break;
       case 4:
         change(state, to_normal, context(rx_role_pre, 5));
-        assert(stream.match(/^`/));
+        stream.match(/^`/);
         token = 'meta';
         break;
       case 5:
         change(state, to_normal, context(rx_role_pre, 6));
-        assert(stream.match(rx_TAIL));
+        stream.match(rx_TAIL);
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_role_suf ||
                stream.match(rx_role_suf, false)) {
@@ -243,62 +229,60 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_normal, context(rx_role_suf, 1));
-        assert(stream.match(/^`/));
+        stream.match(/^`/);
         token = 'meta';
         break;
       case 1:
         change(state, to_normal, context(rx_role_suf, 2));
-        assert(stream.match(rx_TEXT2));
+        stream.match(rx_TEXT2);
         token = 'string';
         break;
       case 2:
         change(state, to_normal, context(rx_role_suf, 3));
-        assert(stream.match(/^`:/));
+        stream.match(/^`:/);
         token = 'meta';
         break;
       case 3:
         change(state, to_normal, context(rx_role_suf, 4));
-        assert(stream.match(rx_NAME));
+        stream.match(rx_NAME);
         token = 'keyword';
         break;
       case 4:
         change(state, to_normal, context(rx_role_suf, 5));
-        assert(stream.match(/^:/));
+        stream.match(/^:/);
         token = 'meta';
         break;
       case 5:
         change(state, to_normal, context(rx_role_suf, 6));
-        assert(stream.match(rx_TAIL));
+        stream.match(rx_TAIL);
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_role || stream.match(rx_role, false)) {
 
       switch (stage(state)) {
       case 0:
         change(state, to_normal, context(rx_role, 1));
-        assert(stream.match(/^:/));
+        stream.match(/^:/);
         token = 'meta';
         break;
       case 1:
         change(state, to_normal, context(rx_role, 2));
-        assert(stream.match(rx_NAME));
+        stream.match(rx_NAME);
         token = 'keyword';
         break;
       case 2:
         change(state, to_normal, context(rx_role, 3));
-        assert(stream.match(/^:/));
+        stream.match(/^:/);
         token = 'meta';
         break;
       case 3:
         change(state, to_normal, context(rx_role, 4));
-        assert(stream.match(rx_TAIL));
+        stream.match(rx_TAIL);
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_substitution_ref ||
                stream.match(rx_substitution_ref, false)) {
@@ -306,7 +290,7 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_normal, context(rx_substitution_ref, 1));
-        assert(stream.match(rx_substitution_text));
+        stream.match(rx_substitution_text);
         token = 'variable-2';
         break;
       case 1:
@@ -315,7 +299,6 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (stream.match(rx_footnote_ref)) {
       change(state, to_normal);
@@ -341,21 +324,20 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       case 1:
         change(state, to_normal, context(rx_link_ref2, 2));
-        assert(stream.match(/^`/));
+        stream.match(/^`/);
         token = 'link';
         break;
       case 2:
         change(state, to_normal, context(rx_link_ref2, 3));
-        assert(stream.match(rx_TEXT2));
+        stream.match(rx_TEXT2);
         break;
       case 3:
         change(state, to_normal, context(rx_link_ref2, 4));
-        assert(stream.match(/^`_/));
+        stream.match(/^`_/);
         token = 'link';
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (stream.match(rx_verbatim)) {
       change(state, to_verbatim);
@@ -380,26 +362,25 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_explicit, context(rx_substitution, 1));
-        assert(stream.match(rx_substitution_text));
+        stream.match(rx_substitution_text);
         token = 'variable-2';
         break;
       case 1:
         change(state, to_explicit, context(rx_substitution, 2));
-        assert(stream.match(rx_substitution_sepa));
+        stream.match(rx_substitution_sepa);
         break;
       case 2:
         change(state, to_explicit, context(rx_substitution, 3));
-        assert(stream.match(rx_substitution_name));
+        stream.match(rx_substitution_name);
         token = 'keyword';
         break;
       case 3:
         change(state, to_explicit, context(rx_substitution, 4));
-        assert(stream.match(rx_substitution_tail));
+        stream.match(rx_substitution_tail);
         token = 'meta';
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_directive ||
                stream.match(rx_directive, false)) {
@@ -407,7 +388,7 @@ CodeMirror.defineMode('rst-base', function (config) {
       switch (stage(state)) {
       case 0:
         change(state, to_explicit, context(rx_directive, 1));
-        assert(stream.match(rx_directive_name));
+        stream.match(rx_directive_name);
         token = 'keyword';
 
         if (stream.current().match(/^(?:math|latex)/))
@@ -417,7 +398,7 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       case 1:
         change(state, to_explicit, context(rx_directive, 2));
-        assert(stream.match(rx_directive_tail));
+        stream.match(rx_directive_tail);
         token = 'meta';
 
         if (stream.match(/^latex\s*$/) || state.tmp_stex) {
@@ -436,25 +417,23 @@ CodeMirror.defineMode('rst-base', function (config) {
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (phase(state) == rx_link || stream.match(rx_link, false)) {
 
       switch (stage(state)) {
       case 0:
         change(state, to_explicit, context(rx_link, 1));
-        assert(stream.match(rx_link_head));
-        assert(stream.match(rx_link_name));
+        stream.match(rx_link_head);
+        stream.match(rx_link_name);
         token = 'link';
         break;
       case 1:
         change(state, to_explicit, context(rx_link, 2));
-        assert(stream.match(rx_link_tail));
+        stream.match(rx_link_tail);
         token = 'meta';
         break;
       default:
         change(state, to_normal);
-        assert(stream.current() == '');
       }
     } else if (stream.match(rx_footnote)) {
       change(state, to_normal);

From bb8996c6d90433382b5d8f50f29ed94fad3b77ce Mon Sep 17 00:00:00 2001
From: Scott Aikin <scott@hawkee.com>
Date: Tue, 16 Sep 2014 13:33:27 -0400
Subject: [PATCH 1557/4742] Update realworld.html

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 899fcc3502..590e07b18a 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -85,6 +85,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
       <li><a href="http://web.uvic.ca/~siefkenj/graphit/graphit.html">Graphit</a> (function graphing)</li>
       <li><a href="http://www.handcraft.com/">Handcraft</a> (HTML prototyping)</li>
+      <li><a href="http://hawkee.com/">Hawkee</a></li>
       <li><a href="http://try.haxe.org">Haxe</a> (Haxe Playground) </li>
       <li><a href="http://haxpad.com/">HaxPad</a> (editor for Win RT)</li>
       <li><a href="http://megafonweblab.github.com/histone-javascript/">Histone template engine playground</a></li>

From 24bec6e9c10398be81b2cedba6f9e47fda62a6c6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Sep 2014 15:51:41 +0200
Subject: [PATCH 1558/4742] Mark release 4.6

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

diff --git a/AUTHORS b/AUTHORS
index acc10fe16d..362fd94a7e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,6 +33,7 @@ Anders Nawroth
 Anderson Mesquita
 Andreas Reischuck
 Andre von Houck
+Andrey Fedorov
 Andrey Lushnikov
 Andy Joslin
 Andy Kimball
@@ -84,6 +85,7 @@ dagsta
 daines
 Dan Heberden
 Daniel, Dao Quang Minh
+Daniele Di Sarli
 Daniel Faust
 Daniel Huigens
 Daniel KJ
@@ -145,6 +147,7 @@ Hakan Tunc
 Hans Engel
 Hardest
 Hasan Karahan
+Hiroyuki Makino
 hitsthings
 Hocdoc
 Ian Beck
@@ -215,6 +218,7 @@ Leonid Khachaturov
 Leonya Khachaturov
 Liam Newman
 LM
+lochel
 Lorenzo Stoakes
 Luciano Longo
 lynschinzer
@@ -223,6 +227,7 @@ Maksym Taran
 Malay Majithia
 Manuel Rego Casasnovas
 Marat Dreizin
+Marcel Gerber
 Marco Aurélio
 Marco Munizaga
 Marcus Bointon
@@ -316,6 +321,7 @@ Sascha Peilicke
 satchmorun
 sathyamoorthi
 SCLINIC\jdecker
+Scott Aikin
 Sebastian Zaha
 shaund
 shaun gilchrist
@@ -324,6 +330,7 @@ sheopory
 Shiv Deepak
 Shmuel Englard
 Shubham Jain
+snasa
 soliton4
 sonson
 spastorelli
diff --git a/bower.json b/bower.json
index 534021cc1e..638b9d0016 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.5.1",
+  "version":"4.6.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index e4178a2d80..4fdcc1331c 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.6.0;f=">4.6</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.5.0;f=">4.5</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.4.0;f=">4.4</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.3.0;f=">4.3</option>
diff --git a/doc/manual.html b/doc/manual.html
index 02f3a59aaf..5520a738b5 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 4.5.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.6.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 f88a0373a6..f878850d39 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">19-09-2014: <a href="http://codemirror.net/codemirror-4.6.zip">Version 4.6</a>:</p>
+
+  <ul class="rel-note">
+    <li>New mode: <a href="../mode/modelica/index.html">Modelica</a></li>
+    <li>New method: <a href="manual.html#findWordAt"><code>findWordAt</code></a></li>
+    <li>Make it easier to <a href="../demo/markselection.html">use text background styling</a></li>
+    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.5.0...4.6.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">21-08-2014: <a href="http://codemirror.net/codemirror-4.5.zip">Version 4.5</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 391ee507cf..3b53e00dc0 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.5</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.6</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 246492a9fb..97f6668e73 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7825,7 +7825,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.5.1";
+  CodeMirror.version = "4.6.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 34a1ecb52a..924c076f2c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.5.1",
+    "version":"4.6.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From b8ae727c1567cfb032e06e2330ba995e63114d26 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Sep 2014 15:52:23 +0200
Subject: [PATCH 1559/4742] Bump version number post-4.6

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

diff --git a/bower.json b/bower.json
index 638b9d0016..c3fa181f72 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.6.0",
+  "version":"4.6.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 5520a738b5..e0378103f7 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 4.6.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.6.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 97f6668e73..4059e03d0a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7825,7 +7825,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.6.0";
+  CodeMirror.version = "4.6.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 924c076f2c..d0d76c0715 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.6.0",
+    "version":"4.6.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 56f9e5cc28afdc7884e2ac4be8e588f46f63aa8a Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Fri, 19 Sep 2014 02:26:11 +0300
Subject: [PATCH 1560/4742] [markdown mode] test case for #2813

after header immediately followed by a code block, GFM formatting is
broken (SHA, #issue, URLs).

overlay.codeBlock gets it wrong (false inside fenced block, true after).
Not yet sure why.
---
 mode/gfm/test.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 78ffff2d7b..b9af5e894c 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -150,4 +150,15 @@
      "[comment `foo]",
      "",
      "[link http://www.example.com/]");
+
+  MT("headerCodeBlockGithub",
+     "[header&header-1 # heading]",
+     "",
+     "[comment ```]",
+     "[comment code]",
+     "[comment ```]",
+     "",
+     "Commit: [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2]",
+     "Issue: [link #1]",
+     "Link: [link http://www.example.com/]");
 })();

From ed21e488b95fbbca656ae77410c1ce0b6f3eea31 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 21 Sep 2014 02:46:11 -0400
Subject: [PATCH 1561/4742] [markdown] Fix handling of forced blank lines
 (after headers)

Closes #2813
---
 mode/markdown/markdown.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 1bad78d65e..3eb7747e60 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -700,14 +700,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.formatting = false;
 
       if (stream.sol()) {
-        var forceBlankLine = stream.match(/^\s*$/, true) || state.header;
+        var forceBlankLine = !!state.header;
 
         // Reset state.header
         state.header = 0;
 
-        if (forceBlankLine) {
+        if (stream.match(/^\s*$/, true) || forceBlankLine) {
           state.prevLineHasContent = false;
-          return blankLine(state);
+          blankLine(state);
+          return forceBlankLine ? this.token(stream, state) : null;
         } else {
           state.prevLineHasContent = state.thisLineHasContent;
           state.thisLineHasContent = true;

From 6120e8d64308573784919911fe3930acbee6acf1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 22 Sep 2014 13:01:15 +0200
Subject: [PATCH 1562/4742] [dylan mode] Remove executable flag on mode demo
 page

Closes #2816
---
 mode/dylan/index.html | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 mode/dylan/index.html

diff --git a/mode/dylan/index.html b/mode/dylan/index.html
old mode 100755
new mode 100644

From 50cf44c40c339db5084d79b24b973771535e0cd8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 23 Sep 2014 15:55:09 +0200
Subject: [PATCH 1563/4742] Move to new github repository (under codemirror
 organization)

---
 CONTRIBUTING.md                    |  4 +-
 README.md                          |  2 +-
 demo/activeline.html               |  2 +-
 demo/anywordhint.html              |  2 +-
 demo/bidi.html                     |  4 +-
 demo/btree.html                    |  2 +-
 demo/buffers.html                  |  2 +-
 demo/changemode.html               |  2 +-
 demo/closebrackets.html            |  2 +-
 demo/closetag.html                 |  2 +-
 demo/complete.html                 |  2 +-
 demo/emacs.html                    |  2 +-
 demo/folding.html                  |  2 +-
 demo/fullscreen.html               |  2 +-
 demo/hardwrap.html                 |  2 +-
 demo/html5complete.html            |  2 +-
 demo/indentwrap.html               |  2 +-
 demo/lint.html                     |  2 +-
 demo/loadmode.html                 |  2 +-
 demo/marker.html                   |  2 +-
 demo/markselection.html            |  2 +-
 demo/matchhighlighter.html         |  2 +-
 demo/matchtags.html                |  2 +-
 demo/merge.html                    |  2 +-
 demo/multiplex.html                |  2 +-
 demo/mustache.html                 |  2 +-
 demo/placeholder.html              |  2 +-
 demo/preview.html                  |  2 +-
 demo/requirejs.html                |  2 +-
 demo/resize.html                   |  2 +-
 demo/rulers.html                   |  2 +-
 demo/runmode.html                  |  2 +-
 demo/search.html                   |  2 +-
 demo/spanaffectswrapping_shim.html |  2 +-
 demo/sublime.html                  |  2 +-
 demo/tern.html                     |  2 +-
 demo/theme.html                    |  2 +-
 demo/trailingspace.html            |  2 +-
 demo/variableheight.html           |  2 +-
 demo/vim.html                      |  2 +-
 demo/visibletabs.html              |  2 +-
 demo/widget.html                   |  2 +-
 demo/xmlcomplete.html              |  2 +-
 doc/compress.html                  |  2 +-
 doc/internals.html                 |  2 +-
 doc/manual.html                    |  4 +-
 doc/realworld.html                 |  4 +-
 doc/releases.html                  | 66 +++++++++++++++---------------
 doc/reporting.html                 |  2 +-
 doc/upgrade_v2.2.html              |  2 +-
 doc/upgrade_v3.html                |  2 +-
 doc/upgrade_v4.html                |  2 +-
 index.html                         |  6 +--
 mode/apl/index.html                |  2 +-
 mode/asterisk/index.html           |  2 +-
 mode/clike/index.html              |  2 +-
 mode/clike/scala.html              |  2 +-
 mode/clojure/index.html            |  2 +-
 mode/cobol/index.html              |  2 +-
 mode/coffeescript/index.html       |  2 +-
 mode/commonlisp/index.html         |  2 +-
 mode/css/index.html                |  2 +-
 mode/css/less.html                 |  2 +-
 mode/css/scss.html                 |  2 +-
 mode/cypher/index.html             |  2 +-
 mode/d/index.html                  |  2 +-
 mode/diff/index.html               |  2 +-
 mode/django/index.html             |  2 +-
 mode/dtd/dtd.js                    |  2 +-
 mode/dtd/index.html                |  2 +-
 mode/dylan/index.html              |  2 +-
 mode/ecl/index.html                |  2 +-
 mode/eiffel/index.html             |  2 +-
 mode/erlang/index.html             |  2 +-
 mode/fortran/index.html            |  2 +-
 mode/gas/index.html                |  2 +-
 mode/gfm/index.html                |  2 +-
 mode/gherkin/gherkin.js            |  2 +-
 mode/gherkin/index.html            |  2 +-
 mode/go/index.html                 |  2 +-
 mode/groovy/index.html             |  2 +-
 mode/haml/index.html               |  2 +-
 mode/haskell/index.html            |  2 +-
 mode/haxe/index.html               |  2 +-
 mode/htmlembedded/index.html       |  2 +-
 mode/htmlmixed/index.html          |  2 +-
 mode/http/index.html               |  2 +-
 mode/index.html                    |  2 +-
 mode/jade/index.html               |  2 +-
 mode/javascript/index.html         |  2 +-
 mode/javascript/json-ld.html       |  2 +-
 mode/javascript/typescript.html    |  2 +-
 mode/jinja2/index.html             |  2 +-
 mode/julia/index.html              |  2 +-
 mode/kotlin/index.html             |  2 +-
 mode/livescript/index.html         |  2 +-
 mode/lua/index.html                |  2 +-
 mode/markdown/index.html           |  2 +-
 mode/mirc/index.html               |  2 +-
 mode/mllike/index.html             |  2 +-
 mode/modelica/index.html           |  2 +-
 mode/nginx/index.html              |  2 +-
 mode/ntriples/index.html           |  2 +-
 mode/octave/index.html             |  2 +-
 mode/pascal/index.html             |  2 +-
 mode/pegjs/index.html              |  2 +-
 mode/perl/index.html               |  2 +-
 mode/php/index.html                |  2 +-
 mode/pig/index.html                |  2 +-
 mode/properties/index.html         |  2 +-
 mode/puppet/index.html             |  2 +-
 mode/python/index.html             |  2 +-
 mode/q/index.html                  |  2 +-
 mode/r/index.html                  |  2 +-
 mode/rpm/changes/index.html        |  2 +-
 mode/rpm/index.html                |  2 +-
 mode/rst/index.html                |  2 +-
 mode/ruby/index.html               |  2 +-
 mode/rust/index.html               |  2 +-
 mode/sass/index.html               |  2 +-
 mode/scheme/index.html             |  2 +-
 mode/shell/index.html              |  2 +-
 mode/sieve/index.html              |  2 +-
 mode/slim/index.html               |  2 +-
 mode/smalltalk/index.html          |  2 +-
 mode/smarty/index.html             |  2 +-
 mode/smartymixed/index.html        |  2 +-
 mode/solr/index.html               |  2 +-
 mode/sparql/index.html             |  2 +-
 mode/sql/index.html                |  2 +-
 mode/stex/index.html               |  2 +-
 mode/tcl/index.html                |  2 +-
 mode/tiddlywiki/index.html         |  2 +-
 mode/tiki/index.html               |  2 +-
 mode/toml/index.html               |  2 +-
 mode/turtle/index.html             |  2 +-
 mode/vb/index.html                 |  2 +-
 mode/vbscript/index.html           |  2 +-
 mode/velocity/index.html           |  2 +-
 mode/verilog/index.html            |  2 +-
 mode/xml/index.html                |  2 +-
 mode/xquery/index.html             |  2 +-
 mode/yaml/index.html               |  2 +-
 mode/z80/index.html                |  2 +-
 package.json                       |  4 +-
 test/index.html                    |  2 +-
 theme/mdn-like.css                 |  2 +-
 147 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3624a39e2b..47006a17f4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ Community discussion, questions, and informal bug reporting is done on the
 ## Submitting bug reports
 
 The preferred way to report bugs is to use the
-[GitHub issue tracker](http://github.com/marijnh/CodeMirror/issues). Before
+[GitHub issue tracker](http://github.com/codemirror/CodeMirror/issues). Before
 reporting a bug, read these pointers.
 
 **Note:** The issue tracker is for *bugs*, not requests for help. Questions
@@ -48,7 +48,7 @@ should be asked on the
 ## Contributing code
 
 - Make sure you have a [GitHub Account](https://github.com/signup/free)
-- Fork [CodeMirror](https://github.com/marijnh/CodeMirror/)
+- Fork [CodeMirror](https://github.com/codemirror/CodeMirror/)
   ([how to fork a repo](https://help.github.com/articles/fork-a-repo))
 - Make your changes
 - If your changes are easy to test or likely to regress, add tests.
diff --git a/README.md b/README.md
index 6a0011b6be..be81882063 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,4 @@ in, it will color your code, and optionally help with indentation.
 
 The project page is http://codemirror.net  
 The manual is at http://codemirror.net/doc/manual.html  
-The contributing guidelines are in [CONTRIBUTING.md](https://github.com/marijnh/CodeMirror/blob/master/CONTRIBUTING.md)
+The contributing guidelines are in [CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md)
diff --git a/demo/activeline.html b/demo/activeline.html
index 14851c35e4..c1391ef27e 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Active Line</a>
diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index c76b997bf5..d20c97ba1f 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Any Word Completion</a>
diff --git a/demo/bidi.html b/demo/bidi.html
index 569693c875..13a6771672 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Bi-directional Text</a>
@@ -67,7 +67,7 @@ <h2>Bi-directional Text Demo</h2>
   blog post</a> for more background.</p>
 
   <p><strong>Note:</strong> There is
-  a <a href="https://github.com/marijnh/CodeMirror/issues/1757">known
+  a <a href="https://github.com/codemirror/CodeMirror/issues/1757">known
   bug</a> with cursor motion and mouse clicks in bi-directional lines
   that are line wrapped.</p>
 
diff --git a/demo/btree.html b/demo/btree.html
index b7bd39088d..cc644b19b9 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">B-Tree visualization</a>
diff --git a/demo/buffers.html b/demo/buffers.html
index 951209cad5..a656a6c378 100644
--- a/demo/buffers.html
+++ b/demo/buffers.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Multiple Buffer & Split View</a>
diff --git a/demo/changemode.html b/demo/changemode.html
index ad4c9d1b2c..36175aeea5 100644
--- a/demo/changemode.html
+++ b/demo/changemode.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Mode-Changing</a>
diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index f7d5afbd87..b9d299d911 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Closebrackets</a>
diff --git a/demo/closetag.html b/demo/closetag.html
index 39ca8b3f51..5e43391f19 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Close-Tag</a>
diff --git a/demo/complete.html b/demo/complete.html
index 047a7ecca4..3a17810825 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Autocomplete</a>
diff --git a/demo/emacs.html b/demo/emacs.html
index 5b622a9992..3efa57456f 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -23,7 +23,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Emacs bindings</a>
diff --git a/demo/folding.html b/demo/folding.html
index 8126c5c705..3f20484227 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -29,7 +29,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Code Folding</a>
diff --git a/demo/fullscreen.html b/demo/fullscreen.html
index 0a11f31924..f027efe502 100644
--- a/demo/fullscreen.html
+++ b/demo/fullscreen.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Full Screen Editing</a>
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index 598bf957df..0aaea0c5d9 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Hard-wrapping</a>
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 94ced527d0..2a7c57ab6d 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -27,7 +27,7 @@
     <ul>
       <li><a href="../index.html">Home</a>
       <li><a href="../doc/manual.html">Manual</a>
-      <li><a href="https://github.com/marijnh/codemirror">Code</a>
+      <li><a href="https://github.com/codemirror/codemirror">Code</a>
     </ul>
     <ul>
       <li><a class=active href="#">HTML completion</a>
diff --git a/demo/indentwrap.html b/demo/indentwrap.html
index efdba5d59e..ca13b1a17b 100644
--- a/demo/indentwrap.html
+++ b/demo/indentwrap.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Indented wrapped line</a>
diff --git a/demo/lint.html b/demo/lint.html
index 2129885298..f792f5da32 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -25,7 +25,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Linter</a>
diff --git a/demo/loadmode.html b/demo/loadmode.html
index be28c7a81d..80fda584d8 100644
--- a/demo/loadmode.html
+++ b/demo/loadmode.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Lazy Mode Loading</a>
diff --git a/demo/marker.html b/demo/marker.html
index ac4dfda893..80fd370e02 100644
--- a/demo/marker.html
+++ b/demo/marker.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Breakpoint</a>
diff --git a/demo/markselection.html b/demo/markselection.html
index d729515e58..14242579c0 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Selection Marking</a>
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index 170213bfc5..2a95f3c849 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -22,7 +22,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Match Highlighter</a>
diff --git a/demo/matchtags.html b/demo/matchtags.html
index ba4b3645d9..0a02941d0f 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Tag Matcher</a>
diff --git a/demo/merge.html b/demo/merge.html
index e592ab3627..b8f2e45ba1 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -26,7 +26,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">merge view</a>
diff --git a/demo/multiplex.html b/demo/multiplex.html
index 2ad9608a82..1e2d1b8fef 100644
--- a/demo/multiplex.html
+++ b/demo/multiplex.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Multiplexing Parser</a>
diff --git a/demo/mustache.html b/demo/mustache.html
index cb0291598a..5dcbca5259 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Overlay Parser</a>
diff --git a/demo/placeholder.html b/demo/placeholder.html
index 6cf098b01a..eb70886b95 100644
--- a/demo/placeholder.html
+++ b/demo/placeholder.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Placeholder</a>
diff --git a/demo/preview.html b/demo/preview.html
index d2aada3c80..47615f5f76 100644
--- a/demo/preview.html
+++ b/demo/preview.html
@@ -30,7 +30,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">HTML5 preview</a>
diff --git a/demo/requirejs.html b/demo/requirejs.html
index 6399f8d769..01197962d0 100644
--- a/demo/requirejs.html
+++ b/demo/requirejs.html
@@ -19,7 +19,7 @@
     <ul>
       <li><a href="../index.html">Home</a>
       <li><a href="../doc/manual.html">Manual</a>
-      <li><a href="https://github.com/marijnh/codemirror">Code</a>
+      <li><a href="https://github.com/codemirror/codemirror">Code</a>
     </ul>
     <ul>
       <li><a class=active href="#">HTML completion</a>
diff --git a/demo/resize.html b/demo/resize.html
index 10326ef66f..2fb6e108d5 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -23,7 +23,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Autoresize</a>
diff --git a/demo/rulers.html b/demo/rulers.html
index 0f8397af20..04abc96d13 100644
--- a/demo/rulers.html
+++ b/demo/rulers.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Ruler demo</a>
diff --git a/demo/runmode.html b/demo/runmode.html
index 144783d347..a1b400606d 100644
--- a/demo/runmode.html
+++ b/demo/runmode.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Mode Runner</a>
diff --git a/demo/search.html b/demo/search.html
index 21c9b278a9..896526e587 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Search/Replace</a>
diff --git a/demo/spanaffectswrapping_shim.html b/demo/spanaffectswrapping_shim.html
index e598221c0c..8271241259 100644
--- a/demo/spanaffectswrapping_shim.html
+++ b/demo/spanaffectswrapping_shim.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Automatically derive odd wrapping behavior for your browser</a>
diff --git a/demo/sublime.html b/demo/sublime.html
index f9115f57be..ec9fdb3ac0 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -30,7 +30,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Sublime bindings</a>
diff --git a/demo/tern.html b/demo/tern.html
index 57027f7267..01e734c5ba 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -32,7 +32,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Tern</a>
diff --git a/demo/theme.html b/demo/theme.html
index 4d59d24359..f558b21c32 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -47,7 +47,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Theme</a>
diff --git a/demo/trailingspace.html b/demo/trailingspace.html
index c3e9c37636..5e5a6e06e3 100644
--- a/demo/trailingspace.html
+++ b/demo/trailingspace.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Trailing Whitespace</a>
diff --git a/demo/variableheight.html b/demo/variableheight.html
index 98f2fd29d0..d993572898 100644
--- a/demo/variableheight.html
+++ b/demo/variableheight.html
@@ -25,7 +25,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Variable Height</a>
diff --git a/demo/vim.html b/demo/vim.html
index cc616759f0..9e75163b6d 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Vim bindings</a>
diff --git a/demo/visibletabs.html b/demo/visibletabs.html
index 5a5a19aa01..0c8ca3a889 100644
--- a/demo/visibletabs.html
+++ b/demo/visibletabs.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Visible tabs</a>
diff --git a/demo/widget.html b/demo/widget.html
index cc06968d8c..e096173765 100644
--- a/demo/widget.html
+++ b/demo/widget.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Inline Widget</a>
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index b1ff1fe26b..ab4a8513a0 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">XML Autocomplete</a>
diff --git a/doc/compress.html b/doc/compress.html
index 4fdcc1331c..5dc69b5101 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -13,7 +13,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Compression helper</a>
diff --git a/doc/internals.html b/doc/internals.html
index 3f1b7de869..c6a3798cc4 100644
--- a/doc/internals.html
+++ b/doc/internals.html
@@ -12,7 +12,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="#top">Introduction</a></li>
diff --git a/doc/manual.html b/doc/manual.html
index e0378103f7..0fdf8d5cdc 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -28,7 +28,7 @@
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="#overview" class=active data-default="true">Manual</a></li>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a></li>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a></li>
   </ul>
   <ul>
     <li><a href="#usage">Basic Usage</a></li>
@@ -72,7 +72,7 @@ <h2 style="position: relative">
     functionality. It does provide a rich API on top of which such
     functionality can be straightforwardly implemented. See
     the <a href="#addons">addons</a> included in the distribution,
-    and the <a href="https://github.com/marijnh/CodeMirror/wiki/CodeMirror-addons">list
+    and the <a href="https://github.com/codemirror/CodeMirror/wiki/CodeMirror-addons">list
     of externally hosted addons</a>, for reusable
     implementations of extra features.</p>
 
diff --git a/doc/realworld.html b/doc/realworld.html
index 590e07b18a..a49d4c8be4 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Real-world uses</a>
@@ -21,7 +21,7 @@
 
 <h2>CodeMirror real-world uses</h2>
 
-    <p>Create a <a href="https://github.com/marijnh/codemirror">pull
+    <p>Create a <a href="https://github.com/codemirror/codemirror">pull
     request</a> or <a href="mailto:marijnh@gmail.com">email me</a> if
     you'd like your project to be added to this list.</p>
 
diff --git a/doc/releases.html b/doc/releases.html
index f878850d39..91c8ac9099 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -11,7 +11,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active data-default="true" href="#v4">Version 4.x</a>
@@ -35,7 +35,7 @@ <h2>Version 4.x</h2>
     <li>New mode: <a href="../mode/modelica/index.html">Modelica</a></li>
     <li>New method: <a href="manual.html#findWordAt"><code>findWordAt</code></a></li>
     <li>Make it easier to <a href="../demo/markselection.html">use text background styling</a></li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.5.0...4.6.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.5.0...4.6.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-08-2014: <a href="http://codemirror.net/codemirror-4.5.zip">Version 4.5</a>:</p>
@@ -45,7 +45,7 @@ <h2>Version 4.x</h2>
     <li>New mode: <a href="../mode/slim/index.html">Slim</a></li>
     <li>New command: <a href="manual.html#command_goLineLeftSmart"><code>goLineLeftSmart</code></a></li>
     <li>More fixes and extensions for the <a href="../demo/vim.html">Vim</a> visual block mode</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.4.0...4.5.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.4.0...4.5.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-07-2014: <a href="http://codemirror.net/codemirror-4.4.zip">Version 4.4</a>:</p>
@@ -59,7 +59,7 @@ <h2>Version 4.x</h2>
     <li>Visual block mode for <a href="../demo/vim.html">vim</a> (&lt;C-v>) is nearly complete</li>
     <li>New mode: <a href="../mode/kotlin/index.html">Kotlin</a></li>
     <li>Better multi-selection paste for text copied from multiple CodeMirror selections</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.3.0...4.4.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.3.0...4.4.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">23-06-2014: <a href="http://codemirror.net/codemirror-4.3.zip">Version 4.3</a>:</p>
@@ -72,7 +72,7 @@ <h2>Version 4.x</h2>
     setting <a href="manual.html#option_cursorBlinkRate"><code>cursorBlinkRate</code></a>
     to a negative value.</li>
     <li>Make gutter markers themeable, use this in foldgutter.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.2.0...4.3.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.2.0...4.3.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">19-05-2014: <a href="http://codemirror.net/codemirror-4.2.zip">Version 4.2</a>:</p>
@@ -89,7 +89,7 @@ <h2>Version 4.x</h2>
     <li>Recognize per-editor configuration for the <a href="manual.html#addon_show-hint">show-hint</a> and <a href="manual.html#addon_foldcode">foldcode</a> addons.</li>
     <li>More intelligent scanning for existing close tags in <a href="manual.html#addon_closetag">closetag</a> addon.</li>
     <li>In the <a href="../demo/vim.html">Vim bindings</a>: Fix bracket matching, support case conversion in visual mode, visual paste, append action.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.1.0...4.2.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.1.0...4.2.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">22-04-2014: <a href="http://codemirror.net/codemirror-4.1.zip">Version 4.1</a>:</p>
@@ -104,7 +104,7 @@ <h2>Version 4.x</h2>
     <li>New mode: <a href="../mode/django/index.html">Django</a>.</li>
     <li>Improved modes: <a href="../mode/verilog/index.html">Verilog</a> (rewritten), <a href="../mode/jinja2/index.html">Jinja2</a>, <a href="../mode/haxe/index.html">Haxe</a>, <a href="../mode/php/index.html">PHP</a> (string interpolation highlighted), <a href="../mode/javascript/index.html">JavaScript</a> (indentation of trailing else, template strings), <a href="../mode/livescript/index.html">LiveScript</a> (multi-line strings).</li>
     <li>Many small issues from the 3.x→4.x transition were found and fixed.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/4.0.3...4.1.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.0.3...4.1.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-03-2014: <a href="http://codemirror.net/codemirror-4.0.zip">Version 4.0</a>:</p>
@@ -120,7 +120,7 @@ <h2>Version 4.x</h2>
     <li><a href="manual.html#modloader">Module loader shims</a> wrapped around all modules.</li>
     <li>Selection <a href="manual.html#command_undoSelection">undo</a>/<a href="manual.html#command_redoSelection">redo</a>.</li>
     <li>Improved character measuring (faster, handles wrapped lines more robustly).</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.23.0...4.0.3">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.23.0...4.0.3">list of patches</a>.</li>
   </ul>
 
 </section>
@@ -152,7 +152,7 @@ <h2>Version 3.x</h2>
     <li>New addons: <a href="manual.html#addon_rulers">rulers</a>, markdown-fold, yaml-lint.</li>
     <li>New theme: <a href="../demo/theme.html?mdn-like">mdn-like</a>.</li>
     <li>New mode: <a href="../mode/solr/index.html">Solr</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">16-01-2014: <a href="http://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
@@ -166,7 +166,7 @@ <h2>Version 3.x</h2>
     <li>Make it possible to fetch multiple applicable helper values with <a href="manual.html#getHelpers"><code>getHelpers</code></a>, and to register helpers matched on predicates with <a href="manual.html#registerGlobalHelper"><code>registerGlobalHelper</code></a>.</li>
     <li>New theme <a href="../demo/theme.html?pastel-on-dark">pastel-on-dark</a>.</li>
     <li>Better ECMAScript 6 support in <a href="../mode/javascript/index.html">JavaScript</a> mode.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.20.0...3.21.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.20.0...3.21.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-11-2013: <a href="http://codemirror.net/codemirror-3.20.zip">Version 3.20</a>:</p>
@@ -177,7 +177,7 @@ <h2>Version 3.x</h2>
     <li>Improved indentation for the <a href="../mode/coffeescript/index.html">CoffeeScript mode</a>.</li>
     <li>Make non-printable-character representation <a href="manual.html#option_specialChars">configurable</a>.</li>
     <li>Add ‘notification’ functionality to <a href="manual.html#addon_dialog">dialog</a> addon.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.19.0...3.20.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.19.0...3.20.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-10-2013: <a href="http://codemirror.net/codemirror-3.19.zip">Version 3.19</a>:</p>
@@ -187,7 +187,7 @@ <h2>Version 3.x</h2>
     <li>New addons: <a href="manual.html#addon_hardwrap">hardwrap</a>, <a href="manual.html#addon_sql-hint">sql-hint</a>.</li>
     <li>New theme: <a href="../demo/theme.html?mbo">MBO</a>.</li>
     <li>Add <a href="manual.html#token_style_line">support</a> for line-level styling from mode tokenizers.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.18.0...3.19.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.18.0...3.19.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">23-09-2013: <a href="http://codemirror.net/codemirror-3.18.zip">Version 3.18</a>:</p>
@@ -202,7 +202,7 @@ <h2>Version 3.x</h2>
     <li>New modes: <a href="../mode/fortran/index.html">Fortran</a>, <a href="../mode/octave/index.html">Octave</a> (Matlab), <a href="../mode/toml/index.html">TOML</a>, and <a href="../mode/dtd/index.html">DTD</a>.</li>
     <li>New addons: <a href="../addon/lint/css-lint.js"><code>css-lint</code></a>, <a href="manual.html#addon_css-hint"><code>css-hint</code></a>.</li>
     <li>Improve resilience to CSS 'frameworks' that globally mess up <code>box-sizing</code>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.16.0...3.17.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.16.0...3.17.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-08-2013: <a href="http://codemirror.net/codemirror-3.16.zip">Version 3.16</a>:</p>
@@ -214,7 +214,7 @@ <h2>Version 3.x</h2>
     <li>Improved interaction between themes and <a href="manual.html#addon_active-line">active-line</a>/<a href="manual.html#addon_matchbrackets">matchbrackets</a> addons.</li>
     <li>New <a href="manual.html#addon_foldcode">folding</a> function <code>CodeMirror.fold.comment</code>.</li>
     <li>Added <a href="manual.html#addon_fullscreen">fullscreen</a> addon.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.15.0...3.16.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.15.0...3.16.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">29-07-2013: <a href="http://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
@@ -225,7 +225,7 @@ <h2>Version 3.x</h2>
     <li>Introduced <a href="manual.html#getHelper"><em>helper</em></a> concept (<a href="https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ">context</a>).</li>
     <li>New method: <a href="manual.html#getModeAt"><code>getModeAt</code></a>.</li>
     <li>New themes: base16 <a href="../demo/theme.html?base16-dark">dark</a>/<a href="../demo/theme.html?base16-light">light</a>, 3024 <a href="../demo/theme.html?3024-night">dark</a>/<a href="../demo/theme.html?3024-day">light</a>, <a href="../demo/theme.html?tomorrow-night-eighties">tomorrow-night</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-06-2013: <a href="http://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
@@ -252,7 +252,7 @@ <h2>Version 3.x</h2>
     <li>Various improvements to <a href="../mode/ruby/index.html">Ruby</a>,
     <a href="../mode/smarty/index.html">Smarty</a>, <a href="../mode/sql/index.html">SQL</a>,
     and <a href="../demo/vim.html">Vim</a> modes.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/3.13.0...3.14.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.13.0...3.14.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-05-2013: <a href="http://codemirror.net/codemirror-3.13.zip">Version 3.13</a>:</p>
@@ -262,7 +262,7 @@ <h2>Version 3.x</h2>
     <li>New options: <a href="manual.html#option_cursorScrollMargin"><code>cursorScrollMargin</code></a> and <a href="manual.html#option_coverGutterNextToScrollbar"><code>coverGutterNextToScrollbar</code></a>.</li>
     <li>New addon: <a href="manual.html#addon_comment">commenting</a>.</li>
     <li>More features added to the <a href="../demo/vim.html">Vim keymap</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.12...3.13.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.12...3.13.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">19-04-2013: <a href="http://codemirror.net/codemirror-3.12.zip">Version 3.12</a>:</p>
@@ -276,7 +276,7 @@ <h2>Version 3.x</h2>
     option for <code>markText</code>.</li>
     <li>Various fixes to JavaScript tokenization and indentation corner cases.</li>
     <li>Further improvements to the vim mode.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.11...v3.12">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.11...v3.12">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-03-2013: <a href="http://codemirror.net/codemirror-3.11.zip">Version 3.11</a>:</p>
@@ -301,7 +301,7 @@ <h2>Version 3.x</h2>
     dialog addon.</li>
     <li>Tweak behavior of by-word cursor motion.</li>
     <li>Further improvements to the <a href="../demo/vim.html">vim mode</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.1...v3.11">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.1...v3.11">list of patches</a>.</li>
   </ul>
 
   <p class="rel">21-02-2013: <a href="http://codemirror.net/codemirror-3.1.zip">Version 3.1</a>:</p>
@@ -337,7 +337,7 @@ <h2>Version 3.x</h2>
     <li>New modes: <a href="../mode/turtle/index.html">Turtle</a>
     and <a href="../mode/q/index.html">Q</a>.</li>
     <li>Further improvements to the <a href="../demo/vim.html">vim mode</a>.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.01...v3.1">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.01...v3.1">list of patches</a>.</li>
   </ul>
   
 
@@ -363,7 +363,7 @@ <h2>Version 3.x</h2>
     <li>Support <code>showIfHidden</code> option for <a href="manual.html#addLineWidget">line widgets</a>.</li>
     <li>Add simple <a href="manual.html#addon_python-hint">Python hinter</a>.</li>
     <li>Bring back the <a href="manual.html#option_fixedGutter"><code>fixedGutter</code></a> option.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0...v3.01">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0...v3.01">list of patches</a>.</li>
   </ul>
 
   <p class="rel">10-12-2012: <a href="http://codemirror.net/codemirror-3.0.zip">Version 3.0</a>:</p>
@@ -377,7 +377,7 @@ <h2>Version 3.x</h2>
     <li>Rewritten VIM mode.</li>
     <li>Fix a few minor scrolling and sizing issues.</li>
     <li>Work around Safari segfault when dragging.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
   </ul>
   
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
@@ -389,7 +389,7 @@ <h2>Version 3.x</h2>
     <li>Reduce gutter glitches during horiz. scrolling.</li>
     <li>Add <a href="manual.html#addKeyMap"><code>addKeyMap</code></a> and <a href="manual.html#removeKeyMap"><code>removeKeyMap</code></a> methods.</li>
     <li>Rewrite <code>formatting</code> and <code>closetag</code> add-ons.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
@@ -406,7 +406,7 @@ <h2>Version 3.x</h2>
     <li>Add <a href="manual.html#isClean"><code>isClean</code></a>/<a href="manual.html#markClean"><code>markClean</code></a> methods.</li>
     <li>Remove <code>compoundChange</code> method, use better undo-event-combining heuristic.</li>
     <li>Improve scrolling performance smoothness.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0beta2...v3.0rc1">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0beta2...v3.0rc1">list of patches</a>.</li>
   </ul>
 
   <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-3.0beta2.zip">Version 3.0, beta 2</a>:</p>
@@ -422,7 +422,7 @@ <h2>Version 3.x</h2>
     <li>Add <a href="manual.html#option_flattenSpans"><code>flattenSpans</code></a> option.</li>
     <li>Many optimizations. Poor responsiveness should be fixed.</li>
     <li>Initialization in hidden state works again.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v3.0beta1...v3.0beta2">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0beta1...v3.0beta2">list of patches</a>.</li>
   </ul>
 
   <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
@@ -454,7 +454,7 @@ <h2>Version 2.x</h2>
     <li>New mode: <a href="../mode/sql/index.html">SQL</a> (will replace <a href="../mode/plsql/index.html">plsql</a> and <a href="../mode/mysql/index.html">mysql</a> modes).</li>
     <li>Further work on the new VIM mode.</li>
     <li>Fix Cmd/Ctrl keys on recent Operas on OS X.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.36...v2.37">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v2.36...v2.37">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
@@ -468,7 +468,7 @@ <h2>Version 2.x</h2>
     <li>Various extensions to the vim keymap.</li>
     <li>Make <a href="../mode/php/index.html">PHP mode</a> build on <a href="../mode/htmlmixed/index.html">mixed HTML mode</a>.</li>
     <li>Add <a href="manual.html#addon_continuecomment">comment-continuing</a> add-on.</li>
-    <li>Full <a href="../https://github.com/marijnh/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
+    <li>Full <a href="../https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
   </ul>
 
   <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-2.35.zip">Version 2.35</a>:</p>
@@ -479,7 +479,7 @@ <h2>Version 2.x</h2>
     <li>Fix several bugs in <a href="manual.html#markText"><code>markText</code></a>/undo interaction.</li>
     <li>Better indentation of JavaScript code without semicolons.</li>
     <li>Add <a href="manual.html#defineInitHook"><code>defineInitHook</code></a> function.</li>
-    <li>Full <a href="https://github.com/marijnh/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
   </ul>
 
   <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-2.34.zip">Version 2.34</a>:</p>
@@ -492,7 +492,7 @@ <h2>Version 2.x</h2>
     <li>Add a <a href="manual.html#version"><code>CodeMirror.version</code></a> property.</li>
     <li>More robust handling of nested modes in <a href="../demo/formatting.html">formatting</a> and <a href="../demo/closetag.html">closetag</a> plug-ins.</li>
     <li>Un/redo now preserves <a href="manual.html#markText">marked text</a> and bookmarks.</li>
-    <li><a href="https://github.com/marijnh/CodeMirror/compare/v2.33...v2.34">Full list</a> of patches.</li>
+    <li><a href="https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34">Full list</a> of patches.</li>
   </ul>
 
   <p class="rel">23-08-2012: <a href="http://codemirror.net/codemirror-2.33.zip">Version 2.33</a>:</p>
@@ -506,7 +506,7 @@ <h2>Version 2.x</h2>
     <li>More tweaks to the scrolling model.</li>
     <li>Expanded testsuite. Basic linter added.</li>
     <li>Remove most uses of <code>innerHTML</code>. Remove <code>CodeMirror.htmlEscape</code>.</li>
-    <li><a href="https://github.com/marijnh/CodeMirror/compare/v2.32...v2.33">Full list</a> of patches.</li>
+    <li><a href="https://github.com/codemirror/CodeMirror/compare/v2.32...v2.33">Full list</a> of patches.</li>
   </ul>
 
   <p class="rel">23-07-2012: <a href="http://codemirror.net/codemirror-2.32.zip">Version 2.32</a>:</p>
@@ -524,7 +524,7 @@ <h2>Version 2.x</h2>
     <li>Add <a href="manual.html#getHistory"><code>getHistory</code></a> and <a href="manual.html#setHistory"><code>setHistory</code></a> methods.</li>
     <li>Allow custom line separator string in <a href="manual.html#getValue"><code>getValue</code></a> and <a href="manual.html#getRange"><code>getRange</code></a>.</li>
     <li>Support double- and triple-click drag, double-clicking whitespace.</li>
-    <li>And more... <a href="https://github.com/marijnh/CodeMirror/compare/v2.3...v2.31">(all patches)</a></li>
+    <li>And more... <a href="https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31">(all patches)</a></li>
   </ul>
 
   <p class="rel">22-06-2012: <a href="http://codemirror.net/codemirror-2.3.zip">Version 2.3</a>:</p>
@@ -536,7 +536,7 @@ <h2>Version 2.x</h2>
     <li>Add <a href="../demo/multiplex.html">mode-multiplexing</a> utility script.</li>
     <li>Fix bug where right-click paste works in read-only mode.</li>
     <li>Add a <a href="manual.html#getScrollInfo"><code>getScrollInfo</code></a> method.</li>
-    <li>Lots of other <a href="https://github.com/marijnh/CodeMirror/compare/v2.25...v2.3">fixes</a>.</li>
+    <li>Lots of other <a href="https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3">fixes</a>.</li>
   </ul>
 
   <p class="rel">23-05-2012: <a href="http://codemirror.net/codemirror-2.25.zip">Version 2.25</a>:</p>
@@ -774,7 +774,7 @@ <h2>Version 2.x</h2>
   and <a href="http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580">this</a>
   for more information.</p>
 
-  <p class="rel">22-02-2011: <a href="https://github.com/marijnh/codemirror/tree/beta2">Version 2.0 beta 2</a>:</p>
+  <p class="rel">22-02-2011: <a href="https://github.com/codemirror/codemirror/tree/beta2">Version 2.0 beta 2</a>:</p>
   <p class="rel-note">Somewhat more mature API, lots of bugs shaken out.</p>
 
   <p class="rel">17-02-2011: <a href="http://codemirror.net/codemirror-0.94.zip">Version 0.94</a>:</p>
diff --git a/doc/reporting.html b/doc/reporting.html
index 84da6111d9..9a8a63fe81 100644
--- a/doc/reporting.html
+++ b/doc/reporting.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Reporting bugs</a>
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
index a2dddef760..d718a9ee9a 100644
--- a/doc/upgrade_v2.2.html
+++ b/doc/upgrade_v2.2.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">2.2 upgrade guide</a>
diff --git a/doc/upgrade_v3.html b/doc/upgrade_v3.html
index 19757924c1..94d1197289 100644
--- a/doc/upgrade_v3.html
+++ b/doc/upgrade_v3.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#upgrade">Upgrade guide</a>
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index c35be5b7fc..9f1d79ab7c 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -11,7 +11,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#upgrade">Upgrade guide</a>
diff --git a/index.html b/index.html
index 3b53e00dc0..7a2bbdcfce 100644
--- a/index.html
+++ b/index.html
@@ -26,7 +26,7 @@
   <ul>
     <li><a class=active data-default="true" href="#description">Home</a>
     <li><a href="doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="#features">Features</a>
@@ -156,7 +156,7 @@ <h2>Community</h2>
   and <a href="doc/realworld.html">many other projects</a>.</p>
 
   <p>Development and bug tracking happens
-  on <a href="https://github.com/marijnh/CodeMirror/">github</a>
+  on <a href="https://github.com/codemirror/CodeMirror/">github</a>
   (<a href="http://marijnhaverbeke.nl/git/codemirror">alternate git
   repository</a>).
   Please <a href="http://codemirror.net/doc/reporting.html">read these
@@ -175,7 +175,7 @@ <h2>Community</h2>
 
   <p>A list of CodeMirror-related software that is not part of the
   main distribution is maintained
-  on <a href="https://github.com/marijnh/CodeMirror/wiki/CodeMirror-addons">our
+  on <a href="https://github.com/codemirror/CodeMirror/wiki/CodeMirror-addons">our
   wiki</a>. Feel free to add your project.</p>
 </section>
 
diff --git a/mode/apl/index.html b/mode/apl/index.html
index f8282ac42f..5842c9b7f3 100644
--- a/mode/apl/index.html
+++ b/mode/apl/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/asterisk/index.html b/mode/asterisk/index.html
index 6abdecb50d..1576e5a6e3 100644
--- a/mode/asterisk/index.html
+++ b/mode/asterisk/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clike/index.html b/mode/clike/index.html
index d1abf9359d..5fb5f2cd17 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clike/scala.html b/mode/clike/scala.html
index e9acc049b3..9ffcc67924 100644
--- a/mode/clike/scala.html
+++ b/mode/clike/scala.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index 5a50c566fc..fb284b17b0 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/cobol/index.html b/mode/cobol/index.html
index a6c5c339ca..72a5faf462 100644
--- a/mode/cobol/index.html
+++ b/mode/cobol/index.html
@@ -44,7 +44,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/coffeescript/index.html b/mode/coffeescript/index.html
index fc0a770581..329f8651e4 100644
--- a/mode/coffeescript/index.html
+++ b/mode/coffeescript/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/commonlisp/index.html b/mode/commonlisp/index.html
index d48be8d233..811edfe35f 100644
--- a/mode/commonlisp/index.html
+++ b/mode/commonlisp/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/index.html b/mode/css/index.html
index 80ef518e90..bdba892288 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/less.html b/mode/css/less.html
index 1030ca43fe..ea9b4f3d99 100644
--- a/mode/css/less.html
+++ b/mode/css/less.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/scss.html b/mode/css/scss.html
index 0677d08fe1..bcd9f120af 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/cypher/index.html b/mode/cypher/index.html
index 2b765fe5aa..cbf1e85d1b 100644
--- a/mode/cypher/index.html
+++ b/mode/cypher/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/d/index.html b/mode/d/index.html
index 8b25fcc5c9..9054b7f35b 100644
--- a/mode/d/index.html
+++ b/mode/d/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/diff/index.html b/mode/diff/index.html
index 6ceae8b33a..e897ccd83b 100644
--- a/mode/diff/index.html
+++ b/mode/diff/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/django/index.html b/mode/django/index.html
index 07963bc611..7942e348d0 100644
--- a/mode/django/index.html
+++ b/mode/django/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index 1df9fc8b32..f37029a77d 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -4,7 +4,7 @@
 /*
   DTD mode
   Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
   GitHub: @peterkroon
 */
 
diff --git a/mode/dtd/index.html b/mode/dtd/index.html
index 076d827f7f..0a27cdbdbb 100644
--- a/mode/dtd/index.html
+++ b/mode/dtd/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/dylan/index.html b/mode/dylan/index.html
index 049f93cc63..fec90c654e 100644
--- a/mode/dylan/index.html
+++ b/mode/dylan/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/ecl/index.html b/mode/ecl/index.html
index f4b612d610..0be5a3d01a 100644
--- a/mode/ecl/index.html
+++ b/mode/ecl/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/eiffel/index.html b/mode/eiffel/index.html
index 95c5f885b0..346fed9e42 100644
--- a/mode/eiffel/index.html
+++ b/mode/eiffel/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index 9cacb759f6..a5b30ae576 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/fortran/index.html b/mode/fortran/index.html
index efa55ec89a..fd72329701 100644
--- a/mode/fortran/index.html
+++ b/mode/fortran/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/gas/index.html b/mode/gas/index.html
index cd8a2ff5a6..a4ab73f240 100644
--- a/mode/gas/index.html
+++ b/mode/gas/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index b71cd5c75f..bd44fcbb9f 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index ed7ba7978e..fc2ebee167 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -3,7 +3,7 @@
 
 /*
 Gherkin mode - http://www.cukes.info/
-Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
 */
 
 // Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js
diff --git a/mode/gherkin/index.html b/mode/gherkin/index.html
index b76877acd6..d8e307881f 100644
--- a/mode/gherkin/index.html
+++ b/mode/gherkin/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/go/index.html b/mode/go/index.html
index 3673fa0b06..074e6a0576 100644
--- a/mode/go/index.html
+++ b/mode/go/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/groovy/index.html b/mode/groovy/index.html
index f5efdf758f..f6ab73fb8a 100644
--- a/mode/groovy/index.html
+++ b/mode/groovy/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haml/index.html b/mode/haml/index.html
index a73787554d..ac91c7eb7d 100644
--- a/mode/haml/index.html
+++ b/mode/haml/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haskell/index.html b/mode/haskell/index.html
index 056b01d46b..53bb7db347 100644
--- a/mode/haskell/index.html
+++ b/mode/haskell/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haxe/index.html b/mode/haxe/index.html
index 4c3b9783bb..a064210087 100644
--- a/mode/haxe/index.html
+++ b/mode/haxe/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index fee1196839..9ee73bc383 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index bd06bb504c..d033624e6c 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/http/index.html b/mode/http/index.html
index 705085e227..cba8042372 100644
--- a/mode/http/index.html
+++ b/mode/http/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/index.html b/mode/index.html
index e3339ad085..c717702d6a 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -10,7 +10,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Language modes</a>
diff --git a/mode/jade/index.html b/mode/jade/index.html
index 8bfd5620c0..7f7ca4a498 100644
--- a/mode/jade/index.html
+++ b/mode/jade/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 59e3924e1c..9dfac25339 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/javascript/json-ld.html b/mode/javascript/json-ld.html
index 256bb0f624..545e6dfa19 100644
--- a/mode/javascript/json-ld.html
+++ b/mode/javascript/json-ld.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index 9cc5f49321..0b30c5355d 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index c99daf6c4a..d65c308d35 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/julia/index.html b/mode/julia/index.html
index 945e1a91fc..75bdab40b6 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/kotlin/index.html b/mode/kotlin/index.html
index 38700f3226..67fd39c945 100644
--- a/mode/kotlin/index.html
+++ b/mode/kotlin/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/livescript/index.html b/mode/livescript/index.html
index 3ce8974854..d1fb0f6f10 100644
--- a/mode/livescript/index.html
+++ b/mode/livescript/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/lua/index.html b/mode/lua/index.html
index 7f4eb2c84a..324b59b86f 100644
--- a/mode/lua/index.html
+++ b/mode/lua/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index a6b541e2eb..7f0541518c 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -21,7 +21,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mirc/index.html b/mode/mirc/index.html
index c346f1c7ef..c6fbc31210 100644
--- a/mode/mirc/index.html
+++ b/mode/mirc/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mllike/index.html b/mode/mllike/index.html
index 67bfef8581..ba0f1849bc 100644
--- a/mode/mllike/index.html
+++ b/mode/mllike/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/modelica/index.html b/mode/modelica/index.html
index eb4f08c57d..94334e4890 100644
--- a/mode/modelica/index.html
+++ b/mode/modelica/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index 16be1eb614..c63772da96 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -26,7 +26,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index c8a67916d5..210274fdc4 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 573ce42382..3d468b5231 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/pascal/index.html b/mode/pascal/index.html
index bf8ff0d635..c2f2ddadc1 100644
--- a/mode/pascal/index.html
+++ b/mode/pascal/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/pegjs/index.html b/mode/pegjs/index.html
index 678b714d8e..0d894b1621 100644
--- a/mode/pegjs/index.html
+++ b/mode/pegjs/index.html
@@ -18,7 +18,7 @@
       <ul>
         <li><a href="../../index.html">Home</a>
         <li><a href="../../doc/manual.html">Manual</a>
-        <li><a href="https://github.com/marijnh/codemirror">Code</a>
+        <li><a href="https://github.com/codemirror/codemirror">Code</a>
       </ul>
       <ul>
         <li><a href="../index.html">Language modes</a>
diff --git a/mode/perl/index.html b/mode/perl/index.html
index 2b7578efe6..d531f2a094 100644
--- a/mode/perl/index.html
+++ b/mode/perl/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/php/index.html b/mode/php/index.html
index dd25a5e788..d7f949b135 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/pig/index.html b/mode/pig/index.html
index 93744ae2d9..ba94e95b5b 100644
--- a/mode/pig/index.html
+++ b/mode/pig/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/properties/index.html b/mode/properties/index.html
index 40ee1a37b2..345cadfa3a 100644
--- a/mode/properties/index.html
+++ b/mode/properties/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/puppet/index.html b/mode/puppet/index.html
index f307636b2e..d29b644894 100644
--- a/mode/puppet/index.html
+++ b/mode/puppet/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/python/index.html b/mode/python/index.html
index a1d6d2d838..2e438f51f5 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/q/index.html b/mode/q/index.html
index 78ed3d88ff..42dee6f510 100644
--- a/mode/q/index.html
+++ b/mode/q/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/r/index.html b/mode/r/index.html
index 6e1d371968..dae3dbd28a 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
index 0ade017966..6f0035f6fe 100644
--- a/mode/rpm/changes/index.html
+++ b/mode/rpm/changes/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../../index.html">Home</a>
     <li><a href="../../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../../index.html">Language modes</a>
diff --git a/mode/rpm/index.html b/mode/rpm/index.html
index e0f501ba4c..03e0222985 100644
--- a/mode/rpm/index.html
+++ b/mode/rpm/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/rst/index.html b/mode/rst/index.html
index cb8269751a..f6da0339be 100644
--- a/mode/rst/index.html
+++ b/mode/rst/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 8f0ebca8e8..21bd45b536 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/rust/index.html b/mode/rust/index.html
index 4fc0999228..d74c0dc3f5 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sass/index.html b/mode/sass/index.html
index 66d4677844..f7263b5e59 100644
--- a/mode/sass/index.html
+++ b/mode/sass/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/scheme/index.html b/mode/scheme/index.html
index 164d5da60d..b2b72eda31 100644
--- a/mode/scheme/index.html
+++ b/mode/scheme/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/shell/index.html b/mode/shell/index.html
index cf415e832c..e3e79fdc9c 100644
--- a/mode/shell/index.html
+++ b/mode/shell/index.html
@@ -17,7 +17,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sieve/index.html b/mode/sieve/index.html
index 9d814a9d5a..11908412b0 100644
--- a/mode/sieve/index.html
+++ b/mode/sieve/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/slim/index.html b/mode/slim/index.html
index 1a3b6ac867..948ca0a44f 100644
--- a/mode/slim/index.html
+++ b/mode/slim/index.html
@@ -25,7 +25,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/smalltalk/index.html b/mode/smalltalk/index.html
index 0d2b172e17..67e0d6ef5f 100644
--- a/mode/smalltalk/index.html
+++ b/mode/smalltalk/index.html
@@ -19,7 +19,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index d458aef0ff..5ff1ff88da 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/smartymixed/index.html b/mode/smartymixed/index.html
index 47c805faca..a62bc37eea 100644
--- a/mode/smartymixed/index.html
+++ b/mode/smartymixed/index.html
@@ -18,7 +18,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/solr/index.html b/mode/solr/index.html
index cb880244be..9539f4f2ec 100644
--- a/mode/solr/index.html
+++ b/mode/solr/index.html
@@ -23,7 +23,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 5f19d647bf..9fa81ce864 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sql/index.html b/mode/sql/index.html
index 7dd5f3075e..9471b689fd 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -22,7 +22,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/stex/index.html b/mode/stex/index.html
index 28b8f64be3..caa008665b 100644
--- a/mode/stex/index.html
+++ b/mode/stex/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/tcl/index.html b/mode/tcl/index.html
index c48e253241..709e10081e 100644
--- a/mode/tcl/index.html
+++ b/mode/tcl/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index 6ef64a4d06..2620c1cd3c 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -16,7 +16,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/tiki/index.html b/mode/tiki/index.html
index 5315dbfcda..d6bfe069c0 100644
--- a/mode/tiki/index.html
+++ b/mode/tiki/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/toml/index.html b/mode/toml/index.html
index c59b4cc085..7ec9df10a9 100644
--- a/mode/toml/index.html
+++ b/mode/toml/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/turtle/index.html b/mode/turtle/index.html
index 27689c34ff..68e650a033 100644
--- a/mode/turtle/index.html
+++ b/mode/turtle/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/vb/index.html b/mode/vb/index.html
index 8b81a88b91..31f136d381 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/vbscript/index.html b/mode/vbscript/index.html
index 9b506b7985..57940d798d 100644
--- a/mode/vbscript/index.html
+++ b/mode/vbscript/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index bd38b886b2..8df6b5de03 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index 4c06cdaecf..f01c659aaf 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -15,7 +15,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/xml/index.html b/mode/xml/index.html
index 60ebd20177..2515f3f518 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/xquery/index.html b/mode/xquery/index.html
index 3baf5e3e3b..6f8b638892 100644
--- a/mode/xquery/index.html
+++ b/mode/xquery/index.html
@@ -20,7 +20,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/yaml/index.html b/mode/yaml/index.html
index bbb40a3c7d..f2f877e257 100644
--- a/mode/yaml/index.html
+++ b/mode/yaml/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/z80/index.html b/mode/z80/index.html
index b63c9621aa..666aa0e99d 100644
--- a/mode/z80/index.html
+++ b/mode/z80/index.html
@@ -14,7 +14,7 @@
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/package.json b/package.json
index d0d76c0715..097d73c781 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,12 @@
     "scripts": {"test": "node ./test/run.js"},
     "devDependencies": {"node-static": "0.6.0",
                         "phantomjs": "1.9.2-5"},
-    "bugs": "http://github.com/marijnh/CodeMirror/issues",
+    "bugs": "http://github.com/codemirror/CodeMirror/issues",
     "keywords": ["JavaScript", "CodeMirror", "Editor"],
     "homepage": "http://codemirror.net",
     "maintainers":[{"name": "Marijn Haverbeke",
                     "email": "marijnh@gmail.com",
                     "web": "http://marijnhaverbeke.nl"}],
     "repository": {"type": "git",
-                   "url": "https://github.com/marijnh/CodeMirror.git"}
+                   "url": "https://github.com/codemirror/CodeMirror.git"}
 }
diff --git a/test/index.html b/test/index.html
index a10bd182d4..6e051254db 100644
--- a/test/index.html
+++ b/test/index.html
@@ -52,7 +52,7 @@
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/marijnh/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Test suite</a>
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index 1e20b9e21b..81b21772d2 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -1,7 +1,7 @@
 /*
   MDN-LIKE Theme - Mozilla
   Ported to CodeMirror by Peter Kroon <plakroon@gmail.com>
-  Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
   GitHub: @peterkroon
 
   The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation

From dbb92b53fa32330d5b99d32dcc12f0fae953b48a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 23 Sep 2014 23:04:29 +0200
Subject: [PATCH 1564/4742] Update travis icon link in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index be81882063..0871482552 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # CodeMirror
-[![Build Status](https://travis-ci.org/marijnh/CodeMirror.svg)](https://travis-ci.org/marijnh/CodeMirror)
+[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/marijnh/CodeMirror)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a JavaScript component that provides a code editor in

From 57b9f64c61c2cca28cf373ef03ff9a887f1dfd5a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 23 Sep 2014 23:05:19 +0200
Subject: [PATCH 1565/4742] Also update the actual link to Travis

Ugh.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0871482552..42b06f7474 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # CodeMirror
-[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/marijnh/CodeMirror)
+[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a JavaScript component that provides a code editor in

From 794abd19160a95269badd66b2b5ee704cbc8a99d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Sep 2014 10:23:06 +0200
Subject: [PATCH 1566/4742] [lint addon] Sanitize passing arguments to hint
 sources. Somewhat incompatible

This might break sites that depend on async linters getting an editor instance
as first arg, or sync linters getting the .options property of the options passed
as second argument. The args passed are now more or less consistent.
---
 addon/lint/lint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index a87e70c09e..552037b13e 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -119,9 +119,9 @@
   function startLinting(cm) {
     var state = cm.state.lint, options = state.options;
     if (options.async)
-      options.getAnnotations(cm, updateLinting, options);
+      options.getAnnotations(cm.getValue(), updateLinting, options, cm);
     else
-      updateLinting(cm, options.getAnnotations(cm.getValue(), options.options));
+      updateLinting(cm, options.getAnnotations(cm.getValue(), options, cm));
   }
 
   function updateLinting(cm, annotationsNotSorted) {

From b89e840e9fee204bcb2ec3dac859c855a35ccb64 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Sep 2014 12:00:10 +0200
Subject: [PATCH 1567/4742] Fix overeager dedentation in CoffeeScript mode

Issue #2807
Issue #2814
---
 mode/coffeescript/coffeescript.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 1695650126..0fa4eef81a 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -217,7 +217,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     type = type || "coffee";
     var offset = 0, align = false, alignOffset = null;
     for (var scope = state.scope; scope; scope = scope.prev) {
-      if (scope.type === "coffee") {
+      if (scope.type === "coffee" || scope.type == "}") {
         offset = scope.offset + conf.indentUnit;
         break;
       }
@@ -278,7 +278,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
 
     // Handle scope changes.
     if (current === "return") {
-      state.dedent += 1;
+      state.dedent = true;
     }
     if (((current === "->" || current === "=>") &&
          !state.lambda &&
@@ -310,9 +310,10 @@ CodeMirror.defineMode("coffeescript", function(conf) {
       if (state.scope.type == current)
         state.scope = state.scope.prev;
     }
-    if (state.dedent > 0 && stream.eol() && state.scope.type == "coffee") {
-      if (state.scope.prev) state.scope = state.scope.prev;
-      state.dedent -= 1;
+    if (state.dedent && stream.eol()) {
+      if (state.scope.type == "coffee" && state.scope.prev)
+        state.scope = state.scope.prev;
+      state.dedent = false;
     }
 
     return style;

From c5b605fc1cdddc0a9b96e0fcc6739cf1ce046585 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Sep 2014 12:09:40 +0200
Subject: [PATCH 1568/4742] [real-world uses] Add SyBox

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

diff --git a/doc/realworld.html b/doc/realworld.html
index a49d4c8be4..3f46d236cc 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -136,6 +136,7 @@ <h2>CodeMirror real-world uses</h2>
       <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://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
+      <li><a href="http://syframework.alwaysdata.net">SyBox</a> (PHP playground)</li>
       <li><a href="http://www.tagspaces.org/">TagSpaces</a> (personal data manager)</li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
       <li><a href="http://www.mapbox.com/tilemill/">TileMill</a> (map design tool)</li>

From 79009084e325f5cd59b7ded826a7272ab51f37ab Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Sep 2014 12:16:48 +0200
Subject: [PATCH 1569/4742] Fix bug in calculateScrollPos

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4059e03d0a..aabcf2c79f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3769,7 +3769,7 @@
     var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
     var screenw = display.scroller.clientWidth - scrollerCutOff - display.gutters.offsetWidth;
     var tooWide = x2 - x1 > screenw;
-    if (tooWide) x2 = y1 + screen;
+    if (tooWide) x2 = x1 + screen;
     if (x1 < 10)
       result.scrollLeft = 0;
     else if (x1 < screenleft)

From 2462b898b87f2422e685d98a331a975b6eb0d2a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rio=20Gon=C3=A7alves?= <mario.mc.goncalves@gmail.com>
Date: Tue, 23 Sep 2014 17:41:44 +0100
Subject: [PATCH 1570/4742] Create a clean copy of the options object when
 instantiating

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index aabcf2c79f..f6a223ee18 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -61,7 +61,7 @@
   function CodeMirror(place, options) {
     if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
 
-    this.options = options = options || {};
+    this.options = options = options ? copyObj(options) : {};
     // Determine effective options based on given values and defaults.
     copyObj(defaults, options, false);
     setGuttersForLineNumbers(options);

From 709e10cad93230d0a562a1749612aa844a7b97af Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Sep 2014 12:31:37 +0200
Subject: [PATCH 1571/4742] [lint addon] Don't break for people who are putting
 linter options in separate property

---
 addon/lint/lint.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 552037b13e..725dfb3721 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -118,10 +118,11 @@
 
   function startLinting(cm) {
     var state = cm.state.lint, options = state.options;
+    var passOptions = options.options || options; // Support deprecated passing of `options` property in options
     if (options.async)
-      options.getAnnotations(cm.getValue(), updateLinting, options, cm);
+      options.getAnnotations(cm.getValue(), updateLinting, passOptions, cm);
     else
-      updateLinting(cm, options.getAnnotations(cm.getValue(), options, cm));
+      updateLinting(cm, options.getAnnotations(cm.getValue(), passOptions, cm));
   }
 
   function updateLinting(cm, annotationsNotSorted) {

From 52bfb4f572dd462e67f1b7f49ceb0b041e2e86af Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Sep 2014 12:57:25 +0200
Subject: [PATCH 1572/4742] Make sure toTextArea can only be called once per
 instance

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f6a223ee18..41f02e2226 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4988,6 +4988,7 @@
     cm.save = save;
     cm.getTextArea = function() { return textarea; };
     cm.toTextArea = function() {
+      cm.toTextArea = isNaN; // Prevent this from being ran twice
       save();
       textarea.parentNode.removeChild(cm.getWrapperElement());
       textarea.style.display = "";

From 4664283bf29c6f578a338411bcd0c6cb8360e2b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Sep 2014 13:07:20 +0200
Subject: [PATCH 1573/4742] [lint addon] Use center of target node rather than
 mouse pos to find inline annotations

Since the mouseover will necessarily happen at the very edge of the node, and thus
give ambiguous coordinates.

Closes #2821
---
 addon/lint/lint.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 725dfb3721..66f187e22e 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -171,20 +171,14 @@
     showTooltipFor(e, annotationTooltip(ann), target);
   }
 
-  // When the mouseover fires, the cursor might not actually be over
-  // the character itself yet. These pairs of x,y offsets are used to
-  // probe a few nearby points when no suitable marked range is found.
-  var nearby = [0, 0, 0, 5, 0, -5, 5, 0, -5, 0];
-
   function onMouseOver(cm, e) {
-    if (!/\bCodeMirror-lint-mark-/.test((e.target || e.srcElement).className)) return;
-    for (var i = 0; i < nearby.length; i += 2) {
-      var spans = cm.findMarksAt(cm.coordsChar({left: e.clientX + nearby[i],
-                                                top: e.clientY + nearby[i + 1]}, "client"));
-      for (var j = 0; j < spans.length; ++j) {
-        var span = spans[j], ann = span.__annotation;
-        if (ann) return popupSpanTooltip(ann, e);
-      }
+    var target = e.target || e.srcElement;
+    if (!/\bCodeMirror-lint-mark-/.test(target.className)) return;
+    var box = target.getBoundingClientRect(), x = (box.left + box.right) / 2, y = (box.top + box.bottom) / 2;
+    var spans = cm.findMarksAt(cm.coordsChar({left: x, top: y}, "client"));
+    for (var i = 0; i < spans.length; ++i) {
+      var ann = spans[i].__annotation;
+      if (ann) return popupSpanTooltip(ann, e);
     }
   }
 

From 2cf65a0e1759c3234c5ea57567f4ab6d31a24a5e Mon Sep 17 00:00:00 2001
From: Jon Sangster <jon@ertt.ca>
Date: Wed, 24 Sep 2014 02:30:03 -0300
Subject: [PATCH 1574/4742] [textile mode] Add

---
 mode/index.html         |   1 +
 mode/textile/index.html | 191 ++++++++++++++
 mode/textile/test.js    | 406 +++++++++++++++++++++++++++++
 mode/textile/textile.js | 553 ++++++++++++++++++++++++++++++++++++++++
 test/index.html         |   2 +
 5 files changed, 1153 insertions(+)
 create mode 100644 mode/textile/index.html
 create mode 100644 mode/textile/test.js
 create mode 100644 mode/textile/textile.js

diff --git a/mode/index.html b/mode/index.html
index c717702d6a..f8dc20ec3e 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -105,6 +105,7 @@ <h2>Language modes</h2>
       <li><a href="sparql/index.html">SPARQL</a></li>
       <li><a href="stex/index.html">sTeX, LaTeX</a></li>
       <li><a href="tcl/index.html">Tcl</a></li>
+      <li><a href="textile/index.html">Textile</a></li>
       <li><a href="tiddlywiki/index.html">Tiddlywiki</a></li>
       <li><a href="tiki/index.html">Tiki wiki</a></li>
       <li><a href="toml/index.html">TOML</a></li>
diff --git a/mode/textile/index.html b/mode/textile/index.html
new file mode 100644
index 0000000000..ff13c810f0
--- /dev/null
+++ b/mode/textile/index.html
@@ -0,0 +1,191 @@
+<!doctype html>
+
+<title>CodeMirror: Textile 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="textile.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</style>
+<div id=nav>
+  <a href="http://codemirror.net"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class="active" href="#">Textile</a>
+  </ul>
+</div>
+
+<article>
+    <h2>Textile mode</h2>
+    <form><textarea id="code" name="code">
+h1. Textile Mode
+
+A paragraph without formatting.
+
+p. A simple Paragraph.
+
+
+h2. Phrase Modifiers
+
+Here are some simple phrase modifiers: *strong*, _emphasis_, **bold**, and __italic__.
+
+A ??citation??, -deleted text-, +inserted text+, some ^superscript^, and some ~subscript~.
+
+A %span element% and @code element@
+
+A "link":http://example.com, a "link with (alt text)":urlAlias
+
+[urlAlias]http://example.com/
+
+An image: !http://example.com/image.png! and an image with a link: !http://example.com/image.png!:http://example.com
+
+A sentence with a footnote.[123]
+
+fn123. The footnote is defined here.
+
+Registered(r), Trademark(tm), and Copyright(c)
+
+
+h2. Headers
+
+h1. Top level
+h2. Second level
+h3. Third level
+h4. Fourth level
+h5. Fifth level
+h6. Lowest level
+
+
+h2.  Lists
+
+* An unordered list
+** foo bar
+*** foo bar
+**** foo bar
+** foo bar
+
+# An ordered list
+## foo bar
+### foo bar
+#### foo bar
+## foo bar
+
+- definition list := description
+- another item    := foo bar
+- spanning ines   :=
+                     foo bar
+
+                     foo bar =:
+
+
+h2. Attributes
+
+Layouts and phrase modifiers can be modified with various kinds of attributes: alignment, CSS ID, CSS class names, language, padding, and CSS styles.
+
+h3. Alignment
+
+div<. left align
+div>. right align
+
+h3. CSS ID and class name
+
+You are a %(my-id#my-classname) rad% person.
+
+h3. Language
+
+p[en_CA]. Strange weather, eh?
+
+h3. Horizontal Padding
+
+p(())). 2em left padding, 3em right padding
+
+h3. CSS styling
+
+p{background: red}. Fire!
+
+
+h2. Table
+
+|_.              Header 1               |_.      Header 2        |
+|{background:#ddd}. Cell with background|         Normal         |
+|\2.         Cell spanning 2 columns                             |
+|/2.         Cell spanning 2 rows       |(cell-class). one       |
+|                                                two             |
+|>.                  Right aligned cell |<. Left aligned cell    |
+
+
+h3. A table with attributes:
+
+table(#prices).
+|Adults|$5|
+|Children|$2|
+
+
+h2. Code blocks
+
+bc.
+function factorial(n) {
+    if (n === 0) {
+        return 1;
+    }
+    return n * factorial(n - 1);
+}
+
+pre..
+                ,,,,,,
+            o#'9MMHb':'-,o,
+         .oH":HH$' "' ' -*R&o,
+        dMMM*""'`'      .oM"HM?.
+       ,MMM'          "HLbd< ?&H\
+      .:MH ."\          ` MM  MM&b
+     . "*H    -        &MMMMMMMMMH:
+     .    dboo        MMMMMMMMMMMM.
+     .   dMMMMMMb      *MMMMMMMMMP.
+     .    MMMMMMMP        *MMMMMP .
+          `#MMMMM           MM6P ,
+       '    `MMMP"           HM*`,
+        '    :MM             .- ,
+         '.   `#?..  .       ..'
+            -.   .         .-
+              ''-.oo,oo.-''
+
+\. _(9>
+ \==_)
+  -'=
+
+h2. Temporarily disabling textile markup
+
+notextile. Don't __touch this!__
+
+Surround text with double-equals to disable textile inline. Example: Use ==*asterisks*== for *strong* text.
+
+
+h2. HTML
+
+Some block layouts are simply textile versions of HTML tags with the same name, like @div@, @pre@, and @p@. HTML tags can also exist on their own line:
+
+<section>
+  <h1>Title</h1>
+  <p>Hello!</p>
+</section>
+
+</textarea></form>
+    <script>
+        var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+            lineNumbers: true,
+            mode: "text/x-textile"
+        });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-textile</code>.</p>
+
+    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#textile_*">normal</a>,  <a href="../../test/index.html#verbose,textile_*">verbose</a>.</p>
+
+</article>
diff --git a/mode/textile/test.js b/mode/textile/test.js
new file mode 100644
index 0000000000..206ff57e49
--- /dev/null
+++ b/mode/textile/test.js
@@ -0,0 +1,406 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({tabSize: 4}, 'textile');
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT('simpleParagraphs',
+      'Some text.',
+      '',
+      'Some more text.');
+
+  /*
+   * Phrase Modifiers
+   */
+
+  MT('em',
+      'foo [em _bar_]');
+
+  MT('emBoogus',
+      'code_mirror');
+
+  MT('strong',
+      'foo [strong *bar*]');
+
+  MT('strongBogus',
+      '3 * 3 = 9');
+
+  MT('italic',
+      'foo [em __bar__]');
+
+  MT('italicBogus',
+      'code__mirror');
+
+  MT('bold',
+      'foo [strong **bar**]');
+
+  MT('boldBogus',
+      '3 ** 3 = 27');
+
+  MT('simpleLink',
+      '[link "CodeMirror":http://codemirror.net]');
+
+  MT('referenceLink',
+      '[link "CodeMirror":code_mirror]',
+      'Normal Text.',
+      '[link [[code_mirror]]http://codemirror.net]');
+
+  MT('footCite',
+      'foo bar[qualifier [[1]]]');
+
+  MT('footCiteBogus',
+      'foo bar[[1a2]]');
+
+  MT('special-characters',
+          'Registered [tag (r)], ' +
+          'Trademark [tag (tm)], and ' +
+          'Copyright [tag (c)] 2008');
+
+  MT('cite',
+      "A book is [keyword ??The Count of Monte Cristo??] by Dumas.");
+
+  MT('additionAndDeletion',
+      'The news networks declared [negative -Al Gore-] ' +
+        '[positive +George W. Bush+] the winner in Florida.');
+
+  MT('subAndSup',
+      'f(x, n) = log [builtin ~4~] x [builtin ^n^]');
+
+  MT('spanAndCode',
+      'A [quote %span element%] and [atom @code element@]');
+
+  MT('spanBogus',
+      'Percentage 25% is not a span.');
+
+  MT('citeBogus',
+      'Question? is not a citation.');
+
+  MT('codeBogus',
+      'user@example.com');
+
+  MT('subBogus',
+      '~username');
+
+  MT('supBogus',
+      'foo ^ bar');
+
+  MT('deletionBogus',
+      '3 - 3 = 0');
+
+  MT('additionBogus',
+      '3 + 3 = 6');
+
+  MT('image',
+      'An image: [string !http://www.example.com/image.png!]');
+
+  MT('imageWithAltText',
+      'An image: [string !http://www.example.com/image.png (Alt Text)!]');
+
+  MT('imageWithUrl',
+      'An image: [string !http://www.example.com/image.png!:http://www.example.com/]');
+
+  /*
+   * Headers
+   */
+
+  MT('h1',
+      '[header&header-1 h1. foo]');
+
+  MT('h2',
+      '[header&header-2 h2. foo]');
+
+  MT('h3',
+      '[header&header-3 h3. foo]');
+
+  MT('h4',
+      '[header&header-4 h4. foo]');
+
+  MT('h5',
+      '[header&header-5 h5. foo]');
+
+  MT('h6',
+      '[header&header-6 h6. foo]');
+
+  MT('h7Bogus',
+      'h7. foo');
+
+  MT('multipleHeaders',
+      '[header&header-1 h1. Heading 1]',
+      '',
+      'Some text.',
+      '',
+      '[header&header-2 h2. Heading 2]',
+      '',
+      'More text.');
+
+  MT('h1inline',
+      '[header&header-1 h1. foo ][header&header-1&em _bar_][header&header-1  baz]');
+
+  /*
+   * Lists
+   */
+
+  MT('ul',
+      'foo',
+      'bar',
+      '',
+      '[variable-2 * foo]',
+      '[variable-2 * bar]');
+
+  MT('ulNoBlank',
+      'foo',
+      'bar',
+      '[variable-2 * foo]',
+      '[variable-2 * bar]');
+
+  MT('ol',
+      'foo',
+      'bar',
+      '',
+      '[variable-2 # foo]',
+      '[variable-2 # bar]');
+
+  MT('olNoBlank',
+      'foo',
+      'bar',
+      '[variable-2 # foo]',
+      '[variable-2 # bar]');
+
+  MT('ulFormatting',
+      '[variable-2 * ][variable-2&em _foo_][variable-2 bar]',
+      '[variable-2 * ][variable-2&strong *][variable-2&em&strong _foo_]' +
+        '[variable-2&strong *][variable-2  bar]',
+      '[variable-2 * ][variable-2&strong *foo*][variable-2 bar]');
+
+  MT('olFormatting',
+      '[variable-2 # ][variable-2&em _foo_][variable-2 bar]',
+      '[variable-2 # ][variable-2&strong *][variable-2&em&strong _foo_]' +
+        '[variable-2&strong *][variable-2  bar]',
+      '[variable-2 # ][variable-2&strong *foo*][variable-2 bar]');
+
+  MT('ulNested',
+      '[variable-2 * foo]',
+      '[variable-3 ** bar]',
+      '[keyword *** bar]',
+      '[variable-2 **** bar]',
+      '[variable-3 ** bar]');
+
+  MT('olNested',
+      '[variable-2 # foo]',
+      '[variable-3 ## bar]',
+      '[keyword ### bar]',
+      '[variable-2 #### bar]',
+      '[variable-3 ## bar]');
+
+  MT('ulNestedWithOl',
+      '[variable-2 * foo]',
+      '[variable-3 ## bar]',
+      '[keyword *** bar]',
+      '[variable-2 #### bar]',
+      '[variable-3 ** bar]');
+
+  MT('olNestedWithUl',
+      '[variable-2 # foo]',
+      '[variable-3 ** bar]',
+      '[keyword ### bar]',
+      '[variable-2 **** bar]',
+      '[variable-3 ## bar]');
+
+  MT('definitionList',
+      '[number - coffee := Hot ][number&em _and_][number  black]',
+      '',
+      'Normal text.');
+
+  MT('definitionListSpan',
+      '[number - coffee :=]',
+      '',
+      '[number Hot ][number&em _and_][number  black =:]',
+      '',
+      'Normal text.');
+
+  MT('boo',
+      '[number - dog := woof woof]',
+      '[number - cat := meow meow]',
+      '[number - whale :=]',
+      '[number Whale noises.]',
+      '',
+      '[number Also, ][number&em _splashing_][number . =:]');
+
+  /*
+   * Attributes
+   */
+
+  MT('divWithAttribute',
+      '[punctuation div][punctuation&attribute (#my-id)][punctuation . foo bar]');
+
+  MT('divWithAttributeAnd2emRightPadding',
+      '[punctuation div][punctuation&attribute (#my-id)((][punctuation . foo bar]');
+
+  MT('divWithClassAndId',
+      '[punctuation div][punctuation&attribute (my-class#my-id)][punctuation . foo bar]');
+
+  MT('paragraphWithCss',
+      'p[attribute {color:red;}]. foo bar');
+
+  MT('paragraphNestedStyles',
+      'p. [strong *foo ][strong&em _bar_][strong *]');
+
+  MT('paragraphWithLanguage',
+      'p[attribute [[fr]]]. Parlez-vous français?');
+
+  MT('paragraphLeftAlign',
+      'p[attribute <]. Left');
+
+  MT('paragraphRightAlign',
+      'p[attribute >]. Right');
+
+  MT('paragraphRightAlign',
+      'p[attribute =]. Center');
+
+  MT('paragraphJustified',
+      'p[attribute <>]. Justified');
+
+  MT('paragraphWithLeftIndent1em',
+      'p[attribute (]. Left');
+
+  MT('paragraphWithRightIndent1em',
+      'p[attribute )]. Right');
+
+  MT('paragraphWithLeftIndent2em',
+      'p[attribute ((]. Left');
+
+  MT('paragraphWithRightIndent2em',
+      'p[attribute ))]. Right');
+
+  MT('paragraphWithLeftIndent3emRightIndent2em',
+      'p[attribute ((())]. Right');
+
+  MT('divFormatting',
+      '[punctuation div. ][punctuation&strong *foo ]' +
+        '[punctuation&strong&em _bar_][punctuation&strong *]');
+
+  MT('phraseModifierAttributes',
+      'p[attribute (my-class)]. This is a paragraph that has a class and' +
+      ' this [em _][em&attribute (#special-phrase)][em emphasized phrase_]' +
+      ' has an id.');
+
+  MT('linkWithClass',
+      '[link "(my-class). This is a link with class":http://redcloth.org]');
+
+  /*
+   * Layouts
+   */
+
+  MT('paragraphLayouts',
+      'p. This is one paragraph.',
+      '',
+      'p. This is another.');
+
+  MT('div',
+      '[punctuation div. foo bar]');
+
+  MT('pre',
+      '[operator pre. Text]');
+
+  MT('bq.',
+      '[bracket bq. foo bar]',
+      '',
+      'Normal text.');
+
+  MT('footnote',
+      '[variable fn123. foo ][variable&strong *bar*]');
+
+  /*
+   * Spanning Layouts
+   */
+
+  MT('bq..ThenParagraph',
+      '[bracket bq.. foo bar]',
+      '',
+      '[bracket More quote.]',
+      'p. Normal Text');
+
+  MT('bq..ThenH1',
+      '[bracket bq.. foo bar]',
+      '',
+      '[bracket More quote.]',
+      '[header&header-1 h1. Header Text]');
+
+  MT('bc..ThenParagraph',
+      '[atom bc.. # Some ruby code]',
+      '[atom obj = {foo: :bar}]',
+      '[atom puts obj]',
+      '',
+      '[atom obj[[:love]] = "*love*"]',
+      '[atom puts obj.love.upcase]',
+      '',
+      'p. Normal text.');
+
+  MT('fn1..ThenParagraph',
+      '[variable fn1.. foo bar]',
+      '',
+      '[variable More.]',
+      'p. Normal Text');
+
+  MT('pre..ThenParagraph',
+      '[operator pre.. foo bar]',
+      '',
+      '[operator More.]',
+      'p. Normal Text');
+
+  /*
+   * Tables
+   */
+
+  MT('table',
+      '[variable-3&operator |_. name |_. age|]',
+      '[variable-3 |][variable-3&strong *Walter*][variable-3 |   5  |]',
+      '[variable-3 |Florence|   6  |]',
+      '',
+      'p. Normal text.');
+
+  MT('tableWithAttributes',
+      '[variable-3&operator |_. name |_. age|]',
+      '[variable-3 |][variable-3&attribute /2.][variable-3  Jim |]',
+      '[variable-3 |][variable-3&attribute \\2{color: red}.][variable-3  Sam |]');
+
+  /*
+   * HTML
+   */
+
+  MT('html',
+      '[comment <div id="wrapper">]',
+      '[comment <section id="introduction">]',
+      '',
+      '[header&header-1 h1. Welcome]',
+      '',
+      '[variable-2 * Item one]',
+      '[variable-2 * Item two]',
+      '',
+      '[comment <a href="http://example.com">Example</a>]',
+      '',
+      '[comment </section>]',
+      '[comment </div>]');
+
+  MT('inlineHtml',
+      'I can use HTML directly in my [comment <span class="youbetcha">Textile</span>].');
+
+  /*
+   * No-Textile
+   */
+
+  MT('notextile',
+    '[string-2 notextile. *No* formatting]');
+
+  MT('notextileInline',
+      'Use [string-2 ==*asterisks*==] for [strong *strong*] text.');
+
+  MT('notextileWithPre',
+      '[operator pre. *No* formatting]');
+
+  MT('notextileWithSpanningPre',
+      '[operator pre.. *No* formatting]',
+      '',
+      '[operator *No* formatting]');
+})();
diff --git a/mode/textile/textile.js b/mode/textile/textile.js
new file mode 100644
index 0000000000..b1511a5666
--- /dev/null
+++ b/mode/textile/textile.js
@@ -0,0 +1,553 @@
+// 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'));
+  } else if (typeof define == 'function' && define.amd) { // AMD
+    define(['../../lib/codemirror'], mod);
+  } else { // Plain browser env
+    mod(CodeMirror);
+  }
+})(function(CodeMirror) {
+'use strict';
+
+var TOKEN_STYLES = {
+  addition: 'positive',
+  attributes: 'attribute',
+  bold: 'strong',
+  cite: 'keyword',
+  code: 'atom',
+  definitionList: 'number',
+  deletion: 'negative',
+  div: 'punctuation',
+  em: 'em',
+  footnote: 'variable',
+  footCite: 'qualifier',
+  header: 'header',
+  html: 'comment',
+  image: 'string',
+  italic: 'em',
+  link: 'link',
+  linkDefinition: 'link',
+  list1: 'variable-2',
+  list2: 'variable-3',
+  list3: 'keyword',
+  notextile: 'string-2',
+  pre: 'operator',
+  p: 'property',
+  quote: 'bracket',
+  span: 'quote',
+  specialChar: 'tag',
+  strong: 'strong',
+  sub: 'builtin',
+  sup: 'builtin',
+  table: 'variable-3',
+  tableHeading: 'operator'
+};
+
+function Parser(regExpFactory, state, stream) {
+  this.regExpFactory = regExpFactory;
+  this.state = state;
+  this.stream = stream;
+  this.styles = TOKEN_STYLES;
+
+  this.state.specialChar = null;
+}
+
+Parser.prototype.eat = function(name) {
+  return this.stream.match(this.regExpFactory.pattern(name), true);
+};
+
+Parser.prototype.check = function(name) {
+  return this.stream.match(this.regExpFactory.pattern(name), false);
+};
+
+Parser.prototype.setModeForNextToken = function(mode) {
+  return this.state.mode = mode;
+};
+
+Parser.prototype.execMode = function(newMode) {
+  return this.setModeForNextToken(newMode).call(this);
+};
+
+Parser.prototype.startNewLine = function() {
+  this.setModeForNextToken(Modes.newLayout);
+  this.state.tableHeading = false;
+
+  if (this.state.layoutType === 'definitionList' && this.state.spanningLayout) {
+    if (this.check('definitionListEnd')) {
+      this.state.spanningLayout = false;
+    }
+  }
+};
+
+Parser.prototype.nextToken = function() {
+  return this.state.mode.call(this);
+};
+
+Parser.prototype.styleFor = function(token) {
+  if (this.styles.hasOwnProperty(token)) {
+    return this.styles[token];
+  }
+  throw 'unknown token';
+};
+
+Parser.prototype.handlePhraseModifier = function(ch) {
+  if (ch === '_') {
+    if (this.stream.eat('_')) {
+      return this.togglePhraseModifier('italic', /^.*__/);
+    }
+    return this.togglePhraseModifier('em', /^.*_/);
+  }
+
+  if (ch === '*') {
+    if (this.stream.eat('*')) {
+      return this.togglePhraseModifier('bold', /^.*\*\*/);
+    }
+    return this.togglePhraseModifier('strong', /^.*\*/);
+  }
+
+  if (ch === '[') {
+    if (this.stream.match(/\d+\]/)) {
+      this.state.footCite = true;
+    }
+    return this.tokenStyles();
+  }
+
+  if (ch === '(') {
+    if (this.stream.match('r)')) {
+      this.state.specialChar = 'r';
+    } else if (this.stream.match('tm)')) {
+      this.state.specialChar = 'tm';
+    } else if (this.stream.match('c)')) {
+      this.state.specialChar = 'c';
+    }
+    return this.tokenStyles();
+  }
+
+  if (ch === '<') {
+    if (this.stream.match(/(\w+)[^>]+>[^<]+<\/\1>/)) {
+      return this.tokenStylesWith(this.styleFor('html'));
+    }
+  }
+
+  if (ch === '?' && this.stream.eat('?')) {
+    return this.togglePhraseModifier('cite', /^.*\?\?/);
+  }
+  if (ch === '=' && this.stream.eat('=')) {
+    return this.togglePhraseModifier('notextile', /^.*==/);
+  }
+  if (ch === '-') {
+    return this.togglePhraseModifier('deletion', /^.*-/);
+  }
+  if (ch === '+') {
+    return this.togglePhraseModifier('addition', /^.*\+/);
+  }
+  if (ch === '~') {
+    return this.togglePhraseModifier('sub', /^.*~/);
+  }
+  if (ch === '^') {
+    return this.togglePhraseModifier('sup', /^.*\^/);
+  }
+  if (ch === '%') {
+    return this.togglePhraseModifier('span', /^.*%/);
+  }
+  if (ch === '@') {
+    return this.togglePhraseModifier('code', /^.*@/);
+  }
+  if (ch === '!') {
+    var type = this.togglePhraseModifier('image', /^.*(?:\([^\)]+\))?!/);
+    this.stream.match(/^:\S+/); // optional Url portion
+    return type;
+  }
+  return this.tokenStyles();
+};
+
+Parser.prototype.togglePhraseModifier = function(phraseModifier, closeRE) {
+  if (this.state[phraseModifier]) { // remove phrase modifier
+    var type = this.tokenStyles();
+    this.state[phraseModifier] = false;
+    return type;
+  }
+  if (this.stream.match(closeRE, false)) { // add phrase modifier
+    this.state[phraseModifier] = true;
+    this.setModeForNextToken(Modes.attributes);
+  }
+  return this.tokenStyles();
+};
+
+Parser.prototype.tokenStyles = function() {
+  var disabled = this.textileDisabled(),
+      styles = [];
+
+  if (disabled) return disabled;
+
+  if (this.state.layoutType) {
+    styles.push(this.styleFor(this.state.layoutType));
+  }
+
+  styles = styles.concat(this.activeStyles('addition', 'bold', 'cite', 'code',
+      'deletion', 'em', 'footCite', 'image', 'italic', 'link', 'span', 'specialChar', 'strong',
+      'sub', 'sup', 'table', 'tableHeading'));
+
+  if (this.state.layoutType === 'header') {
+    styles.push(this.styleFor('header') + '-' + this.state.header);
+  }
+  return styles.length ? styles.join(' ') : null;
+};
+
+Parser.prototype.textileDisabled = function() {
+  var type = this.state.layoutType;
+
+  switch(type) {
+    case 'notextile':
+    case 'code':
+    case 'pre':
+      return this.styleFor(type);
+    default:
+      if (this.state.notextile) {
+        return this.styleFor('notextile') + (type ? (' ' + this.styleFor(type)) : '');
+      }
+
+      return null;
+  }
+};
+
+Parser.prototype.tokenStylesWith = function(extraStyles) {
+  var disabled = this.textileDisabled(),
+      type;
+
+  if (disabled) return disabled;
+
+  type = this.tokenStyles();
+  if(extraStyles) {
+    return type ? (type + ' ' + extraStyles) : extraStyles;
+  }
+  return type;
+};
+
+Parser.prototype.activeStyles = function() {
+  var styles = [],
+      i;
+  for (i = 0; i < arguments.length; ++i) {
+    if (this.state[arguments[i]]) {
+      styles.push(this.styleFor(arguments[i]));
+    }
+  }
+  return styles;
+};
+
+Parser.prototype.blankLine = function() {
+  var spanningLayout = this.state.spanningLayout,
+      type = this.state.layoutType,
+      key;
+
+  for (key in this.state) {
+    if (this.state.hasOwnProperty(key)) {
+      delete this.state[key];
+    }
+  }
+
+  this.setModeForNextToken(Modes.newLayout);
+  if (spanningLayout) {
+    this.state.layoutType = type;
+    this.state.spanningLayout = true;
+  }
+};
+
+
+function RegExpFactory() {
+  this.cache = {};
+  this.single = {
+    bc: 'bc',
+    bq: 'bq',
+    definitionList: /- [^(?::=)]+:=+/,
+    definitionListEnd: /.*=:\s*$/,
+    div: 'div',
+    drawTable: /\|.*\|/,
+    foot: /fn\d+/,
+    header: /h[1-6]/,
+    html: /\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/,
+    link: /[^"]+":\S/,
+    linkDefinition: /\[[^\s\]]+\]\S+/,
+    list: /(?:#+|\*+)/,
+    notextile: 'notextile',
+    para: 'p',
+    pre: 'pre',
+    table: 'table',
+    tableCellAttributes: /[/\\]\d+/,
+    tableHeading: /\|_\./,
+    tableText: /[^"_\*\[\(\?\+~\^%@|-]+/,
+    text: /[^!"_=\*\[\(<\?\+~\^%@-]+/
+  };
+  this.attributes = {
+    align: /(?:<>|<|>|=)/,
+    selector: /\([^\(][^\)]+\)/,
+    lang: /\[[^\[\]]+\]/,
+    pad: /(?:\(+|\)+){1,2}/,
+    css: /\{[^\}]+\}/
+  };
+}
+
+RegExpFactory.prototype.pattern = function(name) {
+  return (this.cache[name] || this.createRe(name));
+};
+
+RegExpFactory.prototype.createRe = function(name) {
+  switch (name) {
+    case 'drawTable':
+      return this.makeRe('^', this.single.drawTable, '$');
+    case 'html':
+      return this.makeRe('^', this.single.html, '(?:', this.single.html, ')*', '$');
+    case 'linkDefinition':
+      return this.makeRe('^', this.single.linkDefinition, '$');
+    case 'listLayout':
+      return this.makeRe('^', this.single.list, this.pattern('allAttributes'), '*\\s+');
+    case 'tableCellAttributes':
+      return this.makeRe('^', this.choiceRe(this.single.tableCellAttributes,
+          this.pattern('allAttributes')), '+\\.');
+    case 'type':
+      return this.makeRe('^', this.pattern('allTypes'));
+    case 'typeLayout':
+      return this.makeRe('^', this.pattern('allTypes'), this.pattern('allAttributes'),
+          '*\\.\\.?', '(\\s+|$)');
+    case 'attributes':
+      return this.makeRe('^', this.pattern('allAttributes'), '+');
+
+    case 'allTypes':
+      return this.choiceRe(this.single.div, this.single.foot,
+          this.single.header, this.single.bc, this.single.bq,
+          this.single.notextile, this.single.pre, this.single.table,
+          this.single.para);
+
+    case 'allAttributes':
+      return this.choiceRe(this.attributes.selector, this.attributes.css,
+          this.attributes.lang, this.attributes.align, this.attributes.pad);
+
+    default:
+      return this.makeRe('^', this.single[name]);
+  }
+};
+
+
+RegExpFactory.prototype.makeRe = function() {
+  var pattern = '',
+      i,
+      arg;
+
+  for (i = 0; i < arguments.length; ++i) {
+    arg = arguments[i];
+    pattern += (typeof arg === 'string') ? arg : arg.source;
+  }
+  return new RegExp(pattern);
+};
+
+RegExpFactory.prototype.choiceRe = function() {
+  var parts = [arguments[0]],
+      i;
+
+  for (i = 1; i < arguments.length; ++i) {
+    parts[i * 2 - 1] = '|';
+    parts[i * 2] = arguments[i];
+  }
+
+  parts.unshift('(?:');
+  parts.push(')');
+  return this.makeRe.apply(this, parts);
+};
+
+
+var Modes = {
+  newLayout: function() {
+    if (this.check('typeLayout')) {
+      this.state.spanningLayout = false;
+      return this.execMode(Modes.blockType);
+    }
+    if (!this.textileDisabled()) {
+      if (this.check('listLayout')) {
+        return this.execMode(Modes.list);
+      } else if (this.check('drawTable')) {
+        return this.execMode(Modes.table);
+      } else if (this.check('linkDefinition')) {
+        return this.execMode(Modes.linkDefinition);
+      } else if (this.check('definitionList')) {
+        return this.execMode(Modes.definitionList);
+      } else if (this.check('html')) {
+        return this.execMode(Modes.html);
+      }
+    }
+    return this.execMode(Modes.text);
+  },
+
+  blockType: function() {
+    var match,
+        type;
+    this.state.layoutType = null;
+
+    if (match = this.eat('type')) {
+      type = match[0];
+    } else {
+      return this.execMode(Modes.text);
+    }
+
+    if(match = type.match(this.regExpFactory.pattern('header'))) {
+      this.state.layoutType = 'header';
+      this.state.header = parseInt(match[0][1]);
+    } else if (type.match(this.regExpFactory.pattern('bq'))) {
+      this.state.layoutType = 'quote';
+    } else if (type.match(this.regExpFactory.pattern('bc'))) {
+      this.state.layoutType = 'code';
+    } else if (type.match(this.regExpFactory.pattern('foot'))) {
+      this.state.layoutType = 'footnote';
+    } else if (type.match(this.regExpFactory.pattern('notextile'))) {
+      this.state.layoutType = 'notextile';
+    } else if (type.match(this.regExpFactory.pattern('pre'))) {
+      this.state.layoutType = 'pre';
+    } else if (type.match(this.regExpFactory.pattern('div'))) {
+      this.state.layoutType = 'div';
+    } else if (type.match(this.regExpFactory.pattern('table'))) {
+      this.state.layoutType = 'table';
+    }
+
+    this.setModeForNextToken(Modes.attributes);
+    return this.tokenStyles();
+  },
+
+  text: function() {
+    if (this.eat('text')) {
+      return this.tokenStyles();
+    }
+
+    var ch = this.stream.next();
+
+    if (ch === '"') {
+      return this.execMode(Modes.link);
+    }
+    return this.handlePhraseModifier(ch);
+  },
+
+  attributes: function() {
+    this.setModeForNextToken(Modes.layoutLength);
+
+    if (this.eat('attributes')) {
+      return this.tokenStylesWith(this.styleFor('attributes'));
+    }
+    return this.tokenStyles();
+  },
+
+  layoutLength: function() {
+    if (this.stream.eat('.') && this.stream.eat('.')) {
+      this.state.spanningLayout = true;
+    }
+
+    this.setModeForNextToken(Modes.text);
+    return this.tokenStyles();
+  },
+
+  list: function() {
+    var match = this.eat('list'),
+        listMod;
+    this.state.listDepth = match[0].length;
+    listMod = (this.state.listDepth - 1) % 3;
+    if (!listMod) {
+      this.state.layoutType = 'list1';
+    } else if (listMod === 1) {
+      this.state.layoutType = 'list2';
+    } else {
+      this.state.layoutType = 'list3';
+    }
+    this.setModeForNextToken(Modes.attributes);
+    return this.tokenStyles();
+  },
+
+  link: function() {
+    this.setModeForNextToken(Modes.text);
+    if (this.eat('link')) {
+      this.stream.match(/\S+/);
+      return this.tokenStylesWith(this.styleFor('link'));
+    }
+    return this.tokenStyles();
+  },
+
+  linkDefinition: function() {
+    this.stream.skipToEnd();
+    return this.tokenStylesWith(this.styleFor('linkDefinition'));
+  },
+
+  definitionList: function() {
+    this.eat('definitionList');
+
+    this.state.layoutType = 'definitionList';
+
+    if (this.stream.match(/\s*$/)) {
+      this.state.spanningLayout = true;
+    } else {
+      this.setModeForNextToken(Modes.attributes);
+    }
+    return this.tokenStyles();
+  },
+
+  html: function() {
+    this.stream.skipToEnd();
+    return this.tokenStylesWith(this.styleFor('html'));
+  },
+
+  table: function() {
+    this.state.layoutType = 'table';
+    return this.execMode(Modes.tableCell);
+  },
+
+  tableCell: function() {
+    if (this.eat('tableHeading')) {
+      this.state.tableHeading = true;
+    } else {
+      this.stream.eat('|');
+    }
+    this.setModeForNextToken(Modes.tableCellAttributes);
+    return this.tokenStyles();
+  },
+
+  tableCellAttributes: function() {
+    this.setModeForNextToken(Modes.tableText);
+
+    if (this.eat('tableCellAttributes')) {
+      return this.tokenStylesWith(this.styleFor('attributes'));
+    }
+    return this.tokenStyles();
+  },
+
+  tableText: function() {
+    if (this.eat('tableText')) {
+      return this.tokenStyles();
+    }
+
+    if (this.stream.peek() === '|') { // end of cell
+      this.setModeForNextToken(Modes.tableCell);
+      return this.tokenStyles();
+    }
+    return this.handlePhraseModifier(this.stream.next());
+  }
+};
+
+
+CodeMirror.defineMode('textile', function() {
+  var regExpFactory = new RegExpFactory();
+
+  return {
+    startState: function() {
+      return { mode: Modes.newLayout };
+    },
+    token: function(stream, state) {
+      var parser = new Parser(regExpFactory, state, stream);
+      if (stream.sol()) { parser.startNewLine(); }
+      return parser.nextToken();
+    },
+    blankLine: function(state) {
+      new Parser(regExpFactory, state).blankLine();
+    }
+  };
+});
+
+CodeMirror.defineMIME('text/x-textile', 'textile');
+});
diff --git a/test/index.html b/test/index.html
index 6e051254db..e6428992c5 100644
--- a/test/index.html
+++ b/test/index.html
@@ -102,6 +102,8 @@ <h2>Test Suite</h2>
     <script src="../mode/shell/test.js"></script>
     <script src="../mode/stex/stex.js"></script>
     <script src="../mode/stex/test.js"></script>
+    <script src="../mode/textile/textile.js"></script>
+    <script src="../mode/textile/test.js"></script>
     <script src="../mode/verilog/verilog.js"></script>
     <script src="../mode/verilog/test.js"></script>
     <script src="../mode/xquery/xquery.js"></script>

From a4fcea9dd5218af29379f2c222fb78dcb92d661b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Sep 2014 10:34:36 +0200
Subject: [PATCH 1575/4742] [textile mode] Integrate

---
 doc/compress.html | 1 +
 mode/meta.js      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/compress.html b/doc/compress.html
index 5dc69b5101..abcb207ac1 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -163,6 +163,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/sparql/sparql.js">sparql.js</option>
           <option value="http://codemirror.net/mode/stex/stex.js">stex.js</option>
           <option value="http://codemirror.net/mode/tcl/tcl.js">tcl.js</option>
+          <option value="http://codemirror.net/mode/textile/textile.js">textile.js</option>
           <option value="http://codemirror.net/mode/tiddlywiki/tiddlywiki.js">tiddlywiki.js</option>
           <option value="http://codemirror.net/mode/tiki/tiki.js">tiki.js</option>
           <option value="http://codemirror.net/mode/toml/toml.js">toml.js</option>
diff --git a/mode/meta.js b/mode/meta.js
index d8ddd474c5..43d5e7f887 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -99,6 +99,7 @@ CodeMirror.modeInfo = [
   {name: "LaTeX", mime: "text/x-latex", mode: "stex"},
   {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog"},
   {name: "Tcl", mime: "text/x-tcl", mode: "tcl"},
+  {name: "Textile", mime: "text/x-textile", mode: "textile"},
   {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
   {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
   {name: "TOML", mime: "text/x-toml", mode: "toml"},

From e1a80eec0799c0b00a752a049ff2fff81c32c5e2 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 9 Aug 2014 23:25:12 -0700
Subject: [PATCH 1576/4742] [vim] Add custom keypress/keydown handlers.

---
 keymap/vim.js    | 122 ++++++++++++++++++++++++-----------------------
 test/vim_test.js |  13 +++--
 2 files changed, 71 insertions(+), 64 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0bf2c78248..69e8d039da 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -354,8 +354,53 @@
 
   var Pos = CodeMirror.Pos;
 
+  var modifierCodes = [16, 17, 18, 91];
+  var specialKey = {Enter:'CR',Backspace:'BS',Delete:'Del'};
   var Vim = function() {
     CodeMirror.defineOption('vimMode', false, function(cm, val) {
+      function lookupKey(e) {
+        var keyCode = e.keyCode;
+        if (modifierCodes.indexOf(keyCode) != -1) { return; }
+        var hasModifier = e.ctrlKey || e.shiftKey || e.metaKey || e.ctrlKey;
+        var key = CodeMirror.keyNames[keyCode];
+        key = specialKey[key] || key;
+        var name = '';
+        if (e.ctrlKey) { name += 'C-'; }
+        if (e.altKey) { name += 'A-'; }
+        if ((!hasModifier || e.shiftKey) && key.length < 2) {
+          // Shift key bindings can only specified for special characters.
+          return;
+        } else if (e.shiftKey) { name += 'S-'; }
+        if (key.length == 1) { key = key.toLowerCase(); }
+        name += key;
+        if (hasModifier) { name = '<' + name + '>'; }
+        return name;
+      }
+      // Keys with modifiers are handled using keydown due to limitations of
+      // keypress event.
+      function handleKeyDown(cm, e) {
+        var name = lookupKey(e);
+        if (!name) { return; }
+
+        console.log(name);
+        CodeMirror.signal(cm, 'vim-keypress', name);
+        if (CodeMirror.Vim.handleKey(cm, name)) {
+          CodeMirror.e_stop(e);
+        }
+      }
+      // Keys without modifiers are handled using keypress to work best with
+      // non-standard keyboard layouts.
+      function handleKeyPress(cm, e) {
+        var code = e.charCode || e.keyCode;
+        if (e.ctrlKey || e.metaKey || e.altKey) { return; }
+        var name = String.fromCharCode(code);
+
+        console.log(name);
+        CodeMirror.signal(cm, 'vim-keypress', name);
+        if (CodeMirror.Vim.handleKey(cm, name)) {
+          CodeMirror.e_stop(e);
+        }
+      }
       if (val) {
         cm.setOption('keyMap', 'vim');
         cm.setOption('disableInput', true);
@@ -364,12 +409,16 @@
         cm.on('cursorActivity', onCursorActivity);
         maybeInitVimState(cm);
         CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
+        cm.on('keypress', handleKeyPress);
+        cm.on('keydown', handleKeyDown);
       } else if (cm.state.vim) {
         cm.setOption('keyMap', 'default');
         cm.setOption('disableInput', false);
         cm.off('cursorActivity', onCursorActivity);
         CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
         cm.state.vim = null;
+        cm.off('keypress', handleKeyPress);
+        cm.off('keydown', handleKeyDown);
       }
     });
     function getOnPasteFn(cm) {
@@ -693,7 +742,7 @@
           if (key == 'q') {
             macroModeState.exitMacroRecordMode();
             clearInputState(cm);
-            return;
+            return true;
           }
         }
         if (key == '<Esc>') {
@@ -702,7 +751,11 @@
           if (vim.visualMode) {
             exitVisualMode(cm);
           }
-          return;
+          return true;
+        }
+        if (vim.insertMode) {
+          // TODO: handle insert mode keys in this path.
+          return false;
         }
         // Enter visual mode when the mouse selects text.
         if (!vim.visualMode &&
@@ -724,7 +777,7 @@
           if (macroModeState.isRecording) {
             logKey(macroModeState, key);
           }
-          return;
+          return isNumber(key) || vim.inputState.keyBuffer.length;
         }
         if (command.type == 'keyToKey') {
           // TODO: prevent infinite recursion.
@@ -737,6 +790,7 @@
           }
           commandDispatcher.processCommand(cm, vim, command);
         }
+        return true;
       },
       handleEx: function(cm, input) {
         exCommandDispatcher.processCommand(cm, input);
@@ -960,6 +1014,7 @@
         var selectedCharacter;
         for (var i = 0; i < keyMap.length; i++) {
           var command = keyMap[i];
+          if (vim.insertMode && command.context != 'insert') { continue; }
           if (matchKeysPartial(keys, command.keys)) {
             if (inputState.operator && command.type == 'action') {
               // Ignore matched action commands after an operator. Operators
@@ -1014,7 +1069,9 @@
           return getFullyMatchedCommandOrNull(matchedCommands[0]);
         } else {
           // Find the best match in the list of matchedCommands.
-          var context = vim.visualMode ? 'visual' : 'normal';
+          var context = vim.visualMode ? 'visual' :
+                        vim.insertMode ? 'insert' :
+                                         'normal';
           var bestMatch; // Default to first in the list.
           for (var i = 0; i < matchedCommands.length; i++) {
             var current = matchedCommands[i];
@@ -4574,65 +4631,10 @@
       });
     }
 
-    // Register Vim with CodeMirror
-    function buildVimKeyMap() {
-      /**
-       * Handle the raw key event from CodeMirror. Translate the
-       * Shift + key modifier to the resulting letter, while preserving other
-       * modifers.
-       */
-      function cmKeyToVimKey(key, modifier) {
-        var vimKey = key;
-        if (isUpperCase(vimKey) && modifier == 'Ctrl') {
-            vimKey = vimKey.toLowerCase();
-        }
-        if (modifier) {
-          // Vim will parse modifier+key combination as a single key.
-          vimKey = modifier.charAt(0) + '-' + vimKey;
-        }
-        var specialKey = ({Enter:'CR',Backspace:'BS',Delete:'Del'})[vimKey];
-        vimKey = specialKey ? specialKey : vimKey;
-        vimKey = vimKey.length > 1 ? '<'+ vimKey + '>' : vimKey;
-        return vimKey;
-      }
-
-      // Closure to bind CodeMirror, key, modifier.
-      function keyMapper(vimKey) {
-        return function(cm) {
-          CodeMirror.signal(cm, 'vim-keypress', vimKey);
-          CodeMirror.Vim.handleKey(cm, vimKey);
-        };
-      }
-
-      var cmToVimKeymap = {
+    CodeMirror.keyMap.vim = {
         'nofallthrough': true,
         'style': 'fat-cursor'
       };
-      function bindKeys(keys, modifier) {
-        for (var i = 0; i < keys.length; i++) {
-          var key = keys[i];
-          if (!modifier && key.length == 1) {
-            // Wrap all keys without modifiers with '' to identify them by their
-            // key characters instead of key identifiers.
-            key = "'" + key + "'";
-          }
-          var vimKey = cmKeyToVimKey(keys[i], modifier);
-          var cmKey = modifier ? modifier + '-' + key : key;
-          cmToVimKeymap[cmKey] = keyMapper(vimKey);
-        }
-      }
-      bindKeys(upperCaseAlphabet);
-      bindKeys(lowerCaseAlphabet);
-      bindKeys(upperCaseAlphabet, 'Ctrl');
-      bindKeys(specialSymbols);
-      bindKeys(specialSymbols, 'Ctrl');
-      bindKeys(numbers);
-      bindKeys(numbers, 'Ctrl');
-      bindKeys(specialKeys);
-      bindKeys(specialKeys, 'Ctrl');
-      return cmToVimKeymap;
-    }
-    CodeMirror.keyMap.vim = buildVimKeyMap();
 
     function exitInsertMode(cm) {
       var vim = cm.state.vim;
diff --git a/test/vim_test.js b/test/vim_test.js
index 3e9b7ae66d..38293ff923 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -902,6 +902,7 @@ testVim('c_visual_block', function(cm, vim, helpers) {
   replacement.pop();
   cm.replaceSelections(replacement);
   eq('1hello\n5hello\nahellofg', cm.getValue());
+  helpers.doInsertModeKeys('Esc');
   cm.setCursor(2, 3);
   helpers.doKeys('<C-v>', '2', 'k', 'h', 'C');
   replacement = new Array(cm.listSelections().length+1).join('world ').split(' ');
@@ -2664,7 +2665,8 @@ testVim('fc,;', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('f', '4');
   cm.setCursor(0, 0);
-  helpers.doKeys('c', ';', 'Esc');
+  helpers.doKeys('c', ';');
+  helpers.doInsertModeKeys('Esc');
   eq('56789', cm.getValue());
   helpers.doKeys('u');
   cm.setCursor(0, 9);
@@ -2675,7 +2677,8 @@ testVim('Fc,;', function(cm, vim, helpers) {
   cm.setCursor(0, 9);
   helpers.doKeys('F', '4');
   cm.setCursor(0, 9);
-  helpers.doKeys('c', ';', 'Esc');
+  helpers.doKeys('c', ';');
+  helpers.doInsertModeKeys('Esc');
   eq('01239', cm.getValue());
   helpers.doKeys('u');
   cm.setCursor(0, 0);
@@ -2686,7 +2689,8 @@ testVim('tc,;', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('t', '4');
   cm.setCursor(0, 0);
-  helpers.doKeys('c', ';', 'Esc');
+  helpers.doKeys('c', ';');
+  helpers.doInsertModeKeys('Esc');
   eq('456789', cm.getValue());
   helpers.doKeys('u');
   cm.setCursor(0, 9);
@@ -2697,7 +2701,8 @@ testVim('Tc,;', function(cm, vim, helpers) {
   cm.setCursor(0, 9);
   helpers.doKeys('T', '4');
   cm.setCursor(0, 9);
-  helpers.doKeys('c', ';', 'Esc');
+  helpers.doKeys('c', ';');
+  helpers.doInsertModeKeys('Esc');
   eq('012349', cm.getValue());
   helpers.doKeys('u');
   cm.setCursor(0, 0);

From 1175e600d25d217257faf4472fb81c52cbc20e39 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 10 Aug 2014 22:41:59 -0700
Subject: [PATCH 1577/4742] [vim] Handle keys as strings instead of arrays.

---
 keymap/vim.js | 463 ++++++++++++++++++++++++--------------------------
 1 file changed, 218 insertions(+), 245 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 69e8d039da..340169b6c2 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -72,284 +72,284 @@
   var defaultKeymap = [
     // Key to key mapping. This goes first to make it possible to override
     // existing mappings.
-    { keys: ['<Left>'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['<Right>'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['<Up>'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['<Down>'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['<Space>'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['<BS>'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['<C-Space>'], type: 'keyToKey', toKeys: ['W'] },
-    { keys: ['<C-BS>'], type: 'keyToKey', toKeys: ['B'] },
-    { keys: ['<S-Space>'], type: 'keyToKey', toKeys: ['w'] },
-    { keys: ['<S-BS>'], type: 'keyToKey', toKeys: ['b'] },
-    { keys: ['<C-n>'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['<C-p>'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['<C-[>'], type: 'keyToKey', toKeys: ['<Esc>'] },
-    { keys: ['<C-c>'], type: 'keyToKey', toKeys: ['<Esc>'] },
-    { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'], context: 'normal' },
-    { keys: ['s'], type: 'keyToKey', toKeys: ['x', 'i'], context: 'visual'},
-    { keys: ['S'], type: 'keyToKey', toKeys: ['c', 'c'], context: 'normal' },
-    { keys: ['S'], type: 'keyToKey', toKeys: ['d', 'c', 'c'], context: 'visual' },
-    { keys: ['<Home>'], type: 'keyToKey', toKeys: ['0'] },
-    { keys: ['<End>'], type: 'keyToKey', toKeys: ['$'] },
-    { keys: ['<PageUp>'], type: 'keyToKey', toKeys: ['<C-b>'] },
-    { keys: ['<PageDown>'], type: 'keyToKey', toKeys: ['<C-f>'] },
-    { keys: ['<CR>'], type: 'keyToKey', toKeys: ['j', '^'], context: 'normal' },
+    { keys: '<Left>', type: 'keyToKey', toKeys: 'h' },
+    { keys: '<Right>', type: 'keyToKey', toKeys: 'l' },
+    { keys: '<Up>', type: 'keyToKey', toKeys: 'k' },
+    { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
+    { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
+    { keys: '<BS>', type: 'keyToKey', toKeys: 'h' },
+    { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
+    { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B' },
+    { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
+    { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b' },
+    { keys: '<C-n>', type: 'keyToKey', toKeys: 'j' },
+    { keys: '<C-p>', type: 'keyToKey', toKeys: 'k' },
+    { keys: '<C->', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
+    { keys: 's', type: 'keyToKey', toKeys: 'xi', context: 'visual'},
+    { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
+    { keys: 'S', type: 'keyToKey', toKeys: 'dcc', context: 'visual' },
+    { keys: '<Home>', type: 'keyToKey', toKeys: '0' },
+    { keys: '<End>', type: 'keyToKey', toKeys: '$' },
+    { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
+    { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
+    { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
     // Motions
-    { keys: ['H'], type: 'motion',
+    { keys: 'H', type: 'motion',
         motion: 'moveToTopLine',
         motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['M'], type: 'motion',
+    { keys: 'M', type: 'motion',
         motion: 'moveToMiddleLine',
         motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['L'], type: 'motion',
+    { keys: 'L', type: 'motion',
         motion: 'moveToBottomLine',
         motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['h'], type: 'motion',
+    { keys: 'h', type: 'motion',
         motion: 'moveByCharacters',
         motionArgs: { forward: false }},
-    { keys: ['l'], type: 'motion',
+    { keys: 'l', type: 'motion',
         motion: 'moveByCharacters',
         motionArgs: { forward: true }},
-    { keys: ['j'], type: 'motion',
+    { keys: 'j', type: 'motion',
         motion: 'moveByLines',
         motionArgs: { forward: true, linewise: true }},
-    { keys: ['k'], type: 'motion',
+    { keys: 'k', type: 'motion',
         motion: 'moveByLines',
         motionArgs: { forward: false, linewise: true }},
-    { keys: ['g','j'], type: 'motion',
+    { keys: 'gj', type: 'motion',
         motion: 'moveByDisplayLines',
         motionArgs: { forward: true }},
-    { keys: ['g','k'], type: 'motion',
+    { keys: 'gk', type: 'motion',
         motion: 'moveByDisplayLines',
         motionArgs: { forward: false }},
-    { keys: ['w'], type: 'motion',
+    { keys: 'w', type: 'motion',
         motion: 'moveByWords',
         motionArgs: { forward: true, wordEnd: false }},
-    { keys: ['W'], type: 'motion',
+    { keys: 'W', type: 'motion',
         motion: 'moveByWords',
         motionArgs: { forward: true, wordEnd: false, bigWord: true }},
-    { keys: ['e'], type: 'motion',
+    { keys: 'e', type: 'motion',
         motion: 'moveByWords',
         motionArgs: { forward: true, wordEnd: true, inclusive: true }},
-    { keys: ['E'], type: 'motion',
+    { keys: 'E', type: 'motion',
         motion: 'moveByWords',
         motionArgs: { forward: true, wordEnd: true, bigWord: true,
             inclusive: true }},
-    { keys: ['b'], type: 'motion',
+    { keys: 'b', type: 'motion',
         motion: 'moveByWords',
         motionArgs: { forward: false, wordEnd: false }},
-    { keys: ['B'], type: 'motion',
+    { keys: 'B', type: 'motion',
         motion: 'moveByWords',
         motionArgs: { forward: false, wordEnd: false, bigWord: true }},
-    { keys: ['g', 'e'], type: 'motion',
+    { keys: 'ge', type: 'motion',
         motion: 'moveByWords',
         motionArgs: { forward: false, wordEnd: true, inclusive: true }},
-    { keys: ['g', 'E'], type: 'motion',
+    { keys: 'gE', type: 'motion',
         motion: 'moveByWords',
         motionArgs: { forward: false, wordEnd: true, bigWord: true,
             inclusive: true }},
-    { keys: ['{'], type: 'motion', motion: 'moveByParagraph',
+    { keys: '{', type: 'motion', motion: 'moveByParagraph',
         motionArgs: { forward: false, toJumplist: true }},
-    { keys: ['}'], type: 'motion', motion: 'moveByParagraph',
+    { keys: '}', type: 'motion', motion: 'moveByParagraph',
         motionArgs: { forward: true, toJumplist: true }},
-    { keys: ['<C-f>'], type: 'motion',
+    { keys: '<C-f>', type: 'motion',
         motion: 'moveByPage', motionArgs: { forward: true }},
-    { keys: ['<C-b>'], type: 'motion',
+    { keys: '<C-b>', type: 'motion',
         motion: 'moveByPage', motionArgs: { forward: false }},
-    { keys: ['<C-d>'], type: 'motion',
+    { keys: '<C-d>', type: 'motion',
         motion: 'moveByScroll',
         motionArgs: { forward: true, explicitRepeat: true }},
-    { keys: ['<C-u>'], type: 'motion',
+    { keys: '<C-u>', type: 'motion',
         motion: 'moveByScroll',
         motionArgs: { forward: false, explicitRepeat: true }},
-    { keys: ['g', 'g'], type: 'motion',
+    { keys: 'gg', type: 'motion',
         motion: 'moveToLineOrEdgeOfDocument',
         motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: ['G'], type: 'motion',
+    { keys: 'G', type: 'motion',
         motion: 'moveToLineOrEdgeOfDocument',
         motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: ['0'], type: 'motion', motion: 'moveToStartOfLine' },
-    { keys: ['^'], type: 'motion',
+    { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
+    { keys: '^', type: 'motion',
         motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['+'], type: 'motion',
+    { keys: '+', type: 'motion',
         motion: 'moveByLines',
         motionArgs: { forward: true, toFirstChar:true }},
-    { keys: ['-'], type: 'motion',
+    { keys: '-', type: 'motion',
         motion: 'moveByLines',
         motionArgs: { forward: false, toFirstChar:true }},
-    { keys: ['_'], type: 'motion',
+    { keys: '_', type: 'motion',
         motion: 'moveByLines',
         motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
-    { keys: ['$'], type: 'motion',
+    { keys: '$', type: 'motion',
         motion: 'moveToEol',
         motionArgs: { inclusive: true }},
-    { keys: ['%'], type: 'motion',
+    { keys: '%', type: 'motion',
         motion: 'moveToMatchedSymbol',
         motionArgs: { inclusive: true, toJumplist: true }},
-    { keys: ['f', 'character'], type: 'motion',
+    { keys: 'f<character>', type: 'motion',
         motion: 'moveToCharacter',
         motionArgs: { forward: true , inclusive: true }},
-    { keys: ['F', 'character'], type: 'motion',
+    { keys: 'F<character>', type: 'motion',
         motion: 'moveToCharacter',
         motionArgs: { forward: false }},
-    { keys: ['t', 'character'], type: 'motion',
+    { keys: 't<character>', type: 'motion',
         motion: 'moveTillCharacter',
         motionArgs: { forward: true, inclusive: true }},
-    { keys: ['T', 'character'], type: 'motion',
+    { keys: 'T<character>', type: 'motion',
         motion: 'moveTillCharacter',
         motionArgs: { forward: false }},
-    { keys: [';'], type: 'motion', motion: 'repeatLastCharacterSearch',
+    { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch',
         motionArgs: { forward: true }},
-    { keys: [','], type: 'motion', motion: 'repeatLastCharacterSearch',
+    { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch',
         motionArgs: { forward: false }},
-    { keys: ['\'', 'character'], type: 'motion', motion: 'goToMark',
+    { keys: '\'<character>', type: 'motion', motion: 'goToMark',
         motionArgs: {toJumplist: true, linewise: true}},
-    { keys: ['`', 'character'], type: 'motion', motion: 'goToMark',
+    { keys: '`<character>', type: 'motion', motion: 'goToMark',
         motionArgs: {toJumplist: true}},
-    { keys: [']', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
-    { keys: ['[', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
-    { keys: [']', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
-    { keys: ['[', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
+    { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
+    { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
+    { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
+    { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
     // the next two aren't motions but must come before more general motion declarations
-    { keys: [']', 'p'], type: 'action', action: 'paste', isEdit: true,
+    { keys: ']p', type: 'action', action: 'paste', isEdit: true,
         actionArgs: { after: true, isEdit: true, matchIndent: true}},
-    { keys: ['[', 'p'], type: 'action', action: 'paste', isEdit: true,
+    { keys: '[p', type: 'action', action: 'paste', isEdit: true,
         actionArgs: { after: false, isEdit: true, matchIndent: true}},
-    { keys: [']', 'character'], type: 'motion',
+    { keys: ']<character>', type: 'motion',
         motion: 'moveToSymbol',
         motionArgs: { forward: true, toJumplist: true}},
-    { keys: ['[', 'character'], type: 'motion',
+    { keys: '[<character>', type: 'motion',
         motion: 'moveToSymbol',
         motionArgs: { forward: false, toJumplist: true}},
-    { keys: ['|'], type: 'motion',
+    { keys: '|', type: 'motion',
         motion: 'moveToColumn',
         motionArgs: { }},
-    { keys: ['o'], type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: { }, context:'visual'},
-    { keys: ['O'], type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
+    { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: { }, context:'visual'},
+    { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
     // Operators
-    { keys: ['d'], type: 'operator', operator: 'delete' },
-    { keys: ['y'], type: 'operator', operator: 'yank' },
-    { keys: ['c'], type: 'operator', operator: 'change' },
-    { keys: ['>'], type: 'operator', operator: 'indent',
+    { keys: 'd', type: 'operator', operator: 'delete' },
+    { keys: 'y', type: 'operator', operator: 'yank' },
+    { keys: 'c', type: 'operator', operator: 'change' },
+    { keys: '>', type: 'operator', operator: 'indent',
         operatorArgs: { indentRight: true }},
-    { keys: ['<'], type: 'operator', operator: 'indent',
+    { keys: '<', type: 'operator', operator: 'indent',
         operatorArgs: { indentRight: false }},
-    { keys: ['g', '~'], type: 'operator', operator: 'swapcase' },
-    { keys: ['n'], type: 'motion', motion: 'findNext',
+    { keys: 'g~', type: 'operator', operator: 'swapcase' },
+    { keys: 'n', type: 'motion', motion: 'findNext',
         motionArgs: { forward: true, toJumplist: true }},
-    { keys: ['N'], type: 'motion', motion: 'findNext',
+    { keys: 'N', type: 'motion', motion: 'findNext',
         motionArgs: { forward: false, toJumplist: true }},
     // Operator-Motion dual commands
-    { keys: ['x'], type: 'operatorMotion', operator: 'delete',
+    { keys: 'x', type: 'operatorMotion', operator: 'delete',
         motion: 'moveByCharacters', motionArgs: { forward: true },
         operatorMotionArgs: { visualLine: false }},
-    { keys: ['X'], type: 'operatorMotion', operator: 'delete',
+    { keys: 'X', type: 'operatorMotion', operator: 'delete',
         motion: 'moveByCharacters', motionArgs: { forward: false },
         operatorMotionArgs: { visualLine: true }},
-    { keys: ['D'], type: 'operatorMotion', operator: 'delete',
+    { keys: 'D', type: 'operatorMotion', operator: 'delete',
       motion: 'moveToEol', motionArgs: { inclusive: true },
         operatorMotionArgs: { visualLine: true }},
-    { keys: ['Y'], type: 'operatorMotion', operator: 'yank',
+    { keys: 'Y', type: 'operatorMotion', operator: 'yank',
         motion: 'moveToEol', motionArgs: { inclusive: true },
         operatorMotionArgs: { visualLine: true }},
-    { keys: ['C'], type: 'operatorMotion',
+    { keys: 'C', type: 'operatorMotion',
         operator: 'change',
         motion: 'moveToEol', motionArgs: { inclusive: true },
         operatorMotionArgs: { visualLine: true }},
-    { keys: ['~'], type: 'operatorMotion',
+    { keys: '~', type: 'operatorMotion',
         operator: 'swapcase', operatorArgs: { shouldMoveCursor: true },
         motion: 'moveByCharacters', motionArgs: { forward: true }},
     // Actions
-    { keys: ['<C-i>'], type: 'action', action: 'jumpListWalk',
+    { keys: '<C-i>', type: 'action', action: 'jumpListWalk',
         actionArgs: { forward: true }},
-    { keys: ['<C-o>'], type: 'action', action: 'jumpListWalk',
+    { keys: '<C-o>', type: 'action', action: 'jumpListWalk',
         actionArgs: { forward: false }},
-    { keys: ['<C-e>'], type: 'action',
+    { keys: '<C-e>', type: 'action',
         action: 'scroll',
         actionArgs: { forward: true, linewise: true }},
-    { keys: ['<C-y>'], type: 'action',
+    { keys: '<C-y>', type: 'action',
         action: 'scroll',
         actionArgs: { forward: false, linewise: true }},
-    { keys: ['a'], type: 'action', action: 'enterInsertMode', isEdit: true,
+    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'charAfter' }},
-    { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true,
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'eol' }},
-    { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
-    { keys: ['i'], type: 'action', action: 'enterInsertMode', isEdit: true,
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
+    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'inplace' }},
-    { keys: ['I'], type: 'action', action: 'enterInsertMode', isEdit: true,
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { insertAt: 'firstNonBlank' }},
-    { keys: ['o'], type: 'action', action: 'newLineAndEnterInsertMode',
+    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode',
         isEdit: true, interlaceInsertRepeat: true,
         actionArgs: { after: true }},
-    { keys: ['O'], type: 'action', action: 'newLineAndEnterInsertMode',
+    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode',
         isEdit: true, interlaceInsertRepeat: true,
         actionArgs: { after: false }},
-    { keys: ['v'], type: 'action', action: 'toggleVisualMode' },
-    { keys: ['V'], type: 'action', action: 'toggleVisualMode',
+    { keys: 'v', type: 'action', action: 'toggleVisualMode' },
+    { keys: 'V', type: 'action', action: 'toggleVisualMode',
         actionArgs: { linewise: true }},
-    { keys: ['<C-v>'], type: 'action', action: 'toggleVisualMode',
+    { keys: '<C-v>', type: 'action', action: 'toggleVisualMode',
         actionArgs: { blockwise: true }},
-    { keys: ['g', 'v'], type: 'action', action: 'reselectLastSelection' },
-    { keys: ['J'], type: 'action', action: 'joinLines', isEdit: true },
-    { keys: ['p'], type: 'action', action: 'paste', isEdit: true,
+    { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
+    { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
+    { keys: 'p', type: 'action', action: 'paste', isEdit: true,
         actionArgs: { after: true, isEdit: true }},
-    { keys: ['P'], type: 'action', action: 'paste', isEdit: true,
+    { keys: 'P', type: 'action', action: 'paste', isEdit: true,
         actionArgs: { after: false, isEdit: true }},
-    { keys: ['r', 'character'], type: 'action', action: 'replace', isEdit: true },
-    { keys: ['@', 'character'], type: 'action', action: 'replayMacro' },
-    { keys: ['q', 'character'], type: 'action', action: 'enterMacroRecordMode' },
+    { keys: 'r<character>', type: 'action', action: 'replace', isEdit: true },
+    { keys: '@<character>', type: 'action', action: 'replayMacro' },
+    { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' },
     // Handle Replace-mode as a special case of insert mode.
-    { keys: ['R'], type: 'action', action: 'enterInsertMode', isEdit: true,
+    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true,
         actionArgs: { replace: true }},
-    { keys: ['u'], type: 'action', action: 'undo' },
-    { keys: ['u'], type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
-    { keys: ['U'],type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
-    { keys: ['<C-r>'], type: 'action', action: 'redo' },
-    { keys: ['m', 'character'], type: 'action', action: 'setMark' },
-    { keys: ['"', 'character'], type: 'action', action: 'setRegister' },
-    { keys: ['z', 'z'], type: 'action', action: 'scrollToCursor',
+    { keys: 'u', type: 'action', action: 'undo' },
+    { keys: 'u', type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
+    { keys: 'U',type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
+    { keys: '<C-r>', type: 'action', action: 'redo' },
+    { keys: 'm<character>', type: 'action', action: 'setMark' },
+    { keys: '"<character>', type: 'action', action: 'setRegister' },
+    { keys: 'zz', type: 'action', action: 'scrollToCursor',
         actionArgs: { position: 'center' }},
-    { keys: ['z', '.'], type: 'action', action: 'scrollToCursor',
+    { keys: 'z.', type: 'action', action: 'scrollToCursor',
         actionArgs: { position: 'center' },
         motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['z', 't'], type: 'action', action: 'scrollToCursor',
+    { keys: 'zt', type: 'action', action: 'scrollToCursor',
         actionArgs: { position: 'top' }},
-    { keys: ['z', '<CR>'], type: 'action', action: 'scrollToCursor',
+    { keys: 'z<CR>', type: 'action', action: 'scrollToCursor',
         actionArgs: { position: 'top' },
         motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['z', '-'], type: 'action', action: 'scrollToCursor',
+    { keys: 'z-', type: 'action', action: 'scrollToCursor',
         actionArgs: { position: 'bottom' }},
-    { keys: ['z', 'b'], type: 'action', action: 'scrollToCursor',
+    { keys: 'zb', type: 'action', action: 'scrollToCursor',
         actionArgs: { position: 'bottom' },
         motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['.'], type: 'action', action: 'repeatLastEdit' },
-    { keys: ['<C-a>'], type: 'action', action: 'incrementNumberToken',
+    { keys: '.', type: 'action', action: 'repeatLastEdit' },
+    { keys: '<C-a>', type: 'action', action: 'incrementNumberToken',
         isEdit: true,
         actionArgs: {increase: true, backtrack: false}},
-    { keys: ['<C-x>'], type: 'action', action: 'incrementNumberToken',
+    { keys: '<C-x>', type: 'action', action: 'incrementNumberToken',
         isEdit: true,
         actionArgs: {increase: false, backtrack: false}},
     // Text object motions
-    { keys: ['a', 'character'], type: 'motion',
+    { keys: 'a<character>', type: 'motion',
         motion: 'textObjectManipulation' },
-    { keys: ['i', 'character'], type: 'motion',
+    { keys: 'i<character>', type: 'motion',
         motion: 'textObjectManipulation',
         motionArgs: { textObjectInner: true }},
     // Search
-    { keys: ['/'], type: 'search',
+    { keys: '/', type: 'search',
         searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
-    { keys: ['?'], type: 'search',
+    { keys: '?', type: 'search',
         searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
-    { keys: ['*'], type: 'search',
+    { keys: '*', type: 'search',
         searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: ['#'], type: 'search',
+    { keys: '#', type: 'search',
         searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: ['g', '*'], type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
-    { keys: ['g', '#'], type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
+    { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
+    { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
     // Ex command
-    { keys: [':'], type: 'ex' }
+    { keys: ':', type: 'ex' }
   ];
 
   var Pos = CodeMirror.Pos;
@@ -373,7 +373,7 @@
         } else if (e.shiftKey) { name += 'S-'; }
         if (key.length == 1) { key = key.toLowerCase(); }
         name += key;
-        if (hasModifier) { name = '<' + name + '>'; }
+        if (name.length > 1) { name = '<' + name + '>'; }
         return name;
       }
       // Keys with modifiers are handled using keydown due to limitations of
@@ -755,6 +755,7 @@
         }
         if (vim.insertMode) {
           // TODO: handle insert mode keys in this path.
+          clearInputState(cm);
           return false;
         }
         // Enter visual mode when the mouse selects text.
@@ -765,24 +766,28 @@
           CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
           cm.on('mousedown', exitVisualMode);
         }
-        if (key != '0' || (key == '0' && vim.inputState.getRepeat() === 0)) {
-          // Have to special case 0 since it's both a motion and a number.
-          command = commandDispatcher.matchCommand(key, defaultKeymap, vim);
+        var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+        if (/^[1-9]\d*$/.test(keys)) {
+          if (macroModeState.isRecording) {
+            logKey(macroModeState, key);
+          }
+          return true;
         }
+        var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+        command = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim);
         if (!command) {
-          if (isNumber(key)) {
-            // Increment count unless count is 0 and key is 0.
-            vim.inputState.pushRepeatDigit(key);
-          }
           if (macroModeState.isRecording) {
             logKey(macroModeState, key);
           }
-          return isNumber(key) || vim.inputState.keyBuffer.length;
+          return vim.inputState.keyBuffer.length;
+        }
+        if (keysMatcher[1] && keysMatcher[1] != '0') {
+          vim.inputState.pushRepeatDigit(keysMatcher[1]);
         }
         if (command.type == 'keyToKey') {
           // TODO: prevent infinite recursion.
           for (var i = 0; i < command.toKeys.length; i++) {
-            this.handleKey(cm, command.toKeys[i]);
+            this.handleKey(cm, command.toKeys.charAt(i));
           }
         } else {
           if (macroModeState.isRecording) {
@@ -1007,86 +1012,32 @@
       }
     };
     var commandDispatcher = {
-      matchCommand: function(key, keyMap, vim) {
+      matchCommand: function(keys, keyMap, vim) {
         var inputState = vim.inputState;
-        var keys = inputState.keyBuffer.concat(key);
-        var matchedCommands = [];
-        var selectedCharacter;
-        for (var i = 0; i < keyMap.length; i++) {
-          var command = keyMap[i];
-          if (vim.insertMode && command.context != 'insert') { continue; }
-          if (matchKeysPartial(keys, command.keys)) {
-            if (inputState.operator && command.type == 'action') {
-              // Ignore matched action commands after an operator. Operators
-              // only operate on motions. This check is really for text
-              // objects since aW, a[ etcs conflicts with a.
-              continue;
-            }
-            // Match commands that take <character> as an argument.
-            if (command.keys[keys.length - 1] == 'character') {
-              selectedCharacter = keys[keys.length - 1];
-              if (selectedCharacter.length>1){
-                switch(selectedCharacter){
-                  case '<CR>':
-                    selectedCharacter='\n';
-                    break;
-                  case '<Space>':
-                    selectedCharacter=' ';
-                    break;
-                  default:
-                    continue;
-                }
-              }
-            }
-            // Add the command to the list of matched commands. Choose the best
-            // command later.
-            matchedCommands.push(command);
-          }
+        var context = vim.visualMode ? 'visual' :
+                      vim.insertMode ? 'insert' :
+                                       'normal';
+        var matches = commandMatches(keys, keyMap, context, inputState);
+        if (!matches.full && !matches.partial) {
+          inputState.keyBuffer = '';
+          return undefined;
+        } else if (!matches.full && matches.partial) {
+          return undefined;
         }
 
-        // Returns the command if it is a full match, or null if not.
-        function getFullyMatchedCommandOrNull(command) {
-          if (keys.length < command.keys.length) {
-            // Matches part of a multi-key command. Buffer and wait for next
-            // stroke.
-            inputState.keyBuffer.push(key);
-            return null;
-          } else {
-            if (command.keys[keys.length - 1] == 'character') {
-              inputState.selectedCharacter = selectedCharacter;
-            }
-            // Clear the buffer since a full match was found.
-            inputState.keyBuffer = [];
-            return command;
+        inputState.keyBuffer = '';
+        var bestMatch;
+        for (var i = 0; i < matches.full.length; i++) {
+          var match = matches.full[i];
+          if (!bestMatch ||
+              match.context == context) {
+            bestMatch = match;
           }
         }
-
-        if (!matchedCommands.length) {
-          // Clear the buffer since there were no matches.
-          inputState.keyBuffer = [];
-          return null;
-        } else if (matchedCommands.length == 1) {
-          return getFullyMatchedCommandOrNull(matchedCommands[0]);
-        } else {
-          // Find the best match in the list of matchedCommands.
-          var context = vim.visualMode ? 'visual' :
-                        vim.insertMode ? 'insert' :
-                                         'normal';
-          var bestMatch; // Default to first in the list.
-          for (var i = 0; i < matchedCommands.length; i++) {
-            var current = matchedCommands[i];
-            if (current.context == context) {
-              bestMatch = current;
-              break;
-            } else if (!bestMatch && !current.context) {
-              // Only set an imperfect match to best match if no best match is
-              // set and the imperfect match is not restricted to another
-              // context.
-              bestMatch = current;
-            }
-          }
-          return getFullyMatchedCommandOrNull(bestMatch);
+        if (bestMatch.keys.slice(-11) == '<character>') {
+          inputState.selectedCharacter = lastChar(keys);
         }
+        return bestMatch;
       },
       processCommand: function(cm, vim, command) {
         vim.inputState.repeatOverride = command.repeatOverride;
@@ -2691,14 +2642,51 @@
     function offsetCursor(cur, offsetLine, offsetCh) {
       return Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
-    function matchKeysPartial(pressed, mapped) {
-      for (var i = 0; i < pressed.length; i++) {
-        // 'character' means any character. For mark, register commads, etc.
-        if (pressed[i] != mapped[i] && mapped[i] != 'character') {
-          return false;
+    function commandMatches(keys, keyMap, context, inputState) {
+      var match, partial = [], full = [];
+      for (var i = 0; i < keyMap.length; i++) {
+        var command = keyMap[i];
+        if (context == 'insert' && command.context != 'insert' ||
+            command.context && command.context != context ||
+            inputState.operator && command.type == 'action' ||
+            !(match = commandMatch(keys, command.keys))) { continue; }
+        if (match == 'partial') { partial.push(command); }
+        if (match == 'full') { full.push(command); }
+      }
+      return {
+        partial: partial.length && partial,
+        full: full.length && full,
+      }
+    }
+    function commandMatch(pressed, mapped) {
+      if (mapped.slice(-11) == '<character>') {
+        // Last character matches anything.
+        var prefixLen = mapped.length - 11;
+        var pressedPrefix = pressed.slice(0, prefixLen);
+        var mappedPrefix = mapped.slice(0, prefixLen);
+        return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' :
+               mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false;
+      } else {
+        return pressed == mapped ? 'full' :
+               mapped.indexOf(pressed) == 0 ? 'partial' : false;
+      }
+    }
+    function lastChar(keys) {
+      var match = /^.*(<[\w\-]+>)$/.exec(keys);
+      var selectedCharacter = match ? match[1] : keys.slice(-1);
+      if (selectedCharacter.length > 1){
+        switch(selectedCharacter){
+          case '<CR>':
+            selectedCharacter='\n';
+            break;
+          case '<Space>':
+            selectedCharacter=' ';
+            break;
+          default:
+            break;
         }
       }
-      return true;
+      return selectedCharacter;
     }
     function repeatFn(cm, fn, repeat) {
       return function() {
@@ -4063,7 +4051,7 @@
             this.commandMap_[commandName] = {
               name: commandName,
               type: 'exToKey',
-              toKeys: parseKeyString(rhs),
+              toKeys: rhs,
               user: true
             };
           }
@@ -4071,7 +4059,7 @@
           if (rhs != ':' && rhs.charAt(0) == ':') {
             // Key to Ex mapping.
             var mapping = {
-              keys: parseKeyString(lhs),
+              keys: lhs,
               type: 'keyToEx',
               exArgs: { input: rhs.substring(1) },
               user: true};
@@ -4080,9 +4068,9 @@
           } else {
             // Key to key mapping
             var mapping = {
-              keys: parseKeyString(lhs),
+              keys: lhs,
               type: 'keyToKey',
-              toKeys: parseKeyString(rhs),
+              toKeys: rhs,
               user: true
             };
             if (ctx) { mapping.context = ctx; }
@@ -4110,9 +4098,9 @@
           }
         } else {
           // Key to Ex or key to key mapping
-          var keys = parseKeyString(lhs);
+          var keys = lhs;
           for (var i = 0; i < defaultKeymap.length; i++) {
-            if (arrayEquals(keys, defaultKeymap[i].keys)
+            if (keys == defaultKeymap[i].keys
                 && defaultKeymap[i].context === ctx
                 && defaultKeymap[i].user) {
               defaultKeymap.splice(i, 1);
@@ -4124,21 +4112,6 @@
       }
     };
 
-    // Converts a key string sequence of the form a<C-w>bd<Left> into Vim's
-    // keymap representation.
-    function parseKeyString(str) {
-      var key, match;
-      var keys = [];
-      while (str) {
-        match = (/<\w+-.+?>|<\w+>|./).exec(str);
-        if (match === null)break;
-        key = match[0];
-        str = str.substring(match.index + key.length);
-        keys.push(key);
-      }
-      return keys;
-    }
-
     var exCommands = {
       map: function(cm, params, ctx) {
         var mapArgs = params.args;

From 4bac4c99a72bd5be3e94a8b3940371007b1949bc Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 10 Aug 2014 23:04:38 -0700
Subject: [PATCH 1578/4742] [vim] Compact defaultKeyMap to 1 line per key

---
 keymap/vim.js | 303 ++++++++++++++------------------------------------
 1 file changed, 84 insertions(+), 219 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 340169b6c2..19e4b0567c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -96,256 +96,121 @@
     { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
     { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
     // Motions
-    { keys: 'H', type: 'motion',
-        motion: 'moveToTopLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: 'M', type: 'motion',
-        motion: 'moveToMiddleLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: 'L', type: 'motion',
-        motion: 'moveToBottomLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: 'h', type: 'motion',
-        motion: 'moveByCharacters',
-        motionArgs: { forward: false }},
-    { keys: 'l', type: 'motion',
-        motion: 'moveByCharacters',
-        motionArgs: { forward: true }},
-    { keys: 'j', type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, linewise: true }},
-    { keys: 'k', type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: false, linewise: true }},
-    { keys: 'gj', type: 'motion',
-        motion: 'moveByDisplayLines',
-        motionArgs: { forward: true }},
-    { keys: 'gk', type: 'motion',
-        motion: 'moveByDisplayLines',
-        motionArgs: { forward: false }},
-    { keys: 'w', type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: false }},
-    { keys: 'W', type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: false, bigWord: true }},
-    { keys: 'e', type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: true, inclusive: true }},
-    { keys: 'E', type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: true, bigWord: true,
-            inclusive: true }},
-    { keys: 'b', type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: false }},
-    { keys: 'B', type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: false, bigWord: true }},
-    { keys: 'ge', type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: true, inclusive: true }},
-    { keys: 'gE', type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: true, bigWord: true,
-            inclusive: true }},
-    { keys: '{', type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: false, toJumplist: true }},
-    { keys: '}', type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: true, toJumplist: true }},
-    { keys: '<C-f>', type: 'motion',
-        motion: 'moveByPage', motionArgs: { forward: true }},
-    { keys: '<C-b>', type: 'motion',
-        motion: 'moveByPage', motionArgs: { forward: false }},
-    { keys: '<C-d>', type: 'motion',
-        motion: 'moveByScroll',
-        motionArgs: { forward: true, explicitRepeat: true }},
-    { keys: '<C-u>', type: 'motion',
-        motion: 'moveByScroll',
-        motionArgs: { forward: false, explicitRepeat: true }},
-    { keys: 'gg', type: 'motion',
-        motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: 'G', type: 'motion',
-        motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }},
+    { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }},
+    { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }},
+    { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }},
+    { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }},
+    { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }},
+    { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }},
+    { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }},
+    { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }},
+    { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }},
+    { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }},
+    { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
+    { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
+    { keys: '<C-f>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
+    { keys: '<C-b>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
+    { keys: '<C-d>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
+    { keys: '<C-u>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
+    { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
     { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
-    { keys: '^', type: 'motion',
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: '+', type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, toFirstChar:true }},
-    { keys: '-', type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: false, toFirstChar:true }},
-    { keys: '_', type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
-    { keys: '$', type: 'motion',
-        motion: 'moveToEol',
-        motionArgs: { inclusive: true }},
-    { keys: '%', type: 'motion',
-        motion: 'moveToMatchedSymbol',
-        motionArgs: { inclusive: true, toJumplist: true }},
-    { keys: 'f<character>', type: 'motion',
-        motion: 'moveToCharacter',
-        motionArgs: { forward: true , inclusive: true }},
-    { keys: 'F<character>', type: 'motion',
-        motion: 'moveToCharacter',
-        motionArgs: { forward: false }},
-    { keys: 't<character>', type: 'motion',
-        motion: 'moveTillCharacter',
-        motionArgs: { forward: true, inclusive: true }},
-    { keys: 'T<character>', type: 'motion',
-        motion: 'moveTillCharacter',
-        motionArgs: { forward: false }},
-    { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch',
-        motionArgs: { forward: true }},
-    { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch',
-        motionArgs: { forward: false }},
-    { keys: '\'<character>', type: 'motion', motion: 'goToMark',
-        motionArgs: {toJumplist: true, linewise: true}},
-    { keys: '`<character>', type: 'motion', motion: 'goToMark',
-        motionArgs: {toJumplist: true}},
+    { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
+    { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }},
+    { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
+    { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }},
+    { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }},
+    { keys: 'f<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }},
+    { keys: 'F<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }},
+    { keys: 't<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }},
+    { keys: 'T<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }},
+    { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }},
+    { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }},
+    { keys: '\'<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}},
+    { keys: '`<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}},
     { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
     { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
     { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
     { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
     // the next two aren't motions but must come before more general motion declarations
-    { keys: ']p', type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: true, isEdit: true, matchIndent: true}},
-    { keys: '[p', type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: false, isEdit: true, matchIndent: true}},
-    { keys: ']<character>', type: 'motion',
-        motion: 'moveToSymbol',
-        motionArgs: { forward: true, toJumplist: true}},
-    { keys: '[<character>', type: 'motion',
-        motion: 'moveToSymbol',
-        motionArgs: { forward: false, toJumplist: true}},
-    { keys: '|', type: 'motion',
-        motion: 'moveToColumn',
-        motionArgs: { }},
-    { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: { }, context:'visual'},
+    { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}},
+    { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}},
+    { keys: ']<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}},
+    { keys: '[<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}},
+    { keys: '|', type: 'motion', motion: 'moveToColumn'},
+    { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'},
     { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
     // Operators
     { keys: 'd', type: 'operator', operator: 'delete' },
     { keys: 'y', type: 'operator', operator: 'yank' },
     { keys: 'c', type: 'operator', operator: 'change' },
-    { keys: '>', type: 'operator', operator: 'indent',
-        operatorArgs: { indentRight: true }},
-    { keys: '<', type: 'operator', operator: 'indent',
-        operatorArgs: { indentRight: false }},
+    { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
+    { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
     { keys: 'g~', type: 'operator', operator: 'swapcase' },
-    { keys: 'n', type: 'motion', motion: 'findNext',
-        motionArgs: { forward: true, toJumplist: true }},
-    { keys: 'N', type: 'motion', motion: 'findNext',
-        motionArgs: { forward: false, toJumplist: true }},
+    { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
+    { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
     // Operator-Motion dual commands
-    { keys: 'x', type: 'operatorMotion', operator: 'delete',
-        motion: 'moveByCharacters', motionArgs: { forward: true },
-        operatorMotionArgs: { visualLine: false }},
-    { keys: 'X', type: 'operatorMotion', operator: 'delete',
-        motion: 'moveByCharacters', motionArgs: { forward: false },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: 'D', type: 'operatorMotion', operator: 'delete',
-      motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: 'Y', type: 'operatorMotion', operator: 'yank',
-        motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: 'C', type: 'operatorMotion',
-        operator: 'change',
-        motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: '~', type: 'operatorMotion',
-        operator: 'swapcase', operatorArgs: { shouldMoveCursor: true },
-        motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
+    { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
+    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
+    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
+    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
+    { keys: '~', type: 'operatorMotion', operator: 'swapcase', operatorArgs: { shouldMoveCursor: true }, motion: 'moveByCharacters', motionArgs: { forward: true }},
     // Actions
-    { keys: '<C-i>', type: 'action', action: 'jumpListWalk',
-        actionArgs: { forward: true }},
-    { keys: '<C-o>', type: 'action', action: 'jumpListWalk',
-        actionArgs: { forward: false }},
-    { keys: '<C-e>', type: 'action',
-        action: 'scroll',
-        actionArgs: { forward: true, linewise: true }},
-    { keys: '<C-y>', type: 'action',
-        action: 'scroll',
-        actionArgs: { forward: false, linewise: true }},
-    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'charAfter' }},
-    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'eol' }},
+    { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
+    { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
+    { keys: '<C-e>', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
+    { keys: '<C-y>', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
+    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }},
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }},
     { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
-    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'inplace' }},
-    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'firstNonBlank' }},
-    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true, interlaceInsertRepeat: true,
-        actionArgs: { after: true }},
-    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true, interlaceInsertRepeat: true,
-        actionArgs: { after: false }},
+    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }},
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank' }},
+    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }},
+    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }},
     { keys: 'v', type: 'action', action: 'toggleVisualMode' },
-    { keys: 'V', type: 'action', action: 'toggleVisualMode',
-        actionArgs: { linewise: true }},
-    { keys: '<C-v>', type: 'action', action: 'toggleVisualMode',
-        actionArgs: { blockwise: true }},
+    { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
+    { keys: '<C-v>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
     { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
     { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
-    { keys: 'p', type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: true, isEdit: true }},
-    { keys: 'P', type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: false, isEdit: true }},
+    { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
+    { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
     { keys: 'r<character>', type: 'action', action: 'replace', isEdit: true },
     { keys: '@<character>', type: 'action', action: 'replayMacro' },
     { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' },
     // Handle Replace-mode as a special case of insert mode.
-    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { replace: true }},
+    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
     { keys: 'u', type: 'action', action: 'undo' },
     { keys: 'u', type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
     { keys: 'U',type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
     { keys: '<C-r>', type: 'action', action: 'redo' },
     { keys: 'm<character>', type: 'action', action: 'setMark' },
     { keys: '"<character>', type: 'action', action: 'setRegister' },
-    { keys: 'zz', type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'center' }},
-    { keys: 'z.', type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'center' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: 'zt', type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'top' }},
-    { keys: 'z<CR>', type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'top' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: 'z-', type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'bottom' }},
-    { keys: 'zb', type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'bottom' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }},
+    { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
+    { keys: 'z<CR>', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
+    { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
     { keys: '.', type: 'action', action: 'repeatLastEdit' },
-    { keys: '<C-a>', type: 'action', action: 'incrementNumberToken',
-        isEdit: true,
-        actionArgs: {increase: true, backtrack: false}},
-    { keys: '<C-x>', type: 'action', action: 'incrementNumberToken',
-        isEdit: true,
-        actionArgs: {increase: false, backtrack: false}},
+    { keys: '<C-a>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
+    { keys: '<C-x>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
     // Text object motions
-    { keys: 'a<character>', type: 'motion',
-        motion: 'textObjectManipulation' },
-    { keys: 'i<character>', type: 'motion',
-        motion: 'textObjectManipulation',
-        motionArgs: { textObjectInner: true }},
+    { keys: 'a<character>', type: 'motion', motion: 'textObjectManipulation' },
+    { keys: 'i<character>', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
     // Search
-    { keys: '/', type: 'search',
-        searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
-    { keys: '?', type: 'search',
-        searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
-    { keys: '*', type: 'search',
-        searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: '#', type: 'search',
-        searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
+    { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
+    { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
     { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
     { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
     // Ex command

From db4c255bba6b04d2a7ede6ecb5f96ca4915ad3fd Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 10 Aug 2014 23:38:53 -0700
Subject: [PATCH 1579/4742] [vim] Add origin to handleKey.

Move keybuffer clearing code out of the matching code
---
 keymap/vim.js | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 19e4b0567c..104f62ef23 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -249,7 +249,7 @@
 
         console.log(name);
         CodeMirror.signal(cm, 'vim-keypress', name);
-        if (CodeMirror.Vim.handleKey(cm, name)) {
+        if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
           CodeMirror.e_stop(e);
         }
       }
@@ -262,7 +262,7 @@
 
         console.log(name);
         CodeMirror.signal(cm, 'vim-keypress', name);
-        if (CodeMirror.Vim.handleKey(cm, name)) {
+        if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
           CodeMirror.e_stop(e);
         }
       }
@@ -599,7 +599,7 @@
       },
       // This is the outermost function called by CodeMirror, after keys have
       // been mapped to their Vim equivalents.
-      handleKey: function(cm, key) {
+      handleKey: function(cm, key, origin) {
         var command;
         var vim = maybeInitVimState(cm);
         var macroModeState = vimGlobalState.macroModeState;
@@ -609,6 +609,9 @@
             clearInputState(cm);
             return true;
           }
+          if (origin != 'mapping') {
+            logKey(macroModeState, key);
+          }
         }
         if (key == '<Esc>') {
           // Clear input state and get back to normal mode.
@@ -633,31 +636,24 @@
         }
         var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
         if (/^[1-9]\d*$/.test(keys)) {
-          if (macroModeState.isRecording) {
-            logKey(macroModeState, key);
-          }
           return true;
         }
         var keysMatcher = /^(\d*)(.*)$/.exec(keys);
-        command = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim);
-        if (!command) {
-          if (macroModeState.isRecording) {
-            logKey(macroModeState, key);
-          }
-          return vim.inputState.keyBuffer.length;
-        }
+        var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim);
+        if (match.type == 'none') { clearInputState(cm); return false; }
+        else if (match.type == 'partial') { return true; }
+
+        vim.inputState.keyBuffer = '';
+        var command = match.command;
         if (keysMatcher[1] && keysMatcher[1] != '0') {
           vim.inputState.pushRepeatDigit(keysMatcher[1]);
         }
         if (command.type == 'keyToKey') {
           // TODO: prevent infinite recursion.
           for (var i = 0; i < command.toKeys.length; i++) {
-            this.handleKey(cm, command.toKeys.charAt(i));
+            this.handleKey(cm, command.toKeys.charAt(i), 'mapping');
           }
         } else {
-          if (macroModeState.isRecording) {
-            logKey(macroModeState, key);
-          }
           commandDispatcher.processCommand(cm, vim, command);
         }
         return true;
@@ -884,13 +880,11 @@
                                        'normal';
         var matches = commandMatches(keys, keyMap, context, inputState);
         if (!matches.full && !matches.partial) {
-          inputState.keyBuffer = '';
-          return undefined;
+          return {type: 'none'};
         } else if (!matches.full && matches.partial) {
-          return undefined;
+          return {type: 'partial'};
         }
 
-        inputState.keyBuffer = '';
         var bestMatch;
         for (var i = 0; i < matches.full.length; i++) {
           var match = matches.full[i];
@@ -902,7 +896,7 @@
         if (bestMatch.keys.slice(-11) == '<character>') {
           inputState.selectedCharacter = lastChar(keys);
         }
-        return bestMatch;
+        return {type: 'full', command: bestMatch};
       },
       processCommand: function(cm, vim, command) {
         vim.inputState.repeatOverride = command.repeatOverride;
@@ -3792,7 +3786,7 @@
             if (command.type == 'exToKey') {
               // Handle Ex to Key mapping.
               for (var i = 0; i < command.toKeys.length; i++) {
-                CodeMirror.Vim.handleKey(cm, command.toKeys[i]);
+                CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
               }
               return;
             } else if (command.type == 'exToEx') {
@@ -4629,7 +4623,7 @@
           match = (/<\w+-.+?>|<\w+>|./).exec(text);
           key = match[0];
           text = text.substring(match.index + key.length);
-          CodeMirror.Vim.handleKey(cm, key);
+          CodeMirror.Vim.handleKey(cm, key, 'macro');
           if (vim.insertMode) {
             var changes = register.insertModeChanges[imc++].changes;
             vimGlobalState.macroModeState.lastInsertModeChanges.changes =

From 42f0fc7890d977257c3a618c6dca0df59f5367ee Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 10 Aug 2014 23:49:08 -0700
Subject: [PATCH 1580/4742] [vim] Don't handle meta-key on mac

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 104f62ef23..626b2b0973 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -221,6 +221,7 @@
 
   var modifierCodes = [16, 17, 18, 91];
   var specialKey = {Enter:'CR',Backspace:'BS',Delete:'Del'};
+  var mac = /Mac/.test(navigator.platform);
   var Vim = function() {
     CodeMirror.defineOption('vimMode', false, function(cm, val) {
       function lookupKey(e) {
@@ -232,7 +233,7 @@
         var name = '';
         if (e.ctrlKey) { name += 'C-'; }
         if (e.altKey) { name += 'A-'; }
-        if ((!hasModifier || e.shiftKey) && key.length < 2) {
+        if (mac && e.metaKey || (!hasModifier || e.shiftKey) && key.length < 2) {
           // Shift key bindings can only specified for special characters.
           return;
         } else if (e.shiftKey) { name += 'S-'; }

From 176f1bc7cfeefa4182b0d10bded374a7a3adccf9 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 23 Aug 2014 16:02:20 -0700
Subject: [PATCH 1581/4742] [vim] Allow generic insert mode keymaps

---
 keymap/vim.js    | 221 ++++++++++++++++++++++++-----------------------
 test/vim_test.js |  86 +++++++++---------
 2 files changed, 157 insertions(+), 150 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 626b2b0973..d117583163 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -84,8 +84,10 @@
     { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b' },
     { keys: '<C-n>', type: 'keyToKey', toKeys: 'j' },
     { keys: '<C-p>', type: 'keyToKey', toKeys: 'k' },
-    { keys: '<C->', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>' },
     { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
+    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
     { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
     { keys: 's', type: 'keyToKey', toKeys: 'xi', context: 'visual'},
     { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
@@ -563,6 +565,7 @@
       }
     }
 
+    var lastInsertModeKeyTimer;
     var vimApi= {
       buildKeyMap: function() {
         // TODO: Convert keymap into dictionary format for fast lookup.
@@ -603,61 +606,120 @@
       handleKey: function(cm, key, origin) {
         var command;
         var vim = maybeInitVimState(cm);
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.isRecording) {
-          if (key == 'q') {
-            macroModeState.exitMacroRecordMode();
+        function handleMacroRecording() {
+          var macroModeState = vimGlobalState.macroModeState;
+          if (macroModeState.isRecording) {
+            if (key == 'q') {
+              macroModeState.exitMacroRecordMode();
+              clearInputState(cm);
+              return true;
+            }
+            if (origin != 'mapping') {
+              logKey(macroModeState, key);
+            }
+          }
+        }
+        function handleEsc() {
+          if (key == '<Esc>') {
+            // Clear input state and get back to normal mode.
             clearInputState(cm);
+            if (vim.visualMode) {
+              exitVisualMode(cm);
+            } else if (vim.insertMode) {
+              exitInsertMode(cm);
+            }
             return true;
           }
-          if (origin != 'mapping') {
-            logKey(macroModeState, key);
+        }
+        function handleExternalSelection() {
+          // Enter visual mode when the mouse selects text.
+          if (!vim.visualMode && !vim.insertMode &&
+              !cursorEqual(cm.getCursor('head'), cm.getCursor('anchor'))) {
+            vim.visualMode = true;
+            vim.visualLine = false;
+            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
+            cm.on('mousedown', exitVisualMode);
           }
         }
-        if (key == '<Esc>') {
-          // Clear input state and get back to normal mode.
-          clearInputState(cm);
-          if (vim.visualMode) {
-            exitVisualMode(cm);
+        function doKeyToKey(keys) {
+          // TODO: prevent infinite recursion.
+          var match;
+          while (keys) {
+            // Pull off one command key, which is either a single character
+            // or a special sequence wrapped in '<' and '>', e.g. '<Space>'.
+            match = (/<\w+-.+?>|<\w+>|./).exec(keys);
+            key = match[0];
+            keys = keys.substring(match.index + key.length);
+            CodeMirror.Vim.handleKey(cm, key, 'mapping');
           }
-          return true;
         }
-        if (vim.insertMode) {
-          // TODO: handle insert mode keys in this path.
+
+        function handleKeyInsertMode() {
+          if (handleEsc()) { return true; }
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          var keysAreChars = key.length == 1;
+          var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+          // Need to check all key substrings in insert mode.
+          while (keys.length > 1 && match.type != 'full') {
+            var keys = vim.inputState.keyBuffer = keys.slice(1);
+            var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+            if (thisMatch.type != 'none') { match = thisMatch; }
+          }
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') {
+            if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+            lastInsertModeKeyTimer = window.setTimeout(
+              function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } },
+              getOption('insertModeEscKeysTimeout'));
+            return !keysAreChars;
+          }
+
+          if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+          if (keysAreChars) {
+            var here = cm.getCursor();
+            cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
+          }
           clearInputState(cm);
-          return false;
-        }
-        // Enter visual mode when the mouse selects text.
-        if (!vim.visualMode &&
-            !cursorEqual(cm.getCursor('head'), cm.getCursor('anchor'))) {
-          vim.visualMode = true;
-          vim.visualLine = false;
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-          cm.on('mousedown', exitVisualMode);
-        }
-        var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
-        if (/^[1-9]\d*$/.test(keys)) {
-          return true;
+          var command = match.command;
+          if (command.type == 'keyToKey') {
+            doKeyToKey(command.toKeys);
+          } else {
+            commandDispatcher.processCommand(cm, vim, command);
+          }
+          return !keysAreChars;
         }
-        var keysMatcher = /^(\d*)(.*)$/.exec(keys);
-        var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim);
-        if (match.type == 'none') { clearInputState(cm); return false; }
-        else if (match.type == 'partial') { return true; }
 
-        vim.inputState.keyBuffer = '';
-        var command = match.command;
-        if (keysMatcher[1] && keysMatcher[1] != '0') {
-          vim.inputState.pushRepeatDigit(keysMatcher[1]);
-        }
-        if (command.type == 'keyToKey') {
-          // TODO: prevent infinite recursion.
-          for (var i = 0; i < command.toKeys.length; i++) {
-            this.handleKey(cm, command.toKeys.charAt(i), 'mapping');
+        function handleKeyGeneral() {
+          if (handleMacroRecording() || handleEsc()) { return true; };
+          handleExternalSelection();
+
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          if (/^[1-9]\d*$/.test(keys)) {
+            return true;
           }
-        } else {
-          commandDispatcher.processCommand(cm, vim, command);
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          var context = vim.visualMode ? 'visual' :
+                                         'normal';
+          var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') { return true; }
+
+          vim.inputState.keyBuffer = '';
+          var command = match.command;
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (keysMatcher[1] && keysMatcher[1] != '0') {
+            vim.inputState.pushRepeatDigit(keysMatcher[1]);
+          }
+          if (command.type == 'keyToKey') {
+            doKeyToKey(command.toKeys);
+          } else {
+            commandDispatcher.processCommand(cm, vim, command);
+          }
+          return true;
         }
-        return true;
+
+        if (vim.insertMode) { return handleKeyInsertMode(); }
+        else { return handleKeyGeneral(); }
       },
       handleEx: function(cm, input) {
         exCommandDispatcher.processCommand(cm, input);
@@ -874,11 +936,7 @@
       }
     };
     var commandDispatcher = {
-      matchCommand: function(keys, keyMap, vim) {
-        var inputState = vim.inputState;
-        var context = vim.visualMode ? 'visual' :
-                      vim.insertMode ? 'insert' :
-                                       'normal';
+      matchCommand: function(keys, keyMap, inputState, context) {
         var matches = commandMatches(keys, keyMap, context, inputState);
         if (!matches.full && !matches.partial) {
           return {type: 'none'};
@@ -2472,7 +2530,8 @@
         if (vim.visualMode) {
           exitVisualMode(cm);
         }
-      }
+      },
+      exitInsertMode: exitInsertMode,
     };
 
     /*
@@ -3733,6 +3792,7 @@
     // shortNames must not match the prefix of the other command.
     var defaultExCommandMap = [
       { name: 'map' },
+      { name: 'imap', shortName: 'im' },
       { name: 'nmap', shortName: 'nm' },
       { name: 'vmap', shortName: 'vm' },
       { name: 'unmap' },
@@ -3983,6 +4043,7 @@
         }
         exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
       },
+      imap: function(cm, params) { this.map(cm, params, 'insert'); },
       nmap: function(cm, params) { this.map(cm, params, 'normal'); },
       vmap: function(cm, params) { this.map(cm, params, 'visual'); },
       unmap: function(cm, params, ctx) {
@@ -4523,63 +4584,13 @@
       }
     }
 
-    defineOption('enableInsertModeEscKeys', false, 'boolean');
-    // Use this option to customize the two-character ESC keymap.
-    // If you want to use characters other than i j or k you'll have to add
-    // lines to the vim-insert and await-second keymaps later in this file.
-    defineOption('insertModeEscKeys', 'kj', 'string');
     // The timeout in milliseconds for the two-character ESC keymap should be
     // adjusted according to your typing speed to prevent false positives.
     defineOption('insertModeEscKeysTimeout', 200, 'number');
-    function firstEscCharacterHandler(ch) {
-      return function(cm){
-        var keys = getOption('insertModeEscKeys');
-        var firstEscCharacter = keys && keys.length > 1 && keys.charAt(0);
-        if (!getOption('enableInsertModeEscKeys')|| firstEscCharacter !== ch) {
-          return CodeMirror.Pass;
-        } else {
-          cm.replaceRange(ch, cm.getCursor(), cm.getCursor(), "+input");
-          cm.setOption('keyMap', 'await-second');
-          cm.state.vim.awaitingEscapeSecondCharacter = true;
-          setTimeout(
-              function(){
-                if(cm.state.vim.awaitingEscapeSecondCharacter) {
-                    cm.state.vim.awaitingEscapeSecondCharacter = false;
-                    cm.setOption('keyMap', 'vim-insert');
-                }
-              },
-              getOption('insertModeEscKeysTimeout'));
-        }
-      };
-    }
-    function secondEscCharacterHandler(ch){
-      return function(cm) {
-        var keys = getOption('insertModeEscKeys');
-        var secondEscCharacter = keys && keys.length > 1 && keys.charAt(1);
-        if (!getOption('enableInsertModeEscKeys')|| secondEscCharacter !== ch) {
-          return CodeMirror.Pass;
-          // This is not the handler you're looking for. Just insert as usual.
-        } else {
-          if (cm.state.vim.insertMode) {
-            var lastChange = vimGlobalState.macroModeState.lastInsertModeChanges;
-            if (lastChange && lastChange.changes.length) {
-              lastChange.changes.pop();
-            }
-          }
-          cm.state.vim.awaitingEscapeSecondCharacter = false;
-          cm.replaceRange('', {ch: cm.getCursor().ch - 1, line: cm.getCursor().line},
-                          cm.getCursor(), "+input");
-          exitInsertMode(cm);
-        }
-      };
-    }
 
     CodeMirror.keyMap['vim-insert'] = {
       // TODO: override navigation keys so that Esc will cancel automatic
       // indentation from o, O, i_<CR>
-      'Esc': exitInsertMode,
-      'Ctrl-[': exitInsertMode,
-      'Ctrl-C': exitInsertMode,
       'Ctrl-N': 'autocomplete',
       'Ctrl-P': 'autocomplete',
       'Enter': function(cm) {
@@ -4587,20 +4598,10 @@
             CodeMirror.commands.newlineAndIndent;
         fn(cm);
       },
-      // The next few lines are where you'd add additional handlers if
-      // you wanted to use keys other than i j and k for two-character
-      // escape sequences. Don't forget to add them in the await-second
-      // section as well.
-      "'i'": firstEscCharacterHandler('i'),
-      "'j'": firstEscCharacterHandler('j'),
-      "'k'": firstEscCharacterHandler('k'),
       fallthrough: ['default']
     };
 
     CodeMirror.keyMap['await-second'] = {
-      "'i'": secondEscCharacterHandler('i'),
-      "'j'": secondEscCharacterHandler('j'),
-      "'k'": secondEscCharacterHandler('k'),
       fallthrough: ['vim-insert']
     };
 
diff --git a/test/vim_test.js b/test/vim_test.js
index 38293ff923..1a5d0f5d60 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -902,7 +902,7 @@ testVim('c_visual_block', function(cm, vim, helpers) {
   replacement.pop();
   cm.replaceSelections(replacement);
   eq('1hello\n5hello\nahellofg', cm.getValue());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   cm.setCursor(2, 3);
   helpers.doKeys('<C-v>', '2', 'k', 'h', 'C');
   replacement = new Array(cm.listSelections().length+1).join('world ').split(' ');
@@ -917,7 +917,7 @@ testVim('c_visual_block_replay', function(cm, vim, helpers) {
   replacement.pop();
   cm.replaceSelections(replacement);
   eq('1fo4\n5fo8\nafodefg', cm.getValue());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   cm.setCursor(0, 0);
   helpers.doKeys('.');
   eq('foo4\nfoo8\nfoodefg', cm.getValue());
@@ -1211,7 +1211,7 @@ testVim('i', function(cm, vim, helpers) {
 testVim('i_repeat', function(cm, vim, helpers) {
   helpers.doKeys('3', 'i');
   cm.replaceRange('test', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   eq('testtesttest', cm.getValue());
   helpers.assertCursorAt(0, 11);
 }, { value: '' });
@@ -1219,7 +1219,8 @@ testVim('i_repeat_delete', function(cm, vim, helpers) {
   cm.setCursor(0, 4);
   helpers.doKeys('2', 'i');
   cm.replaceRange('z', cm.getCursor());
-  helpers.doInsertModeKeys('Backspace', 'Backspace', 'Esc');
+  helpers.doInsertModeKeys('Backspace', 'Backspace');
+  helpers.doKeys('<Esc>');
   eq('abe', cm.getValue());
   helpers.assertCursorAt(0, 1);
 }, { value: 'abcde' });
@@ -1246,7 +1247,7 @@ testVim('I_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('3', 'I');
   cm.replaceRange('test', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   eq('testtesttestblah', cm.getValue());
   helpers.assertCursorAt(0, 11);
 }, { value: 'blah' });
@@ -1269,7 +1270,7 @@ testVim('o_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('3', 'o');
   cm.replaceRange('test', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   eq('\ntest\ntest\ntest', cm.getValue());
   helpers.assertCursorAt(3, 3);
 }, { value: '' });
@@ -1385,7 +1386,7 @@ testVim('r_visual_block', function(cm, vim, helpers) {
   eq('1  l\n5  l\nalllefg', cm.getValue());
   cm.setCursor(2, 0);
   helpers.doKeys('o');
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   cm.replaceRange('\t\t', cm.getCursor());
   helpers.doKeys('<C-v>', 'h', 'h', 'r', 'r');
   eq('1  l\n5  l\nalllefg\nrrrrrrrr', cm.getValue());
@@ -1788,13 +1789,13 @@ testVim('reselect_visual_block', function(cm, vim, helpers) {
 testVim('s_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('s');
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   eq('ac', cm.getValue());
 }, { value: 'abc'});
 testVim('s_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('v', 's');
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.assertCursorAt(0, 0);
   eq('ac', cm.getValue());
 }, { value: 'abc'});
@@ -1878,7 +1879,7 @@ testVim('v_paste_from_register', function(cm, vim, helpers) {
 testVim('S_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('j', 'S');
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.assertCursorAt(1, 0);
   eq('aa\n\ncc', cm.getValue());
 }, { value: 'aa\nbb\ncc'});
@@ -1928,7 +1929,7 @@ testVim('blockwise_paste_last_line', function(cm, vim, helpers) {
 testVim('S_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('v', 'j', 'S');
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.assertCursorAt(0, 0);
   eq('\ncc', cm.getValue());
 }, { value: 'aa\nbb\ncc'});
@@ -2110,7 +2111,7 @@ testVim('macro_insert', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'a', '0', 'i');
   cm.replaceRange('foo', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('q', '@', 'a');
   eq('foofoo', cm.getValue());
 }, { value: ''});
@@ -2118,14 +2119,14 @@ testVim('macro_insert_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'a', '$', 'a');
   cm.replaceRange('larry.', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('a');
   cm.replaceRange('curly.', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('a');
   cm.replaceRange('moe.', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('@', 'a');
   // At this point, the most recent edit should be the 2nd insert change
   // inside the macro, i.e. "curly.".
@@ -2187,10 +2188,10 @@ testVim('macro_parens', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'z', 'i');
   cm.replaceRange('(', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('e', 'a');
   cm.replaceRange(')', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('w', '@', 'z');
   helpers.doKeys('w', '@', 'z');
@@ -2200,13 +2201,13 @@ testVim('macro_overwrite', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'z', '0', 'i');
   cm.replaceRange('I ', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('e');
   // Now replace the macro with something else.
   helpers.doKeys('q', 'z', 'a');
   cm.replaceRange('.', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('e', '@', 'z');
   helpers.doKeys('e', '@', 'z');
@@ -2297,11 +2298,11 @@ testVim('macro_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'a', 'i');
   cm.replaceRange('gangnam', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('q', 'b', 'o');
   cm.replaceRange('style', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   cm.openDialog = helpers.fakeOpenDialog('registers');
   cm.openNotification = helpers.fakeOpenNotification(function(text) {
@@ -2314,7 +2315,7 @@ testVim('._register', function(cm,vim,helpers) {
   cm.setCursor(0,0);
   helpers.doKeys('i');
   cm.replaceRange('foo',cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   cm.openDialog = helpers.fakeOpenDialog('registers');
   cm.openNotification = helpers.fakeOpenNotification(function(text) {
     is(/\.\s+foo/.test(text));
@@ -2465,7 +2466,7 @@ testVim('._repeat', function(cm, vim, helpers) {
 testVim('._insert', function(cm, vim, helpers) {
   helpers.doKeys('i');
   cm.replaceRange('test', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('.');
   eq('testestt', cm.getValue());
   helpers.assertCursorAt(0, 6);
@@ -2474,7 +2475,7 @@ testVim('._insert_repeat', function(cm, vim, helpers) {
   helpers.doKeys('i');
   cm.replaceRange('test', cm.getCursor());
   cm.setCursor(0, 4);
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('2', '.');
   eq('testesttestt', cm.getValue());
   helpers.assertCursorAt(0, 10);
@@ -2483,7 +2484,7 @@ testVim('._repeat_insert', function(cm, vim, helpers) {
   helpers.doKeys('3', 'i');
   cm.replaceRange('te', cm.getCursor());
   cm.setCursor(0, 2);
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('.');
   eq('tetettetetee', cm.getValue());
   helpers.assertCursorAt(0, 10);
@@ -2492,7 +2493,7 @@ testVim('._insert_o', function(cm, vim, helpers) {
   helpers.doKeys('o');
   cm.replaceRange('z', cm.getCursor());
   cm.setCursor(1, 1);
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('.');
   eq('\nz\nz', cm.getValue());
   helpers.assertCursorAt(2, 0);
@@ -2500,7 +2501,7 @@ testVim('._insert_o', function(cm, vim, helpers) {
 testVim('._insert_o_repeat', function(cm, vim, helpers) {
   helpers.doKeys('o');
   cm.replaceRange('z', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   cm.setCursor(1, 0);
   helpers.doKeys('2', '.');
   eq('\nz\nz\nz', cm.getValue());
@@ -2509,7 +2510,7 @@ testVim('._insert_o_repeat', function(cm, vim, helpers) {
 testVim('._insert_o_indent', function(cm, vim, helpers) {
   helpers.doKeys('o');
   cm.replaceRange('z', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   cm.setCursor(1, 2);
   helpers.doKeys('.');
   eq('{\n  z\n  z', cm.getValue());
@@ -2518,7 +2519,7 @@ testVim('._insert_o_indent', function(cm, vim, helpers) {
 testVim('._insert_cw', function(cm, vim, helpers) {
   helpers.doKeys('c', 'w');
   cm.replaceRange('test', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   cm.setCursor(0, 3);
   helpers.doKeys('2', 'l');
   helpers.doKeys('.');
@@ -2530,7 +2531,7 @@ testVim('._insert_cw_repeat', function(cm, vim, helpers) {
   // changes. Will conform to that behavior.
   helpers.doKeys('c', 'w');
   cm.replaceRange('test', cm.getCursor());
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('<Esc>');
   cm.setCursor(0, 4);
   helpers.doKeys('l');
   helpers.doKeys('2', '.');
@@ -2540,7 +2541,8 @@ testVim('._insert_cw_repeat', function(cm, vim, helpers) {
 testVim('._delete', function(cm, vim, helpers) {
   cm.setCursor(0, 5);
   helpers.doKeys('i');
-  helpers.doInsertModeKeys('Backspace', 'Esc');
+  helpers.doInsertModeKeys('Backspace');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('.');
   eq('zace', cm.getValue());
   helpers.assertCursorAt(0, 1);
@@ -2548,7 +2550,8 @@ testVim('._delete', function(cm, vim, helpers) {
 testVim('._delete_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 6);
   helpers.doKeys('i');
-  helpers.doInsertModeKeys('Backspace', 'Esc');
+  helpers.doInsertModeKeys('Backspace');
+  helpers.doKeys('<Esc>');
   helpers.doKeys('2', '.');
   eq('zzce', cm.getValue());
   helpers.assertCursorAt(0, 1);
@@ -2665,8 +2668,7 @@ testVim('fc,;', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('f', '4');
   cm.setCursor(0, 0);
-  helpers.doKeys('c', ';');
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('c', ';', '<Esc>');
   eq('56789', cm.getValue());
   helpers.doKeys('u');
   cm.setCursor(0, 9);
@@ -2677,8 +2679,7 @@ testVim('Fc,;', function(cm, vim, helpers) {
   cm.setCursor(0, 9);
   helpers.doKeys('F', '4');
   cm.setCursor(0, 9);
-  helpers.doKeys('c', ';');
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('c', ';', '<Esc>');
   eq('01239', cm.getValue());
   helpers.doKeys('u');
   cm.setCursor(0, 0);
@@ -2689,8 +2690,7 @@ testVim('tc,;', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('t', '4');
   cm.setCursor(0, 0);
-  helpers.doKeys('c', ';');
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('c', ';', '<Esc>');
   eq('456789', cm.getValue());
   helpers.doKeys('u');
   cm.setCursor(0, 9);
@@ -2701,8 +2701,7 @@ testVim('Tc,;', function(cm, vim, helpers) {
   cm.setCursor(0, 9);
   helpers.doKeys('T', '4');
   cm.setCursor(0, 9);
-  helpers.doKeys('c', ';');
-  helpers.doInsertModeKeys('Esc');
+  helpers.doKeys('c', ';', '<Esc>');
   eq('012349', cm.getValue());
   helpers.doKeys('u');
   cm.setCursor(0, 0);
@@ -3493,6 +3492,13 @@ testVim('ex_map_key2key_visual_api', function(cm, vim, helpers) {
 
   CodeMirror.commands.save = tmp;
 });
+testVim('ex_imap', function(cm, vim, helpers) {
+  CodeMirror.Vim.map('jk', '<Esc>', 'insert');
+  helpers.doKeys('i');
+  is(vim.insertMode);
+  helpers.doKeys('j', 'k');
+  is(!vim.insertMode);
+})
 
 // Testing registration of functions as ex-commands and mapping to <Key>-keys
 testVim('ex_api_test', function(cm, vim, helpers) {

From dc2ef8423f4b4d38f38f6101dbd8bfa9055ec531 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 23 Aug 2014 16:31:08 -0700
Subject: [PATCH 1582/4742] [vim] Style fixes for key handling changes

---
 keymap/vim.js | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index d117583163..50b1c554f5 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -250,7 +250,6 @@
         var name = lookupKey(e);
         if (!name) { return; }
 
-        console.log(name);
         CodeMirror.signal(cm, 'vim-keypress', name);
         if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
           CodeMirror.e_stop(e);
@@ -263,7 +262,6 @@
         if (e.ctrlKey || e.metaKey || e.altKey) { return; }
         var name = String.fromCharCode(code);
 
-        console.log(name);
         CodeMirror.signal(cm, 'vim-keypress', name);
         if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
           CodeMirror.e_stop(e);
@@ -314,9 +312,6 @@
     var upperCaseAlphabet = makeKeyRange(65, 26);
     var lowerCaseAlphabet = makeKeyRange(97, 26);
     var numbers = makeKeyRange(48, 10);
-    var specialSymbols = '~`!@#$%^&*()_-+=[{}]\\|/?.,<>:;"\''.split('');
-    var specialKeys = ['Left', 'Right', 'Up', 'Down', 'Space', 'Backspace',
-        'Esc', 'Home', 'End', 'PageUp', 'PageDown', 'Enter'];
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
     var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
 
@@ -604,7 +599,6 @@
       // This is the outermost function called by CodeMirror, after keys have
       // been mapped to their Vim equivalents.
       handleKey: function(cm, key, origin) {
-        var command;
         var vim = maybeInitVimState(cm);
         function handleMacroRecording() {
           var macroModeState = vimGlobalState.macroModeState;
@@ -689,14 +683,13 @@
           return !keysAreChars;
         }
 
-        function handleKeyGeneral() {
+        function handleKeyNonInsertMode() {
           if (handleMacroRecording() || handleEsc()) { return true; };
           handleExternalSelection();
 
           var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
-          if (/^[1-9]\d*$/.test(keys)) {
-            return true;
-          }
+          if (/^[1-9]\d*$/.test(keys)) { return true; }
+
           var keysMatcher = /^(\d*)(.*)$/.exec(keys);
           var context = vim.visualMode ? 'visual' :
                                          'normal';
@@ -719,7 +712,7 @@
         }
 
         if (vim.insertMode) { return handleKeyInsertMode(); }
-        else { return handleKeyGeneral(); }
+        else { return handleKeyNonInsertMode(); }
       },
       handleEx: function(cm, input) {
         exCommandDispatcher.processCommand(cm, input);
@@ -947,8 +940,7 @@
         var bestMatch;
         for (var i = 0; i < matches.full.length; i++) {
           var match = matches.full[i];
-          if (!bestMatch ||
-              match.context == context) {
+          if (!bestMatch || match.context == context) {
             bestMatch = match;
           }
         }
@@ -2531,7 +2523,7 @@
           exitVisualMode(cm);
         }
       },
-      exitInsertMode: exitInsertMode,
+      exitInsertMode: exitInsertMode
     };
 
     /*
@@ -2562,6 +2554,9 @@
       return Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
     function commandMatches(keys, keyMap, context, inputState) {
+      // Partial matches are not applied. They inform the key handler
+      // that the current key sequence is a subsequence of a valid key
+      // sequence, so that the key buffer is not cleared.
       var match, partial = [], full = [];
       for (var i = 0; i < keyMap.length; i++) {
         var command = keyMap[i];
@@ -2574,8 +2569,8 @@
       }
       return {
         partial: partial.length && partial,
-        full: full.length && full,
-      }
+        full: full.length && full
+      };
     }
     function commandMatch(pressed, mapped) {
       if (mapped.slice(-11) == '<character>') {
@@ -3999,15 +3994,6 @@
         }
       },
       unmap: function(lhs, ctx) {
-        var arrayEquals = function(a, b) {
-          if (a === b) return true;
-          if (a == null || b == null) return true;
-          if (a.length != b.length) return false;
-          for (var i = 0; i < a.length; i++) {
-            if (a[i] !== b[i]) return false;
-          }
-          return true;
-        };
         if (lhs != ':' && lhs.charAt(0) == ':') {
           // Ex to Ex or Ex to key mapping
           if (ctx) { throw Error('Mode not supported for ex mappings'); }

From ca76c878e4918ae541889f8bcda46f3068645917 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 1 Oct 2014 23:59:32 +0200
Subject: [PATCH 1583/4742] [closebrackets addon] Add some braces

---
 addon/edit/closebrackets.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 1a04f3664e..32eca014c5 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -78,24 +78,25 @@
         for (var i = 0; i < ranges.length; i++) {
           var range = ranges[i], cur = range.head, curType;
           var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
-          if (!range.empty())
+          if (!range.empty()) {
             curType = "surround";
-          else if (left == right && next == right) {
+          } else if (left == right && next == right) {
             if (cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == left + left + left)
               curType = "skipThree";
             else
               curType = "skip";
           } else if (left == right && cur.ch > 1 &&
                      cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
-                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left))
+                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left)) {
             curType = "addFour";
-          else if (left == '"' || left == "'") {
+          } else if (left == '"' || left == "'") {
             if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, left)) curType = "both";
             else return CodeMirror.Pass;
-          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next))
+          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next)) {
             curType = "both";
-          else
+          } else {
             return CodeMirror.Pass;
+          }
           if (!type) type = curType;
           else if (type != curType) return CodeMirror.Pass;
         }

From 0d6e3296308e0fc7dfaa527ec2cf6c753fad0d59 Mon Sep 17 00:00:00 2001
From: Christian Oyarzun <co@oyarzun.net>
Date: Mon, 29 Sep 2014 17:15:41 -0400
Subject: [PATCH 1584/4742] Add file extensions and helper functions to meta.js

Added file extensions to the meta info. Added helper functions
getExtFromMimeType,  getMimeTypeFromExt, getFilenameAndExt from a file
name, and detectCodeMirrorMode from a mime type
---
 mode/meta.js | 246 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 147 insertions(+), 99 deletions(-)

diff --git a/mode/meta.js b/mode/meta.js
index 43d5e7f887..44573966a3 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -12,106 +12,154 @@
   "use strict";
 
 CodeMirror.modeInfo = [
-  {name: "APL", mime: "text/apl", mode: "apl"},
-  {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk"},
-  {name: "C", mime: "text/x-csrc", mode: "clike"},
-  {name: "C++", mime: "text/x-c++src", mode: "clike"},
-  {name: "Cobol", mime: "text/x-cobol", mode: "cobol"},
-  {name: "Java", mime: "text/x-java", mode: "clike"},
-  {name: "C#", mime: "text/x-csharp", mode: "clike"},
-  {name: "Scala", mime: "text/x-scala", mode: "clike"},
-  {name: "Clojure", mime: "text/x-clojure", mode: "clojure"},
-  {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript"},
-  {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp"},
-  {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher"},
-  {name: "CSS", mime: "text/css", mode: "css"},
-  {name: "D", mime: "text/x-d", mode: "d"},
-  {name: "diff", mime: "text/x-diff", mode: "diff"},
-  {name: "DTD", mime: "application/xml-dtd", mode: "dtd"},
-  {name: "Dylan", mime: "text/x-dylan", mode: "dylan"},
-  {name: "ECL", mime: "text/x-ecl", mode: "ecl"},
-  {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel"},
-  {name: "Erlang", mime: "text/x-erlang", mode: "erlang"},
-  {name: "Fortran", mime: "text/x-fortran", mode: "fortran"},
-  {name: "F#", mime: "text/x-fsharp", mode: "mllike"},
-  {name: "Gas", mime: "text/x-gas", mode: "gas"},
-  {name: "Gherkin", mime: "text/x-feature", mode: "gherkin"},
-  {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm"},
-  {name: "Go", mime: "text/x-go", mode: "go"},
-  {name: "Groovy", mime: "text/x-groovy", mode: "groovy"},
-  {name: "HAML", mime: "text/x-haml", mode: "haml"},
-  {name: "Haskell", mime: "text/x-haskell", mode: "haskell"},
-  {name: "Haxe", mime: "text/x-haxe", mode: "haxe"},
-  {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded"},
-  {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded"},
-  {name: "JavaServer Pages", mime: "application/x-jsp", mode: "htmlembedded"},
-  {name: "HTML", mime: "text/html", mode: "htmlmixed"},
-  {name: "HTTP", mime: "message/http", mode: "http"},
-  {name: "Jade", mime: "text/x-jade", mode: "jade"},
-  {name: "JavaScript", mime: "text/javascript", mode: "javascript"},
-  {name: "JavaScript", mime: "application/javascript", mode: "javascript"},
-  {name: "JSON", mime: "application/x-json", mode: "javascript"},
-  {name: "JSON", mime: "application/json", mode: "javascript"},
-  {name: "JSON-LD", mime: "application/ld+json", mode: "javascript"},
-  {name: "TypeScript", mime: "application/typescript", mode: "javascript"},
-  {name: "Jinja2", mime: null, mode: "jinja2"},
-  {name: "Julia", mime: "text/x-julia", mode: "julia"},
-  {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin"},
-  {name: "LESS", mime: "text/x-less", mode: "css"},
-  {name: "LiveScript", mime: "text/x-livescript", mode: "livescript"},
-  {name: "Lua", mime: "text/x-lua", mode: "lua"},
-  {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown"},
-  {name: "mIRC", mime: "text/mirc", mode: "mirc"},
-  {name: "Modelica", mime: "text/x-modelica", mode: "modelica"},
-  {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx"},
-  {name: "NTriples", mime: "text/n-triples", mode: "ntriples"},
-  {name: "OCaml", mime: "text/x-ocaml", mode: "mllike"},
-  {name: "Octave", mime: "text/x-octave", mode: "octave"},
-  {name: "Pascal", mime: "text/x-pascal", mode: "pascal"},
-  {name: "PEG.js", mime: null, mode: "pegjs"},
-  {name: "Perl", mime: "text/x-perl", mode: "perl"},
-  {name: "PHP", mime: "text/x-php", mode: "php"},
-  {name: "PHP(HTML)", mime: "application/x-httpd-php", mode: "php"},
-  {name: "Pig", mime: "text/x-pig", mode: "pig"},
-  {name: "Plain Text", mime: "text/plain", mode: "null"},
-  {name: "Properties files", mime: "text/x-properties", mode: "properties"},
-  {name: "Python", mime: "text/x-python", mode: "python"},
-  {name: "Puppet", mime: "text/x-puppet", mode: "puppet"},
-  {name: "Cython", mime: "text/x-cython", mode: "python"},
-  {name: "R", mime: "text/x-rsrc", mode: "r"},
-  {name: "reStructuredText", mime: "text/x-rst", mode: "rst"},
-  {name: "Ruby", mime: "text/x-ruby", mode: "ruby"},
-  {name: "Rust", mime: "text/x-rustsrc", mode: "rust"},
-  {name: "Sass", mime: "text/x-sass", mode: "sass"},
-  {name: "Scheme", mime: "text/x-scheme", mode: "scheme"},
-  {name: "SCSS", mime: "text/x-scss", mode: "css"},
-  {name: "Shell", mime: "text/x-sh", mode: "shell"},
-  {name: "Sieve", mime: "application/sieve", mode: "sieve"},
-  {name: "Slim", mime: "text/x-slim", mode: "slim"},
-  {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk"},
-  {name: "Smarty", mime: "text/x-smarty", mode: "smarty"},
-  {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
-  {name: "Solr", mime: "text/x-solr", mode: "solr"},
-  {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql"},
-  {name: "SQL", mime: "text/x-sql", mode: "sql"},
-  {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
-  {name: "sTeX", mime: "text/x-stex", mode: "stex"},
-  {name: "LaTeX", mime: "text/x-latex", mode: "stex"},
-  {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog"},
-  {name: "Tcl", mime: "text/x-tcl", mode: "tcl"},
+  {name: "APL", mime: "text/apl", mode: "apl", ext: ['']},
+  {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", ext: ['']},
+  {name: "C", mime: "text/x-csrc", mode: "clike", ext: ['c']},
+  {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ['cpp', 'c++']},
+  {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ['cob', 'cpy']},
+  {name: "Java", mime: "text/x-java", mode: "clike", ext: ['java']},
+  {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ['cs']},
+  {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ['scala']},
+  {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ['clj']},
+  {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ['coffee']},
+  {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ['cl', 'lisp', 'el']},
+  {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ['']},
+  {name: "CSS", mime: "text/css", mode: "css", ext: ['css']},
+  {name: "D", mime: "text/x-d", mode: "d", ext: ['d']},
+  {name: "diff", mime: "text/x-diff", mode: "diff", ext: ['diff', 'patch']},
+  {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ['dtd']},
+  {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ['dylan', 'dyl', 'intr']},
+  {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ['ecl']},
+  {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ['e']},
+  {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ['erl']},
+  {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ['f','for','f77','f90']},
+  {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ['fs']},
+  {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ['s']},
+  {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ['feature']},
+  {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", ext: ['']},
+  {name: "Go", mime: "text/x-go", mode: "go", ext: ['go']},
+  {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ['groovy']},
+  {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ['haml']},
+  {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ['hs']},
+  {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ['hx']},
+  {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ['aspx']},
+  {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ['ejs']},
+  {name: "JavaServer Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ['jsp']},
+  {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ['html','htm']},
+  {name: "HTTP", mime: "message/http", mode: "http", ext: ['']},
+  {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ['jade']},
+  {name: "JavaScript", mime: "text/javascript", mode: "javascript", ext: ['js']},
+  {name: "JavaScript", mime: "application/javascript", mode: "javascript", ext: ['js']},
+  {name: "JSON", mime: "application/x-json", mode: "javascript", ext: ['json', 'map']},
+  {name: "JSON", mime: "application/json", mode: "javascript", ext: ['json','map']},
+  {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ['']},
+  {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ['ts']},
+  {name: "Jinja2", mime: "null", mode: "jinja2", ext: ['']},
+  {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ['jl']},
+  {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ['kt']},
+  {name: "LESS", mime: "text/x-less", mode: "css", ext: ['less']},
+  {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ['ls']},
+  {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ['lua']},
+  {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown", ext: ['markdown','md','mkd']},
+  {name: "mIRC", mime: "text/mirc", mode: "mirc", ext: ['']},
+  {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ['mo']},
+  {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", ext: ['']},
+  {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ['']},
+  {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ['ml', 'mli', 'mll', 'mly']},
+  {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ['m']},
+  {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ['p','pas']},
+  {name: "PEG.js", mime: "null", mode: "pegjs", ext: ['']},
+  {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ['pl', 'pm']},
+  {name: "PHP", mime: "text/x-php", mode: "php", ext: ['php', 'php3', 'php4', 'php5']},
+  {name: "PHP(HTML)", mime: "application/x-httpd-php", mode: "php", ext: ['phtml']},
+  {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ['']},
+  {name: "Plain Text", mime: "text/plain", mode: "null", ext: ['txt','text','conf','def','list','log','in','ini']},
+  {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ['properties']},
+  {name: "Python", mime: "text/x-python", mode: "python", ext: ['py', 'pyw']},
+  {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ['pp']},
+  {name: "Cython", mime: "text/x-cython", mode: "python", ext: ['pyx', 'pxd', 'pxi']},
+  {name: "R", mime: "text/x-rsrc", mode: "r", ext: ['r']},
+  {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ['rst']},
+  {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ['rb']},
+  {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ['rs']},
+  {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ['sass']},
+  {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ['scm', 'ss']},
+  {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ['scss']},
+  {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ['sh', 'ksh', 'bash']},
+  {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ['']},
+  {name: "Slim", mime: "text/x-slim", mode: "slim", ext: ['']},
+  {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ['st']},
+  {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ['tpl']},
+  {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed", ext: ['']},
+  {name: "Solr", mime: "text/x-solr", mode: "solr", ext: ['']},
+  {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql", ext: ['sparql']},
+  {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ['sql']},
+  {name: "MariaDB", mime: "text/x-mariadb", mode: "sql", ext: ['sql']},
+  {name: "sTeX", mime: "text/x-stex", mode: "stex", ext: ['tex']},
+  {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ['ltx']},
+  {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ['v']},
+  {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ['tcl']},
   {name: "Textile", mime: "text/x-textile", mode: "textile"},
-  {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
-  {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
-  {name: "TOML", mime: "text/x-toml", mode: "toml"},
-  {name: "Turtle", mime: "text/turtle", mode: "turtle"},
-  {name: "VB.NET", mime: "text/x-vb", mode: "vb"},
-  {name: "VBScript", mime: "text/vbscript", mode: "vbscript"},
-  {name: "Velocity", mime: "text/velocity", mode: "velocity"},
-  {name: "Verilog", mime: "text/x-verilog", mode: "verilog"},
-  {name: "XML", mime: "application/xml", mode: "xml"},
-  {name: "XQuery", mime: "application/xquery", mode: "xquery"},
-  {name: "YAML", mime: "text/x-yaml", mode: "yaml"},
-  {name: "Z80", mime: "text/x-z80", mode: "z80"}
+  {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki", ext: ['']},
+  {name: "Tiki wiki", mime: "text/tiki", mode: "tiki", ext: ['']},
+  {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ['']},
+  {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ['ttl']},
+  {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ['vb']},
+  {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ['vb']},
+  {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ['vtl']},
+  {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ['v']},
+  {name: "XML", mime: "application/xml", mode: "xml", ext: ['xml','xsl','xsd']},
+  {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ['xy', 'xquery']},
+  {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ['yaml']},
+  {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ['z80']}
 ];
 
 });
+
+var getExtFromMimeType = function(mimetype) {
+  var ext = "txt";
+  for(var i=0;i<CodeMirror.modeInfo.length;i++) {
+    var m = CodeMirror.modeInfo[i];
+    if (m.mime == mimetype) {
+      if (m.ext[0] != '') {
+         return m.ext[0];
+      }     
+    }
+  }
+  return ext;
+}
+
+var getMimeTypeFromExt = function(ext) {
+  var mimetype = "text/plain";
+  if (ext) {
+    for(var i=0;i<CodeMirror.modeInfo.length;i++) {
+      var m = CodeMirror.modeInfo[i];
+      for(var j=0;j<m.ext.length;j++) {
+        if (m.ext[j] == ext) {
+          return m.mime;    
+        }
+      }
+    }
+  }
+  return mimetype;
+}
+
+var getFilenameAndExt = function(filename){
+    var parts = filename.split('.');
+
+    if (parts.length > 1){
+        var ext = parts.pop();
+        var filename = parts.join("");
+    }
+    return {"filename": filename, "ext": ext};
+}
+
+var detectCodeMirrorMode = function(mimetype) { 
+  for(var i=0;i<CodeMirror.modeInfo.length;i++) {
+    var m = CodeMirror.modeInfo[i];
+    if (m.mime == mimetype) {
+         return m.mode;
+    }
+  }
+  return null;
+}

From cdf5ef87cec90a6a23f7f25e1e456814663e8bd8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 2 Oct 2014 11:36:22 +0200
Subject: [PATCH 1585/4742] [mode/meta.js] Integrate changes, clean up style

Also update the mode loading demo to make use of the info in that
file, allowing filenames and mimes to be entered.

Issue #2828
---
 demo/closebrackets.html |   2 +-
 demo/loadmode.html      |  29 ++++-
 mode/meta.js            | 272 ++++++++++++++++++----------------------
 3 files changed, 152 insertions(+), 151 deletions(-)

diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index b9d299d911..2503ea6296 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/edit/closebrackets.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/xml/xml.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
diff --git a/demo/loadmode.html b/demo/loadmode.html
index 80fda584d8..ac7164c0e4 100644
--- a/demo/loadmode.html
+++ b/demo/loadmode.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/mode/loadmode.js"></script>
+<script src="../mode/meta.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
@@ -25,12 +26,13 @@
 
 <article>
 <h2>Lazy Mode Loading Demo</h2>
+<p style="color: gray">Current mode: <span id="modeinfo">text/plain</span></p>
 <form><textarea id="code" name="code">This is the editor.
 // It starts out in plain text mode,
 #  use the control below to load and apply a mode
   "you'll see the highlighting of" this text /*change*/.
 </textarea></form>
-<p><input type=text value=javascript id=mode> <button type=button onclick="change()">change mode</button></p>
+<p>Filename, mime, or mode name: <input type=text value=foo.js id=mode> <button type=button onclick="change()">change mode</button></p>
 
     <script>
 CodeMirror.modeURL = "../mode/%N/%N.js";
@@ -42,8 +44,29 @@ <h2>Lazy Mode Loading Demo</h2>
   if (e.keyCode == 13) change();
 });
 function change() {
-   editor.setOption("mode", modeInput.value);
-   CodeMirror.autoLoadMode(editor, modeInput.value);
+  var val = modeInput.value, m, mode, spec;
+  if (m = /.+\.([^.]+)$/.exec(val)) {
+    var info = CodeMirror.findModeByExtension(m[1]);
+    if (info) {
+      mode = info.mode;
+      spec = info.mime;
+    }
+  } else if (/\//.test(val)) {
+    var info = CodeMirror.findModeByMIME(val);
+    if (info) {
+      mode = info.mode;
+      spec = val;
+    }
+  } else {
+    mode = spec = val;
+  }
+  if (mode) {
+    editor.setOption("mode", spec);
+    CodeMirror.autoLoadMode(editor, mode);
+    document.getElementById("modeinfo").textContent = spec;
+  } else {
+    alert("Could not find a mode corresponding to " + val);
+  }
 }
 </script>
   </article>
diff --git a/mode/meta.js b/mode/meta.js
index 44573966a3..81efdcf433 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -11,155 +11,133 @@
 })(function(CodeMirror) {
   "use strict";
 
-CodeMirror.modeInfo = [
-  {name: "APL", mime: "text/apl", mode: "apl", ext: ['']},
-  {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", ext: ['']},
-  {name: "C", mime: "text/x-csrc", mode: "clike", ext: ['c']},
-  {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ['cpp', 'c++']},
-  {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ['cob', 'cpy']},
-  {name: "Java", mime: "text/x-java", mode: "clike", ext: ['java']},
-  {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ['cs']},
-  {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ['scala']},
-  {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ['clj']},
-  {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ['coffee']},
-  {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ['cl', 'lisp', 'el']},
-  {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ['']},
-  {name: "CSS", mime: "text/css", mode: "css", ext: ['css']},
-  {name: "D", mime: "text/x-d", mode: "d", ext: ['d']},
-  {name: "diff", mime: "text/x-diff", mode: "diff", ext: ['diff', 'patch']},
-  {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ['dtd']},
-  {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ['dylan', 'dyl', 'intr']},
-  {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ['ecl']},
-  {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ['e']},
-  {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ['erl']},
-  {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ['f','for','f77','f90']},
-  {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ['fs']},
-  {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ['s']},
-  {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ['feature']},
-  {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", ext: ['']},
-  {name: "Go", mime: "text/x-go", mode: "go", ext: ['go']},
-  {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ['groovy']},
-  {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ['haml']},
-  {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ['hs']},
-  {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ['hx']},
-  {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ['aspx']},
-  {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ['ejs']},
-  {name: "JavaServer Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ['jsp']},
-  {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ['html','htm']},
-  {name: "HTTP", mime: "message/http", mode: "http", ext: ['']},
-  {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ['jade']},
-  {name: "JavaScript", mime: "text/javascript", mode: "javascript", ext: ['js']},
-  {name: "JavaScript", mime: "application/javascript", mode: "javascript", ext: ['js']},
-  {name: "JSON", mime: "application/x-json", mode: "javascript", ext: ['json', 'map']},
-  {name: "JSON", mime: "application/json", mode: "javascript", ext: ['json','map']},
-  {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ['']},
-  {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ['ts']},
-  {name: "Jinja2", mime: "null", mode: "jinja2", ext: ['']},
-  {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ['jl']},
-  {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ['kt']},
-  {name: "LESS", mime: "text/x-less", mode: "css", ext: ['less']},
-  {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ['ls']},
-  {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ['lua']},
-  {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown", ext: ['markdown','md','mkd']},
-  {name: "mIRC", mime: "text/mirc", mode: "mirc", ext: ['']},
-  {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ['mo']},
-  {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", ext: ['']},
-  {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ['']},
-  {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ['ml', 'mli', 'mll', 'mly']},
-  {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ['m']},
-  {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ['p','pas']},
-  {name: "PEG.js", mime: "null", mode: "pegjs", ext: ['']},
-  {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ['pl', 'pm']},
-  {name: "PHP", mime: "text/x-php", mode: "php", ext: ['php', 'php3', 'php4', 'php5']},
-  {name: "PHP(HTML)", mime: "application/x-httpd-php", mode: "php", ext: ['phtml']},
-  {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ['']},
-  {name: "Plain Text", mime: "text/plain", mode: "null", ext: ['txt','text','conf','def','list','log','in','ini']},
-  {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ['properties']},
-  {name: "Python", mime: "text/x-python", mode: "python", ext: ['py', 'pyw']},
-  {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ['pp']},
-  {name: "Cython", mime: "text/x-cython", mode: "python", ext: ['pyx', 'pxd', 'pxi']},
-  {name: "R", mime: "text/x-rsrc", mode: "r", ext: ['r']},
-  {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ['rst']},
-  {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ['rb']},
-  {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ['rs']},
-  {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ['sass']},
-  {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ['scm', 'ss']},
-  {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ['scss']},
-  {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ['sh', 'ksh', 'bash']},
-  {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ['']},
-  {name: "Slim", mime: "text/x-slim", mode: "slim", ext: ['']},
-  {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ['st']},
-  {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ['tpl']},
-  {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed", ext: ['']},
-  {name: "Solr", mime: "text/x-solr", mode: "solr", ext: ['']},
-  {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql", ext: ['sparql']},
-  {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ['sql']},
-  {name: "MariaDB", mime: "text/x-mariadb", mode: "sql", ext: ['sql']},
-  {name: "sTeX", mime: "text/x-stex", mode: "stex", ext: ['tex']},
-  {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ['ltx']},
-  {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ['v']},
-  {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ['tcl']},
-  {name: "Textile", mime: "text/x-textile", mode: "textile"},
-  {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki", ext: ['']},
-  {name: "Tiki wiki", mime: "text/tiki", mode: "tiki", ext: ['']},
-  {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ['']},
-  {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ['ttl']},
-  {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ['vb']},
-  {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ['vb']},
-  {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ['vtl']},
-  {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ['v']},
-  {name: "XML", mime: "application/xml", mode: "xml", ext: ['xml','xsl','xsd']},
-  {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ['xy', 'xquery']},
-  {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ['yaml']},
-  {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ['z80']}
-];
-
-});
-
-var getExtFromMimeType = function(mimetype) {
-  var ext = "txt";
-  for(var i=0;i<CodeMirror.modeInfo.length;i++) {
-    var m = CodeMirror.modeInfo[i];
-    if (m.mime == mimetype) {
-      if (m.ext[0] != '') {
-         return m.ext[0];
-      }     
-    }
-  }
-  return ext;
-}
-
-var getMimeTypeFromExt = function(ext) {
-  var mimetype = "text/plain";
-  if (ext) {
-    for(var i=0;i<CodeMirror.modeInfo.length;i++) {
-      var m = CodeMirror.modeInfo[i];
-      for(var j=0;j<m.ext.length;j++) {
-        if (m.ext[j] == ext) {
-          return m.mime;    
-        }
-      }
-    }
+  CodeMirror.modeInfo = [
+    {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
+    {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk"},
+    {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
+    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "hpp", "h++"]},
+    {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
+    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"]},
+    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
+    {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"]},
+    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"]},
+    {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher"},
+    {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
+    {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
+    {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
+    {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
+    {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
+    {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
+    {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
+    {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
+    {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
+    {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
+    {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+    {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
+    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"]},
+    {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
+    {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
+    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm"},
+    {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
+    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]},
+    {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
+    {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
+    {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
+    {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
+    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"]},
+    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"]},
+    {name: "HTTP", mime: "message/http", mode: "http"},
+    {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
+    {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
+    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"]},
+    {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
+     mode: "javascript", ext: ["js"]},
+    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"]},
+    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript"},
+    {name: "Jinja2", mime: "null", mode: "jinja2"},
+    {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
+    {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]},
+    {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
+    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"]},
+    {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
+    {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
+    {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: "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"},
+    {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
+    {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
+    {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
+    {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
+    {name: "PEG.js", mime: "null", mode: "pegjs"},
+    {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
+    {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
+    {name: "Pig", mime: "text/x-pig", mode: "pig"},
+    {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
+    {name: "PLSQL", mime: "text/x-plsql", mode: "sql"},
+    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"]},
+    {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
+    {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
+    {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
+    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"]},
+    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"]},
+    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"]},
+    {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
+    {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
+    {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
+    {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
+    {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
+    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"]},
+    {name: "Sieve", mime: "application/sieve", mode: "sieve"},
+    {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim"},
+    {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
+    {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
+    {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
+    {name: "Solr", mime: "text/x-solr", mode: "solr"},
+    {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql", ext: ["sparql"]},
+    {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+    {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
+    {name: "sTeX", mime: "text/x-stex", mode: "stex"},
+    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"]},
+    {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
+    {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
+    {name: "Textile", mime: "text/x-textile", mode: "textile"},
+    {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
+    {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
+    {name: "TOML", mime: "text/x-toml", mode: "toml"},
+    {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
+    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"]},
+    {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
+    {name: "VBScript", mime: "text/vbscript", mode: "vbscript"},
+    {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
+    {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
+    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"]},
+    {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
+    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml"]},
+    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]}
+  ];
+  // Ensure all modes have a mime property for backwards compatibility
+  for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+    var info = CodeMirror.modeInfo[i];
+    if (info.mimes) info.mime = info.mimes[0];
   }
-  return mimetype;
-}
-
-var getFilenameAndExt = function(filename){
-    var parts = filename.split('.');
 
-    if (parts.length > 1){
-        var ext = parts.pop();
-        var filename = parts.join("");
+  CodeMirror.findModeByMIME = function(mime) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.mime == mime) return info;
+      if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
+        if (info.mimes[j] == mime) return info;
     }
-    return {"filename": filename, "ext": ext};
-}
+  };
 
-var detectCodeMirrorMode = function(mimetype) { 
-  for(var i=0;i<CodeMirror.modeInfo.length;i++) {
-    var m = CodeMirror.modeInfo[i];
-    if (m.mime == mimetype) {
-         return m.mode;
+  CodeMirror.findModeByExtension = function(ext) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.ext) for (var j = 0; j < info.ext.length; j++)
+        if (info.ext[j] == ext) return info;
     }
-  }
-  return null;
-}
+  };
+});

From 47feb3ce53366a18ba0fc759cb15c236d9428b9c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 2 Oct 2014 12:10:12 +0200
Subject: [PATCH 1586/4742] [mode/meta.js] Document

---
 doc/manual.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 0fdf8d5cdc..1d16bde48b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2585,6 +2585,25 @@ <h2>Addons</h2>
       editor instance to refresh its mode when the loading
       succeeded. See the <a href="../demo/loadmode.html">demo</a>.</dd>
 
+      <dt id="addon_meta"><a href="../mode/meta.js"><code>mode/meta.js</code></a></dt>
+      <dd>Provides meta-information about all the modes in the
+      distribution in a single file.
+      Defines <code>CodeMirror.modeInfo</code>, an array of objects
+      with <code>{name, mime, mode}</code> properties,
+      where <code>name</code> is the human-readable
+      name, <code>mime</code> the MIME type, and <code>mode</code> the
+      name of the mode file that defines this MIME. There are optional
+      properties <code>mimes</code>, which holds an array of MIME
+      types for modes with multiple MIMEs associated,
+      and <code>ext</code>, which holds an array of file extensions
+      associated with this mode. Two convenience
+      functions, <code>CodeMirror.findModeByMIME</code>
+      and <code>CodeMirror.findModeByExtension</code> are provided,
+      which return such an object given a MIME or extension string.
+      Note that, for historical reasons, this file resides in the
+      top-level <code>mode</code> directory, not
+      under <code>addon</code>. <a href="../demo/loadmode.html">Demo</a>.</dd>
+
       <dt id="addon_continuecomment"><a href="../addon/comment/continuecomment.js"><code>comment/continuecomment.js</code></a></dt>
       <dd>Adds a <code>continueComments</code> option, which sets whether the
       editor will make the next line continue a comment when you press Enter

From 2b6bac965a2feb7948fc6db6072353dbd22ed32e Mon Sep 17 00:00:00 2001
From: Justin Hileman <justin@justinhileman.info>
Date: Thu, 2 Oct 2014 11:29:26 -0700
Subject: [PATCH 1587/4742] Add mode.dependencies to runmode-standalone

(So that it plays nice with loadmode)
---
 addon/runmode/runmode-standalone.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 0dd0c289b0..4d5c05acb2 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -74,7 +74,13 @@ CodeMirror.startState = function (mode, a1, a2) {
 };
 
 var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-CodeMirror.defineMode = function (name, mode) { modes[name] = mode; };
+CodeMirror.defineMode = function (name, mode) {
+  if (arguments.length > 2) {
+    mode.dependencies = [];
+    for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
+  }
+  modes[name] = mode;
+};
 CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
 CodeMirror.resolveMode = function(spec) {
   if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {

From 161b40a70f17fc7c59eadc704853e15aa805b71e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 3 Oct 2014 14:32:56 +0200
Subject: [PATCH 1588/4742] Use simpler way to convert mode dependencies to an
 array

---
 addon/runmode/runmode-standalone.js | 6 ++----
 addon/runmode/runmode.node.js       | 6 ++----
 lib/codemirror.js                   | 6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 4d5c05acb2..f4f352c803 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -75,10 +75,8 @@ CodeMirror.startState = function (mode, a1, a2) {
 
 var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
 CodeMirror.defineMode = function (name, mode) {
-  if (arguments.length > 2) {
-    mode.dependencies = [];
-    for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-  }
+  if (arguments.length > 2)
+    mode.dependencies = Array.prototype.slice.call(arguments, 2);
   modes[name] = mode;
 };
 CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index f64b8a152d..8b8140b4c1 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -74,10 +74,8 @@ exports.startState = function(mode, a1, a2) {
 
 var modes = exports.modes = {}, mimeModes = exports.mimeModes = {};
 exports.defineMode = function(name, mode) {
-  if (arguments.length > 2) {
-    mode.dependencies = [];
-    for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-  }
+  if (arguments.length > 2)
+    mode.dependencies = Array.prototype.slice.call(arguments, 2);
   modes[name] = mode;
 };
 exports.defineMIME = function(mime, spec) { mimeModes[mime] = spec; };
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 41f02e2226..ac4959e878 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4570,10 +4570,8 @@
   // load a mode. (Preferred mechanism is the require/define calls.)
   CodeMirror.defineMode = function(name, mode) {
     if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-    if (arguments.length > 2) {
-      mode.dependencies = [];
-      for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-    }
+    if (arguments.length > 2)
+      mode.dependencies = Array.prototype.slice.call(arguments, 2);
     modes[name] = mode;
   };
 

From 0a451fb066c8702b8c659617899dda3a37ff90b0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 3 Oct 2014 22:42:01 +0200
Subject: [PATCH 1589/4742] [coffeescript mode] Highlight 'extends' as keyword

Closes #2817
---
 mode/coffeescript/coffeescript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 0fa4eef81a..3edcb5dda4 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -34,7 +34,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
                         "switch", "try", "catch", "finally", "class"];
   var commonKeywords = ["break", "by", "continue", "debugger", "delete",
                         "do", "in", "of", "new", "return", "then",
-                        "this", "throw", "when", "until"];
+                        "this", "throw", "when", "until", "extends"];
 
   var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
 

From 8288002f672064cafa3219396dffd83900ad6a7c Mon Sep 17 00:00:00 2001
From: blukat29 <yunjong@kaist.ac.kr>
Date: Mon, 6 Oct 2014 04:09:17 +0900
Subject: [PATCH 1590/4742] [vim] Fix error when dd the only line.

When the buffer has only one line, pressing 'dd' causes
CodeMirror to throw an error "There is no line -1".
---
 keymap/vim.js    | 13 +++++++++----
 test/vim_test.js |  9 +++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 50b1c554f5..a4cfd57965 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1862,10 +1862,15 @@
         // including the trailing \n, include the \n before the starting line
         if (operatorArgs.linewise &&
             curEnd.line == cm.lastLine() && curStart.line == curEnd.line) {
-          var tmp = copyCursor(curEnd);
-          curStart.line--;
-          curStart.ch = lineLength(cm, curStart.line);
-          curEnd = tmp;
+          if (curEnd.line == 0) {
+            curStart.ch = 0;
+          }
+          else {
+            var tmp = copyCursor(curEnd);
+            curStart.line--;
+            curStart.ch = lineLength(cm, curStart.line);
+            curEnd = tmp;
+          }
           cm.replaceRange('', curStart, curEnd);
         } else {
           cm.replaceSelections(replacement);
diff --git a/test/vim_test.js b/test/vim_test.js
index 1a5d0f5d60..7d5e5a148e 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -828,6 +828,15 @@ testVim('dd_lastline', function(cm, vim, helpers) {
   eq(expectedLineCount, cm.lineCount());
   helpers.assertCursorAt(cm.lineCount() - 1, 0);
 });
+testVim('dd_only_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  var expectedRegister = cm.getValue() + "\n";
+  helpers.doKeys('d','d');
+  eq(1, cm.lineCount());
+  eq('', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(expectedRegister, register.toString());
+}, { value: "thisistheonlyline" });
 // Yank commands should behave the exact same as d commands, expect that nothing
 // gets deleted.
 testVim('yw_repeat', function(cm, vim, helpers) {

From cde95c423cd59621b1f7b33a0de04f539fb9888a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Oct 2014 10:26:13 +0200
Subject: [PATCH 1591/4742] Properly take gutter borders and margins into
 account when sizing gutter markers

Issue #2836
---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ac4959e878..de21497c2c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -723,9 +723,10 @@
   // view, so that we don't interleave reading and writing to the DOM.
   function getDimensions(cm) {
     var d = cm.display, left = {}, width = {};
+    var gutterLeft = d.gutters.clientLeft;
     for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-      left[cm.options.gutters[i]] = n.offsetLeft;
-      width[cm.options.gutters[i]] = n.offsetWidth;
+      left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
+      width[cm.options.gutters[i]] = n.clientWidth;
     }
     return {fixedPos: compensateForHScroll(d),
             gutterTotalWidth: d.gutters.offsetWidth,

From e32131e1c02cae540406b085e9264b5841e392ef Mon Sep 17 00:00:00 2001
From: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
Date: Sun, 5 Oct 2014 20:54:09 +0530
Subject: [PATCH 1592/4742] SQL hint support for backticks for column/table
 names

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
---
 addon/hint/sql-hint.js | 67 +++++++++++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 20653b5318..6913ef8bc8 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -43,18 +43,53 @@
     }
   }
 
-  function columnCompletion(result, editor) {
+  function nameCompletion(result, editor) {
     var cur = editor.getCursor();
     var token = editor.getTokenAt(cur);
+    var useBacktick = (token.string.charAt(0) == "`");
     var string = token.string.substr(1);
-    var prevCur = Pos(cur.line, token.start);
-    var table = editor.getTokenAt(prevCur).string;
-    if (!tables.hasOwnProperty(table))
-      table = findTableByAlias(table, editor);
-    var columns = tables[table];
-    if (!columns) return;
-
-    addMatches(result, string, columns, function(w) {return "." + w;});
+    var prevToken = editor.getTokenAt(Pos(cur.line, token.start));
+    if (token.string.charAt(0) == "." || prevToken.string == "."){
+      //Suggest colunm names
+      if (prevToken.string == ".") {
+        var prevToken = editor.getTokenAt(Pos(cur.line, token.start - 1));
+      }
+      var table = prevToken.string;
+      //Check if backtick is used in table name. If yes, use it for columns too.
+      var useBacktickTable = false;
+      if (table.match(/`/g)) {
+        useBacktickTable = true;
+        table = table.replace(/`/g, "");
+      }
+      //Check if table is available. If not, find table by Alias
+      if (!tables.hasOwnProperty(table))
+        table = findTableByAlias(table, editor);
+      var columns = tables[table];
+      if (!columns) return;
+
+      if (useBacktick) {
+        addMatches(result, string, columns, function(w) {return "`" + w + "`";});
+      }
+      else if(useBacktickTable) {
+        addMatches(result, string, columns, function(w) {return ".`" + w + "`";});
+      }
+      else {
+        addMatches(result, string, columns, function(w) {return "." + w;});
+      }
+    }
+    else {
+      //Suggest table names
+      while (token.start && string.charAt(0) == ".") {
+        token = editor.getTokenAt(Pos(cur.line, token.start - 1));
+        string = token.string + string;
+      }
+      if (useBacktick) {
+        addMatches(result, string, tables, function(w) {return "`" + w + "`";});
+      }
+      else {
+        addMatches(result, string, tables, function(w) {return w;});
+      }
+    }
   }
 
   function eachWord(lineText, f) {
@@ -132,7 +167,7 @@
     var cur = editor.getCursor();
     var result = [];
     var token = editor.getTokenAt(cur), start, end, search;
-    if (token.string.match(/^[.\w@]\w*$/)) {
+    if (token.string.match(/^[.`\w@]\w*$/)) {
       search = token.string;
       start = token.start;
       end = token.end;
@@ -140,16 +175,8 @@
       start = end = cur.ch;
       search = "";
     }
-    if (search.charAt(0) == ".") {
-      columnCompletion(result, editor);
-      if (!result.length) {
-        while (start && search.charAt(0) == ".") {
-          token = editor.getTokenAt(Pos(cur.line, token.start - 1));
-          start = token.start;
-          search = token.string + search;
-        }
-        addMatches(result, search, tables, function(w) {return w;});
-      }
+    if (search.charAt(0) == "." || search.charAt(0) == "`") {
+      nameCompletion(result, editor);
     } else {
       addMatches(result, search, tables, function(w) {return w;});
       addMatches(result, search, keywords, function(w) {return w.toUpperCase();});

From dcab2496a3994b17a4b38208a34202c758de4e1a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 6 Oct 2014 16:43:17 +0200
Subject: [PATCH 1593/4742] [sql mode] Tokenize unclosed backtick-escapes more
 intelligently

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

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 6c02f4e947..799492f51b 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -213,7 +213,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     while ((ch = stream.next()) != null) {
       if (ch == "`" && !stream.eat("`")) return "variable-2";
     }
-    return null;
+    stream.backUp(stream.current().length - 1);
+    return stream.eatWhile(/\w/) ? "variable-2" : null;
   }
 
   // variable token

From 603c3b763cc3b76dac679b9a3a45075e56e1b7c0 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 8 Oct 2014 11:56:58 +0200
Subject: [PATCH 1594/4742] Fix array<...< to array<...>

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

diff --git a/doc/manual.html b/doc/manual.html
index 1d16bde48b..793dbaa01e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -481,7 +481,7 @@ <h2>Events</h2>
       that used to be between <code>from</code> and <code>to</code>,
       which is overwritten by this change.</dd>
 
-      <dt id="event_changes"><code><strong>"changes"</strong> (instance: CodeMirror, changes: array&lt;object&lt;)</code></dt>
+      <dt id="event_changes"><code><strong>"changes"</strong> (instance: CodeMirror, changes: array&lt;object&gt;)</code></dt>
       <dd>Like the <a href="#event_change"><code>"change"</code></a>
       event, but batched per <a href="#operation">operation</a>,
       passing an array containing all the changes that happened in the
@@ -1205,7 +1205,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       selection). Omitting the argument is the same as
       passing <code>"head"</code>. A <code>{line, ch}</code> object
       will be returned.</dd>
-      <dt id="listSelections"><code><strong>doc.listSelections</strong>() → array&lt;{anchor, head}&lt;</code></dt>
+      <dt id="listSelections"><code><strong>doc.listSelections</strong>() → array&lt;{anchor, head}&gt;</code></dt>
       <dd>Retrieves a list of all current selections. These will
       always be sorted, and never overlap (overlapping selections are
       merged). Each object in the array contains <code>anchor</code>

From b9a2eb3b1e883ed89eaec0b4de788e256450ee81 Mon Sep 17 00:00:00 2001
From: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
Date: Tue, 7 Oct 2014 19:41:01 +0530
Subject: [PATCH 1595/4742] SQL hint support fot default table for hinting
 columns

- Takes `defaultTables` as optional option and hint columns from that
table without explicitly mentioning table name.
- Update doc/manual.html for sql-hint addon.

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
---
 addon/hint/sql-hint.js | 13 ++++++++++++-
 doc/manual.html        |  6 +++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 6913ef8bc8..aa79f82b0e 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -12,6 +12,7 @@
   "use strict";
 
   var tables;
+  var defaultTable;
   var keywords;
   var CONS = {
     QUERY_DIV: ";",
@@ -78,16 +79,18 @@
       }
     }
     else {
-      //Suggest table names
+      //Suggest table names or colums in defaultTable
       while (token.start && string.charAt(0) == ".") {
         token = editor.getTokenAt(Pos(cur.line, token.start - 1));
         string = token.string + string;
       }
       if (useBacktick) {
         addMatches(result, string, tables, function(w) {return "`" + w + "`";});
+        addMatches(result, string, defaultTable, function(w) {return "`" + w + "`";});
       }
       else {
         addMatches(result, string, tables, function(w) {return w;});
+        addMatches(result, string, defaultTable, function(w) {return w;});
       }
     }
   }
@@ -163,6 +166,13 @@
 
   CodeMirror.registerHelper("hint", "sql", function(editor, options) {
     tables = (options && options.tables) || {};
+    defaultTable = (options && options.defaultTable) || false;
+    if ((defaultTable) && (defaultTable in tables)) {
+      defaultTable = tables[defaultTable];
+    }
+    else {
+      defaultTable = [];
+    }
     keywords = keywords || getKeywords(editor);
     var cur = editor.getCursor();
     var result = [];
@@ -179,6 +189,7 @@
       nameCompletion(result, editor);
     } else {
       addMatches(result, search, tables, function(w) {return w;});
+      addMatches(result, search, defaultTable, function(w) {return w;});
       addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
     }
 
diff --git a/doc/manual.html b/doc/manual.html
index 793dbaa01e..46c2518897 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2527,7 +2527,11 @@ <h2>Addons</h2>
       should scan when completing (defaults to 500).</dd>
 
       <dt id="addon_sql-hint"><a href="../addon/hint/sql-hint.js"><code>hint/sql-hint.js</code></a></dt>
-      <dd>A simple SQL hinter. Defines <code>CodeMirror.hint.sql</code>.</dd>
+      <dd>A simple SQL hinter. Defines <code>CodeMirror.hint.sql</code>.
+      Takes two optional options, <code>tables</code>, a object with
+      table names as keys and array of respective column names as values,
+      and <code>defaultTable</code>, a string corresponding to a
+      table name in <code>tables</code> for autocompletion.</dd>
 
       <dt id="addon_match-highlighter"><a href="../addon/search/match-highlighter.js"><code>search/match-highlighter.js</code></a></dt>
       <dd>Adds a <code>highlightSelectionMatches</code> option that

From 31b2334c13bf246e9b44cd4afc58a2a94b9e19dc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 8 Oct 2014 12:55:06 +0200
Subject: [PATCH 1596/4742] [sql-hint addon] Simplification

---
 addon/hint/sql-hint.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index aa79f82b0e..c2b511fa2f 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -166,14 +166,10 @@
 
   CodeMirror.registerHelper("hint", "sql", function(editor, options) {
     tables = (options && options.tables) || {};
-    defaultTable = (options && options.defaultTable) || false;
-    if ((defaultTable) && (defaultTable in tables)) {
-      defaultTable = tables[defaultTable];
-    }
-    else {
-      defaultTable = [];
-    }
+    var defaultTableName = options && options.defaultTable;
+    defaultTable = (defaultTableName && tables[defaultTableName] || []);
     keywords = keywords || getKeywords(editor);
+
     var cur = editor.getCursor();
     var result = [];
     var token = editor.getTokenAt(cur), start, end, search;

From b6a1a9d24d6ba72378844e2a5cb5b7b8bca3d9f2 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 4 Oct 2014 14:46:49 -0400
Subject: [PATCH 1597/4742] [vim] Fix key handling for control characters

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

diff --git a/keymap/vim.js b/keymap/vim.js
index a4cfd57965..355fee62d2 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -229,7 +229,7 @@
       function lookupKey(e) {
         var keyCode = e.keyCode;
         if (modifierCodes.indexOf(keyCode) != -1) { return; }
-        var hasModifier = e.ctrlKey || e.shiftKey || e.metaKey || e.ctrlKey;
+        var hasModifier = e.ctrlKey || e.shiftKey || e.metaKey;
         var key = CodeMirror.keyNames[keyCode];
         key = specialKey[key] || key;
         var name = '';
@@ -259,7 +259,8 @@
       // non-standard keyboard layouts.
       function handleKeyPress(cm, e) {
         var code = e.charCode || e.keyCode;
-        if (e.ctrlKey || e.metaKey || e.altKey) { return; }
+        if (e.ctrlKey || e.metaKey || e.altKey ||
+            e.shiftKey && code < 32) { return; }
         var name = String.fromCharCode(code);
 
         CodeMirror.signal(cm, 'vim-keypress', name);
@@ -691,6 +692,7 @@
           if (/^[1-9]\d*$/.test(keys)) { return true; }
 
           var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (!keysMatcher) { clearInputState(cm); return false; }
           var context = vim.visualMode ? 'visual' :
                                          'normal';
           var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);

From 85b37ac5dd13d3e0536bcc466276f8b7453f816d Mon Sep 17 00:00:00 2001
From: Doug Wikle <dwikle@gmail.com>
Date: Wed, 8 Oct 2014 11:45:50 -0400
Subject: [PATCH 1598/4742] [verilog mode] Fixed a few indentation issues

Fixed indentation for covergroups
Fixed indentation for import/export statements
Better handling of 'function' keyword in other contexts
---
 mode/verilog/test.js    | 38 ++++++++++++++++++++++++++++++++++++--
 mode/verilog/verilog.js | 23 ++++++++++++++---------
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/mode/verilog/test.js b/mode/verilog/test.js
index 376d198685..9c8c094940 100644
--- a/mode/verilog/test.js
+++ b/mode/verilog/test.js
@@ -225,15 +225,49 @@
       ""
   );
 
-  MT("export_function_does_not_indent",
+  MT("export_function_one_line_does_not_indent",
      "[keyword export] [string \"DPI-C\"] [keyword function] [variable helloFromSV];",
      ""
   );
 
-  MT("export_task_does_not_indent",
+  MT("export_task_one_line_does_not_indent",
      "[keyword export] [string \"DPI-C\"] [keyword task] [variable helloFromSV];",
      ""
   );
 
+  MT("export_function_two_lines_indents_properly",
+    "[keyword export]",
+    "    [string \"DPI-C\"] [keyword function] [variable helloFromSV];",
+    ""
+  );
+
+  MT("export_task_two_lines_indents_properly",
+    "[keyword export]",
+    "    [string \"DPI-C\"] [keyword task] [variable helloFromSV];",
+    ""
+  );
+
+  MT("import_function_one_line_does_not_indent",
+    "[keyword import] [string \"DPI-C\"] [keyword function] [variable helloFromC];",
+    ""
+  );
+
+  MT("import_task_one_line_does_not_indent",
+    "[keyword import] [string \"DPI-C\"] [keyword task] [variable helloFromC];",
+    ""
+  );
+
+  MT("import_package_single_line_does_not_indent",
+    "[keyword import] [variable p]::[variable x];",
+    "[keyword import] [variable p]::[variable y];",
+    ""
+  );
+
+  MT("covergoup_with_function_indents_properly",
+    "[keyword covergroup] [variable cg] [keyword with] [keyword function] [variable sample][bracket (][keyword bit] [variable b][bracket )];",
+    "    [variable c] : [keyword coverpoint] [variable c];",
+    "[keyword endgroup]: [variable cg]",
+    ""
+  );
 
 })();
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 46209b2492..8fc9ea4f8c 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -80,7 +80,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   // Block openings which are closed by a matching keyword in the form of ("end" + keyword)
   // E.g. "task" => "endtask"
   var blockKeywords = words(
-    "case checker class clocking config function generate group interface module package" +
+    "case checker class clocking config function generate interface module package" +
     "primitive program property specify sequence table task"
   );
 
@@ -94,11 +94,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   openClose["casez"] = "endcase";
   openClose["do"   ] = "while";
   openClose["fork" ] = "join;join_any;join_none";
-
-  // This is a bit of a hack but will work to not indent after import/epxort statements
-  // as long as the function/task name is on the same line
-  openClose["import"] = "function;task";
-  openClose["export"] = "function;task";
+  openClose["covergroup"] = "endgroup";
 
   for (var i in noIndentKeywords) {
     var keyword = noIndentKeywords[i];
@@ -107,7 +103,8 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     }
   }
 
-  var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else for foreach forever if initial repeat while");
+  // Keywords which open statements that are ended with a semi-colon
+  var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while");
 
   function tokenBase(stream, state) {
     var ch = stream.peek();
@@ -320,8 +317,16 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       else if (curPunc == "newstatement") {
         pushContext(state, stream.column(), "statement");
       } else if (curPunc == "newblock") {
-        var close = openClose[curKeyword];
-        pushContext(state, stream.column(), close);
+        if (curKeyword == "function" && ctx && (ctx.type == "statement" || ctx.type == "endgroup")) {
+          // The 'function' keyword can appear in some other contexts where it actually does not
+          // indicate a function (import/export DPI and covergroup definitions).
+          // Do nothing in this case
+        } else if (curKeyword == "task" && ctx && ctx.type == "statement") {
+          // Same thing for task
+        } else {
+          var close = openClose[curKeyword];
+          pushContext(state, stream.column(), close);
+        }
       }
 
       state.startOfLine = false;

From 822248b594394f9ba4452b7ae22f1c4370242042 Mon Sep 17 00:00:00 2001
From: Doug Wikle <dwikle@gmail.com>
Date: Wed, 8 Oct 2014 11:48:51 -0400
Subject: [PATCH 1599/4742] Added IntelliJ files to .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b471fe6e63..b720b9be07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ test.html
 .tern-*
 *~
 *.swp
+.idea
+*.iml

From 29fbbac3b20d5138385eb1f8024e460f63ddfa15 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 9 Oct 2014 22:22:16 +0200
Subject: [PATCH 1600/4742] [stex mode] Add lineComment property

Closes #2851
---
 mode/stex/stex.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 09a33e56da..14f6fcc3cb 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -251,7 +251,8 @@ CodeMirror.defineMode("stex", function() {
         },
         token: function(stream, state) {
             return state.f(stream, state);
-        }
+        },
+        lineComment: "%"
     };
 });
 

From 3d3898fc71bcfb00f1fb64ff6a4ec7f91f2aa254 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 9 Oct 2014 23:06:50 +0200
Subject: [PATCH 1601/4742] Fix another copy-paste mistake in
 calculateScrollPos

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index de21497c2c..b464356b3e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3770,7 +3770,7 @@
     var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
     var screenw = display.scroller.clientWidth - scrollerCutOff - display.gutters.offsetWidth;
     var tooWide = x2 - x1 > screenw;
-    if (tooWide) x2 = x1 + screen;
+    if (tooWide) x2 = x1 + screenw;
     if (x1 < 10)
       result.scrollLeft = 0;
     else if (x1 < screenleft)

From 8be56518bef493d2155e4a3bea18a196bc43e1db Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 9 Oct 2014 23:10:20 +0200
Subject: [PATCH 1602/4742] Limit loop in scrollPosIntoView at 5 steps

To prevent infinite loops when the algorithm somehow doesn't converge

(It should converge, but infinite loops with nebulous termination
conditions are a rather bad source of hangs.)

I'm still torn about this, since it'll mask bugs.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b464356b3e..dbfe56a503 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3721,7 +3721,7 @@
   // measured, the position of something may 'drift' during drawing).
   function scrollPosIntoView(cm, pos, end, margin) {
     if (margin == null) margin = 0;
-    for (;;) {
+    for (var limit = 0; limit < 5; limit++) {
       var changed = false, coords = cursorCoords(cm, pos);
       var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
       var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),

From 5432702a06696d52dc3fa4cee7909403b55a3863 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 9 Oct 2014 22:47:57 -0400
Subject: [PATCH 1603/4742] [vim] Implement i_CTRL-W

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 355fee62d2..202a150263 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -166,6 +166,7 @@
     { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
     { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
     { keys: '~', type: 'operatorMotion', operator: 'swapcase', operatorArgs: { shouldMoveCursor: true }, motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
     // Actions
     { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
     { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
@@ -235,10 +236,12 @@
         var name = '';
         if (e.ctrlKey) { name += 'C-'; }
         if (e.altKey) { name += 'A-'; }
-        if (mac && e.metaKey || (!hasModifier || e.shiftKey) && key.length < 2) {
+        if (mac && e.metaKey || (!hasModifier && e.shiftKey) && key.length < 2) {
           // Shift key bindings can only specified for special characters.
           return;
-        } else if (e.shiftKey) { name += 'S-'; }
+        } else if (e.shiftKey && !/^[A-Za-z]$/.test(key)) {
+          name += 'S-';
+        }
         if (key.length == 1) { key = key.toLowerCase(); }
         name += key;
         if (name.length > 1) { name = '<' + name + '>'; }

From 6d0422678dc856b6d1319de6004691d050ef90da Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Wed, 8 Oct 2014 22:08:19 -0400
Subject: [PATCH 1604/4742] [vim] Support text objects in visual mode

---
 keymap/vim.js    | 65 +++++++++++++++++++++++++++++++++++++-----------
 test/vim_test.js | 22 ++++++++++++++++
 2 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 202a150263..92c54de2be 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -172,13 +172,13 @@
     { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
     { keys: '<C-e>', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
     { keys: '<C-y>', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
-    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }},
-    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }},
+    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' },
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
     { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
-    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }},
+    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
     { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank' }},
-    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }},
-    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }},
+    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
+    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
     { keys: 'v', type: 'action', action: 'toggleVisualMode' },
     { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
     { keys: '<C-v>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
@@ -191,7 +191,7 @@
     { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' },
     // Handle Replace-mode as a special case of insert mode.
     { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
-    { keys: 'u', type: 'action', action: 'undo' },
+    { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
     { keys: 'u', type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
     { keys: 'U',type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
     { keys: '<C-r>', type: 'action', action: 'redo' },
@@ -945,7 +945,7 @@
         var bestMatch;
         for (var i = 0; i < matches.full.length; i++) {
           var match = matches.full[i];
-          if (!bestMatch || match.context == context) {
+          if (!bestMatch) {
             bestMatch = match;
           }
         }
@@ -1507,8 +1507,8 @@
 
             var equal = cursorEqual(cursor, best);
             var between = (motionArgs.forward) ?
-              cusrorIsBetween(cursor, mark, best) :
-              cusrorIsBetween(best, mark, cursor);
+              cursorIsBetween(cursor, mark, best) :
+              cursorIsBetween(best, mark, cursor);
 
             if (equal || between) {
               best = mark;
@@ -1760,7 +1760,11 @@
           return null;
         }
 
-        return [tmp.start, tmp.end];
+        if (!cm.state.vim.visualMode) {
+          return [tmp.start, tmp.end];
+        } else {
+          return expandSelection(cm, tmp.start, tmp.end);
+        }
       },
 
       repeatLastCharacterSearch: function(cm, motionArgs) {
@@ -2634,7 +2638,13 @@
       }
       return false;
     }
-    function cusrorIsBetween(cur1, cur2, cur3) {
+    function cursorMin(cur1, cur2) {
+      return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
+    }
+    function cursorMax(cur1, cur2) {
+      return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
+    }
+    function cursorIsBetween(cur1, cur2, cur3) {
       // returns true if cur2 is between cur1 and cur3.
       var cur1before2 = cursorIsBefore(cur1, cur2);
       var cur2before3 = cursorIsBefore(cur2, cur3);
@@ -2861,6 +2871,33 @@
                            'visualLine': vim.visualLine,
                            'visualBlock': block};
     }
+    function expandSelection(cm, start, end) {
+      var head = cm.getCursor('head');
+      var anchor = cm.getCursor('anchor');
+      var tmp;
+      if (cursorIsBefore(end, start)) {
+        tmp = end;
+        end = start;
+        start = tmp;
+      }
+      if (cursorIsBefore(head, anchor)) {
+        head = cursorMin(start, head);
+        anchor = cursorMax(anchor, end);
+      } else {
+        anchor = cursorMin(start, anchor);
+        head = cursorMax(head, end);
+      }
+      return [anchor, head];
+    }
+    function getHead(cm) {
+      var cur = cm.getCursor('head');
+      if (cm.getSelection().length == 1) {
+        // Small corner case when only 1 character is selected. The "real"
+        // head is the left of head and anchor.
+        cur = cursorMin(cur, cm.getCursor('anchor'));
+      }
+      return cur;
+    }
 
     function exitVisualMode(cm) {
       cm.off('mousedown', exitVisualMode);
@@ -2933,7 +2970,7 @@
     }
 
     function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
-      var cur = cm.getCursor();
+      var cur = getHead(cm);
       var line = cm.getLine(cur.line);
       var idx = cur.ch;
 
@@ -3319,7 +3356,7 @@
     // TODO: perhaps this finagling of start and end positions belonds
     // in codmirror/replaceRange?
     function selectCompanionObject(cm, symb, inclusive) {
-      var cur = cm.getCursor(), start, end;
+      var cur = getHead(cm), start, end;
 
       var bracketRegexp = ({
         '(': /[()]/, ')': /[()]/,
@@ -3364,7 +3401,7 @@
     // have identical opening and closing symbols
     // TODO support across multiple lines
     function findBeginningAndEnd(cm, symb, inclusive) {
-      var cur = copyCursor(cm.getCursor());
+      var cur = copyCursor(getHead(cm));
       var line = cm.getLine(cur.line);
       var chars = line.split('');
       var start, end, i, len;
diff --git a/test/vim_test.js b/test/vim_test.js
index 7d5e5a148e..86e36cb1d4 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1125,6 +1125,28 @@ testEdit('di]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di]', 'a\t[]b');
 testEdit('da[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da[', 'a\tb');
 testEdit('da]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da]', 'a\tb');
 
+function testSelection(name, before, pos, keys, sel) {
+  return testVim(name, function(cm, vim, helpers) {
+             var ch = before.search(pos)
+             var line = before.substring(0, ch).split('\n').length - 1;
+             if (line) {
+               ch = before.substring(0, ch).split('\n').pop().length;
+             }
+             cm.setCursor(line, ch);
+             helpers.doKeys.apply(this, keys.split(''));
+             eq(sel, cm.getSelection());
+           }, {value: before});
+}
+testSelection('viw_middle_spc', 'foo \tbAr\t baz', /A/, 'viw', 'bAr');
+testSelection('vaw_middle_spc', 'foo \tbAr\t baz', /A/, 'vaw', 'bAr\t ');
+testSelection('viw_middle_punct', 'foo \tbAr,\t baz', /A/, 'viw', 'bAr');
+testSelection('vaW_middle_punct', 'foo \tbAr,\t baz', /A/, 'vaW', 'bAr,\t ');
+testSelection('viw_start_spc', 'foo \tbAr\t baz', /b/, 'viw', 'bAr');
+testSelection('viw_end_spc', 'foo \tbAr\t baz', /r/, 'viw', 'bAr');
+testSelection('viw_eol', 'foo \tbAr', /r/, 'viw', 'bAr');
+testSelection('vi{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'vi{', '\n\tbar\n\t');
+testSelection('va{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'va{', '{\n\tbar\n\t}');
+
 // Operator-motion tests
 testVim('D', function(cm, vim, helpers) {
   cm.setCursor(0, 3);

From 29be39a569fad0b08c55089eb496730df174b994 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 12 Oct 2014 18:41:41 -0400
Subject: [PATCH 1605/4742] [vim] Fix update marks on mouse selection

---
 keymap/vim.js    | 32 +++++++++++++++++---------------
 test/vim_test.js | 11 +++++++++++
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 92c54de2be..9abb0f52bc 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -629,16 +629,6 @@
             return true;
           }
         }
-        function handleExternalSelection() {
-          // Enter visual mode when the mouse selects text.
-          if (!vim.visualMode && !vim.insertMode &&
-              !cursorEqual(cm.getCursor('head'), cm.getCursor('anchor'))) {
-            vim.visualMode = true;
-            vim.visualLine = false;
-            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-            cm.on('mousedown', exitVisualMode);
-          }
-        }
         function doKeyToKey(keys) {
           // TODO: prevent infinite recursion.
           var match;
@@ -689,7 +679,6 @@
 
         function handleKeyNonInsertMode() {
           if (handleMacroRecording() || handleEsc()) { return true; };
-          handleExternalSelection();
 
           var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
           if (/^[1-9]\d*$/.test(keys)) { return true; }
@@ -4738,10 +4727,7 @@
       } else if (cm.doc.history.lastSelOrigin == '*mouse') {
         // Reset lastHPos if mouse click was done in normal mode.
         vim.lastHPos = cm.doc.getCursor().ch;
-        if (cm.somethingSelected()) {
-          // If something is still selected, enter visual mode.
-          vim.visualMode = true;
-        }
+        handleExternalSelection(cm, vim);
       }
       if (vim.visualMode) {
         var from, head;
@@ -4760,6 +4746,22 @@
       }
     }
 
+    function handleExternalSelection(cm, vim) {
+      var anchor = cm.getCursor('anchor');
+      var head = cm.getCursor('head');
+      // Enter visual mode when the mouse selects text.
+      if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
+        vim.visualMode = true;
+        vim.visualLine = false;
+        CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
+        cm.on('mousedown', exitVisualMode);
+      }
+      if (vim.visualMode) {
+        updateMark(cm, vim, '<', cursorMin(head, anchor));
+        updateMark(cm, vim, '>', cursorMax(head, anchor));
+      }
+    }
+
     /** Wrapper for special keys pressed in insert mode */
     function InsertModeKey(keyName) {
       this.keyName = keyName;
diff --git a/test/vim_test.js b/test/vim_test.js
index 86e36cb1d4..401172b649 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1147,6 +1147,17 @@ testSelection('viw_eol', 'foo \tbAr', /r/, 'viw', 'bAr');
 testSelection('vi{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'vi{', '\n\tbar\n\t');
 testSelection('va{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'va{', '{\n\tbar\n\t}');
 
+testVim('mouse_select', function(cm, vim, helpers) {
+  cm.setSelection(Pos(0, 2), Pos(0, 4), {origin: '*mouse'});
+  is(cm.state.vim.visualMode);
+  is(!cm.state.vim.visualLine);
+  is(!cm.state.vim.visualBlock);
+  helpers.doKeys('<Esc>');
+  is(!cm.somethingSelected());
+  helpers.doKeys('g', 'v');
+  eq('cd', cm.getSelection());
+}, {value: 'abcdef'});
+
 // Operator-motion tests
 testVim('D', function(cm, vim, helpers) {
   cm.setCursor(0, 3);

From 0f35444955798d47ebd60b80a34f69ceac9f104f Mon Sep 17 00:00:00 2001
From: Ruslan Osmanov <rrosmanov@gmail.com>
Date: Sun, 12 Oct 2014 19:01:01 +0700
Subject: [PATCH 1606/4742] Fixed breaking attributes in smartymixed mode

Closes issue #2832
---
 mode/smartymixed/smartymixed.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
index 3290d17d80..4fc7ca4b60 100644
--- a/mode/smartymixed/smartymixed.js
+++ b/mode/smartymixed/smartymixed.js
@@ -77,7 +77,11 @@ CodeMirror.defineMode("smartymixed", function(config) {
 
   var parsers = {
     html: function(stream, state) {
-      if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && state.htmlMixedState.htmlState.tagName === null) {
+      var htmlTagName = state.htmlMixedState.htmlState.context && state.htmlMixedState.htmlState.context.tagName
+        ? state.htmlMixedState.htmlState.context.tagName
+        : null;
+
+      if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && htmlTagName === null) {
         state.tokenize = parsers.smarty;
         state.localMode = smartyMode;
         state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));

From f6c5defa2f29e20b0c2b64e692be69697c5eade3 Mon Sep 17 00:00:00 2001
From: Abdelouahab <abdelouahab_al@yahoo.fr>
Date: Sat, 11 Oct 2014 21:16:54 +0100
Subject: [PATCH 1607/4742] [tornado mode] Add

---
 doc/compress.html       |  1 +
 mode/index.html         |  1 +
 mode/meta.js            |  1 +
 mode/tornado/index.html | 63 +++++++++++++++++++++++++++++++++++++
 mode/tornado/tornado.js | 70 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 136 insertions(+)
 create mode 100644 mode/tornado/index.html
 create mode 100644 mode/tornado/tornado.js

diff --git a/doc/compress.html b/doc/compress.html
index abcb207ac1..19639903a3 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -167,6 +167,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/tiddlywiki/tiddlywiki.js">tiddlywiki.js</option>
           <option value="http://codemirror.net/mode/tiki/tiki.js">tiki.js</option>
           <option value="http://codemirror.net/mode/toml/toml.js">toml.js</option>
+          <option value="http://codemirror.net/mode/tornado/tornado.js">tornado.js</option>
           <option value="http://codemirror.net/mode/turtle/turtle.js">turtle.js</option>
           <option value="http://codemirror.net/mode/vb/vb.js">vb.js</option>
           <option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
diff --git a/mode/index.html b/mode/index.html
index f8dc20ec3e..bfbe447005 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -109,6 +109,7 @@ <h2>Language modes</h2>
       <li><a href="tiddlywiki/index.html">Tiddlywiki</a></li>
       <li><a href="tiki/index.html">Tiki wiki</a></li>
       <li><a href="toml/index.html">TOML</a></li>
+      <li><a href="tornado/index.html">Tornado</a> (templating language)</li>
       <li><a href="turtle/index.html">Turtle</a></li>
       <li><a href="vb/index.html">VB.NET</a></li>
       <li><a href="vbscript/index.html">VBScript</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 81efdcf433..cee33e5422 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -107,6 +107,7 @@
     {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
     {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
     {name: "TOML", mime: "text/x-toml", mode: "toml"},
+    {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
     {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"]},
     {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
diff --git a/mode/tornado/index.html b/mode/tornado/index.html
new file mode 100644
index 0000000000..1599fca553
--- /dev/null
+++ b/mode/tornado/index.html
@@ -0,0 +1,63 @@
+<!doctype html>
+
+<title>CodeMirror: Tornado template 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/overlay.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="tornado.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"><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/marijnh/codemirror">Code</a>
+  </ul>
+  <ul>
+    <li><a href="../index.html">Language modes</a>
+    <li><a class=active href="#">Tornado</a>
+  </ul>
+</div>
+
+<article>
+<h2>Tornado template mode</h2>
+<form><textarea id="code" name="code">
+<!doctype html>
+<html>
+    <head>
+        <title>My Tornado web application</title>
+    </head>
+    <body>
+        <h1>
+            {{ 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>
+</html>
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "tornado",
+        indentUnit: 4,
+        indentWithTabs: true
+      });
+    </script>
+
+    <p>Mode for HTML with embedded Tornado template markup.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-tornado</code></p>
+  </article>
diff --git a/mode/tornado/tornado.js b/mode/tornado/tornado.js
new file mode 100644
index 0000000000..ed878cfabd
--- /dev/null
+++ b/mode/tornado/tornado.js
@@ -0,0 +1,70 @@
+// 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("../htmlmixed/htmlmixed"),
+        require("../../addon/mode/overlay"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
+            "../../addon/mode/overlay"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("tornado:inner", function() {
+    var keywords = ["block", "for", "in", "true", "false",
+                    "none", "self", "super", "if", "end", "as", "not", "and",
+                    "else", "import", "with", "without", "context",
+                    "try", "except", "put", "escape", "xhtml_escape", "url_escape",
+                    "json_encode", "squeeze", "linkify", "datetime",
+                    "extends", "include", "load", "length", "comment",
+                    "pass", "while", "set", "import", "from",
+                    "autoescape", "raw", "module"];
+    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
+
+    function tokenBase (stream, state) {
+      stream.eatWhile(/[^\{]/);
+      var ch = stream.next();
+      if (ch == "{") {
+        if (ch = stream.eat(/\{|%|#/)) {
+          state.tokenize = inTag(ch);
+          return "tag";
+        }
+      }
+    }
+    function inTag (close) {
+      if (close == "{") {
+        close = "}";
+      }
+      return function (stream, state) {
+        var ch = stream.next();
+        if ((ch == close) && stream.eat("}")) {
+          state.tokenize = tokenBase;
+          return "tag";
+        }
+        if (stream.match(keywords)) {
+          return "keyword";
+        }
+        return close == "#" ? "comment" : "string";
+      };
+    }
+    return {
+      startState: function () {
+        return {tokenize: tokenBase};
+      },
+      token: function (stream, state) {
+        return state.tokenize(stream, state);
+      }
+    };
+  });
+
+  CodeMirror.defineMode("tornado", function(config) {
+    var htmlBase = CodeMirror.getMode(config, "text/html");
+    var tornadoInner = CodeMirror.getMode(config, "tornado:inner");
+    return CodeMirror.overlayMode(htmlBase, tornadoInner);
+  });
+
+  CodeMirror.defineMIME("text/x-tornado", "tornado");
+});

From aebb9e3a4de9d602633e3ca590afc63500d8be43 Mon Sep 17 00:00:00 2001
From: Abdelouahab <abdelouahab_al@yahoo.fr>
Date: Mon, 13 Oct 2014 15:49:24 +0100
Subject: [PATCH 1608/4742] [tornado mode] Add new keywords and organized the
 list.

---
 mode/tornado/index.html |  2 +-
 mode/tornado/tornado.js | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mode/tornado/index.html b/mode/tornado/index.html
index 1599fca553..a813e9511f 100644
--- a/mode/tornado/index.html
+++ b/mode/tornado/index.html
@@ -42,7 +42,7 @@ <h1>
                 <li>{% item.name %}</li>
             {% empty %}
                 <li>You have no items in your list.</li>
-            {% endfor %}
+            {% end %}
         </ul>
     </body>
 </html>
diff --git a/mode/tornado/tornado.js b/mode/tornado/tornado.js
index ed878cfabd..dbfbc34890 100644
--- a/mode/tornado/tornado.js
+++ b/mode/tornado/tornado.js
@@ -14,14 +14,12 @@
   "use strict";
 
   CodeMirror.defineMode("tornado:inner", function() {
-    var keywords = ["block", "for", "in", "true", "false",
-                    "none", "self", "super", "if", "end", "as", "not", "and",
-                    "else", "import", "with", "without", "context",
-                    "try", "except", "put", "escape", "xhtml_escape", "url_escape",
-                    "json_encode", "squeeze", "linkify", "datetime",
-                    "extends", "include", "load", "length", "comment",
-                    "pass", "while", "set", "import", "from",
-                    "autoescape", "raw", "module"];
+    var keywords = ["and","as","assert","autoescape","block","break","class","comment","context",
+                    "continue","datetime","def","del","elif","else","end","escape","except",
+                    "exec","extends","false","finally","for","from","global","if","import","in",
+                    "include","is","json_encode","lambda","length","linkify","load","module",
+                    "none","not","or","pass","print","put","raise","raw","return","self","set",
+                    "squeeze","super","true","try","url_escape","while","with","without","xhtml_escape","yield"];
     keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
 
     function tokenBase (stream, state) {

From cd17bae3716459028ec973cb2c9511834d978afb Mon Sep 17 00:00:00 2001
From: Willy <willy.vvu@gmail.com>
Date: Mon, 13 Oct 2014 14:18:21 -0400
Subject: [PATCH 1609/4742] [coffeescript mode] Add support for more obscure
 syntax

- Using `@` as `this`
- `and=` and `&&=`
- `or=` and `||=`
- `?=`
---
 mode/coffeescript/coffeescript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 3edcb5dda4..ae460e02a9 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -22,7 +22,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?)/;
+  var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/;
   var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
   var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
   var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
@@ -34,7 +34,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
                         "switch", "try", "catch", "finally", "class"];
   var commonKeywords = ["break", "by", "continue", "debugger", "delete",
                         "do", "in", "of", "new", "return", "then",
-                        "this", "throw", "when", "until", "extends"];
+                        "this", "@", "throw", "when", "until", "extends"];
 
   var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
 

From b7b3943a6c6a3a124cd9a6e007c005fa3975973a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Oct 2014 09:47:27 +0200
Subject: [PATCH 1610/4742] [dialog addon] Select starting value when one is
 given

Closes #2866
---
 addon/dialog/dialog.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 35a6103c2d..5a88d99e64 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -56,7 +56,10 @@
 
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
-      if (options.value) inp.value = options.value;
+      if (options.value) {
+        inp.value = options.value;
+        inp.select();
+      }
 
       if (options.onInput)
         CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});

From 5ae735c77056b563dd8c186e227cbe76054f3059 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Oct 2014 09:58:25 +0200
Subject: [PATCH 1611/4742] [javascript mode] Use electricInput rather than
 electricChars

To be more intelligent about what kind of lines to indent.
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 2e24d3a55b..242abe21e1 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -656,7 +656,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       else return lexical.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: ":{}",
+    electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
     blockCommentStart: jsonMode ? null : "/*",
     blockCommentEnd: jsonMode ? null : "*/",
     lineComment: jsonMode ? null : "//",

From 60740b8822b7b5e3c2162656918df5c9986edf91 Mon Sep 17 00:00:00 2001
From: Herculano Campos <herkulano@gmail.com>
Date: Tue, 14 Oct 2014 14:12:48 +0100
Subject: [PATCH 1612/4742] [base64-dark theme] Background selected color

Changed background selected color to #303030, previous #202020 value is too dark.
https://github.com/cristatus/brackets-darker/issues/12
---
 theme/base16-dark.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 199997abdc..7bfc549cf0 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
-.cm-s-base16-dark div.CodeMirror-selected {background: #202020 !important;}
+.cm-s-base16-dark div.CodeMirror-selected {background: #303030 !important;}
 .cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
 .cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }

From 39396816af111004a79d13729c527a07a3ed7834 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Oct 2014 16:12:24 +0200
Subject: [PATCH 1613/4742] [base64-dark theme] Change active line color to
 distinguish it from selection

---
 theme/base16-dark.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 7bfc549cf0..a46abdbbbd 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -32,5 +32,5 @@
 .cm-s-base16-dark span.cm-link {color: #aa759f;}
 .cm-s-base16-dark span.cm-error {background: #ac4142; color: #b0b0b0;}
 
-.cm-s-base16-dark .CodeMirror-activeline-background {background: #2F2F2F !important;}
+.cm-s-base16-dark .CodeMirror-activeline-background {background: #202020 !important;}
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

From 50a05446ff6bb42c7bbfcfc2e363f468ebc2d27a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Oct 2014 17:04:45 +0200
Subject: [PATCH 1614/4742] [project page] Add some links to top paragraph

---
 doc/manual.html | 2 +-
 index.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 46c2518897..fccf7d6416 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2045,7 +2045,7 @@ <h3 id="api_static">Static properties</h3>
 </section>
 
 <section id=addons>
-    <h2>Addons</h2>
+    <h2 id="addons">Addons</h2>
 
     <p>The <code>addon</code> directory in the distribution contains a
     number of reusable components that implement extra editor
diff --git a/index.html b/index.html
index 7a2bbdcfce..cf9f943ac5 100644
--- a/index.html
+++ b/index.html
@@ -40,7 +40,7 @@
 <section id=description class=first>
   <p><strong>CodeMirror</strong> is a versatile text editor
   implemented in JavaScript for the browser. It is specialized for
-  editing code, and comes with a number of language modes and addons
+  editing code, and comes with a number of <a href="mode/index.html">language modes</a> and <a href="doc/manual.html#addons">addons</a>
   that implement more advanced editing functionality.</p>
 
   <p>A rich <a href="doc/manual.html#api">programming API</a> and a

From 137737779912ef2cb67416e5e91852753acfe6ae Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 14 Oct 2014 22:53:08 -0400
Subject: [PATCH 1615/4742] [vim] Fix uppercase key lookup

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9abb0f52bc..a0a01e06c6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -230,7 +230,7 @@
       function lookupKey(e) {
         var keyCode = e.keyCode;
         if (modifierCodes.indexOf(keyCode) != -1) { return; }
-        var hasModifier = e.ctrlKey || e.shiftKey || e.metaKey;
+        var hasModifier = e.ctrlKey || e.metaKey;
         var key = CodeMirror.keyNames[keyCode];
         key = specialKey[key] || key;
         var name = '';

From 0caeb00baf3abf8e89d0358fbc3c5ee7eb2d75dd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Oct 2014 09:45:57 +0200
Subject: [PATCH 1616/4742] Move ctrl-up/down bindings to mac keymap, bind them
 to goLineUp/Down on PC

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index dbfe56a503..df514190d2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4864,7 +4864,7 @@
   // are simply ignored.
   keyMap.pcDefault = {
     "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Ctrl-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
+    "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
     "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
     "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
     "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
@@ -4879,7 +4879,7 @@
     "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
     "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
     "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
-    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection",
+    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
     fallthrough: ["basic", "emacsy"]
   };
   // Very basic readline/emacs-style bindings, which are standard on Mac.

From 10d9bf1100c1636aa8d9eb381b86bef23bc3ca3d Mon Sep 17 00:00:00 2001
From: Norman Rzepka <code@normanrzepka.de>
Date: Tue, 14 Oct 2014 13:24:42 +0200
Subject: [PATCH 1617/4742] continuelist: hitting enter twice cancels the list

---
 addon/edit/continuelist.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 8cee761aee..56f54c9227 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -12,6 +12,7 @@
   "use strict";
 
   var listRE = /^(\s*)([*+-]|(\d+)\.)(\s+)/,
+      emptyListRE = /^(\s*)([*+-]|(\d+)\.)(\s*)$/,
       unorderedBullets = "*+-";
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
@@ -25,12 +26,22 @@
         cm.execCommand("newlineAndIndent");
         return;
       }
-      var indent = match[1], after = match[4];
-      var bullet = unorderedBullets.indexOf(match[2]) >= 0
-        ? match[2]
-        : (parseInt(match[3], 10) + 1) + ".";
+      if (cm.getLine(pos.line).match(emptyListRE)) {
+        cm.replaceRange("", {
+          line: pos.line, ch: 0
+        }, {
+          line: pos.line, ch: pos.ch + 1
+        });
+        replacements[i] = "\n";
 
-      replacements[i] = "\n" + indent + bullet + after;
+      } else {
+        var indent = match[1], after = match[4];
+        var bullet = unorderedBullets.indexOf(match[2]) >= 0
+          ? match[2]
+          : (parseInt(match[3], 10) + 1) + ".";
+
+        replacements[i] = "\n" + indent + bullet + after;
+      }
     }
 
     cm.replaceSelections(replacements);

From d913da999746ef1bd1510ed9f4e275d023c5a785 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Oct 2014 09:54:20 +0200
Subject: [PATCH 1618/4742] [perl mode] Remove electric chars

Issue #2870
---
 mode/perl/perl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index c12677d249..2a64c2ed41 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -789,7 +789,7 @@ CodeMirror.defineMode("perl",function(){
                                 tail:null};},
                 token:function(stream,state){
                         return (state.tokenize||tokenPerl)(stream,state);},
-                electricChars:"{}"};});
+                };});
 
 CodeMirror.registerHelper("wordChars", "perl", /[\w$]/);
 

From 0462939fa2e8e2699aabcfbb9c86802cbdb6c828 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Oct 2014 10:02:50 +0200
Subject: [PATCH 1619/4742] Fix superfluous comma

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

diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 2a64c2ed41..311574e74a 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -788,7 +788,7 @@ CodeMirror.defineMode("perl",function(){
                                 style:null,
                                 tail:null};},
                 token:function(stream,state){
-                        return (state.tokenize||tokenPerl)(stream,state);},
+                        return (state.tokenize||tokenPerl)(stream,state);}
                 };});
 
 CodeMirror.registerHelper("wordChars", "perl", /[\w$]/);

From c576c4cb4a9923b4acd172e7daa48fe67ef3c74f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Oct 2014 17:45:14 +0200
Subject: [PATCH 1620/4742] Don't use finally in the operation that initializes
 the editor

Trying to call endOperation on a half-constructed editor will never end
well, and the resulting errors will mask the actual error that happened.
---
 lib/codemirror.js | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index df514190d2..7277b8bd0d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -96,21 +96,20 @@
     registerEventHandlers(this);
     ensureGlobalHandlers();
 
-    var cm = this;
-    runInOp(this, function() {
-      cm.curOp.forceUpdate = true;
-      attachDoc(cm, doc);
+    startOperation(this);
+    this.curOp.forceUpdate = true;
+    attachDoc(this, doc);
 
-      if ((options.autofocus && !mobile) || activeElt() == display.input)
-        setTimeout(bind(onFocus, cm), 20);
-      else
-        onBlur(cm);
+    if ((options.autofocus && !mobile) || activeElt() == display.input)
+      setTimeout(bind(onFocus, this), 20);
+    else
+      onBlur(this);
 
-      for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
-        optionHandlers[opt](cm, options[opt], Init);
-      maybeUpdateLineNumberWidth(cm);
-      for (var i = 0; i < initHooks.length; ++i) initHooks[i](cm);
-    });
+    for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
+      optionHandlers[opt](this, options[opt], Init);
+    maybeUpdateLineNumberWidth(this);
+    for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
+    endOperation(this);
   }
 
   // DISPLAY CONSTRUCTOR

From 833ccba1d5d0b8d226ccc100b9b9eb6e854f3836 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Oct 2014 17:51:41 +0200
Subject: [PATCH 1621/4742] Add simple mode addon

---
 addon/mode/simple.js | 200 +++++++++++++++++++++++++++++++++++++++++++
 demo/simplemode.html | 172 +++++++++++++++++++++++++++++++++++++
 doc/compress.html    |   1 +
 doc/manual.html      |   5 ++
 4 files changed, 378 insertions(+)
 create mode 100644 addon/mode/simple.js
 create mode 100644 demo/simplemode.html

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
new file mode 100644
index 0000000000..7299eaeb34
--- /dev/null
+++ b/addon/mode/simple.js
@@ -0,0 +1,200 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineSimpleMode = function(name, states, props) {
+    CodeMirror.defineMode(name, function(config) {
+      return CodeMirror.simpleMode(config, states, props);
+    });
+  };
+
+  CodeMirror.simpleMode = function(config, states) {
+    ensureState(states, "start");
+    var states_ = {}, meta = states.meta || {}, hasIndentation = false;
+    for (var state in states) if (state != meta && states.hasOwnProperty(state)) {
+      var list = states_[state] = [], orig = states[state];
+      for (var i = 0; i < orig.length; i++) {
+        var data = orig[i];
+        list.push(new Rule(data, states));
+        if (data.indent || data.dedent) hasIndentation = true;
+      }
+    }
+    var mode = {
+      startState: function() {
+        return {state: "start", pending: null,
+                local: null, localState: null,
+                indent: hasIndentation ? [] : null};
+      },
+      copyState: function(state) {
+        var s = {state: state.state, pending: state.pending,
+                 local: state.local, localState: null,
+                 indent: state.indent && state.indent.slice(0)};
+        if (state.localState)
+          s.localState = CodeMirror.copyState(state.local.mode, state.localState);
+        for (var pers = state.persistentStates; pers; pers = pers.next)
+          s.persistentStates = {mode: pers.mode,
+                                spec: pers.spec,
+                                state: pers.state == state.localState ? s.localState : CodeMirror.copyState(pers.mode, pers.state),
+                                next: s.persistentStates};
+        return s;
+      },
+      token: tokenFunction(states_, config),
+      innerMode: function(state) { return state.local && {mode: state.local.mode, state: state.localState}; },
+      indent: indentFunction(states_, meta)
+    };
+    if (meta) for (var prop in meta) if (meta.hasOwnProperty(prop))
+      mode[prop] = meta[prop];
+    return mode;
+  };
+
+  function ensureState(states, name) {
+    if (!states.hasOwnProperty(name))
+      throw new Error("Undefined state " + name + "in simple mode");
+  }
+
+  function toRegex(val, caret) {
+    if (!val) return /(?:)/;
+    var flags = "";
+    if (val instanceof RegExp) {
+      if (val.ignoreCase) flags = "i";
+      val = val.source;
+    } else {
+      val = String(val);
+    }
+    return new RegExp((caret === false ? "" : "^") + "(?:" + val + ")", flags);
+  }
+
+  function asToken(val) {
+    if (!val) return null;
+    if (typeof val == "string") return val.replace(/\./g, " ");
+    var result = [];
+    for (var i = 0; i < val.length; i++)
+      result.push(val[i] && val[i].replace(/\./g, " "));
+    return result;
+  }
+
+  function Rule(data, states) {
+    if (data.next) ensureState(states, data.next);
+    this.regex = toRegex(data.regex);
+    this.token = asToken(data.token);
+    this.data = data;
+  }
+
+  function tokenFunction(states, config) {
+    return function(stream, state) {
+      if (state.pending) {
+        var pend = state.pending.shift();
+        if (state.pending.length == 0) state.pending = null;
+        stream.pos += pend.text.length;
+        return pend.token;
+      }
+
+      if (state.local) {
+        if (state.local.end && stream.match(state.local.end)) {
+          var tok = state.local.endToken || null;
+          state.local = state.localState = null;
+          return tok;
+        } else {
+          var tok = state.local.mode.token(stream, state.localState), m;
+          if (state.local.endScan && (m = state.local.endScan.exec(stream.current())))
+            stream.pos = stream.start + m.index;
+          return tok;
+        }
+      }
+
+      var curState = states[state.state];
+      for (var i = 0; i < curState.length; i++) {
+        var rule = curState[i];
+        var matches = stream.match(rule.regex);
+        if (matches) {
+          if (rule.data.next)
+            state.state = rule.data.next;
+          if (rule.data.mode)
+            enterLocalMode(config, state, rule.data.mode, rule.token);
+          if (rule.data.indent)
+            state.indent.push(stream.indentation() + config.indentUnit);
+          if (rule.data.dedent)
+            state.indent.pop();
+          if (matches.length > 2) {
+            state.pending = [];
+            for (var j = 2; j < matches.length; j++)
+              state.pending.push({text: matches[j], token: rule.token[j - 1]});
+            stream.backUp(matches[0].length - matches[1].length);
+            return rule.token[0];
+          } else if (rule.token && rule.token.join) {
+            return rule.token[0];
+          } else {
+            return rule.token;
+          }
+        }
+      }
+      stream.next();
+      return null;
+    };
+  }
+
+  function cmp(a, b) {
+    if (a === b) return true;
+    if (!a || typeof a != "object" || !b || typeof b != "object") return false;
+    var props = 0;
+    for (var prop in a) if (a.hasOwnProperty(prop)) {
+      if (!b.hasOwnProperty(prop) || !cmp(a[prop], b[prop])) return false;
+      props++;
+    }
+    for (var prop in b) if (b.hasOwnProperty(prop)) props--;
+    return props == 0;
+  }
+
+  function enterLocalMode(config, state, spec, token) {
+    var pers;
+    if (spec.persistent) for (var p = state.persistentStates; p && !pers; p = p.next)
+      if (spec.spec ? cmp(spec.spec, p.spec) : spec.mode == p.mode) pers = p;
+    var mode = pers ? pers.mode : spec.mode || CodeMirror.getMode(config, spec.spec);
+    var lState = pers ? pers.state : CodeMirror.startState(mode);
+    if (spec.persistent && !pers)
+      state.persistentStates = {mode: mode, spec: spec.spec, state: lState, next: state.persistentStates};
+
+    state.localState = lState;
+    state.local = {mode: mode,
+                   end: spec.end && toRegex(spec.end),
+                   endScan: spec.end && spec.forceEnd !== false && toRegex(spec.end, false),
+                   endToken: token && token.join ? token[token.length - 1] : token};
+  }
+
+  function indexOf(val, arr) {
+    for (var i = 0; i < arr.length; i++) if (arr[i] === val) return true;
+  }
+
+  function indentFunction(states, meta) {
+    return function(state, textAfter, line) {
+      if (state.local && state.local.mode.indent)
+        return state.local.mode.indent(state.localState, textAfter, line);
+      if (state.indent == null || state.local || meta.dontIndentStates && indexOf(state.state, meta.dontIndentStates) > -1)
+        return CodeMirror.Pass;
+
+      var pos = state.indent.length - 1, rules = states[state.state];
+      scan: for (;;) {
+        for (var i = 0; i < rules.length; i++) {
+          var rule = rules[i], m = rule.regex.exec(textAfter);
+          if (m) {
+            if (rule.data.dedent && rule.data.dedentIfLineStart !== false) pos--;
+            if (rule.next) rules = states[rule.next];
+            textAfter = textAfter.slice(m[0].length);
+            continue scan;
+          }
+        }
+        break;
+      }
+      return pos < 0 ? 0 : state.indent[pos];
+    };
+  }
+});
diff --git a/demo/simplemode.html b/demo/simplemode.html
new file mode 100644
index 0000000000..4b8de8cded
--- /dev/null
+++ b/demo/simplemode.html
@@ -0,0 +1,172 @@
+<!doctype html>
+
+<title>CodeMirror: Simple Mode Demo</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="../mode/xml/xml.js"></script>
+<style type="text/css">
+  .CodeMirror {border: 1px solid silver; margin-bottom: 1em; }
+  dt { text-indent: -2em; padding-left: 2em; margin-top: 1em; }
+  dd { margin-left: 1.5em; margin-bottom: 1em; }
+  dt {margin-top: 1em;}
+</style>
+
+<div id=nav>
+  <a href="http://codemirror.net"><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 class=active href="#">Simple Mode</a>
+  </ul>
+</div>
+
+<article>
+<h2>Simple Mode Demo</h2>
+
+<p>The <a href="../addon/mode/simple.js"><code>mode/simple</code></a>
+addon allows CodeMirror modes to be specified with a relatively simple
+declarative format. This format is not as powerful as writing code
+directly against the <a href="../doc/manual.html#modeapi">mode
+interface</a>, but is a lot easier to get started with, and
+sufficiently expressive for many simple language modes.</p>
+
+<p>This interface is still in flux. It is unlikely to be scrapped or
+overhauled completely, so do start writing code against it, but
+details might change as it stabilizes, and you might have to tweak
+your code when upgrading.</p>
+
+<p>Simple modes (loosely based on
+the <a href="https://github.com/mozilla/skywriter/wiki/Common-JavaScript-Syntax-Highlighting-Specification">Common
+JavaScript Syntax Highlighting Specification</a>, which never took
+off), are state machines, where each state has a number of rules that
+match tokens. A rule describes a type of token that may occur in the
+current state, and possibly a transition to another state caused by
+that token.</p>
+
+<p>The <code>CodeMirror.defineSimpleMode(name, states)</code> method
+takes a mode name and an object that describes the mode's states. The
+editor below shows an example of such a mode (and is itself
+highlighted by the mode shown in it).</p>
+
+<div id="code"></div>
+
+<p>Each state is an array of rules. A rule may have the following properties:</p>
+
+<dl>
+  <dt><code>regex</code></dt>
+  <dd>The regular expression that matches the token. May be a string
+  or a regex object. When a regex, the <code>ignoreCase</code> flag
+  will be taken into account when matching the token. This regex
+  should only capture groups when the <code>token</code> property is
+  an array.</dd>
+  <dt><code>token</code></dt>
+  <dd>An optional token style. Multiple styles can be specified by
+  separating them with dots or spaces. When the <code>regex</code> for
+  this rule captures groups, it must capture <em>all</em> of the
+  string (since JS provides no way to find out where a group matched),
+  and this property must hold an array of token styles that has one
+  style for each matched group.</dd>
+  <dt><code>next</code></dt>
+  <dd>When a <code>next</code> property is present, the mode will
+  transfer to another state when the token is encountered.</dd>
+  <dt><code>mode</code></dt>
+  <dd>Can be used to embed another mode inside a mode. When present,
+  must hold an object with a <code>spec</code> property that describes
+  the embedded mode, and an optional <code>end</code> end property
+  that specifies the regexp that will end the extent of the mode. When
+  a <code>persistent</code> property is set (and true), the nested
+  mode's state will be preserved between occurrences of the mode.</dd>
+  <dt><code>indent</code></dt>
+  <dd>When true, this token changes the indentation to be one unit
+  more than the current line's indentation.</dd>
+  <dt><code>dedent</code></dt>
+  <dd>When true, this token will pop one scope off the indentation
+  stack.</dd>
+  <dt><code>dedentIfLineStart</code></dt>
+  <dd>If a token has its <code>dedent</code> property set, it will, by
+  default, cause lines where it appears at the start to be dedented.
+  Set this property to false to prevent that behavior.</dd>
+</dl>
+
+<p>The <code>meta</code> property of the states object is special, and
+will not be interpreted as a state. Instead, properties set on it will
+be set on the mode, which is useful for properties
+like <a href="../doc/manual.html#addon_comment"><code>lineComment</code></a>,
+which sets the comment style for a mode. The simple mode addon also
+recognizes a few such properties:</p>
+
+<dl>
+  <dt><code>dontIndentStates</code></dt>
+  <dd>An array of states in which the mode's auto-indentation should
+  not take effect. Usually used for multi-line comment and string
+  states.</dd>
+</dl>
+
+<script id="modecode">/* Example definition of a simple mode that understands a subset of
+ * JavaScript:
+ */
+
+CodeMirror.defineSimpleMode("simplemode", {
+  // The start state contains the rules that are intially used
+  start: [
+    // The regex matches the token, the token property contains the type
+    {regex: /"(?:[^\\]|\\.)*?"/, token: "string"},
+    // You can match multiple tokens at once. Note that the captured
+    // groups must span the whole string in this case
+    {regex: /(function)(\s+)([a-z$][\w$]*)/,
+     token: ["keyword", null, "variable-2"]},
+    // Rules are matched in the order in which they appear, so there is
+    // no ambiguity between this one and the one above
+    {regex: /(?:function|var|return|if|for|while|else|do|this)\b/,
+     token: "keyword"},
+    {regex: /true|false|null|undefined/, token: "atom"},
+    {regex: /0x[a-f\d]+|[-+]?(?:\.\d+|\d+\.?\d*)(?:e[-+]?\d+)?/i,
+     token: "number"},
+    {regex: /\/\/.*/, token: "comment"},
+    {regex: /\/(?:[^\\]|\\.)*?\//, token: "variable-3"},
+    // A next property will cause the mode to move to a different state
+    {regex: /\/\*/, token: "comment", next: "comment"},
+    {regex: /[-+\/*=<>!]+/, token: "operator"},
+    // indent and dedent properties guide autoindentation
+    {regex: /[\{\[\(]/, indent: true},
+    {regex: /[\}\]\)]/, dedent: true},
+    {regex: /[a-z$][\w$]*/, token: "variable"},
+    // You can embed other modes with the mode property. This rule
+    // causes all code between << and >> to be highlighted with the XML
+    // mode.
+    {regex: /<</, token: "meta", mode: {spec: "xml", end: />>/}}
+  ],
+  // The multi-line comment state.
+  comment: [
+    {regex: /.*?\*\//, token: "comment", next: "start"},
+    {regex: /.*/, token: "comment"}
+  ],
+  // The meta property contains global information about the mode. It
+  // can contain properties like lineComment, which are supported by
+  // all modes, and also directives like dontIndentStates, which are
+  // specific to simple modes.
+  meta: {
+    dontIndentStates: ["comment"],
+    lineComment: "//"
+  }
+});
+</script>
+
+<script>
+var sc = document.getElementById("modecode");
+var code = document.getElementById("code");
+var editor = CodeMirror(code, {
+  value: (sc.textContent || sc.innerText || sc.innerHTML),
+  mode: "simplemode"
+});
+</script>
+
+</article>
diff --git a/doc/compress.html b/doc/compress.html
index 19639903a3..940465259d 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -219,6 +219,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/search/search.js">search.js</option>
           <option value="http://codemirror.net/addon/search/searchcursor.js">searchcursor.js</option>
           <option value="http://codemirror.net/addon/hint/show-hint.js">show-hint.js</option>
+          <option value="http://codemirror.net/addon/mode/simple.js">simple.js</option>
           <option value="http://codemirror.net/addon/hint/sql-hint.js">sql-hint.js</option>
           <option value="http://codemirror.net/addon/edit/trailingspace.js">trailingspace.js</option>
           <option value="http://codemirror.net/addon/tern/tern.js">tern.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index fccf7d6416..f89cc4b3fd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2715,6 +2715,11 @@ <h2>Writing CodeMirror Modes</h2>
     advances it past a token, and returns a style for that token. More
     advanced modes can also handle indentation for the language.</p>
 
+    <p>This section describes the low-level mode interface. Many modes
+    are written directly against this, since it offers a lot of
+    control, but for a quick mode definition, you might want to use
+    the <a href="../demo/simplemode.html">simple mode addon</a>.</p>
+
     <p id="defineMode">The mode script should
     call <code><strong>CodeMirror.defineMode</strong></code> to
     register itself with CodeMirror. This function takes two

From eee65eef5a258fef405d6880566213f5acf9924c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Oct 2014 17:53:19 +0200
Subject: [PATCH 1622/4742] [simple mode demo] Slight rewording

---
 demo/simplemode.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/simplemode.html b/demo/simplemode.html
index 4b8de8cded..9218b04247 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -32,7 +32,7 @@
 <h2>Simple Mode Demo</h2>
 
 <p>The <a href="../addon/mode/simple.js"><code>mode/simple</code></a>
-addon allows CodeMirror modes to be specified with a relatively simple
+addon allows CodeMirror modes to be specified using a relatively simple
 declarative format. This format is not as powerful as writing code
 directly against the <a href="../doc/manual.html#modeapi">mode
 interface</a>, but is a lot easier to get started with, and

From a9acabd88b1930b2e5d4470cb3a6ce2a20ffa5db Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 17 Oct 2014 00:27:53 +0200
Subject: [PATCH 1623/4742] Switch to new logo

---
 demo/activeline.html               |   2 +-
 demo/anywordhint.html              |   2 +-
 demo/bidi.html                     |   2 +-
 demo/btree.html                    |   2 +-
 demo/buffers.html                  |   2 +-
 demo/changemode.html               |   2 +-
 demo/closebrackets.html            |   2 +-
 demo/closetag.html                 |   2 +-
 demo/complete.html                 |   2 +-
 demo/emacs.html                    |   2 +-
 demo/folding.html                  |   2 +-
 demo/fullscreen.html               |   2 +-
 demo/hardwrap.html                 |   2 +-
 demo/html5complete.html            |   2 +-
 demo/indentwrap.html               |   2 +-
 demo/lint.html                     |   2 +-
 demo/loadmode.html                 |   2 +-
 demo/marker.html                   |   2 +-
 demo/markselection.html            |   2 +-
 demo/matchhighlighter.html         |   2 +-
 demo/matchtags.html                |   2 +-
 demo/merge.html                    |   2 +-
 demo/multiplex.html                |   2 +-
 demo/mustache.html                 |   2 +-
 demo/placeholder.html              |   2 +-
 demo/preview.html                  |   2 +-
 demo/requirejs.html                |   2 +-
 demo/resize.html                   |   2 +-
 demo/rulers.html                   |   2 +-
 demo/runmode.html                  |   2 +-
 demo/search.html                   |   2 +-
 demo/simplemode.html               |   2 +-
 demo/spanaffectswrapping_shim.html |   2 +-
 demo/sublime.html                  |   2 +-
 demo/tern.html                     |   2 +-
 demo/theme.html                    |   2 +-
 demo/trailingspace.html            |   2 +-
 demo/variableheight.html           |   2 +-
 demo/vim.html                      |   2 +-
 demo/visibletabs.html              |   2 +-
 demo/widget.html                   |   2 +-
 demo/xmlcomplete.html              |   2 +-
 doc/compress.html                  |   2 +-
 doc/docs.css                       |  13 +-
 doc/internals.html                 |   2 +-
 doc/logo.png                       | Bin 12003 -> 9730 bytes
 doc/logo.svg                       | 279 ++++++++++++++++-------------
 doc/manual.html                    |   2 +-
 doc/realworld.html                 |   2 +-
 doc/releases.html                  |   2 +-
 doc/reporting.html                 |   2 +-
 doc/upgrade_v2.2.html              |   2 +-
 doc/upgrade_v3.html                |   2 +-
 doc/upgrade_v4.html                |   2 +-
 index.html                         |   2 +-
 mode/apl/index.html                |   2 +-
 mode/asterisk/index.html           |   2 +-
 mode/clike/index.html              |   2 +-
 mode/clike/scala.html              |   2 +-
 mode/clojure/index.html            |   2 +-
 mode/cobol/index.html              |   2 +-
 mode/coffeescript/index.html       |   2 +-
 mode/commonlisp/index.html         |   2 +-
 mode/css/index.html                |   2 +-
 mode/css/less.html                 |   2 +-
 mode/css/scss.html                 |   2 +-
 mode/cypher/index.html             |   2 +-
 mode/d/index.html                  |   2 +-
 mode/diff/index.html               |   2 +-
 mode/django/index.html             |   2 +-
 mode/dtd/index.html                |   2 +-
 mode/dylan/index.html              |   2 +-
 mode/ecl/index.html                |   2 +-
 mode/eiffel/index.html             |   2 +-
 mode/erlang/index.html             |   2 +-
 mode/fortran/index.html            |   2 +-
 mode/gas/index.html                |   2 +-
 mode/gfm/index.html                |   2 +-
 mode/gherkin/index.html            |   2 +-
 mode/go/index.html                 |   2 +-
 mode/groovy/index.html             |   2 +-
 mode/haml/index.html               |   2 +-
 mode/haskell/index.html            |   2 +-
 mode/haxe/index.html               |   2 +-
 mode/htmlembedded/index.html       |   2 +-
 mode/htmlmixed/index.html          |   2 +-
 mode/http/index.html               |   2 +-
 mode/index.html                    |   2 +-
 mode/jade/index.html               |   2 +-
 mode/javascript/index.html         |   2 +-
 mode/javascript/json-ld.html       |   2 +-
 mode/javascript/typescript.html    |   2 +-
 mode/jinja2/index.html             |   2 +-
 mode/julia/index.html              |   2 +-
 mode/kotlin/index.html             |   2 +-
 mode/livescript/index.html         |   2 +-
 mode/lua/index.html                |   2 +-
 mode/markdown/index.html           |   2 +-
 mode/mirc/index.html               |   2 +-
 mode/mllike/index.html             |   2 +-
 mode/modelica/index.html           |   2 +-
 mode/nginx/index.html              |   2 +-
 mode/ntriples/index.html           |   2 +-
 mode/octave/index.html             |   2 +-
 mode/pascal/index.html             |   2 +-
 mode/pegjs/index.html              |   2 +-
 mode/perl/index.html               |   2 +-
 mode/php/index.html                |   2 +-
 mode/pig/index.html                |   2 +-
 mode/properties/index.html         |   2 +-
 mode/puppet/index.html             |   2 +-
 mode/python/index.html             |   2 +-
 mode/q/index.html                  |   2 +-
 mode/r/index.html                  |   2 +-
 mode/rpm/changes/index.html        |   2 +-
 mode/rpm/index.html                |   2 +-
 mode/rst/index.html                |   2 +-
 mode/ruby/index.html               |   2 +-
 mode/rust/index.html               |   2 +-
 mode/sass/index.html               |   2 +-
 mode/scheme/index.html             |   2 +-
 mode/shell/index.html              |   2 +-
 mode/sieve/index.html              |   2 +-
 mode/slim/index.html               |   2 +-
 mode/smalltalk/index.html          |   2 +-
 mode/smarty/index.html             |   2 +-
 mode/smartymixed/index.html        |   2 +-
 mode/solr/index.html               |   2 +-
 mode/sparql/index.html             |   2 +-
 mode/sql/index.html                |   2 +-
 mode/stex/index.html               |   2 +-
 mode/tcl/index.html                |   2 +-
 mode/textile/index.html            |   2 +-
 mode/tiddlywiki/index.html         |   2 +-
 mode/tiki/index.html               |   2 +-
 mode/toml/index.html               |   2 +-
 mode/tornado/index.html            |   2 +-
 mode/turtle/index.html             |   2 +-
 mode/vb/index.html                 |   2 +-
 mode/vbscript/index.html           |   2 +-
 mode/velocity/index.html           |   2 +-
 mode/verilog/index.html            |   2 +-
 mode/xml/index.html                |   2 +-
 mode/xquery/index.html             |   2 +-
 mode/yaml/index.html               |   2 +-
 mode/z80/index.html                |   2 +-
 test/index.html                    |   2 +-
 147 files changed, 311 insertions(+), 269 deletions(-)

diff --git a/demo/activeline.html b/demo/activeline.html
index c1391ef27e..741f6c45a4 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -12,7 +12,7 @@
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index d20c97ba1f..0a7caece24 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -11,7 +11,7 @@
 <script src="../addon/hint/anyword-hint.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/bidi.html b/demo/bidi.html
index 13a6771672..6dd73bec3a 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -11,7 +11,7 @@
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/btree.html b/demo/btree.html
index cc644b19b9..fc4997f4f5 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -11,7 +11,7 @@
       .CodeMirror {border: 1px solid #aaa; height: 400px}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/buffers.html b/demo/buffers.html
index a656a6c378..16ffc7dfe9 100644
--- a/demo/buffers.html
+++ b/demo/buffers.html
@@ -12,7 +12,7 @@
       .CodeMirror {border: 1px solid black; height: 250px;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/changemode.html b/demo/changemode.html
index 36175aeea5..9405932abe 100644
--- a/demo/changemode.html
+++ b/demo/changemode.html
@@ -12,7 +12,7 @@
       .CodeMirror {border: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index 2503ea6296..45da4ebf87 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -12,7 +12,7 @@
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/closetag.html b/demo/closetag.html
index 5e43391f19..79959d2c4d 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -16,7 +16,7 @@
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/complete.html b/demo/complete.html
index 3a17810825..cdf49dbeb9 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -12,7 +12,7 @@
 <script src="../mode/javascript/javascript.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/emacs.html b/demo/emacs.html
index 3efa57456f..c626b8d408 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -18,7 +18,7 @@
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/folding.html b/demo/folding.html
index 3f20484227..81cbf9894b 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -24,7 +24,7 @@
 
 <body>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/fullscreen.html b/demo/fullscreen.html
index f027efe502..1fbdc488e1 100644
--- a/demo/fullscreen.html
+++ b/demo/fullscreen.html
@@ -12,7 +12,7 @@
 <script src="../addon/display/fullscreen.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index 0aaea0c5d9..f1a870b41c 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 2a7c57ab6d..411baae3ed 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -22,7 +22,7 @@
 
 <body>
   <div id=nav>
-    <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+    <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
     <ul>
       <li><a href="../index.html">Home</a>
diff --git a/demo/indentwrap.html b/demo/indentwrap.html
index ca13b1a17b..3d3d0af6ab 100644
--- a/demo/indentwrap.html
+++ b/demo/indentwrap.html
@@ -12,7 +12,7 @@
       .CodeMirror pre > * { text-indent: 0px; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/lint.html b/demo/lint.html
index f792f5da32..29936a8d96 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -20,7 +20,7 @@
       .CodeMirror {border: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/loadmode.html b/demo/loadmode.html
index ac7164c0e4..809cd90225 100644
--- a/demo/loadmode.html
+++ b/demo/loadmode.html
@@ -12,7 +12,7 @@
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/marker.html b/demo/marker.html
index 80fd370e02..3a8b850009 100644
--- a/demo/marker.html
+++ b/demo/marker.html
@@ -13,7 +13,7 @@
       .CodeMirror {border: 1px solid #aaa;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/markselection.html b/demo/markselection.html
index 14242579c0..d4c8a7a0d1 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -15,7 +15,7 @@
       .styled-background { background-color: #ff7; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index 2a95f3c849..c60109009e 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -17,7 +17,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/matchtags.html b/demo/matchtags.html
index 0a02941d0f..175639a396 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -13,7 +13,7 @@
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/merge.html b/demo/merge.html
index b8f2e45ba1..4517c548ee 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -21,7 +21,7 @@
     }
   </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/multiplex.html b/demo/multiplex.html
index 1e2d1b8fef..ca8c80aedc 100644
--- a/demo/multiplex.html
+++ b/demo/multiplex.html
@@ -13,7 +13,7 @@
       .cm-delimit {color: #fa4;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/mustache.html b/demo/mustache.html
index 5dcbca5259..ecc68555ef 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -13,7 +13,7 @@
       .cm-mustache {color: #0ca;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/placeholder.html b/demo/placeholder.html
index eb70886b95..432331a486 100644
--- a/demo/placeholder.html
+++ b/demo/placeholder.html
@@ -14,7 +14,7 @@
       .CodeMirror pre.CodeMirror-placeholder { color: #999; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/preview.html b/demo/preview.html
index 47615f5f76..19e1530b80 100644
--- a/demo/preview.html
+++ b/demo/preview.html
@@ -25,7 +25,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/requirejs.html b/demo/requirejs.html
index 01197962d0..f99b77945a 100644
--- a/demo/requirejs.html
+++ b/demo/requirejs.html
@@ -15,7 +15,7 @@
 
 <body>
   <div id=nav>
-    <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+    <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>
diff --git a/demo/resize.html b/demo/resize.html
index 2fb6e108d5..69eae2c39b 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -18,7 +18,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/rulers.html b/demo/rulers.html
index 04abc96d13..2ac4111582 100644
--- a/demo/rulers.html
+++ b/demo/rulers.html
@@ -11,7 +11,7 @@
   .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/runmode.html b/demo/runmode.html
index a1b400606d..257f03d6b6 100644
--- a/demo/runmode.html
+++ b/demo/runmode.html
@@ -9,7 +9,7 @@
 <script src="../addon/runmode/runmode.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/search.html b/demo/search.html
index 896526e587..b1a51d94f0 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -16,7 +16,7 @@
       dt {font-family: monospace; color: #666;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/simplemode.html b/demo/simplemode.html
index 9218b04247..9265d7908e 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -16,7 +16,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/spanaffectswrapping_shim.html b/demo/spanaffectswrapping_shim.html
index 8271241259..879d99b606 100644
--- a/demo/spanaffectswrapping_shim.html
+++ b/demo/spanaffectswrapping_shim.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/sublime.html b/demo/sublime.html
index ec9fdb3ac0..4cedbcd623 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -25,7 +25,7 @@
   .CodeMirror-linenumbers { padding: 0 8px; }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/tern.html b/demo/tern.html
index 01e734c5ba..0dfb5179e6 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -27,7 +27,7 @@
       .CodeMirror {border: 1px solid #ddd;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/theme.html b/demo/theme.html
index f558b21c32..cdb2113811 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -42,7 +42,7 @@
       .CodeMirror {border: 1px solid black; font-size:13px}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/trailingspace.html b/demo/trailingspace.html
index 5e5a6e06e3..1992ba3ff9 100644
--- a/demo/trailingspace.html
+++ b/demo/trailingspace.html
@@ -16,7 +16,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/variableheight.html b/demo/variableheight.html
index d993572898..d49942864b 100644
--- a/demo/variableheight.html
+++ b/demo/variableheight.html
@@ -20,7 +20,7 @@
       .cm-strong { font-size: 140%; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/vim.html b/demo/vim.html
index 9e75163b6d..d637c5c869 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -16,7 +16,7 @@
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/visibletabs.html b/demo/visibletabs.html
index 0c8ca3a889..2eec337ed3 100644
--- a/demo/visibletabs.html
+++ b/demo/visibletabs.html
@@ -16,7 +16,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/widget.html b/demo/widget.html
index e096173765..da39a9297a 100644
--- a/demo/widget.html
+++ b/demo/widget.html
@@ -14,7 +14,7 @@
       .lint-error-icon {color: white; background-color: red; font-weight: bold; border-radius: 50%; padding: 0 3px; margin-right: 7px;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index ab4a8513a0..bd452e6f6e 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -14,7 +14,7 @@
       .CodeMirror { border: 1px solid #eee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/compress.html b/doc/compress.html
index 940465259d..c3ddd2c7cf 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -8,7 +8,7 @@
 <link rel=stylesheet href="../lib/codemirror.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/docs.css b/doc/docs.css
index ede5540c32..7747895d9f 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -16,14 +16,23 @@ body {
 
 p { margin-top: 0; }
 
-h2, h3 {
+h2, h3, h1 {
   font-weight: normal;
   margin-bottom: .7em;
 }
+h1 { font-size: 140%; }
 h2 { font-size: 120%; }
 h3 { font-size: 110%; }
 article > h2:first-child, section:first-child > h2 { margin-top: 0; }
 
+#nav h1 {
+  margin-right: 12px;
+  margin-top: 0;
+  margin-bottom: 2px;
+  color: #E30808;
+  letter-spacing: .5px;
+}
+
 a, a:visited, a:link, .quasilink {
   color: #A21313;
   text-decoration: none;
@@ -114,7 +123,7 @@ article {
 
 #logo {
   border: 0;
-  margin-right: 7px;
+  margin-right: 12px;
   margin-bottom: 25px;
 }
 
diff --git a/doc/internals.html b/doc/internals.html
index c6a3798cc4..e1ed3e9913 100644
--- a/doc/internals.html
+++ b/doc/internals.html
@@ -7,7 +7,7 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/logo.png b/doc/logo.png
index 2334f5e0999358985862f477ce812805dd66d08d..2222a1300f71193977dfeb61ec3243f68ea53e52 100644
GIT binary patch
literal 9730
zcmWk!1yCGI6g(_gaF+xN?jBqZC%C)2Yj6+l?tvh|-QAr4!QI^hhx7Me)zscz)zr<-
zd(*GG-$p2YlSDxxL;`_8DAH2m%D~kL7*+@${{Q89f(p36x`;}vA^;yB1k-Tf9??-s
z%LN32j{Sc?y$@gkUqA$|U`<yQ2Xj{sBWE*^hldA~mA#FNiIJljlY_HG)&)Ny2t*2!
z78g<V%wEs&@Khaq8WwVKS3yMlDa&jO&0|4}SRjQ#tBieDmd^oJe9;mHW8ic^w5zt%
z&|ztjG?~;Ql?!PQkdVYh?-`)LUO4gb`jCmsxXCd2x-8Qqc~JLsy@Ip(!NkNtR>t?k
z9FGkRDcZ+&VFa=j39uW-7E^>J1+0iD<`*~-sUYDGfg{iu%tbFap>}OmI@Rvo^hi#f
zNlRsF<$tyU0t7Mlnc`mq+Vs^EKsW5z`zq!0nW_Z76}GyIU&_j~RT5-0$f6C!5b9Y%
z2#jFotMuCSA*<dU&KGMu-E$@1obJ!G>gwxd%P;tq`AyaxUhC+dE@XkZxS`<rGAOqS
zu2=jkx+|`L<iy?KxZAlnp&MXe;NeMr`xg5w18cCqe6B!AMU`7w=BI(}&y5KWZBfA`
zfNBZKcGqB{r;p0>c$=szl6`zU%v;B4Wq{jt(=*VFSid89v;X4vv7%<>-=wf_{@<B@
zs}9}Q%LNL{4OUq0?VXnQ=Gd$c+6MF~<?B!ey#?03feFHje#*Ob9e5ZRz5c}={VR8;
zmYYAtX3jS7Z?e+U(^*K|=MNurqQ#@ie)ph~!j@Vz9!vKy3rBO`;fM8>L<ySRS7_}W
z9JHCg+LAsm**0<Hxvl(YxsWUX&!51Y1}bh@l*@M`bcCnDLeoU{nG}9D8Lcb&Tdpz9
zd8!U~-KxN=i`Y^n-B7xM-h;#e2ZUD}N)F~tCBch=oLuwYa>?IngH6syLHRiewO<=!
zeQw-2+N$zUPh0qQ0y)PqMBH!A{lzha=*Q(v-|_?}OB3Rp4kidJlnEm(Z5p-X9?DP*
zw%W*M3alpse*_K(nlowLG%@Mj`*9o=x{D$tRj&$szxfhOLM*PG>B5sNTfw!eXwa;J
zp*#0QTeT9#k=YT=kT$cr>?Fbe?b+ZCSW^&vJxOgA7wdKr;*_KqlB(V!nyPu$MvqS;
z-xg9-*(21tQ@lHxeG_6}VBnz_<RVA#B>`iSf`URv72N%Fe>xodiSOa5yc!A{e50`S
zv&^!cq2+`ESRnM#hiK3n)L$BHDpJxd)kS-~Y5tp$Liv>@8=Y=TKQ&Tz_N3>F&NTLt
zX^@l=O=`#h?CSiHtdcG#CS#d91?o<iif0TADKJ+Ya<M+m|FkqhRaVATI@U!H7Fd9d
zx3*ZRGi+1capH;YV>N##qPEPeP^t{fRfoZk4(^x&-@d-QOnDry+#O+=<XYn6;LMkf
z@g6|;vn=6t$Dz&)HgE$Ge|>Ms>-T?winkyoTD5I*QQH_LFHPhG*3S*I>r~+aRrNix
z;8(N5=G)bXQr!H>Y>})OSgAt*?H{ePi_3DCZ<Y=w4tRUnB5%LdX%{qsG)B?$x9q}1
zNtG@FSFIf-{o|Sz2Qxqa%Nmx+(4N567EBB@G<2kNt_E@%vw`_#wYR{*=FBZ>Uw^-}
zj12Ui;#(CEsdHRni|-!TlTo&x9uMoM1$F9W7pv|<(Nku8LgQVJF^A(wAnAEYNx`G4
zHJ|LXD0ArG1Sx?vZ}(sm6Wu_EVS{TSC-d|+|FGgTqN1ZK4r_yKKxv7IQZh2+oSZ2q
z^W}JBd@ctcFS{Xvc+C2)RIjul=(9h9!0qnmgj{xOo(;>>LVI!j{yvHE@mD%lmk-ec
zJ^}}>kxMOW&f|<cN$-zs{<}jl<&R~RW8$-v!!z3vSk&Q>k>rm%;EGj`oAc()8lyvn
zJ%SIQNObD>A+fG6jw4&WFxH`qx=xUuz}|B8Dp8SWJEHj}|Gu}7OIfe#zW+0n>q;oH
z!rSfSFDq3So6_-mNt{1;wNxfs=$#sr_u|1@68mWv(ml1iCk^VQ>b}j8xbVOERojy$
zsp4_pc3Z{oeUZtG`#!yvF9I_=H>Y(q3hhtkiDqdq+m1sH?9WV(b$$f<q$wM#>yl!w
z*OL|H*B0eQqm-bK2VambuTQjCS~WTXY2Zh1`>Ofk=_|9W%wm))?&r#k$89;6;198k
zPKJi@^^@+btgJ>(PEMn_8_e85oV~HrVPJXZRONRK-rw-J*IiY<mv^2l)qBT5(FmM!
zo5_{CpLIB9j<;$_!Ej{@M3b5IbJ?w|ZPAO-$<Gl!XH3vb3JI>PwYpeDujyh72?0l6
zO>xM+IgJL&OWycR>5tr&)#5)W50tG<hmOGRcQ;ON+`hm8m|w*uv>-Bb{}WhP7llG~
zxW}JwPz-`iBtqZ_sD;OZ$&>jq<}#I%ruW@K2^Xt%+`hJf{J&+r$13)A9cz8%V%t6f
zhr=!CG$C8ROY#nKXjQ6gprO>OG*JV{VJF2Rv*thAx>9hyz^Hr~o9wcjo*i;_(AKt|
zPNR}jRBpbcdj6NUb%?Ja8TXly#)2(F20OPyU^x$p|G)>Rt%fJ<D&KG3bN|(4+MpdD
zA6MwKPl3Xb%H_jbAB28s(R{SSRh#^RKiB2^Y#iz3kY8pUzP!oN>~c8eYP*s+Ar{;D
z8yz}p@}Mn7+G?f%909GG@jtBc_0&%tW^&rxjP}9(J71iBcG!X;7IM$tGmW$9Tui@z
zYgntuCWhNuSV0j;Z7*_%!3xj3@93b#u~H!2s9QaEGw|GoOY|7vnUzD5X(a7h?O1L+
zilbMrpfQ&{j$}))RBBudh?qJI2mqN+KZZBit$J;Gll+vPqngNO4bEUUci!#`MVfCk
zdi~I)Tib`0@8n1$aKd@5$+cuk)n+aLH;QFfxN`qbvj(=oVZAFOz~Z9wQm{{@epFVb
zH#Z@oRUIXy;A;Kg5@}4P7p-Vs<A0nuh3PoXyuak$Af=-#BVLDm3PJDSvclxyS^jtK
zLY<_aHP9Oj-&xkr@-da!z&`KaiVY8liVPnQBc@xqE=3aJB@avbi)A78hgAFMTLF6C
zzoVM%oghvOis^3~gI|KQxwavj{)Yn*SXG-YHdc2jG(gd*q^d!{!&xbvDLfL&?{0pr
z!UpPD6mw@tSy_kRquYYtE2rDZ0%e;Re1S<pL~QKO{TN2tvcgWEM>h5Hlx32sI+CxB
zJ+SGpEOnuw2V_OeZaLPRq-+hi@G5UesePIbwVF@bl?!%e$1bZ)cBeta^Nl(lh3?9k
z&Mfr7TeqVK^%+|W+&Ak%3P^5hi+2yRCk%E`tZ2hIA3$v$ms9m7!>L8pYLQ*9PcsE(
zvbjWju_`6sFo=j`ZEYDqMn*;)mP;TZA)yI#_QR=MmqvYdsF3v6+uXP_OM5*1CKVQ_
zXnQLo(HHfP2m|ru9P+2XPM@}CH#l#iokY<edU^s)Kl4g>Nl-O9J0sdIpi{C0OjfDT
z`Y;!9$du1f05Ktg;@|SIpZ$fXvXOIgKk%&GBhS4)Fg9PV*=9<c=X+0(mPE|^XK!y0
z6ONR#!hOLd;S)^%D~v#@(~ko(PW<IMMr1T<(x14A$2~oX8&>mWYL<?Mf94Vr5+t^k
zyRog1$ORa2R2*4kq*#XIK6!lp%18Rpz~JjN9uA%-gdu4wj`6<+m#MWkxh?hf_C^y5
zL@qfPXK;MS?DT>ZOL(>n-!L~`40JQ<byEF_ctg>?65X3j#~EbGcd*(IhK9~fRt^(j
zvn_R=NDZGDqvE81aj7I!jj|p*=u<vkUZ~V@ppzBij~UQ#N*{zl$HEee<MT=`>au|b
z{_G<mf4WF8JVnvoL<al7&=8x+6MX2H+1|caX|KTSjq~Hv-^(vl24BYQOTc%8ric4K
z189X=U$ti2gFm3K1+rCn-Nm1UKgB@1|8kH-f~y~mX30RXU5UReZcC&QqPMfz7H9px
z$iu|0f&;{mh~H<U%wBUBi9^siY?tCc3wU8uI9=Di@-#vRzcdoM$>Pk}jpAi|XNm20
zW<#EhEut<&FslB9{>xx&3SW8l86K7Rh&ErO`|b5MmV`$phMxrv9#dZc+eOoj$<!h-
zJzY~#zcvdm<&Lk7D1v#*7=EtWzq`CE=L#;9+u@s(RCp96_pgJ4rOiJc=ochXX}mE<
z>dmZ-ky0fk>?#ogE+I?xlB~LMsBo*H$;fl{bqi;6m9$0f!fe=vJ$f(`O-qa%Xb63}
zeA$2M166H^MsIvX7`m_Go>9-9J1aIT(IXypBB4KJF58+{^wS)*{Xh@mbvwZ(pNVaF
zqAzZf=Fys5%y|oTD|ycsQABWq4yvV)9-rLS^kV%<gG~FmZl%H?t??Y-u7*(W2xw>u
zi`wg|cDH!4$A9w)it~l77ph_m#;F(x+8<;Li~_kgD~}l1aECt$f$UFb;SL`cHld7+
zz$q&?YX-kZ?c{>2pg#t%XIOpF6^uK-f#Zf9Gg1CC*VcUo3%zG<h5{@4Va+X#R_r}T
zw>>AG&<KB-hohsO@08na@8$7!YUhxxu0HL%ihr+ELun?W=NM<b|9g2MUL`}wJPp4Z
zlK9w6p=5o)by*n`yEH3;2s0vMz{%I95NeSN9MQAUk+HX{KR?Ba6mkYhiB*nsd|~SS
zg~0t++Mx6@xLt#0+&m^%y|;mAu^*@@Cnx<lRddI7!k-Ss3=K(}AuWDiX6s0qnXCWQ
zi({i3*Dv3LytAi85u8pdn?GEvwX!E6^%&QNz<7j(h8A(%qE+SMY$+7hIHCt_aWO8}
znIQvI)dg39^D*PVYc-5M0@7-}=J$LK3kP@Y(RWSn&p^#@k9>oYPbW?a`Yv9$<>6A2
z<-+dI7exDu5JjvH!Fu8UjKXDV*~u3}I2axtHn?v>T;#mgUySy9twwn*t&Y#iIxVw@
z5te#xPT8n2wghoY4#OU1yJa_pWWD}g;7YVxZ8Dm>3t~b_vhr%p1l5#k>*z8yrpr<B
zZmOS^4Y<Vs5NCuR`ZwNR8w<-rLu3vYbpBy@9y22=3KKj0BeKz$|ArGS72f4)bM+Y)
z0h43wfT)U9{lO$60)nH;%hO=osy{<E>C%yGmeMr3wxOY+d9d)0vDw^Q>2Si{m+!Yc
zzHI^Z3`y&koBMXX(#B+n2VPC;w;`N13)o(%sBuIoNMs?<4gc3$q>M-ClH_bO<p<Y<
za&fxN7$J23ijMQIa72@w*Ow9n@{7oMsKT+yb+e28rKL3N=zlA;>TNT!eqe4XXvXPy
zn(e@92=P#hii**jp8V8Qtt3;FnkT`)P)gvf=BdzbZ2MCm&rpFhEXtL|2rp$b+hAp>
zZ_R78?r?BhtzPTBSVbTD%d@s%6`vg}LDnOWv3MYrtc=T7#Ee4yE!*&XF%+A@Dm}$t
z{TGRV*FP2mUjJitT2l>h?`CTQp`)}?@;o9UB3x>>X!x%u?!Rb=m+L8=5ziTS+YD)$
zdys`!uTVXgOsILzUQ;%u<_opX!($9QX5IYQG~egT_IJjU9eVMVb6E~~Kmv04t1S3t
z3>sT0b$Z>ki<N7TB<5x==p*%`^{8#(1T+xMF_tyyA?eS$349}G&gS!O+Wy_mM2DrH
zxkX3z9$CPDG@o`2`U(D>x834*{t!k+cJ?w@`8-k{+0eidODq^vWVd`-c(GO+Og)@z
ziDd)dij|B)WBU&R5&HO0R8o>9Po?6iC@kE3b#>)EH#^H$QdBe#J*>4qnZrBNdRysw
zv6i9TXp@wYA^oz^=>u7Z_+Sy8exZZk6Q>n#B%JTpAFV%xD=8`ATU|G~VTaI84{dx3
z!7Z|fZ{x+XUaXo-C6VE*DRX9cFolAwd80MjEHbG)o}Jl#5V$f7q-;bFiaevyZn7N>
zmn1Rj34o&1ZhOC9b?D$Tqw~K1%HgT(s3=A5M6-l~XaEoUA)4+uD7slOK$Ht_v7n5R
zk1q>_Xdx{_n3gh$TAqoN<?GjUyrFL4aUzF*WqM$xBUf2!b6<|Ed4tOBuICH-yE0L6
zaad$rM$;AeIjg0bpWCAOLD<1=S#JT%h_J(%n&AUIJvYl)s#NM#y3*^sW(LSYnF3i$
z@~F4T;o%4y-tWGdTsC7@7!;b__Mfu4*X49|iJ9hf$i%_mnQDK3K(XrBKjv#x>${#V
z$UnZ+Pp1PpVT3;`jGsboi@+!&5EykxHEC>goj6F@q1^b@=Yd6x<a6Hxp21$PNYOad
z>0<Tad_*<qYAYW;<LYMIzEQ!wJ?FLQl~~X@eQV3G3{Im^TZ$8qSckXlf7jbRZu?xO
ziD+qQBjY>LY7G2GOHeG8PQZ*ZDO1zoM*aJZL4W_M^5nmRmVfU~vN1AN{=G4%e3X%B
zz9e;MZB1Hha55?SN6XBtKt)aM{kj3jEYtU{*N?z_ZJWxpWK09!Ncj?4+WoJ$6|hpY
z8DF=}z7Y#e30-t|i@S^hLEP{=W%OHmf}!|K&?|-}bT((Ftgru>Xu-j7eWh_=aL@?<
zgM1cek^ei?nj1uq!(O+o<YXv@==SZOmGM&i&j3x~t~hlAVM`@z)U89gQk4?aO^5ZJ
z@~82b<$7~ghYNmCDwDy%jOOXYF*}2HL->N7HoIXDD39*q+?~&6vC3>?t@T@;{h%RR
z20oiBje@|dYQ~wf(Bp%NVCJjR(1!1|Ao~s{%wb?qyY6D2ly0pL&+XwPJh7;R^nyD#
zM@!%$Rp-InJxagf+>ks#M}A<1`mBV%lJ*Bcr<nme&n)<!y|knmhDIU*5P+z*Tqans
z(#L)lnFgghT+t}y-2ltQ0fFuzy_7<l_VuY`kK!7ijQ(#lq@)3ZvT3RrqWUtU2M*k~
zGiS@hJUctOnpY``$q@i}bl)A#^!pt5g?dwty$3QJ*h(XaJfof;|2@XN@ZWk9oqGzs
zJ#2lhYQLSGW8avEobJC(*O#u48sg@|z)T3U!n@Fpj_Q{;(?w!Yf4iz)e3#bM)fHKJ
zz#G;e2-In|-7j3Oe>~^L+Y}1w>{HB@t)avwmat!M<3!U$tWZ^Jj6g4Fj<5TKUO-da
zj?!P+2wChrdv#;p92mNpU!nI}g+s=TPe?FI6|JIi5MnIDh4F!U*u7ffoMntiD~}%l
zu;pMfXFPFG7U}q__u5SGkI#NBv#amN!+GffHn`7_OAq;PDM8YeI?cIyiL{-Q=6p~L
zmg{Y9jP=H!jqxSOu+oIy8Tf5-`8>YSMLKIOR^mipLzqyZb6OS|BjC}9^VQ1L!AZW6
zK#l=IC@AjGKl}3R0tq@e$a8m+TcG2Z=xn1gN{eL5c(cnlbe6J$Ekk~{gEfUEYeEG!
znkiGiT)k3sS~8Ycn*HN0JneYNdwr=k3~_FTo>L*gSM`P~Kp3`o8%8uYjKx$`Fr+f;
zOqE38UN0K>w=yOr<xDQKTdd(ftA7kLs@Z?OeB6n8$LMaZp$0>hp!DMFEpmJ6)f)2E
zeT`6v{$8*JktgCF+Z~RDPuYKRN5q$N3chq?j~!tOMJF*h*;lPj$jBJIF&lqyohi|6
zbNxL~7iM%d<-cL{Mosc8-qV(yJTR70t_kGk;Z!Sxl^*9h)xOb7fi(a02@iMjhUO+R
zzmR6^_$WO+%x0m&=&o%3KE(G~4wH#OQ$<;?sAv5Nll)h*rs_GgV!j@(=+)fRr@@Yo
zsqo4&sZ3g9fbK_T@@oqwEK2kwt&In3Ki{8c@SOHL$BhKTqt=*?Vgi=T9+#hSp#%!g
zzUvc(rtSQl(Y`f8P3a1>?pi;H2V1{A@mGFa)u~f5%;QB9TI(q9VMFaB23{05EhXYJ
z=Fx1U?DrM=p3x-g@4h#telgGUCK*>(jzisFa|0o3{e5uAkA_b;bK?&Wo)RC4rd+0l
z6b@H;(|GBa^*f{h1a<P>316)*x#H@DGve&S=f2<pL}BaU#fzEPEHxDs)mJ7arvBB-
zWk4<?=uVji3W500Kd`AI)zZ<^+tfE7Jc6$Re*6<!Peh0nGW;%`tXyY%%qEyFm@^><
zIiL^`5&7tML?$65nE6L>*mq%ALO{aVnJo%ezcy0P>mSYTP%I@4P55e?>rcIQcN!TZ
ztQZQ(SoCJ<sd?fJMmZ|L3(lE{mIE+X^7dfTYPR9Gi<kj5HT@wDac*MgbC>(GD*9Bn
znSQR(r8=Sr$K`Fj-wIF8(3UeA6!Fx3DudpRo9y!PGXL`g`^(KOv;D1@sHo@B_78&V
z5d`bMj+eiU-#Wfe<Z*AhG$=7Ec6zy8oX!2<^SU#h8;YsWIdmL7I6NFaixVWLpy)rI
zBO;YePv!y;L{dQg=mW0WIOV3ZV$Th1*2P>p0j`=2Y<ACJR0J{=&%5{i0Uq5|pUIq?
zZCh*^PJJOAhC}CLu@1DDm>2=CEq;F(8ogVkuki%_)7p3H+k+{y)6_~+(`4VU_U$kt
zMNSlXl^G7?vSM7he!VvLpGJjY6FKZ@Yiqj2-*U!IILnV0Dv4H`9pDj?-Je|}b**Sn
zpdbA)uc?BfXk^TE%RdKsLqj#;hNuF0M2{Wez5vw6;w~L`q5bhR#@+Mg4W?vVV&Vyk
zIKe)ko+2P3USAbkn3|bg1LnT-(I1j*-tUP3VNJ+NlT<V$4HO9ksPs&O6+4GKc)med
z;hmY9a^^NR7cMdsvf-b{rDWG~nd^-lLPD0FoPX+&rmCO@SoR`47{m!$QRFD4$1=ux
zTVI$kQ$|h60e&H)dc=!CLNX0l;5fP@x3{+@f3|x0Sq~8VWUmaJIInI((v};XC_tb1
z+)aB6LSHVUm_0pC+TqLqGYeKP&!zF{C<Ht|wBs0kgvt(dC|ZMJ3g?US;E|SvSI*s2
z8TGV_hl)FHQNMrx4j3Oj-WNveVRs$;*ZVSLECK>K!SHA|Hfz<kt4%Q^P4@d&+x=$x
zVh){m3qhMXOf6w3BvT{9x*iC|_meX-6s?f}l?So(in%jg31WM6un^H;tK09V(G%S6
zB~h+yWb=Pdgo%JJ)oEs$D^`GvRn#!Bd<-5K5O=>=>Yd8rlU_<wL?2i-WyARNNglG=
zUZ};O$&jl2iK>;5)S?~z{RMeCDKoQgj9G)c2wQ8J2f5wj^j=iP`lRLI;i24V<O!c?
zI0SqZ3Orv3`4?@wr)gZZ)xg~amaVIi2KRIA4=6XpxK_8#S;y$>fmU-RD)r`*ksbmh
z$}#}53;<O%^3#}m*E!b{<Wdr{>HyIu*m7M!{Zp#6Z7GpNr9eeN5gbEAJZCps^abak
z%X`rtua2$$o4L7#KJ+Z?fRRR5oFc`2^898r_XyhPo>jZa7N+W84sx<Zz}K7CT&RgW
zzBmBQanBATcYuxb;jlpMa$U>K${N4j&2^E9fwNqwAiy%nkUCtozr8X)Ug|oR$!WC4
zQ&*;s>`VTw(%LDBb}*ead~GsZyLv7~dzwB`%xlUsCf$NJ=y@u<6DXESGcLQqYeEB4
z48!d?qGQ*149BFr_Ti<jbVW{=_-~MfG$$oxC}7sGEoXQJYfyLfJ>6;8=fT0l-|oE&
zjMi-Tvu2HxhzmDs6A0RV4KpGQAq9wPO1Z{N&Ch2o*|xQJAYPPFczBorx-wlxjmvbd
z!~GF2j<=Mpuu)Ab|DaL2N(N2Xz_F#khH7rL{=xbA^QR#7)kp$`?UExHPY-}@^@^87
zNy*p>^gsY>I-X9-;hwZ;DFJ7+<Lc%1^Q5xw;`DmEd%f44b@RS(hrT{_Qx%X^Ziaq{
zVD)xPgwIk9EB{RM)9v<F9l8cX>EG1pP-NelTYC03Y`JcGqX{^yc9w}8wOD;uIATfY
zYcfVtYOsj)AAX<`C=cWwAl<*UrNNVUDhggd?7lc1jR{DS4SYYo8p{JoiQx~%7LEnJ
z?@$HV2*&Ontj!kU1AVb~m@X%I*>B&>Z}t}HXM2?s5)=DY8f}nsz3<PCxjyDLFLm1B
z$)@QpGa>eRV=jwHnM2<^)b4)#?is#z<LgA`y3zo7Jm2c27gMfL!XK+dY-`N5pM%%7
z^WuY9#yL_;5CmLEysMBOXS#+p^Tl|4NOY6T>*$fhgqLfzg+1}3Hd4|D+gQ3Q4KcD=
zO-_%`IbYtfB^PFr;J{q|&x~4HT5!`a7levkO}aJSi%hvh5Z&Iuwh$h~wzslL^Kt2=
z>bRsJKH<-@($W~yF+{^hN`=T7HVt;GQ;(-`v`0qscTk8Ch@q}gTv>KM5VbC*v{e}~
zH3Kc~R$$BJH}{ze|4J1Dc>Tj<g|@{C3m<>PBG3QZDOctA-`;;A!N1OBzpUT$-E%;^
z6yKj35jz<(xfgv$JvRAvbTZ_q{FXb*MdADZC)zi^q}iC6r>}<-82$q0a8#z0xP*i{
zg#B55lDqy2#&WiSmUU+4Y_nTvGeBmFdu#cHs7EmP|9+#;E)|1=;DV;zlMsKWL9t^4
zU`vMe_mzQw?DBaTrKZHpxIF|<G3(17{4^<Qf-;mEEo|pb$ld*8)MPy$sb<5Eh*@N^
z9Te(31W$sHhVjs9*KPNUp_kI-$H>SBccE^JU#9pMi^X5iWkaMp65`_(ji3NbChOtq
znagy7J&I>8X#r=LAnB;ueL#ixgQJNU$*w=-xqA~mJ2n#vl#+Xk8eO3GZfS={-8+Bx
zto|Vg$R&sFJ9qQ7T!E=&3Y0x$^{jIfhZC#Cwsm>;`d3skupUbgDDdZtF%rw`Rupmp
zt{VF;dNluc#wjRX9lN$e6}OHk9L~>{!Q(qQK)&r3O14wpoDI`=kfR&!X7u^}(P@tT
zck()(#?0<AG*O{Oukj>Hn*)219E8zkPd`8ErL^}<%virU<7~*3i#RbvHj*qw>WT4l
z$a?P9@hjc?6z9719?&|0v&#6P5bv_ko^fC}M(Nk3xg=8qkc-bUcoGs4A6yP6M$g?O
zr_WLh{0L}@R0GCES;*?-PwmaF6Ae;oN;83yscM+~gWO8kzZ}je9|8iwx%~ewfIM>&
z?#L<nIj$NqY*&HQAKAs<chk&W<Ypy@TVoejGJR+-xz1oO`#<?mwVQq_eMGU7&vixP
zd)YiLb?mcqIfPFfi0l)72M`}O>Wwtu{Bv%(^d#jwBOU<<(#&1!z|99p&gni3>&|%X
z5gzhp`{hW1K|Vaz&0GQXaNz(!-zQIoJOEh%HhVPJu5j^u*-3qaI04Nwd3L!d+I*Z;
zr36g`Beb2-Q!mWzfDqywEuMx72PzLR_AcD0WaP)(NG4Som8~M9l#RW#m>lg(^^7dI
z+AmA7ul%zMxiH%q$J$@6x5#<^txKjw`Xc9$ve>Jq)>B~J3~d8apgxlf*ig^9*buLV
zP0kv4iGAEnC;WgnS&oH1QI9br9@@&CCN({7_S7pdK#kMAfA_zNe(`de{IkHQ^WEvi
zlY*OjktaBtE&hGP<E!^1xsc+7k1p{ZUauc9Z0fjZmFO2<Bc(=*00_;jG}PMsl|&eq
zO|XF<dL<SCt&hh&{_0d7>7=}F<o_L_ySB!`DTL<ND;Sf!PxM8}j}(dnvSiQ4Z5P*7
z1^`in0cc*|nY%Zsu(5H0_r4`1*(N1~uVqH8-4KOk#d=PbD~cIPkPHJUNSqm78+Q_!
z^?B}>HVtj-a`u?iou;IvB~2cKuCS@;c4cUCVwdlQ9FO<CZEs+)@J5nheI=u|q?}x|
zfxY^|D<&(#(GS@PlP&)6a~io??aHFa3!Fgk{D-ZU-oHa)3FAHWkGv;Hy%vFaHxTxj
zuNQz@s;!S2G3uWpWmqT?lMcClF@}Y<U9N-EfQC9#tYC{8oE4y^=My1M-C=2Bv{q5Z
z+k?Ts!IPh(qcn~J&#&mHo_iBleHFmKM=tFmMW@3r=%l$(6GLmu(_fE!0GKlS!_Oc1
zw|n?;ytC{UQ`nu00YMLAm}Ueqh<Z!sM#|~>a9XM5x`!fiVq@N_YOiDF^{+}#^hFc~
zH$Fu8VHT9`bSxXzbDguqDIf9@k3xWMDNt*HwzbLUoCt3FwRGyCXd}QKm*GE)2@iMV
zHVGl$L;4sm+S@NAO^5os8cKs4<!_2|*va!<Rau$(*ThEfyl9|Cz#)y`jovj3%dGWW
zoLa+V!PRo+5hBn?hk?)dj0ShQP&wW&7IxJWjMl>GH8wR>4EfZ#!%S^pZ{QVWoYwPz
zkYtrMZ~dw#Lko{WXv&-J=}0`n9cW1UTRmsR?Y7!J4dTrS`?*&{KL<0C3Z@!{1Sm#D
zFSYbJ;xq{7g0RD`yEFc>fZGhv=^~TiSl6?qT1D*HiHV8%9A0-hC{|)T3MM?_9(0q+
zh=t3wJ*Yp$@>xU^eLnDgM~02dLutF-use#b(Xd`Bb#hLq51@3D#^aQe#9uN}uH*(H
zEVz=E-O9UN3kYb`RJ@r-v8<@dI!$NmReF4Sfj@o)f)UE3#UruVxJXG2^>lT!J!=1r
zEga$sPrpp(m>oe#zU~DoRC0BaYb=jN(^1YKMwNwbx7<C^{P|sR85$NQV<;;lGsbI(
z7rXVv|M5gf;GIs)^sNL7b!Y74k@j;sbOpd5l*LA#Ff~HOH8fQjq2V+7uWiqD37rGG
z1EQFOm~o}Yd$yq~31jokrxfH#$=_9S`QUW|Y1Omz9|M*7x5|?K=hWE57AbLCOS^jB
zu^OL7pqqA=PVMSeTrYR}G@z>pF!d6cn;@|Ey{wgkiUSFTIJ=~%vt3Y4T6SK8CQ^^+
zi(ewZ3Dv>TeIlhvOA8N*yQ;9GJ-9a!^(+7A=3Bj@PJ_ffMw*i^0(NiAJZbYXze+gs
yqQVJlzfG$W_stj)EAMZ=OfQeE%&C2NBVqb7IqKFl9SFRy1(F7T6R#3A4Ehf~v>@{U

literal 12003
zcmXY11yof{7riu6(%sV1-617NcZYO$*8@Qs1nGDnh)8#LBi&EBq@+t4{`;-<v(^hP
ztUGtkoY`mZeI{B>MIIB46b%3XOojI{8sO(w@bv{18GOfZ({BSm5Ix>0XrY2XfvA>I
z;P0<o-|KsTmxca&!ST*W)q@vFJZ1GfHC?Pdeazjh03RP8b~|SW4-0cwD|Q!mo9q)&
zQUIU^6lA2dd~=S2{Cx4X7oG#k{C{<Nc@>A!N$TKQ;*p#EPEwcD!dFKm%_M0u?{`X3
z6(`uSm^yzT9}IOPfk~oZyGcEAQRn9$F@@DegwxZ6JI*V-r~crho4ZamPa(XTi<#`n
zcpe13)PfmLc6i;dc}%Vn<9vJjiEFU9sOV|dj5DsXq(nWop!xjjV73ZJy`;+T(ALaY
zA;bUrFCQZ-t7C#n@hog^&Zx!nV8)L&CSWhu$C;eRI*t&)q7qlS+#MffVPRRypSPb4
z3k&n)&sH889W^x2(fQX<HM#+#E?}3kv$Jzp^FOS(SXwf0FKBPiiHVK<MX|H9<N0S8
zr#0}78wW>QTYK8jr9&H<mDM@`+c~qj5JGS=k%V0DPj64ZmUyfVtHd)6JReBy@9(GY
zWdGWwQGB#pZ{YMUPdsP=Jq){G+Ljj_Mk?gxVg0%y>7PSYhxKAdzzu!byn&{Hf&J*{
zXh3;&wX2WA_toj?gYaKwoEW5nt{X&o!S{BP)z#GueY#p&8)KO~!y_Z5Y%DCLiV6zR
z@87>S6ASnkZcyROTRCpsNA+?$6!!FRBaxe$dhO<r`mL~F_SI~@)ThoRaIBP#4YR6e
zneg#!0mF6Q?fA>0qM`^sKEAuqbdJ4qA`WY+rbVpRSm@dQ;OMs6rP+Tr%>GKanq6H^
zN~~A-oUUQ+3VH5N6{28~@2~4v{bf?S%L-jUv{2%)8cDHq3DYt*j=xz8s0vh;8;lr!
zeEg(YRwj|BYtZ_OZ;VAMqoQ`%G@a#bg=N$FK=j8cXnFZXi-?anWmeA0Qx_q790{L&
zio6G3;H|5e1#4zh?NYUGaH7gI_x0a-2OVGE+fQ<ZHG5kFu>lxl{7Tz@yPTFA|JpoX
zq!%t-?yYA~VV}iYHp$!hbsjwz6wtz49WXxADJ08%h&xut8Gzrg8Z79^_}1+#ack~-
z`_qJ(*+aL=B$pcXopHOz-o$1!BXoFTe0=;Z3(I}|&!7A2GIUL<2T!P-lyF8I|2@G!
zFbJk5#>UDgU#v0-*^Tsaa&jJ#$wP7u>4DXU>%*Hqs8~Sx$(??Mj{nW7PZ=IA?(@N+
z|2fiKPUzud^-2`Zn~CNSEm~T2e7oN8S3+D|Tt1Cbouz;N{7DUYSYBscy9nM0MTr5f
z&b^-MA8yY05MX!e5%QFNf7&00SlQT$LJ?4`;iCdbHgsg=60Qg(jH{@WWo~_LPNb+%
z-`RRx^2y68k444AM90Pk*gikr$)4O*>DLV+Z}6MKR0A|4wYy0y3_46+TqmJopNv+W
z_{mN>4=Z!t$R{Y#6<n4fZmN)3tY;M#$iWM$lG|9yJo!Rjpua8vU>#+CPANGQddl6n
zWlo#DXp3R({ctL&#mYn24@XnSmd25b%Zg{5Qopp+WzzD|&u4ou-lgcfQr^v;M5Ksc
zR6>Hz!S#J+T+OPCXGxI5pwC9&cy|Le8{6><gG$cr<w)vVQ~#5eJ<rNu4=Ue{Ee`p_
z3AzGuU?WN^go(KXak4mBvB*M3tmikEep(~~li?(>s!Xw9!txzw5+>l7+>e7z14n~_
z`i8ofFHxwdsOzyaKR+DUuFT1a<W6G~sr5QsurGeOJ>Nb*D9&3G@Vofa$IQ&^Kw`1f
zSVgd2*cZPWC%65l>v4ypEHCKaBC1c9Y%F1FV4M3+S(}H)%ciGc$?Ww`sB7|fc#RS{
zyy?Wa8u!fYD|-c8s{}H9Z0zce*4BFyAzshb6^}jptkF@$+!I19Go8VawYV665sSXh
zaNyo=cgQ&He3;<(IazrT0pBiRx))f0=}jG5k<=&T<0b<!WQ}^CQxijX_X}<pH-m!L
z#&6+JNkx6nUbU^B^epdB7uE$DyBteVRAz7ct(}OE(~NRM{dO~F_4V~9{bDa8laogp
zcVnYUFD@_h3>zKwGuuohB_)UKpQ~^v6f=k|K8J<DchD(ZudMs+<)Rs?OrX)$W+82!
z&kGx8&AKSd$XI?>5tuggFT1*T1I+kIF-iP`nszVD3By~!Z!v8FQc^vGS65es^z`)C
zD<EX~4eBX*%%1+-=PYaifsg34We*x@0>U6Mw5v2NB|Uw+qiKC2c*I_;#h^GA&LUcL
zDCqB1y5F-;-G>jbs+oh6%}~64w+@B0uTobCLzmmYks1Fo6Ks0L{}avk&$eg?XmE&l
z*!H*sUK7t_l{zjTllyJ<J!iY!NNF{=sMEHauQlx*d_=GRd{rPR(}lg-8=?xyIU9Lf
zMgCq{c@>(Oc^B~a`@%WaG<S(sDOa8KxWE0={dElpkv5gV=!C3Ht%3Jfq6tj@Jnar-
z0f})Y=9Yb28F(Bw$?&m^BugRGxMQRt`jOheKqpU6UM}x2o1;DW{NS%JAlOt*jk~G2
z`3rGdW|SNdl@c1LpM3SCRazlICEC1ww%O+eKilTx(hefxYC5Yv_Zu#*X$RdEk|`QF
z4>0?7b47e6P8KSHRkif>qm$mq2Va5+qsl2S8;`;CR>W7fDlyB@$Y>wqQoYI9f5M(Z
ziwwJ3q}!f?r9^9J*tu$x7#(ZDo<mz#8#71Kpmn``HXglN&s&wTmOq`NZrWB2hs)5b
zA$Qh3z#ai!#h|Qo4h;F?6OT2yah<nQxq~llZ?$>fKMJtMG{KCSpHWQ{fh=h-O_z<*
zmxa$43|+M4WMm#EV2^%<a0tkbmF4AE8-7>&)AB*%hKA~q`@16}Bb_T90Zpr`LE~9`
zL||2I5@3u6b4jnY$IK`xWzHVCAEP6f5U?c1C={PL_}lPqZz4A!2t-qYN@pu8E2g(^
zMP?1|9>|2l;VU&tN(EfjjJSdyZ<&e>t*seKV`BbQ;f7BGod}TYnwrpgZEc_5NB^Ac
zp;V<BB`Sta{MkB%B@C$}!wNG`n>#yHmC;d5HFgc^?W{Mc^vv=MrD|?QGmf!VWB{vm
z+#v}L&Y(jBzoz*nfh1QjcY$Cw9R;dooMpTmBVGvr5j??nX?l(PW$(}FOwot+I1(O)
z(<FJygG0~d8jHw^@87@Y2iaFVZQk_G6|3gG@MJ1=nYMb`rIbCy5WHny)6nw#4bl%E
z6@l#Wg?NNGrNSDiv`<zAB7V@<)gO{g&@i7kI%~OksHv%|bkc0jyaSNja-eQTtg7GN
z4BF4Uc@vUhsH3ySLrWXCcPCGyAOwgb0}0!5Znc5ocD!$n;*4F#4*5!52?+_E#r!TT
z*XQQ6fbLbF^$KuZax!yr9LFXmI@8H#1#*#sSI4;qaa~$=(ooXajY~al9^77@lRH_o
zJ5u9w=;k5YrF`T>lMv#}pI^AVvAQ=~_9o^z3wjUy{N}-}NL(Esbstv4?Yd$vm%`Ij
zUQP~_@9gN(nSC-&yO}$OH?kCUF(>zde%-<8&lu+No-2o~QyOY%p$%%x2HaqAqW9+I
zy4BX!KHr`Ctd-b!`h!KSmyp9m6yy|R&ev#{e1R49d~!keSAHTQBFoazV9_nAudjby
zNk85YHnmy~OQfYO#|@{c826CV(#kq~7`GVmFK?<{bmX<2$~W$;Twh=aIo<6oEGQ5q
zzd2cT5D9sHOot`s_aS@X07~@q5++mu&<v}Z9M>SC(Gm9HTJlLZT@kocMWhOyvh%2w
zo=w=Qk(=B3MbU?J!nQV-_0Enz7dxXSH>DMEF{Cw6uC?qukr~X-p(J6PUJWWlb=<<j
zJ%$+#=H~A-4?30$<)<S3gMJEhWo2cF4JA;N?ftuknZgWM)0EeGeJpRiMzstK{9VBs
zxbt6K$Ef_;CS)_Am4);zUB8M7F27exqkw5Mj>`nwUpw-%wY7}=&=*$u_i@G=I7K7f
zG{YD9k_BwDA3kuv0UQc-(Y6R$rE8*U=Tg4DDLNI<-l$G`Gg^dyBc$UL8d_TXkV#-b
z?bp%2^{~Ckadwt_5&+)bo`Hv&f7MK{EP2Op*m)hP!2m@8ZC_JUv)%z#`4+^!s%7rW
zi&2i)#l^+9OH~ZZD8Z}TAf$I(SA{&iozVVLuJab$-0Zk#WY`CP5npxtcZlmH?<5Nm
z5D@Ao%Y9)b)0QdWo(A4)z-yNI2qL`#x_@(N+8sEz{MZd=9j!5_;8#rE;i+RyL+^Lf
z#vPKya~&CRGt5;VcGkti?m7A=Sxlzt8RHvVjEssjeeic<gBJL;(cHfb5AT1xR8zQS
zKMEF^6EH>Y!nkx??0**axkM<G%_n4XSqxr*ES#@<UQ9%UY*SksDX!)icZkC6I@`o3
zFcaZp53xlY#cK?-B~*Pv64xBfl3F+;H_X#GiQ<CZ-Y7(D<0KN1*E?_VR6R2-9J@%H
z$4P7wn0B*exPsCKYS$0E={e6ZEL*yiJQtDwh~?y&BI!4B4Z6eo21}O=XiWNMCMWlr
z1YOU6`}OPB%W91FZosWS;uQ9Ou}ex#-4Vww04scg|JDBad+Bo>S$UK$4A;)x_0-R=
zsX8Y+$dl=&K`!onpVhQL*EOH%3q9R)`p`J=@f#>i&@l%*49cHgfqcB-#F>1EhLx3d
zhUl@L;IT2gti1d&5KJh_!<yKbn9AW=M>q(GtgQKQ&D@@?j0>M5=AG*J4zHybh%pp^
zYQ^F<n;=KW4f|YYJ&()Dsl!vflG%CXh>XGl=i#Y?6JshevSvl>-R$^5|9~kTjL+(r
zMOF<4Wyk;SHDmq!{IF%Yid!B%5pSJFQ}Xg&{)Hi-pQtD*lCD>ob_w6~_V$tj6Gb)K
zJ->atbDeo{&X-0;TIuWPMqlx;rFoGEuYMvQDgq0R$}l+$z57{Pcr}*W;&3nKBLh%A
zbNH3S)uKVJ?tJs{v6K%7C+WM!^|lZ@akm=)4AJA6)$3><bpNKVU4FAs@F|Io9<27r
zoN4bQ84&J=yZsWlVrCBD6+e71=OhN0@H#b%RmR1^ib1thkGo6~yvz+3#Y-A5w%XR(
z+xzY<u+y%fFP>HjllQ328FyQmIFPA~T~1jiC!#^n2eT7T2LGDf!k*K6jrl#$4Yz81
zS-pR)4P5-<N<s(B#v~<^$9@YA{&pMuO<W998PwWn&Wqlj<F?4dHA@M-#E7DmM5|u3
zXC?e#tnuyJx2V`ybPNoPBe$pdKN4rlY0PYF<L%btS>a#4eDOaS7#P5XxC2wjNI~>q
z$xh+RGKIHX49dvu8nlf|k6z%`Kfwh0e}@ha4^xXwy0~EqwtcrOK74pQI$GjG?xSqb
z3D6eUzMK4Iy-a`E9`SWY5YyuNnqPtCvz$k;in)2sqAhDWJu_iLgAm`hZ}WQ<3;iGn
zw|ecfq@t0KkZ`?`i_;q*CR4h8L8Kr8MGdbE9)r>u`3TN*xqjURP=B{jwD3JVJX|&s
zi{gT5bXHX&_jP_`)tv*|#i(-v*C1(D8#ie@3*aP-w)88*K7N|`HIqYj7TT$B>K0qO
zTp`zAPfBzuY&<+X#BPs^noqqPZ9=pK&rc7!OOE`Bg+QCvAt69*&t*ZhRal6CV42zD
zyjKwyF;T0>9#{_ZX*z$TFOJ?Y9-K4yM8h8S6P2ERfg3U>XA$1mx+GrLzG9I`23W$e
z4m;;zZ8Z3H1aB=>SAVKCa7vy33uu~~yL~oUck)(H2-PnRh;dsXz)WJ0u6j{=8#C}q
zc(pt?u7c!)B??ey5)zQ#gMF%;@$YC+6Km+ZhYiHEQ3)`s(Sv63*i6XkS9ZN+5*8Ll
zm7Mz^!%b&rT|qbg^CRnL;)gPQY>ngEz%ngEL&nh1u(Re7YxL5joq*Eo`%bu|q!Rlw
zFDO2?8j*ET59d-jY*MdcHUh4@Plg{p27u5pr@+J0S`8|VIp={Jj{$qS7bExN)u3Ah
zA~u{9;)?!TROFAWKh>}?ChAGlF^1f5PFmN&k~Eq?DRz&8qd%pv(bNlW#jdAim#(0f
zj+?bIo3q)&>#V3KR0IH9olme5g2I5EH2kYpk#@wL-5mj781>HF3*ahX!B#edu=1o?
zu&`d~#c!a&AC)0(G9+v#{I>F=CH`ueAc97nK|K0Z$e9Oc07hXiMQ2N267%bV1kfWO
z;Ios}NKS)jh8j4DWzTK)MV{XuR=s%sohx~<%U!y_yEU+LhyoBno8_?{locrpRKd5Q
zxVX5`3L;9gy#9Vf{*;A_ei=5L%^gCOx+6eKCOibeUe{;ufe}yz-aw84Evkd-!Blm1
z)ev~w;hpcT(}i+R@0~M1oJRsWf{Z6C?#BbiC8g<5d#O4fFFqt{Qlp`xmzZ`1A9U_k
z(et`(^()=D<KyG2DJsS+!rB`c?wka4)z#HYbjrkTV-phOTwPu51J0Aa!F)VcDO1<l
zd?1Ij6e1*=7141=Eo)||`rtZ^qrD=TZE`V9oGw-@g0~oZ@#$^^f`zgWfU^0l7SLu$
zR`|+5vhsB0-w}*z@plMGic8Ktr+?I)%1N@jX?}jb=}aclTA!5&=w?MlC!QwB+)m(z
zPBJR|?SYVKH#96;H3;L#=vt?yQ6fRE<LoMBWDvE{-d#T)Im+t3xi=o(8O?@$j!61G
z|D2F+_254!z6T<;z~S{kzh1<M_1je6U{?rhh-SsC@=jE#L-f{>Xjg7n7&Md9JZ$I~
z73DQ$y^gLfm50yiFo-+RQ3=j#?RV&Pi-C))F8xtBNs$oV;fwbSqlJR{33U3Dy4u<V
zs<o`bNWVg7brP1*3IyNJC}Hihf6#z_pH@mI&X$df_dy0JSg`1%1gW-;_cg?~VAen(
z=F8k)OWGOk{93u<fCwM~r-)1cxuXAaTdCmIk8em>+pr=V2$xC=ff^bG(wP?XU{MIy
zL%p8+qw!|I5`wk2yUXtIsq~WMQ6~e~`19*)BD+!Z*^||1+Pt9-xAj;?)a~u90{It4
zj};v30j@zsA%)T{$i2<`5%;v1{Rtt$Q2~s73!CyBE`BJnNDmw%@VJ3d+PFBO*o|!6
zl;_>L==WUCI*MnRfEUfAxYdk1_}d!5Wxm$!i9&;e{JNk~D9mKX$xRVr54O^pLk*9N
zl#??#-tj(OqF05A-nDHHB_=XPvX#zu!xRlQQ_|8JX*f8lpce+3n$n<XTwX}_oIx^o
zZSDDTmSo~$R5IHzijNE&8~d!L9*zWnLB%BI+^DWPY+xI9@nQhX;z}4*a(+uN{CF19
zH>e==@91Q-P?8;g^pQ~0aQ~^C;fN@ld-Bh2_Q$JA=g`p5=7*Cu3lfW`=>7D6yCrNO
zNhQZwbmY&5y>X@tJnJF;)Z?nEX_pZ{xZ(M!$G1YXoSPWA0ylh}m(aR_dL_r16T`@Y
zchCm4SF1QcNonjc;G~6dSS--Ws)#_cxF%3!6UK%I;1dz$iMVaaXc!n6i1l=VLn4?4
z95)PY2%>jKV@PEP8{!KHuKQ7ESqh0uSDj)NeB-W8;^Nn*T^c|T;L1<7)c+$`se>%Y
zxj>bC)lgD@B?^o&GYchun-xRbpa#kp4nA6L=s@?n(vSYx0uVWmlsW^HNme$ok2+X0
zfCa1n$x6$)fzy+;F6hagjSH+B(H1-|RI#o1Rv9t?f*^BR1@-c2V^!yU>C(J$+5E?i
z?$8bri)#alw-)QoonOZpO6iylk)7c!P^d?RX=^7M^i*&xr1~>(MDtkiu0O`nFKL%z
z_Wwq-dBl+7466~|tUqs8^GOh#EDqbo1zlY3p-Xb$%Qj~$DCvr!ffv90pDqt(i|rn7
z&xb%D6D_&69}d~L>6MY02g!Z*?Vqoz&O)9)JC}GsnQ;R0z7RJr%~AIb%|+h?^dw*L
zsPrA<FFTQbV7fvjwx&qYrBdj*{vi;fr&%pl)-D&9XqUFGHgaRL;I%Ah(!dcNk>8*b
zkJ`kgu9&LRguPD(AqjZHqLdhSR0KP8A>%ZYH2yv^qNoHF6}p`ICf!9p6nc}3^<TwK
zpP8BI{O9d43+i^29;cHrGAkL`f%3SxqjkNE*YR>49^xnd@2g<z_k(0EDQ%a+fwyPU
zos~n4ba^~eMx@-9!%{bi(lYfy58e)-#bg>ZZfYC>{|GYD1V0h}^TuW8(JQ_XCxzhk
zaUpe3EvV`2wxk{JX1nMV|M)Rs9mnVUtxmrxuZ4xhUc=w=`w#(%bw}`z!+_Qv&M8Au
z5L1Pk#4F|wob?F^cUzV)CEva44I79hVzlLjqRX-o#tuEVOdxhqjSD4#whU}%G(9o!
zpeS85t%cpRvwd%|&gKPk;{+qudC4($ho^WQBwR|xno@;#(7Hv2iiLwl+#xaP<g3o_
z8v1^Ne;34qzRwPn5<f_P?x{9P`!3S`TL{^caRc9mGljD)$lKrYk4C~a?VgsF9yj79
z7jjNY6s=G~*_u-W;SUUo``hED^%JgF?IAD0Euh=0>2os?jy21@=-5cLP-)zD@N~0Y
z<>|@j1(LeH6lP61&<a_x+`IEf`2vL<3@*_h1pH?t4C+PwsIUJVHNg!%9U8qj9qH@q
z@=NEsR?MwDJ!MN1{dgp3Q@2QL5luc69k=J>5f{HeNR($O`J<uz5v>wRL}@hoTWU~`
z*K*Ny%J%V4V%>kV??;2ny7<F?M!xiaZb{)d%kb+d^YB*yHxJJqtA6dD0~+bi<f|<n
zHewdL1+uYM3JMAb62>hWF1Z{-dXFo$wd6w%16GAxIS3c!-8XSH-FJ(N4M~tO9Oj!c
zPH#1xlJdB{7tDMBh_XHQq%BiQAt5Iq820V72mL=fMg=Md%a*)(Yr{5!!UL~E5Zp2{
zGW61YOiU;T6RAR+LE`ix4whYF_uXmzO^2dm($p10Sh@bTTf;24gv@+=UL09mtq#g)
zuU?V34^j9SeX(kxlmI;wFjDmbfySoCvJ|CO?xADtj?8~o+XTcP&-!S<Iphhh&Vc@b
ztLbnfSe6%mW#|UEiCMIJSoEN5ZYn!Ve~cSgbM3=CT&OUF^*uGy4-!ZH)XeRfBNi^@
zr0~BS7vK;yDDfxecg*nrl}s-%G&J;r0B8{qShS3$GnNYwzY||LY(tRbn=Wr39u_|&
znQcDxD2tCFeNF8MYNdR+!j^%9lejJ@*LYi835*Pb=2H6I%>BRPhddCASj4HjJvMi;
zT{`t?W40J6DRc2Dta<m)Xj$Up<Acn1$1<xp4C<Md{3aUlK=a>pAI$qbIy$<21jP?8
zuH@C3Uafv+<*d?GlcJ0<ryYoDpL?bxWYa!u)cV9jnimO2`9W&hW?WR7omG;wgVL>+
zsf_)HIzgnRsnvh0v$=Ul;^on!kb2IL7*NMQe||XCbzZ7JINaLW65FTU|I&*HfU=Dw
zu0{-G@BWI|;o0fz##w^SE6u{&6Pl`G1bn_{8v#^7SJS-S7k?<;rs@c4rR^-Glk0ja
z_;<u?-?cJWiCKus$_izRY@ec|8BLz;zCuO%(h#vtn1)Hl@4VdVg$#>u5fT#eJ*pX+
z*xlWw6!F*{TQ4gs^J%c7za;}bod)EH$jJ3ByIBS@KPhu_nt0Gc+hZ?ui+<4h1^VFv
zmAaL|-)FD&D`1Q`I67#(_^@hgspf5dY9?mpgT8dr;Ki*<M?4(kcHgA`!robR*r)r)
z1KHryoc(nL6<7hS5~~g&tIox`CVm6lt{dHXplNSZ@A`}h;Sv(M8+Y3tv^rgC7`+TL
zL#eH+V+OC8c2>SNO`0UJO??Oa-QV9onk`lhxa-$7Z(6onZS|T5TOXpSDH*qkBt1PG
z>@iUpJM?0dlI;c+(3K{abv95DjEQ(3=@r_6?L{?v`@gb)oGC1_>Zi1k$!}s}i^2bV
z(ctp|qOZlu*}FBRH8hW)tMa?eW-=ALvsTXJuNsre@^;6viqv;upQJy%d82JtQX=()
zf`!qxlV&)#=B#k``FOc$*~E7<!UNnQ&^Iw#p$_a?@)1=<cmAlr;cW3_Vnjs58Yy~S
zeq&?WXH2p*B<keH{Dh^i!lk*tqR&7qkdc>{f5=J{w&f)q%NF23mV9AA@Zt9KG)F^2
zMYUZJV?K@s6)4bPK(Xr}zC=c0kP)@Nb+X!~3KjMmftAno*f(s=>za;(2AfFG_=kW(
z9;S_V8X7b5Qc_a)V9@sC$prqnuj9;6`u<zAK@WL6AG!q7t8{pLJZO5$okA`>v?{f6
z;rrCo6i%YVvu|jm&dT8JQQc%IC<cj|bcBRiz!uoT53oPr^Y3^WmTz9upsuAQ6ZG&;
z3^Bd0qxHW(>u_M_gCMZ@1quz0ULpq5xb`*3rig%=PWC2=FW?fsReb;6*LxyIh-flT
zLbW13CI-#_=^8ewp`jrTmw)Z0{}dtI4!;I2%P-Kxekqzg_^gt_`R(CovF^?G_I4F>
z#b`PQ*onc^2IVjkxLs_}(9m>1miOGHW8GrW2b)<jLCg>N_;G9S<#A5}Dk79E>Fmr-
z&&c?Ki-W^O02zc?o$G>K-(v$kYVV`pHEhrTu=ir4C@n3`_>dJ6!U$GbXi9SONAZAv
ztPS`&WvR%Rr1db^<AaEoExPZA9yg=r>E9QHS#$P$px*<ZjkVY?T@?Q7V~yidtyL_n
zuaC43gbj5a9q-nIFUI7Z&ZNs<fitjGKnAv6jitwB)YWk?$pz1dfsU%X8=wCk#l#Gv
zs;vBEzup-H9ZG5b*4&%{4w@3p-tJ#ZKUdT$1W?l+fJ|HUM{#jL2jv)nVUu$OXt)OD
zlFReF#0*Z;Gzw=TNg;LnsXdB*WeN_?RT#t|7vyX%kpvm<ELzyqq41?WzV$mikevZo
zTK}B|klFw+P`=pV4qye@mg<^wqrXFhEW>@5YALC~@5TYLl?wLVEF?uBaIWmdSN=8%
z=ruQBv7N}~cQPn7IepS&r0pH$=*r0kJJg}G<E*IBKn|lOxj^(s6HSuLREjKV@+u<m
z9>D_xD8MfKPw@UOUzzy*y)q>Vp`4jWG`QU#fM>++<%S>h)>5~13iz-l6b~mP+FGtb
z=S*R*znx%1yx$l7vL8<sp9*ZAanTCzZHc0E$0n>F0%Nvv-m37vYv&KrK#1q%>7Fk#
z+<W*b^N11^8}7I1OXR>ABED2Bycr541o(|u<TZnE+s}&nx<R6>0!!Q7-Tl*Q;LGz9
zf)l@?McL7bXZ;3dFDohrq~w+OF2XH-cSyEOjkF8BE*wN3`yHI)z&yhvAHb0zQ*&|^
zQb%nI*N(QK0yr#ZPBuy^ySde{D&YFAd63+JPPCq~va)m&m6nv9!U@Wm_Zz=B1Z<Ri
z+>r(M*BLTyRFDHU^A*!g$INFUT_n3S1^he@0y=;*`eOz76`8Xe#b2|G!-=|}7XbxJ
zl*eVQ-QA~4Rs62M)p4=b3*4^vwW0fl<dZGRmY0z2mOIkLBQ>>5q;Db+3BfgiOc^(2
z3!E%mx;p9=L^EQD6fgpi!=Hh-&L%g>Mxw#)Mg-o#p#s6k)dO@f`qom_h0)W+`q;c`
z2A{qG_W<^{z*{y3^_11VGObd|uMEl;wp<`q{dk3rez@>n2MI`kzm3<&o>40B?M3J4
z0e(mcnbX(dKpy~N)cnCe?sZ{(99Z2haDTv=cJ(=7;~Q6qK&%+lMI8wd-#}`B3+005
zQJfQG;07)V<?M$7{!MF9F1#5&gp5KZ5(u=x9YAJ#0+WFPpny~<7wGLWZ65;+2+cp?
zIniShWSUEj8i}o?P*JMk*Sx~f>Zr#AqPI%rwu<3y5hYCpI6!a51WqkhF8tTI`og<A
z&dQ9}8|dJF@kW1)FOyeSpY8(tDEAw4C7PN>t3+Vy|4U}3P}R5ge4~p;F8m!ob_kM5
z?+OAn@rZ2&*XmytAmo#~;T^I-*Jc8DkR4%oTRziMrSVok!X6;sd<w+zq4x#=l%B72
zedJQ~vF89nI6YJ=vi7$})>3*H8`@u)6wmri;U1B@iR-9S;C>@fuWa7np>+HCt&@CZ
zqICW~h1pB<O+pffP6TodKtl^GD3Gy{&5HD~(|EB%s^0{gGTjUW0UK^iBQJgchx8pM
z=1$0)l#m5UpiA(g^Yw^43$iN_kQm`8qgAL=R<^PVmhlRil;!tH(yrGNgkSZs+mBbX
zw|y(65$-k6^FLkC6eA47nIWGErEtU0Z3x3{@=-O!A@gdT5r-<7RX{r+`=wDhxC?c|
zkSSz=UJV&Bo@PEtg&5+JAE&{i1vtAR3eHOQ@0#JHm^;x!+Q8LZJph}^L~yJqoUgk*
zz-jN<JGjO9u7wv&K@m6?>0&b3pV7bJ-y*q?h-`K3M7?l9gc#K8h1w;!(0k>9fAGzV
ztf)<3wv;&p>ZggdO6aF$&rF9Y7x*r)qPFFG65xG{^UW0<kUDTyMfi<k6&@%?3}18@
zLe#y@pzgRYdTz<|ski~41Xs92B1Ruu32;WDM(~}Zi#cuaeVJ!Pz5EtfR$?ucVU0U5
zxk2#)m?3ZuE>^(Dz@LbwZf1r5GS~1OIluSOm4XN4J?;eYrPSeEyA-d2nS`+b(Os7J
z3AYWvb1@E~weVKD$kwuvm~ue|(#{(o=Bb==n9F<*O(9tnaSU@}hv`%V>aqH$tcFo>
znk|!L)NA?{K0m|mc`k|?E~fPYFGV7yjoJ>b{lxcaMfnT<4_P-P$cv!Kx^4adQp!b!
z5z;HQ@LzU0?F$wWkqBziN&g7e-~|!?nkK-K5*GTSxf1qXePwz^VH;u^@(6e{i!-tC
zGp|h^flX7h_s^dYu@vV!tUBsu%2aNY5eb2gXitMM*)?Pwlj`3=bSIMBz~0W{iz8j<
zEJ!O(k$WG_a0lW~5?Gktu!}*U<7RVYIVg%IU=Z!zY$gapLlfHFSGHaP<L^XLZNU9b
z=|mmp!7|vlv?@6|$Eq2wfL}HqR!yo%6ifwaq9|On1oARvYJLhG@Zw3B*a*TtNhI=P
zBdd9;zy#Oid`vFYq)1x-!d=<ZeH#4o$Cv*{b?XD;b}6S&#O4v-?rDAE>Sq4n1`QqT
zH+Rcc5K}KNdJNpGA5pBlz?KD_2s9l;o023~S)g3azx=yguOH-70X4iNxZ0Igxbuq*
zyuu9|yQfPOLdQBV;Vrku&(=(eE*89NVi(u-O27s&+zX;vxIQ*+e!W@?(Ae-3-|4kY
zZls`&Id3?%k#>+leT)>6Y@RQ^BpoDj3bHnfsv->S$U@y)sh0cc(m(2TJJ85!%2=D9
z6M=7uJCMs3U#?NoPQqh2!wskS_KH76r<5$KYQ3H@XFWQSdtg>gb!zlOj&<m#j~uR*
z1pX7|5zeo2NRYFU%oX2ko_L8~g3}oo5F0utcOVS6rh2m<#yaEy!pA!UQXx9J{=#+|
z8k*2GXGvQ`hx{>Ee1yBgWF*^8A;ks@@eMz*qMbh6q(soy4f3p)5TUg;gx?1lAJ6|Q
zQe$D&Gpwj@jB<S5aVf!fkFJGJv!eFF3A)UC3t$RXY$d6AzIL&FUxS>okWV`D-pWln
zlstAy6q}fM-y8!}Kl2-<Gi!881$uB+pu?W6T(IwxE+m4CFi}!lOs>g!ZAKVQ%*2BX
zoP`z|jej0VnkKEIjtl=7d4~y+1|gdfzwC-bEvvIf?MUGl;0#uK)2~d)3i$MO)S~bM
zBf`YpKGsscq%ja#Nv?giNba2HSGvlG6YoxV(R;C&gvVd9kZ3Sso;~1Vp7!0C2py|9
zqql@2t)2(~RS_0DoJ#)fS85DK#hFN(axi9sL1KxZd(XrLPB2)+Bg0ksBwqXdhH8IH
zYRsFe&UsV(co857;I@w}6TW=UWbB0q!8LL+%ZeA49ixl691Bwe2I`%|xe2x~B@i+;
zIR}NdpTYSFsj)5!NM+X17&Qz5G1cStW)pknOqUu#6n9<wgds@y0Snk1Zg2y{FwAZX
zH91Y5Z{<Vql`4HkpJ|UO9X`joxw%m~q-||)_wkV`lcz{%)`9!%lUl1#SA+t7>{ys9
zV~T_WdAkyq)E(Z0eec*d!F5*fS0?t*kG}(ElYVMOr@)a%UL;cebuRMmH$IMfpn>2e
z2&R8ST`&dWc%ut+izc}=#qdYE?wL~VIurp@gbeUR&Coa2?OUvosd=%^aU5$=d<ssK
zk)McagpW@g5JZmH$&bm&$)Z=~pi-!#6!ZV?XU;d&)2F&NGL4!bwB<J|H6il&&;R_b
z_ia#Q*?KRTqH!-@E5{UF%)0cQN=PJklT8G7^z)mPl8omG0yGoX;UxJ+T~kw+#B+LC
zS=sU5wN~gYg+G5rX=rNd-eq+q$Qe7AeSM38ENzfTDJHsd?Jq`bVFLU767zYwC_<q^
zr?|i0cLc)%qo=1w**W5#;2ONlEGQ@_PTSkI*%@$ik~H>YKWaM7)LPETH5dj;V+_o@
zL<*4wzzS)*%9a7VjD&;~59PK}{M7qj<KS#=Ztj8f;)MXZU)wuZXEXW0sFX3a(eDkO
z*u*9!6|NQY12to9FFq-$zjTvxyptqcD|nDBo@>{~r|$M`>vwRNUQk&?{ODEA;OxoQ
zC?TzFeL)lOR4_-wz##VlkD>Da<PdT@tZ4eo0IG;m0X{rqjSTR?PTKBvv$Ks*Gg4B*
zH#Rmlk9#z2B-8PKfC>sZamGy^3_x5Qmls*x9P`vpI5QpH9|3_iUyDn+SKT0!t~_1q
zcsN~7E>=M>RmEy#Jn(Ft{>rF2QBmP^Avo%PJDc~c^}EgIRO0UcqQn^qX%5sqA{KRv
z`vzv*nP_lyx2@#QO2$93(Xp^7Z>FSQlW3JXhzwpX+T_J2Bqp9>MCLS*w8n7`3=XQ0
z@K`Iw3Xls<SD8xKHY`n7{L-|MPRIGNva*5+isR;8=@GC?g;qA-S_P^WB4fFX(z3Fy
zm#tWi$~)0hFkt$iW~-~^^ZV<#&)qu*J{ZaeMa4=hQ%c}JMx_xL_*iec_m?!ZN*-`h
zRy+Bym<ffNNWr3AI`4j1cSGPJ&kn^{)()3o81;N47@tYNGYlQ?D#9&>64XJJ>Ta4o
zN>wuJ;{kf<-$YK^FSFVNe6Eg{iEwamwhi8POoXd&D1kk7)6<ofx^I{5hH+b4AGNf#
zcj|TgbJ70OSXsbNm*&mSRG=K(_y5ls0JWVBaCPR@@|YwXG%6$02oBXz4bFsc9deKW
zCdyWC1iC49(mI9G=Ii|{(0mD_?*F$x-M2jOj_n<IBITP#N#!+piAo|njZy(qa2rU$
z!Bd}ALYUd(pF!JGH#IFScs8coi~Y7W&xu2$L<@mIIm<J&66Zr2D|2F0)GZG%@t@fI
ziwipTzmNYZLHC@LBOS5b{rv9WXfK+!k)DvjI7j{DXJljyTB^6(Gn`q)!69VTQ)>qg
zMW06hY#CzoQNC@pb9B)to5$0wFql6oN(0>+d@8D!#;Us$)Hy2y21ZBz<sO2!I!1!t
zN5nBPq~e#W)^#)z5>&B-Y%HwI%)e~q2}M|m)yvk=_ixPNt`(J(0yDOoZ^09*NuY)n
z>+MU;t~~M<fr6ceEsn0oi*UsvVMBHG8gU7UkPmnY&uE_N=I#-4g$G}=vhEY6ZI6&4
q1Ox=BJ9~Q^;O*}gVC`PKk0DS~mciXHmum1pI-nq{B2)R!EbM;<{5yaE

diff --git a/doc/logo.svg b/doc/logo.svg
index 9783869c9c..82094ad4ea 100644
--- a/doc/logo.svg
+++ b/doc/logo.svg
@@ -9,139 +9,172 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.4 r9939"
+   width="640"
+   height="640"
+   xml:space="preserve"
+   sodipodi:docname="logo.svg"
    inkscape:export-filename="/home/marijn/src/js/codemirror/doc/logo.png"
-   inkscape:export-xdpi="27.450405"
-   inkscape:export-ydpi="27.450405"
-   sodipodi:docname="logo.svg">
-  <defs
-     id="defs4">
-    <clipPath
+   inkscape:export-xdpi="16.601332"
+   inkscape:export-ydpi="16.601332"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
        clipPathUnits="userSpaceOnUse"
-       id="clipPath4138">
-      <path
-         transform="matrix(1.05,0,0,1,-290.76164,27.927128)"
-         d="m 705.08647,231.61324 a 70.710678,104.55079 0 1 1 -141.42135,0 70.710678,104.55079 0 1 1 141.42135,0 z"
-         sodipodi:ry="104.55079"
-         sodipodi:rx="70.710678"
-         sodipodi:cy="231.61324"
-         sodipodi:cx="634.37579"
-         id="path4140"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
+       id="clipPath16"><path
+         d="M 0,512 512,512 512,0 0,0 0,512 z"
+         id="path18" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath40"><path
+         d="m 435.607,369.899 31.242,0 0,-64.782 -31.242,0 0,64.782 z"
+         id="path42" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath56"><path
+         d="m 421.796,349.477 39.074,0 0,-88.423 -39.074,0 0,88.423 z"
+         id="path58" /></clipPath></defs><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="291.72812"
-     inkscape:cy="789.2497"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
      inkscape:window-width="1600"
      inkscape:window-height="875"
+     id="namedview4"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.52149125"
+     inkscape:cx="299.73684"
+     inkscape:cy="574.48012"
      inkscape:window-x="0"
      inkscape:window-y="25"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10" /><g
+     id="g10"
      inkscape:groupmode="layer"
-     id="layer1">
-    <text
-       xml:space="preserve"
-       style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#a21313;fill-opacity:1;stroke:none;font-family:Ubuntu Mono;-inkscape-font-specification:Ubuntu Mono"
-       x="247.48738"
-       y="163.42795"
-       id="text4006"
-       sodipodi:linespacing="125%"
-       clip-path="url(#clipPath4138)"
-       transform="translate(0.50507287,0.50507595)"><tspan
-         sodipodi:role="line"
-         id="tspan4008"
-         x="247.48738"
-         y="163.42795">    if (unit == &quot;char&quot;) moveOnce();</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="182.17795"
-         id="tspan4010">    else if (unit == &quot;column&quot;) moveOnce(true);</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="200.92795"
-         id="tspan4012">    else if (unit == &quot;word&quot; || unit == &quot;group&quot;) {</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="219.67795"
-         id="tspan4014">      var sawType = null, group = unit == &quot;group&quot;;</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="238.42795"
-         id="tspan4016">      for (var first = true;; first = false) {</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="257.17795"
-         id="tspan4018">        if (dir &lt; 0 &amp;&amp; !moveOnce(!first)) break;</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="275.92795"
-         id="tspan4020">        var cur = lineObj.text.charAt(ch) || &quot;\n&quot;;</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="294.67795"
-         id="tspan4022">        var type = isWordChar(cur) ? &quot;w&quot;</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="313.42795"
-         id="tspan4024">          : !group ? null</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="332.17795"
-         id="tspan4026">          : /\s/.test(cur) ? null</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="350.92795"
-         id="tspan4028">          : &quot;p&quot;; // punctuation</tspan><tspan
-         sodipodi:role="line"
-         x="247.48738"
-         y="369.67795"
-         id="tspan4046">        if (sawType &amp;&amp; sawType</tspan></text>
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 374.84375 136.8125 C 371.96854 136.71001 368.64305 137.97919 365.15625 142.03125 C 361.97051 140.84608 359.22347 140.35622 356.84375 140.375 C 346.53162 140.4564 343.3125 149.71875 343.3125 149.71875 C 326.2234 146.67934 325.625 162.59375 325.625 162.59375 C 309.43195 163.37101 312.4375 177.375 312.4375 177.375 C 295.67899 180.15651 301.1875 194 301.1875 194 C 284.10838 199.04575 293.4375 212.46875 293.4375 212.46875 C 293.4375 212.46875 277.68174 220.31271 288.1875 232.25 C 288.1875 232.25 273.81776 243.63282 285.90625 253.34375 C 285.90625 253.34375 271.57897 263.97487 286.40625 275.03125 C 286.40625 275.03125 273.84147 285.48036 289.96875 295.3125 C 289.96875 295.3125 278.92374 306.07108 295.59375 314.65625 C 295.59375 314.65625 287.70844 329.01862 305.96875 335.125 C 305.96875 335.125 300.47495 348.88874 319.09375 351.46875 C 319.09375 351.46875 315.90162 357.19564 321.59375 361.15625 C 321.59375 361.15625 310.04416 364.78661 312.5625 374.40625 C 313.83361 379.26171 316.82684 380.49158 323.53125 380.1875 C 323.53125 380.1875 329.096 395.54812 350.46875 398.96875 L 353.125 402.59375 C 353.125 402.59375 342.80592 409.64088 359.125 421.5 C 359.125 421.5 354.16126 425.74314 363.28125 433.34375 C 363.28125 433.34375 357.54117 438.3362 365.75 442.625 C 365.75 442.625 361.35822 445.96166 366.09375 448.125 C 366.09375 448.125 370.88293 490.18262 355.40625 534.4375 C 355.40625 534.4375 341.28721 542.04782 350.1875 556.96875 C 350.1875 556.96875 331.59675 562.24093 345.09375 575.53125 C 345.09375 575.53125 342.0547 585.56155 349.375 585.78125 C 349.375 585.78125 346.16048 592.54552 354.4375 594.5625 C 354.4375 594.5625 353.17883 603.88113 364.09375 602.1875 C 369.44813 608.40994 378.92733 608.70518 385.21875 602.34375 C 396.13361 604.03738 394.875 594.71875 394.875 594.71875 C 403.15197 592.70177 399.9375 585.9375 399.9375 585.9375 C 407.25781 585.7178 404.21875 575.6875 404.21875 575.6875 C 417.71573 562.39718 399.125 557.09375 399.125 557.09375 C 408.0253 542.17282 393.90625 534.5625 393.90625 534.5625 C 378.42953 490.30762 383.21875 448.28125 383.21875 448.28125 C 387.95421 446.11791 383.5625 442.78125 383.5625 442.78125 C 391.77129 438.49245 386.03125 433.5 386.03125 433.5 C 395.15125 425.89939 390.1875 421.65625 390.1875 421.65625 C 406.5066 409.79713 396.1875 402.75 396.1875 402.75 L 398.84375 399.125 C 420.21649 395.70437 425.78125 380.34375 425.78125 380.34375 C 432.48566 380.64783 435.47889 379.41796 436.75 374.5625 C 439.26834 364.94286 427.75 361.3125 427.75 361.3125 C 433.44213 357.35188 430.21875 351.59375 430.21875 351.59375 C 448.83755 349.01373 443.34375 335.28125 443.34375 335.28125 C 461.60406 329.17487 453.71875 314.78125 453.71875 314.78125 C 470.38876 306.19608 459.34375 295.46875 459.34375 295.46875 C 475.47103 285.63661 462.90625 275.1875 462.90625 275.1875 C 477.73353 264.13112 463.40625 253.5 463.40625 253.5 C 475.49474 243.78907 461.15625 232.375 461.15625 232.375 C 471.66201 220.43771 455.875 212.625 455.875 212.625 C 455.875 212.625 465.20411 199.202 448.125 194.15625 C 448.125 194.15625 453.66476 180.31276 436.90625 177.53125 C 436.90625 177.53125 439.88054 163.52726 423.6875 162.75 C 423.6875 162.75 423.0891 146.8356 406 149.875 C 406 149.875 401.14687 135.83532 384.15625 142.15625 C 384.15625 142.15625 380.33279 137.00815 374.84375 136.8125 z M 375.34375 155 C 416.3488 155 449.59375 201.78944 449.59375 259.53125 C 449.59375 317.27306 416.3488 364.09375 375.34375 364.09375 C 334.3387 364.09375 301.09375 317.27306 301.09375 259.53125 C 301.09375 201.78944 334.3387 155 375.34375 155 z "
-       id="rect3058" />
-    <text
-       sodipodi:linespacing="125%"
-       id="text4207"
-       y="491.91403"
-       x="149.69542"
-       style="font-size:95px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#a21313;fill-opacity:1;stroke:none;font-family:Source Sans;-inkscape-font-specification:Source Sans"
-       xml:space="preserve"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         y="491.91403"
-         x="149.69542"
-         id="tspan4209"
-         sodipodi:role="line">Code  Mirror</tspan></text>
-  </g>
-</svg>
+     inkscape:label="2014-10_codeMirror_logo_vectors"
+     transform="matrix(1.25,0,0,-1.25,0,640)"><path
+       inkscape:connector-curvature="0"
+       id="path22"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 242.52213,467.0015 c 0,0 14.504,-15.146 -2,-30 -40,-36 -140,-34 -189,-102 -30,-47 -76,-183 71,-273 66,-34 94,-33 94,-33 0,0 -44,31 -16,52 28,21 69,31 80,60 13,-10 34,-31 54,-29 -2,13 -7,18 9,20 16,2 24,2 24,2 0,0 -15,12 -32,13 -17,1 -49,34 -48,48 21,12 48,32 64,26 16,-6 32,-16 35,-25 0,-6 -3,-16 10,-8 13,8 10,13 15,24 5,11 6,13 -5,22 -11,9 -37,30 -58,24 -21,-6 -65,-23 -87,-2 9,20 23,52 16,74 13,10 28,21 30,39 15,2 47,11 41,27 -6,16 -41,85 -106,71" /><path
+       inkscape:connector-curvature="0"
+       id="path26"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 441.52213,306.0015 c 11,29 29,78 12,80 -17,2 -36,-44 -41,-56 -5,-12 -25,-72 -14,-80 11,-8 43,56 43,56" /><path
+       inkscape:connector-curvature="0"
+       id="path30"
+       style="fill:#da687d;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 348.52213,384.0015 c 3.13,4.919 5.82086,0.64508 -7.67914,-0.35492 -13.5,-1 -29.62196,-5.18461 -32.38899,-11.04836 -5.19174,-11.00208 -6.93187,-38.09672 -26.43187,-44.09672 -1,-7 0,-23 27.5,-26 27.5,-3 28.5,15 44.5,14.5 16,-0.5 14.5,5.5 9,10 -5.5,4.5 -24.5,35 -24.5,45 0,10 6.5,6.5 10,12"
+       sodipodi:nodetypes="csscssssc" /><path
+       inkscape:connector-curvature="0"
+       id="path34"
+       style="fill:#da687d;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 103.02213,82.502 c 0,0 -8.5,22.5 16.5,34.5 25,12 47.5,2.5 52,-6 4.5,-8.5 -7.5,-42.5 -50.5,-43 -10.5,8.5 -18,14.5 -18,14.5" /><g
+       id="g38"
+       transform="translate(-21.47687,0)" /><g
+       id="g44"
+       transform="translate(-21.47687,0)"><g
+         style="opacity:0.69999701"
+         id="g46"
+         clip-path="url(#clipPath40)"><g
+           id="g48"
+           transform="translate(466.2583,369.8384)"><path
+             inkscape:connector-curvature="0"
+             id="path50"
+             style="fill:#da687d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             d="M 0,0 C 0.423,-1.569 0.298,-3.199 0.255,-4.838 0.213,-6.452 0.062,-8.15 -0.349,-9.801 c 0.106,-0.377 -0.082,-0.814 -0.018,-1.201 -0.41,-0.515 -0.194,-0.903 -0.284,-1.354 0.661,-0.674 1.522,-1.313 1.152,-2.162 -0.259,-0.596 -0.874,-0.706 -1.464,-0.995 -0.389,-1.403 -0.709,-3.099 -1.028,-4.649 -0.097,-0.476 -0.044,-1.051 -0.187,-1.485 -0.334,-1.01 -0.691,-1.978 -0.971,-3.09 -0.237,-0.945 0.034,-2.689 -1.063,-2.811 -0.423,-1.049 -0.663,-1.841 -1.165,-2.83 -0.286,-0.163 -0.452,0.106 -0.692,0.009 -0.305,-0.348 -0.294,-0.823 -0.577,-1.114 -0.222,-0.229 -0.503,-0.163 -0.665,-0.385 -0.363,-0.5 -0.266,-1.24 -0.523,-1.902 -0.468,-0.4 -0.862,-0.905 -1.147,-1.478 -0.588,-1.179 -0.698,-2.681 -1.591,-3.593 -0.28,-0.286 -0.761,-0.365 -1.011,-0.647 -0.238,-0.269 -0.455,-0.665 -0.689,-0.98 -0.338,-0.452 -0.669,-1.045 -0.972,-1.583 -1.004,-1.787 -2.383,-3.71 -3.301,-5.664 -0.173,-0.369 -0.199,-0.805 -0.364,-1.165 -0.381,-0.827 -0.943,-1.579 -1.257,-2.333 -0.516,-1.239 -1.31,-3.339 -2.538,-4.42 -0.149,-0.131 -0.473,-0.254 -0.606,-0.414 -0.179,-0.215 -0.136,-0.568 -0.32,-0.808 -0.086,-0.113 -0.4,-0.164 -0.537,-0.302 -0.208,-0.211 -0.306,-0.481 -0.479,-0.639 -0.426,-0.388 -1.015,-0.555 -1.381,-0.959 -0.277,-0.306 -0.397,-0.743 -0.692,-1.127 -0.318,-0.413 -0.761,-0.784 -1.09,-1.202 -0.994,-1.264 -1.38,-2.8 -2.702,-3.396 -0.393,-0.178 -0.88,-0.12 -1.291,-0.241 -0.374,0.344 -0.078,0.818 -0.163,1.164 -0.055,0.222 -0.285,0.382 -0.346,0.583 -0.143,0.474 -0.347,1.336 -0.34,1.878 0.007,0.538 0.305,0.971 0.375,1.612 0.061,0.549 -0.137,1.246 -0.177,1.856 -0.021,0.306 0.064,0.624 0.059,0.956 -0.008,0.533 -0.066,0.801 0.008,1.442 0.086,0.743 -0.074,1.462 -0.171,2.152 0.342,1.705 0.531,3.008 1.09,4.919 0.258,0.881 0.721,2.367 1.18,3.346 0.886,1.895 1.64,3.964 2.6,5.945 0.319,0.656 0.825,1.196 1.139,1.852 0.182,0.381 0.211,0.828 0.395,1.215 1.617,3.398 3.877,6.233 5.565,9.731 1.399,2.859 2.88,5.418 4.745,8.545 0.842,1.415 1.568,2.917 2.434,4.086 0.66,0.891 1.632,2.413 2.334,3.916 0.278,0.596 0.269,1.073 1.005,1.102 0.758,0.948 1.326,2.018 2.119,2.824 0.2,0.202 0.51,0.303 0.733,0.498 0.26,0.228 0.383,0.57 0.638,0.778 0.541,0.441 1.432,0.832 2.035,1.659 0.16,0.22 0.229,0.451 0.406,0.682 0.414,0.539 1.191,1.866 1.81,2.013 C -0.241,0.085 -0.126,0.061 0,0" /></g></g></g><g
+       id="g54"
+       transform="translate(-21.47687,0)" /><g
+       id="g60"
+       transform="translate(-21.47687,0)"><g
+         style="opacity:0.69999701"
+         id="g62"
+         clip-path="url(#clipPath56)"><g
+           id="g64"
+           transform="translate(459.8965,349.4487)"><path
+             inkscape:connector-curvature="0"
+             id="path66"
+             style="fill:#da687d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             d="m 0,0 c 0.688,-1.936 0.765,-4.106 0.935,-6.266 -0.019,-2.14 -0.168,-4.579 -0.715,-6.943 0.098,-0.492 -0.155,-1.108 -0.109,-1.623 -0.519,-0.752 -0.295,-1.25 -0.438,-1.876 0.718,-0.835 1.666,-1.609 1.155,-2.836 -0.37,-0.846 -1.118,-1.037 -1.845,-1.479 -0.64,-1.905 -1.226,-4.263 -1.846,-6.305 -0.187,-0.635 -0.212,-1.395 -0.447,-1.977 -0.547,-1.362 -1.111,-2.656 -1.597,-4.101 -0.416,-1.238 -0.356,-3.498 -1.652,-3.689 -0.61,-1.355 -0.978,-2.373 -1.674,-3.651 -0.35,-0.217 -0.512,0.119 -0.801,-0.013 -0.392,-0.456 -0.442,-1.063 -0.795,-1.445 -0.269,-0.298 -0.585,-0.226 -0.785,-0.514 -0.449,-0.651 -0.386,-1.58 -0.723,-2.425 -0.282,-0.266 -0.546,-0.564 -0.784,-0.888 -0.119,-0.162 -0.233,-0.33 -0.337,-0.505 l -0.153,-0.266 -0.072,-0.136 -0.034,-0.069 -0.003,-0.004 0,-10e-4 c 0.099,0.238 0.028,0.066 0.05,0.119 l -10e-4,-0.002 -0.001,-10e-4 -0.004,-0.01 -0.008,-0.019 -0.016,-0.037 c -0.697,-1.635 -0.851,-3.63 -1.895,-4.955 -0.335,-0.421 -0.872,-0.577 -1.142,-0.971 -0.259,-0.375 -0.491,-0.912 -0.746,-1.347 -0.366,-0.625 -0.722,-1.432 -1.046,-2.164 -1.085,-2.456 -2.571,-5.274 -3.572,-8.03 -0.188,-0.523 -0.205,-1.106 -0.385,-1.617 -0.422,-1.173 -1.022,-2.273 -1.394,-3.342 -0.626,-1.753 -1.474,-4.727 -3.01,-6.377 -0.182,-0.2 -0.567,-0.415 -0.732,-0.65 -0.22,-0.315 -0.191,-0.786 -0.42,-1.137 -0.106,-0.164 -0.475,-0.275 -0.642,-0.48 -0.254,-0.313 -0.383,-0.69 -0.594,-0.926 -0.503,-0.581 -1.23,-0.865 -1.714,-1.438 -0.365,-0.435 -0.562,-1.029 -0.958,-1.568 -0.426,-0.578 -0.991,-1.104 -1.428,-1.683 -0.65,-0.928 -1.251,-1.786 -1.828,-2.608 -0.592,-0.813 -1.215,-1.514 -2.047,-1.884 -0.495,-0.219 -1.042,-0.12 -1.539,-0.256 -0.353,0.473 0.086,1.071 0.061,1.524 -0.018,0.288 -0.25,0.504 -0.28,0.766 -0.07,0.615 -0.141,1.712 -0.035,2.387 0.099,0.676 0.548,1.191 0.712,2.005 0.125,0.708 -0.034,1.591 -0.025,2.359 0.004,0.387 0.13,0.791 0.153,1.206 0.038,0.668 -0.008,0.999 0.13,1.795 0.163,0.922 -0.034,1.854 -0.121,2.709 0.426,2.191 0.686,3.806 1.265,6.362 0.273,1.176 0.786,3.104 1.265,4.488 0.472,1.315 0.904,2.681 1.347,4.063 0.445,1.4 0.906,2.841 1.424,4.249 0.347,0.939 0.896,1.734 1.274,2.728 0.213,0.565 0.249,1.192 0.465,1.767 0.475,1.25 0.99,2.514 1.541,3.656 0.553,1.123 1.13,2.228 1.711,3.336 l 0.938,1.807 c 0.326,0.58 0.653,1.161 0.981,1.745 0.649,1.172 1.283,2.367 1.886,3.609 1.027,1.966 2.073,3.828 3.188,5.725 1.116,1.844 2.324,3.757 3.629,5.817 1.158,1.853 2.248,3.825 3.357,5.355 0.827,1.167 2.173,3.163 3.042,5.126 0.342,0.78 0.349,1.38 1.197,1.482 0.907,1.274 1.649,2.697 2.452,3.773 0.214,0.276 0.563,0.445 0.808,0.722 0.286,0.323 0.408,0.762 0.693,1.065 0.582,0.653 1.672,1.277 2.21,2.569 0.151,0.332 0.198,0.653 0.368,1.006 0.397,0.822 1.098,2.779 1.78,3.145 C -0.284,0.044 -0.151,0.044 0,0" /></g></g></g><path
+       inkscape:connector-curvature="0"
+       id="path70"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 416.68863,327.0015 c 0,0 -8,-30.667 -4.667,-56 0.667,8 4.667,56 4.667,56" /><path
+       inkscape:connector-curvature="0"
+       id="path74"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 426.18913,347.7256 c -0.61,2.147 -4.597,-59.478 -3.432,-61.636 1.166,-2.159 7.147,48.575 3.432,61.636" /><path
+       inkscape:connector-curvature="0"
+       id="path78"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 235.24913,465.60369 c 0,0 4.667,-26.6198 -38.667,-40.6198 -43.333,-14 -103.0605,-25.98239 -147.0605,-78.64939 -44.0000004,-52.666 -52.0000004,-139.999 -22,-197.333 30,-57.333 103.333,-128.667 235.333,-128.667 132,0 236.85312,101.50582 236.85312,171.50582 0,36.667 -20.1469,28.4918 -27.11433,-5.90828 C 466.30468,154.88286 408.18863,39.0015 262.18863,39.0015 c -146,0 -220.667,88.667 -230,164.667 -9.334,76 11.898969,141.46925 88.56597,180.80225 76.667,39.334 125.32039,23.66435 114.65339,80.99735"
+       sodipodi:nodetypes="cssssssscsc" /><path
+       inkscape:connector-curvature="0"
+       id="path82"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 198.85713,260.335 c 0,0 -8.667,-40.001 -50.667,-59.333 -42,-19.334 -60,-30 -66,-63.334 16,26.666 62.667,32 88.667,58 26,26 28,64.667 28,64.667" /><path
+       inkscape:connector-curvature="0"
+       id="path86"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 210.19013,353.0015 c 0,0 36,-46.667 78.667,-24 42.666,22.667 20.667,75.333 20,78.667 -0.667,3.333 4.666,-58.667 -27.334,-69.334 -32,-10.666 -71.333,14.667 -71.333,14.667" /><path
+       inkscape:connector-curvature="0"
+       id="path90"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 116.18913,74.3359 c 0,0 22.666,-1.334 39.333,17.332 16.667,18.668 7.334,48 34.667,58.668 27.333,10.666 46,4 46,4 0,0 -48.667,-6.668 -52.667,-34.668 -4,-28 -10.666,-40.666 -21.333,-49.332 -10.667,-8.668 -24.667,-10 -24.667,-10 l -21.333,14 z" /><path
+       inkscape:connector-curvature="0"
+       id="path94"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 219.02213,219.502 c 0,0 40.523,6.783 59,48 15.167,33.833 5,63 5,63 l -20.5,-3 c 0,0 8.5,-24.5 2,-46.5 -6.5,-22 -21.5,-47.5 -45.5,-61.5" /><path
+       inkscape:connector-curvature="0"
+       id="path98"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 437.13303,313.1621 c -14.461,-36.13 -35.773,-62.068 -38.265,-60.674 -4.494,2.513 -0.358,34.036 14.104,70.166 14.46,36.13 32.432,63.635 39.104,61.014 6.672,-2.621 -0.483,-34.376 -14.943,-70.506 m 20.999,72.506 c -16.442,8.934 -36.644,-24.449 -53.276,-63.334 -16.633,-38.885 -18.542,-70.229 -5.759,-75.836 17.092,-7.496 33.127,22.285 49.759,61.17 16.632,38.885 24,70 9.276,78" /><path
+       inkscape:connector-curvature="0"
+       id="path102"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 159.52163,189.668 c 0,0 10.331,-31.037 62,-24.666 48.667,6 69.59,24.744 99.333,43.334 21.334,13.332 20,7.332 22.667,6.666 2.667,-0.666 14.667,-8 27.333,-6.666 0.667,-6.668 -5.999,-1.334 -8.666,-7.334 -1.333,-4 10.12,-22.824 26.666,-20 27.334,4.666 19.667,16 25.001,28.666 5.333,12.666 9,19.334 -17.667,37.334 -20.667,18.666 -32,13.999 -42,13.999 -10,0 -36,-13.999 -54,-10.666 -18,3.333 -29.334,10 -29.334,10 l -11.999,-13.333 c 0,0 21.999,-16.666 47.333,-10.666 25.333,6 44.001,25.332 66.001,15.332 22,-10 26.282,-16.701 32.999,-21.666 7.667,-5.668 8.333,-11.666 3,-17 -5.334,-5.334 0.001,-9.334 -3.332,-15.334 -3.334,-6 -20,-8.666 -20,-8.666 0,0 18.273,23.477 -4,25.332 -16,1.334 -26,22.668 -48.667,11.334 -32.55,-16.277 -78.668,-44 -110.668,-47.332 -31.193,-3.248 -42.667,6.666 -50.667,25.332 -9.333,-8 -11.333,-14 -11.333,-14" /><path
+       inkscape:connector-curvature="0"
+       id="path106"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 274.18863,183.002 c 0,0 22.667,-12 16,-38 -6.667,-26 -36.667,-44 -56,-52.668 -19.333,-8.666 -33.743,-20.127 -19.333,-27.332 12,-6 18.667,9.334 36,12 17.333,2.666 32.667,-4 34,-14 -7.334,4 -12.667,4 -12.667,4 0,0 6,-4 6.667,-10.668 0.666,-6.666 -0.667,-3.332 -4.667,-3.332 -10,0 -11.333,8.666 -20,7.332 -22,-2 -23.333,-11.334 -35.333,-12.666 -12,-1.334 -32,5.334 -29.334,20.666 2.667,15.334 23.334,26 42.667,34 19.333,8 48.667,33.334 44.667,56 -4,22.668 -21.334,18 -21.334,18 l 18.667,6.668 z" /><path
+       inkscape:connector-curvature="0"
+       id="path110"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 331.02213,371.7515 c 0,0 9.5,-4.75 15.5,-28.75 4,-8.667 9.333,-15.667 14,-17.667 4.667,-2 -2,-4 -5.333,-3.333 -3.334,0.667 -10.334,3.667 -15,-0.333 -4.667,-4 -16,-14.667 -32,-12 -16,2.666 -29.667,12.833 -29.667,12.833 0,0 6,-26.5 41.667,-24.833 24.721,1.155 19.333,14 36,16.666 16.666,2.667 14.893,11.089 11.333,18 -5.667,11 -23.333,13.667 -25.333,45.834 -2,3.333 -14.5,-0.417 -11.167,-6.417" /><path
+       inkscape:connector-curvature="0"
+       id="path114"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 388.01383,204.4707 c 1.506,-1.477 -11.825,-31.469 -11.825,-31.469 0,0 -2.667,-7.334 -9.814,-4.75 -7.311,2.645 -5.413,7.948 -5.413,7.948 l 17.026,30.837 c 0,0 9.353,-1.906 10.026,-2.566" /><path
+       inkscape:connector-curvature="0"
+       id="path118"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 406.74623,247.168 c -0.667,-2 -3.333,-10 -3.333,-10 l -10.891,8.334 2.891,6.332 11.333,-4.666 z" /><path
+       inkscape:connector-curvature="0"
+       id="path122"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 284.85563,189.002 c -2,-7.334 23.333,-50.002 40.667,-47.334 17.333,2.666 19.999,-2.668 14.666,-6 -5.333,-3.334 -14.666,-4.668 -13.333,-9.334 1.333,-4.666 5,-9.334 -3.667,-8 -8.666,1.334 -26.333,10.668 -37,28.668 -3.333,-10.668 -4.666,-14 -4.666,-14 0,0 34,-35.334 68.666,-20.668 -6,4.668 -22.666,3.334 -8.666,11.334 14,8 24.666,10.666 31.333,-2 3.333,0.666 3.333,30 -40.667,28 -15.333,2 -36,32 -36,47.334 -4,-4 -9.333,-0.666 -11.333,-8" /><path
+       inkscape:connector-curvature="0"
+       id="path126"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 420.44553,336.5015 c 0,0 -8.75,-26.286 -5.104,-48 0.729,6.857 5.104,48 5.104,48" /><path
+       inkscape:connector-curvature="0"
+       id="path130"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 429.40543,352.0503 c -0.444,1.66 -4.07,-45.761 -3.203,-47.435 0.868,-1.673 5.909,37.339 3.203,47.435" /><path
+       inkscape:connector-curvature="0"
+       id="path134"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 312.85513,378.335 c 0,0 37.667,3.333 31,18.333 -20.105,45.239 -58.333,71.667 -129,69 40,16 74.00021,14.00025 106.667,-14 16.33311,-13.99988 23.89324,-31.04069 29.74979,-44.08296 9.34044,-20.80074 6.58914,-22.74696 -3.74979,-28.58304 -12.56847,-7.0946 -34.191,-2.57 -34.667,-0.667"
+       sodipodi:nodetypes="cccsssc" /><path
+       inkscape:connector-curvature="0"
+       id="path138"
+       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 316.7084,372.58242 c 0,0 10.36415,-7.13802 18.50215,-1.32602 3.74086,3.84884 6.23323,5.95026 -4.37137,5.51213 l -12.90479,0.52875 c -8.94116,1.82452 -8.7647,-0.93753 -1.22599,-4.71486 z"
+       sodipodi:nodetypes="ccccc" /></g></svg>
\ No newline at end of file
diff --git a/doc/manual.html b/doc/manual.html
index f89cc4b3fd..db0e24fb54 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -24,7 +24,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="#overview" class=active data-default="true">Manual</a></li>
diff --git a/doc/realworld.html b/doc/realworld.html
index 3f46d236cc..362408f72b 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/releases.html b/doc/releases.html
index 91c8ac9099..7bffb2690f 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -6,7 +6,7 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/reporting.html b/doc/reporting.html
index 9a8a63fe81..3c582d9618 100644
--- a/doc/reporting.html
+++ b/doc/reporting.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
index d718a9ee9a..3948ce6e56 100644
--- a/doc/upgrade_v2.2.html
+++ b/doc/upgrade_v2.2.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/upgrade_v3.html b/doc/upgrade_v3.html
index 94d1197289..5f94067aa0 100644
--- a/doc/upgrade_v3.html
+++ b/doc/upgrade_v3.html
@@ -14,7 +14,7 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index 9f1d79ab7c..09df00ca1b 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -6,7 +6,7 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/index.html b/index.html
index cf9f943ac5..6e49c2359b 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="doc/logo.png"></a>
 
   <ul>
     <li><a class=active data-default="true" href="#description">Home</a>
diff --git a/mode/apl/index.html b/mode/apl/index.html
index 5842c9b7f3..53dda6b586 100644
--- a/mode/apl/index.html
+++ b/mode/apl/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/asterisk/index.html b/mode/asterisk/index.html
index 1576e5a6e3..257bd39875 100644
--- a/mode/asterisk/index.html
+++ b/mode/asterisk/index.html
@@ -12,7 +12,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 5fb5f2cd17..17d93a07cd 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -12,7 +12,7 @@
 <script src="clike.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/clike/scala.html b/mode/clike/scala.html
index 9ffcc67924..aa04cf0f04 100644
--- a/mode/clike/scala.html
+++ b/mode/clike/scala.html
@@ -10,7 +10,7 @@
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="clike.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index fb284b17b0..3ecf4c4862 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -9,7 +9,7 @@
 <script src="clojure.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/cobol/index.html b/mode/cobol/index.html
index 72a5faf462..4352419a0c 100644
--- a/mode/cobol/index.html
+++ b/mode/cobol/index.html
@@ -39,7 +39,7 @@
         .CodeMirror-activeline-background {background: #555555 !important;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/coffeescript/index.html b/mode/coffeescript/index.html
index 329f8651e4..93a5f4f309 100644
--- a/mode/coffeescript/index.html
+++ b/mode/coffeescript/index.html
@@ -9,7 +9,7 @@
 <script src="coffeescript.js"></script>
 <style>.CodeMirror {border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/commonlisp/index.html b/mode/commonlisp/index.html
index 811edfe35f..f2bf4522d6 100644
--- a/mode/commonlisp/index.html
+++ b/mode/commonlisp/index.html
@@ -9,7 +9,7 @@
 <script src="commonlisp.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/index.html b/mode/css/index.html
index bdba892288..3d2c127d25 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -9,7 +9,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/less.html b/mode/css/less.html
index ea9b4f3d99..6ccb721e63 100644
--- a/mode/css/less.html
+++ b/mode/css/less.html
@@ -10,7 +10,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/scss.html b/mode/css/scss.html
index bcd9f120af..21f20e0d16 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -9,7 +9,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/cypher/index.html b/mode/cypher/index.html
index cbf1e85d1b..b8bd75c8b3 100644
--- a/mode/cypher/index.html
+++ b/mode/cypher/index.html
@@ -15,7 +15,7 @@
 }
         </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/d/index.html b/mode/d/index.html
index 9054b7f35b..08cabd8a2e 100644
--- a/mode/d/index.html
+++ b/mode/d/index.html
@@ -10,7 +10,7 @@
 <script src="d.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/diff/index.html b/mode/diff/index.html
index e897ccd83b..0af611fa48 100644
--- a/mode/diff/index.html
+++ b/mode/diff/index.html
@@ -15,7 +15,7 @@
       span.cm-error.cm-tag { background-color: #2b2; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/django/index.html b/mode/django/index.html
index 7942e348d0..79d9a6a04b 100644
--- a/mode/django/index.html
+++ b/mode/django/index.html
@@ -12,7 +12,7 @@
 <script src="django.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dtd/index.html b/mode/dtd/index.html
index 0a27cdbdbb..e6798a748a 100644
--- a/mode/dtd/index.html
+++ b/mode/dtd/index.html
@@ -9,7 +9,7 @@
 <script src="dtd.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dylan/index.html b/mode/dylan/index.html
index fec90c654e..ddf5ad067d 100644
--- a/mode/dylan/index.html
+++ b/mode/dylan/index.html
@@ -12,7 +12,7 @@
 <script src="dylan.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/ecl/index.html b/mode/ecl/index.html
index 0be5a3d01a..2306860dcb 100644
--- a/mode/ecl/index.html
+++ b/mode/ecl/index.html
@@ -9,7 +9,7 @@
 <script src="ecl.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/eiffel/index.html b/mode/eiffel/index.html
index 346fed9e42..108a71bec8 100644
--- a/mode/eiffel/index.html
+++ b/mode/eiffel/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index a5b30ae576..6d06a890a2 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -11,7 +11,7 @@
 <script src="erlang.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/fortran/index.html b/mode/fortran/index.html
index fd72329701..102e8f8269 100644
--- a/mode/fortran/index.html
+++ b/mode/fortran/index.html
@@ -9,7 +9,7 @@
 <script src="fortran.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/gas/index.html b/mode/gas/index.html
index a4ab73f240..df75ca2db7 100644
--- a/mode/gas/index.html
+++ b/mode/gas/index.html
@@ -9,7 +9,7 @@
 <script src="gas.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index bd44fcbb9f..a35e56866c 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -16,7 +16,7 @@
 <script src="../clike/clike.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/gherkin/index.html b/mode/gherkin/index.html
index d8e307881f..af8184c981 100644
--- a/mode/gherkin/index.html
+++ b/mode/gherkin/index.html
@@ -9,7 +9,7 @@
 <script src="gherkin.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/go/index.html b/mode/go/index.html
index 074e6a0576..72e3b364c6 100644
--- a/mode/go/index.html
+++ b/mode/go/index.html
@@ -11,7 +11,7 @@
 <script src="go.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/groovy/index.html b/mode/groovy/index.html
index f6ab73fb8a..bb0df078c3 100644
--- a/mode/groovy/index.html
+++ b/mode/groovy/index.html
@@ -10,7 +10,7 @@
 <script src="groovy.js"></script>
 <style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haml/index.html b/mode/haml/index.html
index ac91c7eb7d..2894a938e8 100644
--- a/mode/haml/index.html
+++ b/mode/haml/index.html
@@ -13,7 +13,7 @@
 <script src="haml.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haskell/index.html b/mode/haskell/index.html
index 53bb7db347..42240b0f2f 100644
--- a/mode/haskell/index.html
+++ b/mode/haskell/index.html
@@ -11,7 +11,7 @@
 <script src="haskell.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haxe/index.html b/mode/haxe/index.html
index a064210087..d415b5e109 100644
--- a/mode/haxe/index.html
+++ b/mode/haxe/index.html
@@ -9,7 +9,7 @@
 <script src="haxe.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index 9ee73bc383..93d01c4512 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -13,7 +13,7 @@
 <script src="htmlembedded.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index d033624e6c..61630293f5 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -13,7 +13,7 @@
 <script src="htmlmixed.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/http/index.html b/mode/http/index.html
index cba8042372..0b8d5315da 100644
--- a/mode/http/index.html
+++ b/mode/http/index.html
@@ -9,7 +9,7 @@
 <script src="http.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/index.html b/mode/index.html
index bfbe447005..bb656d2a79 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/mode/jade/index.html b/mode/jade/index.html
index 7f7ca4a498..e534981b20 100644
--- a/mode/jade/index.html
+++ b/mode/jade/index.html
@@ -13,7 +13,7 @@
 <script src="jade.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 9dfac25339..592a133d85 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -12,7 +12,7 @@
 <script src="javascript.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/javascript/json-ld.html b/mode/javascript/json-ld.html
index 545e6dfa19..3a37f0bce6 100644
--- a/mode/javascript/json-ld.html
+++ b/mode/javascript/json-ld.html
@@ -12,7 +12,7 @@
 <script src="javascript.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"><img id=logo src="../../doc/logo.png"/></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"/></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index 0b30c5355d..2cfc5381fe 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -9,7 +9,7 @@
 <script src="javascript.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index d65c308d35..5a70e9153b 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -9,7 +9,7 @@
 <script src="jinja2.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/julia/index.html b/mode/julia/index.html
index 75bdab40b6..20e9e97456 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -9,7 +9,7 @@
 <script src="julia.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/kotlin/index.html b/mode/kotlin/index.html
index 67fd39c945..859e109fb8 100644
--- a/mode/kotlin/index.html
+++ b/mode/kotlin/index.html
@@ -9,7 +9,7 @@
 <script src="kotlin.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/livescript/index.html b/mode/livescript/index.html
index d1fb0f6f10..f415479876 100644
--- a/mode/livescript/index.html
+++ b/mode/livescript/index.html
@@ -10,7 +10,7 @@
 <script src="livescript.js"></script>
 <style>.CodeMirror {font-size: 80%;border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/lua/index.html b/mode/lua/index.html
index 324b59b86f..fc98b94468 100644
--- a/mode/lua/index.html
+++ b/mode/lua/index.html
@@ -11,7 +11,7 @@
 <script src="lua.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 7f0541518c..c3bb8df9a2 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -16,7 +16,7 @@
       .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mirc/index.html b/mode/mirc/index.html
index c6fbc31210..fd2f34e4ba 100644
--- a/mode/mirc/index.html
+++ b/mode/mirc/index.html
@@ -10,7 +10,7 @@
 <script src="mirc.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mllike/index.html b/mode/mllike/index.html
index ba0f1849bc..5923af8f87 100644
--- a/mode/mllike/index.html
+++ b/mode/mllike/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/modelica/index.html b/mode/modelica/index.html
index 94334e4890..408c3b17e3 100644
--- a/mode/modelica/index.html
+++ b/mode/modelica/index.html
@@ -12,7 +12,7 @@
 <script src="modelica.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index c63772da96..5ffdc081cc 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -21,7 +21,7 @@
     }
   </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index 210274fdc4..1355e7189e 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -13,7 +13,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 3d468b5231..79df581199 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -9,7 +9,7 @@
 <script src="octave.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/pascal/index.html b/mode/pascal/index.html
index c2f2ddadc1..f8a99ad01e 100644
--- a/mode/pascal/index.html
+++ b/mode/pascal/index.html
@@ -9,7 +9,7 @@
 <script src="pascal.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/pegjs/index.html b/mode/pegjs/index.html
index 0d894b1621..0c74604881 100644
--- a/mode/pegjs/index.html
+++ b/mode/pegjs/index.html
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id=nav>
-      <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+      <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/mode/perl/index.html b/mode/perl/index.html
index d531f2a094..8c1021c42b 100644
--- a/mode/perl/index.html
+++ b/mode/perl/index.html
@@ -9,7 +9,7 @@
 <script src="perl.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/php/index.html b/mode/php/index.html
index d7f949b135..adf6b1be22 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -15,7 +15,7 @@
 <script src="php.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/pig/index.html b/mode/pig/index.html
index ba94e95b5b..984c9a1837 100644
--- a/mode/pig/index.html
+++ b/mode/pig/index.html
@@ -9,7 +9,7 @@
 <script src="pig.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/properties/index.html b/mode/properties/index.html
index 345cadfa3a..f885302de2 100644
--- a/mode/properties/index.html
+++ b/mode/properties/index.html
@@ -9,7 +9,7 @@
 <script src="properties.js"></script>
 <style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/puppet/index.html b/mode/puppet/index.html
index d29b644894..5614c3695a 100644
--- a/mode/puppet/index.html
+++ b/mode/puppet/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/python/index.html b/mode/python/index.html
index 2e438f51f5..dcd7fe5a82 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -10,7 +10,7 @@
 <script src="python.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/q/index.html b/mode/q/index.html
index 42dee6f510..72785ba3bf 100644
--- a/mode/q/index.html
+++ b/mode/q/index.html
@@ -10,7 +10,7 @@
 <script src="q.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/r/index.html b/mode/r/index.html
index dae3dbd28a..6dd9634659 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -15,7 +15,7 @@
       .cm-s-default span.cm-arg-is { color: brown; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
index 6f0035f6fe..6e5031bd1f 100644
--- a/mode/rpm/changes/index.html
+++ b/mode/rpm/changes/index.html
@@ -11,7 +11,7 @@
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../../index.html">Home</a>
diff --git a/mode/rpm/index.html b/mode/rpm/index.html
index 03e0222985..9a34e6dfb8 100644
--- a/mode/rpm/index.html
+++ b/mode/rpm/index.html
@@ -11,7 +11,7 @@
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/rst/index.html b/mode/rst/index.html
index f6da0339be..2902dea231 100644
--- a/mode/rst/index.html
+++ b/mode/rst/index.html
@@ -10,7 +10,7 @@
 <script src="rst.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 21bd45b536..1197ab023f 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/rust/index.html b/mode/rust/index.html
index d74c0dc3f5..407e84f2cf 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -9,7 +9,7 @@
 <script src="rust.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sass/index.html b/mode/sass/index.html
index f7263b5e59..9f4a790221 100644
--- a/mode/sass/index.html
+++ b/mode/sass/index.html
@@ -10,7 +10,7 @@
 <script src="sass.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/scheme/index.html b/mode/scheme/index.html
index b2b72eda31..04d5c6a2a3 100644
--- a/mode/scheme/index.html
+++ b/mode/scheme/index.html
@@ -9,7 +9,7 @@
 <script src="scheme.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/shell/index.html b/mode/shell/index.html
index e3e79fdc9c..0b56300b12 100644
--- a/mode/shell/index.html
+++ b/mode/shell/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sieve/index.html b/mode/sieve/index.html
index 11908412b0..6f029b623e 100644
--- a/mode/sieve/index.html
+++ b/mode/sieve/index.html
@@ -9,7 +9,7 @@
 <script src="sieve.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/slim/index.html b/mode/slim/index.html
index 948ca0a44f..7fa4e50df3 100644
--- a/mode/slim/index.html
+++ b/mode/slim/index.html
@@ -20,7 +20,7 @@
 <script src="slim.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/smalltalk/index.html b/mode/smalltalk/index.html
index 67e0d6ef5f..2155ebc2a0 100644
--- a/mode/smalltalk/index.html
+++ b/mode/smalltalk/index.html
@@ -14,7 +14,7 @@
       .CodeMirror-gutter pre {color: white; font-weight: bold;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index 5ff1ff88da..8d88c9a302 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -9,7 +9,7 @@
 <script src="smarty.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/smartymixed/index.html b/mode/smartymixed/index.html
index a62bc37eea..3a216abb46 100644
--- a/mode/smartymixed/index.html
+++ b/mode/smartymixed/index.html
@@ -13,7 +13,7 @@
 <script src="../../mode/smarty/smarty.js"></script>
 <script src="../../mode/smartymixed/smartymixed.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/solr/index.html b/mode/solr/index.html
index 9539f4f2ec..4b18c25b78 100644
--- a/mode/solr/index.html
+++ b/mode/solr/index.html
@@ -18,7 +18,7 @@
   }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 9fa81ce864..6f24206b1e 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -10,7 +10,7 @@
 <script src="sparql.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sql/index.html b/mode/sql/index.html
index 9471b689fd..a0d8d9e1b9 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -17,7 +17,7 @@
 }
         </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/stex/index.html b/mode/stex/index.html
index caa008665b..14679da4f3 100644
--- a/mode/stex/index.html
+++ b/mode/stex/index.html
@@ -9,7 +9,7 @@
 <script src="stex.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tcl/index.html b/mode/tcl/index.html
index 709e10081e..ce4ad3423e 100644
--- a/mode/tcl/index.html
+++ b/mode/tcl/index.html
@@ -10,7 +10,7 @@
 <script src="tcl.js"></script>
 <script src="../../addon/scroll/scrollpastend.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/textile/index.html b/mode/textile/index.html
index ff13c810f0..42b156b1e2 100644
--- a/mode/textile/index.html
+++ b/mode/textile/index.html
@@ -9,7 +9,7 @@
 <script src="textile.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index 2620c1cd3c..77dd0457c1 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -11,7 +11,7 @@
 <script src="tiddlywiki.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tiki/index.html b/mode/tiki/index.html
index d6bfe069c0..091c5fb2a6 100644
--- a/mode/tiki/index.html
+++ b/mode/tiki/index.html
@@ -10,7 +10,7 @@
 <script src="tiki.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/toml/index.html b/mode/toml/index.html
index 7ec9df10a9..90a2a0215b 100644
--- a/mode/toml/index.html
+++ b/mode/toml/index.html
@@ -9,7 +9,7 @@
 <script src="toml.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tornado/index.html b/mode/tornado/index.html
index a813e9511f..8ee7ef56cc 100644
--- a/mode/tornado/index.html
+++ b/mode/tornado/index.html
@@ -12,7 +12,7 @@
 <script src="tornado.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/turtle/index.html b/mode/turtle/index.html
index 68e650a033..a4962b6174 100644
--- a/mode/turtle/index.html
+++ b/mode/turtle/index.html
@@ -9,7 +9,7 @@
 <script src="turtle.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vb/index.html b/mode/vb/index.html
index 31f136d381..adcc44fd39 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -15,7 +15,7 @@
       .CodeMirror pre { font-family: Inconsolata; font-size: 14px}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vbscript/index.html b/mode/vbscript/index.html
index 57940d798d..ad7532d7df 100644
--- a/mode/vbscript/index.html
+++ b/mode/vbscript/index.html
@@ -9,7 +9,7 @@
 <script src="vbscript.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index 8df6b5de03..2747878667 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -10,7 +10,7 @@
 <script src="velocity.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index f01c659aaf..96b3d64766 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -10,7 +10,7 @@
 <script src="verilog.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/xml/index.html b/mode/xml/index.html
index 2515f3f518..7149f06b2a 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -9,7 +9,7 @@
 <script src="xml.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/xquery/index.html b/mode/xquery/index.html
index 6f8b638892..7ac5aaeff4 100644
--- a/mode/xquery/index.html
+++ b/mode/xquery/index.html
@@ -15,7 +15,7 @@
 	}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/yaml/index.html b/mode/yaml/index.html
index f2f877e257..be9b632368 100644
--- a/mode/yaml/index.html
+++ b/mode/yaml/index.html
@@ -9,7 +9,7 @@
 <script src="yaml.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/z80/index.html b/mode/z80/index.html
index 666aa0e99d..1ad3ace046 100644
--- a/mode/z80/index.html
+++ b/mode/z80/index.html
@@ -9,7 +9,7 @@
 <script src="z80.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"><img id=logo src="../../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/test/index.html b/test/index.html
index e6428992c5..542be6fc5e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -47,7 +47,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><img id=logo src="../doc/logo.png"></a>
+  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>

From 5b3eedb2d36c37d57f0cc583ca6af738166773fb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 17 Oct 2014 00:31:50 +0200
Subject: [PATCH 1624/4742] Fix bad transparency in logo

---
 doc/logo.png | Bin 9730 -> 9709 bytes
 doc/logo.svg |   5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/logo.png b/doc/logo.png
index 2222a1300f71193977dfeb61ec3243f68ea53e52..bdfc75df7db0db8c5d9336dba3070a9c1618c950 100644
GIT binary patch
delta 9669
zcmW++Wmr_*7N)x-r9-;AyBp~qQo6ejDP7WC!Y2&^L$`!d(jC%`G(+C;&NIKy-e<49
z-dZPI^-Lut0GMAG2A;;h3P__Wb6AGv^Q0qaN~SO)Alx!D>ZVtN(2E&M!|yvYS^RVn
zq~hQ*RWeHF7}3JRiDDwhF<^(N#84C!>pk!8N2~{EbCkG$(iUG_kHg#E{}c%<YFPvY
zvQd}s*27Up9^w$p%SBV;PJ>Y3B55Vj;8GAmF<?^B0U9Y~2p(D|D`7muD7mu(2k^mN
zZMMfFIXn=MEXB~o=Q3EleWc(|MY+Pm-?M63&NuoHQDgC3sidRZQb&`q8uc6An>xW;
z`WQhBa)Wp6>FJrlV>{__cWO9UC?un-jOOp}Pr&C3%T&ls$q#@?t?ubx=V&uOE6s=V
zyKFQA^>Xoqnv+Lb%IbxpKe0D~DeTQR$)F%n2n13``YuS*u1PF4Jw08E)anlD)qxhv
z^zL$mr_8E!HAA0WKp>0q{&ln}g9UOqLTO6SPJ^h;N;o!?OI+z&VsZlON9_B_+9py*
zXLNJ3Xd^hF>2Po;sK<p(<}*gWIj0~|<p)|oMYZa#<)<}TefysPWPlh~t%@J#J%_h{
z8N)5jhYyhZae?JFf4l-=U-p7^O4ASmJUqPpmaqkwSKP5mrFk9mWE>jn#dFhAb-#J~
z<hqlfu2ZZ1sXPTKsW8ulWMPlcd54LcVZZJ~i5FGg$`#B$8>;5ur@MAtIvhz&e2NfY
z*FvwxNNMmhW&yC?$`qqfEwYe1P?Rg1R+Y$0lBgu<85(%r&Co}BCND4l{WL9Ej)~@C
zn)mFTYx9Nk^HHXDS`|}RSXd)9HMQ&O>(fQmhv40Bsj7jOa`kuK&>~QT*mV_t`Lg}c
zXj>YCWzz&{(-*0tf90jk)v5gyPsj$)mseDXr)OsBvD%?f`?>8#ba6V9NTbx>2R`1|
zpTDgJ2l)8-yi4_nT6Q4cyG^PJJNdUaZ!9!4l0PRWBHVm@ElNkv;=xaUceOR9E7bBx
z$Q9PW&Z@y7RXdtlaPyXpWR=tEVxgBt*nPzGy4SD)sMMb!kB?Z$G~d5}9|eB>VrHNH
z=KkUF{$gs2TE=b_>|C4RxK%85y4)1a(ffcasY&~WK=CbOk|oSh98ax^KD4mUKu+^~
z)?2LED+jvZ3?K<SV!xNv(a~9!cYqZV62c%Ap7Rmk>w-;@)>n;Hid}Hz&em$Pfxhz@
zy*Vo<lAWe-uYdgh&4olL0PBnOt%dj?wC;pa*|0x&wnDAzd0XWUx&Oc>{*zxV);Oj^
z2K0sJVdc#k>Wz<{V`5M&k+E$?O=a33`+1JeCX>It3uI8E56MjB10(8A)&i%xulzi|
z!=QOvYgf+)^xP>J;<j9=LyOPWhj0FV>mZ*9A78fj_2oVHE_(;CHZ!z`@l6dMAHN~+
zo;{0}Id0%bEZ)$rQW{JG+Al$KJ?G>`UWfF5XO3(G<C{6@7(A<%KrWEEv}Ex7{QOI=
zN50Kt4-FX*KIHG!*c6Y9j!w(XMH|(8)>VS8S=&b{Sv2Es>U#F8%^iEXTj8E$c~O_B
zGK<6WYFDWh0zmt0l7XVu@zY0wzG~<Rv5{q?K9e)rjN0*XyKPAhi}ThkMB!_=3-M*l
z&FOG+bEBX#`B!<LuL*7VKasPWcI+xXnxasDB|?l(A{Y7B(nkno$*zCvfA)r?XJ<cn
z%6WImmnzN6!!?DW9Ne6X1^k^E<Ct!?*LL;REmH)#odlYMypQoUH8sDQc0~H$gL+;c
zS-__+VbZ3^lJB<hwSc}ngd{R9OSkU79ggQD!n|(lE8dJTvE-$~Kj<mcpTS)L^YqhS
z9d5(kw2r%p-o5Kbp9K}ag~HCCmFl_w8MuH6x+z-D7jh3bdu<DiV1Pv+31Z(pM0{gU
zf5Zh`Db&`NFD9v@z~PuhY;X0Anq~6VpFTD2meKV{|K<N(+0`*m1AY2*UqErrhY52|
zPKO)DLcc2|IC%K#*=If}%K>T_c7~#@rHpC>I7O;ey^rQ#qkX?74YgUMCz4?P@nE3t
z-$P*@o{$9}Pv1iUgpiW5XumEb16m+pMWzp~Z!@*Rf#mJJ{;ks{P}Fs+?-gFS_@=u=
zD7ocmbR*ujT`MJi&O$|*yCXeuwbd0UYsIMKRdYPH;;bw9dyhKovffcbgkSvd;C6SK
zv(3$)S8Ia$+X@P06)>J*3<a~u*u>+#pkM+sGc%36E*Cf2BNSr895l&>=_~*#Bn-pR
zL${sc_+;b?FZxn5{k?gbz#|4Kn&CpRRPbi61b5h2o)6B#2c&WkITX{4kN8Db42h0}
zB!0w7QX^=HLTFtl^CADy<Cvf2&ciTD|K@J1F`W2KFQ7THC}CQ<ww?H@dZy-UYh!a0
z9CEBfXLTQPHTjAqe&>I?>I(D{WbwSm*hAAOtWwyA!4{!_Uh3@I1y+i;ksS(t&lhSI
zmUuN%fg>1Ai(6Fw%oiz=sDW>Uno>ypRt3V|RoVrwI=Yzrk0gXXCku(}6UJ$t<2?cd
z(&jBj1+831wMH$>`k__4vGlrucz!FFCao@};zk{jVG&6Fub5q-X#j)zm(2Y;(+jSR
z;Dhz>wdWwjE%0OFdS+)!$OrhC4)DN0&is)E6{vOD>D`q06RUmT_L)5rA{}F>E7;YS
z{qZH2&(UeGMVASB+;`lZ6PKq42P4mjl)p=4kf#(b=y)AB652iYIejNh*g;(ewP3K*
z#=wE&!UGI1CPuk0Flgg4hD4GeyXgFl%D-7gC%Q-Xs9w8Moee?M`(ErGr!ZB)!a*2(
zN|tbYOoboi3I?=I^w4^$zjdSi>u;DXzJq3<`|+4hWYJR+rGISpzqF#Fkv>>o?w7qI
zGO>WUGJY>p+uP%L@DWFEKDIedxKir$1M_E(lUs)+RTw}TE!avorkU7j3Y8iIJCWi8
zdv4lqbZ2~!GF`DZPY7g>NWDOK?^(=OZw}Nx1EsuUxG^`a5;5*S?<|o=0))>=!b%xM
z@1L)~RsCY&0a@&1naxnqgda{8#3sek3k!c<5NKg9E9-`0luc6(<YKCcT*%`G%zFgR
zo{ZScet@9&xMRUlcJ+4vncCZjk7&V7KdnjZ`15>qZN|xky<%V>qi14)N4MHM8D;Iu
z2p~n7_lXGL&REyXARWtZgz<DGrTi=_maK3jLKFeF$3wGt40<*-EpgBaPgi+6(re`Z
z$l<Y#iI4xl&W;t@(7;K;=MtHmj4fZ5dd+ko1o)okmsP=1Egc#^sIIaPC;fTn62OQG
zt7_+L=`f(~^;aS5gjemvq0!(AOI0<|aav^GTThA1Pa&W1np3jlJ)*76Qm(jO%GH7_
ztp`2jO8vPC<9`~0ux;vct;UeYribq&x9Gloa6({neC77Upxu(LDCi1RU+YZxcXM+y
z;DJcRR}*r+3pRZo41QV9bdSpH_kO?G0k4vVm--R=r<1vzzxT@j6&dAUYbZN<zokpy
z+oMpi@W9KMQz^SqF=*t|LKe;H^>BhravIyLe|&XN3%f6vtq{E@lai9ku)ofw=HyIK
zpcj>1(|1=b;wlJvdD1SFd$>O9xB@t4&nWN?C7sIjL|5+!6XGoKI2%f@U_(NZRhR~c
z6Di8`8|bM$uSZ8GhYjknq%@tEKw8Xd_KS7v;9m)Y>#9MhjQj?1v9Tq-MH?CR7afx3
z=2U|U3FZ$m?-ZGYe9y_;-QCA?UO=%P%Tb6fMsA7Y18_Z}*XT<2S)(n>b^w7^bk~41
zKIa3|=gqNdk)Q`Rc*Zno>F{eBSG(<221fxc#`l==k^P~-^>7f+SdJ`2NzND@`B#da
zRtss^Ws)s5f_5QL_kHuaBLXLUIFWR=)Axd#mR-VKu(uEht=D5HmF8N{^@(j)*nxbI
z_)qXmR*xhO2mBZUn>psc415@?26jhNd*Dbg;}Y3K{htMn@x!Tq7yV87m|#I|GCoGl
z#8lbVWy!-{ed_DQhgUT86U*k~X|ZEZ!CxdJu#=LT8)r_Aeg-8mA_T0@7Kn0x`=3Gt
z{Y`?Ma<$gX(Q-b<_9Qt2`<{T;L77ay3-#Vi&Dt7fH0%Bi8Zs3zBEac4YF@_Yg3R^;
z$GL#bz&lh_jOA=-N*hB!@cQ~YRi;<xt}}zG(N0CPMuvwZQMH*A@#Tm*vREntiB7SZ
zdZH(enubrJb+4kS_xsUlJuezcMVJ{CKWz>oB!86o1O6V(5WGz_WbD@+Ih1)Aw>JL%
z{mWWAF(I`oVXU+$53q3}JZQIu1P2)jSPlKy(;q=o5rw#v>!-#_HtduHCQ}Gbw!WgF
zptID@WgfhZDmuF2bg@Vx3udJ$ZD*hx)SGxo6^l|M22Vt@Xi!N?xtxEb^81@Y{n=@Z
z1Aoa0VG&hkYV5zug6^d*XBHxM6E}Q`qJpf}Uuk#owop}o0rcTb<}@}g%5xZLqf~2q
zRN}|nY=%6s5oMQF9WzJZ55Bue`;CUu-$N&gc~y+FE$QR3@idY|UhQ|p3U6Vid_i_t
zbU#K+61@oDhl3yEDk~-qI(~k{^Mr~Ky^?BdTS1Qh*29pJkO2TVKYTezRb+`67#P5v
z!qrrbnRgHaV94A=(W!qpx32H^`d)01RfUy`y!n2Piu%<27Zc;>?RB}5fgp;M`P0Jb
zQey-jgSudx?fW1Mbg{F+oF9StJm+mYSa5J%9=6vV{XeS#R^&Ao^f-*-Dmf~cDA}?t
zPnAVuG>;JRBx=E!;eHE*X1gRV*2r>|I^jc{@F7%G099Y~YyeW=*XlW3ymTTXam)sl
zf`ZknFgP=J-if|7ha`P$(_CQ?rn}ipw=xbX@|Ew7i|jRoDwjA>{hXc3rZCw$wead$
zMi@x&>m6C`%$NTSLjmviEw01p=7f^clVgb^UZ_vmOF%g*qa^BIh0lmQ*PE`w1ZiW~
z<ia|De;x*dpp9j0d9&PD=3<6@x4_?*^9vPv6mY<-&74@|{>4Sn?C56Q_vTM~I5qO$
z{iZD^3)%Kr7tOCB`nrK`DF)Kv5FX>|cBq9RRTfq097!aJ!jXnuX?2)qF36_|(^h6j
zU<~RSH>AmMr6W@k)SM3?3s2n7f6)Ih?a&CMi;{;1F?~wx#V#u?O^}p?dXg(^DeAZ)
z4vTKry&-$;f|uQVG%U>8%*tp>t(IX)R9(Q@+S+@i>%75b{SkLc`g=1!8M<NZLJ(Dx
z;q`t=6tQ9CZAX+wuffP`@KYV(m+kgr7psKy+$b0U1yB)>rt;CHT9x*H>W!CUxM)D8
zYQisxYM!Kx?m$uwv$mi-{3{>1{>4j&`9I%F8Bd@+6VC=j;ZzE&`N_EXy{!smdu97y
zOnEveg*b{kRe~MWKNJfyyvIPIp<(tNFkNl)x}?DrC0hkH9yRQV%=%|+j7#iSqUFmj
ztACx3snTm#r=+BGO3O&g+kCS2`2tAa!@3drAyPR%I;B;eWriQH5vp{_f<%kH%sh-!
zW~En7X?SO*0MeT0_lIL`VZTe~G#bo$!NA~_`Q7VO`O~Ol-1xX^5(DMPT))ndaNzyv
zpUaV7EwL?OYv{iS@xhOekM!{3hK7dn5&bw6TL+6gqN2~|<Ks0hIXOAEeL#qwzsh2r
z*NG45dWUxz=;d*DcQ?iDFV$wyHJjPckWkDoWFa-QcRCETr$f@l7R6~qDey>?JE2uh
zr>0VNn#V3%J_^z=kGIR0rcp?GElG5gY!*xFgWt@0JvK_Nudd#QY`zR-&Pk(GHI><|
zcko$Jl8kKiM~t<2y+IC&`~k;(RxGjx$G=~<zNIt|)tN8S1sxq++$;JMS&K%&r8l&<
zQRq5DGX$sQ@9i@P%1k+2!SY;C#~UUpvS(<t>6NDN!W<{PXxzzt5do=rvxL82^VEpa
zCxDuF!|zT^7d--bP*ONiM_^Xu8nA3xJ5Yn`e^qCdD(wa4Pt_a%T*t*ax>BjV%_z$8
zB8@fvPJd-<Yg*UdYpe-lUfc1dMyHMD*fTR%266G8$g~f(vT|}<jQp8Ud7)=0ez;gq
zDHeFABmT0Bx8E(Hao92UE+7$wR61Tu19oW9k1s8Dk0mopyWA%=KY#oivI6&B`#~Gv
zH{{W`KauBepSuodZoUj&*dC*Ew9SbxJMm)~W2Xg)=JfSRhQmdmpkb9-41NYl$gKAQ
z5>x6S@){Z%`jNY5KL#@ox>v#o%Rw`xI!6x)<YMw5j?vN4ln5*2u{u+iRA_ApGT$r*
ziMTtoZT(N!O!vUG#*WsiQBhIcY-|%d0spBNd})M7J_3x=nOl5}B$((n9@7ogXJ@P3
z_6^}vw78v*(es7<zXZPBwR%j@K?~`(bGry}Iq?1GJ&`Gbepj!49T<@Qr)Db>Nn?|f
z6&Ag7TkX`HYS!JgK0UwVbzVvLwdrM%PbNc*p~HvR-6BO2mhZ!hCq*J*lKefJB;Ro8
z{gn+!xKhLuvcsA09qYOzwoDd?jeP$!X1CZw9)XN~SGB!i)70p`BTvX?GTPpBV3Nu8
z9wUK_FOH!ws8q|Roig}=nsWS&>S?P4p`Q4XBn(~h(zNcxg1*kMJ9j9a5Z;HnOw_TH
zlyrS`Y}V|~;jN>t$@zqzkkz2C5?9>$heZltA=$X9o;NXUTNI*fVnSv$oM7|Oi4~KS
z-)j|I%GgnNvbXXr0Ifu>@=~(db33ePyZ)zU`h<<uejblu_b(TQU8vl@%3yI&qvj~L
zep+0Gn7;-kQTlqYvpz^O{%Zd5<3~~8{kd~j(B<|z?j9x8n4mGP^zTYfh7O<ZjNWzN
zz7==uaR{BL&2iK;%FuAx)ey_L>UoT(a>dP@!W<TfG>jW-e`a<@RL@nH2wJu6HxPv3
z^70ajjD>kxjtJ*#jcM5XQwIk{1wn5pSZJm>`F3io;t6Z*p0?Btga*}B4m{Md0QDyY
zDg#Xn-=hxD#g+!L(8H`$Ph9*?Jdmh=3s%Wwr4|ucWsEY>o_B{v07wrQe}~Q+9lKO;
z>*r`<p_hr(s4azHOh5g%``!6$9<=-o!%uI2o+z`S<%`Cq^iiKo2|qepX~{DyWa@^}
zDk3XXA)1PnS&~(r1fb$&Z2}za4uui`h&j$<$dXH+L2J!;3Ds-M1<0bM5cBvtY|4GG
zw|5E2<qK+i7^JcF)&E0@(^p;Jy<bt`+W>5eL%S<kCK@Y4F{@$HoLBYght7Z<=OjL7
ziB~{(z^$?<r9_CR_Tufu*P7hdsjm)+p`h|FuH0}8%0%K`hd92NZ1<UZ8L4@BW5>GH
z5Wi*a*M}YKtWQ_hz?Gtq?_^Y?>uvFgut?8KCe-6`pdzaTXyLo*5sBI~8i4)Q8q5X0
zv&JTi-`QQhwK}geYZM9+f6O^q-7`n{gxNEg*jG41hlk7Dm4D3T;o)J>?La`u@svH5
z#gS#Kx9Gj`e4oeqdMHzmVxX_3ZP@8U?x<J4|LnggZc|PJfLgOB3h_`3STm<obC0NZ
zb)^(E)0?KbxDo}NmiivOPn=_;v509+q#8=Pz|5i5_bLr3T2La4mu&PgMCr#4yidR6
zHXu-BGK4w{bRu@vo`)kehjitc)UUXN_E3v#dERwjE&3suLTDh4fMp5noj3LntCq{V
zpD=ioY!0+9TN0a=C&8puvGxBH!${Hi>8oFbkI`VjdZ_~|cMeW&9~Hi6XoOHO#0xOd
z#YW>Exd$d!-RLLG{-<&MD}neK|1E8m`_G?0s{Sr$GSQe;M_<aj1fHsnK1oZ%St%r2
zT=7i(t_^HOv)wCK$%;u%W_Xnpy+p=JU!xbKu2Bcxr_rm?3)AOX_!4yU)52R?TEgw@
z>@<nJ6#jF6KaNxh9|#&?EvR<B;+%MRdbS2S6q=#kw=2D^)5V&<!RuwnGSOA*)oph#
zH~swS?ktXrgVPs-OkqB-$$&%R&^z_`_XBoXX6Eqsa{by;;OR_&UM*iyQW9o8@TS;m
zBne<tR>Di%8A-+is5X|#Ht3)-ia#$g|CEe`-$`*Slg)mitKCXwlS)G1P42Yti`Y{S
z|0*j^Qtu~=5|<N0cq!fs_q33O#{A(eFKpP;$veFolRxenP{I;@nbUs07<p?S$Hv0i
z4@0K3K5c89tK3=99@>_RH|Vl!e6lN}0H|nbBSnxgiZyyeoK`zB)bdW*mxF?WvfuiV
zt!-_2Ajh}eCKex880hI=_rX#`oRvnfa+wiudJINvpu`*ttrq$|ru?pKL5q%^MbCzB
z9~+4%s)xeoEv4pvEoo-NFPa5T(1n$hlq8Ud<xX44>p#>5-!zWAcRMKf*V6@nh|iY-
zQwYKNFsZBTJTI@B+^p)iT%#_G`?hZ6#5`V`KjBeOLCWd4z`EdSpfOb_w%i>k5Zc?k
zY@>awEF*_A3Ml??L}4#s<a4hLpshniSTZEj>i_D%0r%!JNsdoCR@2IS@n6twm2TJN
zBPrbsG&Uo?|1CJ2K(6BE){qC}p8xC0f5CsFRj<eXjs0Z4kc^ZCHSFu_1M&kN4vysY
zKHG0z0^M0=(U;yYxyqa3!SMv>{|Nf5Y{he`p))>;k~+K4uCYrKB+`PIR)q*N5=Lrb
zZ42jJpp*ckzC)`?jDfV>^IByRRR@oXiYm(e`e*yZN?cqVgOUpfSD*|`|LgFBw+6L~
z^A-{8ypATB#cpZ<)edhjr#u_Ew|efx)P6M6mWFP%!-t_t^YoU!35RH&<9cJe+lgh%
z4(%}M4Pnj8PBljD-?a)Rg09uj(9t#Vqe=!pH`<TcfU@tT6LGRLGKQwh6d+8m3_fQo
zL%t%uU-I)!j(mYbsPoW!2BOjHrmcoKUo8&E!?OVuuN%KQYSpTJWL57pQ<yIJPvjiq
z$jXr!#!nC<iooYf4`)~PBJqjTuODP(W&fU^E>q+X=pl8~rKP9;*boa`>h$G+wrb<@
zDYIHczoeHJZ}<6Olnu89cMh{x_O4TC{(<Z>&y=`~JRmRZC}9?#uC=?r$8k2_bkKA}
zOq_;`i(5BDeKIIWj+Z%LYg4_)n@%(B)bb4V++s_vnD9Qys-yxg)(>v?7O7yMyI^v<
zz~A@I>3E^m_@#tMO8F<ab~RhXS3O5&*=4;Gk5nWE<h%B#k-P6t4SBIr+Lw1P6;s(#
zK0f@$K<iT0>fBf*^Izxs)j-hr#80t;v@B2JQGA?aH3+{}qUc9MfTysSkv6UKEGbF*
zBY{5q$3nPmrmH}t2ERWvNLXYBT}3R3ySvun1`U1HNvr5+Xnr;`*3okY350A$oM%J!
zUMCytY7=pdfs6C}C-WSYU-j^#a++-16)rYd0Z?;H8iTrJ({hRyKj(W)%+Z#tG&g~`
z*GK5tj;Lx@9Ef=je?%QeT9acoa|Ij4nSO1<c=)8%(k>|U4e|bqLqLGAy}dmsIq-6(
znP|BSa(vbV6>tC2%LED@q_W0iDFjv<9xM4|sYUNd90Vk!?>;ZWBmzF&4od$$QFZ`z
zO_q==T(}hNpZXJejxFbYf*<i+dPK9#r){ds4I(bi_qZao6m(X>E^K!uhY7!bf2_yz
zdwy^SJGEEE*J=NU<+u<sDYG-8AK%y2B?<~SDz|*8N&iw)!&(@;Puyz5G<h-g@^se}
z@)D4>C)uT?%K)B)f(S}OTRzQ60V;qXK$}~e$y=P@yh~c&JvmhUs^@^g^4i(8w7X%)
zd$o}-#Ot`fLF)F2>uKFr$iH;Srb2Q6)DZZGlF!4MDKNKM5Gp0kdoMyDhnsJc^&@o~
zp7_!xDL(bjv7vKOpnbtAv<GZ;pT2T8T%v<amm$HX`75(6mIG+^#cMO}2b2rL*Wer-
z9XYMFH9oYvZuYPbZu!SSciiYPG=KI5r;9DMJIb1!3d*@ZN0AkNk#A-aNN)z;lZS{0
z+#ILlI}vnv7?%#M{kCku;4@|;_uf5|>^)9^CiX9(3hUNHFdxSCRC3CS<DO>{zs{9h
zLc1dlGe`7u`YvtJ_7xZ~HQ4~ivuvKzokjb303xO)P!VUAmX~MzEb2G9Rdu@;3Ec~q
z|IF?-yf-R3E?Z_+jh<u3w#67N(;@toY(PLqwx~TW9!1W_0h2PB=%l1KP<r?Vbav!s
zsbz_}UOMlvZY8Pb-$1YHh+fm*9pGHG?67>mTsELsL9crf0|YNK_1N!RTud=Q1!(8p
z88csB&5tr`3T2wHM|802V!+2u(qp_8vD`)e;7Nhal^tU!n!UCHW-VBsTcP4R;b``g
zg+<9r@&`i)rSIyD&NS0t=T#iavZ)#x9(2l3n~6L;Jo1S@gVFIA-*zp@3)wqhPx-QS
z&XBegOd|IHwgIH3d5`+e#|$(DN3E9WCAONlcO)dgqA7!Q*i#|BX4?Z-iMwPXniiBW
z9qFRY0I4CwhukKQ-`SwGzko`UE0f)j`Jn5*&@DHt$OzkbWX!{a+t+0koH{Xbz{EtH
zc;c(g978Zb1yWO0tpSIcYqgl06K$OrxRV{4(EbOs$(CE8<>@$M`5=c3F(!{br=#cl
z+cJS`eicd5mcR64T+fTGnaV_84fl#I$}li6To0eP?*5<@+%gd3mJ)Xa8%f-JEl4^O
z-f-esc|>8Nk;H~U=(v)IDEcGfYJ$U8nftEOe0S2(UHtciQ%jqK?nsk?rgrF^V0YK-
z>?{O$ibQ3PRfV`EDj>i)iRsT^2Xy)rB93=K^J>q7@d?vbpW6EL8L2H0(|gB80~W9E
zAQCxo1(q}4W;BDCK)CA$bnZP|6bjjIT*hosOXL~APX0O7mEuh5c60u&_U?av;2AQt
z-tputWg}Fd)1_&(qc5YAlTcbkM0|O?nE;@Oe(<WLjMzqlpuGxqU2Nh8T{+^>>q7r|
zh@#sSiu5?pcVsR{yb_e{RGNPd<6tDXnen%O@ys<4fq_8;DalIdyfkqrZk~v@eP`*)
zejxAtYL-z*%I6@vwrG~2J=o)K*5Z+2(qJwH^3ltbktt%bNSYpb0Jon12*d;Eb<yF(
z5!X<ev%;jHh%>`JCYqEConU!1MjLUI5PFP{7Kr#*s@#vujW04WDC3}T7U!dULqtTZ
z0ky=zz98dwUEi&i#`Kw_T#y6@8yVJQ9xXD3sfAIxX_%w^p2dSJLF1XWmkj9>E*{_b
z28iJ84CLXNGrnb1tNe^hiw2h6I=<2smNG);^0g`~H<1y@Id=oRIna^yk_G|FPuxFN
ze%)1A=MM1nx}BIyFl{0h5?D6^#%y(JH@~DZlvqi!Iqu3WWRJR_gDg>UVl|y?N6*-r
z0XQ2<F-d8MWn<7ic5e}Jefm7c8Pq8qRH#lv34)Ael$hM#HFa<qI3bh^vn1TvrRv4U
zvSMgZCiH-g`(V?m#1OmGDy7iO6?gL9&zFjc%Skn>fBNrQ?H8(#si0g%d>g*^$->^4
z8tGX6yYt6$5qfbkO=YHdn_|TjX{_%CtS%RiEl$fb5`uz)<Iu4?JS`nvyI#@)PMnEH
zZ!Ef4Gaf$-9u%1Xh|T3*9}BItd&=Rw<jIVGzr0y4V$>H<%1F*BMyqq==g(KuGjz?)
z#vYE;<<?uFBD30BT5;ICh#m%|^Bs*|q+DEF;)w0-Kw8Y7KB|063V0&PQ+bPuWv9B2
zUiDb2Rs8RtFe~m{;!I!**=IEM(Lw0XI?Y9~!y&%)2;AtvwUY8vnF(ATul+zNHc=Ke
zjyW`46~sd^kKj(sQLO+$+Wlj38*w`uo$d3!prqWFjJ?_C>V0@;tXj43^Q*(ArSH&D
zQlFsYEmGLW37oTX&95XKo3~fT0mIRek(}FM$bP4nBWuTsQw1XWk05xoZFKE)dpIQ4
z0UPwRfxo!G=r5DK4w!AzuVfWf$3%M7w~KMrItesCuQAPe&oh>Y`|z9Qw^R4O(fDP^
zB11KoC^RMO3*p~i$nk^D>iz#|Sy5}Z_UP`^)YLk?gpZLX5m;J`ZID!J^Q=b_cfJ|P
z$aL;Gk0p=Js;c=UYiF&Nk6Uu)+@EZFczWQ6^MKk+y!o>x-mW`!FXXhU+kW+mRhfS1
zke`A~=*!c2?^OA;HV8!V@^qup_Qj`Mdq^xU814lg<8v^ys6<TVWa2?>f9z(am8i_%
z;lkzuFpm}RP1oy=?;S7_2Gv0k9&r`0^)MHCwV5Okt3|=sk7O&sw0C>MwQq#bL^@y%
z2oW*u@G4QsVy7!j+27r*xmYPz5su*!Bz712gVK?0r_K%R&|rt&ovm)#;SY<WbT=(K
z6lg_V{7E*Q=At;%fN&4_Z;6?QEjv_dX3@4tm%_`Tg~u+*Jn6o_Z&CLX<eHwA^^I*z
zTj}tAgJ$AJ_<oYd*^yL=G&AKX?ja#SNZ$6&j#zxTemhqy+#_M|dCiYDV2B+%$O&vz
z<(W}C^Gz3*94Z*z-x=3q!<w=fbMW%&z=_Pv&I-UjH6SxU290}fN~<xP<Hb!I@$?O+
zG*J6g&1<3C;f$;ia930Gf_~~l)0ifNbiXi3Py+J+-?n>mQLbgbykuI8XaQh5>_5yQ
z(!`7FwtF_<W!r;|9K=7yk(zk^TQxWQrN)EoPHf}$z;8au#9ZL6dxIZ(9}G<%Ncy~G
zN_pab-1YR;E@id6R~Evp`9wCPzM|j9-ZZcE@?Hz{!&}MH9{-4{tO4(s3QP`~6U>k%
zX^5cNhW1_Uv5DAFQMjzQKI8ZF^MseHPkx9+9ZR+zgg%IpHq*VtOHpOkr&^yprWwjB
e?!5TI-jM6yM%DRPmZD*xKP5SJ**a<S@c#jb1JTj|

delta 9690
zcmWkzWmFYg6egvlTTn{6Te=&hySqUesiCF2kq{)LySp0!FWuc-^3uHfX07>oX3m_w
z=c|3D5UiNs0}MV6i@15JqoDj!U^Ro|v!+KWkj17~!@DiZ=aN!+))ke)#_xdWRc&fw
zA<(1huxLi971AN2qDqS2F~Lgt;3p&)K_)KZC&QKMvMrL8V7jO4m0hj&Cnol@Gru3?
zc&%&8(m%9|B2z3&OL=f@vP9ZYA&80Nd`1+L4HkVD1dPC8vlcz$hdH)Y=~sJpGore5
zCNGw0mjB%h3>3!MV@Y@kY%|hIgt_9x+fy$GWoZ!mS2!3fd@d`~Q%{uFrid|-K(1#C
zB{oF>RT;J$K~{V_T+dhey5~y1y4;=W*45W5l%ET#37W4tztk~2o-07t5`;;C%3wVz
zcwUGAFaww;FePbcIR1JrUgQdTV-pg}eEk~tB#&Ucw{)gVO+%AgSr(v;2k_z`!C6=E
z2w~X3{PfgjVPuTX^Lm}AD^hrPILKSWZ)HN<@h~*jiCnuSes%gB@V=sE`DRkoKmXs%
z&5CpP<x+w2QiCn7XM3m3ofRJYy`C{+YB{h5YusC4=O2_PsuG~KQ`bR=jok|rcl0mc
zp4e>sl9)MNC%Vec$jD$L^8_8->&Hk&m;LF%AV(;*Zak9fVHJ(xy(J3oEr}MkysOaN
z-QRDsdT}6sT6AdQ%JW$M(Q+<RAO$*xKM7LVv@TcbM(&76M}VV?>N79=WIkF~^baW4
zp5{K$LcDBM<~KlTsgi3bUB>D`<wAs(SPxba{#8BEhl-L?=VqzoU$yZD_k*y~oV4ce
z^|3w=-W)v*CD_MJB1fT|qgWE&SJ(dH*bi7o<xOAngeOZA<6ZVAh^^H=MA_Ik>c!ue
zp&M_uQOp$BO$Pl48V<5z(Y<P7F$C@cxDE<E#gUV%SA@P_eGVZbmDI~}<4aMf;8{^I
zZdS)OnER}!Q3?Nz^&6%MeO7hZaU$^gWPA(VR4`*bS#35C`&JRkl#B$bhT#IHhE?`@
zk6)v}CTeuq1MHehf+wa^6G~7}(18!+JV*FB5qpw~ib`KYs{8ToWH|1l0C4|UUJZ*U
zb)~%dtIVdIspXgox<$CdcQG)pu>a`vXvoPoH5Qx<rv<M@3YC_d?De~C0yN1vIg_8x
zJJUH!reS1F>C!?65LQ5k3aSR&ILu|9R2bXg>fW*N<j}Q}kn^=^!N<iBnzAyU(y=b$
z@Sp-b!qtUJ{bBp+j$>~C%g+{cE2g=`s$8lDU91I96cf@hC3XGs{5<7#w0wJrYo2RE
zgpUs@9pm4J>t|ae?2gBn8EoK%R{iCzC9fZNhE1?0Cs}c5a?@NNr7TV2hJFAq{Ekb7
z8*J70sDj_k&Ks}b5!HCm@obTTgp_KB5atcNtDD<Wmw&cCfP*i!wPc;Q*XptZGl4or
z)$_0H++0<IA(B9|9X;dysxB9+py2Z=uKCce5O@<l77h+BN-kF$EuGca>Z00LXn$ko
z8l$hjUrt^gZdc{C3R<i)0#fVmUU-wy4j&&5>ZgVE>lGHNZo{xrXZ*qv+>daE<H;Zy
zdCAEkqZ&29M@L=i90o*TYUr-Fdhkd|uHeG)q-r6@AV&Ke+<5Kin3#%#+F*N_^rR$N
zd3j21?$l#YIpLUq+y48DZip};tC2g+3w<co?2llncF(g9JdUg04NKD^yYc;iUs6H>
zSl{;IK4!pAXx}|*v1QeDoS85A?V%0W8Hz1`C<7|TBxk9IXSO17X(OVdC?B?^DptI%
z&YCxBOb?WIiQmCQVbLZGNpyYwHnQ0ZZx^;;-~#Ch>Mhr*5*LecBmp%6eXpSx3O?0+
z|F<a*SR|^#*W>sfJ53jd>d{(BJRr4FD*sdDjTR>F*^9p<?&A)mdunG_4yKo;`#Mt^
zI0vqN*Y>2#sC(VDT~`VEo@cQVyiKp>i^0#%&FO+i;Q$J6OdI3bc6>_c3C;A_<wtT(
zT5zztFRJAFJlax!X;Eu5O$`pc_lGgy_luE8uf{?q4|?zGR0S%Y23uxl6{CZBpDHsS
zwiMk$-o-Jyn3yEgPkOSmvzxlOxQqh1>#V%cTKnQ<z$5U_X(;U&zr7OjuDPp!FYi2F
ztoMzFr4u^gwNxzkJni_FHQuT#3(xaYD2BqapT}`|b(2woL22&8Q|1JtjEL~^YO9-d
z%&GyNhzJw{G*yP2n$ziEeU!{zRsSk(+AiF{dZBM_IClhfzj<)`67&TPzyrUFOXy)J
ztbk(#1UKbEEyRakudqzQO=Kcck+Aa*1(V01GS)KnlBTzvLTNYKHG;mjf&71Ey+`U!
zjvcFg<q}(dLI=YwSahMAe@gQ9bLiEp?BQUws&p^{DG??mqOw8n9o(t7pW)R%k4<*j
zOwSIvI_v4#O{dc+s;D(z&;U<2d7B4B+A{H<nCYxJGUf4dJA{_<U<LR6kdcv1j@#A0
zU%lnt)MeRY9vvN3=(kV7M4*-{MYP_F{MMy=??|9I`I%_0%m2wN%Evjs%r0VSgR9x?
zV9MQLIcY*7uJaETT=wLCTdbVzOo3D+oJQvV04vZ_KXs7BZGSb|2O!>@ElfW-Z^Dy`
zc>dhAh_~-t$hdoLSgrU;inuwyj4qVcUgQan8<BO_(Ls-It4zLLw{qrT?7fAU<Tb!I
ztB5M!NZz&5vDA1N&!|;FXQgly#gS;E+PDxHIdu>i2xB$<5Ygng;<MpP_DgP#X5uG%
zNG7M1>sDVFDyY%)1$ftGP}_%@@A8dK=$QLbhiB1(rp-zSaTM3FaQW^=rv{<Hd95om
z(E7adLby-8epEreH#ae|RSP||0KB$;fjTDNi&+HH{vR(+;5&}8?k;%O$r%{RNY@}A
zL$Nw|Y;pMbmTu16Xp@by2YN%0I?MXm-lwq|JLTOh+w;KyG!#UH*s<Meb*VBCA0-6x
z-)!?~KV;iSUkkAMZVqd<wu8B`siwcK4}K2T<Jp3200#q+xK$f&_O`dFbWjGWq^UtB
z#9uC*DLfR(?{0pn!h^C~G;3#QSy_khgU5Wp3%AGdJawA{Qh|9vWL(^@y;x@YvcgWk
z2M(?B)Fpsys*dc-w;qHH1h%@cuziXmR*xJzZgP$W0wncU)U-Yw=USady~=q<%Okgy
zCdZRtQc$D5SD~j`mMa@$$maDZa((9JJnz+7urjKL=ECj$>@kyLG&|;S&O4YkuZyXA
z^Wn6jYR#ywm&cg`ONCq#fjIS&uh=9c3JwlTFs6X1DVNP6jEIQHgcaw(RIXd25hrYD
z#>;hX{Hcu-p;41M8*Ge|t*Q94)_dfEgmNyWliw$gTeIujS1~T)Sob|WK^C9*rG2Dn
z8eLsc9Okj8*#al4)am_Li@4;==cu4%A%PX#^mCg1jiSDub9^`Oq}QXwyEZTeD%WYV
zpa=5&?}*crN%{Zo?(X6sl5<yh&buXkgztZW7fN&au}{HGv{c88hDl5Qiy-N!rzdIM
z7F4Eb^UdV%Tw-FP^yX4Go-Hb+5Hr5|H#T`$w&D1XUZ1`Qkl!~j`MZoqNP#}UleHDc
z0+&){n(a*<i@m+QF&~7Y7M;y9xxV9c`apnUY44WdE7r#Ifo^8QPMW`wujqPU@!iP`
z{6Us{XWP9HIJn#twQwO0hf>#xw1|l@8g43hx5^J1(RPFTeQHNb^OgF}3<@HGu>;yJ
z8H4axxVRGW0zN54UG{L$x4r)$m?0K|L{+pqk;yqQG{j;4h!i$vxx436+AB1B<qAAJ
z{=4{0WBhsCsYL4bgT=w#uRwZH_7~mR_K<hz96=maKDP;{5s$HOp1+-CP!a1#W7sm0
z9hMU=irbRtL>L|Iw<OvBCw=(16{$c8RMNNEXv>$}1=3I~E{Da0PeML;R4$jbFMN$~
zA<vB;JQVQf97hQ=zq7@4yK<n-#sNjNg~+DWAF+NLk4+J&%|0PvkRH<Ki*>)gT*r~|
z$;S$^AtK=z3E{cvc(7PlCuL;ls2J5|6Q<q@w2?%zZki#@RRi7ST{&RHEMDiYva%7;
z)V#m<_ZK(*dSRWD$)@wi9%?nSGe^mmlyIs?3b}<Y*2}OP#A6_?gr%U()dO|&r*oC`
zMV_J@cqToD@Dojo%v_kreFg$Q|JDa-*prN2`H3-ggX5ntPM<m}HY%|qAM~T(K4vXB
zSXK1X9k%_z3g-7X#-p5xYj|WVZj<BFom|Ly4e=;>%NJ8Y_J9knrIH(;+|u!3|3!yJ
z|EX@d!Z^M03@T_%VBe52F#+WTy)_NTYeI#ifBD44`J#67Rk6n7G)%<p_wvT3LA)E4
zhfEv<!yiRpoK9vD4<6<>U`<V>QkSn*jsJ`~DhAuay$|HfwEb)#9DjC&$cr#$uJ(7X
zt@{)KZr92Z9YOrvsz*A##9NL*drra!Q=%n4u8w+v6JE#N=ZEX5?E`?Lu0H*{I?yZI
zP@09}J;q%Ryp<OcRx*Wx=ma%UCC6q8W$FVj%gR_d<=BzMSW%b*kH0j9(u$qqi=U2;
zjJ<;Y{*owC&KV>pRX@t{hpz`jr24^nFd1ctJI2ifc`WXRuLCg>KQK~{kNfef=8hai
zKORV!n2<L^S^_@L)&b<Ktkr+(CGoJ#>X+_de1A@hBfFebHorSxZRJcx?J=tjh4%^%
z3oGKe#;nT4-&8KF`Gys|$-}%<XNd+Cux<p(+z*-iJ}cpjk&sra)qtln1VqG3uf9u0
zfQeSn3GE6!pFxrw=DTF!rk7huwi_oP5KRC31G+>XvfVtM8=&Jsz|yjvFM+&2JUncC
z*MzdbeQC516Yx@v{!&_<kez)}<^(S)`_!DeUSnnh!z(k4aPZUPXH#hQ%b$6kB*&E|
z)4AJV7Sv>0pVlmxno>P|1D3`NMH>DMt<$mrk60+!nG%KlO91q6alN#~<_KWU-VK9r
zGP9#`@FL!$0j6WXx(huG;l)aG^(hZA%eS}zadq4J{YeyL<ZtTFkAv|m0Mk$M#Y2T`
z)oCm}6B84w5YZoFv$?r)5g&S=zhCqDw*}TSC9hp<>^b(znNgtZ`!s1?hjQD`<N2gv
z#FM0=QiQ@a{7=8AnGbL!DL*mQ?%fm1B^fqiMX&&%qT}ofBFQB8<%M*C(gIo@hG<+$
z-RwetX(=5i*1rnfdWX#HA2^%JI`R76mfHy0B7C&s;u4G&$G>zmDk)TCL1ft2s)_v7
zd=+|)ZGY<%m?}_*#d)%sk!0;>8*FWi?D$RBocFJ*wQ7AAsu;t5d)F4M5OGRLQ}ifd
zFYL<#DQW})MXczwUw@jMErj7Q*=D2yTEEGJd~Vo``GF%XdJAo--i_9V58vceQ$Q#v
zD2Qp@;t{_edH-ReT&$&bMm}ZUZZV~2?Ly{Xe8LRfvS2~ny%rp*&F7k(2S?b1tOogU
z>Hbd_?QhJ-+l-RSX9`?OP<zM&sL%Un4w?bBs+~T!?GokMWJ$SM^G2xsm_3@C_<;>1
zbIfH;hNwof9ztI!S$_)nHf{asW?{fJ%GzY0c#A3!JOrg*!u*o@leg6paCRR~L2>##
zSot(k9@Wsm6-O!@T;#ZPQFy*u8$vsrVuNds)QX#ePUmm~frz}nFDfa?R-#e&RuKh6
zo55hP@7(OHKuJ*%2yR$+Z!(8}ruDkg{d_f3uhBj^GgIz)z0(h}2JyosIr+?hv@1z3
z+4up}Z!}tefLKyeBCxV%e#Hr)pB`HO7)ns&gw)25YqwA}nMNkhT~p@DbZ-F*S@p$i
zv|nIRe>gpLcqarl38HSq3XVFZ(*v3uMk8d%OnU-hsrB04?pB;T1S}bR@4j$(t9?_E
zrF5ZNL`N}3LU<R$a1<QVtP&{BL%2{-#w;L^jZQM3o+(OColL95LeBQ(O9tUkx9B*D
z^G%tdl<J|o0<D!lS2oDFa;xj<obk3yTv8GNjeyx=8EMXTvF6v7cz!TmhzF4U8pw)*
zFr1|mG0@X<wUn(vqg7=fx5jU2j3$yLl)b2gah(zofxPbf=AXr5KL*C8(&={knBBdm
zXkb9fGN(@=DJ3;i4FFI-tMBxXuU&2AeloB0@LWHg0qqM@qFGU*R7wYAW_h8Y=mVNb
zGt<kYLFx{*#xH*NY!YOjfWCV|<K14dqH)-hh3W%PWHk(UGao4vd^PUWsO;IE^V0M}
zD(srExoJ{{s9mTh%MEp32iKhc*4n+U``o5U=;`UB5<1drjDgV-bQ{%UDQ5Z9sp$yQ
z{=LTFfB!W2^50;V{_IS0Ff&*FyE3kPke6=0Aa`zUO<rwqF)z9S=vi5nX=rJEU)G@x
z%;K%<<vsKPdiIs+DLBUdQA#EB^m|{fD-dMqGrw$EekB!|5;^bgmUJ717IHn{ggIdG
z5uWN3ajyiX$myJ;nvu~bl6hy7wdKZv!9i1^cS_mZMZg>Est3f7%gLav<aj8S<ofl-
z)@(81SD=n)S3IC)ENY`_hp~B}SgKxvvEjV7UH&*8yHsz*?tCr?lg47aKcjOpam2}_
z*AOx9sK;s21Cz&ae&#7)zffhlzS{aV&uP$vBa?{3olaTkMI-anRpjB`TsZ4Rb!grH
zQkZj_8~z|DxZPl(Pu8H;kMH_m5{Xn?T5jHxm#Zacfd=T@pSwfvH<=q!f(n!$xM6<F
z5ijKZfpF=T(8FgHe*3w&s1uG!CJhw?(QUab2vVx=``P3hRBs8yqt$i-Z59TEx`zx?
z3+dX|rc%6$Yy2|%ztWMD2M#KvYh;QW$&c<k^Ip%KE|KzWZyV@<Q&mzTp&-(IdpOhY
zchnaK_)?F(1u^YA$RUe8VVoWPJ0ds-Hebc(9>cB=TA!-guV?2t*Flhzz1Qjb(q(cJ
zf_!-R2~l<=H~P_0qw;2kC|ugF;Od1pIRgU&vE_ThVQu0d{bq-~!ln9$GhV_Ck>Jig
zm0X1yYCKYDr?ob2OdXU84b8?#tb*o*x{p{u0bOxBdVgsnWTEr)#e;QYVCV|8%;>X%
zh(?f*m}r_NUPb3D!dylG?+1Io1775wWsXcQPZ)rL%>HD~c+#K(>d_b9)tQhVp8{HD
zSKf|>^D>0&37#MqUP@n6gXJpqn{y45=sPE^1YntL*4jLn>&-ry5lK_vri;8W3EBg>
z0$yJkqFi+sD)A%nAS@VgIV}s!kw}=N`I_ZgQpx^N&_;t=q~Q1i;OE8ZIVxO8u=ma+
zuTaMk$?1Ayv@Y3{*+!Rt*erDgN2bzF2YV`8_Jle@3`>?#xmKn4v`ieS9OwHTB>M4^
zxB5~&c+%WVLzhD0FIo*?sA+8R1xzBF8^&TQDwxt(^`}ar2`(3mfmY_^<ebSRPU}^o
zC$0D4rZsy{7Z2OfZ`j?<HMCN&CFs3Gh6}vjhP5UFbzdTtW4;$`LX=2&$99I}kW%*^
zJyD1hT|zFtamJ0Xgkg~xAMa^YCuU}jURjRcyU&yuw7LHos0%j*PXX(uz$-1;lVnfZ
z&y<0&)N&nYhaOC|Lf9GcFVmbFeU!=bPaX*gCa>tOqVfyr#*Pj%GQ#cWD@<?8KzE`3
zPl`A!R66QvhDAMVk2sXSQ*<=W;8gMr3B<v3Qy&LA-lrj{$)~aCjzMz)G?sw2kPk&k
z-sH6jQhHB!XPJB_{jTxANC*-}jm0PqG`8902{0>^M(5jef27iJ0NtAI*&)}IF2fnD
z_QUYu8MP<<&X2D;aY=!HIB&vi9pyi0sC~dDjOL}MMtQ<HoNZM2zRcJ&noRrM|H>jD
z_6cO32?l=~>i&`&1X=CxLqvNpdBmR^zrXjEeor#xHZ7uju)+_d^E0p-b;v@&)Wvr@
zVx_(W%+rf#%H2oAd(H=SjI9Uf&z2Iiv@|p{UszaJ`d2QNpl%x3V9Fv$1V#Ys9fuZb
zEdwK?eSP!(gA_RM$BoEZ5^|h~$#=OFwK|6*4&e;poC!t9K9!i5*!zG(3TYAHtiLM5
z{`14qLej3T96&UIQEim4&kfzqP#iTKUBpV8`!B<GPda&1+*m4^IIL#cDG=#8vmy;N
zIL?`fQG~*;%=P}H?QFvzHwj}}TE+u>(%huZr!LPY4XmkdOQT%V3oR5eu8Zr0fMvd%
zp-opzSkkGxG$zAs4~3<rCBdf&&gZLZR;OzTadGcMVCx6*<p{Ffzi$_R%w9XbPvr4#
zxHYJ<s&x8zoS)A95b(J*n;VL)&_DP#x_@vmd>SuINk!FvG)F?NkdeXzg%TMdt;2T&
zn&Z?Pt|~oO2-)Xz8N>vd_6R?F2BRa<X!zcI@Ae59z<uU(9u94BW%%`l4A{<{55@X$
z5)u-`0KWrKe>f(iN2R~n1kvN_ciQXyDa(_zN(+k=|M2#$a1s@6bS3o}F0`^@0>ysA
zHqT$Ch2ax9oaw8p2E|`<#*VqmkLD{$R+^oWkW)OL+@lO^>CoXG0Gvyj;AlE|OM~)H
z!M<>?O$4DD&|YH1i}aj_vSo3XzNg6Ecset%bJo1hl0raAIzbgL+y|vsWE7N3aIv+8
zrR61b7~p#Nm+UA1_avx{P0UW0Q86J85(|PV?3o5zPA(-WP=lKC8!IjK%ynEYVpJGp
z9mwNRb!@rF^+gLMqsU0fKXFdiP}YPd{9--Wq=~xGl<1{L@@9scpILBHM=dDtfE8zX
zjYEEHGO}rCVvcV>c71(q{&%xikbNJePXTP=!VSI(O<!top@R7+;AzoY5cYf#&FbxS
z+>U4ojl2*H^V}LA4@0FuL)+hC4ly{PGmX~Z*g{Zo9un%3=<=Co8ndBZ@lbKcHOBYv
z-=Wb+kMFtZTKH{;;N_k?1)C5cloNu4d1b#^?Xc1mOV;GH2j1$pG?H-cyqyo;$YE&-
zM<<&a88+}jHoKdgnW1Wpf=YZCwq6NO7O*g$R|gvj9iEocUOFT3^=>lt^7>D~?@92H
zNTvGCEOW)mkg<vyCbst>0|Szt=Zn2lIRbKv=_*(QOBNj1A3rKVR@#9=T_zo-G_{X3
ztsls(+p*rB(WaBLviinYwJD46beH(h+PzNh#O3XdTkh}g%UwnuiCBh1rNCj(FASyp
ztmpVRO`y3Fv@_4P2_9+iJkxuJenm=Pd)=IUgtZoAJ6ED!Z#5a^B}Aqs4@H;(D91*9
z9P{it<9UQ!$Us({0f-*)ru#g`-%`~r8|h>kWg04~kXRDZImg+e&-nLUz6(x-bsY6y
zt*oq#;ARm9Otrh>RjBS#KpQc<BbcMRw(aJdI2waFXeri#U#?zqVJGqg;-Sb+aC#86
z4LwRfE^CY~_to6&?D6ZJTsQexM4R~vVqD`)*@G3QYp@k?wAghfpVMeZsHMgj)tB-|
zy|q&YbALK}_|km1cI8Z#{v>0fnBRhLOs<7+(ECJmJ4hmpZd_rV-<%G<7@pUAMBlOT
z2$4l?_1$w_>9V2$>AzrWIc{p|Fle5`v6Sf@qD|Y?_js%Al!u6fbiMl~G+MLO&z?O_
zCMnviM=T6Dd<i!t4<(1n*VJ<DnVMfux(aQpZ_t`iM-vj_1RBV9nKmvlxDWS7K7YHW
zZbgW0TE2lp?<yHI=a7mkg`TO-X6s-4U%!3{(}G75sT>x+Nf8=CQCzFyIY~w)t^z9v
z3OXH+$K{BRy7bi047CINeEn%s&0t}At=+R8@VT{X-V^OGGNNs&g0_~2NdStJRyz*z
zC)tMO8;kr5$K4g@uE8+IS1kr~h1cemp51i^p6lKiVlLb5C6aHt?EcGKab%1&nWL#S
zxTHq+KQM^Z26FdN?_S%|k;uGNgfH)Ro?Q;dgk&fNz8`_d@?c~ohz8>d$AaFrX@czm
z;kcds)!9NK=s4{SzRN{P;p<nctK9|0*<Q88q@=#(Mtihe-@DTzp7*)Ui=Fm_3h4$*
zEGWIcI7<?;R&ZDMwL9;>dq=EZ`MXfKFE>CQ&Nh1)CDdwEiN-2X+8T46=8*IpeFWf_
z@DDW;g`sgJAvpBMsewrisF+Xym0=QKUBikZ{cy2bTiBB@YA-9dzlCeC+z_jf-Q@D{
zl=JxwPiB558BvM{cw*Mo)kU0!KmVZ8)nriPyTFo50x{?fY76B<X?rc3v>KONtd36(
z77+cUASZ`C9ZNENs9K1YY2V<uGWBqRNPlPwx`joFL<w_`=E-*afuegprKbTf<LCrg
z-!3DRD{btt6#kPfhGO>*^JV%LTU;Wd5$inQ>j_Wg_`lwp(2(C}3ZK{R1n#&XJ}PgI
zjVPVWS-cDWqh1>V+xnS`GyzMU<>E;F|LgCo-*OzRtkajniA?{XL2`7KtfaKG7KHOj
zX_B`d3~w{rK+iribGp$j0&E1zPw{RpJ(KhZhx|XO6xpF+au%M~aeNdJ>@+U^)&LDK
z!~6TnV4yAL_dH5VjgxtOAT`Bmq_F?Xyr>D*M0T{Woi{Oe=dWp#9VklEUJwPR$b2g}
z%ykHf3^^V9zSXhY@i$X1wcC%8k$0XV-PXS?h|U*^KVvC`%5@|H2?;8uuuy!a=;7&^
z%W^?DOkgc(k;*hj)z@%*hk+D;NEbQsv;KhZ_Er4!$WkOoR`E4@be_?-r5y=l_w3EP
z`iC&oNjZ1ldRndK3Qa9hq3@z;WuKWlAKNapttoldzhF>E8L|b#1pRt8LuGr}j7BRU
z(B#~~iV^(IJOvBz>pQj`sC#ro<8yzq2^rtcfi~Svp-emV)#)%}2PKxtPG(=gU;XB|
zo8y=9bXHEcp@|AjM(sxh`W%Gwlwj;OCq~eykLvCdDRceCjH?MtF3Q9Z#Yl=Qxi|K&
zA-lQjZ(kVRrnuMScA?W2MBB_C$_Z}s?V0-~W7Gj%I*WjO4ODG>k|&gwmVW1UFfn@O
zAv1lNY8*gJSELa*F3v_#r*z_Ed6{IKT2q<@Wl#;1lpmC~qCh#KX+8u72GLDUQcOdM
zHJM=K1nZ1I6AhuOK=!Y~!k^n|)-FoRl7r2$bFh3L=5wyAl#kQjeAwEJ0QEkSxXGuw
zqVe6Ie1KaW=j>e0hes|H&WV71h@S`TdO8#bxHsK;lJi|r4x#_0rKj$`haa><r~9z&
zIurCp_$Zs5mZF3P1qj(Ua)q=aL<5EWAHA9Kpdbs?xQBD?%I8lPowQdd6L5T!rxy$2
z%}2>qs&FLmB3qd~^`gAa$f2$=lIa+TFy%m?nQ!5GC9@#TdJ4Jvs6rJ5wL;v5_2g(@
zns-zIc&{wgsq*g*<lJ(59CvT2-a6;$j{$`)`Lm*P>O!xfW>0}#Gn_q)GVQ5M;JQ}!
z`MP8^LQ3|)bKJvD#)o%=ljXQr6ZP0Ll3}g9>9W(~mXEzc1GM<vd$<34>}MaBN#O51
zv;KFNXKyNA-UYsppBxEqBVJ#8Cn-f#Cj1OYcL{p~ND<P;#jC_W^P8$RS_eYtX60a4
zL15`{9{UjE0IW(}VtPNXJEE1TJn~5;gQ)+<O1Eu|gHy=OFJO4{ypN1UDGyXC0}2#R
zM{VbqRmM>92oIHheW#wj<f3MPS%L4K4K>9EHAJ9gMxxyWoo(4}PJt(y6;_x68#P#x
z6-kd^5{><7?zbKtee2TCG1*%k85<kAJSGEC3yZDFu#}`O|8qq?-#dripkmSWWRv<z
zW<422#Ta8Jt@#%mcI3k!3KQm=f)QtQinV%`MN#MYK~kW1n=QTnh9nY!@t*nz{$tc$
z>!7?V2<Oa~b7-)tXM_<s3Z%-K6iUZtKrWxn5a1k^>JYWzU{6&lIHCt<g=iTC#3<9Y
z*_xQ`)YS-g;fbyYmF5_z&7!41%laB;zNA%Ogs_RwO1sFh7>Eiw>8>;-Fx&Es*5dD>
z`kC|o*AJrWU7~pYSx&%u3a@h^F!+89$C5Y}#c=V=R4u~@Q8%sJ;6O}KV$4@V^JUDc
z{zdhXv53m}%8!I7+?v{xfo<Jxu5*?&^<7@lVJLLa3Z-7?(A)e|P9(3>Y6k64j43or
zmlr&ZjfnWhYaU9ui~2r6ytiLOjsfFOHLNxz`oC1Q@Z+c3Dxj=P>q}Cj6i7TsJMe%`
z_{#7So^94{E?%=?vH-l4b%+9;!^0zGe!@gNnXer0mk0;<gkZLC`;1LZ6+=FDZnM%F
zI~n^#o2B>MBPZLYgX~@m<>`^oKUnZ*cz+`u;SDk&|D%<&>~US~ln(LbM)=e#W|V^y
zMFU?APX=Wspy;`lF-MXP`AisL*nMXPP=IFBP?cR|J{;$Mx>&1%H#;#g0m|X`RD@+G
zC8S~@B<;a6uZ*0(SlxyFTdb5#GSTOU)OTpoxHOc$<BPDZ;vR$Gqh6=zf^iR%VcvL@
zdYtrIUe=w`Sd5K8#->|sr)wS=la_`*>oATTLrouOI$f(W6fg|>@jFNgxlB$n3Xg+_
zoZQ6Fz~HA>?akQy0fFfB^K_2oA%yJ9Zjf>%Pba1J(pU@w^$bdMS=d&~?IYdaKNS~Y
z;o<To3i9$}{3e8Po1cM)V-cY@1__JT5?qY!vEv8&PZ@9(P(`68G4hC`9VV%*qrnV^
zl-UnlI-D7Na1H7XjAjvGC6F8M*@CP55SMQ?rL06w`KF#LfTSNpua#}|5Tqu!S(g02
z)W##VPL1DO+%fcx)BZRD*R->E;#jxrezD!B4Oc~sW0=U=1VM1>Wv?7m8Avq2-yz4C
z?SgI6b@UlDmwmum_#7#fSRE46CsvxgIIn)MvZH}8+Cy*^S-*V40BZG#J_(le8fi{B
z58S!3^rp|t`XcShkAWzv_d2aX+BaiLs<yZFJiRowJg52Ym5k-{<fuo}bPx>ml9T!>
JStV`~{2weRDWU)X

diff --git a/doc/logo.svg b/doc/logo.svg
index 82094ad4ea..0aa6323f9e 100644
--- a/doc/logo.svg
+++ b/doc/logo.svg
@@ -50,7 +50,7 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:zoom="0.52149125"
-     inkscape:cx="299.73684"
+     inkscape:cx="303.572"
      inkscape:cy="574.48012"
      inkscape:window-x="0"
      inkscape:window-y="25"
@@ -63,7 +63,8 @@
        inkscape:connector-curvature="0"
        id="path22"
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 242.52213,467.0015 c 0,0 14.504,-15.146 -2,-30 -40,-36 -140,-34 -189,-102 -30,-47 -76,-183 71,-273 66,-34 94,-33 94,-33 0,0 -44,31 -16,52 28,21 69,31 80,60 13,-10 34,-31 54,-29 -2,13 -7,18 9,20 16,2 24,2 24,2 0,0 -15,12 -32,13 -17,1 -49,34 -48,48 21,12 48,32 64,26 16,-6 32,-16 35,-25 0,-6 -3,-16 10,-8 13,8 10,13 15,24 5,11 6,13 -5,22 -11,9 -37,30 -58,24 -21,-6 -65,-23 -87,-2 9,20 23,52 16,74 13,10 28,21 30,39 15,2 47,11 41,27 -6,16 -41,85 -106,71" /><path
+       d="m 233.97976,469.37438 c 0,0 7.01353,-14.94848 -2.94916,-31.42373 -4.97925,-8.23417 -130.50847,-34.94915 -179.50847,-102.94915 -30,-47 -76,-183 71,-273 66,-34 94,-33 94,-33 0,0 -44,31 -16,52 28,21 69,31 80,60 13,-10 34,-31 54,-29 -2,13 -7,18 9,20 16,2 24,2 24,2 0,0 -15,12 -32,13 -17,1 -49,34 -48,48 21,12 48,32 64,26 16,-6 32,-16 35,-25 0,-6 -3,-16 10,-8 13,8 10,13 15,24 5,11 6,13 -5,22 -11,9 -37,30 -58,24 -21,-6 -65,-23 -87,-2 9,20 23,52 16,74 13,10 28,21 30,39 15,2 47,11 41,27 -6,16 -48.59322,87.16949 -113.59322,73.16949"
+       sodipodi:nodetypes="cscccsccscscscsssscccsc" /><path
        inkscape:connector-curvature="0"
        id="path26"
        style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"

From b27ca620a0ef7fc086645c7977cf660b333fef64 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 17 Oct 2014 23:19:59 +0200
Subject: [PATCH 1625/4742] Add Max Xiantu to AUTHORS

The artist who drew the new logo
---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 362fd94a7e..65732c44dc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -251,6 +251,7 @@ mauricio
 Maximilian Hils
 Maxim Kraev
 Max Kirsch
+Max Xiantu
 mbarkhau
 Metatheos
 Micah Dubinko

From 0f371f4067e0e93e45207c814a2224f2e60a2b82 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 19 Oct 2014 23:31:33 +0200
Subject: [PATCH 1626/4742] [simple mode addon] Add support for pushed/popped
 states

---
 addon/mode/simple.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index 7299eaeb34..b32114abeb 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -40,6 +40,8 @@
                  indent: state.indent && state.indent.slice(0)};
         if (state.localState)
           s.localState = CodeMirror.copyState(state.local.mode, state.localState);
+        if (state.stack)
+          s.stack = state.stack.slice(0);
         for (var pers = state.persistentStates; pers; pers = pers.next)
           s.persistentStates = {mode: pers.mode,
                                 spec: pers.spec,
@@ -83,7 +85,7 @@
   }
 
   function Rule(data, states) {
-    if (data.next) ensureState(states, data.next);
+    if (data.next || data.push) ensureState(states, data.next || data.push);
     this.regex = toRegex(data.regex);
     this.token = asToken(data.token);
     this.data = data;
@@ -116,8 +118,15 @@
         var rule = curState[i];
         var matches = stream.match(rule.regex);
         if (matches) {
-          if (rule.data.next)
+          if (rule.data.next) {
             state.state = rule.data.next;
+          } else if (rule.data.push) {
+            (state.stack || (state.stack = [])).push(state.state);
+            state.state = rule.data.push;
+          } else if (rule.data.pop && state.stack && state.stack.length) {
+            state.state = state.stack.pop();
+          }
+            
           if (rule.data.mode)
             enterLocalMode(config, state, rule.data.mode, rule.token);
           if (rule.data.indent)
@@ -127,8 +136,9 @@
           if (matches.length > 2) {
             state.pending = [];
             for (var j = 2; j < matches.length; j++)
-              state.pending.push({text: matches[j], token: rule.token[j - 1]});
-            stream.backUp(matches[0].length - matches[1].length);
+              if (matches[j])
+                state.pending.push({text: matches[j], token: rule.token[j - 1]});
+            stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
             return rule.token[0];
           } else if (rule.token && rule.token.join) {
             return rule.token[0];
@@ -185,9 +195,9 @@
       scan: for (;;) {
         for (var i = 0; i < rules.length; i++) {
           var rule = rules[i], m = rule.regex.exec(textAfter);
-          if (m) {
+          if (m && m[0]) {
             if (rule.data.dedent && rule.data.dedentIfLineStart !== false) pos--;
-            if (rule.next) rules = states[rule.next];
+            if (rule.next || rule.push) rules = states[rule.next || rule.push];
             textAfter = textAfter.slice(m[0].length);
             continue scan;
           }

From 4bd6fea3753c16448d291257cd565269849e6b5f Mon Sep 17 00:00:00 2001
From: Dimage Sapelkin <kerabromsmu@users.noreply.github.com>
Date: Sun, 19 Oct 2014 16:27:44 +0400
Subject: [PATCH 1627/4742] [rust mode] Add struct and loop keywords

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

diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index 4ca1a76af6..b45dacbe9a 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -14,7 +14,7 @@
 CodeMirror.defineMode("rust", function() {
   var indentUnit = 4, altIndentUnit = 2;
   var valKeywords = {
-    "if": "if-style", "while": "if-style", "else": "else-style",
+    "if": "if-style", "while": "if-style", "loop": "else-style", "else": "else-style",
     "do": "else-style", "ret": "else-style", "fail": "else-style",
     "break": "atom", "cont": "atom", "const": "let", "resource": "fn",
     "let": "let", "fn": "fn", "for": "for", "alt": "alt", "iface": "iface",
@@ -22,7 +22,7 @@ CodeMirror.defineMode("rust", function() {
     "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op",
     "claim": "op", "native": "ignore", "unsafe": "ignore", "import": "else-style",
     "export": "else-style", "copy": "op", "log": "op", "log_err": "op",
-    "use": "op", "bind": "op", "self": "atom"
+    "use": "op", "bind": "op", "self": "atom", "struct": "enum",
   };
   var typeKeywords = function() {
     var keywords = {"fn": "fn", "block": "fn", "obj": "obj"};

From 8cd6cbf41de3d8535db75cbe1c36ad4031a16cd2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 19 Oct 2014 23:35:13 +0200
Subject: [PATCH 1628/4742] Fix lint errors

---
 addon/mode/simple.js | 2 +-
 mode/rust/rust.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index b32114abeb..a4a86b9a65 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -126,7 +126,7 @@
           } else if (rule.data.pop && state.stack && state.stack.length) {
             state.state = state.stack.pop();
           }
-            
+
           if (rule.data.mode)
             enterLocalMode(config, state, rule.data.mode, rule.token);
           if (rule.data.indent)
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index b45dacbe9a..2bffa9a6aa 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -22,7 +22,7 @@ CodeMirror.defineMode("rust", function() {
     "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op",
     "claim": "op", "native": "ignore", "unsafe": "ignore", "import": "else-style",
     "export": "else-style", "copy": "op", "log": "op", "log_err": "op",
-    "use": "op", "bind": "op", "self": "atom", "struct": "enum",
+    "use": "op", "bind": "op", "self": "atom", "struct": "enum"
   };
   var typeKeywords = function() {
     var keywords = {"fn": "fn", "block": "fn", "obj": "obj"};

From 9758daa839a326818683a01b1bfe4dedabbbb852 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 09:41:29 +0200
Subject: [PATCH 1629/4742] Make tabs inherit the surrounding text decoration

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

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 6b9ca0238d..68c67b170a 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -87,7 +87,7 @@
 /* Can style cursor different in overwrite (non-insert) mode */
 div.CodeMirror-overwrite div.CodeMirror-cursor {}
 
-.cm-tab { display: inline-block; }
+.cm-tab { display: inline-block; text-decoration: inherit; }
 
 .CodeMirror-ruler {
   border-left: 1px solid #ccc;

From 5c06606e3cb44c7cbbe7aaaa381deefa965c4d7c Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Sat, 18 Oct 2014 16:48:59 -0500
Subject: [PATCH 1630/4742] [continuelist addon] blockquote support for
 newlineAndIndentContinueMarkdownList

Closes #2874
---
 addon/edit/continuelist.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 56f54c9227..9ad0a98fa0 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -11,8 +11,8 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var listRE = /^(\s*)([*+-]|(\d+)\.)(\s+)/,
-      emptyListRE = /^(\s*)([*+-]|(\d+)\.)(\s*)$/,
+  var listRE = /^(\s*)([> ]+|[*+-]|(\d+)\.)(\s+)/,
+      emptyListRE = /^(\s*)([> ]+|[*+-]|(\d+)\.)(\s*)$/,
       unorderedBullets = "*+-";
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
@@ -20,9 +20,11 @@
     var ranges = cm.listSelections(), replacements = [];
     for (var i = 0; i < ranges.length; i++) {
       var pos = ranges[i].head, match;
-      var inList = cm.getStateAfter(pos.line).list !== false;
+      var eolState = cm.getStateAfter(pos.line);
+      var inList = eolState.list !== false;
+      var inQuote = eolState.quote !== false;
 
-      if (!ranges[i].empty() || !inList || !(match = cm.getLine(pos.line).match(listRE))) {
+      if (!ranges[i].empty() || (!inList && !inQuote) || !(match = cm.getLine(pos.line).match(listRE))) {
         cm.execCommand("newlineAndIndent");
         return;
       }
@@ -36,7 +38,7 @@
 
       } else {
         var indent = match[1], after = match[4];
-        var bullet = unorderedBullets.indexOf(match[2]) >= 0
+        var bullet = unorderedBullets.indexOf(match[2]) >= 0 || match[2].indexOf(">") >= 0
           ? match[2]
           : (parseInt(match[3], 10) + 1) + ".";
 

From cc953bf9bd4fc5e5ffcff5819ad433477cbe4d2a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 19 Oct 2014 19:04:18 +0200
Subject: [PATCH 1631/4742] [Julia] Add support for unicode identifier.

---
 mode/julia/index.html | 9 +++++++++
 mode/julia/julia.js   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mode/julia/index.html b/mode/julia/index.html
index 20e9e97456..e1492c210f 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -51,6 +51,14 @@ <h2>Julia mode</h2>
 as123
 function_name!
 
+#unicode identifiers
+# a = x\ddot
+a⃗ = ẍ
+# a = v\dot
+a⃗ = v̇
+#F\vec = m \cdotp a\vec
+F⃗ = m·a⃗
+
 #literal identifier multiples
 3x
 4[1, 2, 3]
@@ -60,6 +68,7 @@ <h2>Julia mode</h2>
 x[end-1]
 x={"julia"=>"language of technical computing"}
 
+
 #exception handling
 try
   f()
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 5dd1afce90..e854988aa3 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -20,7 +20,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
   var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b/;
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
-  var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*!*/;
+  var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
   var blockClosers = ["end", "else", "elseif", "catch", "finally"];
   var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];

From 31a4d5b8fbe42c7303ef0bde9d37e434b4b55654 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Sun, 19 Oct 2014 19:29:03 +0200
Subject: [PATCH 1632/4742] Allow unicode identifiers on python3, and @
 operator.

---
 mode/python/index.html | 20 ++++++++++++++++----
 mode/python/python.js  | 21 +++++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/mode/python/index.html b/mode/python/index.html
index dcd7fe5a82..86eb3d52f7 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -65,13 +65,25 @@ <h2>Python mode</h2>
 a.b
 a.b.c
 
+#Unicode identifiers on Python3
+# a = x\ddot
+a⃗ = ẍ
+# a = v\dot
+a⃗ = v̇
+
+#F\vec = m \cdot a\vec
+F⃗ = m•a⃗ 
+
 # Operators
 + - * / % & | ^ ~ < >
 == != <= >= <> << >> // **
 and or not in is
 
+#infix matrix multiplication operator (PEP 465)
+A @ B
+
 # Delimiters
-() [] {} , : ` = ; @ .  # Note that @ and . require the proper context.
+() [] {} , : ` = ; @ .  # Note that @ and . require the proper context on Python 2.
 += -= *= /= %= &= |= ^=
 //= >>= <<= **=
 
@@ -146,7 +158,7 @@ <h2>Cython mode</h2>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: {name: "python",
-               version: 2,
+               version: 3,
                singleLineStringErrors: false},
         lineNumbers: true,
         indentUnit: 4,
@@ -171,12 +183,12 @@ <h2>Configuration Options for Python mode:</h2>
     <h2>Advanced Configuration Options:</h2>
     <p>Usefull for superset of python syntax like Enthought enaml, IPython magics and  questionmark help</p>
     <ul>
-      <li>singleOperators - RegEx - Regular Expression for single operator matching,  default : <pre>^[\\+\\-\\*/%&amp;|\\^~&lt;&gt;!]</pre></li>
+      <li>singleOperators - RegEx - Regular Expression for single operator matching,  default : <pre>^[\\+\\-\\*/%&amp;|\\^~&lt;&gt;!]</pre> including <pre>@</pre> on Python 3</li>
       <li>singleDelimiters - RegEx - Regular Expression for single delimiter matching, default :  <pre>^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]</pre></li>
       <li>doubleOperators - RegEx - Regular Expression for double operators matching, default : <pre>^((==)|(!=)|(&lt;=)|(&gt;=)|(&lt;&gt;)|(&lt;&lt;)|(&gt;&gt;)|(//)|(\\*\\*))</pre></li>
       <li>doubleDelimiters - RegEx - Regular Expressoin for double delimiters matching, default : <pre>^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&amp;=)|(\\|=)|(\\^=))</pre></li>
       <li>tripleDelimiters - RegEx - Regular Expression for triple delimiters matching, default : <pre>^((//=)|(&gt;&gt;=)|(&lt;&lt;=)|(\\*\\*=))</pre></li>
-      <li>identifiers - RegEx - Regular Expression for identifier, default : <pre>^[_A-Za-z][_A-Za-z0-9]*</pre></li>
+      <li>identifiers - RegEx - Regular Expression for identifier, default : <pre>^[_A-Za-z][_A-Za-z0-9]*</pre> on Python 2 and <pre>^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*</pre> on Python 3.</li>
       <li>extra_keywords - list of string - List of extra words ton consider as keywords</li>
       <li>extra_builtins - list of string - List of extra words ton consider as builtins</li>
     </ul>
diff --git a/mode/python/python.js b/mode/python/python.js
index 4e1f296ae1..98c0409ae2 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -48,12 +48,20 @@
   CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = "error";
 
-    var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
     var singleDelimiters = parserConf.singleDelimiters || new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]");
     var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
     var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
     var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
-    var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+
+    if (parserConf.version && parseInt(parserConf.version, 10) == 3){
+        // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
+        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!@]");
+        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
+    } else {
+        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
+        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+    }
+
     var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
 
     var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
@@ -252,8 +260,13 @@
       }
 
       // Handle decorators
-      if (current == "@")
-        return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
+      if (current == "@"){
+        if(parserConf.version && parseInt(parserConf.version, 10) == 3){
+            return stream.match(identifiers, false) ? "meta" : "operator";
+        } else {
+            return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
+        }
+      }
 
       if ((style == "variable" || style == "builtin")
           && state.lastStyle == "meta")

From 36870ca22bd3cfac75fbf6c14d1d6da79f7e3d48 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 14:38:38 +0200
Subject: [PATCH 1633/4742] Parse unicode identifiers in clike, clojure, d, go,
 haskell, js, octave, ruby, and tcl modes

---
 mode/clike/clike.js           |  2 +-
 mode/clojure/clojure.js       |  8 +++++---
 mode/d/d.js                   |  2 +-
 mode/go/go.js                 |  2 +-
 mode/haskell/haskell.js       |  2 +-
 mode/javascript/javascript.js |  2 +-
 mode/octave/octave.js         |  2 +-
 mode/ruby/ruby.js             | 12 ++++++------
 mode/tcl/tcl.js               |  2 +-
 9 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index ee2c77a025..983a45734b 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -57,7 +57,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       stream.eatWhile(isOperatorChar);
       return "operator";
     }
-    stream.eatWhile(/[\w\$_]/);
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 73bfcd39b5..c334de7300 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -18,7 +18,7 @@
 
 CodeMirror.defineMode("clojure", function (options) {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword";
+        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword", VAR = "variable";
     var INDENT_WORD_SKIP = options.indentUnit || 2;
     var NORMAL_INDENT_UNIT = options.indentUnit || 2;
 
@@ -59,7 +59,7 @@ CodeMirror.defineMode("clojure", function (options) {
         sign: /[+-]/,
         exponent: /e/i,
         keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:<>\/]/
+        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/
     };
 
     function stateStack(indent, type, prev) { // represents a state stack object
@@ -220,7 +220,9 @@ CodeMirror.defineMode("clojure", function (options) {
                             returnType = BUILTIN;
                         } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
                             returnType = ATOM;
-                        } else returnType = null;
+                        } else {
+                          returnType = VAR;
+                        }
                     }
             }
 
diff --git a/mode/d/d.js b/mode/d/d.js
index 2a0631203a..c927a7e358 100644
--- a/mode/d/d.js
+++ b/mode/d/d.js
@@ -60,7 +60,7 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
       stream.eatWhile(isOperatorChar);
       return "operator";
     }
-    stream.eatWhile(/[\w\$_]/);
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
diff --git a/mode/go/go.js b/mode/go/go.js
index 51b07c7c55..173e034d0c 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -71,7 +71,7 @@ CodeMirror.defineMode("go", function(config) {
       stream.eatWhile(isOperatorChar);
       return "operator";
     }
-    stream.eatWhile(/[\w\$_]/);
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) {
       if (cur == "case" || cur == "default") curPunc = "case";
diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index 66020788d1..fe0bab67ed 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -24,7 +24,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
   var digitRE = /\d/;
   var hexitRE = /[0-9A-Fa-f]/;
   var octitRE = /[0-7]/;
-  var idRE = /[a-z_A-Z0-9']/;
+  var idRE = /[a-z_A-Z0-9'\xa1-\uffff]/;
   var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:]/;
   var specialRE = /[(),;[\]`{}]/;
   var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 242abe21e1..74f96fbf1c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -19,7 +19,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var jsonldMode = parserConfig.jsonld;
   var jsonMode = parserConfig.json || jsonldMode;
   var isTS = parserConfig.typescript;
-  var wordRE = parserConfig.wordCharacters || /[\w$]/;
+  var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
 
   // Tokenizer
 
diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index 94314c4822..a7bec030c2 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -22,7 +22,7 @@ CodeMirror.defineMode("octave", function() {
   var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))");
   var tripleDelimiters = new RegExp("^((>>=)|(<<=))");
   var expressionEnd = new RegExp("^[\\]\\)]");
-  var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+  var identifiers = new RegExp("^[_A-Za-z\xa1-\uffff][_A-Za-z0-9\xa1-\uffff]*");
 
   var builtins = wordRegexp([
     'error', 'eval', 'function', 'abs', 'acos', 'atan', 'asin', 'cos',
diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 6c9977b531..5fe415cd19 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -107,16 +107,16 @@ CodeMirror.defineMode("ruby", function(config) {
       }
 
       // Symbols can't start by a digit
-      if (stream.eat(/[a-zA-Z$@_]/)) {
-        stream.eatWhile(/[\w]/);
+      if (stream.eat(/[a-zA-Z$@_\xa1-\uffff]/)) {
+        stream.eatWhile(/[\w$\xa1-\uffff]/);
         // Only one ? ! = is allowed and only as the last character
         stream.eat(/[\?\!\=]/);
         return "atom";
       }
       return "operator";
-    } else if (ch == "@" && stream.match(/^@?[a-zA-Z_]/)) {
+    } else if (ch == "@" && stream.match(/^@?[a-zA-Z_\xa1-\uffff]/)) {
       stream.eat("@");
-      stream.eatWhile(/[\w]/);
+      stream.eatWhile(/[\w\xa1-\uffff]/);
       return "variable-2";
     } else if (ch == "$") {
       if (stream.eat(/[a-zA-Z_]/)) {
@@ -127,8 +127,8 @@ CodeMirror.defineMode("ruby", function(config) {
         stream.next(); // Must be a special global like $: or $!
       }
       return "variable-3";
-    } else if (/[a-zA-Z_]/.test(ch)) {
-      stream.eatWhile(/[\w]/);
+    } else if (/[a-zA-Z_\xa1-\uffff]/.test(ch)) {
+      stream.eatWhile(/[\w\xa1-\uffff]/);
       stream.eat(/[\?\!]/);
       if (stream.eat(":")) return "atom";
       return "ident";
diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index 7be7b9b148..056accb2df 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -78,7 +78,7 @@ CodeMirror.defineMode("tcl", function() {
         return "comment";
       }
       else {
-        stream.eatWhile(/[\w\$_{}]/);
+        stream.eatWhile(/[\w\$_{}\xa1-\uffff]/);
         var word = stream.current().toLowerCase();
         if (keywords && keywords.propertyIsEnumerable(word))
           return "keyword";

From 62754f612abfb26a320ddc2582080eddce8fcb52 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 16:11:17 +0200
Subject: [PATCH 1634/4742] [ruby mode] Fix state-copying bug

---
 mode/ruby/ruby.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 5fe415cd19..eab9d9da7f 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -149,17 +149,18 @@ CodeMirror.defineMode("ruby", function(config) {
     }
   }
 
-  function tokenBaseUntilBrace() {
-    var depth = 1;
+  function tokenBaseUntilBrace(depth) {
+    if (!depth) depth = 1;
     return function(stream, state) {
       if (stream.peek() == "}") {
-        depth--;
-        if (depth == 0) {
+        if (depth == 1) {
           state.tokenize.pop();
           return state.tokenize[state.tokenize.length-1](stream, state);
+        } else {
+          state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth - 1);
         }
       } else if (stream.peek() == "{") {
-        depth++;
+        state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth + 1);
       }
       return tokenBase(stream, state);
     };

From f8f7cace333e5e61bfe1edd3f675359a13dcf6af Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 16:22:43 +0200
Subject: [PATCH 1635/4742] [php mode] Highlight interpolated vars in heredoc
 strings

Closes #2855
---
 mode/php/php.js  | 81 ++++++++++++++++++++++--------------------------
 mode/php/test.js |  6 ++++
 2 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index f8821ed651..e112d91121 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -16,32 +16,24 @@
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
-  function heredoc(delim) {
-    return function(stream, state) {
-      if (stream.match(delim)) state.tokenize = null;
-      else stream.skipToEnd();
-      return "string";
-    };
-  }
 
   // Helper for stringWithEscapes
-  function matchSequence(list) {
-    if (list.length == 0) return stringWithEscapes;
+  function matchSequence(list, end) {
+    if (list.length == 0) return stringWithEscapes(end);
     return function (stream, state) {
       var patterns = list[0];
       for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0])) {
-        state.tokenize = matchSequence(list.slice(1));
+        state.tokenize = matchSequence(list.slice(1), end);
         return patterns[i][1];
       }
-      state.tokenize = stringWithEscapes;
+      state.tokenize = stringWithEscapes(end);
       return "string";
     };
   }
-  function stringWithEscapes(stream, state) {
-    var escaped = false, next, end = false;
-
-    if (stream.current() == '"') return "string";
-
+  function stringWithEscapes(closing) {
+    return function(stream, state) { return stringWithEscapes_(stream, state, closing); };
+  }
+  function stringWithEscapes_(stream, state, closing) {
     // "Complex" syntax
     if (stream.match("${", false) || stream.match("{$", false)) {
       state.tokenize = null;
@@ -49,7 +41,7 @@
     }
 
     // Simple syntax
-    if (stream.match(/\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
+    if (stream.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
       // After the variable name there may appear array or object operator.
       if (stream.match("[", false)) {
         // Match array operator
@@ -59,31 +51,29 @@
            [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
            [/[\w\$]+/, "variable"]],
           [["]", null]]
-        ]);
+        ], closing);
       }
       if (stream.match(/\-\>\w/, false)) {
         // Match object operator
         state.tokenize = matchSequence([
           [["->", null]],
           [[/[\w]+/, "variable"]]
-        ]);
+        ], closing);
       }
       return "variable-2";
     }
 
+    var escaped = false;
     // Normal string
-    while (
-      !stream.eol() &&
-      (!stream.match("{$", false)) &&
-      (!stream.match(/(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false) || escaped)
-    ) {
-      next = stream.next();
-      if (!escaped && next == '"') { end = true; break; }
-      escaped = !escaped && next == "\\";
-    }
-    if (end) {
-      state.tokenize = null;
-      state.phpEncapsStack.pop();
+    while (!stream.eol() &&
+           (escaped || (!stream.match("{$", false) &&
+                        !stream.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false)))) {
+      if (!escaped && stream.match(closing)) {
+        state.tokenize = null;
+        state.tokStack.pop(); state.tokStack.pop();
+        break;
+      }
+      escaped = stream.next() == "\\" && !escaped;
     }
     return "string";
   }
@@ -115,8 +105,12 @@
       "<": function(stream, state) {
         if (stream.match(/<</)) {
           stream.eatWhile(/[\w\.]/);
-          state.tokenize = heredoc(stream.current().slice(3));
-          return state.tokenize(stream, state);
+          var delim = stream.current().slice(3);
+          if (delim) {
+            (state.tokStack || (state.tokStack = [])).push(delim, 0);
+            state.tokenize = stringWithEscapes(delim);
+            return "string";
+          }
         }
         return false;
       },
@@ -131,22 +125,21 @@
         }
         return false;
       },
-      '"': function(stream, state) {
-        if (!state.phpEncapsStack)
-          state.phpEncapsStack = [];
-        state.phpEncapsStack.push(0);
-        state.tokenize = stringWithEscapes;
-        return state.tokenize(stream, state);
+      '"': function(_stream, state) {
+        (state.tokStack || (state.tokStack = [])).push('"', 0);
+        state.tokenize = stringWithEscapes('"');
+        return "string";
       },
       "{": function(_stream, state) {
-        if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
-          state.phpEncapsStack[state.phpEncapsStack.length - 1]++;
+        if (state.tokStack && state.tokStack.length)
+          state.tokStack[state.tokStack.length - 1]++;
         return false;
       },
       "}": function(_stream, state) {
-        if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
-          if (--state.phpEncapsStack[state.phpEncapsStack.length - 1] == 0)
-            state.tokenize = stringWithEscapes;
+        if (state.tokStack && state.tokStack.length > 0 &&
+            !--state.tokStack[state.tokStack.length - 1]) {
+          state.tokenize = stringWithEscapes(state.tokStack[state.tokStack.length - 2]);
+        }
         return false;
       }
     }
diff --git a/mode/php/test.js b/mode/php/test.js
index 8305496571..e2ecefc187 100644
--- a/mode/php/test.js
+++ b/mode/php/test.js
@@ -145,4 +145,10 @@
      '[keyword echo] ' + m3[2] + ';',
      '[keyword echo] [string "end"];',
      '[meta ?>]');
+
+  MT("variable_interpolation_heredoc",
+     "[meta <?php]",
+     "[string <<<here]",
+     "[string doc ][variable-2 $]{[variable yay]}[string more]",
+     "[string here]; [comment // normal]");
 })();

From 7dfbf42ef04e9eb6e9a211302fee7d1ceb56b2fa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 16:49:26 +0200
Subject: [PATCH 1636/4742] [javascript mode] Fix indentation after
 trailing-comma array

Closes #2753
---
 mode/javascript/javascript.js | 2 +-
 mode/javascript/test.js       | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 74f96fbf1c..b0ba8d017f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -590,7 +590,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function maybeArrayComprehension(type) {
     if (type == "for") return pass(comprehension, expect("]"));
-    if (type == ",") return cont(commasep(expressionNoComma, "]"));
+    if (type == ",") return cont(commasep(maybeexpressionNoComma, "]"));
     return pass(commasep(expressionNoComma, "]"));
   }
   function comprehension(type) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 77cc695fef..aaeb8e0c07 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -147,6 +147,13 @@
   MT("scary_regexp",
      "[string-2 /foo[[/]]bar/];");
 
+  MT("indent_strange_array",
+     "[keyword var] [variable x] [operator =] [[",
+     "  [number 1],,",
+     "  [number 2],",
+     "]];",
+     "[number 10];");
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From e7761e7eae01e24f71762be6f9ec8188f299a9f5 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <lushnikov@chromium.org>
Date: Mon, 20 Oct 2014 18:42:50 +0400
Subject: [PATCH 1637/4742] fix comment.js plugin

---
 addon/comment/comment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index d7f569cc00..2dd114d332 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -109,7 +109,7 @@
   CodeMirror.defineExtension("uncomment", function(from, to, options) {
     if (!options) options = noOptions;
     var self = this, mode = self.getModeAt(from);
-    var end = Math.min(to.line, self.lastLine()), start = Math.min(from.line, end);
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
 
     // Try finding line comments
     var lineString = options.lineComment || mode.lineComment, lines = [];

From 8a41f75c3939c0d56f4a4131d63d776199f55cc0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 17:37:18 +0200
Subject: [PATCH 1638/4742] [clike mode] Add triple-quoted string support for
 Scala

---
 mode/clike/clike.js   | 23 +++++++++++++++++++++--
 mode/clike/index.html | 27 ++++++++++++++++++++++++---
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 983a45734b..dc20003c2b 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -298,6 +298,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     },
     modeProps: {fold: ["brace", "include"]}
   });
+
   def("text/x-java", {
     name: "clike",
     keywords: words("abstract assert boolean break byte case catch char class const continue default " +
@@ -315,6 +316,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     },
     modeProps: {fold: ["brace", "import"]}
   });
+
   def("text/x-csharp", {
     name: "clike",
     keywords: words("abstract as base break case catch checked class const continue" +
@@ -341,6 +343,19 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
     }
   });
+
+  function tokenTripleString(stream, state) {
+    var escaped = false;
+    while (!stream.eol()) {
+      if (!escaped && stream.match('"""')) {
+        state.tokenize = null;
+        break;
+      }
+      escaped = stream.next() != "\\" && !escaped;
+    }
+    return "string";
+  }
+
   def("text/x-scala", {
     name: "clike",
     keywords: words(
@@ -366,8 +381,6 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
       "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
       "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
-
-
     ),
     multiLineStrings: true,
     blockKeywords: words("catch class do else finally for forSome if match switch try while"),
@@ -376,9 +389,15 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);
         return "meta";
+      },
+      '"': function(stream, state) {
+        if (!stream.match('""')) return false;
+        state.tokenize = tokenTripleString;
+        return state.tokenize(stream, state);
       }
     }
   });
+
   def(["x-shader/x-vertex", "x-shader/x-fragment"], {
     name: "clike",
     keywords: words("float int bool void " +
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 17d93a07cd..639ac39860 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -169,6 +169,21 @@ <h2>Java example</h2>
     member = value;
   }
 }
+</textarea></div>
+
+<h2>Scala example</h2>
+
+<div><textarea id="scala-code">
+object FilterTest extends App {
+  def filter(xs: List[Int], threshold: Int) = {
+    def process(ys: List[Int]): List[Int] =
+      if (ys.isEmpty) ys
+      else if (ys.head < threshold) ys.head :: process(ys.tail)
+      else process(ys.tail)
+    process(xs)
+  }
+  println(filter(List(1, 9, 2, 8, 3, 7, 4), 5))
+}
 </textarea></div>
 
     <script>
@@ -187,6 +202,11 @@ <h2>Java example</h2>
         matchBrackets: true,
         mode: "text/x-java"
       });
+      var scalaEditor = CodeMirror.fromTextArea(document.getElementById("scala-code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-scala"
+      });
       var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
       CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
     </script>
@@ -198,7 +218,8 @@ <h2>Java example</h2>
     directives are recognized.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-csrc</code>
-    (C code), <code>text/x-c++src</code> (C++
-    code), <code>text/x-java</code> (Java
-    code), <code>text/x-csharp</code> (C#).</p>
+    (C), <code>text/x-c++src</code> (C++), <code>text/x-java</code>
+    (Java), <code>text/x-csharp</code> (C#),
+    <code>text/x-scala</code> (Scala), <code>text/x-vertex</code>
+    and <code>x-shader/x-fragment</code> (shader programs).</p>
 </article>

From 7dbe84e66fdfd31ceb0901e860a804b5c7108e6c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 17:40:05 +0200
Subject: [PATCH 1639/4742] [clike mode] Add indentStatements option, disable
 in Scala mode

---
 mode/clike/clike.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index dc20003c2b..0f24bb8497 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -20,7 +20,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       blockKeywords = parserConfig.blockKeywords || {},
       atoms = parserConfig.atoms || {},
       hooks = parserConfig.hooks || {},
-      multiLineStrings = parserConfig.multiLineStrings;
+      multiLineStrings = parserConfig.multiLineStrings,
+      indentStatements = parserConfig.indentStatements !== false;
   var isOperatorChar = /[+\-*&%=<>!?|\/]/;
 
   var curPunc;
@@ -151,7 +152,9 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         while (ctx.type == "statement") ctx = popContext(state);
       }
       else if (curPunc == ctx.type) popContext(state);
-      else if (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') || (ctx.type == "statement" && curPunc == "newstatement"))
+      else if (indentStatements &&
+               (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') ||
+                (ctx.type == "statement" && curPunc == "newstatement")))
         pushContext(state, stream.column(), "statement");
       state.startOfLine = false;
       return style;
@@ -385,6 +388,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     multiLineStrings: true,
     blockKeywords: words("catch class do else finally for forSome if match switch try while"),
     atoms: words("true false null"),
+    indentStatements: false,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);

From c39ed91f38813b1a415921a21f68722c36891dd5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 22:03:13 +0200
Subject: [PATCH 1640/4742] [simple mode addon] Document push and pop
 properties

---
 demo/simplemode.html | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/demo/simplemode.html b/demo/simplemode.html
index 9265d7908e..ad8baf0b50 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -61,36 +61,45 @@ <h2>Simple Mode Demo</h2>
 <p>Each state is an array of rules. A rule may have the following properties:</p>
 
 <dl>
-  <dt><code>regex</code></dt>
+  <dt><code><strong>regex</strong>: string | RegExp</code></dt>
   <dd>The regular expression that matches the token. May be a string
   or a regex object. When a regex, the <code>ignoreCase</code> flag
   will be taken into account when matching the token. This regex
   should only capture groups when the <code>token</code> property is
   an array.</dd>
-  <dt><code>token</code></dt>
+  <dt><code><strong>token</strong></code>: string | null</dt>
   <dd>An optional token style. Multiple styles can be specified by
   separating them with dots or spaces. When the <code>regex</code> for
   this rule captures groups, it must capture <em>all</em> of the
   string (since JS provides no way to find out where a group matched),
   and this property must hold an array of token styles that has one
   style for each matched group.</dd>
-  <dt><code>next</code></dt>
+  <dt><code><strong>next</strong>: string</code></dt>
   <dd>When a <code>next</code> property is present, the mode will
-  transfer to another state when the token is encountered.</dd>
-  <dt><code>mode</code></dt>
+  transfer to the state named by the property when the token is
+  encountered.</dd>
+  <dt><code><strong>push</strong>: string</code></dt>
+  <dd>Like <code>next</code>, but instead replacing the current state
+  by the new state, the current state is kept on a stack, and can be
+  returned to with the <code>pop</code> directive.</dd>
+  <dt><code><strong>pop</strong>: bool</code></dt>
+  <dd>When true, and there is another state on the state stack, will
+  cause the mode to pop that state off the stack and transition to
+  it.</dd>
+  <dt><code><strong>mode</strong>: {spec, end, persistent}</code></dt>
   <dd>Can be used to embed another mode inside a mode. When present,
   must hold an object with a <code>spec</code> property that describes
   the embedded mode, and an optional <code>end</code> end property
   that specifies the regexp that will end the extent of the mode. When
   a <code>persistent</code> property is set (and true), the nested
   mode's state will be preserved between occurrences of the mode.</dd>
-  <dt><code>indent</code></dt>
+  <dt><code><strong>indent</strong>: bool</code></dt>
   <dd>When true, this token changes the indentation to be one unit
   more than the current line's indentation.</dd>
-  <dt><code>dedent</code></dt>
+  <dt><code><strong>dedent</strong>: bool</code></dt>
   <dd>When true, this token will pop one scope off the indentation
   stack.</dd>
-  <dt><code>dedentIfLineStart</code></dt>
+  <dt><code><strong>dedentIfLineStart</strong>: bool</code></dt>
   <dd>If a token has its <code>dedent</code> property set, it will, by
   default, cause lines where it appears at the start to be dedented.
   Set this property to false to prevent that behavior.</dd>
@@ -104,7 +113,7 @@ <h2>Simple Mode Demo</h2>
 recognizes a few such properties:</p>
 
 <dl>
-  <dt><code>dontIndentStates</code></dt>
+  <dt><code><strong>dontIndentStates</strong>: array&lt;string&gt;</code></dt>
   <dd>An array of states in which the mode's auto-indentation should
   not take effect. Usually used for multi-line comment and string
   states.</dd>

From 7509c24b6ad61d1583d0c6fe31b75f984d1c439a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 22:03:43 +0200
Subject: [PATCH 1641/4742] Mark release 4.7.0

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

diff --git a/AUTHORS b/AUTHORS
index 65732c44dc..5d0740fe9d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,7 @@ List of CodeMirror contributors. Updated before every release.
 
 4r2r
 Aaron Brooks
+Abdelouahab
 Abe Fettig
 Adam Ahmed
 Adam King
@@ -61,6 +62,7 @@ Billy Moon
 binny
 B Krishna Chaitanya
 Blaine G
+blukat29
 boomyjee
 borawjm
 Brandon Frohs
@@ -76,6 +78,7 @@ Chris Coyier
 Chris Granger
 Chris Houseknecht
 Chris Morgan
+Christian Oyarzun
 Christopher Brown
 ciaranj
 CodeAnimal
@@ -99,6 +102,7 @@ David Pathakjee
 deebugger
 Deep Thought
 dignifiedquire
+Dimage Sapelkin
 domagoj412
 Dominator008
 Domizio Demichelis
@@ -147,6 +151,7 @@ Hakan Tunc
 Hans Engel
 Hardest
 Hasan Karahan
+Herculano Campos
 Hiroyuki Makino
 hitsthings
 Hocdoc
@@ -190,6 +195,7 @@ John Van Der Loo
 Jonathan Malmaud
 jongalloway
 Jon Malmaud
+Jon Sangster
 Joost-Wim Boekesteijn
 Joseph Pecoraro
 Joshua Newman
@@ -199,6 +205,7 @@ jsoojeon
 Juan Benavides Romero
 Jucovschi Constantin
 Juho Vuori
+Justin Hileman
 jwallers@gmail.com
 kaniga
 Ken Newman
@@ -215,6 +222,7 @@ Lanny
 Laszlo Vidacs
 leaf corcoran
 Leonid Khachaturov
+Leon Sorokin
 Leonya Khachaturov
 Liam Newman
 LM
@@ -232,6 +240,7 @@ Marco Aurélio
 Marco Munizaga
 Marcus Bointon
 Marijn Haverbeke
+Mário Gonçalves
 Mario Pietsch
 Mark Lentczner
 Marko Bonaci
@@ -243,6 +252,7 @@ Mateusz Paprocki
 Mathias Bynens
 mats cronqvist
 Matthew Beale
+Matthias Bussonnier
 Matthias BUSSONNIER
 Matt McDonald
 Matt Pass
@@ -284,7 +294,9 @@ Nikita Beloglazov
 Nikita Vasilyev
 Nikolay Kostov
 nilp0inter
+Nisarg Jhaveri
 nlwillia
+Norman Rzepka
 pablo
 Page
 Panupong Pasupat
@@ -372,6 +384,7 @@ wenli
 Wesley Wiser
 William Jamieson
 William Stein
+Willy
 Wojtek Ptak
 Xavier Mendez
 YNH Webdev
diff --git a/bower.json b/bower.json
index c3fa181f72..81352b6d70 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.6.1",
+  "version":"4.7.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index c3ddd2c7cf..4581fc4657 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.7.0;f=">4.7</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.6.0;f=">4.6</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.5.0;f=">4.5</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.4.0;f=">4.4</option>
diff --git a/doc/manual.html b/doc/manual.html
index db0e24fb54..cdbb107dd5 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 4.6.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.7.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 7bffb2690f..b50bf30ea8 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,37 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">20-10-2014: <a href="http://codemirror.net/codemirror-4.7.zip">Version 4.7</a>:</p>
+
+  <ul class="rel-note">
+    <li><strong>Incompatible</strong>:
+    The <a href="../demo/lint.html">lint addon</a> now passes the
+    editor's value as first argument to asynchronous lint functions,
+    for consistency. The editor is still passed, as fourth
+    argument.</li>
+    <li>Improved handling of unicode identifiers in modes for
+    languages that support them.</li>
+    <li>More mode
+    improvements: <a href="../mode/coffeescript/index.html">CoffeeScript</a>
+    (indentation), <a href="../mode/verilog/index.html">Verilog</a>
+    (indentation), <a href="../mode/clike/index.html">Scala</a>
+    (indentation, triple-quoted strings),
+    and <a href="../mode/php/index.html">PHP</a> (interpolated
+    variables in heredoc strings).</li>
+    <li>New modes: <a href="../mode/textile/index.html">Textile</a> and <a href="../mode/tornado/index.html">Tornado templates</a>.</li>
+    <li>Experimental new <a href="../demo/simplemode.html">way to define modes</a>.</li>
+    <li>Improvements to the <a href="../demo/vim.html">Vim
+    bindings</a>: Arbitrary insert mode key mappings are now possible,
+    and text objects are supported in visual mode.</li>
+    <li>The mode <a href="../mode/meta.js">meta-information file</a>
+    now includes information about file extensions,
+    and <a href="manual.html#addon_meta">helper
+    functions</a> <code>findModeByMIME</code>
+    and <code>findModeByExtension</code>.</li>
+    <li>New logo!</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.6.0...4.7.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">19-09-2014: <a href="http://codemirror.net/codemirror-4.6.zip">Version 4.6</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 6e49c2359b..0a9f1338fd 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.6</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.7</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7277b8bd0d..4f8a23bde8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7824,7 +7824,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.6.1";
+  CodeMirror.version = "4.7.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 097d73c781..e7d5bd962b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.6.1",
+    "version":"4.7.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 8f52819bdc799ece0981d2b1308ce966ff060070 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 22:04:39 +0200
Subject: [PATCH 1642/4742] Bump version number post-4.7

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

diff --git a/bower.json b/bower.json
index 81352b6d70..2704354d73 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.7.0",
+  "version":"4.7.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index cdbb107dd5..051a2178ae 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 4.7.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.7.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4f8a23bde8..054548d9d4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7824,7 +7824,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.7.0";
+  CodeMirror.version = "4.7.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index e7d5bd962b..c306fa531b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.7.0",
+    "version":"4.7.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From e1289d85c1518478a845d50d1a4797b16c1240b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Oct 2014 22:51:30 +0200
Subject: [PATCH 1643/4742] Saturate logo a little

---
 doc/docs.css |   2 +-
 doc/logo.png | Bin 9709 -> 9310 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/docs.css b/doc/docs.css
index 7747895d9f..837ba69782 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -29,7 +29,7 @@ article > h2:first-child, section:first-child > h2 { margin-top: 0; }
   margin-right: 12px;
   margin-top: 0;
   margin-bottom: 2px;
-  color: #E30808;
+  color: #d30707;
   letter-spacing: .5px;
 }
 
diff --git a/doc/logo.png b/doc/logo.png
index bdfc75df7db0db8c5d9336dba3070a9c1618c950..9aabda1d709f565bb115fa083cc16b6d52db64cf 100644
GIT binary patch
literal 9310
zcmWk!Wl$VV6g=D|1b25!aEIUyhr7GGTL{5|1$PMU!Gb&FaCaxTyW6*4U2W~w{MehF
z_g=s5o{3aZl14)&L<WICXtFXAVBqcoTsDaC|BpP6(gHVlQ+a6#(EI<typEDYU<Aoo
zM#l{Vf{y+Ff_m@&2t0rg++`Id5!R8hu|J^*L@xs)<RDoIF?H|d(`+w)b;$)tmzx()
zM?46M0gP?ahC(3*3tJe5g=r^>C@FTctEwWVDw?~{3&X8ah!PRD9*tQT8757ES=R=O
zZIdr2ugtx4l6@a%-%CqPVF44eaQ%2fx0Jpla6f)NKFVjM^Z_h)hKuzjB4sSI@ekEg
z@U#NrAp>;|c$0x9hg?WZTdZG(0VD4>#GX6z>|wuiM$CS;G$FUC%`Yu#T3S`2xx9Q%
z&L>hk-l%{+T9H<*SA=}sbo%%<gs|+8{M*_H>o@Lho^HR{1J(LU%?j7M6P@vF0Z0pn
zRg3c$bb5L^PunUDMRKYs2Bi84p?^h2s-wqmdrz@zp~k4I#jPdj=S+$6^$1(n#c@vV
zQV@AYWo0F0iuwG?$(^c;iwoWx)a709!-19&TMi)>)^tO&r)EX+#@$=$u6%0kebYPc
zJhdwF-;A+6Nv~cvrd5Mk9vYf~d&?L>K|$|Ad8<9vw25-A3Z(NDgczyq)xxNFX3irt
z5&W3H!9k+!9`(QJE||;POE|miR+~Sm6)TtkQ-cj}VANhC(QrgTL%V&q;;Zro-FDY}
zLEOj<T&8+~8Rqs;*RZ(!H!%8SO3R%&)^gOv_<7W{w(yPPBNKdgMz>{mjZVGgd>u4m
z9zF7e&^@tyDqDe64B@zwmmb{Zn8=9D0EkzmV(u^0Er>Me3Q1W@zsY6$umA0>sVZm?
zf(GAr5tO2~04nkJ@wvUbz0JP5-v~N(8$pml|2M|7;cjEJKc2naVlq*V$ErUVu%xCc
zfs#1n{*MfE1l}<8>Gn8IRz?OtB`Ikq$e{Y8Acr;iHY83OaqB8@B8#tYMp?M1xTHiN
zI7wa+cO)-Jl$p=D%D=t+`FM2=o|c+=mO*=?NKfnSwkBw*RJ8!PBhEop&nIA&$mb;v
z`(VuSI$`*;(y|<U2KoW@w}bt?JzOYQ;Dutox`vs{9=20ee)wBkTbwr2J1MJLaXB3i
zy9*um+D)XQQ!;O8s1H`Oh6qX^k`RihUxG#D<wiZ+9>?=VesS!rUgt{Jdt*)`0hZ?G
z7usFYr+DK=vmmf4*I#j$aOU?KF(7dFFyg^IqOV_XZ;56L^zPYvdwU(1ez>LJ;p|HN
z4VWobRPeX^YQ|=%QMp8X`Hn78u&x4ka1N?5=y}S^Blo>WDpAfA7QE<&X|fPi*P!91
zP1%g!{BoS*|03)2@?Zo#sF~owf;%$sj_3DF)yW$ZALRySHTxJ?p2Ot=fq<u*d|<X=
z<H35e+?g>#BIgX)5|XO;LcR_79G0BHnqmaV{@z-l*0V&*FitQ+$n$GKK~(S<Bns#2
z9WGv8HJqawrlyn#1sK>m8!dKL(9qB_GBTi@yf$25rWcs(1P9>X)ru?O`26nlrz=f0
zm@U<-<h1(RH-|Hl^HvrXe7WAMUJH@<QXLeaG-N@H9g4y^+ry~}I`MGyj$H*go5Q0<
zSS&0o8Clt$1)le^`N!-1$D0}D7S~-l$El4kh!h5c+70$gb)Frq9?}QyXTp$JGCfQp
zqGt#T%v324Dr_-~*!b?LfZ*siq>rU~O=l$e1aj>uh@$@ff@7IHbdSS0=;!NwcMhud
z53gSK=<S?e`l(J~^pQ66pkDhb;9;vzR%&t=GBhewF$?rKou&ltoKMD);edCm!*nt=
zpTohyUGC{^AI=N?5Qu#1eBl8_mjsS3snJEsE0E*S!Cl~F$d@g?n<XB7iQfG^5?k!+
zdAtO%oY1{L{dwNdXgf#A!V(i^#OkaDn+xi}fd`_52sICVzn5aeNeGV?Yd%}53Y3jY
zNy4EqDo8enc-vYEdHkay9Jp}JvMx=;%OV#(lwwt}LXXF64{uqw(H4qt9wAm(@B8=f
zPtwxTbS=a{DA-ZcV7zxy4rAco?t|X%{|tFo=e>5Ft3eehCzt=I&`DimK+<nq!SvKl
z_lIjsYRu%a^Ng!NEklJDH^`Q1^X(tpZ#-RY6t`T#)FlCmb;QoBX(deF3Ye`*FhO@$
z)=1y;-PW4d#=zLvX)N5uU;-6&NeKf;SeJ#%-4PYBGC}Knzu0Vj_qv%uj{f%$PQa7z
zbD&0tFIQ8-1R9;&65(nuKUKNLuK&vtmXSCEO)&JsG=V4uY=Pku9)Myk1yHcs9j+Fv
zGrcg5JUMLlHM*gqRjfLaK9e+~#vI#bWn~NoMr7~bf08t2pFD8LWTOXvEK&N`ASs&~
zg6NMfnEE`hww4_y{1%UA<ewmrJv}|W*d7>)jCpbx;}m$z19HbQtn`d)!hQVW?ChL;
zbyKo%9MIsH(Q>--r@-OVua@MI!wIa-jBE9Yw#B6Hdl@SfkOB%&hU2fK`1pfgB~cEi
z>K7acZUFF41c0jUSTU1(EXAar0TlOu9ixo!E{YZ*$|c}u>+__hBK&*hRIDa8Af}Q;
zWDit2MeZN4SZfyUHj}GWt#8A|6Cu@MLU~bqjhe+}#m%DI(CommzwUQ#@%IP8XxgXH
zkyN(SV_iLNCzH9TWd7jqj-)r0;Kso}!idX{4~*c?b&}V(1|!o(&NG`&<VL<Hkr1TT
zly9#`8ZwIFNaazOUr9vlC+wKuL{j{e0Sq$fejc|t@3?<+5Lj?qkET<~lF`(}73%Y4
zx0$AnB^A;ww<|3lj>2I&`ADZUIJ|pBJ69gpMjxo{`=IqPIR49;HZJ)o;WIDAx4o8-
z1j<We)ajHM-^0%t#W9c96C#muabAJrYrE5n__yChH<_$(mM`|DCz;yul0&d1O;(#-
z@NdR^{H6u$^}9my@(5wWVLuWQ%E`ze-UA7R#=qR(FQGvDvA#3SM#Oa|0)CRd`yg+b
z)3vLmM;~E>5nrhNlg><gp$ZRC%-<Z^L>pz<vlhu{Tru)+uY+0HDvwL2U2R{&xp4zg
zdcp=NApzXoYhoGB%&||q8f{}Rw!49c4>ELyfsea#kffV~rD%Ax^X=p*GhV+t=9NEE
zwGMXJptrZT*>W|aY^89`irs&YC|M#w!f}@{7kC*bUPqjh!Uwy0bsC~_hGjab`^uy}
ztltpI_08Dvm(#}fwt2E&myYl$E+P(Q!cUqD3UxVZSM03`xg;(xj3F4~&-sfCMd~A{
zKqcWr3+}cf1UzhoH@&vk(EDzNAZT}ZqK%}mY#-Nj(O&AtR+xan;967_CN{F;l|~|8
zbv4eSqnd;^x`NQ7i^pBJQWXuEPbA(AiyNG_JNvs^k2SQ48Kr?G<Md$0LOQzq%R8xu
zC)cMNo42Rqw3$G9yi^?}AOSo=*s@0c#t?-!HF*``er#`V#~1eJRaI40@ZEQ44f80G
zGoHfTN<1%{*!LhxChXStrDTurIxmY;LKGOx;jueEJbU|<G##Y9Lr$}9E@iGQ`$w0e
zl(5y9YNg4^%P}zDW~NwA-jz&ptRG1<rw4o-uR?k_{TQ3@2>ew<L<Bh{B{T!g{zNVv
zBV*J=Nl;3SLAfp4oQK+pX9|rzB{xetDud0=p`@lKH!^seA*n0+*+D|$8+_8I&Q9U<
zv2wT;>5?MKFwqKY(F(DdQVId#=h;KNtK-Z_T*+|&{hTo_Dmm~TmWj5{v?&Y`#Q-Eb
zTz&kT>byP|t@F$QR+V?o4xQ)xp3Ohpq{U`hSM0{j5y}#&wUnJ=k1^XyQfGGV`7zm0
zE56Y;?0&vKmsggnf@JGdGPs5<BN)VLVetVE&&xpGY#~5n+KSnpw)1-;i9*fAdXqtx
zGaQ%oB*@5#3_M-UBm%bQezv=WloroT%{3vL1cnH1CcN*^2s0&mAf;-jy5qFXM1IG7
zp)S-<vTdx6=ChRR<l~@*51|$m)c140)<oqe`6cC1uHPPf*Ms@TG1@gJOaww4`B<+&
z&My%qNRpvhVR3UXwTedlEl*d)1FU3-Fh$GWf<kj3_ou2S>f1=AO!H`mBk5|vl*z}R
z*lpQn=>%|W7C2x6OuNW6mFZ4#aq$jO;SZRY@s{oHf#++f@5Odiy7Y#Iu<AAFiiEZ9
zCrslb+r85^L02=@-E{Zz&*&J5ew`jX@m)b;MyfuSa<;A<Rq-=PS=(R!)mOgcB=q*&
z%zgnSl@#XLooxMtL5z236h?mdc7Iw>OBOL;sdb5rDr#wo^`On0`Nwf<x=6ldjIG$h
zl9g@jwo$2G1?GoqHR}0VbX(*LOgXl9sN~g9B3)Itc86h?eg#$tWoy|a=7k46-*~Vf
z{kO$j$FY}x0Fn+_Xd}Qw-JGuX^#u-oF?c7A)p>aORizU;5S`T|a`{+m2KhV!OF2ne
zn)5u+*B7c3=iXT%Iyyc+&gM;Z1*+9%ehzt68mX~f`BMd1@9^Uoo+;_u?+Wkg3K|X|
zjHx*~QxY;V!iLQ-hH3LW{Wn{t=CjfuRg$i^ESx3gzuNLkZD0E0=BB+uR50L5z2_I@
z0CYH%y42$a@fVdzp$8SB%r$@50Z3+R&bl?>tn~Idgp!Uc6LT~!GE$bg@oDPt9dgA|
z)Zx3K0a~`_w(`&$?;ANGV>IlkAOtPLHeJ=_4)Imh6kAU=Ael_$2x%+q9s8$9adapc
z@ZR;|^71uWa}qB9aq`j%@do6JI#;g5gO~kkLO@fV9hIo_EwQ|kO+AI6P%VPG$x%=-
z@5C!jI64WxmL(<%YY`eDXQg`aZFOF5&|6FJU=Oa3e0$`#p1wY+f@)TXyJT_UFBF@h
zm&fbunEXn@wzIX*%ASx7e`1A#zcI}#*00OAaA}0x8_-MYP#IkIi|jhGU7Z~{*Y~X5
z3Bz%wvHe+$Y!UGLy#h-+zuEcix%UM~Ky`&lIGtqNPV4$8-t%@U8wSgDQ_X&PC>YzX
z3~E{1JN?fOkI56WeWg6J@K<F|L_CiES|QE8r_0do-}T*@piy*~Q<%vc4Lf`TZB4OS
z4cD~WU0|LApVwqbN`5fa;1{s)qA*=6B!N?w6B&htb7GFK8MMJgO4sLCtI`0QX<T46
zuwx24$)j)Hb*y64SHre&u(v<aDWT!Yw;an5c3f+7+Z_C0IqodHl_+5FAwv!2ARC2~
z5KT->EE%i6B9%?8D(U|25<-TDdbvw=dRGJ=x+Pzw*;ZBPnm%Q1e{g)fvam7XWvnY_
z`y0C)y*qsiC%B<vCdRi<8GO;YWFHIf^Z0Kdx^Y6kqrCmonTHknBPi;s!A`qm@2O_U
zr3=1$VI|xs=-sIZhMkKmIT504YHdP)>2!CtHWE!`L|+|AvSX;yDQyy+nYrR3nwpYQ
zJZH@bm2-AR0s{?ADlac<m-;hB7sqv+k<7mo4Zy#GfVMxdnpIL#Qt;uX=yd@Qr9Tca
z!*Gl!JDFg_bI=B(lZDkvJGe#~YN=+*rf-;X5fAR4vS|3~SKGPr+GEICGJ1a)3f^>$
zkx01)laBkr=%@l^j&DXHo$?;5U6S;#=JU>H{Ll9EfOHzrZG8vU#$Rw({7!P;`l4{N
zG@f%v$3a!h-uc>@$S^BZL8p1fpBpb(buJ}6eJJIeClz0mfySxp)sr;X(9p1*+mZQx
z!-#)MRuy}>As`~X-m2E~m7g@|<ubFCk<)QC4K5n*(`o(TY_)-&2eiru@S#&(T8=AC
zaEqU*Fs7S9IU|l&i!Ya$hI}X9c#cqJDU04U{B5F5F1W@}2p)rU^gffP_B8yIcoi>Z
z=1NnAGf&Ig$rmUc%eOqeCP(*^Mb*c>Os6!yZIt|SaB{C9#pri-&IJgJk7N6HT&Wah
z9k2~ZFz|&pG>2etaRG99GsCkF10?k5H=YgX&BM13?U#Rv!fbO-JOx}*c;EOh@qo|r
z_Ve35Jynb$<kAoP-s-d=Z0NVE!Ntd?qpJQml+QbI%zD~AsUI{jsn6ynB2I}gGW>;s
zfuT<MT)0m07{S8U_DFHXNxMnxJ8aWW2fd~QRlO$lK_Lq(tC7OOLhw7Qu(09X*^)dL
z=YqVrnm7*wP4(02?<`t6I;|)I`Xcj}hs!MCfGD~g-#Tr#As~LV$~mKPZJr$Fiz@J_
z_?zHQ3<3g~ESXKeZTjHv$ReaPG>&*mrEAvtLK5Y$;_@8VTK)M0G9rk15iwC*`mH_Y
zTr=PfTv5ukYR1Rc+8hNU>Mh4i*R!&&r!1IK@N6nQwpM*`S>B?G6*I9&NzcFo9czwO
z+kaz5b9qwTtS0c5r3$9l*<CRKYk@Jr;Or|LN}7<H=2MUOCsvMsbI_^5%gHvh)%q<z
zAKmtMKM@S*tjtw<U;v!d-R8Z#9IKHgiqCD&`Kh7aP?s3~5M$N_{%NJA%VcHVK>|Ip
zP^-oekWvM_v054$w@z9d+*6_vZd-3KQ%$?{!;VcH9!Kh$%p<iQUA?@lhU$u%6wrV*
zf?x=waoN$*Dd}UdGQ%FLCh?e=nY|yZw$yWPUF|~Dlis0x#DCLJ!1hp7S<e)sDGNWE
zcUrs-7s&$(mq&nw<(2B%#4UY8uwWe%Y7}-<v>CUVqFY}MjCIzeeTz#*Hqqwvp81OK
z>w5Tar|?+{)Wdf5+Gqw>w8+~-A3=L)=`d4m%3^!p;98rP6--6QoNvdQA%%n&g@t^#
zv?^zShDMby`x6Kd;J*Q$ddy?Eu)?a{5OH(kUWM&y!3RQx>x5e!j9k36&nKs)rb*V7
z)*<y+Zuhy?ep>tK&p$qH(8g{oIsgfK-Ay%0yB$zKClk&(7fSgmtC+!^t&zphF<=^r
zfXnT$+)%DLg|4o_l^Z!y6#b|*7LCUyC#i}xW~t`$c_3g1#GXpZgxxO^OImgjKMJ^H
zmAZ{lZ2Mzgux)N&UT>c(K)z^Lzdzrdn(h5y<8?n!>49^J`K9qU>96{ik|{+vzF)>Z
z#*Hte5ISXIWgtS3I$dl)FX)PvKo8v8g{Z+1L5QP@lsBZA%r7c6nV2*yjW2)IH2dD#
z<~!6?rt7ymcVe1tTyZeBd7bWLI(1R)b@zOIg1CA1pjg%)K7-GTzPwRW^8`QiMpIqC
z#Vxl==J5M0*HfRZ45$P-az3C>LU-ZX`_S*@jr5ER4i3VcFE`rpkes|L<n+G48MS`v
zk&}}#p3C5>)bIQnjfWEVse<tzOnuo62pVAdPI~ydsEOdyfBj)Ob~sqNerv5Bl?H9|
zq(p8qFq9v9T3rQ)Il_`25gBNtI<`KmjHUNIS)AAKNDweHL7MEBKJSfZXYN1f;2+-l
z{`>duN~aJG0f7S$^cFb@LBvA6KZ`~dpI%eGT+_{$sb$t%P3(UDByT#lH|WYvjN*cf
z0b`D{*oIX|&b<GlR$-xwj8{`;Za{x~E7zsYI}waUL^RTeA)?O;`rj`TIB)L@d6nGo
z5)}n)8<NRyNI%zFPf-eIdam7krltK(kr3*0JEvu{(z&K+wVTYO6%iXd{&=#ItE}Km
z`yR~L{`m<<H|)=^T(gz<pT8$3Rca0n4sND}t)g*R2)Es7QC{E{p@QO7!4X`V6&`*z
zW7jB?YLZFs2J{gvFxr}!MM=y?ommsbigZ*3&etE5m6e}FID$V=Np0?@ZcjX|x=kb`
zCG~5e)aXg(3i|w<Dv;hjJd_29=1iT%2$BA{au%=HP3P<Q-i4&C767OOHixitsK3NQ
z;b$wfM6~j1axBJtqqAg&iu?@QUd1t&1zECf&$XdsImy_5z38905=JGGLGQq>=(W1r
zq&JVJ8U?0r+~GQsY#yJAzl%+<n-5}^t1}25OaLS&UBt^UVM$6}ytA|O=HP==s^i*X
zodrrJ&)zrlnM3!{435kn4XDJQI-n}Q6mUkz#0cpO7me>t2IhB1iR0GGTTlUx9YO?z
zAu95t;&6Z;IzQoVSbIa-C^2`YjU#(fc^`)GL!Jug_2mVhllLc(c$sI7RMN53%*;Q0
zuJ>yF_F1QA<U4!U+$Mw$V&GA~XT=%TOz3?l3w$s+nl0;FU2^-qWbe;;OEq7qCmyau
z^5`?63?iL&%vFL){hpcd^@R-QvJ+E3AqxD#aSkRLglX($C<h0abGR2|`^$z~9gi1%
zKOqc8wWe^18}H;s>8YuB;<+S$H+w=aFE1GqWv-6dM6UO1yLjF9Q1{2P1}rE3j*P*0
zIVlSY36*KpkV=K-?D_U7D!(UUVI52t+2xpS%_x^lHTbBJp5JSeUQ@v)0*N}L4*mHE
zEvFkP&(fq7i+qxxpM3KNhjh`Db;Og2UM;f0zL5Jv{lsod+@U)^CH#%m&R_y8ta|m2
zYQXBXI=<Hfd9ycgq2RLpYdi1UE+`}8uUM5D$QW~Dgo-E_Li(YNAK+M*W;C>osepS;
zW2_+-c5}5$<EER<@4>jVv_v1(TM&0^HglgzAQI>w21-jw`3oc#pYtZj@9xB8BCd@u
z@Wngwe$o@ezzdf@fR+wc%iNrL0^KVGv%iv?f?{Ib60{b=6IJ>LDz`T#1kV!caeBDQ
zuq6u5&^upyC6mKy+<C{D7$AfSxo<jUqsa2*Hj&ZMW`Iw6veuTmm?pk>de=Tj*`R?)
z(kA$|$GF>?bDh)pXFZf_@hSgBP3IFM(Az5wTaX!w1_wuV0ZCD^@G~(H(%;{|8Y@1(
z@61ojEV_}wyvM;4Y+aZ3ZZ}I5NCUCswZf2<GX<Kcgamdrt_^^%4ajIF%MCWL@bIlC
zNQFrf4w0sR@p9Lk=~vFS?!MihNkWw3l5`2;i7JJpHz#tZoTdw93rkAsE!<+SXt$2I
zgnrkng~z5=X&w_)aBXLpu|?r}j*TPSV4Seow5Nl|dl?5J1Q?ZMHIPw4uCOp;sLlww
zUs|pYmg=o?1hwL0$wbCamg)@%o7XJsFNc|Gc3fk8)Vl%$*0U~fPnVO|g04!)Y9P}U
zx?Ej9bycy8m9mGa;skqBulHS!c5Hxp1`i+UN~*2Ndc3BopO6v92>4b4epXE?H@-NM
zHNT2_@l_*jG#{IUTs~6Q58po2Ea+KWNEtwD{`cLk+VPw^ZgDr9mb2nU0$gU_F$oAF
zHTCYOp>Y!<2M2pf0s9NuNtsQvN>3c1!O{9?uBk>E8ae<J2*VGS?fTJ1?{2VWgb9WG
z`|>p`jd?G0K{BiN&;glP)!{V|1@J_|hJ&i%FZv@t`iu~WCNpYixA@}peMe)$3kJHL
zLK-iHvItWVHJ4D#f}vlPOg;AgtJ_9rK&4(=acTBlb{%{z3n-6`y(^8@E*pv&OCoU~
z3wG6*i0|<gquEtxT`p|uCyo4-!das(OKy;GsNZ=<)64P9&0!YMts>h#`a#7K$5OdY
zijMc=<xny1iK2c`mIU0^oc+bzAU+s>q<&g*+<5S+cd<776F!~5CbT=Dqu>?e&lnD!
z(G94TE2LprS-{rGMuubO<4ad0;@%55pRTgYx4Dp$|Gzsg{VW=H-K1l*wUSKc0QmqR
z$su4@Ia~KBAR8{35!pSMqUt?t(!<u6;hwiIH>pb_<<c2t(J)8I)8n%;;W0M<L@5~r
ze3XhQX7;SmW5cjt&|@+VlV;MRRDB$2U#sWG`Nqt_Wn#&_aiPUHgSgvPvu6zLs`>Ww
zfah;*u-#flq}%R!tb6?#V;`Au<>vt&jL&cYeWmW|TKE5+1eMf}L96O5?Bka@Z1-5M
z%sz|(k|&l8L%Z6S@*Yw{bWkRUDO$Cr1DIJ5n>$5UdQq^dlQq%_+?AjMu!Z*UwBlq9
zl*bV7*ek-|+bL)XL9tZwL?~mqanj?w{~O85VyBx`4(h{7=f;Q!d%MLoE?}Y2*Vore
zj>FUsVp|cYPD=ceO{DE~)NR5bvBc#M_PsrtVQj#0N$Ep}VdOIkOC=%guEwUbg?=xJ
zZ)iu?wW>?Yr3as}M7D&hIz>=JdKt;YuXlUl2B2-aoD+WVMgJya)d}{%IdJ>O&VUZp
zu38{fsnhglG_)S*%8!pX6InT`{$|4Vfq$CgNAqLIN-f;nf@I|=qZc!=M4532FAV{$
zN`nVFfH{HE#TnR#sv`E6TM~13zvJVBdXa-Id|maKrVR{MU}&-Px0hmM8!!@SKU+Ch
zrB!C_Abonc+*ZgD<fHQ42%I>MGJVV#GJUM$TtIRpd=dS_-4-2BiKwnDn#b5>v&tpX
z+AB6&%40nwtEH|!`;R#<d&pE+Wz|EjuO<#IgU@MwXlO`K#9ty`v^eN<y*dcGQnvZ$
zxu0z6vA&#wf;nJc&vR91w#hQML9H^uiH};2Tu!6cQSBY%suPc~z;`PkP`Pbd;xV|W
zdjct>sFZg_0@pIMA0D>}r1)bRUL!VA1!$C@>_lm3!W%A?-AB&Xm)~uFywT%$n#=8W
zSc4QS2PcF5l_!JKZn>6P^~$N%R1aX07$IAdoU(Afnaq1wHX(A^zt&25yg|nd@i)^x
zHj23&m@DH#MXhJimqE_F+fQ3gRl1EpTUt>JyWbs29RXB@d2vaxk3JdbvPG)ov0p>@
zk`;cE=mDNSO0@<4=CjTy4Z4oz(F-DN^pc!X`E6C$*dUqLsZ`46@R`5;c8?&~gLSG(
z?T#bBLq|kGsSkL%r0a#s!`b1i%B;>GGR;tzg{nk(0iy=v1;-Xa{Z`<ZI{dyG!qtsd
zr}_{OgJ0$S&m&PCj`3o5x8C22C8(NCQdPUr(j#B<ARL_(5OO@bfEIV%Wyt(B9M)_j
zLT?w`rUz@RXH23}fX~{{1_ViU*)IA@B8mM7%`vtpKd7fQLzjnkwp{wR)fO#5S^03=
zzS5Q6Q;h5O%qx}m^C^+CN#JT@Cg78mb4z=2ZB|D4_kM6rkwe|Y3>R*o54ryh)BRaz
z5J?M`5b%%LpmMR>W#POLL;o^>KrkEsp9SF0<EIL>-QH7?$QrD>3h1@?Lt{WyhUvn>
z&K{4J$-V9@)oe9ED%EvUmjvdw%!^3)a`!oNO!Dao@JqY<AP~rgW0N1Ke_$ZHb70dZ
zm;w7&xF_yT$Oqc!M_rxg57kk)hcZ|l(9Jc**<F*9-80esC(KF~I1VDm`}+`JJH`fR
zYn`qPG{80nwNbNk&-oJy<ugg0HupMtW%&1_x~h3P4GGvul#(n+Hw~spKKq>cXOdE5
zP~Xs{v8`s31Z?}sq-tuke#*lT#l*Mx?Y7jopM}}thh+oM+9gUPdjWj!@E|D9)8#OZ
zV9-*$YhO1(Og11yY8g!l`2PNZbCCNgDjdcb#DR~x&4}1;T(JH-F-s*&5(*#gzyQkF
zChYYmC>>VN;NeR5;m7^$ZP7aijQ3U;Ues(tjz~~vo)HYPX+ZQIi<C?ZC)1sMkcKr~
zFmoi+0uAQOx58Y*8Y8D#?KfA7eLjMSLTegNWcGRUPeF&nE(@CdD*!*RBE0=>u#**o
zL!i(O2=(@h-sqdNnYP8gb-?Gx`(yebn_n#fr(qrCD+?ypH)5%_B1HTNeoDv46gar`
z<-rTyM`(v@2M>-;KvJP50NSBeP3ojN^&u(7R~!!^O_ISI2^slcx)_YlQCSHxm+$cC
zXrbSN<EO~TNE%*k>@KF#`XZ_8wjuK;H8}<<N=i=Y?bukTN8wF4YV|5Zmcgx7gZce(
zG*pjZt&X%}*=~VuJlg1%FYtP+QS6Jcvu7|QBZ>)^djB7KXf{L8ZE{pRp0B#Lpcoq*
z)Ltp}I5x)&b@}|y^%qsCX#>M}LqX{=kKOzUY4)T?Lht&pdF>CDJ~wY(Y?2A+HK$%R
zeOO_bJ)oH*qsh9;i!$et<0~rJc4Zdx)?nd_0vk>F`S~q*o=!`3MLHo+rTAgpdXm)g
z6a}kmYdn(D(kqOcIYiI~B)OzC&F5XjFWsg9IQcOBy-oRgz{&o$<K2M{vz&C}6&M(Z
zwV0fh)sFO#owY-)WpG<8pihv&E9^kroy>WqhRTkk?NFCCr^lDm1lJD@v#<!YXB_p%
zvy)&cxS|`Uq)Q7qsVMOy^jKzAp=C?1XkP8M8g6drTDN-Qz)RmLVc!b+ua9ZSd{)Wg
zB%ci}#$3$d0$m4v^%QZhr&a>Qli~ZnEZ$Xji^p29BteJ3I(;JX2>ye%XjYfT!8qfs
zA%}?qr2)g~1<F9NSJSf1LjHi_xeE<+CuOa@%N8n8W@v4r@DrVx+Eko-B=^xB&Twe*
txl5jb9%2$N=VS;;E(#9Kj0Ws0S##b}^2FFOG;r<*BrB;TQT@gE>wkjqECv7o

literal 9709
zcmW++WmFu^62;wu2AAOO?(XigxVyVUa0~7h_<}=##XU%Z1$PPV1ZUAVd3$!w%<hk=
z?yjz?dvA4|x~d#H3K0qv6coCGytF28cLy$eB!qweJWtR9H#kp81#KkY6NF?H3;afQ
zlQ-~$f`Uo@cR|1ZzyThh2)$(Vy|i3yynM|)tf72;eOc{Y96c?~-K<$%J#6zYgo&V_
zD4-OiCA9qtHVS?Hv=<gfLZ2tT@<}2qvRQ-`aAm-0h^I2b!QC;^>txh`P)q2`A|AT3
znEZ6$B;sMRlrqca=}{sg2x6lq(4dDYM3Cg=8$9nHMy&>^a}_v$QkPubOu*Vc{1gf-
zZe0QevQSp+HNa3t9bw@u$iz@$&w!9%qNv4DU{c}2(4f*#sU#F3I4E7r_z4ihl&(&!
zP#^5I7JD3`qeDLNGBgcb4*jLOCo<kNq-z}9eaq&R0>e*{wdOBX3felY^;DT_(Z6B6
zDHFXVPvAr#w>USRo}QUpwo@MWX9iP60#b^KDE|Kbcs#z)3`LyeyrCds%Lm%GdFrgs
z3JVduE}Jb4G70z^Q^%T$szt&-F}FgeF}L2ugMx%15J)}ohae5RW|6dvj0{a;%X@@3
z2WkwH`>Ro|a?7%{Og&aUzHIV`x3TI>Cdkz&xd~ne6}%QR{`hPjVU=&G@hP+)p|7=-
zO_a9w*w$9@W^h3B(a>;EuM3ORXS4w`c7B4YPt;1v)%UGGtxy^|{sbU~5@M@V^J0Bu
z^Y$;NyQBK_3Gy((x6<y9Qz+=mTDU=O5`u?=gLBXtz6kY(Jzk}-plz0dMP;>gVN#~*
zw?Laxe;U+%W_d83FDD@p?zxyE=n=NyFnK%T*OMgns?1%rir#NS(GvW8-=RZ;C9Z)>
z7P4oqTWhE=^clS{bfb+SR;@;8F>kOqPddFiiJK@%LEJMe@S=yVpZHu>R`&Z@dWsAK
z)#VKL`3KjQOXrv4EUolvhVbz4CQ3?5*SELl%j!?Td*9NO1FvKn?!5sIkcHTF7k&A%
z^Vnot7K>ri3~ARBs-}J8rq0u@vrfQgp{=N_6wS!W(q*<oqV#jyi|l51CXz&IcnEyD
zwZC{@3l8w{@%fPE5xwF-x__5k9e(<6Xx<noC`5lwPlY&ncv=;XUqpkS|L$q2%~Y!7
z6OqcTgPoOwL#lT*vSAi1nn<c<R7JwB3^Dr&X?1R(1CS{{L!O>65UIX@|33EX7bEN3
zH}_9Z50}&1lu~wUVCT9-$L$h{vz6u;w!TMfaSiHsII?e<Q%vEGqBttmv|&a4`Z5|9
zbKW8?Ub%q1*--J&C(MuH+S=MHvJTJ!0s?5ng7ZG2``yr~l6uN<3UP~$oH?59Ho%O}
zY0a3~5$rSs`}`9QZZE~cpnWmEwGtkN)t}NU8Vm%_RjPEq>?qwM4jkGfSo_ssOrSet
z0@Gc9mNlbmFgkvTjYYCR#IzYRk!pt=<U2YWPyO~TltPX<A~BH-jI2Lh51j6~_Vf4-
zh2m|cRkIM#doO2z-FmGGIG&{+*X-l=VF3Xyu5{nq>qpK#*3R|W;eE7kD!90~je!rW
z+0=~jgFoVMhW8ZGp%PJk@tf&7r!;XpWc*ujL>nmItSQIfIh90GzO3bC{g;=QU%I`r
z?H>Cmh@pZ<ynSk0qERt1>3Ml5V;V0y3V_MFeq!<BS$`AP^Iz@mm@_?c4@4_VIs{eO
zY@XM93T;4qL8j=)>Kv`r@%n3k<zXSoL4F~nw;8kJ=5*T@9}(rQUyR08a~I&roS)a`
z<m5y`X7I1}zE~I7^nWI0HR;@we=<R${7L|ykW4D{FO-kr%2QnbHvH@h$;ioh^px@L
zmMv3QkcDXuM>@Q{5DEA@JI*%KVz1@uty3=F<HXl2;C+Itp`r2Bq%+F@0o42U!~{Nj
z4VN@Q6#uY;s~Os#50^~BVd2*Ex6|>0NRZoYW7V5JHjcDR@CPlK>I=9#V1ah#tHWLR
zyXHv`!G{k6sB@r__b}*%^D<rcKZBQ0LAS*#1p@97rf=<Gk#x{-L_w^3NAT~g8Bf@*
zWGWjgms6C{;0W|$miLAxjdEElYwM=Ha++Srzr4Szx;q!BfS1qo2bAP~nlxi)cetf5
z^1D`mfrYJ^d*P9=7^H+^r7PZE&a8ohk*8SGRW}109{4q@smvif69w~51c%oDdnwf8
zGa~=f*+(F8;FFUVAJm6r{_~DhKTQ8tTBQTg`$NNfmrbCs>vsPetYFD)PpLpk>+#rT
zf^COpYQns^k|JkkM$%fFYiM~JS{1j7<B27Eec|5+<Pn#R&Qb#0lE+84`?K5~PTu@F
zW8~kKKnAOX@(iadoI}JUoah4u<C&V8s^xdPxKSS?5gO#8h&Rq;BZP#bIeO@Hke!^4
zUgN}EX=HpfOXqt+Lq;)JERhJ_>J#G(AJ6x}TKt4i0U`zRxY04M@Tvj9v4Gf*IB`li
zHDL&~>r?^cKUyra^SlKpddc6M?X?DzziIh2Mwi4)%GP(1-jvT(d~I!PZi7Qkv}r6K
zLawLYFhuYD@77%V@Upo+qV1!o6;;a}Kw%1z0oys}ZjqVneRP+M*YlN<i77#anC}=$
z!~71JH|te`D0=W4zJ>(CfMubecePgGo3;)*?-LQe&*@?k>!eY-=R_|bo}^i;VPPA`
zah+i+qh44wcO0!wAdcVam2sPkiKt;`RCpwU{~LODSUR2Rm#l+(lS_`x;KPlG^_L*{
zZSYglMpjpA$S2s?PVnGh?!vJe1*mPs>BF?>GqZi*&bd7TJPm!AE7;YS_31T_$I)rO
zRfhps>w8Z2$*Z%&!_gOb^53OWh|_YHG~AAxi5;E??7maRte|fFIxyI2bMVk{@ezs}
z9j(H5$i`(HfhbXW$@v?Fe~XlMOs~#ygI1R+3!Jd`gUAC`QJS2&gCO{fB=PQq0yo+f
z9I9oki_%;3tq0}b&VkzIIcy2-c{<?{TJjV}8W^AZFTJ>Uv>)1+^L782L?mFooY%|5
z_U>c>e9YEYfN6#mp^!H7$oSdg^v+>f8A=i**it99h0tjlnGy{%iR=?=UixoTXIzjX
zO^G*G2xOl?wNP;XMZ{Nk9@H@l6uA?aaW~CU5zap!ED%Qn1TTof%jkt4UT(fs|6<|-
zneS$s&QefC98DF*CCAYU3VvSXYh^7j?*USiO>-{fa=MvRz~cwhM>zK0%($!pyuOpp
zMMvqi-vJ~l@1N9Bf}4L@5!vzP`|8+CkP3RmLP5sPMFNlSw74?MJ67O8@=_m@;J{sR
zu316a7T@p_XiCd?nN}^BVTc6C0`5+R=WytBZE9QN0q@RKdppvq75vEMvW-nh_{7SJ
z5!TqqPQ>F9m6C!fTb_2qa46t=QBYnDO|g7r^r*bXI+Fb7gG&HCGPJUtvxUQ;s@Gq+
z>{D))Q->z~FHF@n1SjcH{qMb{Qa=TJB5Kb_PWB15x5_x;`^eV{vo#-e6|3~-D~<kP
z2K@HvtMys~E}LGS)4bw`j-g4ut%=pUQ~eGLn&O~qWIfGu!QU+{EgtX`JhdSgdtj57
zq2SkzEcfWF0q>7nov=#jIBDvbKb_3%{JmHI55LI&S^@RY`#nPp*B*(2i3?WBj6%_k
zf=;b~8nR^Cpo<k`oZHlH_2a99O87(JT&3^>iG+kiru|JGB|Cen9IdeAx}LjoF-Kv@
z>$6so%;U{@=QZ2hIT_B8xKp{V@Y+3oV!Q<odt=!(bVx{w62s6)5?Mt-BQ2%p&Dhw~
zh<*cxgog7nNRv^;eyM%~{3~&2LpcbUo>xCUF0RzKcr(-fvQym5jABSG(d;qygFFMU
zwj}QE?i0DMpg50}Xm}Sxx1@<dm|o!<R0aF&vDOtkJk6NyK}lTpM~2T^<26D-k8ZH^
z>5`HWH&m{6J8g81e46wh(Pg6s!a{FGg1E+Wr6CG3MyQCtQtdQbiNmjwZ7JcjibCtZ
zZ{2i8VnvK35zlq`UUE{iin;Um6@`X1=+c!*a%|-J#C6E+LOzN8$A2!ZOB9a<ehPuk
z8uwrMG+q<BH<s25Lxdim#3Jnf!gqojLHWD*Z>oBtIi>N$I3)u^ReQGu7i-O#uNMza
z@$gR!8}+ji$KJxf2!>!M1vfYL++4j(azc0rSdS$T>EZ4_xk%dEL_5VA&DrCX0<@he
zQaaXsKCi=asR0+t{n^^}b@UkKgIg3t3PN~xzcI6N9v4KGR~Yt1Ogir2;t~vJ0~6|4
zJiNEJ-)T~P+V@?V6is$Y8nsefL`ljm#PF}jlu;!Tkq9*MEtHeJ@sw0NVr~1C&3)gG
z&l<Q<kSfDXDR`-K;UNWMjGu7#sfJ-~Y9Qmk?n!}SL%+TG_wQfky2(k2H8CTFC0Q1B
zxJRwFkl-LgKFi@B`+B1&O2QDA3ca*A@y6ZKz!Wn6skS#1Bvhul`K-hDF?mN<tZpW8
zME>k_g`G@P{RU$%i4tK-_~6MHCN&Ci36~3X3ctUpl%Ji(*>IPg;Fgf3rpN!gD(qSA
zc4i`AHFm=lD=y4#`;~s5U<;rCw0@ka+@_`_SvEs0q#7-cD%{xHt&nFHf}FDI6UIo~
zp%1s|zfq6|dTE5wuS>9Y#C=>gpGT8PYy6IxVa-hyFG-GyAI1rZVwPb0v2bHurA0(R
zCofMpo&fgHEv><{<!AeEBOD<aF*G#v;^_4-O`a)oaBvWN8e2m-cELdeio{JAmGXyk
z+r~kk@8u>*b$FT3yYJ`dXzP~0=x9IhZYmV?`H>{do)^!Sn<8=ORQcm=KL(+pikuJS
z{s=7Kx@h0UfPv}uu)XOV_*oOmjJWQC8jn^|EkgknEnU9tskCH-;t?X6OvxWRGGGqZ
zVwcRp995xIFL;C%F^r6itS5Xv2r2Yy^BgHzK9v$XVF6$tf6W>c*6h7^l5g!1Q9sKJ
zM>vGxelE+coK1ps^}FK|Yc0Og6;|{BdzYdKRE~BXtZKF)8UpM_XLbkU)qf*En)`i+
z?J%}Asi5%eSn7xq=2QL}P{B+uj{H~dGd$PLma8CM`Zy-3ptgTL8XdolMO;OT%y`yP
zrhO0J-`9&vC0ZnKz?{vzNYugQW%1nDR{i%D>wT<R+3$Wc7E?tm2h2-mHxNCYK(|zV
z$p{FSQB4QHREQOYmAXcgh@!D1p;y}+78nZ)sKT`rS>fn|x+e^%GF@p%6!<k3LP#Q#
z4hkOiKFv5ZWeAgo1u<AB^<kEml_iRc1I**vN`f-Jn9aP$b${4itMGNN00jfRE~_fW
zLbG*599bvS%F4=nwfmycW#b8ZTJn1fFA1ta-C__$v%$?lX*8ih)Lmz^TA%*tTkvx|
z{+FGO6Bo<GjJ#+lJ~>b^mxki;l}feNf2vJa<Jc%!%89?kYPga&djg5sOxuI<aj$)3
z29~ZI7XExMqdx_LC4nV08mo$L-A~HR?|n@m$1BJGa@x~DA;eMCsS50<`l&>a?jsrk
z6&0iJpvhXh*A*4IFv(iz=98K|f$6}kjZvxnYK(08Rn4!9ab;Sqn$*<PE=eg#SsQCB
zpD&UR&~EsC@D$EZPU+R>SrLaU_)6W<AmQRKvyT(x*%?*SYTj9?p^_RG4@cwe;lIn~
z)f!Fvz@bCiX7_K?70+Xi@e>ou$#mqS^8?z)f`Jcbf38M<wZ^rEucQ9L#|1w<J<-C7
z8W<SJMh;++Z67Xi2@AhmOia|e<mTqy^@r&CD=pP~o%#@Obb6PAUZ3{%_EO#cQfvj?
zu$T@H3&j3H6i`9=piM`8HY{mmUXo6b3X4F#8&>UfW+GvyapJP=BPaR#bhmP45{;nS
znoL8^V!pgF^v$%-W3%+;`ubzY*6VQAyd+X}bGh9{CyymL(dhO-<an#sJLIs~-|>JM
zgQU^%@7L{bsV&3xW=k|d$A^~>^8N%?!qG4pjUDY|I?jMZ;I#6+V-`-4A(taqmIL6l
z;le`u28LT+>2j}(@sdkMU7VMZklJ?(*oSpbwP-y&fSntBcVf8g<;w>O!Ko@7qddo;
zMeF*Z3e3QpDzijcU+BV_iUYReQaw$X#Qs(^`9!hWI&YW1qLmf3Yu^pVq!G96#B!6<
zW=q_;sVkkRXm3>dCtGP584h~hEC5aD8i*b(HIR!0-fN4#?%^Eth^ZZQ&VL9<LL!z-
z&{TsSUh?BfkK1R;%GRpzNh>Ir_=YIQx!-Zv9_lyj(SI<R?{A;Cp|SNkbZL8n%GN$F
zy5hu(VT73;B%IsdFCGCCiG+etW<K;8Bqp`d7b-Tb8X~KvrluFQcm882>#%1v9KQlI
zTc&;dm`Exj3t}4^8%vF}L>#X-aY+OGikJ0nF+{-Gsb%Yb%3`t)t}}A9QjU&}=44@+
z+zt3oweU+5EaI_Y24ky_p%??r=2M1&>fBt7+kpXWswSuN32K3$|Chk``!<hB8o-Hu
zyLU?vmqXuw^b(OQ=y%Q9*TF%_f4H?Wi8wALMQ+JEugy-?sdmF%)B5EDxASU-uT3A5
zYzhf{EDbKi?hYXezv2K^G&u?Zo#^lR6zQfz->)1oSF!|rRv5GW6CIbN)~P~~(eKvd
zc1yjak%*Z0)jOLu%}wsRviK~<V;#+h##tO6(Gp2`;^~Tl$~1jC$b%m#$tT_^p0`Wk
z8VIk5!coPqOzKa~Y3mJo@`e-eVSOmeg&n(yi8sc^=S=S%-aG4?olkl3nf3dtutlAJ
zn5UYHH?67WPmb6YhbS5wlUR-<+Ne7*qZ9Lbt%1wvJL^yPSHA_Il*&|HiMM#}gct8L
z{M5*pw6Q$M=Q8N|<wCay!20V<CI=NtwhF7~r8S7zTTn8&uLmphqa^*WmLETU6bC+B
zIClqK?QCH0lT(cI8(~ZSuJWYo^y$g$+jwZh9)B7}C1`gXGl@1ZSaCJLFsgnT=c-zD
zGb1yDMj#I7#5kCpn-$h|)gb^pw(|~x&|O_!0r{{fU(*rpV!bIH^I-b$u(&Yj9SH-)
zB)7m$g;_Lly~ER%vJqdurrLpvQaY5<T8=_r1I_oi6Lh()hA8kjC(#?9u$z#icL!F=
zVx|-lTBDCP)>?1}C_cg?+TY=eCdY0i?1p)&IA9+!8@8w7jq7FncE7)v%LiQFIP(1d
z=b8MU?_w~?eN?AXBaY8kTk}ne7<zy@3eOCnK@*X33zDkS0A!r(tx&cOha$015M#W@
zumy)6o#wjHGP2jUOExu`h{x9v6VAi^{VPZwPf+{g5S6X3-XC(T{+foKgUU+Z#?UQM
zAgofPVlXo0vm2+(xRtMeXb;-4PvNqcdIj_Z+$jo^i-iblE!|yyt<8Iz{_2nv2CDet
z$_YcKNFeHUgyoCQ@{pyQnU<eFexg$Y@mt}1d)&p$w!Xf(mKX4yif(efD>)Su>V3@u
zcpMutqEdh+uA44_uuYRb*l)ejjPE;hT#D$u-PL=W^9G|@5kH}N?&;dT8JsnG?@&^I
z(JT!PHe+|e35SP=hklO(9y!}{&UiLkwvq0V_vXt(KJ(j=R0EQ}o~D*Tmk+6<Zo|Qg
z|B|Rp1r?|*XR-(fNuN1uS~>5Sa!*G>P9vjvhJz!C&uO{;$@|nfE(U{;+E}8ov>VJA
zR`a0Ln5qesz69|m9|NQT%)p0?D^7hpc?JW3K%f$^GWR|nqc~(J&Zd3E#<vGZu*F69
zLyhpK6f%Lqcs!<Muy_9WW1LDJ_d(*&af(^TiUpxbMKV-+HOs(H5wujbpT2t4xM+>~
z%vajbG8f>KjxoW@#wG|ET>>8iO<WB2v3p=j^{rmw+<$5}zY+;waNpC{IRE_lqwMd3
zA{B#fdHkiKoA0^$*jiE&#!@cD{F-a}cU@o`itT=dQg&=g3f-Hy@D(CP#yTxOWv%MR
zbXpZ!LE1cXU%Vb(YFG;k3z*&A-DZ*3qJIqU$FVa0BVHr4ImPZ*tWyt9&$d8^B2$!y
z4u$s(nmDs}Slvu%2AUe(`kkJY=AS>^okg*+u=-;W$;<|~=&*<!`lg@$e!@)8${P7z
zp;uQH`h3nut5P5@E)KO3cw1sQnoO^#fRnU4nt~HbvAIIBNdsUe-u$G3GZG?RC;9O#
z7W>8S4oj&m3NgNSnX{rVBG0|NYs^^5eb(lsE~f^t65N;W=^=|v1tZ&Dn9yfa_qw&l
zf85o88YTQXuk~^{`ra{tiGgttj!15G*4{K<wY#b{yd#sK-)-0QY*$W3K}{Vcgosw6
z))(Tm)|si2f5y5J6cm*6K7eRtYs&>Wx$7}DS6`*0rF}a9OAxSE8A8isMZ)OP8M1(q
za?LecY5N%px^wu=J9n2n8^5VH5s=jkM=V%KEc{y5$V^x=4V<J2FD)%iBofJ+v6R(&
ztPj3z8vW>YSoklP3x#~X6q-QrE=Gu5r5CulRb=LrzvUTrqdm0uASUH=+x&@$2Cyf)
z<0A8-tG?QFk;qC<AYWKt%ZiQGiK3JY)>x?g4@V@{QhFZux&Z2WWVmGm63v0H4s0;*
zK2xN)#N)MXjF<lf-Bs&!Up*1i%mRWK;lpqKkwj7@H@C+8yo-O)_)o}hvh4FXxV4`u
z5Rj5Er-XicdqjN1!NL;1IbiwCji)omDE!*@B~NinG&lhd^<PCkFJJYXZtO~kCa26P
zvTN$r0136ir&q&6jfN8&TiL>R7b+w|sqRv15TYUM^uARaN7usw&{~-D?a$7srKqSV
z8aYRV9C={IUxy#uwaDG<ckp264HWTgRug>yD!jj*ac$<^>ADkA`cchT7`WAq9EB+?
z&|3H=9-(+n=#KC0B$cl?bU<Y^hPSLZ)f#qu*DRb2x=}$vMb*HKE*<*ZWIt{L%DI<J
z!ph0a9G)qcgD||&`JAr~`wIDfDJU>L_B{d!hVDyf3~K$1<p}$m`5|dUPN<UCtzSK*
za`geCvUj=(R5z?ODcc01VpOKlGsKWA@a4+G*;TbzbTaMhCuwQvzZYjKWVv{{2%Yum
z85ut|MFN+*eA$2)ZCW{FREZoA_wwTIxj2fp;WX#WW%SC~a|$aslz!ow7L}5f6?7Cc
zO~}yPJJ@GCUuZsTJ|-kg$HvC4AErDV;wQz)8nm^k+2_unnsI7<0Z6sTvMV~QPl_@z
zpNrL_+k<%;IJBp5YNpWN_ulDbvCinVlt4o9C%A4cN61$-S8By&qYH;vC>G?q{-=qv
z|4%Jxi9-6953iNeITAiTyhd%y*=zITRg8a~8`c6r6O%th3e&Sa3CD1;QdA(knn}Xy
z2BBO<CG^zkUFXTkTIzUutm;KDI}F!>2#tP!s1Ptn^t+3hlJ@qjMD-i{Ym(PcQBeGB
zX02l8^%L<~4B5|z?Y&MnH&iC$n*x^>cuyDDs=n&tM&~x$xXWE`GJ{%T0d3Esc_meo
zm;EC;`dDjrx*K2o+Y_*`qskhUha%o1>c|ra>oSa{u3*D>ldtV)kJg&49sB~{;2*v?
z1Oy1$+uMUu0<UIU2v)iwC+E!oQu`-LCX#U>lsBD7z%ko!S<0qJEO|#^!66`g_jwg0
z;`8ZoQ26he9DpAdkZWw1RIQ(Sle&(r7k>QexGufI*=92~H5K}imlyjSk(zSaYhV|a
zd*h?T-@nxxaQt2#-N8;B)d}@l|6w>ThD=HAj_M`!cXtbe0*)&zUTZVH)YdW=1s@Q$
z*)U99PQO0iH;23iWbcc2YwFN}r-0;v)Yx7?by|oF$48x4m&IL@=)6bV&@(k$^QP;7
z#`M<Jy}Y++$9=t7Ai(W-uu1G@&GEe9E8t(YY*Q&d2x<)cL(b!2#SoZR!w(>bi@wVc
z$kEpORKsZfrYEkXajH+lOI+A|H0Xf88s!mF)u+G04V&OF%Vn6qdEwf0o9PfxwYY62
z{3--tYq5@xkDb=rn;tt{w|ZHJw*BLQ@iuu3FPwkD>SjsniMC>;0E+C-F+{mvq+3~d
zl3T$Kq#>dKw<j66PI#RjMrFh6zb#tPc#K#`z4y+=`%V%83H~)qZo`TI>eGa-Qf_%k
z{L5_8*ZI;bATHw3bA>-=>`@o*T!T%FH^B)^TNgCvF@7GQLMFxlU^7k6&o_Dz_8Z%-
zzT1xihQi@LySD@Djf{%Tl9gSn>lm_QK2FVW1bZzV5YU+;Y>$mYma9H!TrL%pocs>T
zh}Z=BKyDVA7RVcA3l1BW;=2Bgv^tKcwF5l?&ebapD~F8bgYuQMI;XM0D-6B%yO)>K
zbO6@ux<6;+>974!Zbha@HU5MOR$dBF-y%N2Sry4!;tihS+gjZ<0&>_}Tc~L(#^*Kw
zWhWlbS(}@ezNUOKa8UTJO7BcH19o1+A}^n=rQ$**53`xf$H5_;{4*4jfc9<Ag0zUW
z6Z(uNNBbOMTh2IYpJfoCdBLNh>nRgO&QY^<W|^fn{sR%wuNd-RZPqkMpXtuvb<!S*
zkcK%qRA+{8ODM4c#D~--pVwKxZJ>}sgCmR8fbp>Vp~x*Syx0)aXms4enA6u~4V*SP
zddR>)m~`r^#Tbh>NC8q&R;~qynQ69~nGtMX6uOff8B_n)E?r@XlCSNI;e!}5OrJ9L
zl7U*_Z_5C#{Z%YZUGX}AcC#R|ZXy+PJ<=z#Bt=I@cQbP8y7z;ee_LOKQ$o}cY$$g7
zwJ`ZyaMOuv^$CfAN*ogkuJc+fviOgXt1%W&Ro;g#v%M)tchTRIPOa@?I-||{8d_oZ
z{5{=sb90dAC}h?+Wr$mn92|_3h~6w_K$lMu{6sgPKzkleOq#U$)HP(xN^FA|J~}q(
zGkJXn5y^<kF`fIipy<a2!rU~Xa_(azkx75!Fk*>bCd~}pEx4e#mY+@AX(`y#+WXHB
zJWHa|H<6O9Xo&1{wmhS9{AFxv3Mi!T@UKs|lRy?feA85fZ>NIOS_8W-HFJWl9dT%N
zfNws$@J^*XEfz3C#tQgre(5fSg_m$Pdc50NfBRR@JbfW3D0tAnvjDHnZ1P*DqV3<A
zx^o^$`@WiH77_C}NUtxMW@-)f`kS_TWEwY`Nq~HGv!tYo8O)PsMjyd#7e4|4E2uD{
z@axEo+2ImEqM2nK7fwzAdQl!tF@|iV_#P8u03@(bdYF)zSYn`4#6n^(DM0!L4-a1p
zYK@0}Ma1pCxnC=b?Ke)nBnl2TG^ouwUSbGW2`6_`Geh}3hXYfJ!Zl+r9?~yZGO_tB
zR0wBxFdxT^{ynos>1TX;%!*s*SDK<SdZ4dfr^Iv{6^WR8KggX6G@X~#@Q{9D|FQJz
zsm8c)fTh*xLSKez7cv*axaBiqsaLuEC6TGXOq9cRUtunN+zs@kgh>fiv~wIi<7x+C
zY{*5#B^_3bKo6LG#e@wR3uxy6A3Cg5o&kyi3DX!MslRL5(8?*kOt=O9?jA)SE`}vt
zqawZs(6)n4uNHytR;iLeF_YiT|F}>lA}S-%qH6u$jmj@%9}|9=%7k`Y@6*NoaTVh6
zf)5u@7ech6A{vSe2{tA2sgfAq^_g8RpIV((X2tmV`6qzBIV?2|O^0ssB38VyM_(MO
zNDB@x6b_J(AU0R~{Y=!7?x{x$;-|Cz1G1)h@X=pDsiV1PXl>3>pFdyE%+j<t8+kZV
zR#<I^3C(F~YQ|%7!+YqLEp#?{5p!^Gh{AVtgr>*->8B{LAcG|kKa(}DTyd&b_iDgU
zuIBytj9z)~5^oG$#5${?hYCV{(QYY@8wv4kfa65HQBZs?H-^dQwjV6RB*>=3G6N)2
zejFsTNY12O<w_8w!#@tY3A?Mw**^aZQtCtL_`7|c?xzn%%GHZMzdCGL_zoW@_w$S2
zA%v?>Vx3oLd?o7Ky1PCJ7>S9BV&4fz^gFv6T|beZE)>#x0>Pr}plW5<!yqsZ+MuQn
z{>2{qWxU@BwPW&?q_X;iK)2>@DZWNKk?Q9Sx*7LH<}zVFZu7!U+QBy}zf5UF0AL9N
z`d5Dl@4;fOAJA;~|A$(It=u|ddeYL;>U9&<ql_alH0j$RX;x<0PekrKv*J-1obw*b
z9$nSd3&~c_nyu>FGG?6Cw!K`vup{|(SvU*l&D`Dhs$Pic)prA`m1|N1K$D(~MBvNw
zMc;JAj1~w)_WFFQ)c(b%LTgwgJ{aZ|7VUE|;7|gF3KG$v_CI#BGYS-@urT5C0q7@k
zxF#F*Cl3y2i9@QONRRkR=mw}uzzh+@a*01qon$qb`hI_;?j0WxnFH2CgiJcUN|mx%
zY06R$_V#KoS1XhRV>$Q<-39(2b>`Tqa)$0wVTRqGuWi}kj))@lG_N=mYDQoFNimt>
zAUjfna1Q%#i<pJ4I8<q5Q@2W%!OEaS#4Srb>wJ7@RrTZNn3<9GjcZC@?eu;JRBl6D
zKk<{CC<=M1*@{&6kdTo4o!woLgbKY5jy9Ml{NRh)AMK&Tte8PgV8d$9%(~fcI@qKD
zKKOWV)PM<X!eqq8&8-b1G&?uP2mRcLNCz1*>botgL32(JHEF`pGniIG?pHRe14hFh
zRm<nDBJTwp(V=Qe7eIJeoWd)GdW3D?yS=Q?v|m{^DS<b~bU1jNho?#q)#>nT#L2M-
z8#;)p#}gZS{xg~v@mlLaaxb!Zcj&i}Y;4AN-?PaJ>;(hkN1}djsWPtkANRfeb<5eU
z9~A|#YpqF!Raf=;S(_I$Uq5Pset0Wb*yA2klsDp>P=HB6^Zc2TM2(SDJ3zqIofwM@
z7e`3z(SOglNPNAv_Jc3(T(<SV_kkC;ndu{3jxM)4)3o-Op{uC8_u>hEN34e#Q{`b=
SjscElK`F?nO4m!8Mf?vl%E>qY


From 9ca51f30dbcbf7b97e194514d87f76cf450368cf Mon Sep 17 00:00:00 2001
From: Randy Burden <randy_burden@hotmail.com>
Date: Tue, 21 Oct 2014 18:30:00 -0500
Subject: [PATCH 1644/4742] [overlay mode demo] Fixed bug which highlighted the
 rest of the line

If "{{" was found, the code would highlight the rest of the line
regardless if a matching "}}" or "}}}" was found.
---
 demo/mustache.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/demo/mustache.html b/demo/mustache.html
index ecc68555ef..ae4e6a891b 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -46,9 +46,10 @@ <h1>{{title}}</h1>
       var ch;
       if (stream.match("{{")) {
         while ((ch = stream.next()) != null)
-          if (ch == "}" && stream.next() == "}") break;
-        stream.eat("}");
-        return "mustache";
+          if (ch == "}" && stream.next() == "}") {
+            stream.eat("}");
+            return "mustache";
+          }
       }
       while (stream.next() != null && !stream.match("{{", false)) {}
       return null;

From 08183e426e4a743b8dce274bc51a6aa584b6a4c0 Mon Sep 17 00:00:00 2001
From: Jeremy Parmenter <shabado9889@gmail.com>
Date: Sun, 19 Oct 2014 15:05:10 -0700
Subject: [PATCH 1645/4742] [gfm mode] Added strikethrough implementation

---
 lib/codemirror.css        |  1 +
 mode/gfm/gfm.js           |  3 ++-
 mode/gfm/index.html       | 10 ++++++++
 mode/gfm/test.js          | 49 +++++++++++++++++++++++++++++++++++++++
 mode/markdown/markdown.js | 39 ++++++++++++++++++++++++++++---
 5 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 68c67b170a..af9e0f26e6 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -125,6 +125,7 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-header, .cm-strong {font-weight: bold;}
 .cm-em {font-style: italic;}
 .cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
 
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index eb0b7c193b..80a8e2c84d 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -109,7 +109,8 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var markdownConfig = {
     underscoresBreakWords: false,
     taskLists: true,
-    fencedCodeBlocks: true
+    fencedCodeBlocks: true,
+    strikethrough: true
   };
   for (var attr in modeConfig) {
     markdownConfig[attr] = modeConfig[attr];
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index a35e56866c..60d108c1ca 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -41,6 +41,16 @@ <h2>GFM mode</h2>
 
 Underscores_are_allowed_between_words.
 
+## Strikethrough text
+
+GFM adds syntax to strikethrough text, which is missing from standard Markdown.
+
+~~Mistaken text.~~
+~~**works with other fomatting**~~
+
+~~spans across
+lines~~
+
 ## Fenced code blocks (and syntax highlighting)
 
 ```javascript
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index b9af5e894c..c2bc38fd57 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -22,6 +22,12 @@
      "[variable-2&formatting&formatting-list&formatting-list-ul - ][meta&formatting&formatting-task [ ]]][variable-2  foo]",
      "[variable-2&formatting&formatting-list&formatting-list-ul - ][property&formatting&formatting-task [x]]][variable-2  foo]");
 
+  FT("formatting_strikethrough",
+     "[strikethrough&formatting&formatting-strikethrough ~~][strikethrough foo][strikethrough&formatting&formatting-strikethrough ~~]");
+
+  FT("formatting_strikethrough",
+     "foo [strikethrough&formatting&formatting-strikethrough ~~][strikethrough bar][strikethrough&formatting&formatting-strikethrough ~~]");
+
   MT("emInWordAsterisk",
      "foo[em *bar*]hello");
 
@@ -161,4 +167,47 @@
      "Commit: [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2]",
      "Issue: [link #1]",
      "Link: [link http://www.example.com/]");
+
+  MT("strikethrough",
+     "[strikethrough ~~foo~~]");
+
+  MT("strikethroughWithStartingSpace",
+     "~~ foo~~");
+
+  MT("strikethroughUnclosedStrayTildes",
+    "[strikethrough ~~foo~~~]");
+
+  MT("strikethroughUnclosedStrayTildes",
+     "[strikethrough ~~foo ~~]");
+
+  MT("strikethroughUnclosedStrayTildes",
+    "[strikethrough ~~foo ~~ bar]");
+
+  MT("strikethroughUnclosedStrayTildes",
+    "[strikethrough ~~foo ~~ bar~~]hello");
+
+  MT("strikethroughOneLetter",
+     "[strikethrough ~~a~~]");
+
+  MT("strikethroughWrapped",
+     "[strikethrough ~~foo]",
+     "[strikethrough foo~~]");
+
+  MT("strikethroughParagraph",
+     "[strikethrough ~~foo]",
+     "",
+     "foo[strikethrough ~~bar]");
+
+  MT("strikethroughEm",
+     "[strikethrough ~~foo][em&strikethrough *bar*][strikethrough ~~]");
+
+  MT("strikethroughEm",
+     "[em *][em&strikethrough ~~foo~~][em *]");
+
+  MT("strikethroughStrong",
+     "[strikethrough ~~][strong&strikethrough **foo**][strikethrough ~~]");
+
+  MT("strikethroughStrong",
+     "[strong **][strong&strikethrough ~~foo~~][strong **]");
+
 })();
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 3eb7747e60..48464645bb 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -75,6 +75,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   // Turn on task lists? ("- [ ] " and "- [x] ")
   if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
 
+  // Turn on strikethrough syntax
+  if (modeCfg.strikethrough === undefined)
+    modeCfg.strikethrough = false;
+
   var codeDepth = 0;
 
   var header   = 'header'
@@ -91,7 +95,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   linktext = 'link'
   ,   linkhref = 'string'
   ,   em       = 'em'
-  ,   strong   = 'strong';
+  ,   strong   = 'strong'
+  ,   strikethrough = 'strikethrough';
 
   var hrRE = /^([*\-=_])(?:\s*\1){2,}\s*$/
   ,   ulRE = /^[*\-+]\s+/
@@ -99,7 +104,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
   ,   atxHeaderRE = /^#+/
   ,   setextHeaderRE = /^(?:\={1,}|-{1,})$/
-  ,   textRE = /^[^#!\[\]*_\\<>` "'(]+/;
+  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/;
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -121,6 +126,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.em = false;
     // Reset STRONG state
     state.strong = false;
+    // Reset strikethrough state
+    state.strikethrough = false;
     // Reset state.quote
     state.quote = 0;
     if (!htmlFound && state.f == htmlBlock) {
@@ -283,6 +290,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     if (state.strong) { styles.push(strong); }
     if (state.em) { styles.push(em); }
+    if (state.strikethrough) { styles.push(strikethrough); }
 
     if (state.linkText) { styles.push(linktext); }
 
@@ -511,6 +519,29 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
+    if (modeCfg.strikethrough) {
+      if (ch === '~' && stream.eatWhile(ch)) {
+        if (state.strikethrough) {// Remove strikethrough
+          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
+          var t = getType(state);
+          state.strikethrough = false;
+          return t;
+        } else if (stream.match(/^[^\s]/, false)) {// Add strikethrough
+          state.strikethrough = true;
+          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
+          return getType(state);
+        }
+      } else if (ch === ' ') {
+        if (stream.match(/^~~/, true)) { // Probably surrounded by space
+          if (stream.peek() === ' ') { // Surrounded by spaces, ignore
+            return getType(state);
+          } else { // Not surrounded by spaces, back up pointer
+            stream.backUp(2);
+          }
+        }
+      }
+    }
+
     if (ch === ' ') {
       if (stream.match(/ +$/, false)) {
         state.trailingSpace++;
@@ -659,7 +690,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         listDepth: 0,
         quote: 0,
         trailingSpace: 0,
-        trailingSpaceNewLine: false
+        trailingSpaceNewLine: false,
+        strikethrough: false
       };
     },
 
@@ -683,6 +715,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         linkTitle: s.linkTitle,
         em: s.em,
         strong: s.strong,
+        strikethrough: s.strikethrough,
         header: s.header,
         taskList: s.taskList,
         list: s.list,

From 7e9080a2f3fa37cd6da43aaeaba5c82e7361c140 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 22 Oct 2014 17:41:27 +0200
Subject: [PATCH 1646/4742] Don't re-highlight lines that were highlighted
 during drawing

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 054548d9d4..9d6902ba96 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5878,12 +5878,13 @@
     return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
   }
 
-  function getLineStyles(cm, line) {
+  function getLineStyles(cm, line, updateFrontier) {
     if (!line.styles || line.styles[0] != cm.state.modeGen) {
       var result = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
       line.styles = result.styles;
       if (result.classes) line.styleClasses = result.classes;
       else if (line.styleClasses) line.styleClasses = null;
+      if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
     }
     return line.styles;
   }
@@ -5938,7 +5939,8 @@
       if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
         builder.addToken = buildTokenBadBidi(builder.addToken, order);
       builder.map = [];
-      insertLineContent(line, builder, getLineStyles(cm, line));
+      var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
+      insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
       if (line.styleClasses) {
         if (line.styleClasses.bgClass)
           builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");

From fb8692435b3dda5c417fa1e9a1fd8efd49e9f0ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Oct 2014 09:59:13 +0200
Subject: [PATCH 1647/4742] [solarized theme] Remove tab background character

It doesn't belong in a theme.
---
 theme/solarized.css | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index 36d5f79048..07ef406804 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -88,11 +88,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   text-decoration-style: dotted;
 }
 .cm-s-solarized .cm-strong { color: #eee; }
-.cm-s-solarized .cm-tab:before {
-  content: "➤";   /*visualize tab character*/
-  color: #586e75;
-  position:absolute;
-}
 .cm-s-solarized .cm-error,
 .cm-s-solarized .cm-invalidchar {
   color: #586e75;

From 7206ccce08a565905570e963e3a98b84e75f677b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Thu, 23 Oct 2014 21:26:23 -0400
Subject: [PATCH 1648/4742] [vim] Fix bug that vim mode could not be disabled

---
 keymap/vim.js | 85 ++++++++++++++++++++++++++-------------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a0a01e06c6..e1ff9469b6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -226,51 +226,52 @@
   var specialKey = {Enter:'CR',Backspace:'BS',Delete:'Del'};
   var mac = /Mac/.test(navigator.platform);
   var Vim = function() {
-    CodeMirror.defineOption('vimMode', false, function(cm, val) {
-      function lookupKey(e) {
-        var keyCode = e.keyCode;
-        if (modifierCodes.indexOf(keyCode) != -1) { return; }
-        var hasModifier = e.ctrlKey || e.metaKey;
-        var key = CodeMirror.keyNames[keyCode];
-        key = specialKey[key] || key;
-        var name = '';
-        if (e.ctrlKey) { name += 'C-'; }
-        if (e.altKey) { name += 'A-'; }
-        if (mac && e.metaKey || (!hasModifier && e.shiftKey) && key.length < 2) {
-          // Shift key bindings can only specified for special characters.
-          return;
-        } else if (e.shiftKey && !/^[A-Za-z]$/.test(key)) {
-          name += 'S-';
-        }
-        if (key.length == 1) { key = key.toLowerCase(); }
-        name += key;
-        if (name.length > 1) { name = '<' + name + '>'; }
-        return name;
+    function lookupKey(e) {
+      var keyCode = e.keyCode;
+      if (modifierCodes.indexOf(keyCode) != -1) { return; }
+      var hasModifier = e.ctrlKey || e.metaKey;
+      var key = CodeMirror.keyNames[keyCode];
+      key = specialKey[key] || key;
+      var name = '';
+      if (e.ctrlKey) { name += 'C-'; }
+      if (e.altKey) { name += 'A-'; }
+      if (mac && e.metaKey || (!hasModifier && e.shiftKey) && key.length < 2) {
+        // Shift key bindings can only specified for special characters.
+        return;
+      } else if (e.shiftKey && !/^[A-Za-z]$/.test(key)) {
+        name += 'S-';
       }
-      // Keys with modifiers are handled using keydown due to limitations of
-      // keypress event.
-      function handleKeyDown(cm, e) {
-        var name = lookupKey(e);
-        if (!name) { return; }
-
-        CodeMirror.signal(cm, 'vim-keypress', name);
-        if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
-          CodeMirror.e_stop(e);
-        }
+      if (key.length == 1) { key = key.toLowerCase(); }
+      name += key;
+      if (name.length > 1) { name = '<' + name + '>'; }
+      return name;
+    }
+    // Keys with modifiers are handled using keydown due to limitations of
+    // keypress event.
+    function handleKeyDown(cm, e) {
+      var name = lookupKey(e);
+      if (!name) { return; }
+
+      CodeMirror.signal(cm, 'vim-keypress', name);
+      if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
+        CodeMirror.e_stop(e);
       }
-      // Keys without modifiers are handled using keypress to work best with
-      // non-standard keyboard layouts.
-      function handleKeyPress(cm, e) {
-        var code = e.charCode || e.keyCode;
-        if (e.ctrlKey || e.metaKey || e.altKey ||
-            e.shiftKey && code < 32) { return; }
-        var name = String.fromCharCode(code);
-
-        CodeMirror.signal(cm, 'vim-keypress', name);
-        if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
-          CodeMirror.e_stop(e);
-        }
+    }
+    // Keys without modifiers are handled using keypress to work best with
+    // non-standard keyboard layouts.
+    function handleKeyPress(cm, e) {
+      var code = e.charCode || e.keyCode;
+      if (e.ctrlKey || e.metaKey || e.altKey ||
+          e.shiftKey && code < 32) { return; }
+      var name = String.fromCharCode(code);
+
+      CodeMirror.signal(cm, 'vim-keypress', name);
+      if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
+        CodeMirror.e_stop(e);
       }
+    }
+
+    CodeMirror.defineOption('vimMode', false, function(cm, val) {
       if (val) {
         cm.setOption('keyMap', 'vim');
         cm.setOption('disableInput', true);

From b216b2ae780b87028c7cce3e3425182cbc0e9e4c Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 16 Oct 2014 09:32:54 +0400
Subject: [PATCH 1649/4742] [vim] simplify selectBlock function

---
 keymap/vim.js    | 142 ++++++++++++-----------------------------------
 test/vim_test.js |  11 +++-
 2 files changed, 46 insertions(+), 107 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index e1ff9469b6..ee682e3cf0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2669,121 +2669,51 @@
     // Distance between selectionEnd.ch and any(first considered here) selection.ch
     function selectBlock(cm, selectionEnd) {
       var selections = [], ranges = cm.listSelections();
-      var firstRange = ranges[0].anchor, lastRange = ranges[ranges.length-1].anchor;
-      var start, end, direction, selectionStart;
-      var curEnd = cm.getCursor('head');
-      var originalSelectionEnd = copyCursor(selectionEnd);
-      start = firstRange.line;
-      end = lastRange.line;
-      if (selectionEnd.line < curEnd.line) {
-        direction = 'up';
-      } else if (selectionEnd.line > curEnd.line) {
-        direction = 'down';
-      } else {
-        if (selectionEnd.ch != curEnd.ch) {
-          direction = selectionEnd.ch > curEnd.ch ? 'right' : 'left';
-        }
-        selectionStart = cm.getCursor('anchor');
-      }
-      var primIndex = getIndex(ranges, curEnd);
-      // sets to true when selectionEnd already lies inside the existing selections
-      selectionEnd = cm.clipPos(selectionEnd);
-      var contains = getIndex(ranges, selectionEnd) < 0 ? false : true;
-      var isClipped = !cursorEqual(originalSelectionEnd, selectionEnd);
-      // This function helps to check selection crossing
-      // in case of short lines.
-      var processSelectionCrossing = function() {
-        if (isClipped) {
-          if (curEnd.ch >= selectionStart.ch) {
-            selectionStart.ch++;
-          }
-        } else if (curEnd.ch == lineLength(cm, curEnd.line)) {
-          if (cursorEqual(ranges[primIndex].anchor, ranges[primIndex].head) && ranges.length>1) {
-            if (direction == 'up') {
-              if (contains || primIndex>0) {
-              start = firstRange.line;
-              end = selectionEnd.line;
-              selectionStart = ranges[primIndex-1].anchor;
-            }
-          } else {
-              if (contains || primIndex == 0) {
-                end = lastRange.line;
-                start = selectionEnd.line;
-                selectionStart = ranges[primIndex+1].anchor;
-              }
-            }
-            if (selectionEnd.ch >= selectionStart.ch) {
-              selectionStart.ch--;
-            }
-          }
-        }
-      };
-      switch(direction) {
-        case 'up':
-          start = contains ? firstRange.line : selectionEnd.line;
-          end = contains ? selectionEnd.line : lastRange.line;
-          selectionStart = lastRange;
-          processSelectionCrossing();
-          break;
-        case 'down':
-          start = contains ? selectionEnd.line : firstRange.line;
-          end = contains ? lastRange.line : selectionEnd.line;
-          selectionStart = firstRange;
-          processSelectionCrossing();
-          break;
-        case 'left':
-          if ((selectionEnd.ch <= selectionStart.ch) && (curEnd.ch > selectionStart.ch)) {
-            selectionStart.ch++;
-            selectionEnd.ch--;
-          }
-          break;
-        case 'right':
-          if ((selectionStart.ch <= selectionEnd.ch) && (curEnd.ch < selectionStart.ch)) {
-            selectionStart.ch--;
-            selectionEnd.ch++;
-          }
-          break;
-        default:
-          start = selectionStart.line;
-          end = selectionEnd.line;
-      }
-      while (start <= end) {
-        var anchor = {line: start, ch: selectionStart.ch};
-        var head = {line: start, ch: selectionEnd.ch};
-        var range = {anchor: anchor, head: head};
+      var head = copyCursor(cm.clipPos(selectionEnd));
+      var isClipped = !cursorEqual(selectionEnd, head);
+      var curHead = cm.getCursor('head');
+      var primIndex = getIndex(ranges, curHead);
+      var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor);
+      var max = ranges.length - 1;
+      var index = max - primIndex > primIndex ? max : 0;
+      var base = ranges[index].anchor;
+
+      var firstLine = Math.min(base.line, head.line);
+      var lastLine = Math.max(base.line, head.line);
+      var baseCh = base.ch, headCh = head.ch;
+
+      var dir = ranges[index].head.ch - baseCh;
+      var newDir = headCh - baseCh;
+      if (dir > 0 && newDir <= 0) {
+        baseCh++;
+        if (!isClipped) { headCh--; }
+      } else if (dir < 0 && newDir >= 0) {
+        baseCh--;
+        if (!wasClipped) { headCh++; }
+      } else if (dir < 0 && newDir == -1) {
+        baseCh--;
+        headCh++;
+      }
+      for (var line = firstLine; line <= lastLine; line++) {
+        var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
         selections.push(range);
-        if (cursorEqual(head, selectionEnd)) {
-            primIndex = selections.indexOf(range);
-        }
-        start++;
-      }
-      // Update selectionEnd and selectionStart
-      // after selection crossing
-      selectionEnd.ch = selections[0].head.ch;
-      selectionStart.ch = selections[0].anchor.ch;
-      if (cursorEqual(selectionEnd, selections[0].head)) {
-        selectionStart.line = selections[selections.length-1].anchor.line;
-      } else {
-        selectionStart.line = selections[0].anchor.line;
       }
+      primIndex = head.line == lastLine ? selections.length - 1 : 0;
       cm.setSelections(selections, primIndex);
-      return selectionStart;
+      selectionEnd.ch = headCh;
+      base.ch = baseCh;
+      return base;
     }
     // getIndex returns the index of the cursor in the selections.
     function getIndex(ranges, cursor, end) {
-      var pos = -1;
       for (var i = 0; i < ranges.length; i++) {
-        var atAnchor = cursorEqual(ranges[i].anchor, cursor);
-        var atHead = cursorEqual(ranges[i].head, cursor);
-        if (end == 'head') {
-        pos = atHead ? i : pos;
-        } else if (end == 'anchor') {
-          pos = atAnchor ? i : pos;
-        } else {
-          pos = (atAnchor || atHead) ? i : pos;
+        var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor);
+        var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor);
+        if (atAnchor || atHead) {
+          return i;
         }
       }
-      return pos;
+      return -1;
     }
     function getSelectedAreaRange(cm, vim) {
       var lastSelection = vim.lastSelection;
diff --git a/test/vim_test.js b/test/vim_test.js
index 401172b649..5a2912bef4 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1757,11 +1757,20 @@ testVim('visual_block_crossing_short_line', function(cm, vim, helpers) {
   helpers.doKeys('3', 'k');
   selections = cm.getSelections().join();
   eq('4', selections);
-}, {value: '123456\n78\nabcdefg\nfoobar'});
+  helpers.doKeys('5', 'j', 'k');
+  selections = cm.getSelections().join("");
+  eq(10, selections.length);
+}, {value: '123456\n78\nabcdefg\nfoobar\n}\n'});
 testVim('visual_block_curPos_on_exit', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('<C-v>', '3' , 'l', '<Esc>');
   eqPos(makeCursor(0, 3), cm.getCursor());
+  helpers.doKeys('h', '<C-v>', '2' , 'j' ,'3' , 'l');
+  eq(cm.getSelections().join(), "3456,,cdef");
+  helpers.doKeys('4' , 'h');
+  eq(cm.getSelections().join(), "23,8,bc");
+  helpers.doKeys('2' , 'l');
+  eq(cm.getSelections().join(), "34,,cd");
 }, {value: '123456\n78\nabcdefg\nfoobar'});
 
 testVim('visual_marks', function(cm, vim, helpers) {

From 56dc38e94072122d5bdc86940eec8b7b8e04f076 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 24 Oct 2014 21:10:48 +0200
Subject: [PATCH 1650/4742] Link to new discussion forum

---
 CONTRIBUTING.md | 4 ++--
 index.html      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 47006a17f4..c4296ce4d2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@
 ## Getting help
 
 Community discussion, questions, and informal bug reporting is done on the
-[CodeMirror Google group](http://groups.google.com/group/codemirror).
+[discuss.CodeMirror forum](http://discuss.codemirror.net).
 
 ## Submitting bug reports
 
@@ -17,7 +17,7 @@ reporting a bug, read these pointers.
 
 **Note:** The issue tracker is for *bugs*, not requests for help. Questions
 should be asked on the
-[CodeMirror Google group](http://groups.google.com/group/codemirror) instead.
+[discuss.CodeMirror forum](http://discuss.codemirror.net) instead.
 
 ### Reporting bugs effectively
 
diff --git a/index.html b/index.html
index 0a9f1338fd..8dcd378332 100644
--- a/index.html
+++ b/index.html
@@ -165,7 +165,7 @@ <h2>Community</h2>
   license that CodeMirror uses.</p>
 
   <p>Discussion around the project is done on
-  a <a href="http://groups.google.com/group/codemirror">mailing list</a>.
+  a <a href="http://discuss.codemirror.net">discussion forum</a>.
   There is also
   the <a href="http://groups.google.com/group/codemirror-announce">codemirror-announce</a>
   list, which is only used for major announcements (such as new

From eac6c9b34aab86cc10a10b2cd4377dd5f5431ffd Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 22 Oct 2014 21:40:55 +0400
Subject: [PATCH 1651/4742] [vim] improve handling of external selections

---
 keymap/vim.js    | 31 ++++++++++++++++++-------------
 test/vim_test.js |  3 ++-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index ee682e3cf0..c58de9d44d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -706,8 +706,11 @@
           return true;
         }
 
-        if (vim.insertMode) { return handleKeyInsertMode(); }
-        else { return handleKeyNonInsertMode(); }
+        return cm.operation(function() {
+          cm.curOp.isVimOp = true;
+          if (vim.insertMode) { return handleKeyInsertMode(); }
+          else { return handleKeyNonInsertMode(); }
+        });
       },
       handleEx: function(cm, input) {
         exCommandDispatcher.processCommand(cm, input);
@@ -2100,7 +2103,6 @@
         //     equal to the repeat times the size of the previous visual
         //     operation.
         if (!vim.visualMode) {
-          cm.on('mousedown', exitVisualMode);
           vim.visualMode = true;
           vim.visualLine = !!actionArgs.linewise;
           vim.visualBlock = !!actionArgs.blockwise;
@@ -2820,7 +2822,6 @@
     }
 
     function exitVisualMode(cm) {
-      cm.off('mousedown', exitVisualMode);
       var vim = cm.state.vim;
       var selectionStart = cm.getCursor('anchor');
       var selectionEnd = cm.getCursor('head');
@@ -4655,9 +4656,7 @@
           // Cursor moved outside the context of an edit. Reset the change.
           lastChange.changes = [];
         }
-      } else if (cm.doc.history.lastSelOrigin == '*mouse') {
-        // Reset lastHPos if mouse click was done in normal mode.
-        vim.lastHPos = cm.doc.getCursor().ch;
+      } else {
         handleExternalSelection(cm, vim);
       }
       if (vim.visualMode) {
@@ -4680,16 +4679,22 @@
     function handleExternalSelection(cm, vim) {
       var anchor = cm.getCursor('anchor');
       var head = cm.getCursor('head');
-      // Enter visual mode when the mouse selects text.
-      if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
+      // Enter or exit visual mode to match mouse selection.
+      if (vim.visualMode && cursorEqual(head, anchor) && lineLength(cm, head.line) > head.ch) {
+        exitVisualMode(cm);
+      } else if (!cm.curOp.isVimOp && !vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
         vim.visualMode = true;
         vim.visualLine = false;
         CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-        cm.on('mousedown', exitVisualMode);
       }
-      if (vim.visualMode) {
-        updateMark(cm, vim, '<', cursorMin(head, anchor));
-        updateMark(cm, vim, '>', cursorMax(head, anchor));
+      if (!cm.curOp.isVimOp) {
+        if (vim.visualMode) {
+          updateMark(cm, vim, '<', cursorMin(head, anchor));
+          updateMark(cm, vim, '>', cursorMax(head, anchor));
+        } else if (!vim.insertMode) {
+          // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
+          vim.lastHPos = cm.getCursor().ch;
+        }
       }
     }
 
diff --git a/test/vim_test.js b/test/vim_test.js
index 5a2912bef4..a88d02725e 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1736,7 +1736,7 @@ testVim('visual_block', function(cm, vim, helpers) {
   // switch between visual modes
   cm.setCursor(1, 1);
   // blockwise to characterwise visual
-  helpers.doKeys('<C-v>', '<C-v>', 'j', 'l', 'v');
+  helpers.doKeys('<C-v>', 'j', 'l', 'v');
   selections = cm.getSelections();
   eq('7891\nabc', selections.join(''));
   // characterwise to blockwise
@@ -1785,6 +1785,7 @@ testVim('visual_marks', function(cm, vim, helpers) {
 testVim('visual_join', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'J');
   eq(' 1 2 3\n 4\n 5', cm.getValue());
+  is(!vim.visualMode);
 }, { value: ' 1\n 2\n 3\n 4\n 5' });
 testVim('visual_blank', function(cm, vim, helpers) {
   helpers.doKeys('v', 'k');

From 5a78462df6b4f70664fd6a6df0933c527cf2df3c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 27 Oct 2014 10:30:12 +0100
Subject: [PATCH 1652/4742] [real-world uses] Add three links

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 362408f72b..e9b6d45cce 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -121,6 +121,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
       <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
+      <li><a href="https://pypi.python.org/pypi/PubliForge/">PubliForge</a> (online publishing system)</li>
       <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>
       <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>
       <li><a href="http://qyapp.com">QiYun web app platform</a></li>
@@ -133,6 +134,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
       <li><a href="http://www.skulpt.org/">Skulpt</a> (in-browser Python environment)</li>
+      <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://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
@@ -153,6 +155,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://webglplayground.net/">WebGL playground</a></li>
       <li><a href="https://www.webkit.org/blog/2518/state-of-web-inspector/#source-code">WebKit Web inspector</a></li>
       <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
+      <li><a href="https://github.com/b3log/wide">Wide</a> (golang web IDE)</li>
       <li><a href="http://wordpress.org/extend/plugins/codemirror-for-codeeditor/">WordPress plugin</a></li>
       <li><a href="https://www.writelatex.com">writeLaTeX</a> (Collaborative LaTeX Editor)</li>
       <li><a href="http://www.xosystem.org/home/applications_websites/xosystem_website/xoside_EN.php">XOSide</a> (online editor)</li>

From 514b5bfc007a4339d86300ee271ab662ed0599a7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 27 Oct 2014 11:50:13 +0100
Subject: [PATCH 1653/4742] Allow calling the constructor with null as place

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9d6902ba96..6bfbbf5cda 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -184,8 +184,10 @@
     // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
     if (ie && ie_version < 8) d.scrollbarH.style.minHeight = d.scrollbarV.style.minWidth = "18px";
 
-    if (place.appendChild) place.appendChild(d.wrapper);
-    else place(d.wrapper);
+    if (place) {
+      if (place.appendChild) place.appendChild(d.wrapper);
+      else place(d.wrapper);
+    }
 
     // Current rendered range (may be bigger than the view window).
     d.viewFrom = d.viewTo = doc.first;

From 4902d070c9ba400d2b312733861c32a51ec8cfd1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 27 Oct 2014 14:12:00 +0100
Subject: [PATCH 1654/4742] [vim mode] Don't directly access .options

---
 keymap/vim.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c58de9d44d..832710ca0c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2271,11 +2271,12 @@
           return;
         }
         if (actionArgs.matchIndent) {
-          // length that considers tabs and cm.options.tabSize
+          var tabSize = cm.getOption("tabSize");
+          // length that considers tabs and tabSize
           var whitespaceLength = function(str) {
             var tabs = (str.split("\t").length - 1);
             var spaces = (str.split(" ").length - 1);
-            return tabs * cm.options.tabSize + spaces * 1;
+            return tabs * tabSize + spaces * 1;
           };
           var currentLine = cm.getLine(cm.getCursor().line);
           var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
@@ -2288,8 +2289,8 @@
             if (newIndent < 0) {
               return "";
             }
-            else if (cm.options.indentWithTabs) {
-              var quotient = Math.floor(newIndent / cm.options.tabSize);
+            else if (cm.getOption("indentWithTabs")) {
+              var quotient = Math.floor(newIndent / tabSize);
               return Array(quotient + 1).join('\t');
             }
             else {
@@ -2451,7 +2452,7 @@
           replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
           if (vim.visualBlock) {
             // Tabs are split in visua block before replacing
-            var spaces = new Array(cm.options.tabSize+1).join(' ');
+            var spaces = new Array(cm.getOption("tabSize")+1).join(' ');
             replaceWithStr = cm.getSelection();
             replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
             cm.replaceSelections(replaceWithStr);

From f2459b2867e982a30e56ea32925f674e693072b8 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 27 Oct 2014 22:04:51 +0400
Subject: [PATCH 1655/4742] [vim] implement gu and gU

---
 keymap/vim.js    | 49 ++++++++++++++++++------------------------------
 test/vim_test.js | 26 +++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 832710ca0c..0d6007246d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -156,7 +156,9 @@
     { keys: 'c', type: 'operator', operator: 'change' },
     { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
     { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
-    { keys: 'g~', type: 'operator', operator: 'swapcase' },
+    { keys: 'g~', type: 'operator', operator: 'changeCase' },
+    { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true },
+    { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
     { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
     { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
     // Operator-Motion dual commands
@@ -165,7 +167,7 @@
     { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
     { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
     { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
-    { keys: '~', type: 'operatorMotion', operator: 'swapcase', operatorArgs: { shouldMoveCursor: true }, motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: '~', type: 'operatorMotion', operator: 'changeCase', operatorArgs: { shouldMoveCursor: true }, motion: 'moveByCharacters', motionArgs: { forward: true }},
     { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
     // Actions
     { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
@@ -192,8 +194,8 @@
     // Handle Replace-mode as a special case of insert mode.
     { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
     { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
-    { keys: 'u', type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
-    { keys: 'U',type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
+    { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
+    { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
     { keys: '<C-r>', type: 'action', action: 'redo' },
     { keys: 'm<character>', type: 'action', action: 'setMark' },
     { keys: '"<character>', type: 'action', action: 'setRegister' },
@@ -1915,17 +1917,24 @@
         cm.setCursor(curStart);
         cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
       },
-      swapcase: function(cm, operatorArgs, _vim, _curStart, _curEnd, _curOriginal) {
+      changeCase: function(cm, operatorArgs, _vim, _curStart, _curEnd, _curOriginal) {
         var selections = cm.getSelections();
         var ranges = cm.listSelections();
         var swapped = [];
+        var toLower = operatorArgs.toLower;
         for (var j = 0; j < selections.length; j++) {
           var toSwap = selections[j];
           var text = '';
-          for (var i = 0; i < toSwap.length; i++) {
-            var character = toSwap.charAt(i);
-            text += isUpperCase(character) ? character.toLowerCase() :
-                character.toUpperCase();
+          if (toLower === true) {
+            text = toSwap.toLowerCase();
+          } else if (toLower === false) {
+            text = toSwap.toUpperCase();
+          } else {
+            for (var i = 0; i < toSwap.length; i++) {
+              var character = toSwap.charAt(i);
+              text += isUpperCase(character) ? character.toLowerCase() :
+                  character.toUpperCase();
+            }
           }
           swapped.push(text);
         }
@@ -2508,28 +2517,6 @@
         }
         repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
       },
-      changeCase: function(cm, actionArgs, vim) {
-        var selectionStart = getSelectedAreaRange(cm, vim)[0];
-        var text = cm.getSelection();
-        var lastSelectionCurEnd;
-        var blockSelection;
-        if (vim.lastSelection) {
-        // save the curEnd marker to avoid its removal due to cm.replaceRange
-          lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
-          blockSelection = vim.lastSelection.visualBlock;
-        }
-        var toLower = actionArgs.toLower;
-        text = toLower ? text.toLowerCase() : text.toUpperCase();
-        cm.replaceSelections(vim.visualBlock || blockSelection ? text.split('\n') : [text]);
-        // restore the last selection curEnd marker
-        if (lastSelectionCurEnd) {
-          vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
-        }
-        cm.setCursor(selectionStart);
-        if (vim.visualMode) {
-          exitVisualMode(cm);
-        }
-      },
       exitInsertMode: exitInsertMode
     };
 
diff --git a/test/vim_test.js b/test/vim_test.js
index a88d02725e..12cafa1193 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -957,6 +957,32 @@ testVim('g~g~', function(cm, vim, helpers) {
   is(!register.linewise);
   eqPos({line: curStart.line, ch:0}, cm.getCursor());
 }, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
+testVim('gu_and_gU', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 7);
+  var value = cm.getValue();
+  cm.setCursor(curStart);
+  helpers.doKeys('2', 'g', 'U', 'w');
+  eq(cm.getValue(), 'wa wb xX WC wd');
+  eqPos(curStart, cm.getCursor());
+  helpers.doKeys('2', 'g', 'u', 'w');
+  eq(cm.getValue(), value);
+
+  helpers.doKeys('2', 'g', 'U', 'B');
+  eq(cm.getValue(), 'wa WB Xx wc wd');
+  eqPos(makeCursor(0, 3), cm.getCursor());
+
+  cm.setCursor(makeCursor(0, 4));
+  helpers.doKeys('g', 'u', 'i', 'w');
+  eq(cm.getValue(), 'wa wb Xx wc wd');
+  eqPos(makeCursor(0, 3), cm.getCursor());
+
+  // TODO: support gUgU guu
+  // eqPos(makeCursor(0, 0), cm.getCursor());
+
+  var register = helpers.getRegisterController().getRegister();
+  eq('', register.toString());
+  is(!register.linewise);
+}, { value: 'wa wb xx wc wd' });
 testVim('visual_block_~', function(cm, vim, helpers) {
   cm.setCursor(1, 1);
   helpers.doKeys('<C-v>', 'l', 'l', 'j', '~');

From f1870d8e72fbcdfdd8c079461488c5e3d3bff3b1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Oct 2014 12:11:10 +0100
Subject: [PATCH 1656/4742] Support attach and detach methods for key maps

And adjust vim mode to use these.
---
 demo/vim.html      |  2 +-
 keymap/vim.js      | 81 +++++++++++++++++++++++++++++++---------------
 lib/codemirror.css |  4 +--
 lib/codemirror.js  | 24 ++++++++------
 4 files changed, 72 insertions(+), 39 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index d637c5c869..6a33a6c075 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -80,7 +80,7 @@ <h2>Vim bindings demo</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         mode: "text/x-csrc",
-        vimMode: true,
+        keyMap: "vim",
         matchBrackets: true,
         showCursorWhenSelecting: true
       });
diff --git a/keymap/vim.js b/keymap/vim.js
index 0d6007246d..14affb1ae9 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -273,26 +273,48 @@
       }
     }
 
-    CodeMirror.defineOption('vimMode', false, function(cm, val) {
-      if (val) {
-        cm.setOption('keyMap', 'vim');
-        cm.setOption('disableInput', true);
-        cm.setOption('showCursorWhenSelecting', false);
-        CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-        cm.on('cursorActivity', onCursorActivity);
-        maybeInitVimState(cm);
-        CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
-        cm.on('keypress', handleKeyPress);
-        cm.on('keydown', handleKeyDown);
-      } else if (cm.state.vim) {
-        cm.setOption('keyMap', 'default');
-        cm.setOption('disableInput', false);
-        cm.off('cursorActivity', onCursorActivity);
-        CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
-        cm.state.vim = null;
-        cm.off('keypress', handleKeyPress);
-        cm.off('keydown', handleKeyDown);
-      }
+    function enterVimMode(cm) {
+      cm.setOption('disableInput', true);
+      cm.setOption('showCursorWhenSelecting', false);
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      cm.on('cursorActivity', onCursorActivity);
+      maybeInitVimState(cm);
+      CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
+      cm.on('keypress', handleKeyPress);
+      cm.on('keydown', handleKeyDown);
+      CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
+    }
+
+    function leaveVimMode(cm) {
+      cm.setOption('disableInput', false);
+      cm.off('cursorActivity', onCursorActivity);
+      CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
+      cm.state.vim = null;
+      cm.off('keypress', handleKeyPress);
+      cm.off('keydown', handleKeyDown);
+    }
+
+    function detachVimMap(cm, next) {
+      if (this == CodeMirror.keyMap.vim)
+        CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
+
+      if (!next || next.attach != attachVimMap)
+        leaveVimMode(cm, false);
+    }
+    function attachVimMap(cm, prev) {
+      if (this == CodeMirror.keyMap.vim)
+        CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
+
+      if (!prev || prev.attach != attachVimMap)
+        enterVimMode(cm);
+    }
+
+    // Deprecated, simply setting the keymap works again.
+    CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
+      if (val && cm.getOption("keyMap") != "vim")
+        cm.setOption("keyMap", "vim");
+      else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
+        cm.setOption("keyMap", "default");
     });
     function getOnPasteFn(cm) {
       var vim = cm.state.vim;
@@ -4468,9 +4490,10 @@
     }
 
     CodeMirror.keyMap.vim = {
-        'nofallthrough': true,
-        'style': 'fat-cursor'
-      };
+      nofallthrough: true,
+      attach: attachVimMap,
+      detach: detachVimMap
+    };
 
     function exitInsertMode(cm) {
       var vim = cm.state.vim;
@@ -4540,16 +4563,22 @@
             CodeMirror.commands.newlineAndIndent;
         fn(cm);
       },
-      fallthrough: ['default']
+      fallthrough: ['default'],
+      attach: attachVimMap,
+      detach: detachVimMap
     };
 
     CodeMirror.keyMap['await-second'] = {
-      fallthrough: ['vim-insert']
+      fallthrough: ['vim-insert'],
+      attach: attachVimMap,
+      detach: detachVimMap
     };
 
     CodeMirror.keyMap['vim-replace'] = {
       'Backspace': 'goCharLeft',
-      fallthrough: ['vim-insert']
+      fallthrough: ['vim-insert'],
+      attach: attachVimMap,
+      detach: detachVimMap
     };
 
     function executeMacroRegister(cm, vim, macroModeState, registerName) {
diff --git a/lib/codemirror.css b/lib/codemirror.css
index af9e0f26e6..074dd41b12 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -52,12 +52,12 @@
 .CodeMirror div.CodeMirror-secondarycursor {
   border-left: 1px solid silver;
 }
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
   width: auto;
   border: 0;
   background: #7e7;
 }
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursors {
+.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
   z-index: 1;
 }
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6bfbbf5cda..4ec22f66de 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -303,10 +303,13 @@
     });
   }
 
-  function keyMapChanged(cm) {
-    var map = keyMap[cm.options.keyMap], style = map.style;
-    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
-      (style ? " cm-keymap-" + style : "");
+  function keyMapChanged(cm, old) {
+    if (old == cm.options.keyMap) return;
+
+    old = (old == CodeMirror.Init) ? null : getKeyMap(old);
+    var map = getKeyMap(cm.options.keyMap);
+    if (old && old.detach) old.detach(cm, map);
+    if (map.attach) map.attach(cm, old);
   }
 
   function themeChanged(cm) {
@@ -3185,8 +3188,9 @@
     clearTimeout(maybeTransition);
     if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
       if (getKeyMap(cm.options.keyMap) == startMap) {
+        var old = cm.options.keyMap;
         cm.options.keyMap = (next.call ? next.call(null, cm) : next);
-        keyMapChanged(cm);
+        keyMapChanged(cm, old);
       }
     }, 50);
 
@@ -4504,7 +4508,7 @@
     themeChanged(cm);
     guttersChanged(cm);
   }, true);
-  option("keyMap", "default", keyMapChanged);
+  option("keyMap", "default", function(cm, val, old) { keyMapChanged(cm, old); });
   option("extraKeys", null);
 
   option("lineWrapping", false, wrappingChanged, true);
@@ -7375,13 +7379,13 @@
   };
 
   function classTest(cls) { return new RegExp("\\b" + cls + "\\b\\s*"); }
-  function rmClass(node, cls) {
+  var rmClass = CodeMirror.rmClass = function(node, cls) {
     var test = classTest(cls);
     if (test.test(node.className)) node.className = node.className.replace(test, "");
-  }
-  function addClass(node, cls) {
+  };
+  var addClass = CodeMirror.addClass = function(node, cls) {
     if (!classTest(cls).test(node.className)) node.className += " " + cls;
-  }
+  };
   function joinClasses(a, b) {
     var as = a.split(" ");
     for (var i = 0; i < as.length; i++)

From b077d68ae1a731f0685f615db1664f3507751079 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Oct 2014 16:22:18 +0100
Subject: [PATCH 1657/4742] Allow non-normalized keys and multi-stroke keys in
 keymaps

As long as CodeMirror.normalizeKeyMap is called on them before they are
used. This interface is a little weird, but backwards-compatible.
---
 demo/sublime.html |  11 +--
 keymap/emacs.js   |  47 ++++-----
 keymap/sublime.js |  29 +++---
 keymap/vim.js     |   5 +-
 lib/codemirror.js | 239 +++++++++++++++++++++++++++-------------------
 test/vim_test.js  |   4 +-
 6 files changed, 182 insertions(+), 153 deletions(-)

diff --git a/demo/sublime.html b/demo/sublime.html
index 4cedbcd623..b3b5342c97 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -53,14 +53,11 @@ <h2>Sublime Text bindings demo</h2>
 
 <script>
   var value = "// The bindings defined specifically in the Sublime Text mode\nvar bindings = {\n";
-  var map = CodeMirror.keyMap.sublime, mapK = CodeMirror.keyMap["sublime-Ctrl-K"];
+  var map = CodeMirror.keyMap.sublime;
   for (var key in map) {
-    if (key != "Ctrl-K" && key != "fallthrough" && (!/find/.test(map[key]) || /findUnder/.test(map[key])))
-      value += "  \"" + key + "\": \"" + map[key] + "\",\n";
-  }
-  for (var key in mapK) {
-    if (key != "auto" && key != "nofallthrough")
-      value += "  \"Ctrl-K " + key + "\": \"" + mapK[key] + "\",\n";
+    var val = map[key];
+    if (key != "fallthrough" && val != "..." && (!/find/.test(val) || /findUnder/.test(val)))
+      value += "  \"" + key + "\": \"" + val + "\",\n";
   }
   value += "}\n\n// The implementation of joinLines\n";
   value += CodeMirror.commands.joinLines.toString().replace(/^function\s*\(/, "function joinLines(").replace(/\n  /g, "\n") + "\n";
diff --git a/keymap/emacs.js b/keymap/emacs.js
index ba8149c70e..4acfd601a0 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -256,7 +256,7 @@
 
   // Actual keymap
 
-  var keyMap = CodeMirror.keyMap.emacs = {
+  var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
     "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
     "Ctrl-K": repeated(function(cm) {
       var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
@@ -353,27 +353,7 @@
     "Alt-/": "autocomplete",
     "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
 
-    "Alt-G": function(cm) {cm.setOption("keyMap", "emacs-Alt-G");},
-    "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
-    "Ctrl-Q": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-Q");},
-    "Ctrl-U": addPrefixMap
-  };
-
-  CodeMirror.keyMap["emacs-Ctrl-X"] = {
-    "Tab": function(cm) {
-      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
-    },
-    "Ctrl-X": function(cm) {
-      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
-    },
-
-    "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": repeated("undo"), "K": "close",
-    "Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
-    auto: "emacs", nofallthrough: true, disableInput: true
-  };
-
-  CodeMirror.keyMap["emacs-Alt-G"] = {
-    "G": function(cm) {
+    "Alt-G G": function(cm) {
       var prefix = getPrefix(cm, true);
       if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
 
@@ -383,13 +363,24 @@
           cm.setCursor(num - 1);
       });
     },
-    auto: "emacs", nofallthrough: true, disableInput: true
-  };
 
-  CodeMirror.keyMap["emacs-Ctrl-Q"] = {
-    "Tab": repeated("insertTab"),
-    auto: "emacs", nofallthrough: true
-  };
+    "Ctrl-X Tab": function(cm) {
+      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
+    },
+    "Ctrl-X Ctrl-X": function(cm) {
+      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
+    },
+    "Ctrl-X Ctrl-S": "save",
+    "Ctrl-X Ctrl-W": "save",
+    "Ctrl-X S": "saveAll",
+    "Ctrl-X F": "open",
+    "Ctrl-X U": repeated("undo"),
+    "Ctrl-X K": "close",
+    "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
+
+    "Ctrl-Q Tab": repeated("insertTab"),
+    "Ctrl-U": addPrefixMap
+  });
 
   var prefixMap = {"Ctrl-G": clearPrefix};
   function regPrefix(d) {
diff --git a/keymap/sublime.js b/keymap/sublime.js
index f70a1f98f2..45936c3628 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -386,9 +386,7 @@
 
   map["Alt-Q"] = "wrapLines";
 
-  var mapK = CodeMirror.keyMap["sublime-Ctrl-K"] = {auto: "sublime", nofallthrough: true};
-
-  map[ctrl + "K"] = function(cm) {cm.setOption("keyMap", "sublime-Ctrl-K");};
+  var cK = ctrl + "K ";
 
   function modifyWordOrSelection(cm, mod) {
     cm.operation(function() {
@@ -409,9 +407,9 @@
     });
   }
 
-  mapK[ctrl + "Backspace"] = "delLineLeft";
+  map[cK + ctrl + "Backspace"] = "delLineLeft";
 
-  cmds[mapK[ctrl + "K"] = "delLineRight"] = function(cm) {
+  cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();
       for (var i = ranges.length - 1; i >= 0; i--)
@@ -420,22 +418,22 @@
     });
   };
 
-  cmds[mapK[ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
+  cmds[map[cK + ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
     modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
   };
-  cmds[mapK[ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
+  cmds[map[cK + ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
     modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); });
   };
 
-  cmds[mapK[ctrl + "Space"] = "setSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "Space"] = "setSublimeMark"] = function(cm) {
     if (cm.state.sublimeMark) cm.state.sublimeMark.clear();
     cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
   };
-  cmds[mapK[ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) cm.setSelection(cm.getCursor(), found);
   };
-  cmds[mapK[ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) {
       var from = cm.getCursor(), to = found;
@@ -444,7 +442,7 @@
       cm.replaceRange("", from, to);
     }
   };
-  cmds[mapK[ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) {
       cm.state.sublimeMark.clear();
@@ -452,13 +450,13 @@
       cm.setCursor(found);
     }
   };
-  cmds[mapK[ctrl + "Y"] = "sublimeYank"] = function(cm) {
+  cmds[map[cK + ctrl + "Y"] = "sublimeYank"] = function(cm) {
     if (cm.state.sublimeKilled != null)
       cm.replaceSelection(cm.state.sublimeKilled, null, "paste");
   };
 
-  mapK[ctrl + "G"] = "clearBookmarks";
-  cmds[mapK[ctrl + "C"] = "showInCenter"] = function(cm) {
+  map[cK + ctrl + "G"] = "clearBookmarks";
+  cmds[map[cK + ctrl + "C"] = "showInCenter"] = function(cm) {
     var pos = cm.cursorCoords(null, "local");
     cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
   };
@@ -530,7 +528,7 @@
 
   map["Shift-" + ctrl + "["] = "fold";
   map["Shift-" + ctrl + "]"] = "unfold";
-  mapK[ctrl + "0"] = mapK[ctrl + "j"] = "unfoldAll";
+  map[cK + ctrl + "0"] = map[cK + ctrl + "j"] = "unfoldAll";
 
   map[ctrl + "I"] = "findIncremental";
   map["Shift-" + ctrl + "I"] = "findIncrementalReverse";
@@ -538,4 +536,5 @@
   map["F3"] = "findNext";
   map["Shift-F3"] = "findPrev";
 
+  CodeMirror.normalizeKeyMap(map);
 });
diff --git a/keymap/vim.js b/keymap/vim.js
index 14affb1ae9..ff71568847 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4490,7 +4490,6 @@
     }
 
     CodeMirror.keyMap.vim = {
-      nofallthrough: true,
       attach: attachVimMap,
       detach: detachVimMap
     };
@@ -4734,7 +4733,7 @@
         return true;
       }
       if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
-        CodeMirror.lookupKey(keyName, ['vim-insert'], onKeyFound);
+        CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound);
       }
     }
 
@@ -4819,7 +4818,7 @@
         for (var j = 0; j < changes.length; j++) {
           var change = changes[j];
           if (change instanceof InsertModeKey) {
-            CodeMirror.lookupKey(change.keyName, ['vim-insert'], keyHandler);
+            CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
           } else {
             var cur = cm.getCursor();
             cm.replaceRange(change, cur, cur);
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4ec22f66de..65fe0f5a82 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -86,7 +86,8 @@
       suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
       pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in readInput
       draggingText: false,
-      highlight: new Delayed() // stores highlight worker timeout
+      highlight: new Delayed(), // stores highlight worker timeout
+      keySeq: null  // Unfinished key sequence
     };
 
     // Override magic textarea content restore that IE sometimes does
@@ -303,15 +304,6 @@
     });
   }
 
-  function keyMapChanged(cm, old) {
-    if (old == cm.options.keyMap) return;
-
-    old = (old == CodeMirror.Init) ? null : getKeyMap(old);
-    var map = getKeyMap(cm.options.keyMap);
-    if (old && old.detach) old.detach(cm, map);
-    if (map.attach) map.attach(cm, old);
-  }
-
   function themeChanged(cm) {
     cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
       cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
@@ -2402,7 +2394,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) || isReadOnly(cm) || cm.options.disableInput)
+    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
     if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
@@ -3172,63 +3164,70 @@
     return done;
   }
 
-  // Collect the currently active keymaps.
-  function allKeyMaps(cm) {
-    var maps = cm.state.keyMaps.slice(0);
-    if (cm.options.extraKeys) maps.push(cm.options.extraKeys);
-    maps.push(cm.options.keyMap);
-    return maps;
+  function lookupKeyForEditor(cm, name, handle) {
+    for (var i = 0; i < cm.state.keyMaps.length; i++) {
+      var result = lookupKey(name, cm.state.keyMaps[i], handle);
+      if (result) return result;
+    }
+    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle))
+      || lookupKey(name, cm.options.keyMap, handle);
+  }
+
+  var stopSeq = new Delayed;
+  function dispatchKey(cm, name, e, handle) {
+    var seq = cm.state.keySeq;
+    if (seq) {
+      if (isModifierKey(name)) return "handled";
+      stopSeq.set(50, function() {
+        if (cm.state.keySeq == seq) {
+          cm.state.keySeq = null;
+          resetInput(cm);
+        }
+      });
+      name = seq + " " + name;
+    }
+    var result = lookupKeyForEditor(cm, name, handle);
+
+    if (result == "multi")
+      cm.state.keySeq = name;
+    if (result == "handled")
+      signalLater(cm, "keyHandled", cm, name, e);
+
+    if (result == "handled" || result == "multi") {
+      e_preventDefault(e);
+      restartBlink(cm);
+    }
+
+    if (seq && !result && /\'$/.test(name)) {
+      e_preventDefault(e);
+      return true;
+    }
+    return !!result;
   }
 
-  var maybeTransition;
   // Handle a key from the keydown event.
   function handleKeyBinding(cm, e) {
-    // Handle automatic keymap transitions
-    var startMap = getKeyMap(cm.options.keyMap), next = startMap.auto;
-    clearTimeout(maybeTransition);
-    if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
-      if (getKeyMap(cm.options.keyMap) == startMap) {
-        var old = cm.options.keyMap;
-        cm.options.keyMap = (next.call ? next.call(null, cm) : next);
-        keyMapChanged(cm, old);
-      }
-    }, 50);
-
-    var name = keyName(e, true), handled = false;
+    var name = keyName(e, true);
     if (!name) return false;
-    var keymaps = allKeyMaps(cm);
 
-    if (e.shiftKey) {
+    if (e.shiftKey && !cm.state.keySeq) {
       // First try to resolve full name (including 'Shift-'). Failing
       // that, see if there is a cursor-motion command (starting with
       // 'go') bound to the keyname without 'Shift-'.
-      handled = lookupKey("Shift-" + name, keymaps, function(b) {return doHandleBinding(cm, b, true);})
-             || lookupKey(name, keymaps, function(b) {
-                  if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
-                    return doHandleBinding(cm, b);
-                });
+      return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
+          || dispatchKey(cm, name, e, function(b) {
+               if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
+                 return doHandleBinding(cm, b);
+             });
     } else {
-      handled = lookupKey(name, keymaps, function(b) { return doHandleBinding(cm, b); });
-    }
-
-    if (handled) {
-      e_preventDefault(e);
-      restartBlink(cm);
-      signalLater(cm, "keyHandled", cm, name, e);
+      return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
     }
-    return handled;
   }
 
   // Handle a key from the keypress event
   function handleCharBinding(cm, e, ch) {
-    var handled = lookupKey("'" + ch + "'", allKeyMaps(cm),
-                            function(b) { return doHandleBinding(cm, b, true); });
-    if (handled) {
-      e_preventDefault(e);
-      restartBlink(cm);
-      signalLater(cm, "keyHandled", cm, "'" + ch + "'", e);
-    }
-    return handled;
+    return dispatchKey(cm, "'" + ch + "'", e,
+                       function(b) { return doHandleBinding(cm, b, true); });
   }
 
   var lastStoppedKey = null;
@@ -4030,12 +4029,12 @@
     getDoc: function() {return this.doc;},
 
     addKeyMap: function(map, bottom) {
-      this.state.keyMaps[bottom ? "push" : "unshift"](map);
+      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
     },
     removeKeyMap: function(map) {
       var maps = this.state.keyMaps;
       for (var i = 0; i < maps.length; ++i)
-        if (maps[i] == map || (typeof maps[i] != "string" && maps[i].name == map)) {
+        if (maps[i] == map || maps[i].name == map) {
           maps.splice(i, 1);
           return true;
         }
@@ -4508,7 +4507,12 @@
     themeChanged(cm);
     guttersChanged(cm);
   }, true);
-  option("keyMap", "default", function(cm, val, old) { keyMapChanged(cm, old); });
+  option("keyMap", "default", function(cm, val, old) {
+    var next = getKeyMap(val);
+    var prev = old != CodeMirror.Init && getKeyMap(old);
+    if (prev && prev.detach) prev.detach(cm, next);
+    if (next.attach) next.attach(cm, prev || null);
+  });
   option("extraKeys", null);
 
   option("lineWrapping", false, wrappingChanged, true);
@@ -4853,9 +4857,11 @@
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}
   };
 
+
   // STANDARD KEYMAPS
 
   var keyMap = CodeMirror.keyMap = {};
+
   keyMap.basic = {
     "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
     "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
@@ -4877,6 +4883,13 @@
     "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
     fallthrough: "basic"
   };
+  // Very basic readline/emacs-style bindings, which are standard on Mac.
+  keyMap.emacsy = {
+    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
+    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
+    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
+    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
+  };
   keyMap.macDefault = {
     "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
     "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
@@ -4887,70 +4900,100 @@
     "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
     fallthrough: ["basic", "emacsy"]
   };
-  // Very basic readline/emacs-style bindings, which are standard on Mac.
-  keyMap.emacsy = {
-    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
-    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
-    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
-  };
   keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
 
   // KEYMAP DISPATCH
 
-  function getKeyMap(val) {
-    if (typeof val == "string") return keyMap[val];
-    else return val;
-  }
-
-  // Given an array of keymaps and a key name, call handle on any
-  // bindings found, until that returns a truthy value, at which point
-  // we consider the key handled. Implements things like binding a key
-  // to false stopping further handling and keymap fallthrough.
-  var lookupKey = CodeMirror.lookupKey = function(name, maps, handle) {
-    function lookup(map) {
-      map = getKeyMap(map);
-      var found = map[name];
-      if (found === false) return "stop";
-      if (found != null && handle(found)) return true;
-      if (map.nofallthrough) return "stop";
-
-      var fallthrough = map.fallthrough;
-      if (fallthrough == null) return false;
-      if (Object.prototype.toString.call(fallthrough) != "[object Array]")
-        return lookup(fallthrough);
-      for (var i = 0; i < fallthrough.length; ++i) {
-        var done = lookup(fallthrough[i]);
-        if (done) return done;
+  function normalizeKeyName(name) {
+    var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
+    var alt, ctrl, shift, cmd;
+    for (var i = 0; i < parts.length - 1; i++) {
+      var mod = parts[i];
+      if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
+      else if (/^a(lt)?$/i.test(mod)) alt = true;
+      else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
+      else if (/^s(hift)$/i.test(mod)) shift = true;
+      else throw new Error("Unrecognized modifier name: " + mod);
+    }
+    if (alt) name = "Alt-" + name;
+    if (ctrl) name = "Ctrl-" + name;
+    if (cmd) name = "Cmd-" + name;
+    if (shift) name = "Shift-" + name;
+    return name;
+  }
+
+  // This is a kludge to keep keymaps mostly working as raw objects
+  // (backwards compatibility) while at the same time support features
+  // like normalization and multi-stroke key bindings. It compiles a
+  // new normalized keymap, and then updates the old object to reflect
+  // this.
+  CodeMirror.normalizeKeyMap = function(keymap) {
+    var copy = {};
+    for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
+      var value = keymap[keyname];
+      if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
+      if (value == "...") { delete keymap[keyname]; continue; }
+
+      var keys = map(keyname.split(" "), normalizeKeyName);
+      for (var i = 0; i < keys.length; i++) {
+        var val, name;
+        if (i == keys.length - 1) {
+          name = keyname;
+          val = value;
+        } else {
+          name = keys.slice(0, i + 1).join(" ");
+          val = "...";
+        }
+        var prev = copy[name];
+        if (!prev) copy[name] = val;
+        else if (prev != val) throw new Error("Inconsistent bindings for " + name);
       }
-      return false;
+      delete keymap[keyname];
     }
+    for (var prop in copy) keymap[prop] = copy[prop];
+    return keymap;
+  };
 
-    for (var i = 0; i < maps.length; ++i) {
-      var done = lookup(maps[i]);
-      if (done) return done != "stop";
+  var lookupKey = CodeMirror.lookupKey = function(key, map, handle) {
+    map = getKeyMap(map);
+    var found = map[key];
+    if (found === false) return "nothing";
+    if (found === "...") return "multi";
+    if (found != null && handle(found)) return "handled";
+
+    if (map.fallthrough) {
+      if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
+        return lookupKey(key, map.fallthrough, handle);
+      for (var i = 0; i < map.fallthrough.length; i++) {
+        var result = lookupKey(key, map.fallthrough[i], handle);
+        if (result) return result;
+      }
     }
   };
 
   // Modifier key presses don't count as 'real' key presses for the
   // purpose of keymap fallthrough.
-  var isModifierKey = CodeMirror.isModifierKey = function(event) {
-    var name = keyNames[event.keyCode];
+  var isModifierKey = CodeMirror.isModifierKey = function(value) {
+    var name = typeof value == "string" ? value : keyNames[value.keyCode];
     return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
   };
 
   // Look up the name of a key as indicated by an event object.
   var keyName = CodeMirror.keyName = function(event, noShift) {
     if (presto && event.keyCode == 34 && event["char"]) return false;
-    var name = keyNames[event.keyCode];
+    var base = keyNames[event.keyCode], name = base;
     if (name == null || event.altGraphKey) return false;
-    if (event.altKey) name = "Alt-" + name;
-    if (flipCtrlCmd ? event.metaKey : event.ctrlKey) name = "Ctrl-" + name;
-    if (flipCtrlCmd ? event.ctrlKey : event.metaKey) name = "Cmd-" + name;
-    if (!noShift && event.shiftKey) name = "Shift-" + name;
+    if (event.altKey && base != "Alt") name = "Alt-" + name;
+    if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
+    if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
+    if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
     return name;
   };
 
+  function getKeyMap(val) {
+    return typeof val == "string" ? keyMap[val] : val;
+  }
+
   // FROMTEXTAREA
 
   CodeMirror.fromTextArea = function(textarea, options) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 12cafa1193..c9c8a6aa8d 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -143,9 +143,9 @@ function testVim(name, run, opts, expectedFail) {
         for (var i = 0; i < arguments.length; i++) {
           var key = arguments[i];
           // Find key in keymap and handle.
-          var handled = CodeMirror.lookupKey(key, ['vim-insert'], executeHandler);
+          var handled = CodeMirror.lookupKey(key, 'vim-insert', executeHandler);
           // Record for insert mode.
-          if (handled === true && cm.state.vim.insertMode && arguments[i] != 'Esc') {
+          if (handled == "handled" && cm.state.vim.insertMode && arguments[i] != 'Esc') {
             var lastChange = CodeMirror.Vim.getVimGlobalState_().macroModeState.lastInsertModeChanges;
             if (lastChange) {
               lastChange.changes.push(new CodeMirror.Vim.InsertModeKey(key));

From 94afd115199793bd3cf619f2bc403afa826c09a4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Oct 2014 23:10:31 +0100
Subject: [PATCH 1658/4742] Update the manual to reflect new keymap situation

---
 doc/manual.html | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 051a2178ae..64660af8df 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -702,26 +702,36 @@ <h2>Key Maps</h2>
     names defined here are <code>Enter</code>, <code>F5</code>,
     and <code>Q</code>. These can be prefixed
     with <code>Shift-</code>, <code>Cmd-</code>, <code>Ctrl-</code>,
-    and <code>Alt-</code> (in that order!) to specify a modifier. So
-    for example, <code>Shift-Ctrl-Space</code> would be a valid key
+    and <code>Alt-</code> to specify a modifier. So for
+    example, <code>Shift-Ctrl-Space</code> would be a valid key
     identifier.</p>
 
     <p>Common example: map the Tab key to insert spaces instead of a tab
     character.</p>
 
     <pre data-lang="javascript">
-{
+editor.setOption("extraKeys", {
   Tab: function(cm) {
     var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
     cm.replaceSelection(spaces);
   }
-}</pre>
+});</pre>
 
     <p>Alternatively, a character can be specified directly by
     surrounding it in single quotes, for example <code>'$'</code>
     or <code>'q'</code>. Due to limitations in the way browsers fire
     key events, these may not be prefixed with modifiers.</p>
 
+    <p id="normalizeKeyMap">Multi-stroke key bindings can be specified
+    by separating the key names by spaces in the property name, for
+    example <code>Ctrl-X Ctrl-V</code>. When a map contains
+    multi-stoke bindings or keys with modifiers that are not specified
+    in the default order (<code>Shift-Cmd-Ctrl-Alt</code>), you must
+    call <code>CodeMirror.normalizeKeyMap</code> on it before it can
+    be used. This function takes a keymap and modifies it to normalize
+    modifier order and properly recognize multi-stroke bindings. It
+    will return the keymap itself.</p>
+
     <p>The <code>CodeMirror.keyMap</code> object associates key maps
     with names. User code and key map definitions can assign extra
     properties to this object. Anywhere where a key map is expected, a
@@ -740,7 +750,8 @@ <h2>Key Maps</h2>
     behavior) should be given a turn.</p>
 
     <p>Keys mapped to command names that start with the
-    characters <code>"go"</code> (which should be used for
+    characters <code>"go"</code> or to functions that have a
+    truthy <code>motion</code> property (which should be used for
     cursor-movement actions) will be fired even when an
     extra <code>Shift</code> modifier is present (i.e. <code>"Up":
     "goLineUp"</code> matches both up and shift-up). This is used to
@@ -752,14 +763,15 @@ <h2>Key Maps</h2>
     be searched. It can hold either a single key map or an array of
     key maps.</p>
 
-    <p>When a key map contains a <code>nofallthrough</code> property
-    set to <code>true</code>, keys matched against that map will be
-    ignored if they don't match any of the bindings in the map (no
-    further child maps will be tried). When
-    the <code>disableInput</code> property is set
-    to <code>true</code>, the default effect of inserting a character
-    will be suppressed when the key map is active as the top-level
-    map.</p>
+    <p>When a key map needs to set something up when it becomes
+    active, or tear something down when deactivated, it can
+    contain <code>attach</code> and/or <code>detach</code> properties,
+    which should hold functions that take the editor instance and the
+    next or previous keymap. Note that this only works for the
+    <a href="#option_keyMap">top-level keymap</a>, not for fallthrough
+    maps or maps added
+    with <a href="#option_extraKeys"><code>extraKeys</code></a>
+    or <a href="#addKeyMap"><code>addKeyMap</code></a>.</p>
 </section>
 
 <section id=commands>

From 5397cbe835fd5fbe1fabba7a0ad487310d9df253 Mon Sep 17 00:00:00 2001
From: Scott Goodhew <sgoodhew@atlassian.com>
Date: Wed, 29 Oct 2014 16:14:22 +1100
Subject: [PATCH 1659/4742] [meta addon] Added Django and RPM modes

---
 mode/meta.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/meta.js b/mode/meta.js
index cee33e5422..61a1eae9fa 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -27,6 +27,7 @@
     {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
     {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
     {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
+    {name: "Django", mime: "text/x-django", mode: "django"},
     {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
     {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
     {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
@@ -83,6 +84,8 @@
     {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
     {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"]},
     {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"]},
+    {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
+    {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
     {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"]},
     {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
     {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},

From f88df5c5696ed425eff6776d84f3b1304326e7cc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Oct 2014 14:51:04 +0100
Subject: [PATCH 1660/4742] Don't blindly refresh on resize event, compare new
 size instead

---
 lib/codemirror.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 65fe0f5a82..98ba04d994 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -199,7 +199,7 @@
     d.externalMeasured = null;
     // Empty space (in pixels) above the view
     d.viewOffset = 0;
-    d.lastSizeC = 0;
+    d.lastWrapHeight = d.lastWrapWidth = 0;
     d.updateLineNumbers = null;
 
     // Used to only resize the line number gutter when necessary (when
@@ -548,6 +548,7 @@
     this.visible = visibleLines(display, cm.doc, viewport);
     this.editorIsHidden = !display.wrapper.offsetWidth;
     this.wrapperHeight = display.wrapper.clientHeight;
+    this.wrapperWidth = display.wrapper.clientWidth;
     this.oldViewFrom = display.viewFrom; this.oldViewTo = display.viewTo;
     this.oldScrollerWidth = display.scroller.clientWidth;
     this.force = force;
@@ -588,7 +589,7 @@
     }
 
     var different = from != display.viewFrom || to != display.viewTo ||
-      display.lastSizeC != update.wrapperHeight;
+      display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
     adjustView(cm, from, to);
 
     display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
@@ -616,7 +617,8 @@
     removeChildren(display.selectionDiv);
 
     if (different) {
-      display.lastSizeC = update.wrapperHeight;
+      display.lastWrapHeight = update.wrapperHeight;
+      display.lastWrapWidth = update.wrapperWidth;
       startWorker(cm, 400);
     }
 
@@ -2649,8 +2651,10 @@
 
   // Called when the window resizes
   function onResize(cm) {
-    // Might be a text scaling operation, clear size caches.
     var d = cm.display;
+    if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
+      return;
+    // Might be a text scaling operation, clear size caches.
     d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
     cm.setSize();
   }

From cb403a8996cf2a6f9a01999d3ebeec73d4f81d17 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Oct 2014 22:03:33 +0100
Subject: [PATCH 1661/4742] [closebrackets demo] Make mode match editor content

---
 demo/closebrackets.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index 45da4ebf87..d702f52696 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/edit/closebrackets.js"></script>
-<script src="../mode/xml/xml.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>

From ebc66a348e4f3449ac6470eb02b2e07989492a62 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Oct 2014 22:08:16 +0100
Subject: [PATCH 1662/4742] [closebrackets addon] Count quotes as okay to
 autoclose in front of

---
 addon/edit/closebrackets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 32eca014c5..f6b42f02d3 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -71,7 +71,7 @@
     };
     var closingBrackets = "";
     for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
-      if (left != right) closingBrackets += right;
+      closingBrackets += right;
       map["'" + left + "'"] = function(cm) {
         if (cm.getOption("disableInput")) return CodeMirror.Pass;
         var ranges = cm.listSelections(), type, next;

From aaec99e351229c71db938720e2e6c4e0e7c9c1ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Oct 2014 10:41:27 +0100
Subject: [PATCH 1663/4742] Work around Webkit wrapping issue

Issue #2901
---
 lib/codemirror.css | 3 +++
 lib/codemirror.js  | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 074dd41b12..eba9a5d8b5 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -306,5 +306,8 @@ div.CodeMirror-cursors {
   }
 }
 
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
 /* Help users use markselection to safely style text background */
 span.CodeMirror-selectedtext { background: none; }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 98ba04d994..a3079206ef 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6015,9 +6015,14 @@
       }
     }
 
+    // See issue #2901
+    if (webkit && /\bcm-tab\b/.test(builder.content.lastChild.className))
+      builder.content.className = "cm-tab-wrap-hack";
+
     signal(cm, "renderLine", cm, lineView.line, builder.pre);
     if (builder.pre.className)
       builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
+
     return builder;
   }
 

From 117e25294d91b947099d46a01b71f79773bb567e Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Fri, 31 Oct 2014 13:37:38 -0700
Subject: [PATCH 1664/4742] Workaround for an error in getting to insert mode. 
 It was very difficult to reproduce, and I don't know what led to it, but the
 ">" mark was set but returned undefined when find() was called.  This should
 work around the problem if it happens again.

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

diff --git a/keymap/vim.js b/keymap/vim.js
index ff71568847..6da449a5c1 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1816,7 +1816,10 @@
         lastInsertModeChanges.inVisualBlock = visualBlock;
         var replacement = new Array(selections.length).join('1').split('1');
         // save the selectionEnd mark
-        var selectionEnd = vim.marks['>'] ? vim.marks['>'].find() : cm.getCursor('head');
+        var selectionEnd = vim.marks[">"] && vim.marks[">"].find();
+        if (!selectionEnd) {
+          selectionEnd = cm.getCursor("head");
+        }
         vimGlobalState.registerController.pushText(
             operatorArgs.registerName, 'change', text,
             operatorArgs.linewise);

From 2b8106f669c016e9d110d225f63fd23247b54f9b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 2 Nov 2014 18:52:53 -0500
Subject: [PATCH 1665/4742] [vim] Make vim fail more gracefully

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 6da449a5c1..558e4c82a3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -732,8 +732,14 @@
 
         return cm.operation(function() {
           cm.curOp.isVimOp = true;
-          if (vim.insertMode) { return handleKeyInsertMode(); }
-          else { return handleKeyNonInsertMode(); }
+          try {
+            if (vim.insertMode) { return handleKeyInsertMode(); }
+            else { return handleKeyNonInsertMode(); }
+          } catch (e) {
+            // clear VIM state in case it's in a bad state.
+            cm.state.vim = undefined;
+            throw e;
+          }
         });
       },
       handleEx: function(cm, input) {

From 8173af6f05fa18455399698afc1b99aa6a5cd7bd Mon Sep 17 00:00:00 2001
From: Andrea G <muffo87@gmail.com>
Date: Sat, 1 Nov 2014 12:52:34 +0000
Subject: [PATCH 1666/4742] [3024-day theme] Change color of matching bracket

The color white is not visible on the current backgroung
---
 theme/3024-day.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/3024-day.css b/theme/3024-day.css
index ebf46fb4a5..3c01c2bf58 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -35,4 +35,4 @@
 .cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
 
 .cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important;}

From ef690441922a5ebf3e1e680e1e39011fe2ccaae7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Nov 2014 11:58:33 +0100
Subject: [PATCH 1667/4742] [markdown mode] Don't call tokenizer of code-block
 mode at end of line

Issue #2904
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 48464645bb..5aeb8cf320 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -208,7 +208,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       // try switching mode
       state.localMode = getMode(RegExp.$1);
       if (state.localMode) state.localState = state.localMode.startState();
-      switchBlock(stream, state, local);
+      state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
       state.code = true;
       return getType(state);

From 1e7cdbf82dc08d06f995cdbb3e265547fb114e3a Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Fri, 31 Oct 2014 02:10:37 +0100
Subject: [PATCH 1668/4742] [markdown mode] Support leading whitespace in
 fencedCodeBlocks mode name

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 5aeb8cf320..3d1673bee0 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -204,7 +204,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = state.inline;
       if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
       return getType(state);
-    } else if (modeCfg.fencedCodeBlocks && stream.match(/^```([\w+#]*)/, true)) {
+    } else if (modeCfg.fencedCodeBlocks && stream.match(/^```[ \t]*([\w+#]*)/, true)) {
       // try switching mode
       state.localMode = getMode(RegExp.$1);
       if (state.localMode) state.localState = state.localMode.startState();

From 72cd628aad83ff2a8250ba7241d7613b67bd99f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Nov 2014 13:35:41 +0100
Subject: [PATCH 1669/4742] [real-world uses] Add interactive SICP link

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

diff --git a/doc/realworld.html b/doc/realworld.html
index e9b6d45cce..8a87a0485b 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -138,6 +138,7 @@ <h2>CodeMirror real-world uses</h2>
       <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://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
+      <li><a href="http://xuanji.appspot.com/isicp/">Structure and Interpretation of Computer Programs</a>, Interactive Version</li>
       <li><a href="http://syframework.alwaysdata.net">SyBox</a> (PHP playground)</li>
       <li><a href="http://www.tagspaces.org/">TagSpaces</a> (personal data manager)</li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>

From 0c60c433efb8e37fad42251c49e08ef5b63d9f62 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Fri, 31 Oct 2014 19:04:26 +0100
Subject: [PATCH 1670/4742] [markdown mode, mode meta info] Add mode aliases to
 meta.js, add more aliases

Issue #2903
---
 mode/gfm/index.html       |  1 +
 mode/markdown/markdown.js | 30 ++++++++++++++++------------
 mode/meta.js              | 42 +++++++++++++++++++--------------------
 3 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index 60d108c1ca..7e38c52d60 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -14,6 +14,7 @@
 <script src="../css/css.js"></script>
 <script src="../htmlmixed/htmlmixed.js"></script>
 <script src="../clike/clike.js"></script>
+<script src="../meta.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>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 3d1673bee0..61aaa8ead7 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -15,26 +15,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
   var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
-  var aliases = {
-    html: "htmlmixed",
-    js: "javascript",
-    json: "application/json",
-    c: "text/x-csrc",
-    "c++": "text/x-c++src",
-    java: "text/x-java",
-    csharp: "text/x-csharp",
-    "c#": "text/x-csharp",
-    scala: "text/x-scala"
-  };
 
   var getMode = (function () {
-    var i, modes = {}, mimes = {}, mime;
+    var i, modes = {}, mimes = {}, mime, aliases = {};
 
     var list = [];
     for (var m in CodeMirror.modes)
       if (CodeMirror.modes.propertyIsEnumerable(m)) list.push(m);
     for (i = 0; i < list.length; i++) {
-      modes[list[i]] = list[i];
+      modes[list[i].toLowerCase()] = list[i];
     }
     var mimesList = [];
     for (var m in CodeMirror.mimeModes)
@@ -45,12 +34,27 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       mimes[mime] = mimesList[i].mime;
     }
 
+    // Load aliases from meta.js
+    if (CodeMirror.modeInfo) {
+      var currentMode, aliasMode;
+      for (i = 0; i < CodeMirror.modeInfo.length; i++) {
+        currentMode = CodeMirror.modeInfo[i];
+        if (currentMode.alias) {
+          aliasMode = currentMode.mime || currentMode.mode;
+          for (var j = 0; j < currentMode.alias.length; j++) {
+            aliases[currentMode.alias[j].toLowerCase()] = aliasMode;
+          }
+        }
+      }
+    }
+
     for (var a in aliases) {
       if (aliases[a] in modes || aliases[a] in mimes)
         modes[a] = aliases[a];
     }
 
     return function (lang) {
+      lang = lang.toLowerCase();
       return modes[lang] ? CodeMirror.getMode(cmCfg, modes[lang]) : null;
     };
   }());
diff --git a/mode/meta.js b/mode/meta.js
index 61a1eae9fa..5f32fde00a 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -15,12 +15,12 @@
     {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
     {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk"},
     {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
-    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "hpp", "h++"]},
+    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "hpp", "h++"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
-    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"]},
+    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
-    {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"]},
-    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"]},
+    {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
+    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
     {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher"},
     {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
     {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
@@ -35,7 +35,7 @@
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
     {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
-    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"]},
+    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
     {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
     {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
     {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm"},
@@ -45,21 +45,21 @@
     {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
     {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
     {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
-    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"]},
-    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"]},
+    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
+    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
     {name: "HTTP", mime: "message/http", mode: "http"},
     {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
     {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
-    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"]},
+    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
     {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
-     mode: "javascript", ext: ["js"]},
-    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"]},
-    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript"},
+     mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
+    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
+    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", alias: ["jsonld"]},
     {name: "Jinja2", mime: "null", mode: "jinja2"},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
     {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]},
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
-    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"]},
+    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
     {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
     {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
     {name: "mIRC", mime: "text/mirc", mode: "mirc"},
@@ -78,21 +78,21 @@
     {name: "Pig", mime: "text/x-pig", mode: "pig"},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql"},
-    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"]},
+    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
     {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
     {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
     {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
-    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"]},
-    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"]},
+    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},
+    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
     {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
     {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
-    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"]},
+    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]},
     {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
     {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
     {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
     {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
     {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
-    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"]},
+    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"]},
     {name: "Sieve", mime: "application/sieve", mode: "sieve"},
     {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim"},
     {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
@@ -103,7 +103,7 @@
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
     {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
-    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"]},
+    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
     {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
     {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
     {name: "Textile", mime: "text/x-textile", mode: "textile"},
@@ -112,14 +112,14 @@
     {name: "TOML", mime: "text/x-toml", mode: "toml"},
     {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
-    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"]},
+    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
     {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
     {name: "VBScript", mime: "text/vbscript", mode: "vbscript"},
     {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
     {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
-    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"]},
+    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
-    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml"]},
+    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml"], alias: ["yml"]},
     {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]}
   ];
   // Ensure all modes have a mime property for backwards compatibility

From e64cd58f0f3c69142c486e62b296007d7d64e2c7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Nov 2014 16:54:36 +0100
Subject: [PATCH 1671/4742] [mode metainfo] Add findModeByName function

---
 doc/manual.html | 11 ++++++-----
 mode/meta.js    | 10 ++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 64660af8df..14c7879c10 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2612,11 +2612,12 @@ <h2 id="addons">Addons</h2>
       properties <code>mimes</code>, which holds an array of MIME
       types for modes with multiple MIMEs associated,
       and <code>ext</code>, which holds an array of file extensions
-      associated with this mode. Two convenience
-      functions, <code>CodeMirror.findModeByMIME</code>
-      and <code>CodeMirror.findModeByExtension</code> are provided,
-      which return such an object given a MIME or extension string.
-      Note that, for historical reasons, this file resides in the
+      associated with this mode. Three convenience
+      functions, <code>CodeMirror.findModeByMIME</code>,
+      and <code>CodeMirror.findModeByExtension</code>,
+      and <code>CodeMirror.findModeByName</code> are provided, which
+      return such an object given a MIME or extension string. Note
+      that, for historical reasons, this file resides in the
       top-level <code>mode</code> directory, not
       under <code>addon</code>. <a href="../demo/loadmode.html">Demo</a>.</dd>
 
diff --git a/mode/meta.js b/mode/meta.js
index 5f32fde00a..94acac76da 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -144,4 +144,14 @@
         if (info.ext[j] == ext) return info;
     }
   };
+
+  CodeMirror.findModeByName = function(name) {
+    name = name.toLowerCase();
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.name.toLowerCase() == name) return info;
+      if (info.alias) for (var j = 0; j < info.alias.length; j++)
+        if (info.alias[j].toLowerCase() == name) return info;
+    }
+  };
 });

From 263af5abd471832bd9eabe7c62da458447f7606c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Nov 2014 16:55:10 +0100
Subject: [PATCH 1672/4742] [markdown mode] Less complicated way of getting
 modes by name

---
 mode/markdown/markdown.js | 52 +++++++--------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 61aaa8ead7..c39dc7e35b 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -3,9 +3,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror", require("../xml/xml")));
+    mod(require("../../lib/codemirror", require("../xml/xml"), require("../meta.js")));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../xml/xml"], mod);
+    define(["../../lib/codemirror", "../xml/xml", "../meta.js"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
@@ -16,48 +16,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
   var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
 
-  var getMode = (function () {
-    var i, modes = {}, mimes = {}, mime, aliases = {};
-
-    var list = [];
-    for (var m in CodeMirror.modes)
-      if (CodeMirror.modes.propertyIsEnumerable(m)) list.push(m);
-    for (i = 0; i < list.length; i++) {
-      modes[list[i].toLowerCase()] = list[i];
-    }
-    var mimesList = [];
-    for (var m in CodeMirror.mimeModes)
-      if (CodeMirror.mimeModes.propertyIsEnumerable(m))
-        mimesList.push({mime: m, mode: CodeMirror.mimeModes[m]});
-    for (i = 0; i < mimesList.length; i++) {
-      mime = mimesList[i].mime;
-      mimes[mime] = mimesList[i].mime;
-    }
-
-    // Load aliases from meta.js
-    if (CodeMirror.modeInfo) {
-      var currentMode, aliasMode;
-      for (i = 0; i < CodeMirror.modeInfo.length; i++) {
-        currentMode = CodeMirror.modeInfo[i];
-        if (currentMode.alias) {
-          aliasMode = currentMode.mime || currentMode.mode;
-          for (var j = 0; j < currentMode.alias.length; j++) {
-            aliases[currentMode.alias[j].toLowerCase()] = aliasMode;
-          }
-        }
-      }
-    }
-
-    for (var a in aliases) {
-      if (aliases[a] in modes || aliases[a] in mimes)
-        modes[a] = aliases[a];
+  function getMode(name) {
+    if (CodeMirror.findModeByName) {
+      var found = CodeMirror.findModeByName(name);
+      if (found) name = found.mime || found.mimes[0];
     }
-
-    return function (lang) {
-      lang = lang.toLowerCase();
-      return modes[lang] ? CodeMirror.getMode(cmCfg, modes[lang]) : null;
-    };
-  }());
+    var mode = CodeMirror.getMode(cmCfg, name);
+    return mode.name == "null" ? null : mode;
+  }
 
   // Should characters that affect highlighting be highlighted separate?
   // Does not include characters that will be output (such as `1.` and `-` for lists)

From da3e8f283a5d47ad23666f715d3fcc774b962084 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Mon, 3 Nov 2014 15:35:05 +0100
Subject: [PATCH 1673/4742] Add getLineTokens method

---
 doc/manual.html   |  7 +++++++
 lib/codemirror.js | 37 +++++++++++++++++++++++--------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 14c7879c10..ef11e35868 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1842,6 +1842,13 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
       edits were recently made and highlighting has not yet completed.
       </dd>
 
+      <dt id="getLineTokens"><code><strong>cm.getLineTokens</strong>(line: integer, ?precise: boolean) → array&lt;{start, end, string, type, state}&gt;</code></dt>
+      <dd>This is a (much) cheaper version
+      of <a href="#getTokenAt"><code>getTokenAt</code></a> useful for
+      when you need to have all the tokens in a given line. Returns
+      an array of objects which have the same properties
+      <a href="#getTokenAt"><code>getTokenAt</code></a> has.</dd>
+
       <dt id="getTokenTypeAt"><code><strong>cm.getTokenTypeAt</strong>(pos: {line, ch}) → string</code></dt>
       <dd>This is a (much) cheaper version
       of <a href="#getTokenAt"><code>getTokenAt</code></a> useful for
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a3079206ef..399c5b3217 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4095,20 +4095,11 @@
     // Fetch the parser token for a given character. Useful for hacks
     // that want to inspect the mode state (say, for completion).
     getTokenAt: function(pos, precise) {
-      var doc = this.doc;
-      pos = clipPos(doc, pos);
-      var state = getStateBefore(this, pos.line, precise), mode = this.doc.mode;
-      var line = getLine(doc, pos.line);
-      var stream = new StringStream(line.text, this.options.tabSize);
-      while (stream.pos < pos.ch && !stream.eol()) {
-        stream.start = stream.pos;
-        var style = readToken(mode, stream, state);
-      }
-      return {start: stream.start,
-              end: stream.pos,
-              string: stream.current(),
-              type: style || null,
-              state: state};
+      return getToken(this, pos, precise, "single");
+    },
+
+    getLineTokens: function(line, precise) {
+      return getToken(this, {line: line}, precise, "line");
     },
 
     getTokenTypeAt: function(pos) {
@@ -5855,6 +5846,24 @@
     throw new Error("Mode " + mode.name + " failed to advance stream.");
   }
 
+  // Utility for getTokenAt and getLineTokens
+  function getToken(cm, pos, precise, context) {
+    function getObj() {
+      return {start: stream.start, end: stream.pos, string: stream.current(), type: style || null, state: copyState(doc.mode, state)};
+    }
+    var doc = cm.doc, mode = doc.mode, style;
+    pos = clipPos(doc, pos);
+    var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
+    var stream = new StringStream(line.text, cm.options.tabSize);
+    var createArray = context == "line", tokens = [];
+    while ((createArray || stream.pos < pos.ch) && !stream.eol()) {
+      stream.start = stream.pos;
+      style = readToken(mode, stream, state);
+      if (createArray) tokens.push(getObj());
+    }
+    return createArray ? tokens : getObj();
+  }
+
   // Run the given mode's parser over a line, calling f for each token.
   function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
     var flattenSpans = mode.flattenSpans;

From 71ef0cfec056c34eae61b16f86a17ecfc7d8d286 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Nov 2014 12:58:42 +0100
Subject: [PATCH 1674/4742] Clean up getLineTokens, add test

Issue #2908
---
 doc/manual.html   | 10 +++++-----
 lib/codemirror.js | 24 ++++++++++++++----------
 test/test.js      | 14 +++++++++++++-
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index ef11e35868..5d02b32436 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1843,11 +1843,11 @@ <h3 id="api_mode">Mode, state, and token-related methods</h3>
       </dd>
 
       <dt id="getLineTokens"><code><strong>cm.getLineTokens</strong>(line: integer, ?precise: boolean) → array&lt;{start, end, string, type, state}&gt;</code></dt>
-      <dd>This is a (much) cheaper version
-      of <a href="#getTokenAt"><code>getTokenAt</code></a> useful for
-      when you need to have all the tokens in a given line. Returns
-      an array of objects which have the same properties
-      <a href="#getTokenAt"><code>getTokenAt</code></a> has.</dd>
+      <dd>This is similar
+      to <a href="#getTokenAt"><code>getTokenAt</code></a>, but
+      collects all tokens for a given line into an array. It is much
+      cheaper than repeatedly calling <code>getTokenAt</code>, which
+      re-parses the part of the line before the token for every call.</dd>
 
       <dt id="getTokenTypeAt"><code><strong>cm.getTokenTypeAt</strong>(pos: {line, ch}) → string</code></dt>
       <dd>This is a (much) cheaper version
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 399c5b3217..725324d29e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4095,11 +4095,11 @@
     // Fetch the parser token for a given character. Useful for hacks
     // that want to inspect the mode state (say, for completion).
     getTokenAt: function(pos, precise) {
-      return getToken(this, pos, precise, "single");
+      return takeToken(this, pos, precise);
     },
 
     getLineTokens: function(line, precise) {
-      return getToken(this, {line: line}, precise, "line");
+      return takeToken(this, Pos(line), precise, true);
     },
 
     getTokenTypeAt: function(pos) {
@@ -5847,21 +5847,25 @@
   }
 
   // Utility for getTokenAt and getLineTokens
-  function getToken(cm, pos, precise, context) {
-    function getObj() {
-      return {start: stream.start, end: stream.pos, string: stream.current(), type: style || null, state: copyState(doc.mode, state)};
+  function takeToken(cm, pos, precise, asArray) {
+    function getObj(copy) {
+      return {start: stream.start, end: stream.pos,
+              string: stream.current(),
+              type: style || null,
+              state: copy ? copyState(doc.mode, state) : state};
     }
+
     var doc = cm.doc, mode = doc.mode, style;
     pos = clipPos(doc, pos);
     var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
-    var stream = new StringStream(line.text, cm.options.tabSize);
-    var createArray = context == "line", tokens = [];
-    while ((createArray || stream.pos < pos.ch) && !stream.eol()) {
+    var stream = new StringStream(line.text, cm.options.tabSize), tokens;
+    if (asArray) tokens = [];
+    while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
       stream.start = stream.pos;
       style = readToken(mode, stream, state);
-      if (createArray) tokens.push(getObj());
+      if (asArray) tokens.push(getObj(true));
     }
-    return createArray ? tokens : getObj();
+    return asArray ? tokens : getObj();
   }
 
   // Run the given mode's parser over a line, calling f for each token.
diff --git a/test/test.js b/test/test.js
index 4e7de08818..e437c589f6 100644
--- a/test/test.js
+++ b/test/test.js
@@ -3,7 +3,7 @@ var Pos = CodeMirror.Pos;
 CodeMirror.defaults.rtlMoveVisually = true;
 
 function forEach(arr, f) {
-  for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
+  for (var i = 0, e = arr.length; i < e; ++i) f(arr[i], i);
 }
 
 function addDoc(cm, width, height) {
@@ -1975,6 +1975,18 @@ testCM("alwaysMergeSelEventWithChangeOrigin", function(cm) {
   eq(cm.getValue(), "Va");
 }, {value: "a"});
 
+testCM("getTokenAt", function(cm) {
+  var tokPlus = cm.getTokenAt(Pos(0, 2));
+  eq(tokPlus.type, "operator");
+  eq(tokPlus.string, "+");
+  var toks = cm.getLineTokens(0);
+  eq(toks.length, 3);
+  forEach([["number", "1"], ["operator", "+"], ["number", "2"]], function(expect, i) {
+    eq(toks[i].type, expect[0]);
+    eq(toks[i].string, expect[1]);
+  });
+}, {value: "1+2", mode: "javascript"});
+
 testCM("getTokenTypeAt", function(cm) {
   eq(cm.getTokenTypeAt(Pos(0, 0)), "number");
   eq(cm.getTokenTypeAt(Pos(0, 6)), "string");

From 5a400b673fedc8b008d3addb095c53fca3d1c238 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Nov 2014 13:24:51 +0100
Subject: [PATCH 1675/4742] [xml-hint addon] Properly complete tags when
 directly after >

---
 addon/hint/xml-hint.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index e31b09b5fc..d460959d97 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -21,7 +21,9 @@
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "xml") return;
     var result = [], replaceToken = false, prefix;
-    var tag = /\btag\b/.test(token.type), tagName = tag && /^\w/.test(token.string), tagStart;
+    var tag = /\btag\b/.test(token.type) && !/>$/.test(token.string);
+    var tagName = tag && /^\w/.test(token.string), tagStart;
+
     if (tagName) {
       var before = cm.getLine(cur.line).slice(Math.max(0, token.start - 2), token.start);
       var tagType = /<\/$/.test(before) ? "close" : /<$/.test(before) ? "open" : null;
@@ -31,6 +33,7 @@
     } else if (tag && token.string == "</") {
       tagType = "close";
     }
+
     if (!tag && !inner.state.tagName || tagType) {
       if (tagName)
         prefix = token.string;

From 0c344f93bab724e5f696b0891174c2f1751f4836 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 19:23:39 +0400
Subject: [PATCH 1676/4742] [vim] clear input state after search and ex
 commands

without this pressing / and then Esc doesn't clear status line
---
 keymap/vim.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 558e4c82a3..15dd8f8956 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -994,10 +994,12 @@
             break;
           case 'search':
             this.processSearch(cm, vim, command);
+            clearInputState(cm);
             break;
           case 'ex':
           case 'keyToEx':
             this.processEx(cm, vim, command);
+            clearInputState(cm);
             break;
           default:
             break;

From db3d8c090862d5326b741c0853eb7c1ace494b35 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 19:24:43 +0400
Subject: [PATCH 1677/4742] [vim] cleanup

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 15dd8f8956..7a7dcdd29f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -557,9 +557,7 @@
           visualLine: false,
           visualBlock: false,
           lastSelection: null,
-          lastPastedText: null,
-          // Used by two-character ESC keymap routines. Should not be changed from false here.
-          awaitingEscapeSecondCharacter: false
+          lastPastedText: null
         };
       }
       return cm.state.vim;
@@ -3791,10 +3789,10 @@
       { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
       { name: 'global', shortName: 'g' }
     ];
-    Vim.ExCommandDispatcher = function() {
+    var ExCommandDispatcher = function() {
       this.buildCommandMap_();
     };
-    Vim.ExCommandDispatcher.prototype = {
+    ExCommandDispatcher.prototype = {
       processCommand: function(cm, input, opt_params) {
         var vim = cm.state.vim;
         var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
@@ -4393,7 +4391,7 @@
       }
     };
 
-    var exCommandDispatcher = new Vim.ExCommandDispatcher();
+    var exCommandDispatcher = new ExCommandDispatcher();
 
     /**
     * @param {CodeMirror} cm CodeMirror instance we are in.
diff --git a/test/vim_test.js b/test/vim_test.js
index c9c8a6aa8d..d057b4b3d5 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1723,7 +1723,7 @@ testVim('visual', function(cm, vim, helpers) {
 }, { value: '12345' });
 testVim('visual_exit', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'l', 'j', 'j', '<Esc>');
-  eq(cm.getCursor('anchor'), cm.getCursor('head'));
+  eqPos(cm.getCursor('anchor'), cm.getCursor('head'));
   eq(vim.visualMode, false);
 }, { value: 'hello\nworld\nfoo' });
 testVim('visual_line', function(cm, vim, helpers) {

From b229dddcf3a5d2652f0761b3a0a6d7e325c4908f Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 19:25:31 +0400
Subject: [PATCH 1678/4742] [vim] handleKeys should return true after jk in
 insert mode

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 7a7dcdd29f..8a7945ed08 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -697,7 +697,7 @@
           } else {
             commandDispatcher.processCommand(cm, vim, command);
           }
-          return !keysAreChars;
+          return true;
         }
 
         function handleKeyNonInsertMode() {

From a187f5bb01b0cd326497044e30d9e3ac345c4ac9 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 20:10:10 +0400
Subject: [PATCH 1679/4742] [vim] do not throw when entering insert mode

---
 keymap/vim.js    | 2 +-
 test/vim_test.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8a7945ed08..3ed95190b2 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2105,7 +2105,7 @@
             selectionStart = Pos(selectionStart.line, selectionEnd.ch);
             cm.setCursor(selectionStart);
             selectBlock(cm, selectionEnd);
-          } else if (selectionEnd.line < selectionStart.line) {
+          } else if (selectionEnd && selectionEnd.line < selectionStart.line) {
             selectionEnd = Pos(selectionStart.line, 0);
             cm.setCursor(selectionEnd);
           }
diff --git a/test/vim_test.js b/test/vim_test.js
index d057b4b3d5..7f016c479b 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1304,6 +1304,11 @@ testVim('A_visual_block', function(cm, vim, helpers) {
   replacement.pop();
   cm.replaceSelections(replacement);
   eq('testhello\nmehello\npleahellose', cm.getValue());
+  helpers.doKeys('<Esc>');
+  cm.setCursor(0, 0);
+  helpers.doKeys('.');
+  // TODO this doesn't work yet
+  // eq('teshellothello\nme hello hello\nplehelloahellose', cm.getValue());
 }, {value: 'test\nme\nplease'});
 testVim('I', function(cm, vim, helpers) {
   cm.setCursor(0, 4);

From 9dfdf7c277a3585188b7ff63bfe46bc03ac8f2a8 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 6 Nov 2014 20:17:00 +0400
Subject: [PATCH 1680/4742] [vim] fix typeError when pressing wrong key in
 substitute confirm

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 3ed95190b2..66f2077674 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4479,6 +4479,7 @@
             break;
         }
         if (done) { stop(close); }
+        return true;
       }
 
       // Actually do replace.

From dbd3381856110ba970bf10c453d518449558f768 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Nov 2014 13:13:40 +0100
Subject: [PATCH 1681/4742] [authors list] Add a name

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 5d0740fe9d..c6e7505f2f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,6 +35,7 @@ Anderson Mesquita
 Andreas Reischuck
 Andre von Houck
 Andrey Fedorov
+Andrey Klyuchnikov
 Andrey Lushnikov
 Andy Joslin
 Andy Kimball

From 25210144d920d5934a72062cd6806712e1333d68 Mon Sep 17 00:00:00 2001
From: Dale Jung <dale@dalejung.com>
Date: Thu, 6 Nov 2014 22:02:24 -0500
Subject: [PATCH 1682/4742] [markdown mode] Properly import mode/meta
 dependency

Issue #2914
---
 mode/markdown/markdown.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index c39dc7e35b..d64bfdb6b0 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -3,9 +3,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror", require("../xml/xml"), require("../meta.js")));
+    mod(require("../../lib/codemirror", require("../xml/xml"), require("../meta")));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../xml/xml", "../meta.js"], mod);
+    define(["../../lib/codemirror", "../xml/xml", "../meta"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {

From 69b4a9cc1e0ebd027224de5730e2a63377565780 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Nov 2014 14:33:12 +0100
Subject: [PATCH 1683/4742] [project page] Remove confusing option from example

You won't get much effect from setting the mode option when
no modes are loaded.

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

diff --git a/index.html b/index.html
index 8dcd378332..03b4fd6793 100644
--- a/index.html
+++ b/index.html
@@ -57,7 +57,7 @@ <h2>This is CodeMirror</h2>
 <script src="lib/codemirror.js"></script>
 <script>
   var editor = CodeMirror.fromTextArea(myTextarea, {
-    mode: "text/html"
+    lineNumbers: true
   });
 </script></textarea>
   <select id="demolist" onchange="document.location = this.options[this.selectedIndex].value;">

From e2962a5b0df56c8ee5a4482899d308decf3d7677 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Nov 2014 16:56:50 +0100
Subject: [PATCH 1684/4742] Add experimental scrollCursorIntoView event

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 725324d29e..05795e244f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3710,6 +3710,8 @@
   // If an editor sits on the top or bottom of the window, partially
   // scrolled out of view, this ensures that the cursor is visible.
   function maybeScrollWindow(cm, coords) {
+    if (signalDOMEvent(cm, "scrollCursorIntoView")) return;
+
     var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
     if (coords.top + box.top < 0) doScroll = true;
     else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
@@ -7238,6 +7240,8 @@
   // registering a (non-DOM) handler on the editor for the event name,
   // and preventDefault-ing the event in that handler.
   function signalDOMEvent(cm, e, override) {
+    if (typeof e == "string")
+      e = {type: e, preventDefault: function() { this.defaultPrevented = true; }};
     signal(cm, override || e.type, cm, e);
     return e_defaultPrevented(e) || e.codemirrorIgnore;
   }

From fa0294e3de5de82d9820ee049883f32bf524814b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:13:31 +0100
Subject: [PATCH 1685/4742] Document scrollCursorIntoView event

---
 doc/manual.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 5d02b32436..736be44d5f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -576,6 +576,13 @@ <h2>Events</h2>
       <dt id="event_scroll"><code><strong>"scroll"</strong> (instance: CodeMirror)</code></dt>
       <dd>Fires when the editor is scrolled.</dd>
 
+      <dt id="event_scrollCursorIntoView"><code><strong>"scrollCursorIntoView"</strong> (instance: CodeMirror, event: Event)</code></dt>
+      <dd>Fires when the editor tries to scroll its cursor into view.
+      Can be hooked into to take care of additional scrollable
+      containers around the editor. When the event object has
+      its <code>preventDefault</code> method called, CodeMirror will
+      not itself try to scroll the window.</dd>
+
       <dt id="event_update"><code><strong>"update"</strong> (instance: CodeMirror)</code></dt>
       <dd>Will be fired whenever CodeMirror updates its DOM display.</dd>
 

From 2c5d652f880722996364da40b3e2f27d308923bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:24:52 +0100
Subject: [PATCH 1686/4742] [xml-hint addon] Work properly when the cursor is
 directly after < or </

See http://discuss.codemirror.net/t/html-hints-not-working-just-after/45/6
---
 addon/hint/xml-hint.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index d460959d97..cc95b20f34 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -18,6 +18,11 @@
     var quote = (options && options.quoteChar) || '"';
     if (!tags) return;
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    if (/^<\/?$/.test(token.string) && token.end == cur.ch) {
+      var nextToken = cm.getTokenAt(Pos(cur.line, cur.ch + 1));
+      if (nextToken.start == cur.ch && /\btag\b/.test(nextToken.type))
+        token = nextToken;
+    }
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "xml") return;
     var result = [], replaceToken = false, prefix;

From 02dc00c8d2a77845b2c4000e624f9af6ef80bc30 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:30:55 +0100
Subject: [PATCH 1687/4742] [yaml mode] Highlight strings

This also helps closebrackets close quotes

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

diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index 332aef6a23..b7015e599c 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -23,8 +23,13 @@ CodeMirror.defineMode("yaml", function() {
       state.escaped = false;
       /* comments */
       if (ch == "#" && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
-        stream.skipToEnd(); return "comment";
+        stream.skipToEnd();
+        return "comment";
       }
+
+      if (stream.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))
+        return "string";
+
       if (state.literal && stream.indentation() > state.keyCol) {
         stream.skipToEnd(); return "string";
       } else if (state.literal) { state.literal = false; }

From 0930f2bfdad9ab0bf3b3c5703eda378eeb69d304 Mon Sep 17 00:00:00 2001
From: paris <paris@sourcelair.com>
Date: Thu, 23 Oct 2014 12:51:35 +0300
Subject: [PATCH 1688/4742] [dockerfile mode] Add

---
 mode/dockerfile/dockerfile.js | 91 +++++++++++++++++++++++++++++++++++
 mode/dockerfile/index.html    | 72 +++++++++++++++++++++++++++
 2 files changed, 163 insertions(+)
 create mode 100644 mode/dockerfile/dockerfile.js
 create mode 100644 mode/dockerfile/index.html

diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
new file mode 100644
index 0000000000..9444878699
--- /dev/null
+++ b/mode/dockerfile/dockerfile.js
@@ -0,0 +1,91 @@
+// 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";
+
+  // Collect all Dockerfile directives
+  var instructions = ["from", "maintainer", "run", "cmd", "expose", "env",
+                      "add", "copy", "entrypoint", "volume", "user",
+                      "workdir", "onbuild"],
+      instructionRegex = "(" + instructions.join('|') + ")",
+      instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
+      instructionWithArguments = new RegExp(instructionRegex + "(\\s+)", "i");
+
+  CodeMirror.defineSimpleMode("dockerfile", {
+    start: [
+      // Block comment: This is a line starting with a comment
+      {
+        regex: /#.*$/,
+        token: "comment",
+        next: "start"
+      },
+      // Highlight an instruction without any arguments (for convenience)
+      {
+        regex: instructionOnlyLine,
+        token: "variable-2",
+        next: "start"
+      },
+      // Highlight an instruction followed by arguments
+      {
+        regex: instructionWithArguments,
+        token: ["variable-2", null],
+        next: "arguments"
+      },
+      // Fail-safe return to start
+      {
+        token: null,
+        next: "start"
+      }
+    ],
+    arguments: [
+      {
+        // Line comment without instruction arguments is an error
+        regex: /#.*$/,
+        token: "error",
+        next: "start"
+      },
+      {
+        regex: /[^#]+\\$/,
+        token: null,
+        next: "arguments"
+      },
+      {
+        // Match everything except for the inline comment
+        regex: /[^#]+/,
+        token: null,
+        next: "lineComment"
+      },
+      {
+        regex: /$/,
+        token: null,
+        next: "start"
+      },
+      // Fail safe return to start
+      {
+        token: null,
+        next: "start"
+      }
+    ],
+    lineComment: [
+      {
+        regex: /#.*$/,
+        token: "comment"
+      },
+      // Fail safe return to start
+      {
+        token: null,
+        next: "start"
+      }
+    ]
+  });
+
+  CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");
+});
diff --git a/mode/dockerfile/index.html b/mode/dockerfile/index.html
new file mode 100644
index 0000000000..564f6c52c1
--- /dev/null
+++ b/mode/dockerfile/index.html
@@ -0,0 +1,72 @@
+<!doctype html>
+
+<title>CodeMirror: Dockerfile 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="dockerfile.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="#">Dockerfile</a>
+  </ul>
+</div>
+
+<article>
+<h2>Dockerfile mode</h2>
+<form><textarea id="code" name="code"># Install Ghost blogging platform and run development environment
+#
+# VERSION 1.0.0
+
+FROM ubuntu:12.10
+MAINTAINER Amer Grgic "amer@livebyt.es"
+WORKDIR /data/ghost
+
+# Install dependencies for nginx installation
+RUN apt-get update
+RUN apt-get install -y python g++ make software-properties-common --force-yes
+RUN add-apt-repository ppa:chris-lea/node.js
+RUN apt-get update
+# Install unzip
+RUN apt-get install -y unzip
+# Install curl
+RUN apt-get install -y curl
+# Install nodejs & npm
+RUN apt-get install -y rlwrap
+RUN apt-get install -y nodejs 
+# Download Ghost v0.4.1
+RUN curl -L https://ghost.org/zip/ghost-latest.zip -o /tmp/ghost.zip
+# Unzip Ghost zip to /data/ghost
+RUN unzip -uo /tmp/ghost.zip -d /data/ghost
+# Add custom config js to /data/ghost
+ADD ./config.example.js /data/ghost/config.js
+# Install Ghost with NPM
+RUN cd /data/ghost/ && npm install --production
+# Expose port 2368
+EXPOSE 2368
+# Run Ghost
+CMD ["npm","start"]
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "dockerfile"
+      });
+    </script>
+
+    <p>Dockerfile syntac highlighting for CodeMirror.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-dockerfile</code></p>
+  </article>

From efbd453ac1f1859bf012d776484092f1aae45f2f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:44:32 +0100
Subject: [PATCH 1689/4742] [dockerfile mode] Integrate

Issue #2888
---
 doc/compress.html             |  1 +
 mode/dockerfile/dockerfile.js | 13 +------------
 mode/index.html               |  1 +
 mode/meta.js                  |  1 +
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 4581fc4657..9df32f200f 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -106,6 +106,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/d/d.js">d.js</option>
           <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
           <option value="http://codemirror.net/mode/django/django.js">django.js</option>
+          <option value="http://codemirror.net/mode/dockerfile/dockerfile.js">dockerfile.js</option>
           <option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
           <option value="http://codemirror.net/mode/dylan/dylan.js">dylan.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
index 9444878699..bef67696bc 100644
--- a/mode/dockerfile/dockerfile.js
+++ b/mode/dockerfile/dockerfile.js
@@ -61,23 +61,12 @@
         // Match everything except for the inline comment
         regex: /[^#]+/,
         token: null,
-        next: "lineComment"
-      },
-      {
-        regex: /$/,
-        token: null,
         next: "start"
       },
-      // Fail safe return to start
       {
+        regex: /$/,
         token: null,
         next: "start"
-      }
-    ],
-    lineComment: [
-      {
-        regex: /#.*$/,
-        token: "comment"
       },
       // Fail safe return to start
       {
diff --git a/mode/index.html b/mode/index.html
index bb656d2a79..c346525f88 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -42,6 +42,7 @@ <h2>Language modes</h2>
       <li><a href="python/index.html">Cython</a></li>
       <li><a href="d/index.html">D</a></li>
       <li><a href="django/index.html">Django</a> (templating language)</li>
+      <li><a href="dockerfile/index.html">Dockerfile</a></li>
       <li><a href="diff/index.html">diff</a></li>
       <li><a href="dtd/index.html">DTD</a></li>
       <li><a href="dylan/index.html">Dylan</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 94acac76da..d68b207902 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -28,6 +28,7 @@
     {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
     {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
     {name: "Django", mime: "text/x-django", mode: "django"},
+    {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile"},
     {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
     {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
     {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},

From a6cbaff2d0f1cd13d95f79d96e2d82c7044d5d55 Mon Sep 17 00:00:00 2001
From: Luke Stagner <lstagner@uci.edu>
Date: Sun, 9 Nov 2014 17:59:33 -0800
Subject: [PATCH 1690/4742] [idl mode] Add

---
 doc/compress.html   |   1 +
 mode/idl/idl.js     | 298 ++++++++++++++++++++++++++++++++++++++++++++
 mode/idl/index.html |  64 ++++++++++
 mode/index.html     |   1 +
 mode/meta.js        |   1 +
 5 files changed, 365 insertions(+)
 create mode 100644 mode/idl/idl.js
 create mode 100644 mode/idl/index.html

diff --git a/doc/compress.html b/doc/compress.html
index 9df32f200f..a727e45328 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -124,6 +124,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/htmlembedded/htmlembedded.js">htmlembedded.js</option>
           <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option>
           <option value="http://codemirror.net/mode/http/http.js">http.js</option>
+          <option value="http://codemirror.net/mode/idl/idl.js">idl.js</option>
           <option value="http://codemirror.net/mode/jade/jade.js">jade.js</option>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
diff --git a/mode/idl/idl.js b/mode/idl/idl.js
new file mode 100644
index 0000000000..239d3cbe8a
--- /dev/null
+++ b/mode/idl/idl.js
@@ -0,0 +1,298 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('idl', function() {
+  function wordRegexp(words) {
+    return new RegExp('^((' + words.join(')|(') + '))\\b', 'i');
+  };
+
+  var identifiers = new RegExp('^[_a-z\xa1-\uffff][_a-z0-9\xa1-\uffff]*', 'i');
+
+  var singleOperators = /[+\-*&=<>\/@#~$]/;
+  var boolOperators = new RegExp('(and|or|eq|lt|le|gt|ge|ne|not)', 'i');
+
+  var builtins = wordRegexp([
+    'a_correlate', 'abs', 'acos', 'adapt_hist_equal', 'alog',
+    'alog2', 'alog10', 'amoeba', 'annotate', 'app_user_dir',
+    'app_user_dir_query', 'arg_present', 'array_equal', 'array_indices',
+    'arrow', 'ascii_template', 'asin', 'assoc', 'atan',
+    'axis', 'axis', 'bandpass_filter', 'bandreject_filter', 'barplot',
+    'bar_plot', 'beseli', 'beselj', 'beselk', 'besely',
+    'beta', 'biginteger', 'bilinear', 'bin_date', 'binary_template',
+    'bindgen', 'binomial', 'bit_ffs', 'bit_population', 'blas_axpy',
+    'blk_con', 'boolarr', 'boolean', 'boxplot', 'box_cursor',
+    'breakpoint', 'broyden', 'bubbleplot', 'butterworth', 'bytarr',
+    'byte', 'byteorder', 'bytscl', 'c_correlate', 'calendar',
+    'caldat', 'call_external', 'call_function', 'call_method',
+    'call_procedure', 'canny', 'catch', 'cd', 'cdf', 'ceil',
+    'chebyshev', 'check_math', 'chisqr_cvf', 'chisqr_pdf', 'choldc',
+    'cholsol', 'cindgen', 'cir_3pnt', 'clipboard', 'close',
+    'clust_wts', 'cluster', 'cluster_tree', 'cmyk_convert', 'code_coverage',
+    'color_convert', 'color_exchange', 'color_quan', 'color_range_map',
+    'colorbar', 'colorize_sample', 'colormap_applicable',
+    'colormap_gradient', 'colormap_rotation', 'colortable',
+    'comfit', 'command_line_args', 'common', 'compile_opt', 'complex',
+    'complexarr', 'complexround', 'compute_mesh_normals', 'cond', 'congrid',
+    'conj', 'constrained_min', 'contour', 'contour', 'convert_coord',
+    'convol', 'convol_fft', 'coord2to3', 'copy_lun', 'correlate',
+    'cos', 'cosh', 'cpu', 'cramer', 'createboxplotdata',
+    'create_cursor', 'create_struct', 'create_view', 'crossp', 'crvlength',
+    'ct_luminance', 'cti_test', 'cursor', 'curvefit', 'cv_coord',
+    'cvttobm', 'cw_animate', 'cw_animate_getp', 'cw_animate_load',
+    'cw_animate_run', 'cw_arcball', 'cw_bgroup', 'cw_clr_index',
+    'cw_colorsel', 'cw_defroi', 'cw_field', 'cw_filesel', 'cw_form',
+    'cw_fslider', 'cw_light_editor', 'cw_light_editor_get',
+    'cw_light_editor_set', 'cw_orient', 'cw_palette_editor',
+    'cw_palette_editor_get', 'cw_palette_editor_set', 'cw_pdmenu',
+    'cw_rgbslider', 'cw_tmpl', 'cw_zoom', 'db_exists',
+    'dblarr', 'dcindgen', 'dcomplex', 'dcomplexarr', 'define_key',
+    'define_msgblk', 'define_msgblk_from_file', 'defroi', 'defsysv',
+    'delvar', 'dendro_plot', 'dendrogram', 'deriv', 'derivsig',
+    'determ', 'device', 'dfpmin', 'diag_matrix', 'dialog_dbconnect',
+    'dialog_message', 'dialog_pickfile', 'dialog_printersetup',
+    'dialog_printjob', 'dialog_read_image',
+    'dialog_write_image', 'dictionary', 'digital_filter', 'dilate', 'dindgen',
+    'dissolve', 'dist', 'distance_measure', 'dlm_load', 'dlm_register',
+    'doc_library', 'double', 'draw_roi', 'edge_dog', 'efont',
+    'eigenql', 'eigenvec', 'ellipse', 'elmhes', 'emboss',
+    'empty', 'enable_sysrtn', 'eof', 'eos', 'erase',
+    'erf', 'erfc', 'erfcx', 'erode', 'errorplot',
+    'errplot', 'estimator_filter', 'execute', 'exit', 'exp',
+    'expand', 'expand_path', 'expint', 'extrac', 'extract_slice',
+    'f_cvf', 'f_pdf', 'factorial', 'fft', 'file_basename',
+    'file_chmod', 'file_copy', 'file_delete', 'file_dirname',
+    'file_expand_path', 'file_gunzip', 'file_gzip', 'file_info',
+    'file_lines', 'file_link', 'file_mkdir', 'file_move',
+    'file_poll_input', 'file_readlink', 'file_same',
+    'file_search', 'file_tar', 'file_test', 'file_untar', 'file_unzip',
+    'file_which', 'file_zip', 'filepath', 'findgen', 'finite',
+    'fix', 'flick', 'float', 'floor', 'flow3',
+    'fltarr', 'flush', 'format_axis_values', 'forward_function', 'free_lun',
+    'fstat', 'fulstr', 'funct', 'function', 'fv_test',
+    'fx_root', 'fz_roots', 'gamma', 'gamma_ct', 'gauss_cvf',
+    'gauss_pdf', 'gauss_smooth', 'gauss2dfit', 'gaussfit',
+    'gaussian_function', 'gaussint', 'get_drive_list', 'get_dxf_objects',
+    'get_kbrd', 'get_login_info',
+    'get_lun', 'get_screen_size', 'getenv', 'getwindows', 'greg2jul',
+    'grib', 'grid_input', 'grid_tps', 'grid3', 'griddata',
+    'gs_iter', 'h_eq_ct', 'h_eq_int', 'hanning', 'hash',
+    'hdf', 'hdf5', 'heap_free', 'heap_gc', 'heap_nosave',
+    'heap_refcount', 'heap_save', 'help', 'hilbert', 'hist_2d',
+    'hist_equal', 'histogram', 'hls', 'hough', 'hqr',
+    'hsv', 'i18n_multibytetoutf8',
+    'i18n_multibytetowidechar', 'i18n_utf8tomultibyte',
+    'i18n_widechartomultibyte',
+    'ibeta', 'icontour', 'iconvertcoord', 'idelete', 'identity',
+    'idl_base64', 'idl_container', 'idl_validname',
+    'idlexbr_assistant', 'idlitsys_createtool',
+    'idlunit', 'iellipse', 'igamma', 'igetcurrent', 'igetdata',
+    'igetid', 'igetproperty', 'iimage', 'image', 'image_cont',
+    'image_statistics', 'image_threshold', 'imaginary', 'imap', 'indgen',
+    'int_2d', 'int_3d', 'int_tabulated', 'intarr', 'interpol',
+    'interpolate', 'interval_volume', 'invert', 'ioctl', 'iopen',
+    'ir_filter', 'iplot', 'ipolygon', 'ipolyline', 'iputdata',
+    'iregister', 'ireset', 'iresolve', 'irotate', 'isa',
+    'isave', 'iscale', 'isetcurrent', 'isetproperty', 'ishft',
+    'isocontour', 'isosurface', 'isurface', 'itext', 'itranslate',
+    'ivector', 'ivolume', 'izoom', 'journal', 'json_parse',
+    'json_serialize', 'jul2greg', 'julday', 'keyword_set', 'krig2d',
+    'kurtosis', 'kw_test', 'l64indgen', 'la_choldc', 'la_cholmprove',
+    'la_cholsol', 'la_determ', 'la_eigenproblem', 'la_eigenql', 'la_eigenvec',
+    'la_elmhes', 'la_gm_linear_model', 'la_hqr', 'la_invert',
+    'la_least_square_equality', 'la_least_squares', 'la_linear_equation',
+    'la_ludc', 'la_lumprove', 'la_lusol',
+    'la_svd', 'la_tridc', 'la_trimprove', 'la_triql', 'la_trired',
+    'la_trisol', 'label_date', 'label_region', 'ladfit', 'laguerre',
+    'lambda', 'lambdap', 'lambertw', 'laplacian', 'least_squares_filter',
+    'leefilt', 'legend', 'legendre', 'linbcg', 'lindgen',
+    'linfit', 'linkimage', 'list', 'll_arc_distance', 'lmfit',
+    'lmgr', 'lngamma', 'lnp_test', 'loadct', 'locale_get',
+    'logical_and', 'logical_or', 'logical_true', 'lon64arr', 'lonarr',
+    'long', 'long64', 'lsode', 'lu_complex', 'ludc',
+    'lumprove', 'lusol', 'm_correlate', 'machar', 'make_array',
+    'make_dll', 'make_rt', 'map', 'mapcontinents', 'mapgrid',
+    'map_2points', 'map_continents', 'map_grid', 'map_image', 'map_patch',
+    'map_proj_forward', 'map_proj_image', 'map_proj_info',
+    'map_proj_init', 'map_proj_inverse',
+    'map_set', 'matrix_multiply', 'matrix_power', 'max', 'md_test',
+    'mean', 'meanabsdev', 'mean_filter', 'median', 'memory',
+    'mesh_clip', 'mesh_decimate', 'mesh_issolid',
+    'mesh_merge', 'mesh_numtriangles',
+    'mesh_obj', 'mesh_smooth', 'mesh_surfacearea',
+    'mesh_validate', 'mesh_volume',
+    'message', 'min', 'min_curve_surf', 'mk_html_help', 'modifyct',
+    'moment', 'morph_close', 'morph_distance',
+    'morph_gradient', 'morph_hitormiss',
+    'morph_open', 'morph_thin', 'morph_tophat', 'multi', 'n_elements',
+    'n_params', 'n_tags', 'ncdf', 'newton', 'noise_hurl',
+    'noise_pick', 'noise_scatter', 'noise_slur', 'norm', 'obj_class',
+    'obj_destroy', 'obj_hasmethod', 'obj_isa', 'obj_new', 'obj_valid',
+    'objarr', 'on_error', 'on_ioerror', 'online_help', 'openr',
+    'openu', 'openw', 'oplot', 'oploterr', 'orderedhash',
+    'p_correlate', 'parse_url', 'particle_trace', 'path_cache', 'path_sep',
+    'pcomp', 'plot', 'plot3d', 'plot', 'plot_3dbox',
+    'plot_field', 'ploterr', 'plots', 'polar_contour', 'polar_surface',
+    'polyfill', 'polyshade', 'pnt_line', 'point_lun', 'polarplot',
+    'poly', 'poly_2d', 'poly_area', 'poly_fit', 'polyfillv',
+    'polygon', 'polyline', 'polywarp', 'popd', 'powell',
+    'pref_commit', 'pref_get', 'pref_set', 'prewitt', 'primes',
+    'print', 'printf', 'printd', 'pro', 'product',
+    'profile', 'profiler', 'profiles', 'project_vol', 'ps_show_fonts',
+    'psafm', 'pseudo', 'ptr_free', 'ptr_new', 'ptr_valid',
+    'ptrarr', 'pushd', 'qgrid3', 'qhull', 'qromb',
+    'qromo', 'qsimp', 'query_*', 'query_ascii', 'query_bmp',
+    'query_csv', 'query_dicom', 'query_gif', 'query_image', 'query_jpeg',
+    'query_jpeg2000', 'query_mrsid', 'query_pict', 'query_png', 'query_ppm',
+    'query_srf', 'query_tiff', 'query_video', 'query_wav', 'r_correlate',
+    'r_test', 'radon', 'randomn', 'randomu', 'ranks',
+    'rdpix', 'read', 'readf', 'read_ascii', 'read_binary',
+    'read_bmp', 'read_csv', 'read_dicom', 'read_gif', 'read_image',
+    'read_interfile', 'read_jpeg', 'read_jpeg2000', 'read_mrsid', 'read_pict',
+    'read_png', 'read_ppm', 'read_spr', 'read_srf', 'read_sylk',
+    'read_tiff', 'read_video', 'read_wav', 'read_wave', 'read_x11_bitmap',
+    'read_xwd', 'reads', 'readu', 'real_part', 'rebin',
+    'recall_commands', 'recon3', 'reduce_colors', 'reform', 'region_grow',
+    'register_cursor', 'regress', 'replicate',
+    'replicate_inplace', 'resolve_all',
+    'resolve_routine', 'restore', 'retall', 'return', 'reverse',
+    'rk4', 'roberts', 'rot', 'rotate', 'round',
+    'routine_filepath', 'routine_info', 'rs_test', 's_test', 'save',
+    'savgol', 'scale3', 'scale3d', 'scatterplot', 'scatterplot3d',
+    'scope_level', 'scope_traceback', 'scope_varfetch',
+    'scope_varname', 'search2d',
+    'search3d', 'sem_create', 'sem_delete', 'sem_lock', 'sem_release',
+    'set_plot', 'set_shading', 'setenv', 'sfit', 'shade_surf',
+    'shade_surf_irr', 'shade_volume', 'shift', 'shift_diff', 'shmdebug',
+    'shmmap', 'shmunmap', 'shmvar', 'show3', 'showfont',
+    'signum', 'simplex', 'sin', 'sindgen', 'sinh',
+    'size', 'skewness', 'skip_lun', 'slicer3', 'slide_image',
+    'smooth', 'sobel', 'socket', 'sort', 'spawn',
+    'sph_4pnt', 'sph_scat', 'spher_harm', 'spl_init', 'spl_interp',
+    'spline', 'spline_p', 'sprsab', 'sprsax', 'sprsin',
+    'sprstp', 'sqrt', 'standardize', 'stddev', 'stop',
+    'strarr', 'strcmp', 'strcompress', 'streamline', 'streamline',
+    'stregex', 'stretch', 'string', 'strjoin', 'strlen',
+    'strlowcase', 'strmatch', 'strmessage', 'strmid', 'strpos',
+    'strput', 'strsplit', 'strtrim', 'struct_assign', 'struct_hide',
+    'strupcase', 'surface', 'surface', 'surfr', 'svdc',
+    'svdfit', 'svsol', 'swap_endian', 'swap_endian_inplace', 'symbol',
+    'systime', 't_cvf', 't_pdf', 't3d', 'tag_names',
+    'tan', 'tanh', 'tek_color', 'temporary', 'terminal_size',
+    'tetra_clip', 'tetra_surface', 'tetra_volume', 'text', 'thin',
+    'thread', 'threed', 'tic', 'time_test2', 'timegen',
+    'timer', 'timestamp', 'timestamptovalues', 'tm_test', 'toc',
+    'total', 'trace', 'transpose', 'tri_surf', 'triangulate',
+    'trigrid', 'triql', 'trired', 'trisol', 'truncate_lun',
+    'ts_coef', 'ts_diff', 'ts_fcast', 'ts_smooth', 'tv',
+    'tvcrs', 'tvlct', 'tvrd', 'tvscl', 'typename',
+    'uindgen', 'uint', 'uintarr', 'ul64indgen', 'ulindgen',
+    'ulon64arr', 'ulonarr', 'ulong', 'ulong64', 'uniq',
+    'unsharp_mask', 'usersym', 'value_locate', 'variance', 'vector',
+    'vector_field', 'vel', 'velovect', 'vert_t3d', 'voigt',
+    'volume', 'voronoi', 'voxel_proj', 'wait', 'warp_tri',
+    'watershed', 'wdelete', 'wf_draw', 'where', 'widget_base',
+    'widget_button', 'widget_combobox', 'widget_control',
+    'widget_displaycontextmenu', 'widget_draw',
+    'widget_droplist', 'widget_event', 'widget_info',
+    'widget_label', 'widget_list',
+    'widget_propertysheet', 'widget_slider', 'widget_tab',
+    'widget_table', 'widget_text',
+    'widget_tree', 'widget_tree_move', 'widget_window',
+    'wiener_filter', 'window',
+    'window', 'write_bmp', 'write_csv', 'write_gif', 'write_image',
+    'write_jpeg', 'write_jpeg2000', 'write_nrif', 'write_pict', 'write_png',
+    'write_ppm', 'write_spr', 'write_srf', 'write_sylk', 'write_tiff',
+    'write_video', 'write_wav', 'write_wave', 'writeu', 'wset',
+    'wshow', 'wtn', 'wv_applet', 'wv_cwt', 'wv_cw_wavelet',
+    'wv_denoise', 'wv_dwt', 'wv_fn_coiflet',
+    'wv_fn_daubechies', 'wv_fn_gaussian',
+    'wv_fn_haar', 'wv_fn_morlet', 'wv_fn_paul',
+    'wv_fn_symlet', 'wv_import_data',
+    'wv_import_wavelet', 'wv_plot3d_wps', 'wv_plot_multires',
+    'wv_pwt', 'wv_tool_denoise',
+    'xbm_edit', 'xdisplayfile', 'xdxf', 'xfont', 'xinteranimate',
+    'xloadct', 'xmanager', 'xmng_tmpl', 'xmtool', 'xobjview',
+    'xobjview_rotate', 'xobjview_write_image',
+    'xpalette', 'xpcolor', 'xplot3d',
+    'xregistered', 'xroi', 'xsq_test', 'xsurface', 'xvaredit',
+    'xvolume', 'xvolume_rotate', 'xvolume_write_image',
+    'xyouts', 'zlib_compress', 'zlib_uncompress', 'zoom', 'zoom_24'
+  ]);
+
+  var keywords = wordRegexp([
+    'begin', 'end', 'endcase', 'endfor',
+    'endwhile', 'endif', 'endrep', 'endforeach',
+    'break', 'case', 'continue', 'for',
+    'foreach', 'goto', 'if', 'then', 'else',
+    'repeat', 'until', 'switch', 'while',
+    'do', 'pro', 'function'
+  ]);
+
+  function tokenBase(stream, _state) {
+    // whitespaces
+    if (stream.eatSpace()) return null;
+
+    // Handle one line Comments
+    if (stream.match(';')) {
+      stream.skipToEnd();
+      return 'comment';
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.+-]/, false)) {
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/)) {
+        stream.tokenize = tokenBase;
+        return 'number'; }
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/)) {
+        return 'number'; }
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/)) { return 'number'; }
+    }
+
+    // Handle Strings
+    if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; }
+    if (stream.match(/^'([^']|(''))*'/)) { return 'string'; }
+
+    // Handle words
+    if (stream.match(keywords)) { return 'keyword'; }
+    if (stream.match(builtins)) { return 'builtin'; }
+    if (stream.match(identifiers)) { return 'variable'; }
+
+    if (stream.match(singleOperators) || stream.match(boolOperators)) {
+      return 'operator'; }
+
+    // Handle non-detected items
+    stream.next();
+    return 'error';
+  };
+
+
+  return {
+    startState: function() {
+      return {
+        tokenize: tokenBase
+      };
+    },
+
+    token: function(stream,  state) {
+      var style = state.tokenize(stream, state);
+      if (style === 'comment' || style === 'meta') {
+        return style;
+      }
+      return style;
+    }
+  };
+});
+
+CodeMirror.defineMIME('text/x-idl', 'idl');
+
+});
diff --git a/mode/idl/index.html b/mode/idl/index.html
new file mode 100644
index 0000000000..4c169e2d69
--- /dev/null
+++ b/mode/idl/index.html
@@ -0,0 +1,64 @@
+<!doctype html>
+
+<title>CodeMirror: IDL 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="idl.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="#">IDL</a>
+  </ul>
+</div>
+
+<article>
+<h2>IDL mode</h2>
+
+    <div><textarea id="code" name="code">
+;; Example IDL code
+FUNCTION mean_and_stddev,array
+  ;; This program reads in an array of numbers
+  ;; and returns a structure containing the
+  ;; average and standard deviation
+
+  ave = 0.0
+  count = 0.0
+
+  for i=0,N_ELEMENTS(array)-1 do begin
+      ave = ave + array[i]
+      count = count + 1
+  endfor
+  
+  ave = ave/count
+
+  std = stddev(array)  
+
+  return, {average:ave,std:std}
+
+END
+
+    </textarea></div>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "idl",
+               version: 1,
+               singleLineStringErrors: false},
+        lineNumbers: true,
+        indentUnit: 4,
+        matchBrackets: true
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-idl</code>.</p>
+</article>
diff --git a/mode/index.html b/mode/index.html
index c346525f88..576da6f1c3 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -61,6 +61,7 @@ <h2>Language modes</h2>
       <li><a href="htmlembedded/index.html">HTML embedded scripts</a></li>
       <li><a href="htmlmixed/index.html">HTML mixed-mode</a></li>
       <li><a href="http/index.html">HTTP</a></li>
+      <li><a href="idl/index.html">IDL</a></li>
       <li><a href="clike/index.html">Java</a></li>
       <li><a href="jade/index.html">Jade</a></li>
       <li><a href="javascript/index.html">JavaScript</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index d68b207902..7d28b8b917 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -49,6 +49,7 @@
     {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
     {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
     {name: "HTTP", mime: "message/http", mode: "http"},
+    {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
     {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
     {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
     {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},

From 986e319ad6c885a3652503d9f5b6e1aee32cba7a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 16:51:50 +0100
Subject: [PATCH 1691/4742] [idl mode] Simplify and add hintWords support

Issue #2921
---
 mode/idl/idl.js | 64 ++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/mode/idl/idl.js b/mode/idl/idl.js
index 239d3cbe8a..15c852e36c 100644
--- a/mode/idl/idl.js
+++ b/mode/idl/idl.js
@@ -9,19 +9,13 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
+  "use strict";
 
-CodeMirror.defineMode('idl', function() {
   function wordRegexp(words) {
     return new RegExp('^((' + words.join(')|(') + '))\\b', 'i');
   };
 
-  var identifiers = new RegExp('^[_a-z\xa1-\uffff][_a-z0-9\xa1-\uffff]*', 'i');
-
-  var singleOperators = /[+\-*&=<>\/@#~$]/;
-  var boolOperators = new RegExp('(and|or|eq|lt|le|gt|ge|ne|not)', 'i');
-
-  var builtins = wordRegexp([
+  var builtinArray = [
     'a_correlate', 'abs', 'acos', 'adapt_hist_equal', 'alog',
     'alog2', 'alog10', 'amoeba', 'annotate', 'app_user_dir',
     'app_user_dir_query', 'arg_present', 'array_equal', 'array_indices',
@@ -227,18 +221,27 @@ CodeMirror.defineMode('idl', function() {
     'xregistered', 'xroi', 'xsq_test', 'xsurface', 'xvaredit',
     'xvolume', 'xvolume_rotate', 'xvolume_write_image',
     'xyouts', 'zlib_compress', 'zlib_uncompress', 'zoom', 'zoom_24'
-  ]);
+  ];
+  var builtins = wordRegexp(builtinArray);
 
-  var keywords = wordRegexp([
+  var keywordArray = [
     'begin', 'end', 'endcase', 'endfor',
     'endwhile', 'endif', 'endrep', 'endforeach',
     'break', 'case', 'continue', 'for',
     'foreach', 'goto', 'if', 'then', 'else',
     'repeat', 'until', 'switch', 'while',
     'do', 'pro', 'function'
-  ]);
+  ];
+  var keywords = wordRegexp(keywordArray);
 
-  function tokenBase(stream, _state) {
+  CodeMirror.registerHelper("hintWords", "idl", builtinArray.concat(keywordArray));
+
+  var identifiers = new RegExp('^[_a-z\xa1-\uffff][_a-z0-9\xa1-\uffff]*', 'i');
+
+  var singleOperators = /[+\-*&=<>\/@#~$]/;
+  var boolOperators = new RegExp('(and|or|eq|lt|le|gt|ge|ne|not)', 'i');
+
+  function tokenBase(stream) {
     // whitespaces
     if (stream.eatSpace()) return null;
 
@@ -250,12 +253,12 @@ CodeMirror.defineMode('idl', function() {
 
     // Handle Number Literals
     if (stream.match(/^[0-9\.+-]/, false)) {
-      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/)) {
-        stream.tokenize = tokenBase;
-        return 'number'; }
-      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/)) {
-        return 'number'; }
-      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/)) { return 'number'; }
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/))
+        return 'number';
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/))
+        return 'number';
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/))
+        return 'number';
     }
 
     // Handle Strings
@@ -275,24 +278,13 @@ CodeMirror.defineMode('idl', function() {
     return 'error';
   };
 
-
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase
-      };
-    },
-
-    token: function(stream,  state) {
-      var style = state.tokenize(stream, state);
-      if (style === 'comment' || style === 'meta') {
-        return style;
+  CodeMirror.defineMode('idl', function() {
+    return {
+      token: function(stream) {
+        return tokenBase(stream);
       }
-      return style;
-    }
-  };
-});
-
-CodeMirror.defineMIME('text/x-idl', 'idl');
+    };
+  });
 
+  CodeMirror.defineMIME('text/x-idl', 'idl');
 });

From a9ee60558df3ff8979b48f96ab91127a1b6ae3f9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 21:15:32 +0100
Subject: [PATCH 1692/4742] [vim mode] Remove duplicated statement

---
 keymap/vim.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 66f2077674..c0bd416c16 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -282,7 +282,6 @@
       CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
       cm.on('keypress', handleKeyPress);
       cm.on('keydown', handleKeyDown);
-      CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
     }
 
     function leaveVimMode(cm) {

From c2306eddea6131ea4910a901206bde03c659c9f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 22:11:28 +0100
Subject: [PATCH 1693/4742] [css mode] Slightly better heuristic for
 unrecognized props in nested declarations

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 2695d08150..55082bf8e4 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -182,7 +182,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         override = "string-2";
         return "maybeprop";
       } else if (allowNested) {
-        override = stream.match(/^\s*:/, false) ? "property" : "tag";
+        override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag";
         return "block";
       } else {
         override += " error";

From c47adcc98a87396224d90a31101fa32ed2c8939d Mon Sep 17 00:00:00 2001
From: Jared Forsyth <jabapyth@gmail.com>
Date: Tue, 11 Nov 2014 10:07:00 -0700
Subject: [PATCH 1694/4742] [javascript-hint addon] Allow a custom global scope

Defaults to `window`
---
 addon/hint/javascript-hint.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index c7292468a0..f6c2440062 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -93,7 +93,7 @@
                   "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
 
   function getCompletions(token, context, keywords, options) {
-    var found = [], start = token.string;
+    var found = [], start = token.string, global = options && options.globalScope || window;
     function maybeAdd(str) {
       if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
     }
@@ -112,28 +112,28 @@
         if (options && options.additionalContext)
           base = options.additionalContext[obj.string];
         if (!options || options.useGlobalScope !== false)
-          base = base || window[obj.string];
+          base = base || global[obj.string];
       } else if (obj.type == "string") {
         base = "";
       } else if (obj.type == "atom") {
         base = 1;
       } else if (obj.type == "function") {
-        if (window.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
-            (typeof window.jQuery == 'function'))
-          base = window.jQuery();
-        else if (window._ != null && (obj.string == '_') && (typeof window._ == 'function'))
-          base = window._();
+        if (global.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
+            (typeof global.jQuery == 'function'))
+          base = global.jQuery();
+        else if (global._ != null && (obj.string == '_') && (typeof global._ == 'function'))
+          base = global._();
       }
       while (base != null && context.length)
         base = base[context.pop().string];
       if (base != null) gatherCompletions(base);
     } else {
-      // If not, just look in the window object and any local scope
+      // If not, just look in the global object and any local scope
       // (reading into JS mode internals to get at the local and global variables)
       for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
       for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
       if (!options || options.useGlobalScope !== false)
-        gatherCompletions(window);
+        gatherCompletions(global);
       forEach(keywords, maybeAdd);
     }
     return found;

From e9d3c124ed8c707f4c26098a73486ad4770ce1fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Nov 2014 23:17:03 +0100
Subject: [PATCH 1695/4742] Fix association of modes with tokens for
 addModeClass

The mode associated with a token is now the inner mode at
the time when the token is started. The htmlmixed and markdown/gfm
modes were fixed to return empty tokens during mode switches
when necessary to enforce this rule.

Issue #2919
---
 lib/codemirror.js           | 10 ++++++----
 mode/htmlmixed/htmlmixed.js |  4 ++--
 mode/markdown/markdown.js   | 26 +++++++++++++++-----------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 05795e244f..c7fdf633c3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5840,8 +5840,9 @@
     if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
   }
 
-  function readToken(mode, stream, state) {
+  function readToken(mode, stream, state, inner) {
     for (var i = 0; i < 10; i++) {
+      if (inner) inner[0] = CodeMirror.innerMode(mode, state).mode;
       var style = mode.token(stream, state);
       if (stream.pos > stream.start) return style;
     }
@@ -5876,6 +5877,7 @@
     if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
     var curStart = 0, curStyle = null;
     var stream = new StringStream(text, cm.options.tabSize), style;
+    var inner = cm.options.addModeClass && [null];
     if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
     while (!stream.eol()) {
       if (stream.pos > cm.options.maxHighlightLength) {
@@ -5884,10 +5886,10 @@
         stream.pos = text.length;
         style = null;
       } else {
-        style = extractLineClasses(readToken(mode, stream, state), lineClasses);
+        style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
       }
-      if (cm.options.addModeClass) {
-        var mName = CodeMirror.innerMode(mode, state).mode.name;
+      if (inner) {
+        var mName = inner[0].name;
         if (mName) style = "m-" + (style ? mName + " " + style : mName);
       }
       if (!flattenSpans || curStyle != style) {
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 250ef8cd24..1cc438f013 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -69,7 +69,7 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
     if (stream.match(/^<\/\s*script\s*>/i, false)) {
       state.token = html;
       state.localState = state.localMode = null;
-      return html(stream, state);
+      return null;
     }
     return maybeBackup(stream, /<\/\s*script\s*>/,
                        state.localMode.token(stream, state.localState));
@@ -78,7 +78,7 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
     if (stream.match(/^<\/\s*style\s*>/i, false)) {
       state.token = html;
       state.localState = state.localMode = null;
-      return html(stream, state);
+      return null;
     }
     return maybeBackup(stream, /<\/\s*style\s*>/,
                        cssMode.token(stream, state.localState));
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index d64bfdb6b0..7c87984e2b 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -199,15 +199,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function local(stream, state) {
-    if (stream.sol() && stream.match(/^```/, true)) {
+    if (stream.sol() && stream.match("```", false)) {
       state.localMode = state.localState = null;
-      state.f = inlineNormal;
-      state.block = blockNormal;
-      if (modeCfg.highlightFormatting) state.formatting = "code-block";
-      state.code = true;
-      var returnType = getType(state);
-      state.code = false;
-      return returnType;
+      state.f = state.block = leavingLocal;
+      return null;
     } else if (state.localMode) {
       return state.localMode.token(stream, state.localState);
     } else {
@@ -216,6 +211,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
   }
 
+  function leavingLocal(stream, state) {
+    stream.match("```");
+    state.block = blockNormal;
+    state.f = inlineNormal;
+    if (modeCfg.highlightFormatting) state.formatting = "code-block";
+    state.code = true;
+    var returnType = getType(state);
+    state.code = false;
+    return returnType;
+  }
+
   // Inline
   function getType(state) {
     var styles = [];
@@ -736,9 +742,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         state.indentation = adjustedIndentation;
         if (indentation > 0) return null;
       }
-      var result = state.f(stream, state);
-      if (stream.start == stream.pos) return this.token(stream, state);
-      else return result;
+      return state.f(stream, state);
     },
 
     innerMode: function(state) {

From 36eb2c5ac334aadf250fbdb6d536ec28960748ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 00:31:43 +0100
Subject: [PATCH 1696/4742] [overlay addon] Fix bad synchronization that was
 breaking gfm mode

Issue #2919
---
 addon/mode/overlay.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index 393054dfa4..e1b9ed3753 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -28,7 +28,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
         overlay: CodeMirror.startState(overlay),
         basePos: 0, baseCur: null,
         overlayPos: 0, overlayCur: null,
-        lineSeen: null
+        streamSeen: null
       };
     },
     copyState: function(state) {
@@ -41,9 +41,9 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
     },
 
     token: function(stream, state) {
-      if (stream.sol() || stream.string != state.lineSeen ||
+      if (stream != state.streamSeen ||
           Math.min(state.basePos, state.overlayPos) < stream.start) {
-        state.lineSeen = stream.string;
+        state.streamSeen = stream;
         state.basePos = state.overlayPos = stream.start;
       }
 

From 2024a3fcc8031b1121eab71dd02d14e21aa2c415 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 10:21:19 +0100
Subject: [PATCH 1697/4742] [ruby mode] Remove obsolete license link

---
 mode/ruby/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 1197ab023f..97544babc3 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -178,7 +178,6 @@ <h2>Ruby mode</h2>
     <p><strong>MIME types defined:</strong> <code>text/x-ruby</code>.</p>
 
     <p>Development of the CodeMirror Ruby mode was kindly sponsored
-    by <a href="http://ubalo.com/">Ubalo</a>, who hold
-    the <a href="LICENSE">license</a>.</p>
+    by <a href="http://ubalo.com/">Ubalo</a>.</p>
 
   </article>

From 357485bb35156fc5ad739209998253f5d6b31b26 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 12:04:29 +0100
Subject: [PATCH 1698/4742] Allow keymaps to have a call property, which is
 called to look up bindings

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c7fdf633c3..4b6b8a8dbf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4953,7 +4953,7 @@
 
   var lookupKey = CodeMirror.lookupKey = function(key, map, handle) {
     map = getKeyMap(map);
-    var found = map[key];
+    var found = map.call ? map.call(key) : map[key];
     if (found === false) return "nothing";
     if (found === "...") return "multi";
     if (found != null && handle(found)) return "handled";

From 199c90e51addd896768661e89ef31fa729a760fe Mon Sep 17 00:00:00 2001
From: Gregory Koberger <gkoberger@gmail.com>
Date: Sat, 8 Nov 2014 22:48:45 -0800
Subject: [PATCH 1699/4742] [clike mode] Add Objective-C Support

---
 mode/clike/clike.js   | 20 ++++++++++++++++++++
 mode/clike/index.html | 26 ++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 0f24bb8497..cce41a470c 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -471,4 +471,24 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 
+  def("text/x-objectivec", {
+    name: "clike",
+    keywords: words("IBAction IBOutlet readwrite readonly nonatomic SEL" +
+                    "super self copy if else for in enum while typedef switch case return " +
+                    "const static retain"),
+    builtin: words("char bool BOOL double float int long short id void"),
+    atoms: words("YES NO NULL NILL ON OFF"),
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "keyword";
+      },
+      "#": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "keyword";
+      }
+    },
+    modeProps: {fold: ["brace", "import"]}
+  });
+
 });
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 639ac39860..8b386d22e0 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -139,6 +139,26 @@ <h2>C++ example</h2>
 }
 </textarea></div>
 
+<h2>Objective-C example</h2>
+
+<div><textarea id="objectivec-code">
+/*
+This is a longer comment
+That spans two lines
+*/
+
+#import <Test/Test.h>
+@implementation YourAppDelegate
+
+// This is a one-line comment
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
+  char myString[] = "This is a C character array";
+  int test = 5;
+  return YES;
+}
+</textarea></div>
+
 <h2>Java example</h2>
 
 <div><textarea id="java-code">
@@ -202,6 +222,11 @@ <h2>Scala example</h2>
         matchBrackets: true,
         mode: "text/x-java"
       });
+      var objectivecEditor = CodeMirror.fromTextArea(document.getElementById("objectivec-code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-objectivec"
+      });
       var scalaEditor = CodeMirror.fromTextArea(document.getElementById("scala-code"), {
         lineNumbers: true,
         matchBrackets: true,
@@ -220,6 +245,7 @@ <h2>Scala example</h2>
     <p><strong>MIME types defined:</strong> <code>text/x-csrc</code>
     (C), <code>text/x-c++src</code> (C++), <code>text/x-java</code>
     (Java), <code>text/x-csharp</code> (C#),
+    <code>text/x-objectivec</code> (Objective-C),
     <code>text/x-scala</code> (Scala), <code>text/x-vertex</code>
     and <code>x-shader/x-fragment</code> (shader programs).</p>
 </article>

From 97f606494fb7fe48a2cced689864a3566d43bb16 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 12:33:18 +0100
Subject: [PATCH 1700/4742] [clike mode] Integrate Objective C dialect

Issue #2920
---
 mode/clike/clike.js | 15 +++++----------
 mode/index.html     |  1 +
 mode/meta.js        |  1 +
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index cce41a470c..710953b229 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -473,22 +473,17 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-objectivec", {
     name: "clike",
-    keywords: words("IBAction IBOutlet readwrite readonly nonatomic SEL" +
-                    "super self copy if else for in enum while typedef switch case return " +
-                    "const static retain"),
-    builtin: words("char bool BOOL double float int long short id void"),
+    keywords: words(cKeywords + "inline restrict _Bool _Complex _Imaginery BOOL Class bycopy byref id IMP in " +
+                    "inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
     atoms: words("YES NO NULL NILL ON OFF"),
     hooks: {
       "@": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
+        stream.eatWhile(/[\w\$]/);
         return "keyword";
       },
-      "#": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
-        return "keyword";
-      }
+      "#": cppHook
     },
-    modeProps: {fold: ["brace", "import"]}
+    modeProps: {fold: "brace"}
   });
 
 });
diff --git a/mode/index.html b/mode/index.html
index 576da6f1c3..82bf03ae51 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -76,6 +76,7 @@ <h2>Language modes</h2>
       <li><a href="modelica/index.html">Modelica</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>
       <li><a href="mllike/index.html">OCaml</a></li>
       <li><a href="octave/index.html">Octave</a> (MATLAB)</li>
       <li><a href="pascal/index.html">Pascal</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 7d28b8b917..94cf192976 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -71,6 +71,7 @@
     {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
     {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx"},
     {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
+    {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
     {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},

From 8d159b6ed01516c365e1bb4fa93b0fa2f1d38fd0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 14:04:15 +0100
Subject: [PATCH 1701/4742] Allow styling of line gutter backgrounds

Also add support for "gutter" in add/removeLineClass.
---
 doc/manual.html    |  9 +++++----
 lib/codemirror.css |  5 +++++
 lib/codemirror.js  | 23 +++++++++++++++--------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 736be44d5f..8183fb1b84 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1639,10 +1639,11 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       to which element this class should be applied, can can be one
       of <code>"text"</code> (the text element, which lies in front of
       the selection), <code>"background"</code> (a background element
-      that will be behind the selection), or <code>"wrap"</code> (the
-      wrapper node that wraps all of the line's elements, including
-      gutter elements). <code>class</code> should be the name of the
-      class to apply.</dd>
+      that will be behind the selection), <code>"gutter"</code> (the
+      line's gutter space), or <code>"wrap"</code> (the wrapper node
+      that wraps all of the line's elements, including gutter
+      elements). <code>class</code> should be the name of the class to
+      apply.</dd>
 
       <dt id="removeLineClass"><code><strong>doc.removeLineClass</strong>(line: integer|LineHandle, where: string, class: string) → LineHandle</code></dt>
       <dd>Remove a CSS class from a line. <code>line</code> can be a
diff --git a/lib/codemirror.css b/lib/codemirror.css
index eba9a5d8b5..e2d4ec2048 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -210,6 +210,11 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   *zoom:1;
   *display:inline;
 }
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  height: 100%;
+}
 .CodeMirror-gutter-elt {
   position: absolute;
   cursor: default;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4b6b8a8dbf..01d37002a9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -867,9 +867,12 @@
     if (cm.options.lineNumbers || markers) {
       var wrap = ensureLineWrapped(lineView);
       var gutterWrap = lineView.gutter =
-        wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "position: absolute; left: " +
-                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
+        wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
+                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
+                              "px; width: " + dims.gutterTotalWidth + "px"),
                           lineView.text);
+      if (lineView.line.gutterClass)
+        gutterWrap.className += " " + lineView.line.gutterClass;
       if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
         lineView.lineNumber = gutterWrap.appendChild(
           elt("div", lineNumberFor(cm.options, lineN),
@@ -6608,22 +6611,26 @@
     },
 
     addLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, "class", function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
+      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
         if (!line[prop]) line[prop] = cls;
-        else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
+        else if (classTest(cls).test(line[prop])) return false;
         else line[prop] += " " + cls;
         return true;
       });
     }),
     removeLineClass: docMethodOp(function(handle, where, cls) {
       return changeLine(this, handle, "class", function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
         var cur = line[prop];
         if (!cur) return false;
         else if (cls == null) line[prop] = null;
         else {
-          var found = cur.match(new RegExp("(?:^|\\s+)" + cls + "(?:$|\\s+)"));
+          var found = cur.match(classTest(cls));
           if (!found) return false;
           var end = found.index + found[0].length;
           line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
@@ -7449,7 +7456,7 @@
     catch(e) { return document.body; }
   };
 
-  function classTest(cls) { return new RegExp("\\b" + cls + "\\b\\s*"); }
+  function classTest(cls) { return new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)\\s*"); }
   var rmClass = CodeMirror.rmClass = function(node, cls) {
     var test = classTest(cls);
     if (test.test(node.className)) node.className = node.className.replace(test, "");

From fc54c026d2ced8d3e7deb866455ca79b764adb9c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 15 Nov 2014 21:28:19 +0100
Subject: [PATCH 1702/4742] Suppress error in IE8/9 when initializing detached

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 01d37002a9..ad8e98ac82 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7424,7 +7424,8 @@
   };
   else range = function(node, start, end) {
     var r = document.body.createTextRange();
-    r.moveToElementText(node.parentNode);
+    try { r.moveToElementText(node.parentNode); }
+    catch(e) { return r; }
     r.collapse(true);
     r.moveEnd("character", end);
     r.moveStart("character", start);

From 4bce53423da19c95ab1420885497f19e3ace5db1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Nov 2014 22:29:04 +0100
Subject: [PATCH 1703/4742] Fix rmClass

Add tests
---
 lib/codemirror.js | 13 +++++++++----
 test/test.js      | 29 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ad8e98ac82..9dc7b27e08 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7457,13 +7457,18 @@
     catch(e) { return document.body; }
   };
 
-  function classTest(cls) { return new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)\\s*"); }
+  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
   var rmClass = CodeMirror.rmClass = function(node, cls) {
-    var test = classTest(cls);
-    if (test.test(node.className)) node.className = node.className.replace(test, "");
+    var current = node.className;
+    var match = classTest(cls).exec(current);
+    if (match) {
+      var after = current.slice(match.index + match[0].length);
+      node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
+    }
   };
   var addClass = CodeMirror.addClass = function(node, cls) {
-    if (!classTest(cls).test(node.className)) node.className += " " + cls;
+    var current = node.className;
+    if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
   };
   function joinClasses(a, b) {
     var as = a.split(" ");
diff --git a/test/test.js b/test/test.js
index e437c589f6..3a19c8f5af 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2044,3 +2044,32 @@ testCM("eventOrder", function(cm) {
   cm.replaceSelection("/");
   eq(seen.join(","), "change,change,activity,change");
 });
+
+test("core_rmClass", function() {
+  var node = document.createElement("div");
+  node.className = "foo-bar baz-quux yadda";
+  CodeMirror.rmClass(node, "quux");
+  eq(node.className, "foo-bar baz-quux yadda");
+  CodeMirror.rmClass(node, "baz-quux");
+  eq(node.className, "foo-bar yadda");
+  CodeMirror.rmClass(node, "yadda");
+  eq(node.className, "foo-bar");
+  CodeMirror.rmClass(node, "foo-bar");
+  eq(node.className, "");
+  node.className = " foo ";
+  CodeMirror.rmClass(node, "foo");
+  eq(node.className, "");
+});
+
+test("core_addClass", function() {
+  var node = document.createElement("div");
+  CodeMirror.addClass(node, "a");
+  eq(node.className, "a");
+  CodeMirror.addClass(node, "a");
+  eq(node.className, "a");
+  CodeMirror.addClass(node, "b");
+  eq(node.className, "a b");
+  CodeMirror.addClass(node, "a");
+  CodeMirror.addClass(node, "b");
+  eq(node.className, "a b");
+});

From c78d76c829b770aed68c71383960a7b6195e831b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 9 Nov 2014 14:47:46 -0500
Subject: [PATCH 1704/4742] [vim] Visual mode rewrite

I'm rewriting the way that visual mode is written to:
1. Fix some tricky bugs, like https://github.com/codemirror/CodeMirror/issues/2913, and a couple I uncovered while doing this. (Unit tests updated)
2. Significantly simplify blockwise visual mode

The core of the changes here is that I'm creating a vim selection model. The selection model consists of

```
vim.sel.head
vim.sel.anchor
vim.visualMode
vim.visualLine
vim.visualBlock
```

I'm creating a 2-way binding between the vim and codemirror selection models. All motions now rely only on the vim selection model. Operators and actions still rely on the codemirror selection model, since they operate directly on the text.

Sorry for the gigantic change but I couldn't make it any smaller and still pass all the tests... I'm planning to delete `getSelectedAreaRange`, `getLastSelectedAreaRange`, and `selectBlock` in future changes as they are obsolete now that vim keeps its own selection model.

An added bonus here is that visual line mode now has a cursor that can be moved.
---
 keymap/vim.js    | 1065 +++++++++++++++++++++++-----------------------
 test/vim_test.js |  109 ++++-
 2 files changed, 613 insertions(+), 561 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c0bd416c16..c5b945cd67 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -164,10 +164,14 @@
     // Operator-Motion dual commands
     { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
     { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
-    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
-    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
-    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, operatorMotionArgs: { visualLine: true }},
-    { keys: '~', type: 'operatorMotion', operator: 'changeCase', operatorArgs: { shouldMoveCursor: true }, motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
+    { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
     { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
     // Actions
     { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
@@ -178,7 +182,8 @@
     { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
     { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
     { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
-    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank' }},
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
     { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
     { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
     { keys: 'v', type: 'action', action: 'toggleVisualMode' },
@@ -556,7 +561,9 @@
           visualLine: false,
           visualBlock: false,
           lastSelection: null,
-          lastPastedText: null
+          lastPastedText: null,
+          sel: {
+          }
         };
       }
       return cm.state.vim;
@@ -735,6 +742,7 @@
           } catch (e) {
             // clear VIM state in case it's in a bad state.
             cm.state.vim = undefined;
+            maybeInitVimState(cm);
             throw e;
           }
         });
@@ -1238,13 +1246,13 @@
         var operator = inputState.operator;
         var operatorArgs = inputState.operatorArgs || {};
         var registerName = inputState.registerName;
-        var selectionEnd = copyCursor(cm.getCursor('head'));
-        var selectionStart = copyCursor(cm.getCursor('anchor'));
-        // The difference between cur and selection cursors are that cur is
-        // being operated on and ignores that there is a selection.
-        var curStart = copyCursor(selectionEnd);
-        var curOriginal = copyCursor(curStart);
-        var curEnd;
+        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 oldHead = copyCursor(origHead);
+        var oldAnchor = copyCursor(origAnchor);
+        var newHead, newAnchor;
         var repeat;
         if (operator) {
           this.recordLastEdit(vim, inputState);
@@ -1271,7 +1279,7 @@
         motionArgs.repeat = repeat;
         clearInputState(cm);
         if (motion) {
-          var motionResult = motions[motion](cm, motionArgs, vim);
+          var motionResult = motions[motion](cm, origHead, motionArgs, vim);
           vim.lastMotion = motions[motion];
           if (!motionResult) {
             return;
@@ -1284,159 +1292,139 @@
               recordJumpPosition(cm, cachedCursor, motionResult);
               delete jumpList.cachedCursor;
             } else {
-              recordJumpPosition(cm, curOriginal, motionResult);
+              recordJumpPosition(cm, origHead, motionResult);
             }
           }
           if (motionResult instanceof Array) {
-            curStart = motionResult[0];
-            curEnd = motionResult[1];
+            newAnchor = motionResult[0];
+            newHead = motionResult[1];
           } else {
-            curEnd = motionResult;
+            newHead = motionResult;
           }
           // TODO: Handle null returns from motion commands better.
-          if (!curEnd) {
-            curEnd = Pos(curStart.line, curStart.ch);
+          if (!newHead) {
+            newHead = copyCursor(origHead);
           }
           if (vim.visualMode) {
-            // Check if the selection crossed over itself. Will need to shift
-            // the start point if that happened.
-            // offset is set to -1 or 1 to shift the curEnd
-            // left or right
-            var offset = 0;
-            if (cursorIsBefore(selectionStart, selectionEnd) &&
-                (cursorEqual(selectionStart, curEnd) ||
-                    cursorIsBefore(curEnd, selectionStart))) {
-              // The end of the selection has moved from after the start to
-              // before the start. We will shift the start right by 1.
-              selectionStart.ch += 1;
-              offset = -1;
-            } else if (cursorIsBefore(selectionEnd, selectionStart) &&
-                (cursorEqual(selectionStart, curEnd) ||
-                    cursorIsBefore(selectionStart, curEnd))) {
-              // The opposite happened. We will shift the start left by 1.
-              selectionStart.ch -= 1;
-              offset = 1;
-            }
-            // in case of visual Block selectionStart and curEnd
-            // may not be on the same line,
-            // Also, In case of v_o this should not happen.
-            if (!vim.visualBlock && !(motionResult instanceof Array)) {
-              curEnd.ch += offset;
-            }
-            if (vim.lastHPos != Infinity) {
-              vim.lastHPos = curEnd.ch;
-            }
-            selectionEnd = curEnd;
-            selectionStart = (motionResult instanceof Array) ? curStart : selectionStart;
-            if (vim.visualLine) {
-              if (cursorIsBefore(selectionStart, selectionEnd)) {
-                selectionStart.ch = 0;
-
-                var lastLine = cm.lastLine();
-                if (selectionEnd.line > lastLine) {
-                  selectionEnd.line = lastLine;
-                }
-                selectionEnd.ch = lineLength(cm, selectionEnd.line);
-              } else {
-                selectionEnd.ch = 0;
-                selectionStart.ch = lineLength(cm, selectionStart.line);
-              }
-            } else if (vim.visualBlock) {
-              // Select a block and
-              // return the diagonally opposite end.
-              selectionStart = selectBlock(cm, selectionEnd);
-            }
-            if (!vim.visualBlock) {
-              cm.setSelection(selectionStart, selectionEnd);
+            newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
+            if (newAnchor) {
+              newAnchor = clipCursorToContent(cm, newAnchor, true);
             }
+            newAnchor = newAnchor || oldAnchor;
+            sel.anchor = newAnchor;
+            sel.head = newHead;
+            updateCmSelection(cm);
             updateMark(cm, vim, '<',
-                cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
-                    : selectionEnd);
+                cursorIsBefore(newAnchor, newHead) ? newAnchor
+                    : newHead);
             updateMark(cm, vim, '>',
-                cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
-                    : selectionStart);
+                cursorIsBefore(newAnchor, newHead) ? newHead
+                    : newAnchor);
           } else if (!operator) {
-            curEnd = clipCursorToContent(cm, curEnd);
-            cm.setCursor(curEnd.line, curEnd.ch);
+            newHead = clipCursorToContent(cm, newHead);
+            cm.setCursor(newHead.line, newHead.ch);
           }
         }
-
         if (operator) {
-          var inverted = false;
-          vim.lastMotion = null;
-          var lastSelection = vim.lastSelection;
-          operatorArgs.repeat = repeat; // Indent in visual mode needs this.
-          if (vim.visualMode) {
-            curStart = selectionStart;
-            curEnd = selectionEnd;
-            motionArgs.inclusive = true;
-            operatorArgs.shouldMoveCursor = false;
-          }
-          // Swap start and end if motion was backward.
-          if (curEnd && cursorIsBefore(curEnd, curStart)) {
-            var tmp = curStart;
-            curStart = curEnd;
-            curEnd = tmp;
-            inverted = true;
-          } else if (!curEnd) {
-            curEnd = copyCursor(curStart);
-          }
-          if (motionArgs.inclusive && !vim.visualMode) {
-            // Move the selection end one to the right to include the last
-            // character.
-            curEnd.ch++;
-          }
-          if (operatorArgs.selOffset) {
+          if (operatorArgs.lastSel) {
             // Replaying a visual mode operation
-            curEnd.line = curStart.line + operatorArgs.selOffset.line;
-            if (operatorArgs.selOffset.line) {curEnd.ch = operatorArgs.selOffset.ch; }
-            else { curEnd.ch = curStart.ch + operatorArgs.selOffset.ch; }
-            // In case of blockwise visual
-            if (lastSelection && lastSelection.visualBlock) {
-              var block = lastSelection.visualBlock;
-              var width = block.width;
-              var height = block.height;
-              curEnd = Pos(curStart.line + height, curStart.ch + width);
-              // selectBlock creates a 'proper' rectangular block.
-              // We do not want that in all cases, so we manually set selections.
-              var selections = [];
-              for (var i = curStart.line; i < curEnd.line; i++) {
-                var anchor = Pos(i, curStart.ch);
-                var head = Pos(i, curEnd.ch);
-                var range = {anchor: anchor, head: head};
-                selections.push(range);
-              }
-              cm.setSelections(selections);
-              var blockSelected = true;
+            newAnchor = oldAnchor;
+            var lastSel = operatorArgs.lastSel;
+            var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
+            var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
+            if (lastSel.visualLine) {
+              // Linewise Visual mode: The same number of lines.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+            } else if (lastSel.visualBlock) {
+              // Blockwise Visual mode: The same number of lines and columns.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
+            } else if (lastSel.head.line == lastSel.anchor.line) {
+              // Normal Visual mode within one line: The same number of characters.
+              newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
+            } else {
+              // Normal Visual mode with several lines: The same number of lines, in the
+              // last line the same number of characters as in the last line the last time.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
             }
+            vim.visualMode = true;
+            vim.visualLine = lastSel.visualLine;
+            vim.visualBlock = lastSel.visualBlock;
+            sel = vim.sel = {
+              anchor: newAnchor,
+              head: newHead
+            };
+            updateCmSelection(cm);
           } else if (vim.visualMode) {
-            var selOffset = Pos();
-            selOffset.line = curEnd.line - curStart.line;
-            if (selOffset.line) { selOffset.ch = curEnd.ch; }
-            else { selOffset.ch = curEnd.ch - curStart.ch; }
-            operatorArgs.selOffset = selOffset;
+            operatorArgs.lastSel = {
+              anchor: copyCursor(sel.anchor),
+              head: copyCursor(sel.head),
+              visualBlock: vim.visualBlock,
+              visualLine: vim.visualLine
+            };
           }
-          var linewise = motionArgs.linewise ||
-              (vim.visualMode && vim.visualLine) ||
-              operatorArgs.linewise;
-          if (linewise) {
-            // Expand selection to entire line.
-            expandSelectionToLine(cm, curStart, curEnd);
-          } else if (motionArgs.forward) {
-            // Clip to trailing newlines only if the motion goes forward.
-            clipToLine(cm, curStart, curEnd);
+          var curStart, curEnd, linewise, mode;
+          var cmSel;
+          if (vim.visualMode) {
+            // Init visual op
+            curStart = cursorMin(sel.head, sel.anchor);
+            curEnd = cursorMax(sel.head, sel.anchor);
+            linewise = vim.visualLine || operatorArgs.linewise;
+            mode = vim.visualBlock ? 'block' :
+                   linewise ? 'line' :
+                   'char';
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode);
+            if (linewise) {
+              var ranges = cmSel.ranges;
+              if (mode == 'block') {
+                // Linewise operators in visual block mode extend to end of line
+                for (var i = 0; i < ranges.length; i++) {
+                  ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
+                }
+              } else if (mode == 'line') {
+                ranges[0].head = Pos(ranges[0].head.line + 1, 0);
+              }
+            }
+          } else {
+            // Init motion op
+            curStart = copyCursor(newAnchor || oldAnchor);
+            curEnd = copyCursor(newHead || oldHead);
+            if (cursorIsBefore(curEnd, curStart)) {
+              var tmp = curStart;
+              curStart = curEnd;
+              curEnd = tmp;
+            }
+            linewise = motionArgs.linewise || operatorArgs.linewise;
+            if (linewise) {
+              // Expand selection to entire line.
+              expandSelectionToLine(cm, curStart, curEnd);
+            } else if (motionArgs.forward) {
+              // Clip to trailing newlines only if the motion goes forward.
+              clipToLine(cm, curStart, curEnd);
+            }
+            mode = 'char';
+            var exclusive = !motionArgs.inclusive || linewise;
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode, exclusive);
           }
+          cm.setSelections(cmSel.ranges, cmSel.primary);
+          vim.lastMotion = null;
+          operatorArgs.repeat = repeat; // For indent in visual mode.
           operatorArgs.registerName = registerName;
           // Keep track of linewise as it affects how paste and change behave.
           operatorArgs.linewise = linewise;
-          if (!vim.visualBlock && !blockSelected) {
-            cm.setSelection(curStart, curEnd);
-          }
-          operators[operator](cm, operatorArgs, vim, curStart,
-              curEnd, curOriginal);
+          var operatorMoveTo = operators[operator](
+            cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
           if (vim.visualMode) {
             exitVisualMode(cm);
           }
+          if (operatorMoveTo) {
+            cm.setCursor(operatorMoveTo);
+          }
         }
       },
       recordLastEdit: function(vim, inputState, actionCommand) {
@@ -1455,7 +1443,7 @@
      */
     // All of the functions below return Cursor objects.
     var motions = {
-      moveToTopLine: function(cm, motionArgs) {
+      moveToTopLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
         return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
@@ -1464,17 +1452,17 @@
         var line = Math.floor((range.top + range.bottom) * 0.5);
         return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
-      moveToBottomLine: function(cm, motionArgs) {
+      moveToBottomLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
         return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
-      expandToLine: function(cm, motionArgs) {
+      expandToLine: function(_cm, head, motionArgs) {
         // Expands forward to end of line, and then to next line if repeat is
         // >1. Does not handle backward motion!
-        var cur = cm.getCursor();
+        var cur = head;
         return Pos(cur.line + motionArgs.repeat - 1, Infinity);
       },
-      findNext: function(cm, motionArgs) {
+      findNext: function(cm, _head, motionArgs) {
         var state = getSearchState(cm);
         var query = state.getQuery();
         if (!query) {
@@ -1486,7 +1474,7 @@
         highlightSearchMatches(cm, query);
         return findNext(cm, prev/** prev */, query, motionArgs.repeat);
       },
-      goToMark: function(cm, motionArgs, vim) {
+      goToMark: function(cm, _head, motionArgs, vim) {
         var mark = vim.marks[motionArgs.selectedCharacter];
         if (mark) {
           var pos = mark.find();
@@ -1494,22 +1482,19 @@
         }
         return null;
       },
-      moveToOtherHighlightedEnd: function(cm, motionArgs, vim) {
-        var ranges = cm.listSelections();
-        var curEnd = cm.getCursor('head');
-        var curStart = ranges[0].anchor;
-        var curIndex = cursorEqual(ranges[0].head, curEnd) ? ranges.length-1 : 0;
-        if (motionArgs.sameLine && vim.visualBlock) {
-          curStart = Pos(curEnd.line, ranges[curIndex].anchor.ch);
-          curEnd = Pos(ranges[curIndex].head.line, curEnd.ch);
+      moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) {
+        if (vim.visualBlock && motionArgs.sameLine) {
+          var sel = vim.sel;
+          return [
+            clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
+            clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
+          ];
         } else {
-          curStart = ranges[curIndex].anchor;
+          return ([vim.sel.head, vim.sel.anchor]);
         }
-        cm.setCursor(curEnd);
-        return ([curEnd, curStart]);
       },
-      jumpToMark: function(cm, motionArgs, vim) {
-        var best = cm.getCursor();
+      jumpToMark: function(cm, head, motionArgs, vim) {
+        var best = head;
         for (var i = 0; i < motionArgs.repeat; i++) {
           var cursor = best;
           for (var key in vim.marks) {
@@ -1546,14 +1531,14 @@
         }
         return best;
       },
-      moveByCharacters: function(cm, motionArgs) {
-        var cur = cm.getCursor();
+      moveByCharacters: function(_cm, head, motionArgs) {
+        var cur = head;
         var repeat = motionArgs.repeat;
         var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
         return Pos(cur.line, ch);
       },
-      moveByLines: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
+      moveByLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
         var endCh = cur.ch;
         // Depending what our last motion was, we may want to do different
         // things. If our last motion was moving vertically, we want to
@@ -1588,8 +1573,8 @@
         vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
         return Pos(line, endCh);
       },
-      moveByDisplayLines: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
+      moveByDisplayLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
         switch (vim.lastMotion) {
           case this.moveByDisplayLines:
           case this.moveByScroll:
@@ -1616,16 +1601,16 @@
         vim.lastHPos = res.ch;
         return res;
       },
-      moveByPage: function(cm, motionArgs) {
+      moveByPage: function(cm, head, motionArgs) {
         // CodeMirror only exposes functions that move the cursor page down, so
         // doing this bad hack to move the cursor and move it back. evalInput
         // will move the cursor to where it should be in the end.
-        var curStart = cm.getCursor();
+        var curStart = head;
         var repeat = motionArgs.repeat;
         return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
       },
-      moveByParagraph: function(cm, motionArgs) {
-        var line = cm.getCursor().line;
+      moveByParagraph: function(cm, head, motionArgs) {
+        var line = head.line;
         var repeat = motionArgs.repeat;
         var inc = motionArgs.forward ? 1 : -1;
         for (var i = 0; i < repeat; i++) {
@@ -1640,16 +1625,16 @@
         }
         return Pos(line, 0);
       },
-      moveByScroll: function(cm, motionArgs, vim) {
+      moveByScroll: function(cm, head, motionArgs, vim) {
         var scrollbox = cm.getScrollInfo();
         var curEnd = null;
         var repeat = motionArgs.repeat;
         if (!repeat) {
           repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
         }
-        var orig = cm.charCoords(cm.getCursor(), 'local');
+        var orig = cm.charCoords(head, 'local');
         motionArgs.repeat = repeat;
-        var curEnd = motions.moveByDisplayLines(cm, motionArgs, vim);
+        var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim);
         if (!curEnd) {
           return null;
         }
@@ -1657,11 +1642,11 @@
         cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
         return curEnd;
       },
-      moveByWords: function(cm, motionArgs) {
-        return moveToWord(cm, motionArgs.repeat, !!motionArgs.forward,
+      moveByWords: function(cm, head, motionArgs) {
+        return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward,
             !!motionArgs.wordEnd, !!motionArgs.bigWord);
       },
-      moveTillCharacter: function(cm, motionArgs) {
+      moveTillCharacter: function(cm, _head, motionArgs) {
         var repeat = motionArgs.repeat;
         var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
             motionArgs.selectedCharacter);
@@ -1671,26 +1656,26 @@
         curEnd.ch += increment;
         return curEnd;
       },
-      moveToCharacter: function(cm, motionArgs) {
+      moveToCharacter: function(cm, head, motionArgs) {
         var repeat = motionArgs.repeat;
         recordLastCharacterSearch(0, motionArgs);
         return moveToCharacter(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || cm.getCursor();
+            motionArgs.selectedCharacter) || head;
       },
-      moveToSymbol: function(cm, motionArgs) {
+      moveToSymbol: function(cm, head, motionArgs) {
         var repeat = motionArgs.repeat;
         return findSymbol(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || cm.getCursor();
+            motionArgs.selectedCharacter) || head;
       },
-      moveToColumn: function(cm, motionArgs, vim) {
+      moveToColumn: function(cm, head, motionArgs, vim) {
         var repeat = motionArgs.repeat;
         // repeat is equivalent to which column we want to move to!
         vim.lastHPos = repeat - 1;
-        vim.lastHSPos = cm.charCoords(cm.getCursor(),'div').left;
+        vim.lastHSPos = cm.charCoords(head,'div').left;
         return moveToColumn(cm, repeat);
       },
-      moveToEol: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
+      moveToEol: function(cm, head, motionArgs, vim) {
+        var cur = head;
         vim.lastHPos = Infinity;
         var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
         var end=cm.clipPos(retval);
@@ -1698,15 +1683,15 @@
         vim.lastHSPos = cm.charCoords(end,'div').left;
         return retval;
       },
-      moveToFirstNonWhiteSpaceCharacter: function(cm) {
+      moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
         // Go to the start of the line where the text begins, or the end for
         // whitespace-only lines
-        var cursor = cm.getCursor();
+        var cursor = head;
         return Pos(cursor.line,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
       },
-      moveToMatchedSymbol: function(cm) {
-        var cursor = cm.getCursor();
+      moveToMatchedSymbol: function(cm, head) {
+        var cursor = head;
         var line = cursor.line;
         var ch = cursor.ch;
         var lineText = cm.getLine(line);
@@ -1727,11 +1712,10 @@
           return cursor;
         }
       },
-      moveToStartOfLine: function(cm) {
-        var cursor = cm.getCursor();
-        return Pos(cursor.line, 0);
+      moveToStartOfLine: function(_cm, head) {
+        return Pos(head.line, 0);
       },
-      moveToLineOrEdgeOfDocument: function(cm, motionArgs) {
+      moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
         var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
         if (motionArgs.repeatIsExplicit) {
           lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
@@ -1739,7 +1723,7 @@
         return Pos(lineNum,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
       },
-      textObjectManipulation: function(cm, motionArgs) {
+      textObjectManipulation: function(cm, head, motionArgs) {
         // TODO: lots of possible exceptions that can be thrown here. Try da(
         //     outside of a () block.
 
@@ -1768,9 +1752,9 @@
 
         var tmp;
         if (mirroredPairs[character]) {
-          tmp = selectCompanionObject(cm, character, inclusive);
+          tmp = selectCompanionObject(cm, head, character, inclusive);
         } else if (selfPaired[character]) {
-          tmp = findBeginningAndEnd(cm, character, inclusive);
+          tmp = findBeginningAndEnd(cm, head, character, inclusive);
         } else if (character === 'W') {
           tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
                                                      true /** bigWord */);
@@ -1789,7 +1773,7 @@
         }
       },
 
-      repeatLastCharacterSearch: function(cm, motionArgs) {
+      repeatLastCharacterSearch: function(cm, head, motionArgs) {
         var lastSearch = vimGlobalState.lastChararacterSearch;
         var repeat = motionArgs.repeat;
         var forward = motionArgs.forward === lastSearch.forward;
@@ -1799,141 +1783,107 @@
         var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
         if (!curEnd) {
           cm.moveH(increment, 'char');
-          return cm.getCursor();
+          return head;
         }
         curEnd.ch += increment;
         return curEnd;
       }
     };
 
+    function fillArray(val, times) {
+      var arr = [];
+      for (var i = 0; i < times; i++) {
+        arr.push(val);
+      }
+      return arr;
+    }
+    /**
+     * An operator acts on a text selection. It receives the list of selections
+     * as input. The corresponding CodeMirror selection is guaranteed to
+    * match the input selection.
+     */
     var operators = {
-      change: function(cm, operatorArgs, vim) {
-        var selections = cm.listSelections();
-        var start = selections[0], end = selections[selections.length-1];
-        var curStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
-        var curEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
-        var text = cm.getSelection();
-        var visualBlock = vim.visualBlock;
-        if (vim.lastSelection && !vim.visualMode) {
-          visualBlock = vim.lastSelection.visualBlock ? true : visualBlock;
-        }
-        var lastInsertModeChanges = vimGlobalState.macroModeState.lastInsertModeChanges;
-        lastInsertModeChanges.inVisualBlock = visualBlock;
-        var replacement = new Array(selections.length).join('1').split('1');
-        // save the selectionEnd mark
-        var selectionEnd = vim.marks[">"] && vim.marks[">"].find();
-        if (!selectionEnd) {
-          selectionEnd = cm.getCursor("head");
-        }
-        vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'change', text,
-            operatorArgs.linewise);
-        if (operatorArgs.linewise) {
-          // 'C' in visual block extends the block till eol for all lines
-          if (visualBlock){
-            var startLine = curStart.line;
-            while (startLine <= curEnd.line) {
-              var endCh = lineLength(cm, startLine);
-              var head = Pos(startLine, endCh);
-              var anchor = Pos(startLine, curStart.ch);
-              startLine++;
-              cm.replaceRange('', anchor, head);
-            }
-          } else {
-            // Push the next line back down, if there is a next line.
-            replacement = '\n';
-            if (curEnd.line == curStart.line && curEnd.line == cm.lastLine()) {
-              replacement = '';
-            }
-            cm.replaceRange(replacement, curStart, curEnd);
-            cm.indentLine(curStart.line, 'smart');
-            // null ch so setCursor moves to end of line.
-            curStart.ch = null;
-            cm.setCursor(curStart);
-          }
-        } else {
-          // Exclude trailing whitespace if the range is not all whitespace.
-          var text = cm.getRange(curStart, curEnd);
+      change: function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
+        if (!vim.visualMode) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          text = cm.getRange(anchor, head);
           if (!isWhiteSpaceString(text)) {
+            // Exclude trailing whitespace if the range is not all whitespace.
             var match = (/\s+$/).exec(text);
             if (match) {
-              curEnd = offsetCursor(curEnd, 0, - match[0].length);
+              head = offsetCursor(head, 0, - match[0].length);
+              text = text.slice(0, - match[0].length);
             }
           }
-          if (visualBlock) {
-            cm.replaceSelections(replacement);
-          } else {
-            cm.setCursor(curStart);
-            cm.replaceRange('', curStart, curEnd);
+          var wasLastLine = head.line - 1 == cm.lastLine();
+          cm.replaceRange('', anchor, head);
+          if (args.linewise && !wasLastLine) {
+            // Push the next line back down, if there is a next line.
+            CodeMirror.commands.newlineAndIndent(cm);
+            // null ch so setCursor moves to end of line.
+            anchor.ch = null;
           }
+          finalHead = anchor;
+        } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
+          cm.replaceSelections(replacement);
+          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
         }
-        vim.marks['>'] = cm.setBookmark(selectionEnd);
-        actions.enterInsertMode(cm, {}, cm.state.vim);
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'change', text,
+            args.linewise, ranges.length > 1);
+        actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim);
       },
       // delete is a javascript keyword.
-      'delete': function(cm, operatorArgs, vim) {
-        var selections = cm.listSelections();
-        var start = selections[0], end = selections[selections.length-1];
-        var curStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
-        var curEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
-        // Save the '>' mark before cm.replaceRange clears it.
-        var selectionEnd, selectionStart;
-        var blockwise = vim.visualBlock;
-        if (vim.visualMode) {
-          selectionEnd = vim.marks['>'].find();
-          selectionStart = vim.marks['<'].find();
-        } else if (vim.lastSelection) {
-          selectionEnd = vim.lastSelection.curStartMark.find();
-          selectionStart = vim.lastSelection.curEndMark.find();
-          blockwise = vim.lastSelection.visualBlock;
-        }
-        var text = cm.getSelection();
-        vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'delete', text,
-            operatorArgs.linewise, blockwise);
-        var replacement = new Array(selections.length).join('1').split('1');
-        // If the ending line is past the last line, inclusive, instead of
-        // including the trailing \n, include the \n before the starting line
-        if (operatorArgs.linewise &&
-            curEnd.line == cm.lastLine() && curStart.line == curEnd.line) {
-          if (curEnd.line == 0) {
-            curStart.ch = 0;
+      'delete': function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        if (!vim.visualBlock) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          if (args.linewise &&
+              head.line != cm.firstLine() &&
+              anchor.line == cm.lastLine() &&
+              anchor.line == head.line - 1) {
+            // Special case for dd on last line (and first line).
+            if (anchor.line == cm.firstLine()) {
+              anchor.ch = 0;
+            } else {
+              anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
+            }
           }
-          else {
-            var tmp = copyCursor(curEnd);
-            curStart.line--;
-            curStart.ch = lineLength(cm, curStart.line);
-            curEnd = tmp;
+          text = cm.getRange(anchor, head);
+          cm.replaceRange('', anchor, head);
+          finalHead = anchor;
+          if (args.linewise) {
+            finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor);
           }
-          cm.replaceRange('', curStart, curEnd);
         } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
           cm.replaceSelections(replacement);
+          finalHead = ranges[0].anchor;
         }
-        // restore the saved bookmark
-        if (selectionEnd) {
-          var curStartMark = cm.setBookmark(selectionStart);
-          var curEndMark = cm.setBookmark(selectionEnd);
-          if (vim.visualMode) {
-            vim.marks['<'] = curStartMark;
-            vim.marks['>'] = curEndMark;
-          } else {
-            vim.lastSelection.curStartMark = curStartMark;
-            vim.lastSelection.curEndMark = curEndMark;
-          }
-        }
-        if (operatorArgs.linewise) {
-          cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
-        } else {
-          cm.setCursor(curStart);
-        }
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'delete', text,
+            args.linewise, vim.visualBlock);
+        return finalHead;
       },
-      indent: function(cm, operatorArgs, vim, curStart, curEnd) {
-        var startLine = curStart.line;
-        var endLine = curEnd.line;
+      indent: function(cm, args, ranges) {
+        var vim = cm.state.vim;
+        var startLine = ranges[0].anchor.line;
+        var endLine = vim.visualBlock ?
+          ranges[ranges.length - 1].anchor.line :
+          ranges[0].head.line;
         // In visual mode, n> shifts the selection right n times, instead of
         // shifting n lines right once.
-        var repeat = (vim.visualMode) ? operatorArgs.repeat : 1;
-        if (operatorArgs.linewise) {
+        var repeat = (vim.visualMode) ? args.repeat : 1;
+        if (args.linewise) {
           // The only way to delete a newline is to delete until the start of
           // the next line, so in linewise mode evalInput will include the next
           // line. We don't want this in indent, so we go back a line.
@@ -1941,17 +1891,15 @@
         }
         for (var i = startLine; i <= endLine; i++) {
           for (var j = 0; j < repeat; j++) {
-            cm.indentLine(i, operatorArgs.indentRight);
+            cm.indentLine(i, args.indentRight);
           }
         }
-        cm.setCursor(curStart);
-        cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+        return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
       },
-      changeCase: function(cm, operatorArgs, _vim, _curStart, _curEnd, _curOriginal) {
+      changeCase: function(cm, args, ranges, oldAnchor, newHead) {
         var selections = cm.getSelections();
-        var ranges = cm.listSelections();
         var swapped = [];
-        var toLower = operatorArgs.toLower;
+        var toLower = args.toLower;
         for (var j = 0; j < selections.length; j++) {
           var toSwap = selections[j];
           var text = '';
@@ -1969,18 +1917,26 @@
           swapped.push(text);
         }
         cm.replaceSelections(swapped);
-        var curStart  = ranges[0].anchor;
-        var curEnd = ranges[0].head;
-        if (!operatorArgs.shouldMoveCursor) {
-          cm.setCursor(cursorIsBefore(curStart, curEnd) ? curStart : curEnd);
+        if (args.shouldMoveCursor){
+          return newHead;
+        } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) {
+          return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor);
+        } else if (args.linewise){
+          return oldAnchor;
+        } else {
+          return cursorMin(ranges[0].anchor, ranges[0].head);
         }
       },
-      yank: function(cm, operatorArgs, vim, _curStart, _curEnd, curOriginal) {
+      yank: function(cm, args, ranges, oldAnchor) {
+        var vim = cm.state.vim;
         var text = cm.getSelection();
+        var endPos = vim.visualMode
+          ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor)
+          : oldAnchor;
         vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'yank',
-            text, operatorArgs.linewise, vim.visualBlock);
-        cm.setCursor(curOriginal);
+            args.registerName, 'yank',
+            text, args.linewise, vim.visualBlock);
+        return endPos;
       }
     };
 
@@ -2072,41 +2028,40 @@
         vim.insertMode = true;
         vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
         var insertAt = (actionArgs) ? actionArgs.insertAt : null;
-        if (vim.visualMode) {
-          var selections = getSelectedAreaRange(cm, vim);
-          var selectionStart = selections[0];
-          var selectionEnd = selections[1];
-        }
+        var sel = vim.sel;
+        var head = actionArgs.head || cm.getCursor('head');
+        var height = cm.listSelections().length;
         if (insertAt == 'eol') {
-          var cursor = cm.getCursor();
-          cursor = Pos(cursor.line, lineLength(cm, cursor.line));
-          cm.setCursor(cursor);
+          head = Pos(head.line, lineLength(cm, head.line));
         } else if (insertAt == 'charAfter') {
-          cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
+          head = offsetCursor(head, 0, 1);
         } else if (insertAt == 'firstNonBlank') {
-          if (vim.visualMode && !vim.visualBlock) {
-            if (selectionEnd.line < selectionStart.line) {
-              cm.setCursor(selectionEnd);
+          head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
+        } else if (insertAt == 'startOfSelectedArea') {
+          if (!vim.visualBlock) {
+            if (sel.head.line < sel.anchor.line) {
+              head = sel.head;
             } else {
-              selectionStart = Pos(selectionStart.line, 0);
-              cm.setCursor(selectionStart);
+              head = Pos(sel.anchor.line, 0);
             }
-            cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
-          } else if (vim.visualBlock) {
-            selectionEnd = Pos(selectionEnd.line, selectionStart.ch);
-            cm.setCursor(selectionStart);
-            selectBlock(cm, selectionEnd);
           } else {
-            cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.min(sel.head.ch, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
           }
         } else if (insertAt == 'endOfSelectedArea') {
-          if (vim.visualBlock) {
-            selectionStart = Pos(selectionStart.line, selectionEnd.ch);
-            cm.setCursor(selectionStart);
-            selectBlock(cm, selectionEnd);
-          } else if (selectionEnd && selectionEnd.line < selectionStart.line) {
-            selectionEnd = Pos(selectionStart.line, 0);
-            cm.setCursor(selectionEnd);
+          if (!vim.visualBlock) {
+            if (sel.head.line >= sel.anchor.line) {
+              head = offsetCursor(sel.head, 0, 1);
+            } else {
+              head = Pos(sel.anchor.line, 0);
+            }
+          } else {
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.max(sel.head.ch + 1, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
           }
         } else if (insertAt == 'inplace') {
           if (vim.visualMode){
@@ -2132,128 +2087,68 @@
         if (vim.visualMode) {
           exitVisualMode(cm);
         }
+        selectForInsert(cm, head, height);
       },
       toggleVisualMode: function(cm, actionArgs, vim) {
         var repeat = actionArgs.repeat;
-        var curStart = cm.getCursor();
-        var curEnd;
-        var selections = cm.listSelections();
+        var anchor = cm.getCursor();
+        var head;
         // TODO: The repeat should actually select number of characters/lines
         //     equal to the repeat times the size of the previous visual
         //     operation.
         if (!vim.visualMode) {
+          // Entering visual mode
           vim.visualMode = true;
           vim.visualLine = !!actionArgs.linewise;
           vim.visualBlock = !!actionArgs.blockwise;
-          if (vim.visualLine) {
-            curStart.ch = 0;
-            curEnd = clipCursorToContent(
-              cm, Pos(curStart.line + repeat - 1, lineLength(cm, curStart.line)),
-              true /** includeLineBreak */);
-          } else {
-            curEnd = clipCursorToContent(
-              cm, Pos(curStart.line, curStart.ch + repeat),
+          head = clipCursorToContent(
+              cm, Pos(anchor.line, anchor.ch + repeat - 1),
               true /** includeLineBreak */);
-          }
-          cm.setSelection(curStart, curEnd);
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+        } else if (vim.visualLine ^ actionArgs.linewise ||
+            vim.visualBlock ^ actionArgs.blockwise) {
+          // Toggling between modes
+          vim.visualLine = !!actionArgs.linewise;
+          vim.visualBlock = !!actionArgs.blockwise;
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
         } else {
-          curStart = cm.getCursor('anchor');
-          curEnd = cm.getCursor('head');
-          if (vim.visualLine) {
-            if (actionArgs.blockwise) {
-              // This means Ctrl-V pressed in linewise visual
-              vim.visualBlock = true;
-              selectBlock(cm, curEnd);
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'blockwise'});
-            } else if (!actionArgs.linewise) {
-              // v pressed in linewise, switch to characterwise visual mode
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual'});
-            } else {
-              exitVisualMode(cm);
-            }
-            vim.visualLine = false;
-          } else if (vim.visualBlock) {
-            if (actionArgs.linewise) {
-              // Shift-V pressed in blockwise visual mode
-              vim.visualLine = true;
-              curStart = Pos(selections[0].anchor.line, 0);
-              curEnd = Pos(selections[selections.length-1].anchor.line, lineLength(cm, selections[selections.length-1].anchor.line));
-              cm.setSelection(curStart, curEnd);
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'linewise'});
-            } else if (!actionArgs.blockwise) {
-              // v pressed in blockwise mode, Switch to characterwise
-              if (curEnd != selections[0].head) {
-                curStart = selections[0].anchor;
-              } else {
-                curStart = selections[selections.length-1].anchor;
-              }
-              cm.setSelection(curStart, curEnd);
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual'});
-            } else {
-              exitVisualMode(cm);
-            }
-            vim.visualBlock = false;
-          } else if (actionArgs.linewise) {
-              // Shift-V pressed in characterwise visual mode. Switch to linewise
-              // visual mode instead of exiting visual mode.
-              vim.visualLine = true;
-              curStart.ch = cursorIsBefore(curStart, curEnd) ? 0 :
-                lineLength(cm, curStart.line);
-              curEnd.ch = cursorIsBefore(curStart, curEnd) ?
-                lineLength(cm, curEnd.line) : 0;
-              cm.setSelection(curStart, curEnd);
-              CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: "linewise"});
-            } else if (actionArgs.blockwise) {
-              vim.visualBlock = true;
-              selectBlock(cm, curEnd);
-              CodeMirror.signal(cm, 'vim-mode-change', {mode: 'visual', subMode: 'blockwise'});
-            } else {
-              exitVisualMode(cm);
-            }
+          exitVisualMode(cm);
         }
-        updateMark(cm, vim, '<', cursorIsBefore(curStart, curEnd) ? curStart
-            : curEnd);
-        updateMark(cm, vim, '>', cursorIsBefore(curStart, curEnd) ? curEnd
-            : curStart);
       },
       reselectLastSelection: function(cm, _actionArgs, vim) {
-        var curStart = vim.marks['<'].find();
-        var curEnd = vim.marks['>'].find();
         var lastSelection = vim.lastSelection;
+        if (vim.visualMode) {
+          updateLastSelection(cm, vim);
+        }
         if (lastSelection) {
-          // Set the selections as per last selection
-          var selectionStart = lastSelection.curStartMark.find();
-          var selectionEnd = lastSelection.curEndMark.find();
-          var blockwise = lastSelection.visualBlock;
-          // update last selection
-          updateLastSelection(cm, vim, curStart, curEnd);
-          if (blockwise) {
-            cm.setCursor(selectionStart);
-            selectionStart = selectBlock(cm, selectionEnd);
-          } else {
-            cm.setSelection(selectionStart, selectionEnd);
-            selectionStart = cm.getCursor('anchor');
-            selectionEnd = cm.getCursor('head');
-          }
-          if (vim.visualMode) {
-            updateMark(cm, vim, '<', cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
-              : selectionEnd);
-            updateMark(cm, vim, '>', cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
-              : selectionStart);
+          var anchor = lastSelection.anchorMark.find();
+          var head = lastSelection.headMark.find();
+          if (!anchor || !head) {
+            // If the marks have been destroyed due to edits, do nothing.
+            return;
           }
-          // Last selection is updated now
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
           vim.visualMode = true;
-          if (lastSelection.visualLine) {
-            vim.visualLine = true;
-            vim.visualBlock = false;
-          } else if (lastSelection.visualBlock) {
-            vim.visualLine = false;
-            vim.visualBlock = true;
-          } else {
-            vim.visualBlock = vim.visualLine = false;
-          }
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
+          vim.visualLine = lastSelection.visualLine;
+          vim.visualBlock = lastSelection.visualBlock;
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+          CodeMirror.signal(cm, 'vim-mode-change', {
+            mode: 'visual',
+            subMode: vim.visualLine ? 'linewise' :
+                     vim.visualBlock ? 'blockwise' : ''});
         }
       },
       joinLines: function(cm, actionArgs, vim) {
@@ -2270,18 +2165,19 @@
                                                Infinity));
         }
         var finalCh = 0;
-        cm.operation(function() {
-          for (var i = curStart.line; i < curEnd.line; i++) {
-            finalCh = lineLength(cm, curStart.line);
-            var tmp = Pos(curStart.line + 1,
-                          lineLength(cm, curStart.line + 1));
-            var text = cm.getRange(curStart, tmp);
-            text = text.replace(/\n\s*/g, ' ');
-            cm.replaceRange(text, curStart, tmp);
-          }
-          var curFinalPos = Pos(curStart.line, finalCh);
-          cm.setCursor(curFinalPos);
-        });
+        for (var i = curStart.line; i < curEnd.line; i++) {
+          finalCh = lineLength(cm, curStart.line);
+          var tmp = Pos(curStart.line + 1,
+                        lineLength(cm, curStart.line + 1));
+          var text = cm.getRange(curStart, tmp);
+          text = text.replace(/\n\s*/g, ' ');
+          cm.replaceRange(text, curStart, tmp);
+        }
+        var curFinalPos = Pos(curStart.line, finalCh);
+        cm.setCursor(curFinalPos);
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
       },
       newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
         vim.insertMode = true;
@@ -2377,7 +2273,7 @@
           var emptyStrings = new Array(selections.length).join('1').split('1');
           // save the curEnd marker before it get cleared due to cm.replaceRange.
           if (vim.lastSelection) {
-            lastSelectionCurEnd = vim.lastSelection.curEndMark.find();
+            lastSelectionCurEnd = vim.lastSelection.headMark.find();
           }
           // push the previously selected text to unnamed register
           vimGlobalState.registerController.unnamedRegister.setText(selectedText);
@@ -2401,7 +2297,7 @@
           }
           // restore the the curEnd marker
           if(lastSelectionCurEnd) {
-            vim.lastSelection.curEndMark = cm.setBookmark(lastSelectionCurEnd);
+            vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd);
           }
           if (linewise) {
             curPosFinal.ch=0;
@@ -2443,10 +2339,10 @@
             }
           }
         }
-        cm.setCursor(curPosFinal);
         if (vim.visualMode) {
           exitVisualMode(cm);
         }
+        cm.setCursor(curPosFinal);
       },
       undo: function(cm, actionArgs) {
         cm.operation(function() {
@@ -2575,8 +2471,18 @@
       return ret;
     }
     function offsetCursor(cur, offsetLine, offsetCh) {
+      if (typeof offsetLine === 'object') {
+        offsetCh = offsetLine.ch;
+        offsetLine = offsetLine.line;
+      }
       return Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
+    function getOffset(anchor, head) {
+      return {
+        line: head.line - anchor.line,
+        ch: head.line - anchor.line
+      };
+    }
     function commandMatches(keys, keyMap, context, inputState) {
       // Partial matches are not applied. They inform the key handler
       // that the current key sequence is a subsequence of a valid key
@@ -2649,9 +2555,15 @@
       return false;
     }
     function cursorMin(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
       return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
     }
     function cursorMax(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
       return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
     }
     function cursorIsBetween(cur1, cur2, cur3) {
@@ -2719,11 +2631,19 @@
         selections.push(range);
       }
       primIndex = head.line == lastLine ? selections.length - 1 : 0;
-      cm.setSelections(selections, primIndex);
+      cm.setSelections(selections);
       selectionEnd.ch = headCh;
       base.ch = baseCh;
       return base;
     }
+    function selectForInsert(cm, head, height) {
+      var sel = [];
+      for (var i = 0; i < height; i++) {
+        var lineHead = offsetCursor(head, i, 0);
+        sel.push({anchor: lineHead, head: lineHead});
+      }
+      cm.setSelections(sel, 0);
+    }
     // getIndex returns the index of the cursor in the selections.
     function getIndex(ranges, cursor, end) {
       for (var i = 0; i < ranges.length; i++) {
@@ -2764,8 +2684,8 @@
           }
           cm.setSelections(selections);
         } else {
-          var start = lastSelection.curStartMark.find();
-          var end = lastSelection.curEndMark.find();
+          var start = lastSelection.anchorMark.find();
+          var end = lastSelection.headMark.find();
           var line = end.line - start.line;
           var ch = end.ch - start.ch;
           selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
@@ -2784,36 +2704,28 @@
         return getCurrentSelectedAreaRange();
       }
     }
-    function updateLastSelection(cm, vim, selectionStart, selectionEnd) {
-      if (!selectionStart || !selectionEnd) {
-        selectionStart = vim.marks['<'].find() || cm.getCursor('anchor');
-        selectionEnd = vim.marks['>'].find() || cm.getCursor('head');
-      }
+    // Updates the previous selection with the current selection's values. This
+    // should only be called in visual mode.
+    function updateLastSelection(cm, vim) {
+      var anchor = vim.sel.anchor;
+      var head = vim.sel.head;
       // To accommodate the effect of lastPastedText in the last selection
       if (vim.lastPastedText) {
-        selectionEnd = cm.posFromIndex(cm.indexFromPos(selectionStart) + vim.lastPastedText.length);
+        head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length);
         vim.lastPastedText = null;
       }
-      var ranges = cm.listSelections();
-      // This check ensures to set the cursor
-      // position where we left off in previous selection
-      var swap = getIndex(ranges, selectionStart, 'head') > -1;
-      if (vim.visualBlock) {
-        var height = Math.abs(selectionStart.line - selectionEnd.line)+1;
-        var width =  Math.abs(selectionStart.ch - selectionEnd.ch);
-        var block = {height: height, width: width};
-      }
-      // can't use selection state here because yank has already reset its cursor
-      // Also, Bookmarks make the visual selections robust to edit operations
-      vim.lastSelection = {'curStartMark': cm.setBookmark(swap ? selectionEnd : selectionStart),
-                           'curEndMark': cm.setBookmark(swap ? selectionStart : selectionEnd),
+      vim.lastSelection = {'anchorMark': cm.setBookmark(anchor),
+                           'headMark': cm.setBookmark(head),
+                           'anchor': copyCursor(anchor),
+                           'head': copyCursor(head),
                            'visualMode': vim.visualMode,
                            'visualLine': vim.visualLine,
-                           'visualBlock': block};
+                           'visualBlock': vim.visualBlock};
     }
     function expandSelection(cm, start, end) {
-      var head = cm.getCursor('head');
-      var anchor = cm.getCursor('anchor');
+      var sel = cm.state.vim.sel;
+      var head = sel.head;
+      var anchor = sel.anchor;
       var tmp;
       if (cursorIsBefore(end, start)) {
         tmp = end;
@@ -2826,9 +2738,75 @@
       } else {
         anchor = cursorMin(start, anchor);
         head = cursorMax(head, end);
+        head = offsetCursor(head, 0, -1);
+        if (head.ch == -1 && head.line != cm.firstLine()) {
+          head = Pos(head.line - 1, lineLength(cm, head.line - 1));
+        }
       }
       return [anchor, head];
     }
+    /**
+     * Updates the CodeMirror selection to match the provided vim selection.
+     * If no arguments are given, it uses the current vim selection state.
+     */
+    function updateCmSelection(cm, sel, mode) {
+      var vim = cm.state.vim;
+      sel = sel || vim.sel;
+      var mode = mode ||
+        vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
+      var cmSel = makeCmSelection(cm, sel, mode);
+      cm.setSelections(cmSel.ranges, cmSel.primary);
+      updateFakeCursor(cm);
+    }
+    function makeCmSelection(cm, sel, mode, exclusive) {
+      var head = copyCursor(sel.head);
+      var anchor = copyCursor(sel.anchor);
+      if (mode == 'char') {
+        var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        head = offsetCursor(sel.head, 0, headOffset);
+        anchor = offsetCursor(sel.anchor, 0, anchorOffset);
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'line') {
+        if (!cursorIsBefore(sel.head, sel.anchor)) {
+          anchor.ch = 0;
+
+          var lastLine = cm.lastLine();
+          if (head.line > lastLine) {
+            head.line = lastLine;
+          }
+          head.ch = lineLength(cm, head.line);
+        } else {
+          head.ch = 0;
+          anchor.ch = lineLength(cm, anchor.line);
+        }
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'block') {
+        var top = Math.min(anchor.line, head.line),
+            left = Math.min(anchor.ch, head.ch),
+            bottom = Math.max(anchor.line, head.line),
+            right = Math.max(anchor.ch, head.ch) + 1;
+        var height = bottom - top + 1;
+        var primary = head.line == top ? 0 : height - 1;
+        var ranges = [];
+        for (var i = 0; i < height; i++) {
+          ranges.push({
+            anchor: Pos(top + i, left),
+            head: Pos(top + i, right)
+          });
+        }
+        return {
+          ranges: ranges,
+          primary: primary
+        };
+      }
+    }
     function getHead(cm) {
       var cur = cm.getCursor('head');
       if (cm.getSelection().length == 1) {
@@ -2839,22 +2817,20 @@
       return cur;
     }
 
-    function exitVisualMode(cm) {
+    /**
+     * If moveHead is set to false, the CodeMirror selection will not be
+     * touched. The caller assumes the responsibility of putting the cursor
+    * in the right place.
+     */
+    function exitVisualMode(cm, moveHead) {
       var vim = cm.state.vim;
-      var selectionStart = cm.getCursor('anchor');
-      var selectionEnd = cm.getCursor('head');
-      // hack to place the cursor at the right place
-      // in case of visual block
-      if (vim.visualBlock && (cursorIsBefore(selectionStart, selectionEnd))) {
-          selectionEnd.ch--;
+      if (moveHead !== false) {
+        cm.setCursor(clipCursorToContent(cm, vim.sel.head));
       }
       updateLastSelection(cm, vim);
       vim.visualMode = false;
       vim.visualLine = false;
       vim.visualBlock = false;
-      if (!cursorEqual(selectionStart, selectionEnd)) {
-        cm.setCursor(clipCursorToContent(cm, selectionEnd));
-      }
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (vim.fakeCursor) {
         vim.fakeCursor.clear();
@@ -3184,6 +3160,7 @@
 
     /**
      * @param {CodeMirror} cm CodeMirror object.
+     * @param {Pos} cur The position to start from.
      * @param {int} repeat Number of words to move past.
      * @param {boolean} forward True to search forward. False to search
      *     backward.
@@ -3193,8 +3170,7 @@
      *     False if only alphabet characters count as part of the word.
      * @return {Cursor} The position the cursor should move to.
      */
-    function moveToWord(cm, repeat, forward, wordEnd, bigWord) {
-      var cur = cm.getCursor();
+    function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) {
       var curStart = copyCursor(cur);
       var words = [];
       if (forward && !wordEnd || !forward && wordEnd) {
@@ -3294,8 +3270,8 @@
 
     // TODO: perhaps this finagling of start and end positions belonds
     // in codmirror/replaceRange?
-    function selectCompanionObject(cm, symb, inclusive) {
-      var cur = getHead(cm), start, end;
+    function selectCompanionObject(cm, head, symb, inclusive) {
+      var cur = head, start, end;
 
       var bracketRegexp = ({
         '(': /[()]/, ')': /[()]/,
@@ -3339,8 +3315,8 @@
     // Takes in a symbol and a cursor and tries to simulate text objects that
     // have identical opening and closing symbols
     // TODO support across multiple lines
-    function findBeginningAndEnd(cm, symb, inclusive) {
-      var cur = copyCursor(getHead(cm));
+    function findBeginningAndEnd(cm, head, symb, inclusive) {
+      var cur = copyCursor(head);
       var line = cm.getLine(cur.line);
       var chars = line.split('');
       var start, end, i, len;
@@ -4681,45 +4657,49 @@
           // Cursor moved outside the context of an edit. Reset the change.
           lastChange.changes = [];
         }
-      } else {
+      } else if (!cm.curOp.isVimOp) {
         handleExternalSelection(cm, vim);
       }
       if (vim.visualMode) {
-        var from, head;
-        from = head = cm.getCursor('head');
-        var anchor = cm.getCursor('anchor');
-        var to = Pos(head.line, from.ch + (cursorIsBefore(anchor, head) ? -1 : 1));
-        if (cursorIsBefore(to, from)) {
-          var temp = from;
-          from = to;
-          to = temp;
-        }
-        if (vim.fakeCursor) {
-          vim.fakeCursor.clear();
-        }
-        vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
+        updateFakeCursor(cm);
       }
     }
-
+    function updateFakeCursor(cm) {
+      var vim = cm.state.vim;
+      var from = copyCursor(vim.sel.head);
+      var to = offsetCursor(from, 0, 1);
+      if (vim.fakeCursor) {
+        vim.fakeCursor.clear();
+      }
+      vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
+    }
     function handleExternalSelection(cm, vim) {
       var anchor = cm.getCursor('anchor');
       var head = cm.getCursor('head');
       // Enter or exit visual mode to match mouse selection.
       if (vim.visualMode && cursorEqual(head, anchor) && lineLength(cm, head.line) > head.ch) {
-        exitVisualMode(cm);
-      } else if (!cm.curOp.isVimOp && !vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
+        exitVisualMode(cm, false);
+      } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
         vim.visualMode = true;
         vim.visualLine = false;
         CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
       }
-      if (!cm.curOp.isVimOp) {
-        if (vim.visualMode) {
-          updateMark(cm, vim, '<', cursorMin(head, anchor));
-          updateMark(cm, vim, '>', cursorMax(head, anchor));
-        } else if (!vim.insertMode) {
-          // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
-          vim.lastHPos = cm.getCursor().ch;
-        }
+      if (vim.visualMode) {
+        // Bind CodeMirror selection model to vim selection model.
+        // Mouse selections are considered visual characterwise.
+        var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
+        var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
+        head = offsetCursor(head, 0, headOffset);
+        anchor = offsetCursor(anchor, 0, anchorOffset);
+        vim.sel = {
+          anchor: anchor,
+          head: head
+        };
+        updateMark(cm, vim, '<', cursorMin(head, anchor));
+        updateMark(cm, vim, '>', cursorMax(head, anchor));
+      } else if (!vim.insertMode) {
+        // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
+        vim.lastHPos = cm.getCursor().ch;
       }
     }
 
@@ -4811,19 +4791,21 @@
         }
         return true;
       }
-      var curStart = cm.getCursor();
+      var head = cm.getCursor('head');
       var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
       if (inVisualBlock) {
         // Set up block selection again for repeating the changes.
         var vim = cm.state.vim;
-        var block = vim.lastSelection.visualBlock;
-        var curEnd = Pos(curStart.line + block.height-1, curStart.ch);
-        cm.setCursor(curStart);
-        selectBlock(cm, curEnd);
+        var lastSel = vim.lastSelection;
+        var offset = getOffset(lastSel.anchor, lastSel.head);
+        selectForInsert(cm, head, offset.line + 1);
         repeat = cm.listSelections().length;
-        cm.setCursor(curStart);
+        cm.setCursor(head);
       }
       for (var i = 0; i < repeat; i++) {
+        if (inVisualBlock) {
+          cm.setCursor(offsetCursor(head, i, 0));
+        }
         for (var j = 0; j < changes.length; j++) {
           var change = changes[j];
           if (change instanceof InsertModeKey) {
@@ -4833,10 +4815,9 @@
             cm.replaceRange(change, cur, cur);
           }
         }
-        if (inVisualBlock) {
-          curStart.line++;
-          cm.setCursor(curStart);
-        }
+      }
+      if (inVisualBlock) {
+        cm.setCursor(offsetCursor(head, 0, 1));
       }
     }
 
diff --git a/test/vim_test.js b/test/vim_test.js
index 7f016c479b..7eb8f6d8f7 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -898,32 +898,36 @@ testVim('cc_multiply_repeat', function(cm, vim, helpers) {
   is(register.linewise);
   eq('vim-insert', cm.getOption('keyMap'));
 });
-testVim('cc_append', function(cm, vim, helpers) {
+testVim('cc_should_not_append_to_document', function(cm, vim, helpers) {
   var expectedLineCount = cm.lineCount();
   cm.setCursor(cm.lastLine(), 0);
   helpers.doKeys('c', 'c');
   eq(expectedLineCount, cm.lineCount());
 });
+function fillArray(val, times) {
+  var arr = [];
+  for (var i = 0; i < times; i++) {
+    arr.push(val);
+  }
+  return arr;
+}
 testVim('c_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'c');
-  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
-  replacement.pop();
+  var replacement = fillArray('hello', 3);
   cm.replaceSelections(replacement);
   eq('1hello\n5hello\nahellofg', cm.getValue());
   helpers.doKeys('<Esc>');
   cm.setCursor(2, 3);
   helpers.doKeys('<C-v>', '2', 'k', 'h', 'C');
-  replacement = new Array(cm.listSelections().length+1).join('world ').split(' ');
-  replacement.pop();
+  replacement = fillArray('world', 3);
   cm.replaceSelections(replacement);
   eq('1hworld\n5hworld\nahworld', cm.getValue());
 }, {value: '1234\n5678\nabcdefg'});
 testVim('c_visual_block_replay', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
-  var replacement = new Array(cm.listSelections().length+1).join('fo ').split(' ');
-  replacement.pop();
+  var replacement = fillArray('fo', 3);
   cm.replaceSelections(replacement);
   eq('1fo4\n5fo8\nafodefg', cm.getValue());
   helpers.doKeys('<Esc>');
@@ -932,6 +936,17 @@ testVim('c_visual_block_replay', function(cm, vim, helpers) {
   eq('foo4\nfoo8\nfoodefg', cm.getValue());
 }, {value: '1234\n5678\nabcdefg'});
 
+testVim('d_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'd');
+  eq('1\n5\nafg', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+testVim('D_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'D');
+  eq('1\n5\na', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+
 // Swapcase commands edit in place and do not modify registers.
 testVim('g~w_repeat', function(cm, vim, helpers) {
   // Assert that dw does delete newline if it should go to the next line, and
@@ -955,7 +970,7 @@ testVim('g~g~', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('', register.toString());
   is(!register.linewise);
-  eqPos({line: curStart.line, ch:0}, cm.getCursor());
+  eqPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
 testVim('gu_and_gU', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 7);
@@ -1263,7 +1278,7 @@ testVim('a_eol', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, lines[0].length);
   eq('vim-insert', cm.getOption('keyMap'));
 });
-testVim('a_endOfSelectedArea', function(cm, vim, helpers) {
+testVim('A_endOfSelectedArea', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('v', 'j', 'l');
   helpers.doKeys('A');
@@ -1726,6 +1741,49 @@ testVim('visual', function(cm, vim, helpers) {
   helpers.doKeys('d');
   eq('15', cm.getValue());
 }, { value: '12345' });
+testVim('visual_yank', function(cm, vim, helpers) {
+  helpers.doKeys('v', '3', 'l', 'y');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('p');
+  eq('aa te test for yank', cm.getValue());
+}, { value: 'a test for yank' })
+testVim('visual_w', function(cm, vim, helpers) {
+  helpers.doKeys('v', 'w');
+  eq(cm.getSelection(), 'motion t');
+}, { value: 'motion test'});
+testVim('visual_initial_selection', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('v');
+  cm.getSelection('n');
+}, { value: 'init'});
+testVim('visual_crossover_left', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('v', 'l', 'h', 'h');
+  cm.getSelection('ro');
+}, { value: 'cross'});
+testVim('visual_crossover_left', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('v', 'h', 'l', 'l');
+  cm.getSelection('os');
+}, { value: 'cross'});
+testVim('visual_crossover_up', function(cm, vim, helpers) {
+  cm.setCursor(3, 2);
+  helpers.doKeys('v', 'j', 'k', 'k');
+  eqPos(Pos(2, 2), cm.getCursor('head'));
+  eqPos(Pos(3, 3), cm.getCursor('anchor'));
+  helpers.doKeys('k');
+  eqPos(Pos(1, 2), cm.getCursor('head'));
+  eqPos(Pos(3, 3), cm.getCursor('anchor'));
+}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
+testVim('visual_crossover_down', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('v', 'k', 'j', 'j');
+  eqPos(Pos(2, 3), cm.getCursor('head'));
+  eqPos(Pos(1, 2), cm.getCursor('anchor'));
+  helpers.doKeys('j');
+  eqPos(Pos(3, 3), cm.getCursor('head'));
+  eqPos(Pos(1, 2), cm.getCursor('anchor'));
+}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
 testVim('visual_exit', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'l', 'j', 'j', '<Esc>');
   eqPos(cm.getCursor('anchor'), cm.getCursor('head'));
@@ -1735,20 +1793,23 @@ testVim('visual_line', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'd');
   eq(' 4\n 5', cm.getValue());
 }, { value: ' 1\n 2\n 3\n 4\n 5' });
-testVim('visual_block', function(cm, vim, helpers) {
+testVim('visual_block_different_line_lengths', function(cm, vim, helpers) {
   // test the block selection with lines of different length
   // i.e. extending the selection
   // till the end of the longest line.
   helpers.doKeys('<C-v>', 'l', 'j', 'j', '6', 'l', 'd');
   helpers.doKeys('d', 'd', 'd', 'd');
   eq('', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+testVim('visual_block_truncate_on_short_line', function(cm, vim, helpers) {
   // check for left side selection in case
   // of moving up to a shorter line.
-  cm.replaceRange('hello world\n{\nthis is\nsparta!', cm.getCursor());
+  cm.replaceRange('', cm.getCursor());
   cm.setCursor(3, 4);
   helpers.doKeys('<C-v>', 'l', 'k', 'k', 'd');
   eq('hello world\n{\ntis\nsa!', cm.getValue());
-  cm.replaceRange('12345\n67891\nabcde', {line: 0, ch: 0}, {line: cm.lastLine(), ch: 6});
+}, {value: 'hello world\n{\nthis is\nsparta!'});
+testVim('visual_block_corners', function(cm, vim, helpers) {
   cm.setCursor(1, 2);
   helpers.doKeys('<C-v>', '2', 'l', 'k');
   // circle around the anchor
@@ -1764,6 +1825,8 @@ testVim('visual_block', function(cm, vim, helpers) {
   helpers.doKeys('4', 'l');
   selections = cm.getSelections();
   eq('891cde', selections.join(''));
+}, {value: '12345\n67891\nabcde'});
+testVim('visual_block_mode_switch', function(cm, vim, helpers) {
   // switch between visual modes
   cm.setCursor(1, 1);
   // blockwise to characterwise visual
@@ -1778,7 +1841,7 @@ testVim('visual_block', function(cm, vim, helpers) {
   helpers.doKeys('V');
   selections = cm.getSelections();
   eq('67891\nabcde', selections.join(''));
-}, {value: '1234\n5678\nabcdefg'});
+}, {value: '12345\n67891\nabcde'});
 testVim('visual_block_crossing_short_line', function(cm, vim, helpers) {
   // visual block with long and short lines
   cm.setCursor(0, 3);
@@ -1858,12 +1921,15 @@ testVim('reselect_visual_block', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'k', 'h', '<C-v>');
   cm.setCursor(2, 1);
   helpers.doKeys('v', 'l', 'g', 'v');
-  helpers.assertCursorAt(0, 1);
+  eqPos(Pos(1, 2), vim.sel.anchor);
+  eqPos(Pos(0, 1), vim.sel.head);
   // Ensure selection is done with visual block mode rather than one
   // continuous range.
   eq(cm.getSelections().join(''), '23oo')
   helpers.doKeys('g', 'v');
-  helpers.assertCursorAt(2, 3);
+  eqPos(Pos(2, 1), vim.sel.anchor);
+  eqPos(Pos(2, 2), vim.sel.head);
+  helpers.doKeys('<Esc>');
   // Ensure selection of deleted range
   cm.setCursor(1, 1);
   helpers.doKeys('v', '<C-v>', 'j', 'd', 'g', 'v');
@@ -1897,11 +1963,14 @@ testVim('o_visual', function(cm, vim, helpers) {
 testVim('o_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>','3','j','l','l', 'o');
-  helpers.assertCursorAt(0, 1);
+  eqPos(Pos(3, 3), vim.sel.anchor);
+  eqPos(Pos(0, 1), vim.sel.head);
   helpers.doKeys('O');
-  helpers.assertCursorAt(0, 4);
+  eqPos(Pos(3, 1), vim.sel.anchor);
+  eqPos(Pos(0, 3), vim.sel.head);
   helpers.doKeys('o');
-  helpers.assertCursorAt(3, 1);
+  eqPos(Pos(0, 3), vim.sel.anchor);
+  eqPos(Pos(3, 1), vim.sel.head);
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
 testVim('changeCase_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -1936,7 +2005,9 @@ testVim('changeCase_visual_block', function(cm, vim, helpers) {
 }, { value: 'abcdef\nghijkl\nmnopq\nfoo'});
 testVim('visual_paste', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
-  helpers.doKeys('v', 'l', 'l', 'y', 'j', 'v', 'l', 'p');
+  helpers.doKeys('v', 'l', 'l', 'y');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('3', 'l', 'j', 'v', 'l', 'p');
   helpers.assertCursorAt(1, 5);
   eq('this is a\nunithitest for visual paste', cm.getValue());
   cm.setCursor(0, 0);

From 29b78d2e0a369c95fc4a1a4e1bc1adaa2095431f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 12:16:44 +0100
Subject: [PATCH 1705/4742] [sql mode] Remove outdated comment

---
 mode/sql/sql.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 799492f51b..f2c2384a72 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -367,8 +367,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
   keywords:
     A list of keywords you want to be highlighted.
-  functions:
-    A list of function names you want to be highlighted.
   builtin:
     A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword").
   operatorChars:

From ff4e64092592214c1bbb5b267d8ab2db6f4241ca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 15:43:40 +0100
Subject: [PATCH 1706/4742] [stex mode] Sanitize comment parsing

---
 mode/stex/stex.js | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 14f6fcc3cb..470c4f150f 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -128,10 +128,7 @@ CodeMirror.defineMode("stex", function() {
 
         var ch = source.next();
         if (ch == "%") {
-            // special case: % at end of its own line; stay in same state
-            if (!source.eol()) {
-              setState(state, inCComment);
-            }
+            source.skipToEnd();
             return "comment";
         }
         else if (ch == '}' || ch == ']') {
@@ -163,12 +160,6 @@ CodeMirror.defineMode("stex", function() {
         }
     }
 
-    function inCComment(source, state) {
-        source.skipToEnd();
-        setState(state, normal);
-        return "comment";
-    }
-
     function inMathMode(source, state, endModeSeq) {
         if (source.eatSpace()) {
             return null;
@@ -207,11 +198,8 @@ CodeMirror.defineMode("stex", function() {
             return "bracket";
         }
 
-        // eat comments here, because inCComment returns us to normal state!
         if (ch == "%") {
-            if (!source.eol()) {
-                source.skipToEnd();
-            }
+            source.skipToEnd();
             return "comment";
         }
         return "error";

From 21576a30702cd643c7415e68b70b170da3ac59b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 15:44:21 +0100
Subject: [PATCH 1707/4742] [stex mode] Set to two-space indentation

---
 mode/stex/stex.js | 366 +++++++++++++++++++++++-----------------------
 1 file changed, 183 insertions(+), 183 deletions(-)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 470c4f150f..60c32949be 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -14,60 +14,60 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
+  "use strict";
 
-CodeMirror.defineMode("stex", function() {
+  CodeMirror.defineMode("stex", function() {
     "use strict";
 
     function pushCommand(state, command) {
-        state.cmdState.push(command);
+      state.cmdState.push(command);
     }
 
     function peekCommand(state) {
-        if (state.cmdState.length > 0) {
-            return state.cmdState[state.cmdState.length - 1];
-        } else {
-            return null;
-        }
+      if (state.cmdState.length > 0) {
+        return state.cmdState[state.cmdState.length - 1];
+      } else {
+        return null;
+      }
     }
 
     function popCommand(state) {
-        var plug = state.cmdState.pop();
-        if (plug) {
-            plug.closeBracket();
-        }
+      var plug = state.cmdState.pop();
+      if (plug) {
+        plug.closeBracket();
+      }
     }
 
     // returns the non-default plugin closest to the end of the list
     function getMostPowerful(state) {
-        var context = state.cmdState;
-        for (var i = context.length - 1; i >= 0; i--) {
-            var plug = context[i];
-            if (plug.name == "DEFAULT") {
-                continue;
-            }
-            return plug;
-        }
-        return { styleIdentifier: function() { return null; } };
+      var context = state.cmdState;
+      for (var i = context.length - 1; i >= 0; i--) {
+        var plug = context[i];
+        if (plug.name == "DEFAULT") {
+          continue;
+        }
+        return plug;
+      }
+      return { styleIdentifier: function() { return null; } };
     }
 
     function addPluginPattern(pluginName, cmdStyle, styles) {
-        return function () {
-            this.name = pluginName;
-            this.bracketNo = 0;
-            this.style = cmdStyle;
-            this.styles = styles;
-            this.argument = null;   // \begin and \end have arguments that follow. These are stored in the plugin
-
-            this.styleIdentifier = function() {
-                return this.styles[this.bracketNo - 1] || null;
-            };
-            this.openBracket = function() {
-                this.bracketNo++;
-                return "bracket";
-            };
-            this.closeBracket = function() {};
+      return function () {
+        this.name = pluginName;
+        this.bracketNo = 0;
+        this.style = cmdStyle;
+        this.styles = styles;
+        this.argument = null;   // \begin and \end have arguments that follow. These are stored in the plugin
+
+        this.styleIdentifier = function() {
+          return this.styles[this.bracketNo - 1] || null;
+        };
+        this.openBracket = function() {
+          this.bracketNo++;
+          return "bracket";
         };
+        this.closeBracket = function() {};
+      };
     }
 
     var plugins = {};
@@ -79,172 +79,172 @@ CodeMirror.defineMode("stex", function() {
     plugins["end"] = addPluginPattern("end", "tag", ["atom"]);
 
     plugins["DEFAULT"] = function () {
-        this.name = "DEFAULT";
-        this.style = "tag";
+      this.name = "DEFAULT";
+      this.style = "tag";
 
-        this.styleIdentifier = this.openBracket = this.closeBracket = function() {};
+      this.styleIdentifier = this.openBracket = this.closeBracket = function() {};
     };
 
     function setState(state, f) {
-        state.f = f;
+      state.f = f;
     }
 
     // called when in a normal (no environment) context
     function normal(source, state) {
-        var plug;
-        // Do we look like '\command' ?  If so, attempt to apply the plugin 'command'
-        if (source.match(/^\\[a-zA-Z@]+/)) {
-            var cmdName = source.current().slice(1);
-            plug = plugins[cmdName] || plugins["DEFAULT"];
-            plug = new plug();
-            pushCommand(state, plug);
-            setState(state, beginParams);
-            return plug.style;
-        }
-
-        // escape characters
-        if (source.match(/^\\[$&%#{}_]/)) {
-          return "tag";
-        }
-
-        // white space control characters
-        if (source.match(/^\\[,;!\/\\]/)) {
-          return "tag";
-        }
-
-        // find if we're starting various math modes
-        if (source.match("\\[")) {
-            setState(state, function(source, state){ return inMathMode(source, state, "\\]"); });
-            return "keyword";
-        }
-        if (source.match("$$")) {
-            setState(state, function(source, state){ return inMathMode(source, state, "$$"); });
-            return "keyword";
-        }
-        if (source.match("$")) {
-            setState(state, function(source, state){ return inMathMode(source, state, "$"); });
-            return "keyword";
-        }
-
-        var ch = source.next();
-        if (ch == "%") {
-            source.skipToEnd();
-            return "comment";
-        }
-        else if (ch == '}' || ch == ']') {
-            plug = peekCommand(state);
-            if (plug) {
-                plug.closeBracket(ch);
-                setState(state, beginParams);
-            } else {
-                return "error";
-            }
-            return "bracket";
-        } else if (ch == '{' || ch == '[') {
-            plug = plugins["DEFAULT"];
-            plug = new plug();
-            pushCommand(state, plug);
-            return "bracket";
-        }
-        else if (/\d/.test(ch)) {
-            source.eatWhile(/[\w.%]/);
-            return "atom";
-        }
-        else {
-            source.eatWhile(/[\w\-_]/);
-            plug = getMostPowerful(state);
-            if (plug.name == 'begin') {
-                plug.argument = source.current();
-            }
-            return plug.styleIdentifier();
-        }
+      var plug;
+      // Do we look like '\command' ?  If so, attempt to apply the plugin 'command'
+      if (source.match(/^\\[a-zA-Z@]+/)) {
+        var cmdName = source.current().slice(1);
+        plug = plugins[cmdName] || plugins["DEFAULT"];
+        plug = new plug();
+        pushCommand(state, plug);
+        setState(state, beginParams);
+        return plug.style;
+      }
+
+      // escape characters
+      if (source.match(/^\\[$&%#{}_]/)) {
+        return "tag";
+      }
+
+      // white space control characters
+      if (source.match(/^\\[,;!\/\\]/)) {
+        return "tag";
+      }
+
+      // find if we're starting various math modes
+      if (source.match("\\[")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "\\]"); });
+        return "keyword";
+      }
+      if (source.match("$$")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "$$"); });
+        return "keyword";
+      }
+      if (source.match("$")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "$"); });
+        return "keyword";
+      }
+
+      var ch = source.next();
+      if (ch == "%") {
+        source.skipToEnd();
+        return "comment";
+      }
+      else if (ch == '}' || ch == ']') {
+        plug = peekCommand(state);
+        if (plug) {
+          plug.closeBracket(ch);
+          setState(state, beginParams);
+        } else {
+          return "error";
+        }
+        return "bracket";
+      } else if (ch == '{' || ch == '[') {
+        plug = plugins["DEFAULT"];
+        plug = new plug();
+        pushCommand(state, plug);
+        return "bracket";
+      }
+      else if (/\d/.test(ch)) {
+        source.eatWhile(/[\w.%]/);
+        return "atom";
+      }
+      else {
+        source.eatWhile(/[\w\-_]/);
+        plug = getMostPowerful(state);
+        if (plug.name == 'begin') {
+          plug.argument = source.current();
+        }
+        return plug.styleIdentifier();
+      }
     }
 
     function inMathMode(source, state, endModeSeq) {
-        if (source.eatSpace()) {
-            return null;
-        }
-        if (source.match(endModeSeq)) {
-            setState(state, normal);
-            return "keyword";
-        }
-        if (source.match(/^\\[a-zA-Z@]+/)) {
-            return "tag";
-        }
-        if (source.match(/^[a-zA-Z]+/)) {
-            return "variable-2";
-        }
-        // escape characters
-        if (source.match(/^\\[$&%#{}_]/)) {
-          return "tag";
-        }
-        // white space control characters
-        if (source.match(/^\\[,;!\/]/)) {
-          return "tag";
-        }
-        // special math-mode characters
-        if (source.match(/^[\^_&]/)) {
-          return "tag";
-        }
-        // non-special characters
-        if (source.match(/^[+\-<>|=,\/@!*:;'"`~#?]/)) {
-            return null;
-        }
-        if (source.match(/^(\d+\.\d*|\d*\.\d+|\d+)/)) {
-          return "number";
-        }
-        var ch = source.next();
-        if (ch == "{" || ch == "}" || ch == "[" || ch == "]" || ch == "(" || ch == ")") {
-            return "bracket";
-        }
-
-        if (ch == "%") {
-            source.skipToEnd();
-            return "comment";
-        }
-        return "error";
+      if (source.eatSpace()) {
+        return null;
+      }
+      if (source.match(endModeSeq)) {
+        setState(state, normal);
+        return "keyword";
+      }
+      if (source.match(/^\\[a-zA-Z@]+/)) {
+        return "tag";
+      }
+      if (source.match(/^[a-zA-Z]+/)) {
+        return "variable-2";
+      }
+      // escape characters
+      if (source.match(/^\\[$&%#{}_]/)) {
+        return "tag";
+      }
+      // white space control characters
+      if (source.match(/^\\[,;!\/]/)) {
+        return "tag";
+      }
+      // special math-mode characters
+      if (source.match(/^[\^_&]/)) {
+        return "tag";
+      }
+      // non-special characters
+      if (source.match(/^[+\-<>|=,\/@!*:;'"`~#?]/)) {
+        return null;
+      }
+      if (source.match(/^(\d+\.\d*|\d*\.\d+|\d+)/)) {
+        return "number";
+      }
+      var ch = source.next();
+      if (ch == "{" || ch == "}" || ch == "[" || ch == "]" || ch == "(" || ch == ")") {
+        return "bracket";
+      }
+
+      if (ch == "%") {
+        source.skipToEnd();
+        return "comment";
+      }
+      return "error";
     }
 
     function beginParams(source, state) {
-        var ch = source.peek(), lastPlug;
-        if (ch == '{' || ch == '[') {
-            lastPlug = peekCommand(state);
-            lastPlug.openBracket(ch);
-            source.eat(ch);
-            setState(state, normal);
-            return "bracket";
-        }
-        if (/[ \t\r]/.test(ch)) {
-            source.eat(ch);
-            return null;
-        }
+      var ch = source.peek(), lastPlug;
+      if (ch == '{' || ch == '[') {
+        lastPlug = peekCommand(state);
+        lastPlug.openBracket(ch);
+        source.eat(ch);
         setState(state, normal);
-        popCommand(state);
-
-        return normal(source, state);
+        return "bracket";
+      }
+      if (/[ \t\r]/.test(ch)) {
+        source.eat(ch);
+        return null;
+      }
+      setState(state, normal);
+      popCommand(state);
+
+      return normal(source, state);
     }
 
     return {
-        startState: function() {
-            return {
-                cmdState: [],
-                f: normal
-            };
-        },
-        copyState: function(s) {
-            return {
-                cmdState: s.cmdState.slice(),
-                f: s.f
-            };
-        },
-        token: function(stream, state) {
-            return state.f(stream, state);
-        },
-        lineComment: "%"
+      startState: function() {
+        return {
+          cmdState: [],
+          f: normal
+        };
+      },
+      copyState: function(s) {
+        return {
+          cmdState: s.cmdState.slice(),
+          f: s.f
+        };
+      },
+      token: function(stream, state) {
+        return state.f(stream, state);
+      },
+      lineComment: "%"
     };
-});
+  });
 
-CodeMirror.defineMIME("text/x-stex", "stex");
-CodeMirror.defineMIME("text/x-latex", "stex");
+  CodeMirror.defineMIME("text/x-stex", "stex");
+  CodeMirror.defineMIME("text/x-latex", "stex");
 
 });

From ccddb1ebcce7ba5adef37bf1a63eb08c791ecf1f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 15:49:08 +0100
Subject: [PATCH 1708/4742] [stex mode] Reset tokenizer after blank line

This prevents a stray $ from setting the whole rest of
the document to math mode.

Closes #2928
---
 mode/stex/stex.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 60c32949be..4be533c54e 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -240,6 +240,9 @@
       token: function(stream, state) {
         return state.f(stream, state);
       },
+      blankLine: function(state) {
+        state.f = normal;
+      },
       lineComment: "%"
     };
   });

From 13af2af2d7beb8395257dc095861dfcdea5d33cb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 21 Nov 2014 16:38:04 +0100
Subject: [PATCH 1709/4742] [loadmode addon] Work with requirejs

See http://discuss.codemirror.net/t/loadmode-js
---
 addon/mode/loadmode.js | 35 +++++++++++++++++++----------------
 test/lint/lint.js      |  2 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/addon/mode/loadmode.js b/addon/mode/loadmode.js
index 804215877f..10117ec22f 100644
--- a/addon/mode/loadmode.js
+++ b/addon/mode/loadmode.js
@@ -3,12 +3,12 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), "cjs");
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror"], function(CM) { mod(CM, "amd"); });
   else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
+    mod(CodeMirror, "plain");
+})(function(CodeMirror, env) {
   if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
 
   var loading = {};
@@ -35,21 +35,24 @@
     if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
     if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
 
-    var script = document.createElement("script");
-    script.src = CodeMirror.modeURL.replace(/%N/g, mode);
-    var others = document.getElementsByTagName("script")[0];
-    others.parentNode.insertBefore(script, others);
-    var list = loading[mode] = [cont];
-    var count = 0, poll = setInterval(function() {
-      if (++count > 100) return clearInterval(poll);
-      if (CodeMirror.modes.hasOwnProperty(mode)) {
-        clearInterval(poll);
-        loading[mode] = null;
+    var file = CodeMirror.modeURL.replace(/%N/g, mode);
+    if (env == "plain") {
+      var script = document.createElement("script");
+      script.src = file;
+      var others = document.getElementsByTagName("script")[0];
+      var list = loading[mode] = [cont];
+      CodeMirror.on(script, "load", function() {
         ensureDeps(mode, function() {
           for (var i = 0; i < list.length; ++i) list[i]();
         });
-      }
-    }, 200);
+      });
+      others.parentNode.insertBefore(script, others);
+    } else if (env == "cjs") {
+      require(file);
+      cont();
+    } else if (env == "amd") {
+      requirejs([file], cont);
+    }
   };
 
   CodeMirror.autoLoadMode = function(instance, mode) {
diff --git a/test/lint/lint.js b/test/lint/lint.js
index c2c45262a6..b0248290cf 100644
--- a/test/lint/lint.js
+++ b/test/lint/lint.js
@@ -22,7 +22,7 @@ var topAllowedGlobals = Object.create(null);
  "screen FileReader Worker postMessage importScripts " +
  "setInterval clearInterval setTimeout clearTimeout " +
  "CodeMirror " +
- "test exports require module define")
+ "test exports require module define requirejs")
   .split(" ").forEach(function(n) { topAllowedGlobals[n] = true; });
 
 var fs = require("fs"), acorn = require("./acorn.js"), walk = require("./walk.js");

From fc25da484ba306bc7f8ea72211ba9e5284413b72 Mon Sep 17 00:00:00 2001
From: "Nicholas Bollweg (Nick)" <nick.bollweg@gmail.com>
Date: Fri, 21 Nov 2014 21:32:41 -0500
Subject: [PATCH 1710/4742] [sparql mode] Update with more details from 1.1

- more style classes: operator, builtin, meta, brackets
- literal metas (@ and ^^)
- many more operators
- mime type and extension from spec
---
 mode/meta.js           |  2 +-
 mode/sparql/index.html |  4 ++--
 mode/sparql/sparql.js  | 23 +++++++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/mode/meta.js b/mode/meta.js
index 94cf192976..945b9b565b 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -102,7 +102,7 @@
     {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
     {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
     {name: "Solr", mime: "text/x-solr", mode: "solr"},
-    {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql", ext: ["sparql"]},
+    {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
     {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 6f24206b1e..02837ab346 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -43,11 +43,11 @@ <h2>SPARQL mode</h2>
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "application/x-sparql-query",
+        mode: "application/sparql-query",
         matchBrackets: true
       });
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>application/x-sparql-query</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>application/sparql-query</code>.</p>
 
   </article>
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 64dbb612c2..0d006dcd34 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -19,11 +19,18 @@ CodeMirror.defineMode("sparql", function(config) {
     return new RegExp("^(?:" + words.join("|") + ")$", "i");
   }
   var ops = wordRegexp(["str", "lang", "langmatches", "datatype", "bound", "sameterm", "isiri", "isuri",
+                        "iri", "uri", "bnode", "count", "sum", "min", "max", "avg", "sample",
+                        "group_concat", "rand", "abs", "ceil", "floor", "round", "concat", "substr", "strlen",
+                        "replace", "ucase", "lcase", "encode_for_uri", "contains", "strstarts", "strends",
+                        "strbefore", "strafter", "year", "month", "day", "hours", "minutes", "seconds",
+                        "timezone", "tz", "now", "uuid", "struuid", "md5", "sha1", "sha256", "sha384",
+                        "sha512", "coalesce", "if", "strlang", "strdt", "isnumeric", "regex", "exists",
                         "isblank", "isliteral", "a"]);
   var keywords = wordRegexp(["base", "prefix", "select", "distinct", "reduced", "construct", "describe",
                              "ask", "from", "named", "where", "order", "limit", "offset", "filter", "optional",
                              "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group",
                              "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union",
+                             "true", "false", "with",
                              "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
   var operatorChars = /[*+\-<>=&|]/;
 
@@ -44,7 +51,7 @@ CodeMirror.defineMode("sparql", function(config) {
     }
     else if (/[{}\(\),\.;\[\]]/.test(ch)) {
       curPunc = ch;
-      return null;
+      return "bracket";
     }
     else if (ch == "#") {
       stream.skipToEnd();
@@ -52,12 +59,20 @@ CodeMirror.defineMode("sparql", function(config) {
     }
     else if (operatorChars.test(ch)) {
       stream.eatWhile(operatorChars);
-      return null;
+      return "operator";
     }
     else if (ch == ":") {
       stream.eatWhile(/[\w\d\._\-]/);
       return "atom";
     }
+    else if (ch == "@") {
+      stream.eatWhile(/[a-z\d\-]/i);
+      return "meta";
+    }
+    else if (ch == "^") {
+      stream.eatWhile(/\^/);
+      return "meta";
+    }
     else {
       stream.eatWhile(/[_\w\d]/);
       if (stream.eat(":")) {
@@ -66,7 +81,7 @@ CodeMirror.defineMode("sparql", function(config) {
       }
       var word = stream.current();
       if (ops.test(word))
-        return null;
+        return "builtin";
       else if (keywords.test(word))
         return "keyword";
       else
@@ -155,6 +170,6 @@ CodeMirror.defineMode("sparql", function(config) {
   };
 });
 
-CodeMirror.defineMIME("application/x-sparql-query", "sparql");
+CodeMirror.defineMIME("application/sparql-query", "sparql");
 
 });

From 096a20aa459eceebd1c0e960b80d395998b46a47 Mon Sep 17 00:00:00 2001
From: "Nicholas Bollweg (Nick)" <nick.bollweg@gmail.com>
Date: Fri, 21 Nov 2014 22:05:12 -0500
Subject: [PATCH 1711/4742] [sparql mode] Property paths

---
 mode/sparql/index.html | 16 ++++++++++++----
 mode/sparql/sparql.js  |  9 ++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 02837ab346..84ef4d3639 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -29,15 +29,23 @@ <h2>SPARQL mode</h2>
 PREFIX a: &lt;http://www.w3.org/2000/10/annotation-ns#>
 PREFIX dc: &lt;http://purl.org/dc/elements/1.1/>
 PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/>
+PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#>
 
 # Comment!
 
 SELECT ?given ?family
 WHERE {
-  ?annot a:annotates &lt;http://www.w3.org/TR/rdf-sparql-query/> .
-  ?annot dc:creator ?c .
-  OPTIONAL {?c foaf:given ?given ;
-               foaf:family ?family } .
+  {
+    ?annot a:annotates &lt;http://www.w3.org/TR/rdf-sparql-query/> .
+    ?annot dc:creator ?c .
+    OPTIONAL {?c foaf:givenName ?given ;
+                 foaf:familyName ?family }
+  } UNION {
+    ?c !foaf:knows/foaf:knows? ?thing.
+    ?thing rdfs
+  } MINUS {
+    ?thing rdfs:label "剛柔流"@jp
+  }
   FILTER isBlank(?c)
 }
 </textarea></form>
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 0d006dcd34..bbf8a76a0d 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -32,12 +32,15 @@ CodeMirror.defineMode("sparql", function(config) {
                              "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union",
                              "true", "false", "with",
                              "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
-  var operatorChars = /[*+\-<>=&|]/;
+  var operatorChars = /[*+\-<>=&|\^\/!\?]/;
 
   function tokenBase(stream, state) {
     var ch = stream.next();
     curPunc = null;
     if (ch == "$" || ch == "?") {
+      if(ch == "?" && stream.match(/\s/, false)){
+        return "operator";
+      }
       stream.match(/^[\w\d]*/);
       return "variable-2";
     }
@@ -69,10 +72,6 @@ CodeMirror.defineMode("sparql", function(config) {
       stream.eatWhile(/[a-z\d\-]/i);
       return "meta";
     }
-    else if (ch == "^") {
-      stream.eatWhile(/\^/);
-      return "meta";
-    }
     else {
       stream.eatWhile(/[_\w\d]/);
       if (stream.eat(":")) {

From be9e01eedbf33282fe85ebec69d026e12a6e2959 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 22 Nov 2014 09:53:54 +0100
Subject: [PATCH 1712/4742] Mark version 4.8.0

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

diff --git a/AUTHORS b/AUTHORS
index c6e7505f2f..455d7e68a5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,6 +32,7 @@ anaran
 AndersMad
 Anders Nawroth
 Anderson Mesquita
+Andrea G
 Andreas Reischuck
 Andre von Houck
 Andrey Fedorov
@@ -87,6 +88,7 @@ ComFreek
 Curtis Gagliardi
 dagsta
 daines
+Dale Jung
 Dan Heberden
 Daniel, Dao Quang Minh
 Daniele Di Sarli
@@ -145,6 +147,7 @@ Golevka
 Gordon Smith
 Grant Skinner
 greengiant
+Gregory Koberger
 Guillaume Massé
 Guillaume Massé
 Gustavo Rodrigues
@@ -177,6 +180,7 @@ jankeromnes
 Jan Keromnes
 Jan Odvarko
 Jan T. Sott
+Jared Forsyth
 Jason
 Jason Grout
 Jason Johnston
@@ -187,6 +191,7 @@ Jean Boussier
 jeffkenton
 Jeff Pickhardt
 jem (graphite)
+Jeremy Parmenter
 Jochen Berger
 Johan Ask
 John Connor
@@ -230,6 +235,7 @@ LM
 lochel
 Lorenzo Stoakes
 Luciano Longo
+Luke Stagner
 lynschinzer
 Maksim Lin
 Maksym Taran
@@ -289,8 +295,10 @@ nextrevision
 nguillaumin
 Ng Zhi An
 Nicholas Bollweg
+Nicholas Bollweg (Nick)
 Nick Small
 Niels van Groningen
+nightwing
 Nikita Beloglazov
 Nikita Vasilyev
 Nikolay Kostov
@@ -317,6 +325,7 @@ prasanthj
 Prasanth J
 Radek Piórkowski
 Rahul
+Randy Burden
 Randy Edmunds
 Rasmus Erik Voel Jensen
 Richard van der Meer
@@ -336,6 +345,7 @@ satchmorun
 sathyamoorthi
 SCLINIC\jdecker
 Scott Aikin
+Scott Goodhew
 Sebastian Zaha
 shaund
 shaun gilchrist
diff --git a/bower.json b/bower.json
index 2704354d73..bf28a95f87 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.7.1",
+  "version":"4.8.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index a727e45328..bab6255bb1 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.8.0;f=">4.8</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.7.0;f=">4.7</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.6.0;f=">4.6</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.5.0;f=">4.5</option>
diff --git a/doc/manual.html b/doc/manual.html
index 8183fb1b84..34b7e6102a 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 4.7.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.8.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 b50bf30ea8..8b637908a9 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">22-11-2014: <a href="http://codemirror.net/codemirror-4.8.zip">Version 4.8</a>:</p>
+
+  <ul class="rel-note">
+    <li>Built-in support for <a href="manual.html#normalizeKeyMap">multi-stroke key bindings</a>.</li>
+    <li>New method: <a href="manual.html#getLineTokens"><code>getLineTokens</code></a>.</li>
+    <li>New modes: <a href="../mode/dockerfile/index.html">dockerfile</a>, <a href="../mode/idl/index.html">IDL</a>, <a href="../mode/clike/index.html">Objective C</a> (crude).</li>
+    <li>Support styling of gutter backgrounds, allow <code>"gutter"</code> styles in <a href="manual.html#addLineClass"><code>addLineClass</code></a>.</li>
+    <li>Many improvements to the <a href="../demo/vim.html">Vim mode</a>, rewritten visual mode.</li>
+    <li>Improvements to modes: <a href="../mode/gfm/index.html">gfm</a> (strikethrough), <a href="../mode/sparql/index.html">SPARQL</a> (version 1.1 support), and <a href="../mode/stex/index.html">sTeX</a> (no more runaway math mode).
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.7.0...4.8.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">20-10-2014: <a href="http://codemirror.net/codemirror-4.7.zip">Version 4.7</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 03b4fd6793..f2802dcdb0 100644
--- a/index.html
+++ b/index.html
@@ -85,7 +85,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.7</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.8</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9dc7b27e08..e6011f7e66 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7916,7 +7916,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.7.1";
+  CodeMirror.version = "4.8.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index c306fa531b..fe52bcfe8b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.7.1",
+    "version":"4.8.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From aa29a981282a46105930194a2852365c1994c509 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 22 Nov 2014 09:59:37 +0100
Subject: [PATCH 1713/4742] Bump version number post-4.8

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

diff --git a/bower.json b/bower.json
index bf28a95f87..5c1642313b 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.8.0",
+  "version":"4.8.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 34b7e6102a..bf2536da34 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 4.8.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.8.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index e6011f7e66..493d6ae225 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7916,7 +7916,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.8.0";
+  CodeMirror.version = "4.8.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index fe52bcfe8b..380be98384 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.8.0",
+    "version":"4.8.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From f689a9e9d680a26f7680022c5f70a8d1197cd53b Mon Sep 17 00:00:00 2001
From: Jason Barnabe <jason.barnabe@gmail.com>
Date: Sat, 22 Nov 2014 15:04:25 -0600
Subject: [PATCH 1714/4742] [search addon] Do a string search if a bad regexp
 is entered

---
 addon/search/search.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index c25aeda8b2..9596f6941e 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -63,7 +63,12 @@
   function parseQuery(query) {
     var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
     if (isRE) {
-      query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i");
+      try {
+        query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i");
+      } catch (ex) {
+        // Not a regular expression after all, do a string search
+        return query;
+      }
       if (query.test("")) query = /x^/;
     } else if (query == "") {
       query = /x^/;

From 8acbea70088dfa938a46e964608a0457029290a1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 22 Nov 2014 22:27:23 +0100
Subject: [PATCH 1715/4742] [search addon] Simplify control flow

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

diff --git a/addon/search/search.js b/addon/search/search.js
index 9596f6941e..5e7a05e3f3 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -63,16 +63,11 @@
   function parseQuery(query) {
     var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
     if (isRE) {
-      try {
-        query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i");
-      } catch (ex) {
-        // Not a regular expression after all, do a string search
-        return query;
-      }
-      if (query.test("")) query = /x^/;
-    } else if (query == "") {
-      query = /x^/;
+      try { query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i"); }
+      catch(e) {} // Not a regular expression after all, do a string search
     }
+    if (typeof query == "string" ? query == "" : query.test(""))
+      query = /x^/;
     return query;
   }
   var queryDialog =

From dd2b9d86ac30feb74c0bf0b999893382cd9f1e07 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 22 Nov 2014 22:30:21 +0100
Subject: [PATCH 1716/4742] Pass a context (the editor) to keymaps with a call
 method

Issue #2915
---
 lib/codemirror.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 493d6ae225..304ff434fd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3173,11 +3173,11 @@
 
   function lookupKeyForEditor(cm, name, handle) {
     for (var i = 0; i < cm.state.keyMaps.length; i++) {
-      var result = lookupKey(name, cm.state.keyMaps[i], handle);
+      var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
       if (result) return result;
     }
-    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle))
-      || lookupKey(name, cm.options.keyMap, handle);
+    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
+      || lookupKey(name, cm.options.keyMap, handle, cm);
   }
 
   var stopSeq = new Delayed;
@@ -4954,18 +4954,18 @@
     return keymap;
   };
 
-  var lookupKey = CodeMirror.lookupKey = function(key, map, handle) {
+  var lookupKey = CodeMirror.lookupKey = function(key, map, handle, context) {
     map = getKeyMap(map);
-    var found = map.call ? map.call(key) : map[key];
+    var found = map.call ? map.call(key, context) : map[key];
     if (found === false) return "nothing";
     if (found === "...") return "multi";
     if (found != null && handle(found)) return "handled";
 
     if (map.fallthrough) {
       if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
-        return lookupKey(key, map.fallthrough, handle);
+        return lookupKey(key, map.fallthrough, handle, context);
       for (var i = 0; i < map.fallthrough.length; i++) {
-        var result = lookupKey(key, map.fallthrough[i], handle);
+        var result = lookupKey(key, map.fallthrough[i], handle, context);
         if (result) return result;
       }
     }

From c9b932bd27af998f4309768e55230ceab79e330b Mon Sep 17 00:00:00 2001
From: Daniele Di Sarli <danieleds0@gmail.com>
Date: Wed, 19 Nov 2014 10:41:32 +0100
Subject: [PATCH 1717/4742] [shell mode] Add folding helper reference

---
 mode/shell/shell.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 8e31f6f30b..a684e8c233 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -129,7 +129,8 @@ CodeMirror.defineMode('shell', function() {
     token: function(stream, state) {
       return tokenize(stream, state);
     },
-    lineComment: '#'
+    lineComment: '#',
+    fold: "brace"
   };
 });
 

From 184b5f1d19e65eb0fe4bd620458ca116c1965af0 Mon Sep 17 00:00:00 2001
From: Scott Goodhew <sgoodhew@atlassian.com>
Date: Thu, 13 Nov 2014 11:13:07 +1100
Subject: [PATCH 1718/4742] [dialog addon] Ensure that enter presses can be
 preventDefault-ed

When closeOnEnter is disabled the enter event never gets default
prevented this causes issues for IE9/10, this way implementors can
optionally preventDefault if they want
---
 addon/dialog/dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 5a88d99e64..e0e8ad4eb7 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -73,7 +73,7 @@
           CodeMirror.e_stop(e);
           close();
         }
-        if (e.keyCode == 13) callback(inp.value);
+        if (e.keyCode == 13) callback(inp.value, e);
       });
 
       if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);

From 6ef6ef99a78f5f4678024c86e80ab9bed801cc8d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Nov 2014 10:47:25 +0100
Subject: [PATCH 1719/4742] Make sure scrollPosIntoView always returns a coords
 object

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 304ff434fd..b398518c80 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3750,8 +3750,9 @@
         setScrollLeft(cm, scrollPos.scrollLeft);
         if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
       }
-      if (!changed) return coords;
+      if (!changed) break;
     }
+    return coords;
   }
 
   // Scroll a given set of coordinates into view (immediately).

From 8b24724babfaaeda851205f4b02da32cfc1bbf56 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Nov 2014 10:48:02 +0100
Subject: [PATCH 1720/4742] Never render tokens larger than 50k chararcters

Webkit can't deal with them.

Issue #2945
---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b398518c80..a1470ac5c2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5897,8 +5897,11 @@
         if (mName) style = "m-" + (style ? mName + " " + style : mName);
       }
       if (!flattenSpans || curStyle != style) {
-        if (curStart < stream.start) f(stream.start, curStyle);
-        curStart = stream.start; curStyle = style;
+        while (curStart < stream.start) {
+          curStart = Math.min(stream.start, curStart + 50000);
+          f(curStart, curStyle);
+        }
+        curStyle = style;
       }
       stream.start = stream.pos;
     }

From 6b7bc72b11ebcae061dc400093567708fbc59edb Mon Sep 17 00:00:00 2001
From: Will Binns-Smith <wbinnssmith@atlassian.com>
Date: Mon, 24 Nov 2014 16:12:46 -0800
Subject: [PATCH 1721/4742] [meta addon] Add Embedded Ruby (erb) as a
 htmlembedded mode

The mime type is currently accounted for in the htmlembedded definition, but erb
is not listed in the `mode/meta.js` index.
---
 mode/meta.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/meta.js b/mode/meta.js
index 945b9b565b..d9e63d55e2 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -34,6 +34,7 @@
     {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
     {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
+    {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
     {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
     {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},

From 4f6ffd6d3991d8c250cf250885180ab1b6bccdfa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 26 Nov 2014 23:10:58 +0100
Subject: [PATCH 1722/4742] [real-world uses] Add JSER

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 8a87a0485b..39c8e7e03d 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -96,6 +96,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>
       <li><a href="http://jqfundamentals.com/">jQuery fundamentals</a> (interactive tutorial)</li>
       <li><a href="http://jsbin.com">jsbin.com</a> (JS playground)</li>
+      <li><a href="http://tool.jser.com/preprocessor">JSER preprocessor</a></li>
       <li><a href="https://github.com/kucherenko/jscpd">jscpd</a> (code duplication detector)</li>
       <li><a href="http://jsfiddle.com">jsfiddle.com</a> (another JS playground)</li>
       <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>

From 4d8c0cb5d2a95fb7a03fdc93b54aef8c78b15549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?= <gaitan@gmail.com>
Date: Wed, 26 Nov 2014 16:22:39 -0300
Subject: [PATCH 1723/4742] [real-world uses] Added Waliki

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 39c8e7e03d..a9fc3b884c 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -151,6 +151,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://uicod.com/">uiCod</a> (animation demo gallery and sharing)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
       <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a> (code viewer)</li>
+      <li><a href="https://github.com/mgaitan/waliki">Waliki</a> (wiki engine)</li>
       <li><a href="http://wamer.net/">Wamer</a> (web application builder)</li>
       <li><a href="https://github.com/brettz9/webappfind">webappfind</a> (windows file bindings for webapps)</li>
       <li><a href="http://www.webglacademy.com/">WebGL academy</a> (learning WebGL)</li>

From e0326500f0e90f481d998632b7ec25268cf04a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Schw=C3=B6rer?= <mr.mosch@gmail.com>
Date: Wed, 26 Nov 2014 14:01:43 +0100
Subject: [PATCH 1724/4742] [markdown mode] Fix bad require call

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 7c87984e2b..8c85b9f20d 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -3,7 +3,7 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror", require("../xml/xml"), require("../meta")));
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../meta"));
   else if (typeof define == "function" && define.amd) // AMD
     define(["../../lib/codemirror", "../xml/xml", "../meta"], mod);
   else // Plain browser env

From b9c4feb11da1b5c1f2550ffee6c31c5bf43e6048 Mon Sep 17 00:00:00 2001
From: Lanfei <CooLanfei@163.com>
Date: Thu, 27 Nov 2014 16:50:56 +0800
Subject: [PATCH 1725/4742] [continuelist addon] Fix a bug in matching ordered
 list

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

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 9ad0a98fa0..ca8d26751a 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -11,9 +11,9 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var listRE = /^(\s*)([> ]+|[*+-]|(\d+)\.)(\s+)/,
-      emptyListRE = /^(\s*)([> ]+|[*+-]|(\d+)\.)(\s*)$/,
-      unorderedBullets = "*+-";
+  var listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)\.)(\s*)/,
+      emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)\.)(\s*)$/,
+      unorderedListRE = /[*+-]\s/;
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
@@ -38,7 +38,7 @@
 
       } else {
         var indent = match[1], after = match[4];
-        var bullet = unorderedBullets.indexOf(match[2]) >= 0 || match[2].indexOf(">") >= 0
+        var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0
           ? match[2]
           : (parseInt(match[3], 10) + 1) + ".";
 

From a69661a4d1ce475e77fe6477cddc25307ffb1220 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Thu, 27 Nov 2014 19:15:44 +0100
Subject: [PATCH 1726/4742] [html-hint addon] Remove executable bit

---
 addon/hint/html-hint.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 addon/hint/html-hint.js

diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
old mode 100755
new mode 100644

From 4b6d57ea50c67c537e2ad5e455d3cdc9b5c27716 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 25 Nov 2014 16:47:51 +0400
Subject: [PATCH 1727/4742] [vim] add support for paragraph text object

---
 keymap/vim.js    | 66 ++++++++++++++++++++++++++++++++++++++----------
 test/vim_test.js | 64 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+), 14 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c5b945cd67..a9e81d874f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1610,20 +1610,8 @@
         return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
       },
       moveByParagraph: function(cm, head, motionArgs) {
-        var line = head.line;
-        var repeat = motionArgs.repeat;
-        var inc = motionArgs.forward ? 1 : -1;
-        for (var i = 0; i < repeat; i++) {
-          if ((!motionArgs.forward && line === cm.firstLine() ) ||
-              (motionArgs.forward && line == cm.lastLine())) {
-            break;
-          }
-          line += inc;
-          while (line !== cm.firstLine() && line != cm.lastLine() && cm.getLine(line)) {
-            line += inc;
-          }
-        }
-        return Pos(line, 0);
+        var dir = motionArgs.forward ? 1 : -1;
+        return findParagraph(cm, head, motionArgs.repeat, dir);
       },
       moveByScroll: function(cm, head, motionArgs, vim) {
         var scrollbox = cm.getScrollInfo();
@@ -1761,6 +1749,8 @@
         } else if (character === 'w') {
           tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
                                                      false /** bigWord */);
+        } else if (character === 'p') {
+          tmp = findParagraph(cm, head, motionArgs.repeat, 0, inclusive);
         } else {
           // No text object defined for this, don't move.
           return null;
@@ -3268,6 +3258,54 @@
       return idx;
     }
 
+    function findParagraph(cm, head, repeat, dir, inclusive) {
+      var line = head.line;
+      var min = cm.firstLine();
+      var max = cm.lastLine();
+      var start, end, i = line;
+      function isEmpty(i) { return !cm.getLine(i); }
+      function isBoundary(i, dir, any) {
+        if (any) { return isEmpty(i) != isEmpty(i + dir); }
+        return !isEmpty(i) && isEmpty(i + dir);
+      }
+      if (dir) {
+        while (min <= i && i <= max && repeat > 0) {
+          if (isBoundary(i, dir)) { repeat--; }
+          i += dir;
+        }
+        return new Pos(i, 0);
+      }
+
+      var vim = cm.state.vim;
+      if (vim.visualMode && isBoundary(line, 1, true)) {
+        var anchor = vim.sel.anchor;
+        if (isBoundary(anchor.line, -1, true)) {
+          if (!inclusive || anchor.line != line) {
+            line += 1;
+          }
+        }
+      }
+      var startState = isEmpty(line);
+      for (i = line; i <= max && repeat; i++) {
+        if (isBoundary(i, 1, true)) {
+          if (!inclusive || isEmpty(i) != startState) {
+            repeat--;
+          }
+        }
+      }
+      end = new Pos(i, 0);
+      // select boundary before paragraph for the last one
+      if (i > max && !startState) { startState = true; }
+      else { inclusive = false; }
+      for (i = line; i > min; i--) {
+        if (!inclusive || isEmpty(i) == startState || i == line) {
+          if (isBoundary(i, -1, true)) { break; }
+        }
+      }
+      start = new Pos(i, 0);
+      return { start: start, end: end };
+    }
+
     // TODO: perhaps this finagling of start and end positions belonds
     // in codmirror/replaceRange?
     function selectCompanionObject(cm, head, symb, inclusive) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 7eb8f6d8f7..2373c0afac 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -502,6 +502,70 @@ 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) {
+  cm.setCursor(10, 0);
+  helpers.doKeys('{');
+  helpers.assertCursorAt(4, 0);
+  helpers.doKeys('{');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('2', '}');
+  helpers.assertCursorAt(7, 0);
+  helpers.doKeys('2', '}');
+  helpers.assertCursorAt(16, 0);
+
+  cm.setCursor(9, 0);
+  helpers.doKeys('}');
+  helpers.assertCursorAt(14, 0);
+
+  cm.setCursor(6, 0);
+  helpers.doKeys('}');
+  helpers.assertCursorAt(7, 0);
+
+  // ip inside empty space
+  cm.setCursor(10, 0);
+  helpers.doKeys('v', 'i', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(12, 0), cm.getCursor('head'));
+  helpers.doKeys('i', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(13, 1), cm.getCursor('head'));
+  helpers.doKeys('2', 'i', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(16, 1), cm.getCursor('head'));
+
+  // TODO: this should switch to visual mode
+  // cm.setCursor(14, 0);
+  // helpers.doKeys('<Esc>', 'v', 'i', 'p');
+  // helpers.assertCursorAt(14, 0);
+
+  cm.setCursor(14, 0);
+  helpers.doKeys('<Esc>', 'V', 'i', 'p');
+  eqPos(Pos(16, 1), cm.getCursor('head'));
+
+  // ap inside empty space
+  cm.setCursor(10, 0);
+  helpers.doKeys('<Esc>', 'v', 'a', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(13, 1), cm.getCursor('head'));
+  helpers.doKeys('a', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(16, 1), cm.getCursor('head'));
+
+  cm.setCursor(13, 0);
+  helpers.doKeys('v', 'a', 'p');
+  eqPos(Pos(13, 0), cm.getCursor('anchor'));
+  eqPos(Pos(14, 0), cm.getCursor('head'));
+
+  cm.setCursor(16, 0);
+  helpers.doKeys('v', 'a', 'p');
+  eqPos(Pos(14, 0), cm.getCursor('anchor'));
+  eqPos(Pos(16, 1), cm.getCursor('head'));
+
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'a', 'p');
+  eqPos(Pos(0, 0), cm.getCursor('anchor'));
+  eqPos(Pos(4, 0), cm.getCursor('head'));
+}, { value: 'a\na\n\n\n\nb\nc\n\n\n\n\n\n\nd\n\ne\nf' });
 
 // Operator tests
 testVim('dl', function(cm, vim, helpers) {

From b8ea5a73c1410d41c7c51a8dab3bfb2ce11cb669 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Nov 2014 17:52:01 +0100
Subject: [PATCH 1728/4742] Make default scroll style for CodeMirror-scroller
 'scroll'

And manually compensate for our own scrollbar sizes.

This way, we're no longer dependent on the size of our scrollbars
being the same as the size of native scrollbars, and can start to
think about custom scrollbars.
---
 demo/resize.html   |  11 +----
 doc/manual.html    |  16 +++----
 lib/codemirror.css |   9 +---
 lib/codemirror.js  | 112 ++++++++++++++++++++++++---------------------
 4 files changed, 70 insertions(+), 78 deletions(-)

diff --git a/demo/resize.html b/demo/resize.html
index 69eae2c39b..1c1ef390ab 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -12,10 +12,6 @@
         border: 1px solid #eee;
         height: auto;
       }
-      .CodeMirror-scroll {
-        overflow-y: hidden;
-        overflow-x: auto;
-      }
     </style>
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
@@ -37,13 +33,10 @@ <h2>Autoresize Demo</h2>
   border: 1px solid #eee;
   height: auto;
 }
-.CodeMirror-scroll {
-  overflow-y: hidden;
-  overflow-x: auto;
-}
 </textarea></form>
 
-<p>By setting a few CSS properties, and giving
+<p>By setting an editor's <code>height</code> style
+to <code>auto</code> and giving
 the <a href="../doc/manual.html#option_viewportMargin"><code>viewportMargin</code></a>
 a value of <code>Infinity</code>, CodeMirror can be made to
 automatically resize to fit its content.</p>
diff --git a/doc/manual.html b/doc/manual.html
index bf2536da34..42fc03ebbf 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -998,16 +998,12 @@ <h2>Customized Styling</h2>
       <dd>The outer element of the editor. This should be used for the
       editor width, height, borders and positioning. Can also be used
       to set styles that should hold for everything inside the editor
-      (such as font and font size), or to set a background.</dd>
-
-      <dt id="class_CodeMirror_scroll"><code><strong>CodeMirror-scroll</strong></code></dt>
-      <dd>Whether the editor scrolls (<code>overflow: auto</code> +
-      fixed height). By default, it does. Setting
-      the <code>CodeMirror</code> class to have <code>height:
-      auto</code> and giving this class <code>overflow-x: auto;
-      overflow-y: hidden;</code> will cause the editor
-      to <a href="../demo/resize.html">resize to fit its
-      content</a>.</dd>
+      (such as font and font size), or to set a background. Setting
+      this class' <code>height</code> style to <code>auto</code> will
+      make the editor <a href="../demo/resize.html">resize to fit its
+      content</a> (it is recommended to also set
+      the <a href="#option_viewportMargin"><code>viewportMargin</code>
+      option</a> to <code>Infinity</code> when doing this.</dd>
 
       <dt id="class_CodeMirror_focused"><code><strong>CodeMirror-focused</strong></code></dt>
       <dd>Whenever the editor is focused, the top element gets this
diff --git a/lib/codemirror.css b/lib/codemirror.css
index e2d4ec2048..5c18db34b4 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -5,10 +5,6 @@
   font-family: monospace;
   height: 300px;
 }
-.CodeMirror-scroll {
-  /* Set scrolling behaviour here */
-  overflow: auto;
-}
 
 /* PADDING */
 
@@ -151,6 +147,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 
 .CodeMirror-scroll {
+  overflow: scroll;
   /* 30px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
   margin-bottom: -30px; margin-right: -30px;
@@ -195,7 +192,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-gutters {
   position: absolute; left: 0; top: 0;
-  padding-bottom: 30px;
   z-index: 3;
 }
 .CodeMirror-gutter {
@@ -203,9 +199,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   height: 100%;
   -moz-box-sizing: content-box;
   box-sizing: content-box;
-  padding-bottom: 30px;
-  margin-bottom: -32px;
   display: inline-block;
+  margin-bottom: -30px;
   /* Hack to make IE7 behave */
   *zoom:1;
   *display:inline;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a1470ac5c2..04192ba95c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -164,7 +164,7 @@
     // Behavior of elts with overflow: auto and padding is
     // inconsistent across browsers. This is used to ensure the
     // scrollable area is big enough.
-    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerCutOff + "px; width: 1px;");
+    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
     // Will contain the gutters, if any.
     d.gutters = elt("div", null, "CodeMirror-gutters");
     d.lineGutter = null;
@@ -202,6 +202,9 @@
     d.lastWrapHeight = d.lastWrapWidth = 0;
     d.updateLineNumbers = null;
 
+    d.nativeBarWidth = d.barHeight = d.barWidth = 0;
+    d.scrollbarsClipped = false;
+
     // Used to only resize the line number gutter when necessary (when
     // the amount of lines crosses a boundary that makes its width change)
     d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
@@ -389,10 +392,6 @@
 
   // SCROLLBARS
 
-  function hScrollbarTakesSpace(cm) {
-    return cm.display.scroller.clientHeight - cm.display.wrapper.clientHeight < scrollerCutOff - 3;
-  }
-
   // Prepare DOM reads needed to update the scrollbars. Done in one
   // shot to minimize update/measure roundtrips.
   function measureForScrollbars(cm) {
@@ -401,22 +400,27 @@
       clientHeight: scroll.clientHeight,
       barHeight: cm.display.scrollbarV.clientHeight,
       scrollWidth: scroll.scrollWidth, clientWidth: scroll.clientWidth,
-      hScrollbarTakesSpace: hScrollbarTakesSpace(cm),
       barWidth: cm.display.scrollbarH.clientWidth,
       docHeight: Math.round(cm.doc.height + paddingVert(cm.display))
     };
   }
 
-  // Re-synchronize the fake scrollbars with the actual size of the
-  // content.
   function updateScrollbars(cm, measure) {
     if (!measure) measure = measureForScrollbars(cm);
+    var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
+    updateScrollbarsInner(cm, measure);
+    // FIXME optimize by somehow detecting when the situation is okay?
+    // (Revisit after implementing custom scrollbars)
+    if (startWidth != cm.display.barWidth || startHeight != cm.display.barHeight)
+      updateScrollbarsInner(cm, measureForScrollbars(cm));
+  }
+
+  // Re-synchronize the fake scrollbars with the actual size of the
+  // content.
+  function updateScrollbarsInner(cm, measure) {
     var d = cm.display, sWidth = scrollbarWidth(d.measure);
-    var scrollHeight = measure.docHeight + scrollerCutOff;
     var needsH = measure.scrollWidth > measure.clientWidth;
-    if (needsH && measure.scrollWidth <= measure.clientWidth + 1 &&
-        sWidth > 0 && !measure.hScrollbarTakesSpace)
-      needsH = false; // (Issue #2562)
+    var scrollHeight = measure.docHeight + scrollGap(cm) + d.barHeight;
     var needsV = scrollHeight > measure.clientHeight;
 
     if (needsV) {
@@ -429,6 +433,8 @@
       d.scrollbarV.style.display = "";
       d.scrollbarV.firstChild.style.height = "0";
     }
+    d.sizer.style.paddingRight = (d.barWidth = needsV ? sWidth : 0) + "px";
+
     if (needsH) {
       d.scrollbarH.style.display = "block";
       d.scrollbarH.style.right = needsV ? sWidth + "px" : "0";
@@ -438,6 +444,8 @@
       d.scrollbarH.style.display = "";
       d.scrollbarH.firstChild.style.width = "0";
     }
+    d.sizer.style.paddingBottom = (d.barHeight = needsH ? sWidth : 0) + "px";
+
     if (needsH && needsV) {
       d.scrollbarFiller.style.display = "block";
       d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = sWidth + "px";
@@ -550,16 +558,28 @@
     this.wrapperHeight = display.wrapper.clientHeight;
     this.wrapperWidth = display.wrapper.clientWidth;
     this.oldViewFrom = display.viewFrom; this.oldViewTo = display.viewTo;
-    this.oldScrollerWidth = display.scroller.clientWidth;
+    this.oldDisplayWidth = displayWidth(cm);
     this.force = force;
     this.dims = getDimensions(cm);
   }
 
+  function maybeClipScrollbars(cm) {
+    var display = cm.display;
+    if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
+      display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
+      display.heightForcer.style.height = scrollGap(cm) + "px";
+      display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
+      display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
+      display.scrollbarsClipped = true;
+    }
+  }
+
   // Does the actual updating of the line display. Bails out
   // (returning false) when there is nothing to be done and forced is
   // false.
   function updateDisplayIfNeeded(cm, update) {
     var display = cm.display, doc = cm.doc;
+
     if (update.editorIsHidden) {
       resetView(cm);
       return false;
@@ -612,9 +632,10 @@
     if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
 
     // Prevent selection and cursors from interfering with the scroll
-    // width.
+    // width and height.
     removeChildren(display.cursorDiv);
     removeChildren(display.selectionDiv);
+    display.heightForcer.style.top = display.gutters.style.height = 0;
 
     if (different) {
       display.lastWrapHeight = update.wrapperHeight;
@@ -630,14 +651,13 @@
   function postUpdateDisplay(cm, update) {
     var force = update.force, viewport = update.viewport;
     for (var first = true;; first = false) {
-      if (first && cm.options.lineWrapping && update.oldScrollerWidth != cm.display.scroller.clientWidth) {
+      if (first && cm.options.lineWrapping && update.oldDisplayWidth != displayWidth(cm)) {
         force = true;
       } else {
         force = false;
         // Clip forced viewport to actual scrollable area.
         if (viewport && viewport.top != null)
-          viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - scrollerCutOff -
-                                    cm.display.scroller.clientHeight, viewport.top)};
+          viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
         // Updated line heights might result in the drawn area not
         // actually covering the viewport. Keep looping until it does.
         update.visible = visibleLines(cm.display, cm.doc, viewport);
@@ -671,16 +691,7 @@
 
   function setDocumentHeight(cm, measure) {
     cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = measure.docHeight + "px";
-    cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight - scrollerCutOff) + "px";
-  }
-
-  function checkForWebkitWidthBug(cm, measure) {
-    // Work around Webkit bug where it sometimes reserves space for a
-    // non-existing phantom scrollbar in the scroller (Issue #2420)
-    if (cm.display.sizer.offsetWidth + cm.display.gutters.offsetWidth < cm.display.scroller.clientWidth - 1) {
-      cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = "0px";
-      cm.display.gutters.style.height = measure.docHeight + "px";
-    }
+    cm.display.gutters.style.height = Math.max(measure.docHeight + scrollGap(cm), measure.clientHeight) + "px";
   }
 
   // Read the actual heights of the rendered lines, and update their
@@ -1498,13 +1509,21 @@
     return data;
   }
 
+  function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; }
+  function displayWidth(cm) {
+    return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth;
+  }
+  function displayHeight(cm) {
+    return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight;
+  }
+
   // Ensure the lineView.wrapping.heights array is populated. This is
   // an array of bottom offsets for the lines that make up a drawn
   // line. When lineWrapping is on, there might be more than one
   // height.
   function ensureLineHeights(cm, lineView, rect) {
     var wrapping = cm.options.lineWrapping;
-    var curWidth = wrapping && cm.display.scroller.clientWidth;
+    var curWidth = wrapping && displayWidth(cm);
     if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
       var heights = lineView.measure.heights = [];
       if (wrapping) {
@@ -2022,6 +2041,7 @@
 
   function endOperation_R1(op) {
     var cm = op.cm, display = cm.display;
+    maybeClipScrollbars(cm);
     if (op.updateMaxLine) findMaxLine(cm);
 
     op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
@@ -2047,8 +2067,9 @@
     // updateDisplay_W2 will use these properties to do the actual resizing
     if (display.maxLineChanged && !cm.options.lineWrapping) {
       op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
-      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo +
-                                  scrollerCutOff - display.scroller.clientWidth);
+      op.barMeasure.scrollWidth =
+        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm));
+      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
     }
 
     if (op.updatedDisplay || op.selectionChanged)
@@ -2081,9 +2102,6 @@
   function endOperation_finish(op) {
     var cm = op.cm, display = cm.display, doc = cm.doc;
 
-    if (op.adjustWidthTo != null && Math.abs(op.barMeasure.scrollWidth - cm.display.scroller.scrollWidth) > 1)
-      updateScrollbars(cm);
-
     if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
 
     // Abort mouse wheel delta measurement, when scrolling explicitly
@@ -2096,7 +2114,7 @@
       display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
     }
     if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-      var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
+      var left = Math.max(0, Math.min(display.scroller.scrollWidth - displayWidth(cm), op.scrollLeft));
       display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
       alignHorizontally(cm);
     }
@@ -2118,16 +2136,6 @@
     if (display.wrapper.offsetHeight)
       doc.scrollTop = cm.display.scroller.scrollTop;
 
-    // Apply workaround for two webkit bugs
-    if (op.updatedDisplay && webkit) {
-      if (cm.options.lineWrapping)
-        checkForWebkitWidthBug(cm, op.barMeasure); // (Issue #2420)
-      if (op.barMeasure.scrollWidth > op.barMeasure.clientWidth &&
-          op.barMeasure.scrollWidth < op.barMeasure.clientWidth + 1 &&
-          !hScrollbarTakesSpace(cm))
-        updateScrollbars(cm); // (Issue #2562)
-    }
-
     // Fire change events, and delayed event handlers
     if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);
@@ -3721,7 +3729,7 @@
     if (doScroll != null && !phantom) {
       var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
                            (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
-                           (coords.bottom - coords.top + scrollerCutOff) + "px; left: " +
+                           (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
                            coords.left + "px; width: 2px;");
       cm.display.lineSpace.appendChild(scrollNode);
       scrollNode.scrollIntoView(doScroll);
@@ -3770,7 +3778,7 @@
     var display = cm.display, snapMargin = textHeight(cm.display);
     if (y1 < 0) y1 = 0;
     var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
-    var screen = display.scroller.clientHeight - scrollerCutOff, result = {};
+    var screen = displayHeight(cm), result = {};
     if (y2 - y1 > screen) y2 = y1 + screen;
     var docBottom = cm.doc.height + paddingVert(display);
     var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
@@ -3782,7 +3790,7 @@
     }
 
     var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
-    var screenw = display.scroller.clientWidth - scrollerCutOff - display.gutters.offsetWidth;
+    var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
     var tooWide = x2 - x1 > screenw;
     if (tooWide) x2 = x1 + screenw;
     if (x1 < 10)
@@ -3791,7 +3799,6 @@
       result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
     else if (x2 > screenw + screenleft - 3)
       result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
-
     return result;
   }
 
@@ -4380,10 +4387,11 @@
       if (y != null) this.curOp.scrollTop = y;
     }),
     getScrollInfo: function() {
-      var scroller = this.display.scroller, co = scrollerCutOff;
+      var scroller = this.display.scroller;
       return {left: scroller.scrollLeft, top: scroller.scrollTop,
-              height: scroller.scrollHeight - co, width: scroller.scrollWidth - co,
-              clientHeight: scroller.clientHeight - co, clientWidth: scroller.clientWidth - co};
+              height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
+              width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
+              clientHeight: displayHeight(this), clientWidth: displayWidth(this)};
     },
 
     scrollIntoView: methodOp(function(range, margin) {
@@ -7282,7 +7290,7 @@
   // MISC UTILITIES
 
   // Number of pixels added to scroller and sizer to hide scrollbar
-  var scrollerCutOff = 30;
+  var scrollerGap = 30;
 
   // Returned or thrown by various protocols to signal 'I'm not
   // handling this'.

From 535bcc30159924cd21354dd861f261d001155859 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Nov 2014 16:42:40 +0100
Subject: [PATCH 1729/4742] Add some scroll model tests

---
 lib/codemirror.css  |   4 --
 lib/codemirror.js   |   7 ++-
 test/index.html     |   1 +
 test/scroll_test.js | 105 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 111 insertions(+), 6 deletions(-)
 create mode 100644 test/scroll_test.js

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 5c18db34b4..f8b89b987e 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -256,10 +256,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-widget {}
 
-.CodeMirror-wrap .CodeMirror-scroll {
-  overflow-x: hidden;
-}
-
 .CodeMirror-measure {
   position: absolute;
   width: 100%;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 04192ba95c..591f992964 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -411,8 +411,11 @@
     updateScrollbarsInner(cm, measure);
     // FIXME optimize by somehow detecting when the situation is okay?
     // (Revisit after implementing custom scrollbars)
-    if (startWidth != cm.display.barWidth || startHeight != cm.display.barHeight)
+    if (startWidth != cm.display.barWidth || startHeight != cm.display.barHeight) {
+      if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
+        updateHeightsInViewport(cm);
       updateScrollbarsInner(cm, measureForScrollbars(cm));
+    }
   }
 
   // Re-synchronize the fake scrollbars with the actual size of the
@@ -2068,7 +2071,7 @@
     if (display.maxLineChanged && !cm.options.lineWrapping) {
       op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
       op.barMeasure.scrollWidth =
-        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm));
+        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
       op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
     }
 
diff --git a/test/index.html b/test/index.html
index 542be6fc5e..89f4e378c3 100644
--- a/test/index.html
+++ b/test/index.html
@@ -76,6 +76,7 @@ <h2>Test Suite</h2>
     <script src="test.js"></script>
     <script src="doc_test.js"></script>
     <script src="multi_test.js"></script>
+    <script src="scroll_test.js"></script>
     <script src="comment_test.js"></script>
     <script src="search_test.js"></script>
     <script src="mode_test.js"></script>
diff --git a/test/scroll_test.js b/test/scroll_test.js
new file mode 100644
index 0000000000..20470028ce
--- /dev/null
+++ b/test/scroll_test.js
@@ -0,0 +1,105 @@
+(function() {
+  "use strict";
+
+  namespace = "scroll_";
+
+  testCM("bars_hidden", function(cm) {
+    for (var i = 0;; i++) {
+      var wrapBox = cm.getWrapperElement().getBoundingClientRect();
+      var scrollBox = cm.getScrollerElement().getBoundingClientRect();
+      is(wrapBox.bottom < scrollBox.bottom - 10);
+      is(wrapBox.right < scrollBox.right - 10);
+      if (i == 1) break;
+      cm.getWrapperElement().style.height = "auto";
+      cm.refresh();
+    }
+  });
+  
+  function barH(cm) { return byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0]; }
+  function barV(cm) { return byClassName(cm.getWrapperElement(), "CodeMirror-vscrollbar")[0]; }
+
+  function displayBottom(cm, scrollbar) {
+    if (scrollbar)
+      return barH(cm).getBoundingClientRect().top;
+    else
+      return cm.getWrapperElement().getBoundingClientRect().bottom - 1;
+  }
+
+  function displayRight(cm, scrollbar) {
+    if (scrollbar)
+      return barV(cm).getBoundingClientRect().left;
+    else
+      return cm.getWrapperElement().getBoundingClientRect().right - 1;
+  }
+
+  function testMovedownFixed(cm, hScroll) {
+    cm.setSize("100px", "100px");
+    if (hScroll) cm.setValue(new Array(100).join("x"));
+    var bottom = displayBottom(cm, hScroll);
+    for (var i = 0; i < 30; i++) {
+      cm.replaceSelection("x\n");
+      var cursorBottom = cm.cursorCoords(null, "window").bottom;
+      is(cursorBottom <= bottom);
+    }
+    is(cursorBottom >= bottom - 5);
+  }
+
+  testCM("movedown_fixed", function(cm) {testMovedownFixed(cm, false);});
+  testCM("movedown_hscroll_fixed", function(cm) {testMovedownFixed(cm, true);});
+
+  function testMovedownResize(cm, hScroll) {
+    cm.getWrapperElement().style.height = "auto";
+    if (hScroll) cm.setValue(new Array(100).join("x"));
+    cm.refresh();
+    for (var i = 0; i < 30; i++) {
+      cm.replaceSelection("x\n");
+      var bottom = displayBottom(cm, hScroll);
+      var cursorBottom = cm.cursorCoords(null, "window").bottom;
+      is(cursorBottom <= bottom);
+      is(cursorBottom >= bottom - 5);
+    }
+  }
+
+  testCM("movedown_resize", function(cm) {testMovedownResize(cm, false);});
+  testCM("movedown_hscroll_resize", function(cm) {testMovedownResize(cm, true);});
+
+  function testMoveright(cm, wrap, scroll) {
+    cm.setSize("100px", "100px");
+    if (wrap) cm.setOption("lineWrapping", true);
+    if (scroll) {
+      cm.setValue("\n" + new Array(100).join("x\n"));
+      cm.setCursor(Pos(0, 0));
+    }
+    var right = displayRight(cm, scroll);
+    for (var i = 0; i < 10; i++) {
+      cm.replaceSelection("xxxxxxxxxx");
+      var cursorRight = cm.cursorCoords(null, "window").right;
+      is(cursorRight < right);
+    }
+    if (!wrap) is(cursorRight > right - 20);
+  }
+
+  testCM("moveright", function(cm) {testMoveright(cm, false, false);});
+  testCM("moveright_wrap", function(cm) {testMoveright(cm, true, false);});
+  testCM("moveright_scroll", function(cm) {testMoveright(cm, false, true);});
+  testCM("moveright_scroll_wrap", function(cm) {testMoveright(cm, true, true);});
+
+  testCM("suddenly_wide", function(cm) {
+    addDoc(cm, 100, 100);
+    cm.replaceSelection(new Array(600).join("l ") + "\n");
+    cm.execCommand("goLineUp");
+    cm.execCommand("goLineEnd");
+    is(barH(cm).scrollLeft > cm.getScrollerElement().scrollLeft - 1);
+  });
+
+  testCM("wrap_changes_height", function(cm) {
+    var line = new Array(20).join("a ") + "\n";
+    cm.setValue(new Array(20).join(line));
+    var box = cm.getWrapperElement().getBoundingClientRect();
+    cm.setSize(cm.cursorCoords(Pos(0), "window").right - box.left + 2,
+               cm.cursorCoords(Pos(19, 0), "window").bottom - box.top + 2);
+    cm.setCursor(Pos(19, 0));
+    cm.replaceSelection("\n");
+    is(cm.cursorCoords(null, "window").bottom < displayBottom(cm, false));
+  }, {lineWrapping: true});
+})();

From 292050451a9ebed4c7d6e61554509203604f650e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Nov 2014 18:05:03 +0100
Subject: [PATCH 1730/4742] Add the scrollbarStyle option

Implements a pluggable scrollbar model. Interface not documented yet,
but quite simple (see forthcoming simplescrollbars addon)
---
 doc/manual.html   |   8 ++
 lib/codemirror.js | 253 ++++++++++++++++++++++++++++------------------
 2 files changed, 165 insertions(+), 96 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 42fc03ebbf..3d5ad6e692 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -318,6 +318,14 @@ <h2>Configuration</h2>
       horizontally (false) or whether it stays fixed during horizontal
       scrolling (true, the default).</dd>
 
+      <dt id="option_scrollbarStyle"><code><strong>scrollbarStyle</strong>: string</code></dt>
+      <dd>Chooses a scrollbar implementation. The default
+      is <code>"native"</code>, showing native scrollbars. The core
+      library also provides the <code>"null"</code> style, which
+      completely hides the
+      scrollbars. <a href="addon_simplescrollbars">Addons</a> can
+      implement additional scrollbar models.</dd>
+
       <dt id="option_coverGutterNextToScrollbar"><code><strong>coverGutterNextToScrollbar</strong>: boolean</code></dt>
       <dd>When <a href="#option_fixedGutter"><code>fixedGutter</code></a>
       is on, and there is a horizontal scrollbar, by default the
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 591f992964..cee9abccdd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -77,6 +77,7 @@
     if (options.lineWrapping)
       this.display.wrapper.className += " CodeMirror-wrap";
     if (options.autofocus && !mobile) focusInput(this);
+    initScrollbars(this);
 
     this.state = {
       keyMaps: [],  // stores maps added by addKeyMap
@@ -137,14 +138,13 @@
 
     // Wraps and hides input textarea
     d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The fake scrollbar elements.
-    d.scrollbarH = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
-    d.scrollbarV = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
     // Covers bottom-right square when both scrollbars are present.
     d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
+    d.scrollbarFiller.setAttribute("not-content", "true");
     // Covers bottom of gutter when coverGutterNextToScrollbar is on
     // and h scrollbar is present.
     d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
+    d.gutterFiller.setAttribute("not-content", "true");
     // Will contain the actual code, positioned to cover the viewport.
     d.lineDiv = elt("div", null, "CodeMirror-code");
     // Elements are added to these to represent selection and cursors.
@@ -172,8 +172,7 @@
     d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
     d.scroller.setAttribute("tabIndex", "-1");
     // The element in which the editor lives.
-    d.wrapper = elt("div", [d.inputDiv, d.scrollbarH, d.scrollbarV,
-                            d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
+    d.wrapper = elt("div", [d.inputDiv, d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
 
     // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
     if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
@@ -182,8 +181,6 @@
     if (!webkit) d.scroller.draggable = true;
     // Needed to handle Tab key in KHTML
     if (khtml) { d.inputDiv.style.height = "1px"; d.inputDiv.style.position = "absolute"; }
-    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    if (ie && ie_version < 8) d.scrollbarH.style.minHeight = d.scrollbarV.style.minWidth = "18px";
 
     if (place) {
       if (place.appendChild) place.appendChild(d.wrapper);
@@ -339,7 +336,6 @@
   function updateGutterSpace(cm) {
     var width = cm.display.gutters.offsetWidth;
     cm.display.sizer.style.marginLeft = width + "px";
-    cm.display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0;
   }
 
   // Compute the character length of a line, taking into account
@@ -395,83 +391,163 @@
   // Prepare DOM reads needed to update the scrollbars. Done in one
   // shot to minimize update/measure roundtrips.
   function measureForScrollbars(cm) {
-    var scroll = cm.display.scroller;
+    var d = cm.display, gutterW = d.gutters.offsetWidth;
+    var docH = Math.round(cm.doc.height + paddingVert(cm.display));
     return {
-      clientHeight: scroll.clientHeight,
-      barHeight: cm.display.scrollbarV.clientHeight,
-      scrollWidth: scroll.scrollWidth, clientWidth: scroll.clientWidth,
-      barWidth: cm.display.scrollbarH.clientWidth,
-      docHeight: Math.round(cm.doc.height + paddingVert(cm.display))
+      clientHeight: d.scroller.clientHeight,
+      viewHeight: d.wrapper.clientHeight,
+      scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
+      viewWidth: d.wrapper.clientWidth,
+      barLeft: cm.options.fixedGutter ? gutterW : 0,
+      docHeight: docH,
+      scrollHeight: docH + scrollGap(cm) + d.barHeight,
+      nativeBarWidth: d.nativeBarWidth,
+      gutterWidth: gutterW
     };
   }
 
+  function NativeScrollbars(place, scroll, cm) {
+    this.cm = cm;
+    var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
+    var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
+    place(vert); place(horiz);
+
+    on(vert, "scroll", function() {
+      if (vert.clientHeight) scroll(vert.scrollTop, "vertical");
+    });
+    on(horiz, "scroll", function() {
+      if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
+    });
+
+    this.checkedOverlay = false;
+    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+    if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
+  }
+
+  NativeScrollbars.prototype = copyObj({
+    update: function(measure) { // FIXME move left positioning into this
+      var needsH = measure.scrollWidth > measure.clientWidth + 1;
+      var needsV = measure.scrollHeight > measure.clientHeight + 1;
+      var sWidth = measure.nativeBarWidth;
+
+      if (needsV) {
+        this.vert.style.display = "block";
+        this.vert.style.bottom = needsH ? sWidth + "px" : "0";
+        var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
+        // A bug in IE8 can cause this value to be negative, so guard it.
+        this.vert.firstChild.style.height =
+          Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
+      } else {
+        this.vert.style.display = "";
+        this.vert.firstChild.style.height = "0";
+      }
+
+      if (needsH) {
+        this.horiz.style.display = "block";
+        this.horiz.style.right = needsV ? sWidth + "px" : "0";
+        this.horiz.style.left = measure.barLeft + "px";
+        var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
+        this.horiz.firstChild.style.width =
+          (measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
+      } else {
+        this.horiz.style.display = "";
+        this.horiz.firstChild.style.width = "0";
+      }
+
+      if (!this.checkedOverlay && measure.clientHeight > 0) {
+        if (sWidth == 0) this.overlayHack();
+        this.checkedOverlay = true;
+      }
+
+      return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
+    },
+    setScrollLeft: function(pos) {
+      if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
+    },
+    setScrollTop: function(pos) {
+      if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
+    },
+    overlayHack: function() {
+      var w = mac && !mac_geMountainLion ? "12px" : "18px";
+      this.horiz.style.minWidth = this.vert.style.minHeight = w;
+      var self = this;
+      var barMouseDown = function(e) {
+        if (e_target(e) != self.vert && e_target(e) != self.horiz)
+          operation(self.cm, onMouseDown)(e);
+      };
+      on(this.vert, "mousedown", barMouseDown);
+      on(this.horiz, "mousedown", barMouseDown);
+    },
+    clear: function() {
+      var parent = this.horiz.parentNode;
+      parent.removeChild(this.horiz);
+      parent.removeChild(this.vert);
+    }
+  }, NativeScrollbars.prototype);
+
+  function NullScrollbars() {}
+
+  NullScrollbars.prototype = copyObj({
+    update: function() { return {bottom: 0, right: 0}; },
+    setScrollLeft: function() {},
+    setScrollTop: function() {},
+    clear: function() {}
+  }, NullScrollbars.prototype);
+
+  CodeMirror.scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
+
+  function initScrollbars(cm) {
+    if (cm.display.scrollbars) {
+      cm.display.scrollbars.clear();
+      if (cm.display.scrollbars.addClass)
+        rmClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+    }
+
+    cm.display.scrollbars = new CodeMirror.scrollbarModel[cm.options.scrollbarStyle](function(node) {
+      cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+      on(node, "mousedown", function() {
+        if (cm.state.focused) setTimeout(bind(focusInput, cm), 0);
+      });
+      node.setAttribute("not-content", "true");
+    }, function(pos, axis) {
+      if (axis == "horizontal") setScrollLeft(cm, pos);
+      else setScrollTop(cm, pos);
+    }, cm);
+    if (cm.display.scrollbars.addClass)
+      addClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+  }
+
   function updateScrollbars(cm, measure) {
     if (!measure) measure = measureForScrollbars(cm);
     var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
     updateScrollbarsInner(cm, measure);
-    // FIXME optimize by somehow detecting when the situation is okay?
-    // (Revisit after implementing custom scrollbars)
-    if (startWidth != cm.display.barWidth || startHeight != cm.display.barHeight) {
+    for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
       if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
         updateHeightsInViewport(cm);
       updateScrollbarsInner(cm, measureForScrollbars(cm));
+      startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
     }
   }
 
   // Re-synchronize the fake scrollbars with the actual size of the
   // content.
   function updateScrollbarsInner(cm, measure) {
-    var d = cm.display, sWidth = scrollbarWidth(d.measure);
-    var needsH = measure.scrollWidth > measure.clientWidth;
-    var scrollHeight = measure.docHeight + scrollGap(cm) + d.barHeight;
-    var needsV = scrollHeight > measure.clientHeight;
-
-    if (needsV) {
-      d.scrollbarV.style.display = "block";
-      d.scrollbarV.style.bottom = needsH ? sWidth + "px" : "0";
-      // A bug in IE8 can cause this value to be negative, so guard it.
-      d.scrollbarV.firstChild.style.height =
-        Math.max(0, scrollHeight - measure.clientHeight + (measure.barHeight || d.scrollbarV.clientHeight)) + "px";
-    } else {
-      d.scrollbarV.style.display = "";
-      d.scrollbarV.firstChild.style.height = "0";
-    }
-    d.sizer.style.paddingRight = (d.barWidth = needsV ? sWidth : 0) + "px";
+    var d = cm.display;
+    var sizes = d.scrollbars.update(measure);
 
-    if (needsH) {
-      d.scrollbarH.style.display = "block";
-      d.scrollbarH.style.right = needsV ? sWidth + "px" : "0";
-      d.scrollbarH.firstChild.style.width =
-        (measure.scrollWidth - measure.clientWidth + (measure.barWidth || d.scrollbarH.clientWidth)) + "px";
-    } else {
-      d.scrollbarH.style.display = "";
-      d.scrollbarH.firstChild.style.width = "0";
-    }
-    d.sizer.style.paddingBottom = (d.barHeight = needsH ? sWidth : 0) + "px";
+    d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
+    d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
 
-    if (needsH && needsV) {
+    if (sizes.right && sizes.bottom) {
       d.scrollbarFiller.style.display = "block";
-      d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = sWidth + "px";
+      d.scrollbarFiller.style.height = sizes.bottom + "px";
+      d.scrollbarFiller.style.width = sizes.right + "px";
     } else d.scrollbarFiller.style.display = "";
-    if (needsH && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
+    if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
       d.gutterFiller.style.display = "block";
-      d.gutterFiller.style.height = sWidth + "px";
-      d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
+      d.gutterFiller.style.height = sizes.bottom + "px";
+      d.gutterFiller.style.width = measure.gutterWidth + "px";
     } else d.gutterFiller.style.display = "";
-
-    if (!cm.state.checkedOverlayScrollbar && measure.clientHeight > 0) {
-      if (sWidth === 0) {
-        var w = mac && !mac_geMountainLion ? "12px" : "18px";
-        d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = w;
-        var barMouseDown = function(e) {
-          if (e_target(e) != d.scrollbarV && e_target(e) != d.scrollbarH)
-            operation(cm, onMouseDown)(e);
-        };
-        on(d.scrollbarV, "mousedown", barMouseDown);
-        on(d.scrollbarH, "mousedown", barMouseDown);
-      }
-      cm.state.checkedOverlayScrollbar = true;
-    }
   }
 
   // Compute the lines that are visible in a given viewport (defaults
@@ -2113,12 +2189,14 @@
 
     // Propagate the scroll position to the actual DOM scroller
     if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
-      var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
-      display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
+      doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
+      display.scrollbars.setScrollTop(doc.scrollTop);
+      display.scroller.scrollTop = doc.scrollTop;
     }
     if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-      var left = Math.max(0, Math.min(display.scroller.scrollWidth - displayWidth(cm), op.scrollLeft));
-      display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
+      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - displayWidth(cm), op.scrollLeft));
+      display.scrollbars.setScrollLeft(doc.scrollLeft);
+      display.scroller.scrollLeft = doc.scrollLeft;
       alignHorizontally(cm);
     }
     // If we need to scroll a specific position into view, do so.
@@ -2563,21 +2641,11 @@
         signal(cm, "scroll", cm);
       }
     });
-    on(d.scrollbarV, "scroll", function() {
-      if (d.scroller.clientHeight) setScrollTop(cm, d.scrollbarV.scrollTop);
-    });
-    on(d.scrollbarH, "scroll", function() {
-      if (d.scroller.clientHeight) setScrollLeft(cm, d.scrollbarH.scrollLeft);
-    });
 
     // Listen to wheel events in order to try and update the viewport on time.
     on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
     on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
 
-    // Prevent clicks in the scrollbars from killing focus
-    function reFocus() { if (cm.state.focused) setTimeout(bind(focusInput, cm), 0); }
-    on(d.scrollbarH, "mousedown", reFocus);
-    on(d.scrollbarV, "mousedown", reFocus);
     // Prevent wrapper from ever scrolling
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
@@ -2670,6 +2738,7 @@
       return;
     // Might be a text scaling operation, clear size caches.
     d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+    d.scrollbarsClipped = false;
     cm.setSize();
   }
 
@@ -2689,11 +2758,8 @@
   // coordinates beyond the right of the text.
   function posFromMouse(cm, e, liberal, forRect) {
     var display = cm.display;
-    if (!liberal) {
-      var target = e_target(e);
-      if (target == display.scrollbarH || target == display.scrollbarV ||
-          target == display.scrollbarFiller || target == display.gutterFiller) return null;
-    }
+    if (!liberal && e_target(e).getAttribute("not-content") == "true") return null;
+
     var x, y, space = display.lineSpace.getBoundingClientRect();
     // Fails unpredictably on IE[67] when mouse is dragged around quickly.
     try { x = e.clientX - space.left; y = e.clientY - space.top; }
@@ -3051,7 +3117,7 @@
     cm.doc.scrollTop = val;
     if (!gecko) updateDisplaySimple(cm, {top: val});
     if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
-    if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;
+    cm.display.scrollbars.setScrollTop(val);
     if (gecko) updateDisplaySimple(cm);
     startWorker(cm, 100);
   }
@@ -3063,7 +3129,7 @@
     cm.doc.scrollLeft = val;
     alignHorizontally(cm);
     if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
-    if (cm.display.scrollbarH.scrollLeft != val) cm.display.scrollbarH.scrollLeft = val;
+    cm.display.scrollbars.setScrollLeft(val);
   }
 
   // Since the delta values reported on mouse wheel events are
@@ -3382,7 +3448,7 @@
     function rehide() {
       display.inputDiv.style.position = "relative";
       display.input.style.cssText = oldCSS;
-      if (ie && ie_version < 9) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos;
+      if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
       slowPoll(cm);
 
       // Try to detect the user choosing select-all
@@ -4536,7 +4602,13 @@
     cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
     cm.refresh();
   }, true);
-  option("coverGutterNextToScrollbar", false, updateScrollbars, true);
+  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true);
+  option("scrollbarStyle", "native", function(cm) {
+    initScrollbars(cm);
+    updateScrollbars(cm);
+    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
+    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
+  }, true);
   option("lineNumbers", false, function(cm) {
     setGuttersForLineNumbers(cm.options);
     guttersChanged(cm);
@@ -7519,7 +7591,6 @@
     on(window, "resize", function() {
       if (resizeTimer == null) resizeTimer = setTimeout(function() {
         resizeTimer = null;
-        knownScrollbarWidth = null;
         forEachCodeMirror(onResize);
       }, 100);
     });
@@ -7540,16 +7611,6 @@
     return "draggable" in div || "dragDrop" in div;
   }();
 
-  var knownScrollbarWidth;
-  function scrollbarWidth(measure) {
-    if (knownScrollbarWidth != null) return knownScrollbarWidth;
-    var test = elt("div", null, null, "width: 50px; height: 50px; overflow-x: scroll");
-    removeChildrenAndAdd(measure, test);
-    if (test.offsetWidth)
-      knownScrollbarWidth = test.offsetHeight - test.clientHeight;
-    return knownScrollbarWidth || 0;
-  }
-
   var zwspSupported;
   function zeroWidthElement(measure) {
     if (zwspSupported == null) {

From bb072fa53463a1a35a9ca1acba6b1716b764a182 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 30 Nov 2014 00:16:00 +0100
Subject: [PATCH 1731/4742] [simplescrollbars addon] Add

---
 addon/scroll/simplescrollbars.css |  66 ++++++++++++++
 addon/scroll/simplescrollbars.js  | 139 ++++++++++++++++++++++++++++++
 demo/simplescrollbars.html        |  82 ++++++++++++++++++
 doc/compress.html                 |   1 +
 doc/manual.html                   |  13 ++-
 index.html                        |   1 +
 6 files changed, 301 insertions(+), 1 deletion(-)
 create mode 100644 addon/scroll/simplescrollbars.css
 create mode 100644 addon/scroll/simplescrollbars.js
 create mode 100644 demo/simplescrollbars.html

diff --git a/addon/scroll/simplescrollbars.css b/addon/scroll/simplescrollbars.css
new file mode 100644
index 0000000000..5eea7aa1b3
--- /dev/null
+++ b/addon/scroll/simplescrollbars.css
@@ -0,0 +1,66 @@
+.CodeMirror-simplescroll-horizontal div, .CodeMirror-simplescroll-vertical div {
+  position: absolute;
+  background: #ccc;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  border: 1px solid #bbb;
+  border-radius: 2px;
+}
+
+.CodeMirror-simplescroll-horizontal, .CodeMirror-simplescroll-vertical {
+  position: absolute;
+  z-index: 6;
+  background: #eee;
+}
+
+.CodeMirror-simplescroll-horizontal {
+  bottom: 0; left: 0;
+  height: 8px;
+}
+.CodeMirror-simplescroll-horizontal div {
+  bottom: 0;
+  height: 100%;
+}
+
+.CodeMirror-simplescroll-vertical {
+  right: 0; top: 0;
+  width: 8px;
+}
+.CodeMirror-simplescroll-vertical div {
+  right: 0;
+  width: 100%;
+}
+
+
+.CodeMirror-overlayscroll .CodeMirror-scrollbar-filler, .CodeMirror-overlayscroll .CodeMirror-gutter-filler {
+  display: none;
+}
+
+.CodeMirror-overlayscroll-horizontal div, .CodeMirror-overlayscroll-vertical div {
+  position: absolute;
+  background: #bcd;
+  border-radius: 3px;
+}
+
+.CodeMirror-overlayscroll-horizontal, .CodeMirror-overlayscroll-vertical {
+  position: absolute;
+  z-index: 6;
+}
+
+.CodeMirror-overlayscroll-horizontal {
+  bottom: 0; left: 0;
+  height: 6px;
+}
+.CodeMirror-overlayscroll-horizontal div {
+  bottom: 0;
+  height: 100%;
+}
+
+.CodeMirror-overlayscroll-vertical {
+  right: 0; top: 0;
+  width: 6px;
+}
+.CodeMirror-overlayscroll-vertical div {
+  right: 0;
+  width: 100%;
+}
diff --git a/addon/scroll/simplescrollbars.js b/addon/scroll/simplescrollbars.js
new file mode 100644
index 0000000000..739aa7beb4
--- /dev/null
+++ b/addon/scroll/simplescrollbars.js
@@ -0,0 +1,139 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function Bar(cls, orientation, scroll) {
+    this.orientation = orientation;
+    this.scroll = scroll;
+    this.screen = this.total = this.size = 1;
+    this.pos = 0;
+
+    this.node = document.createElement("div");
+    this.node.className = cls + "-" + orientation;
+    this.inner = this.node.appendChild(document.createElement("div"));
+
+    var self = this;
+    CodeMirror.on(this.inner, "mousedown", function(e) {
+      if (e.which != 1) return;
+      CodeMirror.e_preventDefault(e);
+      var axis = self.orientation == "horizontal" ? "pageX" : "pageY";
+      var start = e[axis], startpos = self.pos;
+      function move(e) {
+        if (e.which != 1) {
+          CodeMirror.off(document, "mousemove", move);
+          return;
+        }
+        self.moveTo(startpos + (e[axis] - start) * (self.total / self.size));
+      }
+      CodeMirror.on(document, "mousemove", move);
+    });
+
+    CodeMirror.on(this.node, "click", function(e) {
+      CodeMirror.e_preventDefault(e);
+      var innerBox = self.inner.getBoundingClientRect(), where;
+      if (self.orientation == "horizontal")
+        where = e.clientX < innerBox.left ? -1 : e.clientX > innerBox.right ? 1 : 0;
+      else
+        where = e.clientY < innerBox.top ? -1 : e.clientY > innerBox.bottom ? 1 : 0;
+      self.moveTo(self.pos + where * self.screen);
+    });
+
+    function onWheel(e) {
+      var moved = CodeMirror.wheelEventPixels(e)[self.orientation == "horizontal" ? "x" : "y"];
+      var oldPos = self.pos;
+      self.moveTo(self.pos + moved);
+      if (self.pos != oldPos) CodeMirror.e_preventDefault(e);
+    }
+    CodeMirror.on(this.node, "mousewheel", onWheel);
+    CodeMirror.on(this.node, "DOMMouseScroll", onWheel);
+  }
+
+  Bar.prototype.moveTo = function(pos, update) {
+    if (pos < 0) pos = 0;
+    if (pos > this.total - this.screen) pos = this.total - this.screen;
+    if (pos == this.pos) return;
+    this.pos = pos;
+    this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
+      (pos * (this.size / this.total)) + "px";
+    if (update !== false) this.scroll(pos, this.orientation);
+  };
+
+  Bar.prototype.update = function(scrollSize, clientSize, barSize) {
+    this.screen = clientSize;
+    this.total = scrollSize;
+    this.size = barSize;
+
+    // FIXME clip to min size?
+    this.inner.style[this.orientation == "horizontal" ? "width" : "height"] =
+      this.screen * (this.size / this.total) + "px";
+    this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
+      this.pos * (this.size / this.total) + "px";
+  };
+
+  function SimpleScrollbars(cls, place, scroll) {
+    this.addClass = cls;
+    this.horiz = new Bar(cls, "horizontal", scroll);
+    place(this.horiz.node);
+    this.vert = new Bar(cls, "vertical", scroll);
+    place(this.vert.node);
+    this.width = null;
+  }
+
+  SimpleScrollbars.prototype.update = function(measure) {
+    if (this.width == null) {
+      var style = window.getComputedStyle ? window.getComputedStyle(this.horiz.node) : this.horiz.node.currentStyle;
+      if (style) this.width = parseInt(style.height);
+    }
+    var width = this.width || 0;
+
+    var needsH = measure.scrollWidth > measure.clientWidth + 1;
+    var needsV = measure.scrollHeight > measure.clientHeight + 1;
+    this.vert.node.style.display = needsV ? "block" : "none";
+    this.horiz.node.style.display = needsH ? "block" : "none";
+
+    if (needsV) {
+      this.vert.update(measure.scrollHeight, measure.clientHeight,
+                       measure.viewHeight - (needsH ? width : 0));
+      this.vert.node.style.display = "block";
+      this.vert.node.style.bottom = needsH ? width + "px" : "0";
+    }
+    if (needsH) {
+      this.horiz.update(measure.scrollWidth, measure.clientWidth,
+                        measure.viewWidth - (needsV ? width : 0) - measure.barLeft);
+      this.horiz.node.style.right = needsV ? width + "px" : "0";
+      this.horiz.node.style.left = measure.barLeft + "px";
+    }
+
+    return {right: needsV ? width : 0, bottom: needsH ? width : 0};
+  };
+
+  SimpleScrollbars.prototype.setScrollTop = function(pos) {
+    this.vert.moveTo(pos, false);
+  };
+
+  SimpleScrollbars.prototype.setScrollLeft = function(pos) {
+    this.horiz.moveTo(pos, false);
+  };
+
+  SimpleScrollbars.prototype.clear = function() {
+    var parent = this.horiz.node.parentNode;
+    parent.removeChild(this.horiz.node);
+    parent.removeChild(this.vert.node);
+  };
+
+  CodeMirror.scrollbarModel.simple = function(place, scroll) {
+    return new SimpleScrollbars("CodeMirror-simplescroll", place, scroll);
+  };
+  CodeMirror.scrollbarModel.overlay = function(place, scroll) {
+    return new SimpleScrollbars("CodeMirror-overlayscroll", place, scroll);
+  };
+});
diff --git a/demo/simplescrollbars.html b/demo/simplescrollbars.html
new file mode 100644
index 0000000000..9d40932649
--- /dev/null
+++ b/demo/simplescrollbars.html
@@ -0,0 +1,82 @@
+<!doctype html>
+
+<title>CodeMirror: Simple Scrollbar Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<link rel="stylesheet" href="../addon/scroll/simplescrollbars.css">
+<script src="../lib/codemirror.js"></script>
+<script src="../mode/markdown/markdown.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<script src="../addon/scroll/simplescrollbars.js"></script>
+
+<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 class=active href="#">Simple Scrollbar</a>
+  </ul>
+</div>
+
+<article>
+<h2>Simple Scrollbar Demo</h2>
+<form><textarea id="code" name="code"># Custom Scrollbars
+
+This is a piece of text that creates scrollbars
+
+Lorem ipsum dolor sit amet, turpis nec facilisis neque vestibulum adipiscing, magna nunc est luctus orci a,
+aliquam duis ad volutpat nostra. Vestibulum ultricies suspendisse commodo volutpat pede sed. Bibendum odio
+dignissim, ad vitae mollis ac sed nibh quis, suspendisse diam, risus quas blandit phasellus luctus nec,
+integer nunc vitae posuere scelerisque. Lobortis quam porta conubia nulla. Et nisl ac, imperdiet vitae ac.
+Parturient sit. Et vestibulum euismod, rutrum nunc libero mauris purus convallis. Cum id adipiscing et eget
+pretium rutrum, ultrices sapien magnis fringilla sit lorem, eu vitae scelerisque ipsum aliquet, magna sed
+fusce vel.
+
+Lectus ultricies libero dolor convallis, sed etiam vel hendrerit egestas viverra, at urna mauris, eget
+vulputate dolor voluptatem, nulla eget sollicitudin. Sed tincidunt, elit sociis. Mattis mi tortor dui id
+sodales mi, maecenas nam fringilla risus turpis mauris praesent, imperdiet maecenas ultrices nonummy tellus
+quis est. Scelerisque nec pharetra quis varius fringilla. Varius vestibulum non dictum pharetra, tincidunt in
+vestibulum iaculis molestie, id condimentum blandit elit urna magna pulvinar, quam suspendisse pellentesque
+donec. Vel amet ad ac. Nec aut viverra, morbi mi neque massa, turpis enim proin. Tellus eu, fermentum velit
+est convallis aliquam velit, rutrum in diam lacus, praesent tempor pellentesque dictum semper augue. Felis
+explicabo massa amet lectus phasellus dolor. Ut lorem quis arcu neque felis ultricies, senectus vitae
+curabitur sed pellentesque et, id sed risus in sed ac accumsan, blandit arcu quam duis nunc.
+
+Sed leo sollicitudin odio vitae, purus sit egestas, justo eros inceptos auctor fermentum lectus. Ligula luctus
+turpis, quod massa vitae elementum orci, nullam fringilla elit tortor. Justo ante tempor amet quam posuere
+volutpat. Facilisis pede erat ut hac ultrices ipsum, wisi duis sit metus. Dolor vitae est sed sed vitae. Sed
+eu ligula, morbi vestibulum nunc nibh velit ut taciti, ligula elit semper sagittis in, auctor arcu vel eget.
+Mauris at vitae nec suspendisse et, aenean proin blandit suscipit. Morbi quam, dolor ultricies. Viverra
+tempus. Suspendisse sit dapibus, ac fuga aenean, magna nisl nonummy augue posuere, dictum ut fuga velit
+parturient augue interdum, mattis sit tellus.
+
+Vehicula commodo tempus curabitur eros, lacinia erat vulputate lorem vel fermentum donec, lectus sed conubia
+id pellentesque. Vel senectus donec pede aliquet dolor sit, nec vivamus justo placerat interdum maecenas,
+sodales euismod. Quis netus sapien amet, vestibulum quam nec amet lacinia, quis aliquet, tempor vivamus tellus
+enim, suscipit quis eleifend. Amet class phasellus orci pretium, risus in nulla. Neque sit ullamcorper,
+ultricies platea id nec suspendisse ac. Et elementum. Dictum nam, ut dui fermentum egestas facilisis elit
+augue, adipiscing donec ipsum erat nam pellentesque convallis, vestibulum vestibulum risus id nulla ut mauris,
+curabitur aute aptent. Ultrices orci wisi dui ipsum praesent, pharetra felis eu quis. Est fringilla etiam,
+maxime sem dapibus et eget, mi enim dignissim nec pretium, augue vehicula, volutpat proin. Et occaecati
+lobortis viverra, cum in sed, vivamus tellus. Libero at malesuada est vivamus leo tortor.
+</textarea></form>
+
+<p>The <a href="../doc/manual.html#addon_simplescrollbars"><code>simplescrollbars</code></a> addon defines two
+styles of non-native scrollbars: <a href="javascript:editor.setOption('scrollbarStyle', 'simple')"><code>"simple"</code></a> and <a href="javascript:editor.setOption('scrollbarStyle', 'overlay')"><code>"overlay"</code></a> (click to try), which can be passed to
+the <a href="../doc/manual.html#option_scrollbarStyle"><code>scrollbarStyle</code></a> option. These implement
+the scrollbar using DOM elements, allowing more control over
+its <a href="../addon/scroll/simplescrollbars.css">appearance</a>.</p>
+
+  <script>
+    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+      lineNumbers: true,
+      scrollbarStyle: "simple"
+    });
+  </script>
+</article>
diff --git a/doc/compress.html b/doc/compress.html
index bab6255bb1..eaa984cced 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -224,6 +224,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/search/searchcursor.js">searchcursor.js</option>
           <option value="http://codemirror.net/addon/hint/show-hint.js">show-hint.js</option>
           <option value="http://codemirror.net/addon/mode/simple.js">simple.js</option>
+          <option value="http://codemirror.net/addon/scroll/simplescrollbars.js">simplescrollbars.js</option>
           <option value="http://codemirror.net/addon/hint/sql-hint.js">sql-hint.js</option>
           <option value="http://codemirror.net/addon/edit/trailingspace.js">trailingspace.js</option>
           <option value="http://codemirror.net/addon/tern/tern.js">tern.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index 3d5ad6e692..d941b1aa00 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -323,7 +323,7 @@ <h2>Configuration</h2>
       is <code>"native"</code>, showing native scrollbars. The core
       library also provides the <code>"null"</code> style, which
       completely hides the
-      scrollbars. <a href="addon_simplescrollbars">Addons</a> can
+      scrollbars. <a href="#addon_simplescrollbars">Addons</a> can
       implement additional scrollbar models.</dd>
 
       <dt id="option_coverGutterNextToScrollbar"><code><strong>coverGutterNextToScrollbar</strong>: boolean</code></dt>
@@ -2664,6 +2664,17 @@ <h2 id="addons">Addons</h2>
       on <a href="../addon/display/fullscreen.css"><code>fullscreen.css</code></a>. <a href="../demo/fullscreen.html">Demo
       here</a>.</dd>
 
+      <dt id="addon_simplescrollbars"><a href="../addon/scroll/simplescrollbars.js"><code>scroll/simplescrollbars.js</code></a></dt>
+      <dd>Defines two additional scrollbar
+      models, <code>"simple"</code> and <code>"overlay"</code>
+      (see <a href="../demo/simplescrollbars.html">demo</a>) that can
+      be selected with
+      the <a href="#option_scrollbarStyle"><code>scrollbarStyle</code></a>
+      option. Depends
+      on <a href="../addon/scroll/simplescrollbars.css"><code>simplescrollbars.css</code></a>,
+      which can be further overridden to style your own
+      scrollbars.</dd>
+
       <dt id="addon_rulers"><a href="../addon/display/rulers.js"><code>display/rulers.js</code></a></dt>
       <dd>Adds a <code>rulers</code> option, which can be used to show
       one or more vertical rulers in the editor. The option, if
diff --git a/index.html b/index.html
index f2802dcdb0..8d30c32169 100644
--- a/index.html
+++ b/index.html
@@ -75,6 +75,7 @@ <h2>This is CodeMirror</h2>
     <option value="demo/tern.html">Tern integration</option>
     <option value="demo/merge.html">Merge/diff interface</option>
     <option value="demo/fullscreen.html">Full-screen editor</option>
+    <option value="demo/simplescrollbars.html">Custom scrollbars</option>
   </select></form>
   <script>
     var editor = CodeMirror.fromTextArea(document.getElementById("demotext"), {

From 8a21751ba0087a529d9349f22407eeb374220f77 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Dec 2014 12:40:14 +0100
Subject: [PATCH 1732/4742] Expose CodeMirror.wheelEventPixels

---
 lib/codemirror.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cee9abccdd..083fd0ab1b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3153,11 +3153,22 @@
   else if (chrome) wheelPixelsPerUnit = -.7;
   else if (safari) wheelPixelsPerUnit = -1/3;
 
-  function onScrollWheel(cm, e) {
+  var wheelEventDelta = function(e) {
     var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
     if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
     if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
     else if (dy == null) dy = e.wheelDelta;
+    return {x: dx, y: dy};
+  };
+  CodeMirror.wheelEventPixels = function(e) {
+    var delta = wheelEventDelta(e);
+    delta.x *= wheelPixelsPerUnit;
+    delta.y *= wheelPixelsPerUnit;
+    return delta;
+  };
+
+  function onScrollWheel(cm, e) {
+    var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
 
     var display = cm.display, scroll = display.scroller;
     // Quit if there's nothing to scroll here

From 85ed11182238fa227113aa883713a198a7abe695 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Dec 2014 13:32:57 +0100
Subject: [PATCH 1733/4742] Fix bug that allowed visibleLines to return an
 empty viewport

---
 lib/codemirror.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 083fd0ab1b..bc91ee6ccb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -563,12 +563,13 @@
     // forces those lines into the viewport (if possible).
     if (viewport && viewport.ensure) {
       var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
-      if (ensureFrom < from)
-        return {from: ensureFrom,
-                to: lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)};
-      if (Math.min(ensureTo, doc.lastLine()) >= to)
-        return {from: lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight),
-                to: ensureTo};
+      if (ensureFrom < from) {
+        from = ensureFrom;
+        to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
+      } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
+        from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
+        to = ensureTo;
+      }
     }
     return {from: from, to: Math.max(to, from + 1)};
   }

From 7c9b97fc78ee32870ddc16b1416832c71ecd8e4b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Oct 2014 15:12:57 +0100
Subject: [PATCH 1734/4742] Implement annotated scrollbars, rig search addon to
 show them

---
 addon/scroll/annotatescrollbar.js   | 76 ++++++++++++++++++++++++
 addon/search/matchesonscrollbar.css |  8 +++
 addon/search/matchesonscrollbar.js  | 90 +++++++++++++++++++++++++++++
 addon/search/search.js              |  5 ++
 demo/search.html                    |  8 ++-
 doc/manual.html                     | 33 +++++++++++
 6 files changed, 219 insertions(+), 1 deletion(-)
 create mode 100644 addon/scroll/annotatescrollbar.js
 create mode 100644 addon/search/matchesonscrollbar.css
 create mode 100644 addon/search/matchesonscrollbar.js

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
new file mode 100644
index 0000000000..6dfff1a6a4
--- /dev/null
+++ b/addon/scroll/annotatescrollbar.js
@@ -0,0 +1,76 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineExtension("annotateScrollbar", function(className) {
+    return new Annotation(this, className);
+  });
+
+  function Annotation(cm, className) {
+    this.cm = cm;
+    this.className = className;
+    this.annotations = [];
+    this.div = cm.getWrapperElement().appendChild(document.createElement("div"));
+    this.div.style.cssText = "position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none";
+    this.computeScale();
+
+    var self = this;
+    cm.on("refresh", this.resizeHandler = function(){
+      if (self.computeScale()) self.redraw();
+    });
+  }
+
+  Annotation.prototype.computeScale = function() {
+    var cm = this.cm;
+    var hScale = (cm.getWrapperElement().clientHeight - cm.display.barHeight) /
+      cm.heightAtLine(cm.lastLine() + 1, "local");
+    if (hScale != this.hScale) {
+      this.hScale = hScale;
+      return true;
+    }
+  };
+
+  Annotation.prototype.update = function(annotations) {
+    this.annotations = annotations;
+    this.redraw();
+  };
+
+  Annotation.prototype.redraw = function() {
+    var cm = this.cm, hScale = this.hScale;
+    if (!cm.display.barWidth) return;
+
+    var frag = document.createDocumentFragment(), anns = this.annotations;
+    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;
+      while (i < anns.length - 1) {
+        nextTop = cm.charCoords(anns[i + 1].from, "local").top * hScale;
+        if (nextTop > bottom + .9) break;
+        ann = anns[++i];
+        bottom = cm.charCoords(ann.to, "local").bottom * hScale;
+      }
+      var height = Math.max(bottom - top, 3);
+
+      var elt = frag.appendChild(document.createElement("div"));
+      elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth - 1, 2) + "px; top: " + top + "px; height: " + height + "px";
+      elt.className = this.className;
+    }
+    this.div.textContent = "";
+    this.div.appendChild(frag);
+  };
+
+  Annotation.prototype.clear = function() {
+    this.cm.off("refresh", this.resizeHandler);
+    this.div.parentNode.removeChild(this.div);
+  };
+});
diff --git a/addon/search/matchesonscrollbar.css b/addon/search/matchesonscrollbar.css
new file mode 100644
index 0000000000..77932cc908
--- /dev/null
+++ b/addon/search/matchesonscrollbar.css
@@ -0,0 +1,8 @@
+.CodeMirror-search-match {
+  background: gold;
+  border-top: 1px solid orange;
+  border-bottom: 1px solid orange;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  opacity: .5;
+}
diff --git a/addon/search/matchesonscrollbar.js b/addon/search/matchesonscrollbar.js
new file mode 100644
index 0000000000..937d3f786e
--- /dev/null
+++ b/addon/search/matchesonscrollbar.js
@@ -0,0 +1,90 @@
+// 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("./searchcursor"), require("../scroll/annotatescrollbar"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../scroll/annotatescrollbar"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineExtension("showMatchesOnScrollbar", function(query, caseFold, className) {
+    return new SearchAnnotation(this, query, caseFold, className);
+  });
+
+  function SearchAnnotation(cm, query, caseFold, className) {
+    this.cm = cm;
+    this.annotation = cm.annotateScrollbar(className || "CodeMirror-search-match");
+    this.query = query;
+    this.caseFold = caseFold;
+    this.gap = {from: cm.firstLine(), to: cm.lastLine() + 1};
+    this.matches = [];
+    this.update = null;
+
+    this.findMatches();
+    this.annotation.update(this.matches);
+
+    var self = this;
+    cm.on("change", this.changeHandler = function(_cm, change) { self.onChange(change); });
+  }
+
+  var MAX_MATCHES = 1000;
+
+  SearchAnnotation.prototype.findMatches = function() {
+    if (!this.gap) return;
+    for (var i = 0; i < this.matches.length; i++) {
+      var match = this.matches[i];
+      if (match.from.line >= this.gap.to) break;
+      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);
+    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;
+    }
+    this.gap = null;
+  };
+
+  function offsetLine(line, changeStart, sizeChange) {
+    if (line <= changeStart) return line;
+    return Math.max(changeStart, line + sizeChange);
+  }
+
+  SearchAnnotation.prototype.onChange = function(change) {
+    var startLine = change.from.line;
+    var endLine = CodeMirror.changeEnd(change).line;
+    var sizeChange = endLine - change.to.line;
+    if (this.gap) {
+      this.gap.from = Math.min(offsetLine(this.gap.from, startLine, sizeChange), change.from.line);
+      this.gap.to = Math.max(offsetLine(this.gap.to, startLine, sizeChange), change.from.line);
+    } else {
+      this.gap = {from: change.from.line, to: endLine + 1};
+    }
+
+    if (sizeChange) for (var i = 0; i < this.matches.length; i++) {
+      var match = this.matches[i];
+      var newFrom = offsetLine(match.from.line, startLine, sizeChange);
+      if (newFrom != match.from.line) match.from = CodeMirror.Pos(newFrom, match.from.ch);
+      var newTo = offsetLine(match.to.line, startLine, sizeChange);
+      if (newTo != match.to.line) match.to = CodeMirror.Pos(newTo, match.to.ch);
+    }
+    clearTimeout(this.update);
+    var self = this;
+    this.update = setTimeout(function() { self.updateAfterChange(); }, 250);
+  };
+
+  SearchAnnotation.prototype.updateAfterChange = function() {
+    this.findMatches();
+    this.annotation.update(this.matches);
+  };
+
+  SearchAnnotation.prototype.clear = function() {
+    this.cm.off("change", this.changeHandler);
+    this.annotation.clear();
+  };
+});
diff --git a/addon/search/search.js b/addon/search/search.js
index 5e7a05e3f3..0251067a73 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -82,6 +82,10 @@
         cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query));
         state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query));
         cm.addOverlay(state.overlay);
+        if (cm.showMatchesOnScrollbar) {
+          if (state.annotate) { state.annotate.clear(); state.annotate = null; }
+          state.annotate = cm.showMatchesOnScrollbar(state.query, queryCaseInsensitive(state.query));
+        }
         state.posFrom = state.posTo = cm.getCursor();
         findNext(cm, rev);
       });
@@ -103,6 +107,7 @@
     if (!state.query) return;
     state.query = null;
     cm.removeOverlay(state.overlay);
+    if (state.annotate) { state.annotate.clear(); state.annotate = null; }
   });}
 
   var replaceQueryDialog =
diff --git a/demo/search.html b/demo/search.html
index b1a51d94f0..04ba7ac09a 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -6,11 +6,14 @@
 
 <link rel="stylesheet" href="../lib/codemirror.css">
 <link rel="stylesheet" href="../addon/dialog/dialog.css">
+<link rel="stylesheet" href="../addon/search/matchesonscrollbar.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/search/searchcursor.js"></script>
 <script src="../addon/search/search.js"></script>
+<script src="../addon/scroll/annotatescrollbar.js"></script>
+<script src="../addon/search/matchesonscrollbar.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       dt {font-family: monospace; color: #666;}
@@ -66,7 +69,10 @@ <h2>Search/Replace Demo</h2>
 </textarea></form>
 
     <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "text/html", lineNumbers: true});
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+  mode: "text/html",
+  lineNumbers: true
+});
 </script>
 
     <p>Demonstration of primitive search/replace functionality. The
diff --git a/doc/manual.html b/doc/manual.html
index d941b1aa00..32c56c9f49 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2165,6 +2165,28 @@ <h2 id="addons">Addons</h2>
       of <a href="#addon_dialog"><code>openDialog</code></a> when
       available to make prompting for search queries less ugly.</dd>
 
+      <dt id="addon_matchesonscrollbar"><a href="../addon/search/matchesonscrollbar.js"><code>search/matchesonscrollbar.js</code></a></dt>
+      <dd>Adds a <code>showMatchesOnScrollbar</code> method to editor
+      instances, which should be given a query (string or regular
+      expression), optionally a case-fold flag (only applicable for
+      strings), and optionally a class name (defaults
+      to <code>CodeMirror-search-match</code>) as arguments. When
+      called, matches of the given query will be displayed on the
+      editor's vertical scrollbar. The method returns an object with
+      a <code>clear</code> method that can be called to remove the
+      matches. Depends on
+      the <a href="#addon_annotatescrollbar"><code>annotatescrollbar</code></a>
+      addon, and
+      the <a href="../addon/search/matchesonscrollbar.css"><code>matchesonscrollbar.css</code></a>
+      file provides a default (transparent yellowish) definition of
+      the CSS class applied to the matches. Note that the matches are
+      only perfectly aligned if your scrollbar does not have buttons
+      at the top and bottom. You can use
+      the <a href="#addon_simplescrollbars"><code>simplescrollbar</code></a>
+      addon to make sure of this. If this addon is loaded,
+      the <a href="#addon_search"><code>search</code></a> addon will
+      automatically use it.</dd>
+
       <dt id="addon_matchbrackets"><a href="../addon/edit/matchbrackets.js"><code>edit/matchbrackets.js</code></a></dt>
       <dd>Defines an option <code>matchBrackets</code> which, when set
       to true, causes matching brackets to be highlighted whenever the
@@ -2675,6 +2697,17 @@ <h2 id="addons">Addons</h2>
       which can be further overridden to style your own
       scrollbars.</dd>
 
+      <dt id="addon_annotatescrollbar"><a href="../addon/scroll/annotatescrollbar.js"><code>scroll/annotatescrollbar.js</code></a></dt>
+      <dd>Provides functionality for showing markers on the scrollbar
+      to call out certain parts of the document. Adds a
+      method <code>annotateScrollbar</code> to editor instances that
+      can be called, with a CSS class name as argument, to create a
+      set of annotations. The method returns an object
+      whose <code>update</code> method can be called with an array
+      of <code>{from: Pos, to: Pos}</code> objects marking the ranges
+      to be higlighed. To detach the annotations, call the
+      object's <code>clear</code> method.</dd>
+
       <dt id="addon_rulers"><a href="../addon/display/rulers.js"><code>display/rulers.js</code></a></dt>
       <dd>Adds a <code>rulers</code> option, which can be used to show
       one or more vertical rulers in the editor. The option, if

From b6be5c272349ffdad0b91fdd0888ee5ebcf5f993 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Oct 2014 17:15:47 +0100
Subject: [PATCH 1735/4742] [merge addon] Support aligning both panels by
 adding empty space

---
 addon/merge/merge.js | 186 ++++++++++++++++++++++++++++---------------
 lib/codemirror.js    |   1 +
 2 files changed, 124 insertions(+), 63 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index da3ea47ccf..14d06903fe 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -31,6 +31,8 @@
          insert: "CodeMirror-merge-r-inserted",
          del: "CodeMirror-merge-r-deleted",
          connect: "CodeMirror-merge-r-connect"};
+    if (mv.options.connect == "align")
+      this.aligners = [];
   }
 
   DiffView.prototype = {
@@ -81,7 +83,7 @@
         updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
         updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
       }
-      drawConnectors(dv);
+      makeConnections(dv);
     }
     function set(slow) {
       clearTimeout(debounceChange);
@@ -108,10 +110,10 @@
 
   function registerScroll(dv) {
     dv.edit.on("scroll", function() {
-      syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
+      syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
     });
     dv.orig.on("scroll", function() {
-      syncScroll(dv, DIFF_DELETE) && drawConnectors(dv);
+      syncScroll(dv, DIFF_DELETE) && makeConnections(dv);
     });
   }
 
@@ -126,24 +128,29 @@
     // (to prevent feedback loops)
     if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
 
-    var sInfo = editor.getScrollInfo(), halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
-    var mid = editor.lineAtHeight(midY, "local");
-    var around = chunkBoundariesAround(dv.diff, mid, type == DIFF_INSERT);
-    var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
-    var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
-    var ratio = (midY - off.top) / (off.bot - off.top);
-    var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
-
-    var botDist, mix;
-    // Some careful tweaking to make sure no space is left out of view
-    // when scrolling to top or bottom.
-    if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
-      targetPos = targetPos * mix + sInfo.top * (1 - mix);
-    } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
-      var otherInfo = other.getScrollInfo();
-      var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
-      if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
-        targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
+    var sInfo = editor.getScrollInfo();
+    if (dv.mv.options.connect == "align") {
+      targetPos = sInfo.top;
+    } else {
+      var halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
+      var mid = editor.lineAtHeight(midY, "local");
+      var around = chunkBoundariesAround(dv.diff, mid, type == DIFF_INSERT);
+      var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
+      var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
+      var ratio = (midY - off.top) / (off.bot - off.top);
+      var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
+
+      var botDist, mix;
+      // Some careful tweaking to make sure no space is left out of view
+      // when scrolling to top or bottom.
+      if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
+        targetPos = targetPos * mix + sInfo.top * (1 - mix);
+      } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
+        var otherInfo = other.getScrollInfo();
+        var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
+        if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
+          targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
+      }
     }
 
     other.scrollTo(sInfo.left, targetPos);
@@ -161,7 +168,7 @@
 
   function setScrollLock(dv, val, action) {
     dv.lockScroll = val;
-    if (val && action != false) syncScroll(dv, DIFF_INSERT) && drawConnectors(dv);
+    if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
     dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db&nbsp;&nbsp;\u21da";
   }
 
@@ -249,9 +256,20 @@
 
   // Updating the gap between editor and original
 
-  function drawConnectors(dv) {
+  function makeConnections(dv) {
     if (!dv.showDifferences) return;
 
+    var align = dv.mv.options.connect == "align";
+    if (align) {
+      if (!dv.orig.curOp) return dv.orig.operation(function() {
+        makeConnections(dv);
+      });
+      for (var i = 0; i < dv.aligners.length; i++)
+        dv.aligners[i].clear();
+      dv.aligners.length = 0;
+      var extraSpaceAbove = {edit: 0, orig: 0};
+    }
+
     if (dv.svg) {
       clear(dv.svg);
       var w = dv.gap.offsetWidth;
@@ -259,45 +277,82 @@
     }
     if (dv.copyButtons) clear(dv.copyButtons);
 
-    var flip = dv.type == "left";
     var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
     var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
     iterateChunks(dv.diff, function(topOrig, botOrig, topEdit, botEdit) {
-      if (topEdit > vpEdit.to || botEdit < vpEdit.from ||
-          topOrig > vpOrig.to || botOrig < vpOrig.from)
-        return;
-      var topLpx = dv.orig.heightAtLine(topOrig, "local") - sTopOrig, top = topLpx;
-      if (dv.svg) {
-        var topRpx = dv.edit.heightAtLine(topEdit, "local") - sTopEdit;
-        if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
-        var botLpx = dv.orig.heightAtLine(botOrig, "local") - sTopOrig;
-        var botRpx = dv.edit.heightAtLine(botEdit, "local") - sTopEdit;
-        if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
-        var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
-        var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
-        attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
-              "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
-              "class", dv.classes.connect);
-      }
-      if (dv.copyButtons) {
-        var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
-                                                  "CodeMirror-merge-copy"));
-        var editOriginals = dv.mv.options.allowEditingOriginals;
-        copy.title = editOriginals ? "Push to left" : "Revert chunk";
-        copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
-        copy.style.top = top + "px";
-
-        if (editOriginals) {
-          var topReverse = dv.orig.heightAtLine(topEdit, "local") - sTopEdit;
-          var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
-                                                           "CodeMirror-merge-copy-reverse"));
-          copyReverse.title = "Push to right";
-          copyReverse.chunk = {topEdit: topOrig, botEdit: botOrig, topOrig: topEdit, botOrig: botEdit};
-          copyReverse.style.top = topReverse + "px";
-          dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
-        }
+      if (topEdit <= vpEdit.to && botEdit >= vpEdit.from &&
+          topOrig <= vpOrig.to && botOrig >= vpOrig.from)
+        drawConnectorsForChunk(dv, topOrig, botOrig, topEdit, botEdit, sTopOrig, sTopEdit, w);
+      if (align && (topEdit <= vpEdit.to || topOrig <= vpOrig.to)) {
+        var above = (botEdit < vpEdit.from && botOrig < vpOrig.from);
+        alignChunks(dv, topOrig, botOrig, topEdit, botEdit, above && extraSpaceAbove);
       }
     });
+    if (align) {
+      if (extraSpaceAbove.edit)
+        dv.aligners.push(padBelow(dv.edit, 0, extraSpaceAbove.edit));
+      if (extraSpaceAbove.orig)
+        dv.aligners.push(padBelow(dv.orig, 0, extraSpaceAbove.orig));
+    }
+  }
+
+  function drawConnectorsForChunk(dv, topOrig, botOrig, topEdit, botEdit, sTopOrig, sTopEdit, w) {
+    var flip = dv.type == "left";
+    var top = dv.orig.heightAtLine(topOrig, "local") - sTopOrig;
+    if (dv.svg) {
+      var topLpx = top;
+      var topRpx = dv.edit.heightAtLine(topEdit, "local") - sTopEdit;
+      if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
+      var botLpx = dv.orig.heightAtLine(botOrig, "local") - sTopOrig;
+      var botRpx = dv.edit.heightAtLine(botEdit, "local") - sTopEdit;
+      if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
+      var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
+      var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
+      attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
+            "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
+            "class", dv.classes.connect);
+    }
+    if (dv.copyButtons) {
+      var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
+                                                "CodeMirror-merge-copy"));
+      var editOriginals = dv.mv.options.allowEditingOriginals;
+      copy.title = editOriginals ? "Push to left" : "Revert chunk";
+      copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
+      copy.style.top = top + "px";
+
+      if (editOriginals) {
+        var topReverse = dv.orig.heightAtLine(topEdit, "local") - sTopEdit;
+        var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
+                                                         "CodeMirror-merge-copy-reverse"));
+        copyReverse.title = "Push to right";
+        copyReverse.chunk = {topEdit: topOrig, botEdit: botOrig, topOrig: topEdit, botOrig: botEdit};
+        copyReverse.style.top = topReverse + "px";
+        dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
+      }
+    }
+  }
+
+  function alignChunks(dv, topOrig, botOrig, topEdit, botEdit, aboveViewport) {
+    var topOrigPx = dv.orig.heightAtLine(topOrig, "local");
+    var botOrigPx = dv.orig.heightAtLine(botOrig, "local");
+    var topEditPx = dv.edit.heightAtLine(topEdit, "local");
+    var botEditPx = dv.edit.heightAtLine(botEdit, "local");
+    var origH = botOrigPx -topOrigPx, editH = botEditPx - topEditPx;
+    var diff = editH - origH;
+    if (diff > 1) {
+      if (aboveViewport) aboveViewport.orig += diff;
+      else dv.aligners.push(padBelow(dv.orig, botOrig - 1, diff));
+    } else if (diff < -1) {
+      if (aboveViewport) aboveViewport.edit -= diff;
+      else dv.aligners.push(padBelow(dv.edit, botEdit - 1, -diff));
+    }
+    return 0;
+  }
+
+  function padBelow(cm, line, size) {
+    var elt = document.createElement("div");
+    elt.style.height = size + "px"; elt.style.minWidth = "1px";
+    return cm.addLineWidget(line, elt, {height: size});
   }
 
   function copyChunk(dv, to, from, chunk) {
@@ -313,6 +368,9 @@
 
     this.options = options;
     var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
+    if (origLeft && origRight && options.connect == "align")
+      throw new Error("connect: \"align\" is not supported for three-way merge views");
+
     var hasLeft = origLeft != null, hasRight = origRight != null;
     var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
     var wrap = [], left = this.left = null, right = this.right = null;
@@ -345,8 +403,8 @@
     if (right) right.init(rightPane, origRight, options);
 
     var onResize = function() {
-      if (left) drawConnectors(left);
-      if (right) drawConnectors(right);
+      if (left) makeConnections(left);
+      if (right) makeConnections(right);
     };
     CodeMirror.on(window, "resize", onResize);
     var resizeInterval = setInterval(function() {
@@ -374,10 +432,12 @@
       });
       gapElts.unshift(dv.copyButtons);
     }
-    var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
-    if (svg && !svg.createSVGRect) svg = null;
-    dv.svg = svg;
-    if (svg) gapElts.push(svg);
+    if (dv.mv.options.connect != "align") {
+      var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
+      if (svg && !svg.createSVGRect) svg = null;
+      dv.svg = svg;
+      if (svg) gapElts.push(svg);
+    }
 
     return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
   }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index bc91ee6ccb..a581375ea5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5875,6 +5875,7 @@
       if (widget.insertAt == null) widgets.push(widget);
       else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
       widget.line = line;
+      if (options.height != null) widget.height = options.height;
       if (!lineIsHidden(cm.doc, line)) {
         var aboveVisible = heightAtLine(line) < cm.doc.scrollTop;
         updateLineHeight(line, line.height + widgetHeight(widget));

From 5d74cb02c1ed41b1478d40dfc3659e37c4468c42 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 13:34:43 +0100
Subject: [PATCH 1736/4742] [merge addon] Allow collapsing of identical
 stretches of text

Using the collapseIdentical option.
---
 addon/merge/merge.css | 14 ++++++++++++
 addon/merge/merge.js  | 51 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.css b/addon/merge/merge.css
index 5d24b9bb7f..a6a80e43e0 100644
--- a/addon/merge/merge.css
+++ b/addon/merge/merge.css
@@ -96,3 +96,17 @@
 .CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
 .CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
 .CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
+
+.CodeMirror-merge-collapsed-widget:before {
+  content: "(...)";
+}
+.CodeMirror-merge-collapsed-widget {
+  cursor: pointer;
+  color: #88b;
+  background: #eef;
+  border: 1px solid #ddf;
+  font-size: 90%;
+  padding: 0 3px;
+  border-radius: 4px;
+}
+.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 14d06903fe..ed22b60024 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -368,8 +368,12 @@
 
     this.options = options;
     var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
-    if (origLeft && origRight && options.connect == "align")
-      throw new Error("connect: \"align\" is not supported for three-way merge views");
+    if (origLeft && origRight) {
+      if (options.connect == "align")
+        throw new Error("connect: \"align\" is not supported for three-way merge views");
+      if (options.collapseIdentical)
+        throw new Error("collapseIdentical option is not supported for three-way merge views");
+    }
 
     var hasLeft = origLeft != null, hasRight = origRight != null;
     var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
@@ -402,6 +406,9 @@
     if (left) left.init(leftPane, origLeft, options);
     if (right) right.init(rightPane, origRight, options);
 
+    if (options.collapseIdentical)
+      collapseIdenticalStretches(left || right, options.collapseIdentical);
+
     var onResize = function() {
       if (left) makeConnections(left);
       if (right) makeConnections(right);
@@ -549,6 +556,46 @@
     return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
   }
 
+  function collapseSingle(cm, from, to) {
+    cm.addLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
+    var widget = document.createElement("span");
+    widget.className = "CodeMirror-merge-collapsed-widget";
+    widget.title = "Identical text collapsed. Click to expand.";
+    var mark = cm.markText(Pos(from, 0), Pos(to - 1), {
+      inclusiveLeft: true,
+      inclusiveRight: true,
+      replacedWith: widget,
+      clearOnEnter: true
+    });
+    function clear() {
+      mark.clear();
+      cm.removeLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
+    }
+    widget.addEventListener("click", clear);
+    return {mark: mark, clear: clear};
+  }
+
+  function collapseStretch(dv, origStart, editStart, size) {
+    var mOrig = collapseSingle(dv.orig, origStart, origStart + size);
+    var mEdit = collapseSingle(dv.edit, editStart, editStart + size);
+    mOrig.mark.on("clear", function() { mEdit.clear(); });
+    mEdit.mark.on("clear", function() { mOrig.clear(); });
+  }
+
+  function collapseIdenticalStretches(dv, margin) {
+    if (typeof margin != "number") margin = 2;
+    var lastOrig = dv.orig.firstLine(), lastEdit = dv.edit.firstLine();
+    iterateChunks(dv.diff, function(topOrig, botOrig, _topEdit, botEdit) {
+      var identicalSize = topOrig - margin - lastOrig;
+      if (identicalSize > margin)
+        collapseStretch(dv, lastOrig, lastEdit, identicalSize);
+      lastOrig = botOrig + margin; lastEdit = botEdit + margin;
+    });
+    var bottomSize = dv.orig.lastLine() + 1 - lastOrig;
+    if (bottomSize > margin)
+      collapseStretch(dv, lastOrig, lastEdit, bottomSize);
+  }
+
   // General utilities
 
   function elt(tag, content, className, style) {

From 0842639f3ce4ddf2471f3674d7823459737cc9f2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Dec 2014 16:31:16 +0100
Subject: [PATCH 1737/4742] [merge demo] Describe aligning and collapsing
 functionality

---
 demo/merge.html | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/demo/merge.html b/demo/merge.html
index 4517c548ee..dad1952757 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -41,33 +41,41 @@ <h2>merge view demo</h2>
 
 <p>The <a href="../doc/manual.html#addon_merge"><code>merge</code></a>
 addon provides an interface for displaying and merging diffs,
-either <span class=clicky onclick="initUI(2)">two-way</span>
-or <span class=clicky onclick="initUI(3)">three-way</span>. The left
-(or center) pane is editable, and the differences with the other
-pane(s) are <span class=clicky onclick="toggleDifferences()">optionally</span> shown live as you edit it.</p>
+either <span class=clicky onclick="panes = 2; initUI()">two-way</span>
+or <span class=clicky onclick="panes = 3; initUI()">three-way</span>.
+The left (or center) pane is editable, and the differences with the
+other pane(s) are <span class=clicky
+onclick="toggleDifferences()">optionally</span> shown live as you edit
+it. In the two-way configuration, there are also options to pad changed
+sections to <span class=clicky onclick="connect = connect ? null :
+'align'; initUI()">align</span> them, and to <span class=clicky
+onclick="collapse = !collapse; initUI()">collapse</span> unchanged
+stretches of text.</p>
 
 <p>This addon depends on
 the <a href="https://code.google.com/p/google-diff-match-patch/">google-diff-match-patch</a>
 library to compute the diffs.</p>
 
 <script>
-var value, orig1, orig2, dv, hilight= true;
-function initUI(panes) {
+var value, orig1, orig2, dv, panes = 2, highlight = true, connect = null, collapse = false;
+function initUI() {
   if (value == null) return;
   var target = document.getElementById("view");
   target.innerHTML = "";
   dv = CodeMirror.MergeView(target, {
     value: value,
-    origLeft: panes == 3 ? orig1 : null,
+    origLeft: panes == 3 && !collapse && !connect ? orig1 : null,
     orig: orig2,
     lineNumbers: true,
     mode: "text/html",
-    highlightDifferences: hilight
+    highlightDifferences: highlight,
+    connect: connect,
+    collapseIdentical: collapse
   });
 }
 
 function toggleDifferences() {
-  dv.setShowDifferences(hilight = !hilight);
+  dv.setShowDifferences(highlight = !highlight);
 }
 
 window.onload = function() {
@@ -75,7 +83,7 @@ <h2>merge view demo</h2>
   orig1 = value.replace(/\.\.\//g, "codemirror/").replace("yellow", "orange");
   orig2 = value.replace(/\u003cscript/g, "\u003cscript type=text/javascript ")
     .replace("white", "purple;\n      font: comic sans;\n      text-decoration: underline;\n      height: 15em");
-  initUI(2);
+  initUI();
 };
 
 function mergeViewHeight(mergeView) {

From 2ffde7475b4bf5cd298b35b94b77df25c6fe92de Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Dec 2014 16:40:16 +0100
Subject: [PATCH 1738/4742] [merge addon] Properly document

---
 doc/manual.html | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 32c56c9f49..fa54aaf19d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2758,15 +2758,37 @@ <h2 id="addons">Addons</h2>
       constructor takes arguments similar to
       the <a href="#CodeMirror"><code>CodeMirror</code></a>
       constructor, first a node to append the interface to, and then
-      an options object. Two extra optional options are
-      recognized, <code>origLeft</code> and <code>origRight</code>,
-      which may be strings that provide original versions of the
-      document, which will be shown to the left and right of the
-      editor in non-editable CodeMirror instances. The merge interface
-      will highlight changes between the editable document and the
-      original(s), and, unless a <code>revertButtons</code> option
-      of <code>false</code> is given, show buttons that allow the user
-      to revert changes (<a href="../demo/merge.html">demo</a>).</dd>
+      an options object. Options are passed through to the editors
+      inside the view. These extra options are recognized:
+        <dl>
+          <dt><code><strong>origLeft</strong></code> and <code><strong>origRight</strong>: string</code></dt>
+          <dd>If given these provide original versions of the
+          document, which will be shown to the left and right of the
+          editor in non-editable CodeMirror instances. The merge
+          interface will highlight changes between the editable
+          document and the original(s). To create a 2-way (as opposed
+          to 3-way) merge view, provide only one of them.</dd>
+          <dt><code><strong>revertButtons</strong>: boolean</code></dt>
+          <dd>Determines whether buttons that allow the user to revert
+          changes are shown. Defaults to true.</dd>
+          <dt><code><strong>connect</strong>: string</code></dt>
+          <dd>Sets the style used to connect changed chunks of code.
+          By default, connectors are drawn. When this is set
+          to <code>"align"</code>, the smaller chunk is padded to
+          align with the bigger chunk instead.</dd>
+          <dt><code><strong>collapseIdentical</strong>: boolean|number</code></dt>
+          <dd>When true (default is false), stretches of unchanged
+          text will be collapsed. When a number is given, this
+          indicates the amount of lines to leave visible around such
+          stretches (which defaults to 2).</dd>
+          <dt><code><strong>allowEditingOriginals</strong>: boolean</code></dt>
+          <dd>Determines whether the original editor allows editing.
+          Defaults to false.</dd>
+          <dt><code><strong>showDifferences</strong>: boolean</code></dt>
+          <dd>When true (the default), changed pieces of text are
+          highlighted.</dd>
+        </dl>
+        <a href="../demo/merge.html">Demo here</a>.</dd>
 
       <dt id="addon_tern"><a href="../addon/tern/tern.js"><code>tern/tern.js</code></a></dt>
       <dd>Provides integration with

From 7535b720e05b70567f76c67aecf1ade0861eac7a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Dec 2014 17:02:18 +0100
Subject: [PATCH 1739/4742] Fix bug introduced by b6be5c272349ffdad0b9

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a581375ea5..bc91ee6ccb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5875,7 +5875,6 @@
       if (widget.insertAt == null) widgets.push(widget);
       else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
       widget.line = line;
-      if (options.height != null) widget.height = options.height;
       if (!lineIsHidden(cm.doc, line)) {
         var aboveVisible = heightAtLine(line) < cm.doc.scrollTop;
         updateLineHeight(line, line.height + widgetHeight(widget));

From 31f6c927ff4d84665fef2cc14c4d75452eb29f83 Mon Sep 17 00:00:00 2001
From: Anders Nawroth <anders@neotechnology.com>
Date: Fri, 28 Nov 2014 09:12:04 +0100
Subject: [PATCH 1740/4742] Cypher mode: add EXPLAIN and PROFILE keywords.

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

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index a39c227d9c..315778706e 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -62,7 +62,7 @@
     var curPunc;
     var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
     var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]);
-    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
     var operatorChars = /[*+\-<>=&|~%^]/;
 
     return {

From d5d0b701f214ee6226061d5cca7b59f91aed0b38 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sat, 29 Nov 2014 20:43:56 +0100
Subject: [PATCH 1741/4742] [mode/meta.js] Change Markdown name

The gfm mode is for the GitHub flavour.
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index d9e63d55e2..60739e38f7 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -64,7 +64,7 @@
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
     {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
     {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
-    {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
+    {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
     {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"]},

From 3e4c5d21c543500c8a7c526b8eb46f34830dde82 Mon Sep 17 00:00:00 2001
From: Lanfei <CooLanfei@163.com>
Date: Mon, 1 Dec 2014 11:49:14 +0800
Subject: [PATCH 1742/4742] [markdown mode] Fixed a bug in link matching

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 8c85b9f20d..3c80311068 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -396,13 +396,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return image;
     }
 
-    if (ch === '[' && stream.match(/.*\](\(| ?\[)/, false)) {
+    if (ch === '[' && stream.match(/.*\](\(.*\)| ?\[.*\])/, false)) {
       state.linkText = true;
       if (modeCfg.highlightFormatting) state.formatting = "link";
       return getType(state);
     }
 
-    if (ch === ']' && state.linkText) {
+    if (ch === ']' && state.linkText && stream.match(/\(.*\)| ?\[.*\]/, false)) {
       if (modeCfg.highlightFormatting) state.formatting = "link";
       var type = getType(state);
       state.linkText = false;

From 714065559dbf44721f1fa5041dc975a60e014895 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Dec 2014 23:01:15 +0100
Subject: [PATCH 1743/4742] [stex mode] Reposition some else lines to match
 coding style

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

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 4be533c54e..85358b67a6 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -130,8 +130,7 @@
       if (ch == "%") {
         source.skipToEnd();
         return "comment";
-      }
-      else if (ch == '}' || ch == ']') {
+      } else if (ch == '}' || ch == ']') {
         plug = peekCommand(state);
         if (plug) {
           plug.closeBracket(ch);
@@ -145,12 +144,10 @@
         plug = new plug();
         pushCommand(state, plug);
         return "bracket";
-      }
-      else if (/\d/.test(ch)) {
+      } else if (/\d/.test(ch)) {
         source.eatWhile(/[\w.%]/);
         return "atom";
-      }
-      else {
+      } else {
         source.eatWhile(/[\w\-_]/);
         plug = getMostPowerful(state);
         if (plug.name == 'begin') {

From 5e40155fde06ddf4e033662bb55419e8e136a70d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Dec 2014 23:03:23 +0100
Subject: [PATCH 1744/4742] [stex mode] Also reset cmdState on blank line

Issue #2928
Issue #2958
---
 mode/stex/stex.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 85358b67a6..835ed46d1e 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -239,6 +239,7 @@
       },
       blankLine: function(state) {
         state.f = normal;
+        state.cmdState.length = 0;
       },
       lineComment: "%"
     };

From 029285fc719aa309542b5a39c1fe21fc8d942162 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Dec 2014 11:26:46 +0100
Subject: [PATCH 1745/4742] Make sure viewportChange is fired properly

Closes #2955
---
 lib/codemirror.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bc91ee6ccb..e0361b8c42 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -189,6 +189,7 @@
 
     // Current rendered range (may be bigger than the view window).
     d.viewFrom = d.viewTo = doc.first;
+    d.reportedViewFrom = d.reportedViewTo = doc.first;
     // Information about the rendered lines.
     d.view = [];
     // Holds info about a single rendered line when it was rendered
@@ -637,7 +638,6 @@
     this.editorIsHidden = !display.wrapper.offsetWidth;
     this.wrapperHeight = display.wrapper.clientHeight;
     this.wrapperWidth = display.wrapper.clientWidth;
-    this.oldViewFrom = display.viewFrom; this.oldViewTo = display.viewTo;
     this.oldDisplayWidth = displayWidth(cm);
     this.force = force;
     this.dims = getDimensions(cm);
@@ -753,8 +753,10 @@
     }
 
     signalLater(cm, "update", cm);
-    if (cm.display.viewFrom != update.oldViewFrom || cm.display.viewTo != update.oldViewTo)
+    if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
       signalLater(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
+      cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
+    }
   }
 
   function updateDisplaySimple(cm, viewport) {

From bbffbe6d17de3dad56c4317e26a7df4ff5a04df0 Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@gmail.com>
Date: Thu, 27 Nov 2014 22:13:47 -0800
Subject: [PATCH 1746/4742] [dart mode] Add

---
 mode/dart/dart.js    | 59 ++++++++++++++++++++++++++++++++++++
 mode/dart/index.html | 71 ++++++++++++++++++++++++++++++++++++++++++++
 mode/index.html      |  1 +
 mode/meta.js         |  1 +
 4 files changed, 132 insertions(+)
 create mode 100644 mode/dart/dart.js
 create mode 100644 mode/dart/index.html

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
new file mode 100644
index 0000000000..950db8740c
--- /dev/null
+++ b/mode/dart/dart.js
@@ -0,0 +1,59 @@
+// 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("../clike/clike"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../clike/clike"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function def(mimes, mode) {
+    if (typeof mimes == "string") mimes = [mimes];
+    var words = [];
+    function add(obj) {
+      if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop))
+        words.push(prop);
+    }
+    add(mode.keywords);
+    add(mode.builtin);
+    add(mode.atoms);
+    if (words.length) {
+      mode.helperType = mimes[0];
+      CodeMirror.registerHelper("hintWords", mimes[0], words);
+    }
+
+    for (var i = 0; i < mimes.length; ++i)
+      CodeMirror.defineMIME(mimes[i], mode);
+  }
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  def("application/dart", {
+    name: "clike",
+    keywords: words(
+      "this super static final const abstract class extends external factory " +
+      "implements get native operator set typedef with enum throw rethrow " +
+      "assert break case continue default in return new deferred async await " +
+      "try catch finally do else for if switch while import library export " +
+      "part of show hide is"
+    ),
+    multiLineStrings: true,
+    blockKeywords: words("try catch finally do else for if switch while"),
+    builtin: words("void bool num int double dynamic var String"),
+    atoms: words("true false null"),
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      }
+    }
+  });
+});
diff --git a/mode/dart/index.html b/mode/dart/index.html
new file mode 100644
index 0000000000..e79da5a8b0
--- /dev/null
+++ b/mode/dart/index.html
@@ -0,0 +1,71 @@
+<!doctype html>
+
+<title>CodeMirror: Dart 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="../clike/clike.js"></script>
+<script src="dart.js"></script>
+<style>.CodeMirror {border: 1px solid #dee;}</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="#">Dart</a>
+  </ul>
+</div>
+
+<article>
+<h2>Dart mode</h2>
+<form>
+<textarea id="code" name="code">
+import 'dart:math' show Random;
+
+void main() {
+  print(new Die(n: 12).roll());
+}
+
+// Define a class.
+class Die {
+  // Define a class variable.
+  static Random shaker = new Random();
+
+  // Define instance variables.
+  int sides, value;
+
+  // Define a method using shorthand syntax.
+  String toString() => '$value';
+
+  // Define a constructor.
+  Die({int n: 6}) {
+    if (4 <= n && n <= 20) {
+      sides = n;
+    } else {
+      // Support for errors and exceptions.
+      throw new ArgumentError(/* */);
+    }
+  }
+
+  // Define an instance method.
+  int roll() {
+    return value = shaker.nextInt(sides) + 1;
+  }
+}
+</textarea>
+</form>
+
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    mode: "application/dart"
+  });
+</script>
+
+</article>
diff --git a/mode/index.html b/mode/index.html
index 82bf03ae51..bc86610287 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -41,6 +41,7 @@ <h2>Language modes</h2>
       <li><a href="cypher/index.html">Cypher</a></li>
       <li><a href="python/index.html">Cython</a></li>
       <li><a href="d/index.html">D</a></li>
+      <li><a href="dart/index.html">Dart</a></li>
       <li><a href="django/index.html">Django</a> (templating language)</li>
       <li><a href="dockerfile/index.html">Dockerfile</a></li>
       <li><a href="diff/index.html">diff</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 60739e38f7..a07497178e 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -26,6 +26,7 @@
     {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
     {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
     {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
+    {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "clike", ext: ["dart"]},
     {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
     {name: "Django", mime: "text/x-django", mode: "django"},
     {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile"},

From 1d821f88ed89205628813edb424f97ec3946a9a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Dec 2014 11:56:08 +0100
Subject: [PATCH 1747/4742] [dart mode] Simplify, make autoloading work

Issue #2952
---
 doc/compress.html |  1 +
 mode/dart/dart.js | 53 ++++++++++++++++++++---------------------------
 mode/meta.js      |  2 +-
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index eaa984cced..26039c9f05 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -105,6 +105,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/css/css.js">css.js</option>
           <option value="http://codemirror.net/mode/cypher/cypher.js">cypher.js</option>
           <option value="http://codemirror.net/mode/d/d.js">d.js</option>
+          <option value="http://codemirror.net/mode/dart/dart.js">dart.js</option>
           <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
           <option value="http://codemirror.net/mode/django/django.js">django.js</option>
           <option value="http://codemirror.net/mode/dockerfile/dockerfile.js">dockerfile.js</option>
diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 950db8740c..a49e218c3b 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -11,44 +11,28 @@
 })(function(CodeMirror) {
   "use strict";
 
-  function def(mimes, mode) {
-    if (typeof mimes == "string") mimes = [mimes];
-    var words = [];
-    function add(obj) {
-      if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop))
-        words.push(prop);
-    }
-    add(mode.keywords);
-    add(mode.builtin);
-    add(mode.atoms);
-    if (words.length) {
-      mode.helperType = mimes[0];
-      CodeMirror.registerHelper("hintWords", mimes[0], words);
-    }
-
-    for (var i = 0; i < mimes.length; ++i)
-      CodeMirror.defineMIME(mimes[i], mode);
-  }
+  var keywords = ("this super static final const abstract class extends external factory " +
+    "implements get native operator set typedef with enum throw rethrow " +
+    "assert break case continue default in return new deferred async await " +
+    "try catch finally do else for if switch while import library export " +
+    "part of show hide is").split(" ");
+  var blockKeywords = "try catch finally do else for if switch while".split(" ");
+  var atoms = "true false null".split(" ");
+  var builtins = "void bool num int double dynamic var String".split(" ");
 
-  function words(str) {
-    var obj = {}, words = str.split(" ");
+  function set(words) {
+    var obj = {};
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
 
-  def("application/dart", {
+  CodeMirror.defineMIME("application/dart", {
     name: "clike",
-    keywords: words(
-      "this super static final const abstract class extends external factory " +
-      "implements get native operator set typedef with enum throw rethrow " +
-      "assert break case continue default in return new deferred async await " +
-      "try catch finally do else for if switch while import library export " +
-      "part of show hide is"
-    ),
+    keywords: set(keywords),
     multiLineStrings: true,
-    blockKeywords: words("try catch finally do else for if switch while"),
-    builtin: words("void bool num int double dynamic var String"),
-    atoms: words("true false null"),
+    blockKeywords: set(blockKeywords),
+    builtin: set(builtins),
+    atoms: set(atoms),
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);
@@ -56,4 +40,11 @@
       }
     }
   });
+
+  CodeMirror.registerHelper("hintWords", "application/dart", keywords.concat(atoms).concat(builtins));
+
+  // This is needed to make loading through meta.js work.
+  CodeMirror.defineMode("dart", function(conf) {
+    return CodeMirror.getMode(conf, "application/dart");
+  }, "clike");
 });
diff --git a/mode/meta.js b/mode/meta.js
index a07497178e..a9f4c72e09 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -26,7 +26,7 @@
     {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
     {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
     {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
-    {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "clike", ext: ["dart"]},
+    {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "dart", ext: ["dart"]},
     {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
     {name: "Django", mime: "text/x-django", mode: "django"},
     {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile"},

From cb397ba0b1b8ac29104b262fce50d89830fd5fc0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Dec 2014 16:42:41 +0100
Subject: [PATCH 1748/4742] Remove stray FIXME comment

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e0361b8c42..f070d17bc1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -426,7 +426,7 @@
   }
 
   NativeScrollbars.prototype = copyObj({
-    update: function(measure) { // FIXME move left positioning into this
+    update: function(measure) {
       var needsH = measure.scrollWidth > measure.clientWidth + 1;
       var needsV = measure.scrollHeight > measure.clientHeight + 1;
       var sWidth = measure.nativeBarWidth;

From e1a13faef092ae98bc5cca2cbc1136c2577c5585 Mon Sep 17 00:00:00 2001
From: Robert Plummer <RobertLeePlummerJr@Gmail.com>
Date: Mon, 1 Dec 2014 22:13:02 -0500
Subject: [PATCH 1749/4742] [ebnf mode] Add

---
 mode/ebnf/ebnf.js    | 220 +++++++++++++++++++++++++++++++++++++++++++
 mode/ebnf/index.html | 102 ++++++++++++++++++++
 mode/index.html      |   1 +
 3 files changed, 323 insertions(+)
 create mode 100644 mode/ebnf/ebnf.js
 create mode 100644 mode/ebnf/index.html

diff --git a/mode/ebnf/ebnf.js b/mode/ebnf/ebnf.js
new file mode 100644
index 0000000000..6a63697715
--- /dev/null
+++ b/mode/ebnf/ebnf.js
@@ -0,0 +1,220 @@
+// 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("../javascript/javascript"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../javascript/javascript"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("ebnf", function (config) {
+  var commentType = {
+	    slash: 0,
+	    parenthesis: 1
+    },
+    stateType = {
+      comment: 0,
+      _string: 1,
+      characterClass: 2
+    },
+    peek,
+    bracesMode = null;
+
+  if (config.bracesMode) {
+    bracesMode = CodeMirror.getMode(config, config.bracesMode);
+  }
+
+  return {
+    startState: function () {
+      return {
+        stringType: null,
+	      commentType: null,
+        braced: 0,
+        lhs: true,
+        localState: null,
+        stack: [],
+        inDefinition: false
+      };
+    },
+    token: function (stream, state) {
+      if (!stream) return;
+
+      //check for state changes
+      if (state.stack.length === 0) {
+        //strings
+        if ((stream.peek() == '"') || (stream.peek() == "'")) {
+          state.stringType = stream.peek();
+          stream.next(); // Skip quote
+          state.stack.unshift(stateType._string);
+        }
+
+
+        //comments starting with /*
+        else if (stream.match(/^\/\*/)) {
+          state.stack.unshift(stateType.comment);
+          state.commentType = commentType.slash;
+        }
+
+        //comments starting with (*
+        else if (stream.match(/^\(\*/)) {
+          state.stack.unshift(stateType.comment);
+		      state.commentType = commentType.parenthesis;
+	      }
+      }
+
+      //return state
+      //stack has
+      switch (state.stack[0]) {
+        case stateType._string:
+          while (state.stack[0] === stateType._string && !stream.eol()) {
+            if (stream.peek() === state.stringType) {
+              stream.next(); // Skip quote
+              state.stack.shift(); // Clear flag
+            } else if (stream.peek() === '\\') {
+              stream.next();
+              stream.next();
+            } else {
+              stream.match(/^.[^\\\"\']*/);
+            }
+          }
+          return state.lhs ? "property string" : "string"; // Token style
+
+        case stateType.comment:
+          while (state.stack[0] === stateType.comment && !stream.eol()) {
+            if (state.commentType === commentType.slash && stream.match(/\*\//)) {
+              state.stack.shift(); // Clear flag
+              state.commentType = null;
+            } else if (state.commentType === commentType.parenthesis && stream.match(/\*\)/)) {
+              state.stack.shift(); // Clear flag
+              state.commentType = null;
+            } else {
+              stream.match(/^.[^\*]*/);
+            }
+          }
+          return "comment";
+
+        case stateType.characterClass:
+          while (state.stack[0] === stateType.characterClass && !stream.eol()) {
+            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
+              state.stack.shift();
+            }
+          }
+          return 'operator';
+      }
+
+      peek = stream.peek();
+
+      if (bracesMode !== null && (state.braced || peek === '{')) {
+        if (state.localState === null) {
+          state.localState = bracesMode.startState();
+        }
+        var token = bracesMode.token(stream, state.localState),
+          text = stream.current();
+
+        if (!token) {
+          for (var i = 0; i < text.length; i++) {
+            if (text[i] === '{') {
+              if (state.braced === 0) {
+                token = 'matchingbracket';
+              }
+              state.braced++;
+            } else if (text[i] === '}') {
+              state.braced--;
+              if (state.braced === 0) {
+                token = 'matchingbracket';
+              }
+            }
+          }
+        }
+        return token;
+      }
+
+      //no stack
+      switch (peek) {
+        case '[':
+          stream.next();
+          state.stack.unshift(stateType.characterClass);
+          return 'bracket';
+        case ':':
+        case '|':
+        case ';':
+          stream.next();
+          return 'operator';
+        case '%':
+          if (stream.match('%%')) {
+            return 'header';
+          }
+
+          else if (stream.match(/[%][A-Za-z]+/)) {
+            return 'keyword';
+          } else if (stream.match(/[%][}]/)) {
+            return 'matchingbracket';
+          }
+          break;
+        case '/':
+          if (stream.match(/[/][A-Za-z]+/)) {
+            return 'keyword';
+          }
+        case '\\':
+          if (stream.match(/[\][a-z]+/)) {
+            return 'string-2';
+          }
+        case '.':
+          if (stream.match('.')) {
+            return 'atom';
+          }
+        case '*':
+        case '-':
+        case '+':
+        case '^':
+          if (stream.match(peek)) {
+            return 'atom';
+          }
+        case '$':
+          if (stream.match('$$')) {
+            return 'builtin';
+          } else if (stream.match(/[$][0-9]+/)) {
+            return 'variable-3'
+          }
+        case '<':
+          if (stream.match(/<<[a-zA-Z_]+>>/)) {
+            return 'builtin';
+          }
+      }
+
+      if (stream.match(/^\/\//)) {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      else if (stream.match(/return/)) {
+        return 'operator';
+      }
+
+      else if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
+        if (stream.match(/(?=[\(.])/)) {
+          return 'variable';
+        } else if (stream.match(/(?=[\s\n]*[:=])/)) {
+          return 'def';
+        }
+        return 'variable-2';
+      }
+
+      else if (['[', ']', '(', ')'].indexOf(stream.peek()) != -1) {
+        stream.next();
+        return 'bracket';
+      }
+
+      else if (!stream.eatSpace()) {
+        stream.next();
+      }
+      return null;
+    }
+  };
+});
+
+});
diff --git a/mode/ebnf/index.html b/mode/ebnf/index.html
new file mode 100644
index 0000000000..13845629b3
--- /dev/null
+++ b/mode/ebnf/index.html
@@ -0,0 +1,102 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CodeMirror: EBNF 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="../javascript/javascript.js"></script>
+    <script src="ebnf.js"></script>
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+  </head>
+  <body>
+    <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="#">EBNF Mode</a>
+      </ul>
+    </div>
+
+    <article>
+      <h2>EBNF Mode (bracesMode setting = "javascript")</h2>
+      <form><textarea id="code" name="code">
+/* description: Parses end executes mathematical expressions. */
+
+/* lexical grammar */
+%lex
+
+%%
+\s+                   /* skip whitespace */
+[0-9]+("."[0-9]+)?\b  return 'NUMBER';
+"*"                   return '*';
+"/"                   return '/';
+"-"                   return '-';
+"+"                   return '+';
+"^"                   return '^';
+"("                   return '(';
+")"                   return ')';
+"PI"                  return 'PI';
+"E"                   return 'E';
+&lt;&lt;EOF&gt;&gt;               return 'EOF';
+
+/lex
+
+/* operator associations and precedence */
+
+%left '+' '-'
+%left '*' '/'
+%left '^'
+%left UMINUS
+
+%start expressions
+
+%% /* language grammar */
+
+expressions
+: e EOF
+{print($1); return $1;}
+;
+
+e
+: e '+' e
+{$$ = $1+$3;}
+| e '-' e
+{$$ = $1-$3;}
+| e '*' e
+{$$ = $1*$3;}
+| e '/' e
+{$$ = $1/$3;}
+| e '^' e
+{$$ = Math.pow($1, $3);}
+| '-' e %prec UMINUS
+{$$ = -$2;}
+| '(' e ')'
+{$$ = $2;}
+| NUMBER
+{$$ = Number(yytext);}
+| E
+{$$ = Math.E;}
+| PI
+{$$ = Math.PI;}
+;</textarea></form>
+      <script>
+        var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+          mode: {name: "ebnf"},
+          lineNumbers: true,
+          bracesMode: 'javascript'
+        });
+      </script>
+      <h3>The EBNF Mode</h3>
+      <p> Created by <a href="https://github.com/robertleeplummerjr">Robert Plummer</a></p>
+    </article>
+  </body>
+</html>
diff --git a/mode/index.html b/mode/index.html
index bc86610287..53ab942352 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -47,6 +47,7 @@ <h2>Language modes</h2>
       <li><a href="diff/index.html">diff</a></li>
       <li><a href="dtd/index.html">DTD</a></li>
       <li><a href="dylan/index.html">Dylan</a></li>
+      <li><a href="ebnf/index.html">EBNF</a></li>
       <li><a href="ecl/index.html">ECL</a></li>
       <li><a href="eiffel/index.html">Eiffel</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>

From 1e6f259d35004997d88c0cbdfb8ccf528f56c7b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Dec 2014 16:48:46 +0100
Subject: [PATCH 1750/4742] [ebnf mode] Fix coding style, make linter pass

---
 mode/ebnf/ebnf.js | 269 +++++++++++++++++++++-------------------------
 1 file changed, 121 insertions(+), 148 deletions(-)

diff --git a/mode/ebnf/ebnf.js b/mode/ebnf/ebnf.js
index 6a63697715..53cfa0276d 100644
--- a/mode/ebnf/ebnf.js
+++ b/mode/ebnf/ebnf.js
@@ -3,78 +3,62 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../javascript/javascript"));
+    mod(require("../../lib/codemirror"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../javascript/javascript"], mod);
+    define(["../../lib/codemirror"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("ebnf", function (config) {
-  var commentType = {
-	    slash: 0,
-	    parenthesis: 1
-    },
-    stateType = {
-      comment: 0,
-      _string: 1,
-      characterClass: 2
-    },
-    peek,
-    bracesMode = null;
-
-  if (config.bracesMode) {
-    bracesMode = CodeMirror.getMode(config, config.bracesMode);
-  }
-
-  return {
-    startState: function () {
-      return {
-        stringType: null,
-	      commentType: null,
-        braced: 0,
-        lhs: true,
-        localState: null,
-        stack: [],
-        inDefinition: false
-      };
-    },
-    token: function (stream, state) {
-      if (!stream) return;
-
-      //check for state changes
-      if (state.stack.length === 0) {
-        //strings
-        if ((stream.peek() == '"') || (stream.peek() == "'")) {
-          state.stringType = stream.peek();
-          stream.next(); // Skip quote
-          state.stack.unshift(stateType._string);
-        }
-
-
-        //comments starting with /*
-        else if (stream.match(/^\/\*/)) {
-          state.stack.unshift(stateType.comment);
-          state.commentType = commentType.slash;
+  "use strict";
+
+  CodeMirror.defineMode("ebnf", function (config) {
+    var commentType = {slash: 0, parenthesis: 1};
+    var stateType = {comment: 0, _string: 1, characterClass: 2};
+    var bracesMode = null;
+
+    if (config.bracesMode)
+      bracesMode = CodeMirror.getMode(config, config.bracesMode);
+
+    return {
+      startState: function () {
+        return {
+          stringType: null,
+          commentType: null,
+          braced: 0,
+          lhs: true,
+          localState: null,
+          stack: [],
+          inDefinition: false
+        };
+      },
+      token: function (stream, state) {
+        if (!stream) return;
+
+        //check for state changes
+        if (state.stack.length === 0) {
+          //strings
+          if ((stream.peek() == '"') || (stream.peek() == "'")) {
+            state.stringType = stream.peek();
+            stream.next(); // Skip quote
+            state.stack.unshift(stateType._string);
+          } else if (stream.match(/^\/\*/)) { //comments starting with /*
+            state.stack.unshift(stateType.comment);
+            state.commentType = commentType.slash;
+          } else if (stream.match(/^\(\*/)) { //comments starting with (*
+            state.stack.unshift(stateType.comment);
+            state.commentType = commentType.parenthesis;
+          }
         }
 
-        //comments starting with (*
-        else if (stream.match(/^\(\*/)) {
-          state.stack.unshift(stateType.comment);
-		      state.commentType = commentType.parenthesis;
-	      }
-      }
-
-      //return state
-      //stack has
-      switch (state.stack[0]) {
+        //return state
+        //stack has
+        switch (state.stack[0]) {
         case stateType._string:
           while (state.stack[0] === stateType._string && !stream.eol()) {
             if (stream.peek() === state.stringType) {
               stream.next(); // Skip quote
               state.stack.shift(); // Clear flag
-            } else if (stream.peek() === '\\') {
+            } else if (stream.peek() === "\\") {
               stream.next();
               stream.next();
             } else {
@@ -103,118 +87,107 @@ CodeMirror.defineMode("ebnf", function (config) {
               state.stack.shift();
             }
           }
-          return 'operator';
-      }
+          return "operator";
+        }
 
-      peek = stream.peek();
+        var peek = stream.peek();
 
-      if (bracesMode !== null && (state.braced || peek === '{')) {
-        if (state.localState === null) {
-          state.localState = bracesMode.startState();
-        }
-        var token = bracesMode.token(stream, state.localState),
+        if (bracesMode !== null && (state.braced || peek === "{")) {
+          if (state.localState === null)
+            state.localState = bracesMode.startState();
+
+          var token = bracesMode.token(stream, state.localState),
           text = stream.current();
 
-        if (!token) {
-          for (var i = 0; i < text.length; i++) {
-            if (text[i] === '{') {
-              if (state.braced === 0) {
-                token = 'matchingbracket';
-              }
-              state.braced++;
-            } else if (text[i] === '}') {
-              state.braced--;
-              if (state.braced === 0) {
-                token = 'matchingbracket';
+          if (!token) {
+            for (var i = 0; i < text.length; i++) {
+              if (text[i] === "{") {
+                if (state.braced === 0) {
+                  token = "matchingbracket";
+                }
+                state.braced++;
+              } else if (text[i] === "}") {
+                state.braced--;
+                if (state.braced === 0) {
+                  token = "matchingbracket";
+                }
               }
             }
           }
+          return token;
         }
-        return token;
-      }
 
-      //no stack
-      switch (peek) {
-        case '[':
+        //no stack
+        switch (peek) {
+        case "[":
           stream.next();
           state.stack.unshift(stateType.characterClass);
-          return 'bracket';
-        case ':':
-        case '|':
-        case ';':
+          return "bracket";
+        case ":":
+        case "|":
+        case ";":
           stream.next();
-          return 'operator';
-        case '%':
-          if (stream.match('%%')) {
-            return 'header';
-          }
-
-          else if (stream.match(/[%][A-Za-z]+/)) {
-            return 'keyword';
+          return "operator";
+        case "%":
+          if (stream.match("%%")) {
+            return "header";
+          } else if (stream.match(/[%][A-Za-z]+/)) {
+            return "keyword";
           } else if (stream.match(/[%][}]/)) {
-            return 'matchingbracket';
+            return "matchingbracket";
           }
           break;
-        case '/':
-          if (stream.match(/[/][A-Za-z]+/)) {
-            return 'keyword';
-          }
-        case '\\':
+        case "/":
+          if (stream.match(/[\/][A-Za-z]+/)) {
+          return "keyword";
+        }
+        case "\\":
           if (stream.match(/[\][a-z]+/)) {
-            return 'string-2';
+            return "string-2";
           }
-        case '.':
-          if (stream.match('.')) {
-            return 'atom';
+        case ".":
+          if (stream.match(".")) {
+            return "atom";
           }
-        case '*':
-        case '-':
-        case '+':
-        case '^':
+        case "*":
+        case "-":
+        case "+":
+        case "^":
           if (stream.match(peek)) {
-            return 'atom';
+            return "atom";
           }
-        case '$':
-          if (stream.match('$$')) {
-            return 'builtin';
+        case "$":
+          if (stream.match("$$")) {
+            return "builtin";
           } else if (stream.match(/[$][0-9]+/)) {
-            return 'variable-3'
+            return "variable-3";
           }
-        case '<':
+        case "<":
           if (stream.match(/<<[a-zA-Z_]+>>/)) {
-            return 'builtin';
+            return "builtin";
           }
-      }
-
-      if (stream.match(/^\/\//)) {
-        stream.skipToEnd();
-        return "comment";
-      }
-
-      else if (stream.match(/return/)) {
-        return 'operator';
-      }
-
-      else if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
-        if (stream.match(/(?=[\(.])/)) {
-          return 'variable';
-        } else if (stream.match(/(?=[\s\n]*[:=])/)) {
-          return 'def';
         }
-        return 'variable-2';
-      }
 
-      else if (['[', ']', '(', ')'].indexOf(stream.peek()) != -1) {
-        stream.next();
-        return 'bracket';
-      }
-
-      else if (!stream.eatSpace()) {
-        stream.next();
+        if (stream.match(/^\/\//)) {
+          stream.skipToEnd();
+          return "comment";
+        } else if (stream.match(/return/)) {
+          return "operator";
+        } else if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
+          if (stream.match(/(?=[\(.])/)) {
+            return "variable";
+          } else if (stream.match(/(?=[\s\n]*[:=])/)) {
+            return "def";
+          }
+          return "variable-2";
+        } else if (["[", "]", "(", ")"].indexOf(stream.peek()) != -1) {
+          stream.next();
+          return "bracket";
+        } else if (!stream.eatSpace()) {
+          stream.next();
+        }
+        return null;
       }
-      return null;
-    }
-  };
-});
-
+    };
+  });
 });

From 5b471d3b5baded981e0191c47388e8ccdee1a472 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Dec 2014 16:53:34 +0100
Subject: [PATCH 1751/4742] [ebnf mode] Integrate

---
 doc/compress.html | 1 +
 mode/ebnf/ebnf.js | 2 ++
 mode/meta.js      | 1 +
 3 files changed, 4 insertions(+)

diff --git a/doc/compress.html b/doc/compress.html
index 26039c9f05..3e047ca8f5 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -111,6 +111,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/dockerfile/dockerfile.js">dockerfile.js</option>
           <option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
           <option value="http://codemirror.net/mode/dylan/dylan.js">dylan.js</option>
+          <option value="http://codemirror.net/mode/ebnf/ebnf.js">ebnf.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
           <option value="http://codemirror.net/mode/eiffel/eiffel.js">eiffel.js</option>
           <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
diff --git a/mode/ebnf/ebnf.js b/mode/ebnf/ebnf.js
index 53cfa0276d..6b51aba07e 100644
--- a/mode/ebnf/ebnf.js
+++ b/mode/ebnf/ebnf.js
@@ -190,4 +190,6 @@
       }
     };
   });
+
+  CodeMirror.defineMIME("text/x-ebnf", "ebnf");
 });
diff --git a/mode/meta.js b/mode/meta.js
index a9f4c72e09..12332002c0 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -32,6 +32,7 @@
     {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile"},
     {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
     {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
+    {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
     {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
     {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},

From e6c90d52f609e5bdfbed033975af39fa6be18290 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Dec 2014 17:01:21 +0100
Subject: [PATCH 1752/4742] [dockerfile mode] Add note about simplemode
 dependency

Closes #2960
---
 mode/dockerfile/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/dockerfile/index.html b/mode/dockerfile/index.html
index 564f6c52c1..40aa80aadd 100644
--- a/mode/dockerfile/index.html
+++ b/mode/dockerfile/index.html
@@ -66,7 +66,8 @@ <h2>Dockerfile mode</h2>
       });
     </script>
 
-    <p>Dockerfile syntac highlighting for CodeMirror.</p>
+    <p>Dockerfile syntac highlighting for CodeMirror. Depends on
+    the <a href="../../demo/simplemode.html">simplemode</a> addon.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-dockerfile</code></p>
   </article>

From 114b1e465d7d41b391dde0954e780e7521e13f18 Mon Sep 17 00:00:00 2001
From: "Yassin N. Hassan" <ynh@users.noreply.github.com>
Date: Wed, 3 Dec 2014 11:56:55 +0100
Subject: [PATCH 1753/4742] [turtle mode] Add comment syntax

---
 mode/turtle/turtle.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/turtle/turtle.js b/mode/turtle/turtle.js
index a4727ed572..0988f0a442 100644
--- a/mode/turtle/turtle.js
+++ b/mode/turtle/turtle.js
@@ -151,7 +151,9 @@ CodeMirror.defineMode("turtle", function(config) {
         return context.col + (closing ? 0 : 1);
       else
         return context.indent + (closing ? 0 : indentUnit);
-    }
+    },
+
+    lineComment: "#"
   };
 });
 

From 38dffcb342c5bd78c7c9f74428aaf403f2927a67 Mon Sep 17 00:00:00 2001
From: Randall Mason <ClashTheBunny@gmail.com>
Date: Thu, 4 Dec 2014 12:19:08 +0200
Subject: [PATCH 1754/4742] [dockerfile demo] Update spelling syntac -> syntax

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

diff --git a/mode/dockerfile/index.html b/mode/dockerfile/index.html
index 40aa80aadd..a31759bce1 100644
--- a/mode/dockerfile/index.html
+++ b/mode/dockerfile/index.html
@@ -66,7 +66,7 @@ <h2>Dockerfile mode</h2>
       });
     </script>
 
-    <p>Dockerfile syntac highlighting for CodeMirror. Depends on
+    <p>Dockerfile syntax highlighting for CodeMirror. Depends on
     the <a href="../../demo/simplemode.html">simplemode</a> addon.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-dockerfile</code></p>

From 183ebcb75dbb9554ad6c14c47307fdc69d5ac45c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Dec 2014 17:44:45 +0100
Subject: [PATCH 1755/4742] [panel addon] Add

Allows convenient showing of panels (DOM nodes) above or
below an editor, automatically shrinking the editor to make
space.
---
 addon/display/panel.js | 94 ++++++++++++++++++++++++++++++++++++++++++
 demo/panel.html        | 62 ++++++++++++++++++++++++++++
 doc/manual.html        | 13 ++++++
 3 files changed, 169 insertions(+)
 create mode 100644 addon/display/panel.js
 create mode 100644 demo/panel.html

diff --git a/addon/display/panel.js b/addon/display/panel.js
new file mode 100644
index 0000000000..22c0453e8f
--- /dev/null
+++ b/addon/display/panel.js
@@ -0,0 +1,94 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  CodeMirror.defineExtension("addPanel", function(node, options) {
+    if (!this.state.panels) initPanels(this);
+
+    var info = this.state.panels;
+    if (options && options.position == "bottom")
+      info.wrapper.appendChild(node);
+    else
+      info.wrapper.insertBefore(node, info.wrapper.firstChild);
+    var height = (options && options.height) || node.offsetHeight;
+    this._setSize(null, info.heightLeft -= height);
+    info.panels++;
+    return new Panel(this, node, options, height);
+  });
+
+  function Panel(cm, node, options, height) {
+    this.cm = cm;
+    this.node = node;
+    this.options = options;
+    this.height = height;
+    this.cleared = false;
+  }
+
+  Panel.prototype.clear = function() {
+    if (this.cleared) return;
+    this.cleared = true;
+    var info = this.cm.state.panels;
+    this.cm._setSize(null, info.heightLeft += this.height);
+    info.wrapper.removeChild(this.node);
+    if (--info.panels == 0) removePanels(this.cm);
+  };
+
+  Panel.prototype.changed = function(height) {
+    var newHeight = height == null ? this.node.offsetHeight : height;
+    var info = this.cm.state.panels;
+    this.cm._setSize(null, info.height += (newHeight - this.height));
+    this.height = newHeight;
+  };
+
+  function initPanels(cm) {
+    var wrap = cm.getWrapperElement();
+    var style = window.getComputedStyle ? window.getComputedStyle(wrap) : wrap.currentStyle;
+    var height = parseInt(style.height);
+    var info = cm.state.panels = {
+      setHeight: wrap.style.height,
+      heightLeft: height,
+      panels: 0,
+      wrapper: document.createElement("div")
+    };
+    wrap.parentNode.insertBefore(info.wrapper, wrap);
+    var hasFocus = cm.hasFocus();
+    info.wrapper.appendChild(wrap);
+    if (hasFocus) cm.focus();
+
+    cm._setSize = cm.setSize;
+    if (height != null) cm.setSize = function(width, newHeight) {
+      if (newHeight == null) return this._setSize(width, newHeight);
+      info.setHeight = newHeight;
+      if (typeof newHeight != "number") {
+        var px = /^(\d+\.?\d*)px$/.exec(newHeight);
+        if (px) {
+          newHeight = Number(px[1]);
+        } else {
+          info.wrapper.style.height = newHeight;
+          newHeight = info.wrapper.offsetHeight;
+          info.wrapper.style.height = "";
+        }
+      }
+      cm._setSize(width, info.heightLeft += (newHeight - height));
+      height = newHeight;
+    };
+  }
+
+  function removePanels(cm) {
+    var info = cm.state.panels;
+    cm.state.panels = null;
+
+    var wrap = cm.getWrapperElement();
+    info.wrapper.parentNode.replaceChild(wrap, info.wrapper);
+    wrap.style.height = info.setHeight;
+    cm.setSize = cm._setSize;
+    cm.setSize();
+  }
+});
diff --git a/demo/panel.html b/demo/panel.html
new file mode 100644
index 0000000000..4a9a8c2e21
--- /dev/null
+++ b/demo/panel.html
@@ -0,0 +1,62 @@
+<!doctype html>
+
+<title>CodeMirror: Panel Demo</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="../mode/javascript/javascript.js"></script>
+<script src="../addon/display/panel.js"></script>
+<style type="text/css">
+  .border {border-top: 1px solid black; border-bottom: 1px solid black;}
+  .add { background: orange; padding: 1px 3px; color: white !important; border-radius: 4px; }
+</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 class=active href="#">Panel</a>
+  </ul>
+</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);
+editor = CodeMirror.fromTextArea(textarea, {
+  lineNumbers: true
+});
+
+var colors = ["red", "blue", "orange", "purple"], colorIndex = 0;
+function addPanel(where) {
+  var node = document.createElement("div");
+  node.style.cssText = "background: " + colors[colorIndex] +
+    "; border-radius: 5px; padding: 5px 10px";
+  colorIndex = (colorIndex + 1) % colors.length;
+  var close = node.appendChild(document.createElement("span"));
+  close.textContent = "✖ Remove this panel";
+  close.style.cssText = "color: white; cursor: pointer; " +
+    "text-decoration: underline";
+  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>
+
+</article>
diff --git a/doc/manual.html b/doc/manual.html
index fa54aaf19d..c08c52b9b2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2719,6 +2719,19 @@ <h2 id="addons">Addons</h2>
       custom style to a ruler. <a href="../demo/rulers.html">Demo
       here</a>.</dd>
 
+      <dt id="addon_panel"><a href="../addon/display/panel.js"><code>display/panel.js</code></a></dt>
+      <dd>Defines an <code>addPanel</code> method for CodeMirror
+      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
+      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>
+
       <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
       of text. Adds these methods to editor instances:

From 88b1d826db1cc37d22beead44e3c59bcb1d94e22 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Dec 2014 22:27:50 +0100
Subject: [PATCH 1756/4742] [dockerfile mode] Clean up state machine

Issue #2964
---
 mode/dockerfile/dockerfile.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
index bef67696bc..6d51775067 100644
--- a/mode/dockerfile/dockerfile.js
+++ b/mode/dockerfile/dockerfile.js
@@ -24,14 +24,12 @@
       // Block comment: This is a line starting with a comment
       {
         regex: /#.*$/,
-        token: "comment",
-        next: "start"
+        token: "comment"
       },
       // Highlight an instruction without any arguments (for convenience)
       {
         regex: instructionOnlyLine,
-        token: "variable-2",
-        next: "start"
+        token: "variable-2"
       },
       // Highlight an instruction followed by arguments
       {
@@ -39,10 +37,9 @@
         token: ["variable-2", null],
         next: "arguments"
       },
-      // Fail-safe return to start
       {
-        token: null,
-        next: "start"
+        regex: /./,
+        token: null
       }
     ],
     arguments: [
@@ -54,8 +51,7 @@
       },
       {
         regex: /[^#]+\\$/,
-        token: null,
-        next: "arguments"
+        token: null
       },
       {
         // Match everything except for the inline comment

From 4fad3f82c4a40ef91883d04b83f1c1751b6c022a Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 23 Nov 2014 20:08:52 -0500
Subject: [PATCH 1757/4742] [vim] Use keymap binding instead of event handlers

https://github.com/codemirror/CodeMirror/issues/2915
---
 keymap/vim.js | 206 +++++++++++++++++++++++++++-----------------------
 1 file changed, 113 insertions(+), 93 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index a9e81d874f..bcb6b8751d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -77,11 +77,11 @@
     { keys: '<Up>', type: 'keyToKey', toKeys: 'k' },
     { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
     { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
-    { keys: '<BS>', type: 'keyToKey', toKeys: 'h' },
+    { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'},
     { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
-    { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B' },
+    { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B', context: 'normal' },
     { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
-    { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b' },
+    { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b', context: 'normal' },
     { keys: '<C-n>', type: 'keyToKey', toKeys: 'j' },
     { keys: '<C-p>', type: 'keyToKey', toKeys: 'k' },
     { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>' },
@@ -229,55 +229,7 @@
 
   var Pos = CodeMirror.Pos;
 
-  var modifierCodes = [16, 17, 18, 91];
-  var specialKey = {Enter:'CR',Backspace:'BS',Delete:'Del'};
-  var mac = /Mac/.test(navigator.platform);
   var Vim = function() {
-    function lookupKey(e) {
-      var keyCode = e.keyCode;
-      if (modifierCodes.indexOf(keyCode) != -1) { return; }
-      var hasModifier = e.ctrlKey || e.metaKey;
-      var key = CodeMirror.keyNames[keyCode];
-      key = specialKey[key] || key;
-      var name = '';
-      if (e.ctrlKey) { name += 'C-'; }
-      if (e.altKey) { name += 'A-'; }
-      if (mac && e.metaKey || (!hasModifier && e.shiftKey) && key.length < 2) {
-        // Shift key bindings can only specified for special characters.
-        return;
-      } else if (e.shiftKey && !/^[A-Za-z]$/.test(key)) {
-        name += 'S-';
-      }
-      if (key.length == 1) { key = key.toLowerCase(); }
-      name += key;
-      if (name.length > 1) { name = '<' + name + '>'; }
-      return name;
-    }
-    // Keys with modifiers are handled using keydown due to limitations of
-    // keypress event.
-    function handleKeyDown(cm, e) {
-      var name = lookupKey(e);
-      if (!name) { return; }
-
-      CodeMirror.signal(cm, 'vim-keypress', name);
-      if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
-        CodeMirror.e_stop(e);
-      }
-    }
-    // Keys without modifiers are handled using keypress to work best with
-    // non-standard keyboard layouts.
-    function handleKeyPress(cm, e) {
-      var code = e.charCode || e.keyCode;
-      if (e.ctrlKey || e.metaKey || e.altKey ||
-          e.shiftKey && code < 32) { return; }
-      var name = String.fromCharCode(code);
-
-      CodeMirror.signal(cm, 'vim-keypress', name);
-      if (CodeMirror.Vim.handleKey(cm, name, 'user')) {
-        CodeMirror.e_stop(e);
-      }
-    }
-
     function enterVimMode(cm) {
       cm.setOption('disableInput', true);
       cm.setOption('showCursorWhenSelecting', false);
@@ -285,8 +237,6 @@
       cm.on('cursorActivity', onCursorActivity);
       maybeInitVimState(cm);
       CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
-      cm.on('keypress', handleKeyPress);
-      cm.on('keydown', handleKeyDown);
     }
 
     function leaveVimMode(cm) {
@@ -294,8 +244,6 @@
       cm.off('cursorActivity', onCursorActivity);
       CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
       cm.state.vim = null;
-      cm.off('keypress', handleKeyPress);
-      cm.off('keydown', handleKeyDown);
     }
 
     function detachVimMap(cm, next) {
@@ -320,6 +268,60 @@
       else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
         cm.setOption("keyMap", "default");
     });
+
+    function cmKey(key, cm) {
+      if (!cm) { return undefined; }
+      var vimKey = cmKeyToVimKey(key);
+      if (!vimKey) {
+        return false;
+      }
+      var cmd = CodeMirror.Vim.findKey(cm, vimKey);
+      if (typeof cmd == 'function') {
+        CodeMirror.signal(cm, 'vim-keypress', vimKey);
+      }
+      return cmd;
+    }
+
+    var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
+    var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del'};
+    function cmKeyToVimKey(key) {
+      if (key.charAt(0) == '\'') {
+        // Keypress character binding of format "'a'"
+        return key.charAt(1);
+      }
+      var pieces = key.split('-');
+      if (/-$/.test(key)) {
+        // If the - key was typed, split will result in 2 extra empty strings
+        // in the array. Replace them with 1 '-'.
+        pieces.splice(-2, 2, '-');
+      }
+      var lastPiece = pieces[pieces.length - 1];
+      if (pieces.length == 1 && pieces[0].length == 1) {
+        // No-modifier bindings use literal character bindings above. Skip.
+        return false;
+      } else if (pieces.length == 2 && pieces[0] == 'Shift' && lastPiece.length == 1) {
+        // Ignore Shift+char bindings as they should be handled by literal character.
+        return false;
+      }
+      var hasCharacter = false;
+      for (var i = 0; i < pieces.length; i++) {
+        var piece = pieces[i];
+        if (piece in modifiers) { pieces[i] = modifiers[piece]; }
+        else { hasCharacter = true; }
+        if (piece in specialKeys) { pieces[i] = specialKeys[piece]; }
+      }
+      if (!hasCharacter) {
+        // Vim does not support modifier only keys.
+        return false;
+      }
+      // TODO: Current bindings expect the character to be lower case, but
+      // it looks like vim key notation uses upper case.
+      if (isUpperCase(lastPiece)) {
+        pieces[pieces.length - 1] = lastPiece.toLowerCase();
+      }
+      return '<' + pieces.join('-') + '>';
+    }
+
     function getOnPasteFn(cm) {
       var vim = cm.state.vim;
       if (!vim.onPasteFn) {
@@ -629,9 +631,23 @@
         exCommands[name]=func;
         exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
       },
-      // This is the outermost function called by CodeMirror, after keys have
-      // been mapped to their Vim equivalents.
-      handleKey: function(cm, key, origin) {
+      handleKey: function (cm, key, origin) {
+        var command = this.findKey(cm, key, origin);
+        if (typeof command === 'function') {
+          return command();
+        }
+      },
+      /**
+       * This is the outermost function called by CodeMirror, after keys have
+       * been mapped to their Vim equivalents.
+       *
+       * Finds a command based on the key (and cached keys if there is a
+       * multi-key sequence). Returns `undefined` if no key is matched, a noop
+       * function if a partial match is found (multi-key), and a function to
+       * execute the bound command if a a key is matched. The function always
+       * returns true.
+       */
+      findKey: function(cm, key, origin) {
         var vim = maybeInitVimState(cm);
         function handleMacroRecording() {
           var macroModeState = vimGlobalState.macroModeState;
@@ -697,13 +713,7 @@
             cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
           }
           clearInputState(cm);
-          var command = match.command;
-          if (command.type == 'keyToKey') {
-            doKeyToKey(command.toKeys);
-          } else {
-            commandDispatcher.processCommand(cm, vim, command);
-          }
-          return true;
+          return match.command;
         }
 
         function handleKeyNonInsertMode() {
@@ -721,31 +731,44 @@
           else if (match.type == 'partial') { return true; }
 
           vim.inputState.keyBuffer = '';
-          var command = match.command;
           var keysMatcher = /^(\d*)(.*)$/.exec(keys);
           if (keysMatcher[1] && keysMatcher[1] != '0') {
             vim.inputState.pushRepeatDigit(keysMatcher[1]);
           }
-          if (command.type == 'keyToKey') {
-            doKeyToKey(command.toKeys);
-          } else {
-            commandDispatcher.processCommand(cm, vim, command);
-          }
-          return true;
+          return match.command;
         }
 
-        return cm.operation(function() {
-          cm.curOp.isVimOp = true;
-          try {
-            if (vim.insertMode) { return handleKeyInsertMode(); }
-            else { return handleKeyNonInsertMode(); }
-          } catch (e) {
-            // clear VIM state in case it's in a bad state.
-            cm.state.vim = undefined;
-            maybeInitVimState(cm);
-            throw e;
-          }
-        });
+        var command;
+        if (vim.insertMode) { command = handleKeyInsertMode(); }
+        else { command = handleKeyNonInsertMode(); }
+        if (command === false) {
+          return undefined;
+        } else if (command === true) {
+          // TODO: Look into using CodeMirror's multi-key handling.
+          // Return no-op since we are caching the key. Counts as handled, but
+          // don't want act on it just yet.
+          return function() {};
+        } else {
+          return function() {
+            return cm.operation(function() {
+              cm.curOp.isVimOp = true;
+              try {
+                if (command.type == 'keyToKey') {
+                  doKeyToKey(command.toKeys);
+                } else {
+                  commandDispatcher.processCommand(cm, vim, command);
+                }
+              } catch (e) {
+                // clear VIM state in case it's in a bad state.
+                cm.state.vim = undefined;
+                maybeInitVimState(cm);
+                console['log'](e);
+                throw e;
+              }
+              return true;
+            });
+          };
+        }
       },
       handleEx: function(cm, input) {
         exCommandDispatcher.processCommand(cm, input);
@@ -4514,7 +4537,8 @@
 
     CodeMirror.keyMap.vim = {
       attach: attachVimMap,
-      detach: detachVimMap
+      detach: detachVimMap,
+      call: cmKey
     };
 
     function exitInsertMode(cm) {
@@ -4587,20 +4611,16 @@
       },
       fallthrough: ['default'],
       attach: attachVimMap,
-      detach: detachVimMap
-    };
-
-    CodeMirror.keyMap['await-second'] = {
-      fallthrough: ['vim-insert'],
-      attach: attachVimMap,
-      detach: detachVimMap
+      detach: detachVimMap,
+      call: cmKey
     };
 
     CodeMirror.keyMap['vim-replace'] = {
       'Backspace': 'goCharLeft',
       fallthrough: ['vim-insert'],
       attach: attachVimMap,
-      detach: detachVimMap
+      detach: detachVimMap,
+      call: cmKey
     };
 
     function executeMacroRegister(cm, vim, macroModeState, registerName) {

From f545e2112710e3636ca82a992fed3b2cf1107016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Vr=C3=A1na?= <jakub@vrana.cz>
Date: Fri, 5 Dec 2014 16:31:26 -0800
Subject: [PATCH 1758/4742] Fix link in documentation

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

diff --git a/mode/index.html b/mode/index.html
index 53ab942352..14a3f10ea4 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -25,7 +25,7 @@ <h2>Language modes</h2>
 in a subdirectory of the <code>mode/</code> directory, and typically
 defines a single JavaScript file that implements the mode. Loading
 such file will make the language available to CodeMirror, through
-the <a href="manual.html#option_mode"><code>mode</code></a>
+the <a href="../doc/manual.html#option_mode"><code>mode</code></a>
 option.</p>
 
 <div style="-webkit-columns: 100px 2; -moz-columns: 100px 2; columns: 100px 2;">

From c7d808782ce70c9276bb08edf4d6eabc936af5b2 Mon Sep 17 00:00:00 2001
From: Robert Crossfield <robcrossfield@gmail.com>
Date: Tue, 24 Jun 2014 08:06:12 +1000
Subject: [PATCH 1759/4742] [zenburn theme] Add

This file was taken from
https://github.com/wisenomad/zenburn-lighttable-theme with a few
modifications to make it work in CodeMirror
---
 demo/theme.html   |  2 ++
 theme/zenburn.css | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 theme/zenburn.css

diff --git a/demo/theme.html b/demo/theme.html
index cdb2113811..d15e75e02c 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -34,6 +34,7 @@
 <link rel="stylesheet" href="../theme/vibrant-ink.css">
 <link rel="stylesheet" href="../theme/xq-dark.css">
 <link rel="stylesheet" href="../theme/xq-light.css">
+<link rel="stylesheet" href="../theme/zenburn.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../addon/selection/active-line.js"></script>
@@ -102,6 +103,7 @@ <h2>Theme Demo</h2>
     <option>vibrant-ink</option>
     <option>xq-dark</option>
     <option>xq-light</option>
+    <option>zenburn</option>
 </select>
 </p>
 
diff --git a/theme/zenburn.css b/theme/zenburn.css
new file mode 100644
index 0000000000..f817198af0
--- /dev/null
+++ b/theme/zenburn.css
@@ -0,0 +1,37 @@
+/**
+ * "
+ *  Using Zenburn color palette from the Emacs Zenburn Theme
+ *  https://github.com/bbatsov/zenburn-emacs/blob/master/zenburn-theme.el
+ *
+ *  Also using parts of https://github.com/xavi/coderay-lighttable-theme
+ * "
+ * From: https://github.com/wisenomad/zenburn-lighttable-theme/blob/master/zenburn.css
+ */
+
+.cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
+.cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
+.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-zenburn { background-color: #3f3f3f; color: #dcdccc; }
+.cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
+.cm-s-zenburn span.cm-comment { color: #7f9f7f; }
+.cm-s-zenburn span.cm-keyword { color: #f0dfaf; font-weight: bold; }
+.cm-s-zenburn span.cm-atom { color: #bfebbf; }
+.cm-s-zenburn span.cm-def { color: #dcdccc; }
+.cm-s-zenburn span.cm-variable { color: #dfaf8f; }
+.cm-s-zenburn span.cm-variable-2 { color: #dcdccc; }
+.cm-s-zenburn span.cm-string { color: #cc9393; }
+.cm-s-zenburn span.cm-string-2 { color: #cc9393; }
+.cm-s-zenburn span.cm-number { color: #dcdccc; }
+.cm-s-zenburn span.cm-tag { color: #93e0e3; }
+.cm-s-zenburn span.cm-property { color: #dfaf8f; }
+.cm-s-zenburn span.cm-attribute { color: #dfaf8f; }
+.cm-s-zenburn span.cm-qualifier { color: #7cb8bb; }
+.cm-s-zenburn span.cm-meta { color: #f0dfaf; }
+.cm-s-zenburn span.cm-header { color: #f0efd0; }
+.cm-s-zenburn span.cm-operator { color: #f0efd0; }
+.cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
+.cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
+.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
+.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
+.cm-s-zenburn .CodeMirror-selected { background: #545454; }
+.cm-s-zenburn .CodeMirror-focused .CodeMirror-selected { background: #4f4f4f; }

From 99c9a0bb2815bb3afb9ab5ff567abdc641d6b0f9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 8 Dec 2014 15:26:33 +0100
Subject: [PATCH 1760/4742] [project page] Use non-breaking space to make
 doctype readable

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

diff --git a/index.html b/index.html
index 8d30c32169..a6f0371545 100644
--- a/index.html
+++ b/index.html
@@ -183,7 +183,7 @@ <h2>Community</h2>
 <section id=browsersupport>
   <h2>Browser support</h2>
   <p>The <em>desktop</em> versions of the following browsers,
-  in <em>standards mode</em> (HTML5 <code>&lt;!doctype html></code>
+  in <em>standards mode</em> (HTML5 <code>&lt;!doctype html></code>
   recommended) are supported:</p>
   <table style="margin-bottom: 1em">
     <tr><th>Firefox</th><td>version 4 and up</td></tr>

From 2de4f1e23fef73883919b58ca6852a84647fbdca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 8 Dec 2014 22:03:33 +0100
Subject: [PATCH 1761/4742] [textile mode] Agressively adjust coding style

Remove a bunch of convoluting abstractions, make sure the regexps are
actually cached.
---
 mode/textile/textile.js | 864 ++++++++++++++++++----------------------
 1 file changed, 388 insertions(+), 476 deletions(-)

diff --git a/mode/textile/textile.js b/mode/textile/textile.js
index b1511a5666..cd9a483640 100644
--- a/mode/textile/textile.js
+++ b/mode/textile/textile.js
@@ -2,552 +2,464 @@
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (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);
+  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';
-
-var TOKEN_STYLES = {
-  addition: 'positive',
-  attributes: 'attribute',
-  bold: 'strong',
-  cite: 'keyword',
-  code: 'atom',
-  definitionList: 'number',
-  deletion: 'negative',
-  div: 'punctuation',
-  em: 'em',
-  footnote: 'variable',
-  footCite: 'qualifier',
-  header: 'header',
-  html: 'comment',
-  image: 'string',
-  italic: 'em',
-  link: 'link',
-  linkDefinition: 'link',
-  list1: 'variable-2',
-  list2: 'variable-3',
-  list3: 'keyword',
-  notextile: 'string-2',
-  pre: 'operator',
-  p: 'property',
-  quote: 'bracket',
-  span: 'quote',
-  specialChar: 'tag',
-  strong: 'strong',
-  sub: 'builtin',
-  sup: 'builtin',
-  table: 'variable-3',
-  tableHeading: 'operator'
-};
-
-function Parser(regExpFactory, state, stream) {
-  this.regExpFactory = regExpFactory;
-  this.state = state;
-  this.stream = stream;
-  this.styles = TOKEN_STYLES;
-
-  this.state.specialChar = null;
-}
-
-Parser.prototype.eat = function(name) {
-  return this.stream.match(this.regExpFactory.pattern(name), true);
-};
-
-Parser.prototype.check = function(name) {
-  return this.stream.match(this.regExpFactory.pattern(name), false);
-};
-
-Parser.prototype.setModeForNextToken = function(mode) {
-  return this.state.mode = mode;
-};
-
-Parser.prototype.execMode = function(newMode) {
-  return this.setModeForNextToken(newMode).call(this);
-};
-
-Parser.prototype.startNewLine = function() {
-  this.setModeForNextToken(Modes.newLayout);
-  this.state.tableHeading = false;
-
-  if (this.state.layoutType === 'definitionList' && this.state.spanningLayout) {
-    if (this.check('definitionListEnd')) {
-      this.state.spanningLayout = false;
-    }
-  }
-};
+  "use strict";
+
+  var TOKEN_STYLES = {
+    addition: "positive",
+    attributes: "attribute",
+    bold: "strong",
+    cite: "keyword",
+    code: "atom",
+    definitionList: "number",
+    deletion: "negative",
+    div: "punctuation",
+    em: "em",
+    footnote: "variable",
+    footCite: "qualifier",
+    header: "header",
+    html: "comment",
+    image: "string",
+    italic: "em",
+    link: "link",
+    linkDefinition: "link",
+    list1: "variable-2",
+    list2: "variable-3",
+    list3: "keyword",
+    notextile: "string-2",
+    pre: "operator",
+    p: "property",
+    quote: "bracket",
+    span: "quote",
+    specialChar: "tag",
+    strong: "strong",
+    sub: "builtin",
+    sup: "builtin",
+    table: "variable-3",
+    tableHeading: "operator"
+  };
 
-Parser.prototype.nextToken = function() {
-  return this.state.mode.call(this);
-};
+  function startNewLine(stream, state) {
+    state.mode = Modes.newLayout;
+    state.tableHeading = false;
 
-Parser.prototype.styleFor = function(token) {
-  if (this.styles.hasOwnProperty(token)) {
-    return this.styles[token];
+    if (state.layoutType === "definitionList" && state.spanningLayout &&
+        stream.match(RE("definitionListEnd"), false))
+      state.spanningLayout = false;
   }
-  throw 'unknown token';
-};
 
-Parser.prototype.handlePhraseModifier = function(ch) {
-  if (ch === '_') {
-    if (this.stream.eat('_')) {
-      return this.togglePhraseModifier('italic', /^.*__/);
+  function handlePhraseModifier(stream, state, ch) {
+    if (ch === "_") {
+      if (stream.eat("_"))
+        return togglePhraseModifier(stream, state, "italic", /^.*__/);
+      else
+        return togglePhraseModifier(stream, state, "em", /^.*_/);
     }
-    return this.togglePhraseModifier('em', /^.*_/);
-  }
 
-  if (ch === '*') {
-    if (this.stream.eat('*')) {
-      return this.togglePhraseModifier('bold', /^.*\*\*/);
+    if (ch === "*") {
+      if (stream.eat("*")) {
+        return togglePhraseModifier(stream, state, "bold", /^.*\*\*/);
+      }
+      return togglePhraseModifier(stream, state, "strong", /^.*\*/);
     }
-    return this.togglePhraseModifier('strong', /^.*\*/);
-  }
 
-  if (ch === '[') {
-    if (this.stream.match(/\d+\]/)) {
-      this.state.footCite = true;
+    if (ch === "[") {
+      if (stream.match(/\d+\]/)) state.footCite = true;
+      return tokenStyles(state);
     }
-    return this.tokenStyles();
-  }
 
-  if (ch === '(') {
-    if (this.stream.match('r)')) {
-      this.state.specialChar = 'r';
-    } else if (this.stream.match('tm)')) {
-      this.state.specialChar = 'tm';
-    } else if (this.stream.match('c)')) {
-      this.state.specialChar = 'c';
+    if (ch === "(") {
+      var spec = stream.match(/^(r|tm|c)\)/);
+      if (spec)
+        return tokenStylesWith(state, TOKEN_STYLES.specialChar);
     }
-    return this.tokenStyles();
-  }
 
-  if (ch === '<') {
-    if (this.stream.match(/(\w+)[^>]+>[^<]+<\/\1>/)) {
-      return this.tokenStylesWith(this.styleFor('html'));
-    }
-  }
+    if (ch === "<" && stream.match(/(\w+)[^>]+>[^<]+<\/\1>/))
+      return tokenStylesWith(state, TOKEN_STYLES.html);
 
-  if (ch === '?' && this.stream.eat('?')) {
-    return this.togglePhraseModifier('cite', /^.*\?\?/);
-  }
-  if (ch === '=' && this.stream.eat('=')) {
-    return this.togglePhraseModifier('notextile', /^.*==/);
-  }
-  if (ch === '-') {
-    return this.togglePhraseModifier('deletion', /^.*-/);
-  }
-  if (ch === '+') {
-    return this.togglePhraseModifier('addition', /^.*\+/);
-  }
-  if (ch === '~') {
-    return this.togglePhraseModifier('sub', /^.*~/);
-  }
-  if (ch === '^') {
-    return this.togglePhraseModifier('sup', /^.*\^/);
-  }
-  if (ch === '%') {
-    return this.togglePhraseModifier('span', /^.*%/);
-  }
-  if (ch === '@') {
-    return this.togglePhraseModifier('code', /^.*@/);
-  }
-  if (ch === '!') {
-    var type = this.togglePhraseModifier('image', /^.*(?:\([^\)]+\))?!/);
-    this.stream.match(/^:\S+/); // optional Url portion
-    return type;
-  }
-  return this.tokenStyles();
-};
-
-Parser.prototype.togglePhraseModifier = function(phraseModifier, closeRE) {
-  if (this.state[phraseModifier]) { // remove phrase modifier
-    var type = this.tokenStyles();
-    this.state[phraseModifier] = false;
-    return type;
-  }
-  if (this.stream.match(closeRE, false)) { // add phrase modifier
-    this.state[phraseModifier] = true;
-    this.setModeForNextToken(Modes.attributes);
-  }
-  return this.tokenStyles();
-};
+    if (ch === "?" && stream.eat("?"))
+      return togglePhraseModifier(stream, state, "cite", /^.*\?\?/);
 
-Parser.prototype.tokenStyles = function() {
-  var disabled = this.textileDisabled(),
-      styles = [];
+    if (ch === "=" && stream.eat("="))
+      return togglePhraseModifier(stream, state, "notextile", /^.*==/);
 
-  if (disabled) return disabled;
+    if (ch === "-")
+      return togglePhraseModifier(stream, state, "deletion", /^.*-/);
 
-  if (this.state.layoutType) {
-    styles.push(this.styleFor(this.state.layoutType));
-  }
+    if (ch === "+")
+      return togglePhraseModifier(stream, state, "addition", /^.*\+/);
 
-  styles = styles.concat(this.activeStyles('addition', 'bold', 'cite', 'code',
-      'deletion', 'em', 'footCite', 'image', 'italic', 'link', 'span', 'specialChar', 'strong',
-      'sub', 'sup', 'table', 'tableHeading'));
+    if (ch === "~")
+      return togglePhraseModifier(stream, state, "sub", /^.*~/);
 
-  if (this.state.layoutType === 'header') {
-    styles.push(this.styleFor('header') + '-' + this.state.header);
-  }
-  return styles.length ? styles.join(' ') : null;
-};
+    if (ch === "^")
+      return togglePhraseModifier(stream, state, "sup", /^.*\^/);
 
-Parser.prototype.textileDisabled = function() {
-  var type = this.state.layoutType;
+    if (ch === "%")
+      return togglePhraseModifier(stream, state, "span", /^.*%/);
 
-  switch(type) {
-    case 'notextile':
-    case 'code':
-    case 'pre':
-      return this.styleFor(type);
-    default:
-      if (this.state.notextile) {
-        return this.styleFor('notextile') + (type ? (' ' + this.styleFor(type)) : '');
-      }
+    if (ch === "@")
+      return togglePhraseModifier(stream, state, "code", /^.*@/);
 
-      return null;
+    if (ch === "!") {
+      var type = togglePhraseModifier(stream, state, "image", /^.*(?:\([^\)]+\))?!/);
+      stream.match(/^:\S+/); // optional Url portion
+      return type;
+    }
+    return tokenStyles(state);
   }
-};
 
-Parser.prototype.tokenStylesWith = function(extraStyles) {
-  var disabled = this.textileDisabled(),
-      type;
+  function togglePhraseModifier(stream, state, phraseModifier, closeRE) {
+    if (state[phraseModifier]) { // remove phrase modifier
+      var type = tokenStyles(state);
+      state[phraseModifier] = false;
+      return type;
+    }
+    if (stream.match(closeRE, false)) { // add phrase modifier
+      state[phraseModifier] = true;
+      state.mode = Modes.attributes;
+    }
+    return tokenStyles(state);
+  };
 
-  if (disabled) return disabled;
+  function tokenStyles(state) {
+    var disabled = textileDisabled(state);
+    if (disabled) return disabled;
 
-  type = this.tokenStyles();
-  if(extraStyles) {
-    return type ? (type + ' ' + extraStyles) : extraStyles;
-  }
-  return type;
-};
-
-Parser.prototype.activeStyles = function() {
-  var styles = [],
-      i;
-  for (i = 0; i < arguments.length; ++i) {
-    if (this.state[arguments[i]]) {
-      styles.push(this.styleFor(arguments[i]));
-    }
-  }
-  return styles;
-};
+    var styles = [];
+    if (state.layoutType) styles.push(TOKEN_STYLES[state.layoutType]);
 
-Parser.prototype.blankLine = function() {
-  var spanningLayout = this.state.spanningLayout,
-      type = this.state.layoutType,
-      key;
+    styles = styles.concat(activeStyles(
+      state, "addition", "bold", "cite", "code", "deletion", "em", "footCite",
+      "image", "italic", "link", "span", "strong", "sub", "sup", "table", "tableHeading"));
 
-  for (key in this.state) {
-    if (this.state.hasOwnProperty(key)) {
-      delete this.state[key];
-    }
-  }
+    if (state.layoutType === "header")
+      styles.push(TOKEN_STYLES.header + "-" + state.header);
 
-  this.setModeForNextToken(Modes.newLayout);
-  if (spanningLayout) {
-    this.state.layoutType = type;
-    this.state.spanningLayout = true;
+    return styles.length ? styles.join(" ") : null;
   }
-};
-
-
-function RegExpFactory() {
-  this.cache = {};
-  this.single = {
-    bc: 'bc',
-    bq: 'bq',
-    definitionList: /- [^(?::=)]+:=+/,
-    definitionListEnd: /.*=:\s*$/,
-    div: 'div',
-    drawTable: /\|.*\|/,
-    foot: /fn\d+/,
-    header: /h[1-6]/,
-    html: /\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/,
-    link: /[^"]+":\S/,
-    linkDefinition: /\[[^\s\]]+\]\S+/,
-    list: /(?:#+|\*+)/,
-    notextile: 'notextile',
-    para: 'p',
-    pre: 'pre',
-    table: 'table',
-    tableCellAttributes: /[/\\]\d+/,
-    tableHeading: /\|_\./,
-    tableText: /[^"_\*\[\(\?\+~\^%@|-]+/,
-    text: /[^!"_=\*\[\(<\?\+~\^%@-]+/
-  };
-  this.attributes = {
-    align: /(?:<>|<|>|=)/,
-    selector: /\([^\(][^\)]+\)/,
-    lang: /\[[^\[\]]+\]/,
-    pad: /(?:\(+|\)+){1,2}/,
-    css: /\{[^\}]+\}/
-  };
-}
-
-RegExpFactory.prototype.pattern = function(name) {
-  return (this.cache[name] || this.createRe(name));
-};
-
-RegExpFactory.prototype.createRe = function(name) {
-  switch (name) {
-    case 'drawTable':
-      return this.makeRe('^', this.single.drawTable, '$');
-    case 'html':
-      return this.makeRe('^', this.single.html, '(?:', this.single.html, ')*', '$');
-    case 'linkDefinition':
-      return this.makeRe('^', this.single.linkDefinition, '$');
-    case 'listLayout':
-      return this.makeRe('^', this.single.list, this.pattern('allAttributes'), '*\\s+');
-    case 'tableCellAttributes':
-      return this.makeRe('^', this.choiceRe(this.single.tableCellAttributes,
-          this.pattern('allAttributes')), '+\\.');
-    case 'type':
-      return this.makeRe('^', this.pattern('allTypes'));
-    case 'typeLayout':
-      return this.makeRe('^', this.pattern('allTypes'), this.pattern('allAttributes'),
-          '*\\.\\.?', '(\\s+|$)');
-    case 'attributes':
-      return this.makeRe('^', this.pattern('allAttributes'), '+');
-
-    case 'allTypes':
-      return this.choiceRe(this.single.div, this.single.foot,
-          this.single.header, this.single.bc, this.single.bq,
-          this.single.notextile, this.single.pre, this.single.table,
-          this.single.para);
-
-    case 'allAttributes':
-      return this.choiceRe(this.attributes.selector, this.attributes.css,
-          this.attributes.lang, this.attributes.align, this.attributes.pad);
 
+  function textileDisabled(state) {
+    var type = state.layoutType;
+
+    switch(type) {
+    case "notextile":
+    case "code":
+    case "pre":
+      return TOKEN_STYLES[type];
     default:
-      return this.makeRe('^', this.single[name]);
+      if (state.notextile)
+        return TOKEN_STYLES.notextile + (type ? (" " + TOKEN_STYLES[type]) : "");
+      return null;
+    }
   }
-};
 
+  function tokenStylesWith(state, extraStyles) {
+    var disabled = textileDisabled(state);
+    if (disabled) return disabled;
 
-RegExpFactory.prototype.makeRe = function() {
-  var pattern = '',
-      i,
-      arg;
-
-  for (i = 0; i < arguments.length; ++i) {
-    arg = arguments[i];
-    pattern += (typeof arg === 'string') ? arg : arg.source;
+    var type = tokenStyles(state);
+    if (extraStyles)
+      return type ? (type + " " + extraStyles) : extraStyles;
+    else
+      return type;
   }
-  return new RegExp(pattern);
-};
-
-RegExpFactory.prototype.choiceRe = function() {
-  var parts = [arguments[0]],
-      i;
 
-  for (i = 1; i < arguments.length; ++i) {
-    parts[i * 2 - 1] = '|';
-    parts[i * 2] = arguments[i];
+  function activeStyles(state) {
+    var styles = [];
+    for (var i = 1; i < arguments.length; ++i) {
+      if (state[arguments[i]])
+        styles.push(TOKEN_STYLES[arguments[i]]);
+    }
+    return styles;
   }
 
-  parts.unshift('(?:');
-  parts.push(')');
-  return this.makeRe.apply(this, parts);
-};
+  function blankLine(state) {
+    var spanningLayout = state.spanningLayout, type = state.layoutType;
 
+    for (var key in state) if (state.hasOwnProperty(key))
+      delete state[key];
 
-var Modes = {
-  newLayout: function() {
-    if (this.check('typeLayout')) {
-      this.state.spanningLayout = false;
-      return this.execMode(Modes.blockType);
+    state.mode = Modes.newLayout;
+    if (spanningLayout) {
+      state.layoutType = type;
+      state.spanningLayout = true;
     }
-    if (!this.textileDisabled()) {
-      if (this.check('listLayout')) {
-        return this.execMode(Modes.list);
-      } else if (this.check('drawTable')) {
-        return this.execMode(Modes.table);
-      } else if (this.check('linkDefinition')) {
-        return this.execMode(Modes.linkDefinition);
-      } else if (this.check('definitionList')) {
-        return this.execMode(Modes.definitionList);
-      } else if (this.check('html')) {
-        return this.execMode(Modes.html);
+  }
+
+  var REs = {
+    cache: {},
+    single: {
+      bc: "bc",
+      bq: "bq",
+      definitionList: /- [^(?::=)]+:=+/,
+      definitionListEnd: /.*=:\s*$/,
+      div: "div",
+      drawTable: /\|.*\|/,
+      foot: /fn\d+/,
+      header: /h[1-6]/,
+      html: /\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/,
+      link: /[^"]+":\S/,
+      linkDefinition: /\[[^\s\]]+\]\S+/,
+      list: /(?:#+|\*+)/,
+      notextile: "notextile",
+      para: "p",
+      pre: "pre",
+      table: "table",
+      tableCellAttributes: /[\/\\]\d+/,
+      tableHeading: /\|_\./,
+      tableText: /[^"_\*\[\(\?\+~\^%@|-]+/,
+      text: /[^!"_=\*\[\(<\?\+~\^%@-]+/
+    },
+    attributes: {
+      align: /(?:<>|<|>|=)/,
+      selector: /\([^\(][^\)]+\)/,
+      lang: /\[[^\[\]]+\]/,
+      pad: /(?:\(+|\)+){1,2}/,
+      css: /\{[^\}]+\}/
+    },
+    createRe: function(name) {
+      switch (name) {
+      case "drawTable":
+        return REs.makeRe("^", REs.single.drawTable, "$");
+      case "html":
+        return REs.makeRe("^", REs.single.html, "(?:", REs.single.html, ")*", "$");
+      case "linkDefinition":
+        return REs.makeRe("^", REs.single.linkDefinition, "$");
+      case "listLayout":
+        return REs.makeRe("^", REs.single.list, RE("allAttributes"), "*\\s+");
+      case "tableCellAttributes":
+        return REs.makeRe("^", REs.choiceRe(REs.single.tableCellAttributes,
+                                            RE("allAttributes")), "+\\.");
+      case "type":
+        return REs.makeRe("^", RE("allTypes"));
+      case "typeLayout":
+        return REs.makeRe("^", RE("allTypes"), RE("allAttributes"),
+                          "*\\.\\.?", "(\\s+|$)");
+      case "attributes":
+        return REs.makeRe("^", RE("allAttributes"), "+");
+
+      case "allTypes":
+        return REs.choiceRe(REs.single.div, REs.single.foot,
+                            REs.single.header, REs.single.bc, REs.single.bq,
+                            REs.single.notextile, REs.single.pre, REs.single.table,
+                            REs.single.para);
+
+      case "allAttributes":
+        return REs.choiceRe(REs.attributes.selector, REs.attributes.css,
+                            REs.attributes.lang, REs.attributes.align, REs.attributes.pad);
+
+      default:
+        return REs.makeRe("^", REs.single[name]);
+      }
+    },
+    makeRe: function() {
+      var pattern = "";
+      for (var i = 0; i < arguments.length; ++i) {
+        var arg = arguments[i];
+        pattern += (typeof arg === "string") ? arg : arg.source;
+      }
+      return new RegExp(pattern);
+    },
+    choiceRe: function() {
+      var parts = [arguments[0]];
+      for (var i = 1; i < arguments.length; ++i) {
+        parts[i * 2 - 1] = "|";
+        parts[i * 2] = arguments[i];
       }
-    }
-    return this.execMode(Modes.text);
-  },
-
-  blockType: function() {
-    var match,
-        type;
-    this.state.layoutType = null;
-
-    if (match = this.eat('type')) {
-      type = match[0];
-    } else {
-      return this.execMode(Modes.text);
-    }
 
-    if(match = type.match(this.regExpFactory.pattern('header'))) {
-      this.state.layoutType = 'header';
-      this.state.header = parseInt(match[0][1]);
-    } else if (type.match(this.regExpFactory.pattern('bq'))) {
-      this.state.layoutType = 'quote';
-    } else if (type.match(this.regExpFactory.pattern('bc'))) {
-      this.state.layoutType = 'code';
-    } else if (type.match(this.regExpFactory.pattern('foot'))) {
-      this.state.layoutType = 'footnote';
-    } else if (type.match(this.regExpFactory.pattern('notextile'))) {
-      this.state.layoutType = 'notextile';
-    } else if (type.match(this.regExpFactory.pattern('pre'))) {
-      this.state.layoutType = 'pre';
-    } else if (type.match(this.regExpFactory.pattern('div'))) {
-      this.state.layoutType = 'div';
-    } else if (type.match(this.regExpFactory.pattern('table'))) {
-      this.state.layoutType = 'table';
+      parts.unshift("(?:");
+      parts.push(")");
+      return REs.makeRe.apply(null, parts);
     }
+  };
 
-    this.setModeForNextToken(Modes.attributes);
-    return this.tokenStyles();
-  },
+  function RE(name) {
+    return (REs.cache[name] || (REs.cache[name] = REs.createRe(name)));
+  }
 
-  text: function() {
-    if (this.eat('text')) {
-      return this.tokenStyles();
-    }
+  var Modes = {
+    newLayout: function(stream, state) {
+      if (stream.match(RE("typeLayout"), false)) {
+        state.spanningLayout = false;
+        return (state.mode = Modes.blockType)(stream, state);
+      }
+      var newMode;
+      if (!textileDisabled(state)) {
+        if (stream.match(RE("listLayout"), false))
+          newMode = Modes.list;
+        else if (stream.match(RE("drawTable"), false))
+          newMode = Modes.table;
+        else if (stream.match(RE("linkDefinition"), false))
+          newMode = Modes.linkDefinition;
+        else if (stream.match(RE("definitionList")))
+          newMode = Modes.definitionList;
+        else if (stream.match(RE("html"), false))
+          newMode = Modes.html;
+      }
+      return (state.mode = (newMode || Modes.text))(stream, state);
+    },
 
-    var ch = this.stream.next();
+    blockType: function(stream, state) {
+      var match, type;
+      state.layoutType = null;
+
+      if (match = stream.match(RE("type")))
+        type = match[0];
+      else
+        return (state.mode = Modes.text)(stream, state);
+
+      if (match = type.match(RE("header"))) {
+        state.layoutType = "header";
+        state.header = parseInt(match[0][1]);
+      } else if (type.match(RE("bq"))) {
+        state.layoutType = "quote";
+      } else if (type.match(RE("bc"))) {
+        state.layoutType = "code";
+      } else if (type.match(RE("foot"))) {
+        state.layoutType = "footnote";
+      } else if (type.match(RE("notextile"))) {
+        state.layoutType = "notextile";
+      } else if (type.match(RE("pre"))) {
+        state.layoutType = "pre";
+      } else if (type.match(RE("div"))) {
+        state.layoutType = "div";
+      } else if (type.match(RE("table"))) {
+        state.layoutType = "table";
+      }
 
-    if (ch === '"') {
-      return this.execMode(Modes.link);
-    }
-    return this.handlePhraseModifier(ch);
-  },
+      state.mode = Modes.attributes;
+      return tokenStyles(state);
+    },
 
-  attributes: function() {
-    this.setModeForNextToken(Modes.layoutLength);
+    text: function(stream, state) {
+      if (stream.match(RE("text"))) return tokenStyles(state);
 
-    if (this.eat('attributes')) {
-      return this.tokenStylesWith(this.styleFor('attributes'));
-    }
-    return this.tokenStyles();
-  },
+      var ch = stream.next();
+      if (ch === '"')
+        return (state.mode = Modes.link)(stream, state);
+      return handlePhraseModifier(stream, state, ch);
+    },
 
-  layoutLength: function() {
-    if (this.stream.eat('.') && this.stream.eat('.')) {
-      this.state.spanningLayout = true;
-    }
+    attributes: function(stream, state) {
+      state.mode = Modes.layoutLength;
 
-    this.setModeForNextToken(Modes.text);
-    return this.tokenStyles();
-  },
-
-  list: function() {
-    var match = this.eat('list'),
-        listMod;
-    this.state.listDepth = match[0].length;
-    listMod = (this.state.listDepth - 1) % 3;
-    if (!listMod) {
-      this.state.layoutType = 'list1';
-    } else if (listMod === 1) {
-      this.state.layoutType = 'list2';
-    } else {
-      this.state.layoutType = 'list3';
-    }
-    this.setModeForNextToken(Modes.attributes);
-    return this.tokenStyles();
-  },
-
-  link: function() {
-    this.setModeForNextToken(Modes.text);
-    if (this.eat('link')) {
-      this.stream.match(/\S+/);
-      return this.tokenStylesWith(this.styleFor('link'));
-    }
-    return this.tokenStyles();
-  },
+      if (stream.match(RE("attributes")))
+        return tokenStylesWith(state, TOKEN_STYLES.attributes);
+      else
+        return tokenStyles(state);
+    },
 
-  linkDefinition: function() {
-    this.stream.skipToEnd();
-    return this.tokenStylesWith(this.styleFor('linkDefinition'));
-  },
+    layoutLength: function(stream, state) {
+      if (stream.eat(".") && stream.eat("."))
+        state.spanningLayout = true;
 
-  definitionList: function() {
-    this.eat('definitionList');
+      state.mode = Modes.text;
+      return tokenStyles(state);
+    },
 
-    this.state.layoutType = 'definitionList';
+    list: function(stream, state) {
+      var match = stream.match(RE("list"));
+      state.listDepth = match[0].length;
+      var listMod = (state.listDepth - 1) % 3;
+      if (!listMod)
+        state.layoutType = "list1";
+      else if (listMod === 1)
+        state.layoutType = "list2";
+      else
+        state.layoutType = "list3";
+
+      state.mode = Modes.attributes;
+      return tokenStyles(state);
+    },
 
-    if (this.stream.match(/\s*$/)) {
-      this.state.spanningLayout = true;
-    } else {
-      this.setModeForNextToken(Modes.attributes);
-    }
-    return this.tokenStyles();
-  },
-
-  html: function() {
-    this.stream.skipToEnd();
-    return this.tokenStylesWith(this.styleFor('html'));
-  },
-
-  table: function() {
-    this.state.layoutType = 'table';
-    return this.execMode(Modes.tableCell);
-  },
-
-  tableCell: function() {
-    if (this.eat('tableHeading')) {
-      this.state.tableHeading = true;
-    } else {
-      this.stream.eat('|');
-    }
-    this.setModeForNextToken(Modes.tableCellAttributes);
-    return this.tokenStyles();
-  },
+    link: function(stream, state) {
+      state.mode = Modes.text;
+      if (stream.match(RE("link"))) {
+        stream.match(/\S+/);
+        return tokenStylesWith(state, TOKEN_STYLES.link);
+      }
+      return tokenStyles(state);
+    },
 
-  tableCellAttributes: function() {
-    this.setModeForNextToken(Modes.tableText);
+    linkDefinition: function(stream, state) {
+      stream.skipToEnd();
+      return tokenStylesWith(state, TOKEN_STYLES.linkDefinition);
+    },
 
-    if (this.eat('tableCellAttributes')) {
-      return this.tokenStylesWith(this.styleFor('attributes'));
-    }
-    return this.tokenStyles();
-  },
+    definitionList: function(stream, state) {
+      stream.match(RE("definitionList"));
 
-  tableText: function() {
-    if (this.eat('tableText')) {
-      return this.tokenStyles();
-    }
+      state.layoutType = "definitionList";
 
-    if (this.stream.peek() === '|') { // end of cell
-      this.setModeForNextToken(Modes.tableCell);
-      return this.tokenStyles();
-    }
-    return this.handlePhraseModifier(this.stream.next());
-  }
-};
+      if (stream.match(/\s*$/))
+        state.spanningLayout = true;
+      else
+        state.mode = Modes.attributes;
 
+      return tokenStyles(state);
+    },
 
-CodeMirror.defineMode('textile', function() {
-  var regExpFactory = new RegExpFactory();
+    html: function(stream, state) {
+      stream.skipToEnd();
+      return tokenStylesWith(state, TOKEN_STYLES.html);
+    },
 
-  return {
-    startState: function() {
-      return { mode: Modes.newLayout };
+    table: function(stream, state) {
+      state.layoutType = "table";
+      return (state.mode = Modes.tableCell)(stream, state);
     },
-    token: function(stream, state) {
-      var parser = new Parser(regExpFactory, state, stream);
-      if (stream.sol()) { parser.startNewLine(); }
-      return parser.nextToken();
+
+    tableCell: function(stream, state) {
+      if (stream.match(RE("tableHeading")))
+        state.tableHeading = true;
+      else
+        stream.eat("|");
+
+      state.mode = Modes.tableCellAttributes;
+      return tokenStyles(state);
     },
-    blankLine: function(state) {
-      new Parser(regExpFactory, state).blankLine();
+
+    tableCellAttributes: function(stream, state) {
+      state.mode = Modes.tableText;
+
+      if (stream.match(RE("tableCellAttributes")))
+        return tokenStylesWith(state, TOKEN_STYLES.attributes);
+      else
+        return tokenStyles(state);
+    },
+
+    tableText: function(stream, state) {
+      if (stream.match(RE("tableText")))
+        return tokenStyles(state);
+
+      if (stream.peek() === "|") { // end of cell
+        state.mode = Modes.tableCell;
+        return tokenStyles(state);
+      }
+      return handlePhraseModifier(stream, state, stream.next());
     }
   };
-});
 
-CodeMirror.defineMIME('text/x-textile', 'textile');
+  CodeMirror.defineMode("textile", function() {
+    return {
+      startState: function() {
+        return { mode: Modes.newLayout };
+      },
+      token: function(stream, state) {
+        if (stream.sol()) startNewLine(stream, state);
+        return state.mode(stream, state);
+      },
+      blankLine: blankLine
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-textile", "textile");
 });

From 80c750e9a03b0c208f8b7a1b542bdb2bddf2908f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 8 Dec 2014 23:38:07 +0100
Subject: [PATCH 1762/4742] [textile mode] Only toggle phrase modifiers between
 non-word chars

Issue #2967
---
 mode/textile/test.js    | 16 ++++++++++++----
 mode/textile/textile.js | 42 +++++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/mode/textile/test.js b/mode/textile/test.js
index 206ff57e49..83af8b1f0d 100644
--- a/mode/textile/test.js
+++ b/mode/textile/test.js
@@ -168,16 +168,16 @@
       '[variable-2 # bar]');
 
   MT('ulFormatting',
-      '[variable-2 * ][variable-2&em _foo_][variable-2 bar]',
+      '[variable-2 * ][variable-2&em _foo_][variable-2  bar]',
       '[variable-2 * ][variable-2&strong *][variable-2&em&strong _foo_]' +
         '[variable-2&strong *][variable-2  bar]',
-      '[variable-2 * ][variable-2&strong *foo*][variable-2 bar]');
+      '[variable-2 * ][variable-2&strong *foo*][variable-2  bar]');
 
   MT('olFormatting',
-      '[variable-2 # ][variable-2&em _foo_][variable-2 bar]',
+      '[variable-2 # ][variable-2&em _foo_][variable-2  bar]',
       '[variable-2 # ][variable-2&strong *][variable-2&em&strong _foo_]' +
         '[variable-2&strong *][variable-2  bar]',
-      '[variable-2 # ][variable-2&strong *foo*][variable-2 bar]');
+      '[variable-2 # ][variable-2&strong *foo*][variable-2  bar]');
 
   MT('ulNested',
       '[variable-2 * foo]',
@@ -403,4 +403,12 @@
       '[operator pre.. *No* formatting]',
       '',
       '[operator *No* formatting]');
+
+  /* Only toggling phrases between non-word chars. */
+
+  MT('phrase-in-word',
+     'foo_bar_baz');
+
+  MT('phrase-non-word',
+     '[negative -x-] aaa-bbb ccc-ddd [negative -eee-] fff [negative -ggg-]');
 })();
diff --git a/mode/textile/textile.js b/mode/textile/textile.js
index cd9a483640..35029a772c 100644
--- a/mode/textile/textile.js
+++ b/mode/textile/textile.js
@@ -58,16 +58,16 @@
   function handlePhraseModifier(stream, state, ch) {
     if (ch === "_") {
       if (stream.eat("_"))
-        return togglePhraseModifier(stream, state, "italic", /^.*__/);
+        return togglePhraseModifier(stream, state, "italic", /__/, 2);
       else
-        return togglePhraseModifier(stream, state, "em", /^.*_/);
+        return togglePhraseModifier(stream, state, "em", /_/, 1);
     }
 
     if (ch === "*") {
       if (stream.eat("*")) {
-        return togglePhraseModifier(stream, state, "bold", /^.*\*\*/);
+        return togglePhraseModifier(stream, state, "bold", /\*\*/, 2);
       }
-      return togglePhraseModifier(stream, state, "strong", /^.*\*/);
+      return togglePhraseModifier(stream, state, "strong", /\*/, 1);
     }
 
     if (ch === "[") {
@@ -85,44 +85,46 @@
       return tokenStylesWith(state, TOKEN_STYLES.html);
 
     if (ch === "?" && stream.eat("?"))
-      return togglePhraseModifier(stream, state, "cite", /^.*\?\?/);
+      return togglePhraseModifier(stream, state, "cite", /\?\?/, 2);
 
     if (ch === "=" && stream.eat("="))
-      return togglePhraseModifier(stream, state, "notextile", /^.*==/);
+      return togglePhraseModifier(stream, state, "notextile", /==/, 2);
 
     if (ch === "-")
-      return togglePhraseModifier(stream, state, "deletion", /^.*-/);
+      return togglePhraseModifier(stream, state, "deletion", /-/, 1);
 
     if (ch === "+")
-      return togglePhraseModifier(stream, state, "addition", /^.*\+/);
+      return togglePhraseModifier(stream, state, "addition", /\+/, 1);
 
     if (ch === "~")
-      return togglePhraseModifier(stream, state, "sub", /^.*~/);
+      return togglePhraseModifier(stream, state, "sub", /~/, 1);
 
     if (ch === "^")
-      return togglePhraseModifier(stream, state, "sup", /^.*\^/);
+      return togglePhraseModifier(stream, state, "sup", /\^/, 1);
 
     if (ch === "%")
-      return togglePhraseModifier(stream, state, "span", /^.*%/);
+      return togglePhraseModifier(stream, state, "span", /%/, 1);
 
     if (ch === "@")
-      return togglePhraseModifier(stream, state, "code", /^.*@/);
+      return togglePhraseModifier(stream, state, "code", /@/, 1);
 
     if (ch === "!") {
-      var type = togglePhraseModifier(stream, state, "image", /^.*(?:\([^\)]+\))?!/);
+      var type = togglePhraseModifier(stream, state, "image", /(?:\([^\)]+\))?!/, 1);
       stream.match(/^:\S+/); // optional Url portion
       return type;
     }
     return tokenStyles(state);
   }
 
-  function togglePhraseModifier(stream, state, phraseModifier, closeRE) {
-    if (state[phraseModifier]) { // remove phrase modifier
-      var type = tokenStyles(state);
-      state[phraseModifier] = false;
-      return type;
-    }
-    if (stream.match(closeRE, false)) { // add phrase modifier
+  function togglePhraseModifier(stream, state, phraseModifier, closeRE, openSize) {
+    if (state[phraseModifier]) {
+      if (stream.match(/^($|\W)/, false)) {
+        var type = tokenStyles(state);
+        state[phraseModifier] = false;
+        return type;
+      }
+    } else if ((stream.pos == openSize || /\W/.test(stream.string.charAt(stream.pos - 1 - openSize))) &&
+               stream.match(new RegExp("^.*" + closeRE.source + "(?=\\W|$)"), false)) {
       state[phraseModifier] = true;
       state.mode = Modes.attributes;
     }

From f550e11e546d598998359f55097764c881f9b747 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 9 Dec 2014 08:30:29 +0100
Subject: [PATCH 1763/4742] [emacs keymap] Make delete and backspace delete
 region, if active

Issue #2263
---
 keymap/emacs.js    | 11 +++++++++--
 test/emacs_test.js |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 4acfd601a0..c81912df3c 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -155,6 +155,13 @@
     kill(cm, cm.getCursor(), findEnd(cm, by, dir), true);
   }
 
+  function killRegion(cm) {
+    if (cm.somethingSelected()) {
+      kill(cm, cm.getCursor("from"), cm.getCursor("to"));
+      return true;
+    }
+  }
+
   function addPrefix(cm, digit) {
     if (cm.state.emacsPrefix) {
       if (digit != "-") cm.state.emacsPrefix += digit;
@@ -283,9 +290,9 @@
     "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
     "Right": move(byChar, 1), "Left": move(byChar, -1),
     "Ctrl-D": function(cm) { killTo(cm, byChar, 1); },
-    "Delete": function(cm) { killTo(cm, byChar, 1); },
+    "Delete": function(cm) { killRegion(cm) || killTo(cm, byChar, 1); },
     "Ctrl-H": function(cm) { killTo(cm, byChar, -1); },
-    "Backspace": function(cm) { killTo(cm, byChar, -1); },
+    "Backspace": function(cm) { killRegion(cm) || killTo(cm, byChar, -1); },
 
     "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
     "Alt-D": function(cm) { killTo(cm, byWord, 1); },
diff --git a/test/emacs_test.js b/test/emacs_test.js
index c49e480375..ccbd6ce491 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -128,6 +128,9 @@
   sim("clearMark", "abcde", Pos(0, 2), "Ctrl-Space", "Ctrl-F", "Ctrl-F",
       "Ctrl-G", "Ctrl-W", txt("abcde"));
 
+  sim("delRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Delete", txt("cde"));
+  sim("backspaceRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Backspace", txt("cde"));
+
   testCM("save", function(cm) {
     var saved = false;
     CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };

From 014b8e42ece38dc7be2bf6a5ed63dc0b27c711a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20V=C3=A1zquez?= <davazp@gmail.com>
Date: Tue, 9 Dec 2014 05:37:55 +0100
Subject: [PATCH 1764/4742] Highlight as keyword special forms and common
 macros

---
 mode/commonlisp/commonlisp.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 8878e26f45..9c01892ba9 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -12,6 +12,7 @@
 "use strict";
 
 CodeMirror.defineMode("commonlisp", function (config) {
+  var specialForm = /^(block|let*|return-from|catch|load-time-value|setq|eval-when|locally|symbol-macrolet|flet|macrolet|tagbody|function|multiple-value-call|the|go|multiple-value-prog1|throw|if|progn|unwind-protect|labels|progv|let|quote)$/;
   var assumeBody = /^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/;
   var numLiteral = /^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/;
   var symbol = /[^\s'`,@()\[\]";]/;
@@ -53,7 +54,7 @@ CodeMirror.defineMode("commonlisp", function (config) {
       if (name == ".") return null;
       type = "symbol";
       if (name == "nil" || name == "t") return "atom";
-      if (name.charAt(0) == ":") return "keyword";
+      if (name.charAt(0) == ":" || assumeBody.test(name) || specialForm.test(name)) return "keyword";
       if (name.charAt(0) == "&") return "variable-2";
       return "variable";
     }

From 8659c5a8a6b0e6ebea1a24d57690f7c7e79eb934 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 9 Dec 2014 15:26:46 +0100
Subject: [PATCH 1765/4742] [commonlisp mode] Only highlight keywords at start
 of list, give :-keywords atom style

Issue #2969
---
 mode/commonlisp/commonlisp.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 9c01892ba9..5f50b352de 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -53,8 +53,8 @@ CodeMirror.defineMode("commonlisp", function (config) {
       var name = readSym(stream);
       if (name == ".") return null;
       type = "symbol";
-      if (name == "nil" || name == "t") return "atom";
-      if (name.charAt(0) == ":" || assumeBody.test(name) || specialForm.test(name)) return "keyword";
+      if (name == "nil" || name == "t" || name.charAt(0) == ":") return "atom";
+      if (state.lastType == "open" && (specialForm.test(name) || assumeBody.test(name))) return "keyword";
       if (name.charAt(0) == "&") return "variable-2";
       return "variable";
     }
@@ -81,7 +81,7 @@ CodeMirror.defineMode("commonlisp", function (config) {
 
   return {
     startState: function () {
-      return {ctx: {prev: null, start: 0, indentTo: 0}, tokenize: base};
+      return {ctx: {prev: null, start: 0, indentTo: 0}, lastType: null, tokenize: base};
     },
 
     token: function (stream, state) {
@@ -99,6 +99,7 @@ CodeMirror.defineMode("commonlisp", function (config) {
         } else if (state.ctx.indentTo == "next") {
           state.ctx.indentTo = stream.column();
         }
+        state.lastType = type;
       }
       if (type == "open") state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
       else if (type == "close") state.ctx = state.ctx.prev || state.ctx;

From 9cf1df7f2f20c84ae7ed8472b7bdf7d5b9e1e36a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 9 Dec 2014 16:53:36 +0100
Subject: [PATCH 1766/4742] [real-world uses] Add two links

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

diff --git a/doc/realworld.html b/doc/realworld.html
index a9fc3b884c..1214b8b7b5 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -139,11 +139,13 @@ <h2>CodeMirror real-world uses</h2>
       <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://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>
       <li><a href="http://syframework.alwaysdata.net">SyBox</a> (PHP playground)</li>
       <li><a href="http://www.tagspaces.org/">TagSpaces</a> (personal data manager)</li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
       <li><a href="http://www.mapbox.com/tilemill/">TileMill</a> (map design tool)</li>
+      <li><a href="http://doc.tiki.org/Syntax+Highlighter">Tiki</a> (wiki CMS groupware)</li>
       <li><a href="http://www.toolsverse.com/products/data-explorer/">Toolsverse Data Explorer</a> (database management)</li>
       <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a> (augmented editing)</li>
       <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>

From b5e401f5956172806ed3c8b97c1ac9db746cce8d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 9 Dec 2014 17:11:52 +0100
Subject: [PATCH 1767/4742] Draw selection the correct width during an
 operation that changes doc width

Closes #2968
---
 lib/codemirror.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f070d17bc1..1cd6a07a92 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -161,6 +161,7 @@
     d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
     // Set to the height of the document, allowing scrolling.
     d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
+    d.sizerWidth = null;
     // Behavior of elts with overflow: auto and padding is
     // inconsistent across browsers. This is used to ensure the
     // scrollable area is big enough.
@@ -266,6 +267,7 @@
     if (cm.options.lineWrapping) {
       addClass(cm.display.wrapper, "CodeMirror-wrap");
       cm.display.sizer.style.minWidth = "";
+      cm.display.sizerWidth = null;
     } else {
       rmClass(cm.display.wrapper, "CodeMirror-wrap");
       findMaxLine(cm);
@@ -1412,7 +1414,8 @@
   function drawSelectionRange(cm, range, output) {
     var display = cm.display, doc = cm.doc;
     var fragment = document.createDocumentFragment();
-    var padding = paddingH(cm.display), leftSide = padding.left, rightSide = display.lineSpace.offsetWidth - padding.right;
+    var padding = paddingH(cm.display), leftSide = padding.left;
+    var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
 
     function add(left, top, width, bottom) {
       if (top < 0) top = 0;
@@ -2149,6 +2152,7 @@
     // updateDisplay_W2 will use these properties to do the actual resizing
     if (display.maxLineChanged && !cm.options.lineWrapping) {
       op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
+      cm.display.sizerWidth = op.adjustWidthTo;
       op.barMeasure.scrollWidth =
         Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
       op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));

From 4449d55f288a433409ea0d48c2befd6eba40148f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 9 Dec 2014 17:28:28 +0100
Subject: [PATCH 1768/4742] [textile mode] Require non-space characters
 directly inside phrase modifiers

Issue #2967
---
 mode/textile/test.js    | 3 +++
 mode/textile/textile.js | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mode/textile/test.js b/mode/textile/test.js
index 83af8b1f0d..49cdaf9c91 100644
--- a/mode/textile/test.js
+++ b/mode/textile/test.js
@@ -411,4 +411,7 @@
 
   MT('phrase-non-word',
      '[negative -x-] aaa-bbb ccc-ddd [negative -eee-] fff [negative -ggg-]');
+
+  MT('phrase-lone-dash',
+     'foo - bar - baz');
 })();
diff --git a/mode/textile/textile.js b/mode/textile/textile.js
index 35029a772c..8ce71c08e4 100644
--- a/mode/textile/textile.js
+++ b/mode/textile/textile.js
@@ -117,14 +117,16 @@
   }
 
   function togglePhraseModifier(stream, state, phraseModifier, closeRE, openSize) {
+    var charBefore = stream.pos > openSize ? stream.string.charAt(stream.pos - openSize - 1) : null;
+    var charAfter = stream.peek();
     if (state[phraseModifier]) {
-      if (stream.match(/^($|\W)/, false)) {
+      if ((!charAfter || /\W/.test(charAfter)) && charBefore && /\S/.test(charBefore)) {
         var type = tokenStyles(state);
         state[phraseModifier] = false;
         return type;
       }
-    } else if ((stream.pos == openSize || /\W/.test(stream.string.charAt(stream.pos - 1 - openSize))) &&
-               stream.match(new RegExp("^.*" + closeRE.source + "(?=\\W|$)"), false)) {
+    } else if ((!charBefore || /\W/.test(charBefore)) && charAfter && /\S/.test(charAfter) &&
+               stream.match(new RegExp("^.*\\S" + closeRE.source + "(?:\\W|$)"), false)) {
       state[phraseModifier] = true;
       state.mode = Modes.attributes;
     }

From de62c96c4425e008d762a07dc834251acaf9f100 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 9 Dec 2014 18:04:20 +0100
Subject: [PATCH 1769/4742] [panel demo] Improve look

---
 demo/panel.html | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/demo/panel.html b/demo/panel.html
index 4a9a8c2e21..7f4bbefca6 100644
--- a/demo/panel.html
+++ b/demo/panel.html
@@ -9,8 +9,15 @@
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../addon/display/panel.js"></script>
 <style type="text/css">
-  .border {border-top: 1px solid black; border-bottom: 1px solid black;}
+  .border {border: 1px solid black; border-bottom: 1px solid black;}
   .add { background: orange; padding: 1px 3px; color: white !important; border-radius: 4px; }
+  .panel {
+    background-image: linear-gradient(to bottom, #ffffaa, #ffffdd);
+    padding: 3px 7px;
+  }
+  .panel.top { border-bottom: 1px solid #dd6; }
+  .panel.bottom { border-top: 1px solid #dd6; }
+  .panel span { cursor: pointer; }
 </style>
 
 <div id=nav>
@@ -39,16 +46,11 @@ <h2>Panel Demo</h2>
   lineNumbers: true
 });
 
-var colors = ["red", "blue", "orange", "purple"], colorIndex = 0;
 function addPanel(where) {
   var node = document.createElement("div");
-  node.style.cssText = "background: " + colors[colorIndex] +
-    "; border-radius: 5px; padding: 5px 10px";
-  colorIndex = (colorIndex + 1) % colors.length;
+  node.className = "panel " + where;
   var close = node.appendChild(document.createElement("span"));
   close.textContent = "✖ Remove this panel";
-  close.style.cssText = "color: white; cursor: pointer; " +
-    "text-decoration: underline";
   var widget = editor.addPanel(node, {position: where});
   CodeMirror.on(close, "click", function() { widget.clear(); });
 }</script>

From 944815a6dff91b8dbeab42e1699fccfb8da058ca Mon Sep 17 00:00:00 2001
From: nextrevision <notarobot@nextrevision.net>
Date: Tue, 9 Dec 2014 22:31:33 -0500
Subject: [PATCH 1770/4742] [puppet mode] Fix infinite loop when adding a
 capital letter

A loop is caused in the Puppet mode when adding a capital letter
due to an incomplete regex match and use of the backUp function.
Resolving this issue required checking for a full match against
the word before calling backUp on the stream.
---
 mode/puppet/puppet.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/puppet/puppet.js b/mode/puppet/puppet.js
index b407ded883..e7f799f78a 100644
--- a/mode/puppet/puppet.js
+++ b/mode/puppet/puppet.js
@@ -140,11 +140,11 @@ CodeMirror.defineMode("puppet", function () {
       return words[word];
     }
     // Is there a match on a reference?
-    if (/(\s+)?[A-Z]/.test(word)) {
+    if (/(^|\s+)[A-Z][\w:_]+/.test(word)) {
       // Negate the next()
       stream.backUp(1);
       // Match the full reference
-      stream.match(/(\s+)?[A-Z][\w:_]+/);
+      stream.match(/(^|\s+)[A-Z][\w:_]+/);
       return 'def';
     }
     // Have we matched the prior resource regex?

From cb714803f8b09ae483659eb4108e28184748e928 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 10 Dec 2014 16:45:28 +0100
Subject: [PATCH 1771/4742] Prevent resetInput from breaking context menu
 'select all' in FF

Closes #2974
---
 lib/codemirror.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1cd6a07a92..4d0b12c498 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2582,6 +2582,7 @@
   // Reset the input to correspond to the selection (or to be empty,
   // when not typing and nothing is selected)
   function resetInput(cm, typing) {
+    if (cm.display.contextMenuPending) return;
     var minimal, selected, doc = cm.doc;
     if (cm.somethingSelected()) {
       cm.display.prevInput = "";
@@ -3446,6 +3447,7 @@
     resetInput(cm);
     // Adds "Select all" to context menu in FF
     if (!cm.somethingSelected()) display.input.value = display.prevInput = " ";
+    display.contextMenuPending = true;
     display.selForContextMenu = cm.doc.sel;
     clearTimeout(display.detectingSelectAll);
 
@@ -3464,6 +3466,7 @@
       }
     }
     function rehide() {
+      display.contextMenuPending = false;
       display.inputDiv.style.position = "relative";
       display.input.style.cssText = oldCSS;
       if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);

From 2a083f19cde965b06222a676fe1ff8b56089627a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 10 Dec 2014 17:23:45 +0100
Subject: [PATCH 1772/4742] [hint addons] Don't include text after the cursor
 in completion

Completing inside a word used to try and take the whole word into
account. This is not typical completion behavior, and often not what
you want. After this change, the addons only take the part of the
word in front of the cursor into account.
---
 addon/hint/anyword-hint.js    |  3 +--
 addon/hint/css-hint.js        |  2 +-
 addon/hint/javascript-hint.js | 11 ++++++++---
 addon/hint/sql-hint.js        | 11 +++++++----
 addon/hint/xml-hint.js        |  7 +++----
 mode/css/index.html           |  7 ++++++-
 6 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index be72e2bc75..8e74a92080 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -17,8 +17,7 @@
     var word = options && options.word || WORD;
     var range = options && options.range || RANGE;
     var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
-    var start = cur.ch, end = start;
-    while (end < curLine.length && word.test(curLine.charAt(end))) ++end;
+    var end = cur.ch, start = end;
     while (start && word.test(curLine.charAt(start - 1))) --start;
     var curWord = start != end && curLine.slice(start, end);
 
diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 3300f4bd5a..488da3449e 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -20,7 +20,7 @@
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "css") return;
 
-    var word = token.string, start = token.start, end = token.end;
+    var start = token.start, end = cur.ch, word = token.string.slice(0, end - start);
     if (/[^\w$_-]/.test(word)) {
       word = ""; start = end = cur.ch;
     }
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index f6c2440062..7bcbf4a057 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -30,15 +30,20 @@
 
   function scriptHint(editor, keywords, getToken, options) {
     // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
+    var cur = editor.getCursor(), token = getToken(editor, cur);
     if (/\b(?:string|comment)\b/.test(token.type)) return;
     token.state = CodeMirror.innerMode(editor.getMode(), token.state).state;
 
     // If it's not a 'word-style' token, ignore the token.
     if (!/^[\w$_]*$/.test(token.string)) {
-      token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-                       type: token.string == "." ? "property" : null};
+      token = {start: cur.ch, end: cur.ch, string: "", state: token.state,
+               type: token.string == "." ? "property" : null};
+    } else if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
     }
+
+    var tprop = token;
     // If it is a property, find out what it is a property of.
     while (tprop.type == "property") {
       tprop = getToken(editor, Pos(cur.line, tprop.start));
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index c2b511fa2f..92c889e139 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -44,9 +44,7 @@
     }
   }
 
-  function nameCompletion(result, editor) {
-    var cur = editor.getCursor();
-    var token = editor.getTokenAt(cur);
+  function nameCompletion(cur, token, result, editor) {
     var useBacktick = (token.string.charAt(0) == "`");
     var string = token.string.substr(1);
     var prevToken = editor.getTokenAt(Pos(cur.line, token.start));
@@ -173,6 +171,11 @@
     var cur = editor.getCursor();
     var result = [];
     var token = editor.getTokenAt(cur), start, end, search;
+    if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
+    }
+
     if (token.string.match(/^[.`\w@]\w*$/)) {
       search = token.string;
       start = token.start;
@@ -182,7 +185,7 @@
       search = "";
     }
     if (search.charAt(0) == "." || search.charAt(0) == "`") {
-      nameCompletion(result, editor);
+      nameCompletion(cur, token, result, editor);
     } else {
       addMatches(result, search, tables, function(w) {return w;});
       addMatches(result, search, defaultTable, function(w) {return w;});
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index cc95b20f34..9b9baa0c67 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -18,10 +18,9 @@
     var quote = (options && options.quoteChar) || '"';
     if (!tags) return;
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    if (/^<\/?$/.test(token.string) && token.end == cur.ch) {
-      var nextToken = cm.getTokenAt(Pos(cur.line, cur.ch + 1));
-      if (nextToken.start == cur.ch && /\btag\b/.test(nextToken.type))
-        token = nextToken;
+    if (token.end > cur.ch) {
+      token.end = cur.ch;
+      token.string = token.string.slice(0, cur.ch - token.start);
     }
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "xml") return;
diff --git a/mode/css/index.html b/mode/css/index.html
index 3d2c127d25..2d2b9b073c 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -5,8 +5,11 @@
 <link rel=stylesheet href="../../doc/docs.css">
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../addon/hint/show-hint.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="css.js"></script>
+<script src="../../addon/hint/show-hint.js"></script>
+<script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
@@ -60,7 +63,9 @@ <h2>CSS mode</h2>
 }
 </textarea></form>
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        extraKeys: {"Ctrl-Space": "autocomplete"},
+      });
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/css</code>, <code>text/x-scss</code> (<a href="scss.html">demo</a>), <code>text/x-less</code> (<a href="less.html">demo</a>).</p>

From 261d3d3fb035b7350fe309edb7ca0f16c330f012 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 10 Dec 2014 17:25:12 +0100
Subject: [PATCH 1773/4742] [python-hint addon] Delete

The code was confused beyond belief, and the hintWords
functionality will provide the same completion power
without loading an additional addon.
---
 addon/hint/python-hint.js | 102 --------------------------------------
 doc/compress.html         |   1 -
 doc/manual.html           |   4 --
 3 files changed, 107 deletions(-)
 delete mode 100644 addon/hint/python-hint.js

diff --git a/addon/hint/python-hint.js b/addon/hint/python-hint.js
deleted file mode 100644
index 1b97f6ab0a..0000000000
--- a/addon/hint/python-hint.js
+++ /dev/null
@@ -1,102 +0,0 @@
-// 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"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function forEach(arr, f) {
-    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
-  }
-
-  function arrayContains(arr, item) {
-    if (!Array.prototype.indexOf) {
-      var i = arr.length;
-      while (i--) {
-        if (arr[i] === item) {
-          return true;
-        }
-      }
-      return false;
-    }
-    return arr.indexOf(item) != -1;
-  }
-
-  function scriptHint(editor, _keywords, getToken) {
-    // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
-    // If it's not a 'word-style' token, ignore the token.
-
-    if (!/^[\w$_]*$/.test(token.string)) {
-        token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-                         className: token.string == ":" ? "python-type" : null};
-    }
-
-    if (!context) var context = [];
-    context.push(tprop);
-
-    var completionList = getCompletions(token, context);
-    completionList = completionList.sort();
-
-    return {list: completionList,
-            from: CodeMirror.Pos(cur.line, token.start),
-            to: CodeMirror.Pos(cur.line, token.end)};
-  }
-
-  function pythonHint(editor) {
-    return scriptHint(editor, pythonKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
-  }
-  CodeMirror.registerHelper("hint", "python", pythonHint);
-
-  var pythonKeywords = "and del from not while as elif global or with assert else if pass yield"
-+ "break except import print class exec in raise continue finally is return def for lambda try";
-  var pythonKeywordsL = pythonKeywords.split(" ");
-  var pythonKeywordsU = pythonKeywords.toUpperCase().split(" ");
-
-  var pythonBuiltins = "abs divmod input open staticmethod all enumerate int ord str "
-+ "any eval isinstance pow sum basestring execfile issubclass print super"
-+ "bin file iter property tuple bool filter len range type"
-+ "bytearray float list raw_input unichr callable format locals reduce unicode"
-+ "chr frozenset long reload vars classmethod getattr map repr xrange"
-+ "cmp globals max reversed zip compile hasattr memoryview round __import__"
-+ "complex hash min set apply delattr help next setattr buffer"
-+ "dict hex object slice coerce dir id oct sorted intern ";
-  var pythonBuiltinsL = pythonBuiltins.split(" ").join("() ").split(" ");
-  var pythonBuiltinsU = pythonBuiltins.toUpperCase().split(" ").join("() ").split(" ");
-
-  function getCompletions(token, context) {
-    var found = [], start = token.string;
-    function maybeAdd(str) {
-      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
-    }
-
-    function gatherCompletions(_obj) {
-        forEach(pythonBuiltinsL, maybeAdd);
-        forEach(pythonBuiltinsU, maybeAdd);
-        forEach(pythonKeywordsL, maybeAdd);
-        forEach(pythonKeywordsU, maybeAdd);
-    }
-
-    if (context) {
-      // If this is a property, see if it belongs to some object we can
-      // find in the current environment.
-      var obj = context.pop(), base;
-
-      if (obj.type == "variable")
-          base = obj.string;
-      else if(obj.type == "variable-3")
-          base = ":" + obj.string;
-
-      while (base != null && context.length)
-        base = base[context.pop().string];
-      if (base != null) gatherCompletions(base);
-    }
-    return found;
-  }
-});
diff --git a/doc/compress.html b/doc/compress.html
index 3e047ca8f5..c729cc6ed8 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -217,7 +217,6 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/mode/multiplex.js">multiplex.js</option>
           <option value="http://codemirror.net/addon/mode/overlay.js">overlay.js</option>
           <option value="http://codemirror.net/addon/display/placeholder.js">placeholder.js</option>
-          <option value="http://codemirror.net/addon/hint/python-hint.js">python-hint.js</option>
           <option value="http://codemirror.net/addon/display/rulers.js">rulers.js</option>
           <option value="http://codemirror.net/addon/runmode/runmode.js">runmode.js</option>
           <option value="http://codemirror.net/addon/runmode/runmode.node.js">runmode.node.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index c08c52b9b2..8cee223d68 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2566,10 +2566,6 @@ <h2 id="addons">Addons</h2>
       <dd>A hinting function for CSS, SCSS, or LESS code.
       Defines <code>CodeMirror.hint.css</code>.</dd>
 
-      <dt id="addon_python-hint"><a href="../addon/hint/python-hint.js"><code>hint/python-hint.js</code></a></dt>
-      <dd>A very simple hinting function for Python code.
-      Defines <code>CodeMirror.hint.python</code>.</dd>
-
       <dt id="addon_anyword-hint"><a href="../addon/hint/anyword-hint.js"><code>hint/anyword-hint.js</code></a></dt>
       <dd>A very simple hinting function
       (<code>CodeMirror.hint.anyword</code>) that simply looks for

From b945a34173197c836cb6446637434afa3b05f99e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 10 Dec 2014 17:41:52 +0100
Subject: [PATCH 1774/4742] Immediately read input on "input" event

To prevent race conditions where an API call triggers a
resetInput before the new input has been read.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4d0b12c498..151925f7fb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2660,7 +2660,7 @@
     on(d.input, "keyup", function(e) { onKeyUp.call(cm, e); });
     on(d.input, "input", function() {
       if (ie && ie_version >= 9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
-      fastPoll(cm);
+      readInput(cm);
     });
     on(d.input, "keydown", operation(cm, onKeyDown));
     on(d.input, "keypress", operation(cm, onKeyPress));

From b833e63142d18e89a43cc37b712325f5b530c08c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 10 Dec 2014 18:06:03 +0100
Subject: [PATCH 1775/4742] Allow clearing of cursor selections by
 ctrl-clicking them

Closes #2658
---
 lib/codemirror.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 151925f7fb..25d0bd3aa3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2837,9 +2837,10 @@
       lastClick = {time: now, pos: start};
     }
 
-    var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey;
+    var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
     if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
-        type == "single" && sel.contains(start) > -1 && sel.somethingSelected())
+        type == "single" && (contained = sel.contains(start)) > -1 &&
+        !sel.ranges[contained].empty())
       leftButtonStartDrag(cm, e, start, modifier);
     else
       leftButtonSelect(cm, e, start, type, modifier);
@@ -2878,11 +2879,11 @@
     var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
 
-    var ourRange, ourIndex, startSel = doc.sel;
+    var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
     if (addNew && !e.shiftKey) {
       ourIndex = doc.sel.contains(start);
       if (ourIndex > -1)
-        ourRange = doc.sel.ranges[ourIndex];
+        ourRange = ranges[ourIndex];
       else
         ourRange = new Range(start, start);
     } else {
@@ -2914,12 +2915,15 @@
       ourIndex = 0;
       setSelection(doc, new Selection([ourRange], 0), sel_mouse);
       startSel = doc.sel;
-    } else if (ourIndex > -1) {
-      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
-    } else {
-      ourIndex = doc.sel.ranges.length;
-      setSelection(doc, normalizeSelection(doc.sel.ranges.concat([ourRange]), ourIndex),
+    } else if (ourIndex == -1) {
+      ourIndex = ranges.length;
+      setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
                    {scroll: false, origin: "*mouse"});
+    } else if (ranges.length > 1 && ranges[ourIndex].empty()) {
+      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0));
+      startSel = doc.sel;
+    } else {
+      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
     }
 
     var lastPos = start;

From d05a998ef4776148d92013664ac857ccbb1d0121 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakubvrana@google.com>
Date: Tue, 9 Dec 2014 15:20:18 -0800
Subject: [PATCH 1776/4742] [soy mode] Add

See https://developers.google.com/closure/templates/ for documentation.
Closure Templates support text, HTML, JS and CSS code.

I'm not extremely happy with the indentation which is currently based
just on the Soy tags, not on the underlying code. Although this style
is possible and sometimes used, it's not the most common style.
---
 mode/soy/index.html |  60 +++++++++++++++
 mode/soy/soy.js     | 175 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 235 insertions(+)
 create mode 100644 mode/soy/index.html
 create mode 100644 mode/soy/soy.js

diff --git a/mode/soy/index.html b/mode/soy/index.html
new file mode 100644
index 0000000000..e83f372a93
--- /dev/null
+++ b/mode/soy/index.html
@@ -0,0 +1,60 @@
+<!doctype html>
+
+<title>CodeMirror: Soy (Closure Template) 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/edit/matchbrackets.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../javascript/javascript.js"></script>
+<script src="../css/css.js"></script>
+<script src="soy.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="#">Soy (Closure Template)</a>
+  </ul>
+</div>
+
+<article>
+<h2>Soy (Closure Template) mode</h2>
+<form><textarea id="code" name="code">
+{namespace example}
+
+/**
+ * Says hello to the world.
+ */
+{template .helloWorld}
+  {@param name: string}
+  Hello <b>{$name}</b>!
+{/template}
+
+{template .alertHelloWorld kind="js"}
+  alert('Hello World');
+{/template}
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-soy",
+        indentUnit: 2,
+        indentWithTabs: false
+      });
+    </script>
+
+    <p>A mode for <a href="https://developers.google.com/closure/templates/">Closure Templates</a> (Soy).</p>
+    <p><strong>MIME type defined:</strong> <code>text/x-soy</code>.</p>
+  </article>
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
new file mode 100644
index 0000000000..2973971d20
--- /dev/null
+++ b/mode/soy/soy.js
@@ -0,0 +1,175 @@
+// 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("../htmlmixed/htmlmixed"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("soy", function(config, parserConfig) {
+    var textMode = CodeMirror.getMode(config, "text/plain");
+    var modes = {
+      html: CodeMirror.getMode(config, "text/html"),
+      attributes: textMode,
+      text: textMode,
+      uri: textMode,
+      css: CodeMirror.getMode(config, "text/css"),
+      js: CodeMirror.getMode(config, "text/javascript")
+    };
+
+    var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif", "else", "switch", "case", "default", "foreach", "ifempty", "for", "call", "param", "log"];
+
+    function last(array) {
+      return array[array.length - 1];
+    }
+
+    function maybeBackUp(stream, state, backUpOn) {
+      var token = state.localMode.token(stream, state.localState);
+      var pos = stream.current().search(backUpOn);
+      if (pos > 0) {
+        stream.backUp(stream.current().length - pos);
+      }
+      return token;
+    }
+
+    return {
+      startState: function() {
+        return {
+          kind: [],
+          kindTag: [],
+          soyState: [],
+          localMode: modes.html,
+          localState: CodeMirror.startState(modes.html)
+        };
+      },
+
+      copyState: function(state) {
+        return {
+          tag: state.tag, // Last seen Soy tag.
+          kind: state.kind.concat([]), // Values of kind="" attributes.
+          kindTag: state.kindTag.concat([]), // Opened tags with kind="" attributes.
+          soyState: state.soyState.concat([]),
+          indent: state.indent, // Indentation of the following line.
+          localMode: state.localMode,
+          localState: CodeMirror.copyState(state.localMode, state.localState)
+        };
+      },
+
+      token: function(stream, state) {
+        var match;
+
+        switch (last(state.soyState)) {
+          case "comment":
+            if (stream.match(/^.*?\*\//)) {
+              state.soyState.pop();
+            } else {
+              stream.skipToEnd();
+            }
+            return "comment";
+
+          case "variable":
+            if (stream.match(/^}/)) {
+              state.indent -= 2 * config.indentUnit;
+              state.soyState.pop();
+              return "variable-2";
+            }
+            stream.next();
+            return null;
+
+          case "tag":
+            if (stream.match(/^\/?}/)) {
+              state.indent -= (/^\//.test(state.tag) || stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1) * config.indentUnit;
+              state.soyState.pop();
+              return "keyword";
+            } else if (stream.match(/^(\w+)(?==)/i)) {
+              if (stream.current() == "kind" && (match = stream.match(/^="([^"]+)/, false))) {
+                var kind = match[1];
+                state.kind.push(kind);
+                state.kindTag.push(state.tag);
+                state.localMode = modes[kind] || modes.html;
+                state.localState = CodeMirror.startState(state.localMode, state.indent); // TODO: Base indent isn't supported by the HTML mode.
+              }
+              return "attribute";
+            } else if (stream.match(/^"/)) {
+              state.soyState.push("string");
+              return "string";
+            }
+            stream.next();
+            return null;
+
+          case "literal":
+            if (stream.match(/^\{\/literal}/)) {
+              state.indent -= config.indentUnit;
+              state.soyState.pop();
+              return "keyword";
+            }
+            return maybeBackUp(stream, state, /\{/);
+
+          case "string":
+            if (stream.match(/^.*?"/)) {
+              state.soyState.pop();
+            } else {
+              stream.skipToEnd();
+            }
+            return "string";
+
+        }
+
+        if (stream.match(/^\/\*/)) {
+          state.soyState.push("comment");
+          return "comment";
+        } else if (stream.match(stream.sol() ? /^\/\// : /^\s+\/\//)) {
+          return "comment";
+        } else if (stream.match(/^\{\$\w*/i)) {
+          state.indent = stream.indentation() + 2 * config.indentUnit;
+          state.soyState.push("variable");
+          return "variable-2";
+        } else if (stream.match(/^\{literal}/i)) {
+          state.indent = stream.indentation() + config.indentUnit;
+          state.soyState.push("literal");
+          return "keyword";
+        } else if (match = stream.match(/^\{([/@\\]?\w*)/i)) {
+          state.indent = stream.indentation() + 2 * config.indentUnit;
+          state.tag = match[1];
+          if (state.tag == "/" + last(state.kindTag)) {
+            // We found the tag that opened the current kind="".
+            state.kind.pop();
+            state.kindTag.pop();
+            state.localMode = modes[last(state.kind)] || modes.html;
+            state.localState = CodeMirror.startState(state.localMode, state.indent);
+          }
+          state.soyState.push("tag");
+          return "keyword";
+        }
+
+        return maybeBackUp(stream, state, /\{|\/\/|\/\*/);
+      },
+
+      indent: function(state, textAfter) {
+        if (/^\{(\/|fallbackmsg|elseif|else|ifempty)\b/.test(textAfter)) {
+          return state.indent - config.indentUnit;
+        }
+        // TODO: Defer to inner modes.
+        return state.indent;
+      },
+
+      // We don't define innerMode because electricInput works only for inner modes and we need it to work for Soy.
+
+      electricInput: /(}|<\/[\s\w:]+>)$/, // This covers Soy, JS, CSS and HTML.
+      lineComment: "//",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      blockCommentContinue: " * ",
+      fold: "indent"
+    };
+  }, "htmlmixed");
+
+  CodeMirror.registerHelper("hintWords", "soy", "delpackage namespace alias template param literal print msg fallbackmsg let if elseif else switch case default foreach ifempty for call param deltemplate delcall css log debugger".split(" "));
+
+  CodeMirror.defineMIME("text/x-soy", "soy");
+});

From a4ec3433e958e96d3bdff33810dafd287a2353fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Dec 2014 09:42:14 +0100
Subject: [PATCH 1777/4742] [soy mode] Integrate, fix innerMode

---
 doc/compress.html |  2 ++
 mode/index.html   |  1 +
 mode/meta.js      |  1 +
 mode/soy/soy.js   | 26 +++++++++++++++++---------
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index c729cc6ed8..eb8b007d47 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -165,6 +165,8 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/smalltalk/smalltalk.js">smalltalk.js</option>
           <option value="http://codemirror.net/mode/smarty/smarty.js">smarty.js</option>
           <option value="http://codemirror.net/mode/smartymixed/smartymixed.js">smartymixed.js</option>
+          <option value="http://codemirror.net/mode/solr/solr.js">solr.js</option>
+          <option value="http://codemirror.net/mode/soy/soy.js">soy.js</option>
           <option value="http://codemirror.net/mode/sql/sql.js">sql.js</option>
           <option value="http://codemirror.net/mode/sparql/sparql.js">sparql.js</option>
           <option value="http://codemirror.net/mode/stex/stex.js">stex.js</option>
diff --git a/mode/index.html b/mode/index.html
index 14a3f10ea4..cccd3b48b9 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -106,6 +106,7 @@ <h2>Language modes</h2>
       <li><a href="smarty/index.html">Smarty</a></li>
       <li><a href="smartymixed/index.html">Smarty/HTML mixed</a></li>
       <li><a href="solr/index.html">Solr</a></li>
+      <li><a href="soy/index.html">Soy</a></li>
       <li><a href="sql/index.html">SQL</a> (several dialects)</li>
       <li><a href="sparql/index.html">SPARQL</a></li>
       <li><a href="stex/index.html">sTeX, LaTeX</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 12332002c0..507b0cc55b 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -105,6 +105,7 @@
     {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
     {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
     {name: "Solr", mime: "text/x-solr", mode: "solr"},
+    {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
     {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
     {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 2973971d20..025d1e3a1d 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -11,7 +11,7 @@
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineMode("soy", function(config, parserConfig) {
+  CodeMirror.defineMode("soy", function(config) {
     var textMode = CodeMirror.getMode(config, "text/plain");
     var modes = {
       html: CodeMirror.getMode(config, "text/html"),
@@ -22,7 +22,9 @@
       js: CodeMirror.getMode(config, "text/javascript")
     };
 
-    var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif", "else", "switch", "case", "default", "foreach", "ifempty", "for", "call", "param", "log"];
+    var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
+                         "else", "switch", "case", "default", "foreach", "ifempty", "for",
+                         "call", "param", "log"];
 
     function last(array) {
       return array[array.length - 1];
@@ -117,7 +119,6 @@
               stream.skipToEnd();
             }
             return "string";
-
         }
 
         if (stream.match(/^\/\*/)) {
@@ -133,7 +134,7 @@
           state.indent = stream.indentation() + config.indentUnit;
           state.soyState.push("literal");
           return "keyword";
-        } else if (match = stream.match(/^\{([/@\\]?\w*)/i)) {
+        } else if (match = stream.match(/^\{([\/@\\]?\w*)/i)) {
           state.indent = stream.indentation() + 2 * config.indentUnit;
           state.tag = match[1];
           if (state.tag == "/" + last(state.kindTag)) {
@@ -151,16 +152,20 @@
       },
 
       indent: function(state, textAfter) {
-        if (/^\{(\/|fallbackmsg|elseif|else|ifempty)\b/.test(textAfter)) {
+        if (/^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(textAfter))
           return state.indent - config.indentUnit;
-        }
+
         // TODO: Defer to inner modes.
         return state.indent;
       },
 
-      // We don't define innerMode because electricInput works only for inner modes and we need it to work for Soy.
+      innerMode: function(state) {
+        var ctx = last(state.soyState);
+        if (ctx == "comment" || ctx == "variable" || ctx == "tag") return null;
+        else return {state: state.localState, mode: state.localMode};
+      },
 
-      electricInput: /(}|<\/[\s\w:]+>)$/, // This covers Soy, JS, CSS and HTML.
+      electricInput: /^\s*(}|{\/)$/,
       lineComment: "//",
       blockCommentStart: "/*",
       blockCommentEnd: "*/",
@@ -169,7 +174,10 @@
     };
   }, "htmlmixed");
 
-  CodeMirror.registerHelper("hintWords", "soy", "delpackage namespace alias template param literal print msg fallbackmsg let if elseif else switch case default foreach ifempty for call param deltemplate delcall css log debugger".split(" "));
+  CodeMirror.registerHelper(("hintWords", "soy", "delpackage namespace alias template param " +
+                             "literal print msg fallbackmsg let if elseif else switch case " +
+                             "default foreach ifempty for call param deltemplate delcall css " +
+                             "log debugger").split(" "));
 
   CodeMirror.defineMIME("text/x-soy", "soy");
 });

From c983dc1ce4b69ba45e78f1591760c6a0ea281dcf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 12 Dec 2014 10:28:50 +0100
Subject: [PATCH 1778/4742] [show-hint addon] Fix widget horizontal positioning

Closes #2983
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 27b770bdef..fda5ffaa16 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -243,7 +243,7 @@
         }
       }
     }
-    var overlapX = box.left - winW;
+    var overlapX = box.right - winW;
     if (overlapX > 0) {
       if (box.right - box.left > winW) {
         hints.style.width = (winW - 5) + "px";

From 63e0effd2e6dcf10703e224aa06a5fd209ee6265 Mon Sep 17 00:00:00 2001
From: Robert Plummer <RobertLeePlummerJr@Gmail.com>
Date: Wed, 10 Dec 2014 15:49:30 -0500
Subject: [PATCH 1779/4742] [spreadsheet mode] Add

---
 mode/index.html                 |   7 +-
 mode/spreadsheet/index.html     |  42 +++++++++++
 mode/spreadsheet/spreadsheet.js | 121 ++++++++++++++++++++++++++++++++
 3 files changed, 167 insertions(+), 3 deletions(-)
 create mode 100644 mode/spreadsheet/index.html
 create mode 100644 mode/spreadsheet/spreadsheet.js

diff --git a/mode/index.html b/mode/index.html
index cccd3b48b9..c933e1e943 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -19,16 +19,16 @@
 
 <article>
 
-<h2>Language modes</h2>
+  <h2>Language modes</h2>
 
-<p>This is a list of every mode in the distribution. Each mode lives
+  <p>This is a list of every mode in the distribution. Each mode lives
 in a subdirectory of the <code>mode/</code> directory, and typically
 defines a single JavaScript file that implements the mode. Loading
 such file will make the language available to CodeMirror, through
 the <a href="../doc/manual.html#option_mode"><code>mode</code></a>
 option.</p>
 
-<div style="-webkit-columns: 100px 2; -moz-columns: 100px 2; columns: 100px 2;">
+  <div style="-webkit-columns: 100px 2; -moz-columns: 100px 2; columns: 100px 2;">
     <ul style="margin-top: 0">
       <li><a href="apl/index.html">APL</a></li>
       <li><a href="asterisk/index.html">Asterisk dialplan</a></li>
@@ -96,6 +96,7 @@ <h2>Language modes</h2>
       <li><a href="ruby/index.html">Ruby</a></li>
       <li><a href="rust/index.html">Rust</a></li>
       <li><a href="sass/index.html">Sass</a></li>
+      <li><a href="spreadsheet/index.html">Spreadsheet</a></li>
       <li><a href="clike/scala.html">Scala</a></li>
       <li><a href="scheme/index.html">Scheme</a></li>
       <li><a href="css/scss.html">SCSS</a></li>
diff --git a/mode/spreadsheet/index.html b/mode/spreadsheet/index.html
new file mode 100644
index 0000000000..a52f76f050
--- /dev/null
+++ b/mode/spreadsheet/index.html
@@ -0,0 +1,42 @@
+<!doctype html>
+
+<title>CodeMirror: Spreadsheet 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/edit/matchbrackets.js"></script>
+<script src="spreadsheet.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="#">Spreadsheet</a>
+  </ul>
+</div>
+
+<article>
+  <h2>Spreadsheet mode</h2>
+  <form><textarea id="code" name="code">=IF(A1:B2, TRUE, FALSE) / 100</textarea></form>
+
+  <script>
+    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+      lineNumbers: true,
+      matchBrackets: true,
+      extraKeys: {"Tab":  "indentAuto"}
+    });
+  </script>
+
+  <p><strong>MIME types defined:</strong> <code>text/x-spreadsheet</code>.</p>
+  
+  <h3>The Spreadsheet Mode</h3>
+  <p> Created by <a href="https://github.com/robertleeplummerjr">Robert Plummer</a></p>
+</article>
diff --git a/mode/spreadsheet/spreadsheet.js b/mode/spreadsheet/spreadsheet.js
new file mode 100644
index 0000000000..7f7f495f8c
--- /dev/null
+++ b/mode/spreadsheet/spreadsheet.js
@@ -0,0 +1,121 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("spreadsheet", function () {
+    var stateType = {
+	  string: 'string',
+	  characterClass: 'characterClass'
+    };
+
+    return {
+      startState: function () {
+        return {
+          stringType: null,
+          stack: []
+        };
+      },
+      token: function (stream, state) {
+        if (!stream) return;
+
+        //check for state changes
+        if (state.stack.length === 0) {
+          //strings
+          if ((stream.peek() == '"') || (stream.peek() == "'")) {
+            state.stringType = stream.peek();
+            stream.next(); // Skip quote
+            state.stack.unshift(stateType.string);
+          }
+        }
+
+        //return state
+        //stack has
+        switch (state.stack[0]) {
+          case stateType.string:
+            while (state.stack[0] === stateType.string && !stream.eol()) {
+              if (stream.peek() === state.stringType) {
+                stream.next(); // Skip quote
+                state.stack.shift(); // Clear flag
+              } else if (stream.peek() === "\\") {
+                stream.next();
+                stream.next();
+              } else {
+                stream.match(/^.[^\\\"\']*/);
+              }
+            }
+            return "string";
+
+          case stateType.characterClass:
+            while (state.stack[0] === stateType.characterClass && !stream.eol()) {
+              if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
+                state.stack.shift();
+              }
+            }
+            return "operator";
+        }
+
+        var peek = stream.peek();
+
+        //no stack
+        switch (peek) {
+          case "[":
+            stream.next();
+            state.stack.unshift(stateType.characterClass);
+            return "bracket";
+          case ":":
+            stream.next();
+            return "operator";
+          case "\\":
+            if (stream.match(/[\][a-z]+/)) {
+              return "string-2";
+            }
+
+          case ".":
+          case ",":
+          case ";":
+          case "*":
+          case "-":
+          case "+":
+          case "^":
+          case "<":
+          case "/":
+          case "=":
+            stream.next();
+            return "atom";
+          case "$":
+            stream.next();
+            return "builtin";
+        }
+
+        if (stream.match(/[0-9]+/)) {
+          if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
+            return "error";
+          }
+          return "number";
+        } else if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
+          if (stream.match(/(?=[\(.])/, false)) {
+            return "keyword";
+          }
+          return "variable-2";
+        } else if (["[", "]", "(", ")", "{", "}"].indexOf(peek) != -1) {
+          stream.next();
+          return "bracket";
+        } else if (!stream.eatSpace()) {
+          stream.next();
+        }
+        return null;
+      }
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-spreadsheet", "spreadsheet");
+});
\ No newline at end of file

From eb8f15c26e6880adc93c7c01ff7bf85ddf979465 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 12 Dec 2014 10:58:36 +0100
Subject: [PATCH 1780/4742] [spreadsheet mode] Integrate

Issue #2976
---
 doc/compress.html               |   3 +-
 mode/meta.js                    |   1 +
 mode/spreadsheet/spreadsheet.js | 110 ++++++++++++++------------------
 3 files changed, 52 insertions(+), 62 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index eb8b007d47..b81bd48dda 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -167,8 +167,9 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/smartymixed/smartymixed.js">smartymixed.js</option>
           <option value="http://codemirror.net/mode/solr/solr.js">solr.js</option>
           <option value="http://codemirror.net/mode/soy/soy.js">soy.js</option>
-          <option value="http://codemirror.net/mode/sql/sql.js">sql.js</option>
           <option value="http://codemirror.net/mode/sparql/sparql.js">sparql.js</option>
+          <option value="http://codemirror.net/mode/spreadsheet/spreadsheet.js">spreadsheet.js</option>
+          <option value="http://codemirror.net/mode/sql/sql.js">sql.js</option>
           <option value="http://codemirror.net/mode/stex/stex.js">stex.js</option>
           <option value="http://codemirror.net/mode/tcl/tcl.js">tcl.js</option>
           <option value="http://codemirror.net/mode/textile/textile.js">textile.js</option>
diff --git a/mode/meta.js b/mode/meta.js
index 507b0cc55b..fcaed98e2d 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -107,6 +107,7 @@
     {name: "Solr", mime: "text/x-solr", mode: "solr"},
     {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
     {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
+    {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
     {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
diff --git a/mode/spreadsheet/spreadsheet.js b/mode/spreadsheet/spreadsheet.js
index 7f7f495f8c..6fab00fdda 100644
--- a/mode/spreadsheet/spreadsheet.js
+++ b/mode/spreadsheet/spreadsheet.js
@@ -12,11 +12,6 @@
   "use strict";
 
   CodeMirror.defineMode("spreadsheet", function () {
-    var stateType = {
-	  string: 'string',
-	  characterClass: 'characterClass'
-    };
-
     return {
       startState: function () {
         return {
@@ -33,78 +28,71 @@
           if ((stream.peek() == '"') || (stream.peek() == "'")) {
             state.stringType = stream.peek();
             stream.next(); // Skip quote
-            state.stack.unshift(stateType.string);
+            state.stack.unshift("string");
           }
         }
 
         //return state
         //stack has
         switch (state.stack[0]) {
-          case stateType.string:
-            while (state.stack[0] === stateType.string && !stream.eol()) {
-              if (stream.peek() === state.stringType) {
-                stream.next(); // Skip quote
-                state.stack.shift(); // Clear flag
-              } else if (stream.peek() === "\\") {
-                stream.next();
-                stream.next();
-              } else {
-                stream.match(/^.[^\\\"\']*/);
-              }
+        case "string":
+          while (state.stack[0] === "string" && !stream.eol()) {
+            if (stream.peek() === state.stringType) {
+              stream.next(); // Skip quote
+              state.stack.shift(); // Clear flag
+            } else if (stream.peek() === "\\") {
+              stream.next();
+              stream.next();
+            } else {
+              stream.match(/^.[^\\\"\']*/);
             }
-            return "string";
+          }
+          return "string";
 
-          case stateType.characterClass:
-            while (state.stack[0] === stateType.characterClass && !stream.eol()) {
-              if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
-                state.stack.shift();
-              }
-            }
-            return "operator";
+        case "characterClass":
+          while (state.stack[0] === "characterClass" && !stream.eol()) {
+            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./)))
+              state.stack.shift();
+          }
+          return "operator";
         }
 
         var peek = stream.peek();
 
         //no stack
         switch (peek) {
-          case "[":
-            stream.next();
-            state.stack.unshift(stateType.characterClass);
-            return "bracket";
-          case ":":
-            stream.next();
-            return "operator";
-          case "\\":
-            if (stream.match(/[\][a-z]+/)) {
-              return "string-2";
-            }
-
-          case ".":
-          case ",":
-          case ";":
-          case "*":
-          case "-":
-          case "+":
-          case "^":
-          case "<":
-          case "/":
-          case "=":
-            stream.next();
-            return "atom";
-          case "$":
-            stream.next();
-            return "builtin";
+        case "[":
+          stream.next();
+          state.stack.unshift("characterClass");
+          return "bracket";
+        case ":":
+          stream.next();
+          return "operator";
+        case "\\":
+          if (stream.match(/\\[a-z]+/)) return "string-2";
+          else return null;
+        case ".":
+        case ",":
+        case ";":
+        case "*":
+        case "-":
+        case "+":
+        case "^":
+        case "<":
+        case "/":
+        case "=":
+          stream.next();
+          return "atom";
+        case "$":
+          stream.next();
+          return "builtin";
         }
 
-        if (stream.match(/[0-9]+/)) {
-          if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
-            return "error";
-          }
+        if (stream.match(/\d+/)) {
+          if (stream.match(/^\w+/)) return "error";
           return "number";
-        } else if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
-          if (stream.match(/(?=[\(.])/, false)) {
-            return "keyword";
-          }
+        } else if (stream.match(/^[a-zA-Z_]\w*/)) {
+          if (stream.match(/(?=[\(.])/, false)) return "keyword";
           return "variable-2";
         } else if (["[", "]", "(", ")", "{", "}"].indexOf(peek) != -1) {
           stream.next();
@@ -118,4 +106,4 @@
   });
 
   CodeMirror.defineMIME("text/x-spreadsheet", "spreadsheet");
-});
\ No newline at end of file
+});

From 6f25f676101438045b61b344efea177a007c55aa Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 12 Dec 2014 01:30:18 +0400
Subject: [PATCH 1781/4742] [vim] paragraph text object should be linewise

---
 keymap/vim.js    | 12 ++++++++++--
 test/vim_test.js | 18 ++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index bcb6b8751d..97833bd4ae 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1734,7 +1734,7 @@
         return Pos(lineNum,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
       },
-      textObjectManipulation: function(cm, head, motionArgs) {
+      textObjectManipulation: function(cm, head, motionArgs, vim) {
         // TODO: lots of possible exceptions that can be thrown here. Try da(
         //     outside of a () block.
 
@@ -1774,6 +1774,14 @@
                                                      false /** bigWord */);
         } else if (character === 'p') {
           tmp = findParagraph(cm, head, motionArgs.repeat, 0, inclusive);
+          motionArgs.linewise = true;
+          if (vim.visualMode) {
+            if (!vim.visualLine) { vim.visualLine = true; }
+          } else {
+            var operatorArgs = vim.inputState.operatorArgs;
+            if (operatorArgs) { operatorArgs.linewise = true; }
+            tmp.end.line--;
+          }
         } else {
           // No text object defined for this, don't move.
           return null;
@@ -3300,7 +3308,7 @@
       }
 
       var vim = cm.state.vim;
-      if (vim.visualMode && isBoundary(line, 1, true)) {
+      if (vim.visualLine && isBoundary(line, 1, true)) {
         var anchor = vim.sel.anchor;
         if (isBoundary(anchor.line, -1, true)) {
           if (!inclusive || anchor.line != line) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 2373c0afac..13b8ca39b9 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -533,10 +533,10 @@ testVim('paragraph motions', function(cm, vim, helpers) {
   eqPos(Pos(7, 0), cm.getCursor('anchor'));
   eqPos(Pos(16, 1), cm.getCursor('head'));
 
-  // TODO: this should switch to visual mode
-  // cm.setCursor(14, 0);
-  // helpers.doKeys('<Esc>', 'v', 'i', 'p');
-  // helpers.assertCursorAt(14, 0);
+  // should switch to visualLine mode
+  cm.setCursor(14, 0);
+  helpers.doKeys('<Esc>', 'v', 'i', 'p');
+  helpers.assertCursorAt(14, 0);
 
   cm.setCursor(14, 0);
   helpers.doKeys('<Esc>', 'V', 'i', 'p');
@@ -565,6 +565,16 @@ testVim('paragraph motions', function(cm, vim, helpers) {
   helpers.doKeys('v', 'a', 'p');
   eqPos(Pos(0, 0), cm.getCursor('anchor'));
   eqPos(Pos(4, 0), cm.getCursor('head'));
+
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'i', 'p');
+  var register = helpers.getRegisterController().getRegister();
+  eq('a\na\n', register.toString());
+  is(register.linewise);
+  helpers.doKeys('3', 'j', 'p');
+  helpers.doKeys('y', 'i', 'p');
+  is(register.linewise);
+  eq('b\na\na\nc\n', register.toString());
 }, { value: 'a\na\n\n\n\nb\nc\n\n\n\n\n\n\nd\n\ne\nf' });
 
 // Operator tests

From abbaa3eb075cb06237a65155da366f72810e2a1d Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakubvrana@google.com>
Date: Thu, 11 Dec 2014 11:18:44 -0800
Subject: [PATCH 1782/4742] Improve Soy indentation

---
 mode/soy/soy.js | 80 ++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 025d1e3a1d..d0dba679a2 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -11,10 +11,14 @@
 })(function(CodeMirror) {
   "use strict";
 
+  var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
+                       "else", "switch", "case", "default", "foreach", "ifempty", "for",
+                       "call", "param", "log"];
+
   CodeMirror.defineMode("soy", function(config) {
     var textMode = CodeMirror.getMode(config, "text/plain");
     var modes = {
-      html: CodeMirror.getMode(config, "text/html"),
+      html: CodeMirror.getMode(config, {name: "text/html", multilineTagIndentFactor: 2, multilineTagIndentPastTag: false}),
       attributes: textMode,
       text: textMode,
       uri: textMode,
@@ -22,21 +26,22 @@
       js: CodeMirror.getMode(config, "text/javascript")
     };
 
-    var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
-                         "else", "switch", "case", "default", "foreach", "ifempty", "for",
-                         "call", "param", "log"];
-
     function last(array) {
       return array[array.length - 1];
     }
 
-    function maybeBackUp(stream, state, backUpOn) {
-      var token = state.localMode.token(stream, state.localState);
-      var pos = stream.current().search(backUpOn);
-      if (pos > 0) {
-        stream.backUp(stream.current().length - pos);
+    function tokenUntil(stream, state, untilRegExp) {
+      var oldString = stream.string;
+      var match = untilRegExp.exec(oldString.substr(stream.pos));
+      if (match) {
+        // This uses an undocumented API.
+        stream.string = oldString.substr(0, stream.pos + match.index);
       }
-      return token;
+      var result = stream.hideFirstChars(state.indent, function() {
+        return state.localMode.token(stream, state.localState);
+      });
+      stream.string = oldString;
+      return result;
     }
 
     return {
@@ -45,6 +50,7 @@
           kind: [],
           kindTag: [],
           soyState: [],
+          indent: 0,
           localMode: modes.html,
           localState: CodeMirror.startState(modes.html)
         };
@@ -85,16 +91,16 @@
 
           case "tag":
             if (stream.match(/^\/?}/)) {
-              state.indent -= (/^\//.test(state.tag) || stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1) * config.indentUnit;
+              state.indent -= (/^\//.test(state.tag) ? 3 : (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1)) * config.indentUnit;
               state.soyState.pop();
               return "keyword";
-            } else if (stream.match(/^(\w+)(?==)/i)) {
+            } else if (stream.match(/^(\w+)(?==)/)) {
               if (stream.current() == "kind" && (match = stream.match(/^="([^"]+)/, false))) {
                 var kind = match[1];
                 state.kind.push(kind);
                 state.kindTag.push(state.tag);
                 state.localMode = modes[kind] || modes.html;
-                state.localState = CodeMirror.startState(state.localMode, state.indent); // TODO: Base indent isn't supported by the HTML mode.
+                state.localState = CodeMirror.startState(state.localMode);
               }
               return "attribute";
             } else if (stream.match(/^"/)) {
@@ -105,12 +111,12 @@
             return null;
 
           case "literal":
-            if (stream.match(/^\{\/literal}/)) {
+            if (stream.match(/^(?=\{\/literal})/)) {
               state.indent -= config.indentUnit;
               state.soyState.pop();
-              return "keyword";
+              return this.token(stream, state);
             }
-            return maybeBackUp(stream, state, /\{/);
+            return tokenUntil(stream, state, /\{\/literal}/);
 
           case "string":
             if (stream.match(/^.*?"/)) {
@@ -124,48 +130,48 @@
         if (stream.match(/^\/\*/)) {
           state.soyState.push("comment");
           return "comment";
-        } else if (stream.match(stream.sol() ? /^\/\// : /^\s+\/\//)) {
+        } else if (stream.match(stream.sol() ? /^\/\/.*/ : /^\s+\/\/.*/)) {
           return "comment";
-        } else if (stream.match(/^\{\$\w*/i)) {
-          state.indent = stream.indentation() + 2 * config.indentUnit;
+        } else if (stream.match(/^\{\$\w*/)) {
+          state.indent += 2 * config.indentUnit;
           state.soyState.push("variable");
           return "variable-2";
-        } else if (stream.match(/^\{literal}/i)) {
-          state.indent = stream.indentation() + config.indentUnit;
+        } else if (stream.match(/^\{literal}/)) {
+          state.indent += config.indentUnit;
           state.soyState.push("literal");
           return "keyword";
-        } else if (match = stream.match(/^\{([\/@\\]?\w*)/i)) {
-          state.indent = stream.indentation() + 2 * config.indentUnit;
+        } else if (match = stream.match(/^\{([\/@\\]?\w*)/)) {
+          state.indent += 2 * config.indentUnit;
           state.tag = match[1];
           if (state.tag == "/" + last(state.kindTag)) {
             // We found the tag that opened the current kind="".
             state.kind.pop();
             state.kindTag.pop();
             state.localMode = modes[last(state.kind)] || modes.html;
-            state.localState = CodeMirror.startState(state.localMode, state.indent);
+            state.localState = CodeMirror.startState(state.localMode);
           }
           state.soyState.push("tag");
           return "keyword";
         }
 
-        return maybeBackUp(stream, state, /\{|\/\/|\/\*/);
+        return tokenUntil(stream, state, /\{|\s+\/\/|\/\*/);
       },
 
       indent: function(state, textAfter) {
-        if (/^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(textAfter))
-          return state.indent - config.indentUnit;
-
-        // TODO: Defer to inner modes.
-        return state.indent;
+        var indent = state.indent;
+        if (last(state.soyState) == "literal" ? /^\{\/literal}/.test(textAfter) : /^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(textAfter)) {
+          indent -= config.indentUnit;
+        }
+        indent += state.localMode.indent(state.localState, textAfter);
+        return indent;
       },
 
       innerMode: function(state) {
-        var ctx = last(state.soyState);
-        if (ctx == "comment" || ctx == "variable" || ctx == "tag") return null;
+        if (state.soyState.length && last(state.soyState) != "literal") return null;
         else return {state: state.localState, mode: state.localMode};
       },
 
-      electricInput: /^\s*(}|{\/)$/,
+      electricInput: /^\s*\{(\/|fallbackmsg|elseif|else|ifempty|\/literal\})$/,
       lineComment: "//",
       blockCommentStart: "/*",
       blockCommentEnd: "*/",
@@ -174,10 +180,8 @@
     };
   }, "htmlmixed");
 
-  CodeMirror.registerHelper(("hintWords", "soy", "delpackage namespace alias template param " +
-                             "literal print msg fallbackmsg let if elseif else switch case " +
-                             "default foreach ifempty for call param deltemplate delcall css " +
-                             "log debugger").split(" "));
+  CodeMirror.registerHelper("hintWords", "soy", indentingTags.concat(
+      ["delpackage", "namespace", "alias", "print", "css", "debugger"]));
 
   CodeMirror.defineMIME("text/x-soy", "soy");
 });

From 175741a277c48d2e4595dc70bee5d60a5d2c12eb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Dec 2014 13:13:16 +0100
Subject: [PATCH 1783/4742] [soy mode] Fix indentation of else and elseif

Also turn off reindentation inside strings and comments.

Issue #2980
---
 mode/soy/index.html |  7 +++++++
 mode/soy/soy.js     | 13 +++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/mode/soy/index.html b/mode/soy/index.html
index e83f372a93..040ef0d210 100644
--- a/mode/soy/index.html
+++ b/mode/soy/index.html
@@ -38,6 +38,13 @@ <h2>Soy (Closure Template) mode</h2>
 {template .helloWorld}
   {@param name: string}
   Hello <b>{$name}</b>!
+  <div>
+    {if $score}
+      <em>{$score} points}</em>
+    {else}
+      no score
+    {/if}
+  </div>
 {/template}
 
 {template .alertHelloWorld kind="js"}
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index d0dba679a2..2cc4045503 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -11,8 +11,8 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
-                       "else", "switch", "case", "default", "foreach", "ifempty", "for",
+  var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if",
+                       "switch", "case", "default", "foreach", "ifempty", "for",
                        "call", "param", "log"];
 
   CodeMirror.defineMode("soy", function(config) {
@@ -158,10 +158,11 @@
       },
 
       indent: function(state, textAfter) {
-        var indent = state.indent;
-        if (last(state.soyState) == "literal" ? /^\{\/literal}/.test(textAfter) : /^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(textAfter)) {
+        var indent = state.indent, top = last(state.soyState);
+        if (top == "comment" || top == "string") return CodeMirror.Pass;
+
+        if ((top == "literal" ? /^\{\/literal}/ : /^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/).test(textAfter))
           indent -= config.indentUnit;
-        }
         indent += state.localMode.indent(state.localState, textAfter);
         return indent;
       },
@@ -181,7 +182,7 @@
   }, "htmlmixed");
 
   CodeMirror.registerHelper("hintWords", "soy", indentingTags.concat(
-      ["delpackage", "namespace", "alias", "print", "css", "debugger"]));
+      ["else", "elseif", "delpackage", "namespace", "alias", "print", "css", "debugger"]));
 
   CodeMirror.defineMIME("text/x-soy", "soy");
 });

From 2ba9d8ce0f7bdafc13a306b6a0b4b42288647538 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Dec 2014 13:21:54 +0100
Subject: [PATCH 1784/4742] Use attribute rather than expando property for
 ignoring events

Also cause widgets with addWidget to have their events ignored.

See http://discuss.codemirror.net/t/click-to-clear-marker-created-with-cm-addwidget/98
---
 lib/codemirror.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 25d0bd3aa3..164da2e13a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1019,7 +1019,7 @@
     var wrap = ensureLineWrapped(lineView);
     for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
       var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
-      if (!widget.handleMouseEvents) node.ignoreEvents = true;
+      if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
       positionLineWidget(widget, node, lineView, dims);
       if (allowAbove && widget.above)
         wrap.insertBefore(node, lineView.gutter || lineView.text);
@@ -2755,7 +2755,7 @@
   // Return true when the given mouse event happened in a widget
   function eventInWidget(display, e) {
     for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
-      if (!n || n.ignoreEvents || n.parentNode == display.sizer && n != display.mover) return true;
+      if (!n || n.getAttribute("cm-ignore-events") == "true" || n.parentNode == display.sizer && n != display.mover) return true;
     }
   }
 
@@ -4347,6 +4347,7 @@
       pos = cursorCoords(this, clipPos(this.doc, pos));
       var top = pos.bottom, left = pos.left;
       node.style.position = "absolute";
+      node.setAttribute("cm-ignore-events", "true");
       display.sizer.appendChild(node);
       if (vert == "over") {
         top = pos.top;
@@ -5381,7 +5382,7 @@
       // Showing up as a widget implies collapsed (widget replaces text)
       marker.collapsed = true;
       marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
-      if (!options.handleMouseEvents) marker.widgetNode.ignoreEvents = true;
+      if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true");
       if (options.insertLeft) marker.widgetNode.insertLeft = true;
     }
     if (marker.collapsed) {

From 58dbfdc86f07fd6a1f14be8f50e4a9d108587e85 Mon Sep 17 00:00:00 2001
From: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
Date: Sat, 13 Dec 2014 02:02:56 +0530
Subject: [PATCH 1785/4742] [emacs] Multiple cursor delete support

Fixes #2470
---
 keymap/emacs.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index c81912df3c..6a8bb4a2f7 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -132,8 +132,8 @@
     };
   }
 
-  function findEnd(cm, by, dir) {
-    var pos = cm.getCursor(), prefix = getPrefix(cm);
+  function findEnd(cm, pos, by, dir) {
+    var prefix = getPrefix(cm);
     if (prefix < 0) { dir = -dir; prefix = -prefix; }
     for (var i = 0; i < prefix; ++i) {
       var newPos = by(cm, pos, dir);
@@ -145,19 +145,29 @@
 
   function move(by, dir) {
     var f = function(cm) {
-      cm.extendSelection(findEnd(cm, by, dir));
+      cm.extendSelection(findEnd(cm, cm.getCursor(), by, dir));
     };
     f.motion = true;
     return f;
   }
 
   function killTo(cm, by, dir) {
-    kill(cm, cm.getCursor(), findEnd(cm, by, dir), true);
+    var selections = cm.listSelections(), cursor;
+    var i = selections.length;
+    while (i--) {
+      cursor = selections[i].head;
+      kill(cm, cursor, findEnd(cm, cursor, by, dir), true);
+    }
   }
 
   function killRegion(cm) {
     if (cm.somethingSelected()) {
-      kill(cm, cm.getCursor("from"), cm.getCursor("to"));
+      var selections = cm.listSelections(), selection;
+      var i = selections.length;
+      while (i--) {
+        selection = selections[i];
+        kill(cm, selection.anchor, selection.head);
+      }
       return true;
     }
   }
@@ -316,7 +326,8 @@
     "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1),
 
     "Shift-Ctrl-Alt-2": function(cm) {
-      cm.setSelection(findEnd(cm, byExpr, 1), cm.getCursor());
+      var cursor = cm.getCursor();
+      cm.setSelection(findEnd(cm, cursor, byExpr, 1), cursor);
     },
     "Ctrl-Alt-T": function(cm) {
       var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1);

From e561bebb65efee914cbaec13efa9cfc0047b8aa5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Dec 2014 16:01:11 +0100
Subject: [PATCH 1786/4742] [tern addon] Add showDocs method

---
 addon/tern/tern.js | 8 +++++---
 demo/tern.html     | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 9bd69446a2..86729e2d3f 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -106,7 +106,9 @@
       cm.showHint({hint: this.getHint});
     },
 
-    showType: function(cm, pos, c) { showType(this, cm, pos, c); },
+    showType: function(cm, pos, c) { showContextInfo(this, cm, pos, "type", c); },
+
+    showDocs: function(cm, pos, c) { showContextInfo(this, cm, pos, "documentation", c); },
 
     updateArgHints: function(cm) { updateArgHints(this, cm); },
 
@@ -239,8 +241,8 @@
 
   // Type queries
 
-  function showType(ts, cm, pos, c) {
-    ts.request(cm, "type", function(error, data) {
+  function showContextInfo(ts, cm, pos, queryName, c) {
+    ts.request(cm, queryName, function(error, data) {
       if (error) return showError(ts, cm, error);
       if (ts.options.typeTip) {
         var tip = ts.options.typeTip(data);
diff --git a/demo/tern.html b/demo/tern.html
index 0dfb5179e6..19135faf7f 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -42,7 +42,7 @@
 <article>
 <h2>Tern Demo</h2>
 <form><textarea id="code" name="code">// Use ctrl-space to complete something
-// Put the cursor in or after an expression, press ctrl-i to
+// Put the cursor in or after an expression, press ctrl-o to
 // find its type
 
 var foo = ["array", "of", "strings"];
@@ -83,6 +83,7 @@ <h2>Tern Demo</h2>
 
 <dl>
   <dt>Ctrl-Space</dt><dd>Autocomplete</dd>
+  <dt>Ctrl-O</dt><dd>Find docs for the expression at the cursor</dd>
   <dt>Ctrl-I</dt><dd>Find type at cursor</dd>
   <dt>Alt-.</dt><dd>Jump to definition (Alt-, to jump back)</dd>
   <dt>Ctrl-Q</dt><dd>Rename variable</dd>
@@ -114,6 +115,7 @@ <h2>Tern Demo</h2>
     editor.setOption("extraKeys", {
       "Ctrl-Space": function(cm) { server.complete(cm); },
       "Ctrl-I": function(cm) { server.showType(cm); },
+      "Ctrl-O": function(cm) { server.showDocs(cm); },
       "Alt-.": function(cm) { server.jumpToDef(cm); },
       "Alt-,": function(cm) { server.jumpBack(cm); },
       "Ctrl-Q": function(cm) { server.rename(cm); },

From 35b85adaa9ea1d3ad708327c4b325feae7f5ba35 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakubvrana@google.com>
Date: Mon, 15 Dec 2014 11:51:38 -0800
Subject: [PATCH 1787/4742] [soy mode] Improve indentation of strings and
 /template

---
 mode/soy/index.html |  3 ++-
 mode/soy/soy.js     | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mode/soy/index.html b/mode/soy/index.html
index 040ef0d210..f0216f097d 100644
--- a/mode/soy/index.html
+++ b/mode/soy/index.html
@@ -37,10 +37,11 @@ <h2>Soy (Closure Template) mode</h2>
  */
 {template .helloWorld}
   {@param name: string}
+  {@param? score: number}
   Hello <b>{$name}</b>!
   <div>
     {if $score}
-      <em>{$score} points}</em>
+      <em>{$score} points</em>
     {else}
       no score
     {/if}
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 2cc4045503..f5d22f64d8 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -23,7 +23,7 @@
       text: textMode,
       uri: textMode,
       css: CodeMirror.getMode(config, "text/css"),
-      js: CodeMirror.getMode(config, "text/javascript")
+      js: CodeMirror.getMode(config, {name: "text/javascript", statementIndent: 2 * config.indentUnit})
     };
 
     function last(array) {
@@ -34,6 +34,7 @@
       var oldString = stream.string;
       var match = untilRegExp.exec(oldString.substr(stream.pos));
       if (match) {
+        // We don't use backUp because it backs up just the position, not the state.
         // This uses an undocumented API.
         stream.string = oldString.substr(0, stream.pos + match.index);
       }
@@ -91,7 +92,8 @@
 
           case "tag":
             if (stream.match(/^\/?}/)) {
-              state.indent -= (/^\//.test(state.tag) ? 3 : (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1)) * config.indentUnit;
+              if (state.tag == "/template") state.indent = 0;
+              else state.indent -= (/^\//.test(state.tag) ? 3 : (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1)) * config.indentUnit;
               state.soyState.pop();
               return "keyword";
             } else if (stream.match(/^(\w+)(?==)/)) {
@@ -130,7 +132,7 @@
         if (stream.match(/^\/\*/)) {
           state.soyState.push("comment");
           return "comment";
-        } else if (stream.match(stream.sol() ? /^\/\/.*/ : /^\s+\/\/.*/)) {
+        } else if (stream.match(stream.sol() ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
           return "comment";
         } else if (stream.match(/^\{\$\w*/)) {
           state.indent += 2 * config.indentUnit;
@@ -158,12 +160,14 @@
       },
 
       indent: function(state, textAfter) {
+        if (/^\s*\{\/template\b/.test(textAfter)) return 0;
+
         var indent = state.indent, top = last(state.soyState);
-        if (top == "comment" || top == "string") return CodeMirror.Pass;
+        if (top == "comment") return CodeMirror.Pass;
 
         if ((top == "literal" ? /^\{\/literal}/ : /^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/).test(textAfter))
           indent -= config.indentUnit;
-        indent += state.localMode.indent(state.localState, textAfter);
+        if (indent) indent += state.localMode.indent(state.localState, textAfter);
         return indent;
       },
 
@@ -172,7 +176,7 @@
         else return {state: state.localState, mode: state.localMode};
       },
 
-      electricInput: /^\s*\{(\/|fallbackmsg|elseif|else|ifempty|\/literal\})$/,
+      electricInput: /^\s*\{(\/|\/template|fallbackmsg|elseif|else|ifempty|\/literal\})$/,
       lineComment: "//",
       blockCommentStart: "/*",
       blockCommentEnd: "*/",

From 685be494e1b0c1bf7454fb8f3e2936df12d7b30a Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakubvrana@google.com>
Date: Mon, 15 Dec 2014 13:53:57 -0800
Subject: [PATCH 1788/4742] [soy mode] Fix indentation of {switch}

---
 mode/soy/soy.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index f5d22f64d8..14af0facc5 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -11,8 +11,8 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if",
-                       "switch", "case", "default", "foreach", "ifempty", "for",
+  var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
+                       "else", "switch", "case", "default", "foreach", "ifempty", "for",
                        "call", "param", "log"];
 
   CodeMirror.defineMode("soy", function(config) {
@@ -93,7 +93,7 @@
           case "tag":
             if (stream.match(/^\/?}/)) {
               if (state.tag == "/template") state.indent = 0;
-              else state.indent -= (/^\//.test(state.tag) ? 3 : (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1)) * config.indentUnit;
+              else state.indent -= (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1) * config.indentUnit;
               state.soyState.pop();
               return "keyword";
             } else if (stream.match(/^(\w+)(?==)/)) {
@@ -143,7 +143,8 @@
           state.soyState.push("literal");
           return "keyword";
         } else if (match = stream.match(/^\{([\/@\\]?\w*)/)) {
-          state.indent += 2 * config.indentUnit;
+          if (match[1] != "/switch")
+            state.indent += (/^(\/|(else|elseif|case|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
           state.tag = match[1];
           if (state.tag == "/" + last(state.kindTag)) {
             // We found the tag that opened the current kind="".
@@ -160,14 +161,19 @@
       },
 
       indent: function(state, textAfter) {
-        if (/^\s*\{\/template\b/.test(textAfter)) return 0;
-
         var indent = state.indent, top = last(state.soyState);
         if (top == "comment") return CodeMirror.Pass;
 
-        if ((top == "literal" ? /^\{\/literal}/ : /^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/).test(textAfter))
-          indent -= config.indentUnit;
-        if (indent) indent += state.localMode.indent(state.localState, textAfter);
+        if (top == "literal") {
+          if (/^\{\/literal}/.test(textAfter)) indent -= config.indentUnit;
+        } else {
+          if (/^\s*\{\/template\b/.test(textAfter)) return 0;
+          if (/^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(textAfter)) indent -= config.indentUnit;
+          if (state.tag != "switch" && /^\{(case|default)\b/.test(textAfter)) indent -= config.indentUnit;
+          if (/^\{\/switch\b/.test(textAfter)) indent -= config.indentUnit;
+        }
+        if (indent && state.localMode.indent)
+          indent += state.localMode.indent(state.localState, textAfter);
         return indent;
       },
 
@@ -176,7 +182,7 @@
         else return {state: state.localState, mode: state.localMode};
       },
 
-      electricInput: /^\s*\{(\/|\/template|fallbackmsg|elseif|else|ifempty|\/literal\})$/,
+      electricInput: /^\s*\{(\/|\/template|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,
       lineComment: "//",
       blockCommentStart: "/*",
       blockCommentEnd: "*/",
@@ -186,7 +192,7 @@
   }, "htmlmixed");
 
   CodeMirror.registerHelper("hintWords", "soy", indentingTags.concat(
-      ["else", "elseif", "delpackage", "namespace", "alias", "print", "css", "debugger"]));
+      ["delpackage", "namespace", "alias", "print", "css", "debugger"]));
 
   CodeMirror.defineMIME("text/x-soy", "soy");
 });

From f6146ee71053aa3568046c104fc9462dc9d8d675 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 16 Dec 2014 11:38:30 +0100
Subject: [PATCH 1789/4742] Always patch display when the view array changed

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 164da2e13a..590400a2f9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -193,6 +193,7 @@
     d.reportedViewFrom = d.reportedViewTo = doc.first;
     // Information about the rendered lines.
     d.view = [];
+    d.renderedView = null;
     // Holds info about a single rendered line when it was rendered
     // for measurement, while not in view.
     d.externalMeasured = null;
@@ -671,7 +672,7 @@
     if (!update.force &&
         update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
         (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
-        countDirtyView(cm) == 0)
+        display.renderedView == display.view && countDirtyView(cm) == 0)
       return false;
 
     if (maybeUpdateLineNumberWidth(cm)) {
@@ -699,7 +700,7 @@
     cm.display.mover.style.top = display.viewOffset + "px";
 
     var toUpdate = countDirtyView(cm);
-    if (!different && toUpdate == 0 && !update.force &&
+    if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
         (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
       return false;
 
@@ -709,6 +710,7 @@
     if (toUpdate > 4) display.lineDiv.style.display = "none";
     patchDisplay(cm, display.updateLineNumbers, update.dims);
     if (toUpdate > 4) display.lineDiv.style.display = "";
+    display.renderedView = display.view;
     // There might have been a widget with a focused element that got
     // hidden or updated, if so re-focus it.
     if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();

From 54e9ffced0a02675144f6898b9a0d2265eb093d2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 17 Dec 2014 15:53:40 +0100
Subject: [PATCH 1790/4742] [front page] Remove flattr link, rename gittip to
 gratipay

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

diff --git a/index.html b/index.html
index a6f0371545..7a5057b65d 100644
--- a/index.html
+++ b/index.html
@@ -93,8 +93,7 @@ <h2>This is CodeMirror</h2>
       <div style="position: relative">
         or <span onclick="document.getElementById('bankinfo').style.display = 'block';" class=quasilink>Bank</span>,
         <span onclick="document.getElementById('bcinfo').style.display = 'block';" class=quasilink>Bitcoin</span>,
-        <a href="https://www.gittip.com/marijnh">Gittip</a>,
-        <a href="https://flattr.com/profile/marijnh">Flattr</a><br>
+        <a href="https://gratipay.com/marijnh/">Gratipay</a><br>
         <div id=bankinfo class=bankinfo>
           <span class=bankinfo_close onclick="document.getElementById('bankinfo').style.display = '';">×</span>
           Bank: <i>Rabobank</i><br/>

From 905185f0df8b98d3472778221fbeae805a4d033a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 17 Dec 2014 16:59:31 +0100
Subject: [PATCH 1791/4742] [project page] Link to Patreon

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

diff --git a/index.html b/index.html
index 7a5057b65d..d4589a9b4c 100644
--- a/index.html
+++ b/index.html
@@ -93,6 +93,7 @@ <h2>This is CodeMirror</h2>
       <div style="position: relative">
         or <span onclick="document.getElementById('bankinfo').style.display = 'block';" class=quasilink>Bank</span>,
         <span onclick="document.getElementById('bcinfo').style.display = 'block';" class=quasilink>Bitcoin</span>,
+        <a href="http://www.patreon.com/marijn">Patreon</a><br>
         <a href="https://gratipay.com/marijnh/">Gratipay</a><br>
         <div id=bankinfo class=bankinfo>
           <span class=bankinfo_close onclick="document.getElementById('bankinfo').style.display = '';">×</span>

From 133ac19cf90736024ba79a3e00068eb9c1d1f865 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakubvrana@google.com>
Date: Tue, 16 Dec 2014 18:27:02 -0800
Subject: [PATCH 1792/4742] [soy mode] Support delegates

---
 mode/soy/soy.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 14af0facc5..7e81e8dd56 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -13,7 +13,7 @@
 
   var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
                        "else", "switch", "case", "default", "foreach", "ifempty", "for",
-                       "call", "param", "log"];
+                       "call", "param", "deltemplate", "delcall", "log"];
 
   CodeMirror.defineMode("soy", function(config) {
     var textMode = CodeMirror.getMode(config, "text/plain");
@@ -92,7 +92,7 @@
 
           case "tag":
             if (stream.match(/^\/?}/)) {
-              if (state.tag == "/template") state.indent = 0;
+              if (state.tag == "/template" || state.tag == "/deltemplate") state.indent = 0;
               else state.indent -= (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1) * config.indentUnit;
               state.soyState.pop();
               return "keyword";
@@ -167,7 +167,7 @@
         if (top == "literal") {
           if (/^\{\/literal}/.test(textAfter)) indent -= config.indentUnit;
         } else {
-          if (/^\s*\{\/template\b/.test(textAfter)) return 0;
+          if (/^\s*\{\/(template|deltemplate)\b/.test(textAfter)) return 0;
           if (/^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(textAfter)) indent -= config.indentUnit;
           if (state.tag != "switch" && /^\{(case|default)\b/.test(textAfter)) indent -= config.indentUnit;
           if (/^\{\/switch\b/.test(textAfter)) indent -= config.indentUnit;
@@ -182,7 +182,7 @@
         else return {state: state.localState, mode: state.localMode};
       },
 
-      electricInput: /^\s*\{(\/|\/template|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,
+      electricInput: /^\s*\{(\/|\/template|\/deltemplate|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,
       lineComment: "//",
       blockCommentStart: "/*",
       blockCommentEnd: "*/",

From b35c14c68a41e4d09f685726636d64af6349094c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 18 Dec 2014 10:26:46 +0100
Subject: [PATCH 1793/4742] [simple mode addon] Remove unused argument

Issue #2991
---
 addon/mode/simple.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index a4a86b9a65..de702a3dd5 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -11,9 +11,9 @@
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineSimpleMode = function(name, states, props) {
+  CodeMirror.defineSimpleMode = function(name, states) {
     CodeMirror.defineMode(name, function(config) {
-      return CodeMirror.simpleMode(config, states, props);
+      return CodeMirror.simpleMode(config, states);
     });
   };
 

From 1ace5ad21a2d28a711d01346394d1ca7981aef51 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Dec 2014 23:05:29 +0100
Subject: [PATCH 1794/4742] [coffeescript mode] Stop strangely fetching options
 from conf.mode

That's what the parser configuration object is for. Also,
I am unsure how this was supposed to even work.

Issue #2996
---
 mode/coffeescript/coffeescript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index ae460e02a9..da0eb2d518 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -15,7 +15,7 @@
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode("coffeescript", function(conf) {
+CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
   var ERRORCLASS = "error";
 
   function wordRegexp(words) {
@@ -191,7 +191,7 @@ CodeMirror.defineMode("coffeescript", function(conf) {
         }
       }
       if (singleline) {
-        if (conf.mode.singleLineStringErrors) {
+        if (parserConf.singleLineStringErrors) {
           outclass = ERRORCLASS;
         } else {
           state.tokenize = tokenBase;

From 965b8dd10992700835b8baac90872aba3a2f299c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Dec 2014 23:09:01 +0100
Subject: [PATCH 1795/4742] Make ctrl-double/triple-click work again

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 590400a2f9..06f0099a05 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2921,7 +2921,7 @@
       ourIndex = ranges.length;
       setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
                    {scroll: false, origin: "*mouse"});
-    } else if (ranges.length > 1 && ranges[ourIndex].empty()) {
+    } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single") {
       setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0));
       startSel = doc.sel;
     } else {

From 27fe44c3cb75ab38c18846760d9c7815700ad864 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Dec 2014 23:24:02 +0100
Subject: [PATCH 1796/4742] [javascript mode] Be more conservative about
 detecting fat arrow syntax

So that => in a string or comment doesn't trigger weird indentation.

Closes #2993
---
 mode/javascript/javascript.js | 2 ++
 mode/javascript/test.js       | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index b0ba8d017f..fac8d57769 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -205,6 +205,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         ++depth;
       } else if (wordRE.test(ch)) {
         sawSomething = true;
+      } else if (/["'\/]/.test(ch)) {
+        return;
       } else if (sawSomething && !depth) {
         ++pos;
         break;
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index aaeb8e0c07..91b0e89a06 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -61,6 +61,12 @@
      "    [keyword yield] [variable-2 i];",
      "}");
 
+  MT("quotedStringAddition",
+     "[keyword let] [variable f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
+
+  MT("quotedFatArrow",
+     "[keyword let] [variable f] [operator =] [variable a] [operator +] [string '=>'] [operator +] [variable c];");
+
   MT("fatArrow",
      "[variable array].[property filter]([def a] [operator =>] [variable-2 a] [operator +] [number 1]);",
      "[variable a];", // No longer in scope

From 1e5ae06ba46ab8c7c41d295ebf25b1bfc6cf6c39 Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Sat, 20 Dec 2014 14:00:59 -0800
Subject: [PATCH 1797/4742] [vim] fix 'moveToEol' behaviour for vim visual
 block mode

---
 keymap/vim.js    | 4 +++-
 test/vim_test.js | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 97833bd4ae..1bfa9d2b88 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1329,7 +1329,9 @@
             newHead = copyCursor(origHead);
           }
           if (vim.visualMode) {
-            newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
+            if (!(vim.visualBlock && newHead.ch === Infinity)) {
+              newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
+            }
             if (newAnchor) {
               newAnchor = clipCursorToContent(cm, newAnchor, true);
             }
diff --git a/test/vim_test.js b/test/vim_test.js
index 13b8ca39b9..2c936fa34d 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1867,6 +1867,13 @@ testVim('visual_line', function(cm, vim, helpers) {
   helpers.doKeys('l', 'V', 'l', 'j', 'j', 'd');
   eq(' 4\n 5', cm.getValue());
 }, { value: ' 1\n 2\n 3\n 4\n 5' });
+testVim('visual_block_move_to_eol', function(cm, vim, helpers) {
+  // moveToEol should move all block cursors to end of line
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-v>', 'G', '$');
+  var selections = cm.getSelections().join();
+  eq("123,45,6", selections);
+}, {value: '123\n45\n6'});
 testVim('visual_block_different_line_lengths', function(cm, vim, helpers) {
   // test the block selection with lines of different length
   // i.e. extending the selection

From 4e105c5c80251a038ea9534ad10ddac0c90d8826 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 21 Dec 2014 12:22:21 -0500
Subject: [PATCH 1798/4742] [vim] Add suppressErrorLogging option for tests

---
 keymap/vim.js    | 6 +++++-
 test/vim_test.js | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 1bfa9d2b88..5743a0d9c7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -616,6 +616,8 @@
       // Testing hook.
       maybeInitVimState_: maybeInitVimState,
 
+      suppressErrorLogging: false,
+
       InsertModeKey: InsertModeKey,
       map: function(lhs, rhs, ctx) {
         // Add user defined key bindings.
@@ -762,7 +764,9 @@
                 // clear VIM state in case it's in a bad state.
                 cm.state.vim = undefined;
                 maybeInitVimState(cm);
-                console['log'](e);
+                if (!CodeMirror.Vim.suppressErrorLogging) {
+                  console['log'](e);
+                }
                 throw e;
               }
               return true;
diff --git a/test/vim_test.js b/test/vim_test.js
index 2c936fa34d..6262dab0c1 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1,3 +1,5 @@
+CodeMirror.Vim.suppressErrorLogging = true;
+
 var code = '' +
 ' wOrd1 (#%\n' +
 ' word3] \n' +

From b447f47c41f8592cf9161f13e0d0ea78f438538c Mon Sep 17 00:00:00 2001
From: Gabriel Gheorghian <gabriel.gheorghian@gmail.com>
Date: Fri, 19 Dec 2014 11:40:25 -0500
Subject: [PATCH 1799/4742] Can now style markText by adding the css property
 to options

---
 lib/codemirror.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 06f0099a05..d174952966 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5428,7 +5428,7 @@
       if (updateMaxLine) cm.curOp.updateMaxLine = true;
       if (marker.collapsed)
         regChange(cm, from.line, to.line + 1);
-      else if (marker.className || marker.title || marker.startStyle || marker.endStyle)
+      else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
         for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
       if (marker.atomic) reCheckSelection(cm.doc);
       signalLater(cm, "markerAdded", cm, marker);
@@ -6169,7 +6169,7 @@
 
   // Build up the DOM representation for a single token, and add it to
   // the line map. Takes care to render special characters separately.
-  function buildToken(builder, text, style, startStyle, endStyle, title) {
+  function buildToken(builder, text, style, startStyle, endStyle, title, css) {
     if (!text) return;
     var special = builder.cm.options.specialChars, mustWrap = false;
     if (!special.test(text)) {
@@ -6208,11 +6208,11 @@
         builder.pos++;
       }
     }
-    if (style || startStyle || endStyle || mustWrap) {
+    if (style || startStyle || endStyle || mustWrap || css) {
       var fullStyle = style || "";
       if (startStyle) fullStyle += startStyle;
       if (endStyle) fullStyle += endStyle;
-      var token = elt("span", [content], fullStyle);
+      var token = elt("span", [content], fullStyle, css);
       if (title) token.title = title;
       return builder.content.appendChild(token);
     }
@@ -6271,11 +6271,11 @@
       return;
     }
 
-    var len = allText.length, pos = 0, i = 1, text = "", style;
+    var len = allText.length, pos = 0, i = 1, text = "", style, css;
     var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
     for (;;) {
       if (nextChange == pos) { // Update current marker set
-        spanStyle = spanEndStyle = spanStartStyle = title = "";
+        spanStyle = spanEndStyle = spanStartStyle = title = css = "";
         collapsed = null; nextChange = Infinity;
         var foundBookmarks = [];
         for (var j = 0; j < spans.length; ++j) {
@@ -6283,6 +6283,7 @@
           if (sp.from <= pos && (sp.to == null || sp.to > pos)) {
             if (sp.to != null && 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;
             if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
             if (m.title && !title) title = m.title;
@@ -6310,7 +6311,7 @@
           if (!collapsed) {
             var tokenText = end > upto ? text.slice(0, upto - pos) : text;
             builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title);
+                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
           }
           if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
           pos = end;

From 74b7c2093d4a698ddaf70ff865d861f57f915874 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 22 Dec 2014 07:55:32 +0100
Subject: [PATCH 1800/4742] Documentation and test for markText css option

Issue #2995
---
 doc/manual.html |  2 ++
 test/test.js    | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 8cee223d68..2881c7ecf3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1565,6 +1565,8 @@ <h3 id="api_marker">Text-marking methods</h3>
         is part of the marker.</dd>
         <dt id="mark_endStyle"><code><strong>endStyle</strong>: string</code></dt><dd>Equivalent
         to <code>startStyle</code>, but for the rightmost span.</dd>
+        <dt id="mark_css"><code><strong>css</strong>: string</code></dt>
+        <dd>A string of CSS to be applied to the covered text. For example <code>"color: #fe3"</code>.</dd>
         <dt id="mark_title"><code><strong>title</strong>:
         string</code></dt><dd>When given, will give the nodes created
         for this span a HTML <code>title</code> attribute with the
diff --git a/test/test.js b/test/test.js
index 3a19c8f5af..17f68fd5e5 100644
--- a/test/test.js
+++ b/test/test.js
@@ -516,6 +516,17 @@ testCM("deleteSpanCollapsedInclusiveLeft", function(cm) {
   cm.replaceRange("", from, to);
 }, {value: "abc\nX\ndef"});
 
+testCM("markTextCSS", function(cm) {
+  function present() {
+    var spans = cm.display.lineDiv.getElementsByTagName("span");
+    for (var i = 0; i < spans.length; i++)
+      if (spans[i].style.color == "cyan" && span[i].textContent == "cdefg") return true;
+  }
+  var m = cm.markText(Pos(0, 2), Pos(0, 6), {css: "color: cyan"});
+  m.clear();
+  is(!present());
+}, {value: "abcdefgh"});
+
 testCM("bookmark", function(cm) {
   function p(v) { return v && Pos(v[0], v[1]); }
   forEach([{a: [1, 0], b: [1, 1], c: "", d: [1, 4]},

From f61fe9275f07b2dc71ebb328bad755b0d9fd1882 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 22 Dec 2014 08:07:17 +0100
Subject: [PATCH 1801/4742] [simple mode addon] When indenting, stop scanning
 on non-dedenting token

See http://discuss.codemirror.net/t/possible-bug-in-simple-mode-indenting-behavior/109
---
 addon/mode/simple.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index de702a3dd5..0a48a95367 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -194,12 +194,15 @@
       var pos = state.indent.length - 1, rules = states[state.state];
       scan: for (;;) {
         for (var i = 0; i < rules.length; i++) {
-          var rule = rules[i], m = rule.regex.exec(textAfter);
-          if (m && m[0]) {
-            if (rule.data.dedent && rule.data.dedentIfLineStart !== false) pos--;
-            if (rule.next || rule.push) rules = states[rule.next || rule.push];
-            textAfter = textAfter.slice(m[0].length);
-            continue scan;
+          var rule = rules[i];
+          if (rule.data.dedent && rule.data.dedentIfLineStart !== false) {
+            var m = rule.regex.exec(textAfter);
+            if (m && m[0]) {
+              pos--;
+              if (rule.next || rule.push) rules = states[rule.next || rule.push];
+              textAfter = textAfter.slice(m[0].length);
+              continue scan;
+            }
           }
         }
         break;

From 3b9bb8937744a4042b9e36def81913cf6a780c08 Mon Sep 17 00:00:00 2001
From: Dan Bentley <dan@numiko.com>
Date: Fri, 19 Dec 2014 14:44:33 +0000
Subject: [PATCH 1802/4742] Adding checks to ensure that when removeLineClass
 is called:

- line.handle.gutterClass is successfully
- Gutter class is removed from Markup

Amending removeLineClass to remove gutter class from markup.
---
 lib/codemirror.js |  2 +-
 test/test.js      | 31 +++++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d174952966..10dbd64831 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6738,7 +6738,7 @@
       });
     }),
     removeLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, "class", function(line) {
+      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
         var prop = where == "text" ? "textClass"
                  : where == "background" ? "bgClass"
                  : where == "gutter" ? "gutterClass" : "wrapClass";
diff --git a/test/test.js b/test/test.js
index 17f68fd5e5..08d03810bc 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1544,33 +1544,48 @@ testCM("jumpTheGap", function(cm) {
 }, {lineWrapping: true, value: "abc\ndef\nghi\njkl\n"});
 
 testCM("addLineClass", function(cm) {
-  function cls(line, text, bg, wrap) {
+  function cls(line, text, bg, wrap, gutter) {
     var i = cm.lineInfo(line);
     eq(i.textClass, text);
     eq(i.bgClass, bg);
     eq(i.wrapClass, wrap);
+    if (typeof i.handle.gutterClass !== 'undefined') {
+        eq(i.handle.gutterClass, gutter);
+    }
   }
   cm.addLineClass(0, "text", "foo");
   cm.addLineClass(0, "text", "bar");
   cm.addLineClass(1, "background", "baz");
   cm.addLineClass(1, "wrap", "foo");
-  cls(0, "foo bar", null, null);
-  cls(1, null, "baz", "foo");
+  cm.addLineClass(1, "gutter", "gutter-class");
+  cls(0, "foo bar", null, null, null);
+  cls(1, null, "baz", "foo", "gutter-class");
   var lines = cm.display.lineDiv;
   eq(byClassName(lines, "foo").length, 2);
   eq(byClassName(lines, "bar").length, 1);
   eq(byClassName(lines, "baz").length, 1);
+  eq(byClassName(lines, "gutter-class").length, 1);
   cm.removeLineClass(0, "text", "foo");
-  cls(0, "bar", null, null);
+  cls(0, "bar", null, null, null);
   cm.removeLineClass(0, "text", "foo");
-  cls(0, "bar", null, null);
+  cls(0, "bar", null, null, null);
   cm.removeLineClass(0, "text", "bar");
   cls(0, null, null, null);
+
   cm.addLineClass(1, "wrap", "quux");
-  cls(1, null, "baz", "foo quux");
+  cls(1, null, "baz", "foo quux", "gutter-class");
   cm.removeLineClass(1, "wrap");
-  cls(1, null, "baz", null);
-}, {value: "hohoho\n"});
+  cls(1, null, "baz", null, "gutter-class");
+  cm.removeLineClass(1, "gutter", "gutter-class");
+  eq(byClassName(lines, "gutter-class").length, 0);
+  cls(1, null, "baz", null, null);
+
+  cm.addLineClass(1, "gutter", "gutter-class");
+  cls(1, null, "baz", null, "gutter-class");
+  cm.removeLineClass(1, "gutter", "gutter-class");
+  cls(1, null, "baz", null, null);
+
+}, {value: "hohoho\n", lineNumbers: true});
 
 testCM("atomicMarker", function(cm) {
   addDoc(cm, 10, 10);

From 668fe4d37b6e06174fc381e2e1f66e9617ea7bbf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 22 Dec 2014 08:16:06 +0100
Subject: [PATCH 1803/4742] [textile mode] Don't trigger deletion on double
 dash

Issue #2967
---
 mode/textile/textile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/textile/textile.js b/mode/textile/textile.js
index 8ce71c08e4..a6f7576582 100644
--- a/mode/textile/textile.js
+++ b/mode/textile/textile.js
@@ -90,7 +90,7 @@
     if (ch === "=" && stream.eat("="))
       return togglePhraseModifier(stream, state, "notextile", /==/, 2);
 
-    if (ch === "-")
+    if (ch === "-" && !stream.eat("-"))
       return togglePhraseModifier(stream, state, "deletion", /-/, 1);
 
     if (ch === "+")

From 76863e3ea3023c489c9632d67803e29aa359f1e6 Mon Sep 17 00:00:00 2001
From: Gerard Braad <me@gbraad.nl>
Date: Sun, 21 Dec 2014 16:21:49 +0800
Subject: [PATCH 1804/4742] Added Tomorrow Night Bright theme

---
 demo/theme.html                 |  2 ++
 theme/tomorrow-night-bright.css | 35 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 theme/tomorrow-night-bright.css

diff --git a/demo/theme.html b/demo/theme.html
index d15e75e02c..e951c84c36 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -29,6 +29,7 @@
 <link rel="stylesheet" href="../theme/rubyblue.css">
 <link rel="stylesheet" href="../theme/solarized.css">
 <link rel="stylesheet" href="../theme/the-matrix.css">
+<link rel="stylesheet" href="../theme/tomorrow-night-bright.css">
 <link rel="stylesheet" href="../theme/tomorrow-night-eighties.css">
 <link rel="stylesheet" href="../theme/twilight.css">
 <link rel="stylesheet" href="../theme/vibrant-ink.css">
@@ -98,6 +99,7 @@ <h2>Theme Demo</h2>
     <option>solarized dark</option>
     <option>solarized light</option>
     <option>the-matrix</option>
+    <option>tomorrow-night-bright</option>
     <option>tomorrow-night-eighties</option>
     <option>twilight</option>
     <option>vibrant-ink</option>
diff --git a/theme/tomorrow-night-bright.css b/theme/tomorrow-night-bright.css
new file mode 100644
index 0000000000..4c7575d758
--- /dev/null
+++ b/theme/tomorrow-night-bright.css
@@ -0,0 +1,35 @@
+/*
+
+    Name:       Tomorrow Night - Bright
+    Author:     Chris Kempson
+
+    Port done by Gerard Braad <me@gbraad.nl>
+
+*/
+
+.cm-s-tomorrow-night-bright.CodeMirror {background: #000000; color: #eaeaea;}
+.cm-s-tomorrow-night-bright div.CodeMirror-selected {background: #000000 !important;}
+.cm-s-tomorrow-night-bright .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-tomorrow-night-bright .CodeMirror-linenumber {color: #424242;}
+.cm-s-tomorrow-night-bright .CodeMirror-cursor {border-left: 1px solid #6A6A6A !important;}
+
+.cm-s-tomorrow-night-bright span.cm-comment {color: #d27b53;}
+.cm-s-tomorrow-night-bright span.cm-atom {color: #a16a94;}
+.cm-s-tomorrow-night-bright span.cm-number {color: #a16a94;}
+
+.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute {color: #99cc99;}
+.cm-s-tomorrow-night-bright span.cm-keyword {color: #d54e53;}
+.cm-s-tomorrow-night-bright span.cm-string {color: #e7c547;}
+
+.cm-s-tomorrow-night-bright span.cm-variable {color: #b9ca4a;}
+.cm-s-tomorrow-night-bright span.cm-variable-2 {color: #7aa6da;}
+.cm-s-tomorrow-night-bright span.cm-def {color: #e78c45;}
+.cm-s-tomorrow-night-bright span.cm-bracket {color: #eaeaea;}
+.cm-s-tomorrow-night-bright span.cm-tag {color: #d54e53;}
+.cm-s-tomorrow-night-bright span.cm-link {color: #a16a94;}
+.cm-s-tomorrow-night-bright span.cm-error {background: #d54e53; color: #6A6A6A;}
+
+.cm-s-tomorrow-night-bright .CodeMirror-activeline-background {background: #424242 !important;}
+.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

From c818907c32203331f00f1415e0402fd2e0f08fdc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 23 Dec 2014 12:28:53 +0100
Subject: [PATCH 1805/4742] Add !important to CodeMirror-scroll css class

Code that overrides this will break the new scroll model.

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

diff --git a/lib/codemirror.css b/lib/codemirror.css
index f8b89b987e..c56510e99a 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -147,7 +147,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 
 .CodeMirror-scroll {
-  overflow: scroll;
+  overflow: scroll !important; /* Things will break if this is overridden */
   /* 30px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
   margin-bottom: -30px; margin-right: -30px;

From eee903922d5b02cd84e150e4d3325093b98604b4 Mon Sep 17 00:00:00 2001
From: Gerard Braad <me@gbraad.nl>
Date: Sun, 21 Dec 2014 16:21:49 +0800
Subject: [PATCH 1806/4742] [tomorrow-night-bright theme] Add

---
 theme/tomorrow-night-bright.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/tomorrow-night-bright.css b/theme/tomorrow-night-bright.css
index 4c7575d758..decb82d3e0 100644
--- a/theme/tomorrow-night-bright.css
+++ b/theme/tomorrow-night-bright.css
@@ -8,7 +8,7 @@
 */
 
 .cm-s-tomorrow-night-bright.CodeMirror {background: #000000; color: #eaeaea;}
-.cm-s-tomorrow-night-bright div.CodeMirror-selected {background: #000000 !important;}
+.cm-s-tomorrow-night-bright div.CodeMirror-selected {background: #424242 !important;}
 .cm-s-tomorrow-night-bright .CodeMirror-gutters {background: #000000; border-right: 0px;}
 .cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
 .cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
@@ -31,5 +31,5 @@
 .cm-s-tomorrow-night-bright span.cm-link {color: #a16a94;}
 .cm-s-tomorrow-night-bright span.cm-error {background: #d54e53; color: #6A6A6A;}
 
-.cm-s-tomorrow-night-bright .CodeMirror-activeline-background {background: #424242 !important;}
+.cm-s-tomorrow-night-bright .CodeMirror-activeline-background {background: #2a2a2a !important;}
 .cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

From b65e950ea30ddcb40ce62b4b215d258307cc8167 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 24 Dec 2014 00:25:11 +0100
Subject: [PATCH 1807/4742] [native scrollbars] Fix workaround for OSX overlay
 scrollbars

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 10dbd64831..6d2089298e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -473,7 +473,7 @@
     },
     overlayHack: function() {
       var w = mac && !mac_geMountainLion ? "12px" : "18px";
-      this.horiz.style.minWidth = this.vert.style.minHeight = w;
+      this.horiz.style.minHeight = this.vert.style.minWidth = w;
       var self = this;
       var barMouseDown = function(e) {
         if (e_target(e) != self.vert && e_target(e) != self.horiz)

From 49320c6eb10005dce5363c27c75ebb4823a3c793 Mon Sep 17 00:00:00 2001
From: Patrick Stoica <pstoica@gatech.edu>
Date: Tue, 23 Dec 2014 17:50:15 -0500
Subject: [PATCH 1808/4742] [html hint] Fix bad require call

---
 addon/hint/html-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index 992218f288..c6769bcae5 100644
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -3,7 +3,7 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror", "./xml-hint"));
+    mod(require("../../lib/codemirror"), require("./xml-hint"));
   else if (typeof define == "function" && define.amd) // AMD
     define(["../../lib/codemirror", "./xml-hint"], mod);
   else // Plain browser env

From 2111a7e46649ffb2ce9ae158bead17d7c833b060 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 24 Dec 2014 00:57:42 +0100
Subject: [PATCH 1809/4742] Mark release 4.9.0

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

diff --git a/AUTHORS b/AUTHORS
index 455d7e68a5..afa3cc083a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -89,6 +89,7 @@ Curtis Gagliardi
 dagsta
 daines
 Dale Jung
+Dan Bentley
 Dan Heberden
 Daniel, Dao Quang Minh
 Daniele Di Sarli
@@ -98,12 +99,15 @@ Daniel KJ
 Daniel Neel
 Daniel Parnell
 Danny Yoo
+darealshinji
 Darius Roberts
 Dave Myers
 David Mignot
 David Pathakjee
+David Vázquez
 deebugger
 Deep Thought
+Devon Carew
 dignifiedquire
 Dimage Sapelkin
 domagoj412
@@ -135,11 +139,13 @@ ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
 Frank Wiegand
+Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
 gekkoe
+Gerard Braad
 Gergely Hegykozi
 Glenn Jorde
 Glenn Ruehle
@@ -172,6 +178,7 @@ Ivan Kurnosov
 Jacob Lee
 Jakob Miland
 Jakub Vrana
+Jakub Vrána
 James Campos
 James Thorne
 Jamie Hill
@@ -182,6 +189,7 @@ Jan Odvarko
 Jan T. Sott
 Jared Forsyth
 Jason
+Jason Barnabe
 Jason Grout
 Jason Johnston
 Jason San Jose
@@ -217,6 +225,7 @@ kaniga
 Ken Newman
 Ken Rockot
 Kevin Sawicki
+Kevin Ushey
 Klaus Silveira
 Koh Zi Han, Cliff
 komakino
@@ -224,6 +233,7 @@ Konstantin Lopuhin
 koops
 ks-ifware
 kubelsmieci
+Lanfei
 Lanny
 Laszlo Vidacs
 leaf corcoran
@@ -285,6 +295,7 @@ MinRK
 Miraculix87
 misfo
 mloginov
+Moritz Schwörer
 mps
 mtaran-google
 Narciso Jaramillo
@@ -311,6 +322,7 @@ Page
 Panupong Pasupat
 paris
 Patil Arpith
+Patrick Stoica
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
@@ -325,11 +337,13 @@ prasanthj
 Prasanth J
 Radek Piórkowski
 Rahul
+Randall Mason
 Randy Burden
 Randy Edmunds
 Rasmus Erik Voel Jensen
 Richard van der Meer
 Richard Z.H. Wang
+Robert Crossfield
 Roberto Abdelkader Martínez Pérez
 robertop23
 Robert Plummer
@@ -354,6 +368,7 @@ sheopory
 Shiv Deepak
 Shmuel Englard
 Shubham Jain
+silverwind
 snasa
 soliton4
 sonson
@@ -393,11 +408,13 @@ Vincent Woo
 Volker Mische
 wenli
 Wesley Wiser
+Will Binns-Smith
 William Jamieson
 William Stein
 Willy
 Wojtek Ptak
 Xavier Mendez
+Yassin N. Hassan
 YNH Webdev
 Yunchi Luo
 Yuvi Panda
diff --git a/bower.json b/bower.json
index 5c1642313b..dfbe3d42fd 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.8.1",
+  "version":"4.9.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index b81bd48dda..c2742403f8 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.9.0;f=">4.9</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.8.0;f=">4.8</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.7.0;f=">4.7</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.6.0;f=">4.6</option>
diff --git a/doc/manual.html b/doc/manual.html
index 2881c7ecf3..99e630c56f 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 4.8.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.9.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 8b637908a9..d2e821d32a 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,29 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">23-12-2014: <a href="http://codemirror.net/codemirror-4.9.zip">Version 4.9</a>:</p>
+
+  <ul class="rel-note">
+    <li>Overhauled scroll bar handling.
+    Add pluggable <a href="../demo/simplescrollbars.html">scrollbar
+    implementations</a>.</li>
+    <li>Tweaked behavior for
+    the <a href="manual.html#addon_show-hint">completion addons</a> to
+    not take text after cursor into account.</li>
+    <li>Two new optional features in
+    the <a href="manual.html#addon_merge">merge addon</a>: aligning
+    editors, and folding unchanged text.</li>
+    <li>New
+    modes: <a href="../mode/dart/index.html">Dart</a>, <a href="../mode/ebnf/index.html">EBNF</a>, <a href="../mode/spreadsheet/index.html">spreadsheet</a>,
+    and <a href="../mode/soy/index.html">Soy</a>.</li>
+    <li>New <a href="../demo/panel.html">addon</a> to show persistent panels below/above an editor.</li>
+    <li>New themes: <a href="../demo/theme.html?zenburn">zenburn</a>
+    and <a href="../demo/theme.html?tomorrow-night-bright">tomorrow night
+    bright</a>.</li>
+    <li>Allow ctrl-click to clear existing cursors.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.8.0...4.9.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">22-11-2014: <a href="http://codemirror.net/codemirror-4.8.zip">Version 4.8</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index d4589a9b4c..04038a8bfd 100644
--- a/index.html
+++ b/index.html
@@ -86,7 +86,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.8</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.9</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6d2089298e..d4a40593ed 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8021,7 +8021,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.8.1";
+  CodeMirror.version = "4.9.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 380be98384..f9870c4058 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.8.1",
+    "version":"4.9.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From c298d60ff7ec7f25e1bc1cf91198c46c333218df Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 24 Dec 2014 00:59:08 +0100
Subject: [PATCH 1810/4742] Bump version number post-4.9

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

diff --git a/bower.json b/bower.json
index dfbe3d42fd..f887229324 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.9.0",
+  "version":"4.9.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 99e630c56f..89f06389a5 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 4.9.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.9.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index d4a40593ed..9c56d73259 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8021,7 +8021,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.9.0";
+  CodeMirror.version = "4.9.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index f9870c4058..43fc30fc57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.9.0",
+    "version":"4.9.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 98df975f4b1cae046599b5b7a54d9e64c4900d2e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Dec 2014 13:08:08 +0100
Subject: [PATCH 1811/4742] Fix positioning of height forcer

To work around a layout quirk in Firefox

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9c56d73259..7c6ea4962c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -776,8 +776,10 @@
   }
 
   function setDocumentHeight(cm, measure) {
-    cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = measure.docHeight + "px";
-    cm.display.gutters.style.height = Math.max(measure.docHeight + scrollGap(cm), measure.clientHeight) + "px";
+    cm.display.sizer.style.minHeight = measure.docHeight + "px";
+    var plusGap = measure.docHeight + scrollGap(cm);
+    cm.display.heightForcer.style.top = plusGap + "px";
+    cm.display.gutters.style.height = Math.max(plusGap, measure.clientHeight) + "px";
   }
 
   // Read the actual heights of the rendered lines, and update their

From f6f427c2af6fa8557854552404761e97c7a7acc6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Dec 2014 13:10:20 +0100
Subject: [PATCH 1812/4742] Mark release 4.10.0

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

diff --git a/bower.json b/bower.json
index f887229324..d896ce06c1 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.9.1",
+  "version":"4.10.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index c2742403f8..d6f3f43777 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.10.0;f=">4.10</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.9.0;f=">4.9</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.8.0;f=">4.8</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.7.0;f=">4.7</option>
diff --git a/doc/manual.html b/doc/manual.html
index 89f06389a5..f2a5e9480d 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 4.9.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.10.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 d2e821d32a..bf26f00b92 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">29-12-2014: <a href="http://codemirror.net/codemirror-4.10.zip">Version 4.10</a>:</p>
+
+  <p class="rel-note">Emergency single-patch update to 4.9. Fixes
+  Firefox-specific problem where the cursor could end up behind the
+  horizontal scrollbar.</p>
+
   <p class="rel">23-12-2014: <a href="http://codemirror.net/codemirror-4.9.zip">Version 4.9</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 04038a8bfd..1278430861 100644
--- a/index.html
+++ b/index.html
@@ -86,7 +86,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.9</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.10</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7c6ea4962c..e21f4162be 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8023,7 +8023,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.9.1";
+  CodeMirror.version = "4.10.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 43fc30fc57..f934a08e02 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.9.1",
+    "version":"4.10.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 978cba0516a779d946a34b3da8d3515da97a3d47 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Dec 2014 13:11:03 +0100
Subject: [PATCH 1813/4742] Bump version number post-4.10

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

diff --git a/bower.json b/bower.json
index d896ce06c1..c68d54352c 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.10.0",
+  "version":"4.10.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index f2a5e9480d..dc3cfe065e 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 4.10.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.10.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index e21f4162be..59cf2cf234 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8023,7 +8023,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.10.0";
+  CodeMirror.version = "4.10.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index f934a08e02..7532035cf0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.10.0",
+    "version":"4.10.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 198d00f80882e80e0f5cd4f4dff1249541e36ed8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Dec 2014 13:30:16 +0100
Subject: [PATCH 1814/4742] More accurate position for heightForcer

Issue #3009
---
 lib/codemirror.js | 6 +++---
 test/vim_test.js  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 59cf2cf234..95ce908308 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -777,9 +777,9 @@
 
   function setDocumentHeight(cm, measure) {
     cm.display.sizer.style.minHeight = measure.docHeight + "px";
-    var plusGap = measure.docHeight + scrollGap(cm);
-    cm.display.heightForcer.style.top = plusGap + "px";
-    cm.display.gutters.style.height = Math.max(plusGap, measure.clientHeight) + "px";
+    var total = measure.docHeight + cm.display.barHeight;
+    cm.display.heightForcer.style.top = total + "px";
+    cm.display.gutters.style.height = Math.max(total + scrollGap(cm), measure.clientHeight) + "px";
   }
 
   // Read the actual heights of the rendered lines, and update their
diff --git a/test/vim_test.js b/test/vim_test.js
index 6262dab0c1..ea640efdac 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3112,7 +3112,7 @@ testVim('scrollMotion', function(cm, vim, helpers){
   eq(prevCursor.line, cm.getCursor().line);
   prevScrollInfo = cm.getScrollInfo();
   helpers.doKeys('<C-y>');
-  eq(prevCursor.line - 1, cm.getCursor().line);
+  eq(prevCursor.line - 1, cm.getCursor().line, "Y");
   is(prevScrollInfo.top > cm.getScrollInfo().top);
 }, { value: scrollMotionSandbox});
 

From b8accafbbf0cb9536f425e3f01216a268109ccc9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Dec 2014 13:35:10 +0100
Subject: [PATCH 1815/4742] Fix issue with scroll position snapping back

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 95ce908308..68a08b9419 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -719,7 +719,7 @@
     // width and height.
     removeChildren(display.cursorDiv);
     removeChildren(display.selectionDiv);
-    display.heightForcer.style.top = display.gutters.style.height = 0;
+    display.gutters.style.height = 0;
 
     if (different) {
       display.lastWrapHeight = update.wrapperHeight;

From 2fc14dbad06372e88e2ec663a45b82eb175be760 Mon Sep 17 00:00:00 2001
From: Ankit <ankitstarski@gmail.com>
Date: Sun, 28 Dec 2014 01:19:01 +0530
Subject: [PATCH 1816/4742] [sass mode] Improve indentation

Fixes bug #2156 for the most part

indention was bugged because it was reaching a wrong state when
any text that was not in the known set of words or patterns was
incurred.

for eg:
	head
		| <---- cursor should be here

and lets take  color : red as another example
now 'red' is same to the current tokenizer as 'head' from the first
example. So it indents for red automatically.

It was fixed by not letting any text after colon to reach the state
where it appends an indent after it.
---
 mode/sass/sass.js | 82 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 63 insertions(+), 19 deletions(-)

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index b792a02aa3..3ac48018f0 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -22,7 +22,7 @@ CodeMirror.defineMode("sass", function(config) {
   var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-", "\\!=", "/", "\\*", "%", "and", "or", "not"];
   var opRegexp = tokenRegexp(operators);
 
-  var pseudoElementsRegexp = /^::?[\w\-]+/;
+  var pseudoElementsRegexp = /^::[\w\-]+/;
 
   function urlTokens(stream, state) {
     var ch = stream.peek();
@@ -64,7 +64,7 @@ CodeMirror.defineMode("sass", function(config) {
   }
 
   function buildStringTokenizer(quote, greedy) {
-    if(greedy == null) { greedy = true; }
+    if (greedy == null) { greedy = true; }
 
     function stringTokenizer(stream, state) {
       var nextChar = stream.next();
@@ -189,13 +189,11 @@ CodeMirror.defineMode("sass", function(config) {
     if (ch === "$") {
       stream.next();
       stream.eatWhile(/[\w-]/);
-
-      if (stream.peek() === ":") {
-        stream.next();
+      stream.eatSpace();
+      if (stream.peek() === ":")
         return "variable-2";
-      } else {
+      else
         return "variable-3";
-      }
     }
 
     if (ch === "!") {
@@ -245,22 +243,71 @@ CodeMirror.defineMode("sass", function(config) {
       return "string";
     }
 
-    // Pseudo element selectors
-    if (ch == ":" && stream.match(pseudoElementsRegexp))
-      return "keyword";
+    // Pseudo element selectors and values after colon
+    if (ch === ":"){
+      if (stream.match(pseudoElementsRegexp))
+        return "keyword";
+      stream.next();
+      stream.eatSpace();
+      if (stream.peek() === null){
+        // if there is no more space after it
+        indent(state);
+        return "atom";
+      }
 
-    // atoms
-    if (stream.eatWhile(/[\w-&]/)) {
-      // matches a property definition
-      if (stream.peek() === ":" && !stream.match(pseudoElementsRegexp, false))
-        return "property";
-      else
+      // all posible tokens after colon
+      if (stream.match(/\$[\w-]+/)){
+        // variables
+        return "variable-3";
+      } else if (stream.match(/^url/) && stream.peek() === "(") {
+        //urls
+        state.tokenizer = urlTokens;
+        return "atom";
+      } else if (stream.match(/#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3}/)){
+        //hexadecimal value
+        return "number";
+      } else if (stream.match(/^-?[0-9\.]+/)){
+        return "number";
+      } else if (stream.match(keywordsRegexp)){
+        return "keyword";
+      } else if (stream.match(/[\w-,\s]+/)){
+        // other text
         return "atom";
+      }
     }
 
     if (stream.match(opRegexp))
       return "operator";
 
+    // atoms
+    if (stream.eatWhile(/[\w-&]/)) {
+      stream.eatSpace();
+      // matches a property definition
+      if (stream.peek() === ":" ){
+        if (!stream.match(/:[ ]*[\d\w-\$\+#!\("']/,false)){
+         //for cases where line ends after colon
+         // eg
+         // font:
+         //   | <-----cursor
+          indent(state);
+          return "property";
+        } else if (!stream.match(pseudoElementsRegexp, false)){
+          return "property";
+        }
+      } else {
+        stream.eatSpace();
+        if (stream.peek() !== "," ){
+          //for cases where line ends after comma
+          //eg
+          //head,
+          //body,
+          //| <-----cursor
+          indent(state);
+        }
+        return "atom";
+      }
+    }
+
     // If we haven't returned by now, we move 1 character
     // and return an error
     stream.next();
@@ -275,9 +322,6 @@ CodeMirror.defineMode("sass", function(config) {
     if (current === "@return")
       dedent(state);
 
-    if (style === "atom")
-      indent(state);
-
     if (style !== null) {
       var startOfToken = stream.pos - current.length;
       var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);

From 66f9224c656e8a9512f52c6be53645e8ec55cd48 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Wed, 31 Dec 2014 16:34:06 -0500
Subject: [PATCH 1817/4742] [vim] Support showing search matches on scrollbar

https://github.com/codemirror/CodeMirror/issues/3012
---
 keymap/vim.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 5743a0d9c7..78046f59f9 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3469,6 +3469,12 @@
       },
       setReversed: function(reversed) {
         vimGlobalState.isReversed = reversed;
+      },
+      getScrollbarAnnotate: function() {
+        return this.annotate;
+      },
+      setScrollbarAnnotate: function(annotate) {
+        this.annotate = annotate;
       }
     };
     function getSearchState(cm) {
@@ -3747,14 +3753,21 @@
       };
     }
     function highlightSearchMatches(cm, query) {
-      var overlay = getSearchState(cm).getOverlay();
+      var searchState = getSearchState(cm);
+      var overlay = searchState.getOverlay();
       if (!overlay || query != overlay.query) {
         if (overlay) {
           cm.removeOverlay(overlay);
         }
         overlay = searchOverlay(query);
         cm.addOverlay(overlay);
-        getSearchState(cm).setOverlay(overlay);
+        if (cm.showMatchesOnScrollbar) {
+          if (searchState.getScrollbarAnnotate()) {
+            searchState.getScrollbarAnnotate().clear();
+          }
+          searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
+        }
+        searchState.setOverlay(overlay);
       }
     }
     function findNext(cm, prev, query, repeat) {

From d0a2ddaa0454f6ea00d4c151ce9c1c15a3d84014 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Wed, 31 Dec 2014 23:21:33 -0500
Subject: [PATCH 1818/4742] [vim] Enable clearing search scrollbar annotation

https://github.com/codemirror/CodeMirror/issues/3012
---
 keymap/vim.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 78046f59f9..913e3a63fd 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3792,8 +3792,13 @@
       });
     }
     function clearSearchHighlight(cm) {
+      var state = getSearchState(cm);
       cm.removeOverlay(getSearchState(cm).getOverlay());
-      getSearchState(cm).setOverlay(null);
+      state.setOverlay(null);
+      if (state.getScrollbarAnnotate()) {
+        state.getScrollbarAnnotate().clear();
+        state.setScrollbarAnnotate(null);
+      }
     }
     /**
      * Check if pos is in the specified range, INCLUSIVE.

From 9e56052a7a902229bc996fc1c241ddec8a89966e Mon Sep 17 00:00:00 2001
From: Ankit <ankitstarski@gmail.com>
Date: Thu, 1 Jan 2015 23:16:08 +0530
Subject: [PATCH 1819/4742] [sass mode] Fixed bug #2156 and syntax highlighting
 too

To fix this I had to introduce new state parameter that tells if
cursor is before colon or not.
---
 mode/sass/sass.js | 321 ++++++++++++++++++++++++++--------------------
 1 file changed, 182 insertions(+), 139 deletions(-)

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 3ac48018f0..52a6682915 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -19,10 +19,11 @@ CodeMirror.defineMode("sass", function(config) {
   var keywords = ["true", "false", "null", "auto"];
   var keywordsRegexp = new RegExp("^" + keywords.join("|"));
 
-  var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-", "\\!=", "/", "\\*", "%", "and", "or", "not"];
+  var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-",
+                   "\\!=", "/", "\\*", "%", "and", "or", "not", ";","\\{","\\}",":"];
   var opRegexp = tokenRegexp(operators);
 
-  var pseudoElementsRegexp = /^::[\w\-]+/;
+  var pseudoElementsRegexp = /^::?[a-zA-Z_][\w\-]*/;
 
   function urlTokens(stream, state) {
     var ch = stream.peek();
@@ -56,7 +57,7 @@ CodeMirror.defineMode("sass", function(config) {
         stream.next();
         state.tokenizer = tokenBase;
       } else {
-        stream.next();
+        stream.skipToEnd();
       }
 
       return "comment";
@@ -135,178 +136,216 @@ CodeMirror.defineMode("sass", function(config) {
       return "operator";
     }
 
-    if (ch === ".") {
+    // Strings
+    if (ch === '"' || ch === "'") {
       stream.next();
-
-      // Match class selectors
-      if (stream.match(/^[\w-]+/)) {
-        indent(state);
-        return "atom";
-      } else if (stream.peek() === "#") {
-        indent(state);
-        return "atom";
-      } else {
-        return "operator";
-      }
+      state.tokenizer = buildStringTokenizer(ch);
+      return "string";
     }
 
-    if (ch === "#") {
-      stream.next();
+    if(!state.cursorHalf){// state.cursorHalf === 0
+    // first half i.e. before : for key-value pairs
+    // including selectors
 
-      // Hex numbers
-      if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/))
-        return "number";
+      if (ch === ".") {
+        stream.next();
+        if (stream.match(/^[\w-]+/)) {
+          indent(state);
+          return "atom";
+        } else if (stream.peek() === "#") {
+          indent(state);
+          return "atom";
+        }
+      }
 
-      // ID selectors
-      if (stream.match(/^[\w-]+/)) {
-        indent(state);
-        return "atom";
+      if (ch === "#") {
+        stream.next();
+        // ID selectors
+        if (stream.match(/^[\w-]+/)) {
+          indent(state);
+          return "atom";
+        }
+        if (stream.peek() === "#") {
+          indent(state);
+          return "atom";
+        }
       }
 
-      if (stream.peek() === "#") {
-        indent(state);
-        return "atom";
+      // Variables
+      if (ch === "$") {
+        stream.next();
+        stream.eatWhile(/[\w-]/);
+        return "variable-2";
       }
-    }
 
-    // Numbers
-    if (stream.match(/^-?[0-9\.]+/))
-      return "number";
+      // Numbers
+      if (stream.match(/^-?[0-9\.]+/))
+        return "number";
+
+      // Units
+      if (stream.match(/^(px|em|in)\b/))
+        return "unit";
 
-    // Units
-    if (stream.match(/^(px|em|in)\b/))
-      return "unit";
+      if (stream.match(keywordsRegexp))
+        return "keyword";
 
-    if (stream.match(keywordsRegexp))
-      return "keyword";
+      if (stream.match(/^url/) && stream.peek() === "(") {
+        state.tokenizer = urlTokens;
+        return "atom";
+      }
 
-    if (stream.match(/^url/) && stream.peek() === "(") {
-      state.tokenizer = urlTokens;
-      return "atom";
-    }
+      if (ch === "=") {
+        // Match shortcut mixin definition
+        if (stream.match(/^=[\w-]+/)) {
+          indent(state);
+          return "meta";
+        }
+      }
 
-    // Variables
-    if (ch === "$") {
-      stream.next();
-      stream.eatWhile(/[\w-]/);
-      stream.eatSpace();
-      if (stream.peek() === ":")
-        return "variable-2";
-      else
-        return "variable-3";
-    }
+      if (ch === "+") {
+        // Match shortcut mixin definition
+        if (stream.match(/^\+[\w-]+/)){
+          return "variable-3";
+        }
+      }
 
-    if (ch === "!") {
-      stream.next();
-      return stream.match(/^[\w]+/) ? "keyword": "operator";
-    }
+      if(ch === "@"){
+        if(stream.match(/@extend/)){
+          if(!stream.match(/\s*[\w]/))
+            dedent(state);
+        }
+      }
 
-    if (ch === "=") {
-      stream.next();
 
-      // Match shortcut mixin definition
-      if (stream.match(/^[\w-]+/)) {
+      // Indent Directives
+      if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
         indent(state);
         return "meta";
-      } else {
-        return "operator";
       }
-    }
 
-    if (ch === "+") {
-      stream.next();
+      // Other Directives
+      if (ch === "@") {
+        stream.next();
+        stream.eatWhile(/[\w-]/);
+        return "meta";
+      }
 
-      // Match shortcut mixin definition
-      if (stream.match(/^[\w-]+/))
-        return "variable-3";
-      else
+      if (stream.eatWhile(/[\w-]/)){
+        if(stream.match(/ *: *[\w-\+\$#!\("']/,false)){
+          return "propery";
+        }
+        else if(stream.match(/ *:/,false)){
+          indent(state);
+          state.cursorHalf = 1;
+          return "atom";
+        }
+        else if(stream.match(/ *,/,false)){
+          return "atom";
+        }
+        else{
+          indent(state);
+          return "atom";
+        }
+      }
+
+      if(ch === ":"){
+        if (stream.match(pseudoElementsRegexp)){ // could be a pseudo-element
+          return "keyword";
+        }
+        stream.next();
+        state.cursorHalf=1;
         return "operator";
-    }
+      }
 
-    // Indent Directives
-    if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
-      indent(state);
-      return "meta";
-    }
+    } // cursorHalf===0 ends here
+    else{
 
-    // Other Directives
-    if (ch === "@") {
-      stream.next();
-      stream.eatWhile(/[\w-]/);
-      return "meta";
-    }
+      if (ch === "#") {
+        stream.next();
+        // Hex numbers
+        if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
+          if(!stream.peek()){
+            state.cursorHalf = 0;
+          }
+          return "number";
+        }
+      }
 
-    // Strings
-    if (ch === '"' || ch === "'") {
-      stream.next();
-      state.tokenizer = buildStringTokenizer(ch);
-      return "string";
-    }
+      // Numbers
+      if (stream.match(/^-?[0-9\.]+/)){
+        if(!stream.peek()){
+          state.cursorHalf = 0;
+        }
+        return "number";
+      }
+
+      // Units
+      if (stream.match(/^(px|em|in)\b/)){
+        if(!stream.peek()){
+          state.cursorHalf = 0;
+        }
+        return "unit";
+      }
 
-    // Pseudo element selectors and values after colon
-    if (ch === ":"){
-      if (stream.match(pseudoElementsRegexp))
+      if (stream.match(keywordsRegexp)){
+        if(!stream.peek()){
+          state.cursorHalf = 0;
+        }
         return "keyword";
-      stream.next();
-      stream.eatSpace();
-      if (stream.peek() === null){
-        // if there is no more space after it
-        indent(state);
-        return "atom";
       }
 
-      // all posible tokens after colon
-      if (stream.match(/\$[\w-]+/)){
-        // variables
-        return "variable-3";
-      } else if (stream.match(/^url/) && stream.peek() === "(") {
-        //urls
+      if (stream.match(/^url/) && stream.peek() === "(") {
         state.tokenizer = urlTokens;
-        return "atom";
-      } else if (stream.match(/#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3}/)){
-        //hexadecimal value
-        return "number";
-      } else if (stream.match(/^-?[0-9\.]+/)){
-        return "number";
-      } else if (stream.match(keywordsRegexp)){
-        return "keyword";
-      } else if (stream.match(/[\w-,\s]+/)){
-        // other text
+        if(!stream.peek()){
+          state.cursorHalf = 0;
+        }
         return "atom";
       }
-    }
 
-    if (stream.match(opRegexp))
-      return "operator";
+      // Variables
+      if (ch === "$") {
+        stream.next();
+        stream.eatWhile(/[\w-]/);
+        if(!stream.peek()){
+          state.cursorHalf = 0;
+        }
+        return "variable-3";
+      }
 
-    // atoms
-    if (stream.eatWhile(/[\w-&]/)) {
-      stream.eatSpace();
-      // matches a property definition
-      if (stream.peek() === ":" ){
-        if (!stream.match(/:[ ]*[\d\w-\$\+#!\("']/,false)){
-         //for cases where line ends after colon
-         // eg
-         // font:
-         //   | <-----cursor
-          indent(state);
-          return "property";
-        } else if (!stream.match(pseudoElementsRegexp, false)){
-          return "property";
+      // bang character for !important, !default, etc.
+      if (ch === "!") {
+        stream.next();
+        if(!stream.peek()){
+          state.cursorHalf = 0;
         }
-      } else {
-        stream.eatSpace();
-        if (stream.peek() !== "," ){
-          //for cases where line ends after comma
-          //eg
-          //head,
-          //body,
-          //| <-----cursor
-          indent(state);
+        return stream.match(/^[\w]+/) ? "keyword": "operator";
+      }
+
+      if (stream.match(opRegexp)){
+        if(!stream.peek()){
+          state.cursorHalf = 0;
         }
-        return "atom";
+        return "operator";
+      }
+
+      // attributes
+      if (stream.eatWhile(/[\w-]/)) {
+        if(!stream.peek()){
+          state.cursorHalf = 0;
+        }
+        return "attribute";
       }
-    }
+
+      //stream.eatSpace();
+      if(!stream.peek()){
+        state.cursorHalf = 0;
+        return null;
+      }
+
+    } // else ends here
+
+    if (stream.match(opRegexp))
+      return "operator";
 
     // If we haven't returned by now, we move 1 character
     // and return an error
@@ -319,11 +358,13 @@ CodeMirror.defineMode("sass", function(config) {
     var style = state.tokenizer(stream, state);
     var current = stream.current();
 
-    if (current === "@return")
+    if (current === "@return" || current === "}"){
       dedent(state);
+    }
 
     if (style !== null) {
       var startOfToken = stream.pos - current.length;
+
       var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);
 
       var newScopes = [];
@@ -348,6 +389,8 @@ CodeMirror.defineMode("sass", function(config) {
         tokenizer: tokenBase,
         scopes: [{offset: 0, type: "sass"}],
         indentCount: 0,
+        cursorHalf: 0,  // cursor half tells us if cursor lies after (1)
+                        // or before (0) colon (well... more or less)
         definedVars: [],
         definedMixins: []
       };

From 1bfa666170100a4b40c14766f11460838a9c3ad8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 Jan 2015 13:11:24 +0100
Subject: [PATCH 1820/4742] [merge addon] Keep stable scroll position when
 removing/adding alignment padding

See http://discuss.codemirror.net/t/jittering-mousewheel-scrolling-with-merge-addon-align-mode/125
---
 addon/merge/merge.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index ed22b60024..3e9df42fb7 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -259,11 +259,13 @@
   function makeConnections(dv) {
     if (!dv.showDifferences) return;
 
-    var align = dv.mv.options.connect == "align";
+    var align = dv.mv.options.connect == "align", oldScrollEdit, oldScrollOrig;
     if (align) {
       if (!dv.orig.curOp) return dv.orig.operation(function() {
         makeConnections(dv);
       });
+      oldScrollEdit = dv.edit.getScrollInfo().top;
+      oldScrollOrig = dv.orig.getScrollInfo().top;
       for (var i = 0; i < dv.aligners.length; i++)
         dv.aligners[i].clear();
       dv.aligners.length = 0;
@@ -293,6 +295,8 @@
         dv.aligners.push(padBelow(dv.edit, 0, extraSpaceAbove.edit));
       if (extraSpaceAbove.orig)
         dv.aligners.push(padBelow(dv.orig, 0, extraSpaceAbove.orig));
+      dv.edit.scrollTo(null, oldScrollEdit);
+      dv.orig.scrollTo(null, oldScrollOrig);
     }
   }
 

From 0d8d8555529c279002115842b82f03109165d476 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 3 Jan 2015 22:48:50 +0100
Subject: [PATCH 1821/4742] [simpelscrollbars addon] Properly detect
 end-of-drag on non-Webkit browsers

Issue #3017
---
 addon/scroll/simplescrollbars.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addon/scroll/simplescrollbars.js b/addon/scroll/simplescrollbars.js
index 739aa7beb4..bb06adb86a 100644
--- a/addon/scroll/simplescrollbars.js
+++ b/addon/scroll/simplescrollbars.js
@@ -27,14 +27,16 @@
       CodeMirror.e_preventDefault(e);
       var axis = self.orientation == "horizontal" ? "pageX" : "pageY";
       var start = e[axis], startpos = self.pos;
+      function done() {
+        CodeMirror.off(document, "mousemove", move);
+        CodeMirror.off(document, "mouseup", done);
+      }
       function move(e) {
-        if (e.which != 1) {
-          CodeMirror.off(document, "mousemove", move);
-          return;
-        }
+        if (e.which != 1) return done();
         self.moveTo(startpos + (e[axis] - start) * (self.total / self.size));
       }
       CodeMirror.on(document, "mousemove", move);
+      CodeMirror.on(document, "mouseup", done);
     });
 
     CodeMirror.on(this.node, "click", function(e) {

From 5619d837ef00e68ad2c15c2fb2fd49ee71f035e8 Mon Sep 17 00:00:00 2001
From: tel <t_telkun@hotmail.com>
Date: Sun, 4 Jan 2015 03:22:08 +0900
Subject: [PATCH 1822/4742] [clike mode] Fix GLSL keywords

---
 mode/clike/clike.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 710953b229..b04b22b167 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -408,7 +408,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 " +
                     "mat2 mat3 mat4 " +
                     "sampler1D sampler2D sampler3D samplerCube " +
-                    "sampler1DShadow sampler2DShadow" +
+                    "sampler1DShadow sampler2DShadow " +
                     "const attribute uniform varying " +
                     "break continue discard return " +
                     "for while do if else struct " +
@@ -416,7 +416,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     blockKeywords: words("for while do if else struct"),
     builtin: words("radians degrees sin cos tan asin acos atan " +
                     "pow exp log exp2 sqrt inversesqrt " +
-                    "abs sign floor ceil fract mod min max clamp mix step smootstep " +
+                    "abs sign floor ceil fract mod min max clamp mix step smoothstep " +
                     "length distance dot cross normalize ftransform faceforward " +
                     "reflect refract matrixCompMult " +
                     "lessThan lessThanEqual greaterThan greaterThanEqual " +
@@ -433,12 +433,12 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                 "gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex " +
                 "gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 " +
                 "gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 " +
-                "gl_FogCoord " +
+                "gl_FogCoord gl_PointCoord " +
                 "gl_Position gl_PointSize gl_ClipVertex " +
                 "gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor " +
                 "gl_TexCoord gl_FogFragCoord " +
                 "gl_FragCoord gl_FrontFacing " +
-                "gl_FragColor gl_FragData gl_FragDepth " +
+                "gl_FragData gl_FragDepth " +
                 "gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix " +
                 "gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse " +
                 "gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse " +

From f97df90d832fa523d26f26131e6646567f5a83d0 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 3 Jan 2015 19:40:09 -0500
Subject: [PATCH 1823/4742] [vim] Check for falsy return from
 CodeMirror.keyname

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 913e3a63fd..88a404a291 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4807,6 +4807,7 @@
       var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       var keyName = CodeMirror.keyName(e);
+      if (!keyName) { return; }
       function onKeyFound() {
         lastChange.changes.push(new InsertModeKey(keyName));
         return true;

From 0cb74f85f78e910409cc036f49fb64083f179703 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Jan 2015 09:09:48 +0100
Subject: [PATCH 1824/4742] Make eventInWidget work with text nodes

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 68a08b9419..f7c3817d30 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2759,7 +2759,9 @@
   // Return true when the given mouse event happened in a widget
   function eventInWidget(display, e) {
     for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
-      if (!n || n.getAttribute("cm-ignore-events") == "true" || n.parentNode == display.sizer && n != display.mover) return true;
+      if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
+          (n.parentNode == display.sizer && n != display.mover))
+        return true;
     }
   }
 

From deb87f471b1e63eb145cf0a387d659da38ed1fd2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Jan 2015 16:30:43 +0100
Subject: [PATCH 1825/4742] Properly document that cursorCoords can be given
 "window" as mode

---
 doc/manual.html   | 9 ++++++---
 lib/codemirror.js | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index dc3cfe065e..ba1f89352c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1763,9 +1763,12 @@ <h3 id="api_sizing">Sizing, scrolling and positioning methods</h3>
       If <code>mode</code> is <code>"local"</code>, they will be
       relative to the top-left corner of the editable document. If it
       is <code>"page"</code> or not given, they are relative to the
-      top-left corner of the page. <code>where</code> can be a boolean
-      indicating whether you want the start (<code>true</code>) or the
-      end (<code>false</code>) of the selection, or, if a <code>{line,
+      top-left corner of the page. If <code>mode</code>
+      is <code>"window"</code>, the coordinates are relative to the
+      top-left corner of the currently visible (scrolled)
+      window. <code>where</code> can be a boolean indicating whether
+      you want the start (<code>true</code>) or the end
+      (<code>false</code>) of the selection, or, if a <code>{line,
       ch}</code> object is given, it specifies the precise position at
       which you want to measure.</dd>
       <dt id="charCoords"><code><strong>cm.charCoords</strong>(pos: {line, ch}, ?mode: string) → {left, right, top, bottom}</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index f7c3817d30..542fb41732 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1847,7 +1847,8 @@
 
   // Converts a {top, bottom, left, right} box from line-local
   // coordinates into another coordinate system. Context may be one of
-  // "line", "div" (display.lineDiv), "local"/null (editor), or "page".
+  // "line", "div" (display.lineDiv), "local"/null (editor), "window",
+  // or "page".
   function intoCoordSystem(cm, lineObj, rect, context) {
     if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
       var size = widgetHeight(lineObj.widgets[i]);

From 04dbeafb4dc224041670045bce08d607f2b2bafa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Jan 2015 17:56:46 +0100
Subject: [PATCH 1826/4742] [javascript mode] Also look at following text to
 determine continued statement

Issue #3015
---
 mode/javascript/javascript.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fac8d57769..93df06d152 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -600,6 +600,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "if") return cont(expression, comprehension);
   }
 
+  function isContinuedStatement(state, textAfter) {
+    return state.lastType == "operator" || state.lastType == "," ||
+      isOperatorChar.test(textAfter.charAt(0)) ||
+      /[,.]/.test(textAfter.charAt(0));
+  }
+
   // Interface
 
   return {
@@ -651,7 +657,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       else if (type == "form" && firstChar == "{") return lexical.indented;
       else if (type == "form") return lexical.indented + indentUnit;
       else if (type == "stat")
-        return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? statementIndent || indentUnit : 0);
+        return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);
       else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
         return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
       else if (lexical.align) return lexical.column + (closing ? 0 : 1);

From 9ee2cefa7f7eded5aba5cb297236038429e5036d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 7 Jan 2015 12:27:23 +0100
Subject: [PATCH 1827/4742] Don't fall back to native implemtation of
 map/indexOf

They aren't faster, and don't work on pseudo-arrays.
---
 lib/codemirror.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 542fb41732..20c7329c7e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7467,13 +7467,11 @@
       if (array[i] == elt) return i;
     return -1;
   }
-  if ([].indexOf) indexOf = function(array, elt) { return array.indexOf(elt); };
   function map(array, f) {
     var out = [];
     for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
     return out;
   }
-  if ([].map) map = function(array, f) { return array.map(f); };
 
   function createObj(base, props) {
     var inst;

From f043c8db443a3f097b0ed7b2ac0fb5399f9312b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 Jan 2015 18:06:39 +0100
Subject: [PATCH 1828/4742] Make setValue completely replace the document

Issue #3023
---
 lib/codemirror.js | 26 +++++++++++++++++---------
 test/test.js      |  8 ++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 20c7329c7e..ed337635c7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3791,7 +3791,9 @@
 
     var lendiff = change.text.length - (to.line - from.line) - 1;
     // Remember that these lines changed, for updating the display
-    if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
+    if (change.full)
+      regChange(cm);
+    else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
       regLineChange(cm, from.line, "text");
     else
       regChange(cm, from.line, to.line + 1, lendiff);
@@ -5573,6 +5575,7 @@
   // spans partially within the change. Returns an array of span
   // arrays with one element for each line in (after) the change.
   function stretchSpansOverChange(doc, change) {
+    if (change.full) return null;
     var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
     var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
     if (!oldFirst && !oldLast) return null;
@@ -6345,17 +6348,24 @@
       updateLine(line, text, spans, estimateHeight);
       signalLater(line, "change", line, change);
     }
+    function linesFor(start, end) {
+      for (var i = start, result = []; i < end; ++i)
+        result.push(new Line(text[i], spansFor(i), estimateHeight));
+      return result;
+    }
 
     var from = change.from, to = change.to, text = change.text;
     var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
     var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
 
     // Adjust the line structure
-    if (isWholeLineUpdate(doc, change)) {
+    if (change.full) {
+      doc.insert(0, linesFor(0, text.length));
+      doc.remove(text.length, doc.size - text.length);
+    } else if (isWholeLineUpdate(doc, change)) {
       // This is a whole-line replace. Treated specially to make
       // sure line objects move the way they are supposed to.
-      for (var i = 0, added = []; i < text.length - 1; ++i)
-        added.push(new Line(text[i], spansFor(i), estimateHeight));
+      var added = linesFor(0, text.length - 1);
       update(lastLine, lastLine.text, lastSpans);
       if (nlines) doc.remove(from.line, nlines);
       if (added.length) doc.insert(from.line, added);
@@ -6363,8 +6373,7 @@
       if (text.length == 1) {
         update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
       } else {
-        for (var added = [], i = 1; i < text.length - 1; ++i)
-          added.push(new Line(text[i], spansFor(i), estimateHeight));
+        var added = linesFor(1, text.length - 1);
         added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
         update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
         doc.insert(from.line + 1, added);
@@ -6375,8 +6384,7 @@
     } else {
       update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
       update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
-      for (var i = 1, added = []; i < text.length - 1; ++i)
-        added.push(new Line(text[i], spansFor(i), estimateHeight));
+      var added = linesFor(1, text.length - 1);
       if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
       doc.insert(from.line + 1, added);
     }
@@ -6587,7 +6595,7 @@
     setValue: docMethodOp(function(code) {
       var top = Pos(this.first, 0), last = this.first + this.size - 1;
       makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: splitLines(code), origin: "setValue"}, true);
+                        text: splitLines(code), origin: "setValue", full: true}, true);
       setSelection(this, simpleSelection(top));
     }),
     replaceRange: function(code, from, to, origin) {
diff --git a/test/test.js b/test/test.js
index 08d03810bc..6314598235 100644
--- a/test/test.js
+++ b/test/test.js
@@ -611,6 +611,14 @@ testCM("getAllMarks", function(cm) {
   eq(cm.getAllMarks().length, 2);
 });
 
+testCM("setValueClears", function(cm) {
+  cm.addLineClass(0, "wrap", "foo");
+  var mark = cm.markText(Pos(0, 0), Pos(1, 1), {inclusiveLeft: true, inclusiveRight: true});
+  cm.setValue("foo");
+  is(!cm.lineInfo(0).wrapClass);
+  is(!mark.find());
+}, {value: "a\nb"});
+
 testCM("bug577", function(cm) {
   cm.setValue("a\nb");
   cm.clearHistory();

From 5dd07d60b8b142ca41d336adfccbd7cdd7acdb49 Mon Sep 17 00:00:00 2001
From: Marek Rudnicki <marekrud@gmail.com>
Date: Fri, 9 Jan 2015 15:43:43 +0100
Subject: [PATCH 1829/4742] [emacs keymap] Add C-X H for selectAll

---
 keymap/emacs.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 6a8bb4a2f7..c4135237e1 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -395,6 +395,7 @@
     "Ctrl-X U": repeated("undo"),
     "Ctrl-X K": "close",
     "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
+    "Ctrl-X H": "selectAll",
 
     "Ctrl-Q Tab": repeated("insertTab"),
     "Ctrl-U": addPrefixMap

From 1c78007be219f06f1afca059c2ee18316912daac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 Jan 2015 18:11:53 +0100
Subject: [PATCH 1830/4742] Mark release 4.11

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

diff --git a/bower.json b/bower.json
index c68d54352c..318a2454f1 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.10.1",
+  "version":"4.11.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index d6f3f43777..53314b7514 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.11.0;f=">4.11</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.10.0;f=">4.10</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.9.0;f=">4.9</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.8.0;f=">4.8</option>
diff --git a/doc/manual.html b/doc/manual.html
index dc3cfe065e..be51cb8110 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 4.10.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.11.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 bf26f00b92..d9dd323ec0 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">9-01-2015: <a href="http://codemirror.net/codemirror-4.11.zip">Version 4.11</a>:</p>
+
+  <p class="rel-note">Unfortunately, 4.10 did not take care of the
+  Firefox scrolling issue entirely. This release adds two more patches
+  to address that.</p>
+
   <p class="rel">29-12-2014: <a href="http://codemirror.net/codemirror-4.10.zip">Version 4.10</a>:</p>
 
   <p class="rel-note">Emergency single-patch update to 4.9. Fixes
diff --git a/index.html b/index.html
index 1278430861..1c03177511 100644
--- a/index.html
+++ b/index.html
@@ -86,7 +86,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.10</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.11</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 68a08b9419..038a894a92 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8023,7 +8023,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.10.1";
+  CodeMirror.version = "4.11.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 7532035cf0..c011d782cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.10.1",
+    "version":"4.11.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 3cf2e251a3037089a626f53facfe91bfe65d790b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 9 Jan 2015 18:15:00 +0100
Subject: [PATCH 1831/4742] Bump version number post-4.11

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

diff --git a/bower.json b/bower.json
index 318a2454f1..16aa2e37dd 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.11.0",
+  "version":"4.11.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 906646e986..4298a17d67 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 4.11.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.11.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 893a5f54d6..c8612d0b5a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8032,7 +8032,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.11.0";
+  CodeMirror.version = "4.11.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index c011d782cf..57f12bba7b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.11.0",
+    "version":"4.11.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 6d8de27e7cf987015b52c44c6b5df97993ef3307 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 12 Jan 2015 10:56:34 +0100
Subject: [PATCH 1832/4742] [foldgutter addon] Use same option defaulting
 strategy as foldcode addon

---
 addon/fold/foldcode.js   | 4 ++++
 addon/fold/foldgutter.js | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 3abeb83e76..62911f9352 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -142,4 +142,8 @@
       return editorOptions[name];
     return defaultOptions[name];
   }
+
+  CodeMirror.defineExtension("foldOption", function(options, name) {
+    return getOption(this, options, name);
+  });
 });
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index bd31ec4d9b..3359476796 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -67,14 +67,16 @@
 
   function updateFoldInfo(cm, from, to) {
     var opts = cm.state.foldGutter.options, cur = from;
+    var minSize = cm.foldOption(opts, "minFoldSize");
+    var func = cm.foldOption(opts, "rangeFinder");
     cm.eachLine(from, to, function(line) {
       var mark = null;
       if (isFolded(cm, cur)) {
         mark = marker(opts.indicatorFolded);
       } else {
-        var pos = Pos(cur, 0), func = opts.rangeFinder || CodeMirror.fold.auto;
+        var pos = Pos(cur, 0);
         var range = func && func(cm, pos);
-        if (range && range.from.line + 1 < range.to.line)
+        if (range && range.to.line - range.from.line >= minSize)
           mark = marker(opts.indicatorOpen);
       }
       cm.setGutterMarker(line, opts.gutter, mark);

From f12f5733d57d6ced95f2487bfcddf757245c1ea2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 13 Jan 2015 10:35:34 +0100
Subject: [PATCH 1833/4742] [closetag addon] Define a closeTag command that
 closes the nearest open tag

Closes #3028
---
 addon/edit/closetag.js | 21 ++++++++++++++-------
 doc/manual.html        |  8 ++++++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index a0bec7dd43..369bea30c4 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -94,15 +94,15 @@
     }
   }
 
-  function autoCloseSlash(cm) {
-    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+  function autoCloseCurrent(cm, typingSlash) {
     var ranges = cm.listSelections(), replacements = [];
+    var head = typingSlash ? "/" : "</";
     for (var i = 0; i < ranges.length; i++) {
       if (!ranges[i].empty()) return CodeMirror.Pass;
       var pos = ranges[i].head, tok = cm.getTokenAt(pos);
       var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-      if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-          tok.start != pos.ch - 1)
+      if (typingSlash && (tok.type == "string" || tok.string.charAt(0) != "<" ||
+                          tok.start != pos.ch - 1))
         return CodeMirror.Pass;
       // Kludge to get around the fact that we are not in XML mode
       // when completing in JS/CSS snippet in htmlmixed mode. Does not
@@ -110,16 +110,16 @@
       // way to go from a mixed mode to its current XML state).
       if (inner.mode.name != "xml") {
         if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
-          replacements[i] = "/script>";
+          replacements[i] = head + "script>";
         else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
-          replacements[i] = "/style>";
+          replacements[i] = head + "style>";
         else
           return CodeMirror.Pass;
       } else {
         if (!state.context || !state.context.tagName ||
             closingTagExists(cm, state.context.tagName, pos, state))
           return CodeMirror.Pass;
-        replacements[i] = "/" + state.context.tagName + ">";
+        replacements[i] = head + state.context.tagName + ">";
       }
     }
     cm.replaceSelections(replacements);
@@ -129,6 +129,13 @@
         cm.indentLine(ranges[i].head.line);
   }
 
+  function autoCloseSlash(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    autoCloseCurrent(cm, true);
+  }
+
+  CodeMirror.commands.closeTag = function(cm) { return autoCloseCurrent(cm); };
+
   function indexOf(collection, elt) {
     if (collection.indexOf) return collection.indexOf(elt);
     for (var i = 0, e = collection.length; i < e; ++i)
diff --git a/doc/manual.html b/doc/manual.html
index 4298a17d67..a70ab6b02f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2232,8 +2232,12 @@ <h2 id="addons">Addons</h2>
       squiggly underline style for this class.</dd>
 
       <dt id="addon_closetag"><a href="../addon/edit/closetag.js"><code>edit/closetag.js</code></a></dt>
-      <dd>Provides utility functions for adding automatic tag closing
-      to XML modes. See
+      <dd>Defines an <code>autoCloseTags</code> option that will
+      auto-close XML tags when '<code>&gt;</code>' or '<code>/</code>'
+      is typed, and
+      a <code>closeTag</code> <a href="#commands">command</a> that
+      closes the nearest open tag. Depends on
+      the <code>fold/xml-fold.js</code> addon. See
       the <a href="../demo/closetag.html">demo</a>.</dd>
 
       <dt id="addon_continuelist"><a href="../addon/edit/continuelist.js"><code>edit/continuelist.js</code></a></dt>

From 78e06acf0d9a04b81bd9aa667a9a98c7413c5e70 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Mon, 12 Jan 2015 17:27:04 +0100
Subject: [PATCH 1834/4742] [meta] Add findModeByFileName, several meta
 improvements

---
 doc/manual.html |  9 +++++----
 mode/meta.js    | 41 ++++++++++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index a70ab6b02f..051039bd03 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2658,12 +2658,13 @@ <h2 id="addons">Addons</h2>
       properties <code>mimes</code>, which holds an array of MIME
       types for modes with multiple MIMEs associated,
       and <code>ext</code>, which holds an array of file extensions
-      associated with this mode. Three convenience
+      associated with this mode. Four convenience
       functions, <code>CodeMirror.findModeByMIME</code>,
-      and <code>CodeMirror.findModeByExtension</code>,
+      <code>CodeMirror.findModeByExtension</code>,
+      <code>CodeMirror.findModeByFileName</code>
       and <code>CodeMirror.findModeByName</code> are provided, which
-      return such an object given a MIME or extension string. Note
-      that, for historical reasons, this file resides in the
+      return such an object given a MIME, extension, file name or mode name
+      string. Note that, for historical reasons, this file resides in the
       top-level <code>mode</code> directory, not
       under <code>addon</code>. <a href="../demo/loadmode.html">Demo</a>.</dd>
 
diff --git a/mode/meta.js b/mode/meta.js
index fcaed98e2d..8d91df7d77 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -13,15 +13,15 @@
 
   CodeMirror.modeInfo = [
     {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
-    {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk"},
+    {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
     {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
-    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "hpp", "h++"], alias: ["cpp"]},
+    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
     {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
     {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
-    {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher"},
+    {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
     {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
     {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
     {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
@@ -29,7 +29,7 @@
     {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "dart", ext: ["dart"]},
     {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
     {name: "Django", mime: "text/x-django", mode: "django"},
-    {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile"},
+    {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile", file: /^Dockerfile$/},
     {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
     {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
     {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
@@ -42,7 +42,7 @@
     {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
     {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
     {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
-    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm"},
+    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
     {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
     {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]},
     {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
@@ -59,7 +59,7 @@
     {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
      mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
     {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
-    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", alias: ["jsonld"]},
+    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
     {name: "Jinja2", mime: "null", mode: "jinja2"},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
     {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]},
@@ -72,18 +72,18 @@
     {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
     {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"},
+    {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
     {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
     {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
     {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
-    {name: "PEG.js", mime: "null", mode: "pegjs"},
+    {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
     {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
     {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
-    {name: "Pig", mime: "text/x-pig", mode: "pig"},
+    {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
-    {name: "PLSQL", mime: "text/x-plsql", mode: "sql"},
+    {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
     {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
     {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
     {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
@@ -99,8 +99,8 @@
     {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
     {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
     {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"]},
-    {name: "Sieve", mime: "application/sieve", mode: "sieve"},
-    {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim"},
+    {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
+    {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
     {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
     {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
     {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
@@ -114,15 +114,15 @@
     {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
     {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
     {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
-    {name: "Textile", mime: "text/x-textile", mode: "textile"},
+    {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
     {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
     {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
-    {name: "TOML", mime: "text/x-toml", mode: "toml"},
+    {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
     {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
     {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
     {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
-    {name: "VBScript", mime: "text/vbscript", mode: "vbscript"},
+    {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
     {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
     {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
     {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
@@ -137,6 +137,7 @@
   }
 
   CodeMirror.findModeByMIME = function(mime) {
+    mime = mime.toLowerCase();
     for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
       var info = CodeMirror.modeInfo[i];
       if (info.mime == mime) return info;
@@ -153,6 +154,16 @@
     }
   };
 
+  CodeMirror.findModeByFileName = function(filename) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.file && info.file.test(filename)) return info;
+    }
+    var dot = filename.lastIndexOf(".");
+    var ext = dot > -1 && filename.substring(dot + 1, filename.length);
+    if (ext) return CodeMirror.findModeByExtension(ext);
+  };
+
   CodeMirror.findModeByName = function(name) {
     name = name.toLowerCase();
     for (var i = 0; i < CodeMirror.modeInfo.length; i++) {

From 643d9c05a301b765d1bc8c6877434f35fc2a582a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 14 Jan 2015 14:14:06 +0100
Subject: [PATCH 1835/4742] Use blint for linting, rather than in-tree tool

(Blint is the in-tree tool factored into its own npm package.)
---
 bin/lint           |   15 +-
 package.json       |    3 +-
 test/lint.js       |   11 +
 test/lint/acorn.js | 1782 --------------------------------------------
 test/lint/lint.js  |  166 -----
 test/lint/walk.js  |  313 --------
 test/run.js        |    9 +-
 7 files changed, 15 insertions(+), 2284 deletions(-)
 create mode 100644 test/lint.js
 delete mode 100644 test/lint/acorn.js
 delete mode 100644 test/lint/lint.js
 delete mode 100644 test/lint/walk.js

diff --git a/bin/lint b/bin/lint
index 4f70994c51..47f45f3676 100755
--- a/bin/lint
+++ b/bin/lint
@@ -1,16 +1,3 @@
 #!/usr/bin/env node
 
-var lint = require("../test/lint/lint"),
-    path = require("path");
-
-if (process.argv.length > 2) {
-  lint.checkDir(process.argv[2]);
-} else {
-  process.chdir(path.resolve(__dirname, ".."));
-  lint.checkDir("lib");
-  lint.checkDir("mode");
-  lint.checkDir("addon");
-  lint.checkDir("keymap");
-}
-
-process.exit(lint.success() ? 0 : 1);
+process.exit(require("../test/lint").ok ? 0 : 1);
diff --git a/package.json b/package.json
index 57f12bba7b..b8cb39d0c5 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
     "directories": {"lib": "./lib"},
     "scripts": {"test": "node ./test/run.js"},
     "devDependencies": {"node-static": "0.6.0",
-                        "phantomjs": "1.9.2-5"},
+                        "phantomjs": "1.9.2-5",
+                        "blint": "^0.1.0"},
     "bugs": "http://github.com/codemirror/CodeMirror/issues",
     "keywords": ["JavaScript", "CodeMirror", "Editor"],
     "homepage": "http://codemirror.net",
diff --git a/test/lint.js b/test/lint.js
new file mode 100644
index 0000000000..35777562ef
--- /dev/null
+++ b/test/lint.js
@@ -0,0 +1,11 @@
+var blint = require("blint");
+
+["mode", "lib", "addon", "keymap"].forEach(function(dir) {
+  blint.checkDir(dir, {
+    browser: true,
+    allowedGlobals: ["CodeMirror", "define", "test", "requirejs"],
+    blob: "// CodeMirror, copyright (c) by Marijn Haverbeke and others\n// Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n"
+  });
+});
+
+module.exports = {ok: blint.success()};
diff --git a/test/lint/acorn.js b/test/lint/acorn.js
deleted file mode 100644
index 0f11931752..0000000000
--- a/test/lint/acorn.js
+++ /dev/null
@@ -1,1782 +0,0 @@
-// Acorn is a tiny, fast JavaScript parser written in JavaScript.
-//
-// Acorn was written by Marijn Haverbeke and released under an MIT
-// license. The Unicode regexps (for identifiers and whitespace) were
-// taken from [Esprima](http://esprima.org) by Ariya Hidayat.
-//
-// Git repositories for Acorn are available at
-//
-//     http://marijnhaverbeke.nl/git/acorn
-//     https://github.com/marijnh/acorn.git
-//
-// Please use the [github bug tracker][ghbt] to report issues.
-//
-// [ghbt]: https://github.com/marijnh/acorn/issues
-//
-// This file defines the main parser interface. The library also comes
-// with a [error-tolerant parser][dammit] and an
-// [abstract syntax tree walker][walk], defined in other files.
-//
-// [dammit]: acorn_loose.js
-// [walk]: util/walk.js
-
-(function(root, mod) {
-  if (typeof exports == "object" && typeof module == "object") return mod(exports); // CommonJS
-  if (typeof define == "function" && define.amd) return define(["exports"], mod); // AMD
-  mod(root.acorn || (root.acorn = {})); // Plain browser env
-})(this, function(exports) {
-  "use strict";
-
-  exports.version = "0.4.1";
-
-  // The main exported interface (under `self.acorn` when in the
-  // browser) is a `parse` function that takes a code string and
-  // returns an abstract syntax tree as specified by [Mozilla parser
-  // API][api], with the caveat that the SpiderMonkey-specific syntax
-  // (`let`, `yield`, inline XML, etc) is not recognized.
-  //
-  // [api]: https://developer.mozilla.org/en-US/docs/SpiderMonkey/Parser_API
-
-  var options, input, inputLen, sourceFile;
-
-  exports.parse = function(inpt, opts) {
-    input = String(inpt); inputLen = input.length;
-    setOptions(opts);
-    initTokenState();
-    return parseTopLevel(options.program);
-  };
-
-  // A second optional argument can be given to further configure
-  // the parser process. These options are recognized:
-
-  var defaultOptions = exports.defaultOptions = {
-    // `ecmaVersion` indicates the ECMAScript version to parse. Must
-    // be either 3 or 5. This
-    // influences support for strict mode, the set of reserved words, and
-    // support for getters and setter.
-    ecmaVersion: 5,
-    // Turn on `strictSemicolons` to prevent the parser from doing
-    // automatic semicolon insertion.
-    strictSemicolons: false,
-    // When `allowTrailingCommas` is false, the parser will not allow
-    // trailing commas in array and object literals.
-    allowTrailingCommas: true,
-    // By default, reserved words are not enforced. Enable
-    // `forbidReserved` to enforce them. When this option has the
-    // value "everywhere", reserved words and keywords can also not be
-    // used as property names.
-    forbidReserved: false,
-    // When enabled, a return at the top level is not considered an
-    // error.
-    allowReturnOutsideFunction: false,
-    // When `locations` is on, `loc` properties holding objects with
-    // `start` and `end` properties in `{line, column}` form (with
-    // line being 1-based and column 0-based) will be attached to the
-    // nodes.
-    locations: false,
-    // A function can be passed as `onComment` option, which will
-    // cause Acorn to call that function with `(block, text, start,
-    // end)` parameters whenever a comment is skipped. `block` is a
-    // boolean indicating whether this is a block (`/* */`) comment,
-    // `text` is the content of the comment, and `start` and `end` are
-    // character offsets that denote the start and end of the comment.
-    // When the `locations` option is on, two more parameters are
-    // passed, the full `{line, column}` locations of the start and
-    // end of the comments. Note that you are not allowed to call the
-    // parser from the callback—that will corrupt its internal state.
-    onComment: null,
-    // Nodes have their start and end characters offsets recorded in
-    // `start` and `end` properties (directly on the node, rather than
-    // the `loc` object, which holds line/column data. To also add a
-    // [semi-standardized][range] `range` property holding a `[start,
-    // end]` array with the same numbers, set the `ranges` option to
-    // `true`.
-    //
-    // [range]: https://bugzilla.mozilla.org/show_bug.cgi?id=745678
-    ranges: false,
-    // It is possible to parse multiple files into a single AST by
-    // passing the tree produced by parsing the first file as
-    // `program` option in subsequent parses. This will add the
-    // toplevel forms of the parsed file to the `Program` (top) node
-    // of an existing parse tree.
-    program: null,
-    // When `locations` is on, you can pass this to record the source
-    // file in every node's `loc` object.
-    sourceFile: null,
-    // This value, if given, is stored in every node, whether
-    // `locations` is on or off.
-    directSourceFile: null
-  };
-
-  function setOptions(opts) {
-    options = opts || {};
-    for (var opt in defaultOptions) if (!Object.prototype.hasOwnProperty.call(options, opt))
-      options[opt] = defaultOptions[opt];
-    sourceFile = options.sourceFile || null;
-  }
-
-  // The `getLineInfo` function is mostly useful when the
-  // `locations` option is off (for performance reasons) and you
-  // want to find the line/column position for a given character
-  // offset. `input` should be the code string that the offset refers
-  // into.
-
-  var getLineInfo = exports.getLineInfo = function(input, offset) {
-    for (var line = 1, cur = 0;;) {
-      lineBreak.lastIndex = cur;
-      var match = lineBreak.exec(input);
-      if (match && match.index < offset) {
-        ++line;
-        cur = match.index + match[0].length;
-      } else break;
-    }
-    return {line: line, column: offset - cur};
-  };
-
-  // Acorn is organized as a tokenizer and a recursive-descent parser.
-  // The `tokenize` export provides an interface to the tokenizer.
-  // Because the tokenizer is optimized for being efficiently used by
-  // the Acorn parser itself, this interface is somewhat crude and not
-  // very modular. Performing another parse or call to `tokenize` will
-  // reset the internal state, and invalidate existing tokenizers.
-
-  exports.tokenize = function(inpt, opts) {
-    input = String(inpt); inputLen = input.length;
-    setOptions(opts);
-    initTokenState();
-
-    var t = {};
-    function getToken(forceRegexp) {
-      lastEnd = tokEnd;
-      readToken(forceRegexp);
-      t.start = tokStart; t.end = tokEnd;
-      t.startLoc = tokStartLoc; t.endLoc = tokEndLoc;
-      t.type = tokType; t.value = tokVal;
-      return t;
-    }
-    getToken.jumpTo = function(pos, reAllowed) {
-      tokPos = pos;
-      if (options.locations) {
-        tokCurLine = 1;
-        tokLineStart = lineBreak.lastIndex = 0;
-        var match;
-        while ((match = lineBreak.exec(input)) && match.index < pos) {
-          ++tokCurLine;
-          tokLineStart = match.index + match[0].length;
-        }
-      }
-      tokRegexpAllowed = reAllowed;
-      skipSpace();
-    };
-    return getToken;
-  };
-
-  // State is kept in (closure-)global variables. We already saw the
-  // `options`, `input`, and `inputLen` variables above.
-
-  // The current position of the tokenizer in the input.
-
-  var tokPos;
-
-  // The start and end offsets of the current token.
-
-  var tokStart, tokEnd;
-
-  // When `options.locations` is true, these hold objects
-  // containing the tokens start and end line/column pairs.
-
-  var tokStartLoc, tokEndLoc;
-
-  // The type and value of the current token. Token types are objects,
-  // named by variables against which they can be compared, and
-  // holding properties that describe them (indicating, for example,
-  // the precedence of an infix operator, and the original name of a
-  // keyword token). The kind of value that's held in `tokVal` depends
-  // on the type of the token. For literals, it is the literal value,
-  // for operators, the operator name, and so on.
-
-  var tokType, tokVal;
-
-  // Interal state for the tokenizer. To distinguish between division
-  // operators and regular expressions, it remembers whether the last
-  // token was one that is allowed to be followed by an expression.
-  // (If it is, a slash is probably a regexp, if it isn't it's a
-  // division operator. See the `parseStatement` function for a
-  // caveat.)
-
-  var tokRegexpAllowed;
-
-  // When `options.locations` is true, these are used to keep
-  // track of the current line, and know when a new line has been
-  // entered.
-
-  var tokCurLine, tokLineStart;
-
-  // These store the position of the previous token, which is useful
-  // when finishing a node and assigning its `end` position.
-
-  var lastStart, lastEnd, lastEndLoc;
-
-  // This is the parser's state. `inFunction` is used to reject
-  // `return` statements outside of functions, `labels` to verify that
-  // `break` and `continue` have somewhere to jump to, and `strict`
-  // indicates whether strict mode is on.
-
-  var inFunction, labels, strict;
-
-  // This function is used to raise exceptions on parse errors. It
-  // takes an offset integer (into the current `input`) to indicate
-  // the location of the error, attaches the position to the end
-  // of the error message, and then raises a `SyntaxError` with that
-  // message.
-
-  function raise(pos, message) {
-    var loc = getLineInfo(input, pos);
-    message += " (" + loc.line + ":" + loc.column + ")";
-    var err = new SyntaxError(message);
-    err.pos = pos; err.loc = loc; err.raisedAt = tokPos;
-    throw err;
-  }
-
-  // Reused empty array added for node fields that are always empty.
-
-  var empty = [];
-
-  // ## Token types
-
-  // The assignment of fine-grained, information-carrying type objects
-  // allows the tokenizer to store the information it has about a
-  // token in a way that is very cheap for the parser to look up.
-
-  // All token type variables start with an underscore, to make them
-  // easy to recognize.
-
-  // These are the general types. The `type` property is only used to
-  // make them recognizeable when debugging.
-
-  var _num = {type: "num"}, _regexp = {type: "regexp"}, _string = {type: "string"};
-  var _name = {type: "name"}, _eof = {type: "eof"};
-
-  // Keyword tokens. The `keyword` property (also used in keyword-like
-  // operators) indicates that the token originated from an
-  // identifier-like word, which is used when parsing property names.
-  //
-  // The `beforeExpr` property is used to disambiguate between regular
-  // expressions and divisions. It is set on all token types that can
-  // be followed by an expression (thus, a slash after them would be a
-  // regular expression).
-  //
-  // `isLoop` marks a keyword as starting a loop, which is important
-  // to know when parsing a label, in order to allow or disallow
-  // continue jumps to that label.
-
-  var _break = {keyword: "break"}, _case = {keyword: "case", beforeExpr: true}, _catch = {keyword: "catch"};
-  var _continue = {keyword: "continue"}, _debugger = {keyword: "debugger"}, _default = {keyword: "default"};
-  var _do = {keyword: "do", isLoop: true}, _else = {keyword: "else", beforeExpr: true};
-  var _finally = {keyword: "finally"}, _for = {keyword: "for", isLoop: true}, _function = {keyword: "function"};
-  var _if = {keyword: "if"}, _return = {keyword: "return", beforeExpr: true}, _switch = {keyword: "switch"};
-  var _throw = {keyword: "throw", beforeExpr: true}, _try = {keyword: "try"}, _var = {keyword: "var"};
-  var _while = {keyword: "while", isLoop: true}, _with = {keyword: "with"}, _new = {keyword: "new", beforeExpr: true};
-  var _this = {keyword: "this"};
-
-  // The keywords that denote values.
-
-  var _null = {keyword: "null", atomValue: null}, _true = {keyword: "true", atomValue: true};
-  var _false = {keyword: "false", atomValue: false};
-
-  // Some keywords are treated as regular operators. `in` sometimes
-  // (when parsing `for`) needs to be tested against specifically, so
-  // we assign a variable name to it for quick comparing.
-
-  var _in = {keyword: "in", binop: 7, beforeExpr: true};
-
-  // Map keyword names to token types.
-
-  var keywordTypes = {"break": _break, "case": _case, "catch": _catch,
-                      "continue": _continue, "debugger": _debugger, "default": _default,
-                      "do": _do, "else": _else, "finally": _finally, "for": _for,
-                      "function": _function, "if": _if, "return": _return, "switch": _switch,
-                      "throw": _throw, "try": _try, "var": _var, "while": _while, "with": _with,
-                      "null": _null, "true": _true, "false": _false, "new": _new, "in": _in,
-                      "instanceof": {keyword: "instanceof", binop: 7, beforeExpr: true}, "this": _this,
-                      "typeof": {keyword: "typeof", prefix: true, beforeExpr: true},
-                      "void": {keyword: "void", prefix: true, beforeExpr: true},
-                      "delete": {keyword: "delete", prefix: true, beforeExpr: true}};
-
-  // Punctuation token types. Again, the `type` property is purely for debugging.
-
-  var _bracketL = {type: "[", beforeExpr: true}, _bracketR = {type: "]"}, _braceL = {type: "{", beforeExpr: true};
-  var _braceR = {type: "}"}, _parenL = {type: "(", beforeExpr: true}, _parenR = {type: ")"};
-  var _comma = {type: ",", beforeExpr: true}, _semi = {type: ";", beforeExpr: true};
-  var _colon = {type: ":", beforeExpr: true}, _dot = {type: "."}, _question = {type: "?", beforeExpr: true};
-
-  // Operators. These carry several kinds of properties to help the
-  // parser use them properly (the presence of these properties is
-  // what categorizes them as operators).
-  //
-  // `binop`, when present, specifies that this operator is a binary
-  // operator, and will refer to its precedence.
-  //
-  // `prefix` and `postfix` mark the operator as a prefix or postfix
-  // unary operator. `isUpdate` specifies that the node produced by
-  // the operator should be of type UpdateExpression rather than
-  // simply UnaryExpression (`++` and `--`).
-  //
-  // `isAssign` marks all of `=`, `+=`, `-=` etcetera, which act as
-  // binary operators with a very low precedence, that should result
-  // in AssignmentExpression nodes.
-
-  var _slash = {binop: 10, beforeExpr: true}, _eq = {isAssign: true, beforeExpr: true};
-  var _assign = {isAssign: true, beforeExpr: true};
-  var _incDec = {postfix: true, prefix: true, isUpdate: true}, _prefix = {prefix: true, beforeExpr: true};
-  var _logicalOR = {binop: 1, beforeExpr: true};
-  var _logicalAND = {binop: 2, beforeExpr: true};
-  var _bitwiseOR = {binop: 3, beforeExpr: true};
-  var _bitwiseXOR = {binop: 4, beforeExpr: true};
-  var _bitwiseAND = {binop: 5, beforeExpr: true};
-  var _equality = {binop: 6, beforeExpr: true};
-  var _relational = {binop: 7, beforeExpr: true};
-  var _bitShift = {binop: 8, beforeExpr: true};
-  var _plusMin = {binop: 9, prefix: true, beforeExpr: true};
-  var _multiplyModulo = {binop: 10, beforeExpr: true};
-
-  // Provide access to the token types for external users of the
-  // tokenizer.
-
-  exports.tokTypes = {bracketL: _bracketL, bracketR: _bracketR, braceL: _braceL, braceR: _braceR,
-                      parenL: _parenL, parenR: _parenR, comma: _comma, semi: _semi, colon: _colon,
-                      dot: _dot, question: _question, slash: _slash, eq: _eq, name: _name, eof: _eof,
-                      num: _num, regexp: _regexp, string: _string};
-  for (var kw in keywordTypes) exports.tokTypes["_" + kw] = keywordTypes[kw];
-
-  // This is a trick taken from Esprima. It turns out that, on
-  // non-Chrome browsers, to check whether a string is in a set, a
-  // predicate containing a big ugly `switch` statement is faster than
-  // a regular expression, and on Chrome the two are about on par.
-  // This function uses `eval` (non-lexical) to produce such a
-  // predicate from a space-separated string of words.
-  //
-  // It starts by sorting the words by length.
-
-  function makePredicate(words) {
-    words = words.split(" ");
-    var f = "", cats = [];
-    out: for (var i = 0; i < words.length; ++i) {
-      for (var j = 0; j < cats.length; ++j)
-        if (cats[j][0].length == words[i].length) {
-          cats[j].push(words[i]);
-          continue out;
-        }
-      cats.push([words[i]]);
-    }
-    function compareTo(arr) {
-      if (arr.length == 1) return f += "return str === " + JSON.stringify(arr[0]) + ";";
-      f += "switch(str){";
-      for (var i = 0; i < arr.length; ++i) f += "case " + JSON.stringify(arr[i]) + ":";
-      f += "return true}return false;";
-    }
-
-    // When there are more than three length categories, an outer
-    // switch first dispatches on the lengths, to save on comparisons.
-
-    if (cats.length > 3) {
-      cats.sort(function(a, b) {return b.length - a.length;});
-      f += "switch(str.length){";
-      for (var i = 0; i < cats.length; ++i) {
-        var cat = cats[i];
-        f += "case " + cat[0].length + ":";
-        compareTo(cat);
-      }
-      f += "}";
-
-    // Otherwise, simply generate a flat `switch` statement.
-
-    } else {
-      compareTo(words);
-    }
-    return new Function("str", f);
-  }
-
-  // The ECMAScript 3 reserved word list.
-
-  var isReservedWord3 = makePredicate("abstract boolean byte char class double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile");
-
-  // ECMAScript 5 reserved words.
-
-  var isReservedWord5 = makePredicate("class enum extends super const export import");
-
-  // The additional reserved words in strict mode.
-
-  var isStrictReservedWord = makePredicate("implements interface let package private protected public static yield");
-
-  // The forbidden variable names in strict mode.
-
-  var isStrictBadIdWord = makePredicate("eval arguments");
-
-  // And the keywords.
-
-  var isKeyword = makePredicate("break case catch continue debugger default do else finally for function if return switch throw try var while with null true false instanceof typeof void delete new in this");
-
-  // ## Character categories
-
-  // Big ugly regular expressions that match characters in the
-  // whitespace, identifier, and identifier-start categories. These
-  // are only applied when a character is found to actually have a
-  // code point above 128.
-
-  var nonASCIIwhitespace = /[\u1680\u180e\u2000-\u200a\u202f\u205f\u3000\ufeff]/;
-  var nonASCIIidentifierStartChars = "\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u08a0\u08a2-\u08ac\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32\u0e33\u0e40-\u0e46\u0e81\u0e82\u0e84\u0e87\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa\u0eab\u0ead-\u0eb0\u0eb2\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0edc-\u0edf\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u1000-\u102a\u103f\u1050-\u1055\u105a-\u105d\u1061\u1065\u1066\u106e-\u1070\u1075-\u1081\u108e\u10a0-\u10c5\u10c7\u10cd\u10d0-\u10fa\u10fc-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1950-\u196d\u1970-\u1974\u1980-\u19ab\u19c1-\u19c7\u1a00-\u1a16\u1a20-\u1a54\u1aa7\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bba-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1cf5\u1cf6\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2cf2\u2cf3\u2d00-\u2d25\u2d27\u2d2d\u2d30-\u2d67\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fcc\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790-\ua793\ua7a0-\ua7aa\ua7f8-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa60-\uaa76\uaa7a\uaa80-\uaaaf\uaab1\uaab5\uaab6\uaab9-\uaabd\uaac0\uaac2\uaadb-\uaadd\uaae0-\uaaea\uaaf2-\uaaf4\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc";
-  var nonASCIIidentifierChars = "\u0300-\u036f\u0483-\u0487\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u0620-\u0649\u0672-\u06d3\u06e7-\u06e8\u06fb-\u06fc\u0730-\u074a\u0800-\u0814\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0840-\u0857\u08e4-\u08fe\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962-\u0963\u0966-\u096f\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09d7\u09df-\u09e0\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a66-\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2-\u0ae3\u0ae6-\u0aef\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b5f-\u0b60\u0b66-\u0b6f\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0be6-\u0bef\u0c01-\u0c03\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62-\u0c63\u0c66-\u0c6f\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2-\u0ce3\u0ce6-\u0cef\u0d02\u0d03\u0d46-\u0d48\u0d57\u0d62-\u0d63\u0d66-\u0d6f\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e34-\u0e3a\u0e40-\u0e45\u0e50-\u0e59\u0eb4-\u0eb9\u0ec8-\u0ecd\u0ed0-\u0ed9\u0f18\u0f19\u0f20-\u0f29\u0f35\u0f37\u0f39\u0f41-\u0f47\u0f71-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u1000-\u1029\u1040-\u1049\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f-\u109d\u135d-\u135f\u170e-\u1710\u1720-\u1730\u1740-\u1750\u1772\u1773\u1780-\u17b2\u17dd\u17e0-\u17e9\u180b-\u180d\u1810-\u1819\u1920-\u192b\u1930-\u193b\u1951-\u196d\u19b0-\u19c0\u19c8-\u19c9\u19d0-\u19d9\u1a00-\u1a15\u1a20-\u1a53\u1a60-\u1a7c\u1a7f-\u1a89\u1a90-\u1a99\u1b46-\u1b4b\u1b50-\u1b59\u1b6b-\u1b73\u1bb0-\u1bb9\u1be6-\u1bf3\u1c00-\u1c22\u1c40-\u1c49\u1c5b-\u1c7d\u1cd0-\u1cd2\u1d00-\u1dbe\u1e01-\u1f15\u200c\u200d\u203f\u2040\u2054\u20d0-\u20dc\u20e1\u20e5-\u20f0\u2d81-\u2d96\u2de0-\u2dff\u3021-\u3028\u3099\u309a\ua640-\ua66d\ua674-\ua67d\ua69f\ua6f0-\ua6f1\ua7f8-\ua800\ua806\ua80b\ua823-\ua827\ua880-\ua881\ua8b4-\ua8c4\ua8d0-\ua8d9\ua8f3-\ua8f7\ua900-\ua909\ua926-\ua92d\ua930-\ua945\ua980-\ua983\ua9b3-\ua9c0\uaa00-\uaa27\uaa40-\uaa41\uaa4c-\uaa4d\uaa50-\uaa59\uaa7b\uaae0-\uaae9\uaaf2-\uaaf3\uabc0-\uabe1\uabec\uabed\uabf0-\uabf9\ufb20-\ufb28\ufe00-\ufe0f\ufe20-\ufe26\ufe33\ufe34\ufe4d-\ufe4f\uff10-\uff19\uff3f";
-  var nonASCIIidentifierStart = new RegExp("[" + nonASCIIidentifierStartChars + "]");
-  var nonASCIIidentifier = new RegExp("[" + nonASCIIidentifierStartChars + nonASCIIidentifierChars + "]");
-
-  // Whether a single character denotes a newline.
-
-  var newline = /[\n\r\u2028\u2029]/;
-
-  // Matches a whole line break (where CRLF is considered a single
-  // line break). Used to count lines.
-
-  var lineBreak = /\r\n|[\n\r\u2028\u2029]/g;
-
-  // Test whether a given character code starts an identifier.
-
-  var isIdentifierStart = exports.isIdentifierStart = function(code) {
-    if (code < 65) return code === 36;
-    if (code < 91) return true;
-    if (code < 97) return code === 95;
-    if (code < 123)return true;
-    return code >= 0xaa && nonASCIIidentifierStart.test(String.fromCharCode(code));
-  };
-
-  // Test whether a given character is part of an identifier.
-
-  var isIdentifierChar = exports.isIdentifierChar = function(code) {
-    if (code < 48) return code === 36;
-    if (code < 58) return true;
-    if (code < 65) return false;
-    if (code < 91) return true;
-    if (code < 97) return code === 95;
-    if (code < 123)return true;
-    return code >= 0xaa && nonASCIIidentifier.test(String.fromCharCode(code));
-  };
-
-  // ## Tokenizer
-
-  // These are used when `options.locations` is on, for the
-  // `tokStartLoc` and `tokEndLoc` properties.
-
-  function line_loc_t() {
-    this.line = tokCurLine;
-    this.column = tokPos - tokLineStart;
-  }
-
-  // Reset the token state. Used at the start of a parse.
-
-  function initTokenState() {
-    tokCurLine = 1;
-    tokPos = tokLineStart = 0;
-    tokRegexpAllowed = true;
-    skipSpace();
-  }
-
-  // Called at the end of every token. Sets `tokEnd`, `tokVal`, and
-  // `tokRegexpAllowed`, and skips the space after the token, so that
-  // the next one's `tokStart` will point at the right position.
-
-  function finishToken(type, val) {
-    tokEnd = tokPos;
-    if (options.locations) tokEndLoc = new line_loc_t;
-    tokType = type;
-    skipSpace();
-    tokVal = val;
-    tokRegexpAllowed = type.beforeExpr;
-  }
-
-  function skipBlockComment() {
-    var startLoc = options.onComment && options.locations && new line_loc_t;
-    var start = tokPos, end = input.indexOf("*/", tokPos += 2);
-    if (end === -1) raise(tokPos - 2, "Unterminated comment");
-    tokPos = end + 2;
-    if (options.locations) {
-      lineBreak.lastIndex = start;
-      var match;
-      while ((match = lineBreak.exec(input)) && match.index < tokPos) {
-        ++tokCurLine;
-        tokLineStart = match.index + match[0].length;
-      }
-    }
-    if (options.onComment)
-      options.onComment(true, input.slice(start + 2, end), start, tokPos,
-                        startLoc, options.locations && new line_loc_t);
-  }
-
-  function skipLineComment() {
-    var start = tokPos;
-    var startLoc = options.onComment && options.locations && new line_loc_t;
-    var ch = input.charCodeAt(tokPos+=2);
-    while (tokPos < inputLen && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
-      ++tokPos;
-      ch = input.charCodeAt(tokPos);
-    }
-    if (options.onComment)
-      options.onComment(false, input.slice(start + 2, tokPos), start, tokPos,
-                        startLoc, options.locations && new line_loc_t);
-  }
-
-  // Called at the start of the parse and after every token. Skips
-  // whitespace and comments, and.
-
-  function skipSpace() {
-    while (tokPos < inputLen) {
-      var ch = input.charCodeAt(tokPos);
-      if (ch === 32) { // ' '
-        ++tokPos;
-      } else if (ch === 13) {
-        ++tokPos;
-        var next = input.charCodeAt(tokPos);
-        if (next === 10) {
-          ++tokPos;
-        }
-        if (options.locations) {
-          ++tokCurLine;
-          tokLineStart = tokPos;
-        }
-      } else if (ch === 10 || ch === 8232 || ch === 8233) {
-        ++tokPos;
-        if (options.locations) {
-          ++tokCurLine;
-          tokLineStart = tokPos;
-        }
-      } else if (ch > 8 && ch < 14) {
-        ++tokPos;
-      } else if (ch === 47) { // '/'
-        var next = input.charCodeAt(tokPos + 1);
-        if (next === 42) { // '*'
-          skipBlockComment();
-        } else if (next === 47) { // '/'
-          skipLineComment();
-        } else break;
-      } else if (ch === 160) { // '\xa0'
-        ++tokPos;
-      } else if (ch >= 5760 && nonASCIIwhitespace.test(String.fromCharCode(ch))) {
-        ++tokPos;
-      } else {
-        break;
-      }
-    }
-  }
-
-  // ### Token reading
-
-  // This is the function that is called to fetch the next token. It
-  // is somewhat obscure, because it works in character codes rather
-  // than characters, and because operator parsing has been inlined
-  // into it.
-  //
-  // All in the name of speed.
-  //
-  // The `forceRegexp` parameter is used in the one case where the
-  // `tokRegexpAllowed` trick does not work. See `parseStatement`.
-
-  function readToken_dot() {
-    var next = input.charCodeAt(tokPos + 1);
-    if (next >= 48 && next <= 57) return readNumber(true);
-    ++tokPos;
-    return finishToken(_dot);
-  }
-
-  function readToken_slash() { // '/'
-    var next = input.charCodeAt(tokPos + 1);
-    if (tokRegexpAllowed) {++tokPos; return readRegexp();}
-    if (next === 61) return finishOp(_assign, 2);
-    return finishOp(_slash, 1);
-  }
-
-  function readToken_mult_modulo() { // '%*'
-    var next = input.charCodeAt(tokPos + 1);
-    if (next === 61) return finishOp(_assign, 2);
-    return finishOp(_multiplyModulo, 1);
-  }
-
-  function readToken_pipe_amp(code) { // '|&'
-    var next = input.charCodeAt(tokPos + 1);
-    if (next === code) return finishOp(code === 124 ? _logicalOR : _logicalAND, 2);
-    if (next === 61) return finishOp(_assign, 2);
-    return finishOp(code === 124 ? _bitwiseOR : _bitwiseAND, 1);
-  }
-
-  function readToken_caret() { // '^'
-    var next = input.charCodeAt(tokPos + 1);
-    if (next === 61) return finishOp(_assign, 2);
-    return finishOp(_bitwiseXOR, 1);
-  }
-
-  function readToken_plus_min(code) { // '+-'
-    var next = input.charCodeAt(tokPos + 1);
-    if (next === code) {
-      if (next == 45 && input.charCodeAt(tokPos + 2) == 62 &&
-          newline.test(input.slice(lastEnd, tokPos))) {
-        // A `-->` line comment
-        tokPos += 3;
-        skipLineComment();
-        skipSpace();
-        return readToken();
-      }
-      return finishOp(_incDec, 2);
-    }
-    if (next === 61) return finishOp(_assign, 2);
-    return finishOp(_plusMin, 1);
-  }
-
-  function readToken_lt_gt(code) { // '<>'
-    var next = input.charCodeAt(tokPos + 1);
-    var size = 1;
-    if (next === code) {
-      size = code === 62 && input.charCodeAt(tokPos + 2) === 62 ? 3 : 2;
-      if (input.charCodeAt(tokPos + size) === 61) return finishOp(_assign, size + 1);
-      return finishOp(_bitShift, size);
-    }
-    if (next == 33 && code == 60 && input.charCodeAt(tokPos + 2) == 45 &&
-        input.charCodeAt(tokPos + 3) == 45) {
-      // `<!--`, an XML-style comment that should be interpreted as a line comment
-      tokPos += 4;
-      skipLineComment();
-      skipSpace();
-      return readToken();
-    }
-    if (next === 61)
-      size = input.charCodeAt(tokPos + 2) === 61 ? 3 : 2;
-    return finishOp(_relational, size);
-  }
-
-  function readToken_eq_excl(code) { // '=!'
-    var next = input.charCodeAt(tokPos + 1);
-    if (next === 61) return finishOp(_equality, input.charCodeAt(tokPos + 2) === 61 ? 3 : 2);
-    return finishOp(code === 61 ? _eq : _prefix, 1);
-  }
-
-  function getTokenFromCode(code) {
-    switch(code) {
-      // The interpretation of a dot depends on whether it is followed
-      // by a digit.
-    case 46: // '.'
-      return readToken_dot();
-
-      // Punctuation tokens.
-    case 40: ++tokPos; return finishToken(_parenL);
-    case 41: ++tokPos; return finishToken(_parenR);
-    case 59: ++tokPos; return finishToken(_semi);
-    case 44: ++tokPos; return finishToken(_comma);
-    case 91: ++tokPos; return finishToken(_bracketL);
-    case 93: ++tokPos; return finishToken(_bracketR);
-    case 123: ++tokPos; return finishToken(_braceL);
-    case 125: ++tokPos; return finishToken(_braceR);
-    case 58: ++tokPos; return finishToken(_colon);
-    case 63: ++tokPos; return finishToken(_question);
-
-      // '0x' is a hexadecimal number.
-    case 48: // '0'
-      var next = input.charCodeAt(tokPos + 1);
-      if (next === 120 || next === 88) return readHexNumber();
-      // Anything else beginning with a digit is an integer, octal
-      // number, or float.
-    case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: // 1-9
-      return readNumber(false);
-
-      // Quotes produce strings.
-    case 34: case 39: // '"', "'"
-      return readString(code);
-
-    // Operators are parsed inline in tiny state machines. '=' (61) is
-    // often referred to. `finishOp` simply skips the amount of
-    // characters it is given as second argument, and returns a token
-    // of the type given by its first argument.
-
-    case 47: // '/'
-      return readToken_slash(code);
-
-    case 37: case 42: // '%*'
-      return readToken_mult_modulo();
-
-    case 124: case 38: // '|&'
-      return readToken_pipe_amp(code);
-
-    case 94: // '^'
-      return readToken_caret();
-
-    case 43: case 45: // '+-'
-      return readToken_plus_min(code);
-
-    case 60: case 62: // '<>'
-      return readToken_lt_gt(code);
-
-    case 61: case 33: // '=!'
-      return readToken_eq_excl(code);
-
-    case 126: // '~'
-      return finishOp(_prefix, 1);
-    }
-
-    return false;
-  }
-
-  function readToken(forceRegexp) {
-    if (!forceRegexp) tokStart = tokPos;
-    else tokPos = tokStart + 1;
-    if (options.locations) tokStartLoc = new line_loc_t;
-    if (forceRegexp) return readRegexp();
-    if (tokPos >= inputLen) return finishToken(_eof);
-
-    var code = input.charCodeAt(tokPos);
-    // Identifier or keyword. '\uXXXX' sequences are allowed in
-    // identifiers, so '\' also dispatches to that.
-    if (isIdentifierStart(code) || code === 92 /* '\' */) return readWord();
-
-    var tok = getTokenFromCode(code);
-
-    if (tok === false) {
-      // If we are here, we either found a non-ASCII identifier
-      // character, or something that's entirely disallowed.
-      var ch = String.fromCharCode(code);
-      if (ch === "\\" || nonASCIIidentifierStart.test(ch)) return readWord();
-      raise(tokPos, "Unexpected character '" + ch + "'");
-    }
-    return tok;
-  }
-
-  function finishOp(type, size) {
-    var str = input.slice(tokPos, tokPos + size);
-    tokPos += size;
-    finishToken(type, str);
-  }
-
-  // Parse a regular expression. Some context-awareness is necessary,
-  // since a '/' inside a '[]' set does not end the expression.
-
-  function readRegexp() {
-    var content = "", escaped, inClass, start = tokPos;
-    for (;;) {
-      if (tokPos >= inputLen) raise(start, "Unterminated regular expression");
-      var ch = input.charAt(tokPos);
-      if (newline.test(ch)) raise(start, "Unterminated regular expression");
-      if (!escaped) {
-        if (ch === "[") inClass = true;
-        else if (ch === "]" && inClass) inClass = false;
-        else if (ch === "/" && !inClass) break;
-        escaped = ch === "\\";
-      } else escaped = false;
-      ++tokPos;
-    }
-    var content = input.slice(start, tokPos);
-    ++tokPos;
-    // Need to use `readWord1` because '\uXXXX' sequences are allowed
-    // here (don't ask).
-    var mods = readWord1();
-    if (mods && !/^[gmsiy]*$/.test(mods)) raise(start, "Invalid regexp flag");
-    try {
-      var value = new RegExp(content, mods);
-    } catch (e) {
-      if (e instanceof SyntaxError) raise(start, e.message);
-      raise(e);
-    }
-    return finishToken(_regexp, value);
-  }
-
-  // Read an integer in the given radix. Return null if zero digits
-  // were read, the integer value otherwise. When `len` is given, this
-  // will return `null` unless the integer has exactly `len` digits.
-
-  function readInt(radix, len) {
-    var start = tokPos, total = 0;
-    for (var i = 0, e = len == null ? Infinity : len; i < e; ++i) {
-      var code = input.charCodeAt(tokPos), val;
-      if (code >= 97) val = code - 97 + 10; // a
-      else if (code >= 65) val = code - 65 + 10; // A
-      else if (code >= 48 && code <= 57) val = code - 48; // 0-9
-      else val = Infinity;
-      if (val >= radix) break;
-      ++tokPos;
-      total = total * radix + val;
-    }
-    if (tokPos === start || len != null && tokPos - start !== len) return null;
-
-    return total;
-  }
-
-  function readHexNumber() {
-    tokPos += 2; // 0x
-    var val = readInt(16);
-    if (val == null) raise(tokStart + 2, "Expected hexadecimal number");
-    if (isIdentifierStart(input.charCodeAt(tokPos))) raise(tokPos, "Identifier directly after number");
-    return finishToken(_num, val);
-  }
-
-  // Read an integer, octal integer, or floating-point number.
-
-  function readNumber(startsWithDot) {
-    var start = tokPos, isFloat = false, octal = input.charCodeAt(tokPos) === 48;
-    if (!startsWithDot && readInt(10) === null) raise(start, "Invalid number");
-    if (input.charCodeAt(tokPos) === 46) {
-      ++tokPos;
-      readInt(10);
-      isFloat = true;
-    }
-    var next = input.charCodeAt(tokPos);
-    if (next === 69 || next === 101) { // 'eE'
-      next = input.charCodeAt(++tokPos);
-      if (next === 43 || next === 45) ++tokPos; // '+-'
-      if (readInt(10) === null) raise(start, "Invalid number");
-      isFloat = true;
-    }
-    if (isIdentifierStart(input.charCodeAt(tokPos))) raise(tokPos, "Identifier directly after number");
-
-    var str = input.slice(start, tokPos), val;
-    if (isFloat) val = parseFloat(str);
-    else if (!octal || str.length === 1) val = parseInt(str, 10);
-    else if (/[89]/.test(str) || strict) raise(start, "Invalid number");
-    else val = parseInt(str, 8);
-    return finishToken(_num, val);
-  }
-
-  // Read a string value, interpreting backslash-escapes.
-
-  function readString(quote) {
-    tokPos++;
-    var out = "";
-    for (;;) {
-      if (tokPos >= inputLen) raise(tokStart, "Unterminated string constant");
-      var ch = input.charCodeAt(tokPos);
-      if (ch === quote) {
-        ++tokPos;
-        return finishToken(_string, out);
-      }
-      if (ch === 92) { // '\'
-        ch = input.charCodeAt(++tokPos);
-        var octal = /^[0-7]+/.exec(input.slice(tokPos, tokPos + 3));
-        if (octal) octal = octal[0];
-        while (octal && parseInt(octal, 8) > 255) octal = octal.slice(0, -1);
-        if (octal === "0") octal = null;
-        ++tokPos;
-        if (octal) {
-          if (strict) raise(tokPos - 2, "Octal literal in strict mode");
-          out += String.fromCharCode(parseInt(octal, 8));
-          tokPos += octal.length - 1;
-        } else {
-          switch (ch) {
-          case 110: out += "\n"; break; // 'n' -> '\n'
-          case 114: out += "\r"; break; // 'r' -> '\r'
-          case 120: out += String.fromCharCode(readHexChar(2)); break; // 'x'
-          case 117: out += String.fromCharCode(readHexChar(4)); break; // 'u'
-          case 85: out += String.fromCharCode(readHexChar(8)); break; // 'U'
-          case 116: out += "\t"; break; // 't' -> '\t'
-          case 98: out += "\b"; break; // 'b' -> '\b'
-          case 118: out += "\u000b"; break; // 'v' -> '\u000b'
-          case 102: out += "\f"; break; // 'f' -> '\f'
-          case 48: out += "\0"; break; // 0 -> '\0'
-          case 13: if (input.charCodeAt(tokPos) === 10) ++tokPos; // '\r\n'
-          case 10: // ' \n'
-            if (options.locations) { tokLineStart = tokPos; ++tokCurLine; }
-            break;
-          default: out += String.fromCharCode(ch); break;
-          }
-        }
-      } else {
-        if (ch === 13 || ch === 10 || ch === 8232 || ch === 8233) raise(tokStart, "Unterminated string constant");
-        out += String.fromCharCode(ch); // '\'
-        ++tokPos;
-      }
-    }
-  }
-
-  // Used to read character escape sequences ('\x', '\u', '\U').
-
-  function readHexChar(len) {
-    var n = readInt(16, len);
-    if (n === null) raise(tokStart, "Bad character escape sequence");
-    return n;
-  }
-
-  // Used to signal to callers of `readWord1` whether the word
-  // contained any escape sequences. This is needed because words with
-  // escape sequences must not be interpreted as keywords.
-
-  var containsEsc;
-
-  // Read an identifier, and return it as a string. Sets `containsEsc`
-  // to whether the word contained a '\u' escape.
-  //
-  // Only builds up the word character-by-character when it actually
-  // containeds an escape, as a micro-optimization.
-
-  function readWord1() {
-    containsEsc = false;
-    var word, first = true, start = tokPos;
-    for (;;) {
-      var ch = input.charCodeAt(tokPos);
-      if (isIdentifierChar(ch)) {
-        if (containsEsc) word += input.charAt(tokPos);
-        ++tokPos;
-      } else if (ch === 92) { // "\"
-        if (!containsEsc) word = input.slice(start, tokPos);
-        containsEsc = true;
-        if (input.charCodeAt(++tokPos) != 117) // "u"
-          raise(tokPos, "Expecting Unicode escape sequence \\uXXXX");
-        ++tokPos;
-        var esc = readHexChar(4);
-        var escStr = String.fromCharCode(esc);
-        if (!escStr) raise(tokPos - 1, "Invalid Unicode escape");
-        if (!(first ? isIdentifierStart(esc) : isIdentifierChar(esc)))
-          raise(tokPos - 4, "Invalid Unicode escape");
-        word += escStr;
-      } else {
-        break;
-      }
-      first = false;
-    }
-    return containsEsc ? word : input.slice(start, tokPos);
-  }
-
-  // Read an identifier or keyword token. Will check for reserved
-  // words when necessary.
-
-  function readWord() {
-    var word = readWord1();
-    var type = _name;
-    if (!containsEsc && isKeyword(word))
-      type = keywordTypes[word];
-    return finishToken(type, word);
-  }
-
-  // ## Parser
-
-  // A recursive descent parser operates by defining functions for all
-  // syntactic elements, and recursively calling those, each function
-  // advancing the input stream and returning an AST node. Precedence
-  // of constructs (for example, the fact that `!x[1]` means `!(x[1])`
-  // instead of `(!x)[1]` is handled by the fact that the parser
-  // function that parses unary prefix operators is called first, and
-  // in turn calls the function that parses `[]` subscripts — that
-  // way, it'll receive the node for `x[1]` already parsed, and wraps
-  // *that* in the unary operator node.
-  //
-  // Acorn uses an [operator precedence parser][opp] to handle binary
-  // operator precedence, because it is much more compact than using
-  // the technique outlined above, which uses different, nesting
-  // functions to specify precedence, for all of the ten binary
-  // precedence levels that JavaScript defines.
-  //
-  // [opp]: http://en.wikipedia.org/wiki/Operator-precedence_parser
-
-  // ### Parser utilities
-
-  // Continue to the next token.
-
-  function next() {
-    lastStart = tokStart;
-    lastEnd = tokEnd;
-    lastEndLoc = tokEndLoc;
-    readToken();
-  }
-
-  // Enter strict mode. Re-reads the next token to please pedantic
-  // tests ("use strict"; 010; -- should fail).
-
-  function setStrict(strct) {
-    strict = strct;
-    tokPos = tokStart;
-    if (options.locations) {
-      while (tokPos < tokLineStart) {
-        tokLineStart = input.lastIndexOf("\n", tokLineStart - 2) + 1;
-        --tokCurLine;
-      }
-    }
-    skipSpace();
-    readToken();
-  }
-
-  // Start an AST node, attaching a start offset.
-
-  function node_t() {
-    this.type = null;
-    this.start = tokStart;
-    this.end = null;
-  }
-
-  function node_loc_t() {
-    this.start = tokStartLoc;
-    this.end = null;
-    if (sourceFile !== null) this.source = sourceFile;
-  }
-
-  function startNode() {
-    var node = new node_t();
-    if (options.locations)
-      node.loc = new node_loc_t();
-    if (options.directSourceFile)
-      node.sourceFile = options.directSourceFile;
-    if (options.ranges)
-      node.range = [tokStart, 0];
-    return node;
-  }
-
-  // Start a node whose start offset information should be based on
-  // the start of another node. For example, a binary operator node is
-  // only started after its left-hand side has already been parsed.
-
-  function startNodeFrom(other) {
-    var node = new node_t();
-    node.start = other.start;
-    if (options.locations) {
-      node.loc = new node_loc_t();
-      node.loc.start = other.loc.start;
-    }
-    if (options.ranges)
-      node.range = [other.range[0], 0];
-
-    return node;
-  }
-
-  // Finish an AST node, adding `type` and `end` properties.
-
-  function finishNode(node, type) {
-    node.type = type;
-    node.end = lastEnd;
-    if (options.locations)
-      node.loc.end = lastEndLoc;
-    if (options.ranges)
-      node.range[1] = lastEnd;
-    return node;
-  }
-
-  // Test whether a statement node is the string literal `"use strict"`.
-
-  function isUseStrict(stmt) {
-    return options.ecmaVersion >= 5 && stmt.type === "ExpressionStatement" &&
-      stmt.expression.type === "Literal" && stmt.expression.value === "use strict";
-  }
-
-  // Predicate that tests whether the next token is of the given
-  // type, and if yes, consumes it as a side effect.
-
-  function eat(type) {
-    if (tokType === type) {
-      next();
-      return true;
-    }
-  }
-
-  // Test whether a semicolon can be inserted at the current position.
-
-  function canInsertSemicolon() {
-    return !options.strictSemicolons &&
-      (tokType === _eof || tokType === _braceR || newline.test(input.slice(lastEnd, tokStart)));
-  }
-
-  // Consume a semicolon, or, failing that, see if we are allowed to
-  // pretend that there is a semicolon at this position.
-
-  function semicolon() {
-    if (!eat(_semi) && !canInsertSemicolon()) unexpected();
-  }
-
-  // Expect a token of a given type. If found, consume it, otherwise,
-  // raise an unexpected token error.
-
-  function expect(type) {
-    if (tokType === type) next();
-    else unexpected();
-  }
-
-  // Raise an unexpected token error.
-
-  function unexpected() {
-    raise(tokStart, "Unexpected token");
-  }
-
-  // Verify that a node is an lval — something that can be assigned
-  // to.
-
-  function checkLVal(expr) {
-    if (expr.type !== "Identifier" && expr.type !== "MemberExpression")
-      raise(expr.start, "Assigning to rvalue");
-    if (strict && expr.type === "Identifier" && isStrictBadIdWord(expr.name))
-      raise(expr.start, "Assigning to " + expr.name + " in strict mode");
-  }
-
-  // ### Statement parsing
-
-  // Parse a program. Initializes the parser, reads any number of
-  // statements, and wraps them in a Program node.  Optionally takes a
-  // `program` argument.  If present, the statements will be appended
-  // to its body instead of creating a new node.
-
-  function parseTopLevel(program) {
-    lastStart = lastEnd = tokPos;
-    if (options.locations) lastEndLoc = new line_loc_t;
-    inFunction = strict = null;
-    labels = [];
-    readToken();
-
-    var node = program || startNode(), first = true;
-    if (!program) node.body = [];
-    while (tokType !== _eof) {
-      var stmt = parseStatement();
-      node.body.push(stmt);
-      if (first && isUseStrict(stmt)) setStrict(true);
-      first = false;
-    }
-    return finishNode(node, "Program");
-  }
-
-  var loopLabel = {kind: "loop"}, switchLabel = {kind: "switch"};
-
-  // Parse a single statement.
-  //
-  // If expecting a statement and finding a slash operator, parse a
-  // regular expression literal. This is to handle cases like
-  // `if (foo) /blah/.exec(foo);`, where looking at the previous token
-  // does not help.
-
-  function parseStatement() {
-    if (tokType === _slash || tokType === _assign && tokVal == "/=")
-      readToken(true);
-
-    var starttype = tokType, node = startNode();
-
-    // Most types of statements are recognized by the keyword they
-    // start with. Many are trivial to parse, some require a bit of
-    // complexity.
-
-    switch (starttype) {
-    case _break: case _continue:
-      next();
-      var isBreak = starttype === _break;
-      if (eat(_semi) || canInsertSemicolon()) node.label = null;
-      else if (tokType !== _name) unexpected();
-      else {
-        node.label = parseIdent();
-        semicolon();
-      }
-
-      // Verify that there is an actual destination to break or
-      // continue to.
-      for (var i = 0; i < labels.length; ++i) {
-        var lab = labels[i];
-        if (node.label == null || lab.name === node.label.name) {
-          if (lab.kind != null && (isBreak || lab.kind === "loop")) break;
-          if (node.label && isBreak) break;
-        }
-      }
-      if (i === labels.length) raise(node.start, "Unsyntactic " + starttype.keyword);
-      return finishNode(node, isBreak ? "BreakStatement" : "ContinueStatement");
-
-    case _debugger:
-      next();
-      semicolon();
-      return finishNode(node, "DebuggerStatement");
-
-    case _do:
-      next();
-      labels.push(loopLabel);
-      node.body = parseStatement();
-      labels.pop();
-      expect(_while);
-      node.test = parseParenExpression();
-      semicolon();
-      return finishNode(node, "DoWhileStatement");
-
-      // Disambiguating between a `for` and a `for`/`in` loop is
-      // non-trivial. Basically, we have to parse the init `var`
-      // statement or expression, disallowing the `in` operator (see
-      // the second parameter to `parseExpression`), and then check
-      // whether the next token is `in`. When there is no init part
-      // (semicolon immediately after the opening parenthesis), it is
-      // a regular `for` loop.
-
-    case _for:
-      next();
-      labels.push(loopLabel);
-      expect(_parenL);
-      if (tokType === _semi) return parseFor(node, null);
-      if (tokType === _var) {
-        var init = startNode();
-        next();
-        parseVar(init, true);
-        finishNode(init, "VariableDeclaration");
-        if (init.declarations.length === 1 && eat(_in))
-          return parseForIn(node, init);
-        return parseFor(node, init);
-      }
-      var init = parseExpression(false, true);
-      if (eat(_in)) {checkLVal(init); return parseForIn(node, init);}
-      return parseFor(node, init);
-
-    case _function:
-      next();
-      return parseFunction(node, true);
-
-    case _if:
-      next();
-      node.test = parseParenExpression();
-      node.consequent = parseStatement();
-      node.alternate = eat(_else) ? parseStatement() : null;
-      return finishNode(node, "IfStatement");
-
-    case _return:
-      if (!inFunction && !options.allowReturnOutsideFunction)
-        raise(tokStart, "'return' outside of function");
-      next();
-
-      // In `return` (and `break`/`continue`), the keywords with
-      // optional arguments, we eagerly look for a semicolon or the
-      // possibility to insert one.
-
-      if (eat(_semi) || canInsertSemicolon()) node.argument = null;
-      else { node.argument = parseExpression(); semicolon(); }
-      return finishNode(node, "ReturnStatement");
-
-    case _switch:
-      next();
-      node.discriminant = parseParenExpression();
-      node.cases = [];
-      expect(_braceL);
-      labels.push(switchLabel);
-
-      // Statements under must be grouped (by label) in SwitchCase
-      // nodes. `cur` is used to keep the node that we are currently
-      // adding statements to.
-
-      for (var cur, sawDefault; tokType != _braceR;) {
-        if (tokType === _case || tokType === _default) {
-          var isCase = tokType === _case;
-          if (cur) finishNode(cur, "SwitchCase");
-          node.cases.push(cur = startNode());
-          cur.consequent = [];
-          next();
-          if (isCase) cur.test = parseExpression();
-          else {
-            if (sawDefault) raise(lastStart, "Multiple default clauses"); sawDefault = true;
-            cur.test = null;
-          }
-          expect(_colon);
-        } else {
-          if (!cur) unexpected();
-          cur.consequent.push(parseStatement());
-        }
-      }
-      if (cur) finishNode(cur, "SwitchCase");
-      next(); // Closing brace
-      labels.pop();
-      return finishNode(node, "SwitchStatement");
-
-    case _throw:
-      next();
-      if (newline.test(input.slice(lastEnd, tokStart)))
-        raise(lastEnd, "Illegal newline after throw");
-      node.argument = parseExpression();
-      semicolon();
-      return finishNode(node, "ThrowStatement");
-
-    case _try:
-      next();
-      node.block = parseBlock();
-      node.handler = null;
-      if (tokType === _catch) {
-        var clause = startNode();
-        next();
-        expect(_parenL);
-        clause.param = parseIdent();
-        if (strict && isStrictBadIdWord(clause.param.name))
-          raise(clause.param.start, "Binding " + clause.param.name + " in strict mode");
-        expect(_parenR);
-        clause.guard = null;
-        clause.body = parseBlock();
-        node.handler = finishNode(clause, "CatchClause");
-      }
-      node.guardedHandlers = empty;
-      node.finalizer = eat(_finally) ? parseBlock() : null;
-      if (!node.handler && !node.finalizer)
-        raise(node.start, "Missing catch or finally clause");
-      return finishNode(node, "TryStatement");
-
-    case _var:
-      next();
-      parseVar(node);
-      semicolon();
-      return finishNode(node, "VariableDeclaration");
-
-    case _while:
-      next();
-      node.test = parseParenExpression();
-      labels.push(loopLabel);
-      node.body = parseStatement();
-      labels.pop();
-      return finishNode(node, "WhileStatement");
-
-    case _with:
-      if (strict) raise(tokStart, "'with' in strict mode");
-      next();
-      node.object = parseParenExpression();
-      node.body = parseStatement();
-      return finishNode(node, "WithStatement");
-
-    case _braceL:
-      return parseBlock();
-
-    case _semi:
-      next();
-      return finishNode(node, "EmptyStatement");
-
-      // If the statement does not start with a statement keyword or a
-      // brace, it's an ExpressionStatement or LabeledStatement. We
-      // simply start parsing an expression, and afterwards, if the
-      // next token is a colon and the expression was a simple
-      // Identifier node, we switch to interpreting it as a label.
-
-    default:
-      var maybeName = tokVal, expr = parseExpression();
-      if (starttype === _name && expr.type === "Identifier" && eat(_colon)) {
-        for (var i = 0; i < labels.length; ++i)
-          if (labels[i].name === maybeName) raise(expr.start, "Label '" + maybeName + "' is already declared");
-        var kind = tokType.isLoop ? "loop" : tokType === _switch ? "switch" : null;
-        labels.push({name: maybeName, kind: kind});
-        node.body = parseStatement();
-        labels.pop();
-        node.label = expr;
-        return finishNode(node, "LabeledStatement");
-      } else {
-        node.expression = expr;
-        semicolon();
-        return finishNode(node, "ExpressionStatement");
-      }
-    }
-  }
-
-  // Used for constructs like `switch` and `if` that insist on
-  // parentheses around their expression.
-
-  function parseParenExpression() {
-    expect(_parenL);
-    var val = parseExpression();
-    expect(_parenR);
-    return val;
-  }
-
-  // Parse a semicolon-enclosed block of statements, handling `"use
-  // strict"` declarations when `allowStrict` is true (used for
-  // function bodies).
-
-  function parseBlock(allowStrict) {
-    var node = startNode(), first = true, strict = false, oldStrict;
-    node.body = [];
-    expect(_braceL);
-    while (!eat(_braceR)) {
-      var stmt = parseStatement();
-      node.body.push(stmt);
-      if (first && allowStrict && isUseStrict(stmt)) {
-        oldStrict = strict;
-        setStrict(strict = true);
-      }
-      first = false;
-    }
-    if (strict && !oldStrict) setStrict(false);
-    return finishNode(node, "BlockStatement");
-  }
-
-  // Parse a regular `for` loop. The disambiguation code in
-  // `parseStatement` will already have parsed the init statement or
-  // expression.
-
-  function parseFor(node, init) {
-    node.init = init;
-    expect(_semi);
-    node.test = tokType === _semi ? null : parseExpression();
-    expect(_semi);
-    node.update = tokType === _parenR ? null : parseExpression();
-    expect(_parenR);
-    node.body = parseStatement();
-    labels.pop();
-    return finishNode(node, "ForStatement");
-  }
-
-  // Parse a `for`/`in` loop.
-
-  function parseForIn(node, init) {
-    node.left = init;
-    node.right = parseExpression();
-    expect(_parenR);
-    node.body = parseStatement();
-    labels.pop();
-    return finishNode(node, "ForInStatement");
-  }
-
-  // Parse a list of variable declarations.
-
-  function parseVar(node, noIn) {
-    node.declarations = [];
-    node.kind = "var";
-    for (;;) {
-      var decl = startNode();
-      decl.id = parseIdent();
-      if (strict && isStrictBadIdWord(decl.id.name))
-        raise(decl.id.start, "Binding " + decl.id.name + " in strict mode");
-      decl.init = eat(_eq) ? parseExpression(true, noIn) : null;
-      node.declarations.push(finishNode(decl, "VariableDeclarator"));
-      if (!eat(_comma)) break;
-    }
-    return node;
-  }
-
-  // ### Expression parsing
-
-  // These nest, from the most general expression type at the top to
-  // 'atomic', nondivisible expression types at the bottom. Most of
-  // the functions will simply let the function(s) below them parse,
-  // and, *if* the syntactic construct they handle is present, wrap
-  // the AST node that the inner parser gave them in another node.
-
-  // Parse a full expression. The arguments are used to forbid comma
-  // sequences (in argument lists, array literals, or object literals)
-  // or the `in` operator (in for loops initalization expressions).
-
-  function parseExpression(noComma, noIn) {
-    var expr = parseMaybeAssign(noIn);
-    if (!noComma && tokType === _comma) {
-      var node = startNodeFrom(expr);
-      node.expressions = [expr];
-      while (eat(_comma)) node.expressions.push(parseMaybeAssign(noIn));
-      return finishNode(node, "SequenceExpression");
-    }
-    return expr;
-  }
-
-  // Parse an assignment expression. This includes applications of
-  // operators like `+=`.
-
-  function parseMaybeAssign(noIn) {
-    var left = parseMaybeConditional(noIn);
-    if (tokType.isAssign) {
-      var node = startNodeFrom(left);
-      node.operator = tokVal;
-      node.left = left;
-      next();
-      node.right = parseMaybeAssign(noIn);
-      checkLVal(left);
-      return finishNode(node, "AssignmentExpression");
-    }
-    return left;
-  }
-
-  // Parse a ternary conditional (`?:`) operator.
-
-  function parseMaybeConditional(noIn) {
-    var expr = parseExprOps(noIn);
-    if (eat(_question)) {
-      var node = startNodeFrom(expr);
-      node.test = expr;
-      node.consequent = parseExpression(true);
-      expect(_colon);
-      node.alternate = parseExpression(true, noIn);
-      return finishNode(node, "ConditionalExpression");
-    }
-    return expr;
-  }
-
-  // Start the precedence parser.
-
-  function parseExprOps(noIn) {
-    return parseExprOp(parseMaybeUnary(), -1, noIn);
-  }
-
-  // Parse binary operators with the operator precedence parsing
-  // algorithm. `left` is the left-hand side of the operator.
-  // `minPrec` provides context that allows the function to stop and
-  // defer further parser to one of its callers when it encounters an
-  // operator that has a lower precedence than the set it is parsing.
-
-  function parseExprOp(left, minPrec, noIn) {
-    var prec = tokType.binop;
-    if (prec != null && (!noIn || tokType !== _in)) {
-      if (prec > minPrec) {
-        var node = startNodeFrom(left);
-        node.left = left;
-        node.operator = tokVal;
-        var op = tokType;
-        next();
-        node.right = parseExprOp(parseMaybeUnary(), prec, noIn);
-        var exprNode = finishNode(node, (op === _logicalOR || op === _logicalAND) ? "LogicalExpression" : "BinaryExpression");
-        return parseExprOp(exprNode, minPrec, noIn);
-      }
-    }
-    return left;
-  }
-
-  // Parse unary operators, both prefix and postfix.
-
-  function parseMaybeUnary() {
-    if (tokType.prefix) {
-      var node = startNode(), update = tokType.isUpdate;
-      node.operator = tokVal;
-      node.prefix = true;
-      tokRegexpAllowed = true;
-      next();
-      node.argument = parseMaybeUnary();
-      if (update) checkLVal(node.argument);
-      else if (strict && node.operator === "delete" &&
-               node.argument.type === "Identifier")
-        raise(node.start, "Deleting local variable in strict mode");
-      return finishNode(node, update ? "UpdateExpression" : "UnaryExpression");
-    }
-    var expr = parseExprSubscripts();
-    while (tokType.postfix && !canInsertSemicolon()) {
-      var node = startNodeFrom(expr);
-      node.operator = tokVal;
-      node.prefix = false;
-      node.argument = expr;
-      checkLVal(expr);
-      next();
-      expr = finishNode(node, "UpdateExpression");
-    }
-    return expr;
-  }
-
-  // Parse call, dot, and `[]`-subscript expressions.
-
-  function parseExprSubscripts() {
-    return parseSubscripts(parseExprAtom());
-  }
-
-  function parseSubscripts(base, noCalls) {
-    if (eat(_dot)) {
-      var node = startNodeFrom(base);
-      node.object = base;
-      node.property = parseIdent(true);
-      node.computed = false;
-      return parseSubscripts(finishNode(node, "MemberExpression"), noCalls);
-    } else if (eat(_bracketL)) {
-      var node = startNodeFrom(base);
-      node.object = base;
-      node.property = parseExpression();
-      node.computed = true;
-      expect(_bracketR);
-      return parseSubscripts(finishNode(node, "MemberExpression"), noCalls);
-    } else if (!noCalls && eat(_parenL)) {
-      var node = startNodeFrom(base);
-      node.callee = base;
-      node.arguments = parseExprList(_parenR, false);
-      return parseSubscripts(finishNode(node, "CallExpression"), noCalls);
-    } else return base;
-  }
-
-  // Parse an atomic expression — either a single token that is an
-  // expression, an expression started by a keyword like `function` or
-  // `new`, or an expression wrapped in punctuation like `()`, `[]`,
-  // or `{}`.
-
-  function parseExprAtom() {
-    switch (tokType) {
-    case _this:
-      var node = startNode();
-      next();
-      return finishNode(node, "ThisExpression");
-    case _name:
-      return parseIdent();
-    case _num: case _string: case _regexp:
-      var node = startNode();
-      node.value = tokVal;
-      node.raw = input.slice(tokStart, tokEnd);
-      next();
-      return finishNode(node, "Literal");
-
-    case _null: case _true: case _false:
-      var node = startNode();
-      node.value = tokType.atomValue;
-      node.raw = tokType.keyword;
-      next();
-      return finishNode(node, "Literal");
-
-    case _parenL:
-      var tokStartLoc1 = tokStartLoc, tokStart1 = tokStart;
-      next();
-      var val = parseExpression();
-      val.start = tokStart1;
-      val.end = tokEnd;
-      if (options.locations) {
-        val.loc.start = tokStartLoc1;
-        val.loc.end = tokEndLoc;
-      }
-      if (options.ranges)
-        val.range = [tokStart1, tokEnd];
-      expect(_parenR);
-      return val;
-
-    case _bracketL:
-      var node = startNode();
-      next();
-      node.elements = parseExprList(_bracketR, true, true);
-      return finishNode(node, "ArrayExpression");
-
-    case _braceL:
-      return parseObj();
-
-    case _function:
-      var node = startNode();
-      next();
-      return parseFunction(node, false);
-
-    case _new:
-      return parseNew();
-
-    default:
-      unexpected();
-    }
-  }
-
-  // New's precedence is slightly tricky. It must allow its argument
-  // to be a `[]` or dot subscript expression, but not a call — at
-  // least, not without wrapping it in parentheses. Thus, it uses the
-
-  function parseNew() {
-    var node = startNode();
-    next();
-    node.callee = parseSubscripts(parseExprAtom(), true);
-    if (eat(_parenL)) node.arguments = parseExprList(_parenR, false);
-    else node.arguments = empty;
-    return finishNode(node, "NewExpression");
-  }
-
-  // Parse an object literal.
-
-  function parseObj() {
-    var node = startNode(), first = true, sawGetSet = false;
-    node.properties = [];
-    next();
-    while (!eat(_braceR)) {
-      if (!first) {
-        expect(_comma);
-        if (options.allowTrailingCommas && eat(_braceR)) break;
-      } else first = false;
-
-      var prop = {key: parsePropertyName()}, isGetSet = false, kind;
-      if (eat(_colon)) {
-        prop.value = parseExpression(true);
-        kind = prop.kind = "init";
-      } else if (options.ecmaVersion >= 5 && prop.key.type === "Identifier" &&
-                 (prop.key.name === "get" || prop.key.name === "set")) {
-        isGetSet = sawGetSet = true;
-        kind = prop.kind = prop.key.name;
-        prop.key = parsePropertyName();
-        if (tokType !== _parenL) unexpected();
-        prop.value = parseFunction(startNode(), false);
-      } else unexpected();
-
-      // getters and setters are not allowed to clash — either with
-      // each other or with an init property — and in strict mode,
-      // init properties are also not allowed to be repeated.
-
-      if (prop.key.type === "Identifier" && (strict || sawGetSet)) {
-        for (var i = 0; i < node.properties.length; ++i) {
-          var other = node.properties[i];
-          if (other.key.name === prop.key.name) {
-            var conflict = kind == other.kind || isGetSet && other.kind === "init" ||
-              kind === "init" && (other.kind === "get" || other.kind === "set");
-            if (conflict && !strict && kind === "init" && other.kind === "init") conflict = false;
-            if (conflict) raise(prop.key.start, "Redefinition of property");
-          }
-        }
-      }
-      node.properties.push(prop);
-    }
-    return finishNode(node, "ObjectExpression");
-  }
-
-  function parsePropertyName() {
-    if (tokType === _num || tokType === _string) return parseExprAtom();
-    return parseIdent(true);
-  }
-
-  // Parse a function declaration or literal (depending on the
-  // `isStatement` parameter).
-
-  function parseFunction(node, isStatement) {
-    if (tokType === _name) node.id = parseIdent();
-    else if (isStatement) unexpected();
-    else node.id = null;
-    node.params = [];
-    var first = true;
-    expect(_parenL);
-    while (!eat(_parenR)) {
-      if (!first) expect(_comma); else first = false;
-      node.params.push(parseIdent());
-    }
-
-    // Start a new scope with regard to labels and the `inFunction`
-    // flag (restore them to their old value afterwards).
-    var oldInFunc = inFunction, oldLabels = labels;
-    inFunction = true; labels = [];
-    node.body = parseBlock(true);
-    inFunction = oldInFunc; labels = oldLabels;
-
-    // If this is a strict mode function, verify that argument names
-    // are not repeated, and it does not try to bind the words `eval`
-    // or `arguments`.
-    if (strict || node.body.body.length && isUseStrict(node.body.body[0])) {
-      for (var i = node.id ? -1 : 0; i < node.params.length; ++i) {
-        var id = i < 0 ? node.id : node.params[i];
-        if (isStrictReservedWord(id.name) || isStrictBadIdWord(id.name))
-          raise(id.start, "Defining '" + id.name + "' in strict mode");
-        if (i >= 0) for (var j = 0; j < i; ++j) if (id.name === node.params[j].name)
-          raise(id.start, "Argument name clash in strict mode");
-      }
-    }
-
-    return finishNode(node, isStatement ? "FunctionDeclaration" : "FunctionExpression");
-  }
-
-  // Parses a comma-separated list of expressions, and returns them as
-  // an array. `close` is the token type that ends the list, and
-  // `allowEmpty` can be turned on to allow subsequent commas with
-  // nothing in between them to be parsed as `null` (which is needed
-  // for array literals).
-
-  function parseExprList(close, allowTrailingComma, allowEmpty) {
-    var elts = [], first = true;
-    while (!eat(close)) {
-      if (!first) {
-        expect(_comma);
-        if (allowTrailingComma && options.allowTrailingCommas && eat(close)) break;
-      } else first = false;
-
-      if (allowEmpty && tokType === _comma) elts.push(null);
-      else elts.push(parseExpression(true));
-    }
-    return elts;
-  }
-
-  // Parse the next token as an identifier. If `liberal` is true (used
-  // when parsing properties), it will also convert keywords into
-  // identifiers.
-
-  function parseIdent(liberal) {
-    var node = startNode();
-    if (liberal && options.forbidReserved == "everywhere") liberal = false;
-    if (tokType === _name) {
-      if (!liberal &&
-          (options.forbidReserved &&
-           (options.ecmaVersion === 3 ? isReservedWord3 : isReservedWord5)(tokVal) ||
-           strict && isStrictReservedWord(tokVal)) &&
-          input.slice(tokStart, tokEnd).indexOf("\\") == -1)
-        raise(tokStart, "The keyword '" + tokVal + "' is reserved");
-      node.name = tokVal;
-    } else if (liberal && tokType.keyword) {
-      node.name = tokType.keyword;
-    } else {
-      unexpected();
-    }
-    tokRegexpAllowed = false;
-    next();
-    return finishNode(node, "Identifier");
-  }
-
-});
diff --git a/test/lint/lint.js b/test/lint/lint.js
deleted file mode 100644
index b0248290cf..0000000000
--- a/test/lint/lint.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- Simple linter, based on the Acorn [1] parser module
-
- All of the existing linters either cramp my style or have huge
- dependencies (Closure). So here's a very simple, non-invasive one
- that only spots
-
-  - missing semicolons and trailing commas
-  - variables or properties that are reserved words
-  - assigning to a variable you didn't declare
-  - access to non-whitelisted globals
-    (use a '// declare global: foo, bar' comment to declare extra
-    globals in a file)
-
- [1]: https://github.com/marijnh/acorn/
-*/
-
-var topAllowedGlobals = Object.create(null);
-("Error RegExp Number String Array Function Object Math Date undefined " +
- "parseInt parseFloat Infinity NaN isNaN " +
- "window document navigator prompt alert confirm console " +
- "screen FileReader Worker postMessage importScripts " +
- "setInterval clearInterval setTimeout clearTimeout " +
- "CodeMirror " +
- "test exports require module define requirejs")
-  .split(" ").forEach(function(n) { topAllowedGlobals[n] = true; });
-
-var fs = require("fs"), acorn = require("./acorn.js"), walk = require("./walk.js");
-
-var scopePasser = walk.make({
-  ScopeBody: function(node, prev, c) { c(node, node.scope); }
-});
-
-var cBlob = /^\/\/ CodeMirror, copyright \(c\) by Marijn Haverbeke and others\n\/\/ Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n/;
-
-function checkFile(fileName) {
-  var file = fs.readFileSync(fileName, "utf8"), notAllowed;
-  if (notAllowed = file.match(/[\x00-\x08\x0b\x0c\x0e-\x19\uFEFF\t]|[ \t]\n/)) {
-    var msg;
-    if (notAllowed[0] == "\t") msg = "Found tab character";
-    else if (notAllowed[0].indexOf("\n") > -1) msg = "Trailing whitespace";
-    else msg = "Undesirable character " + notAllowed[0].charCodeAt(0);
-    var info = acorn.getLineInfo(file, notAllowed.index);
-    fail(msg + " at line " + info.line + ", column " + info.column, {source: fileName});
-  }
-
-  if (!cBlob.test(file))
-    fail("Missing license blob", {source: fileName});
-  
-  var globalsSeen = Object.create(null);
-
-  try {
-    var parsed = acorn.parse(file, {
-      locations: true,
-      ecmaVersion: 3,
-      strictSemicolons: true,
-      allowTrailingCommas: false,
-      forbidReserved: "everywhere",
-      sourceFile: fileName
-    });
-  } catch (e) {
-    fail(e.message, {source: fileName});
-    return;
-  }
-
-  var scopes = [];
-
-  walk.simple(parsed, {
-    ScopeBody: function(node, scope) {
-      node.scope = scope;
-      scopes.push(scope);
-    }
-  }, walk.scopeVisitor, {vars: Object.create(null)});
-
-  var ignoredGlobals = Object.create(null);
-
-  function inScope(name, scope) {
-    for (var cur = scope; cur; cur = cur.prev)
-      if (name in cur.vars) return true;
-  }
-  function checkLHS(node, scope) {
-    if (node.type == "Identifier" && !(node.name in ignoredGlobals) &&
-        !inScope(node.name, scope)) {
-      ignoredGlobals[node.name] = true;
-      fail("Assignment to global variable", node.loc);
-    }
-  }
-
-  walk.simple(parsed, {
-    UpdateExpression: function(node, scope) {checkLHS(node.argument, scope);},
-    AssignmentExpression: function(node, scope) {checkLHS(node.left, scope);},
-    Identifier: function(node, scope) {
-      if (node.name == "arguments") return;
-      // Mark used identifiers
-      for (var cur = scope; cur; cur = cur.prev)
-        if (node.name in cur.vars) {
-          cur.vars[node.name].used = true;
-          return;
-        }
-      globalsSeen[node.name] = node.loc;
-    },
-    FunctionExpression: function(node) {
-      if (node.id) fail("Named function expression", node.loc);
-    },
-    ForStatement: function(node) {
-      checkReusedIndex(node);
-    },
-    MemberExpression: function(node) {
-      if (node.object.type == "Identifier" && node.object.name == "console" && !node.computed)
-        fail("Found console." + node.property.name, node.loc);
-    },
-    DebuggerStatement: function(node) {
-      fail("Found debugger statement", node.loc);
-    }
-  }, scopePasser);
-
-  function checkReusedIndex(node) {
-    if (!node.init || node.init.type != "VariableDeclaration") return;
-    var name = node.init.declarations[0].id.name;
-    walk.recursive(node.body, null, {
-      Function: function() {},
-      VariableDeclaration: function(node, st, c) {
-        for (var i = 0; i < node.declarations.length; i++)
-          if (node.declarations[i].id.name == name)
-            fail("redefined loop variable", node.declarations[i].id.loc);
-        walk.base.VariableDeclaration(node, st, c);
-      }
-    });
-  }
-
-  var allowedGlobals = Object.create(topAllowedGlobals), m;
-  if (m = file.match(/\/\/ declare global:\s+(.*)/))
-    m[1].split(/,\s*/g).forEach(function(n) { allowedGlobals[n] = true; });
-  for (var glob in globalsSeen)
-    if (!(glob in allowedGlobals))
-      fail("Access to global variable " + glob + ". Add a '// declare global: " + glob +
-           "' comment or add this variable in test/lint/lint.js.", globalsSeen[glob]);
-
-  for (var i = 0; i < scopes.length; ++i) {
-    var scope = scopes[i];
-    for (var name in scope.vars) {
-      var info = scope.vars[name];
-      if (!info.used && info.type != "catch clause" && info.type != "function name" && name.charAt(0) != "_")
-        fail("Unused " + info.type + " " + name, info.node.loc);
-    }
-  }
-}
-
-var failed = false;
-function fail(msg, pos) {
-  if (pos.start) msg += " (" + pos.start.line + ":" + pos.start.column + ")";
-  console.log(pos.source + ": " + msg);
-  failed = true;
-}
-
-function checkDir(dir) {
-  fs.readdirSync(dir).forEach(function(file) {
-    var fname = dir + "/" + file;
-    if (/\.js$/.test(file)) checkFile(fname);
-    else if (fs.lstatSync(fname).isDirectory()) checkDir(fname);
-  });
-}
-
-exports.checkDir = checkDir;
-exports.checkFile = checkFile;
-exports.success = function() { return !failed; };
diff --git a/test/lint/walk.js b/test/lint/walk.js
deleted file mode 100644
index 4c0d9a7f88..0000000000
--- a/test/lint/walk.js
+++ /dev/null
@@ -1,313 +0,0 @@
-// AST walker module for Mozilla Parser API compatible trees
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") return mod(exports); // CommonJS
-  if (typeof define == "function" && define.amd) return define(["exports"], mod); // AMD
-  mod((this.acorn || (this.acorn = {})).walk = {}); // Plain browser env
-})(function(exports) {
-  "use strict";
-
-  // A simple walk is one where you simply specify callbacks to be
-  // called on specific nodes. The last two arguments are optional. A
-  // simple use would be
-  //
-  //     walk.simple(myTree, {
-  //         Expression: function(node) { ... }
-  //     });
-  //
-  // to do something with all expressions. All Parser API node types
-  // can be used to identify node types, as well as Expression,
-  // Statement, and ScopeBody, which denote categories of nodes.
-  //
-  // The base argument can be used to pass a custom (recursive)
-  // walker, and state can be used to give this walked an initial
-  // state.
-  exports.simple = function(node, visitors, base, state) {
-    if (!base) base = exports.base;
-    function c(node, st, override) {
-      var type = override || node.type, found = visitors[type];
-      base[type](node, st, c);
-      if (found) found(node, st);
-    }
-    c(node, state);
-  };
-
-  // A recursive walk is one where your functions override the default
-  // walkers. They can modify and replace the state parameter that's
-  // threaded through the walk, and can opt how and whether to walk
-  // their child nodes (by calling their third argument on these
-  // nodes).
-  exports.recursive = function(node, state, funcs, base) {
-    var visitor = funcs ? exports.make(funcs, base) : base;
-    function c(node, st, override) {
-      visitor[override || node.type](node, st, c);
-    }
-    c(node, state);
-  };
-
-  function makeTest(test) {
-    if (typeof test == "string")
-      return function(type) { return type == test; };
-    else if (!test)
-      return function() { return true; };
-    else
-      return test;
-  }
-
-  function Found(node, state) { this.node = node; this.state = state; }
-
-  // Find a node with a given start, end, and type (all are optional,
-  // null can be used as wildcard). Returns a {node, state} object, or
-  // undefined when it doesn't find a matching node.
-  exports.findNodeAt = function(node, start, end, test, base, state) {
-    test = makeTest(test);
-    try {
-      if (!base) base = exports.base;
-      var c = function(node, st, override) {
-        var type = override || node.type;
-        if ((start == null || node.start <= start) &&
-            (end == null || node.end >= end))
-          base[type](node, st, c);
-        if (test(type, node) &&
-            (start == null || node.start == start) &&
-            (end == null || node.end == end))
-          throw new Found(node, st);
-      };
-      c(node, state);
-    } catch (e) {
-      if (e instanceof Found) return e;
-      throw e;
-    }
-  };
-
-  // Find the innermost node of a given type that contains the given
-  // position. Interface similar to findNodeAt.
-  exports.findNodeAround = function(node, pos, test, base, state) {
-    test = makeTest(test);
-    try {
-      if (!base) base = exports.base;
-      var c = function(node, st, override) {
-        var type = override || node.type;
-        if (node.start > pos || node.end < pos) return;
-        base[type](node, st, c);
-        if (test(type, node)) throw new Found(node, st);
-      };
-      c(node, state);
-    } catch (e) {
-      if (e instanceof Found) return e;
-      throw e;
-    }
-  };
-
-  // Find the outermost matching node after a given position.
-  exports.findNodeAfter = function(node, pos, test, base, state) {
-    test = makeTest(test);
-    try {
-      if (!base) base = exports.base;
-      var c = function(node, st, override) {
-        if (node.end < pos) return;
-        var type = override || node.type;
-        if (node.start >= pos && test(type, node)) throw new Found(node, st);
-        base[type](node, st, c);
-      };
-      c(node, state);
-    } catch (e) {
-      if (e instanceof Found) return e;
-      throw e;
-    }
-  };
-
-  // Find the outermost matching node before a given position.
-  exports.findNodeBefore = function(node, pos, test, base, state) {
-    test = makeTest(test);
-    if (!base) base = exports.base;
-    var max;
-    var c = function(node, st, override) {
-      if (node.start > pos) return;
-      var type = override || node.type;
-      if (node.end <= pos && (!max || max.node.end < node.end) && test(type, node))
-        max = new Found(node, st);
-      base[type](node, st, c);
-    };
-    c(node, state);
-    return max;
-  };
-
-  // Used to create a custom walker. Will fill in all missing node
-  // type properties with the defaults.
-  exports.make = function(funcs, base) {
-    if (!base) base = exports.base;
-    var visitor = {};
-    for (var type in base) visitor[type] = base[type];
-    for (var type in funcs) visitor[type] = funcs[type];
-    return visitor;
-  };
-
-  function skipThrough(node, st, c) { c(node, st); }
-  function ignore(_node, _st, _c) {}
-
-  // Node walkers.
-
-  var base = exports.base = {};
-  base.Program = base.BlockStatement = function(node, st, c) {
-    for (var i = 0; i < node.body.length; ++i)
-      c(node.body[i], st, "Statement");
-  };
-  base.Statement = skipThrough;
-  base.EmptyStatement = ignore;
-  base.ExpressionStatement = function(node, st, c) {
-    c(node.expression, st, "Expression");
-  };
-  base.IfStatement = function(node, st, c) {
-    c(node.test, st, "Expression");
-    c(node.consequent, st, "Statement");
-    if (node.alternate) c(node.alternate, st, "Statement");
-  };
-  base.LabeledStatement = function(node, st, c) {
-    c(node.body, st, "Statement");
-  };
-  base.BreakStatement = base.ContinueStatement = ignore;
-  base.WithStatement = function(node, st, c) {
-    c(node.object, st, "Expression");
-    c(node.body, st, "Statement");
-  };
-  base.SwitchStatement = function(node, st, c) {
-    c(node.discriminant, st, "Expression");
-    for (var i = 0; i < node.cases.length; ++i) {
-      var cs = node.cases[i];
-      if (cs.test) c(cs.test, st, "Expression");
-      for (var j = 0; j < cs.consequent.length; ++j)
-        c(cs.consequent[j], st, "Statement");
-    }
-  };
-  base.ReturnStatement = function(node, st, c) {
-    if (node.argument) c(node.argument, st, "Expression");
-  };
-  base.ThrowStatement = function(node, st, c) {
-    c(node.argument, st, "Expression");
-  };
-  base.TryStatement = function(node, st, c) {
-    c(node.block, st, "Statement");
-    if (node.handler) c(node.handler.body, st, "ScopeBody");
-    if (node.finalizer) c(node.finalizer, st, "Statement");
-  };
-  base.WhileStatement = function(node, st, c) {
-    c(node.test, st, "Expression");
-    c(node.body, st, "Statement");
-  };
-  base.DoWhileStatement = base.WhileStatement;
-  base.ForStatement = function(node, st, c) {
-    if (node.init) c(node.init, st, "ForInit");
-    if (node.test) c(node.test, st, "Expression");
-    if (node.update) c(node.update, st, "Expression");
-    c(node.body, st, "Statement");
-  };
-  base.ForInStatement = function(node, st, c) {
-    c(node.left, st, "ForInit");
-    c(node.right, st, "Expression");
-    c(node.body, st, "Statement");
-  };
-  base.ForInit = function(node, st, c) {
-    if (node.type == "VariableDeclaration") c(node, st);
-    else c(node, st, "Expression");
-  };
-  base.DebuggerStatement = ignore;
-
-  base.FunctionDeclaration = function(node, st, c) {
-    c(node, st, "Function");
-  };
-  base.VariableDeclaration = function(node, st, c) {
-    for (var i = 0; i < node.declarations.length; ++i) {
-      var decl = node.declarations[i];
-      if (decl.init) c(decl.init, st, "Expression");
-    }
-  };
-
-  base.Function = function(node, st, c) {
-    c(node.body, st, "ScopeBody");
-  };
-  base.ScopeBody = function(node, st, c) {
-    c(node, st, "Statement");
-  };
-
-  base.Expression = skipThrough;
-  base.ThisExpression = ignore;
-  base.ArrayExpression = function(node, st, c) {
-    for (var i = 0; i < node.elements.length; ++i) {
-      var elt = node.elements[i];
-      if (elt) c(elt, st, "Expression");
-    }
-  };
-  base.ObjectExpression = function(node, st, c) {
-    for (var i = 0; i < node.properties.length; ++i)
-      c(node.properties[i].value, st, "Expression");
-  };
-  base.FunctionExpression = base.FunctionDeclaration;
-  base.SequenceExpression = function(node, st, c) {
-    for (var i = 0; i < node.expressions.length; ++i)
-      c(node.expressions[i], st, "Expression");
-  };
-  base.UnaryExpression = base.UpdateExpression = function(node, st, c) {
-    c(node.argument, st, "Expression");
-  };
-  base.BinaryExpression = base.AssignmentExpression = base.LogicalExpression = function(node, st, c) {
-    c(node.left, st, "Expression");
-    c(node.right, st, "Expression");
-  };
-  base.ConditionalExpression = function(node, st, c) {
-    c(node.test, st, "Expression");
-    c(node.consequent, st, "Expression");
-    c(node.alternate, st, "Expression");
-  };
-  base.NewExpression = base.CallExpression = function(node, st, c) {
-    c(node.callee, st, "Expression");
-    if (node.arguments) for (var i = 0; i < node.arguments.length; ++i)
-      c(node.arguments[i], st, "Expression");
-  };
-  base.MemberExpression = function(node, st, c) {
-    c(node.object, st, "Expression");
-    if (node.computed) c(node.property, st, "Expression");
-  };
-  base.Identifier = base.Literal = ignore;
-
-  // A custom walker that keeps track of the scope chain and the
-  // variables defined in it.
-  function makeScope(prev, isCatch) {
-    return {vars: Object.create(null), prev: prev, isCatch: isCatch};
-  }
-  function normalScope(scope) {
-    while (scope.isCatch) scope = scope.prev;
-    return scope;
-  }
-  exports.scopeVisitor = exports.make({
-    Function: function(node, scope, c) {
-      var inner = makeScope(scope);
-      for (var i = 0; i < node.params.length; ++i)
-        inner.vars[node.params[i].name] = {type: "argument", node: node.params[i]};
-      if (node.id) {
-        var decl = node.type == "FunctionDeclaration";
-        (decl ? normalScope(scope) : inner).vars[node.id.name] =
-          {type: decl ? "function" : "function name", node: node.id};
-      }
-      c(node.body, inner, "ScopeBody");
-    },
-    TryStatement: function(node, scope, c) {
-      c(node.block, scope, "Statement");
-      if (node.handler) {
-        var inner = makeScope(scope, true);
-        inner.vars[node.handler.param.name] = {type: "catch clause", node: node.handler.param};
-        c(node.handler.body, inner, "ScopeBody");
-      }
-      if (node.finalizer) c(node.finalizer, scope, "Statement");
-    },
-    VariableDeclaration: function(node, scope, c) {
-      var target = normalScope(scope);
-      for (var i = 0; i < node.declarations.length; ++i) {
-        var decl = node.declarations[i];
-        target.vars[decl.id.name] = {type: "var", node: decl.id};
-        if (decl.init) c(decl.init, scope, "Expression");
-      }
-    }
-  });
-
-});
diff --git a/test/run.js b/test/run.js
index 140539c173..24b835c37c 100755
--- a/test/run.js
+++ b/test/run.js
@@ -1,13 +1,6 @@
 #!/usr/bin/env node
 
-var lint = require("./lint/lint");
-
-lint.checkDir("mode");
-lint.checkDir("lib");
-lint.checkDir("addon");
-lint.checkDir("keymap");
-
-var ok = lint.success();
+var ok = require("./lint").ok;
 
 var files = new (require('node-static').Server)();
 

From 509b989a6b2a954c92d1f2fd7de1bae923968f86 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 14 Jan 2015 14:17:25 +0100
Subject: [PATCH 1836/4742] Try to please Travis by declaring blint dep
 differently

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b8cb39d0c5..89d7db1438 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "scripts": {"test": "node ./test/run.js"},
     "devDependencies": {"node-static": "0.6.0",
                         "phantomjs": "1.9.2-5",
-                        "blint": "^0.1.0"},
+                        "blint": ">=0.1.1"},
     "bugs": "http://github.com/codemirror/CodeMirror/issues",
     "keywords": ["JavaScript", "CodeMirror", "Editor"],
     "homepage": "http://codemirror.net",

From e53166be3207dd91a2ef60d2bc23862fe5f5d25d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 14 Jan 2015 15:00:40 +0100
Subject: [PATCH 1837/4742] Require node 0.10 in .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index baa0031d50..20fd86b6a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - 0.8
+  - 0.10

From 2f162eeec682d24f5252de26474d55cff01c90db Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 17 Jan 2015 22:09:44 +0100
Subject: [PATCH 1838/4742] [simple mode addon] Support 'sol' property to force
 tokens to only match at line start

See http://discuss.codemirror.net/t/simple-mode-and-anchored-regexp/88/4
---
 addon/mode/simple.js | 2 +-
 demo/simplemode.html | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index 0a48a95367..795328b83d 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -116,7 +116,7 @@
       var curState = states[state.state];
       for (var i = 0; i < curState.length; i++) {
         var rule = curState[i];
-        var matches = stream.match(rule.regex);
+        var matches = (!rule.data.sol || stream.sol()) && stream.match(rule.regex);
         if (matches) {
           if (rule.data.next) {
             state.state = rule.data.next;
diff --git a/demo/simplemode.html b/demo/simplemode.html
index ad8baf0b50..49778ef1e2 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -74,6 +74,11 @@ <h2>Simple Mode Demo</h2>
   string (since JS provides no way to find out where a group matched),
   and this property must hold an array of token styles that has one
   style for each matched group.</dd>
+  <dt><code><strong>sol</strong></code>: boolean</dt>
+  <dd>When true, this token will only match at the start of the line.
+  (The <code>^</code> regexp marker doesn't work as you'd expect in
+  this context because of limitations in JavaScript's RegExp
+  API.)</dd>
   <dt><code><strong>next</strong>: string</code></dt>
   <dd>When a <code>next</code> property is present, the mode will
   transfer to the state named by the property when the token is

From e3d317b579b12aa482d216da50ecc7236f6562f5 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Wed, 14 Jan 2015 15:18:15 +0100
Subject: [PATCH 1839/4742] [css mode] Add values flex and inline-flex

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 55082bf8e4..3f02907ed5 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -525,14 +525,14 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
     "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et",
     "ethiopic-halehame-tig", "ew-resize", "expanded", "extra-condensed",
-    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "footnotes",
+    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "footnotes",
     "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
     "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
     "help", "hidden", "hide", "higher", "highlight", "highlighttext",
     "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
     "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
     "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
-    "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert",
+    "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert",
     "italic", "justify", "kannada", "katakana", "katakana-iroha", "keep-all", "khmer",
     "landscape", "lao", "large", "larger", "left", "level", "lighter",
     "line-through", "linear", "lines", "list-item", "listbox", "listitem",

From 39888dd65055efaf019c5e858fb7280567349c4c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 17 Jan 2015 23:05:30 +0100
Subject: [PATCH 1840/4742] When measuring noHScroll line widgets, pin width to
 editor width

Closes #3024
---
 lib/codemirror.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c8612d0b5a..1b4395adf8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5885,7 +5885,9 @@
     if (!contains(document.body, widget.node)) {
       var parentStyle = "position: relative;";
       if (widget.coverGutter)
-        parentStyle += "margin-left: -" + widget.cm.getGutterElement().offsetWidth + "px;";
+        parentStyle += "margin-left: -" + widget.cm.display.gutters.offsetWidth + "px;";
+      if (widget.noHScroll)
+        parentStyle += "width: " + widget.cm.display.wrapper.clientWidth + "px;";
       removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, parentStyle));
     }
     return widget.height = widget.node.offsetHeight;

From 5a7affd1a661699f49733348f469fc2f720601ba Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Sun, 18 Jan 2015 19:15:03 -0800
Subject: [PATCH 1841/4742] [perl] Add lineComment attribute to Perl mode

Also clean up style a bit. `perl.js` is oddly spaced!
---
 mode/perl/perl.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 311574e74a..bef62bc7d9 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -780,16 +780,21 @@ CodeMirror.defineMode("perl",function(){
                                 return "meta";}
                 return null;}
 
-        return{
-                startState:function(){
-                        return{
-                                tokenize:tokenPerl,
-                                chain:null,
-                                style:null,
-                                tail:null};},
-                token:function(stream,state){
-                        return (state.tokenize||tokenPerl)(stream,state);}
-                };});
+        return {
+            startState: function() {
+                return {
+                    tokenize: tokenPerl,
+                    chain: null,
+                    style: null,
+                    tail: null
+                };
+            },
+            token: function(stream, state) {
+                return (state.tokenize || tokenPerl)(stream, state);
+            },
+            lineComment: '#'
+        };
+});
 
 CodeMirror.registerHelper("wordChars", "perl", /[\w$]/);
 

From 6534d9e1aa49a47d523338d7c88a1d19fc9119b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Jan 2015 12:24:04 +0100
Subject: [PATCH 1842/4742] Work around bad measuring in Webkit for
 text-rendering: optimizelegibility

See http://discuss.codemirror.net/t/my-users-are-having-an-intermittent-issue-that-i-cant-reproduce/126
---
 lib/codemirror.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1b4395adf8..4994b08d94 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -112,6 +112,11 @@
     maybeUpdateLineNumberWidth(this);
     for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
     endOperation(this);
+    // Suppress optimizelegibility in Webkit, since it breaks text
+    // measuring on line wrapping boundaries.
+    if (webkit && options.lineWrapping &&
+        getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
+      display.lineDiv.style.textRendering = "auto";
   }
 
   // DISPLAY CONSTRUCTOR

From bf2e307473f812211d1cf49cd13d8721aca31176 Mon Sep 17 00:00:00 2001
From: Forrest Oliphant <github.com@sembiki.com>
Date: Wed, 21 Jan 2015 11:20:52 -0500
Subject: [PATCH 1843/4742] [docs] Mention coffeescript-lint addon

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

diff --git a/doc/manual.html b/doc/manual.html
index 051039bd03..4fee2bed90 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2612,6 +2612,7 @@ <h2 id="addons">Addons</h2>
       with pluggable warning sources
       (see <a href="../addon/lint/json-lint.js"><code>json-lint.js</code></a>,
       <a href="../addon/lint/javascript-lint.js"><code>javascript-lint.js</code></a>,
+      <a href="../addon/lint/coffeescript-lint.js"><code>coffeescript-lint.js</code></a>,
       and <a href="../addon/lint/css-lint.js"><code>css-lint.js</code></a>
       in the same directory). Defines a <code>lint</code> option that
       can be set to a warning source (for

From 3c1505d0444ffac75bb4da7c99c993780303c83b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Jan 2015 16:11:27 +0100
Subject: [PATCH 1844/4742] [selection-pointer addon] Add

---
 addon/selection/selection-pointer.js | 95 ++++++++++++++++++++++++++++
 doc/manual.html                      |  8 +++
 mode/htmlmixed/index.html            |  6 +-
 3 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 addon/selection/selection-pointer.js

diff --git a/addon/selection/selection-pointer.js b/addon/selection/selection-pointer.js
new file mode 100644
index 0000000000..ba5999496c
--- /dev/null
+++ b/addon/selection/selection-pointer.js
@@ -0,0 +1,95 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("selectionPointer", false, function(cm, val) {
+    var data = cm.state.selectionPointer;
+    if (data) {
+      CodeMirror.off(cm.getWrapperElement(), "mousemove", data.mousemove);
+      CodeMirror.off(cm.getWrapperElement(), "mouseleave", data.mouseleave);
+      cm.off("cursorActivity", reset);
+      cm.off("scroll", reset);
+      cm.state.selectionPointer = null;
+      cm.display.lineDiv.style.cursor = "";
+    }
+    if (val) {
+      data = cm.state.selectionPointer = {
+        value: typeof val == "string" ? val : "default",
+        mousemove: function(event) { mousemove(cm, event); },
+        mouseleave: function(event) { mouseleave(cm, event); },
+        rects: null,
+        mouseX: null, mouseY: null,
+        willUpdate: false
+      };
+      CodeMirror.on(cm.getWrapperElement(), "mousemove", data.mousemove);
+      CodeMirror.on(cm.getWrapperElement(), "mousemove", data.mousemove);
+      cm.on("cursorActivity", reset);
+      cm.on("scroll", reset);
+    }
+  });
+
+  function mousemove(cm, event) {
+    var data = cm.state.selectionPointer;
+    if (event.buttons == null ? event.which : event.buttons) {
+      data.mouseX = data.mouseY = null;
+    } else {
+      data.mouseX = event.clientX;
+      data.mouseY = event.clientY;
+    }
+    scheduleUpdate(cm);
+  }
+
+  function mouseout(cm, event) {
+    if (!cm.getWrapperElement().contains(event.relatedTarget)) {
+      var data = cm.state.selectionPointer;
+      data.mouseX = data.mouseY = null;
+      scheduleUpdate(cm);
+    }
+  }
+
+  function reset(cm) {
+    cm.state.selectionPointer.rects = null;
+    scheduleUpdate(cm);
+  }
+
+  function scheduleUpdate(cm) {
+    if (!cm.state.selectionPointer.willUpdate) {
+      cm.state.selectionPointer.willUpdate = true;
+      setTimeout(function() {
+        update(cm);
+        cm.state.selectionPointer.willUpdate = false;
+      }, 50);
+    }
+  }
+
+  function update(cm) {
+    var data = cm.state.selectionPointer;
+    if (!data) return;
+    if (data.rects == null && data.mouseX != null) {
+      data.rects = [];
+      if (cm.somethingSelected()) {
+        for (var sel = cm.display.selectionDiv.firstChild; sel; sel = sel.nextSibling)
+          data.rects.push(sel.getBoundingClientRect());
+      }
+    }
+    var inside = false;
+    if (data.mouseX != null) for (var i = 0; i < data.rects.length; i++) {
+      var rect = data.rects[i];
+      if (rect.left <= data.mouseX && rect.right >= data.mouseX &&
+          rect.top <= data.mouseY && rect.bottom >= data.mouseY)
+        inside = true;
+    }
+    var cursor = inside ? data.value : "";
+    if (cm.display.lineDiv.style.cursor != cursor)
+      cm.display.lineDiv.style.cursor = cursor;
+  }
+});
diff --git a/doc/manual.html b/doc/manual.html
index 4fee2bed90..3651040519 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2635,6 +2635,14 @@ <h2 id="addons">Addons</h2>
       and adds a background with the class <code>CodeMirror-activeline-background</code>.
       is enabled. See the <a href="../demo/activeline.html">demo</a>.</dd>
 
+      <dt id="addon_selection-pointer"><a href="../addon/selection/selection-pointer.js"><code>selection/selection-pointer.js</code></a></dt>
+      <dd>Defines a <code>selectionPointer</code> option which you can
+      use to control the mouse cursor appearance when hovering over
+      the selection. It can be set to a string,
+      like <code>"pointer"</code>, or to true, in which case
+      the <code>"default"</code> (arrow) cursor will be used. You can
+      see a demo <a href="../mode/htmlmixed/index.html">here</a>.</dd>
+
       <dt id="addon_loadmode"><a href="../addon/mode/loadmode.js"><code>mode/loadmode.js</code></a></dt>
       <dd>Defines a <code>CodeMirror.requireMode(modename,
       callback)</code> function that will try to load a given mode and
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index 61630293f5..f94df9e21a 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/selection/selection-pointer.js"></script>
 <script src="../xml/xml.js"></script>
 <script src="../javascript/javascript.js"></script>
 <script src="../css/css.js"></script>
@@ -62,7 +63,10 @@ <h1>Mixed HTML Example</h1>
                       {matches: /(text|application)\/(x-)?vb(a|script)/i,
                        mode: "vbscript"}]
       };
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: mixedMode});
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: mixedMode,
+        selectionPointer: true
+      });
     </script>
 
     <p>The HTML mixed mode depends on the XML, JavaScript, and CSS modes.</p>

From b84fff1cdbaa337885bb83e43f7f6f74e4bccbaf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Jan 2015 16:26:19 +0100
Subject: [PATCH 1845/4742] [selection-pointer addon] Fix confused use of wrong
 event name

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

diff --git a/addon/selection/selection-pointer.js b/addon/selection/selection-pointer.js
index ba5999496c..8cc0fc6860 100644
--- a/addon/selection/selection-pointer.js
+++ b/addon/selection/selection-pointer.js
@@ -15,7 +15,7 @@
     var data = cm.state.selectionPointer;
     if (data) {
       CodeMirror.off(cm.getWrapperElement(), "mousemove", data.mousemove);
-      CodeMirror.off(cm.getWrapperElement(), "mouseleave", data.mouseleave);
+      CodeMirror.off(cm.getWrapperElement(), "mouseout", data.mouseout);
       cm.off("cursorActivity", reset);
       cm.off("scroll", reset);
       cm.state.selectionPointer = null;
@@ -25,13 +25,13 @@
       data = cm.state.selectionPointer = {
         value: typeof val == "string" ? val : "default",
         mousemove: function(event) { mousemove(cm, event); },
-        mouseleave: function(event) { mouseleave(cm, event); },
+        mouseout: function(event) { mouseout(cm, event); },
         rects: null,
         mouseX: null, mouseY: null,
         willUpdate: false
       };
       CodeMirror.on(cm.getWrapperElement(), "mousemove", data.mousemove);
-      CodeMirror.on(cm.getWrapperElement(), "mousemove", data.mousemove);
+      CodeMirror.on(cm.getWrapperElement(), "mouseout", data.mouseout);
       cm.on("cursorActivity", reset);
       cm.on("scroll", reset);
     }

From bed3de39aa62616393db2bab4b5fec6ee2238747 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Jan 2015 16:24:21 +0100
Subject: [PATCH 1846/4742] Mark release 4.12.0

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

diff --git a/AUTHORS b/AUTHORS
index afa3cc083a..2ca41e67b7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -43,6 +43,7 @@ Andy Kimball
 Andy Li
 angelozerr
 angelo.zerr@gmail.com
+Ankit
 Ankit Ahuja
 Ansel Santosa
 Anthony Grimes
@@ -138,6 +139,7 @@ flack
 ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
+Forrest Oliphant
 Frank Wiegand
 Gabriel Gheorghian
 Gabriel Horner
@@ -256,6 +258,7 @@ Marcel Gerber
 Marco Aurélio
 Marco Munizaga
 Marcus Bointon
+Marek Rudnicki
 Marijn Haverbeke
 Mário Gonçalves
 Mario Pietsch
@@ -383,6 +386,7 @@ stoskov
 Taha Jahangir
 Takuji Shimokawa
 Tarmil
+tel
 tfjgeorge
 Thaddee Tyl
 TheHowl
diff --git a/bower.json b/bower.json
index 16aa2e37dd..d378331c4c 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.11.1",
+  "version":"4.12.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index 53314b7514..cf785ef75a 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.12.0;f=">4.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.11.0;f=">4.11</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.10.0;f=">4.10</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.9.0;f=">4.9</option>
diff --git a/doc/manual.html b/doc/manual.html
index 3651040519..909d1a6343 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 4.11.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.12.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 d9dd323ec0..7854019280 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,26 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">22-01-2015: <a href="http://codemirror.net/codemirror-4.12.zip">Version 4.12</a>:</p>
+
+  <ul class="rel-note">
+    <li>The <a href="manual.html#addon_closetag"><code>closetag</code></a>
+    addon now defines a <code>"closeTag"</code> command.</li>
+    <li>Adds a <code>findModeByFileName</code> to the <a href="manual.html#addon_meta">mode metadata</a>
+    addon.</li>
+    <li><a href="../demo/simplemode.html">Simple mode</a> rules can
+    now contain a <code>sol</code> property to only match at the start
+    of a line.</li>
+    <li>New
+    addon: <a href="manual.html#addon_selection-pointer"><code>selection-pointer</code></a>
+    to style the mouse cursor over the selection.</li>
+    <li>Improvements to the <a href="../mode/sass/index.html">Sass mode</a>'s indentation.</li>
+    <li>The <a href="../demo/vim.html">Vim keymap</a>'s search functionality now
+    supports <a href="manual.html#addon_matchesonscrollbar">scrollbar
+    annotation</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.11.0...4.12.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">9-01-2015: <a href="http://codemirror.net/codemirror-4.11.zip">Version 4.11</a>:</p>
 
   <p class="rel-note">Unfortunately, 4.10 did not take care of the
diff --git a/index.html b/index.html
index 1c03177511..2988d4a8a9 100644
--- a/index.html
+++ b/index.html
@@ -86,7 +86,7 @@ <h2>This is CodeMirror</h2>
   </script>
   <div style="position: relative; margin: 1em 0;">
     <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.11</strong> (<a href="doc/releases.html">Release notes</a>)</div>
+    <div><strong>version 4.12</strong> (<a href="doc/releases.html">Release notes</a>)</div>
     <div>or use the <a href="doc/compress.html">minification helper</a></div>
     <div style="position: absolute; top: 0; right: 0; text-align: right">
       <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4994b08d94..03a34dbbfb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8039,7 +8039,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.11.1";
+  CodeMirror.version = "4.12.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 89d7db1438..8f529cd925 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.11.1",
+    "version":"4.12.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From d07160c81d106731ef55dc04e7e8f3b83b22f117 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Jan 2015 16:27:53 +0100
Subject: [PATCH 1847/4742] Bump version number post-4.12

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

diff --git a/bower.json b/bower.json
index d378331c4c..7e30a06c6a 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.12.0",
+  "version":"4.12.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 909d1a6343..31a52dee12 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 4.12.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.12.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 03a34dbbfb..6723a1c42a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8039,7 +8039,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.12.0";
+  CodeMirror.version = "4.12.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 8f529cd925..89645861fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.12.0",
+    "version":"4.12.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 35830b92e7e4a5ce0b66f09c26d5bd4e96d19b40 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 22 Jan 2015 22:43:38 +0100
Subject: [PATCH 1848/4742] [selection-pointer addon] Also clear geometry on
 window scroll

Closes #3040
---
 addon/selection/selection-pointer.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addon/selection/selection-pointer.js b/addon/selection/selection-pointer.js
index 8cc0fc6860..ef5e404ad3 100644
--- a/addon/selection/selection-pointer.js
+++ b/addon/selection/selection-pointer.js
@@ -16,6 +16,7 @@
     if (data) {
       CodeMirror.off(cm.getWrapperElement(), "mousemove", data.mousemove);
       CodeMirror.off(cm.getWrapperElement(), "mouseout", data.mouseout);
+      CodeMirror.off(window, "scroll", data.windowScroll);
       cm.off("cursorActivity", reset);
       cm.off("scroll", reset);
       cm.state.selectionPointer = null;
@@ -26,12 +27,14 @@
         value: typeof val == "string" ? val : "default",
         mousemove: function(event) { mousemove(cm, event); },
         mouseout: function(event) { mouseout(cm, event); },
+        windowScroll: function() { reset(cm); },
         rects: null,
         mouseX: null, mouseY: null,
         willUpdate: false
       };
       CodeMirror.on(cm.getWrapperElement(), "mousemove", data.mousemove);
       CodeMirror.on(cm.getWrapperElement(), "mouseout", data.mouseout);
+      CodeMirror.on(window, "scroll", data.windowScroll);
       cm.on("cursorActivity", reset);
       cm.on("scroll", reset);
     }

From 076afcb14e8be635439e1689d8c3af2ffcfbce85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 23 Jan 2015 11:05:23 +0100
Subject: [PATCH 1849/4742] [closetag addon] Properly pass through return value
 for / key handler

So that the CodeMirror.Pass it will return actually ends up in the editor.
---
 addon/edit/closetag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 369bea30c4..e68d52d9dc 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -131,7 +131,7 @@
 
   function autoCloseSlash(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
-    autoCloseCurrent(cm, true);
+    return autoCloseCurrent(cm, true);
   }
 
   CodeMirror.commands.closeTag = function(cm) { return autoCloseCurrent(cm); };

From b17c0b6adb91d44e6fb062619db409862a24f133 Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Thu, 22 Jan 2015 20:43:42 -0800
Subject: [PATCH 1850/4742] [vim] fix join when 'head' before 'anchor' (closes
 #3042)

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 88a404a291..9f61fd7152 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2183,6 +2183,11 @@
         if (vim.visualMode) {
           curStart = cm.getCursor('anchor');
           curEnd = cm.getCursor('head');
+          if (cursorIsBefore(curEnd, curStart)) {
+            var tmp = curEnd;
+            curEnd = curStart;
+            curStart = tmp;
+          }
           curEnd.ch = lineLength(cm, curEnd.line) - 1;
         } else {
           // Repeat is the number of lines to join. Minimum 2 lines.
diff --git a/test/vim_test.js b/test/vim_test.js
index ea640efdac..1f5179a87d 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1964,6 +1964,11 @@ testVim('visual_join', function(cm, vim, helpers) {
   eq(' 1 2 3\n 4\n 5', cm.getValue());
   is(!vim.visualMode);
 }, { value: ' 1\n 2\n 3\n 4\n 5' });
+testVim('visual_join_2', function(cm, vim, helpers) {
+  helpers.doKeys('G', 'V', 'g', 'g', 'J');
+  eq('1 2 3 4 5 6 ', cm.getValue());
+  is(!vim.visualMode);
+}, { value: '1\n2\n3\n4\n5\n6\n'});
 testVim('visual_blank', function(cm, vim, helpers) {
   helpers.doKeys('v', 'k');
   eq(vim.visualMode, true);

From c79549dd2f38c17c01654b19e0b98879249006cb Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Thu, 22 Jan 2015 22:48:59 -0800
Subject: [PATCH 1851/4742] [vim] set cursor position after exiting visual mode

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9f61fd7152..f5dabcd39b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2206,10 +2206,10 @@
           cm.replaceRange(text, curStart, tmp);
         }
         var curFinalPos = Pos(curStart.line, finalCh);
-        cm.setCursor(curFinalPos);
         if (vim.visualMode) {
           exitVisualMode(cm);
         }
+        cm.setCursor(curFinalPos);
       },
       newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
         vim.insertMode = true;

From 25fa71e7fd6b52a2cab8362e1f56774e44fe81f7 Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Thu, 22 Jan 2015 22:57:14 -0800
Subject: [PATCH 1852/4742] [vim] don't move cursor on 'exitVisualMode' in many
 places

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

diff --git a/keymap/vim.js b/keymap/vim.js
index f5dabcd39b..dafd573831 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1449,7 +1449,7 @@
           var operatorMoveTo = operators[operator](
             cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
           if (vim.visualMode) {
-            exitVisualMode(cm);
+            exitVisualMode(cm, operatorMoveTo);
           }
           if (operatorMoveTo) {
             cm.setCursor(operatorMoveTo);
@@ -2207,7 +2207,7 @@
         }
         var curFinalPos = Pos(curStart.line, finalCh);
         if (vim.visualMode) {
-          exitVisualMode(cm);
+          exitVisualMode(cm, false);
         }
         cm.setCursor(curFinalPos);
       },
@@ -2372,7 +2372,7 @@
           }
         }
         if (vim.visualMode) {
-          exitVisualMode(cm);
+          exitVisualMode(cm, false);
         }
         cm.setCursor(curPosFinal);
       },
@@ -2430,7 +2430,7 @@
             curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ?
                          selections[0].anchor : selections[0].head;
             cm.setCursor(curStart);
-            exitVisualMode(cm);
+            exitVisualMode(cm, false);
           } else {
             cm.setCursor(offsetCursor(curEnd, 0, -1));
           }

From 790a7621a3ba46da868cfff272340beb49eba664 Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Thu, 22 Jan 2015 23:00:54 -0800
Subject: [PATCH 1853/4742] [vim] better check re: operatorMoveTo truthiness

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index dafd573831..7a8704feef 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1449,7 +1449,7 @@
           var operatorMoveTo = operators[operator](
             cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
           if (vim.visualMode) {
-            exitVisualMode(cm, operatorMoveTo);
+            exitVisualMode(cm, operatorMoveTo != null);
           }
           if (operatorMoveTo) {
             cm.setCursor(operatorMoveTo);

From f1692af532b78b7aeacb9dfc1962e2443866f65b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 24 Jan 2015 10:56:30 -0500
Subject: [PATCH 1854/4742] [vim] Clip cursor position after delete

---
 keymap/vim.js    |  2 +-
 test/vim_test.js | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 7a8704feef..ee524fde74 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1899,7 +1899,7 @@
         vimGlobalState.registerController.pushText(
             args.registerName, 'delete', text,
             args.linewise, vim.visualBlock);
-        return finalHead;
+        return clipCursorToContent(cm, finalHead);
       },
       indent: function(cm, args, ranges) {
         var vim = cm.state.vim;
diff --git a/test/vim_test.js b/test/vim_test.js
index 1f5179a87d..74013cbff4 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -597,7 +597,7 @@ testVim('dl_eol', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq(' ', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 6);
+  helpers.assertCursorAt(0, 5);
 }, { value: ' word1 ' });
 testVim('dl_repeat', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 0);
@@ -688,7 +688,7 @@ testVim('dw_only_word', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1 ', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1 ' });
 testVim('dw_eol', function(cm, vim, helpers) {
   // Assert that dw does not delete the newline if last word to delete is at end
@@ -699,7 +699,7 @@ testVim('dw_eol', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1\nword2' });
 testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
   // Assert that dw does not delete the newline if last word to delete is at end
@@ -710,7 +710,7 @@ testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1\n\nword2' });
 testVim('dw_empty_line_followed_by_whitespace', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -756,7 +756,7 @@ testVim('dw_repeat', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1\nword2', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1\nword2' });
 testVim('de_word_start_and_empty_lines', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -1283,7 +1283,7 @@ testVim('D', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('rd1', register.toString());
   is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
+  helpers.assertCursorAt(0, 2);
 }, { value: ' word1\nword2\n word3' });
 testVim('C', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);

From e94159ec9b214873dd818ce2ee90bb708a1edbb1 Mon Sep 17 00:00:00 2001
From: Aliaksei Chapyzhenka <alex.drom@gmail.com>
Date: Sun, 25 Jan 2015 15:20:31 -0800
Subject: [PATCH 1855/4742] [forth mode] Add

---
 mode/forth/forth.js | 180 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 mode/forth/forth.js

diff --git a/mode/forth/forth.js b/mode/forth/forth.js
new file mode 100644
index 0000000000..d08c6f0bdc
--- /dev/null
+++ b/mode/forth/forth.js
@@ -0,0 +1,180 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Author: Aliaksei Chapyzhenka
+
+(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";
+
+  function toWordList(words) {
+    var ret = [];
+    words.split(' ').forEach(function(e){
+      ret.push({name: e});
+    });
+    return ret;
+  }
+
+  var coreWordList = toWordList(
+'INVERT AND OR XOR\
+ 2* 2/ LSHIFT RSHIFT\
+ 0= = 0< < > U< MIN MAX\
+ 2DROP 2DUP 2OVER 2SWAP ?DUP DEPTH DROP DUP OVER ROT SWAP\
+ >R R> R@\
+ + - 1+ 1- ABS NEGATE\
+ S>D * M* UM*\
+ FM/MOD SM/REM UM/MOD */ */MOD / /MOD MOD\
+ HERE , @ ! CELL+ CELLS C, C@ C! CHARS 2@ 2!\
+ ALIGN ALIGNED +! ALLOT\
+ CHAR [CHAR] [ ] BL\
+ FIND EXECUTE IMMEDIATE COUNT LITERAL STATE\
+ ; DOES> >BODY\
+ EVALUATE\
+ SOURCE >IN\
+ <# # #S #> HOLD SIGN BASE >NUMBER HEX DECIMAL\
+ FILL MOVE\
+ . CR EMIT SPACE SPACES TYPE U. .R U.R\
+ ACCEPT\
+ TRUE FALSE\
+ <> U> 0<> 0>\
+ NIP TUCK ROLL PICK\
+ 2>R 2R@ 2R>\
+ WITHIN UNUSED MARKER\
+ I J\
+ TO\
+ COMPILE, [COMPILE]\
+ SAVE-INPUT RESTORE-INPUT\
+ PAD ERASE\
+ 2LITERAL DNEGATE\
+ D- D+ D0< D0= D2* D2/ D< D= DMAX DMIN D>S DABS\
+ M+ M*/ D. D.R 2ROT DU<\
+ CATCH THROW\
+ FREE RESIZE ALLOCATE\
+ CS-PICK CS-ROLL\
+ GET-CURRENT SET-CURRENT FORTH-WORDLIST GET-ORDER SET-ORDER\
+ PREVIOUS SEARCH-WORDLIST WORDLIST FIND ALSO ONLY FORTH DEFINITIONS ORDER\
+ -TRAILING /STRING SEARCH COMPARE CMOVE CMOVE> BLANK SLITERAL');
+
+  var immediateWordList = toWordList('IF ELSE THEN BEGIN WHILE REPEAT UNTIL RECURSE [IF] [ELSE] [THEN] ?DO DO LOOP +LOOP UNLOOP LEAVE EXIT AGAIN CASE OF ENDOF ENDCASE');
+
+  CodeMirror.defineMode('forth', function() {
+    function searchWordList (wordList, word) {
+      var i;
+      for (i = wordList.length - 1; i >= 0; i--) {
+        if (wordList[i].name === word.toUpperCase()) {
+          return wordList[i];
+        }
+      }
+      return undefined;
+    }
+  return {
+    startState: function() {
+      return {
+        state: '',
+        base: 10,
+        coreWordList: coreWordList,
+        immediateWordList: immediateWordList,
+        wordList: []
+      };
+    },
+    token: function (stream, stt) {
+      var mat;
+      if (stream.eatSpace()) {
+        return null;
+      }
+      if (stt.state === '') { // interpretation
+        if (stream.match(/^(\]|:NONAME)(\s|$)/i)) {
+          stt.state = ' compilation';
+          return 'builtin compilation';
+        }
+        mat = stream.match(/^(\:)\s+(\S+)(\s|$)+/);
+        if (mat) {
+          stt.wordList.push({name: mat[2].toUpperCase()});
+          stt.state = ' compilation';
+          return 'def' + stt.state;
+        }
+        mat = stream.match(/^(VARIABLE|2VARIABLE|CONSTANT|2CONSTANT|CREATE|POSTPONE|VALUE|WORD)\s+(\S+)(\s|$)+/i);
+        if (mat) {
+          stt.wordList.push({name: mat[2].toUpperCase()});
+          return 'def' + stt.state;
+        }
+        mat = stream.match(/^(\'|\[\'\])\s+(\S+)(\s|$)+/);
+        if (mat) {
+          return 'builtin' + stt.state;
+        }
+        } else { // compilation
+        // ; [
+        if (stream.match(/^(\;|\[)(\s)/)) {
+          stt.state = '';
+          stream.backUp(1);
+          return 'builtin compilation';
+        }
+        if (stream.match(/^(\;|\[)($)/)) {
+          stt.state = '';
+          return 'builtin compilation';
+        }
+        if (stream.match(/^(POSTPONE)\s+\S+(\s|$)+/)) {
+          return 'builtin';
+        }
+      }
+
+      // dynamic wordlist
+      mat = stream.match(/^(\S+)(\s+|$)/);
+      if (mat) {
+        if (searchWordList(stt.wordList, mat[1]) !== undefined) {
+          return 'variable' + stt.state;
+        }
+
+        // comments
+        if (mat[1] === '\\') {
+          stream.skipToEnd();
+            return 'comment' + stt.state;
+          }
+
+          // core words
+          if (searchWordList(stt.coreWordList, mat[1]) !== undefined) {
+            return 'builtin' + stt.state;
+          }
+          if (searchWordList(stt.immediateWordList, mat[1]) !== undefined) {
+            return 'keyword' + stt.state;
+          }
+
+          if (mat[1] === '(') {
+            stream.eatWhile(function (s) { return s !== ')'; });
+            stream.eat(')');
+            return 'comment' + stt.state;
+          }
+
+          // // strings
+          if (mat[1] === '.(') {
+            stream.eatWhile(function (s) { return s !== ')'; });
+            stream.eat(')');
+            return 'string' + stt.state;
+          }
+          if (mat[1] === 'S"' || mat[1] === '."' || mat[1] === 'C"') {
+            stream.eatWhile(function (s) { return s !== '"'; });
+            stream.eat('"');
+            return 'string' + stt.state;
+          }
+
+          // numbers
+          if (mat[1] - 0xfffffffff) {
+            return 'number' + stt.state;
+          }
+          // if (mat[1].match(/^[-+]?[0-9]+\.[0-9]*/)) {
+          //     return 'number' + stt.state;
+          // }
+
+          return 'atom' + stt.state;
+        }
+      }
+    };
+  });
+  CodeMirror.defineMIME("text/forth", "forth");
+});

From 0c10c7a72c79610fad7a79601227897a9ab0df0c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 27 Jan 2015 23:04:04 +0100
Subject: [PATCH 1856/4742] [forth mode] Integrate

---
 doc/compress.html   | 1 +
 mode/forth/forth.js | 2 +-
 mode/index.html     | 1 +
 mode/meta.js        | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/compress.html b/doc/compress.html
index cf785ef75a..b572c09dac 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -119,6 +119,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
           <option value="http://codemirror.net/mode/eiffel/eiffel.js">eiffel.js</option>
           <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
+          <option value="http://codemirror.net/mode/forth/forth.js">forth.js</option>
           <option value="http://codemirror.net/mode/fortran/fortran.js">fortran.js</option>
           <option value="http://codemirror.net/mode/gfm/gfm.js">gfm.js</option>
           <option value="http://codemirror.net/mode/gas/gas.js">gas.js</option>
diff --git a/mode/forth/forth.js b/mode/forth/forth.js
index d08c6f0bdc..1f519d8862 100644
--- a/mode/forth/forth.js
+++ b/mode/forth/forth.js
@@ -176,5 +176,5 @@
       }
     };
   });
-  CodeMirror.defineMIME("text/forth", "forth");
+  CodeMirror.defineMIME("text/x-forth", "forth");
 });
diff --git a/mode/index.html b/mode/index.html
index c933e1e943..d934f7e0e9 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -51,6 +51,7 @@ <h2>Language modes</h2>
       <li><a href="ecl/index.html">ECL</a></li>
       <li><a href="eiffel/index.html">Eiffel</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
+      <li><a href="forth/index.html">Forth</a></li>
       <li><a href="fortran/index.html">Fortran</a></li>
       <li><a href="mllike/index.html">F#</a></li>
       <li><a href="gas/index.html">Gas</a> (AT&amp;T-style assembly)</li>
diff --git a/mode/meta.js b/mode/meta.js
index 8d91df7d77..e110288afc 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -38,6 +38,7 @@
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
     {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+    {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
     {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
     {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
     {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},

From 11a7c353077d9dac15a8d7de159165c2a3363805 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 29 Jan 2015 23:35:07 +0100
Subject: [PATCH 1857/4742] Wrap .focus() call in try/catch to avoid IE8
 exception

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6723a1c42a..b89dc1c101 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2611,8 +2611,10 @@
   }
 
   function focusInput(cm) {
-    if (cm.options.readOnly != "nocursor" && (!mobile || activeElt() != cm.display.input))
-      cm.display.input.focus();
+    if (cm.options.readOnly != "nocursor" && (!mobile || activeElt() != cm.display.input)) {
+      try { cm.display.input.focus(); }
+      catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
+    }
   }
 
   function ensureFocus(cm) {

From bb8f072c7e5840159ba816bae8163b759822d3f5 Mon Sep 17 00:00:00 2001
From: Aliaksei Chapyzhenka <alex.drom@gmail.com>
Date: Thu, 29 Jan 2015 23:59:22 +0100
Subject: [PATCH 1858/4742] [forth mode] Add demo page

---
 mode/forth/index.html | 67 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 mode/forth/index.html

diff --git a/mode/forth/index.html b/mode/forth/index.html
new file mode 100644
index 0000000000..711d387cd8
--- /dev/null
+++ b/mode/forth/index.html
@@ -0,0 +1,67 @@
+<!doctype html>
+
+<title>CodeMirror: Forth 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="forth.js"></script>
+<style>.CodeMirror {border: 2px inset #dee;}</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="#">Forth</a>
+  </ul>
+</div>
+
+<article>
+
+<h2>Forth mode</h2>
+
+<form><textarea id="code" name="code">
+\ Insertion sort
+
+: cell-  1 cells - ;
+
+: insert ( start end -- start )
+  dup @ >r ( r: v )
+  begin
+    2dup <
+  while
+    r@ over cell- @ <
+  while
+    cell-
+    dup @ over cell+ !
+  repeat then
+  r> swap ! ;
+
+: sort ( array len -- )
+  1 ?do
+    dup i cells + insert
+  loop drop ;
+</textarea></form>
+
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    lineWrapping: true,
+    indentUnit: 2,
+    tabSize: 2,
+    autofocus: true,
+    mode: "text/x-forth"
+  });
+</script>
+
+<p>Simple mode that handle Forth-Syntax (<a href="http://en.wikipedia.org/wiki/Forth_%28programming_language%29">Forth on WikiPedia</a>).</p>
+
+<p><strong>MIME types defined:</strong> <code>text/x-forth</code>.</p>
+
+</article>

From 893a12e7ea3983d6f7a99d6e16f4aa7f00a6e699 Mon Sep 17 00:00:00 2001
From: Christian Petrov <cpetrov@eclipsesource.com>
Date: Mon, 26 Jan 2015 10:15:20 +0100
Subject: [PATCH 1859/4742] [tern addon] open [doc] link in a new tab/window

Opening the documentation in the same window navigates away from the
code editor.
---
 addon/tern/tern.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 86729e2d3f..80bf87cd43 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -252,7 +252,9 @@
           tip.appendChild(document.createTextNode(" — " + data.doc));
         if (data.url) {
           tip.appendChild(document.createTextNode(" "));
-          tip.appendChild(elt("a", null, "[docs]")).href = data.url;
+          var child = tip.appendChild(elt("a", null, "[docs]"));
+          child.href = data.url;
+          child.target = "_blank";
         }
       }
       tempTooltip(cm, tip);

From 41a740b19baf1db5409a09844bcb45bf2235e908 Mon Sep 17 00:00:00 2001
From: Aliaksei Chapyzhenka <alex.drom@gmail.com>
Date: Tue, 27 Jan 2015 20:06:47 -0800
Subject: [PATCH 1860/4742] [colorforth theme] Add

---
 mode/forth/index.html | 14 +++++++++++---
 theme/colorforth.css  | 31 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 theme/colorforth.css

diff --git a/mode/forth/index.html b/mode/forth/index.html
index 711d387cd8..ae8cd34584 100644
--- a/mode/forth/index.html
+++ b/mode/forth/index.html
@@ -4,10 +4,17 @@
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
 
+<link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'>
 <link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel=stylesheet href="../../theme/colorforth.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="forth.js"></script>
-<style>.CodeMirror {border: 2px inset #dee;}</style>
+<style>
+.CodeMirror {
+    font-family: 'Droid Sans Mono', monospace;
+    font-size: 14px;
+}
+</style>
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
@@ -46,8 +53,8 @@ <h2>Forth mode</h2>
 : sort ( array len -- )
   1 ?do
     dup i cells + insert
-  loop drop ;
-</textarea></form>
+  loop drop ;</textarea>
+  </form>
 
 <script>
   var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
@@ -56,6 +63,7 @@ <h2>Forth mode</h2>
     indentUnit: 2,
     tabSize: 2,
     autofocus: true,
+    theme: "colorforth",
     mode: "text/x-forth"
   });
 </script>
diff --git a/theme/colorforth.css b/theme/colorforth.css
new file mode 100644
index 0000000000..a54e45a91e
--- /dev/null
+++ b/theme/colorforth.css
@@ -0,0 +1,31 @@
+.cm-s-colorforth.CodeMirror { background: #000000; color: #f8f8f8; }
+.cm-s-colorforth .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
+.cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
+.cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
+.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-colorforth span.cm-comment     { color: #ededed; }
+.cm-s-colorforth span.cm-def         { color: #ff1c1c; font-weight:bold; }
+.cm-s-colorforth span.cm-keyword     { color: #ffd900; }
+.cm-s-colorforth span.cm-builtin     { color: #00d95a; }
+.cm-s-colorforth span.cm-variable    { color: #73ff00; }
+.cm-s-colorforth span.cm-string      { color: #007bff; }
+.cm-s-colorforth span.cm-number      { color: #00c4ff; }
+.cm-s-colorforth span.cm-atom        { color: #606060; }
+
+.cm-s-colorforth span.cm-variable-2  { color: #EEE; }
+.cm-s-colorforth span.cm-variable-3  { color: #DDD; }
+.cm-s-colorforth span.cm-property    {}
+.cm-s-colorforth span.cm-operator    {}
+
+.cm-s-colorforth span.cm-meta        { color: yellow; }
+.cm-s-colorforth span.cm-qualifier   { color: #FFF700; }
+.cm-s-colorforth span.cm-bracket     { color: #cc7; }
+.cm-s-colorforth span.cm-tag         { color: #FFBD40; }
+.cm-s-colorforth span.cm-attribute   { color: #FFF700; }
+.cm-s-colorforth span.cm-error       { color: #f00; }
+
+.cm-s-colorforth .CodeMirror-selected { background: #333d53 !important; }
+
+.cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }

From c2ee561857e607f0941e6c1effa503399335d199 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Jan 2015 11:28:37 +0100
Subject: [PATCH 1861/4742] [colorforth theme] Integrate

Issue #3053
---
 demo/theme.html      | 2 ++
 theme/colorforth.css | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/demo/theme.html b/demo/theme.html
index e951c84c36..22b59b7fdc 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -12,6 +12,7 @@
 <link rel="stylesheet" href="../theme/base16-light.css">
 <link rel="stylesheet" href="../theme/blackboard.css">
 <link rel="stylesheet" href="../theme/cobalt.css">
+<link rel="stylesheet" href="../theme/colorforth.css">
 <link rel="stylesheet" href="../theme/eclipse.css">
 <link rel="stylesheet" href="../theme/elegant.css">
 <link rel="stylesheet" href="../theme/erlang-dark.css">
@@ -81,6 +82,7 @@ <h2>Theme Demo</h2>
     <option>base16-light</option>
     <option>blackboard</option>
     <option>cobalt</option>
+    <option>colorforth</option>
     <option>eclipse</option>
     <option>elegant</option>
     <option>erlang-dark</option>
diff --git a/theme/colorforth.css b/theme/colorforth.css
index a54e45a91e..73fbf80824 100644
--- a/theme/colorforth.css
+++ b/theme/colorforth.css
@@ -29,3 +29,5 @@
 .cm-s-colorforth .CodeMirror-selected { background: #333d53 !important; }
 
 .cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
+
+.cm-s-colorforth .CodeMirror-activeline-background {background: #253540 !important;}

From ac72e8d23653c473c6754f11bc8230102503e65d Mon Sep 17 00:00:00 2001
From: Dmitry Kiselyov <dmitrykiselyov@ukr.net>
Date: Sun, 25 Jan 2015 14:30:34 +0200
Subject: [PATCH 1862/4742] [stylus mode] Add

---
 mode/stylus/index.html | 105 ++++++++++
 mode/stylus/stylus.js  | 444 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 549 insertions(+)
 create mode 100644 mode/stylus/index.html
 create mode 100644 mode/stylus/stylus.js

diff --git a/mode/stylus/index.html b/mode/stylus/index.html
new file mode 100644
index 0000000000..3995a2d0ef
--- /dev/null
+++ b/mode/stylus/index.html
@@ -0,0 +1,105 @@
+<!doctype html>
+
+<title>CodeMirror: Stylus mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../addon/hint/show-hint.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="stylus.js"></script>
+<script src="../../addon/hint/show-hint.js"></script>
+<script src="../../addon/hint/css-hint.js"></script>
+<style>.CodeMirror {background: #f8f8f8;} form{margin-bottom: .7em;}</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="#">Stylus</a>
+  </ul>
+</div>
+
+<article>
+<h2>Stylus mode</h2>
+<form>
+    <textarea id="code" name="code">
+/* Stylus mode */
+#id
+.class
+article
+  font-family Arial, sans-serif
+
+#id,
+.class,
+article {
+  font-family: Arial, sans-serif;
+}
+
+// Variables
+font-size-base = 16px
+line-height-base = 1.5
+font-family-base = "Helvetica Neue", Helvetica, Arial, sans-serif
+text-color = lighten(#000, 20%)
+
+body
+  font font-size-base/line-height-base font-family-base
+  color text-color
+
+body {
+  font: 400 16px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #333;
+}
+
+// Variables
+link-color = darken(#428bca, 6.5%)
+link-hover-color = darken(link-color, 15%)
+link-decoration = none
+link-hover-decoration = false
+
+// Mixin
+tab-focus()
+  outline thin dotted
+  outline 5px auto -webkit-focus-ring-color
+  outline-offset -2px
+
+a
+  color link-color
+  if link-decoration
+    text-decoration link-decoration
+  &:hover
+  &:focus
+    color link-hover-color
+    if link-hover-decoration
+      text-decoration link-hover-decoration
+  &:focus
+    tab-focus()
+
+a {
+  color: #3782c4;
+  text-decoration: none;
+}
+a:hover,
+a:focus {
+  color: #2f6ea7;
+}
+a:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+  </textarea>
+  </form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        extraKeys: {"Ctrl-Space": "autocomplete"},
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-styl</code>.</p>
+
+  </article>
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
new file mode 100644
index 0000000000..6f7c754425
--- /dev/null
+++ b/mode/stylus/stylus.js
@@ -0,0 +1,444 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("stylus", function(config) {
+
+    var operatorsRegexp = /^(\?:?|\+[+=]?|-[\-=]?|\*[\*=]?|\/=?|[=!:\?]?=|<=?|>=?|%=?|&&|\|=?|\~|!|\^|\\)/,
+        delimitersRegexp = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/,
+        wordOperatorsRegexp = wordRegexp(wordOperators),
+        commonKeywordsRegexp = wordRegexp(commonKeywords),
+        commonAtomsRegexp = wordRegexp(commonAtoms),
+        commonDefRegexp = wordRegexp(commonDef),
+        vendorPrefixesRegexp = new RegExp(/^\-(moz|ms|o|webkit)-/),
+        cssValuesWithBracketsRegexp = new RegExp("^(" + cssValuesWithBrackets_.join("|") + ")\\([\\w\-\\#\\,\\.\\%\\s\\(\\)]*\\)");
+
+    var tokenBase = function(stream, state) {
+
+      if (stream.eatSpace()) return null;
+
+      var ch = stream.peek();
+
+      // Single line Comment
+      if (stream.match('//')) {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      // Multiline Comment
+      if (stream.match('/*')) {
+        state.tokenizer = multilineComment;
+        return state.tokenizer(stream, state);
+      }
+
+      // Strings
+      if (ch === '"' || ch === "'") {
+        stream.next();
+        state.tokenizer = buildStringTokenizer(ch);
+        return "string";
+      }
+
+      // Def
+      if (ch === "@") {
+        stream.next();
+        if (stream.match(/extend/)) {
+          dedent(state); // remove indentation after selectors
+        } else if (stream.match(/media[\w-\s]*[\w-]/)) {
+          indent(state);
+        } else if(stream.eatWhile(/[\w-]/)) {
+          if(stream.current().match(commonDefRegexp)) {
+            indent(state);
+          }
+        }
+        return "def";
+      }
+
+      // Number
+      if (stream.match(/^-?[0-9\.]/, false)) {
+
+        // Floats
+        if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i) || stream.match(/^-?\d+\.\d*/)) {
+
+          // Prevent from getting extra . on 1..
+          if (stream.peek() == ".") {
+            stream.backUp(1);
+          }
+          // Units
+          stream.eatWhile(/[a-z%]/i);
+          return "number";
+        }
+        // Integers
+        if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/) || stream.match(/^-?0(?![\dx])/i)) {
+          // Units
+          stream.eatWhile(/[a-z%]/i);
+          return "number";
+        }
+      }
+
+      // Hex color and id selector
+      if (ch === "#") {
+        stream.next();
+
+        // Hex color
+        if (stream.match(/^[0-9a-f]{6}|[0-9a-f]{3}/i)) {
+          return "atom";
+        }
+
+        // ID selector
+        if (stream.match(/^[\w-]+/i)) {
+          indent(state);
+          return "builtin";
+        }
+      }
+
+      // Vendor prefixes
+      if (stream.match(vendorPrefixesRegexp)) {
+        return "meta";
+      }
+
+      // Gradients and animation as CSS value
+      if (stream.match(cssValuesWithBracketsRegexp)) {
+        return "atom";
+      }
+
+      // Mixins / Functions with indentation
+      if (stream.sol() && stream.match(/^\.?[a-z][\w-]*\(/i)) {
+        stream.backUp(1);
+        indent(state);
+        return "keyword";
+      }
+
+      // Mixins / Functions
+      if (stream.match(/^\.?[a-z][\w-]*\(/i)) {
+        stream.backUp(1);
+        return "keyword";
+      }
+
+      // +Block mixins
+      if (stream.match(/^(\+|\-)[a-z][\w-]+\(/i)) {
+        stream.backUp(1);
+        indent(state);
+        return "keyword";
+      }
+
+      // url tokens
+      if (stream.match(/^url/) && stream.peek() === "(") {
+        state.tokenizer = urlTokens;
+        if(!stream.peek()) {
+          state.cursorHalf = 0;
+        }
+        return "atom";
+      }
+
+      // Class
+      if (stream.match(/^\.[a-z][\w-]*/i)) {
+        indent(state);
+        return "qualifier";
+      }
+
+      // & Parent Reference with BEM naming
+      if (stream.match(/^(_|__|-|--)[a-z0-9-]+/)) {
+        return "qualifier";
+      }
+
+      // Pseudo elements/classes
+      if (ch == ':' && stream.match(/^::?[\w-]+/)) {
+        indent(state);
+        return "variable-3";
+      }
+
+      // Conditionals
+      if (stream.match(wordRegexp(["for", "if", "else", "unless"]))) {
+        indent(state);
+        return "keyword";
+      }
+
+      // Keywords
+      if (stream.match(commonKeywordsRegexp)) {
+        return "keyword";
+      }
+
+      // Atoms
+      if (stream.match(commonAtomsRegexp)) {
+        return "atom";
+      }
+
+      // Variables
+      if (stream.match(/^\$?[a-z][\w-]+\s?=(\s|[\w-'"\$])/i)) {
+        stream.backUp(2);
+        var cssPropertie = stream.current().toLowerCase().match(/[\w-]+/)[0];
+        return cssProperties[cssPropertie] === undefined ? "variable-2" : "property";
+      } else if (stream.match(/\$[\w-\.]+/i)) {
+        return "variable-2";
+      } else if (stream.match(/\$?[\w-]+\.[\w-]+/i)) {
+        var cssTypeSelector = stream.current().toLowerCase().match(/[\w]+/)[0];
+        if(cssTypeSelectors[cssTypeSelector] === undefined) {
+          return "variable-2";
+        } else stream.backUp(stream.current().length);
+      }
+
+      // !important
+      if (ch === "!") {
+        stream.next();
+        return stream.match(/^[\w]+/) ? "keyword": "operator";
+      }
+
+      // / Root Reference
+      if (stream.match(/^\/(:|\.|#|[a-z])/)) {
+        stream.backUp(1);
+        return "variable-3";
+      }
+
+      // Operators and delimiters
+      if (stream.match(operatorsRegexp) || stream.match(wordOperatorsRegexp)) {
+        return "operator";
+      }
+      if (stream.match(delimitersRegexp)) {
+        return null;
+      }
+
+      // & Parent Reference
+      if (ch === "&") {
+        stream.next();
+        return "variable-3";
+      }
+
+      // Font family
+      if (stream.match(/^[A-Z][a-z0-9-]+/)) {
+        return "string";
+      }
+
+      // CSS rule
+      // NOTE: Some css selectors and property values have the same name
+      // (embed, menu, pre, progress, sub, table),
+      // so they will have the same color (.cm-atom).
+      if (stream.match(/[\w-]*/i)) {
+
+        var word = stream.current().toLowerCase();
+
+        if(cssProperties[word] !== undefined) {
+          // CSS property
+          if(!stream.eol())
+            return "property";
+          else
+            return "variable-2";
+
+        } else if(cssValues[word] !== undefined) {
+          // CSS value
+          return "atom";
+
+        } else if(cssTypeSelectors[word] !== undefined) {
+          // CSS type selectors
+          indent(state);
+          return "tag";
+
+        } else if(word) {
+          // By default variable-2
+          return "variable-2";
+        }
+      }
+
+      // Handle non-detected items
+      stream.next();
+      return null;
+
+    };
+
+    var tokenLexer = function(stream, state) {
+
+      if (stream.sol()) {
+        state.indentCount = 0;
+      }
+
+      var style = state.tokenizer(stream, state);
+      var current = stream.current();
+
+      if (stream.eol() && (current === "}" || current === ",")) {
+        dedent(state);
+      }
+
+      if (style !== null) {
+        var startOfToken = stream.pos - current.length;
+        var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);
+
+        var newScopes = [];
+
+        for (var i = 0; i < state.scopes.length; i++) {
+          var scope = state.scopes[i];
+
+          if (scope.offset <= withCurrentIndent) {
+            newScopes.push(scope);
+          }
+        }
+
+        state.scopes = newScopes;
+      }
+
+      return style;
+    };
+
+    return {
+      startState: function() {
+        return {
+          tokenizer: tokenBase,
+          scopes: [{offset: 0, type: 'styl'}]
+        };
+      },
+
+      token: function(stream, state) {
+        var style = tokenLexer(stream, state);
+        state.lastToken = { style: style, content: stream.current() };
+        return style;
+      },
+
+      indent: function(state) {
+        return state.scopes[0].offset;
+      },
+
+      lineComment: "//",
+      fold: "indent"
+
+    };
+
+    function urlTokens(stream, state) {
+      var ch = stream.peek();
+
+      if (ch === ")") {
+        stream.next();
+        state.tokenizer = tokenBase;
+        return "operator";
+      } else if (ch === "(") {
+        stream.next();
+        stream.eatSpace();
+
+        return "operator";
+      } else if (ch === "'" || ch === '"') {
+        state.tokenizer = buildStringTokenizer(stream.next());
+        return "string";
+      } else {
+        state.tokenizer = buildStringTokenizer(")", false);
+        return "string";
+      }
+    }
+
+    function multilineComment(stream, state) {
+      if (stream.skipTo("*/")) {
+        stream.next();
+        stream.next();
+        state.tokenizer = tokenBase;
+      } else {
+        stream.next();
+      }
+      return "comment";
+    }
+
+    function buildStringTokenizer(quote, greedy) {
+
+      if(greedy == null) {
+        greedy = true;
+      }
+
+      function stringTokenizer(stream, state) {
+        var nextChar = stream.next();
+        var peekChar = stream.peek();
+        var previousChar = stream.string.charAt(stream.pos-2);
+
+        var endingString = ((nextChar !== "\\" && peekChar === quote) ||
+                            (nextChar === quote && previousChar !== "\\"));
+
+        if (endingString) {
+          if (nextChar !== quote && greedy) {
+            stream.next();
+          }
+          state.tokenizer = tokenBase;
+          return "string";
+        } else if (nextChar === "#" && peekChar === "{") {
+          state.tokenizer = buildInterpolationTokenizer(stringTokenizer);
+          stream.next();
+          return "operator";
+        } else {
+          return "string";
+        }
+      }
+
+      return stringTokenizer;
+    }
+
+    function buildInterpolationTokenizer(currentTokenizer) {
+      return function(stream, state) {
+        if (stream.peek() === "}") {
+          stream.next();
+          state.tokenizer = currentTokenizer;
+          return "operator";
+        } else {
+          return tokenBase(stream, state);
+        }
+      };
+    }
+
+    function indent(state) {
+      if (state.indentCount == 0) {
+        state.indentCount++;
+        var lastScopeOffset = state.scopes[0].offset;
+        var currentOffset = lastScopeOffset + config.indentUnit;
+        state.scopes.unshift({ offset:currentOffset });
+      }
+    }
+
+    function dedent(state) {
+      if (state.scopes.length == 1) { return true; }
+      state.scopes.shift();
+    }
+
+  });
+
+  // https://developer.mozilla.org/en-US/docs/Web/HTML/Element
+  var cssTypeSelectors_ = ["a","abbr","address","area","article","aside","audio", "b", "base","bdi","bdo","bgsound","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","marquee","menu","menuitem","meta","meter","nav","nobr","noframes","noscript","object","ol","optgroup","option","output","p","param","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","title","tr","track","u","ul","var","video","wbr"];
+  // https://github.com/csscomb/csscomb.js/blob/master/config/zen.json
+  var cssProperties_ = ["position","top","right","bottom","left","z-index","display","visibility","flex-direction","flex-order","flex-pack","float","clear","flex-align","overflow","overflow-x","overflow-y","overflow-scrolling","clip","box-sizing","margin","margin-top","margin-right","margin-bottom","margin-left","padding","padding-top","padding-right","padding-bottom","padding-left","min-width","min-height","max-width","max-height","width","height","outline","outline-width","outline-style","outline-color","outline-offset","border","border-spacing","border-collapse","border-width","border-style","border-color","border-top","border-top-width","border-top-style","border-top-color","border-right","border-right-width","border-right-style","border-right-color","border-bottom","border-bottom-width","border-bottom-style","border-bottom-color","border-left","border-left-width","border-left-style","border-left-color","border-radius","border-top-left-radius","border-top-right-radius","border-bottom-right-radius","border-bottom-left-radius","border-image","border-image-source","border-image-slice","border-image-width","border-image-outset","border-image-repeat","border-top-image","border-right-image","border-bottom-image","border-left-image","border-corner-image","border-top-left-image","border-top-right-image","border-bottom-right-image","border-bottom-left-image","background","filter:progid:DXImageTransform\\.Microsoft\\.AlphaImageLoader","background-color","background-image","background-attachment","background-position","background-position-x","background-position-y","background-clip","background-origin","background-size","background-repeat","box-decoration-break","box-shadow","color","table-layout","caption-side","empty-cells","list-style","list-style-position","list-style-type","list-style-image","quotes","content","counter-increment","counter-reset","writing-mode","vertical-align","text-align","text-align-last","text-decoration","text-emphasis","text-emphasis-position","text-emphasis-style","text-emphasis-color","text-indent","-ms-text-justify","text-justify","text-outline","text-transform","text-wrap","text-overflow","text-overflow-ellipsis","text-overflow-mode","text-size-adjust","text-shadow","white-space","word-spacing","word-wrap","word-break","tab-size","hyphens","letter-spacing","font","font-weight","font-style","font-variant","font-size-adjust","font-stretch","font-size","font-family","src","line-height","opacity","filter:\\\\\\\\'progid:DXImageTransform.Microsoft.Alpha","filter:progid:DXImageTransform.Microsoft.Alpha\\(Opacity","interpolation-mode","filter","resize","cursor","nav-index","nav-up","nav-right","nav-down","nav-left","transition","transition-delay","transition-timing-function","transition-duration","transition-property","transform","transform-origin","animation","animation-name","animation-duration","animation-play-state","animation-timing-function","animation-delay","animation-iteration-count","animation-direction","pointer-events","unicode-bidi","direction","columns","column-span","column-width","column-count","column-fill","column-gap","column-rule","column-rule-width","column-rule-style","column-rule-color","break-before","break-inside","break-after","page-break-before","page-break-inside","page-break-after","orphans","widows","zoom","max-zoom","min-zoom","user-zoom","orientation","text-rendering","speak","animation-fill-mode","backface-visibility","user-drag","user-select","appearance"];
+  // https://github.com/codemirror/CodeMirror/blob/master/mode/css/css.js#L501
+  var cssValues_ = ["above","absolute","activeborder","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","cambodian","capitalize","caps-lock-indicator","captiontext","caret","cell","center","checkbox","circle","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","content-box","context-menu","continuous","copy","cover","crop","cross","crosshair","currentcolor","cursive","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ew-resize","expanded","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-table","inset","inside","intrinsic","invert","italic","justify","kannada","katakana","katakana-iroha","keep-all","khmer","landscape","lao","large","larger","left","level","lighter","line-through","linear","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","single","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","telugu","text","text-bottom","text-top","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale"];
+  var cssColorValues_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
+  var cssValuesWithBrackets_ = ["gradient","linear-gradient","radial-gradient","repeating-linear-gradient","repeating-radial-gradient","cubic-bezier","translateX","translateY","translate3d","rotate3d","scale","scale3d","perspective","skewX"];
+
+  var wordOperators = ["in", "and", "or", "not", "is a", "is", "isnt", "defined", "if unless"],
+      commonKeywords = ["for", "if", "else", "unless", "return"],
+      commonAtoms = ["null", "true", "false", "href", "title", "type", "not-allowed", "readonly", "disabled"],
+      commonDef = ["@font-face", "@keyframes", "@media", "@viewport", "@page", "@host", "@supports", "@block", "@css"],
+      cssTypeSelectors = keySet(cssTypeSelectors_),
+      cssProperties = keySet(cssProperties_),
+      cssValues = keySet(cssValues_.concat(cssColorValues_)),
+      hintWords = wordOperators.concat(commonKeywords,
+                                       commonAtoms,
+                                       commonDef,
+                                       cssTypeSelectors_,
+                                       cssProperties_,
+                                       cssValues_,
+                                       cssValuesWithBrackets_,
+                                       cssColorValues_);
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  };
+
+  function keySet(array) {
+    var keys = {};
+    for (var i = 0; i < array.length; ++i) {
+      keys[array[i]] = true;
+    }
+    return keys;
+  };
+
+  CodeMirror.registerHelper("hintWords", "stylus", hintWords);
+  CodeMirror.defineMIME("text/x-styl", "stylus");
+
+});

From fd7265a21bd97dedf4f663a275e662ac8c1175c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Jan 2015 12:11:33 +0100
Subject: [PATCH 1863/4742] [stylus mode] Integrate

Issue #3047
---
 doc/compress.html      |  1 +
 mode/index.html        |  1 +
 mode/stylus/index.html | 21 ++++++++++-----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index b572c09dac..eb7547691d 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -174,6 +174,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/soy/soy.js">soy.js</option>
           <option value="http://codemirror.net/mode/sparql/sparql.js">sparql.js</option>
           <option value="http://codemirror.net/mode/spreadsheet/spreadsheet.js">spreadsheet.js</option>
+          <option value="http://codemirror.net/mode/stylus/stylus.js">stylus.js</option>
           <option value="http://codemirror.net/mode/sql/sql.js">sql.js</option>
           <option value="http://codemirror.net/mode/stex/stex.js">stex.js</option>
           <option value="http://codemirror.net/mode/tcl/tcl.js">tcl.js</option>
diff --git a/mode/index.html b/mode/index.html
index d934f7e0e9..04167a5a54 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -109,6 +109,7 @@ <h2>Language modes</h2>
       <li><a href="smartymixed/index.html">Smarty/HTML mixed</a></li>
       <li><a href="solr/index.html">Solr</a></li>
       <li><a href="soy/index.html">Soy</a></li>
+      <li><a href="stylus/index.html">Stylus</a></li>
       <li><a href="sql/index.html">SQL</a> (several dialects)</li>
       <li><a href="sparql/index.html">SPARQL</a></li>
       <li><a href="stex/index.html">sTeX, LaTeX</a></li>
diff --git a/mode/stylus/index.html b/mode/stylus/index.html
index 3995a2d0ef..354bf30328 100644
--- a/mode/stylus/index.html
+++ b/mode/stylus/index.html
@@ -26,8 +26,7 @@
 
 <article>
 <h2>Stylus mode</h2>
-<form>
-    <textarea id="code" name="code">
+<form><textarea id="code" name="code">
 /* Stylus mode */
 #id
 .class
@@ -92,14 +91,14 @@ <h2>Stylus mode</h2>
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-  </textarea>
-  </form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        extraKeys: {"Ctrl-Space": "autocomplete"},
-      });
-    </script>
+</textarea>
+</form>
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    extraKeys: {"Ctrl-Space": "autocomplete"},
+  });
+</script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-styl</code>.</p>
+<p><strong>MIME types defined:</strong> <code>text/x-styl</code>.</p>
 
-  </article>
+</article>

From 4baed8daa2acc12a2b5eaa4e5e0a9f1bc2c790b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Jan 2015 12:30:17 +0100
Subject: [PATCH 1864/4742] [lint addon] When checking whether node is still in
 document, account for shadow dom

Issue #3039
---
 addon/lint/lint.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 66f187e22e..ef97f35f5c 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -46,6 +46,7 @@
     }
     var poll = setInterval(function() {
       if (tooltip) for (var n = node;; n = n.parentNode) {
+        if (n && n.nodeType == 11) n = n.root;
         if (n == document.body) return;
         if (!n) { hide(); break; }
       }

From 29009e6b5bf51e306e4f572dd939f788795958ea Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Jan 2015 12:36:22 +0100
Subject: [PATCH 1865/4742] [tern addon] Don't show multiple tooltips at once

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

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 80bf87cd43..a5c4408885 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -584,9 +584,11 @@
   // Tooltips
 
   function tempTooltip(cm, content) {
+    if (cm.state.ternTooltip) remove(cm.state.ternTooltip);
     var where = cm.cursorCoords();
-    var tip = makeTooltip(where.right + 1, where.bottom, content);
+    var tip = cm.state.ternTooltip = makeTooltip(where.right + 1, where.bottom, content);
     function clear() {
+      cm.state.ternTooltip = null;
       if (!tip.parentNode) return;
       cm.off("cursorActivity", clear);
       fadeOut(tip);

From 9c6fb77ce510d0a2b8d856d63d94600dff5677d7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Jan 2015 12:43:26 +0100
Subject: [PATCH 1866/4742] Make contains shadow-dom aware, and export it

---
 lib/codemirror.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b89dc1c101..ad470a9da9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7578,12 +7578,14 @@
     return removeChildren(parent).appendChild(e);
   }
 
-  function contains(parent, child) {
+  var contains = CodeMirror.contains = function(parent, child) {
     if (parent.contains)
       return parent.contains(child);
-    while (child = child.parentNode)
+    while (child = child.parentNode) {
+      if (child.nodeType == 11) child = child.root;
       if (child == parent) return true;
-  }
+    }
+  };
 
   function activeElt() { return document.activeElement; }
   // Older versions of IE throws unspecified error when touching

From 791fe00bf79d8d9b81c7e99fac434cf79d282189 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Jan 2015 12:44:05 +0100
Subject: [PATCH 1867/4742] [tern addon] Don't auto-hide tooltips when mouse
 hovers over them

Issue #3055
---
 addon/tern/tern.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index a5c4408885..d8bf9d7288 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -587,13 +587,25 @@
     if (cm.state.ternTooltip) remove(cm.state.ternTooltip);
     var where = cm.cursorCoords();
     var tip = cm.state.ternTooltip = makeTooltip(where.right + 1, where.bottom, content);
+    function maybeClear() {
+      old = true;
+      if (!mouseOnTip) clear();
+    }
     function clear() {
       cm.state.ternTooltip = null;
       if (!tip.parentNode) return;
       cm.off("cursorActivity", clear);
       fadeOut(tip);
     }
-    setTimeout(clear, 1700);
+    var mouseOnTip = false, old = false;
+    CodeMirror.on(tip, "mousemove", function() { mouseOnTip = true; });
+    CodeMirror.on(tip, "mouseout", function(e) {
+      if (!CodeMirror.contains(tip, e.relatedTarget || e.toElement)) {
+        if (old) clear();
+        else mouseOnTip = false;
+      }
+    });
+    setTimeout(maybeClear, 1700);
     cm.on("cursorActivity", clear);
   }
 

From 762568de366965e1df26b8f7ac203317aebfa712 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Jan 2015 12:46:14 +0100
Subject: [PATCH 1868/4742] git-ignore all test files in project root

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

diff --git a/.gitignore b/.gitignore
index b720b9be07..f91c241f20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /node_modules
 /npm-debug.log
-test.html
+/test*.html
 .tern-*
 *~
 *.swp

From b00260068e81bf93c8653e92eaa54654d448fcfb Mon Sep 17 00:00:00 2001
From: mihailik <mihailik@gmail.com>
Date: Fri, 30 Jan 2015 18:17:46 +0000
Subject: [PATCH 1869/4742] [tern addon] Make tooltip go away on scroll or blur

Easiest to see the difference on touch-enabled device. Go to Tern demo
page (link below), click on a variable name and press Ctrl+I. Now pan
the editor's content. The tooltip stays at a fixed position, whilst
the variable name detaches and moves off.

The fix listens to scroll and blur, switching the tooltip off.
---
 addon/tern/tern.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index d8bf9d7288..c1938012ca 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -595,6 +595,8 @@
       cm.state.ternTooltip = null;
       if (!tip.parentNode) return;
       cm.off("cursorActivity", clear);
+      cm.off('blur', clear);
+      cm.off('scroll', clear);
       fadeOut(tip);
     }
     var mouseOnTip = false, old = false;
@@ -607,6 +609,8 @@
     });
     setTimeout(maybeClear, 1700);
     cm.on("cursorActivity", clear);
+    cm.on('blur', clear);
+    cm.on('scroll', clear);
   }
 
   function makeTooltip(x, y, content) {

From 34622a2690493742c4246c04ad3fdc0d8f27ab50 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Jan 2015 22:59:02 +0100
Subject: [PATCH 1870/4742] Fix shadow dom traversal

Use host property, not root.
---
 addon/lint/lint.js | 2 +-
 lib/codemirror.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index ef97f35f5c..cc25ad6143 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -46,7 +46,7 @@
     }
     var poll = setInterval(function() {
       if (tooltip) for (var n = node;; n = n.parentNode) {
-        if (n && n.nodeType == 11) n = n.root;
+        if (n && n.nodeType == 11) n = n.host;
         if (n == document.body) return;
         if (!n) { hide(); break; }
       }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ad470a9da9..17e582c6d8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7582,7 +7582,7 @@
     if (parent.contains)
       return parent.contains(child);
     while (child = child.parentNode) {
-      if (child.nodeType == 11) child = child.root;
+      if (child.nodeType == 11) child = child.host;
       if (child == parent) return true;
     }
   };

From 2c9fb8365cf1f076c387badd76dfa23326f134ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Giovanni=20Cal=C3=B2?= <giovanni.calo@live.it>
Date: Mon, 2 Feb 2015 02:38:05 +0100
Subject: [PATCH 1871/4742] [javascript mode] Disallow repeating regular
 expressions

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 93df06d152..a1a7a98c73 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -118,7 +118,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
                state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
         readRegexp(stream);
-        stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla
+        stream.match(/^\b(([gimy])(?!.*\2))+\b/); // 'y' is "sticky" option in Mozilla
         return ret("regexp", "string-2");
       } else {
         stream.eatWhile(isOperatorChar);

From a7d44a52b26a6012952d671f1f09f4f47d34fbf5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 2 Feb 2015 22:37:45 +0100
Subject: [PATCH 1872/4742] [javascript mode] Support 'u' regex flag, and fix
 repeat flag detection

Issue #3063
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index a1a7a98c73..3f05ac46c3 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -118,7 +118,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
                state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
         readRegexp(stream);
-        stream.match(/^\b(([gimy])(?!.*\2))+\b/); // 'y' is "sticky" option in Mozilla
+        stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
         return ret("regexp", "string-2");
       } else {
         stream.eatWhile(isOperatorChar);

From 752c785f83f49b9ef43bfc2d85b5f6080bc1a51c Mon Sep 17 00:00:00 2001
From: KwanEsq <kwan@perix.co.uk>
Date: Mon, 2 Feb 2015 11:07:38 +0000
Subject: [PATCH 1873/4742] [css mode] teach it about CSS variables

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 3f02907ed5..e4bbf9aa16 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -57,6 +57,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       if (/[\d.]/.test(stream.peek())) {
         stream.eatWhile(/[\w.%]/);
         return ret("number", "unit");
+      } else if (stream.match(/^-[\w\\\-]+/)) {
+        stream.eatWhile(/[\w\\\-]/);
+        if (stream.match(/^\s*:/, false))
+          return ret("variable-2", "variable-definition");
+        return ret("variable-2", "variable");
       } else if (stream.match(/^\w+-/)) {
         return ret("meta", "meta");
       }

From 941916482d529571198e410b32ca609f76ba7a7b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 2 Feb 2015 22:44:50 +0100
Subject: [PATCH 1874/4742] [css mode] Add test for css variables

Issue #3064
---
 mode/css/test.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mode/css/test.js b/mode/css/test.js
index d236e2a738..b36c53e2e4 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -132,4 +132,12 @@
      "    [variable fade]([atom #000], [number 20%]) [number 100%]",
      "  );",
      "}");
+
+  MT("css_variable",
+     ":[variable-3 root] {",
+     "  [variable-2 --main-color]: [atom #06c];",
+     "}",
+     "[tag h1][builtin #foo] {",
+     "  [property color]: [variable var]([variable-2 --main-color]);",
+     "}");
 })();

From 6b9511d11d227aa2b971d239b45ca698a3060714 Mon Sep 17 00:00:00 2001
From: KwanEsq <kwan@perix.co.uk>
Date: Mon, 2 Feb 2015 12:03:21 +0000
Subject: [PATCH 1875/4742] [css mode] teach it about @supports

Add support for the @supports rule
---
 mode/css/css.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/mode/css/css.js b/mode/css/css.js
index e4bbf9aa16..14ad4fa52c 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -153,6 +153,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return pushContext(state, stream, "block");
     } else if (type == "}" && state.context.prev) {
       return popContext(state);
+    } else if (type == "@supports") {
+      return pushContext(state, stream, "supports");
     } else if (type == "@media") {
       return pushContext(state, stream, "media");
     } else if (type == "@font-face") {
@@ -271,6 +273,33 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return states.media(type, stream, state);
   };
 
+  states.supports = function(type, stream, state) {
+    if (type == "(") return pushContext(state, stream, "supports_parens");
+    if (type == "}") return popAndPass(type, stream, state);
+    if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
+
+    if (type == "word") {
+      var word = stream.current().toLowerCase();
+      if (word == "not" || word == "and" || word == "or")
+        override = "keyword";
+      else if (propertyKeywords.hasOwnProperty(word))
+        override = "property";
+      else if (nonStandardPropertyKeywords.hasOwnProperty(word))
+        override = "string-2";
+      else if (valueKeywords.hasOwnProperty(word))
+        override = "atom";
+      else
+        override = "error";
+    }
+    return state.context.type;
+  };
+
+  states.supports_parens = function(type, stream, state) {
+    if (type == ")") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
+    return states.supports(type, stream, state);
+  };
+
   states.font_face_before = function(type, stream, state) {
     if (type == "{")
       return pushContext(state, stream, "font_face");

From 3469f317b5ebbeaf394b1409c25d402448955151 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 2 Feb 2015 23:38:37 +0100
Subject: [PATCH 1876/4742] [css mode] Add test for @supports

Issue #3066
---
 mode/css/test.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mode/css/test.js b/mode/css/test.js
index b36c53e2e4..47f6516909 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -140,4 +140,9 @@
      "[tag h1][builtin #foo] {",
      "  [property color]: [variable var]([variable-2 --main-color]);",
      "}");
+
+  MT("supports",
+     "[def @supports] ([keyword not] (([property text-align-last]: [atom justify]) [keyword or] ([meta -moz-][property text-align-last]: [atom justify])) {",
+     "  [property text-align-last]: [atom justify];",
+     "}");
 })();

From 2d544462f25e5a0a622016d914725c6389742838 Mon Sep 17 00:00:00 2001
From: KwanEsq <kwan@perix.co.uk>
Date: Mon, 2 Feb 2015 23:14:27 +0000
Subject: [PATCH 1877/4742] [css mode] teach it about @document in a more
 general way

Teach it about @document in a more general way than my first attempt,
and also do @supports the same, by treating both them and @media as
atBlocks with shared word parsing
---
 mode/css/css.js | 47 ++++++++++++++++-------------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 14ad4fa52c..fc549a98cf 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -71,7 +71,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return ret("qualifier", "qualifier");
     } else if (/[:;{}\[\]\(\)]/.test(ch)) {
       return ret(null, ch);
-    } else if (ch == "u" && stream.match("rl(")) {
+    } else if ((ch == "u" && stream.match(/rl(-prefix)?\(/)) ||
+               (ch == "d" && stream.match("omain(")) ||
+               (ch == "r" && stream.match("egexp("))) {
       stream.backUp(1);
       state.tokenize = tokenParenthesized;
       return ret("property", "word");
@@ -153,10 +155,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return pushContext(state, stream, "block");
     } else if (type == "}" && state.context.prev) {
       return popContext(state);
-    } else if (type == "@supports") {
-      return pushContext(state, stream, "supports");
-    } else if (type == "@media") {
-      return pushContext(state, stream, "media");
+    } else if (/@(media|supports|(-moz-)?document)/.test(type)) {
+      return pushContext(state, stream, "atBlock");
     } else if (type == "@font-face") {
       return "font_face_before";
     } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
@@ -248,40 +248,21 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return pass(type, stream, state);
   };
 
-  states.media = function(type, stream, state) {
-    if (type == "(") return pushContext(state, stream, "media_parens");
+  states.atBlock = function(type, stream, state) {
+    if (type == "(") return pushContext(state, stream, "atBlock_parens");
     if (type == "}") return popAndPass(type, stream, state);
     if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
 
     if (type == "word") {
       var word = stream.current().toLowerCase();
-      if (word == "only" || word == "not" || word == "and")
+      if (word == "only" || word == "not" || word == "and" || word == "or")
         override = "keyword";
+      else if (documentTypes.hasOwnProperty(word))
+        override = "tag";
       else if (mediaTypes.hasOwnProperty(word))
         override = "attribute";
       else if (mediaFeatures.hasOwnProperty(word))
         override = "property";
-      else
-        override = "error";
-    }
-    return state.context.type;
-  };
-
-  states.media_parens = function(type, stream, state) {
-    if (type == ")") return popContext(state);
-    if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
-    return states.media(type, stream, state);
-  };
-
-  states.supports = function(type, stream, state) {
-    if (type == "(") return pushContext(state, stream, "supports_parens");
-    if (type == "}") return popAndPass(type, stream, state);
-    if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
-
-    if (type == "word") {
-      var word = stream.current().toLowerCase();
-      if (word == "not" || word == "and" || word == "or")
-        override = "keyword";
       else if (propertyKeywords.hasOwnProperty(word))
         override = "property";
       else if (nonStandardPropertyKeywords.hasOwnProperty(word))
@@ -294,10 +275,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return state.context.type;
   };
 
-  states.supports_parens = function(type, stream, state) {
+  states.atBlock_parens = function(type, stream, state) {
     if (type == ")") return popContext(state);
     if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
-    return states.supports(type, stream, state);
+    return states.atBlock(type, stream, state);
   };
 
   states.font_face_before = function(type, stream, state) {
@@ -387,6 +368,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return keys;
   }
 
+  var documentTypes_ = [
+    "domain", "regexp", "url", "url-prefix"
+  ], documentTypes = keySet(documentTypes_);
+
   var mediaTypes_ = [
     "all", "aural", "braille", "handheld", "print", "projection", "screen",
     "tty", "tv", "embossed"

From 5e3c995ffb1387556e6606a44bcc94eaf435b8c3 Mon Sep 17 00:00:00 2001
From: KwanEsq <kwan@perix.co.uk>
Date: Mon, 2 Feb 2015 23:16:44 +0000
Subject: [PATCH 1878/4742] [css mode] add @document tests

---
 mode/css/test.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/mode/css/test.js b/mode/css/test.js
index 47f6516909..407822bc30 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -145,4 +145,29 @@
      "[def @supports] ([keyword not] (([property text-align-last]: [atom justify]) [keyword or] ([meta -moz-][property text-align-last]: [atom justify])) {",
      "  [property text-align-last]: [atom justify];",
      "}");
+     
+   MT("document",
+      "[def @document] [tag url]([string http://blah]),",
+      "  [tag url-prefix]([string https://]),",
+      "  [tag domain]([string blah.com]),",
+      "  [tag regexp]([string \".*blah.+\"]) {",
+      "    [builtin #id] {",
+      "      [property background-color]: [keyword white];",
+      "    }",
+      "    [tag foo] {",
+      "      [property font-family]: [variable Verdana], [atom sans-serif];",
+      "    }",
+      "  }");
+     
+   MT("document_url",
+      "[def @document] [tag url]([string http://blah]) { [qualifier .class] { } }");
+     
+   MT("document_urlPrefix",
+      "[def @document] [tag url-prefix]([string https://]) { [builtin #id] { } }");
+     
+   MT("document_domain",
+      "[def @document] [tag domain]([string blah.com]) { [tag foo] { } }");
+     
+   MT("document_regexp",
+      "[def @document] [tag regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
 })();

From 6c5a432ae6e39ac49e1204187a6c4b6a940dead2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 3 Feb 2015 15:50:04 +0100
Subject: [PATCH 1879/4742] [css mode] Delete trailing whitespace from tests

---
 mode/css/test.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mode/css/test.js b/mode/css/test.js
index 407822bc30..3fed96936c 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -145,7 +145,7 @@
      "[def @supports] ([keyword not] (([property text-align-last]: [atom justify]) [keyword or] ([meta -moz-][property text-align-last]: [atom justify])) {",
      "  [property text-align-last]: [atom justify];",
      "}");
-     
+
    MT("document",
       "[def @document] [tag url]([string http://blah]),",
       "  [tag url-prefix]([string https://]),",
@@ -158,16 +158,16 @@
       "      [property font-family]: [variable Verdana], [atom sans-serif];",
       "    }",
       "  }");
-     
+
    MT("document_url",
       "[def @document] [tag url]([string http://blah]) { [qualifier .class] { } }");
-     
+
    MT("document_urlPrefix",
       "[def @document] [tag url-prefix]([string https://]) { [builtin #id] { } }");
-     
+
    MT("document_domain",
       "[def @document] [tag domain]([string blah.com]) { [tag foo] { } }");
-     
+
    MT("document_regexp",
       "[def @document] [tag regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
 })();

From 702de95780356454814208e881d5ebc9acf98bfa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Feb 2015 22:10:27 +0100
Subject: [PATCH 1880/4742] Ensure fromTextarea initialization is run before
 init hooks

Issue #3067
---
 lib/codemirror.js | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 17e582c6d8..382260b2e2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -110,6 +110,7 @@
     for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
       optionHandlers[opt](this, options[opt], Init);
     maybeUpdateLineNumberWidth(this);
+    if (options.finishInit) options.finishInit(this);
     for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
     endOperation(this);
     // Suppress optimizelegibility in Webkit, since it breaks text
@@ -5123,7 +5124,7 @@
   // FROMTEXTAREA
 
   CodeMirror.fromTextArea = function(textarea, options) {
-    if (!options) options = {};
+    options = options ? copyObj(options) : {};
     options.value = textarea.value;
     if (!options.tabindex && textarea.tabindex)
       options.tabindex = textarea.tabindex;
@@ -5154,23 +5155,26 @@
       }
     }
 
+    options.finishInit = function(cm) {
+      cm.save = save;
+      cm.getTextArea = function() { return textarea; };
+      cm.toTextArea = function() {
+        cm.toTextArea = isNaN; // Prevent this from being ran twice
+        save();
+        textarea.parentNode.removeChild(cm.getWrapperElement());
+        textarea.style.display = "";
+        if (textarea.form) {
+          off(textarea.form, "submit", save);
+          if (typeof textarea.form.submit == "function")
+            textarea.form.submit = realSubmit;
+        }
+      };
+    };
+
     textarea.style.display = "none";
     var cm = CodeMirror(function(node) {
       textarea.parentNode.insertBefore(node, textarea.nextSibling);
     }, options);
-    cm.save = save;
-    cm.getTextArea = function() { return textarea; };
-    cm.toTextArea = function() {
-      cm.toTextArea = isNaN; // Prevent this from being ran twice
-      save();
-      textarea.parentNode.removeChild(cm.getWrapperElement());
-      textarea.style.display = "";
-      if (textarea.form) {
-        off(textarea.form, "submit", save);
-        if (typeof textarea.form.submit == "function")
-          textarea.form.submit = realSubmit;
-      }
-    };
     return cm;
   };
 

From f3f57a3e6d2b16ad5d7bace01be298c639008dfe Mon Sep 17 00:00:00 2001
From: KwanEsq <kwan@perix.co.uk>
Date: Wed, 4 Feb 2015 09:58:10 +0000
Subject: [PATCH 1881/4742] [tests] Clean up test/index.html

---
 test/index.html | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/test/index.html b/test/index.html
index 89f4e378c3..34450bc3f8 100644
--- a/test/index.html
+++ b/test/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
 
-<title>CodeMirror: Test Suite</title>
 <meta charset="utf-8"/>
+<title>CodeMirror: Test Suite</title>
 <link rel=stylesheet href="../doc/docs.css">
 
 <link rel="stylesheet" href="../lib/codemirror.css">
@@ -14,13 +14,26 @@
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/edit/matchbrackets.js"></script>
 <script src="../addon/comment/comment.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/css/css.js"></script>
 <script src="../mode/clike/clike.js"></script>
+<!-- clike must be after css or vim and sublime tests will fail -->
+<script src="../mode/gfm/gfm.js"></script>
+<script src="../mode/haml/haml.js"></script>
+<script src="../mode/htmlmixed/htmlmixed.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/markdown/markdown.js"></script>
 <script src="../mode/php/php.js"></script>
+<script src="../mode/ruby/ruby.js"></script>
+<script src="../mode/shell/shell.js"></script>
+<script src="../mode/slim/slim.js"></script>
+<script src="../mode/stex/stex.js"></script>
+<script src="../mode/textile/textile.js"></script>
+<script src="../mode/verilog/verilog.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<script src="../keymap/vim.js"></script>
+<script src="../mode/xquery/xquery.js"></script>
 <script src="../keymap/emacs.js"></script>
 <script src="../keymap/sublime.js"></script>
+<script src="../keymap/vim.js"></script>
 
 <style type="text/css">
   .ok {color: #090;}
@@ -80,39 +93,27 @@ <h2>Test Suite</h2>
     <script src="comment_test.js"></script>
     <script src="search_test.js"></script>
     <script src="mode_test.js"></script>
-    <script src="../mode/javascript/test.js"></script>
-    <script src="../mode/php/test.js"></script>
-    <script src="../mode/css/css.js"></script>
+    
     <script src="../mode/css/test.js"></script>
     <script src="../mode/css/scss_test.js"></script>
     <script src="../mode/css/less_test.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../mode/xml/test.js"></script>
-    <script src="../mode/htmlmixed/htmlmixed.js"></script>
-    <script src="../mode/ruby/ruby.js"></script>
-    <script src="../mode/ruby/test.js"></script>
-    <script src="../mode/haml/haml.js"></script>
+    <script src="../mode/gfm/test.js"></script>
     <script src="../mode/haml/test.js"></script>
-    <script src="../mode/markdown/markdown.js"></script>
+    <script src="../mode/javascript/test.js"></script>
     <script src="../mode/markdown/test.js"></script>
-    <script src="../mode/slim/slim.js"></script>
-    <script src="../mode/slim/test.js"></script>
-    <script src="../mode/gfm/gfm.js"></script>
-    <script src="../mode/gfm/test.js"></script>
-    <script src="../mode/shell/shell.js"></script>
+    <script src="../mode/php/test.js"></script>
+    <script src="../mode/ruby/test.js"></script>
     <script src="../mode/shell/test.js"></script>
-    <script src="../mode/stex/stex.js"></script>
+    <script src="../mode/slim/test.js"></script>
     <script src="../mode/stex/test.js"></script>
-    <script src="../mode/textile/textile.js"></script>
     <script src="../mode/textile/test.js"></script>
-    <script src="../mode/verilog/verilog.js"></script>
     <script src="../mode/verilog/test.js"></script>
-    <script src="../mode/xquery/xquery.js"></script>
+    <script src="../mode/xml/test.js"></script>
     <script src="../mode/xquery/test.js"></script>
     <script src="../addon/mode/multiplex_test.js"></script>
-    <script src="vim_test.js"></script>
     <script src="emacs_test.js"></script>
     <script src="sublime_test.js"></script>
+    <script src="vim_test.js"></script>
     <script>
       window.onload = runHarness;
       CodeMirror.on(window, 'hashchange', runHarness);
@@ -149,7 +150,7 @@ <h2>Test Suite</h2>
             if (s === "verbose")
               verbose = true;
             else
-              filters.push(parseTestFilter(decodeURIComponent(s)));;
+              filters.push(parseTestFilter(decodeURIComponent(s)));
           }
         }
         quit = false;

From e454aa8940e42feb00c64e3c577f4187648b5116 Mon Sep 17 00:00:00 2001
From: mloginov <mikhail.loginov@citronium.com>
Date: Fri, 6 Feb 2015 13:32:03 +0300
Subject: [PATCH 1882/4742] Check foldGutter for exists

---
 addon/fold/foldgutter.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 3359476796..199120c726 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -94,20 +94,26 @@
   }
 
   function onGutterClick(cm, line, gutter) {
-    var opts = cm.state.foldGutter.options;
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
     if (gutter != opts.gutter) return;
     cm.foldCode(Pos(line, 0), opts.rangeFinder);
   }
 
   function onChange(cm) {
-    var state = cm.state.foldGutter, opts = cm.state.foldGutter.options;
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
     state.from = state.to = 0;
     clearTimeout(state.changeUpdate);
     state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, opts.foldOnChangeTimeSpan || 600);
   }
 
   function onViewportChange(cm) {
-    var state = cm.state.foldGutter, opts = cm.state.foldGutter.options;
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
     clearTimeout(state.changeUpdate);
     state.changeUpdate = setTimeout(function() {
       var vp = cm.getViewport();
@@ -129,7 +135,9 @@
   }
 
   function onFold(cm, from) {
-    var state = cm.state.foldGutter, line = from.line;
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var line = from.line;
     if (line >= state.from && line < state.to)
       updateFoldInfo(cm, line, line + 1);
   }

From e3acd6855e73dec2a56264a716d3a830958ff5b3 Mon Sep 17 00:00:00 2001
From: Anders Nawroth <anders@neotechnology.com>
Date: Fri, 6 Feb 2015 14:58:48 +0100
Subject: [PATCH 1883/4742] [cypher mode] Adds the 'keys' function name

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

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 315778706e..9decf30753 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -60,7 +60,7 @@
     };
     var indentUnit = config.indentUnit;
     var curPunc;
-    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
+    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
     var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]);
     var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
     var operatorChars = /[*+\-<>=&|~%^]/;

From 1ad149aeefb6877649b795f99eae75a75b7ca235 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 9 Feb 2015 22:41:19 +0100
Subject: [PATCH 1884/4742] [sql mode] Indent with CodeMirror.Pass when not in
 braces

Issue #2064
Issue #3074
---
 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 f2c2384a72..ee6c194b0e 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -190,7 +190,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
     indent: function(state, textAfter) {
       var cx = state.context;
-      if (!cx) return 0;
+      if (!cx) return CodeMirror.Pass;
       var closing = textAfter.charAt(0) == cx.type;
       if (cx.align) return cx.col + (closing ? 0 : 1);
       else return cx.indent + (closing ? 0 : config.indentUnit);

From 011b947ee9d05417c1c293566636e5593d8c2273 Mon Sep 17 00:00:00 2001
From: mloginov <mikhail.loginov@citronium.com>
Date: Mon, 9 Feb 2015 11:45:03 +0300
Subject: [PATCH 1885/4742] [tern addon] Ability to destroy worker

---
 addon/tern/tern.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index c1938012ca..b049549d35 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -130,6 +130,13 @@
           data = self.options.responseFilter(doc, query, request, error, data);
         c(error, data);
       });
+    },
+
+    destroy: function () {
+      if (this.worker) {
+        this.worker.terminate();
+        this.worker = null;
+      }
     }
   };
 
@@ -651,7 +658,7 @@
   // Worker wrapper
 
   function WorkerServer(ts) {
-    var worker = new Worker(ts.options.workerScript);
+    var worker = ts.worker = new Worker(ts.options.workerScript);
     worker.postMessage({type: "init",
                         defs: ts.options.defs,
                         plugins: ts.options.plugins,

From 9d9337fc3a7826e70359cc5d148dc5967bffb702 Mon Sep 17 00:00:00 2001
From: Luke Stagner <lstagner@uci.edu>
Date: Tue, 10 Feb 2015 16:43:25 -0800
Subject: [PATCH 1886/4742] [idl mode] Fix red brackets and commas

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

diff --git a/mode/idl/idl.js b/mode/idl/idl.js
index 15c852e36c..07308d71dc 100644
--- a/mode/idl/idl.js
+++ b/mode/idl/idl.js
@@ -275,7 +275,7 @@
 
     // Handle non-detected items
     stream.next();
-    return 'error';
+    return null;
   };
 
   CodeMirror.defineMode('idl', function() {

From 534bd1f3211103f461012228791c3628f9cf6d58 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Feb 2015 17:00:43 +0100
Subject: [PATCH 1887/4742] [clike mode] Fix triple-quoted-string tokenizing
 for Scala mode

Closes #3078
---
 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 b04b22b167..a49702161f 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -354,7 +354,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         state.tokenize = null;
         break;
       }
-      escaped = stream.next() != "\\" && !escaped;
+      escaped = stream.next() == "\\" && !escaped;
     }
     return "string";
   }

From 5c0270c98963d9271725acc89c32c5b1a2d0355a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Feb 2015 17:05:42 +0100
Subject: [PATCH 1888/4742] [lint addon] Allow the async flag to be on the
 annotation function

So that the helper mechanism can meaningfully be used to register
asynchronous linters.
---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index cc25ad6143..18eb709016 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -120,7 +120,7 @@
   function startLinting(cm) {
     var state = cm.state.lint, options = state.options;
     var passOptions = options.options || options; // Support deprecated passing of `options` property in options
-    if (options.async)
+    if (options.async || options.getAnnotations.async)
       options.getAnnotations(cm.getValue(), updateLinting, passOptions, cm);
     else
       updateLinting(cm, options.getAnnotations(cm.getValue(), passOptions, cm));

From 4f2e8b16ac1cf5d56fb487cd1dbbe996844d2f1e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Feb 2015 10:32:07 +0100
Subject: [PATCH 1889/4742] [annotatescrollbar addon] Recompute vertical scale
 on every update

Issue #3079
---
 addon/scroll/annotatescrollbar.js  | 27 +++++++++++++++++----------
 addon/search/matchesonscrollbar.js |  3 ++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 6dfff1a6a4..974f9c330c 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -11,22 +11,28 @@
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineExtension("annotateScrollbar", function(className) {
-    return new Annotation(this, className);
+  CodeMirror.defineExtension("annotateScrollbar", function(options) {
+    if (typeof options == "string") options = {className: options};
+    return new Annotation(this, options);
   });
 
-  function Annotation(cm, className) {
+  function Annotation(cm, options) {
     this.cm = cm;
-    this.className = className;
+    this.options = options;
     this.annotations = [];
     this.div = cm.getWrapperElement().appendChild(document.createElement("div"));
     this.div.style.cssText = "position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none";
     this.computeScale();
 
     var self = this;
-    cm.on("refresh", this.resizeHandler = function(){
-      if (self.computeScale()) self.redraw();
+    cm.on("refresh", this.resizeHandler = function() {
+      if (self.computeScale()) self.redraw(false);
     });
+    if (options.listenForChanges !== false)
+      cm.on("change", this.changeHandler = function() {
+        clearTimeout(self.changed);
+        self.changed = setTimeout(function() { self.redraw(); }, 250);
+      });
   }
 
   Annotation.prototype.computeScale = function() {
@@ -44,12 +50,12 @@
     this.redraw();
   };
 
-  Annotation.prototype.redraw = function() {
+  Annotation.prototype.redraw = function(compute) {
+    if (compute !== false) this.computeScale();
     var cm = this.cm, hScale = this.hScale;
-    if (!cm.display.barWidth) return;
 
     var frag = document.createDocumentFragment(), anns = this.annotations;
-    for (var i = 0, nextTop; i < anns.length; i++) {
+    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;
@@ -63,7 +69,7 @@
 
       var elt = frag.appendChild(document.createElement("div"));
       elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth - 1, 2) + "px; top: " + top + "px; height: " + height + "px";
-      elt.className = this.className;
+      elt.className = this.options.className;
     }
     this.div.textContent = "";
     this.div.appendChild(frag);
@@ -71,6 +77,7 @@
 
   Annotation.prototype.clear = function() {
     this.cm.off("refresh", this.resizeHandler);
+    if (this.changeHandler) this.cm.off("change", this.changeHandler);
     this.div.parentNode.removeChild(this.div);
   };
 });
diff --git a/addon/search/matchesonscrollbar.js b/addon/search/matchesonscrollbar.js
index 937d3f786e..da5e834f6f 100644
--- a/addon/search/matchesonscrollbar.js
+++ b/addon/search/matchesonscrollbar.js
@@ -17,7 +17,8 @@
 
   function SearchAnnotation(cm, query, caseFold, className) {
     this.cm = cm;
-    this.annotation = cm.annotateScrollbar(className || "CodeMirror-search-match");
+    this.annotation = cm.annotateScrollbar({className: className || "CodeMirror-search-match",
+                                            listenForChanges: false});
     this.query = query;
     this.caseFold = caseFold;
     this.gap = {from: cm.firstLine(), to: cm.lastLine() + 1};

From aa46ff58b8c91aa99c565b1304993e41c3301a79 Mon Sep 17 00:00:00 2001
From: Ray Ratchup <ray1248@gmail.com>
Date: Tue, 27 Jan 2015 22:31:31 -0500
Subject: [PATCH 1890/4742] Add svx submode to verilog mode

---
 mode/verilog/verilog.js | 204 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 194 insertions(+), 10 deletions(-)

diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 8fc9ea4f8c..d486cfe7c7 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -17,7 +17,8 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
       dontAlignCalls = parserConfig.dontAlignCalls,
       noIndentKeywords = parserConfig.noIndentKeywords || [],
-      multiLineStrings = parserConfig.multiLineStrings;
+      multiLineStrings = parserConfig.multiLineStrings,
+      hooks = parserConfig.hooks || {};
 
   function words(str) {
     var obj = {}, words = str.split(" ");
@@ -107,7 +108,10 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while");
 
   function tokenBase(stream, state) {
-    var ch = stream.peek();
+    var ch = stream.peek(), style;
+    if (hooks[ch] && ((style = hooks[ch](stream, state)) != false)) {return style;}
+    if (hooks["tokenBase"] && ((style = hooks["tokenBase"](stream, state)) != false)) {return style;}
+
     if (/[,;:\.]/.test(ch)) {
       curPunc = stream.next();
       return null;
@@ -284,7 +288,8 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
         tokenize: null,
         context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
         indented: 0,
-        startOfLine: true
+        startOfLine: true,
+        vxContext: (hooks["startStateContext"]) ? new hooks["startStateContext"](parserConfig) : null
       };
     },
 
@@ -295,6 +300,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
         state.indented = stream.indentation();
         state.startOfLine = true;
       }
+      if (hooks["token"]) {hooks["token"](stream, state);}
       if (stream.eatSpace()) return null;
       curPunc = null;
       curKeyword = null;
@@ -335,6 +341,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
 
     indent: function(state, textAfter) {
       if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
+      if (hooks["indent"] && hooks["indent"](state) >= 0) {return(hooks["indent"](state));};
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
       var closing = false;
@@ -354,11 +361,188 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   };
 });
 
-CodeMirror.defineMIME("text/x-verilog", {
-  name: "verilog"
-});
-CodeMirror.defineMIME("text/x-systemverilog", {
-  name: "systemverilog"
-});
-
+  CodeMirror.defineMIME("text/x-verilog", {
+    name: "verilog"
+  });
+
+  CodeMirror.defineMIME("text/x-systemverilog", {
+    name: "verilog"
+  });
+
+  CodeMirror.defineMIME("text/x-svx", {
+    name: "verilog",
+    vxModeIsOn: true,
+    isSvxChangeScopePrefix: function(str) {
+      var svxchScopePrefixs = {
+        ">":"property", "->":"property", "-":"hr", "|":"link", "?$":"qualifier", "?*":"qualifier",
+        "@-":"variable-3", "@":"variable-3", "?":"qualifier"};
+      var x = svxchScopePrefixs[str];
+      return (x === undefined ? false : x);
+    },
+    svxGenIndent: function(stream, state) {
+      var svxindentUnit = 2;
+      var rtnIndent = -1, indentUnitRq = 0, curIndent = stream.indentation(), ctx = state.vxContext;
+      switch (ctx.svxCurCtlFlowChar) {
+      case "\\":
+        curIndent = 0;
+        break;
+      case "|":
+        if (ctx.svxPrevPrevCtlFlowChar == "@") {
+          indentUnitRq = -2; //-2 new pipe rq after cur pipe
+          break;
+        }
+        if (ctx.thisMode.isSvxChangeScopePrefix(ctx.svxPrevCtlFlowChar) != false)
+          indentUnitRq = 1; // +1 new scope
+        break;
+      case "M":  // m4
+        if (ctx.svxPrevPrevCtlFlowChar == "@") {
+          indentUnitRq = -2; //-2 new inst rq after  pipe
+          break;
+        }
+        if (ctx.thisMode.isSvxChangeScopePrefix(ctx.svxPrevCtlFlowChar) != false)
+          indentUnitRq = 1; // +1 new scope
+        break;
+      case "@":
+        if (ctx.svxPrevCtlFlowChar == "S") {
+          indentUnitRq = -1; // new pipe stage after stmts
+        }
+        if (ctx.svxPrevCtlFlowChar == "|") {
+          indentUnitRq = 1; // 1st pipe stage
+        }
+        break;
+      case "S":
+        if (ctx.svxPrevCtlFlowChar == "@") {
+          indentUnitRq = 1; // flow in pipe stage
+        }
+        if (ctx.thisMode.isSvxChangeScopePrefix(ctx.svxPrevCtlFlowChar) != false)
+          indentUnitRq = 1; // +1 new scope
+        break;
+      }
+      var statementIndentUnit = svxindentUnit;
+      rtnIndent = curIndent + (indentUnitRq*statementIndentUnit);
+      return( (rtnIndent >= 0) ? rtnIndent : curIndent );
+    },
+    hooks: {
+      "\\": function(stream, state) {
+        var vxIndent = 0, style = false;
+        var curPunc  = stream.string;
+        if ((stream.sol()) && (/\\SV/.test(stream.string))) {
+          curPunc = (/\\SVX_version/.test(stream.string))
+            ? "\\SVX_version" : stream.string;
+          stream.skipToEnd();
+          if (curPunc == "\\SV" && state.vxContext.vxCodeActive) {state.vxContext.vxCodeActive = false;};
+          if ((/\\SVX/.test(curPunc) && !state.vxContext.vxCodeActive)
+            || (curPunc=="\\SVX_version" && state.vxContext.vxCodeActive)) {state.vxContext.vxCodeActive = true;};
+          style = "keyword";
+          state.vxContext.svxCurCtlFlowChar  = state.vxContext.svxPrevPrevCtlFlowChar
+            = state.vxContext.svxPrevCtlFlowChar = "";
+          if (state.vxContext.vxCodeActive == true) {
+            state.vxContext.svxCurCtlFlowChar  = "\\";
+            vxIndent=state.vxContext.thisMode.svxGenIndent(stream, state);
+          }
+          state.vxContext.vxIndentRq = vxIndent;
+        }
+        return style;
+      },
+      "tokenBase": function(stream, state) {
+        var vxIndent = 0, style = false, ctx = state.vxContext;
+        var svxisOperatorChar = /[\[\]=:]/;
+        var     svxkpScopePrefixs = {
+          "**":"variable-2", "*":"variable-2", "$$":"variable", "$":"variable",
+          "^^":"attribute", "^":"attribute"};
+        var ch = stream.peek();
+        var vxCurCtlFlowCharValueAtStart = ctx.svxCurCtlFlowChar;
+        if (state.vxContext.vxCodeActive == true) {
+          switch (true) {
+          case /[\[\]{}\(\);\:]/.test(ch):
+            // bypass nesting and 1 char punc
+            style = "meta";
+            stream.next();
+            break;
+          case ch == "/":
+            stream.next();
+            if (stream.eat("/")) {
+              stream.skipToEnd();
+              style = "comment";
+              ctx.svxCurCtlFlowChar = "S";
+            } else
+              stream.backUp(1);
+            break;
+          case /@/.test(ch):
+            // pipeline stage
+            style = ctx.thisMode.isSvxChangeScopePrefix(ch);
+            ctx.svxCurCtlFlowChar = "@";
+            stream.next();
+            stream.eatWhile(/[\w\$_]/);
+            break;
+          case (stream.match(/\b[mM]4+/, true)): // match: function(pattern, consume, caseInsensitive)
+            // m4 pre proc
+            stream.skipTo("(");
+            style = "def";
+            ctx.svxCurCtlFlowChar = "M";
+            break;
+          case ch == "!" && stream.sol():
+            // v stmt in svx region
+            // ctx.svxCurCtlFlowChar  = "S";
+            style = "comment";
+            stream.next();
+            break;
+          case svxisOperatorChar.test(ch):
+            // operators
+            stream.eatWhile(svxisOperatorChar);
+            style = "operator";
+            break;
+          case ch == "#":
+            // phy hier
+            ctx.svxCurCtlFlowChar  = (ctx.svxCurCtlFlowChar == "")
+              ? ch : ctx.svxCurCtlFlowChar;
+            stream.next();
+            stream.eatWhile(/[+-]\d/);
+            style = "tag";
+            break;
+          case svxkpScopePrefixs.propertyIsEnumerable(ch):
+            // special SVX operators
+            style = svxkpScopePrefixs[ch];
+            ctx.svxCurCtlFlowChar  = (ctx.svxCurCtlFlowChar == "")
+              ? "S" : ctx.svxCurCtlFlowChar;  // stmt
+            stream.next();
+            stream.match(/[a-zA-Z_0-9]+/);
+            break;
+          case (ctx.thisMode.isSvxChangeScopePrefix(ch) != false):
+            // special SVX operators
+            style = ctx.thisMode.isSvxChangeScopePrefix(ch);
+            ctx.svxCurCtlFlowChar  = (ctx.svxCurCtlFlowChar == "")
+              ? ch : ctx.svxCurCtlFlowChar;
+            stream.next();
+            stream.match(/[a-zA-Z_0-9]+/);
+            break;
+          }
+          if (ctx.svxCurCtlFlowChar != vxCurCtlFlowCharValueAtStart) { // flow change
+            vxIndent = ctx.thisMode.svxGenIndent(stream, state);
+            ctx.vxIndentRq = vxIndent;
+          }
+        }
+        return style;
+      },
+      "startStateContext": function(thisMode) {
+        this.svxCurCtlFlowChar = "";
+        this.svxPrevCtlFlowChar = "";
+        this.svxPrevPrevCtlFlowChar = "";
+        this.vxCodeActive = thisMode.vxModeIsOn;
+        this.vxIndentRq = 0;
+        this.thisMode = thisMode;
+      },
+      "token": function(stream, state) {
+        var ctx = state.vxContext;
+        if (ctx.vxCodeActive == true && stream.sol() && ctx.svxCurCtlFlowChar != "") {
+          ctx.svxPrevPrevCtlFlowChar = ctx.svxPrevCtlFlowChar;
+          ctx.svxPrevCtlFlowChar = ctx.svxCurCtlFlowChar;
+          ctx.svxCurCtlFlowChar  = "";
+        }
+      },
+      "indent": function(state) {
+        return( (state.vxContext.vxCodeActive == true) ? state.vxContext.vxIndentRq : -1);
+      }
+    }
+  });
 });

From c7562e82f022b6db58a6ba9811ed56cf1403aed0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 13 Feb 2015 10:52:26 +0100
Subject: [PATCH 1891/4742] [verilog mode] Clean up SVXVerilog implementation

---
 mode/verilog/verilog.js | 253 +++++++++++++++++++---------------------
 1 file changed, 121 insertions(+), 132 deletions(-)

diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index d486cfe7c7..96b9f24581 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -109,8 +109,9 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
 
   function tokenBase(stream, state) {
     var ch = stream.peek(), style;
-    if (hooks[ch] && ((style = hooks[ch](stream, state)) != false)) {return style;}
-    if (hooks["tokenBase"] && ((style = hooks["tokenBase"](stream, state)) != false)) {return style;}
+    if (hooks[ch] && (style = hooks[ch](stream, state)) != false) return style;
+    if (hooks.tokenBase && (style = hooks.tokenBase(stream, state)) != false)
+      return style;
 
     if (/[,;:\.]/.test(ch)) {
       curPunc = stream.next();
@@ -284,13 +285,14 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     electricInput: buildElectricInputRegEx(),
 
     startState: function(basecolumn) {
-      return {
+      var state = {
         tokenize: null,
         context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
         indented: 0,
-        startOfLine: true,
-        vxContext: (hooks["startStateContext"]) ? new hooks["startStateContext"](parserConfig) : null
+        startOfLine: true
       };
+      if (hooks.startState) hooks.startState(state);
+      return state;
     },
 
     token: function(stream, state) {
@@ -300,7 +302,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
         state.indented = stream.indentation();
         state.startOfLine = true;
       }
-      if (hooks["token"]) {hooks["token"](stream, state);}
+      if (hooks.token) hooks.token(stream, state);
       if (stream.eatSpace()) return null;
       curPunc = null;
       curKeyword = null;
@@ -310,17 +312,19 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
 
       if (curPunc == ctx.type) {
         popContext(state);
-      }
-      else if ((curPunc == ";" && ctx.type == "statement") ||
+      } else if ((curPunc == ";" && ctx.type == "statement") ||
                (ctx.type && isClosing(curKeyword, ctx.type))) {
         ctx = popContext(state);
         while (ctx && ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == "{") { pushContext(state, stream.column(), "}"); }
-      else if (curPunc == "[") { pushContext(state, stream.column(), "]"); }
-      else if (curPunc == "(") { pushContext(state, stream.column(), ")"); }
-      else if (ctx && ctx.type == "endcase" && curPunc == ":") { pushContext(state, stream.column(), "statement"); }
-      else if (curPunc == "newstatement") {
+      } else if (curPunc == "{") {
+        pushContext(state, stream.column(), "}");
+      } else if (curPunc == "[") {
+        pushContext(state, stream.column(), "]");
+      } else if (curPunc == "(") {
+        pushContext(state, stream.column(), ")");
+      } else if (ctx && ctx.type == "endcase" && curPunc == ":") {
+        pushContext(state, stream.column(), "statement");
+      } else if (curPunc == "newstatement") {
         pushContext(state, stream.column(), "statement");
       } else if (curPunc == "newblock") {
         if (curKeyword == "function" && ctx && (ctx.type == "statement" || ctx.type == "endgroup")) {
@@ -341,14 +345,16 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
 
     indent: function(state, textAfter) {
       if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
-      if (hooks["indent"] && hooks["indent"](state) >= 0) {return(hooks["indent"](state));};
+      if (hooks.indent) {
+        var fromHook = hooks.indent(state);
+        if (fromHook >= 0) return fromHook;
+      }
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
       var closing = false;
       var possibleClosing = textAfter.match(closingBracketOrWord);
-      if (possibleClosing) {
+      if (possibleClosing)
         closing = isClosing(possibleClosing[0], ctx.type);
-      }
       if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
       else if (closingBracket.test(ctx.type) && ctx.align && !dontAlignCalls) return ctx.column + (closing ? 0 : 1);
       else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
@@ -369,59 +375,56 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     name: "verilog"
   });
 
-  CodeMirror.defineMIME("text/x-svx", {
-    name: "verilog",
-    vxModeIsOn: true,
-    isSvxChangeScopePrefix: function(str) {
-      var svxchScopePrefixs = {
-        ">":"property", "->":"property", "-":"hr", "|":"link", "?$":"qualifier", "?*":"qualifier",
-        "@-":"variable-3", "@":"variable-3", "?":"qualifier"};
-      var x = svxchScopePrefixs[str];
-      return (x === undefined ? false : x);
-    },
-    svxGenIndent: function(stream, state) {
-      var svxindentUnit = 2;
-      var rtnIndent = -1, indentUnitRq = 0, curIndent = stream.indentation(), ctx = state.vxContext;
-      switch (ctx.svxCurCtlFlowChar) {
-      case "\\":
-        curIndent = 0;
-        break;
-      case "|":
-        if (ctx.svxPrevPrevCtlFlowChar == "@") {
-          indentUnitRq = -2; //-2 new pipe rq after cur pipe
-          break;
-        }
-        if (ctx.thisMode.isSvxChangeScopePrefix(ctx.svxPrevCtlFlowChar) != false)
-          indentUnitRq = 1; // +1 new scope
-        break;
-      case "M":  // m4
-        if (ctx.svxPrevPrevCtlFlowChar == "@") {
-          indentUnitRq = -2; //-2 new inst rq after  pipe
-          break;
-        }
-        if (ctx.thisMode.isSvxChangeScopePrefix(ctx.svxPrevCtlFlowChar) != false)
-          indentUnitRq = 1; // +1 new scope
-        break;
-      case "@":
-        if (ctx.svxPrevCtlFlowChar == "S") {
-          indentUnitRq = -1; // new pipe stage after stmts
-        }
-        if (ctx.svxPrevCtlFlowChar == "|") {
-          indentUnitRq = 1; // 1st pipe stage
-        }
+  // SVXVerilog mode
+
+  var svxchScopePrefixes = {
+    ">": "property", "->": "property", "-": "hr", "|": "link", "?$": "qualifier", "?*": "qualifier",
+    "@-": "variable-3", "@": "variable-3", "?": "qualifier"
+  };
+
+  function svxGenIndent(stream, state) {
+    var svxindentUnit = 2;
+    var rtnIndent = -1, indentUnitRq = 0, curIndent = stream.indentation();
+    switch (state.svxCurCtlFlowChar) {
+    case "\\":
+      curIndent = 0;
+      break;
+    case "|":
+      if (state.svxPrevPrevCtlFlowChar == "@") {
+        indentUnitRq = -2; //-2 new pipe rq after cur pipe
         break;
-      case "S":
-        if (ctx.svxPrevCtlFlowChar == "@") {
-          indentUnitRq = 1; // flow in pipe stage
-        }
-        if (ctx.thisMode.isSvxChangeScopePrefix(ctx.svxPrevCtlFlowChar) != false)
-          indentUnitRq = 1; // +1 new scope
+      }
+      if (svxchScopePrefixes[state.svxPrevCtlFlowChar])
+        indentUnitRq = 1; // +1 new scope
+      break;
+    case "M":  // m4
+      if (state.svxPrevPrevCtlFlowChar == "@") {
+        indentUnitRq = -2; //-2 new inst rq after  pipe
         break;
       }
-      var statementIndentUnit = svxindentUnit;
-      rtnIndent = curIndent + (indentUnitRq*statementIndentUnit);
-      return( (rtnIndent >= 0) ? rtnIndent : curIndent );
-    },
+      if (svxchScopePrefixes[state.svxPrevCtlFlowChar])
+        indentUnitRq = 1; // +1 new scope
+      break;
+    case "@":
+      if (state.svxPrevCtlFlowChar == "S")
+        indentUnitRq = -1; // new pipe stage after stmts
+      if (state.svxPrevCtlFlowChar == "|")
+        indentUnitRq = 1; // 1st pipe stage
+      break;
+    case "S":
+      if (state.svxPrevCtlFlowChar == "@")
+        indentUnitRq = 1; // flow in pipe stage
+      if (svxchScopePrefixes[state.svxPrevCtlFlowChar])
+        indentUnitRq = 1; // +1 new scope
+      break;
+    }
+    var statementIndentUnit = svxindentUnit;
+    rtnIndent = curIndent + (indentUnitRq*statementIndentUnit);
+    return rtnIndent >= 0 ? rtnIndent : curIndent;
+  }
+
+  CodeMirror.defineMIME("text/x-svx", {
+    name: "verilog",
     hooks: {
       "\\": function(stream, state) {
         var vxIndent = 0, style = false;
@@ -430,118 +433,104 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
           curPunc = (/\\SVX_version/.test(stream.string))
             ? "\\SVX_version" : stream.string;
           stream.skipToEnd();
-          if (curPunc == "\\SV" && state.vxContext.vxCodeActive) {state.vxContext.vxCodeActive = false;};
-          if ((/\\SVX/.test(curPunc) && !state.vxContext.vxCodeActive)
-            || (curPunc=="\\SVX_version" && state.vxContext.vxCodeActive)) {state.vxContext.vxCodeActive = true;};
+          if (curPunc == "\\SV" && state.vxCodeActive) {state.vxCodeActive = false;};
+          if ((/\\SVX/.test(curPunc) && !state.vxCodeActive)
+            || (curPunc=="\\SVX_version" && state.vxCodeActive)) {state.vxCodeActive = true;};
           style = "keyword";
-          state.vxContext.svxCurCtlFlowChar  = state.vxContext.svxPrevPrevCtlFlowChar
-            = state.vxContext.svxPrevCtlFlowChar = "";
-          if (state.vxContext.vxCodeActive == true) {
-            state.vxContext.svxCurCtlFlowChar  = "\\";
-            vxIndent=state.vxContext.thisMode.svxGenIndent(stream, state);
+          state.svxCurCtlFlowChar  = state.svxPrevPrevCtlFlowChar
+            = state.svxPrevCtlFlowChar = "";
+          if (state.vxCodeActive == true) {
+            state.svxCurCtlFlowChar  = "\\";
+            vxIndent = svxGenIndent(stream, state);
           }
-          state.vxContext.vxIndentRq = vxIndent;
+          state.vxIndentRq = vxIndent;
         }
         return style;
       },
-      "tokenBase": function(stream, state) {
-        var vxIndent = 0, style = false, ctx = state.vxContext;
+      tokenBase: function(stream, state) {
+        var vxIndent = 0, style = false;
         var svxisOperatorChar = /[\[\]=:]/;
-        var     svxkpScopePrefixs = {
+        var svxkpScopePrefixs = {
           "**":"variable-2", "*":"variable-2", "$$":"variable", "$":"variable",
           "^^":"attribute", "^":"attribute"};
         var ch = stream.peek();
-        var vxCurCtlFlowCharValueAtStart = ctx.svxCurCtlFlowChar;
-        if (state.vxContext.vxCodeActive == true) {
-          switch (true) {
-          case /[\[\]{}\(\);\:]/.test(ch):
+        var vxCurCtlFlowCharValueAtStart = state.svxCurCtlFlowChar;
+        if (state.vxCodeActive == true) {
+          if (/[\[\]{}\(\);\:]/.test(ch)) {
             // bypass nesting and 1 char punc
             style = "meta";
             stream.next();
-            break;
-          case ch == "/":
+          } else if (ch == "/") {
             stream.next();
             if (stream.eat("/")) {
               stream.skipToEnd();
               style = "comment";
-              ctx.svxCurCtlFlowChar = "S";
-            } else
+              state.svxCurCtlFlowChar = "S";
+            } else {
               stream.backUp(1);
-            break;
-          case /@/.test(ch):
+            }
+          } else if (ch == "@") {
             // pipeline stage
-            style = ctx.thisMode.isSvxChangeScopePrefix(ch);
-            ctx.svxCurCtlFlowChar = "@";
+            style = svxchScopePrefixes[ch];
+            state.svxCurCtlFlowChar = "@";
             stream.next();
             stream.eatWhile(/[\w\$_]/);
-            break;
-          case (stream.match(/\b[mM]4+/, true)): // match: function(pattern, consume, caseInsensitive)
+          } else if (stream.match(/\b[mM]4+/, true)) { // match: function(pattern, consume, caseInsensitive)
             // m4 pre proc
             stream.skipTo("(");
             style = "def";
-            ctx.svxCurCtlFlowChar = "M";
-            break;
-          case ch == "!" && stream.sol():
+            state.svxCurCtlFlowChar = "M";
+          } else if (ch == "!" && stream.sol()) {
             // v stmt in svx region
-            // ctx.svxCurCtlFlowChar  = "S";
+            // state.svxCurCtlFlowChar  = "S";
             style = "comment";
             stream.next();
-            break;
-          case svxisOperatorChar.test(ch):
+          } else if (svxisOperatorChar.test(ch)) {
             // operators
             stream.eatWhile(svxisOperatorChar);
             style = "operator";
-            break;
-          case ch == "#":
+          } else if (ch == "#") {
             // phy hier
-            ctx.svxCurCtlFlowChar  = (ctx.svxCurCtlFlowChar == "")
-              ? ch : ctx.svxCurCtlFlowChar;
+            state.svxCurCtlFlowChar  = (state.svxCurCtlFlowChar == "")
+              ? ch : state.svxCurCtlFlowChar;
             stream.next();
             stream.eatWhile(/[+-]\d/);
             style = "tag";
-            break;
-          case svxkpScopePrefixs.propertyIsEnumerable(ch):
+          } else if (svxkpScopePrefixs.propertyIsEnumerable(ch)) {
             // special SVX operators
             style = svxkpScopePrefixs[ch];
-            ctx.svxCurCtlFlowChar  = (ctx.svxCurCtlFlowChar == "")
-              ? "S" : ctx.svxCurCtlFlowChar;  // stmt
+            state.svxCurCtlFlowChar = state.svxCurCtlFlowChar == "" ? "S" : state.svxCurCtlFlowChar;  // stmt
             stream.next();
             stream.match(/[a-zA-Z_0-9]+/);
-            break;
-          case (ctx.thisMode.isSvxChangeScopePrefix(ch) != false):
+          } else if (style = svxchScopePrefixes[ch] || false) {
             // special SVX operators
-            style = ctx.thisMode.isSvxChangeScopePrefix(ch);
-            ctx.svxCurCtlFlowChar  = (ctx.svxCurCtlFlowChar == "")
-              ? ch : ctx.svxCurCtlFlowChar;
+            state.svxCurCtlFlowChar = state.svxCurCtlFlowChar == "" ? ch : state.svxCurCtlFlowChar;
             stream.next();
             stream.match(/[a-zA-Z_0-9]+/);
-            break;
           }
-          if (ctx.svxCurCtlFlowChar != vxCurCtlFlowCharValueAtStart) { // flow change
-            vxIndent = ctx.thisMode.svxGenIndent(stream, state);
-            ctx.vxIndentRq = vxIndent;
+          if (state.svxCurCtlFlowChar != vxCurCtlFlowCharValueAtStart) { // flow change
+            vxIndent = svxGenIndent(stream, state);
+            state.vxIndentRq = vxIndent;
           }
         }
         return style;
       },
-      "startStateContext": function(thisMode) {
-        this.svxCurCtlFlowChar = "";
-        this.svxPrevCtlFlowChar = "";
-        this.svxPrevPrevCtlFlowChar = "";
-        this.vxCodeActive = thisMode.vxModeIsOn;
-        this.vxIndentRq = 0;
-        this.thisMode = thisMode;
-      },
-      "token": function(stream, state) {
-        var ctx = state.vxContext;
-        if (ctx.vxCodeActive == true && stream.sol() && ctx.svxCurCtlFlowChar != "") {
-          ctx.svxPrevPrevCtlFlowChar = ctx.svxPrevCtlFlowChar;
-          ctx.svxPrevCtlFlowChar = ctx.svxCurCtlFlowChar;
-          ctx.svxCurCtlFlowChar  = "";
+      token: function(stream, state) {
+        if (state.vxCodeActive == true && stream.sol() && state.svxCurCtlFlowChar != "") {
+          state.svxPrevPrevCtlFlowChar = state.svxPrevCtlFlowChar;
+          state.svxPrevCtlFlowChar = state.svxCurCtlFlowChar;
+          state.svxCurCtlFlowChar = "";
         }
       },
-      "indent": function(state) {
-        return( (state.vxContext.vxCodeActive == true) ? state.vxContext.vxIndentRq : -1);
+      indent: function(state) {
+        return (state.vxCodeActive == true) ? state.vxIndentRq : -1;
+      },
+      startState: function(state) {
+        state.svxCurCtlFlowChar = "";
+        state.svxPrevCtlFlowChar = "";
+        state.svxPrevPrevCtlFlowChar = "";
+        state.vxCodeActive = true;
+        state.vxIndentRq = 0;
       }
     }
   });

From 79368b48fe27ec772249fd51fcec0350de8b7592 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 14 Feb 2015 08:56:11 +0100
Subject: [PATCH 1892/4742] [annotatescrollbar addon] Listen to markerAdded
 events

---
 addon/scroll/annotatescrollbar.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 974f9c330c..542b002380 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -28,6 +28,7 @@
     cm.on("refresh", this.resizeHandler = function() {
       if (self.computeScale()) self.redraw(false);
     });
+    cm.on("markerAdded", this.resizeHandler);
     if (options.listenForChanges !== false)
       cm.on("change", this.changeHandler = function() {
         clearTimeout(self.changed);
@@ -77,6 +78,7 @@
 
   Annotation.prototype.clear = function() {
     this.cm.off("refresh", this.resizeHandler);
+    this.cm.off("markerAdded", this.resizeHandler);
     if (this.changeHandler) this.cm.off("change", this.changeHandler);
     this.div.parentNode.removeChild(this.div);
   };

From 39409d6bc00a2ad9c3fb3d3a49dc4f1d20eabd46 Mon Sep 17 00:00:00 2001
From: ngn <nick.nickolov@gmail.com>
Date: Sat, 14 Feb 2015 16:22:26 +0000
Subject: [PATCH 1893/4742] [closebrackets addon] Option to override expansion
 of triple quotes #2385

---
 addon/edit/closebrackets.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index f6b42f02d3..ff4bb3f733 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -10,6 +10,7 @@
     mod(CodeMirror);
 })(function(CodeMirror) {
   var DEFAULT_BRACKETS = "()[]{}''\"\"";
+  var DEFAULT_TRIPLES = "'\"";
   var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
   var SPACE_CHAR_REGEX = /\s/;
 
@@ -19,13 +20,14 @@
     if (old != CodeMirror.Init && old)
       cm.removeKeyMap("autoCloseBrackets");
     if (!val) return;
-    var pairs = DEFAULT_BRACKETS, explode = DEFAULT_EXPLODE_ON_ENTER;
+    var pairs = DEFAULT_BRACKETS, triples = DEFAULT_TRIPLES, explode = DEFAULT_EXPLODE_ON_ENTER;
     if (typeof val == "string") pairs = val;
     else if (typeof val == "object") {
       if (val.pairs != null) pairs = val.pairs;
+      if (val.triples != null) triples = val.triples;
       if (val.explode != null) explode = val.explode;
     }
-    var map = buildKeymap(pairs);
+    var map = buildKeymap(pairs, triples);
     if (explode) map.Enter = buildExplodeHandler(explode);
     cm.addKeyMap(map);
   });
@@ -52,7 +54,7 @@
     }
   }
 
-  function buildKeymap(pairs) {
+  function buildKeymap(pairs, triples) {
     var map = {
       name : "autoCloseBrackets",
       Backspace: function(cm) {
@@ -85,7 +87,7 @@
               curType = "skipThree";
             else
               curType = "skip";
-          } else if (left == right && cur.ch > 1 &&
+          } else if (left == right && cur.ch > 1 && triples.indexOf(left) >= 0 &&
                      cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
                      (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left)) {
             curType = "addFour";

From f8b8b245aa28839e6518f8b0ba4195c0471d94ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 15 Feb 2015 11:56:36 +0100
Subject: [PATCH 1894/4742] [annotatescrollbar addon] Don't create annotations
 for folded code

---
 addon/scroll/annotatescrollbar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 542b002380..08b8fe07b0 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -66,6 +66,7 @@
         ann = anns[++i];
         bottom = cm.charCoords(ann.to, "local").bottom * hScale;
       }
+      if (bottom == top) continue;
       var height = Math.max(bottom - top, 3);
 
       var elt = frag.appendChild(document.createElement("div"));

From 4ed39b19aff2997f75de1a3f408d1efe77473f9f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 15 Feb 2015 14:15:07 +0100
Subject: [PATCH 1895/4742] [merge addon] Give space elements a CSS class

---
 addon/merge/merge.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 3e9df42fb7..1d0a34636b 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -355,6 +355,7 @@
 
   function padBelow(cm, line, size) {
     var elt = document.createElement("div");
+    elt.className = "CodeMirror-merge-spacer";
     elt.style.height = size + "px"; elt.style.minWidth = "1px";
     return cm.addLineWidget(line, elt, {height: size});
   }

From 83f0a64d6a592f61ee2246bb7990dc81a4535ef5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Feb 2015 10:57:38 +0100
Subject: [PATCH 1896/4742] [merge demo] Make wider on wide displays

---
 demo/merge.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/demo/merge.html b/demo/merge.html
index dad1952757..5981d410ea 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -12,6 +12,10 @@
 <script src="../addon/merge/merge.js"></script>
 <style>
     .CodeMirror { line-height: 1.2; }
+    @media screen and (min-width: 1300px) {
+      article { max-width: 1000px; }
+      #nav { border-right: 499px solid transparent; }
+    }
     span.clicky {
       cursor: pointer;
       background: #d70;

From b67c0d430b50c3673caeb852b6adffe5989b1b01 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Feb 2015 11:01:54 +0100
Subject: [PATCH 1897/4742] [merge addon] Keep chunks in an array rather than
 using an iterator

---
 addon/merge/merge.js | 110 +++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 1d0a34636b..12ef130614 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -42,6 +42,7 @@
       this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
 
       this.diff = getDiff(asString(orig), asString(options.value));
+      this.chunks = getChunks(this.diff);
       this.diffOutOfDate = false;
 
       this.showDifferences = options.showDifferences !== false;
@@ -61,6 +62,7 @@
   function ensureDiff(dv) {
     if (dv.diffOutOfDate) {
       dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
+      dv.chunks = getChunks(dv.diff);
       dv.diffOutOfDate = false;
       CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
     }
@@ -134,7 +136,7 @@
     } else {
       var halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
       var mid = editor.lineAtHeight(midY, "local");
-      var around = chunkBoundariesAround(dv.diff, mid, type == DIFF_INSERT);
+      var around = chunkBoundariesAround(dv.chunks, mid, type == DIFF_INSERT);
       var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
       var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
       var ratio = (midY - off.top) / (off.bot - off.top);
@@ -281,15 +283,16 @@
 
     var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
     var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
-    iterateChunks(dv.diff, function(topOrig, botOrig, topEdit, botEdit) {
-      if (topEdit <= vpEdit.to && botEdit >= vpEdit.from &&
-          topOrig <= vpOrig.to && botOrig >= vpOrig.from)
-        drawConnectorsForChunk(dv, topOrig, botOrig, topEdit, botEdit, sTopOrig, sTopEdit, w);
-      if (align && (topEdit <= vpEdit.to || topOrig <= vpOrig.to)) {
-        var above = (botEdit < vpEdit.from && botOrig < vpOrig.from);
-        alignChunks(dv, topOrig, botOrig, topEdit, botEdit, above && extraSpaceAbove);
+    for (var i = 0; i < dv.chunks.length; i++) {
+      var ch = dv.chunks[i];
+      if (ch.editFrom <= vpEdit.to && ch.editTo >= vpEdit.from &&
+          ch.origFrom <= vpOrig.to && ch.origTo >= vpOrig.from)
+        drawConnectorsForChunk(dv, ch, sTopOrig, sTopEdit, w);
+      if (align && (ch.editFrom <= vpEdit.to || ch.origFrom <= vpOrig.to)) {
+        var above = (ch.editTo < vpEdit.from && ch.origTo < vpOrig.from);
+        alignChunks(dv, ch, above && extraSpaceAbove);
       }
-    });
+    }
     if (align) {
       if (extraSpaceAbove.edit)
         dv.aligners.push(padBelow(dv.edit, 0, extraSpaceAbove.edit));
@@ -300,15 +303,15 @@
     }
   }
 
-  function drawConnectorsForChunk(dv, topOrig, botOrig, topEdit, botEdit, sTopOrig, sTopEdit, w) {
+  function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
     var flip = dv.type == "left";
-    var top = dv.orig.heightAtLine(topOrig, "local") - sTopOrig;
+    var top = dv.orig.heightAtLine(chunk.origFrom, "local") - sTopOrig;
     if (dv.svg) {
       var topLpx = top;
-      var topRpx = dv.edit.heightAtLine(topEdit, "local") - sTopEdit;
+      var topRpx = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
       if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
-      var botLpx = dv.orig.heightAtLine(botOrig, "local") - sTopOrig;
-      var botRpx = dv.edit.heightAtLine(botEdit, "local") - sTopEdit;
+      var botLpx = dv.orig.heightAtLine(chunk.origTo, "local") - sTopOrig;
+      var botRpx = dv.edit.heightAtLine(chunk.editTo, "local") - sTopEdit;
       if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
       var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
       var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
@@ -321,34 +324,35 @@
                                                 "CodeMirror-merge-copy"));
       var editOriginals = dv.mv.options.allowEditingOriginals;
       copy.title = editOriginals ? "Push to left" : "Revert chunk";
-      copy.chunk = {topEdit: topEdit, botEdit: botEdit, topOrig: topOrig, botOrig: botOrig};
+      copy.chunk = chunk;
       copy.style.top = top + "px";
 
       if (editOriginals) {
-        var topReverse = dv.orig.heightAtLine(topEdit, "local") - sTopEdit;
+        var topReverse = dv.orig.heightAtLine(chunk.editFrom, "local") - sTopEdit;
         var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
                                                          "CodeMirror-merge-copy-reverse"));
         copyReverse.title = "Push to right";
-        copyReverse.chunk = {topEdit: topOrig, botEdit: botOrig, topOrig: topEdit, botOrig: botEdit};
+        copyReverse.chunk = {editFrom: chunk.origFrom, editTo: chunk.origTo,
+                             origFrom: chunk.editFrom, origTo: chunk.editTo};
         copyReverse.style.top = topReverse + "px";
         dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
       }
     }
   }
 
-  function alignChunks(dv, topOrig, botOrig, topEdit, botEdit, aboveViewport) {
-    var topOrigPx = dv.orig.heightAtLine(topOrig, "local");
-    var botOrigPx = dv.orig.heightAtLine(botOrig, "local");
-    var topEditPx = dv.edit.heightAtLine(topEdit, "local");
-    var botEditPx = dv.edit.heightAtLine(botEdit, "local");
-    var origH = botOrigPx -topOrigPx, editH = botEditPx - topEditPx;
+  function alignChunks(dv, chunk, aboveViewport) {
+    var topOrigPx = dv.orig.heightAtLine(chunk.origFrom, "local");
+    var botOrigPx = dv.orig.heightAtLine(chunk.origTo, "local");
+    var topEditPx = dv.edit.heightAtLine(chunk.editFrom, "local");
+    var botEditPx = dv.edit.heightAtLine(chunk.editTo, "local");
+    var origH = botOrigPx - topOrigPx, editH = botEditPx - topEditPx;
     var diff = editH - origH;
     if (diff > 1) {
       if (aboveViewport) aboveViewport.orig += diff;
-      else dv.aligners.push(padBelow(dv.orig, botOrig - 1, diff));
+      else dv.aligners.push(padBelow(dv.orig, chunk.origTo - 1, diff));
     } else if (diff < -1) {
       if (aboveViewport) aboveViewport.edit -= diff;
-      else dv.aligners.push(padBelow(dv.edit, botEdit - 1, -diff));
+      else dv.aligners.push(padBelow(dv.edit, chunk.editTo - 1, -diff));
     }
     return 0;
   }
@@ -362,8 +366,8 @@
 
   function copyChunk(dv, to, from, chunk) {
     if (dv.diffOutOfDate) return;
-    to.replaceRange(from.getRange(Pos(chunk.topOrig, 0), Pos(chunk.botOrig, 0)),
-                         Pos(chunk.topEdit, 0), Pos(chunk.botEdit, 0));
+    to.replaceRange(from.getRange(Pos(chunk.origFrom, 0), Pos(chunk.origTo, 0)),
+                         Pos(chunk.editFrom, 0), Pos(chunk.editTo, 0));
   }
 
   // Merge view, containing 0, 1, or 2 diff views.
@@ -464,10 +468,10 @@
       if (this.left) this.left.setShowDifferences(val);
     },
     rightChunks: function() {
-      return this.right && getChunks(this.right);
+      if (this.right) { ensureDiff(this.right); return this.right.chunks; }
     },
     leftChunks: function() {
-      return this.left && getChunks(this.left);
+      if (this.left) { ensureDiff(this.left); return this.left.chunks; }
     }
   };
 
@@ -495,7 +499,8 @@
     return diff;
   }
 
-  function iterateChunks(diff, f) {
+  function getChunks(diff) {
+    var chunks = [];
     var startEdit = 0, startOrig = 0;
     var edit = Pos(0, 0), orig = Pos(0, 0);
     for (var i = 0; i < diff.length; ++i) {
@@ -507,7 +512,8 @@
         var endOff = endOfLineClean(diff, i) ? 1 : 0;
         var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
         if (cleanToEdit > cleanFromEdit) {
-          if (i) f(startOrig, cleanFromOrig, startEdit, cleanFromEdit);
+          if (i) chunks.push({origFrom: startOrig, origTo: cleanFromOrig,
+                              editFrom: startEdit, editTo: cleanFromEdit});
           startEdit = cleanToEdit; startOrig = cleanToOrig;
         }
       } else {
@@ -515,17 +521,9 @@
       }
     }
     if (startEdit <= edit.line || startOrig <= orig.line)
-      f(startOrig, orig.line + 1, startEdit, edit.line + 1);
-  }
-
-  function getChunks(dv) {
-    ensureDiff(dv);
-    var collect = [];
-    iterateChunks(dv.diff, function(topOrig, botOrig, topEdit, botEdit) {
-      collect.push({origFrom: topOrig, origTo: botOrig,
-                    editFrom: topEdit, editTo: botEdit});
-    });
-    return collect;
+      chunks.push({origFrom: startOrig, origTo: orig.line + 1,
+                   editFrom: startEdit, editTo: edit.line + 1});
+    return chunks;
   }
 
   function endOfLineClean(diff, i) {
@@ -546,18 +544,19 @@
     return last.charCodeAt(last.length - 1) == 10;
   }
 
-  function chunkBoundariesAround(diff, n, nInEdit) {
+  function chunkBoundariesAround(chunks, n, nInEdit) {
     var beforeE, afterE, beforeO, afterO;
-    iterateChunks(diff, function(fromOrig, toOrig, fromEdit, toEdit) {
-      var fromLocal = nInEdit ? fromEdit : fromOrig;
-      var toLocal = nInEdit ? toEdit : toOrig;
+    for (var i = 0; i < chunks.length; i++) {
+      var chunk = chunks[i];
+      var fromLocal = nInEdit ? chunk.editFrom : chunk.origFrom;
+      var toLocal = nInEdit ? chunk.editTo : chunk.origTo;
       if (afterE == null) {
-        if (fromLocal > n) { afterE = fromEdit; afterO = fromOrig; }
-        else if (toLocal > n) { afterE = toEdit; afterO = toOrig; }
+        if (fromLocal > n) { afterE = chunk.editFrom; afterO = chunk.origFrom; }
+        else if (toLocal > n) { afterE = chunk.editTo; afterO = chunk.origTo; }
       }
-      if (toLocal <= n) { beforeE = toEdit; beforeO = toOrig; }
-      else if (fromLocal <= n) { beforeE = fromEdit; beforeO = fromOrig; }
-    });
+      if (toLocal <= n) { beforeE = chunk.editTo; beforeO = chunk.origTo; }
+      else if (fromLocal <= n) { beforeE = chunk.editFrom; beforeO = chunk.origFrom; }
+    }
     return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
   }
 
@@ -590,12 +589,13 @@
   function collapseIdenticalStretches(dv, margin) {
     if (typeof margin != "number") margin = 2;
     var lastOrig = dv.orig.firstLine(), lastEdit = dv.edit.firstLine();
-    iterateChunks(dv.diff, function(topOrig, botOrig, _topEdit, botEdit) {
-      var identicalSize = topOrig - margin - lastOrig;
+    for (var i = 0; i < dv.chunks.length; i++) {
+      var chunk = dv.chunks[i];
+      var identicalSize = chunk.origFrom - margin - lastOrig;
       if (identicalSize > margin)
         collapseStretch(dv, lastOrig, lastEdit, identicalSize);
-      lastOrig = botOrig + margin; lastEdit = botEdit + margin;
-    });
+      lastOrig = chunk.origTo + margin; lastEdit = chunk.editTo + margin;
+    }
     var bottomSize = dv.orig.lastLine() + 1 - lastOrig;
     if (bottomSize > margin)
       collapseStretch(dv, lastOrig, lastEdit, bottomSize);

From 850a6f5c0ad2bdf0c71363f2af089c6ec760d4c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Feb 2015 12:00:53 +0100
Subject: [PATCH 1898/4742] [merge addon] Rewrite aligning algorithm to work
 with three views

---
 addon/merge/merge.js | 185 +++++++++++++++++++++++++++++--------------
 demo/merge.html      |   7 +-
 2 files changed, 132 insertions(+), 60 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 12ef130614..d83bfb63b7 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -31,8 +31,6 @@
          insert: "CodeMirror-merge-r-inserted",
          del: "CodeMirror-merge-r-deleted",
          connect: "CodeMirror-merge-r-connect"};
-    if (mv.options.connect == "align")
-      this.aligners = [];
   }
 
   DiffView.prototype = {
@@ -43,7 +41,7 @@
 
       this.diff = getDiff(asString(orig), asString(options.value));
       this.chunks = getChunks(this.diff);
-      this.diffOutOfDate = false;
+      this.diffOutOfDate = this.dealigned = false;
 
       this.showDifferences = options.showDifferences !== false;
       this.forceUpdate = registerUpdate(this);
@@ -68,11 +66,13 @@
     }
   }
 
+  var updating = false;
   function registerUpdate(dv) {
     var edit = {from: 0, to: 0, marked: []};
     var orig = {from: 0, to: 0, marked: []};
     var debounceChange;
     function update(mode) {
+      updating = true;
       if (mode == "full") {
         if (dv.svg) clear(dv.svg);
         if (dv.copyButtons) clear(dv.copyButtons);
@@ -86,17 +86,23 @@
         updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
       }
       makeConnections(dv);
+
+      if (dv.mv.options.connect == "align")
+        alignChunks(dv);
+      updating = false;
     }
-    function set(slow) {
+    function set() {
+      if (updating) return;
+      dv.dealigned = true;
       clearTimeout(debounceChange);
-      debounceChange = setTimeout(update, slow == true ? 250 : 100);
+      debounceChange = setTimeout(update, 250);
     }
     function change() {
       if (!dv.diffOutOfDate) {
         dv.diffOutOfDate = true;
         edit.from = edit.to = orig.from = orig.to = 0;
       }
-      set(true);
+      set();
     }
     dv.edit.on("change", change);
     dv.orig.on("change", change);
@@ -261,19 +267,6 @@
   function makeConnections(dv) {
     if (!dv.showDifferences) return;
 
-    var align = dv.mv.options.connect == "align", oldScrollEdit, oldScrollOrig;
-    if (align) {
-      if (!dv.orig.curOp) return dv.orig.operation(function() {
-        makeConnections(dv);
-      });
-      oldScrollEdit = dv.edit.getScrollInfo().top;
-      oldScrollOrig = dv.orig.getScrollInfo().top;
-      for (var i = 0; i < dv.aligners.length; i++)
-        dv.aligners[i].clear();
-      dv.aligners.length = 0;
-      var extraSpaceAbove = {edit: 0, orig: 0};
-    }
-
     if (dv.svg) {
       clear(dv.svg);
       var w = dv.gap.offsetWidth;
@@ -288,19 +281,119 @@
       if (ch.editFrom <= vpEdit.to && ch.editTo >= vpEdit.from &&
           ch.origFrom <= vpOrig.to && ch.origTo >= vpOrig.from)
         drawConnectorsForChunk(dv, ch, sTopOrig, sTopEdit, w);
-      if (align && (ch.editFrom <= vpEdit.to || ch.origFrom <= vpOrig.to)) {
-        var above = (ch.editTo < vpEdit.from && ch.origTo < vpOrig.from);
-        alignChunks(dv, ch, above && extraSpaceAbove);
+    }
+  }
+
+  function getMatchingOrigLine(editLine, chunks) {
+    var editStart = 0, origStart = 0;
+    for (var i = 0; i < chunks.length; i++) {
+      var chunk = chunks[i];
+      if (chunk.editTo > editLine && chunk.editFrom <= editLine) return null;
+      if (chunk.editFrom > editLine) break;
+      editStart = chunk.editTo;
+      origStart = chunk.origTo;
+    }
+    return origStart + (editLine - editStart);
+  }
+
+  function findAlignedLines(dv, other) {
+    var linesToAlign = [];
+    for (var i = 0; i < dv.chunks.length; i++) {
+      var chunk = dv.chunks[i];
+      linesToAlign.push([chunk.origTo, chunk.editTo, other ? getMatchingOrigLine(chunk.editTo, other.chunks) : null]);
+    }
+    if (other) {
+      for (var i = 0; i < other.chunks.length; i++) {
+        var chunk = other.chunks[i];
+        for (var j = 0; j < linesToAlign.length; j++) {
+          var align = linesToAlign[j];
+          if (align[1] == chunk.editTo) {
+            j = -1;
+            break;
+          } else if (align[1] > chunk.editTo) {
+            break;
+          }
+        }
+        if (j > -1)
+          linesToAlign.splice(j - 1, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
+      }
+    }
+    return linesToAlign;
+  }
+
+  function alignChunks(dv, force) {
+    if (!dv.dealigned && !force) return;
+    if (!dv.orig.curOp) return dv.orig.operation(function() {
+      alignChunks(dv, force);
+    });
+
+    dv.dealigned = false;
+    var other = dv.mv.left == dv ? dv.mv.right : dv.mv.left;
+    if (other) {
+      ensureDiff(other);
+      other.dealigned = false;
+    }
+    var linesToAlign = findAlignedLines(dv, other);
+
+    // Clear old aligners
+    var aligners = dv.mv.aligners;
+    for (var i = 0; i < aligners.length; i++)
+      aligners[i].clear();
+    aligners.length = 0;
+
+    var cm = [dv.orig, dv.edit], vp = [], scroll = [];
+    if (other) cm.push(other.orig);
+    for (var i = 0; i < cm.length; i++) {
+      vp.push(cm[i].getViewport());
+      scroll.push(cm[i].getScrollInfo().top);
+    }
+
+    var spaceAbove = [0, 0, 0];
+    for (var ln = 0; ln < linesToAlign.length; ln++) {
+      var lines = linesToAlign[ln];
+      var above = true, below = true;
+      for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
+        if (lines[i] >= vp[i].from) above = false;
+        if (lines[i] <= vp[i].to) below = false;
+      }
+      alignLines(cm, lines, aligners, spaceAbove, above);
+      if (below) break;
+    }
+    if (dv.lockScroll)
+      scroll[0] = scroll[1] = Math.max(scroll[0], scroll[1]);
+    for (var i = 0; i < cm.length; i++) {
+      if (spaceAbove[i])
+        aligners.push(padAbove(cm[i], 0, spaceAbove[i]));
+      cm[i].scrollTo(null, scroll[i]);
+    }
+  }
+
+  function alignLines(cm, lines, aligners, spaceAbove, isAboveViewport) {
+    var maxOffset = 0, offset = [];
+    for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
+      var off = cm[i].heightAtLine(lines[i], "local") + spaceAbove[i];
+      offset[i] = off;
+      maxOffset = Math.max(maxOffset, off);
+    }
+    for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
+      var diff = maxOffset - offset[i];
+      if (diff > 1) {
+        if (isAboveViewport) spaceAbove[i] += diff;
+        else aligners.push(padAbove(cm[i], lines[i], diff));
       }
     }
-    if (align) {
-      if (extraSpaceAbove.edit)
-        dv.aligners.push(padBelow(dv.edit, 0, extraSpaceAbove.edit));
-      if (extraSpaceAbove.orig)
-        dv.aligners.push(padBelow(dv.orig, 0, extraSpaceAbove.orig));
-      dv.edit.scrollTo(null, oldScrollEdit);
-      dv.orig.scrollTo(null, oldScrollOrig);
+  }
+
+  function padAbove(cm, line, size) {
+    var above = true;
+    if (line > cm.lastLine()) {
+      line--;
+      above = false;
     }
+    var elt = document.createElement("div");
+    elt.className = "CodeMirror-merge-spacer";
+    elt.style.height = size + "px"; elt.style.minWidth = "1px";
+    return cm.addLineWidget(line, elt, {height: size, above: above});
   }
 
   function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
@@ -340,30 +433,6 @@
     }
   }
 
-  function alignChunks(dv, chunk, aboveViewport) {
-    var topOrigPx = dv.orig.heightAtLine(chunk.origFrom, "local");
-    var botOrigPx = dv.orig.heightAtLine(chunk.origTo, "local");
-    var topEditPx = dv.edit.heightAtLine(chunk.editFrom, "local");
-    var botEditPx = dv.edit.heightAtLine(chunk.editTo, "local");
-    var origH = botOrigPx - topOrigPx, editH = botEditPx - topEditPx;
-    var diff = editH - origH;
-    if (diff > 1) {
-      if (aboveViewport) aboveViewport.orig += diff;
-      else dv.aligners.push(padBelow(dv.orig, chunk.origTo - 1, diff));
-    } else if (diff < -1) {
-      if (aboveViewport) aboveViewport.edit -= diff;
-      else dv.aligners.push(padBelow(dv.edit, chunk.editTo - 1, -diff));
-    }
-    return 0;
-  }
-
-  function padBelow(cm, line, size) {
-    var elt = document.createElement("div");
-    elt.className = "CodeMirror-merge-spacer";
-    elt.style.height = size + "px"; elt.style.minWidth = "1px";
-    return cm.addLineWidget(line, elt, {height: size});
-  }
-
   function copyChunk(dv, to, from, chunk) {
     if (dv.diffOutOfDate) return;
     to.replaceRange(from.getRange(Pos(chunk.origFrom, 0), Pos(chunk.origTo, 0)),
@@ -377,12 +446,8 @@
 
     this.options = options;
     var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
-    if (origLeft && origRight) {
-      if (options.connect == "align")
-        throw new Error("connect: \"align\" is not supported for three-way merge views");
-      if (options.collapseIdentical)
+    if (origLeft && origRight && options.collapseIdentical)
         throw new Error("collapseIdentical option is not supported for three-way merge views");
-    }
 
     var hasLeft = origLeft != null, hasRight = origRight != null;
     var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
@@ -417,6 +482,10 @@
 
     if (options.collapseIdentical)
       collapseIdenticalStretches(left || right, options.collapseIdentical);
+    if (options.connect == "align") {
+      this.aligners = [];
+      alignChunks(this.left || this.right, true);
+    }
 
     var onResize = function() {
       if (left) makeConnections(left);
diff --git a/demo/merge.html b/demo/merge.html
index 5981d410ea..c60e653297 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -8,6 +8,9 @@
 <link rel=stylesheet href="../addon/merge/merge.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/xml/xml.js"></script>
+<script src="../mode/css/css.js"></script>
+<script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/htmlmixed/htmlmixed.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"></script>
 <script src="../addon/merge/merge.js"></script>
 <style>
@@ -68,7 +71,7 @@ <h2>merge view demo</h2>
   target.innerHTML = "";
   dv = CodeMirror.MergeView(target, {
     value: value,
-    origLeft: panes == 3 && !collapse && !connect ? orig1 : null,
+    origLeft: panes == 3 ? orig1 : null,
     orig: orig2,
     lineNumbers: true,
     mode: "text/html",
@@ -84,7 +87,7 @@ <h2>merge view demo</h2>
 
 window.onload = function() {
   value = document.documentElement.innerHTML;
-  orig1 = value.replace(/\.\.\//g, "codemirror/").replace("yellow", "orange");
+  orig1 = "<!doctype html>\n\n" + value.replace(/\.\.\//g, "codemirror/").replace("yellow", "orange");
   orig2 = value.replace(/\u003cscript/g, "\u003cscript type=text/javascript ")
     .replace("white", "purple;\n      font: comic sans;\n      text-decoration: underline;\n      height: 15em");
   initUI();

From 19d0d1d1013c4015ede6f1e2b8110e22ddd476f9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Feb 2015 17:08:38 +0100
Subject: [PATCH 1899/4742] [merge addon] Support collapsing unchanged ranges
 in three-way merge

---
 addon/merge/merge.js | 58 +++++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index d83bfb63b7..81cc95471a 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -446,8 +446,6 @@
 
     this.options = options;
     var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
-    if (origLeft && origRight && options.collapseIdentical)
-        throw new Error("collapseIdentical option is not supported for three-way merge views");
 
     var hasLeft = origLeft != null, hasRight = origRight != null;
     var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
@@ -481,7 +479,7 @@
     if (right) right.init(rightPane, origRight, options);
 
     if (options.collapseIdentical)
-      collapseIdenticalStretches(left || right, options.collapseIdentical);
+      collapseIdenticalStretches(this, options.collapseIdentical);
     if (options.connect == "align") {
       this.aligners = [];
       alignChunks(this.left || this.right, true);
@@ -648,26 +646,48 @@
     return {mark: mark, clear: clear};
   }
 
-  function collapseStretch(dv, origStart, editStart, size) {
-    var mOrig = collapseSingle(dv.orig, origStart, origStart + size);
-    var mEdit = collapseSingle(dv.edit, editStart, editStart + size);
-    mOrig.mark.on("clear", function() { mEdit.clear(); });
-    mEdit.mark.on("clear", function() { mOrig.clear(); });
+  function collapseStretch(size, editors) {
+    var marks = [];
+    function clear() {
+      for (var i = 0; i < marks.length; i++) marks[i].clear();
+    }
+    for (var i = 0; i < editors.length; i++) {
+      var editor = editors[i];
+      var mark = collapseSingle(editor.cm, editor.line, editor.line + size);
+      marks.push(mark);
+      mark.mark.on("clear", clear);
+    }
   }
 
-  function collapseIdenticalStretches(dv, margin) {
-    if (typeof margin != "number") margin = 2;
-    var lastOrig = dv.orig.firstLine(), lastEdit = dv.edit.firstLine();
+  function unclearNearChunks(dv, margin, off, clear) {
     for (var i = 0; i < dv.chunks.length; i++) {
       var chunk = dv.chunks[i];
-      var identicalSize = chunk.origFrom - margin - lastOrig;
-      if (identicalSize > margin)
-        collapseStretch(dv, lastOrig, lastEdit, identicalSize);
-      lastOrig = chunk.origTo + margin; lastEdit = chunk.editTo + margin;
-    }
-    var bottomSize = dv.orig.lastLine() + 1 - lastOrig;
-    if (bottomSize > margin)
-      collapseStretch(dv, lastOrig, lastEdit, bottomSize);
+      for (var l = chunk.editFrom - margin; l < chunk.editTo + margin; l++) {
+        var pos = l + off;
+        if (pos >= 0 && pos < clear.length) clear[pos] = false;
+      }
+    }
+  }
+
+  function collapseIdenticalStretches(mv, margin) {
+    if (typeof margin != "number") margin = 2;
+    var clear = [], edit = (mv.left || mv.right).edit, off = edit.firstLine();
+    for (var l = off, e = edit.lastLine(); l <= e; l++) clear.push(true);
+    if (mv.left) unclearNearChunks(mv.left, margin, off, clear);
+    if (mv.right) unclearNearChunks(mv.right, margin, off, clear);
+
+    for (var i = 0; i < clear.length; i++) {
+      if (clear[i]) {
+        var line = i + off;
+        for (var size = 1; i < clear.length - 1 && clear[i + 1]; i++, size++) {}
+        if (size > margin) {
+          var editors = [{line: line, cm: edit}];
+          if (mv.left) editors.push({line: getMatchingOrigLine(line, mv.left.chunks), cm: mv.left.orig});
+          if (mv.right) editors.push({line: getMatchingOrigLine(line, mv.right.chunks), cm: mv.right.orig});
+          collapseStretch(size, editors);
+        }
+      }
+    }
   }
 
   // General utilities

From 444b0f1097644e418587c0c5b39bb8fad224342f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Feb 2015 17:31:02 +0100
Subject: [PATCH 1900/4742] [merge addon] Add an onCollapse callback

...  for getting information about collapsed spans
---
 addon/merge/merge.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 81cc95471a..688aeb9967 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -657,6 +657,7 @@
       marks.push(mark);
       mark.mark.on("clear", clear);
     }
+    return marks[0].mark;
   }
 
   function unclearNearChunks(dv, margin, off, clear) {
@@ -671,7 +672,7 @@
 
   function collapseIdenticalStretches(mv, margin) {
     if (typeof margin != "number") margin = 2;
-    var clear = [], edit = (mv.left || mv.right).edit, off = edit.firstLine();
+    var clear = [], edit = mv.editor(), off = edit.firstLine();
     for (var l = off, e = edit.lastLine(); l <= e; l++) clear.push(true);
     if (mv.left) unclearNearChunks(mv.left, margin, off, clear);
     if (mv.right) unclearNearChunks(mv.right, margin, off, clear);
@@ -684,7 +685,8 @@
           var editors = [{line: line, cm: edit}];
           if (mv.left) editors.push({line: getMatchingOrigLine(line, mv.left.chunks), cm: mv.left.orig});
           if (mv.right) editors.push({line: getMatchingOrigLine(line, mv.right.chunks), cm: mv.right.orig});
-          collapseStretch(size, editors);
+          var mark = collapseStretch(size, editors);
+          if (mv.options.onCollapse) mv.options.onCollapse(mv, line, size, mark);
         }
       }
     }

From 2b54fc48e81bdc9f536134acea8bae95fde7f33b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 16 Feb 2015 17:44:33 +0100
Subject: [PATCH 1901/4742] Add attributes to tab and non-printing char
 placeholders to help screen readers

See https://bugzilla.mozilla.org/show_bug.cgi?id=1088804
---
 lib/codemirror.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 382260b2e2..862855e94c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6185,6 +6185,7 @@
   function defaultSpecialCharPlaceholder(ch) {
     var token = elt("span", "\u2022", "cm-invalidchar");
     token.title = "\\u" + ch.charCodeAt(0).toString(16);
+    token.setAttribute("aria-label", token.title);
     return token;
   }
 
@@ -6218,6 +6219,7 @@
         if (m[0] == "\t") {
           var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
           var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
+          txt.setAttribute("role", "presentation");
           builder.col += tabWidth;
         } else {
           var txt = builder.cm.options.specialCharPlaceholder(m[0]);

From 513ed0290bfcb233fceba10094b83e663eb5dfba Mon Sep 17 00:00:00 2001
From: KwanEsq <kwan@perix.co.uk>
Date: Fri, 13 Feb 2015 13:58:10 +0000
Subject: [PATCH 1902/4742] [css mode] missed indent() update for @document
 changes

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

diff --git a/mode/css/css.js b/mode/css/css.js
index fc549a98cf..a901914ecb 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -345,8 +345,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
       if (cx.prev &&
           (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "font_face") ||
-           ch == ")" && (cx.type == "parens" || cx.type == "media_parens") ||
-           ch == "{" && (cx.type == "at" || cx.type == "media"))) {
+           ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
+           ch == "{" && (cx.type == "at" || cx.type == "atBlock"))) {
         indent = cx.indent - indentUnit;
         cx = cx.prev;
       }

From e3fc06869e59e36c6d38ff01079d3b768d470e86 Mon Sep 17 00:00:00 2001
From: KwanEsq <kwan@perix.co.uk>
Date: Fri, 13 Feb 2015 14:11:28 +0000
Subject: [PATCH 1903/4742] [css mode] add documentTypes to the parserConfig
 and the allWords array

---
 mode/css/css.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index a901914ecb..4959efd5d6 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -16,6 +16,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   var indentUnit = config.indentUnit,
       tokenHooks = parserConfig.tokenHooks,
+      documentTypes = parserConfig.documentTypes || {},
       mediaTypes = parserConfig.mediaTypes || {},
       mediaFeatures = parserConfig.mediaFeatures || {},
       propertyKeywords = parserConfig.propertyKeywords || {},
@@ -607,7 +608,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "font-stretch", "font-weight", "font-style"
   ], fontProperties = keySet(fontProperties_);
 
-  var allWords = mediaTypes_.concat(mediaFeatures_).concat(propertyKeywords_)
+  var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(propertyKeywords_)
     .concat(nonStandardPropertyKeywords_).concat(colorKeywords_).concat(valueKeywords_);
   CodeMirror.registerHelper("hintWords", "css", allWords);
 
@@ -634,6 +635,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   }
 
   CodeMirror.defineMIME("text/css", {
+    documentTypes: documentTypes,
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
     propertyKeywords: propertyKeywords,

From be81e74767a59be28bfa4b35055235609db16e55 Mon Sep 17 00:00:00 2001
From: KwanEsq <kwan@perix.co.uk>
Date: Fri, 13 Feb 2015 12:42:48 +0000
Subject: [PATCH 1904/4742] [css mode] add support for @counter-style

Add support for @counter-style blocks by making them and @font-face
blocks match a new "restricted_atBlock" state based on "font_face"
---
 mode/css/css.js  | 84 ++++++++++++++++++++++++++++++------------------
 mode/css/test.js | 22 +++++++++++++
 2 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 4959efd5d6..7352d508c4 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -21,9 +21,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       mediaFeatures = parserConfig.mediaFeatures || {},
       propertyKeywords = parserConfig.propertyKeywords || {},
       nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {},
+      fontProperties = parserConfig.fontProperties || {},
+      counterDescriptors = parserConfig.counterDescriptors || {},
       colorKeywords = parserConfig.colorKeywords || {},
       valueKeywords = parserConfig.valueKeywords || {},
-      fontProperties = parserConfig.fontProperties || {},
       allowNested = parserConfig.allowNested;
 
   var type, override;
@@ -158,8 +159,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return popContext(state);
     } else if (/@(media|supports|(-moz-)?document)/.test(type)) {
       return pushContext(state, stream, "atBlock");
-    } else if (type == "@font-face") {
-      return "font_face_before";
+    } else if (/@(font-face|counter-style)/.test(type)) {
+      state.restrictedType = type;
+      return "restricted_atBlock_before";
     } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
       return "keyframes";
     } else if (type && type.charAt(0) == "@") {
@@ -282,22 +284,30 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return states.atBlock(type, stream, state);
   };
 
-  states.font_face_before = function(type, stream, state) {
+  states.restricted_atBlock_before = function(type, stream, state) {
     if (type == "{")
-      return pushContext(state, stream, "font_face");
+      return pushContext(state, stream, "restricted_atBlock");
+    if (type == "word" && state.restrictedType == "@counter-style") {
+      override = "variable";
+      return "restricted_atBlock_before";
+    }
     return pass(type, stream, state);
   };
 
-  states.font_face = function(type, stream, state) {
-    if (type == "}") return popContext(state);
+  states.restricted_atBlock = function(type, stream, state) {
+    if (type == "}") {
+      delete state.restrictedType;
+      return popContext(state);
+    }
     if (type == "word") {
-      if (!fontProperties.hasOwnProperty(stream.current().toLowerCase()))
+      if ((state.restrictedType == "@font-face" && !fontProperties.hasOwnProperty(stream.current().toLowerCase())) ||
+          (state.restrictedType == "@counter-style" && !counterDescriptors.hasOwnProperty(stream.current().toLowerCase())))
         override = "error";
       else
         override = "property";
       return "maybeprop";
     }
-    return "font_face";
+    return "restricted_atBlock";
   };
 
   states.keyframes = function(type, stream, state) {
@@ -345,7 +355,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       var indent = cx.indent;
       if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
       if (cx.prev &&
-          (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "font_face") ||
+          (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "restricted_atBlock") ||
            ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
            ch == "{" && (cx.type == "at" || cx.type == "atBlock"))) {
         indent = cx.indent - indentUnit;
@@ -489,6 +499,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "searchfield-results-decoration", "zoom"
   ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
 
+  var fontProperties_ = [
+    "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
+    "font-stretch", "font-weight", "font-style"
+  ], fontProperties = keySet(fontProperties_);
+
+  var counterDescriptors_ = [
+    "additive-symbols", "fallback", "negative", "pad", "prefix", "range",
+    "speak-as", "suffix", "symbols", "system"
+  ], counterDescriptors = keySet(counterDescriptors_);
+
   var colorKeywords_ = [
     "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
     "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
@@ -519,32 +539,33 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   ], colorKeywords = keySet(colorKeywords_);
 
   var valueKeywords_ = [
-    "above", "absolute", "activeborder", "activecaption", "afar",
-    "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate",
+    "above", "absolute", "activeborder", "additive", "activecaption", "afar",
+    "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
     "arabic-indic", "armenian", "asterisks", "auto", "avoid", "avoid-column", "avoid-page",
     "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
     "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
-    "both", "bottom", "break", "break-all", "break-word", "button", "button-bevel",
+    "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
     "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian",
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
-    "cell", "center", "checkbox", "circle", "cjk-earthly-branch",
+    "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
     "col-resize", "collapse", "column", "compact", "condensed", "contain", "content",
     "content-box", "context-menu", "continuous", "copy", "cover", "crop",
-    "cross", "crosshair", "currentcolor", "cursive", "dashed", "decimal",
+    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "destination-atop",
     "destination-in", "destination-out", "destination-over", "devanagari",
-    "disc", "discard", "document", "dot-dash", "dot-dot-dash", "dotted",
-    "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
+    "disc", "discard", "disclosure-closed", "disclosure-open", "document",
+    "dot-dash", "dot-dot-dash",
+    "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
     "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
     "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
     "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
     "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
     "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
     "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
-    "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et",
-    "ethiopic-halehame-tig", "ew-resize", "expanded", "extra-condensed",
+    "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
+    "ethiopic-numeric", "ew-resize", "expanded", "extends", "extra-condensed",
     "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "footnotes",
     "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
     "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
@@ -553,7 +574,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
     "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
     "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert",
-    "italic", "justify", "kannada", "katakana", "katakana-iroha", "keep-all", "khmer",
+    "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
+    "katakana", "katakana-iroha", "keep-all", "khmer",
+    "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
     "landscape", "lao", "large", "larger", "left", "level", "lighter",
     "line-through", "linear", "lines", "list-item", "listbox", "listitem",
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
@@ -570,7 +593,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize",
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
-    "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
+    "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
     "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
     "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
     "painted", "page", "paused", "persian", "plus-darker", "plus-lighter", "pointer",
@@ -582,32 +605,30 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "searchfield-cancel-button", "searchfield-decoration",
     "searchfield-results-button", "searchfield-results-decoration",
     "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
+    "simp-chinese-formal", "simp-chinese-informal",
     "single", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
     "small", "small-caps", "small-caption", "smaller", "solid", "somali",
-    "source-atop", "source-in", "source-out", "source-over", "space", "square",
+    "source-atop", "source-in", "source-out", "source-over", "space", "spell-out", "square",
     "square-button", "start", "static", "status-bar", "stretch", "stroke",
-    "sub", "subpixel-antialiased", "super", "sw-resize", "table",
+    "sub", "subpixel-antialiased", "super", "sw-resize", "symbolic", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",
     "table-footer-group", "table-header-group", "table-row", "table-row-group",
+    "tamil",
     "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai",
     "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
     "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
     "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
-    "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
+    "transparent", "trad-chinese-formal", "trad-chinese-informal",
+    "ultra-condensed", "ultra-expanded", "underline", "up",
     "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
     "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
     "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
-    "window", "windowframe", "windowtext", "x-large", "x-small", "xor",
+    "window", "windowframe", "windowtext", "words", "x-large", "x-small", "xor",
     "xx-large", "xx-small"
   ], valueKeywords = keySet(valueKeywords_);
 
-  var fontProperties_ = [
-    "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
-    "font-stretch", "font-weight", "font-style"
-  ], fontProperties = keySet(fontProperties_);
-
   var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(propertyKeywords_)
     .concat(nonStandardPropertyKeywords_).concat(colorKeywords_).concat(valueKeywords_);
   CodeMirror.registerHelper("hintWords", "css", allWords);
@@ -640,9 +661,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     mediaFeatures: mediaFeatures,
     propertyKeywords: propertyKeywords,
     nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    fontProperties: fontProperties,
+    counterDescriptors: counterDescriptors,
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
-    fontProperties: fontProperties,
     tokenHooks: {
       "<": function(stream, state) {
         if (!stream.match("!--")) return false;
diff --git a/mode/css/test.js b/mode/css/test.js
index 3fed96936c..49cffb49d5 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -170,4 +170,26 @@
 
    MT("document_regexp",
       "[def @document] [tag regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
+
+   MT("counter-style",
+      "[def @counter-style] [variable binary] {",
+      "  [property system]: [atom numeric];",
+      "  [property symbols]: [number 0] [number 1];",
+      "  [property suffix]: [string \".\"];",
+      "  [property range]: [atom infinite];",
+      "  [property speak-as]: [atom numeric];",
+      "}");
+
+   MT("counter-style-additive-symbols",
+      "[def @counter-style] [variable simple-roman] {",
+      "  [property system]: [atom additive];",
+      "  [property additive-symbols]: [number 10] [variable X], [number 5] [variable V], [number 1] [variable I];",
+      "  [property range]: [number 1] [number 49];",
+      "}");
+
+   MT("counter-style-use",
+      "[tag ol][qualifier .roman] { [property list-style]: [variable simple-roman]; }");
+
+   MT("counter-style-symbols",
+      "[tag ol] { [property list-style]: [variable symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
 })();

From a142db5e3714d0e3a6ba7a3bc7542c23ea4a6296 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 17 Feb 2015 12:30:50 +0100
Subject: [PATCH 1905/4742] [css mode] Use a state.stateArg property for
 per-state-type state

And don't call delete on the state object.

Issue #3084
---
 mode/css/css.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 7352d508c4..bc4a1292c9 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -160,7 +160,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     } else if (/@(media|supports|(-moz-)?document)/.test(type)) {
       return pushContext(state, stream, "atBlock");
     } else if (/@(font-face|counter-style)/.test(type)) {
-      state.restrictedType = type;
+      state.stateArg = type;
       return "restricted_atBlock_before";
     } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
       return "keyframes";
@@ -287,7 +287,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   states.restricted_atBlock_before = function(type, stream, state) {
     if (type == "{")
       return pushContext(state, stream, "restricted_atBlock");
-    if (type == "word" && state.restrictedType == "@counter-style") {
+    if (type == "word" && state.stateArg == "@counter-style") {
       override = "variable";
       return "restricted_atBlock_before";
     }
@@ -296,12 +296,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   states.restricted_atBlock = function(type, stream, state) {
     if (type == "}") {
-      delete state.restrictedType;
+      state.stateArg = null;
       return popContext(state);
     }
     if (type == "word") {
-      if ((state.restrictedType == "@font-face" && !fontProperties.hasOwnProperty(stream.current().toLowerCase())) ||
-          (state.restrictedType == "@counter-style" && !counterDescriptors.hasOwnProperty(stream.current().toLowerCase())))
+      if ((state.stateArg == "@font-face" && !fontProperties.hasOwnProperty(stream.current().toLowerCase())) ||
+          (state.stateArg == "@counter-style" && !counterDescriptors.hasOwnProperty(stream.current().toLowerCase())))
         override = "error";
       else
         override = "property";
@@ -335,6 +335,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     startState: function(base) {
       return {tokenize: null,
               state: "top",
+              stateArg: null,
               context: new Context("top", base || 0, null)};
     },
 

From 6a684673fc140326572a5852ebc14cf7255f32eb Mon Sep 17 00:00:00 2001
From: KwanEsq <kwan@perix.co.uk>
Date: Sun, 15 Feb 2015 19:49:32 +0000
Subject: [PATCH 1906/4742] [css mode] add missing functions to valueKeywords

[attr, calc, counter, counters, linear-gradient, matrix, matrix3d,
perspective, radial-gradient, repeating-linear-gradient,
repeating-radial-gradient, rotate, rotate3d, rotateX, rotateY, rotateZ,
scale, scale3d, scaleX, scaleY, scaleZ, skew, skewX, skewY, symbols,
translate, translate3d, translateX, translateY, translateZ, var]
---
 mode/css/css.js  | 41 +++++++++++++++++++++++------------------
 mode/css/test.js |  6 +++---
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index bc4a1292c9..34355aaa99 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -543,16 +543,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "above", "absolute", "activeborder", "additive", "activecaption", "afar",
     "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
-    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "avoid-column", "avoid-page",
+    "arabic-indic", "armenian", "asterisks", "attr", "auto", "avoid", "avoid-column", "avoid-page",
     "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
     "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
     "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
-    "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian",
+    "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
     "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
     "col-resize", "collapse", "column", "compact", "condensed", "contain", "content",
-    "content-box", "context-menu", "continuous", "copy", "cover", "crop",
+    "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
     "cross", "crosshair", "currentcolor", "cursive", "cyclic", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "destination-atop",
     "destination-in", "destination-out", "destination-over", "devanagari",
@@ -579,10 +579,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "katakana", "katakana-iroha", "keep-all", "khmer",
     "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
     "landscape", "lao", "large", "larger", "left", "level", "lighter",
-    "line-through", "linear", "lines", "list-item", "listbox", "listitem",
+    "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
     "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
-    "lower-roman", "lowercase", "ltr", "malayalam", "match",
+    "lower-roman", "lowercase", "ltr", "malayalam", "match", "matrix", "matrix3d",
     "media-controls-background", "media-current-time-display",
     "media-fullscreen-button", "media-mute-button", "media-play-button",
     "media-return-to-realtime-button", "media-rewind-button",
@@ -597,22 +597,26 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
     "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
     "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
-    "painted", "page", "paused", "persian", "plus-darker", "plus-lighter", "pointer",
-    "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
-    "radio", "read-only", "read-write", "read-write-plaintext-only", "rectangle", "region",
-    "relative", "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
-    "ridge", "right", "round", "row-resize", "rtl", "run-in", "running",
-    "s-resize", "sans-serif", "scroll", "scrollbar", "se-resize", "searchfield",
+    "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
+    "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
+    "progress", "push-button", "radial-gradient", "radio", "read-only",
+    "read-write", "read-write-plaintext-only", "rectangle", "region",
+    "relative", "repeat", "repeating-linear-gradient",
+    "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
+    "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
+    "rotateZ", "round", "row-resize", "rtl", "run-in", "running",
+    "s-resize", "sans-serif", "scale", "scale3d", "scaleX", "scaleY", "scaleZ",
+    "scroll", "scrollbar", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",
     "searchfield-results-button", "searchfield-results-decoration",
     "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
-    "simp-chinese-formal", "simp-chinese-informal",
-    "single", "skip-white-space", "slide", "slider-horizontal",
+    "simp-chinese-formal", "simp-chinese-informal", "single",
+    "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
     "small", "small-caps", "small-caption", "smaller", "solid", "somali",
     "source-atop", "source-in", "source-out", "source-over", "space", "spell-out", "square",
-    "square-button", "start", "static", "status-bar", "stretch", "stroke",
-    "sub", "subpixel-antialiased", "super", "sw-resize", "symbolic", "table",
+    "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
+    "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",
     "table-footer-group", "table-header-group", "table-row", "table-row-group",
     "tamil",
@@ -620,11 +624,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
     "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
     "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
-    "transparent", "trad-chinese-formal", "trad-chinese-informal",
-    "ultra-condensed", "ultra-expanded", "underline", "up",
+    "trad-chinese-formal", "trad-chinese-informal",
+    "translate", "translate3d", "translateX", "translateY", "translateZ",
+    "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
     "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
-    "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
+    "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
     "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
     "window", "windowframe", "windowtext", "words", "x-large", "x-small", "xor",
     "xx-large", "xx-small"
diff --git a/mode/css/test.js b/mode/css/test.js
index 49cffb49d5..bef7156163 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -126,7 +126,7 @@
   MT("parens",
      "[qualifier .foo] {",
      "  [property background-image]: [variable fade]([atom #000], [number 20%]);",
-     "  [property border-image]: [variable linear-gradient](",
+     "  [property border-image]: [atom linear-gradient](",
      "    [atom to] [atom bottom],",
      "    [variable fade]([atom #000], [number 20%]) [number 0%],",
      "    [variable fade]([atom #000], [number 20%]) [number 100%]",
@@ -138,7 +138,7 @@
      "  [variable-2 --main-color]: [atom #06c];",
      "}",
      "[tag h1][builtin #foo] {",
-     "  [property color]: [variable var]([variable-2 --main-color]);",
+     "  [property color]: [atom var]([variable-2 --main-color]);",
      "}");
 
   MT("supports",
@@ -191,5 +191,5 @@
       "[tag ol][qualifier .roman] { [property list-style]: [variable simple-roman]; }");
 
    MT("counter-style-symbols",
-      "[tag ol] { [property list-style]: [variable symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
+      "[tag ol] { [property list-style]: [atom symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
 })();

From 5a564a9c1618c3d381931f0de5105f59b46022d4 Mon Sep 17 00:00:00 2001
From: Nisarg Jhaveri <nisargjhaveri@gmail.com>
Date: Mon, 16 Feb 2015 23:20:12 +0530
Subject: [PATCH 1907/4742] [sql-hint addon] Better table/column name
 completion

Closes #2323
---
 addon/hint/sql-hint.js | 102 +++++++++++++++++++++++++----------------
 1 file changed, 62 insertions(+), 40 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 92c889e139..c0bc40ade1 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -44,53 +44,75 @@
     }
   }
 
+  function cleanName(name) {
+    // Get rid name from backticks(`) and preceding dot(.)
+    if (name.charAt(0) == ".") {
+      name = name.substr(1);
+    }
+    return name.replace(/`/g, "");
+  }
+
+  function insertBackticks(name) {
+    var nameParts = name.split(".");
+    nameParts = nameParts.map(function(w) {return "`" + w + "`";});
+    return nameParts.join(".");
+  }
+
   function nameCompletion(cur, token, result, editor) {
-    var useBacktick = (token.string.charAt(0) == "`");
-    var string = token.string.substr(1);
-    var prevToken = editor.getTokenAt(Pos(cur.line, token.start));
-    if (token.string.charAt(0) == "." || prevToken.string == "."){
-      //Suggest colunm names
-      if (prevToken.string == ".") {
-        var prevToken = editor.getTokenAt(Pos(cur.line, token.start - 1));
-      }
-      var table = prevToken.string;
-      //Check if backtick is used in table name. If yes, use it for columns too.
-      var useBacktickTable = false;
-      if (table.match(/`/g)) {
-        useBacktickTable = true;
-        table = table.replace(/`/g, "");
-      }
-      //Check if table is available. If not, find table by Alias
-      if (!tables.hasOwnProperty(table))
-        table = findTableByAlias(table, editor);
-      var columns = tables[table];
-      if (!columns) return;
+    // Try to complete table, colunm names and return start position of completion
+    var useBacktick = false;
+    var nameParts = [];
+    var start = token.start;
+    var cont = true;
+    while (cont) {
+      cont = (token.string.charAt(0) == ".");
+      useBacktick = useBacktick || (token.string.charAt(0) == "`");
 
-      if (useBacktick) {
-        addMatches(result, string, columns, function(w) {return "`" + w + "`";});
-      }
-      else if(useBacktickTable) {
-        addMatches(result, string, columns, function(w) {return ".`" + w + "`";});
-      }
-      else {
-        addMatches(result, string, columns, function(w) {return "." + w;});
+      start = token.start;
+      nameParts.unshift(cleanName(token.string));
+
+      token = editor.getTokenAt(Pos(cur.line, token.start));
+      if (token.string == ".") {
+        cont = true;
+        token = editor.getTokenAt(Pos(cur.line, token.start));
       }
     }
-    else {
-      //Suggest table names or colums in defaultTable
-      while (token.start && string.charAt(0) == ".") {
-        token = editor.getTokenAt(Pos(cur.line, token.start - 1));
-        string = token.string + string;
+
+    // Try to complete table names
+    var string = nameParts.join(".");
+    addMatches(result, string, tables, function(w) {
+      if (useBacktick) {
+        return insertBackticks(w);
       }
+      return w;
+    });
+
+    // Try to complete columns from defaultTable
+    addMatches(result, string, defaultTable, function(w) {
       if (useBacktick) {
-        addMatches(result, string, tables, function(w) {return "`" + w + "`";});
-        addMatches(result, string, defaultTable, function(w) {return "`" + w + "`";});
+        return insertBackticks(w);
       }
-      else {
-        addMatches(result, string, tables, function(w) {return w;});
-        addMatches(result, string, defaultTable, function(w) {return w;});
+      return w;
+    });
+
+    // Try to complete columns
+    var table = nameParts.slice(0, nameParts.length - 1).join(".");
+    string = nameParts[nameParts.length - 1];
+
+    //Check if table is available. If not, find table by Alias
+    if (!tables.hasOwnProperty(table))
+      table = findTableByAlias(table, editor);
+
+    var columns = tables[table];
+    addMatches(result, string, columns, function(w) {
+      w = table + "." + w;
+      if (useBacktick) {
+        return insertBackticks(w);
       }
-    }
+      return w;
+    });
+
+    return start;
   }
 
   function eachWord(lineText, f) {
@@ -185,7 +207,7 @@
       search = "";
     }
     if (search.charAt(0) == "." || search.charAt(0) == "`") {
-      nameCompletion(cur, token, result, editor);
+      start = nameCompletion(cur, token, result, editor);
     } else {
       addMatches(result, search, tables, function(w) {return w;});
       addMatches(result, search, defaultTable, function(w) {return w;});

From 26f9b92098324d3fdebaa37ff10ba3c0afeca782 Mon Sep 17 00:00:00 2001
From: Nisarg Jhaveri <nisargjhaveri@gmail.com>
Date: Tue, 17 Feb 2015 22:13:33 +0530
Subject: [PATCH 1908/4742] [sql-hint addon] Add some tests

---
 addon/hint/sql-hint-test.js | 217 ++++++++++++++++++++++++++++++++++++
 test/index.html             |   6 +-
 2 files changed, 222 insertions(+), 1 deletion(-)
 create mode 100644 addon/hint/sql-hint-test.js

diff --git a/addon/hint/sql-hint-test.js b/addon/hint/sql-hint-test.js
new file mode 100644
index 0000000000..636adf9f98
--- /dev/null
+++ b/addon/hint/sql-hint-test.js
@@ -0,0 +1,217 @@
+(function() {
+
+    var Pos = CodeMirror.Pos;
+
+    simpleTables = {
+        "users": ["name", "score", "birthDate"],
+        "countries": ["name", "population", "size"]
+    }
+
+    schemaTables = {
+        "schema.users": ["name", "score", "birthDate"],
+        "schema.countries": ["name", "population", "size"]
+    }
+
+    var tests = [
+        {
+            value: "S",
+            cursor: Pos(0, 1),
+            options: {
+                mode: 'sql',
+                hintOptions: {
+                    tables: simpleTables
+                }
+            },
+            list: [
+                "SELECT",
+                "SET"
+            ],
+            from: Pos(0, 0),
+            to: Pos(0, 1)
+        }, {
+            value: "SELECT * fr",
+            cursor: Pos(0, 11),
+            options: {
+                mode: 'sql',
+                hintOptions: {
+                    tables: simpleTables
+                }
+            },
+            list: [
+                "FROM"
+            ],
+            from: Pos(0, 9),
+            to: Pos(0, 11)
+        }, {
+            value: "SELECT us",
+            cursor: Pos(0, 9),
+            options: {
+                mode: 'sql',
+                hintOptions: {
+                    tables: simpleTables
+                }
+            },
+            list: [
+                "users"
+            ],
+            from: Pos(0, 7),
+            to: Pos(0, 9)
+        },
+        {
+            value: "SELECT users.",
+            cursor: Pos(0, 13),
+            options: {
+                mode: 'sql',
+                hintOptions: {
+                    tables: simpleTables
+                }
+            },
+            list: [
+                "users.name",
+                "users.score",
+                "users.birthDate"
+            ],
+            from: Pos(0, 7),
+            to: Pos(0, 13)
+        },
+        {
+            value: "SELECT users.na",
+            cursor: Pos(0, 15),
+            options: {
+                mode: 'text/x-mysql',
+                hintOptions: {
+                    tables: simpleTables
+                }
+            },
+            list: [
+                "users.name",
+            ],
+            from: Pos(0, 7),
+            to: Pos(0, 15)
+        },
+        {
+            value: "SELECT `users`.`na",
+            cursor: Pos(0, 18),
+            options: {
+                mode: 'text/x-mysql',
+                hintOptions: {
+                    tables: simpleTables
+                }
+            },
+            list: [
+                "`users`.`name`",
+            ],
+            from: Pos(0, 7),
+            to: Pos(0, 18)
+        },
+        {
+            value: "SELECT users.`na",
+            cursor: Pos(0, 16),
+            options: {
+                mode: 'text/x-mysql',
+                hintOptions: {
+                    tables: simpleTables
+                }
+            },
+            list: [
+                "`users`.`name`",
+            ],
+            from: Pos(0, 7),
+            to: Pos(0, 16)
+        },
+        {
+            value: "SELECT sch",
+            cursor: Pos(0, 10),
+            options: {
+                mode: 'sql',
+                hintOptions: {
+                    tables: schemaTables
+                }
+            },
+            list: [
+                "schema.users",
+                "schema.countries"
+            ],
+            from: Pos(0, 7),
+            to: Pos(0, 10)
+        },
+        {
+            value: "SELECT `sch",
+            cursor: Pos(0, 11),
+            options: {
+                mode: 'text/x-mysql',
+                hintOptions: {
+                    tables: schemaTables
+                }
+            },
+            list: [
+                "`schema`.`users`",
+                "`schema`.`countries`"
+            ],
+            from: Pos(0, 7),
+            to: Pos(0, 11)
+        },
+        {
+            value: "SELECT `schema`.`users`.",
+            cursor: Pos(0, 24),
+            options: {
+                mode: 'text/x-mysql',
+                hintOptions: {
+                    tables: schemaTables
+                }
+            },
+            list: [
+                "`schema`.`users`.`name`",
+                "`schema`.`users`.`score`",
+                "`schema`.`users`.`birthDate`"
+            ],
+            from: Pos(0, 7),
+            to: Pos(0, 24)
+        },
+        {
+            value: "SELECT schema.users.",
+            cursor: Pos(0, 20),
+            options: {
+                mode: 'sql',
+                hintOptions: {
+                    tables: schemaTables
+                }
+            },
+            list: [
+                "schema.users.name",
+                "schema.users.score",
+                "schema.users.birthDate"
+            ],
+            from: Pos(0, 7),
+            to: Pos(0, 20)
+        }
+    ];
+
+    for (var testNum = 0; testNum < tests.length; testNum++) {
+        testCM('sql-hint-' + (testNum + 1), (function(testNum, cm) {
+            var test = tests[testNum];
+            cm.setValue(test.value);
+            cm.setCursor(test.cursor);
+            completion = CodeMirror.hint.sql(cm, test.options.hintOptions);
+            if (!isEqPos(completion.from, test.from) || !isEqPos(completion.to, test.to)
+                || !isEqList(completion.list, test.list)) {
+                    throw new Failure('Sql hint test failed.');
+            }
+        }).bind(undefined, testNum), tests[testNum].options);
+    }
+
+    function isEqPos(pos1, pos2) {
+        return (pos1.line == pos2.line) && (pos1.ch == pos2.ch)
+    }
+
+    function isEqList(list1, list2) {
+        if(list1.length != list2.length)
+            return false;
+        for(var i = list1.length; i--;) {
+            if(list1[i] !== list2[i])
+                return false;
+        }
+        return true;
+    }
+
+})();
diff --git a/test/index.html b/test/index.html
index 34450bc3f8..28db43e795 100644
--- a/test/index.html
+++ b/test/index.html
@@ -34,6 +34,9 @@
 <script src="../keymap/emacs.js"></script>
 <script src="../keymap/sublime.js"></script>
 <script src="../keymap/vim.js"></script>
+<!-- For testing sql-hint -->
+<script src="../mode/sql/sql.js"></script>
+<script src="../addon/hint/sql-hint.js"></script>
 
 <style type="text/css">
   .ok {color: #090;}
@@ -93,7 +96,7 @@ <h2>Test Suite</h2>
     <script src="comment_test.js"></script>
     <script src="search_test.js"></script>
     <script src="mode_test.js"></script>
-    
+
     <script src="../mode/css/test.js"></script>
     <script src="../mode/css/scss_test.js"></script>
     <script src="../mode/css/less_test.js"></script>
@@ -114,6 +117,7 @@ <h2>Test Suite</h2>
     <script src="emacs_test.js"></script>
     <script src="sublime_test.js"></script>
     <script src="vim_test.js"></script>
+    <script src="../addon/hint/sql-hint-test.js"></script>
     <script>
       window.onload = runHarness;
       CodeMirror.on(window, 'hashchange', runHarness);

From a1cdedd2921037fc78609eae95c466a7882d65ea Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 17 Feb 2015 23:12:21 +0100
Subject: [PATCH 1909/4742] [sql-mode] Clean up tests

---
 addon/hint/sql-hint-test.js | 217 ------------------------------------
 test/index.html             |   7 +-
 test/sql-hint-test.js       | 145 ++++++++++++++++++++++++
 3 files changed, 148 insertions(+), 221 deletions(-)
 delete mode 100644 addon/hint/sql-hint-test.js
 create mode 100644 test/sql-hint-test.js

diff --git a/addon/hint/sql-hint-test.js b/addon/hint/sql-hint-test.js
deleted file mode 100644
index 636adf9f98..0000000000
--- a/addon/hint/sql-hint-test.js
+++ /dev/null
@@ -1,217 +0,0 @@
-(function() {
-
-    var Pos = CodeMirror.Pos;
-
-    simpleTables = {
-        "users": ["name", "score", "birthDate"],
-        "countries": ["name", "population", "size"]
-    }
-
-    schemaTables = {
-        "schema.users": ["name", "score", "birthDate"],
-        "schema.countries": ["name", "population", "size"]
-    }
-
-    var tests = [
-        {
-            value: "S",
-            cursor: Pos(0, 1),
-            options: {
-                mode: 'sql',
-                hintOptions: {
-                    tables: simpleTables
-                }
-            },
-            list: [
-                "SELECT",
-                "SET"
-            ],
-            from: Pos(0, 0),
-            to: Pos(0, 1)
-        }, {
-            value: "SELECT * fr",
-            cursor: Pos(0, 11),
-            options: {
-                mode: 'sql',
-                hintOptions: {
-                    tables: simpleTables
-                }
-            },
-            list: [
-                "FROM"
-            ],
-            from: Pos(0, 9),
-            to: Pos(0, 11)
-        }, {
-            value: "SELECT us",
-            cursor: Pos(0, 9),
-            options: {
-                mode: 'sql',
-                hintOptions: {
-                    tables: simpleTables
-                }
-            },
-            list: [
-                "users"
-            ],
-            from: Pos(0, 7),
-            to: Pos(0, 9)
-        },
-        {
-            value: "SELECT users.",
-            cursor: Pos(0, 13),
-            options: {
-                mode: 'sql',
-                hintOptions: {
-                    tables: simpleTables
-                }
-            },
-            list: [
-                "users.name",
-                "users.score",
-                "users.birthDate"
-            ],
-            from: Pos(0, 7),
-            to: Pos(0, 13)
-        },
-        {
-            value: "SELECT users.na",
-            cursor: Pos(0, 15),
-            options: {
-                mode: 'text/x-mysql',
-                hintOptions: {
-                    tables: simpleTables
-                }
-            },
-            list: [
-                "users.name",
-            ],
-            from: Pos(0, 7),
-            to: Pos(0, 15)
-        },
-        {
-            value: "SELECT `users`.`na",
-            cursor: Pos(0, 18),
-            options: {
-                mode: 'text/x-mysql',
-                hintOptions: {
-                    tables: simpleTables
-                }
-            },
-            list: [
-                "`users`.`name`",
-            ],
-            from: Pos(0, 7),
-            to: Pos(0, 18)
-        },
-        {
-            value: "SELECT users.`na",
-            cursor: Pos(0, 16),
-            options: {
-                mode: 'text/x-mysql',
-                hintOptions: {
-                    tables: simpleTables
-                }
-            },
-            list: [
-                "`users`.`name`",
-            ],
-            from: Pos(0, 7),
-            to: Pos(0, 16)
-        },
-        {
-            value: "SELECT sch",
-            cursor: Pos(0, 10),
-            options: {
-                mode: 'sql',
-                hintOptions: {
-                    tables: schemaTables
-                }
-            },
-            list: [
-                "schema.users",
-                "schema.countries"
-            ],
-            from: Pos(0, 7),
-            to: Pos(0, 10)
-        },
-        {
-            value: "SELECT `sch",
-            cursor: Pos(0, 11),
-            options: {
-                mode: 'text/x-mysql',
-                hintOptions: {
-                    tables: schemaTables
-                }
-            },
-            list: [
-                "`schema`.`users`",
-                "`schema`.`countries`"
-            ],
-            from: Pos(0, 7),
-            to: Pos(0, 11)
-        },
-        {
-            value: "SELECT `schema`.`users`.",
-            cursor: Pos(0, 24),
-            options: {
-                mode: 'text/x-mysql',
-                hintOptions: {
-                    tables: schemaTables
-                }
-            },
-            list: [
-                "`schema`.`users`.`name`",
-                "`schema`.`users`.`score`",
-                "`schema`.`users`.`birthDate`"
-            ],
-            from: Pos(0, 7),
-            to: Pos(0, 24)
-        },
-        {
-            value: "SELECT schema.users.",
-            cursor: Pos(0, 20),
-            options: {
-                mode: 'sql',
-                hintOptions: {
-                    tables: schemaTables
-                }
-            },
-            list: [
-                "schema.users.name",
-                "schema.users.score",
-                "schema.users.birthDate"
-            ],
-            from: Pos(0, 7),
-            to: Pos(0, 20)
-        }
-    ];
-
-    for (var testNum = 0; testNum < tests.length; testNum++) {
-        testCM('sql-hint-' + (testNum + 1), (function(testNum, cm) {
-            var test = tests[testNum];
-            cm.setValue(test.value);
-            cm.setCursor(test.cursor);
-            completion = CodeMirror.hint.sql(cm, test.options.hintOptions);
-            if (!isEqPos(completion.from, test.from) || !isEqPos(completion.to, test.to)
-                || !isEqList(completion.list, test.list)) {
-                    throw new Failure('Sql hint test failed.');
-            }
-        }).bind(undefined, testNum), tests[testNum].options);
-    }
-
-    function isEqPos(pos1, pos2) {
-        return (pos1.line == pos2.line) && (pos1.ch == pos2.ch)
-    }
-
-    function isEqList(list1, list2) {
-        if(list1.length != list2.length)
-            return false;
-        for(var i = list1.length; i--;) {
-            if(list1[i] !== list2[i])
-                return false;
-        }
-        return true;
-    }
-
-})();
diff --git a/test/index.html b/test/index.html
index 28db43e795..d7fdede74e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -13,6 +13,7 @@
 <script src="../addon/search/searchcursor.js"></script>
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/edit/matchbrackets.js"></script>
+<script src="../addon/hint/sql-hint.js"></script>
 <script src="../addon/comment/comment.js"></script>
 <script src="../mode/css/css.js"></script>
 <script src="../mode/clike/clike.js"></script>
@@ -26,6 +27,7 @@
 <script src="../mode/ruby/ruby.js"></script>
 <script src="../mode/shell/shell.js"></script>
 <script src="../mode/slim/slim.js"></script>
+<script src="../mode/sql/sql.js"></script>
 <script src="../mode/stex/stex.js"></script>
 <script src="../mode/textile/textile.js"></script>
 <script src="../mode/verilog/verilog.js"></script>
@@ -34,9 +36,6 @@
 <script src="../keymap/emacs.js"></script>
 <script src="../keymap/sublime.js"></script>
 <script src="../keymap/vim.js"></script>
-<!-- For testing sql-hint -->
-<script src="../mode/sql/sql.js"></script>
-<script src="../addon/hint/sql-hint.js"></script>
 
 <style type="text/css">
   .ok {color: #090;}
@@ -115,9 +114,9 @@ <h2>Test Suite</h2>
     <script src="../mode/xquery/test.js"></script>
     <script src="../addon/mode/multiplex_test.js"></script>
     <script src="emacs_test.js"></script>
+    <script src="sql-hint-test.js"></script>
     <script src="sublime_test.js"></script>
     <script src="vim_test.js"></script>
-    <script src="../addon/hint/sql-hint-test.js"></script>
     <script>
       window.onload = runHarness;
       CodeMirror.on(window, 'hashchange', runHarness);
diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
new file mode 100644
index 0000000000..0c5ffdfba1
--- /dev/null
+++ b/test/sql-hint-test.js
@@ -0,0 +1,145 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var Pos = CodeMirror.Pos;
+
+  var simpleTables = {
+    "users": ["name", "score", "birthDate"],
+    "xcountries": ["name", "population", "size"]
+  };
+
+  var schemaTables = {
+    "schema.users": ["name", "score", "birthDate"],
+    "schema.countries": ["name", "population", "size"]
+  };
+
+  namespace = "sql-hint_";
+
+  function test(name, spec) {
+    testCM(name, function(cm) {
+      cm.setValue(spec.value);
+      cm.setCursor(spec.cursor);
+      var completion = CodeMirror.hint.sql(cm, {tables: spec.tables});
+      if (!isEqList(completion.list, spec.list))
+        throw new Failure("Wrong completion results " + completion.list + " vs " + spec.list);
+      eqPos(completion.from, spec.from);
+      eqPos(completion.to, spec.to);
+    }, {
+      value: spec.value,
+      mode: "text/x-mysql"
+    });
+  }
+
+  test("keywords", {
+    value: "SEL",
+    cursor: Pos(0, 3),
+    list: ["SELECT"],
+    from: Pos(0, 0),
+    to: Pos(0, 3)
+  });
+
+  test("from", {
+    value: "SELECT * fr",
+    cursor: Pos(0, 11),
+    list: ["FROM"],
+    from: Pos(0, 9),
+    to: Pos(0, 11)
+  });
+
+  test("table", {
+    value: "SELECT xc",
+    cursor: Pos(0, 9),
+    tables: simpleTables,
+    list: ["xcountries"],
+    from: Pos(0, 7),
+    to: Pos(0, 9)
+  });
+
+  test("columns", {
+    value: "SELECT users.",
+    cursor: Pos(0, 13),
+    tables: simpleTables,
+    list: ["users.name", "users.score", "users.birthDate"],
+    from: Pos(0, 7),
+    to: Pos(0, 13)
+  });
+
+  test("singlecolumn", {
+    value: "SELECT users.na",
+    cursor: Pos(0, 15),
+    tables: simpleTables,
+    list: ["users.name"],
+    from: Pos(0, 7),
+    to: Pos(0, 15)
+  });
+
+  test("quoted", {
+    value: "SELECT `users`.`na",
+    cursor: Pos(0, 18),
+    tables: simpleTables,
+    list: ["`users`.`name`"],
+    from: Pos(0, 7),
+    to: Pos(0, 18)
+  });
+
+  test("quotedcolumn", {
+    value: "SELECT users.`na",
+    cursor: Pos(0, 16),
+    tables: simpleTables,
+    list: ["`users`.`name`"],
+    from: Pos(0, 7),
+    to: Pos(0, 16)
+  });
+
+  test("schema", {
+    value: "SELECT schem",
+    cursor: Pos(0, 12),
+    tables: schemaTables,
+    list: ["schema.users", "schema.countries",
+           "SCHEMA", "SCHEMA_NAME", "SCHEMAS"],
+    from: Pos(0, 7),
+    to: Pos(0, 12)
+  });
+
+  test("schemaquoted", {
+    value: "SELECT `sch",
+    cursor: Pos(0, 11),
+    tables: schemaTables,
+    list: ["`schema`.`users`", "`schema`.`countries`"],
+    from: Pos(0, 7),
+    to: Pos(0, 11)
+  });
+
+  test("schemacolumn", {
+    value: "SELECT schema.users.",
+    cursor: Pos(0, 20),
+    tables: schemaTables,
+    list: ["schema.users.name",
+           "schema.users.score",
+           "schema.users.birthDate"],
+    from: Pos(0, 7),
+    to: Pos(0, 20)
+  });
+
+  test("schemacolumnquoted", {
+    value: "SELECT `schema`.`users`.",
+    cursor: Pos(0, 24),
+    tables: schemaTables,
+    list: ["`schema`.`users`.`name`",
+           "`schema`.`users`.`score`",
+           "`schema`.`users`.`birthDate`"],
+    from: Pos(0, 7),
+    to: Pos(0, 24)
+  });
+
+  function isEqList(list1, list2) {
+    if (list1.length != list2.length)
+      return false;
+    for (var i = list1.length; i--;) {
+      if (list1[i] !== list2[i])
+        return false;
+    }
+    return true;
+  }
+})();

From e48811db7cc54a384fd2a3d41530d9a989ea2a58 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 18 Feb 2015 11:00:39 +0100
Subject: [PATCH 1910/4742] [clike mode] Properly tokenize Scala symbols

Closes #3091
---
 mode/clike/clike.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index a49702161f..e2223ccd15 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -398,6 +398,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         if (!stream.match('""')) return false;
         state.tokenize = tokenTripleString;
         return state.tokenize(stream, state);
+      },
+      "'": function(stream) {
+        stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+        return "atom";
       }
     }
   });

From 9b88b78f27262bde8a6c60e53c3ebb76785a52f9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 18 Feb 2015 12:07:27 +0100
Subject: [PATCH 1911/4742] [real-world uses] Add a link

---
 doc/realworld.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index 1214b8b7b5..7a326cf238 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -22,8 +22,7 @@
 <h2>CodeMirror real-world uses</h2>
 
     <p>Create a <a href="https://github.com/codemirror/codemirror">pull
-    request</a> or <a href="mailto:marijnh@gmail.com">email me</a> if
-    you'd like your project to be added to this list.</p>
+    request</a> if you'd like your project to be added to this list.</p>
 
     <ul>
       <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
@@ -89,6 +88,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://try.haxe.org">Haxe</a> (Haxe Playground) </li>
       <li><a href="http://haxpad.com/">HaxPad</a> (editor for Win RT)</li>
       <li><a href="http://megafonweblab.github.com/histone-javascript/">Histone template engine playground</a></li>
+      <li><a href="http://www.homegenie.it/docs/automation_getstarted.php">Homegenie</a> (home automation server)</li>
       <li><a href="http://icecoder.net">ICEcoder</a> (web IDE)</li>
       <li><a href="http://ipython.org/">IPython</a> (interactive computing shell)</li>
       <li><a href="http://i-mos.org/imos/">i-MOS</a> (modeling and simulation platform)</li>

From 2b187734e68315ff93effe254272d5fbf2637b8f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 19 Feb 2015 09:01:19 +0100
Subject: [PATCH 1912/4742] [annotatescrollbars addon] Fix race condition,
 listen to markerCleared

---
 addon/scroll/annotatescrollbar.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 08b8fe07b0..d0c367a88f 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -20,19 +20,28 @@
     this.cm = cm;
     this.options = options;
     this.annotations = [];
+    this.doRedraw = this.doUpdate = null;
     this.div = cm.getWrapperElement().appendChild(document.createElement("div"));
     this.div.style.cssText = "position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none";
     this.computeScale();
 
+    function scheduleRedraw(delay) {
+      clearTimeout(self.doRedraw);
+      self.doRedraw = setTimeout(function() { self.redraw(); }, delay);
+    }
+
     var self = this;
     cm.on("refresh", this.resizeHandler = function() {
-      if (self.computeScale()) self.redraw(false);
+      clearTimeout(self.doUpdate);
+      self.doUpdate = setTimeout(function() {
+        if (self.computeScale()) scheduleRedraw(20);
+      }, 100);
     });
     cm.on("markerAdded", this.resizeHandler);
+    cm.on("markerCleared", this.resizeHandler);
     if (options.listenForChanges !== false)
       cm.on("change", this.changeHandler = function() {
-        clearTimeout(self.changed);
-        self.changed = setTimeout(function() { self.redraw(); }, 250);
+        scheduleRedraw(250);
       });
   }
 
@@ -80,6 +89,7 @@
   Annotation.prototype.clear = function() {
     this.cm.off("refresh", this.resizeHandler);
     this.cm.off("markerAdded", this.resizeHandler);
+    this.cm.off("markerCleared", this.resizeHandler);
     if (this.changeHandler) this.cm.off("change", this.changeHandler);
     this.div.parentNode.removeChild(this.div);
   };

From 725ef6668edaf936ab9e8491c19784c424973100 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 19 Feb 2015 09:58:37 +0100
Subject: [PATCH 1913/4742] [merge addon] When aligning, align whole document
 at once

To prevent scrolling artifacts
---
 addon/merge/merge.js | 53 +++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 688aeb9967..c8115103de 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -91,9 +91,13 @@
         alignChunks(dv);
       updating = false;
     }
-    function set() {
+    function setDealign() {
       if (updating) return;
       dv.dealigned = true;
+      set();
+    }
+    function set() {
+      if (updating) return;
       clearTimeout(debounceChange);
       debounceChange = setTimeout(update, 250);
     }
@@ -102,14 +106,14 @@
         dv.diffOutOfDate = true;
         edit.from = edit.to = orig.from = orig.to = 0;
       }
-      set();
+      setDealign();
     }
     dv.edit.on("change", change);
     dv.orig.on("change", change);
-    dv.edit.on("markerAdded", set);
-    dv.edit.on("markerCleared", set);
-    dv.orig.on("markerAdded", set);
-    dv.orig.on("markerCleared", set);
+    dv.edit.on("markerAdded", setDealign);
+    dv.edit.on("markerCleared", setDealign);
+    dv.orig.on("markerAdded", setDealign);
+    dv.orig.on("markerCleared", setDealign);
     dv.edit.on("viewportChange", set);
     dv.orig.on("viewportChange", set);
     update();
@@ -341,46 +345,29 @@
       aligners[i].clear();
     aligners.length = 0;
 
-    var cm = [dv.orig, dv.edit], vp = [], scroll = [];
+    var cm = [dv.orig, dv.edit], scroll = [];
     if (other) cm.push(other.orig);
-    for (var i = 0; i < cm.length; i++) {
-      vp.push(cm[i].getViewport());
+    for (var i = 0; i < cm.length; i++)
       scroll.push(cm[i].getScrollInfo().top);
-    }
 
-    var spaceAbove = [0, 0, 0];
-    for (var ln = 0; ln < linesToAlign.length; ln++) {
-      var lines = linesToAlign[ln];
-      var above = true, below = true;
-      for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
-        if (lines[i] >= vp[i].from) above = false;
-        if (lines[i] <= vp[i].to) below = false;
-      }
-      alignLines(cm, lines, aligners, spaceAbove, above);
-      if (below) break;
-    }
-    if (dv.lockScroll)
-      scroll[0] = scroll[1] = Math.max(scroll[0], scroll[1]);
-    for (var i = 0; i < cm.length; i++) {
-      if (spaceAbove[i])
-        aligners.push(padAbove(cm[i], 0, spaceAbove[i]));
+    for (var ln = 0; ln < linesToAlign.length; ln++)
+      alignLines(cm, linesToAlign[ln], aligners);
+
+    for (var i = 0; i < cm.length; i++)
       cm[i].scrollTo(null, scroll[i]);
-    }
   }
 
-  function alignLines(cm, lines, aligners, spaceAbove, isAboveViewport) {
+  function alignLines(cm, lines, aligners) {
     var maxOffset = 0, offset = [];
     for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
-      var off = cm[i].heightAtLine(lines[i], "local") + spaceAbove[i];
+      var off = cm[i].heightAtLine(lines[i], "local");
       offset[i] = off;
       maxOffset = Math.max(maxOffset, off);
     }
     for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
       var diff = maxOffset - offset[i];
-      if (diff > 1) {
-        if (isAboveViewport) spaceAbove[i] += diff;
-        else aligners.push(padAbove(cm[i], lines[i], diff));
-      }
+      if (diff > 1)
+        aligners.push(padAbove(cm[i], lines[i], diff));
     }
   }
 

From 7c2d81c7c8e94cbe0c0d5f4f698109c963af782a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 19 Feb 2015 10:41:30 +0100
Subject: [PATCH 1914/4742] Fire update and viewportChange events synchronously

They were unintentionally falling outside of the operation
---
 lib/codemirror.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 862855e94c..63eb011f79 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -650,8 +650,18 @@
     this.oldDisplayWidth = displayWidth(cm);
     this.force = force;
     this.dims = getDimensions(cm);
+    this.events = [];
   }
 
+  DisplayUpdate.prototype.signal = function(emitter, type) {
+    if (hasHandler(emitter, type))
+      this.events.push(arguments);
+  };
+  DisplayUpdate.prototype.finish = function() {
+    for (var i = 0; i < this.events.length; i++)
+      signal.apply(null, this.events[i]);
+  };
+
   function maybeClipScrollbars(cm) {
     var display = cm.display;
     if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
@@ -762,9 +772,9 @@
       updateScrollbars(cm, barMeasure);
     }
 
-    signalLater(cm, "update", cm);
+    update.signal(cm, "update", cm);
     if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
-      signalLater(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
+      update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
       cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
     }
   }
@@ -778,6 +788,7 @@
       updateSelection(cm);
       setDocumentHeight(cm, barMeasure);
       updateScrollbars(cm, barMeasure);
+      update.finish();
     }
   }
 
@@ -2238,6 +2249,8 @@
     // Fire change events, and delayed event handlers
     if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);
+    if (op.update)
+      op.update.finish();
   }
 
   // Run the given function in an operation

From de6848600acb7b6f22fc1d7ea0d4094ca5faeced Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 19 Feb 2015 10:42:28 +0100
Subject: [PATCH 1915/4742] [merge addon] Update display faster on changes that
 add/remove lines

---
 addon/merge/merge.js | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index c8115103de..f1f3aafc49 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -70,9 +70,10 @@
   function registerUpdate(dv) {
     var edit = {from: 0, to: 0, marked: []};
     var orig = {from: 0, to: 0, marked: []};
-    var debounceChange;
+    var debounceChange, updatingFast = false;
     function update(mode) {
       updating = true;
+      updatingFast = false;
       if (mode == "full") {
         if (dv.svg) clear(dv.svg);
         if (dv.copyButtons) clear(dv.copyButtons);
@@ -91,22 +92,24 @@
         alignChunks(dv);
       updating = false;
     }
-    function setDealign() {
+    function setDealign(fast) {
       if (updating) return;
       dv.dealigned = true;
-      set();
+      set(fast);
     }
-    function set() {
-      if (updating) return;
+    function set(fast) {
+      if (updating || updatingFast) return;
       clearTimeout(debounceChange);
-      debounceChange = setTimeout(update, 250);
+      if (fast === true) updatingFast = true;
+      debounceChange = setTimeout(update, fast === true ? 20 : 250);
     }
-    function change() {
+    function change(_cm, change) {
       if (!dv.diffOutOfDate) {
         dv.diffOutOfDate = true;
         edit.from = edit.to = orig.from = orig.to = 0;
       }
-      setDealign();
+      // Update faster when a line was added/removed
+      setDealign(change.text.length - 1 != change.to.line - change.from.line);
     }
     dv.edit.on("change", change);
     dv.orig.on("change", change);
@@ -114,8 +117,8 @@
     dv.edit.on("markerCleared", setDealign);
     dv.orig.on("markerAdded", setDealign);
     dv.orig.on("markerCleared", setDealign);
-    dv.edit.on("viewportChange", set);
-    dv.orig.on("viewportChange", set);
+    dv.edit.on("viewportChange", function() { set(false); });
+    dv.orig.on("viewportChange", function() { set(false); });
     update();
     return update;
   }
@@ -437,6 +440,7 @@
     var hasLeft = origLeft != null, hasRight = origRight != null;
     var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
     var wrap = [], left = this.left = null, right = this.right = null;
+    var self = this;
 
     if (hasLeft) {
       left = this.left = new DiffView(this, "left");
@@ -465,8 +469,13 @@
     if (left) left.init(leftPane, origLeft, options);
     if (right) right.init(rightPane, origRight, options);
 
-    if (options.collapseIdentical)
-      collapseIdenticalStretches(this, options.collapseIdentical);
+    if (options.collapseIdentical) {
+      updating = true;
+      this.editor().operation(function() {
+        collapseIdenticalStretches(self, options.collapseIdentical);
+      });
+      updating = false;
+    }
     if (options.connect == "align") {
       this.aligners = [];
       alignChunks(this.left || this.right, true);

From 68847ad9d5913c271050a5de4d647803ccfe5c42 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 15 Feb 2015 11:56:50 +0100
Subject: [PATCH 1916/4742] [frontpage] Overhaul the download and donate part

---
 bin/release     |   4 +--
 doc/docs.css    |  88 ++++++++++++++++++++++++++++++++----------------
 doc/yinyang.png | Bin 0 -> 4633 bytes
 index.html      |  58 +++++++++++++++----------------
 4 files changed, 88 insertions(+), 62 deletions(-)
 create mode 100644 doc/yinyang.png

diff --git a/bin/release b/bin/release
index ba6630aaa8..c6b97c1c03 100755
--- a/bin/release
+++ b/bin/release
@@ -41,6 +41,6 @@ rewrite("doc/compress.html", function(cmp) {
 });
 
 rewrite("index.html", function(index) {
-  return index.replace(/<strong>version \d+\.\d+<\/strong>/,
-                       "<strong>version " + simple + "</strong>");
+  return index.replace(/\.zip">\d+\.\d+<\/a>/,
+                       ".zip>" + simple + "</a>");
 });
diff --git a/doc/docs.css b/doc/docs.css
index 837ba69782..881d2aa455 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -148,49 +148,79 @@ section.first {
   z-index: 25;
 }
 
-.bankinfo {
-  text-align: left;
-  display: none;
-  padding: 0 .5em;
+.yinyang {
   position: absolute;
-  border: 2px solid #aaa;
-  border-radius: 5px;
-  background: #eee;
-  top: 10px;
-  left: 30px;
+  top: -10px;
+  left: 0; right: 0;
+  margin: auto;
+  display: block;
+  height: 120px;
+}
+
+.actions {
+  margin: 1em 0 0;
+  min-height: 100px;
+  position: relative;
 }
 
-.bankinfo_close {
+.actionspicture {
+  pointer-events: none;
   position: absolute;
-  top: 0; right: 6px;
+  height: 100px;
+  top: 0; left: 0; right: 0;
+}
+
+.actionlink {
+  pointer-events: auto;
+  font-family: arial;
+  font-size: 80%;
   font-weight: bold;
-  cursor: pointer;
+  position: absolute;
+  top: 0; bottom: 0;
+  line-height: 1;
+  height: 1em;
+  margin: auto;
 }
 
-.bigbutton {
-  cursor: pointer;
-  text-align: center;
-  padding: 0 1em;
-  display: inline-block;
+.actionlink.download {
   color: white;
-  position: relative;
-  line-height: 1.9;
-  color: white !important;
-  background: #A21313;
+  right: 50%;
+  margin-right: 13px;
+  text-shadow: -1px 1px 3px #b00, -1px -1px 3px #b00, 1px 0px 3px #b00;
+}
+
+.actionlink.fund {
+  color: #b00;
+  left: 50%;
+  margin-left: 15px;
+}
+
+.actionlink:hover {
+  text-decoration: underline;
+}
+
+.actionlink a {
+  color: inherit;
 }
 
-.bigbutton.right {
-  border-bottom-left-radius: 100px;
-  border-top-left-radius: 100px;
+.actionsleft {
+  float: left;
 }
 
-.bigbutton.left {
-  border-bottom-right-radius: 100px;
-  border-top-right-radius: 100px;
+.actionsright {
+  float: right;
+  text-align: right;
 }
 
-.bigbutton:hover {
-  background: #E30808;
+@media screen and (max-width: 800px) {
+  .actions {
+    padding-top: 120px;
+  }
+  .actionsleft, .actionsright {
+    float: none;
+    text-align: left;
+    margin-bottom: 1em;
+  }
 }
 
 th {
diff --git a/doc/yinyang.png b/doc/yinyang.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eafd3f1ca137898ede8c27d0e64d99919bdc1ab
GIT binary patch
literal 4633
zcmV+!66WoRP)<h;3K|Lk000e1NJLTq004LZ004Lh1^@s6Ib=4{00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY5={UA5_AFm6G<Ha000McNliru-vSc~2OL2M;1vJ>02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{01<&nL_t(|+U=cPY#Y~=$Nxhy
zV#HV?X-TGS*&^w9;jhFRrrmgx#ahFz1vCy?kuL#aq!!t?6h%Z81?uLZB43geHDU@V
z+Mp;vst;|SN~%ad0C~-k)9hlmSaX=zPPDc)WGqXTMTJAjrb?Oe-3N*cW$Tk1&I~CX
zfUqS?^p$>dKJU5bQiKrHlFYFz0f02eVNnnYpU(;c7Gg1IX}a*adb1fCv$^nbBg0Ur
zF`=pzaE9keIvT}1$05D+nvTcOcJd?uKugo8)9VXguh#2PZ#E;%afQz<#A3+AVug?I
zT)vD}lL=ayhL)z$$S`Q==;%@#3>UWnOCae;gd_$BF~_o)9vj1Ms}+q511(KMV>Ux;
zwTkiJV2))A4^1)jMuvgDyBivdh1v!zk|aYRB7{O14+gQ*Y=+)$hrw<a1?DCmETlOO
zb1aK^Fo@Oz2hielqOr3RTC0`X23&&qof#ZNA`n2GP6wmgjYfun#$r*5B|#z(fDj4+
z6onS26U{w6%G7K^h+<x;OP9!4PY($<Hj=TkXUT&rSIFb?;K~&;8xE6)Uw%oHAP=rw
zA!BFH=GNTPLsFM65heXj6`{ei;V_x>dXeFI?DcrCgJCeg6hO_fEbc`jSeTt%_4{{s
zbQA)kyswm6vdJW70s&0<e5f-RV063D;&f75+C*n~p2S?P0@yl(0W*OB;zL7ay>ER}
z6HG1_T6%gU_0>fWEG9f2EX3n5`~7IL*{CfAIK%T~!s|u+4}ZXscizEbB7s{MF084g
zrAn*G1f$!XkA5Ww9dkONu~@LDzh4&6k^`Rd`N*|%=U`}RLW|3V*asg}1nf#${cK+!
z_If;$KhO!k9}^xA8f`Z0zi>g)yjn8A8J;J%91cv~xPeFMv}|sn)nv+>P04-ql+TAT
zpAXLk0x&onRLuaM@Oa4RyYJ%B!h&M5hXXx5*ni;y)CPkrW?S!YU~hka#kE;g;ivZ0
zXJ7w18U5MMkW~;|02mt_#Hh`NY%(e7|J!7<;V8!egy6c>I-HI~NL6ZZIuarO{qoDX
zd@PeuY^7&+M+Yo^ziiR=mF{jlH!y$}my4<zz*9aSx&EUcDas_T7l3_@Wo3b!jzn<N
zZbysDg}ojRrFg(&XU>o>KKu}ib91OBkrQ$@nZzi=Kx?(a5(tP2S+xx}CkwN);9V}s
zeKG*34F()yS%45+qiK>&CQm5}a5kAdHFo9<nfl9LsuFHq?na}SkReabL$(YKLfg@S
zQJZa8F(x{jOr9D&d2)Dmd>rYb4vK1)f4+1{@;td%_?{ksqC_#*WdpwU{PU!i;O71D
zOR<>bIdUZ+mt~^I&YY<^xOsnk+wGQh4VJ+{WOyFD(@A6je5b#keDUFjH3zrw@c!mE
z$nd<ZYd9DR<(dopej+L0gx^nYzW;tz2UHsoxdN`@!0TWrgsZ*1D7E6XX&;=gP(Av`
zKTzwU1YZmQ$zTvyold+Ii*34gy(taOCX=Uby!t8#C2ym`uA*M%O8ep|pHKD&&ERn0
zfZL5*4##jsHTa9(UNZgL-$F<vB>e&R&@_y_y=Y_@)EB{Bh{Z6+vY7CCaj&SqS!^x-
zw^T|I7UlEKPBbzM+Pq#$bim1AkbH9XEVB3SOZEdb=yZ5K6xvXa)l48zG0<}7#d*o_
zJpQYr1209R8}8uTkcrMFlczp;;|)pS?xAT|S$4w>bj?mDjz%KbQ*<;%ESY0jMQE_b
zV!;uw7crMhTpxVf?H-0&Eh*eX;V>FD39C-8$H8C_4LV&-0tNtMUmpk|n7VLbL#B6K
z6FnOalc?P;N#9gnUgkJ7baa&b{qr1$2*Y4rB;TndKfIL5;C~qgFLK<vrg~isp7`;P
z@$lh8$risqci^i$-%Zol>u`t~O{XIf#Q@e?tvKLzZzxY!t*5<{pMDB5KQGzh#p-(0
z+wG#RE32@Iozd+^JQzfV=Sj(cW8e9Xq#clZXc{{@JH-Lq-7TswUZ_wSR;s8Ch7AQ=
zs{&5={UjxEDN<c@o>vrWAflPhC=75u;L7kkX2W5!X~2{3y(ej4wJoK)v`Mdba~eDw
z4wJ<Axa5m%5IKikP@vX{EiFrDyH?ZU6#-BG{O7WqK3J^Ltw$-ecqS0om<DHfp2Yw3
zCs`Ic5e#Bc#C%gszp1T2g-k5b+wF)4gIK9q?+L((Kmd63NS1}pr&767^CHO1;Gn2=
zX^liXSfxhPCWix4KHn3&O;1#^xLv!*%=ENui#6Nrcs3X;`+YvOSVRT<?+Tw~l8!`h
z)8WAJSd3a#gVT`+Nj`WW>q29p5M~Ak%X*LdBO{{1-F^JH;{CAJYDJw+hh#8FRt22;
z^Pgos+F7t7PABH0(bCL(G>T8UyG31(lFjq7yx8r2!o@8EJpJomD`v5g&dyCko*5j>
zeV@o119Hs#D0Q9Vs{zjNJW1TSqnO3cr&9P&nnuj!!a_X0c6yacVbbf(X?_KEeZ;P7
zS4uP%3wD~#%Nq0wo4jI0uVTxsKmfM_0X*w;LT|T2t=FT0rZLZP$O;04PzV#jU`4<J
zfa%-cR?K{^jcRcs5J3CVA-b;s4-J7xxGh);XsnXVS31Y6CTVdx!53{n6ioD&B?dLM
zEOm{IRR>sWwPJc~tgwx!0&+c9>FqM%ljhmski93mq_oazEmZMT0FdUmVM?RfCi<B6
z?v?puLpgpp-$$kba!qAQo}(d${8L|FRRvee%=A(a`W4`d7q^KPNo#vM+Sb@(ReZW+
zHY2?hQ>g&p{^;m7)gm#=5Uq<IXf4$aQ~;2gnc1eAH_dOorHE4u<x1Phlb8*MiE1_+
zCe23UHdz1%&Yng4z(7s?OgRmfuq{@xsm1Z**sp+-gklF;s%^c^!9B#XRhjdyn&#>C
z$O;0~3$YloTey3&818Dvc&MfG(ChuXB29E=3v?c?CWn9W6CC9@)amuP`wb{+#aA)N
z)&4zyM}pEsy%oW>wzuOzFo<WYR?)O?B`udzv(-x`ddvCXLvO#0=WgD_ju&322!LYE
zmQ$<i&1TGV9MtngSH0D;XmmOp3j|=0aChi&t(H=w(;SBenufZ*O8Sk;O8OZF7QbJ%
z-l}44mfCEq>O?;9r8GIx-;cxLu<VU<#b$du$P&pUzreDJJCRTfxsuvE&v9sWI&(o*
zOMCk^T!|sCl~;=)SwTRZUJsR8uLrW(ZMZcE830rbG>wHC+U!5<^C=##lzFlW05m&x
z)CAn;d_J@|omI8wN(EkbE?-8I%|=m#5c~&4k!pv#k6~~q9Inc>iyd@jcpjq+gX8fy
zl?$?JU_aRG_gC%O#WvM*MKOp90G>H<qPlZkkEd!5h)H3p^Hr<@;0BsTU1MWa{$g6q
zX6)+it(hQE49IDYD;$_p0lD3Oy;fV5zmUBikLcr<s@+uIxqKN~n(kT#Sg6924H}&e
zdXdipSGyLcBN4Q=w<A9pK9?q0EL3w9R<qh1j+)V4v9vhNam(reg<7=kl~-^t9tW!A
zLP?;qC;t`&0m9G_gir{Jf`HpBi~S6PI=voxyB*CvJ&OFD%sn<^yD)?$9f^?WH@;Cd
z*W|RC%{X46Yi}kz9>jdUHP0OHGMlm2<Ea?vQnwaA(&?6s87_2mXsuQ%Q$;1qN@(w*
zARy*);WMvy-2>(KVli+|C$3wqiW%TG8xCWq*}QCq^s<(n_9_Zk#Gae6C<qv}*>VTX
zHzAW8hg%{JJuOFsQ0R$L?J~fI*Iuide7I4hvBP<}X}4pt#P+4zEW4?D6e<;L2}46q
zJow82I~<h$>8Gp0|B4wsFT`RP9~mj@J#Ga8qR%<mOuCegL;ymdwOUsnga!buZ@vlY
zsi%~k|B76e6zd8*IS1KH`Fv<zVJGbgz%5RvqC52gK+HzLg;)%?%ABlMcu-^loJ}S%
zzJmW<5wON$q1sNK+%g(0=E;uvRBF|+zLk`jKmhyf_7!hnS+Vhb_uFqnRi(9QxkZkY
zX=-3#Mf1EW;3k`mG9Es>C4h)M6}~~@cA?pD7<D=wnrt>|!+-%`-}&>{3X^xLeaif#
z*9+qsx0SC7xXEUt_LO-+RW(Sn$UR(AZhp*$!^rSFT3jw_(|`fM^uY&;OqtRmo~NqQ
z>tPnDg14`;Q&JNhbGg<X7_%l|t<_4IzV$7jzP_f-s#tYxDF>$|{C?D%Oso3dysUdU
zWrpX;$48DRZcv(-BlZ^s0iz6q$uj13?&;{jQ4uZ6TDwWvWD?h{R+#<%bpfw?K3HS1
zP{-bV7ixv2O=%H_r`GB9IK;BpWipjkcxh^aMZ)}d!s9_>XXm<bHv|{}jD3An%fW*+
z>xc7@4~9ahZ))1K=AMW~CG)+r;V{Phe(d-8x;FCl8$RK02?U^0kT0%8-M4|JaUvSU
zvm4yR-`ClRLo5ra&RA!YNyJ<(bPNs_dal+JYBM_)cl!Iu&GYAxRlvm^0MIE2P>X!q
zcX0t^!sEdl%jQ~{mSmU7ghqye(e197)~@D%zgTJyZXX!f@MZzE*$%$XPMjbU9H)rh
zt&TtdEfV!cEiN6$ltNYloD2qW+wI0tj_cZ}_Lc-Vn@pbiTU*=kq5`JlRkANjPI(+~
z{z~_+vFsE3y`uTxLZ!xFxcK77A1lHiPsd_Nh_uzGRJhq>5;q+V9P#-!4Ywq~`2xt%
z_uhk60X@kRRXUY@qe0cE&4%Wlo;AynqMGPp8GHS8a{G^els)K@(icmqy}Z*25CY5K
zV96aARJn(p#$JD&O#St*vi4JJbUOS?JYKPgS}M4}SIu_3(}{E>f@9HWS?x7tPr5ts
zyWdg9Z+=r&bDc@05UaA2{VQtQV{i|#Y*)GODat6r_Fw#>tEsI`R><*C2vb!$%)8h$
z=gso5Xq4JaI#f}>YJ=h8p^rY29rBI-eo<@GQkv#$GKo=!Dck2(1aKbmv8z{QHP@L`
z3cS;aY=!PItQ6dZSPY{!8|qCaQQ?XTxY#GRzx5W>GEMHe%W)WG7{x=*!xcgy{0~jT
z*xM^QTv4Lv)g<BflTW|*JrIflk)i6fo2GFv6oRJ2EkG&YPI|rgzxUtAiz6c?6)|K5
z4CIca-Z*_4*=!a<A|Xrq^uovpv<m7iBZMHs^N4@<yC8(%U?|ijMldCri7pnc)k+<^
ze!Xkw>C>{9>`W?!E1jK+DQ6NwaBpA$f45q(qq7r-M@Fbh!mYRl7fUi2B%i$T26kw*
zvS{-@hJiT{ki}#ZLXeI`F#dxdfDi&pAh6;ogsRivVlg-z)W438ckMiVdedDKV#qkl
z;%{a%CM3L*Fq=x@_PKMo-Peb|GYs_I-8eilLP-TzQVlMa*>ITLId=|suU^F?8S2;?
zoeu3T7mRLqMKn5_O5vW*htGfdQ&1FzwwGUq=~usklwf5ATnu{rhd;#KYu9A!+BDhi
z&@a8psby!E4xUZ<e3*{KKxs7C)6szgzyG}~U=;!QanMtre=dtg7yIc3nua$2S|$2U
zN26F21f)5x@MnCfM@*&F!g%;F_MJb!p{~a*0k|0S-FM!>oy(U2wOUr#E5V<RM37mb
zfTGfBK^7Nbdi7Pbe*gQ50INvA1#_27o)SW#;pt!g5|bPU^6(*)C|bQ94NpCV);HgT
z(e3W4bjnjRfFFlF69^1X4GbVLF_B9<<N{t_53N><OeTZ&?rs=fdkqGML($_96c2b=
z;ezLh5DGyU8p7Pwt4PhvfYN9x7NFHPHKD1Y0ZBnXb9*~<ue^d5r?X;Z#VrqbCGAdg
z-0&RBV(#Ka+#el9YGwv4Mk8jI>fa0L^qQBBw3<vH*({LFLiP01xEGJ3#c0GcCr+S&
zrqReS&^$I=teT{%0k0LT<^P_Ka`Q6Jai}+&m-RTS_4+~+yOIJVG35UN*~pN{$@6Y4
P00000NkvXXu0mjf!~eO`

literal 0
HcmV?d00001

diff --git a/index.html b/index.html
index 2988d4a8a9..6465980006 100644
--- a/index.html
+++ b/index.html
@@ -84,46 +84,42 @@ <h2>This is CodeMirror</h2>
       matchBrackets: true
     });
   </script>
-  <div style="position: relative; margin: 1em 0;">
-    <a class="bigbutton left" href="http://codemirror.net/codemirror.zip">DOWNLOAD LATEST RELEASE</a>
-    <div><strong>version 4.12</strong> (<a href="doc/releases.html">Release notes</a>)</div>
-    <div>or use the <a href="doc/compress.html">minification helper</a></div>
-    <div style="position: absolute; top: 0; right: 0; text-align: right">
-      <span class="bigbutton right" onclick="document.getElementById('paypal').submit();">DONATE WITH PAYPAL</span>
-      <div style="position: relative">
-        or <span onclick="document.getElementById('bankinfo').style.display = 'block';" class=quasilink>Bank</span>,
-        <span onclick="document.getElementById('bcinfo').style.display = 'block';" class=quasilink>Bitcoin</span>,
-        <a href="http://www.patreon.com/marijn">Patreon</a><br>
-        <a href="https://gratipay.com/marijnh/">Gratipay</a><br>
-        <div id=bankinfo class=bankinfo>
-          <span class=bankinfo_close onclick="document.getElementById('bankinfo').style.display = '';">×</span>
-          Bank: <i>Rabobank</i><br/>
-          Country: <i>Netherlands</i><br/>
-          SWIFT: <i>RABONL2U</i><br/>
-          Account: <i>147850770</i><br/>
-          Name: <i>Marijn Haverbeke</i><br/>
-          IBAN: <i>NL26 RABO 0147 8507 70</i>
-        </div>
-        <div id=bcinfo class=bankinfo>
-          <span class=bankinfo_close onclick="document.getElementById('bcinfo').style.display = '';">×</span>
-          Bitcoin address: 1HVnnU8E9yLPeFyNgNtUPB5deXBvUmZ6Nx
-        </div>
-        <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal">
-          <input type="hidden" name="cmd" value="_s-xclick"/>
-          <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/>
-        </form>
+
+  <div class=actions>
+    <div class=actionspicture>
+      <img src="doc/yinyang.png" class=yinyang>
+      <div class="actionlink download">
+        <a href="http://codemirror.net/codemirror.zip">DOWNLOAD</a>
       </div>
-      <div>
-        Purchase <a href="http://codemirror.com">commercial support</a>
+      <div class="actionlink fund">
+        <a href="https://marijnhaverbeke.nl/fund/">FUND</a>
       </div>
     </div>
+    <div class=actionsleft>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">4.12</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>.
+    </div>
+    <div class=actionsright>
+      Software needs maintenance,<br>
+      maintainers need to subsist.<br>
+      Current funding status = <img src="//marijnhaverbeke.nl/fund/status_s.png" title="Current maintainer happiness" style="vertical-align: middle; height: 16px; width: 16px"><br>
+      You can help <a href="https://marijnhaverbeke.nl/fund/" title="Set up a monthly contribution">per month</a> or
+      <a title="Donate with Paypal" href="javascript:document.getElementById('paypal').submit();">once</a>.
+      <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal">
+        <input type="hidden" name="cmd" value="_s-xclick"/>
+        <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/>
+      </form>
+    </div>
   </div>
+  
 </section>
 
 <section id=features>
   <h2>Features</h2>
   <ul>
-    <li>Support for <a href="mode/index.html">over 60 languages</a> out of the box
+    <li>Support for <a href="mode/index.html">over 90 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 e4d675d1c74d67cf12875c243443a0b92472186a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 19 Feb 2015 11:38:30 +0100
Subject: [PATCH 1917/4742] Add funding icon to README

---
 README.md  | 3 ++-
 index.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 42b06f7474..bc6e7f5c71 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # CodeMirror
 [![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
-[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
+[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)  
+[Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png)](https://marijnhaverbeke.nl/fund/)
 
 CodeMirror is a JavaScript component that provides a code editor in
 the browser. When a mode is available for the language you are coding
diff --git a/index.html b/index.html
index 6465980006..8595b6b830 100644
--- a/index.html
+++ b/index.html
@@ -104,7 +104,7 @@ <h2>This is CodeMirror</h2>
     <div class=actionsright>
       Software needs maintenance,<br>
       maintainers need to subsist.<br>
-      Current funding status = <img src="//marijnhaverbeke.nl/fund/status_s.png" title="Current maintainer happiness" style="vertical-align: middle; height: 16px; width: 16px"><br>
+      Current funding status = <img src="https://marijnhaverbeke.nl/fund/status_s.png" title="Current maintainer happiness" style="vertical-align: middle; height: 16px; width: 16px"><br>
       You can help <a href="https://marijnhaverbeke.nl/fund/" title="Set up a monthly contribution">per month</a> or
       <a title="Donate with Paypal" href="javascript:document.getElementById('paypal').submit();">once</a>.
       <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal">

From e7598d0cac4f948ad930f0dd3407cd2fccdcc2aa Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Wed, 18 Feb 2015 13:24:18 +0800
Subject: [PATCH 1918/4742] [vim] add API for defining custom commands (#3049)

---
 keymap/vim.js | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index ee524fde74..682eb7a8c4 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -776,7 +776,16 @@
       },
       handleEx: function(cm, input) {
         exCommandDispatcher.processCommand(cm, input);
-      }
+      },
+
+      defineMotion: defineMotion,
+      defineAction: defineAction,
+      defineOperator: defineOperator,
+      mapCommand: mapCommand,
+      _mapCommand: _mapCommand,
+
+      exitVisualMode: exitVisualMode,
+      exitInsertMode: exitInsertMode
     };
 
     // Represents the current input state.
@@ -1817,6 +1826,10 @@
       }
     };
 
+    function defineMotion(name, fn) {
+      motions[name] = fn;
+    }
+
     function fillArray(val, times) {
       var arr = [];
       for (var i = 0; i < times; i++) {
@@ -1967,6 +1980,10 @@
       }
     };
 
+    function defineOperator(name, fn) {
+      operators[name] = fn;
+    }
+
     var actions = {
       jumpListWalk: function(cm, actionArgs, vim) {
         if (vim.visualMode) {
@@ -2478,6 +2495,10 @@
       exitInsertMode: exitInsertMode
     };
 
+    function defineAction(name, fn) {
+      actions[name] = fn;
+    }
+
     /*
      * Below are miscellaneous utility functions used by vim.js
      */
@@ -4632,6 +4653,19 @@
       }
     }
 
+    function _mapCommand(command) {
+      defaultKeymap.push(command);
+    }
+
+    function mapCommand(keys, type, name, args, extra) {
+      var command = {keys: keys, type: type};
+      command[type] = name;
+      command[type + "Args"] = args;
+      for (var key in extra)
+        command[key] = extra[key];
+      _mapCommand(command);
+    }
+
     // The timeout in milliseconds for the two-character ESC keymap should be
     // adjusted according to your typing speed to prevent false positives.
     defineOption('insertModeEscKeysTimeout', 200, 'number');

From 883acb1a7cfaf11b0514e88f3be25e42bc810179 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 13:30:51 +0100
Subject: [PATCH 1919/4742] [annotatescrollbar addon] Support
 scrollButtonHeight option

Both to the annotateScrollbar and to the editor itself.
---
 addon/scroll/annotatescrollbar.js  |  8 ++++++--
 addon/search/matchesonscrollbar.js | 14 +++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index d0c367a88f..54aeacf271 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -16,9 +16,12 @@
     return new Annotation(this, options);
   });
 
+  CodeMirror.defineOption("scrollButtonHeight", 0);
+
   function Annotation(cm, options) {
     this.cm = cm;
     this.options = options;
+    this.buttonHeight = options.scrollButtonHeight || cm.getOption("scrollButtonHeight");
     this.annotations = [];
     this.doRedraw = this.doUpdate = null;
     this.div = cm.getWrapperElement().appendChild(document.createElement("div"));
@@ -47,7 +50,7 @@
 
   Annotation.prototype.computeScale = function() {
     var cm = this.cm;
-    var hScale = (cm.getWrapperElement().clientHeight - cm.display.barHeight) /
+    var hScale = (cm.getWrapperElement().clientHeight - cm.display.barHeight - this.buttonHeight * 2) /
       cm.heightAtLine(cm.lastLine() + 1, "local");
     if (hScale != this.hScale) {
       this.hScale = hScale;
@@ -79,7 +82,8 @@
       var height = Math.max(bottom - top, 3);
 
       var elt = frag.appendChild(document.createElement("div"));
-      elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth - 1, 2) + "px; top: " + top + "px; height: " + height + "px";
+      elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth - 1, 2) + "px; top: "
+        + (top + this.buttonHeight) + "px; height: " + height + "px";
       elt.className = this.options.className;
     }
     this.div.textContent = "";
diff --git a/addon/search/matchesonscrollbar.js b/addon/search/matchesonscrollbar.js
index da5e834f6f..dbd67a4a5d 100644
--- a/addon/search/matchesonscrollbar.js
+++ b/addon/search/matchesonscrollbar.js
@@ -11,14 +11,18 @@
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineExtension("showMatchesOnScrollbar", function(query, caseFold, className) {
-    return new SearchAnnotation(this, query, caseFold, className);
+  CodeMirror.defineExtension("showMatchesOnScrollbar", function(query, caseFold, options) {
+    if (typeof options == "string") options = {className: options};
+    if (!options) options = {};
+    return new SearchAnnotation(this, query, caseFold, options);
   });
 
-  function SearchAnnotation(cm, query, caseFold, className) {
+  function SearchAnnotation(cm, query, caseFold, options) {
     this.cm = cm;
-    this.annotation = cm.annotateScrollbar({className: className || "CodeMirror-search-match",
-                                            listenForChanges: false});
+    var annotateOptions = {listenForChanges: false};
+    for (var prop in options) annotateOptions[prop] = options[prop];
+    if (!annotateOptions.className) annotateOptions.className = "CodeMirror-search-match";
+    this.annotation = cm.annotateScrollbar(annotateOptions);
     this.query = query;
     this.caseFold = caseFold;
     this.gap = {from: cm.firstLine(), to: cm.lastLine() + 1};

From 149c19f3a6d82f46407c33851a17d14ccc1526b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 14:42:40 +0100
Subject: [PATCH 1920/4742] [show-hint addon] Fix race condition during async
 linting

Issue #3089
---
 addon/hint/show-hint.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index fda5ffaa16..f544619428 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -24,6 +24,18 @@
     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;
@@ -34,10 +46,7 @@
     if (!getHints) return;
 
     CodeMirror.signal(this, "startCompletion", this);
-    if (getHints.async)
-      getHints(this, function(hints) { completion.showHints(hints); }, completion.options);
-    else
-      return completion.showHints(getHints(this, completion.options));
+    return retrieveHints(getHints, this, completion.options, function(hints) { completion.showHints(hints); });
   });
 
   function Completion(cm, options) {
@@ -102,11 +111,7 @@
       function update() {
         if (finished) return;
         CodeMirror.signal(data, "update");
-        var getHints = completion.options.hint;
-        if (getHints.async)
-          getHints(completion.cm, finishUpdate, completion.options);
-        else
-          finishUpdate(getHints(completion.cm, completion.options));
+        retrieveHints(completion.options.hint, completion.cm, completion.options, finishUpdate);
       }
       function finishUpdate(data_) {
         data = data_;

From 8f13aa615b8f79c77a1818b6676f648afd6570e6 Mon Sep 17 00:00:00 2001
From: Zhang Hao <jason.daurus@gmail.com>
Date: Thu, 19 Feb 2015 18:06:00 +0800
Subject: [PATCH 1921/4742] [sql-hint addon] Support displayNames

---
 addon/hint/sql-hint.js | 98 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 80 insertions(+), 18 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index c0bc40ade1..90ae49616c 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -26,9 +26,37 @@
     return CodeMirror.resolveMode(mode).keywords;
   }
 
+  function getText(item) {
+    if (typeof item == 'string') {
+      return item;
+    }
+    return item.text;
+  }
+
+  function getItem(list, item) {
+    if (Array.isArray(list)) {
+      for (var i = list.length - 1; i >= 0; i--) {
+        if (getText(list[i]) == item) {
+          return list[i];
+        }
+      }
+    }
+    return list[item];
+  }
+
+  function shallowClone(object) {
+    var result = {};
+    for (var key in object) {
+      if (object.hasOwnProperty(key)) {
+        result[key] = object[key];
+      }
+    }
+    return result;
+  }
+
   function match(string, word) {
     var len = string.length;
-    var sub = word.substr(0, len);
+    var sub = getText(word).substr(0, len);
     return string.toUpperCase() === sub.toUpperCase();
   }
 
@@ -53,9 +81,22 @@
   }
 
   function insertBackticks(name) {
-    var nameParts = name.split(".");
-    nameParts = nameParts.map(function(w) {return "`" + w + "`";});
-    return nameParts.join(".");
+    var nameParts = [];
+    if (typeof name == "string") {
+      nameParts = name.split(".");
+    }
+    else if (typeof name.text == "string") {
+      nameParts = name.text.split(".");
+    }
+    nameParts = nameParts.map(function(w) {return "`" + w + "`";}).join(".");
+    if (typeof name == "string") {
+      return nameParts;
+    }
+    if (typeof name.text == "string") {
+      name = shallowClone(name);
+      name.text = nameParts;
+    }
+    return name;
   }
 
   function nameCompletion(cur, token, result, editor) {
@@ -96,21 +137,32 @@
     });
 
     // Try to complete columns
-    var table = nameParts.slice(0, nameParts.length - 1).join(".");
-    string = nameParts[nameParts.length - 1];
+    string = nameParts.pop();
+    var table = nameParts.join(".");
 
     //Check if table is available. If not, find table by Alias
-    if (!tables.hasOwnProperty(table))
+    if (!getItem(tables, table)) {
       table = findTableByAlias(table, editor);
-
-    var columns = tables[table];
-    addMatches(result, string, columns, function(w) {
-      w = table + "." + w;
-      if (useBacktick) {
-        return insertBackticks(w);
-      }
-      return w;
-    });
+    }
+    var columns = getItem(tables, table);
+    if (columns && Array.isArray(tables) && columns.columns) {
+      columns = columns.columns;
+    }
+    if (columns) {
+      addMatches(result, string, columns, function(w) {
+        if (typeof w == "string") {
+          w = table + "." + w;
+        }
+        else {
+          w = shallowClone(w);
+          w.text = table + "." + w.text;
+        }
+        if (useBacktick) {
+          return insertBackticks(w);
+        }
+        return w;
+      });
+    }
 
     return start;
   }
@@ -172,8 +224,18 @@
       var lineText = query[i];
       eachWord(lineText, function(word) {
         var wordUpperCase = word.toUpperCase();
-        if (wordUpperCase === aliasUpperCase && tables.hasOwnProperty(previousWord)) {
+        if (wordUpperCase === aliasUpperCase) {
+          if (Array.isArray(tables)) {
+            for (var i = tables.length - 1; i >= 0; i--) {
+              if (getText(tables[i]) == previousWord) {
+                table = previousWord;
+                break;
+              }
+            }
+          }
+          else if (tables.hasOwnProperty(previousWord)) {
             table = previousWord;
+          }
         }
         if (wordUpperCase !== CONS.ALIAS_KEYWORD) {
           previousWord = word;
@@ -187,7 +249,7 @@
   CodeMirror.registerHelper("hint", "sql", function(editor, options) {
     tables = (options && options.tables) || {};
     var defaultTableName = options && options.defaultTable;
-    defaultTable = (defaultTableName && tables[defaultTableName] || []);
+    defaultTable = (defaultTableName && getItem(tables, defaultTableName)) || [];
     keywords = keywords || getKeywords(editor);
 
     var cur = editor.getCursor();

From 1eb72e8ccc17412b74a50a4ceebd924281a7f582 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 15:31:24 +0100
Subject: [PATCH 1922/4742] [sql-hint addon] Simplify displayName support and
 add tests

Issue #3095
---
 addon/hint/sql-hint.js | 91 ++++++++++++------------------------------
 test/sql-hint-test.js  | 41 +++++++++++++++----
 2 files changed, 58 insertions(+), 74 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 90ae49616c..5b0cc7696f 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -27,30 +27,19 @@
   }
 
   function getText(item) {
-    if (typeof item == 'string') {
-      return item;
-    }
-    return item.text;
+    return typeof item == "string" ? item : item.text;
   }
 
   function getItem(list, item) {
-    if (Array.isArray(list)) {
-      for (var i = list.length - 1; i >= 0; i--) {
-        if (getText(list[i]) == item) {
-          return list[i];
-        }
-      }
-    }
-    return list[item];
+    if (!list.slice) return list[item];
+    for (var i = list.length - 1; i >= 0; i--) if (getText(list[i]) == item)
+      return list[i];
   }
 
   function shallowClone(object) {
     var result = {};
-    for (var key in object) {
-      if (object.hasOwnProperty(key)) {
-        result[key] = object[key];
-      }
-    }
+    for (var key in object) if (object.hasOwnProperty(key))
+      result[key] = object[key];
     return result;
   }
 
@@ -81,21 +70,13 @@
   }
 
   function insertBackticks(name) {
-    var nameParts = [];
-    if (typeof name == "string") {
-      nameParts = name.split(".");
-    }
-    else if (typeof name.text == "string") {
-      nameParts = name.text.split(".");
-    }
-    nameParts = nameParts.map(function(w) {return "`" + w + "`";}).join(".");
-    if (typeof name == "string") {
-      return nameParts;
-    }
-    if (typeof name.text == "string") {
-      name = shallowClone(name);
-      name.text = nameParts;
-    }
+    var nameParts = getText(name).split(".");
+    for (var i = 0; i < nameParts.length; i++)
+      nameParts[i] = "`" + nameParts[i] + "`";
+    var escaped = nameParts.join(".");
+    if (typeof name == "string") return escaped;
+    name = shallowClone(name);
+    name.text = escaped;
     return name;
   }
 
@@ -122,45 +103,35 @@
     // Try to complete table names
     var string = nameParts.join(".");
     addMatches(result, string, tables, function(w) {
-      if (useBacktick) {
-        return insertBackticks(w);
-      }
-      return w;
+      return useBacktick ? insertBackticks(w) : w;
     });
 
     // Try to complete columns from defaultTable
     addMatches(result, string, defaultTable, function(w) {
-      if (useBacktick) {
-        return insertBackticks(w);
-      }
-      return w;
+      return useBacktick ? insertBackticks(w) : w;
     });
 
     // Try to complete columns
     string = nameParts.pop();
     var table = nameParts.join(".");
 
-    //Check if table is available. If not, find table by Alias
-    if (!getItem(tables, table)) {
+    // Check if table is available. If not, find table by Alias
+    if (!getItem(tables, table))
       table = findTableByAlias(table, editor);
-    }
+
     var columns = getItem(tables, table);
-    if (columns && Array.isArray(tables) && columns.columns) {
+    if (columns && Array.isArray(tables) && columns.columns)
       columns = columns.columns;
-    }
+
     if (columns) {
       addMatches(result, string, columns, function(w) {
         if (typeof w == "string") {
           w = table + "." + w;
-        }
-        else {
+        } else {
           w = shallowClone(w);
           w.text = table + "." + w.text;
         }
-        if (useBacktick) {
-          return insertBackticks(w);
-        }
-        return w;
+        return useBacktick ? insertBackticks(w) : w;
       });
     }
 
@@ -224,22 +195,10 @@
       var lineText = query[i];
       eachWord(lineText, function(word) {
         var wordUpperCase = word.toUpperCase();
-        if (wordUpperCase === aliasUpperCase) {
-          if (Array.isArray(tables)) {
-            for (var i = tables.length - 1; i >= 0; i--) {
-              if (getText(tables[i]) == previousWord) {
-                table = previousWord;
-                break;
-              }
-            }
-          }
-          else if (tables.hasOwnProperty(previousWord)) {
-            table = previousWord;
-          }
-        }
-        if (wordUpperCase !== CONS.ALIAS_KEYWORD) {
+        if (wordUpperCase === aliasUpperCase && getItem(tables, previousWord))
+          table = previousWord;
+        if (wordUpperCase !== CONS.ALIAS_KEYWORD)
           previousWord = word;
-        }
       });
       if (table) break;
     }
diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index 0c5ffdfba1..c8579204b0 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -14,6 +14,13 @@
     "schema.countries": ["name", "population", "size"]
   };
 
+  var displayTextTables = [{
+    text: "mytable",
+    displayText: "mytable | The main table",
+    columns: [{text: "id", displayText: "id | Unique ID"},
+              {text: "name", displayText: "name | The name"}]
+  }];
+
   namespace = "sql-hint_";
 
   function test(name, spec) {
@@ -21,8 +28,8 @@
       cm.setValue(spec.value);
       cm.setCursor(spec.cursor);
       var completion = CodeMirror.hint.sql(cm, {tables: spec.tables});
-      if (!isEqList(completion.list, spec.list))
-        throw new Failure("Wrong completion results " + completion.list + " vs " + spec.list);
+      if (!deepCompare(completion.list, spec.list))
+        throw new Failure("Wrong completion results " + JSON.stringify(completion.list) + " vs " + JSON.stringify(spec.list));
       eqPos(completion.from, spec.from);
       eqPos(completion.to, spec.to);
     }, {
@@ -133,13 +140,31 @@
     to: Pos(0, 24)
   });
 
-  function isEqList(list1, list2) {
-    if (list1.length != list2.length)
+  test("displayText_table", {
+    value: "SELECT myt",
+    cursor: Pos(0, 10),
+    tables: displayTextTables,
+    list: displayTextTables,
+    from: Pos(0, 7),
+    to: Pos(0, 10)
+  });
+
+  test("displayText_column", {
+    value: "SELECT mytable.",
+    cursor: Pos(0, 15),
+    tables: displayTextTables,
+    list: [{text: "mytable.id", displayText: "id | Unique ID"},
+           {text: "mytable.name", displayText: "name | The name"}],
+    from: Pos(0, 7),
+    to: Pos(0, 15)
+  });
+
+  function deepCompare(a, b) {
+    if (!a || typeof a != "object")
+      return a === b;
+    if (!b || typeof b != "object")
       return false;
-    for (var i = list1.length; i--;) {
-      if (list1[i] !== list2[i])
-        return false;
-    }
+    for (var prop in a) if (!deepCompare(a[prop], b[prop])) return false;
     return true;
   }
 })();

From 6e5651ce5f52d5c6df40535af4e8a0a170e21587 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 15:35:08 +0100
Subject: [PATCH 1923/4742] [go mode] Never pop off the root context

Closes #3093
---
 mode/go/go.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/go/go.js b/mode/go/go.js
index 173e034d0c..b121f4e6eb 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -117,6 +117,7 @@ CodeMirror.defineMode("go", function(config) {
     return state.context = new Context(state.indented, col, type, null, state.context);
   }
   function popContext(state) {
+    if (!state.context.prev) return;
     var t = state.context.type;
     if (t == ")" || t == "]" || t == "}")
       state.indented = state.context.indented;

From 3e2218192c41814d17965198532320aefd25447e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 16:13:33 +0100
Subject: [PATCH 1924/4742] Mark release 4.13

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

diff --git a/AUTHORS b/AUTHORS
index 2ca41e67b7..9d62d48e63 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,6 +24,7 @@ Alexander Solovyov
 Alexandre Bique
 alexey-k
 Alex Piggott
+Aliaksei Chapyzhenka
 Amsul
 amuntean
 Amy
@@ -82,6 +83,7 @@ Chris Granger
 Chris Houseknecht
 Chris Morgan
 Christian Oyarzun
+Christian Petrov
 Christopher Brown
 ciaranj
 CodeAnimal
@@ -111,6 +113,7 @@ Deep Thought
 Devon Carew
 dignifiedquire
 Dimage Sapelkin
+Dmitry Kiselyov
 domagoj412
 Dominator008
 Domizio Demichelis
@@ -149,6 +152,7 @@ Gautam Mehta
 gekkoe
 Gerard Braad
 Gergely Hegykozi
+Giovanni Calò
 Glenn Jorde
 Glenn Ruehle
 Golevka
@@ -235,6 +239,7 @@ Konstantin Lopuhin
 koops
 ks-ifware
 kubelsmieci
+KwanEsq
 Lanfei
 Lanny
 Laszlo Vidacs
@@ -289,6 +294,7 @@ Michael Lehenbauer
 Michael Zhou
 Mighty Guava
 Miguel Castillo
+mihailik
 Mike
 Mike Brevoort
 Mike Diaz
@@ -306,6 +312,7 @@ Nathan Williams
 ndr
 nerbert
 nextrevision
+ngn
 nguillaumin
 Ng Zhi An
 Nicholas Bollweg
@@ -344,6 +351,7 @@ Randall Mason
 Randy Burden
 Randy Edmunds
 Rasmus Erik Voel Jensen
+Ray Ratchup
 Richard van der Meer
 Richard Z.H. Wang
 Robert Crossfield
@@ -423,5 +431,6 @@ YNH Webdev
 Yunchi Luo
 Yuvi Panda
 Zachary Dremann
+Zhang Hao
 zziuni
 魏鹏刚
diff --git a/bower.json b/bower.json
index 7e30a06c6a..dad8fe2e02 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.12.1",
+  "version":"4.13.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index eb7547691d..7d89eb4520 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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=4.13.0;f=">4.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.12.0;f=">4.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.11.0;f=">4.11</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.10.0;f=">4.10</option>
diff --git a/doc/manual.html b/doc/manual.html
index 31a52dee12..c77a71f9cc 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 4.12.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 4.13.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 7854019280..7e0f4bf338 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.x</h2>
 
+  <p class="rel">20-02-2015: <a href="http://codemirror.net/codemirror-4.13.zip">Version 4.13</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix the way the <a href="../demo/closetag.html"><code>closetag</code></a> demo handles the slash character.</li>
+    <li>New modes: <a href="../mode/forth/index.html">Forth</a>, <a href="../mode/stylus/index.html">Stylus</a>.</li>
+    <li>Make the <a href="../mode/css/index.html">CSS mode</a> understand some modern CSS extensions.</li>
+    <li>Have the <a href="../mode/clike/index.html">Scala mode</a> handle symbols and triple-quoted strings.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">22-01-2015: <a href="http://codemirror.net/codemirror-4.12.zip">Version 4.12</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 8595b6b830..eaa7f80f35 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">4.12</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip>4.13</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 63eb011f79..0e3d019278 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8062,7 +8062,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.12.1";
+  CodeMirror.version = "4.13.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 89645861fb..5801a6c860 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.12.1",
+    "version":"4.13.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 0dc2189b43433e64799731c3265d49879263430a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 8 Oct 2014 17:30:38 +0200
Subject: [PATCH 1925/4742] Make inputStyle an option, move relevant logic into
 TextareaInput

Add a dummy ContentEditableInput
---
 addon/edit/matchbrackets.js |   2 +-
 lib/codemirror.js           | 915 ++++++++++++++++++++----------------
 2 files changed, 499 insertions(+), 418 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index fa1ae030a5..70e1ae18c7 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -81,7 +81,7 @@
     if (marks.length) {
       // Kludge to work around the IE bug from issue #1193, where text
       // input stops going to the textare whever this fires.
-      if (ie_lt8 && cm.state.focused) cm.display.input.focus();
+      if (ie_lt8 && cm.state.focused) cm.focus();
 
       var clear = function() {
         cm.operation(function() {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0e3d019278..0e680db3ff 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -33,7 +33,6 @@
   var chrome = /Chrome\//.test(navigator.userAgent);
   var presto = /Opera\//.test(navigator.userAgent);
   var safari = /Apple Computer/.test(navigator.vendor);
-  var khtml = /KHTML\//.test(navigator.userAgent);
   var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
   var phantom = /PhantomJS/.test(navigator.userAgent);
 
@@ -70,13 +69,14 @@
     if (typeof doc == "string") doc = new Doc(doc, options.mode);
     this.doc = doc;
 
-    var display = this.display = new Display(place, doc);
+    var input = new CodeMirror.inputStyles[options.inputStyle](this);
+    var display = this.display = new Display(place, doc, input);
     display.wrapper.CodeMirror = this;
     updateGutters(this);
     themeChanged(this);
     if (options.lineWrapping)
       this.display.wrapper.className += " CodeMirror-wrap";
-    if (options.autofocus && !mobile) focusInput(this);
+    if (options.autofocus && !mobile) display.input.focus();
     initScrollbars(this);
 
     this.state = {
@@ -85,15 +85,17 @@
       modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
       overwrite: false, focused: false,
       suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
-      pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in readInput
+      pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
       draggingText: false,
       highlight: new Delayed(), // stores highlight worker timeout
       keySeq: null  // Unfinished key sequence
     };
 
+    var cm = this;
+
     // Override magic textarea content restore that IE sometimes does
     // on our hidden textarea on reload
-    if (ie && ie_version < 11) setTimeout(bind(resetInput, this, true), 20);
+    if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20);
 
     registerEventHandlers(this);
     ensureGlobalHandlers();
@@ -102,7 +104,7 @@
     this.curOp.forceUpdate = true;
     attachDoc(this, doc);
 
-    if ((options.autofocus && !mobile) || activeElt() == display.input)
+    if ((options.autofocus && !mobile) || display.input.hasFocus())
       setTimeout(bind(onFocus, this), 20);
     else
       onBlur(this);
@@ -126,24 +128,10 @@
   // and content drawing. It holds references to DOM nodes and
   // display-related state.
 
-  function Display(place, doc) {
+  function Display(place, doc, input) {
     var d = this;
+    this.input = input;
 
-    // The semihidden textarea that is focused when the editor is
-    // focused, and receives input.
-    var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
-    // The textarea is kept positioned near the cursor to prevent the
-    // fact that it'll be scrolled into view on input from scrolling
-    // our fake cursor out of view. On webkit, when wrap=off, paste is
-    // very slow. So make the area wide instead.
-    if (webkit) input.style.width = "1000px";
-    else input.setAttribute("wrap", "off");
-    // If border: 0; -- iOS fails to open keyboard (issue #1287)
-    if (ios) input.style.border = "1px solid black";
-    input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off"); input.setAttribute("spellcheck", "false");
-
-    // Wraps and hides input textarea
-    d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
     // Covers bottom-right square when both scrollbars are present.
     d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
     d.scrollbarFiller.setAttribute("not-content", "true");
@@ -179,15 +167,11 @@
     d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
     d.scroller.setAttribute("tabIndex", "-1");
     // The element in which the editor lives.
-    d.wrapper = elt("div", [d.inputDiv, d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
+    d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
 
     // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
     if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-    // Needed to hide big blue blinking cursor on Mobile Safari
-    if (ios) input.style.width = "0px";
     if (!webkit) d.scroller.draggable = true;
-    // Needed to handle Tab key in KHTML
-    if (khtml) { d.inputDiv.style.height = "1px"; d.inputDiv.style.position = "absolute"; }
 
     if (place) {
       if (place.appendChild) place.appendChild(d.wrapper);
@@ -214,25 +198,13 @@
     // Used to only resize the line number gutter when necessary (when
     // the amount of lines crosses a boundary that makes its width change)
     d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
-    // See readInput and resetInput
-    d.prevInput = "";
     // Set to true when a non-horizontal-scrolling line widget is
     // added. As an optimization, line widget aligning is skipped when
     // this is false.
     d.alignWidgets = false;
-    // Flag that indicates whether we expect input to appear real soon
-    // now (after some event like 'keypress' or 'input') and are
-    // polling intensively.
-    d.pollingFast = false;
-    // Self-resetting timeout for the poller
-    d.poll = new Delayed();
 
     d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
 
-    // Tracks when resetInput has punted to just putting a short
-    // string into the textarea instead of the full selection.
-    d.inaccurateSelection = false;
-
     // Tracks the maximum line length so that the horizontal scrollbar
     // can be kept static when scrolling.
     d.maxLine = null;
@@ -248,6 +220,8 @@
     // Used to track whether anything happened since the context menu
     // was opened.
     d.selForContextMenu = null;
+
+    input.init(this);
   }
 
   // STATE UPDATES
@@ -515,8 +489,9 @@
 
     cm.display.scrollbars = new CodeMirror.scrollbarModel[cm.options.scrollbarStyle](function(node) {
       cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+      // Prevent clicks in the scrollbars from killing focus
       on(node, "mousedown", function() {
-        if (cm.state.focused) setTimeout(bind(focusInput, cm), 0);
+        if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
       });
       node.setAttribute("not-content", "true");
     }, function(pos, axis) {
@@ -1084,6 +1059,449 @@
   function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
   function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
 
+  // INPUT HANDLING
+
+  function ensureFocus(cm) {
+    if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
+  }
+
+  function isReadOnly(cm) {
+    return cm.options.readOnly || cm.doc.cantEdit;
+  }
+
+  // This will be set to an array of strings when copying, so that,
+  // when pasting, we know what kind of selections the copied text
+  // was made out of.
+  var lastCopied = null;
+
+  var emptyInput = {
+    init: nothing,
+    drawSelection: nothing,
+    showSelection: nothing,
+    reset: nothing,
+    getField: nothing,
+    focus: nothing,
+    hasFocus: nothing,
+    blur: nothing,
+    setTabIndex: nothing,
+    resetPosition: nothing,
+    slowPoll: nothing,
+    fastPoll: nothing,
+    poll: nothing,
+    ensurePolled: nothing,
+    onKeyPress: nothing,
+    onContextMenu: nothing
+  };
+
+  // TEXTAREA INPUT STYLE
+
+  function TextareaInput(cm) {
+    this.cm = cm;
+    // See input.poll and input.reset
+    this.prevInput = "";
+
+    // Flag that indicates whether we expect input to appear real soon
+    // now (after some event like 'keypress' or 'input') and are
+    // polling intensively.
+    this.pollingFast = false;
+    // Self-resetting timeout for the poller
+    this.polling = new Delayed();
+    // Tracks when input.reset has punted to just putting a short
+    // string into the textarea instead of the full selection.
+    this.inaccurateSelection = false;
+    // Used to work around IE issue with selection being forgotten when focus moves away from textarea
+    this.hasSelection = false;
+  };
+
+  TextareaInput.prototype = createObj(emptyInput, {
+    init: function(display) {
+      var input = this, cm = this.cm;
+      // The semihidden textarea that is focused when the editor is
+      // focused, and receives input.
+      var te = this.textarea = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
+      // The textarea is kept positioned near the cursor to prevent the
+      // fact that it'll be scrolled into view on input from scrolling
+      // our fake cursor out of view. On webkit, when wrap=off, paste is
+      // very slow. So make the area wide instead.
+      if (webkit) te.style.width = "1000px";
+      else te.setAttribute("wrap", "off");
+      // If border: 0; -- iOS fails to open keyboard (issue #1287)
+      if (ios) te.style.border = "1px solid black";
+      te.setAttribute("autocorrect", "off"); te.setAttribute("autocapitalize", "off"); te.setAttribute("spellcheck", "false");
+
+      // Wraps and hides input textarea
+      var div = this.wrapper = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+      display.wrapper.insertBefore(div, display.wrapper.firstChild);
+
+      // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
+      if (ios) te.style.width = "0px";
+
+      on(te, "keyup", function(e) { onKeyUp.call(cm, e); });
+      on(te, "input", function() {
+        if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
+        input.poll();
+      });
+      on(te, "keydown", operation(cm, onKeyDown));
+      on(te, "keypress", operation(cm, onKeyPress));
+      on(te, "focus", bind(onFocus, cm));
+      on(te, "blur", bind(onBlur, cm));
+
+      on(te, "paste", function() {
+        // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
+        // Add a char to the end of textarea before paste occur so that
+        // selection doesn't span to the end of textarea.
+        if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
+          var start = te.selectionStart, end = te.selectionEnd;
+          te.value += "$";
+          // The selection end needs to be set before the start, otherwise there
+          // can be an intermediate non-empty selection between the two, which
+          // can override the middle-click paste buffer on linux and cause the
+          // wrong thing to get pasted.
+          te.selectionEnd = end;
+          te.selectionStart = start;
+          cm.state.fakedLastChar = true;
+        }
+        cm.state.pasteIncoming = true;
+        input.fastPoll();
+      });
+
+      function prepareCopyCut(e) {
+        if (cm.somethingSelected()) {
+          lastCopied = cm.getSelections();
+          if (this.inaccurateSelection) {
+            input.prevInput = "";
+            input.inaccurateSelection = false;
+            te.value = lastCopied.join("\n");
+            selectInput(te);
+          }
+        } else {
+          var text = [], ranges = [];
+          for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
+            var line = cm.doc.sel.ranges[i].head.line;
+            var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
+            ranges.push(lineRange);
+            text.push(cm.getRange(lineRange.anchor, lineRange.head));
+          }
+          if (e.type == "cut") {
+            cm.setSelections(ranges, null, sel_dontScroll);
+          } else {
+            input.prevInput = "";
+            te.value = text.join("\n");
+            selectInput(te);
+          }
+          lastCopied = text;
+        }
+        if (e.type == "cut") cm.state.cutIncoming = true;
+      }
+      on(te, "cut", prepareCopyCut);
+      on(te, "copy", prepareCopyCut);
+
+      // Prevent normal selection in the editor (we handle our own)
+      on(display.lineSpace, "selectstart", function(e) {
+        if (!eventInWidget(display, e)) e_preventDefault(e);
+      });
+    },
+
+    drawSelection: function() {
+      // Redraw the selection and/or cursor
+      var cm = this.cm, display = cm.display, doc = cm.doc, result = {};
+      var curFragment = result.cursors = document.createDocumentFragment();
+      var selFragment = result.selection = document.createDocumentFragment();
+
+      for (var i = 0; i < doc.sel.ranges.length; i++) {
+        var range = doc.sel.ranges[i];
+        var collapsed = range.empty();
+        if (collapsed || cm.options.showCursorWhenSelecting)
+          drawSelectionCursor(cm, range, curFragment);
+        if (!collapsed)
+          drawSelectionRange(cm, range, selFragment);
+      }
+
+      // Move the hidden textarea near the cursor to prevent scrolling artifacts
+      if (cm.options.moveInputWithCursor) {
+        var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
+        var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
+        result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
+                                            headPos.top + lineOff.top - wrapOff.top));
+        result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
+                                             headPos.left + lineOff.left - wrapOff.left));
+      }
+
+      return result;
+    },
+
+    showSelection: function(drawn) {
+      var cm = this.cm, display = cm.display;
+      removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
+      removeChildrenAndAdd(display.selectionDiv, drawn.selection);
+      if (drawn.teTop != null) {
+        this.wrapper.style.top = drawn.teTop + "px";
+        this.wrapper.style.left = drawn.teLeft + "px";
+      }
+    },
+
+    // Reset the input to correspond to the selection (or to be empty,
+    // when not typing and nothing is selected)
+    reset: function(typing) {
+      if (this.contextMenuPending) return;
+      var minimal, selected, cm = this.cm, doc = cm.doc;
+      if (cm.somethingSelected()) {
+        this.prevInput = "";
+        var range = doc.sel.primary();
+        minimal = hasCopyEvent &&
+          (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
+        var content = minimal ? "-" : selected || cm.getSelection();
+        this.textarea.value = content;
+        if (cm.state.focused) selectInput(this.textarea);
+        if (ie && ie_version >= 9) this.hasSelection = content;
+      } else if (!typing) {
+        this.prevInput = this.textarea.value = "";
+        if (ie && ie_version >= 9) this.hasSelection = null;
+      }
+      this.inaccurateSelection = minimal;
+    },
+
+    getField: function() {
+      return this.textarea;
+    },
+
+    focus: function() {
+      if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
+        try { this.textarea.focus(); }
+        catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
+      }
+    },
+
+    blur: function() {
+      this.textarea.blur();
+    },
+
+    hasFocus: function() {
+      return activeElt() == this.textarea;
+    },
+
+    setTabIndex: function(index) {
+      this.textarea.tabIndex = index;
+    },
+
+    resetPosition: function() {
+      this.wrapper.style.top = this.wrapper.style.left = 0;
+    },
+
+    // Poll for input changes, using the normal rate of polling. This
+    // runs as long as the editor is focused.
+    slowPoll: function() {
+      var input = this;
+      if (input.pollingFast) return;
+      input.polling.set(this.cm.options.pollInterval, function() {
+        input.poll();
+        if (input.cm.state.focused) input.slowPoll();
+      });
+    },
+
+    // When an event has just come in that is likely to add or change
+    // something in the input textarea, we poll faster, to ensure that
+    // the change appears on the screen quickly.
+    fastPoll: function() {
+      var missed = false, input = this;
+      input.pollingFast = true;
+      function p() {
+        var changed = input.poll();
+        if (!changed && !missed) {missed = true; input.polling.set(60, p);}
+        else {input.pollingFast = false; input.slowPoll();}
+      }
+      input.polling.set(20, p);
+    },
+
+    // Read input from the textarea, and update the document to match.
+    // When something is selected, it is present in the textarea, and
+    // selected (unless it is huge, in which case a placeholder is
+    // used). When nothing is selected, the cursor sits after previously
+    // seen text (can be empty), which is stored in prevInput (we must
+    // not reset the textarea when typing, because that breaks IME).
+    poll: function() {
+      var cm = this.cm, input = this.textarea, prevInput = this.prevInput, doc = cm.doc;
+      // Since this is called a *lot*, try to bail out as cheaply as
+      // 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) ||
+          isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
+        return false;
+      // See paste handler for more on the fakedLastChar kludge
+      if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
+        input.value = input.value.substring(0, input.value.length - 1);
+        cm.state.fakedLastChar = false;
+      }
+      var text = input.value;
+      // If nothing changed, bail.
+      if (text == prevInput && !cm.somethingSelected()) return false;
+      // Work around nonsensical selection resetting in IE9/10, and
+      // inexplicable appearance of private area unicode characters on
+      // some key combos in Mac (#2689).
+      if (ie && ie_version >= 9 && this.hasSelection === text ||
+          mac && /[\uf700-\uf7ff]/.test(text)) {
+        cm.display.input.reset();
+        return false;
+      }
+
+      var withOp = !cm.curOp;
+      if (withOp) startOperation(cm);
+      cm.display.shift = false;
+
+      if (text.charCodeAt(0) == 0x200b && doc.sel == cm.display.selForContextMenu && !prevInput)
+        prevInput = "\u200b";
+      // Find the part of the input that is actually new
+      var same = 0, l = Math.min(prevInput.length, text.length);
+      while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
+      var inserted = text.slice(same), textLines = splitLines(inserted);
+
+      // When pasing N lines into N selections, insert one line per selection
+      var multiPaste = null;
+      if (cm.state.pasteIncoming && doc.sel.ranges.length > 1) {
+        if (lastCopied && lastCopied.join("\n") == inserted)
+          multiPaste = doc.sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
+        else if (textLines.length == doc.sel.ranges.length)
+          multiPaste = map(textLines, function(l) { return [l]; });
+      }
+
+      // Normal behavior is to insert the new text into every selection
+      for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
+        var range = doc.sel.ranges[i];
+        var from = range.from(), to = range.to();
+        // Handle deletion
+        if (same < prevInput.length)
+          from = Pos(from.line, from.ch - (prevInput.length - same));
+        // Handle overwrite
+        else if (cm.state.overwrite && range.empty() && !cm.state.pasteIncoming)
+          to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
+        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"};
+        makeChange(cm.doc, changeEvent);
+        signalLater(cm, "inputRead", cm, changeEvent);
+        // When an 'electric' character is inserted, immediately trigger a reindent
+        if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
+            cm.options.smartIndent && range.head.ch < 100 &&
+            (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
+          var mode = cm.getModeAt(range.head);
+          var end = changeEnd(changeEvent);
+          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");
+                break;
+              }
+          } else if (mode.electricInput) {
+            if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
+              indentLine(cm, end.line, "smart");
+          }
+        }
+      }
+      ensureCursorVisible(cm);
+      cm.curOp.updateInput = updateInput;
+      cm.curOp.typing = true;
+
+      // Don't leave long text in the textarea, since it makes further polling slow
+      if (text.length > 1000 || text.indexOf("\n") > -1) input.value = this.prevInput = "";
+      else this.prevInput = text;
+      if (withOp) endOperation(cm);
+      cm.state.pasteIncoming = cm.state.cutIncoming = false;
+      return true;
+    },
+
+    ensurePolled: function() {
+      if (this.pollingFast && this.poll()) this.pollingFast = false;
+    },
+
+    onKeyPress: function() {
+      if (ie && ie_version >= 9) this.hasSelection = null;
+      this.fastPoll();
+    },
+
+    onContextMenu: function(e) {
+      var input = this, cm = input.cm, display = cm.display, te = input.textarea;
+      var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
+      if (!pos || presto) return; // Opera is difficult.
+
+      // Reset the current text selection only if the click is done outside of the selection
+      // and 'resetSelectionOnContextMenu' option is true.
+      var reset = cm.options.resetSelectionOnContextMenu;
+      if (reset && cm.doc.sel.contains(pos) == -1)
+        operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
+
+      var oldCSS = te.style.cssText;
+      input.wrapper.style.position = "absolute";
+      te.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
+        "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
+        (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
+        "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
+      if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
+      display.input.focus();
+      if (webkit) window.scrollTo(null, oldScrollY);
+      display.input.reset();
+      // Adds "Select all" to context menu in FF
+      if (!cm.somethingSelected()) te.value = input.prevInput = " ";
+      input.contextMenuPending = true;
+      display.selForContextMenu = cm.doc.sel;
+      clearTimeout(display.detectingSelectAll);
+
+      // Select-all will be greyed out if there's nothing to select, so
+      // this adds a zero-width space so that we can later check whether
+      // it got selected.
+      function prepareSelectAllHack() {
+        if (te.selectionStart != null) {
+          var selected = cm.somethingSelected();
+          var extval = te.value = "\u200b" + (selected ? te.value : "");
+          input.prevInput = selected ? "" : "\u200b";
+          te.selectionStart = 1; te.selectionEnd = extval.length;
+          // Re-set this, in case some other handler touched the
+          // selection in the meantime.
+          display.selForContextMenu = cm.doc.sel;
+        }
+      }
+      function rehide() {
+        input.contextMenuPending = false;
+        input.wrapper.style.position = "relative";
+        te.style.cssText = oldCSS;
+        if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
+        display.input.slowPoll();
+
+        // Try to detect the user choosing select-all
+        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)
+              operation(cm, commands.selectAll)(cm);
+            else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
+            else display.input.reset();
+          };
+          display.detectingSelectAll = setTimeout(poll, 200);
+        }
+      }
+
+      if (ie && ie_version >= 9) prepareSelectAllHack();
+      if (captureRightClick) {
+        e_stop(e);
+        var mouseup = function() {
+          off(window, "mouseup", mouseup);
+          setTimeout(rehide, 20);
+        };
+        on(window, "mouseup", mouseup);
+      } else {
+        setTimeout(rehide, 50);
+      }
+    }
+  });
+
+  // CONTENTEDITABLE INPUT STYLE
+
+  function ContentEditableInput() {}
+
+  ContentEditableInput.prototype = createObj(emptyInput, {});
+
+  CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
+
   // SELECTION / CURSOR
 
   // Selection objects are immutable. A new one is created every time
@@ -1371,45 +1789,8 @@
 
   // SELECTION DRAWING
 
-  // Redraw the selection and/or cursor
-  function drawSelection(cm) {
-    var display = cm.display, doc = cm.doc, result = {};
-    var curFragment = result.cursors = document.createDocumentFragment();
-    var selFragment = result.selection = document.createDocumentFragment();
-
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      var range = doc.sel.ranges[i];
-      var collapsed = range.empty();
-      if (collapsed || cm.options.showCursorWhenSelecting)
-        drawSelectionCursor(cm, range, curFragment);
-      if (!collapsed)
-        drawSelectionRange(cm, range, selFragment);
-    }
-
-    // Move the hidden textarea near the cursor to prevent scrolling artifacts
-    if (cm.options.moveInputWithCursor) {
-      var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
-      var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
-      result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                          headPos.top + lineOff.top - wrapOff.top));
-      result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                           headPos.left + lineOff.left - wrapOff.left));
-    }
-
-    return result;
-  }
-
-  function showSelection(cm, drawn) {
-    removeChildrenAndAdd(cm.display.cursorDiv, drawn.cursors);
-    removeChildrenAndAdd(cm.display.selectionDiv, drawn.selection);
-    if (drawn.teTop != null) {
-      cm.display.inputDiv.style.top = drawn.teTop + "px";
-      cm.display.inputDiv.style.left = drawn.teLeft + "px";
-    }
-  }
-
   function updateSelection(cm) {
-    showSelection(cm, drawSelection(cm));
+    cm.display.input.showSelection(cm.display.input.drawSelection());
   }
 
   // Draws a cursor for the given range
@@ -2181,7 +2562,7 @@
     }
 
     if (op.updatedDisplay || op.selectionChanged)
-      op.newSelectionNodes = drawSelection(cm);
+      op.preparedSelection = display.input.drawSelection();
   }
 
   function endOperation_W2(op) {
@@ -2194,8 +2575,8 @@
       cm.display.maxLineChanged = false;
     }
 
-    if (op.newSelectionNodes)
-      showSelection(cm, op.newSelectionNodes);
+    if (op.preparedSelection)
+      cm.display.input.showSelection(op.preparedSelection);
     if (op.updatedDisplay)
       setDocumentHeight(cm, op.barMeasure);
     if (op.updatedDisplay || op.startHeight != cm.doc.height)
@@ -2204,7 +2585,7 @@
     if (op.selectionChanged) restartBlink(cm);
 
     if (cm.state.focused && op.updateInput)
-      resetInput(cm, op.typing);
+      cm.display.input.reset(op.typing);
   }
 
   function endOperation_finish(op) {
@@ -2476,169 +2857,6 @@
     return dirty;
   }
 
-  // INPUT HANDLING
-
-  // Poll for input changes, using the normal rate of polling. This
-  // runs as long as the editor is focused.
-  function slowPoll(cm) {
-    if (cm.display.pollingFast) return;
-    cm.display.poll.set(cm.options.pollInterval, function() {
-      readInput(cm);
-      if (cm.state.focused) slowPoll(cm);
-    });
-  }
-
-  // When an event has just come in that is likely to add or change
-  // something in the input textarea, we poll faster, to ensure that
-  // the change appears on the screen quickly.
-  function fastPoll(cm) {
-    var missed = false;
-    cm.display.pollingFast = true;
-    function p() {
-      var changed = readInput(cm);
-      if (!changed && !missed) {missed = true; cm.display.poll.set(60, p);}
-      else {cm.display.pollingFast = false; slowPoll(cm);}
-    }
-    cm.display.poll.set(20, p);
-  }
-
-  // This will be set to an array of strings when copying, so that,
-  // when pasting, we know what kind of selections the copied text
-  // was made out of.
-  var lastCopied = null;
-
-  // Read input from the textarea, and update the document to match.
-  // When something is selected, it is present in the textarea, and
-  // selected (unless it is huge, in which case a placeholder is
-  // used). When nothing is selected, the cursor sits after previously
-  // seen text (can be empty), which is stored in prevInput (we must
-  // not reset the textarea when typing, because that breaks IME).
-  function readInput(cm) {
-    var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc;
-    // Since this is called a *lot*, try to bail out as cheaply as
-    // 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) || isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
-      return false;
-    // See paste handler for more on the fakedLastChar kludge
-    if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
-      input.value = input.value.substring(0, input.value.length - 1);
-      cm.state.fakedLastChar = false;
-    }
-    var text = input.value;
-    // If nothing changed, bail.
-    if (text == prevInput && !cm.somethingSelected()) return false;
-    // Work around nonsensical selection resetting in IE9/10, and
-    // inexplicable appearance of private area unicode characters on
-    // some key combos in Mac (#2689).
-    if (ie && ie_version >= 9 && cm.display.inputHasSelection === text ||
-        mac && /[\uf700-\uf7ff]/.test(text)) {
-      resetInput(cm);
-      return false;
-    }
-
-    var withOp = !cm.curOp;
-    if (withOp) startOperation(cm);
-    cm.display.shift = false;
-
-    if (text.charCodeAt(0) == 0x200b && doc.sel == cm.display.selForContextMenu && !prevInput)
-      prevInput = "\u200b";
-    // Find the part of the input that is actually new
-    var same = 0, l = Math.min(prevInput.length, text.length);
-    while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-    var inserted = text.slice(same), textLines = splitLines(inserted);
-
-    // When pasing N lines into N selections, insert one line per selection
-    var multiPaste = null;
-    if (cm.state.pasteIncoming && doc.sel.ranges.length > 1) {
-      if (lastCopied && lastCopied.join("\n") == inserted)
-        multiPaste = doc.sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
-      else if (textLines.length == doc.sel.ranges.length)
-        multiPaste = map(textLines, function(l) { return [l]; });
-    }
-
-    // Normal behavior is to insert the new text into every selection
-    for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
-      var range = doc.sel.ranges[i];
-      var from = range.from(), to = range.to();
-      // Handle deletion
-      if (same < prevInput.length)
-        from = Pos(from.line, from.ch - (prevInput.length - same));
-      // Handle overwrite
-      else if (cm.state.overwrite && range.empty() && !cm.state.pasteIncoming)
-        to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-      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"};
-      makeChange(cm.doc, changeEvent);
-      signalLater(cm, "inputRead", cm, changeEvent);
-      // When an 'electric' character is inserted, immediately trigger a reindent
-      if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
-          cm.options.smartIndent && range.head.ch < 100 &&
-          (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
-        var mode = cm.getModeAt(range.head);
-        var end = changeEnd(changeEvent);
-        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");
-              break;
-            }
-        } else if (mode.electricInput) {
-          if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
-            indentLine(cm, end.line, "smart");
-        }
-      }
-    }
-    ensureCursorVisible(cm);
-    cm.curOp.updateInput = updateInput;
-    cm.curOp.typing = true;
-
-    // Don't leave long text in the textarea, since it makes further polling slow
-    if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
-    else cm.display.prevInput = text;
-    if (withOp) endOperation(cm);
-    cm.state.pasteIncoming = cm.state.cutIncoming = false;
-    return true;
-  }
-
-  // Reset the input to correspond to the selection (or to be empty,
-  // when not typing and nothing is selected)
-  function resetInput(cm, typing) {
-    if (cm.display.contextMenuPending) return;
-    var minimal, selected, doc = cm.doc;
-    if (cm.somethingSelected()) {
-      cm.display.prevInput = "";
-      var range = doc.sel.primary();
-      minimal = hasCopyEvent &&
-        (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
-      var content = minimal ? "-" : selected || cm.getSelection();
-      cm.display.input.value = content;
-      if (cm.state.focused) selectInput(cm.display.input);
-      if (ie && ie_version >= 9) cm.display.inputHasSelection = content;
-    } else if (!typing) {
-      cm.display.prevInput = cm.display.input.value = "";
-      if (ie && ie_version >= 9) cm.display.inputHasSelection = null;
-    }
-    cm.display.inaccurateSelection = minimal;
-  }
-
-  function focusInput(cm) {
-    if (cm.options.readOnly != "nocursor" && (!mobile || activeElt() != cm.display.input)) {
-      try { cm.display.input.focus(); }
-      catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
-    }
-  }
-
-  function ensureFocus(cm) {
-    if (!cm.state.focused) { focusInput(cm); onFocus(cm); }
-  }
-
-  function isReadOnly(cm) {
-    return cm.options.readOnly || cm.doc.cantEdit;
-  }
-
   // EVENT HANDLERS
 
   // Attach the necessary event handlers when initializing the editor
@@ -2657,10 +2875,6 @@
       }));
     else
       on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
-    // Prevent normal selection in the editor (we handle our own)
-    on(d.lineSpace, "selectstart", function(e) {
-      if (!eventInWidget(d, e)) e_preventDefault(e);
-    });
     // Some browsers fire contextmenu *after* opening the menu, at
     // which point we can't mess with it anymore. Context menu is
     // handled in onMouseDown for these browsers.
@@ -2683,16 +2897,6 @@
     // Prevent wrapper from ever scrolling
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
-    on(d.input, "keyup", function(e) { onKeyUp.call(cm, e); });
-    on(d.input, "input", function() {
-      if (ie && ie_version >= 9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
-      readInput(cm);
-    });
-    on(d.input, "keydown", operation(cm, onKeyDown));
-    on(d.input, "keypress", operation(cm, onKeyPress));
-    on(d.input, "focus", bind(onFocus, cm));
-    on(d.input, "blur", bind(onBlur, cm));
-
     function drag_(e) {
       if (!signalDOMEvent(cm, e)) e_stop(e);
     }
@@ -2703,65 +2907,11 @@
       on(d.scroller, "drop", operation(cm, onDrop));
     }
     on(d.scroller, "paste", function(e) {
+      // FIXME adjust for configurable input model
       if (eventInWidget(d, e)) return;
       cm.state.pasteIncoming = true;
-      focusInput(cm);
-      fastPoll(cm);
-    });
-    on(d.input, "paste", function() {
-      // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
-      // Add a char to the end of textarea before paste occur so that
-      // selection doesn't span to the end of textarea.
-      if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
-        var start = d.input.selectionStart, end = d.input.selectionEnd;
-        d.input.value += "$";
-        // The selection end needs to be set before the start, otherwise there
-        // can be an intermediate non-empty selection between the two, which
-        // can override the middle-click paste buffer on linux and cause the
-        // wrong thing to get pasted.
-        d.input.selectionEnd = end;
-        d.input.selectionStart = start;
-        cm.state.fakedLastChar = true;
-      }
-      cm.state.pasteIncoming = true;
-      fastPoll(cm);
-    });
-
-    function prepareCopyCut(e) {
-      if (cm.somethingSelected()) {
-        lastCopied = cm.getSelections();
-        if (d.inaccurateSelection) {
-          d.prevInput = "";
-          d.inaccurateSelection = false;
-          d.input.value = lastCopied.join("\n");
-          selectInput(d.input);
-        }
-      } else {
-        var text = [], ranges = [];
-        for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
-          var line = cm.doc.sel.ranges[i].head.line;
-          var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
-          ranges.push(lineRange);
-          text.push(cm.getRange(lineRange.anchor, lineRange.head));
-        }
-        if (e.type == "cut") {
-          cm.setSelections(ranges, null, sel_dontScroll);
-        } else {
-          d.prevInput = "";
-          d.input.value = text.join("\n");
-          selectInput(d.input);
-        }
-        lastCopied = text;
-      }
-      if (e.type == "cut") cm.state.cutIncoming = true;
-    }
-    on(d.input, "cut", prepareCopyCut);
-    on(d.input, "copy", prepareCopyCut);
-
-    // Needed to handle Tab key in KHTML
-    if (khtml) on(d.sizer, "mouseup", function() {
-      if (activeElt() == d.input) d.input.blur();
-      focusInput(cm);
+      d.input.focus();
+      d.input.fastPoll();
     });
   }
 
@@ -2841,7 +2991,7 @@
     case 2:
       if (webkit) cm.state.lastMiddleDown = +new Date;
       if (start) extendSelection(cm.doc, start);
-      setTimeout(bind(focusInput, cm), 20);
+      setTimeout(function() {display.input.focus();}, 20);
       e_preventDefault(e);
       break;
     case 3:
@@ -2887,10 +3037,10 @@
         e_preventDefault(e2);
         if (!modifier)
           extendSelection(cm.doc, start);
-        focusInput(cm);
+        display.input.focus();
         // Work around unexplainable focus problem in IE9 (#2127)
         if (ie && ie_version == 9)
-          setTimeout(function() {document.body.focus(); focusInput(cm);}, 20);
+          setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
       }
     });
     // Let the drag handler handle this.
@@ -3028,7 +3178,7 @@
     function done(e) {
       counter = Infinity;
       e_preventDefault(e);
-      focusInput(cm);
+      display.input.focus();
       off(document, "mousemove", move);
       off(document, "mouseup", up);
       doc.history.lastSelOrigin = null;
@@ -3107,7 +3257,7 @@
       if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
         cm.state.draggingText(e);
         // Ensure the editor is re-focused
-        setTimeout(bind(focusInput, cm), 20);
+        setTimeout(function() {cm.display.input.focus();}, 20);
         return;
       }
       try {
@@ -3119,7 +3269,7 @@
           if (selected) for (var i = 0; i < selected.length; ++i)
             replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
           cm.replaceSelection(text, "around", "paste");
-          focusInput(cm);
+          cm.display.input.focus();
         }
       }
       catch(e){}
@@ -3286,7 +3436,7 @@
     }
     // Ensure previous input has been read, so that the handler sees a
     // consistent view of the document
-    if (cm.display.pollingFast && readInput(cm)) cm.display.pollingFast = false;
+    cm.display.input.ensurePolled();
     var prevShift = cm.display.shift, done = false;
     try {
       if (isReadOnly(cm)) cm.state.suppressEdits = true;
@@ -3316,7 +3466,7 @@
       stopSeq.set(50, function() {
         if (cm.state.keySeq == seq) {
           cm.state.keySeq = null;
-          resetInput(cm);
+          cm.display.input.reset();
         }
       });
       name = seq + " " + name;
@@ -3412,11 +3562,10 @@
     if (signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
     var keyCode = e.keyCode, charCode = e.charCode;
     if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-    if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
+    if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
     var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
     if (handleCharBinding(cm, e, ch)) return;
-    if (ie && ie_version >= 9) cm.display.inputHasSelection = null;
-    fastPoll(cm);
+    cm.display.input.onKeyPress(e);
   }
 
   // FOCUS/BLUR EVENTS
@@ -3427,15 +3576,15 @@
       signal(cm, "focus", cm);
       cm.state.focused = true;
       addClass(cm.display.wrapper, "CodeMirror-focused");
-      // The prevInput test prevents this from firing when a context
-      // menu is closed (since the resetInput would kill the
+      // This test prevents this from firing when a context
+      // menu is closed (since the input reset would kill the
       // select-all detection hack)
       if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
-        resetInput(cm);
-        if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
+        cm.display.input.reset();
+        if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
       }
     }
-    slowPoll(cm);
+    cm.display.input.slowPoll();
     restartBlink(cm);
   }
   function onBlur(cm) {
@@ -3454,80 +3603,8 @@
   // textarea (making it as unobtrusive as possible) to let the
   // right-click take effect on it.
   function onContextMenu(cm, e) {
-    if (signalDOMEvent(cm, e, "contextmenu")) return;
-    var display = cm.display;
-    if (eventInWidget(display, e) || contextMenuInGutter(cm, e)) return;
-
-    var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
-    if (!pos || presto) return; // Opera is difficult.
-
-    // Reset the current text selection only if the click is done outside of the selection
-    // and 'resetSelectionOnContextMenu' option is true.
-    var reset = cm.options.resetSelectionOnContextMenu;
-    if (reset && cm.doc.sel.contains(pos) == -1)
-      operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
-
-    var oldCSS = display.input.style.cssText;
-    display.inputDiv.style.position = "absolute";
-    display.input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-      "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
-      (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
-      "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
-    if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
-    focusInput(cm);
-    if (webkit) window.scrollTo(null, oldScrollY);
-    resetInput(cm);
-    // Adds "Select all" to context menu in FF
-    if (!cm.somethingSelected()) display.input.value = display.prevInput = " ";
-    display.contextMenuPending = true;
-    display.selForContextMenu = cm.doc.sel;
-    clearTimeout(display.detectingSelectAll);
-
-    // Select-all will be greyed out if there's nothing to select, so
-    // this adds a zero-width space so that we can later check whether
-    // it got selected.
-    function prepareSelectAllHack() {
-      if (display.input.selectionStart != null) {
-        var selected = cm.somethingSelected();
-        var extval = display.input.value = "\u200b" + (selected ? display.input.value : "");
-        display.prevInput = selected ? "" : "\u200b";
-        display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
-        // Re-set this, in case some other handler touched the
-        // selection in the meantime.
-        display.selForContextMenu = cm.doc.sel;
-      }
-    }
-    function rehide() {
-      display.contextMenuPending = false;
-      display.inputDiv.style.position = "relative";
-      display.input.style.cssText = oldCSS;
-      if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
-      slowPoll(cm);
-
-      // Try to detect the user choosing select-all
-      if (display.input.selectionStart != null) {
-        if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
-        var i = 0, poll = function() {
-          if (display.selForContextMenu == cm.doc.sel && display.input.selectionStart == 0)
-            operation(cm, commands.selectAll)(cm);
-          else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
-          else resetInput(cm);
-        };
-        display.detectingSelectAll = setTimeout(poll, 200);
-      }
-    }
-
-    if (ie && ie_version >= 9) prepareSelectAllHack();
-    if (captureRightClick) {
-      e_stop(e);
-      var mouseup = function() {
-        off(window, "mouseup", mouseup);
-        setTimeout(rehide, 20);
-      };
-      on(window, "mouseup", mouseup);
-    } else {
-      setTimeout(rehide, 50);
-    }
+    if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
+    cm.display.input.onContextMenu(e);
   }
 
   function contextMenuInGutter(cm, e) {
@@ -4156,7 +4233,7 @@
 
   CodeMirror.prototype = {
     constructor: CodeMirror,
-    focus: function(){window.focus(); focusInput(this); fastPoll(this);},
+    focus: function(){window.focus(); this.display.input.focus(); this.display.input.fastPoll();},
 
     setOption: function(option, value) {
       var options = this.options, old = options[option];
@@ -4504,7 +4581,7 @@
 
       signal(this, "overwriteToggle", this, this.state.overwrite);
     },
-    hasFocus: function() { return activeElt() == this.display.input; },
+    hasFocus: function() { return this.display.input.hasFocus(); },
 
     scrollTo: methodOp(function(x, y) {
       if (x != null || y != null) resolveScrollToPos(this);
@@ -4580,14 +4657,14 @@
       old.cm = null;
       attachDoc(this, doc);
       clearCaches(this);
-      resetInput(this);
+      this.display.input.reset();
       this.scrollTo(doc.scrollLeft, doc.scrollTop);
       this.curOp.forceScroll = true;
       signalLater(this, "swapDoc", this, old);
       return old;
     }),
 
-    getInputField: function(){return this.display.input;},
+    getInputField: function(){return this.display.input.getField();},
     getWrapperElement: function(){return this.display.wrapper;},
     getScrollerElement: function(){return this.display.scroller;},
     getGutterElement: function(){return this.display.gutters;}
@@ -4634,6 +4711,9 @@
   }, true);
   option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
   option("electricChars", true);
+  option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
+    throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
+  }, true);
   option("rtlMoveVisually", !windows);
   option("wholeLineUpdateBefore", true);
 
@@ -4682,10 +4762,10 @@
       cm.display.disabled = true;
     } else {
       cm.display.disabled = false;
-      if (!val) resetInput(cm);
+      if (!val) cm.display.input.reset();
     }
   });
-  option("disableInput", false, function(cm, val) {if (!val) resetInput(cm);}, true);
+  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
   option("dragDrop", true);
 
   option("cursorBlinkRate", 530);
@@ -4702,11 +4782,11 @@
   option("viewportMargin", 10, function(cm){cm.refresh();}, true);
   option("maxHighlightLength", 10000, resetModeState, true);
   option("moveInputWithCursor", true, function(cm, val) {
-    if (!val) cm.display.inputDiv.style.top = cm.display.inputDiv.style.left = 0;
+    if (!val) cm.display.input.resetPosition();
   });
 
   option("tabindex", null, function(cm, val) {
-    cm.display.input.tabIndex = val || "";
+    cm.display.input.setTabIndex(val || "");
   });
   option("autofocus", null);
 
@@ -7509,14 +7589,15 @@
     return out;
   }
 
+  function nothing() {}
+
   function createObj(base, props) {
     var inst;
     if (Object.create) {
       inst = Object.create(base);
     } else {
-      var ctor = function() {};
-      ctor.prototype = base;
-      inst = new ctor();
+      nothing.prototype = base;
+      inst = new nothing();
     }
     if (props) copyObj(props, inst);
     return inst;

From f2b49d192b1149f504200ecd5e50ef3e0c774b64 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 9 Oct 2014 17:20:49 +0200
Subject: [PATCH 1926/4742] Wire up some actual logic to ContentEditableInput

Simple things work.
---
 lib/codemirror.css |  12 +-
 lib/codemirror.js  | 307 +++++++++++++++++++++++++++++----------------
 2 files changed, 208 insertions(+), 111 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index c56510e99a..0b53af6576 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -4,6 +4,7 @@
   /* Set height, width, borders, and global font properties here */
   font-family: monospace;
   height: 300px;
+  color: black;
 }
 
 /* PADDING */
@@ -139,11 +140,9 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
    the editor. You probably shouldn't touch them. */
 
 .CodeMirror {
-  line-height: 1;
   position: relative;
   overflow: hidden;
   background: white;
-  color: black;
 }
 
 .CodeMirror-scroll {
@@ -215,6 +214,11 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   cursor: default;
   z-index: 4;
 }
+.CodeMirror-gutter-wrapper {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
 
 .CodeMirror-lines {
   cursor: text;
@@ -256,6 +260,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-widget {}
 
+.CodeMirror-code {
+  outline: none;
+}
+
 .CodeMirror-measure {
   position: absolute;
   width: 100%;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0e680db3ff..3c089d72e9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -23,7 +23,6 @@
   // detected are enabled based on userAgent etc sniffing.
 
   var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  // ie_uptoN means Internet Explorer version N or lower
   var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
   var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
   var ie = ie_upto10 || ie_11up;
@@ -221,7 +220,7 @@
     // was opened.
     d.selForContextMenu = null;
 
-    input.init(this);
+    input.init(d);
   }
 
   // STATE UPDATES
@@ -879,7 +878,7 @@
       if (type == "text") updateLineText(cm, lineView);
       else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
       else if (type == "class") updateLineClasses(lineView);
-      else if (type == "widget") updateLineWidgets(lineView, dims);
+      else if (type == "widget") updateLineWidgets(cm, lineView, dims);
     }
     lineView.changes = null;
   }
@@ -957,11 +956,11 @@
     var markers = lineView.line.gutterMarkers;
     if (cm.options.lineNumbers || markers) {
       var wrap = ensureLineWrapped(lineView);
-      var gutterWrap = lineView.gutter =
-        wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
-                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
-                              "px; width: " + dims.gutterTotalWidth + "px"),
-                          lineView.text);
+      var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
+                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
+                                             "px; width: " + dims.gutterTotalWidth + "px");
+      cm.display.input.setUneditable(gutterWrap);
+      wrap.insertBefore(gutterWrap, lineView.text);
       if (lineView.line.gutterClass)
         gutterWrap.className += " " + lineView.line.gutterClass;
       if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
@@ -979,14 +978,14 @@
     }
   }
 
-  function updateLineWidgets(lineView, dims) {
+  function updateLineWidgets(cm, lineView, dims) {
     if (lineView.alignable) lineView.alignable = null;
     for (var node = lineView.node.firstChild, next; node; node = next) {
       var next = node.nextSibling;
       if (node.className == "CodeMirror-linewidget")
         lineView.node.removeChild(node);
     }
-    insertLineWidgets(lineView, dims);
+    insertLineWidgets(cm, lineView, dims);
   }
 
   // Build a line's DOM representation from scratch
@@ -998,25 +997,26 @@
 
     updateLineClasses(lineView);
     updateLineGutter(cm, lineView, lineN, dims);
-    insertLineWidgets(lineView, dims);
+    insertLineWidgets(cm, lineView, dims);
     return lineView.node;
   }
 
   // A lineView may contain multiple logical lines (when merged by
   // collapsed spans). The widgets for all of them need to be drawn.
-  function insertLineWidgets(lineView, dims) {
-    insertLineWidgetsFor(lineView.line, lineView, dims, true);
+  function insertLineWidgets(cm, lineView, dims) {
+    insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
     if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-      insertLineWidgetsFor(lineView.rest[i], lineView, dims, false);
+      insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false);
   }
 
-  function insertLineWidgetsFor(line, lineView, dims, allowAbove) {
+  function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
     if (!line.widgets) return;
     var wrap = ensureLineWrapped(lineView);
     for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
       var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
       if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
       positionLineWidget(widget, node, lineView, dims);
+      cm.display.input.setUneditable(widget);
       if (allowAbove && widget.above)
         wrap.insertBefore(node, lineView.gutter || lineView.text);
       else
@@ -1074,24 +1074,57 @@
   // was made out of.
   var lastCopied = null;
 
-  var emptyInput = {
-    init: nothing,
-    drawSelection: nothing,
-    showSelection: nothing,
-    reset: nothing,
-    getField: nothing,
-    focus: nothing,
-    hasFocus: nothing,
-    blur: nothing,
-    setTabIndex: nothing,
-    resetPosition: nothing,
-    slowPoll: nothing,
-    fastPoll: nothing,
-    poll: nothing,
-    ensurePolled: nothing,
-    onKeyPress: nothing,
-    onContextMenu: nothing
-  };
+  function applyTextInput(cm, inserted, deleted) {
+    var doc = cm.doc;
+    cm.display.shift = false;
+
+    var textLines = splitLines(inserted), multiPaste = null;
+    // When pasing N lines into N selections, insert one line per selection
+    if (cm.state.pasteIncoming && doc.sel.ranges.length > 1) {
+      if (lastCopied && lastCopied.join("\n") == inserted)
+        multiPaste = doc.sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
+      else if (textLines.length == doc.sel.ranges.length)
+        multiPaste = map(textLines, function(l) { return [l]; });
+    }
+
+    // Normal behavior is to insert the new text into every selection
+    for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
+      var range = doc.sel.ranges[i];
+      var from = range.from(), to = range.to();
+      if (range.empty()) {
+        if (deleted && deleted > 0) // Handle deletion
+          from = Pos(from.line, from.ch - deleted);
+        else if (cm.state.overwrite && !cm.state.pasteIncoming) // Handle overwrite
+          to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
+      }
+      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"};
+      makeChange(cm.doc, changeEvent);
+      signalLater(cm, "inputRead", cm, changeEvent);
+      // When an 'electric' character is inserted, immediately trigger a reindent
+      if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
+          cm.options.smartIndent && range.head.ch < 100 &&
+          (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
+        var mode = cm.getModeAt(range.head);
+        var end = changeEnd(changeEvent);
+        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");
+              break;
+            }
+        } else if (mode.electricInput) {
+          if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
+            indentLine(cm, end.line, "smart");
+        }
+      }
+    }
+    ensureCursorVisible(cm);
+    cm.curOp.updateInput = updateInput;
+    cm.curOp.typing = true;
+    cm.state.pasteIncoming = cm.state.cutIncoming = false;
+  }
 
   // TEXTAREA INPUT STYLE
 
@@ -1113,7 +1146,7 @@
     this.hasSelection = false;
   };
 
-  TextareaInput.prototype = createObj(emptyInput, {
+  TextareaInput.prototype = copyObj({
     init: function(display) {
       var input = this, cm = this.cm;
       // The semihidden textarea that is focused when the editor is
@@ -1202,7 +1235,7 @@
       });
     },
 
-    drawSelection: function() {
+    prepareSelection: function() {
       // Redraw the selection and/or cursor
       var cm = this.cm, display = cm.display, doc = cm.doc, result = {};
       var curFragment = result.cursors = document.createDocumentFragment();
@@ -1280,10 +1313,6 @@
       return activeElt() == this.textarea;
     },
 
-    setTabIndex: function(index) {
-      this.textarea.tabIndex = index;
-    },
-
     resetPosition: function() {
       this.wrapper.style.top = this.wrapper.style.left = 0;
     },
@@ -1320,7 +1349,7 @@
     // seen text (can be empty), which is stored in prevInput (we must
     // not reset the textarea when typing, because that breaks IME).
     poll: function() {
-      var cm = this.cm, input = this.textarea, prevInput = this.prevInput, doc = cm.doc;
+      var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
       // Since this is called a *lot*, try to bail out as cheaply as
       // possible when it is clear that nothing happened. hasSelection
       // will be the case when there is a lot of text in the textarea,
@@ -1345,68 +1374,17 @@
         return false;
       }
 
-      var withOp = !cm.curOp;
-      if (withOp) startOperation(cm);
-      cm.display.shift = false;
-
-      if (text.charCodeAt(0) == 0x200b && doc.sel == cm.display.selForContextMenu && !prevInput)
+      if (text.charCodeAt(0) == 0x200b && cm.doc.sel == cm.display.selForContextMenu && !prevInput)
         prevInput = "\u200b";
       // Find the part of the input that is actually new
       var same = 0, l = Math.min(prevInput.length, text.length);
       while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-      var inserted = text.slice(same), textLines = splitLines(inserted);
 
-      // When pasing N lines into N selections, insert one line per selection
-      var multiPaste = null;
-      if (cm.state.pasteIncoming && doc.sel.ranges.length > 1) {
-        if (lastCopied && lastCopied.join("\n") == inserted)
-          multiPaste = doc.sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
-        else if (textLines.length == doc.sel.ranges.length)
-          multiPaste = map(textLines, function(l) { return [l]; });
-      }
-
-      // Normal behavior is to insert the new text into every selection
-      for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
-        var range = doc.sel.ranges[i];
-        var from = range.from(), to = range.to();
-        // Handle deletion
-        if (same < prevInput.length)
-          from = Pos(from.line, from.ch - (prevInput.length - same));
-        // Handle overwrite
-        else if (cm.state.overwrite && range.empty() && !cm.state.pasteIncoming)
-          to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-        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"};
-        makeChange(cm.doc, changeEvent);
-        signalLater(cm, "inputRead", cm, changeEvent);
-        // When an 'electric' character is inserted, immediately trigger a reindent
-        if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
-            cm.options.smartIndent && range.head.ch < 100 &&
-            (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
-          var mode = cm.getModeAt(range.head);
-          var end = changeEnd(changeEvent);
-          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");
-                break;
-              }
-          } else if (mode.electricInput) {
-            if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
-              indentLine(cm, end.line, "smart");
-          }
-        }
-      }
-      ensureCursorVisible(cm);
-      cm.curOp.updateInput = updateInput;
-      cm.curOp.typing = true;
+      operation(cm, applyTextInput)(cm, text.slice(same), prevInput.length - same);
 
       // Don't leave long text in the textarea, since it makes further polling slow
       if (text.length > 1000 || text.indexOf("\n") > -1) input.value = this.prevInput = "";
       else this.prevInput = text;
-      if (withOp) endOperation(cm);
-      cm.state.pasteIncoming = cm.state.cutIncoming = false;
       return true;
     },
 
@@ -1491,14 +1469,119 @@
       } else {
         setTimeout(rehide, 50);
       }
-    }
-  });
+    },
+
+    setUneditable: nothing
+  }, TextareaInput.prototype);
 
   // CONTENTEDITABLE INPUT STYLE
 
-  function ContentEditableInput() {}
+  function ContentEditableInput(cm) {
+    this.cm = cm;
+    // FIXME eventually poll for selection changes
+    this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
+  }
+
+  ContentEditableInput.prototype = copyObj({
+    init: function(display) {
+      var input = this, cm = input.cm;
+      var div = input.div = display.lineDiv;
+      try { div.contentEditable = "plaintext-only"; }
+      catch(e) {} // It's nice if this works, since it guards against some weird editing possiblities, but not essential
+      if (div.contentEditable != "plaintext-only") div.contentEditable = "true";
+
+      // FIXME make configurable
+      div.setAttribute("autocorrect", "off"); div.setAttribute("autocapitalize", "off"); div.setAttribute("spellcheck", "false");
+
+      // FIXME maybe do centrally, on input.getField()
+      on(div, "keyup", function(e) { onKeyUp.call(cm, e); });
+      on(div, "keydown", operation(cm, onKeyDown));
+      on(div, "keypress", operation(cm, onKeyPress));
+      on(div, "focus", bind(onFocus, cm));
+      on(div, "blur", bind(onBlur, cm));
+
+      on(div, "input", function() { input.fastPoll(); });
+      on(div, "selectstart", function() { input.fastPoll(); });
+      on(div, "textInput", function(e) {
+        if (eventInWidget(cm.display, e)) return;
+        e.preventDefault();
+        operation(cm, applyTextInput)(cm, e.data, 0);
+      });
+
+      // FIXME cut/copy/paste handlers
+    },
+    prepareSelection: function(force) {
+      if (force || this.cm.hasFocus()) {
+        var sel = this.cm.doc.sel.primary();
+        return {start: nodeAndOffsetForPos(this.cm, sel.from()),
+                end: nodeAndOffsetForPos(this.cm, sel.to())};
+      }
+    },
+    showSelection: function(nodes) {
+      var sel = window.getSelection();
+      if (nodes) {
+        var old = sel.rangeCount && sel.getRangeAt(0);
+        try { var rng = range(nodes.start.node, nodes.start.offset, nodes.end.offset, nodes.end.node); }
+        catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
+        if (rng) {
+          sel.removeAllRanges();
+          sel.addRange(rng);
+          if (sel.anchorNode == null) sel.addRange(old);
+        }
+      }
+      this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
+      this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
+    },
+    focus: function() {
+      this.showSelection(this.prepareSelection(true));
+      this.div.focus();
+    },
+    hasFocus: function() {
+      var sel = window.getSelection();
+      if (!sel.rangeCount) return false;
+      var node = sel.getRangeAt(0).commonAncestorContainer;
+      return node == this.div || contains(this.div, node);
+    },
+    blur: function() {
+      if (this.hasFocus())
+        window.getSelection().removeAllRanges();
+      this.div.blur();
+    },
+    getField: function() {
+      return this.div;
+    },
+    reset: nothing,
+    resetPosition: nothing,
+    slowPoll: function() {
+      // FIXME
+    },
+    fastPoll: function() { this.slowPoll(); }, // FIXME
+    poll: function() { // FIXME (poll just for selection?)
+    },
+
+    ensurePolled: nothing,
+    onContextMenu: nothing,
+
+    setUneditable: function(node) {
+      node.setAttribute("contenteditable", "false");
+    },
+
+    onKeyPress: function(e) {
+      e.preventDefault();
+      operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
+    }
+  }, ContentEditableInput.prototype);
 
-  ContentEditableInput.prototype = createObj(emptyInput, {});
+  // FIXME assumes pos is in viewport
+  function nodeAndOffsetForPos(cm, pos) {
+    var view = findViewForLine(cm, pos.line);
+    var line = getLine(cm.doc, pos.line);
+    var info = mapFromLineView(view, line, pos.line);
+    // FIXME bidi
+    var result = nodeAndOffsetInLineMap(info.map, pos.ch, "left");
+    result.offset = result.collapse == "right" ? result.end : result.start;
+    return result;
+  }
 
   CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
 
@@ -1790,7 +1873,7 @@
   // SELECTION DRAWING
 
   function updateSelection(cm) {
-    cm.display.input.showSelection(cm.display.input.drawSelection());
+    cm.display.input.showSelection(cm.display.input.prepareSelection());
   }
 
   // Draws a cursor for the given range
@@ -2115,9 +2198,7 @@
 
   var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
 
-  function measureCharInner(cm, prepared, ch, bias) {
-    var map = prepared.map;
-
+  function nodeAndOffsetInLineMap(map, ch, bias) {
     var node, start, end, collapse;
     // First, search the line map for the text node corresponding to,
     // or closest to, the target character.
@@ -2151,13 +2232,19 @@
         break;
       }
     }
+    return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
+  }
+
+  function measureCharInner(cm, prepared, ch, bias) {
+    var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
+    var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
 
     var rect;
     if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
       for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
-        while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
-        while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
-        if (ie && ie_version < 9 && start == 0 && end == mEnd - mStart) {
+        while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
+        while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
+        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) {
           rect = node.parentNode.getBoundingClientRect();
         } else if (ie && cm.options.lineWrapping) {
           var rects = range(node, start, end).getClientRects();
@@ -2562,7 +2649,7 @@
     }
 
     if (op.updatedDisplay || op.selectionChanged)
-      op.preparedSelection = display.input.drawSelection();
+      op.preparedSelection = display.input.prepareSelection();
   }
 
   function endOperation_W2(op) {
@@ -3559,7 +3646,7 @@
 
   function onKeyPress(e) {
     var cm = this;
-    if (signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
+    if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
     var keyCode = e.keyCode, charCode = e.charCode;
     if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
     if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
@@ -4455,6 +4542,7 @@
       var top = pos.bottom, left = pos.left;
       node.style.position = "absolute";
       node.setAttribute("cm-ignore-events", "true");
+      this.display.input.setUneditable(node);
       display.sizer.appendChild(node);
       if (vert == "over") {
         top = pos.top;
@@ -4786,7 +4874,7 @@
   });
 
   option("tabindex", null, function(cm, val) {
-    cm.display.input.setTabIndex(val || "");
+    cm.display.input.getField().tabindex = val || "";
   });
   option("autofocus", null);
 
@@ -6372,6 +6460,7 @@
     var widget = !ignoreWidget && marker.widgetNode;
     if (widget) {
       builder.map.push(builder.pos, builder.pos + size, widget);
+      builder.cm.display.input.setUneditable(widget);
       builder.content.appendChild(widget);
     }
     builder.pos += size;
@@ -7652,9 +7741,9 @@
   }
 
   var range;
-  if (document.createRange) range = function(node, start, end) {
+  if (document.createRange) range = function(node, start, end, endNode) {
     var r = document.createRange();
-    r.setEnd(node, end);
+    r.setEnd(endNode || node, end);
     r.setStart(node, start);
     return r;
   };

From a1664f64e7ff30846a992e293b1d2b5bda6ca849 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Oct 2014 11:50:18 +0200
Subject: [PATCH 1927/4742] Suppress mouse event handling during touch

---
 lib/codemirror.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3c089d72e9..6929f2f4a9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -220,6 +220,8 @@
     // was opened.
     d.selForContextMenu = null;
 
+    d.touchActive = false;
+
     input.init(d);
   }
 
@@ -2967,6 +2969,16 @@
     // handled in onMouseDown for these browsers.
     if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
 
+    // Used to suppress mouse event handling when a touch happens
+    var touchFinished;
+    on(d.scroller, "touchstart", function() {
+      clearTimeout(touchFinished);
+      d.touchActive = true;
+    });
+    on(d.scroller, "touchend", function() {
+      touchFinished = setTimeout(function() {d.touchActive = false;}, 1000);
+    });
+
     // Sync scrolling between fake scrollbars and real scrollable
     // area, ensure viewport is updated when scrolling.
     on(d.scroller, "scroll", function() {
@@ -3051,8 +3063,8 @@
   // middle-click-paste. Or it might be a click on something we should
   // not interfere with, such as a scrollbar or widget.
   function onMouseDown(e) {
-    if (signalDOMEvent(this, e)) return;
     var cm = this, display = cm.display;
+    if (display.touchActive || signalDOMEvent(cm, e)) return;
     display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {

From 8bec859269c22b31ff6e13e20b17b1b357eb9f65 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Oct 2014 15:18:55 +0200
Subject: [PATCH 1928/4742] Support clipboard events, fix some selection issues

---
 lib/codemirror.js | 156 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 118 insertions(+), 38 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6929f2f4a9..c852cb9107 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -103,7 +103,7 @@
     this.curOp.forceUpdate = true;
     attachDoc(this, doc);
 
-    if ((options.autofocus && !mobile) || display.input.hasFocus())
+    if ((options.autofocus && !mobile) || cm.hasFocus())
       setTimeout(bind(onFocus, this), 20);
     else
       onBlur(this);
@@ -1128,6 +1128,17 @@
     cm.state.pasteIncoming = cm.state.cutIncoming = false;
   }
 
+  function copyableRanges(cm) {
+    var text = [], ranges = [];
+    for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
+      var line = cm.doc.sel.ranges[i].head.line;
+      var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
+      ranges.push(lineRange);
+      text.push(cm.getRange(lineRange.anchor, lineRange.head));
+    }
+    return {text: text, ranges: ranges};
+  }
+
   // TEXTAREA INPUT STYLE
 
   function TextareaInput(cm) {
@@ -1210,21 +1221,15 @@
             selectInput(te);
           }
         } else {
-          var text = [], ranges = [];
-          for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
-            var line = cm.doc.sel.ranges[i].head.line;
-            var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
-            ranges.push(lineRange);
-            text.push(cm.getRange(lineRange.anchor, lineRange.head));
-          }
+          var ranges = copyableRanges(cm);
+          lastCopied = ranges.text;
           if (e.type == "cut") {
-            cm.setSelections(ranges, null, sel_dontScroll);
+            cm.setSelections(ranges.ranges, null, sel_dontScroll);
           } else {
             input.prevInput = "";
-            te.value = text.join("\n");
+            te.value = ranges.text.join("\n");
             selectInput(te);
           }
-          lastCopied = text;
         }
         if (e.type == "cut") cm.state.cutIncoming = true;
       }
@@ -1311,14 +1316,12 @@
       this.textarea.blur();
     },
 
-    hasFocus: function() {
-      return activeElt() == this.textarea;
-    },
-
     resetPosition: function() {
       this.wrapper.style.top = this.wrapper.style.left = 0;
     },
 
+    receivedFocus: function() { this.slowPoll(); },
+
     // Poll for input changes, using the normal rate of polling. This
     // runs as long as the editor is focused.
     slowPoll: function() {
@@ -1394,6 +1397,9 @@
       if (this.pollingFast && this.poll()) this.pollingFast = false;
     },
 
+    rememberSelection: nothing,
+    pollSelection: nothing,
+
     onKeyPress: function() {
       if (ie && ie_version >= 9) this.hasSelection = null;
       this.fastPoll();
@@ -1445,7 +1451,6 @@
         input.wrapper.style.position = "relative";
         te.style.cssText = oldCSS;
         if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
-        display.input.slowPoll();
 
         // Try to detect the user choosing select-all
         if (te.selectionStart != null) {
@@ -1501,27 +1506,55 @@
       on(div, "keypress", operation(cm, onKeyPress));
       on(div, "focus", bind(onFocus, cm));
       on(div, "blur", bind(onBlur, cm));
+      on(div, "focus", bind(onFocus, cm));
+      on(div, "blur", bind(onBlur, cm));
 
-      on(div, "input", function() { input.fastPoll(); });
-      on(div, "selectstart", function() { input.fastPoll(); });
       on(div, "textInput", function(e) {
         if (eventInWidget(cm.display, e)) return;
         e.preventDefault();
         operation(cm, applyTextInput)(cm, e.data, 0);
       });
 
-      // FIXME cut/copy/paste handlers
+      // FIXME include per-line selection magic
+      on(div, "paste", function(e) {
+        if (e.clipboardData) {
+          e.preventDefault();
+          cm.replaceSelection(e.clipboardData.getData("text/plain"), null, "paste");
+        }
+      });
+      function onCopyCut(e) {
+        if (e.clipboardData) {
+          e.preventDefault();
+          if (cm.somethingSelected()) {
+            lastCopied = cm.getSelections();
+            if (e.type == "cut") cm.replaceSelection("", null, "cut");
+          } else {
+            var ranges = copyableRanges(cm);
+            lastCopied = ranges.text;
+            if (e.type == "cut") {
+              cm.operation(function() {
+                cm.setSelections(ranges.ranges, 0, sel_dontScroll);
+                cm.replaceSelection("", null, "cut");
+              });
+            }
+          }
+          e.clipboardData.clearData();
+          e.clipboardData.setData("text/plain", lastCopied.join("\n"));
+        }
+      }
+      on(div, "copy", onCopyCut);
+      on(div, "cut", onCopyCut);
     },
     prepareSelection: function(force) {
-      if (force || this.cm.hasFocus()) {
+      if (force || this.cm.state.focused) {
         var sel = this.cm.doc.sel.primary();
-        return {start: nodeAndOffsetForPos(this.cm, sel.from()),
-                end: nodeAndOffsetForPos(this.cm, sel.to())};
+        return {start: posNodeOffset(this.cm, sel.from()),
+                end: posNodeOffset(this.cm, sel.to())};
       }
     },
     showSelection: function(nodes) {
-      var sel = window.getSelection();
       if (nodes) {
+        var sel = window.getSelection();
         var old = sel.rangeCount && sel.getRangeAt(0);
         try { var rng = range(nodes.start.node, nodes.start.offset, nodes.end.offset, nodes.end.node); }
         catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
@@ -1530,35 +1563,50 @@
           sel.addRange(rng);
           if (sel.anchorNode == null) sel.addRange(old);
         }
+        this.rememberSelection();
       }
+    },
+    rememberSelection: function() {
+      var sel = window.getSelection();
       this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
       this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
     },
     focus: function() {
-      this.showSelection(this.prepareSelection(true));
       this.div.focus();
     },
-    hasFocus: function() {
+    selectionInEditor: function() {
       var sel = window.getSelection();
       if (!sel.rangeCount) return false;
       var node = sel.getRangeAt(0).commonAncestorContainer;
       return node == this.div || contains(this.div, node);
     },
     blur: function() {
-      if (this.hasFocus())
-        window.getSelection().removeAllRanges();
       this.div.blur();
     },
     getField: function() {
       return this.div;
     },
+
     reset: nothing,
     resetPosition: nothing,
-    slowPoll: function() {
-      // FIXME
+
+    receivedFocus: function() {
+      if (!this.selectionInEditor())
+        this.showSelection(this.prepareSelection(true));
     },
-    fastPoll: function() { this.slowPoll(); }, // FIXME
-    poll: function() { // FIXME (poll just for selection?)
+
+    pollSelection: function() {
+      var sel = window.getSelection(), an = sel.anchorNode, ao = sel.anchorOffset, fn = sel.focusNode, fo = sel.focusOffset;
+      if (sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
+          sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset) {
+        this.rememberSelection();
+        window.ii = (window.ii || 0) + 1;
+        if (window.ii > 20) return;
+        var anchor = nodeOffsetPos(this.cm, sel.anchorNode, sel.anchorOffset);
+        var head = nodeOffsetPos(this.cm, sel.focusNode, sel.focusOffset);
+        if (anchor && head)
+          operation(this.cm, setSelection)(this.cm.doc, simpleSelection(anchor, head), sel_dontScroll);
+      }
     },
 
     ensurePolled: nothing,
@@ -1575,7 +1623,7 @@
   }, ContentEditableInput.prototype);
 
   // FIXME assumes pos is in viewport
-  function nodeAndOffsetForPos(cm, pos) {
+  function posNodeOffset(cm, pos) {
     var view = findViewForLine(cm, pos.line);
     var line = getLine(cm.doc, pos.line);
     var info = mapFromLineView(view, line, pos.line);
@@ -1585,6 +1633,35 @@
     return result;
   }
 
+  function nodeOffsetPos(cm, node, offset) {
+    for (var lineNode = node;; lineNode = lineNode.parentNode) {
+      if (!lineNode || lineNode == cm.display.lineDiv) return null;
+      if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
+    }
+    for (var i = 0; i < cm.display.view.length; i++) {
+      var lineView = cm.display.view[i];
+      if (lineView.node == lineNode)
+        return locateNodeInLineView(lineView, node, offset);
+    }
+  }
+
+  function locateNodeInLineView(lineView, node, offset) {
+    if (!contains(lineView.text, node)) return Pos(lineNo(lineView.line), 0);
+
+    var textNode = node.nodeType == 3 ? node : null, topNode = node;
+    while (topNode.parentNode != lineView.text.firstChild) topNode = topNode.parentNode;
+    var measure = lineView.measure, maps = measure.maps;
+    for (var i = -1; i < (maps ? maps.length : 0); i++) {
+      var map = i < 0 ? measure.map : maps[i];
+      for (var j = 0; j < map.length; j += 3) {
+        if (map[j + 2] == textNode || map[j + 2] == topNode) {
+          var line = lineNo(i < 0 ? lineView.line : lineView.other[i]);
+          return Pos(line, map[j] + (map[j + 2] == textNode ? offset : 0));
+        }
+      }
+    }
+  }
+
   CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
 
   // SELECTION / CURSOR
@@ -2972,10 +3049,12 @@
     // Used to suppress mouse event handling when a touch happens
     var touchFinished;
     on(d.scroller, "touchstart", function() {
+      d.input.rememberSelection();
       clearTimeout(touchFinished);
       d.touchActive = true;
     });
     on(d.scroller, "touchend", function() {
+      d.input.pollSelection();
       touchFinished = setTimeout(function() {d.touchActive = false;}, 1000);
     });
 
@@ -3010,7 +3089,6 @@
       if (eventInWidget(d, e)) return;
       cm.state.pasteIncoming = true;
       d.input.focus();
-      d.input.fastPoll();
     });
   }
 
@@ -3683,7 +3761,7 @@
         if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
       }
     }
-    cm.display.input.slowPoll();
+    cm.display.input.receivedFocus();
     restartBlink(cm);
   }
   function onBlur(cm) {
@@ -4332,7 +4410,7 @@
 
   CodeMirror.prototype = {
     constructor: CodeMirror,
-    focus: function(){window.focus(); this.display.input.focus(); this.display.input.fastPoll();},
+    focus: function(){window.focus(); this.display.input.focus();},
 
     setOption: function(option, value) {
       var options = this.options, old = options[option];
@@ -4681,7 +4759,7 @@
 
       signal(this, "overwriteToggle", this, this.state.overwrite);
     },
-    hasFocus: function() { return this.display.input.hasFocus(); },
+    hasFocus: function() { return this.display.input.getField() == activeElt(); },
 
     scrollTo: methodOp(function(x, y) {
       if (x != null || y != null) resolveScrollToPos(this);
@@ -7780,12 +7858,14 @@
   }
 
   var contains = CodeMirror.contains = function(parent, child) {
+    if (child.nodeType == 3) // Android browser always returns false when child is a textnode
+      child = child.parentNode;
     if (parent.contains)
       return parent.contains(child);
-    while (child = child.parentNode) {
+    do {
       if (child.nodeType == 11) child = child.host;
       if (child == parent) return true;
-    }
+    } while (child = child.parentNode);
   };
 
   function activeElt() { return document.activeElement; }

From 3f45d4e54c7d055681845fca39a91db973614a0c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Oct 2014 15:44:18 +0200
Subject: [PATCH 1929/4742] Clean up some FIXMEs

---
 lib/codemirror.js | 53 +++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c852cb9107..22e44344da 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1139,6 +1139,12 @@
     return {text: text, ranges: ranges};
   }
 
+  function disableBrowserMagic(field) {
+    field.setAttribute("autocorrect", "off");
+    field.setAttribute("autocapitalize", "off");
+    field.setAttribute("spellcheck", "false");
+  }
+
   // TEXTAREA INPUT STYLE
 
   function TextareaInput(cm) {
@@ -1173,7 +1179,7 @@
       else te.setAttribute("wrap", "off");
       // If border: 0; -- iOS fails to open keyboard (issue #1287)
       if (ios) te.style.border = "1px solid black";
-      te.setAttribute("autocorrect", "off"); te.setAttribute("autocapitalize", "off"); te.setAttribute("spellcheck", "false");
+      disableBrowserMagic(te);
 
       // Wraps and hides input textarea
       var div = this.wrapper = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
@@ -1182,15 +1188,10 @@
       // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
       if (ios) te.style.width = "0px";
 
-      on(te, "keyup", function(e) { onKeyUp.call(cm, e); });
       on(te, "input", function() {
         if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
         input.poll();
       });
-      on(te, "keydown", operation(cm, onKeyDown));
-      on(te, "keypress", operation(cm, onKeyPress));
-      on(te, "focus", bind(onFocus, cm));
-      on(te, "blur", bind(onBlur, cm));
 
       on(te, "paste", function() {
         // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
@@ -1236,6 +1237,12 @@
       on(te, "cut", prepareCopyCut);
       on(te, "copy", prepareCopyCut);
 
+      on(display.scroller, "paste", function(e) {
+        if (eventInWidget(display, e)) return;
+        cm.state.pasteIncoming = true;
+        input.focus();
+      });
+
       // Prevent normal selection in the editor (we handle our own)
       on(display.lineSpace, "selectstart", function(e) {
         if (!eventInWidget(display, e)) e_preventDefault(e);
@@ -1485,7 +1492,6 @@
 
   function ContentEditableInput(cm) {
     this.cm = cm;
-    // FIXME eventually poll for selection changes
     this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
   }
 
@@ -1496,18 +1502,7 @@
       try { div.contentEditable = "plaintext-only"; }
       catch(e) {} // It's nice if this works, since it guards against some weird editing possiblities, but not essential
       if (div.contentEditable != "plaintext-only") div.contentEditable = "true";
-
-      // FIXME make configurable
-      div.setAttribute("autocorrect", "off"); div.setAttribute("autocapitalize", "off"); div.setAttribute("spellcheck", "false");
-
-      // FIXME maybe do centrally, on input.getField()
-      on(div, "keyup", function(e) { onKeyUp.call(cm, e); });
-      on(div, "keydown", operation(cm, onKeyDown));
-      on(div, "keypress", operation(cm, onKeyPress));
-      on(div, "focus", bind(onFocus, cm));
-      on(div, "blur", bind(onBlur, cm));
-      on(div, "focus", bind(onFocus, cm));
-      on(div, "blur", bind(onBlur, cm));
+      disableBrowserMagic(div);
 
       on(div, "textInput", function(e) {
         if (eventInWidget(cm.display, e)) return;
@@ -1515,7 +1510,6 @@
         operation(cm, applyTextInput)(cm, e.data, 0);
       });
 
-      // FIXME include per-line selection magic
       on(div, "paste", function(e) {
         if (e.clipboardData) {
           e.preventDefault();
@@ -3084,12 +3078,13 @@
       on(d.scroller, "dragover", drag_);
       on(d.scroller, "drop", operation(cm, onDrop));
     }
-    on(d.scroller, "paste", function(e) {
-      // FIXME adjust for configurable input model
-      if (eventInWidget(d, e)) return;
-      cm.state.pasteIncoming = true;
-      d.input.focus();
-    });
+
+    var inp = d.input.getField();
+    on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
+    on(inp, "keydown", operation(cm, onKeyDown));
+    on(inp, "keypress", operation(cm, onKeyPress));
+    on(inp, "focus", bind(onFocus, cm));
+    on(inp, "blur", bind(onBlur, cm));
   }
 
   // Called when the window resizes
@@ -4964,7 +4959,7 @@
   });
 
   option("tabindex", null, function(cm, val) {
-    cm.display.input.getField().tabindex = val || "";
+    cm.display.input.getField().tabIndex = val || "";
   });
   option("autofocus", null);
 
@@ -5397,8 +5392,8 @@
   CodeMirror.fromTextArea = function(textarea, options) {
     options = options ? copyObj(options) : {};
     options.value = textarea.value;
-    if (!options.tabindex && textarea.tabindex)
-      options.tabindex = textarea.tabindex;
+    if (!options.tabindex && textarea.tabIndex)
+      options.tabindex = textarea.tabIndex;
     if (!options.placeholder && textarea.placeholder)
       options.placeholder = textarea.placeholder;
     // Set autofocus to true if this textarea is focused, or if it has

From 594a301d5e3f5fa71627d9283b4e00d96cd16b93 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Oct 2014 16:04:27 +0200
Subject: [PATCH 1930/4742] Make selection drawing work when the viewport
 doesn't cover the selection

---
 lib/codemirror.js | 47 ++++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 22e44344da..4b022390b8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1308,9 +1308,7 @@
       this.inaccurateSelection = minimal;
     },
 
-    getField: function() {
-      return this.textarea;
-    },
+    getField: function() { return this.textarea; },
 
     focus: function() {
       if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
@@ -1319,9 +1317,7 @@
       }
     },
 
-    blur: function() {
-      this.textarea.blur();
-    },
+    blur: function() { this.textarea.blur(); },
 
     resetPosition: function() {
       this.wrapper.style.top = this.wrapper.style.left = 0;
@@ -1539,18 +1535,31 @@
       on(div, "copy", onCopyCut);
       on(div, "cut", onCopyCut);
     },
+
     prepareSelection: function(force) {
       if (force || this.cm.state.focused) {
         var sel = this.cm.doc.sel.primary();
-        return {start: posNodeOffset(this.cm, sel.from()),
-                end: posNodeOffset(this.cm, sel.to())};
+        var start = posNodeOffset(this.cm, sel.from());
+        var end = posNodeOffset(this.cm, sel.to());
+        return (start || end) && {start: start, end: end};
       }
     },
+
+    // FIXME draw multiple selections
     showSelection: function(nodes) {
-      if (nodes) {
+      var view = this.cm.display.view;
+      if (nodes && view.length) {
         var sel = window.getSelection();
         var old = sel.rangeCount && sel.getRangeAt(0);
-        try { var rng = range(nodes.start.node, nodes.start.offset, nodes.end.offset, nodes.end.node); }
+        var start = nodes.start, end = nodes.end;
+        if (!start) {
+          start = {node: view[0].measure.map[2], offset: 0};
+        } else if (!end) { // FIXME dangerously hacky
+          var measure = view[view.length - 1].measure;
+          var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
+          last = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
+        }
+        try { var rng = range(start.node, start.offset, end.offset, end.node); }
         catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
         if (rng) {
           sel.removeAllRanges();
@@ -1560,26 +1569,25 @@
         this.rememberSelection();
       }
     },
+
     rememberSelection: function() {
       var sel = window.getSelection();
       this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
       this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
     },
-    focus: function() {
-      this.div.focus();
-    },
+
     selectionInEditor: function() {
       var sel = window.getSelection();
       if (!sel.rangeCount) return false;
       var node = sel.getRangeAt(0).commonAncestorContainer;
       return node == this.div || contains(this.div, node);
     },
-    blur: function() {
-      this.div.blur();
-    },
-    getField: function() {
-      return this.div;
+
+    focus: function() {
+      if (this.cm.options.readOnly != "nocursor") this.div.focus();
     },
+    blur: function() { this.div.blur(); },
+    getField: function() { return this.div; },
 
     reset: nothing,
     resetPosition: nothing,
@@ -1610,15 +1618,16 @@
       node.setAttribute("contenteditable", "false");
     },
 
+    // FIXME handle IME
     onKeyPress: function(e) {
       e.preventDefault();
       operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
     }
   }, ContentEditableInput.prototype);
 
-  // FIXME assumes pos is in viewport
   function posNodeOffset(cm, pos) {
     var view = findViewForLine(cm, pos.line);
+    if (!view) return null;
     var line = getLine(cm.doc, pos.line);
     var info = mapFromLineView(view, line, pos.line);
     // FIXME bidi

From af059b4dcac2c7d9d9562f15d43d68304b54d6d2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Oct 2014 11:50:39 +0200
Subject: [PATCH 1931/4742] Further tweaks to selection polling

Still doesn't work properly
---
 lib/codemirror.js | 121 +++++++++++++++++++++++++++-------------------
 1 file changed, 71 insertions(+), 50 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4b022390b8..a95613206a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -170,7 +170,7 @@
 
     // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
     if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-    if (!webkit) d.scroller.draggable = true;
+    if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
 
     if (place) {
       if (place.appendChild) place.appendChild(d.wrapper);
@@ -1400,9 +1400,6 @@
       if (this.pollingFast && this.poll()) this.pollingFast = false;
     },
 
-    rememberSelection: nothing,
-    pollSelection: nothing,
-
     onKeyPress: function() {
       if (ie && ie_version >= 9) this.hasSelection = null;
       this.fastPoll();
@@ -1489,6 +1486,7 @@
   function ContentEditableInput(cm) {
     this.cm = cm;
     this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
+    this.polling = new Delayed();
   }
 
   ContentEditableInput.prototype = copyObj({
@@ -1507,11 +1505,13 @@
       });
 
       on(div, "paste", function(e) {
-        if (e.clipboardData) {
+        var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
+        if (pasted) {
           e.preventDefault();
-          cm.replaceSelection(e.clipboardData.getData("text/plain"), null, "paste");
+          cm.replaceSelection(pasted, null, "paste");
         }
       });
+
       function onCopyCut(e) {
         if (e.clipboardData) {
           e.preventDefault();
@@ -1536,38 +1536,43 @@
       on(div, "cut", onCopyCut);
     },
 
-    prepareSelection: function(force) {
-      if (force || this.cm.state.focused) {
-        var sel = this.cm.doc.sel.primary();
-        var start = posNodeOffset(this.cm, sel.from());
-        var end = posNodeOffset(this.cm, sel.to());
-        return (start || end) && {start: start, end: end};
-      }
-    },
+    prepareSelection: function() { return true; },
 
     // FIXME draw multiple selections
-    showSelection: function(nodes) {
+    showSelection: function(force) {
+      if (!this.cm.state.focused && !force || !this.cm.display.view.length) return;
+
+      var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
+      var curAnchor = nodeOffsetPos(this.cm, sel.anchorNode, sel.anchorOffset);
+      var curFocus = nodeOffsetPos(this.cm, sel.focusNode, sel.focusOffset);
+      if (curAnchor && curFocus &&
+          cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
+          cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
+        return;
+
+      var start = posNodeOffset(this.cm, prim.from());
+      var end = posNodeOffset(this.cm, prim.to());
+      if (!start && !end) return;
+
       var view = this.cm.display.view;
-      if (nodes && view.length) {
-        var sel = window.getSelection();
-        var old = sel.rangeCount && sel.getRangeAt(0);
-        var start = nodes.start, end = nodes.end;
-        if (!start) {
-          start = {node: view[0].measure.map[2], offset: 0};
-        } else if (!end) { // FIXME dangerously hacky
-          var measure = view[view.length - 1].measure;
-          var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
-          last = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
-        }
-        try { var rng = range(start.node, start.offset, end.offset, end.node); }
-        catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
-        if (rng) {
-          sel.removeAllRanges();
-          sel.addRange(rng);
-          if (sel.anchorNode == null) sel.addRange(old);
-        }
-        this.rememberSelection();
-      }
+      var old = sel.rangeCount && sel.getRangeAt(0);
+      if (!start) {
+        start = {node: view[0].measure.map[2], offset: 0};
+      } else if (!end) { // FIXME dangerously hacky
+        var measure = view[view.length - 1].measure;
+        var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
+        last = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
+      }
+
+      console.log("selection redraw");
+      try { var rng = range(start.node, start.offset, end.offset, end.node); }
+      catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
+      if (rng) {
+        sel.removeAllRanges();
+        sel.addRange(rng);
+        if (sel.anchorNode == null) sel.addRange(old);
+      }
+      this.rememberSelection();
     },
 
     rememberSelection: function() {
@@ -1580,7 +1585,7 @@
       var sel = window.getSelection();
       if (!sel.rangeCount) return false;
       var node = sel.getRangeAt(0).commonAncestorContainer;
-      return node == this.div || contains(this.div, node);
+      return contains(this.div, node);
     },
 
     focus: function() {
@@ -1593,19 +1598,26 @@
     resetPosition: nothing,
 
     receivedFocus: function() {
-      if (!this.selectionInEditor())
-        this.showSelection(this.prepareSelection(true));
+      this.showSelection(true);
+
+      var input = this;
+      function poll() {
+        if (input.cm.state.focused) {
+          input.pollSelection();
+          input.polling.set(input.cm.options.pollInterval, poll);
+        }
+      }
+      this.polling.set(this.cm.options.pollInterval, poll);
     },
 
     pollSelection: function() {
-      var sel = window.getSelection(), an = sel.anchorNode, ao = sel.anchorOffset, fn = sel.focusNode, fo = sel.focusOffset;
+      var sel = window.getSelection();
       if (sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
           sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset) {
         this.rememberSelection();
-        window.ii = (window.ii || 0) + 1;
-        if (window.ii > 20) return;
         var anchor = nodeOffsetPos(this.cm, sel.anchorNode, sel.anchorOffset);
         var head = nodeOffsetPos(this.cm, sel.focusNode, sel.focusOffset);
+        console.log("selection noticed", anchor, head);
         if (anchor && head)
           operation(this.cm, setSelection)(this.cm.doc, simpleSelection(anchor, head), sel_dontScroll);
       }
@@ -1637,8 +1649,10 @@
   }
 
   function nodeOffsetPos(cm, node, offset) {
+    if (node == cm.display.lineDiv)
+      return Pos(offset + cm.display.viewOffset, 0); // FIXME collapsed lines, etc
     for (var lineNode = node;; lineNode = lineNode.parentNode) {
-      if (!lineNode || lineNode == cm.display.lineDiv) return null;
+      if (!lineNode || lineNode == cm.display.lineDiv) return console.log("OUT");
       if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
     }
     for (var i = 0; i < cm.display.view.length; i++) {
@@ -1649,10 +1663,16 @@
   }
 
   function locateNodeInLineView(lineView, node, offset) {
-    if (!contains(lineView.text, node)) return Pos(lineNo(lineView.line), 0);
+    var wrapper = lineView.text.firstChild;
+    if (!wrapper) console.log("wrapper is null", lineView.text.outerHTML, lineView.measure && lineView.measure.map);
+    if (!contains(wrapper, node)) return Pos(lineNo(lineView.line), 0);
+    if (node == wrapper) {
+      node = wrapper.childNodes[offset];
+      offset = 0;
+    }
 
     var textNode = node.nodeType == 3 ? node : null, topNode = node;
-    while (topNode.parentNode != lineView.text.firstChild) topNode = topNode.parentNode;
+    while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
     var measure = lineView.measure, maps = measure.maps;
     for (var i = -1; i < (maps ? maps.length : 0); i++) {
       var map = i < 0 ? measure.map : maps[i];
@@ -1663,6 +1683,7 @@
         }
       }
     }
+    console.log("FELL", textNode && textNode.nodeValue, topNode, measure.map.indexOf(textNode), lineView.changes);
   }
 
   CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
@@ -3051,15 +3072,15 @@
 
     // Used to suppress mouse event handling when a touch happens
     var touchFinished;
+    function finishTouch(e) {
+      touchFinished = setTimeout(function() {d.touchActive = false;}, 1000);
+    };
     on(d.scroller, "touchstart", function() {
-      d.input.rememberSelection();
       clearTimeout(touchFinished);
       d.touchActive = true;
     });
-    on(d.scroller, "touchend", function() {
-      d.input.pollSelection();
-      touchFinished = setTimeout(function() {d.touchActive = false;}, 1000);
-    });
+    on(d.scroller, "touchend", finishTouch);
+    on(d.scroller, "touchcancel", finishTouch);
 
     // Sync scrolling between fake scrollbars and real scrollable
     // area, ensure viewport is updated when scrolling.
@@ -3764,8 +3785,8 @@
         cm.display.input.reset();
         if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
       }
+      cm.display.input.receivedFocus();
     }
-    cm.display.input.receivedFocus();
     restartBlink(cm);
   }
   function onBlur(cm) {

From 68b04f070efaead35a742caa40f5fe49d2964a4c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Oct 2014 13:15:13 +0200
Subject: [PATCH 1932/4742] Add scanning of surrounding dom nodes when looking
 for a selection node

---
 lib/codemirror.js | 69 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a95613206a..bed3c46b4e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1543,15 +1543,15 @@
       if (!this.cm.state.focused && !force || !this.cm.display.view.length) return;
 
       var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
-      var curAnchor = nodeOffsetPos(this.cm, sel.anchorNode, sel.anchorOffset);
-      var curFocus = nodeOffsetPos(this.cm, sel.focusNode, sel.focusOffset);
+      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
+      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
       if (curAnchor && curFocus &&
           cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
           cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
         return;
 
-      var start = posNodeOffset(this.cm, prim.from());
-      var end = posNodeOffset(this.cm, prim.to());
+      var start = posToDOM(this.cm, prim.from());
+      var end = posToDOM(this.cm, prim.to());
       if (!start && !end) return;
 
       var view = this.cm.display.view;
@@ -1615,8 +1615,8 @@
       if (sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
           sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset) {
         this.rememberSelection();
-        var anchor = nodeOffsetPos(this.cm, sel.anchorNode, sel.anchorOffset);
-        var head = nodeOffsetPos(this.cm, sel.focusNode, sel.focusOffset);
+        var anchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
+        var head = domToPos(this.cm, sel.focusNode, sel.focusOffset);
         console.log("selection noticed", anchor, head);
         if (anchor && head)
           operation(this.cm, setSelection)(this.cm.doc, simpleSelection(anchor, head), sel_dontScroll);
@@ -1637,7 +1637,7 @@
     }
   }, ContentEditableInput.prototype);
 
-  function posNodeOffset(cm, pos) {
+  function posToDOM(cm, pos) {
     var view = findViewForLine(cm, pos.line);
     if (!view) return null;
     var line = getLine(cm.doc, pos.line);
@@ -1648,12 +1648,17 @@
     return result;
   }
 
-  function nodeOffsetPos(cm, node, offset) {
-    if (node == cm.display.lineDiv)
-      return Pos(offset + cm.display.viewOffset, 0); // FIXME collapsed lines, etc
-    for (var lineNode = node;; lineNode = lineNode.parentNode) {
-      if (!lineNode || lineNode == cm.display.lineDiv) return console.log("OUT");
-      if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
+  function domToPos(cm, node, offset) {
+    var lineNode;
+    if (node == cm.display.lineDiv) {
+      lineNode = cm.display.lineDiv.childNodes[offset];
+      if (!lineNode) return cm.clipPos(Pos(cm.display.viewTo - 1));
+      node = null; offset = 0;
+    } else {
+      for (lineNode = node;; lineNode = lineNode.parentNode) {
+        if (!lineNode || lineNode == cm.display.lineDiv) return;
+        if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
+      }
     }
     for (var i = 0; i < cm.display.view.length; i++) {
       var lineView = cm.display.view[i];
@@ -1665,25 +1670,47 @@
   function locateNodeInLineView(lineView, node, offset) {
     var wrapper = lineView.text.firstChild;
     if (!wrapper) console.log("wrapper is null", lineView.text.outerHTML, lineView.measure && lineView.measure.map);
-    if (!contains(wrapper, node)) return Pos(lineNo(lineView.line), 0);
+    if (!node || !contains(wrapper, node)) return Pos(lineNo(lineView.line), 0);
     if (node == wrapper) {
       node = wrapper.childNodes[offset];
       offset = 0;
+      if (!node) return cm.clipPos(Pos(lineNo(lineView.rest ? lst(lineView.rest) : lineView.line)));
     }
 
     var textNode = node.nodeType == 3 ? node : null, topNode = node;
     while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
     var measure = lineView.measure, maps = measure.maps;
-    for (var i = -1; i < (maps ? maps.length : 0); i++) {
-      var map = i < 0 ? measure.map : maps[i];
-      for (var j = 0; j < map.length; j += 3) {
-        if (map[j + 2] == textNode || map[j + 2] == topNode) {
-          var line = lineNo(i < 0 ? lineView.line : lineView.other[i]);
-          return Pos(line, map[j] + (map[j + 2] == textNode ? offset : 0));
+
+    function find(textNode, topNode, offset) {
+      for (var i = -1; i < (maps ? maps.length : 0); i++) {
+        var map = i < 0 ? measure.map : maps[i];
+        for (var j = 0; j < map.length; j += 3) {
+          if (map[j + 2] == textNode || map[j + 2] == topNode) {
+            var line = lineNo(i < 0 ? lineView.line : lineView.other[i]);
+            return Pos(line, offset < 0 ? map[j + 1] : map[j] + (map[j + 2] == textNode ? offset : 0));
+          }
         }
       }
     }
-    console.log("FELL", textNode && textNode.nodeValue, topNode, measure.map.indexOf(textNode), lineView.changes);
+    var found = find(textNode, topNode, offset);
+    if (found) return found;
+
+    // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
+    for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
+      found = find(after, after.firstChild, 0);
+      if (found)
+        return Pos(found.line, found.ch - dist);
+      else
+        dist += after.textContent.length;
+    }
+    for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
+      found = find(before, before.firstChild, -1);
+      if (found)
+        return Pos(found.line, found.ch + dist);
+      else
+        dist += after.textContent.length;
+    }
+    console.log("FELL THROUGH", textNode && textNode.nodeValue, topNode);
   }
 
   CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};

From 3082017f6cb4d2a511be3abdb96fe6395ab04df1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Oct 2014 14:49:23 +0200
Subject: [PATCH 1933/4742] More selection nonsense

---
 lib/codemirror.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bed3c46b4e..12fb076378 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1536,15 +1536,15 @@
       on(div, "cut", onCopyCut);
     },
 
-    prepareSelection: function() { return true; },
+    prepareSelection: function() { return this.cm.state.focused; },
 
     // FIXME draw multiple selections
-    showSelection: function(force) {
-      if (!this.cm.state.focused && !force || !this.cm.display.view.length) return;
+    showSelection: function(doIt) {
+      if (!doIt || !this.cm.display.view.length) return;
 
       var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
-      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
-      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
+      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset, true);
+      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset, true);
       if (curAnchor && curFocus &&
           cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
           cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
@@ -1564,7 +1564,6 @@
         last = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
       }
 
-      console.log("selection redraw");
       try { var rng = range(start.node, start.offset, end.offset, end.node); }
       catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
       if (rng) {
@@ -1598,7 +1597,10 @@
     resetPosition: nothing,
 
     receivedFocus: function() {
-      this.showSelection(true);
+      if (this.selectionInEditor())
+        this.pollSelection();
+      else
+        this.showSelection(true);
 
       var input = this;
       function poll() {
@@ -1617,7 +1619,6 @@
         this.rememberSelection();
         var anchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
         var head = domToPos(this.cm, sel.focusNode, sel.focusOffset);
-        console.log("selection noticed", anchor, head);
         if (anchor && head)
           operation(this.cm, setSelection)(this.cm.doc, simpleSelection(anchor, head), sel_dontScroll);
       }
@@ -1648,9 +1649,10 @@
     return result;
   }
 
-  function domToPos(cm, node, offset) {
+  function domToPos(cm, node, offset, strict) {
     var lineNode;
     if (node == cm.display.lineDiv) {
+      if (strict) return null;
       lineNode = cm.display.lineDiv.childNodes[offset];
       if (!lineNode) return cm.clipPos(Pos(cm.display.viewTo - 1));
       node = null; offset = 0;
@@ -1669,6 +1671,7 @@
 
   function locateNodeInLineView(lineView, node, offset) {
     var wrapper = lineView.text.firstChild;
+    // FIXME debug
     if (!wrapper) console.log("wrapper is null", lineView.text.outerHTML, lineView.measure && lineView.measure.map);
     if (!node || !contains(wrapper, node)) return Pos(lineNo(lineView.line), 0);
     if (node == wrapper) {
@@ -1710,7 +1713,6 @@
       else
         dist += after.textContent.length;
     }
-    console.log("FELL THROUGH", textNode && textNode.nodeValue, topNode);
   }
 
   CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};

From a3af04e3ebc40ec35973a1f84e72e461e00eb2cc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Oct 2014 15:06:39 +0200
Subject: [PATCH 1934/4742] Don't disable mouse events during touch when using
 textarea input

---
 lib/codemirror.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 12fb076378..f4b877b072 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1310,6 +1310,8 @@
 
     getField: function() { return this.textarea; },
 
+    supportsTouch: function() { return false; },
+
     focus: function() {
       if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
         try { this.textarea.focus(); }
@@ -1593,6 +1595,8 @@
     blur: function() { this.div.blur(); },
     getField: function() { return this.div; },
 
+    supportsTouch: function() { return true; },
+
     reset: nothing,
     resetPosition: nothing,
 
@@ -3196,7 +3200,7 @@
   // not interfere with, such as a scrollbar or widget.
   function onMouseDown(e) {
     var cm = this, display = cm.display;
-    if (display.touchActive || signalDOMEvent(cm, e)) return;
+    if (display.touchActive && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
     display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {

From 5df0ce750e6d393c41e3e2aafdf8d35502a82e55 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Oct 2014 15:37:01 +0200
Subject: [PATCH 1935/4742] Make tests more or less run with contenteditable
 backend

---
 lib/codemirror.js | 19 +++++++++++--------
 test/test.js      |  7 +++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f4b877b072..6026d7157f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1018,7 +1018,7 @@
       var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
       if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
       positionLineWidget(widget, node, lineView, dims);
-      cm.display.input.setUneditable(widget);
+      cm.display.input.setUneditable(node);
       if (allowAbove && widget.above)
         wrap.insertBefore(node, lineView.gutter || lineView.text);
       else
@@ -1563,7 +1563,7 @@
       } else if (!end) { // FIXME dangerously hacky
         var measure = view[view.length - 1].measure;
         var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
-        last = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
+        end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
       }
 
       try { var rng = range(start.node, start.offset, end.offset, end.node); }
@@ -1571,7 +1571,7 @@
       if (rng) {
         sel.removeAllRanges();
         sel.addRange(rng);
-        if (sel.anchorNode == null) sel.addRange(old);
+        if (old && sel.anchorNode == null) sel.addRange(old);
       }
       this.rememberSelection();
     },
@@ -1601,12 +1601,12 @@
     resetPosition: nothing,
 
     receivedFocus: function() {
+      var input = this;
       if (this.selectionInEditor())
         this.pollSelection();
       else
-        this.showSelection(true);
+        runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; });
 
-      var input = this;
       function poll() {
         if (input.cm.state.focused) {
           input.pollSelection();
@@ -1644,7 +1644,7 @@
 
   function posToDOM(cm, pos) {
     var view = findViewForLine(cm, pos.line);
-    if (!view) return null;
+    if (!view || view.hidden) return null;
     var line = getLine(cm.doc, pos.line);
     var info = mapFromLineView(view, line, pos.line);
     // FIXME bidi
@@ -1681,7 +1681,10 @@
     if (node == wrapper) {
       node = wrapper.childNodes[offset];
       offset = 0;
-      if (!node) return cm.clipPos(Pos(lineNo(lineView.rest ? lst(lineView.rest) : lineView.line)));
+      if (!node) {
+        var line = lineView.rest ? lst(lineView.rest) : lineView.line;
+        return Pos(lineNo(line), line.text.length);
+      }
     }
 
     var textNode = node.nodeType == 3 ? node : null, topNode = node;
@@ -3105,7 +3108,7 @@
 
     // Used to suppress mouse event handling when a touch happens
     var touchFinished;
-    function finishTouch(e) {
+    function finishTouch() {
       touchFinished = setTimeout(function() {d.touchActive = false;}, 1000);
     };
     on(d.scroller, "touchstart", function() {
diff --git a/test/test.js b/test/test.js
index 6314598235..83d09ca5ac 100644
--- a/test/test.js
+++ b/test/test.js
@@ -681,7 +681,7 @@ testCM("selectAllNoScroll", function(cm) {
 });
 
 testCM("selectionPos", function(cm) {
-  if (phantom) return;
+  if (phantom || cm.getOption("inputStyle") != "textarea") return;
   cm.setSize(100, 100);
   addDoc(cm, 200, 100);
   cm.setSelection(Pos(1, 100), Pos(98, 100));
@@ -811,6 +811,7 @@ testCM("collapsedRangeCoordsChar", function(cm) {
 }, {value: "123456\nabcdef\nghijkl\nmnopqr\n"});
 
 testCM("collapsedRangeBetweenLinesSelected", function(cm) {
+  if (cm.getOption("inputStyle") != "textarea") return;
   var widget = document.createElement("span");
   widget.textContent = "\u2194";
   cm.markText(Pos(0, 3), Pos(1, 0), {replacedWith: widget});
@@ -1091,6 +1092,7 @@ testCM("measureEndOfLine", function(cm) {
 }, {mode: "text/html", value: "<!-- foo barrr -->", lineWrapping: true}, ie_lt8 || opera_lt10);
 
 testCM("scrollVerticallyAndHorizontally", function(cm) {
+  if (cm.getOption("inputStyle") != "textarea") return;
   cm.setSize(100, 100);
   addDoc(cm, 40, 40);
   cm.setCursor(39);
@@ -1319,6 +1321,7 @@ testCM("verticalMovementCommandsWrapping", function(cm) {
     lineWrapping: true});
 
 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) {
@@ -1388,7 +1391,7 @@ testCM("lineChangeEvents", function(cm) {
 });
 
 testCM("scrollEntirelyToRight", function(cm) {
-  if (phantom) return;
+  if (phantom || cm.getOption("inputStyle") != "textarea") return;
   addDoc(cm, 500, 2);
   cm.setCursor(Pos(0, 500));
   var wrap = cm.getWrapperElement(), cur = byClassName(wrap, "CodeMirror-cursor")[0];

From 3ab057f4af1a8354ffa897797aad235a8aad5f35 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Oct 2014 14:22:44 +0100
Subject: [PATCH 1936/4742] Don't poll for selection during composition

---
 lib/codemirror.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6026d7157f..771e237ff3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1514,6 +1514,13 @@
         }
       });
 
+      on(div, "compositionstart", function() {
+        this.composing = true;
+      });
+      on(div, "compositionend", function() {
+        this.composing = false;
+      });
+
       function onCopyCut(e) {
         if (e.clipboardData) {
           e.preventDefault();
@@ -1617,6 +1624,8 @@
     },
 
     pollSelection: function() {
+      if (this.composing) return;
+
       var sel = window.getSelection();
       if (sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
           sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset) {

From 5e834b99421d5974d26e08f17ca969cdfa2f14cb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Oct 2014 14:35:33 +0100
Subject: [PATCH 1937/4742] Draw secondary selections in contentEditable input
 model

---
 lib/codemirror.js | 51 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 771e237ff3..1dd777b868 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1251,18 +1251,8 @@
 
     prepareSelection: function() {
       // Redraw the selection and/or cursor
-      var cm = this.cm, display = cm.display, doc = cm.doc, result = {};
-      var curFragment = result.cursors = document.createDocumentFragment();
-      var selFragment = result.selection = document.createDocumentFragment();
-
-      for (var i = 0; i < doc.sel.ranges.length; i++) {
-        var range = doc.sel.ranges[i];
-        var collapsed = range.empty();
-        if (collapsed || cm.options.showCursorWhenSelecting)
-          drawSelectionCursor(cm, range, curFragment);
-        if (!collapsed)
-          drawSelectionRange(cm, range, selFragment);
-      }
+      var cm = this.cm, display = cm.display, doc = cm.doc;
+      var result = prepareSelection(cm);
 
       // Move the hidden textarea near the cursor to prevent scrolling artifacts
       if (cm.options.moveInputWithCursor) {
@@ -1545,12 +1535,19 @@
       on(div, "cut", onCopyCut);
     },
 
-    prepareSelection: function() { return this.cm.state.focused; },
+    prepareSelection: function() {
+      var result = prepareSelection(this.cm, false);
+      result.focus = this.cm.state.focused;
+      return result;
+    },
 
-    // FIXME draw multiple selections
-    showSelection: function(doIt) {
-      if (!doIt || !this.cm.display.view.length) return;
+    showSelection: function(info) {
+      if (!info || !this.cm.display.view.length) return;
+      if (info.focus) this.showPrimarySelection();
+      this.showMultipleSelections(info);
+    },
 
+    showPrimarySelection: function() {
       var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
       var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset, true);
       var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset, true);
@@ -1583,6 +1580,11 @@
       this.rememberSelection();
     },
 
+    showMultipleSelections: function(info) {
+      removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
+      removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
+    },
+
     rememberSelection: function() {
       var sel = window.getSelection();
       this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
@@ -2024,6 +2026,23 @@
     cm.display.input.showSelection(cm.display.input.prepareSelection());
   }
 
+  function prepareSelection(cm, primary) {
+    var doc = cm.doc, result = {};
+    var curFragment = result.cursors = document.createDocumentFragment();
+    var selFragment = result.selection = document.createDocumentFragment();
+
+    for (var i = 0; i < doc.sel.ranges.length; i++) {
+      if (primary === false && i == doc.sel.primIndex) continue;
+      var range = doc.sel.ranges[i];
+      var collapsed = range.empty();
+      if (collapsed || cm.options.showCursorWhenSelecting)
+        drawSelectionCursor(cm, range, curFragment);
+      if (!collapsed)
+        drawSelectionRange(cm, range, selFragment);
+    }
+    return result;
+  }
+
   // Draws a cursor for the given range
   function drawSelectionCursor(cm, range, output) {
     var pos = cursorCoords(cm, range.head, "div", null, null, !cm.options.singleCursorHeightPerLine);

From 4891ba31f2fd2e8209d88f92f2a77f55df7fcf92 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Oct 2014 14:46:13 +0100
Subject: [PATCH 1938/4742] Place cursor at correct offset in bidi text

---
 lib/codemirror.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1dd777b868..fb4ffb943f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1646,7 +1646,6 @@
       node.setAttribute("contenteditable", "false");
     },
 
-    // FIXME handle IME
     onKeyPress: function(e) {
       e.preventDefault();
       operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
@@ -1658,7 +1657,12 @@
     if (!view || view.hidden) return null;
     var line = getLine(cm.doc, pos.line);
     var info = mapFromLineView(view, line, pos.line);
-    // FIXME bidi
+
+    var order = getOrder(line), side = "left";
+    if (order) {
+      var partPos = getBidiPartAt(order, pos.ch);
+      side = partPos % 2 ? "right" : "left";
+    }
     var result = nodeAndOffsetInLineMap(info.map, pos.ch, "left");
     result.offset = result.collapse == "right" ? result.end : result.start;
     return result;

From 4f20778ac6219bb720a88a44b273d91fd2ea4fd2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 11:40:14 +0100
Subject: [PATCH 1939/4742] Improve handling of composition events

---
 lib/codemirror.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fb4ffb943f..bda1107ccf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1490,12 +1490,6 @@
       if (div.contentEditable != "plaintext-only") div.contentEditable = "true";
       disableBrowserMagic(div);
 
-      on(div, "textInput", function(e) {
-        if (eventInWidget(cm.display, e)) return;
-        e.preventDefault();
-        operation(cm, applyTextInput)(cm, e.data, 0);
-      });
-
       on(div, "paste", function(e) {
         var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
         if (pasted) {
@@ -1505,10 +1499,14 @@
       });
 
       on(div, "compositionstart", function() {
-        this.composing = true;
+        input.composing = true;
       });
-      on(div, "compositionend", function() {
-        this.composing = false;
+      on(div, "compositionend", function(e) {
+        input.composing = false;
+        var data = e.data;
+        setTimeout(function() {
+          operation(cm, applyTextInput)(cm, data, 0);
+        }, 50);
       });
 
       function onCopyCut(e) {

From 2ba1798be6f2c7fab8679054f3c20804e64ff15b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Nov 2014 11:48:13 +0100
Subject: [PATCH 1940/4742] Fix focus issue in Firefox

---
 lib/codemirror.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bda1107ccf..22d512c78c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1688,8 +1688,6 @@
 
   function locateNodeInLineView(lineView, node, offset) {
     var wrapper = lineView.text.firstChild;
-    // FIXME debug
-    if (!wrapper) console.log("wrapper is null", lineView.text.outerHTML, lineView.measure && lineView.measure.map);
     if (!node || !contains(wrapper, node)) return Pos(lineNo(lineView.line), 0);
     if (node == wrapper) {
       node = wrapper.childNodes[offset];
@@ -3270,7 +3268,8 @@
 
   var lastClick, lastDoubleClick;
   function leftButtonDown(cm, e, start) {
-    setTimeout(bind(ensureFocus, cm), 0);
+    ensureFocus(cm);
+    if (ie) setTimeout(bind(ensureFocus, cm), 0);
 
     var now = +new Date, type;
     if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {

From 9ddfe1f2871631c467739576cf6da7440e65f8c1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Nov 2014 12:07:26 +0100
Subject: [PATCH 1941/4742] Don't treat single-pixel-radius touch events as
 touch events

---
 lib/codemirror.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 22d512c78c..501c038202 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3137,11 +3137,18 @@
     // Used to suppress mouse event handling when a touch happens
     var touchFinished;
     function finishTouch() {
-      touchFinished = setTimeout(function() {d.touchActive = false;}, 1000);
+      if (d.touchActive) touchFinished = setTimeout(function() {d.touchActive = false;}, 1000);
     };
-    on(d.scroller, "touchstart", function() {
-      clearTimeout(touchFinished);
-      d.touchActive = true;
+    function isMouseLikeTouchEvent(e) {
+      if (e.touches.length != 1) return false;
+      var touch = e.touches[0];
+      return touch.radiusX <= 1 && touch.radiusY <= 1;
+    }
+    on(d.scroller, "touchstart", function(e) {
+      if (!isMouseLikeTouchEvent(e)) {
+        clearTimeout(touchFinished);
+        d.touchActive = true;
+      }
     });
     on(d.scroller, "touchend", finishTouch);
     on(d.scroller, "touchcancel", finishTouch);

From 45229e2af219c8b024785547f93f9846df210378 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Dec 2014 13:35:21 +0100
Subject: [PATCH 1942/4742] [contenteditable input] React to input invent by
 reading text from DOM

---
 lib/codemirror.js | 79 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 501c038202..f586a4c931 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1502,13 +1502,19 @@
         input.composing = true;
       });
       on(div, "compositionend", function(e) {
-        input.composing = false;
         var data = e.data;
         setTimeout(function() {
           operation(cm, applyTextInput)(cm, data, 0);
+          input.composing = false;
         }, 50);
       });
 
+      on(div, "input", function() {
+        if (input.composing) return;
+        if (!input.pollContent())
+          runInOp(input.cm, function() {regChange(cm);});
+      });
+
       function onCopyCut(e) {
         if (e.clipboardData) {
           e.preventDefault();
@@ -1637,6 +1643,50 @@
       }
     },
 
+    pollContent: function() {
+      var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
+      var from = sel.from(), to = sel.to();
+      if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
+
+      if (from.line == display.viewFrom) {
+        var fromLine = from.line;
+        var fromNode = display.view[0].node;
+      } else {
+        var fromIndex = findViewIndex(cm, from.line);
+        var fromLine = lineNo(display.view[fromIndex].line);
+        var fromNode = display.view[fromIndex - 1].node.nextSibling;
+      }
+      var toIndex = findViewIndex(cm, to.line);
+      if (toIndex == display.view.length - 1) {
+        var toLine = display.viewTo - 1;
+        var toNode = display.view[toIndex].node;
+      } else {
+        var toLine = lineNo(display.view[toIndex + 1].line) - 1;
+        var toNode = display.view[toIndex + 1].node.previousSibling;
+      }
+      var text = splitLines(domTextBetween(fromNode, toNode));
+
+      var beforeSel = getBetween(cm.doc, Pos(fromLine, 0), from);
+      while (beforeSel.length > 1) {
+        if (text.length <= 1 || beforeSel[0] != text[0]) return false;
+        beforeSel.shift(); text.shift();
+      }
+      if (beforeSel[0] != text[0].slice(0, from.ch)) return false;
+      text[0] = text[0].slice(from.ch);
+
+      var afterSel = getBetween(cm.doc, to, Pos(toLine, getLine(cm.doc, toLine).text.length));
+      while (afterSel.length > 1) {
+        if (text.length <= 1 || lst(afterSel) != lst(text)) return false;
+        afterSel.pop(); text.pop();
+      }
+      var textLst = lst(text);
+      if (afterSel[0] != textLst.slice(textLst.length - afterSel[0].length)) return false;
+      text[text.length - 1] = textLst.slice(0, textLst.length - afterSel[0].length);
+
+      cm.replaceSelection(text.join("\n"));
+      return true;
+    },
+
     ensurePolled: nothing,
     onContextMenu: nothing,
 
@@ -1733,6 +1783,33 @@
     }
   }
 
+  function domTextBetween(from, to) {
+    var text = "", closing = false;
+    function walk(node) {
+      if (node.nodeType == 1) {
+        if (node.getAttribute("contenteditable") == "false") return;
+        for (var i = 0; i < node.childNodes.length; i++)
+          walk(node.childNodes[i]);
+        if (/^(pre|div|p)$/i.test(node.nodeName))
+          closing = true;
+      } else if (node.nodeType == 3) {
+        var val = node.nodeValue;
+        if (!val) return;
+        if (closing) {
+          text += "\n";
+          closing = false;
+        }
+        text += val;
+      }
+    }
+    for (;;) {
+      walk(from);
+      if (from == to) break;
+      from = from.nextSibling;
+    }
+    return text;
+  }
+
   CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
 
   // SELECTION / CURSOR

From 0dc7c20b2f6656381fba2cf39c4b1710af17bd13 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Dec 2014 15:02:31 +0100
Subject: [PATCH 1943/4742] Override tap events to avoid Chrome's magnifying
 behavior

It apparently believes that if the editor's nodes are directly next to
each other without margin, the user needs a magnifying glass to pick
a cursor position.
---
 lib/codemirror.css |  1 +
 lib/codemirror.js  | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 0b53af6576..626d890f10 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -239,6 +239,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   z-index: 2;
   position: relative;
   overflow: visible;
+  -webkit-tap-highlight-color: transparent;
 }
 .CodeMirror-wrap pre {
   word-wrap: break-word;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index f586a4c931..1a0b4ba9c6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3224,10 +3224,27 @@
     on(d.scroller, "touchstart", function(e) {
       if (!isMouseLikeTouchEvent(e)) {
         clearTimeout(touchFinished);
-        d.touchActive = true;
+        d.touchActive = {};
+        if (e.touches.length == 1) {
+          d.touchActive.left = e.touches[0].pageX;
+          d.touchActive.top = e.touches[0].pageY;
+          d.touchActive.time = Date.now();
+        }
+      }
+    });
+    on(d.scroller, "touchmove", function() {
+      if (d.touchActive) d.touchActive.moved = true;
+    });
+    on(d.scroller, "touchend", function(e) {
+      if (d.touchActive && !eventInWidget(d, e) &&
+          !d.touchActive.moved &&
+          d.touchActive.time != null && Date.now() - d.touchActive.time < 300) {
+        cm.setCursor(cm.coordsChar(d.touchActive, "page"));
+        cm.focus();
+        e_preventDefault(e);
       }
+      finishTouch();
     });
-    on(d.scroller, "touchend", finishTouch);
     on(d.scroller, "touchcancel", finishTouch);
 
     // Sync scrolling between fake scrollbars and real scrollable

From 72d5c41ea5b72bbceea72f70a072049da90302c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Dec 2014 15:32:59 +0100
Subject: [PATCH 1944/4742] [contenteditable input] Properly handle
 compositionend events

---
 lib/codemirror.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1a0b4ba9c6..ea358a0f02 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1076,22 +1076,23 @@
   // was made out of.
   var lastCopied = null;
 
-  function applyTextInput(cm, inserted, deleted) {
+  function applyTextInput(cm, inserted, deleted, sel) {
     var doc = cm.doc;
     cm.display.shift = false;
+    if (!sel) sel = doc.sel;
 
     var textLines = splitLines(inserted), multiPaste = null;
     // When pasing N lines into N selections, insert one line per selection
-    if (cm.state.pasteIncoming && doc.sel.ranges.length > 1) {
+    if (cm.state.pasteIncoming && sel.ranges.length > 1) {
       if (lastCopied && lastCopied.join("\n") == inserted)
-        multiPaste = doc.sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
-      else if (textLines.length == doc.sel.ranges.length)
+        multiPaste = sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
+      else if (textLines.length == sel.ranges.length)
         multiPaste = map(textLines, function(l) { return [l]; });
     }
 
     // Normal behavior is to insert the new text into every selection
-    for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
-      var range = doc.sel.ranges[i];
+    for (var i = sel.ranges.length - 1; i >= 0; i--) {
+      var range = sel.ranges[i];
       var from = range.from(), to = range.to();
       if (range.empty()) {
         if (deleted && deleted > 0) // Handle deletion
@@ -1107,7 +1108,7 @@
       // When an 'electric' character is inserted, immediately trigger a reindent
       if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
           cm.options.smartIndent && range.head.ch < 100 &&
-          (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
+          (!i || sel.ranges[i - 1].head.line != range.head.line)) {
         var mode = cm.getModeAt(range.head);
         var end = changeEnd(changeEvent);
         if (mode.electricChars) {
@@ -1498,13 +1499,16 @@
         }
       });
 
-      on(div, "compositionstart", function() {
-        input.composing = true;
+      on(div, "compositionstart", function(e) {
+        input.composing = {sel: cm.doc.sel, value: e.data};
+      });
+      on(div, "compositionupdate", function(e) {
+        input.composing.value = e.data;
       });
       on(div, "compositionend", function(e) {
-        var data = e.data;
+        var data = e.data || input.composing.value, sel = input.composing.sel;
         setTimeout(function() {
-          operation(cm, applyTextInput)(cm, data, 0);
+          operation(cm, applyTextInput)(cm, data, 0, sel);
           input.composing = false;
         }, 50);
       });

From 4734f2f579229db5139bbee69ffcf8bca9c34689 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Dec 2014 15:46:43 +0100
Subject: [PATCH 1945/4742] [contenteditable input] Kill composition when key
 is handled or input is reset

---
 lib/codemirror.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ea358a0f02..07ce3ffa19 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1506,10 +1506,11 @@
         input.composing.value = e.data;
       });
       on(div, "compositionend", function(e) {
+        if (!input.composing) return;
         var data = e.data || input.composing.value, sel = input.composing.sel;
         setTimeout(function() {
           operation(cm, applyTextInput)(cm, data, 0, sel);
-          input.composing = false;
+          input.composing = null;
         }, 50);
       });
 
@@ -1614,9 +1615,6 @@
 
     supportsTouch: function() { return true; },
 
-    reset: nothing,
-    resetPosition: nothing,
-
     receivedFocus: function() {
       var input = this;
       if (this.selectionInEditor())
@@ -1691,8 +1689,18 @@
       return true;
     },
 
-    ensurePolled: nothing,
-    onContextMenu: nothing,
+    ensurePolled: function() {
+      if (this.composing) this.forceCompositionEnd();
+    },
+    reset: function() {
+      if (this.composing) this.forceCompositionEnd();
+    },
+    forceCompositionEnd: function() {
+      operation(this.cm, applyTextInput)(this.cm, this.composing.value, 0, this.composing.sel);
+      this.composing = null;
+      this.div.blur();
+      this.div.focus();
+    },
 
     setUneditable: function(node) {
       node.setAttribute("contenteditable", "false");
@@ -1701,7 +1709,10 @@
     onKeyPress: function(e) {
       e.preventDefault();
       operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
-    }
+    },
+
+    onContextMenu: nothing,
+    resetPosition: nothing
   }, ContentEditableInput.prototype);
 
   function posToDOM(cm, pos) {

From e3748a29e86d6bcfea21e726319b770ef1a38ecb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Dec 2014 16:40:48 +0100
Subject: [PATCH 1946/4742] Style in-editor selections to match default
 selection style

So that the contenteditable input style doesn't look silly
on desktop.
---
 lib/codemirror.css                |  2 ++
 theme/3024-day.css                |  2 ++
 theme/3024-night.css              |  2 ++
 theme/ambiance.css                | 10 ++++------
 theme/base16-dark.css             |  2 ++
 theme/base16-light.css            |  2 ++
 theme/blackboard.css              |  2 ++
 theme/cobalt.css                  |  2 ++
 theme/erlang-dark.css             |  2 ++
 theme/lesser-dark.css             |  2 ++
 theme/mbo.css                     |  2 ++
 theme/mdn-like.css                |  2 ++
 theme/midnight.css                |  2 ++
 theme/monokai.css                 |  2 ++
 theme/night.css                   |  2 ++
 theme/paraiso-dark.css            |  2 ++
 theme/paraiso-light.css           |  2 ++
 theme/pastel-on-dark.css          |  3 +++
 theme/rubyblue.css                |  2 ++
 theme/solarized.css               | 12 ++++++------
 theme/the-matrix.css              |  2 ++
 theme/tomorrow-night-eighties.css |  2 ++
 theme/twilight.css                |  2 ++
 theme/vibrant-ink.css             |  2 ++
 theme/xq-dark.css                 |  2 ++
 25 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 626d890f10..1902ba4abd 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -292,6 +292,8 @@ div.CodeMirror-cursors {
 .CodeMirror-selected { background: #d9d9d9; }
 .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
 .CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror ::selection { background: #d7d4f0; }
+.CodeMirror ::-moz-selection { background: #d7d4f0; }
 
 .cm-searching {
   background: #ffa;
diff --git a/theme/3024-day.css b/theme/3024-day.css
index 3c01c2bf58..359281621b 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -10,6 +10,8 @@
 
 .cm-s-3024-day.CodeMirror {background: #f7f7f7; color: #3a3432;}
 .cm-s-3024-day div.CodeMirror-selected {background: #d6d5d4 !important;}
+.cm-s-3024-day.CodeMirror ::selection { background: #d6d5d4; }
+.cm-s-3024-day.CodeMirror ::-moz-selection { background: #d9d9d9; }
 
 .cm-s-3024-day .CodeMirror-gutters {background: #f7f7f7; border-right: 0px;}
 .cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
diff --git a/theme/3024-night.css b/theme/3024-night.css
index 631757fc47..ccab9d50bf 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -10,6 +10,8 @@
 
 .cm-s-3024-night.CodeMirror {background: #090300; color: #d6d5d4;}
 .cm-s-3024-night div.CodeMirror-selected {background: #3a3432 !important;}
+.cm-s-3024-night.CodeMirror ::selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night.CodeMirror ::-moz-selection { background: rgba(58, 52, 50, .99); }
 .cm-s-3024-night .CodeMirror-gutters {background: #090300; border-right: 0px;}
 .cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
 .cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
diff --git a/theme/ambiance.css b/theme/ambiance.css
index c844566eac..afcf15a37a 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -30,12 +30,10 @@
 .cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
 .cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
 
-.cm-s-ambiance .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.15);
-}
-.cm-s-ambiance.CodeMirror-focused .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.10);
-}
+.cm-s-ambiance .CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-ambiance.CodeMirror-focused .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance.CodeMirror ::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance.CodeMirror ::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 
 /* Editor styling */
 
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index a46abdbbbd..b009d2b9d6 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -10,6 +10,8 @@
 
 .cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
 .cm-s-base16-dark div.CodeMirror-selected {background: #303030 !important;}
+.cm-s-base16-dark.CodeMirror ::selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark.CodeMirror ::-moz-selection { background: rgba(48, 48, 48, .99); }
 .cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
 .cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
diff --git a/theme/base16-light.css b/theme/base16-light.css
index 12ff2eb06f..15df6d3807 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -10,6 +10,8 @@
 
 .cm-s-base16-light.CodeMirror {background: #f5f5f5; color: #202020;}
 .cm-s-base16-light div.CodeMirror-selected {background: #e0e0e0 !important;}
+.cm-s-base16-light.CodeMirror ::selection { background: #e0e0e0; }
+.cm-s-base16-light.CodeMirror ::-moz-selection { background: #e0e0e0; }
 .cm-s-base16-light .CodeMirror-gutters {background: #f5f5f5; border-right: 0px;}
 .cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
diff --git a/theme/blackboard.css b/theme/blackboard.css
index d7a2dc9695..02289b630b 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -2,6 +2,8 @@
 
 .cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
 .cm-s-blackboard .CodeMirror-selected { background: #253B76 !important; }
+.cm-s-blackboard.CodeMirror ::selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard.CodeMirror ::-moz-selection { background: rgba(37, 59, 118, .99); }
 .cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
 .cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
 .cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
diff --git a/theme/cobalt.css b/theme/cobalt.css
index 47440531a0..3915589494 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -1,5 +1,7 @@
 .cm-s-cobalt.CodeMirror { background: #002240; color: white; }
 .cm-s-cobalt div.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-cobalt.CodeMirror ::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt.CodeMirror ::-moz-selection { background: rgba(179, 101, 57, .99); }
 .cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
 .cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index ff47d7f8de..25c7e0a2aa 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -1,5 +1,7 @@
 .cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
 .cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-erlang-dark.CodeMirror ::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark.CodeMirror ::-moz-selection { background: rgba(179, 101, 57, .99); }
 .cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
 .cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index a782474739..5af8b7f627 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -7,6 +7,8 @@ Ported to CodeMirror by Peter Kroon
 }
 .cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
 .cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/
+.cm-s-lesser-dark.CodeMirror ::selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark.CodeMirror ::-moz-selection { background: rgba(69, 68, 59, .99); }
 .cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 .cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
 
diff --git a/theme/mbo.css b/theme/mbo.css
index 0ad6360b50..e39879522e 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -6,6 +6,8 @@
 
 .cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffec;}
 .cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
+.cm-s-mbo.CodeMirror ::selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo.CodeMirror ::-moz-selection { background: rgba(113, 108, 98, .99); }
 .cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
 .cm-s-mbo .CodeMirror-guttermarker { color: white; }
 .cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index 81b21772d2..93293c01c8 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -9,6 +9,8 @@
 */
 .cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
 .cm-s-mdn-like .CodeMirror-selected { background: #cfc !important; }
+.cm-s-mdn-like.CodeMirror ::selection { background: #cfc; }
+.cm-s-mdn-like.CodeMirror ::-moz-selection { background: #cfc; }
 
 .cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
 .cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; margin-left: 3px; }
diff --git a/theme/midnight.css b/theme/midnight.css
index 4567d29399..296af4f7d2 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -15,6 +15,8 @@
 .cm-s-midnight.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 
 .cm-s-midnight div.CodeMirror-selected {background: #314D67 !important;}
+.cm-s-midnight.CodeMirror ::selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight.CodeMirror ::-moz-selection { background: rgba(49, 77, 103, .99); }
 .cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;}
 .cm-s-midnight .CodeMirror-guttermarker { color: white; }
 .cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
diff --git a/theme/monokai.css b/theme/monokai.css
index 548d2dfff6..6dfcc73ce4 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -2,6 +2,8 @@
 
 .cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2;}
 .cm-s-monokai div.CodeMirror-selected {background: #49483E !important;}
+.cm-s-monokai.CodeMirror ::selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai.CodeMirror ::-moz-selection { background: rgba(73, 72, 62, .99); }
 .cm-s-monokai .CodeMirror-gutters {background: #272822; border-right: 0px;}
 .cm-s-monokai .CodeMirror-guttermarker { color: white; }
 .cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
diff --git a/theme/night.css b/theme/night.css
index a0bf8cfa78..6b2ac6c7cf 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -2,6 +2,8 @@
 
 .cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
 .cm-s-night div.CodeMirror-selected { background: #447 !important; }
+.cm-s-night.CodeMirror ::selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night.CodeMirror ::-moz-selection { background: rgba(68, 68, 119, .99); }
 .cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
 .cm-s-night .CodeMirror-guttermarker { color: white; }
 .cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index 53dcdf7a2a..af914b60bf 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -10,6 +10,8 @@
 
 .cm-s-paraiso-dark.CodeMirror {background: #2f1e2e; color: #b9b6b0;}
 .cm-s-paraiso-dark div.CodeMirror-selected {background: #41323f !important;}
+.cm-s-paraiso-dark.CodeMirror ::selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark.CodeMirror ::-moz-selection { background: rgba(65, 50, 63, .99); }
 .cm-s-paraiso-dark .CodeMirror-gutters {background: #2f1e2e; border-right: 0px;}
 .cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
 .cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index 07ca325978..e198066faa 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -10,6 +10,8 @@
 
 .cm-s-paraiso-light.CodeMirror {background: #e7e9db; color: #41323f;}
 .cm-s-paraiso-light div.CodeMirror-selected {background: #b9b6b0 !important;}
+.cm-s-paraiso-light.CodeMirror ::selection { background: #b9b6b0; }
+.cm-s-paraiso-light.CodeMirror ::-moz-selection { background: #b9b6b0; }
 .cm-s-paraiso-light .CodeMirror-gutters {background: #e7e9db; border-right: 0px;}
 .cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
 .cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index 7992ac7d2d..0d06f63284 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -14,6 +14,9 @@
 	font-size: 14px;
 }
 .cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2) !important; }
+.cm-s-pastel-on-dark.CodeMirror ::selection { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark.CodeMirror ::-moz-selection { background: rgba(221,240,255,0.2); }
+
 .cm-s-pastel-on-dark .CodeMirror-gutters {
 	background: #34302f;
 	border-right: 0px;
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index 5349838940..d2fc0ecdbc 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -1,5 +1,7 @@
 .cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
 .cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
+.cm-s-rubyblue.CodeMirror ::selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue.CodeMirror ::-moz-selection { background: rgba(56, 86, 111, 0.99); }
 .cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
 .cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
 .cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 07ef406804..4a10b7c059 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -94,13 +94,13 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   border-bottom: 1px dotted #dc322f;
 }
 
-.cm-s-solarized.cm-s-dark .CodeMirror-selected {
-  background: #073642;
-}
+.cm-s-solarized.cm-s-dark .CodeMirror-selected { background: #073642; }
+.cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
+.cm-s-solarized.cm-s-dark.CodeMirror ::-moz-selection { background: rgba(7, 54, 66, 0.99); }
 
-.cm-s-solarized.cm-s-light .CodeMirror-selected {
-  background: #eee8d5;
-}
+.cm-s-solarized.cm-s-light .CodeMirror-selected { background: #eee8d5; }
+.cm-s-solarized.cm-s-light.CodeMirror ::selection { background: #eee8d5; }
+.cm-s-solarized.cm-s-lightCodeMirror ::-moz-selection { background: #eee8d5; }
 
 /* Editor styling */
 
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index 01474ca94d..f29b22b0da 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -1,5 +1,7 @@
 .cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
 .cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D !important; }
+.cm-s-the-matrix.CodeMirror ::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix.CodeMirror ::-moz-selection { background: rgba(45, 45, 45, 0.99); }
 .cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
 .cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
 .cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index 841413546c..5fca3cafbf 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -10,6 +10,8 @@
 
 .cm-s-tomorrow-night-eighties.CodeMirror {background: #000000; color: #CCCCCC;}
 .cm-s-tomorrow-night-eighties div.CodeMirror-selected {background: #2D2D2D !important;}
+.cm-s-tomorrow-night-eighties.CodeMirror ::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties.CodeMirror ::-moz-selection { background: rgba(45, 45, 45, 0.99); }
 .cm-s-tomorrow-night-eighties .CodeMirror-gutters {background: #000000; border-right: 0px;}
 .cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
 .cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
diff --git a/theme/twilight.css b/theme/twilight.css
index 9ca50576d8..889a83d799 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -1,5 +1,7 @@
 .cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
 .cm-s-twilight .CodeMirror-selected { background: #323232 !important; } /**/
+.cm-s-twilight.CodeMirror ::selection { background: rgba(50, 50, 50, 0.99); }
+.cm-s-twilight.CodeMirror ::-moz-selection { background: rgba(50, 50, 50, 0.99); }
 
 .cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
 .cm-s-twilight .CodeMirror-guttermarker { color: white; }
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index 5177282325..8ea535973c 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -2,6 +2,8 @@
 
 .cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
 .cm-s-vibrant-ink .CodeMirror-selected { background: #35493c !important; }
+.cm-s-vibrant-ink.CodeMirror ::selection { background: rgba(53, 73, 60, 0.99); }
+.cm-s-vibrant-ink.CodeMirror ::-moz-selection { background: rgba(53, 73, 60, 0.99); }
 
 .cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index 116eccf21b..d537993e89 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -22,6 +22,8 @@ THE SOFTWARE.
 */
 .cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-selected { background: #27007A !important; }
+.cm-s-xq-dark.CodeMirror ::selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark.CodeMirror ::-moz-selection { background: rgba(39, 0, 122, 0.99); }
 .cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
 .cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
 .cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }

From 9c874be3b1d8c7616832311a03f1f2479835f3de Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Dec 2014 15:32:39 +0100
Subject: [PATCH 1947/4742] [contenteditable input] Make dom poll hack work
 with tabs and special chars

---
 lib/codemirror.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 07ce3ffa19..d5a13fb1e5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -133,11 +133,11 @@
 
     // Covers bottom-right square when both scrollbars are present.
     d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
-    d.scrollbarFiller.setAttribute("not-content", "true");
+    d.scrollbarFiller.setAttribute("cm-not-content", "true");
     // Covers bottom of gutter when coverGutterNextToScrollbar is on
     // and h scrollbar is present.
     d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
-    d.gutterFiller.setAttribute("not-content", "true");
+    d.gutterFiller.setAttribute("cm-not-content", "true");
     // Will contain the actual code, positioned to cover the viewport.
     d.lineDiv = elt("div", null, "CodeMirror-code");
     // Elements are added to these to represent selection and cursors.
@@ -494,7 +494,7 @@
       on(node, "mousedown", function() {
         if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
       });
-      node.setAttribute("not-content", "true");
+      node.setAttribute("cm-not-content", "true");
     }, function(pos, axis) {
       if (axis == "horizontal") setScrollLeft(cm, pos);
       else setScrollTop(cm, pos);
@@ -1803,6 +1803,8 @@
     function walk(node) {
       if (node.nodeType == 1) {
         if (node.getAttribute("contenteditable") == "false") return;
+        var cmText = node.getAttribute("cm-text");
+        if (cmText) { text += cmText; return; }
         for (var i = 0; i < node.childNodes.length; i++)
           walk(node.childNodes[i]);
         if (/^(pre|div|p)$/i.test(node.nodeName))
@@ -3326,7 +3328,7 @@
   // coordinates beyond the right of the text.
   function posFromMouse(cm, e, liberal, forRect) {
     var display = cm.display;
-    if (!liberal && e_target(e).getAttribute("not-content") == "true") return null;
+    if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null;
 
     var x, y, space = display.lineSpace.getBoundingClientRect();
     // Fails unpredictably on IE[67] when mouse is dragged around quickly.
@@ -6697,9 +6699,11 @@
           var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
           var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
           txt.setAttribute("role", "presentation");
+          txt.setAttribute("cm-text", "\t");
           builder.col += tabWidth;
         } else {
           var txt = builder.cm.options.specialCharPlaceholder(m[0]);
+          txt.setAttribute("cm-text", m[0]);
           if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
           else content.appendChild(txt);
           builder.col += 1;

From 0f227d37511743355de99be4eaef7ff001b02ba7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 10 Dec 2014 14:07:50 +0100
Subject: [PATCH 1948/4742] Force redraw of native selection when it is in a
 bogus state

I.e. when the cursor is directly in the editor's top node or outside of a line's
<pre> node.
---
 lib/codemirror.js | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d5a13fb1e5..e3f7e84e06 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1558,9 +1558,9 @@
 
     showPrimarySelection: function() {
       var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
-      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset, true);
-      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset, true);
-      if (curAnchor && curFocus &&
+      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
+      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
+      if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
           cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
           cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
         return;
@@ -1634,14 +1634,16 @@
     pollSelection: function() {
       if (this.composing) return;
 
-      var sel = window.getSelection();
+      var sel = window.getSelection(), cm = this.cm;
       if (sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
           sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset) {
         this.rememberSelection();
-        var anchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
-        var head = domToPos(this.cm, sel.focusNode, sel.focusOffset);
-        if (anchor && head)
-          operation(this.cm, setSelection)(this.cm.doc, simpleSelection(anchor, head), sel_dontScroll);
+        var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+        var head = domToPos(cm, sel.focusNode, sel.focusOffset);
+        if (anchor && head) runInOp(cm, function() {
+          setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
+          if (anchor.bad || head.bad) cm.curOp.selectionChanged = true;
+        });
       }
     },
 
@@ -1731,16 +1733,17 @@
     return result;
   }
 
-  function domToPos(cm, node, offset, strict) {
+  function badPos(pos, bad) { if (bad) pos.bad = true; return pos; }
+
+  function domToPos(cm, node, offset) {
     var lineNode;
     if (node == cm.display.lineDiv) {
-      if (strict) return null;
       lineNode = cm.display.lineDiv.childNodes[offset];
-      if (!lineNode) return cm.clipPos(Pos(cm.display.viewTo - 1));
+      if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true);
       node = null; offset = 0;
     } else {
       for (lineNode = node;; lineNode = lineNode.parentNode) {
-        if (!lineNode || lineNode == cm.display.lineDiv) return;
+        if (!lineNode || lineNode == cm.display.lineDiv) return null;
         if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
       }
     }
@@ -1752,14 +1755,15 @@
   }
 
   function locateNodeInLineView(lineView, node, offset) {
-    var wrapper = lineView.text.firstChild;
-    if (!node || !contains(wrapper, node)) return Pos(lineNo(lineView.line), 0);
+    var wrapper = lineView.text.firstChild, bad = false;
+    if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true);
     if (node == wrapper) {
+      bad = true;
       node = wrapper.childNodes[offset];
       offset = 0;
       if (!node) {
         var line = lineView.rest ? lst(lineView.rest) : lineView.line;
-        return Pos(lineNo(line), line.text.length);
+        return badPos(Pos(lineNo(line), line.text.length), bad);
       }
     }
 
@@ -1779,20 +1783,20 @@
       }
     }
     var found = find(textNode, topNode, offset);
-    if (found) return found;
+    if (found) return badPos(found, bad);
 
     // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
     for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
       found = find(after, after.firstChild, 0);
       if (found)
-        return Pos(found.line, found.ch - dist);
+        return badPos(Pos(found.line, found.ch - dist), bad);
       else
         dist += after.textContent.length;
     }
     for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
       found = find(before, before.firstChild, -1);
       if (found)
-        return Pos(found.line, found.ch + dist);
+        return badPos(Pos(found.line, found.ch + dist), bad);
       else
         dist += after.textContent.length;
     }

From 8956ff560d10b6b0bb9637c474a6ff8b918cb2d1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 10 Dec 2014 14:37:54 +0100
Subject: [PATCH 1949/4742] [contenteditable input] Improve handling of forced
 completionend

---
 lib/codemirror.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e3f7e84e06..de9b79b9ef 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1508,8 +1508,12 @@
       on(div, "compositionend", function(e) {
         if (!input.composing) return;
         var data = e.data || input.composing.value, sel = input.composing.sel;
+        // Need a small delay to prevent other code (input event,
+        // selection polling) from doing damage when fired right after
+        // compositionend.
         setTimeout(function() {
-          operation(cm, applyTextInput)(cm, data, 0, sel);
+          if (input.composing && !input.composing.handled)
+            operation(cm, applyTextInput)(cm, data, 0, sel);
           input.composing = null;
         }, 50);
       });
@@ -1692,14 +1696,14 @@
     },
 
     ensurePolled: function() {
-      if (this.composing) this.forceCompositionEnd();
+      if (this.composing && !this.composing.handled) this.forceCompositionEnd();
     },
     reset: function() {
-      if (this.composing) this.forceCompositionEnd();
+      if (this.composing && !this.composing.handled) this.forceCompositionEnd();
     },
     forceCompositionEnd: function() {
       operation(this.cm, applyTextInput)(this.cm, this.composing.value, 0, this.composing.sel);
-      this.composing = null;
+      this.composing.handled = true;
       this.div.blur();
       this.div.focus();
     },

From 54df5999ec251dc84e943134dbde84344ccee078 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 10 Dec 2014 14:42:27 +0100
Subject: [PATCH 1950/4742] [contenteditable input] Make sure zero-width
 elements aren't counted as text

---
 lib/codemirror.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index de9b79b9ef..a15d938514 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1812,7 +1812,7 @@
       if (node.nodeType == 1) {
         if (node.getAttribute("contenteditable") == "false") return;
         var cmText = node.getAttribute("cm-text");
-        if (cmText) { text += cmText; return; }
+        if (cmText != null) { text += cmText; return; }
         for (var i = 0; i < node.childNodes.length; i++)
           walk(node.childNodes[i]);
         if (/^(pre|div|p)$/i.test(node.nodeName))
@@ -8169,8 +8169,10 @@
       if (measure.firstChild.offsetHeight != 0)
         zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
     }
-    if (zwspSupported) return elt("span", "\u200b");
-    else return elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
+    var node = zwspSupported ? elt("span", "\u200b") :
+      elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
+    node.setAttribute("cm-text", "");
+    return node;
   }
 
   // Feature-detect IE's crummy client rect reporting for bidi text

From 6ed2b8673fcfe52787773e3ba8ab81a3d44e6299 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Dec 2014 12:56:09 +0100
Subject: [PATCH 1951/4742] [contenteditable input] Guard against wrapped or
 replaced nodes in patchDisplay

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a15d938514..49271390e5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -849,7 +849,7 @@
     for (var i = 0; i < view.length; i++) {
       var lineView = view[i];
       if (lineView.hidden) {
-      } else if (!lineView.node) { // Not drawn yet
+      } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
         var node = buildLineElement(cm, lineView, lineN, dims);
         container.insertBefore(node, cur);
       } else { // Already drawn

From f396f8fcb6fab17e6e09accb35522f22dde855e3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 16 Dec 2014 18:00:11 +0100
Subject: [PATCH 1952/4742] [contenteditable input] Try to handle Google
 Keyboard's weird composition events

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 49271390e5..8bca14fc82 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1500,20 +1500,28 @@
       });
 
       on(div, "compositionstart", function(e) {
-        input.composing = {sel: cm.doc.sel, value: e.data};
+        var data = e.data;
+        input.composing = {sel: cm.doc.sel, data: data, startData: data};
+        if (!data) return;
+        var prim = cm.doc.sel.primary();
+        var line = cm.getLine(prim.head.line);
+        var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
+        if (found > -1 && found < data.length)
+          input.composing.sel = simpleSelection(Pos(prim.head.line, found),
+                                                Pos(prim.head.line, found + data.length));
       });
       on(div, "compositionupdate", function(e) {
         input.composing.value = e.data;
       });
       on(div, "compositionend", function(e) {
         if (!input.composing) return;
-        var data = e.data || input.composing.value, sel = input.composing.sel;
+        if (e.data) input.composing.data = e.data;
         // Need a small delay to prevent other code (input event,
         // selection polling) from doing damage when fired right after
         // compositionend.
         setTimeout(function() {
           if (input.composing && !input.composing.handled)
-            operation(cm, applyTextInput)(cm, data, 0, sel);
+            input.applyComposition(input.composing);
           input.composing = null;
         }, 50);
       });
@@ -1672,26 +1680,35 @@
         var toLine = lineNo(display.view[toIndex + 1].line) - 1;
         var toNode = display.view[toIndex + 1].node.previousSibling;
       }
-      var text = splitLines(domTextBetween(fromNode, toNode));
 
-      var beforeSel = getBetween(cm.doc, Pos(fromLine, 0), from);
-      while (beforeSel.length > 1) {
-        if (text.length <= 1 || beforeSel[0] != text[0]) return false;
-        beforeSel.shift(); text.shift();
+      var newText = splitLines(domTextBetween(fromNode, toNode));
+      var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
+      while (newText.length && oldText.length) {
+        if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
+        else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
+        else break;
       }
-      if (beforeSel[0] != text[0].slice(0, from.ch)) return false;
-      text[0] = text[0].slice(from.ch);
 
-      var afterSel = getBetween(cm.doc, to, Pos(toLine, getLine(cm.doc, toLine).text.length));
-      while (afterSel.length > 1) {
-        if (text.length <= 1 || lst(afterSel) != lst(text)) return false;
-        afterSel.pop(); text.pop();
+      var cutFront = 0, cutEnd = 0;
+      if (newText.length && oldText.length) {
+        var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
+        while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
+          ++cutFront;
+        var newBot = lst(newText), oldBot = lst(oldText);
+        var maxCutEnd = Math.max(newBot.length - (newText.length == 1 ? cutFront : 0),
+                                 oldBot.length - (oldText.length == 1 ? cutFront : 0));
+        while (cutEnd < maxCutEnd &&
+               newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
+          ++cutEnd;
+
+        newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
+        newText[0] = newTop.slice(cutFront);
       }
-      var textLst = lst(text);
-      if (afterSel[0] != textLst.slice(textLst.length - afterSel[0].length)) return false;
-      text[text.length - 1] = textLst.slice(0, textLst.length - afterSel[0].length);
 
-      cm.replaceSelection(text.join("\n"));
+      var chFrom = Pos(fromLine, cutFront);
+      var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
+      if (newText.length || newText[0].length || cmp(chFrom, chTo))
+        replaceRange(cm.doc, newText, chFrom, chTo, "+input");
       return true;
     },
 
@@ -1702,11 +1719,15 @@
       if (this.composing && !this.composing.handled) this.forceCompositionEnd();
     },
     forceCompositionEnd: function() {
-      operation(this.cm, applyTextInput)(this.cm, this.composing.value, 0, this.composing.sel);
+      this.applyComposition(this.composing);
       this.composing.handled = true;
       this.div.blur();
       this.div.focus();
     },
+    applyComposition: function(composing) {
+      if (composing.data && composing.data != composing.startData)
+        operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
+    },
 
     setUneditable: function(node) {
       node.setAttribute("contenteditable", "false");

From 42c3cadc7e65aa2715889b7f88e7d30421483b29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Jan 2015 16:28:26 +0100
Subject: [PATCH 1953/4742] Work around broken iOS clipboard API

---
 lib/codemirror.js | 72 +++++++++++++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 27 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8bca14fc82..3aed97603b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1166,24 +1166,30 @@
     this.hasSelection = false;
   };
 
+  function hiddenTextarea() {
+    var te = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
+    var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+    // The textarea is kept positioned near the cursor to prevent the
+    // fact that it'll be scrolled into view on input from scrolling
+    // our fake cursor out of view. On webkit, when wrap=off, paste is
+    // very slow. So make the area wide instead.
+    if (webkit) te.style.width = "1000px";
+    else te.setAttribute("wrap", "off");
+    // If border: 0; -- iOS fails to open keyboard (issue #1287)
+    if (ios) te.style.border = "1px solid black";
+    disableBrowserMagic(te);
+    return div;
+  }
+
   TextareaInput.prototype = copyObj({
     init: function(display) {
       var input = this, cm = this.cm;
-      // The semihidden textarea that is focused when the editor is
-      // focused, and receives input.
-      var te = this.textarea = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
-      // The textarea is kept positioned near the cursor to prevent the
-      // fact that it'll be scrolled into view on input from scrolling
-      // our fake cursor out of view. On webkit, when wrap=off, paste is
-      // very slow. So make the area wide instead.
-      if (webkit) te.style.width = "1000px";
-      else te.setAttribute("wrap", "off");
-      // If border: 0; -- iOS fails to open keyboard (issue #1287)
-      if (ios) te.style.border = "1px solid black";
-      disableBrowserMagic(te);
 
       // Wraps and hides input textarea
-      var div = this.wrapper = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+      var div = this.wrapper = hiddenTextarea();
+      // The semihidden textarea that is focused when the editor is
+      // focused, and receives input.
+      var te = this.textarea = div.firstChild;
       display.wrapper.insertBefore(div, display.wrapper.firstChild);
 
       // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
@@ -1533,23 +1539,35 @@
       });
 
       function onCopyCut(e) {
-        if (e.clipboardData) {
-          e.preventDefault();
-          if (cm.somethingSelected()) {
-            lastCopied = cm.getSelections();
-            if (e.type == "cut") cm.replaceSelection("", null, "cut");
-          } else {
-            var ranges = copyableRanges(cm);
-            lastCopied = ranges.text;
-            if (e.type == "cut") {
-              cm.operation(function() {
-                cm.setSelections(ranges.ranges, 0, sel_dontScroll);
-                cm.replaceSelection("", null, "cut");
-              });
-            }
+        if (cm.somethingSelected()) {
+          lastCopied = cm.getSelections();
+          if (e.type == "cut") cm.replaceSelection("", null, "cut");
+        } else {
+          var ranges = copyableRanges(cm);
+          lastCopied = ranges.text;
+          if (e.type == "cut") {
+            cm.operation(function() {
+              cm.setSelections(ranges.ranges, 0, sel_dontScroll);
+              cm.replaceSelection("", null, "cut");
+            });
           }
+        }
+        // iOS exposes the clipboard API, but seems to discard content inserted into it
+        if (e.clipboardData && !ios) {
+          e.preventDefault();
           e.clipboardData.clearData();
           e.clipboardData.setData("text/plain", lastCopied.join("\n"));
+        } else {
+          // Old-fashioned briefly-focus-a-textarea hack
+          var kludge = hiddenTextarea(), te = kludge.firstChild;
+          cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
+          te.value = lastCopied.join("\n");
+          var hadFocus = document.activeElement;
+          selectInput(te);
+          setTimeout(function() {
+            cm.display.lineSpace.removeChild(kludge);
+            hadFocus.focus();
+          }, 50);
         }
       }
       on(div, "copy", onCopyCut);

From 3baa1c1269519e11225ac436296ccb5bdfb69b97 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Jan 2015 17:08:02 +0100
Subject: [PATCH 1954/4742] [contenteditable input] Fix empty array issues in
 pollContent

---
 lib/codemirror.js | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3aed97603b..e05aa1505f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1701,31 +1701,29 @@
 
       var newText = splitLines(domTextBetween(fromNode, toNode));
       var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
-      while (newText.length && oldText.length) {
+      while (newText.length > 1 && oldText.length > 1) {
         if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
         else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
         else break;
       }
 
       var cutFront = 0, cutEnd = 0;
-      if (newText.length && oldText.length) {
-        var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
-        while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
-          ++cutFront;
-        var newBot = lst(newText), oldBot = lst(oldText);
-        var maxCutEnd = Math.max(newBot.length - (newText.length == 1 ? cutFront : 0),
-                                 oldBot.length - (oldText.length == 1 ? cutFront : 0));
-        while (cutEnd < maxCutEnd &&
-               newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
-          ++cutEnd;
-
-        newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
-        newText[0] = newTop.slice(cutFront);
-      }
+      var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
+      while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
+        ++cutFront;
+      var newBot = lst(newText), oldBot = lst(oldText);
+      var maxCutEnd = Math.max(newBot.length - (newText.length == 1 ? cutFront : 0),
+                               oldBot.length - (oldText.length == 1 ? cutFront : 0));
+      while (cutEnd < maxCutEnd &&
+             newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
+        ++cutEnd;
+
+      newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
+      newText[0] = newTop.slice(cutFront);
 
       var chFrom = Pos(fromLine, cutFront);
       var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
-      if (newText.length || newText[0].length || cmp(chFrom, chTo))
+      if (newText.length > 1 || newText[0] || cmp(chFrom, chTo))
         replaceRange(cm.doc, newText, chFrom, chTo, "+input");
       return true;
     },

From 505f6963af5194fc73b7ade6910d22e07ba022d5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 5 Jan 2015 17:37:15 +0100
Subject: [PATCH 1955/4742] [contenteditable input] Resolve race condition in
 composition end

---
 lib/codemirror.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e05aa1505f..e60dfa7e17 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1517,18 +1517,20 @@
                                                 Pos(prim.head.line, found + data.length));
       });
       on(div, "compositionupdate", function(e) {
-        input.composing.value = e.data;
+        input.composing.data = e.data;
       });
       on(div, "compositionend", function(e) {
-        if (!input.composing) return;
-        if (e.data) input.composing.data = e.data;
+        var ours = input.composing;
+        if (!ours) return;
+        if (e.data != e.startData && !/\200b/.test(e.data)) ours.data = e.data;
         // Need a small delay to prevent other code (input event,
         // selection polling) from doing damage when fired right after
         // compositionend.
         setTimeout(function() {
-          if (input.composing && !input.composing.handled)
-            input.applyComposition(input.composing);
-          input.composing = null;
+          if (!ours.handled)
+            input.applyComposition(ours);
+          if (input.composing == ours)
+            input.composing = null;
         }, 50);
       });
 

From 3f60ed5101a38310f14f0d4d52e82f642185014c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 7 Jan 2015 12:25:26 +0100
Subject: [PATCH 1956/4742] [contenteditable input] Fix pollContent when cursor
 ends up in a zero-width element

---
 lib/codemirror.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e60dfa7e17..acc48cd8f6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1851,7 +1851,11 @@
       if (node.nodeType == 1) {
         if (node.getAttribute("contenteditable") == "false") return;
         var cmText = node.getAttribute("cm-text");
-        if (cmText != null) { text += cmText; return; }
+        if (cmText != null) {
+          if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
+          text += cmText;
+          return;
+        }
         for (var i = 0; i < node.childNodes.length; i++)
           walk(node.childNodes[i]);
         if (/^(pre|div|p)$/i.test(node.nodeName))

From 60ef248a7739be24a118ece6e439a6e39c76a2b2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 23 Jan 2015 11:26:08 +0100
Subject: [PATCH 1957/4742] Don't immediately focus on click in IE

It can create a kind of phantom-focus state where the textarea
is focused but you can't type into it.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index acc48cd8f6..03b42958ac 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3437,8 +3437,8 @@
 
   var lastClick, lastDoubleClick;
   function leftButtonDown(cm, e, start) {
-    ensureFocus(cm);
     if (ie) setTimeout(bind(ensureFocus, cm), 0);
+    else ensureFocus(cm);
 
     var now = +new Date, type;
     if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {

From 0f5030a87a2ccffc5cce7d28019ff2d655199b84 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 26 Jan 2015 14:20:34 +0100
Subject: [PATCH 1958/4742] When polling input, set prevInput before ending the
 operation

Since that might end up calling resetInput and creating an
inconsistent state.

Issue #3046
---
 lib/codemirror.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 03b42958ac..cca917c278 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1387,11 +1387,14 @@
       var same = 0, l = Math.min(prevInput.length, text.length);
       while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
 
-      operation(cm, applyTextInput)(cm, text.slice(same), prevInput.length - same);
+      var self = this;
+      runInOp(cm, function() {
+        applyTextInput(cm, text.slice(same), prevInput.length - same);
 
-      // Don't leave long text in the textarea, since it makes further polling slow
-      if (text.length > 1000 || text.indexOf("\n") > -1) input.value = this.prevInput = "";
-      else this.prevInput = text;
+        // 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;
+      });
       return true;
     },
 

From 6873df1e6b5f9cc0cf414e56dba81e18bf0cea97 Mon Sep 17 00:00:00 2001
From: mihailik <mihailik@gmail.com>
Date: Wed, 28 Jan 2015 12:25:26 +0000
Subject: [PATCH 1959/4742] Fix for copying large chunks of text

Selecting and copying a large chunk of text places a single dash into clipboard.

This is related to line 1285, where the input's content is trimmed for performance:

https://github.com/codemirror/CodeMirror/blob/mobile/lib/codemirror.js#L1285

    minimal = hasCopyEvent &&
      (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
    var content = minimal ? "-" : selected || cm.getSelection();

The problem is apparently a typo during refactoring/renaming from 'd' on the master branch to 'input' here.
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cca917c278..6033a69736 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1222,7 +1222,7 @@
       function prepareCopyCut(e) {
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
-          if (this.inaccurateSelection) {
+          if (input.inaccurateSelection) {
             input.prevInput = "";
             input.inaccurateSelection = false;
             te.value = lastCopied.join("\n");

From 926ce1161dc56ffb4e9623c0b42f0c57bf2f652e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 2 Feb 2015 22:29:04 +0100
Subject: [PATCH 1960/4742] Don't try to use contenteditable=plaintext-only

Since Mobile Chrome's clipboard API is broken and does not let us
intercept paste events, we need full contenteditable to be able
to paste code with newlines.

Issue #3062
---
 lib/codemirror.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6033a69736..4a15e8308e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1495,9 +1495,7 @@
     init: function(display) {
       var input = this, cm = input.cm;
       var div = input.div = display.lineDiv;
-      try { div.contentEditable = "plaintext-only"; }
-      catch(e) {} // It's nice if this works, since it guards against some weird editing possiblities, but not essential
-      if (div.contentEditable != "plaintext-only") div.contentEditable = "true";
+      div.contentEditable = "true";
       disableBrowserMagic(div);
 
       on(div, "paste", function(e) {

From 7ae24f7c6cc3880869da1f0c838d5def962b5047 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Feb 2015 16:52:13 +0100
Subject: [PATCH 1961/4742] [contenteditable input] Fix bug in pollContent

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4a15e8308e..b200d66e81 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1722,7 +1722,7 @@
         ++cutEnd;
 
       newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
-      newText[0] = newTop.slice(cutFront);
+      newText[0] = newText[0].slice(cutFront);
 
       var chFrom = Pos(fromLine, cutFront);
       var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);

From 23486577016c5f0e040064fc5944ce7f78cc1dac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Feb 2015 16:52:51 +0100
Subject: [PATCH 1962/4742] [contenteditable input] Fix selection adjustment
 for compositionstart

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b200d66e81..889192d160 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1513,7 +1513,7 @@
         var prim = cm.doc.sel.primary();
         var line = cm.getLine(prim.head.line);
         var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
-        if (found > -1 && found < data.length)
+        if (found > -1 && found <= prim.head.ch)
           input.composing.sel = simpleSelection(Pos(prim.head.line, found),
                                                 Pos(prim.head.line, found + data.length));
       });

From 6ef5f8be8a51784faada2384bba8f51a9132f64b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Feb 2015 17:04:47 +0100
Subject: [PATCH 1963/4742] [contenteditable input] Fix compositionend
 data-overwriting exception

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 889192d160..c478245335 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1523,7 +1523,8 @@
       on(div, "compositionend", function(e) {
         var ours = input.composing;
         if (!ours) return;
-        if (e.data != e.startData && !/\200b/.test(e.data)) ours.data = e.data;
+        if (e.data != ours.startData && !/\u200b/.test(e.data))
+          ours.data = e.data;
         // Need a small delay to prevent other code (input event,
         // selection polling) from doing damage when fired right after
         // compositionend.

From 5cf6e8718b3016c6946b77ca3c472318d7b1d37e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 11 Feb 2015 17:27:44 +0100
Subject: [PATCH 1964/4742] [contenteditable input] Force composition end on
 touchstart event

---
 lib/codemirror.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c478245335..46c0b2d105 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1536,6 +1536,10 @@
         }, 50);
       });
 
+      on(div, "touchstart", function() {
+        input.forceCompositionEnd();
+      });
+
       on(div, "input", function() {
         if (input.composing) return;
         if (!input.pollContent())
@@ -1733,12 +1737,13 @@
     },
 
     ensurePolled: function() {
-      if (this.composing && !this.composing.handled) this.forceCompositionEnd();
+      this.forceCompositionEnd();
     },
     reset: function() {
-      if (this.composing && !this.composing.handled) this.forceCompositionEnd();
+      this.forceCompositionEnd();
     },
     forceCompositionEnd: function() {
+      if (!this.composing || this.composing.handled) return;
       this.applyComposition(this.composing);
       this.composing.handled = true;
       this.div.blur();

From 2ec77379cae678c7cedcda9a04d492eb7ae6e079 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Feb 2015 13:22:36 +0100
Subject: [PATCH 1965/4742] Handle double- and triple-tap events ourselves

Since preventDefaulting the first touchend event means the native
behavior won't happen anymore, this is seems to be the only way
to make multi-tap work for iOS.
---
 lib/codemirror.js | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 46c0b2d105..d2dffd1eaa 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -220,7 +220,7 @@
     // was opened.
     d.selForContextMenu = null;
 
-    d.touchActive = false;
+    d.activeTouch = null;
 
     input.init(d);
   }
@@ -3287,34 +3287,51 @@
     if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
 
     // Used to suppress mouse event handling when a touch happens
-    var touchFinished;
+    var touchFinished, prevTouch = {end: 0};
     function finishTouch() {
-      if (d.touchActive) touchFinished = setTimeout(function() {d.touchActive = false;}, 1000);
+      if (d.activeTouch) {
+        touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000);
+        prevTouch = d.activeTouch;
+        prevTouch.end = +new Date;
+      }
     };
     function isMouseLikeTouchEvent(e) {
       if (e.touches.length != 1) return false;
       var touch = e.touches[0];
       return touch.radiusX <= 1 && touch.radiusY <= 1;
     }
+    function farAway(touch, other) {
+      if (other.left == null) return true;
+      var dx = other.left - touch.left, dy = other.top - touch.top;
+      return dx * dx + dy * dy > 20 * 20;
+    }
     on(d.scroller, "touchstart", function(e) {
       if (!isMouseLikeTouchEvent(e)) {
         clearTimeout(touchFinished);
-        d.touchActive = {};
+        var now = +new Date;
+        d.activeTouch = {start: now, moved: false,
+                         prev: now - prevTouch.end <= 300 ? prevTouch : null};
         if (e.touches.length == 1) {
-          d.touchActive.left = e.touches[0].pageX;
-          d.touchActive.top = e.touches[0].pageY;
-          d.touchActive.time = Date.now();
+          d.activeTouch.left = e.touches[0].pageX;
+          d.activeTouch.top = e.touches[0].pageY;
         }
       }
     });
     on(d.scroller, "touchmove", function() {
-      if (d.touchActive) d.touchActive.moved = true;
+      if (d.activeTouch) d.activeTouch.moved = true;
     });
     on(d.scroller, "touchend", function(e) {
-      if (d.touchActive && !eventInWidget(d, e) &&
-          !d.touchActive.moved &&
-          d.touchActive.time != null && Date.now() - d.touchActive.time < 300) {
-        cm.setCursor(cm.coordsChar(d.touchActive, "page"));
+      var touch = d.activeTouch;
+      if (touch && !eventInWidget(d, e) && touch.left != null &&
+          !touch.moved && new Date - touch.start < 300) {
+        var pos = cm.coordsChar(d.activeTouch, "page"), range;
+        if (!touch.prev || farAway(touch, touch.prev)) // Single tap
+          range = new Range(pos, pos);
+        else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
+          range = cm.findWordAt(pos);
+        else // Triple tap
+          range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)));
+        cm.setSelection(range.anchor, range.head);
         cm.focus();
         e_preventDefault(e);
       }
@@ -3407,7 +3424,7 @@
   // not interfere with, such as a scrollbar or widget.
   function onMouseDown(e) {
     var cm = this, display = cm.display;
-    if (display.touchActive && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
+    if (display.activeTouch && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
     display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {

From 025d1a8e5f39619580465e622a2b4408fde0bec7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Feb 2015 13:23:32 +0100
Subject: [PATCH 1966/4742] [contenteditable input] Only return true from
 pollContent when an actual change was found

So that styling content causes a redraw, removing the style
---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d2dffd1eaa..ba8ad3d01d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1731,9 +1731,10 @@
 
       var chFrom = Pos(fromLine, cutFront);
       var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
-      if (newText.length > 1 || newText[0] || cmp(chFrom, chTo))
+      if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
         replaceRange(cm.doc, newText, chFrom, chTo, "+input");
-      return true;
+        return true;
+      }
     },
 
     ensurePolled: function() {

From b6fed250db7fec16e9802ab20cbea6867e107ac3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Feb 2015 14:22:45 +0100
Subject: [PATCH 1967/4742] [contenteditable display] Fix polling for collapsed
 text

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ba8ad3d01d..4ffe7e6f2d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1480,7 +1480,9 @@
       }
     },
 
-    setUneditable: nothing
+    setUneditable: nothing,
+
+    needsContentAttribute: false
   }, TextareaInput.prototype);
 
   // CONTENTEDITABLE INPUT STYLE
@@ -1690,11 +1692,11 @@
       var from = sel.from(), to = sel.to();
       if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
 
-      if (from.line == display.viewFrom) {
-        var fromLine = from.line;
+      var fromIndex;
+      if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
+        var fromLine = lineNo(display.view[0].line);
         var fromNode = display.view[0].node;
       } else {
-        var fromIndex = findViewIndex(cm, from.line);
         var fromLine = lineNo(display.view[fromIndex].line);
         var fromNode = display.view[fromIndex - 1].node.nextSibling;
       }
@@ -1707,7 +1709,7 @@
         var toNode = display.view[toIndex + 1].node.previousSibling;
       }
 
-      var newText = splitLines(domTextBetween(fromNode, toNode));
+      var newText = splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
       var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
       while (newText.length > 1 && oldText.length > 1) {
         if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
@@ -1765,7 +1767,9 @@
     },
 
     onContextMenu: nothing,
-    resetPosition: nothing
+    resetPosition: nothing,
+
+    needsContentAttribute: true
   }, ContentEditableInput.prototype);
 
   function posToDOM(cm, pos) {
@@ -1827,7 +1831,7 @@
         var map = i < 0 ? measure.map : maps[i];
         for (var j = 0; j < map.length; j += 3) {
           if (map[j + 2] == textNode || map[j + 2] == topNode) {
-            var line = lineNo(i < 0 ? lineView.line : lineView.other[i]);
+            var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
             return Pos(line, offset < 0 ? map[j + 1] : map[j] + (map[j + 2] == textNode ? offset : 0));
           }
         }
@@ -1853,17 +1857,25 @@
     }
   }
 
-  function domTextBetween(from, to) {
+  function domTextBetween(cm, from, to, fromLine, toLine) {
     var text = "", closing = false;
+    function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
     function walk(node) {
       if (node.nodeType == 1) {
-        if (node.getAttribute("contenteditable") == "false") return;
         var cmText = node.getAttribute("cm-text");
         if (cmText != null) {
           if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
           text += cmText;
           return;
         }
+        var markerID = node.getAttribute("cm-marker"), range;
+        if (markerID) {
+          var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
+          if (found.length && (range = found[0].find()))
+            text += getBetween(cm.doc, range.from, range.to).join("\n");
+          return;
+        }
+        if (node.getAttribute("contenteditable") == "false") return;
         for (var i = 0; i < node.childNodes.length; i++)
           walk(node.childNodes[i]);
         if (/^(pre|div|p)$/i.test(node.nodeName))
@@ -5822,10 +5834,13 @@
   // marker continues beyond the start/end of the line. Markers have
   // links back to the lines they currently touch.
 
+  var nextMarkerId = 0;
+
   var TextMarker = CodeMirror.TextMarker = function(doc, type) {
     this.lines = [];
     this.type = type;
     this.doc = doc;
+    this.id = ++nextMarkerId;
   };
   eventMixin(TextMarker);
 
@@ -6834,8 +6849,13 @@
 
   function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
     var widget = !ignoreWidget && marker.widgetNode;
+    if (widget) builder.map.push(builder.pos, builder.pos + size, widget);
+    if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
+      if (!widget)
+        widget = builder.content.appendChild(document.createElement("span"));
+      widget.setAttribute("cm-marker", marker.id);
+    }
     if (widget) {
-      builder.map.push(builder.pos, builder.pos + size, widget);
       builder.cm.display.input.setUneditable(widget);
       builder.content.appendChild(widget);
     }

From 9914eb78b1e5f8da7bf5f908f2c33d49273ef278 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 16:02:00 +0100
Subject: [PATCH 1968/4742] [contenteditable input] Fix another bug in
 pollContent

Typing the same character multiple times in a row would
cause a character to be deleted.
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4ffe7e6f2d..795300f590 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1722,7 +1722,7 @@
       while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
         ++cutFront;
       var newBot = lst(newText), oldBot = lst(oldText);
-      var maxCutEnd = Math.max(newBot.length - (newText.length == 1 ? cutFront : 0),
+      var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
                                oldBot.length - (oldText.length == 1 ? cutFront : 0));
       while (cutEnd < maxCutEnd &&
              newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))

From 8f74e74366a690825a259caaa10b90d616aa2763 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 17:30:12 +0100
Subject: [PATCH 1969/4742] [contenteditable input] Fix selection-to-pos hack
 when node is a span around a text node

---
 lib/codemirror.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 795300f590..33356c8840 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1823,6 +1823,10 @@
     }
 
     var textNode = node.nodeType == 3 ? node : null, topNode = node;
+    if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
+      textNode = node.firstChild;
+      if (offset) offset = textNode.nodeValue.length;
+    }
     while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
     var measure = lineView.measure, maps = measure.maps;
 
@@ -1830,9 +1834,12 @@
       for (var i = -1; i < (maps ? maps.length : 0); i++) {
         var map = i < 0 ? measure.map : maps[i];
         for (var j = 0; j < map.length; j += 3) {
-          if (map[j + 2] == textNode || map[j + 2] == topNode) {
+          var curNode = map[j + 2];
+          if (curNode == textNode || curNode == topNode) {
             var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
-            return Pos(line, offset < 0 ? map[j + 1] : map[j] + (map[j + 2] == textNode ? offset : 0));
+            var ch = map[j] + offset;
+            if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)];
+            return Pos(line, ch);
           }
         }
       }

From c1e30b8cc3ab741912f33b981ce00fbee15130cd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 17:30:23 +0100
Subject: [PATCH 1970/4742] Document inputStyle option

---
 doc/manual.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index c77a71f9cc..9f3fa36763 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 4.13.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.0.0</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
@@ -333,6 +333,17 @@ <h2>Configuration</h2>
       option is set to true, it will be covered by an element with
       class <code>CodeMirror-gutter-filler</code>.</dd>
 
+      <dt id="option_inputStyle"><code><strong>inputStyle</strong>: string</code></dt>
+      <dd>Selects the way CodeMirror handles input and focus. The core
+      library defines the <code>"textarea"</code>
+      and <code>"contenteditable"</code> input models. On mobile
+      browsers, the default is <code>"contenteditable"</code>. On
+      desktop browsers, the default is <code>"textarea"</code>.
+      Support for IME and screen readers is better in
+      the <code>"contenteditable"</code> model. The intention is to
+      make it the default on modern desktop browsers in the
+      future.</dd>
+
       <dt id="option_readOnly"><code><strong>readOnly</strong>: boolean|string</code></dt>
       <dd>This disables editing of the editor content by the user. If
       the special value <code>"nocursor"</code> is given (instead of

From 289b6472d4a0d41ea6028416d4942794c98856f7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 17:46:43 +0100
Subject: [PATCH 1971/4742] Mark release 5.0

---
 bin/release       |  2 +-
 bower.json        |  2 +-
 doc/compress.html |  1 +
 doc/manual.html   |  7 +++++--
 doc/releases.html | 10 ++++++++++
 index.html        |  8 ++++----
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 8 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/bin/release b/bin/release
index c6b97c1c03..9b58b872d8 100755
--- a/bin/release
+++ b/bin/release
@@ -42,5 +42,5 @@ rewrite("doc/compress.html", function(cmp) {
 
 rewrite("index.html", function(index) {
   return index.replace(/\.zip">\d+\.\d+<\/a>/,
-                       ".zip>" + simple + "</a>");
+                       ".zip\">" + simple + "</a>");
 });
diff --git a/bower.json b/bower.json
index dad8fe2e02..c59f2d9d27 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"4.13.0",
+  "version":"5.0.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index 7d89eb4520..a376c86d2d 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.0.0;f=">5.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.13.0;f=">4.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.12.0;f=">4.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.11.0;f=">4.11</option>
diff --git a/doc/manual.html b/doc/manual.html
index 9f3fa36763..74a74e29ed 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1976,8 +1976,11 @@ <h3 id="api_misc">Miscellaneous methods</h3>
       <dt id="focus"><code><strong>cm.focus</strong>()</code></dt>
       <dd>Give the editor focus.</dd>
 
-      <dt id="getInputField"><code><strong>cm.getInputField</strong>() → TextAreaElement</code></dt>
-      <dd>Returns the hidden textarea used to read input.</dd>
+      <dt id="getInputField"><code><strong>cm.getInputField</strong>() → Element</code></dt>
+      <dd>Returns the input field for the editor. Will be a textarea
+      or an editable div, depending on the value of
+      the <a href="#option_inputStyle"><code>inputStyle</code></a>
+      option.</dd>
       <dt id="getWrapperElement"><code><strong>cm.getWrapperElement</strong>() → Element</code></dt>
       <dd>Returns the DOM node that represents the editor, and
       controls its size. Remove this from your tree to delete an
diff --git a/doc/releases.html b/doc/releases.html
index 7e0f4bf338..8b2b375253 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -29,6 +29,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 4.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">
+    <li>Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)</li>
+    <li>New option <a href="manual.html#option_inputStyle"><code>inputStyle</code></a> to switch between hidden textarea and contenteditable input.</li>
+    <li>The <a href="manual.html#getInputField"><code>getInputField</code></a>
+    method is no longer guaranteed to return a textarea.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0">list of patches</a>.</li>
+  </ul>
+
   <p class="rel">20-02-2015: <a href="http://codemirror.net/codemirror-4.13.zip">Version 4.13</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index eaa7f80f35..3813fda1b1 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip>4.13</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.0</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>.
@@ -188,9 +188,9 @@ <h2>Browser support</h2>
     <tr><th style="padding-right: 1em;">Internet Explorer</th><td>version 8 and up</td></tr>
     <tr><th>Opera</th><td>version 9 and up</td></tr>
   </table>
-  <p>Modern mobile browsers tend to partly work. Bug reports and
-  patches for mobile support are welcome, but the maintainer does not
-  have the time or budget to actually work on it himself.</p>
+  <p>Support for modern mobile browsers is experimental. Recent
+  versions of the iOS browser and Chrome on Android should work
+  pretty well.</p>
 </section>
 
 </article>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 33356c8840..53b35329fc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8639,7 +8639,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.13.0";
+  CodeMirror.version = "5.0.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 5801a6c860..b4a9b53fe6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"4.13.0",
+    "version":"5.0.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From e11c32768459bced344024d9a3fb472e4e7bea54 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 17:48:43 +0100
Subject: [PATCH 1972/4742] Bump version number post-5.0

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

diff --git a/bower.json b/bower.json
index c59f2d9d27..be3cdca9f5 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"5.0.0",
+  "version":"5.0.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 74a74e29ed..ba537d959b 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.0.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.0.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 53b35329fc..98a45c60ba 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8639,7 +8639,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.0.0";
+  CodeMirror.version = "5.0.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index b4a9b53fe6..3d99c1adb0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.0.0",
+    "version":"5.0.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 2e591196dce9d51a70c921dfe79277b99a4d2bf8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Feb 2015 17:49:16 +0100
Subject: [PATCH 1973/4742] [release notes] Fix bad patches link

---
 doc/releases.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/releases.html b/doc/releases.html
index 8b2b375253..49d5be43bc 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -36,7 +36,7 @@ <h2>Version 4.x</h2>
     <li>New option <a href="manual.html#option_inputStyle"><code>inputStyle</code></a> to switch between hidden textarea and contenteditable input.</li>
     <li>The <a href="manual.html#getInputField"><code>getInputField</code></a>
     method is no longer guaranteed to return a textarea.</li>
-    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0">list of patches</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.13.0...5.0.0">list of patches</a>.</li>
   </ul>
 
   <p class="rel">20-02-2015: <a href="http://codemirror.net/codemirror-4.13.zip">Version 4.13</a>:</p>

From 318f32da231c264438473e3cebe0543293fe216b Mon Sep 17 00:00:00 2001
From: Zhang Hao <jason.daurus@gmail.com>
Date: Sat, 21 Feb 2015 16:19:13 +0800
Subject: [PATCH 1974/4742] [sql-hint addon] Fix defaultTable for new tables
 format

---
 addon/hint/sql-hint.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 5b0cc7696f..37937ca9a2 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -208,9 +208,17 @@
   CodeMirror.registerHelper("hint", "sql", function(editor, options) {
     tables = (options && options.tables) || {};
     var defaultTableName = options && options.defaultTable;
-    defaultTable = (defaultTableName && getItem(tables, defaultTableName)) || [];
+    defaultTable = defaultTableName && getItem(tables, defaultTableName);
     keywords = keywords || getKeywords(editor);
 
+    if (defaultTableName && !defaultTable)
+      defaultTable = findTableByAlias(defaultTableName, editor);
+
+    defaultTable = defaultTable || [];
+
+    if (Array.isArray(tables) && defaultTable.columns)
+      defaultTable = defaultTable.columns;
+
     var cur = editor.getCursor();
     var result = [];
     var token = editor.getTokenAt(cur), start, end, search;

From ead08e070cfe2990ed972b7bb432c6e04cbfea16 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Feb 2015 10:27:17 +0100
Subject: [PATCH 1975/4742] [sql-hint addon] Remove uses of Array.isArray

We're still targeting ES3.
---
 addon/hint/sql-hint.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 37937ca9a2..cba27a0b2c 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -52,12 +52,9 @@
   function addMatches(result, search, wordlist, formatter) {
     for (var word in wordlist) {
       if (!wordlist.hasOwnProperty(word)) continue;
-      if (Array.isArray(wordlist)) {
-        word = wordlist[word];
-      }
-      if (match(search, word)) {
-        result.push(formatter(word));
-      }
+      if (wordlist.slice) word = wordlist[word];
+
+      if (match(search, word)) result.push(formatter(word));
     }
   }
 
@@ -120,7 +117,7 @@
       table = findTableByAlias(table, editor);
 
     var columns = getItem(tables, table);
-    if (columns && Array.isArray(tables) && columns.columns)
+    if (columns && columns.columns)
       columns = columns.columns;
 
     if (columns) {
@@ -216,7 +213,7 @@
 
     defaultTable = defaultTable || [];
 
-    if (Array.isArray(tables) && defaultTable.columns)
+    if (defaultTable.columns)
       defaultTable = defaultTable.columns;
 
     var cur = editor.getCursor();

From b1360a32fa98b193055b42a593d21b26a07f8cdc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Feb 2015 10:55:46 +0100
Subject: [PATCH 1976/4742] [asciiarmor mode] Add

Closes #3099
---
 doc/compress.html             |  1 +
 mode/asciiarmor/asciiarmor.js | 73 +++++++++++++++++++++++++++++++++++
 mode/asciiarmor/index.html    | 46 ++++++++++++++++++++++
 mode/meta.js                  |  1 +
 4 files changed, 121 insertions(+)
 create mode 100644 mode/asciiarmor/asciiarmor.js
 create mode 100644 mode/asciiarmor/index.html

diff --git a/doc/compress.html b/doc/compress.html
index a376c86d2d..b2b4d08754 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -103,6 +103,7 @@ <h2>Script compression helper</h2>
         </optgroup>
         <optgroup label="Modes">
           <option value="http://codemirror.net/mode/apl/apl.js">apl.js</option>
+          <option value="http://codemirror.net/mode/asciiarmor/asciiarmor.js">asciiarmor.js</option>
           <option value="http://codemirror.net/mode/clike/clike.js">clike.js</option>
           <option value="http://codemirror.net/mode/clojure/clojure.js">clojure.js</option>
           <option value="http://codemirror.net/mode/cobol/cobol.js">cobol.js</option>
diff --git a/mode/asciiarmor/asciiarmor.js b/mode/asciiarmor/asciiarmor.js
new file mode 100644
index 0000000000..d830903767
--- /dev/null
+++ b/mode/asciiarmor/asciiarmor.js
@@ -0,0 +1,73 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function errorIfNotEmpty(stream) {
+    var nonWS = stream.match(/^\s*\S/);
+    stream.skipToEnd();
+    return nonWS ? "error" : null;
+  }
+
+  CodeMirror.defineMode("asciiarmor", function() {
+    return {
+      token: function(stream, state) {
+        var m;
+        if (state.state == "top") {
+          if (stream.sol() && (m = stream.match(/^-----BEGIN (.*)?-----\s*$/))) {
+            state.state = "headers";
+            state.type = m[1];
+            return "tag";
+          }
+          return errorIfNotEmpty(stream);
+        } else if (state.state == "headers") {
+          if (stream.sol() && stream.match(/^\w+:/)) {
+            state.state = "header";
+            return "atom";
+          } else {
+            var result = errorIfNotEmpty(stream);
+            if (result) state.state = "body";
+            return result;
+          }
+        } else if (state.state == "header") {
+          stream.skipToEnd();
+          state.state = "headers";
+          return "string";
+        } else if (state.state == "body") {
+          if (stream.sol() && (m = stream.match(/^-----END (.*)?-----\s*$/))) {
+            if (m[1] != state.type) return "error";
+            state.state = "end";
+            return "tag";
+          } else {
+            if (stream.eatWhile(/[A-Za-z0-9+\/=]/)) {
+              return null;
+            } else {
+              stream.next();
+              return "error";
+            }
+          }
+        } else if (state.state == "end") {
+          return errorIfNotEmpty(stream);
+        }
+      },
+      blankLine: function(state) {
+        if (state.state == "headers") state.state = "body";
+      },
+      startState: function() {
+        return {state: "top", type: null};
+      }
+    };
+  });
+
+  CodeMirror.defineMIME("application/pgp", "asciiarmor");
+  CodeMirror.defineMIME("application/pgp-keys", "asciiarmor");
+  CodeMirror.defineMIME("application/pgp-signature", "asciiarmor");
+});
diff --git a/mode/asciiarmor/index.html b/mode/asciiarmor/index.html
new file mode 100644
index 0000000000..8ba1b5c76c
--- /dev/null
+++ b/mode/asciiarmor/index.html
@@ -0,0 +1,46 @@
+<!doctype html>
+
+<title>CodeMirror: ASCII Armor (PGP) 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="asciiarmor.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</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="#">ASCII Armor</a>
+  </ul>
+</div>
+
+<article>
+<h2>ASCII Armor (PGP) mode</h2>
+<form><textarea id="code" name="code">
+-----BEGIN PGP MESSAGE-----
+Version: OpenPrivacy 0.99
+
+yDgBO22WxBHv7O8X7O/jygAEzol56iUKiXmV+XmpCtmpqQUKiQrFqclFqUDBovzS
+vBSFjNSiVHsuAA==
+=njUN
+-----END PGP MESSAGE-----
+</textarea></form>
+
+<script>
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+  lineNumbers: true
+});
+</script>
+
+<p><strong>MIME types
+defined:</strong> <code>application/pgp</code>, <code>application/pgp-keys</code>, <code>application/pgp-signature</code></p>
+
+</article>
diff --git a/mode/meta.js b/mode/meta.js
index e110288afc..914d2dc291 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -13,6 +13,7 @@
 
   CodeMirror.modeInfo = [
     {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
+    {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
     {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
     {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},

From b1e087975c300f44615826d103916a1ea4ec4347 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Feb 2015 11:02:46 +0100
Subject: [PATCH 1977/4742] [asciiarmor mode] Add to mode list

---
 mode/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/index.html b/mode/index.html
index 04167a5a54..b39cca479f 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -85,6 +85,7 @@ <h2>Language modes</h2>
       <li><a href="pascal/index.html">Pascal</a></li>
       <li><a href="pegjs/index.html">PEG.js</a></li>
       <li><a href="perl/index.html">Perl</a></li>
+      <li><a href="asciiarmor/index.html">PGP (ASCII armor)</a></li>
       <li><a href="php/index.html">PHP</a></li>
       <li><a href="pig/index.html">Pig Latin</a></li>
       <li><a href="properties/index.html">Properties files</a></li>

From 35a96182ede54c935cca7231365fe180092e32e2 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Sun, 22 Feb 2015 16:58:32 +0100
Subject: [PATCH 1978/4742] Fix scroll position jump on mousedown in Chrome

---
 lib/codemirror.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 98a45c60ba..0f7c8090e6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3517,10 +3517,11 @@
         e_preventDefault(e2);
         if (!modifier)
           extendSelection(cm.doc, start);
-        display.input.focus();
-        // Work around unexplainable focus problem in IE9 (#2127)
-        if (ie && ie_version == 9)
+        // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
+        if (webkit || ie && ie_version == 9)
           setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
+        else
+          display.input.focus();
       }
     });
     // Let the drag handler handle this.

From 28b25a4ca0a48f3385dbe6371c7d841b0a8c67f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Feb 2015 14:24:52 +0100
Subject: [PATCH 1979/4742] [contenteditable input] Work around mobile firefox
 randomly resetting selection sometimes

---
 lib/codemirror.js | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0f7c8090e6..e813755bb6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1491,6 +1491,7 @@
     this.cm = cm;
     this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
     this.polling = new Delayed();
+    this.gracePeriod = false;
   }
 
   ContentEditableInput.prototype = copyObj({
@@ -1625,10 +1626,21 @@
         sel.removeAllRanges();
         sel.addRange(rng);
         if (old && sel.anchorNode == null) sel.addRange(old);
+        else if (gecko) this.startGracePeriod();
       }
       this.rememberSelection();
     },
 
+    startGracePeriod: function() {
+      var input = this;
+      clearTimeout(this.gracePeriod);
+      this.gracePeriod = setTimeout(function() {
+        input.gracePeriod = false;
+        if (input.selectionChanged())
+          input.cm.operation(function() { input.cm.curOp.selectionChanged = true; });
+      }, 20);
+    },
+
     showMultipleSelections: function(info) {
       removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
       removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
@@ -1671,12 +1683,15 @@
       this.polling.set(this.cm.options.pollInterval, poll);
     },
 
-    pollSelection: function() {
-      if (this.composing) return;
+    selectionChanged: function() {
+      var sel = window.getSelection();
+      return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
+        sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset;
+    },
 
-      var sel = window.getSelection(), cm = this.cm;
-      if (sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
-          sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset) {
+    pollSelection: function() {
+      if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
+        var sel = window.getSelection(), cm = this.cm;
         this.rememberSelection();
         var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
         var head = domToPos(cm, sel.focusNode, sel.focusOffset);

From 6d115cdfb57ff4a53075c4c88a86c1de3046d7a2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Feb 2015 15:03:26 +0100
Subject: [PATCH 1980/4742] [htmlembedded mode] Strip down to a simple
 addon/mode/multiplex wrapper

At least that works.

Closes #1788
---
 mode/htmlembedded/htmlembedded.js | 94 ++++++-------------------------
 mode/htmlembedded/index.html      |  1 +
 mode/index.html                   |  1 -
 3 files changed, 19 insertions(+), 77 deletions(-)

diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index e8f7ba803f..464dc57f83 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -3,84 +3,26 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"));
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
+        require("../../addon/mode/multiplex"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../htmlmixed/htmlmixed"], mod);
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
+            "../../addon/mode/multiplex"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
-
-  //config settings
-  var scriptStartRegex = parserConfig.scriptStartRegex || /^<%/i,
-      scriptEndRegex = parserConfig.scriptEndRegex || /^%>/i;
-
-  //inner modes
-  var scriptingMode, htmlMixedMode;
-
-  //tokenizer when in html mode
-  function htmlDispatch(stream, state) {
-      if (stream.match(scriptStartRegex, false)) {
-          state.token=scriptingDispatch;
-          return scriptingMode.token(stream, state.scriptState);
-          }
-      else
-          return htmlMixedMode.token(stream, state.htmlState);
-    }
-
-  //tokenizer when in scripting mode
-  function scriptingDispatch(stream, state) {
-      if (stream.match(scriptEndRegex, false))  {
-          state.token=htmlDispatch;
-          return htmlMixedMode.token(stream, state.htmlState);
-         }
-      else
-          return scriptingMode.token(stream, state.scriptState);
-         }
-
-
-  return {
-    startState: function() {
-      scriptingMode = scriptingMode || CodeMirror.getMode(config, parserConfig.scriptingModeSpec);
-      htmlMixedMode = htmlMixedMode || CodeMirror.getMode(config, "htmlmixed");
-      return {
-          token :  parserConfig.startOpen ? scriptingDispatch : htmlDispatch,
-          htmlState : CodeMirror.startState(htmlMixedMode),
-          scriptState : CodeMirror.startState(scriptingMode)
-      };
-    },
-
-    token: function(stream, state) {
-      return state.token(stream, state);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.token == htmlDispatch)
-        return htmlMixedMode.indent(state.htmlState, textAfter);
-      else if (scriptingMode.indent)
-        return scriptingMode.indent(state.scriptState, textAfter);
-    },
-
-    copyState: function(state) {
-      return {
-       token : state.token,
-       htmlState : CodeMirror.copyState(htmlMixedMode, state.htmlState),
-       scriptState : CodeMirror.copyState(scriptingMode, state.scriptState)
-      };
-    },
-
-    innerMode: function(state) {
-      if (state.token == scriptingDispatch) return {state: state.scriptState, mode: scriptingMode};
-      else return {state: state.htmlState, mode: htmlMixedMode};
-    }
-  };
-}, "htmlmixed");
-
-CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
-CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
-CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"});
-CodeMirror.defineMIME("application/x-erb", { name: "htmlembedded", scriptingModeSpec:"ruby"});
-
+  "use strict";
+
+  CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
+    return CodeMirror.multiplexingMode(CodeMirror.getMode(config, "htmlmixed"), {
+      open: parserConfig.open || parserConfig.scriptStartRegex || "<%",
+      close: parserConfig.close || parserConfig.scriptEndRegex || "%>",
+      mode: CodeMirror.getMode(config, parserConfig.scriptingModeSpec)
+    });
+  }, "htmlmixed");
+
+  CodeMirror.defineMIME("application/x-ejs", {name: "htmlembedded", scriptingModeSpec:"javascript"});
+  CodeMirror.defineMIME("application/x-aspx", {name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
+  CodeMirror.defineMIME("application/x-jsp", {name: "htmlembedded", scriptingModeSpec:"text/x-java"});
+  CodeMirror.defineMIME("application/x-erb", {name: "htmlembedded", scriptingModeSpec:"ruby"});
 });
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index 93d01c4512..365ef8f366 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -10,6 +10,7 @@
 <script src="../javascript/javascript.js"></script>
 <script src="../css/css.js"></script>
 <script src="../htmlmixed/htmlmixed.js"></script>
+<script src="../../addon/mode/multiplex.js"></script>
 <script src="htmlembedded.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
diff --git a/mode/index.html b/mode/index.html
index b39cca479f..7630250e4f 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -61,7 +61,6 @@ <h2>Language modes</h2>
       <li><a href="haml/index.html">HAML</a></li>
       <li><a href="haskell/index.html">Haskell</a></li>
       <li><a href="haxe/index.html">Haxe</a></li>
-      <li><a href="htmlembedded/index.html">HTML embedded scripts</a></li>
       <li><a href="htmlmixed/index.html">HTML mixed-mode</a></li>
       <li><a href="http/index.html">HTTP</a></li>
       <li><a href="idl/index.html">IDL</a></li>

From 144f29bc7358ed325b7ba5c17c0246cad2b60e31 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Feb 2015 15:47:16 +0100
Subject: [PATCH 1981/4742] [smarty mode] Clean up, add support for base mode

Issue #2871
---
 mode/smarty/index.html |  76 +++++++--------
 mode/smarty/smarty.js  | 207 ++++++++++++++++++++---------------------
 2 files changed, 139 insertions(+), 144 deletions(-)

diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index 8d88c9a302..b19c8f09b5 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../xml/xml.js"></script>
 <script src="smarty.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
@@ -46,17 +47,24 @@ <h2>Smarty mode</h2>
   {/function}
 {/if}</textarea></form>
 
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "smarty"
-      });
-    </script>
+<p>Mode for Smarty version 2 or 3, which allows for custom delimiter tags.</p>
 
-    <br />
+<p>Several configuration parameters are supported:</p>
 
-	<h3>Smarty 2, custom delimiters</h3>
-    <form><textarea id="code2" name="code2">
+<ul>
+  <li><code>leftDelimiter</code> and <code>rightDelimiter</code>,
+  which should be strings that determine where the Smarty syntax
+  starts and ends.</li>
+  <li><code>version</code>, which should be 2 or 3.</li>
+  <li><code>baseMode</code>, which can be a mode spec
+  like <code>"text/html"</code> to set a different background mode.</li>
+</ul>
+
+<p><strong>MIME types defined:</strong> <code>text/x-smarty</code></p>
+
+<h3>Smarty 2, custom delimiters</h3>
+
+<form><textarea id="code2" name="code2">
 {--extends file="parent.tpl"--}
 {--include file="template.tpl"--}
 
@@ -78,27 +86,14 @@ <h3>Smarty 2, custom delimiters</h3>
   {--/function--}
 {--/if--}</textarea></form>
 
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code2"), {
-        lineNumbers: true,
-        mode: {
-          name: "smarty",
-          leftDelimiter: "{--",
-          rightDelimiter: "--}"
-        }
-      });
-    </script>
-
-	<br />
-
-	<h3>Smarty 3</h3>
+<h3>Smarty 3</h3>
 
-	<textarea id="code3" name="code3">
+<textarea id="code3" name="code3">
 Nested tags {$foo={counter one=1 two={inception}}+3} are now valid in Smarty 3.
 
 <script>
 function test() {
-	console.log("Smarty 3 permits single curly braces followed by whitespace to NOT slip into Smarty mode.");
+  console.log("Smarty 3 permits single curly braces followed by whitespace to NOT slip into Smarty mode.");
 }
 </script>
 
@@ -121,16 +116,23 @@ <h3>Smarty 3</h3>
 
 {$object->method1($x)->method2($y)}</textarea>
 
-	<script>
-		var editor = CodeMirror.fromTextArea(document.getElementById("code3"), {
-			lineNumbers: true,
-			mode: "smarty",
-			smartyVersion: 3
-		});
-	</script>
-
-
-    <p>A plain text/Smarty version 2 or 3 mode, which allows for custom delimiter tags.</p>
+<script>
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+  lineNumbers: true,
+  mode: "smarty"
+});
+var editor = CodeMirror.fromTextArea(document.getElementById("code2"), {
+  lineNumbers: true,
+  mode: {
+    name: "smarty",
+    leftDelimiter: "{--",
+    rightDelimiter: "--}"
+  }
+});
+var editor = CodeMirror.fromTextArea(document.getElementById("code3"), {
+  lineNumbers: true,
+  mode: {name: "smarty", version: 3, baseMode: "text/html"}
+});
+</script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-smarty</code></p>
-  </article>
+</article>
diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index bb053245d3..7eada8223e 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -13,134 +13,118 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("smarty", function(config) {
   "use strict";
 
-  // our default settings; check to see if they're overridden
-  var settings = {
-    rightDelimiter: '}',
-    leftDelimiter: '{',
-    smartyVersion: 2 // for backward compatibility
-  };
-  if (config.hasOwnProperty("leftDelimiter")) {
-    settings.leftDelimiter = config.leftDelimiter;
-  }
-  if (config.hasOwnProperty("rightDelimiter")) {
-    settings.rightDelimiter = config.rightDelimiter;
-  }
-  if (config.hasOwnProperty("smartyVersion") && config.smartyVersion === 3) {
-    settings.smartyVersion = 3;
-  }
-
-  var keyFunctions = ["debug", "extends", "function", "include", "literal"];
-  var last;
-  var regs = {
-    operatorChars: /[+\-*&%=<>!?]/,
-    validIdentifier: /[a-zA-Z0-9_]/,
-    stringChar: /['"]/
-  };
-
-  var helpers = {
-    cont: function(style, lastType) {
+  CodeMirror.defineMode("smarty", function(config, parserConf) {
+    var rightDelimiter = parserConf.rightDelimiter || "}";
+    var leftDelimiter = parserConf.leftDelimiter || "{";
+    var version = parserConf.version || 2;
+    var baseMode = CodeMirror.getMode(config, parserConf.baseMode || "null");
+
+    var keyFunctions = ["debug", "extends", "function", "include", "literal"];
+    var regs = {
+      operatorChars: /[+\-*&%=<>!?]/,
+      validIdentifier: /[a-zA-Z0-9_]/,
+      stringChar: /['"]/
+    };
+
+    var last;
+    function cont(style, lastType) {
       last = lastType;
       return style;
-    },
-    chain: function(stream, state, parser) {
+    }
+
+    function chain(stream, state, parser) {
       state.tokenize = parser;
       return parser(stream, state);
     }
-  };
 
+    // Smarty 3 allows { and } surrounded by whitespace to NOT slip into Smarty mode
+    function doesNotCount(stream, pos) {
+      if (pos == null) pos = stream.pos;
+      return version === 3 && leftDelimiter == "{" &&
+        (pos == stream.string.length || /\s/.test(stream.string.charAt(pos)));
+    }
 
-  // our various parsers
-  var parsers = {
-
-    // the main tokenizer
-    tokenizer: function(stream, state) {
-      if (stream.match(settings.leftDelimiter, true)) {
+    function tokenTop(stream, state) {
+      if (stream.match(leftDelimiter, true)) {
         if (stream.eat("*")) {
-          return helpers.chain(stream, state, parsers.inBlock("comment", "*" + settings.rightDelimiter));
-        } else {
-          // Smarty 3 allows { and } surrounded by whitespace to NOT slip into Smarty mode
+          return chain(stream, state, tokenBlock("comment", "*" + rightDelimiter));
+        } else if (!doesNotCount(stream)) {
           state.depth++;
-          var isEol = stream.eol();
-          var isFollowedByWhitespace = /\s/.test(stream.peek());
-          if (settings.smartyVersion === 3 && settings.leftDelimiter === "{" && (isEol || isFollowedByWhitespace)) {
-            state.depth--;
-            return null;
-          } else {
-            state.tokenize = parsers.smarty;
-            last = "startTag";
-            return "tag";
-          }
+          state.tokenize = tokenSmarty;
+          last = "startTag";
+          return "tag";
         }
-      } else {
-        stream.next();
-        return null;
       }
-    },
+
+      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);
+      return token;
+    }
 
     // parsing Smarty content
-    smarty: function(stream, state) {
-      if (stream.match(settings.rightDelimiter, true)) {
-        if (settings.smartyVersion === 3) {
+    function tokenSmarty(stream, state) {
+      if (stream.match(rightDelimiter, true)) {
+        if (version === 3) {
           state.depth--;
           if (state.depth <= 0) {
-            state.tokenize = parsers.tokenizer;
+            state.tokenize = tokenTop;
           }
         } else {
-          state.tokenize = parsers.tokenizer;
+          state.tokenize = tokenTop;
         }
-        return helpers.cont("tag", null);
+        return cont("tag", null);
       }
 
-      if (stream.match(settings.leftDelimiter, true)) {
+      if (stream.match(leftDelimiter, true)) {
         state.depth++;
-        return helpers.cont("tag", "startTag");
+        return cont("tag", "startTag");
       }
 
       var ch = stream.next();
       if (ch == "$") {
         stream.eatWhile(regs.validIdentifier);
-        return helpers.cont("variable-2", "variable");
+        return cont("variable-2", "variable");
       } else if (ch == "|") {
-        return helpers.cont("operator", "pipe");
+        return cont("operator", "pipe");
       } else if (ch == ".") {
-        return helpers.cont("operator", "property");
+        return cont("operator", "property");
       } else if (regs.stringChar.test(ch)) {
-        state.tokenize = parsers.inAttribute(ch);
-        return helpers.cont("string", "string");
+        state.tokenize = tokenAttribute(ch);
+        return cont("string", "string");
       } else if (regs.operatorChars.test(ch)) {
         stream.eatWhile(regs.operatorChars);
-        return helpers.cont("operator", "operator");
+        return cont("operator", "operator");
       } else if (ch == "[" || ch == "]") {
-        return helpers.cont("bracket", "bracket");
+        return cont("bracket", "bracket");
       } else if (ch == "(" || ch == ")") {
-        return helpers.cont("bracket", "operator");
+        return cont("bracket", "operator");
       } else if (/\d/.test(ch)) {
         stream.eatWhile(/\d/);
-        return helpers.cont("number", "number");
+        return cont("number", "number");
       } else {
 
         if (state.last == "variable") {
           if (ch == "@") {
             stream.eatWhile(regs.validIdentifier);
-            return helpers.cont("property", "property");
+            return cont("property", "property");
           } else if (ch == "|") {
             stream.eatWhile(regs.validIdentifier);
-            return helpers.cont("qualifier", "modifier");
+            return cont("qualifier", "modifier");
           }
         } else if (state.last == "pipe") {
           stream.eatWhile(regs.validIdentifier);
-          return helpers.cont("qualifier", "modifier");
+          return cont("qualifier", "modifier");
         } else if (state.last == "whitespace") {
           stream.eatWhile(regs.validIdentifier);
-          return helpers.cont("attribute", "modifier");
+          return cont("attribute", "modifier");
         } if (state.last == "property") {
           stream.eatWhile(regs.validIdentifier);
-          return helpers.cont("property", null);
+          return cont("property", null);
         } else if (/\s/.test(ch)) {
           last = "whitespace";
           return null;
@@ -156,37 +140,37 @@ CodeMirror.defineMode("smarty", function(config) {
         }
         for (var i=0, j=keyFunctions.length; i<j; i++) {
           if (keyFunctions[i] == str) {
-            return helpers.cont("keyword", "keyword");
+            return cont("keyword", "keyword");
           }
         }
         if (/\s/.test(ch)) {
           return null;
         }
-        return helpers.cont("tag", "tag");
+        return cont("tag", "tag");
       }
-    },
+    }
 
-    inAttribute: function(quote) {
+    function tokenAttribute(quote) {
       return function(stream, state) {
         var prevChar = null;
         var currChar = null;
         while (!stream.eol()) {
           currChar = stream.peek();
           if (stream.next() == quote && prevChar !== '\\') {
-            state.tokenize = parsers.smarty;
+            state.tokenize = tokenSmarty;
             break;
           }
           prevChar = currChar;
         }
         return "string";
       };
-    },
+    }
 
-    inBlock: function(style, terminator) {
+    function tokenBlock(style, terminator) {
       return function(stream, state) {
         while (!stream.eol()) {
           if (stream.match(terminator)) {
-            state.tokenize = parsers.tokenizer;
+            state.tokenize = tokenTop;
             break;
           }
           stream.next();
@@ -194,28 +178,37 @@ CodeMirror.defineMode("smarty", function(config) {
         return style;
       };
     }
-  };
 
+    return {
+      startState: function() {
+        return {
+          base: CodeMirror.startState(baseMode),
+          tokenize: tokenTop,
+          last: null,
+          depth: 0
+        };
+      },
+      copyState: function(state) {
+        return {
+          base: CodeMirror.copyState(baseMode, state.base),
+          tokenize: state.tokenize,
+          last: state.last,
+          depth: state.depth
+        };
+      },
+      innerMode: function(state) {
+        if (state.tokenize == tokenTop)
+          return {mode: baseMode, state: state.base};
+      },
+      token: function(stream, state) {
+        var style = state.tokenize(stream, state);
+        state.last = last;
+        return style;
+      },
+      blockCommentStart: leftDelimiter + "*",
+      blockCommentEnd: "*" + rightDelimiter
+    };
+  });
 
-  // the public API for CodeMirror
-  return {
-    startState: function() {
-      return {
-        tokenize: parsers.tokenizer,
-        mode: "smarty",
-        last: null,
-        depth: 0
-      };
-    },
-    token: function(stream, state) {
-      var style = state.tokenize(stream, state);
-      state.last = last;
-      return style;
-    },
-    electricChars: ""
-  };
-});
-
-CodeMirror.defineMIME("text/x-smarty", "smarty");
-
+  CodeMirror.defineMIME("text/x-smarty", "smarty");
 });

From 92ed45f4da75d9e589d7f8cb8ff529810674177d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Feb 2015 15:48:16 +0100
Subject: [PATCH 1982/4742] [smartymixed mode] Delete

It was a broken mess. The Smarty mode now supports a base mode.

Issue #2871
---
 doc/compress.html               |   1 -
 mode/index.html                 |   1 -
 mode/meta.js                    |   1 -
 mode/smartymixed/index.html     | 114 ------------------
 mode/smartymixed/smartymixed.js | 197 --------------------------------
 5 files changed, 314 deletions(-)
 delete mode 100644 mode/smartymixed/index.html
 delete mode 100644 mode/smartymixed/smartymixed.js

diff --git a/doc/compress.html b/doc/compress.html
index b2b4d08754..6fe3477e3f 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -172,7 +172,6 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/slim/slim.js">slim.js</option>
           <option value="http://codemirror.net/mode/smalltalk/smalltalk.js">smalltalk.js</option>
           <option value="http://codemirror.net/mode/smarty/smarty.js">smarty.js</option>
-          <option value="http://codemirror.net/mode/smartymixed/smartymixed.js">smartymixed.js</option>
           <option value="http://codemirror.net/mode/solr/solr.js">solr.js</option>
           <option value="http://codemirror.net/mode/soy/soy.js">soy.js</option>
           <option value="http://codemirror.net/mode/sparql/sparql.js">sparql.js</option>
diff --git a/mode/index.html b/mode/index.html
index 7630250e4f..f9b2a89d42 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -106,7 +106,6 @@ <h2>Language modes</h2>
       <li><a href="slim/index.html">Slim</a></li>
       <li><a href="smalltalk/index.html">Smalltalk</a></li>
       <li><a href="smarty/index.html">Smarty</a></li>
-      <li><a href="smartymixed/index.html">Smarty/HTML mixed</a></li>
       <li><a href="solr/index.html">Solr</a></li>
       <li><a href="soy/index.html">Soy</a></li>
       <li><a href="stylus/index.html">Stylus</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 914d2dc291..637005d834 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -105,7 +105,6 @@
     {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
     {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
     {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
-    {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"},
     {name: "Solr", mime: "text/x-solr", mode: "solr"},
     {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
     {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
diff --git a/mode/smartymixed/index.html b/mode/smartymixed/index.html
deleted file mode 100644
index 3a216abb46..0000000000
--- a/mode/smartymixed/index.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Smarty mixed 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="../../mode/xml/xml.js"></script>
-<script src="../../mode/javascript/javascript.js"></script>
-<script src="../../mode/css/css.js"></script>
-<script src="../../mode/htmlmixed/htmlmixed.js"></script>
-<script src="../../mode/smarty/smarty.js"></script>
-<script src="../../mode/smartymixed/smartymixed.js"></script>
-<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="#">Smarty mixed</a>
-  </ul>
-</div>
-
-<article>
-<h2>Smarty mixed mode</h2>
-<form><textarea id="code" name="code">
-{**
-* @brief Smarty mixed mode
-* @author Ruslan Osmanov
-* @date 29.06.2013
-*}
-<html>
-<head>
-  <title>{$title|htmlspecialchars|truncate:30}</title>
-</head>
-<body class="{$bodyclass}">
-  {* Multiline smarty
-  * comment, no {$variables} here
-  *}
-  {literal}
-  {literal} is just an HTML text.
-  <script type="text/javascript">//<![CDATA[
-    var a = {$just_a_normal_js_object : "value"};
-    var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("code"), {
-      mode           : "smartymixed",
-      tabSize        : 2,
-      indentUnit     : 2,
-      indentWithTabs : false,
-      lineNumbers    : true,
-      smartyVersion  : 3
-    });
-    // ]]>
-  </script>
-  <style>
-    /* CSS content 
-    {$no_smarty} */
-    .some-class { font-weight: bolder; color: "orange"; }
-  </style>
-  {/literal}
-
-  {extends file="parent.tpl"}
-  {include file="template.tpl"}
-
-  {* some example Smarty content *}
-  {if isset($name) && $name == 'Blog'}
-    This is a {$var}.
-    {$integer = 4511}, {$array[] = "a"}, {$stringvar = "string"}
-    {$integer = 4512} {$array[] = "a"} {$stringvar = "string"}
-    {assign var='bob' value=$var.prop}
-  {elseif $name == $foo}
-    {function name=menu level=0}
-    {foreach $data as $entry}
-      {if is_array($entry)}
-      - {$entry@key}
-      {menu data=$entry level=$level+1}
-      {else}
-      {$entry}
-      {* One
-      * Two
-      * Three
-      *}
-      {/if}
-    {/foreach}
-    {/function}
-  {/if}
-  </body>
-  <!-- R.O. -->
-</html>
-</textarea></form>
-
-    <script type="text/javascript">
-      var myCodeMirror = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode           : "smartymixed",
-        tabSize        : 2,
-        indentUnit     : 2,
-        indentWithTabs : false,
-        lineNumbers    : true,
-        smartyVersion  : 3,
-        matchBrackets  : true,
-      });
-    </script>
-
-    <p>The Smarty mixed mode depends on the Smarty and HTML mixed modes. HTML
-    mixed mode itself depends on XML, JavaScript, and CSS modes.</p>
-
-    <p>It takes the same options, as Smarty and HTML mixed modes.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-smarty</code>.</p>
-  </article>
diff --git a/mode/smartymixed/smartymixed.js b/mode/smartymixed/smartymixed.js
deleted file mode 100644
index 4fc7ca4b60..0000000000
--- a/mode/smartymixed/smartymixed.js
+++ /dev/null
@@ -1,197 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
-* @file smartymixed.js
-* @brief Smarty Mixed Codemirror mode (Smarty + Mixed HTML)
-* @author Ruslan Osmanov <rrosmanov at gmail dot com>
-* @version 3.0
-* @date 05.07.2013
-*/
-
-// Warning: Don't base other modes on this one. This here is a
-// terrible way to write a mixed mode.
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../smarty/smarty"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../smarty/smarty"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("smartymixed", function(config) {
-  var htmlMixedMode = CodeMirror.getMode(config, "htmlmixed");
-  var smartyMode = CodeMirror.getMode(config, "smarty");
-
-  var settings = {
-    rightDelimiter: '}',
-    leftDelimiter: '{'
-  };
-
-  if (config.hasOwnProperty("leftDelimiter")) {
-    settings.leftDelimiter = config.leftDelimiter;
-  }
-  if (config.hasOwnProperty("rightDelimiter")) {
-    settings.rightDelimiter = config.rightDelimiter;
-  }
-
-  function reEsc(str) { return str.replace(/[^\s\w]/g, "\\$&"); }
-
-  var reLeft = reEsc(settings.leftDelimiter), reRight = reEsc(settings.rightDelimiter);
-  var regs = {
-    smartyComment: new RegExp("^" + reRight + "\\*"),
-    literalOpen: new RegExp(reLeft + "literal" + reRight),
-    literalClose: new RegExp(reLeft + "\/literal" + reRight),
-    hasLeftDelimeter: new RegExp(".*" + reLeft),
-    htmlHasLeftDelimeter: new RegExp("[^<>]*" + reLeft)
-  };
-
-  var helpers = {
-    chain: function(stream, state, parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    },
-
-    cleanChain: function(stream, state, parser) {
-      state.tokenize = null;
-      state.localState = null;
-      state.localMode = null;
-      return (typeof parser == "string") ? (parser ? parser : null) : parser(stream, state);
-    },
-
-    maybeBackup: function(stream, pat, style) {
-      var cur = stream.current();
-      var close = cur.search(pat),
-      m;
-      if (close > - 1) stream.backUp(cur.length - close);
-      else if (m = cur.match(/<\/?$/)) {
-        stream.backUp(cur.length);
-        if (!stream.match(pat, false)) stream.match(cur[0]);
-      }
-      return style;
-    }
-  };
-
-  var parsers = {
-    html: function(stream, state) {
-      var htmlTagName = state.htmlMixedState.htmlState.context && state.htmlMixedState.htmlState.context.tagName
-        ? state.htmlMixedState.htmlState.context.tagName
-        : null;
-
-      if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && htmlTagName === null) {
-        state.tokenize = parsers.smarty;
-        state.localMode = smartyMode;
-        state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
-        return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState));
-      } else if (!state.inLiteral && stream.match(settings.leftDelimiter, false)) {
-        state.tokenize = parsers.smarty;
-        state.localMode = smartyMode;
-        state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, ""));
-        return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState));
-      }
-      return htmlMixedMode.token(stream, state.htmlMixedState);
-    },
-
-    smarty: function(stream, state) {
-      if (stream.match(settings.leftDelimiter, false)) {
-        if (stream.match(regs.smartyComment, false)) {
-          return helpers.chain(stream, state, parsers.inBlock("comment", "*" + settings.rightDelimiter));
-        }
-      } else if (stream.match(settings.rightDelimiter, false)) {
-        stream.eat(settings.rightDelimiter);
-        state.tokenize = parsers.html;
-        state.localMode = htmlMixedMode;
-        state.localState = state.htmlMixedState;
-        return "tag";
-      }
-
-      return helpers.maybeBackup(stream, settings.rightDelimiter, smartyMode.token(stream, state.localState));
-    },
-
-    inBlock: function(style, terminator) {
-      return function(stream, state) {
-        while (!stream.eol()) {
-          if (stream.match(terminator)) {
-            helpers.cleanChain(stream, state, "");
-            break;
-          }
-          stream.next();
-        }
-        return style;
-      };
-    }
-  };
-
-  return {
-    startState: function() {
-      var state = htmlMixedMode.startState();
-      return {
-        token: parsers.html,
-        localMode: null,
-        localState: null,
-        htmlMixedState: state,
-        tokenize: null,
-        inLiteral: false
-      };
-    },
-
-    copyState: function(state) {
-      var local = null, tok = (state.tokenize || state.token);
-      if (state.localState) {
-        local = CodeMirror.copyState((tok != parsers.html ? smartyMode : htmlMixedMode), state.localState);
-      }
-      return {
-        token: state.token,
-        tokenize: state.tokenize,
-        localMode: state.localMode,
-        localState: local,
-        htmlMixedState: CodeMirror.copyState(htmlMixedMode, state.htmlMixedState),
-        inLiteral: state.inLiteral
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.match(settings.leftDelimiter, false)) {
-        if (!state.inLiteral && stream.match(regs.literalOpen, true)) {
-          state.inLiteral = true;
-          return "keyword";
-        } else if (state.inLiteral && stream.match(regs.literalClose, true)) {
-          state.inLiteral = false;
-          return "keyword";
-        }
-      }
-      if (state.inLiteral && state.localState != state.htmlMixedState) {
-        state.tokenize = parsers.html;
-        state.localMode = htmlMixedMode;
-        state.localState = state.htmlMixedState;
-      }
-
-      var style = (state.tokenize || state.token)(stream, state);
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.localMode == smartyMode
-          || (state.inLiteral && !state.localMode)
-         || regs.hasLeftDelimeter.test(textAfter)) {
-        return CodeMirror.Pass;
-      }
-      return htmlMixedMode.indent(state.htmlMixedState, textAfter);
-    },
-
-    innerMode: function(state) {
-      return {
-        state: state.localState || state.htmlMixedState,
-        mode: state.localMode || htmlMixedMode
-      };
-    }
-  };
-}, "htmlmixed", "smarty");
-
-CodeMirror.defineMIME("text/x-smarty", "smartymixed");
-// vim: et ts=2 sts=2 sw=2
-
-});

From a5e22b726103009c88060cc44d8f8b5f528480bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Feb 2015 15:54:45 +0100
Subject: [PATCH 1983/4742] [manual] Add a short description of the lint
 validator interface

Closes #3073
---
 doc/manual.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index ba537d959b..923ca9b984 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2634,8 +2634,14 @@ <h2 id="addons">Addons</h2>
       to <code>true</code>, in which
       case <a href="#getHelper"><code>getHelper</code></a> with
       type <code>"lint"</code> is used to determined a validator
-      function. Depends on <code>addon/lint/lint.css</code>. A demo
-      can be found <a href="../demo/lint.html">here</a>.</dd>
+      function. Such a function should, when given a document string
+      and an options object, return an array of <code>{message,
+      severity, from, to}</code> objects representing problems. When
+      the function has an <code>async</code> property with a truthy
+      value, it will be called with an additional second argument,
+      which is a callback to pass the array to. Depends
+      on <code>addon/lint/lint.css</code>. A demo can be
+      found <a href="../demo/lint.html">here</a>.</dd>
 
       <dt id="addon_mark-selection"><a href="../addon/selection/mark-selection.js"><code>selection/mark-selection.js</code></a></dt>
       <dd>Causes the selected text to be marked with the CSS class

From fb78920cd36c41680f6b473bac51465532fd117e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Feb 2015 16:18:15 +0100
Subject: [PATCH 1984/4742] [merge addon] Define goNextDiff and goPrevDiff
 commands

Closes #2858
---
 addon/merge/merge.js | 40 ++++++++++++++++++++++++++++++++++++++++
 doc/manual.html      |  5 ++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index f1f3aafc49..5b04b03292 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -37,7 +37,9 @@
     constructor: DiffView,
     init: function(pane, orig, options) {
       this.edit = this.mv.edit;
+      (this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
       this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
+      this.orig.state.diffViews = [this];
 
       this.diff = getDiff(asString(orig), asString(options.value));
       this.chunks = getChunks(this.diff);
@@ -732,4 +734,42 @@
   function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
   function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
   function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
+
+  function findPrevDiff(chunks, start, isOrig) {
+    for (var i = chunks.length - 1; i >= 0; i--) {
+      var chunk = chunks[i];
+      var to = (isOrig ? chunk.origTo : chunk.editTo) - 1;
+      if (to < start) return to;
+    }
+  }
+
+  function findNextDiff(chunks, start, isOrig) {
+    for (var i = 0; i < chunks.length; i++) {
+      var chunk = chunks[i];
+      var from = (isOrig ? chunk.origFrom : chunk.editFrom);
+      if (from > start) return from;
+    }
+  }
+
+  function goNearbyDiff(cm, dir) {
+    var found = null, views = cm.state.diffViews, line = cm.getCursor().line;
+    if (views) for (var i = 0; i < views.length; i++) {
+      var dv = views[i], isOrig = cm == dv.orig;
+      ensureDiff(dv);
+      var pos = dir < 0 ? findPrevDiff(dv.chunks, line, isOrig) : findNextDiff(dv.chunks, line, isOrig);
+      if (pos != null && (found == null || (dir < 0 ? pos > found : pos < found)))
+        found = pos;
+    }
+    if (found != null)
+      cm.setCursor(found, 0);
+    else
+      return CodeMirror.Pass;
+  }
+
+  CodeMirror.commands.goNextDiff = function(cm) {
+    return goNearbyDiff(cm, 1);
+  };
+  CodeMirror.commands.goPrevDiff = function(cm) {
+    return goNearbyDiff(cm, -1);
+  };
 });
diff --git a/doc/manual.html b/doc/manual.html
index 923ca9b984..d6f89569ba 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2836,7 +2836,10 @@ <h2 id="addons">Addons</h2>
           <dd>When true (the default), changed pieces of text are
           highlighted.</dd>
         </dl>
-        <a href="../demo/merge.html">Demo here</a>.</dd>
+        The addon also defines commands <code>"goNextDiff"</code>
+        and <code>"goPrevDiff"</code> to quickly jump to the next
+        changed chunk. <a href="../demo/merge.html">Demo
+        here</a>.</dd>
 
       <dt id="addon_tern"><a href="../addon/tern/tern.js"><code>tern/tern.js</code></a></dt>
       <dd>Provides integration with

From c1d250204853089e1996c078e5321bce4eb31431 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Feb 2015 16:35:30 +0100
Subject: [PATCH 1985/4742] [foldgutter addon] Make sure unfolding markers
 work, even when fold range is broken

Closes #2581
---
 addon/fold/foldgutter.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 199120c726..ed7bd87d34 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -52,7 +52,7 @@
   function isFolded(cm, line) {
     var marks = cm.findMarksAt(Pos(line));
     for (var i = 0; i < marks.length; ++i)
-      if (marks[i].__isFold && marks[i].find().from.line == line) return true;
+      if (marks[i].__isFold && marks[i].find().from.line == line) return marks[i];
   }
 
   function marker(spec) {
@@ -98,7 +98,9 @@
     if (!state) return;
     var opts = state.options;
     if (gutter != opts.gutter) return;
-    cm.foldCode(Pos(line, 0), opts.rangeFinder);
+    var folded = isFolded(cm, line);
+    if (folded) folded.clear();
+    else cm.foldCode(Pos(line, 0), opts.rangeFinder);
   }
 
   function onChange(cm) {

From a1d45cf047bebfe05280b009241a0b40c3c0038d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 25 Feb 2015 12:17:46 +0100
Subject: [PATCH 1986/4742] Also force box-sizing: content-box for
 CodeMirror-gutters

Issue #3098
---
 lib/codemirror.css | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 1902ba4abd..a27d83f8bf 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -33,8 +33,6 @@
   min-width: 20px;
   text-align: right;
   color: #999;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
 }
 
 .CodeMirror-guttermarker { color: black; }
@@ -154,14 +152,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
 }
 .CodeMirror-sizer {
   position: relative;
   border-right: 30px solid transparent;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
@@ -196,8 +190,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 .CodeMirror-gutter {
   white-space: normal;
   height: 100%;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
   display: inline-block;
   margin-bottom: -30px;
   /* Hack to make IE7 behave */
@@ -265,6 +257,16 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   outline: none;
 }
 
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
 .CodeMirror-measure {
   position: absolute;
   width: 100%;

From 3a408884dd5e3f86bfbd4bf1f597aad397155cae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 25 Feb 2015 12:18:40 +0100
Subject: [PATCH 1987/4742] [mdn-like theme] Remove margin on linenumber
 element

Margins for gutter markers aren't supported, and this was
pushing the numbers into the content.

Issue #3098
---
 theme/mdn-like.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index 93293c01c8..9c73dc2f0c 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -13,7 +13,7 @@
 .cm-s-mdn-like.CodeMirror ::-moz-selection { background: #cfc; }
 
 .cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
-.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; margin-left: 3px; }
+.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
 div.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
 
 .cm-s-mdn-like .cm-keyword {  color: #6262FF; }

From cd6a1a7242bb1eb600e9b795bdf0e4a08866941e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 26 Feb 2015 11:43:55 +0100
Subject: [PATCH 1988/4742] [lint addon] Prevent events/timeouts trying to run
 after addon has been disabled

Issue #3104
---
 addon/lint/lint.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 18eb709016..c7e093960e 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -163,6 +163,7 @@
 
   function onChange(cm) {
     var state = cm.state.lint;
+    if (!state) return;
     clearTimeout(state.timeout);
     state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
   }
@@ -188,6 +189,7 @@
       clearMarks(cm);
       cm.off("change", onChange);
       CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
+      clearTimeout(cm.state.lint.timeout);
       delete cm.state.lint;
     }
 

From 14c07d51e2cacf874f837a51cddf0ee4f772369a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 26 Feb 2015 12:08:20 +0100
Subject: [PATCH 1989/4742] [mllike mode] Fix bad usage of object as dictionary

Looking up arbitrary strings without a hasOwnProperty check
never ends well.

Closes #3106
---
 mode/mllike/mllike.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 04ab1c98ec..bf0b8a674f 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -85,7 +85,7 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
     }
     stream.eatWhile(/\w/);
     var cur = stream.current();
-    return words[cur] || 'variable';
+    return words.hasOwnProperty(cur) ? words[cur] : 'variable';
   }
 
   function tokenString(stream, state) {

From e78b5ab32cc41c8342a4dd213c61f0c7e89119bb Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Fri, 27 Feb 2015 16:29:25 +0200
Subject: [PATCH 1990/4742] [yaml mode] add ext "yml"

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

diff --git a/mode/meta.js b/mode/meta.js
index 637005d834..6519cde4c9 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -128,7 +128,7 @@
     {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
     {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
-    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml"], alias: ["yml"]},
+    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
     {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]}
   ];
   // Ensure all modes have a mime property for backwards compatibility

From 78cad27f974c2a84f43a1ca47d75cccb142953e1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 2 Mar 2015 10:20:40 +0100
Subject: [PATCH 1991/4742] [simplescrollbars addon] Prevent scroll thumb from
 becoming too tiny

---
 addon/scroll/simplescrollbars.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addon/scroll/simplescrollbars.js b/addon/scroll/simplescrollbars.js
index bb06adb86a..f78353a130 100644
--- a/addon/scroll/simplescrollbars.js
+++ b/addon/scroll/simplescrollbars.js
@@ -69,14 +69,20 @@
     if (update !== false) this.scroll(pos, this.orientation);
   };
 
+  var minButtonSize = 10;
+
   Bar.prototype.update = function(scrollSize, clientSize, barSize) {
     this.screen = clientSize;
     this.total = scrollSize;
     this.size = barSize;
 
-    // FIXME clip to min size?
+    var buttonSize = this.screen * (this.size / this.total);
+    if (buttonSize < minButtonSize) {
+      this.size -= minButtonSize - buttonSize;
+      buttonSize = minButtonSize;
+    }
     this.inner.style[this.orientation == "horizontal" ? "width" : "height"] =
-      this.screen * (this.size / this.total) + "px";
+      buttonSize + "px";
     this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
       this.pos * (this.size / this.total) + "px";
   };

From 0cd691f94d4b57d013c66f0e212e8990f063135b Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 28 Feb 2015 23:53:56 +0400
Subject: [PATCH 1992/4742] [vim] fix handling of non-ascii characters

---
 keymap/vim.js    | 80 ++++++++++++++++++------------------------------
 test/vim_test.js | 10 ++++++
 2 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 682eb7a8c4..1e802b5eef 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -336,7 +336,11 @@
     }
 
     var numberRegex = /[\d]/;
-    var wordRegexp = [(/\w/), (/[^\w\s]/)], bigWordRegexp = [(/\S/)];
+    var wordCharTest = [CodeMirror.isWordChar, function(ch) {
+      return ch && !CodeMirror.isWordChar(ch) && !/\s/.test(ch);
+    }], bigWordCharTest = [function(ch) {
+      return /\S/.test(ch);
+    }];
     function makeKeyRange(start, size) {
       var keys = [];
       for (var i = start; i < start + size; i++) {
@@ -2628,9 +2632,6 @@
     function lineLength(cm, lineNum) {
       return cm.getLine(lineNum).length;
     }
-    function reverse(s){
-      return s.split('').reverse().join('');
-    }
     function trim(s) {
       if (s.trim) {
         return s.trim();
@@ -2944,59 +2945,38 @@
 
       // Seek to first word or non-whitespace character, depending on if
       // noSymbol is true.
-      var textAfterIdx = line.substring(idx);
-      var firstMatchedChar;
-      if (noSymbol) {
-        firstMatchedChar = textAfterIdx.search(/\w/);
-      } else {
-        firstMatchedChar = textAfterIdx.search(/\S/);
-      }
-      if (firstMatchedChar == -1) {
-        return null;
+      var test = noSymbol ? wordCharTest[0] : bigWordCharTest [0];
+      while (!test(line.charAt(idx))) {
+        idx++;
+        if (idx >= line.length) { return null; }
       }
-      idx += firstMatchedChar;
-      textAfterIdx = line.substring(idx);
-      var textBeforeIdx = line.substring(0, idx);
 
-      var matchRegex;
-      // Greedy matchers for the "word" we are trying to expand.
       if (bigWord) {
-        matchRegex = /^\S+/;
+        test = bigWordCharTest[0];
       } else {
-        if ((/\w/).test(line.charAt(idx))) {
-          matchRegex = /^\w+/;
-        } else {
-          matchRegex = /^[^\w\s]+/;
+        test = wordCharTest[0];
+        if (!test(line.charAt(idx))) {
+          test = wordCharTest[1];
         }
       }
 
-      var wordAfterRegex = matchRegex.exec(textAfterIdx);
-      var wordStart = idx;
-      var wordEnd = idx + wordAfterRegex[0].length;
-      // TODO: Find a better way to do this. It will be slow on very long lines.
-      var revTextBeforeIdx = reverse(textBeforeIdx);
-      var wordBeforeRegex = matchRegex.exec(revTextBeforeIdx);
-      if (wordBeforeRegex) {
-        wordStart -= wordBeforeRegex[0].length;
-      }
+      var end = idx, start = idx;
+      while (test(line.charAt(end)) && end < line.length) { end++; }
+      while (test(line.charAt(start)) && start >= 0) { start--; }
+      start++;
 
       if (inclusive) {
-        // If present, trim all whitespace after word.
-        // Otherwise, trim all whitespace before word.
-        var textAfterWordEnd = line.substring(wordEnd);
-        var whitespacesAfterWord = textAfterWordEnd.match(/^\s*/)[0].length;
-        if (whitespacesAfterWord > 0) {
-          wordEnd += whitespacesAfterWord;
-        } else {
-          var revTrim = revTextBeforeIdx.length - wordStart;
-          var textBeforeWordStart = revTextBeforeIdx.substring(revTrim);
-          var whitespacesBeforeWord = textBeforeWordStart.match(/^\s*/)[0].length;
-          wordStart -= whitespacesBeforeWord;
+        // If present, include all whitespace after word.
+        // Otherwise, include all whitespace before word, except indentation.
+        var wordEnd = end;
+        while (/\s/.test(line.charAt(end)) && end < line.length) { end++; }
+        if (wordEnd == end) {
+          var wordStart = start;
+          while (/\s/.test(line.charAt(start - 1)) && start > 0) { start--; }
+          if (!start) { start = wordStart; }
         }
       }
-
-      return { start: Pos(cur.line, wordStart),
-               end: Pos(cur.line, wordEnd) };
+      return { start: Pos(cur.line, start), end: Pos(cur.line, end) };
     }
 
     function recordJumpPosition(cm, oldCur, newCur) {
@@ -3154,7 +3134,7 @@
       var pos = cur.ch;
       var line = cm.getLine(lineNum);
       var dir = forward ? 1 : -1;
-      var regexps = bigWord ? bigWordRegexp : wordRegexp;
+      var charTests = bigWord ? bigWordCharTest: wordCharTest;
 
       if (emptyLineIsWord && line == '') {
         lineNum += dir;
@@ -3174,11 +3154,11 @@
         // Find bounds of next word.
         while (pos != stop) {
           var foundWord = false;
-          for (var i = 0; i < regexps.length && !foundWord; ++i) {
-            if (regexps[i].test(line.charAt(pos))) {
+          for (var i = 0; i < charTests.length && !foundWord; ++i) {
+            if (charTests[i](line.charAt(pos))) {
               wordStart = pos;
               // Advance to end of word.
-              while (pos != stop && regexps[i].test(line.charAt(pos))) {
+              while (pos != stop && charTests[i](line.charAt(pos))) {
                 pos += dir;
               }
               wordEnd = pos;
diff --git a/test/vim_test.js b/test/vim_test.js
index 74013cbff4..29c29d0614 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -679,6 +679,16 @@ testVim('dw_word', function(cm, vim, helpers) {
   is(!register.linewise);
   eqPos(curStart, cm.getCursor());
 }, { value: ' word1 word2' });
+testVim('dw_unicode_word', function(cm, vim, helpers) {
+  helpers.doKeys('d', 'w');
+  eq(cm.getValue().length, 10);
+  helpers.doKeys('d', 'w');
+  eq(cm.getValue().length, 6);
+  helpers.doKeys('d', 'w');
+  eq(cm.getValue().length, 5);
+  helpers.doKeys('d', 'e');
+  eq(cm.getValue().length, 2);
+}, { value: '  \u0562\u0561\u0580\u0587\xbbe\xb5g  ' });
 testVim('dw_only_word', function(cm, vim, helpers) {
   // Test that if there is only 1 word left, dw deletes till the end of the
   // line.

From b4f8836c8f08324283b9cb9cb45714547c3f1f8d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 2 Mar 2015 11:13:58 +0100
Subject: [PATCH 1993/4742] [tern addon] Accept closing paren and bracket as
 the end of an interesting expression

---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index b049549d35..99b8a64682 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -443,7 +443,7 @@
   function atInterestingExpression(cm) {
     var pos = cm.getCursor("end"), tok = cm.getTokenAt(pos);
     if (tok.start < pos.ch && (tok.type == "comment" || tok.type == "string")) return false;
-    return /\w/.test(cm.getLine(pos.line).slice(Math.max(pos.ch - 1, 0), pos.ch + 1));
+    return /[\w)\]]/.test(cm.getLine(pos.line).slice(Math.max(pos.ch - 1, 0), pos.ch + 1));
   }
 
   // Variable renaming

From dfad61de4584705731bee6fe5951abe6a9175eb9 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 1 Mar 2015 14:31:42 +0400
Subject: [PATCH 1994/4742] [vim] fix search motion

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 1e802b5eef..f7be4b370f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1039,12 +1039,10 @@
             break;
           case 'search':
             this.processSearch(cm, vim, command);
-            clearInputState(cm);
             break;
           case 'ex':
           case 'keyToEx':
             this.processEx(cm, vim, command);
-            clearInputState(cm);
             break;
           default:
             break;
@@ -1137,6 +1135,7 @@
             updateSearchQuery(cm, query, ignoreCase, smartCase);
           } catch (e) {
             showConfirm(cm, 'Invalid regex: ' + query);
+            clearInputState(cm);
             return;
           }
           commandDispatcher.processMotion(cm, vim, {
@@ -1186,6 +1185,7 @@
             clearSearchHighlight(cm);
             cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
             CodeMirror.e_stop(e);
+            clearInputState(cm);
             close();
             cm.focus();
           }
@@ -1252,6 +1252,7 @@
             vimGlobalState.exCommandHistoryController.pushInput(input);
             vimGlobalState.exCommandHistoryController.reset();
             CodeMirror.e_stop(e);
+            clearInputState(cm);
             close();
             cm.focus();
           }
diff --git a/test/vim_test.js b/test/vim_test.js
index 29c29d0614..dfce9a2ce5 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2186,6 +2186,15 @@ testVim('S_visual', function(cm, vim, helpers) {
   eq('\ncc', cm.getValue());
 }, { value: 'aa\nbb\ncc'});
 
+testVim('d_/', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('2', 'd', '/');
+  helpers.assertCursorAt(0, 0);
+  eq('match \n next', cm.getValue());
+  cm.openDialog = helpers.fakeOpenDialog('2');
+  helpers.doKeys('d', ':');
+  // TODO eq(' next', cm.getValue());
+}, { value: 'text match match \n next' });
 testVim('/ and n/N', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('match');
   helpers.doKeys('/');

From dad7abf8b2b071ba7579bb69752e9577680f18d6 Mon Sep 17 00:00:00 2001
From: Peter Flynn <pflynn@adobe.com>
Date: Wed, 4 Mar 2015 17:06:44 -0800
Subject: [PATCH 1995/4742] [sass mode] Fix typo that was introduced by
 9e56052a

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

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 52a6682915..6973ece292 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -232,7 +232,7 @@ CodeMirror.defineMode("sass", function(config) {
 
       if (stream.eatWhile(/[\w-]/)){
         if(stream.match(/ *: *[\w-\+\$#!\("']/,false)){
-          return "propery";
+          return "property";
         }
         else if(stream.match(/ *:/,false)){
           indent(state);

From 4485ae75218d11a542ee8d6c289c3c10ce7952ab Mon Sep 17 00:00:00 2001
From: Kevin Earls <kevin@kevinearls.com>
Date: Wed, 4 Mar 2015 16:57:23 +0100
Subject: [PATCH 1996/4742] [properties mode] Fix handling of line-continuation
 backslash

Closes #3114
---
 mode/properties/properties.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/properties/properties.js b/mode/properties/properties.js
index 0740084209..9da5baf420 100644
--- a/mode/properties/properties.js
+++ b/mode/properties/properties.js
@@ -51,7 +51,7 @@ CodeMirror.defineMode("properties", function() {
         state.position = "quote";
         return null;
       } else if (ch === "\\" && state.position === "quote") {
-        if (stream.next() !== "u") {    // u = Unicode sequence \u1234
+        if (stream.eol()) {  // end of line?
           // Multiline value
           state.nextMultiline = true;
         }

From 313e2386d0f389256a645a4824e5f73047514737 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Mar 2015 17:58:44 +0100
Subject: [PATCH 1997/4742] [manual] Mention the fact that editor instances are
 passed to lint functions

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

diff --git a/doc/manual.html b/doc/manual.html
index d6f89569ba..ec0033f783 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2634,8 +2634,8 @@ <h2 id="addons">Addons</h2>
       to <code>true</code>, in which
       case <a href="#getHelper"><code>getHelper</code></a> with
       type <code>"lint"</code> is used to determined a validator
-      function. Such a function should, when given a document string
-      and an options object, return an array of <code>{message,
+      function. Such a function should, when given a document string,
+      an options object, and an editor instance, return an array of <code>{message,
       severity, from, to}</code> objects representing problems. When
       the function has an <code>async</code> property with a truthy
       value, it will be called with an additional second argument,

From 572f6f2a740a00614ce4410fe6488cc63b7c1019 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Mar 2015 20:52:05 +0100
Subject: [PATCH 1998/4742] Fix interpretation of specialchars not happening on
 init

Thus allowing a user to specify a non-global regexp, causing a hang
in buildToken

Issue #3117
---
 lib/codemirror.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e813755bb6..04acf87d71 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -87,7 +87,8 @@
       pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
       draggingText: false,
       highlight: new Delayed(), // stores highlight worker timeout
-      keySeq: null  // Unfinished key sequence
+      keySeq: null,  // Unfinished key sequence
+      specialChars: null
     };
 
     var cm = this;
@@ -5202,10 +5203,10 @@
     clearCaches(cm);
     regChange(cm);
   }, true);
-  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val) {
-    cm.options.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
-    cm.refresh();
-  }, true);
+  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
+    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
+    if (old != CodeMirror.Init) cm.refresh();
+  });
   option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
   option("electricChars", true);
   option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
@@ -6786,7 +6787,7 @@
   // the line map. Takes care to render special characters separately.
   function buildToken(builder, text, style, startStyle, endStyle, title, css) {
     if (!text) return;
-    var special = builder.cm.options.specialChars, mustWrap = false;
+    var special = builder.cm.state.specialChars, mustWrap = false;
     if (!special.test(text)) {
       builder.col += text.length;
       var content = document.createTextNode(text);

From acdb74de8f75bd5e696371026069811ecedea460 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Mar 2015 21:05:19 +0100
Subject: [PATCH 1999/4742] Don't apply special character filter to nbsps
 generated by space-splitting

Issue #3117
---
 lib/codemirror.js | 32 ++++++++++++++------------------
 test/test.js      |  7 +++++++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 04acf87d71..6e02c20aea 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6727,7 +6727,9 @@
     // is needed on Webkit to be able to get line-level bounding
     // rectangles for it (in measureChar).
     var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
-    var builder = {pre: elt("pre", [content]), content: content, col: 0, pos: 0, cm: cm};
+    var builder = {pre: elt("pre", [content]), content: content,
+                   col: 0, pos: 0, cm: cm,
+                   splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
     lineView.measure = {};
 
     // Iterate over the logical lines that make up this visual line.
@@ -6737,8 +6739,6 @@
       builder.addToken = buildToken;
       // Optionally wire in some hacks into the token-rendering
       // algorithm, to deal with browser quirks.
-      if ((ie || webkit) && cm.getOption("lineWrapping"))
-        builder.addToken = buildTokenSplitSpaces(builder.addToken);
       if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
         builder.addToken = buildTokenBadBidi(builder.addToken, order);
       builder.map = [];
@@ -6787,10 +6787,11 @@
   // the line map. Takes care to render special characters separately.
   function buildToken(builder, text, style, startStyle, endStyle, title, css) {
     if (!text) return;
+    var displayText = builder.splitSpaces ? text.replace(/ {3,}/g, splitSpaces) : text;
     var special = builder.cm.state.specialChars, mustWrap = false;
     if (!special.test(text)) {
       builder.col += text.length;
-      var content = document.createTextNode(text);
+      var content = document.createTextNode(displayText);
       builder.map.push(builder.pos, builder.pos + text.length, content);
       if (ie && ie_version < 9) mustWrap = true;
       builder.pos += text.length;
@@ -6801,7 +6802,7 @@
         var m = special.exec(text);
         var skipped = m ? m.index - pos : text.length - pos;
         if (skipped) {
-          var txt = document.createTextNode(text.slice(pos, pos + skipped));
+          var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
           if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
           else content.appendChild(txt);
           builder.map.push(builder.pos, builder.pos + skipped, txt);
@@ -6838,22 +6839,17 @@
     builder.content.appendChild(content);
   }
 
-  function buildTokenSplitSpaces(inner) {
-    function split(old) {
-      var out = " ";
-      for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
-      out += " ";
-      return out;
-    }
-    return function(builder, text, style, startStyle, endStyle, title) {
-      inner(builder, text.replace(/ {3,}/g, split), style, startStyle, endStyle, title);
-    };
+  function splitSpaces(old) {
+    var out = " ";
+    for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
+    out += " ";
+    return out;
   }
 
   // Work around nonsense dimensions being reported for stretches of
   // right-to-left text.
   function buildTokenBadBidi(inner, order) {
-    return function(builder, text, style, startStyle, endStyle, title) {
+    return function(builder, text, style, startStyle, endStyle, title, css) {
       style = style ? style + " cm-force-border" : "cm-force-border";
       var start = builder.pos, end = start + text.length;
       for (;;) {
@@ -6862,8 +6858,8 @@
           var part = order[i];
           if (part.to > start && part.from <= start) break;
         }
-        if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title);
-        inner(builder, text.slice(0, part.to - start), style, startStyle, null, title);
+        if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css);
+        inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
         startStyle = null;
         text = text.slice(part.to - start);
         start = part.to;
diff --git a/test/test.js b/test/test.js
index 83d09ca5ac..4631672bdb 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2082,6 +2082,13 @@ testCM("eventOrder", function(cm) {
   eq(seen.join(","), "change,change,activity,change");
 });
 
+testCM("splitSpaces_nonspecial", function(cm) {
+  eq(byClassName(cm.getWrapperElement(), "cm-invalidchar").length, 0);
+}, {
+  specialChars: /[\u00a0]/,
+  value: "spaces ->            <- between"
+});
+
 test("core_rmClass", function() {
   var node = document.createElement("div");
   node.className = "foo-bar baz-quux yadda";

From 94a67141982d3e01a7803936802f6aa26ef7375b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 5 Mar 2015 21:18:44 +0100
Subject: [PATCH 2000/4742] Add extra pixel to line number gutter width

Also set CodeMirror-linenumber to nowrap.

Works around issue where a rounding error causes the line
numbers to wrap in some situations on iOS.

Closes #3068
---
 lib/codemirror.css | 1 +
 lib/codemirror.js  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index a27d83f8bf..e531d296e2 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -33,6 +33,7 @@
   min-width: 20px;
   text-align: right;
   color: #999;
+  white-space: nowrap;
 }
 
 .CodeMirror-guttermarker { color: black; }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6e02c20aea..6806c084c3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -592,7 +592,7 @@
                                                  "CodeMirror-linenumber CodeMirror-gutter-elt"));
       var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
       display.lineGutter.style.width = "";
-      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding);
+      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
       display.lineNumWidth = display.lineNumInnerWidth + padding;
       display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
       display.lineGutter.style.width = display.lineNumWidth + "px";

From dbdc448273f41e185dbd7739f97f8b0a100fa4fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 6 Mar 2015 09:48:20 +0100
Subject: [PATCH 2001/4742] [closebrackets addon] Don't rely on the set of
 brackets being static

---
 addon/edit/closebrackets.js | 247 +++++++++++++++++++-----------------
 1 file changed, 131 insertions(+), 116 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index ff4bb3f733..da89af58c9 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -10,6 +10,7 @@
     mod(CodeMirror);
 })(function(CodeMirror) {
   var DEFAULT_BRACKETS = "()[]{}''\"\"";
+  var BIND = DEFAULT_BRACKETS + "`";
   var DEFAULT_TRIPLES = "'\"";
   var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
   var SPACE_CHAR_REGEX = /\s/;
@@ -17,21 +18,140 @@
   var Pos = CodeMirror.Pos;
 
   CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
-    if (old != CodeMirror.Init && old)
-      cm.removeKeyMap("autoCloseBrackets");
+    if (old && old != CodeMirror.Init) {
+      cm.removeKeyMap(keyMap);
+      cm.state.closeBrackets = null;
+    }
     if (!val) return;
-    var pairs = DEFAULT_BRACKETS, triples = DEFAULT_TRIPLES, explode = DEFAULT_EXPLODE_ON_ENTER;
-    if (typeof val == "string") pairs = val;
-    else if (typeof val == "object") {
-      if (val.pairs != null) pairs = val.pairs;
-      if (val.triples != null) triples = val.triples;
-      if (val.explode != null) explode = val.explode;
+    var config = cm.state.closeBrackets = {
+      pairs: DEFAULT_BRACKETS,
+      triples: DEFAULT_TRIPLES,
+      explode: DEFAULT_EXPLODE_ON_ENTER
+    };
+    if (typeof val == "string") {
+      config.pairs = val;
+    } else if (typeof val == "object") {
+      if (val.pairs != null) config.pairs = val.pairs;
+      if (val.triples != null) config.triples = val.triples;
+      if (val.explode != null) config.explode = val.explode;
     }
-    var map = buildKeymap(pairs, triples);
-    if (explode) map.Enter = buildExplodeHandler(explode);
-    cm.addKeyMap(map);
+    cm.addKeyMap(keyMap);
   });
 
+  var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
+  for (var i = 0; i < BIND.length; i++)
+    keyMap["'" + BIND.charAt(i) + "'"] = handler(BIND.charAt(i));
+
+  function handler(ch) {
+    return function(cm) { return handleChar(cm, ch); };
+  }
+
+  function handleBackspace(cm) {
+    var data = cm.state.closeBrackets;
+    if (!data || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || data.pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var cur = ranges[i].head;
+      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
+    }
+  }
+
+  function handleEnter(cm) {
+    var data = cm.state.closeBrackets;
+    if (!data || !data.explode || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) return CodeMirror.Pass;
+      var around = charsAround(cm, ranges[i].head);
+      if (!around || data.explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+    }
+    cm.operation(function() {
+      cm.replaceSelection("\n\n", null);
+      cm.execCommand("goCharLeft");
+      ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var line = ranges[i].head.line;
+        cm.indentLine(line, null, true);
+        cm.indentLine(line + 1, null, true);
+      }
+    });
+  }
+
+  function isClosingBracket(ch, pairs) {
+    var pos = pairs.lastIndexOf(ch);
+    return pos > -1 && pos % 2 == 1;
+  }
+
+  function handleChar(cm, ch) {
+    var data = cm.state.closeBrackets;
+    if (!data || cm.getOption("disableInput")) return CodeMirror.Pass;
+
+    var pos = data.pairs.indexOf(ch);
+    if (pos == -1) return CodeMirror.Pass;
+
+    var identical = data.pairs.charAt(pos + 1) == ch;
+    var ranges = cm.listSelections();
+    var opening = pos % 2 == 0;
+
+    var type, next;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], cur = range.head, curType;
+      var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
+      if (opening && !range.empty()) {
+        curType = "surround";
+      } else if ((identical || !opening) && next == ch) {
+        if (data.triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
+          curType = "skipThree";
+        else
+          curType = "skip";
+      } else if (identical && cur.ch > 1 && data.triples.indexOf(ch) >= 0 &&
+                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch &&
+                 (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != ch)) {
+        curType = "addFour";
+      } else if (identical) {
+        if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, ch)) curType = "both";
+        else return CodeMirror.Pass;
+      } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
+                             isClosingBracket(next, data.pairs) ||
+                             SPACE_CHAR_REGEX.test(next))) {
+        curType = "both";
+      } else {
+        return CodeMirror.Pass;
+      }
+      if (!type) type = curType;
+      else if (type != curType) return CodeMirror.Pass;
+    }
+
+    var left = pos % 2 ? data.pairs.charAt(pos - 1) : ch;
+    var right = pos % 2 ? ch : data.pairs.charAt(pos + 1);
+    cm.operation(function() {
+      if (type == "skip") {
+        cm.execCommand("goCharRight");
+      } else if (type == "skipThree") {
+        for (var i = 0; i < 3; i++)
+          cm.execCommand("goCharRight");
+      } else if (type == "surround") {
+        var sels = cm.getSelections();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = left + sels[i] + right;
+        cm.replaceSelections(sels, "around");
+      } else if (type == "both") {
+        cm.replaceSelection(left + right, null);
+        cm.execCommand("goCharLeft");
+      } else if (type == "addFour") {
+        cm.replaceSelection(left + left + left + left, "before");
+        cm.execCommand("goCharRight");
+      }
+    });
+  }
+
   function charsAround(cm, pos) {
     var str = cm.getRange(Pos(pos.line, pos.ch - 1),
                           Pos(pos.line, pos.ch + 1));
@@ -53,109 +173,4 @@
       stream.start = stream.pos;
     }
   }
-
-  function buildKeymap(pairs, triples) {
-    var map = {
-      name : "autoCloseBrackets",
-      Backspace: function(cm) {
-        if (cm.getOption("disableInput")) return CodeMirror.Pass;
-        var ranges = cm.listSelections();
-        for (var i = 0; i < ranges.length; i++) {
-          if (!ranges[i].empty()) return CodeMirror.Pass;
-          var around = charsAround(cm, ranges[i].head);
-          if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-        }
-        for (var i = ranges.length - 1; i >= 0; i--) {
-          var cur = ranges[i].head;
-          cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
-        }
-      }
-    };
-    var closingBrackets = "";
-    for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
-      closingBrackets += right;
-      map["'" + left + "'"] = function(cm) {
-        if (cm.getOption("disableInput")) return CodeMirror.Pass;
-        var ranges = cm.listSelections(), type, next;
-        for (var i = 0; i < ranges.length; i++) {
-          var range = ranges[i], cur = range.head, curType;
-          var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
-          if (!range.empty()) {
-            curType = "surround";
-          } else if (left == right && next == right) {
-            if (cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == left + left + left)
-              curType = "skipThree";
-            else
-              curType = "skip";
-          } else if (left == right && cur.ch > 1 && triples.indexOf(left) >= 0 &&
-                     cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
-                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left)) {
-            curType = "addFour";
-          } else if (left == '"' || left == "'") {
-            if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, left)) curType = "both";
-            else return CodeMirror.Pass;
-          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next)) {
-            curType = "both";
-          } else {
-            return CodeMirror.Pass;
-          }
-          if (!type) type = curType;
-          else if (type != curType) return CodeMirror.Pass;
-        }
-
-        cm.operation(function() {
-          if (type == "skip") {
-            cm.execCommand("goCharRight");
-          } else if (type == "skipThree") {
-            for (var i = 0; i < 3; i++)
-              cm.execCommand("goCharRight");
-          } else if (type == "surround") {
-            var sels = cm.getSelections();
-            for (var i = 0; i < sels.length; i++)
-              sels[i] = left + sels[i] + right;
-            cm.replaceSelections(sels, "around");
-          } else if (type == "both") {
-            cm.replaceSelection(left + right, null);
-            cm.execCommand("goCharLeft");
-          } else if (type == "addFour") {
-            cm.replaceSelection(left + left + left + left, "before");
-            cm.execCommand("goCharRight");
-          }
-        });
-      };
-      if (left != right) map["'" + right + "'"] = function(cm) {
-        var ranges = cm.listSelections();
-        for (var i = 0; i < ranges.length; i++) {
-          var range = ranges[i];
-          if (!range.empty() ||
-              cm.getRange(range.head, Pos(range.head.line, range.head.ch + 1)) != right)
-            return CodeMirror.Pass;
-        }
-        cm.execCommand("goCharRight");
-      };
-    })(pairs.charAt(i), pairs.charAt(i + 1));
-    return map;
-  }
-
-  function buildExplodeHandler(pairs) {
-    return function(cm) {
-      if (cm.getOption("disableInput")) return CodeMirror.Pass;
-      var ranges = cm.listSelections();
-      for (var i = 0; i < ranges.length; i++) {
-        if (!ranges[i].empty()) return CodeMirror.Pass;
-        var around = charsAround(cm, ranges[i].head);
-        if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-      }
-      cm.operation(function() {
-        cm.replaceSelection("\n\n", null);
-        cm.execCommand("goCharLeft");
-        ranges = cm.listSelections();
-        for (var i = 0; i < ranges.length; i++) {
-          var line = ranges[i].head.line;
-          cm.indentLine(line, null, true);
-          cm.indentLine(line + 1, null, true);
-        }
-      });
-    };
-  }
 });

From e1cda7058213bf17a04193a9f8cbe6911eba8df6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 6 Mar 2015 10:12:31 +0100
Subject: [PATCH 2002/4742] [closebrackets addon] Make closing rules
 configurable per mode

Make JavaScript mode autoclose backticks, remove single quote closing
for Lisp modes, and add explicit triple-quote rule to languages supporting
triple quoting.

Issue #3110
---
 addon/edit/closebrackets.js   | 90 +++++++++++++++++++----------------
 lib/codemirror.js             |  2 +-
 mode/clike/clike.js           |  3 +-
 mode/clojure/clojure.js       |  1 +
 mode/commonlisp/commonlisp.js |  1 +
 mode/groovy/groovy.js         |  1 +
 mode/javascript/javascript.js |  1 +
 mode/kotlin/kotlin.js         |  1 +
 mode/python/python.js         |  1 +
 mode/scheme/scheme.js         |  1 +
 10 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index da89af58c9..2bbc6f2a38 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -9,11 +9,11 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-  var DEFAULT_BRACKETS = "()[]{}''\"\"";
-  var BIND = DEFAULT_BRACKETS + "`";
-  var DEFAULT_TRIPLES = "'\"";
-  var DEFAULT_EXPLODE_ON_ENTER = "[]{}";
-  var SPACE_CHAR_REGEX = /\s/;
+  var defaults = {
+    pairs: "()[]{}''\"\"",
+    triples: "",
+    explode: "[]{}"
+  };
 
   var Pos = CodeMirror.Pos;
 
@@ -22,39 +22,44 @@
       cm.removeKeyMap(keyMap);
       cm.state.closeBrackets = null;
     }
-    if (!val) return;
-    var config = cm.state.closeBrackets = {
-      pairs: DEFAULT_BRACKETS,
-      triples: DEFAULT_TRIPLES,
-      explode: DEFAULT_EXPLODE_ON_ENTER
-    };
-    if (typeof val == "string") {
-      config.pairs = val;
-    } else if (typeof val == "object") {
-      if (val.pairs != null) config.pairs = val.pairs;
-      if (val.triples != null) config.triples = val.triples;
-      if (val.explode != null) config.explode = val.explode;
+    if (val) {
+      cm.state.closeBrackets = val;
+      cm.addKeyMap(keyMap);
     }
-    cm.addKeyMap(keyMap);
   });
 
+  function getOption(conf, name) {
+    if (name == "pairs" && typeof conf == "string") return conf;
+    if (typeof conf == "object" && conf[name] != null) return conf[name];
+    return defaults[name];
+  }
+
+  var bind = defaults.pairs + "`";
   var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
-  for (var i = 0; i < BIND.length; i++)
-    keyMap["'" + BIND.charAt(i) + "'"] = handler(BIND.charAt(i));
+  for (var i = 0; i < bind.length; i++)
+    keyMap["'" + bind.charAt(i) + "'"] = handler(bind.charAt(i));
 
   function handler(ch) {
     return function(cm) { return handleChar(cm, ch); };
   }
 
+  function getConfig(cm) {
+    var deflt = cm.state.closeBrackets;
+    if (!deflt) return null;
+    var mode = cm.getModeAt(cm.getCursor());
+    return mode.closeBrackets || deflt;
+  }
+
   function handleBackspace(cm) {
-    var data = cm.state.closeBrackets;
-    if (!data || cm.getOption("disableInput")) return CodeMirror.Pass;
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
 
+    var pairs = getOption(conf, "pairs");
     var ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
       if (!ranges[i].empty()) return CodeMirror.Pass;
       var around = charsAround(cm, ranges[i].head);
-      if (!around || data.pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
     }
     for (var i = ranges.length - 1; i >= 0; i--) {
       var cur = ranges[i].head;
@@ -63,14 +68,15 @@
   }
 
   function handleEnter(cm) {
-    var data = cm.state.closeBrackets;
-    if (!data || !data.explode || cm.getOption("disableInput")) return CodeMirror.Pass;
+    var conf = getConfig(cm);
+    var explode = conf && getOption(conf, "explode");
+    if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass;
 
     var ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
       if (!ranges[i].empty()) return CodeMirror.Pass;
       var around = charsAround(cm, ranges[i].head);
-      if (!around || data.explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+      if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
     }
     cm.operation(function() {
       cm.replaceSelection("\n\n", null);
@@ -84,19 +90,16 @@
     });
   }
 
-  function isClosingBracket(ch, pairs) {
-    var pos = pairs.lastIndexOf(ch);
-    return pos > -1 && pos % 2 == 1;
-  }
-
   function handleChar(cm, ch) {
-    var data = cm.state.closeBrackets;
-    if (!data || cm.getOption("disableInput")) return CodeMirror.Pass;
+    var conf = getConfig(cm);
+    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
 
-    var pos = data.pairs.indexOf(ch);
+    var pairs = getOption(conf, "pairs");
+    var pos = pairs.indexOf(ch);
     if (pos == -1) return CodeMirror.Pass;
+    var triples = getOption(conf, "triples");
 
-    var identical = data.pairs.charAt(pos + 1) == ch;
+    var identical = pairs.charAt(pos + 1) == ch;
     var ranges = cm.listSelections();
     var opening = pos % 2 == 0;
 
@@ -107,11 +110,11 @@
       if (opening && !range.empty()) {
         curType = "surround";
       } else if ((identical || !opening) && next == ch) {
-        if (data.triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
+        if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
           curType = "skipThree";
         else
           curType = "skip";
-      } else if (identical && cur.ch > 1 && data.triples.indexOf(ch) >= 0 &&
+      } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
                  cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch &&
                  (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != ch)) {
         curType = "addFour";
@@ -119,8 +122,8 @@
         if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, ch)) curType = "both";
         else return CodeMirror.Pass;
       } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
-                             isClosingBracket(next, data.pairs) ||
-                             SPACE_CHAR_REGEX.test(next))) {
+                             isClosingBracket(next, pairs) ||
+                             /\s/.test(next))) {
         curType = "both";
       } else {
         return CodeMirror.Pass;
@@ -129,8 +132,8 @@
       else if (type != curType) return CodeMirror.Pass;
     }
 
-    var left = pos % 2 ? data.pairs.charAt(pos - 1) : ch;
-    var right = pos % 2 ? ch : data.pairs.charAt(pos + 1);
+    var left = pos % 2 ? pairs.charAt(pos - 1) : ch;
+    var right = pos % 2 ? ch : pairs.charAt(pos + 1);
     cm.operation(function() {
       if (type == "skip") {
         cm.execCommand("goCharRight");
@@ -152,6 +155,11 @@
     });
   }
 
+  function isClosingBracket(ch, pairs) {
+    var pos = pairs.lastIndexOf(ch);
+    return pos > -1 && pos % 2 == 1;
+  }
+
   function charsAround(cm, pos) {
     var str = cm.getRange(Pos(pos.line, pos.ch - 1),
                           Pos(pos.line, pos.ch + 1));
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6806c084c3..197c40df30 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4841,7 +4841,7 @@
 
     getHelpers: function(pos, type) {
       var found = [];
-      if (!helpers.hasOwnProperty(type)) return helpers;
+      if (!helpers.hasOwnProperty(type)) return found;
       var help = helpers[type], mode = this.getModeAt(pos);
       if (typeof mode[type] == "string") {
         if (help[mode[type]]) found.push(help[mode[type]]);
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index e2223ccd15..f996f019dc 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -403,7 +403,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         stream.eatWhile(/[\w\$_\xa1-\uffff]/);
         return "atom";
       }
-    }
+    },
+    modeProps: {closeBrackets: {triples: '"'}}
   });
 
   def(["x-shader/x-vertex", "x-shader/x-fragment"], {
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index c334de7300..d531022a2e 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -234,6 +234,7 @@ CodeMirror.defineMode("clojure", function (options) {
             return state.indentStack.indent;
         },
 
+        closeBrackets: {pairs: "()[]{}\"\""},
         lineComment: ";;"
     };
 });
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 5f50b352de..fb1f99c631 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -111,6 +111,7 @@ CodeMirror.defineMode("commonlisp", function (config) {
       return typeof i == "number" ? i : state.ctx.start + 1;
     },
 
+    closeBrackets: {pairs: "()[]{}\"\""},
     lineComment: ";;",
     blockCommentStart: "#|",
     blockCommentEnd: "|#"
diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 89b8224cf5..e3a1db869b 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -217,6 +217,7 @@ CodeMirror.defineMode("groovy", function(config) {
     },
 
     electricChars: "{}",
+    closeBrackets: {triples: "'\""},
     fold: "brace"
   };
 });
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 3f05ac46c3..ddaa01ef47 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -669,6 +669,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     blockCommentEnd: jsonMode ? null : "*/",
     lineComment: jsonMode ? null : "//",
     fold: "brace",
+    closeBrackets: "()[]{}''\"\"``",
 
     helperType: jsonMode ? "json" : "javascript",
     jsonldMode: jsonldMode,
diff --git a/mode/kotlin/kotlin.js b/mode/kotlin/kotlin.js
index 73c84f6c4f..1efec85dff 100644
--- a/mode/kotlin/kotlin.js
+++ b/mode/kotlin/kotlin.js
@@ -271,6 +271,7 @@ CodeMirror.defineMode("kotlin", function (config, parserConfig) {
       else return ctx.indented + (closing ? 0 : config.indentUnit);
     },
 
+    closeBrackets: {triples: "'\""},
     electricChars: "{}"
   };
 });
diff --git a/mode/python/python.js b/mode/python/python.js
index 98c0409ae2..979e849822 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -339,6 +339,7 @@
           return scope.offset;
       },
 
+      closeBrackets: {triples: "'\""},
       lineComment: "#",
       fold: "indent"
     };
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 979edc0963..2234645911 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -239,6 +239,7 @@ CodeMirror.defineMode("scheme", function () {
             return state.indentStack.indent;
         },
 
+        closeBrackets: {pairs: "()[]{}\"\""},
         lineComment: ";;"
     };
 });

From 11fa758937db5ef9abfaa5b6d3fa93cf0607be1b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 7 Mar 2015 14:44:50 -0500
Subject: [PATCH 2003/4742] Set isVimOp when performing ex command.

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

diff --git a/keymap/vim.js b/keymap/vim.js
index f7be4b370f..5679f58d89 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3869,6 +3869,13 @@
     };
     ExCommandDispatcher.prototype = {
       processCommand: function(cm, input, opt_params) {
+        var that = this;
+        cm.operation(function () {
+          cm.curOp.isVimOp = true;
+          that._processCommand(cm, input, opt_params);
+        });
+      },
+      _processCommand: function(cm, input, opt_params) {
         var vim = cm.state.vim;
         var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
         var previousCommand = commandHistoryRegister.toString();
@@ -4787,7 +4794,7 @@
       var anchor = cm.getCursor('anchor');
       var head = cm.getCursor('head');
       // Enter or exit visual mode to match mouse selection.
-      if (vim.visualMode && cursorEqual(head, anchor) && lineLength(cm, head.line) > head.ch) {
+      if (vim.visualMode && !cm.somethingSelected()) {
         exitVisualMode(cm, false);
       } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
         vim.visualMode = true;

From 03f157ef90a5b03e53dd16956ea2c8625fbdfabd Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 7 Mar 2015 14:52:20 -0500
Subject: [PATCH 2004/4742] [dialog] Add option to not select value on open

---
 addon/dialog/dialog.js | 4 +++-
 keymap/vim.js          | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index e0e8ad4eb7..323b20078e 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -58,7 +58,9 @@
     if (inp) {
       if (options.value) {
         inp.value = options.value;
-        inp.select();
+        if (options.selectValueOnOpen !== false) {
+          inp.select();
+        }
       }
 
       if (options.onInput)
diff --git a/keymap/vim.js b/keymap/vim.js
index 5679f58d89..f5f8cafbc7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3491,7 +3491,8 @@
     function dialog(cm, template, shortText, onClose, options) {
       if (cm.openDialog) {
         cm.openDialog(template, onClose, { bottom: true, value: options.value,
-            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp });
+            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
+            selectValueOnOpen: false});
       }
       else {
         onClose(prompt(shortText, ''));

From 2c6e5539977b25f42af9ae86f26165f7097acec4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 7 Mar 2015 22:54:57 +0100
Subject: [PATCH 2005/4742] [manual] Accurately reflect default value of
 specialChars option

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

diff --git a/doc/manual.html b/doc/manual.html
index ec0033f783..3bcf841a40 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -256,7 +256,7 @@ <h2>Configuration</h2>
       should be replaced by a
       special <a href="#option_specialCharPlaceholder">placeholder</a>.
       Mostly useful for non-printing special characters. The default
-      is <code>/[\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/</code>.</dd>
+      is <code>/[\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/</code>.</dd>
       <dt id="option_specialCharPlaceholder"><code><strong>specialCharPlaceholder</strong>: function(char) → Element</code></dt>
       <dd>A function that, given a special character identified by
       the <a href="#option_specialChars"><code>specialChars</code></a>

From def124276c090d85ae6bf296bdedb3a3bf9f9199 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Mar 2015 22:15:24 +0100
Subject: [PATCH 2006/4742] Add parameter to status_s.png in attempt to force
 override github's cache

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bc6e7f5c71..38156a7427 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # CodeMirror
 [![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)  
-[Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png)](https://marijnhaverbeke.nl/fund/)
+[Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?again)](https://marijnhaverbeke.nl/fund/)
 
 CodeMirror is a JavaScript component that provides a code editor in
 the browser. When a mode is available for the language you are coding

From c94b38318d5277648ed1214fccdcb17afe5d2cb1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 14 Mar 2015 10:51:49 +0100
Subject: [PATCH 2007/4742] Fix ctrl-shift-selection with multiple active
 selections

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 197c40df30..06b10ac390 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3563,6 +3563,7 @@
         ourRange = new Range(start, start);
     } else {
       ourRange = doc.sel.primary();
+      ourIndex = doc.sel.primIndex;
     }
 
     if (e.altKey) {
@@ -3594,7 +3595,7 @@
       ourIndex = ranges.length;
       setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
                    {scroll: false, origin: "*mouse"});
-    } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single") {
+    } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
       setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0));
       startSel = doc.sel;
     } else {

From 46773789f7aa31df9cfb956e696d05b900a6f554 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 14 Mar 2015 10:58:06 +0100
Subject: [PATCH 2008/4742] [release notes] Add a 5.x header

Closes #3130
---
 doc/releases.html | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/doc/releases.html b/doc/releases.html
index 49d5be43bc..3cfd68c6d2 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -14,7 +14,8 @@
     <li><a href="https://github.com/codemirror/codemirror">Code</a>
   </ul>
   <ul>
-    <li><a class=active data-default="true" href="#v4">Version 4.x</a>
+    <li><a class=active data-default="true" href="#v5">Version 5.x</a>
+    <li><a href="#v4">Version 4.x</a>
     <li><a href="#v3">Version 3.x</a>
     <li><a href="#v2">Version 2.x</a>
     <li><a href="#v1">Version 0.x</a>
@@ -25,9 +26,9 @@
 
 <h2>Release notes and version history</h2>
 
-<section id=v4 class=first>
+<section id=v5 class=first>
 
-  <h2>Version 4.x</h2>
+  <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>
 
@@ -39,6 +40,12 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.13.0...5.0.0">list of patches</a>.</li>
   </ul>
 
+</section>
+
+<section id=v4 class=first>
+
+  <h2>Version 4.x</h2>
+
   <p class="rel">20-02-2015: <a href="http://codemirror.net/codemirror-4.13.zip">Version 4.13</a>:</p>
 
   <ul class="rel-note">
@@ -1033,12 +1040,12 @@ <h2>Version 0.x</h2>
   parser. And, as usual, add workarounds for various newly discovered
   browser incompatibilities.</p>
 
-  <p class="rel"><em>31-08-2009</em>: <a href="http://codemirror.net/codemirror-0.63.zip">Version 0.63</a>:</p>
+  <p class="rel">31-08-2009: <a href="http://codemirror.net/codemirror-0.63.zip">Version 0.63</a>:</p>
   <p class="rel-note"> Overhaul of paste-handling (less fragile), fixes for several
   serious IE8 issues (cursor jumping, end-of-document bugs) and a number
   of small problems.</p>
 
-  <p class="rel"><em>30-05-2009</em>: <a href="http://codemirror.net/codemirror-0.62.zip">Version 0.62</a>:</p>
+  <p class="rel">30-05-2009: <a href="http://codemirror.net/codemirror-0.62.zip">Version 0.62</a>:</p>
   <p class="rel-note">Introduces <a href="contrib/python/index.html">Python</a>
   and <a href="contrib/lua/index.html">Lua</a> parsers. Add
   <code>setParser</code> (on-the-fly mode changing) and

From 8dbb84f44d3f4cdecde25e910277ca1816f80a24 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Fri, 13 Mar 2015 04:08:41 -0700
Subject: [PATCH 2009/4742] [sublime keymap] Add sublime-style smart backspace

---
 keymap/sublime.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 45936c3628..2b49f1ae35 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -409,6 +409,22 @@
 
   map[cK + ctrl + "Backspace"] = "delLineLeft";
 
+  cmds[map["Backspace"] = "smartBackspace"] = function(cm) {
+    if (cm.somethingSelected()) {
+      return CodeMirror.Pass;
+    }
+
+    var tabSize = cm.getOption('tabSize');
+    var cursor = cm.getCursor();
+    var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
+    var column = CodeMirror.countColumn(toStartOfLine, null, tabSize);
+
+    if (/^\s+$/.test(toStartOfLine) && column % tabSize == 0) {
+      return cm.indentSelection('subtract');
+    }
+    return CodeMirror.Pass;
+  };
+
   cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();

From 33e56fbd728ad0d0f60823f4c8ffad37520ac59e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 14 Mar 2015 11:03:34 +0100
Subject: [PATCH 2010/4742] [sublime keymap] Adjust backspace binding

Issue #3127
---
 keymap/sublime.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 2b49f1ae35..cf18573605 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -410,19 +410,16 @@
   map[cK + ctrl + "Backspace"] = "delLineLeft";
 
   cmds[map["Backspace"] = "smartBackspace"] = function(cm) {
-    if (cm.somethingSelected()) {
-      return CodeMirror.Pass;
-    }
+    if (cm.somethingSelected()) return CodeMirror.Pass;
 
-    var tabSize = cm.getOption('tabSize');
     var cursor = cm.getCursor();
     var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
-    var column = CodeMirror.countColumn(toStartOfLine, null, tabSize);
+    var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
 
-    if (/^\s+$/.test(toStartOfLine) && column % tabSize == 0) {
-      return cm.indentSelection('subtract');
-    }
-    return CodeMirror.Pass;
+    if (!/\S/.test(toStartOfLine) && column % cm.getOption("indentUnit") == 0)
+      return cm.indentSelection("subtract");
+    else
+      return CodeMirror.Pass;
   };
 
   cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {

From 30a118ac43682b7783a1f9031e4edbb3d048bba5 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Fri, 13 Mar 2015 09:01:51 +0100
Subject: [PATCH 2011/4742] [troff mode] Add

---
 doc/compress.html     |   1 +
 mode/index.html       |   1 +
 mode/meta.js          |   1 +
 mode/troff/index.html | 146 ++++++++++++++++++++++++++++++++++++++++++
 mode/troff/troff.js   |  82 ++++++++++++++++++++++++
 5 files changed, 231 insertions(+)
 create mode 100644 mode/troff/index.html
 create mode 100644 mode/troff/troff.js

diff --git a/doc/compress.html b/doc/compress.html
index 6fe3477e3f..6331835eb4 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -185,6 +185,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/tiki/tiki.js">tiki.js</option>
           <option value="http://codemirror.net/mode/toml/toml.js">toml.js</option>
           <option value="http://codemirror.net/mode/tornado/tornado.js">tornado.js</option>
+          <option value="http://codemirror.net/mode/troff/troff.js">troff.js</option>
           <option value="http://codemirror.net/mode/turtle/turtle.js">turtle.js</option>
           <option value="http://codemirror.net/mode/vb/vb.js">vb.js</option>
           <option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
diff --git a/mode/index.html b/mode/index.html
index f9b2a89d42..6ecb2cb558 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -118,6 +118,7 @@ <h2>Language modes</h2>
       <li><a href="tiki/index.html">Tiki wiki</a></li>
       <li><a href="toml/index.html">TOML</a></li>
       <li><a href="tornado/index.html">Tornado</a> (templating language)</li>
+      <li><a href="troff/index.html">troff</a> (for manpages)</li>
       <li><a href="turtle/index.html">Turtle</a></li>
       <li><a href="vb/index.html">VB.NET</a></li>
       <li><a href="vbscript/index.html">VBScript</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 6519cde4c9..2d8d9275d8 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -120,6 +120,7 @@
     {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
     {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
     {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
+    {name: "troff", mime: "troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
     {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
     {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
diff --git a/mode/troff/index.html b/mode/troff/index.html
new file mode 100644
index 0000000000..7c5a54e54f
--- /dev/null
+++ b/mode/troff/index.html
@@ -0,0 +1,146 @@
+<!doctype html>
+
+<title>CodeMirror: troff 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/edit/matchbrackets.js"></script>
+<script src=troff.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="#">troff</a>
+  </ul>
+</div>
+
+<article>
+<h2>troff</h2>
+
+
+<textarea id=code>
+'\" t
+.\"     Title: mkvextract
+.TH "MKVEXTRACT" "1" "2015\-02\-28" "MKVToolNix 7\&.7\&.0" "User Commands"
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.SH "NAME"
+mkvextract \- extract tracks from Matroska(TM) files into other files
+.SH "SYNOPSIS"
+.HP \w'\fBmkvextract\fR\ 'u
+\fBmkvextract\fR {mode} {source\-filename} [options] [extraction\-spec]
+.SH "DESCRIPTION"
+.PP
+.B mkvextract
+extracts specific parts from a
+.I Matroska(TM)
+file to other useful formats\&. The first argument,
+\fBmode\fR, tells
+\fBmkvextract\fR(1)
+what to extract\&. Currently supported is the extraction of
+tracks,
+tags,
+attachments,
+chapters,
+CUE sheets,
+timecodes
+and
+cues\&. The second argument is the name of the source file\&. It must be a
+Matroska(TM)
+file\&. All following arguments are options and extraction specifications; both of which depend on the selected mode\&.
+.SS "Common options"
+.PP
+The following options are available in all modes and only described once in this section\&.
+.PP
+\fB\-f\fR, \fB\-\-parse\-fully\fR
+.RS 4
+Sets the parse mode to \*(Aqfull\*(Aq\&. The default mode does not parse the whole file but uses the meta seek elements for locating the required elements of a source file\&. In 99% of all cases this is enough\&. But for files that do not contain meta seek elements or which are damaged the user might have to use this mode\&. A full scan of a file can take a couple of minutes while a fast scan only takes seconds\&.
+.RE
+.PP
+\fB\-\-command\-line\-charset\fR \fIcharacter\-set\fR
+.RS 4
+Sets the character set to convert strings given on the command line from\&. It defaults to the character set given by system\*(Aqs current locale\&.
+.RE
+.PP
+\fB\-\-output\-charset\fR \fIcharacter\-set\fR
+.RS 4
+Sets the character set to which strings are converted that are to be output\&. It defaults to the character set given by system\*(Aqs current locale\&.
+.RE
+.PP
+\fB\-r\fR, \fB\-\-redirect\-output\fR \fIfile\-name\fR
+.RS 4
+Writes all messages to the file
+\fIfile\-name\fR
+instead of to the console\&. While this can be done easily with output redirection there are cases in which this option is needed: when the terminal reinterprets the output before writing it to a file\&. The character set set with
+\fB\-\-output\-charset\fR
+is honored\&.
+.RE
+.PP
+\fB\-\-ui\-language\fR \fIcode\fR
+.RS 4
+Forces the translations for the language
+\fIcode\fR
+to be used (e\&.g\&. \*(Aqde_DE\*(Aq for the German translations)\&. It is preferable to use the environment variables
+\fILANG\fR,
+\fILC_MESSAGES\fR
+and
+\fILC_ALL\fR
+though\&. Entering \*(Aqlist\*(Aq as the
+\fIcode\fR
+will cause
+\fBmkvextract\fR(1)
+to output a list of available translations\&.
+
+.\" [...]
+
+.SH "SEE ALSO"
+.PP
+\fBmkvmerge\fR(1),
+\fBmkvinfo\fR(1),
+\fBmkvpropedit\fR(1),
+\fBmmg\fR(1)
+.SH "WWW"
+.PP
+The latest version can always be found at
+\m[blue]\fBthe MKVToolNix homepage\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.SH "AUTHOR"
+.PP
+\(co \fBMoritz Bunkus\fR <\&moritz@bunkus\&.org\&>
+.RS 4
+Developer
+.RE
+.SH "NOTES"
+.IP " 1." 4
+the MKVToolNix homepage
+.RS 4
+\%https://www.bunkus.org/videotools/mkvtoolnix/
+.RE
+</textarea>
+
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById('code'), {
+    mode: 'troff',
+    lineNumbers: true,
+    matchBrackets: false
+  });
+</script>
+
+<p><strong>MIME types defined:</strong> <code>troff</code>.</p>
+</article>
diff --git a/mode/troff/troff.js b/mode/troff/troff.js
new file mode 100644
index 0000000000..beca778eeb
--- /dev/null
+++ b/mode/troff/troff.js
@@ -0,0 +1,82 @@
+// 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")
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd)
+    define(["../../lib/codemirror"], mod);
+  else
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode('troff', function() {
+
+  var words = {};
+
+  function tokenBase(stream) {
+    if (stream.eatSpace()) return null;
+
+    var sol = stream.sol();
+    var ch = stream.next();
+
+    if (ch === '\\') {
+      if (stream.match('fB') || stream.match('fR') || stream.match('fI') ||
+          stream.match('u')  || stream.match('d')  ||
+          stream.match('%')  || stream.match('&')) {
+        return 'string';
+      }
+      if (stream.match('m[')) {
+        stream.skipTo(']');
+        stream.next();
+        return 'string';
+      }
+      if (stream.match('s+') || stream.match('s-')) {
+        stream.eatWhile(/[\d-]/);
+        return 'string';
+      }
+      if (stream.match('\(') || stream.match('*\(')) {
+        stream.eatWhile(/[\w-]/);
+        return 'string';
+      }
+      return 'string';
+    }
+    if (sol && (ch === '.' || ch === '\'')) {
+      if (stream.eat('\\') && stream.eat('\"')) {
+        stream.skipToEnd();
+        return 'comment';
+      }
+    }
+    if (sol && ch === '.') {
+      if (stream.match('B ') || stream.match('I ') || stream.match('R ')) {
+        return 'attribute';
+      }
+      if (stream.match('TH ') || stream.match('SH ') || stream.match('SS ') || stream.match('HP ')) {
+        stream.skipToEnd();
+        return 'quote';
+      }
+      if ((stream.match(/[A-Z]/) && stream.match(/[A-Z]/)) || (stream.match(/[a-z]/) && stream.match(/[a-z]/))) {
+        return 'attribute';
+      }
+    }
+    stream.eatWhile(/[\w-]/);
+    var cur = stream.current();
+    return words.hasOwnProperty(cur) ? words[cur] : null;
+  }
+
+  function tokenize(stream, state) {
+    return (state.tokens[0] || tokenBase) (stream, state);
+  };
+
+  return {
+    startState: function() {return {tokens:[]};},
+    token: function(stream, state) {
+      return tokenize(stream, state);
+    }
+  };
+});
+
+CodeMirror.defineMIME('troff', 'troff');
+
+});

From fd9f66c3fb1970a1cd426dbdb76343abb513fbd2 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Fri, 13 Mar 2015 08:53:11 +0100
Subject: [PATCH 2012/4742] [cmake mode] Add

---
 mode/cmake/cmake.js   |  97 +++++++++
 mode/cmake/index.html | 493 ++++++++++++++++++++++++++++++++++++++++++
 mode/index.html       |   1 +
 mode/meta.js          |   1 +
 4 files changed, 592 insertions(+)
 create mode 100644 mode/cmake/cmake.js
 create mode 100644 mode/cmake/index.html

diff --git a/mode/cmake/cmake.js b/mode/cmake/cmake.js
new file mode 100644
index 0000000000..9f9eda5417
--- /dev/null
+++ b/mode/cmake/cmake.js
@@ -0,0 +1,97 @@
+// 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")
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd)
+    define(["../../lib/codemirror"], mod);
+  else
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("cmake", function () {
+  var variable_regex = /({)?[a-zA-Z0-9_]+(})?/;
+
+  function tokenString(stream, state) {
+    var current, prev, found_var = false;
+    while (!stream.eol() && (current = stream.next()) != state.pending) {
+      if (current === '$' && prev != '\\' && state.pending == '"') {
+        found_var = true;
+        break;
+      }
+      prev = current;
+    }
+    if (found_var) {
+      stream.backUp(1);
+    }
+    if (current == state.pending) {
+      state.continueString = false;
+    } else {
+      state.continueString = true;
+    }
+    return "string";
+  }
+
+  function tokenize(stream, state) {
+    var ch = stream.next();
+
+    // Have we found a variable?
+    if (ch === '$') {
+      if (stream.match(variable_regex)) {
+        return 'variable-2';
+      }
+      return 'variable';
+    }
+    // Should we still be looking for the end of a string?
+    if (state.continueString) {
+      // If so, go through the loop again
+      stream.backUp(1);
+      return tokenString(stream, state);
+    }
+    // Do we just have a function on our hands?
+    // In 'cmake_minimum_required (VERSION 2.8.8)', 'cmake_minimum_required' is matched
+    if (stream.match(/(\s+)?\w+\(/) || stream.match(/(\s+)?\w+\ \(/)) {
+      stream.backUp(1);
+      return 'def';
+    }
+    if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    }
+    // Have we found a string?
+    if (ch == "'" || ch == '"') {
+      // Store the type (single or double)
+      state.pending = ch;
+      // Perform the looping function to find the end
+      return tokenString(stream, state);
+    }
+    if (ch == '(' || ch == ')') {
+      return 'bracket';
+    }
+    if (ch.match(/[0-9]/)) {
+      return 'number';
+    }
+    stream.eatWhile(/[\w-]/);
+    return null;
+  }
+  return {
+    startState: function () {
+      var state = {};
+      state.inDefinition = false;
+      state.inInclude = false;
+      state.continueString = false;
+      state.pending = false;
+      return state;
+    },
+    token: function (stream, state) {
+      if (stream.eatSpace()) return null;
+      return tokenize(stream, state);
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-cmake", "cmake");
+
+});
diff --git a/mode/cmake/index.html b/mode/cmake/index.html
new file mode 100644
index 0000000000..5f8b485328
--- /dev/null
+++ b/mode/cmake/index.html
@@ -0,0 +1,493 @@
+<!doctype html>
+
+<title>CodeMirror: CMake 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/edit/matchbrackets.js"></script>
+<script src="cmake.js"></script>
+<style>
+      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+      .cm-s-default span.cm-arrow { color: red; }
+    </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="#">CMake</a>
+  </ul>
+</div>
+
+<article>
+<h2>CMake mode</h2>
+<form><textarea id="code" name="code">
+# vim: syntax=cmake
+if(NOT CMAKE_BUILD_TYPE)
+    # default to Release build for GCC builds
+    set(CMAKE_BUILD_TYPE Release CACHE STRING
+        "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel."
+        FORCE)
+endif()
+message(STATUS "cmake version ${CMAKE_VERSION}")
+if(POLICY CMP0025)
+    cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
+endif()
+if(POLICY CMP0042)
+    cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
+endif()
+
+project (x265)
+cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+include(CheckSymbolExists)
+include(CheckCXXCompilerFlag)
+
+# X265_BUILD must be incremented each time the public API is changed
+set(X265_BUILD 48)
+configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
+               "${PROJECT_BINARY_DIR}/x265.def")
+configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
+               "${PROJECT_BINARY_DIR}/x265_config.h")
+
+SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+
+# System architecture detection
+string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
+set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
+    message(STATUS "Detected x86 target processor")
+    set(X86 1)
+    add_definitions(-DX265_ARCH_X86=1)
+    if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
+        set(X64 1)
+        add_definitions(-DX86_64=1)
+    endif()
+elseif(${SYSPROC} STREQUAL "armv6l")
+    message(STATUS "Detected ARM target processor")
+    set(ARM 1)
+    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
+else()
+    message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
+    message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")
+endif()
+
+if(UNIX)
+    list(APPEND PLATFORM_LIBS pthread)
+    find_library(LIBRT rt)
+    if(LIBRT)
+        list(APPEND PLATFORM_LIBS rt)
+    endif()
+    find_package(Numa)
+    if(NUMA_FOUND)
+        list(APPEND CMAKE_REQUIRED_LIBRARIES ${NUMA_LIBRARY})
+        check_symbol_exists(numa_node_of_cpu numa.h NUMA_V2)
+        if(NUMA_V2)
+            add_definitions(-DHAVE_LIBNUMA)
+            message(STATUS "libnuma found, building with support for NUMA nodes")
+            list(APPEND PLATFORM_LIBS ${NUMA_LIBRARY})
+            link_directories(${NUMA_LIBRARY_DIR})
+            include_directories(${NUMA_INCLUDE_DIR})
+        endif()
+    endif()
+    mark_as_advanced(LIBRT NUMA_FOUND)
+endif(UNIX)
+
+if(X64 AND NOT WIN32)
+    option(ENABLE_PIC "Enable Position Independent Code" ON)
+else()
+    option(ENABLE_PIC "Enable Position Independent Code" OFF)
+endif(X64 AND NOT WIN32)
+
+# Compiler detection
+if(CMAKE_GENERATOR STREQUAL "Xcode")
+  set(XCODE 1)
+endif()
+if (APPLE)
+  add_definitions(-DMACOS)
+endif()
+
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set(CLANG 1)
+endif()
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+    set(INTEL_CXX 1)
+endif()
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    set(GCC 1)
+endif()
+
+if(INTEL_CXX AND WIN32)
+    # treat icl roughly like MSVC
+    set(MSVC 1)
+endif()
+if(MSVC)
+    option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)
+    if (STATIC_LINK_CRT)
+        set(CompilerFlags CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS_RELEASE)
+        foreach(CompilerFlag ${CompilerFlags})
+            string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
+        endforeach()
+    endif (STATIC_LINK_CRT)
+    add_definitions(/W4)  # Full warnings
+    add_definitions(/Ob2) # always inline
+    add_definitions(/MP)  # multithreaded build
+
+    # disable Microsofts suggestions for proprietary secure APIs
+    add_definitions(/D_CRT_SECURE_NO_WARNINGS)
+
+    check_include_files(stdint.h HAVE_STDINT_H)
+    if(NOT HAVE_STDINT_H)
+        include_directories(compat/msvc)
+    endif()
+endif(MSVC)
+
+check_include_files(inttypes.h HAVE_INT_TYPES_H)
+if(HAVE_INT_TYPES_H)
+    add_definitions(-DHAVE_INT_TYPES_H=1)
+endif()
+
+if(INTEL_CXX AND UNIX)
+    set(GCC 1) # treat icpc roughly like gcc
+elseif(CLANG)
+    set(GCC 1) # treat clang roughly like gcc
+elseif(CMAKE_COMPILER_IS_GNUCXX)
+    set(GCC 1)
+endif()
+if(GCC)
+    add_definitions(-Wall -Wextra -Wshadow)
+    add_definitions(-D__STDC_LIMIT_MACROS=1)
+    if(ENABLE_PIC)
+         add_definitions(-fPIC)
+    endif(ENABLE_PIC)
+    if(X86 AND NOT X64)
+        add_definitions(-march=i686)
+    endif()
+    if(ARM)
+        add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
+    endif()
+    check_cxx_compiler_flag(-Wno-narrowing CC_HAS_NO_NARROWING) 
+    check_cxx_compiler_flag(-Wno-array-bounds CC_HAS_NO_ARRAY_BOUNDS) 
+    if (CC_HAS_NO_ARRAY_BOUNDS)
+        add_definitions(-Wno-array-bounds) # these are unhelpful
+    endif()
+    check_cxx_compiler_flag(-ffast-math CC_HAS_FAST_MATH) 
+    if (CC_HAS_FAST_MATH)
+        add_definitions(-ffast-math)
+    endif()
+    check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN) 
+    if (CC_HAS_STACK_REALIGN)
+        add_definitions(-mstackrealign)
+    endif()
+    # Disable exceptions. Reduce executable size, increase compability.
+    check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG)
+    if(CC_HAS_FNO_EXCEPTIONS_FLAG)
+        add_definitions(-fno-exceptions)
+    endif()
+    set(FSANITIZE "" CACHE STRING "-fsanitize options for GCC/clang")
+    if(FSANITIZE)
+        add_definitions(-fsanitize=${FSANITIZE})
+        # clang and gcc need the sanitize options to be passed at link
+        # time so the appropriate ASAN/TSAN runtime libraries can be
+        # linked.
+        list(APPEND LINKER_OPTIONS "-fsanitize=${FSANITIZE}")
+    endif()
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CC_VERSION)
+endif(GCC)
+
+find_package(Yasm)
+if(YASM_FOUND AND X86)
+    if (YASM_VERSION_STRING VERSION_LESS "1.2.0")
+        message(STATUS "Yasm version ${YASM_VERSION_STRING} is too old. 1.2.0 or later required")
+        option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" OFF)
+    else()
+        message(STATUS "Found Yasm ${YASM_VERSION_STRING} to build assembly primitives")
+        option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" ON)
+    endif()
+endif()
+
+option(CHECKED_BUILD "Enable run-time sanity checks (debugging)" OFF)
+if(CHECKED_BUILD)
+    add_definitions(-DCHECKED_BUILD=1)
+    if(GCC)
+        check_cxx_compiler_flag(-fsanitize=undefined-trap CC_HAS_CATCH_UNDEFINED) # clang
+        check_cxx_compiler_flag(-ftrapv CC_HAS_FTRAPV)                            # gcc
+        check_cxx_compiler_flag(-fstack-protector-all CC_HAS_STACK_PROTECT)       # gcc
+        if(CC_HAS_FTRAPV)
+            add_definitions(-ftrapv)
+        endif()
+        if(CC_HAS_CATCH_UNDEFINED)
+            add_definitions(-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error)
+        endif()
+        if(CC_HAS_STACK_PROTECT)
+            add_definitions(-fstack-protector-all)
+            if(MINGW)
+                list(APPEND PLATFORM_LIBS ssp)
+            endif()
+        endif()
+    endif(GCC)
+endif()
+
+# Build options
+set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries")
+set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")
+
+if(X64)
+    # NOTE: We only officially support 16bit-per-pixel compiles of x265
+    # on 64bit architectures. 16bpp plus large resolution plus slow
+    # preset plus 32bit address space usually means malloc failure.  You
+    # can disable this if(X64) check if you desparately need a 32bit
+    # build with 10bit/12bit support, but this violates the "shrink wrap
+    # license" so to speak.  If it breaks you get to keep both halves.
+    # You will likely need to compile without assembly
+    option(HIGH_BIT_DEPTH "Store pixels as 16bit values" OFF)
+endif(X64)
+if(HIGH_BIT_DEPTH)
+    add_definitions(-DHIGH_BIT_DEPTH=1)
+else(HIGH_BIT_DEPTH)
+    add_definitions(-DHIGH_BIT_DEPTH=0)
+endif(HIGH_BIT_DEPTH)
+
+option(WARNINGS_AS_ERRORS "Stop compiles on first warning" OFF)
+if(WARNINGS_AS_ERRORS)
+    if(GCC)
+        add_definitions(-Werror)
+    elseif(MSVC)
+        add_definitions(/WX)
+    endif()
+endif(WARNINGS_AS_ERRORS)
+
+if (WIN32)
+    # Visual leak detector
+    find_package(VLD QUIET)
+    if(VLD_FOUND)
+        add_definitions(-DHAVE_VLD)
+        include_directories(${VLD_INCLUDE_DIRS})
+        list(APPEND PLATFORM_LIBS ${VLD_LIBRARIES})
+        link_directories(${VLD_LIBRARY_DIRS})
+    endif()
+    option(WINXP_SUPPORT "Make binaries compatible with Windows XP" OFF)
+    if(WINXP_SUPPORT)
+        # force use of workarounds for CONDITION_VARIABLE and atomic
+        # intrinsics introduced after XP
+        add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WINXP)
+    endif()
+endif()
+
+include(version) # determine X265_VERSION and X265_LATEST_TAG
+include_directories(. common encoder "${PROJECT_BINARY_DIR}")
+
+option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)
+if(ENABLE_PPA)
+    add_definitions(-DENABLE_PPA)
+    list(APPEND PLATFORM_LIBS PPA)
+    if(UNIX)
+        list(APPEND PLATFORM_LIBS dl)
+    endif(UNIX)
+    add_subdirectory(profile/PPA)
+endif(ENABLE_PPA)
+
+option(ENABLE_VTUNE "Enable Vtune profiling instrumentation" OFF)
+if(ENABLE_VTUNE)
+    add_definitions(-DENABLE_VTUNE)
+    include_directories($ENV{VTUNE_AMPLIFIER_XE_2015_DIR}/include)
+    list(APPEND PLATFORM_LIBS vtune)
+    link_directories($ENV{VTUNE_AMPLIFIER_XE_2015_DIR}/lib64)
+    if(WIN32)
+        list(APPEND PLATFORM_LIBS libittnotify.lib)
+    else()
+        list(APPEND PLATFORM_LIBS libittnotify.a dl)
+    endif()
+    add_subdirectory(profile/vtune)
+endif(ENABLE_VTUNE)
+
+option(DETAILED_CU_STATS "Enable internal profiling of encoder work" OFF)
+if(DETAILED_CU_STATS)
+    add_definitions(-DDETAILED_CU_STATS)
+endif(DETAILED_CU_STATS)
+
+add_subdirectory(encoder)
+add_subdirectory(common)
+
+if((MSVC_IDE OR XCODE) AND ENABLE_ASSEMBLY)
+    # this is required because of this cmake bug
+    # http://www.cmake.org/Bug/print_bug_page.php?bug_id=8170
+    if(WIN32)
+        set(SUFFIX obj)
+    else()
+        set(SUFFIX o)
+    endif()
+    foreach(ASM ${MSVC_ASMS})
+        set(YASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/x86/${ASM})
+        list(APPEND YASM_SRCS ${YASM_SRC})
+        list(APPEND YASM_OBJS ${ASM}.${SUFFIX})
+        add_custom_command(
+            OUTPUT ${ASM}.${SUFFIX}
+            COMMAND ${YASM_EXECUTABLE} ARGS ${YASM_FLAGS} ${YASM_SRC} -o ${ASM}.${SUFFIX}
+            DEPENDS ${YASM_SRC})
+    endforeach()
+endif()
+
+source_group(ASM FILES ${YASM_SRCS})
+add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})
+if(NOT MSVC)
+    set_target_properties(x265-static PROPERTIES OUTPUT_NAME x265)
+endif()
+install(TARGETS x265-static
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+    ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
+install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
+
+if(CMAKE_RC_COMPILER)
+    # The resource compiler does not need CFLAGS or macro defines. It
+    # often breaks them
+    string(REPLACE "<FLAGS>" "" CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILE_OBJECT}")
+    string(REPLACE "<DEFINES>" "" CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILE_OBJECT}")
+
+    # convert X265_LATEST_TAG (ex: 0.7) and X265_TAG_DISTANCE (ex: 103) to
+    # @X265_VERSION_MAJOR@,@X265_VERSION_MINOR@,@X265_BRANCH_ID@,@X265_TAG_DISTANCE@
+    string(REPLACE "." ";" VERSION_LIST "${X265_LATEST_TAG}")
+    list(GET VERSION_LIST 0 X265_VERSION_MAJOR)
+    list(GET VERSION_LIST 1 X265_VERSION_MINOR)
+    set(X265_BRANCH_ID 0) # TODO: 0 - stable, 1 - default or other
+    set(X265_RC_FILE "${CMAKE_CURRENT_BINARY_DIR}/x265.rc")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/x265.rc.in" "${X265_RC_FILE}" @ONLY)
+endif()
+
+if(NOT (MSVC_IDE OR XCODE))
+    add_custom_target(clean-generated COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/clean-generated.cmake)
+endif()
+
+option(ENABLE_SHARED "Build shared library" ON)
+if(ENABLE_SHARED)
+    add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${YASM_OBJS}
+                ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)
+    target_link_libraries(x265-shared ${PLATFORM_LIBS})
+    if(MSVC)
+        set_target_properties(x265-shared PROPERTIES OUTPUT_NAME libx265)
+    else()
+        set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
+    endif()
+    if(UNIX)
+        set_target_properties(x265-shared PROPERTIES VERSION ${X265_BUILD})
+        if(APPLE)
+            set_target_properties(x265-shared PROPERTIES MACOSX_RPATH 1)
+        else()
+            set_target_properties(x265-shared PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,-znoexecstack")
+        endif()
+    endif()
+    set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})
+    if(X265_LATEST_TAG)
+        if(WINDOWS)
+            set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG})
+        endif()
+        # shared library is not installed if a tag is not found
+        install(TARGETS x265-shared
+                LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+                ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                RUNTIME DESTINATION ${BIN_INSTALL_DIR})
+    endif()
+    if(LINKER_OPTIONS)
+        set_target_properties(x265-shared PROPERTIES LINK_FLAGS ${LINKER_OPTIONS})
+    endif()
+endif()
+
+if(X265_LATEST_TAG)
+    # convert lists of link libraries into -lstdc++ -lm etc..
+    foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
+        if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
+            list(APPEND PLIBLIST "${LIB}")
+        else()
+            list(APPEND PLIBLIST "-l${LIB}")
+        endif()
+    endforeach()
+    if(PLIBLIST)
+        # blacklist of libraries that should not be in Libs.private
+        list(REMOVE_ITEM PLIBLIST "-lc" "-lpthread")
+        string(REPLACE ";" " " PRIVATE_LIBS "${PLIBLIST}")
+    else()
+        set(PRIVATE_LIBS "")
+    endif(PLIBLIST)
+
+    # Produce a pkg-config file
+    configure_file("x265.pc.in" "x265.pc" @ONLY)
+    install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/x265.pc"
+            DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
+endif()
+
+if(NOT WIN32)
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+                   "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
+                   IMMEDIATE @ONLY)
+    add_custom_target(uninstall
+                      "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake")
+endif()
+
+# Main CLI application
+option(ENABLE_CLI "Build standalone CLI application" ON)
+if(ENABLE_CLI)
+    file(GLOB InputFiles input/*.cpp input/*.h)
+    file(GLOB OutputFiles output/*.cpp output/*.h)
+    file(GLOB FilterFiles filters/*.cpp filters/*.h)
+    source_group(input FILES ${InputFiles})
+    source_group(output FILES ${OutputFiles})
+    source_group(filters FILES ${FilterFiles})
+
+    check_include_files(getopt.h HAVE_GETOPT_H)
+    if(NOT HAVE_GETOPT_H)
+        if(MSVC)
+            set_source_files_properties(compat/getopt/getopt.c PROPERTIES COMPILE_FLAGS "/wd4100 /wd4131 -DHAVE_STRING_H=1")
+        endif(MSVC)
+        include_directories(compat/getopt)
+        set(GETOPT compat/getopt/getopt.c compat/getopt/getopt.h)
+    endif(NOT HAVE_GETOPT_H)
+
+    if(XCODE)
+        # Xcode seems unable to link the CLI with libs, so link as one targget
+        add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${FilterFiles} ${GETOPT} x265.cpp x265.h x265cli.h
+                           $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})
+    else()
+        add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${FilterFiles} ${GETOPT} ${X265_RC_FILE} x265.cpp x265.h x265cli.h)
+        if(WIN32 OR NOT ENABLE_SHARED OR INTEL_CXX)
+            # The CLI cannot link to the shared library on Windows, it
+            # requires internal APIs not exported from the DLL
+            target_link_libraries(cli x265-static ${PLATFORM_LIBS})
+        else()
+            target_link_libraries(cli x265-shared ${PLATFORM_LIBS})
+        endif()
+    endif()
+    set_target_properties(cli PROPERTIES OUTPUT_NAME x265)
+    if(LINKER_OPTIONS)
+        set_target_properties(cli PROPERTIES LINK_FLAGS ${LINKER_OPTIONS})
+    endif()
+
+    install(TARGETS cli DESTINATION ${BIN_INSTALL_DIR})
+endif(ENABLE_CLI)
+
+if(ENABLE_ASSEMBLY AND NOT XCODE)
+    option(ENABLE_TESTS "Enable Unit Tests" OFF)
+    if(ENABLE_TESTS)
+        add_subdirectory(test)
+    endif()
+endif()
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: "text/x-cmake",
+        matchBrackets: true,
+        indentUnit: 4
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-cmake</code>.</p>
+
+  </article>
diff --git a/mode/index.html b/mode/index.html
index 6ecb2cb558..7b62a33cf2 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -34,6 +34,7 @@ <h2>Language modes</h2>
       <li><a href="asterisk/index.html">Asterisk dialplan</a></li>
       <li><a href="clike/index.html">C, C++, C#</a></li>
       <li><a href="clojure/index.html">Clojure</a></li>
+      <li><a href="cmake/index.html">CMake</a></li>
       <li><a href="cobol/index.html">COBOL</a></li>
       <li><a href="coffeescript/index.html">CoffeeScript</a></li>
       <li><a href="commonlisp/index.html">Common Lisp</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 2d8d9275d8..d138809179 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -20,6 +20,7 @@
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
+    {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
     {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
     {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
     {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},

From 03a49e971fb5b5b36867c05131475b264d8d2c85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 14 Mar 2015 11:11:47 +0100
Subject: [PATCH 2013/4742] [cmake mode] Cut size of example code

Issue #3125
---
 doc/compress.html     |   1 +
 mode/cmake/index.html | 364 ------------------------------------------
 2 files changed, 1 insertion(+), 364 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 6331835eb4..b3ef59af3b 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -106,6 +106,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/asciiarmor/asciiarmor.js">asciiarmor.js</option>
           <option value="http://codemirror.net/mode/clike/clike.js">clike.js</option>
           <option value="http://codemirror.net/mode/clojure/clojure.js">clojure.js</option>
+          <option value="http://codemirror.net/mode/cmake/cmake.js">cmake.js</option>
           <option value="http://codemirror.net/mode/cobol/cobol.js">cobol.js</option>
           <option value="http://codemirror.net/mode/coffeescript/coffeescript.js">coffeescript.js</option>
           <option value="http://codemirror.net/mode/commonlisp/commonlisp.js">commonlisp.js</option>
diff --git a/mode/cmake/index.html b/mode/cmake/index.html
index 5f8b485328..ed114fece5 100644
--- a/mode/cmake/index.html
+++ b/mode/cmake/index.html
@@ -115,370 +115,6 @@ <h2>CMake mode</h2>
 if (APPLE)
   add_definitions(-DMACOS)
 endif()
-
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    set(CLANG 1)
-endif()
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-    set(INTEL_CXX 1)
-endif()
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    set(GCC 1)
-endif()
-
-if(INTEL_CXX AND WIN32)
-    # treat icl roughly like MSVC
-    set(MSVC 1)
-endif()
-if(MSVC)
-    option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)
-    if (STATIC_LINK_CRT)
-        set(CompilerFlags CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS_RELEASE)
-        foreach(CompilerFlag ${CompilerFlags})
-            string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
-        endforeach()
-    endif (STATIC_LINK_CRT)
-    add_definitions(/W4)  # Full warnings
-    add_definitions(/Ob2) # always inline
-    add_definitions(/MP)  # multithreaded build
-
-    # disable Microsofts suggestions for proprietary secure APIs
-    add_definitions(/D_CRT_SECURE_NO_WARNINGS)
-
-    check_include_files(stdint.h HAVE_STDINT_H)
-    if(NOT HAVE_STDINT_H)
-        include_directories(compat/msvc)
-    endif()
-endif(MSVC)
-
-check_include_files(inttypes.h HAVE_INT_TYPES_H)
-if(HAVE_INT_TYPES_H)
-    add_definitions(-DHAVE_INT_TYPES_H=1)
-endif()
-
-if(INTEL_CXX AND UNIX)
-    set(GCC 1) # treat icpc roughly like gcc
-elseif(CLANG)
-    set(GCC 1) # treat clang roughly like gcc
-elseif(CMAKE_COMPILER_IS_GNUCXX)
-    set(GCC 1)
-endif()
-if(GCC)
-    add_definitions(-Wall -Wextra -Wshadow)
-    add_definitions(-D__STDC_LIMIT_MACROS=1)
-    if(ENABLE_PIC)
-         add_definitions(-fPIC)
-    endif(ENABLE_PIC)
-    if(X86 AND NOT X64)
-        add_definitions(-march=i686)
-    endif()
-    if(ARM)
-        add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
-    endif()
-    check_cxx_compiler_flag(-Wno-narrowing CC_HAS_NO_NARROWING) 
-    check_cxx_compiler_flag(-Wno-array-bounds CC_HAS_NO_ARRAY_BOUNDS) 
-    if (CC_HAS_NO_ARRAY_BOUNDS)
-        add_definitions(-Wno-array-bounds) # these are unhelpful
-    endif()
-    check_cxx_compiler_flag(-ffast-math CC_HAS_FAST_MATH) 
-    if (CC_HAS_FAST_MATH)
-        add_definitions(-ffast-math)
-    endif()
-    check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN) 
-    if (CC_HAS_STACK_REALIGN)
-        add_definitions(-mstackrealign)
-    endif()
-    # Disable exceptions. Reduce executable size, increase compability.
-    check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG)
-    if(CC_HAS_FNO_EXCEPTIONS_FLAG)
-        add_definitions(-fno-exceptions)
-    endif()
-    set(FSANITIZE "" CACHE STRING "-fsanitize options for GCC/clang")
-    if(FSANITIZE)
-        add_definitions(-fsanitize=${FSANITIZE})
-        # clang and gcc need the sanitize options to be passed at link
-        # time so the appropriate ASAN/TSAN runtime libraries can be
-        # linked.
-        list(APPEND LINKER_OPTIONS "-fsanitize=${FSANITIZE}")
-    endif()
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CC_VERSION)
-endif(GCC)
-
-find_package(Yasm)
-if(YASM_FOUND AND X86)
-    if (YASM_VERSION_STRING VERSION_LESS "1.2.0")
-        message(STATUS "Yasm version ${YASM_VERSION_STRING} is too old. 1.2.0 or later required")
-        option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" OFF)
-    else()
-        message(STATUS "Found Yasm ${YASM_VERSION_STRING} to build assembly primitives")
-        option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" ON)
-    endif()
-endif()
-
-option(CHECKED_BUILD "Enable run-time sanity checks (debugging)" OFF)
-if(CHECKED_BUILD)
-    add_definitions(-DCHECKED_BUILD=1)
-    if(GCC)
-        check_cxx_compiler_flag(-fsanitize=undefined-trap CC_HAS_CATCH_UNDEFINED) # clang
-        check_cxx_compiler_flag(-ftrapv CC_HAS_FTRAPV)                            # gcc
-        check_cxx_compiler_flag(-fstack-protector-all CC_HAS_STACK_PROTECT)       # gcc
-        if(CC_HAS_FTRAPV)
-            add_definitions(-ftrapv)
-        endif()
-        if(CC_HAS_CATCH_UNDEFINED)
-            add_definitions(-fsanitize=undefined-trap -fsanitize-undefined-trap-on-error)
-        endif()
-        if(CC_HAS_STACK_PROTECT)
-            add_definitions(-fstack-protector-all)
-            if(MINGW)
-                list(APPEND PLATFORM_LIBS ssp)
-            endif()
-        endif()
-    endif(GCC)
-endif()
-
-# Build options
-set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries")
-set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")
-
-if(X64)
-    # NOTE: We only officially support 16bit-per-pixel compiles of x265
-    # on 64bit architectures. 16bpp plus large resolution plus slow
-    # preset plus 32bit address space usually means malloc failure.  You
-    # can disable this if(X64) check if you desparately need a 32bit
-    # build with 10bit/12bit support, but this violates the "shrink wrap
-    # license" so to speak.  If it breaks you get to keep both halves.
-    # You will likely need to compile without assembly
-    option(HIGH_BIT_DEPTH "Store pixels as 16bit values" OFF)
-endif(X64)
-if(HIGH_BIT_DEPTH)
-    add_definitions(-DHIGH_BIT_DEPTH=1)
-else(HIGH_BIT_DEPTH)
-    add_definitions(-DHIGH_BIT_DEPTH=0)
-endif(HIGH_BIT_DEPTH)
-
-option(WARNINGS_AS_ERRORS "Stop compiles on first warning" OFF)
-if(WARNINGS_AS_ERRORS)
-    if(GCC)
-        add_definitions(-Werror)
-    elseif(MSVC)
-        add_definitions(/WX)
-    endif()
-endif(WARNINGS_AS_ERRORS)
-
-if (WIN32)
-    # Visual leak detector
-    find_package(VLD QUIET)
-    if(VLD_FOUND)
-        add_definitions(-DHAVE_VLD)
-        include_directories(${VLD_INCLUDE_DIRS})
-        list(APPEND PLATFORM_LIBS ${VLD_LIBRARIES})
-        link_directories(${VLD_LIBRARY_DIRS})
-    endif()
-    option(WINXP_SUPPORT "Make binaries compatible with Windows XP" OFF)
-    if(WINXP_SUPPORT)
-        # force use of workarounds for CONDITION_VARIABLE and atomic
-        # intrinsics introduced after XP
-        add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WINXP)
-    endif()
-endif()
-
-include(version) # determine X265_VERSION and X265_LATEST_TAG
-include_directories(. common encoder "${PROJECT_BINARY_DIR}")
-
-option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)
-if(ENABLE_PPA)
-    add_definitions(-DENABLE_PPA)
-    list(APPEND PLATFORM_LIBS PPA)
-    if(UNIX)
-        list(APPEND PLATFORM_LIBS dl)
-    endif(UNIX)
-    add_subdirectory(profile/PPA)
-endif(ENABLE_PPA)
-
-option(ENABLE_VTUNE "Enable Vtune profiling instrumentation" OFF)
-if(ENABLE_VTUNE)
-    add_definitions(-DENABLE_VTUNE)
-    include_directories($ENV{VTUNE_AMPLIFIER_XE_2015_DIR}/include)
-    list(APPEND PLATFORM_LIBS vtune)
-    link_directories($ENV{VTUNE_AMPLIFIER_XE_2015_DIR}/lib64)
-    if(WIN32)
-        list(APPEND PLATFORM_LIBS libittnotify.lib)
-    else()
-        list(APPEND PLATFORM_LIBS libittnotify.a dl)
-    endif()
-    add_subdirectory(profile/vtune)
-endif(ENABLE_VTUNE)
-
-option(DETAILED_CU_STATS "Enable internal profiling of encoder work" OFF)
-if(DETAILED_CU_STATS)
-    add_definitions(-DDETAILED_CU_STATS)
-endif(DETAILED_CU_STATS)
-
-add_subdirectory(encoder)
-add_subdirectory(common)
-
-if((MSVC_IDE OR XCODE) AND ENABLE_ASSEMBLY)
-    # this is required because of this cmake bug
-    # http://www.cmake.org/Bug/print_bug_page.php?bug_id=8170
-    if(WIN32)
-        set(SUFFIX obj)
-    else()
-        set(SUFFIX o)
-    endif()
-    foreach(ASM ${MSVC_ASMS})
-        set(YASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/x86/${ASM})
-        list(APPEND YASM_SRCS ${YASM_SRC})
-        list(APPEND YASM_OBJS ${ASM}.${SUFFIX})
-        add_custom_command(
-            OUTPUT ${ASM}.${SUFFIX}
-            COMMAND ${YASM_EXECUTABLE} ARGS ${YASM_FLAGS} ${YASM_SRC} -o ${ASM}.${SUFFIX}
-            DEPENDS ${YASM_SRC})
-    endforeach()
-endif()
-
-source_group(ASM FILES ${YASM_SRCS})
-add_library(x265-static STATIC $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})
-if(NOT MSVC)
-    set_target_properties(x265-static PROPERTIES OUTPUT_NAME x265)
-endif()
-install(TARGETS x265-static
-    LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-    ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
-install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
-
-if(CMAKE_RC_COMPILER)
-    # The resource compiler does not need CFLAGS or macro defines. It
-    # often breaks them
-    string(REPLACE "<FLAGS>" "" CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILE_OBJECT}")
-    string(REPLACE "<DEFINES>" "" CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILE_OBJECT}")
-
-    # convert X265_LATEST_TAG (ex: 0.7) and X265_TAG_DISTANCE (ex: 103) to
-    # @X265_VERSION_MAJOR@,@X265_VERSION_MINOR@,@X265_BRANCH_ID@,@X265_TAG_DISTANCE@
-    string(REPLACE "." ";" VERSION_LIST "${X265_LATEST_TAG}")
-    list(GET VERSION_LIST 0 X265_VERSION_MAJOR)
-    list(GET VERSION_LIST 1 X265_VERSION_MINOR)
-    set(X265_BRANCH_ID 0) # TODO: 0 - stable, 1 - default or other
-    set(X265_RC_FILE "${CMAKE_CURRENT_BINARY_DIR}/x265.rc")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/x265.rc.in" "${X265_RC_FILE}" @ONLY)
-endif()
-
-if(NOT (MSVC_IDE OR XCODE))
-    add_custom_target(clean-generated COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/clean-generated.cmake)
-endif()
-
-option(ENABLE_SHARED "Build shared library" ON)
-if(ENABLE_SHARED)
-    add_library(x265-shared SHARED "${PROJECT_BINARY_DIR}/x265.def" ${YASM_OBJS}
-                ${X265_RC_FILE} $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common>)
-    target_link_libraries(x265-shared ${PLATFORM_LIBS})
-    if(MSVC)
-        set_target_properties(x265-shared PROPERTIES OUTPUT_NAME libx265)
-    else()
-        set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
-    endif()
-    if(UNIX)
-        set_target_properties(x265-shared PROPERTIES VERSION ${X265_BUILD})
-        if(APPLE)
-            set_target_properties(x265-shared PROPERTIES MACOSX_RPATH 1)
-        else()
-            set_target_properties(x265-shared PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,-znoexecstack")
-        endif()
-    endif()
-    set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})
-    if(X265_LATEST_TAG)
-        if(WINDOWS)
-            set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG})
-        endif()
-        # shared library is not installed if a tag is not found
-        install(TARGETS x265-shared
-                LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-                RUNTIME DESTINATION ${BIN_INSTALL_DIR})
-    endif()
-    if(LINKER_OPTIONS)
-        set_target_properties(x265-shared PROPERTIES LINK_FLAGS ${LINKER_OPTIONS})
-    endif()
-endif()
-
-if(X265_LATEST_TAG)
-    # convert lists of link libraries into -lstdc++ -lm etc..
-    foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
-        if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB})
-            list(APPEND PLIBLIST "${LIB}")
-        else()
-            list(APPEND PLIBLIST "-l${LIB}")
-        endif()
-    endforeach()
-    if(PLIBLIST)
-        # blacklist of libraries that should not be in Libs.private
-        list(REMOVE_ITEM PLIBLIST "-lc" "-lpthread")
-        string(REPLACE ";" " " PRIVATE_LIBS "${PLIBLIST}")
-    else()
-        set(PRIVATE_LIBS "")
-    endif(PLIBLIST)
-
-    # Produce a pkg-config file
-    configure_file("x265.pc.in" "x265.pc" @ONLY)
-    install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/x265.pc"
-            DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
-endif()
-
-if(NOT WIN32)
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-                   "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
-                   IMMEDIATE @ONLY)
-    add_custom_target(uninstall
-                      "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake")
-endif()
-
-# Main CLI application
-option(ENABLE_CLI "Build standalone CLI application" ON)
-if(ENABLE_CLI)
-    file(GLOB InputFiles input/*.cpp input/*.h)
-    file(GLOB OutputFiles output/*.cpp output/*.h)
-    file(GLOB FilterFiles filters/*.cpp filters/*.h)
-    source_group(input FILES ${InputFiles})
-    source_group(output FILES ${OutputFiles})
-    source_group(filters FILES ${FilterFiles})
-
-    check_include_files(getopt.h HAVE_GETOPT_H)
-    if(NOT HAVE_GETOPT_H)
-        if(MSVC)
-            set_source_files_properties(compat/getopt/getopt.c PROPERTIES COMPILE_FLAGS "/wd4100 /wd4131 -DHAVE_STRING_H=1")
-        endif(MSVC)
-        include_directories(compat/getopt)
-        set(GETOPT compat/getopt/getopt.c compat/getopt/getopt.h)
-    endif(NOT HAVE_GETOPT_H)
-
-    if(XCODE)
-        # Xcode seems unable to link the CLI with libs, so link as one targget
-        add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${FilterFiles} ${GETOPT} x265.cpp x265.h x265cli.h
-                           $<TARGET_OBJECTS:encoder> $<TARGET_OBJECTS:common> ${YASM_OBJS} ${YASM_SRCS})
-    else()
-        add_executable(cli ../COPYING ${InputFiles} ${OutputFiles} ${FilterFiles} ${GETOPT} ${X265_RC_FILE} x265.cpp x265.h x265cli.h)
-        if(WIN32 OR NOT ENABLE_SHARED OR INTEL_CXX)
-            # The CLI cannot link to the shared library on Windows, it
-            # requires internal APIs not exported from the DLL
-            target_link_libraries(cli x265-static ${PLATFORM_LIBS})
-        else()
-            target_link_libraries(cli x265-shared ${PLATFORM_LIBS})
-        endif()
-    endif()
-    set_target_properties(cli PROPERTIES OUTPUT_NAME x265)
-    if(LINKER_OPTIONS)
-        set_target_properties(cli PROPERTIES LINK_FLAGS ${LINKER_OPTIONS})
-    endif()
-
-    install(TARGETS cli DESTINATION ${BIN_INSTALL_DIR})
-endif(ENABLE_CLI)
-
-if(ENABLE_ASSEMBLY AND NOT XCODE)
-    option(ENABLE_TESTS "Enable Unit Tests" OFF)
-    if(ENABLE_TESTS)
-        add_subdirectory(test)
-    endif()
-endif()
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {

From 31b9f1b37e182adfa1466829e563bdfc25d66f59 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 14 Mar 2015 11:27:19 +0100
Subject: [PATCH 2014/4742] Move addLineWidget to Document

Issue #2573
---
 lib/codemirror.js | 48 ++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 06b10ac390..c297fe5d36 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4924,12 +4924,6 @@
       });
     }),
 
-    addLineWidget: methodOp(function(handle, node, options) {
-      return addLineWidget(this, handle, node, options);
-    }),
-
-    removeLineWidget: function(widget) { widget.clear(); },
-
     lineInfo: function(line) {
       if (typeof line == "number") {
         if (!isLine(this.doc, line)) return null;
@@ -6449,10 +6443,10 @@
 
   // Line widgets are block elements displayed above or below a line.
 
-  var LineWidget = CodeMirror.LineWidget = function(cm, node, options) {
+  var LineWidget = CodeMirror.LineWidget = function(doc, node, options) {
     if (options) for (var opt in options) if (options.hasOwnProperty(opt))
       this[opt] = options[opt];
-    this.cm = cm;
+    this.doc = doc;
     this.node = node;
   };
   eventMixin(LineWidget);
@@ -6463,52 +6457,55 @@
   }
 
   LineWidget.prototype.clear = function() {
-    var cm = this.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
+    var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
     if (no == null || !ws) return;
     for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
     if (!ws.length) line.widgets = null;
     var height = widgetHeight(this);
-    runInOp(cm, function() {
+    updateLineHeight(line, Math.max(0, line.height - height));
+    if (cm) runInOp(cm, function() {
       adjustScrollWhenAboveVisible(cm, line, -height);
       regLineChange(cm, no, "widget");
-      updateLineHeight(line, Math.max(0, line.height - height));
     });
   };
   LineWidget.prototype.changed = function() {
-    var oldH = this.height, cm = this.cm, line = this.line;
+    var oldH = this.height, cm = this.doc.cm, line = this.line;
     this.height = null;
     var diff = widgetHeight(this) - oldH;
     if (!diff) return;
-    runInOp(cm, function() {
+    updateLineHeight(line, line.height + diff);
+    if (cm) runInOp(cm, function() {
       cm.curOp.forceUpdate = true;
       adjustScrollWhenAboveVisible(cm, line, diff);
-      updateLineHeight(line, line.height + diff);
     });
   };
 
   function widgetHeight(widget) {
     if (widget.height != null) return widget.height;
+    var cm = widget.doc.cm;
+    if (!cm) return 0;
     if (!contains(document.body, widget.node)) {
       var parentStyle = "position: relative;";
       if (widget.coverGutter)
-        parentStyle += "margin-left: -" + widget.cm.display.gutters.offsetWidth + "px;";
+        parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;";
       if (widget.noHScroll)
-        parentStyle += "width: " + widget.cm.display.wrapper.clientWidth + "px;";
-      removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, parentStyle));
+        parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
+      removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
     }
     return widget.height = widget.node.offsetHeight;
   }
 
-  function addLineWidget(cm, handle, node, options) {
-    var widget = new LineWidget(cm, node, options);
-    if (widget.noHScroll) cm.display.alignWidgets = true;
-    changeLine(cm.doc, handle, "widget", function(line) {
+  function addLineWidget(doc, handle, node, options) {
+    var widget = new LineWidget(doc, node, options);
+    var cm = doc.cm;
+    if (cm && widget.noHScroll) cm.display.alignWidgets = true;
+    changeLine(doc, handle, "widget", function(line) {
       var widgets = line.widgets || (line.widgets = []);
       if (widget.insertAt == null) widgets.push(widget);
       else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
       widget.line = line;
-      if (!lineIsHidden(cm.doc, line)) {
-        var aboveVisible = heightAtLine(line) < cm.doc.scrollTop;
+      if (cm && !lineIsHidden(doc, line)) {
+        var aboveVisible = heightAtLine(line) < doc.scrollTop;
         updateLineHeight(line, line.height + widgetHeight(widget));
         if (aboveVisible) addToScrollPos(cm, null, widget.height);
         cm.curOp.forceUpdate = true;
@@ -7382,6 +7379,11 @@
       });
     }),
 
+    addLineWidget: docMethodOp(function(handle, node, options) {
+      return addLineWidget(this, handle, node, options);
+    }),
+    removeLineWidget: function(widget) { widget.clear(); },
+
     markText: function(from, to, options) {
       return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
     },

From 7f64e0f2791ec52608d284a270dd53e912ffb358 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 14 Mar 2015 22:29:51 +0100
Subject: [PATCH 2015/4742] Update manual about addLineWidget being applicable
 to document objects

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

diff --git a/doc/manual.html b/doc/manual.html
index 3bcf841a40..1299be17b4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1691,7 +1691,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       widget again, simply use DOM methods (move it somewhere else, or
       call <code>removeChild</code> on its parent).</dd>
 
-      <dt id="addLineWidget"><code><strong>cm.addLineWidget</strong>(line: integer|LineHandle, node: Element, ?options: object) → LineWidget</code></dt>
+      <dt id="addLineWidget"><code><strong>doc.addLineWidget</strong>(line: integer|LineHandle, node: Element, ?options: object) → LineWidget</code></dt>
       <dd>Adds a line widget, an element shown below a line, spanning
       the whole of the editor's width, and moving the lines below it
       downwards. <code>line</code> should be either an integer or a

From 5d8347de1a6f137bf5d54659eaa2b8b6ac6b3d79 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 18 Mar 2015 10:24:10 +0100
Subject: [PATCH 2016/4742] Don't fire focus/blur when context menu is opened

Issue #3132
---
 lib/codemirror.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c297fe5d36..58fc942888 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -82,7 +82,9 @@
       keyMaps: [],  // stores maps added by addKeyMap
       overlays: [], // highlighting overlays, as added by addOverlay
       modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
-      overwrite: false, focused: false,
+      overwrite: false,
+      delayingBlurEvent: false,
+      focused: false,
       suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
       pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
       draggingText: false,
@@ -3491,6 +3493,7 @@
       break;
     case 3:
       if (captureRightClick) onContextMenu(cm, e);
+      else delayBlurEvent(cm);
       break;
     }
   }
@@ -4068,7 +4071,19 @@
 
   // FOCUS/BLUR EVENTS
 
+  function delayBlurEvent(cm) {
+    cm.state.delayingBlurEvent = true;
+    setTimeout(function() {
+      if (cm.state.delayingBlurEvent) {
+        cm.state.delayingBlurEvent = false;
+        onBlur(cm);
+      }
+    }, 100);
+  }
+
   function onFocus(cm) {
+    if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
+
     if (cm.options.readOnly == "nocursor") return;
     if (!cm.state.focused) {
       signal(cm, "focus", cm);
@@ -4086,6 +4101,8 @@
     restartBlink(cm);
   }
   function onBlur(cm) {
+    if (cm.state.delayingBlurEvent) return;
+
     if (cm.state.focused) {
       signal(cm, "blur", cm);
       cm.state.focused = false;

From 493d3cc2c428373ecbd151773fc17050b1ffd11a Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Sun, 15 Mar 2015 17:27:47 +0100
Subject: [PATCH 2017/4742] [scss mode] Allow interpolation inside braces

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 34355aaa99..bed1517e8c 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -239,6 +239,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     if (type == "{" || type == "}") return popAndPass(type, stream, state);
     if (type == ")") return popContext(state);
     if (type == "(") return pushContext(state, stream, "parens");
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
     if (type == "word") wordAsValue(stream);
     return "parens";
   };

From 658de3f9c3c52351059c8fbbbeaaa76be792246f Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Sun, 15 Mar 2015 21:22:10 +0100
Subject: [PATCH 2018/4742] [css mode] Add two left-out braces on the demo
 pages

---
 mode/css/less.html | 2 +-
 mode/css/scss.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/css/less.html b/mode/css/less.html
index 6ccb721e63..adf7427d30 100644
--- a/mode/css/less.html
+++ b/mode/css/less.html
@@ -146,7 +146,7 @@ <h2>LESS mode</h2>
       });
     </script>
 
-    <p>The LESS mode is a sub-mode of the <a href="index.html">CSS mode</a> (defined in <code>css.js</code>.</p>
+    <p>The LESS mode is a sub-mode of the <a href="index.html">CSS mode</a> (defined in <code>css.js</code>).</p>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#less_*">normal</a>,  <a href="../../test/index.html#verbose,less_*">verbose</a>.</p>
   </article>
diff --git a/mode/css/scss.html b/mode/css/scss.html
index 21f20e0d16..f8e4d37368 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -150,7 +150,7 @@ <h2>SCSS mode</h2>
       });
     </script>
 
-    <p>The SCSS mode is a sub-mode of the <a href="index.html">CSS mode</a> (defined in <code>css.js</code>.</p>
+    <p>The SCSS mode is a sub-mode of the <a href="index.html">CSS mode</a> (defined in <code>css.js</code>).</p>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#scss_*">normal</a>,  <a href="../../test/index.html#verbose,scss_*">verbose</a>.</p>
 

From fc2def32c40914164923b417823f7452b0e5b13d Mon Sep 17 00:00:00 2001
From: Dmitry Kiselyov <dmitrykiselyov@ukr.net>
Date: Mon, 16 Mar 2015 17:49:29 +0200
Subject: [PATCH 2019/4742] [stylus mode] New version

Better auto-indent and highlighting.
---
 mode/stylus/stylus.js | 987 ++++++++++++++++++++++++++++--------------
 1 file changed, 653 insertions(+), 334 deletions(-)

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 6f7c754425..e9561109f7 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -1,444 +1,763 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
+// Stylus mode created by Dmitry Kiselyov http://git.io/AaRB
+
 (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);
 })(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineMode("stylus", function(config) {
-
-    var operatorsRegexp = /^(\?:?|\+[+=]?|-[\-=]?|\*[\*=]?|\/=?|[=!:\?]?=|<=?|>=?|%=?|&&|\|=?|\~|!|\^|\\)/,
-        delimitersRegexp = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/,
-        wordOperatorsRegexp = wordRegexp(wordOperators),
-        commonKeywordsRegexp = wordRegexp(commonKeywords),
-        commonAtomsRegexp = wordRegexp(commonAtoms),
-        commonDefRegexp = wordRegexp(commonDef),
-        vendorPrefixesRegexp = new RegExp(/^\-(moz|ms|o|webkit)-/),
-        cssValuesWithBracketsRegexp = new RegExp("^(" + cssValuesWithBrackets_.join("|") + ")\\([\\w\-\\#\\,\\.\\%\\s\\(\\)]*\\)");
-
-    var tokenBase = function(stream, state) {
-
-      if (stream.eatSpace()) return null;
-
-      var ch = stream.peek();
-
-      // Single line Comment
-      if (stream.match('//')) {
+    var indentUnit = config.indentUnit,
+        tagKeywords = keySet(tagKeywords_),
+        tagVariablesRegexp = /^(a|b|i|s|col|em)$/i,
+        propertyKeywords = keySet(propertyKeywords_),
+        nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_),
+        valueKeywords = keySet(valueKeywords_),
+        colorKeywords = keySet(colorKeywords_),
+        documentTypes = keySet(documentTypes_),
+        documentTypesRegexp = wordRegexp(documentTypes_),
+        mediaFeatures = keySet(mediaFeatures_),
+        mediaTypes = keySet(mediaTypes_),
+        fontProperties = keySet(fontProperties_),
+        operatorsRegexp = /^\s*([.]{2,3}|&&|\|\||\*\*|[?!=:]?=|[-+*\/%<>]=?|\?:|\~)/,
+        wordOperatorKeywordsRegexp = wordRegexp(wordOperatorKeywords_),
+        blockKeywords = keySet(blockKeywords_),
+        vendorPrefixesRegexp = new RegExp(/^\-(moz|ms|o|webkit)-/i),
+        commonAtoms = keySet(commonAtoms_),
+        firstWordMatch = "",
+        states = {},
+        ch,
+        style,
+        type,
+        override;
+
+    /**
+     * Tokenizers
+     */
+    function tokenBase(stream, state) {
+      firstWordMatch = stream.string.match(/(^[\w-]+\s*=\s*$)|(^\s*[\w-]+\s*=\s*[\w-])|(^\s*(\.|#|@|\$|\&|\[|\d|\+|::?|\{|\>|~|\/)?\s*[\w-]*([a-z0-9-]|\*|\/\*)(\(|,)?)/);
+      state.context.line.firstWord = firstWordMatch ? firstWordMatch[0].replace(/^\s*/, "") : "";
+      state.context.line.indent = stream.indentation();
+      ch = stream.peek();
+
+      // Line comment
+      if (stream.match("//")) {
         stream.skipToEnd();
-        return "comment";
+        return ["comment", "comment"];
       }
-
-      // Multiline Comment
-      if (stream.match('/*')) {
-        state.tokenizer = multilineComment;
-        return state.tokenizer(stream, state);
+      // Block comment
+      if (stream.match("/*")) {
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
       }
-
-      // Strings
-      if (ch === '"' || ch === "'") {
+      // String
+      if (ch == "\"" || ch == "'") {
         stream.next();
-        state.tokenizer = buildStringTokenizer(ch);
-        return "string";
+        state.tokenize = tokenString(ch);
+        return state.tokenize(stream, state);
       }
-
       // Def
-      if (ch === "@") {
+      if (ch == "@") {
         stream.next();
-        if (stream.match(/extend/)) {
-          dedent(state); // remove indentation after selectors
-        } else if (stream.match(/media[\w-\s]*[\w-]/)) {
-          indent(state);
-        } else if(stream.eatWhile(/[\w-]/)) {
-          if(stream.current().match(commonDefRegexp)) {
-            indent(state);
-          }
-        }
-        return "def";
-      }
-
-      // Number
-      if (stream.match(/^-?[0-9\.]/, false)) {
-
-        // Floats
-        if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i) || stream.match(/^-?\d+\.\d*/)) {
-
-          // Prevent from getting extra . on 1..
-          if (stream.peek() == ".") {
-            stream.backUp(1);
-          }
-          // Units
-          stream.eatWhile(/[a-z%]/i);
-          return "number";
-        }
-        // Integers
-        if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/) || stream.match(/^-?0(?![\dx])/i)) {
-          // Units
-          stream.eatWhile(/[a-z%]/i);
-          return "number";
-        }
+        stream.eatWhile(/[\w\\-]/);
+        return ["def", stream.current()];
       }
-
-      // Hex color and id selector
-      if (ch === "#") {
+      // ID selector or Hex color
+      if (ch == "#") {
         stream.next();
-
         // Hex color
         if (stream.match(/^[0-9a-f]{6}|[0-9a-f]{3}/i)) {
-          return "atom";
+          return ["atom", "atom"];
         }
-
         // ID selector
-        if (stream.match(/^[\w-]+/i)) {
-          indent(state);
-          return "builtin";
+        if (stream.match(/^[a-z][\w-]*/i)) {
+          return ["builtin", "hash"];
         }
       }
-
       // Vendor prefixes
       if (stream.match(vendorPrefixesRegexp)) {
-        return "meta";
+        return ["meta", "vendor-prefixes"];
       }
-
-      // Gradients and animation as CSS value
-      if (stream.match(cssValuesWithBracketsRegexp)) {
-        return "atom";
+      // Numbers
+      if (stream.match(/^-?[0-9]?\.?[0-9]/)) {
+        stream.eatWhile(/[a-z%]/i);
+        return ["number", "unit"];
       }
-
-      // Mixins / Functions with indentation
-      if (stream.sol() && stream.match(/^\.?[a-z][\w-]*\(/i)) {
-        stream.backUp(1);
-        indent(state);
-        return "keyword";
+      // !important|optional
+      if (ch == "!") {
+        stream.next();
+        return [stream.match(/^(important|optional)/i) ? "keyword": "operator", "important"];
+      }
+      // Class
+      if (ch == "." && stream.match(/^\.[a-z][\w-]*/i)) {
+        return ["qualifier", "qualifier"];
+      }
+      // url url-prefix domain regexp
+      if (stream.match(documentTypesRegexp)) {
+        if (stream.peek() == "(") state.tokenize = tokenParenthesized;
+        return ["property", "word"];
       }
-
       // Mixins / Functions
-      if (stream.match(/^\.?[a-z][\w-]*\(/i)) {
+      if (stream.match(/^[a-z][\w-]*\(/i)) {
         stream.backUp(1);
-        return "keyword";
+        return ["keyword", "mixin"];
       }
-
-      // +Block mixins
-      if (stream.match(/^(\+|\-)[a-z][\w-]+\(/i)) {
+      // Block mixins
+      if (stream.match(/^(\+|-)[a-z][\w-]*\(/i)) {
         stream.backUp(1);
-        indent(state);
-        return "keyword";
+        return ["keyword", "block-mixin"];
       }
-
-      // url tokens
-      if (stream.match(/^url/) && stream.peek() === "(") {
-        state.tokenizer = urlTokens;
-        if(!stream.peek()) {
-          state.cursorHalf = 0;
+      // Parent Reference BEM naming
+      if (stream.string.match(/^\s*&/) && stream.match(/^[-_]+[a-z][\w-]*/)) {
+        return ["qualifier", "qualifier"];
+      }
+      // / Root Reference & Parent Reference
+      if (stream.match(/^(\/|&)(-|_|:|\.|#|[a-z])/)) {
+        stream.backUp(1);
+        return ["variable-3", "reference"];
+      }
+      if (stream.match(/^&{1}\s*$/)) {
+        return ["variable-3", "reference"];
+      }
+      // Variable
+      if (ch == "$" && stream.match(/^\$[\w-]+/i)) {
+        return ["variable-2", "variable-name"];
+      }
+      // Word operator
+      if (stream.match(wordOperatorKeywordsRegexp)) {
+        return ["operator", "operator"];
+      }
+      // Word
+      if (stream.match(/^[-_]*[a-z0-9]+[\w-]*/i)) {
+        if (stream.match(/^(\.|\[)[\w-\'\"\]]+/i, false)) {
+          if (!wordIsTag(stream.current())) {
+            stream.match(/[\w-]+/);
+            return ["variable-2", "variable-name"];
+          }
         }
-        return "atom";
+        return ["variable-2", "word"];
       }
-
-      // Class
-      if (stream.match(/^\.[a-z][\w-]*/i)) {
-        indent(state);
-        return "qualifier";
+      // Operators
+      if (stream.match(operatorsRegexp)) {
+        return ["operator", stream.current()];
       }
-
-      // & Parent Reference with BEM naming
-      if (stream.match(/^(_|__|-|--)[a-z0-9-]+/)) {
-        return "qualifier";
+      // Delimiters
+      if (/[:;,{}\[\]\(\)]/.test(ch)) {
+        stream.next();
+        return [null, ch];
       }
+      // Non-detected items
+      stream.next();
+      return [null, null];
+    }
 
-      // Pseudo elements/classes
-      if (ch == ':' && stream.match(/^::?[\w-]+/)) {
-        indent(state);
-        return "variable-3";
+    /**
+     * Token comment
+     */
+    function tokenCComment(stream, state) {
+      var maybeEnd = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (maybeEnd && ch == "/") {
+          state.tokenize = null;
+          break;
+        }
+        maybeEnd = (ch == "*");
       }
+      return ["comment", "comment"];
+    }
 
-      // Conditionals
-      if (stream.match(wordRegexp(["for", "if", "else", "unless"]))) {
-        indent(state);
-        return "keyword";
-      }
+    /**
+     * Token string
+     */
+    function tokenString(quote) {
+      return function(stream, state) {
+        var escaped = false, ch;
+        while ((ch = stream.next()) != null) {
+          if (ch == quote && !escaped) {
+            if (quote == ")") stream.backUp(1);
+            break;
+          }
+          escaped = !escaped && ch == "\\";
+        }
+        if (ch == quote || !escaped && quote != ")") state.tokenize = null;
+        return ["string", "string"];
+      };
+    }
 
-      // Keywords
-      if (stream.match(commonKeywordsRegexp)) {
-        return "keyword";
-      }
+    /**
+     * Token parenthesized
+     */
+    function tokenParenthesized(stream, state) {
+      stream.next(); // Must be "("
+      if (!stream.match(/\s*[\"\')]/, false))
+        state.tokenize = tokenString(")");
+      else
+        state.tokenize = null;
+      return [null, "("];
+    }
 
-      // Atoms
-      if (stream.match(commonAtomsRegexp)) {
-        return "atom";
-      }
+    /**
+     * Context management
+     */
+    function Context(type, indent, prev, line) {
+      this.type = type;
+      this.indent = indent;
+      this.prev = prev;
+      this.line = line || {firstWord: "", indent: 0};
+    }
 
-      // Variables
-      if (stream.match(/^\$?[a-z][\w-]+\s?=(\s|[\w-'"\$])/i)) {
-        stream.backUp(2);
-        var cssPropertie = stream.current().toLowerCase().match(/[\w-]+/)[0];
-        return cssProperties[cssPropertie] === undefined ? "variable-2" : "property";
-      } else if (stream.match(/\$[\w-\.]+/i)) {
-        return "variable-2";
-      } else if (stream.match(/\$?[\w-]+\.[\w-]+/i)) {
-        var cssTypeSelector = stream.current().toLowerCase().match(/[\w]+/)[0];
-        if(cssTypeSelectors[cssTypeSelector] === undefined) {
-          return "variable-2";
-        } else stream.backUp(stream.current().length);
-      }
+    function pushContext(state, stream, type, indent) {
+      indent = indent >= 0 ? indent : indentUnit;
+      state.context = new Context(type, stream.indentation() + indent, state.context);
+      return type;
+    }
 
-      // !important
-      if (ch === "!") {
-        stream.next();
-        return stream.match(/^[\w]+/) ? "keyword": "operator";
-      }
+    function popContext(state, currentIndent) {
+      var contextIndent = state.context.indent - indentUnit;
+      currentIndent = currentIndent || false;
+      state.context = state.context.prev;
+      if (currentIndent) state.context.indent = contextIndent;
+      return state.context.type;
+    }
 
-      // / Root Reference
-      if (stream.match(/^\/(:|\.|#|[a-z])/)) {
-        stream.backUp(1);
-        return "variable-3";
-      }
+    function pass(type, stream, state) {
+      return states[state.context.type](type, stream, state);
+    }
 
-      // Operators and delimiters
-      if (stream.match(operatorsRegexp) || stream.match(wordOperatorsRegexp)) {
-        return "operator";
-      }
-      if (stream.match(delimitersRegexp)) {
-        return null;
-      }
+    function popAndPass(type, stream, state, n) {
+      for (var i = n || 1; i > 0; i--)
+        state.context = state.context.prev;
+      return pass(type, stream, state);
+    }
 
-      // & Parent Reference
-      if (ch === "&") {
-        stream.next();
-        return "variable-3";
-      }
+
+    /**
+     * Parser
+     */
+    function wordIsTag(word) {
+      return word.toLowerCase() in tagKeywords;
+    }
+
+    function wordIsProperty(word) {
+      word = word.toLowerCase();
+      return word in propertyKeywords || word in fontProperties;
+    }
+
+    function wordIsBlock(word) {
+      return word.toLowerCase() in blockKeywords;
+    }
+
+    function wordIsVendorPrefix(word) {
+      return word.toLowerCase().match(vendorPrefixesRegexp);
+    }
+
+    function wordAsValue(word) {
+      var wordLC = word.toLowerCase();
+      var override = "variable-2";
+      if (wordIsTag(word)) override = "tag";
+      else if (wordIsBlock(word)) override = "block-keyword";
+      else if (wordIsProperty(word)) override = "property";
+      else if (wordLC in valueKeywords || wordLC in commonAtoms) override = "atom";
+      else if (wordLC == "return" || wordLC in colorKeywords) override = "keyword";
 
       // Font family
-      if (stream.match(/^[A-Z][a-z0-9-]+/)) {
-        return "string";
-      }
+      else if (word.match(/^[A-Z]/)) override = "string";
+      return override;
+    }
 
-      // CSS rule
-      // NOTE: Some css selectors and property values have the same name
-      // (embed, menu, pre, progress, sub, table),
-      // so they will have the same color (.cm-atom).
-      if (stream.match(/[\w-]*/i)) {
+    function typeIsBlock(type, stream) {
+      return ((endOfLine(stream) && (type == "{" || type == "]" || type == "hash" || type == "qualifier")) || type == "block-mixin");
+    }
 
-        var word = stream.current().toLowerCase();
+    function typeIsInterpolation(type, stream) {
+      return type == "{" && stream.match(/^\s*\$?[\w-]+/i, false);
+    }
 
-        if(cssProperties[word] !== undefined) {
-          // CSS property
-          if(!stream.eol())
-            return "property";
-          else
-            return "variable-2";
-
-        } else if(cssValues[word] !== undefined) {
-          // CSS value
-          return "atom";
-
-        } else if(cssTypeSelectors[word] !== undefined) {
-          // CSS type selectors
-          indent(state);
-          return "tag";
-
-        } else if(word) {
-          // By default variable-2
-          return "variable-2";
-        }
-      }
+    function typeIsPseudo(type, stream) {
+      return type == ":" && stream.match(/^[a-z-]+/, false);
+    }
 
-      // Handle non-detected items
-      stream.next();
-      return null;
+    function startOfLine(stream) {
+      return stream.sol() || stream.string.match(new RegExp("^\\s*" + escapeRegExp(stream.current())));
+    }
 
-    };
+    function endOfLine(stream) {
+      return stream.eol() || stream.match(/^\s*$/, false);
+    }
+
+    function firstWordOfLine(line) {
+      var re = /^\s*[-_]*[a-z0-9]+[\w-]*/i;
+      var result = typeof line == "string" ? line.match(re) : line.string.match(re);
+      return result ? result[0].replace(/^\s*/, "") : "";
+    }
 
-    var tokenLexer = function(stream, state) {
 
-      if (stream.sol()) {
-        state.indentCount = 0;
+    /**
+     * Block
+     */
+    states.block = function(type, stream, state) {
+      if ((type == "comment" && startOfLine(stream)) ||
+          (type == "," && endOfLine(stream)) ||
+          type == "mixin") {
+        return pushContext(state, stream, "block", 0);
+      }
+      if (typeIsInterpolation(type, stream)) {
+        return pushContext(state, stream, "interpolation");
+      }
+      if (endOfLine(stream) && type == "]") {
+        if (!/^\s*(\.|#|:|\[|\*|&)/.test(stream.string) && !wordIsTag(firstWordOfLine(stream))) {
+          return pushContext(state, stream, "block", 0);
+        }
+      }
+      if (typeIsBlock(type, stream, state)) {
+        return pushContext(state, stream, "block");
+      }
+      if (type == "}" && endOfLine(stream)) {
+        return pushContext(state, stream, "block", 0);
+      }
+      if (type == "variable-name") {
+        return pushContext(state, stream, "variableName");
+      }
+      if (type == "=") {
+        if (!endOfLine(stream) && !wordIsBlock(firstWordOfLine(stream))) {
+          return pushContext(state, stream, "block", 0);
+        }
+        return pushContext(state, stream, "block");
       }
+      if (type == "*") {
+        if (endOfLine(stream) || stream.match(/\s*(,|\.|#|\[|:|{)/,false)) {
+          override = "tag";
+          return pushContext(state, stream, "block");
+        }
+      }
+      if (typeIsPseudo(type, stream)) {
+        return pushContext(state, stream, "pseudo");
+      }
+      if (/@(font-face|media|supports|(-moz-)?document)/.test(type)) {
+        return pushContext(state, stream, endOfLine(stream) ? "block" : "atBlock");
+      }
+      if (/@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
+        return pushContext(state, stream, "keyframes");
+      }
+      if (/@extends?/.test(type)) {
+        return pushContext(state, stream, "extend", 0);
+      }
+      if (type && type.charAt(0) == "@") {
 
-      var style = state.tokenizer(stream, state);
-      var current = stream.current();
+        // Property Lookup
+        if (stream.indentation() > 0 && wordIsProperty(stream.current().slice(1))) {
+          override = "variable-2";
+          return "block";
+        }
+        if (/(@import|@require|@charset)/.test(type)) {
+          return pushContext(state, stream, "block", 0);
+        }
+        return pushContext(state, stream, "block");
+      }
+      if (type == "reference" && endOfLine(stream)) {
+        return pushContext(state, stream, "block");
+      }
+      if (type == "(") {
+        return pushContext(state, stream, "parens");
+      }
 
-      if (stream.eol() && (current === "}" || current === ",")) {
-        dedent(state);
+      if (type == "vendor-prefixes") {
+        return pushContext(state, stream, "vendorPrefixes");
       }
+      if (type == "word") {
+        var word = stream.current();
+        override = wordAsValue(word);
+
+        if (override == "property") {
+          if (startOfLine(stream)) {
+            return pushContext(state, stream, "block", 0);
+          } else {
+            override = "atom";
+            return "block";
+          }
+        }
 
-      if (style !== null) {
-        var startOfToken = stream.pos - current.length;
-        var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);
+        if (override == "tag") {
 
-        var newScopes = [];
+          // tag is a css value
+          if (/embed|menu|pre|progress|sub|table/.test(word)) {
+            if (wordIsProperty(firstWordOfLine(stream))) {
+              override = "atom";
+              return "block";
+            }
+          }
 
-        for (var i = 0; i < state.scopes.length; i++) {
-          var scope = state.scopes[i];
+          // tag is an attribute
+          if (stream.string.match(new RegExp("\\[\\s*" + word + "|" + word +"\\s*\\]"))) {
+            override = "atom";
+            return "block";
+          }
 
-          if (scope.offset <= withCurrentIndent) {
-            newScopes.push(scope);
+          // tag is a variable
+          if (tagVariablesRegexp.test(word)) {
+            if ((startOfLine(stream) && stream.string.match(/=/)) ||
+                (!startOfLine(stream) &&
+                 !stream.string.match(/^(\s*\.|#|\&|\[|\/|>|\*)/) &&
+                 !wordIsTag(firstWordOfLine(stream)))) {
+              override = "variable-2";
+              if (wordIsBlock(firstWordOfLine(stream)))  return "block";
+              return pushContext(state, stream, "block", 0);
+            }
           }
+
+          if (endOfLine(stream)) return pushContext(state, stream, "block");
         }
+        if (override == "block-keyword") {
+          override = "keyword";
 
-        state.scopes = newScopes;
+          // Postfix conditionals
+          if (stream.current(/(if|unless)/) && !startOfLine(stream)) {
+            return "block";
+          }
+          return pushContext(state, stream, "block");
+        }
+        if (word == "return") return pushContext(state, stream, "block", 0);
       }
-
-      return style;
+      return state.context.type;
     };
 
-    return {
-      startState: function() {
-        return {
-          tokenizer: tokenBase,
-          scopes: [{offset: 0, type: 'styl'}]
-        };
-      },
 
-      token: function(stream, state) {
-        var style = tokenLexer(stream, state);
-        state.lastToken = { style: style, content: stream.current() };
-        return style;
-      },
+    /**
+     * Parens
+     */
+    states.parens = function(type, stream, state) {
+      if (type == "(") return pushContext(state, stream, "parens");
+      if (type == ")") {
+        if (state.context.prev.type == "parens") {
+          return popContext(state);
+        }
+        if ((stream.string.match(/^[a-z][\w-]*\(/i) && endOfLine(stream)) ||
+            wordIsBlock(firstWordOfLine(stream)) ||
+            /(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(firstWordOfLine(stream)) ||
+            (!stream.string.match(/^-?[a-z][\w-\.\[\]\'\"]*\s*=/) &&
+             wordIsTag(firstWordOfLine(stream)))) {
+          return pushContext(state, stream, "block");
+        }
+        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)) {
+          return pushContext(state, stream, "block", 0);
+        }
+        if (endOfLine(stream)) return pushContext(state, stream, "block");
+        else return pushContext(state, stream, "block", 0);
+      }
+      if (type && type.charAt(0) == "@" && wordIsProperty(stream.current().slice(1))) {
+        override = "variable-2";
+      }
+      if (type == "word") {
+        var word = stream.current();
+        override = wordAsValue(word);
+        if (override == "tag" && tagVariablesRegexp.test(word)) {
+          override = "variable-2";
+        }
+        if (override == "property" || word == "to") override = "atom";
+      }
+      if (type == "variable-name") {
+        return pushContext(state, stream, "variableName");
+      }
+      if (typeIsPseudo(type, stream)) {
+        return pushContext(state, stream, "pseudo");
+      }
+      return state.context.type;
+    };
 
-      indent: function(state) {
-        return state.scopes[0].offset;
-      },
-
-      lineComment: "//",
-      fold: "indent"
 
+    /**
+     * Vendor prefixes
+     */
+    states.vendorPrefixes = function(type, stream, state) {
+      if (type == "word") {
+        override = "property";
+        return pushContext(state, stream, "block", 0);
+      }
+      return popContext(state);
     };
 
-    function urlTokens(stream, state) {
-      var ch = stream.peek();
 
-      if (ch === ")") {
-        stream.next();
-        state.tokenizer = tokenBase;
-        return "operator";
-      } else if (ch === "(") {
-        stream.next();
-        stream.eatSpace();
+    /**
+     * Pseudo
+     */
+    states.pseudo = function(type, stream, state) {
+      if (!wordIsProperty(firstWordOfLine(stream.string))) {
+        stream.match(/^[a-z-]+/);
+        override = "variable-3";
+        if (endOfLine(stream)) return pushContext(state, stream, "block");
+        return popContext(state);
+      }
+      return popAndPass(type, stream, state);
+    };
 
-        return "operator";
-      } else if (ch === "'" || ch === '"') {
-        state.tokenizer = buildStringTokenizer(stream.next());
-        return "string";
-      } else {
-        state.tokenizer = buildStringTokenizer(")", false);
-        return "string";
+
+    /**
+     * atBlock
+     */
+    states.atBlock = function(type, stream, state) {
+      if (type == "(") return pushContext(state, stream, "atBlock_parens");
+      if (typeIsBlock(type, stream, state)) {
+        return pushContext(state, stream, "block");
       }
-    }
+      if (typeIsInterpolation(type, stream)) {
+        return pushContext(state, stream, "interpolation");
+      }
+      if (type == "word") {
+        var word = stream.current().toLowerCase();
+        if (/^(only|not|and|or)$/.test(word))
+          override = "keyword";
+        else if (documentTypes.hasOwnProperty(word))
+          override = "tag";
+        else if (mediaTypes.hasOwnProperty(word))
+          override = "attribute";
+        else if (mediaFeatures.hasOwnProperty(word))
+          override = "property";
+        else if (nonStandardPropertyKeywords.hasOwnProperty(word))
+          override = "string-2";
+        else override = wordAsValue(stream.current());
+        if (override == "tag" && endOfLine(stream)) {
+          return pushContext(state, stream, "block");
+        }
+      }
+      if (type == "operator" && /^(not|and|or)$/.test(stream.current())) {
+        override = "keyword";
+      }
+      return state.context.type;
+    };
 
-    function multilineComment(stream, state) {
-      if (stream.skipTo("*/")) {
-        stream.next();
-        stream.next();
-        state.tokenizer = tokenBase;
-      } else {
-        stream.next();
+    states.atBlock_parens = function(type, stream, state) {
+      if (type == "{" || type == "}") return state.context.type;
+      if (type == ")") {
+        if (endOfLine(stream)) return pushContext(state, stream, "block");
+        else return pushContext(state, stream, "atBlock");
       }
-      return "comment";
-    }
+      if (type == "word") {
+        var word = stream.current().toLowerCase();
+        override = wordAsValue(word);
+        if (/^(max|min)/.test(word)) override = "property";
+        if (override == "tag") {
+          tagVariablesRegexp.test(word) ? override = "variable-2" : override = "atom";
+        }
+        return state.context.type;
+      }
+      return states.atBlock(type, stream, state);
+    };
 
-    function buildStringTokenizer(quote, greedy) {
 
-      if(greedy == null) {
-        greedy = true;
+    /**
+     * Keyframes
+     */
+    states.keyframes = function(type, stream, state) {
+      if (stream.indentation() == "0" && ((type == "}" && startOfLine(stream)) || type == "]" || type == "hash"
+                                          || type == "qualifier" || wordIsTag(stream.current()))) {
+        return popAndPass(type, stream, state);
       }
+      if (type == "{") return pushContext(state, stream, "keyframes");
+      if (type == "}") {
+        if (startOfLine(stream)) return popContext(state, true);
+        else return pushContext(state, stream, "keyframes");
+      }
+      if (type == "unit" && /^[0-9]+\%$/.test(stream.current())) {
+        return pushContext(state, stream, "keyframes");
+      }
+      if (type == "word") {
+        override = wordAsValue(stream.current());
+        if (override == "block-keyword") {
+          override = "keyword";
+          return pushContext(state, stream, "keyframes");
+        }
+      }
+      if (/@(font-face|media|supports|(-moz-)?document)/.test(type)) {
+        return pushContext(state, stream, endOfLine(stream) ? "block" : "atBlock");
+      }
+      if (type == "mixin") {
+        return pushContext(state, stream, "block", 0);
+      }
+      return state.context.type;
+    };
 
-      function stringTokenizer(stream, state) {
-        var nextChar = stream.next();
-        var peekChar = stream.peek();
-        var previousChar = stream.string.charAt(stream.pos-2);
-
-        var endingString = ((nextChar !== "\\" && peekChar === quote) ||
-                            (nextChar === quote && previousChar !== "\\"));
 
-        if (endingString) {
-          if (nextChar !== quote && greedy) {
-            stream.next();
-          }
-          state.tokenizer = tokenBase;
-          return "string";
-        } else if (nextChar === "#" && peekChar === "{") {
-          state.tokenizer = buildInterpolationTokenizer(stringTokenizer);
-          stream.next();
-          return "operator";
-        } else {
-          return "string";
+    /**
+     * Interpolation
+     */
+    states.interpolation = function(type, stream, state) {
+      if (type == "{") popContext(state) && pushContext(state, stream, "block");
+      if (type == "}") {
+        if (stream.string.match(/^\s*(\.|#|:|\[|\*|&|>|~|\+|\/)/i) ||
+            (stream.string.match(/^\s*[a-z]/i) && wordIsTag(firstWordOfLine(stream)))) {
+          return pushContext(state, stream, "block");
         }
+        if (!stream.string.match(/^(\{|\s*\&)/) ||
+            stream.match(/\s*[\w-]/,false)) {
+          return pushContext(state, stream, "block", 0);
+        }
+        return pushContext(state, stream, "block");
+      }
+      if (type == "variable-name") {
+        return pushContext(state, stream, "variableName", 0);
+      }
+      if (type == "word") {
+        override = wordAsValue(stream.current());
+        if (override == "tag") override = "atom";
       }
+      return state.context.type;
+    };
 
-      return stringTokenizer;
-    }
 
-    function buildInterpolationTokenizer(currentTokenizer) {
-      return function(stream, state) {
-        if (stream.peek() === "}") {
-          stream.next();
-          state.tokenizer = currentTokenizer;
-          return "operator";
-        } else {
-          return tokenBase(stream, state);
-        }
-      };
-    }
+    /**
+     * Extend/s
+     */
+    states.extend = function(type, stream, state) {
+      if (type == "[" || type == "=") return "extend";
+      if (type == "]") return popContext(state);
+      if (type == "word") {
+        override = wordAsValue(stream.current());
+        return "extend";
+      }
+      return popContext(state);
+    };
+
 
-    function indent(state) {
-      if (state.indentCount == 0) {
-        state.indentCount++;
-        var lastScopeOffset = state.scopes[0].offset;
-        var currentOffset = lastScopeOffset + config.indentUnit;
-        state.scopes.unshift({ offset:currentOffset });
+    /**
+     * Variable name
+     */
+    states.variableName = function(type, stream, state) {
+      if (type == "string" || type == "[" || type == "]" || stream.current().match(/^(\.|\$)/)) {
+        if (stream.current().match(/^\.[\w-]+/i)) override = "variable-2";
+        if (endOfLine(stream)) return popContext(state);
+        return "variableName";
       }
-    }
+      return popAndPass(type, stream, state);
+    };
 
-    function dedent(state) {
-      if (state.scopes.length == 1) { return true; }
-      state.scopes.shift();
-    }
 
+    return {
+      startState: function(base) {
+        return {
+          tokenize: null,
+          state: "block",
+          context: new Context("block", base || 0, null)
+        };
+      },
+      token: function(stream, state) {
+        if (!state.tokenize && stream.eatSpace()) return null;
+        style = (state.tokenize || tokenBase)(stream, state);
+        if (style && typeof style == "object") {
+          type = style[1];
+          style = style[0];
+        }
+        override = style;
+        state.state = states[state.state](type, stream, state);
+        return override;
+      },
+      indent: function(state, textAfter, line) {
+
+        var cx = state.context,
+            ch = textAfter && textAfter.charAt(0),
+            indent = cx.indent,
+            lineFirstWord = firstWordOfLine(textAfter),
+            lineIndent = line.length - line.replace(/^\s*/, "").length,
+            prevLineFirstWord = state.context.prev ? state.context.prev.line.firstWord : "",
+            prevLineIndent = state.context.prev ? state.context.prev.line.indent : lineIndent;
+
+        if (cx.prev &&
+            (ch == "}" && (cx.type == "block" || cx.type == "atBlock" || cx.type == "keyframes") ||
+             ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
+             ch == "{" && (cx.type == "at"))) {
+          indent = cx.indent - indentUnit;
+          cx = cx.prev;
+        } else if (!(/(\})/.test(ch))) {
+          if (/@|\$|\d/.test(ch) ||
+              /^\{/.test(textAfter) ||
+/^\s*\/(\/|\*)/.test(textAfter) ||
+              /^\s*\/\*/.test(prevLineFirstWord) ||
+              /^\s*[\w-\.\[\]\'\"]+\s*(\?|:|\+)?=/i.test(textAfter) ||
+/^(\+|-)?[a-z][\w-]*\(/i.test(textAfter) ||
+/^return/.test(textAfter) ||
+              wordIsBlock(lineFirstWord)) {
+            indent = lineIndent;
+          } else if (/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(ch) || wordIsTag(lineFirstWord)) {
+            if (/\,\s*$/.test(prevLineFirstWord)) {
+              indent = prevLineIndent;
+            } else if (/^\s+/.test(line) && (/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(prevLineFirstWord) || wordIsTag(prevLineFirstWord))) {
+              indent = lineIndent <= prevLineIndent ? prevLineIndent : prevLineIndent + indentUnit;
+            } else {
+              indent = lineIndent;
+            }
+          } else if (!/,\s*$/.test(line) && (wordIsVendorPrefix(lineFirstWord) || wordIsProperty(lineFirstWord))) {
+            if (wordIsBlock(prevLineFirstWord)) {
+              indent = lineIndent <= prevLineIndent ? prevLineIndent : prevLineIndent + indentUnit;
+            } else if (/^\{/.test(prevLineFirstWord)) {
+              indent = lineIndent <= prevLineIndent ? lineIndent : prevLineIndent + indentUnit;
+            } else if (wordIsVendorPrefix(prevLineFirstWord) || wordIsProperty(prevLineFirstWord)) {
+              indent = lineIndent >= prevLineIndent ? prevLineIndent : lineIndent;
+            } else if (/^(\.|#|:|\[|\*|&|@|\+|\-|>|~|\/)/.test(prevLineFirstWord) ||
+                      /=\s*$/.test(prevLineFirstWord) ||
+                      wordIsTag(prevLineFirstWord) ||
+                      /^\$[\w-\.\[\]\'\"]/.test(prevLineFirstWord)) {
+              indent = prevLineIndent + indentUnit;
+            } else {
+              indent = lineIndent;
+            }
+          }
+        }
+        return indent;
+      },
+      electricChars: "}",
+      lineComment: "//",
+      fold: "indent"
+    };
   });
 
-  // https://developer.mozilla.org/en-US/docs/Web/HTML/Element
-  var cssTypeSelectors_ = ["a","abbr","address","area","article","aside","audio", "b", "base","bdi","bdo","bgsound","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","marquee","menu","menuitem","meta","meter","nav","nobr","noframes","noscript","object","ol","optgroup","option","output","p","param","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","title","tr","track","u","ul","var","video","wbr"];
-  // https://github.com/csscomb/csscomb.js/blob/master/config/zen.json
-  var cssProperties_ = ["position","top","right","bottom","left","z-index","display","visibility","flex-direction","flex-order","flex-pack","float","clear","flex-align","overflow","overflow-x","overflow-y","overflow-scrolling","clip","box-sizing","margin","margin-top","margin-right","margin-bottom","margin-left","padding","padding-top","padding-right","padding-bottom","padding-left","min-width","min-height","max-width","max-height","width","height","outline","outline-width","outline-style","outline-color","outline-offset","border","border-spacing","border-collapse","border-width","border-style","border-color","border-top","border-top-width","border-top-style","border-top-color","border-right","border-right-width","border-right-style","border-right-color","border-bottom","border-bottom-width","border-bottom-style","border-bottom-color","border-left","border-left-width","border-left-style","border-left-color","border-radius","border-top-left-radius","border-top-right-radius","border-bottom-right-radius","border-bottom-left-radius","border-image","border-image-source","border-image-slice","border-image-width","border-image-outset","border-image-repeat","border-top-image","border-right-image","border-bottom-image","border-left-image","border-corner-image","border-top-left-image","border-top-right-image","border-bottom-right-image","border-bottom-left-image","background","filter:progid:DXImageTransform\\.Microsoft\\.AlphaImageLoader","background-color","background-image","background-attachment","background-position","background-position-x","background-position-y","background-clip","background-origin","background-size","background-repeat","box-decoration-break","box-shadow","color","table-layout","caption-side","empty-cells","list-style","list-style-position","list-style-type","list-style-image","quotes","content","counter-increment","counter-reset","writing-mode","vertical-align","text-align","text-align-last","text-decoration","text-emphasis","text-emphasis-position","text-emphasis-style","text-emphasis-color","text-indent","-ms-text-justify","text-justify","text-outline","text-transform","text-wrap","text-overflow","text-overflow-ellipsis","text-overflow-mode","text-size-adjust","text-shadow","white-space","word-spacing","word-wrap","word-break","tab-size","hyphens","letter-spacing","font","font-weight","font-style","font-variant","font-size-adjust","font-stretch","font-size","font-family","src","line-height","opacity","filter:\\\\\\\\'progid:DXImageTransform.Microsoft.Alpha","filter:progid:DXImageTransform.Microsoft.Alpha\\(Opacity","interpolation-mode","filter","resize","cursor","nav-index","nav-up","nav-right","nav-down","nav-left","transition","transition-delay","transition-timing-function","transition-duration","transition-property","transform","transform-origin","animation","animation-name","animation-duration","animation-play-state","animation-timing-function","animation-delay","animation-iteration-count","animation-direction","pointer-events","unicode-bidi","direction","columns","column-span","column-width","column-count","column-fill","column-gap","column-rule","column-rule-width","column-rule-style","column-rule-color","break-before","break-inside","break-after","page-break-before","page-break-inside","page-break-after","orphans","widows","zoom","max-zoom","min-zoom","user-zoom","orientation","text-rendering","speak","animation-fill-mode","backface-visibility","user-drag","user-select","appearance"];
-  // https://github.com/codemirror/CodeMirror/blob/master/mode/css/css.js#L501
-  var cssValues_ = ["above","absolute","activeborder","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","cambodian","capitalize","caps-lock-indicator","captiontext","caret","cell","center","checkbox","circle","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","content-box","context-menu","continuous","copy","cover","crop","cross","crosshair","currentcolor","cursive","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ew-resize","expanded","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-table","inset","inside","intrinsic","invert","italic","justify","kannada","katakana","katakana-iroha","keep-all","khmer","landscape","lao","large","larger","left","level","lighter","line-through","linear","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","single","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","telugu","text","text-bottom","text-top","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale"];
-  var cssColorValues_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
-  var cssValuesWithBrackets_ = ["gradient","linear-gradient","radial-gradient","repeating-linear-gradient","repeating-radial-gradient","cubic-bezier","translateX","translateY","translate3d","rotate3d","scale","scale3d","perspective","skewX"];
-
-  var wordOperators = ["in", "and", "or", "not", "is a", "is", "isnt", "defined", "if unless"],
-      commonKeywords = ["for", "if", "else", "unless", "return"],
-      commonAtoms = ["null", "true", "false", "href", "title", "type", "not-allowed", "readonly", "disabled"],
-      commonDef = ["@font-face", "@keyframes", "@media", "@viewport", "@page", "@host", "@supports", "@block", "@css"],
-      cssTypeSelectors = keySet(cssTypeSelectors_),
-      cssProperties = keySet(cssProperties_),
-      cssValues = keySet(cssValues_.concat(cssColorValues_)),
-      hintWords = wordOperators.concat(commonKeywords,
-                                       commonAtoms,
-                                       commonDef,
-                                       cssTypeSelectors_,
-                                       cssProperties_,
-                                       cssValues_,
-                                       cssValuesWithBrackets_,
-                                       cssColorValues_);
+  // developer.mozilla.org/en-US/docs/Web/HTML/Element
+  var tagKeywords_ = ["a","abbr","address","area","article","aside","audio", "b", "base","bdi", "bdo","bgsound","blockquote","body","br","button","canvas","caption","cite", "code","col","colgroup","data","datalist","dd","del","details","dfn","div", "dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1", "h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe", "img","input","ins","kbd","keygen","label","legend","li","link","main","map", "mark","marquee","menu","menuitem","meta","meter","nav","nobr","noframes", "noscript","object","ol","optgroup","option","output","p","param","pre", "progress","q","rp","rt","ruby","s","samp","script","section","select", "small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","track", "u","ul","var","video"];
+
+  // github.com/codemirror/CodeMirror/blob/master/mode/css/css.js
+  var documentTypes_ = ["domain", "regexp", "url", "url-prefix"];
+  var mediaTypes_ = ["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"];
+  var mediaFeatures_ = ["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"];
+  var propertyKeywords_ = ["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"];
+  var nonStandardPropertyKeywords_ = ["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"];
+  var fontProperties_ = ["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"];
+  var colorKeywords_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
+  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale"];
+
+  var wordOperatorKeywords_ = ["in","and","or","not","is not","is a","is","isnt","defined","if unless"],
+      blockKeywords_ = ["for","if","else","unless", "from", "to"],
+      commonAtoms_ = ["null","true","false","href","title","type","not-allowed","readonly","disabled"],
+      commonDef_ = ["@font-face", "@keyframes", "@media", "@viewport", "@page", "@host", "@supports", "@block", "@css"];
+
+  var hintWords = tagKeywords_.concat(documentTypes_,mediaTypes_,mediaFeatures_,
+                                      propertyKeywords_,nonStandardPropertyKeywords_,
+                                      colorKeywords_,valueKeywords_,fontProperties_,
+                                      wordOperatorKeywords_,blockKeywords_,
+                                      commonAtoms_,commonDef_);
 
   function wordRegexp(words) {
+    words = words.sort(function(a,b){return b > a;});
     return new RegExp("^((" + words.join(")|(") + "))\\b");
-  };
+  }
 
   function keySet(array) {
     var keys = {};
-    for (var i = 0; i < array.length; ++i) {
-      keys[array[i]] = true;
-    }
+    for (var i = 0; i < array.length; ++i) keys[array[i]] = true;
     return keys;
-  };
+  }
+
+  function escapeRegExp(text) {
+    return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+  }
 
   CodeMirror.registerHelper("hintWords", "stylus", hintWords);
   CodeMirror.defineMIME("text/x-styl", "stylus");
-
 });

From 866934b3b1b4c62ae4cf3ee3ecd640ab69acfc3d Mon Sep 17 00:00:00 2001
From: Dmitry Kiselyov <dmitrykiselyov@ukr.net>
Date: Mon, 16 Mar 2015 17:56:20 +0200
Subject: [PATCH 2020/4742] [stylus mode] Added tabSize and link to the author
 in demo page

---
 mode/stylus/index.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mode/stylus/index.html b/mode/stylus/index.html
index 354bf30328..862c18f250 100644
--- a/mode/stylus/index.html
+++ b/mode/stylus/index.html
@@ -28,8 +28,9 @@
 <h2>Stylus mode</h2>
 <form><textarea id="code" name="code">
 /* Stylus mode */
-#id
-.class
+
+#id,
+.class,
 article
   font-family Arial, sans-serif
 
@@ -96,9 +97,10 @@ <h2>Stylus mode</h2>
 <script>
   var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
     extraKeys: {"Ctrl-Space": "autocomplete"},
+    tabSize: 2
   });
 </script>
 
 <p><strong>MIME types defined:</strong> <code>text/x-styl</code>.</p>
-
+<p>Created by <a href="https://github.com/dmitrykiselyov">Dmitry Kiselyov</a></p>
 </article>

From f5574526eea1ec430560b2883f04982d2cb34738 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 18 Mar 2015 10:55:35 +0100
Subject: [PATCH 2021/4742] [stylus mode] Fix module import paths

Issue #3138
---
 mode/stylus/stylus.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index e9561109f7..60d9a737fb 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -5,9 +5,9 @@
 
 (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);
 })(function(CodeMirror) {

From ea0510141c60f62ed6fd729b070a1de89e3883ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 18 Mar 2015 14:09:16 +0100
Subject: [PATCH 2022/4742] Support a handleMouseEvents option to addBookmark

See http://discuss.codemirror.net/t/click-on-bookmark-should-set-the-cursor/175
---
 doc/manual.html   | 5 +++++
 lib/codemirror.js | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 1299be17b4..2fdf397ff2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1622,6 +1622,11 @@ <h3 id="api_marker">Text-marking methods</h3>
         <dt><code><strong>shared</strong>: boolean</code></dt><dd>See
         the corresponding <a href="#mark_shared">option</a>
         to <code>markText</code>.</dd>
+        <dt><code><strong>handleMouseEvents</strong>: boolean</code></dt>
+        <dd>As with <a href="#markText"><code>markText</code></a>,
+        this determines whether mouse events on the widget inserted
+        for this bookmark are handled by CodeMirror. The default is
+        false.</dd>
       </dl></dd>
 
       <dt id="findMarks"><code><strong>doc.findMarks</strong>(from: {line, ch}, to: {line, ch}) → array&lt;TextMarker&gt;</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 58fc942888..339cf1eac6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7407,7 +7407,8 @@
     setBookmark: function(pos, options) {
       var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
                       insertLeft: options && options.insertLeft,
-                      clearWhenEmpty: false, shared: options && options.shared};
+                      clearWhenEmpty: false, shared: options && options.shared,
+                      handleMouseEvents: options && options.handleMouseEvents};
       pos = clipPos(this, pos);
       return markText(this, pos, pos, realOpts, "bookmark");
     },

From c6440eed51b6a66da06b56c3712c899aa8f077b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 19 Mar 2015 11:20:40 +0100
Subject: [PATCH 2023/4742] [css-hint addon] Complete !important

Closes #3141
---
 addon/hint/css-hint.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 488da3449e..22642727cf 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -20,6 +20,10 @@
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
     if (inner.mode.name != "css") return;
 
+    if (token.type == "keyword" && "!important".indexOf(token.string) == 0)
+      return {list: ["!important"], from: CodeMirror.Pos(cur.line, token.start),
+              to: CodeMirror.Pos(cur.line, token.end)};
+
     var start = token.start, end = cur.ch, word = token.string.slice(0, end - start);
     if (/[^\w$_-]/.test(word)) {
       word = ""; start = end = cur.ch;

From 582c1b21538632dacf06082389e2987aea9c472d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Mar 2015 23:00:55 +0100
Subject: [PATCH 2024/4742] [javascript mode] Recognize static as keyword in
 class body context

Closes #3140
---
 mode/javascript/javascript.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index ddaa01ef47..bee88997be 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -549,6 +549,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function classBody(type, value) {
     if (type == "variable" || cx.style == "keyword") {
+      if (value == "static") {
+        cx.marked = "keyword";
+        return cont(classBody);
+      }
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody);
       return cont(functiondef, classBody);

From 78a35ed3f2b8a3154e6d4160b1a9dd1de3726fed Mon Sep 17 00:00:00 2001
From: ray ratchup <ray1248@gmail.com>
Date: Sat, 14 Mar 2015 16:37:04 -0400
Subject: [PATCH 2025/4742] [verilog mode] Repurpose SVG extension as
 transaction level verilog (suffix: .tlv) mode

---
 mode/verilog/verilog.js | 106 ++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 96b9f24581..9d2a4cd582 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -375,73 +375,73 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     name: "verilog"
   });
 
-  // SVXVerilog mode
+  // TLVVerilog mode
 
-  var svxchScopePrefixes = {
+  var tlvchScopePrefixes = {
     ">": "property", "->": "property", "-": "hr", "|": "link", "?$": "qualifier", "?*": "qualifier",
     "@-": "variable-3", "@": "variable-3", "?": "qualifier"
   };
 
-  function svxGenIndent(stream, state) {
-    var svxindentUnit = 2;
+  function tlvGenIndent(stream, state) {
+    var tlvindentUnit = 2;
     var rtnIndent = -1, indentUnitRq = 0, curIndent = stream.indentation();
-    switch (state.svxCurCtlFlowChar) {
+    switch (state.tlvCurCtlFlowChar) {
     case "\\":
       curIndent = 0;
       break;
     case "|":
-      if (state.svxPrevPrevCtlFlowChar == "@") {
+      if (state.tlvPrevPrevCtlFlowChar == "@") {
         indentUnitRq = -2; //-2 new pipe rq after cur pipe
         break;
       }
-      if (svxchScopePrefixes[state.svxPrevCtlFlowChar])
+      if (tlvchScopePrefixes[state.tlvPrevCtlFlowChar])
         indentUnitRq = 1; // +1 new scope
       break;
     case "M":  // m4
-      if (state.svxPrevPrevCtlFlowChar == "@") {
+      if (state.tlvPrevPrevCtlFlowChar == "@") {
         indentUnitRq = -2; //-2 new inst rq after  pipe
         break;
       }
-      if (svxchScopePrefixes[state.svxPrevCtlFlowChar])
+      if (tlvchScopePrefixes[state.tlvPrevCtlFlowChar])
         indentUnitRq = 1; // +1 new scope
       break;
     case "@":
-      if (state.svxPrevCtlFlowChar == "S")
+      if (state.tlvPrevCtlFlowChar == "S")
         indentUnitRq = -1; // new pipe stage after stmts
-      if (state.svxPrevCtlFlowChar == "|")
+      if (state.tlvPrevCtlFlowChar == "|")
         indentUnitRq = 1; // 1st pipe stage
       break;
     case "S":
-      if (state.svxPrevCtlFlowChar == "@")
+      if (state.tlvPrevCtlFlowChar == "@")
         indentUnitRq = 1; // flow in pipe stage
-      if (svxchScopePrefixes[state.svxPrevCtlFlowChar])
+      if (tlvchScopePrefixes[state.tlvPrevCtlFlowChar])
         indentUnitRq = 1; // +1 new scope
       break;
     }
-    var statementIndentUnit = svxindentUnit;
+    var statementIndentUnit = tlvindentUnit;
     rtnIndent = curIndent + (indentUnitRq*statementIndentUnit);
     return rtnIndent >= 0 ? rtnIndent : curIndent;
   }
 
-  CodeMirror.defineMIME("text/x-svx", {
+  CodeMirror.defineMIME("text/x-tlv", {
     name: "verilog",
     hooks: {
       "\\": function(stream, state) {
         var vxIndent = 0, style = false;
         var curPunc  = stream.string;
-        if ((stream.sol()) && (/\\SV/.test(stream.string))) {
-          curPunc = (/\\SVX_version/.test(stream.string))
-            ? "\\SVX_version" : stream.string;
+        if ((stream.sol()) && ((/\\SV/.test(stream.string)) || (/\\TLV/.test(stream.string)))) {
+          curPunc = (/\\TLV_version/.test(stream.string))
+            ? "\\TLV_version" : stream.string;
           stream.skipToEnd();
           if (curPunc == "\\SV" && state.vxCodeActive) {state.vxCodeActive = false;};
-          if ((/\\SVX/.test(curPunc) && !state.vxCodeActive)
-            || (curPunc=="\\SVX_version" && state.vxCodeActive)) {state.vxCodeActive = true;};
+          if ((/\\TLV/.test(curPunc) && !state.vxCodeActive)
+            || (curPunc=="\\TLV_version" && state.vxCodeActive)) {state.vxCodeActive = true;};
           style = "keyword";
-          state.svxCurCtlFlowChar  = state.svxPrevPrevCtlFlowChar
-            = state.svxPrevCtlFlowChar = "";
+          state.tlvCurCtlFlowChar  = state.tlvPrevPrevCtlFlowChar
+            = state.tlvPrevCtlFlowChar = "";
           if (state.vxCodeActive == true) {
-            state.svxCurCtlFlowChar  = "\\";
-            vxIndent = svxGenIndent(stream, state);
+            state.tlvCurCtlFlowChar  = "\\";
+            vxIndent = tlvGenIndent(stream, state);
           }
           state.vxIndentRq = vxIndent;
         }
@@ -449,12 +449,12 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       },
       tokenBase: function(stream, state) {
         var vxIndent = 0, style = false;
-        var svxisOperatorChar = /[\[\]=:]/;
-        var svxkpScopePrefixs = {
+        var tlvisOperatorChar = /[\[\]=:]/;
+        var tlvkpScopePrefixs = {
           "**":"variable-2", "*":"variable-2", "$$":"variable", "$":"variable",
           "^^":"attribute", "^":"attribute"};
         var ch = stream.peek();
-        var vxCurCtlFlowCharValueAtStart = state.svxCurCtlFlowChar;
+        var vxCurCtlFlowCharValueAtStart = state.tlvCurCtlFlowChar;
         if (state.vxCodeActive == true) {
           if (/[\[\]{}\(\);\:]/.test(ch)) {
             // bypass nesting and 1 char punc
@@ -465,70 +465,70 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
             if (stream.eat("/")) {
               stream.skipToEnd();
               style = "comment";
-              state.svxCurCtlFlowChar = "S";
+              state.tlvCurCtlFlowChar = "S";
             } else {
               stream.backUp(1);
             }
           } else if (ch == "@") {
             // pipeline stage
-            style = svxchScopePrefixes[ch];
-            state.svxCurCtlFlowChar = "@";
+            style = tlvchScopePrefixes[ch];
+            state.tlvCurCtlFlowChar = "@";
             stream.next();
             stream.eatWhile(/[\w\$_]/);
           } else if (stream.match(/\b[mM]4+/, true)) { // match: function(pattern, consume, caseInsensitive)
             // m4 pre proc
             stream.skipTo("(");
             style = "def";
-            state.svxCurCtlFlowChar = "M";
+            state.tlvCurCtlFlowChar = "M";
           } else if (ch == "!" && stream.sol()) {
-            // v stmt in svx region
-            // state.svxCurCtlFlowChar  = "S";
+            // v stmt in tlv region
+            // state.tlvCurCtlFlowChar  = "S";
             style = "comment";
             stream.next();
-          } else if (svxisOperatorChar.test(ch)) {
+          } else if (tlvisOperatorChar.test(ch)) {
             // operators
-            stream.eatWhile(svxisOperatorChar);
+            stream.eatWhile(tlvisOperatorChar);
             style = "operator";
           } else if (ch == "#") {
             // phy hier
-            state.svxCurCtlFlowChar  = (state.svxCurCtlFlowChar == "")
-              ? ch : state.svxCurCtlFlowChar;
+            state.tlvCurCtlFlowChar  = (state.tlvCurCtlFlowChar == "")
+              ? ch : state.tlvCurCtlFlowChar;
             stream.next();
             stream.eatWhile(/[+-]\d/);
             style = "tag";
-          } else if (svxkpScopePrefixs.propertyIsEnumerable(ch)) {
-            // special SVX operators
-            style = svxkpScopePrefixs[ch];
-            state.svxCurCtlFlowChar = state.svxCurCtlFlowChar == "" ? "S" : state.svxCurCtlFlowChar;  // stmt
+          } else if (tlvkpScopePrefixs.propertyIsEnumerable(ch)) {
+            // special TLV operators
+            style = tlvkpScopePrefixs[ch];
+            state.tlvCurCtlFlowChar = state.tlvCurCtlFlowChar == "" ? "S" : state.tlvCurCtlFlowChar;  // stmt
             stream.next();
             stream.match(/[a-zA-Z_0-9]+/);
-          } else if (style = svxchScopePrefixes[ch] || false) {
-            // special SVX operators
-            state.svxCurCtlFlowChar = state.svxCurCtlFlowChar == "" ? ch : state.svxCurCtlFlowChar;
+          } else if (style = tlvchScopePrefixes[ch] || false) {
+            // special TLV operators
+            state.tlvCurCtlFlowChar = state.tlvCurCtlFlowChar == "" ? ch : state.tlvCurCtlFlowChar;
             stream.next();
             stream.match(/[a-zA-Z_0-9]+/);
           }
-          if (state.svxCurCtlFlowChar != vxCurCtlFlowCharValueAtStart) { // flow change
-            vxIndent = svxGenIndent(stream, state);
+          if (state.tlvCurCtlFlowChar != vxCurCtlFlowCharValueAtStart) { // flow change
+            vxIndent = tlvGenIndent(stream, state);
             state.vxIndentRq = vxIndent;
           }
         }
         return style;
       },
       token: function(stream, state) {
-        if (state.vxCodeActive == true && stream.sol() && state.svxCurCtlFlowChar != "") {
-          state.svxPrevPrevCtlFlowChar = state.svxPrevCtlFlowChar;
-          state.svxPrevCtlFlowChar = state.svxCurCtlFlowChar;
-          state.svxCurCtlFlowChar = "";
+        if (state.vxCodeActive == true && stream.sol() && state.tlvCurCtlFlowChar != "") {
+          state.tlvPrevPrevCtlFlowChar = state.tlvPrevCtlFlowChar;
+          state.tlvPrevCtlFlowChar = state.tlvCurCtlFlowChar;
+          state.tlvCurCtlFlowChar = "";
         }
       },
       indent: function(state) {
         return (state.vxCodeActive == true) ? state.vxIndentRq : -1;
       },
       startState: function(state) {
-        state.svxCurCtlFlowChar = "";
-        state.svxPrevCtlFlowChar = "";
-        state.svxPrevPrevCtlFlowChar = "";
+        state.tlvCurCtlFlowChar = "";
+        state.tlvPrevCtlFlowChar = "";
+        state.tlvPrevPrevCtlFlowChar = "";
         state.vxCodeActive = true;
         state.vxIndentRq = 0;
       }

From ad742950976b730876be3d78e03eb83dcfcdf73d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Mar 2015 12:02:35 +0100
Subject: [PATCH 2026/4742] Work around Firefox's undo in context menu causing
 odd side effects

It doesn't seem to be possible to capture it an perform an actual
undo, unfortunately.

Issue #3142
---
 lib/codemirror.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 339cf1eac6..47bfa74ddb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1384,8 +1384,14 @@
         return false;
       }
 
-      if (text.charCodeAt(0) == 0x200b && cm.doc.sel == cm.display.selForContextMenu && !prevInput)
-        prevInput = "\u200b";
+      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 = "";
+        }
+      }
       // Find the part of the input that is actually new
       var same = 0, l = Math.min(prevInput.length, text.length);
       while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
@@ -1461,7 +1467,7 @@
         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)
+            if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 && input.prevInput == "\u200b")
               operation(cm, commands.selectAll)(cm);
             else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
             else display.input.reset();

From 09f032d3f543c1f9d1b52ff81cf45c6bbfa094c7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Mar 2015 12:11:56 +0100
Subject: [PATCH 2027/4742] [vb mode] Register a list of hintWords

---
 mode/vb/vb.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 902203e0c0..665248f499 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -29,13 +29,14 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
     var middleKeywords = ['else','elseif','case', 'catch'];
     var endKeywords = ['next','loop'];
 
-    var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'in']);
-    var commonkeywords = ['as', 'dim', 'break',  'continue','optional', 'then',  'until',
+    var operatorKeywords = ['and', 'or', 'not', 'xor', 'in'];
+    var wordOperators = wordRegexp(operatorKeywords);
+    var commonKeywords = ['as', 'dim', 'break',  'continue','optional', 'then',  'until',
                           'goto', 'byval','byref','new','handles','property', 'return',
                           'const','private', 'protected', 'friend', 'public', 'shared', 'static', 'true','false'];
     var commontypes = ['integer','string','double','decimal','boolean','short','char', 'float','single'];
 
-    var keywords = wordRegexp(commonkeywords);
+    var keywords = wordRegexp(commonKeywords);
     var types = wordRegexp(commontypes);
     var stringPrefixes = '"';
 
@@ -47,8 +48,8 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
 
     var indentInfo = null;
 
-
-
+    CodeMirror.registerHelper("hintWords", "vb", openingKeywords.concat(middleKeywords).concat(endKeywords)
+                                .concat(operatorKeywords).concat(commonKeywords).concat(commontypes));
 
     function indent(_stream, state) {
       state.currentIndent++;

From 8fa467e250d68a567bbc7759a921aed7329ecbca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Mar 2015 12:25:26 +0100
Subject: [PATCH 2028/4742] Mark release 5.1.0

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

diff --git a/AUTHORS b/AUTHORS
index 9d62d48e63..a4f2b94b79 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -87,6 +87,7 @@ Christian Petrov
 Christopher Brown
 ciaranj
 CodeAnimal
+coderaiser
 ComFreek
 Curtis Gagliardi
 dagsta
@@ -230,6 +231,7 @@ jwallers@gmail.com
 kaniga
 Ken Newman
 Ken Rockot
+Kevin Earls
 Kevin Sawicki
 Kevin Ushey
 Klaus Silveira
@@ -351,6 +353,7 @@ Randall Mason
 Randy Burden
 Randy Edmunds
 Rasmus Erik Voel Jensen
+ray ratchup
 Ray Ratchup
 Richard van der Meer
 Richard Z.H. Wang
diff --git a/bower.json b/bower.json
index be3cdca9f5..334447e56d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"5.0.1",
+  "version":"5.1.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index b3ef59af3b..65df6483f5 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.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>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.12.0;f=">4.12</option>
diff --git a/doc/manual.html b/doc/manual.html
index 2fdf397ff2..fbf366df2b 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.0.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.1.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 3cfd68c6d2..c3f2afe062 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">23-03-2015: <a href="http://codemirror.net/codemirror-5.1.zip">Version 5.1</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="../mode/asciiarmor/index.html">ASCII armor</a> (PGP data), <a href="../mode/troff/index.html">Troff</a>, and <a href="../mode/cmake/index.html">CMake</a>.</li>
+    <li>Remove SmartyMixed mode, rewrite <a href="../mode/smarty/index.html">Smarty</a> mode to supersede it.</li>
+    <li>New commands in the <a href="manual.html#addon_merge">merge
+    addon</a>: <code>goNextDiff</code> and <code>goPrevDiff</code>.</li>
+    <li>The <a href="manual.html#addon_closebrackets">closebrackets addon</a> can now be configured per mode.</li>
+    <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/index.html b/index.html
index 3813fda1b1..163eeef3cb 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.1</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 47bfa74ddb..33f8f8f1a5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8679,7 +8679,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.0.1";
+  CodeMirror.version = "5.1.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 3d99c1adb0..a5c7cd093f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.0.1",
+    "version":"5.1.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

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 2029/4742] 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 @@ <h2>Version 5.x</h2>
     <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 2030/4742] 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 2031/4742] [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 2032/4742] [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 @@ <h2>Panel Demo</h2>
 
 <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 @@ <h2>Panel Demo</h2>
 </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 2033/4742] [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 2034/4742] 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 2035/4742] [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 2036/4742] 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 2037/4742] [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 2038/4742] [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 2039/4742] [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 2040/4742] [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 2041/4742] 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 2042/4742] [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 2043/4742] [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 2044/4742] 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 2045/4742] [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 2046/4742] [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 2047/4742] 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 2048/4742] 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 2049/4742] 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 2050/4742] [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 2051/4742] [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 @@ <h2>Script compression helper</h2>
           <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 @@ <h2>Language modes</h2>
       <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 @@ <h2>MUMPS mode</h2>
       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 2052/4742] [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 2053/4742] 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 2054/4742] 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 @@ <h2>This is CodeMirror</h2>
 <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 2055/4742] 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 @@ <h2>Configuration</h2>
       <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 2056/4742] [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 2057/4742] 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 2058/4742] [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 @@ <h2>Theme Demo</h2>
     <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 2059/4742] [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 @@ <h2>CodeMirror real-world uses</h2>
       <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 2060/4742] [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 2061/4742] [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 2062/4742] [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 2063/4742] [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 2064/4742] [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 2065/4742] 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 2066/4742] [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 2067/4742] [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 2068/4742] [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 2069/4742] 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 2070/4742] [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 2071/4742] [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 2072/4742] [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 2073/4742] 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 @@ <h2>Events</h2>
       <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 2074/4742] [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 2075/4742] 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 2076/4742] [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 @@ <h2>Script compression helper</h2>
           <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 @@ <h2>Language modes</h2>
       <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 2077/4742] [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 2078/4742] [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 2079/4742] [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 @@ <h2>Configuration</h2>
       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 2080/4742] [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 @@ <h2>Django template mode</h2>
 <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 @@ <h1>
       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 2081/4742] [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 @@ <h2>Z80 assembly mode</h2>
 <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 @@ <h2>Z80 assembly mode</h2>
       });
     </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 2082/4742] [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 2083/4742] [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 2084/4742] [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 @@ <h1>{{t 'article_list'}}</h1>
 
 </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 2085/4742] [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 2086/4742] [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 2087/4742] [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 2088/4742] [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 @@ <h2>Commands</h2>
       <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 2089/4742] 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 2090/4742] 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 2091/4742] [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 2092/4742] [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 2093/4742] [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 2094/4742] 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 2095/4742] [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 2096/4742] 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 2097/4742] [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 @@ <h2>CodeMirror real-world uses</h2>
       <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 2098/4742] [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 2099/4742] [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 2100/4742] 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 @@ <h2>Script compression helper</h2>
       <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>Release notes and version history</h2>
 
   <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 @@ <h2>This is CodeMirror</h2>
       </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",

From 691942de6664abea3fa35ff84253949251b7f9d6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Apr 2015 12:35:57 +0200
Subject: [PATCH 2101/4742] Bump version number post-5.2

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

diff --git a/bower.json b/bower.json
index 84808c8bc3..13e7e5b47d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"5.2.0",
+  "version":"5.2.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 185be703df..187a14ce5a 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.2.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.2.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 37e268554c..ba7ea1189d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8732,7 +8732,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.2.0";
+  CodeMirror.version = "5.2.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 1d198cd801..2ae2e6b72f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.2.0",
+    "version":"5.2.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 23b33c71b0793edbecfa445012cd5855a4d01c9a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Apr 2015 12:37:57 +0200
Subject: [PATCH 2102/4742] [release notes] Add dropped word

---
 doc/releases.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/releases.html b/doc/releases.html
index ec2a6bf68c..8d1e2cc008 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -41,7 +41,7 @@ <h2>Version 5.x</h2>
     
     <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 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>

From f14a29f5461402708a4eaadf9b1d404798b82b06 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 18 Apr 2015 11:14:28 -0400
Subject: [PATCH 2103/4742] [dialog addon] dialog inherits CodeMirror theme
 colors

Fixes https://github.com/codemirror/CodeMirror/issues/3215
---
 addon/dialog/dialog.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/dialog/dialog.css b/addon/dialog/dialog.css
index 2e7c0fc9b8..677c078387 100644
--- a/addon/dialog/dialog.css
+++ b/addon/dialog/dialog.css
@@ -1,11 +1,11 @@
 .CodeMirror-dialog {
   position: absolute;
   left: 0; right: 0;
-  background: white;
+  background: inherit;
   z-index: 15;
   padding: .1em .8em;
   overflow: hidden;
-  color: #333;
+  color: inherit;
 }
 
 .CodeMirror-dialog-top {

From 7a46dc1b0475a3a07e0edaa13cedb501e4888841 Mon Sep 17 00:00:00 2001
From: David Barnett <dbarnett@google.com>
Date: Mon, 20 Apr 2015 08:42:42 -0700
Subject: [PATCH 2104/4742] Fix bug showing imprecise value of vim 'filetype'
 option

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index ef5dd8c01b..45f883b213 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -463,7 +463,7 @@
       }
       // The 'filetype' option proxies to the CodeMirror 'mode' option.
       if (name === undefined) {
-        var mode = cm.getMode().name;
+        var mode = cm.getOption('mode');
         return mode == 'null' ? '' : mode;
       } else {
         var mode = name == '' ? 'null' : name;

From d5fbfc9c7ec601f9ba837513714d2c9bdd9d821d Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 19 Apr 2015 16:00:08 -0400
Subject: [PATCH 2105/4742] [vim] Add documentation

---
 demo/vim.html   |  19 ++++---
 doc/manual.html | 129 ++++++++++++++++++++++++++++++++++++++++++++++++
 keymap/vim.js   |  88 +++++++++++++--------------------
 3 files changed, 173 insertions(+), 63 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index 6a33a6c075..46c4581e61 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -47,17 +47,16 @@ <h2>Vim bindings demo</h2>
 </textarea></form>
 <div style="font-size: 13px; width: 300px; height: 30px;">Key buffer: <span id="command-display"></span></div>
 
-<p>The vim keybindings are enabled by
-including <a href="../keymap/vim.js">keymap/vim.js</a> and setting
-the <code>vimMode</code> option to <code>true</code>. This will also
-automatically change the <code>keyMap</code> option to <code>"vim"</code>.</p>
+<p>The vim keybindings are enabled by including <code><a
+href="../keymap/vim.js">keymap/vim.js</a></code> and setting the
+<code>keyMap</code> option to <code>vim</code>.</p>
 
 <p><strong>Features</strong></p>
 
 <ul>
   <li>All common motions and operators, including text objects</li>
   <li>Operator motion orthogonality</li>
-  <li>Visual mode - characterwise, linewise, partial support for blockwise</li>
+  <li>Visual mode - characterwise, linewise, blockwise</li>
   <li>Full macro support (q, @)</li>
   <li>Incremental highlighted search (/, ?, #, *, g#, g*)</li>
   <li>Search/replace with confirm (:substitute, :%s)</li>
@@ -71,9 +70,13 @@ <h2>Vim bindings demo</h2>
   <li>Cross-buffer yank/paste</li>
 </ul>
 
-<p>Note that while the vim mode tries to emulate the most useful features of
-vim as faithfully as possible, it does not strive to become a complete vim
-implementation</p>
+<p>For the full list of key mappings and Ex commands, refer to the
+<code>defaultKeymap</code> and <code>defaultExCommandMap</code> at the
+top of <code><a href="../keymap/vim.js">keymap/vim.js</a></code>.
+
+<p>Note that while the vim mode tries to emulate the most useful
+features of vim as faithfully as possible, it does not strive to
+become a complete vim implementation</p>
 
     <script>
       CodeMirror.commands.save = function(){ alert("Saving"); };
diff --git a/doc/manual.html b/doc/manual.html
index 187a14ce5a..faf49b3ecb 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -55,6 +55,12 @@
     </li>
     <li><a href="#addons">Addons</a></li>
     <li><a href="#modeapi">Writing CodeMirror Modes</a></li>
+    <li><a href="#vimapi">Vim Mode API</a>
+      <ul>
+        <li><a href="#vimapi_configuration">Configuration</a></li>
+        <li><a href="#vimapi_extending">Extending VIM</a></li>
+      </ul>
+    </li>
   </ul>
 </div>
 
@@ -3156,6 +3162,129 @@ <h2>Writing CodeMirror Modes</h2>
     looked up through <a href="#getMode"><code>getMode</code></a>.</p>
 </section>
 
+<section id="vimapi">
+    <h2>VIM Mode API</h2>
+
+    <p>CodeMirror has a robust VIM mode that attempts to faithfully
+    emulate VIM's most useful features. It can be enabled by
+    including <a href="../keymap/vim.js"><code>keymap/vim.js</code>
+    </a> and setting the <code>keymap</code> option to
+    <code>vim</code>.</p>
+
+    <h3 id="vimapi_configuration">Configuration</h3>
+
+    <p>VIM mode accepts configuration options for customizing
+    behavior at run time. These methods can be called at any time
+    and will affect all existing CodeMirror instances unless
+    specified otherwise. The methods are exposed on the
+    <code><strong>CodeMirror.Vim</strong></code> object.</p>
+
+    <dl>
+      <dt id="vimapi_setOption"><code><strong>setOption(name: string, value: any, ?cm: CodeMirror, ?cfg: object)</strong></code></dt>
+      <dd>Sets the value of a VIM option. <code>name</code> should
+      be the name of an option. If <code>cfg.scope</code> is not set
+      and <code>cm</code> is provided, then sets the global and
+      instance values of the option. Otherwise, sets either the
+      global or instance value of the option depending on whether
+      <code>cfg.scope</code> is <code>global</code> or
+      <code>local</code>.</dd>
+      <dt id="vimapi_getOption"><code><strong>getOption(name: string, ?cm: CodeMirror: ?cfg: object)</strong></code></dt>
+      <dd>Gets the current value of a VIM option. If
+      <code>cfg.scope</code> is not set and <code>cm</code> is
+      provided, then gets the instance value of the option, falling
+      back to the global value if not set. If <code>cfg.scope</code> is provided, then gets the <code>global</code> or
+      <code>local</code> value without checking the other.</dd>
+
+      <dt id="vimapi_map"><code><strong>map(lhs: string, rhs: string, ?context: string)</strong></code></dt>
+      <dd>Maps a key sequence to another key sequence. Implements
+      VIM's <code>:map</code> command. To map ; to : in VIM would be
+      <code><strong>:map ; :</strong></code>. That would translate to
+      <code><strong>CodeMirror.Vim.map(';', ':');</strong></code>.
+      The <code>context</code> can be <code>normal</code>,
+      <code>visual</code>, or <code>insert</code>, which correspond
+      to <code>:nmap</code>, <code>:vmap</code>, and
+      <code>:imap</code>
+      respectively.</dd>
+
+      <dt id="vimapi_mapCommand"><code><strong>mapCommand(keys: string, type: string, name: string, ?args: object, ?extra: object)</strong></code></dt>
+      <dd>Maps a key sequence to a <code>motion</code>,
+      <code>operator</code>, or <code>action</code> type command.
+      The args object is passed through to the command when it is
+      invoked by the provided key sequence.
+      <code>extras.context</code> can be <code>normal</code>,
+      <code>visual</code>, or <code>insert</code>, to map the key
+      sequence only in the corresponding mode.
+      <code>extras.isEdit</code> is applicable only to actions,
+      determining whether it is recorded for replay for the
+      <code>.</code> single-repeat command.
+    </dl>
+
+    <h3 id="vimapi_extending">Extending VIM</h3>
+
+    <p>CodeMirror's VIM mode implements a large subset of VIM's core
+    editing functionality. But since there's always more to be
+    desired, there is a set of APIs for extending VIM's
+    functionality. As with the configuration API, the methods are
+    exposed on <code><strong>CodeMirror.Vim</strong></code> and may
+    be called at any time.</p>
+
+    <dl>
+      <dt id="vimapi_defineOption"><code><strong>defineOption(name: string, default: any, type: string, ?aliases: array&lt;string&gt;, ?callback: function (?value: any, ?cm: CodeMirror) → ?any)</strong></code></dt>
+      <dd>Defines a VIM style option and makes it available to the
+      <code>:set</code> command. Type can be <code>boolean</code> or
+      <code>string</code>, used for validation and by
+      <code>:set</code> to determine which syntax to accept. If a
+      <code>callback</code> is passed in, VIM does not store the value of the
+      option itself, but instead uses the callback as a setter/getter. If the
+      first argument to the callback is <code>undefined</code>, then the
+      callback should return the value of the option. Otherwise, it should set
+      instead. Since VIM options have global and instance values, whether a
+      <code>CodeMirror</code> instance is passed in denotes whether the global
+      or local value should be used. Consequently, it's possible for the
+      callback to be called twice for a single <code>setOption</code> or
+      <code>getOption</code> call. Note that right now, VIM does not support
+      defining buffer-local options that do not have global values. If an
+      option should not have a global value, either always ignore the
+      <code>cm</code> parameter in the callback, or always pass in a
+      <code>cfg.scope</code> to <code>setOption</code> and
+      <code>getOption</code>.</dd>
+
+      <dt id="vimapi_defineMotion"><code><strong>defineMotion(name: string, fn: function(cm: CodeMirror, head: {line, ch}, ?motionArgs: object}) → {line, ch})</strong></code></dt>
+      <dd>Defines a motion command for VIM. The motion should return
+      the desired result position of the cursor. <code>head</code>
+      is the current position of the cursor. It can differ from
+      <code>cm.getCursor('head')</code> if VIM is in visual mode.
+      <code>motionArgs</code> is the object passed into
+      <strong><code>mapCommand()</code></strong>.</dd>
+
+      <dt id="vimapi_defineOperator"><strong><code>defineOperator(name: string, fn: function(cm: CodeMirror, ?operatorArgs: object, ranges: array&lt;{anchor, head}&gt;) → ?{line, ch})</code></strong></dt>
+      <dd>Defines an operator command, similar to <strong><code>
+      defineMotion</code></strong>. <code>ranges</code> is the range
+      of text the operator should operate on. If the cursor should
+      be set to a certain position after the operation finishes, it
+      can return a cursor object.</dd>
+
+      <dt id="vimapi_defineActon"><strong><code>defineAction(name: string, fn: function(cm: CodeMirror, ?actionArgs: object))</strong></code></dt>
+      <dd>Defines an action command, similar to
+      <strong><code>defineMotion</code></strong>. Action commands
+      can have arbitrary behavior, making them more flexible than
+      motions and operators, at the loss of orthogonality.</dd>
+
+      <dt id="vimapi_defineEx"><strong><code>defineEx(name: string, ?prefix: string, fn: function(cm: CodeMirror, ?params: object))</code></strong></dt>
+      <dd>Defines an Ex command, and maps it to <code>:name</code>.
+      If a prefix is provided, it, and any prefixed substring of the
+      <code>name</code> beginning with the <code>prefix</code> can
+      be used to invoke the command. <code>params.argString</code>
+      contains the part of the prompted string after the command
+      name. <code>params.args</code> is <code>params.argString</code>
+      split by whitespace. If the command was prefixed with a
+      <code><strong><a href="http://vimdoc.sourceforge.net/htmldoc/cmdline.html#cmdline-ranges">line range</a></strong></code>,
+      <code>params.line</code> and <code>params.lineEnd</code> will
+      be set.
+    </dl>
+
+</section>
+
 </article>
 
 <script>setTimeout(function(){CodeMirror.colorize();}, 20);</script>
diff --git a/keymap/vim.js b/keymap/vim.js
index 45f883b213..2ede2167b6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3,42 +3,16 @@
 
 /**
  * Supported keybindings:
+ *   Too many to list. Refer to defaultKeyMap below.
  *
- *   Motion:
- *   h, j, k, l
- *   gj, gk
- *   e, E, w, W, b, B, ge, gE
- *   f<character>, F<character>, t<character>, T<character>
- *   $, ^, 0, -, +, _
- *   gg, G
- *   %
- *   '<character>, `<character>
- *
- *   Operator:
- *   d, y, c
- *   dd, yy, cc
- *   g~, g~g~
- *   >, <, >>, <<
- *
- *   Operator-Motion:
- *   x, X, D, Y, C, ~
- *
- *   Action:
- *   a, i, s, A, I, S, o, O
- *   zz, z., z<CR>, zt, zb, z-
- *   J
- *   u, Ctrl-r
- *   m<character>
- *   r<character>
- *
- *   Modes:
- *   ESC - leave insert mode, visual mode, and clear input state.
- *   Ctrl-[, Ctrl-c - same as ESC.
+ * Supported Ex commands:
+ *   Refer to defaultExCommandMap below.
  *
  * Registers: unnamed, -, a-z, A-Z, 0-9
  *   (Does not respect the special case for number registers when delete
  *    operator is made with these commands: %, (, ),  , /, ?, n, N, {, } )
  *   TODO: Implement the remaining registers.
+ *
  * Marks: a-z, A-Z, and 0-9
  *   TODO: Implement the remaining special marks. They have more complex
  *       behavior.
@@ -57,6 +31,7 @@
  *  6. Motion, operator, and action implementations
  *  7. Helper functions for the key handler, motions, operators, and actions
  *  8. Set up Vim to work as a keymap for CodeMirror.
+ *  9. Ex command implementations.
  */
 
 (function(mod) {
@@ -227,6 +202,34 @@
     { keys: ':', type: 'ex' }
   ];
 
+  /**
+   * Ex commands
+   * Care must be taken when adding to the default Ex command map. For any
+   * 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' },
+    { name: 'vmap', shortName: 'vm' },
+    { name: 'unmap' },
+    { name: 'write', shortName: 'w' },
+    { name: 'undo', shortName: 'u' },
+    { name: 'redo', shortName: 'red' },
+    { 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' },
+    { name: 'delmarks', shortName: 'delm' },
+    { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
+    { name: 'global', shortName: 'g' }
+  ];
+
   var Pos = CodeMirror.Pos;
 
   var Vim = function() {
@@ -3913,31 +3916,6 @@
       return {top: from.line, bottom: to.line};
     }
 
-    // Ex command handling
-    // Care must be taken when adding to the default Ex command map. For any
-    // 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' },
-      { name: 'vmap', shortName: 'vm' },
-      { name: 'unmap' },
-      { name: 'write', shortName: 'w' },
-      { name: 'undo', shortName: 'u' },
-      { name: 'redo', shortName: 'red' },
-      { 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' },
-      { name: 'delmarks', shortName: 'delm' },
-      { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
-      { name: 'global', shortName: 'g' }
-    ];
     var ExCommandDispatcher = function() {
       this.buildCommandMap_();
     };

From dafd32fdf3842bcff355135c44f9e11a2feceac5 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Wed, 22 Apr 2015 23:21:31 -0400
Subject: [PATCH 2106/4742] [vim] Load solarized and midnight themes

https://github.com/codemirror/CodeMirror/pull/3212
---
 demo/vim.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/demo/vim.html b/demo/vim.html
index 46c4581e61..be4b857213 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -6,6 +6,8 @@
 
 <link rel="stylesheet" href="../lib/codemirror.css">
 <link rel="stylesheet" href="../addon/dialog/dialog.css">
+<link rel="stylesheet" href="../theme/midnight.css">
+<link rel="stylesheet" href="../theme/solarized.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/search/searchcursor.js"></script>

From bb61349fa659f29877b29e0ed7e2c4beea57ffe2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 23 Apr 2015 09:46:58 +0200
Subject: [PATCH 2107/4742] [show-hint addon] Fix completeSingle options

Issue #3189
---
 addon/hint/show-hint.js | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 539181fdb7..cb60afe03c 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -33,7 +33,7 @@
     if (!completion.options.hint) return;
 
     CodeMirror.signal(this, "startCompletion", this);
-    completion.update();
+    completion.update(true);
   });
 
   function Completion(cm, options) {
@@ -78,15 +78,6 @@
       this.close();
     },
 
-    showHints: function(data) {
-      if (!data || !data.list.length || !this.active()) return this.close();
-
-      if (this.options.completeSingle && data.list.length == 1)
-        this.pick(data, 0);
-      else
-        this.showWidget(data);
-    },
-
     cursorActivity: function() {
       if (this.debounce) {
         cancelAnimationFrame(this.debounce);
@@ -105,22 +96,23 @@
       }
     },
 
-    update: function() {
+    update: function(first) {
       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);
+        this.finishUpdate(this.options.hint(this.cm, this.options), first);
       } else {
         var myTick = ++this.tick, self = this;
         this.options.hint(this.cm, function(data) {
-          if (self.tick == myTick) self.finishUpdate(data);
+          if (self.tick == myTick) self.finishUpdate(data, first);
         }, this.options);
       }
     },
 
-    finishUpdate: function(data) {
+    finishUpdate: function(data, first) {
       this.data = data;
-      var picked = this.widget && this.widget.picked;
+
+      var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
       if (this.widget) this.widget.close();
       if (data && data.list.length) {
         if (picked && data.list.length == 1) this.pick(data, 0);
@@ -128,12 +120,6 @@
       }
     },
 
-    showWidget: function(data) {
-      this.data = data;
-      this.widget = new Widget(this, data);
-      CodeMirror.signal(data, "shown");
-    },
-
     buildOptions: function(options) {
       var editor = this.cm.options.hintOptions;
       var out = {};

From 0185ceeae11d09c963942fbeb1df70db09eaa122 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 25 Apr 2015 20:50:44 -0400
Subject: [PATCH 2108/4742] [vim] Replay last command with @:

https://github.com/codemirror/CodeMirror/issues/3219
---
 keymap/vim.js    | 8 ++++++++
 test/vim_test.js | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 2ede2167b6..8e08e64385 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4757,6 +4757,14 @@
 
     function executeMacroRegister(cm, vim, macroModeState, registerName) {
       var register = vimGlobalState.registerController.getRegister(registerName);
+      if (registerName == ':') {
+        // Read-only register containing last Ex command.
+        if (register.keyBuffer[0]) {
+          exCommandDispatcher.processCommand(cm, register.keyBuffer[0]);
+        }
+        macroModeState.isPlaying = false;
+        return;
+      }
       var keyBuffer = register.keyBuffer;
       var imc = 0;
       macroModeState.isPlaying = true;
diff --git a/test/vim_test.js b/test/vim_test.js
index b2b7e25211..ff51d0cf42 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2460,6 +2460,13 @@ testVim('macro_multislash_search', function(cm, vim, helpers) {
   helpers.doKeys('@', 'd');
   helpers.assertCursorAt(0, 15);
 }, { value: 'one line of text to rule them all.'});
+testVim('macro_last_ex_command_register', function (cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doEx('s/a/b');
+  helpers.doKeys('2', '@', ':');
+  eq('bbbaa', cm.getValue());
+  helpers.assertCursorAt(0, 2);
+}, { value: 'aaaaa'});
 testVim('macro_parens', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'z', 'i');

From bdd6c0edc8031a061a4df6d4f936bfdf69c8d691 Mon Sep 17 00:00:00 2001
From: Hector Oswaldo Caballero <hector.caballero@ericsson.com>
Date: Tue, 28 Apr 2015 10:00:23 +0200
Subject: [PATCH 2109/4742] [asn.1 mode] Add

---
 doc/compress.html     |   2 +
 mode/asn.1/asn.1.js   | 204 ++++++++++++++++++++++++++++++++++++++++++
 mode/asn.1/index.html |  78 ++++++++++++++++
 mode/index.html       |   1 +
 4 files changed, 285 insertions(+)
 create mode 100644 mode/asn.1/asn.1.js
 create mode 100644 mode/asn.1/index.html

diff --git a/doc/compress.html b/doc/compress.html
index 581bacf07f..83d486ea57 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -105,6 +105,8 @@ <h2>Script compression helper</h2>
         </optgroup>
         <optgroup label="Modes">
           <option value="http://codemirror.net/mode/apl/apl.js">apl.js</option>
+          <option value="http://codemirror.net/mode/asn.1/asn.1.js">asn.1.js</option>
+          <option value="http://codemirror.net/mode/asterisk/asterisk.js">asterisk.js</option>
           <option value="http://codemirror.net/mode/asciiarmor/asciiarmor.js">asciiarmor.js</option>
           <option value="http://codemirror.net/mode/clike/clike.js">clike.js</option>
           <option value="http://codemirror.net/mode/clojure/clojure.js">clojure.js</option>
diff --git a/mode/asn.1/asn.1.js b/mode/asn.1/asn.1.js
new file mode 100644
index 0000000000..9600247ea6
--- /dev/null
+++ b/mode/asn.1/asn.1.js
@@ -0,0 +1,204 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("asn.1", function(config, parserConfig) {
+    var indentUnit = config.indentUnit,
+        keywords = parserConfig.keywords || {},
+        cmipVerbs = parserConfig.cmipVerbs || {},
+        compareTypes = parserConfig.compareTypes || {},
+        status = parserConfig.status || {},
+        tags = parserConfig.tags || {},
+        storage = parserConfig.storage || {},
+        modifier = parserConfig.modifier || {},
+        accessTypes = parserConfig.accessTypes|| {},
+        multiLineStrings = parserConfig.multiLineStrings,
+        indentStatements = parserConfig.indentStatements !== false;
+    var isOperatorChar = /[\|\^]/;
+    var curPunc;
+
+    function tokenBase(stream, state) {
+      var ch = stream.next();
+      if (ch == '"' || ch == "'") {
+        state.tokenize = tokenString(ch);
+        return state.tokenize(stream, state);
+      }
+      if (/[\[\]\(\){}:=,;]/.test(ch)) {
+        curPunc = ch;
+        return "punctuation";
+      }
+      if (ch == "-"){
+        if (stream.eat("-")) {
+          stream.skipToEnd();
+          return "comment";
+        }
+      }
+      if (/\d/.test(ch)) {
+        stream.eatWhile(/[\w\.]/);
+        return "number";
+      }
+      if (isOperatorChar.test(ch)) {
+        stream.eatWhile(isOperatorChar);
+        return "operator";
+      }
+
+      stream.eatWhile(/[\w\-]/);
+      var cur = stream.current();
+      if (keywords.propertyIsEnumerable(cur)) return "keyword";
+      if (cmipVerbs.propertyIsEnumerable(cur)) return "variable cmipVerbs";
+      if (compareTypes.propertyIsEnumerable(cur)) return "atom compareTypes";
+      if (status.propertyIsEnumerable(cur)) return "comment status";
+      if (tags.propertyIsEnumerable(cur)) return "variable-3 tags";
+      if (storage.propertyIsEnumerable(cur)) return "builtin storage";
+      if (modifier.propertyIsEnumerable(cur)) return "string-2 modifier";
+      if (accessTypes.propertyIsEnumerable(cur)) return "atom accessTypes";
+
+      return "variable";
+    }
+
+    function tokenString(quote) {
+      return function(stream, state) {
+        var escaped = false, next, end = false;
+        while ((next = stream.next()) != null) {
+          if (next == quote && !escaped){
+            var afterNext = stream.peek();
+            //look if the character if the quote is like the B in '10100010'B
+            if (afterNext){
+              afterNext = afterNext.toLowerCase();
+              if(afterNext == "b" || afterNext == "h" || afterNext == "o")
+                stream.next();
+            }
+            end = true; break;
+          }
+          escaped = !escaped && next == "\\";
+        }
+        if (end || !(escaped || multiLineStrings))
+          state.tokenize = null;
+        return "string";
+      };
+    }
+
+    function Context(indented, column, type, align, prev) {
+      this.indented = indented;
+      this.column = column;
+      this.type = type;
+      this.align = align;
+      this.prev = prev;
+    }
+    function pushContext(state, col, type) {
+      var indent = state.indented;
+      if (state.context && state.context.type == "statement")
+        indent = state.context.indented;
+      return state.context = new Context(indent, col, type, null, state.context);
+    }
+    function popContext(state) {
+      var t = state.context.type;
+      if (t == ")" || t == "]" || t == "}")
+        state.indented = state.context.indented;
+      return state.context = state.context.prev;
+    }
+
+    //Interface
+    return {
+      startState: function(basecolumn) {
+        return {
+          tokenize: null,
+          context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+          indented: 0,
+          startOfLine: true
+        };
+      },
+
+      token: function(stream, state) {
+        var ctx = state.context;
+        if (stream.sol()) {
+          if (ctx.align == null) ctx.align = false;
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+        curPunc = null;
+        var style = (state.tokenize || tokenBase)(stream, state);
+        if (style == "comment") return style;
+        if (ctx.align == null) ctx.align = true;
+
+        if ((curPunc == ";" || curPunc == ":" || curPunc == ",")
+            && ctx.type == "statement"){
+          popContext(state);
+        }
+        else if (curPunc == "{") pushContext(state, stream.column(), "}");
+        else if (curPunc == "[") pushContext(state, stream.column(), "]");
+        else if (curPunc == "(") pushContext(state, stream.column(), ")");
+        else if (curPunc == "}") {
+          while (ctx.type == "statement") ctx = popContext(state);
+          if (ctx.type == "}") ctx = popContext(state);
+          while (ctx.type == "statement") ctx = popContext(state);
+        }
+        else if (curPunc == ctx.type) popContext(state);
+        else if (indentStatements && (((ctx.type == "}" || ctx.type == "top")
+            && curPunc != ';') || (ctx.type == "statement"
+            && curPunc == "newstatement")))
+          pushContext(state, stream.column(), "statement");
+
+        state.startOfLine = false;
+        return style;
+      },
+
+      electricChars: "{}",
+      lineComment: "--",
+      fold: "brace"
+    };
+  });
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  CodeMirror.defineMIME("text/x-ttcn-asn", {
+    name: "asn.1",
+    keywords: words("DEFINITIONS OBJECTS IF DERIVED INFORMATION ACTION" +
+    " REPLY ANY NAMED CHARACTERIZED BEHAVIOUR REGISTERED" +
+    " WITH AS IDENTIFIED CONSTRAINED BY PRESENT BEGIN" +
+    " IMPORTS FROM UNITS SYNTAX MIN-ACCESS MAX-ACCESS" +
+    " MINACCESS MAXACCESS REVISION STATUS DESCRIPTION" +
+    " SEQUENCE SET COMPONENTS OF CHOICE DistinguishedName" +
+    " ENUMERATED SIZE MODULE END INDEX AUGMENTS EXTENSIBILITY" +
+    " IMPLIED EXPORTS"),
+    cmipVerbs: words("ACTIONS ADD GET NOTIFICATIONS REPLACE REMOVE"),
+    compareTypes: words("OPTIONAL DEFAULT MANAGED MODULE-TYPE MODULE_IDENTITY" +
+    " MODULE-COMPLIANCE OBJECT-TYPE OBJECT-IDENTITY" +
+    " OBJECT-COMPLIANCE MODE CONFIRMED CONDITIONAL" +
+    " SUBORDINATE SUPERIOR CLASS TRUE FALSE NULL" +
+    " TEXTUAL-CONVENTION"),
+    status: words("current deprecated mandatory obsolete"),
+    tags: words("APPLICATION AUTOMATIC EXPLICIT IMPLICIT PRIVATE TAGS" +
+    " UNIVERSAL"),
+    storage: words("BOOLEAN INTEGER OBJECT IDENTIFIER BIT OCTET STRING" +
+    " UTCTime InterfaceIndex IANAifType CMIP-Attribute" +
+    " REAL PACKAGE PACKAGES IpAddress PhysAddress" +
+    " NetworkAddress BITS BMPString TimeStamp TimeTicks" +
+    " TruthValue RowStatus DisplayString GeneralString" +
+    " GraphicString IA5String NumericString" +
+    " PrintableString SnmpAdminAtring TeletexString" +
+    " UTF8String VideotexString VisibleString StringStore" +
+    " ISO646String T61String UniversalString Unsigned32" +
+    " Integer32 Gauge Gauge32 Counter Counter32 Counter64"),
+    modifier: words("ATTRIBUTE ATTRIBUTES MANDATORY-GROUP MANDATORY-GROUPS" +
+    " GROUP GROUPS ELEMENTS EQUALITY ORDERING SUBSTRINGS" +
+    " DEFINED"),
+    accessTypes: words("not-accessible accessible-for-notify read-only" +
+    " read-create read-write"),
+    multiLineStrings: true
+  });
+});
diff --git a/mode/asn.1/index.html b/mode/asn.1/index.html
new file mode 100644
index 0000000000..8346f8e500
--- /dev/null
+++ b/mode/asn.1/index.html
@@ -0,0 +1,78 @@
+<!doctype html>
+
+<title>CodeMirror: ASN.1 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="asn.1.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="http://en.wikipedia.org/wiki/Abstract_Syntax_Notation_One">ASN.1</a>
+    </ul>
+</div>
+<article>
+    <h2>ASN.1 example</h2>
+    <div>
+        <textarea id="ttcn-asn-code">
+ --
+ -- Sample ASN.1 Code
+ --
+ MyModule DEFINITIONS ::=
+ BEGIN
+
+ MyTypes ::= SEQUENCE {
+     myObjectId   OBJECT IDENTIFIER,
+     mySeqOf      SEQUENCE OF MyInt,
+     myBitString  BIT STRING {
+                         muxToken(0),
+                         modemToken(1)
+                  }
+ }
+
+ MyInt ::= INTEGER (0..65535)
+
+ END
+        </textarea>
+    </div>
+
+    <script>
+        var ttcnEditor = CodeMirror.fromTextArea(document.getElementById("ttcn-asn-code"), {
+            lineNumbers: true,
+            matchBrackets: true,
+            mode: "text/x-ttcn-asn"
+        });
+        ttcnEditor.setSize(400, 400);
+        var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
+        CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
+    </script>
+    <br/>
+    <p><strong>Language:</strong> Abstract Syntax Notation One
+        (<a href="http://www.itu.int/en/ITU-T/asn1/Pages/introduction.aspx">ASN.1</a>)
+    </p>
+    <p><strong>MIME types defined:</strong> <code>text/x-ttcn-asn</code></p>
+
+    <br/>
+    <p>The development of this mode has been sponsored by <a href="http://www.ericsson.com/">Ericsson
+    </a>.</p>
+    <p>Coded by Asmelash Tsegay Gebretsadkan </p>
+    </article>
+</article>
+
diff --git a/mode/index.html b/mode/index.html
index 245595de4e..2652de6f27 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -31,6 +31,7 @@ <h2>Language modes</h2>
   <div style="-webkit-columns: 100px 2; -moz-columns: 100px 2; columns: 100px 2;">
     <ul style="margin-top: 0">
       <li><a href="apl/index.html">APL</a></li>
+      <li><a href="asn.1/index.html">ASN.1</a></li>
       <li><a href="asterisk/index.html">Asterisk dialplan</a></li>
       <li><a href="clike/index.html">C, C++, C#</a></li>
       <li><a href="clojure/index.html">Clojure</a></li>

From 92ec62d2785a71e3794f35d9c75399b21a3bbe16 Mon Sep 17 00:00:00 2001
From: Hector Oswaldo Caballero <hector.caballero@ericsson.com>
Date: Tue, 28 Apr 2015 10:02:11 +0200
Subject: [PATCH 2110/4742] [ttcn mode] Add

---
 doc/compress.html    |   1 +
 mode/index.html      |   1 +
 mode/ttcn/index.html | 118 ++++++++++++++++++
 mode/ttcn/ttcn.js    | 283 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 403 insertions(+)
 create mode 100644 mode/ttcn/index.html
 create mode 100644 mode/ttcn/ttcn.js

diff --git a/doc/compress.html b/doc/compress.html
index 83d486ea57..d7ef62de68 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -193,6 +193,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/toml/toml.js">toml.js</option>
           <option value="http://codemirror.net/mode/tornado/tornado.js">tornado.js</option>
           <option value="http://codemirror.net/mode/troff/troff.js">troff.js</option>
+          <option value="http://codemirror.net/mode/ttcn/ttcn.js">ttcn.js</option>
           <option value="http://codemirror.net/mode/turtle/turtle.js">turtle.js</option>
           <option value="http://codemirror.net/mode/vb/vb.js">vb.js</option>
           <option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
diff --git a/mode/index.html b/mode/index.html
index 2652de6f27..5d895cacc7 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -123,6 +123,7 @@ <h2>Language modes</h2>
       <li><a href="toml/index.html">TOML</a></li>
       <li><a href="tornado/index.html">Tornado</a> (templating language)</li>
       <li><a href="troff/index.html">troff</a> (for manpages)</li>
+      <li><a href="ttcn/index.html">TTCN</a></li>
       <li><a href="turtle/index.html">Turtle</a></li>
       <li><a href="vb/index.html">VB.NET</a></li>
       <li><a href="vbscript/index.html">VBScript</a></li>
diff --git a/mode/ttcn/index.html b/mode/ttcn/index.html
new file mode 100644
index 0000000000..f1ef811310
--- /dev/null
+++ b/mode/ttcn/index.html
@@ -0,0 +1,118 @@
+<!doctype html>
+
+<title>CodeMirror: TTCN 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="ttcn.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="http://en.wikipedia.org/wiki/TTCN">TTCN</a>
+    </ul>
+</div>
+<article>
+    <h2>TTCN example</h2>
+    <div>
+        <textarea id="ttcn-code">
+module Templates {
+  /* import types from ASN.1 */
+  import from Types language "ASN.1:1997" all;
+
+  /* During the conversion phase from ASN.1 to TTCN-3 */
+  /* - the minus sign (Message-Type) within the identifiers will be replaced by underscore (Message_Type)*/
+  /* - the ASN.1 identifiers matching a TTCN-3 keyword (objid) will be postfixed with an underscore (objid_)*/
+
+  // simple types
+
+  template SenderID localObjid := objid {itu_t(0) identified_organization(4) etsi(0)};
+
+  // complex types
+
+  /* ASN.1 Message-Type mapped to TTCN-3 Message_Type */
+  template Message receiveMsg(template (present) Message_Type p_messageType) := {
+    header := p_messageType,
+    body := ?
+  }
+
+  /* ASN.1 objid mapped to TTCN-3 objid_ */
+  template Message sendInviteMsg := {
+      header := inviteType,
+      body := {
+        /* optional fields may be assigned by omit or may be ignored/skipped */
+        description := "Invite Message",
+        data := 'FF'O,
+        objid_ := localObjid
+      }
+  }
+
+  template Message sendAcceptMsg modifies sendInviteMsg := {
+      header := acceptType,
+      body := {
+        description := "Accept Message"
+      }
+    };
+
+  template Message sendErrorMsg modifies sendInviteMsg := {
+      header := errorType,
+      body := {
+        description := "Error Message"
+      }
+    };
+
+  template Message expectedErrorMsg := {
+      header := errorType,
+      body := ?
+    };
+
+  template Message expectedInviteMsg modifies expectedErrorMsg := {
+      header := inviteType
+    };
+
+  template Message expectedAcceptMsg modifies expectedErrorMsg := {
+      header := acceptType
+    };
+
+} with { encode "BER:1997" }
+        </textarea>
+    </div>
+
+    <script> 
+      var ttcnEditor = CodeMirror.fromTextArea(document.getElementById("ttcn-code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-ttcn"
+      });
+      ttcnEditor.setSize(600, 860);
+      var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
+      CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
+    </script>
+    <br/>
+    <p><strong>Language:</strong> Testing and Test Control Notation
+        (<a href="http://en.wikipedia.org/wiki/TTCN">TTCN</a>)
+    </p>
+    <p><strong>MIME types defined:</strong> <code>text/x-ttcn,
+        text/x-ttcn3, text/x-ttcnpp</code>.</p>
+    <br/>
+    <p>The development of this mode has been sponsored by <a href="http://www.ericsson.com/">Ericsson
+    </a>.</p>
+    <p>Coded by Asmelash Tsegay Gebretsadkan </p>
+</article>
+
diff --git a/mode/ttcn/ttcn.js b/mode/ttcn/ttcn.js
new file mode 100644
index 0000000000..3051851779
--- /dev/null
+++ b/mode/ttcn/ttcn.js
@@ -0,0 +1,283 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("ttcn", function(config, parserConfig) {
+    var indentUnit = config.indentUnit,
+        keywords = parserConfig.keywords || {},
+        builtin = parserConfig.builtin || {},
+        timerOps = parserConfig.timerOps || {},
+        portOps  = parserConfig.portOps || {},
+        configOps = parserConfig.configOps || {},
+        verdictOps = parserConfig.verdictOps || {},
+        sutOps = parserConfig.sutOps || {},
+        functionOps = parserConfig.functionOps || {},
+
+        verdictConsts = parserConfig.verdictConsts || {},
+        booleanConsts = parserConfig.booleanConsts || {},
+        otherConsts   = parserConfig.otherConsts || {},
+
+        types = parserConfig.types || {},
+        visibilityModifiers = parserConfig.visibilityModifiers || {},
+        templateMatch = parserConfig.templateMatch || {},
+        multiLineStrings = parserConfig.multiLineStrings,
+        indentStatements = parserConfig.indentStatements !== false;
+    var isOperatorChar = /[+\-*&@=<>!\/]/;
+    var curPunc;
+
+    function tokenBase(stream, state) {
+      var ch = stream.next();
+
+      if (ch == '"' || ch == "'") {
+        state.tokenize = tokenString(ch);
+        return state.tokenize(stream, state);
+      }
+      if (/[\[\]{}\(\),;\\:\?\.]/.test(ch)) {
+        curPunc = ch;
+        return "punctuation";
+      }
+      if (ch == "#"){
+        stream.skipToEnd();
+        return "atom preprocessor";
+      }
+      if (ch == "%"){
+        stream.eatWhile(/\b/);
+        return "atom ttcn3Macros";
+      }
+      if (/\d/.test(ch)) {
+        stream.eatWhile(/[\w\.]/);
+        return "number";
+      }
+      if (ch == "/") {
+        if (stream.eat("*")) {
+          state.tokenize = tokenComment;
+          return tokenComment(stream, state);
+        }
+        if (stream.eat("/")) {
+          stream.skipToEnd();
+          return "comment";
+        }
+      }
+      if (isOperatorChar.test(ch)) {
+        if(ch == "@"){
+          if(stream.match("try") || stream.match("catch")
+              || stream.match("lazy")){
+            return "keyword";
+          }
+        }
+        stream.eatWhile(isOperatorChar);
+        return "operator";
+      }
+      stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+      var cur = stream.current();
+
+      if (keywords.propertyIsEnumerable(cur)) return "keyword";
+      if (builtin.propertyIsEnumerable(cur)) return "builtin";
+
+      if (timerOps.propertyIsEnumerable(cur)) return "def timerOps";
+      if (configOps.propertyIsEnumerable(cur)) return "def configOps";
+      if (verdictOps.propertyIsEnumerable(cur)) return "def verdictOps";
+      if (portOps.propertyIsEnumerable(cur)) return "def portOps";
+      if (sutOps.propertyIsEnumerable(cur)) return "def sutOps";
+      if (functionOps.propertyIsEnumerable(cur)) return "def functionOps";
+
+      if (verdictConsts.propertyIsEnumerable(cur)) return "string verdictConsts";
+      if (booleanConsts.propertyIsEnumerable(cur)) return "string booleanConsts";
+      if (otherConsts.propertyIsEnumerable(cur)) return "string otherConsts";
+
+      if (types.propertyIsEnumerable(cur)) return "builtin types";
+      if (visibilityModifiers.propertyIsEnumerable(cur))
+        return "builtin visibilityModifiers";
+      if (templateMatch.propertyIsEnumerable(cur)) return "atom templateMatch";
+
+      return "variable";
+    }
+
+    function tokenString(quote) {
+      return function(stream, state) {
+        var escaped = false, next, end = false;
+        while ((next = stream.next()) != null) {
+          if (next == quote && !escaped){
+            var afterQuote = stream.peek();
+            //look if the character after the quote is like the B in '10100010'B
+            if (afterQuote){
+              afterQuote = afterQuote.toLowerCase();
+              if(afterQuote == "b" || afterQuote == "h" || afterQuote == "o")
+                stream.next();
+            }
+            end = true; break;
+          }
+          escaped = !escaped && next == "\\";
+        }
+        if (end || !(escaped || multiLineStrings))
+          state.tokenize = null;
+        return "string";
+      };
+    }
+
+    function tokenComment(stream, state) {
+      var maybeEnd = false, ch;
+      while (ch = stream.next()) {
+        if (ch == "/" && maybeEnd) {
+          state.tokenize = null;
+          break;
+        }
+        maybeEnd = (ch == "*");
+      }
+      return "comment";
+    }
+
+    function Context(indented, column, type, align, prev) {
+      this.indented = indented;
+      this.column = column;
+      this.type = type;
+      this.align = align;
+      this.prev = prev;
+    }
+
+    function pushContext(state, col, type) {
+      var indent = state.indented;
+      if (state.context && state.context.type == "statement")
+        indent = state.context.indented;
+      return state.context = new Context(indent, col, type, null, state.context);
+    }
+
+    function popContext(state) {
+      var t = state.context.type;
+      if (t == ")" || t == "]" || t == "}")
+        state.indented = state.context.indented;
+      return state.context = state.context.prev;
+    }
+
+    //Interface
+    return {
+      startState: function(basecolumn) {
+        return {
+          tokenize: null,
+          context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+          indented: 0,
+          startOfLine: true
+        };
+      },
+
+      token: function(stream, state) {
+        var ctx = state.context;
+        if (stream.sol()) {
+          if (ctx.align == null) ctx.align = false;
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+        curPunc = null;
+        var style = (state.tokenize || tokenBase)(stream, state);
+        if (style == "comment") return style;
+        if (ctx.align == null) ctx.align = true;
+
+        if ((curPunc == ";" || curPunc == ":" || curPunc == ",")
+            && ctx.type == "statement"){
+          popContext(state);
+        }
+        else if (curPunc == "{") pushContext(state, stream.column(), "}");
+        else if (curPunc == "[") pushContext(state, stream.column(), "]");
+        else if (curPunc == "(") pushContext(state, stream.column(), ")");
+        else if (curPunc == "}") {
+          while (ctx.type == "statement") ctx = popContext(state);
+          if (ctx.type == "}") ctx = popContext(state);
+          while (ctx.type == "statement") ctx = popContext(state);
+        }
+        else if (curPunc == ctx.type) popContext(state);
+        else if (indentStatements &&
+            (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') ||
+            (ctx.type == "statement" && curPunc == "newstatement")))
+          pushContext(state, stream.column(), "statement");
+
+        state.startOfLine = false;
+
+        return style;
+      },
+
+      electricChars: "{}",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      lineComment: "//",
+      fold: "brace"
+    };
+  });
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  function def(mimes, mode) {
+    if (typeof mimes == "string") mimes = [mimes];
+    var words = [];
+    function add(obj) {
+      if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop))
+        words.push(prop);
+    }
+
+    add(mode.keywords);
+    add(mode.builtin);
+    add(mode.timerOps);
+    add(mode.portOps);
+
+    if (words.length) {
+      mode.helperType = mimes[0];
+      CodeMirror.registerHelper("hintWords", mimes[0], words);
+    }
+
+    for (var i = 0; i < mimes.length; ++i)
+      CodeMirror.defineMIME(mimes[i], mode);
+  }
+
+  def(["text/x-ttcn", "text/x-ttcn3", "text/x-ttcnpp"], {
+    name: "ttcn",
+    keywords: words("activate address alive all alt altstep and and4b any" +
+    " break case component const continue control deactivate" +
+    " display do else encode enumerated except exception" +
+    " execute extends extension external for from function" +
+    " goto group if import in infinity inout interleave" +
+    " label language length log match message mixed mod" +
+    " modifies module modulepar mtc noblock not not4b nowait" +
+    " of on optional or or4b out override param pattern port" +
+    " procedure record recursive rem repeat return runs select" +
+    " self sender set signature system template testcase to" +
+    " type union value valueof var variant while with xor xor4b"),
+    builtin: words("bit2hex bit2int bit2oct bit2str char2int char2oct encvalue" +
+    " decomp decvalue float2int float2str hex2bit hex2int" +
+    " hex2oct hex2str int2bit int2char int2float int2hex" +
+    " int2oct int2str int2unichar isbound ischosen ispresent" +
+    " isvalue lengthof log2str oct2bit oct2char oct2hex oct2int" +
+    " oct2str regexp replace rnd sizeof str2bit str2float" +
+    " str2hex str2int str2oct substr unichar2int unichar2char" +
+    " enum2int"),
+    types: words("anytype bitstring boolean char charstring default float" +
+    " hexstring integer objid octetstring universal verdicttype timer"),
+    timerOps: words("read running start stop timeout"),
+    portOps: words("call catch check clear getcall getreply halt raise receive" +
+    " reply send trigger"),
+    configOps: words("create connect disconnect done kill killed map unmap"),
+    verdictOps: words("getverdict setverdict"),
+    sutOps: words("action"),
+    functionOps: words("apply derefers refers"),
+
+    verdictConsts: words("error fail inconc none pass"),
+    booleanConsts: words("true false"),
+    otherConsts: words("null NULL omit"),
+
+    visibilityModifiers: words("private public friend"),
+    templateMatch: words("complement ifpresent subset superset permutation"),
+    multiLineStrings: true
+  });
+});

From 46e9a5e08f44687f6393dbaaef0dd9bb4ebfa1d2 Mon Sep 17 00:00:00 2001
From: Hector Oswaldo Caballero <hector.caballero@ericsson.com>
Date: Tue, 28 Apr 2015 10:05:26 +0200
Subject: [PATCH 2111/4742] [ttcn-cfg mode] Add

---
 doc/compress.html         |   1 +
 mode/index.html           |   1 +
 mode/ttcn-cfg/index.html  | 115 ++++++++++++++++++++
 mode/ttcn-cfg/ttcn-cfg.js | 214 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 331 insertions(+)
 create mode 100644 mode/ttcn-cfg/index.html
 create mode 100644 mode/ttcn-cfg/ttcn-cfg.js

diff --git a/doc/compress.html b/doc/compress.html
index d7ef62de68..1775c5a181 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -194,6 +194,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/tornado/tornado.js">tornado.js</option>
           <option value="http://codemirror.net/mode/troff/troff.js">troff.js</option>
           <option value="http://codemirror.net/mode/ttcn/ttcn.js">ttcn.js</option>
+          <option value="http://codemirror.net/mode/ttcn-cfg/ttcn-cfg.js">ttcn-cfg.js</option>
           <option value="http://codemirror.net/mode/turtle/turtle.js">turtle.js</option>
           <option value="http://codemirror.net/mode/vb/vb.js">vb.js</option>
           <option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
diff --git a/mode/index.html b/mode/index.html
index 5d895cacc7..6358acef77 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -124,6 +124,7 @@ <h2>Language modes</h2>
       <li><a href="tornado/index.html">Tornado</a> (templating language)</li>
       <li><a href="troff/index.html">troff</a> (for manpages)</li>
       <li><a href="ttcn/index.html">TTCN</a></li>
+      <li><a href="ttcn-cfg/index.html">TTCN Configuration</a></li>
       <li><a href="turtle/index.html">Turtle</a></li>
       <li><a href="vb/index.html">VB.NET</a></li>
       <li><a href="vbscript/index.html">VBScript</a></li>
diff --git a/mode/ttcn-cfg/index.html b/mode/ttcn-cfg/index.html
new file mode 100644
index 0000000000..4a4cd4571c
--- /dev/null
+++ b/mode/ttcn-cfg/index.html
@@ -0,0 +1,115 @@
+<!doctype html>
+
+<title>CodeMirror: TTCN-CFG 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="ttcn-cfg.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="http://en.wikipedia.org/wiki/TTCN">TTCN-CFG</a>
+    </ul>
+</div>
+<article>
+    <h2>TTCN-CFG example</h2>
+    <div>
+        <textarea id="ttcn-cfg-code">
+[MODULE_PARAMETERS]
+# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
+
+[LOGGING]
+# In this section you can specify the name of the log file and the classes of events
+# you want to log into the file or display on console (standard error).
+
+LogFile := "logs/%e.%h-%r.%s"
+FileMask := LOG_ALL | DEBUG | MATCHING
+ConsoleMask := ERROR | WARNING | TESTCASE | STATISTICS | PORTEVENT
+
+LogSourceInfo := Yes
+AppendFile := No
+TimeStampFormat := DateTime
+LogEventTypes := Yes
+SourceInfoFormat := Single
+LogEntityName := Yes
+
+[TESTPORT_PARAMETERS]
+# In this section you can specify parameters that are passed to Test Ports.
+
+[DEFINE]
+# In this section you can create macro definitions,
+# that can be used in other configuration file sections except [INCLUDE].
+
+[INCLUDE]
+# To use configuration settings given in other configuration files,
+# the configuration files just need to be listed in this section, with their full or relative pathnames.
+
+[EXTERNAL_COMMANDS]
+# This section can define external commands (shell scripts) to be executed by the ETS
+# whenever a control part or test case is started or terminated.
+
+BeginTestCase := ""
+EndTestCase := ""
+BeginControlPart := ""
+EndControlPart := ""
+
+[EXECUTE]
+# In this section you can specify what parts of your test suite you want to execute.
+
+[GROUPS]
+# In this section you can specify groups of hosts. These groups can be used inside the
+# [COMPONENTS] section to restrict the creation of certain PTCs to a given set of hosts.
+
+[COMPONENTS]
+# This section consists of rules restricting the location of created PTCs.
+
+[MAIN_CONTROLLER]
+# The options herein control the behavior of MC.
+
+TCPPort := 0
+KillTimer := 10.0
+NumHCs := 0
+LocalAddress :=
+        </textarea>
+    </div>
+
+    <script> 
+      var ttcnEditor = CodeMirror.fromTextArea(document.getElementById("ttcn-cfg-code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-ttcn-cfg"
+      });
+      ttcnEditor.setSize(600, 860);
+      var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
+      CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
+    </script>
+    <br/>
+    <p><strong>Language:</strong> Testing and Test Control Notation -
+        Configuration files
+        (<a href="http://en.wikipedia.org/wiki/TTCN">TTCN-CFG</a>)
+    </p>
+    <p><strong>MIME types defined:</strong> <code>text/x-ttcn-cfg</code>.</p>
+
+    <br/>
+    <p>The development of this mode has been sponsored by <a href="http://www.ericsson.com/">Ericsson
+    </a>.</p>
+    <p>Coded by Asmelash Tsegay Gebretsadkan </p>
+</article>
+
diff --git a/mode/ttcn-cfg/ttcn-cfg.js b/mode/ttcn-cfg/ttcn-cfg.js
new file mode 100644
index 0000000000..e10805119c
--- /dev/null
+++ b/mode/ttcn-cfg/ttcn-cfg.js
@@ -0,0 +1,214 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("ttcn-cfg", function(config, parserConfig) {
+    var indentUnit = config.indentUnit,
+        keywords = parserConfig.keywords || {},
+        fileNCtrlMaskOptions = parserConfig.fileNCtrlMaskOptions || {},
+        externalCommands = parserConfig.externalCommands || {},
+        multiLineStrings = parserConfig.multiLineStrings,
+        indentStatements = parserConfig.indentStatements !== false;
+    var isOperatorChar = /[\|]/;
+    var curPunc;
+
+    function tokenBase(stream, state) {
+      var ch = stream.next();
+      if (ch == '"' || ch == "'") {
+        state.tokenize = tokenString(ch);
+        return state.tokenize(stream, state);
+      }
+      if (/[:=]/.test(ch)) {
+        curPunc = ch;
+        return "punctuation";
+      }
+      if (ch == "#"){
+        stream.skipToEnd();
+        return "comment";
+      }
+      if (/\d/.test(ch)) {
+        stream.eatWhile(/[\w\.]/);
+        return "number";
+      }
+      if (isOperatorChar.test(ch)) {
+        stream.eatWhile(isOperatorChar);
+        return "operator";
+      }
+      if (ch == "["){
+        stream.eatWhile(/[\w_\]]/);
+        return "number sectionTitle";
+      }
+
+      stream.eatWhile(/[\w\$_]/);
+      var cur = stream.current();
+      if (keywords.propertyIsEnumerable(cur)) return "keyword";
+      if (fileNCtrlMaskOptions.propertyIsEnumerable(cur))
+        return "negative fileNCtrlMaskOptions";
+      if (externalCommands.propertyIsEnumerable(cur)) return "negative externalCommands";
+
+      return "variable";
+    }
+
+    function tokenString(quote) {
+      return function(stream, state) {
+        var escaped = false, next, end = false;
+        while ((next = stream.next()) != null) {
+          if (next == quote && !escaped){
+            var afterNext = stream.peek();
+            //look if the character if the quote is like the B in '10100010'B
+            if (afterNext){
+              afterNext = afterNext.toLowerCase();
+              if(afterNext == "b" || afterNext == "h" || afterNext == "o")
+                stream.next();
+            }
+            end = true; break;
+          }
+          escaped = !escaped && next == "\\";
+        }
+        if (end || !(escaped || multiLineStrings))
+          state.tokenize = null;
+        return "string";
+      };
+    }
+
+    function Context(indented, column, type, align, prev) {
+      this.indented = indented;
+      this.column = column;
+      this.type = type;
+      this.align = align;
+      this.prev = prev;
+    }
+    function pushContext(state, col, type) {
+      var indent = state.indented;
+      if (state.context && state.context.type == "statement")
+        indent = state.context.indented;
+      return state.context = new Context(indent, col, type, null, state.context);
+    }
+    function popContext(state) {
+      var t = state.context.type;
+      if (t == ")" || t == "]" || t == "}")
+        state.indented = state.context.indented;
+      return state.context = state.context.prev;
+    }
+
+    //Interface
+    return {
+      startState: function(basecolumn) {
+        return {
+          tokenize: null,
+          context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+          indented: 0,
+          startOfLine: true
+        };
+      },
+
+      token: function(stream, state) {
+        var ctx = state.context;
+        if (stream.sol()) {
+          if (ctx.align == null) ctx.align = false;
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+        curPunc = null;
+        var style = (state.tokenize || tokenBase)(stream, state);
+        if (style == "comment") return style;
+        if (ctx.align == null) ctx.align = true;
+
+        if ((curPunc == ";" || curPunc == ":" || curPunc == ",")
+            && ctx.type == "statement"){
+          popContext(state);
+        }
+        else if (curPunc == "{") pushContext(state, stream.column(), "}");
+        else if (curPunc == "[") pushContext(state, stream.column(), "]");
+        else if (curPunc == "(") pushContext(state, stream.column(), ")");
+        else if (curPunc == "}") {
+          while (ctx.type == "statement") ctx = popContext(state);
+          if (ctx.type == "}") ctx = popContext(state);
+          while (ctx.type == "statement") ctx = popContext(state);
+        }
+        else if (curPunc == ctx.type) popContext(state);
+        else if (indentStatements && (((ctx.type == "}" || ctx.type == "top")
+            && curPunc != ';') || (ctx.type == "statement"
+            && curPunc == "newstatement")))
+          pushContext(state, stream.column(), "statement");
+        state.startOfLine = false;
+        return style;
+      },
+
+      electricChars: "{}",
+      lineComment: "#",
+      fold: "brace"
+    };
+  });
+
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i)
+      obj[words[i]] = true;
+    return obj;
+  }
+
+  CodeMirror.defineMIME("text/x-ttcn-cfg", {
+    name: "ttcn-cfg",
+    keywords: words("Yes No LogFile FileMask ConsoleMask AppendFile" +
+    " TimeStampFormat LogEventTypes SourceInfoFormat" +
+    " LogEntityName LogSourceInfo DiskFullAction" +
+    " LogFileNumber LogFileSize MatchingHints Detailed" +
+    " Compact SubCategories Stack Single None Seconds" +
+    " DateTime Time Stop Error Retry Delete TCPPort KillTimer" +
+    " NumHCs UnixSocketsEnabled LocalAddress"),
+    fileNCtrlMaskOptions: words("TTCN_EXECUTOR TTCN_ERROR TTCN_WARNING" +
+    " TTCN_PORTEVENT TTCN_TIMEROP TTCN_VERDICTOP" +
+    " TTCN_DEFAULTOP TTCN_TESTCASE TTCN_ACTION" +
+    " TTCN_USER TTCN_FUNCTION TTCN_STATISTICS" +
+    " TTCN_PARALLEL TTCN_MATCHING TTCN_DEBUG" +
+    " EXECUTOR ERROR WARNING PORTEVENT TIMEROP" +
+    " VERDICTOP DEFAULTOP TESTCASE ACTION USER" +
+    " FUNCTION STATISTICS PARALLEL MATCHING DEBUG" +
+    " LOG_ALL LOG_NOTHING ACTION_UNQUALIFIED" +
+    " DEBUG_ENCDEC DEBUG_TESTPORT" +
+    " DEBUG_UNQUALIFIED DEFAULTOP_ACTIVATE" +
+    " DEFAULTOP_DEACTIVATE DEFAULTOP_EXIT" +
+    " DEFAULTOP_UNQUALIFIED ERROR_UNQUALIFIED" +
+    " EXECUTOR_COMPONENT EXECUTOR_CONFIGDATA" +
+    " EXECUTOR_EXTCOMMAND EXECUTOR_LOGOPTIONS" +
+    " EXECUTOR_RUNTIME EXECUTOR_UNQUALIFIED" +
+    " FUNCTION_RND FUNCTION_UNQUALIFIED" +
+    " MATCHING_DONE MATCHING_MCSUCCESS" +
+    " MATCHING_MCUNSUCC MATCHING_MMSUCCESS" +
+    " MATCHING_MMUNSUCC MATCHING_PCSUCCESS" +
+    " MATCHING_PCUNSUCC MATCHING_PMSUCCESS" +
+    " MATCHING_PMUNSUCC MATCHING_PROBLEM" +
+    " MATCHING_TIMEOUT MATCHING_UNQUALIFIED" +
+    " PARALLEL_PORTCONN PARALLEL_PORTMAP" +
+    " PARALLEL_PTC PARALLEL_UNQUALIFIED" +
+    " PORTEVENT_DUALRECV PORTEVENT_DUALSEND" +
+    " PORTEVENT_MCRECV PORTEVENT_MCSEND" +
+    " PORTEVENT_MMRECV PORTEVENT_MMSEND" +
+    " PORTEVENT_MQUEUE PORTEVENT_PCIN" +
+    " PORTEVENT_PCOUT PORTEVENT_PMIN" +
+    " PORTEVENT_PMOUT PORTEVENT_PQUEUE" +
+    " PORTEVENT_STATE PORTEVENT_UNQUALIFIED" +
+    " STATISTICS_UNQUALIFIED STATISTICS_VERDICT" +
+    " TESTCASE_FINISH TESTCASE_START" +
+    " TESTCASE_UNQUALIFIED TIMEROP_GUARD" +
+    " TIMEROP_READ TIMEROP_START TIMEROP_STOP" +
+    " TIMEROP_TIMEOUT TIMEROP_UNQUALIFIED" +
+    " USER_UNQUALIFIED VERDICTOP_FINAL" +
+    " VERDICTOP_GETVERDICT VERDICTOP_SETVERDICT" +
+    " VERDICTOP_UNQUALIFIED WARNING_UNQUALIFIED"),
+    externalCommands: words("BeginControlPart EndControlPart BeginTestCase" +
+    " EndTestCase"),
+    multiLineStrings: true
+  });
+});
\ No newline at end of file

From fa11b729130b91be7725204bb9daf38a6eca3269 Mon Sep 17 00:00:00 2001
From: Hector Oswaldo Caballero <hector.caballero@ericsson.com>
Date: Tue, 28 Apr 2015 10:09:57 +0200
Subject: [PATCH 2112/4742] [ttcn theme] Add

---
 demo/theme.html |  2 ++
 theme/ttcn.css  | 66 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 theme/ttcn.css

diff --git a/demo/theme.html b/demo/theme.html
index b3e31b5629..a5599859ad 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -33,6 +33,7 @@
 <link rel="stylesheet" href="../theme/the-matrix.css">
 <link rel="stylesheet" href="../theme/tomorrow-night-bright.css">
 <link rel="stylesheet" href="../theme/tomorrow-night-eighties.css">
+<link rel="stylesheet" href="../theme/ttcn.css">
 <link rel="stylesheet" href="../theme/twilight.css">
 <link rel="stylesheet" href="../theme/vibrant-ink.css">
 <link rel="stylesheet" href="../theme/xq-dark.css">
@@ -105,6 +106,7 @@ <h2>Theme Demo</h2>
     <option>the-matrix</option>
     <option>tomorrow-night-bright</option>
     <option>tomorrow-night-eighties</option>
+    <option>ttcn</option>
     <option>twilight</option>
     <option>vibrant-ink</option>
     <option>xq-dark</option>
diff --git a/theme/ttcn.css b/theme/ttcn.css
new file mode 100644
index 0000000000..959c047968
--- /dev/null
+++ b/theme/ttcn.css
@@ -0,0 +1,66 @@
+/* DEFAULT THEME */
+.cm-atom {color: #219;}
+.cm-attribute {color: #00c;}
+.cm-bracket {color: #997;}
+.cm-comment {color: #333333;}
+.cm-def {color: #00f;}
+.cm-em {font-style: italic;}
+.cm-error {color: #f00;}
+.cm-header {color: #00f; font-weight: bold;}
+.cm-hr {color: #999;}
+.cm-invalidchar {color: #f00;}
+.cm-keyword {font-weight:bold}
+.cm-link {color: #00c; text-decoration: underline;}
+.cm-meta {color: #555;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-qualifier {color: #555;}
+.cm-quote {color: #090;}
+.cm-strikethrough {text-decoration: line-through;}
+.cm-string {color: #006400;}
+.cm-string-2 {color: #f50;}
+.cm-strong {font-weight: bold;}
+.cm-tag {color: #170;}
+.cm-variable {color: #8B2252;}
+.cm-variable-2 {color: #05a;}
+.cm-variable-3 {color: #085;}
+
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
+.cm-s-default .cm-error {color: #f00;}
+.cm-invalidchar {color: #f00;}
+
+/* ASN */
+.cm-s-ttcn .cm-accessTypes,
+.cm-s-ttcn .cm-compareTypes {color: #27408B}
+.cm-s-ttcn .cm-cmipVerbs {color: #8B2252}
+.cm-s-ttcn .cm-modifier {color:#D2691E}
+.cm-s-ttcn .cm-status {color:#8B4545}
+.cm-s-ttcn .cm-storage {color:#A020F0}
+.cm-s-ttcn .cm-tags {color:#006400}
+
+/* CFG */
+.cm-s-ttcn .cm-externalCommands {color: #8B4545; font-weight:bold}
+.cm-s-ttcn .cm-fileNCtrlMaskOptions,
+.cm-s-ttcn .cm-sectionTitle {color: #2E8B57; font-weight:bold}
+
+/* TTCN */
+.cm-s-ttcn .cm-booleanConsts,
+.cm-s-ttcn .cm-otherConsts,
+.cm-s-ttcn .cm-verdictConsts {color: #006400}
+.cm-s-ttcn .cm-configOps,
+.cm-s-ttcn .cm-functionOps,
+.cm-s-ttcn .cm-portOps,
+.cm-s-ttcn .cm-sutOps,
+.cm-s-ttcn .cm-timerOps,
+.cm-s-ttcn .cm-verdictOps {color: #0000FF}
+.cm-s-ttcn .cm-preprocessor,
+.cm-s-ttcn .cm-templateMatch,
+.cm-s-ttcn .cm-ttcn3Macros {color: #27408B}
+.cm-s-ttcn .cm-types {color: #A52A2A; font-weight:bold}
+.cm-s-ttcn .cm-visibilityModifiers {font-weight:bold}

From ec3eff8aaa898c2ae4e54549cbb835abc448436b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 28 Apr 2015 10:14:13 +0200
Subject: [PATCH 2113/4742] [sql mode] Add 'group' keyword

Closes #3222
---
 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 fb1c6cb5ce..a33a8ec397 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -257,7 +257,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   }
 
   // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
-  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from having in insert into is join like not on or order select set table union update values where ";
+  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where ";
 
   // turn a space-separated list into an array
   function set(str) {

From a5f2de453f517c4fa88eccf92b8f010770278cf7 Mon Sep 17 00:00:00 2001
From: Amin Shali <amshali@google.com>
Date: Tue, 28 Apr 2015 13:57:45 -0700
Subject: [PATCH 2114/4742] [search addon] Added a missing argument to
 getSearchState

---
 addon/search/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 1c8ca3c245..761cb9492e 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -118,7 +118,7 @@
   var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>";
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
-    var query = cm.getSelection() || getSearchState().lastQuery;
+    var query = cm.getSelection() || getSearchState(cm).lastQuery;
     dialog(cm, replaceQueryDialog, "Replace:", query, function(query) {
       if (!query) return;
       query = parseQuery(query);

From 8148e0df311870dcdbe158f4ee12be8e1038d886 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Apr 2015 10:21:05 +0200
Subject: [PATCH 2115/4742] [lint addon] Don't resolve annotation function on
 startup

This makes it impossible to change the mode of the editor
and still automatically get appropriate annotations.

Issue #3227
---
 addon/lint/lint.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index c7e093960e..a7e74f2800 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -66,8 +66,6 @@
   function parseOptions(cm, options) {
     if (options instanceof Function) return {getAnnotations: options};
     if (!options || options === true) options = {};
-    if (!options.getAnnotations) options.getAnnotations = cm.getHelper(CodeMirror.Pos(0, 0), "lint");
-    if (!options.getAnnotations) throw new Error("Required option 'getAnnotations' missing (lint addon)");
     return options;
   }
 
@@ -120,10 +118,12 @@
   function startLinting(cm) {
     var state = cm.state.lint, options = state.options;
     var passOptions = options.options || options; // Support deprecated passing of `options` property in options
-    if (options.async || options.getAnnotations.async)
-      options.getAnnotations(cm.getValue(), updateLinting, passOptions, cm);
+    var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
+    if (!getAnnotations) return;
+    if (options.async || getAnnotations.async)
+      getAnnotations(cm.getValue(), updateLinting, passOptions, cm);
     else
-      updateLinting(cm, options.getAnnotations(cm.getValue(), passOptions, cm));
+      updateLinting(cm, getAnnotations(cm.getValue(), passOptions, cm));
   }
 
   function updateLinting(cm, annotationsNotSorted) {

From ed3a03e1518df312c005612f402402cf99af17b6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Apr 2015 10:24:40 +0200
Subject: [PATCH 2116/4742] Suppress unused argument error in linter

---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index a7e74f2800..3eea203ce5 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -63,7 +63,7 @@
     this.onMouseOver = function(e) { onMouseOver(cm, e); };
   }
 
-  function parseOptions(cm, options) {
+  function parseOptions(_cm, options) {
     if (options instanceof Function) return {getAnnotations: options};
     if (!options || options === true) options = {};
     return options;

From 1e57bb9c33f6f0deb91faae2b4fc9694b97554b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 5 May 2015 12:22:18 +0200
Subject: [PATCH 2117/4742] [show-hint addon] Restore shown and close events

Issue #3229
---
 addon/hint/show-hint.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index cb60afe03c..edd10705e4 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -62,6 +62,7 @@
       this.cm.off("cursorActivity", this.activityFunc);
 
       if (this.widget) this.widget.close();
+      if (this.widget && this.data) CodeMirror.signal(this.data, "close");
       CodeMirror.signal(this.cm, "endCompletion", this.cm);
     },
 
@@ -115,8 +116,12 @@
       var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
       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);
+        if (picked && data.list.length == 1) {
+          this.pick(data, 0);
+        } else {
+          this.widget = new Widget(this, data);
+          CodeMirror.signal(data, "shown");
+        }
       }
     },
 

From a6cf6e30eb9c1bc2a39c2deb1d92f26f78fdc289 Mon Sep 17 00:00:00 2001
From: noragrossman <nmgrossman@gmail.com>
Date: Sun, 3 May 2015 13:24:15 -0400
Subject: [PATCH 2118/4742] Added a link to the HTML embedded page from the
 language mode homepage

---
 mode/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/index.html b/mode/index.html
index 6358acef77..d50f3f8315 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -64,6 +64,7 @@ <h2>Language modes</h2>
       <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="htmlembedded/index.html">HTML embedded</a> (JSP, ASP.NET)</li>
       <li><a href="htmlmixed/index.html">HTML mixed-mode</a></li>
       <li><a href="http/index.html">HTTP</a></li>
       <li><a href="idl/index.html">IDL</a></li>

From 5e989bdabd38535794987c8192f3ca16e24f92a6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 5 May 2015 12:53:26 +0200
Subject: [PATCH 2119/4742] Make brackets typed with closebrackets addon
 trigger electric indentation

Closes #3233
---
 addon/edit/closebrackets.js |  1 +
 lib/codemirror.js           | 48 ++++++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 2bbc6f2a38..7030268b03 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -147,6 +147,7 @@
         cm.replaceSelections(sels, "around");
       } else if (type == "both") {
         cm.replaceSelection(left + right, null);
+        cm.triggerElectric(left + right);
         cm.execCommand("goCharLeft");
       } else if (type == "addFour") {
         cm.replaceSelection(left + left + left + left, "before");
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ba7ea1189d..b8b879b78d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1108,32 +1108,40 @@
                          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
-      if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
-          cm.options.smartIndent && range.head.ch < 100 &&
-          (!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) {
-              indented = indentLine(cm, end.line, "smart");
-              break;
-            }
-        } else if (mode.electricInput) {
-          if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
-            indented = indentLine(cm, end.line, "smart");
-        }
-        if (indented) signalLater(cm, "electricInput", cm, end.line);
-      }
     }
+    if (inserted && !cm.state.pasteIncoming)
+      triggerElectric(cm, inserted);
+
     ensureCursorVisible(cm);
     cm.curOp.updateInput = updateInput;
     cm.curOp.typing = true;
     cm.state.pasteIncoming = cm.state.cutIncoming = false;
   }
 
+  function triggerElectric(cm, inserted) {
+    // When an 'electric' character is inserted, immediately trigger a reindent
+    if (!cm.options.electricChars || !cm.options.smartIndent) return;
+    var sel = cm.doc.sel;
+
+    for (var i = sel.ranges.length - 1; i >= 0; i--) {
+      var range = sel.ranges[i];
+      if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue;
+      var mode = cm.getModeAt(range.head);
+      var indented = false;
+      if (mode.electricChars) {
+        for (var j = 0; j < mode.electricChars.length; j++)
+          if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
+            indented = indentLine(cm, range.head.line, "smart");
+            break;
+          }
+      } else if (mode.electricInput) {
+        if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
+          indented = indentLine(cm, range.head.line, "smart");
+      }
+      if (indented) signalLater(cm, "electricInput", cm, range.head.line);
+    }
+  }
+
   function copyableRanges(cm) {
     var text = [], ranges = [];
     for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
@@ -5053,6 +5061,8 @@
         return commands[cmd](this);
     },
 
+    triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
+
     findPosH: function(from, amount, unit, visually) {
       var dir = 1;
       if (amount < 0) { dir = -1; amount = -amount; }

From 96a3d493e2c5d68356d2ebb58cb7c98c04c45ab9 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 5 May 2015 22:39:40 -0400
Subject: [PATCH 2120/4742] [vim] Make defineEx prefix optional

https://github.com/codemirror/CodeMirror/issues/3237
---
 keymap/vim.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8e08e64385..6a4f3879d8 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -692,7 +692,9 @@
       getOption: getOption,
       defineOption: defineOption,
       defineEx: function(name, prefix, func){
-        if (name.indexOf(prefix) !== 0) {
+        if (!prefix) {
+          prefix = name;
+        } else if (name.indexOf(prefix) !== 0) {
           throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
         }
         exCommands[name]=func;

From 9898541f2e4a95a7c19f17d7f24cb4f1a38e8c47 Mon Sep 17 00:00:00 2001
From: AQNOUCH Mohammed <maqnouch@users.noreply.github.com>
Date: Tue, 5 May 2015 18:59:21 +0100
Subject: [PATCH 2121/4742] updated license year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index d21bbea5a6..f4a5a4a25f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (C) 2015 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From fbd336f3e163c201bf977465580f03b40816915b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Wed, 6 May 2015 09:14:40 -0400
Subject: [PATCH 2122/4742] [vim] Update manual to clarify defineEx() prefix

---
 doc/manual.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index faf49b3ecb..2c44b92cf4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3274,10 +3274,12 @@ <h3 id="vimapi_extending">Extending VIM</h3>
       <dd>Defines an Ex command, and maps it to <code>:name</code>.
       If a prefix is provided, it, and any prefixed substring of the
       <code>name</code> beginning with the <code>prefix</code> can
-      be used to invoke the command. <code>params.argString</code>
-      contains the part of the prompted string after the command
-      name. <code>params.args</code> is <code>params.argString</code>
-      split by whitespace. If the command was prefixed with a
+      be used to invoke the command. If the <code>prefix</code> is
+      falsy, then <code>name</code> is used as the prefix. <code>
+      params.argString</code> contains the part of the prompted
+      string after the command name. <code>params.args</code> is
+      <code>params.argString</code> split by whitespace. If the
+      command was prefixed with a
       <code><strong><a href="http://vimdoc.sourceforge.net/htmldoc/cmdline.html#cmdline-ranges">line range</a></strong></code>,
       <code>params.line</code> and <code>params.lineEnd</code> will
       be set.

From 426822e987fb4489f2ffabed41cec396bf97cef0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 8 May 2015 10:59:38 +0200
Subject: [PATCH 2123/4742] [show-hint addon] Fix bug that prevented close
 event from firing

Issue #3243
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index edd10705e4..d228fc8890 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -61,8 +61,8 @@
       this.tick = null;
       this.cm.off("cursorActivity", this.activityFunc);
 
-      if (this.widget) this.widget.close();
       if (this.widget && this.data) CodeMirror.signal(this.data, "close");
+      if (this.widget) this.widget.close();
       CodeMirror.signal(this.cm, "endCompletion", this.cm);
     },
 

From 9d320fdeecf778860f59f760d306e010ae24fed0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 8 May 2015 11:09:47 +0200
Subject: [PATCH 2124/4742] [css mode] Remove support for SGML-style comments

Closes #3244
---
 mode/css/css.js  | 15 ---------------
 mode/css/test.js |  7 -------
 2 files changed, 22 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 7fc9098fbc..60fcdfeda5 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -653,16 +653,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return ["comment", "comment"];
   }
 
-  function tokenSGMLComment(stream, state) {
-    if (stream.skipTo("-->")) {
-      stream.match("-->");
-      state.tokenize = null;
-    } else {
-      stream.skipToEnd();
-    }
-    return ["comment", "comment"];
-  }
-
   CodeMirror.defineMIME("text/css", {
     documentTypes: documentTypes,
     mediaTypes: mediaTypes,
@@ -674,11 +664,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     colorKeywords: colorKeywords,
     valueKeywords: valueKeywords,
     tokenHooks: {
-      "<": function(stream, state) {
-        if (!stream.match("!--")) return false;
-        state.tokenize = tokenSGMLComment;
-        return tokenSGMLComment(stream, state);
-      },
       "/": function(stream, state) {
         if (!stream.eat("*")) return false;
         state.tokenize = tokenCComment;
diff --git a/mode/css/test.js b/mode/css/test.js
index bef7156163..55ae676e75 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -76,13 +76,6 @@
   MT("tagTwoPropertiesURL",
      "[tag foo] { [property background]: [atom url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
 
-  MT("commentSGML",
-     "[comment <!--comment-->]");
-
-  MT("commentSGML2",
-     "[comment <!--comment]",
-     "[comment -->] [tag div] {}");
-
   MT("indent_tagSelector",
      "[tag strong], [tag em] {",
      "  [property background]: [atom rgba](",

From 736140c06f675e8c40a0f4e0eb9cc5ca5f345bb3 Mon Sep 17 00:00:00 2001
From: Matthew Rathbone <matthew.rathbone@gmail.com>
Date: Thu, 7 May 2015 13:41:40 -0500
Subject: [PATCH 2125/4742] [sql-hint addon] Potential (hacky) fix for alias
 tables

---
 addon/hint/sql-hint.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index cba27a0b2c..ee648fe527 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -112,9 +112,14 @@
     string = nameParts.pop();
     var table = nameParts.join(".");
 
+    var alias = false;
+    var aliasTable = table;
     // Check if table is available. If not, find table by Alias
-    if (!getItem(tables, table))
+    if (!getItem(tables, table)) {
+      var oldTable = table;
       table = findTableByAlias(table, editor);
+      if (table !== oldTable) alias = true;
+    }
 
     var columns = getItem(tables, table);
     if (columns && columns.columns)
@@ -123,7 +128,9 @@
     if (columns) {
       addMatches(result, string, columns, function(w) {
         if (typeof w == "string") {
-          w = table + "." + w;
+          var tableInsert = table;
+          if (alias == true) tableInsert = aliasTable;
+          w = tableInsert + "." + w;
         } else {
           w = shallowClone(w);
           w.text = table + "." + w.text;

From d47bc479c8848e59049d50d95a9d89b29988be59 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 8 May 2015 11:19:19 +0200
Subject: [PATCH 2126/4742] [sql-hint addon] Add test for alias completion

Issue #3248
---
 test/sql-hint-test.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index c8579204b0..efe5d54b19 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -159,6 +159,15 @@
     to: Pos(0, 15)
   });
 
+  test("alias_complete", {
+    value: "SELECT t. FROM users t",
+    cursor: Pos(0, 9),
+    tables: simpleTables,
+    list: ["t.name", "t.score", "t.birthDate"],
+    from: Pos(0, 7),
+    to: Pos(0, 9)
+  });
+
   function deepCompare(a, b) {
     if (!a || typeof a != "object")
       return a === b;

From c8f0fee358a3fe974a11eb388837be57c7fdadc4 Mon Sep 17 00:00:00 2001
From: Matthew Rathbone <matthew.rathbone@gmail.com>
Date: Fri, 8 May 2015 10:39:32 -0500
Subject: [PATCH 2127/4742] [sql-hint addon] Allow opting out of keyword
 completion

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

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index ee648fe527..08051ce74f 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -212,6 +212,7 @@
   CodeMirror.registerHelper("hint", "sql", function(editor, options) {
     tables = (options && options.tables) || {};
     var defaultTableName = options && options.defaultTable;
+    var disableKeywords = options && options.disableKeywords;
     defaultTable = defaultTableName && getItem(tables, defaultTableName);
     keywords = keywords || getKeywords(editor);
 
@@ -244,7 +245,8 @@
     } else {
       addMatches(result, search, tables, function(w) {return w;});
       addMatches(result, search, defaultTable, function(w) {return w;});
-      addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
+      if (!disableKeywords)
+        addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
     }
 
     return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};

From cffaa81922905e226109b868a7be232581e0c60b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 11 May 2015 10:50:23 +0200
Subject: [PATCH 2128/4742] [css mode] Allow parens in interpolated expressions

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 60fcdfeda5..1e6d2ddbc7 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -329,7 +329,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     if (type == "}") return popContext(state);
     if (type == "{" || type == ";") return popAndPass(type, stream, state);
     if (type == "word") override = "variable";
-    else if (type != "variable") override = "error";
+    else if (type != "variable" && type != "(" && type != ")") override = "error";
     return "interpolation";
   };
 

From 8ba727a0310b2e87d6a2c310580d368b1e3cc791 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 12 May 2015 01:02:28 +0200
Subject: [PATCH 2129/4742] Fix a number of lint warnings from
 new-improved-blint

---
 addon/display/rulers.js       |  3 +-
 addon/search/searchcursor.js  |  4 +-
 addon/tern/worker.js          |  2 +-
 keymap/vim.js                 |  3 +-
 lib/codemirror.js             |  9 ++--
 mode/apl/apl.js               |  3 +-
 mode/asterisk/asterisk.js     |  6 +--
 mode/cypher/cypher.js         |  2 +-
 mode/dylan/dylan.js           | 44 ++++++++-----------
 mode/ecl/ecl.js               |  3 +-
 mode/eiffel/eiffel.js         |  2 -
 mode/htmlmixed/htmlmixed.js   |  4 +-
 mode/julia/julia.js           |  2 -
 mode/livescript/livescript.js |  4 +-
 mode/pig/pig.js               | 40 +++++++----------
 mode/tiddlywiki/tiddlywiki.js | 83 +++++++++++++++--------------------
 mode/tiki/tiki.js             | 27 ++++--------
 mode/xquery/xquery.js         | 70 +++++++++++++----------------
 18 files changed, 124 insertions(+), 187 deletions(-)

diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index 13185d30b4..01f65667c4 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -38,7 +38,7 @@
     for (var i = 0; i < val.length; i++) {
       var elt = document.createElement("div");
       elt.className = "CodeMirror-ruler";
-      var col, cls = null, conf = val[i];
+      var col, conf = val[i];
       if (typeof conf == "number") {
         col = conf;
       } else {
@@ -47,7 +47,6 @@
         if (conf.color) elt.style.borderColor = conf.color;
         if (conf.lineStyle) elt.style.borderLeftStyle = conf.lineStyle;
         if (conf.width) elt.style.borderLeftWidth = conf.width;
-        cls = val[i].className;
       }
       elt.style.left = (left + col * cw) + "px";
       elt.style.top = "-50px";
diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 97088bf1cf..b70242ee4b 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -177,9 +177,9 @@
   });
 
   CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
-    var ranges = [], next;
+    var ranges = [];
     var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
-    while (next = cur.findNext()) {
+    while (cur.findNext()) {
       if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
       ranges.push({anchor: cur.from(), head: cur.to()});
     }
diff --git a/addon/tern/worker.js b/addon/tern/worker.js
index 48277af8e7..887f906a44 100644
--- a/addon/tern/worker.js
+++ b/addon/tern/worker.js
@@ -39,6 +39,6 @@ function startServer(defs, plugins, scripts) {
   });
 }
 
-var console = {
+this.console = {
   log: function(v) { postMessage({type: "debug", message: v}); }
 };
diff --git a/keymap/vim.js b/keymap/vim.js
index 6a4f3879d8..f93774271f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4581,10 +4581,9 @@
         searchCursor.replace(newText);
       }
       function next() {
-        var found;
         // The below only loops to skip over multiple occurrences on the same
         // line when 'global' is not true.
-        while(found = searchCursor.findNext() &&
+        while(searchCursor.findNext() &&
               isInRange(searchCursor.from(), lineStart, lineEnd)) {
           if (!global && lastPos && searchCursor.from().line == lastPos.line) {
             continue;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index b8b879b78d..4bae807dfe 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -728,12 +728,9 @@
   }
 
   function postUpdateDisplay(cm, update) {
-    var force = update.force, viewport = update.viewport;
+    var viewport = update.viewport;
     for (var first = true;; first = false) {
-      if (first && cm.options.lineWrapping && update.oldDisplayWidth != displayWidth(cm)) {
-        force = true;
-      } else {
-        force = false;
+      if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
         // Clip forced viewport to actual scrollable area.
         if (viewport && viewport.top != null)
           viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
@@ -1844,7 +1841,7 @@
       var partPos = getBidiPartAt(order, pos.ch);
       side = partPos % 2 ? "right" : "left";
     }
-    var result = nodeAndOffsetInLineMap(info.map, pos.ch, "left");
+    var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
     result.offset = result.collapse == "right" ? result.end : result.start;
     return result;
   }
diff --git a/mode/apl/apl.js b/mode/apl/apl.js
index 4357bed475..caafe4e913 100644
--- a/mode/apl/apl.js
+++ b/mode/apl/apl.js
@@ -102,7 +102,7 @@ CodeMirror.defineMode("apl", function() {
       };
     },
     token: function(stream, state) {
-      var ch, funcName, word;
+      var ch, funcName;
       if (stream.eatSpace()) {
         return null;
       }
@@ -163,7 +163,6 @@ CodeMirror.defineMode("apl", function() {
         return "function jot-dot";
       }
       stream.eatWhile(/[\w\$_]/);
-      word = stream.current();
       state.prev = true;
       return "keyword";
     }
diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index a1ead1157a..b7ebfc5ad7 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -65,8 +65,7 @@ CodeMirror.defineMode("asterisk", function() {
 
   function basicToken(stream,state){
     var cur = '';
-    var ch  = '';
-    ch = stream.next();
+    var ch = stream.next();
     // comment
     if(ch == ";") {
       stream.skipToEnd();
@@ -136,7 +135,6 @@ CodeMirror.defineMode("asterisk", function() {
     token: function(stream, state) {
 
       var cur = '';
-      var ch  = '';
       if(stream.eatSpace()) return null;
       // extension started
       if(state.extenStart){
@@ -170,7 +168,7 @@ CodeMirror.defineMode("asterisk", function() {
       } else if(state.extenPriority) {
         state.extenPriority = false;
         state.extenApplication = true;
-        ch = stream.next(); // get comma
+        stream.next(); // get comma
         if(state.extenSame) return null;
         stream.eatWhile(/[^,]/);
         return "number";
diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 9decf30753..e218d47308 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -19,7 +19,7 @@
 
   CodeMirror.defineMode("cypher", function(config) {
     var tokenBase = function(stream/*, state*/) {
-      var ch = stream.next(), curPunc = null;
+      var ch = stream.next();
       if (ch === "\"" || ch === "'") {
         stream.match(/.+?["']/);
         return "string";
diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index be2986adb5..85f0166c10 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -154,20 +154,12 @@ CodeMirror.defineMode("dylan", function(_config) {
     return f(stream, state);
   }
 
-  var type, content;
-
-  function ret(_type, style, _content) {
-    type = _type;
-    content = _content;
-    return style;
-  }
-
   function tokenBase(stream, state) {
     // String
     var ch = stream.peek();
     if (ch == "'" || ch == '"') {
       stream.next();
-      return chain(stream, state, tokenString(ch, "string", "string"));
+      return chain(stream, state, tokenString(ch, "string"));
     }
     // Comment
     else if (ch == "/") {
@@ -176,16 +168,16 @@ CodeMirror.defineMode("dylan", function(_config) {
         return chain(stream, state, tokenComment);
       } else if (stream.eat("/")) {
         stream.skipToEnd();
-        return ret("comment", "comment");
+        return "comment";
       } else {
         stream.skipTo(" ");
-        return ret("operator", "operator");
+        return "operator";
       }
     }
     // Decimal
     else if (/\d/.test(ch)) {
       stream.match(/^\d*(?:\.\d*)?(?:e[+\-]?\d+)?/);
-      return ret("number", "number");
+      return "number";
     }
     // Hash
     else if (ch == "#") {
@@ -194,33 +186,33 @@ CodeMirror.defineMode("dylan", function(_config) {
       ch = stream.peek();
       if (ch == '"') {
         stream.next();
-        return chain(stream, state, tokenString('"', "symbol", "string-2"));
+        return chain(stream, state, tokenString('"', "string-2"));
       }
       // Binary number
       else if (ch == "b") {
         stream.next();
         stream.eatWhile(/[01]/);
-        return ret("number", "number");
+        return "number";
       }
       // Hex number
       else if (ch == "x") {
         stream.next();
         stream.eatWhile(/[\da-f]/i);
-        return ret("number", "number");
+        return "number";
       }
       // Octal number
       else if (ch == "o") {
         stream.next();
         stream.eatWhile(/[0-7]/);
-        return ret("number", "number");
+        return "number";
       }
       // Hash symbol
       else {
         stream.eatWhile(/[-a-zA-Z]/);
-        return ret("hash", "keyword");
+        return "keyword";
       }
     } else if (stream.match("end")) {
-      return ret("end", "keyword");
+      return "keyword";
     }
     for (var name in patterns) {
       if (patterns.hasOwnProperty(name)) {
@@ -228,21 +220,21 @@ CodeMirror.defineMode("dylan", function(_config) {
         if ((pattern instanceof Array && pattern.some(function(p) {
           return stream.match(p);
         })) || stream.match(pattern))
-          return ret(name, patternStyles[name], stream.current());
+          return patternStyles[name];
       }
     }
     if (stream.match("define")) {
-      return ret("definition", "def");
+      return "def";
     } else {
       stream.eatWhile(/[\w\-]/);
       // Keyword
       if (wordLookup[stream.current()]) {
-        return ret(wordLookup[stream.current()], styleLookup[stream.current()], stream.current());
+        return styleLookup[stream.current()];
       } else if (stream.current().match(symbol)) {
-        return ret("variable", "variable");
+        return "variable";
       } else {
         stream.next();
-        return ret("other", "variable-2");
+        return "variable-2";
       }
     }
   }
@@ -257,10 +249,10 @@ CodeMirror.defineMode("dylan", function(_config) {
       }
       maybeEnd = (ch == "*");
     }
-    return ret("comment", "comment");
+    return "comment";
   }
 
-  function tokenString(quote, type, style) {
+  function tokenString(quote, style) {
     return function(stream, state) {
       var next, end = false;
       while ((next = stream.next()) != null) {
@@ -271,7 +263,7 @@ CodeMirror.defineMode("dylan", function(_config) {
       }
       if (end)
         state.tokenize = tokenBase;
-      return ret(type, style);
+      return style;
     };
   }
 
diff --git a/mode/ecl/ecl.js b/mode/ecl/ecl.js
index 18778f1691..8df7ebe4ab 100644
--- a/mode/ecl/ecl.js
+++ b/mode/ecl/ecl.js
@@ -34,7 +34,6 @@ CodeMirror.defineMode("ecl", function(config) {
   var blockKeywords = words("catch class do else finally for if switch try while");
   var atoms = words("true false null");
   var hooks = {"#": metaHook};
-  var multiLineStrings;
   var isOperatorChar = /[+\-*&%=<>!?|\/]/;
 
   var curPunc;
@@ -112,7 +111,7 @@ CodeMirror.defineMode("ecl", function(config) {
         if (next == quote && !escaped) {end = true; break;}
         escaped = !escaped && next == "\\";
       }
-      if (end || !(escaped || multiLineStrings))
+      if (end || !escaped)
         state.tokenize = tokenBase;
       return "string";
     };
diff --git a/mode/eiffel/eiffel.js b/mode/eiffel/eiffel.js
index fcdf295cbc..b8b70e36e5 100644
--- a/mode/eiffel/eiffel.js
+++ b/mode/eiffel/eiffel.js
@@ -84,7 +84,6 @@ CodeMirror.defineMode("eiffel", function() {
     'or'
   ]);
   var operators = wordObj([":=", "and then","and", "or","<<",">>"]);
-  var curPunc;
 
   function chain(newtok, stream, state) {
     state.tokenize.push(newtok);
@@ -92,7 +91,6 @@ CodeMirror.defineMode("eiffel", function() {
   }
 
   function tokenBase(stream, state) {
-    curPunc = null;
     if (stream.eatSpace()) return null;
     var ch = stream.next();
     if (ch == '"'||ch == "'") {
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 1cc438f013..24552e2d80 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -57,9 +57,9 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
   }
   function maybeBackup(stream, pat, style) {
     var cur = stream.current();
-    var close = cur.search(pat), m;
+    var close = cur.search(pat);
     if (close > -1) stream.backUp(cur.length - close);
-    else if (m = cur.match(/<\/?$/)) {
+    else if (cur.match(/<\/?$/)) {
       stream.backUp(cur.length);
       if (!stream.match(pat, false)) stream.match(cur);
     }
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index e854988aa3..d0a74cef59 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -34,7 +34,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   var closers = wordRegexp(blockClosers);
   var macro = /^@[_A-Za-z][_A-Za-z0-9]*/;
   var symbol = /^:[_A-Za-z][_A-Za-z0-9]*/;
-  var indentInfo = null;
 
   function in_array(state) {
     var ch = cur_scope(state);
@@ -247,7 +246,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   }
 
   function tokenLexer(stream, state) {
-    indentInfo = null;
     var style = state.tokenize(stream, state);
     var current = stream.current();
 
diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index 55882efc3b..4b26e04619 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -24,8 +24,8 @@
         var nr = Rules[next_rule];
         if (nr.splice) {
           for (var i$ = 0; i$ < nr.length; ++i$) {
-            var r = nr[i$], m;
-            if (r.regex && (m = stream.match(r.regex))) {
+            var r = nr[i$];
+            if (r.regex && stream.match(r.regex)) {
               state.next = r.next || state.next;
               return r.token;
             }
diff --git a/mode/pig/pig.js b/mode/pig/pig.js
index c74b2cc866..5b567272e6 100644
--- a/mode/pig/pig.js
+++ b/mode/pig/pig.js
@@ -30,12 +30,6 @@ CodeMirror.defineMode("pig", function(_config, parserConfig) {
     return f(stream, state);
   }
 
-  var type;
-  function ret(tp, style) {
-    type = tp;
-    return style;
-  }
-
   function tokenComment(stream, state) {
     var isEnd = false;
     var ch;
@@ -46,7 +40,7 @@ CodeMirror.defineMode("pig", function(_config, parserConfig) {
       }
       isEnd = (ch == "*");
     }
-    return ret("comment", "comment");
+    return "comment";
   }
 
   function tokenString(quote) {
@@ -60,10 +54,11 @@ CodeMirror.defineMode("pig", function(_config, parserConfig) {
       }
       if (end || !(escaped || multiLineStrings))
         state.tokenize = tokenBase;
-      return ret("string", "error");
+      return "error";
     };
   }
 
+
   function tokenBase(stream, state) {
     var ch = stream.next();
 
@@ -72,11 +67,11 @@ CodeMirror.defineMode("pig", function(_config, parserConfig) {
       return chain(stream, state, tokenString(ch));
     // is it one of the special chars
     else if(/[\[\]{}\(\),;\.]/.test(ch))
-      return ret(ch);
+      return null;
     // is it a number?
     else if(/\d/.test(ch)) {
       stream.eatWhile(/[\w\.]/);
-      return ret("number", "number");
+      return "number";
     }
     // multi line comment or operator
     else if (ch == "/") {
@@ -85,47 +80,42 @@ CodeMirror.defineMode("pig", function(_config, parserConfig) {
       }
       else {
         stream.eatWhile(isOperatorChar);
-        return ret("operator", "operator");
+        return "operator";
       }
     }
     // single line comment or operator
     else if (ch=="-") {
       if(stream.eat("-")){
         stream.skipToEnd();
-        return ret("comment", "comment");
+        return "comment";
       }
       else {
         stream.eatWhile(isOperatorChar);
-        return ret("operator", "operator");
+        return "operator";
       }
     }
     // is it an operator
     else if (isOperatorChar.test(ch)) {
       stream.eatWhile(isOperatorChar);
-      return ret("operator", "operator");
+      return "operator";
     }
     else {
       // get the while word
       stream.eatWhile(/[\w\$_]/);
       // is it one of the listed keywords?
       if (keywords && keywords.propertyIsEnumerable(stream.current().toUpperCase())) {
-        if (stream.eat(")") || stream.eat(".")) {
-          //keywords can be used as variables like flatten(group), group.$0 etc..
-        }
-        else {
-          return ("keyword", "keyword");
-        }
+        //keywords can be used as variables like flatten(group), group.$0 etc..
+        if (!stream.eat(")") && !stream.eat("."))
+          return "keyword";
       }
       // is it one of the builtin functions?
       if (builtins && builtins.propertyIsEnumerable(stream.current().toUpperCase()))
-      {
-        return ("keyword", "variable-2");
-      }
+        return "variable-2";
       // is it one of the listed types?
       if (types && types.propertyIsEnumerable(stream.current().toUpperCase()))
-        return ("keyword", "variable-3");
+        return "variable-3";
       // default is a 'variable'
-      return ret("variable", "pig-word");
+      return "variable";
     }
   }
 
diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index 88c9768a72..1df01647ae 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -71,16 +71,6 @@ CodeMirror.defineMode("tiddlywiki", function () {
     return f(stream, state);
   }
 
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-
-  function ret(tp, style, cont) {
-    type = tp;
-    content = cont;
-    return style;
-  }
-
   function jsTokenBase(stream, state) {
     var sol = stream.sol(), ch;
 
@@ -95,16 +85,16 @@ CodeMirror.defineMode("tiddlywiki", function () {
         return chain(stream, state, twTokenCode);
       }
       if (stream.match(reBlockQuote)) {
-        return ret('quote', 'quote');
+        return 'quote';
       }
       if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) {
-        return ret('code', 'comment');
+        return 'comment';
       }
       if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) {
-        return ret('code', 'comment');
+        return 'comment';
       }
       if (stream.match(reHR)) {
-        return ret('hr', 'hr');
+        return 'hr';
       }
     } // sol
     ch = stream.next();
@@ -112,30 +102,30 @@ CodeMirror.defineMode("tiddlywiki", function () {
     if (sol && /[\/\*!#;:>|]/.test(ch)) {
       if (ch == "!") { // tw header
         stream.skipToEnd();
-        return ret("header", "header");
+        return "header";
       }
       if (ch == "*") { // tw list
         stream.eatWhile('*');
-        return ret("list", "comment");
+        return "comment";
       }
       if (ch == "#") { // tw numbered list
         stream.eatWhile('#');
-        return ret("list", "comment");
+        return "comment";
       }
       if (ch == ";") { // definition list, term
         stream.eatWhile(';');
-        return ret("list", "comment");
+        return "comment";
       }
       if (ch == ":") { // definition list, description
         stream.eatWhile(':');
-        return ret("list", "comment");
+        return "comment";
       }
       if (ch == ">") { // single line quote
         stream.eatWhile(">");
-        return ret("quote", "quote");
+        return "quote";
       }
       if (ch == '|') {
-        return ret('table', 'header');
+        return 'header';
       }
     }
 
@@ -146,29 +136,29 @@ CodeMirror.defineMode("tiddlywiki", function () {
     // rudimentary html:// file:// link matching. TW knows much more ...
     if (/[hf]/i.test(ch)) {
       if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) {
-        return ret("link", "link");
+        return "link";
       }
     }
     // just a little string indicator, don't want to have the whole string covered
     if (ch == '"') {
-      return ret('string', 'string');
+      return 'string';
     }
     if (ch == '~') {    // _no_ CamelCase indicator should be bold
-      return ret('text', 'brace');
+      return 'brace';
     }
     if (/[\[\]]/.test(ch)) { // check for [[..]]
       if (stream.peek() == ch) {
         stream.next();
-        return ret('brace', 'brace');
+        return 'brace';
       }
     }
     if (ch == "@") {    // check for space link. TODO fix @@...@@ highlighting
       stream.eatWhile(isSpaceName);
-      return ret("link", "link");
+      return "link";
     }
     if (/\d/.test(ch)) {        // numbers
       stream.eatWhile(/\d/);
-      return ret("number", "number");
+      return "number";
     }
     if (ch == "/") { // tw invisible comment
       if (stream.eat("%")) {
@@ -191,7 +181,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
           return chain(stream, state, twTokenStrike);
         // mdash
         if (stream.peek() == ' ')
-          return ret('text', 'brace');
+          return 'brace';
       }
     }
     if (ch == "'") { // tw bold
@@ -205,7 +195,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
       }
     }
     else {
-      return ret(ch);
+      return null;
     }
 
     // core macro handling
@@ -213,8 +203,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
     var word = stream.current(),
     known = textwords.propertyIsEnumerable(word) && textwords[word];
 
-    return known ? ret(known.type, known.style, word) : ret("text", null, word);
-
+    return known ? known.style : null;
   } // jsTokenBase()
 
   // tw invisible comment
@@ -228,7 +217,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
       }
       maybeEnd = (ch == "%");
     }
-    return ret("comment", "comment");
+    return "comment";
   }
 
   // tw strong / bold
@@ -242,29 +231,29 @@ CodeMirror.defineMode("tiddlywiki", function () {
       }
       maybeEnd = (ch == "'");
     }
-    return ret("text", "strong");
+    return "strong";
   }
 
   // tw code
   function twTokenCode(stream, state) {
-    var ch, sb = state.block;
+    var sb = state.block;
 
     if (sb && stream.current()) {
-      return ret("code", "comment");
+      return "comment";
     }
 
     if (!sb && stream.match(reUntilCodeStop)) {
       state.tokenize = jsTokenBase;
-      return ret("code", "comment");
+      return "comment";
     }
 
     if (sb && stream.sol() && stream.match(reCodeBlockStop)) {
       state.tokenize = jsTokenBase;
-      return ret("code", "comment");
+      return "comment";
     }
 
-    ch = stream.next();
-    return (sb) ? ret("code", "comment") : ret("code", "comment");
+    stream.next();
+    return "comment";
   }
 
   // tw em / italic
@@ -278,7 +267,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
       }
       maybeEnd = (ch == "/");
     }
-    return ret("text", "em");
+    return "em";
   }
 
   // tw underlined text
@@ -292,7 +281,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
       }
       maybeEnd = (ch == "_");
     }
-    return ret("text", "underlined");
+    return "underlined";
   }
 
   // tw strike through text looks ugly
@@ -307,7 +296,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
       }
       maybeEnd = (ch == "-");
     }
-    return ret("text", "strikethrough");
+    return "strikethrough";
   }
 
   // macro
@@ -315,19 +304,19 @@ CodeMirror.defineMode("tiddlywiki", function () {
     var ch, word, known;
 
     if (stream.current() == '<<') {
-      return ret('brace', 'macro');
+      return 'macro';
     }
 
     ch = stream.next();
     if (!ch) {
       state.tokenize = jsTokenBase;
-      return ret(ch);
+      return null;
     }
     if (ch == ">") {
       if (stream.peek() == '>') {
         stream.next();
         state.tokenize = jsTokenBase;
-        return ret("brace", "macro");
+        return "macro";
       }
     }
 
@@ -336,10 +325,10 @@ CodeMirror.defineMode("tiddlywiki", function () {
     known = keywords.propertyIsEnumerable(word) && keywords[word];
 
     if (known) {
-      return ret(known.type, known.style, word);
+      return known.style, word;
     }
     else {
-      return ret("macro", null, word);
+      return null, word;
     }
   }
 
diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index c90aac9ec7..5e05b1ff01 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -52,35 +52,27 @@ CodeMirror.defineMode('tiki', function(config) {
     case "{": //plugin
       stream.eat("/");
       stream.eatSpace();
-      var tagName = "";
-      var c;
-      while ((c = stream.eat(/[^\s\u00a0=\"\'\/?(}]/))) tagName += c;
+      stream.eatWhile(/[^\s\u00a0=\"\'\/?(}]/);
       state.tokenize = inPlugin;
       return "tag";
-      break;
     case "_": //bold
-      if (stream.eat("_")) {
+      if (stream.eat("_"))
         return chain(inBlock("strong", "__", inText));
-      }
       break;
     case "'": //italics
-      if (stream.eat("'")) {
-        // Italic text
+      if (stream.eat("'"))
         return chain(inBlock("em", "''", inText));
-      }
       break;
     case "(":// Wiki Link
-      if (stream.eat("(")) {
+      if (stream.eat("("))
         return chain(inBlock("variable-2", "))", inText));
-      }
       break;
     case "[":// Weblink
       return chain(inBlock("variable-3", "]", inText));
       break;
     case "|": //table
-      if (stream.eat("|")) {
+      if (stream.eat("|"))
         return chain(inBlock("comment", "||"));
-      }
       break;
     case "-":
       if (stream.eat("=")) {//titleBar
@@ -90,22 +82,19 @@ CodeMirror.defineMode('tiki', function(config) {
       }
       break;
     case "=": //underline
-      if (stream.match("==")) {
+      if (stream.match("=="))
         return chain(inBlock("tw-underline", "===", inText));
-      }
       break;
     case ":":
-      if (stream.eat(":")) {
+      if (stream.eat(":"))
         return chain(inBlock("comment", "::"));
-      }
       break;
     case "^": //box
       return chain(inBlock("tw-box", "^"));
       break;
     case "~": //np
-      if (stream.match("np~")) {
+      if (stream.match("np~"))
         return chain(inBlock("meta", "~/np~"));
-      }
       break;
     }
 
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index c8f3d90a9f..c642ee58fa 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -68,15 +68,6 @@ CodeMirror.defineMode("xquery", function() {
     return kwObj;
   }();
 
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-
   function chain(stream, state, f) {
     state.tokenize = f;
     return f(stream, state);
@@ -95,7 +86,7 @@ CodeMirror.defineMode("xquery", function() {
 
       if(stream.match("![CDATA", false)) {
         state.tokenize = tokenCDATA;
-        return ret("tag", "tag");
+        return "tag";
       }
 
       if(stream.match("?", false)) {
@@ -112,28 +103,28 @@ CodeMirror.defineMode("xquery", function() {
     // start code block
     else if(ch == "{") {
       pushStateStack(state,{ type: "codeblock"});
-      return ret("", null);
+      return null;
     }
     // end code block
     else if(ch == "}") {
       popStateStack(state);
-      return ret("", null);
+      return null;
     }
     // if we're in an XML block
     else if(isInXmlBlock(state)) {
       if(ch == ">")
-        return ret("tag", "tag");
+        return "tag";
       else if(ch == "/" && stream.eat(">")) {
         popStateStack(state);
-        return ret("tag", "tag");
+        return "tag";
       }
       else
-        return ret("word", "variable");
+        return "variable";
     }
     // if a number
     else if (/\d/.test(ch)) {
       stream.match(/^\d*(?:\.\d*)?(?:E[+\-]?\d+)?/);
-      return ret("number", "atom");
+      return "atom";
     }
     // comment start
     else if (ch === "(" && stream.eat(":")) {
@@ -149,27 +140,27 @@ CodeMirror.defineMode("xquery", function() {
     }
     // assignment
     else if(ch ===":" && stream.eat("=")) {
-      return ret("operator", "keyword");
+      return "keyword";
     }
     // open paren
     else if(ch === "(") {
       pushStateStack(state, { type: "paren"});
-      return ret("", null);
+      return null;
     }
     // close paren
     else if(ch === ")") {
       popStateStack(state);
-      return ret("", null);
+      return null;
     }
     // open paren
     else if(ch === "[") {
       pushStateStack(state, { type: "bracket"});
-      return ret("", null);
+      return null;
     }
     // close paren
     else if(ch === "]") {
       popStateStack(state);
-      return ret("", null);
+      return null;
     }
     else {
       var known = keywords.propertyIsEnumerable(ch) && keywords[ch];
@@ -204,15 +195,14 @@ CodeMirror.defineMode("xquery", function() {
       // if the previous word was element, attribute, axis specifier, this word should be the name of that
       if(isInXmlConstructor(state)) {
         popStateStack(state);
-        return ret("word", "variable", word);
+        return "variable";
       }
       // as previously checked, if the word is element,attribute, axis specifier, call it an "xmlconstructor" and
       // push the stack so we know to look for it on the next word
       if(word == "element" || word == "attribute" || known.type == "axis_specifier") pushStateStack(state, {type: "xmlconstructor"});
 
       // if the word is known, return the details of that else just call this a generic 'word'
-      return known ? ret(known.type, known.style, word) :
-                     ret("word", "variable", word);
+      return known ? known.style : "variable";
     }
   }
 
@@ -235,7 +225,7 @@ CodeMirror.defineMode("xquery", function() {
       maybeNested = (ch == "(");
     }
 
-    return ret("comment", "comment");
+    return "comment";
   }
 
   // tokenizer for string literals
@@ -247,7 +237,7 @@ CodeMirror.defineMode("xquery", function() {
       if(isInString(state) && stream.current() == quote) {
         popStateStack(state);
         if(f) state.tokenize = f;
-        return ret("string", "string");
+        return "string";
       }
 
       pushStateStack(state, { type: "string", name: quote, tokenize: tokenString(quote, f) });
@@ -255,7 +245,7 @@ CodeMirror.defineMode("xquery", function() {
       // if we're in a string and in an XML block, allow an embedded code block
       if(stream.match("{", false) && isInXmlAttributeBlock(state)) {
         state.tokenize = tokenBase;
-        return ret("string", "string");
+        return "string";
       }
 
 
@@ -269,13 +259,13 @@ CodeMirror.defineMode("xquery", function() {
           // if we're in a string and in an XML block, allow an embedded code block in an attribute
           if(stream.match("{", false) && isInXmlAttributeBlock(state)) {
             state.tokenize = tokenBase;
-            return ret("string", "string");
+            return "string";
           }
 
         }
       }
 
-      return ret("string", "string");
+      return "string";
     };
   }
 
@@ -293,7 +283,7 @@ CodeMirror.defineMode("xquery", function() {
     }
     stream.eatWhile(isVariableChar);
     state.tokenize = tokenBase;
-    return ret("variable", "variable");
+    return "variable";
   }
 
   // tokenizer for XML tags
@@ -303,19 +293,19 @@ CodeMirror.defineMode("xquery", function() {
       if(isclose && stream.eat(">")) {
         popStateStack(state);
         state.tokenize = tokenBase;
-        return ret("tag", "tag");
+        return "tag";
       }
       // self closing tag without attributes?
       if(!stream.eat("/"))
         pushStateStack(state, { type: "tag", name: name, tokenize: tokenBase});
       if(!stream.eat(">")) {
         state.tokenize = tokenAttribute;
-        return ret("tag", "tag");
+        return "tag";
       }
       else {
         state.tokenize = tokenBase;
       }
-      return ret("tag", "tag");
+      return "tag";
     };
   }
 
@@ -326,14 +316,14 @@ CodeMirror.defineMode("xquery", function() {
     if(ch == "/" && stream.eat(">")) {
       if(isInXmlAttributeBlock(state)) popStateStack(state);
       if(isInXmlBlock(state)) popStateStack(state);
-      return ret("tag", "tag");
+      return "tag";
     }
     if(ch == ">") {
       if(isInXmlAttributeBlock(state)) popStateStack(state);
-      return ret("tag", "tag");
+      return "tag";
     }
     if(ch == "=")
-      return ret("", null);
+      return null;
     // quoted string
     if (ch == '"' || ch == "'")
       return chain(stream, state, tokenString(ch, tokenAttribute));
@@ -351,7 +341,7 @@ CodeMirror.defineMode("xquery", function() {
       state.tokenize = tokenBase;
     }
 
-    return ret("attribute", "attribute");
+    return "attribute";
   }
 
   // handle comments, including nested
@@ -360,7 +350,7 @@ CodeMirror.defineMode("xquery", function() {
     while (ch = stream.next()) {
       if (ch == "-" && stream.match("->", true)) {
         state.tokenize = tokenBase;
-        return ret("comment", "comment");
+        return "comment";
       }
     }
   }
@@ -372,7 +362,7 @@ CodeMirror.defineMode("xquery", function() {
     while (ch = stream.next()) {
       if (ch == "]" && stream.match("]", true)) {
         state.tokenize = tokenBase;
-        return ret("comment", "comment");
+        return "comment";
       }
     }
   }
@@ -383,7 +373,7 @@ CodeMirror.defineMode("xquery", function() {
     while (ch = stream.next()) {
       if (ch == "?" && stream.match(">", true)) {
         state.tokenize = tokenBase;
-        return ret("comment", "comment meta");
+        return "comment meta";
       }
     }
   }

From 981888e714f1bb260f2fe8cd1c125da5b091e086 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 13 May 2015 17:06:32 +0200
Subject: [PATCH 2130/4742] [clike mode] Add switchIndent option for deep
 indentation of switch blocks

Enable it for the languages that have switch.

Issue #3252
---
 mode/clike/clike.js | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index b209910b92..33d11ac297 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -21,7 +21,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       atoms = parserConfig.atoms || {},
       hooks = parserConfig.hooks || {},
       multiLineStrings = parserConfig.multiLineStrings,
-      indentStatements = parserConfig.indentStatements !== false;
+      indentStatements = parserConfig.indentStatements !== false,
+      indentSwitch = parserConfig.indentSwitch !== false;
   var isOperatorChar = /[+\-*&%=<>!?|\/]/;
 
   var curPunc;
@@ -104,9 +105,12 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     this.align = align;
     this.prev = prev;
   }
+  function isStatement(context) {
+    return context.type == "statement" || context.type == "switchstatement";
+  }
   function pushContext(state, col, type) {
     var indent = state.indented;
-    if (state.context && state.context.type == "statement")
+    if (state.context && isStatement(state.context))
       indent = state.context.indented;
     return state.context = new Context(indent, col, type, null, state.context);
   }
@@ -142,20 +146,24 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (style == "comment" || style == "meta") return style;
       if (ctx.align == null) ctx.align = true;
 
-      if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && ctx.type == "statement") popContext(state);
+      if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && isStatement(ctx)) popContext(state);
       else if (curPunc == "{") pushContext(state, stream.column(), "}");
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
       else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
+        while (isStatement(ctx)) ctx = popContext(state);
         if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
+        while (isStatement(ctx)) ctx = popContext(state);
       }
       else if (curPunc == ctx.type) popContext(state);
       else if (indentStatements &&
                (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') ||
-                (ctx.type == "statement" && curPunc == "newstatement")))
-        pushContext(state, stream.column(), "statement");
+                (isStatement(ctx) && curPunc == "newstatement"))) {
+        var type = "statement"
+        if (curPunc == "newstatement" && indentSwitch && stream.current() == "switch")
+          type = "switchstatement"
+        pushContext(state, stream.column(), type);
+      }
       state.startOfLine = false;
       return style;
     },
@@ -163,15 +171,21 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     indent: function(state, textAfter) {
       if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
+      if (isStatement(ctx) && firstChar == "}") ctx = ctx.prev;
       var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
-      else if (ctx.align && (!dontAlignCalls || ctx.type != ")")) return ctx.column + (closing ? 0 : 1);
-      else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
-      else return ctx.indented + (closing ? 0 : indentUnit);
+      var switchBlock = ctx.prev && ctx.prev.type == "switchstatement";
+      if (isStatement(ctx))
+        return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
+      if (ctx.align && (!dontAlignCalls || ctx.type != ")"))
+        return ctx.column + (closing ? 0 : 1);
+      if (ctx.type == ")" && !closing)
+        return ctx.indented + statementIndentUnit;
+
+      return ctx.indented + (closing ? 0 : indentUnit) +
+        (!closing && switchBlock && !/^(?:case|default)\b/.test(textAfter) ? indentUnit : 0);
     },
 
-    electricChars: "{}",
+    electricInput: indentSwitch ? /^\s*(?:case .*?:|default:|\{|\})$/ : /^\s*[{}]$/,
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
     lineComment: "//",
@@ -389,6 +403,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     blockKeywords: words("catch class do else finally for forSome if match switch try while"),
     atoms: words("true false null"),
     indentStatements: false,
+    indentSwitch: false,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);
@@ -461,6 +476,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                 "gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits " +
                 "gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits " +
                 "gl_MaxDrawBuffers"),
+    indentSwitch: false,
     hooks: {"#": cppHook},
     modeProps: {fold: ["brace", "include"]}
   });

From ba5660a06d6d04da8a109ab5d1ef8a65e8778ca7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 14 May 2015 16:34:23 +0200
Subject: [PATCH 2131/4742] Fix key name normalization in normalizeKeyMap

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4bae807dfe..d611a96f1f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5727,7 +5727,7 @@
       for (var i = 0; i < keys.length; i++) {
         var val, name;
         if (i == keys.length - 1) {
-          name = keyname;
+          name = keys.join(" ");
           val = value;
         } else {
           name = keys.slice(0, i + 1).join(" ");

From de9a6b9ac70334e31d643e0f667346b0e1e14d60 Mon Sep 17 00:00:00 2001
From: Calin Barbat <calin.barbat@web.de>
Date: Wed, 13 May 2015 19:31:29 +0200
Subject: [PATCH 2132/4742] [mathematica mode] Add

---
 doc/compress.html               |   1 +
 mode/index.html                 |   1 +
 mode/mathematica/index.html     |  72 +++++++++++++
 mode/mathematica/mathematica.js | 175 ++++++++++++++++++++++++++++++++
 mode/meta.js                    |   1 +
 5 files changed, 250 insertions(+)
 create mode 100644 mode/mathematica/index.html
 create mode 100644 mode/mathematica/mathematica.js

diff --git a/doc/compress.html b/doc/compress.html
index 1775c5a181..ff3c7dd14d 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -150,6 +150,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/livescript/livescript.js">livescript.js</option>
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
+          <option value="http://codemirror.net/mode/mathematica/mathematica.js">mathematica.js</option>
           <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>
diff --git a/mode/index.html b/mode/index.html
index d50f3f8315..534b88bc88 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -78,6 +78,7 @@ <h2>Language modes</h2>
       <li><a href="livescript/index.html">LiveScript</a></li>
       <li><a href="lua/index.html">Lua</a></li>
       <li><a href="markdown/index.html">Markdown</a> (<a href="gfm/index.html">GitHub-flavour</a>)</li>
+      <li><a href="mathematica/index.html">Mathematica</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>
diff --git a/mode/mathematica/index.html b/mode/mathematica/index.html
new file mode 100644
index 0000000000..57c4298531
--- /dev/null
+++ b/mode/mathematica/index.html
@@ -0,0 +1,72 @@
+<!doctype html>
+
+<title>CodeMirror: Mathematica 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/edit/matchbrackets.js></script>
+<script src=mathematica.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="#">Mathematica</a>
+  </ul>
+</div>
+
+<article>
+<h2>Mathematica mode</h2>
+
+
+<textarea id="mathematicaCode">
+(* example Mathematica code *)
+(* Dualisiert wird anhand einer Polarität an einer
+   Quadrik $x^t Q x = 0$ mit regulärer Matrix $Q$ (also
+   mit $det(Q) \neq 0$), z.B. die Identitätsmatrix.
+   $p$ ist eine Liste von Polynomen - ein Ideal. *)
+dualize::"singular" = "Q must be regular: found Det[Q]==0.";
+dualize[ Q_, p_ ] := Block[
+    { m, n, xv, lv, uv, vars, polys, dual },
+    If[Det[Q] == 0,
+      Message[dualize::"singular"],
+      m = Length[p];
+      n = Length[Q] - 1;
+      xv = Table[Subscript[x, i], {i, 0, n}];
+      lv = Table[Subscript[l, i], {i, 1, m}];
+      uv = Table[Subscript[u, i], {i, 0, n}];
+      (* Konstruiere Ideal polys. *)
+      If[m == 0,
+        polys = Q.uv,
+        polys = Join[p, Q.uv - Transpose[Outer[D, p, xv]].lv]
+        ];
+      (* Eliminiere die ersten n + 1 + m Variablen xv und lv
+         aus dem Ideal polys. *)
+      vars = Join[xv, lv];
+      dual = GroebnerBasis[polys, uv, vars];
+      (* Ersetze u mit x im Ergebnis. *)
+      ReplaceAll[dual, Rule[u, x]]
+      ]
+    ]
+</textarea>
+
+<script>
+  var mathematicaEditor = CodeMirror.fromTextArea(document.getElementById('mathematicaCode'), {
+    mode: 'text/x-mathematica',
+    lineNumbers: true,
+    matchBrackets: true
+  });
+</script>
+
+<p><strong>MIME types defined:</strong> <code>text/x-mathematica</code> (Mathematica).</p>
+</article>
diff --git a/mode/mathematica/mathematica.js b/mode/mathematica/mathematica.js
new file mode 100644
index 0000000000..5ae6f55cb5
--- /dev/null
+++ b/mode/mathematica/mathematica.js
@@ -0,0 +1,175 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Mathematica mode copyright (c) 2015 by Calin Barbat
+// Based on code by Patrick Scheibe (halirutan)
+// See: https://github.com/halirutan/Mathematica-Source-Highlighting/tree/master/src/lang-mma.js
+
+(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('mathematica', function(_config, _parserConfig) {
+
+  // used pattern building blocks
+  var Identifier = '[a-zA-Z\\$][a-zA-Z0-9\\$]*';
+  var pBase      = "(?:\\d+)";
+  var pFloat     = "(?:\\.\\d+|\\d+\\.\\d*|\\d+)";
+  var pFloatBase = "(?:\\.\\w+|\\w+\\.\\w*|\\w+)";
+  var pPrecision = "(?:`(?:`?"+pFloat+")?)";
+
+  // regular expressions
+  var reBaseForm        = new RegExp('(?:'+pBase+'(?:\\^\\^'+pFloatBase+pPrecision+'?(?:\\*\\^[+-]?\\d+)?))');
+  var reFloatForm       = new RegExp('(?:' + pFloat + pPrecision + '?(?:\\*\\^[+-]?\\d+)?)');
+  var reIdInContext     = new RegExp('(?:`?)(?:' + Identifier + ')(?:`(?:' + Identifier + '))*(?:`?)');
+
+  function tokenBase(stream, state) {
+    var ch;
+
+    // get next character
+    ch = stream.next();
+
+    // string
+    if (ch === '"') {
+      state.tokenize = tokenString;
+      return state.tokenize(stream, state);
+    }
+
+    // comment
+    if (ch === '(') {
+      if (stream.eat('*')) {
+        state.commentLevel++;
+        state.tokenize = tokenComment;
+        return state.tokenize(stream, state);
+      }
+    }
+
+    // go back one character
+    stream.backUp(1);
+
+    // look for numbers
+    // Numbers in a baseform
+    if (stream.match(reBaseForm, true, false)) {
+      return 'number';
+    }
+
+    // Mathematica numbers. Floats (1.2, .2, 1.) can have optionally a precision (`float) or an accuracy definition
+    // (``float). Note: while 1.2` is possible 1.2`` is not. At the end an exponent (float*^+12) can follow.
+    if (stream.match(reFloatForm, true, false)) {
+      return 'number';
+    }
+
+    /* In[23] and Out[34] */
+    if (stream.match(/(?:In|Out)\[[0-9]*\]/, true, false)) {
+      return 'atom';
+    }
+
+    // usage
+    if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::usage)/, true, false)) {
+      return 'meta';
+    }
+
+    // message
+    if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/, true, false)) {
+      return 'string-2';
+    }
+
+    // this makes a look-ahead match for something like variable:{_Integer}
+    // the match is then forwarded to the mma-patterns tokenizer.
+    if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*\s*:)(?:(?:[a-zA-Z\$][a-zA-Z0-9\$]*)|(?:[^:=>~@\^\&\*\)\[\]'\?,\|])).*/, true, false)) {
+      return 'variable-2';
+    }
+
+    // catch variables which are used together with Blank (_), BlankSequence (__) or BlankNullSequence (___)
+    // Cannot start with a number, but can have numbers at any other position. Examples
+    // blub__Integer, a1_, b34_Integer32
+    if (stream.match(/[a-zA-Z\$][a-zA-Z0-9\$]*_+[a-zA-Z\$][a-zA-Z0-9\$]*/, true, false)) {
+      return 'variable-2';
+    }
+    if (stream.match(/[a-zA-Z\$][a-zA-Z0-9\$]*_+/, true, false)) {
+      return 'variable-2';
+    }
+    if (stream.match(/_+[a-zA-Z\$][a-zA-Z0-9\$]*/, true, false)) {
+      return 'variable-2';
+    }
+
+    // Named characters in Mathematica, like \[Gamma].
+    if (stream.match(/\\\[[a-zA-Z\$][a-zA-Z0-9\$]*\]/, true, false)) {
+      return 'variable-3';
+    }
+
+    // Match all braces separately
+    if (stream.match(/(?:\[|\]|{|}|\(|\))/, true, false)) {
+      return 'bracket';
+    }
+
+    // Catch Slots (#, ##, #3, ##9 and the V10 named slots #name). I have never seen someone using more than one digit after #, so we match
+    // only one.
+    if (stream.match(/(?:#[a-zA-Z\$][a-zA-Z0-9\$]*|#+[0-9]?)/, true, false)) {
+      return 'variable-2';
+    }
+
+    // Literals like variables, keywords, functions
+    if (stream.match(reIdInContext, true, false)) {
+      return 'keyword';
+    }
+
+    // operators. Note that operators like @@ or /; are matched separately for each symbol.
+    if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%)/, true, false)) {
+      return 'operator';
+    }
+
+    // everything else is an error
+    return 'error';
+  }
+
+  function tokenString(stream, state) {
+    var next, end = false, escaped = false;
+    while ((next = stream.next()) != null) {
+      if (next === '"' && !escaped) {
+        end = true;
+        break;
+      }
+      escaped = !escaped && next === '\\';
+    }
+    if (end && !escaped) {
+      state.tokenize = tokenBase;
+    }
+    return 'string';
+  };
+
+  function tokenComment(stream, state) {
+    var prev, next;
+    while(state.commentLevel > 0 && (next = stream.next()) != null) {
+      if (prev === '(' && next === '*') state.commentLevel++;
+      if (prev === '*' && next === ')') state.commentLevel--;
+      prev = next;
+    }
+    if (state.commentLevel <= 0) {
+      state.tokenize = tokenBase;
+    }
+    return 'comment';
+  }
+
+  return {
+    startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return state.tokenize(stream, state);
+    },
+    blockCommentStart: "(*",
+    blockCommentEnd: "*)"
+  };
+});
+
+CodeMirror.defineMIME('text/x-mathematica', {
+  name: 'mathematica'
+});
+
+});
diff --git a/mode/meta.js b/mode/meta.js
index 6c988e226d..44e0dbfc99 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -72,6 +72,7 @@
     {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
     {name: "mIRC", mime: "text/mirc", mode: "mirc"},
     {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
+    {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
     {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"},

From e3cc695a8cf3fe2d67f3ca8e4904a9a4e6967c34 Mon Sep 17 00:00:00 2001
From: Michal Dorner <dorner.michal@gmail.com>
Date: Sun, 17 May 2015 23:53:33 +0200
Subject: [PATCH 2133/4742] [clike mode] Add C# keywords/builtins: async,
 await, Action, Func, Task

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

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 33d11ac297..6d0e4b11c0 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -336,7 +336,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-csharp", {
     name: "clike",
-    keywords: words("abstract as base break case catch checked class const continue" +
+    keywords: words("abstract as async await base break case catch checked class const continue" +
                     " default delegate do else enum event explicit extern finally fixed for" +
                     " foreach goto if implicit in interface internal is lock namespace new" +
                     " operator out override params private protected public readonly ref return sealed" +
@@ -344,8 +344,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     " unsafe using virtual void volatile while add alias ascending descending dynamic from get" +
                     " global group into join let orderby partial remove select set value var yield"),
     blockKeywords: words("catch class do else finally for foreach if struct switch try while"),
-    builtin: words("Boolean Byte Char DateTime DateTimeOffset Decimal Double" +
-                    " Guid Int16 Int32 Int64 Object SByte Single String TimeSpan UInt16 UInt32" +
+    builtin: words("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func" +
+                    " Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32" +
                     " UInt64 bool byte char decimal double short int long object"  +
                     " sbyte float string ushort uint ulong"),
     atoms: words("true false null"),

From d1cae0a8002877213aba292aebd6a4edee69757e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 18 May 2015 11:00:48 +0200
Subject: [PATCH 2134/4742] [clike mode] Add separate token type for types

And a few minimal tests for the mode
---
 mode/clike/clike.js | 62 ++++++++++++++++++++++++++++++---------------
 mode/clike/test.js  | 22 ++++++++++++++++
 test/index.html     |  1 +
 3 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 mode/clike/test.js

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 6d0e4b11c0..09a4237ce8 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -16,6 +16,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
       dontAlignCalls = parserConfig.dontAlignCalls,
       keywords = parserConfig.keywords || {},
+      types = parserConfig.types || {},
       builtin = parserConfig.builtin || {},
       blockKeywords = parserConfig.blockKeywords || {},
       atoms = parserConfig.atoms || {},
@@ -65,6 +66,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
       return "keyword";
     }
+    if (types.propertyIsEnumerable(cur)) return "variable-2";
     if (builtin.propertyIsEnumerable(cur)) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
       return "builtin";
@@ -129,7 +131,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         tokenize: null,
         context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
         indented: 0,
-        startOfLine: true
+        startOfLine: true,
+        prevToken: null
       };
     },
 
@@ -165,7 +168,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         pushContext(state, stream.column(), type);
       }
       state.startOfLine = false;
-      return style;
+      return state.prevToken = style;
     },
 
     indent: function(state, textAfter) {
@@ -198,9 +201,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
-  var cKeywords = "auto if break int case long char register continue return default short do sizeof " +
-    "double static else struct switch extern typedef float union for unsigned " +
-    "goto while enum void const signed volatile";
+  var cKeywords = "auto if break case register continue return default do sizeof " +
+    "static else struct switch extern typedef float union for unsigned " +
+    "goto while enum const volatile true false";
+  var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
 
   function cppHook(stream, state) {
     if (!state.startOfLine) return false;
@@ -220,6 +224,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return "meta";
   }
 
+  function pointerHook(stream, state) {
+    if (state.prevToken == "variable-2") return "variable-2";
+    return false;
+  }
+
   function cpp11StringHook(stream, state) {
     stream.backUp(1);
     // Raw strings.
@@ -277,6 +286,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         words.push(prop);
     }
     add(mode.keywords);
+    add(mode.types);
     add(mode.builtin);
     add(mode.atoms);
     if (words.length) {
@@ -291,9 +301,12 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   def(["text/x-csrc", "text/x-c", "text/x-chdr"], {
     name: "clike",
     keywords: words(cKeywords),
+    types: words(cTypes + " bool _Complex _Bool float_t double_t intptr_t intmax_t " +
+                 "int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t " +
+                 "uint32_t uint64_t"),
     blockKeywords: words("case do else for if switch while struct"),
     atoms: words("null"),
-    hooks: {"#": cppHook},
+    hooks: {"#": cppHook, "*": pointerHook},
     modeProps: {fold: ["brace", "include"]}
   });
 
@@ -304,10 +317,12 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "this using const_cast inline public throw virtual delete mutable protected " +
                     "wchar_t alignas alignof constexpr decltype nullptr noexcept thread_local final " +
                     "static_assert override"),
+    types: words(cTypes + "bool wchar_t"),
     blockKeywords: words("catch class do else finally for if struct switch try while"),
     atoms: words("true false null"),
     hooks: {
       "#": cppHook,
+      "*": pointerHook,
       "u": cpp11StringHook,
       "U": cpp11StringHook,
       "L": cpp11StringHook,
@@ -318,11 +333,13 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-java", {
     name: "clike",
-    keywords: words("abstract assert boolean break byte case catch char class const continue default " +
-                    "do double else enum extends final finally float for goto if implements import " +
-                    "instanceof int interface long native new package private protected public " +
-                    "return short static strictfp super switch synchronized this throw throws transient " +
-                    "try void volatile while"),
+    keywords: words("abstract assert break case catch class const continue default " +
+                    "do else enum extends final finally float for goto if implements import " +
+                    "instanceof interface native new package private protected public " +
+                    "return static strictfp super switch synchronized this throw throws transient " +
+                    "try volatile while"),
+    types: words("byte short int long float double boolean char void Boolean Byte Character Double Float " +
+                 "Integer Long Number Object Short String StringBuffer StringBuilder Void"),
     blockKeywords: words("catch class do else finally for if switch try while"),
     atoms: words("true false null"),
     hooks: {
@@ -343,11 +360,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     " sizeof stackalloc static struct switch this throw try typeof unchecked" +
                     " unsafe using virtual void volatile while add alias ascending descending dynamic from get" +
                     " global group into join let orderby partial remove select set value var yield"),
+    types: words("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func" +
+                 " Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32" +
+                 " UInt64 bool byte char decimal double short int long object"  +
+                 " sbyte float string ushort uint ulong"),
     blockKeywords: words("catch class do else finally for foreach if struct switch try while"),
-    builtin: words("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func" +
-                    " Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32" +
-                    " UInt64 bool byte char decimal double short int long object"  +
-                    " sbyte float string ushort uint ulong"),
     atoms: words("true false null"),
     hooks: {
       "@": function(stream, state) {
@@ -387,11 +404,14 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "assert assume require print println printf readLine readBoolean readByte readShort " +
       "readChar readInt readLong readFloat readDouble " +
 
+      ":: #:: "
+    ),
+    types: words(
       "AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either " +
       "Enumeration Equiv Error Exception Fractional Function IndexedSeq Integral Iterable " +
       "Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering " +
       "Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder " +
-      "StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector :: #:: " +
+      "StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector " +
 
       /* package java.lang */
       "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
@@ -424,15 +444,15 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def(["x-shader/x-vertex", "x-shader/x-fragment"], {
     name: "clike",
-    keywords: words("float int bool void " +
-                    "vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 " +
-                    "mat2 mat3 mat4 " +
-                    "sampler1D sampler2D sampler3D samplerCube " +
+    keywords: words("sampler1D sampler2D sampler3D samplerCube " +
                     "sampler1DShadow sampler2DShadow " +
                     "const attribute uniform varying " +
                     "break continue discard return " +
                     "for while do if else struct " +
                     "in out inout"),
+    types: words("float int bool void " +
+                 "vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 " +
+                 "mat2 mat3 mat4"),
     blockKeywords: words("for while do if else struct"),
     builtin: words("radians degrees sin cos tan asin acos atan " +
                     "pow exp log exp2 sqrt inversesqrt " +
@@ -486,6 +506,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     keywords: words(cKeywords + "as atomic async call command component components configuration event generic " +
                     "implementation includes interface module new norace nx_struct nx_union post provides " +
                     "signal task uses abstract extends"),
+    types: words(cTypes),
     blockKeywords: words("case do else for if switch while struct"),
     atoms: words("null"),
     hooks: {"#": cppHook},
@@ -496,6 +517,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     name: "clike",
     keywords: words(cKeywords + "inline restrict _Bool _Complex _Imaginery BOOL Class bycopy byref id IMP in " +
                     "inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
+    types: words(cTypes),
     atoms: words("YES NO NULL NILL ON OFF"),
     hooks: {
       "@": function(stream) {
diff --git a/mode/clike/test.js b/mode/clike/test.js
new file mode 100644
index 0000000000..ee885505d2
--- /dev/null
+++ b/mode/clike/test.js
@@ -0,0 +1,22 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-c");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("indent",
+     "[variable-2 void] [variable foo]([variable-2 void*] [variable a], [variable-2 int] [variable b]) {",
+     "  [variable-2 int] [variable c] [operator =] [variable b] [operator +]",
+     "    [number 1];",
+     "  [keyword return] [operator *][variable a];",
+     "}");
+
+  MT("indent_switch",
+     "[keyword switch] ([variable x]) {",
+     "  [keyword case] [number 10]:",
+     "    [keyword return] [number 20];",
+     "  [keyword default]:",
+     "    [variable printf]([string \"foo %c\"], [variable x]);",
+     "}");
+})();
diff --git a/test/index.html b/test/index.html
index d7fdede74e..eb7412645e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -96,6 +96,7 @@ <h2>Test Suite</h2>
     <script src="search_test.js"></script>
     <script src="mode_test.js"></script>
 
+    <script src="../mode/clike/test.js"></script>
     <script src="../mode/css/test.js"></script>
     <script src="../mode/css/scss_test.js"></script>
     <script src="../mode/css/less_test.js"></script>

From 3d5d9a4af38facd8c2d79abbe74ead61470ca97b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 18 May 2015 12:39:23 +0200
Subject: [PATCH 2135/4742] [clike mode] Highlight identifiers that are
 (probably) definitions

---
 mode/clike/clike.js | 40 ++++++++++++++++++++++++++++++++--------
 mode/clike/test.js  |  9 +++++++--
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 09a4237ce8..c5469eb27d 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -19,6 +19,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       types = parserConfig.types || {},
       builtin = parserConfig.builtin || {},
       blockKeywords = parserConfig.blockKeywords || {},
+      defKeywords = parserConfig.defKeywords || {},
       atoms = parserConfig.atoms || {},
       hooks = parserConfig.hooks || {},
       multiLineStrings = parserConfig.multiLineStrings,
@@ -26,7 +27,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       indentSwitch = parserConfig.indentSwitch !== false;
   var isOperatorChar = /[+\-*&%=<>!?|\/]/;
 
-  var curPunc;
+  var curPunc, isDefKeyword;
 
   function tokenBase(stream, state) {
     var ch = stream.next();
@@ -64,9 +65,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      if (defKeywords.propertyIsEnumerable(cur)) isDefKeyword = true;
       return "keyword";
     }
-    if (types.propertyIsEnumerable(cur)) return "variable-2";
+    if (types.propertyIsEnumerable(cur)) return "variable-3";
     if (builtin.propertyIsEnumerable(cur)) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
       return "builtin";
@@ -123,6 +125,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return state.context = state.context.prev;
   }
 
+  function typeBefore(stream, state) {
+    if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
+    if (/\S[>*\]]\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
+  }
+
   // Interface
 
   return {
@@ -144,7 +151,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         state.startOfLine = true;
       }
       if (stream.eatSpace()) return null;
-      curPunc = null;
+      curPunc = isDefKeyword = null;
       var style = (state.tokenize || tokenBase)(stream, state);
       if (style == "comment" || style == "meta") return style;
       if (ctx.align == null) ctx.align = true;
@@ -167,8 +174,16 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
           type = "switchstatement"
         pushContext(state, stream.column(), type);
       }
+
+      if (style == "variable" &&
+          ((state.prevToken == "def" ||
+            (parserConfig.typeFirstDefinitions && typeBefore(stream, state) &&
+             stream.match(/^\s*\(/, false)))))
+        style = "def";
+
       state.startOfLine = false;
-      return state.prevToken = style;
+      state.prevToken = isDefKeyword ? "def" : style;
+      return style;
     },
 
     indent: function(state, textAfter) {
@@ -202,7 +217,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return obj;
   }
   var cKeywords = "auto if break case register continue return default do sizeof " +
-    "static else struct switch extern typedef float union for unsigned " +
+    "static else struct switch extern typedef float union for " +
     "goto while enum const volatile true false";
   var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
 
@@ -224,8 +239,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return "meta";
   }
 
-  function pointerHook(stream, state) {
-    if (state.prevToken == "variable-2") return "variable-2";
+  function pointerHook(_stream, state) {
+    if (state.prevToken == "variable-3") return "variable-3";
     return false;
   }
 
@@ -305,6 +320,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                  "int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t " +
                  "uint32_t uint64_t"),
     blockKeywords: words("case do else for if switch while struct"),
+    defKeywords: words("struct"),
+    typeFirstDefinitions: true,
     atoms: words("null"),
     hooks: {"#": cppHook, "*": pointerHook},
     modeProps: {fold: ["brace", "include"]}
@@ -319,6 +336,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "static_assert override"),
     types: words(cTypes + "bool wchar_t"),
     blockKeywords: words("catch class do else finally for if struct switch try while"),
+    defKeywords: words("class namespace struct enum union"),
+    typeFirstDefinitions: true,
     atoms: words("true false null"),
     hooks: {
       "#": cppHook,
@@ -341,6 +360,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     types: words("byte short int long float double boolean char void Boolean Byte Character Double Float " +
                  "Integer Long Number Object Short String StringBuffer StringBuilder Void"),
     blockKeywords: words("catch class do else finally for if switch try while"),
+    defKeywords: words("class interface package enum"),
+    typeFirstDefinitions: true,
     atoms: words("true false null"),
     hooks: {
       "@": function(stream) {
@@ -365,6 +386,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                  " UInt64 bool byte char decimal double short int long object"  +
                  " sbyte float string ushort uint ulong"),
     blockKeywords: words("catch class do else finally for foreach if struct switch try while"),
+    defKeywords: words("class interface namespace struct var"),
+    typeFirstDefinitions: true,
     atoms: words("true false null"),
     hooks: {
       "@": function(stream, state) {
@@ -397,7 +420,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       /* scala */
       "abstract case catch class def do else extends false final finally for forSome if " +
       "implicit import lazy match new null object override package private protected return " +
-      "sealed super this throw trait try trye type val var while with yield _ : = => <- <: " +
+      "sealed super this throw trait try type val var while with yield _ : = => <- <: " +
       "<% >: # @ " +
 
       /* package scala */
@@ -421,6 +444,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     ),
     multiLineStrings: true,
     blockKeywords: words("catch class do else finally for forSome if match switch try while"),
+    defKeywords: words("class def object package trait type val var"),
     atoms: words("true false null"),
     indentStatements: false,
     indentSwitch: false,
diff --git a/mode/clike/test.js b/mode/clike/test.js
index ee885505d2..801a17c508 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -6,8 +6,8 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   MT("indent",
-     "[variable-2 void] [variable foo]([variable-2 void*] [variable a], [variable-2 int] [variable b]) {",
-     "  [variable-2 int] [variable c] [operator =] [variable b] [operator +]",
+     "[variable-3 void] [def foo]([variable-3 void*] [variable a], [variable-3 int] [variable b]) {",
+     "  [variable-3 int] [variable c] [operator =] [variable b] [operator +]",
      "    [number 1];",
      "  [keyword return] [operator *][variable a];",
      "}");
@@ -19,4 +19,9 @@
      "  [keyword default]:",
      "    [variable printf]([string \"foo %c\"], [variable x]);",
      "}");
+
+  MT("def",
+     "[variable-3 void] [def foo]() {}",
+     "[keyword struct] [def bar]{}",
+     "[variable-3 int] [variable-3 *][def baz]() {}");
 })();

From 56ed3f7c73e112ec704193492d5ee990ea20bc5f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 18 May 2015 12:45:23 +0200
Subject: [PATCH 2136/4742] [php mode] Declare defKeywords

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

diff --git a/mode/php/php.js b/mode/php/php.js
index e112d91121..1c62eb485a 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -94,6 +94,7 @@
     helperType: "php",
     keywords: keywords(phpKeywords),
     blockKeywords: keywords("catch do else elseif for foreach if switch try while finally"),
+    defKeywords: keywords("class function interface namespace trait"),
     atoms: keywords(phpAtoms),
     builtin: keywords(phpBuiltin),
     multiLineStrings: true,

From b43a6b36b5fd784e8e67b9d3387d86b19e9612e4 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Mon, 18 May 2015 14:17:10 -0700
Subject: [PATCH 2137/4742] [monokai theme] Add support for cm-variable-3 type

---
 theme/monokai.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/monokai.css b/theme/monokai.css
index d70bb86f29..9b9a6f3919 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -20,6 +20,7 @@
 
 .cm-s-monokai span.cm-variable {color: #f8f8f2;}
 .cm-s-monokai span.cm-variable-2 {color: #9effff;}
+.cm-s-monokai span.cm-variable-3 {color: #66d9ef;}
 .cm-s-monokai span.cm-def {color: #fd971f;}
 .cm-s-monokai span.cm-bracket {color: #f8f8f2;}
 .cm-s-monokai span.cm-tag {color: #f92672;}

From 1a9cdc08152035db9cd02439bcacafad3458065c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 19 May 2015 12:46:56 +0200
Subject: [PATCH 2138/4742] [package.json] Use supported format for license
 field

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 2ae2e6b72f..b3e55d8778 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,7 @@
     "version":"5.2.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
-    "licenses": [{"type": "MIT",
-                  "url": "http://codemirror.net/LICENSE"}],
+    "license": "MIT",
     "directories": {"lib": "./lib"},
     "scripts": {"test": "node ./test/run.js"},
     "devDependencies": {"node-static": "0.6.0",

From c35e4a4b96e4ce70f85e84ae8882d7ffb38b9aa9 Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Tue, 19 May 2015 23:08:54 -0400
Subject: [PATCH 2139/4742] [vim] Support :s with \r,\n,\t

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

diff --git a/keymap/vim.js b/keymap/vim.js
index f93774271f..fb0331862c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3640,13 +3640,17 @@
     // Translates the replace part of a search and replace from ex (vim) syntax into
     // javascript form.  Similar to translateRegex, but additionally fixes back references
     // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'.
+    var charUnescapes = {'\\n': '\n', '\\r': '\r', '\\t': '\t'};
     function translateRegexReplace(str) {
       var escapeNextChar = false;
       var out = [];
       for (var i = -1; i < str.length; i++) {
         var c = str.charAt(i) || '';
         var n = str.charAt(i+1) || '';
-        if (escapeNextChar) {
+        if (charUnescapes[c + n]) {
+          out.push(charUnescapes[c+n]);
+          i++;
+        } else if (escapeNextChar) {
           // At any point in the loop, escapeNextChar is true if the previous
           // character was a '\' and was not escaped.
           out.push(c);
@@ -3674,6 +3678,7 @@
     }
 
     // Unescape \ and / in the replace part, for PCRE mode.
+    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'};
     function unescapeRegexReplace(str) {
       var stream = new CodeMirror.StringStream(str);
       var output = [];
@@ -3682,13 +3687,15 @@
         while (stream.peek() && stream.peek() != '\\') {
           output.push(stream.next());
         }
-        if (stream.match('\\/', true)) {
-          // \/ => /
-          output.push('/');
-        } else if (stream.match('\\\\', true)) {
-          // \\ => \
-          output.push('\\');
-        } else {
+        var matched = false;
+        for (var matcher in unescapes) {
+          if (stream.match(matcher, true)) {
+            matched = true;
+            output.push(unescapes[matcher]);
+            break;
+          }
+        }
+        if (!matched) {
           // Don't change anything
           output.push(stream.next());
         }
@@ -4463,6 +4470,9 @@
         var query = state.getQuery();
         var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
         var lineEnd = params.lineEnd || lineStart;
+        if (lineStart == cm.firstLine() && lineEnd == cm.lastLine()) {
+          lineEnd = Infinity;
+        }
         if (count) {
           lineStart = lineEnd;
           lineEnd = lineStart + count - 1;
diff --git a/test/vim_test.js b/test/vim_test.js
index ff51d0cf42..e9b7bec069 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -200,11 +200,13 @@ function testVim(name, run, opts, expectedFail) {
     CodeMirror.Vim.resetVimGlobalState_();
     var successful = false;
     var savedOpenNotification = cm.openNotification;
+    var savedOpenDialog = cm.openDialog;
     try {
       run(cm, vim, helpers);
       successful = true;
     } finally {
       cm.openNotification = savedOpenNotification;
+      cm.openDialog = savedOpenDialog;
       if (!successful || verbose) {
         place.style.visibility = "visible";
       } else {
@@ -3556,6 +3558,10 @@ testSubstitute('ex_substitute_multibackslash_replacement', {
   value: 'one,two \n three,four',
   expectedValue: 'one\\\\\\\\two \n three\\\\\\\\four', // 2*8 backslashes.
   expr: '%s/,/\\\\\\\\\\\\\\\\/g'}); // 16 backslashes.
+testSubstitute('ex_substitute_newline_replacement', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one\ntwo \n three\nfour',
+  expr: '%s/,/\\n/g'});
 testSubstitute('ex_substitute_braces_word', {
   value: 'ababab abb ab{2}',
   expectedValue: 'ab abb ab{2}',

From daae9be9ebda2c64f82cee560b6d421fb0b7488d Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 20 May 2015 12:56:08 +0530
Subject: [PATCH 2140/4742] [sql mode] MySQL function is GROUP_CONCAT, not
 GROUPBY_CONCAT

---
 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 a33a8ec397..a908277151 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -293,7 +293,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-mysql", {
     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 + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group groupby_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
+    keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
     builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,

From 994281f9d3eed7cd00e9beef64f70d8d78047523 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 20 May 2015 10:16:38 +0200
Subject: [PATCH 2141/4742] Mark release 5.3.0

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

diff --git a/AUTHORS b/AUTHORS
index b9bf72103c..9c271f9c43 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -50,6 +50,7 @@ Ankit Ahuja
 Ansel Santosa
 Anthony Grimes
 Anton Kovalyov
+AQNOUCH Mohammed
 areos
 as3boyan
 AtomicPages LLC
@@ -76,6 +77,7 @@ Brett Zamir
 Brian Grinstead
 Brian Sletten
 Bruce Mitchener
+Calin Barbat
 Chandra Sekhar Pydi
 Charles Skelton
 Cheah Chu Yeow
@@ -173,6 +175,7 @@ Hakan Tunc
 Hans Engel
 Hardest
 Hasan Karahan
+Hector Oswaldo Caballero
 Herculano Campos
 Hiroyuki Makino
 hitsthings
@@ -266,6 +269,7 @@ Lorenzo Stoakes
 Luciano Longo
 Luke Stagner
 lynschinzer
+Madhura Jayaratne
 Maksim Lin
 Maksym Taran
 Malay Majithia
@@ -290,6 +294,7 @@ Mateusz Paprocki
 Mathias Bynens
 mats cronqvist
 Matthew Beale
+Matthew Rathbone
 Matthias Bussonnier
 Matthias BUSSONNIER
 Matt McDonald
@@ -306,6 +311,7 @@ Micah Dubinko
 Michael Grey
 Michael Lehenbauer
 Michael Zhou
+Michal Dorner
 Mighty Guava
 Miguel Castillo
 mihailik
@@ -342,6 +348,7 @@ Nikolay Kostov
 nilp0inter
 Nisarg Jhaveri
 nlwillia
+noragrossman
 Norman Rzepka
 pablo
 Page
diff --git a/bower.json b/bower.json
index 13e7e5b47d..a9e0fd0d29 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"5.2.1",
+  "version":"5.3.0",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/compress.html b/doc/compress.html
index ff3c7dd14d..9c8c3c0c70 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.3.0;f=">5.3</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>
diff --git a/doc/manual.html b/doc/manual.html
index 2c44b92cf4..9cce7328d3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.2.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.3.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 8d1e2cc008..0f9c69b319 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-05-2015: <a href="http://codemirror.net/codemirror-5.3.zip">Version 5.3</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix several regressions in the <a href="manual.html#addon_show-hint"><code>show-hint</code></a> addon (<code>completeSingle</code> option, <code>"shown"</code> and <code>"close"</code> events)</li>
+    <li>The <a href="../demo/vim.html">vim mode</a> was <a href="manual.html#vimapi">documented</a></li>
+    <li>New modes: <a href="../mode/asn.1/index.html">ASN.1</a>, <a href="../mode/ttcn/index.html">TTCN</a>, and <a href="../mode/ttcn-cfg/index.html">TTCN-CFG</a></li>
+    <li>The <a href="../mode/clike/index.html">clike</a> mode can now deep-indent <code>switch</code> statements, and rougly recognizes types and defined identifiers</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.2.0...5.3.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">20-04-2015: <a href="http://codemirror.net/codemirror-5.2.zip">Version 5.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index e2cca9f0bb..c8e38e3e19 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.3</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 d611a96f1f..a1dfd0fc3d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8739,7 +8739,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.2.1";
+  CodeMirror.version = "5.3.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index b3e55d8778..94bd2c0fac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.2.1",
+    "version":"5.3.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From e18595bb523b5af9ceacb466d1854e5b45f5c418 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 20 May 2015 10:17:35 +0200
Subject: [PATCH 2142/4742] Bump version number post-5.3

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

diff --git a/bower.json b/bower.json
index a9e0fd0d29..892aa72326 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version":"5.3.0",
+  "version":"5.3.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",
diff --git a/doc/manual.html b/doc/manual.html
index 9cce7328d3..424796f96f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.3.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.3.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a1dfd0fc3d..cb6d3026b1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8739,7 +8739,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.3.0";
+  CodeMirror.version = "5.3.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 94bd2c0fac..a400c9e145 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.3.0",
+    "version":"5.3.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 9e4e844898a60576aebb31a0999cb767a758cf39 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 20 May 2015 10:20:46 +0200
Subject: [PATCH 2143/4742] Typos in 5.3.0 release notes

---
 doc/releases.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/releases.html b/doc/releases.html
index 0f9c69b319..37c3d2e453 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,9 +34,9 @@ <h2>Version 5.x</h2>
 
   <ul class="rel-note">
     <li>Fix several regressions in the <a href="manual.html#addon_show-hint"><code>show-hint</code></a> addon (<code>completeSingle</code> option, <code>"shown"</code> and <code>"close"</code> events)</li>
-    <li>The <a href="../demo/vim.html">vim mode</a> was <a href="manual.html#vimapi">documented</a></li>
+    <li>The <a href="../demo/vim.html">vim mode</a> API was <a href="manual.html#vimapi">documented</a></li>
     <li>New modes: <a href="../mode/asn.1/index.html">ASN.1</a>, <a href="../mode/ttcn/index.html">TTCN</a>, and <a href="../mode/ttcn-cfg/index.html">TTCN-CFG</a></li>
-    <li>The <a href="../mode/clike/index.html">clike</a> mode can now deep-indent <code>switch</code> statements, and rougly recognizes types and defined identifiers</li>
+    <li>The <a href="../mode/clike/index.html">clike</a> mode can now deep-indent <code>switch</code> statements, and roughly recognizes types and defined identifiers</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.2.0...5.3.0">list of patches</a></li>
   </ul>
 

From 70691857f2db3ed7aba5ce5645caff23dbd656e8 Mon Sep 17 00:00:00 2001
From: Hector Oswaldo Caballero <hector.caballero@ericsson.com>
Date: Fri, 22 May 2015 13:59:16 -0400
Subject: [PATCH 2144/4742] [meta] Include new ASN.1, TTCN and TTCN-CFG modes

---
 mode/meta.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/meta.js b/mode/meta.js
index 44e0dbfc99..3f127c99a2 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -14,6 +14,7 @@
   CodeMirror.modeInfo = [
     {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
     {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
+    {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn, asn1"]},
     {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
     {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
@@ -124,6 +125,8 @@
     {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
     {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
     {name: "troff", mime: "troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
+    {name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
+    {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
     {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
     {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},

From 9b8fb65abba3fbb9440e6a28145095242d552ae6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 24 May 2015 22:46:55 +0200
Subject: [PATCH 2145/4742] [groovy mode] Improve indentation after
 argument-less return/continue/break

Closes #3276
---
 mode/groovy/groovy.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index e3a1db869b..721933b01c 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -24,6 +24,7 @@ CodeMirror.defineMode("groovy", function(config) {
     "short static strictfp super switch synchronized threadsafe throw throws transient " +
     "try void volatile while");
   var blockKeywords = words("catch class do else finally for if switch try while enum interface def");
+  var standaloneKeywords = words("return break continue");
   var atoms = words("null true false this");
 
   var curPunc;
@@ -50,7 +51,7 @@ CodeMirror.defineMode("groovy", function(config) {
         stream.skipToEnd();
         return "comment";
       }
-      if (expectExpression(state.lastToken)) {
+      if (expectExpression(state.lastToken, false)) {
         return startString(ch, stream, state);
       }
     }
@@ -70,6 +71,7 @@ CodeMirror.defineMode("groovy", function(config) {
     if (atoms.propertyIsEnumerable(cur)) { return "atom"; }
     if (keywords.propertyIsEnumerable(cur)) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      else if (standaloneKeywords.propertyIsEnumerable(cur)) curPunc = "standalone";
       return "keyword";
     }
     return "variable";
@@ -132,9 +134,10 @@ CodeMirror.defineMode("groovy", function(config) {
     return "comment";
   }
 
-  function expectExpression(last) {
+  function expectExpression(last, newline) {
     return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) ||
-      last == "newstatement" || last == "keyword" || last == "proplabel";
+      last == "newstatement" || last == "keyword" || last == "proplabel" ||
+      (last == "standalone" && !newline);
   }
 
   function Context(indented, column, type, align, prev) {
@@ -174,7 +177,7 @@ CodeMirror.defineMode("groovy", function(config) {
         state.indented = stream.indentation();
         state.startOfLine = true;
         // Automatic semicolon insertion
-        if (ctx.type == "statement" && !expectExpression(state.lastToken)) {
+        if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) {
           popContext(state); ctx = state.context;
         }
       }
@@ -209,7 +212,7 @@ CodeMirror.defineMode("groovy", function(config) {
     indent: function(state, textAfter) {
       if (!state.tokenize[state.tokenize.length-1].isBase) return 0;
       var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
-      if (ctx.type == "statement" && !expectExpression(state.lastToken)) ctx = ctx.prev;
+      if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) ctx = ctx.prev;
       var closing = firstChar == ctx.type;
       if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit);
       else if (ctx.align) return ctx.column + (closing ? 0 : 1);

From 923bf9b9b9f03fe4a00454ffaccf9422f71e2d1c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 26 May 2015 12:27:29 +0200
Subject: [PATCH 2146/4742] Disable input polling when the context menu kludge
 is active

It can, if the selection is changed in that narrow window, cause
bogus deletion of the selection.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index cb6d3026b1..ca91f4beef 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1389,9 +1389,11 @@
       // 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.contextMenuPending || !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
       if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
         input.value = input.value.substring(0, input.value.length - 1);

From 172a78163d3ad80636d99983001acde633f3433b Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 22 May 2015 07:32:35 +0530
Subject: [PATCH 2147/4742] [sql-hint] Respect alias names when completing
 columns with display text

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

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 08051ce74f..22124b58f7 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -127,13 +127,13 @@
 
     if (columns) {
       addMatches(result, string, columns, function(w) {
+        var tableInsert = table;
+        if (alias == true) tableInsert = aliasTable;
         if (typeof w == "string") {
-          var tableInsert = table;
-          if (alias == true) tableInsert = aliasTable;
           w = tableInsert + "." + w;
         } else {
           w = shallowClone(w);
-          w.text = table + "." + w.text;
+          w.text = tableInsert + "." + w.text;
         }
         return useBacktick ? insertBackticks(w) : w;
       });

From 0467bf22e92e68a08285e9d48ad313460db20c2c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 26 May 2015 12:35:31 +0200
Subject: [PATCH 2148/4742] [sql-hint] Add a test for the fix in
 172a78163d3ad80636d99983001acde633f3433b

Issue #3274
---
 test/sql-hint-test.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index efe5d54b19..39f2172e1f 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -168,6 +168,16 @@
     to: Pos(0, 9)
   });
 
+  test("alias_complete_with_displayText", {
+    value: "SELECT t. FROM mytable t",
+    cursor: Pos(0, 9),
+    tables: displayTextTables,
+    list: [{text: "t.id", displayText: "id | Unique ID"},
+           {text: "t.name", displayText: "name | The name"}],
+    from: Pos(0, 7),
+    to: Pos(0, 9)
+  })
+
   function deepCompare(a, b) {
     if (!a || typeof a != "object")
       return a === b;

From 64b11dc66305ee1cd529240662c49e3494385ea2 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Mon, 25 May 2015 17:55:06 -0700
Subject: [PATCH 2149/4742] [monokai theme] Add support for cm-header

Matches color for `cm-link` style
---
 theme/monokai.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/monokai.css b/theme/monokai.css
index 9b9a6f3919..cea775f67f 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -24,6 +24,7 @@
 .cm-s-monokai span.cm-def {color: #fd971f;}
 .cm-s-monokai span.cm-bracket {color: #f8f8f2;}
 .cm-s-monokai span.cm-tag {color: #f92672;}
+.cm-s-monokai span.cm-header {color: #ae81ff;}
 .cm-s-monokai span.cm-link {color: #ae81ff;}
 .cm-s-monokai span.cm-error {background: #f92672; color: #f8f8f0;}
 

From 4ef6a904c6312a8ca3d7ba1d81c88a78bbcba076 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Mon, 25 May 2015 23:20:51 +0200
Subject: [PATCH 2150/4742] [markdown mode] Allow a list after a hr, with no
 blank lines in between

---
 mode/markdown/markdown.js | 8 ++++++--
 mode/markdown/test.js     | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index bc5314fc35..9ba35cd9fc 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -158,6 +158,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     } else if (stream.peek() === '[') {
       return switchInline(stream, state, footnoteLink);
     } else if (stream.match(hrRE, true)) {
+      state.hr = true;
       return hr;
     } else if ((!state.prevLineHasContent || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
       var listType = null;
@@ -663,6 +664,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         em: false,
         strong: false,
         header: 0,
+        hr: false,
         taskList: false,
         list: false,
         listDepth: 0,
@@ -695,6 +697,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         strong: s.strong,
         strikethrough: s.strikethrough,
         header: s.header,
+        hr: s.hr,
         taskList: s.taskList,
         list: s.list,
         listDepth: s.listDepth,
@@ -711,10 +714,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.formatting = false;
 
       if (stream.sol()) {
-        var forceBlankLine = !!state.header;
+        var forceBlankLine = !!state.header || state.hr;
 
-        // Reset state.header
+        // Reset state.header and state.hr
         state.header = 0;
+        state.hr = false;
 
         if (stream.match(/^\s*$/, true) || forceBlankLine) {
           state.prevLineHasContent = false;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 7bc687f0e6..e217374e45 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -287,6 +287,11 @@
      "1. bar",
      "2. hello");
 
+  // List after hr
+  MT("listAfterHr",
+     "[hr ---]",
+     "[variable-2 - bar]");
+
   // List after header
   MT("listAfterHeader",
      "[header&header-1 # foo]",

From 495de327b7982eb0da3bb93fcd5a0941f177dff7 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Wed, 27 May 2015 00:35:15 +0200
Subject: [PATCH 2151/4742] [markdown mode] Make markdown mode a whole lot more
 CommonMark compliant

---
 mode/markdown/markdown.js | 32 ++++++++++++++++++--------
 mode/markdown/test.js     | 48 ++++++++++++++++++++++++++++++---------
 2 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 9ba35cd9fc..5cf1bf59c7 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -68,12 +68,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   strong   = 'strong'
   ,   strikethrough = 'strikethrough';
 
-  var hrRE = /^([*\-=_])(?:\s*\1){2,}\s*$/
+  var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
   ,   ulRE = /^[*\-+]\s+/
-  ,   olRE = /^[0-9]+\.\s+/
+  ,   olRE = /^[0-9]+([.)])\s+/
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
-  ,   atxHeaderRE = /^#+ ?/
-  ,   setextHeaderRE = /^(?:\={1,}|-{1,})$/
+  ,   atxHeaderRE = /^(#+)(?: |$)/
+  ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/;
 
   function switchInline(stream, state, f) {
@@ -100,6 +100,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.strikethrough = false;
     // Reset state.quote
     state.quote = 0;
+    // Reset state.indentedCode
+    state.indentedCode = false;
     if (!htmlFound && state.f == htmlBlock) {
       state.f = inlineNormal;
       state.block = blockNormal;
@@ -116,7 +118,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     var sol = stream.sol();
 
-    var prevLineIsList = state.list !== false;
+    var prevLineIsList = state.list !== false,
+        prevLineIsIndentedCode = state.indentedCode;
+
+    state.indentedCode = false;
+
     if (prevLineIsList) {
       if (state.indentationDiff >= 0) { // Continued list
         if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
@@ -134,17 +140,22 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     var match = null;
     if (state.indentationDiff >= 4) {
-      state.indentation -= 4;
       stream.skipToEnd();
-      return code;
+      if (prevLineIsIndentedCode || !state.prevLineHasContent) {
+        state.indentation -= 4;
+        state.indentedCode = true;
+        return code;
+      } else {
+        return null;
+      }
     } else if (stream.eatSpace()) {
       return null;
-    } else if (match = stream.match(atxHeaderRE)) {
-      state.header = Math.min(6, match[0].indexOf(" ") !== -1 ? match[0].length - 1 : match[0].length);
+    } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
+      state.header = match[1].length;
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
       return getType(state);
-    } else if (state.prevLineHasContent && (match = stream.match(setextHeaderRE))) {
+    } else if (state.prevLineHasContent && !state.quote && !prevLineIsList && !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
       state.header = match[0].charAt(0) == '=' ? 1 : 2;
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
@@ -702,6 +713,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         list: s.list,
         listDepth: s.listDepth,
         quote: s.quote,
+        indentedCode: s.indentedCode,
         trailingSpace: s.trailingSpace,
         trailingSpaceNewLine: s.trailingSpaceNewLine,
         md_inside: s.md_inside
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index e217374e45..0bf6b5fda3 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -85,13 +85,6 @@
      "    [comment foo]",
      "bar");
 
-  // Code blocks using 4 spaces with internal indentation
-  MT("codeBlocksUsing4SpacesIndentation",
-     " foo",
-     "    [comment bar]",
-     "        [comment hello]",
-     "    [comment world]");
-
   // Code blocks should end even after extra indented lines
   MT("codeBlocksWithTrailingIndentedLine",
      "    [comment foo]",
@@ -104,6 +97,12 @@
   MT("codeBlocksUsing1Tab",
      "\t[comment foo]");
 
+  // No code blocks directly after paragraph
+  // http://spec.commonmark.org/0.19/#example-65
+  MT("noCodeBlocksAfterParagraph",
+     "Foo",
+     "    Bar");
+
   // Inline code using backticks
   MT("inlineCodeUsingBackticks",
      "foo [comment `bar`]");
@@ -166,10 +165,13 @@
   MT("atxH6",
      "[header&header-6 ###### foo]");
 
-  // H6 - 7x '#' should still be H6, per Dingus
-  // http://daringfireball.net/projects/markdown/dingus
-  MT("atxH6NotH7",
-     "[header&header-6 ####### foo]");
+  // http://spec.commonmark.org/0.19/#example-24
+  MT("noAtxH7",
+     "####### foo");
+
+  // http://spec.commonmark.org/0.19/#example-25
+  MT("noAtxH1WithoutSpace",
+     "#5 bolt");
 
   // Inline styles should be parsed inside headers
   MT("atxH1inline",
@@ -202,6 +204,25 @@
      "foo",
      "[header&header-2 ---]");
 
+  // http://spec.commonmark.org/0.19/#example-45
+  MT("setextH2AllowSpaces",
+     "foo",
+     "   [header&header-2 ----      ]");
+
+  // http://spec.commonmark.org/0.19/#example-44
+  MT("noSetextAfterIndentedCodeBlock",
+     "     [comment foo]",
+     "[hr ---]");
+
+  // http://spec.commonmark.org/0.19/#example-51
+  MT("noSetextAfterQuote",
+     "[quote&quote-1 > foo]",
+     "[hr ---]");
+
+  MT("noSetextAfterList",
+     "[variable-2 - foo]",
+     "[hr ---]");
+
   // Single-line blockquote with trailing space
   MT("blockquoteSpace",
      "[quote&quote-1 > foo]");
@@ -297,6 +318,11 @@
      "[header&header-1 # foo]",
      "[variable-2 - bar]");
 
+  // hr after list
+  MT("hrAfterList",
+     "[variable-2 - foo]",
+     "[hr -----]");
+
   // Formatting in lists (*)
   MT("listAsteriskFormatting",
      "[variable-2 * ][variable-2&em *foo*][variable-2  bar]",

From aa8c3682c19cd6e308e3e68304aea3f2cb57f0d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 27 May 2015 12:23:58 +0200
Subject: [PATCH 2152/4742] Add some semi-legal gibberish to CONTRIBUTING.md

---
 CONTRIBUTING.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c4296ce4d2..1645548239 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -63,6 +63,17 @@ should be asked on the
 - Submit a pull request
 ([how to create a pull request](https://help.github.com/articles/fork-a-repo))
 
+By contributing code to CodeMirror you
+
+ - agree to license the contributed code under CodeMirror's [MIT
+   license](http://codemirror.net/LICENSE).
+
+ - confirm that you have the right to contribute and license the code
+   in question. (Either you hold all rights on the code, or the rights
+   holder has explicitly granted the right to use it like this,
+   through a compatible open source license or through a direct
+   agreement with you.)
+
 ### Coding standards
 
 - 2 spaces per indentation level, no tabs.

From 6fa7e27751a2423b46420bae7a48aba97f3d9388 Mon Sep 17 00:00:00 2001
From: Marcel Gerber <mg.hain@gmx.de>
Date: Wed, 27 May 2015 12:31:27 +0200
Subject: [PATCH 2153/4742] [continuelist addon] Update continuelist addon to
 also support ) as a ordered list bullet

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

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 86de49c538..df5179fe47 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -11,8 +11,8 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)\.)(\s*)/,
-      emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)\.)(\s*)$/,
+  var listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)([.)]))(\s*)/,
+      emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)[.)])(\s*)$/,
       unorderedListRE = /[*+-]\s/;
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
@@ -37,10 +37,10 @@
         });
         replacements[i] = "\n";
       } else {
-        var indent = match[1], after = match[4];
+        var indent = match[1], after = match[5];
         var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0
           ? match[2]
-          : (parseInt(match[3], 10) + 1) + ".";
+          : (parseInt(match[3], 10) + 1) + match[4];
 
         replacements[i] = "\n" + indent + bullet + after;
       }

From 6482803c1dfb8d6ee2044d0b3c7c884246c01650 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Wed, 27 May 2015 12:07:37 -0700
Subject: [PATCH 2154/4742] [python mode] Add async and await keyword to
 python3

Since May 5th. `async` and `await` are Python3 keywords.
cf https://www.python.org/dev/peps/pep-0492/

The new version of Python is still in beta, but start to get some use.
And getting the correct highlighting out will help people not use
`async` and `await` as variable name.
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index cdb58bbbb1..e5a09719bd 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -37,7 +37,7 @@
                         "unichr", "unicode", "xrange", "False", "True", "None"],
              keywords: ["exec", "print"]};
   var py3 = {builtins: ["ascii", "bytes", "exec", "print"],
-             keywords: ["nonlocal", "False", "True", "None"]};
+             keywords: ["nonlocal", "False", "True", "None", "async", "await"]};
 
   CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
 

From f0b870d203b0aaaa9fe9bb8984bcc2b84a5b1466 Mon Sep 17 00:00:00 2001
From: Brad Metcalf <brad@localabstract.com>
Date: Sat, 30 May 2015 15:09:09 -0500
Subject: [PATCH 2155/4742] [real-world uses] Fix JSFiddle link

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 172bb7ecad..65128ad1b2 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -98,7 +98,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://jsbin.com">jsbin.com</a> (JS playground)</li>
       <li><a href="http://tool.jser.com/preprocessor">JSER preprocessor</a></li>
       <li><a href="https://github.com/kucherenko/jscpd">jscpd</a> (code duplication detector)</li>
-      <li><a href="http://jsfiddle.com">jsfiddle.com</a> (another JS playground)</li>
+      <li><a href="http://jsfiddle.net">JSFiddle</a> (another JS playground)</li>
       <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>
       <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>

From 5b69b032873ef00c1a50c209e45b218797eb00d2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 1 Jun 2015 11:01:27 +0200
Subject: [PATCH 2156/4742] [clike mode] Also fire electric indent on line
 containing only {}

Closes #3295
---
 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 c5469eb27d..4e06ee1100 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -203,7 +203,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         (!closing && switchBlock && !/^(?:case|default)\b/.test(textAfter) ? indentUnit : 0);
     },
 
-    electricInput: indentSwitch ? /^\s*(?:case .*?:|default:|\{|\})$/ : /^\s*[{}]$/,
+    electricInput: indentSwitch ? /^\s*(?:case .*?:|default:|\{\}?|\})$/ : /^\s*[{}]$/,
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
     lineComment: "//",

From 32c258f6fada2ad42654057d460976f4973129c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Jun 2015 10:15:39 +0200
Subject: [PATCH 2157/4742] Add note about working around requirejs limitations
 to manual

Issue #3234
---
 doc/manual.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 424796f96f..d086b75362 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -181,7 +181,20 @@ <h3 id=modloader>Module loaders</h3>
 });</pre>
 
     <p>It will automatically load the modes that the mixed HTML mode
-    depends on (XML, JavaScript, and CSS).</p>
+    depends on (XML, JavaScript, and CSS). Do <em>not</em> use
+    RequireJS' <code>paths</code> option to configure the path to
+    CodeMirror, since it will break loading submodules through
+    relative paths. Use
+    the <a href="http://requirejs.org/docs/api.html#packages"><code>packages</code></a>
+    configuration option instead, as in:</p>
+
+    <pre data-lang=javascript>require.config({
+  packages: [{
+    name: "codemirror",
+    location: "../path/to/codemirror",
+    main: "lib/codemirror"
+  }]
+});</pre>
 
 </section>
 

From 23a03a9b796041b3e2d7028007d835698e63c51c Mon Sep 17 00:00:00 2001
From: Anthony Dugois <dev.anthonydugois@gmail.com>
Date: Tue, 2 Jun 2015 23:23:28 +0200
Subject: [PATCH 2158/4742] [twig mode] Add

---
 mode/twig/index.html |  45 +++++++++++++++
 mode/twig/twig.js    | 130 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)
 create mode 100644 mode/twig/index.html
 create mode 100644 mode/twig/twig.js

diff --git a/mode/twig/index.html b/mode/twig/index.html
new file mode 100644
index 0000000000..02493a5cb8
--- /dev/null
+++ b/mode/twig/index.html
@@ -0,0 +1,45 @@
+<!doctype html>
+
+<title>CodeMirror: Twig 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="twig.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="#">Twig</a>
+  </ul>
+</div>
+
+<article>
+<h2>Twig mode</h2>
+<form><textarea id="code" name="code">
+{% extends "layout.twig" %}
+{% block title %}CodeMirror: Twig mode{% endblock %}
+{# this is a comment #}
+{% block content %}
+  {% for foo in bar if foo.baz is divisible by(3) %}
+    Hello {{ foo.world }}
+  {% else %}
+    {% set msg = "Result not found" %}
+    {% include "empty.twig" with { message: msg } %}
+  {% endfor %}
+{% endblock %}
+</textarea></form>
+    <script>
+      var editor =
+      CodeMirror.fromTextArea(document.getElementById("code"), {mode:
+        {name: "twig", htmlMode: true}});
+    </script>
+  </article>
diff --git a/mode/twig/twig.js b/mode/twig/twig.js
new file mode 100644
index 0000000000..efb77c33cd
--- /dev/null
+++ b/mode/twig/twig.js
@@ -0,0 +1,130 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("twig", function() {
+    var keywords = ["and", "as", "autoescape", "endautoescape", "block", "do", "endblock", "else", "elseif", "extends", "for", "endfor", "embed", "endembed", "filter", "endfilter", "flush", "from", "if", "endif", "in", "is", "include", "import", "not", "or", "set", "spaceless", "endspaceless", "with", "endwith", "trans", "endtrans", "blocktrans", "endblocktrans", "macro", "endmacro", "use", "verbatim", "endverbatim"],
+        operator = /^[+\-*&%=<>!?|~^]/,
+        sign = /^[:\[\(\{]/,
+        atom = ["true", "false", "null", "empty", "defined", "divisibleby", "divisible by", "even", "odd", "iterable", "sameas", "same as"],
+        number = /^(\d[+\-\*\/])?\d+(\.\d+)?/;
+
+    keywords = new RegExp("((" + keywords.join(")|(") + "))\\b");
+    atom = new RegExp("((" + atom.join(")|(") + "))\\b");
+
+    function tokenBase (stream, state) {
+      var ch = stream.peek();
+
+      //Comment
+      if (state.incomment) {
+        if (!stream.skipTo("#}")) {
+          stream.skipToEnd();
+        } else {
+          stream.eatWhile(/\#|}/);
+          state.incomment = false;
+        }
+        return "comment";
+      //Tag
+      } else if (state.intag) {
+        //After operator
+        if (state.operator) {
+          state.operator = false;
+          if (stream.match(atom)) {
+            return "atom";
+          }
+          if (stream.match(number)) {
+            return "number";
+          }
+        }
+        //After sign
+        if (state.sign) {
+          state.sign = false;
+          if (stream.match(atom)) {
+            return "atom";
+          }
+          if (stream.match(number)) {
+            return "number";
+          }
+        }
+
+        if (state.instring) {
+          if (ch == state.instring) {
+            state.instring = false;
+          }
+          stream.next();
+          return "string";
+        } else if (ch == "'" || ch == '"') {
+          state.instring = ch;
+          stream.next();
+          return "string";
+        } else if (stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
+          state.intag = false;
+          return "tag";
+        } else if (stream.match(operator)) {
+          state.operator = true;
+          return "operator";
+        } else if (stream.match(sign)) {
+          state.sign = true;
+        } else {
+          if (stream.eat(" ") || stream.sol()) {
+            if (stream.match(keywords)) {
+              return "keyword";
+            }
+            if (stream.match(atom)) {
+              return "atom";
+            }
+            if (stream.match(number)) {
+              return "number";
+            }
+            if (stream.sol()) {
+              stream.next();
+            }
+          } else {
+            stream.next();
+          }
+
+        }
+        return "variable";
+      } else if (stream.eat("{")) {
+        if (ch = stream.eat("#")) {
+          state.incomment = true;
+          if (!stream.skipTo("#}")) {
+            stream.skipToEnd();
+          } else {
+            stream.eatWhile(/\#|}/);
+            state.incomment = false;
+          }
+          return "comment";
+        //Open tag
+        } else if (ch = stream.eat(/\{|%/)) {
+          //Cache close tag
+          state.intag = ch;
+          if (ch == "{") {
+            state.intag = "}";
+          }
+          stream.eat("-");
+          return "tag";
+        }
+      }
+      stream.next();
+    };
+
+    return {
+      startState: function () {
+        return {};
+      },
+      token: function (stream, state) {
+        return tokenBase(stream, state);
+      }
+    };
+  });
+});

From 00d968d6cbf358a11df7c74dadaa11f726989cda Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Jun 2015 10:19:06 +0200
Subject: [PATCH 2159/4742] [twig mode] Integrate

---
 doc/compress.html | 1 +
 mode/index.html   | 1 +
 mode/meta.js      | 1 +
 mode/twig/twig.js | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/doc/compress.html b/doc/compress.html
index 9c8c3c0c70..6e0e9efd82 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -198,6 +198,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/ttcn/ttcn.js">ttcn.js</option>
           <option value="http://codemirror.net/mode/ttcn-cfg/ttcn-cfg.js">ttcn-cfg.js</option>
           <option value="http://codemirror.net/mode/turtle/turtle.js">turtle.js</option>
+          <option value="http://codemirror.net/mode/twig/twig.js">twig.js</option>
           <option value="http://codemirror.net/mode/vb/vb.js">vb.js</option>
           <option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
           <option value="http://codemirror.net/mode/velocity/velocity.js">velocity.js</option>
diff --git a/mode/index.html b/mode/index.html
index 534b88bc88..af3eb1851a 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -128,6 +128,7 @@ <h2>Language modes</h2>
       <li><a href="ttcn/index.html">TTCN</a></li>
       <li><a href="ttcn-cfg/index.html">TTCN Configuration</a></li>
       <li><a href="turtle/index.html">Turtle</a></li>
+      <li><a href="twig/index.html">Twig</a></li>
       <li><a href="vb/index.html">VB.NET</a></li>
       <li><a href="vbscript/index.html">VBScript</a></li>
       <li><a href="velocity/index.html">Velocity</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 3f127c99a2..9f29897d62 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -129,6 +129,7 @@
     {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
     {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
+    {name: "Twig", mime: "text/x-twig", mode: "twig"},
     {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
     {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
     {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
diff --git a/mode/twig/twig.js b/mode/twig/twig.js
index efb77c33cd..aa676dc480 100644
--- a/mode/twig/twig.js
+++ b/mode/twig/twig.js
@@ -127,4 +127,6 @@
       }
     };
   });
+
+  CodeMirror.defineMIME("text/x-twig", "twig");
 });

From bb5178787695525627a608953f2bfb977f6ff8ba Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Tue, 2 Jun 2015 22:48:16 -0400
Subject: [PATCH 2160/4742] [markdown] Don't adjust indentation for blockquotes
 (closes #3287)

---
 mode/markdown/markdown.js | 1 -
 mode/markdown/test.js     | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 5cf1bf59c7..f2cea40d3b 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -161,7 +161,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = state.inline;
       return getType(state);
     } else if (stream.eat('>')) {
-      state.indentation++;
       state.quote = sol ? 1 : state.quote + 1;
       if (modeCfg.highlightFormatting) state.formatting = "quote";
       stream.eatSpace();
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 0bf6b5fda3..6f3cc8b1ac 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -272,6 +272,13 @@
      "",
      "hello");
 
+  // Header with leading space after continued blockquote (#3287, negative indentation)
+  MT("headerAfterContinuedBlockquote",
+     "[quote&quote-1 > foo]",
+     "[quote&quote-1 bar]",
+     "",
+     " [header&header-1 # hello]");
+
   // Check list types
 
   MT("listAsterisk",

From 90bc10bf216d82f08438f60cf315ce83f9b73c5f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Jun 2015 10:03:52 +0200
Subject: [PATCH 2161/4742] [elm mode] Add

Original code by Evan Czaplicki
---
 doc/compress.html   |   1 +
 mode/elm/elm.js     | 205 ++++++++++++++++++++++++++++++++++++++++++++
 mode/elm/index.html |  61 +++++++++++++
 mode/index.html     |   1 +
 mode/meta.js        |   1 +
 5 files changed, 269 insertions(+)
 create mode 100644 mode/elm/elm.js
 create mode 100644 mode/elm/index.html

diff --git a/doc/compress.html b/doc/compress.html
index 6e0e9efd82..c5d0bf6cab 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -127,6 +127,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/ebnf/ebnf.js">ebnf.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
           <option value="http://codemirror.net/mode/eiffel/eiffel.js">eiffel.js</option>
+          <option value="http://codemirror.net/mode/elm/elm.js">eml.js</option>
           <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
           <option value="http://codemirror.net/mode/forth/forth.js">forth.js</option>
           <option value="http://codemirror.net/mode/fortran/fortran.js">fortran.js</option>
diff --git a/mode/elm/elm.js b/mode/elm/elm.js
new file mode 100644
index 0000000000..7124c50acf
--- /dev/null
+++ b/mode/elm/elm.js
@@ -0,0 +1,205 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("elm", function() {
+
+    function switchState(source, setState, f) {
+      setState(f);
+      return f(source, setState);
+    }
+
+    // These should all be Unicode extended, as per the Haskell 2010 report
+    var smallRE = /[a-z_]/;
+    var largeRE = /[A-Z]/;
+    var digitRE = /[0-9]/;
+    var hexitRE = /[0-9A-Fa-f]/;
+    var octitRE = /[0-7]/;
+    var idRE = /[a-z_A-Z0-9\']/;
+    var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:\u03BB\u2192]/;
+    var specialRE = /[(),;[\]`{}]/;
+    var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer
+
+    function normal() {
+      return function (source, setState) {
+        if (source.eatWhile(whiteCharRE)) {
+          return null;
+        }
+
+        var ch = source.next();
+        if (specialRE.test(ch)) {
+          if (ch == '{' && source.eat('-')) {
+            var t = "comment";
+            if (source.eat('#')) t = "meta";
+            return switchState(source, setState, ncomment(t, 1));
+          }
+          return null;
+        }
+
+        if (ch == '\'') {
+          if (source.eat('\\'))
+            source.next();  // should handle other escapes here
+          else
+            source.next();
+
+          if (source.eat('\''))
+            return "string";
+          return "error";
+        }
+
+        if (ch == '"') {
+          return switchState(source, setState, stringLiteral);
+        }
+
+        if (largeRE.test(ch)) {
+          source.eatWhile(idRE);
+          if (source.eat('.'))
+            return "qualifier";
+          return "variable-2";
+        }
+
+        if (smallRE.test(ch)) {
+          var isDef = source.pos === 1;
+          source.eatWhile(idRE);
+          return isDef ? "variable-3" : "variable";
+        }
+
+        if (digitRE.test(ch)) {
+          if (ch == '0') {
+            if (source.eat(/[xX]/)) {
+              source.eatWhile(hexitRE); // should require at least 1
+              return "integer";
+            }
+            if (source.eat(/[oO]/)) {
+              source.eatWhile(octitRE); // should require at least 1
+              return "number";
+            }
+          }
+          source.eatWhile(digitRE);
+          var t = "number";
+          if (source.eat('.')) {
+            t = "number";
+            source.eatWhile(digitRE); // should require at least 1
+          }
+          if (source.eat(/[eE]/)) {
+            t = "number";
+            source.eat(/[-+]/);
+            source.eatWhile(digitRE); // should require at least 1
+          }
+          return t;
+        }
+
+        if (symbolRE.test(ch)) {
+          if (ch == '-' && source.eat(/-/)) {
+            source.eatWhile(/-/);
+            if (!source.eat(symbolRE)) {
+              source.skipToEnd();
+              return "comment";
+            }
+          }
+          source.eatWhile(symbolRE);
+          return "builtin";
+        }
+
+        return "error";
+      }
+    }
+
+    function ncomment(type, nest) {
+      if (nest == 0) {
+        return normal();
+      }
+      return function(source, setState) {
+        var currNest = nest;
+        while (!source.eol()) {
+          var ch = source.next();
+          if (ch == '{' && source.eat('-')) {
+            ++currNest;
+          } else if (ch == '-' && source.eat('}')) {
+            --currNest;
+            if (currNest == 0) {
+              setState(normal());
+              return type;
+            }
+          }
+        }
+        setState(ncomment(type, currNest));
+        return type;
+      }
+    }
+
+    function stringLiteral(source, setState) {
+      while (!source.eol()) {
+        var ch = source.next();
+        if (ch == '"') {
+          setState(normal());
+          return "string";
+        }
+        if (ch == '\\') {
+          if (source.eol() || source.eat(whiteCharRE)) {
+            setState(stringGap);
+            return "string";
+          }
+          if (!source.eat('&')) source.next(); // should handle other escapes here
+        }
+      }
+      setState(normal());
+      return "error";
+    }
+
+    function stringGap(source, setState) {
+      if (source.eat('\\')) {
+        return switchState(source, setState, stringLiteral);
+      }
+      source.next();
+      setState(normal());
+      return "error";
+    }
+
+
+    var wellKnownWords = (function() {
+      var wkw = {};
+
+      var keywords = [
+        "case", "of", "as",
+        "if", "then", "else",
+        "let", "in",
+        "infix", "infixl", "infixr",
+        "type", "alias",
+        "input", "output", "foreign", "loopback",
+        "module", "where", "import", "exposing",
+        "_", "..", "|", ":", "=", "\\", "\"", "->", "<-"
+      ];
+
+      for (var i = keywords.length; i--;)
+        wkw[keywords[i]] = "keyword";
+
+      return wkw;
+    })();
+
+
+
+    return {
+      startState: function ()  { return { f: normal() }; },
+      copyState:  function (s) { return { f: s.f }; },
+
+      token: function(stream, state) {
+        var t = state.f(stream, function(s) { state.f = s; });
+        var w = stream.current();
+        return (wellKnownWords.hasOwnProperty(w)) ? wellKnownWords[w] : t;
+      }
+    };
+
+  });
+
+  CodeMirror.defineMIME("text/x-elm", "elm");
+})();
diff --git a/mode/elm/index.html b/mode/elm/index.html
new file mode 100644
index 0000000000..d5cb16abfb
--- /dev/null
+++ b/mode/elm/index.html
@@ -0,0 +1,61 @@
+<!doctype html>
+
+<title>CodeMirror: Elm 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="elm.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="#">Elm</a>
+  </ul>
+</div>
+
+<article>
+<h2>Elm mode</h2>
+
+<div><textarea id="code" name="code">
+import Color exposing (..)
+import Graphics.Collage exposing (..)
+import Graphics.Element exposing (..)
+import Time exposing (..)
+
+main =
+  Signal.map clock (every second)
+
+clock t =
+  collage 400 400
+    [ filled    lightGrey   (ngon 12 110)
+    , outlined (solid grey) (ngon 12 110)
+    , hand orange   100  t
+    , hand charcoal 100 (t/60)
+    , hand charcoal 60  (t/720)
+    ]
+
+hand clr len time =
+  let angle = degrees (90 - 6 * inSeconds time)
+  in
+      segment (0,0) (fromPolar (len,angle))
+        |> traced (solid clr)
+</textarea></div>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "text/x-elm"
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-elm</code>.</p>
+  </article>
diff --git a/mode/index.html b/mode/index.html
index af3eb1851a..e39561fb74 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -52,6 +52,7 @@ <h2>Language modes</h2>
       <li><a href="ebnf/index.html">EBNF</a></li>
       <li><a href="ecl/index.html">ECL</a></li>
       <li><a href="eiffel/index.html">Eiffel</a></li>
+      <li><a href="elm/index.html">Elm</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
       <li><a href="forth/index.html">Forth</a></li>
       <li><a href="fortran/index.html">Fortran</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 9f29897d62..00e32d8660 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -38,6 +38,7 @@
     {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
     {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
     {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
+    {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
     {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},

From 63155b78023911fbec3c0abdd94dc5968effbc0a Mon Sep 17 00:00:00 2001
From: Dimage Sapelkin <kerabromsmu@users.noreply.github.com>
Date: Wed, 3 Jun 2015 18:38:13 +0300
Subject: [PATCH 2162/4742] [factor mode] Add

---
 doc/compress.html      |  1 +
 mode/factor/factor.js  | 83 ++++++++++++++++++++++++++++++++++++++++++
 mode/factor/index.html | 77 +++++++++++++++++++++++++++++++++++++++
 mode/index.html        |  1 +
 mode/meta.js           |  1 +
 5 files changed, 163 insertions(+)
 create mode 100644 mode/factor/factor.js
 create mode 100644 mode/factor/index.html

diff --git a/doc/compress.html b/doc/compress.html
index c5d0bf6cab..39a0c2a227 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -129,6 +129,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/eiffel/eiffel.js">eiffel.js</option>
           <option value="http://codemirror.net/mode/elm/elm.js">eml.js</option>
           <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
+          <option value="http://codemirror.net/mode/factor/factor.js">factor.js</option>
           <option value="http://codemirror.net/mode/forth/forth.js">forth.js</option>
           <option value="http://codemirror.net/mode/fortran/fortran.js">fortran.js</option>
           <option value="http://codemirror.net/mode/gfm/gfm.js">gfm.js</option>
diff --git a/mode/factor/factor.js b/mode/factor/factor.js
new file mode 100644
index 0000000000..86d7adf627
--- /dev/null
+++ b/mode/factor/factor.js
@@ -0,0 +1,83 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Factor syntax highlight - simple mode
+//
+// by Dimage Sapelkin (https://github.com/kerabromsmu)
+
+(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("factor", {
+    // The start state contains the rules that are intially used
+    start: [
+      // comments
+      {regex: /#?!.*/, token: "comment"},
+      // strings """, multiline --> state
+      {regex: /"""/, token: "string", next: "string3"},
+      {regex: /"/, token: "string", next: "string"},
+      // numbers: dec, hex, unicode, bin, fractional, complex
+      {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
+      //{regex: /[+-]?/} //fractional
+      // definition: defining word, defined word, etc
+      {regex: /(\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "keyword"], next: "stack"},
+      // vocabulary using --> state
+      {regex: /USING\:/, token: "keyword", next: "vocabulary"},
+      // vocabulary definition/use
+      {regex: /(USE\:|IN\:)(\s+)(\S+)/, token: ["keyword", null, "variable-2"]},
+      // <constructors>
+      {regex: /<\S+>/, token: "builtin"},
+      // "keywords", incl. ; t f . [ ] { } defining words
+      {regex: /;|t|f|if|\.|\[|\]|\{|\}|MAIN:/, token: "keyword"},
+      // any id (?)
+      {regex: /\S+/, token: "variable"},
+
+      {
+        regex: /./,
+        token: null
+      }
+    ],
+    vocabulary: [
+      {regex: /;/, token: "keyword", next: "start"},
+      {regex: /\S+/, token: "variable-2"},
+      {
+        regex: /./,
+        token: null
+      }
+    ],
+    string: [
+      {regex: /(?:[^\\]|\\.)*?"/, token: "string", next: "start"},
+      {regex: /.*/, token: "string"}
+    ],
+    string3: [
+      {regex: /(?:[^\\]|\\.)*?"""/, token: "string", next: "start"},
+      {regex: /.*/, token: "string"}
+    ],
+    stack: [
+      {regex: /\)/, token: "meta", next: "start"},
+      {regex: /--/, token: "meta"},
+      {regex: /\S+/, token: "variable-3"},
+      {
+        regex: /./,
+        token: null
+      }
+    ],
+    // The meta property contains global information about the mode. It
+    // can contain properties like lineComment, which are supported by
+    // all modes, and also directives like dontIndentStates, which are
+    // specific to simple modes.
+    meta: {
+      dontIndentStates: ["start", "vocabulary", "string", "string3", "stack"],
+      lineComment: [ "!", "#!" ]
+    }
+  });
+
+  CodeMirror.defineMIME("text/x-factor", "factor");
+});
diff --git a/mode/factor/index.html b/mode/factor/index.html
new file mode 100644
index 0000000000..9f15489140
--- /dev/null
+++ b/mode/factor/index.html
@@ -0,0 +1,77 @@
+<!doctype html>
+
+<title>CodeMirror: Factor mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'>
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/mode/simple.js"></script>
+<script src="factor.js"></script>
+<style>
+.CodeMirror {
+    font-family: 'Droid Sans Mono', monospace;
+    font-size: 14px;
+}
+</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="#">Factor</a>
+  </ul>
+</div>
+
+<article>
+
+<h2>Factor mode</h2>
+
+<form><textarea id="code" name="code">
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+
+! A simple time server
+
+USING: accessors calendar calendar.format io io.encodings.ascii
+io.servers kernel threads ;
+IN: time-server
+
+: handle-time-client ( -- )
+    now timestamp>rfc822 print ;
+
+: <time-server> ( -- threaded-server )
+    ascii <threaded-server>
+        "time-server" >>name
+        1234 >>insecure
+        [ handle-time-client ] >>handler ;
+
+: start-time-server ( -- )
+    <time-server> start-server drop ;
+
+MAIN: start-time-server
+</textarea>
+  </form>
+
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    lineWrapping: true,
+    indentUnit: 2,
+    tabSize: 2,
+    autofocus: true,
+    mode: "text/x-factor"
+  });
+</script>
+<p/>
+<p>Simple mode that handles Factor Syntax (<a href="http://en.wikipedia.org/wiki/Factor_(programming_language)">Factor on WikiPedia</a>).</p>
+
+<p><strong>MIME types defined:</strong> <code>text/x-factor</code>.</p>
+
+</article>
diff --git a/mode/index.html b/mode/index.html
index e39561fb74..81b9b3b44c 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -54,6 +54,7 @@ <h2>Language modes</h2>
       <li><a href="eiffel/index.html">Eiffel</a></li>
       <li><a href="elm/index.html">Elm</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
+      <li><a href="factor/index.html">Factor</a></li>
       <li><a href="forth/index.html">Forth</a></li>
       <li><a href="fortran/index.html">Fortran</a></li>
       <li><a href="mllike/index.html">F#</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 00e32d8660..b2f30c24db 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -42,6 +42,7 @@
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
     {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+    {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
     {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
     {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
     {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},

From 476779e4c519164f184d2d7544da6e51d29feb73 Mon Sep 17 00:00:00 2001
From: Kevin Ushey <kevinushey@gmail.com>
Date: Sun, 7 Jun 2015 03:26:31 -0700
Subject: [PATCH 2163/4742] [vim] ensure newly mapped commands take precedence

- Use 'unshift' instead of 'push' to ensure newly mapped commands come first (and hence take precedence over previously mapped commands)
---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fb0331862c..53003f6e35 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4726,7 +4726,7 @@
     }
 
     function _mapCommand(command) {
-      defaultKeymap.push(command);
+      defaultKeymap.unshift(command);
     }
 
     function mapCommand(keys, type, name, args, extra) {

From 7367b4db1ebb7a9b65d820b9c0ee953767ee8b8b Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sun, 7 Jun 2015 12:44:40 -0400
Subject: [PATCH 2164/4742] [vim] Expose defineRegister API

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 53003f6e35..d50cc4af45 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -851,6 +851,8 @@
       mapCommand: mapCommand,
       _mapCommand: _mapCommand,
 
+      defineRegister: defineRegister,
+
       exitVisualMode: exitVisualMode,
       exitInsertMode: exitInsertMode
     };
@@ -940,6 +942,25 @@
       }
     };
 
+    /**
+     * Defines an external register.
+     *
+     * The name should be a single character that will be used to reference the register.
+     * The register should support setText, pushText, clear, and toString(). See Register
+     * for a reference implementation.
+     */
+    function defineRegister(name, register) {
+      var registers = vimGlobalState.registerController.registers[name];
+      if (!name || name.length != 1) {
+        throw Error('Register name must be 1 character');
+      }
+      if (registers[name]) {
+        throw Error('Register already defined ' + name);
+      }
+      registers[name] = register;
+      validRegisters.push(name);
+    }
+
     /*
      * vim registers allow you to keep many independent copy and paste buffers.
      * See http://usevim.com/2012/04/13/registers/ for an introduction.
@@ -4815,7 +4836,7 @@
       if (macroModeState.isPlaying) { return; }
       var registerName = macroModeState.latestRegister;
       var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register) {
+      if (register && register.pushInsertModeChanges) {
         register.pushInsertModeChanges(macroModeState.lastInsertModeChanges);
       }
     }
@@ -4824,7 +4845,7 @@
       if (macroModeState.isPlaying) { return; }
       var registerName = macroModeState.latestRegister;
       var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register) {
+      if (register && register.pushSearchQuery) {
         register.pushSearchQuery(query);
       }
     }

From 7e701b7f3a509158ac1d9d3b12cbffdd35155ada Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jun 2015 10:45:49 +0200
Subject: [PATCH 2165/4742] [javascript mode] Properly parse parameter default
 values

Closes #3307
---
 mode/javascript/javascript.js | 7 +++++--
 mode/javascript/test.js       | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index ef0184789a..c86f49e1f6 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -482,8 +482,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybetype(type) {
     if (isTS && type == ":") return cont(typedef);
   }
+  function maybedefault(_, value) {
+    if (value == "=") return cont(expressionNoComma);
+  }
   function typedef(type) {
-    if (type == "variable"){cx.marked = "variable-3"; return cont();}
+    if (type == "variable") {cx.marked = "variable-3"; return cont();}
   }
   function vardef() {
     return pass(pattern, maybetype, maybeAssign, vardefCont);
@@ -538,7 +541,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function funarg(type) {
     if (type == "spread") return cont(funarg);
-    return pass(pattern, maybetype);
+    return pass(pattern, maybetype, maybedefault);
   }
   function className(type, value) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 91b0e89a06..092d25dc9a 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -160,6 +160,11 @@
      "]];",
      "[number 10];");
 
+  MT("param_default",
+     "[keyword function] [variable foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
+     "  [keyword return] [variable-2 x];",
+     "}");
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 2608793b786c4b264e9c79c27783973f13689b83 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jun 2015 10:58:20 +0200
Subject: [PATCH 2166/4742] [tern addon] Support a queryOptions option that
 allows configuring queries

Issue #3308
---
 addon/tern/tern.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 99b8a64682..eac117e81a 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -124,6 +124,8 @@
       var self = this;
       var doc = findDoc(this, cm.getDoc());
       var request = buildRequest(this, doc, query, pos);
+      var extraOptions = request.query && this.options.queryOptions && this.options.queryOptions[request.query.type]
+      if (extraOptions) for (var prop in extraOptions) request.query[prop] = extraOptions[prop];
 
       this.server.request(request, function (error, data) {
         if (!error && self.options.responseFilter)

From 451e6a7f1875f80db5316833857e6cddf9e47e4b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jun 2015 11:29:23 +0200
Subject: [PATCH 2167/4742] Use clipboardData in paste event when possible

Get rid of webkit paste bug workaround again, since recent
webkits all support the clipboard API.

Issue #3031
---
 lib/codemirror.js | 49 +++++++++++++++++------------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ca91f4beef..72d4f18ddb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1081,9 +1081,10 @@
     cm.display.shift = false;
     if (!sel) sel = doc.sel;
 
+    var paste = cm.state.pasteIncoming || origin == "paste";
     var textLines = splitLines(inserted), multiPaste = null;
     // When pasing N lines into N selections, insert one line per selection
-    if (cm.state.pasteIncoming && sel.ranges.length > 1) {
+    if (paste && sel.ranges.length > 1) {
       if (lastCopied && lastCopied.join("\n") == inserted)
         multiPaste = sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
       else if (textLines.length == sel.ranges.length)
@@ -1097,16 +1098,16 @@
       if (range.empty()) {
         if (deleted && deleted > 0) // Handle deletion
           from = Pos(from.line, from.ch - deleted);
-        else if (cm.state.overwrite && !cm.state.pasteIncoming) // Handle overwrite
+        else if (cm.state.overwrite && !paste) // Handle overwrite
           to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
       }
       var updateInput = cm.curOp.updateInput;
       var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
-                         origin: origin || (cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
+                         origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
       makeChange(cm.doc, changeEvent);
       signalLater(cm, "inputRead", cm, changeEvent);
     }
-    if (inserted && !cm.state.pasteIncoming)
+    if (inserted && !paste)
       triggerElectric(cm, inserted);
 
     ensureCursorVisible(cm);
@@ -1115,6 +1116,15 @@
     cm.state.pasteIncoming = cm.state.cutIncoming = false;
   }
 
+  function handlePaste(e, cm) {
+    var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
+    if (pasted) {
+      e.preventDefault();
+      runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
+      return true;
+    }
+  }
+
   function triggerElectric(cm, inserted) {
     // When an 'electric' character is inserted, immediately trigger a reindent
     if (!cm.options.electricChars || !cm.options.smartIndent) return;
@@ -1211,21 +1221,9 @@
         input.poll();
       });
 
-      on(te, "paste", function() {
-        // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
-        // Add a char to the end of textarea before paste occur so that
-        // selection doesn't span to the end of textarea.
-        if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
-          var start = te.selectionStart, end = te.selectionEnd;
-          te.value += "$";
-          // The selection end needs to be set before the start, otherwise there
-          // can be an intermediate non-empty selection between the two, which
-          // can override the middle-click paste buffer on linux and cause the
-          // wrong thing to get pasted.
-          te.selectionEnd = end;
-          te.selectionStart = start;
-          cm.state.fakedLastChar = true;
-        }
+      on(te, "paste", function(e) {
+        if (handlePaste(e, cm)) return true;
+
         cm.state.pasteIncoming = true;
         input.fastPoll();
       });
@@ -1394,11 +1392,6 @@
           isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
         return false;
 
-      // See paste handler for more on the fakedLastChar kludge
-      if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
-        input.value = input.value.substring(0, input.value.length - 1);
-        cm.state.fakedLastChar = false;
-      }
       var text = input.value;
       // If nothing changed, bail.
       if (text == prevInput && !cm.somethingSelected()) return false;
@@ -1544,13 +1537,7 @@
       div.contentEditable = "true";
       disableBrowserMagic(div);
 
-      on(div, "paste", function(e) {
-        var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
-        if (pasted) {
-          e.preventDefault();
-          cm.replaceSelection(pasted, null, "paste");
-        }
-      });
+      on(div, "paste", function(e) { handlePaste(e, cm); })
 
       on(div, "compositionstart", function(e) {
         var data = e.data;

From 91ac27eaf40f53f79844e2310f183d4b562d4894 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jun 2015 11:52:16 +0200
Subject: [PATCH 2168/4742] Fix constructor property of editor instances

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 72d4f18ddb..36ad982ba0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7576,7 +7576,7 @@
   Doc.prototype.eachLine = Doc.prototype.iter;
 
   // Set up methods on CodeMirror's prototype to redirect to the editor's document.
-  var dontDelegate = "iter insert remove copy getEditor".split(" ");
+  var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
   for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
     CodeMirror.prototype[prop] = (function(method) {
       return function() {return method.apply(this.doc, arguments);};

From eca62f152c508336a222e921d990a097a4923dab Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jun 2015 11:57:59 +0200
Subject: [PATCH 2169/4742] [requirejs demo] Extend to include dynamic mode
 loading

Issue #3320
---
 demo/requirejs.html | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/demo/requirejs.html b/demo/requirejs.html
index f99b77945a..438ef9fbf6 100644
--- a/demo/requirejs.html
+++ b/demo/requirejs.html
@@ -38,14 +38,32 @@ <h2>RequireJS module loading demo</h2>
 
     <div id="code"></div>
 
+    <button id="markdown">Dynamically load Markdown mode</button>
+
     <script type="text/javascript">
-      require(["../lib/codemirror", "../mode/htmlmixed/htmlmixed",
-               "../addon/hint/show-hint", "../addon/hint/html-hint"], function(CodeMirror) {
+      require.config({
+        packages: [{
+          name: "codemirror",
+          location: "../",
+          main: "lib/codemirror"
+        }]
+      });
+      require(["codemirror", "codemirror/mode/htmlmixed/htmlmixed",
+               "codemirror/addon/hint/show-hint", "codemirror/addon/hint/html-hint",
+               "codemirror/addon/mode/loadmode"], function(CodeMirror) {
         editor = CodeMirror(document.getElementById("code"), {
           mode: "text/html",
           extraKeys: {"Ctrl-Space": "autocomplete"},
           value: document.documentElement.innerHTML
         });
+
+        CodeMirror.modeURL = "codemirror/mode/%N/%N";
+        document.getElementById("markdown").addEventListener("click", function() {
+          CodeMirror.requireMode("markdown", function() {
+            editor.replaceRange("This is **Markdown**.\n\n", {line: 0, ch: 0});
+            editor.setOption("mode", "markdown");
+          });
+        });
       });
     </script>
   </article>

From 61e27f027766f8227b66881d646b20e3fa9354dc Mon Sep 17 00:00:00 2001
From: Angelo <angelo.zerr@gmail.com>
Date: Thu, 11 Jun 2015 06:16:58 +0200
Subject: [PATCH 2170/4742] [tern addon] Initialize docs before creating tern
 server instance

This PR initialize docs before creating tern server instance, because
in some case, tern server creation call getFile which use docs.

I have this case by using requirejs tern plugin + custom plugin which
defines modules :

```json
{
    "!name": "delite",
    "!define": {
      "!requirejs": {
        "delite/register": {
          "!type": "fn(tag: string, superclasses: [], props: ?) -> fn()",
      }
    }
  }
```
---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index eac117e81a..b6ecc6f09f 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -59,6 +59,7 @@
     this.options = options || {};
     var plugins = this.options.plugins || (this.options.plugins = {});
     if (!plugins.doc_comment) plugins.doc_comment = true;
+    this.docs = Object.create(null);
     if (this.options.useWorker) {
       this.server = new WorkerServer(this);
     } else {
@@ -69,7 +70,6 @@
         plugins: plugins
       });
     }
-    this.docs = Object.create(null);
     this.trackChange = function(doc, change) { trackChange(self, doc, change); };
 
     this.cachedArgHints = null;

From 7444827afb10d8308b35074127632c840dd6f67b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jun 2015 12:50:49 +0200
Subject: [PATCH 2171/4742] [contenteditable display] More robust end-node
 finding when polling content

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 36ad982ba0..aa22d58499 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1750,7 +1750,7 @@
       var toIndex = findViewIndex(cm, to.line);
       if (toIndex == display.view.length - 1) {
         var toLine = display.viewTo - 1;
-        var toNode = display.view[toIndex].node;
+        var toNode = display.lineDiv.lastChild;
       } else {
         var toLine = lineNo(display.view[toIndex + 1].line) - 1;
         var toNode = display.view[toIndex + 1].node.previousSibling;

From ee62a07311da904c1eec8d7661733dbe26ddbae2 Mon Sep 17 00:00:00 2001
From: satamas <se.atamas@gmail.com>
Date: Thu, 11 Jun 2015 16:48:44 +0300
Subject: [PATCH 2172/4742] [kotlin mode] Minor fixes

---
 mode/kotlin/kotlin.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mode/kotlin/kotlin.js b/mode/kotlin/kotlin.js
index 1efec85dff..e9a6a94e64 100644
--- a/mode/kotlin/kotlin.js
+++ b/mode/kotlin/kotlin.js
@@ -21,7 +21,7 @@ CodeMirror.defineMode("kotlin", function (config, parserConfig) {
   var multiLineStrings = parserConfig.multiLineStrings;
 
   var keywords = words(
-          "package continue return object while break class data trait throw super" +
+          "package continue return object while break class data trait interface throw super" +
           " when type this else This try val var fun for is in if do as true false null get set");
   var softKeywords = words("import" +
       " where by get set abstract enum open annotation override private public internal" +
@@ -272,7 +272,10 @@ CodeMirror.defineMode("kotlin", function (config, parserConfig) {
     },
 
     closeBrackets: {triples: "'\""},
-    electricChars: "{}"
+    electricChars: "{}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 

From 22f6cc80420db0c4ae3fbae2fc44e8f118846876 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jun 2015 16:32:22 +0200
Subject: [PATCH 2173/4742] [markdown mode] Add 'url' style to link url tokens

Issue #3321
---
 mode/markdown/markdown.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index f2cea40d3b..0408e8260e 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -273,7 +273,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (state.linkHref) {
-      styles.push(linkhref);
+      styles.push(linkhref, "url");
       return styles.length ? styles.join(' ') : null;
     }
 
@@ -637,7 +637,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
     }
     state.f = state.inline = inlineNormal;
-    return linkhref;
+    return linkhref + " url";
   }
 
   var savedInlineRE = [];

From b8e5c096f84615bb80e621b962f8a83275badb76 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 11 Jun 2015 16:53:38 +0200
Subject: [PATCH 2174/4742] [markdown mode] Adjust tests

---
 mode/markdown/test.js | 62 +++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 6f3cc8b1ac..7cd0bf4b4f 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -41,11 +41,11 @@
      "[variable-2&formatting&formatting-list&formatting-list-ol 1. ][variable-2 foo]");
 
   FT("formatting_link",
-     "[link&formatting&formatting-link [][link foo][link&formatting&formatting-link ]]][string&formatting&formatting-link-string (][string http://example.com/][string&formatting&formatting-link-string )]");
+     "[link&formatting&formatting-link [][link foo][link&formatting&formatting-link ]]][string&formatting&formatting-link-string&url (][string&url http://example.com/][string&formatting&formatting-link-string&url )]");
 
   FT("formatting_linkReference",
-     "[link&formatting&formatting-link [][link foo][link&formatting&formatting-link ]]][string&formatting&formatting-link-string [][string bar][string&formatting&formatting-link-string ]]]",
-     "[link&formatting&formatting-link [][link bar][link&formatting&formatting-link ]]:] [string http://example.com/]");
+     "[link&formatting&formatting-link [][link foo][link&formatting&formatting-link ]]][string&formatting&formatting-link-string&url [][string&url bar][string&formatting&formatting-link-string&url ]]]",
+     "[link&formatting&formatting-link [][link bar][link&formatting&formatting-link ]]:] [string&url http://example.com/]");
 
   FT("formatting_linkWeb",
      "[link&formatting&formatting-link <][link http://example.com/][link&formatting&formatting-link >]");
@@ -536,39 +536,39 @@
 
   // Inline link with title
   MT("linkTitle",
-     "[link [[foo]]][string (http://example.com/ \"bar\")] hello");
+     "[link [[foo]]][string&url (http://example.com/ \"bar\")] hello");
 
   // Inline link without title
   MT("linkNoTitle",
-     "[link [[foo]]][string (http://example.com/)] bar");
+     "[link [[foo]]][string&url (http://example.com/)] bar");
 
   // Inline link with image
   MT("linkImage",
-     "[link [[][tag ![[foo]]][string (http://example.com/)][link ]]][string (http://example.com/)] bar");
+     "[link [[][tag ![[foo]]][string&url (http://example.com/)][link ]]][string&url (http://example.com/)] bar");
 
   // Inline link with Em
   MT("linkEm",
-     "[link [[][link&em *foo*][link ]]][string (http://example.com/)] bar");
+     "[link [[][link&em *foo*][link ]]][string&url (http://example.com/)] bar");
 
   // Inline link with Strong
   MT("linkStrong",
-     "[link [[][link&strong **foo**][link ]]][string (http://example.com/)] bar");
+     "[link [[][link&strong **foo**][link ]]][string&url (http://example.com/)] bar");
 
   // Inline link with EmStrong
   MT("linkEmStrong",
-     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string (http://example.com/)] bar");
+     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url (http://example.com/)] bar");
 
   // Image with title
   MT("imageTitle",
-     "[tag ![[foo]]][string (http://example.com/ \"bar\")] hello");
+     "[tag ![[foo]]][string&url (http://example.com/ \"bar\")] hello");
 
   // Image without title
   MT("imageNoTitle",
-     "[tag ![[foo]]][string (http://example.com/)] bar");
+     "[tag ![[foo]]][string&url (http://example.com/)] bar");
 
   // Image with asterisks
   MT("imageAsterisks",
-     "[tag ![[*foo*]]][string (http://example.com/)] bar");
+     "[tag ![[*foo*]]][string&url (http://example.com/)] bar");
 
   // Not a link. Should be normal text due to square brackets being used
   // regularly in text, especially in quoted material, and no space is allowed
@@ -578,24 +578,24 @@
 
   // Reference-style links
   MT("linkReference",
-     "[link [[foo]]][string [[bar]]] hello");
+     "[link [[foo]]][string&url [[bar]]] hello");
 
   // Reference-style links with Em
   MT("linkReferenceEm",
-     "[link [[][link&em *foo*][link ]]][string [[bar]]] hello");
+     "[link [[][link&em *foo*][link ]]][string&url [[bar]]] hello");
 
   // Reference-style links with Strong
   MT("linkReferenceStrong",
-     "[link [[][link&strong **foo**][link ]]][string [[bar]]] hello");
+     "[link [[][link&strong **foo**][link ]]][string&url [[bar]]] hello");
 
   // Reference-style links with EmStrong
   MT("linkReferenceEmStrong",
-     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string [[bar]]] hello");
+     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url [[bar]]] hello");
 
   // Reference-style links with optional space separator (per docuentation)
   // "You can optionally use a space to separate the sets of brackets"
   MT("linkReferenceSpace",
-     "[link [[foo]]] [string [[bar]]] hello");
+     "[link [[foo]]] [string&url [[bar]]] hello");
 
   // Should only allow a single space ("...use *a* space...")
   MT("linkReferenceDoubleSpace",
@@ -603,7 +603,7 @@
 
   // Reference-style links with implicit link name
   MT("linkImplicit",
-     "[link [[foo]]][string [[]]] hello");
+     "[link [[foo]]][string&url [[]]] hello");
 
   // @todo It would be nice if, at some point, the document was actually
   // checked to see if the referenced link exists
@@ -611,46 +611,46 @@
   // Link label, for reference-style links (taken from documentation)
 
   MT("labelNoTitle",
-     "[link [[foo]]:] [string http://example.com/]");
+     "[link [[foo]]:] [string&url http://example.com/]");
 
   MT("labelIndented",
-     "   [link [[foo]]:] [string http://example.com/]");
+     "   [link [[foo]]:] [string&url http://example.com/]");
 
   MT("labelSpaceTitle",
-     "[link [[foo bar]]:] [string http://example.com/ \"hello\"]");
+     "[link [[foo bar]]:] [string&url http://example.com/ \"hello\"]");
 
   MT("labelDoubleTitle",
-     "[link [[foo bar]]:] [string http://example.com/ \"hello\"] \"world\"");
+     "[link [[foo bar]]:] [string&url http://example.com/ \"hello\"] \"world\"");
 
   MT("labelTitleDoubleQuotes",
-     "[link [[foo]]:] [string http://example.com/  \"bar\"]");
+     "[link [[foo]]:] [string&url http://example.com/  \"bar\"]");
 
   MT("labelTitleSingleQuotes",
-     "[link [[foo]]:] [string http://example.com/  'bar']");
+     "[link [[foo]]:] [string&url http://example.com/  'bar']");
 
   MT("labelTitleParenthese",
-     "[link [[foo]]:] [string http://example.com/  (bar)]");
+     "[link [[foo]]:] [string&url http://example.com/  (bar)]");
 
   MT("labelTitleInvalid",
-     "[link [[foo]]:] [string http://example.com/] bar");
+     "[link [[foo]]:] [string&url http://example.com/] bar");
 
   MT("labelLinkAngleBrackets",
-     "[link [[foo]]:] [string <http://example.com/>  \"bar\"]");
+     "[link [[foo]]:] [string&url <http://example.com/>  \"bar\"]");
 
   MT("labelTitleNextDoubleQuotes",
-     "[link [[foo]]:] [string http://example.com/]",
+     "[link [[foo]]:] [string&url http://example.com/]",
      "[string \"bar\"] hello");
 
   MT("labelTitleNextSingleQuotes",
-     "[link [[foo]]:] [string http://example.com/]",
+     "[link [[foo]]:] [string&url http://example.com/]",
      "[string 'bar'] hello");
 
   MT("labelTitleNextParenthese",
-     "[link [[foo]]:] [string http://example.com/]",
+     "[link [[foo]]:] [string&url http://example.com/]",
      "[string (bar)] hello");
 
   MT("labelTitleNextMixed",
-     "[link [[foo]]:] [string http://example.com/]",
+     "[link [[foo]]:] [string&url http://example.com/]",
      "(bar\" hello");
 
   MT("linkWeb",

From 5a088693cc5847ca572176a07ecfa7c8c90f8da7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 12 Jun 2015 13:45:14 +0200
Subject: [PATCH 2175/4742] Get rid of version field in bower.json again

Closes #3322
---
 bin/release | 1 -
 bower.json  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/bin/release b/bin/release
index 9b58b872d8..b782739fa8 100755
--- a/bin/release
+++ b/bin/release
@@ -24,7 +24,6 @@ function rewriteJSON(pack) {
   return pack.replace(/"version":"\d+\.\d+\.\d+"/, "\"version\":\"" + number + "\"");
 }
 rewrite("package.json", rewriteJSON);
-rewrite("bower.json", rewriteJSON);
 rewrite("doc/manual.html", function(manual) {
   return manual.replace(/>version \d+\.\d+\.\d+<\/span>/, ">version " + number + "</span>");
 });
diff --git a/bower.json b/bower.json
index 892aa72326..903d9f55f8 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,5 @@
 {
   "name": "codemirror",
-  "version":"5.3.1",
   "main": ["lib/codemirror.js", "lib/codemirror.css"],
   "ignore": [
     "**/.*",

From 2ed4c8f4ea313a96dbe51eb1418c2bdcac87eb24 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Jun 2015 11:38:28 +0200
Subject: [PATCH 2176/4742] [markdown mode] Include quote/header style for url
 tokens

Issue #3325
---
 mode/markdown/markdown.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 0408e8260e..bef37b8ab6 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -274,16 +274,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     if (state.linkHref) {
       styles.push(linkhref, "url");
-      return styles.length ? styles.join(' ') : null;
-    }
+    } else { // Only apply inline styles to non-url text
+      if (state.strong) { styles.push(strong); }
+      if (state.em) { styles.push(em); }
+      if (state.strikethrough) { styles.push(strikethrough); }
 
-    if (state.strong) { styles.push(strong); }
-    if (state.em) { styles.push(em); }
-    if (state.strikethrough) { styles.push(strikethrough); }
+      if (state.linkText) { styles.push(linktext); }
 
-    if (state.linkText) { styles.push(linktext); }
-
-    if (state.code) { styles.push(code); }
+      if (state.code) { styles.push(code); }
+    }
 
     if (state.header) { styles.push(header); styles.push(header + "-" + state.header); }
 

From 4cfcb2dfdcd5f79f16d524b4b256bc1e7a6ac316 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Jun 2015 11:39:06 +0200
Subject: [PATCH 2177/4742] [themes] Make sure quote/header styles have lower
 precedence

So that they don't end up overriding more specific styles.

Issue #3325
---
 lib/codemirror.css    | 18 +++++++++---------
 theme/ambiance.css    |  5 +++--
 theme/erlang-dark.css |  2 +-
 theme/lesser-dark.css |  4 ++--
 theme/solarized.css   |  4 ++--
 theme/ttcn.css        | 19 +++++++++----------
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index ceacd13047..b313b61c68 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -92,6 +92,15 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 
 /* DEFAULT THEME */
 
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
 .cm-s-default .cm-keyword {color: #708;}
 .cm-s-default .cm-atom {color: #219;}
 .cm-s-default .cm-number {color: #164;}
@@ -111,18 +120,9 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-s-default .cm-bracket {color: #997;}
 .cm-s-default .cm-tag {color: #170;}
 .cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
 .cm-s-default .cm-hr {color: #999;}
 .cm-s-default .cm-link {color: #00c;}
 
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
 
diff --git a/theme/ambiance.css b/theme/ambiance.css
index afcf15a37a..3ab9b25483 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -2,6 +2,9 @@
 
 /* Color scheme */
 
+.cm-s-ambiance .cm-header {color: blue;}
+.cm-s-ambiance .cm-quote { color: #24C2C7; }
+
 .cm-s-ambiance .cm-keyword { color: #cda869; }
 .cm-s-ambiance .cm-atom { color: #CF7EA9; }
 .cm-s-ambiance .cm-number { color: #78CF8A; }
@@ -20,8 +23,6 @@
 .cm-s-ambiance .cm-bracket { color: #24C2C7; }
 .cm-s-ambiance .cm-tag { color: #fee4ff }
 .cm-s-ambiance .cm-attribute {  color: #9B859D; }
-.cm-s-ambiance .cm-header {color: blue;}
-.cm-s-ambiance .cm-quote { color: #24C2C7; }
 .cm-s-ambiance .cm-hr { color: pink; }
 .cm-s-ambiance .cm-link { color: #F4C20B; }
 .cm-s-ambiance .cm-special { color: #FF9D00; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index 25c7e0a2aa..e20bf1259b 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -8,6 +8,7 @@
 .cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 
+.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
 .cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
 .cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
 .cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
@@ -20,7 +21,6 @@
 .cm-s-erlang-dark span.cm-operator   { color: #d55; }
 .cm-s-erlang-dark span.cm-property   { color: #ccc; }
 .cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
-.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
 .cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
 .cm-s-erlang-dark span.cm-string     { color: #3ad900; }
 .cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 5af8b7f627..88dff92191 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -19,6 +19,8 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
 .cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
 
+.cm-s-lesser-dark span.cm-header {color: #a0a;}
+.cm-s-lesser-dark span.cm-quote {color: #090;}
 .cm-s-lesser-dark span.cm-keyword { color: #599eff; }
 .cm-s-lesser-dark span.cm-atom { color: #C2B470; }
 .cm-s-lesser-dark span.cm-number { color: #B35E4D; }
@@ -37,8 +39,6 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
 .cm-s-lesser-dark span.cm-tag { color: #669199; }
 .cm-s-lesser-dark span.cm-attribute {color: #00c;}
-.cm-s-lesser-dark span.cm-header {color: #a0a;}
-.cm-s-lesser-dark span.cm-quote {color: #090;}
 .cm-s-lesser-dark span.cm-hr {color: #999;}
 .cm-s-lesser-dark span.cm-link {color: #00c;}
 .cm-s-lesser-dark span.cm-error { color: #9d1e15; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 9db3951579..1f1dedac10 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -47,6 +47,8 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   text-shadow: none;
 }
 
+.cm-s-solarized .cm-header { color: #586e75; }
+.cm-s-solarized .cm-quote { color: #93a1a1; }
 
 .cm-s-solarized .cm-keyword { color: #cb4b16 }
 .cm-s-solarized .cm-atom { color: #d33682; }
@@ -73,8 +75,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
 .cm-s-solarized .cm-tag { color: #93a1a1 }
 .cm-s-solarized .cm-attribute {  color: #2aa198; }
-.cm-s-solarized .cm-header { color: #586e75; }
-.cm-s-solarized .cm-quote { color: #93a1a1; }
 .cm-s-solarized .cm-hr {
   color: transparent;
   border-top: 1px solid #586e75;
diff --git a/theme/ttcn.css b/theme/ttcn.css
index 959c047968..9c2e9a61d7 100644
--- a/theme/ttcn.css
+++ b/theme/ttcn.css
@@ -1,4 +1,12 @@
-/* DEFAULT THEME */
+.cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+.cm-header {color: #00f; font-weight: bold;}
+
 .cm-atom {color: #219;}
 .cm-attribute {color: #00c;}
 .cm-bracket {color: #997;}
@@ -6,7 +14,6 @@
 .cm-def {color: #00f;}
 .cm-em {font-style: italic;}
 .cm-error {color: #f00;}
-.cm-header {color: #00f; font-weight: bold;}
 .cm-hr {color: #999;}
 .cm-invalidchar {color: #f00;}
 .cm-keyword {font-weight:bold}
@@ -15,7 +22,6 @@
 .cm-negative {color: #d44;}
 .cm-positive {color: #292;}
 .cm-qualifier {color: #555;}
-.cm-quote {color: #090;}
 .cm-strikethrough {text-decoration: line-through;}
 .cm-string {color: #006400;}
 .cm-string-2 {color: #f50;}
@@ -25,13 +31,6 @@
 .cm-variable-2 {color: #05a;}
 .cm-variable-3 {color: #085;}
 
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
 

From a08e3ec95f7569f62f2f1f052e5d0f2818205e19 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Fri, 12 Jun 2015 11:07:11 -0700
Subject: [PATCH 2178/4742] [vb mode] Add line commenting

---
 mode/vb/vb.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 665248f499..d78f91f701 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -264,8 +264,9 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
             if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
             if(state.currentIndent < 0) return 0;
             return state.currentIndent * conf.indentUnit;
-        }
+        },
 
+        lineComment: "'"
     };
     return external;
 });

From 6336adf07dc0c21d0a9939f61b48bc6d20abf091 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 16 Jun 2015 10:28:03 +0200
Subject: [PATCH 2179/4742] [clike mode] Don't tokenize ->fooo as a definition

Issue #3332
---
 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 4e06ee1100..cee853aaac 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -127,7 +127,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   function typeBefore(stream, state) {
     if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
-    if (/\S[>*\]]\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
+    if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
   }
 
   // Interface

From 1a27da75600dd19880d17bc472789c7cffc2bb0d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 16 Jun 2015 10:41:52 +0200
Subject: [PATCH 2180/4742] Allow starting a drag selection directly next to
 existing selection

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index aa22d58499..51f956506b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3556,7 +3556,8 @@
     var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
     if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
         type == "single" && (contained = sel.contains(start)) > -1 &&
-        !sel.ranges[contained].empty())
+        (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
+        (cmp(contained.to(), start) > 0 || start.xRel < 0))
       leftButtonStartDrag(cm, e, start, modifier);
     else
       leftButtonSelect(cm, e, start, type, modifier);

From 7b663503ae09381cb7d808ca41e6f56a67693d5c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 17 Jun 2015 10:31:33 +0200
Subject: [PATCH 2181/4742] [clike mode] Further improve definition
 highlighting for C++

And add a styleDefs option to turn it off.

Issue #3332
---
 mode/clike/clike.js | 64 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 15 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index cee853aaac..39545d0072 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -24,7 +24,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       hooks = parserConfig.hooks || {},
       multiLineStrings = parserConfig.multiLineStrings,
       indentStatements = parserConfig.indentStatements !== false,
-      indentSwitch = parserConfig.indentSwitch !== false;
+      indentSwitch = parserConfig.indentSwitch !== false,
+      namespaceSeparator = parserConfig.namespaceSeparator;
   var isOperatorChar = /[+\-*&%=<>!?|\/]/;
 
   var curPunc, isDefKeyword;
@@ -62,6 +63,9 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       return "operator";
     }
     stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+    if (namespaceSeparator) while (stream.match(namespaceSeparator))
+      stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) {
       if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
@@ -110,7 +114,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     this.prev = prev;
   }
   function isStatement(context) {
-    return context.type == "statement" || context.type == "switchstatement";
+    return context.type == "statement" || context.type == "switchstatement" || context.type == "namespace";
   }
   function pushContext(state, col, type) {
     var indent = state.indented;
@@ -130,6 +134,14 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
   }
 
+  function isTopScope(context) {
+    for (;;) {
+      if (!context || context.type == "top") return true;
+      if (context.type == "}" && context.prev.type != "namespace") return false;
+      context = context.prev;
+    }
+  }
+
   // Interface
 
   return {
@@ -167,22 +179,31 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
       else if (curPunc == ctx.type) popContext(state);
       else if (indentStatements &&
-               (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') ||
+               (((ctx.type == "}" || ctx.type == "top") && curPunc != ";") ||
                 (isStatement(ctx) && curPunc == "newstatement"))) {
-        var type = "statement"
+        var type = "statement";
         if (curPunc == "newstatement" && indentSwitch && stream.current() == "switch")
-          type = "switchstatement"
+          type = "switchstatement";
+        else if (style == "keyword" && stream.current() == "namespace")
+          type = "namespace";
         pushContext(state, stream.column(), type);
       }
 
       if (style == "variable" &&
           ((state.prevToken == "def" ||
             (parserConfig.typeFirstDefinitions && typeBefore(stream, state) &&
-             stream.match(/^\s*\(/, false)))))
+             isTopScope(state.context) && stream.match(/^\s*\(/, false)))))
         style = "def";
 
+      if (hooks.token) {
+        var result = hooks.token(stream, state, style);
+        if (result !== undefined) style = result;
+      }
+
+      if (style == "def" && parserConfig.styleDefs === false) style = "variable";
+
       state.startOfLine = false;
-      state.prevToken = isDefKeyword ? "def" : style;
+      state.prevToken = isDefKeyword ? "def" : style || curPunc;
       return style;
     },
 
@@ -218,7 +239,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   }
   var cKeywords = "auto if break case register continue return default do sizeof " +
     "static else struct switch extern typedef float union for " +
-    "goto while enum const volatile true false";
+    "goto while enum const volatile";
   var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
 
   function cppHook(stream, state) {
@@ -268,6 +289,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return false;
   }
 
+  function cppLooksLikeConstructor(word) {
+    var lastTwo = /(\w+)::(\w+)$/.exec(word);
+    return lastTwo && lastTwo[1] == lastTwo[2];
+  }
+
   // C#-style strings where "" escapes a quote.
   function tokenAtString(stream, state) {
     var next;
@@ -322,19 +348,19 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     blockKeywords: words("case do else for if switch while struct"),
     defKeywords: words("struct"),
     typeFirstDefinitions: true,
-    atoms: words("null"),
+    atoms: words("null true false"),
     hooks: {"#": cppHook, "*": pointerHook},
     modeProps: {fold: ["brace", "include"]}
   });
 
   def(["text/x-c++src", "text/x-c++hdr"], {
     name: "clike",
-    keywords: words(cKeywords + " asm dynamic_cast namespace reinterpret_cast try bool explicit new " +
+    keywords: words(cKeywords + " asm dynamic_cast namespace reinterpret_cast try explicit new " +
                     "static_cast typeid catch operator template typename class friend private " +
                     "this using const_cast inline public throw virtual delete mutable protected " +
-                    "wchar_t alignas alignof constexpr decltype nullptr noexcept thread_local final " +
+                    "alignas alignof constexpr decltype nullptr noexcept thread_local final " +
                     "static_assert override"),
-    types: words(cTypes + "bool wchar_t"),
+    types: words(cTypes + " bool wchar_t"),
     blockKeywords: words("catch class do else finally for if struct switch try while"),
     defKeywords: words("class namespace struct enum union"),
     typeFirstDefinitions: true,
@@ -345,8 +371,16 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "u": cpp11StringHook,
       "U": cpp11StringHook,
       "L": cpp11StringHook,
-      "R": cpp11StringHook
+      "R": cpp11StringHook,
+      token: function(stream, state, style) {
+        if (style == "variable" && stream.peek() == "(" &&
+            (state.prevToken == ";" || state.prevToken == null ||
+             state.prevToken == "}") &&
+            cppLooksLikeConstructor(stream.current()))
+          return "def";
+      }
     },
+    namespaceSeparator: "::",
     modeProps: {fold: ["brace", "include"]}
   });
 
@@ -532,7 +566,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "signal task uses abstract extends"),
     types: words(cTypes),
     blockKeywords: words("case do else for if switch while struct"),
-    atoms: words("null"),
+    atoms: words("null true false"),
     hooks: {"#": cppHook},
     modeProps: {fold: ["brace", "include"]}
   });
@@ -542,7 +576,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     keywords: words(cKeywords + "inline restrict _Bool _Complex _Imaginery BOOL Class bycopy byref id IMP in " +
                     "inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
     types: words(cTypes),
-    atoms: words("YES NO NULL NILL ON OFF"),
+    atoms: words("YES NO NULL NILL ON OFF true false"),
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$]/);

From 0bc820bf5836ff9aac41409934203c87ceabf535 Mon Sep 17 00:00:00 2001
From: Forbes Lindesay <forbes@lindesay.co.uk>
Date: Wed, 17 Jun 2015 17:18:19 +0100
Subject: [PATCH 2182/4742] [runmode addon] Update runmode.node to match core

---
 addon/runmode/runmode.node.js | 74 ++++++++++++++++++++++++++++++-----
 1 file changed, 64 insertions(+), 10 deletions(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 8b8140b4c1..1c5531742a 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -5,17 +5,38 @@
 
 // declare global: StringStream
 
-function splitLines(string){ return string.split(/\r?\n|\r/); };
+function splitLines(string){return string.split(/\r\n?|\n/);};
 
-function StringStream(string) {
+
+// Counts the column offset in a string, taking tabs into account.
+// Used mostly to find indentation.
+var countColumn = function(string, end, tabSize, startIndex, startValue) {
+  if (end == null) {
+    end = string.search(/[^\s\u00a0]/);
+    if (end == -1) end = string.length;
+  }
+  for (var i = startIndex || 0, n = startValue || 0;;) {
+    var nextTab = string.indexOf("\t", i);
+    if (nextTab < 0 || nextTab >= end)
+      return n + (end - i);
+    n += nextTab - i;
+    n += tabSize - (n % tabSize);
+    i = nextTab + 1;
+  }
+};
+
+function StringStream(string, tabSize) {
   this.pos = this.start = 0;
   this.string = string;
+  this.tabSize = tabSize || 8;
+  this.lastColumnPos = this.lastColumnValue = 0;
   this.lineStart = 0;
-}
+};
+
 StringStream.prototype = {
   eol: function() {return this.pos >= this.string.length;},
-  sol: function() {return this.pos == 0;},
-  peek: function() {return this.string.charAt(this.pos) || null;},
+  sol: function() {return this.pos == this.lineStart;},
+  peek: function() {return this.string.charAt(this.pos) || undefined;},
   next: function() {
     if (this.pos < this.string.length)
       return this.string.charAt(this.pos++);
@@ -42,8 +63,17 @@ StringStream.prototype = {
     if (found > -1) {this.pos = found; return true;}
   },
   backUp: function(n) {this.pos -= n;},
-  column: function() {return this.start - this.lineStart;},
-  indentation: function() {return 0;},
+  column: function() {
+    if (this.lastColumnPos < this.start) {
+      this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
+      this.lastColumnPos = this.start;
+    }
+    return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
+  },
+  indentation: function() {
+    return countColumn(this.string, null, this.tabSize) -
+      (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
+  },
   match: function(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
       var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
@@ -94,11 +124,35 @@ exports.resolveMode = function(spec) {
   if (typeof spec == "string") return {name: spec};
   else return spec || {name: "null"};
 };
+
+
+// This can be used to attach properties to mode objects from
+// outside the actual mode definition.
+var modeExtensions = exports.modeExtensions = {};
+exports.extendMode = function(mode, properties) {
+  var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
+  copyObj(properties, exts);
+};
+
 exports.getMode = function(options, spec) {
-  spec = exports.resolveMode(spec);
+  var spec = exports.resolveMode(spec);
   var mfactory = modes[spec.name];
-  if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, spec);
+  if (!mfactory) return exports.getMode(options, "text/plain");
+  var modeObj = mfactory(options, spec);
+  if (modeExtensions.hasOwnProperty(spec.name)) {
+    var exts = modeExtensions[spec.name];
+    for (var prop in exts) {
+      if (!exts.hasOwnProperty(prop)) continue;
+      if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
+      modeObj[prop] = exts[prop];
+    }
+  }
+  modeObj.name = spec.name;
+  if (spec.helperType) modeObj.helperType = spec.helperType;
+  if (spec.modeProps) for (var prop in spec.modeProps)
+    modeObj[prop] = spec.modeProps[prop];
+
+  return modeObj;
 };
 exports.registerHelper = exports.registerGlobalHelper = Math.min;
 

From 59d78210d6d167eaa8ede54ea8b49e2952588dd4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 18 Jun 2015 10:10:58 +0200
Subject: [PATCH 2183/4742] [runmode addon] Make linter pass

---
 addon/runmode/runmode.node.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 1c5531742a..8f345a32c7 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -3,11 +3,8 @@
 
 /* Just enough of CodeMirror to run runMode under node.js */
 
-// declare global: StringStream
-
 function splitLines(string){return string.split(/\r\n?|\n/);};
 
-
 // Counts the column offset in a string, taking tabs into account.
 // Used mostly to find indentation.
 var countColumn = function(string, end, tabSize, startIndex, startValue) {
@@ -125,6 +122,13 @@ exports.resolveMode = function(spec) {
   else return spec || {name: "null"};
 };
 
+function copyObj(obj, target, overwrite) {
+  if (!target) target = {};
+  for (var prop in obj)
+    if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
+      target[prop] = obj[prop];
+  return target;
+}
 
 // This can be used to attach properties to mode objects from
 // outside the actual mode definition.

From 01c4b0edbcdf96721cffa62c60459ba773b379e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 24 Jun 2015 14:01:07 +0200
Subject: [PATCH 2184/4742] [clike mode] Fix indentation around nested
 braceless sub-statements

Closes #3339
---
 mode/clike/clike.js | 19 ++++++++++---------
 mode/clike/test.js  |  6 ++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 39545d0072..f1a7e7a957 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -113,12 +113,12 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     this.align = align;
     this.prev = prev;
   }
-  function isStatement(context) {
-    return context.type == "statement" || context.type == "switchstatement" || context.type == "namespace";
+  function isStatement(type) {
+    return type == "statement" || type == "switchstatement" || type == "namespace";
   }
   function pushContext(state, col, type) {
     var indent = state.indented;
-    if (state.context && isStatement(state.context))
+    if (state.context && isStatement(state.context.type) && !isStatement(type))
       indent = state.context.indented;
     return state.context = new Context(indent, col, type, null, state.context);
   }
@@ -168,19 +168,20 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (style == "comment" || style == "meta") return style;
       if (ctx.align == null) ctx.align = true;
 
-      if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && isStatement(ctx)) popContext(state);
+      if ((curPunc == ";" || curPunc == ":" || curPunc == ","))
+        while (isStatement(state.context.type)) popContext(state);
       else if (curPunc == "{") pushContext(state, stream.column(), "}");
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
       else if (curPunc == "}") {
-        while (isStatement(ctx)) ctx = popContext(state);
+        while (isStatement(ctx.type)) ctx = popContext(state);
         if (ctx.type == "}") ctx = popContext(state);
-        while (isStatement(ctx)) ctx = popContext(state);
+        while (isStatement(ctx.type)) ctx = popContext(state);
       }
       else if (curPunc == ctx.type) popContext(state);
       else if (indentStatements &&
                (((ctx.type == "}" || ctx.type == "top") && curPunc != ";") ||
-                (isStatement(ctx) && curPunc == "newstatement"))) {
+                (isStatement(ctx.type) && curPunc == "newstatement"))) {
         var type = "statement";
         if (curPunc == "newstatement" && indentSwitch && stream.current() == "switch")
           type = "switchstatement";
@@ -210,10 +211,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     indent: function(state, textAfter) {
       if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (isStatement(ctx) && firstChar == "}") ctx = ctx.prev;
+      if (isStatement(ctx.type) && firstChar == "}") ctx = ctx.prev;
       var closing = firstChar == ctx.type;
       var switchBlock = ctx.prev && ctx.prev.type == "switchstatement";
-      if (isStatement(ctx))
+      if (isStatement(ctx.type))
         return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
       if (ctx.align && (!dontAlignCalls || ctx.type != ")"))
         return ctx.column + (closing ? 0 : 1);
diff --git a/mode/clike/test.js b/mode/clike/test.js
index 801a17c508..79b006de4a 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -24,4 +24,10 @@
      "[variable-3 void] [def foo]() {}",
      "[keyword struct] [def bar]{}",
      "[variable-3 int] [variable-3 *][def baz]() {}");
+
+  MT("double_block",
+     "[keyword for] (;;)",
+     "  [keyword for] (;;)",
+     "    [variable x][operator ++];",
+     "[keyword return];");
 })();

From 606898065770114c4bba05598d0ac4f14fca0775 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 24 Jun 2015 14:11:12 +0200
Subject: [PATCH 2185/4742] [php mode] Support 'nowdoc' strings

Closes #3340
---
 mode/php/php.js | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index 1c62eb485a..0c3f21e51b 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -17,31 +17,31 @@
     return obj;
   }
 
-  // Helper for stringWithEscapes
-  function matchSequence(list, end) {
-    if (list.length == 0) return stringWithEscapes(end);
+  // Helper for phpString
+  function matchSequence(list, end, escapes) {
+    if (list.length == 0) return phpString(end);
     return function (stream, state) {
       var patterns = list[0];
       for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0])) {
         state.tokenize = matchSequence(list.slice(1), end);
         return patterns[i][1];
       }
-      state.tokenize = stringWithEscapes(end);
+      state.tokenize = phpString(end, escapes);
       return "string";
     };
   }
-  function stringWithEscapes(closing) {
-    return function(stream, state) { return stringWithEscapes_(stream, state, closing); };
+  function phpString(closing, escapes) {
+    return function(stream, state) { return phpString_(stream, state, closing, escapes); };
   }
-  function stringWithEscapes_(stream, state, closing) {
+  function phpString_(stream, state, closing, escapes) {
     // "Complex" syntax
-    if (stream.match("${", false) || stream.match("{$", false)) {
+    if (escapes !== false && stream.match("${", false) || stream.match("{$", false)) {
       state.tokenize = null;
       return "string";
     }
 
     // Simple syntax
-    if (stream.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
+    if (escapes !== false && stream.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
       // After the variable name there may appear array or object operator.
       if (stream.match("[", false)) {
         // Match array operator
@@ -51,14 +51,14 @@
            [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
            [/[\w\$]+/, "variable"]],
           [["]", null]]
-        ], closing);
+        ], closing, escapes);
       }
       if (stream.match(/\-\>\w/, false)) {
         // Match object operator
         state.tokenize = matchSequence([
           [["->", null]],
           [[/[\w]+/, "variable"]]
-        ], closing);
+        ], closing, escapes);
       }
       return "variable-2";
     }
@@ -66,8 +66,9 @@
     var escaped = false;
     // Normal string
     while (!stream.eol() &&
-           (escaped || (!stream.match("{$", false) &&
-                        !stream.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false)))) {
+           (escaped || escapes === false ||
+            (!stream.match("{$", false) &&
+             !stream.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false)))) {
       if (!escaped && stream.match(closing)) {
         state.tokenize = null;
         state.tokStack.pop(); state.tokStack.pop();
@@ -105,11 +106,13 @@
       },
       "<": function(stream, state) {
         if (stream.match(/<</)) {
+          var nowDoc = stream.eat("'");
           stream.eatWhile(/[\w\.]/);
-          var delim = stream.current().slice(3);
+          var delim = stream.current().slice(3 + (nowDoc ? 1 : 0));
+          if (nowDoc) stream.eat("'");
           if (delim) {
             (state.tokStack || (state.tokStack = [])).push(delim, 0);
-            state.tokenize = stringWithEscapes(delim);
+            state.tokenize = phpString(delim, nowDoc ? false : true);
             return "string";
           }
         }
@@ -128,7 +131,7 @@
       },
       '"': function(_stream, state) {
         (state.tokStack || (state.tokStack = [])).push('"', 0);
-        state.tokenize = stringWithEscapes('"');
+        state.tokenize = phpString('"');
         return "string";
       },
       "{": function(_stream, state) {
@@ -139,7 +142,7 @@
       "}": function(_stream, state) {
         if (state.tokStack && state.tokStack.length > 0 &&
             !--state.tokStack[state.tokStack.length - 1]) {
-          state.tokenize = stringWithEscapes(state.tokStack[state.tokStack.length - 2]);
+          state.tokenize = phpString(state.tokStack[state.tokStack.length - 2]);
         }
         return false;
       }

From 3ebe7df83714ce43390877945c7a94ca63245b59 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jun 2015 13:31:47 +0200
Subject: [PATCH 2186/4742] [tern addon] Allow jump-to-definition in strings

---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index b6ecc6f09f..dfb19b8451 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -444,7 +444,7 @@
 
   function atInterestingExpression(cm) {
     var pos = cm.getCursor("end"), tok = cm.getTokenAt(pos);
-    if (tok.start < pos.ch && (tok.type == "comment" || tok.type == "string")) return false;
+    if (tok.start < pos.ch && tok.type == "comment") return false;
     return /[\w)\]]/.test(cm.getLine(pos.line).slice(Math.max(pos.ch - 1, 0), pos.ch + 1));
   }
 

From 60879eed092be6ff4513d9816d84706003162ab0 Mon Sep 17 00:00:00 2001
From: Michael Kaminsky <mkaminsky11@gmail.com>
Date: Wed, 24 Jun 2015 14:57:59 -0400
Subject: [PATCH 2187/4742] [swift mode] Add

---
 mode/meta.js          |   1 +
 mode/swift/index.html |  88 +++++++++++++++
 mode/swift/swift.js   | 241 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 330 insertions(+)
 create mode 100644 mode/swift/index.html
 create mode 100644 mode/swift/swift.js

diff --git a/mode/meta.js b/mode/meta.js
index b2f30c24db..bb30c80f54 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -116,6 +116,7 @@
     {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
     {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+    {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
     {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
     {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
diff --git a/mode/swift/index.html b/mode/swift/index.html
new file mode 100644
index 0000000000..2649dc37cc
--- /dev/null
+++ b/mode/swift/index.html
@@ -0,0 +1,88 @@
+<!doctype html>
+
+<title>CodeMirror: Swift 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/edit/matchbrackets.js"></script>
+<script src="./swift.js"></script>
+<style>
+	.CodeMirror { border: 2px inset #dee; }
+    </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="#">Swift</a>
+  </ul>
+</div>
+
+<article>
+<h2>Swift mode</h2>
+<form><textarea id="code" name="code">
+//
+//  TipCalculatorModel.swift
+//  TipCalculator
+//
+//  Created by Main Account on 12/18/14.
+//  Copyright (c) 2014 Razeware LLC. All rights reserved.
+//
+ 
+import Foundation
+ 
+class TipCalculatorModel {
+ 
+  var total: Double
+  var taxPct: Double
+  var subtotal: Double {
+    get {
+      return total / (taxPct + 1)
+    }
+  }
+ 
+  init(total: Double, taxPct: Double) {
+    self.total = total
+    self.taxPct = taxPct
+  }
+ 
+  func calcTipWithTipPct(tipPct: Double) -> Double {
+    return subtotal * tipPct
+  }
+ 
+  func returnPossibleTips() -> [Int: Double] {
+ 
+    let possibleTipsInferred = [0.15, 0.18, 0.20]
+    let possibleTipsExplicit:[Double] = [0.15, 0.18, 0.20]
+ 
+    var retval = [Int: Double]()
+    for possibleTip in possibleTipsInferred {
+      let intPct = Int(possibleTip*100)
+      retval[intPct] = calcTipWithTipPct(possibleTip)
+    }
+    return retval
+ 
+  }
+ 
+}
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-swift"
+      });
+    </script>
+
+    <p>A simple mode for Swift</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-swift</code> (Swift code)</p>
+  </article>
diff --git a/mode/swift/swift.js b/mode/swift/swift.js
new file mode 100644
index 0000000000..6eed9eda80
--- /dev/null
+++ b/mode/swift/swift.js
@@ -0,0 +1,241 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Swift mode created by Michael Kaminsky https://github.com/mkaminsky11
+
+(function(mod){
+  if(typeof exports=="object"&&typeof module=="object")
+    mod(require("../../lib/codemirror"));
+  else if(typeof define=="function"&&define.amd)
+    define(["../../lib/codemirror"],mod);
+  else
+    mod(CodeMirror)
+})
+(function(CodeMirror){
+  "use strict";
+  var separators=[' ','\\\+','\\\-','\\\(','\\\)','\\\*','/',':','\\\?','\\\<','\\\>',' ','\\\.'];
+  var tokens=new RegExp(separators.join('|'),'g');
+  function getWord(string,pos){
+    var index=-1;
+    var count=1;
+    var words=string.split(tokens);
+    for(var i=0;i<words.length;i++){
+      for(var j=1;j<=words[i].length;j++){
+        if(count===pos){
+          index=i
+        }
+        count++
+      }count++
+    }
+    var ret=["",""];
+    if(pos===0){
+      ret[1]=words[0];
+      ret[0]=null;
+    }
+    else{
+      ret[1]=words[index];
+      ret[0]=words[index-1];
+    }
+    return ret
+  }
+  CodeMirror.defineMode("swift",function(){
+    var keywords=["var","let","class","deinit","enum","extension","func","import","init","let","protocol","static","struct","subscript","typealias","var","as","dynamicType","is","new","super","self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case","continue","default","do","else","fallthrough","if","in","for","return","switch","where","while","associativity","didSet","get","infix","inout","left","mutating","none","nonmutating","operator","override","postfix","precedence","prefix","right","set","unowned","unowned(safe)","unowned(unsafe)","weak","willSet"];
+    var commonConstants=["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null","this","super"];
+    var types=["String","bool","int","string","double","Double","Int","Float","float","public","private","extension"];
+    var numbers=["0","1","2","3","4","5","6","7","8","9"];
+    var operators=["+","-","/","*","%","=","|","&","<",">"];
+    var punc=[";",",",".","(",")","{","}","[","]"];
+    var delimiters=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
+    var identifiers=/^[_A-Za-z$][_A-Za-z$0-9]*/;
+    var properties=/^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
+    var regexPrefixes=/^(\/{3}|\/)/;
+    return{
+      startState:function(){
+        return{
+          prev:false,
+          string:false,
+          escape:false,
+          inner:false,
+          comment:false,
+          num_left:0,
+          num_right:0,
+          doubleString:false,
+          singleString:false
+        }
+      },
+      token:function(stream,state){
+        var ch;
+        if(stream.eatSpace()){
+          return null
+        }
+        ch=stream.next();
+        if(state.string){
+          if(state.escape){
+            state.escape=false;
+            return"string"
+          }else{
+            if((ch==="\""&&(state.doubleString===true&&state.singleString===false)||(ch==="'"&&(state.doubleString===false&&state.singleString===true)))&&state.escape===false){
+              state.string=false;
+              state.doubleString=false;
+              state.singleString=false;
+              return"string"
+            }
+            if(ch==="\\"&&stream.peek()==="("){
+              state.inner=true;
+              state.string=false;
+              return"keyword"
+            }
+            if(ch==="\\"&&stream.peek()!=="("){
+              state.escape=true;
+              state.string=true;
+              return"string"
+            }
+            else{
+              return"string"
+            }
+          }
+        }else if(state.comment){
+          if(ch==="*"&&stream.peek()==="/"){
+            state.prev="*";
+            return"comment"
+          }if(ch==="/"&&state.prev==="*"){
+            state.prev=false;
+            state.comment=false;
+            return"comment"
+          }
+          return"comment"
+        }
+        else{
+          if(ch==="/"){
+            if(stream.peek()==="/"){
+              stream.skipToEnd();
+              return"comment"
+            }
+            if(stream.peek()==="*"){
+              state.comment=true;
+              return"comment"
+            }
+          }
+          if(ch==="("&&state.inner){
+            state.num_left++;
+            return null
+          }
+          if(ch===")"&&state.inner){
+            state.num_right++;
+            if(state.num_left===state.num_right){
+              state.inner=false;
+              state.string=true
+            }
+            return null
+          }
+          var ret=getWord(stream.string,stream.pos);
+          var the_word=ret[1];
+          var prev_word=ret[0];
+          if(operators.indexOf(ch+"")!==-1){
+            return"operator"
+          }
+          if(punc.indexOf(ch)!==-1){
+            return"punctuation"
+          }
+          if(typeof the_word!=='undefined'){
+            the_word=the_word.trim();
+            if(typeof prev_word!=='undefined'){
+              prev_word=prev_word.trim()
+            }
+            if(the_word.charAt(0)==="#"){
+              return null
+            }
+            if(types.indexOf(the_word)!==-1){
+              return"def"
+            }
+            if(commonConstants.indexOf(the_word)!==-1){
+              return"atom"
+            }
+            if(numbers.indexOf(the_word)!==-1){
+              return"number"
+            }
+            if((numbers.indexOf(the_word.charAt(0)+"")!==-1||operators.indexOf(the_word.charAt(0)+""))&&numbers.indexOf(ch)!==-1){
+              return"number"
+            }
+            if(keywords.indexOf(the_word)!==-1||keywords.indexOf(the_word.split(tokens)[0])!==-1){
+              return"keyword"
+            }
+            if(keywords.indexOf(prev_word)!==-1){
+              return"def"
+            }
+          }
+          if(ch==='"'&&state.doubleString===false){
+            state.string=true;
+            state.doubleString=true;
+            return"string"
+          }
+          if(ch==="'"&&state.singleString===false){
+            state.string=true;
+            state.singleString=true;
+            return"string"
+          }
+          if(ch==="("&&state.inner){
+            state.num_left++
+          }
+          if(ch===")"&&state.inner){
+            state.num_right++;
+            if(state.num_left===state.num_right){
+              state.inner=false;
+              state.string=true
+            }
+            return null
+          }
+          if(stream.match(/^-?[0-9\.]/,false)){
+            var floatLiteral=false;
+            if(stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)){
+              floatLiteral=true
+            }
+            if(stream.match(/^-?\d+\.\d*/)){
+              floatLiteral=true
+            }
+            if(stream.match(/^-?\.\d+/)){
+              floatLiteral=true
+            }
+            if(floatLiteral){
+              if(stream.peek()=="."){
+                stream.backUp(1)
+              }
+              return"number"
+            }
+            var intLiteral=false;
+            if(stream.match(/^-?0x[0-9a-f]+/i)){
+              intLiteral=true
+            }
+            if(stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)){
+              intLiteral=true
+            }
+            if(stream.match(/^-?0(?![\dx])/i)){
+              intLiteral=true
+            }
+            if(intLiteral){
+              return"number"
+            }
+          }
+          if(stream.match(regexPrefixes)){
+            if(stream.current()!="/"||stream.match(/^.*\//,false)){
+              return"string"
+            }
+            else{
+              stream.backUp(1)
+            }
+          }
+          if(stream.match(delimiters)){
+            return"punctuation"
+          }
+          if(stream.match(identifiers)){
+            return"variable"
+          }
+          if(stream.match(properties)){
+            return"property"
+          }
+          return"variable"
+        }
+      }
+    }
+  });
+CodeMirror.defineMIME("text/x-swift","swift")});

From 4a295392c278dc1d7da95b526572a2ca257fd71b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jun 2015 13:51:39 +0200
Subject: [PATCH 2188/4742] [swift mode] Adjust code style

Issue #3346
---
 doc/compress.html   |   1 +
 mode/index.html     |   1 +
 mode/swift/swift.js | 388 ++++++++++++++++++++------------------------
 3 files changed, 177 insertions(+), 213 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 39a0c2a227..43d3339278 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -186,6 +186,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/solr/solr.js">solr.js</option>
           <option value="http://codemirror.net/mode/soy/soy.js">soy.js</option>
           <option value="http://codemirror.net/mode/sparql/sparql.js">sparql.js</option>
+          <option value="http://codemirror.net/mode/swift/swift.js">swift.js</option>
           <option value="http://codemirror.net/mode/spreadsheet/spreadsheet.js">spreadsheet.js</option>
           <option value="http://codemirror.net/mode/stylus/stylus.js">stylus.js</option>
           <option value="http://codemirror.net/mode/sql/sql.js">sql.js</option>
diff --git a/mode/index.html b/mode/index.html
index 81b9b3b44c..8c6d0a435e 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -119,6 +119,7 @@ <h2>Language modes</h2>
       <li><a href="stylus/index.html">Stylus</a></li>
       <li><a href="sql/index.html">SQL</a> (several dialects)</li>
       <li><a href="sparql/index.html">SPARQL</a></li>
+      <li><a href="swift/index.html">Swift</a></li>
       <li><a href="stex/index.html">sTeX, LaTeX</a></li>
       <li><a href="tcl/index.html">Tcl</a></li>
       <li><a href="textile/index.html">Textile</a></li>
diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 6eed9eda80..cf784feff0 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -3,239 +3,201 @@
 
 // Swift mode created by Michael Kaminsky https://github.com/mkaminsky11
 
-(function(mod){
-  if(typeof exports=="object"&&typeof module=="object")
-    mod(require("../../lib/codemirror"));
-  else if(typeof define=="function"&&define.amd)
-    define(["../../lib/codemirror"],mod);
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object")
+    mod(require("../../lib/codemirror"))
+  else if (typeof define == "function" && define.amd)
+    define(["../../lib/codemirror"], mod)
   else
     mod(CodeMirror)
-})
-(function(CodeMirror){
-  "use strict";
-  var separators=[' ','\\\+','\\\-','\\\(','\\\)','\\\*','/',':','\\\?','\\\<','\\\>',' ','\\\.'];
-  var tokens=new RegExp(separators.join('|'),'g');
-  function getWord(string,pos){
-    var index=-1;
-    var count=1;
-    var words=string.split(tokens);
-    for(var i=0;i<words.length;i++){
-      for(var j=1;j<=words[i].length;j++){
-        if(count===pos){
-          index=i
-        }
+})(function(CodeMirror) {
+  "use strict"
+
+  function trim(str) { return /^\s*(.*?)\s*$/.exec(str)[1] }
+
+  var separators = [" ","\\\+","\\\-","\\\(","\\\)","\\\*","/",":","\\\?","\\\<","\\\>"," ","\\\."]
+  var tokens = new RegExp(separators.join("|"),"g")
+
+  function getWord(string, pos) {
+    var index = -1, count = 1
+    var words = string.split(tokens)
+    for (var i = 0; i < words.length; i++) {
+      for(var j = 1; j <= words[i].length; j++) {
+        if (count==pos) index = i
         count++
-      }count++
-    }
-    var ret=["",""];
-    if(pos===0){
-      ret[1]=words[0];
-      ret[0]=null;
+      }
+      count++
     }
-    else{
-      ret[1]=words[index];
-      ret[0]=words[index-1];
+    var ret = ["", ""]
+    if (pos == 0) {
+      ret[1] = words[0]
+      ret[0] = null
+    } else {
+      ret[1] = words[index]
+      ret[0] = words[index-1]
     }
     return ret
   }
-  CodeMirror.defineMode("swift",function(){
-    var keywords=["var","let","class","deinit","enum","extension","func","import","init","let","protocol","static","struct","subscript","typealias","var","as","dynamicType","is","new","super","self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case","continue","default","do","else","fallthrough","if","in","for","return","switch","where","while","associativity","didSet","get","infix","inout","left","mutating","none","nonmutating","operator","override","postfix","precedence","prefix","right","set","unowned","unowned(safe)","unowned(unsafe)","weak","willSet"];
-    var commonConstants=["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null","this","super"];
-    var types=["String","bool","int","string","double","Double","Int","Float","float","public","private","extension"];
-    var numbers=["0","1","2","3","4","5","6","7","8","9"];
-    var operators=["+","-","/","*","%","=","|","&","<",">"];
-    var punc=[";",",",".","(",")","{","}","[","]"];
-    var delimiters=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
-    var identifiers=/^[_A-Za-z$][_A-Za-z$0-9]*/;
-    var properties=/^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
-    var regexPrefixes=/^(\/{3}|\/)/;
-    return{
-      startState:function(){
-        return{
-          prev:false,
-          string:false,
-          escape:false,
-          inner:false,
-          comment:false,
-          num_left:0,
-          num_right:0,
-          doubleString:false,
-          singleString:false
+
+  CodeMirror.defineMode("swift", function() {
+    var keywords=["var","let","class","deinit","enum","extension","func","import","init","let","protocol","static","struct","subscript","typealias","var","as","dynamicType","is","new","super","self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case","continue","default","do","else","fallthrough","if","in","for","return","switch","where","while","associativity","didSet","get","infix","inout","left","mutating","none","nonmutating","operator","override","postfix","precedence","prefix","right","set","unowned","unowned(safe)","unowned(unsafe)","weak","willSet"]
+    var commonConstants=["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null","this","super"]
+    var types=["String","bool","int","string","double","Double","Int","Float","float","public","private","extension"]
+    var numbers=["0","1","2","3","4","5","6","7","8","9"]
+    var operators=["+","-","/","*","%","=","|","&","<",">"]
+    var punc=[";",",",".","(",")","{","}","[","]"]
+    var delimiters=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/
+    var identifiers=/^[_A-Za-z$][_A-Za-z$0-9]*/
+    var properties=/^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/
+    var regexPrefixes=/^(\/{3}|\/)/
+
+    return {
+      startState: function() {
+        return {
+          prev: false,
+          string: false,
+          escape: false,
+          inner: false,
+          comment: false,
+          num_left: 0,
+          num_right: 0,
+          doubleString: false,
+          singleString: false
         }
       },
-      token:function(stream,state){
-        var ch;
-        if(stream.eatSpace()){
-          return null
-        }
-        ch=stream.next();
-        if(state.string){
-          if(state.escape){
-            state.escape=false;
-            return"string"
-          }else{
-            if((ch==="\""&&(state.doubleString===true&&state.singleString===false)||(ch==="'"&&(state.doubleString===false&&state.singleString===true)))&&state.escape===false){
-              state.string=false;
-              state.doubleString=false;
-              state.singleString=false;
-              return"string"
-            }
-            if(ch==="\\"&&stream.peek()==="("){
-              state.inner=true;
-              state.string=false;
-              return"keyword"
-            }
-            if(ch==="\\"&&stream.peek()!=="("){
-              state.escape=true;
-              state.string=true;
-              return"string"
-            }
-            else{
-              return"string"
-            }
-          }
-        }else if(state.comment){
-          if(ch==="*"&&stream.peek()==="/"){
-            state.prev="*";
-            return"comment"
-          }if(ch==="/"&&state.prev==="*"){
-            state.prev=false;
-            state.comment=false;
-            return"comment"
-          }
-          return"comment"
-        }
-        else{
-          if(ch==="/"){
-            if(stream.peek()==="/"){
-              stream.skipToEnd();
-              return"comment"
-            }
-            if(stream.peek()==="*"){
-              state.comment=true;
-              return"comment"
-            }
-          }
-          if(ch==="("&&state.inner){
-            state.num_left++;
+      token: function(stream, state) {
+        if (stream.eatSpace()) return null
+
+        var ch = stream.next()
+        if (state.string) {
+          if (state.escape) {
+            state.escape = false
+            return "string"
+          } else {
+            if ((ch == "\"" && (state.doubleString && !state.singleString) ||
+                 (ch == "'" && (!state.doubleString && state.singleString))) &&
+                !state.escape) {
+              state.string = false
+              state.doubleString = false
+              state.singleString = false
+              return "string"
+            } else if (ch == "\\" && stream.peek() == "(") {
+              state.inner = true
+              state.string = false
+              return "keyword"
+            } else if (ch == "\\" && stream.peek() != "(") {
+              state.escape = true
+              state.string = true
+              return "string"
+            } else {
+              return "string"
+            }
+          }
+        } else if (state.comment) {
+          if (ch == "*" && stream.peek() == "/") {
+            state.prev = "*"
+            return "comment"
+          } else if (ch == "/" && state.prev == "*") {
+            state.prev = false
+            state.comment = false
+            return "comment"
+          }
+          return "comment"
+        } else {
+          if (ch == "/") {
+            if (stream.peek() == "/") {
+              stream.skipToEnd()
+              return "comment"
+            }
+            if (stream.peek() == "*") {
+              state.comment = true
+              return "comment"
+            }
+          }
+          if (ch == "(" && state.inner) {
+            state.num_left++
             return null
           }
-          if(ch===")"&&state.inner){
-            state.num_right++;
-            if(state.num_left===state.num_right){
-              state.inner=false;
+          if (ch == ")" && state.inner) {
+            state.num_right++
+            if (state.num_left == state.num_right) {
+              state.inner=false
               state.string=true
             }
             return null
           }
-          var ret=getWord(stream.string,stream.pos);
-          var the_word=ret[1];
-          var prev_word=ret[0];
-          if(operators.indexOf(ch+"")!==-1){
-            return"operator"
-          }
-          if(punc.indexOf(ch)!==-1){
-            return"punctuation"
-          }
-          if(typeof the_word!=='undefined'){
-            the_word=the_word.trim();
-            if(typeof prev_word!=='undefined'){
-              prev_word=prev_word.trim()
-            }
-            if(the_word.charAt(0)==="#"){
-              return null
-            }
-            if(types.indexOf(the_word)!==-1){
-              return"def"
-            }
-            if(commonConstants.indexOf(the_word)!==-1){
-              return"atom"
-            }
-            if(numbers.indexOf(the_word)!==-1){
-              return"number"
-            }
-            if((numbers.indexOf(the_word.charAt(0)+"")!==-1||operators.indexOf(the_word.charAt(0)+""))&&numbers.indexOf(ch)!==-1){
-              return"number"
-            }
-            if(keywords.indexOf(the_word)!==-1||keywords.indexOf(the_word.split(tokens)[0])!==-1){
-              return"keyword"
-            }
-            if(keywords.indexOf(prev_word)!==-1){
-              return"def"
+
+          var ret = getWord(stream.string, stream.pos)
+          var the_word = ret[1]
+          var prev_word = ret[0]
+
+          if (operators.indexOf(ch + "") > -1) return "operator"
+          if (punc.indexOf(ch) > -1) return "punctuation"
+
+          if (typeof the_word != "undefined") {
+            the_word = trim(the_word)
+            if (typeof prev_word != "undefined") prev_word = trim(prev_word)
+            if (the_word.charAt(0) == "#") return null
+
+            if (types.indexOf(the_word) > -1) return "def"
+            if (commonConstants.indexOf(the_word) > -1) return "atom"
+            if (numbers.indexOf(the_word) > -1) return "number"
+
+            if ((numbers.indexOf(the_word.charAt(0) + "") > -1 ||
+                 operators.indexOf(the_word.charAt(0) + "") > -1) &&
+                numbers.indexOf(ch) > -1) {
+              return "number"
             }
-          }
-          if(ch==='"'&&state.doubleString===false){
-            state.string=true;
-            state.doubleString=true;
-            return"string"
-          }
-          if(ch==="'"&&state.singleString===false){
-            state.string=true;
-            state.singleString=true;
-            return"string"
-          }
-          if(ch==="("&&state.inner){
+
+            if (keywords.indexOf(the_word) > -1 ||
+                keywords.indexOf(the_word.split(tokens)[0]) > -1)
+              return "keyword"
+            if (keywords.indexOf(prev_word) > -1) return "def"
+          }
+          if (ch == '"' && !state.doubleString) {
+            state.string = true
+            state.doubleString = true
+            return "string"
+          }
+          if (ch == "'" && !state.singleString) {
+            state.string = true
+            state.singleString = true
+            return "string"
+          }
+          if (ch == "(" && state.inner)
             state.num_left++
-          }
-          if(ch===")"&&state.inner){
-            state.num_right++;
-            if(state.num_left===state.num_right){
-              state.inner=false;
-              state.string=true
+          if (ch == ")" && state.inner) {
+            state.num_right++
+            if (state.num_left == state.num_right) {
+              state.inner = false
+              state.string = true
             }
             return null
           }
-          if(stream.match(/^-?[0-9\.]/,false)){
-            var floatLiteral=false;
-            if(stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)){
-              floatLiteral=true
-            }
-            if(stream.match(/^-?\d+\.\d*/)){
-              floatLiteral=true
-            }
-            if(stream.match(/^-?\.\d+/)){
-              floatLiteral=true
-            }
-            if(floatLiteral){
-              if(stream.peek()=="."){
-                stream.backUp(1)
-              }
-              return"number"
-            }
-            var intLiteral=false;
-            if(stream.match(/^-?0x[0-9a-f]+/i)){
-              intLiteral=true
-            }
-            if(stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)){
-              intLiteral=true
-            }
-            if(stream.match(/^-?0(?![\dx])/i)){
-              intLiteral=true
-            }
-            if(intLiteral){
-              return"number"
-            }
-          }
-          if(stream.match(regexPrefixes)){
-            if(stream.current()!="/"||stream.match(/^.*\//,false)){
-              return"string"
-            }
-            else{
-              stream.backUp(1)
-            }
-          }
-          if(stream.match(delimiters)){
-            return"punctuation"
-          }
-          if(stream.match(identifiers)){
-            return"variable"
-          }
-          if(stream.match(properties)){
-            return"property"
-          }
-          return"variable"
+          if (stream.match(/^-?[0-9\.]/, false)) {
+            if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i) ||
+                stream.match(/^-?\d+\.\d*/) ||
+                stream.match(/^-?\.\d+/)) {
+              if (stream.peek() == ".") stream.backUp(1)
+              return "number"
+            }
+            if (stream.match(/^-?0x[0-9a-f]+/i) ||
+                stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/) ||
+                stream.match(/^-?0(?![\dx])/i))
+              return "number"
+          }
+          if (stream.match(regexPrefixes)) {
+            if (stream.current()!="/" || stream.match(/^.*\//,false)) return "string"
+            else stream.backUp(1)
+          }
+          if (stream.match(delimiters)) return "punctuation"
+          if (stream.match(identifiers)) return "variable"
+          if (stream.match(properties)) return "property"
+          return "variable"
         }
       }
     }
-  });
-CodeMirror.defineMIME("text/x-swift","swift")});
+  })
+
+  CodeMirror.defineMIME("text/x-swift","swift")
+})

From a2931a6ce565511af4ab983b2a0c4a79df70a6fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jun 2015 15:58:23 +0200
Subject: [PATCH 2189/4742] Mark release 5.4.0

---
 AUTHORS           | 5 +++++
 doc/compress.html | 1 +
 doc/manual.html   | 2 +-
 doc/releases.html | 9 +++++++++
 index.html        | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 7 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 9c271f9c43..3299d4fd0c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -43,11 +43,13 @@ Andrey Lushnikov
 Andy Joslin
 Andy Kimball
 Andy Li
+Angelo
 angelozerr
 angelo.zerr@gmail.com
 Ankit
 Ankit Ahuja
 Ansel Santosa
+Anthony Dugois
 Anthony Grimes
 Anton Kovalyov
 AQNOUCH Mohammed
@@ -71,6 +73,7 @@ Blaine G
 blukat29
 boomyjee
 borawjm
+Brad Metcalf
 Brandon Frohs
 Brandon Wamboldt
 Brett Zamir
@@ -309,6 +312,7 @@ mbarkhau
 Metatheos
 Micah Dubinko
 Michael Grey
+Michael Kaminsky
 Michael Lehenbauer
 Michael Zhou
 Michal Dorner
@@ -391,6 +395,7 @@ sandeepshetty
 Sander AKA Redsandro
 santec
 Sascha Peilicke
+satamas
 satchmorun
 sathyamoorthi
 SCLINIC\jdecker
diff --git a/doc/compress.html b/doc/compress.html
index 43d3339278..ecbc406591 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.4.0;f=">5.4</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.3.0;f=">5.3</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>
diff --git a/doc/manual.html b/doc/manual.html
index d086b75362..6f579cb670 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.3.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.4.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 37c3d2e453..7f6563d967 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">25-06-2015: <a href="http://codemirror.net/codemirror-5.4.zip">Version 5.4</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="../mode/twig/index.html">Twig</a>, <a href="../mode/elm/index.html">Elm</a>, <a href="../mode/factor/index.html">Factor</a>, <a href="../mode/swift/index.html">Swift</a></li>
+    <li>Prefer clipboard API (if available) when pasting</li>
+    <li>Refined definition highlighting in <a href="../mode/clike/index.html">clike</a> mode</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.3.0...5.4.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">20-05-2015: <a href="http://codemirror.net/codemirror-5.3.zip">Version 5.3</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index c8e38e3e19..b769386c7e 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.3</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.4</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 51f956506b..283fc09fec 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8729,7 +8729,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.3.1";
+  CodeMirror.version = "5.4.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index a400c9e145..ece298bc5f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.3.1",
+    "version":"5.4.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 8455ac4b57193759189f5d48f04a85f3df69ec5a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jun 2015 15:59:55 +0200
Subject: [PATCH 2190/4742] Bump version number post-5.4

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 6f579cb670..43fac0e475 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.4.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.4.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 283fc09fec..9d812c910f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8729,7 +8729,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.4.0";
+  CodeMirror.version = "5.4.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index ece298bc5f..687c185b9a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.4.0",
+    "version":"5.4.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 0fc02ca3b1a50c941336c9b3990c3360932a012d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Jun 2015 12:18:54 +0200
Subject: [PATCH 2191/4742] [gfm mode] Define a MIME, remove bogus use of
 defineMIME

Closes #3345
---
 mode/gfm/gfm.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 80a8e2c84d..94ff920bfb 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -116,8 +116,9 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
     markdownConfig[attr] = modeConfig[attr];
   }
   markdownConfig.name = "markdown";
-  CodeMirror.defineMIME("gfmBase", markdownConfig);
-  return CodeMirror.overlayMode(CodeMirror.getMode(config, "gfmBase"), gfmOverlay);
+  return CodeMirror.overlayMode(CodeMirror.getMode(config, markdownConfig), gfmOverlay);
+
 }, "markdown");
 
+  CodeMirror.defineMIME("text/x-gfm", "gfm");
 });

From eea1ed18f29e443fe61a9eeab222410a57db6dbb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 25 Jun 2015 15:30:24 +0200
Subject: [PATCH 2192/4742] Start on ::selection workaround

---
 lib/codemirror.css | 4 ++--
 lib/codemirror.js  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index b313b61c68..2384ad01f3 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -297,8 +297,8 @@ div.CodeMirror-cursors {
 .CodeMirror-selected { background: #d9d9d9; }
 .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
 .CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror ::selection { background: #d7d4f0; }
-.CodeMirror ::-moz-selection { background: #d7d4f0; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection { background: #d7d4f0; }
 
 .cm-searching {
   background: #ffa;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9d812c910f..a0fce911eb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6790,7 +6790,7 @@
     // The padding-right forces the element to have a 'border', which
     // is needed on Webkit to be able to get line-level bounding
     // rectangles for it (in measureChar).
-    var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
+    var content = elt("span", null, "CodeMirror-line", webkit ? "padding-right: .1px" : null);
     var builder = {pre: elt("pre", [content]), content: content,
                    col: 0, pos: 0, cm: cm,
                    splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};

From 0ac8955e5ccad9160e7fcd7212486da1383619d3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Jun 2015 12:41:06 +0200
Subject: [PATCH 2193/4742] Change the way the native selection style is
 overridden by themes

So that selection inside widgets isn't affected

Issue #3342
---
 lib/codemirror.css                | 4 ++--
 lib/codemirror.js                 | 4 ++--
 theme/3024-day.css                | 5 +++--
 theme/3024-night.css              | 4 ++--
 theme/ambiance.css                | 4 ++--
 theme/base16-dark.css             | 4 ++--
 theme/base16-light.css            | 4 ++--
 theme/blackboard.css              | 4 ++--
 theme/cobalt.css                  | 4 ++--
 theme/erlang-dark.css             | 4 ++--
 theme/lesser-dark.css             | 4 ++--
 theme/mbo.css                     | 4 ++--
 theme/mdn-like.css                | 4 ++--
 theme/midnight.css                | 4 ++--
 theme/monokai.css                 | 4 ++--
 theme/night.css                   | 4 ++--
 theme/paraiso-dark.css            | 4 ++--
 theme/paraiso-light.css           | 4 ++--
 theme/pastel-on-dark.css          | 4 ++--
 theme/rubyblue.css                | 4 ++--
 theme/solarized.css               | 6 +++---
 theme/the-matrix.css              | 4 ++--
 theme/tomorrow-night-eighties.css | 4 ++--
 theme/twilight.css                | 4 ++--
 theme/vibrant-ink.css             | 4 ++--
 theme/xq-dark.css                 | 4 ++--
 26 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 2384ad01f3..c4aa3c0635 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -297,8 +297,8 @@ div.CodeMirror-cursors {
 .CodeMirror-selected { background: #d9d9d9; }
 .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
 .CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror-line::selection, .CodeMirror-line > span::selection { background: #d7d4f0; }
-.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection { background: #d7d4f0; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
 
 .cm-searching {
   background: #ffa;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a0fce911eb..572cbbce52 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6790,8 +6790,8 @@
     // The padding-right forces the element to have a 'border', which
     // is needed on Webkit to be able to get line-level bounding
     // rectangles for it (in measureChar).
-    var content = elt("span", null, "CodeMirror-line", webkit ? "padding-right: .1px" : null);
-    var builder = {pre: elt("pre", [content]), content: content,
+    var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
+    var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
                    col: 0, pos: 0, cm: cm,
                    splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
     lineView.measure = {};
diff --git a/theme/3024-day.css b/theme/3024-day.css
index 359281621b..1eb109e438 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -10,8 +10,9 @@
 
 .cm-s-3024-day.CodeMirror {background: #f7f7f7; color: #3a3432;}
 .cm-s-3024-day div.CodeMirror-selected {background: #d6d5d4 !important;}
-.cm-s-3024-day.CodeMirror ::selection { background: #d6d5d4; }
-.cm-s-3024-day.CodeMirror ::-moz-selection { background: #d9d9d9; }
+
+.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
+.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
 
 .cm-s-3024-day .CodeMirror-gutters {background: #f7f7f7; border-right: 0px;}
 .cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
diff --git a/theme/3024-night.css b/theme/3024-night.css
index ccab9d50bf..36bb8b4eea 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -10,8 +10,8 @@
 
 .cm-s-3024-night.CodeMirror {background: #090300; color: #d6d5d4;}
 .cm-s-3024-night div.CodeMirror-selected {background: #3a3432 !important;}
-.cm-s-3024-night.CodeMirror ::selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night.CodeMirror ::-moz-selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
 .cm-s-3024-night .CodeMirror-gutters {background: #090300; border-right: 0px;}
 .cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
 .cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
diff --git a/theme/ambiance.css b/theme/ambiance.css
index 3ab9b25483..0e68f75e4c 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -33,8 +33,8 @@
 
 .cm-s-ambiance .CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
 .cm-s-ambiance.CodeMirror-focused .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-ambiance.CodeMirror ::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-ambiance.CodeMirror ::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::selection, .cm-s-ambiance .CodeMirror-line > span::selection, .cm-s-ambiance .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::-moz-selection, .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 
 /* Editor styling */
 
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index b009d2b9d6..fb79fae2b9 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -10,8 +10,8 @@
 
 .cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
 .cm-s-base16-dark div.CodeMirror-selected {background: #303030 !important;}
-.cm-s-base16-dark.CodeMirror ::selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark.CodeMirror ::-moz-selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
 .cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
 .cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
diff --git a/theme/base16-light.css b/theme/base16-light.css
index 15df6d3807..46508e02c6 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -10,8 +10,8 @@
 
 .cm-s-base16-light.CodeMirror {background: #f5f5f5; color: #202020;}
 .cm-s-base16-light div.CodeMirror-selected {background: #e0e0e0 !important;}
-.cm-s-base16-light.CodeMirror ::selection { background: #e0e0e0; }
-.cm-s-base16-light.CodeMirror ::-moz-selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
 .cm-s-base16-light .CodeMirror-gutters {background: #f5f5f5; border-right: 0px;}
 .cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
diff --git a/theme/blackboard.css b/theme/blackboard.css
index 02289b630b..6de11dd20a 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -2,8 +2,8 @@
 
 .cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
 .cm-s-blackboard .CodeMirror-selected { background: #253B76 !important; }
-.cm-s-blackboard.CodeMirror ::selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard.CodeMirror ::-moz-selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
 .cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
 .cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
 .cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
diff --git a/theme/cobalt.css b/theme/cobalt.css
index 3915589494..b6eebcfcff 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -1,7 +1,7 @@
 .cm-s-cobalt.CodeMirror { background: #002240; color: white; }
 .cm-s-cobalt div.CodeMirror-selected { background: #b36539 !important; }
-.cm-s-cobalt.CodeMirror ::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-cobalt.CodeMirror ::-moz-selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
 .cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
 .cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index e20bf1259b..48552f862f 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -1,7 +1,7 @@
 .cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
 .cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
-.cm-s-erlang-dark.CodeMirror ::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-erlang-dark.CodeMirror ::-moz-selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
 .cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
 .cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 88dff92191..0573c06692 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -7,8 +7,8 @@ Ported to CodeMirror by Peter Kroon
 }
 .cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
 .cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/
-.cm-s-lesser-dark.CodeMirror ::selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark.CodeMirror ::-moz-selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
 .cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 .cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
 
diff --git a/theme/mbo.css b/theme/mbo.css
index e39879522e..cc9032e0ed 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -6,8 +6,8 @@
 
 .cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffec;}
 .cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
-.cm-s-mbo.CodeMirror ::selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo.CodeMirror ::-moz-selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
 .cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
 .cm-s-mbo .CodeMirror-guttermarker { color: white; }
 .cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index 9c73dc2f0c..771d4471e5 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -9,8 +9,8 @@
 */
 .cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
 .cm-s-mdn-like .CodeMirror-selected { background: #cfc !important; }
-.cm-s-mdn-like.CodeMirror ::selection { background: #cfc; }
-.cm-s-mdn-like.CodeMirror ::-moz-selection { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection { background: #cfc; }
 
 .cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
 .cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
diff --git a/theme/midnight.css b/theme/midnight.css
index 296af4f7d2..9e9825b3f8 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -15,8 +15,8 @@
 .cm-s-midnight.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 
 .cm-s-midnight div.CodeMirror-selected {background: #314D67 !important;}
-.cm-s-midnight.CodeMirror ::selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight.CodeMirror ::-moz-selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
 .cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;}
 .cm-s-midnight .CodeMirror-guttermarker { color: white; }
 .cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
diff --git a/theme/monokai.css b/theme/monokai.css
index cea775f67f..e11e80cace 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -2,8 +2,8 @@
 
 .cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2;}
 .cm-s-monokai div.CodeMirror-selected {background: #49483E !important;}
-.cm-s-monokai.CodeMirror ::selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai.CodeMirror ::-moz-selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
 .cm-s-monokai .CodeMirror-gutters {background: #272822; border-right: 0px;}
 .cm-s-monokai .CodeMirror-guttermarker { color: white; }
 .cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
diff --git a/theme/night.css b/theme/night.css
index 6b2ac6c7cf..6fbbcaa202 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -2,8 +2,8 @@
 
 .cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
 .cm-s-night div.CodeMirror-selected { background: #447 !important; }
-.cm-s-night.CodeMirror ::selection { background: rgba(68, 68, 119, .99); }
-.cm-s-night.CodeMirror ::-moz-selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
 .cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
 .cm-s-night .CodeMirror-guttermarker { color: white; }
 .cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index af914b60bf..2b6a797d0d 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -10,8 +10,8 @@
 
 .cm-s-paraiso-dark.CodeMirror {background: #2f1e2e; color: #b9b6b0;}
 .cm-s-paraiso-dark div.CodeMirror-selected {background: #41323f !important;}
-.cm-s-paraiso-dark.CodeMirror ::selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark.CodeMirror ::-moz-selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
 .cm-s-paraiso-dark .CodeMirror-gutters {background: #2f1e2e; border-right: 0px;}
 .cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
 .cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index e198066faa..01d2e11f54 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -10,8 +10,8 @@
 
 .cm-s-paraiso-light.CodeMirror {background: #e7e9db; color: #41323f;}
 .cm-s-paraiso-light div.CodeMirror-selected {background: #b9b6b0 !important;}
-.cm-s-paraiso-light.CodeMirror ::selection { background: #b9b6b0; }
-.cm-s-paraiso-light.CodeMirror ::-moz-selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
 .cm-s-paraiso-light .CodeMirror-gutters {background: #e7e9db; border-right: 0px;}
 .cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
 .cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index 0d06f63284..1c7f84c45b 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -14,8 +14,8 @@
 	font-size: 14px;
 }
 .cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2) !important; }
-.cm-s-pastel-on-dark.CodeMirror ::selection { background: rgba(221,240,255,0.2); }
-.cm-s-pastel-on-dark.CodeMirror ::-moz-selection { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
 
 .cm-s-pastel-on-dark .CodeMirror-gutters {
 	background: #34302f;
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index d2fc0ecdbc..064f192f78 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -1,7 +1,7 @@
 .cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
 .cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
-.cm-s-rubyblue.CodeMirror ::selection { background: rgba(56, 86, 111, 0.99); }
-.cm-s-rubyblue.CodeMirror ::-moz-selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
 .cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
 .cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
 .cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 1f1dedac10..03ace472d9 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -96,11 +96,11 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 .cm-s-solarized.cm-s-dark .CodeMirror-selected { background: #073642; }
 .cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
-.cm-s-solarized.cm-s-dark.CodeMirror ::-moz-selection { background: rgba(7, 54, 66, 0.99); }
+.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
 
 .cm-s-solarized.cm-s-light .CodeMirror-selected { background: #eee8d5; }
-.cm-s-solarized.cm-s-light.CodeMirror ::selection { background: #eee8d5; }
-.cm-s-solarized.cm-s-lightCodeMirror ::-moz-selection { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
+.cm-s-solarized.cm-s-ligh .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
 
 /* Editor styling */
 
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index f29b22b0da..ec6046ad96 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -1,7 +1,7 @@
 .cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
 .cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D !important; }
-.cm-s-the-matrix.CodeMirror ::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-the-matrix.CodeMirror ::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
 .cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
 .cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
 .cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index 5fca3cafbf..a8ee8f5d97 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -10,8 +10,8 @@
 
 .cm-s-tomorrow-night-eighties.CodeMirror {background: #000000; color: #CCCCCC;}
 .cm-s-tomorrow-night-eighties div.CodeMirror-selected {background: #2D2D2D !important;}
-.cm-s-tomorrow-night-eighties.CodeMirror ::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties.CodeMirror ::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
 .cm-s-tomorrow-night-eighties .CodeMirror-gutters {background: #000000; border-right: 0px;}
 .cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
 .cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
diff --git a/theme/twilight.css b/theme/twilight.css
index 889a83d799..360d44afc9 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -1,7 +1,7 @@
 .cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
 .cm-s-twilight .CodeMirror-selected { background: #323232 !important; } /**/
-.cm-s-twilight.CodeMirror ::selection { background: rgba(50, 50, 50, 0.99); }
-.cm-s-twilight.CodeMirror ::-moz-selection { background: rgba(50, 50, 50, 0.99); }
+.cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
+.cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
 
 .cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
 .cm-s-twilight .CodeMirror-guttermarker { color: white; }
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index 8ea535973c..8d3e99d386 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -2,8 +2,8 @@
 
 .cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
 .cm-s-vibrant-ink .CodeMirror-selected { background: #35493c !important; }
-.cm-s-vibrant-ink.CodeMirror ::selection { background: rgba(53, 73, 60, 0.99); }
-.cm-s-vibrant-ink.CodeMirror ::-moz-selection { background: rgba(53, 73, 60, 0.99); }
+.cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
+.cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
 
 .cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index d537993e89..5cdfe8f03a 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -22,8 +22,8 @@ THE SOFTWARE.
 */
 .cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-selected { background: #27007A !important; }
-.cm-s-xq-dark.CodeMirror ::selection { background: rgba(39, 0, 122, 0.99); }
-.cm-s-xq-dark.CodeMirror ::-moz-selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
 .cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
 .cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
 .cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }

From d85fd8c4b25889da29576f4ff94557fd64c7e794 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 26 Jun 2015 21:36:48 +0200
Subject: [PATCH 2194/4742] [css mode] Recognize color keywords in @-block
 expressions

Closes #3336
---
 mode/css/css.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/css/css.js b/mode/css/css.js
index 1e6d2ddbc7..63698c15c9 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -273,6 +273,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         override = "string-2";
       else if (valueKeywords.hasOwnProperty(word))
         override = "atom";
+      else if (colorKeywords.hasOwnProperty(word))
+        override = "keyword";
       else
         override = "error";
     }

From cfba4b1b61b68d3524a3336d5e990d593945fd0d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 2 Jul 2015 21:59:22 +0200
Subject: [PATCH 2195/4742] [show-hint addon] Document selectedHint

Closes #3348
---
 doc/manual.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 43fac0e475..49faee7982 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2481,7 +2481,9 @@ <h2 id="addons">Addons</h2>
       is an array of strings or objects (the completions),
       and <code>from</code> and <code>to</code> give the start and end
       of the token that is being completed as <code>{line, ch}</code>
-      objects.</dd>
+      objects. An optional <code>selectedHint</code> property (an
+      integer) can be added to the completion object to control the
+      initially selected hint.</dd>
       <dd>If no hinting function is given, the addon will
       use <code>CodeMirror.hint.auto</code>, which
       calls <a href="#getHelpers"><code>getHelpers</code></a> with

From f52e64d095db6a8bbbd2528bab341ccd44e4b2bf Mon Sep 17 00:00:00 2001
From: mkaminsky11 <mkaminsky11@gmail.com>
Date: Fri, 3 Jul 2015 13:42:02 -0700
Subject: [PATCH 2196/4742] [dracula, seti, yeti, material themes] Add

---
 demo/theme.html     |   8 ++++
 theme/dracula.css   |  87 ++++++++++++++++++++++++++++++++++++
 theme/material.css  | 105 ++++++++++++++++++++++++++++++++++++++++++++
 theme/seti.css      |  88 +++++++++++++++++++++++++++++++++++++
 theme/solarized.css |   2 +-
 theme/yeti.css      |  86 ++++++++++++++++++++++++++++++++++++
 6 files changed, 375 insertions(+), 1 deletion(-)
 create mode 100644 theme/dracula.css
 create mode 100644 theme/material.css
 create mode 100644 theme/seti.css
 create mode 100644 theme/yeti.css

diff --git a/demo/theme.html b/demo/theme.html
index a5599859ad..8833e87560 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -13,11 +13,13 @@
 <link rel="stylesheet" href="../theme/blackboard.css">
 <link rel="stylesheet" href="../theme/cobalt.css">
 <link rel="stylesheet" href="../theme/colorforth.css">
+<link rel="stylesheet" href="../theme/dracula.css">
 <link rel="stylesheet" href="../theme/eclipse.css">
 <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/material.css">
 <link rel="stylesheet" href="../theme/mbo.css">
 <link rel="stylesheet" href="../theme/mdn-like.css">
 <link rel="stylesheet" href="../theme/midnight.css">
@@ -29,6 +31,7 @@
 <link rel="stylesheet" href="../theme/paraiso-light.css">
 <link rel="stylesheet" href="../theme/pastel-on-dark.css">
 <link rel="stylesheet" href="../theme/rubyblue.css">
+<link rel="stylesheet" href="../theme/seti.css">
 <link rel="stylesheet" href="../theme/solarized.css">
 <link rel="stylesheet" href="../theme/the-matrix.css">
 <link rel="stylesheet" href="../theme/tomorrow-night-bright.css">
@@ -38,6 +41,7 @@
 <link rel="stylesheet" href="../theme/vibrant-ink.css">
 <link rel="stylesheet" href="../theme/xq-dark.css">
 <link rel="stylesheet" href="../theme/xq-light.css">
+<link rel="stylesheet" href="../theme/yeti.css">
 <link rel="stylesheet" href="../theme/zenburn.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
@@ -85,11 +89,13 @@ <h2>Theme Demo</h2>
     <option>blackboard</option>
     <option>cobalt</option>
     <option>colorforth</option>
+    <option>dracula</option>
     <option>eclipse</option>
     <option>elegant</option>
     <option>erlang-dark</option>
     <option>lesser-dark</option>
     <option>liquibyte</option>
+    <option>material</option>
     <option>mbo</option>
     <option>mdn-like</option>
     <option>midnight</option>
@@ -101,6 +107,7 @@ <h2>Theme Demo</h2>
     <option>paraiso-light</option>
     <option>pastel-on-dark</option>
     <option>rubyblue</option>
+    <option>seti</option>
     <option>solarized dark</option>
     <option>solarized light</option>
     <option>the-matrix</option>
@@ -111,6 +118,7 @@ <h2>Theme Demo</h2>
     <option>vibrant-ink</option>
     <option>xq-dark</option>
     <option>xq-light</option>
+    <option>yeti</option>
     <option>zenburn</option>
 </select>
 </p>
diff --git a/theme/dracula.css b/theme/dracula.css
new file mode 100644
index 0000000000..5badef282e
--- /dev/null
+++ b/theme/dracula.css
@@ -0,0 +1,87 @@
+/*
+
+    Name:       dracula
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
+
+*/
+
+
+.cm-s-dracula.CodeMirror, .cm-s-dracula .CodeMirror-gutters {
+  background-color: #282a36 !important;
+  color: #f8f8f2 !important;
+  border: none;
+}
+.cm-s-dracula .CodeMirror-gutters{
+  color: #282a36;
+}
+.cm-s-dracula .CodeMirror-cursor {
+  border-left: solid thin #f8f8f0 !important;
+}
+.cm-s-dracula .CodeMirror-linenumber {
+  color: #6D8A88;
+}
+.cm-s-dracula.CodeMirror-focused .CodeMirror-selected {
+  background: rgba(255, 255, 255, 0.10);
+}
+.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection {
+  background: rgba(255, 255, 255, 0.10);
+}
+.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection {
+  background: rgba(255, 255, 255, 0.10);
+}
+.cm-s-dracula span.cm-comment {
+  color: #6272a4;
+}
+.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 {
+  color: #f1fa8c;
+}
+.cm-s-dracula span.cm-number {
+  color: #bd93f9;
+}
+.cm-s-dracula span.cm-variable {
+  color: #50fa7b;
+}
+.cm-s-dracula span.cm-variable-2 {
+  color: white;
+}
+.cm-s-dracula span.cm-def {
+  color: #ffb86c;
+}
+.cm-s-dracula span.cm-keyword {
+  color: #ff79c6;
+}
+.cm-s-dracula span.cm-operator {
+  color: #ff79c6;
+}
+.cm-s-dracula span.cm-keyword {
+  color: #ff79c6;
+}
+.cm-s-dracula span.cm-atom {
+  color: #bd93f9;
+}
+.cm-s-dracula span.cm-meta {
+  color: #f8f8f2;
+}
+.cm-s-dracula span.cm-tag {
+  color: #ff79c6;
+}
+.cm-s-dracula span.cm-attribute {
+  color: #50fa7b;
+}
+.cm-s-dracula span.cm-qualifier {
+  color: #50fa7b;
+}
+.cm-s-dracula span.cm-property {
+  color: #66d9ef;
+}
+.cm-s-dracula span.cm-builtin {
+  color: #50fa7b;
+}
+.cm-s-dracula span.cm-variable-3 {
+  color: #50fa7b;
+}
+
+.cm-s-dracula .CodeMirror-activeline-background {background: rgba(255,255,255,0.1) !important;}
+.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
\ No newline at end of file
diff --git a/theme/material.css b/theme/material.css
new file mode 100644
index 0000000000..85e1f185d5
--- /dev/null
+++ b/theme/material.css
@@ -0,0 +1,105 @@
+/*
+
+    Name:       material
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme)
+
+*/
+
+.cm-s-material {
+  background-color: #263238;
+  color: rgba(233, 237, 237, 1);
+}
+.cm-s-material .CodeMirror-gutters {
+  background: #263238;
+  color: rgb(83,127,126);
+  border: none;
+}
+.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber {
+  color: rgb(83,127,126);
+}
+.cm-s-material .CodeMirror-cursor {
+  border-left: 1px solid #f8f8f0 !important;
+}
+.cm-s-material .CodeMirror-selected {
+  background: rgba(255, 255, 255, 0.15);
+}
+.cm-s-material.CodeMirror-focused .CodeMirror-selected {
+  background: rgba(255, 255, 255, 0.10);
+}
+.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection {
+  background: rgba(255, 255, 255, 0.10);
+}
+.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection {
+  background: rgba(255, 255, 255, 0.10);
+}
+
+.CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0) !important;
+}
+.cm-s-material span.cm-keyword {
+  color: rgba(199, 146, 234, 1);
+}
+.cm-s-material span.cm-operator {
+  color: rgba(233, 237, 237, 1);
+}
+.cm-s-material span.cm-variable-2 {
+  color: #80CBC4;
+}
+.cm-s-material span.cm-variable-3 {
+  color: #82B1FF;
+}
+.cm-s-material span.cm-builtin {
+  color: #DECB6B;
+}
+.cm-s-material span.cm-atom {
+  color: #F77669;
+}
+.cm-s-material span.cm-number {
+  color: #F77669;
+}
+.cm-s-material span.cm-def {
+  color: rgba(233, 237, 237, 1);
+}
+.cm-s-material span.cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #EC5F67;
+}
+.cm-s-material span.cm-string {
+  color: #C3E88D;
+}
+.cm-s-material span.cm-string-2 {
+  color: #80CBC4;
+}
+.cm-s-material span.cm-comment {
+  color: #546E7A;
+}
+.cm-s-material span.cm-variable {
+  color: #82B1FF;
+}
+.cm-s-material span.cm-tag {
+  color: #80CBC4;
+}
+.cm-s-material span.cm-meta{
+  color: #80CBC4;
+}
+.cm-s-material span.cm-attribute {
+  color: #FFCB6B;
+}
+.cm-s-material span.cm-property {
+  color: #80CBAE;
+}
+.cm-s-material span.cm-qualifier {
+  color: #DECB6B;
+}
+.cm-s-material span.cm-variable-3{
+  color: #DECB6B;
+}
+.cm-s-material span.cm-tag {
+  color: rgba(255, 83, 112, 1);
+}
+.cm-s-material .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
\ No newline at end of file
diff --git a/theme/seti.css b/theme/seti.css
new file mode 100644
index 0000000000..ea27d5eee7
--- /dev/null
+++ b/theme/seti.css
@@ -0,0 +1,88 @@
+/*
+
+    Name:       seti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original seti color scheme by Jesse Weed (https://github.com/jesseweed/seti-syntax)
+
+*/
+
+
+.cm-s-seti.CodeMirror {
+  background-color: #151718 !important;
+  color: #CFD2D1 !important;
+  border: none;
+}
+.cm-s-seti .CodeMirror-gutters{
+  color: #404b53;
+  background-color: #0E1112;
+  border: none;
+}
+.cm-s-seti .CodeMirror-cursor {
+  border-left: solid thin #f8f8f0 !important;
+}
+.cm-s-seti .CodeMirror-linenumber {
+  color: #6D8A88;
+}
+.cm-s-seti.CodeMirror-focused .CodeMirror-selected {
+  background: rgba(255, 255, 255, 0.10);
+}
+.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection {
+  background: rgba(255, 255, 255, 0.10);
+}
+.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection {
+  background: rgba(255, 255, 255, 0.10);
+}
+.cm-s-seti span.cm-comment {
+  color: #41535b;
+}
+.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 {
+  color: #55b5db;
+}
+.cm-s-seti span.cm-number {
+  color: #cd3f45;
+}
+.cm-s-seti span.cm-variable {
+  color: #55b5db;
+}
+.cm-s-seti span.cm-variable-2 {
+  color: #a074c4;
+}
+.cm-s-seti span.cm-def {
+  color: #55b5db;
+}
+.cm-s-seti span.cm-keyword {
+  color: #ff79c6;
+}
+.cm-s-seti span.cm-operator {
+  color: #9fca56;
+}
+.cm-s-seti span.cm-keyword {
+  color: #e6cd69;
+}
+.cm-s-seti span.cm-atom {
+  color: #cd3f45;
+}
+.cm-s-seti span.cm-meta {
+  color: #55b5db;
+}
+.cm-s-seti span.cm-tag {
+  color: #55b5db;
+}
+.cm-s-seti span.cm-attribute {
+  color: #9fca56;
+}
+.cm-s-seti span.cm-qualifier {
+  color: #9fca56;
+}
+.cm-s-seti span.cm-property {
+  color: #a074c4;
+}
+.cm-s-seti span.cm-variable-3 {
+  color: #9fca56;
+}
+.cm-s-seti span.cm-builtin {
+  color: #9fca56;
+}
+.cm-s-seti .CodeMirror-activeline-background {background: #101213 !important;}
+.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
\ No newline at end of file
diff --git a/theme/solarized.css b/theme/solarized.css
index 03ace472d9..18ed6de63f 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -100,7 +100,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 .cm-s-solarized.cm-s-light .CodeMirror-selected { background: #eee8d5; }
 .cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
-.cm-s-solarized.cm-s-ligh .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
 
 /* Editor styling */
 
diff --git a/theme/yeti.css b/theme/yeti.css
new file mode 100644
index 0000000000..dce32588cd
--- /dev/null
+++ b/theme/yeti.css
@@ -0,0 +1,86 @@
+/*
+
+    Name:       yeti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original yeti color scheme by Jesse Weed (https://github.com/jesseweed/yeti-syntax)
+
+*/
+
+
+.cm-s-yeti.CodeMirror {
+  background-color: #ECEAE8 !important;
+  color: #d1c9c0 !important;
+  border: none;
+}
+
+.cm-s-yeti .CodeMirror-gutters{
+  color: #adaba6;
+  background-color: #E5E1DB;
+  border: none;
+}
+.cm-s-yeti .CodeMirror-cursor {
+  border-left: solid thin #d1c9c0 !important;
+}
+.cm-s-yeti .CodeMirror-linenumber {
+  color: #adaba6;
+}
+.cm-s-yeti.CodeMirror-focused .CodeMirror-selected {
+  background: #DCD8D2;
+}
+.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection {
+  background: #DCD8D2;
+}
+.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection {
+  background: #DCD8D2;
+}
+.cm-s-yeti span.cm-comment {
+  color: #d4c8be;
+}
+.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 {
+  color: #96c0d8;
+}
+.cm-s-yeti span.cm-number {
+  color: #a074c4;
+}
+.cm-s-yeti span.cm-variable {
+  color: #55b5db;
+}
+.cm-s-yeti span.cm-variable-2 {
+  color: #a074c4;
+}
+.cm-s-yeti span.cm-def {
+  color: #55b5db;
+}
+.cm-s-yeti span.cm-operator {
+  color: #9fb96e;
+}
+.cm-s-yeti span.cm-keyword {
+  color: #9fb96e;
+}
+.cm-s-yeti span.cm-atom {
+  color:##a074c4;
+}
+.cm-s-yeti span.cm-meta {
+  color: #96c0d8;
+}
+.cm-s-yeti span.cm-tag {
+  color: #96c0d8;
+}
+.cm-s-yeti span.cm-attribute {
+  color: #9fb96e;
+}
+.cm-s-yeti span.cm-qualifier {
+  color: #96c0d8;
+}
+.cm-s-yeti span.cm-property {
+  color: #a074c4;
+}
+.cm-s-yeti span.cm-builtin {
+  color: #a074c4;
+}
+.cm-s-yeti span.cm-variable-3 {
+  color: #96c0d8;
+}
+.cm-s-yeti .CodeMirror-activeline-background {background: #E7E4E0 !important;}
+.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline;}
\ No newline at end of file

From 165f5d9d9363620faa458c49410c2fa6458bb89f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 10 Jul 2015 17:19:58 +0200
Subject: [PATCH 2197/4742] [theme demo] Make hash reflect current theme

---
 demo/theme.html | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/demo/theme.html b/demo/theme.html
index 8833e87560..7898fcd7b4 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -131,14 +131,20 @@ <h2>Theme Demo</h2>
   });
   var input = document.getElementById("select");
   function selectTheme() {
-    var theme = input.options[input.selectedIndex].innerHTML;
+    var theme = input.options[input.selectedIndex].textContent;
     editor.setOption("theme", theme);
+    location.hash = "#" + theme;
   }
-  var choice = document.location.search &&
-               decodeURIComponent(document.location.search.slice(1));
+  var choice = (location.hash && location.hash.slice(1)) ||
+               (document.location.search &&
+                decodeURIComponent(document.location.search.slice(1)));
   if (choice) {
     input.value = choice;
     editor.setOption("theme", choice);
   }
+  CodeMirror.on(window, "hashchange", function() {
+    var theme = location.hash.slice(1);
+    if (theme) { input.value = theme; selectTheme(); }
+  });
 </script>
   </article>

From 84c8c92968174df6d35ce5a3772ca9900d9b4f26 Mon Sep 17 00:00:00 2001
From: mkaminsky11 <mkaminsky11@gmail.com>
Date: Tue, 7 Jul 2015 14:54:15 -0700
Subject: [PATCH 2198/4742] [brainfuck mode] Add

---
 doc/compress.html           |  1 +
 mode/brainfuck/brainfuck.js | 85 +++++++++++++++++++++++++++++++++++++
 mode/brainfuck/index.html   | 85 +++++++++++++++++++++++++++++++++++++
 mode/index.html             |  1 +
 mode/meta.js                |  3 +-
 5 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 mode/brainfuck/brainfuck.js
 create mode 100644 mode/brainfuck/index.html

diff --git a/doc/compress.html b/doc/compress.html
index ecbc406591..7acdefe2af 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -110,6 +110,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/asn.1/asn.1.js">asn.1.js</option>
           <option value="http://codemirror.net/mode/asterisk/asterisk.js">asterisk.js</option>
           <option value="http://codemirror.net/mode/asciiarmor/asciiarmor.js">asciiarmor.js</option>
+          <option value="http://codemirror.net/mode/brainfuck/brainfuck.js">brainfuck.js</option>
           <option value="http://codemirror.net/mode/clike/clike.js">clike.js</option>
           <option value="http://codemirror.net/mode/clojure/clojure.js">clojure.js</option>
           <option value="http://codemirror.net/mode/cmake/cmake.js">cmake.js</option>
diff --git a/mode/brainfuck/brainfuck.js b/mode/brainfuck/brainfuck.js
new file mode 100644
index 0000000000..3becf2a5a3
--- /dev/null
+++ b/mode/brainfuck/brainfuck.js
@@ -0,0 +1,85 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Brainfuck mode created by Michael Kaminsky https://github.com/mkaminsky11
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object")
+    mod(require("../../lib/codemirror"))
+  else if (typeof define == "function" && define.amd)
+    define(["../../lib/codemirror"], mod)
+  else
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+  var reserve = "><+-.,[]".split("");
+  /*
+  comments can be either:
+  placed behind lines
+
+        +++    this is a comment
+
+  where reserved characters cannot be used
+  or in a loop
+  [
+    this is ok to use [ ] and stuff
+  ]
+  or preceded by #
+  */
+  CodeMirror.defineMode("brainfuck", function() {
+    return {
+      startState: function() {
+        return {
+          commentLine: false,
+          left: 0,
+          right: 0,
+          commentLoop: false
+        }
+      },
+      token: function(stream, state) {
+        if (stream.eatSpace()) return null
+        if(stream.sol()){
+          state.commentLine = false;
+        }
+        var ch = stream.next().toString();
+        if(reserve.indexOf(ch) !== -1){
+          if(state.commentLine === true){
+            if(stream.eol()){
+              state.commentLine = false;
+            }
+            return "comment";
+          }
+          if(ch === "]" || ch === "["){
+            if(ch === "["){
+              state.left++;
+            }
+            else{
+              state.right++;
+            }
+            return "bracket";
+          }
+          else if(ch === "+" || ch === "-"){
+            return "keyword";
+          }
+          else if(ch === "<" || ch === ">"){
+            return "atom";
+          }
+          else if(ch === "." || ch === ","){
+            return "def";
+          }
+        }
+        else{
+          state.commentLine = true;
+          if(stream.eol()){
+            state.commentLine = false;
+          }
+          return "comment";
+        }
+        if(stream.eol()){
+          state.commentLine = false;
+        }
+      }
+    };
+  });
+CodeMirror.defineMIME("text/x-brainfuck","brainfuck")
+});
diff --git a/mode/brainfuck/index.html b/mode/brainfuck/index.html
new file mode 100644
index 0000000000..6048fc2412
--- /dev/null
+++ b/mode/brainfuck/index.html
@@ -0,0 +1,85 @@
+<!doctype html>
+
+<title>CodeMirror: Brainfuck 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/edit/matchbrackets.js"></script>
+<script src="./brainfuck.js"></script>
+<style>
+	.CodeMirror { border: 2px inset #dee; }
+    </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="#"></a>
+  </ul>
+</div>
+
+<article>
+<h2>Brainfuck mode</h2>
+<form><textarea id="code" name="code">
+[ This program prints "Hello World!" and a newline to the screen, its
+  length is 106 active command characters [it is not the shortest.]
+
+  This loop is a "comment loop", it's a simple way of adding a comment
+  to a BF program such that you don't have to worry about any command
+  characters. Any ".", ",", "+", "-", "&lt;" and "&gt;" characters are simply
+  ignored, the "[" and "]" characters just have to be balanced.
+]
++++++ +++               Set Cell #0 to 8
+[
+    &gt;++++               Add 4 to Cell #1; this will always set Cell #1 to 4
+    [                   as the cell will be cleared by the loop
+        &gt;++             Add 2 to Cell #2
+        &gt;+++            Add 3 to Cell #3
+        &gt;+++            Add 3 to Cell #4
+        &gt;+              Add 1 to Cell #5
+        &lt;&lt;&lt;&lt;-           Decrement the loop counter in Cell #1
+    ]                   Loop till Cell #1 is zero; number of iterations is 4
+    &gt;+                  Add 1 to Cell #2
+    &gt;+                  Add 1 to Cell #3
+    &gt;-                  Subtract 1 from Cell #4
+    &gt;&gt;+                 Add 1 to Cell #6
+    [&lt;]                 Move back to the first zero cell you find; this will
+                        be Cell #1 which was cleared by the previous loop
+    &lt;-                  Decrement the loop Counter in Cell #0
+]                       Loop till Cell #0 is zero; number of iterations is 8
+
+The result of this is:
+Cell No :   0   1   2   3   4   5   6
+Contents:   0   0  72 104  88  32   8
+Pointer :   ^
+
+&gt;&gt;.                     Cell #2 has value 72 which is 'H'
+&gt;---.                   Subtract 3 from Cell #3 to get 101 which is 'e'
++++++++..+++.           Likewise for 'llo' from Cell #3
+&gt;&gt;.                     Cell #5 is 32 for the space
+&lt;-.                     Subtract 1 from Cell #4 for 87 to give a 'W'
+&lt;.                      Cell #3 was set to 'o' from the end of 'Hello'
++++.------.--------.    Cell #3 for 'rl' and 'd'
+&gt;&gt;+.                    Add 1 to Cell #5 gives us an exclamation point
+&gt;++.                    And finally a newline from Cell #6
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/x-brainfuck"
+      });
+    </script>
+
+    <p>A mode for Brainfuck</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-brainfuck</code></p>
+  </article>
diff --git a/mode/index.html b/mode/index.html
index 8c6d0a435e..ca89a377a8 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -33,6 +33,7 @@ <h2>Language modes</h2>
       <li><a href="apl/index.html">APL</a></li>
       <li><a href="asn.1/index.html">ASN.1</a></li>
       <li><a href="asterisk/index.html">Asterisk dialplan</a></li>
+      <li><a href="brainfuck/index.html">Brainfuck</a></li>
       <li><a href="clike/index.html">C, C++, C#</a></li>
       <li><a href="clojure/index.html">Clojure</a></li>
       <li><a href="cmake/index.html">CMake</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index bb30c80f54..bf0929eba6 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -14,8 +14,9 @@
   CodeMirror.modeInfo = [
     {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
     {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
-    {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn, asn1"]},
+    {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
     {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
+    {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
     {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},

From 31d89d6e4f84631198800e7b4f991606fb1cc57b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jul 2015 11:07:36 +0200
Subject: [PATCH 2199/4742] Prevent sizer from propping up scroll height

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 572cbbce52..a806e9a4e1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -714,7 +714,7 @@
     // width and height.
     removeChildren(display.cursorDiv);
     removeChildren(display.selectionDiv);
-    display.gutters.style.height = 0;
+    display.gutters.style.height = display.sizer.style.minHeight = 0;
 
     if (different) {
       display.lastWrapHeight = update.wrapperHeight;

From 50aba2033fc4b96bf033f8b8a0dcd18aec464748 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jul 2015 11:38:59 +0200
Subject: [PATCH 2200/4742] Add a test for resizing editors shrinking correctly

Issue #3362
---
 test/scroll_test.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/scroll_test.js b/test/scroll_test.js
index 20470028ce..82fd126c48 100644
--- a/test/scroll_test.js
+++ b/test/scroll_test.js
@@ -102,4 +102,14 @@
     cm.replaceSelection("\n");
     is(cm.cursorCoords(null, "window").bottom < displayBottom(cm, false));
   }, {lineWrapping: true});
+
+  testCM("height_auto_with_gutter_expect_no_scroll_after_line_delete", function(cm) {
+    cm.setSize(null, "auto");
+    cm.setValue("x\n");
+    cm.execCommand("goDocEnd");
+    cm.execCommand("delCharBefore");
+    eq(cm.getScrollInfo().top, 0);
+    cm.scrollTo(null, 10);
+    is(cm.getScrollInfo().top < 5);
+  }, {lineNumbers: true});
 })();

From 8d797495642152f140aaf430650016ea55dd14aa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jul 2015 11:50:38 +0200
Subject: [PATCH 2201/4742] [show-hint addon] Ignore hint updates that start at
 a different place from original list

See http://discuss.codemirror.net/t/tern-special-characters-causing-issues/294
---
 addon/hint/show-hint.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index d228fc8890..fc85a10bb7 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -111,6 +111,7 @@
     },
 
     finishUpdate: function(data, first) {
+      if (data && this.data && CodeMirror.cmpPos(data.from, this.data.from)) data = null;
       this.data = data;
 
       var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);

From 66ba83ca1a7e043cf78e13c16cc7b9d94d59f2db Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Fri, 3 Jul 2015 19:40:45 +0100
Subject: [PATCH 2202/4742] [icecoder theme] Add

Spent quite a while perfecting this (IMO), but a lot of people seem to
really like it. Hope you do too.
---
 demo/theme.html    |  2 ++
 theme/icecoder.css | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 theme/icecoder.css

diff --git a/demo/theme.html b/demo/theme.html
index 7898fcd7b4..93d52510fb 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -17,6 +17,7 @@
 <link rel="stylesheet" href="../theme/eclipse.css">
 <link rel="stylesheet" href="../theme/elegant.css">
 <link rel="stylesheet" href="../theme/erlang-dark.css">
+<link rel="stylesheet" href="../theme/icecoder.css">
 <link rel="stylesheet" href="../theme/lesser-dark.css">
 <link rel="stylesheet" href="../theme/liquibyte.css">
 <link rel="stylesheet" href="../theme/material.css">
@@ -93,6 +94,7 @@ <h2>Theme Demo</h2>
     <option>eclipse</option>
     <option>elegant</option>
     <option>erlang-dark</option>
+    <option>icecoder</option>
     <option>lesser-dark</option>
     <option>liquibyte</option>
     <option>material</option>
diff --git a/theme/icecoder.css b/theme/icecoder.css
new file mode 100644
index 0000000000..ff2d43bd21
--- /dev/null
+++ b/theme/icecoder.css
@@ -0,0 +1,42 @@
+/*
+ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
+*/
+
+.cm-s-icecoder {color: #666; background: #141612}
+
+.cm-s-icecoder span.cm-keyword {color: #eee; font-weight:bold}  /* off-white 1 */
+.cm-s-icecoder span.cm-atom {color: #e1c76e}                    /* yellow */
+.cm-s-icecoder span.cm-number {color: #6cb5d9}                  /* blue */
+.cm-s-icecoder span.cm-def {color: #b9ca4a}                     /* green */
+
+.cm-s-icecoder span.cm-variable {color: #6cb5d9}                /* blue */
+.cm-s-icecoder span.cm-variable-2 {color: #bf255c}              /* pink */
+.cm-s-icecoder span.cm-variable-3 {color: #f9602c}              /* orange */
+
+.cm-s-icecoder span.cm-property {color: #eee}                   /* off-white 1 */
+.cm-s-icecoder span.cm-operator {color: #9179bb}                /* purple */
+.cm-s-icecoder span.cm-comment {color: #97a3aa}                 /* grey-blue */
+
+.cm-s-icecoder span.cm-string {color: #b9ca4a}                  /* green */
+.cm-s-icecoder span.cm-string-2 {color: #6cb5d9}                /* blue */
+
+.cm-s-icecoder span.cm-meta {color: #555}                       /* grey */
+
+.cm-s-icecoder span.cm-qualifier {color: #555}                  /* grey */
+.cm-s-icecoder span.cm-builtin {color: #214e7b}                 /* bright blue */
+.cm-s-icecoder span.cm-bracket {color: #cc7}                    /* grey-yellow */
+
+.cm-s-icecoder span.cm-tag {color: #e8e8e8}                     /* off-white 2 */
+.cm-s-icecoder span.cm-attribute {color: #099}                  /* teal */
+
+.cm-s-icecoder span.cm-header {color: #6a0d6a}                  /* purple-pink */
+.cm-s-icecoder span.cm-quote {color: #186718}                   /* dark green */
+.cm-s-icecoder span.cm-hr {color: #888}                         /* mid-grey */
+.cm-s-icecoder span.cm-link {color: #e1c76e}                    /* yellow */
+.cm-s-icecoder span.cm-error {color: #d00}                      /* red */
+
+.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important}
+.cm-s-icecoder .CodeMirror-selected {color: #fff !important; background: #037 !important}
+.cm-s-icecoder .CodeMirror-gutters {background: #141612; min-width: 41px; border-right: 0}
+.cm-s-icecoder .CodeMirror-linenumber {color: #555; cursor: default}
+.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important}
\ No newline at end of file

From 96b50658e14bc7796790c0024f067f191face333 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jul 2015 12:14:45 +0200
Subject: [PATCH 2203/4742] [CONTRIBUTING.md] Add note about focused pull
 requests

---
 CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1645548239..6d65e41129 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -61,7 +61,8 @@ should be asked on the
 - Make sure all tests pass. Visit `test/index.html` in your browser to
   run them.
 - Submit a pull request
-([how to create a pull request](https://help.github.com/articles/fork-a-repo))
+([how to create a pull request](https://help.github.com/articles/fork-a-repo)).
+  Don't put more than one feature/fix in a single pull request.
 
 By contributing code to CodeMirror you
 

From afd407f572d1bb82fef31b21a07eb810ce1bd432 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jul 2015 12:28:13 +0200
Subject: [PATCH 2204/4742] [ruby mode] Fix management of curPunc output
 variable

Closes #3365
---
 mode/ruby/ruby.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index eab9d9da7f..771f855abf 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -37,7 +37,6 @@ CodeMirror.defineMode("ruby", function(config) {
   }
 
   function tokenBase(stream, state) {
-    curPunc = null;
     if (stream.sol() && stream.match("=begin") && stream.eol()) {
       state.tokenize.push(readBlockComment);
       return "comment";
@@ -232,6 +231,7 @@ CodeMirror.defineMode("ruby", function(config) {
     },
 
     token: function(stream, state) {
+      curPunc = null;
       if (stream.sol()) state.indented = stream.indentation();
       var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
       var thisTok = curPunc;

From e585ae81469c21394432407da1754ad6340850e1 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Mon, 13 Jul 2015 11:28:14 +0100
Subject: [PATCH 2205/4742] [icecoder theme] Color boost on variable-2 to be
 brighter

Was a little subdued
---
 theme/icecoder.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/icecoder.css b/theme/icecoder.css
index ff2d43bd21..5ec374342a 100644
--- a/theme/icecoder.css
+++ b/theme/icecoder.css
@@ -10,7 +10,7 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 .cm-s-icecoder span.cm-def {color: #b9ca4a}                     /* green */
 
 .cm-s-icecoder span.cm-variable {color: #6cb5d9}                /* blue */
-.cm-s-icecoder span.cm-variable-2 {color: #bf255c}              /* pink */
+.cm-s-icecoder span.cm-variable-2 {color: #cc1e5c}              /* pink */
 .cm-s-icecoder span.cm-variable-3 {color: #f9602c}              /* orange */
 
 .cm-s-icecoder span.cm-property {color: #eee}                   /* off-white 1 */
@@ -39,4 +39,4 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 .cm-s-icecoder .CodeMirror-selected {color: #fff !important; background: #037 !important}
 .cm-s-icecoder .CodeMirror-gutters {background: #141612; min-width: 41px; border-right: 0}
 .cm-s-icecoder .CodeMirror-linenumber {color: #555; cursor: default}
-.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important}
\ No newline at end of file
+.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important}

From 8e6aca8c445b716fffac9cdd19fa8fc42abed430 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jul 2015 12:37:58 +0200
Subject: [PATCH 2206/4742] Make activeElt aware of shadow DOM nesting

Issue #3369
---
 lib/codemirror.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a806e9a4e1..221dacd8d5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8269,7 +8269,12 @@
     } while (child = child.parentNode);
   };
 
-  function activeElt() { return document.activeElement; }
+  function activeElt() {
+    var activeElement = document.activeElement;
+    while (activeElement && activeElement.root && activeElement.root.activeElement)
+      activeElement = activeElement.root.activeElement;
+    return activeElement;
+  }
   // Older versions of IE throws unspecified error when touching
   // document.activeElement in some cases (during loading, in iframe)
   if (ie && ie_version < 11) activeElt = function() {

From efca20989567651901895dae6532953386d191f1 Mon Sep 17 00:00:00 2001
From: Oreoluwa Onatemowo <ooreoluwa@google.com>
Date: Wed, 8 Jul 2015 16:53:41 -0700
Subject: [PATCH 2207/4742] [tern addon] Update CSS to prevent cutting off of
 icons

I noticed that the image that accompanies auto-completion suggestions
when the tern addon is active gets cut slightly, because the default
line height is slightly smaller than the image height.

This change above ensures that the line height is bigger, hence
ensuring that the image is fully shown.
---
 addon/tern/tern.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/tern/tern.css b/addon/tern/tern.css
index 76fba33d4a..c4b8a2f77e 100644
--- a/addon/tern/tern.css
+++ b/addon/tern/tern.css
@@ -1,6 +1,7 @@
 .CodeMirror-Tern-completion {
   padding-left: 22px;
   position: relative;
+  line-height: 1.5;
 }
 .CodeMirror-Tern-completion:before {
   position: absolute;

From bd36c1dbe484d6a9a692d814995ff02473279449 Mon Sep 17 00:00:00 2001
From: Michael Zhou <moz@google.com>
Date: Fri, 10 Jul 2015 01:02:43 -0700
Subject: [PATCH 2208/4742] [vhdl mode] Add

Reference: https://groups.google.com/forum/#!msg/codemirror/uRUuqXimqj0/mn3Lmdkab18J
Rewritten to match the style of the Verilog mode
---
 mode/vhdl/index.html |  95 +++++++++++++++++++++
 mode/vhdl/vhdl.js    | 193 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 288 insertions(+)
 create mode 100644 mode/vhdl/index.html
 create mode 100644 mode/vhdl/vhdl.js

diff --git a/mode/vhdl/index.html b/mode/vhdl/index.html
new file mode 100644
index 0000000000..24e86f039d
--- /dev/null
+++ b/mode/vhdl/index.html
@@ -0,0 +1,95 @@
+<!doctype html>
+
+<title>CodeMirror: VHDL 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/edit/matchbrackets.js"></script>
+<script src="vhdl.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="#">VHDL</a>
+  </ul>
+</div>
+
+<article>
+<h2>VHDL mode</h2>
+
+<div><textarea id="code" name="code">
+LIBRARY ieee;
+USE ieee.std_logic_1164.ALL;
+USE ieee.numeric_std.ALL;
+
+ENTITY tb IS
+END tb;
+
+ARCHITECTURE behavior OF tb IS
+   --Inputs
+   signal a : unsigned(2 downto 0) := (others => '0');
+   signal b : unsigned(2 downto 0) := (others => '0');
+    --Outputs
+   signal a_eq_b : std_logic;
+   signal a_le_b : std_logic;
+   signal a_gt_b : std_logic;
+
+    signal i,j : integer;
+
+BEGIN
+
+    -- Instantiate the Unit Under Test (UUT)
+   uut: entity work.comparator PORT MAP (
+          a => a,
+          b => b,
+          a_eq_b => a_eq_b,
+          a_le_b => a_le_b,
+          a_gt_b => a_gt_b
+        );
+
+   -- Stimulus process
+   stim_proc: process
+   begin
+        for i in 0 to 8 loop
+            for j in 0 to 8 loop
+                a <= to_unsigned(i,3); --integer to unsigned type conversion
+                b <= to_unsigned(j,3);
+                wait for 10 ns;
+            end loop;
+        end loop;
+   end process;
+
+END;
+</textarea></div>
+
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    matchBrackets: true,
+    mode: {
+      name: "vhdl",
+    }
+  });
+</script>
+
+<p>
+Syntax highlighting and indentation for the VHDL language.
+<h2>Configuration options:</h2>
+  <ul>
+    <li><strong>atoms</strong> - List of atom words. Default: "null"</li>
+    <li><strong>hooks</strong> - List of meta hooks. Default: ["`", "$"]</li>
+    <li><strong>multiLineStrings</strong> - Whether multi-line strings are accepted. Default: undefined</li>
+  </ul>
+</p>
+
+<p><strong>MIME types defined:</strong> <code>text/x-vhdl</code>.</p>
+</article>
diff --git a/mode/vhdl/vhdl.js b/mode/vhdl/vhdl.js
new file mode 100644
index 0000000000..cc9c43d80f
--- /dev/null
+++ b/mode/vhdl/vhdl.js
@@ -0,0 +1,193 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Originall written by Alf Nielsen, re-written by Michael Zhou
+(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";
+
+function words(str) {
+  var obj = {}, words = str.split(",");
+  for (var i = 0; i < words.length; ++i) {
+    var allCaps = words[i].toUpperCase();
+    var firstCap = words[i].charAt(0).toUpperCase() + words[i].slice(1);
+    obj[words[i]] = true;
+    obj[allCaps] = true;
+    obj[firstCap] = true;
+  }
+  return obj;
+}
+
+CodeMirror.defineMode("vhdl", function(config, parserConfig) {
+  var indentUnit = config.indentUnit,
+      atoms = parserConfig.atoms || {},
+      hooks = parserConfig.hooks || {},
+      multiLineStrings = parserConfig.multiLineStrings;
+
+  var keywords = words("abs,access,after,alias,all,and,architecture,array,assert,attribute,begin,block," +
+      "body,buffer,bus,case,component,configuration,constant,disconnent,downto,else,elsif,end,end block,end case," +
+      "end component,end for,end generate,end if,end loop,end process,end record,end units,entity,exit,file,for," +
+      "function,generate,generic,generic map,group,guarded,if,impure,in,inertial,inout,is,label,library,linkage," +
+      "literal,loop,map,mod,nand,new,next,nor,null,of,on,open,or,others,out,package,package body,port,port map," +
+      "postponed,procedure,process,pure,range,record,register,reject,rem,report,return,rol,ror,select,severity,signal," +
+      "sla,sll,sra,srl,subtype,then,to,transport,type,unaffected,units,until,use,variable,wait,when,while,with,xnor,xor");
+
+  var blockKeywords = words("architecture,entity,begin,case,port,else,elsif,end,for,function,if");
+
+  var isOperatorChar = /[&|~><!\)\(*#%@+\/=?\:;}{,\.\^\-\[\]]/;
+  var curPunc;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (hooks[ch]) {
+      var result = hooks[ch](stream, state);
+      if (result !== false) return result;
+    }
+    if (ch == '"') {
+      state.tokenize = tokenString2(ch);
+      return state.tokenize(stream, state);
+    }
+    if (ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
+    if (/[\d']/.test(ch)) {
+      stream.eatWhile(/[\w\.']/);
+      return "number";
+    }
+    if (ch == "-") {
+      if (stream.eat("-")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_]/);
+    var cur = stream.current();
+    if (keywords.propertyIsEnumerable(cur.toLowerCase())) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "keyword";
+    }
+    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    return "variable";
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && next == "--";
+      }
+      if (end || !(escaped || multiLineStrings))
+        state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+  function tokenString2(quote) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {end = true; break;}
+        escaped = !escaped && next == "--";
+      }
+      if (end || !(escaped || multiLineStrings))
+        state.tokenize = tokenBase;
+      return "string-2";
+    };
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+  function popContext(state) {
+    var t = state.context.type;
+    if (t == ")" || t == "]" || t == "}")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
+    },
+
+    token: function(stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+      }
+      if (stream.eatSpace()) return null;
+      curPunc = null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style == "comment" || style == "meta") return style;
+      if (ctx.align == null) ctx.align = true;
+
+      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
+      else if (curPunc == "{") pushContext(state, stream.column(), "}");
+      else if (curPunc == "[") pushContext(state, stream.column(), "]");
+      else if (curPunc == "(") pushContext(state, stream.column(), ")");
+      else if (curPunc == "}") {
+        while (ctx.type == "statement") ctx = popContext(state);
+        if (ctx.type == "}") ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
+      }
+      else if (curPunc == ctx.type) popContext(state);
+      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
+        pushContext(state, stream.column(), "statement");
+      state.startOfLine = false;
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context, closing = firstChar == ctx.type;
+      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit);
+      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricChars: "{}"
+  };
+});
+
+function metaHook(stream) {
+  stream.eatWhile(/[\w\$_]/);
+  return "meta";
+}
+
+CodeMirror.defineMIME("text/x-vhdl", {
+  name: "vhdl",
+  atoms: words("null"),
+  hooks: {"`": metaHook, "$": metaHook}
+});
+
+});

From e5b224af8db8974306e387a9a56877b8ee6699a1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jul 2015 12:53:12 +0200
Subject: [PATCH 2209/4742] [vhdl mode] Integrate

Issue #3372
---
 doc/compress.html    |  1 +
 mode/index.html      |  1 +
 mode/vhdl/index.html |  2 +-
 mode/vhdl/vhdl.js    | 20 ++++++++------------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 7acdefe2af..98b0f674f0 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -208,6 +208,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
           <option value="http://codemirror.net/mode/velocity/velocity.js">velocity.js</option>
           <option value="http://codemirror.net/mode/verilog/verilog.js">verilog.js</option>
+          <option value="http://codemirror.net/mode/vhdl/vhdl.js">vhdl.js</option>
           <option value="http://codemirror.net/mode/xml/xml.js">xml.js</option>
           <option value="http://codemirror.net/mode/xquery/xquery.js">xquery.js</option>
           <option value="http://codemirror.net/mode/yaml/yaml.js">yaml.js</option>
diff --git a/mode/index.html b/mode/index.html
index ca89a377a8..7629561932 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -137,6 +137,7 @@ <h2>Language modes</h2>
       <li><a href="vbscript/index.html">VBScript</a></li>
       <li><a href="velocity/index.html">Velocity</a></li>
       <li><a href="verilog/index.html">Verilog/SystemVerilog</a></li>
+      <li><a href="vhdl/index.html">VHDL</a></li>
       <li><a href="xml/index.html">XML/HTML</a></li>
       <li><a href="xquery/index.html">XQuery</a></li>
       <li><a href="yaml/index.html">YAML</a></li>
diff --git a/mode/vhdl/index.html b/mode/vhdl/index.html
index 24e86f039d..3051bc37e5 100644
--- a/mode/vhdl/index.html
+++ b/mode/vhdl/index.html
@@ -87,7 +87,7 @@ <h2>Configuration options:</h2>
   <ul>
     <li><strong>atoms</strong> - List of atom words. Default: "null"</li>
     <li><strong>hooks</strong> - List of meta hooks. Default: ["`", "$"]</li>
-    <li><strong>multiLineStrings</strong> - Whether multi-line strings are accepted. Default: undefined</li>
+    <li><strong>multiLineStrings</strong> - Whether multi-line strings are accepted. Default: false</li>
   </ul>
 </p>
 
diff --git a/mode/vhdl/vhdl.js b/mode/vhdl/vhdl.js
index cc9c43d80f..470cf2be8a 100644
--- a/mode/vhdl/vhdl.js
+++ b/mode/vhdl/vhdl.js
@@ -24,10 +24,15 @@ function words(str) {
   return obj;
 }
 
+function metaHook(stream) {
+  stream.eatWhile(/[\w\$_]/);
+  return "meta";
+}
+
 CodeMirror.defineMode("vhdl", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
-      atoms = parserConfig.atoms || {},
-      hooks = parserConfig.hooks || {},
+      atoms = parserConfig.atoms || words("null"),
+      hooks = parserConfig.hooks || {"`": metaHook, "$": metaHook},
       multiLineStrings = parserConfig.multiLineStrings;
 
   var keywords = words("abs,access,after,alias,all,and,architecture,array,assert,attribute,begin,block," +
@@ -179,15 +184,6 @@ CodeMirror.defineMode("vhdl", function(config, parserConfig) {
   };
 });
 
-function metaHook(stream) {
-  stream.eatWhile(/[\w\$_]/);
-  return "meta";
-}
-
-CodeMirror.defineMIME("text/x-vhdl", {
-  name: "vhdl",
-  atoms: words("null"),
-  hooks: {"`": metaHook, "$": metaHook}
-});
+CodeMirror.defineMIME("text/x-vhdl", "vhdl");
 
 });

From 127a6e017e4d40c43734a301e0c4e9135c6375d6 Mon Sep 17 00:00:00 2001
From: Max Schaefer <xiemaisi@gmail.com>
Date: Fri, 10 Jul 2015 09:01:39 +0100
Subject: [PATCH 2210/4742] [emacs keymap] Fix handling of non-integer line
 numbers in goto-line.

---
 keymap/emacs.js    | 2 +-
 test/emacs_test.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index c4135237e1..3eec1e5762 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -377,7 +377,7 @@
 
       getInput(cm, "Goto line", function(str) {
         var num;
-        if (str && !isNaN(num = Number(str)) && num == num|0 && num > 0)
+        if (str && !isNaN(num = Number(str)) && num == (num|0) && num > 0)
           cm.setCursor(num - 1);
       });
     },
diff --git a/test/emacs_test.js b/test/emacs_test.js
index ccbd6ce491..01db618b24 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -138,4 +138,10 @@
     cm.triggerOnKeyDown(fakeEvent("Ctrl-S"));
     is(saved, "hi");
   }, {value: "hi", keyMap: "emacs"});
+
+  testCM("gotoInvalidLineFloat", function(cm) {
+    cm.openDialog = function(_, cb) { cb("2.2"); };
+    cm.triggerOnKeyDown(fakeEvent("Alt-G"));
+    cm.triggerOnKeyDown(fakeEvent("G"));
+  }, {value: "1\n2\n3\n4", keyMap: "emacs"});
 })();

From 8cc9eb8c9c47081bf4fb7edf7dd7e98f428cf34c Mon Sep 17 00:00:00 2001
From: Max Schaefer <xiemaisi@gmail.com>
Date: Fri, 10 Jul 2015 09:06:14 +0100
Subject: [PATCH 2211/4742] [erlang mode] Remove duplicate if conditions.

---
 mode/erlang/erlang.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index fbca292f03..5aed76a526 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -220,8 +220,6 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
         }else{
           return rval(state,stream,"function");
         }
-      }else if (is_member(w,operatorAtomWords)) {
-        return rval(state,stream,"operator");
       }else if (lookahead(stream) == ":") {
         if (w == "erlang") {
           return rval(state,stream,"builtin");
@@ -230,8 +228,6 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
         }
       }else if (is_member(w,["true","false"])) {
         return rval(state,stream,"boolean");
-      }else if (is_member(w,["true","false"])) {
-        return rval(state,stream,"boolean");
       }else{
         return rval(state,stream,"atom");
       }

From c2350fd4eea27fcb0a4fbc6e121ac62c0c5de4e7 Mon Sep 17 00:00:00 2001
From: Max Schaefer <xiemaisi@gmail.com>
Date: Fri, 10 Jul 2015 09:19:25 +0100
Subject: [PATCH 2212/4742] [vim tests] Remove a few useless expressions

---
 test/vim_test.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/vim_test.js b/test/vim_test.js
index e9b7bec069..320a67b99e 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -390,7 +390,6 @@ testVim('%_skip_string', function(cm, vim, helpers) {
   helpers.doKeys(['%']);
   helpers.assertCursorAt(0,0);
 }, {value:'(")")'});
-(')')
 testVim('%_skip_comment', function(cm, vim, helpers) {
   cm.setCursor(0,0);
   helpers.doKeys(['%']);
@@ -3128,8 +3127,7 @@ testVim('zt==z<CR>', function(cm, vim, helpers){
 });
 
 var moveTillCharacterSandbox =
-  'The quick brown fox \n'
-  'jumped over the lazy dog.'
+  'The quick brown fox \n';
 testVim('moveTillCharacter', function(cm, vim, helpers){
   cm.setCursor(0, 0);
   // Search for the 'q'.
@@ -3176,9 +3174,6 @@ testVim('searchForPipe', function(cm, vim, helpers){
 
 
 var scrollMotionSandbox =
-  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'
-  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'
-  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n'
   '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n';
 testVim('scrollMotion', function(cm, vim, helpers){
   var prevCursor, prevScrollInfo;

From 9a532d3ca683e3810a777506314feda15a37b74a Mon Sep 17 00:00:00 2001
From: Max Schaefer <xiemaisi@gmail.com>
Date: Fri, 10 Jul 2015 10:08:56 +0100
Subject: [PATCH 2213/4742] [vim mode] Fix notification about lacking pattern
 support in sort command.

---
 keymap/vim.js    | 2 +-
 test/vim_test.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index d50cc4af45..14897a84da 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4308,7 +4308,7 @@
               if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
               number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
             }
-            if (args.eatSpace() && args.match(/\/.*\//)) { 'patterns not supported'; }
+            if (args.match(/\/.*\//)) { return 'patterns not supported'; }
           }
         }
         var err = parseArgs();
diff --git a/test/vim_test.js b/test/vim_test.js
index 320a67b99e..855cb8825e 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3392,6 +3392,14 @@ testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
   helpers.doEx('sort! d');
   eq('a3\nb2\nc1\nz\ny', cm.getValue());
 }, { value: 'a3\nz\nc1\ny\nb2'});
+testVim('ex_sort_patterns_not_supported', function(cm, vim, helpers) {
+  var notified = false;
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    notified = /patterns not supported/.test(text);
+  });
+  helpers.doEx('sort /abc/');
+  is(notified, 'No notification.');
+});
 // test for :global command
 testVim('ex_global', function(cm, vim, helpers) {
   cm.setCursor(0, 0);

From b8c4ea12a7c472981c0a35dd20c79bbebb01bc69 Mon Sep 17 00:00:00 2001
From: Angelo <angelo.zerr@gmail.com>
Date: Fri, 10 Jul 2015 16:13:26 +0200
Subject: [PATCH 2214/4742] [tern addon] Use displayName if it exists for
 completion display text

Tern completion for required module returns name (module wuith quote)
and displayName (module without quote). This PR gives the capability
to display completion for required module without quote.
---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index dfb19b8451..42c3cdee24 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -216,7 +216,7 @@
         var completion = data.completions[i], className = typeToIcon(completion.type);
         if (data.guess) className += " " + cls + "guess";
         completions.push({text: completion.name + after,
-                          displayText: completion.name,
+                          displayText: completion.displayName || completion.name,
                           className: className,
                           data: completion});
       }

From baad003136869696e044f7cd6f48f973512fb527 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Sat, 11 Jul 2015 03:12:19 -0700
Subject: [PATCH 2215/4742] [sublime keymap] Fix scrollLine[Up/Down] bindings

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 441456f58c..1d9a9d8ef6 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -55,7 +55,9 @@
   cmds[map["Alt-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
   cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
 
-  cmds[map[ctrl + "Up"] = "scrollLineUp"] = function(cm) {
+  var scrollLineCombo = mac ? "Ctrl-Alt-" : "Ctrl-";
+
+  cmds[map[scrollLineCombo + "Up"] = "scrollLineUp"] = function(cm) {
     var info = cm.getScrollInfo();
     if (!cm.somethingSelected()) {
       var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local");
@@ -64,7 +66,7 @@
     }
     cm.scrollTo(null, info.top - cm.defaultTextHeight());
   };
-  cmds[map[ctrl + "Down"] = "scrollLineDown"] = function(cm) {
+  cmds[map[scrollLineCombo + "Down"] = "scrollLineDown"] = function(cm) {
     var info = cm.getScrollInfo();
     if (!cm.somethingSelected()) {
       var visibleTopLine = cm.lineAtHeight(info.top, "local")+1;

From 002688377fc8c5f0f5d6229259fbfddf05ed62b4 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Sat, 11 Jul 2015 03:31:27 -0700
Subject: [PATCH 2216/4742] [travis] Use stable node and container
 infrastructure

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 20fd86b6a5..52b8b81591 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
 language: node_js
 node_js:
-  - 0.10
+  - stable
+sudo: false

From 9abd9e63331e4fa3db61a4159acab222c8490112 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jul 2015 14:51:00 +0200
Subject: [PATCH 2217/4742] Work around bad interaction between above-line
 widgets and gutter backgrounds

Issue #3357
---
 lib/codemirror.css |  8 +++++++-
 lib/codemirror.js  | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index c4aa3c0635..08eb6bbf29 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -202,7 +202,13 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 .CodeMirror-gutter-wrapper {
   position: absolute;
   z-index: 4;
-  height: 100%;
+  background: none !important;
+  border: none !important;
+}
+.CodeMirror-gutter-background {
+  position: absolute;
+  top: 0; bottom: 0;
+  z-index: 4;
 }
 .CodeMirror-gutter-elt {
   position: absolute;
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 221dacd8d5..36ce1913d9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -955,12 +955,22 @@
       lineView.node.removeChild(lineView.gutter);
       lineView.gutter = null;
     }
+    if (lineView.gutterBackground) {
+      lineView.node.removeChild(lineView.gutterBackground);
+      lineView.gutterBackground = null;
+    }
+    if (lineView.line.gutterClass) {
+      var wrap = ensureLineWrapped(lineView);
+      lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
+                                      "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
+                                      "px; width: " + dims.gutterTotalWidth + "px");
+      wrap.insertBefore(lineView.gutterBackground, lineView.text);
+    }
     var markers = lineView.line.gutterMarkers;
     if (cm.options.lineNumbers || markers) {
       var wrap = ensureLineWrapped(lineView);
       var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
-                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
-                                             "px; width: " + dims.gutterTotalWidth + "px");
+                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px");
       cm.display.input.setUneditable(gutterWrap);
       wrap.insertBefore(gutterWrap, lineView.text);
       if (lineView.line.gutterClass)

From 9332d055660824849dfdfab1788b52c2aa8ece80 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 13 Jul 2015 14:53:37 +0200
Subject: [PATCH 2218/4742] Fix test for gutter line classes

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

diff --git a/test/test.js b/test/test.js
index f3e9da7645..0002be9b99 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1583,7 +1583,7 @@ testCM("addLineClass", function(cm) {
   eq(byClassName(lines, "foo").length, 2);
   eq(byClassName(lines, "bar").length, 1);
   eq(byClassName(lines, "baz").length, 1);
-  eq(byClassName(lines, "gutter-class").length, 1);
+  eq(byClassName(lines, "gutter-class").length, 2); // Gutter classes are reflected in 2 nodes
   cm.removeLineClass(0, "text", "foo");
   cls(0, "bar", null, null, null);
   cm.removeLineClass(0, "text", "foo");

From 4c4c0c6f2425056dfc894262515a21cc5a6dca65 Mon Sep 17 00:00:00 2001
From: belhaj <ghazibelhaj@gmail.com>
Date: Sat, 11 Jul 2015 02:01:28 -0500
Subject: [PATCH 2219/4742] [.npmignore] Add

---
 .npmignore | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .npmignore

diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000000..54322f9e2a
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,9 @@
+/node_modules
+/demo
+/doc
+/test
+/index.html
+/mode/*/*test.js
+/mode/*/*.html
+/mode/index.html
+.*

From bb3aac30b46c24004777f8f7a0014e559a764d51 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Jul 2015 10:32:37 +0200
Subject: [PATCH 2220/4742] [search addon] Add some blank lines

---
 addon/search/search.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addon/search/search.js b/addon/search/search.js
index 761cb9492e..4bcfbe1be1 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -18,6 +18,7 @@
     mod(CodeMirror);
 })(function(CodeMirror) {
   "use strict";
+
   function searchOverlay(query, caseInsensitive) {
     if (typeof query == "string")
       query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), caseInsensitive ? "gi" : "g");
@@ -42,16 +43,20 @@
     this.posFrom = this.posTo = this.lastQuery = this.query = null;
     this.overlay = null;
   }
+
   function getSearchState(cm) {
     return cm.state.search || (cm.state.search = new SearchState());
   }
+
   function queryCaseInsensitive(query) {
     return typeof query == "string" && query == query.toLowerCase();
   }
+
   function getSearchCursor(cm, query, pos) {
     // Heuristic: if the query string is all lowercase, do a case insensitive search.
     return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
   }
+
   function dialog(cm, text, shortText, deflt, f) {
     if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
     else f(prompt(shortText, deflt));
@@ -60,6 +65,7 @@
     if (cm.openConfirm) cm.openConfirm(text, fs);
     else if (confirm(shortText)) fs[0]();
   }
+
   function parseQuery(query) {
     var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
     if (isRE) {
@@ -70,8 +76,10 @@
       query = /x^/;
     return query;
   }
+
   var queryDialog =
     'Search: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
+
   function doSearch(cm, rev) {
     var state = getSearchState(cm);
     if (state.query) return findNext(cm, rev);
@@ -92,6 +100,7 @@
       });
     });
   }
+
   function findNext(cm, rev) {cm.operation(function() {
     var state = getSearchState(cm);
     var cursor = getSearchCursor(cm, state.query, rev ? state.posFrom : state.posTo);
@@ -103,6 +112,7 @@
     cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
     state.posFrom = cursor.from(); state.posTo = cursor.to();
   });}
+
   function clearSearch(cm) {cm.operation(function() {
     var state = getSearchState(cm);
     state.lastQuery = state.query;
@@ -116,6 +126,7 @@
     'Replace: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
   var replacementQueryDialog = 'With: <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
   var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>";
+
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
     var query = cm.getSelection() || getSearchState(cm).lastQuery;

From 404e30823680c94203794a78aa0f91d31a9cdb41 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Jul 2015 10:57:41 +0200
Subject: [PATCH 2221/4742] [search addon] Add persistent search command

Issue #3337
Issue #3338
---
 addon/search/search.js | 54 ++++++++++++++++++++++++++++++------------
 demo/search.html       |  6 +++--
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 4bcfbe1be1..9f804b1512 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -57,10 +57,20 @@
     return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
   }
 
+  function persistentDialog(cm, text, deflt, f) {
+    cm.openDialog(text, f, {
+      value: deflt,
+      selectValueOnOpen: true,
+      closeOnEnter: false,
+      onClose: function() { clearSearch(cm); }
+    });
+  }
+
   function dialog(cm, text, shortText, deflt, f) {
     if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
     else f(prompt(shortText, deflt));
   }
+
   function confirmDialog(cm, text, shortText, fs) {
     if (cm.openConfirm) cm.openConfirm(text, fs);
     else if (confirm(shortText)) fs[0]();
@@ -80,25 +90,38 @@
   var queryDialog =
     'Search: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
 
-  function doSearch(cm, rev) {
+  function startSearch(cm, state, query) {
+    state.queryText = query;
+    state.query = parseQuery(query);
+    cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query));
+    state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query));
+    cm.addOverlay(state.overlay);
+    if (cm.showMatchesOnScrollbar) {
+      if (state.annotate) { state.annotate.clear(); state.annotate = null; }
+      state.annotate = cm.showMatchesOnScrollbar(state.query, queryCaseInsensitive(state.query));
+    }
+  }
+
+  function doSearch(cm, rev, persistent) {
     var state = getSearchState(cm);
     if (state.query) return findNext(cm, rev);
     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);
-        cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query));
-        state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query));
-        cm.addOverlay(state.overlay);
-        if (cm.showMatchesOnScrollbar) {
-          if (state.annotate) { state.annotate.clear(); state.annotate = null; }
-          state.annotate = cm.showMatchesOnScrollbar(state.query, queryCaseInsensitive(state.query));
-        }
-        state.posFrom = state.posTo = cm.getCursor();
-        findNext(cm, rev);
+    if (persistent && cm.openDialog) {
+      persistentDialog(cm, queryDialog, q, function(query, event) {
+        CodeMirror.e_stop(event);
+        if (!query) return;
+        if (query != state.queryText) startSearch(cm, state, query);
+        findNext(cm, event.shiftKey);
       });
-    });
+    } else {
+      dialog(cm, queryDialog, "Search for:", q, function(query) {
+        if (query && !state.query) cm.operation(function() {
+          startSearch(cm, state, query);
+          state.posFrom = state.posTo = cm.getCursor();
+          findNext(cm, rev);
+        });
+      });
+    }
   }
 
   function findNext(cm, rev) {cm.operation(function() {
@@ -170,6 +193,7 @@
   }
 
   CodeMirror.commands.find = function(cm) {clearSearch(cm); doSearch(cm);};
+  CodeMirror.commands.findPersistent = function(cm) {clearSearch(cm); doSearch(cm, false, true);};
   CodeMirror.commands.findNext = doSearch;
   CodeMirror.commands.findPrev = function(cm) {doSearch(cm, true);};
   CodeMirror.commands.clearSearch = clearSearch;
diff --git a/demo/search.html b/demo/search.html
index 04ba7ac09a..21c34251e2 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -71,18 +71,20 @@ <h2>Search/Replace Demo</h2>
     <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   mode: "text/html",
-  lineNumbers: true
+  lineNumbers: true,
+  extraKeys: {"Alt-F": "findPersistent"}
 });
 </script>
 
     <p>Demonstration of primitive search/replace functionality. The
-    keybindings (which can be overridden by custom keymaps) are:</p>
+    keybindings (which can be configured with custom keymaps) are:</p>
     <dl>
       <dt>Ctrl-F / Cmd-F</dt><dd>Start searching</dd>
       <dt>Ctrl-G / Cmd-G</dt><dd>Find next</dd>
       <dt>Shift-Ctrl-G / Shift-Cmd-G</dt><dd>Find previous</dd>
       <dt>Shift-Ctrl-F / Cmd-Option-F</dt><dd>Replace</dd>
       <dt>Shift-Ctrl-R / Shift-Cmd-Option-F</dt><dd>Replace all</dd>
+      <dt>Alt-F</dt><dd>Persistent search (dialog doesn't autoclose, enter to find next, shift-enter to find previous)</dd>
     </dl>
     <p>Searching is enabled by
     including <a href="../addon/search/search.js">addon/search/search.js</a>

From bafd405ef0df3cf643cef35ad1fcb85cae2fedb2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Jul 2015 11:14:12 +0200
Subject: [PATCH 2222/4742] [markdown mode] Fix broken scanning for markdown=1
 attribute

---
 mode/markdown/markdown.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index bef37b8ab6..bbc3dd8f99 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -447,11 +447,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (ch === '<' && stream.match(/^\w/, false)) {
-      if (stream.string.indexOf(">") != -1) {
-        var atts = stream.string.substring(1,stream.string.indexOf(">"));
-        if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) {
-          state.md_inside = true;
-        }
+      var end = stream.string.indexOf(">", stream.pos);
+      if (end != -1) {
+        var atts = stream.string.substring(stream.start, end);
+        if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) state.md_inside = true;
       }
       stream.backUp(1);
       state.htmlState = CodeMirror.startState(htmlMode);

From ff04f127ba8a736b97d06c505fb85d976e3f2980 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 14 Jul 2015 11:24:41 +0200
Subject: [PATCH 2223/4742] [markdown mode] Recognize HTML comments

Closes #3384
---
 mode/markdown/markdown.js | 5 +++--
 mode/xml/xml.js           | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index bbc3dd8f99..87c3ad30ad 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -202,7 +202,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function htmlBlock(stream, state) {
     var style = htmlMode.token(stream, state.htmlState);
-    if ((htmlFound && state.htmlState.tagStart === null && !state.htmlState.context) ||
+    if ((htmlFound && state.htmlState.tagStart === null &&
+         (!state.htmlState.context && state.htmlState.tokenize.isInText)) ||
         (state.md_inside && stream.current().indexOf(">") > -1)) {
       state.f = inlineNormal;
       state.block = blockNormal;
@@ -446,7 +447,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return type + linkemail;
     }
 
-    if (ch === '<' && stream.match(/^\w/, false)) {
+    if (ch === '<' && stream.match(/^(!--|\w)/, false)) {
       var end = stream.string.indexOf(">", stream.pos);
       if (end != -1) {
         var atts = stream.string.substring(stream.start, end);
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 2f3b8f87a0..5ad21720fb 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -109,6 +109,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       return null;
     }
   }
+  inText.isInText = true;
 
   function inTag(stream, state) {
     var ch = stream.next();

From 0c2264b44b085630113dc499eccaca5b544e5d77 Mon Sep 17 00:00:00 2001
From: M1cha <sigmaepsilon92@gmail.com>
Date: Tue, 14 Jul 2015 11:06:16 +0200
Subject: [PATCH 2224/4742] [squirrel mode] Add

---
 mode/clike/clike.js   | 13 +++++++++++++
 mode/clike/index.html |  3 ++-
 mode/index.html       |  1 +
 mode/meta.js          |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index f1a7e7a957..e13b79c14c 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -588,4 +588,17 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: "brace"}
   });
 
+  def("text/x-squirrel", {
+    name: "clike",
+    keywords: words("base break clone continue const default delete enum extends function in class" +
+                    " foreach local resume return this throw typeof yield constructor instanceof static"),
+    types: words(cTypes),
+    blockKeywords: words("case catch class else for foreach if switch try while"),
+    defKeywords: words("function local class"),
+    typeFirstDefinitions: true,
+    atoms: words("true false null"),
+    hooks: {"#": cppHook},
+    modeProps: {fold: ["brace", "include"]}
+  });
+
 });
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 8b386d22e0..226c6ce846 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -247,5 +247,6 @@ <h2>Scala example</h2>
     (Java), <code>text/x-csharp</code> (C#),
     <code>text/x-objectivec</code> (Objective-C),
     <code>text/x-scala</code> (Scala), <code>text/x-vertex</code>
-    and <code>x-shader/x-fragment</code> (shader programs).</p>
+    and <code>x-shader/x-fragment</code> (shader programs),
+    <code>text/x-squirrel</code> (Squirrel).</p>
 </article>
diff --git a/mode/index.html b/mode/index.html
index 7629561932..ca1703aff9 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -120,6 +120,7 @@ <h2>Language modes</h2>
       <li><a href="stylus/index.html">Stylus</a></li>
       <li><a href="sql/index.html">SQL</a> (several dialects)</li>
       <li><a href="sparql/index.html">SPARQL</a></li>
+      <li><a href="clike/index.html">Squirrel</a></li>
       <li><a href="swift/index.html">Swift</a></li>
       <li><a href="stex/index.html">sTeX, LaTeX</a></li>
       <li><a href="tcl/index.html">Tcl</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index bf0929eba6..bc9f121d04 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -117,6 +117,7 @@
     {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
     {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+    {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
     {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
     {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},

From 01f2a1bedd4069c82afd273de27ba01e2609d9a8 Mon Sep 17 00:00:00 2001
From: Jeff Blaisdell <jeff.blaisdell@gmail.com>
Date: Tue, 14 Jul 2015 10:31:24 -0500
Subject: [PATCH 2225/4742] [search addon] Clear queryString on search reset,
 add scroll margin

Issue #3337
---
 addon/search/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 9f804b1512..ed3c477550 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -132,7 +132,7 @@
       if (!cursor.find(rev)) return;
     }
     cm.setSelection(cursor.from(), cursor.to());
-    cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
+    cm.scrollIntoView({from: cursor.from(), to: cursor.to()}, 20);
     state.posFrom = cursor.from(); state.posTo = cursor.to();
   });}
 
@@ -140,7 +140,7 @@
     var state = getSearchState(cm);
     state.lastQuery = state.query;
     if (!state.query) return;
-    state.query = null;
+    state.query = state.queryText = null;
     cm.removeOverlay(state.overlay);
     if (state.annotate) { state.annotate.clear(); state.annotate = null; }
   });}

From 127850e7106ade846a3a3e528f52414c682a3113 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 15 Jul 2015 09:58:36 +0200
Subject: [PATCH 2226/4742] Force display update when measuring during
 operation redrew a line

When something is redraw, we definitely need to do the consistency-
ensuring that is done by a display update.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 36ce1913d9..8246529c6c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2555,10 +2555,12 @@
   function prepareMeasureForLine(cm, line) {
     var lineN = lineNo(line);
     var view = findViewForLine(cm, lineN);
-    if (view && !view.text)
+    if (view && !view.text) {
       view = null;
-    else if (view && view.changes)
+    } else if (view && view.changes) {
       updateLineForChanges(cm, view, lineN, getDimensions(cm));
+      cm.curOp.forceUpdate = true;
+    }
     if (!view)
       view = updateExternalMeasurement(cm, line);
 

From 78c619e7117b6e13722cad322f918665664a2223 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 15 Jul 2015 10:39:39 +0200
Subject: [PATCH 2227/4742] [show-hint addon] Don't fire update event until
 async response comes back

See http://discuss.codemirror.net/t/tern-webworker-causing-hint-flickering/300
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index fc85a10bb7..a14c652dd7 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -99,7 +99,6 @@
 
     update: function(first) {
       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), first);
       } else {
@@ -111,6 +110,7 @@
     },
 
     finishUpdate: function(data, first) {
+      if (this.data) CodeMirror.signal(this.data, "update");
       if (data && this.data && CodeMirror.cmpPos(data.from, this.data.from)) data = null;
       this.data = data;
 

From e7b3d6992c750cdebde3c607334a602c8467b0c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 16 Jul 2015 22:34:38 +0200
Subject: [PATCH 2228/4742] Add a code of conduct

---
 README.md  | 27 +++++++++++++++++++++------
 index.html |  5 ++++-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 38156a7427..77824ebdbf 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,25 @@
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)  
 [Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?again)](https://marijnhaverbeke.nl/fund/)
 
-CodeMirror is a JavaScript component that provides a code editor in
-the browser. When a mode is available for the language you are coding
-in, it will color your code, and optionally help with indentation.
+CodeMirror is a versatile text editor implemented in JavaScript for
+the browser. It is specialized for editing code, and comes with over
+100 language modes and various addons that implement more advanced
+editing functionality.
 
-The project page is http://codemirror.net  
-The manual is at http://codemirror.net/doc/manual.html  
-The contributing guidelines are in [CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md)
+A rich programming API and a CSS theming system are available for
+customizing CodeMirror to fit your application, and extending it with
+new functionality.
+
+You can find more information (and the
+[manual](http://codemirror.net/doc/manual.html)) on the [project
+page](http://codemirror.net). For questions and discussion, use the
+[discussion forum](http://discuss.codemirror.net/).
+
+See
+[CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md)
+for contributing guidelines.
+
+The CodeMirror community aims to be welcoming to everybody. We use the
+[Contributor Covenant
+(1.1)](http://contributor-covenant.org/version/1/1/0/) as our code of
+conduct.
diff --git a/index.html b/index.html
index b769386c7e..ddb804a560 100644
--- a/index.html
+++ b/index.html
@@ -168,7 +168,10 @@ <h2>Community</h2>
   list, which is only used for major announcements (such as new
   versions). If needed, you can
   contact <a href="mailto:marijnh@gmail.com">the maintainer</a>
-  directly.</p>
+  directly. We aim to be an inclusive, welcoming community. To make
+  that explicit, we have
+  a <a href="http://contributor-covenant.org/version/1/1/0/">code of
+  conduct</a> that applies to communication around the project.</p>
 
   <p>A list of CodeMirror-related software that is not part of the
   main distribution is maintained

From da42989b854fe9545f283602e5df8c30cae4e598 Mon Sep 17 00:00:00 2001
From: Rrandom <emanonhere@gmail.com>
Date: Thu, 16 Jul 2015 21:16:13 +0800
Subject: [PATCH 2229/4742] [rust mode] Update primitive types

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

diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index 2bffa9a6aa..4970b2f7cb 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -26,7 +26,7 @@ CodeMirror.defineMode("rust", function() {
   };
   var typeKeywords = function() {
     var keywords = {"fn": "fn", "block": "fn", "obj": "obj"};
-    var atoms = "bool uint int i8 i16 i32 i64 u8 u16 u32 u64 float f32 f64 str char".split(" ");
+    var atoms = "bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 str char isize usize".split(" ");
     for (var i = 0, e = atoms.length; i < e; ++i) keywords[atoms[i]] = "atom";
     return keywords;
   }();

From 76582eeb03ab5c1ddf953066bef922810f1001bb Mon Sep 17 00:00:00 2001
From: Sungho Kim <sungho-kim@nhnent.com>
Date: Fri, 17 Jul 2015 15:58:34 +0900
Subject: [PATCH 2230/4742] [textarea input] Don't disable poll() when input
 has selection during composing

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8246529c6c..22082263b8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1398,7 +1398,7 @@
       // 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.contextMenuPending || !cm.state.focused ||
-          (hasSelection(input) && !prevInput) ||
+          (hasSelection(input) && !prevInput && !this.composing) ||
           isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
         return false;
 

From 09e14b3dc85c1f7153a8749ba2520889fcec0a4b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Jul 2015 08:11:59 +0200
Subject: [PATCH 2231/4742] [show-hint addon] Fix bad handling of non-word
 tokens in fromList hinter

---
 addon/hint/show-hint.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index a14c652dd7..980da5235d 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -352,18 +352,20 @@
 
   CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
+    var to = CodeMirror.Pos(cur.line, token.end);
+    if (token.string && /\w/.test(token.string[token.string.length - 1])) {
+      var term = token.string, from = CodeMirror.Pos(cur.line, token.start);
+    } else {
+      var term = "", from = to;
+    }
     var found = [];
     for (var i = 0; i < options.words.length; i++) {
       var word = options.words[i];
-      if (word.slice(0, token.string.length) == token.string)
+      if (word.slice(0, term.length) == term)
         found.push(word);
     }
 
-    if (found.length) return {
-      list: found,
-      from: CodeMirror.Pos(cur.line, token.start),
-            to: CodeMirror.Pos(cur.line, token.end)
-    };
+    if (found.length) return {list: found, from: from, to: to};
   });
 
   CodeMirror.commands.autocomplete = CodeMirror.showHint;

From a84b756b4c5f2b921f2e16fafc811805a8e82dd0 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Mon, 20 Jul 2015 00:37:03 -0700
Subject: [PATCH 2232/4742] [vim] Make it easier to override color on blinking
 cursor

---
 lib/codemirror.css | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 08eb6bbf29..318d25f02d 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -63,21 +63,22 @@
   -webkit-animation: blink 1.06s steps(1) infinite;
   -moz-animation: blink 1.06s steps(1) infinite;
   animation: blink 1.06s steps(1) infinite;
+  background-color: #7e7;
 }
 @-moz-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
 }
 @-webkit-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
 }
 @keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
 }
 
 /* Can style cursor different in overwrite (non-insert) mode */

From 83f2bad66d9a423a0ae19833696bf393a9cbf1fd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Jul 2015 09:59:12 +0200
Subject: [PATCH 2233/4742] Be more explicit about event timing for change and
 changes

Issue #3387
---
 doc/manual.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 49faee7982..78b67731c1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -510,13 +510,17 @@ <h2>Events</h2>
       an array of strings representing the text that replaced the
       changed range (split by line). <code>removed</code> is the text
       that used to be between <code>from</code> and <code>to</code>,
-      which is overwritten by this change.</dd>
+      which is overwritten by this change. This event is
+      fired <em>before</em> the end of
+      an <a href="#operation">operation</a>, before the DOM updates
+      happen.</dd>
 
       <dt id="event_changes"><code><strong>"changes"</strong> (instance: CodeMirror, changes: array&lt;object&gt;)</code></dt>
       <dd>Like the <a href="#event_change"><code>"change"</code></a>
       event, but batched per <a href="#operation">operation</a>,
       passing an array containing all the changes that happened in the
-      operation.</dd>
+      operation. This event is fired after the operation finished, and
+      display changes it makes will trigger a new operation.</dd>
 
       <dt id="event_beforeChange"><code><strong>"beforeChange"</strong> (instance: CodeMirror, changeObj: object)</code></dt>
       <dd>This event is fired before a change is applied, and its

From 04ea39c64af2de0ca5141202aebc730408df65bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Jul 2015 11:16:44 +0200
Subject: [PATCH 2234/4742] Allow precise line separator to be specified
 through lineSeparator option

Issue #3395
---
 doc/manual.html   | 10 ++++++
 lib/codemirror.js | 87 +++++++++++++++++++++++++++++++++--------------
 test/test.js      | 15 ++++++++
 3 files changed, 86 insertions(+), 26 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 78b67731c1..47afe3e748 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -236,6 +236,16 @@ <h2>Configuration</h2>
       mode names to their constructors, and the second maps MIME types
       to mode specs.</dd>
 
+      <dt id="option_lineSeparator"><code><strong>lineSeparator</strong>: string|null</code></dt>
+      <dd>Explicitly set the line separator for the editor. By default
+      (value <code>null</code>), the document will be split on CRLFs
+      as well as lone CRs and LFs, and a single LF will be used as
+      line separator in all output (such
+      as <a href="#getValue"><code>getValue</code></a>). When a
+      specific string is given, lines will only be split on that
+      string, and output will, by default, use that same
+      separator.</dd>
+
       <dt id="option_theme"><code><strong>theme</strong>: string</code></dt>
       <dd>The theme to style the editor with. You must make sure the
       CSS file defining the corresponding <code>.cm-s-[name]</code>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 22082263b8..29892a51c7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -65,7 +65,7 @@
     setGuttersForLineNumbers(options);
 
     var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(doc, options.mode);
+    if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator);
     this.doc = doc;
 
     var input = new CodeMirror.inputStyles[options.inputStyle](this);
@@ -1092,13 +1092,18 @@
     if (!sel) sel = doc.sel;
 
     var paste = cm.state.pasteIncoming || origin == "paste";
-    var textLines = splitLines(inserted), multiPaste = null;
+    var textLines = doc.splitLines(inserted), multiPaste = null;
     // When pasing N lines into N selections, insert one line per selection
     if (paste && sel.ranges.length > 1) {
-      if (lastCopied && lastCopied.join("\n") == inserted)
-        multiPaste = sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines);
-      else if (textLines.length == sel.ranges.length)
+      if (lastCopied && lastCopied.join("\n") == inserted) {
+        if (sel.ranges.length % lastCopied.length == 0) {
+          multiPaste = [];
+          for (var i = 0; i < lastCopied.length; i++)
+            multiPaste.push(doc.splitLines(lastCopied[i]));
+        }
+      } else if (textLines.length == sel.ranges.length) {
         multiPaste = map(textLines, function(l) { return [l]; });
+      }
     }
 
     // Normal behavior is to insert the new text into every selection
@@ -1766,7 +1771,7 @@
         var toNode = display.view[toIndex + 1].node.previousSibling;
       }
 
-      var newText = splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
+      var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
       var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
       while (newText.length > 1 && oldText.length > 1) {
         if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
@@ -1922,7 +1927,7 @@
   }
 
   function domTextBetween(cm, from, to, fromLine, toLine) {
-    var text = "", closing = false;
+    var text = "", closing = false, lineSep = cm.doc.lineSep || "\n";
     function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
     function walk(node) {
       if (node.nodeType == 1) {
@@ -1936,7 +1941,7 @@
         if (markerID) {
           var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
           if (found.length && (range = found[0].find()))
-            text += getBetween(cm.doc, range.from, range.to).join("\n");
+            text += getBetween(cm.doc, range.from, range.to).join(lineSep);
           return;
         }
         if (node.getAttribute("contenteditable") == "false") return;
@@ -1948,7 +1953,7 @@
         var val = node.nodeValue;
         if (!val) return;
         if (closing) {
-          text += "\n";
+          text += lineSep;
           closing = false;
         }
         text += val;
@@ -3797,7 +3802,9 @@
           text[i] = reader.result;
           if (++read == n) {
             pos = clipPos(cm.doc, pos);
-            var change = {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"};
+            var change = {from: pos, to: pos,
+                          text: cm.doc.splitLines(text.join(cm.doc.lineSep || "\n")),
+                          origin: "paste"};
             makeChange(cm.doc, change);
             setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
           }
@@ -4480,7 +4487,7 @@
   function replaceRange(doc, code, from, to, origin) {
     if (!to) to = from;
     if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
-    if (typeof code == "string") code = splitLines(code);
+    if (typeof code == "string") code = doc.splitLines(code);
     makeChange(doc, {from: from, to: to, text: code, origin: origin});
   }
 
@@ -5275,6 +5282,22 @@
     clearCaches(cm);
     regChange(cm);
   }, true);
+  option("lineSeparator", null, function(cm, val) {
+    cm.doc.lineSep = val;
+    if (!val) return;
+    var newBreaks = [], lineNo = cm.doc.first;
+    cm.doc.iter(function(line) {
+      for (var pos = 0;;) {
+        var found = line.text.indexOf(val, pos);
+        if (found == -1) break;
+        pos = found + val.length;
+        newBreaks.push(Pos(lineNo, found));
+      }
+      lineNo++;
+    });
+    for (var i = newBreaks.length - 1; i >= 0; i--)
+      replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
+  });
   option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
     if (old != CodeMirror.Init) cm.refresh();
@@ -5625,7 +5648,8 @@
             } else if (cur.line > cm.doc.first) {
               var prev = getLine(cm.doc, cur.line - 1).text;
               if (prev)
-                cm.replaceRange(line.charAt(0) + "\n" + prev.charAt(prev.length - 1),
+                cm.replaceRange(line.charAt(0) + (cm.doc.lineSep || "\n") +
+                                prev.charAt(prev.length - 1),
                                 Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
             }
           }
@@ -5639,7 +5663,7 @@
         var len = cm.listSelections().length;
         for (var i = 0; i < len; i++) {
           var range = cm.listSelections()[i];
-          cm.replaceRange("\n", range.anchor, range.head, "+input");
+          cm.replaceRange(cm.doc.lineSep || "\n", range.anchor, range.head, "+input");
           cm.indentLine(range.from().line + 1, null, true);
           ensureCursorVisible(cm);
         }
@@ -6893,6 +6917,10 @@
           txt.setAttribute("role", "presentation");
           txt.setAttribute("cm-text", "\t");
           builder.col += tabWidth;
+        } else if (m[0] == "\r" || m[0] == "\n") {
+          var txt = content.appendChild(elt("span", m[0] == "\r" ? "␍" : "␤", "cm-invalidchar"));
+          txt.setAttribute("cm-text", m[0]);
+          builder.col += 1;
         } else {
           var txt = builder.cm.options.specialCharPlaceholder(m[0]);
           txt.setAttribute("cm-text", m[0]);
@@ -7238,8 +7266,8 @@
   };
 
   var nextDocId = 0;
-  var Doc = CodeMirror.Doc = function(text, mode, firstLine) {
-    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
+  var Doc = CodeMirror.Doc = function(text, mode, firstLine, lineSep) {
+    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep);
     if (firstLine == null) firstLine = 0;
 
     BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
@@ -7253,8 +7281,9 @@
     this.history = new History(null);
     this.id = ++nextDocId;
     this.modeOption = mode;
+    this.lineSep = lineSep;
 
-    if (typeof text == "string") text = splitLines(text);
+    if (typeof text == "string") text = this.splitLines(text);
     updateDoc(this, {from: start, to: start, text: text});
     setSelection(this, simpleSelection(start), sel_dontScroll);
   };
@@ -7284,12 +7313,12 @@
     getValue: function(lineSep) {
       var lines = getLines(this, this.first, this.first + this.size);
       if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
+      return lines.join(lineSep || this.lineSep || "\n");
     },
     setValue: docMethodOp(function(code) {
       var top = Pos(this.first, 0), last = this.first + this.size - 1;
       makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: splitLines(code), origin: "setValue", full: true}, true);
+                        text: this.splitLines(code), origin: "setValue", full: true}, true);
       setSelection(this, simpleSelection(top));
     }),
     replaceRange: function(code, from, to, origin) {
@@ -7300,7 +7329,7 @@
     getRange: function(from, to, lineSep) {
       var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
       if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
+      return lines.join(lineSep || this.lineSep || "\n");
     },
 
     getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
@@ -7366,13 +7395,13 @@
         lines = lines ? lines.concat(sel) : sel;
       }
       if (lineSep === false) return lines;
-      else return lines.join(lineSep || "\n");
+      else return lines.join(lineSep || this.lineSep || "\n");
     },
     getSelections: function(lineSep) {
       var parts = [], ranges = this.sel.ranges;
       for (var i = 0; i < ranges.length; i++) {
         var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        if (lineSep !== false) sel = sel.join(lineSep || "\n");
+        if (lineSep !== false) sel = sel.join(lineSep || this.lineSep || "\n");
         parts[i] = sel;
       }
       return parts;
@@ -7387,7 +7416,7 @@
       var changes = [], sel = this.sel;
       for (var i = 0; i < sel.ranges.length; i++) {
         var range = sel.ranges[i];
-        changes[i] = {from: range.from(), to: range.to(), text: splitLines(code[i]), origin: origin};
+        changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
       }
       var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
       for (var i = changes.length - 1; i >= 0; i--)
@@ -7537,7 +7566,8 @@
     },
 
     copy: function(copyHistory) {
-      var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first);
+      var doc = new Doc(getLines(this, this.first, this.first + this.size),
+                        this.modeOption, this.first, this.lineSep);
       doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
       doc.sel = this.sel;
       doc.extend = false;
@@ -7553,7 +7583,7 @@
       var from = this.first, to = this.first + this.size;
       if (options.from != null && options.from > from) from = options.from;
       if (options.to != null && options.to < to) to = options.to;
-      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from);
+      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep);
       if (options.sharedHist) copy.history = this.history;
       (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
       copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
@@ -7582,7 +7612,12 @@
     iterLinkedDocs: function(f) {linkedDocs(this, f);},
 
     getMode: function() {return this.mode;},
-    getEditor: function() {return this.cm;}
+    getEditor: function() {return this.cm;},
+
+    splitLines: function(str) {
+      if (this.lineSep) return str.split(this.lineSep);
+      return splitLinesAuto(str);
+    }
   });
 
   // Public alias.
@@ -8388,7 +8423,7 @@
 
   // See if "".split is the broken IE version, if so, provide an
   // alternative way to split lines.
-  var splitLines = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
+  var splitLinesAuto = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
     var pos = 0, result = [], l = string.length;
     while (pos <= l) {
       var nl = string.indexOf("\n", pos);
diff --git a/test/test.js b/test/test.js
index 0002be9b99..7bc2c8e95b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2125,3 +2125,18 @@ test("core_addClass", function() {
   CodeMirror.addClass(node, "b");
   eq(node.className, "a b");
 });
+
+testCM("lineSeparator", function(cm) {
+  eq(cm.lineCount(), 3);
+  eq(cm.getLine(1), "bar\r");
+  eq(cm.getLine(2), "baz\rquux");
+  cm.setOption("lineSeparator", "\r");
+  eq(cm.lineCount(), 5);
+  eq(cm.getLine(4), "quux");
+  eq(cm.getValue(), "foo\rbar\r\rbaz\rquux");
+  eq(cm.getValue("\n"), "foo\nbar\n\nbaz\nquux");
+  cm.setOption("lineSeparator", null);
+  cm.setValue("foo\nbar\r\nbaz\rquux");
+  eq(cm.lineCount(), 4);
+}, {value: "foo\nbar\r\nbaz\rquux",
+    lineSeparator: "\n"});

From 0d9dbab4bcb3bcfef596e9ce475efff5507765bb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Jul 2015 11:21:22 +0200
Subject: [PATCH 2235/4742] Add lineSeparator method

Issue #3395
---
 doc/manual.html   |  6 ++++++
 lib/codemirror.js | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 47afe3e748..f10203359f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1997,6 +1997,12 @@ <h3 id="api_misc">Miscellaneous methods</h3>
       given an argument), or sets the overwrite mode to a specific
       state (when given an argument).</dd>
 
+      <dt id="lineSeparator"><code><strong>doc.lineSeparator</strong>()</code></dt>
+      <dd>Returns the preferred line separator string for this
+      document, as per the <a href="#option_lineSeparator">option</a>
+      by the same name. When that option is <code>null</code>, the
+      string <code>"\n"</code> is returned.</dd>
+
       <dt id="execCommand"><code><strong>cm.execCommand</strong>(name: string)</code></dt>
       <dd>Runs the <a href="#commands">command</a> with the given name on the editor.</dd>
 
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 29892a51c7..df0af5d2e3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1927,7 +1927,7 @@
   }
 
   function domTextBetween(cm, from, to, fromLine, toLine) {
-    var text = "", closing = false, lineSep = cm.doc.lineSep || "\n";
+    var text = "", closing = false, lineSep = cm.doc.lineSeparator();
     function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
     function walk(node) {
       if (node.nodeType == 1) {
@@ -3803,7 +3803,7 @@
           if (++read == n) {
             pos = clipPos(cm.doc, pos);
             var change = {from: pos, to: pos,
-                          text: cm.doc.splitLines(text.join(cm.doc.lineSep || "\n")),
+                          text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
                           origin: "paste"};
             makeChange(cm.doc, change);
             setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
@@ -5648,7 +5648,7 @@
             } else if (cur.line > cm.doc.first) {
               var prev = getLine(cm.doc, cur.line - 1).text;
               if (prev)
-                cm.replaceRange(line.charAt(0) + (cm.doc.lineSep || "\n") +
+                cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
                                 prev.charAt(prev.length - 1),
                                 Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
             }
@@ -5663,7 +5663,7 @@
         var len = cm.listSelections().length;
         for (var i = 0; i < len; i++) {
           var range = cm.listSelections()[i];
-          cm.replaceRange(cm.doc.lineSep || "\n", range.anchor, range.head, "+input");
+          cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
           cm.indentLine(range.from().line + 1, null, true);
           ensureCursorVisible(cm);
         }
@@ -7313,7 +7313,7 @@
     getValue: function(lineSep) {
       var lines = getLines(this, this.first, this.first + this.size);
       if (lineSep === false) return lines;
-      return lines.join(lineSep || this.lineSep || "\n");
+      return lines.join(lineSep || this.lineSeparator());
     },
     setValue: docMethodOp(function(code) {
       var top = Pos(this.first, 0), last = this.first + this.size - 1;
@@ -7329,7 +7329,7 @@
     getRange: function(from, to, lineSep) {
       var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
       if (lineSep === false) return lines;
-      return lines.join(lineSep || this.lineSep || "\n");
+      return lines.join(lineSep || this.lineSeparator());
     },
 
     getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
@@ -7395,13 +7395,13 @@
         lines = lines ? lines.concat(sel) : sel;
       }
       if (lineSep === false) return lines;
-      else return lines.join(lineSep || this.lineSep || "\n");
+      else return lines.join(lineSep || this.lineSeparator());
     },
     getSelections: function(lineSep) {
       var parts = [], ranges = this.sel.ranges;
       for (var i = 0; i < ranges.length; i++) {
         var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        if (lineSep !== false) sel = sel.join(lineSep || this.lineSep || "\n");
+        if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator());
         parts[i] = sel;
       }
       return parts;
@@ -7617,7 +7617,8 @@
     splitLines: function(str) {
       if (this.lineSep) return str.split(this.lineSep);
       return splitLinesAuto(str);
-    }
+    },
+    lineSeparator: function() { return this.lineSep || "\n"; }
   });
 
   // Public alias.

From 8cc06af2c04cd16b11d2a2ccc4c8ef52d9d080d4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Jul 2015 12:56:59 +0200
Subject: [PATCH 2236/4742] Mark relese 5.5.0

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

diff --git a/AUTHORS b/AUTHORS
index 3299d4fd0c..c8e17d0778 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -59,6 +59,7 @@ AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
 Bastian Müller
+belhaj
 Bem Jones-Bey
 benbro
 Beni Cherniavsky-Paskin
@@ -215,6 +216,7 @@ Jason San Jose
 Jason Siefken
 Jaydeep Solanki
 Jean Boussier
+Jeff Blaisdell
 jeffkenton
 Jeff Pickhardt
 jem (graphite)
@@ -272,6 +274,7 @@ Lorenzo Stoakes
 Luciano Longo
 Luke Stagner
 lynschinzer
+M1cha
 Madhura Jayaratne
 Maksim Lin
 Maksym Taran
@@ -307,6 +310,7 @@ mauricio
 Maximilian Hils
 Maxim Kraev
 Max Kirsch
+Max Schaefer
 Max Xiantu
 mbarkhau
 Metatheos
@@ -327,6 +331,7 @@ Mike Kadin
 MinRK
 Miraculix87
 misfo
+mkaminsky11
 mloginov
 Moritz Schwörer
 mps
@@ -354,6 +359,7 @@ Nisarg Jhaveri
 nlwillia
 noragrossman
 Norman Rzepka
+Oreoluwa Onatemowo
 pablo
 Page
 Panupong Pasupat
@@ -387,6 +393,7 @@ Robert Crossfield
 Roberto Abdelkader Martínez Pérez
 robertop23
 Robert Plummer
+Rrandom
 Ruslan Osmanov
 Ryan Prior
 sabaca
@@ -421,6 +428,7 @@ Stefan Borsje
 Steffen Beyer
 Steve O'Hara
 stoskov
+Sungho Kim
 Taha Jahangir
 Takuji Shimokawa
 Tarmil
diff --git a/doc/compress.html b/doc/compress.html
index 98b0f674f0..f64f4bbfaf 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.5.0;f=">5.5</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.4.0;f=">5.4</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.3.0;f=">5.3</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.2.0;f=">5.2</option>
diff --git a/doc/manual.html b/doc/manual.html
index f10203359f..441afea2ce 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.4.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.5.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 7f6563d967..77e98965a9 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-07-2015: <a href="http://codemirror.net/codemirror-5.5.zip">Version 5.5</a>:</p>
+
+  <ul class="rel-note">
+    <li>New option: <a href="manual.html#option_lineSeparator"><code>lineSeparator</code></a> (with corresponding <a href="manual.html#lineSeparator">method</a>)
+    <li>New themes: <a href="../demo/theme.html#dracula">dracula</a>, <a href="../demo/theme.html#seti">seti</a>, <a href="../demo/theme.html#yeti">yeti</a>, <a href="../demo/theme.html#material">material</a>, and <a href="../demo/theme.html#icecoder">icecoder</a></li>
+    <li>New modes: <a href="../mode/brainfuck/index.html">Brainfuck</a>, <a href="../mode/vhdl/index.html">VHDL</a>, Squirrel (<a href="../mode/clike/index.html">clike</a> dialect)</li>
+    <li>Define a <code>findPersistent</code> command in
+    the <a href="../demo/search.html">search</a> addon, for a dialog
+    that stays open as you cycle through matches</li>
+    <li>From this release on, the NPM module doesn't include documentation and demos</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.4.0...5.5.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">25-06-2015: <a href="http://codemirror.net/codemirror-5.4.zip">Version 5.4</a>:</p>
 
   <ul class="rel-note">
@@ -60,7 +73,7 @@ <h2>Version 5.x</h2>
     
     <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>New theme: <a href="../demo/theme.html?liquibyte">Liquibyte</a></li>
+    <li>New 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>
@@ -151,8 +164,8 @@ <h2>Version 4.x</h2>
     modes: <a href="../mode/dart/index.html">Dart</a>, <a href="../mode/ebnf/index.html">EBNF</a>, <a href="../mode/spreadsheet/index.html">spreadsheet</a>,
     and <a href="../mode/soy/index.html">Soy</a>.</li>
     <li>New <a href="../demo/panel.html">addon</a> to show persistent panels below/above an editor.</li>
-    <li>New themes: <a href="../demo/theme.html?zenburn">zenburn</a>
-    and <a href="../demo/theme.html?tomorrow-night-bright">tomorrow night
+    <li>New themes: <a href="../demo/theme.html#zenburn">zenburn</a>
+    and <a href="../demo/theme.html#tomorrow-night-bright">tomorrow night
     bright</a>.</li>
     <li>Allow ctrl-click to clear existing cursors.</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.8.0...4.9.0">list of patches</a>.</li>
@@ -256,7 +269,7 @@ <h2>Version 4.x</h2>
     <li>Rewritten <a href="../mode/jade/index.html">Jade</a> mode.</li>
     <li>Various improvements to <a href="../mode/shell/index.html">Shell</a> (support for more syntax) and <a href="../mode/python/index.html">Python</a> (better indentation) modes.</li>
     <li>New mode: <a href="../mode/cypher/index.html">Cypher</a>.</li>
-    <li>New theme: <a href="../demo/theme.html?neo">Neo</a>.</li>
+    <li>New theme: <a href="../demo/theme.html#neo">Neo</a>.</li>
     <li>Support direct styling options (color, line style, width) in the <a href="manual.html#addon_rulers">rulers</a> addon.</li>
     <li>Recognize per-editor configuration for the <a href="manual.html#addon_show-hint">show-hint</a> and <a href="manual.html#addon_foldcode">foldcode</a> addons.</li>
     <li>More intelligent scanning for existing close tags in <a href="manual.html#addon_closetag">closetag</a> addon.</li>
@@ -322,7 +335,7 @@ <h2>Version 3.x</h2>
   <ul class="rel-note">
     <li>Adds the <a href="manual.html#findMarks"><code>findMarks</code></a> method.</li>
     <li>New addons: <a href="manual.html#addon_rulers">rulers</a>, markdown-fold, yaml-lint.</li>
-    <li>New theme: <a href="../demo/theme.html?mdn-like">mdn-like</a>.</li>
+    <li>New theme: <a href="../demo/theme.html#mdn-like">mdn-like</a>.</li>
     <li>New mode: <a href="../mode/solr/index.html">Solr</a>.</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
   </ul>
@@ -336,7 +349,7 @@ <h2>Version 3.x</h2>
     <li>The <a href="../mode/xml/index.html">XML</a> and <a href="../mode/css/index.html">CSS</a> modes were largely rewritten. <a href="../mode/css/less.html">LESS</a> support was added to the CSS mode.</li>
     <li>The OCaml mode was moved to an <a href="../mode/mllike/index.html">mllike</a> mode, F# support added.</li>
     <li>Make it possible to fetch multiple applicable helper values with <a href="manual.html#getHelpers"><code>getHelpers</code></a>, and to register helpers matched on predicates with <a href="manual.html#registerGlobalHelper"><code>registerGlobalHelper</code></a>.</li>
-    <li>New theme <a href="../demo/theme.html?pastel-on-dark">pastel-on-dark</a>.</li>
+    <li>New theme <a href="../demo/theme.html#pastel-on-dark">pastel-on-dark</a>.</li>
     <li>Better ECMAScript 6 support in <a href="../mode/javascript/index.html">JavaScript</a> mode.</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.20.0...3.21.0">list of patches</a>.</li>
   </ul>
@@ -357,7 +370,7 @@ <h2>Version 3.x</h2>
   <ul class="rel-note">
     <li>New modes: <a href="../mode/eiffel/index.html">Eiffel</a>, <a href="../mode/gherkin/index.html">Gherkin</a>, <a href="../mode/sql/?mime=text/x-mssql">MSSQL dialect</a>.</li>
     <li>New addons: <a href="manual.html#addon_hardwrap">hardwrap</a>, <a href="manual.html#addon_sql-hint">sql-hint</a>.</li>
-    <li>New theme: <a href="../demo/theme.html?mbo">MBO</a>.</li>
+    <li>New theme: <a href="../demo/theme.html#mbo">MBO</a>.</li>
     <li>Add <a href="manual.html#token_style_line">support</a> for line-level styling from mode tokenizers.</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.18.0...3.19.0">list of patches</a>.</li>
   </ul>
@@ -382,7 +395,7 @@ <h2>Version 3.x</h2>
   <ul class="rel-note">
     <li>The whole codebase is now under a single <a href="../LICENSE">license</a> file.</li>
     <li>The project page was overhauled and redesigned.</li>
-    <li>New themes: <a href="../demo/theme.html?paraiso-dark">Paraiso</a> (<a href="../demo/theme.html?paraiso-light">light</a>), <a href="../demo/theme.html?the-matrix">The Matrix</a>.</li>
+    <li>New themes: <a href="../demo/theme.html#paraiso-dark">Paraiso</a> (<a href="../demo/theme.html#paraiso-light">light</a>), <a href="../demo/theme.html#the-matrix">The Matrix</a>.</li>
     <li>Improved interaction between themes and <a href="manual.html#addon_active-line">active-line</a>/<a href="manual.html#addon_matchbrackets">matchbrackets</a> addons.</li>
     <li>New <a href="manual.html#addon_foldcode">folding</a> function <code>CodeMirror.fold.comment</code>.</li>
     <li>Added <a href="manual.html#addon_fullscreen">fullscreen</a> addon.</li>
@@ -396,7 +409,7 @@ <h2>Version 3.x</h2>
     <li>New addons: <a href="../demo/tern.html">Tern</a>, <a href="manual.html#addon_matchtags">matchtags</a>, and <a href="manual.html#addon_foldgutter">foldgutter</a>.</li>
     <li>Introduced <a href="manual.html#getHelper"><em>helper</em></a> concept (<a href="https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ">context</a>).</li>
     <li>New method: <a href="manual.html#getModeAt"><code>getModeAt</code></a>.</li>
-    <li>New themes: base16 <a href="../demo/theme.html?base16-dark">dark</a>/<a href="../demo/theme.html?base16-light">light</a>, 3024 <a href="../demo/theme.html?3024-night">dark</a>/<a href="../demo/theme.html?3024-day">light</a>, <a href="../demo/theme.html?tomorrow-night-eighties">tomorrow-night</a>.</li>
+    <li>New themes: base16 <a href="../demo/theme.html#base16-dark">dark</a>/<a href="../demo/theme.html#base16-light">light</a>, 3024 <a href="../demo/theme.html#3024-night">dark</a>/<a href="../demo/theme.html#3024-day">light</a>, <a href="../demo/theme.html#tomorrow-night-eighties">tomorrow-night</a>.</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
   </ul>
 
@@ -567,7 +580,7 @@ <h2>Version 3.x</h2>
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
 
   <ul class="rel-note">
-    <li>New theme: <a href="../demo/theme.html?solarized%20light">Solarized</a>.</li>
+    <li>New theme: <a href="../demo/theme.html#solarized%20light">Solarized</a>.</li>
     <li>Introduce <a href="manual.html#addLineClass"><code>addLineClass</code></a>
     and <a href="manual.html#removeLineClass"><code>removeLineClass</code></a>,
     drop <code>setLineClass</code>.</li>
@@ -633,7 +646,7 @@ <h2>Version 2.x</h2>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/z80/index.html">Z80 assembly</a>.</li>
-    <li>New theme: <a href="../demo/theme.html?twilight">Twilight</a>.</li>
+    <li>New theme: <a href="../demo/theme.html#twilight">Twilight</a>.</li>
     <li>Add command-line compression helper.</li>
     <li>Make <a href="manual.html#scrollIntoView"><code>scrollIntoView</code></a> public.</li>
     <li>Add <a href="manual.html#defaultTextHeight"><code>defaultTextHeight</code></a> method.</li>
@@ -703,7 +716,7 @@ <h2>Version 2.x</h2>
 
   <ul class="rel-note">
     <li><strong>New scrollbar implementation</strong>. Should flicker less. Changes DOM structure of the editor.</li>
-    <li>New theme: <a href="../demo/theme.html?vibrant-ink">vibrant-ink</a>.</li>
+    <li>New theme: <a href="../demo/theme.html#vibrant-ink">vibrant-ink</a>.</li>
     <li>Many extensions to the VIM keymap (including text objects).</li>
     <li>Add <a href="../demo/multiplex.html">mode-multiplexing</a> utility script.</li>
     <li>Fix bug where right-click paste works in read-only mode.</li>
@@ -729,7 +742,7 @@ <h2>Version 2.x</h2>
     <li>New
     modes: <a href="../mode/shell/index.html">Shell</a>, <a href="../mode/tiki/index.html">Tiki
     wiki</a>, <a href="../mode/pig/index.html">Pig Latin</a>.</li>
-    <li>New themes: <a href="../demo/theme.html?ambiance">Ambiance</a>, <a href="../demo/theme.html?blackboard">Blackboard</a>.</li>
+    <li>New themes: <a href="../demo/theme.html#ambiance">Ambiance</a>, <a href="../demo/theme.html#blackboard">Blackboard</a>.</li>
     <li>More control over drag/drop
     with <a href="manual.html#option_dragDrop"><code>dragDrop</code></a>
     and <a href="manual.html#option_onDragEvent"><code>onDragEvent</code></a>
diff --git a/index.html b/index.html
index ddb804a560..bca7e02a2d 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.4</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.5</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 df0af5d2e3..e9e2c1f375 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8782,7 +8782,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.4.1";
+  CodeMirror.version = "5.5.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 687c185b9a..5c02fc1896 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.4.1",
+    "version":"5.5.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 0286e0f9d002a94f3a74a11f895002829bfd6939 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 20 Jul 2015 12:57:37 +0200
Subject: [PATCH 2237/4742] Bump version number post-5.5

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 441afea2ce..070bc4a0a0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.5.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.5.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index e9e2c1f375..a8b6395970 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8782,7 +8782,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.5.0";
+  CodeMirror.version = "5.5.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 5c02fc1896..c2c901af18 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.5.0",
+    "version":"5.5.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 8bb073616bf79943c300ae604004f3aaae3279f7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 21 Jul 2015 08:47:46 +0200
Subject: [PATCH 2238/4742] Avoid unintentional this bindings in event and
 command calls

Issue #3401
---
 lib/codemirror.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a8b6395970..0825144215 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2978,12 +2978,12 @@
     var callbacks = group.delayedCallbacks, i = 0;
     do {
       for (; i < callbacks.length; i++)
-        callbacks[i]();
+        callbacks[i].call(null);
       for (var j = 0; j < group.ops.length; j++) {
         var op = group.ops[j];
         if (op.cursorActivityHandlers)
           while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
-            op.cursorActivityHandlers[op.cursorActivityCalled++](op.cm);
+            op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm);
       }
     } while (i < callbacks.length);
   }
@@ -5064,7 +5064,7 @@
 
     execCommand: function(cmd) {
       if (commands.hasOwnProperty(cmd))
-        return commands[cmd](this);
+        return commands[cmd].call(null, this);
     },
 
     triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),

From d002b03deb78adfcdaec61e993f5f2f78700db55 Mon Sep 17 00:00:00 2001
From: Shea Bunge <info@bungeshea.com>
Date: Wed, 22 Jul 2015 16:05:15 +1000
Subject: [PATCH 2239/4742] [yeti theme] Remove duplicate color hex sign

---
 theme/yeti.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/yeti.css b/theme/yeti.css
index dce32588cd..bd441fcb9c 100644
--- a/theme/yeti.css
+++ b/theme/yeti.css
@@ -59,7 +59,7 @@
   color: #9fb96e;
 }
 .cm-s-yeti span.cm-atom {
-  color:##a074c4;
+  color: #a074c4;
 }
 .cm-s-yeti span.cm-meta {
   color: #96c0d8;
@@ -83,4 +83,4 @@
   color: #96c0d8;
 }
 .cm-s-yeti .CodeMirror-activeline-background {background: #E7E4E0 !important;}
-.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline;}
\ No newline at end of file
+.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline;}

From 091a0f615ae928126c0f41a52722cdddedf5f89a Mon Sep 17 00:00:00 2001
From: Michael Zhou <moz@google.com>
Date: Mon, 20 Jul 2015 11:04:13 -0700
Subject: [PATCH 2240/4742] [mode/meta addon] Include VHDL mode

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

diff --git a/mode/meta.js b/mode/meta.js
index bc9f121d04..376e1ecdc2 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -139,6 +139,7 @@
     {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
     {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
     {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
+    {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
     {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
     {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},

From 0a54ddbc70390dcad5bf3afc408adbf24675294e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 25 Jul 2015 12:32:45 +0200
Subject: [PATCH 2241/4742] Ignore paste when in readOnly mode

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0825144215..3363179f56 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1135,7 +1135,8 @@
     var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
     if (pasted) {
       e.preventDefault();
-      runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
+      if (!isReadOnly(cm) && !cm.options.disableInput)
+        runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
       return true;
     }
   }

From ea3277bb4ca3116ca34eb6b191d7679243247cdd Mon Sep 17 00:00:00 2001
From: thanasis <ath.daglis@gmail.com>
Date: Fri, 24 Jul 2015 15:58:21 +0300
Subject: [PATCH 2242/4742] [Dockerfile mode] Added lineComment

---
 mode/dockerfile/dockerfile.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
index 6d51775067..4419009afa 100644
--- a/mode/dockerfile/dockerfile.js
+++ b/mode/dockerfile/dockerfile.js
@@ -69,7 +69,10 @@
         token: null,
         next: "start"
       }
-    ]
+    ],
+      meta: {
+          lineComment: "#"
+      }
   });
 
   CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");

From bc0a644e34250341f31f624ed57c0bb127575717 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 25 Jul 2015 22:41:07 +0200
Subject: [PATCH 2243/4742] [closetag addon] Don't include trailing > if it is
 already present

Closes #3409
---
 addon/edit/closetag.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index e68d52d9dc..a518da3ec1 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -108,19 +108,22 @@
       // when completing in JS/CSS snippet in htmlmixed mode. Does not
       // work for other XML embedded languages (there is no general
       // way to go from a mixed mode to its current XML state).
+      var replacement;
       if (inner.mode.name != "xml") {
         if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
-          replacements[i] = head + "script>";
+          replacement = head + "script";
         else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
-          replacements[i] = head + "style>";
+          replacement = head + "style";
         else
           return CodeMirror.Pass;
       } else {
         if (!state.context || !state.context.tagName ||
             closingTagExists(cm, state.context.tagName, pos, state))
           return CodeMirror.Pass;
-        replacements[i] = head + state.context.tagName + ">";
+        replacement = head + state.context.tagName;
       }
+      if (cm.getLine(pos.line).charAt(tok.end) != ">") replacement += ">";
+      replacements[i] = replacement;
     }
     cm.replaceSelections(replacements);
     ranges = cm.listSelections();

From 536bba1e247ff668de8095be4001cf82a297310b Mon Sep 17 00:00:00 2001
From: Amin Shali <amshali@google.com>
Date: Sun, 26 Jul 2015 22:47:21 -0700
Subject: [PATCH 2244/4742] [lint addon] Add option to disable automatic
 linting

... and export (via defineExtension) a method to explicitly trigger
linting from user code.
---
 addon/lint/lint.js | 14 ++++++++++++--
 demo/lint.html     |  6 +++++-
 doc/manual.html    |  4 ++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 3eea203ce5..e2218f0463 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -187,7 +187,9 @@
   CodeMirror.defineOption("lint", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       clearMarks(cm);
-      cm.off("change", onChange);
+      if (!state.options.disableLintOnChange) {
+        cm.off("change", onChange);
+      }
       CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
       clearTimeout(cm.state.lint.timeout);
       delete cm.state.lint;
@@ -197,11 +199,19 @@
       var gutters = cm.getOption("gutters"), hasLintGutter = false;
       for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
       var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
-      cm.on("change", onChange);
+      if (!state.options.disableLintOnChange) {
+        cm.on("change", onChange);
+      }
       if (state.options.tooltips != false)
         CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
 
       startLinting(cm);
     }
   });
+
+  CodeMirror.defineExtension("performLint", function(cm) {
+    var state = cm.state.lint;
+    if (!state) return;
+    startLinting(cm);
+  });
 });
diff --git a/demo/lint.html b/demo/lint.html
index 29936a8d96..7dfc653cf3 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -164,8 +164,12 @@ <h2>Linter Demo</h2>
     lineNumbers: true,
     mode: "css",
     gutters: ["CodeMirror-lint-markers"],
-    lint: true
+    lint: {
+      disableLintOnChange: true
+    }
   });
+  // Performing the lint every 5 seconds on the css editor:
+  setInterval(function() {editor_css.performLint(editor_css);}, 5000);
 </script>
 
   </article>
diff --git a/doc/manual.html b/doc/manual.html
index 070bc4a0a0..093fe0a8b6 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2689,6 +2689,10 @@ <h2 id="addons">Addons</h2>
       which is a callback to pass the array to. Depends
       on <code>addon/lint/lint.css</code>. A demo can be
       found <a href="../demo/lint.html">here</a>.</dd>
+      <dd>Linting on every change can be disabled using <code>disableLintOnChange</code>
+      option. One can then perform the lint operation using the <code>performLint</code>
+      method which is defined as an extension. This method takes an editor instance
+      as its parameter.</dd>
 
       <dt id="addon_mark-selection"><a href="../addon/selection/mark-selection.js"><code>selection/mark-selection.js</code></a></dt>
       <dd>Causes the selected text to be marked with the CSS class

From 3686816436caada9848c4402c5f9e08032e1c06b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 27 Jul 2015 13:30:09 +0200
Subject: [PATCH 2245/4742] [lint addon] Revise patch 536bba1

---
 addon/lint/lint.js | 12 ++++--------
 doc/manual.html    |  8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index e2218f0463..8e3fcb0e65 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -187,9 +187,8 @@
   CodeMirror.defineOption("lint", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       clearMarks(cm);
-      if (!state.options.disableLintOnChange) {
+      if (!state.options.lintOnChange !== false)
         cm.off("change", onChange);
-      }
       CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
       clearTimeout(cm.state.lint.timeout);
       delete cm.state.lint;
@@ -199,9 +198,8 @@
       var gutters = cm.getOption("gutters"), hasLintGutter = false;
       for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
       var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
-      if (!state.options.disableLintOnChange) {
+      if (!state.options.lintOnChange !== false)
         cm.on("change", onChange);
-      }
       if (state.options.tooltips != false)
         CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
 
@@ -209,9 +207,7 @@
     }
   });
 
-  CodeMirror.defineExtension("performLint", function(cm) {
-    var state = cm.state.lint;
-    if (!state) return;
-    startLinting(cm);
+  CodeMirror.defineExtension("performLint", function() {
+    if (this.state.lint) startLinting(this);
   });
 });
diff --git a/doc/manual.html b/doc/manual.html
index 093fe0a8b6..ba87d09ad2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2689,10 +2689,10 @@ <h2 id="addons">Addons</h2>
       which is a callback to pass the array to. Depends
       on <code>addon/lint/lint.css</code>. A demo can be
       found <a href="../demo/lint.html">here</a>.</dd>
-      <dd>Linting on every change can be disabled using <code>disableLintOnChange</code>
-      option. One can then perform the lint operation using the <code>performLint</code>
-      method which is defined as an extension. This method takes an editor instance
-      as its parameter.</dd>
+      <dd>Linting on every change can be disabled by setting
+      the <code>lintOnChange</code> option to <code>false</code>. One
+      can then perform the lint operation explicitly using the
+      editor's <code>performLint</code> method.</dd>
 
       <dt id="addon_mark-selection"><a href="../addon/selection/mark-selection.js"><code>selection/mark-selection.js</code></a></dt>
       <dd>Causes the selected text to be marked with the CSS class

From b1df2f02150b74e625b4e361f37728c9fca251ba Mon Sep 17 00:00:00 2001
From: Matt Gaide <matt.gaide@service-now.com>
Date: Thu, 23 Jul 2015 21:19:00 -0700
Subject: [PATCH 2246/4742] Adding a CodeMirror option for controlling how long
 the ternTooltip should be visible before closing

---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 42c3cdee24..04a5873150 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -616,7 +616,7 @@
         else mouseOnTip = false;
       }
     });
-    setTimeout(maybeClear, 1700);
+    setTimeout(maybeClear, cm.options.ternHintDelay ? cm.options.ternHintDelay : 1700);
     cm.on("cursorActivity", clear);
     cm.on('blur', clear);
     cm.on('scroll', clear);

From b6f9fd376dbf3ed6e28ad4e60f93b2d47403b031 Mon Sep 17 00:00:00 2001
From: Matt Gaide <matt.gaide@service-now.com>
Date: Sat, 25 Jul 2015 14:23:50 -0700
Subject: [PATCH 2247/4742] [tern addon] Add option for hint delay

---
 addon/tern/tern.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 04a5873150..68eceb5a62 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -266,7 +266,7 @@
           child.target = "_blank";
         }
       }
-      tempTooltip(cm, tip);
+      tempTooltip(cm, tip, ts);
       if (c) c();
     }, pos);
   }
@@ -592,7 +592,7 @@
 
   // Tooltips
 
-  function tempTooltip(cm, content) {
+  function tempTooltip(cm, content, ts) {
     if (cm.state.ternTooltip) remove(cm.state.ternTooltip);
     var where = cm.cursorCoords();
     var tip = cm.state.ternTooltip = makeTooltip(where.right + 1, where.bottom, content);
@@ -616,7 +616,7 @@
         else mouseOnTip = false;
       }
     });
-    setTimeout(maybeClear, cm.options.ternHintDelay ? cm.options.ternHintDelay : 1700);
+    setTimeout(maybeClear, ts.options.hintDelay ? ts.options.hintDelay : 1700);
     cm.on("cursorActivity", clear);
     cm.on('blur', clear);
     cm.on('scroll', clear);
@@ -644,7 +644,7 @@
     if (ts.options.showError)
       ts.options.showError(cm, msg);
     else
-      tempTooltip(cm, String(msg));
+      tempTooltip(cm, String(msg), ts);
   }
 
   function closeArgHints(ts) {

From bd6268517d65cab1a1a5239c30f8ca68719089d2 Mon Sep 17 00:00:00 2001
From: Richard Denton <isdampe@gmail.com>
Date: Tue, 28 Jul 2015 15:08:53 +1000
Subject: [PATCH 2248/4742] [real-world uses] Add boson editor

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 65128ad1b2..52dc56bdb0 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -33,6 +33,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a> (code hosting)</li>
       <li><a href="http://buzz.blogger.com/2013/04/improvements-to-blogger-template-html.html">Blogger's template editor</a></li>
       <li><a href="http://bluegriffon.org/">BlueGriffon</a> (HTML editor)</li>
+      <li><a href="https://github.com/isdampe/BosonEditorExperimental">Boson Editor</a> (code editor)</li>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>

From 665417cbd0ac859ac7b8ee3c91cdc69fb7f38a70 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Jul 2015 17:09:55 +0200
Subject: [PATCH 2249/4742] Show a drop location cursor when dragging over the
 editor

Closes #2645
---
 lib/codemirror.css |  4 ++++
 lib/codemirror.js  | 37 ++++++++++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 318d25f02d..67dbd2b2f3 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -297,6 +297,10 @@ div.CodeMirror-cursors {
   position: relative;
   z-index: 3;
 }
+div.CodeMirror-dragcursors {
+  visibility: visible;
+}
+
 .CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
 }
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3363179f56..bbb3a1eb50 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2271,7 +2271,7 @@
       var range = doc.sel.ranges[i];
       var collapsed = range.empty();
       if (collapsed || cm.options.showCursorWhenSelecting)
-        drawSelectionCursor(cm, range, curFragment);
+        drawSelectionCursor(cm, range.head, curFragment);
       if (!collapsed)
         drawSelectionRange(cm, range, selFragment);
     }
@@ -2279,8 +2279,8 @@
   }
 
   // Draws a cursor for the given range
-  function drawSelectionCursor(cm, range, output) {
-    var pos = cursorCoords(cm, range.head, "div", null, null, !cm.options.singleCursorHeightPerLine);
+  function drawSelectionCursor(cm, head, output) {
+    var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
 
     var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
     cursor.style.left = pos.left + "px";
@@ -3444,9 +3444,11 @@
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
     d.dragFunctions = {
-      simple: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
+      enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
+      over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
       start: function(e){onDragStart(cm, e);},
-      drop: operation(cm, onDrop)
+      drop: operation(cm, onDrop),
+      leave: function() {clearDragCursor(cm);}
     };
 
     var inp = d.input.getField();
@@ -3463,8 +3465,9 @@
       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, "dragenter", funcs.enter);
+      toggle(cm.display.scroller, "dragover", funcs.over);
+      toggle(cm.display.scroller, "dragleave", funcs.leave);
       toggle(cm.display.scroller, "drop", funcs.drop);
     }
   }
@@ -3787,6 +3790,7 @@
 
   function onDrop(e) {
     var cm = this;
+    clearDragCursor(cm);
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
       return;
     e_preventDefault(e);
@@ -3859,6 +3863,25 @@
     }
   }
 
+  function onDragOver(cm, e) {
+    var pos = posFromMouse(cm, e);
+    if (!pos) return;
+    var frag = document.createDocumentFragment();
+    drawSelectionCursor(cm, pos, frag);
+    if (!cm.display.dragCursor) {
+      cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
+      cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
+    }
+    removeChildrenAndAdd(cm.display.dragCursor, frag);
+  }
+
+  function clearDragCursor(cm) {
+    if (cm.display.dragCursor) {
+      cm.display.lineSpace.removeChild(cm.display.dragCursor);
+      cm.display.dragCursor = null;
+    }
+  }
+
   // SCROLL EVENTS
 
   // Sync the scrollable area and scrollbars, ensure the viewport

From e36dff2348ad841889831863ba1b6d142ea83a17 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Jul 2015 20:40:53 +0200
Subject: [PATCH 2250/4742] [php mode] Allow double-quoted heredoc ids and
 space before the id

Closes #3421
---
 mode/php/php.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index 0c3f21e51b..62411db104 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -105,11 +105,12 @@
         return "variable-2";
       },
       "<": function(stream, state) {
-        if (stream.match(/<</)) {
-          var nowDoc = stream.eat("'");
+        var before;
+        if (before = stream.match(/<<\s*/)) {
+          var nowDoc = stream.eat(/['"]/);
           stream.eatWhile(/[\w\.]/);
-          var delim = stream.current().slice(3 + (nowDoc ? 1 : 0));
-          if (nowDoc) stream.eat("'");
+          var delim = stream.current().slice(before[0].length + (nowDoc ? 2 : 1));
+          if (nowDoc) stream.eat(nowDoc);
           if (delim) {
             (state.tokStack || (state.tokStack = [])).push(delim, 0);
             state.tokenize = phpString(delim, nowDoc ? false : true);

From a2e51a66a9b78a0d7dc1138ba2b891049e7dfb72 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Jul 2015 09:25:28 +0200
Subject: [PATCH 2251/4742] [php mode] Allow interpolation in double-quoted
 heredoc strings

Issue #3421
---
 mode/php/php.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index 62411db104..f4594d4a46 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -107,13 +107,13 @@
       "<": function(stream, state) {
         var before;
         if (before = stream.match(/<<\s*/)) {
-          var nowDoc = stream.eat(/['"]/);
+          var quoted = stream.eat(/['"]/);
           stream.eatWhile(/[\w\.]/);
-          var delim = stream.current().slice(before[0].length + (nowDoc ? 2 : 1));
-          if (nowDoc) stream.eat(nowDoc);
+          var delim = stream.current().slice(before[0].length + (quoted ? 2 : 1));
+          if (quoted) stream.eat(quoted);
           if (delim) {
             (state.tokStack || (state.tokStack = [])).push(delim, 0);
-            state.tokenize = phpString(delim, nowDoc ? false : true);
+            state.tokenize = phpString(delim, quoted != "'");
             return "string";
           }
         }

From 4ab7e90a71660552b7324e0bdf70ba72a148bfd6 Mon Sep 17 00:00:00 2001
From: Dmitry Kiselyov <dmitrykiselyov@ukr.net>
Date: Sat, 13 Jun 2015 23:25:13 +0300
Subject: [PATCH 2252/4742] [stylus mode] Add flexbox value

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

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index fc46a0163d..f249258174 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -735,7 +735,7 @@
   var nonStandardPropertyKeywords_ = ["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"];
   var fontProperties_ = ["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"];
   var colorKeywords_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
-  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale"];
+  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around"];
 
   var wordOperatorKeywords_ = ["in","and","or","not","is not","is a","is","isnt","defined","if unless"],
       blockKeywords_ = ["for","if","else","unless", "from", "to"],

From b22783dc9c268b00e735288920972e55b11c3225 Mon Sep 17 00:00:00 2001
From: Philip Stadermann <p.stadermann@aixtron.com>
Date: Wed, 20 May 2015 13:17:37 +0200
Subject: [PATCH 2253/4742] Make sure, that we're not starting a second
 selection.

---
 lib/codemirror.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bbb3a1eb50..80a709675d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -87,6 +87,7 @@
       focused: false,
       suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
       pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
+      selectingText: false,
       draggingText: false,
       highlight: new Delayed(), // stores highlight worker timeout
       keySeq: null,  // Unfinished key sequence
@@ -3540,7 +3541,10 @@
 
     switch (e_button(e)) {
     case 1:
-      if (start)
+      // #3261: make sure, that we're not starting a second selection
+      if (cm.state.selectingText)
+        cm.state.selectingText(e);
+      else if (start)
         leftButtonDown(cm, e, start);
       else if (e_target(e) == display.scroller)
         e_preventDefault(e);
@@ -3738,6 +3742,7 @@
     }
 
     function done(e) {
+      cm.state.selectingText = false;
       counter = Infinity;
       e_preventDefault(e);
       display.input.focus();
@@ -3751,6 +3756,7 @@
       else extend(e);
     });
     var up = operation(cm, done);
+    cm.state.selectingText = up;
     on(document, "mousemove", move);
     on(document, "mouseup", up);
   }

From 52ad899d8b45df43667cd3d8e6541c21a07ff053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20W=C3=A5glund?= <anders@waglund.se>
Date: Tue, 28 Apr 2015 14:06:52 +0200
Subject: [PATCH 2254/4742] [css mode] Add `inline` option

---
 mode/css/css.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 63698c15c9..70e35ae5af 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -12,7 +12,9 @@
 "use strict";
 
 CodeMirror.defineMode("css", function(config, parserConfig) {
+  var provided = parserConfig;
   if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
+  parserConfig.inline = provided.inline;
 
   var indentUnit = config.indentUnit,
       tokenHooks = parserConfig.tokenHooks,
@@ -338,9 +340,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   return {
     startState: function(base) {
       return {tokenize: null,
-              state: "top",
+              state: parserConfig.inline ? "block" : "top",
               stateArg: null,
-              context: new Context("top", base || 0, null)};
+              context: new Context(parserConfig.inline ? "block" : "top", base || 0, null)};
     },
 
     token: function(stream, state) {

From d7dc8c31b993a9cf68f109d3820d027306b57e08 Mon Sep 17 00:00:00 2001
From: Rrandom <emanonhere@gmail.com>
Date: Fri, 17 Jul 2015 14:32:30 +0800
Subject: [PATCH 2255/4742] [rust mode] Rewrite on top of simple-mode

---
 mode/rust/index.html |   8 +-
 mode/rust/rust.js    | 469 ++++---------------------------------------
 mode/rust/test.js    |  38 ++++
 test/index.html      |   3 +
 4 files changed, 84 insertions(+), 434 deletions(-)
 create mode 100644 mode/rust/test.js

diff --git a/mode/rust/index.html b/mode/rust/index.html
index 407e84f2cf..c8eac943ce 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/mode/simple.js"></script>
 <script src="rust.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
@@ -52,7 +53,12 @@ <h2>Rust mode</h2>
 
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true
+        lineNumbers: true,
+        lineWrapping: true,
+        indentUnit: 4,
+        tabSize: 2,
+        autofocus: true,
+        mode: "rust"
       });
     </script>
 
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index 4970b2f7cb..df8d244718 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -11,441 +11,44 @@
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode("rust", function() {
-  var indentUnit = 4, altIndentUnit = 2;
-  var valKeywords = {
-    "if": "if-style", "while": "if-style", "loop": "else-style", "else": "else-style",
-    "do": "else-style", "ret": "else-style", "fail": "else-style",
-    "break": "atom", "cont": "atom", "const": "let", "resource": "fn",
-    "let": "let", "fn": "fn", "for": "for", "alt": "alt", "iface": "iface",
-    "impl": "impl", "type": "type", "enum": "enum", "mod": "mod",
-    "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op",
-    "claim": "op", "native": "ignore", "unsafe": "ignore", "import": "else-style",
-    "export": "else-style", "copy": "op", "log": "op", "log_err": "op",
-    "use": "op", "bind": "op", "self": "atom", "struct": "enum"
-  };
-  var typeKeywords = function() {
-    var keywords = {"fn": "fn", "block": "fn", "obj": "obj"};
-    var atoms = "bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 str char isize usize".split(" ");
-    for (var i = 0, e = atoms.length; i < e; ++i) keywords[atoms[i]] = "atom";
-    return keywords;
-  }();
-  var operatorChar = /[+\-*&%=<>!?|\.@]/;
-
-  // Tokenizer
-
-  // Used as scratch variable to communicate multiple values without
-  // consing up tons of objects.
-  var tcat, content;
-  function r(tc, style) {
-    tcat = tc;
-    return style;
-  }
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"') {
-      state.tokenize = tokenString;
-      return state.tokenize(stream, state);
-    }
-    if (ch == "'") {
-      tcat = "atom";
-      if (stream.eat("\\")) {
-        if (stream.skipTo("'")) { stream.next(); return "string"; }
-        else { return "error"; }
-      } else {
-        stream.next();
-        return stream.eat("'") ? "string" : "error";
-      }
-    }
-    if (ch == "/") {
-      if (stream.eat("/")) { stream.skipToEnd(); return "comment"; }
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment(1);
-        return state.tokenize(stream, state);
-      }
-    }
-    if (ch == "#") {
-      if (stream.eat("[")) { tcat = "open-attr"; return null; }
-      stream.eatWhile(/\w/);
-      return r("macro", "meta");
-    }
-    if (ch == ":" && stream.match(":<")) {
-      return r("op", null);
-    }
-    if (ch.match(/\d/) || (ch == "." && stream.eat(/\d/))) {
-      var flp = false;
-      if (!stream.match(/^x[\da-f]+/i) && !stream.match(/^b[01]+/)) {
-        stream.eatWhile(/\d/);
-        if (stream.eat(".")) { flp = true; stream.eatWhile(/\d/); }
-        if (stream.match(/^e[+\-]?\d+/i)) { flp = true; }
-      }
-      if (flp) stream.match(/^f(?:32|64)/);
-      else stream.match(/^[ui](?:8|16|32|64)/);
-      return r("atom", "number");
-    }
-    if (ch.match(/[()\[\]{}:;,]/)) return r(ch, null);
-    if (ch == "-" && stream.eat(">")) return r("->", null);
-    if (ch.match(operatorChar)) {
-      stream.eatWhile(operatorChar);
-      return r("op", null);
-    }
-    stream.eatWhile(/\w/);
-    content = stream.current();
-    if (stream.match(/^::\w/)) {
-      stream.backUp(1);
-      return r("prefix", "variable-2");
-    }
-    if (state.keywords.propertyIsEnumerable(content))
-      return r(state.keywords[content], content.match(/true|false/) ? "atom" : "keyword");
-    return r("name", "variable");
-  }
-
-  function tokenString(stream, state) {
-    var ch, escaped = false;
-    while (ch = stream.next()) {
-      if (ch == '"' && !escaped) {
-        state.tokenize = tokenBase;
-        return r("atom", "string");
-      }
-      escaped = !escaped && ch == "\\";
-    }
-    // Hack to not confuse the parser when a string is split in
-    // pieces.
-    return r("op", "string");
-  }
-
-  function tokenComment(depth) {
-    return function(stream, state) {
-      var lastCh = null, ch;
-      while (ch = stream.next()) {
-        if (ch == "/" && lastCh == "*") {
-          if (depth == 1) {
-            state.tokenize = tokenBase;
-            break;
-          } else {
-            state.tokenize = tokenComment(depth - 1);
-            return state.tokenize(stream, state);
-          }
-        }
-        if (ch == "*" && lastCh == "/") {
-          state.tokenize = tokenComment(depth + 1);
-          return state.tokenize(stream, state);
-        }
-        lastCh = ch;
-      }
-      return "comment";
-    };
-  }
-
-  // Parser
-
-  var cx = {state: null, stream: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state;
-      state.lexical = {indented: state.indented, column: cx.stream.column(),
-                       type: type, prev: state.lexical, info: info};
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  function typecx() { cx.state.keywords = typeKeywords; }
-  function valcx() { cx.state.keywords = valKeywords; }
-  poplex.lex = typecx.lex = valcx.lex = true;
-
-  function commasep(comb, end) {
-    function more(type) {
-      if (type == ",") return cont(comb, more);
-      if (type == end) return cont();
-      return cont(more);
-    }
-    return function(type) {
-      if (type == end) return cont();
-      return pass(comb, more);
-    };
-  }
-
-  function stat_of(comb, tag) {
-    return cont(pushlex("stat", tag), comb, poplex, block);
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    if (type == "let") return stat_of(letdef1, "let");
-    if (type == "fn") return stat_of(fndef);
-    if (type == "type") return cont(pushlex("stat"), tydef, endstatement, poplex, block);
-    if (type == "enum") return stat_of(enumdef);
-    if (type == "mod") return stat_of(mod);
-    if (type == "iface") return stat_of(iface);
-    if (type == "impl") return stat_of(impl);
-    if (type == "open-attr") return cont(pushlex("]"), commasep(expression, "]"), poplex);
-    if (type == "ignore" || type.match(/[\]\);,]/)) return cont(block);
-    return pass(pushlex("stat"), expression, poplex, endstatement, block);
-  }
-  function endstatement(type) {
-    if (type == ";") return cont();
-    return pass();
-  }
-  function expression(type) {
-    if (type == "atom" || type == "name") return cont(maybeop);
-    if (type == "{") return cont(pushlex("}"), exprbrace, poplex);
-    if (type.match(/[\[\(]/)) return matchBrackets(type, expression);
-    if (type.match(/[\]\)\};,]/)) return pass();
-    if (type == "if-style") return cont(expression, expression);
-    if (type == "else-style" || type == "op") return cont(expression);
-    if (type == "for") return cont(pattern, maybetype, inop, expression, expression);
-    if (type == "alt") return cont(expression, altbody);
-    if (type == "fn") return cont(fndef);
-    if (type == "macro") return cont(macro);
-    return cont();
-  }
-  function maybeop(type) {
-    if (content == ".") return cont(maybeprop);
-    if (content == "::<"){return cont(typarams, maybeop);}
-    if (type == "op" || content == ":") return cont(expression);
-    if (type == "(" || type == "[") return matchBrackets(type, expression);
-    return pass();
-  }
-  function maybeprop() {
-    if (content.match(/^\w+$/)) {cx.marked = "variable"; return cont(maybeop);}
-    return pass(expression);
-  }
-  function exprbrace(type) {
-    if (type == "op") {
-      if (content == "|") return cont(blockvars, poplex, pushlex("}", "block"), block);
-      if (content == "||") return cont(poplex, pushlex("}", "block"), block);
-    }
-    if (content == "mutable" || (content.match(/^\w+$/) && cx.stream.peek() == ":"
-                                 && !cx.stream.match("::", false)))
-      return pass(record_of(expression));
-    return pass(block);
-  }
-  function record_of(comb) {
-    function ro(type) {
-      if (content == "mutable" || content == "with") {cx.marked = "keyword"; return cont(ro);}
-      if (content.match(/^\w*$/)) {cx.marked = "variable"; return cont(ro);}
-      if (type == ":") return cont(comb, ro);
-      if (type == "}") return cont();
-      return cont(ro);
-    }
-    return ro;
-  }
-  function blockvars(type) {
-    if (type == "name") {cx.marked = "def"; return cont(blockvars);}
-    if (type == "op" && content == "|") return cont();
-    return cont(blockvars);
-  }
-
-  function letdef1(type) {
-    if (type.match(/[\]\)\};]/)) return cont();
-    if (content == "=") return cont(expression, letdef2);
-    if (type == ",") return cont(letdef1);
-    return pass(pattern, maybetype, letdef1);
-  }
-  function letdef2(type) {
-    if (type.match(/[\]\)\};,]/)) return pass(letdef1);
-    else return pass(expression, letdef2);
-  }
-  function maybetype(type) {
-    if (type == ":") return cont(typecx, rtype, valcx);
-    return pass();
+CodeMirror.defineSimpleMode("rust",{
+  start:[
+    // string and byte string
+    {regex: /b?"(?:[^\\]|\\.)*?"/, token: "string"},
+    // raw string and raw byte string
+    {regex: /(b?r)(#*)(".*)("\2)/, token: ["string", "string", "string", "string"]},
+    // character
+    {regex: /'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/, token: "string-2"},
+    // byte
+    {regex: /b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/, token: "string-2"},
+
+    {regex: /(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,
+     token: "number"},
+    {regex: /(let\s+(?:mut\s+)?)([a-zA-Z_][a-zA-Z0-9_]*)/, token: ["keyword", "def"]},
+    {regex: /(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/, token: "keyword"},
+    {regex: /\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/, token: "atom"},
+    {regex: /\b(?:true|false|Some|None|Ok|Err)\b/, token: "builtin"},
+    {regex: /\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,
+     token: ["keyword", null ,"def"]},
+    {regex: /#!?\[.*\]/, token: "attribute"},
+    {regex: /\/\/.*/, token: "comment"},
+    {regex: /\/\*/, token: "comment", next: "comment"},
+    {regex: /[-+\/*=<>!]+/, token: "operator"},
+    {regex: /[a-zA-Z_]\w*!/,token: "variable-3"},
+    {regex: /[a-zA-Z_]\w*/, token: "variable"},
+    {regex: /[\{\[\(]/, indent: true},
+    {regex: /[\}\]\)]/, dedent: true},
+  ],
+  comment: [
+    {regex: /.*?\*\//, token: "comment", next: "start"},
+    {regex: /.*/, token: "comment"}
+  ],
+  meta: {
+    dontIndentStates: ["comment"],
+    lineComment: "//"
   }
-  function inop(type) {
-    if (type == "name" && content == "in") {cx.marked = "keyword"; return cont();}
-    return pass();
-  }
-  function fndef(type) {
-    if (content == "@" || content == "~") {cx.marked = "keyword"; return cont(fndef);}
-    if (type == "name") {cx.marked = "def"; return cont(fndef);}
-    if (content == "<") return cont(typarams, fndef);
-    if (type == "{") return pass(expression);
-    if (type == "(") return cont(pushlex(")"), commasep(argdef, ")"), poplex, fndef);
-    if (type == "->") return cont(typecx, rtype, valcx, fndef);
-    if (type == ";") return cont();
-    return cont(fndef);
-  }
-  function tydef(type) {
-    if (type == "name") {cx.marked = "def"; return cont(tydef);}
-    if (content == "<") return cont(typarams, tydef);
-    if (content == "=") return cont(typecx, rtype, valcx);
-    return cont(tydef);
-  }
-  function enumdef(type) {
-    if (type == "name") {cx.marked = "def"; return cont(enumdef);}
-    if (content == "<") return cont(typarams, enumdef);
-    if (content == "=") return cont(typecx, rtype, valcx, endstatement);
-    if (type == "{") return cont(pushlex("}"), typecx, enumblock, valcx, poplex);
-    return cont(enumdef);
-  }
-  function enumblock(type) {
-    if (type == "}") return cont();
-    if (type == "(") return cont(pushlex(")"), commasep(rtype, ")"), poplex, enumblock);
-    if (content.match(/^\w+$/)) cx.marked = "def";
-    return cont(enumblock);
-  }
-  function mod(type) {
-    if (type == "name") {cx.marked = "def"; return cont(mod);}
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    return pass();
-  }
-  function iface(type) {
-    if (type == "name") {cx.marked = "def"; return cont(iface);}
-    if (content == "<") return cont(typarams, iface);
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    return pass();
-  }
-  function impl(type) {
-    if (content == "<") return cont(typarams, impl);
-    if (content == "of" || content == "for") {cx.marked = "keyword"; return cont(rtype, impl);}
-    if (type == "name") {cx.marked = "def"; return cont(impl);}
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    return pass();
-  }
-  function typarams() {
-    if (content == ">") return cont();
-    if (content == ",") return cont(typarams);
-    if (content == ":") return cont(rtype, typarams);
-    return pass(rtype, typarams);
-  }
-  function argdef(type) {
-    if (type == "name") {cx.marked = "def"; return cont(argdef);}
-    if (type == ":") return cont(typecx, rtype, valcx);
-    return pass();
-  }
-  function rtype(type) {
-    if (type == "name") {cx.marked = "variable-3"; return cont(rtypemaybeparam); }
-    if (content == "mutable") {cx.marked = "keyword"; return cont(rtype);}
-    if (type == "atom") return cont(rtypemaybeparam);
-    if (type == "op" || type == "obj") return cont(rtype);
-    if (type == "fn") return cont(fntype);
-    if (type == "{") return cont(pushlex("{"), record_of(rtype), poplex);
-    return matchBrackets(type, rtype);
-  }
-  function rtypemaybeparam() {
-    if (content == "<") return cont(typarams);
-    return pass();
-  }
-  function fntype(type) {
-    if (type == "(") return cont(pushlex("("), commasep(rtype, ")"), poplex, fntype);
-    if (type == "->") return cont(rtype);
-    return pass();
-  }
-  function pattern(type) {
-    if (type == "name") {cx.marked = "def"; return cont(patternmaybeop);}
-    if (type == "atom") return cont(patternmaybeop);
-    if (type == "op") return cont(pattern);
-    if (type.match(/[\]\)\};,]/)) return pass();
-    return matchBrackets(type, pattern);
-  }
-  function patternmaybeop(type) {
-    if (type == "op" && content == ".") return cont();
-    if (content == "to") {cx.marked = "keyword"; return cont(pattern);}
-    else return pass();
-  }
-  function altbody(type) {
-    if (type == "{") return cont(pushlex("}", "alt"), altblock1, poplex);
-    return pass();
-  }
-  function altblock1(type) {
-    if (type == "}") return cont();
-    if (type == "|") return cont(altblock1);
-    if (content == "when") {cx.marked = "keyword"; return cont(expression, altblock2);}
-    if (type.match(/[\]\);,]/)) return cont(altblock1);
-    return pass(pattern, altblock2);
-  }
-  function altblock2(type) {
-    if (type == "{") return cont(pushlex("}", "alt"), block, poplex, altblock1);
-    else return pass(altblock1);
-  }
-
-  function macro(type) {
-    if (type.match(/[\[\(\{]/)) return matchBrackets(type, expression);
-    return pass();
-  }
-  function matchBrackets(type, comb) {
-    if (type == "[") return cont(pushlex("]"), commasep(comb, "]"), poplex);
-    if (type == "(") return cont(pushlex(")"), commasep(comb, ")"), poplex);
-    if (type == "{") return cont(pushlex("}"), commasep(comb, "}"), poplex);
-    return cont();
-  }
-
-  function parse(state, stream, style) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
-
-    while (true) {
-      var combinator = cc.length ? cc.pop() : block;
-      if (combinator(tcat)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        return cx.marked || style;
-      }
-    }
-  }
-
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        cc: [],
-        lexical: {indented: -indentUnit, column: 0, type: "top", align: false},
-        keywords: valKeywords,
-        indented: 0
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      tcat = content = null;
-      var style = state.tokenize(stream, state);
-      if (style == "comment") return style;
-      if (!state.lexical.hasOwnProperty("align"))
-        state.lexical.align = true;
-      if (tcat == "prefix") return style;
-      if (!content) content = stream.current();
-      return parse(state, stream, style);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical,
-          type = lexical.type, closing = firstChar == type;
-      if (type == "stat") return lexical.indented + indentUnit;
-      if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      return lexical.indented + (closing ? 0 : (lexical.info == "alt" ? altIndentUnit : indentUnit));
-    },
-
-    electricChars: "{}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//",
-    fold: "brace"
-  };
 });
 
-CodeMirror.defineMIME("text/x-rustsrc", "rust");
 
+CodeMirror.defineMIME("text/x-rustsrc", "rust");
 });
diff --git a/mode/rust/test.js b/mode/rust/test.js
new file mode 100644
index 0000000000..858c6be0f5
--- /dev/null
+++ b/mode/rust/test.js
@@ -0,0 +1,38 @@
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 4}, "rust");
+  function MT(name) {test.mode(name, mode, Array.prototype.slice.call(arguments, 1));}
+
+  MT('integer_test',
+     '[number 123i32]',
+     '[number 123u32]',
+     '[number 123_u32]',
+     '[number 0xff_u8]',
+     '[number 0o70_i16]',
+     '[number 0b1111_1111_1001_0000_i32]',
+     '[number 0usize]');
+
+  MT('float_test',
+     '[number 123.0f64]',
+     '[number 0.1f64]',
+     '[number 0.1f32]',
+     '[number 12E+99_f64]');
+
+  MT('string-literals-test',
+     '[string "foo"]',
+     '[string r"foo"]',
+     '[string "\\"foo\\""]',
+     '[string r#""foo""#]',
+     '[string "foo #\\"# bar"]',
+     '[string r##"foo #"# bar"##]',
+
+     '[string b"foo"]',
+     '[string br"foo"]',
+     '[string b"\\"foo\\""]',
+     '[string br#""foo""#]',
+     '[string br##"foo #" bar"##]',
+
+     "[string-2 'h']",
+     "[string-2 b'h']");
+
+})();
diff --git a/test/index.html b/test/index.html
index eb7412645e..310e88519d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,6 +15,7 @@
 <script src="../addon/edit/matchbrackets.js"></script>
 <script src="../addon/hint/sql-hint.js"></script>
 <script src="../addon/comment/comment.js"></script>
+<script src="../addon/mode/simple.js"></script>
 <script src="../mode/css/css.js"></script>
 <script src="../mode/clike/clike.js"></script>
 <!-- clike must be after css or vim and sublime tests will fail -->
@@ -36,6 +37,7 @@
 <script src="../keymap/emacs.js"></script>
 <script src="../keymap/sublime.js"></script>
 <script src="../keymap/vim.js"></script>
+<script src="../mode/rust/rust.js"></script>
 
 <style type="text/css">
   .ok {color: #090;}
@@ -113,6 +115,7 @@ <h2>Test Suite</h2>
     <script src="../mode/verilog/test.js"></script>
     <script src="../mode/xml/test.js"></script>
     <script src="../mode/xquery/test.js"></script>
+    <script src="../mode/rust/test.js"></script>
     <script src="../addon/mode/multiplex_test.js"></script>
     <script src="emacs_test.js"></script>
     <script src="sql-hint-test.js"></script>

From d56b13a17336131e65dc13c76e470598d8f8ab61 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Aug 2015 10:55:26 +0200
Subject: [PATCH 2256/4742] [rust mode] A few small tweaks

---
 mode/rust/index.html | 18 ++++++++----------
 mode/rust/rust.js    | 20 ++++++++++++--------
 mode/rust/test.js    |  2 ++
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/mode/rust/index.html b/mode/rust/index.html
index c8eac943ce..1fe0ad1e66 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -38,15 +38,15 @@ <h2>Rust mode</h2>
 
 fn check_crate(x: int) {
     let v = 10;
-    alt foo {
-      1 to 3 {
-        print_foo();
-        if x {
-            blah() + 10;
+    match foo {
+        1 ... 3 {
+            print_foo();
+            if x {
+                blah().to_string();
+            }
         }
-      }
-      (x, y) { "bye" }
-      _ { "hi" }
+        (x, y) { "bye" }
+        _ { "hi" }
     }
 }
 </textarea></div>
@@ -56,8 +56,6 @@ <h2>Rust mode</h2>
         lineNumbers: true,
         lineWrapping: true,
         indentUnit: 4,
-        tabSize: 2,
-        autofocus: true,
         mode: "rust"
       });
     </script>
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index df8d244718..1ce0c01ee5 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -3,9 +3,9 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
@@ -16,7 +16,7 @@ CodeMirror.defineSimpleMode("rust",{
     // string and byte string
     {regex: /b?"(?:[^\\]|\\.)*?"/, token: "string"},
     // raw string and raw byte string
-    {regex: /(b?r)(#*)(".*)("\2)/, token: ["string", "string", "string", "string"]},
+    {regex: /(b?r)(#*)(".*?)("\2)/, token: ["string", "string", "string", "string"]},
     // character
     {regex: /'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/, token: "string-2"},
     // byte
@@ -24,20 +24,20 @@ CodeMirror.defineSimpleMode("rust",{
 
     {regex: /(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,
      token: "number"},
-    {regex: /(let\s+(?:mut\s+)?)([a-zA-Z_][a-zA-Z0-9_]*)/, token: ["keyword", "def"]},
-    {regex: /(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/, token: "keyword"},
+    {regex: /(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/, token: ["keyword", null, "def"]},
+    {regex: /(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/, token: "keyword"},
     {regex: /\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/, token: "atom"},
     {regex: /\b(?:true|false|Some|None|Ok|Err)\b/, token: "builtin"},
     {regex: /\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,
      token: ["keyword", null ,"def"]},
-    {regex: /#!?\[.*\]/, token: "attribute"},
+    {regex: /#!?\[.*\]/, token: "meta"},
     {regex: /\/\/.*/, token: "comment"},
     {regex: /\/\*/, token: "comment", next: "comment"},
     {regex: /[-+\/*=<>!]+/, token: "operator"},
     {regex: /[a-zA-Z_]\w*!/,token: "variable-3"},
     {regex: /[a-zA-Z_]\w*/, token: "variable"},
     {regex: /[\{\[\(]/, indent: true},
-    {regex: /[\}\]\)]/, dedent: true},
+    {regex: /[\}\]\)]/, dedent: true}
   ],
   comment: [
     {regex: /.*?\*\//, token: "comment", next: "start"},
@@ -45,7 +45,11 @@ CodeMirror.defineSimpleMode("rust",{
   ],
   meta: {
     dontIndentStates: ["comment"],
-    lineComment: "//"
+    electricInput: /^\s*\}$/,
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//",
+    fold: "brace"
   }
 });
 
diff --git a/mode/rust/test.js b/mode/rust/test.js
index 858c6be0f5..1a3c6e7207 100644
--- a/mode/rust/test.js
+++ b/mode/rust/test.js
@@ -1,3 +1,5 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4}, "rust");

From 38c3e9cc9446b795c434f1b9fa85fe58c60bcc46 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Aug 2015 16:54:24 +0200
Subject: [PATCH 2257/4742] [lint addon] Fix broken implementation of
 lintOnChange

Issue #3423
---
 addon/lint/lint.js | 4 ++--
 demo/lint.html     | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 8e3fcb0e65..3887d64723 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -187,7 +187,7 @@
   CodeMirror.defineOption("lint", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       clearMarks(cm);
-      if (!state.options.lintOnChange !== false)
+      if (state.options.lintOnChange !== false)
         cm.off("change", onChange);
       CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
       clearTimeout(cm.state.lint.timeout);
@@ -198,7 +198,7 @@
       var gutters = cm.getOption("gutters"), hasLintGutter = false;
       for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
       var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
-      if (!state.options.lintOnChange !== false)
+      if (state.options.lintOnChange !== false)
         cm.on("change", onChange);
       if (state.options.tooltips != false)
         CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
diff --git a/demo/lint.html b/demo/lint.html
index 7dfc653cf3..29936a8d96 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -164,12 +164,8 @@ <h2>Linter Demo</h2>
     lineNumbers: true,
     mode: "css",
     gutters: ["CodeMirror-lint-markers"],
-    lint: {
-      disableLintOnChange: true
-    }
+    lint: true
   });
-  // Performing the lint every 5 seconds on the css editor:
-  setInterval(function() {editor_css.performLint(editor_css);}, 5000);
 </script>
 
   </article>

From 5a50589ebc954e19b1fb4f337307aa641e8a688e Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Sun, 2 Aug 2015 01:24:43 -0700
Subject: [PATCH 2258/4742] Use one-line css definitions in themes uniformly

---
 theme/dracula.css  |  94 ++++++++++------------------------------
 theme/material.css | 106 ++++++++++++---------------------------------
 theme/seti.css     |  90 ++++++++++----------------------------
 theme/yeti.css     |  84 +++++++++--------------------------
 4 files changed, 95 insertions(+), 279 deletions(-)

diff --git a/theme/dracula.css b/theme/dracula.css
index 5badef282e..5c52492033 100644
--- a/theme/dracula.css
+++ b/theme/dracula.css
@@ -13,75 +13,29 @@
   color: #f8f8f2 !important;
   border: none;
 }
-.cm-s-dracula .CodeMirror-gutters{
-  color: #282a36;
-}
-.cm-s-dracula .CodeMirror-cursor {
-  border-left: solid thin #f8f8f0 !important;
-}
-.cm-s-dracula .CodeMirror-linenumber {
-  color: #6D8A88;
-}
-.cm-s-dracula.CodeMirror-focused .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-dracula span.cm-comment {
-  color: #6272a4;
-}
-.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 {
-  color: #f1fa8c;
-}
-.cm-s-dracula span.cm-number {
-  color: #bd93f9;
-}
-.cm-s-dracula span.cm-variable {
-  color: #50fa7b;
-}
-.cm-s-dracula span.cm-variable-2 {
-  color: white;
-}
-.cm-s-dracula span.cm-def {
-  color: #ffb86c;
-}
-.cm-s-dracula span.cm-keyword {
-  color: #ff79c6;
-}
-.cm-s-dracula span.cm-operator {
-  color: #ff79c6;
-}
-.cm-s-dracula span.cm-keyword {
-  color: #ff79c6;
-}
-.cm-s-dracula span.cm-atom {
-  color: #bd93f9;
-}
-.cm-s-dracula span.cm-meta {
-  color: #f8f8f2;
-}
-.cm-s-dracula span.cm-tag {
-  color: #ff79c6;
-}
-.cm-s-dracula span.cm-attribute {
-  color: #50fa7b;
-}
-.cm-s-dracula span.cm-qualifier {
-  color: #50fa7b;
-}
-.cm-s-dracula span.cm-property {
-  color: #66d9ef;
-}
-.cm-s-dracula span.cm-builtin {
-  color: #50fa7b;
-}
-.cm-s-dracula span.cm-variable-3 {
-  color: #50fa7b;
-}
+.cm-s-dracula .CodeMirror-gutters { color: #282a36; }
+.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0 !important; }
+.cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-dracula.CodeMirror-focused .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula span.cm-comment { color: #6272a4; }
+.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 { color: #f1fa8c; }
+.cm-s-dracula span.cm-number { color: #bd93f9; }
+.cm-s-dracula span.cm-variable { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-2 { color: white; }
+.cm-s-dracula span.cm-def { color: #ffb86c; }
+.cm-s-dracula span.cm-keyword { color: #ff79c6; }
+.cm-s-dracula span.cm-operator { color: #ff79c6; }
+.cm-s-dracula span.cm-keyword { color: #ff79c6; }
+.cm-s-dracula span.cm-atom { color: #bd93f9; }
+.cm-s-dracula span.cm-meta { color: #f8f8f2; }
+.cm-s-dracula span.cm-tag { color: #ff79c6; }
+.cm-s-dracula span.cm-attribute { color: #50fa7b; }
+.cm-s-dracula span.cm-qualifier { color: #50fa7b; }
+.cm-s-dracula span.cm-property { color: #66d9ef; }
+.cm-s-dracula span.cm-builtin { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-3 { color: #50fa7b; }
 
 .cm-s-dracula .CodeMirror-activeline-background {background: rgba(255,255,255,0.1) !important;}
-.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
\ No newline at end of file
+.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/material.css b/theme/material.css
index 85e1f185d5..b048cdc05f 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -16,90 +16,38 @@
   color: rgb(83,127,126);
   border: none;
 }
-.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber {
-  color: rgb(83,127,126);
-}
-.cm-s-material .CodeMirror-cursor {
-  border-left: 1px solid #f8f8f0 !important;
-}
-.cm-s-material .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.15);
-}
-.cm-s-material.CodeMirror-focused .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection {
-  background: rgba(255, 255, 255, 0.10);
-}
+.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
+.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0 !important; }
+.cm-s-material .CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-material.CodeMirror-focused .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 
-.CodeMirror-activeline-background {
-  background: rgba(0, 0, 0, 0) !important;
-}
-.cm-s-material span.cm-keyword {
-  color: rgba(199, 146, 234, 1);
-}
-.cm-s-material span.cm-operator {
-  color: rgba(233, 237, 237, 1);
-}
-.cm-s-material span.cm-variable-2 {
-  color: #80CBC4;
-}
-.cm-s-material span.cm-variable-3 {
-  color: #82B1FF;
-}
-.cm-s-material span.cm-builtin {
-  color: #DECB6B;
-}
-.cm-s-material span.cm-atom {
-  color: #F77669;
-}
-.cm-s-material span.cm-number {
-  color: #F77669;
-}
-.cm-s-material span.cm-def {
-  color: rgba(233, 237, 237, 1);
-}
+.CodeMirror-activeline-background { background: rgba(0, 0, 0, 0) !important; }
+.cm-s-material span.cm-keyword { color: rgba(199, 146, 234, 1); }
+.cm-s-material span.cm-operator { color: rgba(233, 237, 237, 1); }
+.cm-s-material span.cm-variable-2 { color: #80CBC4; }
+.cm-s-material span.cm-variable-3 { color: #82B1FF; }
+.cm-s-material span.cm-builtin { color: #DECB6B; }
+.cm-s-material span.cm-atom { color: #F77669; }
+.cm-s-material span.cm-number { color: #F77669; }
+.cm-s-material span.cm-def { color: rgba(233, 237, 237, 1); }
 .cm-s-material span.cm-error {
   color: rgba(255, 255, 255, 1.0);
   background-color: #EC5F67;
 }
-.cm-s-material span.cm-string {
-  color: #C3E88D;
-}
-.cm-s-material span.cm-string-2 {
-  color: #80CBC4;
-}
-.cm-s-material span.cm-comment {
-  color: #546E7A;
-}
-.cm-s-material span.cm-variable {
-  color: #82B1FF;
-}
-.cm-s-material span.cm-tag {
-  color: #80CBC4;
-}
-.cm-s-material span.cm-meta{
-  color: #80CBC4;
-}
-.cm-s-material span.cm-attribute {
-  color: #FFCB6B;
-}
-.cm-s-material span.cm-property {
-  color: #80CBAE;
-}
-.cm-s-material span.cm-qualifier {
-  color: #DECB6B;
-}
-.cm-s-material span.cm-variable-3{
-  color: #DECB6B;
-}
-.cm-s-material span.cm-tag {
-  color: rgba(255, 83, 112, 1);
-}
+.cm-s-material span.cm-string { color: #C3E88D; }
+.cm-s-material span.cm-string-2 { color: #80CBC4; }
+.cm-s-material span.cm-comment { color: #546E7A; }
+.cm-s-material span.cm-variable { color: #82B1FF; }
+.cm-s-material span.cm-tag { color: #80CBC4; }
+.cm-s-material span.cm-meta{ color: #80CBC4; }
+.cm-s-material span.cm-attribute { color: #FFCB6B; }
+.cm-s-material span.cm-property { color: #80CBAE; }
+.cm-s-material span.cm-qualifier { color: #DECB6B; }
+.cm-s-material span.cm-variable-3{ color: #DECB6B; }
+.cm-s-material span.cm-tag { color: rgba(255, 83, 112, 1); }
 .cm-s-material .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
-}
\ No newline at end of file
+}
diff --git a/theme/seti.css b/theme/seti.css
index ea27d5eee7..4032b5a859 100644
--- a/theme/seti.css
+++ b/theme/seti.css
@@ -18,71 +18,27 @@
   background-color: #0E1112;
   border: none;
 }
-.cm-s-seti .CodeMirror-cursor {
-  border-left: solid thin #f8f8f0 !important;
-}
-.cm-s-seti .CodeMirror-linenumber {
-  color: #6D8A88;
-}
-.cm-s-seti.CodeMirror-focused .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-seti span.cm-comment {
-  color: #41535b;
-}
-.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 {
-  color: #55b5db;
-}
-.cm-s-seti span.cm-number {
-  color: #cd3f45;
-}
-.cm-s-seti span.cm-variable {
-  color: #55b5db;
-}
-.cm-s-seti span.cm-variable-2 {
-  color: #a074c4;
-}
-.cm-s-seti span.cm-def {
-  color: #55b5db;
-}
-.cm-s-seti span.cm-keyword {
-  color: #ff79c6;
-}
-.cm-s-seti span.cm-operator {
-  color: #9fca56;
-}
-.cm-s-seti span.cm-keyword {
-  color: #e6cd69;
-}
-.cm-s-seti span.cm-atom {
-  color: #cd3f45;
-}
-.cm-s-seti span.cm-meta {
-  color: #55b5db;
-}
-.cm-s-seti span.cm-tag {
-  color: #55b5db;
-}
-.cm-s-seti span.cm-attribute {
-  color: #9fca56;
-}
-.cm-s-seti span.cm-qualifier {
-  color: #9fca56;
-}
-.cm-s-seti span.cm-property {
-  color: #a074c4;
-}
-.cm-s-seti span.cm-variable-3 {
-  color: #9fca56;
-}
-.cm-s-seti span.cm-builtin {
-  color: #9fca56;
-}
+.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0 !important; }
+.cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-seti.CodeMirror-focused .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti span.cm-comment { color: #41535b; }
+.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 { color: #55b5db; }
+.cm-s-seti span.cm-number { color: #cd3f45; }
+.cm-s-seti span.cm-variable { color: #55b5db; }
+.cm-s-seti span.cm-variable-2 { color: #a074c4; }
+.cm-s-seti span.cm-def { color: #55b5db; }
+.cm-s-seti span.cm-keyword { color: #ff79c6; }
+.cm-s-seti span.cm-operator { color: #9fca56; }
+.cm-s-seti span.cm-keyword { color: #e6cd69; }
+.cm-s-seti span.cm-atom { color: #cd3f45; }
+.cm-s-seti span.cm-meta { color: #55b5db; }
+.cm-s-seti span.cm-tag { color: #55b5db; }
+.cm-s-seti span.cm-attribute { color: #9fca56; }
+.cm-s-seti span.cm-qualifier { color: #9fca56; }
+.cm-s-seti span.cm-property { color: #a074c4; }
+.cm-s-seti span.cm-variable-3 { color: #9fca56; }
+.cm-s-seti span.cm-builtin { color: #9fca56; }
 .cm-s-seti .CodeMirror-activeline-background {background: #101213 !important;}
-.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
\ No newline at end of file
+.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/yeti.css b/theme/yeti.css
index bd441fcb9c..0b0a72edac 100644
--- a/theme/yeti.css
+++ b/theme/yeti.css
@@ -19,68 +19,26 @@
   background-color: #E5E1DB;
   border: none;
 }
-.cm-s-yeti .CodeMirror-cursor {
-  border-left: solid thin #d1c9c0 !important;
-}
-.cm-s-yeti .CodeMirror-linenumber {
-  color: #adaba6;
-}
-.cm-s-yeti.CodeMirror-focused .CodeMirror-selected {
-  background: #DCD8D2;
-}
-.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection {
-  background: #DCD8D2;
-}
-.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection {
-  background: #DCD8D2;
-}
-.cm-s-yeti span.cm-comment {
-  color: #d4c8be;
-}
-.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 {
-  color: #96c0d8;
-}
-.cm-s-yeti span.cm-number {
-  color: #a074c4;
-}
-.cm-s-yeti span.cm-variable {
-  color: #55b5db;
-}
-.cm-s-yeti span.cm-variable-2 {
-  color: #a074c4;
-}
-.cm-s-yeti span.cm-def {
-  color: #55b5db;
-}
-.cm-s-yeti span.cm-operator {
-  color: #9fb96e;
-}
-.cm-s-yeti span.cm-keyword {
-  color: #9fb96e;
-}
-.cm-s-yeti span.cm-atom {
-  color: #a074c4;
-}
-.cm-s-yeti span.cm-meta {
-  color: #96c0d8;
-}
-.cm-s-yeti span.cm-tag {
-  color: #96c0d8;
-}
-.cm-s-yeti span.cm-attribute {
-  color: #9fb96e;
-}
-.cm-s-yeti span.cm-qualifier {
-  color: #96c0d8;
-}
-.cm-s-yeti span.cm-property {
-  color: #a074c4;
-}
-.cm-s-yeti span.cm-builtin {
-  color: #a074c4;
-}
-.cm-s-yeti span.cm-variable-3 {
-  color: #96c0d8;
-}
+.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0 !important; }
+.cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
+.cm-s-yeti.CodeMirror-focused .CodeMirror-selected { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
+.cm-s-yeti span.cm-comment { color: #d4c8be; }
+.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 { color: #96c0d8; }
+.cm-s-yeti span.cm-number { color: #a074c4; }
+.cm-s-yeti span.cm-variable { color: #55b5db; }
+.cm-s-yeti span.cm-variable-2 { color: #a074c4; }
+.cm-s-yeti span.cm-def { color: #55b5db; }
+.cm-s-yeti span.cm-operator { color: #9fb96e; }
+.cm-s-yeti span.cm-keyword { color: #9fb96e; }
+.cm-s-yeti span.cm-atom { color: #a074c4; }
+.cm-s-yeti span.cm-meta { color: #96c0d8; }
+.cm-s-yeti span.cm-tag { color: #96c0d8; }
+.cm-s-yeti span.cm-attribute { color: #9fb96e; }
+.cm-s-yeti span.cm-qualifier { color: #96c0d8; }
+.cm-s-yeti span.cm-property { color: #a074c4; }
+.cm-s-yeti span.cm-builtin { color: #a074c4; }
+.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
 .cm-s-yeti .CodeMirror-activeline-background {background: #E7E4E0 !important;}
 .cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline;}

From 06a508e611badab298426434b6d3df5651684257 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Sun, 2 Aug 2015 02:01:54 -0700
Subject: [PATCH 2259/4742] Standardize .CodeMirror-selected specificity in
 themes

---
 theme/3024-day.css                | 2 +-
 theme/3024-night.css              | 2 +-
 theme/ambiance.css                | 4 ++--
 theme/base16-dark.css             | 2 +-
 theme/base16-light.css            | 2 +-
 theme/blackboard.css              | 4 ++--
 theme/cobalt.css                  | 2 +-
 theme/colorforth.css              | 2 +-
 theme/dracula.css                 | 2 +-
 theme/erlang-dark.css             | 2 +-
 theme/icecoder.css                | 2 +-
 theme/lesser-dark.css             | 2 +-
 theme/liquibyte.css               | 2 +-
 theme/material.css                | 4 ++--
 theme/mbo.css                     | 2 +-
 theme/mdn-like.css                | 2 +-
 theme/midnight.css                | 2 +-
 theme/monokai.css                 | 2 +-
 theme/night.css                   | 2 +-
 theme/paraiso-dark.css            | 2 +-
 theme/paraiso-light.css           | 2 +-
 theme/pastel-on-dark.css          | 2 +-
 theme/rubyblue.css                | 2 +-
 theme/seti.css                    | 2 +-
 theme/solarized.css               | 4 ++--
 theme/the-matrix.css              | 2 +-
 theme/tomorrow-night-bright.css   | 2 +-
 theme/tomorrow-night-eighties.css | 2 +-
 theme/twilight.css                | 2 +-
 theme/vibrant-ink.css             | 2 +-
 theme/xq-dark.css                 | 4 ++--
 theme/yeti.css                    | 2 +-
 theme/zenburn.css                 | 4 ++--
 33 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/theme/3024-day.css b/theme/3024-day.css
index 1eb109e438..c051088eac 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-3024-day.CodeMirror {background: #f7f7f7; color: #3a3432;}
-.cm-s-3024-day div.CodeMirror-selected {background: #d6d5d4 !important;}
+.cm-s-3024-day div.CodeMirror-selected {background: #d6d5d4;}
 
 .cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
 .cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
diff --git a/theme/3024-night.css b/theme/3024-night.css
index 36bb8b4eea..cd09ada671 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-3024-night.CodeMirror {background: #090300; color: #d6d5d4;}
-.cm-s-3024-night div.CodeMirror-selected {background: #3a3432 !important;}
+.cm-s-3024-night div.CodeMirror-selected {background: #3a3432;}
 .cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
 .cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
 .cm-s-3024-night .CodeMirror-gutters {background: #090300; border-right: 0px;}
diff --git a/theme/ambiance.css b/theme/ambiance.css
index 0e68f75e4c..d368509e68 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -31,8 +31,8 @@
 .cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
 .cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
 
-.cm-s-ambiance .CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-ambiance.CodeMirror-focused .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-ambiance.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
 .cm-s-ambiance .CodeMirror-line::selection, .cm-s-ambiance .CodeMirror-line > span::selection, .cm-s-ambiance .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-ambiance .CodeMirror-line::-moz-selection, .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index fb79fae2b9..3b3c7ddfe5 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
-.cm-s-base16-dark div.CodeMirror-selected {background: #303030 !important;}
+.cm-s-base16-dark div.CodeMirror-selected {background: #303030;}
 .cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
 .cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
 .cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
diff --git a/theme/base16-light.css b/theme/base16-light.css
index 46508e02c6..1c10113a13 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-base16-light.CodeMirror {background: #f5f5f5; color: #202020;}
-.cm-s-base16-light div.CodeMirror-selected {background: #e0e0e0 !important;}
+.cm-s-base16-light div.CodeMirror-selected {background: #e0e0e0;}
 .cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
 .cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
 .cm-s-base16-light .CodeMirror-gutters {background: #f5f5f5; border-right: 0px;}
diff --git a/theme/blackboard.css b/theme/blackboard.css
index 6de11dd20a..03d6d2eda9 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -1,7 +1,7 @@
 /* Port of TextMate's Blackboard theme */
 
 .cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
-.cm-s-blackboard .CodeMirror-selected { background: #253B76 !important; }
+.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
 .cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
 .cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
 .cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
@@ -29,4 +29,4 @@
 .cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 
 .cm-s-blackboard .CodeMirror-activeline-background {background: #3C3636 !important;}
-.cm-s-blackboard .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
\ No newline at end of file
+.cm-s-blackboard .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
diff --git a/theme/cobalt.css b/theme/cobalt.css
index b6eebcfcff..aced1a5e94 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -1,5 +1,5 @@
 .cm-s-cobalt.CodeMirror { background: #002240; color: white; }
-.cm-s-cobalt div.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
 .cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
 .cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
 .cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
diff --git a/theme/colorforth.css b/theme/colorforth.css
index 73fbf80824..beb7d4d4c7 100644
--- a/theme/colorforth.css
+++ b/theme/colorforth.css
@@ -26,7 +26,7 @@
 .cm-s-colorforth span.cm-attribute   { color: #FFF700; }
 .cm-s-colorforth span.cm-error       { color: #f00; }
 
-.cm-s-colorforth .CodeMirror-selected { background: #333d53 !important; }
+.cm-s-colorforth div.CodeMirror-selected { background: #333d53; }
 
 .cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
 
diff --git a/theme/dracula.css b/theme/dracula.css
index 5c52492033..f06b3e4af1 100644
--- a/theme/dracula.css
+++ b/theme/dracula.css
@@ -16,7 +16,7 @@
 .cm-s-dracula .CodeMirror-gutters { color: #282a36; }
 .cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0 !important; }
 .cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-dracula.CodeMirror-focused .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
 .cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-dracula span.cm-comment { color: #6272a4; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index 48552f862f..bd528b491e 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -1,5 +1,5 @@
 .cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
-.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539; }
 .cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
 .cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
 .cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
diff --git a/theme/icecoder.css b/theme/icecoder.css
index 5ec374342a..a65ae43419 100644
--- a/theme/icecoder.css
+++ b/theme/icecoder.css
@@ -36,7 +36,7 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 .cm-s-icecoder span.cm-error {color: #d00}                      /* red */
 
 .cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important}
-.cm-s-icecoder .CodeMirror-selected {color: #fff !important; background: #037 !important}
+.cm-s-icecoder div.CodeMirror-selected {color: #fff !important; background: #037}
 .cm-s-icecoder .CodeMirror-gutters {background: #141612; min-width: 41px; border-right: 0}
 .cm-s-icecoder .CodeMirror-linenumber {color: #555; cursor: default}
 .cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important}
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 0573c06692..5dadad8915 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -6,7 +6,7 @@ Ported to CodeMirror by Peter Kroon
   line-height: 1.3em;
 }
 .cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
-.cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/
+.cm-s-lesser-dark div.CodeMirror-selected {background: #45443B;} /* 33322B*/
 .cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
 .cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
 .cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
diff --git a/theme/liquibyte.css b/theme/liquibyte.css
index a6e070c6a8..bd978c098f 100644
--- a/theme/liquibyte.css
+++ b/theme/liquibyte.css
@@ -47,7 +47,7 @@
 .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 div.CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25); }
 
 .cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
 
diff --git a/theme/material.css b/theme/material.css
index b048cdc05f..90592a63b2 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -18,8 +18,8 @@
 }
 .cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
 .cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0 !important; }
-.cm-s-material .CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-material.CodeMirror-focused .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
 .cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 
diff --git a/theme/mbo.css b/theme/mbo.css
index cc9032e0ed..f0dbda7a3a 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -5,7 +5,7 @@
 /****************************************************************/
 
 .cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffec;}
-.cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
+.cm-s-mbo div.CodeMirror-selected {background: #716C62;}
 .cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
 .cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
 .cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index 771d4471e5..d3317d9de6 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -8,7 +8,7 @@
 
 */
 .cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
-.cm-s-mdn-like .CodeMirror-selected { background: #cfc !important; }
+.cm-s-mdn-like div.CodeMirror-selected { background: #cfc; }
 .cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection { background: #cfc; }
 .cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection { background: #cfc; }
 
diff --git a/theme/midnight.css b/theme/midnight.css
index 9e9825b3f8..975fb36b2b 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -14,7 +14,7 @@
 
 .cm-s-midnight.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 
-.cm-s-midnight div.CodeMirror-selected {background: #314D67 !important;}
+.cm-s-midnight div.CodeMirror-selected {background: #314D67;}
 .cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
 .cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
 .cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;}
diff --git a/theme/monokai.css b/theme/monokai.css
index e11e80cace..164936a494 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -1,7 +1,7 @@
 /* Based on Sublime Text's Monokai theme */
 
 .cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2;}
-.cm-s-monokai div.CodeMirror-selected {background: #49483E !important;}
+.cm-s-monokai div.CodeMirror-selected {background: #49483E;}
 .cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
 .cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
 .cm-s-monokai .CodeMirror-gutters {background: #272822; border-right: 0px;}
diff --git a/theme/night.css b/theme/night.css
index 6fbbcaa202..39ada7abd1 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -1,7 +1,7 @@
 /* Loosely based on the Midnight Textmate theme */
 
 .cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-night div.CodeMirror-selected { background: #447 !important; }
+.cm-s-night div.CodeMirror-selected { background: #447; }
 .cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
 .cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
 .cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index 2b6a797d0d..4b565328c1 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-paraiso-dark.CodeMirror {background: #2f1e2e; color: #b9b6b0;}
-.cm-s-paraiso-dark div.CodeMirror-selected {background: #41323f !important;}
+.cm-s-paraiso-dark div.CodeMirror-selected {background: #41323f;}
 .cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
 .cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
 .cm-s-paraiso-dark .CodeMirror-gutters {background: #2f1e2e; border-right: 0px;}
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index 01d2e11f54..c3c3d75a36 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-paraiso-light.CodeMirror {background: #e7e9db; color: #41323f;}
-.cm-s-paraiso-light div.CodeMirror-selected {background: #b9b6b0 !important;}
+.cm-s-paraiso-light div.CodeMirror-selected {background: #b9b6b0;}
 .cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
 .cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
 .cm-s-paraiso-light .CodeMirror-gutters {background: #e7e9db; border-right: 0px;}
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index 1c7f84c45b..e995f31158 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -13,7 +13,7 @@
 	line-height: 1.5;
 	font-size: 14px;
 }
-.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2) !important; }
+.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
 .cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
 .cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
 
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index 064f192f78..c03244fad1 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -1,5 +1,5 @@
 .cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
-.cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
+.cm-s-rubyblue div.CodeMirror-selected { background: #38566F; }
 .cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
 .cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
 .cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
diff --git a/theme/seti.css b/theme/seti.css
index 4032b5a859..dc515d58e6 100644
--- a/theme/seti.css
+++ b/theme/seti.css
@@ -20,7 +20,7 @@
 }
 .cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0 !important; }
 .cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-seti.CodeMirror-focused .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
 .cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-seti span.cm-comment { color: #41535b; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 18ed6de63f..56c3ac9b32 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -94,11 +94,11 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   border-bottom: 1px dotted #dc322f;
 }
 
-.cm-s-solarized.cm-s-dark .CodeMirror-selected { background: #073642; }
+.cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
 .cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
 .cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
 
-.cm-s-solarized.cm-s-light .CodeMirror-selected { background: #eee8d5; }
+.cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
 .cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
 .cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
 
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index ec6046ad96..b0af9c4a5d 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -1,5 +1,5 @@
 .cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
-.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D !important; }
+.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D; }
 .cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
 .cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
 .cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
diff --git a/theme/tomorrow-night-bright.css b/theme/tomorrow-night-bright.css
index decb82d3e0..50c779e852 100644
--- a/theme/tomorrow-night-bright.css
+++ b/theme/tomorrow-night-bright.css
@@ -8,7 +8,7 @@
 */
 
 .cm-s-tomorrow-night-bright.CodeMirror {background: #000000; color: #eaeaea;}
-.cm-s-tomorrow-night-bright div.CodeMirror-selected {background: #424242 !important;}
+.cm-s-tomorrow-night-bright div.CodeMirror-selected {background: #424242;}
 .cm-s-tomorrow-night-bright .CodeMirror-gutters {background: #000000; border-right: 0px;}
 .cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
 .cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index a8ee8f5d97..d5e36201d8 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-tomorrow-night-eighties.CodeMirror {background: #000000; color: #CCCCCC;}
-.cm-s-tomorrow-night-eighties div.CodeMirror-selected {background: #2D2D2D !important;}
+.cm-s-tomorrow-night-eighties div.CodeMirror-selected {background: #2D2D2D;}
 .cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
 .cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
 .cm-s-tomorrow-night-eighties .CodeMirror-gutters {background: #000000; border-right: 0px;}
diff --git a/theme/twilight.css b/theme/twilight.css
index 360d44afc9..f3b2253717 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -1,5 +1,5 @@
 .cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
-.cm-s-twilight .CodeMirror-selected { background: #323232 !important; } /**/
+.cm-s-twilight div.CodeMirror-selected { background: #323232; } /**/
 .cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
 .cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
 
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index 8d3e99d386..380728d2f6 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -1,7 +1,7 @@
 /* Taken from the popular Visual Studio Vibrant Ink Schema */
 
 .cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
-.cm-s-vibrant-ink .CodeMirror-selected { background: #35493c !important; }
+.cm-s-vibrant-ink div.CodeMirror-selected { background: #35493c; }
 .cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
 .cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
 
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index 5cdfe8f03a..8514d8eb9c 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 .cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-selected { background: #27007A !important; }
+.cm-s-xq-dark div.CodeMirror-selected { background: #27007A; }
 .cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
 .cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
 .cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
@@ -50,4 +50,4 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-error {color: #f00;}
 
 .cm-s-xq-dark .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-xq-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
\ No newline at end of file
+.cm-s-xq-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
diff --git a/theme/yeti.css b/theme/yeti.css
index 0b0a72edac..75632c41f8 100644
--- a/theme/yeti.css
+++ b/theme/yeti.css
@@ -21,7 +21,7 @@
 }
 .cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0 !important; }
 .cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
-.cm-s-yeti.CodeMirror-focused .CodeMirror-selected { background: #DCD8D2; }
+.cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
 .cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
 .cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
 .cm-s-yeti span.cm-comment { color: #d4c8be; }
diff --git a/theme/zenburn.css b/theme/zenburn.css
index f817198af0..c8114483e9 100644
--- a/theme/zenburn.css
+++ b/theme/zenburn.css
@@ -33,5 +33,5 @@
 .cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
 .cm-s-zenburn .CodeMirror-activeline { background: #000000; }
 .cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
-.cm-s-zenburn .CodeMirror-selected { background: #545454; }
-.cm-s-zenburn .CodeMirror-focused .CodeMirror-selected { background: #4f4f4f; }
+.cm-s-zenburn div.CodeMirror-selected { background: #545454; }
+.cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }

From 3f3a75921f13717c2d81773e3f3999a601ad3ffd Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Sun, 2 Aug 2015 02:23:01 -0700
Subject: [PATCH 2260/4742] Ensure space before opening bracket in css themes

---
 theme/liquibyte.css | 2 +-
 theme/material.css  | 4 ++--
 theme/seti.css      | 2 +-
 theme/yeti.css      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/theme/liquibyte.css b/theme/liquibyte.css
index bd978c098f..fb17c49381 100644
--- a/theme/liquibyte.css
+++ b/theme/liquibyte.css
@@ -20,7 +20,7 @@
 	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-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;}
diff --git a/theme/material.css b/theme/material.css
index 90592a63b2..143c694a11 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -41,11 +41,11 @@
 .cm-s-material span.cm-comment { color: #546E7A; }
 .cm-s-material span.cm-variable { color: #82B1FF; }
 .cm-s-material span.cm-tag { color: #80CBC4; }
-.cm-s-material span.cm-meta{ color: #80CBC4; }
+.cm-s-material span.cm-meta { color: #80CBC4; }
 .cm-s-material span.cm-attribute { color: #FFCB6B; }
 .cm-s-material span.cm-property { color: #80CBAE; }
 .cm-s-material span.cm-qualifier { color: #DECB6B; }
-.cm-s-material span.cm-variable-3{ color: #DECB6B; }
+.cm-s-material span.cm-variable-3 { color: #DECB6B; }
 .cm-s-material span.cm-tag { color: rgba(255, 83, 112, 1); }
 .cm-s-material .CodeMirror-matchingbracket {
   text-decoration: underline;
diff --git a/theme/seti.css b/theme/seti.css
index dc515d58e6..9303e10450 100644
--- a/theme/seti.css
+++ b/theme/seti.css
@@ -13,7 +13,7 @@
   color: #CFD2D1 !important;
   border: none;
 }
-.cm-s-seti .CodeMirror-gutters{
+.cm-s-seti .CodeMirror-gutters {
   color: #404b53;
   background-color: #0E1112;
   border: none;
diff --git a/theme/yeti.css b/theme/yeti.css
index 75632c41f8..c7e93764d9 100644
--- a/theme/yeti.css
+++ b/theme/yeti.css
@@ -14,7 +14,7 @@
   border: none;
 }
 
-.cm-s-yeti .CodeMirror-gutters{
+.cm-s-yeti .CodeMirror-gutters {
   color: #adaba6;
   background-color: #E5E1DB;
   border: none;

From 857be8fbbf3007cdc9bf2b7ad995e94976560a8f Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Sun, 2 Aug 2015 02:26:13 -0700
Subject: [PATCH 2261/4742] Standardize formatting in one-line theme css
 definitions

---
 theme/3024-day.css                | 40 +++++++-------
 theme/3024-night.css              | 40 +++++++-------
 theme/ambiance.css                |  8 +--
 theme/base16-dark.css             | 48 ++++++++--------
 theme/base16-light.css            | 48 ++++++++--------
 theme/blackboard.css              |  6 +-
 theme/cobalt.css                  |  4 +-
 theme/colorforth.css              |  2 +-
 theme/dracula.css                 |  4 +-
 theme/eclipse.css                 | 42 +++++++-------
 theme/elegant.css                 | 24 ++++----
 theme/erlang-dark.css             |  4 +-
 theme/icecoder.css                | 58 +++++++++----------
 theme/lesser-dark.css             | 26 ++++-----
 theme/liquibyte.css               |  4 +-
 theme/mbo.css                     | 46 ++++++++--------
 theme/mdn-like.css                |  8 +--
 theme/midnight.css                | 40 +++++++-------
 theme/monokai.css                 | 42 +++++++-------
 theme/neat.css                    |  6 +-
 theme/neo.css                     | 12 ++--
 theme/night.css                   |  4 +-
 theme/paraiso-dark.css            | 48 ++++++++--------
 theme/paraiso-light.css           | 48 ++++++++--------
 theme/rubyblue.css                |  2 +-
 theme/seti.css                    |  4 +-
 theme/solarized.css               |  8 +--
 theme/the-matrix.css              | 38 ++++++-------
 theme/tomorrow-night-bright.css   | 48 ++++++++--------
 theme/tomorrow-night-eighties.css | 48 ++++++++--------
 theme/ttcn.css                    | 92 +++++++++++++++----------------
 theme/twilight.css                | 10 ++--
 theme/vibrant-ink.css             | 14 ++---
 theme/xq-dark.css                 | 36 ++++++------
 theme/xq-light.css                | 36 ++++++------
 theme/yeti.css                    |  4 +-
 36 files changed, 476 insertions(+), 476 deletions(-)

diff --git a/theme/3024-day.css b/theme/3024-day.css
index c051088eac..b5d304aef4 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -8,34 +8,34 @@
 
 */
 
-.cm-s-3024-day.CodeMirror {background: #f7f7f7; color: #3a3432;}
-.cm-s-3024-day div.CodeMirror-selected {background: #d6d5d4;}
+.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
+.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }
 
 .cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
 .cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
 
-.cm-s-3024-day .CodeMirror-gutters {background: #f7f7f7; border-right: 0px;}
+.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
 .cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
 .cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
-.cm-s-3024-day .CodeMirror-linenumber {color: #807d7c;}
+.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
 
-.cm-s-3024-day .CodeMirror-cursor {border-left: 1px solid #5c5855 !important;}
+.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855 !important; }
 
-.cm-s-3024-day span.cm-comment {color: #cdab53;}
-.cm-s-3024-day span.cm-atom {color: #a16a94;}
-.cm-s-3024-day span.cm-number {color: #a16a94;}
+.cm-s-3024-day span.cm-comment { color: #cdab53; }
+.cm-s-3024-day span.cm-atom { color: #a16a94; }
+.cm-s-3024-day span.cm-number { color: #a16a94; }
 
-.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute {color: #01a252;}
-.cm-s-3024-day span.cm-keyword {color: #db2d20;}
-.cm-s-3024-day span.cm-string {color: #fded02;}
+.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
+.cm-s-3024-day span.cm-keyword { color: #db2d20; }
+.cm-s-3024-day span.cm-string { color: #fded02; }
 
-.cm-s-3024-day span.cm-variable {color: #01a252;}
-.cm-s-3024-day span.cm-variable-2 {color: #01a0e4;}
-.cm-s-3024-day span.cm-def {color: #e8bbd0;}
-.cm-s-3024-day span.cm-bracket {color: #3a3432;}
-.cm-s-3024-day span.cm-tag {color: #db2d20;}
-.cm-s-3024-day span.cm-link {color: #a16a94;}
-.cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
+.cm-s-3024-day span.cm-variable { color: #01a252; }
+.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-day span.cm-def { color: #e8bbd0; }
+.cm-s-3024-day span.cm-bracket { color: #3a3432; }
+.cm-s-3024-day span.cm-tag { color: #db2d20; }
+.cm-s-3024-day span.cm-link { color: #a16a94; }
+.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
 
-.cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important;}
+.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/theme/3024-night.css b/theme/3024-night.css
index cd09ada671..df5c201ab8 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -8,32 +8,32 @@
 
 */
 
-.cm-s-3024-night.CodeMirror {background: #090300; color: #d6d5d4;}
-.cm-s-3024-night div.CodeMirror-selected {background: #3a3432;}
+.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
+.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
 .cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
 .cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night .CodeMirror-gutters {background: #090300; border-right: 0px;}
+.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
 .cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
 .cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
-.cm-s-3024-night .CodeMirror-linenumber {color: #5c5855;}
+.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
 
-.cm-s-3024-night .CodeMirror-cursor {border-left: 1px solid #807d7c !important;}
+.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c !important; }
 
-.cm-s-3024-night span.cm-comment {color: #cdab53;}
-.cm-s-3024-night span.cm-atom {color: #a16a94;}
-.cm-s-3024-night span.cm-number {color: #a16a94;}
+.cm-s-3024-night span.cm-comment { color: #cdab53; }
+.cm-s-3024-night span.cm-atom { color: #a16a94; }
+.cm-s-3024-night span.cm-number { color: #a16a94; }
 
-.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute {color: #01a252;}
-.cm-s-3024-night span.cm-keyword {color: #db2d20;}
-.cm-s-3024-night span.cm-string {color: #fded02;}
+.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
+.cm-s-3024-night span.cm-keyword { color: #db2d20; }
+.cm-s-3024-night span.cm-string { color: #fded02; }
 
-.cm-s-3024-night span.cm-variable {color: #01a252;}
-.cm-s-3024-night span.cm-variable-2 {color: #01a0e4;}
-.cm-s-3024-night span.cm-def {color: #e8bbd0;}
-.cm-s-3024-night span.cm-bracket {color: #d6d5d4;}
-.cm-s-3024-night span.cm-tag {color: #db2d20;}
-.cm-s-3024-night span.cm-link {color: #a16a94;}
-.cm-s-3024-night span.cm-error {background: #db2d20; color: #807d7c;}
+.cm-s-3024-night span.cm-variable { color: #01a252; }
+.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-night span.cm-def { color: #e8bbd0; }
+.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
+.cm-s-3024-night span.cm-tag { color: #db2d20; }
+.cm-s-3024-night span.cm-link { color: #a16a94; }
+.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
 
-.cm-s-3024-night .CodeMirror-activeline-background {background: #2F2F2F !important;}
-.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F !important; }
+.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/ambiance.css b/theme/ambiance.css
index d368509e68..b785ec8cf8 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -2,7 +2,7 @@
 
 /* Color scheme */
 
-.cm-s-ambiance .cm-header {color: blue;}
+.cm-s-ambiance .cm-header { color: blue; }
 .cm-s-ambiance .cm-quote { color: #24C2C7; }
 
 .cm-s-ambiance .cm-keyword { color: #cda869; }
@@ -13,7 +13,7 @@
 .cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
 .cm-s-ambiance .cm-variable-3 { color: #faded3; }
 .cm-s-ambiance .cm-property { color: #eed1b3; }
-.cm-s-ambiance .cm-operator {color: #fa8d6a;}
+.cm-s-ambiance .cm-operator { color: #fa8d6a; }
 .cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
 .cm-s-ambiance .cm-string { color: #8f9d6a; }
 .cm-s-ambiance .cm-string-2 { color: #9d937c; }
@@ -21,8 +21,8 @@
 .cm-s-ambiance .cm-qualifier { color: yellow; }
 .cm-s-ambiance .cm-builtin { color: #9999cc; }
 .cm-s-ambiance .cm-bracket { color: #24C2C7; }
-.cm-s-ambiance .cm-tag { color: #fee4ff }
-.cm-s-ambiance .cm-attribute {  color: #9B859D; }
+.cm-s-ambiance .cm-tag { color: #fee4ff; }
+.cm-s-ambiance .cm-attribute { color: #9B859D; }
 .cm-s-ambiance .cm-hr { color: pink; }
 .cm-s-ambiance .cm-link { color: #F4C20B; }
 .cm-s-ambiance .cm-special { color: #FF9D00; }
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 3b3c7ddfe5..e521cf68c0 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -8,31 +8,31 @@
 
 */
 
-.cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
-.cm-s-base16-dark div.CodeMirror-selected {background: #303030;}
+.cm-s-base16-dark.CodeMirror { background: #151515; color: #e0e0e0; }
+.cm-s-base16-dark div.CodeMirror-selected { background: #303030; }
 .cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
 .cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
+.cm-s-base16-dark .CodeMirror-gutters { background: #151515; border-right: 0px; }
 .cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
-.cm-s-base16-dark .CodeMirror-linenumber {color: #505050;}
-.cm-s-base16-dark .CodeMirror-cursor {border-left: 1px solid #b0b0b0 !important;}
-
-.cm-s-base16-dark span.cm-comment {color: #8f5536;}
-.cm-s-base16-dark span.cm-atom {color: #aa759f;}
-.cm-s-base16-dark span.cm-number {color: #aa759f;}
-
-.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute {color: #90a959;}
-.cm-s-base16-dark span.cm-keyword {color: #ac4142;}
-.cm-s-base16-dark span.cm-string {color: #f4bf75;}
-
-.cm-s-base16-dark span.cm-variable {color: #90a959;}
-.cm-s-base16-dark span.cm-variable-2 {color: #6a9fb5;}
-.cm-s-base16-dark span.cm-def {color: #d28445;}
-.cm-s-base16-dark span.cm-bracket {color: #e0e0e0;}
-.cm-s-base16-dark span.cm-tag {color: #ac4142;}
-.cm-s-base16-dark span.cm-link {color: #aa759f;}
-.cm-s-base16-dark span.cm-error {background: #ac4142; color: #b0b0b0;}
-
-.cm-s-base16-dark .CodeMirror-activeline-background {background: #202020 !important;}
-.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
+.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0 !important; }
+
+.cm-s-base16-dark span.cm-comment { color: #8f5536; }
+.cm-s-base16-dark span.cm-atom { color: #aa759f; }
+.cm-s-base16-dark span.cm-number { color: #aa759f; }
+
+.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute { color: #90a959; }
+.cm-s-base16-dark span.cm-keyword { color: #ac4142; }
+.cm-s-base16-dark span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-dark span.cm-variable { color: #90a959; }
+.cm-s-base16-dark span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-dark span.cm-def { color: #d28445; }
+.cm-s-base16-dark span.cm-bracket { color: #e0e0e0; }
+.cm-s-base16-dark span.cm-tag { color: #ac4142; }
+.cm-s-base16-dark span.cm-link { color: #aa759f; }
+.cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
+
+.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020 !important; }
+.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/base16-light.css b/theme/base16-light.css
index 1c10113a13..cb006496fa 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -8,31 +8,31 @@
 
 */
 
-.cm-s-base16-light.CodeMirror {background: #f5f5f5; color: #202020;}
-.cm-s-base16-light div.CodeMirror-selected {background: #e0e0e0;}
+.cm-s-base16-light.CodeMirror { background: #f5f5f5; color: #202020; }
+.cm-s-base16-light div.CodeMirror-selected { background: #e0e0e0; }
 .cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
 .cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-gutters {background: #f5f5f5; border-right: 0px;}
+.cm-s-base16-light .CodeMirror-gutters { background: #f5f5f5; border-right: 0px; }
 .cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-linenumber {color: #b0b0b0;}
-.cm-s-base16-light .CodeMirror-cursor {border-left: 1px solid #505050 !important;}
-
-.cm-s-base16-light span.cm-comment {color: #8f5536;}
-.cm-s-base16-light span.cm-atom {color: #aa759f;}
-.cm-s-base16-light span.cm-number {color: #aa759f;}
-
-.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute {color: #90a959;}
-.cm-s-base16-light span.cm-keyword {color: #ac4142;}
-.cm-s-base16-light span.cm-string {color: #f4bf75;}
-
-.cm-s-base16-light span.cm-variable {color: #90a959;}
-.cm-s-base16-light span.cm-variable-2 {color: #6a9fb5;}
-.cm-s-base16-light span.cm-def {color: #d28445;}
-.cm-s-base16-light span.cm-bracket {color: #202020;}
-.cm-s-base16-light span.cm-tag {color: #ac4142;}
-.cm-s-base16-light span.cm-link {color: #aa759f;}
-.cm-s-base16-light span.cm-error {background: #ac4142; color: #505050;}
-
-.cm-s-base16-light .CodeMirror-activeline-background {background: #DDDCDC !important;}
-.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
+.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050 !important; }
+
+.cm-s-base16-light span.cm-comment { color: #8f5536; }
+.cm-s-base16-light span.cm-atom { color: #aa759f; }
+.cm-s-base16-light span.cm-number { color: #aa759f; }
+
+.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute { color: #90a959; }
+.cm-s-base16-light span.cm-keyword { color: #ac4142; }
+.cm-s-base16-light span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-light span.cm-variable { color: #90a959; }
+.cm-s-base16-light span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-light span.cm-def { color: #d28445; }
+.cm-s-base16-light span.cm-bracket { color: #202020; }
+.cm-s-base16-light span.cm-tag { color: #ac4142; }
+.cm-s-base16-light span.cm-link { color: #aa759f; }
+.cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
+
+.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC !important; }
+.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/blackboard.css b/theme/blackboard.css
index 03d6d2eda9..0e21e8665d 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -15,7 +15,7 @@
 .cm-s-blackboard .cm-number { color: #D8FA3C; }
 .cm-s-blackboard .cm-def { color: #8DA6CE; }
 .cm-s-blackboard .cm-variable { color: #FF6400; }
-.cm-s-blackboard .cm-operator { color: #FBDE2D;}
+.cm-s-blackboard .cm-operator { color: #FBDE2D; }
 .cm-s-blackboard .cm-comment { color: #AEAEAE; }
 .cm-s-blackboard .cm-string { color: #61CE3C; }
 .cm-s-blackboard .cm-string-2 { color: #61CE3C; }
@@ -28,5 +28,5 @@
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
 .cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 
-.cm-s-blackboard .CodeMirror-activeline-background {background: #3C3636 !important;}
-.cm-s-blackboard .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636 !important; }
+.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/theme/cobalt.css b/theme/cobalt.css
index aced1a5e94..9e54d4356a 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -21,5 +21,5 @@
 .cm-s-cobalt span.cm-link { color: #845dc4; }
 .cm-s-cobalt span.cm-error { color: #9d1e15; }
 
-.cm-s-cobalt .CodeMirror-activeline-background {background: #002D57 !important;}
-.cm-s-cobalt .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
+.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57 !important; }
+.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/theme/colorforth.css b/theme/colorforth.css
index beb7d4d4c7..004cdbb569 100644
--- a/theme/colorforth.css
+++ b/theme/colorforth.css
@@ -30,4 +30,4 @@
 
 .cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
 
-.cm-s-colorforth .CodeMirror-activeline-background {background: #253540 !important;}
+.cm-s-colorforth .CodeMirror-activeline-background { background: #253540 !important; }
diff --git a/theme/dracula.css b/theme/dracula.css
index f06b3e4af1..c0a1315265 100644
--- a/theme/dracula.css
+++ b/theme/dracula.css
@@ -37,5 +37,5 @@
 .cm-s-dracula span.cm-builtin { color: #50fa7b; }
 .cm-s-dracula span.cm-variable-3 { color: #50fa7b; }
 
-.cm-s-dracula .CodeMirror-activeline-background {background: rgba(255,255,255,0.1) !important;}
-.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1) !important; }
+.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/eclipse.css b/theme/eclipse.css
index 317218e3d2..6a6fc76861 100644
--- a/theme/eclipse.css
+++ b/theme/eclipse.css
@@ -1,23 +1,23 @@
-.cm-s-eclipse span.cm-meta {color: #FF1717;}
+.cm-s-eclipse span.cm-meta { color: #FF1717; }
 .cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
-.cm-s-eclipse span.cm-atom {color: #219;}
-.cm-s-eclipse span.cm-number {color: #164;}
-.cm-s-eclipse span.cm-def {color: #00f;}
-.cm-s-eclipse span.cm-variable {color: black;}
-.cm-s-eclipse span.cm-variable-2 {color: #0000C0;}
-.cm-s-eclipse span.cm-variable-3 {color: #0000C0;}
-.cm-s-eclipse span.cm-property {color: black;}
-.cm-s-eclipse span.cm-operator {color: black;}
-.cm-s-eclipse span.cm-comment {color: #3F7F5F;}
-.cm-s-eclipse span.cm-string {color: #2A00FF;}
-.cm-s-eclipse span.cm-string-2 {color: #f50;}
-.cm-s-eclipse span.cm-qualifier {color: #555;}
-.cm-s-eclipse span.cm-builtin {color: #30a;}
-.cm-s-eclipse span.cm-bracket {color: #cc7;}
-.cm-s-eclipse span.cm-tag {color: #170;}
-.cm-s-eclipse span.cm-attribute {color: #00c;}
-.cm-s-eclipse span.cm-link {color: #219;}
-.cm-s-eclipse span.cm-error {color: #f00;}
+.cm-s-eclipse span.cm-atom { color: #219; }
+.cm-s-eclipse span.cm-number { color: #164; }
+.cm-s-eclipse span.cm-def { color: #00f; }
+.cm-s-eclipse span.cm-variable { color: black; }
+.cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
+.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
+.cm-s-eclipse span.cm-property { color: black; }
+.cm-s-eclipse span.cm-operator { color: black; }
+.cm-s-eclipse span.cm-comment { color: #3F7F5F; }
+.cm-s-eclipse span.cm-string { color: #2A00FF; }
+.cm-s-eclipse span.cm-string-2 { color: #f50; }
+.cm-s-eclipse span.cm-qualifier { color: #555; }
+.cm-s-eclipse span.cm-builtin { color: #30a; }
+.cm-s-eclipse span.cm-bracket { color: #cc7; }
+.cm-s-eclipse span.cm-tag { color: #170; }
+.cm-s-eclipse span.cm-attribute { color: #00c; }
+.cm-s-eclipse span.cm-link { color: #219; }
+.cm-s-eclipse span.cm-error { color: #f00; }
 
-.cm-s-eclipse .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-eclipse .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
+.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/elegant.css b/theme/elegant.css
index dd7df7b73c..45a1e86f80 100644
--- a/theme/elegant.css
+++ b/theme/elegant.css
@@ -1,13 +1,13 @@
-.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;}
-.cm-s-elegant span.cm-comment {color: #262; font-style: italic; line-height: 1em;}
-.cm-s-elegant span.cm-meta {color: #555; font-style: italic; line-height: 1em;}
-.cm-s-elegant span.cm-variable {color: black;}
-.cm-s-elegant span.cm-variable-2 {color: #b11;}
-.cm-s-elegant span.cm-qualifier {color: #555;}
-.cm-s-elegant span.cm-keyword {color: #730;}
-.cm-s-elegant span.cm-builtin {color: #30a;}
-.cm-s-elegant span.cm-link {color: #762;}
-.cm-s-elegant span.cm-error {background-color: #fdd;}
+.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom { color: #762; }
+.cm-s-elegant span.cm-comment { color: #262; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-meta { color: #555; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-variable { color: black; }
+.cm-s-elegant span.cm-variable-2 { color: #b11; }
+.cm-s-elegant span.cm-qualifier { color: #555; }
+.cm-s-elegant span.cm-keyword { color: #730; }
+.cm-s-elegant span.cm-builtin { color: #30a; }
+.cm-s-elegant span.cm-link { color: #762; }
+.cm-s-elegant span.cm-error { background-color: #fdd; }
 
-.cm-s-elegant .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-elegant .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
+.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index bd528b491e..8aa476bf4b 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -30,5 +30,5 @@
 .cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
 .cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
-.cm-s-erlang-dark .CodeMirror-activeline-background {background: #013461 !important;}
-.cm-s-erlang-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461 !important; }
+.cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/icecoder.css b/theme/icecoder.css
index a65ae43419..089217aed5 100644
--- a/theme/icecoder.css
+++ b/theme/icecoder.css
@@ -2,41 +2,41 @@
 ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
 */
 
-.cm-s-icecoder {color: #666; background: #141612}
+.cm-s-icecoder { color: #666; background: #141612; }
 
-.cm-s-icecoder span.cm-keyword {color: #eee; font-weight:bold}  /* off-white 1 */
-.cm-s-icecoder span.cm-atom {color: #e1c76e}                    /* yellow */
-.cm-s-icecoder span.cm-number {color: #6cb5d9}                  /* blue */
-.cm-s-icecoder span.cm-def {color: #b9ca4a}                     /* green */
+.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
+.cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-number { color: #6cb5d9; }                  /* blue */
+.cm-s-icecoder span.cm-def { color: #b9ca4a; }                     /* green */
 
-.cm-s-icecoder span.cm-variable {color: #6cb5d9}                /* blue */
-.cm-s-icecoder span.cm-variable-2 {color: #cc1e5c}              /* pink */
-.cm-s-icecoder span.cm-variable-3 {color: #f9602c}              /* orange */
+.cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
+.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
+.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
 
-.cm-s-icecoder span.cm-property {color: #eee}                   /* off-white 1 */
-.cm-s-icecoder span.cm-operator {color: #9179bb}                /* purple */
-.cm-s-icecoder span.cm-comment {color: #97a3aa}                 /* grey-blue */
+.cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
+.cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
+.cm-s-icecoder span.cm-comment { color: #97a3aa; }                 /* grey-blue */
 
-.cm-s-icecoder span.cm-string {color: #b9ca4a}                  /* green */
-.cm-s-icecoder span.cm-string-2 {color: #6cb5d9}                /* blue */
+.cm-s-icecoder span.cm-string { color: #b9ca4a; }                  /* green */
+.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; }                /* blue */
 
-.cm-s-icecoder span.cm-meta {color: #555}                       /* grey */
+.cm-s-icecoder span.cm-meta { color: #555; }                       /* grey */
 
-.cm-s-icecoder span.cm-qualifier {color: #555}                  /* grey */
-.cm-s-icecoder span.cm-builtin {color: #214e7b}                 /* bright blue */
-.cm-s-icecoder span.cm-bracket {color: #cc7}                    /* grey-yellow */
+.cm-s-icecoder span.cm-qualifier { color: #555; }                  /* grey */
+.cm-s-icecoder span.cm-builtin { color: #214e7b; }                 /* bright blue */
+.cm-s-icecoder span.cm-bracket { color: #cc7; }                    /* grey-yellow */
 
-.cm-s-icecoder span.cm-tag {color: #e8e8e8}                     /* off-white 2 */
-.cm-s-icecoder span.cm-attribute {color: #099}                  /* teal */
+.cm-s-icecoder span.cm-tag { color: #e8e8e8; }                     /* off-white 2 */
+.cm-s-icecoder span.cm-attribute { color: #099; }                  /* teal */
 
-.cm-s-icecoder span.cm-header {color: #6a0d6a}                  /* purple-pink */
-.cm-s-icecoder span.cm-quote {color: #186718}                   /* dark green */
-.cm-s-icecoder span.cm-hr {color: #888}                         /* mid-grey */
-.cm-s-icecoder span.cm-link {color: #e1c76e}                    /* yellow */
-.cm-s-icecoder span.cm-error {color: #d00}                      /* red */
+.cm-s-icecoder span.cm-header { color: #6a0d6a; }                  /* purple-pink */
+.cm-s-icecoder span.cm-quote { color: #186718; }                   /* dark green */
+.cm-s-icecoder span.cm-hr { color: #888; }                         /* mid-grey */
+.cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
 
-.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important}
-.cm-s-icecoder div.CodeMirror-selected {color: #fff !important; background: #037}
-.cm-s-icecoder .CodeMirror-gutters {background: #141612; min-width: 41px; border-right: 0}
-.cm-s-icecoder .CodeMirror-linenumber {color: #555; cursor: default}
-.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important}
+.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-icecoder div.CodeMirror-selected { color: #fff !important; background: #037; }
+.cm-s-icecoder .CodeMirror-gutters { background: #141612; min-width: 41px; border-right: 0; }
+.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
+.cm-s-icecoder .CodeMirror-matchingbracket { border: 1px solid grey; color: black !important; }
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 5dadad8915..bbaa00b104 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -6,7 +6,7 @@ Ported to CodeMirror by Peter Kroon
   line-height: 1.3em;
 }
 .cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
-.cm-s-lesser-dark div.CodeMirror-selected {background: #45443B;} /* 33322B*/
+.cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
 .cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
 .cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
 .cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
@@ -19,29 +19,29 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
 .cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
 
-.cm-s-lesser-dark span.cm-header {color: #a0a;}
-.cm-s-lesser-dark span.cm-quote {color: #090;}
+.cm-s-lesser-dark span.cm-header { color: #a0a; }
+.cm-s-lesser-dark span.cm-quote { color: #090; }
 .cm-s-lesser-dark span.cm-keyword { color: #599eff; }
 .cm-s-lesser-dark span.cm-atom { color: #C2B470; }
 .cm-s-lesser-dark span.cm-number { color: #B35E4D; }
-.cm-s-lesser-dark span.cm-def {color: white;}
+.cm-s-lesser-dark span.cm-def { color: white; }
 .cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
 .cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
 .cm-s-lesser-dark span.cm-variable-3 { color: white; }
-.cm-s-lesser-dark span.cm-property {color: #92A75C;}
-.cm-s-lesser-dark span.cm-operator {color: #92A75C;}
+.cm-s-lesser-dark span.cm-property { color: #92A75C; }
+.cm-s-lesser-dark span.cm-operator { color: #92A75C; }
 .cm-s-lesser-dark span.cm-comment { color: #666; }
 .cm-s-lesser-dark span.cm-string { color: #BCD279; }
-.cm-s-lesser-dark span.cm-string-2 {color: #f50;}
+.cm-s-lesser-dark span.cm-string-2 { color: #f50; }
 .cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-qualifier {color: #555;}
+.cm-s-lesser-dark span.cm-qualifier { color: #555; }
 .cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
 .cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
 .cm-s-lesser-dark span.cm-tag { color: #669199; }
-.cm-s-lesser-dark span.cm-attribute {color: #00c;}
-.cm-s-lesser-dark span.cm-hr {color: #999;}
-.cm-s-lesser-dark span.cm-link {color: #00c;}
+.cm-s-lesser-dark span.cm-attribute { color: #00c; }
+.cm-s-lesser-dark span.cm-hr { color: #999; }
+.cm-s-lesser-dark span.cm-link { color: #00c; }
 .cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 
-.cm-s-lesser-dark .CodeMirror-activeline-background {background: #3C3A3A !important;}
-.cm-s-lesser-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A !important; }
+.cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/liquibyte.css b/theme/liquibyte.css
index fb17c49381..f51d712a98 100644
--- a/theme/liquibyte.css
+++ b/theme/liquibyte.css
@@ -23,7 +23,7 @@
 .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-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; }
@@ -51,7 +51,7 @@
 
 .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;}
+.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; }
diff --git a/theme/mbo.css b/theme/mbo.css
index f0dbda7a3a..717033ed3d 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -4,34 +4,34 @@
 /*   Create your own: http://tmtheme-editor.herokuapp.com       */
 /****************************************************************/
 
-.cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffec;}
-.cm-s-mbo div.CodeMirror-selected {background: #716C62;}
+.cm-s-mbo.CodeMirror { background: #2c2c2c; color: #ffffec; }
+.cm-s-mbo div.CodeMirror-selected { background: #716C62; }
 .cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
 .cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
+.cm-s-mbo .CodeMirror-gutters { background: #4e4e4e; border-right: 0px; }
 .cm-s-mbo .CodeMirror-guttermarker { color: white; }
 .cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
-.cm-s-mbo .CodeMirror-linenumber {color: #dadada;}
-.cm-s-mbo .CodeMirror-cursor {border-left: 1px solid #ffffec !important;}
+.cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
+.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec !important; }
 
-.cm-s-mbo span.cm-comment {color: #95958a;}
-.cm-s-mbo span.cm-atom {color: #00a8c6;}
-.cm-s-mbo span.cm-number {color: #00a8c6;}
+.cm-s-mbo span.cm-comment { color: #95958a; }
+.cm-s-mbo span.cm-atom { color: #00a8c6; }
+.cm-s-mbo span.cm-number { color: #00a8c6; }
 
-.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute {color: #9ddfe9;}
-.cm-s-mbo span.cm-keyword {color: #ffb928;}
-.cm-s-mbo span.cm-string {color: #ffcf6c;}
-.cm-s-mbo span.cm-string.cm-property {color: #ffffec;}
+.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; }
+.cm-s-mbo span.cm-keyword { color: #ffb928; }
+.cm-s-mbo span.cm-string { color: #ffcf6c; }
+.cm-s-mbo span.cm-string.cm-property { color: #ffffec; }
 
-.cm-s-mbo span.cm-variable {color: #ffffec;}
-.cm-s-mbo span.cm-variable-2 {color: #00a8c6;}
-.cm-s-mbo span.cm-def {color: #ffffec;}
-.cm-s-mbo span.cm-bracket {color: #fffffc; font-weight: bold;}
-.cm-s-mbo span.cm-tag {color: #9ddfe9;}
-.cm-s-mbo span.cm-link {color: #f54b07;}
-.cm-s-mbo span.cm-error {border-bottom: #636363; color: #ffffec;}
-.cm-s-mbo span.cm-qualifier {color: #ffffec;}
+.cm-s-mbo span.cm-variable { color: #ffffec; }
+.cm-s-mbo span.cm-variable-2 { color: #00a8c6; }
+.cm-s-mbo span.cm-def { color: #ffffec; }
+.cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; }
+.cm-s-mbo span.cm-tag { color: #9ddfe9; }
+.cm-s-mbo span.cm-link { color: #f54b07; }
+.cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
+.cm-s-mbo span.cm-qualifier { color: #ffffec; }
 
-.cm-s-mbo .CodeMirror-activeline-background {background: #494b41 !important;}
-.cm-s-mbo .CodeMirror-matchingbracket {color: #222 !important;}
-.cm-s-mbo .CodeMirror-matchingtag {background: rgba(255, 255, 255, .37);}
+.cm-s-mbo .CodeMirror-activeline-background { background: #494b41 !important; }
+.cm-s-mbo .CodeMirror-matchingbracket { color: #222 !important; }
+.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index d3317d9de6..5837a8ebee 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -16,7 +16,7 @@
 .cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
 div.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
 
-.cm-s-mdn-like .cm-keyword {  color: #6262FF; }
+.cm-s-mdn-like .cm-keyword { color: #6262FF; }
 .cm-s-mdn-like .cm-atom { color: #F90; }
 .cm-s-mdn-like .cm-number { color:  #ca7841; }
 .cm-s-mdn-like .cm-def { color: #8DA6CE; }
@@ -37,10 +37,10 @@ div.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
 .cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
 .cm-s-mdn-like .cm-header { color: #FF6400; }
 .cm-s-mdn-like .cm-hr { color: #AEAEAE; }
-.cm-s-mdn-like .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; }
+.cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
 .cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
 
-div.cm-s-mdn-like .CodeMirror-activeline-background {background: #efefff;}
-div.cm-s-mdn-like span.CodeMirror-matchingbracket {outline:1px solid grey; color: inherit;}
+div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
+div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
 
 .cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }
diff --git a/theme/midnight.css b/theme/midnight.css
index 975fb36b2b..b13095deef 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -5,41 +5,41 @@
 .cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
 
 /*<!--activeline-->*/
-.cm-s-midnight .CodeMirror-activeline-background {background: #253540 !important;}
+.cm-s-midnight .CodeMirror-activeline-background { background: #253540 !important; }
 
 .cm-s-midnight.CodeMirror {
     background: #0F192A;
     color: #D1EDFF;
 }
 
-.cm-s-midnight.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+.cm-s-midnight.CodeMirror { border-top: 1px solid black; border-bottom: 1px solid black; }
 
-.cm-s-midnight div.CodeMirror-selected {background: #314D67;}
+.cm-s-midnight div.CodeMirror-selected { background: #314D67; }
 .cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
 .cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;}
+.cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; }
 .cm-s-midnight .CodeMirror-guttermarker { color: white; }
 .cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-midnight .CodeMirror-linenumber {color: #D0D0D0;}
+.cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
 .cm-s-midnight .CodeMirror-cursor {
     border-left: 1px solid #F8F8F0 !important;
 }
 
-.cm-s-midnight span.cm-comment {color: #428BDD;}
-.cm-s-midnight span.cm-atom {color: #AE81FF;}
-.cm-s-midnight span.cm-number {color: #D1EDFF;}
-
-.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute {color: #A6E22E;}
-.cm-s-midnight span.cm-keyword {color: #E83737;}
-.cm-s-midnight span.cm-string {color: #1DC116;}
-
-.cm-s-midnight span.cm-variable {color: #FFAA3E;}
-.cm-s-midnight span.cm-variable-2 {color: #FFAA3E;}
-.cm-s-midnight span.cm-def {color: #4DD;}
-.cm-s-midnight span.cm-bracket {color: #D1EDFF;}
-.cm-s-midnight span.cm-tag {color: #449;}
-.cm-s-midnight span.cm-link {color: #AE81FF;}
-.cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;}
+.cm-s-midnight span.cm-comment { color: #428BDD; }
+.cm-s-midnight span.cm-atom { color: #AE81FF; }
+.cm-s-midnight span.cm-number { color: #D1EDFF; }
+
+.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute { color: #A6E22E; }
+.cm-s-midnight span.cm-keyword { color: #E83737; }
+.cm-s-midnight span.cm-string { color: #1DC116; }
+
+.cm-s-midnight span.cm-variable { color: #FFAA3E; }
+.cm-s-midnight span.cm-variable-2 { color: #FFAA3E; }
+.cm-s-midnight span.cm-def { color: #4DD; }
+.cm-s-midnight span.cm-bracket { color: #D1EDFF; }
+.cm-s-midnight span.cm-tag { color: #449; }
+.cm-s-midnight span.cm-link { color: #AE81FF; }
+.cm-s-midnight span.cm-error { background: #F92672; color: #F8F8F0; }
 
 .cm-s-midnight .CodeMirror-matchingbracket {
   text-decoration: underline;
diff --git a/theme/monokai.css b/theme/monokai.css
index 164936a494..7607fa585d 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -1,34 +1,34 @@
 /* Based on Sublime Text's Monokai theme */
 
-.cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2;}
-.cm-s-monokai div.CodeMirror-selected {background: #49483E;}
+.cm-s-monokai.CodeMirror { background: #272822; color: #f8f8f2; }
+.cm-s-monokai div.CodeMirror-selected { background: #49483E; }
 .cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
 .cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai .CodeMirror-gutters {background: #272822; border-right: 0px;}
+.cm-s-monokai .CodeMirror-gutters { background: #272822; border-right: 0px; }
 .cm-s-monokai .CodeMirror-guttermarker { color: white; }
 .cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-linenumber {color: #d0d0d0;}
-.cm-s-monokai .CodeMirror-cursor {border-left: 1px solid #f8f8f0 !important;}
+.cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0 !important; }
 
-.cm-s-monokai span.cm-comment {color: #75715e;}
-.cm-s-monokai span.cm-atom {color: #ae81ff;}
-.cm-s-monokai span.cm-number {color: #ae81ff;}
+.cm-s-monokai span.cm-comment { color: #75715e; }
+.cm-s-monokai span.cm-atom { color: #ae81ff; }
+.cm-s-monokai span.cm-number { color: #ae81ff; }
 
-.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute {color: #a6e22e;}
-.cm-s-monokai span.cm-keyword {color: #f92672;}
-.cm-s-monokai span.cm-string {color: #e6db74;}
+.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
+.cm-s-monokai span.cm-keyword { color: #f92672; }
+.cm-s-monokai span.cm-string { color: #e6db74; }
 
-.cm-s-monokai span.cm-variable {color: #f8f8f2;}
-.cm-s-monokai span.cm-variable-2 {color: #9effff;}
-.cm-s-monokai span.cm-variable-3 {color: #66d9ef;}
-.cm-s-monokai span.cm-def {color: #fd971f;}
-.cm-s-monokai span.cm-bracket {color: #f8f8f2;}
-.cm-s-monokai span.cm-tag {color: #f92672;}
-.cm-s-monokai span.cm-header {color: #ae81ff;}
-.cm-s-monokai span.cm-link {color: #ae81ff;}
-.cm-s-monokai span.cm-error {background: #f92672; color: #f8f8f0;}
+.cm-s-monokai span.cm-variable { color: #f8f8f2; }
+.cm-s-monokai span.cm-variable-2 { color: #9effff; }
+.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
+.cm-s-monokai span.cm-def { color: #fd971f; }
+.cm-s-monokai span.cm-bracket { color: #f8f8f2; }
+.cm-s-monokai span.cm-tag { color: #f92672; }
+.cm-s-monokai span.cm-header { color: #ae81ff; }
+.cm-s-monokai span.cm-link { color: #ae81ff; }
+.cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
 
-.cm-s-monokai .CodeMirror-activeline-background {background: #373831 !important;}
+.cm-s-monokai .CodeMirror-activeline-background { background: #373831 !important; }
 .cm-s-monokai .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
diff --git a/theme/neat.css b/theme/neat.css
index 115083b812..29bc8e1f86 100644
--- a/theme/neat.css
+++ b/theme/neat.css
@@ -5,8 +5,8 @@
 .cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
 .cm-s-neat span.cm-variable { color: black; }
 .cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
-.cm-s-neat span.cm-meta {color: #555;}
+.cm-s-neat span.cm-meta { color: #555; }
 .cm-s-neat span.cm-link { color: #3a3; }
 
-.cm-s-neat .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-neat .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
+.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/neo.css b/theme/neo.css
index cecaaf2801..d8a4d51659 100644
--- a/theme/neo.css
+++ b/theme/neo.css
@@ -7,12 +7,12 @@
   color:#2e383c;
   line-height:1.4375;
 }
-.cm-s-neo .cm-comment {color:#75787b}
-.cm-s-neo .cm-keyword, .cm-s-neo .cm-property {color:#1d75b3}
-.cm-s-neo .cm-atom,.cm-s-neo .cm-number {color:#75438a}
-.cm-s-neo .cm-node,.cm-s-neo .cm-tag {color:#9c3328}
-.cm-s-neo .cm-string {color:#b35e14}
-.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier {color:#047d65}
+.cm-s-neo .cm-comment { color:#75787b; }
+.cm-s-neo .cm-keyword, .cm-s-neo .cm-property { color:#1d75b3; }
+.cm-s-neo .cm-atom,.cm-s-neo .cm-number { color:#75438a; }
+.cm-s-neo .cm-node,.cm-s-neo .cm-tag { color:#9c3328; }
+.cm-s-neo .cm-string { color:#b35e14; }
+.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier { color:#047d65; }
 
 
 /* Editor styling */
diff --git a/theme/night.css b/theme/night.css
index 39ada7abd1..b66d7d486b 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -24,5 +24,5 @@
 .cm-s-night span.cm-link { color: #845dc4; }
 .cm-s-night span.cm-error { color: #9d1e15; }
 
-.cm-s-night .CodeMirror-activeline-background {background: #1C005A !important;}
-.cm-s-night .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-night .CodeMirror-activeline-background { background: #1C005A !important; }
+.cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index 4b565328c1..08c4c3ac4f 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -8,31 +8,31 @@
 
 */
 
-.cm-s-paraiso-dark.CodeMirror {background: #2f1e2e; color: #b9b6b0;}
-.cm-s-paraiso-dark div.CodeMirror-selected {background: #41323f;}
+.cm-s-paraiso-dark.CodeMirror { background: #2f1e2e; color: #b9b6b0; }
+.cm-s-paraiso-dark div.CodeMirror-selected { background: #41323f; }
 .cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
 .cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark .CodeMirror-gutters {background: #2f1e2e; border-right: 0px;}
+.cm-s-paraiso-dark .CodeMirror-gutters { background: #2f1e2e; border-right: 0px; }
 .cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
 .cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-linenumber {color: #776e71;}
-.cm-s-paraiso-dark .CodeMirror-cursor {border-left: 1px solid #8d8687 !important;}
-
-.cm-s-paraiso-dark span.cm-comment {color: #e96ba8;}
-.cm-s-paraiso-dark span.cm-atom {color: #815ba4;}
-.cm-s-paraiso-dark span.cm-number {color: #815ba4;}
-
-.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute {color: #48b685;}
-.cm-s-paraiso-dark span.cm-keyword {color: #ef6155;}
-.cm-s-paraiso-dark span.cm-string {color: #fec418;}
-
-.cm-s-paraiso-dark span.cm-variable {color: #48b685;}
-.cm-s-paraiso-dark span.cm-variable-2 {color: #06b6ef;}
-.cm-s-paraiso-dark span.cm-def {color: #f99b15;}
-.cm-s-paraiso-dark span.cm-bracket {color: #b9b6b0;}
-.cm-s-paraiso-dark span.cm-tag {color: #ef6155;}
-.cm-s-paraiso-dark span.cm-link {color: #815ba4;}
-.cm-s-paraiso-dark span.cm-error {background: #ef6155; color: #8d8687;}
-
-.cm-s-paraiso-dark .CodeMirror-activeline-background {background: #4D344A !important;}
-.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
+.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687 !important; }
+
+.cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-dark span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-dark span.cm-variable { color: #48b685; }
+.cm-s-paraiso-dark span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-dark span.cm-def { color: #f99b15; }
+.cm-s-paraiso-dark span.cm-bracket { color: #b9b6b0; }
+.cm-s-paraiso-dark span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-link { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
+
+.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A !important; }
+.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index c3c3d75a36..ae020d1b18 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -8,31 +8,31 @@
 
 */
 
-.cm-s-paraiso-light.CodeMirror {background: #e7e9db; color: #41323f;}
-.cm-s-paraiso-light div.CodeMirror-selected {background: #b9b6b0;}
+.cm-s-paraiso-light.CodeMirror { background: #e7e9db; color: #41323f; }
+.cm-s-paraiso-light div.CodeMirror-selected { background: #b9b6b0; }
 .cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
 .cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-gutters {background: #e7e9db; border-right: 0px;}
+.cm-s-paraiso-light .CodeMirror-gutters { background: #e7e9db; border-right: 0px; }
 .cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
 .cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-linenumber {color: #8d8687;}
-.cm-s-paraiso-light .CodeMirror-cursor {border-left: 1px solid #776e71 !important;}
-
-.cm-s-paraiso-light span.cm-comment {color: #e96ba8;}
-.cm-s-paraiso-light span.cm-atom {color: #815ba4;}
-.cm-s-paraiso-light span.cm-number {color: #815ba4;}
-
-.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute {color: #48b685;}
-.cm-s-paraiso-light span.cm-keyword {color: #ef6155;}
-.cm-s-paraiso-light span.cm-string {color: #fec418;}
-
-.cm-s-paraiso-light span.cm-variable {color: #48b685;}
-.cm-s-paraiso-light span.cm-variable-2 {color: #06b6ef;}
-.cm-s-paraiso-light span.cm-def {color: #f99b15;}
-.cm-s-paraiso-light span.cm-bracket {color: #41323f;}
-.cm-s-paraiso-light span.cm-tag {color: #ef6155;}
-.cm-s-paraiso-light span.cm-link {color: #815ba4;}
-.cm-s-paraiso-light span.cm-error {background: #ef6155; color: #776e71;}
-
-.cm-s-paraiso-light .CodeMirror-activeline-background {background: #CFD1C4 !important;}
-.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
+.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71 !important; }
+
+.cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-light span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-light span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-light span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-light span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-light span.cm-variable { color: #48b685; }
+.cm-s-paraiso-light span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-light span.cm-def { color: #f99b15; }
+.cm-s-paraiso-light span.cm-bracket { color: #41323f; }
+.cm-s-paraiso-light span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-light span.cm-link { color: #815ba4; }
+.cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
+
+.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4 !important; }
+.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index c03244fad1..9f41d910c5 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -22,4 +22,4 @@
 .cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
 .cm-s-rubyblue span.cm-error { color: #AF2018; }
 
-.cm-s-rubyblue .CodeMirror-activeline-background {background: #173047 !important;}
+.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047 !important; }
diff --git a/theme/seti.css b/theme/seti.css
index 9303e10450..62bddff3a8 100644
--- a/theme/seti.css
+++ b/theme/seti.css
@@ -40,5 +40,5 @@
 .cm-s-seti span.cm-property { color: #a074c4; }
 .cm-s-seti span.cm-variable-3 { color: #9fca56; }
 .cm-s-seti span.cm-builtin { color: #9fca56; }
-.cm-s-seti .CodeMirror-activeline-background {background: #101213 !important;}
-.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-seti .CodeMirror-activeline-background { background: #101213 !important; }
+.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 56c3ac9b32..93951a95d3 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -50,7 +50,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .cm-header { color: #586e75; }
 .cm-s-solarized .cm-quote { color: #93a1a1; }
 
-.cm-s-solarized .cm-keyword { color: #cb4b16 }
+.cm-s-solarized .cm-keyword { color: #cb4b16; }
 .cm-s-solarized .cm-atom { color: #d33682; }
 .cm-s-solarized .cm-number { color: #d33682; }
 .cm-s-solarized .cm-def { color: #2aa198; }
@@ -60,7 +60,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .cm-variable-3 { color: #6c71c4; }
 
 .cm-s-solarized .cm-property { color: #2aa198; }
-.cm-s-solarized .cm-operator {color: #6c71c4;}
+.cm-s-solarized .cm-operator { color: #6c71c4; }
 
 .cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
 
@@ -73,8 +73,8 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .cm-bracket { color: #cb4b16; }
 .cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
 .cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
-.cm-s-solarized .cm-tag { color: #93a1a1 }
-.cm-s-solarized .cm-attribute {  color: #2aa198; }
+.cm-s-solarized .cm-tag { color: #93a1a1; }
+.cm-s-solarized .cm-attribute { color: #2aa198; }
 .cm-s-solarized .cm-hr {
   color: transparent;
   border-top: 1px solid #586e75;
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index b0af9c4a5d..1d8b0093ab 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -8,23 +8,23 @@
 .cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
 .cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00 !important; }
 
-.cm-s-the-matrix span.cm-keyword {color: #008803; font-weight: bold;}
-.cm-s-the-matrix span.cm-atom {color: #3FF;}
-.cm-s-the-matrix span.cm-number {color: #FFB94F;}
-.cm-s-the-matrix span.cm-def {color: #99C;}
-.cm-s-the-matrix span.cm-variable {color: #F6C;}
-.cm-s-the-matrix span.cm-variable-2 {color: #C6F;}
-.cm-s-the-matrix span.cm-variable-3 {color: #96F;}
-.cm-s-the-matrix span.cm-property {color: #62FFA0;}
-.cm-s-the-matrix span.cm-operator {color: #999}
-.cm-s-the-matrix span.cm-comment {color: #CCCCCC;}
-.cm-s-the-matrix span.cm-string {color: #39C;}
-.cm-s-the-matrix span.cm-meta {color: #C9F;}
-.cm-s-the-matrix span.cm-qualifier {color: #FFF700;}
-.cm-s-the-matrix span.cm-builtin {color: #30a;}
-.cm-s-the-matrix span.cm-bracket {color: #cc7;}
-.cm-s-the-matrix span.cm-tag {color: #FFBD40;}
-.cm-s-the-matrix span.cm-attribute {color: #FFF700;}
-.cm-s-the-matrix span.cm-error {color: #FF0000;}
+.cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
+.cm-s-the-matrix span.cm-atom { color: #3FF; }
+.cm-s-the-matrix span.cm-number { color: #FFB94F; }
+.cm-s-the-matrix span.cm-def { color: #99C; }
+.cm-s-the-matrix span.cm-variable { color: #F6C; }
+.cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
+.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
+.cm-s-the-matrix span.cm-property { color: #62FFA0; }
+.cm-s-the-matrix span.cm-operator { color: #999; }
+.cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
+.cm-s-the-matrix span.cm-string { color: #39C; }
+.cm-s-the-matrix span.cm-meta { color: #C9F; }
+.cm-s-the-matrix span.cm-qualifier { color: #FFF700; }
+.cm-s-the-matrix span.cm-builtin { color: #30a; }
+.cm-s-the-matrix span.cm-bracket { color: #cc7; }
+.cm-s-the-matrix span.cm-tag { color: #FFBD40; }
+.cm-s-the-matrix span.cm-attribute { color: #FFF700; }
+.cm-s-the-matrix span.cm-error { color: #FF0000; }
 
-.cm-s-the-matrix .CodeMirror-activeline-background {background: #040;}
+.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }
diff --git a/theme/tomorrow-night-bright.css b/theme/tomorrow-night-bright.css
index 50c779e852..12bfb1ea54 100644
--- a/theme/tomorrow-night-bright.css
+++ b/theme/tomorrow-night-bright.css
@@ -7,29 +7,29 @@
 
 */
 
-.cm-s-tomorrow-night-bright.CodeMirror {background: #000000; color: #eaeaea;}
-.cm-s-tomorrow-night-bright div.CodeMirror-selected {background: #424242;}
-.cm-s-tomorrow-night-bright .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-tomorrow-night-bright.CodeMirror { background: #000000; color: #eaeaea; }
+.cm-s-tomorrow-night-bright div.CodeMirror-selected { background: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-gutters { background: #000000; border-right: 0px; }
 .cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
 .cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-bright .CodeMirror-linenumber {color: #424242;}
-.cm-s-tomorrow-night-bright .CodeMirror-cursor {border-left: 1px solid #6A6A6A !important;}
-
-.cm-s-tomorrow-night-bright span.cm-comment {color: #d27b53;}
-.cm-s-tomorrow-night-bright span.cm-atom {color: #a16a94;}
-.cm-s-tomorrow-night-bright span.cm-number {color: #a16a94;}
-
-.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute {color: #99cc99;}
-.cm-s-tomorrow-night-bright span.cm-keyword {color: #d54e53;}
-.cm-s-tomorrow-night-bright span.cm-string {color: #e7c547;}
-
-.cm-s-tomorrow-night-bright span.cm-variable {color: #b9ca4a;}
-.cm-s-tomorrow-night-bright span.cm-variable-2 {color: #7aa6da;}
-.cm-s-tomorrow-night-bright span.cm-def {color: #e78c45;}
-.cm-s-tomorrow-night-bright span.cm-bracket {color: #eaeaea;}
-.cm-s-tomorrow-night-bright span.cm-tag {color: #d54e53;}
-.cm-s-tomorrow-night-bright span.cm-link {color: #a16a94;}
-.cm-s-tomorrow-night-bright span.cm-error {background: #d54e53; color: #6A6A6A;}
-
-.cm-s-tomorrow-night-bright .CodeMirror-activeline-background {background: #2a2a2a !important;}
-.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A !important; }
+
+.cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-bright span.cm-keyword { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-string { color: #e7c547; }
+
+.cm-s-tomorrow-night-bright span.cm-variable { color: #b9ca4a; }
+.cm-s-tomorrow-night-bright span.cm-variable-2 { color: #7aa6da; }
+.cm-s-tomorrow-night-bright span.cm-def { color: #e78c45; }
+.cm-s-tomorrow-night-bright span.cm-bracket { color: #eaeaea; }
+.cm-s-tomorrow-night-bright span.cm-tag { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a !important; }
+.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index d5e36201d8..c0d1e12f9a 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -8,31 +8,31 @@
 
 */
 
-.cm-s-tomorrow-night-eighties.CodeMirror {background: #000000; color: #CCCCCC;}
-.cm-s-tomorrow-night-eighties div.CodeMirror-selected {background: #2D2D2D;}
+.cm-s-tomorrow-night-eighties.CodeMirror { background: #000000; color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties div.CodeMirror-selected { background: #2D2D2D; }
 .cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
 .cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-tomorrow-night-eighties .CodeMirror-gutters { background: #000000; border-right: 0px; }
 .cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
 .cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-eighties .CodeMirror-linenumber {color: #515151;}
-.cm-s-tomorrow-night-eighties .CodeMirror-cursor {border-left: 1px solid #6A6A6A !important;}
-
-.cm-s-tomorrow-night-eighties span.cm-comment {color: #d27b53;}
-.cm-s-tomorrow-night-eighties span.cm-atom {color: #a16a94;}
-.cm-s-tomorrow-night-eighties span.cm-number {color: #a16a94;}
-
-.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute {color: #99cc99;}
-.cm-s-tomorrow-night-eighties span.cm-keyword {color: #f2777a;}
-.cm-s-tomorrow-night-eighties span.cm-string {color: #ffcc66;}
-
-.cm-s-tomorrow-night-eighties span.cm-variable {color: #99cc99;}
-.cm-s-tomorrow-night-eighties span.cm-variable-2 {color: #6699cc;}
-.cm-s-tomorrow-night-eighties span.cm-def {color: #f99157;}
-.cm-s-tomorrow-night-eighties span.cm-bracket {color: #CCCCCC;}
-.cm-s-tomorrow-night-eighties span.cm-tag {color: #f2777a;}
-.cm-s-tomorrow-night-eighties span.cm-link {color: #a16a94;}
-.cm-s-tomorrow-night-eighties span.cm-error {background: #f2777a; color: #6A6A6A;}
-
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background {background: #343600 !important;}
-.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
+.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A !important; }
+
+.cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-keyword { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-string { color: #ffcc66; }
+
+.cm-s-tomorrow-night-eighties span.cm-variable { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-variable-2 { color: #6699cc; }
+.cm-s-tomorrow-night-eighties span.cm-def { color: #f99157; }
+.cm-s-tomorrow-night-eighties span.cm-bracket { color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties span.cm-tag { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600 !important; }
+.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/ttcn.css b/theme/ttcn.css
index 9c2e9a61d7..cf19c1476d 100644
--- a/theme/ttcn.css
+++ b/theme/ttcn.css
@@ -1,65 +1,65 @@
-.cm-quote {color: #090;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-.cm-header {color: #00f; font-weight: bold;}
+.cm-quote { color: #090; }
+.cm-negative { color: #d44; }
+.cm-positive { color: #292; }
+.cm-header, .cm-strong { font-weight: bold; }
+.cm-em { font-style: italic; }
+.cm-link { text-decoration: underline; }
+.cm-strikethrough { text-decoration: line-through; }
+.cm-header { color: #00f; font-weight: bold; }
 
-.cm-atom {color: #219;}
-.cm-attribute {color: #00c;}
-.cm-bracket {color: #997;}
-.cm-comment {color: #333333;}
-.cm-def {color: #00f;}
-.cm-em {font-style: italic;}
-.cm-error {color: #f00;}
-.cm-hr {color: #999;}
-.cm-invalidchar {color: #f00;}
-.cm-keyword {font-weight:bold}
-.cm-link {color: #00c; text-decoration: underline;}
-.cm-meta {color: #555;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-qualifier {color: #555;}
-.cm-strikethrough {text-decoration: line-through;}
-.cm-string {color: #006400;}
-.cm-string-2 {color: #f50;}
-.cm-strong {font-weight: bold;}
-.cm-tag {color: #170;}
-.cm-variable {color: #8B2252;}
-.cm-variable-2 {color: #05a;}
-.cm-variable-3 {color: #085;}
+.cm-atom { color: #219; }
+.cm-attribute { color: #00c; }
+.cm-bracket { color: #997; }
+.cm-comment { color: #333333; }
+.cm-def { color: #00f; }
+.cm-em { font-style: italic; }
+.cm-error { color: #f00; }
+.cm-hr { color: #999; }
+.cm-invalidchar { color: #f00; }
+.cm-keyword { font-weight:bold; }
+.cm-link { color: #00c; text-decoration: underline; }
+.cm-meta { color: #555; }
+.cm-negative { color: #d44; }
+.cm-positive { color: #292; }
+.cm-qualifier { color: #555; }
+.cm-strikethrough { text-decoration: line-through; }
+.cm-string { color: #006400; }
+.cm-string-2 { color: #f50; }
+.cm-strong { font-weight: bold; }
+.cm-tag { color: #170; }
+.cm-variable { color: #8B2252; }
+.cm-variable-2 { color: #05a; }
+.cm-variable-3 { color: #085; }
 
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
+.cm-s-default .cm-error { color: #f00; }
+.cm-invalidchar { color: #f00; }
 
 /* ASN */
 .cm-s-ttcn .cm-accessTypes,
-.cm-s-ttcn .cm-compareTypes {color: #27408B}
-.cm-s-ttcn .cm-cmipVerbs {color: #8B2252}
-.cm-s-ttcn .cm-modifier {color:#D2691E}
-.cm-s-ttcn .cm-status {color:#8B4545}
-.cm-s-ttcn .cm-storage {color:#A020F0}
-.cm-s-ttcn .cm-tags {color:#006400}
+.cm-s-ttcn .cm-compareTypes { color: #27408B; }
+.cm-s-ttcn .cm-cmipVerbs { color: #8B2252; }
+.cm-s-ttcn .cm-modifier { color:#D2691E; }
+.cm-s-ttcn .cm-status { color:#8B4545; }
+.cm-s-ttcn .cm-storage { color:#A020F0; }
+.cm-s-ttcn .cm-tags { color:#006400; }
 
 /* CFG */
-.cm-s-ttcn .cm-externalCommands {color: #8B4545; font-weight:bold}
+.cm-s-ttcn .cm-externalCommands { color: #8B4545; font-weight:bold; }
 .cm-s-ttcn .cm-fileNCtrlMaskOptions,
-.cm-s-ttcn .cm-sectionTitle {color: #2E8B57; font-weight:bold}
+.cm-s-ttcn .cm-sectionTitle { color: #2E8B57; font-weight:bold; }
 
 /* TTCN */
 .cm-s-ttcn .cm-booleanConsts,
 .cm-s-ttcn .cm-otherConsts,
-.cm-s-ttcn .cm-verdictConsts {color: #006400}
+.cm-s-ttcn .cm-verdictConsts { color: #006400; }
 .cm-s-ttcn .cm-configOps,
 .cm-s-ttcn .cm-functionOps,
 .cm-s-ttcn .cm-portOps,
 .cm-s-ttcn .cm-sutOps,
 .cm-s-ttcn .cm-timerOps,
-.cm-s-ttcn .cm-verdictOps {color: #0000FF}
+.cm-s-ttcn .cm-verdictOps { color: #0000FF; }
 .cm-s-ttcn .cm-preprocessor,
 .cm-s-ttcn .cm-templateMatch,
-.cm-s-ttcn .cm-ttcn3Macros {color: #27408B}
-.cm-s-ttcn .cm-types {color: #A52A2A; font-weight:bold}
-.cm-s-ttcn .cm-visibilityModifiers {font-weight:bold}
+.cm-s-ttcn .cm-ttcn3Macros { color: #27408B; }
+.cm-s-ttcn .cm-types { color: #A52A2A; font-weight:bold; }
+.cm-s-ttcn .cm-visibilityModifiers { font-weight:bold; }
diff --git a/theme/twilight.css b/theme/twilight.css
index f3b2253717..b333efd775 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -9,7 +9,7 @@
 .cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
 .cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white !important; }
 
-.cm-s-twilight .cm-keyword {  color: #f9ee98; } /**/
+.cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
 .cm-s-twilight .cm-atom { color: #FC0; }
 .cm-s-twilight .cm-number { color:  #ca7841; } /**/
 .cm-s-twilight .cm-def { color: #8DA6CE; }
@@ -18,15 +18,15 @@
 .cm-s-twilight .cm-operator { color: #cda869; } /**/
 .cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
 .cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
-.cm-s-twilight .cm-string-2 { color:#bd6b18 } /*?*/
+.cm-s-twilight .cm-string-2 { color:#bd6b18; } /*?*/
 .cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
 .cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
 .cm-s-twilight .cm-tag { color: #997643; } /**/
 .cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
 .cm-s-twilight .cm-header { color: #FF6400; }
 .cm-s-twilight .cm-hr { color: #AEAEAE; }
-.cm-s-twilight .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; } /**/
+.cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
 .cm-s-twilight .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-twilight .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-twilight .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-twilight .CodeMirror-activeline-background { background: #27282E !important; }
+.cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index 380728d2f6..075797fc57 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -11,16 +11,16 @@
 .cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white !important; }
 
-.cm-s-vibrant-ink .cm-keyword {  color: #CC7832; }
+.cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
 .cm-s-vibrant-ink .cm-atom { color: #FC0; }
 .cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
 .cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
-.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D }
+.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
 .cm-s-vibrant-ink .cm-operator { color: #888; }
 .cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
-.cm-s-vibrant-ink .cm-string { color:  #A5C25C }
-.cm-s-vibrant-ink .cm-string-2 { color: red }
+.cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
+.cm-s-vibrant-ink .cm-string-2 { color: red; }
 .cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
 .cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
 .cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
@@ -30,5 +30,5 @@
 .cm-s-vibrant-ink .cm-link { color: blue; }
 .cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-vibrant-ink .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-vibrant-ink .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E !important; }
+.cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index 8514d8eb9c..1e7527b144 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -30,24 +30,24 @@ THE SOFTWARE.
 .cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 
-.cm-s-xq-dark span.cm-keyword {color: #FFBD40;}
-.cm-s-xq-dark span.cm-atom {color: #6C8CD5;}
-.cm-s-xq-dark span.cm-number {color: #164;}
-.cm-s-xq-dark span.cm-def {color: #FFF; text-decoration:underline;}
-.cm-s-xq-dark span.cm-variable {color: #FFF;}
-.cm-s-xq-dark span.cm-variable-2 {color: #EEE;}
-.cm-s-xq-dark span.cm-variable-3 {color: #DDD;}
+.cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
+.cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-dark span.cm-number { color: #164; }
+.cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
+.cm-s-xq-dark span.cm-variable { color: #FFF; }
+.cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
+.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
 .cm-s-xq-dark span.cm-property {}
 .cm-s-xq-dark span.cm-operator {}
-.cm-s-xq-dark span.cm-comment {color: gray;}
-.cm-s-xq-dark span.cm-string {color: #9FEE00;}
-.cm-s-xq-dark span.cm-meta {color: yellow;}
-.cm-s-xq-dark span.cm-qualifier {color: #FFF700;}
-.cm-s-xq-dark span.cm-builtin {color: #30a;}
-.cm-s-xq-dark span.cm-bracket {color: #cc7;}
-.cm-s-xq-dark span.cm-tag {color: #FFBD40;}
-.cm-s-xq-dark span.cm-attribute {color: #FFF700;}
-.cm-s-xq-dark span.cm-error {color: #f00;}
+.cm-s-xq-dark span.cm-comment { color: gray; }
+.cm-s-xq-dark span.cm-string { color: #9FEE00; }
+.cm-s-xq-dark span.cm-meta { color: yellow; }
+.cm-s-xq-dark span.cm-qualifier { color: #FFF700; }
+.cm-s-xq-dark span.cm-builtin { color: #30a; }
+.cm-s-xq-dark span.cm-bracket { color: #cc7; }
+.cm-s-xq-dark span.cm-tag { color: #FFBD40; }
+.cm-s-xq-dark span.cm-attribute { color: #FFF700; }
+.cm-s-xq-dark span.cm-error { color: #f00; }
 
-.cm-s-xq-dark .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-xq-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E !important; }
+.cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/xq-light.css b/theme/xq-light.css
index 20b5c79614..c9185dc394 100644
--- a/theme/xq-light.css
+++ b/theme/xq-light.css
@@ -20,24 +20,24 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-.cm-s-xq-light span.cm-keyword {line-height: 1em; font-weight: bold; color: #5A5CAD; }
-.cm-s-xq-light span.cm-atom {color: #6C8CD5;}
-.cm-s-xq-light span.cm-number {color: #164;}
-.cm-s-xq-light span.cm-def {text-decoration:underline;}
-.cm-s-xq-light span.cm-variable {color: black; }
-.cm-s-xq-light span.cm-variable-2 {color:black;}
-.cm-s-xq-light span.cm-variable-3 {color: black; }
+.cm-s-xq-light span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
+.cm-s-xq-light span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-light span.cm-number { color: #164; }
+.cm-s-xq-light span.cm-def { text-decoration:underline; }
+.cm-s-xq-light span.cm-variable { color: black; }
+.cm-s-xq-light span.cm-variable-2 { color:black; }
+.cm-s-xq-light span.cm-variable-3 { color: black; }
 .cm-s-xq-light span.cm-property {}
 .cm-s-xq-light span.cm-operator {}
-.cm-s-xq-light span.cm-comment {color: #0080FF; font-style: italic;}
-.cm-s-xq-light span.cm-string {color: red;}
-.cm-s-xq-light span.cm-meta {color: yellow;}
-.cm-s-xq-light span.cm-qualifier {color: grey}
-.cm-s-xq-light span.cm-builtin {color: #7EA656;}
-.cm-s-xq-light span.cm-bracket {color: #cc7;}
-.cm-s-xq-light span.cm-tag {color: #3F7F7F;}
-.cm-s-xq-light span.cm-attribute {color: #7F007F;}
-.cm-s-xq-light span.cm-error {color: #f00;}
+.cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
+.cm-s-xq-light span.cm-string { color: red; }
+.cm-s-xq-light span.cm-meta { color: yellow; }
+.cm-s-xq-light span.cm-qualifier { color: grey; }
+.cm-s-xq-light span.cm-builtin { color: #7EA656; }
+.cm-s-xq-light span.cm-bracket { color: #cc7; }
+.cm-s-xq-light span.cm-tag { color: #3F7F7F; }
+.cm-s-xq-light span.cm-attribute { color: #7F007F; }
+.cm-s-xq-light span.cm-error { color: #f00; }
 
-.cm-s-xq-light .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-xq-light .CodeMirror-matchingbracket {outline:1px solid grey;color:black !important;background:yellow;}
\ No newline at end of file
+.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/theme/yeti.css b/theme/yeti.css
index c7e93764d9..657cc1d32e 100644
--- a/theme/yeti.css
+++ b/theme/yeti.css
@@ -40,5 +40,5 @@
 .cm-s-yeti span.cm-property { color: #a074c4; }
 .cm-s-yeti span.cm-builtin { color: #a074c4; }
 .cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
-.cm-s-yeti .CodeMirror-activeline-background {background: #E7E4E0 !important;}
-.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline;}
+.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0 !important; }
+.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }

From be2089949c9e80b674c83c762fbceb473302d737 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Aug 2015 17:00:03 +0200
Subject: [PATCH 2262/4742] [go mode] Better handle raw strings

Don't treat backslashes specially inside of them

Closes #3428
---
 mode/go/go.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/go/go.js b/mode/go/go.js
index b121f4e6eb..21fe9a2d6e 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -86,7 +86,7 @@ CodeMirror.defineMode("go", function(config) {
       var escaped = false, next, end = false;
       while ((next = stream.next()) != null) {
         if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
+        escaped = !escaped && quote != "`" && next == "\\";
       }
       if (end || !(escaped || quote == "`"))
         state.tokenize = tokenBase;

From 8d989c5241bb295e77eb4e53b418990c50dda7dc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Aug 2015 12:07:23 +0200
Subject: [PATCH 2263/4742] [real-world uses] Rename uiCod->Refork

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 52dc56bdb0..3f72b28c8a 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -132,6 +132,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.quivive-file-manager.com">Quivive File Manager</a></li>
       <li><a href="http://rascalmicro.com/docs/basic-tutorial-getting-started.html">Rascal</a> (tiny computer)</li>
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
+      <li><a href="http://refork.com/">Refork</a> (animation demo gallery and sharing)</li>
       <li><a href="https://cloud.sagemath.com/">SageMathCloud</a> (interactive mathematical software environment)</li>
       <li><a href="https://chrome.google.com/webstore/detail/servephp/mnpikomdchjhkhbhmbboehfdjkobbfpo">ServePHP</a> (PHP code testing in Chrome dev tools)</li>
       <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>
@@ -153,7 +154,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a> (augmented editing)</li>
       <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>
       <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>
-      <li><a href="http://uicod.com/">uiCod</a> (animation demo gallery and sharing)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
       <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a> (code viewer)</li>
       <li><a href="https://github.com/mgaitan/waliki">Waliki</a> (wiki engine)</li>

From 61436251acf43696292276ff1a87cee1c8247171 Mon Sep 17 00:00:00 2001
From: Amin Shali <amshali@google.com>
Date: Tue, 4 Aug 2015 14:58:18 -0700
Subject: [PATCH 2264/4742] Fixed the issue with undefined state.

---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 3887d64723..babcba85c3 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -187,7 +187,7 @@
   CodeMirror.defineOption("lint", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       clearMarks(cm);
-      if (state.options.lintOnChange !== false)
+      if (cm.state.lint.options.lintOnChange !== false)
         cm.off("change", onChange);
       CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
       clearTimeout(cm.state.lint.timeout);

From a7d443ec82c1806d24e25ad8014a4d8651409320 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Tue, 4 Aug 2015 16:28:26 -0700
Subject: [PATCH 2265/4742] Reduce css specificity for cursor and activeline
 classes

Also some general improvements to material.css and solarized.css
---
 lib/codemirror.css                | 16 ++++-------
 theme/3024-day.css                |  4 +--
 theme/3024-night.css              |  4 +--
 theme/ambiance.css                |  4 +--
 theme/base16-dark.css             |  4 +--
 theme/base16-light.css            |  4 +--
 theme/blackboard.css              |  4 +--
 theme/cobalt.css                  |  4 +--
 theme/colorforth.css              |  4 +--
 theme/dracula.css                 |  4 +--
 theme/eclipse.css                 |  2 +-
 theme/elegant.css                 |  2 +-
 theme/erlang-dark.css             |  4 +--
 theme/icecoder.css                |  4 +--
 theme/lesser-dark.css             |  4 +--
 theme/liquibyte.css               |  4 +--
 theme/material.css                | 44 +++++++++++++++----------------
 theme/mbo.css                     |  4 +--
 theme/mdn-like.css                |  2 +-
 theme/midnight.css                |  6 ++---
 theme/monokai.css                 |  4 +--
 theme/neat.css                    |  2 +-
 theme/neo.css                     |  2 +-
 theme/night.css                   |  4 +--
 theme/paraiso-dark.css            |  4 +--
 theme/paraiso-light.css           |  4 +--
 theme/pastel-on-dark.css          |  4 +--
 theme/rubyblue.css                |  4 +--
 theme/seti.css                    |  4 +--
 theme/solarized.css               |  4 +--
 theme/the-matrix.css              |  2 +-
 theme/tomorrow-night-bright.css   |  4 +--
 theme/tomorrow-night-eighties.css |  4 +--
 theme/twilight.css                |  4 +--
 theme/vibrant-ink.css             |  4 +--
 theme/xq-dark.css                 |  4 +--
 theme/xq-light.css                |  2 +-
 theme/yeti.css                    |  4 +--
 theme/zenburn.css                 |  2 +-
 39 files changed, 91 insertions(+), 103 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 67dbd2b2f3..63753dcb02 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -41,14 +41,17 @@
 
 /* CURSOR */
 
-.CodeMirror div.CodeMirror-cursor {
+.CodeMirror-cursor {
+  position: absolute;
+  border-right: none;
+  width: 0;
   border-left: 1px solid black;
 }
 /* Shown when moving in bi-directional text */
 .CodeMirror div.CodeMirror-secondarycursor {
   border-left: 1px solid silver;
 }
-.CodeMirror.cm-fat-cursor div.CodeMirror-cursor {
+.CodeMirror.cm-fat-cursor .CodeMirror-cursor {
   width: auto;
   border: 0;
   background: #7e7;
@@ -81,9 +84,6 @@
   100% {}
 }
 
-/* Can style cursor different in overwrite (non-insert) mode */
-div.CodeMirror-overwrite div.CodeMirror-cursor {}
-
 .cm-tab { display: inline-block; text-decoration: inherit; }
 
 .CodeMirror-ruler {
@@ -286,12 +286,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 .CodeMirror-measure pre { position: static; }
 
-.CodeMirror div.CodeMirror-cursor {
-  position: absolute;
-  border-right: none;
-  width: 0;
-}
-
 div.CodeMirror-cursors {
   visibility: hidden;
   position: relative;
diff --git a/theme/3024-day.css b/theme/3024-day.css
index b5d304aef4..7132655306 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -19,7 +19,7 @@
 .cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
 .cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
 
-.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855 !important; }
+.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }
 
 .cm-s-3024-day span.cm-comment { color: #cdab53; }
 .cm-s-3024-day span.cm-atom { color: #a16a94; }
@@ -37,5 +37,5 @@
 .cm-s-3024-day span.cm-link { color: #a16a94; }
 .cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
 
-.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/theme/3024-night.css b/theme/3024-night.css
index df5c201ab8..adc5900ad1 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -17,7 +17,7 @@
 .cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
 .cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
 
-.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c !important; }
+.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }
 
 .cm-s-3024-night span.cm-comment { color: #cdab53; }
 .cm-s-3024-night span.cm-atom { color: #a16a94; }
@@ -35,5 +35,5 @@
 .cm-s-3024-night span.cm-link { color: #a16a94; }
 .cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
 
-.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F !important; }
+.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
 .cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/ambiance.css b/theme/ambiance.css
index b785ec8cf8..bce3446494 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -62,9 +62,7 @@
 .cm-s-ambiance .CodeMirror-guttermarker { color: #aaa; }
 .cm-s-ambiance .CodeMirror-guttermarker-subtle { color: #111; }
 
-.cm-s-ambiance .CodeMirror-lines .CodeMirror-cursor {
-  border-left: 1px solid #7991E8;
-}
+.cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
 
 .cm-s-ambiance .CodeMirror-activeline-background {
   background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index e521cf68c0..81dac03923 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -16,7 +16,7 @@
 .cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
 .cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
-.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0 !important; }
+.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
 
 .cm-s-base16-dark span.cm-comment { color: #8f5536; }
 .cm-s-base16-dark span.cm-atom { color: #aa759f; }
@@ -34,5 +34,5 @@
 .cm-s-base16-dark span.cm-link { color: #aa759f; }
 .cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
 
-.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020 !important; }
+.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/base16-light.css b/theme/base16-light.css
index cb006496fa..e645678f8a 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -16,7 +16,7 @@
 .cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
 .cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
 .cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050 !important; }
+.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050; }
 
 .cm-s-base16-light span.cm-comment { color: #8f5536; }
 .cm-s-base16-light span.cm-atom { color: #aa759f; }
@@ -34,5 +34,5 @@
 .cm-s-base16-light span.cm-link { color: #aa759f; }
 .cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
 
-.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC !important; }
+.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
 .cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/blackboard.css b/theme/blackboard.css
index 0e21e8665d..b6eaedb180 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -8,7 +8,7 @@
 .cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
 .cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
 .cm-s-blackboard .CodeMirror-linenumber { color: #888; }
-.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
+.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
 
 .cm-s-blackboard .cm-keyword { color: #FBDE2D; }
 .cm-s-blackboard .cm-atom { color: #D8FA3C; }
@@ -28,5 +28,5 @@
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
 .cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 
-.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636 !important; }
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
 .cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/theme/cobalt.css b/theme/cobalt.css
index 9e54d4356a..d88223ed80 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -6,7 +6,7 @@
 .cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
 .cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-cobalt span.cm-comment { color: #08f; }
 .cm-s-cobalt span.cm-atom { color: #845dc4; }
@@ -21,5 +21,5 @@
 .cm-s-cobalt span.cm-link { color: #845dc4; }
 .cm-s-cobalt span.cm-error { color: #9d1e15; }
 
-.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57 !important; }
+.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
 .cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/theme/colorforth.css b/theme/colorforth.css
index 004cdbb569..606899f309 100644
--- a/theme/colorforth.css
+++ b/theme/colorforth.css
@@ -3,7 +3,7 @@
 .cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
 .cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
 .cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
-.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-colorforth span.cm-comment     { color: #ededed; }
 .cm-s-colorforth span.cm-def         { color: #ff1c1c; font-weight:bold; }
@@ -30,4 +30,4 @@
 
 .cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
 
-.cm-s-colorforth .CodeMirror-activeline-background { background: #253540 !important; }
+.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }
diff --git a/theme/dracula.css b/theme/dracula.css
index c0a1315265..57f979ae69 100644
--- a/theme/dracula.css
+++ b/theme/dracula.css
@@ -14,7 +14,7 @@
   border: none;
 }
 .cm-s-dracula .CodeMirror-gutters { color: #282a36; }
-.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0 !important; }
+.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
 .cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
 .cm-s-dracula.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
 .cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
@@ -37,5 +37,5 @@
 .cm-s-dracula span.cm-builtin { color: #50fa7b; }
 .cm-s-dracula span.cm-variable-3 { color: #50fa7b; }
 
-.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1) !important; }
+.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
 .cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/eclipse.css b/theme/eclipse.css
index 6a6fc76861..1bde460e90 100644
--- a/theme/eclipse.css
+++ b/theme/eclipse.css
@@ -19,5 +19,5 @@
 .cm-s-eclipse span.cm-link { color: #219; }
 .cm-s-eclipse span.cm-error { color: #f00; }
 
-.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/elegant.css b/theme/elegant.css
index 45a1e86f80..45b3ea655e 100644
--- a/theme/elegant.css
+++ b/theme/elegant.css
@@ -9,5 +9,5 @@
 .cm-s-elegant span.cm-link { color: #762; }
 .cm-s-elegant span.cm-error { background-color: #fdd; }
 
-.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index 8aa476bf4b..65fe4814c1 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -6,7 +6,7 @@
 .cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
 .cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-erlang-dark span.cm-quote      { color: #ccc; }
 .cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
@@ -30,5 +30,5 @@
 .cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
 .cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
-.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461 !important; }
+.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
 .cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/icecoder.css b/theme/icecoder.css
index 089217aed5..37561d4b9f 100644
--- a/theme/icecoder.css
+++ b/theme/icecoder.css
@@ -35,8 +35,8 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 .cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
 .cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
 
-.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white !important; }
-.cm-s-icecoder div.CodeMirror-selected { color: #fff !important; background: #037; }
+.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
 .cm-s-icecoder .CodeMirror-gutters { background: #141612; min-width: 41px; border-right: 0; }
 .cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
 .cm-s-icecoder .CodeMirror-matchingbracket { border: 1px solid grey; color: black !important; }
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index bbaa00b104..690c183d7b 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -9,7 +9,7 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
 .cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
 .cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white; }
 .cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
 
 .cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
@@ -43,5 +43,5 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-link { color: #00c; }
 .cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 
-.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A !important; }
+.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
 .cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/liquibyte.css b/theme/liquibyte.css
index f51d712a98..c64c25c743 100644
--- a/theme/liquibyte.css
+++ b/theme/liquibyte.css
@@ -24,7 +24,7 @@
 .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 .CodeMirror-cursor { border-left: 1px solid #eee; }
 
 .cm-s-liquibyte span.cm-comment     { color: #008000; }
 .cm-s-liquibyte span.cm-def         { color: #ffaf40; font-weight: bold; }
@@ -51,7 +51,7 @@
 
 .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; }
+.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
 
 /* Default styles for common addons */
 div.CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
diff --git a/theme/material.css b/theme/material.css
index 143c694a11..26005e280d 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -17,36 +17,36 @@
   border: none;
 }
 .cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
-.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0 !important; }
+.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
 .cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
 .cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
 .cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 
-.CodeMirror-activeline-background { background: rgba(0, 0, 0, 0) !important; }
-.cm-s-material span.cm-keyword { color: rgba(199, 146, 234, 1); }
-.cm-s-material span.cm-operator { color: rgba(233, 237, 237, 1); }
-.cm-s-material span.cm-variable-2 { color: #80CBC4; }
-.cm-s-material span.cm-variable-3 { color: #82B1FF; }
-.cm-s-material span.cm-builtin { color: #DECB6B; }
-.cm-s-material span.cm-atom { color: #F77669; }
-.cm-s-material span.cm-number { color: #F77669; }
-.cm-s-material span.cm-def { color: rgba(233, 237, 237, 1); }
-.cm-s-material span.cm-error {
+.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
+.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
+.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
+.cm-s-material .cm-variable-2 { color: #80CBC4; }
+.cm-s-material .cm-variable-3 { color: #82B1FF; }
+.cm-s-material .cm-builtin { color: #DECB6B; }
+.cm-s-material .cm-atom { color: #F77669; }
+.cm-s-material .cm-number { color: #F77669; }
+.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
+.cm-s-material .cm-error {
   color: rgba(255, 255, 255, 1.0);
   background-color: #EC5F67;
 }
-.cm-s-material span.cm-string { color: #C3E88D; }
-.cm-s-material span.cm-string-2 { color: #80CBC4; }
-.cm-s-material span.cm-comment { color: #546E7A; }
-.cm-s-material span.cm-variable { color: #82B1FF; }
-.cm-s-material span.cm-tag { color: #80CBC4; }
-.cm-s-material span.cm-meta { color: #80CBC4; }
-.cm-s-material span.cm-attribute { color: #FFCB6B; }
-.cm-s-material span.cm-property { color: #80CBAE; }
-.cm-s-material span.cm-qualifier { color: #DECB6B; }
-.cm-s-material span.cm-variable-3 { color: #DECB6B; }
-.cm-s-material span.cm-tag { color: rgba(255, 83, 112, 1); }
+.cm-s-material .cm-string { color: #C3E88D; }
+.cm-s-material .cm-string-2 { color: #80CBC4; }
+.cm-s-material .cm-comment { color: #546E7A; }
+.cm-s-material .cm-variable { color: #82B1FF; }
+.cm-s-material .cm-tag { color: #80CBC4; }
+.cm-s-material .cm-meta { color: #80CBC4; }
+.cm-s-material .cm-attribute { color: #FFCB6B; }
+.cm-s-material .cm-property { color: #80CBAE; }
+.cm-s-material .cm-qualifier { color: #DECB6B; }
+.cm-s-material .cm-variable-3 { color: #DECB6B; }
+.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
 .cm-s-material .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
diff --git a/theme/mbo.css b/theme/mbo.css
index 717033ed3d..59ff5da7c6 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -12,7 +12,7 @@
 .cm-s-mbo .CodeMirror-guttermarker { color: white; }
 .cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
 .cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
-.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec !important; }
+.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec; }
 
 .cm-s-mbo span.cm-comment { color: #95958a; }
 .cm-s-mbo span.cm-atom { color: #00a8c6; }
@@ -32,6 +32,6 @@
 .cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
 .cm-s-mbo span.cm-qualifier { color: #ffffec; }
 
-.cm-s-mbo .CodeMirror-activeline-background { background: #494b41 !important; }
+.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
 .cm-s-mbo .CodeMirror-matchingbracket { color: #222 !important; }
 .cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index 5837a8ebee..f325d45005 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -14,7 +14,7 @@
 
 .cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
 .cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
-div.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
+.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
 
 .cm-s-mdn-like .cm-keyword { color: #6262FF; }
 .cm-s-mdn-like .cm-atom { color: #F90; }
diff --git a/theme/midnight.css b/theme/midnight.css
index b13095deef..e41f10560f 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -5,7 +5,7 @@
 .cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
 
 /*<!--activeline-->*/
-.cm-s-midnight .CodeMirror-activeline-background { background: #253540 !important; }
+.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
 
 .cm-s-midnight.CodeMirror {
     background: #0F192A;
@@ -21,9 +21,7 @@
 .cm-s-midnight .CodeMirror-guttermarker { color: white; }
 .cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
-.cm-s-midnight .CodeMirror-cursor {
-    border-left: 1px solid #F8F8F0 !important;
-}
+.cm-s-midnight .CodeMirror-cursor { border-left: 1px solid #F8F8F0; }
 
 .cm-s-midnight span.cm-comment { color: #428BDD; }
 .cm-s-midnight span.cm-atom { color: #AE81FF; }
diff --git a/theme/monokai.css b/theme/monokai.css
index 7607fa585d..6910f793e6 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -8,7 +8,7 @@
 .cm-s-monokai .CodeMirror-guttermarker { color: white; }
 .cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0 !important; }
+.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
 
 .cm-s-monokai span.cm-comment { color: #75715e; }
 .cm-s-monokai span.cm-atom { color: #ae81ff; }
@@ -28,7 +28,7 @@
 .cm-s-monokai span.cm-link { color: #ae81ff; }
 .cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
 
-.cm-s-monokai .CodeMirror-activeline-background { background: #373831 !important; }
+.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
 .cm-s-monokai .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
diff --git a/theme/neat.css b/theme/neat.css
index 29bc8e1f86..4267b1a37d 100644
--- a/theme/neat.css
+++ b/theme/neat.css
@@ -8,5 +8,5 @@
 .cm-s-neat span.cm-meta { color: #555; }
 .cm-s-neat span.cm-link { color: #3a3; }
 
-.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/neo.css b/theme/neo.css
index d8a4d51659..b28d5c65fa 100644
--- a/theme/neo.css
+++ b/theme/neo.css
@@ -35,7 +35,7 @@
 .cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
 .cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
 
-.cm-s-neo div.CodeMirror-cursor {
+.cm-s-neo .CodeMirror-cursor {
   width: auto;
   border: 0;
   background: rgba(155,157,162,0.37);
diff --git a/theme/night.css b/theme/night.css
index b66d7d486b..4dbb86624a 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -8,7 +8,7 @@
 .cm-s-night .CodeMirror-guttermarker { color: white; }
 .cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
 .cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-night span.cm-comment { color: #6900a1; }
 .cm-s-night span.cm-atom { color: #845dc4; }
@@ -24,5 +24,5 @@
 .cm-s-night span.cm-link { color: #845dc4; }
 .cm-s-night span.cm-error { color: #9d1e15; }
 
-.cm-s-night .CodeMirror-activeline-background { background: #1C005A !important; }
+.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
 .cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index 08c4c3ac4f..aa9d207e6d 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -16,7 +16,7 @@
 .cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
 .cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
 .cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687 !important; }
+.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687; }
 
 .cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
 .cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
@@ -34,5 +34,5 @@
 .cm-s-paraiso-dark span.cm-link { color: #815ba4; }
 .cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
 
-.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A !important; }
+.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
 .cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index ae020d1b18..ae0c755f89 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -16,7 +16,7 @@
 .cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
 .cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
 .cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71 !important; }
+.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71; }
 
 .cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
 .cm-s-paraiso-light span.cm-atom { color: #815ba4; }
@@ -34,5 +34,5 @@
 .cm-s-paraiso-light span.cm-link { color: #815ba4; }
 .cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
 
-.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4 !important; }
+.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
 .cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index e995f31158..7197509205 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -25,7 +25,7 @@
 .cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
 .cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
 .cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
+.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
 .cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
 .cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
 .cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
@@ -45,7 +45,7 @@
 	background: #757aD8;
 	color: #f8f8f0;
 }
-.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031) !important; }
+.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
 .cm-s-pastel-on-dark .CodeMirror-matchingbracket {
 	border: 1px solid rgba(255,255,255,0.25);
 	color: #8F938F !important;
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index 9f41d910c5..76d33e7798 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -6,7 +6,7 @@
 .cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
 .cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
 .cm-s-rubyblue .CodeMirror-linenumber { color: white; }
-.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
 .cm-s-rubyblue span.cm-atom { color: #F4C20B; }
@@ -22,4 +22,4 @@
 .cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
 .cm-s-rubyblue span.cm-error { color: #AF2018; }
 
-.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047 !important; }
+.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }
diff --git a/theme/seti.css b/theme/seti.css
index 62bddff3a8..6632d3fc7f 100644
--- a/theme/seti.css
+++ b/theme/seti.css
@@ -18,7 +18,7 @@
   background-color: #0E1112;
   border: none;
 }
-.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0 !important; }
+.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
 .cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
 .cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
 .cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
@@ -40,5 +40,5 @@
 .cm-s-seti span.cm-property { color: #a074c4; }
 .cm-s-seti span.cm-variable-3 { color: #9fca56; }
 .cm-s-seti span.cm-builtin { color: #9fca56; }
-.cm-s-seti .CodeMirror-activeline-background { background: #101213 !important; }
+.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
 .cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 93951a95d3..7882c93763 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -149,9 +149,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   color: #586e75;
 }
 
-.cm-s-solarized .CodeMirror-lines .CodeMirror-cursor {
-  border-left: 1px solid #819090;
-}
+.cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
 
 /*
 Active line. Negative margin compensates left padding of the text in the
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index 1d8b0093ab..3912a8dbd8 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -6,7 +6,7 @@
 .cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
 .cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
 .cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00 !important; }
+.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00; }
 
 .cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
 .cm-s-the-matrix span.cm-atom { color: #3FF; }
diff --git a/theme/tomorrow-night-bright.css b/theme/tomorrow-night-bright.css
index 12bfb1ea54..b6dd4a9278 100644
--- a/theme/tomorrow-night-bright.css
+++ b/theme/tomorrow-night-bright.css
@@ -13,7 +13,7 @@
 .cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
 .cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
 .cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
-.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A !important; }
+.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
 
 .cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
 .cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
@@ -31,5 +31,5 @@
 .cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
 .cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
 
-.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a !important; }
+.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
 .cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index c0d1e12f9a..2a9debc327 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -16,7 +16,7 @@
 .cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
 .cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
 .cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
-.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A !important; }
+.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
 
 .cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
 .cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
@@ -34,5 +34,5 @@
 .cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
 .cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
 
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600 !important; }
+.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
 .cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/twilight.css b/theme/twilight.css
index b333efd775..d342b899f6 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -7,7 +7,7 @@
 .cm-s-twilight .CodeMirror-guttermarker { color: white; }
 .cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
 .cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
-.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
 .cm-s-twilight .cm-atom { color: #FC0; }
@@ -28,5 +28,5 @@
 .cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
 .cm-s-twilight .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-twilight .CodeMirror-activeline-background { background: #27282E !important; }
+.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
 .cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index 075797fc57..ac4ec6d87a 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -9,7 +9,7 @@
 .cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
 .cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
 .cm-s-vibrant-ink .cm-atom { color: #FC0; }
@@ -30,5 +30,5 @@
 .cm-s-vibrant-ink .cm-link { color: blue; }
 .cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E !important; }
+.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
 .cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index 1e7527b144..e3bd960bbb 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -28,7 +28,7 @@ THE SOFTWARE.
 .cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
 .cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
 .cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
@@ -49,5 +49,5 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-attribute { color: #FFF700; }
 .cm-s-xq-dark span.cm-error { color: #f00; }
 
-.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E !important; }
+.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
 .cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/xq-light.css b/theme/xq-light.css
index c9185dc394..8d2fcb667b 100644
--- a/theme/xq-light.css
+++ b/theme/xq-light.css
@@ -39,5 +39,5 @@ THE SOFTWARE.
 .cm-s-xq-light span.cm-attribute { color: #7F007F; }
 .cm-s-xq-light span.cm-error { color: #f00; }
 
-.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff !important; }
+.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/theme/yeti.css b/theme/yeti.css
index 657cc1d32e..c70d4d214e 100644
--- a/theme/yeti.css
+++ b/theme/yeti.css
@@ -19,7 +19,7 @@
   background-color: #E5E1DB;
   border: none;
 }
-.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0 !important; }
+.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0; }
 .cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
 .cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
 .cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
@@ -40,5 +40,5 @@
 .cm-s-yeti span.cm-property { color: #a074c4; }
 .cm-s-yeti span.cm-builtin { color: #a074c4; }
 .cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
-.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0 !important; }
+.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
 .cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/theme/zenburn.css b/theme/zenburn.css
index c8114483e9..781c40acac 100644
--- a/theme/zenburn.css
+++ b/theme/zenburn.css
@@ -10,7 +10,7 @@
 
 .cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
 .cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
-.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white; }
 .cm-s-zenburn { background-color: #3f3f3f; color: #dcdccc; }
 .cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
 .cm-s-zenburn span.cm-comment { color: #7f9f7f; }

From f06c53fb017efc8a949c4e84558fe6a2f866953f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Aug 2015 12:25:32 +0200
Subject: [PATCH 2266/4742] Fix some damage done by a7d443ec82c

Issue #3434
---
 lib/codemirror.css | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 63753dcb02..3543523e64 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -42,21 +42,20 @@
 /* CURSOR */
 
 .CodeMirror-cursor {
-  position: absolute;
+  border-left: 1px solid black;
   border-right: none;
   width: 0;
-  border-left: 1px solid black;
 }
 /* Shown when moving in bi-directional text */
 .CodeMirror div.CodeMirror-secondarycursor {
   border-left: 1px solid silver;
 }
-.CodeMirror.cm-fat-cursor .CodeMirror-cursor {
+.cm-fat-cursor .CodeMirror-cursor {
   width: auto;
   border: 0;
   background: #7e7;
 }
-.CodeMirror.cm-fat-cursor div.CodeMirror-cursors {
+.cm-fat-cursor div.CodeMirror-cursors {
   z-index: 1;
 }
 
@@ -84,6 +83,9 @@
   100% {}
 }
 
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror-overwrite .CodeMirror-cursor {}
+
 .cm-tab { display: inline-block; text-decoration: inherit; }
 
 .CodeMirror-ruler {
@@ -284,6 +286,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   overflow: hidden;
   visibility: hidden;
 }
+
+.CodeMirror-cursor { position: absolute; }
 .CodeMirror-measure pre { position: static; }
 
 div.CodeMirror-cursors {

From 7bba3a8c6fbde5ade4507b22ce11bc9714d8d660 Mon Sep 17 00:00:00 2001
From: Amin Shali <amshali@google.com>
Date: Tue, 4 Aug 2015 17:39:46 -0700
Subject: [PATCH 2267/4742] [abcdef theme] Add

---
 theme/abcdef.css | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 theme/abcdef.css

diff --git a/theme/abcdef.css b/theme/abcdef.css
new file mode 100644
index 0000000000..ee17760d1c
--- /dev/null
+++ b/theme/abcdef.css
@@ -0,0 +1,32 @@
+.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
+.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
+.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
+.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
+.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
+.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00 !important; }
+
+.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
+.cm-s-abcdef span.cm-atom { color: #77F; }
+.cm-s-abcdef span.cm-number { color: violet; }
+.cm-s-abcdef span.cm-def { color: #fffabc; }
+.cm-s-abcdef span.cm-variable { color: #abcdef; }
+.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
+.cm-s-abcdef span.cm-variable-3 { color: #def; }
+.cm-s-abcdef span.cm-property { color: #fedcba; }
+.cm-s-abcdef span.cm-operator { color: #ff0; }
+.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
+.cm-s-abcdef span.cm-string { color: #2b4; }
+.cm-s-abcdef span.cm-meta { color: #C9F; }
+.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
+.cm-s-abcdef span.cm-builtin { color: #30aabc; }
+.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
+.cm-s-abcdef span.cm-tag { color: #FFDD44; }
+.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
+.cm-s-abcdef span.cm-error { color: #FF0000; }
+.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
+.cm-s-abcdef span.cm-link { color: blue; }
+
+.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }

From 16b9bf7dd2361aaa2a4a6128340f6d9ecf694b61 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Aug 2015 12:29:39 +0200
Subject: [PATCH 2268/4742] [abcdef theme] Integrate

---
 demo/theme.html  | 2 ++
 theme/abcdef.css | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/demo/theme.html b/demo/theme.html
index 93d52510fb..3c6b1c07de 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <link rel="stylesheet" href="../theme/3024-day.css">
 <link rel="stylesheet" href="../theme/3024-night.css">
+<link rel="stylesheet" href="../theme/abcdef.css">
 <link rel="stylesheet" href="../theme/ambiance.css">
 <link rel="stylesheet" href="../theme/base16-dark.css">
 <link rel="stylesheet" href="../theme/base16-light.css">
@@ -84,6 +85,7 @@ <h2>Theme Demo</h2>
     <option selected>default</option>
     <option>3024-day</option>
     <option>3024-night</option>
+    <option>abcdef</option>
     <option>ambiance</option>
     <option>base16-dark</option>
     <option>base16-light</option>
diff --git a/theme/abcdef.css b/theme/abcdef.css
index ee17760d1c..142d813703 100644
--- a/theme/abcdef.css
+++ b/theme/abcdef.css
@@ -6,7 +6,7 @@
 .cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
 .cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
 .cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00 !important; }
+.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }
 
 .cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
 .cm-s-abcdef span.cm-atom { color: #77F; }

From ad47608229f6552bd314851f3daf9f8ba5d4cce9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 6 Aug 2015 12:32:54 +0200
Subject: [PATCH 2269/4742] [ttcn theme] Fix leaky declarations

---
 theme/ttcn.css | 65 +++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/theme/ttcn.css b/theme/ttcn.css
index cf19c1476d..b3d465645b 100644
--- a/theme/ttcn.css
+++ b/theme/ttcn.css
@@ -1,38 +1,37 @@
-.cm-quote { color: #090; }
-.cm-negative { color: #d44; }
-.cm-positive { color: #292; }
-.cm-header, .cm-strong { font-weight: bold; }
-.cm-em { font-style: italic; }
-.cm-link { text-decoration: underline; }
-.cm-strikethrough { text-decoration: line-through; }
-.cm-header { color: #00f; font-weight: bold; }
+.cm-s-ttcn .cm-quote { color: #090; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-header, .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-link { text-decoration: underline; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-header { color: #00f; font-weight: bold; }
 
-.cm-atom { color: #219; }
-.cm-attribute { color: #00c; }
-.cm-bracket { color: #997; }
-.cm-comment { color: #333333; }
-.cm-def { color: #00f; }
-.cm-em { font-style: italic; }
-.cm-error { color: #f00; }
-.cm-hr { color: #999; }
-.cm-invalidchar { color: #f00; }
-.cm-keyword { font-weight:bold; }
-.cm-link { color: #00c; text-decoration: underline; }
-.cm-meta { color: #555; }
-.cm-negative { color: #d44; }
-.cm-positive { color: #292; }
-.cm-qualifier { color: #555; }
-.cm-strikethrough { text-decoration: line-through; }
-.cm-string { color: #006400; }
-.cm-string-2 { color: #f50; }
-.cm-strong { font-weight: bold; }
-.cm-tag { color: #170; }
-.cm-variable { color: #8B2252; }
-.cm-variable-2 { color: #05a; }
-.cm-variable-3 { color: #085; }
+.cm-s-ttcn .cm-atom { color: #219; }
+.cm-s-ttcn .cm-attribute { color: #00c; }
+.cm-s-ttcn .cm-bracket { color: #997; }
+.cm-s-ttcn .cm-comment { color: #333333; }
+.cm-s-ttcn .cm-def { color: #00f; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-error { color: #f00; }
+.cm-s-ttcn .cm-hr { color: #999; }
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
+.cm-s-ttcn .cm-keyword { font-weight:bold; }
+.cm-s-ttcn .cm-link { color: #00c; text-decoration: underline; }
+.cm-s-ttcn .cm-meta { color: #555; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-qualifier { color: #555; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-string { color: #006400; }
+.cm-s-ttcn .cm-string-2 { color: #f50; }
+.cm-s-ttcn .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-tag { color: #170; }
+.cm-s-ttcn .cm-variable { color: #8B2252; }
+.cm-s-ttcn .cm-variable-2 { color: #05a; }
+.cm-s-ttcn .cm-variable-3 { color: #085; }
 
-.cm-s-default .cm-error { color: #f00; }
-.cm-invalidchar { color: #f00; }
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
 
 /* ASN */
 .cm-s-ttcn .cm-accessTypes,

From 3ef42f71dc1a7c50ab73c39516a0563430eb11e3 Mon Sep 17 00:00:00 2001
From: Joseph Pecoraro <pecoraro@apple.com>
Date: Tue, 28 Jul 2015 12:47:42 -0700
Subject: [PATCH 2270/4742] [css mode] Missing some common media query features
 and values

Closes #3417
---
 mode/css/css.js  | 20 +++++++++++++++++---
 mode/css/test.js |  6 ++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 70e35ae5af..11498a67af 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -21,6 +21,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       documentTypes = parserConfig.documentTypes || {},
       mediaTypes = parserConfig.mediaTypes || {},
       mediaFeatures = parserConfig.mediaFeatures || {},
+      mediaValueKeywords = parserConfig.mediaValueKeywords || {},
       propertyKeywords = parserConfig.propertyKeywords || {},
       nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {},
       fontProperties = parserConfig.fontProperties || {},
@@ -269,6 +270,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         override = "attribute";
       else if (mediaFeatures.hasOwnProperty(word))
         override = "property";
+      else if (mediaValueKeywords.hasOwnProperty(word))
+        override = "keyword";
       else if (propertyKeywords.hasOwnProperty(word))
         override = "property";
       else if (nonStandardPropertyKeywords.hasOwnProperty(word))
@@ -403,9 +406,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
     "max-color", "color-index", "min-color-index", "max-color-index",
     "monochrome", "min-monochrome", "max-monochrome", "resolution",
-    "min-resolution", "max-resolution", "scan", "grid"
+    "min-resolution", "max-resolution", "scan", "grid", "orientation",
+    "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
+    "pointer", "any-pointer", "hover", "any-hover"
   ], mediaFeatures = keySet(mediaFeatures_);
 
+  var mediaValueKeywords_ = [
+    "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
+    "interlace", "progressive"
+  ], mediaValueKeywords = keySet(mediaValueKeywords_);
+
   var propertyKeywords_ = [
     "align-content", "align-items", "align-self", "alignment-adjust",
     "alignment-baseline", "anchor-point", "animation", "animation-delay",
@@ -641,8 +651,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "xx-large", "xx-small"
   ], valueKeywords = keySet(valueKeywords_);
 
-  var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(propertyKeywords_)
-    .concat(nonStandardPropertyKeywords_).concat(colorKeywords_).concat(valueKeywords_);
+  var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(mediaValueKeywords_)
+    .concat(propertyKeywords_).concat(nonStandardPropertyKeywords_).concat(colorKeywords_)
+    .concat(valueKeywords_);
   CodeMirror.registerHelper("hintWords", "css", allWords);
 
   function tokenCComment(stream, state) {
@@ -661,6 +672,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     documentTypes: documentTypes,
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
     propertyKeywords: propertyKeywords,
     nonStandardPropertyKeywords: nonStandardPropertyKeywords,
     fontProperties: fontProperties,
@@ -680,6 +692,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-scss", {
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
     propertyKeywords: propertyKeywords,
     nonStandardPropertyKeywords: nonStandardPropertyKeywords,
     colorKeywords: colorKeywords,
@@ -721,6 +734,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-less", {
     mediaTypes: mediaTypes,
     mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
     propertyKeywords: propertyKeywords,
     nonStandardPropertyKeywords: nonStandardPropertyKeywords,
     colorKeywords: colorKeywords,
diff --git a/mode/css/test.js b/mode/css/test.js
index 55ae676e75..cda07748b2 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -18,6 +18,12 @@
   MT("atMediaMaxWidthNested",
      "[def @media] [attribute screen] [keyword and] ([property max-width]: [number 25px]) { [tag foo] { } }");
 
+  MT("atMediaFeatureValueKeyword",
+     "[def @media] ([property orientation]: [keyword landscape]) { }");
+
+  MT("atMediaUnknownFeatureValueKeyword",
+     "[def @media] ([property orientation]: [error upsidedown]) { }");
+
   MT("tagSelector",
      "[tag foo] { }");
 

From bc026f1b2e7d188f6742f7a312f65af31dcd0668 Mon Sep 17 00:00:00 2001
From: Se-Won Kim <kim.sewon@gmail.com>
Date: Fri, 7 Aug 2015 11:39:57 +0900
Subject: [PATCH 2271/4742] [tern addon] Use correct primary when selecting
 variables

---
 addon/tern/tern.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 68eceb5a62..7eeab38fe2 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -466,12 +466,13 @@
     ts.request(cm, {type: "refs"}, function(error, data) {
       if (error) return showError(ts, cm, error);
       var ranges = [], cur = 0;
+      var curPos = cm.getCursor();
       for (var i = 0; i < data.refs.length; i++) {
         var ref = data.refs[i];
         if (ref.file == name) {
           ranges.push({anchor: ref.start, head: ref.end});
-          if (cmpPos(cur, ref.start) >= 0 && cmpPos(cur, ref.end) <= 0)
-            cur = ranges.length - 1;
+          if (cmpPos(curPos, ref.start) >= 0 && cmpPos(curPos, ref.end) <= 0)
+            cur = i;
         }
       }
       cm.setSelections(ranges, cur);

From 9e375f15452f0f3c79e62bd555e9466c9477648e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Aug 2015 09:58:19 +0200
Subject: [PATCH 2272/4742] [tern addon] Fix patch bc026f1

Issue #3438
---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 7eeab38fe2..3ff2d53e5f 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -472,7 +472,7 @@
         if (ref.file == name) {
           ranges.push({anchor: ref.start, head: ref.end});
           if (cmpPos(curPos, ref.start) >= 0 && cmpPos(curPos, ref.end) <= 0)
-            cur = i;
+            cur = ranges.length - 1;
         }
       }
       cm.setSelections(ranges, cur);

From 9f1b3a6d489b72a9f67f553cb3112b252e61fb0b Mon Sep 17 00:00:00 2001
From: Rrandom <emanonhere@gmail.com>
Date: Fri, 7 Aug 2015 14:16:37 +0800
Subject: [PATCH 2273/4742] [css mode] Add values for property flex-direction

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 11498a67af..f67cd2161b 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -567,7 +567,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
     "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
-    "col-resize", "collapse", "column", "compact", "condensed", "contain", "content",
+    "col-resize", "collapse", "column", "column-reverse", "compact", "condensed", "contain", "content",
     "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
     "cross", "crosshair", "currentcolor", "cursive", "cyclic", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "destination-atop",
@@ -620,7 +620,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "relative", "repeat", "repeating-linear-gradient",
     "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
     "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
-    "rotateZ", "round", "row-resize", "rtl", "run-in", "running",
+    "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
     "s-resize", "sans-serif", "scale", "scale3d", "scaleX", "scaleY", "scaleZ",
     "scroll", "scrollbar", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",

From 7523531bbbfa8fc2f5bd535380504d483bd2dba2 Mon Sep 17 00:00:00 2001
From: Dmitry Kiselyov <dmitrykiselyov@ukr.net>
Date: Fri, 31 Jul 2015 14:53:46 +0300
Subject: [PATCH 2274/4742] [stylus mode] Fix highlight class after a $var

For example:

body
  color $red

.content
  color #000

The .content was highlighted as the variable-2
---
 mode/stylus/stylus.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index f249258174..662cd03c04 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -126,19 +126,16 @@
       if (stream.match(/^&{1}\s*$/)) {
         return ["variable-3", "reference"];
       }
-      // Variable
-      if (ch == "$" && stream.match(/^\$[\w-]+/i)) {
-        return ["variable-2", "variable-name"];
-      }
       // Word operator
       if (stream.match(wordOperatorKeywordsRegexp)) {
         return ["operator", "operator"];
       }
       // Word
-      if (stream.match(/^[-_]*[a-z0-9]+[\w-]*/i)) {
+      if (stream.match(/^\$?[-_]*[a-z0-9]+[\w-]*/i)) {
+        // Variable
         if (stream.match(/^(\.|\[)[\w-\'\"\]]+/i, false)) {
           if (!wordIsTag(stream.current())) {
-            stream.match(/[\w-]+/);
+            stream.match(/\./);
             return ["variable-2", "variable-name"];
           }
         }
@@ -323,7 +320,7 @@
         return pushContext(state, stream, "block", 0);
       }
       if (type == "variable-name") {
-        if ((stream.indentation() == 0 && startOfLine(stream)) || wordIsBlock(firstWordOfLine(stream))) {
+        if (stream.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/) || wordIsBlock(firstWordOfLine(stream))) {
           return pushContext(state, stream, "variableName");
         }
         else {
@@ -429,6 +426,11 @@
           return pushContext(state, stream, "block");
         }
         if (word == "return") return pushContext(state, stream, "block", 0);
+
+        // Placeholder selector
+        if (override == "variable-2" && stream.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/)) {
+          return pushContext(state, stream, "block");
+        }
       }
       return state.context.type;
     };
@@ -639,7 +641,6 @@
     states.variableName = function(type, stream, state) {
       if (type == "string" || type == "[" || type == "]" || stream.current().match(/^(\.|\$)/)) {
         if (stream.current().match(/^\.[\w-]+/i)) override = "variable-2";
-        if (endOfLine(stream)) return popContext(state);
         return "variableName";
       }
       return popAndPass(type, stream, state);

From 723c9f1a8686551de36070419fe8fdd143d13fc8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Aug 2015 10:32:26 +0200
Subject: [PATCH 2275/4742] [merge addon] Assume diff_match_patch to be global

Since the library is completely oblivious to module loaders

Issue #3447
---
 addon/merge/merge.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 5b04b03292..e99de0b778 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -9,8 +9,8 @@
   else if (typeof define == "function" && define.amd) // AMD
     define(["../../lib/codemirror", "diff_match_patch"], mod);
   else // Plain browser env
-    mod(CodeMirror, diff_match_patch);
-})(function(CodeMirror, diff_match_patch) {
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
   var Pos = CodeMirror.Pos;
   var svgNS = "http://www.w3.org/2000/svg";

From 5d782cbe26f2291c2cde21475910be77caf35fd9 Mon Sep 17 00:00:00 2001
From: Allen Sarkisyan <allensarkisyan@gmail.com>
Date: Fri, 7 Aug 2015 16:47:00 -0700
Subject: [PATCH 2276/4742] [anyword-hint addon] Allow initial custom list
 through hintOptions

- Provide custom list through CodeMirror hintOptions to kickoff
  autocompletion for domain specific usage.
---
 addon/hint/anyword-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index 8e74a92080..dae78e2efb 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -21,7 +21,7 @@
     while (start && word.test(curLine.charAt(start - 1))) --start;
     var curWord = start != end && curLine.slice(start, end);
 
-    var list = [], seen = {};
+    var list = options && options.list || [], seen = {};
     var re = new RegExp(word.source, "g");
     for (var dir = -1; dir <= 1; dir += 2) {
       var line = cur.line, endLine = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;

From 341a8505d4408b57b45384846282192ba9f606c6 Mon Sep 17 00:00:00 2001
From: Rrandom <emanonhere@gmail.com>
Date: Sat, 8 Aug 2015 14:25:18 +0800
Subject: [PATCH 2277/4742] [css mode] Add missing values for properties in
 flex

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

diff --git a/mode/css/css.js b/mode/css/css.js
index f67cd2161b..7fcf335d30 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -583,7 +583,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
     "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
     "ethiopic-numeric", "ew-resize", "expanded", "extends", "extra-condensed",
-    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "footnotes",
+    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
     "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
     "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
     "help", "hidden", "hide", "higher", "highlight", "highlighttext",
@@ -630,7 +630,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
     "small", "small-caps", "small-caption", "smaller", "solid", "somali",
-    "source-atop", "source-in", "source-out", "source-over", "space", "spell-out", "square",
+    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
     "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
     "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",
@@ -647,7 +647,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
     "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
     "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
-    "window", "windowframe", "windowtext", "words", "x-large", "x-small", "xor",
+    "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor",
     "xx-large", "xx-small"
   ], valueKeywords = keySet(valueKeywords_);
 

From 4f88baab053cf8a0d1808c4af8fa995c63918e19 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Aug 2015 11:10:23 +0200
Subject: [PATCH 2278/4742] Ignore mode state changes for lines too long to be
 fully highlighted

Should reduce the indentation issues after long lines

Issue #3443
---
 lib/codemirror.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 80a709675d..687cb957b5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2405,8 +2405,8 @@
 
     doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
       if (doc.frontier >= cm.display.viewFrom) { // Visible
-        var oldStyles = line.styles;
-        var highlighted = highlightLine(cm, line, state, true);
+        var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength;
+        var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true);
         line.styles = highlighted.styles;
         var oldCls = line.styleClasses, newCls = highlighted.classes;
         if (newCls) line.styleClasses = newCls;
@@ -2415,9 +2415,10 @@
           oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
         for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
         if (ischange) changedLines.push(doc.frontier);
-        line.stateAfter = copyState(doc.mode, state);
+        line.stateAfter = tooLong ? state : copyState(doc.mode, state);
       } else {
-        processLine(cm, line.text, state);
+        if (line.text.length <= cm.options.maxHighlightLength)
+          processLine(cm, line.text, state);
         line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
       }
       ++doc.frontier;
@@ -6813,7 +6814,9 @@
 
   function getLineStyles(cm, line, updateFrontier) {
     if (!line.styles || line.styles[0] != cm.state.modeGen) {
-      var result = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
+      var state = getStateBefore(cm, lineNo(line));
+      var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state);
+      line.stateAfter = state;
       line.styles = result.styles;
       if (result.classes) line.styleClasses = result.classes;
       else if (line.styleClasses) line.styleClasses = null;
@@ -6830,7 +6833,7 @@
     var stream = new StringStream(text, cm.options.tabSize);
     stream.start = stream.pos = startAt || 0;
     if (text == "") callBlankLine(mode, state);
-    while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) {
+    while (!stream.eol()) {
       readToken(mode, stream, state);
       stream.start = stream.pos;
     }

From 29e2d4f2ff5832291a3a71c5e6c05e39b712cd82 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Aug 2015 11:38:18 +0200
Subject: [PATCH 2279/4742] [autorefresh addon] Add

---
 addon/display/autorefresh.js | 47 ++++++++++++++++++++++++++++++++++++
 doc/manual.html              | 17 ++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 addon/display/autorefresh.js

diff --git a/addon/display/autorefresh.js b/addon/display/autorefresh.js
new file mode 100644
index 0000000000..c47733f80b
--- /dev/null
+++ b/addon/display/autorefresh.js
@@ -0,0 +1,47 @@
+// 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"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+
+  CodeMirror.defineOption("autoRefresh", false, function(cm, val) {
+    if (cm.state.autoRefresh) {
+      stopListening(cm, cm.state.autoRefresh)
+      cm.state.autoRefresh = null
+    }
+    if (val && cm.display.wrapper.offsetHeight == 0)
+      startListening(cm, cm.state.autoRefresh = {delay: val.delay || 250})
+  })
+
+  function startListening(cm, state) {
+    function check() {
+      if (cm.display.wrapper.offsetHeight) {
+        stopListening(cm, state)
+        if (cm.display.lastWrapHeight != cm.display.wrapper.clientHeight)
+          cm.refresh()
+      } else {
+        state.timeout = setTimeout(check, state.delay)
+      }
+    }
+    state.timeout = setTimeout(check, state.delay)
+    state.hurry = function() {
+      clearTimeout(state.timeout)
+      state.timeout = setTimeout(check, 50)
+    }
+    CodeMirror.on(window, "mouseup", state.hurry)
+    CodeMirror.on(window, "keyup", state.hurry)
+  }
+
+  function stopListening(cm, state) {
+    clearTimeout(state.timeout)
+    CodeMirror.off(window, "mouseup", state.hurry)
+    CodeMirror.off(window, "keyup", state.hurry)
+  }
+});
diff --git a/doc/manual.html b/doc/manual.html
index ba87d09ad2..065ee0b2cf 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1865,7 +1865,8 @@ <h3 id="api_sizing">Sizing, scrolling and positioning methods</h3>
       <dd>If your code does something to change the size of the editor
       element (window resizes are already listened for), or unhides
       it, you should probably follow up by calling this method to
-      ensure CodeMirror is still looking as intended.</dd>
+      ensure CodeMirror is still looking as intended. See also
+      the <a href="#addon_autorefresh">autorefresh addon</a>.</dd>
     </dl>
 
     <h3 id="api_mode">Mode, state, and token-related methods</h3>
@@ -2772,6 +2773,20 @@ <h2 id="addons">Addons</h2>
       on <a href="../addon/display/fullscreen.css"><code>fullscreen.css</code></a>. <a href="../demo/fullscreen.html">Demo
       here</a>.</dd>
 
+      <dt id="addon_autorefresh"><a href="../addon/display/autorefresh.js"><code>display/autorefresh.js</code></a></dt>
+      <dd>This addon can be useful when initalizing an editor in a
+      hidden DOM node, in cases where it is difficult to
+      call <a href="#refresh"><code>refresh</code></a> when the editor
+      becomes visible. It defines an option <code>autoRefresh</code>
+      which you can set to true to ensure that, if the editor wasn't
+      visible on initialization, it will be refreshed the first time
+      it becomes visible. This is done by polling every 250
+      milliseconds (you can pass a value like <code>{delay:
+      500}</code> as the option value to configure this). Note that
+      this addon will only refresh the editor <em>once</em> when it
+      first becomes visible, and won't take care of further restyling
+      and resizing.</dd>
+
       <dt id="addon_simplescrollbars"><a href="../addon/scroll/simplescrollbars.js"><code>scroll/simplescrollbars.js</code></a></dt>
       <dd>Defines two additional scrollbar
       models, <code>"simple"</code> and <code>"overlay"</code>

From f211bc170ff2a718cff67aad5fa8c41085317148 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Aug 2015 11:47:28 +0200
Subject: [PATCH 2280/4742] Mark unused variable

---
 addon/display/autorefresh.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/display/autorefresh.js b/addon/display/autorefresh.js
index c47733f80b..1e0e850469 100644
--- a/addon/display/autorefresh.js
+++ b/addon/display/autorefresh.js
@@ -39,7 +39,7 @@
     CodeMirror.on(window, "keyup", state.hurry)
   }
 
-  function stopListening(cm, state) {
+  function stopListening(_cm, state) {
     clearTimeout(state.timeout)
     CodeMirror.off(window, "mouseup", state.hurry)
     CodeMirror.off(window, "keyup", state.hurry)

From 37ecdbec441cfc3db7fbb6c79ad18c74e2f9f327 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 13 Aug 2015 11:09:41 +0200
Subject: [PATCH 2281/4742] [readme] Add gitter badge

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 77824ebdbf..6c818272fd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # CodeMirror
 [![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
-[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)  
+[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
+[![Join the chat at https://gitter.im/codemirror/CodeMirror](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/codemirror/CodeMirror)  
 [Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?again)](https://marijnhaverbeke.nl/fund/)
 
 CodeMirror is a versatile text editor implemented in JavaScript for

From c890a09516e11c83cbe147e01a056faf71fd0302 Mon Sep 17 00:00:00 2001
From: Andres Taylor <andres@neotechnology.com>
Date: Thu, 13 Aug 2015 11:21:21 +0200
Subject: [PATCH 2282/4742] [cypher mode] Updated keywords and preds

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

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index e218d47308..79048b440c 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -61,8 +61,8 @@
     var indentUnit = config.indentUnit;
     var curPunc;
     var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
-    var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]);
-    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
+    var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor", "like", "ilike", "exists"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
     var operatorChars = /[*+\-<>=&|~%^]/;
 
     return {

From 5db6351f5518cf3f9d261a3c83c18574c60262f6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Aug 2015 14:47:18 +0200
Subject: [PATCH 2283/4742] [javascript mode] Remove support for outdated/bogus
 module syntax

---
 mode/javascript/javascript.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c86f49e1f6..341a43d592 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -36,7 +36,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
       "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
-      "this": kw("this"), "module": kw("module"), "class": kw("class"), "super": kw("atom"),
+      "this": kw("this"), "class": kw("class"), "super": kw("atom"),
       "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
     };
 
@@ -347,7 +347,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "default") return cont(expect(":"));
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
                                      statement, poplex, popcontext);
-    if (type == "module") return cont(pushlex("form"), pushcontext, afterModule, popcontext, poplex);
     if (type == "class") return cont(pushlex("form"), className, poplex);
     if (type == "export") return cont(pushlex("form"), afterExport, poplex);
     if (type == "import") return cont(pushlex("form"), afterImport, poplex);
@@ -572,10 +571,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     cx.marked = "property";
     return cont();
   }
-  function afterModule(type, value) {
-    if (type == "string") return cont(statement);
-    if (type == "variable") { register(value); return cont(maybeFrom); }
-  }
   function afterExport(_type, value) {
     if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
     if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }

From 7c3fb566acae16f66ba8ca96fdd1e01e4d93bb72 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 14 Aug 2015 14:50:27 +0200
Subject: [PATCH 2284/4742] [javascript mode] Remove tests that relied on
 module syntax

---
 mode/javascript/test.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 092d25dc9a..452de5fd6b 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -34,16 +34,9 @@
      "  }",
      "}");
 
-  MT("module",
-     "[keyword module] [string 'foo'] {",
-     "  [keyword export] [keyword let] [def x] [operator =] [number 42];",
-     "  [keyword export] [keyword *] [keyword from] [string 'somewhere'];",
-     "}");
-
   MT("import",
      "[keyword function] [variable foo]() {",
      "  [keyword import] [def $] [keyword from] [string 'jquery'];",
-     "  [keyword module] [def crypto] [keyword from] [string 'crypto'];",
      "  [keyword import] { [def encrypt], [def decrypt] } [keyword from] [string 'crypto'];",
      "}");
 

From 6990f142986af5a4d5372b3a990147db9073307d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Aug 2015 12:34:42 +0200
Subject: [PATCH 2285/4742] Don't scroll selection into view when removing a
 cursor

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 687cb957b5..f1ba15bb10 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3665,7 +3665,8 @@
       setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
                    {scroll: false, origin: "*mouse"});
     } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
-      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0));
+      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
+                   {scroll: false, origin: "*mouse"});
       startSel = doc.sel;
     } else {
       replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);

From f1ffc95f43a0b2e9a67ec559d9d071ada43bea30 Mon Sep 17 00:00:00 2001
From: Michael <mikethedj4@yahoo.com>
Date: Tue, 18 Aug 2015 14:47:11 -0500
Subject: [PATCH 2286/4742] [html-lint addon] Add

---
 addon/lint/html-lint.js | 58 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 addon/lint/html-lint.js

diff --git a/addon/lint/html-lint.js b/addon/lint/html-lint.js
new file mode 100644
index 0000000000..01eec9e85b
--- /dev/null
+++ b/addon/lint/html-lint.js
@@ -0,0 +1,58 @@
+/*!
+ * Try it on Codepen!
+ * http://codepen.io/mikethedj4/pen/PqgrBY
+ * 
+ * View Github Example: 
+ * https://github.com/mikethedj4/html-lint-for-codemirror
+ *
+ * Rules Specified for Validation:
+ *
+ * var ruleSets = {
+ *   "tagname-lowercase": true,
+ *   "attr-lowercase": true,
+ *   "attr-value-double-quotes": true,
+ *   "doctype-first": false,
+ *   "tag-pair": true,
+ *   "spec-char-escape": true,
+ *   "id-unique": true,
+ *   "src-not-empty": true,
+ *   "attr-no-duplication": true
+ * };
+*/
+
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Depends on htmlhint.js from http://htmlhint.com/js/htmlhint.js
+
+// declare global: HTMLHint
+
+(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.registerHelper("lint", "html", function(text) {
+    var found = [], message;
+    if (!window.HTMLHint) return found;
+    var messages = HTMLHint.verify(text, ruleSets);
+    for ( var i = 0; i < messages.length; i++) {
+      message = messages[i];
+      var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;
+      found.push({
+        from: CodeMirror.Pos(startLine, startCol),
+        to: CodeMirror.Pos(endLine, endCol),
+        message: message.message,
+        severity : message.type
+      });
+    }
+    return found;
+  }); 
+});

From 644803cd61b008e2c2684de32718be283cc2bde1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Aug 2015 22:08:36 +0200
Subject: [PATCH 2287/4742] [html-lint addon] Touch up

---
 addon/lint/html-lint.js | 56 ++++++++++++++++-------------------------
 doc/manual.html         |  3 ++-
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/addon/lint/html-lint.js b/addon/lint/html-lint.js
index 01eec9e85b..1e8417098d 100644
--- a/addon/lint/html-lint.js
+++ b/addon/lint/html-lint.js
@@ -1,25 +1,3 @@
-/*!
- * Try it on Codepen!
- * http://codepen.io/mikethedj4/pen/PqgrBY
- * 
- * View Github Example: 
- * https://github.com/mikethedj4/html-lint-for-codemirror
- *
- * Rules Specified for Validation:
- *
- * var ruleSets = {
- *   "tagname-lowercase": true,
- *   "attr-lowercase": true,
- *   "attr-value-double-quotes": true,
- *   "doctype-first": false,
- *   "tag-pair": true,
- *   "spec-char-escape": true,
- *   "id-unique": true,
- *   "src-not-empty": true,
- *   "attr-no-duplication": true
- * };
-*/
-
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
@@ -29,23 +7,33 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), require("htmlhint"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "htmlhint"], mod);
   else // Plain browser env
     mod(CodeMirror);
-})
-
-(function(CodeMirror) {
+})(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.registerHelper("lint", "html", function(text) {
-    var found = [], message;
+  var defaultRules = {
+    "tagname-lowercase": true,
+    "attr-lowercase": true,
+    "attr-value-double-quotes": true,
+    "doctype-first": false,
+    "tag-pair": true,
+    "spec-char-escape": true,
+    "id-unique": true,
+    "src-not-empty": true,
+    "attr-no-duplication": true
+  };
+
+  CodeMirror.registerHelper("lint", "html", function(text, options) {
+    var found = [];
     if (!window.HTMLHint) return found;
-    var messages = HTMLHint.verify(text, ruleSets);
-    for ( var i = 0; i < messages.length; i++) {
-      message = messages[i];
-      var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;
+    var messages = HTMLHint.verify(text, options && options.rules || defaultRules);
+    for (var i = 0; i < messages.length; i++) {
+      var message = messages[i];
+      var startLine = message.line - 1, endLine = message.line - 1, startCol = message.col - 1, endCol = message.col;
       found.push({
         from: CodeMirror.Pos(startLine, startCol),
         to: CodeMirror.Pos(endLine, endCol),
@@ -54,5 +42,5 @@
       });
     }
     return found;
-  }); 
+  });
 });
diff --git a/doc/manual.html b/doc/manual.html
index 065ee0b2cf..a73c3902ba 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2672,7 +2672,8 @@ <h2 id="addons">Addons</h2>
       <dt id="addon_lint"><a href="../addon/lint/lint.js"><code>lint/lint.js</code></a></dt>
       <dd>Defines an interface component for showing linting warnings,
       with pluggable warning sources
-      (see <a href="../addon/lint/json-lint.js"><code>json-lint.js</code></a>,
+      (see <a href="../addon/lint/html-lint.js"><code>html-lint.js</code></a>,
+      <a href="../addon/lint/json-lint.js"><code>json-lint.js</code></a>,
       <a href="../addon/lint/javascript-lint.js"><code>javascript-lint.js</code></a>,
       <a href="../addon/lint/coffeescript-lint.js"><code>coffeescript-lint.js</code></a>,
       and <a href="../addon/lint/css-lint.js"><code>css-lint.js</code></a>

From eb0ef20e96b4dfc821eb693982510af60ab6ac45 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Aug 2015 10:35:15 +0200
Subject: [PATCH 2288/4742] [search addon] Allow \n and \r in search and
 replace strings

Closes #3456
---
 addon/search/search.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addon/search/search.js b/addon/search/search.js
index ed3c477550..5ec6ed6fb1 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -76,11 +76,21 @@
     else if (confirm(shortText)) fs[0]();
   }
 
+  function parseString(string) {
+    return string.replace(/\\(.)/g, function(_, ch) {
+      if (ch == "n") return "\n"
+      if (ch == "r") return "\r"
+      return ch
+    })
+  }
+
   function parseQuery(query) {
     var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
     if (isRE) {
       try { query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i"); }
       catch(e) {} // Not a regular expression after all, do a string search
+    } else {
+      query = parseString(query)
     }
     if (typeof query == "string" ? query == "" : query.test(""))
       query = /x^/;
@@ -157,6 +167,7 @@
       if (!query) return;
       query = parseQuery(query);
       dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {
+        text = parseString(text)
         if (all) {
           cm.operation(function() {
             for (var cursor = getSearchCursor(cm, query); cursor.findNext();) {

From ffa2b88b5d3e837df34d1edf55d6b811a7c7597e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Aug 2015 12:40:22 +0200
Subject: [PATCH 2289/4742] Exclude test html files from npm packages

---
 .npmignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.npmignore b/.npmignore
index 54322f9e2a..5ed053f893 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,6 +2,7 @@
 /demo
 /doc
 /test
+/test*.html
 /index.html
 /mode/*/*test.js
 /mode/*/*.html

From 2901f7037faaebaefcf3ebd498a3de97da47edb2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Aug 2015 11:10:39 +0200
Subject: [PATCH 2290/4742] Mark release 5.6.0

* Fix bug where you could paste into a `readOnly` editor
* Show a cursor at the drop location when dragging over the editor
* The [Rust mode](http://codemirror.net/mode/rust/index.html) was
  rewritten to handle modern Rust
* The editor and theme CSS was cleaned up. Some selectors are now
  less specific than before
* New theme: [abcdef](http://codemirror.net/demo/theme.html#abcdef)
* Lines longer than [`maxHighlightLength`](http://codemirror.net/doc/manual.html#option_maxHighlightLength)
  are now less likely to mess up indentation
* New addons: [`autorefresh`](http://codemirror.net/doc/manual.html#addon_autorefresh)
  for refreshing an editor the first time it becomes visible, and `html-lint` for using [HTMLHint](http://htmlhint.com/)
* The [`search`](http://codemirror.net/doc/manual.html#addon_search)
  addon now recognizes `\r` and `\n` in pattern and replacement input
---
 AUTHORS           | 10 ++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 14 ++++++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index c8e17d0778..e2902c63c7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@ Alexandre Bique
 alexey-k
 Alex Piggott
 Aliaksei Chapyzhenka
+Allen Sarkisyan
 Amin Shali
 Amsul
 amuntean
@@ -34,8 +35,10 @@ anaran
 AndersMad
 Anders Nawroth
 Anderson Mesquita
+Anders Wåglund
 Andrea G
 Andreas Reischuck
+Andres Taylor
 Andre von Houck
 Andrey Fedorov
 Andrey Klyuchnikov
@@ -299,6 +302,7 @@ Mason Malone
 Mateusz Paprocki
 Mathias Bynens
 mats cronqvist
+Matt Gaide
 Matthew Beale
 Matthew Rathbone
 Matthias Bussonnier
@@ -315,6 +319,7 @@ Max Xiantu
 mbarkhau
 Metatheos
 Micah Dubinko
+Michael
 Michael Grey
 Michael Kaminsky
 Michael Lehenbauer
@@ -377,6 +382,7 @@ peteguhl
 Peter Flynn
 peterkroon
 Peter Kroon
+Philip Stadermann
 prasanthj
 Prasanth J
 Radek Piórkowski
@@ -387,6 +393,7 @@ Randy Edmunds
 Rasmus Erik Voel Jensen
 ray ratchup
 Ray Ratchup
+Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
 Robert Crossfield
@@ -409,9 +416,11 @@ SCLINIC\jdecker
 Scott Aikin
 Scott Goodhew
 Sebastian Zaha
+Se-Won Kim
 shaund
 shaun gilchrist
 Shawn A
+Shea Bunge
 sheopory
 Shiv Deepak
 Shmuel Englard
@@ -435,6 +444,7 @@ Tarmil
 tel
 tfjgeorge
 Thaddee Tyl
+thanasis
 TheHowl
 think
 Thomas Dvornik
diff --git a/doc/compress.html b/doc/compress.html
index f64f4bbfaf..7dff44dcd6 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.6.0;f=">5.6</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.5.0;f=">5.5</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.4.0;f=">5.4</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.3.0;f=">5.3</option>
diff --git a/doc/manual.html b/doc/manual.html
index a73c3902ba..aeb9fadfde 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.5.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.6.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 77e98965a9..561ea371cd 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-08-2015: <a href="http://codemirror.net/codemirror-5.6.zip">Version 5.6</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix bug where you could paste into a <code>readOnly</code> editor</li>
+    <li>Show a cursor at the drop location when dragging over the editor</li>
+    <li>The <a href="../mode/rust/index.html">Rust mode</a> was rewritten to handle modern Rust</li>
+    <li>The editor and theme CSS was cleaned up. Some selectors are now less specific than before</li>
+    <li>New theme: <a href="../demo/theme.html#abcdef">abcdef</a></li>
+    <li>Lines longer than <a href="manual.html#option_maxHighlightLength"><code>maxHighlightLength</code></a> are now less likely to mess up indentation</li>
+    <li>New addons: <a href="manual.html#addon_autorefresh"><code>autorefresh</code></a> for refreshing an editor the first time it becomes visible, and <code>html-lint</code> for using <a href="http://htmlhint.com/">HTMLHint</a></li>
+    <li>The <a href="manual.html#addon_search"><code>search</code></a> addon now recognizes <code>\r</code> and <code>\n</code> in pattern and replacement input</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.5.0...5.6.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">20-07-2015: <a href="http://codemirror.net/codemirror-5.5.zip">Version 5.5</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index bca7e02a2d..9a49c16d04 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.5</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.6</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 f1ba15bb10..5de8a13321 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8816,7 +8816,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.5.1";
+  CodeMirror.version = "5.6.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index c2c901af18..0f0cb56e7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.5.1",
+    "version":"5.6.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From e3bb8736b543e4a77b503c1b685f4feb01f8a427 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Aug 2015 11:12:53 +0200
Subject: [PATCH 2291/4742] Bump version number post-5.6

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index aeb9fadfde..e59e6f3fca 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.6.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.6.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5de8a13321..a4f7973ba6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8816,7 +8816,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.6.0";
+  CodeMirror.version = "5.6.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 0f0cb56e7c..864a563212 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.6.0",
+    "version":"5.6.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 89c8c3d11f72552b3f82b080bfa9c12f17800f01 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 20 Aug 2015 11:41:29 +0200
Subject: [PATCH 2292/4742] [coffeescript mode] Highlight properties

And remove some unused state properties
---
 mode/coffeescript/coffeescript.js | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index da0eb2d518..5dcaac1eda 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -25,7 +25,7 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
   var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/;
   var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
   var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
-  var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/;
+  var atProp = /^@[_A-Za-z$][_A-Za-z$0-9]*/;
 
   var wordOperators = wordRegexp(["and", "or", "not",
                                   "is", "isnt", "in",
@@ -145,6 +145,8 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
       }
     }
 
+
+
     // Handle operators and delimiters
     if (stream.match(operators) || stream.match(wordOperators)) {
       return "operator";
@@ -157,6 +159,10 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
       return "atom";
     }
 
+    if (stream.match(atProp) || state.prop && stream.match(identifiers)) {
+      return "property";
+    }
+
     if (stream.match(keywords)) {
       return "keyword";
     }
@@ -165,10 +171,6 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
       return "variable";
     }
 
-    if (stream.match(properties)) {
-      return "property";
-    }
-
     // Handle non-detected items
     stream.next();
     return ERRORCLASS;
@@ -266,7 +268,7 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
     var current = stream.current();
 
     // Handle "." connected identifiers
-    if (current === ".") {
+    if (false && current === ".") {
       style = state.tokenize(stream, state);
       current = stream.current();
       if (/^\.[\w$]+$/.test(current)) {
@@ -280,9 +282,7 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
     if (current === "return") {
       state.dedent = true;
     }
-    if (((current === "->" || current === "=>") &&
-         !state.lambda &&
-         !stream.peek())
+    if (((current === "->" || current === "=>") && stream.eol())
         || style === "indent") {
       indent(stream, state);
     }
@@ -324,8 +324,7 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
       return {
         tokenize: tokenBase,
         scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false},
-        lastToken: null,
-        lambda: false,
+        prop: false,
         dedent: 0
       };
     },
@@ -335,12 +334,9 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
       if (fillAlign && stream.sol()) fillAlign.align = false;
 
       var style = tokenLexer(stream, state);
-      if (fillAlign && style && style != "comment") fillAlign.align = true;
-
-      state.lastToken = {style:style, content: stream.current()};
-
-      if (stream.eol() && stream.lambda) {
-        state.lambda = false;
+      if (style && style != "comment") {
+        if (fillAlign) fillAlign.align = true;
+        state.prop = style == "punctuation" && stream.current() == "."
       }
 
       return style;

From 7f51f131185445d1f7aa2d20cc18f30b5bc86d9f Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Fri, 21 Aug 2015 03:46:07 -0700
Subject: [PATCH 2293/4742] [sublime] Make smartBackspace delete and not
 replace

Fixes #3449
---
 demo/sublime.html |  3 ++-
 keymap/sublime.js | 14 +++++++++++---
 lib/codemirror.js |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/demo/sublime.html b/demo/sublime.html
index b3b5342c97..233dd83a4e 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -69,7 +69,8 @@ <h2>Sublime Text bindings demo</h2>
     autoCloseBrackets: true,
     matchBrackets: true,
     showCursorWhenSelecting: true,
-    theme: "monokai"
+    theme: "monokai",
+    tabSize: 2
   });
 </script>
 
diff --git a/keymap/sublime.js b/keymap/sublime.js
index 1d9a9d8ef6..44e812a248 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -417,11 +417,19 @@
     var cursor = cm.getCursor();
     var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
     var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
+    var indentUnit = cm.getOption("indentUnit");
 
-    if (toStartOfLine && !/\S/.test(toStartOfLine) && column % cm.getOption("indentUnit") == 0)
-      return cm.indentSelection("subtract");
-    else
+    if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) {
+      var prevIndent = new Pos(cursor.line,
+        CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit));
+
+      // If no smart delete is happening (due to tab sizing) just do a regular delete
+      if (prevIndent.ch == cursor.ch) return CodeMirror.Pass;
+
+      return cm.replaceRange("", prevIndent, cursor, "+delete");
+    } else {
       return CodeMirror.Pass;
+    }
   };
 
   cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index a4f7973ba6..f18d13591a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8211,7 +8211,7 @@
 
   // The inverse of countColumn -- find the offset that corresponds to
   // a particular column.
-  function findColumn(string, goal, tabSize) {
+  var findColumn = CodeMirror.findColumn = function(string, goal, tabSize) {
     for (var pos = 0, col = 0;;) {
       var nextTab = string.indexOf("\t", pos);
       if (nextTab == -1) nextTab = string.length;

From 13eadcd6b96a5bf836f94f8fe5f9f632dc2b3d53 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <beni.cherniavsky@gmail.com>
Date: Sat, 22 Aug 2015 23:57:16 +0300
Subject: [PATCH 2294/4742] [markdown more] Advertise gfm mode from demo page.

More than once people have asked questions expecting markdown mode to
support GFisms and were simply not aware of gfm mode existance.
Hopefully this will make it more discoverable.
---
 mode/markdown/index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index c3bb8df9a2..15660c2618 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -350,8 +350,10 @@ <h2>Markdown mode</h2>
       });
     </script>
 
-    <p>Optionally depends on the XML mode for properly highlighted inline XML blocks.</p>
+    <p>You might want to use the <a href="../gfm/index.html">Github-Flavored Markdown mode</a> instead, which adds support for fenced code blocks and a few other things.</p>
 
+    <p>Optionally depends on the XML mode for properly highlighted inline XML blocks.</p>
+    
     <p><strong>MIME types defined:</strong> <code>text/x-markdown</code>.</p>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#markdown_*">normal</a>,  <a href="../../test/index.html#verbose,markdown_*">verbose</a>.</p>

From b9c5c18a751becd26282c52eca543586cf4c1ab8 Mon Sep 17 00:00:00 2001
From: Dominator008 <zhoumotongxue008@gmail.com>
Date: Sun, 23 Aug 2015 02:54:59 -0700
Subject: [PATCH 2295/4742] [vhdl mode] Fix a typo

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

diff --git a/mode/vhdl/vhdl.js b/mode/vhdl/vhdl.js
index 470cf2be8a..d3b555aa0d 100644
--- a/mode/vhdl/vhdl.js
+++ b/mode/vhdl/vhdl.js
@@ -1,7 +1,7 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
-// Originall written by Alf Nielsen, re-written by Michael Zhou
+// Originally written by Alf Nielsen, re-written by Michael Zhou
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"));

From e79d4ffafb3300d3d852d4088f17a75ebc8be320 Mon Sep 17 00:00:00 2001
From: David Barnett <dbarnett@google.com>
Date: Sun, 23 Aug 2015 09:21:55 -0700
Subject: [PATCH 2296/4742] [css mode] Add submode for "Closure Stylesheets
 (GSS)"

Closes #3470
---
 mode/css/css.js      |  45 ++++++++++++++++++-
 mode/css/gss.html    | 103 +++++++++++++++++++++++++++++++++++++++++++
 mode/css/gss_test.js |  17 +++++++
 mode/css/test.js     |   2 +-
 mode/index.html      |   1 +
 mode/meta.js         |   1 +
 test/index.html      |   2 +
 7 files changed, 169 insertions(+), 2 deletions(-)
 create mode 100644 mode/css/gss.html
 create mode 100644 mode/css/gss_test.js

diff --git a/mode/css/css.js b/mode/css/css.js
index 7fcf335d30..512bb29de6 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -28,7 +28,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       counterDescriptors = parserConfig.counterDescriptors || {},
       colorKeywords = parserConfig.colorKeywords || {},
       valueKeywords = parserConfig.valueKeywords || {},
-      allowNested = parserConfig.allowNested;
+      allowNested = parserConfig.allowNested,
+      supportsAtComponent = (typeof parserConfig.supportsAtComponent != "undefined" ?
+          parserConfig.supportsAtComponent : false);
 
   var type, override;
   function ret(style, tp) { type = tp; return style; }
@@ -127,6 +129,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return type;
   }
 
+  function pushContextNoIndent(state, stream, type) {
+    state.context = new Context(type, stream.indentation(), state.context);
+    return type;
+  }
+
   function popContext(state) {
     state.context = state.context.prev;
     return state.context.type;
@@ -160,6 +167,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return pushContext(state, stream, "block");
     } else if (type == "}" && state.context.prev) {
       return popContext(state);
+    } else if (supportsAtComponent && /@component/.test(type)) {
+      return pushContext(state, stream, "atComponentBlock");
     } else if (/@(media|supports|(-moz-)?document)/.test(type)) {
       return pushContext(state, stream, "atBlock");
     } else if (/@(font-face|counter-style)/.test(type)) {
@@ -286,6 +295,18 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return state.context.type;
   };
 
+  states.atComponentBlock = function(type, stream, state) {
+    if (type == "}") return popAndPass(type, stream, state);
+    if (type == "{") {
+      return popContext(state) && pushContextNoIndent(state, stream, allowNested ? "block" : "top");
+    }
+
+    if (type == "word") {
+      override = "error";
+    }
+    return state.context.type;
+  };
+
   states.atBlock_parens = function(type, stream, state) {
     if (type == ")") return popContext(state);
     if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
@@ -769,4 +790,26 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     helperType: "less"
   });
 
+  CodeMirror.defineMIME("text/x-gss", {
+    documentTypes: documentTypes,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    fontProperties: fontProperties,
+    counterDescriptors: counterDescriptors,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    supportsAtComponent: true,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
+      }
+    },
+    name: "css",
+    helperType: "gss"
+  });
+
 });
diff --git a/mode/css/gss.html b/mode/css/gss.html
new file mode 100644
index 0000000000..232fe8c12b
--- /dev/null
+++ b/mode/css/gss.html
@@ -0,0 +1,103 @@
+<!doctype html>
+
+<title>CodeMirror: Closure Stylesheets (GSS) mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../addon/hint/show-hint.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="css.js"></script>
+<script src="../../addon/hint/show-hint.js"></script>
+<script src="../../addon/hint/css-hint.js"></script>
+<style>.CodeMirror {background: #f8f8f8;}</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="#">Closure Stylesheets (GSS)</a>
+  </ul>
+</div>
+
+<article>
+<h2>Closure Stylesheets (GSS) mode</h2>
+<form><textarea id="code" name="code">
+/* Some example Closure Stylesheets */
+
+@provide 'some.styles';
+
+@require 'other.styles';
+
+@component {
+
+@def FONT_FAMILY           "Times New Roman", Georgia, Serif;
+@def FONT_SIZE_NORMAL      15px;
+@def FONT_NORMAL           normal FONT_SIZE_NORMAL FONT_FAMILY;
+
+@def BG_COLOR              rgb(235, 239, 249);
+
+@def DIALOG_BORDER_COLOR   rgb(107, 144, 218);
+@def DIALOG_BG_COLOR       BG_COLOR;
+
+@def LEFT_HAND_NAV_WIDTH    180px;
+@def LEFT_HAND_NAV_PADDING  3px;
+
+@defmixin size(WIDTH, HEIGHT) {
+  width: WIDTH;
+  height: HEIGHT;
+}
+
+body {
+  background-color: BG_COLOR;
+  margin: 0;
+  padding: 3em 6em;
+  font: FONT_NORMAL;
+  color: #000;
+}
+
+#navigation a {
+  font-weight: bold;
+  text-decoration: none !important;
+}
+
+.dialog {
+  background-color: DIALOG_BG_COLOR;
+  border: 1px solid DIALOG_BORDER_COLOR;
+}
+
+.content {
+  position: absolute;
+  margin-left: add(LEFT_HAND_NAV_PADDING,  /* padding left */
+                   LEFT_HAND_NAV_WIDTH,
+                   LEFT_HAND_NAV_PADDING); /* padding right */
+
+}
+
+.logo {
+  @mixin size(150px, 55px);
+  background-image: url('http://www.google.com/images/logo_sm.gif');
+}
+
+}
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        extraKeys: {"Ctrl-Space": "autocomplete"},
+        lineNumbers: true,
+        matchBrackets: "text/x-less",
+        mode: "text/x-gss"
+      });
+    </script>
+
+    <p>A mode for <a href="https://github.com/google/closure-stylesheets">Closure Stylesheets</a> (GSS).</p>
+    <p><strong>MIME type defined:</strong> <code>text/x-gss</code>.</p>
+
+    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#gss_*">normal</a>,  <a href="../../test/index.html#verbose,gss_*">verbose</a>.</p>
+
+  </article>
diff --git a/mode/css/gss_test.js b/mode/css/gss_test.js
new file mode 100644
index 0000000000..e1a330652e
--- /dev/null
+++ b/mode/css/gss_test.js
@@ -0,0 +1,17 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  "use strict";
+
+  var mode = CodeMirror.getMode({indentUnit: 2}, "gss");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "gss"); }
+
+  MT("atComponent",
+     "[def @component] {",
+     "[tag foo] {",
+     "  [property color]: [keyword black];",
+     "}",
+     "}");
+
+})();
diff --git a/mode/css/test.js b/mode/css/test.js
index cda07748b2..7d78135de4 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -6,7 +6,7 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   // Error, because "foobarhello" is neither a known type or property, but
-  // property was expected (after "and"), and it should be in parenthese.
+  // property was expected (after "and"), and it should be in parentheses.
   MT("atMediaUnknownType",
      "[def @media] [attribute screen] [keyword and] [error foobarhello] { }");
 
diff --git a/mode/index.html b/mode/index.html
index ca1703aff9..9bb8beff92 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -36,6 +36,7 @@ <h2>Language modes</h2>
       <li><a href="brainfuck/index.html">Brainfuck</a></li>
       <li><a href="clike/index.html">C, C++, C#</a></li>
       <li><a href="clojure/index.html">Clojure</a></li>
+      <li><a href="css/gss.html">Closure Stylesheets (GSS)</a></li>
       <li><a href="cmake/index.html">CMake</a></li>
       <li><a href="cobol/index.html">COBOL</a></li>
       <li><a href="coffeescript/index.html">CoffeeScript</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 376e1ecdc2..aff0cc7c62 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -22,6 +22,7 @@
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
+    {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
     {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
     {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
     {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
diff --git a/test/index.html b/test/index.html
index 310e88519d..e0593e90f3 100644
--- a/test/index.html
+++ b/test/index.html
@@ -20,6 +20,7 @@
 <script src="../mode/clike/clike.js"></script>
 <!-- clike must be after css or vim and sublime tests will fail -->
 <script src="../mode/gfm/gfm.js"></script>
+<script src="../mode/gss/gss.js"></script>
 <script src="../mode/haml/haml.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
@@ -100,6 +101,7 @@ <h2>Test Suite</h2>
 
     <script src="../mode/clike/test.js"></script>
     <script src="../mode/css/test.js"></script>
+    <script src="../mode/css/gss_test.js"></script>
     <script src="../mode/css/scss_test.js"></script>
     <script src="../mode/css/less_test.js"></script>
     <script src="../mode/gfm/test.js"></script>

From 1c468ffa985f2af993a3438bdc13b251d5dcb0ff Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Aug 2015 12:02:49 +0200
Subject: [PATCH 2297/4742] [css mode] Fix up e79d4ff

---
 mode/css/css.js | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 512bb29de6..56aff88fd4 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -29,8 +29,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       colorKeywords = parserConfig.colorKeywords || {},
       valueKeywords = parserConfig.valueKeywords || {},
       allowNested = parserConfig.allowNested,
-      supportsAtComponent = (typeof parserConfig.supportsAtComponent != "undefined" ?
-          parserConfig.supportsAtComponent : false);
+      supportsAtComponent = parserConfig.supportsAtComponent === true;
 
   var type, override;
   function ret(style, tp) { type = tp; return style; }
@@ -124,13 +123,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     this.prev = prev;
   }
 
-  function pushContext(state, stream, type) {
-    state.context = new Context(type, stream.indentation() + indentUnit, state.context);
-    return type;
-  }
-
-  function pushContextNoIndent(state, stream, type) {
-    state.context = new Context(type, stream.indentation(), state.context);
+  function pushContext(state, stream, type, indent) {
+    state.context = new Context(type, stream.indentation() + (indent === false ? 0 : indentUnit), state.context);
     return type;
   }
 
@@ -296,14 +290,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   };
 
   states.atComponentBlock = function(type, stream, state) {
-    if (type == "}") return popAndPass(type, stream, state);
-    if (type == "{") {
-      return popContext(state) && pushContextNoIndent(state, stream, allowNested ? "block" : "top");
-    }
-
-    if (type == "word") {
+    if (type == "}")
+      return popAndPass(type, stream, state);
+    if (type == "{")
+      return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top", false);
+    if (type == "word")
       override = "error";
-    }
     return state.context.type;
   };
 

From 5d853959ca8a6b62e8c4ff9d69703d866695824b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Aug 2015 12:05:40 +0200
Subject: [PATCH 2298/4742] [css mode] Make gss test pass

---
 mode/css/css.js      | 5 +++--
 mode/css/gss_test.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 56aff88fd4..6e16627ee0 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -129,7 +129,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   }
 
   function popContext(state) {
-    state.context = state.context.prev;
+    if (state.context.prev)
+      state.context = state.context.prev;
     return state.context.type;
   }
 
@@ -381,7 +382,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
           (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "restricted_atBlock") ||
            ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
            ch == "{" && (cx.type == "at" || cx.type == "atBlock"))) {
-        indent = cx.indent - indentUnit;
+        indent = Math.max(0, cx.indent - indentUnit);
         cx = cx.prev;
       }
       return indent;
diff --git a/mode/css/gss_test.js b/mode/css/gss_test.js
index e1a330652e..d56e592803 100644
--- a/mode/css/gss_test.js
+++ b/mode/css/gss_test.js
@@ -4,7 +4,7 @@
 (function() {
   "use strict";
 
-  var mode = CodeMirror.getMode({indentUnit: 2}, "gss");
+  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-gss");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "gss"); }
 
   MT("atComponent",

From b4278a14959874cfa2031cf9dbbd3f9e0a5755d7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Aug 2015 12:26:06 +0200
Subject: [PATCH 2299/4742] Fix another bug in GSS tests

---
 test/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/index.html b/test/index.html
index e0593e90f3..42a9f01d38 100644
--- a/test/index.html
+++ b/test/index.html
@@ -20,7 +20,6 @@
 <script src="../mode/clike/clike.js"></script>
 <!-- clike must be after css or vim and sublime tests will fail -->
 <script src="../mode/gfm/gfm.js"></script>
-<script src="../mode/gss/gss.js"></script>
 <script src="../mode/haml/haml.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
 <script src="../mode/javascript/javascript.js"></script>

From bec937e15e3d62e38e2872721683d0e090eb869a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 24 Aug 2015 14:10:49 +0200
Subject: [PATCH 2300/4742] Backslash-u encode non-ascii characters

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f18d13591a..bf5c4064bd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6952,7 +6952,7 @@
           txt.setAttribute("cm-text", "\t");
           builder.col += tabWidth;
         } else if (m[0] == "\r" || m[0] == "\n") {
-          var txt = content.appendChild(elt("span", m[0] == "\r" ? "␍" : "␤", "cm-invalidchar"));
+          var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
           txt.setAttribute("cm-text", m[0]);
           builder.col += 1;
         } else {

From e359853f6a0ec508e768a55c45cde013e8fc34b1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Aug 2015 16:44:38 +0200
Subject: [PATCH 2301/4742] Remove spurious parentheses from Elm mode

Closes #3476
---
 mode/elm/elm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/elm/elm.js b/mode/elm/elm.js
index 7124c50acf..b31e663757 100644
--- a/mode/elm/elm.js
+++ b/mode/elm/elm.js
@@ -202,4 +202,4 @@
   });
 
   CodeMirror.defineMIME("text/x-elm", "elm");
-})();
+});

From 5e1ca4f62d7f06c95f4d847ee60dcb52cb89d9e2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 27 Aug 2015 11:29:03 +0200
Subject: [PATCH 2302/4742] [css mode] Make @import highlighting consistent
 with other contexts

Closes #3475
---
 mode/css/css.js  | 19 ++++++++++++++-----
 mode/css/test.js |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 6e16627ee0..83fdcdd7c8 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -164,9 +164,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return popContext(state);
     } else if (supportsAtComponent && /@component/.test(type)) {
       return pushContext(state, stream, "atComponentBlock");
-    } else if (/@(media|supports|(-moz-)?document)/.test(type)) {
+    } else if (/^@(-moz-)?document$/.test(type)) {
+      return pushContext(state, stream, "documentTypes");
+    } else if (/^@(media|supports|(-moz-)?document|import)$/.test(type)) {
       return pushContext(state, stream, "atBlock");
-    } else if (/@(font-face|counter-style)/.test(type)) {
+    } else if (/^@(font-face|counter-style)/.test(type)) {
       state.stateArg = type;
       return "restricted_atBlock_before";
     } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
@@ -259,17 +261,24 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     return pass(type, stream, state);
   };
 
+  states.documentTypes = function(type, stream, state) {
+    if (type == "word" && documentTypes.hasOwnProperty(stream.current())) {
+      override = "tag";
+      return state.context.type;
+    } else {
+      return states.atBlock(type, stream, state);
+    }
+  };
+
   states.atBlock = function(type, stream, state) {
     if (type == "(") return pushContext(state, stream, "atBlock_parens");
-    if (type == "}") return popAndPass(type, stream, state);
+    if (type == "}" || type == ";") return popAndPass(type, stream, state);
     if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
 
     if (type == "word") {
       var word = stream.current().toLowerCase();
       if (word == "only" || word == "not" || word == "and" || word == "or")
         override = "keyword";
-      else if (documentTypes.hasOwnProperty(word))
-        override = "tag";
       else if (mediaTypes.hasOwnProperty(word))
         override = "attribute";
       else if (mediaFeatures.hasOwnProperty(word))
diff --git a/mode/css/test.js b/mode/css/test.js
index 7d78135de4..91046141d9 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -120,7 +120,7 @@
      "}");
 
   MT("empty_url",
-     "[def @import] [tag url]() [tag screen];");
+     "[def @import] [atom url]() [attribute screen];");
 
   MT("parens",
      "[qualifier .foo] {",

From bfbb9c716d1b399699afda39e4bfca5e1bbd5d17 Mon Sep 17 00:00:00 2001
From: karevn <karev.n@gmail.com>
Date: Thu, 20 Aug 2015 22:58:06 +0500
Subject: [PATCH 2303/4742] [vue mode, htmlmixed mode] Implement vue mode by
 extending htmlmixed

---
 mode/htmlmixed/htmlmixed.js | 267 ++++++++++++++++++++++++------------
 mode/vue/index.html         |  84 ++++++++++++
 mode/vue/vue.js             |  94 +++++++++++++
 3 files changed, 357 insertions(+), 88 deletions(-)
 create mode 100644 mode/vue/index.html
 create mode 100644 mode/vue/vue.js

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 24552e2d80..4c9aafbb15 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -10,112 +10,203 @@
     mod(CodeMirror);
 })(function(CodeMirror) {
 "use strict";
+var nestedModes = {
+    script: {
+      attributes: {
+        lang: {
+          javascript: /(javascript|babel)/i
+        },
+        type: {
+          javascript: /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i
+        }
+      },
+      defaultMode: 'javascript'
+    },
+    style:  {
+      attributes: {
+        lang: {
+          css: /^css$/i
+        },
+        type: {
+          css: /^(text\/)?(x-)?stylesheet$/i
+        }
+      },
+      defaultMode: 'css'
+    }
+  }, attrRegexpCache = {}, tagRegexpCache = {};
 
-CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
-  var htmlMode = CodeMirror.getMode(config, {name: "xml",
-                                             htmlMode: true,
-                                             multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
-                                             multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag});
-  var cssMode = CodeMirror.getMode(config, "css");
-
-  var scriptTypes = [], scriptTypesConf = parserConfig && parserConfig.scriptTypes;
-  scriptTypes.push({matches: /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i,
-                    mode: CodeMirror.getMode(config, "javascript")});
-  if (scriptTypesConf) for (var i = 0; i < scriptTypesConf.length; ++i) {
-    var conf = scriptTypesConf[i];
-    scriptTypes.push({matches: conf.matches, mode: conf.mode && CodeMirror.getMode(config, conf.mode)});
-  }
-  scriptTypes.push({matches: /./,
-                    mode: CodeMirror.getMode(config, "text/plain")});
-
-  function html(stream, state) {
-    var tagName = state.htmlState.tagName;
-    if (tagName) tagName = tagName.toLowerCase();
-    var style = htmlMode.token(stream, state.htmlState);
-    if (tagName == "script" && /\btag\b/.test(style) && stream.current() == ">") {
-      // Script block: mode to change to depends on type attribute
-      var scriptType = stream.string.slice(Math.max(0, stream.pos - 100), stream.pos).match(/\btype\s*=\s*("[^"]+"|'[^']+'|\S+)[^<]*$/i);
-      scriptType = scriptType ? scriptType[1] : "";
-      if (scriptType && /[\"\']/.test(scriptType.charAt(0))) scriptType = scriptType.slice(1, scriptType.length - 1);
-      for (var i = 0; i < scriptTypes.length; ++i) {
-        var tp = scriptTypes[i];
-        if (typeof tp.matches == "string" ? scriptType == tp.matches : tp.matches.test(scriptType)) {
-          if (tp.mode) {
-            state.token = script;
-            state.localMode = tp.mode;
-            state.localState = tp.mode.startState && tp.mode.startState(htmlMode.indent(state.htmlState, ""));
-          }
-          break;
+  function deepmerge(target, src) {
+    var array = Array.isArray(src);
+    var dst = array && [] || {};
+
+    if (array) {
+        target = target || [];
+        dst = dst.concat(target);
+        src.forEach(function(e, i) {
+            if (typeof dst[i] === 'undefined') {
+                dst[i] = e;
+            } else if (typeof e === 'object') {
+                dst[i] = deepmerge(target[i], e);
+            } else {
+                if (target.indexOf(e) === -1) {
+                    dst.push(e);
+                }
+            }
+        });
+    } else {
+        if (target && typeof target === 'object') {
+            Object.keys(target).forEach(function (key) {
+                dst[key] = target[key];
+            })
         }
-      }
-    } else if (tagName == "style" && /\btag\b/.test(style) && stream.current() == ">") {
-      state.token = css;
-      state.localMode = cssMode;
-      state.localState = cssMode.startState(htmlMode.indent(state.htmlState, ""));
+        Object.keys(src).forEach(function (key) {
+            if (typeof src[key] !== 'object' || !src[key]) {
+                dst[key] = src[key];
+            }
+            else {
+                if (!target[key]) {
+                    dst[key] = src[key];
+                } else {
+                    dst[key] = deepmerge(target[key], src[key]);
+                }
+            }
+        });
     }
-    return style;
+
+    return dst;
   }
+
   function maybeBackup(stream, pat, style) {
-    var cur = stream.current();
-    var close = cur.search(pat);
-    if (close > -1) stream.backUp(cur.length - close);
-    else if (cur.match(/<\/?$/)) {
+    var cur = stream.current(), close = cur.search(pat);
+    if (close > -1) {
+      stream.backUp(cur.length - close);
+    } else if (cur.match(/<\/?$/)) {
       stream.backUp(cur.length);
-      if (!stream.match(pat, false)) stream.match(cur);
+      if (!stream.match(pat, false)) {
+        stream.match(cur);
+      }
     }
     return style;
   }
-  function script(stream, state) {
-    if (stream.match(/^<\/\s*script\s*>/i, false)) {
-      state.token = html;
-      state.localState = state.localMode = null;
-      return null;
+
+  function getAttrRegexp(attr) {
+    var regexp;
+    if (regexp = attrRegexpCache[attr]) {
+      return regexp;
     }
-    return maybeBackup(stream, /<\/\s*script\s*>/,
-                       state.localMode.token(stream, state.localState));
+    return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*");
   }
-  function css(stream, state) {
-    if (stream.match(/^<\/\s*style\s*>/i, false)) {
-      state.token = html;
-      state.localState = state.localMode = null;
-      return null;
+
+  function getAttrValue(stream, attr) {
+    var pos = stream.pos, match;
+    while (pos >= 0 && stream.string.charAt(pos) !== "<") {
+      pos -= 1;
+    }
+    if (pos < 0) {
+      return pos;
+    }
+    if (match = stream.string.slice(pos, stream.pos).match(getAttrRegexp(attr))) {
+      return match[2];
     }
-    return maybeBackup(stream, /<\/\s*style\s*>/,
-                       cssMode.token(stream, state.localState));
   }
 
-  return {
-    startState: function() {
-      var state = htmlMode.startState();
-      return {token: html, localMode: null, localState: null, htmlState: state};
-    },
+  function getMode(modes, tagName, value) {
+    if (!value) {
+      return modes[tagName].defaultMode;
+    }
+    var attr, mode;
+    modes = modes[tagName];
+    for (attr in modes.attributes){
+      for (mode in modes.attributes[attr]) {
+        if (modes.attributes[attr][mode].test(value)) {
+          return mode;
+        }
+      }
+    }
+    return modes.defaultMode;
+  }
 
-    copyState: function(state) {
-      if (state.localState)
-        var local = CodeMirror.copyState(state.localMode, state.localState);
-      return {token: state.token, localMode: state.localMode, localState: local,
-              htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
-    },
+  function getTagRegexp(tagName) {
+    var regexp;
+    if (regexp = tagRegexpCache[tagName]) {
+      return regexp;
+    }
+    return tagRegexpCache[tagName] = new RegExp("^<\/\s*" + tagName + "\s*>", 'i');
+  }
 
-    token: function(stream, state) {
-      return state.token(stream, state);
-    },
+  CodeMirror.defineMode("htmlmixed", function (config, parserConfig) {
+    var htmlMode = CodeMirror.getMode(config, {name: "xml",
+                                             htmlMode: true,
+                                             multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
+                                             multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag}),
+        html, modes;
+    modes = deepmerge(deepmerge({}, nestedModes), parserConfig.modes || {});
+    if (parserConfig.scriptTypes) {
+      for (var i = 0; i < parserConfig.scriptTypes.length; ++i) {
+        var conf = parserConfig.scriptTypes[i];
+        modes.script.attributes[conf.mode] = conf.matches;
+      }
+    }
+    html = function (stream, state) {
+      var tagName = state.htmlState.tagName,
+        style = htmlMode.token(stream, state.htmlState),
+        mode, tag;
+      if (tagName) {
+        tagName = tagName.toLowerCase();
+      }
+      tag = modes[tagName];
+      if (stream.current() === ">" && tag &&  /\btag\b/.test(style) &&
+         (mode = getMode(modes, tagName, getAttrValue(stream, 'lang')))) {
+        state.token = function (stream, state) {
+          var regexp = getTagRegexp(tagName);
+          if (stream.match(regexp, false)) {
+            state.token = html;
+            state.localState = state.localMode = null;
+            return null;
+          }
+          return maybeBackup(stream, regexp, state.localMode.token(stream, state.localState));
+        }
+        mode = CodeMirror.getMode(config, mode);
+        state.localMode = mode;
+        state.localState = mode.startState && mode.startState(htmlMode.indent(state.htmlState, ""));
+      }
+      return style;
+    };
 
-    indent: function(state, textAfter) {
-      if (!state.localMode || /^\s*<\//.test(textAfter))
-        return htmlMode.indent(state.htmlState, textAfter);
-      else if (state.localMode.indent)
-        return state.localMode.indent(state.localState, textAfter);
-      else
-        return CodeMirror.Pass;
-    },
+    return {
+      startState: function () {
+        var state = htmlMode.startState();
+        return {token: html, localMode: null, localState: null, htmlState: state};
+      },
 
-    innerMode: function(state) {
-      return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
-    }
-  };
-}, "xml", "javascript", "css");
+      copyState: function (state) {
+        var local;
+        if (state.localState) {
+          local = CodeMirror.copyState(state.localMode, state.localState);
+        }
+        return {token: state.token, localMode: state.localMode, localState: local,
+                htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
+      },
 
-CodeMirror.defineMIME("text/html", "htmlmixed");
+      token: function (stream, state) {
+        return state.token(stream, state);
+      },
 
+      indent: function (state, textAfter) {
+        if (!state.localMode || /^\s*<\//.test(textAfter)) {
+          return htmlMode.indent(state.htmlState, textAfter);
+        } else if (state.localMode.indent) {
+          return state.localMode.indent(state.localState, textAfter);
+        } else {
+          return CodeMirror.Pass;
+        }
+      },
+
+      innerMode: function (state) {
+        return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
+      }
+    };
+  }, "xml", "javascript", "css");
+
+CodeMirror.defineMIME("text/html", "htmlmixed");
 });
diff --git a/mode/vue/index.html b/mode/vue/index.html
new file mode 100644
index 0000000000..e291f679a5
--- /dev/null
+++ b/mode/vue/index.html
@@ -0,0 +1,84 @@
+<!doctype html>
+
+<title>CodeMirror: Vue.js 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/overlay.js"></script>
+<script src="../../addon/mode/simple.js"></script>
+<script src="../../addon/selection/selection-pointer.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../javascript/javascript.js"></script>
+<script src="../css/css.js"></script>
+<script src="../coffeescript/coffeescript.js"></script>
+<script src="../sass/sass.js"></script>
+<script src="../jade/jade.js"></script>
+
+<script src="../handlebars/handlebars.js"></script>
+<script src="../htmlmixed/htmlmixed.js"></script>
+<script src="vue.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="#">Vue.js mode</a>
+  </ul>
+</div>
+
+<article>
+<h2>Vue.js mode</h2>
+<form><textarea id="code" name="code">
+<template>
+  <div class="sass">Im am a {{mustache-like}} template</div>
+</template>
+
+<script lang="coffee">
+  module.exports =
+    props: ['one', 'two', 'three']
+</script>
+
+<style lang="sass">
+.sass
+  font-size: 18px
+</style>
+
+</textarea></form>
+    <script>
+      // Define an extended mixed-mode that understands vbscript and
+      // leaves mustache/handlebars embedded templates in html mode
+      var mixedMode = {
+        name: "vue"
+      };
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: mixedMode,
+        selectionPointer: true
+      });
+    </script>
+
+    <p>The HTML mixed mode depends on the XML, JavaScript, and CSS modes.</p>
+
+    <p>It takes an optional mode configuration
+    option, <code>scriptTypes</code>, which can be used to add custom
+    behavior for specific <code>&lt;script type="..."></code> tags. If
+    given, it should hold an array of <code>{matches, mode}</code>
+    objects, where <code>matches</code> is a string or regexp that
+    matches the script type, and <code>mode</code> is
+    either <code>null</code>, for script types that should stay in
+    HTML mode, or a <a href="../../doc/manual.html#option_mode">mode
+    spec</a> corresponding to the mode that should be used for the
+    script.</p>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-vue</code>
+    (redefined, only takes effect if you load this parser after the
+    XML parser).</p>
+
+  </article>
diff --git a/mode/vue/vue.js b/mode/vue/vue.js
new file mode 100644
index 0000000000..01bb5ecacf
--- /dev/null
+++ b/mode/vue/vue.js
@@ -0,0 +1,94 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function (mod) {
+  "use strict";
+  if (typeof exports === "object" && typeof module === "object") {// CommonJS
+    mod(require("../../lib/codemirror"),
+        require("../xml/xml"),
+        require("../javascript/javascript"),
+        require("../coffeescript/coffeescript"),
+        require("../css/css"),
+        require("../sass/sass"),
+        require("../stylus/stylus"),
+        require("../jade/jade"),
+        require("../handlebars/handlebars"));
+  } else if (typeof define === "function" && define.amd) { // AMD
+    define(["../../lib/codemirror",
+            "../xml/xml",
+            "../javascript/javascript",
+            "../coffeescript/coffeescript",
+            "../css/css",
+            "../sass/sass",
+            "../stylus/stylus",
+            "../jade/jade",
+            "../handlebars/handlebars"], mod);
+  } else { // Plain browser env
+    mod(CodeMirror);
+  }
+})(function (CodeMirror) {
+  var nestedModes = {
+    script: {
+      attributes: {
+        lang: {
+          coffeescript: /coffee(script)?/
+        },
+        type: {
+          coffeescript: /^(?:text|application)\/(?:x-)?coffee(?:script)?$/
+        }
+      }
+    },
+    style:  {
+      attributes: {
+        lang: {
+          stylus: /^stylus$/i,
+          sass: /^sass$/i
+        },
+        type: {
+          stylus: /^(text\/)?(x-)?styl(us)?$/i,
+          sass: /^text\/sass/i
+        }
+      }
+    },
+    template: {
+      attributes: {
+        lang: {
+          vue: /^vue-template$/i,
+          jade: /^jade$/i,
+          handlebars: /^handlebars$/i
+        },
+        type: {
+          jade: /^(text\/)?(x-)?jade$/i,
+          handlebars: /^text\/x-handlebars-template$/i
+        }
+      },
+      defaultMode: 'vue-template'
+    }
+  };
+
+  CodeMirror.defineMode("vue-template", function (config, parserConfig) {
+    "use strict";
+    var mustacheOverlay = {
+      token: function (stream) {
+        var ch;
+        if (stream.match("{{")) {
+          while ((ch = stream.next()) !== null) {
+            if (ch === "}" && stream.next() === "}") {
+              stream.eat("}");
+              return "mustache";
+            }
+          }
+        }
+        while (stream.next() && !stream.match("{{", false)) {}
+        return null;
+      }
+    };
+    return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), mustacheOverlay);
+  });
+
+  CodeMirror.defineMode("vue", function (config) {
+    return CodeMirror.getMode(config, {name: "htmlmixed", modes: nestedModes});
+  },"htmlmixed", "xml", "javascript", "coffeescript", "css", "sass", "stylus", "jade", "handlebars");
+
+  CodeMirror.defineMIME("script/x-vue", "vue");
+});

From eb56e9111910acf860fe21466524f029bc1b81f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 27 Aug 2015 12:56:34 +0200
Subject: [PATCH 2304/4742] [htmlmixed mode] Revise changes from patch
 bfbb9c716d1b

Issue #3462
---
 doc/compress.html           |   1 +
 mode/htmlmixed/htmlmixed.js | 202 +++++++++++++-----------------------
 mode/index.html             |   1 +
 mode/vue/index.html         |  17 +--
 mode/vue/vue.js             |  73 +++++--------
 5 files changed, 97 insertions(+), 197 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 7dff44dcd6..86575be7c4 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -211,6 +211,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/velocity/velocity.js">velocity.js</option>
           <option value="http://codemirror.net/mode/verilog/verilog.js">verilog.js</option>
           <option value="http://codemirror.net/mode/vhdl/vhdl.js">vhdl.js</option>
+          <option value="http://codemirror.net/mode/vue/vue.js">vue.js</option>
           <option value="http://codemirror.net/mode/xml/xml.js">xml.js</option>
           <option value="http://codemirror.net/mode/xquery/xquery.js">xquery.js</option>
           <option value="http://codemirror.net/mode/yaml/yaml.js">yaml.js</option>
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 4c9aafbb15..670fd62bf1 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -9,72 +9,22 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-"use strict";
-var nestedModes = {
-    script: {
-      attributes: {
-        lang: {
-          javascript: /(javascript|babel)/i
-        },
-        type: {
-          javascript: /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i
-        }
-      },
-      defaultMode: 'javascript'
-    },
-    style:  {
-      attributes: {
-        lang: {
-          css: /^css$/i
-        },
-        type: {
-          css: /^(text\/)?(x-)?stylesheet$/i
-        }
-      },
-      defaultMode: 'css'
-    }
-  }, attrRegexpCache = {}, tagRegexpCache = {};
-
-  function deepmerge(target, src) {
-    var array = Array.isArray(src);
-    var dst = array && [] || {};
-
-    if (array) {
-        target = target || [];
-        dst = dst.concat(target);
-        src.forEach(function(e, i) {
-            if (typeof dst[i] === 'undefined') {
-                dst[i] = e;
-            } else if (typeof e === 'object') {
-                dst[i] = deepmerge(target[i], e);
-            } else {
-                if (target.indexOf(e) === -1) {
-                    dst.push(e);
-                }
-            }
-        });
-    } else {
-        if (target && typeof target === 'object') {
-            Object.keys(target).forEach(function (key) {
-                dst[key] = target[key];
-            })
-        }
-        Object.keys(src).forEach(function (key) {
-            if (typeof src[key] !== 'object' || !src[key]) {
-                dst[key] = src[key];
-            }
-            else {
-                if (!target[key]) {
-                    dst[key] = src[key];
-                } else {
-                    dst[key] = deepmerge(target[key], src[key]);
-                }
-            }
-        });
-    }
-
-    return dst;
-  }
+  "use strict";
+
+  var defaultTags = {
+    script: [
+      ["lang", /(javascript|babel)/i, "javascript"],
+      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, "javascript"],
+      ["type", /./, "text/plain"],
+      [null, null, "javascript"]
+    ],
+    style:  [
+      ["lang", /^css$/i, "css"],
+      ["type", /^(text\/)?(x-)?(stylesheet|css)$/i, "css"],
+      ["type", /./, "text/plain"],
+      [null, null, "css"]
+    ]
+  };
 
   function maybeBackup(stream, pat, style) {
     var cur = stream.current(), close = cur.search(pat);
@@ -82,93 +32,82 @@ var nestedModes = {
       stream.backUp(cur.length - close);
     } else if (cur.match(/<\/?$/)) {
       stream.backUp(cur.length);
-      if (!stream.match(pat, false)) {
-        stream.match(cur);
-      }
+      if (!stream.match(pat, false)) stream.match(cur);
     }
     return style;
   }
 
+  var attrRegexpCache = {};
   function getAttrRegexp(attr) {
-    var regexp;
-    if (regexp = attrRegexpCache[attr]) {
-      return regexp;
-    }
+    var regexp = attrRegexpCache[attr];
+    if (regexp) return regexp;
     return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*");
   }
 
   function getAttrValue(stream, attr) {
     var pos = stream.pos, match;
-    while (pos >= 0 && stream.string.charAt(pos) !== "<") {
-      pos -= 1;
-    }
-    if (pos < 0) {
-      return pos;
-    }
-    if (match = stream.string.slice(pos, stream.pos).match(getAttrRegexp(attr))) {
+    while (pos >= 0 && stream.string.charAt(pos) !== "<") pos--;
+    if (pos < 0) return pos;
+    if (match = stream.string.slice(pos, stream.pos).match(getAttrRegexp(attr)))
       return match[2];
-    }
+    return "";
   }
 
-  function getMode(modes, tagName, value) {
-    if (!value) {
-      return modes[tagName].defaultMode;
-    }
-    var attr, mode;
-    modes = modes[tagName];
-    for (attr in modes.attributes){
-      for (mode in modes.attributes[attr]) {
-        if (modes.attributes[attr][mode].test(value)) {
-          return mode;
-        }
-      }
+  function getTagRegexp(tagName, anchored) {
+    return new RegExp((anchored ? "^" : "") + "<\/\s*" + tagName + "\s*>", "i");
+  }
+
+  function addTags(from, to) {
+    for (var tag in from) {
+      var dest = to[tag] || (to[tag] = []);
+      var source = from[tag];
+      for (var i = source.length - 1; i >= 0; i--)
+        dest.unshift(source[i])
     }
-    return modes.defaultMode;
   }
 
-  function getTagRegexp(tagName) {
-    var regexp;
-    if (regexp = tagRegexpCache[tagName]) {
-      return regexp;
+  function findMatchingMode(tagInfo, stream) {
+    for (var i = 0; i < tagInfo.length; i++) {
+      var spec = tagInfo[i];
+      if (!spec[0] || spec[1].test(getAttrValue(stream, spec[0]))) return spec[2];
     }
-    return tagRegexpCache[tagName] = new RegExp("^<\/\s*" + tagName + "\s*>", 'i');
   }
 
   CodeMirror.defineMode("htmlmixed", function (config, parserConfig) {
-    var htmlMode = CodeMirror.getMode(config, {name: "xml",
-                                             htmlMode: true,
-                                             multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
-                                             multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag}),
-        html, modes;
-    modes = deepmerge(deepmerge({}, nestedModes), parserConfig.modes || {});
-    if (parserConfig.scriptTypes) {
-      for (var i = 0; i < parserConfig.scriptTypes.length; ++i) {
-        var conf = parserConfig.scriptTypes[i];
-        modes.script.attributes[conf.mode] = conf.matches;
-      }
-    }
-    html = function (stream, state) {
-      var tagName = state.htmlState.tagName,
-        style = htmlMode.token(stream, state.htmlState),
-        mode, tag;
-      if (tagName) {
-        tagName = tagName.toLowerCase();
-      }
-      tag = modes[tagName];
-      if (stream.current() === ">" && tag &&  /\btag\b/.test(style) &&
-         (mode = getMode(modes, tagName, getAttrValue(stream, 'lang')))) {
+    var htmlMode = CodeMirror.getMode(config, {
+      name: "xml",
+      htmlMode: true,
+      multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
+      multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag
+    });
+
+    var tags = {};
+    var configTags = parserConfig && parserConfig.tags, configScript = parserConfig && parserConfig.scriptTypes;
+    addTags(defaultTags, tags);
+    if (configTags) addTags(configTags, tags);
+    if (configScript) for (var i = configScript.length - 1; i >= 0; i--)
+      tags.script.unshift(["type", configScript[i].matches, configScript[i].mode])
+
+    function html(stream, state) {
+      var tagName = state.htmlState.tagName;
+      var tagInfo = tagName && tags[tagName.toLowerCase()];
+
+      var style = htmlMode.token(stream, state.htmlState), modeSpec;
+
+      if (tagInfo && /\btag\b/.test(style) && stream.current() === ">" &&
+          (modeSpec = findMatchingMode(tagInfo, stream))) {
+        var mode = CodeMirror.getMode(config, modeSpec);
+        var endTagA = getTagRegexp(tagName, true), endTag = getTagRegexp(tagName, false);
         state.token = function (stream, state) {
-          var regexp = getTagRegexp(tagName);
-          if (stream.match(regexp, false)) {
+          if (stream.match(endTagA, false)) {
             state.token = html;
             state.localState = state.localMode = null;
             return null;
           }
-          return maybeBackup(stream, regexp, state.localMode.token(stream, state.localState));
-        }
-        mode = CodeMirror.getMode(config, mode);
+          return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState));
+        };
         state.localMode = mode;
-        state.localState = mode.startState && mode.startState(htmlMode.indent(state.htmlState, ""));
+        state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
       }
       return style;
     };
@@ -193,13 +132,12 @@ var nestedModes = {
       },
 
       indent: function (state, textAfter) {
-        if (!state.localMode || /^\s*<\//.test(textAfter)) {
+        if (!state.localMode || /^\s*<\//.test(textAfter))
           return htmlMode.indent(state.htmlState, textAfter);
-        } else if (state.localMode.indent) {
+        else if (state.localMode.indent)
           return state.localMode.indent(state.localState, textAfter);
-        } else {
+        else
           return CodeMirror.Pass;
-        }
       },
 
       innerMode: function (state) {
@@ -208,5 +146,5 @@ var nestedModes = {
     };
   }, "xml", "javascript", "css");
 
-CodeMirror.defineMIME("text/html", "htmlmixed");
+  CodeMirror.defineMIME("text/html", "htmlmixed");
 });
diff --git a/mode/index.html b/mode/index.html
index 9bb8beff92..8b1678e6c0 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -140,6 +140,7 @@ <h2>Language modes</h2>
       <li><a href="velocity/index.html">Velocity</a></li>
       <li><a href="verilog/index.html">Verilog/SystemVerilog</a></li>
       <li><a href="vhdl/index.html">VHDL</a></li>
+      <li><a href="vue/index.html">Vue.js app</a></li>
       <li><a href="xml/index.html">XML/HTML</a></li>
       <li><a href="xquery/index.html">XQuery</a></li>
       <li><a href="yaml/index.html">YAML</a></li>
diff --git a/mode/vue/index.html b/mode/vue/index.html
index e291f679a5..cccb9764f3 100644
--- a/mode/vue/index.html
+++ b/mode/vue/index.html
@@ -64,21 +64,6 @@ <h2>Vue.js mode</h2>
       });
     </script>
 
-    <p>The HTML mixed mode depends on the XML, JavaScript, and CSS modes.</p>
-
-    <p>It takes an optional mode configuration
-    option, <code>scriptTypes</code>, which can be used to add custom
-    behavior for specific <code>&lt;script type="..."></code> tags. If
-    given, it should hold an array of <code>{matches, mode}</code>
-    objects, where <code>matches</code> is a string or regexp that
-    matches the script type, and <code>mode</code> is
-    either <code>null</code>, for script types that should stay in
-    HTML mode, or a <a href="../../doc/manual.html#option_mode">mode
-    spec</a> corresponding to the mode that should be used for the
-    script.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-vue</code>
-    (redefined, only takes effect if you load this parser after the
-    XML parser).</p>
+    <p><strong>MIME types defined:</strong> <code>text/x-vue</code></p>
 
   </article>
diff --git a/mode/vue/vue.js b/mode/vue/vue.js
index 01bb5ecacf..d89a552387 100644
--- a/mode/vue/vue.js
+++ b/mode/vue/vue.js
@@ -5,6 +5,7 @@
   "use strict";
   if (typeof exports === "object" && typeof module === "object") {// CommonJS
     mod(require("../../lib/codemirror"),
+        require("../../addon/mode/overlay"),
         require("../xml/xml"),
         require("../javascript/javascript"),
         require("../coffeescript/coffeescript"),
@@ -15,6 +16,7 @@
         require("../handlebars/handlebars"));
   } else if (typeof define === "function" && define.amd) { // AMD
     define(["../../lib/codemirror",
+            "../../addon/mode/overlay",
             "../xml/xml",
             "../javascript/javascript",
             "../coffeescript/coffeescript",
@@ -27,58 +29,31 @@
     mod(CodeMirror);
   }
 })(function (CodeMirror) {
-  var nestedModes = {
-    script: {
-      attributes: {
-        lang: {
-          coffeescript: /coffee(script)?/
-        },
-        type: {
-          coffeescript: /^(?:text|application)\/(?:x-)?coffee(?:script)?$/
-        }
-      }
-    },
-    style:  {
-      attributes: {
-        lang: {
-          stylus: /^stylus$/i,
-          sass: /^sass$/i
-        },
-        type: {
-          stylus: /^(text\/)?(x-)?styl(us)?$/i,
-          sass: /^text\/sass/i
-        }
-      }
-    },
-    template: {
-      attributes: {
-        lang: {
-          vue: /^vue-template$/i,
-          jade: /^jade$/i,
-          handlebars: /^handlebars$/i
-        },
-        type: {
-          jade: /^(text\/)?(x-)?jade$/i,
-          handlebars: /^text\/x-handlebars-template$/i
-        }
-      },
-      defaultMode: 'vue-template'
-    }
+  var tagLanguages = {
+    script: [
+      ["lang", /coffee(script)?/, "coffeescript"],
+      ["type", /^(?:text|application)\/(?:x-)?coffee(?:script)?$/, "coffeescript"]
+    ],
+    style: [
+      ["lang", /^stylus$/i, "stylus"],
+      ["lang", /^sass$/i, "sass"],
+      ["type", /^(text\/)?(x-)?styl(us)?$/i, "stylus"],
+      ["type", /^text\/sass/i, "sass"]
+    ],
+    template: [
+      ["lang", /^vue-template$/i, "vue"],
+      ["lang", /^jade$/i, "jade"],
+      ["lang", /^handlebars$/i, "handlebars"],
+      ["type", /^(text\/)?(x-)?jade$/i, "jade"],
+      ["type", /^text\/x-handlebars-template$/i, "handlebars"],
+      [null, null, "vue-template"]
+    ]
   };
 
   CodeMirror.defineMode("vue-template", function (config, parserConfig) {
-    "use strict";
     var mustacheOverlay = {
       token: function (stream) {
-        var ch;
-        if (stream.match("{{")) {
-          while ((ch = stream.next()) !== null) {
-            if (ch === "}" && stream.next() === "}") {
-              stream.eat("}");
-              return "mustache";
-            }
-          }
-        }
+        if (stream.match(/^\{\{.*?\}\}/)) return "meta mustache";
         while (stream.next() && !stream.match("{{", false)) {}
         return null;
       }
@@ -87,8 +62,8 @@
   });
 
   CodeMirror.defineMode("vue", function (config) {
-    return CodeMirror.getMode(config, {name: "htmlmixed", modes: nestedModes});
-  },"htmlmixed", "xml", "javascript", "coffeescript", "css", "sass", "stylus", "jade", "handlebars");
+    return CodeMirror.getMode(config, {name: "htmlmixed", tags: tagLanguages});
+  }, "htmlmixed", "xml", "javascript", "coffeescript", "css", "sass", "stylus", "jade", "handlebars");
 
   CodeMirror.defineMIME("script/x-vue", "vue");
 });

From 94fc3b71e8e9f52b9239276a34658023933aac68 Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Wed, 26 Aug 2015 11:08:30 +1000
Subject: [PATCH 2305/4742] [javascript mode] attempt to fix parsing when
 async/await are present

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 341a43d592..4451d65b4f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -32,12 +32,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
       "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, "debugger": C,
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
-      "function": kw("function"), "catch": kw("catch"),
+      "async": kw("async"), "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
       "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
       "this": kw("this"), "class": kw("class"), "super": kw("atom"),
-      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
+      "await": C, "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
     };
 
     // Extend the 'normal' keywords with the TypeScript language extensions
@@ -367,6 +367,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
+    if (type == "async") return cont(expression);
     if (type == "function") return cont(functiondef, maybeop);
     if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
@@ -432,7 +433,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {cx.marked = "property"; return cont();}
   }
   function objprop(type, value) {
-    if (type == "variable" || cx.style == "keyword") {
+    if (type == "async") {
+      return cont(objprop);
+    } else if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);
       return cont(afterprop);

From 756ddc5c8b58c7a47e48762496771aebe08623b4 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Wed, 26 Aug 2015 11:30:16 +0100
Subject: [PATCH 2306/4742] [icecoder theme] Activeline background added

---
 theme/icecoder.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/icecoder.css b/theme/icecoder.css
index 37561d4b9f..d70d26e820 100644
--- a/theme/icecoder.css
+++ b/theme/icecoder.css
@@ -40,3 +40,4 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 .cm-s-icecoder .CodeMirror-gutters { background: #141612; min-width: 41px; border-right: 0; }
 .cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
 .cm-s-icecoder .CodeMirror-matchingbracket { border: 1px solid grey; color: black !important; }
+.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
\ No newline at end of file

From 3d18f89f77c285e36419d6a1ca3714c236d8041c Mon Sep 17 00:00:00 2001
From: David Barnett <dbarnett@google.com>
Date: Sat, 22 Aug 2015 15:36:24 -0700
Subject: [PATCH 2307/4742] [css mode] Adjust indent to align with parent
 context when closing blocks

---
 mode/css/css.js  | 18 ++++++++++++------
 mode/css/test.js |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 83fdcdd7c8..7300850399 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -387,12 +387,18 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       var cx = state.context, ch = textAfter && textAfter.charAt(0);
       var indent = cx.indent;
       if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
-      if (cx.prev &&
-          (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "restricted_atBlock") ||
-           ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
-           ch == "{" && (cx.type == "at" || cx.type == "atBlock"))) {
-        indent = Math.max(0, cx.indent - indentUnit);
-        cx = cx.prev;
+      if (cx.prev) {
+        if (ch == "}" && (cx.type == "block" || cx.type == "top" ||
+                          cx.type == "interpolation" || cx.type == "restricted_atBlock")) {
+          // Resume indentation from parent context.
+          cx = cx.prev;
+          indent = cx.indent;
+        } else if (ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
+            ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
+          // Dedent relative to current context.
+          indent = Math.max(0, cx.indent - indentUnit);
+          cx = cx.prev;
+        }
       }
       return indent;
     },
diff --git a/mode/css/test.js b/mode/css/test.js
index 91046141d9..60f9c837f6 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -156,7 +156,7 @@
       "    [tag foo] {",
       "      [property font-family]: [variable Verdana], [atom sans-serif];",
       "    }",
-      "  }");
+      "}");
 
    MT("document_url",
       "[def @document] [tag url]([string http://blah]) { [qualifier .class] { } }");

From cfdd017c503eeff779b9adb424a0f5d06028ec7e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Sep 2015 14:34:46 +0200
Subject: [PATCH 2308/4742] [placeholder addon] Allow a DOM node to be given as
 placeholder content

Issue #3487
---
 addon/display/placeholder.js | 4 +++-
 doc/manual.html              | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index bb0c3931e4..babddfb1fe 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -37,7 +37,9 @@
     var elt = cm.state.placeholder = document.createElement("pre");
     elt.style.cssText = "height: 0; overflow: visible";
     elt.className = "CodeMirror-placeholder";
-    elt.appendChild(document.createTextNode(cm.getOption("placeholder")));
+    var placeHolder = cm.getOption("placeholder")
+    if (typeof placeHolder == "string") placeHolder = document.createTextNode(placeHolder)
+    elt.appendChild(placeHolder)
     cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
   }
 
diff --git a/doc/manual.html b/doc/manual.html
index e59e6f3fca..0c32e80d93 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2762,9 +2762,10 @@ <h2 id="addons">Addons</h2>
 
       <dt id="addon_placeholder"><a href="../addon/display/placeholder.js"><code>display/placeholder.js</code></a></dt>
       <dd>Adds a <code>placeholder</code> option that can be used to
-      make text appear in the editor when it is empty and not focused.
-      Also gives the editor a <code>CodeMirror-empty</code> CSS class
-      whenever it doesn't contain any text.
+      make content appear in the editor when it is empty and not
+      focused. It can hold either a string or a DOM node. Also gives
+      the editor a <code>CodeMirror-empty</code> CSS class whenever it
+      doesn't contain any text.
       See <a href="../demo/placeholder.html">the demo</a>.</dd>
 
       <dt id="addon_fullscreen"><a href="../addon/display/fullscreen.js"><code>display/fullscreen.js</code></a></dt>

From 9018087c161f32abac9f3ba43e6591f1b9bcab05 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Sep 2015 14:56:13 +0200
Subject: [PATCH 2309/4742] [php mode] Indent php code when in nested HTML

Issue #3488
---
 mode/php/php.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index f4594d4a46..b174a49283 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -160,6 +160,7 @@
       if (!isPHP) {
         if (stream.match(/^<\?\w*/)) {
           state.curMode = phpMode;
+          if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, ""))
           state.curState = state.php;
           return "meta";
         }
@@ -183,6 +184,7 @@
       } else if (isPHP && state.php.tokenize == null && stream.match("?>")) {
         state.curMode = htmlMode;
         state.curState = state.html;
+        if (!state.php.context.prev) state.php = null;
         return "meta";
       } else {
         return phpMode.token(stream, state.curState);
@@ -191,7 +193,8 @@
 
     return {
       startState: function() {
-        var html = CodeMirror.startState(htmlMode), php = CodeMirror.startState(phpMode);
+        var html = CodeMirror.startState(htmlMode)
+        var php = parserConfig.startOpen ? CodeMirror.startState(phpMode) : null
         return {html: html,
                 php: php,
                 curMode: parserConfig.startOpen ? phpMode : htmlMode,
@@ -201,7 +204,7 @@
 
       copyState: function(state) {
         var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html),
-            php = state.php, phpNew = CodeMirror.copyState(phpMode, php), cur;
+            php = state.php, phpNew = php && CodeMirror.copyState(phpMode, php), cur;
         if (state.curMode == htmlMode) cur = htmlNew;
         else cur = phpNew;
         return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur,

From 0cd2432caa007afaddebccb7f315d678b3396695 Mon Sep 17 00:00:00 2001
From: anthonygego <anthonygego@hotmail.com>
Date: Fri, 14 Aug 2015 11:47:12 +0200
Subject: [PATCH 2310/4742] [oz mode] Add

---
 doc/compress.html  |   1 +
 mode/index.html    |   1 +
 mode/meta.js       |   1 +
 mode/oz/index.html |  59 +++++++++++
 mode/oz/oz.js      | 242 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 304 insertions(+)
 create mode 100644 mode/oz/index.html
 create mode 100644 mode/oz/oz.js

diff --git a/doc/compress.html b/doc/compress.html
index 86575be7c4..335a025917 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -165,6 +165,7 @@ <h2>Script compression helper</h2>
           <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>
+          <option value="http://codemirror.net/mode/oz/oz.js">oz.js</option>
           <option value="http://codemirror.net/mode/pascal/pascal.js">pascal.js</option>
           <option value="http://codemirror.net/mode/pegjs/pegjs.js">pegjs.js</option>
           <option value="http://codemirror.net/mode/perl/perl.js">perl.js</option>
diff --git a/mode/index.html b/mode/index.html
index 8b1678e6c0..f63e83684c 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -91,6 +91,7 @@ <h2>Language modes</h2>
       <li><a href="clike/index.html">Objective C</a></li>
       <li><a href="mllike/index.html">OCaml</a></li>
       <li><a href="octave/index.html">Octave</a> (MATLAB)</li>
+      <li><a href="oz/index.html">Oz</a></li>
       <li><a href="pascal/index.html">Pascal</a></li>
       <li><a href="pegjs/index.html">PEG.js</a></li>
       <li><a href="perl/index.html">Perl</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index aff0cc7c62..55f11da8b6 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -87,6 +87,7 @@
     {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
+    {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
     {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
     {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
     {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
diff --git a/mode/oz/index.html b/mode/oz/index.html
new file mode 100644
index 0000000000..febd82a59a
--- /dev/null
+++ b/mode/oz/index.html
@@ -0,0 +1,59 @@
+<!doctype html>
+
+<title>CodeMirror: Oz 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="oz.js"></script>
+<script type="text/javascript" src="../../addon/runmode/runmode.js"></script>
+<style>
+  .CodeMirror {border: 1px solid #aaa;}
+</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="#">Oz</a>
+  </ul>
+</div>
+
+<article>
+<h2>Oz mode</h2>
+<textarea id="code" name="code">
+declare
+fun {Ints N Max}
+  if N == Max then nil
+  else
+    {Delay 1000}
+    N|{Ints N+1 Max}
+  end
+end
+
+fun {Sum S Stream}
+  case Stream of nil then S
+  [] H|T then S|{Sum H+S T} end
+end
+
+local X Y in
+  thread X = {Ints 0 1000} end
+  thread Y = {Sum 0 X} end
+  {Browse Y}
+end
+</textarea>
+<p>MIME type defined: <code>text/x-oz</code>.</p>
+
+<script type="text/javascript">
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    mode: "text/x-oz",
+    readOnly: false
+});
+</script>
+</article>
diff --git a/mode/oz/oz.js b/mode/oz/oz.js
new file mode 100644
index 0000000000..91ea13c22c
--- /dev/null
+++ b/mode/oz/oz.js
@@ -0,0 +1,242 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("oz", function (conf) {
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  }
+
+  var singleOperators = /[\^@!\|<>#~\.\*\-\+\\/,=]/;
+  var doubleOperators = /(<-)|(:=)|(=<)|(>=)|(<=)|(<:)|(>:)|(=:)|(\\=)|(\\=:)|(!!)|(==)|(::)/;
+  var tripleOperators = /(:::)|(\.\.\.)|(=<:)|(>=:)/;
+
+  var atoms = wordRegexp(["true", "false", "nil", "unit"]);
+  var openingKeywords = wordRegexp(["local", "proc", "fun", "case", "class", "if", "cond", "or", "dis",
+    "choice", "not", "thread", "try", "raise", "lock", "for", "suchthat", "meth", "functor"]);
+  var middleKeywords = wordRegexp(["in", "then", "else", "of", "elseof", "elsecase", "elseif", "catch",
+    "finally", "with", "require", "prepare", "import", "export", "define", "do"]);
+  var commonKeywords = wordRegexp(["andthen", "at", "attr", "declare", "feat", "from", "lex",
+    "mod", "mode", "orelse", "parser", "prod", "prop", "scanner", "self", "syn", "token"]);
+  var endKeywords = wordRegexp(["end"]);
+
+  // Tokenizers
+  function tokenBase(stream, state) {
+    if (stream.eatSpace()) {
+      return null;
+    }
+
+    // Brackets
+    if(stream.match(/[{}]/)) {
+      return "bracket";
+    }
+
+    // Special [] keyword
+    if (stream.match(/(\[])/)) {
+        return "keyword"
+    }
+
+    // Operators
+    if (stream.match(tripleOperators) || stream.match(doubleOperators)) {
+      return "operator";
+    }
+
+    // Atoms
+    if(stream.match(atoms)) {
+      return 'atom';
+    }
+
+    // Opening keywords
+    var matched = stream.match(openingKeywords);
+    if (matched) {
+      if (!state.doInCurrentLine)
+        state.currentIndent++;
+      else
+        state.doInCurrentLine = false;
+
+      // Special matching for signatures
+      if(matched[0] == "proc" || matched[0] == "fun")
+        state.tokenize = tokenFunProc;
+      else if(matched[0] == "class")
+        state.tokenize = tokenClass;
+      else if(matched[0] == "meth")
+        state.tokenize = tokenMeth;
+
+      return 'keyword';
+    }
+
+    // Middle and other keywords
+    if (stream.match(middleKeywords) || stream.match(commonKeywords)) {
+      return "keyword"
+    }
+
+    // End keywords
+    if (stream.match(endKeywords)) {
+      state.currentIndent--;
+      return 'keyword';
+    }
+
+    // Eat the next char for next comparisons
+    var ch = stream.next();
+
+    // Strings
+    if (ch == '"' || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    }
+
+    // Numbers
+    if (/[~\d]/.test(ch)) {
+      if (ch == "~") {
+        if(! /^[0-9]/.test(stream.peek()))
+          return null;
+        else if (( stream.next() == "0" && stream.match(/^[xX][0-9a-fA-F]+/)) || stream.match(/^[0-9]*(\.[0-9]+)?([eE][~+]?[0-9]+)?/))
+          return "number";
+      }
+
+      if ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/)) || stream.match(/^[0-9]*(\.[0-9]+)?([eE][~+]?[0-9]+)?/))
+        return "number";
+
+      return null;
+    }
+
+    // Comments
+    if (ch == "%") {
+      stream.skipToEnd();
+      return 'comment';
+    }
+    else if (ch == "/") {
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+    }
+
+    // Single operators
+    if(singleOperators.test(ch)) {
+      return "operator";
+    }
+
+    // If nothing match, we skip the entire alphanumerical block
+    stream.eatWhile(/\w/);
+
+    return "variable";
+  }
+
+  function tokenClass(stream, state) {
+    if (stream.eatSpace()) {
+      return null;
+    }
+    stream.match(/([A-Z][A-Za-z0-9_]*)|(`.+`)/);
+    state.tokenize = tokenBase;
+    return "variable-3"
+  }
+
+  function tokenMeth(stream, state) {
+    if (stream.eatSpace()) {
+      return null;
+    }
+    stream.match(/([a-zA-Z][A-Za-z0-9_]*)|(`.+`)/);
+    state.tokenize = tokenBase;
+    return "def"
+  }
+
+  function tokenFunProc(stream, state) {
+    if (stream.eatSpace()) {
+      return null;
+    }
+
+    if(!state.hasPassedFirstStage && stream.eat("{")) {
+      state.hasPassedFirstStage = true;
+      return "bracket";
+    }
+    else if(state.hasPassedFirstStage) {
+      stream.match(/([A-Z][A-Za-z0-9_]*)|(`.+`)|\$/);
+      state.hasPassedFirstStage = false;
+      state.tokenize = tokenBase;
+      return "def"
+    }
+    else {
+      state.tokenize = tokenBase;
+      return null;
+    }
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function tokenString(quote) {
+    return function (stream, state) {
+      var escaped = false, next, end = false;
+      while ((next = stream.next()) != null) {
+        if (next == quote && !escaped) {
+          end = true;
+          break;
+        }
+        escaped = !escaped && next == "\\";
+      }
+      if (end || !escaped)
+        state.tokenize = tokenBase;
+      return "string";
+    };
+  }
+
+  return {
+
+    startState: function () {
+      return {
+        tokenize: tokenBase,
+        currentIndent: 0,
+        doInCurrentLine: false,
+        hasPassedFirstStage: false
+      };
+    },
+
+    token: function (stream, state) {
+      if (stream.sol())
+        state.doInCurrentLine = 0;
+
+      return state.tokenize(stream, state);
+    },
+
+    indent: function (state, textAfter) {
+      var trueText = textAfter.replace(/^\s+|\s+$/g, '');
+
+      if (trueText.match(endKeywords) || trueText.match(middleKeywords) || trueText.match(/(\[])/))
+        return conf.indentUnit * (state.currentIndent - 1);
+
+      if (state.currentIndent < 0)
+        return 0;
+
+      return state.currentIndent * conf.indentUnit;
+    },
+    fold: "indent",
+    electricChars: "eEdDtTnNiIoOfFhHyY[]",
+    lineComment: "%",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/"
+  };
+});
+
+CodeMirror.defineMIME("text/x-oz", "oz");
+
+});

From a2cc9c0a5551f634e498f8d7c7378ab793fe9eb3 Mon Sep 17 00:00:00 2001
From: Stephen Lavelle <analytic@gmail.com>
Date: Tue, 1 Sep 2015 13:02:32 +0100
Subject: [PATCH 2311/4742] [haxe mode] Don't close strings at end of line

Closes #3492
---
 mode/haxe/haxe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index d49ad70f99..eb1ecd31c5 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -48,7 +48,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
         return false;
       escaped = !escaped && next == "\\";
     }
-    return escaped;
+    return true;
   }
 
   // Used as scratch variables to communicate multiple values without

From 61ca2db598f3f1d79e837f326bc740e8bc49e62a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 1 Sep 2015 15:26:56 +0200
Subject: [PATCH 2312/4742] [haxe mode] Clean up messy formatting

---
 mode/haxe/haxe.js | 131 ++++++++++++++++++++--------------------------
 1 file changed, 57 insertions(+), 74 deletions(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index eb1ecd31c5..fd4a0df1e9 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -16,23 +16,21 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
 
   // Tokenizer
 
-  var keywords = function(){
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
-    var operator = kw("operator"), atom = {type: "atom", style: "atom"}, attribute = {type:"attribute", style: "attribute"};
+  function kw(type) {return {type: type, style: "keyword"};}
+  var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
+  var operator = kw("operator"), atom = {type: "atom", style: "atom"}, attribute = {type:"attribute", style: "attribute"};
   var type = kw("typedef");
-    return {
-      "if": A, "while": A, "else": B, "do": B, "try": B,
-      "return": C, "break": C, "continue": C, "new": C, "throw": C,
-      "var": kw("var"), "inline":attribute, "static": attribute, "using":kw("import"),
+  var keywords = {
+    "if": A, "while": A, "else": B, "do": B, "try": B,
+    "return": C, "break": C, "continue": C, "new": C, "throw": C,
+    "var": kw("var"), "inline":attribute, "static": attribute, "using":kw("import"),
     "public": attribute, "private": attribute, "cast": kw("cast"), "import": kw("import"), "macro": kw("macro"),
-      "function": kw("function"), "catch": kw("catch"), "untyped": kw("untyped"), "callback": kw("cb"),
-      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "never": kw("property_access"), "trace":kw("trace"),
+    "function": kw("function"), "catch": kw("catch"), "untyped": kw("untyped"), "callback": kw("cb"),
+    "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
+    "in": operator, "never": kw("property_access"), "trace":kw("trace"),
     "class": type, "abstract":type, "enum":type, "interface":type, "typedef":type, "extends":type, "implements":type, "dynamic":type,
-      "true": atom, "false": atom, "null": atom
-    };
-  }();
+    "true": atom, "false": atom, "null": atom
+  };
 
   var isOperatorChar = /[+\-*&%=<>!?|]/;
 
@@ -41,14 +39,13 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
     return f(stream, state);
   }
 
-  function nextUntilUnescaped(stream, end) {
+  function toUnescaped(stream, end) {
     var escaped = false, next;
     while ((next = stream.next()) != null) {
       if (next == end && !escaped)
-        return false;
+        return true;
       escaped = !escaped && next == "\\";
     }
-    return true;
   }
 
   // Used as scratch variables to communicate multiple values without
@@ -61,70 +58,58 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
 
   function haxeTokenBase(stream, state) {
     var ch = stream.next();
-    if (ch == '"' || ch == "'")
+    if (ch == '"' || ch == "'") {
       return chain(stream, state, haxeTokenString(ch));
-    else if (/[\[\]{}\(\),;\:\.]/.test(ch))
+    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
       return ret(ch);
-    else if (ch == "0" && stream.eat(/x/i)) {
+    } else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
-    }
-    else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
+    } else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
       stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");
-    }
-    else if (state.reAllowed && (ch == "~" && stream.eat(/\//))) {
-      nextUntilUnescaped(stream, "/");
+    } else if (state.reAllowed && (ch == "~" && stream.eat(/\//))) {
+      toUnescaped(stream, "/");
       stream.eatWhile(/[gimsu]/);
       return ret("regexp", "string-2");
-    }
-    else if (ch == "/") {
+    } else if (ch == "/") {
       if (stream.eat("*")) {
         return chain(stream, state, haxeTokenComment);
-      }
-      else if (stream.eat("/")) {
+      } else if (stream.eat("/")) {
         stream.skipToEnd();
         return ret("comment", "comment");
-      }
-      else {
+      } else {
         stream.eatWhile(isOperatorChar);
         return ret("operator", null, stream.current());
       }
-    }
-    else if (ch == "#") {
+    } else if (ch == "#") {
         stream.skipToEnd();
         return ret("conditional", "meta");
-    }
-    else if (ch == "@") {
+    } else if (ch == "@") {
       stream.eat(/:/);
       stream.eatWhile(/[\w_]/);
       return ret ("metadata", "meta");
-    }
-    else if (isOperatorChar.test(ch)) {
+    } else if (isOperatorChar.test(ch)) {
       stream.eatWhile(isOperatorChar);
       return ret("operator", null, stream.current());
-    }
-    else {
-    var word;
-    if(/[A-Z]/.test(ch))
-    {
-      stream.eatWhile(/[\w_<>]/);
-      word = stream.current();
-      return ret("type", "variable-3", word);
-    }
-    else
-    {
+    } else {
+      var word;
+      if(/[A-Z]/.test(ch)) {
+        stream.eatWhile(/[\w_<>]/);
+        word = stream.current();
+        return ret("type", "variable-3", word);
+      } else {
         stream.eatWhile(/[\w_]/);
         var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
         return (known && state.kwAllowed) ? ret(known.type, known.style, word) :
                        ret("variable", "variable", word);
-    }
+      }
     }
   }
 
   function haxeTokenString(quote) {
     return function(stream, state) {
-      if (!nextUntilUnescaped(stream, quote))
+      if (toUnescaped(stream, quote))
         state.tokenize = haxeTokenBase;
       return ret("string", "string");
     };
@@ -176,27 +161,25 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
           cc.pop()();
         if (cx.marked) return cx.marked;
         if (type == "variable" && inScope(state, content)) return "variable-2";
-    if (type == "variable" && imported(state, content)) return "variable-3";
+        if (type == "variable" && imported(state, content)) return "variable-3";
         return style;
       }
     }
   }
 
-  function imported(state, typename)
-  {
-  if (/[a-z]/.test(typename.charAt(0)))
-    return false;
-  var len = state.importedtypes.length;
-  for (var i = 0; i<len; i++)
-    if(state.importedtypes[i]==typename) return true;
+  function imported(state, typename) {
+    if (/[a-z]/.test(typename.charAt(0)))
+      return false;
+    var len = state.importedtypes.length;
+    for (var i = 0; i<len; i++)
+      if(state.importedtypes[i]==typename) return true;
   }
 
-
   function registerimport(importname) {
-  var state = cx.state;
-  for (var t = state.importedtypes; t; t = t.next)
-    if(t.name == importname) return;
-  state.importedtypes = { name: importname, next: state.importedtypes };
+    var state = cx.state;
+    for (var t = state.importedtypes; t; t = t.next)
+      if(t.name == importname) return;
+    state.importedtypes = { name: importname, next: state.importedtypes };
   }
   // Combinator utils
 
@@ -266,14 +249,14 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
     if (type == "attribute") return cont(maybeattribute);
     if (type == "function") return cont(functiondef);
     if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"),
-                                      poplex, statement, poplex);
+                                   poplex, statement, poplex);
     if (type == "variable") return cont(pushlex("stat"), maybelabel);
     if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                         block, poplex, poplex);
+                                      block, poplex, poplex);
     if (type == "case") return cont(expression, expect(":"));
     if (type == "default") return cont(expect(":"));
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                        statement, poplex, popcontext);
+                                     statement, poplex, popcontext);
     if (type == "import") return cont(importdef, expect(";"));
     if (type == "typedef") return cont(typedef);
     return pass(pushlex("stat"), expression, expect(";"), poplex);
@@ -318,14 +301,14 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
   }
 
   function importdef (type, value) {
-  if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
-  else if(type == "variable" || type == "property" || type == "." || value == "*") return cont(importdef);
+    if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
+    else if(type == "variable" || type == "property" || type == "." || value == "*") return cont(importdef);
   }
 
   function typedef (type, value)
   {
-  if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
-  else if (type == "type" && /[A-Z]/.test(value.charAt(0))) { return cont(); }
+    if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
+    else if (type == "type" && /[A-Z]/.test(value.charAt(0))) { return cont(); }
   }
 
   function maybelabel(type) {
@@ -363,10 +346,10 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
     if (type == ",") return cont(vardef1);
   }
   function forspec1(type, value) {
-  if (type == "variable") {
-    register(value);
-  }
-  return cont(pushlex(")"), pushcontext, forin, expression, poplex, statement, popcontext);
+    if (type == "variable") {
+      register(value);
+    }
+    return cont(pushlex(")"), pushcontext, forin, expression, poplex, statement, popcontext);
   }
   function forin(_type, value) {
     if (value == "in") return cont();

From 926e5aa1273c984e31eee2c91440f8ab2bde12a1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 12:07:43 +0200
Subject: [PATCH 2313/4742] [haxe mode] Fix indentation after braces and
 parsing of for specs

Closes #3494
---
 mode/haxe/haxe.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index fd4a0df1e9..548cbe1b47 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -212,6 +212,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
     cx.state.localVars = cx.state.context.vars;
     cx.state.context = cx.state.context.prev;
   }
+  popcontext.lex = true;
   function pushlex(type, info) {
     var result = function() {
       var state = cx.state;
@@ -235,7 +236,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
       if (type == wanted) return cont();
       else if (wanted == ";") return pass();
       else return cont(f);
-    };
+    }
     return f;
   }
 
@@ -348,8 +349,10 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
   function forspec1(type, value) {
     if (type == "variable") {
       register(value);
+      return cont(forin, expression)
+    } else {
+      return pass()
     }
-    return cont(pushlex(")"), pushcontext, forin, expression, poplex, statement, popcontext);
   }
   function forin(_type, value) {
     if (value == "in") return cont();
@@ -378,7 +381,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
 
   return {
     startState: function(basecolumn) {
-    var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"];
+      var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"];
       return {
         tokenize: haxeTokenBase,
         reAllowed: true,
@@ -386,7 +389,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
         cc: [],
         lexical: new HaxeLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,
-    importedtypes: defaulttypes,
+        importedtypes: defaulttypes,
         context: parserConfig.localVars && {vars: parserConfig.localVars},
         indented: 0
       };

From 20e70382fd3e2f8cc8abeed732abd2399449bc36 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 12:17:06 +0200
Subject: [PATCH 2314/4742] Add few more names for numpad keys

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bf5c4064bd..d9d136a66c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8504,14 +8504,16 @@
 
   // KEY NAMES
 
-  var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
-                  19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
-                  36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-                  46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod", 107: "=", 109: "-", 127: "Delete",
-                  173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-                  221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
-                  63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"};
-  CodeMirror.keyNames = keyNames;
+  var keyNames = CodeMirror.keyNames = {
+    3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+    19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
+    36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
+    46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
+    106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
+    173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
+    221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
+    63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
+  };
   (function() {
     // Number keys
     for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);

From 7a8197fc53c04f6130ae648cf8c2296b48753f3f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 12:37:00 +0200
Subject: [PATCH 2315/4742] [javascript mode] Don't open a form scope for
 import/export

Closes #3458
---
 mode/javascript/javascript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 4451d65b4f..a30872bfa9 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -348,8 +348,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
                                      statement, poplex, popcontext);
     if (type == "class") return cont(pushlex("form"), className, poplex);
-    if (type == "export") return cont(pushlex("form"), afterExport, poplex);
-    if (type == "import") return cont(pushlex("form"), afterImport, poplex);
+    if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
+    if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {

From 15e6088b0db36f76708d068b51a557bb7760e2dc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 12:51:01 +0200
Subject: [PATCH 2316/4742] [search addon] Add 'all' option in replace confirm
 dialog

Issue #3431
---
 addon/search/search.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 5ec6ed6fb1..adb2bccadd 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -158,7 +158,18 @@
   var replaceQueryDialog =
     'Replace: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
   var replacementQueryDialog = 'With: <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
-  var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>Stop</button>";
+  var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>";
+
+  function replaceAll(cm, query, text) {
+    cm.operation(function() {
+      for (var cursor = getSearchCursor(cm, query); cursor.findNext();) {
+        if (typeof query != "string") {
+          var match = cm.getRange(cursor.from(), cursor.to()).match(query);
+          cursor.replace(text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
+        } else cursor.replace(text);
+      }
+    });
+  }
 
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
@@ -169,14 +180,7 @@
       dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {
         text = parseString(text)
         if (all) {
-          cm.operation(function() {
-            for (var cursor = getSearchCursor(cm, query); cursor.findNext();) {
-              if (typeof query != "string") {
-                var match = cm.getRange(cursor.from(), cursor.to()).match(query);
-                cursor.replace(text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
-              } else cursor.replace(text);
-            }
-          });
+          replaceAll(cm, query, text)
         } else {
           clearSearch(cm);
           var cursor = getSearchCursor(cm, query, cm.getCursor());
@@ -190,7 +194,8 @@
             cm.setSelection(cursor.from(), cursor.to());
             cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
             confirmDialog(cm, doReplaceConfirm, "Replace?",
-                          [function() {doReplace(match);}, advance]);
+                          [function() {doReplace(match);}, advance,
+                           function() {replaceAll(cm, query, text)}]);
           };
           var doReplace = function(match) {
             cursor.replace(typeof query == "string" ? text :

From 5c27f7aeab457a6746e3fc906b61b250da6051d9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 12:54:07 +0200
Subject: [PATCH 2317/4742] [search addon] Say 'Replace all' in dialog when
 replacing all

Issue #3431
---
 addon/search/search.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index adb2bccadd..122b86e45c 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -156,7 +156,7 @@
   });}
 
   var replaceQueryDialog =
-    'Replace: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
+    ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
   var replacementQueryDialog = 'With: <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
   var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>";
 
@@ -174,7 +174,8 @@
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
     var query = cm.getSelection() || getSearchState(cm).lastQuery;
-    dialog(cm, replaceQueryDialog, "Replace:", query, function(query) {
+    var dialogText = all ? "Replace all:" : "Replace:"
+    dialog(cm, dialogText + replaceQueryDialog, dialogText, query, function(query) {
       if (!query) return;
       query = parseQuery(query);
       dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {

From f1b8de57027ea3146cd1a0b69f31e91a51b9777a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 13:09:50 +0200
Subject: [PATCH 2318/4742] [search addon] Make persistent dialog transparent
 when hiding current match

Issue #3431
---
 addon/search/search.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 122b86e45c..ac0f3254d7 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -117,11 +117,19 @@
     if (state.query) return findNext(cm, rev);
     var q = cm.getSelection() || state.lastQuery;
     if (persistent && cm.openDialog) {
+      var hiding = null
       persistentDialog(cm, queryDialog, q, function(query, event) {
         CodeMirror.e_stop(event);
         if (!query) return;
         if (query != state.queryText) startSearch(cm, state, query);
-        findNext(cm, event.shiftKey);
+        if (hiding) hiding.style.opacity = 1
+        findNext(cm, event.shiftKey, function(_, to) {
+          var dialog
+          if (to.line < 3 && document.querySelector &&
+              (dialog = cm.display.wrapper.querySelector(".CodeMirror-dialog")) &&
+              dialog.getBoundingClientRect().bottom - 4 > cm.cursorCoords(to, "window").top)
+            (hiding = dialog).style.opacity = .4
+        })
       });
     } else {
       dialog(cm, queryDialog, "Search for:", q, function(query) {
@@ -134,7 +142,7 @@
     }
   }
 
-  function findNext(cm, rev) {cm.operation(function() {
+  function findNext(cm, rev, callback) {cm.operation(function() {
     var state = getSearchState(cm);
     var cursor = getSearchCursor(cm, state.query, rev ? state.posFrom : state.posTo);
     if (!cursor.find(rev)) {
@@ -144,6 +152,7 @@
     cm.setSelection(cursor.from(), cursor.to());
     cm.scrollIntoView({from: cursor.from(), to: cursor.to()}, 20);
     state.posFrom = cursor.from(); state.posTo = cursor.to();
+    if (callback) callback(cursor.from(), cursor.to())
   });}
 
   function clearSearch(cm) {cm.operation(function() {

From 7745cb96f1b6cfae9abaf87626a828e3d36f8ace Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 13:27:29 +0200
Subject: [PATCH 2319/4742] [markdown mode] Allow cross-line code spans

Closes #3386
---
 mode/gfm/test.js          |   4 +-
 mode/markdown/index.html  | 311 +-------------------------------------
 mode/markdown/markdown.js |   4 +-
 mode/markdown/test.js     |   4 +-
 4 files changed, 7 insertions(+), 316 deletions(-)

diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index c2bc38fd57..54d604880a 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -152,8 +152,8 @@
 
   MT("notALink",
      "[comment `foo]",
-     "[link http://www.example.com/]",
-     "[comment `foo]",
+     "[comment&link http://www.example.com/]",
+     "[comment `] foo",
      "",
      "[link http://www.example.com/]");
 
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 15660c2618..d56d333aec 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -31,315 +31,8 @@
 
 <article>
 <h2>Markdown mode</h2>
-<form><textarea id="code" name="code">
-Markdown: Basics
-================
-
-&lt;ul id="ProjectSubmenu"&gt;
-    &lt;li&gt;&lt;a href="/projects/markdown/" title="Markdown Project Page"&gt;Main&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a class="selected" title="Markdown Basics"&gt;Basics&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="/projects/markdown/syntax" title="Markdown Syntax Documentation"&gt;Syntax&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="/projects/markdown/license" title="Pricing and License Information"&gt;License&lt;/a&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;a href="/projects/markdown/dingus" title="Online Markdown Web Form"&gt;Dingus&lt;/a&gt;&lt;/li&gt;
-&lt;/ul&gt;
-
-
-Getting the Gist of Markdown's Formatting Syntax
-------------------------------------------------
-
-This page offers a brief overview of what it's like to use Markdown.
-The [syntax page] [s] provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.
-
-It's also helpful to simply try Markdown out; the [Dingus] [d] is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL] [src].
-
-  [s]: /projects/markdown/syntax  "Markdown Syntax"
-  [d]: /projects/markdown/dingus  "Markdown Dingus"
-  [src]: /projects/markdown/basics.text
-
-
-## Paragraphs, Headers, Blockquotes ##
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like
-a blank line -- a line containing nothing but spaces or tabs is
-considered blank.) Normal paragraphs should not be indented with
-spaces or tabs.
-
-Markdown offers two styles of headers: *Setext* and *atx*.
-Setext-style headers for `&lt;h1&gt;` and `&lt;h2&gt;` are created by
-"underlining" with equal signs (`=`) and hyphens (`-`), respectively.
-To create an atx-style header, you put 1-6 hash marks (`#`) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.
-
-Blockquotes are indicated using email-style '`&gt;`' angle brackets.
-
-Markdown:
-
-    A First Level Header
-    ====================
-    
-    A Second Level Header
-    ---------------------
-
-    Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.
-
-    The quick brown fox jumped over the lazy
-    dog's back.
-    
-    ### Header 3
-
-    &gt; This is a blockquote.
-    &gt; 
-    &gt; This is the second paragraph in the blockquote.
-    &gt;
-    &gt; ## This is an H2 in a blockquote
-
-
-Output:
-
-    &lt;h1&gt;A First Level Header&lt;/h1&gt;
-    
-    &lt;h2&gt;A Second Level Header&lt;/h2&gt;
-    
-    &lt;p&gt;Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.&lt;/p&gt;
-    
-    &lt;p&gt;The quick brown fox jumped over the lazy
-    dog's back.&lt;/p&gt;
-    
-    &lt;h3&gt;Header 3&lt;/h3&gt;
-    
-    &lt;blockquote&gt;
-        &lt;p&gt;This is a blockquote.&lt;/p&gt;
-        
-        &lt;p&gt;This is the second paragraph in the blockquote.&lt;/p&gt;
-        
-        &lt;h2&gt;This is an H2 in a blockquote&lt;/h2&gt;
-    &lt;/blockquote&gt;
-
-
-
-### Phrase Emphasis ###
-
-Markdown uses asterisks and underscores to indicate spans of emphasis.
-
-Markdown:
-
-    Some of these words *are emphasized*.
-    Some of these words _are emphasized also_.
-    
-    Use two asterisks for **strong emphasis**.
-    Or, if you prefer, __use two underscores instead__.
-
-Output:
-
-    &lt;p&gt;Some of these words &lt;em&gt;are emphasized&lt;/em&gt;.
-    Some of these words &lt;em&gt;are emphasized also&lt;/em&gt;.&lt;/p&gt;
-    
-    &lt;p&gt;Use two asterisks for &lt;strong&gt;strong emphasis&lt;/strong&gt;.
-    Or, if you prefer, &lt;strong&gt;use two underscores instead&lt;/strong&gt;.&lt;/p&gt;
-   
-
-
-## Lists ##
-
-Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
-`+`, and `-`) as list markers. These three markers are
-interchangable; this:
-
-    *   Candy.
-    *   Gum.
-    *   Booze.
-
-this:
-
-    +   Candy.
-    +   Gum.
-    +   Booze.
-
-and this:
-
-    -   Candy.
-    -   Gum.
-    -   Booze.
-
-all produce the same output:
-
-    &lt;ul&gt;
-    &lt;li&gt;Candy.&lt;/li&gt;
-    &lt;li&gt;Gum.&lt;/li&gt;
-    &lt;li&gt;Booze.&lt;/li&gt;
-    &lt;/ul&gt;
-
-Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:
-
-    1.  Red
-    2.  Green
-    3.  Blue
-
-Output:
-
-    &lt;ol&gt;
-    &lt;li&gt;Red&lt;/li&gt;
-    &lt;li&gt;Green&lt;/li&gt;
-    &lt;li&gt;Blue&lt;/li&gt;
-    &lt;/ol&gt;
-
-If you put blank lines between items, you'll get `&lt;p&gt;` tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:
-
-    *   A list item.
-    
-        With multiple paragraphs.
-
-    *   Another item in the list.
-
-Output:
-
-    &lt;ul&gt;
-    &lt;li&gt;&lt;p&gt;A list item.&lt;/p&gt;
-    &lt;p&gt;With multiple paragraphs.&lt;/p&gt;&lt;/li&gt;
-    &lt;li&gt;&lt;p&gt;Another item in the list.&lt;/p&gt;&lt;/li&gt;
-    &lt;/ul&gt;
-    
-
-
-### Links ###
-
-Markdown supports two styles for creating links: *inline* and
-*reference*. With both styles, you use square brackets to delimit the
-text you want to turn into a link.
-
-Inline-style links use parentheses immediately after the link text.
-For example:
-
-    This is an [example link](http://example.com/).
-
-Output:
-
-    &lt;p&gt;This is an &lt;a href="http://example.com/"&gt;
-    example link&lt;/a&gt;.&lt;/p&gt;
-
-Optionally, you may include a title attribute in the parentheses:
-
-    This is an [example link](http://example.com/ "With a Title").
-
-Output:
-
-    &lt;p&gt;This is an &lt;a href="http://example.com/" title="With a Title"&gt;
-    example link&lt;/a&gt;.&lt;/p&gt;
-
-Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:
-
-    I get 10 times more traffic from [Google][1] than from
-    [Yahoo][2] or [MSN][3].
-
-    [1]: http://google.com/        "Google"
-    [2]: http://search.yahoo.com/  "Yahoo Search"
-    [3]: http://search.msn.com/    "MSN Search"
-
-Output:
-
-    &lt;p&gt;I get 10 times more traffic from &lt;a href="http://google.com/"
-    title="Google"&gt;Google&lt;/a&gt; than from &lt;a href="http://search.yahoo.com/"
-    title="Yahoo Search"&gt;Yahoo&lt;/a&gt; or &lt;a href="http://search.msn.com/"
-    title="MSN Search"&gt;MSN&lt;/a&gt;.&lt;/p&gt;
-
-The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are *not* case sensitive:
-
-    I start my morning with a cup of coffee and
-    [The New York Times][NY Times].
-
-    [ny times]: http://www.nytimes.com/
-
-Output:
-
-    &lt;p&gt;I start my morning with a cup of coffee and
-    &lt;a href="http://www.nytimes.com/"&gt;The New York Times&lt;/a&gt;.&lt;/p&gt;
-
-
-### Images ###
-
-Image syntax is very much like link syntax.
-
-Inline (titles are optional):
-
-    ![alt text](/path/to/img.jpg "Title")
-
-Reference-style:
-
-    ![alt text][id]
-
-    [id]: /path/to/img.jpg "Title"
-
-Both of the above examples produce the same output:
-
-    &lt;img src="/path/to/img.jpg" alt="alt text" title="Title" /&gt;
-
-
-
-### Code ###
-
-In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (`&amp;`) and angle brackets (`&lt;` or
-`&gt;`) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:
-
-    I strongly recommend against using any `&lt;blink&gt;` tags.
-
-    I wish SmartyPants used named entities like `&amp;mdash;`
-    instead of decimal-encoded entites like `&amp;#8212;`.
-
-Output:
-
-    &lt;p&gt;I strongly recommend against using any
-    &lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
-    
-    &lt;p&gt;I wish SmartyPants used named entities like
-    &lt;code&gt;&amp;amp;mdash;&lt;/code&gt; instead of decimal-encoded
-    entites like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
-
-
-To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, `&amp;`, `&lt;`,
-and `&gt;` characters will be escaped automatically.
-
-Markdown:
-
-    If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:
-
-        &lt;blockquote&gt;
-            &lt;p&gt;For example.&lt;/p&gt;
-        &lt;/blockquote&gt;
-
-Output:
-
-    &lt;p&gt;If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:&lt;/p&gt;
-    
-    &lt;pre&gt;&lt;code&gt;&amp;lt;blockquote&amp;gt;
-        &amp;lt;p&amp;gt;For example.&amp;lt;/p&amp;gt;
-    &amp;lt;/blockquote&amp;gt;
-    &lt;/code&gt;&lt;/pre&gt;
-</textarea></form>
+<form><textarea id="code" name="code">fooo `bar
+baz` bug</textarea></form>
 
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 87c3ad30ad..127846ba4f 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -702,6 +702,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         text: s.text,
         formatting: false,
         linkTitle: s.linkTitle,
+        code: s.code,
         em: s.em,
         strong: s.strong,
         strikethrough: s.strikethrough,
@@ -742,9 +743,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         // Reset state.taskList
         state.taskList = false;
 
-        // Reset state.code
-        state.code = false;
-
         // Reset state.trailingSpace
         state.trailingSpace = 0;
         state.trailingSpaceNewLine = false;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 7cd0bf4b4f..89958ac44d 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -110,7 +110,7 @@
   // Block code using single backtick (shouldn't work)
   MT("blockCodeSingleBacktick",
      "[comment `]",
-     "foo",
+     "[comment foo]",
      "[comment `]");
 
   // Unclosed backticks
@@ -768,7 +768,7 @@
 
   MT("fencedCodeBlocks",
      "[comment ```]",
-     "foo",
+     "[comment foo]",
      "[comment ```]");
 
   // Tests that require XML mode

From 94ae2e1c3d3d3114688cdd9b695d1e75af80020d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 13:49:06 +0200
Subject: [PATCH 2320/4742] Make sure composition underlines are removed even
 if events are fired in bad order

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d9d136a66c..6f1f9a46ad 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1285,6 +1285,7 @@
 
       on(te, "compositionstart", function() {
         var start = cm.getCursor("from");
+        if (input.composing) input.composing.range.clear()
         input.composing = {
           start: start,
           range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})

From 6d4cd33b52f757b7e430ce720b0a0b4032cf98f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 13:52:22 +0200
Subject: [PATCH 2321/4742] Wording change in test runner

Closes #3245
---
 test/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/index.html b/test/index.html
index 42a9f01d38..23d3fa5e57 100644
--- a/test/index.html
+++ b/test/index.html
@@ -204,7 +204,7 @@ <h2>Test Suite</h2>
         progress.style.width = (count * (progress.parentNode.clientWidth - 2) / totalTests) + "px";
         progressRan.nodeValue = count;
         if (type == "ok") {
-          message = "Test '" + name + "' succeeded";
+          message = "Test '" + name + "' passed";
           if (!verbose) customMessage = false;
         } else if (type == "skipped") {
           message = "Test '" + name + "' skipped";

From d2bd2f7a8108ac67c5dc2985631455413939c6a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 14:10:13 +0200
Subject: [PATCH 2322/4742] [markdown mode] Fix accidentally vandalized demo
 page

---
 mode/markdown/index.html | 311 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 309 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index d56d333aec..15660c2618 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -31,8 +31,315 @@
 
 <article>
 <h2>Markdown mode</h2>
-<form><textarea id="code" name="code">fooo `bar
-baz` bug</textarea></form>
+<form><textarea id="code" name="code">
+Markdown: Basics
+================
+
+&lt;ul id="ProjectSubmenu"&gt;
+    &lt;li&gt;&lt;a href="/projects/markdown/" title="Markdown Project Page"&gt;Main&lt;/a&gt;&lt;/li&gt;
+    &lt;li&gt;&lt;a class="selected" title="Markdown Basics"&gt;Basics&lt;/a&gt;&lt;/li&gt;
+    &lt;li&gt;&lt;a href="/projects/markdown/syntax" title="Markdown Syntax Documentation"&gt;Syntax&lt;/a&gt;&lt;/li&gt;
+    &lt;li&gt;&lt;a href="/projects/markdown/license" title="Pricing and License Information"&gt;License&lt;/a&gt;&lt;/li&gt;
+    &lt;li&gt;&lt;a href="/projects/markdown/dingus" title="Online Markdown Web Form"&gt;Dingus&lt;/a&gt;&lt;/li&gt;
+&lt;/ul&gt;
+
+
+Getting the Gist of Markdown's Formatting Syntax
+------------------------------------------------
+
+This page offers a brief overview of what it's like to use Markdown.
+The [syntax page] [s] provides complete, detailed documentation for
+every feature, but Markdown should be very easy to pick up simply by
+looking at a few examples of it in action. The examples on this page
+are written in a before/after style, showing example syntax and the
+HTML output produced by Markdown.
+
+It's also helpful to simply try Markdown out; the [Dingus] [d] is a
+web application that allows you type your own Markdown-formatted text
+and translate it to XHTML.
+
+**Note:** This document is itself written using Markdown; you
+can [see the source for it by adding '.text' to the URL] [src].
+
+  [s]: /projects/markdown/syntax  "Markdown Syntax"
+  [d]: /projects/markdown/dingus  "Markdown Dingus"
+  [src]: /projects/markdown/basics.text
+
+
+## Paragraphs, Headers, Blockquotes ##
+
+A paragraph is simply one or more consecutive lines of text, separated
+by one or more blank lines. (A blank line is any line that looks like
+a blank line -- a line containing nothing but spaces or tabs is
+considered blank.) Normal paragraphs should not be indented with
+spaces or tabs.
+
+Markdown offers two styles of headers: *Setext* and *atx*.
+Setext-style headers for `&lt;h1&gt;` and `&lt;h2&gt;` are created by
+"underlining" with equal signs (`=`) and hyphens (`-`), respectively.
+To create an atx-style header, you put 1-6 hash marks (`#`) at the
+beginning of the line -- the number of hashes equals the resulting
+HTML header level.
+
+Blockquotes are indicated using email-style '`&gt;`' angle brackets.
+
+Markdown:
+
+    A First Level Header
+    ====================
+    
+    A Second Level Header
+    ---------------------
+
+    Now is the time for all good men to come to
+    the aid of their country. This is just a
+    regular paragraph.
+
+    The quick brown fox jumped over the lazy
+    dog's back.
+    
+    ### Header 3
+
+    &gt; This is a blockquote.
+    &gt; 
+    &gt; This is the second paragraph in the blockquote.
+    &gt;
+    &gt; ## This is an H2 in a blockquote
+
+
+Output:
+
+    &lt;h1&gt;A First Level Header&lt;/h1&gt;
+    
+    &lt;h2&gt;A Second Level Header&lt;/h2&gt;
+    
+    &lt;p&gt;Now is the time for all good men to come to
+    the aid of their country. This is just a
+    regular paragraph.&lt;/p&gt;
+    
+    &lt;p&gt;The quick brown fox jumped over the lazy
+    dog's back.&lt;/p&gt;
+    
+    &lt;h3&gt;Header 3&lt;/h3&gt;
+    
+    &lt;blockquote&gt;
+        &lt;p&gt;This is a blockquote.&lt;/p&gt;
+        
+        &lt;p&gt;This is the second paragraph in the blockquote.&lt;/p&gt;
+        
+        &lt;h2&gt;This is an H2 in a blockquote&lt;/h2&gt;
+    &lt;/blockquote&gt;
+
+
+
+### Phrase Emphasis ###
+
+Markdown uses asterisks and underscores to indicate spans of emphasis.
+
+Markdown:
+
+    Some of these words *are emphasized*.
+    Some of these words _are emphasized also_.
+    
+    Use two asterisks for **strong emphasis**.
+    Or, if you prefer, __use two underscores instead__.
+
+Output:
+
+    &lt;p&gt;Some of these words &lt;em&gt;are emphasized&lt;/em&gt;.
+    Some of these words &lt;em&gt;are emphasized also&lt;/em&gt;.&lt;/p&gt;
+    
+    &lt;p&gt;Use two asterisks for &lt;strong&gt;strong emphasis&lt;/strong&gt;.
+    Or, if you prefer, &lt;strong&gt;use two underscores instead&lt;/strong&gt;.&lt;/p&gt;
+   
+
+
+## Lists ##
+
+Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
+`+`, and `-`) as list markers. These three markers are
+interchangable; this:
+
+    *   Candy.
+    *   Gum.
+    *   Booze.
+
+this:
+
+    +   Candy.
+    +   Gum.
+    +   Booze.
+
+and this:
+
+    -   Candy.
+    -   Gum.
+    -   Booze.
+
+all produce the same output:
+
+    &lt;ul&gt;
+    &lt;li&gt;Candy.&lt;/li&gt;
+    &lt;li&gt;Gum.&lt;/li&gt;
+    &lt;li&gt;Booze.&lt;/li&gt;
+    &lt;/ul&gt;
+
+Ordered (numbered) lists use regular numbers, followed by periods, as
+list markers:
+
+    1.  Red
+    2.  Green
+    3.  Blue
+
+Output:
+
+    &lt;ol&gt;
+    &lt;li&gt;Red&lt;/li&gt;
+    &lt;li&gt;Green&lt;/li&gt;
+    &lt;li&gt;Blue&lt;/li&gt;
+    &lt;/ol&gt;
+
+If you put blank lines between items, you'll get `&lt;p&gt;` tags for the
+list item text. You can create multi-paragraph list items by indenting
+the paragraphs by 4 spaces or 1 tab:
+
+    *   A list item.
+    
+        With multiple paragraphs.
+
+    *   Another item in the list.
+
+Output:
+
+    &lt;ul&gt;
+    &lt;li&gt;&lt;p&gt;A list item.&lt;/p&gt;
+    &lt;p&gt;With multiple paragraphs.&lt;/p&gt;&lt;/li&gt;
+    &lt;li&gt;&lt;p&gt;Another item in the list.&lt;/p&gt;&lt;/li&gt;
+    &lt;/ul&gt;
+    
+
+
+### Links ###
+
+Markdown supports two styles for creating links: *inline* and
+*reference*. With both styles, you use square brackets to delimit the
+text you want to turn into a link.
+
+Inline-style links use parentheses immediately after the link text.
+For example:
+
+    This is an [example link](http://example.com/).
+
+Output:
+
+    &lt;p&gt;This is an &lt;a href="http://example.com/"&gt;
+    example link&lt;/a&gt;.&lt;/p&gt;
+
+Optionally, you may include a title attribute in the parentheses:
+
+    This is an [example link](http://example.com/ "With a Title").
+
+Output:
+
+    &lt;p&gt;This is an &lt;a href="http://example.com/" title="With a Title"&gt;
+    example link&lt;/a&gt;.&lt;/p&gt;
+
+Reference-style links allow you to refer to your links by names, which
+you define elsewhere in your document:
+
+    I get 10 times more traffic from [Google][1] than from
+    [Yahoo][2] or [MSN][3].
+
+    [1]: http://google.com/        "Google"
+    [2]: http://search.yahoo.com/  "Yahoo Search"
+    [3]: http://search.msn.com/    "MSN Search"
+
+Output:
+
+    &lt;p&gt;I get 10 times more traffic from &lt;a href="http://google.com/"
+    title="Google"&gt;Google&lt;/a&gt; than from &lt;a href="http://search.yahoo.com/"
+    title="Yahoo Search"&gt;Yahoo&lt;/a&gt; or &lt;a href="http://search.msn.com/"
+    title="MSN Search"&gt;MSN&lt;/a&gt;.&lt;/p&gt;
+
+The title attribute is optional. Link names may contain letters,
+numbers and spaces, but are *not* case sensitive:
+
+    I start my morning with a cup of coffee and
+    [The New York Times][NY Times].
+
+    [ny times]: http://www.nytimes.com/
+
+Output:
+
+    &lt;p&gt;I start my morning with a cup of coffee and
+    &lt;a href="http://www.nytimes.com/"&gt;The New York Times&lt;/a&gt;.&lt;/p&gt;
+
+
+### Images ###
+
+Image syntax is very much like link syntax.
+
+Inline (titles are optional):
+
+    ![alt text](/path/to/img.jpg "Title")
+
+Reference-style:
+
+    ![alt text][id]
+
+    [id]: /path/to/img.jpg "Title"
+
+Both of the above examples produce the same output:
+
+    &lt;img src="/path/to/img.jpg" alt="alt text" title="Title" /&gt;
+
+
+
+### Code ###
+
+In a regular paragraph, you can create code span by wrapping text in
+backtick quotes. Any ampersands (`&amp;`) and angle brackets (`&lt;` or
+`&gt;`) will automatically be translated into HTML entities. This makes
+it easy to use Markdown to write about HTML example code:
+
+    I strongly recommend against using any `&lt;blink&gt;` tags.
+
+    I wish SmartyPants used named entities like `&amp;mdash;`
+    instead of decimal-encoded entites like `&amp;#8212;`.
+
+Output:
+
+    &lt;p&gt;I strongly recommend against using any
+    &lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
+    
+    &lt;p&gt;I wish SmartyPants used named entities like
+    &lt;code&gt;&amp;amp;mdash;&lt;/code&gt; instead of decimal-encoded
+    entites like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
+
+
+To specify an entire block of pre-formatted code, indent every line of
+the block by 4 spaces or 1 tab. Just like with code spans, `&amp;`, `&lt;`,
+and `&gt;` characters will be escaped automatically.
+
+Markdown:
+
+    If you want your page to validate under XHTML 1.0 Strict,
+    you've got to put paragraph tags in your blockquotes:
+
+        &lt;blockquote&gt;
+            &lt;p&gt;For example.&lt;/p&gt;
+        &lt;/blockquote&gt;
+
+Output:
+
+    &lt;p&gt;If you want your page to validate under XHTML 1.0 Strict,
+    you've got to put paragraph tags in your blockquotes:&lt;/p&gt;
+    
+    &lt;pre&gt;&lt;code&gt;&amp;lt;blockquote&amp;gt;
+        &amp;lt;p&amp;gt;For example.&amp;lt;/p&amp;gt;
+    &amp;lt;/blockquote&amp;gt;
+    &lt;/code&gt;&lt;/pre&gt;
+</textarea></form>
 
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {

From 495cdb571f70bd3e2f0bf074620823efc9b033e2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 14:15:49 +0200
Subject: [PATCH 2323/4742] Amend 6d4cd33b5

---
 test/driver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/driver.js b/test/driver.js
index be013a7701..c61d4c1f36 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -76,7 +76,7 @@ function runTests(callback) {
       }
     }
     if (!threw) {
-      if (expFail) callback("fail", test.name, message || "expected failure, but succeeded");
+      if (expFail) callback("fail", test.name, message || "expected failure, but passed");
       else callback("ok", test.name, message);
     }
     if (!quit) { // Run next test

From 662d71f91e2246cb190ed7dcd2d7bfad2cda076b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 14:16:15 +0200
Subject: [PATCH 2324/4742] [markdown mode] Use CommonMark-style flexibility
 for list continuation

Closes #2962
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 127846ba4f..137db5f38d 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -178,7 +178,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         stream.match(olRE, true);
         listType = 'ol';
       }
-      state.indentation += 4;
+      state.indentation = stream.column() + stream.current().length;
       state.list = true;
       state.listDepth++;
       if (modeCfg.taskLists && stream.match(taskListRE, false)) {

From 85d04d188603b1c76155faa4f6cbf1c85e1e7f5d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Sep 2015 14:34:27 +0200
Subject: [PATCH 2325/4742] [markdown mode] Adjust test cases to
 CommonMark-style lists

---
 mode/markdown/test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 89958ac44d..33c8642e58 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -498,14 +498,14 @@
     "",
     "    [variable-3 * bar]",
     "",
-    "       [variable-2 hello]"
+    "       [variable-3 hello]"
   );
   MT("listNested",
     "[variable-2 * foo]",
     "",
     "    [variable-3 * bar]",
     "",
-    "      [variable-3 * foo]"
+    "      [keyword * foo]"
   );
 
   // Code followed by text

From 0dc38d151d515500d8749e7518a580dc8f8c4999 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 4 Sep 2015 09:46:58 +0200
Subject: [PATCH 2326/4742] [javascript mode] Support octal and binary number
 literals

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index a30872bfa9..032c207594 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -105,6 +105,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
+    } else if (ch == "0" && stream.eat(/o/i)) {
+      stream.eatWhile(/[0-7]/i);
+      return ret("number", "number");
+    } else if (ch == "0" && stream.eat(/b/i)) {
+      stream.eatWhile(/[01]/i);
+      return ret("number", "number");
     } else if (/\d/.test(ch)) {
       stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");

From 5cd327fbabdc6c42094869bb403cd7e570ad626b Mon Sep 17 00:00:00 2001
From: Dave Brondsema <dbrondsema@slashdotmedia.com>
Date: Thu, 3 Sep 2015 20:02:09 +0000
Subject: [PATCH 2327/4742] Add option to allow ATX headers without a space

Closes #3343
---
 mode/markdown/markdown.js |  2 +-
 mode/markdown/test.js     | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 137db5f38d..8ce34975b2 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 = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/;
 
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 33c8642e58..a177f5b2dd 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -6,6 +6,8 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
   var modeHighlightFormatting = CodeMirror.getMode({tabSize: 4}, {name: "markdown", highlightFormatting: true});
   function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
+  var modeAtxNoSpace = CodeMirror.getMode({tabSize: 4}, {name: "markdown", allowAtxHeaderWithoutSpace: true});
+  function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); }
 
   FT("formatting_emAsterisk",
      "[em&formatting&formatting-em *][em foo][em&formatting&formatting-em *]");
@@ -173,6 +175,16 @@
   MT("noAtxH1WithoutSpace",
      "#5 bolt");
 
+  // CommonMark requires a space after # but most parsers don't
+  AtxNoSpaceTest("atxNoSpaceAllowed_H1NoSpace",
+     "[header&header-1 #foo]");
+
+  AtxNoSpaceTest("atxNoSpaceAllowed_H4NoSpace",
+     "[header&header-4 ####foo]");
+
+  AtxNoSpaceTest("atxNoSpaceAllowed_H1Space",
+     "[header&header-1 # foo]");
+
   // Inline styles should be parsed inside headers
   MT("atxH1inline",
      "[header&header-1 # foo ][header&header-1&em *bar*]");

From 812d7791ccf04612d50a8a15f919bd7033561ff6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 5 Sep 2015 20:11:37 -0500
Subject: [PATCH 2328/4742] [coffeescript mode] Add text/coffeescript mime type

Node's 'mime' package gives me text/coffeescript for this.
---
 mode/coffeescript/coffeescript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 5dcaac1eda..1b96f85d86 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -361,5 +361,6 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
 });
 
 CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
+CodeMirror.defineMIME("text/coffeescript", "coffeescript");
 
 });

From c9fb71cfec45314dfea8bfc4c0e78741cb9bcec6 Mon Sep 17 00:00:00 2001
From: Stephen Lavelle <analytic@gmail.com>
Date: Sun, 6 Sep 2015 07:12:49 +0100
Subject: [PATCH 2329/4742] [haxe mode] A not-so-great fix to an indentation
 bug

Closes #3500

I don't know if

1) there's a way to get haxe to, while in functiondef, for instance,
   be able to tell the compiler that what it thought was a type name
   is actually a variable name, and to indent/highlight correctly

or

2) there's a way that, assuming it's a type name, to still indent
   correctly

but it is possible to loosen the lexer to accept things marked as
types as function names (in functiondef), and this fixes the
indentation problem.
---
 mode/haxe/haxe.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 548cbe1b47..2ef55b273e 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -358,7 +358,8 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
     if (value == "in") return cont();
   }
   function functiondef(type, value) {
-    if (type == "variable") {register(value); return cont(functiondef);}
+    //function names starting with upper-case letters are recognised as types, so cludging them together here.
+    if (type == "variable" || type == "type") {register(value); return cont(functiondef);}
     if (value == "new") return cont(functiondef);
     if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, typeuse, statement, popcontext);
   }

From 698c8e530e9461bb38a4f1fcfdbf40d61ce17399 Mon Sep 17 00:00:00 2001
From: Stephen Lavelle <analytic@gmail.com>
Date: Sun, 6 Sep 2015 16:36:03 +0100
Subject: [PATCH 2330/4742] [haxe mode] Allow trailing commas in array literals

Closes #3504

(not *totally* confident about its correctness, but it looks like a
plausible fix, and seems to work ok)
---
 mode/haxe/haxe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 2ef55b273e..39837cc4ce 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -268,7 +268,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
     if (type == "keyword c") return cont(maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator);
     if (type == "operator") return cont(expression);
-    if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator);
+    if (type == "[") return cont(pushlex("]"), commasep(maybeexpression, "]"), poplex, maybeoperator);
     if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator);
     return cont();
   }

From 1ded3f6ab7b5e7c80a86603c1130c19a38cc6a57 Mon Sep 17 00:00:00 2001
From: ramwin1 <1175190234@qq.com>
Date: Tue, 8 Sep 2015 14:23:03 +0800
Subject: [PATCH 2331/4742] [manual] Fix confusing path in example

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

diff --git a/doc/manual.html b/doc/manual.html
index 0c32e80d93..b8be70a3db 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -100,7 +100,7 @@ <h2>Basic Usage</h2>
     easy way to combine scripts.) For example:</p>
 
     <pre data-lang="text/html">&lt;script src="lib/codemirror.js">&lt;/script>
-&lt;link rel="stylesheet" href="../lib/codemirror.css">
+&lt;link rel="stylesheet" href="lib/codemirror.css">
 &lt;script src="mode/javascript/javascript.js">&lt;/script></pre>
 
     <p>(Alternatively, use a module loader. <a href="#modloader">More

From 44d30d7c5daee94a62b10431655a2f869dd661e3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 9 Sep 2015 11:53:21 +0200
Subject: [PATCH 2332/4742] [manual] Add note about runmode.node.js example

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

diff --git a/doc/manual.html b/doc/manual.html
index b8be70a3db..456d92efae 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2439,7 +2439,7 @@ <h2 id="addons">Addons</h2>
       running <a href="../addon/runmode/runmode-standalone.js">stand-alone</a>
       (without including all of CodeMirror) and
       for <a href="../addon/runmode/runmode.node.js">running under
-      node.js</a>.</dd>
+      node.js</a> (see <code>bin/source-highlight</code> for an example of using the latter).</dd>
 
       <dt id="addon_colorize"><a href="../addon/runmode/colorize.js"><code>runmode/colorize.js</code></a></dt>
       <dd>Provides a convenient way to syntax-highlight code snippets

From 45adc4d3326346444b8a1a1d5802a47b2785e059 Mon Sep 17 00:00:00 2001
From: Stephen Lavelle <analytic@gmail.com>
Date: Tue, 8 Sep 2015 18:26:12 +0100
Subject: [PATCH 2333/4742] [haxe mode] Treat types as expressions when parsing
 an expression

Closes #3513

Not 100% sure that this is the best way to deal with this - but if
you're in an expression, and encounter what you think is a type, it's
probably better to change your assumption and treat it as you would a
variable/constant (Because that's what it probably is) rather than to
forget everything.

I ran the test suite, and it didn't break anything, and the linter,
which was quiet.
---
 mode/haxe/haxe.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 39837cc4ce..4fcbf075be 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -264,6 +264,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
   }
   function expression(type) {
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator);
+    if (type == "type" ) return cont(maybeoperator);
     if (type == "function") return cont(functiondef);
     if (type == "keyword c") return cont(maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator);

From 1a56b954e0aba1b67ef23c4f58745b26f3d98260 Mon Sep 17 00:00:00 2001
From: Dave Brondsema <dbrondsema@slashdotmedia.com>
Date: Tue, 8 Sep 2015 22:04:15 +0000
Subject: [PATCH 2334/4742] [gfm mode] limit the url regex to certain schemes

Since foo:bar was matching as a regex (as reported in #2521 but still
occurring for me), limit URI schemes to those in the CommonMark spec
for autolinks http://spec.commonmark.org/0.22/#autolinks
---
 mode/gfm/gfm.js  |  3 ++-
 mode/gfm/test.js | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 94ff920bfb..0463e6673a 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -92,11 +92,12 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
           return "link";
         }
       }
-      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
+      if (stream.match(/^((?:coap|doi|javascript|aaa|aaas|about|acap|cap|cid|crid|data|dav|dict|dns|file|ftp|geo|go|gopher|h323|http|https|iax|icap|im|imap|info|ipp|iris|iris\.beep|iris\.xpc|iris\.xpcs|iris\.lwz|ldap|mailto|mid|msrp|msrps|mtqp|mupdate|news|nfs|ni|nih|nntp|opaquelocktoken|pop|pres|rtsp|service|session|shttp|sieve|sip|sips|sms|snmp|soap\.beep|soap\.beeps|tag|tel|telnet|tftp|thismessage|tn3270|tip|tv|urn|vemmi|ws|wss|xcon|xcon-userid|xmlrpc\.beep|xmlrpc\.beeps|xmpp|z39\.50r|z39\.50s|adiumxtra|afp|afs|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|chrome|chrome-extension|com-eventbrite-attendee|content|cvs|dlna-playsingle|dlna-playcontainer|dtn|dvb|ed2k|facetime|feed|finger|fish|gg|git|gizmoproject|gtalk|hcp|icon|ipn|irc|irc6|ircs|itms|jar|jms|keyparc|lastfm|ldaps|magnet|maps|market|message|mms|ms-help|msnim|mumble|mvn|notes|oid|palm|paparazzi|platform|proxy|psyc|query|res|resource|rmi|rsync|rtmp|secondlife|sftp|sgn|skype|smb|soldat|spotify|ssh|steam|svn|teamspeak|things|udp|unreal|ut2004|ventrilo|view-source|webcal|wtai|wyciwyg|xfire|xri|ymsgr:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
          stream.string.slice(stream.start - 2, stream.start) != "](") {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
         // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine
+        // And then limited url schemes to the CommonMark list, so foo:bar isn't matched as a URL
         state.combineTokens = true;
         return "link";
       }
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 54d604880a..3a644c741a 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -133,6 +133,15 @@
   MT("vanillaLink",
      "foo [link http://www.example.com/] bar");
 
+  MT("vanillaLinkNoScheme",
+     "foo [link www.example.com] bar");
+
+  MT("vanillaLinkHttps",
+     "foo [link https://www.example.com/] bar");
+
+  MT("vanillaLinkDataSchema",
+     "foo [link data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==] bar");
+
   MT("vanillaLinkPunctuation",
      "foo [link http://www.example.com/]. bar");
 
@@ -142,6 +151,9 @@
   MT("vanillaLinkEmphasis",
      "foo [em *][em&link http://www.example.com/index.html][em *] bar");
 
+  MT("notALink",
+     "foo asfd:asdf bar");
+
   MT("notALink",
      "[comment ```css]",
      "[tag foo] {[property color]:[keyword black];}",

From 3c41bf145bd26872667f6584150c9d3dd912a85b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 9 Sep 2015 12:01:55 +0200
Subject: [PATCH 2335/4742] [gfm mode] Move humongous URL regexp out of line
 for clarity

Issue #3516
---
 mode/gfm/gfm.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 0463e6673a..2f94bb6dd0 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -11,6 +11,8 @@
 })(function(CodeMirror) {
 "use strict";
 
+var urlRE = /^((?:coap|doi|javascript|aaa|aaas|about|acap|cap|cid|crid|data|dav|dict|dns|file|ftp|geo|go|gopher|h323|http|https|iax|icap|im|imap|info|ipp|iris|iris\.beep|iris\.xpc|iris\.xpcs|iris\.lwz|ldap|mailto|mid|msrp|msrps|mtqp|mupdate|news|nfs|ni|nih|nntp|opaquelocktoken|pop|pres|rtsp|service|session|shttp|sieve|sip|sips|sms|snmp|soap\.beep|soap\.beeps|tag|tel|telnet|tftp|thismessage|tn3270|tip|tv|urn|vemmi|ws|wss|xcon|xcon-userid|xmlrpc\.beep|xmlrpc\.beeps|xmpp|z39\.50r|z39\.50s|adiumxtra|afp|afs|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|chrome|chrome-extension|com-eventbrite-attendee|content|cvs|dlna-playsingle|dlna-playcontainer|dtn|dvb|ed2k|facetime|feed|finger|fish|gg|git|gizmoproject|gtalk|hcp|icon|ipn|irc|irc6|ircs|itms|jar|jms|keyparc|lastfm|ldaps|magnet|maps|market|message|mms|ms-help|msnim|mumble|mvn|notes|oid|palm|paparazzi|platform|proxy|psyc|query|res|resource|rmi|rsync|rtmp|secondlife|sftp|sgn|skype|smb|soldat|spotify|ssh|steam|svn|teamspeak|things|udp|unreal|ut2004|ventrilo|view-source|webcal|wtai|wyciwyg|xfire|xri|ymsgr:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i
+
 CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var codeDepth = 0;
   function blankLine(state) {
@@ -92,7 +94,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
           return "link";
         }
       }
-      if (stream.match(/^((?:coap|doi|javascript|aaa|aaas|about|acap|cap|cid|crid|data|dav|dict|dns|file|ftp|geo|go|gopher|h323|http|https|iax|icap|im|imap|info|ipp|iris|iris\.beep|iris\.xpc|iris\.xpcs|iris\.lwz|ldap|mailto|mid|msrp|msrps|mtqp|mupdate|news|nfs|ni|nih|nntp|opaquelocktoken|pop|pres|rtsp|service|session|shttp|sieve|sip|sips|sms|snmp|soap\.beep|soap\.beeps|tag|tel|telnet|tftp|thismessage|tn3270|tip|tv|urn|vemmi|ws|wss|xcon|xcon-userid|xmlrpc\.beep|xmlrpc\.beeps|xmpp|z39\.50r|z39\.50s|adiumxtra|afp|afs|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|chrome|chrome-extension|com-eventbrite-attendee|content|cvs|dlna-playsingle|dlna-playcontainer|dtn|dvb|ed2k|facetime|feed|finger|fish|gg|git|gizmoproject|gtalk|hcp|icon|ipn|irc|irc6|ircs|itms|jar|jms|keyparc|lastfm|ldaps|magnet|maps|market|message|mms|ms-help|msnim|mumble|mvn|notes|oid|palm|paparazzi|platform|proxy|psyc|query|res|resource|rmi|rsync|rtmp|secondlife|sftp|sgn|skype|smb|soldat|spotify|ssh|steam|svn|teamspeak|things|udp|unreal|ut2004|ventrilo|view-source|webcal|wtai|wyciwyg|xfire|xri|ymsgr:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
+      if (stream.match(urlRE) &&
          stream.string.slice(stream.start - 2, stream.start) != "](") {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls

From 95055c82cf09214fef8a307afa3f056ac3327987 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 9 Sep 2015 12:13:15 +0200
Subject: [PATCH 2336/4742] [manual] Clean up documentation for the lint addon

Closes #3512
---
 doc/manual.html | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 456d92efae..20936f5a92 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2678,23 +2678,24 @@ <h2 id="addons">Addons</h2>
       <a href="../addon/lint/coffeescript-lint.js"><code>coffeescript-lint.js</code></a>,
       and <a href="../addon/lint/css-lint.js"><code>css-lint.js</code></a>
       in the same directory). Defines a <code>lint</code> option that
-      can be set to a warning source (for
-      example <code>CodeMirror.lint.javascript</code>), or
-      to <code>true</code>, in which
-      case <a href="#getHelper"><code>getHelper</code></a> with
-      type <code>"lint"</code> is used to determined a validator
-      function. Such a function should, when given a document string,
-      an options object, and an editor instance, return an array of <code>{message,
-      severity, from, to}</code> objects representing problems. When
-      the function has an <code>async</code> property with a truthy
-      value, it will be called with an additional second argument,
-      which is a callback to pass the array to. Depends
-      on <code>addon/lint/lint.css</code>. A demo can be
+      can be set to an annotation source (for
+      example <code>CodeMirror.lint.javascript</code>), to an options
+      object (in which case the <code>getAnnotations</code> field is
+      used as annotation source), or simply to <code>true</code>. When
+      no annotation source is
+      specified, <a href="#getHelper"><code>getHelper</code></a> with
+      type <code>"lint"</code> is used to find an annotation function.
+      An annotation source function should, when given a document
+      string, an options object, and an editor instance, return an
+      array of <code>{message, severity, from, to}</code> objects
+      representing problems. When the function has
+      an <code>async</code> property with a truthy value, it will be
+      called with an additional second argument, which is a callback
+      to pass the array to. By default, the linter will run
+      (debounced) whenever the document is changed. You can pass
+      a <code>lintOnChange: false</code> option to disable that.
+      Depends on <code>addon/lint/lint.css</code>. A demo can be
       found <a href="../demo/lint.html">here</a>.</dd>
-      <dd>Linting on every change can be disabled by setting
-      the <code>lintOnChange</code> option to <code>false</code>. One
-      can then perform the lint operation explicitly using the
-      editor's <code>performLint</code> method.</dd>
 
       <dt id="addon_mark-selection"><a href="../addon/selection/mark-selection.js"><code>selection/mark-selection.js</code></a></dt>
       <dd>Causes the selected text to be marked with the CSS class

From b6deb1fbe4a8691c5f4cdcd0c1acef53ce53687c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 11 Sep 2015 16:13:33 +0200
Subject: [PATCH 2337/4742] [lint addon] Don't require async linters to pass
 editor to callback

---
 addon/lint/lint.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index babcba85c3..83cb27fb5d 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -121,7 +121,10 @@
     var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
     if (!getAnnotations) return;
     if (options.async || getAnnotations.async)
-      getAnnotations(cm.getValue(), updateLinting, passOptions, cm);
+      getAnnotations(cm.getValue(), function(annotations, arg2) {
+        if (arg2 && annotations instanceof CodeMirror) annotations = arg2
+        updateLinting(cm, annotations)
+      }, passOptions, cm);
     else
       updateLinting(cm, getAnnotations(cm.getValue(), passOptions, cm));
   }

From dbaf6a94f1ae50d387fa77893cf6b886988c2147 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 11 Sep 2015 22:46:37 +0200
Subject: [PATCH 2338/4742] [lint addon] Deal with changes and response order
 in async linters

---
 addon/lint/lint.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 83cb27fb5d..36845b9eff 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -61,6 +61,7 @@
     this.timeout = null;
     this.hasGutter = hasGutter;
     this.onMouseOver = function(e) { onMouseOver(cm, e); };
+    this.waitingFor = 0
   }
 
   function parseOptions(_cm, options) {
@@ -120,13 +121,22 @@
     var passOptions = options.options || options; // Support deprecated passing of `options` property in options
     var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
     if (!getAnnotations) return;
-    if (options.async || getAnnotations.async)
+    if (options.async || getAnnotations.async) {
+      var id = ++state.waitingFor
+      function abort() {
+        id = -1
+        cm.off("change", abort)
+      }
+      cm.on("change", abort)
       getAnnotations(cm.getValue(), function(annotations, arg2) {
+        cm.off("change", abort)
+        if (state.waitingFor != id) return
         if (arg2 && annotations instanceof CodeMirror) annotations = arg2
         updateLinting(cm, annotations)
       }, passOptions, cm);
-    else
+    } else {
       updateLinting(cm, getAnnotations(cm.getValue(), passOptions, cm));
+    }
   }
 
   function updateLinting(cm, annotationsNotSorted) {

From ed6651b29fbe38ac5747d281340f297d765abdb7 Mon Sep 17 00:00:00 2001
From: Victor Bocharsky <bocharsky.bw@gmail.com>
Date: Tue, 15 Sep 2015 21:24:50 +0300
Subject: [PATCH 2339/4742] [php mode] Add missing file_put_contents function

For proper syntax highlighting
---
 mode/php/php.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index b174a49283..22494467b2 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -86,7 +86,7 @@
     "die echo empty exit eval include include_once isset list require require_once return " +
     "print unset __halt_compiler self static parent yield insteadof finally";
   var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
-  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
+  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
   CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
   CodeMirror.registerHelper("wordChars", "php", /[\w$]/);
 

From 72ca9ff8f90044ea9fef55565bcfd7c9dd8c6637 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Sep 2015 14:30:43 +0200
Subject: [PATCH 2340/4742] [gfm mode] Fix crudely broken regexp for URL
 detection

Damaged in 1a56b954e0aba1b67ef
---
 mode/gfm/gfm.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 2f94bb6dd0..08d3820a4a 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -11,7 +11,7 @@
 })(function(CodeMirror) {
 "use strict";
 
-var urlRE = /^((?:coap|doi|javascript|aaa|aaas|about|acap|cap|cid|crid|data|dav|dict|dns|file|ftp|geo|go|gopher|h323|http|https|iax|icap|im|imap|info|ipp|iris|iris\.beep|iris\.xpc|iris\.xpcs|iris\.lwz|ldap|mailto|mid|msrp|msrps|mtqp|mupdate|news|nfs|ni|nih|nntp|opaquelocktoken|pop|pres|rtsp|service|session|shttp|sieve|sip|sips|sms|snmp|soap\.beep|soap\.beeps|tag|tel|telnet|tftp|thismessage|tn3270|tip|tv|urn|vemmi|ws|wss|xcon|xcon-userid|xmlrpc\.beep|xmlrpc\.beeps|xmpp|z39\.50r|z39\.50s|adiumxtra|afp|afs|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|chrome|chrome-extension|com-eventbrite-attendee|content|cvs|dlna-playsingle|dlna-playcontainer|dtn|dvb|ed2k|facetime|feed|finger|fish|gg|git|gizmoproject|gtalk|hcp|icon|ipn|irc|irc6|ircs|itms|jar|jms|keyparc|lastfm|ldaps|magnet|maps|market|message|mms|ms-help|msnim|mumble|mvn|notes|oid|palm|paparazzi|platform|proxy|psyc|query|res|resource|rmi|rsync|rtmp|secondlife|sftp|sgn|skype|smb|soldat|spotify|ssh|steam|svn|teamspeak|things|udp|unreal|ut2004|ventrilo|view-source|webcal|wtai|wyciwyg|xfire|xri|ymsgr:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i
+var urlRE = /^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i
 
 CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var codeDepth = 0;
@@ -95,7 +95,8 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
         }
       }
       if (stream.match(urlRE) &&
-         stream.string.slice(stream.start - 2, stream.start) != "](") {
+          stream.string.slice(stream.start - 2, stream.start) != "](" &&
+          (stream.start == 0 || /\W/.test(stream.string.charAt(stream.start - 1)))) {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
         // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine

From 0c9a2ffd67e00dd30d1d82c4a363215f70c9470a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anthony=20G=C3=A9go?= <anthonygego@hotmail.com>
Date: Wed, 9 Sep 2015 16:07:19 +0200
Subject: [PATCH 2341/4742] [oz mode] clean up electric indentation test

---
 mode/oz/oz.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/mode/oz/oz.js b/mode/oz/oz.js
index 91ea13c22c..ee8cb0ad15 100644
--- a/mode/oz/oz.js
+++ b/mode/oz/oz.js
@@ -21,14 +21,17 @@ CodeMirror.defineMode("oz", function (conf) {
   var doubleOperators = /(<-)|(:=)|(=<)|(>=)|(<=)|(<:)|(>:)|(=:)|(\\=)|(\\=:)|(!!)|(==)|(::)/;
   var tripleOperators = /(:::)|(\.\.\.)|(=<:)|(>=:)/;
 
+  var middle = ["in", "then", "else", "of", "elseof", "elsecase", "elseif", "catch",
+    "finally", "with", "require", "prepare", "import", "export", "define", "do"];
+  var end = ["end"];
+
   var atoms = wordRegexp(["true", "false", "nil", "unit"]);
-  var openingKeywords = wordRegexp(["local", "proc", "fun", "case", "class", "if", "cond", "or", "dis",
-    "choice", "not", "thread", "try", "raise", "lock", "for", "suchthat", "meth", "functor"]);
-  var middleKeywords = wordRegexp(["in", "then", "else", "of", "elseof", "elsecase", "elseif", "catch",
-    "finally", "with", "require", "prepare", "import", "export", "define", "do"]);
   var commonKeywords = wordRegexp(["andthen", "at", "attr", "declare", "feat", "from", "lex",
     "mod", "mode", "orelse", "parser", "prod", "prop", "scanner", "self", "syn", "token"]);
-  var endKeywords = wordRegexp(["end"]);
+  var openingKeywords = wordRegexp(["local", "proc", "fun", "case", "class", "if", "cond", "or", "dis",
+    "choice", "not", "thread", "try", "raise", "lock", "for", "suchthat", "meth", "functor"]);
+  var middleKeywords = wordRegexp(middle);
+  var endKeywords = wordRegexp(end);
 
   // Tokenizers
   function tokenBase(stream, state) {
@@ -200,6 +203,13 @@ CodeMirror.defineMode("oz", function (conf) {
     };
   }
 
+  function buildElectricInputRegEx() {
+    // Reindentation should occur on [] or on a match of any of
+    // the block closing keywords, at the end of a line.
+    var allClosings = middle.concat(end);
+    return new RegExp("[\\[\\]]|(" + allClosings.join("|") + ")$");
+  }
+
   return {
 
     startState: function () {
@@ -230,7 +240,7 @@ CodeMirror.defineMode("oz", function (conf) {
       return state.currentIndent * conf.indentUnit;
     },
     fold: "indent",
-    electricChars: "eEdDtTnNiIoOfFhHyY[]",
+    electricInput: buildElectricInputRegEx(),
     lineComment: "%",
     blockCommentStart: "/*",
     blockCommentEnd: "*/"

From c65244d1f5fa9164cbf62e2328e9a46d614ce465 Mon Sep 17 00:00:00 2001
From: Stephen Lavelle <analytic@gmail.com>
Date: Wed, 9 Sep 2015 11:45:07 +0100
Subject: [PATCH 2342/4742] [closebrackets addon] When wrapping selection,
 create new selection without brackets

Right now if you have a selection, and you enter a bracket/quote,
surrounds it with quotation marks, and selects the entire quote. This
change should change the behaviour to selecting the interior of the
quote instead.

The motivating example for me was autocomplete, where after
autocompleting a function the arguments are selected, so if you want
to insert a string literal right now you have to delete the selection
before you can enter the quotes. With the proposed fix, it'll be
rather more fluid.
---
 addon/edit/closebrackets.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 7030268b03..bd183c32cc 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -90,6 +90,16 @@
     });
   }
 
+  function contractSelection(sel){
+    if (sel.anchor.line<sel.head.line || (sel.anchor.line===sel.head.line&&sel.anchor.ch<sel.head.ch)){
+      sel.anchor.ch++;
+      sel.head.ch--;
+    }
+    if (sel.anchor.line>sel.head.line || (sel.anchor.line===sel.head.line&&sel.anchor.ch>sel.head.ch)){
+      sel.head.ch++;
+      sel.anchor.ch--;
+    }
+  }
   function handleChar(cm, ch) {
     var conf = getConfig(cm);
     if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
@@ -145,6 +155,11 @@
         for (var i = 0; i < sels.length; i++)
           sels[i] = left + sels[i] + right;
         cm.replaceSelections(sels, "around");
+        var selections = cm.listSelections();
+        for (var i=0;i<selections.length;i++){
+          contractSelection(selections[i]);
+        }
+        cm.setSelections(selections);
       } else if (type == "both") {
         cm.replaceSelection(left + right, null);
         cm.triggerElectric(left + right);

From df8afed39c8b9912ffc2ef1ffe9d66a794b411ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Sep 2015 14:43:31 +0200
Subject: [PATCH 2343/4742] [closebrackets addon] Fix mutation of shared data

Issue #3518
---
 addon/edit/closebrackets.js | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index bd183c32cc..f3006976fd 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -90,16 +90,12 @@
     });
   }
 
-  function contractSelection(sel){
-    if (sel.anchor.line<sel.head.line || (sel.anchor.line===sel.head.line&&sel.anchor.ch<sel.head.ch)){
-      sel.anchor.ch++;
-      sel.head.ch--;
-    }
-    if (sel.anchor.line>sel.head.line || (sel.anchor.line===sel.head.line&&sel.anchor.ch>sel.head.ch)){
-      sel.head.ch++;
-      sel.anchor.ch--;
-    }
+  function contractSelection(sel) {
+    var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;
+    return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),
+            head: new Pos(sel.head.line, sel.head.ch + (inverted ? 1 : -1))};
   }
+
   function handleChar(cm, ch) {
     var conf = getConfig(cm);
     if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
@@ -155,11 +151,10 @@
         for (var i = 0; i < sels.length; i++)
           sels[i] = left + sels[i] + right;
         cm.replaceSelections(sels, "around");
-        var selections = cm.listSelections();
-        for (var i=0;i<selections.length;i++){
-          contractSelection(selections[i]);
-        }
-        cm.setSelections(selections);
+        sels = cm.listSelections().slice();
+        for (var i = 0; i < sels.length; i++)
+          sels[i] = contractSelection(sels[i]);
+        cm.setSelections(sels);
       } else if (type == "both") {
         cm.replaceSelection(left + right, null);
         cm.triggerElectric(left + right);

From 658ef7809e3fc32516a13a7a1477ceabf8443f29 Mon Sep 17 00:00:00 2001
From: Wes Cossick <WesCossick@users.noreply.github.com>
Date: Thu, 10 Sep 2015 14:27:21 -0500
Subject: [PATCH 2344/4742] [gfm mode] Add modeConfig for GitHub Spice

---
 mode/gfm/gfm.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 08d3820a4a..4d856eed79 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -14,6 +14,10 @@
 var urlRE = /^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i
 
 CodeMirror.defineMode("gfm", function(config, modeConfig) {
+  // Should GitHub spice be added (like linking #Num, SHA, etc.)
+  if (modeConfig.gitHubSpice === undefined)
+    modeConfig.gitHubSpice = true;
+
   var codeDepth = 0;
   function blankLine(state) {
     state.code = false;
@@ -80,18 +84,20 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
       }
       if (stream.sol() || state.ateSpace) {
         state.ateSpace = false;
-        if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
-          // User/Project@SHA
-          // User@SHA
-          // SHA
-          state.combineTokens = true;
-          return "link";
-        } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) {
-          // User/Project#Num
-          // User#Num
-          // #Num
-          state.combineTokens = true;
-          return "link";
+        if (modeConfig.gitHubSpice) {
+          if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
+            // User/Project@SHA
+            // User@SHA
+            // SHA
+            state.combineTokens = true;
+            return "link";
+          } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) {
+            // User/Project#Num
+            // User#Num
+            // #Num
+            state.combineTokens = true;
+            return "link";
+          }
         }
       }
       if (stream.match(urlRE) &&

From ece5c232a43e9260b4c7393de5560ba2b60a4036 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 17 Sep 2015 14:48:01 +0200
Subject: [PATCH 2345/4742] [gfm mode] Simplify checking of gitHubSpice config
 parameter

---
 mode/gfm/gfm.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 4d856eed79..fe65a3780a 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -14,10 +14,6 @@
 var urlRE = /^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i
 
 CodeMirror.defineMode("gfm", function(config, modeConfig) {
-  // Should GitHub spice be added (like linking #Num, SHA, etc.)
-  if (modeConfig.gitHubSpice === undefined)
-    modeConfig.gitHubSpice = true;
-
   var codeDepth = 0;
   function blankLine(state) {
     state.code = false;
@@ -84,7 +80,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
       }
       if (stream.sol() || state.ateSpace) {
         state.ateSpace = false;
-        if (modeConfig.gitHubSpice) {
+        if (modeConfig.gitHubSpice !== false) {
           if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
             // User/Project@SHA
             // User@SHA

From e367de8a1e8d2f314cf71b29a4488cce7cfc0a76 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 12:35:15 +0200
Subject: [PATCH 2346/4742] [markdown mode] Don't get confused when the start
 of line is multiplexed away

Issue #3535
---
 mode/markdown/markdown.js | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 8ce34975b2..5cce40a76d 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -86,6 +86,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return f(stream, state);
   }
 
+  function lineIsEmpty(line) {
+    return !line || !/\S/.test(line.string)
+  }
 
   // Blocks
 
@@ -110,7 +113,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.trailingSpace = 0;
     state.trailingSpaceNewLine = false;
     // Mark this line as blank
-    state.thisLineHasContent = false;
+    state.prevLine = state.thisLine
+    state.thisLine = null
     return null;
   }
 
@@ -141,7 +145,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     var match = null;
     if (state.indentationDiff >= 4) {
       stream.skipToEnd();
-      if (prevLineIsIndentedCode || !state.prevLineHasContent) {
+      if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
         state.indentation -= 4;
         state.indentedCode = true;
         return code;
@@ -155,7 +159,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
       return getType(state);
-    } else if (state.prevLineHasContent && !state.quote && !prevLineIsList && !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
+    } else if (!lineIsEmpty(state.prevLine) && !state.quote && !prevLineIsList &&
+               !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
       state.header = match[0].charAt(0) == '=' ? 1 : 2;
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
@@ -170,7 +175,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     } else if (stream.match(hrRE, true)) {
       state.hr = true;
       return hr;
-    } else if ((!state.prevLineHasContent || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
+    } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
       var listType = null;
       if (stream.match(ulRE, true)) {
         listType = 'ul';
@@ -656,8 +661,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return {
         f: blockNormal,
 
-        prevLineHasContent: false,
-        thisLineHasContent: false,
+        prevLine: null,
+        thisLine: null,
 
         block: blockNormal,
         htmlState: null,
@@ -688,8 +693,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return {
         f: s.f,
 
-        prevLineHasContent: s.prevLineHasContent,
-        thisLineHasContent: s.thisLineHasContent,
+        prevLine: s.prevLine,
+        thisLine: s.this,
 
         block: s.block,
         htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),
@@ -724,22 +729,22 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       // Reset state.formatting
       state.formatting = false;
 
-      if (stream.sol()) {
-        var forceBlankLine = !!state.header || state.hr;
+      if (stream != state.thisLine) {
+        var forceBlankLine = state.header || state.hr;
 
         // Reset state.header and state.hr
         state.header = 0;
         state.hr = false;
 
         if (stream.match(/^\s*$/, true) || forceBlankLine) {
-          state.prevLineHasContent = false;
           blankLine(state);
-          return forceBlankLine ? this.token(stream, state) : null;
-        } else {
-          state.prevLineHasContent = state.thisLineHasContent;
-          state.thisLineHasContent = true;
+          if (!forceBlankLine) return null
+          state.prevLine = null
         }
 
+        state.prevLine = state.thisLine
+        state.thisLine = stream
+
         // Reset state.taskList
         state.taskList = false;
 

From 39593273dd4b3464306f17d4e8a69003399fcf7b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 13:03:20 +0200
Subject: [PATCH 2347/4742] [contenteditable input] Make aware of readOnly
 option

Which wasn't taken into account in this input backend at all,
up to this point.

See http://discuss.codemirror.net/t/read-only-support-in-mobile-safari/470/1
---
 lib/codemirror.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6f1f9a46ad..953768e6d6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1534,6 +1534,10 @@
       }
     },
 
+    readOnlyChanged: function(val) {
+      if (!val) this.reset();
+    },
+
     setUneditable: nothing,
 
     needsContentAttribute: false
@@ -1552,7 +1556,6 @@
     init: function(display) {
       var input = this, cm = input.cm;
       var div = input.div = display.lineDiv;
-      div.contentEditable = "true";
       disableBrowserMagic(div);
 
       on(div, "paste", function(e) { handlePaste(e, cm); })
@@ -1593,7 +1596,7 @@
 
       on(div, "input", function() {
         if (input.composing) return;
-        if (!input.pollContent())
+        if (isReadOnly(cm) || !input.pollContent())
           runInOp(input.cm, function() {regChange(cm);});
       });
 
@@ -1818,17 +1821,24 @@
       this.div.focus();
     },
     applyComposition: function(composing) {
-      if (composing.data && composing.data != composing.startData)
+      if (isReadOnly(this.cm))
+        operation(this.cm, regChange)(this.cm)
+      else if (composing.data && composing.data != composing.startData)
         operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
     },
 
     setUneditable: function(node) {
-      node.setAttribute("contenteditable", "false");
+      node.contentEditable = "false"
     },
 
     onKeyPress: function(e) {
       e.preventDefault();
-      operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
+      if (!isReadOnly(this.cm))
+        operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
+    },
+
+    readOnlyChanged: function(val) {
+      this.div.contentEditable = String(val != "nocursor")
     },
 
     onContextMenu: nothing,
@@ -5389,8 +5399,8 @@
       cm.display.disabled = true;
     } else {
       cm.display.disabled = false;
-      if (!val) cm.display.input.reset();
     }
+    cm.display.input.readOnlyChanged(val)
   });
   option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
   option("dragDrop", true, dragDropChanged);

From 0da0083df23ee830016bacdc5ed83171ad77ef42 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 13:09:03 +0200
Subject: [PATCH 2348/4742] [lint addon] Lift async lint call into own function

Closes #3538
---
 addon/lint/lint.js | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 36845b9eff..5afe49d0fc 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -116,24 +116,29 @@
     return tip;
   }
 
+  function lintAsync(cm, getAnnotations, passOptions) {
+    var state = cm.state.lint
+    var id = ++state.waitingFor
+    function abort() {
+      id = -1
+      cm.off("change", abort)
+    }
+    cm.on("change", abort)
+    getAnnotations(cm.getValue(), function(annotations, arg2) {
+      cm.off("change", abort)
+      if (state.waitingFor != id) return
+      if (arg2 && annotations instanceof CodeMirror) annotations = arg2
+      updateLinting(cm, annotations)
+    }, passOptions, cm);
+  }
+
   function startLinting(cm) {
     var state = cm.state.lint, options = state.options;
     var passOptions = options.options || options; // Support deprecated passing of `options` property in options
     var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
     if (!getAnnotations) return;
     if (options.async || getAnnotations.async) {
-      var id = ++state.waitingFor
-      function abort() {
-        id = -1
-        cm.off("change", abort)
-      }
-      cm.on("change", abort)
-      getAnnotations(cm.getValue(), function(annotations, arg2) {
-        cm.off("change", abort)
-        if (state.waitingFor != id) return
-        if (arg2 && annotations instanceof CodeMirror) annotations = arg2
-        updateLinting(cm, annotations)
-      }, passOptions, cm);
+      lintAsync(cm, getAnnotations, passOptions)
     } else {
       updateLinting(cm, getAnnotations(cm.getValue(), passOptions, cm));
     }

From 3d1a0564a16e2bd9b625e3a82f4a8f6815fa7b24 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Fri, 18 Sep 2015 15:27:37 -0700
Subject: [PATCH 2349/4742] [ruby] Add `until` to indentWords list

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

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 771f855abf..089a971d4b 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -25,7 +25,7 @@ CodeMirror.defineMode("ruby", function(config) {
     "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
     "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
   ]);
-  var indentWords = wordObj(["def", "class", "case", "for", "while", "module", "then",
+  var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
                              "catch", "loop", "proc", "begin"]);
   var dedentWords = wordObj(["end", "until"]);
   var matching = {"[": "]", "{": "}", "(": ")"};

From 08df099e713d1ef97f0205807b098dfad325b561 Mon Sep 17 00:00:00 2001
From: melpon <melt@e-ml.jp>
Date: Sat, 19 Sep 2015 22:36:18 +0900
Subject: [PATCH 2350/4742] [clike mode] Syntax highliting for C++14 numeric
 literals.

In C++14, the single-quote character may be used arbitrarily
as a digit separator in numeric literals.
---
 mode/clike/clike.js | 15 +++++++++++++++
 mode/clike/test.js  |  9 +++++++++
 2 files changed, 24 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index e13b79c14c..50f1ea7348 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -266,6 +266,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return false;
   }
 
+  function cpp14Literal(stream) {
+    stream.eatWhile(/[\w\.']/);
+    return "number";
+  }
+
   function cpp11StringHook(stream, state) {
     stream.backUp(1);
     // Raw strings.
@@ -373,6 +378,16 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "U": cpp11StringHook,
       "L": cpp11StringHook,
       "R": cpp11StringHook,
+      "0": cpp14Literal,
+      "1": cpp14Literal,
+      "2": cpp14Literal,
+      "3": cpp14Literal,
+      "4": cpp14Literal,
+      "5": cpp14Literal,
+      "6": cpp14Literal,
+      "7": cpp14Literal,
+      "8": cpp14Literal,
+      "9": cpp14Literal,
       token: function(stream, state, style) {
         if (style == "variable" && stream.peek() == "(" &&
             (state.prevToken == ";" || state.prevToken == null ||
diff --git a/mode/clike/test.js b/mode/clike/test.js
index 79b006de4a..c84d22e185 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -30,4 +30,13 @@
      "  [keyword for] (;;)",
      "    [variable x][operator ++];",
      "[keyword return];");
+
+  var mode_cpp = CodeMirror.getMode({indentUnit: 2}, "text/x-c++src");
+  function MTCPP(name) { test.mode(name, mode_cpp, Array.prototype.slice.call(arguments, 1)); }
+
+  MTCPP("cpp14_literal",
+    "[number 10'000];",
+    "[number 0b10'000];",
+    "[number 0x10'000];",
+    "[string '100000'];");
 })();

From 9f149ba3e97a174487f22bac873a422104239703 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 13:45:23 +0200
Subject: [PATCH 2351/4742] [haxe mode] Don't match start of ... as decimal dot

Issue #3542
---
 mode/haxe/haxe.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 4fcbf075be..73cd6213ac 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -66,7 +66,7 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
     } else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
-      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
+      stream.match(/^\d*(?:\.\d*(?!\.))?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");
     } else if (state.reAllowed && (ch == "~" && stream.eat(/\//))) {
       toUnescaped(stream, "/");

From 5e34e117d44bd7e33018f58fef2c8cde2124c720 Mon Sep 17 00:00:00 2001
From: Dave Brondsema <dbrondsema@slashdotmedia.com>
Date: Thu, 3 Sep 2015 19:23:36 +0000
Subject: [PATCH 2352/4742] [markdown mode] Support an option for tildes as
 code fences.  Allow more than 3 `s or ~s

---
 mode/gfm/gfm.js           |  6 ++---
 mode/gfm/test.js          |  5 ++++
 mode/markdown/markdown.js | 31 +++++++++++++++++--------
 mode/markdown/test.js     | 48 +++++++++++++++++++++++++++++++++++++--
 4 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index fe65a3780a..6e74ad4fd6 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -39,7 +39,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
 
       // Hack to prevent formatting override inside code blocks (block and inline)
       if (state.codeBlock) {
-        if (stream.match(/^```/)) {
+        if (stream.match(/^```+/)) {
           state.codeBlock = false;
           return null;
         }
@@ -49,7 +49,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
       if (stream.sol()) {
         state.code = false;
       }
-      if (stream.sol() && stream.match(/^```/)) {
+      if (stream.sol() && stream.match(/^```+/)) {
         stream.skipToEnd();
         state.codeBlock = true;
         return null;
@@ -115,7 +115,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var markdownConfig = {
     underscoresBreakWords: false,
     taskLists: true,
-    fencedCodeBlocks: true,
+    fencedCodeBlocks: '```',
     strikethrough: true
   };
   for (var attr in modeConfig) {
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 3a644c741a..0dcd3619a3 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -51,6 +51,11 @@
      "[comment ```]",
      "bar");
 
+  MT("fencedCodeBlocksNoTildes",
+     "~~~",
+     "foo",
+     "~~~");
+
   MT("taskListAsterisk",
      "[variable-2 * []] foo]", // Invalid; must have space or x between []
      "[variable-2 * [ ]]bar]", // Invalid; must have space after ]
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 5cce40a76d..e89f4e4ae3 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -39,8 +39,16 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.underscoresBreakWords === undefined)
     modeCfg.underscoresBreakWords = true;
 
-  // Turn on fenced code blocks? ("```" to start/end)
-  if (modeCfg.fencedCodeBlocks === undefined) modeCfg.fencedCodeBlocks = false;
+  // Turn on fenced code blocks? ("```" or "~~~" to start/end).
+  // Set to true to enable either format, per CommonMark.
+  // To limit to one type of code block, provide the simple regex text.  Examples:
+  //   '```'
+  //   '```+'
+  //   '~~~~'
+  if (modeCfg.fencedCodeBlocks === undefined)
+    modeCfg.fencedCodeBlocks = false;
+  if (modeCfg.fencedCodeBlocks === true)
+    modeCfg.fencedCodeBlocks = '~~~+|```+';
 
   // Turn on task lists? ("- [ ] " and "- [x] ")
   if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
@@ -74,7 +82,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
-  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/;
+  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
+  ,   fencedCodeRE = new RegExp('^(' + modeCfg.fencedCodeBlocks + ')[ \\t]*([\\w+#]*)');
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -192,9 +201,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = state.inline;
       if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
       return getType(state);
-    } else if (modeCfg.fencedCodeBlocks && stream.match(/^```[ \t]*([\w+#]*)/, true)) {
+    } else if (modeCfg.fencedCodeBlocks && stream.match(fencedCodeRE, true)) {
+      state.fencedChars = RegExp.$1;
       // try switching mode
-      state.localMode = getMode(RegExp.$1);
+      state.localMode = getMode(RegExp.$2);
       if (state.localMode) state.localState = state.localMode.startState();
       state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
@@ -218,7 +228,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function local(stream, state) {
-    if (stream.sol() && stream.match("```", false)) {
+    if (stream.sol() && state.fencedChars && stream.match(state.fencedChars, false)) {
       state.localMode = state.localState = null;
       state.f = state.block = leavingLocal;
       return null;
@@ -231,9 +241,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function leavingLocal(stream, state) {
-    stream.match("```");
+    stream.match(state.fencedChars);
     state.block = blockNormal;
     state.f = inlineNormal;
+    state.fencedChars = null;
     if (modeCfg.highlightFormatting) state.formatting = "code-block";
     state.code = true;
     var returnType = getType(state);
@@ -685,7 +696,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         quote: 0,
         trailingSpace: 0,
         trailingSpaceNewLine: false,
-        strikethrough: false
+        strikethrough: false,
+        fencedChars: null
       };
     },
 
@@ -720,7 +732,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         indentedCode: s.indentedCode,
         trailingSpace: s.trailingSpace,
         trailingSpaceNewLine: s.trailingSpaceNewLine,
-        md_inside: s.md_inside
+        md_inside: s.md_inside,
+        fencedChars: s.fencedChars
       };
     },
 
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index a177f5b2dd..78b6c685af 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -8,6 +8,8 @@
   function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
   var modeAtxNoSpace = CodeMirror.getMode({tabSize: 4}, {name: "markdown", allowAtxHeaderWithoutSpace: true});
   function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); }
+  var modeFenced = CodeMirror.getMode({tabSize: 4}, {name: "markdown", fencedCodeBlocks: true});
+  function FencedTest(name) { test.mode(name, modeFenced, Array.prototype.slice.call(arguments, 1)); }
 
   FT("formatting_emAsterisk",
      "[em&formatting&formatting-em *][em foo][em&formatting&formatting-em *]");
@@ -778,10 +780,52 @@
   MT("taskList",
      "[variable-2 * [ ]] bar]");
 
-  MT("fencedCodeBlocks",
+  MT("noFencedCodeBlocks",
+     "~~~",
+     "foo",
+     "~~~");
+
+  FencedTest("fencedCodeBlocks",
+     "[comment ```]",
+     "[comment foo]",
+     "[comment ```]",
+     "bar");
+
+  FencedTest("fencedCodeBlocksMultipleChars",
+     "[comment `````]",
+     "[comment foo]",
+     "[comment ```]",
+     "[comment foo]",
+     "[comment `````]",
+     "bar");
+
+  FencedTest("fencedCodeBlocksTildes",
+     "[comment ~~~]",
+     "[comment foo]",
+     "[comment ~~~]",
+     "bar");
+
+  FencedTest("fencedCodeBlocksTildesMultipleChars",
+     "[comment ~~~~~]",
+     "[comment ~~~]",
+     "[comment foo]",
+     "[comment ~~~~~]",
+     "bar");
+
+  FencedTest("fencedCodeBlocksMultipleChars",
+     "[comment `````]",
+     "[comment foo]",
+     "[comment ```]",
+     "[comment foo]",
+     "[comment `````]",
+     "bar");
+
+  FencedTest("fencedCodeBlocksMixed",
+     "[comment ~~~]",
      "[comment ```]",
      "[comment foo]",
-     "[comment ```]");
+     "[comment ~~~]",
+     "bar");
 
   // Tests that require XML mode
 

From 6dc095ad8ae0076a80f5fe81d201167079bc1a2c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 14:06:15 +0200
Subject: [PATCH 2353/4742] [markdown mode] Tighten up reading of
 fencedCodeBlocks option

Issue #3496
---
 mode/markdown/markdown.js | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index e89f4e4ae3..9d40368180 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -39,16 +39,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.underscoresBreakWords === undefined)
     modeCfg.underscoresBreakWords = true;
 
-  // Turn on fenced code blocks? ("```" or "~~~" to start/end).
-  // Set to true to enable either format, per CommonMark.
-  // To limit to one type of code block, provide the simple regex text.  Examples:
-  //   '```'
-  //   '```+'
-  //   '~~~~'
-  if (modeCfg.fencedCodeBlocks === undefined)
-    modeCfg.fencedCodeBlocks = false;
-  if (modeCfg.fencedCodeBlocks === true)
-    modeCfg.fencedCodeBlocks = '~~~+|```+';
+  // Use `fencedCodeBlocks` to configure fenced code blocks. false to
+  // disable, string to specify a precise regexp that the fence should
+  // match, and true to allow three or more backticks or tildes (as
+  // per CommonMark).
 
   // Turn on task lists? ("- [ ] " and "- [x] ")
   if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
@@ -83,7 +77,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
-  ,   fencedCodeRE = new RegExp('^(' + modeCfg.fencedCodeBlocks + ')[ \\t]*([\\w+#]*)');
+  ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
+                                ")[ \\t]*([\\w+#]*)");
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -201,10 +196,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = state.inline;
       if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
       return getType(state);
-    } else if (modeCfg.fencedCodeBlocks && stream.match(fencedCodeRE, true)) {
-      state.fencedChars = RegExp.$1;
+    } else if (modeCfg.fencedCodeBlocks && (match = stream.match(fencedCodeRE, true))) {
+      state.fencedChars = match[1]
       // try switching mode
-      state.localMode = getMode(RegExp.$2);
+      state.localMode = getMode(match[2]);
       if (state.localMode) state.localState = state.localMode.startState();
       state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";

From d47c918fd7452522f602d9979b1929c1e699cf16 Mon Sep 17 00:00:00 2001
From: sverweij <sverweij@users.noreply.github.com>
Date: Thu, 10 Sep 2015 21:48:07 +0200
Subject: [PATCH 2354/4742] [mscgen mode] Add

---
 mode/meta.js                   |   5 +-
 mode/mscgen/index.html         |  53 ++++++++++
 mode/mscgen/index_msgenny.html |  44 ++++++++
 mode/mscgen/index_xu.html      |  70 +++++++++++++
 mode/mscgen/mscgen.js          | 186 +++++++++++++++++++++++++++++++++
 mode/mscgen/mscgen_test.js     |  75 +++++++++++++
 mode/mscgen/msgenny_test.js    |  71 +++++++++++++
 mode/mscgen/xu_test.js         |  75 +++++++++++++
 test/index.html                |   4 +
 9 files changed, 582 insertions(+), 1 deletion(-)
 create mode 100644 mode/mscgen/index.html
 create mode 100644 mode/mscgen/index_msgenny.html
 create mode 100644 mode/mscgen/index_xu.html
 create mode 100644 mode/mscgen/mscgen.js
 create mode 100644 mode/mscgen/mscgen_test.js
 create mode 100644 mode/mscgen/msgenny_test.js
 create mode 100644 mode/mscgen/xu_test.js

diff --git a/mode/meta.js b/mode/meta.js
index 55f11da8b6..6e82fad6c3 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -145,7 +145,10 @@
     {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
     {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
-    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]}
+    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
+    {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
+    {name: "xu", mime: "text/x-xu", mode: "xu", ext: ["xu"]},
+    {name: "msgenny", mime: "text/x-msgenny", mode: "msgenny", ext: ["msgenny"]}
   ];
   // Ensure all modes have a mime property for backwards compatibility
   for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
diff --git a/mode/mscgen/index.html b/mode/mscgen/index.html
new file mode 100644
index 0000000000..a97b6c8321
--- /dev/null
+++ b/mode/mscgen/index.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: mscgen mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="mscgen.js"></script>
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+  </head>
+  <body>
+    <h1>CodeMirror: MscGen mode</h1>
+
+<div><textarea id="code">
+# Sample mscgen program
+# See http://www.mcternan.me.uk/mscgen or 
+# https://sverweij.github.io/mscgen_js for more samples
+
+msc {
+  # options
+  hscale="1.2";
+
+  # entities/ lifelines
+  a [label="Entity A"],
+  b [label="Entity B", linecolor="red", arclinecolor="red", textbgcolor="pink"],
+  c [label="Entity C"];
+
+  # arcs/ messages
+  a => c [label="doSomething(args)"];
+  b => c [label="doSomething(args)"];
+  c >> * [label="everyone asked me", arcskip="1"];
+  c =>> c [label="doing something"];
+  c -x * [label="report back", arcskip="1"];
+  |||;
+  --- [label="shows's over, however ..."];
+  b => a [label="did you see c doing something?"];
+  a -> b [label="nope"];
+  b :> a [label="shall we ask again?"];
+  a => b [label="naah"];
+  ...;
+}
+</textarea></div>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "mscgen",
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-mscgen</code></p>
+  </body>
+</html>
diff --git a/mode/mscgen/index_msgenny.html b/mode/mscgen/index_msgenny.html
new file mode 100644
index 0000000000..1664f3051e
--- /dev/null
+++ b/mode/mscgen/index_msgenny.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: msgenny mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="mscgen.js"></script>
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+  </head>
+  <body>
+    <h1>CodeMirror: msgenny mode</h1>
+
+<div><textarea id="code">
+# Sample msgenny program
+# https://sverweij.github.io/mscgen_js for more samples
+
+a -> b   : a -> b  (signal);
+a => b   : a => b  (method);
+b >> a   : b >> a  (return value);
+a =>> b  : a =>> b (callback);
+a -x b   : a -x b  (lost);
+a :> b   : a :> b  (emphasis);
+a .. b   : a .. b  (dotted);
+a -- b   : "a -- b straight line";
+a note a : a note a\n(note),
+b box b  : b box b\n(action);
+a rbox a : a rbox a\n(reference),
+b abox b : b abox b\n(state/ condition);
+|||      : ||| (empty row);
+...      : ... (omitted row);
+---      : --- (comment);
+</textarea></div>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "msgenny",
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-msgenny</code></p>
+  </body>
+</html>
diff --git a/mode/mscgen/index_xu.html b/mode/mscgen/index_xu.html
new file mode 100644
index 0000000000..2f7bf9ec04
--- /dev/null
+++ b/mode/mscgen/index_xu.html
@@ -0,0 +1,70 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: xu mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="mscgen.js"></script>
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+  </head>
+  <body>
+    <h1>CodeMirror: xù mode</h1>
+
+<div><textarea id="code">
+# test50 - expansions to mscgen to support inline expressions
+#          for now in a separate language: xù
+msc {
+
+  hscale="0.8",
+  width="700";
+
+  a,
+  b [label="change store"],
+  c,
+  d [label="necro queue"],
+  e [label="natalis queue"],
+  f;
+
+  a =>> b [label="get change list()"];
+  a alt f [label="changes found"] { /* alt is a xu specific keyword*/
+    b >> a [label="list of changes"];
+    a =>> c [label="cull old stuff (list of changes)"];
+    b loop e [label="for each change"] { // loop is xu specific as well...
+      /*
+       * Here interesting stuff happens.
+       * TBD
+       */
+      c =>> b [label="get change()"];
+      b >> c [label="change"];
+      c alt e [label="change too old"] {
+        c =>> d [label="queue(change)"];
+        --- [label="change newer than latest run"];
+        c =>> e [label="queue(change)"];
+        --- [label="all other cases"];
+        ||| [label="leave well alone"];
+      };
+    };
+    
+    
+    c >> a [label="done
+    processing"];
+    
+    /* shucks! nothing found ...*/
+    --- [label="nothing found"];
+    b >> a [label="nothing"];
+    a note a [label="silent exit"];
+  };
+}
+</textarea></div>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "xu",
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-xu</code></p>
+  </body>
+</html>
diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
new file mode 100644
index 0000000000..090a208a78
--- /dev/null
+++ b/mode/mscgen/mscgen.js
@@ -0,0 +1,186 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// mode(s) for the sequence chart dsl's mscgen, xù and msgenny
+// For more information on mscgen, see the site of the original author:
+// http://www.mcternan.me.uk/mscgen
+//
+// This mode for mscgen and the two derivative languages were
+// originally made for use in the mscgen_js interpreter
+// (https://sverweij.github.io/mscgen_js)
+
+(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("mscgen", function() {
+    return {
+      startState : startStateFn,
+      copyState : copyStateFn,
+      token : produceTokenFunction({
+        "keywords" : ["msc"],
+        "options" : ["hscale", "width", "arcgradient", "wordwraparcs"],
+        "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
+        "brackets" : ["\\{", "\\}"], // [ and  ] are brackets too, but these get handled in with lists
+        "arcsWords" : ["note", "abox", "rbox", "box"],
+        "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
+        "singlecomment" : ["//", "#"],
+        "operators" : ["="]
+      }),
+      lineComment : "#",
+      blockCommentStart : "/*",
+      blockCommentEnd : "*/"
+    };
+  });
+  CodeMirror.defineMIME("text/x-mscgen", "mscgen");
+
+  CodeMirror.defineMode("xu", function() {
+    return {
+      startState : startStateFn,
+      copyState : copyStateFn,
+      token : produceTokenFunction({
+        "keywords" : ["msc"],
+        "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+        "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
+        "brackets" : ["\\{", "\\}"],  // [ and  ] are brackets too, but these get handled in with lists
+        "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
+        "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
+        "singlecomment" : ["//", "#"],
+        "operators" : ["="]
+      }),
+      lineComment : "#",
+      blockCommentStart : "/*",
+      blockCommentEnd : "*/"
+    };
+  });
+  CodeMirror.defineMIME("text/x-xu", "xu");
+
+  CodeMirror.defineMode("msgenny", function() {
+    return {
+      startState : startStateFn,
+      copyState : copyStateFn,
+      token : produceTokenFunction({
+        "keywords" : null,
+        "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+        "attributes" : null,
+        "brackets" : ["\\{", "\\}"],
+        "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
+        "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
+        "singlecomment" : ["//", "#"],
+        "operators" : ["="]
+      }),
+      lineComment : "#",
+      blockCommentStart : "/*",
+      blockCommentEnd : "*/"
+
+    };
+  });
+  CodeMirror.defineMIME("text/x-msgenny", "msgenny");
+
+  function wordRegexpBoundary(pWords) {
+    return new RegExp("\\b((" + pWords.join(")|(") + "))\\b", "i");
+  }
+
+  function wordRegexp(pWords) {
+    return new RegExp("((" + pWords.join(")|(") + "))", "i");
+  }
+
+  function startStateFn() {
+    return {
+      inComment : false,
+      inString : false,
+      inAttributeList : false,
+      inScript : false
+    };
+  }
+
+  function copyStateFn(pState) {
+    return {
+      inComment : pState.inComment,
+      inString : pState.inString,
+      inAttributeList : pState.inAttributeList,
+      inScript : pState.inScript
+    };
+  }
+
+  function produceTokenFunction(pConfig) {
+
+    return function(pStream, pState) {
+      if (pStream.match(wordRegexp(pConfig.brackets), true, true)) {
+        return "bracket";
+      }
+      /* comments */
+      if (!pState.inComment) {
+        if (pStream.match(/\/\*[^\*\/]*/, true, true)) {
+          pState.inComment = true;
+          return "comment";
+        }
+        if (pStream.match(wordRegexp(pConfig.singlecomment), true, true)) {
+          pStream.skipToEnd();
+          return "comment";
+        }
+      }
+      if (pState.inComment) {
+        if (pStream.match(/[^\*\/]*\*\//, true, true)) {
+          pState.inComment = false;
+        } else {
+          pStream.skipToEnd();
+        }
+        return "comment";
+      }
+      /* strings */
+      if (!pState.inString && pStream.match(/\"(\\\"|[^\"])*/, true, true)) {
+        pState.inString = true;
+        return "string";
+      }
+      if (pState.inString) {
+        if (pStream.match(/[^\"]*\"/, true, true)) {
+          pState.inString = false;
+        } else {
+          pStream.skipToEnd();
+        }
+        return "string";
+      }
+      /* keywords & operators */
+      if (!!pConfig.keywords && pStream.match(wordRegexpBoundary(pConfig.keywords), true, true)) {
+        return "keyword";
+      }
+      if (pStream.match(wordRegexpBoundary(pConfig.options), true, true)) {
+        return "keyword";
+      }
+      if (pStream.match(wordRegexpBoundary(pConfig.arcsWords), true, true)) {
+        return "keyword";
+      }
+      if (pStream.match(wordRegexp(pConfig.arcsOthers), true, true)) {
+        return "keyword";
+      }
+      if (!!pConfig.operators && pStream.match(wordRegexp(pConfig.operators), true, true)) {
+        return "operator";
+      }
+      /* attribute lists */
+      if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match(/\[/, true, true)) {
+        pConfig.inAttributeList = true;
+        return "bracket";
+      }
+      if (pConfig.inAttributeList) {
+        if (pConfig.attributes !== null && pStream.match(wordRegexpBoundary(pConfig.attributes), true, true)) {
+          return "attribute";
+        }
+        if (pStream.match(/]/, true, true)) {
+          pConfig.inAttributeList = false;
+          return "bracket";
+        }
+      }
+
+      pStream.next();
+      return "base";
+    };
+  }
+
+});
diff --git a/mode/mscgen/mscgen_test.js b/mode/mscgen/mscgen_test.js
new file mode 100644
index 0000000000..e319a3997e
--- /dev/null
+++ b/mode/mscgen/mscgen_test.js
@@ -0,0 +1,75 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "mscgen");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("empty chart",
+     "[keyword msc][bracket {]",
+     "[base   ]",
+     "[bracket }]"
+   );
+
+  MT("comments",
+    "[comment // a single line comment]",
+    "[comment # another  single line comment /* and */ ignored here]",
+    "[comment /* A multi-line comment even though it contains]",
+    "[comment msc keywords and \"quoted text\"*/]");
+
+  MT("strings",
+    "[string \"// a string\"]",
+    "[string \"a string running over]",
+    "[string two lines\"]",
+    "[string \"with \\\"escaped quote\"]"
+  );
+
+  MT("xù/ msgenny keywords classify as 'base'",
+    "[base watermark]",
+    "[base alt loop opt ref else break par seq assert]"
+  );
+
+  MT("mscgen options classify as keyword",
+    "[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
+  );
+
+  MT("mscgen arcs classify as keyword",
+    "[keyword note]","[keyword abox]","[keyword rbox]","[keyword box]",
+    "[keyword |||...---]", "[keyword ..--==::]",
+    "[keyword ->]", "[keyword <-]", "[keyword <->]",
+    "[keyword =>]", "[keyword <=]", "[keyword <=>]",
+    "[keyword =>>]", "[keyword <<=]", "[keyword <<=>>]",
+    "[keyword >>]", "[keyword <<]", "[keyword <<>>]",
+    "[keyword -x]", "[keyword x-]", "[keyword -X]", "[keyword X-]",
+    "[keyword :>]", "[keyword <:]", "[keyword <:>]"
+  );
+
+  MT("within an attribute list, attributes classify as attribute",
+    "[bracket [[][attribute label]",
+    "[attribute id]","[attribute url]","[attribute idurl]",
+    "[attribute linecolor]","[attribute linecolour]","[attribute textcolor]","[attribute textcolour]","[attribute textbgcolor]","[attribute textbgcolour]",
+    "[attribute arclinecolor]","[attribute arclinecolour]","[attribute arctextcolor]","[attribute arctextcolour]","[attribute arctextbgcolor]","[attribute arctextbgcolour]",
+    "[attribute arcskip][bracket ]]]"
+  );
+
+  MT("outside an attribute list, attributes classify as base",
+    "[base label]",
+    "[base id]","[base url]","[base idurl]",
+    "[base linecolor]","[base linecolour]","[base textcolor]","[base textcolour]","[base textbgcolor]","[base textbgcolour]",
+    "[base arclinecolor]","[base arclinecolour]","[base arctextcolor]","[base arctextcolour]","[base arctextbgcolor]","[base arctextbgcolour]",
+    "[base arcskip]"
+  );
+
+  MT("a typical program",
+    "[comment # typical mscgen program]",
+    "[keyword msc][base  ][bracket {]",
+    "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][keyword arcgradient][operator =][base 30;]",
+    "[base   a][bracket [[][attribute label][operator =][string \"Entity A\"][bracket ]]][base ,]",
+    "[base   b][bracket [[][attribute label][operator =][string \"Entity B\"][bracket ]]][base ,]",
+    "[base   c][bracket [[][attribute label][operator =][string \"Entity C\"][bracket ]]][base ;]",
+    "[base   a ][keyword =>>][base  b][bracket [[][attribute label][operator =][string \"Hello entity B\"][bracket ]]][base ;]",
+    "[base   a ][keyword <<][base  b][bracket [[][attribute label][operator =][string \"Here's an answer dude!\"][bracket ]]][base ;]",
+    "[base   c ][keyword :>][base  *][bracket [[][attribute label][operator =][string \"What about me?\"][base , ][attribute textcolor][operator =][base red][bracket ]]][base ;]",
+    "[bracket }]"
+  );
+})();
diff --git a/mode/mscgen/msgenny_test.js b/mode/mscgen/msgenny_test.js
new file mode 100644
index 0000000000..6e9ab16535
--- /dev/null
+++ b/mode/mscgen/msgenny_test.js
@@ -0,0 +1,71 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "msgenny");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("comments",
+    "[comment // a single line comment]",
+    "[comment # another  single line comment /* and */ ignored here]",
+    "[comment /* A multi-line comment even though it contains]",
+    "[comment msc keywords and \"quoted text\"*/]");
+
+  MT("strings",
+    "[string \"// a string\"]",
+    "[string \"a string running over]",
+    "[string two lines\"]",
+    "[string \"with \\\"escaped quote\"]"
+  );
+
+  MT("xù/ msgenny keywords classify as 'keyword'",
+    "[keyword watermark]",
+    "[keyword alt]","[keyword loop]","[keyword opt]","[keyword ref]","[keyword else]","[keyword break]","[keyword par]","[keyword seq]","[keyword assert]"
+  );
+
+  MT("mscgen options classify as keyword",
+    "[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
+  );
+
+  MT("mscgen arcs classify as keyword",
+    "[keyword note]","[keyword abox]","[keyword rbox]","[keyword box]",
+    "[keyword |||...---]", "[keyword ..--==::]",
+    "[keyword ->]", "[keyword <-]", "[keyword <->]",
+    "[keyword =>]", "[keyword <=]", "[keyword <=>]",
+    "[keyword =>>]", "[keyword <<=]", "[keyword <<=>>]",
+    "[keyword >>]", "[keyword <<]", "[keyword <<>>]",
+    "[keyword -x]", "[keyword x-]", "[keyword -X]", "[keyword X-]",
+    "[keyword :>]", "[keyword <:]", "[keyword <:>]"
+  );
+
+  MT("within an attribute list, mscgen/ xù attributes classify as base",
+    "[base [[label]",
+    "[base idurl id url]",
+    "[base linecolor linecolour textcolor textcolour textbgcolor textbgcolour]",
+    "[base arclinecolor arclinecolour arctextcolor arctextcolour arctextbgcolor arctextbgcolour]",
+    "[base arcskip]]]"
+  );
+
+  MT("outside an attribute list, mscgen/ xù attributes classify as base",
+    "[base label]",
+    "[base idurl id url]",
+    "[base linecolor linecolour textcolor textcolour textbgcolor textbgcolour]",
+    "[base arclinecolor arclinecolour arctextcolor arctextcolour arctextbgcolor arctextbgcolour]",
+    "[base arcskip]"
+  );
+
+  MT("a typical program",
+    "[comment # typical msgenny program]",
+    "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30;]",
+    "[base   a : ][string \"Entity A\"][base ,]",
+    "[base   b : Entity B,]",
+    "[base   c : Entity C;]",
+    "[base   a ][keyword =>>][base  b: ][string \"Hello entity B\"][base ;]",
+    "[base   a ][keyword alt][base  c][bracket {]",
+    "[base     a ][keyword <<][base  b: ][string \"Here's an answer dude!\"][base ;]",
+    "[keyword ---][base : ][string \"sorry, won't march - comm glitch\"]",
+    "[base     a ][keyword x-][base  b: ][string \"Here's an answer dude! (won't arrive...)\"][base ;]",
+    "[bracket }]",
+    "[base   c ][keyword :>][base  *: What about me?;]"
+  );
+})();
diff --git a/mode/mscgen/xu_test.js b/mode/mscgen/xu_test.js
new file mode 100644
index 0000000000..ada8dd1046
--- /dev/null
+++ b/mode/mscgen/xu_test.js
@@ -0,0 +1,75 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "xu");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("empty chart",
+     "[keyword msc][bracket {]",
+     "[base   ]",
+     "[bracket }]"
+   );
+
+  MT("comments",
+    "[comment // a single line comment]",
+    "[comment # another  single line comment /* and */ ignored here]",
+    "[comment /* A multi-line comment even though it contains]",
+    "[comment msc keywords and \"quoted text\"*/]");
+
+  MT("strings",
+    "[string \"// a string\"]",
+    "[string \"a string running over]",
+    "[string two lines\"]",
+    "[string \"with \\\"escaped quote\"]"
+  );
+
+  MT("xù/ msgenny keywords classify as 'keyword'",
+    "[keyword watermark]",
+    "[keyword alt]","[keyword loop]","[keyword opt]","[keyword ref]","[keyword else]","[keyword break]","[keyword par]","[keyword seq]","[keyword assert]"
+  );
+
+  MT("mscgen options classify as keyword",
+    "[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
+  );
+
+  MT("mscgen arcs classify as keyword",
+    "[keyword note]","[keyword abox]","[keyword rbox]","[keyword box]",
+    "[keyword |||...---]", "[keyword ..--==::]",
+    "[keyword ->]", "[keyword <-]", "[keyword <->]",
+    "[keyword =>]", "[keyword <=]", "[keyword <=>]",
+    "[keyword =>>]", "[keyword <<=]", "[keyword <<=>>]",
+    "[keyword >>]", "[keyword <<]", "[keyword <<>>]",
+    "[keyword -x]", "[keyword x-]", "[keyword -X]", "[keyword X-]",
+    "[keyword :>]", "[keyword <:]", "[keyword <:>]"
+  );
+
+  MT("within an attribute list, attributes classify as attribute",
+    "[bracket [[][attribute label]",
+    "[attribute id]","[attribute url]","[attribute idurl]",
+    "[attribute linecolor]","[attribute linecolour]","[attribute textcolor]","[attribute textcolour]","[attribute textbgcolor]","[attribute textbgcolour]",
+    "[attribute arclinecolor]","[attribute arclinecolour]","[attribute arctextcolor]","[attribute arctextcolour]","[attribute arctextbgcolor]","[attribute arctextbgcolour]",
+    "[attribute arcskip][bracket ]]]"
+  );
+
+  MT("outside an attribute list, attributes classify as base",
+    "[base label]",
+    "[base id]","[base url]","[base idurl]",
+    "[base linecolor]","[base linecolour]","[base textcolor]","[base textcolour]","[base textbgcolor]","[base textbgcolour]",
+    "[base arclinecolor]","[base arclinecolour]","[base arctextcolor]","[base arctextcolour]","[base arctextbgcolor]","[base arctextbgcolour]",
+    "[base arcskip]"
+  );
+
+  MT("a typical program",
+    "[comment # typical mscgen program]",
+    "[keyword msc][base  ][bracket {]",
+    "[keyword wordwraparcs][operator =][string \"true\"][keyword hscale][operator =][string \"0.8\"][keyword arcgradient][operator =][base 30;]",
+    "[base   a][bracket [[][attribute label][operator =][string \"Entity A\"][bracket ]]][base ,]",
+    "[base   b][bracket [[][attribute label][operator =][string \"Entity B\"][bracket ]]][base ,]",
+    "[base   c][bracket [[][attribute label][operator =][string \"Entity C\"][bracket ]]][base ;]",
+    "[base   a ][keyword =>>][base  b][bracket [[][attribute label][operator =][string \"Hello entity B\"][bracket ]]][base ;]",
+    "[base   a ][keyword <<][base  b][bracket [[][attribute label][operator =][string \"Here's an answer dude!\"][bracket ]]][base ;]",
+    "[base   c ][keyword :>][base  *][bracket [[][attribute label][operator =][string \"What about me?\"][base , ][attribute textcolor][operator =][base red][bracket ]]][base ;]",
+    "[bracket }]"
+  );
+})();
diff --git a/test/index.html b/test/index.html
index 23d3fa5e57..b0b1fa976b 100644
--- a/test/index.html
+++ b/test/index.html
@@ -38,6 +38,7 @@
 <script src="../keymap/sublime.js"></script>
 <script src="../keymap/vim.js"></script>
 <script src="../mode/rust/rust.js"></script>
+<script src="../mode/mscgen/mscgen.js"></script>
 
 <style type="text/css">
   .ok {color: #090;}
@@ -117,6 +118,9 @@ <h2>Test Suite</h2>
     <script src="../mode/xml/test.js"></script>
     <script src="../mode/xquery/test.js"></script>
     <script src="../mode/rust/test.js"></script>
+    <script src="../mode/mscgen/mscgen_test.js"></script>
+    <script src="../mode/mscgen/xu_test.js"></script>
+    <script src="../mode/mscgen/msgenny_test.js"></script>
     <script src="../addon/mode/multiplex_test.js"></script>
     <script src="emacs_test.js"></script>
     <script src="sql-hint-test.js"></script>

From 9016ae38f5e208158022bde9cfa9bc7bac2c9781 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 14:30:10 +0200
Subject: [PATCH 2355/4742] [mscgen mode] Integrate, move under single mode
 name

So that the xu/msgenny modes can be dynamically loaded from meta.js

Issue #3523
---
 doc/compress.html           |   1 +
 mode/meta.js                |   4 +-
 mode/mscgen/mscgen.js       | 125 ++++++++++++++++--------------------
 mode/mscgen/msgenny_test.js |   4 +-
 mode/mscgen/xu_test.js      |   4 +-
 5 files changed, 61 insertions(+), 77 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 335a025917..16eab1ba15 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -161,6 +161,7 @@ <h2>Script compression helper</h2>
           <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/mscgen/mscgen.js">mscgen.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>
diff --git a/mode/meta.js b/mode/meta.js
index 6e82fad6c3..3a14dfc588 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -147,8 +147,8 @@
     {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
     {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
     {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
-    {name: "xu", mime: "text/x-xu", mode: "xu", ext: ["xu"]},
-    {name: "msgenny", mime: "text/x-msgenny", mode: "msgenny", ext: ["msgenny"]}
+    {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
+    {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
   ];
   // Ensure all modes have a mime property for backwards compatibility
   for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
index 090a208a78..3cf4eb0897 100644
--- a/mode/mscgen/mscgen.js
+++ b/mode/mscgen/mscgen.js
@@ -19,69 +19,54 @@
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineMode("mscgen", function() {
-    return {
-      startState : startStateFn,
-      copyState : copyStateFn,
-      token : produceTokenFunction({
-        "keywords" : ["msc"],
-        "options" : ["hscale", "width", "arcgradient", "wordwraparcs"],
-        "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
-        "brackets" : ["\\{", "\\}"], // [ and  ] are brackets too, but these get handled in with lists
-        "arcsWords" : ["note", "abox", "rbox", "box"],
-        "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
-        "singlecomment" : ["//", "#"],
-        "operators" : ["="]
-      }),
-      lineComment : "#",
-      blockCommentStart : "/*",
-      blockCommentEnd : "*/"
-    };
-  });
-  CodeMirror.defineMIME("text/x-mscgen", "mscgen");
+  var languages = {
+    mscgen: {
+      "keywords" : ["msc"],
+      "options" : ["hscale", "width", "arcgradient", "wordwraparcs"],
+      "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
+      "brackets" : ["\\{", "\\}"], // [ and  ] are brackets too, but these get handled in with lists
+      "arcsWords" : ["note", "abox", "rbox", "box"],
+      "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
+      "singlecomment" : ["//", "#"],
+      "operators" : ["="]
+    },
+    xu: {
+      "keywords" : ["msc"],
+      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+      "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
+      "brackets" : ["\\{", "\\}"],  // [ and  ] are brackets too, but these get handled in with lists
+      "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
+      "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
+      "singlecomment" : ["//", "#"],
+      "operators" : ["="]
+    },
+    msgenny: {
+      "keywords" : null,
+      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+      "attributes" : null,
+      "brackets" : ["\\{", "\\}"],
+      "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
+      "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
+      "singlecomment" : ["//", "#"],
+      "operators" : ["="]
+    }
+  }
 
-  CodeMirror.defineMode("xu", function() {
+  CodeMirror.defineMode("mscgen", function(_, modeConfig) {
+    var language = languages[modeConfig && modeConfig.language || "mscgen"]
     return {
-      startState : startStateFn,
-      copyState : copyStateFn,
-      token : produceTokenFunction({
-        "keywords" : ["msc"],
-        "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
-        "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
-        "brackets" : ["\\{", "\\}"],  // [ and  ] are brackets too, but these get handled in with lists
-        "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
-        "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
-        "singlecomment" : ["//", "#"],
-        "operators" : ["="]
-      }),
+      startState: startStateFn,
+      copyState: copyStateFn,
+      token: produceTokenFunction(language),
       lineComment : "#",
       blockCommentStart : "/*",
       blockCommentEnd : "*/"
     };
   });
-  CodeMirror.defineMIME("text/x-xu", "xu");
 
-  CodeMirror.defineMode("msgenny", function() {
-    return {
-      startState : startStateFn,
-      copyState : copyStateFn,
-      token : produceTokenFunction({
-        "keywords" : null,
-        "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
-        "attributes" : null,
-        "brackets" : ["\\{", "\\}"],
-        "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
-        "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
-        "singlecomment" : ["//", "#"],
-        "operators" : ["="]
-      }),
-      lineComment : "#",
-      blockCommentStart : "/*",
-      blockCommentEnd : "*/"
-
-    };
-  });
-  CodeMirror.defineMIME("text/x-msgenny", "msgenny");
+  CodeMirror.defineMIME("text/x-mscgen", "mscgen");
+  CodeMirror.defineMIME("text/x-xu", {name: "mscgen", language: "xu"});
+  CodeMirror.defineMIME("text/x-msgenny", {name: "mscgen", language: "msgenny"});
 
   function wordRegexpBoundary(pWords) {
     return new RegExp("\\b((" + pWords.join(")|(") + "))\\b", "i");
@@ -127,11 +112,10 @@
         }
       }
       if (pState.inComment) {
-        if (pStream.match(/[^\*\/]*\*\//, true, true)) {
+        if (pStream.match(/[^\*\/]*\*\//, true, true))
           pState.inComment = false;
-        } else {
+        else
           pStream.skipToEnd();
-        }
         return "comment";
       }
       /* strings */
@@ -140,29 +124,28 @@
         return "string";
       }
       if (pState.inString) {
-        if (pStream.match(/[^\"]*\"/, true, true)) {
+        if (pStream.match(/[^\"]*\"/, true, true))
           pState.inString = false;
-        } else {
+        else
           pStream.skipToEnd();
-        }
         return "string";
       }
       /* keywords & operators */
-      if (!!pConfig.keywords && pStream.match(wordRegexpBoundary(pConfig.keywords), true, true)) {
+      if (!!pConfig.keywords && pStream.match(wordRegexpBoundary(pConfig.keywords), true, true))
         return "keyword";
-      }
-      if (pStream.match(wordRegexpBoundary(pConfig.options), true, true)) {
+
+      if (pStream.match(wordRegexpBoundary(pConfig.options), true, true))
         return "keyword";
-      }
-      if (pStream.match(wordRegexpBoundary(pConfig.arcsWords), true, true)) {
+
+      if (pStream.match(wordRegexpBoundary(pConfig.arcsWords), true, true))
         return "keyword";
-      }
-      if (pStream.match(wordRegexp(pConfig.arcsOthers), true, true)) {
+
+      if (pStream.match(wordRegexp(pConfig.arcsOthers), true, true))
         return "keyword";
-      }
-      if (!!pConfig.operators && pStream.match(wordRegexp(pConfig.operators), true, true)) {
+
+      if (!!pConfig.operators && pStream.match(wordRegexp(pConfig.operators), true, true))
         return "operator";
-      }
+
       /* attribute lists */
       if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match(/\[/, true, true)) {
         pConfig.inAttributeList = true;
diff --git a/mode/mscgen/msgenny_test.js b/mode/mscgen/msgenny_test.js
index 6e9ab16535..80173de082 100644
--- a/mode/mscgen/msgenny_test.js
+++ b/mode/mscgen/msgenny_test.js
@@ -2,8 +2,8 @@
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "msgenny");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-msgenny");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "msgenny"); }
 
   MT("comments",
     "[comment // a single line comment]",
diff --git a/mode/mscgen/xu_test.js b/mode/mscgen/xu_test.js
index ada8dd1046..f9a50f0af2 100644
--- a/mode/mscgen/xu_test.js
+++ b/mode/mscgen/xu_test.js
@@ -2,8 +2,8 @@
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "xu");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-xu");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "xu"); }
 
   MT("empty chart",
      "[keyword msc][bracket {]",

From 95951a5d34653ae9386e1909d94f82da7d463c3e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 14:35:53 +0200
Subject: [PATCH 2356/4742] [CONTRIBUTING.md] Remove note about semicolons

I don't much care anymore, might move to semicolon-free style in future
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6d65e41129..77ed15b52d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -78,7 +78,7 @@ By contributing code to CodeMirror you
 ### Coding standards
 
 - 2 spaces per indentation level, no tabs.
-- Include semicolons after statements.
+
 - Note that the linter (`bin/lint`) which is run after each commit
   complains about unused variables and functions. Prefix their names
   with an underscore to muffle it.

From be3db533796153ba75116c1f538c0c52f62cb6d3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 14:59:56 +0200
Subject: [PATCH 2357/4742] [mscgen mode] Make demo page conform to project
 style

---
 mode/mscgen/index.html | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/mode/mscgen/index.html b/mode/mscgen/index.html
index a97b6c8321..0517825fbc 100644
--- a/mode/mscgen/index.html
+++ b/mode/mscgen/index.html
@@ -1,15 +1,28 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: mscgen mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="mscgen.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: MscGen mode</h1>
+
+<title>CodeMirror: Oz 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="mscgen.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="#">MscGen</a>
+  </ul>
+</div>
+
+<article>
+<h2>MscGen mode</h2>
 
 <div><textarea id="code">
 # Sample mscgen program
@@ -49,5 +62,4 @@ <h1>CodeMirror: MscGen mode</h1>
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-mscgen</code></p>
-  </body>
-</html>
+</article>

From 153d92b57611063877bffc5f449a7e8eee2c3887 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 15:44:20 +0200
Subject: [PATCH 2358/4742] Mark release 5.7.0

---
 AUTHORS           | 12 ++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 14 ++++++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index e2902c63c7..67a8e248c5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -53,6 +53,8 @@ Ankit
 Ankit Ahuja
 Ansel Santosa
 Anthony Dugois
+anthonygego
+Anthony Gégo
 Anthony Grimes
 Anton Kovalyov
 AQNOUCH Mohammed
@@ -118,6 +120,7 @@ Daniel Parnell
 Danny Yoo
 darealshinji
 Darius Roberts
+Dave Brondsema
 Dave Myers
 David Barnett
 David Mignot
@@ -248,6 +251,7 @@ Juho Vuori
 Justin Hileman
 jwallers@gmail.com
 kaniga
+karevn
 Ken Newman
 Ken Rockot
 Kevin Earls
@@ -298,11 +302,13 @@ Martin Balek
 Martín Gaitán
 Martin Hasoň
 Martin Hunt
+Martin Zagora
 Mason Malone
 Mateusz Paprocki
 Mathias Bynens
 mats cronqvist
 Matt Gaide
+Matthew Bauer
 Matthew Beale
 Matthew Rathbone
 Matthias Bussonnier
@@ -317,6 +323,7 @@ Max Kirsch
 Max Schaefer
 Max Xiantu
 mbarkhau
+melpon
 Metatheos
 Micah Dubinko
 Michael
@@ -387,6 +394,7 @@ prasanthj
 Prasanth J
 Radek Piórkowski
 Rahul
+ramwin1
 Randall Mason
 Randy Burden
 Randy Edmunds
@@ -435,9 +443,11 @@ Stanislav Oaserele
 Stas Kobzar
 Stefan Borsje
 Steffen Beyer
+Stephen Lavelle
 Steve O'Hara
 stoskov
 Sungho Kim
+sverweij
 Taha Jahangir
 Takuji Shimokawa
 Tarmil
@@ -464,9 +474,11 @@ Triangle717
 twifkak
 Vestimir Markov
 vf
+Victor Bocharsky
 Vincent Woo
 Volker Mische
 wenli
+Wes Cossick
 Wesley Wiser
 Will Binns-Smith
 William Jamieson
diff --git a/doc/compress.html b/doc/compress.html
index 16eab1ba15..218cacc2f0 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.7.0;f=">5.7</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.6.0;f=">5.6</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.5.0;f=">5.5</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.4.0;f=">5.4</option>
diff --git a/doc/manual.html b/doc/manual.html
index 20936f5a92..f83f2748f1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.6.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.7.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 561ea371cd..b2685f5714 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-08-2015: <a href="http://codemirror.net/codemirror-5.7.zip">Version 5.7</a>:</p>
+
+  <ul class="rel-note">
+    <li>New modes: <a href="../mode/vue/index.html">Vue</a>, <a href="../mode/oz/index.html">Oz</a>, <a href="../mode/mscgen/index.html">MscGen</a> (and dialects), <a href="../mode/css/gss.html">Closure Stylesheets</a></li>
+    <li>Implement <a href="http://commonmark.org">CommonMark</a>-style flexible list indent and cross-line code spans in <a href="../mode/markdown/index.html">Markdown</a> mode</li>
+    <li>Add a replace-all button to the <a href="../doc/manual.html#addon_search">search addon</a>, and make the persistent search dialog transparent when it obscures the match</li>
+    <li>Handle <code>acync</code>/<code>await</code> and ocal and binary numbers in <a href="../mode/javascript/index.html">JavaScript mode</a></li>
+    <li>Fix various issues with the <a href="../mode/haxe/index.html">Haxe mode</a></li>
+    <li>Make the <a href="../doc/manual.html#addon_closebrackets">closebrackets addon</a> select only the wrapped text when wrapping selection in brackets</li>
+    <li>Tokenize properties as properties in the <a href="../mode/coffeescript/index.html">CoffeeScript mode</a></li>
+    <li>The <a href="../doc/manual.html#addon_placeholder">placeholder addon</a> now accepts a DOM node as well as a string placeholder</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.6.0...5.7.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">20-08-2015: <a href="http://codemirror.net/codemirror-5.6.zip">Version 5.6</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 9a49c16d04..69dcf71d92 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.6</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.7</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 953768e6d6..c6f9af8594 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8829,7 +8829,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.6.1";
+  CodeMirror.version = "5.7.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 864a563212..dc064040bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.6.1",
+    "version":"5.7.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From b0f064e8c211dbaceda47bbd08fad7a9178713db Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 15:46:42 +0200
Subject: [PATCH 2359/4742] Bump version number post-5.7.0

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f83f2748f1..44635b843c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.7.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.7.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c6f9af8594..bd56830f68 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8829,7 +8829,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.7.0";
+  CodeMirror.version = "5.7.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index dc064040bb..9e2175750c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.7.0",
+    "version":"5.7.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 3c9df966c36f7b8314c792fd1e1ecb60cdab1320 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 17:43:13 +0200
Subject: [PATCH 2360/4742] Make event signalling safe in the face of handlers
 being added/removed

---
 lib/codemirror.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bd56830f68..689efa3a78 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8103,24 +8103,30 @@
     }
   };
 
+  var noHandlers = []
+  function getHandlers(emitter, type, copy) {
+    var arr = emitter._handlers && emitter._handlers[type]
+    if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers
+    else return arr || noHandlers
+  }
+
   var off = CodeMirror.off = function(emitter, type, f) {
     if (emitter.removeEventListener)
       emitter.removeEventListener(type, f, false);
     else if (emitter.detachEvent)
       emitter.detachEvent("on" + type, f);
     else {
-      var arr = emitter._handlers && emitter._handlers[type];
-      if (!arr) return;
-      for (var i = 0; i < arr.length; ++i)
-        if (arr[i] == f) { arr.splice(i, 1); break; }
+      var handlers = getHandlers(emitter, type, false)
+      for (var i = 0; i < handlers.length; ++i)
+        if (handlers[i] == f) { handlers.splice(i, 1); break; }
     }
   };
 
   var signal = CodeMirror.signal = function(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
+    var handlers = getHandlers(emitter, type, true)
+    if (!handlers.length) return;
     var args = Array.prototype.slice.call(arguments, 2);
-    for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
+    for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args);
   };
 
   var orphanDelayedCallbacks = null;
@@ -8133,8 +8139,8 @@
   // them to be executed when the last operation ends, or, if no
   // operation is active, when a timeout fires.
   function signalLater(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
+    var arr = getHandlers(emitter, type, false)
+    if (!arr.length) return;
     var args = Array.prototype.slice.call(arguments, 2), list;
     if (operationGroup) {
       list = operationGroup.delayedCallbacks;
@@ -8174,8 +8180,7 @@
   }
 
   function hasHandler(emitter, type) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    return arr && arr.length > 0;
+    return getHandlers(emitter, type).length > 0
   }
 
   // Add on and off methods to a constructor's prototype, to make

From c6bc91b48c670205103f8b340c6db77f32cf3197 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Sep 2015 22:14:37 +0200
Subject: [PATCH 2361/4742] [javascript mode] Recognize spread patterns

Issue #3536
---
 mode/javascript/javascript.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 032c207594..8869c9b08e 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -501,6 +501,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function pattern(type, value) {
     if (type == "variable") { register(value); return cont(); }
+    if (type == "spread") return cont(pattern);
     if (type == "[") return contCommasep(pattern, "]");
     if (type == "{") return contCommasep(proppattern, "}");
   }
@@ -510,6 +511,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(maybeAssign);
     }
     if (type == "variable") cx.marked = "property";
+    if (type == "spread") return cont(pattern);
     return cont(expect(":"), pattern, maybeAssign);
   }
   function maybeAssign(_type, value) {

From ed2e611a981f89c8e79e6233f64ef498e2835337 Mon Sep 17 00:00:00 2001
From: satamas <se.atamas@gmail.com>
Date: Mon, 21 Sep 2015 15:32:37 +0300
Subject: [PATCH 2362/4742] [kotlin mode] Move to clike.

---
 mode/clike/clike.js    |  28 ++++
 mode/clike/index.html  |  58 +++++++++
 mode/kotlin/index.html |  89 -------------
 mode/kotlin/kotlin.js  | 284 -----------------------------------------
 4 files changed, 86 insertions(+), 373 deletions(-)
 delete mode 100644 mode/kotlin/index.html
 delete mode 100644 mode/kotlin/kotlin.js

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 50f1ea7348..91cba89c63 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -516,6 +516,34 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {closeBrackets: {triples: '"'}}
   });
 
+  def("text/x-kotlin", {
+    name: "clike",
+    keywords: words(
+      /*keywords*/
+      "package as typealias class interface this super val " +
+      "var fun for is in This throw return " +
+      "break continue object if else while do try when !in !is as?" +
+
+      /*soft keywords*/
+      "file import where by get set abstract enum open inner override private public internal " +
+      "protected catch finally out final vararg reified dynamic companion constructor init " +
+      "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
+      "external annotation crossinline"
+    ),
+    types: words(
+      /* package java.lang */
+      "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
+      "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
+      "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
+      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
+    ),
+    multiLineStrings: true,
+    blockKeywords: words("catch class do else finally for if where try while enum"),
+    defKeywords: words("class val var object package interface fun"),
+    atoms: words("true false null this"),
+    modeProps: {closeBrackets: {triples: '"'}}
+  });
+
   def(["x-shader/x-vertex", "x-shader/x-fragment"], {
     name: "clike",
     keywords: words("sampler1D sampler2D sampler3D samplerCube " +
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 226c6ce846..5378869a56 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -206,6 +206,59 @@ <h2>Scala example</h2>
 }
 </textarea></div>
 
+<h2>Kotlin mode</h2>
+
+<div><textarea id="kotlin-code">
+package org.wasabi.http
+
+import java.util.concurrent.Executors
+import java.net.InetSocketAddress
+import org.wasabi.app.AppConfiguration
+import io.netty.bootstrap.ServerBootstrap
+import io.netty.channel.nio.NioEventLoopGroup
+import io.netty.channel.socket.nio.NioServerSocketChannel
+import org.wasabi.app.AppServer
+
+public class HttpServer(private val appServer: AppServer) {
+
+    val bootstrap: ServerBootstrap
+    val primaryGroup: NioEventLoopGroup
+    val workerGroup:  NioEventLoopGroup
+
+    init {
+        // Define worker groups
+        primaryGroup = NioEventLoopGroup()
+        workerGroup = NioEventLoopGroup()
+
+        // Initialize bootstrap of server
+        bootstrap = ServerBootstrap()
+
+        bootstrap.group(primaryGroup, workerGroup)
+        bootstrap.channel(javaClass<NioServerSocketChannel>())
+        bootstrap.childHandler(NettyPipelineInitializer(appServer))
+    }
+
+    public fun start(wait: Boolean = true) {
+        val channel = bootstrap.bind(appServer.configuration.port)?.sync()?.channel()
+
+        if (wait) {
+            channel?.closeFuture()?.sync()
+        }
+    }
+
+    public fun stop() {
+        // Shutdown all event loops
+        primaryGroup.shutdownGracefully()
+        workerGroup.shutdownGracefully()
+
+        // Wait till all threads are terminated
+        primaryGroup.terminationFuture().sync()
+        workerGroup.terminationFuture().sync()
+    }
+}
+</textarea></div>
+
+
     <script>
       var cEditor = CodeMirror.fromTextArea(document.getElementById("c-code"), {
         lineNumbers: true,
@@ -232,6 +285,11 @@ <h2>Scala example</h2>
         matchBrackets: true,
         mode: "text/x-scala"
       });
+      var kotlinEditor = CodeMirror.fromTextArea(document.getElementById("kotlin-code"), {
+          lineNumbers: true,
+          matchBrackets: true,
+          mode: "text/x-kotlin"
+      });
       var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
       CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
     </script>
diff --git a/mode/kotlin/index.html b/mode/kotlin/index.html
deleted file mode 100644
index 859e109fb8..0000000000
--- a/mode/kotlin/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Kotlin 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="kotlin.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="#">Kotlin</a>
-  </ul>
-</div>
-
-<article>
-<h2>Kotlin mode</h2>
-
-
-<div><textarea id="code" name="code">
-package org.wasabi.http
-
-import java.util.concurrent.Executors
-import java.net.InetSocketAddress
-import org.wasabi.app.AppConfiguration
-import io.netty.bootstrap.ServerBootstrap
-import io.netty.channel.nio.NioEventLoopGroup
-import io.netty.channel.socket.nio.NioServerSocketChannel
-import org.wasabi.app.AppServer
-
-public class HttpServer(private val appServer: AppServer) {
-
-    val bootstrap: ServerBootstrap
-    val primaryGroup: NioEventLoopGroup
-    val workerGroup:  NioEventLoopGroup
-
-    {
-        // Define worker groups
-        primaryGroup = NioEventLoopGroup()
-        workerGroup = NioEventLoopGroup()
-
-        // Initialize bootstrap of server
-        bootstrap = ServerBootstrap()
-
-        bootstrap.group(primaryGroup, workerGroup)
-        bootstrap.channel(javaClass<NioServerSocketChannel>())
-        bootstrap.childHandler(NettyPipelineInitializer(appServer))
-    }
-
-    public fun start(wait: Boolean = true) {
-        val channel = bootstrap.bind(appServer.configuration.port)?.sync()?.channel()
-
-        if (wait) {
-            channel?.closeFuture()?.sync()
-        }
-    }
-
-    public fun stop() {
-        // Shutdown all event loops
-        primaryGroup.shutdownGracefully()
-        workerGroup.shutdownGracefully()
-
-        // Wait till all threads are terminated
-        primaryGroup.terminationFuture().sync()
-        workerGroup.terminationFuture().sync()
-    }
-}
-</textarea></div>
-
-    <script>
-        var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-            mode: {name: "kotlin"},
-            lineNumbers: true,
-            indentUnit: 4
-        });
-    </script>
-    <h3>Mode for Kotlin (http://kotlin.jetbrains.org/)</h3>
-    <p>Developed by Hadi Hariri (https://github.com/hhariri).</p>
-    <p><strong>MIME type defined:</strong> <code>text/x-kotlin</code>.</p>
-</article>
diff --git a/mode/kotlin/kotlin.js b/mode/kotlin/kotlin.js
deleted file mode 100644
index e9a6a94e64..0000000000
--- a/mode/kotlin/kotlin.js
+++ /dev/null
@@ -1,284 +0,0 @@
-// 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"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("kotlin", function (config, parserConfig) {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var multiLineStrings = parserConfig.multiLineStrings;
-
-  var keywords = words(
-          "package continue return object while break class data trait interface throw super" +
-          " when type this else This try val var fun for is in if do as true false null get set");
-  var softKeywords = words("import" +
-      " where by get set abstract enum open annotation override private public internal" +
-      " protected catch out vararg inline finally final ref");
-  var blockKeywords = words("catch class do else finally for if where try while enum");
-  var atoms = words("null true false this");
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      return startString(ch, stream, state);
-    }
-    // Wildcard import w/o trailing semicolon (import smth.*)
-    if (ch == "." && stream.eat("*")) {
-      return "word";
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      if (stream.eat(/eE/)) {
-        stream.eat(/\+\-/);
-        stream.eatWhile(/\d/);
-      }
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize.push(tokenComment);
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (expectExpression(state.lastToken)) {
-        return startString(ch, stream, state);
-      }
-    }
-    // Commented
-    if (ch == "-" && stream.eat(">")) {
-      curPunc = "->";
-      return null;
-    }
-    if (/[\-+*&%=<>!?|\/~]/.test(ch)) {
-      stream.eatWhile(/[\-+*&%=<>|~]/);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-
-    var cur = stream.current();
-    if (atoms.propertyIsEnumerable(cur)) {
-      return "atom";
-    }
-    if (softKeywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "softKeyword";
-    }
-
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    }
-    return "word";
-  }
-
-  tokenBase.isBase = true;
-
-  function startString(quote, stream, state) {
-    var tripleQuoted = false;
-    if (quote != "/" && stream.eat(quote)) {
-      if (stream.eat(quote)) tripleQuoted = true;
-      else return "string";
-    }
-    function t(stream, state) {
-      var escaped = false, next, end = !tripleQuoted;
-
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          if (!tripleQuoted) {
-            break;
-          }
-          if (stream.match(quote + quote)) {
-            end = true;
-            break;
-          }
-        }
-
-        if (quote == '"' && next == "$" && !escaped && stream.eat("{")) {
-          state.tokenize.push(tokenBaseUntilBrace());
-          return "string";
-        }
-
-        if (next == "$" && !escaped && !stream.eat(" ")) {
-          state.tokenize.push(tokenBaseUntilSpace());
-          return "string";
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (multiLineStrings)
-        state.tokenize.push(t);
-      if (end) state.tokenize.pop();
-      return "string";
-    }
-
-    state.tokenize.push(t);
-    return t(stream, state);
-  }
-
-  function tokenBaseUntilBrace() {
-    var depth = 1;
-
-    function t(stream, state) {
-      if (stream.peek() == "}") {
-        depth--;
-        if (depth == 0) {
-          state.tokenize.pop();
-          return state.tokenize[state.tokenize.length - 1](stream, state);
-        }
-      } else if (stream.peek() == "{") {
-        depth++;
-      }
-      return tokenBase(stream, state);
-    }
-
-    t.isBase = true;
-    return t;
-  }
-
-  function tokenBaseUntilSpace() {
-    function t(stream, state) {
-      if (stream.eat(/[\w]/)) {
-        var isWord = stream.eatWhile(/[\w]/);
-        if (isWord) {
-          state.tokenize.pop();
-          return "word";
-        }
-      }
-      state.tokenize.pop();
-      return "string";
-    }
-
-    t.isBase = true;
-    return t;
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize.pop();
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function expectExpression(last) {
-    return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) ||
-        last == "newstatement" || last == "keyword" || last == "proplabel";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function (basecolumn) {
-      return {
-        tokenize: [tokenBase],
-        context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true,
-        lastToken: null
-      };
-    },
-
-    token: function (stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-        // Automatic semicolon insertion
-        if (ctx.type == "statement" && !expectExpression(state.lastToken)) {
-          popContext(state);
-          ctx = state.context;
-        }
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = state.tokenize[state.tokenize.length - 1](stream, state);
-      if (style == "comment") return style;
-      if (ctx.align == null) ctx.align = true;
-      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
-      // Handle indentation for {x -> \n ... }
-      else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") {
-        popContext(state);
-        state.context.align = false;
-      }
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      state.lastToken = curPunc || style;
-      return style;
-    },
-
-    indent: function (state, textAfter) {
-      if (!state.tokenize[state.tokenize.length - 1].isBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
-      if (ctx.type == "statement" && !expectExpression(state.lastToken)) ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") {
-        return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit);
-      }
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : config.indentUnit);
-    },
-
-    closeBrackets: {triples: "'\""},
-    electricChars: "{}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//"
-  };
-});
-
-CodeMirror.defineMIME("text/x-kotlin", "kotlin");
-
-});

From af0ac949bea5fec9ea7121618db14bc8927789b7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Sep 2015 13:16:27 +0200
Subject: [PATCH 2363/4742] [kotlin mode] Update/remove references to
 stand-alone mode

---
 doc/compress.html | 1 -
 mode/meta.js      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 218cacc2f0..0b11e1362c 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -154,7 +154,6 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
           <option value="http://codemirror.net/mode/julia/julia.js">julia.js</option>
-          <option value="http://codemirror.net/mode/kotlin/kotlin.js">kotlin.js</option>
           <option value="http://codemirror.net/mode/livescript/livescript.js">livescript.js</option>
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
diff --git a/mode/meta.js b/mode/meta.js
index 3a14dfc588..da03716be8 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -70,7 +70,7 @@
     {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
     {name: "Jinja2", mime: "null", mode: "jinja2"},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
-    {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]},
+    {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
     {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
     {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},

From b0d525acc5db0eb6cd2fa67c564057d6b89bca37 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Sep 2015 15:01:45 +0200
Subject: [PATCH 2364/4742] [show-hint addon] Allow hinting functions to
 support selection

Issue #3525
---
 addon/hint/show-hint.js | 98 +++++++++++++++++++++++++++++++----------
 doc/manual.html         |  5 ++-
 2 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 980da5235d..649d959e99 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -25,8 +25,18 @@
   };
 
   CodeMirror.defineExtension("showHint", function(options) {
-    // We want a single cursor position.
-    if (this.listSelections().length > 1 || this.somethingSelected()) return;
+    options = parseOptions(this, options);
+    var selections = this.listSelections()
+    if (selections.length > 1) return;
+    // By default, don't allow completion when something is selected.
+    // A hint function can have a `supportsSelection` property to
+    // indicate that it can handle selections.
+    if (this.somethingSelected()) {
+      if (!options.hint.supportsSelection) return;
+      // Don't try with cross-line selections
+      for (var i = 0; i < selections.length; i++)
+        if (selections[i].head.line != selections[i].anchor.line) return;
+    }
 
     if (this.state.completionActive) this.state.completionActive.close();
     var completion = this.state.completionActive = new Completion(this, options);
@@ -38,12 +48,12 @@
 
   function Completion(cm, options) {
     this.cm = cm;
-    this.options = this.buildOptions(options);
+    this.options = options;
     this.widget = null;
     this.debounce = 0;
     this.tick = 0;
-    this.startPos = this.cm.getCursor();
-    this.startLen = this.cm.getLine(this.startPos.line).length;
+    this.startPos = this.cm.getCursor("start");
+    this.startLen = this.cm.getLine(this.startPos.line).length - this.cm.getSelection().length;
 
     var self = this;
     cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
@@ -124,20 +134,21 @@
           CodeMirror.signal(data, "shown");
         }
       }
-    },
-
-    buildOptions: function(options) {
-      var editor = this.cm.options.hintOptions;
-      var out = {};
-      for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
-      if (editor) for (var prop in editor)
-        if (editor[prop] !== undefined) out[prop] = editor[prop];
-      if (options) for (var prop in options)
-        if (options[prop] !== undefined) out[prop] = options[prop];
-      return out;
     }
   };
 
+  function parseOptions(cm, pos, options) {
+    var editor = cm.options.hintOptions;
+    var out = {};
+    for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
+    if (editor) for (var prop in editor)
+      if (editor[prop] !== undefined) out[prop] = editor[prop];
+    if (options) for (var prop in options)
+      if (options[prop] !== undefined) out[prop] = options[prop];
+    if (out.hint.resolve) out.hint = out.hint.resolve(cm, pos)
+    return out;
+  }
+
   function getText(completion) {
     if (typeof completion == "string") return completion;
     else return completion.text;
@@ -336,18 +347,59 @@
     }
   };
 
-  CodeMirror.registerHelper("hint", "auto", function(cm, options) {
-    var helpers = cm.getHelpers(cm.getCursor(), "hint"), words;
+  function applicableHelpers(cm, helpers) {
+    if (!cm.somethingSelected()) return helpers
+    var result = []
+    for (var i = 0; i < helpers.length; i++)
+      if (helpers[i].supportsSelection) result.push(helpers[i])
+    return result
+  }
+
+  function resolveAutoHints(cm, pos) {
+    var helpers = cm.getHelpers(pos, "hint"), words
     if (helpers.length) {
-      for (var i = 0; i < helpers.length; i++) {
-        var cur = helpers[i](cm, options);
-        if (cur && cur.list.length) return cur;
+      var async = false, resolved
+      for (var i = 0; i < helpers.length; i++) if (helpers[i].async) async = true
+      if (async) {
+        resolved = function(cm, callback, options) {
+          var app = applicableHelpers(cm, helpers)
+          function run(i, result) {
+            if (i == app.length) return callback(null)
+            var helper = app[i]
+            if (helper.async) {
+              helper(cm, function(result) {
+                if (result) callback(result)
+                else run(i + 1)
+              }, options)
+            } else {
+              var result = helper(cm, options)
+              if (result) callback(result)
+              else run(i + 1)
+            }
+          }
+          run(0)
+        }
+        resolved.async = true
+      } else {
+        resolved = function(cm, options) {
+          var app = applicableHelpers(cm, helpers)
+          for (var i = 0; i < app.length; i++) {
+            var cur = app[i](cm, options)
+            if (cur && cur.list.length) return cur
+          }
+        }
       }
+      resolved.supportsSelection = true
+      return resolved
     } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
-      if (words) return CodeMirror.hint.fromList(cm, {words: words});
+      return function(cm) { return CodeMirror.hint.fromList(cm, {words: words}) }
     } else if (CodeMirror.hint.anyword) {
-      return CodeMirror.hint.anyword(cm, options);
+      return function(cm, options) { return CodeMirror.hint.anyword(cm, options) }
     }
+  }
+
+  CodeMirror.registerHelper("hint", "auto", {
+    resolve: resolveAutoHints
   });
 
   CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
diff --git a/doc/manual.html b/doc/manual.html
index 44635b843c..e2a3269d6b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2549,7 +2549,10 @@ <h2 id="addons">Addons</h2>
         arguments <code>(cm, callback, ?options)</code>, and the
         completion interface will only be popped up when the hinting
         function calls the callback, passing it the object holding the
-        completions.</dd>
+        completions. By default, hinting only works when there is no
+        selection. You can give a hinting function
+        a <code>supportsSelection</code> property with a truthy value
+        to indicate that it supports selections.</dd>
         <dt><code><strong>completeSingle</strong>: boolean</code></dt>
         <dd>Determines whether, when only a single completion is
         available, it is completed without showing the dialog.

From eac558597f753a64940a8e5aaef051de288218bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Sep 2015 09:43:44 +0200
Subject: [PATCH 2365/4742] [show-hint addon] Fix bugs introduced by
 supportsSelection changes

Issue #3525
---
 addon/hint/show-hint.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 649d959e99..a1e56c38be 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -25,7 +25,7 @@
   };
 
   CodeMirror.defineExtension("showHint", function(options) {
-    options = parseOptions(this, options);
+    options = parseOptions(this, this.getCursor("start"), options);
     var selections = this.listSelections()
     if (selections.length > 1) return;
     // By default, don't allow completion when something is selected.
@@ -395,6 +395,8 @@
       return function(cm) { return CodeMirror.hint.fromList(cm, {words: words}) }
     } else if (CodeMirror.hint.anyword) {
       return function(cm, options) { return CodeMirror.hint.anyword(cm, options) }
+    } else {
+      return function() {}
     }
   }
 

From d708748a9c37db8757d06a9baa63b3c3d2ddbae2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Sep 2015 11:10:28 +0200
Subject: [PATCH 2366/4742] [hardwrap demo] Make less prone to infinite loops

Issue #3548
---
 demo/hardwrap.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index f1a870b41c..84ba0cc0c2 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -60,11 +60,14 @@ <h2>Hard-wrapping Demo</h2>
     "Ctrl-Q": function(cm) { cm.wrapParagraph(cm.getCursor(), options); }
   }
 });
-var wait, options = {column: 60};
+var wait, options = {column: 60}, changing = false;
 editor.on("change", function(cm, change) {
+  if (changing) return;
   clearTimeout(wait);
   wait = setTimeout(function() {
-    console.log(cm.wrapParagraphsInRange(change.from, CodeMirror.changeEnd(change), options));
+    changing = true;
+    cm.wrapParagraphsInRange(change.from, CodeMirror.changeEnd(change), options);
+    changing = false;
   }, 200);
 });
 </script>

From edfe2106348c5c251f0f9f4f924dcd7ffd45ec48 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Sep 2015 11:12:38 +0200
Subject: [PATCH 2367/4742] [hardwrap addon] Don't generate null changes

Issue #3548
---
 addon/wrap/hardwrap.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index fe9b4dd669..8c1a7436ff 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -86,7 +86,8 @@
     if (changes.length) cm.operation(function() {
       for (var i = 0; i < changes.length; ++i) {
         var change = changes[i];
-        cm.replaceRange(change.text, change.from, change.to);
+        if (change.text || CodeMirror.cmpPos(change.from, change.to))
+          cm.replaceRange(change.text, change.from, change.to);
       }
     });
     return changes.length ? {from: changes[0].from, to: CodeMirror.changeEnd(changes[changes.length - 1])} : null;

From 5c4b8de1f33d7ae5d2a052599245e3f74b0b60b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 25 Sep 2015 13:06:03 +0200
Subject: [PATCH 2368/4742] [merge addon] Use CodeMirror.on to register event
 handler

Closes #3549
---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index e99de0b778..b4114a232a 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -640,7 +640,7 @@
       mark.clear();
       cm.removeLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
     }
-    widget.addEventListener("click", clear);
+    CodeMirror.on(widget, "click", clear);
     return {mark: mark, clear: clear};
   }
 

From cd88422f57c7d00282356c27263a35fe5e3d5629 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 30 Sep 2015 13:06:21 +0200
Subject: [PATCH 2369/4742] Bring back support for capturing the contextmenu
 event

Which was (possibly accidentally) dropped in the input style overhaul.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 689efa3a78..3605006c7f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4221,6 +4221,7 @@
   // right-click take effect on it.
   function onContextMenu(cm, e) {
     if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
+    if (signalDOMEvent(cm, e, "contextmenu")) return;
     cm.display.input.onContextMenu(e);
   }
 

From 2a9bf60c1b068a736d23478e8cc9b1ac9185c255 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 Oct 2015 22:49:24 +0200
Subject: [PATCH 2370/4742] [hardwrap addon] Fix infinite loop in corner case
 (indented space-less line)

Closes #3548
---
 addon/wrap/hardwrap.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 8c1a7436ff..8806fbe2f2 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -32,11 +32,13 @@
   function findBreakPoint(text, column, wrapOn, killTrailingSpace) {
     for (var at = column; at > 0; --at)
       if (wrapOn.test(text.slice(at - 1, at + 1))) break;
-    if (at == 0) at = column;
-    var endOfText = at;
-    if (killTrailingSpace)
-      while (text.charAt(endOfText - 1) == " ") --endOfText;
-    return {from: endOfText, to: at};
+    for (var first = true;; first = false) {
+      var endOfText = at;
+      if (killTrailingSpace)
+        while (text.charAt(endOfText - 1) == " ") --endOfText;
+      if (endOfText == 0 && first) at = column;
+      else return {from: endOfText, to: at};
+    }
   }
 
   function wrapRange(cm, from, to, options) {

From 119c86bad98fa8f874d34fb5253e3a8ed90a7926 Mon Sep 17 00:00:00 2001
From: Tako Schotanus <tako@ceylon-lang.org>
Date: Thu, 1 Oct 2015 18:34:51 +0200
Subject: [PATCH 2371/4742] Added my name to AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 67a8e248c5..78dd06f062 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -449,6 +449,7 @@ stoskov
 Sungho Kim
 sverweij
 Taha Jahangir
+Tako Schotanus
 Takuji Shimokawa
 Tarmil
 tel

From 4255f78cdaa1a2c4bc132a72b192cae52ae37667 Mon Sep 17 00:00:00 2001
From: Tako Schotanus <tako@ceylon-lang.org>
Date: Thu, 1 Oct 2015 18:35:20 +0200
Subject: [PATCH 2372/4742] [ceylon mode] Add

---
 mode/clike/clike.js   | 68 ++++++++++++++++++++++++++++++++++++-------
 mode/clike/index.html | 54 ++++++++++++++++++++++++++++++++--
 mode/index.html       |  1 +
 3 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 91cba89c63..ed4755e9f7 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -25,8 +25,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       multiLineStrings = parserConfig.multiLineStrings,
       indentStatements = parserConfig.indentStatements !== false,
       indentSwitch = parserConfig.indentSwitch !== false,
-      namespaceSeparator = parserConfig.namespaceSeparator;
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
+      namespaceSeparator = parserConfig.namespaceSeparator,
+      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/;
 
   var curPunc, isDefKeyword;
 
@@ -67,17 +67,17 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       stream.eatWhile(/[\w\$_\xa1-\uffff]/);
 
     var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      if (defKeywords.propertyIsEnumerable(cur)) isDefKeyword = true;
+    if (contains(keywords, cur)) {
+      if (contains(blockKeywords, cur)) curPunc = "newstatement";
+      if (contains(defKeywords, cur)) isDefKeyword = true;
       return "keyword";
     }
-    if (types.propertyIsEnumerable(cur)) return "variable-3";
-    if (builtin.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+    if (contains(types, cur)) return "variable-3";
+    if (contains(builtin, cur)) {
+      if (contains(blockKeywords, cur)) curPunc = "newstatement";
       return "builtin";
     }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    if (contains(atoms, cur)) return "atom";
     return "variable";
   }
 
@@ -190,7 +190,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         pushContext(state, stream.column(), type);
       }
 
-      if (style == "variable" &&
+      if ((style == "variable" || style == "variable-3") &&
           ((state.prevToken == "def" ||
             (parserConfig.typeFirstDefinitions && typeBefore(stream, state) &&
              isTopScope(state.context) && stream.match(/^\s*\(/, false)))))
@@ -238,6 +238,13 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
+  function contains(words, word) {
+    if (typeof words === "function") {
+      return words(word);
+    } else {
+      return words.propertyIsEnumerable(word);
+    }
+  }
   var cKeywords = "auto if break case register continue return default do sizeof " +
     "static else struct switch extern typedef float union for " +
     "goto while enum const volatile";
@@ -644,4 +651,45 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 
+  def("text/x-ceylon", {
+    name: "clike",
+    keywords: words("abstracts alias assembly assert assign break case catch class continue dynamic else" +
+                    " exists extends finally for function given if import in interface is let module new" +
+                    " nonempty object of out outer package return satisfies super switch then this throw" +
+                    " try value void while"),
+    types: function(word) {
+        // In Ceylon all identifiers that start with an uppercase are types
+        var first = word.charAt(0);
+        return (first === first.toUpperCase() && first !== first.toLowerCase());
+    },
+    blockKeywords: words("case catch class dynamic else finally for function if interface module new object switch try while"),
+    defKeywords: words("class dynamic function interface module object package value"),
+    builtin: words("abstract actual aliased annotation by default deprecated doc final formal late license" +
+                   " native optional sealed see serializable shared suppressWarnings tagged throws variable"),
+    isOperatorChar: /[+\-*&%=<>!?|^~:\/]/,
+    multiLineStrings: true,
+    typeFirstDefinitions: true,
+    atoms: words("true false null larger smaller equal empty finished"),
+    indentSwitch: false,
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      },
+      '"': function(stream, state) {
+        if (!stream.match('""')) return false;
+        state.tokenize = tokenTripleString;
+        return state.tokenize(stream, state);
+      },
+      "'": function(stream) {
+        stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+        return "atom";
+      }
+    },
+    modeProps: {
+        fold: ["brace", "import"],
+        closeBrackets: {triples: '"'}
+    }
+  });
+
 });
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 5378869a56..45c670ae58 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -258,6 +258,50 @@ <h2>Kotlin mode</h2>
 }
 </textarea></div>
 
+<h2>Ceylon mode</h2>
+
+<div><textarea id="ceylon-code">
+"Produces the [[stream|Iterable]] that results from repeated
+ application of the given [[function|next]] to the given
+ [[first]] element of the stream, until the function first
+ returns [[finished]]. If the given function never returns 
+ `finished`, the resulting stream is infinite.
+
+ For example:
+
+     loop(0)(2.plus).takeWhile(10.largerThan)
+
+ produces the stream `{ 0, 2, 4, 6, 8 }`."
+tagged("Streams")
+shared {Element+} loop&lt;Element&gt;(
+        "The first element of the resulting stream."
+        Element first)(
+        "The function that produces the next element of the
+         stream, given the current element. The function may
+         return [[finished]] to indicate the end of the 
+         stream."
+        Element|Finished next(Element element))
+    =&gt; let (start = first)
+    object satisfies {Element+} {
+        first =&gt; start;
+        empty =&gt; false;
+        function nextElement(Element element)
+                =&gt; next(element);
+        iterator()
+                =&gt; object satisfies Iterator&lt;Element&gt; {
+            variable Element|Finished current = start;
+            shared actual Element|Finished next() {
+                if (!is Finished result = current) {
+                    current = nextElement(result);
+                    return result;
+                }
+                else {
+                    return finished;
+                }
+            }
+        };
+    };
+</textarea></div>
 
     <script>
       var cEditor = CodeMirror.fromTextArea(document.getElementById("c-code"), {
@@ -290,6 +334,11 @@ <h2>Kotlin mode</h2>
           matchBrackets: true,
           mode: "text/x-kotlin"
       });
+      var ceylonEditor = CodeMirror.fromTextArea(document.getElementById("ceylon-code"), {
+          lineNumbers: true,
+          matchBrackets: true,
+          mode: "text/x-ceylon"
+      });
       var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
       CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
     </script>
@@ -305,6 +354,7 @@ <h2>Kotlin mode</h2>
     (Java), <code>text/x-csharp</code> (C#),
     <code>text/x-objectivec</code> (Objective-C),
     <code>text/x-scala</code> (Scala), <code>text/x-vertex</code>
-    and <code>x-shader/x-fragment</code> (shader programs),
-    <code>text/x-squirrel</code> (Squirrel).</p>
+    <code>x-shader/x-fragment</code> (shader programs),
+    <code>text/x-squirrel</code> (Squirrel) and
+    <code>text/x-ceylon</code> (Ceylon)</p>
 </article>
diff --git a/mode/index.html b/mode/index.html
index f63e83684c..3e1230900c 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -35,6 +35,7 @@ <h2>Language modes</h2>
       <li><a href="asterisk/index.html">Asterisk dialplan</a></li>
       <li><a href="brainfuck/index.html">Brainfuck</a></li>
       <li><a href="clike/index.html">C, C++, C#</a></li>
+      <li><a href="clike/index.html">Ceylon</a></li>
       <li><a href="clojure/index.html">Clojure</a></li>
       <li><a href="css/gss.html">Closure Stylesheets (GSS)</a></li>
       <li><a href="cmake/index.html">CMake</a></li>

From acb7e767c116599b80db390a09db0941b752fcec Mon Sep 17 00:00:00 2001
From: idleberg <jan@idleberg.com>
Date: Thu, 24 Sep 2015 15:22:21 +0200
Subject: [PATCH 2373/4742] [nsis mode] Add

---
 mode/index.html      |  1 +
 mode/nsis/index.html | 62 +++++++++++++++++++++++++++++++++++++++++++
 mode/nsis/nsis.js    | 63 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 126 insertions(+)
 create mode 100644 mode/nsis/index.html
 create mode 100644 mode/nsis/nsis.js

diff --git a/mode/index.html b/mode/index.html
index 3e1230900c..044dee7fdb 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -88,6 +88,7 @@ <h2>Language modes</h2>
       <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="nsis/index.html">NSIS</a></li>
       <li><a href="ntriples/index.html">NTriples</a></li>
       <li><a href="clike/index.html">Objective C</a></li>
       <li><a href="mllike/index.html">OCaml</a></li>
diff --git a/mode/nsis/index.html b/mode/nsis/index.html
new file mode 100644
index 0000000000..a1d7aaa586
--- /dev/null
+++ b/mode/nsis/index.html
@@ -0,0 +1,62 @@
+<!doctype html>
+
+<title>CodeMirror: NSIS 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="../../addon/edit/matchbrackets.js"></script>
+<script src=nsis.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="#">NSIS</a>
+  </ul>
+</div>
+
+<article>
+<h2>NSIS mode</h2>
+
+
+<textarea id=code>
+; This is a comment
+!ifdef ERROR
+    !error "Something went wrong"
+!endif
+
+OutFile "demo.exe"
+RequestExecutionLevel user
+
+!include "LogicLib.nsh"
+
+Section -mandatory
+    ${If} 1 > 0
+      MessageBox MB_OK "Hello world"
+    ${EndIf}
+SectionEnd
+</textarea>
+
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById('code'), {
+    mode: 'nsis',
+    indentWithTabs: true,
+    smartIndent: true,
+    lineNumbers: true,
+    matchBrackets: true
+  });
+</script>
+
+<p><strong>MIME types defined:</strong> <code>text/x-nsis</code>.</p>
+</article>
diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
new file mode 100644
index 0000000000..3960b2e451
--- /dev/null
+++ b/mode/nsis/nsis.js
@@ -0,0 +1,63 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Author: Jan T. Sott (http://github.com/idleberg)
+
+(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("nsis",{
+  start:[
+    // Numbers
+    {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
+    // Compile Time Commands
+    {regex: /(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+    // Conditional Compilation
+    {regex: /(?:\!(if|ifdef|ifmacrodef|ifmacrondef|ifndef|macro))\b/, token: "keyword", indent: true},
+    {regex: /(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
+    // Runtime Commands
+    {regex: /(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /\b(?:Function|PageEx|Section|SectionGroup)\b/, token: "keyword", indent: true},
+    {regex: /\b(?:FunctionEnd|PageExEnd|SectionEnd|SectionGroupEnd)\b/, token: "keyword", dedent: true},
+    // Options
+    {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
+    {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
+
+    // LogicLib
+    {regex: /\$\{(?:End(If|Unless|While)|Loop(?:Until)|Next)\}/, token: "variable-2", dedent: true},
+    {regex: /\$\{(?:Do(Until|While)|Else(?:If(?:Not)?)?|For(?:Each)?|(?:(?:And|Else|Or)?If(?:Cmd|Not|Then)?|Unless)|While)\}/, token: "variable-2", indent: true},
+
+    // Line Comment
+    {regex: /(#|;).*/, token: "comment"},
+    // Block Comment
+    {regex: /\/\*/, token: "comment", next: "comment"},
+    // Operator
+    {regex: /[-+\/*=<>!]+/, token: "operator"},
+    // Variable
+    {regex: /\$[\w]+/, token: "variable"},
+    // Constant
+    {regex: /\${[\w]+}/,token: "variable-2"},
+    // Language String
+    {regex: /\$\([\w]+\)/,token: "variable-3"}
+  ],
+  comment: [
+    {regex: /.*?\*\//, token: "comment", next: "start"},
+    {regex: /.*/, token: "comment"}
+  ],
+  meta: {
+    electricInput: /^\s*(FunctionEnd|PageExEnd|SectionEnd|SectionGroupEnd|(\!(endif|macroend))|\$\{(End(If|Unless|While)|Loop(Until)|Next)\})$/,
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: ["#", ";"]
+  }
+});
+
+CodeMirror.defineMIME("text/x-nsis", "nsis");
+});

From b1ad58e9c96c7e25c304fab21cf5641031ccbdf7 Mon Sep 17 00:00:00 2001
From: Wes Cossick <WesCossick@users.noreply.github.com>
Date: Fri, 25 Sep 2015 15:11:34 -0500
Subject: [PATCH 2374/4742] New option: allowDroppedFileTypes

---
 lib/codemirror.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3605006c7f..996978fc67 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3821,6 +3821,9 @@
     if (files && files.length && window.FileReader && window.File) {
       var n = files.length, text = Array(n), read = 0;
       var loadFile = function(file, i) {
+        if(this.options.allowDroppedFileTypes !== undefined && this.options.allowDroppedFileTypes.indexOf(file.type) === -1)
+          return;
+
         var reader = new FileReader;
         reader.onload = operation(cm, function() {
           text[i] = reader.result;

From 031afdee246f404c8ecaa635a58c457ac899c837 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 Oct 2015 23:46:20 +0200
Subject: [PATCH 2375/4742] Clean up allowDroppedFileTypes implementation,
 rename to allowDropFileTypes

Make it actually work, document it, declare the option,
make sure the code runs on pre-ES5 browsers.

Issue #3550
---
 doc/manual.html   | 7 +++++++
 lib/codemirror.js | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index e2a3269d6b..095a80cd1c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -421,6 +421,13 @@ <h2>Configuration</h2>
       <dt id="option_dragDrop"><code><strong>dragDrop</strong>: boolean</code></dt>
       <dd>Controls whether drag-and-drop is enabled. On by default.</dd>
 
+      <dt id="option_allowDropFileTypes"><code><strong>allowDropFileTypes</strong>: array&lt;string&gt;</code></dt>
+      <dd>When set (default is <code>null</code>) only files whose
+      type is in the array can be dropped into the editor. The strings
+      should be MIME types, and will be checked against
+      the <a href="https://w3c.github.io/FileAPI/#dfn-type"><code>type</code></a>
+      of the <code>File</code> object as reported by the browser.</dd>
+
       <dt id="option_cursorBlinkRate"><code><strong>cursorBlinkRate</strong>: number</code></dt>
       <dd>Half-period in milliseconds used for cursor blinking. The default blink
       rate is 530ms. By setting this to zero, blinking can be disabled. A
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 996978fc67..f0f8837aed 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3821,7 +3821,8 @@
     if (files && files.length && window.FileReader && window.File) {
       var n = files.length, text = Array(n), read = 0;
       var loadFile = function(file, i) {
-        if(this.options.allowDroppedFileTypes !== undefined && this.options.allowDroppedFileTypes.indexOf(file.type) === -1)
+        if (cm.options.allowDropFileTypes &&
+            indexOf(cm.options.allowDropFileTypes, file.type) == -1)
           return;
 
         var reader = new FileReader;
@@ -5408,6 +5409,7 @@
   });
   option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
   option("dragDrop", true, dragDropChanged);
+  option("allowDropFileTypes", null);
 
   option("cursorBlinkRate", 530);
   option("cursorScrollMargin", 0);

From 46936dd3129e94be249c457bcef8dbee3beb12e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 2 Oct 2015 23:46:38 +0200
Subject: [PATCH 2376/4742] Refuse to accept dropped binary files

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f0f8837aed..1fd68dda24 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3827,7 +3827,9 @@
 
         var reader = new FileReader;
         reader.onload = operation(cm, function() {
-          text[i] = reader.result;
+          var content = reader.result;
+          if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = "";
+          text[i] = content;
           if (++read == n) {
             pos = clipPos(cm.doc, pos);
             var change = {from: pos, to: pos,

From 80ba42652018bae1061def23c02e9db81863ca83 Mon Sep 17 00:00:00 2001
From: Anders Nawroth <anders@neotechnology.com>
Date: Mon, 28 Sep 2015 11:18:57 +0200
Subject: [PATCH 2377/4742] [cypher mode] Update keywords and builtins

* Removes like, ilike.
* Adds starts, ends, contains, toString, size, reverse.
---
 mode/cypher/cypher.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 79048b440c..107e4f6d21 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -60,9 +60,9 @@
     };
     var indentUnit = config.indentUnit;
     var curPunc;
-    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
-    var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor", "like", "ilike", "exists"]);
-    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
+    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "reverse", "right", "round", "rtrim", "shortestPath", "sign", "sin", "size", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "toString", "trim", "type", "upper"]);
+    var preds = wordRegexp(["all", "and", "any", "contains", "exists", "has", "in", "none", "not", "or", "single", "xor"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
     var operatorChars = /[*+\-<>=&|~%^]/;
 
     return {

From 52e48afa6d3d508c83115c142c3f8fd0dc477108 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 3 Oct 2015 00:00:37 +0200
Subject: [PATCH 2378/4742] Only call ensureCursorVisible once in
 newlineAndIndent

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1fd68dda24..63a6229477 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5716,8 +5716,8 @@
           var range = cm.listSelections()[i];
           cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
           cm.indentLine(range.from().line + 1, null, true);
-          ensureCursorVisible(cm);
         }
+        ensureCursorVisible(cm);
       });
     },
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}

From 4f7a6fb37a7f6d879dc6f72f7604e25e75c6487d Mon Sep 17 00:00:00 2001
From: Mark Anderson <manderson23@gmail.com>
Date: Mon, 28 Sep 2015 21:27:05 +0100
Subject: [PATCH 2379/4742] [rpm spec mode] Use classes that exist

support more arch/preamble/sections and fix clearing control flow
state.
---
 mode/rpm/rpm.js | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/mode/rpm/rpm.js b/mode/rpm/rpm.js
index 3bb7cd2f62..87cde591a3 100644
--- a/mode/rpm/rpm.js
+++ b/mode/rpm/rpm.js
@@ -34,10 +34,10 @@ CodeMirror.defineMIME("text/x-rpm-changes", "rpm-changes");
 // Quick and dirty spec file highlighting
 
 CodeMirror.defineMode("rpm-spec", function() {
-  var arch = /^(i386|i586|i686|x86_64|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
+  var arch = /^(i386|i586|i686|x86_64|ppc64le|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
 
-  var preamble = /^(Name|Version|Release|License|Summary|Url|Group|Source|BuildArch|BuildRequires|BuildRoot|AutoReqProv|Provides|Requires(\(\w+\))?|Obsoletes|Conflicts|Recommends|Source\d*|Patch\d*|ExclusiveArch|NoSource|Supplements):/;
-  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pre|post|triggerin|triggerun|pretrans|posttrans|verifyscript|check|triggerpostun|triggerprein|trigger)/;
+  var preamble = /^[a-zA-Z0-9()]+:/;
+  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pretrans|posttrans|pre|post|triggerin|triggerun|verifyscript|check|triggerpostun|triggerprein|trigger)/;
   var control_flow_complex = /^%(ifnarch|ifarch|if)/; // rpm control flow macros
   var control_flow_simple = /^%(else|endif)/; // rpm control flow macros
   var operators = /^(\!|\?|\<\=|\<|\>\=|\>|\=\=|\&\&|\|\|)/; // operators in control flow macros
@@ -55,8 +55,8 @@ CodeMirror.defineMode("rpm-spec", function() {
       if (ch == "#") { stream.skipToEnd(); return "comment"; }
 
       if (stream.sol()) {
-        if (stream.match(preamble)) { return "preamble"; }
-        if (stream.match(section)) { return "section"; }
+        if (stream.match(preamble)) { return "header"; }
+        if (stream.match(section)) { return "atom"; }
       }
 
       if (stream.match(/^\$\w+/)) { return "def"; } // Variables like '$RPM_BUILD_ROOT'
@@ -73,21 +73,29 @@ CodeMirror.defineMode("rpm-spec", function() {
         if (stream.eol()) { state.controlFlow = false; }
       }
 
-      if (stream.match(arch)) { return "number"; }
+      if (stream.match(arch)) {
+        if (stream.eol()) { state.controlFlow = false; }
+        return "number";
+      }
 
       // Macros like '%make_install' or '%attr(0775,root,root)'
       if (stream.match(/^%[\w]+/)) {
         if (stream.match(/^\(/)) { state.macroParameters = true; }
-        return "macro";
+        return "keyword";
       }
       if (state.macroParameters) {
         if (stream.match(/^\d+/)) { return "number";}
         if (stream.match(/^\)/)) {
           state.macroParameters = false;
-          return "macro";
+          return "keyword";
         }
       }
-      if (stream.match(/^%\{\??[\w \-]+\}/)) { return "macro"; } // Macros like '%{defined fedora}'
+
+      // Macros like '%{defined fedora}'
+      if (stream.match(/^%\{\??[\w \-\:\!]+\}/)) {
+        if (stream.eol()) { state.controlFlow = false; }
+        return "def";
+      }
 
       //TODO: Include bash script sub-parser (CodeMirror supports that)
       stream.next();

From a24a053df741fea91dac30de16ba56c091164440 Mon Sep 17 00:00:00 2001
From: "amshali@google.com" <amshali@google.com>
Date: Tue, 29 Sep 2015 18:10:49 -0700
Subject: [PATCH 2380/4742] [real-world uses] Add Codiad

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 3f72b28c8a..ab33409a64 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -29,6 +29,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://amber-lang.net/">Amber</a> (JavaScript-based Smalltalk system)</li>
       <li><a href="http://apachegui.ca/">Apache GUI</a></li>
       <li><a href="http://apeye.org/">APEye</a> (tool for testing &amp; documenting APIs)</li>
+      <li><a href="https://github.com/google/appengine-codiad">Appengine Codiad</a></li>
       <li><a href="https://chrome.google.com/webstore/detail/better-text-viewer/lcaidopdffhfemoefoaadecppnjdknkc">Better Text Viewer</a> (plain text reader app for Chrome)</li>
       <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a> (code hosting)</li>
       <li><a href="http://buzz.blogger.com/2013/04/improvements-to-blogger-template-html.html">Blogger's template editor</a></li>

From 8a48219a5ec380aacf938cc7d5438dd85a187e31 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 3 Oct 2015 00:24:12 +0200
Subject: [PATCH 2381/4742] [clike mode] Don't get confused by commas in Java
 throw clauses

Closes #3558
---
 mode/clike/clike.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index ed4755e9f7..77cc203111 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -26,7 +26,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       indentStatements = parserConfig.indentStatements !== false,
       indentSwitch = parserConfig.indentSwitch !== false,
       namespaceSeparator = parserConfig.namespaceSeparator,
-      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/;
+      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/,
+      endStatement = parserConfig.endStatement || /^[;:,]$/;
 
   var curPunc, isDefKeyword;
 
@@ -168,8 +169,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (style == "comment" || style == "meta") return style;
       if (ctx.align == null) ctx.align = true;
 
-      if ((curPunc == ";" || curPunc == ":" || curPunc == ","))
-        while (isStatement(state.context.type)) popContext(state);
+      if (endStatement.test(curPunc)) while (isStatement(state.context.type)) popContext(state);
       else if (curPunc == "{") pushContext(state, stream.column(), "}");
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
@@ -420,6 +420,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     defKeywords: words("class interface package enum"),
     typeFirstDefinitions: true,
     atoms: words("true false null"),
+    endStatement: /^[;:]$/,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);

From 825ca00010c61ae366fb53b78ba633d1c39fc497 Mon Sep 17 00:00:00 2001
From: Markus Bordihn <GitHub@markusbordihn.de>
Date: Thu, 1 Oct 2015 11:11:18 +0200
Subject: [PATCH 2382/4742] [coffeescript mode] Remove disabled code

Removed possible testing and unreachable code to avoid JavaScript
compiler errors:

...
codemirror/mode/coffeescript/coffeescript.js:271: WARNING - unreachable code
    if (false && current === ".") {
...
---
 mode/coffeescript/coffeescript.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index 1b96f85d86..adf2184fd7 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -267,17 +267,6 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
     var style = state.tokenize(stream, state);
     var current = stream.current();
 
-    // Handle "." connected identifiers
-    if (false && current === ".") {
-      style = state.tokenize(stream, state);
-      current = stream.current();
-      if (/^\.[\w$]+$/.test(current)) {
-        return "variable";
-      } else {
-        return ERRORCLASS;
-      }
-    }
-
     // Handle scope changes.
     if (current === "return") {
       state.dedent = true;

From 0e924de982e315ba74ee9e57d6030581dcd43158 Mon Sep 17 00:00:00 2001
From: Martin Laine <martin.laine@simplybusiness.co.uk>
Date: Sat, 3 Oct 2015 14:34:40 +0100
Subject: [PATCH 2383/4742] Add start and end tokens when highlighting
 delimiters

---
 addon/mode/multiplex.js      | 6 +++---
 addon/mode/multiplex_test.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index fe48c7fbd5..3d8b34c452 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -51,7 +51,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
             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;
+            return other.delimStyle && (other.delimStyle + " " + other.delimStyle + "-open");
           } else if (found != -1 && found < cutOff) {
             cutOff = found;
           }
@@ -70,7 +70,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         if (found == stream.pos && !curInner.parseDelimiters) {
           stream.match(curInner.close);
           state.innerActive = state.inner = null;
-          return curInner.delimStyle;
+          return curInner.delimStyle && (curInner.delimStyle + " " + curInner.delimStyle + "-close");
         }
         if (found > -1) stream.string = oldContent.slice(0, found);
         var innerToken = curInner.mode.token(stream, state.inner);
@@ -80,7 +80,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           state.innerActive = state.inner = null;
 
         if (curInner.innerStyle) {
-          if (innerToken) innerToken = innerToken + ' ' + curInner.innerStyle;
+          if (innerToken) innerToken = innerToken + " " + curInner.innerStyle;
           else innerToken = curInner.innerStyle;
         }
 
diff --git a/addon/mode/multiplex_test.js b/addon/mode/multiplex_test.js
index d33943420e..24e5e670de 100644
--- a/addon/mode/multiplex_test.js
+++ b/addon/mode/multiplex_test.js
@@ -29,5 +29,5 @@
 
   MT(
     "stexInsideMarkdown",
-    "[strong **Equation:**] [delim $][inner&tag \\pi][delim $]");
+    "[strong **Equation:**] [delim&delim-open $][inner&tag \\pi][delim&delim-close $]");
 })();

From 1011199245705e8e05447dd47e835caf0abba817 Mon Sep 17 00:00:00 2001
From: Martin Laine <martin.laine@simplybusiness.co.uk>
Date: Sat, 3 Oct 2015 16:25:06 +0100
Subject: [PATCH 2384/4742] Update docs

---
 doc/manual.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 095a80cd1c..75875ff2bd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2488,7 +2488,9 @@ <h2 id="addons">Addons</h2>
       Pass <code>"\n"</code> for <code>open</code> or <code>close</code>
       if you want to switch on a blank line.
       <ul><li>When <code>delimStyle</code> is specified, it will be the token
-      style returned for the delimiter tokens.</li>
+      style returned for the delimiter tokens (as well as
+      <code>[delimStyle]-open</code> on the opening token and
+      <code>[delimStyle]-close</code> on the closing token).</li>
       <li>When <code>innerStyle</code> is specified, it will be the token
       style added for each inner mode token.</li>
       <li>When <code>parseDelimiters</code> is true, the content of

From d8237c8f1d377d13bd5593712c1d8e703b8139eb Mon Sep 17 00:00:00 2001
From: Tako Schotanus <tako@ceylon-lang.org>
Date: Mon, 5 Oct 2015 18:43:13 +0200
Subject: [PATCH 2385/4742] [clike mode] Make punctuation and number chars
 configurable

---
 mode/clike/clike.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 77cc203111..e1502437bc 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -26,6 +26,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       indentStatements = parserConfig.indentStatements !== false,
       indentSwitch = parserConfig.indentSwitch !== false,
       namespaceSeparator = parserConfig.namespaceSeparator,
+      isPunctuationChar = parserConfig.isPunctuationChar || /[\[\]{}\(\),;\:\.]/,
+      isNumberChar = parserConfig.isNumberChar || /\d/,
       isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/,
       endStatement = parserConfig.endStatement || /^[;:,]$/;
 
@@ -41,11 +43,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
     }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+    if (isPunctuationChar.test(ch)) {
       curPunc = ch;
       return null;
     }
-    if (/\d/.test(ch)) {
+    if (isNumberChar.test(ch)) {
       stream.eatWhile(/[\w\.]/);
       return "number";
     }
@@ -667,7 +669,9 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     defKeywords: words("class dynamic function interface module object package value"),
     builtin: words("abstract actual aliased annotation by default deprecated doc final formal late license" +
                    " native optional sealed see serializable shared suppressWarnings tagged throws variable"),
+    isPunctuationChar: /[\[\]{}\(\),;\:\.`]/,
     isOperatorChar: /[+\-*&%=<>!?|^~:\/]/,
+    isNumberChar: /[\d#$]/,
     multiLineStrings: true,
     typeFirstDefinitions: true,
     atoms: words("true false null larger smaller equal empty finished"),

From 84d5f64006822fd2213ca09cb0fcb93ca85d1b0e Mon Sep 17 00:00:00 2001
From: Tako Schotanus <tako@ceylon-lang.org>
Date: Mon, 5 Oct 2015 18:44:02 +0200
Subject: [PATCH 2386/4742] [clike mode] Support string interpolation and
 members in Ceylon mode

---
 mode/clike/clike.js | 49 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index e1502437bc..e2900d8014 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -192,7 +192,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         pushContext(state, stream.column(), type);
       }
 
-      if ((style == "variable" || style == "variable-3") &&
+      if (style == "variable" &&
           ((state.prevToken == "def" ||
             (parserConfig.typeFirstDefinitions && typeBefore(stream, state) &&
              isTopScope(state.context) && stream.match(/^\s*\(/, false)))))
@@ -654,6 +654,31 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 
+  // Ceylon Strings need to deal with interpolation
+  var stringTokenizer = null;
+  function tokenCeylonString(type) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while (!stream.eol()) {
+        if (!escaped && stream.match('"') &&
+              (type == "single" || stream.match('""'))) {
+          end = true;
+          break;
+        }
+        if (!escaped && stream.match('``')) {
+          stringTokenizer = tokenCeylonString(type);
+          end = true;
+          break;
+        }
+        next = stream.next();
+        escaped = type == "single" && !escaped && next == "\\";
+      }
+      if (end)
+          state.tokenize = null;
+      return "string";
+    }
+  }
+
   def("text/x-ceylon", {
     name: "clike",
     keywords: words("abstracts alias assembly assert assign break case catch class continue dynamic else" +
@@ -676,20 +701,32 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     typeFirstDefinitions: true,
     atoms: words("true false null larger smaller equal empty finished"),
     indentSwitch: false,
+    styleDefs: false,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);
         return "meta";
       },
       '"': function(stream, state) {
-        if (!stream.match('""')) return false;
-        state.tokenize = tokenTripleString;
-        return state.tokenize(stream, state);
-      },
+          state.tokenize = tokenCeylonString(stream.match('""') ? "triple" : "single");
+          return state.tokenize(stream, state);
+        },
+      '`': function(stream, state) {
+          if (!stringTokenizer || !stream.match('`')) return false;
+          state.tokenize = stringTokenizer;
+          stringTokenizer = null;
+          return state.tokenize(stream, state);
+        },
       "'": function(stream) {
         stream.eatWhile(/[\w\$_\xa1-\uffff]/);
         return "atom";
-      }
+      },
+      token: function(_stream, state, style) {
+          if ((style == "variable" || style == "variable-3") &&
+              state.prevToken == ".") {
+            return "variable-2";
+          }
+        }
     },
     modeProps: {
         fold: ["brace", "import"],

From b62924237dce61ba5f8e799a434b2d82747876ac Mon Sep 17 00:00:00 2001
From: "amshali@google.com" <amshali@google.com>
Date: Wed, 30 Sep 2015 18:15:22 -0700
Subject: [PATCH 2387/4742] [abcdef theme] Change link color to blueviolet

...because the original blue on black background is difficult to read.
---
 theme/abcdef.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/abcdef.css b/theme/abcdef.css
index 142d813703..7f9d788704 100644
--- a/theme/abcdef.css
+++ b/theme/abcdef.css
@@ -27,6 +27,6 @@
 .cm-s-abcdef span.cm-attribute { color: #DDFF00; }
 .cm-s-abcdef span.cm-error { color: #FF0000; }
 .cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
-.cm-s-abcdef span.cm-link { color: blue; }
+.cm-s-abcdef span.cm-link { color: blueviolet; }
 
 .cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }

From 61e9389610df5f944b82e3a24edd564614427ff6 Mon Sep 17 00:00:00 2001
From: "amshali@google.com" <amshali@google.com>
Date: Wed, 30 Sep 2015 13:56:33 -0700
Subject: [PATCH 2388/4742] [liquibyte theme] Fix css file to have more
 complete selectors

Including liquibyte theme with other themes causes other themes(when
in use) to not look right. For example there will be underline text
decorations when a text is selected in default theme.
---
 theme/liquibyte.css | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/theme/liquibyte.css b/theme/liquibyte.css
index c64c25c743..9db8bde739 100644
--- a/theme/liquibyte.css
+++ b/theme/liquibyte.css
@@ -4,17 +4,17 @@
 	line-height: 1.2em;
 	font-size: 1em;
 }
-.CodeMirror-focused .cm-matchhighlight {
+.cm-s-liquibyte .CodeMirror-focused .cm-matchhighlight {
 	text-decoration: underline;
 	text-decoration-color: #0f0;
 	text-decoration-style: wavy;
 }
-.cm-trailingspace {
+.cm-s-liquibyte .cm-trailingspace {
 	text-decoration: line-through;
 	text-decoration-color: #f00;
 	text-decoration-style: dotted;
 }
-.cm-tab {
+.cm-s-liquibyte .cm-tab {
 	text-decoration: line-through;
 	text-decoration-color: #404040;
 	text-decoration-style: dotted;
@@ -54,42 +54,42 @@
 .cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
 
 /* 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; }
+.cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte .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 {
+.cm-s-liquibyte 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 {
+.cm-s-liquibyte 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 {
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
 	border-top: 1px solid #404040;
 	border-bottom: 1px solid #404040;
 }
-div.CodeMirror-simplescroll-horizontal div {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div {
 	border-left: 1px solid #404040;
 	border-right: 1px solid #404040;
 }
-div.CodeMirror-simplescroll-vertical {
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical {
 	background-color: #262626;
 }
-div.CodeMirror-simplescroll-horizontal {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal {
 	background-color: #262626;
 	border-top: 1px solid #404040;
 }
 /* Overlay */
-div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
 	background-color: #404040;
 	border-radius: 5px;
 }
-div.CodeMirror-overlayscroll-vertical div {
+.cm-s-liquibyte div.CodeMirror-overlayscroll-vertical div {
 	border: 1px solid #404040;
 }
-div.CodeMirror-overlayscroll-horizontal div {
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div {
 	border: 1px solid #404040;
 }

From d16f4d81ff576b93f7db37d11ec5f73babbccd88 Mon Sep 17 00:00:00 2001
From: idleberg <jan@idleberg.com>
Date: Wed, 7 Oct 2015 12:44:45 +0200
Subject: [PATCH 2389/4742] [nsis mode] Shorten some regular expressions

---
 mode/nsis/nsis.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 3960b2e451..93dd7421e8 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -20,12 +20,12 @@ CodeMirror.defineSimpleMode("nsis",{
     // Compile Time Commands
     {regex: /(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
     // Conditional Compilation
-    {regex: /(?:\!(if|ifdef|ifmacrodef|ifmacrondef|ifndef|macro))\b/, token: "keyword", indent: true},
+    {regex: /(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
     {regex: /(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
     // Runtime Commands
     {regex: /(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
-    {regex: /\b(?:Function|PageEx|Section|SectionGroup)\b/, token: "keyword", indent: true},
-    {regex: /\b(?:FunctionEnd|PageExEnd|SectionEnd|SectionGroupEnd)\b/, token: "keyword", dedent: true},
+    {regex: /\b(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
+    {regex: /\b(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
     // Options
     {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
     {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
@@ -52,7 +52,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /.*/, token: "comment"}
   ],
   meta: {
-    electricInput: /^\s*(FunctionEnd|PageExEnd|SectionEnd|SectionGroupEnd|(\!(endif|macroend))|\$\{(End(If|Unless|While)|Loop(Until)|Next)\})$/,
+    electricInput: /^\s*((Function|PageEx|Section|Section(Group)?)End|(\!(endif|macroend))|\$\{(End(If|Unless|While)|Loop(Until)|Next)\})$/,
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
     lineComment: ["#", ";"]

From 897586c0ad1bec7226c7109b0c8a0e3aae35d333 Mon Sep 17 00:00:00 2001
From: Stephen Lavelle <analytic@gmail.com>
Date: Sun, 6 Sep 2015 08:17:48 +0100
Subject: [PATCH 2390/4742] [haxe mode] Add support for globalVars

---
 mode/haxe/haxe.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 73cd6213ac..00be2962b5 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -192,12 +192,20 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
     return true;
   }
   function register(varname) {
+    function inList(list) {
+      for (var v = list; v; v = v.next)
+        if (v.name == varname) return true;
+      return false;
+    }
     var state = cx.state;
     if (state.context) {
       cx.marked = "def";
-      for (var v = state.localVars; v; v = v.next)
-        if (v.name == varname) return;
+      if (inList(state.localVars)) return;
       state.localVars = {name: varname, next: state.localVars};
+    } else {
+      if (inList(state.globalVars)) return;
+      if (parserConfig.globalVars)
+        state.globalVars = {name: varname, next: state.globalVars};
     }
   }
 
@@ -380,11 +388,10 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
   }
 
   // Interface
-
   return {
     startState: function(basecolumn) {
       var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"];
-      return {
+      var state = {
         tokenize: haxeTokenBase,
         reAllowed: true,
         kwAllowed: true,
@@ -395,6 +402,9 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
         context: parserConfig.localVars && {vars: parserConfig.localVars},
         indented: 0
       };
+      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
+        state.globalVars = parserConfig.globalVars;
+      return state;
     },
 
     token: function(stream, state) {

From a039316c74253b6176b8fd9517a93295033f8ec5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 7 Oct 2015 12:59:10 +0200
Subject: [PATCH 2391/4742] [haxe mode] Tweak previous patch

---
 mode/haxe/haxe.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 00be2962b5..a9573dd71b 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -191,21 +191,20 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
     pass.apply(null, arguments);
     return true;
   }
+  function inList(name, list) {
+    for (var v = list; v; v = v.next)
+      if (v.name == name) return true;
+    return false;
+  }
   function register(varname) {
-    function inList(list) {
-      for (var v = list; v; v = v.next)
-        if (v.name == varname) return true;
-      return false;
-    }
     var state = cx.state;
     if (state.context) {
       cx.marked = "def";
-      if (inList(state.localVars)) return;
+      if (inList(varname, state.localVars)) return;
       state.localVars = {name: varname, next: state.localVars};
-    } else {
-      if (inList(state.globalVars)) return;
-      if (parserConfig.globalVars)
-        state.globalVars = {name: varname, next: state.globalVars};
+    } else if (state.globalVars) {
+      if (inList(varname, state.globalVars)) return;
+      state.globalVars = {name: varname, next: state.globalVars};
     }
   }
 

From 5fafcf837480430b614085d62d884098ccd53297 Mon Sep 17 00:00:00 2001
From: "S. Chris Colbert" <sccolbert@gmail.com>
Date: Wed, 7 Oct 2015 13:41:25 -0400
Subject: [PATCH 2392/4742] Fix vertical scroll jitter on OSX trackpads

---
 lib/codemirror.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 63a6229477..4b1fc4f769 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3971,8 +3971,9 @@
 
     var display = cm.display, scroll = display.scroller;
     // Quit if there's nothing to scroll here
-    if (!(dx && scroll.scrollWidth > scroll.clientWidth ||
-          dy && scroll.scrollHeight > scroll.clientHeight)) return;
+    var canScrollX = scroll.scrollWidth > scroll.clientWidth;
+    var canScrollY = scroll.scrollHeight > scroll.clientHeight;
+    if (!(dx && canScrollX || dy && canScrollY)) return;
 
     // Webkit browsers on OS X abort momentum scrolls when the target
     // of the scroll event is removed from the scrollable element.
@@ -3996,10 +3997,15 @@
     // scrolling entirely here. It'll be slightly off from native, but
     // better than glitching out.
     if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
-      if (dy)
+      if (dy && canScrollY)
         setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
       setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-      e_preventDefault(e);
+      // Only prevent default scrolling if vertical scrolling is
+      // actually possible. Otherwise, it causes vertical scroll
+      // jitter on OSX trackpads when deltaX is small and deltaY
+      // is large (issue #3579)
+      if (!dy || (dy && canScrollY))
+        e_preventDefault(e);
       display.wheelStartX = null; // Abort measurement, if in progress
       return;
     }

From 4a0c9c3e23f886065d44b4ad29c8dce13d8306b4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 8 Oct 2015 16:28:38 +0200
Subject: [PATCH 2393/4742] [javascript mode] Also style global definitions as
 'def'

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 8869c9b08e..de7b5abe91 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -281,8 +281,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return false;
     }
     var state = cx.state;
+    cx.marked = "def";
     if (state.context) {
-      cx.marked = "def";
       if (inList(state.localVars)) return;
       state.localVars = {name: varname, next: state.localVars};
     } else {

From 55f3f3a086c7080ce0c27aed39a90174796e1035 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 8 Oct 2015 16:45:41 +0200
Subject: [PATCH 2394/4742] [javascript modes] Update tests for changed
 highlighting of toplevel defs

---
 mode/javascript/test.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 452de5fd6b..de71d8c95d 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -6,7 +6,7 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   MT("locals",
-     "[keyword function] [variable foo]([def a], [def b]) { [keyword var] [def c] [operator =] [number 10]; [keyword return] [variable-2 a] [operator +] [variable-2 c] [operator +] [variable d]; }");
+     "[keyword function] [def foo]([def a], [def b]) { [keyword var] [def c] [operator =] [number 10]; [keyword return] [variable-2 a] [operator +] [variable-2 c] [operator +] [variable d]; }");
 
   MT("comma-and-binop",
      "[keyword function](){ [keyword var] [def x] [operator =] [number 1] [operator +] [number 2], [def y]; }");
@@ -18,7 +18,7 @@
      "})();");
 
   MT("class_body",
-     "[keyword class] [variable Foo] {",
+     "[keyword class] [def Foo] {",
      "  [property constructor]() {}",
      "  [property sayName]() {",
      "    [keyword return] [string-2 `foo${][variable foo][string-2 }oo`];",
@@ -26,7 +26,7 @@
      "}");
 
   MT("class",
-     "[keyword class] [variable Point] [keyword extends] [variable SuperThing] {",
+     "[keyword class] [def Point] [keyword extends] [variable SuperThing] {",
      "  [property get] [property prop]() { [keyword return] [number 24]; }",
      "  [property constructor]([def x], [def y]) {",
      "    [keyword super]([string 'something']);",
@@ -35,44 +35,44 @@
      "}");
 
   MT("import",
-     "[keyword function] [variable foo]() {",
+     "[keyword function] [def foo]() {",
      "  [keyword import] [def $] [keyword from] [string 'jquery'];",
      "  [keyword import] { [def encrypt], [def decrypt] } [keyword from] [string 'crypto'];",
      "}");
 
   MT("const",
-     "[keyword function] [variable f]() {",
+     "[keyword function] [def f]() {",
      "  [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",
      "}");
 
   MT("for/of",
-     "[keyword for]([keyword let] [variable of] [keyword of] [variable something]) {}");
+     "[keyword for]([keyword let] [def of] [keyword of] [variable something]) {}");
 
   MT("generator",
-     "[keyword function*] [variable repeat]([def n]) {",
+     "[keyword function*] [def repeat]([def n]) {",
      "  [keyword for]([keyword var] [def i] [operator =] [number 0]; [variable-2 i] [operator <] [variable-2 n]; [operator ++][variable-2 i])",
      "    [keyword yield] [variable-2 i];",
      "}");
 
   MT("quotedStringAddition",
-     "[keyword let] [variable f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
+     "[keyword let] [def f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
 
   MT("quotedFatArrow",
-     "[keyword let] [variable f] [operator =] [variable a] [operator +] [string '=>'] [operator +] [variable c];");
+     "[keyword let] [def f] [operator =] [variable a] [operator +] [string '=>'] [operator +] [variable c];");
 
   MT("fatArrow",
      "[variable array].[property filter]([def a] [operator =>] [variable-2 a] [operator +] [number 1]);",
      "[variable a];", // No longer in scope
-     "[keyword let] [variable f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
+     "[keyword let] [def f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
      "[variable c];");
 
   MT("spread",
-     "[keyword function] [variable f]([def a], [meta ...][def b]) {",
+     "[keyword function] [def f]([def a], [meta ...][def b]) {",
      "  [variable something]([variable-2 a], [meta ...][variable-2 b]);",
      "}");
 
   MT("comprehension",
-     "[keyword function] [variable f]() {",
+     "[keyword function] [def f]() {",
      "  [[([variable x] [operator +] [number 1]) [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
      "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] [operator ===] [string 'blue']));",
      "}");
@@ -84,7 +84,7 @@
      "[variable x] [operator =] [string-2 `fofdlakj${][variable x] [operator +] [string-2 `foo`] [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
 
   MT("indent_statement",
-     "[keyword var] [variable x] [operator =] [number 10]",
+     "[keyword var] [def x] [operator =] [number 10]",
      "[variable x] [operator +=] [variable y] [operator +]",
      "  [atom Infinity]",
      "[keyword debugger];");
@@ -105,14 +105,14 @@
      "}");
 
   MT("indent_for",
-     "[keyword for] ([keyword var] [variable i] [operator =] [number 0];",
+     "[keyword for] ([keyword var] [def i] [operator =] [number 0];",
      "     [variable i] [operator <] [number 100];",
      "     [variable i][operator ++])",
      "  [variable doSomething]([variable i]);",
      "[keyword debugger];");
 
   MT("indent_c_style",
-     "[keyword function] [variable foo]()",
+     "[keyword function] [def foo]()",
      "{",
      "  [keyword debugger];",
      "}");
@@ -140,21 +140,21 @@
      "[number 2];");
 
   MT("multilinestring",
-     "[keyword var] [variable x] [operator =] [string 'foo\\]",
+     "[keyword var] [def x] [operator =] [string 'foo\\]",
      "[string bar'];");
 
   MT("scary_regexp",
      "[string-2 /foo[[/]]bar/];");
 
   MT("indent_strange_array",
-     "[keyword var] [variable x] [operator =] [[",
+     "[keyword var] [def x] [operator =] [[",
      "  [number 1],,",
      "  [number 2],",
      "]];",
      "[number 10];");
 
   MT("param_default",
-     "[keyword function] [variable foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
+     "[keyword function] [def foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
      "  [keyword return] [variable-2 x];",
      "}");
 

From 8fbf049ab7c0591d91687ccc8c74dc5940ac6317 Mon Sep 17 00:00:00 2001
From: idleberg <jan@idleberg.com>
Date: Fri, 9 Oct 2015 13:12:17 +0200
Subject: [PATCH 2395/4742] [base64 themes] Fix URL in comment

---
 theme/base16-dark.css  | 2 +-
 theme/base16-light.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 81dac03923..026a816890 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -3,7 +3,7 @@
     Name:       Base16 Default Dark
     Author:     Chris Kempson (http://chriskempson.com)
 
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
     Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
 
 */
diff --git a/theme/base16-light.css b/theme/base16-light.css
index e645678f8a..474e0ca9d1 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -3,7 +3,7 @@
     Name:       Base16 Default Light
     Author:     Chris Kempson (http://chriskempson.com)
 
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
     Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
 
 */

From de7b15f97f6a2f85ae0b09dea8c649f5d3c29159 Mon Sep 17 00:00:00 2001
From: peter <sean@17track.net>
Date: Fri, 9 Oct 2015 17:42:39 +0800
Subject: [PATCH 2396/4742] Refactor local variable name to save file size when
 minified

---
 lib/codemirror.js | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4b1fc4f769..8801a44cb7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -21,27 +21,29 @@
 
   // Kludges for bugs and behavior differences that can't be feature
   // detected are enabled based on userAgent etc sniffing.
+  var userAgent = navigator.userAgent;
+  var platform = navigator.platform;
 
-  var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
-  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
+  var gecko = /gecko\/\d/i.test(userAgent);
+  var ie_upto10 = /MSIE \d/.test(userAgent);
+  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
   var ie = ie_upto10 || ie_11up;
   var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
-  var webkit = /WebKit\//.test(navigator.userAgent);
-  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
-  var chrome = /Chrome\//.test(navigator.userAgent);
-  var presto = /Opera\//.test(navigator.userAgent);
+  var webkit = /WebKit\//.test(userAgent);
+  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
+  var chrome = /Chrome\//.test(userAgent);
+  var presto = /Opera\//.test(userAgent);
   var safari = /Apple Computer/.test(navigator.vendor);
-  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
-  var phantom = /PhantomJS/.test(navigator.userAgent);
+  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
+  var phantom = /PhantomJS/.test(userAgent);
 
-  var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
+  var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
   // This is woefully incomplete. Suggestions for alternative methods welcome.
-  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent);
-  var mac = ios || /Mac/.test(navigator.platform);
-  var windows = /win/i.test(navigator.platform);
+  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
+  var mac = ios || /Mac/.test(platform);
+  var windows = /win/i.test(platform);
 
-  var presto_version = presto && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
+  var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
   if (presto_version) presto_version = Number(presto_version[1]);
   if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X

From 0ca9fc878df2ecc2f9d2a279de9d5c3786f9a2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elis=C3=A9e?= <elisee@sparklinlabs.com>
Date: Sun, 11 Oct 2015 00:58:06 +0200
Subject: [PATCH 2397/4742] [javascript mode] Fix TypeScript mode to highlight
 "boolean" not "bool"

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index de7b5abe91..106111d837 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -56,7 +56,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         "static": kw("static"),
 
         // types
-        "string": type, "number": type, "bool": type, "any": type
+        "string": type, "number": type, "boolean": type, "any": type
       };
 
       for (var attr in tsKeywords) {

From eedb58faa301551d530b34e5c765a90607232a31 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 14 Oct 2015 18:09:56 +0200
Subject: [PATCH 2398/4742] [htmlmixed mode] Check for own properties when
 looking up defined tags

Closes #3596
---
 mode/htmlmixed/htmlmixed.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 670fd62bf1..21e74f163d 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -89,8 +89,8 @@
       tags.script.unshift(["type", configScript[i].matches, configScript[i].mode])
 
     function html(stream, state) {
-      var tagName = state.htmlState.tagName;
-      var tagInfo = tagName && tags[tagName.toLowerCase()];
+      var tagName = state.htmlState.tagName && state.htmlState.tagName.toLowerCase();
+      var tagInfo = tagName && tags.hasOwnProperty(tagName) && tags[tagName];
 
       var style = htmlMode.token(stream, state.htmlState), modeSpec;
 

From bc5a4939b2603f587c2358a8b13063862660bcdf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 15 Oct 2015 09:46:18 +0200
Subject: [PATCH 2399/4742] Allow the type of a marker created by markText to
 be overridden

... using the type option.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8801a44cb7..c13f954352 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7558,7 +7558,7 @@
     removeLineWidget: function(widget) { widget.clear(); },
 
     markText: function(from, to, options) {
-      return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
+      return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range");
     },
     setBookmark: function(pos, options) {
       var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),

From caf1323d81cfc446db0e77129a26bd95ab9322b8 Mon Sep 17 00:00:00 2001
From: Michael Goderbauer <goderbauer@google.com>
Date: Thu, 15 Oct 2015 10:56:55 -0700
Subject: [PATCH 2400/4742] [dart mode] support for triple-quoted strings and
 string interpolation

- Previously, triple-quoted multi-line strings could be closed with a
  single quote, e.g. CodeMirror thought the following was a legal string
  literal: '''This string literal is not terminated correctly'.
  Also reported here: dart-lang/dart-pad#667
- String interpolation with $identifier and ${expression} now works
---
 mode/dart/dart.js | 82 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index a49e218c3b..3132c21e71 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -26,10 +26,21 @@
     return obj;
   }
 
+  function pushInterpolationStack(state) {
+    (state.interpolationStack || (state.interpolationStack = [])).push(state.tokenize);
+  }
+
+  function popInterpolationStack(state) {
+    return (state.interpolationStack || (state.interpolationStack = [])).pop();
+  }
+
+  function sizeInterpolationStack(state) {
+    return (state.interpolationStack || (state.interpolationStack = [])).length;
+  }
+
   CodeMirror.defineMIME("application/dart", {
     name: "clike",
     keywords: set(keywords),
-    multiLineStrings: true,
     blockKeywords: set(blockKeywords),
     builtin: set(builtins),
     atoms: set(atoms),
@@ -37,10 +48,79 @@
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);
         return "meta";
+      },
+
+      // custom string handling to deal with triple-quoted strings and string interpolation
+      "'": function(stream, state) {
+        return tokenString("'", stream, state, false);
+      },
+      "\"": function(stream, state) {
+        return tokenString("\"", stream, state, false);
+      },
+      "r": function(stream, state) {
+        var peek = stream.peek();
+        if (peek == "'" || peek == "\"") {
+          return tokenString(stream.next(), stream, state, true);
+        }
+        return false;
+      },
+
+      "}": function(_stream, state) {
+        // "}" is end of interpolation, if interpolation stack is non-empty
+        if (sizeInterpolationStack(state) > 0) {
+          state.tokenize = popInterpolationStack(state);
+          return null;
+        }
+        return false;
       }
     }
   });
 
+  function tokenString(quote, stream, state, raw) {
+    var tripleQuoted = false;
+    if (stream.eat(quote)) {
+      if (stream.eat(quote)) tripleQuoted = true;
+      else return "string"; //empty string
+    }
+    function tokenStringHelper(stream, state) {
+      var escaped = false;
+      while (!stream.eol()) {
+        if (!raw && !escaped && stream.peek() == "$") {
+          pushInterpolationStack(state);
+          state.tokenize = tokenInterpolation;
+          return "string";
+        }
+        var next = stream.next();
+        if (next == quote && !escaped && (!tripleQuoted || stream.match(quote + quote))) {
+          state.tokenize = null;
+          break;
+        }
+        escaped = !escaped && next == "\\";
+      }
+      return "string";
+    }
+    state.tokenize = tokenStringHelper;
+    return tokenStringHelper(stream, state);
+  }
+
+  function tokenInterpolation(stream, state) {
+    stream.eat("$");
+    if (stream.eat("{")) {
+      // let clike handle the content of ${...},
+      // we take over again when "}" appears (see hooks).
+      state.tokenize = null;
+    } else {
+      state.tokenize = tokenInterpolationIdentifier;
+    }
+    return null;
+  }
+
+  function tokenInterpolationIdentifier(stream, state) {
+    stream.eatWhile(/[\w_]/);
+    state.tokenize = popInterpolationStack(state);
+    return "variable";
+  }
+
   CodeMirror.registerHelper("hintWords", "application/dart", keywords.concat(atoms).concat(builtins));
 
   // This is needed to make loading through meta.js work.

From b3619febb82a792450c3a0f8d61512f2217d6d60 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 15 Oct 2015 22:33:29 +0200
Subject: [PATCH 2401/4742] [dart mode] Avoid unneccesary adding of state
 property

Issue #3601
---
 mode/dart/dart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 3132c21e71..7d6e5abd96 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -35,7 +35,7 @@
   }
 
   function sizeInterpolationStack(state) {
-    return (state.interpolationStack || (state.interpolationStack = [])).length;
+    return state.interpolationStack ? state.interpolationStack.length : 0;
   }
 
   CodeMirror.defineMIME("application/dart", {

From 356f2a1ad385283b9d4de8e4dcc09bd90c995681 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 15 Oct 2015 23:19:23 +0200
Subject: [PATCH 2402/4742] [css mode] Support interpolation in @block context

Closes #3585
---
 mode/css/css.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/css/css.js b/mode/css/css.js
index 7300850399..d07426473b 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -275,6 +275,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     if (type == "}" || type == ";") return popAndPass(type, stream, state);
     if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
 
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
+
     if (type == "word") {
       var word = stream.current().toLowerCase();
       if (word == "only" || word == "not" || word == "and" || word == "or")

From 8fd466fba5d47176d7b3c26ddc5edf2a8f4b1292 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Fri, 9 Oct 2015 18:24:59 -0700
Subject: [PATCH 2403/4742] [comment addon] Smarter indenting in multiline
 linecommenting

---
 addon/comment/comment.js | 9 ++++++++-
 test/comment_test.js     | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 2dd114d332..1c7aaae1e1 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -57,7 +57,14 @@
 
     self.operation(function() {
       if (options.indent) {
-        var baseString = firstLine.slice(0, firstNonWS(firstLine));
+        var baseString = null;
+        for (var i = from.line; i < end; ++i) {
+          var line = self.getLine(i);
+          var whitespace = line.slice(0, firstNonWS(line));
+          if (baseString == null || baseString.length > whitespace.length) {
+            baseString = whitespace;
+          }
+        }
         for (var i = from.line; i < end; ++i) {
           var line = self.getLine(i), cut = baseString.length;
           if (!blankLines && !nonWS.test(line)) continue;
diff --git a/test/comment_test.js b/test/comment_test.js
index 8bd3959ee9..26e474493b 100644
--- a/test/comment_test.js
+++ b/test/comment_test.js
@@ -79,7 +79,7 @@ namespace = "comment_";
 
   test("indented", "javascript", function(cm) {
     cm.lineComment(Pos(1, 0), Pos(2), {indent: true});
-  }, simpleProg, "function foo() {\n  // return bar;\n  // }");
+  }, simpleProg, "function foo() {\n//   return bar;\n// }");
 
   test("singleEmptyLine", "javascript", function(cm) {
     cm.setCursor(1);

From 872bb73403998d14e2994fbefee43df01e828470 Mon Sep 17 00:00:00 2001
From: John Engler <jfengler4@gmail.com>
Date: Wed, 7 Oct 2015 18:34:34 -0700
Subject: [PATCH 2404/4742] [clike mode] Remove false from Scala keyword list

So that both true and false highlight as atoms
---
 mode/clike/clike.js           | 2 +-
 mode/javascript/javascript.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index e2900d8014..d4b7438b9d 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -478,7 +478,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     keywords: words(
 
       /* scala */
-      "abstract case catch class def do else extends false final finally for forSome if " +
+      "abstract case catch class def do else extends final finally for forSome if " +
       "implicit import lazy match new null object override package private protected return " +
       "sealed super this throw trait try type val var while with yield _ : = => <- <: " +
       "<% >: # @ " +
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 106111d837..07281b7959 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -670,6 +670,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         lexical = lexical.prev;
       var type = lexical.type, closing = firstChar == type;
 
+      console.log(firstChar, type)
       if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
       else if (type == "form" && firstChar == "{") return lexical.indented;
       else if (type == "form") return lexical.indented + indentUnit;

From 4096f2da64c0af8c744b5e3e7a4a6c047073e354 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Wed, 14 Oct 2015 19:58:13 +0200
Subject: [PATCH 2405/4742] [shell mode] add `PKGBUILD' as a file name

`A PKGBUILD is a shell script containing the build information required by Arch Linux packages.`
https://wiki.archlinux.org/index.php/PKGBUILD
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index da03716be8..7d6a6e1bf4 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -109,7 +109,7 @@
     {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
     {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
     {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
-    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"]},
+    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
     {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
     {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
     {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},

From 8a012c0ae93654c911e029f82f92d5e21c1f389d Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Fri, 9 Oct 2015 17:35:59 -0700
Subject: [PATCH 2406/4742] Allow passing options to toggleComment

---
 addon/comment/comment.js | 18 ++++++++++++------
 doc/manual.html          |  9 ++++++---
 keymap/sublime.js        |  4 +++-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 1c7aaae1e1..3aa468089e 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -21,22 +21,28 @@
   }
 
   CodeMirror.commands.toggleComment = function(cm) {
-    var minLine = Infinity, ranges = cm.listSelections(), mode = null;
+    cm.toggleComment();
+  };
+
+  CodeMirror.defineExtension("toggleComment", function(options) {
+    if (!options) options = noOptions;
+    var cm = this;
+    var minLine = Infinity, ranges = this.listSelections(), mode = null;
     for (var i = ranges.length - 1; i >= 0; i--) {
       var from = ranges[i].from(), to = ranges[i].to();
       if (from.line >= minLine) continue;
       if (to.line >= minLine) to = Pos(minLine, 0);
       minLine = from.line;
       if (mode == null) {
-        if (cm.uncomment(from, to)) mode = "un";
-        else { cm.lineComment(from, to); mode = "line"; }
+        if (cm.uncomment(from, to, options)) mode = "un";
+        else { cm.lineComment(from, to, options); mode = "line"; }
       } else if (mode == "un") {
-        cm.uncomment(from, to);
+        cm.uncomment(from, to, options);
       } else {
-        cm.lineComment(from, to);
+        cm.lineComment(from, to, options);
       }
     }
-  };
+  });
 
   CodeMirror.defineExtension("lineComment", function(from, to, options) {
     if (!options) options = noOptions;
diff --git a/doc/manual.html b/doc/manual.html
index 75875ff2bd..4cc4a39c25 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2313,9 +2313,12 @@ <h2 id="addons">Addons</h2>
       demo</a>.</dd>
 
       <dt id="addon_comment"><a href="../addon/comment/comment.js"><code>comment/comment.js</code></a></dt>
-      <dd>Addon for commenting and uncommenting code. Adds three
+      <dd>Addon for commenting and uncommenting code. Adds four
       methods to CodeMirror instances:
       <dl>
+        <dt id="toggleComment"><code><strong>toggleComment</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>
+        <dd>Tries to uncomment the current selection, and if that
+        fails, line-comments it.</dd>
         <dt id="lineComment"><code><strong>lineComment</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>
         <dd>Set the lines in the given range to be line comments. Will
         fall back to <code>blockComment</code> when no line comment
@@ -2353,8 +2356,8 @@ <h2 id="addons">Addons</h2>
       </dl>
       The addon also defines
       a <code>toggleComment</code> <a href="#commands">command</a>,
-      which will try to uncomment the current selection, and if that
-      fails, line-comments it.</dd>
+      which is a shorthand command for calling
+      <code>toggleComment</code> with no options.</dd>
 
       <dt id="addon_foldcode"><a href="../addon/fold/foldcode.js"><code>fold/foldcode.js</code></a></dt>
       <dd>Helps with code folding. Adds a <code>foldCode</code> method
diff --git a/keymap/sublime.js b/keymap/sublime.js
index 44e812a248..a0ca41ea2a 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -240,7 +240,9 @@
     });
   };
 
-  map[ctrl + "/"] = "toggleComment";
+  map[ctrl + "/"] = function(cm) {
+    cm.toggleComment({ indent: true });
+  }
 
   cmds[map[ctrl + "J"] = "joinLines"] = function(cm) {
     var ranges = cm.listSelections(), joined = [];

From e07f8fcf7087b6b87fb8aa9884d14bb158485a1e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 16 Oct 2015 09:44:21 +0200
Subject: [PATCH 2407/4742] [javascript mode] Remove accidentally committed
 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 07281b7959..106111d837 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -670,7 +670,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         lexical = lexical.prev;
       var type = lexical.type, closing = firstChar == type;
 
-      console.log(firstChar, type)
       if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
       else if (type == "form" && firstChar == "{") return lexical.indented;
       else if (type == "form") return lexical.indented + indentUnit;

From 770a7719494119dc90ed16c848d3e2399da1c263 Mon Sep 17 00:00:00 2001
From: Barret Rennie <barret@brennie.ca>
Date: Thu, 1 Oct 2015 12:55:53 -0600
Subject: [PATCH 2408/4742] [markdown mode] Allow styles to be overridden

The `markdown` mode now supports styling overrides. The configuration
object passed to the class now accepts a `tokenTypeOverrides` object,
which allows the user to sepcify different CSS classes for elements.
This is useful for the case where the default CSS classes are reused
for multiple elements (e.g. `list1` maps to `variable-2` by default)
and more customized styling is desired.

Unit tests have been added to cover all types of styling overrides.
---
 mode/markdown/markdown.js | 105 +++++++++++++++++++++-----------------
 mode/markdown/test.js     |  99 +++++++++++++++++++++++++++++++++++
 2 files changed, 157 insertions(+), 47 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 9d40368180..2349ddf22b 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -51,24 +51,36 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.strikethrough === undefined)
     modeCfg.strikethrough = false;
 
+  // Allow token types to be overridden by user-provided token types.
+  if (modeCfg.tokenTypeOverrides === undefined)
+    modeCfg.tokenTypeOverrides = {};
+
   var codeDepth = 0;
 
-  var header   = 'header'
-  ,   code     = 'comment'
-  ,   quote    = 'quote'
-  ,   list1    = 'variable-2'
-  ,   list2    = 'variable-3'
-  ,   list3    = 'keyword'
-  ,   hr       = 'hr'
-  ,   image    = 'tag'
-  ,   formatting = 'formatting'
-  ,   linkinline = 'link'
-  ,   linkemail = 'link'
-  ,   linktext = 'link'
-  ,   linkhref = 'string'
-  ,   em       = 'em'
-  ,   strong   = 'strong'
-  ,   strikethrough = 'strikethrough';
+  var tokenTypes = {
+    header: "header",
+    code: "comment",
+    quote: "quote",
+    list1: "variable-2",
+    list2: "variable-3",
+    list3: "keyword",
+    hr: "hr",
+    image: "tag",
+    formatting: "formatting",
+    linkInline: "link",
+    linkEmail: "link",
+    linkText: "link",
+    linkHref: "string",
+    em: "em",
+    strong: "strong",
+    strikethrough: "strikethrough"
+  };
+
+  for (var tokenType in tokenTypes) {
+    if (tokenTypes.hasOwnProperty(tokenType) && modeCfg.tokenTypeOverrides[tokenType]) {
+      tokenTypes[tokenType] = modeCfg.tokenTypeOverrides[tokenType];
+    }
+  }
 
   var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
   ,   ulRE = /^[*\-+]\s+/
@@ -152,7 +164,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
         state.indentation -= 4;
         state.indentedCode = true;
-        return code;
+        return tokenTypes.code;
       } else {
         return null;
       }
@@ -178,7 +190,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return switchInline(stream, state, footnoteLink);
     } else if (stream.match(hrRE, true)) {
       state.hr = true;
-      return hr;
+      return tokenTypes.hr;
     } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
       var listType = null;
       if (stream.match(ulRE, true)) {
@@ -231,7 +243,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return state.localMode.token(stream, state.localState);
     } else {
       stream.skipToEnd();
-      return code;
+      return tokenTypes.code;
     }
   }
 
@@ -252,22 +264,22 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     var styles = [];
 
     if (state.formatting) {
-      styles.push(formatting);
+      styles.push(tokenTypes.formatting);
 
       if (typeof state.formatting === "string") state.formatting = [state.formatting];
 
       for (var i = 0; i < state.formatting.length; i++) {
-        styles.push(formatting + "-" + state.formatting[i]);
+        styles.push(tokenTypes.formatting + "-" + state.formatting[i]);
 
         if (state.formatting[i] === "header") {
-          styles.push(formatting + "-" + state.formatting[i] + "-" + state.header);
+          styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.header);
         }
 
         // Add `formatting-quote` and `formatting-quote-#` for blockquotes
         // Add `error` instead if the maximum blockquote nesting depth is passed
         if (state.formatting[i] === "quote") {
           if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
-            styles.push(formatting + "-" + state.formatting[i] + "-" + state.quote);
+            styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.quote);
           } else {
             styles.push("error");
           }
@@ -285,38 +297,36 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (state.linkHref) {
-      styles.push(linkhref, "url");
+      styles.push(tokenTypes.linkHref, "url");
     } else { // Only apply inline styles to non-url text
-      if (state.strong) { styles.push(strong); }
-      if (state.em) { styles.push(em); }
-      if (state.strikethrough) { styles.push(strikethrough); }
-
-      if (state.linkText) { styles.push(linktext); }
-
-      if (state.code) { styles.push(code); }
+      if (state.strong) { styles.push(tokenTypes.strong); }
+      if (state.em) { styles.push(tokenTypes.em); }
+      if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
+      if (state.linkText) { styles.push(tokenTypes.linkText); }
+      if (state.code) { styles.push(tokenTypes.code); }
     }
 
-    if (state.header) { styles.push(header); styles.push(header + "-" + state.header); }
+    if (state.header) { styles.push(tokenTypes.header, tokenTypes.header + "-" + state.header); }
 
     if (state.quote) {
-      styles.push(quote);
+      styles.push(tokenTypes.quote);
 
       // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth
       if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
-        styles.push(quote + "-" + state.quote);
+        styles.push(tokenTypes.quote + "-" + state.quote);
       } else {
-        styles.push(quote + "-" + modeCfg.maxBlockquoteDepth);
+        styles.push(tokenTypes.quote + "-" + modeCfg.maxBlockquoteDepth);
       }
     }
 
     if (state.list !== false) {
       var listMod = (state.listDepth - 1) % 3;
       if (!listMod) {
-        styles.push(list1);
+        styles.push(tokenTypes.list1);
       } else if (listMod === 1) {
-        styles.push(list2);
+        styles.push(tokenTypes.list2);
       } else {
-        styles.push(list3);
+        styles.push(tokenTypes.list3);
       }
     }
 
@@ -372,7 +382,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       stream.next();
       if (modeCfg.highlightFormatting) {
         var type = getType(state);
-        return type ? type + " formatting-escape" : "formatting-escape";
+        var formattingEscape = tokenTypes.formatting + "-escape";
+        return type ? type + " " + formattingEscape : formattingEscape;
       }
     }
 
@@ -386,7 +397,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
       var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
       if (stream.match(new RegExp(regex), true)) {
-        return linkhref;
+        return tokenTypes.linkHref;
       }
     }
 
@@ -417,7 +428,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
       stream.match(/\[[^\]]*\]/);
       state.inline = state.f = linkHref;
-      return image;
+      return tokenTypes.image;
     }
 
     if (ch === '[' && stream.match(/.*\](\(.*\)| ?\[.*\])/, false)) {
@@ -443,7 +454,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       } else {
         type = "";
       }
-      return type + linkinline;
+      return type + tokenTypes.linkInline;
     }
 
     if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
@@ -455,7 +466,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       } else {
         type = "";
       }
-      return type + linkemail;
+      return type + tokenTypes.linkEmail;
     }
 
     if (ch === '<' && stream.match(/^(!--|\w)/, false)) {
@@ -564,12 +575,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       } else {
         type = "";
       }
-      return type + linkinline;
+      return type + tokenTypes.linkInline;
     }
 
     stream.match(/^[^>]+/, true);
 
-    return linkinline;
+    return tokenTypes.linkInline;
   }
 
   function linkHref(stream, state) {
@@ -630,7 +641,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     stream.match(/^[^\]]+/, true);
 
-    return linktext;
+    return tokenTypes.linkText;
   }
 
   function footnoteUrl(stream, state) {
@@ -647,7 +658,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
     }
     state.f = state.inline = inlineNormal;
-    return linkhref + " url";
+    return tokenTypes.linkHref + " url";
   }
 
   var savedInlineRE = [];
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 78b6c685af..f9cc27c3b4 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -10,6 +10,35 @@
   function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); }
   var modeFenced = CodeMirror.getMode({tabSize: 4}, {name: "markdown", fencedCodeBlocks: true});
   function FencedTest(name) { test.mode(name, modeFenced, Array.prototype.slice.call(arguments, 1)); }
+  var modeOverrideClasses = CodeMirror.getMode({tabsize: 4}, {
+    name: "markdown",
+    strikethrough: true,
+    tokenTypeOverrides: {
+      "header" : "override-header",
+      "code" : "override-code",
+      "quote" : "override-quote",
+      "list1" : "override-list1",
+      "list2" : "override-list2",
+      "list3" : "override-list3",
+      "hr" : "override-hr",
+      "image" : "override-image",
+      "linkInline" : "override-link-inline",
+      "linkEmail" : "override-link-email",
+      "linkText" : "override-link-text",
+      "linkHref" : "override-link-href",
+      "em" : "override-em",
+      "strong" : "override-strong",
+      "strikethrough" : "override-strikethrough"
+  }});
+  function TokenTypeOverrideTest(name) { test.mode(name, modeOverrideClasses, Array.prototype.slice.call(arguments, 1)); }
+  var modeFormattingOverride = CodeMirror.getMode({tabsize: 4}, {
+    name: "markdown",
+    highlightFormatting: true,
+    tokenTypeOverrides: {
+      "formatting" : "override-formatting"
+  }});
+  function FormatTokenTypeOverrideTest(name) { test.mode(name, modeFormattingOverride, Array.prototype.slice.call(arguments, 1)); }
+
 
   FT("formatting_emAsterisk",
      "[em&formatting&formatting-em *][em foo][em&formatting&formatting-em *]");
@@ -774,6 +803,76 @@
      "\\",
      "[em *foo*]");
 
+  // Class override tests
+  TokenTypeOverrideTest("overrideHeader1",
+    "[override-header&override-header-1 # Foo]");
+
+  TokenTypeOverrideTest("overrideHeader2",
+    "[override-header&override-header-2 ## Foo]");
+
+  TokenTypeOverrideTest("overrideHeader3",
+    "[override-header&override-header-3 ### Foo]");
+
+  TokenTypeOverrideTest("overrideHeader4",
+    "[override-header&override-header-4 #### Foo]");
+
+  TokenTypeOverrideTest("overrideHeader5",
+    "[override-header&override-header-5 ##### Foo]");
+
+  TokenTypeOverrideTest("overrideHeader6",
+    "[override-header&override-header-6 ###### Foo]");
+
+  TokenTypeOverrideTest("overrideCode",
+    "[override-code `foo`]");
+
+  TokenTypeOverrideTest("overrideCodeBlock",
+    "[override-code ```]",
+    "[override-code foo]",
+    "[override-code ```]");
+
+  TokenTypeOverrideTest("overrideQuote",
+    "[override-quote&override-quote-1 > foo]",
+    "[override-quote&override-quote-1 > bar]");
+
+  TokenTypeOverrideTest("overrideQuoteNested",
+    "[override-quote&override-quote-1 > foo]",
+    "[override-quote&override-quote-1 >][override-quote&override-quote-2 > bar]",
+    "[override-quote&override-quote-1 >][override-quote&override-quote-2 >][override-quote&override-quote-3 > baz]");
+
+  TokenTypeOverrideTest("overrideLists",
+    "[override-list1 - foo]",
+    "",
+    "    [override-list2 + bar]",
+    "",
+    "        [override-list3 * baz]",
+    "",
+    "            [override-list1 1. qux]",
+    "",
+    "                [override-list2 - quux]");
+
+  TokenTypeOverrideTest("overrideHr",
+    "[override-hr * * *]");
+
+  TokenTypeOverrideTest("overrideImage",
+    "[override-image ![[foo]]][override-link-href&url (http://example.com/)]")
+
+  TokenTypeOverrideTest("overrideLinkText",
+    "[override-link-text [[foo]]][override-link-href&url (http://example.com)]");
+
+  TokenTypeOverrideTest("overrideLinkEmailAndInline",
+    "[override-link-email <][override-link-inline foo@example.com>]");
+
+  TokenTypeOverrideTest("overrideEm",
+    "[override-em *foo*]");
+
+  TokenTypeOverrideTest("overrideStrong",
+    "[override-strong **foo**]");
+
+  TokenTypeOverrideTest("overrideStrikethrough",
+    "[override-strikethrough ~~foo~~]");
+
+  FormatTokenTypeOverrideTest("overrideFormatting",
+    "[override-formatting-escape \\*]");
 
   // Tests to make sure GFM-specific things aren't getting through
 

From bc008c070f19ee1e6902384a69317f84774d17de Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Fri, 9 Oct 2015 22:15:35 +0200
Subject: [PATCH 2409/4742] [bespin, hopskotch, isotope, and railscasts themes]
 Add

---
 theme/bespin.css     | 33 +++++++++++++++++++++++++++++++++
 theme/hopscotch.css  | 33 +++++++++++++++++++++++++++++++++
 theme/isotope.css    | 33 +++++++++++++++++++++++++++++++++
 theme/railscasts.css | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 132 insertions(+)
 create mode 100644 theme/bespin.css
 create mode 100644 theme/hopscotch.css
 create mode 100644 theme/isotope.css
 create mode 100644 theme/railscasts.css

diff --git a/theme/bespin.css b/theme/bespin.css
new file mode 100644
index 0000000000..1265a672b1
--- /dev/null
+++ b/theme/bespin.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       Bespin
+    Author:     Mozilla / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
+.cm-s-bespin div.CodeMirror-selected {background: #36312e !important;}
+.cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
+.cm-s-bespin .CodeMirror-linenumber {color: #666666;}
+.cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}
+
+.cm-s-bespin span.cm-comment {color: #937121;}
+.cm-s-bespin span.cm-atom {color: #9b859d;}
+.cm-s-bespin span.cm-number {color: #9b859d;}
+
+.cm-s-bespin span.cm-property, .cm-s-bespin span.cm-attribute {color: #54be0d;}
+.cm-s-bespin span.cm-keyword {color: #cf6a4c;}
+.cm-s-bespin span.cm-string {color: #f9ee98;}
+
+.cm-s-bespin span.cm-variable {color: #54be0d;}
+.cm-s-bespin span.cm-variable-2 {color: #5ea6ea;}
+.cm-s-bespin span.cm-def {color: #cf7d34;}
+.cm-s-bespin span.cm-error {background: #cf6a4c; color: #797977;}
+.cm-s-bespin span.cm-bracket {color: #9d9b97;}
+.cm-s-bespin span.cm-tag {color: #cf6a4c;}
+.cm-s-bespin span.cm-link {color: #9b859d;}
+
+.cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/hopscotch.css b/theme/hopscotch.css
new file mode 100644
index 0000000000..dd1d2add47
--- /dev/null
+++ b/theme/hopscotch.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       Hopscotch
+    Author:     Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-hopscotch.CodeMirror {background: #322931; color: #d5d3d5;}
+.cm-s-hopscotch div.CodeMirror-selected {background: #433b42 !important;}
+.cm-s-hopscotch .CodeMirror-gutters {background: #322931; border-right: 0px;}
+.cm-s-hopscotch .CodeMirror-linenumber {color: #797379;}
+.cm-s-hopscotch .CodeMirror-cursor {border-left: 1px solid #989498 !important;}
+
+.cm-s-hopscotch span.cm-comment {color: #b33508;}
+.cm-s-hopscotch span.cm-atom {color: #c85e7c;}
+.cm-s-hopscotch span.cm-number {color: #c85e7c;}
+
+.cm-s-hopscotch span.cm-property, .cm-s-hopscotch span.cm-attribute {color: #8fc13e;}
+.cm-s-hopscotch span.cm-keyword {color: #dd464c;}
+.cm-s-hopscotch span.cm-string {color: #fdcc59;}
+
+.cm-s-hopscotch span.cm-variable {color: #8fc13e;}
+.cm-s-hopscotch span.cm-variable-2 {color: #1290bf;}
+.cm-s-hopscotch span.cm-def {color: #fd8b19;}
+.cm-s-hopscotch span.cm-error {background: #dd464c; color: #989498;}
+.cm-s-hopscotch span.cm-bracket {color: #d5d3d5;}
+.cm-s-hopscotch span.cm-tag {color: #dd464c;}
+.cm-s-hopscotch span.cm-link {color: #c85e7c;}
+
+.cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/isotope.css b/theme/isotope.css
new file mode 100644
index 0000000000..1fe8ce08d5
--- /dev/null
+++ b/theme/isotope.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       Isotope
+    Author:     David Desandro / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-isotope.CodeMirror {background: #000000; color: #e0e0e0;}
+.cm-s-isotope div.CodeMirror-selected {background: #404040 !important;}
+.cm-s-isotope .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-isotope .CodeMirror-linenumber {color: #808080;}
+.cm-s-isotope .CodeMirror-cursor {border-left: 1px solid #c0c0c0 !important;}
+
+.cm-s-isotope span.cm-comment {color: #3300ff;}
+.cm-s-isotope span.cm-atom {color: #cc00ff;}
+.cm-s-isotope span.cm-number {color: #cc00ff;}
+
+.cm-s-isotope span.cm-property, .cm-s-isotope span.cm-attribute {color: #33ff00;}
+.cm-s-isotope span.cm-keyword {color: #ff0000;}
+.cm-s-isotope span.cm-string {color: #ff0099;}
+
+.cm-s-isotope span.cm-variable {color: #33ff00;}
+.cm-s-isotope span.cm-variable-2 {color: #0066ff;}
+.cm-s-isotope span.cm-def {color: #ff9900;}
+.cm-s-isotope span.cm-error {background: #ff0000; color: #c0c0c0;}
+.cm-s-isotope span.cm-bracket {color: #e0e0e0;}
+.cm-s-isotope span.cm-tag {color: #ff0000;}
+.cm-s-isotope span.cm-link {color: #cc00ff;}
+
+.cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
diff --git a/theme/railscasts.css b/theme/railscasts.css
new file mode 100644
index 0000000000..34fc951eab
--- /dev/null
+++ b/theme/railscasts.css
@@ -0,0 +1,33 @@
+/*
+
+    Name:       Railscasts
+    Author:     Ryan Bates (http://railscasts.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-railscasts.CodeMirror {background: #2b2b2b; color: #f4f1ed;}
+.cm-s-railscasts div.CodeMirror-selected {background: #272935 !important;}
+.cm-s-railscasts .CodeMirror-gutters {background: #2b2b2b; border-right: 0px;}
+.cm-s-railscasts .CodeMirror-linenumber {color: #5a647e;}
+.cm-s-railscasts .CodeMirror-cursor {border-left: 1px solid #d4cfc9 !important;}
+
+.cm-s-railscasts span.cm-comment {color: #bc9458;}
+.cm-s-railscasts span.cm-atom {color: #b6b3eb;}
+.cm-s-railscasts span.cm-number {color: #b6b3eb;}
+
+.cm-s-railscasts span.cm-property, .cm-s-railscasts span.cm-attribute {color: #a5c261;}
+.cm-s-railscasts span.cm-keyword {color: #da4939;}
+.cm-s-railscasts span.cm-string {color: #ffc66d;}
+
+.cm-s-railscasts span.cm-variable {color: #a5c261;}
+.cm-s-railscasts span.cm-variable-2 {color: #6d9cbe;}
+.cm-s-railscasts span.cm-def {color: #cc7833;}
+.cm-s-railscasts span.cm-error {background: #da4939; color: #d4cfc9;}
+.cm-s-railscasts span.cm-bracket {color: #f4f1ed;}
+.cm-s-railscasts span.cm-tag {color: #da4939;}
+.cm-s-railscasts span.cm-link {color: #b6b3eb;}
+
+.cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

From 960bacc91e8faeec9372b12a5645035a9405762e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 16 Oct 2015 16:20:21 +0200
Subject: [PATCH 2410/4742] [bespin, hopskotch, isotop, railscasts themes]
 Integrate

Issue #3586
---
 demo/theme.html      | 8 ++++++++
 theme/bespin.css     | 1 +
 theme/hopscotch.css  | 1 +
 theme/isotope.css    | 1 +
 theme/railscasts.css | 1 +
 5 files changed, 12 insertions(+)

diff --git a/demo/theme.html b/demo/theme.html
index 3c6b1c07de..300e2625e3 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -10,6 +10,7 @@
 <link rel="stylesheet" href="../theme/abcdef.css">
 <link rel="stylesheet" href="../theme/ambiance.css">
 <link rel="stylesheet" href="../theme/base16-dark.css">
+<link rel="stylesheet" href="../theme/bespin.css">
 <link rel="stylesheet" href="../theme/base16-light.css">
 <link rel="stylesheet" href="../theme/blackboard.css">
 <link rel="stylesheet" href="../theme/cobalt.css">
@@ -18,7 +19,9 @@
 <link rel="stylesheet" href="../theme/eclipse.css">
 <link rel="stylesheet" href="../theme/elegant.css">
 <link rel="stylesheet" href="../theme/erlang-dark.css">
+<link rel="stylesheet" href="../theme/hopscotch.css">
 <link rel="stylesheet" href="../theme/icecoder.css">
+<link rel="stylesheet" href="../theme/isotope.css">
 <link rel="stylesheet" href="../theme/lesser-dark.css">
 <link rel="stylesheet" href="../theme/liquibyte.css">
 <link rel="stylesheet" href="../theme/material.css">
@@ -32,6 +35,7 @@
 <link rel="stylesheet" href="../theme/paraiso-dark.css">
 <link rel="stylesheet" href="../theme/paraiso-light.css">
 <link rel="stylesheet" href="../theme/pastel-on-dark.css">
+<link rel="stylesheet" href="../theme/railscasts.css">
 <link rel="stylesheet" href="../theme/rubyblue.css">
 <link rel="stylesheet" href="../theme/seti.css">
 <link rel="stylesheet" href="../theme/solarized.css">
@@ -89,6 +93,7 @@ <h2>Theme Demo</h2>
     <option>ambiance</option>
     <option>base16-dark</option>
     <option>base16-light</option>
+    <option>bespin</option>
     <option>blackboard</option>
     <option>cobalt</option>
     <option>colorforth</option>
@@ -96,7 +101,9 @@ <h2>Theme Demo</h2>
     <option>eclipse</option>
     <option>elegant</option>
     <option>erlang-dark</option>
+    <option>hopscotch</option>
     <option>icecoder</option>
+    <option>isotope</option>
     <option>lesser-dark</option>
     <option>liquibyte</option>
     <option>material</option>
@@ -110,6 +117,7 @@ <h2>Theme Demo</h2>
     <option>paraiso-dark</option>
     <option>paraiso-light</option>
     <option>pastel-on-dark</option>
+    <option>railscasts</option>
     <option>rubyblue</option>
     <option>seti</option>
     <option>solarized dark</option>
diff --git a/theme/bespin.css b/theme/bespin.css
index 1265a672b1..60913ba938 100644
--- a/theme/bespin.css
+++ b/theme/bespin.css
@@ -31,3 +31,4 @@
 .cm-s-bespin span.cm-link {color: #9b859d;}
 
 .cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }
diff --git a/theme/hopscotch.css b/theme/hopscotch.css
index dd1d2add47..7d05431bdc 100644
--- a/theme/hopscotch.css
+++ b/theme/hopscotch.css
@@ -31,3 +31,4 @@
 .cm-s-hopscotch span.cm-link {color: #c85e7c;}
 
 .cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }
diff --git a/theme/isotope.css b/theme/isotope.css
index 1fe8ce08d5..d0d6263cf4 100644
--- a/theme/isotope.css
+++ b/theme/isotope.css
@@ -31,3 +31,4 @@
 .cm-s-isotope span.cm-link {color: #cc00ff;}
 
 .cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }
diff --git a/theme/railscasts.css b/theme/railscasts.css
index 34fc951eab..aeff0449d5 100644
--- a/theme/railscasts.css
+++ b/theme/railscasts.css
@@ -31,3 +31,4 @@
 .cm-s-railscasts span.cm-link {color: #b6b3eb;}
 
 .cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }

From 0073840889e3b50af08aafa3b06348f024d7ae2c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Oct 2015 13:34:26 +0200
Subject: [PATCH 2411/4742] [merge addon] Stop trying to require
 diff_match_patch

Issue #3593
---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index b4114a232a..3ee75e751a 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -5,7 +5,7 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("diff_match_patch"));
+    mod(require("../../lib/codemirror")); // Note non-packaged dependency diff_match_patch
   else if (typeof define == "function" && define.amd) // AMD
     define(["../../lib/codemirror", "diff_match_patch"], mod);
   else // Plain browser env

From a06e2e1e08b6788f044c486f4772c3dc909a4956 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 19 Oct 2015 13:47:53 +0200
Subject: [PATCH 2412/4742] [clike mode] Support indent hook, use it to improve
 @property indent in objc

Closes #3592
---
 mode/clike/clike.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index d4b7438b9d..603e48ce46 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -214,6 +214,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       if (isStatement(ctx.type) && firstChar == "}") ctx = ctx.prev;
+      if (hooks.indent) {
+        var hook = hooks.indent(state, ctx, textAfter);
+        if (typeof hook == "number") return hook
+      }
       var closing = firstChar == ctx.type;
       var switchBlock = ctx.prev && ctx.prev.type == "switchstatement";
       if (isStatement(ctx.type))
@@ -636,7 +640,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         stream.eatWhile(/[\w\$]/);
         return "keyword";
       },
-      "#": cppHook
+      "#": cppHook,
+      indent: function(_state, ctx, textAfter) {
+        if (ctx.type == "statement" && /^@\w/.test(textAfter)) return ctx.indented
+      }
     },
     modeProps: {fold: "brace"}
   });

From 71ac921c4385c7bfcbaa6c83ab105172a0049728 Mon Sep 17 00:00:00 2001
From: Caitlin Potter <caitpotter88@gmail.com>
Date: Tue, 20 Oct 2015 02:48:10 -0400
Subject: [PATCH 2413/4742] [javascript mode] Add a test for new.target

---
 mode/javascript/test.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index de71d8c95d..252e064dcc 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -158,6 +158,14 @@
      "  [keyword return] [variable-2 x];",
      "}");
 
+  MT("new_target",
+     "[keyword function] [def F]([def target]) {",
+     "  [keyword if] ([variable-2 target] [operator &&] [keyword new].[keyword target].[property name]) {",
+     "    [keyword return] [keyword new]",
+     "      .[keyword target];",
+     "  }",
+     "}");
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 457468315e8175befd7464d55f4c5eeabf76186e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 20 Oct 2015 10:01:40 +0200
Subject: [PATCH 2414/4742] [javascript mode] Implement new.target

Issue #3607
---
 mode/javascript/javascript.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 106111d837..b961b89011 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -30,7 +30,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     var jsKeywords = {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, "debugger": C,
+      "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C,
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
       "async": kw("async"), "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
@@ -122,7 +122,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         stream.skipToEnd();
         return ret("comment", "comment");
       } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-               state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
+                 state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
         readRegexp(stream);
         stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
         return ret("regexp", "string-2");
@@ -380,7 +380,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
-    if (type == "quasi") { return pass(quasi, maybeop); }
+    if (type == "quasi") return pass(quasi, maybeop);
+    if (type == "new") return cont(maybeTarget(noComma));
     return cont();
   }
   function maybeexpression(type) {
@@ -431,6 +432,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     findFatArrow(cx.stream, cx.state);
     return pass(type == "{" ? statement : expressionNoComma);
   }
+  function maybeTarget(noComma) {
+    return function(type) {
+      if (type == ".") return cont(noComma ? targetNoComma : target);
+      else return pass(noComma ? expressionNoComma : expression);
+    };
+  }
+  function target(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); }
+  }
+  function targetNoComma(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); }
+  }
   function maybelabel(type) {
     if (type == ":") return cont(poplex, statement);
     return pass(maybeoperatorComma, expect(";"), poplex);

From 4df95b1501ff4ad66d2d65d0c065ff7623a50fae Mon Sep 17 00:00:00 2001
From: Basarat Ali Syed <basaratali@gmail.com>
Date: Tue, 20 Oct 2015 09:26:12 +1100
Subject: [PATCH 2415/4742] :memo: `+input` origin documentation

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

diff --git a/doc/manual.html b/doc/manual.html
index 4cc4a39c25..6221e04790 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1311,7 +1311,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
         collapsed or both non-collapsed), the new one will replace the
         old one. When it starts with <code>*</code>, it will always
         replace the previous event (if that had the same origin).
-        Built-in motion uses the <code>"+move"</code> origin.</dd>
+        Built-in motion uses the <code>"+move"</code> origin. User input uses the <code>"+input"</code> origin.</dd>
         <dt id="selection_bias"><code><strong>bias</strong>: number</code></dt>
         <dd>Determine the direction into which the selection endpoints
         should be adjusted when they fall inside

From d71a32856823c047b995b7178c28c9ce9dce20f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 20 Oct 2015 11:08:21 +0200
Subject: [PATCH 2416/4742] [merge addon] Don't suppress highlight updates when
 collapsing code

Since collapsing might move previously hidden code into the viewport

Issue #3599
---
 addon/merge/merge.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 3ee75e751a..830a5f027a 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -471,13 +471,10 @@
     if (left) left.init(leftPane, origLeft, options);
     if (right) right.init(rightPane, origRight, options);
 
-    if (options.collapseIdentical) {
-      updating = true;
+    if (options.collapseIdentical)
       this.editor().operation(function() {
         collapseIdenticalStretches(self, options.collapseIdentical);
       });
-      updating = false;
-    }
     if (options.connect == "align") {
       this.aligners = [];
       alignChunks(this.left || this.right, true);

From c7274043fd9db6e48524e41c5f60c8aa5f731768 Mon Sep 17 00:00:00 2001
From: idleberg <jan@idleberg.com>
Date: Tue, 20 Oct 2015 10:58:05 +0200
Subject: [PATCH 2417/4742] [mode meta] List NSIS mode

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

diff --git a/mode/meta.js b/mode/meta.js
index 7d6a6e1bf4..7af51c1ec5 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -83,6 +83,7 @@
     {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},
+    {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
     {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
     {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},

From 300e65942c0f93f37f80cab26f6b79bc0ad7001b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 20 Oct 2015 11:29:22 +0200
Subject: [PATCH 2418/4742] Mark release 5.8

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

diff --git a/AUTHORS b/AUTHORS
index 78dd06f062..1e3ece23e0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Alex Piggott
 Aliaksei Chapyzhenka
 Allen Sarkisyan
 Amin Shali
+amshali@google.com
 Amsul
 amuntean
 Amy
@@ -63,6 +64,8 @@ as3boyan
 AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
+Barret Rennie
+Basarat Ali Syed
 Bastian Müller
 belhaj
 Bem Jones-Bey
@@ -86,6 +89,7 @@ Brett Zamir
 Brian Grinstead
 Brian Sletten
 Bruce Mitchener
+Caitlin Potter
 Calin Barbat
 Chandra Sekhar Pydi
 Charles Skelton
@@ -144,6 +148,7 @@ duralog
 eborden
 edsharp
 ekhaled
+Elisée
 Enam Mijbah Noor
 Eric Allam
 eustas
@@ -196,6 +201,7 @@ Ian Wehrman
 Ian Wetherbee
 Ice White
 ICHIKAWA, Yuji
+idleberg
 ilvalle
 Ingo Richter
 Irakli Gozalishvili
@@ -230,6 +236,7 @@ Jeremy Parmenter
 Jochen Berger
 Johan Ask
 John Connor
+John Engler
 John Lees-Miller
 John Snelson
 John Van Der Loo
@@ -296,12 +303,15 @@ Marek Rudnicki
 Marijn Haverbeke
 Mário Gonçalves
 Mario Pietsch
+Mark Anderson
 Mark Lentczner
 Marko Bonaci
+Markus Bordihn
 Martin Balek
 Martín Gaitán
 Martin Hasoň
 Martin Hunt
+Martin Laine
 Martin Zagora
 Mason Malone
 Mateusz Paprocki
@@ -327,6 +337,7 @@ melpon
 Metatheos
 Micah Dubinko
 Michael
+Michael Goderbauer
 Michael Grey
 Michael Kaminsky
 Michael Lehenbauer
@@ -386,6 +397,7 @@ Pavel Feldman
 Pavel Strashkin
 Paweł Bartkiewicz
 peteguhl
+peter
 Peter Flynn
 peterkroon
 Peter Kroon
@@ -420,6 +432,7 @@ Sascha Peilicke
 satamas
 satchmorun
 sathyamoorthi
+S. Chris Colbert
 SCLINIC\jdecker
 Scott Aikin
 Scott Goodhew
diff --git a/doc/compress.html b/doc/compress.html
index 0b11e1362c..6a183ca528 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.8.0;f=">5.8</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.7.0;f=">5.7</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.6.0;f=">5.6</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.5.0;f=">5.5</option>
diff --git a/doc/manual.html b/doc/manual.html
index 6221e04790..480a029bf4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.7.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.8.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 b2685f5714..3d841ef6e8 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,7 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
-  <p class="rel">20-08-2015: <a href="http://codemirror.net/codemirror-5.7.zip">Version 5.7</a>:</p>
+  <p class="rel">20-10-2015: <a href="http://codemirror.net/codemirror-5.8.zip">Version 5.8</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fixes an infinite loop in
+    the <a href="manual.html#addon_hardwrap">hardwrap
+    addon</a></li>
+    <li>New modes: <a href="../mode/nsis/index.html">NSIS</a>, <a href="../mode/clike/index.html">Ceylon</a></li>
+    <li>The Kotlin mode is now a <a href="../mode/clike/index.html">clike</a> dialect, rather than a stand-alone mode</li>
+    <li>New option: <a href="manual.html#option_allowDropFileTypes"><code>allowDropFileTypes</code></a>. Binary files can no longer be dropped into CodeMirror</li>
+    <li>New themes: <a href="../demo/theme.html#bespin">bespin</a>, <a href="../demo/theme.html#hopscotch">hopscotch</a>, <a href="../demo/theme.html#isotope">isotope</a>, <a href="../demo/theme.html#railscasts">railscasts</a></li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.7.0...5.8.0">list of patches</a></li>
+  </ul>
+
+  <p class="rel">20-09-2015: <a href="http://codemirror.net/codemirror-5.7.zip">Version 5.7</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/vue/index.html">Vue</a>, <a href="../mode/oz/index.html">Oz</a>, <a href="../mode/mscgen/index.html">MscGen</a> (and dialects), <a href="../mode/css/gss.html">Closure Stylesheets</a></li>
diff --git a/index.html b/index.html
index 69dcf71d92..d0cb55c34b 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.7</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.8</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 c13f954352..e08dedea4e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8850,7 +8850,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.7.1";
+  CodeMirror.version = "5.8.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 9e2175750c..bda0357da9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.7.1",
+    "version":"5.8.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 9de718f4621c8fafde9d409698679bc07c52b16e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 20 Oct 2015 11:33:07 +0200
Subject: [PATCH 2419/4742] Bump version number post-5.8

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 480a029bf4..8916b57f3f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.8.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.8.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index e08dedea4e..489bef5d01 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8850,7 +8850,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.8.0";
+  CodeMirror.version = "5.8.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index bda0357da9..934af6a0fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.8.0",
+    "version":"5.8.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 07779394f3d5b756abc2f54e15999134627436a7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 26 Oct 2015 09:24:04 +0100
Subject: [PATCH 2420/4742] [clike mode] Highlight float as a type, not a
 keyword

Closes #3616
---
 mode/clike/clike.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

From c491ec264601d6c1416a44c6f204e25b8e9dca0c Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Tue, 20 Oct 2015 16:44:00 +0200
Subject: [PATCH 2421/4742] [nsis mode] Improve

---
 mode/nsis/index.html | 20 +++++++++++++++++++-
 mode/nsis/nsis.js    | 42 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/mode/nsis/index.html b/mode/nsis/index.html
index a1d7aaa586..2afae87f08 100644
--- a/mode/nsis/index.html
+++ b/mode/nsis/index.html
@@ -38,14 +38,32 @@ <h2>NSIS mode</h2>
 
 OutFile "demo.exe"
 RequestExecutionLevel user
+SetDetailsPrint listonly
 
 !include "LogicLib.nsh"
+!include "WinVer.nsh"
 
 Section -mandatory
+
+    Call logWinVer
+
     ${If} 1 > 0
       MessageBox MB_OK "Hello world"
     ${EndIf}
+
 SectionEnd
+
+Function logWinVer
+
+    ${If} ${IsWin10}
+        DetailPrint "Windows 10!"
+    ${ElseIf} ${AtLeastWinVista}
+        DetailPrint "We're post-XP"
+    ${Else}
+        DetailPrint "Legacy system"
+    ${EndIf}
+
+FunctionEnd
 </textarea>
 
 <script>
@@ -59,4 +77,4 @@ <h2>NSIS mode</h2>
 </script>
 
 <p><strong>MIME types defined:</strong> <code>text/x-nsis</code>.</p>
-</article>
+</article>
\ No newline at end of file
diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 93dd7421e8..4c73fb73a8 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -17,33 +17,65 @@ CodeMirror.defineSimpleMode("nsis",{
   start:[
     // Numbers
     {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
+
+    // Strings
+    { regex: /"(?:[^\\]|\\.)*?"/, token: "string" },
+    { regex: /'(?:[^\\]|\\.)*?'/, token: "string" },
+    { regex: /`(?:[^\\]|\\.)*?`/, token: "string" },
+
     // Compile Time Commands
     {regex: /(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+
     // Conditional Compilation
     {regex: /(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
     {regex: /(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
+
     // Runtime Commands
-    {regex: /(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /\b(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
     {regex: /\b(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
     {regex: /\b(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
-    // Options
+
+    // Command Options
     {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
     {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
 
-    // LogicLib
-    {regex: /\$\{(?:End(If|Unless|While)|Loop(?:Until)|Next)\}/, token: "variable-2", dedent: true},
-    {regex: /\$\{(?:Do(Until|While)|Else(?:If(?:Not)?)?|For(?:Each)?|(?:(?:And|Else|Or)?If(?:Cmd|Not|Then)?|Unless)|While)\}/, token: "variable-2", indent: true},
+    // LogicLib.nsh
+    {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/, token: "variable-2", indent: true},
+
+    // FileFunc.nsh
+    {regex: /\$\{(?:BannerTrimPath|DirState|DriveSpace|Get(BaseName|Drives|ExeName|ExePath|FileAttributes|FileExt|FileName|FileVersion|Options|OptionsS|Parameters|Parent|Root|Size|Time)|Locate|RefreshShellIcons)\}/, token: "variable-2", dedent: true},
+
+    // Memento.nsh
+    {regex: /\$\{(?:Memento(?:Section(?:Done|End|Restore|Save)?|UnselectedSection))\}/, token: "variable-2", dedent: true},
+
+    // TextFunc.nsh
+    {regex: /\$\{(?:Config(?:Read|ReadS|Write|WriteS)|File(?:Join|ReadFromEnd|Recode)|Line(?:Find|Read|Sum)|Text(?:Compare|CompareS)|TrimNewLines)\}/, token: "variable-2", dedent: true},
+
+    // WinVer.nsh
+    {regex: /\$\{(?:(?:At(?:Least|Most)|Is)(?:ServicePack|Win(?:7|8|10|95|98|200(?:0|3|8(?:R2)?)|ME|NT4|Vista|XP))|Is(?:NT|Server))\}/, token: "variable", dedent: true},
+
+    // WordFunc.nsh
+    {regex: /\$\{(?:StrFilterS?|Version(?:Compare|Convert)|Word(?:AddS?|Find(?:(?:2|3)X)?S?|InsertS?|ReplaceS?))\}/, token: "variable-2", dedent: true},
+
+    // x64.nsh
+    {regex: /\$\{(?:RunningX64)\}/, token: "variable", dedent: true},
+    {regex: /\$\{(?:Disable|Enable)X64FSRedirection\}/, token: "variable-2", dedent: true},
 
     // Line Comment
     {regex: /(#|;).*/, token: "comment"},
+
     // Block Comment
     {regex: /\/\*/, token: "comment", next: "comment"},
+
     // Operator
     {regex: /[-+\/*=<>!]+/, token: "operator"},
+
     // Variable
     {regex: /\$[\w]+/, token: "variable"},
+
     // Constant
     {regex: /\${[\w]+}/,token: "variable-2"},
+
     // Language String
     {regex: /\$\([\w]+\)/,token: "variable-3"}
   ],

From d05dc6ebf010b58e26863214959b2abfb3a939be Mon Sep 17 00:00:00 2001
From: TDaglis <ath.daglis@gmail.com>
Date: Wed, 21 Oct 2015 12:58:29 +0000
Subject: [PATCH 2422/4742] [django mode] Added template tag keywords

Added: filter, endfilter, elif, endblocktrans, endspaceless
---
 mode/django/django.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mode/django/django.js b/mode/django/django.js
index 2f08b06312..7fae876c16 100644
--- a/mode/django/django.js
+++ b/mode/django/django.js
@@ -14,14 +14,14 @@
   "use strict";
 
   CodeMirror.defineMode("django:inner", function() {
-    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", "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"],
+    var keywords = ["block", "endblock", "for", "endfor", "true", "false", "filter", "endfilter",
+                    "loop", "none", "self", "super", "if", "elif", "endif", "as", "else", "import",
+                    "with", "endwith", "without", "context", "ifequal", "endifequal", "ifnotequal",
+                    "endifnotequal", "extends", "include", "load", "comment", "endcomment",
+                    "empty", "url", "static", "trans", "blocktrans", "endblocktrans", "now",
+                    "regroup", "lorem", "ifchanged", "endifchanged", "firstof", "debug", "cycle",
+                    "csrf_token", "autoescape", "endautoescape", "spaceless", "endspaceless",
+                    "ssi", "templatetag", "verbatim", "endverbatim", "widthratio"],
         filters = ["add", "addslashes", "capfirst", "center", "cut", "date",
                    "default", "default_if_none", "dictsort",
                    "dictsortreversed", "divisibleby", "escape", "escapejs",

From 70ff0f663d6980e7d9c518d4bff13a6499d09d99 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 27 Oct 2015 16:05:14 +0100
Subject: [PATCH 2423/4742] Fire gutter events synchronously

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 489bef5d01..ae16a87f54 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3778,7 +3778,7 @@
 
   // Determines whether an event happened in the gutter, and fires the
   // handlers for the corresponding event.
-  function gutterEvent(cm, e, type, prevent, signalfn) {
+  function gutterEvent(cm, e, type, prevent) {
     try { var mX = e.clientX, mY = e.clientY; }
     catch(e) { return false; }
     if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
@@ -3795,14 +3795,14 @@
       if (g && g.getBoundingClientRect().right >= mX) {
         var line = lineAtHeight(cm.doc, mY);
         var gutter = cm.options.gutters[i];
-        signalfn(cm, type, cm, line, gutter, e);
+        signal(cm, type, cm, line, gutter, e);
         return e_defaultPrevented(e);
       }
     }
   }
 
   function clickInGutter(cm, e) {
-    return gutterEvent(cm, e, "gutterClick", true, signalLater);
+    return gutterEvent(cm, e, "gutterClick", true);
   }
 
   // Kludge to work around strange IE behavior where it'll sometimes
@@ -4241,7 +4241,7 @@
 
   function contextMenuInGutter(cm, e) {
     if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
+    return gutterEvent(cm, e, "gutterContextMenu", false);
   }
 
   // UPDATING

From aebf68bf574bfc6f7ad09ad7736714eb6b134623 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 27 Oct 2015 16:43:01 +0100
Subject: [PATCH 2424/4742] Don't refocus editor when the document doesn't have
 focus

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ae16a87f54..d914807e72 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3093,7 +3093,8 @@
 
     if (cm.state.focused && op.updateInput)
       cm.display.input.reset(op.typing);
-    if (op.focus && op.focus == activeElt()) ensureFocus(op.cm);
+    if (op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus()))
+      ensureFocus(op.cm);
   }
 
   function endOperation_finish(op) {

From ff1baa7aac7dd23fe3902915d878c16885757dac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 27 Oct 2015 22:05:18 +0100
Subject: [PATCH 2425/4742] [tern addon] Close argument hint tooltip when
 destroying server

Issue ternjs/tern#668
---
 addon/tern/tern.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 3ff2d53e5f..c345c49781 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -135,6 +135,7 @@
     },
 
     destroy: function () {
+      closeArgHints(this)
       if (this.worker) {
         this.worker.terminate();
         this.worker = null;

From de1f27dc5d8540e263d88194f3e78e90fd735eac Mon Sep 17 00:00:00 2001
From: JobJob <jobba1@hotmail.com>
Date: Tue, 27 Oct 2015 19:49:37 +0200
Subject: [PATCH 2426/4742] [julia mode] Indent using codemirror option instead
 of hardcoded 4

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

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index d0a74cef59..17710647d1 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -283,7 +283,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") {
         delta = -1;
       }
-      return (state.scopes.length + delta) * 4;
+      return (state.scopes.length + delta) * _conf.indentUnit;
     },
 
     lineComment: "#",

From ba41e2f599d851d3db9649d866ec4ee08298fb8c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 28 Oct 2015 10:01:48 +0100
Subject: [PATCH 2427/4742] [clike mode] Add an allmanIndentation mode option

Issue #3581
---
 mode/clike/clike.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 65f37cee7e..85305d6949 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -220,6 +220,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
       var closing = firstChar == ctx.type;
       var switchBlock = ctx.prev && ctx.prev.type == "switchstatement";
+      if (parserConfig.allmanIndentation && /[{(]/.test(firstChar)) {
+        while (ctx.type != "top" && ctx.type != "}") ctx = ctx.prev
+        return ctx.indented
+      }
       if (isStatement(ctx.type))
         return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
       if (ctx.align && (!dontAlignCalls || ctx.type != ")"))

From 3e55a4c88e6368de5527bf0df6d2aafcb331f4f7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 28 Oct 2015 14:16:02 +0100
Subject: [PATCH 2428/4742] [runmode addon] Have node-based addon also replace
 the regular runmode module

---
 addon/runmode/runmode.node.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 8f345a32c7..b22a5187f3 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -176,3 +176,4 @@ exports.runMode = function(string, modespec, callback, options) {
 };
 
 require.cache[require.resolve("../../lib/codemirror")] = require.cache[require.resolve("./runmode.node")];
+require.cache[require.resolve("../../addon/runmode/runmode")] = require.cache[require.resolve("./runmode.node")];

From ede9de3deb230a1cc28345df695963c96eefa307 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 28 Oct 2015 18:09:05 +0100
Subject: [PATCH 2429/4742] [tern demo] Use protocol-relative urls

Closes #3569
---
 demo/tern.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/demo/tern.html b/demo/tern.html
index d5badfef6e..b5194447df 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -13,16 +13,16 @@
 <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://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>
-<script src="http://ternjs.net/lib/def.js"></script>
-<script src="http://ternjs.net/lib/comment.js"></script>
-<script src="http://ternjs.net/lib/infer.js"></script>
-<script src="http://ternjs.net/plugin/doc_comment.js"></script>
+<script src="//ternjs.net/node_modules/acorn/dist/acorn.js"></script>
+<script src="//ternjs.net/node_modules/acorn/dist/acorn_loose.js"></script>
+<script src="//ternjs.net/node_modules/acorn/dist/walk.js"></script>
+<script src="//ternjs.net/doc/demo/polyfill.js"></script>
+<script src="//ternjs.net/lib/signal.js"></script>
+<script src="//ternjs.net/lib/tern.js"></script>
+<script src="//ternjs.net/lib/def.js"></script>
+<script src="//ternjs.net/lib/comment.js"></script>
+<script src="//ternjs.net/lib/infer.js"></script>
+<script src="//ternjs.net/plugin/doc_comment.js"></script>
 <style>
       .CodeMirror {border: 1px solid #ddd;}
     </style>
@@ -109,7 +109,7 @@ <h2>Tern Demo</h2>
   }
 
   var server;
-  getURL("http://ternjs.net/defs/ecma5.json", function(err, code) {
+  getURL("//ternjs.net/defs/ecma5.json", function(err, code) {
     if (err) throw new Error("Request for ecma5.json: " + err);
     server = new CodeMirror.TernServer({defs: [JSON.parse(code)]});
     editor.setOption("extraKeys", {

From c375d82c98e0e2ce728a78d1a308471994730b9f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 28 Oct 2015 21:24:02 +0100
Subject: [PATCH 2430/4742] Use https link for discussion forum

---
 README.md  | 2 +-
 index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6c818272fd..ff2622a2b8 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ new functionality.
 You can find more information (and the
 [manual](http://codemirror.net/doc/manual.html)) on the [project
 page](http://codemirror.net). For questions and discussion, use the
-[discussion forum](http://discuss.codemirror.net/).
+[discussion forum](https://discuss.codemirror.net/).
 
 See
 [CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md)
diff --git a/index.html b/index.html
index d0cb55c34b..b29e0b51de 100644
--- a/index.html
+++ b/index.html
@@ -162,7 +162,7 @@ <h2>Community</h2>
   license that CodeMirror uses.</p>
 
   <p>Discussion around the project is done on
-  a <a href="http://discuss.codemirror.net">discussion forum</a>.
+  a <a href="https://discuss.codemirror.net">discussion forum</a>.
   There is also
   the <a href="http://groups.google.com/group/codemirror-announce">codemirror-announce</a>
   list, which is only used for major announcements (such as new

From 21f1d0ab6a054c56c8a8886bcef7e68efc0bc47f Mon Sep 17 00:00:00 2001
From: Basarat Ali Syed <basaratali@gmail.com>
Date: Thu, 29 Oct 2015 17:28:53 +1100
Subject: [PATCH 2431/4742] [search addon] Make sure search overlay always
 advances the stream

---
 addon/search/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index ac0f3254d7..93e90b36ed 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -29,7 +29,7 @@
       query.lastIndex = stream.pos;
       var match = query.exec(stream.string);
       if (match && match.index == stream.pos) {
-        stream.pos += match[0].length;
+        stream.pos += match[0].length || 1;
         return "searching";
       } else if (match) {
         stream.pos = match.index;

From a11ccbefa281a0e728b7431ba52f550854831ea6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Oct 2015 10:58:31 +0100
Subject: [PATCH 2432/4742] Improve handling of zero-width scrollbars

We now disable pointer events on them (again) and temporarily
re-enable those when scrolling.

Fixes a problem where you could not click to put the cursor
'under' the hidden scrollbar areas at the right and bottom.

Issue #2326
---
 lib/codemirror.js | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d914807e72..ff2f1a54eb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -410,7 +410,7 @@
       if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
     });
 
-    this.checkedOverlay = false;
+    this.checkedZeroWidth = false;
     // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
     if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
   }
@@ -445,29 +445,43 @@
         this.horiz.firstChild.style.width = "0";
       }
 
-      if (!this.checkedOverlay && measure.clientHeight > 0) {
-        if (sWidth == 0) this.overlayHack();
-        this.checkedOverlay = true;
+      if (!this.checkedZeroWidth && measure.clientHeight > 0) {
+        if (sWidth == 0) this.zeroWidthHack();
+        this.checkedZeroWidth = true;
       }
 
       return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
     },
     setScrollLeft: function(pos) {
       if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
+      if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz);
     },
     setScrollTop: function(pos) {
       if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
+      if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert);
     },
-    overlayHack: function() {
+    zeroWidthHack: function() {
       var w = mac && !mac_geMountainLion ? "12px" : "18px";
-      this.horiz.style.minHeight = this.vert.style.minWidth = w;
-      var self = this;
-      var barMouseDown = function(e) {
-        if (e_target(e) != self.vert && e_target(e) != self.horiz)
-          operation(self.cm, onMouseDown)(e);
-      };
-      on(this.vert, "mousedown", barMouseDown);
-      on(this.horiz, "mousedown", barMouseDown);
+      this.horiz.style.height = this.vert.style.width = w;
+      this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
+      this.disableHoriz = new Delayed;
+      this.disableVert = new Delayed;
+    },
+    enableZeroWidthBar: function(bar, delay) {
+      bar.style.pointerEvents = "auto";
+      function maybeDisable() {
+        // To find out whether the scrollbar is still visible, we
+        // check whether the element under the pixel in the bottom
+        // left corner of the scrollbar box is the scrollbar box
+        // itself (when the bar is still visible) or its filler child
+        // (when the bar is hidden). If it is still visible, we keep
+        // it enabled, if it's hidden, we disable pointer events.
+        var box = bar.getBoundingClientRect();
+        var elt = document.elementFromPoint(box.left + 1, box.bottom - 1);
+        if (elt != bar) bar.style.pointerEvents = "none";
+        else delay.set(1000, maybeDisable);
+      }
+      delay.set(1000, maybeDisable);
     },
     clear: function() {
       var parent = this.horiz.parentNode;

From 38131c44806f187153dfc3036b8c0437700b0f3d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 30 Oct 2015 11:05:54 +0100
Subject: [PATCH 2433/4742] [tests] Fix measuring of editor bottom in case of
 zero-width scrollbars

Issue #3517
---
 test/scroll_test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/scroll_test.js b/test/scroll_test.js
index 82fd126c48..55aac78ebb 100644
--- a/test/scroll_test.js
+++ b/test/scroll_test.js
@@ -19,14 +19,14 @@
   function barV(cm) { return byClassName(cm.getWrapperElement(), "CodeMirror-vscrollbar")[0]; }
 
   function displayBottom(cm, scrollbar) {
-    if (scrollbar)
+    if (scrollbar && cm.display.scroller.offsetHeight > cm.display.scroller.clientHeight)
       return barH(cm).getBoundingClientRect().top;
     else
       return cm.getWrapperElement().getBoundingClientRect().bottom - 1;
   }
 
   function displayRight(cm, scrollbar) {
-    if (scrollbar)
+    if (scrollbar && cm.display.scroller.offsetWidth > cm.display.scroller.clientWidth)
       return barV(cm).getBoundingClientRect().left;
     else
       return cm.getWrapperElement().getBoundingClientRect().right - 1;

From fec63b9bd4bee31f9dd6a49cb0571e342a32a89f Mon Sep 17 00:00:00 2001
From: Chad Jolly <cjolly@lawgical.com>
Date: Wed, 4 Nov 2015 17:23:19 -0700
Subject: [PATCH 2434/4742] [material theme] Fix cm-error style

it seems `.cm-error` lost some specificity in [this commit](https://github.com/codemirror/CodeMirror/commit/a7d443ec82c1806d24e25ad8014a4d8651409320#diff-33646e9ee4d04eedb98a991a636c2302L35) that causes the error state to have same color as the tag.
---
 theme/material.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/theme/material.css b/theme/material.css
index 26005e280d..91ed6cef29 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -32,10 +32,6 @@
 .cm-s-material .cm-atom { color: #F77669; }
 .cm-s-material .cm-number { color: #F77669; }
 .cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-error {
-  color: rgba(255, 255, 255, 1.0);
-  background-color: #EC5F67;
-}
 .cm-s-material .cm-string { color: #C3E88D; }
 .cm-s-material .cm-string-2 { color: #80CBC4; }
 .cm-s-material .cm-comment { color: #546E7A; }
@@ -47,6 +43,10 @@
 .cm-s-material .cm-qualifier { color: #DECB6B; }
 .cm-s-material .cm-variable-3 { color: #DECB6B; }
 .cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
+.cm-s-material .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #EC5F67;
+}
 .cm-s-material .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;

From 292a12a68eed18561754f27e5a29b2e4076845e9 Mon Sep 17 00:00:00 2001
From: Joseph Pecoraro <pecoraro@apple.com>
Date: Wed, 4 Nov 2015 14:27:16 -0800
Subject: [PATCH 2435/4742] [css mode] Support CSS4 #rrggbbaa and #rgba colors

Issue #3625
---
 mode/css/css.js  |  2 +-
 mode/css/test.js | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index d07426473b..b20b4907ec 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -228,7 +228,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     if (type == "}" || type == "{") return popAndPass(type, stream, state);
     if (type == "(") return pushContext(state, stream, "parens");
 
-    if (type == "hash" && !/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
+    if (type == "hash" && !/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(stream.current())) {
       override += " error";
     } else if (type == "word") {
       wordAsValue(stream);
diff --git a/mode/css/test.js b/mode/css/test.js
index 60f9c837f6..7a496fb091 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -55,11 +55,17 @@
   MT("tagColorHex3",
      "[tag foo] { [property background]: [atom #fff]; }");
 
+  MT("tagColorHex4",
+     "[tag foo] { [property background]: [atom #ffff]; }");
+
   MT("tagColorHex6",
      "[tag foo] { [property background]: [atom #ffffff]; }");
 
-  MT("tagColorHex4",
-     "[tag foo] { [property background]: [atom&error #ffff]; }");
+  MT("tagColorHex8",
+     "[tag foo] { [property background]: [atom #ffffffff]; }");
+
+  MT("tagColorHex5Invalid",
+     "[tag foo] { [property background]: [atom&error #fffff]; }");
 
   MT("tagColorHexInvalid",
      "[tag foo] { [property background]: [atom&error #ffg]; }");

From a155d5592034a40f5628a83f5e0223c17b18ca16 Mon Sep 17 00:00:00 2001
From: Michael Goderbauer <goderbauer@google.com>
Date: Mon, 2 Nov 2015 10:45:12 -0800
Subject: [PATCH 2436/4742] [dart mode] fix escaping in raw strings

In a raw string, a character following a "\" is not escaped.
---
 mode/dart/dart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 7d6e5abd96..b1ee37767a 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -95,7 +95,7 @@
           state.tokenize = null;
           break;
         }
-        escaped = !escaped && next == "\\";
+        escaped = !raw && !escaped && next == "\\";
       }
       return "string";
     }

From 11a00a46483c2f93992f549ec8052de1daf641d5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 7 Nov 2015 21:49:43 +0100
Subject: [PATCH 2437/4742] [clike mode] Tighten matching of number tokens

Closes #3623
---
 mode/clike/clike.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 85305d6949..566aa048e7 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -27,7 +27,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       indentSwitch = parserConfig.indentSwitch !== false,
       namespaceSeparator = parserConfig.namespaceSeparator,
       isPunctuationChar = parserConfig.isPunctuationChar || /[\[\]{}\(\),;\:\.]/,
-      isNumberChar = parserConfig.isNumberChar || /\d/,
+      numberStart = parserConfig.numberStart || /[\d\.]/,
+      number = parserConfig.number || /^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,
       isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/,
       endStatement = parserConfig.endStatement || /^[;:,]$/;
 
@@ -47,9 +48,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       curPunc = ch;
       return null;
     }
-    if (isNumberChar.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
+    if (numberStart.test(ch)) {
+      stream.backUp(1)
+      if (stream.match(number)) return "number"
+      stream.next()
     }
     if (ch == "/") {
       if (stream.eat("*")) {
@@ -706,7 +708,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                    " native optional sealed see serializable shared suppressWarnings tagged throws variable"),
     isPunctuationChar: /[\[\]{}\(\),;\:\.`]/,
     isOperatorChar: /[+\-*&%=<>!?|^~:\/]/,
-    isNumberChar: /[\d#$]/,
+    numberStart: /[\d#$]/,
+    number: /^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,
     multiLineStrings: true,
     typeFirstDefinitions: true,
     atoms: words("true false null larger smaller equal empty finished"),

From 1fedaa2e83d6cb76c827090d97bdcf88de614c6d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 7 Nov 2015 21:57:35 +0100
Subject: [PATCH 2438/4742] [emacs mode] Fix mistake in tests

---
 test/emacs_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/emacs_test.js b/test/emacs_test.js
index 01db618b24..124575c724 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -19,7 +19,7 @@
     var code;
     for (var c in CodeMirror.keyNames)
       if (CodeMirror.keyNames[c] == key) { code = c; break; }
-    if (c == null) throw new Error("Unknown key: " + key);
+    if (code == null) throw new Error("Unknown key: " + key);
 
     return eventCache[keyName] = {
       type: "keydown", keyCode: code, ctrlKey: ctrl, shiftKey: shift, altKey: alt,

From ae48869c2062e303eea278b1ed622a005af2656d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 7 Nov 2015 22:18:31 +0100
Subject: [PATCH 2439/4742] [annotatescrollbar addon] Use real scroll height,
 rather than end of last line

So that the annotations still make sense when scrollPastEnd is enabled

Closes #3630
---
 addon/scroll/annotatescrollbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index e62a45acf2..0bbd050c8e 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -51,7 +51,7 @@
   Annotation.prototype.computeScale = function() {
     var cm = this.cm;
     var hScale = (cm.getWrapperElement().clientHeight - cm.display.barHeight - this.buttonHeight * 2) /
-      cm.heightAtLine(cm.lastLine() + 1, "local");
+      cm.getScrollerElement().scrollHeight
     if (hScale != this.hScale) {
       this.hScale = hScale;
       return true;

From 5a6f158eedf354acd88f66f1d09c9b221fc636d8 Mon Sep 17 00:00:00 2001
From: Stu Kennedy <info@continuata.com>
Date: Wed, 11 Nov 2015 23:42:25 +0000
Subject: [PATCH 2440/4742] [show-hint addon] Change selected item in hint
 options on mousmove

Moving the mouse will change the selected hint option
---
 addon/hint/show-hint.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index a1e56c38be..b359208d4a 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -295,6 +295,12 @@
       setTimeout(function(){cm.focus();}, 20);
     });
 
+    CodeMirror.on(hints, "mousemove", function(e) {
+      var elt = getHintElement(hints, e.target || e.srcElement);
+      if (elt && elt.hintId != null)
+        widget.changeActive(elt.hintId);
+    });
+
     CodeMirror.signal(data, "select", completions[0], hints.firstChild);
     return true;
   }

From 1de8132e2cefbe34043508dea747fffdfb90a2bc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 12 Nov 2015 11:35:18 +0100
Subject: [PATCH 2441/4742] [show-hint addon] Only follow mouse with focus when
 completeOnSingleClick is on

Make this the default

Issue #3636
---
 addon/hint/show-hint.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index b359208d4a..7eefad8b5b 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -295,11 +295,12 @@
       setTimeout(function(){cm.focus();}, 20);
     });
 
-    CodeMirror.on(hints, "mousemove", function(e) {
-      var elt = getHintElement(hints, e.target || e.srcElement);
-      if (elt && elt.hintId != null)
-        widget.changeActive(elt.hintId);
-    });
+    if (completion.options.completeOnSingleClick)
+      CodeMirror.on(hints, "mousemove", function(e) {
+        var elt = getHintElement(hints, e.target || e.srcElement);
+        if (elt && elt.hintId != null)
+          widget.changeActive(elt.hintId);
+      });
 
     CodeMirror.signal(data, "select", completions[0], hints.firstChild);
     return true;
@@ -436,7 +437,7 @@
     alignWithWord: true,
     closeCharacters: /[\s()\[\]{};:>,]/,
     closeOnUnfocus: true,
-    completeOnSingleClick: false,
+    completeOnSingleClick: true,
     container: null,
     customKeys: null,
     extraKeys: null

From 7530191700a67477d5866e1d606a4d4b8d4072b6 Mon Sep 17 00:00:00 2001
From: mihailik <mihailik@gmail.com>
Date: Thu, 12 Nov 2015 15:59:28 +0000
Subject: [PATCH 2442/4742] [markdown mode] Fix typo

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 2349ddf22b..97dfb7464a 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -712,7 +712,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         f: s.f,
 
         prevLine: s.prevLine,
-        thisLine: s.this,
+        thisLine: s.thisLine,
 
         block: s.block,
         htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),

From 8e0660682d4171fc203867f7acdcb94ea77c80c5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 17 Nov 2015 05:16:48 +0100
Subject: [PATCH 2443/4742] [javascript mode] Recognize regexp after case and
 new keywords

Closes ##3648
---
 mode/javascript/javascript.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index b961b89011..0cbc36d705 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -121,8 +121,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (stream.eat("/")) {
         stream.skipToEnd();
         return ret("comment", "comment");
-      } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-                 state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
+      } else if (/^(?:operator|sof|keyword c|case|new|[\[{}\(,;:])$/.test(state.lastType)) {
         readRegexp(stream);
         stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
         return ret("regexp", "string-2");

From cedae180f76cec84dbed6ab530f80ec136054b99 Mon Sep 17 00:00:00 2001
From: satamas <se.atamas@gmail.com>
Date: Mon, 16 Nov 2015 20:25:41 +0300
Subject: [PATCH 2444/4742] [kotlin mode] Improve string tokenizing, add
 keywords

---
 mode/clike/clike.js | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 566aa048e7..0cbe2faea2 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -535,19 +535,36 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {closeBrackets: {triples: '"'}}
   });
 
+  function tokenKotlinString(tripleString){
+    return function (stream, state) {
+      var escaped = false, next, end = false;
+      while (!stream.eol()) {
+        if (!tripleString && !escaped && stream.match('"') ) {end = true; break;}
+        if (tripleString && stream.match('"""')) {end = true; break;}
+        next = stream.next();
+        if(!escaped && next == "$" && stream.match('{'))
+          stream.skipTo("}");
+        escaped = !escaped && next == "\\" && !tripleString;
+      }
+      if (end || !tripleString)
+        state.tokenize = null;
+      return "string";
+    }
+  }
+
   def("text/x-kotlin", {
     name: "clike",
     keywords: words(
       /*keywords*/
       "package as typealias class interface this super val " +
       "var fun for is in This throw return " +
-      "break continue object if else while do try when !in !is as?" +
+      "break continue object if else while do try when !in !is as? " +
 
       /*soft keywords*/
       "file import where by get set abstract enum open inner override private public internal " +
       "protected catch finally out final vararg reified dynamic companion constructor init " +
       "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
-      "external annotation crossinline"
+      "external annotation crossinline const operator infix"
     ),
     types: words(
       /* package java.lang */
@@ -556,10 +573,18 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
       "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
     ),
+    intendSwitch: false,
+    indentStatements: false,
     multiLineStrings: true,
     blockKeywords: words("catch class do else finally for if where try while enum"),
     defKeywords: words("class val var object package interface fun"),
     atoms: words("true false null this"),
+    hooks: {
+      '"': function(stream, state) {
+        state.tokenize = tokenKotlinString(stream.match('""'));
+        return state.tokenize(stream, state);
+      }
+    },
     modeProps: {closeBrackets: {triples: '"'}}
   });
 

From e477745492b75e1851689cd4832f7e16f7a94335 Mon Sep 17 00:00:00 2001
From: Michael Goderbauer <contact@m-goderbauer.de>
Date: Sat, 14 Nov 2015 02:58:07 -0500
Subject: [PATCH 2445/4742] [dart mode] add "as" to keywords

`import "package:foo/foo.dart" as bar;` should highlight "as" as a keyword.
---
 mode/dart/dart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index b1ee37767a..88bb277976 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -15,7 +15,7 @@
     "implements get native operator set typedef with enum throw rethrow " +
     "assert break case continue default in return new deferred async await " +
     "try catch finally do else for if switch while import library export " +
-    "part of show hide is").split(" ");
+    "part of show hide is as").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
   var atoms = "true false null".split(" ");
   var builtins = "void bool num int double dynamic var String".split(" ");

From a1e780ba7a6dce48781c93f998e6544fae657280 Mon Sep 17 00:00:00 2001
From: Michael Goderbauer <contact@m-goderbauer.de>
Date: Sat, 14 Nov 2015 03:12:06 -0500
Subject: [PATCH 2446/4742] [dart mode] in annotations "." is legal

`@ng1.Injectable` is a legal annotation
---
 mode/dart/dart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 88bb277976..d92eb5190c 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -46,7 +46,7 @@
     atoms: set(atoms),
     hooks: {
       "@": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
+        stream.eatWhile(/[\w\$_\.]/);
         return "meta";
       },
 

From 0216c3a753ec7dc8b594bb9bf155ea28bb422575 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 18 Nov 2015 16:13:07 +0100
Subject: [PATCH 2447/4742] [javascript mode] Allow spread in object literals

Closes #3650
---
 mode/javascript/javascript.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 0cbc36d705..26e1693cab 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -464,6 +464,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(afterprop);
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
+    } else if (type == "spread") {
+      return cont(expression);
     }
   }
   function getterSetter(type) {

From 5bf7669e2fe96ffd46ebf46584c3a25d1e4d5ef8 Mon Sep 17 00:00:00 2001
From: Kayur Patel <kayurkayur@gmail.com>
Date: Wed, 18 Nov 2015 00:46:30 -0800
Subject: [PATCH 2448/4742] [vim keymap] Fix JSDoc comment

According to http://usejsdoc.org/about-getting-started.html, jsdoc comments must start with /**
---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 14897a84da..02ed53af30 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3208,7 +3208,7 @@
       return cur;
     }
 
-    /*
+    /**
      * Returns the boundaries of the next word. If the cursor in the middle of
      * the word, then returns the boundaries of the current word, starting at
      * the cursor. If the cursor is at the start/end of a word, and we are going

From 160d3f64d4998b5677c7c79e7f333c8ad4caf479 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 19 Nov 2015 00:21:36 +0100
Subject: [PATCH 2449/4742] Initialize Doc.extend property in constructor

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ff2f1a54eb..f97998ed03 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7358,6 +7358,7 @@
     this.id = ++nextDocId;
     this.modeOption = mode;
     this.lineSep = lineSep;
+    this.extend = false;
 
     if (typeof text == "string") text = this.splitLines(text);
     updateDoc(this, {from: start, to: start, text: text});

From be4c5f3cb32757f47c402d3cfa85faf14e184dae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 20 Nov 2015 21:32:44 +0100
Subject: [PATCH 2450/4742] [python mode] Fix parsing of properties

Clean up weirdly specified regexps

Closes #3641
---
 mode/python/python.js | 45 ++++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index e5a09719bd..553f2d6fc8 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -48,18 +48,18 @@
   CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = "error";
 
-    var singleDelimiters = parserConf.singleDelimiters || new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]");
-    var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
-    var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
-    var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
+    var singleDelimiters = parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
+    var doubleOperators = parserConf.doubleOperators || /^([!<>]==|<>|<<|>>|\/\/|\*\*)/;
+    var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
+    var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
 
     if (parserConf.version && parseInt(parserConf.version, 10) == 3){
         // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
-        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!@]");
-        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
+        var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
+        var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
     } else {
-        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
-        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+        var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
+        var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
     }
 
     var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
@@ -160,13 +160,16 @@
 
       // Handle operators and Delimiters
       if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
-        return null;
+        return "punctuation";
 
       if (stream.match(doubleOperators) || stream.match(singleOperators))
         return "operator";
 
       if (stream.match(singleDelimiters))
-        return null;
+        return "punctuation";
+
+      if (state.lastToken == "." && stream.match(identifiers))
+        return "property";
 
       if (stream.match(keywords) || stream.match(wordOperators))
         return "keyword";
@@ -246,17 +249,6 @@
       var style = state.tokenize(stream, state);
       var current = stream.current();
 
-      // Handle '.' connected identifiers
-      if (current == ".") {
-        style = stream.match(identifiers, false) ? null : ERRORCLASS;
-        if (style == null && state.lastStyle == "meta") {
-          // Apply 'meta' style to '.' connected identifiers when
-          // appropriate.
-          style = "meta";
-        }
-        return style;
-      }
-
       // Handle decorators
       if (current == "@"){
         if(parserConf.version && parseInt(parserConf.version, 10) == 3){
@@ -267,7 +259,7 @@
       }
 
       if ((style == "variable" || style == "builtin")
-          && state.lastStyle == "meta")
+          && state.lastToken == "meta")
         style = "meta";
 
       // Handle scope changes.
@@ -300,7 +292,6 @@
         return {
           tokenize: tokenBase,
           scopes: [{offset: basecolumn || 0, type: "py", align: null}],
-          lastStyle: null,
           lastToken: null,
           lambda: false,
           dedent: 0
@@ -312,11 +303,9 @@
         if (addErr) state.errorToken = false;
         var style = tokenLexer(stream, state);
 
-        state.lastStyle = style;
-
-        var current = stream.current();
-        if (current && style)
-          state.lastToken = current;
+        if (style && style != "comment")
+          state.lastToken = (style == "keyword" || style == "punctuation") ? stream.current() : style;
+        if (style == "punctuation") style = null;
 
         if (stream.eol() && state.lambda)
           state.lambda = false;

From 2a84b591b06470ad2063e2f2f03516eca2e4b42c Mon Sep 17 00:00:00 2001
From: Josh Cohen <joshco@gmail.com>
Date: Sun, 15 Nov 2015 23:57:24 -0500
Subject: [PATCH 2451/4742] [haml mode] Ignore {% liquid tags

The old behavior sees the closing %} as a haml tag begin. The result
is that the rest of the file after the %} doesnt highlight correctly.

Dont go into quote mode when stream is '{%'.
---
 mode/haml/haml.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 8fe63b0203..03ce83355c 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -85,8 +85,10 @@
           state.tokenize = rubyInQuote(")");
           return state.tokenize(stream, state);
         } else if (ch == "{") {
-          state.tokenize = rubyInQuote("}");
-          return state.tokenize(stream, state);
+          if (!stream.match(/^\{%.*/)) {
+            state.tokenize = rubyInQuote("}");
+            return state.tokenize(stream, state);
+          }
         }
       }
 

From 88071b32ffd90b7ea50df965e7f511850ba4c8b1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 21 Nov 2015 12:43:29 +0100
Subject: [PATCH 2452/4742] [comment-fold addon] Ignore block comment start
 strings inside comments

Closes #3651
---
 addon/fold/comment-fold.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index b75db7ea25..60fa3e43df 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -28,7 +28,9 @@ CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
       continue;
     }
     if (pass == 1 && found < start.ch) return;
-    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1)))) {
+    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1))) &&
+        (lineText.slice(found - endToken.length, found) == endToken ||
+         !/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found))))) {
       startCh = found + startToken.length;
       break;
     }

From 9024f7cc61fcfd6b1490b9ee52045a2c7d0e7b99 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 21 Nov 2015 12:59:44 +0100
Subject: [PATCH 2453/4742] [javascript mode] Revert "attempt to fix parsing
 when async/await are present"

This reverts commit 94fc3b71e8e9f52b9239276a34658023933aac68.
---
 mode/javascript/javascript.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 26e1693cab..993d3eaf87 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -32,12 +32,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
       "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C,
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
-      "async": kw("async"), "function": kw("function"), "catch": kw("catch"),
+      "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
       "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
       "this": kw("this"), "class": kw("class"), "super": kw("atom"),
-      "await": C, "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
+      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
     };
 
     // Extend the 'normal' keywords with the TypeScript language extensions
@@ -372,7 +372,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
-    if (type == "async") return cont(expression);
     if (type == "function") return cont(functiondef, maybeop);
     if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
@@ -451,9 +450,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {cx.marked = "property"; return cont();}
   }
   function objprop(type, value) {
-    if (type == "async") {
-      return cont(objprop);
-    } else if (type == "variable" || cx.style == "keyword") {
+    if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);
       return cont(afterprop);

From 446d89def9aabe93f4030ab446546598b7ea2df6 Mon Sep 17 00:00:00 2001
From: Sergey Goder <sgoder@fb.com>
Date: Fri, 20 Nov 2015 19:02:33 -0800
Subject: [PATCH 2454/4742] [sql mode] Add `limit` to default SQL keyords

---
 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 a908277151..86c68f7235 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -257,7 +257,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   }
 
   // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
-  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where ";
+  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit";
 
   // turn a space-separated list into an array
   function set(str) {

From daad4a601ad1ffb35f4607bd49cdc3249cb5dda1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Nov 2015 10:53:41 +0100
Subject: [PATCH 2455/4742] [rust mode] Support multiline strings

Issue #3660
---
 mode/rust/rust.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index 1ce0c01ee5..8558b53fe4 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -12,11 +12,12 @@
 "use strict";
 
 CodeMirror.defineSimpleMode("rust",{
-  start:[
+  start: [
     // string and byte string
-    {regex: /b?"(?:[^\\]|\\.)*?"/, token: "string"},
+    {regex: /b?"/, token: "string", next: "string"},
     // raw string and raw byte string
-    {regex: /(b?r)(#*)(".*?)("\2)/, token: ["string", "string", "string", "string"]},
+    {regex: /b?r"/, token: "string", next: "string_raw"},
+    {regex: /b?r#+"/, token: "string", next: "string_raw_hash"},
     // character
     {regex: /'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/, token: "string-2"},
     // byte
@@ -39,6 +40,18 @@ CodeMirror.defineSimpleMode("rust",{
     {regex: /[\{\[\(]/, indent: true},
     {regex: /[\}\]\)]/, dedent: true}
   ],
+  string: [
+    {regex: /"/, token: "string", next: "start"},
+    {regex: /(?:[^\\"]|\\(?:.|$))*/, token: "string"}
+  ],
+  string_raw: [
+    {regex: /"/, token: "string", next: "start"},
+    {regex: /[^"]*/, token: "string"}
+  ],
+  string_raw_hash: [
+    {regex: /"#+/, token: "string", next: "start"},
+    {regex: /(?:[^"]|"(?!#))*/, token: "string"}
+  ],
   comment: [
     {regex: /.*?\*\//, token: "comment", next: "start"},
     {regex: /.*/, token: "comment"}

From a29e51697083c3cd6678f5bdda459a447321f3aa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Nov 2015 10:57:41 +0100
Subject: [PATCH 2456/4742] [handlebars and nsis modes] Do tokenize mismatched
 quotes as strings

So that autoclosing works.

Issue #3660
---
 mode/handlebars/handlebars.js | 4 ++--
 mode/nsis/nsis.js             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mode/handlebars/handlebars.js b/mode/handlebars/handlebars.js
index 40dfea42af..d6d9f5b0f3 100644
--- a/mode/handlebars/handlebars.js
+++ b/mode/handlebars/handlebars.js
@@ -21,8 +21,8 @@
       { regex: /\}\}/, pop: true, token: "tag" },
 
       // Double and single quotes
-      { regex: /"(?:[^\\]|\\.)*?"/, token: "string" },
-      { regex: /'(?:[^\\]|\\.)*?'/, token: "string" },
+      { regex: /"(?:[^\\"]|\\.)*"?/, token: "string" },
+      { regex: /'(?:[^\\']|\\.)*'?/, token: "string" },
 
       // Handlebars keywords
       { regex: />|[#\/]([A-Za-z_]\w*)/, token: "keyword" },
diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 4c73fb73a8..172207c5a1 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -19,9 +19,9 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
 
     // Strings
-    { regex: /"(?:[^\\]|\\.)*?"/, token: "string" },
-    { regex: /'(?:[^\\]|\\.)*?'/, token: "string" },
-    { regex: /`(?:[^\\]|\\.)*?`/, token: "string" },
+    { regex: /"(?:[^\\"]|\\.)*"?/, token: "string" },
+    { regex: /'(?:[^\\']|\\.)*'?/, token: "string" },
+    { regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
 
     // Compile Time Commands
     {regex: /(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},

From 2e3a2a1134cd4c5f92f21fb762c80c9a3e8f332d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Nov 2015 11:12:10 +0100
Subject: [PATCH 2457/4742] [rust mode] Adjust tests to new handling of strings

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

diff --git a/mode/rust/test.js b/mode/rust/test.js
index 1a3c6e7207..eb256c47e8 100644
--- a/mode/rust/test.js
+++ b/mode/rust/test.js
@@ -26,7 +26,6 @@
      '[string "\\"foo\\""]',
      '[string r#""foo""#]',
      '[string "foo #\\"# bar"]',
-     '[string r##"foo #"# bar"##]',
 
      '[string b"foo"]',
      '[string br"foo"]',

From 10b0c73e45a2f23f2b34871e5b8b00bcc2fe54c1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Nov 2015 11:47:09 +0100
Subject: [PATCH 2458/4742] Support adding multiple css strings to a token
 using markText

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f97998ed03..249f40ee5e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7089,7 +7089,7 @@
               spanEndStyle = "";
             }
             if (m.className) spanStyle += " " + m.className;
-            if (m.css) css = m.css;
+            if (m.css) css = (css ? css + ";" : "") + m.css;
             if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
             if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
             if (m.title && !title) title = m.title;

From ec73f71ee6d04cc5c257f098bfcf693460be1866 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Nov 2015 12:22:30 +0100
Subject: [PATCH 2459/4742] Mark release 5.9.0

---
 AUTHORS           |  7 +++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 11 +++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1e3ece23e0..4f06064129 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -91,6 +91,7 @@ Brian Sletten
 Bruce Mitchener
 Caitlin Potter
 Calin Barbat
+Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
 Cheah Chu Yeow
@@ -233,6 +234,7 @@ jeffkenton
 Jeff Pickhardt
 jem (graphite)
 Jeremy Parmenter
+JobJob
 Jochen Berger
 Johan Ask
 John Connor
@@ -247,6 +249,7 @@ Jon Malmaud
 Jon Sangster
 Joost-Wim Boekesteijn
 Joseph Pecoraro
+Josh Cohen
 Joshua Newman
 Josh Watzman
 jots
@@ -259,6 +262,7 @@ Justin Hileman
 jwallers@gmail.com
 kaniga
 karevn
+Kayur Patel
 Ken Newman
 Ken Rockot
 Kevin Earls
@@ -437,6 +441,7 @@ SCLINIC\jdecker
 Scott Aikin
 Scott Goodhew
 Sebastian Zaha
+Sergey Goder
 Se-Won Kim
 shaund
 shaun gilchrist
@@ -459,12 +464,14 @@ Steffen Beyer
 Stephen Lavelle
 Steve O'Hara
 stoskov
+Stu Kennedy
 Sungho Kim
 sverweij
 Taha Jahangir
 Tako Schotanus
 Takuji Shimokawa
 Tarmil
+TDaglis
 tel
 tfjgeorge
 Thaddee Tyl
diff --git a/doc/compress.html b/doc/compress.html
index 6a183ca528..7712274c83 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.9.0;f=">5.9</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.8.0;f=">5.8</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.7.0;f=">5.7</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.6.0;f=">5.6</option>
diff --git a/doc/manual.html b/doc/manual.html
index 8916b57f3f..7e1ce1aaa5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.8.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.9.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 3d841ef6e8..ca3e2e6284 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,17 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">23-10-2015: <a href="http://codemirror.net/codemirror-5.9.zip">Version 5.9</a>:</p>
+
+  <ul class="rel-note">
+    <li>Improve the way overlay (OS X-style) scrollbars are handled</li>
+    <li>Make <a href="manual.html#addon_annotatescrollbar">annotatescrollbar</a> and scrollpastend addons work properly together</li>
+    <li>Make <a href="manual.html#addon_show-hint">show-hint</a> addon select options on single click by default, move selection to hovered item</li>
+    <li>Properly fold comments that include block-comment-start markers</li>
+    <li>Many small language mode fixes</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.8.0...5.9.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">20-10-2015: <a href="http://codemirror.net/codemirror-5.8.zip">Version 5.8</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index b29e0b51de..a393997dfd 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.8</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.9</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 249f40ee5e..2c4c3fb87f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8866,7 +8866,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.8.1";
+  CodeMirror.version = "5.9.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 934af6a0fd..9b1cc8e3b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.8.1",
+    "version":"5.9.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 217c37ee9c740bc09f56362351454865d725e04d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 23 Nov 2015 12:23:11 +0100
Subject: [PATCH 2460/4742] Bump version number post-5.9

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 7e1ce1aaa5..4d3326eb50 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.9.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.9.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2c4c3fb87f..47c5292ff5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8866,7 +8866,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.9.0";
+  CodeMirror.version = "5.9.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 9b1cc8e3b5..3c8aad422a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.9.0",
+    "version":"5.9.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 49b5d2234384ae23b4c6c46db5564db34bb27ee6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Nov 2015 11:00:59 +0100
Subject: [PATCH 2461/4742] Include line widgets' margins when computing their
 height

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 47c5292ff5..1610b3ca32 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -823,7 +823,7 @@
   // given line.
   function updateWidgetHeight(line) {
     if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
-      line.widgets[i].height = line.widgets[i].node.offsetHeight;
+      line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight;
   }
 
   // Do a bulk-read of the DOM positions and sizes needed to draw the
@@ -6668,7 +6668,7 @@
         parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
       removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
     }
-    return widget.height = widget.node.offsetHeight;
+    return widget.height = widget.node.parentNode.offsetHeight;
   }
 
   function addLineWidget(doc, handle, node, options) {

From 88a02578c1c0a15c004b8b96a6ee00825edc4a1e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Nov 2015 11:35:17 +0100
Subject: [PATCH 2462/4742] [handlebars mode] Make it easier to wrap around a
 base mode

Issue #3624
---
 mode/handlebars/handlebars.js | 15 ++++++++++++---
 mode/handlebars/index.html    | 10 +---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mode/handlebars/handlebars.js b/mode/handlebars/handlebars.js
index d6d9f5b0f3..2174e53849 100644
--- a/mode/handlebars/handlebars.js
+++ b/mode/handlebars/handlebars.js
@@ -3,15 +3,15 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"), require("../../addon/mode/multiplex"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+    define(["../../lib/codemirror", "../../addon/mode/simple", "../../addon/mode/multiplex"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineSimpleMode("handlebars", {
+  CodeMirror.defineSimpleMode("handlebars-tags", {
     start: [
       { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
       { regex: /\{\{!/,   push: "comment", token: "comment" },
@@ -49,5 +49,14 @@
     ]
   });
 
+  CodeMirror.defineMode("handlebars", function(config, parserConfig) {
+    var handlebars = CodeMirror.getMode(config, "handlebars-tags");
+    if (!parserConfig || !parserConfig.base) return handlebars;
+    return CodeMirror.multiplexingMode(
+      CodeMirror.getMode(config, parserConfig.base),
+      {open: "{{", close: "}}", mode: handlebars, parseDelimiters: true}
+    );
+  });
+
   CodeMirror.defineMIME("text/x-handlebars-template", "handlebars");
 });
diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
index beaef87a18..8786fe3ab4 100644
--- a/mode/handlebars/index.html
+++ b/mode/handlebars/index.html
@@ -61,18 +61,10 @@ <h1>{{t 'article_list'}}</h1>
 
 </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: "htmlhandlebars"
+        mode: {name: "handlebars", base: "text/html"}
       });
     </script>
     </script>

From 0df380b6384f6138764a2f1c78d960edddf6fbce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Nov 2015 12:44:55 +0100
Subject: [PATCH 2463/4742] Rewrite atomic selection skipping

The code is now clearer, and will prefer the nearer end of the atomic
range as long as that means there is still progress (i.e. the cursor
does not get stuck).

Issue #3658
---
 lib/codemirror.js | 102 ++++++++++++++++++++++++----------------------
 test/test.js      |   4 ++
 2 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1610b3ca32..5a3c3fdeaf 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2222,8 +2222,9 @@
     var out;
     for (var i = 0; i < sel.ranges.length; i++) {
       var range = sel.ranges[i];
-      var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear);
-      var newHead = skipAtomic(doc, range.head, bias, mayClear);
+      var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
+      var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
+      var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
       if (out || newAnchor != range.anchor || newHead != range.head) {
         if (!out) out = sel.ranges.slice(0, i);
         out[i] = new Range(newAnchor, newHead);
@@ -2232,54 +2233,59 @@
     return out ? normalizeSelection(out, sel.primIndex) : sel;
   }
 
-  // Ensure a given position is not inside an atomic range.
-  function skipAtomic(doc, pos, bias, mayClear) {
-    var flipped = false, curPos = pos;
-    var dir = bias || 1;
-    doc.cantEdit = false;
-    search: for (;;) {
-      var line = getLine(doc, curPos.line);
-      if (line.markedSpans) {
-        for (var i = 0; i < line.markedSpans.length; ++i) {
-          var sp = line.markedSpans[i], m = sp.marker;
-          if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&
-              (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {
-            if (mayClear) {
-              signal(m, "beforeCursorEnter");
-              if (m.explicitlyCleared) {
-                if (!line.markedSpans) break;
-                else {--i; continue;}
-              }
-            }
-            if (!m.atomic) continue;
-            var newPos = m.find(dir < 0 ? -1 : 1);
-            if (cmp(newPos, curPos) == 0) {
-              newPos.ch += dir;
-              if (newPos.ch < 0) {
-                if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
-                else newPos = null;
-              } else if (newPos.ch > line.text.length) {
-                if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0);
-                else newPos = null;
-              }
-              if (!newPos) {
-                if (flipped) {
-                  // Driven in a corner -- no valid cursor position found at all
-                  // -- try again *with* clearing, if we didn't already
-                  if (!mayClear) return skipAtomic(doc, pos, bias, true);
-                  // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit = true;
-                  return Pos(doc.first, 0);
-                }
-                flipped = true; newPos = pos; dir = -dir;
-              }
-            }
-            curPos = newPos;
-            continue search;
+  function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
+    var line = getLine(doc, pos.line);
+    if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
+      var sp = line.markedSpans[i], m = sp.marker;
+      if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+          (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+        if (mayClear) {
+          signal(m, "beforeCursorEnter");
+          if (m.explicitlyCleared) {
+            if (!line.markedSpans) break;
+            else {--i; continue;}
           }
         }
+        if (!m.atomic) continue;
+
+        if (oldPos) {
+          var near = m.find(dir < 0 ? 1 : -1), diff;
+          if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft) near = movePos(doc, near, -dir, line);
+          if (near && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
+            return skipAtomicInner(doc, near, oldPos, dir, mayClear);
+        }
+
+        var far = m.find(dir < 0 ? -1 : 1);
+        if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight) far = movePos(doc, far, dir, line);
+        return far ? skipAtomicInner(doc, far, oldPos, dir, mayClear) : null;
       }
-      return curPos;
+    }
+    return pos;
+  }
+
+  // Ensure a given position is not inside an atomic range.
+  function skipAtomic(doc, pos, oldPos, bias, mayClear) {
+    var dir = bias || 1;
+    var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
+        skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
+    if (!found) {
+      doc.cantEdit = true;
+      return Pos(doc.first, 0);
+    }
+    return found;
+  }
+
+  function movePos(doc, pos, dir, line) {
+    if (dir < 0 && pos.ch == 0) {
+      if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1));
+      else return null;
+    } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
+      if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0);
+      else return null;
+    } else {
+      return new Pos(pos.line, pos.ch + dir);
     }
   }
 
@@ -4844,7 +4850,7 @@
         if (dir > 0 && !moveOnce(!first)) break;
       }
     }
-    var result = skipAtomic(doc, Pos(line, ch), origDir, true);
+    var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
     if (!possible) result.hitSide = true;
     return result;
   }
diff --git a/test/test.js b/test/test.js
index 7bc2c8e95b..9205224538 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1637,6 +1637,8 @@ testCM("atomicMarker", function(cm) {
   m = atom(1, 1, 3, 8);
   cm.setCursor(Pos(0, 0));
   cm.setCursor(Pos(2, 0));
+  eqPos(cm.getCursor(), Pos(1, 1));
+  cm.execCommand("goCharRight");
   eqPos(cm.getCursor(), Pos(3, 8));
   cm.execCommand("goCharLeft");
   eqPos(cm.getCursor(), Pos(1, 1));
@@ -1657,6 +1659,8 @@ testCM("atomicMarker", function(cm) {
 testCM("selectionBias", function(cm) {
   cm.markText(Pos(0, 1), Pos(0, 3), {atomic: true});
   cm.setCursor(Pos(0, 2));
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.setCursor(Pos(0, 2));
   eqPos(cm.getCursor(), Pos(0, 3));
   cm.setCursor(Pos(0, 2));
   eqPos(cm.getCursor(), Pos(0, 1));

From 710f43a1c55ffa4102ef4c3fce46329ad5643da7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 24 Nov 2015 17:00:33 +0100
Subject: [PATCH 2464/4742] [javascript mode] Remove duplicated extends keyword

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 993d3eaf87..6d80bddf72 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -46,7 +46,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       var tsKeywords = {
         // object-like things
         "interface": kw("interface"),
-        "extends": kw("extends"),
         "constructor": kw("constructor"),
 
         // scope modifiers

From f14b2f861f4a5670a01203fa67a5004961148356 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Tue, 24 Nov 2015 15:08:49 -0800
Subject: [PATCH 2465/4742] Fix 5.9 release date in release notes

---
 doc/releases.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/releases.html b/doc/releases.html
index ca3e2e6284..a0cd627c98 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,7 +30,7 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
-  <p class="rel">23-10-2015: <a href="http://codemirror.net/codemirror-5.9.zip">Version 5.9</a>:</p>
+  <p class="rel">23-11-2015: <a href="http://codemirror.net/codemirror-5.9.zip">Version 5.9</a>:</p>
 
   <ul class="rel-note">
     <li>Improve the way overlay (OS X-style) scrollbars are handled</li>

From 1fae53703cf4099d4f4855ef18dd14d60514c82f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 25 Nov 2015 15:58:52 +0100
Subject: [PATCH 2466/4742] When skipping atomic marks, only use near side when
 on same line

Which is kind of arbitrary but seems to give less surprising
results.

Issue #3658
---
 lib/codemirror.js | 6 +++---
 test/test.js      | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5a3c3fdeaf..1d8b8cc70a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2251,13 +2251,13 @@
         if (oldPos) {
           var near = m.find(dir < 0 ? 1 : -1), diff;
           if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft) near = movePos(doc, near, -dir, line);
-          if (near && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
-            return skipAtomicInner(doc, near, oldPos, dir, mayClear);
+          if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
+            return skipAtomicInner(doc, near, pos, dir, mayClear);
         }
 
         var far = m.find(dir < 0 ? -1 : 1);
         if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight) far = movePos(doc, far, dir, line);
-        return far ? skipAtomicInner(doc, far, oldPos, dir, mayClear) : null;
+        return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
       }
     }
     return pos;
diff --git a/test/test.js b/test/test.js
index 9205224538..01efbce866 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1637,8 +1637,6 @@ testCM("atomicMarker", function(cm) {
   m = atom(1, 1, 3, 8);
   cm.setCursor(Pos(0, 0));
   cm.setCursor(Pos(2, 0));
-  eqPos(cm.getCursor(), Pos(1, 1));
-  cm.execCommand("goCharRight");
   eqPos(cm.getCursor(), Pos(3, 8));
   cm.execCommand("goCharLeft");
   eqPos(cm.getCursor(), Pos(1, 1));

From 6eef0e0a399820265379b34fb045f363435fcbfe Mon Sep 17 00:00:00 2001
From: Erik Welander <ewelander@google.com>
Date: Tue, 24 Nov 2015 14:26:09 -0800
Subject: [PATCH 2467/4742] [annotatescrollbar addon] Add an id attribute to
 annotations

---
 addon/scroll/annotatescrollbar.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 0bbd050c8e..a97495a559 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -100,6 +100,9 @@
       elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth - 1, 2) + "px; top: "
         + (top + this.buttonHeight) + "px; height: " + height + "px";
       elt.className = this.options.className;
+      if (ann.id) {
+        ann.setAttribute("annotation-id", ann.id);
+      }
     }
     this.div.textContent = "";
     this.div.appendChild(frag);

From c3b025221834052e47061610df30e119e4cd1ee1 Mon Sep 17 00:00:00 2001
From: Erik Welander <ewelander@google.com>
Date: Wed, 25 Nov 2015 12:52:01 -0800
Subject: [PATCH 2468/4742] [annotatescrollbar addon] Fix a typo, ann should
 have been elt.

---
 addon/scroll/annotatescrollbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index a97495a559..5e748e816d 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -101,7 +101,7 @@
         + (top + this.buttonHeight) + "px; height: " + height + "px";
       elt.className = this.options.className;
       if (ann.id) {
-        ann.setAttribute("annotation-id", ann.id);
+        elt.setAttribute("annotation-id", ann.id);
       }
     }
     this.div.textContent = "";

From ca6166e08aef0e8f74b2774cee691eb6cc05d5f8 Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Tue, 1 Dec 2015 12:40:20 +0100
Subject: [PATCH 2469/4742] [simple mode addon] Add missing space in error
 message

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

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index 795328b83d..df663365e8 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -60,7 +60,7 @@
 
   function ensureState(states, name) {
     if (!states.hasOwnProperty(name))
-      throw new Error("Undefined state " + name + "in simple mode");
+      throw new Error("Undefined state " + name + " in simple mode");
   }
 
   function toRegex(val, caret) {

From 170bf9371c2cee092cef5cc251c78471b6450abe Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Thu, 3 Dec 2015 16:11:03 -0800
Subject: [PATCH 2470/4742] [swift] Add line and block comment options

---
 mode/swift/swift.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index cf784feff0..5179c89afb 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -195,7 +195,10 @@
           if (stream.match(properties)) return "property"
           return "variable"
         }
-      }
+      },
+      lineComment: "//",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/"
     }
   })
 

From f89a8fac8014fba06849728383c32ef012ecc4f5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 4 Dec 2015 10:56:18 +0100
Subject: [PATCH 2471/4742] [swift mode] Rewrite

Closes #3680

And a number of other issues
---
 mode/swift/index.html |  20 +--
 mode/swift/swift.js   | 291 ++++++++++++++++++------------------------
 2 files changed, 134 insertions(+), 177 deletions(-)

diff --git a/mode/swift/index.html b/mode/swift/index.html
index 2649dc37cc..109f3fdb07 100644
--- a/mode/swift/index.html
+++ b/mode/swift/index.html
@@ -35,11 +35,11 @@ <h2>Swift mode</h2>
 //  Created by Main Account on 12/18/14.
 //  Copyright (c) 2014 Razeware LLC. All rights reserved.
 //
- 
+
 import Foundation
- 
+
 class TipCalculatorModel {
- 
+
   var total: Double
   var taxPct: Double
   var subtotal: Double {
@@ -47,30 +47,30 @@ <h2>Swift mode</h2>
       return total / (taxPct + 1)
     }
   }
- 
+
   init(total: Double, taxPct: Double) {
     self.total = total
     self.taxPct = taxPct
   }
- 
+
   func calcTipWithTipPct(tipPct: Double) -> Double {
     return subtotal * tipPct
   }
- 
+
   func returnPossibleTips() -> [Int: Double] {
- 
+
     let possibleTipsInferred = [0.15, 0.18, 0.20]
     let possibleTipsExplicit:[Double] = [0.15, 0.18, 0.20]
- 
+
     var retval = [Int: Double]()
     for possibleTip in possibleTipsInferred {
       let intPct = Int(possibleTip*100)
       retval[intPct] = calcTipWithTipPct(possibleTip)
     }
     return retval
- 
+
   }
- 
+
 }
 </textarea></form>
 
diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 5179c89afb..7a2339fcdf 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -13,189 +13,146 @@
 })(function(CodeMirror) {
   "use strict"
 
-  function trim(str) { return /^\s*(.*?)\s*$/.exec(str)[1] }
+  function wordSet(words) {
+    var set = {}
+    for (var i = 0; i < words.length; i++) set[words[i]] = true
+    return set
+  }
+
+  var keywords = wordSet(["var","let","class","deinit","enum","extension","func","import","init","protocol",
+                          "static","struct","subscript","typealias","as","dynamicType","is","new","super",
+                          "self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case",
+                          "continue","default","do","else","fallthrough","if","in","for","return","switch",
+                          "where","while","associativity","didSet","get","infix","inout","left","mutating",
+                          "none","nonmutating","operator","override","postfix","precedence","prefix","right",
+                          "set","unowned","weak","willSet"])
+  var definingKeywords = wordSet(["var","let","class","enum","extension","func","import","protocol","struct",
+                                  "typealias","dynamicType","for"])
+  var atoms = wordSet(["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null",
+                       "this","super"])
+  var types = wordSet(["String","bool","int","string","double","Double","Int","Float","float","public",
+                       "private","extension"])
+  var operators = "+-/*%=|&<>#"
+  var punc = ";,.(){}[]"
+  var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/
+  var number = /^-?(?:(?:[\d_]+\.[_\d]*|\.[_\d]+|0o[0-7_\.]+|0b[01_\.]+)(?:e-?[\d_]+)?|0x[\d_a-f\.]+(?:p-?[\d_]+)?)/i
+  var identifier = /^[_A-Za-z$][_A-Za-z$0-9]*/
+  var property = /^[@\.][_A-Za-z$][_A-Za-z$0-9]*/
+  var regexp = /^\/(?!\s)(?:\/\/)?(?:\\.|[^\/])+\//
 
-  var separators = [" ","\\\+","\\\-","\\\(","\\\)","\\\*","/",":","\\\?","\\\<","\\\>"," ","\\\."]
-  var tokens = new RegExp(separators.join("|"),"g")
+  function tokenBase(stream, state, prev) {
+    if (stream.eatSpace()) return null
 
-  function getWord(string, pos) {
-    var index = -1, count = 1
-    var words = string.split(tokens)
-    for (var i = 0; i < words.length; i++) {
-      for(var j = 1; j <= words[i].length; j++) {
-        if (count==pos) index = i
-        count++
+    var ch = stream.peek()
+    if (ch == "/") {
+      if (stream.match("//")) {
+        stream.skipToEnd()
+        return "comment"
+      }
+      if (stream.match("/*")) {
+        state.tokenize.push(tokenComment)
+        return tokenComment(stream, state)
       }
-      count++
+      if (stream.match(regexp)) return "string-2"
     }
-    var ret = ["", ""]
-    if (pos == 0) {
-      ret[1] = words[0]
-      ret[0] = null
-    } else {
-      ret[1] = words[index]
-      ret[0] = words[index-1]
+    if (operators.indexOf(ch) > -1) {
+      stream.next()
+      return "operator"
+    }
+    if (punc.indexOf(ch) > -1) {
+      stream.match(delimiters)
+      return "punctuation"
+    }
+    if (ch == '"' || ch == "'") {
+      stream.next()
+      var tokenize = tokenString(ch)
+      state.tokenize.push(tokenize)
+      return tokenize(stream, state)
     }
-    return ret
-  }
 
-  CodeMirror.defineMode("swift", function() {
-    var keywords=["var","let","class","deinit","enum","extension","func","import","init","let","protocol","static","struct","subscript","typealias","var","as","dynamicType","is","new","super","self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case","continue","default","do","else","fallthrough","if","in","for","return","switch","where","while","associativity","didSet","get","infix","inout","left","mutating","none","nonmutating","operator","override","postfix","precedence","prefix","right","set","unowned","unowned(safe)","unowned(unsafe)","weak","willSet"]
-    var commonConstants=["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null","this","super"]
-    var types=["String","bool","int","string","double","Double","Int","Float","float","public","private","extension"]
-    var numbers=["0","1","2","3","4","5","6","7","8","9"]
-    var operators=["+","-","/","*","%","=","|","&","<",">"]
-    var punc=[";",",",".","(",")","{","}","[","]"]
-    var delimiters=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/
-    var identifiers=/^[_A-Za-z$][_A-Za-z$0-9]*/
-    var properties=/^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/
-    var regexPrefixes=/^(\/{3}|\/)/
+    if (stream.match(number)) return "number"
+    if (stream.match(property)) return "property"
 
-    return {
-      startState: function() {
-        return {
-          prev: false,
-          string: false,
-          escape: false,
-          inner: false,
-          comment: false,
-          num_left: 0,
-          num_right: 0,
-          doubleString: false,
-          singleString: false
+    if (stream.match(identifier)) {
+      var ident = stream.current()
+      if (keywords.hasOwnProperty(ident)) {
+        if (definingKeywords.hasOwnProperty(ident))
+          state.prev = "define"
+        return "keyword"
+      }
+      if (types.hasOwnProperty(ident)) return "variable-2"
+      if (atoms.hasOwnProperty(ident)) return "atom"
+      if (prev == "define") return "def"
+      return "variable"
+    }
+
+    stream.next()
+    return null
+  }
+
+  function tokenUntilClosingParen() {
+    var depth = 0
+    return function(stream, state, prev) {
+      var inner = tokenBase(stream, state, prev)
+      if (inner == "punctuation") {
+        if (stream.current() == "(") ++depth
+        else if (stream.current() == ")") {
+          if (depth == 0) {
+            stream.backUp(1)
+            state.tokenize.pop()
+            return state.tokenize[state.tokenize.length - 1](stream, state)
+          }
+          else --depth
         }
-      },
-      token: function(stream, state) {
-        if (stream.eatSpace()) return null
+      }
+      return inner
+    }
+  }
 
-        var ch = stream.next()
-        if (state.string) {
-          if (state.escape) {
-            state.escape = false
+  function tokenString(quote) {
+    return function(stream, state) {
+      var ch, escaped = false
+      while (ch = stream.next()) {
+        if (escaped) {
+          if (ch == "(") {
+            state.tokenize.push(tokenUntilClosingParen())
             return "string"
-          } else {
-            if ((ch == "\"" && (state.doubleString && !state.singleString) ||
-                 (ch == "'" && (!state.doubleString && state.singleString))) &&
-                !state.escape) {
-              state.string = false
-              state.doubleString = false
-              state.singleString = false
-              return "string"
-            } else if (ch == "\\" && stream.peek() == "(") {
-              state.inner = true
-              state.string = false
-              return "keyword"
-            } else if (ch == "\\" && stream.peek() != "(") {
-              state.escape = true
-              state.string = true
-              return "string"
-            } else {
-              return "string"
-            }
           }
-        } else if (state.comment) {
-          if (ch == "*" && stream.peek() == "/") {
-            state.prev = "*"
-            return "comment"
-          } else if (ch == "/" && state.prev == "*") {
-            state.prev = false
-            state.comment = false
-            return "comment"
-          }
-          return "comment"
+          escaped = false
+        } else if (ch == quote) {
+          break
         } else {
-          if (ch == "/") {
-            if (stream.peek() == "/") {
-              stream.skipToEnd()
-              return "comment"
-            }
-            if (stream.peek() == "*") {
-              state.comment = true
-              return "comment"
-            }
-          }
-          if (ch == "(" && state.inner) {
-            state.num_left++
-            return null
-          }
-          if (ch == ")" && state.inner) {
-            state.num_right++
-            if (state.num_left == state.num_right) {
-              state.inner=false
-              state.string=true
-            }
-            return null
-          }
-
-          var ret = getWord(stream.string, stream.pos)
-          var the_word = ret[1]
-          var prev_word = ret[0]
-
-          if (operators.indexOf(ch + "") > -1) return "operator"
-          if (punc.indexOf(ch) > -1) return "punctuation"
-
-          if (typeof the_word != "undefined") {
-            the_word = trim(the_word)
-            if (typeof prev_word != "undefined") prev_word = trim(prev_word)
-            if (the_word.charAt(0) == "#") return null
-
-            if (types.indexOf(the_word) > -1) return "def"
-            if (commonConstants.indexOf(the_word) > -1) return "atom"
-            if (numbers.indexOf(the_word) > -1) return "number"
+          escaped = ch == "\\"
+        }
+      }
+      state.tokenize.pop()
+      return "string"
+    }
+  }
 
-            if ((numbers.indexOf(the_word.charAt(0) + "") > -1 ||
-                 operators.indexOf(the_word.charAt(0) + "") > -1) &&
-                numbers.indexOf(ch) > -1) {
-              return "number"
-            }
+  function tokenComment(stream, state) {
+    stream.match(/^(?:[^*]|\*(?!\/))*/)
+    if (stream.match("*/")) state.tokenize.pop()
+    return "comment"
+  }
 
-            if (keywords.indexOf(the_word) > -1 ||
-                keywords.indexOf(the_word.split(tokens)[0]) > -1)
-              return "keyword"
-            if (keywords.indexOf(prev_word) > -1) return "def"
-          }
-          if (ch == '"' && !state.doubleString) {
-            state.string = true
-            state.doubleString = true
-            return "string"
-          }
-          if (ch == "'" && !state.singleString) {
-            state.string = true
-            state.singleString = true
-            return "string"
-          }
-          if (ch == "(" && state.inner)
-            state.num_left++
-          if (ch == ")" && state.inner) {
-            state.num_right++
-            if (state.num_left == state.num_right) {
-              state.inner = false
-              state.string = true
-            }
-            return null
-          }
-          if (stream.match(/^-?[0-9\.]/, false)) {
-            if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i) ||
-                stream.match(/^-?\d+\.\d*/) ||
-                stream.match(/^-?\.\d+/)) {
-              if (stream.peek() == ".") stream.backUp(1)
-              return "number"
-            }
-            if (stream.match(/^-?0x[0-9a-f]+/i) ||
-                stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/) ||
-                stream.match(/^-?0(?![\dx])/i))
-              return "number"
-          }
-          if (stream.match(regexPrefixes)) {
-            if (stream.current()!="/" || stream.match(/^.*\//,false)) return "string"
-            else stream.backUp(1)
-          }
-          if (stream.match(delimiters)) return "punctuation"
-          if (stream.match(identifiers)) return "variable"
-          if (stream.match(properties)) return "property"
-          return "variable"
+  CodeMirror.defineMode("swift", function() {
+    return {
+      startState: function() {
+        return {
+          prev: null,
+          tokenize: []
         }
       },
+      token: function(stream, state) {
+        var prev = state.prev
+        state.prev = null
+        var tokenize = state.tokenize[state.tokenize.length - 1] || tokenBase
+        var style = tokenize(stream, state, prev)
+        if (!style || style == "comment") state.prev = prev
+        else if (!state.prev) state.prev = style
+        return style
+      },
       lineComment: "//",
       blockCommentStart: "/*",
       blockCommentEnd: "*/"

From f1519ad50574be6b86480d53bd49ec0868791b5b Mon Sep 17 00:00:00 2001
From: mihailik <mihailik@gmail.com>
Date: Fri, 4 Dec 2015 08:09:59 +0000
Subject: [PATCH 2472/4742] [jump-to-line addon] Add

---
 addon/search/jumpToLine.js | 72 ++++++++++++++++++++++++++++++++++++++
 demo/search.html           |  8 +++--
 doc/manual.html            |  7 ++++
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 addon/search/jumpToLine.js

diff --git a/addon/search/jumpToLine.js b/addon/search/jumpToLine.js
new file mode 100644
index 0000000000..58c5b6707a
--- /dev/null
+++ b/addon/search/jumpToLine.js
@@ -0,0 +1,72 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Define search commands. Depends on dialog.js or another
+// implementation of the openDialog method.
+
+// Replace works a little oddly -- it will do the replace on the next
+// Ctrl-G (or whatever is bound to findNext) press. You prevent a
+// replace by making sure the match is no longer selected when hitting
+// Ctrl-G.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../dialog/dialog"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../dialog/dialog"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function dialog(cm, text, shortText, deflt, f) {
+    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
+    else f(prompt(shortText, deflt));
+  }
+
+  var jumpDialog =
+    'Jump to line: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use line:column or scroll% syntax)</span>';
+
+  function jumpToLine(cm) {
+    var cur = cm.getCursor();
+     dialog(cm, jumpDialog, 'Jump to line:', (cur.line+1)+':'+(cur.ch+1), function(posStr) {
+      if (!posStr) return;
+
+      var clnMatch = /^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(posStr);
+      var prcMatch = /^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(posStr);
+      var lnMatch = /^\s*\:?\s*([\+\-]?\d+)\s*/.exec(posStr);
+      if (clnMatch) {
+        try {
+          var line = parseInt(clnMatch[1]);
+          var ch = parseInt(clnMatch[2]);
+          if ('+-'.indexOf(clnMatch[1].charAt(0))>=0)
+            line = cur.line+line+1;
+        }
+        catch (error) { return; }
+        cm.setCursor(line-1, ch-1);
+      }
+      else if (prcMatch) {
+        try {
+          var prc = parseFloat(prcMatch[1]);
+          var line = Math.round(cm.lineCount()*prc/100);
+          if ('+-'.indexOf(prcMatch[1].charAt(0))>=0)
+            line = cur.line+line+1;
+        }
+        catch (error) { return; }
+        cm.setCursor(line-1, cur.ch);
+      }
+      else if (lnMatch) {
+        try {
+          var line = parseInt(lnMatch[1]);
+          if ('+-'.indexOf(lnMatch[1].charAt(0))>=0)
+            line = cur.line+line+1;
+        }
+        catch (error) { return; }
+        cm.setCursor(line-1, cur.ch);
+      }
+     })
+  }
+
+  CodeMirror.commands.jumpToLine = jumpToLine;
+  CodeMirror.keyMap.default["Alt-G"] = "jumpToLine";
+});
diff --git a/demo/search.html b/demo/search.html
index 21c34251e2..fd445db290 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -14,6 +14,7 @@
 <script src="../addon/search/search.js"></script>
 <script src="../addon/scroll/annotatescrollbar.js"></script>
 <script src="../addon/search/matchesonscrollbar.js"></script>
+<script src="../addon/search/jumpToLine.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       dt {font-family: monospace; color: #666;}
@@ -84,12 +85,15 @@ <h2>Search/Replace Demo</h2>
       <dt>Shift-Ctrl-G / Shift-Cmd-G</dt><dd>Find previous</dd>
       <dt>Shift-Ctrl-F / Cmd-Option-F</dt><dd>Replace</dd>
       <dt>Shift-Ctrl-R / Shift-Cmd-Option-F</dt><dd>Replace all</dd>
-      <dt>Alt-F</dt><dd>Persistent search (dialog doesn't autoclose, enter to find next, shift-enter to find previous)</dd>
+      <dt>Alt-F</dt><dd>Persistent search (dialog doesn't autoclose,
+      enter to find next, shift-enter to find previous)</dd>
+      <dt>Alt-G</dt><dd>Jump to line</dd>
     </dl>
     <p>Searching is enabled by
     including <a href="../addon/search/search.js">addon/search/search.js</a>
     and <a href="../addon/search/searchcursor.js">addon/search/searchcursor.js</a>.
-    For good-looking input dialogs, you also want to include
+    Jump to line - including <a href="../addon/search/jumpToLine.js">addon/search/jumpToLine.js</a>.</p>
+    <p>For good-looking input dialogs, you also want to include
     <a href="../addon/dialog/dialog.js">addon/dialog/dialog.js</a>
     and <a href="../addon/dialog/dialog.css">addon/dialog/dialog.css</a>.</p>
   </article>
diff --git a/doc/manual.html b/doc/manual.html
index 4d3326eb50..6fed80226d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2234,6 +2234,13 @@ <h2 id="addons">Addons</h2>
       of <a href="#addon_dialog"><code>openDialog</code></a> when
       available to make prompting for search queries less ugly.</dd>
 
+      <dt id="addon_jumptoline"><a href="../addon/search/jumpToLine.js"><code>search/jumpToLine.js</code></a></dt>
+      <dd>Implements jumpToLine command and binding <code>Alt-G</code> to it.
+      Accepts <code>linenumber</code>, <code>+/-linenumber</code>, <code>line:char</code>,
+      <code>scroll%</code> and <code>:linenumber</code> formats.
+      This will make use of <a href="#addon_dialog"><code>openDialog</code></a>
+      when available to make prompting for line number neater.</dd>
+
       <dt id="addon_matchesonscrollbar"><a href="../addon/search/matchesonscrollbar.js"><code>search/matchesonscrollbar.js</code></a></dt>
       <dd>Adds a <code>showMatchesOnScrollbar</code> method to editor
       instances, which should be given a query (string or regular

From 291b06eb891ff63bc010795bd492e9a672c13566 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 4 Dec 2015 11:12:57 +0100
Subject: [PATCH 2473/4742] [jump-to-line addon] Clean up

Issue #3682
---
 addon/search/jump-to-line.js | 58 +++++++++++++++++++++++++++++
 addon/search/jumpToLine.js   | 72 ------------------------------------
 demo/search.html             |  4 +-
 doc/compress.html            |  1 +
 doc/manual.html              |  4 +-
 5 files changed, 63 insertions(+), 76 deletions(-)
 create mode 100644 addon/search/jump-to-line.js
 delete mode 100644 addon/search/jumpToLine.js

diff --git a/addon/search/jump-to-line.js b/addon/search/jump-to-line.js
new file mode 100644
index 0000000000..06357a9d92
--- /dev/null
+++ b/addon/search/jump-to-line.js
@@ -0,0 +1,58 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Define search commands. Depends on dialog.js or another
+// implementation of the openDialog method.
+
+// Replace works a little oddly -- it will do the replace on the next
+// Ctrl-G (or whatever is bound to findNext) press. You prevent a
+// replace by making sure the match is no longer selected when hitting
+// Ctrl-G.
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../dialog/dialog"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./searchcursor", "../dialog/dialog"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+
+  function dialog(cm, text, shortText, deflt, f) {
+    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
+    else f(prompt(shortText, deflt));
+  }
+
+  var jumpDialog =
+      'Jump to line: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use line:column or scroll% syntax)</span>';
+
+  function interpretLine(cm, string) {
+    var num = Number(string)
+    if (/^[-+]/.test(string)) return cm.getCursor().line + num
+    else return num - 1
+  }
+
+  CodeMirror.commands.jumpToLine = function(cm) {
+    var cur = cm.getCursor();
+    dialog(cm, jumpDialog, "Jump to line:", (cur.line + 1) + ":" + cur.ch, function(posStr) {
+      if (!posStr) return;
+
+      var match;
+      if (match = /^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(posStr)) {
+        cm.setCursor(Pos(interpretLine(cm, match[1]), Number(match[2])))
+      } else if (match = /^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(posStr)) {
+        var prc = parseFloat(match[1]);
+        var line = Math.round(cm.lineCount() * prc / 100);
+        if (/^[-+]/.test(match[1])) line = cur.line + line + 1;
+        cm.setCursor(line - 1, cur.ch);
+      } else if (match = /^\s*\:?\s*([\+\-]?\d+)\s*/.exec(posStr)) {
+        cm.setCursor(interpretLine(cm, match[1]), cur.ch);
+      }
+    });
+  };
+
+  CodeMirror.keyMap.default["Alt-G"] = "jumpToLine";
+});
diff --git a/addon/search/jumpToLine.js b/addon/search/jumpToLine.js
deleted file mode 100644
index 58c5b6707a..0000000000
--- a/addon/search/jumpToLine.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Define search commands. Depends on dialog.js or another
-// implementation of the openDialog method.
-
-// Replace works a little oddly -- it will do the replace on the next
-// Ctrl-G (or whatever is bound to findNext) press. You prevent a
-// replace by making sure the match is no longer selected when hitting
-// Ctrl-G.
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../dialog/dialog"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "./searchcursor", "../dialog/dialog"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function dialog(cm, text, shortText, deflt, f) {
-    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
-    else f(prompt(shortText, deflt));
-  }
-
-  var jumpDialog =
-    'Jump to line: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use line:column or scroll% syntax)</span>';
-
-  function jumpToLine(cm) {
-    var cur = cm.getCursor();
-     dialog(cm, jumpDialog, 'Jump to line:', (cur.line+1)+':'+(cur.ch+1), function(posStr) {
-      if (!posStr) return;
-
-      var clnMatch = /^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(posStr);
-      var prcMatch = /^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(posStr);
-      var lnMatch = /^\s*\:?\s*([\+\-]?\d+)\s*/.exec(posStr);
-      if (clnMatch) {
-        try {
-          var line = parseInt(clnMatch[1]);
-          var ch = parseInt(clnMatch[2]);
-          if ('+-'.indexOf(clnMatch[1].charAt(0))>=0)
-            line = cur.line+line+1;
-        }
-        catch (error) { return; }
-        cm.setCursor(line-1, ch-1);
-      }
-      else if (prcMatch) {
-        try {
-          var prc = parseFloat(prcMatch[1]);
-          var line = Math.round(cm.lineCount()*prc/100);
-          if ('+-'.indexOf(prcMatch[1].charAt(0))>=0)
-            line = cur.line+line+1;
-        }
-        catch (error) { return; }
-        cm.setCursor(line-1, cur.ch);
-      }
-      else if (lnMatch) {
-        try {
-          var line = parseInt(lnMatch[1]);
-          if ('+-'.indexOf(lnMatch[1].charAt(0))>=0)
-            line = cur.line+line+1;
-        }
-        catch (error) { return; }
-        cm.setCursor(line-1, cur.ch);
-      }
-     })
-  }
-
-  CodeMirror.commands.jumpToLine = jumpToLine;
-  CodeMirror.keyMap.default["Alt-G"] = "jumpToLine";
-});
diff --git a/demo/search.html b/demo/search.html
index fd445db290..a5a8897190 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -14,7 +14,7 @@
 <script src="../addon/search/search.js"></script>
 <script src="../addon/scroll/annotatescrollbar.js"></script>
 <script src="../addon/search/matchesonscrollbar.js"></script>
-<script src="../addon/search/jumpToLine.js"></script>
+<script src="../addon/search/jump-to-line.js"></script>
 <style type="text/css">
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       dt {font-family: monospace; color: #666;}
@@ -86,7 +86,7 @@ <h2>Search/Replace Demo</h2>
       <dt>Shift-Ctrl-F / Cmd-Option-F</dt><dd>Replace</dd>
       <dt>Shift-Ctrl-R / Shift-Cmd-Option-F</dt><dd>Replace all</dd>
       <dt>Alt-F</dt><dd>Persistent search (dialog doesn't autoclose,
-      enter to find next, shift-enter to find previous)</dd>
+      enter to find next, Shift-Enter to find previous)</dd>
       <dt>Alt-G</dt><dd>Jump to line</dd>
     </dl>
     <p>Searching is enabled by
diff --git a/doc/compress.html b/doc/compress.html
index 7712274c83..f7c511c78c 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -243,6 +243,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/hint/javascript-hint.js">javascript-hint.js</option>
           <option value="http://codemirror.net/addon/lint/javascript-lint.js">javascript-lint.js</option>
           <option value="http://codemirror.net/addon/lint/json-lint.js">json-lint.js</option>
+          <option value="http://codemirror.net/addon/search/jump-to-line.js">jump-to-line.js</option>
           <option value="http://codemirror.net/addon/lint/lint.js">lint.js</option>
           <option value="http://codemirror.net/addon/mode/loadmode.js">loadmode.js</option>
           <option value="http://codemirror.net/addon/fold/markdown-fold.js">markdown-fold.js</option>
diff --git a/doc/manual.html b/doc/manual.html
index 6fed80226d..7f758eafca 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2234,8 +2234,8 @@ <h2 id="addons">Addons</h2>
       of <a href="#addon_dialog"><code>openDialog</code></a> when
       available to make prompting for search queries less ugly.</dd>
 
-      <dt id="addon_jumptoline"><a href="../addon/search/jumpToLine.js"><code>search/jumpToLine.js</code></a></dt>
-      <dd>Implements jumpToLine command and binding <code>Alt-G</code> to it.
+      <dt id="addon_jump-to-line"><a href="../addon/search/jump-to-line.js"><code>search/jump-to-line.js</code></a></dt>
+      <dd>Implements a <code>jumpToLine</code> command and binding <code>Alt-G</code> to it.
       Accepts <code>linenumber</code>, <code>+/-linenumber</code>, <code>line:char</code>,
       <code>scroll%</code> and <code>:linenumber</code> formats.
       This will make use of <a href="#addon_dialog"><code>openDialog</code></a>

From 026ad081b16c3e13898d64492ee36b322df7a6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elis=C3=A9e?= <elisee@sparklinlabs.com>
Date: Tue, 24 Nov 2015 16:00:31 +0100
Subject: [PATCH 2474/4742] [javascript mode] Add missing keywords for
 typescript mode

---
 mode/javascript/javascript.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 6d80bddf72..76dc56455b 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -46,13 +46,21 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       var tsKeywords = {
         // object-like things
         "interface": kw("interface"),
+        "implements": kw("implements"),
         "constructor": kw("constructor"),
+        "namespace": kw("namespace"),
+        "module": kw("module"),
+        "enum": kw("enum"),
 
         // scope modifiers
         "public": kw("public"),
         "private": kw("private"),
         "protected": kw("protected"),
         "static": kw("static"),
+        "abstract": kw("abstract"),
+
+        // operators
+        "as": operator,
 
         // types
         "string": type, "number": type, "boolean": type, "any": type

From 7cde7a70940e822878edbbd8edacfaef2215ffa8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Dec 2015 14:40:57 +0100
Subject: [PATCH 2475/4742] [javascript mode] Clean up TypeScript keywords

Issue #3666
---
 mode/javascript/javascript.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 76dc56455b..e97593a212 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -45,19 +45,17 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       var type = {type: "variable", style: "variable-3"};
       var tsKeywords = {
         // object-like things
-        "interface": kw("interface"),
-        "implements": kw("implements"),
-        "constructor": kw("constructor"),
-        "namespace": kw("namespace"),
+        "interface": kw("class"),
+        "implements": C,
+        "namespace": C,
         "module": kw("module"),
-        "enum": kw("enum"),
+        "enum": kw("module"),
 
         // scope modifiers
-        "public": kw("public"),
-        "private": kw("private"),
-        "protected": kw("protected"),
-        "static": kw("static"),
-        "abstract": kw("abstract"),
+        "public": kw("modifier"),
+        "private": kw("modifier"),
+        "protected": kw("modifier"),
+        "abstract": kw("modifier"),
 
         // operators
         "as": operator,
@@ -362,6 +360,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "class") return cont(pushlex("form"), className, poplex);
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
+    if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {
@@ -466,6 +465,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(afterprop);
     } else if (type == "jsonld-keyword") {
       return cont(afterprop);
+    } else if (type == "modifier") {
+      return cont(objprop)
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
     } else if (type == "spread") {
@@ -518,6 +519,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(pattern, maybetype, maybeAssign, vardefCont);
   }
   function pattern(type, value) {
+    if (type == "modifier") return cont(pattern)
     if (type == "variable") { register(value); return cont(); }
     if (type == "spread") return cont(pattern);
     if (type == "[") return contCommasep(pattern, "]");

From 25815ce36d8463e6b7bdd739875e58e22cac9238 Mon Sep 17 00:00:00 2001
From: mihailik <mihailik@gmail.com>
Date: Fri, 4 Dec 2015 12:31:43 +0000
Subject: [PATCH 2476/4742] [jump-to-line addon] Cleanup of the header,
 consistency tweaks

---
 addon/search/jump-to-line.js | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/addon/search/jump-to-line.js b/addon/search/jump-to-line.js
index 06357a9d92..49f3df4efe 100644
--- a/addon/search/jump-to-line.js
+++ b/addon/search/jump-to-line.js
@@ -1,26 +1,18 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
-// Define search commands. Depends on dialog.js or another
-// implementation of the openDialog method.
-
-// Replace works a little oddly -- it will do the replace on the next
-// Ctrl-G (or whatever is bound to findNext) press. You prevent a
-// replace by making sure the match is no longer selected when hitting
-// Ctrl-G.
+// Defines jumpToLine command. Uses dialog.js if present.
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../dialog/dialog"));
+    mod(require("../../lib/codemirror"), require("../dialog/dialog"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "./searchcursor", "../dialog/dialog"], mod);
+    define(["../../lib/codemirror", "../dialog/dialog"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
   "use strict";
 
-  var Pos = CodeMirror.Pos;
-
   function dialog(cm, text, shortText, deflt, f) {
     if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
     else f(prompt(shortText, deflt));
@@ -42,10 +34,9 @@
 
       var match;
       if (match = /^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(posStr)) {
-        cm.setCursor(Pos(interpretLine(cm, match[1]), Number(match[2])))
+        cm.setCursor(interpretLine(cm, match[1]), Number(match[2]))
       } else if (match = /^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(posStr)) {
-        var prc = parseFloat(match[1]);
-        var line = Math.round(cm.lineCount() * prc / 100);
+        var line = Math.round(cm.lineCount() * Number(match[1]) / 100);
         if (/^[-+]/.test(match[1])) line = cur.line + line + 1;
         cm.setCursor(line - 1, cur.ch);
       } else if (match = /^\s*\:?\s*([\+\-]?\d+)\s*/.exec(posStr)) {

From 5ead6aca38d055472075cd63f283dc607a283bfe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Dec 2015 15:07:07 +0100
Subject: [PATCH 2477/4742] Expose isReadOnly method

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

diff --git a/doc/manual.html b/doc/manual.html
index 7f758eafca..22d32df0ad 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2000,11 +2000,15 @@ <h3 id="api_misc">Miscellaneous methods</h3>
           indentation by the given amount of spaces.</dd>
         </dl></dd>
 
-      <dt id="toggleOverwrite"><code><strong>cm.toggleOverwrite</strong>(?value: bool)</code></dt>
+      <dt id="toggleOverwrite"><code><strong>cm.toggleOverwrite</strong>(?value: boolean)</code></dt>
       <dd>Switches between overwrite and normal insert mode (when not
       given an argument), or sets the overwrite mode to a specific
       state (when given an argument).</dd>
 
+      <dt id="isReadOnly"><code><strong>cm.isReadOnly</strong>() → boolean</code></dt>
+      <dd>Tells you whether the editor's content can be edited by the
+      user.</dd>
+
       <dt id="lineSeparator"><code><strong>doc.lineSeparator</strong>()</code></dt>
       <dd>Returns the preferred line separator string for this
       document, as per the <a href="#option_lineSeparator">option</a>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1d8b8cc70a..88c47bba46 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1094,10 +1094,6 @@
     if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
   }
 
-  function isReadOnly(cm) {
-    return cm.options.readOnly || cm.doc.cantEdit;
-  }
-
   // This will be set to an array of strings when copying, so that,
   // when pasting, we know what kind of selections the copied text
   // was made out of.
@@ -1152,7 +1148,7 @@
     var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
     if (pasted) {
       e.preventDefault();
-      if (!isReadOnly(cm) && !cm.options.disableInput)
+      if (!cm.isReadOnly() && !cm.options.disableInput)
         runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
       return true;
     }
@@ -1423,7 +1419,7 @@
       // in which case reading its value would be expensive.
       if (this.contextMenuPending || !cm.state.focused ||
           (hasSelection(input) && !prevInput && !this.composing) ||
-          isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
+          cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
         return false;
 
       var text = input.value;
@@ -1612,7 +1608,7 @@
 
       on(div, "input", function() {
         if (input.composing) return;
-        if (isReadOnly(cm) || !input.pollContent())
+        if (cm.isReadOnly() || !input.pollContent())
           runInOp(input.cm, function() {regChange(cm);});
       });
 
@@ -1837,7 +1833,7 @@
       this.div.focus();
     },
     applyComposition: function(composing) {
-      if (isReadOnly(this.cm))
+      if (this.cm.isReadOnly())
         operation(this.cm, regChange)(this.cm)
       else if (composing.data && composing.data != composing.startData)
         operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
@@ -1849,7 +1845,7 @@
 
     onKeyPress: function(e) {
       e.preventDefault();
-      if (!isReadOnly(this.cm))
+      if (!this.cm.isReadOnly())
         operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
     },
 
@@ -3614,7 +3610,7 @@
     }
 
     var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
+    if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
         type == "single" && (contained = sel.contains(start)) > -1 &&
         (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
         (cmp(contained.to(), start) > 0 || start.xRel < 0))
@@ -3838,7 +3834,7 @@
     e_preventDefault(e);
     if (ie) lastDrop = +new Date;
     var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-    if (!pos || isReadOnly(cm)) return;
+    if (!pos || cm.isReadOnly()) return;
     // Might be a file drop, in which case we simply extract the text
     // and insert it.
     if (files && files.length && window.FileReader && window.File) {
@@ -4077,7 +4073,7 @@
     cm.display.input.ensurePolled();
     var prevShift = cm.display.shift, done = false;
     try {
-      if (isReadOnly(cm)) cm.state.suppressEdits = true;
+      if (cm.isReadOnly()) cm.state.suppressEdits = true;
       if (dropShift) cm.display.shift = false;
       done = bound(cm) != Pass;
     } finally {
@@ -5238,6 +5234,7 @@
       signal(this, "overwriteToggle", this, this.state.overwrite);
     },
     hasFocus: function() { return this.display.input.getField() == activeElt(); },
+    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); },
 
     scrollTo: methodOp(function(x, y) {
       if (x != null || y != null) resolveScrollToPos(this);

From 2fbb91e69d3c2d21ff1b0a391efbf225ebf1f29a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Dec 2015 15:10:38 +0100
Subject: [PATCH 2478/4742] [sublime bindings] Don't mess up selection in
 read-only mode

Closes #3684
---
 keymap/sublime.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index a0ca41ea2a..e0640b7639 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -108,6 +108,7 @@
   map["Shift-" + ctrl + "K"] = "deleteLine";
 
   function insertLine(cm, above) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
     cm.operation(function() {
       var len = cm.listSelections().length, newSelection = [], last = -1;
       for (var i = 0; i < len; i++) {
@@ -123,9 +124,9 @@
     });
   }
 
-  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { insertLine(cm, false); };
+  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { return insertLine(cm, false); };
 
-  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { insertLine(cm, true); };
+  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { return insertLine(cm, true); };
 
   function wordAt(cm, pos) {
     var start = pos.ch, end = start, line = cm.getLine(pos.line);
@@ -192,6 +193,7 @@
   var swapLineCombo = mac ? "Cmd-Ctrl-" : "Shift-Ctrl-";
 
   cmds[map[swapLineCombo + "Up"] = "swapLineUp"] = function(cm) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
     var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i], from = range.from().line - 1, to = range.to().line;
@@ -218,6 +220,7 @@
   };
 
   cmds[map[swapLineCombo + "Down"] = "swapLineDown"] = function(cm) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
     var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
     for (var i = ranges.length - 1; i >= 0; i--) {
       var range = ranges[i], from = range.to().line + 1, to = range.from().line;
@@ -289,6 +292,7 @@
   map[ctrl + "T"] = "transposeChars";
 
   function sortLines(cm, caseSensitive) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
     var ranges = cm.listSelections(), toSort = [], selected;
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i];

From c0e878ab7170a587eed9440ee101bac887181c4f Mon Sep 17 00:00:00 2001
From: sverweij <sverweij@users.noreply.github.com>
Date: Sat, 5 Dec 2015 19:23:20 +0100
Subject: [PATCH 2479/4742] [mscgen mode] doc: adds MscGen to the 'Language
 modes' index

---
 mode/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/index.html b/mode/index.html
index 044dee7fdb..477ca2c18c 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -86,6 +86,7 @@ <h2>Language modes</h2>
       <li><a href="mathematica/index.html">Mathematica</a></li>
       <li><a href="mirc/index.html">mIRC</a></li>
       <li><a href="modelica/index.html">Modelica</a></li>
+      <li><a href="mscgen/index.html">MscGen</a></li>
       <li><a href="mumps/index.html">MUMPS</a></li>
       <li><a href="nginx/index.html">Nginx</a></li>
       <li><a href="nsis/index.html">NSIS</a></li>

From fb113ab0ab12ee5bb98fd7900cc970f37d155990 Mon Sep 17 00:00:00 2001
From: sverweij <sverweij@users.noreply.github.com>
Date: Sat, 5 Dec 2015 19:36:23 +0100
Subject: [PATCH 2480/4742] [mscgen mode] doc: merges MscGen derived modes into
 Mscgen page

... taking the same approach as the C-like page.

Also
- Changes the window title from Oz mode => MscGen mode
- Makes the samples a little more uniform
---
 mode/mscgen/index.html         | 100 ++++++++++++++++++++++++++++++---
 mode/mscgen/index_msgenny.html |  44 ---------------
 mode/mscgen/index_xu.html      |  70 -----------------------
 3 files changed, 93 insertions(+), 121 deletions(-)
 delete mode 100644 mode/mscgen/index_msgenny.html
 delete mode 100644 mode/mscgen/index_xu.html

diff --git a/mode/mscgen/index.html b/mode/mscgen/index.html
index 0517825fbc..8c28ee6200 100644
--- a/mode/mscgen/index.html
+++ b/mode/mscgen/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror: Oz mode</title>
+<title>CodeMirror: MscGen mode</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
 
@@ -24,11 +24,10 @@
 <article>
 <h2>MscGen mode</h2>
 
-<div><textarea id="code">
+<div><textarea id="mscgen-code">
 # Sample mscgen program
-# See http://www.mcternan.me.uk/mscgen or 
+# See http://www.mcternan.me.uk/mscgen or
 # https://sverweij.github.io/mscgen_js for more samples
-
 msc {
   # options
   hscale="1.2";
@@ -54,12 +53,99 @@ <h2>MscGen mode</h2>
 }
 </textarea></div>
 
+<h2>Xù mode</h2>
+
+<div><textarea id="xu-code">
+# Xù - expansions to MscGen to support inline expressions
+#      https://github.com/sverweij/mscgen_js/blob/master/wikum/xu.md
+# More samples: https://sverweij.github.io/mscgen_js
+msc {
+  hscale="0.8",
+  width="700";
+
+  a,
+  b [label="change store"],
+  c,
+  d [label="necro queue"],
+  e [label="natalis queue"],
+  f;
+
+  a =>> b [label="get change list()"];
+  a alt f [label="changes found"] { /* alt is a xu specific keyword*/
+    b >> a [label="list of changes"];
+    a =>> c [label="cull old stuff (list of changes)"];
+    b loop e [label="for each change"] { // loop is xu specific as well...
+      /*
+       * Interesting stuff happens.
+       */
+      c =>> b [label="get change()"];
+      b >> c [label="change"];
+      c alt e [label="change too old"] {
+        c =>> d [label="queue(change)"];
+        --- [label="change newer than latest run"];
+        c =>> e [label="queue(change)"];
+        --- [label="all other cases"];
+        ||| [label="leave well alone"];
+      };
+    };
+
+    c >> a [label="done
+    processing"];
+
+    /* shucks! nothing found ...*/
+    --- [label="nothing found"];
+    b >> a [label="nothing"];
+    a note a [label="silent exit"];
+  };
+}
+</textarea></div>
+
+<h2>MsGenny mode</h2>
+<div><textarea id="msgenny-code">
+# MsGenny - simplified version of MscGen / Xù
+#           https://github.com/sverweij/mscgen_js/blob/master/wikum/msgenny.md
+# More samples: https://sverweij.github.io/mscgen_js
+a -> b   : a -> b  (signal);
+a => b   : a => b  (method);
+b >> a   : b >> a  (return value);
+a =>> b  : a =>> b (callback);
+a -x b   : a -x b  (lost);
+a :> b   : a :> b  (emphasis);
+a .. b   : a .. b  (dotted);
+a -- b   : "a -- b straight line";
+a note a : a note a\n(note),
+b box b  : b box b\n(action);
+a rbox a : a rbox a\n(reference),
+b abox b : b abox b\n(state/ condition);
+|||      : ||| (empty row);
+...      : ... (omitted row);
+---      : --- (comment);
+</textarea></div>
+
+    <p>
+      Simple mode for highlighting MscGen and two derived sequence
+      chart languages.
+    </p>
+
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+      var mscgenEditor = CodeMirror.fromTextArea(document.getElementById("mscgen-code"), {
         lineNumbers: true,
-        mode: "mscgen",
+        mode: "text/x-mscgen",
+      });
+      var xuEditor = CodeMirror.fromTextArea(document.getElementById("xu-code"), {
+        lineNumbers: true,
+        mode: "text/x-xu",
+      });
+      var msgennyEditor = CodeMirror.fromTextArea(document.getElementById("msgenny-code"), {
+        lineNumbers: true,
+        mode: "text/x-msgenny",
       });
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-mscgen</code></p>
+    <p><strong>MIME types defined:</strong>
+      <code>text/x-mscgen</code>
+      <code>text/x-xu</code>
+      <code>text/x-msgenny</code>
+    </p>
+
 </article>
diff --git a/mode/mscgen/index_msgenny.html b/mode/mscgen/index_msgenny.html
deleted file mode 100644
index 1664f3051e..0000000000
--- a/mode/mscgen/index_msgenny.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: msgenny mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="mscgen.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: msgenny mode</h1>
-
-<div><textarea id="code">
-# Sample msgenny program
-# https://sverweij.github.io/mscgen_js for more samples
-
-a -> b   : a -> b  (signal);
-a => b   : a => b  (method);
-b >> a   : b >> a  (return value);
-a =>> b  : a =>> b (callback);
-a -x b   : a -x b  (lost);
-a :> b   : a :> b  (emphasis);
-a .. b   : a .. b  (dotted);
-a -- b   : "a -- b straight line";
-a note a : a note a\n(note),
-b box b  : b box b\n(action);
-a rbox a : a rbox a\n(reference),
-b abox b : b abox b\n(state/ condition);
-|||      : ||| (empty row);
-...      : ... (omitted row);
----      : --- (comment);
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "msgenny",
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-msgenny</code></p>
-  </body>
-</html>
diff --git a/mode/mscgen/index_xu.html b/mode/mscgen/index_xu.html
deleted file mode 100644
index 2f7bf9ec04..0000000000
--- a/mode/mscgen/index_xu.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: xu mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="mscgen.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror: xù mode</h1>
-
-<div><textarea id="code">
-# test50 - expansions to mscgen to support inline expressions
-#          for now in a separate language: xù
-msc {
-
-  hscale="0.8",
-  width="700";
-
-  a,
-  b [label="change store"],
-  c,
-  d [label="necro queue"],
-  e [label="natalis queue"],
-  f;
-
-  a =>> b [label="get change list()"];
-  a alt f [label="changes found"] { /* alt is a xu specific keyword*/
-    b >> a [label="list of changes"];
-    a =>> c [label="cull old stuff (list of changes)"];
-    b loop e [label="for each change"] { // loop is xu specific as well...
-      /*
-       * Here interesting stuff happens.
-       * TBD
-       */
-      c =>> b [label="get change()"];
-      b >> c [label="change"];
-      c alt e [label="change too old"] {
-        c =>> d [label="queue(change)"];
-        --- [label="change newer than latest run"];
-        c =>> e [label="queue(change)"];
-        --- [label="all other cases"];
-        ||| [label="leave well alone"];
-      };
-    };
-    
-    
-    c >> a [label="done
-    processing"];
-    
-    /* shucks! nothing found ...*/
-    --- [label="nothing found"];
-    b >> a [label="nothing"];
-    a note a [label="silent exit"];
-  };
-}
-</textarea></div>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "xu",
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-xu</code></p>
-  </body>
-</html>

From 382f51d257112027d147f583d14d6880618fd3da Mon Sep 17 00:00:00 2001
From: sverweij <sverweij@users.noreply.github.com>
Date: Sat, 5 Dec 2015 19:55:08 +0100
Subject: [PATCH 2481/4742] [mscgen mode] simplifies the regexps to recognize
 keywords

for our purposes (=>|<=|...) works just as well as ((<=)|(=>)|...)
---
 mode/mscgen/mscgen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
index 3cf4eb0897..d61b470652 100644
--- a/mode/mscgen/mscgen.js
+++ b/mode/mscgen/mscgen.js
@@ -69,11 +69,11 @@
   CodeMirror.defineMIME("text/x-msgenny", {name: "mscgen", language: "msgenny"});
 
   function wordRegexpBoundary(pWords) {
-    return new RegExp("\\b((" + pWords.join(")|(") + "))\\b", "i");
+    return new RegExp("\\b(" + pWords.join("|") + ")\\b", "i");
   }
 
   function wordRegexp(pWords) {
-    return new RegExp("((" + pWords.join(")|(") + "))", "i");
+    return new RegExp("(" + pWords.join("|") + ")", "i");
   }
 
   function startStateFn() {

From 764022a60ee7c092e18c9a45f3678d6b52852a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <nicolo.ribaudo@gmail.com>
Date: Sat, 5 Dec 2015 22:05:27 +0100
Subject: [PATCH 2482/4742] [javascript mode] Recognize regex inside template
 literal

Closes gh-3687
---
 mode/javascript/javascript.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index e97593a212..d4ae668794 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -126,7 +126,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (stream.eat("/")) {
         stream.skipToEnd();
         return ret("comment", "comment");
-      } else if (/^(?:operator|sof|keyword c|case|new|[\[{}\(,;:])$/.test(state.lastType)) {
+      } else if (/^(?:operator|sof|keyword c|case|new|[\[{}\(,;:])$/.test(state.lastType) ||
+                 (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - 1)))) {
         readRegexp(stream);
         stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
         return ret("regexp", "string-2");

From 9399b1cdee43d648fd8649c15220afdc33fc3ec0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Dec 2015 15:43:13 +0100
Subject: [PATCH 2483/4742] [vim bindings] Use a simpler way to handle
 splitting on dashes

---
 keymap/vim.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 02ed53af30..c1532a179a 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -292,12 +292,7 @@
         // Keypress character binding of format "'a'"
         return key.charAt(1);
       }
-      var pieces = key.split('-');
-      if (/-$/.test(key)) {
-        // If the - key was typed, split will result in 2 extra empty strings
-        // in the array. Replace them with 1 '-'.
-        pieces.splice(-2, 2, '-');
-      }
+      var pieces = key.split(/-(?!$)/);
       var lastPiece = pieces[pieces.length - 1];
       if (pieces.length == 1 && pieces[0].length == 1) {
         // No-modifier bindings use literal character bindings above. Skip.

From 4bdf6440429bc455f4ce39486d424fba0be7fa14 Mon Sep 17 00:00:00 2001
From: mihailik <mihailik@gmail.com>
Date: Sat, 28 Nov 2015 15:55:34 +0000
Subject: [PATCH 2484/4742] Fixing hidding keyboard on arrow keys on mobile

Makes sure the selection is not entirely cleared, which causs the
on-screen keyboard to get hidden.

Disabled for Firefox, where this causes other problems.

Issue #3653
---
 lib/codemirror.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 88c47bba46..5bfa91d6c2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1688,8 +1688,13 @@
       try { var rng = range(start.node, start.offset, end.offset, end.node); }
       catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
       if (rng) {
-        sel.removeAllRanges();
-        sel.addRange(rng);
+        if (!gecko && this.cm.state.focused) {
+          sel.collapse(start.node, start.offset);
+          if (!rng.collapsed) sel.addRange(rng);
+        } else {
+          sel.removeAllRanges();
+          sel.addRange(rng);
+        }
         if (old && sel.anchorNode == null) sel.addRange(old);
         else if (gecko) this.startGracePeriod();
       }

From b3010eddf829821ef279ce80a73047b6e6db6011 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 13 Dec 2015 00:07:29 +0100
Subject: [PATCH 2485/4742] [css mode] Clean up handling of inline option

---
 mode/css/css.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index b20b4907ec..2673074ab9 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -12,9 +12,8 @@
 "use strict";
 
 CodeMirror.defineMode("css", function(config, parserConfig) {
-  var provided = parserConfig;
+  var inline = parserConfig.inline
   if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
-  parserConfig.inline = provided.inline;
 
   var indentUnit = config.indentUnit,
       tokenHooks = parserConfig.tokenHooks,
@@ -368,9 +367,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   return {
     startState: function(base) {
       return {tokenize: null,
-              state: parserConfig.inline ? "block" : "top",
+              state: inline ? "block" : "top",
               stateArg: null,
-              context: new Context(parserConfig.inline ? "block" : "top", base || 0, null)};
+              context: new Context(inline ? "block" : "top", base || 0, null)};
     },
 
     token: function(stream, state) {

From 0dbe0ef55d50734818325bbbc211f47c21c3c0ed Mon Sep 17 00:00:00 2001
From: TDaglis <ath.daglis@gmail.com>
Date: Tue, 15 Dec 2015 11:39:14 +0000
Subject: [PATCH 2486/4742] [django mode] better highlighting of in/and/or/not

Currently operators in most themes look like normal text because
cm-operator doesn't usually get special styling. This patch highlights
word operators (in/and/or/not) to make them stand out better.
---
 mode/django/django.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mode/django/django.js b/mode/django/django.js
index 7fae876c16..eb8d65914e 100644
--- a/mode/django/django.js
+++ b/mode/django/django.js
@@ -35,11 +35,13 @@
                    "truncatechars_html", "truncatewords", "truncatewords_html",
                    "unordered_list", "upper", "urlencode", "urlize",
                    "urlizetrunc", "wordcount", "wordwrap", "yesno"],
-        operators = ["==", "!=", "<", ">", "<=", ">=", "in", "not", "or", "and"];
+        operators = ["==", "!=", "<", ">", "<=", ">="],
+        wordOperators = ["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");
+    wordOperators = new RegExp("^\\b(" + wordOperators.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
@@ -270,6 +272,11 @@
         return "operator";
       }
 
+      // Attempt to match a word operator
+      if (stream.match(wordOperators)) {
+        return "keyword";
+      }
+
       // Attempt to match a keyword
       var keywordMatch = stream.match(keywords);
       if (keywordMatch) {

From 07207dd57c351b7ce9861960c1fba03caf301a99 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 15 Dec 2015 22:13:51 +0100
Subject: [PATCH 2487/4742] [show-hint addon] Use mouseover rather than
 mousemove to change selection

So that tiny mouse motions don't keep resetting the selected item

Closes #3698
---
 addon/hint/show-hint.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 7eefad8b5b..204e136fe8 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -296,10 +296,10 @@
     });
 
     if (completion.options.completeOnSingleClick)
-      CodeMirror.on(hints, "mousemove", function(e) {
-        var elt = getHintElement(hints, e.target || e.srcElement);
-        if (elt && elt.hintId != null)
-          widget.changeActive(elt.hintId);
+      CodeMirror.on(hints, "mouseover", function(e) {
+        var target = e.target || e.srcElement
+        if (target.hintId != null && !target.contains(e.relatedTarget || e.fromElement))
+          widget.changeActive(target.hintId);
       });
 
     CodeMirror.signal(data, "select", completions[0], hints.firstChild);

From 9951761dc3e690cb958b4f11f7a84092466c9c56 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 15 Dec 2015 22:36:46 +0100
Subject: [PATCH 2488/4742] Fall back to putting CodeMirror in window if this
 is undefined

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5bfa91d6c2..07a23f1b80 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -13,7 +13,7 @@
   else if (typeof define == "function" && define.amd) // AMD
     return define([], mod);
   else // Plain browser env
-    this.CodeMirror = mod();
+    (this || window).CodeMirror = mod();
 })(function() {
   "use strict";
 

From b7f07850a9339b85a97fe0c261b5d3929c31d835 Mon Sep 17 00:00:00 2001
From: Cole R Lawrence <msgzht@gmail.com>
Date: Mon, 14 Dec 2015 11:59:30 -0600
Subject: [PATCH 2489/4742] Link text runmode script in the correct location

---
 demo/runmode.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/runmode.html b/demo/runmode.html
index 257f03d6b6..ab8938d8d3 100644
--- a/demo/runmode.html
+++ b/demo/runmode.html
@@ -43,7 +43,7 @@ <h2>Mode Runner Demo</h2>
 
     <p>Running a CodeMirror mode outside of the editor.
     The <code>CodeMirror.runMode</code> function, defined
-    in <code><a href="../addon/runmode/runmode.js">lib/runmode.js</a></code> takes the following arguments:</p>
+    in <code><a href="../addon/runmode/runmode.js">addon/runmode/runmode.js</a></code> takes the following arguments:</p>
 
     <dl>
       <dt><code>text (string)</code></dt>

From 4c66400caefe1dbaf959b30ed835feec6942aa86 Mon Sep 17 00:00:00 2001
From: Jim <jsproch@fb.com>
Date: Mon, 14 Dec 2015 11:47:37 -0800
Subject: [PATCH 2490/4742] Correct typo in codemirror.css (`actuall` vs
 `actual`)

There was a typo in one of the comments (`actuall` vs `actual`).
---
 lib/codemirror.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 3543523e64..1067b3ee6b 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -165,7 +165,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
+   before actual scrolling happens, thus preventing shaking and
    flickering artifacts. */
 .CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   position: absolute;

From 188ae75e0154ba68d918ab21939163d8bf2d9f87 Mon Sep 17 00:00:00 2001
From: McBrainy <McBrainy@users.noreply.github.com>
Date: Mon, 14 Dec 2015 17:49:23 -0600
Subject: [PATCH 2491/4742] Fix typo in manual

It took me forever to figure out why vim mode wasn't working, and all because the manual said to set the "keymap" option and not the "keyMap" option. I also added quotes to make it clear that "vim" is a string.
---
 doc/manual.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 22d32df0ad..8812a1713d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3251,8 +3251,8 @@ <h2>VIM Mode API</h2>
     <p>CodeMirror has a robust VIM mode that attempts to faithfully
     emulate VIM's most useful features. It can be enabled by
     including <a href="../keymap/vim.js"><code>keymap/vim.js</code>
-    </a> and setting the <code>keymap</code> option to
-    <code>vim</code>.</p>
+    </a> and setting the <code>keyMap</code> option to
+    <code>"vim"</code>.</p>
 
     <h3 id="vimapi_configuration">Configuration</h3>
 

From 7e35f03ad1639d92735c8dee1e1b5c86a727c873 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 15 Dec 2015 22:48:56 +0100
Subject: [PATCH 2492/4742] [runmode addon] Treat everything with an
 appendChild property as a DOM output node

Closes #3703
---
 addon/runmode/runmode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 07d2279f74..a51c6d0d52 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -16,7 +16,7 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
   var ie = /MSIE \d/.test(navigator.userAgent);
   var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
 
-  if (callback.nodeType == 1) {
+  if (callback.appendChild) {
     var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
     var node = callback, col = 0;
     node.innerHTML = "";

From bae907609a698e0da4579f69d13f84eccc252833 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Dec 2015 09:09:22 +0100
Subject: [PATCH 2493/4742] [sublime bindings] Give ctrl-/ command a name

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index e0640b7639..e0d0e92b91 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -243,7 +243,7 @@
     });
   };
 
-  map[ctrl + "/"] = function(cm) {
+  cmds[map[ctrl + "/"] = "toggleCommentIndented"] = function(cm) {
     cm.toggleComment({ indent: true });
   }
 

From 06e83fd66ebe639038eb64013891a1535ed07f25 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 16 Dec 2015 09:15:52 +0100
Subject: [PATCH 2494/4742] [show-hint addon] Revert select-on-mouse behavior

Issue #3636
Issue #3698
---
 addon/hint/show-hint.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 204e136fe8..cbe3b39a30 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -295,13 +295,6 @@
       setTimeout(function(){cm.focus();}, 20);
     });
 
-    if (completion.options.completeOnSingleClick)
-      CodeMirror.on(hints, "mouseover", function(e) {
-        var target = e.target || e.srcElement
-        if (target.hintId != null && !target.contains(e.relatedTarget || e.fromElement))
-          widget.changeActive(target.hintId);
-      });
-
     CodeMirror.signal(data, "select", completions[0], hints.firstChild);
     return true;
   }

From 463797fb5ed003bacd64b69fc0910fbdb2cd0ca5 Mon Sep 17 00:00:00 2001
From: mihailik <mihailik@gmail.com>
Date: Wed, 16 Dec 2015 09:55:27 +0000
Subject: [PATCH 2495/4742] [jump-to-line addon] Quote `default` property

To avoid IE8 parser issue.
---
 addon/search/jump-to-line.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/jump-to-line.js b/addon/search/jump-to-line.js
index 49f3df4efe..8b599cbc17 100644
--- a/addon/search/jump-to-line.js
+++ b/addon/search/jump-to-line.js
@@ -45,5 +45,5 @@
     });
   };
 
-  CodeMirror.keyMap.default["Alt-G"] = "jumpToLine";
+  CodeMirror.keyMap["default"]["Alt-G"] = "jumpToLine";
 });

From ab78fe07c459a56d92c6c4c9b50b3be86c314534 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 11 Dec 2015 00:49:09 +0400
Subject: [PATCH 2496/4742] [vim] fix autoindent of S command

---
 keymap/vim.js    | 20 ++++++++++++++------
 test/vim_test.js | 15 ++++++++++++---
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c1532a179a..59815957ca 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1954,13 +1954,21 @@
               text = text.slice(0, - match[0].length);
             }
           }
-          var wasLastLine = head.line - 1 == cm.lastLine();
-          cm.replaceRange('', anchor, head);
-          if (args.linewise && !wasLastLine) {
+          var prevLineEnd = new Pos(anchor.line - 1, Number.MAX_VALUE);
+          var wasLastLine = cm.firstLine() == cm.lastLine();
+          if (head.line > cm.lastLine() && args.linewise && !wasLastLine) {
+            cm.replaceRange('', prevLineEnd, head);
+          } else {
+            cm.replaceRange('', anchor, head);
+          }
+          if (args.linewise) {
             // Push the next line back down, if there is a next line.
-            CodeMirror.commands.newlineAndIndent(cm);
-            // null ch so setCursor moves to end of line.
-            anchor.ch = null;
+            if (!wasLastLine) {
+              cm.setCursor(prevLineEnd);
+              CodeMirror.commands.newlineAndIndent(cm);
+            }
+            // make sure cursor ends up at the end of the line.
+            anchor.ch = Number.MAX_VALUE;
           }
           finalHead = anchor;
         } else {
diff --git a/test/vim_test.js b/test/vim_test.js
index 855cb8825e..74c6a95071 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2148,9 +2148,18 @@ testVim('S_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('j', 'S');
   helpers.doKeys('<Esc>');
-  helpers.assertCursorAt(1, 0);
-  eq('aa\n\ncc', cm.getValue());
-}, { value: 'aa\nbb\ncc'});
+  helpers.assertCursorAt(1, 1);
+  eq('aa{\n  \ncc', cm.getValue());
+  helpers.doKeys('j', 'S');
+  eq('aa{\n  \n  ', cm.getValue());
+  helpers.assertCursorAt(2, 2);
+  helpers.doKeys('<Esc>');
+  helpers.doKeys('d', 'd', 'd', 'd');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('S');
+  is(vim.insertMode);
+  eq('', cm.getValue());
+}, { value: 'aa{\nbb\ncc'});
 testVim('blockwise_paste', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('<C-v>', '3', 'j', 'l', 'y');

From 78e3ac3520aec44b19a47d7c43232813a0e28f39 Mon Sep 17 00:00:00 2001
From: Justin Andresen <jan.dresen.95@gmail.com>
Date: Thu, 17 Dec 2015 19:58:16 +0100
Subject: [PATCH 2497/4742] Update manual entry of extendSelectionsBy.

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

diff --git a/doc/manual.html b/doc/manual.html
index 8812a1713d..2d8d618a19 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1350,7 +1350,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       <dd>An equivalent
       of <a href="#extendSelection"><code>extendSelection</code></a>
       that acts on all selections at once.</dd>
-      <dt id="extendSelectionsBy"><code><strong>doc.extendSelectionsBy</strong>(f: function(range: {anchor, head}) → {anchor, head}), ?options: object)</code></dt>
+      <dt id="extendSelectionsBy"><code><strong>doc.extendSelectionsBy</strong>(f: function(range: {anchor, head}) → {line, ch}), ?options: object)</code></dt>
       <dd>Applies the given function to all existing selections, and
       calls <a href="#extendSelections"><code>extendSelections</code></a>
       on the result.</dd>

From 3e88446bb59cacf133e7db1ae2221a85728b5bcc Mon Sep 17 00:00:00 2001
From: Drini Cami <cdrini@gmail.com>
Date: Sat, 19 Dec 2015 02:50:21 -0500
Subject: [PATCH 2498/4742] [sparql mode] Add lineComment property

---
 mode/sparql/sparql.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index bbf8a76a0d..0cf40f58bc 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -165,7 +165,9 @@ CodeMirror.defineMode("sparql", function(config) {
         return context.col + (closing ? 0 : 1);
       else
         return context.indent + (closing ? 0 : indentUnit);
-    }
+    },
+
+    lineComment: "#"
   };
 });
 

From d9042e78013f3377580966bf5a3092ccfa7848c0 Mon Sep 17 00:00:00 2001
From: Justin Andresen <jan.dresen.95@gmail.com>
Date: Thu, 17 Dec 2015 18:58:45 +0100
Subject: [PATCH 2499/4742] Fix options of extendSelections.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 07a23f1b80..c7c507d979 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7454,7 +7454,7 @@
       extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
     }),
     extendSelections: docMethodOp(function(heads, options) {
-      extendSelections(this, clipPosArray(this, heads, options));
+      extendSelections(this, clipPosArray(this, heads), options);
     }),
     extendSelectionsBy: docMethodOp(function(f, options) {
       extendSelections(this, map(this.sel.ranges, f), options);

From c39008a728e3172b196546eb7c22bb3d8a7d50f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4r?= <jscissr@gmail.com>
Date: Wed, 16 Dec 2015 21:10:11 +0100
Subject: [PATCH 2500/4742] [markdown mode] fix escaped brackets in link def

Example: `[foo\[bar\]foo]: https://example.com`
---
 mode/markdown/markdown.js | 4 ++--
 mode/markdown/test.js     | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 97dfb7464a..70889205d3 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -620,7 +620,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function footnoteLink(stream, state) {
-    if (stream.match(/^[^\]]*\]:/, false)) {
+    if (stream.match(/^([^\]\\]|\\.)*\]:/, false)) {
       state.f = footnoteLinkInside;
       stream.next(); // Consume [
       if (modeCfg.highlightFormatting) state.formatting = "link";
@@ -639,7 +639,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return returnType;
     }
 
-    stream.match(/^[^\]]+/, true);
+    stream.match(/^([^\]\\]|\\.)+/, true);
 
     return tokenTypes.linkText;
   }
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index f9cc27c3b4..6d7829fa57 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -696,6 +696,15 @@
      "[link [[foo]]:] [string&url http://example.com/]",
      "(bar\" hello");
 
+  MT("labelEscape",
+     "[link [[foo \\]] ]]:] [string&url http://example.com/]");
+
+  MT("labelEscapeColon",
+     "[link [[foo \\]]: bar]]:] [string&url http://example.com/]");
+
+  MT("labelEscapeEnd",
+     "[[foo\\]]: http://example.com/");
+
   MT("linkWeb",
      "[link <http://example.com/>] foo");
 

From 420cefd50bb4f62db4217c709064b39f55976650 Mon Sep 17 00:00:00 2001
From: Justin Andresen <jan.dresen.95@gmail.com>
Date: Thu, 17 Dec 2015 19:02:41 +0100
Subject: [PATCH 2501/4742] Clip extended ranges.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c7c507d979..dde88b4f9b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7457,7 +7457,8 @@
       extendSelections(this, clipPosArray(this, heads), options);
     }),
     extendSelectionsBy: docMethodOp(function(f, options) {
-      extendSelections(this, map(this.sel.ranges, f), options);
+      var heads = map(this.sel.ranges, f);
+      extendSelections(this, clipPosArray(this, heads), options);
     }),
     setSelections: docMethodOp(function(ranges, primary, options) {
       if (!ranges.length) return;

From fec88d280e1c0bf0f09b6b1db50318f39a74f172 Mon Sep 17 00:00:00 2001
From: Justin Andresen <jan.dresen.95@gmail.com>
Date: Thu, 17 Dec 2015 19:02:41 +0100
Subject: [PATCH 2502/4742] Add an origin field to beforeSelectionChange event
 objects

Issue #3723
---
 doc/manual.html   | 8 +++++---
 lib/codemirror.js | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 2d8d618a19..bda852a72f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -582,15 +582,17 @@ <h2>Events</h2>
       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>
+      <dt id="event_beforeSelectionChange"><code><strong>"beforeSelectionChange"</strong> (instance: CodeMirror, obj: {ranges, origin, 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
       array of <code>{anchor, head}</code> objects in
       the <code>ranges</code> property of the <code>obj</code>
       argument, and optionally change them by calling
       the <code>update</code> method on this object, passing an array
-      of ranges in the same format. Handlers for this event have the
-      same restriction
+      of ranges in the same format. The object also contains
+      an <code>origin</code> property holding the origin string passed
+      to the selection-changing method, if any. Handlers for this
+      event have the same restriction
       as <a href="#event_beforeChange"><code>"beforeChange"</code></a>
       handlers — they should not do anything to directly update the
       state of the editor.</dd>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index dde88b4f9b..2141cda197 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2155,7 +2155,7 @@
 
   // Give beforeSelectionChange handlers a change to influence a
   // selection update.
-  function filterSelectionChange(doc, sel) {
+  function filterSelectionChange(doc, sel, options) {
     var obj = {
       ranges: sel.ranges,
       update: function(ranges) {
@@ -2163,7 +2163,8 @@
         for (var i = 0; i < ranges.length; i++)
           this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
                                      clipPos(doc, ranges[i].head));
-      }
+      },
+      origin: options && options.origin
     };
     signal(doc, "beforeSelectionChange", doc, obj);
     if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
@@ -2189,7 +2190,7 @@
 
   function setSelectionNoUndo(doc, sel, options) {
     if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-      sel = filterSelectionChange(doc, sel);
+      sel = filterSelectionChange(doc, sel, options);
 
     var bias = options && options.bias ||
       (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);

From ca8fb83d48ebb9fe2d24b8f08abfe204f706dcad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 20 Dec 2015 21:50:47 +0100
Subject: [PATCH 2503/4742] Fire DOM events for paste

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index bda852a72f..695a7ed25d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -654,7 +654,7 @@ <h2>Events</h2>
 
       <dt id="event_dom"><code><strong>"mousedown"</strong>,
       <strong>"dblclick"</strong>, <strong>"contextmenu"</strong>, <strong>"keydown"</strong>, <strong>"keypress"</strong>,
-      <strong>"keyup"</strong>, <strong>"dragstart"</strong>, <strong>"dragenter"</strong>,
+      <strong>"keyup"</strong>, <strong>"paste"</strong>, <strong>"dragstart"</strong>, <strong>"dragenter"</strong>,
       <strong>"dragover"</strong>, <strong>"drop"</strong>
       (instance: CodeMirror, event: Event)</code></dt>
       <dd>Fired when CodeMirror is handling a DOM event of this type.
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2141cda197..6305cafdc2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1251,7 +1251,7 @@
       });
 
       on(te, "paste", function(e) {
-        if (handlePaste(e, cm)) return true;
+        if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
 
         cm.state.pasteIncoming = true;
         input.fastPoll();
@@ -1285,7 +1285,7 @@
       on(te, "copy", prepareCopyCut);
 
       on(display.scroller, "paste", function(e) {
-        if (eventInWidget(display, e)) return;
+        if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return;
         cm.state.pasteIncoming = true;
         input.focus();
       });
@@ -1570,7 +1570,9 @@
       var div = input.div = display.lineDiv;
       disableBrowserMagic(div);
 
-      on(div, "paste", function(e) { handlePaste(e, cm); })
+      on(div, "paste", function(e) {
+        if (!signalDOMEvent(cm, e)) handlePaste(e, cm);
+      })
 
       on(div, "compositionstart", function(e) {
         var data = e.data;

From a4e987079517e1ff23d73c5a572f69d15ec4ff55 Mon Sep 17 00:00:00 2001
From: Chunliang Lyu <hi@chunlianglyu.com>
Date: Sat, 19 Dec 2015 22:39:10 +0800
Subject: [PATCH 2504/4742] Add mode for GitHub Flavored Markdown with YAML
 front matter

---
 mode/yaml-markdown/index.html       | 114 ++++++++++++++++++++++++++++
 mode/yaml-markdown/yaml-markdown.js |  64 ++++++++++++++++
 2 files changed, 178 insertions(+)
 create mode 100644 mode/yaml-markdown/index.html
 create mode 100644 mode/yaml-markdown/yaml-markdown.js

diff --git a/mode/yaml-markdown/index.html b/mode/yaml-markdown/index.html
new file mode 100644
index 0000000000..ad610da8f9
--- /dev/null
+++ b/mode/yaml-markdown/index.html
@@ -0,0 +1,114 @@
+<!doctype html>
+
+<title>CodeMirror: GitHub Flavored Markdown with YAML front matter 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/overlay.js"></script>
+<script src="../markdown/markdown.js"></script>
+<script src="../gfm/gfm.js"></script>
+<script src="../yaml/yaml.js"></script>
+<script src="yaml-markdown.js"></script>
+<style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</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="#">YAML-Markdown</a>
+  </ul>
+</div>
+
+<article>
+<h2>GitHub Flavored Markdown with YAML front matter mode</h2>
+<form><textarea id="code" name="code">
+---
+receipt:     Oz-Ware Purchase Invoice
+date:        2007-08-06
+customer:
+    given:   Dorothy
+    family:  Gale
+
+items:
+    - part_no:   A4786
+      descrip:   Water Bucket (Filled)
+      price:     1.47
+      quantity:  4
+
+    - part_no:   E1628
+      descrip:   High Heeled "Ruby" Slippers
+      size:       8
+      price:     100.27
+      quantity:  1
+
+bill-to:  &id001
+    street: |
+            123 Tornado Alley
+            Suite 16
+    city:   East Centerville
+    state:  KS
+
+ship-to:  *id001
+
+specialDelivery:  >
+    Follow the Yellow Brick
+    Road to the Emerald City.
+    Pay no attention to the
+    man behind the curtain.
+---
+
+GitHub Flavored Markdown
+========================
+
+Everything from markdown plus GFM features:
+
+## URL autolinking
+
+Underscores_are_allowed_between_words.
+
+## Strikethrough text
+
+GFM adds syntax to strikethrough text, which is missing from standard Markdown.
+
+~~Mistaken text.~~
+~~**works with other fomatting**~~
+
+~~spans across
+lines~~
+
+## Fenced code blocks (and syntax highlighting)
+
+```javascript
+for (var i = 0; i &lt; items.length; i++) {
+    console.log(items[i], i); // log them
+}
+```
+
+## Task Lists
+
+- [ ] Incomplete task list item
+- [x] **Completed** task list item
+
+## A bit of GitHub spice
+
+* SHA: be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
+* User@SHA ref: mojombo@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
+* User/Project@SHA: mojombo/god@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
+* \#Num: #1
+* User/#Num: mojombo#1
+* User/Project#Num: mojombo/god#1
+
+See http://github.github.com/github-flavored-markdown/.
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: 'yaml-markdown'});
+    </script>
+
+  </article>
diff --git a/mode/yaml-markdown/yaml-markdown.js b/mode/yaml-markdown/yaml-markdown.js
new file mode 100644
index 0000000000..a1af80f3ec
--- /dev/null
+++ b/mode/yaml-markdown/yaml-markdown.js
@@ -0,0 +1,64 @@
+// 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("../gfm/gfm"), require("../yaml/yaml"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../gfm/gfm", "../yaml/yaml"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function (CodeMirror) {
+
+  // a mixed mode for Markdown text with an optional YAML front matter
+  CodeMirror.defineMode("yaml-markdown", function (config) {
+    var gfmMode = CodeMirror.getMode(config, {name: "gfm"});
+    var yamlMode = CodeMirror.getMode(config, {name: "yaml"});
+
+    return {
+      startState: function () {
+        var gfmState = gfmMode.startState();
+        var yamlState = yamlMode.startState();
+        return {
+          firstLine: true,
+          mode: gfmMode,
+          gfmState: gfmState,
+          yamlState: yamlState
+        };
+      },
+      copyState: function (state) {
+        return {
+          mode: state.mode,
+          gfmState: gfmMode.copyState(state.gfmState),
+          yamlState: state.yamlState
+        };
+      },
+      token: function (stream, state) {
+        if (state.firstLine && stream.match(/---/, false)) {
+          state.firstLine = false;
+          state.mode = yamlMode;
+          return yamlMode.token(stream, state.yamlState);
+        } else if (state.mode == yamlMode && stream.match(/---/, false)) {
+          state.mode = gfmMode;
+          return yamlMode.token(stream, state.yamlState);
+        } else if (state.mode == yamlMode) {
+          return state.mode.token(stream, state.yamlState);
+        } else {
+          return state.mode.token(stream, state.gfmState);
+        }
+      },
+      innerMode: function (state) {
+        if (state.mode == gfmMode) {
+          return gfmMode.innerMode(state.gfmState);
+        } else {
+          return {mode: yamlMode, state: state};
+        }
+      },
+      blankLine: function (state) {
+        if (state.mode == gfmMode) {
+          return gfmMode.blankLine(state.gfmState)
+        }
+      }
+    };
+  });
+});

From d6212b9216e4a3add9df636726d0c59dfd62ca74 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 20 Dec 2015 22:15:16 +0100
Subject: [PATCH 2505/4742] [yaml-frontmatter mode] Repurpose yaml-markdown
 mode to a general yaml-frontmatter mode

Issue #3722
---
 doc/compress.html                             |  1 +
 mode/index.html                               |  1 +
 .../index.html                                | 17 +++--
 mode/yaml-frontmatter/yaml-frontmatter.js     | 68 +++++++++++++++++++
 mode/yaml-markdown/yaml-markdown.js           | 64 -----------------
 5 files changed, 82 insertions(+), 69 deletions(-)
 rename mode/{yaml-markdown => yaml-frontmatter}/index.html (83%)
 create mode 100644 mode/yaml-frontmatter/yaml-frontmatter.js
 delete mode 100644 mode/yaml-markdown/yaml-markdown.js

diff --git a/doc/compress.html b/doc/compress.html
index f7c511c78c..fe8260ad64 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -219,6 +219,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/xml/xml.js">xml.js</option>
           <option value="http://codemirror.net/mode/xquery/xquery.js">xquery.js</option>
           <option value="http://codemirror.net/mode/yaml/yaml.js">yaml.js</option>
+          <option value="http://codemirror.net/mode/yaml-frontmatter/yaml-frontmatter.js">yaml-frontmatter.js</option>
           <option value="http://codemirror.net/mode/z80/z80.js">z80.js</option>
         </optgroup>
         <optgroup label="Add-ons">
diff --git a/mode/index.html b/mode/index.html
index 477ca2c18c..724192413a 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -148,6 +148,7 @@ <h2>Language modes</h2>
       <li><a href="xml/index.html">XML/HTML</a></li>
       <li><a href="xquery/index.html">XQuery</a></li>
       <li><a href="yaml/index.html">YAML</a></li>
+      <li><a href="yaml-frontmatter/index.html">YAML frontmatter</a></li>
       <li><a href="z80/index.html">Z80</a></li>
     </ul>
   </div>
diff --git a/mode/yaml-markdown/index.html b/mode/yaml-frontmatter/index.html
similarity index 83%
rename from mode/yaml-markdown/index.html
rename to mode/yaml-frontmatter/index.html
index ad610da8f9..30bed2f855 100644
--- a/mode/yaml-markdown/index.html
+++ b/mode/yaml-frontmatter/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror: GitHub Flavored Markdown with YAML front matter mode</title>
+<title>CodeMirror: YAML front matter mode</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
 
@@ -10,7 +10,7 @@
 <script src="../markdown/markdown.js"></script>
 <script src="../gfm/gfm.js"></script>
 <script src="../yaml/yaml.js"></script>
-<script src="yaml-markdown.js"></script>
+<script src="yaml-frontmatter.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
@@ -22,12 +22,12 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">YAML-Markdown</a>
+    <li><a class=active href="#">YAML-Frontmatter</a>
   </ul>
 </div>
 
 <article>
-<h2>GitHub Flavored Markdown with YAML front matter mode</h2>
+<h2>YAML front matter mode</h2>
 <form><textarea id="code" name="code">
 ---
 receipt:     Oz-Ware Purchase Invoice
@@ -107,8 +107,15 @@ <h2>GitHub Flavored Markdown with YAML front matter mode</h2>
 
 See http://github.github.com/github-flavored-markdown/.
 </textarea></form>
+
+<p>Defines a mode that parses
+a <a href="http://jekyllrb.com/docs/frontmatter/">YAML frontmatter</a>
+at the start of a file, switching to a base mode at the end of that.
+Takes a mode configuration option <code>base</code> to configure the
+base mode, which defaults to <code>"gfm"</code>.</p>
+
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: 'yaml-markdown'});
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "yaml-frontmatter"});
     </script>
 
   </article>
diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
new file mode 100644
index 0000000000..5b65dffbf7
--- /dev/null
+++ b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -0,0 +1,68 @@
+// 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("../yaml/yaml"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../yaml/yaml"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function (CodeMirror) {
+
+  var START = 0, FRONTMATTER = 1, BODY = 2
+
+  // a mixed mode for Markdown text with an optional YAML front matter
+  CodeMirror.defineMode("yaml-frontmatter", function (config, parserConfig) {
+    var yamlMode = CodeMirror.getMode(config, "yaml")
+    var innerMode = CodeMirror.getMode(config, parserConfig && parserConfig.base || "gfm")
+
+    function curMode(state) {
+      return state.state == BODY ? innerMode : yamlMode
+    }
+
+    return {
+      startState: function () {
+        return {
+          state: START,
+          inner: CodeMirror.startState(yamlMode)
+        }
+      },
+      copyState: function (state) {
+        return {
+          state: state.state,
+          inner: CodeMirror.copyState(curMode(state), state.inner)
+        }
+      },
+      token: function (stream, state) {
+        if (state.state == START) {
+          if (stream.match(/---/, false)) {
+            state.state = FRONTMATTER
+            return yamlMode.token(stream, state.inner)
+          } else {
+            stream.state = BODY
+            state.inner = CodeMirror.startState(innerMode)
+            return innerMode.token(stream, state.inner)
+          }
+        } else if (state.state == FRONTMATTER) {
+          var end = stream.sol() && stream.match(/---/, false)
+          var style = yamlMode.token(stream, state.inner)
+          if (end) {
+            state.state = BODY
+            state.inner = CodeMirror.startState(innerMode)
+          }
+          return style
+        } else {
+          return innerMode.token(stream, state.inner)
+        }
+      },
+      innerMode: function (state) {
+        return {mode: curMode(state), state: state.inner}
+      },
+      blankLine: function (state) {
+        var mode = curMode(state)
+        if (mode.blankLine) return mode.blankLine(state.inner)
+      }
+    }
+  })
+})
diff --git a/mode/yaml-markdown/yaml-markdown.js b/mode/yaml-markdown/yaml-markdown.js
deleted file mode 100644
index a1af80f3ec..0000000000
--- a/mode/yaml-markdown/yaml-markdown.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// 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("../gfm/gfm"), require("../yaml/yaml"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../gfm/gfm", "../yaml/yaml"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function (CodeMirror) {
-
-  // a mixed mode for Markdown text with an optional YAML front matter
-  CodeMirror.defineMode("yaml-markdown", function (config) {
-    var gfmMode = CodeMirror.getMode(config, {name: "gfm"});
-    var yamlMode = CodeMirror.getMode(config, {name: "yaml"});
-
-    return {
-      startState: function () {
-        var gfmState = gfmMode.startState();
-        var yamlState = yamlMode.startState();
-        return {
-          firstLine: true,
-          mode: gfmMode,
-          gfmState: gfmState,
-          yamlState: yamlState
-        };
-      },
-      copyState: function (state) {
-        return {
-          mode: state.mode,
-          gfmState: gfmMode.copyState(state.gfmState),
-          yamlState: state.yamlState
-        };
-      },
-      token: function (stream, state) {
-        if (state.firstLine && stream.match(/---/, false)) {
-          state.firstLine = false;
-          state.mode = yamlMode;
-          return yamlMode.token(stream, state.yamlState);
-        } else if (state.mode == yamlMode && stream.match(/---/, false)) {
-          state.mode = gfmMode;
-          return yamlMode.token(stream, state.yamlState);
-        } else if (state.mode == yamlMode) {
-          return state.mode.token(stream, state.yamlState);
-        } else {
-          return state.mode.token(stream, state.gfmState);
-        }
-      },
-      innerMode: function (state) {
-        if (state.mode == gfmMode) {
-          return gfmMode.innerMode(state.gfmState);
-        } else {
-          return {mode: yamlMode, state: state};
-        }
-      },
-      blankLine: function (state) {
-        if (state.mode == gfmMode) {
-          return gfmMode.blankLine(state.gfmState)
-        }
-      }
-    };
-  });
-});

From 237a6b69baab3c5d0c4dedc00ad70ceb436d6d13 Mon Sep 17 00:00:00 2001
From: Erik Welander <ewelander@google.com>
Date: Sat, 12 Dec 2015 01:56:34 -0800
Subject: [PATCH 2506/4742] [vim] Correct the scroll position for zt & zb.

zt was placing 40% of the line above the visible area, and zb was placing it too high.
---
 keymap/vim.js    |  4 +---
 test/vim_test.js | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 59815957ca..0548b75be7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2147,9 +2147,7 @@
         switch (actionArgs.position) {
           case 'center': y = y - (height / 2) + lineHeight;
             break;
-          case 'bottom': y = y - height + lineHeight*1.4;
-            break;
-          case 'top': y = y + lineHeight*0.4;
+          case 'bottom': y = y - height + lineHeight;
             break;
         }
         cm.scrollTo(null, y);
diff --git a/test/vim_test.js b/test/vim_test.js
index 74c6a95071..25f7e75e90 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3119,6 +3119,25 @@ forEach(['zb','zz','zt','z-','z.','z<CR>'], function(e, idx){
     return new Array(500).join('\n');
   })()});
 });
+testVim('zb_to_bottom', function(cm, vim, helpers){
+  var lineNum = 250;
+  cm.setSize(600, 35*cm.defaultTextHeight());
+  cm.setCursor(lineNum, 0);
+  helpers.doKeys('z', 'b');
+  var scrollInfo = cm.getScrollInfo();
+  eq(scrollInfo.top + scrollInfo.clientHeight, cm.charCoords(Pos(lineNum, 0), 'local').bottom);
+}, { value: (function(){
+  return new Array(500).join('\n');
+})()});
+testVim('zt_to_top', function(cm, vim, helpers){
+  var lineNum = 250;
+  cm.setSize(600, 35*cm.defaultTextHeight());
+  cm.setCursor(lineNum, 0);
+  helpers.doKeys('z', 't');
+  eq(cm.getScrollInfo().top, cm.charCoords(Pos(lineNum, 0), 'local').top);
+}, { value: (function(){
+  return new Array(500).join('\n');
+})()});
 testVim('zb<zz', function(cm, vim, helpers){
   eq(zVals[0]<zVals[1], true);
 });

From b1f1f1906c9b8dbd1fd30d02e883f4980bd982f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Dec 2015 10:05:31 +0100
Subject: [PATCH 2507/4742] [clike mode] Highlight comments in preprocessor
 lines

Closes #3709
---
 mode/clike/clike.js | 25 ++++++++++++-------------
 mode/clike/test.js  |  9 +++++++++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 0cbe2faea2..3766209c28 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -262,21 +262,20 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
 
   function cppHook(stream, state) {
-    if (!state.startOfLine) return false;
-    for (;;) {
-      if (stream.skipTo("\\")) {
-        stream.next();
-        if (stream.eol()) {
-          state.tokenize = cppHook;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        state.tokenize = null;
-        break;
+    if (!state.startOfLine) return false
+    for (var ch, next = null; ch = stream.peek();) {
+      if (!ch) {
+        break
+      } else if (ch == "\\" && stream.match(/^.$/)) {
+        next = cppHook
+        break
+      } else if (ch == "/" && stream.match(/^\/[\/\*]/, false)) {
+        break
       }
+      stream.next()
     }
-    return "meta";
+    state.tokenize = next
+    return "meta"
   }
 
   function pointerHook(_stream, state) {
diff --git a/mode/clike/test.js b/mode/clike/test.js
index c84d22e185..c26003266c 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -31,6 +31,15 @@
      "    [variable x][operator ++];",
      "[keyword return];");
 
+  MT("preprocessor",
+     "[meta #define FOO 3]",
+     "[variable-3 int] [variable foo];",
+     "[meta #define BAR\\]",
+     "[meta 4]",
+     "[variable-3 unsigned] [variable-3 int] [variable bar] [operator =] [number 8];",
+     "[meta #include <baz> ][comment // comment]")
+
+
   var mode_cpp = CodeMirror.getMode({indentUnit: 2}, "text/x-c++src");
   function MTCPP(name) { test.mode(name, mode_cpp, Array.prototype.slice.call(arguments, 1)); }
 

From c7b64ca080df3657f5094a51a976a167176a4178 Mon Sep 17 00:00:00 2001
From: TSUYUSATO Kitsune <make.just.on@gmail.com>
Date: Thu, 17 Dec 2015 00:12:45 +0900
Subject: [PATCH 2508/4742] [crystal mode] Add

---
 mode/crystal/crystal.js | 391 ++++++++++++++++++++++++++++++++++++++++
 mode/crystal/index.html | 119 ++++++++++++
 mode/index.html         |   1 +
 mode/meta.js            |   1 +
 4 files changed, 512 insertions(+)
 create mode 100644 mode/crystal/crystal.js
 create mode 100644 mode/crystal/index.html

diff --git a/mode/crystal/crystal.js b/mode/crystal/crystal.js
new file mode 100644
index 0000000000..8fd65a5f0b
--- /dev/null
+++ b/mode/crystal/crystal.js
@@ -0,0 +1,391 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("crystal", function(config) {
+    function wordRegExp(words, end) {
+      return new RegExp((end ? "" : "^") + "(?:" + words.join("|") + ")" + (end ? "$" : "\\b"));
+    }
+
+    function chain(tokenize, stream, state) {
+      state.tokenize.push(tokenize);
+      return tokenize(stream, state);
+    }
+
+    var operators = /^(?:[-+/%|&^]|\*\*?|[<>]{2})/;
+    var conditionalOperators = /^(?:[=!]~|===|<=>|[<>=!]=?|[|&]{2}|~)/;
+    var indexingOperators = /^(?:\[\][?=]?)/;
+    var anotherOperators = /^(?:\.(?:\.{2})?|->|[?:])/;
+    var idents = /^[a-z_\u009F-\uFFFF][a-zA-Z0-9_\u009F-\uFFFF]*/;
+    var types = /^[A-Z_\u009F-\uFFFF][a-zA-Z0-9_\u009F-\uFFFF]*/;
+    var keywords = wordRegExp([
+      "abstract", "alias", "as", "asm", "begin", "break", "case", "class", "def", "do",
+      "else", "elsif", "end", "ensure", "enum", "extend", "for", "fun", "if", "ifdef",
+      "include", "instance_sizeof", "lib", "macro", "module", "next", "of", "out", "pointerof",
+      "private", "protected", "rescue", "return", "require", "sizeof", "struct",
+      "super", "then", "type", "typeof", "union", "unless", "until", "when", "while", "with",
+      "yield", "__DIR__", "__FILE__", "__LINE__"
+    ]);
+    var atomWords = wordRegExp(["true", "false", "nil", "self"]);
+    var indentKeywordsArray = [
+      "def", "fun", "macro",
+      "class", "module", "struct", "lib", "enum", "union",
+      "if", "unless", "case", "while", "until", "begin", "then",
+      "do",
+      "for", "ifdef"
+    ];
+    var indentKeywords = wordRegExp(indentKeywordsArray);
+    var dedentKeywordsArray = [
+      "end",
+      "else", "elsif",
+      "rescue", "ensure"
+    ];
+    var dedentKeywords = wordRegExp(dedentKeywordsArray);
+    var dedentPunctualsArray = ["\\)", "\\}", "\\]"];
+    var dedentPunctuals = new RegExp("^(?:" + dedentPunctualsArray.join("|") + ")$");
+    var nextTokenizer = {
+      "def": tokenFollowIdent, "fun": tokenFollowIdent, "macro": tokenMacroDef,
+      "class": tokenFollowType, "module": tokenFollowType, "struct": tokenFollowType,
+      "lib": tokenFollowType, "enum": tokenFollowType, "union": tokenFollowType
+    };
+    var matching = {"[": "]", "{": "}", "(": ")", "<": ">"};
+
+    function tokenBase(stream, state) {
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      // Macros
+      if (state.lastToken != "\\" && stream.match("{%", false)) {
+        return chain(tokenMacro("%", "%"), stream, state);
+      }
+
+      if (state.lastToken != "\\" && stream.match("{{", false)) {
+        return chain(tokenMacro("{", "}"), stream, state);
+      }
+
+      // Comments
+      if (stream.peek() == "#") {
+        stream.skipToEnd();
+        return "comment";
+      }
+
+      // Variables and keywords
+      var matched;
+      if (matched = stream.match(idents)) {
+        stream.eat(/[?!]/);
+
+        matched = stream.current();
+        if (stream.eat(":")) {
+          return "atom";
+        } else if (state.lastToken == ".") {
+          return "property";
+        } else if (keywords.test(matched)) {
+          if (state.lastToken != "abstract" && indentKeywords.test(matched)) {
+            if (!(matched == "fun" && state.blocks.indexOf("lib") >= 0)) {
+              state.blocks.push(matched);
+              state.currentIndent += 1;
+            }
+          } else if (dedentKeywords.test(matched)) {
+            state.blocks.pop();
+            state.currentIndent -= 1;
+          }
+
+          if (nextTokenizer.hasOwnProperty(matched)) {
+            state.tokenize.push(nextTokenizer[matched]);
+          }
+
+          return "keyword";
+        } else if (atomWords.test(matched)) {
+          return "atom";
+        }
+
+        return "variable";
+      }
+
+      // Class variables and instance variables
+      // or attributes
+      if (stream.eat("@")) {
+        if (stream.peek() == "[") {
+          return chain(tokenNest("[", "]", "meta"), stream, state);
+        }
+
+        stream.eat("@");
+        stream.match(idents) || stream.match(types);
+        return "variable-2";
+      }
+
+      // Global variables
+      if (stream.eat("$")) {
+        stream.eat(/[0-9]+|\?/) || stream.match(idents) || stream.match(types);
+        return "variable-3";
+      }
+
+      // Constants and types
+      if (stream.match(types)) {
+        return "tag";
+      }
+
+      // Symbols or ':' operator
+      if (stream.eat(":")) {
+        if (stream.eat("\"")) {
+          return chain(tokenQuote("\"", "atom", false), stream, state);
+        } else if (stream.match(idents) || stream.match(types) ||
+                   stream.match(operators) || stream.match(conditionalOperators) || stream.match(indexingOperators)) {
+          return "atom";
+        }
+        stream.eat(":");
+        return "operator";
+      }
+
+      // Strings
+      if (stream.eat("\"")) {
+        return chain(tokenQuote("\"", "string", true), stream, state);
+      }
+
+      // Strings or regexps or macro variables or '%' operator
+      if (stream.peek() == "%") {
+        var style = "string";
+        var embed = true;
+        var delim;
+
+        if (stream.match("%r")) {
+          // Regexps
+          style = "string-2";
+          delim = stream.next();
+        } else if (stream.match("%w")) {
+          embed = false;
+          delim = stream.next();
+        } else {
+          if(delim = stream.match(/^%([^\w\s=])/)) {
+            delim = delim[1];
+          } else if (stream.match(/^%[a-zA-Z0-9_\u009F-\uFFFF]*/)) {
+            // Macro variables
+            return "meta";
+          } else {
+            // '%' operator
+            return "operator";
+          }
+        }
+
+        if (matching.hasOwnProperty(delim)) {
+          delim = matching[delim];
+        }
+        return chain(tokenQuote(delim, style, embed), stream, state);
+      }
+
+      // Characters
+      if (stream.eat("'")) {
+        stream.match(/^(?:[^']|\\(?:[befnrtv0'"]|[0-7]{3}|u(?:[0-9a-fA-F]{4}|\{[0-9a-fA-F]{1,6}\})))/);
+        stream.eat("'");
+        return "atom";
+      }
+
+      // Numbers
+      if (stream.eat("0")) {
+        if (stream.eat("x")) {
+          stream.match(/^[0-9a-fA-F]+/);
+        } else if (stream.eat("o")) {
+          stream.match(/^[0-7]+/);
+        } else if (stream.eat("b")) {
+          stream.match(/^[01]+/);
+        }
+        return "number";
+      }
+
+      if (stream.eat(/\d/)) {
+        stream.match(/^\d*(?:\.\d+)?(?:[eE][+-]?\d+)?/);
+        return "number";
+      }
+
+      // Operators
+      if (stream.match(operators)) {
+        stream.eat("="); // Operators can follow assigin symbol.
+        return "operator";
+      }
+
+      if (stream.match(conditionalOperators) || stream.match(anotherOperators)) {
+        return "operator";
+      }
+
+      // Parens and braces
+      if (matched = stream.match(/[({[]/, false)) {
+        matched = matched[0];
+        return chain(tokenNest(matched, matching[matched], null), stream, state);
+      }
+
+      // Escapes
+      if (stream.eat("\\")) {
+        stream.next();
+        return "meta";
+      }
+
+      stream.next();
+      return null;
+    }
+
+    function tokenNest(begin, end, style, started) {
+      return function (stream, state) {
+        if (!started && stream.match(begin)) {
+          state.tokenize[state.tokenize.length - 1] = tokenNest(begin, end, style, true);
+          state.currentIndent += 1;
+          return style;
+        }
+
+        var nextStyle = tokenBase(stream, state);
+        if (stream.current() === end) {
+          state.tokenize.pop();
+          state.currentIndent -= 1;
+          nextStyle = style;
+        }
+
+        return nextStyle;
+      };
+    }
+
+    function tokenMacro(begin, end, started) {
+      return function (stream, state) {
+        if (!started && stream.match("{" + begin)) {
+          state.currentIndent += 1;
+          state.tokenize[state.tokenize.length - 1] = tokenMacro(begin, end, true);
+          return "meta";
+        }
+
+        if (stream.match(end + "}")) {
+          state.currentIndent -= 1;
+          state.tokenize.pop();
+          return "meta";
+        }
+
+        return tokenBase(stream, state);
+      };
+    }
+
+    function tokenMacroDef(stream, state) {
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      var matched;
+      if (matched = stream.match(idents)) {
+        if (matched == "def") {
+          return "keyword";
+        }
+        stream.eat(/[?!]/);
+      }
+
+      state.tokenize.pop();
+      return "def";
+    }
+
+    function tokenFollowIdent(stream, state) {
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      if (stream.match(idents)) {
+        stream.eat(/[!?]/);
+      } else {
+        stream.match(operators) || stream.match(conditionalOperators) || stream.match(indexingOperators);
+      }
+      state.tokenize.pop();
+      return "def";
+    }
+
+    function tokenFollowType(stream, state) {
+      if (stream.eatSpace()) {
+        return null;
+      }
+
+      stream.match(types);
+      state.tokenize.pop();
+      return "def";
+    }
+
+    function tokenQuote(end, style, embed) {
+      return function (stream, state) {
+        var escaped = false;
+
+        while (stream.peek()) {
+          if (!escaped) {
+            if (stream.match("{%", false)) {
+              state.tokenize.push(tokenMacro("%", "%"));
+              return style;
+            }
+
+            if (stream.match("{{", false)) {
+              state.tokenize.push(tokenMacro("{", "}"));
+              return style;
+            }
+
+            if (embed && stream.match("#{", false)) {
+              state.tokenize.push(tokenNest("#{", "}", "meta"));
+              return style;
+            }
+
+            var ch = stream.next();
+
+            if (ch == end) {
+              state.tokenize.pop();
+              return style;
+            }
+
+            escaped = ch == "\\";
+          } else {
+            stream.next();
+            escaped = false;
+          }
+        }
+
+        return style;
+      };
+    }
+
+    return {
+      startState: function () {
+        return {
+          tokenize: [tokenBase],
+          currentIndent: 0,
+          lastToken: null,
+          blocks: []
+        };
+      },
+
+      token: function (stream, state) {
+        var style = state.tokenize[state.tokenize.length - 1](stream, state);
+        var token = stream.current();
+
+        if (style && style != "comment") {
+          state.lastToken = token;
+        }
+
+        return style;
+      },
+
+      indent: function (state, textAfter) {
+        textAfter = textAfter.replace(/^\s*(?:\{%)?\s*|\s*(?:%\})?\s*$/g, "");
+
+        if (dedentKeywords.test(textAfter) || dedentPunctuals.test(textAfter)) {
+          return config.indentUnit * (state.currentIndent - 1);
+        }
+
+        return config.indentUnit * state.currentIndent;
+      },
+
+      fold: "indent",
+      electricInput: wordRegExp(dedentPunctualsArray.concat(dedentKeywordsArray), true),
+      lineComment: '#'
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-crystal", "crystal");
+});
diff --git a/mode/crystal/index.html b/mode/crystal/index.html
new file mode 100644
index 0000000000..4bd0399f0c
--- /dev/null
+++ b/mode/crystal/index.html
@@ -0,0 +1,119 @@
+<!doctype html>
+
+<title>CodeMirror: Ruby 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/edit/matchbrackets.js"></script>
+<script src="crystal.js"></script>
+<style>
+  .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+  .cm-s-default span.cm-arrow { color: red; }
+</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="#">Ruby</a>
+  </ul>
+</div>
+
+<article>
+<h2>Crystal mode</h2>
+<form><textarea id="code" name="code">
+# Features of Crystal
+# - Ruby-inspired syntax.
+# - Statically type-checked but without having to specify the type of variables or method arguments.
+# - Be able to call C code by writing bindings to it in Crystal.
+# - Have compile-time evaluation and generation of code, to avoid boilerplate code.
+# - Compile to efficient native code.
+
+# A very basic HTTP server
+require "http/server"
+
+server = HTTP::Server.new(8080) do |request|
+  HTTP::Response.ok "text/plain", "Hello world, got #{request.path}!"
+end
+
+puts "Listening on http://0.0.0.0:8080"
+server.listen
+
+module Foo
+  def initialize(@foo); end
+
+  abstract def abstract_method : String
+
+  @[AlwaysInline]
+  def with_foofoo
+    with Foo.new(self) yield
+  end
+
+  struct Foo
+    def initialize(@foo); end
+
+    def hello_world
+      @foo.abstract_method
+    end
+  end
+end
+
+class Bar
+  include Foo
+
+  @@foobar = 12345
+
+  def initialize(@bar)
+    super(@bar.not_nil! + 100)
+  end
+
+  macro alias_method(name, method)
+    def {{ name }}(*args)
+      {{ method }}(*args)
+    end
+  end
+
+  def a_method
+    "Hello, World"
+  end
+
+  alias_method abstract_method, a_method
+
+  macro def show_instance_vars : Nil
+    {% for var in @type.instance_vars %}
+      puts "@{{ var }} = #{ @{{ var }} }"
+    {% end %}
+    nil
+  end
+end
+
+class Baz &lt; Bar; end
+
+lib LibC
+  fun c_puts = "puts"(str : Char*) : Int
+end
+
+$baz = Baz.new(100)
+$baz.show_instance_vars
+$baz.with_foofoo do
+  LibC.c_puts hello_world
+end
+</textarea></form>
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    mode: "text/x-crystal",
+    matchBrackets: true,
+    indentUnit: 2
+  });
+</script>
+
+<p><strong>MIME types defined:</strong> <code>text/x-crystal</code>.</p>
+</article>
diff --git a/mode/index.html b/mode/index.html
index 724192413a..072b89bdaa 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -42,6 +42,7 @@ <h2>Language modes</h2>
       <li><a href="cobol/index.html">COBOL</a></li>
       <li><a href="coffeescript/index.html">CoffeeScript</a></li>
       <li><a href="commonlisp/index.html">Common Lisp</a></li>
+      <li><a href="crystal/index.html">Crystal</a></li>
       <li><a href="css/index.html">CSS</a></li>
       <li><a href="cypher/index.html">Cypher</a></li>
       <li><a href="python/index.html">Cython</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 7af51c1ec5..69e2a3ef69 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -28,6 +28,7 @@
     {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
     {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
     {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
+    {name: "Crystal", mime: "text/x-crystal", mode: "crystal", ext: ["cr"]},
     {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
     {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
     {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},

From 09e20bce214c2bd849667783365a7283b803d8eb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Dec 2015 10:42:29 +0100
Subject: [PATCH 2509/4742] [crystal mode] Integrate

---
 doc/compress.html       | 1 +
 mode/crystal/crystal.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/compress.html b/doc/compress.html
index fe8260ad64..74c6834768 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -122,6 +122,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/cobol/cobol.js">cobol.js</option>
           <option value="http://codemirror.net/mode/coffeescript/coffeescript.js">coffeescript.js</option>
           <option value="http://codemirror.net/mode/commonlisp/commonlisp.js">commonlisp.js</option>
+          <option value="http://codemirror.net/mode/crystal/crystal.js">crystal.js</option>
           <option value="http://codemirror.net/mode/css/css.js">css.js</option>
           <option value="http://codemirror.net/mode/cypher/cypher.js">cypher.js</option>
           <option value="http://codemirror.net/mode/d/d.js">d.js</option>
diff --git a/mode/crystal/crystal.js b/mode/crystal/crystal.js
index 8fd65a5f0b..2e74bee436 100644
--- a/mode/crystal/crystal.js
+++ b/mode/crystal/crystal.js
@@ -81,7 +81,7 @@
 
       // Variables and keywords
       var matched;
-      if (matched = stream.match(idents)) {
+      if (stream.match(idents)) {
         stream.eat(/[?!]/);
 
         matched = stream.current();

From 6bc4c5a082be035ecf1c2bc66c0237df7c94850f Mon Sep 17 00:00:00 2001
From: TSUYUSATO Kitsune <make.just.on@gmail.com>
Date: Mon, 21 Dec 2015 18:55:12 +0900
Subject: [PATCH 2510/4742] [crystal mode] Crystal looks like Ruby but not Ruby

---
 mode/crystal/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/crystal/index.html b/mode/crystal/index.html
index 4bd0399f0c..ec03e25094 100644
--- a/mode/crystal/index.html
+++ b/mode/crystal/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror: Ruby mode</title>
+<title>CodeMirror: Crystal mode</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
 
@@ -23,7 +23,7 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Ruby</a>
+    <li><a class=active href="#">Crystal</a>
   </ul>
 </div>
 

From fcfe83818aaee069c932be21cffeb855d7ac6cb0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Dec 2015 11:16:41 +0100
Subject: [PATCH 2511/4742] Fix assignment of end styles when there are
 multiple active marks

We can't check for nextChange until all marks have been looked at

See https://discuss.codemirror.net/t/marktext-endstyle-appearing-multiple-times/568/5
---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6305cafdc2..a90b9b5940 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7089,7 +7089,7 @@
       if (nextChange == pos) { // Update current marker set
         spanStyle = spanEndStyle = spanStartStyle = title = css = "";
         collapsed = null; nextChange = Infinity;
-        var foundBookmarks = [];
+        var foundBookmarks = [], endStyles
         for (var j = 0; j < spans.length; ++j) {
           var sp = spans[j], m = sp.marker;
           if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
@@ -7102,7 +7102,7 @@
             if (m.className) spanStyle += " " + m.className;
             if (m.css) css = (css ? css + ";" : "") + m.css;
             if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
-            if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
+            if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
             if (m.title && !title) title = m.title;
             if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
               collapsed = sp;
@@ -7110,6 +7110,9 @@
             nextChange = sp.from;
           }
         }
+        if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
+          if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
+
         if (collapsed && (collapsed.from || 0) == pos) {
           buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
                              collapsed.marker, collapsed.from == null);

From 8a3e59cb49b05da385639c350858c2a2a07e60c1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Dec 2015 11:30:25 +0100
Subject: [PATCH 2512/4742] Mark release 5.10.0

---
 AUTHORS           | 11 +++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 19 ++++++++++++++++---
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 4f06064129..830a968c27 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -105,9 +105,11 @@ Christian Petrov
 Christopher Brown
 Christopher Mitchell
 Christopher Pfohl
+Chunliang Lyu
 ciaranj
 CodeAnimal
 coderaiser
+Cole R Lawrence
 ComFreek
 Curtis Gagliardi
 dagsta
@@ -144,6 +146,7 @@ Doug Wikle
 Drew Bratcher
 Drew Hintz
 Drew Khoury
+Drini Cami
 Dror BG
 duralog
 eborden
@@ -152,6 +155,7 @@ ekhaled
 Elisée
 Enam Mijbah Noor
 Eric Allam
+Erik Welander
 eustas
 Fabien O'Carroll
 Fabio Zendhi Nagao
@@ -219,6 +223,7 @@ Jan Jongboom
 jankeromnes
 Jan Keromnes
 Jan Odvarko
+Jan Schär
 Jan T. Sott
 Jared Forsyth
 Jason
@@ -234,7 +239,9 @@ jeffkenton
 Jeff Pickhardt
 jem (graphite)
 Jeremy Parmenter
+Jim
 JobJob
+jochenberger
 Jochen Berger
 Johan Ask
 John Connor
@@ -258,6 +265,7 @@ ju1ius
 Juan Benavides Romero
 Jucovschi Constantin
 Juho Vuori
+Justin Andresen
 Justin Hileman
 jwallers@gmail.com
 kaniga
@@ -337,6 +345,7 @@ Max Kirsch
 Max Schaefer
 Max Xiantu
 mbarkhau
+McBrainy
 melpon
 Metatheos
 Micah Dubinko
@@ -376,6 +385,7 @@ Nicholas Bollweg
 Nicholas Bollweg (Nick)
 Nick Kreeger
 Nick Small
+Nicolò Ribaudo
 Niels van Groningen
 nightwing
 Nikita Beloglazov
@@ -492,6 +502,7 @@ Tom MacWright
 Tony Jian
 Travis Heppe
 Triangle717
+TSUYUSATO Kitsune
 twifkak
 Vestimir Markov
 vf
diff --git a/doc/compress.html b/doc/compress.html
index 74c6834768..1f1d0f0764 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.10.0;f=">5.10</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.9.0;f=">5.9</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.8.0;f=">5.8</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.7.0;f=">5.7</option>
diff --git a/doc/manual.html b/doc/manual.html
index 695a7ed25d..b3ef0658ce 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.9.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.10.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 a0cd627c98..74a7d49057 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-12-2015: <a href="http://codemirror.net/codemirror-5.10.zip">Version 5.10</a>:</p>
+
+  <ul class="rel-note">
+    <li>Modify the way <a href="manual.html#mark_atomic">atomic ranges</a> are skipped by selection to try and make it less surprising.</li>
+    <li>The <a href="../mode/swift/index.html">Swift mode</a> was rewritten.</li>
+    <li>New addon: <a href="manual.html#addon_jump-to-line">jump-to-line</a>.</li>
+    <li>New method: <a href="manual.html#isReadOnly"><code>isReadOnly</code></a>.</li>
+    <li>The <a href="manual.html#addon_show-hint">show-hint addon</a> now defaults to picking completions on single click.</li>
+    <li>The object passed to <a href="manual.html#event_beforeSelectionChange"><code>&quot;beforeSelectionChange&quot;</code></a> events now has an <code>origin</code> property.</li>
+    <li>New mode: <a href="../mode/crystal/index.html">Crystal</a>.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.9.0...5.10.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">23-11-2015: <a href="http://codemirror.net/codemirror-5.9.zip">Version 5.9</a>:</p>
 
   <ul class="rel-note">
@@ -59,12 +72,12 @@ <h2>Version 5.x</h2>
   <ul class="rel-note">
     <li>New modes: <a href="../mode/vue/index.html">Vue</a>, <a href="../mode/oz/index.html">Oz</a>, <a href="../mode/mscgen/index.html">MscGen</a> (and dialects), <a href="../mode/css/gss.html">Closure Stylesheets</a></li>
     <li>Implement <a href="http://commonmark.org">CommonMark</a>-style flexible list indent and cross-line code spans in <a href="../mode/markdown/index.html">Markdown</a> mode</li>
-    <li>Add a replace-all button to the <a href="../doc/manual.html#addon_search">search addon</a>, and make the persistent search dialog transparent when it obscures the match</li>
+    <li>Add a replace-all button to the <a href="manual.html#addon_search">search addon</a>, and make the persistent search dialog transparent when it obscures the match</li>
     <li>Handle <code>acync</code>/<code>await</code> and ocal and binary numbers in <a href="../mode/javascript/index.html">JavaScript mode</a></li>
     <li>Fix various issues with the <a href="../mode/haxe/index.html">Haxe mode</a></li>
-    <li>Make the <a href="../doc/manual.html#addon_closebrackets">closebrackets addon</a> select only the wrapped text when wrapping selection in brackets</li>
+    <li>Make the <a href="manual.html#addon_closebrackets">closebrackets addon</a> select only the wrapped text when wrapping selection in brackets</li>
     <li>Tokenize properties as properties in the <a href="../mode/coffeescript/index.html">CoffeeScript mode</a></li>
-    <li>The <a href="../doc/manual.html#addon_placeholder">placeholder addon</a> now accepts a DOM node as well as a string placeholder</li>
+    <li>The <a href="manual.html#addon_placeholder">placeholder addon</a> now accepts a DOM node as well as a string placeholder</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.6.0...5.7.0">list of patches</a></li>
   </ul>
 
diff --git a/index.html b/index.html
index a393997dfd..2e8dcc5cfd 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.9</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.10</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 a90b9b5940..942ad1f319 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8881,7 +8881,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.9.1";
+  CodeMirror.version = "5.10.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 3c8aad422a..f57893b88b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.9.1",
+    "version":"5.10.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 11d1b740ef4796623f94217dc718d48fc164d98f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Dec 2015 11:31:08 +0100
Subject: [PATCH 2513/4742] Bump version number post-5.10

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index b3ef0658ce..2b0afaee34 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.10.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.10.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 942ad1f319..078ecdb6db 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8881,7 +8881,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.10.0";
+  CodeMirror.version = "5.10.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index f57893b88b..165631b906 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.10.0",
+    "version":"5.10.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From a7e4e4a05452432ff522930a2d13dd3bab12e8f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Dec 2015 09:46:55 +0100
Subject: [PATCH 2514/4742] [clike mode] Remove redundant code

---
 mode/clike/clike.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 3766209c28..4f5c0cf370 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -264,9 +264,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   function cppHook(stream, state) {
     if (!state.startOfLine) return false
     for (var ch, next = null; ch = stream.peek();) {
-      if (!ch) {
-        break
-      } else if (ch == "\\" && stream.match(/^.$/)) {
+      if (ch == "\\" && stream.match(/^.$/)) {
         next = cppHook
         break
       } else if (ch == "/" && stream.match(/^\/[\/\*]/, false)) {

From 2a7dc2be2fe149f0521741a6998c28dadafe77c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 26 Dec 2015 17:25:26 +0100
Subject: [PATCH 2515/4742] Signal DOM events for cut and copy

---
 doc/manual.html   | 3 ++-
 lib/codemirror.js | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 2b0afaee34..a33b77aef4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -654,7 +654,8 @@ <h2>Events</h2>
 
       <dt id="event_dom"><code><strong>"mousedown"</strong>,
       <strong>"dblclick"</strong>, <strong>"contextmenu"</strong>, <strong>"keydown"</strong>, <strong>"keypress"</strong>,
-      <strong>"keyup"</strong>, <strong>"paste"</strong>, <strong>"dragstart"</strong>, <strong>"dragenter"</strong>,
+      <strong>"keyup"</strong>, <strong>"cut"</strong>, <strong>"copy"</strong>, <strong>"paste"</strong>,
+      <strong>"dragstart"</strong>, <strong>"dragenter"</strong>,
       <strong>"dragover"</strong>, <strong>"drop"</strong>
       (instance: CodeMirror, event: Event)</code></dt>
       <dd>Fired when CodeMirror is handling a DOM event of this type.
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 078ecdb6db..c4f5a0008f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1258,6 +1258,7 @@
       });
 
       function prepareCopyCut(e) {
+        if (signalDOMEvent(cm, e)) return
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
           if (input.inaccurateSelection) {
@@ -1615,6 +1616,7 @@
       });
 
       function onCopyCut(e) {
+        if (signalDOMEvent(cm, e)) return
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
           if (e.type == "cut") cm.replaceSelection("", null, "cut");

From 4b0229d1f2caf5bfece6851941d868a1a1ab580f Mon Sep 17 00:00:00 2001
From: pabloferz <pabloferz@yahoo.com.mx>
Date: Tue, 22 Dec 2015 17:55:56 +0100
Subject: [PATCH 2516/4742] [julia mode] Add type assertions and handle
 multiline comments

---
 mode/julia/julia.js | 107 +++++++++++++++++++++++++++-----------------
 1 file changed, 66 insertions(+), 41 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 17710647d1..e31b44a3ce 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -18,35 +18,34 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     return new RegExp("^((" + words.join(")|(") + "))\\b");
   }
 
-  var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b/;
+  var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b(?!\()|[\u2208\u2209](?!\()/;
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
-  var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
+  var identifiers = parserConf.identifiers || /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
   var blockClosers = ["end", "else", "elseif", "catch", "finally"];
   var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];
-  var builtinList = ['true', 'false', 'enumerate', 'open', 'close', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'UTF8String', 'ASCIIString', 'error', 'warn', 'info', '@printf'];
+  var builtinList = ['true', 'false', 'nothing', 'NaN', 'Inf'];
 
   //var stringPrefixes = new RegExp("^[br]?('|\")")
-  var stringPrefixes = /^(`|'|"{3}|([br]?"))/;
+  var stringPrefixes = /^(`|'|"{3}|([brv]?"))/;
   var keywords = wordRegexp(keywordList);
   var builtins = wordRegexp(builtinList);
   var openers = wordRegexp(blockOpeners);
   var closers = wordRegexp(blockClosers);
   var macro = /^@[_A-Za-z][_A-Za-z0-9]*/;
-  var symbol = /^:[_A-Za-z][_A-Za-z0-9]*/;
+  var symbol = /^:[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
+  var typeAssertion = /^::[^,)"=$.]+(\.{3}\)|,\))?(?=\s*[,)"=]|$)/;
 
-  function in_array(state) {
-    var ch = cur_scope(state);
-    if(ch=="[" || ch=="{") {
+  function inArray(state) {
+    var ch = currentScope(state);
+    if (ch=="[" || ch=="{") {
       return true;
     }
-    else {
-      return false;
-    }
+    return false;
   }
 
-  function cur_scope(state) {
-    if(state.scopes.length==0) {
+  function currentScope(state) {
+    if (state.scopes.length == 0) {
       return null;
     }
     return state.scopes[state.scopes.length - 1];
@@ -54,20 +53,34 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
   // tokenizers
   function tokenBase(stream, state) {
+    //Handle multiline comments
+    if (stream.match(/^#=\s*/)) {
+      state.scopes.push('#=');
+    }
+    if (currentScope(state) == '#=' && stream.match(/^=#/)) {
+      state.scopes.pop();
+      return 'comment';
+    }
+    if (state.scopes.indexOf('#=') >= 0) {
+      if (!stream.match(/.*?(?=(#=|=#))/)) {
+        stream.skipToEnd();
+      }
+      return 'comment';
+    }
+
     // Handle scope changes
     var leaving_expr = state.leaving_expr;
-    if(stream.sol()) {
+    if (stream.sol()) {
       leaving_expr = false;
     }
     state.leaving_expr = false;
-    if(leaving_expr) {
-      if(stream.match(/^'+/)) {
+    if (leaving_expr) {
+      if (stream.match(/^'+/)) {
         return 'operator';
       }
-
     }
 
-    if(stream.match(/^\.{2,3}/)) {
+    if (stream.match(/^\.{2,3}/)) {
       return 'operator';
     }
 
@@ -76,52 +89,56 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     }
 
     var ch = stream.peek();
-    // Handle Comments
+
+    // Handle single line comments
     if (ch === '#') {
         stream.skipToEnd();
         return 'comment';
     }
-    if(ch==='[') {
+
+    if (ch === '[') {
       state.scopes.push("[");
     }
 
-    if(ch==='{') {
+    if (ch === '{') {
       state.scopes.push("{");
     }
 
-    var scope=cur_scope(state);
+    var scope=currentScope(state);
 
-    if(scope==='[' && ch===']') {
+    if (scope === '[' && ch === ']') {
       state.scopes.pop();
-      state.leaving_expr=true;
+      state.leaving_expr = true;
     }
 
-    if(scope==='{' && ch==='}') {
+    if (scope === '{' && ch === '}') {
       state.scopes.pop();
-      state.leaving_expr=true;
+      state.leaving_expr = true;
     }
 
-    if(ch===')') {
+    if (ch === ')') {
       state.leaving_expr = true;
     }
 
     var match;
-    if(!in_array(state) && (match=stream.match(openers, false))) {
+    if (!inArray(state) && (match=stream.match(openers, false))) {
       state.scopes.push(match);
     }
 
-    if(!in_array(state) && stream.match(closers, false)) {
+    if (!inArray(state) && stream.match(closers, false)) {
       state.scopes.pop();
     }
 
-    if(in_array(state)) {
-      if(stream.match(/^end/)) {
+    if (inArray(state)) {
+      if (state.lastToken == 'end' && stream.match(/^:/)) {
+        return 'operator';
+      }
+      if (stream.match(/^end(?=])/)) {
         return 'number';
       }
-
     }
 
-    if(stream.match(/^=>/)) {
+    if (stream.match(/^=>/)) {
       return 'operator';
     }
 
@@ -134,6 +151,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       if (stream.match(/^\d*\.(?!\.)\d+([ef][\+\-]?\d+)?/i)) { floatLiteral = true; }
       if (stream.match(/^\d+\.(?!\.)\d*/)) { floatLiteral = true; }
       if (stream.match(/^\.\d+/)) { floatLiteral = true; }
+      if (stream.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)) { floatLiteral = true; }
       if (floatLiteral) {
           // Float literals may be "imaginary"
           stream.match(imMatcher);
@@ -162,13 +180,22 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       }
     }
 
-    if(stream.match(/^(::)|(<:)/)) {
+    if (stream.match(/^<:/)) {
       return 'operator';
     }
 
+    if (stream.match(typeAssertion)) {
+      return 'builtin';
+    }
+
     // Handle symbols
-    if(!leaving_expr && stream.match(symbol)) {
-      return 'string';
+    if (!leaving_expr && stream.match(symbol)) {
+      return 'builtin';
+    }
+
+    // Handle parametric types
+    if (stream.match(/^{[^}]*}(?=\()/)) {
+      return 'builtin';
     }
 
     // Handle operators and Delimiters
@@ -176,7 +203,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return 'operator';
     }
 
-
     // Handle Strings
     if (stream.match(stringPrefixes)) {
       state.tokenize = tokenStringFactory(stream.current());
@@ -187,7 +213,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return 'meta';
     }
 
-
     if (stream.match(delimiters)) {
       return null;
     }
@@ -200,11 +225,11 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return 'builtin';
     }
 
-
     if (stream.match(identifiers)) {
-      state.leaving_expr=true;
+      state.leaving_expr = true;
       return 'variable';
     }
+
     // Handle non-detected items
     stream.next();
     return ERRORCLASS;
@@ -280,7 +305,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
     indent: function(state, textAfter) {
       var delta = 0;
-      if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") {
+      if (textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") {
         delta = -1;
       }
       return (state.scopes.length + delta) * _conf.indentUnit;

From 28bc0e0361ef3002fc79513831c69a1b7f57bc59 Mon Sep 17 00:00:00 2001
From: pabloferz <pabloferz@yahoo.com.mx>
Date: Wed, 23 Dec 2015 00:46:40 +0100
Subject: [PATCH 2517/4742] [julia mode] String, function calls and definitions
 improvements

---
 mode/julia/julia.js | 96 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 78 insertions(+), 18 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index e31b44a3ce..ca672b9ed7 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -69,12 +69,12 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     }
 
     // Handle scope changes
-    var leaving_expr = state.leaving_expr;
+    var leavingExpr = state.leavingExpr;
     if (stream.sol()) {
-      leaving_expr = false;
+      leavingExpr = false;
     }
-    state.leaving_expr = false;
-    if (leaving_expr) {
+    state.leavingExpr = false;
+    if (leavingExpr) {
       if (stream.match(/^'+/)) {
         return 'operator';
       }
@@ -108,16 +108,16 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
     if (scope === '[' && ch === ']') {
       state.scopes.pop();
-      state.leaving_expr = true;
+      state.leavingExpr = true;
     }
 
     if (scope === '{' && ch === '}') {
       state.scopes.pop();
-      state.leaving_expr = true;
+      state.leavingExpr = true;
     }
 
     if (ch === ')') {
-      state.leaving_expr = true;
+      state.leavingExpr = true;
     }
 
     var match;
@@ -142,7 +142,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return 'operator';
     }
 
-
     // Handle Number Literals
     if (stream.match(/^[0-9\.]/, false)) {
       var imMatcher = RegExp(/^im\b/);
@@ -155,7 +154,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       if (floatLiteral) {
           // Float literals may be "imaginary"
           stream.match(imMatcher);
-          state.leaving_expr = true;
+          state.leavingExpr = true;
           return 'number';
       }
       // Integers
@@ -175,7 +174,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       if (intLiteral) {
           // Integer literals may be "long"
           stream.match(imMatcher);
-          state.leaving_expr = true;
+          state.leavingExpr = true;
           return 'number';
       }
     }
@@ -189,7 +188,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     }
 
     // Handle symbols
-    if (!leaving_expr && stream.match(symbol)) {
+    if (!leavingExpr && stream.match(symbol)) {
       return 'builtin';
     }
 
@@ -225,8 +224,25 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return 'builtin';
     }
 
+    var isDefinition = state.isDefinition ||
+                       state.lastToken == 'function' ||
+                       state.lastToken == 'macro' ||
+                       state.lastToken == 'type' ||
+                       state.lastToken == 'immutable';
+
     if (stream.match(identifiers)) {
-      state.leaving_expr = true;
+      if (isDefinition) {
+        if (stream.peek() === '.') {
+          state.isDefinition = true;
+          return 'variable';
+        }
+        state.isDefinition = false;
+        return 'def';
+      }
+      if (stream.match(/^({[^}]*})*\(/, false)) {
+        return callOrDef(stream, state);
+      }
+      state.leavingExpr = true;
       return 'variable';
     }
 
@@ -235,11 +251,47 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     return ERRORCLASS;
   }
 
+  function callOrDef(stream, state) {
+    var match = stream.match(/^(\(\s*)/);
+    if (match) {
+      if (state.firstParenPos < 0)
+        state.firstParenPos = state.scopes.length;
+      state.scopes.push('(');
+      state.charsAdvanced += match[1].length;
+    }
+    if (currentScope(state) == '(' && stream.match(/^\)/)) {
+      state.scopes.pop();
+      state.charsAdvanced += 1;
+      if (state.scopes.length <= state.firstParenPos) {
+        var isDefinition = stream.match(/^\s*?=(?!=)/, false);
+        stream.backUp(state.charsAdvanced);
+        state.firstParenPos = -1;
+        state.charsAdvanced = 0;
+        if (isDefinition)
+          return 'def';
+        return 'builtin';
+      }
+    }
+    // Unfortunately javascript does not support multiline strings, so we have
+    // to undo anything done upto here if a function call or definition splits
+    // over two or more lines.
+    if (stream.match(/^$/g, false)) {
+      stream.backUp(state.charsAdvanced);
+      while (state.scopes.length > state.firstParenPos + 1)
+        state.scopes.pop();
+      state.firstParenPos = -1;
+      state.charsAdvanced = 0;
+      return 'variable';
+    }
+    state.charsAdvanced += stream.match(/^([^()]*)/)[1].length;
+    return callOrDef(stream, state);
+  }
+
   function tokenStringFactory(delimiter) {
-    while ('rub'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
+    while ('bruv'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
       delimiter = delimiter.substr(1);
     }
-    var singleline = delimiter.length == 1;
+    var singleline = delimiter == "'";
     var OUTCLASS = 'string';
 
     function tokenString(stream, state) {
@@ -274,9 +326,14 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     var style = state.tokenize(stream, state);
     var current = stream.current();
 
+    if (current && style) {
+      state.lastToken = current;
+    }
+
     // Handle '.' connected identifiers
     if (current === '.') {
-      style = stream.match(identifiers, false) ? null : ERRORCLASS;
+      style = stream.match(identifiers, false) ||
+              stream.match(macro, false) ? null : ERRORCLASS;
       if (style === null && state.lastStyle === 'meta') {
           // Apply 'meta' style to '.' connected identifiers when
           // appropriate.
@@ -284,7 +341,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       }
       return style;
     }
-
     return style;
   }
 
@@ -293,7 +349,11 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return {
         tokenize: tokenBase,
         scopes: [],
-        leaving_expr: false
+        lastToken: null,
+        leavingExpr: false,
+        isDefinition: false,
+        charsAdvanced: 0,
+        firstParenPos: -1
       };
     },
 
@@ -305,7 +365,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
     indent: function(state, textAfter) {
       var delta = 0;
-      if (textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") {
+      if (textAfter == "end" || textAfter == "]" || textAfter == "}" || textAfter == "else" || textAfter == "elseif" || textAfter == "catch" || textAfter == "finally") {
         delta = -1;
       }
       return (state.scopes.length + delta) * _conf.indentUnit;

From f1156f523964b1fbebbb673b6dda3dbc13048646 Mon Sep 17 00:00:00 2001
From: Rahul Anand <rahulanand.fine@gmail.com>
Date: Wed, 23 Dec 2015 14:34:41 +0530
Subject: [PATCH 2518/4742] [monokay theme] Add style for builtin keywords

Usecase: Datatypes in hive are not highlighted without this fix
---
 theme/monokai.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/monokai.css b/theme/monokai.css
index 6910f793e6..7c8a4c5d00 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -16,6 +16,7 @@
 
 .cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
 .cm-s-monokai span.cm-keyword { color: #f92672; }
+.cm-s-monokai span.cm-builtin { color: #66d9ef; }
 .cm-s-monokai span.cm-string { color: #e6db74; }
 
 .cm-s-monokai span.cm-variable { color: #f8f8f2; }

From 5ee26b8c2e4e1cc191c434e3685e528465e4be24 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sat, 26 Dec 2015 17:43:57 +0100
Subject: [PATCH 2519/4742] [closebrackets addon] Give matching-brace deletion
 an origin

Issue #3733
---
 addon/edit/closebrackets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index f3006976fd..3eb9d8eae7 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -63,7 +63,7 @@
     }
     for (var i = ranges.length - 1; i >= 0; i--) {
       var cur = ranges[i].head;
-      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
+      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1), "+delete");
     }
   }
 

From d395fec651fd31b2c284768acb7cd840c301ae1f Mon Sep 17 00:00:00 2001
From: Amin Ullah Khan <aminullah@outlook.com>
Date: Sun, 27 Dec 2015 02:09:12 +0500
Subject: [PATCH 2520/4742] [css mode] Support background-blend-mode

---
 mode/css/css.js       | 27 ++++++++++++++-------------
 mode/css/less_test.js |  4 ++--
 mode/css/scss_test.js |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 2673074ab9..e9656e3dcc 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -452,8 +452,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "animation-direction", "animation-duration", "animation-fill-mode",
     "animation-iteration-count", "animation-name", "animation-play-state",
     "animation-timing-function", "appearance", "azimuth", "backface-visibility",
-    "background", "background-attachment", "background-clip", "background-color",
-    "background-image", "background-origin", "background-position",
+    "background", "background-attachment", "background-blend-mode", "background-clip",
+    "background-color", "background-image", "background-origin", "background-position",
     "background-repeat", "background-size", "baseline-shift", "binding",
     "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
     "bookmark-target", "border", "border-bottom", "border-bottom-color",
@@ -597,11 +597,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
     "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
-    "col-resize", "collapse", "column", "column-reverse", "compact", "condensed", "contain", "content",
+    "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
+    "compact", "condensed", "contain", "content",
     "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
-    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "dashed", "decimal",
+    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "destination-atop",
-    "destination-in", "destination-out", "destination-over", "devanagari",
+    "destination-in", "destination-out", "destination-over", "devanagari", "difference",
     "disc", "discard", "disclosure-closed", "disclosure-open", "document",
     "dot-dash", "dot-dot-dash",
     "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
@@ -612,23 +613,23 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
     "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
     "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
-    "ethiopic-numeric", "ew-resize", "expanded", "extends", "extra-condensed",
+    "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
     "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
     "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
-    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
+    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
     "help", "hidden", "hide", "higher", "highlight", "highlighttext",
-    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
+    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore",
     "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
     "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
     "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert",
     "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
     "katakana", "katakana-iroha", "keep-all", "khmer",
     "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
-    "landscape", "lao", "large", "larger", "left", "level", "lighter",
+    "landscape", "lao", "large", "larger", "left", "level", "lighter", "lighten",
     "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
     "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
-    "lower-roman", "lowercase", "ltr", "malayalam", "match", "matrix", "matrix3d",
+    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d",
     "media-controls-background", "media-current-time-display",
     "media-fullscreen-button", "media-mute-button", "media-play-button",
     "media-return-to-realtime-button", "media-rewind-button",
@@ -637,7 +638,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "media-volume-slider-container", "media-volume-sliderthumb", "medium",
     "menu", "menulist", "menulist-button", "menulist-text",
     "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
-    "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize",
+    "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
     "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
@@ -651,7 +652,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
     "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
     "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
-    "s-resize", "sans-serif", "scale", "scale3d", "scaleX", "scaleY", "scaleZ",
+    "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
     "scroll", "scrollbar", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",
     "searchfield-results-button", "searchfield-results-decoration",
@@ -659,7 +660,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "simp-chinese-formal", "simp-chinese-informal", "single",
     "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
-    "small", "small-caps", "small-caption", "smaller", "solid", "somali",
+    "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
     "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
     "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
     "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
diff --git a/mode/css/less_test.js b/mode/css/less_test.js
index 7b77f58488..dd821558b0 100644
--- a/mode/css/less_test.js
+++ b/mode/css/less_test.js
@@ -26,10 +26,10 @@
 
   MT("mixin",
      "[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",
-     "  [property color]: [variable darken]([variable-2 @color], [number 10%]);",
+     "  [property color]: [atom darken]([variable-2 @color], [number 10%]);",
      "}",
      "[qualifier .mixin] ([variable light]; [variable-2 @color]) {",
-     "  [property color]: [variable lighten]([variable-2 @color], [number 10%]);",
+     "  [property color]: [atom lighten]([variable-2 @color], [number 10%]);",
      "}",
      "[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",
      "  [property display]: [atom block];",
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 26c226a1ea..785921b39c 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -95,7 +95,7 @@
 
   MT('indent_parentheses',
      "[tag foo] {",
-     "  [property color]: [variable darken]([variable-2 $blue],",
+     "  [property color]: [atom darken]([variable-2 $blue],",
      "    [number 9%]);",
      "}");
 

From 16e51fc7321f83320e590fe9c98853cb4404e2d4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Dec 2015 11:26:38 +0100
Subject: [PATCH 2521/4742] Fix highlighting of mode test failures

---
 test/mode_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/mode_test.js b/test/mode_test.js
index 2e16eba0ee..0aed50f7dc 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -170,7 +170,7 @@
     for (var i = 0; i < output.length; ++i) {
       var style = output[i].style, val = output[i].text;
       s +=
-      '<td class="mt-token"' + (i == diffAt * 2 ? " style='background: pink'" : "") + '>' +
+      '<td class="mt-token"' + (i == diffAt ? " style='background: pink'" : "") + '>' +
         '<span class="cm-' + esc(String(style)) + '">' +
         esc(val.replace(/ /g,'\xb7')) +  // · MIDDLE DOT
         '</span>' +

From f9631461ce80eb0b4e38e90d26403aed64e04af9 Mon Sep 17 00:00:00 2001
From: Chris Ford <christophertford@gmail.com>
Date: Sun, 27 Dec 2015 15:18:19 +0800
Subject: [PATCH 2522/4742] [clojure mode] Support ratios

---
 mode/clojure/clojure.js | 3 +++
 mode/clojure/index.html | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index d531022a2e..44948d04e7 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -96,6 +96,9 @@ CodeMirror.defineMode("clojure", function (options) {
             if ( '.' == stream.peek() ) {
                 stream.eat('.');
                 stream.eatWhile(tests.digit);
+            } else if ('/' == stream.peek() ) {
+                stream.eat('/');
+                stream.eatWhile(tests.digit);
             }
 
             if ( stream.eat(tests.exponent) ) {
diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index 3ecf4c4862..81294bc14a 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -78,6 +78,9 @@ <h2>Clojure mode</h2>
          \tab \return \backspace
          \u1000 \uAaAa \u9F9F)
 
+;; Let's play with numbers
+(+ 1 -1 1/2 -1/2 -0.5 0.5)
+
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});

From ef5dcef4f594c0498ce9902f9d06e086ea6633c0 Mon Sep 17 00:00:00 2001
From: pabloferz <pabloferz@yahoo.com.mx>
Date: Mon, 28 Dec 2015 15:08:35 +0100
Subject: [PATCH 2523/4742] [julia mode] Syntax clean-up and minor improvements

---
 mode/julia/julia.js | 70 ++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 45 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index ca672b9ed7..4471896b76 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -23,7 +23,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   var identifiers = parserConf.identifiers || /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
   var blockClosers = ["end", "else", "elseif", "catch", "finally"];
-  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];
+  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype'];
   var builtinList = ['true', 'false', 'nothing', 'NaN', 'Inf'];
 
   //var stringPrefixes = new RegExp("^[br]?('|\")")
@@ -34,11 +34,11 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
   var closers = wordRegexp(blockClosers);
   var macro = /^@[_A-Za-z][_A-Za-z0-9]*/;
   var symbol = /^:[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
-  var typeAssertion = /^::[^,)"=$.]+(\.{3}\)|,\))?(?=\s*[,)"=]|$)/;
+  var typeAnnotation = /^::[^.,;"{()=$\s]+({[^}]*}+)*/;
 
   function inArray(state) {
     var ch = currentScope(state);
-    if (ch=="[" || ch=="{") {
+    if (ch == '[') {
       return true;
     }
     return false;
@@ -92,34 +92,26 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
     // Handle single line comments
     if (ch === '#') {
-        stream.skipToEnd();
-        return 'comment';
+      stream.skipToEnd();
+      return 'comment';
     }
 
     if (ch === '[') {
-      state.scopes.push("[");
-    }
-
-    if (ch === '{') {
-      state.scopes.push("{");
+      state.scopes.push('[');
     }
 
-    var scope=currentScope(state);
+    var scope = currentScope(state);
 
-    if (scope === '[' && ch === ']') {
+    if (scope == '[' && ch === ']') {
       state.scopes.pop();
       state.leavingExpr = true;
     }
 
-    if (scope === '{' && ch === '}') {
+    if (scope == '(' && ch === ')') {
       state.scopes.pop();
       state.leavingExpr = true;
     }
 
-    if (ch === ')') {
-      state.leavingExpr = true;
-    }
-
     var match;
     if (!inArray(state) && (match=stream.match(openers, false))) {
       state.scopes.push(match);
@@ -133,7 +125,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       if (state.lastToken == 'end' && stream.match(/^:/)) {
         return 'operator';
       }
-      if (stream.match(/^end(?=])/)) {
+      if (stream.match(/^end/)) {
         return 'number';
       }
     }
@@ -183,12 +175,12 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return 'operator';
     }
 
-    if (stream.match(typeAssertion)) {
+    if (stream.match(typeAnnotation)) {
       return 'builtin';
     }
 
     // Handle symbols
-    if (!leavingExpr && stream.match(symbol)) {
+    if (!leavingExpr && stream.match(symbol) || stream.match(/:\./)) {
       return 'builtin';
     }
 
@@ -281,7 +273,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
         state.scopes.pop();
       state.firstParenPos = -1;
       state.charsAdvanced = 0;
-      return 'variable';
+      return 'builtin';
     }
     state.charsAdvanced += stream.match(/^([^()]*)/)[1].length;
     return callOrDef(stream, state);
@@ -322,28 +314,6 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     return tokenString;
   }
 
-  function tokenLexer(stream, state) {
-    var style = state.tokenize(stream, state);
-    var current = stream.current();
-
-    if (current && style) {
-      state.lastToken = current;
-    }
-
-    // Handle '.' connected identifiers
-    if (current === '.') {
-      style = stream.match(identifiers, false) ||
-              stream.match(macro, false) ? null : ERRORCLASS;
-      if (style === null && state.lastStyle === 'meta') {
-          // Apply 'meta' style to '.' connected identifiers when
-          // appropriate.
-        style = 'meta';
-      }
-      return style;
-    }
-    return style;
-  }
-
   var external = {
     startState: function() {
       return {
@@ -358,8 +328,18 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     },
 
     token: function(stream, state) {
-      var style = tokenLexer(stream, state);
-      state.lastStyle = style;
+      var style = state.tokenize(stream, state);
+      var current = stream.current();
+
+      if (current && style) {
+        state.lastToken = current;
+      }
+
+      // Handle '.' connected identifiers
+      if (current === '.') {
+        style = stream.match(identifiers, false) || stream.match(macro, false) ||
+                stream.match(/\(/, false) ? 'operator' : ERRORCLASS;
+      }
       return style;
     },
 

From 4955e6e01883726bf510ea3a020c1565f003fc2f Mon Sep 17 00:00:00 2001
From: ms <martin.starman@paninarodigital.com>
Date: Mon, 28 Dec 2015 18:25:35 +0100
Subject: [PATCH 2524/4742] [haskell-literate mode] Add

---
 mode/haskell-literate/haskell-literate.js |  38 +++
 mode/haskell-literate/index.html          | 276 ++++++++++++++++++++++
 2 files changed, 314 insertions(+)
 create mode 100644 mode/haskell-literate/haskell-literate.js
 create mode 100644 mode/haskell-literate/index.html

diff --git a/mode/haskell-literate/haskell-literate.js b/mode/haskell-literate/haskell-literate.js
new file mode 100644
index 0000000000..f50d2fb100
--- /dev/null
+++ b/mode/haskell-literate/haskell-literate.js
@@ -0,0 +1,38 @@
+// 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("../haskell/haskell"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../haskell/haskell"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function (CodeMirror) {
+  CodeMirror.defineMode("haskell-literate", function (config) {
+    var haskellMode = CodeMirror.getMode(config, "haskell")
+    return {
+      startState: function () {
+        return {
+          haskellCode: false,
+          haskellState: CodeMirror.startState(haskellMode)
+        }
+      },
+      token: function (stream, state) {
+        if ((stream.sol() && stream.next() == '>') || state.haskellCode) {
+          state.haskellCode = true
+          return haskellMode.token(stream, state.haskellState)
+        } else {
+          stream.skipToEnd()
+          return "comment"
+        }
+      },
+      blankLine: function (state) {
+        state.haskellCode = false
+      },
+      innerMode: function (state) {
+        return {state: state.haskellState, mode: haskellMode};
+      }
+    }
+  })
+})
diff --git a/mode/haskell-literate/index.html b/mode/haskell-literate/index.html
new file mode 100644
index 0000000000..051724776b
--- /dev/null
+++ b/mode/haskell-literate/index.html
@@ -0,0 +1,276 @@
+<!doctype html>
+
+<title>CodeMirror: Haskell-literate 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="haskell-literate.js"></script>
+<script src="../haskell/haskell.js"></script>
+<style>.CodeMirror {
+  border-top    : 1px solid #DDDDDD;
+  border-bottom : 1px solid #DDDDDD;
+}</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="#">Haskell-literate</a>
+  </ul>
+</div>
+
+<article>
+  <h2>Haskell literate mode</h2>
+  <form>
+    <textarea id="code" name="code">
+> {-# LANGUAGE OverloadedStrings #-}
+> {-# OPTIONS_GHC -fno-warn-unused-do-bind #-}
+> import Control.Applicative ((<$>), (<*>))
+> import Data.Maybe (isJust)
+
+> import Data.Text (Text)
+> import Text.Blaze ((!))
+> import qualified Data.Text as T
+> import qualified Happstack.Server as Happstack
+> import qualified Text.Blaze.Html5 as H
+> import qualified Text.Blaze.Html5.Attributes as A
+
+> import Text.Digestive
+> import Text.Digestive.Blaze.Html5
+> import Text.Digestive.Happstack
+> import Text.Digestive.Util
+
+Simple forms and validation
+---------------------------
+
+Let's start by creating a very simple datatype to represent a user:
+
+> data User = User
+>     { userName :: Text
+>     , userMail :: Text
+>     } deriving (Show)
+
+And dive in immediately to create a `Form` for a user. The `Form v m a` type
+has three parameters:
+
+- `v`: the type for messages and errors (usually a `String`-like type, `Text` in
+  this case);
+- `m`: the monad we are operating in, not specified here;
+- `a`: the return type of the `Form`, in this case, this is obviously `User`.
+
+> userForm :: Monad m => Form Text m User
+
+We create forms by using the `Applicative` interface. A few form types are
+provided in the `Text.Digestive.Form` module, such as `text`, `string`,
+`bool`...
+
+In the `digestive-functors` library, the developer is required to label each
+field using the `.:` operator. This might look like a bit of a burden, but it
+allows you to do some really useful stuff, like separating the `Form` from the
+actual HTML layout.
+
+> userForm = User
+>     <$> "name" .: text Nothing
+>     <*> "mail" .: check "Not a valid email address" checkEmail (text Nothing)
+
+The `check` function enables you to validate the result of a form. For example,
+we can validate the email address with a really naive `checkEmail` function.
+
+> checkEmail :: Text -> Bool
+> checkEmail = isJust . T.find (== '@')
+
+More validation
+---------------
+
+For our example, we also want descriptions of Haskell libraries, and in order to
+do that, we need package versions...
+
+> type Version = [Int]
+
+We want to let the user input a version number such as `0.1.0.0`. This means we
+need to validate if the input `Text` is of this form, and then we need to parse
+it to a `Version` type. Fortunately, we can do this in a single function:
+`validate` allows conversion between values, which can optionally fail.
+
+`readMaybe :: Read a => String -> Maybe a` is a utility function imported from
+`Text.Digestive.Util`.
+
+> validateVersion :: Text -> Result Text Version
+> validateVersion = maybe (Error "Cannot parse version") Success .
+>     mapM (readMaybe . T.unpack) . T.split (== '.')
+
+A quick test in GHCi:
+
+    ghci> validateVersion (T.pack "0.3.2.1")
+    Success [0,3,2,1]
+    ghci> validateVersion (T.pack "0.oops")
+    Error "Cannot parse version"
+
+It works! This means we can now easily add a `Package` type and a `Form` for it:
+
+> data Category = Web | Text | Math
+>     deriving (Bounded, Enum, Eq, Show)
+
+> data Package = Package Text Version Category
+>     deriving (Show)
+
+> packageForm :: Monad m => Form Text m Package
+> packageForm = Package
+>     <$> "name"     .: text Nothing
+>     <*> "version"  .: validate validateVersion (text (Just "0.0.0.1"))
+>     <*> "category" .: choice categories Nothing
+>   where
+>     categories = [(x, T.pack (show x)) | x <- [minBound .. maxBound]]
+
+Composing forms
+---------------
+
+A release has an author and a package. Let's use this to illustrate the
+composability of the digestive-functors library: we can reuse the forms we have
+written earlier on.
+
+> data Release = Release User Package
+>     deriving (Show)
+
+> releaseForm :: Monad m => Form Text m Release
+> releaseForm = Release
+>     <$> "author"  .: userForm
+>     <*> "package" .: packageForm
+
+Views
+-----
+
+As mentioned before, one of the advantages of using digestive-functors is
+separation of forms and their actual HTML layout. In order to do this, we have
+another type, `View`.
+
+We can get a `View` from a `Form` by supplying input. A `View` contains more
+information than a `Form`, it has:
+
+- the original form;
+- the input given by the user;
+- any errors that have occurred.
+
+It is this view that we convert to HTML. For this tutorial, we use the
+[blaze-html] library, and some helpers from the `digestive-functors-blaze`
+library.
+
+[blaze-html]: http://jaspervdj.be/blaze/
+
+Let's write a view for the `User` form. As you can see, we here refer to the
+different fields in the `userForm`. The `errorList` will generate a list of
+errors for the `"mail"` field.
+
+> userView :: View H.Html -> H.Html
+> userView view = do
+>     label     "name" view "Name: "
+>     inputText "name" view
+>     H.br
+>
+>     errorList "mail" view
+>     label     "mail" view "Email address: "
+>     inputText "mail" view
+>     H.br
+
+Like forms, views are also composable: let's illustrate that by adding a view
+for the `releaseForm`, in which we reuse `userView`. In order to do this, we
+take only the parts relevant to the author from the view by using `subView`. We
+can then pass the resulting view to our own `userView`.
+We have no special view code for `Package`, so we can just add that to
+`releaseView` as well. `childErrorList` will generate a list of errors for each
+child of the specified form. In this case, this means a list of errors from
+`"package.name"` and `"package.version"`. Note how we use `foo.bar` to refer to
+nested forms.
+
+> releaseView :: View H.Html -> H.Html
+> releaseView view = do
+>     H.h2 "Author"
+>     userView $ subView "author" view
+>
+>     H.h2 "Package"
+>     childErrorList "package" view
+>
+>     label     "package.name" view "Name: "
+>     inputText "package.name" view
+>     H.br
+>
+>     label     "package.version" view "Version: "
+>     inputText "package.version" view
+>     H.br
+>
+>     label       "package.category" view "Category: "
+>     inputSelect "package.category" view
+>     H.br
+
+The attentive reader might have wondered what the type parameter for `View` is:
+it is the `String`-like type used for e.g. error messages.
+But wait! We have
+    releaseForm :: Monad m => Form Text m Release
+    releaseView :: View H.Html -> H.Html
+... doesn't this mean that we need a `View Text` rather than a `View Html`?  The
+answer is yes -- but having `View Html` allows us to write these views more
+easily with the `digestive-functors-blaze` library. Fortunately, we will be able
+to fix this using the `Functor` instance of `View`.
+    fmap :: Monad m => (v -> w) -> View v -> View w
+A backend
+---------
+To finish this tutorial, we need to be able to actually run this code. We need
+an HTTP server for that, and we use [Happstack] for this tutorial. The
+`digestive-functors-happstack` library gives about everything we need for this.
+[Happstack]: http://happstack.com/
+
+> site :: Happstack.ServerPart Happstack.Response
+> site = do
+>     Happstack.decodeBody $ Happstack.defaultBodyPolicy "/tmp" 4096 4096 4096
+>     r <- runForm "test" releaseForm
+>     case r of
+>         (view, Nothing) -> do
+>             let view' = fmap H.toHtml view
+>             Happstack.ok $ Happstack.toResponse $
+>                 template $
+>                     form view' "/" $ do
+>                         releaseView view'
+>                         H.br
+>                         inputSubmit "Submit"
+>         (_, Just release) -> Happstack.ok $ Happstack.toResponse $
+>             template $ do
+>                 css
+>                 H.h1 "Release received"
+>                 H.p $ H.toHtml $ show release
+>
+> main :: IO ()
+> main = Happstack.simpleHTTP Happstack.nullConf site
+
+Utilities
+---------
+
+> template :: H.Html -> H.Html
+> template body = H.docTypeHtml $ do
+>     H.head $ do
+>         H.title "digestive-functors tutorial"
+>         css
+>     H.body body
+> css :: H.Html
+> css = H.style ! A.type_ "text/css" $ do
+>     "label {width: 130px; float: left; clear: both}"
+>     "ul.digestive-functors-error-list {"
+>     "    color: red;"
+>     "    list-style-type: none;"
+>     "    padding-left: 0px;"
+>     "}"
+    </textarea>
+  </form>
+
+  <script>
+    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "haskell-literate"});
+  </script>
+
+</article>

From 07bcf88d8606b6aa75951862abe504fcf83f64b0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Dec 2015 09:32:54 +0100
Subject: [PATCH 2525/4742] [haskell-literate mode] Integrate

Issue #3730
---
 doc/compress.html                         |  1 +
 mode/haskell-literate/haskell-literate.js | 27 ++++++++++++++---------
 mode/haskell-literate/index.html          |  6 +++++
 mode/index.html                           |  2 +-
 mode/meta.js                              |  1 +
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 1f1d0f0764..2537978290 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -149,6 +149,7 @@ <h2>Script compression helper</h2>
           <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/haskell-literate/haskell-literate.js">haskell-literate.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>
           <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option>
diff --git a/mode/haskell-literate/haskell-literate.js b/mode/haskell-literate/haskell-literate.js
index f50d2fb100..f51e96b604 100644
--- a/mode/haskell-literate/haskell-literate.js
+++ b/mode/haskell-literate/haskell-literate.js
@@ -9,30 +9,35 @@
   else // Plain browser env
     mod(CodeMirror)
 })(function (CodeMirror) {
-  CodeMirror.defineMode("haskell-literate", function (config) {
-    var haskellMode = CodeMirror.getMode(config, "haskell")
+  "use strict"
+
+  CodeMirror.defineMode("haskell-literate", function (config, parserConfig) {
+    var baseMode = CodeMirror.getMode(config, (parserConfig && parserConfig.base) || "haskell")
+
     return {
       startState: function () {
         return {
-          haskellCode: false,
-          haskellState: CodeMirror.startState(haskellMode)
+          inCode: false,
+          baseState: CodeMirror.startState(baseMode)
         }
       },
       token: function (stream, state) {
-        if ((stream.sol() && stream.next() == '>') || state.haskellCode) {
-          state.haskellCode = true
-          return haskellMode.token(stream, state.haskellState)
+        if (stream.sol()) {
+          if (state.inCode = stream.eat(">"))
+            return "meta"
+        }
+        if (state.inCode) {
+          return baseMode.token(stream, state.baseState)
         } else {
           stream.skipToEnd()
           return "comment"
         }
       },
-      blankLine: function (state) {
-        state.haskellCode = false
-      },
       innerMode: function (state) {
-        return {state: state.haskellState, mode: haskellMode};
+        return state.inCode ? {state: state.baseState, mode: baseMode} : null
       }
     }
   })
+
+  CodeMirror.defineMIME("text/x-literate-haskell", "haskell-literate")
 })
diff --git a/mode/haskell-literate/index.html b/mode/haskell-literate/index.html
index 051724776b..8c9bc60d15 100644
--- a/mode/haskell-literate/index.html
+++ b/mode/haskell-literate/index.html
@@ -269,6 +269,12 @@ <h2>Haskell literate mode</h2>
     </textarea>
   </form>
 
+  <p><strong>MIME types
+  defined:</strong> <code>text/x-literate-haskell</code>.</p>
+
+  <p>Parser configuration parameters recognized: <code>base</code> to
+  set the base mode (defaults to <code>"haskell"</code>).</p>
+
   <script>
     var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "haskell-literate"});
   </script>
diff --git a/mode/index.html b/mode/index.html
index 072b89bdaa..2a159ec53f 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -68,7 +68,7 @@ <h2>Language modes</h2>
       <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="haskell/index.html">Haskell</a> (<a href="haskell-literate/index.html">Literate</a>)</li>
       <li><a href="haxe/index.html">Haxe</a></li>
       <li><a href="htmlembedded/index.html">HTML embedded</a> (JSP, ASP.NET)</li>
       <li><a href="htmlmixed/index.html">HTML mixed-mode</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 69e2a3ef69..e4b97360c3 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -56,6 +56,7 @@
     {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]},
     {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
     {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
+    {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
     {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
     {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
     {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},

From b3f9487046e37facd64196380ebdd8639efc57b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Dec 2015 13:33:29 +0100
Subject: [PATCH 2526/4742] [jsx mode] Add

Closes #3742
Closes #3744
---
 doc/compress.html             |  2 +-
 mode/index.html               |  2 +-
 mode/javascript/javascript.js | 16 +++++--
 mode/jsx/index.html           | 89 +++++++++++++++++++++++++++++++++++
 mode/jsx/jsx.js               | 85 +++++++++++++++++++++++++++++++++
 mode/jsx/test.js              | 35 ++++++++++++++
 mode/meta.js                  |  1 +
 mode/xml/xml.js               | 25 ++++++----
 test/index.html               |  2 +
 9 files changed, 243 insertions(+), 14 deletions(-)
 create mode 100644 mode/jsx/index.html
 create mode 100644 mode/jsx/jsx.js
 create mode 100644 mode/jsx/test.js

diff --git a/doc/compress.html b/doc/compress.html
index 2537978290..a79b3097a3 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -159,7 +159,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
           <option value="http://codemirror.net/mode/julia/julia.js">julia.js</option>
-          <option value="http://codemirror.net/mode/livescript/livescript.js">livescript.js</option>
+          <option value="http://codemirror.net/mode/jsx/jsx.js">jsx.js</option>
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
           <option value="http://codemirror.net/mode/mathematica/mathematica.js">mathematica.js</option>
diff --git a/mode/index.html b/mode/index.html
index 2a159ec53f..a6c293ec28 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -76,7 +76,7 @@ <h2>Language modes</h2>
       <li><a href="idl/index.html">IDL</a></li>
       <li><a href="clike/index.html">Java</a></li>
       <li><a href="jade/index.html">Jade</a></li>
-      <li><a href="javascript/index.html">JavaScript</a></li>
+      <li><a href="javascript/index.html">JavaScript</a> (<a href="jsx/index.html">JSX</a>)</li>
       <li><a href="jinja2/index.html">Jinja2</a></li>
       <li><a href="julia/index.html">Julia</a></li>
       <li><a href="kotlin/index.html">Kotlin</a></li>
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d4ae668794..c851547775 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -13,6 +13,11 @@
 })(function(CodeMirror) {
 "use strict";
 
+function expressionAllowed(stream, state, backUp) {
+  return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:])$/.test(state.lastType) ||
+    (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
+}
+
 CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var statementIndent = parserConfig.statementIndent;
@@ -126,8 +131,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (stream.eat("/")) {
         stream.skipToEnd();
         return ret("comment", "comment");
-      } else if (/^(?:operator|sof|keyword c|case|new|[\[{}\(,;:])$/.test(state.lastType) ||
-                 (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - 1)))) {
+      } else if (expressionAllowed(stream, state, 1)) {
         readRegexp(stream);
         stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
         return ret("regexp", "string-2");
@@ -711,7 +715,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     helperType: jsonMode ? "json" : "javascript",
     jsonldMode: jsonldMode,
-    jsonMode: jsonMode
+    jsonMode: jsonMode,
+
+    expressionAllowed: expressionAllowed,
+    skipExpression: function(state) {
+      var top = state.cc[state.cc.length - 1]
+      if (top == expression || top == expressionNoComma) state.cc.pop()
+    }
   };
 });
 
diff --git a/mode/jsx/index.html b/mode/jsx/index.html
new file mode 100644
index 0000000000..cb51edb364
--- /dev/null
+++ b/mode/jsx/index.html
@@ -0,0 +1,89 @@
+<!doctype html>
+
+<title>CodeMirror: JSX 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="../javascript/javascript.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="jsx.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="#">JSX</a>
+  </ul>
+</div>
+
+<article>
+<h2>JSX mode</h2>
+
+<div><textarea id="code" name="code">// Code snippets from http://facebook.github.io/react/docs/jsx-in-depth.html
+
+// Rendering HTML tags
+var myDivElement = <div className="foo" />;
+ReactDOM.render(myDivElement, document.getElementById('example'));
+
+// Rendering React components
+var MyComponent = React.createClass({/*...*/});
+var myElement = <MyComponent someProperty={true} />;
+ReactDOM.render(myElement, document.getElementById('example'));
+
+// Namespaced components
+var Form = MyFormComponent;
+
+var App = (
+  <Form>
+    <Form.Row>
+      <Form.Label />
+      <Form.Input />
+    </Form.Row>
+  </Form>
+);
+
+// Attribute JavaScript expressions
+var person = <Person name={window.isLoggedIn ? window.name : ''} />;
+
+// Boolean attributes
+<input type="button" disabled />;
+<input type="button" disabled={true} />;
+
+// Child JavaScript expressions
+var content = <Container>{window.isLoggedIn ? <Nav /> : <Login />}</Container>;
+
+// Comments
+var content = (
+  <Nav>
+    {/* child comment, put {} around */}
+    <Person
+      /* multi
+         line
+         comment */
+      name={window.isLoggedIn ? window.name : ''} // end of line comment
+    />
+  </Nav>
+);
+</textarea></div>
+
+<script>
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+  lineNumbers: true,
+  mode: "jsx"
+})
+</script>
+
+<p>JSX Mode for <a href="http://facebook.github.io/react">React</a>'s
+JavaScript syntax extension.</p>
+
+<p><strong>MIME types defined:</strong> <code>text/jsx</code>.</p>
+
+</article>
diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
new file mode 100644
index 0000000000..c3d227a882
--- /dev/null
+++ b/mode/jsx/jsx.js
@@ -0,0 +1,85 @@
+// 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("../xml/xml"), require("../javascript/javascript"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+
+  function copyContext(context) {
+    return {state: CodeMirror.copyState(context.mode, context.state),
+            mode: context.mode,
+            depth: context.depth,
+            prev: context.prev && copyContext(context.prev)}
+  }
+
+  CodeMirror.defineMode("jsx", function(config) {
+    var xmlMode = CodeMirror.getMode(config, "xml")
+    var jsMode = CodeMirror.getMode(config, "javascript")
+
+    return {
+      startState: function() {
+        return {context: {state: CodeMirror.startState(jsMode), mode: jsMode}}
+      },
+
+      copyState: function(state) {
+        return {context: copyContext(state.context)}
+      },
+
+      token: function(stream, state) {
+        var cx = state.context
+        if (cx.mode == xmlMode) {
+          if (stream.peek() == "{") {
+            xmlMode.skipAttribute(cx.state)
+            state.context = {state: CodeMirror.startState(jsMode, xmlMode.indent(cx.state, "")),
+                             mode: jsMode,
+                             depth: 1,
+                             prev: state.context}
+            return jsMode.token(stream, state.context.state)
+          } else { // FIXME skip attribute
+            var style = xmlMode.token(stream, cx.state), cur, brace
+            if (/\btag\b/.test(style) && !cx.state.context && /^\/?>$/.test(stream.current()))
+              state.context = state.context.prev
+            else if (!style && (brace = (cur = stream.current()).indexOf("{")) > -1)
+              stream.backUp(cur.length - brace)
+            return style
+          }
+        } else { // jsMode
+          if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
+            jsMode.skipExpression(cx.state)
+            state.context = {state: CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
+                             mode: xmlMode,
+                             prev: state.context}
+            return xmlMode.token(stream, state.context.state)
+          } else {
+            var style = jsMode.token(stream, cx.state)
+            if (!style && cx.depth != null) {
+              var cur = stream.current()
+              if (cur == "{") {
+                cx.depth++
+              } else if (cur == "}") {
+                if (--cx.depth == 0) state.context = state.context.prev
+              }
+            }
+            return style
+          }
+        }
+      },
+
+      indent: function(state, textAfter, fullLine) {
+        return state.context.mode.indent(state.context.state, textAfter, fullLine)
+      },
+
+      innerMode: function(state) {
+        return state.context[state.context.length - 1]
+      }
+    }
+  }, "xml", "javascript")
+
+  CodeMirror.defineMIME("text/jsx", "jsx")
+})
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
new file mode 100644
index 0000000000..63fafb27c1
--- /dev/null
+++ b/mode/jsx/test.js
@@ -0,0 +1,35 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "jsx")
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)) }
+
+  MT("selfclose",
+     "[keyword var] [def x] [operator =] [bracket&tag <] [tag foo] [bracket&tag />] [operator +] [number 1];")
+
+  MT("openclose",
+     "([bracket&tag <][tag foo][bracket&tag >]hello [atom &amp;][bracket&tag </][tag foo][bracket&tag >][operator ++])")
+
+  MT("attr",
+     "([bracket&tag <][tag foo] [attribute abc]=[string 'value'][bracket&tag >]hello [atom &amp;][bracket&tag </][tag foo][bracket&tag >][operator ++])")
+
+  MT("braced_attr",
+     "([bracket&tag <][tag foo] [attribute abc]={[number 10]}[bracket&tag >]hello [atom &amp;][bracket&tag </][tag foo][bracket&tag >][operator ++])")
+
+  MT("braced_text",
+     "([bracket&tag <][tag foo][bracket&tag >]hello {[number 10]} [atom &amp;][bracket&tag </][tag foo][bracket&tag >][operator ++])")
+
+  MT("nested_tag",
+     "([bracket&tag <][tag foo][bracket&tag ><][tag bar][bracket&tag ></][tag bar][bracket&tag ></][tag foo][bracket&tag >][operator ++])")
+
+  MT("nested_jsx",
+     "[keyword return] (",
+     "  [bracket&tag <][tag foo][bracket&tag >]",
+     "    say {[number 1] [operator +] [bracket&tag <][tag bar] [attribute attr]={[number 10]}[bracket&tag />]}!",
+     "  [bracket&tag </][tag foo][bracket&tag >][operator ++]",
+     ")")
+
+  MT("preserve_js_context",
+     "[variable x] [operator =] [string-2 `quasi${][bracket&tag <][tag foo][bracket&tag />][string-2 }quoted`]")
+})()
diff --git a/mode/meta.js b/mode/meta.js
index e4b97360c3..49520717fd 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -70,6 +70,7 @@
      mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
     {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
     {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
+    {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
     {name: "Jinja2", mime: "null", mode: "jinja2"},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
     {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 5ad21720fb..92808e1478 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -297,12 +297,14 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   }
 
   return {
-    startState: function() {
-      return {tokenize: inText,
-              state: baseState,
-              indented: 0,
-              tagName: null, tagStart: null,
-              context: null};
+    startState: function(baseIndent) {
+      var state = {tokenize: inText,
+                   state: baseState,
+                   indented: baseIndent || 0,
+                   tagName: null, tagStart: null,
+                   context: null}
+      if (baseIndent != null) state.baseIndent = baseIndent
+      return state
     },
 
     token: function(stream, state) {
@@ -362,10 +364,10 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
             break;
         }
       }
-      while (context && !context.startOfLine)
+      while (context && context.prev && !context.startOfLine)
         context = context.prev;
       if (context) return context.indent + indentUnit;
-      else return 0;
+      else return state.baseIndent || 0;
     },
 
     electricInput: /<\/[\s\w:]+>$/,
@@ -373,7 +375,12 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     blockCommentEnd: "-->",
 
     configuration: parserConfig.htmlMode ? "html" : "xml",
-    helperType: parserConfig.htmlMode ? "html" : "xml"
+    helperType: parserConfig.htmlMode ? "html" : "xml",
+
+    skipAttribute: function(state) {
+      if (state.state == attrValueState)
+        state.state = attrState
+    }
   };
 });
 
diff --git a/test/index.html b/test/index.html
index b0b1fa976b..3e227a061d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -23,6 +23,7 @@
 <script src="../mode/haml/haml.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/jsx/jsx.js"></script>
 <script src="../mode/markdown/markdown.js"></script>
 <script src="../mode/php/php.js"></script>
 <script src="../mode/ruby/ruby.js"></script>
@@ -107,6 +108,7 @@ <h2>Test Suite</h2>
     <script src="../mode/gfm/test.js"></script>
     <script src="../mode/haml/test.js"></script>
     <script src="../mode/javascript/test.js"></script>
+    <script src="../mode/jsx/test.js"></script>
     <script src="../mode/markdown/test.js"></script>
     <script src="../mode/php/test.js"></script>
     <script src="../mode/ruby/test.js"></script>

From b42563cadcfb6a490732090757dae38569ba6068 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Dec 2015 22:16:37 +0100
Subject: [PATCH 2527/4742] [jsx mode] Support JS comments

Issue #3745
---
 mode/jsx/jsx.js  | 43 +++++++++++++++++++++++++++----------------
 mode/jsx/test.js |  9 +++++++++
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index c3d227a882..ebae784455 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -11,11 +11,15 @@
 })(function(CodeMirror) {
   "use strict"
 
+  function Context(state, mode, depth, prev) {
+    this.state = state; this.mode = mode; this.depth = depth; this.prev = prev
+  }
+
   function copyContext(context) {
-    return {state: CodeMirror.copyState(context.mode, context.state),
-            mode: context.mode,
-            depth: context.depth,
-            prev: context.prev && copyContext(context.prev)}
+    return new Context(CodeMirror.copyState(context.mode, context.state),
+                       context.mode,
+                       context.depth,
+                       context.prev && copyContext(context.prev))
   }
 
   CodeMirror.defineMode("jsx", function(config) {
@@ -24,7 +28,7 @@
 
     return {
       startState: function() {
-        return {context: {state: CodeMirror.startState(jsMode), mode: jsMode}}
+        return {context: new Context(CodeMirror.startState(jsMode), jsMode)}
       },
 
       copyState: function(state) {
@@ -34,27 +38,34 @@
       token: function(stream, state) {
         var cx = state.context
         if (cx.mode == xmlMode) {
-          if (stream.peek() == "{") {
+          if (cx.depth) { // Inside a JS /* */ comment
+            if (stream.match(/^.*?\*\//)) cx.depth = 0
+            else stream.skipToEnd()
+            return "comment"
+          } else if (stream.peek() == "{") {
             xmlMode.skipAttribute(cx.state)
-            state.context = {state: CodeMirror.startState(jsMode, xmlMode.indent(cx.state, "")),
-                             mode: jsMode,
-                             depth: 1,
-                             prev: state.context}
+            state.context = new Context(CodeMirror.startState(jsMode, xmlMode.indent(cx.state, "")),
+                                        jsMode, 1, state.context)
             return jsMode.token(stream, state.context.state)
+          } else if (stream.match("//")) {
+            stream.skipToEnd()
+            return "comment"
+          } else if (stream.match("/*")) {
+            cx.depth = 1
+            return this.token(stream, state)
           } else { // FIXME skip attribute
-            var style = xmlMode.token(stream, cx.state), cur, brace
+            var style = xmlMode.token(stream, cx.state), cur, stop
             if (/\btag\b/.test(style) && !cx.state.context && /^\/?>$/.test(stream.current()))
               state.context = state.context.prev
-            else if (!style && (brace = (cur = stream.current()).indexOf("{")) > -1)
-              stream.backUp(cur.length - brace)
+            else if (!style && (stop = (cur = stream.current()).search(/\{|\/[*\/]/)) > -1)
+              stream.backUp(cur.length - stop)
             return style
           }
         } else { // jsMode
           if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
             jsMode.skipExpression(cx.state)
-            state.context = {state: CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
-                             mode: xmlMode,
-                             prev: state.context}
+            state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
+                                        xmlMode, 0, state.context)
             return xmlMode.token(stream, state.context.state)
           } else {
             var style = jsMode.token(stream, cx.state)
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index 63fafb27c1..e45f67cdcd 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -32,4 +32,13 @@
 
   MT("preserve_js_context",
      "[variable x] [operator =] [string-2 `quasi${][bracket&tag <][tag foo][bracket&tag />][string-2 }quoted`]")
+
+  MT("line_comment",
+     "([bracket&tag <][tag foo][bracket&tag >] [comment // hello]",
+     "  [bracket&tag </][tag foo][bracket&tag >][operator ++])")
+
+  MT("block_comment",
+     "([bracket&tag <][tag foo][bracket&tag >] [comment /* hello]",
+     "[comment     line 2]",
+     "[comment     line 3 */] [bracket&tag </][tag foo][bracket&tag >][operator ++])")
 })()

From e8ad6773ba672017a50af029b260eafbc93c5f46 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Dec 2015 22:30:28 +0100
Subject: [PATCH 2528/4742] [xml mode] Allow more direct access to
 configuration

Use it to enable value-less attributes in the JSX mode

Issue #3745
---
 mode/jsx/jsx.js  |   2 +-
 mode/jsx/test.js |   4 ++
 mode/xml/xml.js  | 124 ++++++++++++++++++++++++-----------------------
 3 files changed, 68 insertions(+), 62 deletions(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index ebae784455..d38d16c898 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -23,7 +23,7 @@
   }
 
   CodeMirror.defineMode("jsx", function(config) {
-    var xmlMode = CodeMirror.getMode(config, "xml")
+    var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true})
     var jsMode = CodeMirror.getMode(config, "javascript")
 
     return {
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index e45f67cdcd..c0032a4ce0 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -41,4 +41,8 @@
      "([bracket&tag <][tag foo][bracket&tag >] [comment /* hello]",
      "[comment     line 2]",
      "[comment     line 3 */] [bracket&tag </][tag foo][bracket&tag >][operator ++])")
+
+  MT("missing_attr",
+     "([bracket&tag <][tag foo] [attribute selected][bracket&tag />][operator ++])")
+     
 })()
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 92808e1478..014f7d846d 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -11,54 +11,56 @@
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode("xml", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
-  var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag;
-  if (multilineTagIndentPastTag == null) multilineTagIndentPastTag = true;
+var htmlConfig = {
+  autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
+                    'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
+                    'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
+                    'track': true, 'wbr': true, 'menuitem': true},
+  implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
+                     'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
+                     'th': true, 'tr': true},
+  contextGrabbers: {
+    'dd': {'dd': true, 'dt': true},
+    'dt': {'dd': true, 'dt': true},
+    'li': {'li': true},
+    'option': {'option': true, 'optgroup': true},
+    'optgroup': {'optgroup': true},
+    'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
+          'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
+          'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
+          'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
+          'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
+    'rp': {'rp': true, 'rt': true},
+    'rt': {'rp': true, 'rt': true},
+    'tbody': {'tbody': true, 'tfoot': true},
+    'td': {'td': true, 'th': true},
+    'tfoot': {'tbody': true},
+    'th': {'td': true, 'th': true},
+    'thead': {'tbody': true, 'tfoot': true},
+    'tr': {'tr': true}
+  },
+  doNotIndent: {"pre": true},
+  allowUnquoted: true,
+  allowMissing: true,
+  caseFold: true
+}
 
-  var Kludges = parserConfig.htmlMode ? {
-    autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
-                      'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
-                      'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true, 'menuitem': true},
-    implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
-                       'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
-                       'th': true, 'tr': true},
-    contextGrabbers: {
-      'dd': {'dd': true, 'dt': true},
-      'dt': {'dd': true, 'dt': true},
-      'li': {'li': true},
-      'option': {'option': true, 'optgroup': true},
-      'optgroup': {'optgroup': true},
-      'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
-            'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
-            'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
-            'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
-            'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
-      'rp': {'rp': true, 'rt': true},
-      'rt': {'rp': true, 'rt': true},
-      'tbody': {'tbody': true, 'tfoot': true},
-      'td': {'td': true, 'th': true},
-      'tfoot': {'tbody': true},
-      'th': {'td': true, 'th': true},
-      'thead': {'tbody': true, 'tfoot': true},
-      'tr': {'tr': true}
-    },
-    doNotIndent: {"pre": true},
-    allowUnquoted: true,
-    allowMissing: true,
-    caseFold: true
-  } : {
-    autoSelfClosers: {},
-    implicitlyClosed: {},
-    contextGrabbers: {},
-    doNotIndent: {},
-    allowUnquoted: false,
-    allowMissing: false,
-    caseFold: false
-  };
-  var alignCDATA = parserConfig.alignCDATA;
+var xmlConfig = {
+  autoSelfClosers: {},
+  implicitlyClosed: {},
+  contextGrabbers: {},
+  doNotIndent: {},
+  allowUnquoted: false,
+  allowMissing: false,
+  caseFold: false
+}
+
+CodeMirror.defineMode("xml", function(editorConf, config_) {
+  var indentUnit = editorConf.indentUnit
+  var config = {}
+  var defaults = config_.htmlMode ? htmlConfig : xmlConfig
+  for (var prop in defaults) config[prop] = defaults[prop]
+  for (var prop in config_) config[prop] = config_[prop]
 
   // Return variables for tokenizers
   var type, setStyle;
@@ -188,7 +190,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     this.tagName = tagName;
     this.indent = state.indented;
     this.startOfLine = startOfLine;
-    if (Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
+    if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
       this.noIndent = true;
   }
   function popContext(state) {
@@ -201,8 +203,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         return;
       }
       parentTagName = state.context.tagName;
-      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
+      if (!config.contextGrabbers.hasOwnProperty(parentTagName) ||
+          !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
         return;
       }
       popContext(state);
@@ -233,7 +235,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     if (type == "word") {
       var tagName = stream.current();
       if (state.context && state.context.tagName != tagName &&
-          Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName))
+          config.implicitlyClosed.hasOwnProperty(state.context.tagName))
         popContext(state);
       if (state.context && state.context.tagName == tagName) {
         setStyle = "tag";
@@ -269,7 +271,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       var tagName = state.tagName, tagStart = state.tagStart;
       state.tagName = state.tagStart = null;
       if (type == "selfcloseTag" ||
-          Kludges.autoSelfClosers.hasOwnProperty(tagName)) {
+          config.autoSelfClosers.hasOwnProperty(tagName)) {
         maybePopContext(state, tagName);
       } else {
         maybePopContext(state, tagName);
@@ -282,12 +284,12 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   }
   function attrEqState(type, stream, state) {
     if (type == "equals") return attrValueState;
-    if (!Kludges.allowMissing) setStyle = "error";
+    if (!config.allowMissing) setStyle = "error";
     return attrState(type, stream, state);
   }
   function attrValueState(type, stream, state) {
     if (type == "string") return attrContinuedState;
-    if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return attrState;}
+    if (type == "word" && config.allowUnquoted) {setStyle = "string"; return attrState;}
     setStyle = "error";
     return attrState(type, stream, state);
   }
@@ -337,19 +339,19 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
       // Indent the starts of attribute names.
       if (state.tagName) {
-        if (multilineTagIndentPastTag)
+        if (config.multilineTagIndentPastTag !== false)
           return state.tagStart + state.tagName.length + 2;
         else
-          return state.tagStart + indentUnit * multilineTagIndentFactor;
+          return state.tagStart + indentUnit * (config.multilineTagIndentFactor || 1);
       }
-      if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
+      if (config.alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
       var tagAfter = textAfter && /^<(\/)?([\w_:\.-]*)/.exec(textAfter);
       if (tagAfter && tagAfter[1]) { // Closing tag spotted
         while (context) {
           if (context.tagName == tagAfter[2]) {
             context = context.prev;
             break;
-          } else if (Kludges.implicitlyClosed.hasOwnProperty(context.tagName)) {
+          } else if (config.implicitlyClosed.hasOwnProperty(context.tagName)) {
             context = context.prev;
           } else {
             break;
@@ -357,7 +359,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         }
       } else if (tagAfter) { // Opening tag spotted
         while (context) {
-          var grabbers = Kludges.contextGrabbers[context.tagName];
+          var grabbers = config.contextGrabbers[context.tagName];
           if (grabbers && grabbers.hasOwnProperty(tagAfter[2]))
             context = context.prev;
           else
@@ -374,8 +376,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     blockCommentStart: "<!--",
     blockCommentEnd: "-->",
 
-    configuration: parserConfig.htmlMode ? "html" : "xml",
-    helperType: parserConfig.htmlMode ? "html" : "xml",
+    configuration: config.htmlMode ? "html" : "xml",
+    helperType: config.htmlMode ? "html" : "xml",
 
     skipAttribute: function(state) {
       if (state.state == attrValueState)

From e3dc9731678b2f4b33b5faf9ffb90332d3c97c96 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Dec 2015 22:49:02 +0100
Subject: [PATCH 2529/4742] [jsx mode] Improve indentation of nested JavaScript

Kludge the xml indentation to ignore inside-tag positions, and
properly set start indentation state in javascript mode.

Issue #3745
---
 mode/javascript/javascript.js | 2 +-
 mode/jsx/jsx.js               | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c851547775..ee6e4016df 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -659,7 +659,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,
         context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
+        indented: basecolumn || 0
       };
       if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
         state.globalVars = parserConfig.globalVars;
diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index d38d16c898..ccf2ee742f 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -44,8 +44,11 @@
             return "comment"
           } else if (stream.peek() == "{") {
             xmlMode.skipAttribute(cx.state)
+            var tagName = cx.state.tagName
+            cx.state.tagName = null
             state.context = new Context(CodeMirror.startState(jsMode, xmlMode.indent(cx.state, "")),
                                         jsMode, 1, state.context)
+            cx.state.tagName = tagName
             return jsMode.token(stream, state.context.state)
           } else if (stream.match("//")) {
             stream.skipToEnd()
@@ -87,7 +90,7 @@
       },
 
       innerMode: function(state) {
-        return state.context[state.context.length - 1]
+        return state.context
       }
     }
   }, "xml", "javascript")

From d103ebfc453193406d3d01c8fbf638cadd00793d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Dec 2015 22:54:28 +0100
Subject: [PATCH 2530/4742] [jsx mode] Add test case for spread syntax

---
 mode/jsx/test.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index c0032a4ce0..1d2fe4984b 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -44,5 +44,14 @@
 
   MT("missing_attr",
      "([bracket&tag <][tag foo] [attribute selected][bracket&tag />][operator ++])")
-     
+
+  MT("indent_js",
+     "([bracket&tag <][tag foo][bracket&tag >]",
+     "    [bracket&tag <][tag bar] [attribute baz]={[keyword function]() {",
+     "      [keyword return] [number 10]",
+     "    }}[bracket&tag />]",
+     "  [bracket&tag </][tag foo][bracket&tag >])")
+
+  MT("spread",
+     "([bracket&tag <][tag foo] [attribute bar]={[meta ...][variable baz] [operator /][number 2]}[bracket&tag />])")
 })()

From bec6669991a226de6c8b8f6046f2296ac346b68c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 30 Dec 2015 11:52:33 +0100
Subject: [PATCH 2531/4742] [jsx mode] Only recognize comments inside of tags

Issue #3745
---
 mode/jsx/jsx.js  | 35 ++++++++++++++++++++++-------------
 mode/jsx/test.js | 17 +++++++++++++----
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index ccf2ee742f..6b7b6c2487 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -11,6 +11,9 @@
 })(function(CodeMirror) {
   "use strict"
 
+  // Depth means the amount of open braces in JS context, in XML
+  // context 0 means not in tag, 1 means in tag, and 2 means in tag
+  // and js block comment.
   function Context(state, mode, depth, prev) {
     this.state = state; this.mode = mode; this.depth = depth; this.prev = prev
   }
@@ -23,7 +26,7 @@
   }
 
   CodeMirror.defineMode("jsx", function(config) {
-    var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true})
+    var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true, multilineTagIndentPastTag: false})
     var jsMode = CodeMirror.getMode(config, "javascript")
 
     return {
@@ -38,8 +41,8 @@
       token: function(stream, state) {
         var cx = state.context
         if (cx.mode == xmlMode) {
-          if (cx.depth) { // Inside a JS /* */ comment
-            if (stream.match(/^.*?\*\//)) cx.depth = 0
+          if (cx.depth == 2) { // Inside a JS /* */ comment
+            if (stream.match(/^.*?\*\//)) cx.depth = 1
             else stream.skipToEnd()
             return "comment"
           } else if (stream.peek() == "{") {
@@ -47,21 +50,27 @@
             var tagName = cx.state.tagName
             cx.state.tagName = null
             state.context = new Context(CodeMirror.startState(jsMode, xmlMode.indent(cx.state, "")),
-                                        jsMode, 1, state.context)
+                                        jsMode, 0, state.context)
             cx.state.tagName = tagName
-            return jsMode.token(stream, state.context.state)
-          } else if (stream.match("//")) {
+            return this.token(stream, state)
+          } else if (cx.depth == 1 && stream.match("//")) {
             stream.skipToEnd()
             return "comment"
-          } else if (stream.match("/*")) {
-            cx.depth = 1
+          } else if (cx.depth == 1 && stream.match("/*")) {
+            cx.depth = 2
             return this.token(stream, state)
           } else { // FIXME skip attribute
-            var style = xmlMode.token(stream, cx.state), cur, stop
-            if (/\btag\b/.test(style) && !cx.state.context && /^\/?>$/.test(stream.current()))
-              state.context = state.context.prev
-            else if (!style && (stop = (cur = stream.current()).search(/\{|\/[*\/]/)) > -1)
+            var style = xmlMode.token(stream, cx.state), cur = stream.current(), stop
+            if (/\btag\b/.test(style)) {
+              if (/>$/.test(cur)) {
+                if (cx.state.context) cx.depth = 0
+                else state.context = state.context.prev
+              } else if (/^</.test(cur)) {
+                cx.depth = 1
+              }
+            } else if (!style && (stop = cur.indexOf("{")) > -1) {
               stream.backUp(cur.length - stop)
+            }
             return style
           }
         } else { // jsMode
@@ -69,7 +78,7 @@
             jsMode.skipExpression(cx.state)
             state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
                                         xmlMode, 0, state.context)
-            return xmlMode.token(stream, state.context.state)
+            return this.token(stream, state)
           } else {
             var style = jsMode.token(stream, cx.state)
             if (!style && cx.depth != null) {
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index 1d2fe4984b..ee601651d8 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -34,13 +34,22 @@
      "[variable x] [operator =] [string-2 `quasi${][bracket&tag <][tag foo][bracket&tag />][string-2 }quoted`]")
 
   MT("line_comment",
-     "([bracket&tag <][tag foo][bracket&tag >] [comment // hello]",
+     "([bracket&tag <][tag foo] [comment // hello]",
+     "   [bracket&tag ></][tag foo][bracket&tag >][operator ++])")
+
+  MT("line_comment_not_in_tag",
+     "([bracket&tag <][tag foo][bracket&tag >] // hello",
      "  [bracket&tag </][tag foo][bracket&tag >][operator ++])")
 
   MT("block_comment",
-     "([bracket&tag <][tag foo][bracket&tag >] [comment /* hello]",
-     "[comment     line 2]",
-     "[comment     line 3 */] [bracket&tag </][tag foo][bracket&tag >][operator ++])")
+     "([bracket&tag <][tag foo] [comment /* hello]",
+     "[comment    line 2]",
+     "[comment    line 3 */] [bracket&tag ></][tag foo][bracket&tag >][operator ++])")
+
+  MT("block_comment_not_in_tag",
+     "([bracket&tag <][tag foo][bracket&tag >]/* hello",
+     "    line 2",
+     "    line 3 */ [bracket&tag </][tag foo][bracket&tag >][operator ++])")
 
   MT("missing_attr",
      "([bracket&tag <][tag foo] [attribute selected][bracket&tag />][operator ++])")

From 8870302a3f2efec00e68d32f6a9d5af959210241 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 30 Dec 2015 12:02:21 +0100
Subject: [PATCH 2532/4742] [jsx mode] Support tag attributes

Issue #3745
---
 mode/jsx/jsx.js  | 134 ++++++++++++++++++++++++++++-------------------
 mode/jsx/test.js |   3 ++
 2 files changed, 82 insertions(+), 55 deletions(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 6b7b6c2487..5f6afc1832 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -29,6 +29,84 @@
     var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true, multilineTagIndentPastTag: false})
     var jsMode = CodeMirror.getMode(config, "javascript")
 
+    function flatXMLIndent(state) {
+      var tagName = state.tagName
+      state.tagName = null
+      var result = xmlMode.indent(state, "")
+      state.tagName = tagName
+      return result
+    }
+
+    function token(stream, state) {
+      if (state.context.mode == xmlMode)
+        return xmlToken(stream, state, state.context)
+      else
+        return jsToken(stream, state, state.context)
+    }
+
+    function xmlToken(stream, state, cx) {
+      if (cx.depth == 2) { // Inside a JS /* */ comment
+        if (stream.match(/^.*?\*\//)) cx.depth = 1
+        else stream.skipToEnd()
+        return "comment"
+      }
+
+      if (stream.peek() == "{") {
+        xmlMode.skipAttribute(cx.state)
+        state.context = new Context(CodeMirror.startState(jsMode, flatXMLIndent(cx.state)),
+                                    jsMode, 0, state.context)
+        return token(stream, state)
+      }
+
+      if (cx.depth == 1) { // Inside of tag
+        if (stream.peek() == "<") { // Tag inside of tag
+          xmlMode.skipAttribute(cx.state)
+          state.context = new Context(CodeMirror.startState(xmlMode, flatXMLIndent(cx.state)),
+                                      xmlMode, 0, state.context)
+          return token(stream, state)
+        } else if (stream.match("//")) {
+          stream.skipToEnd()
+          return "comment"
+        } else if (stream.match("/*")) {
+          cx.depth = 2
+          return token(stream, state)
+        }
+      }
+
+      var style = xmlMode.token(stream, cx.state), cur = stream.current(), stop
+      if (/\btag\b/.test(style)) {
+        if (/>$/.test(cur)) {
+          if (cx.state.context) cx.depth = 0
+          else state.context = state.context.prev
+        } else if (/^</.test(cur)) {
+          cx.depth = 1
+        }
+      } else if (!style && (stop = cur.indexOf("{")) > -1) {
+        stream.backUp(cur.length - stop)
+      }
+      return style
+    }
+
+    function jsToken(stream, state, cx) {
+      if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
+        jsMode.skipExpression(cx.state)
+        state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
+                                    xmlMode, 0, state.context)
+        return token(stream, state)
+      }
+
+      var style = jsMode.token(stream, cx.state)
+      if (!style && cx.depth != null) {
+        var cur = stream.current()
+        if (cur == "{") {
+          cx.depth++
+        } else if (cur == "}") {
+          if (--cx.depth == 0) state.context = state.context.prev
+        }
+      }
+      return style
+    }
+
     return {
       startState: function() {
         return {context: new Context(CodeMirror.startState(jsMode), jsMode)}
@@ -38,61 +116,7 @@
         return {context: copyContext(state.context)}
       },
 
-      token: function(stream, state) {
-        var cx = state.context
-        if (cx.mode == xmlMode) {
-          if (cx.depth == 2) { // Inside a JS /* */ comment
-            if (stream.match(/^.*?\*\//)) cx.depth = 1
-            else stream.skipToEnd()
-            return "comment"
-          } else if (stream.peek() == "{") {
-            xmlMode.skipAttribute(cx.state)
-            var tagName = cx.state.tagName
-            cx.state.tagName = null
-            state.context = new Context(CodeMirror.startState(jsMode, xmlMode.indent(cx.state, "")),
-                                        jsMode, 0, state.context)
-            cx.state.tagName = tagName
-            return this.token(stream, state)
-          } else if (cx.depth == 1 && stream.match("//")) {
-            stream.skipToEnd()
-            return "comment"
-          } else if (cx.depth == 1 && stream.match("/*")) {
-            cx.depth = 2
-            return this.token(stream, state)
-          } else { // FIXME skip attribute
-            var style = xmlMode.token(stream, cx.state), cur = stream.current(), stop
-            if (/\btag\b/.test(style)) {
-              if (/>$/.test(cur)) {
-                if (cx.state.context) cx.depth = 0
-                else state.context = state.context.prev
-              } else if (/^</.test(cur)) {
-                cx.depth = 1
-              }
-            } else if (!style && (stop = cur.indexOf("{")) > -1) {
-              stream.backUp(cur.length - stop)
-            }
-            return style
-          }
-        } else { // jsMode
-          if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
-            jsMode.skipExpression(cx.state)
-            state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
-                                        xmlMode, 0, state.context)
-            return this.token(stream, state)
-          } else {
-            var style = jsMode.token(stream, cx.state)
-            if (!style && cx.depth != null) {
-              var cur = stream.current()
-              if (cur == "{") {
-                cx.depth++
-              } else if (cur == "}") {
-                if (--cx.depth == 0) state.context = state.context.prev
-              }
-            }
-            return style
-          }
-        }
-      },
+      token: token,
 
       indent: function(state, textAfter, fullLine) {
         return state.context.mode.indent(state.context.state, textAfter, fullLine)
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index ee601651d8..0ea9901784 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -63,4 +63,7 @@
 
   MT("spread",
      "([bracket&tag <][tag foo] [attribute bar]={[meta ...][variable baz] [operator /][number 2]}[bracket&tag />])")
+
+  MT("tag_attribute",
+     "([bracket&tag <][tag foo] [attribute bar]=[bracket&tag <][tag foo][bracket&tag />/>][operator ++])")
 })()

From 78aba6492cb31e1b3ab680af47896e1a0b8a2156 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 30 Dec 2015 12:09:05 +0100
Subject: [PATCH 2533/4742] [javascript mode] Allow expressions after fat arrow

Issue #3745
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index ee6e4016df..f4e7ed6daf 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -14,7 +14,7 @@
 "use strict";
 
 function expressionAllowed(stream, state, backUp) {
-  return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:])$/.test(state.lastType) ||
+  return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
     (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
 }
 

From 5c53fe7c7f97147650bac3f20c1518a7b5cdd16e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 30 Dec 2015 14:09:47 +0100
Subject: [PATCH 2534/4742] [nginx mode] Fix MIME declaration

Closes #3746
---
 mode/nginx/nginx.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/nginx/nginx.js b/mode/nginx/nginx.js
index 135b9cc7f8..00a3224922 100644
--- a/mode/nginx/nginx.js
+++ b/mode/nginx/nginx.js
@@ -173,6 +173,6 @@ CodeMirror.defineMode("nginx", function(config) {
   };
 });
 
-CodeMirror.defineMIME("text/nginx", "text/x-nginx-conf");
+CodeMirror.defineMIME("text/x-nginx-conf", "nginx");
 
 });

From 5f228475fd7059c3d712da96c441496fccd25081 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 4 Jan 2016 10:34:49 +0100
Subject: [PATCH 2535/4742] Signal touchstart event, signal mousedown even
 during touch

Issue #3736
---
 doc/manual.html   | 3 ++-
 lib/codemirror.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index a33b77aef4..5087df9061 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -653,7 +653,8 @@ <h2>Events</h2>
       should <em>not</em> try to change the state of the editor.</dd>
 
       <dt id="event_dom"><code><strong>"mousedown"</strong>,
-      <strong>"dblclick"</strong>, <strong>"contextmenu"</strong>, <strong>"keydown"</strong>, <strong>"keypress"</strong>,
+      <strong>"dblclick"</strong>, <strong>"touchstart"</strong>, <strong>"contextmenu"</strong>,
+      <strong>"keydown"</strong>, <strong>"keypress"</strong>,
       <strong>"keyup"</strong>, <strong>"cut"</strong>, <strong>"copy"</strong>, <strong>"paste"</strong>,
       <strong>"dragstart"</strong>, <strong>"dragenter"</strong>,
       <strong>"dragover"</strong>, <strong>"drop"</strong>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c4f5a0008f..55412ae72a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3435,7 +3435,7 @@
       return dx * dx + dy * dy > 20 * 20;
     }
     on(d.scroller, "touchstart", function(e) {
-      if (!isMouseLikeTouchEvent(e)) {
+      if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
         clearTimeout(touchFinished);
         var now = +new Date;
         d.activeTouch = {start: now, moved: false,
@@ -3564,7 +3564,7 @@
   // not interfere with, such as a scrollbar or widget.
   function onMouseDown(e) {
     var cm = this, display = cm.display;
-    if (display.activeTouch && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
+    if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return;
     display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {

From 0d73c4bf947efccfb43b534ca2f78c513f43cdb5 Mon Sep 17 00:00:00 2001
From: Devin Abbott <devinabbott@gmail.com>
Date: Wed, 30 Dec 2015 12:35:43 -0800
Subject: [PATCH 2536/4742] [javascript mode] Allow trailing comma in object
 destructure

Issue #3745
---
 mode/javascript/javascript.js | 1 +
 mode/javascript/test.js       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index f4e7ed6daf..fa5721d5d0 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -537,6 +537,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     if (type == "variable") cx.marked = "property";
     if (type == "spread") return cont(pattern);
+    if (type == "}") return pass();
     return cont(expect(":"), pattern, maybeAssign);
   }
   function maybeAssign(_type, value) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 252e064dcc..cb43d0894d 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -17,6 +17,10 @@
      "  [[[variable-2 c], [variable y] ]] [operator =] [variable-2 c];",
      "})();");
 
+  MT("destructure_trailing_comma",
+    "[keyword let] {[def a], [def b],} [operator =] [variable foo];",
+    "[keyword let] [def c];"); // Parser still in good state?
+
   MT("class_body",
      "[keyword class] [def Foo] {",
      "  [property constructor]() {}",

From 65950ad0acb3d3014077d9bfe0defc8bd468b11c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 4 Jan 2016 10:45:34 +0100
Subject: [PATCH 2537/4742] [jsx mode] Return empty token when switching inner
 modes

So that addModeClass sees the right mode for the token

Issue #3745
---
 mode/jsx/jsx.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 5f6afc1832..af0e26338a 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -55,7 +55,7 @@
         xmlMode.skipAttribute(cx.state)
         state.context = new Context(CodeMirror.startState(jsMode, flatXMLIndent(cx.state)),
                                     jsMode, 0, state.context)
-        return token(stream, state)
+        return null
       }
 
       if (cx.depth == 1) { // Inside of tag
@@ -63,7 +63,7 @@
           xmlMode.skipAttribute(cx.state)
           state.context = new Context(CodeMirror.startState(xmlMode, flatXMLIndent(cx.state)),
                                       xmlMode, 0, state.context)
-          return token(stream, state)
+          return null
         } else if (stream.match("//")) {
           stream.skipToEnd()
           return "comment"
@@ -92,7 +92,7 @@
         jsMode.skipExpression(cx.state)
         state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
                                     xmlMode, 0, state.context)
-        return token(stream, state)
+        return null
       }
 
       var style = jsMode.token(stream, cx.state)

From 8f2149c2d5861842883f078003d055546951aec4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 4 Jan 2016 11:03:46 +0100
Subject: [PATCH 2538/4742] Draw bookmarks next to a collapsed span

See https://discuss.codemirror.net/t/inserting-a-boomark-immediately-before-a-textmarker/590/1
---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 55412ae72a..aa5664a173 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7115,14 +7115,14 @@
         if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
           if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
 
+        if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
+          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
         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]);
       }
       if (pos >= len) break;
 

From f923adb268043880178ab17dcaeaeacaf5d5fdd5 Mon Sep 17 00:00:00 2001
From: Will Dean <will.dean@indcomp.co.uk>
Date: Fri, 1 Jan 2016 11:50:16 +0000
Subject: [PATCH 2539/4742] Various HTML cleanups

---
 demo/btree.html            | 4 +---
 demo/tern.html             | 4 ++--
 demo/xmlcomplete.html      | 4 ++--
 doc/internals.html         | 3 ++-
 doc/manual.html            | 4 ++--
 doc/releases.html          | 4 ++--
 mode/asn.1/index.html      | 3 +--
 mode/handlebars/index.html | 5 ++---
 mode/mumps/index.html      | 4 ++--
 mode/nginx/index.html      | 4 ++--
 mode/pig/index.html        | 4 +---
 mode/tiki/tiki.css         | 2 +-
 12 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/demo/btree.html b/demo/btree.html
index fc4997f4f5..ba07bc74f4 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: B-Tree visualization</title>
 <meta charset="utf-8"/>
@@ -26,9 +26,7 @@
 <article>
 <h2>B-Tree visualization</h2>
 <form><textarea id="code" name="code">type here, see a summary of the document b-tree below</textarea></form>
-      </div>
       <div style="display: inline-block; height: 402px; overflow-y: auto" id="output"></div>
-    </div>
 
     <script id="me">
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
diff --git a/demo/tern.html b/demo/tern.html
index b5194447df..b7b65608e6 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: Tern Demo</title>
 <meta charset="utf-8"/>
@@ -76,7 +76,7 @@ <h2>Tern Demo</h2>
 
 var randomStr = myMod.randomElt(myMod.strList);
 var randomInt = myMod.randomElt(myMod.intList);
-</textarea></p>
+</textarea></form>
 
 <p>Demonstrates integration of <a href="http://ternjs.net/">Tern</a>
 and CodeMirror. The following keys are bound:</p>
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index bd452e6f6e..043f0c429c 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: XML Autocomplete Demo</title>
 <meta charset="utf-8"/>
@@ -31,7 +31,7 @@ <h2>XML Autocomplete Demo</h2>
 <form><textarea id="code" name="code"><!-- write some xml below -->
 </textarea></form>
 
-    <p>Press <strong>ctrl-space</strong>, or type a '<' character to
+    <p>Press <strong>ctrl-space</strong>, or type a '&lt;' character to
     activate autocompletion. This demo defines a simple schema that
     guides completion. The schema can be customized—see
     the <a href="../doc/manual.html#addon_xml-hint">manual</a>.</p>
diff --git a/doc/internals.html b/doc/internals.html
index e1ed3e9913..079466f630 100644
--- a/doc/internals.html
+++ b/doc/internals.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: Internals</title>
 <meta charset="utf-8"/>
@@ -500,4 +500,5 @@ <h2>Keymaps</h2>
 is updated <em>during</em> composition. So we poll, whenever the
 editor is focused, to provide immediate updates of the display.</p>
 
+</section>
 </article>
diff --git a/doc/manual.html b/doc/manual.html
index 5087df9061..25e66ed69a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: User Manual</title>
 <meta charset="utf-8"/>
@@ -3351,7 +3351,7 @@ <h3 id="vimapi_extending">Extending VIM</h3>
       be set to a certain position after the operation finishes, it
       can return a cursor object.</dd>
 
-      <dt id="vimapi_defineActon"><strong><code>defineAction(name: string, fn: function(cm: CodeMirror, ?actionArgs: object))</strong></code></dt>
+      <dt id="vimapi_defineActon"><strong><code>defineAction(name: string, fn: function(cm: CodeMirror, ?actionArgs: object))</code></strong></dt>
       <dd>Defines an action command, similar to
       <strong><code>defineMotion</code></strong>. Action commands
       can have arbitrary behavior, making them more flexible than
diff --git a/doc/releases.html b/doc/releases.html
index 74a7d49057..6df8f04c65 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: Release History</title>
 <meta charset="utf-8"/>
@@ -408,7 +408,7 @@ <h2>Version 3.x</h2>
   <p class="rel">16-01-2014: <a href="http://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
 
   <ul class="rel-note">
-    <li>Auto-indenting a block will no longer add trailing whitespace to blank lines.</a>
+    <li>Auto-indenting a block will no longer add trailing whitespace to blank lines.</li>
     <li>Marking text has a new option <a href="manual.html#markText"><code>clearWhenEmpty</code></a> to control auto-removal.</li>
     <li>Several bugfixes in the handling of bidirectional text.</li>
     <li>The <a href="../mode/xml/index.html">XML</a> and <a href="../mode/css/index.html">CSS</a> modes were largely rewritten. <a href="../mode/css/less.html">LESS</a> support was added to the CSS mode.</li>
diff --git a/mode/asn.1/index.html b/mode/asn.1/index.html
index 8346f8e500..699fd4473d 100644
--- a/mode/asn.1/index.html
+++ b/mode/asn.1/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: ASN.1 mode</title>
 <meta charset="utf-8"/>
@@ -73,6 +73,5 @@ <h2>ASN.1 example</h2>
     <p>The development of this mode has been sponsored by <a href="http://www.ericsson.com/">Ericsson
     </a>.</p>
     <p>Coded by Asmelash Tsegay Gebretsadkan </p>
-    </article>
 </article>
 
diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
index 8786fe3ab4..4f82d60282 100644
--- a/mode/handlebars/index.html
+++ b/mode/handlebars/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: Handlebars mode</title>
 <meta charset="utf-8"/>
@@ -67,8 +67,7 @@ <h1>{{t 'article_list'}}</h1>
         mode: {name: "handlebars", base: "text/html"}
       });
     </script>
-    </script>
-
+    
     <p>Handlebars syntax highlighting for CodeMirror.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-handlebars-template</code></p>
diff --git a/mode/mumps/index.html b/mode/mumps/index.html
index bd1f69aef5..b1f92c213f 100644
--- a/mode/mumps/index.html
+++ b/mode/mumps/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: MUMPS mode</title>
 <meta charset="utf-8"/>
@@ -73,7 +73,7 @@ <h2>MUMPS mode</h2>
  IF '$LENGTH($PIECE(XUSER(1),U,2)) QUIT 21 ;p419, p434
  Q 0
  ;
-  </textarea>
+  </textarea></div>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
          mode: "mumps",
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index 5ffdc081cc..03cf671498 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -1,5 +1,5 @@
-<!doctype html>
-
+<!doctype html>
+<head>
 <title>CodeMirror: NGINX mode</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
diff --git a/mode/pig/index.html b/mode/pig/index.html
index 984c9a1837..ea77f70441 100644
--- a/mode/pig/index.html
+++ b/mode/pig/index.html
@@ -1,5 +1,4 @@
-<!doctype html>
-
+<!doctype html>
 <title>CodeMirror: Pig Latin mode</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
@@ -51,5 +50,4 @@ <h2>Pig Latin mode</h2>
 
     <p><strong>MIME type defined:</strong> <code>text/x-pig</code>
     (PIG code)
-</html>
 </article>
diff --git a/mode/tiki/tiki.css b/mode/tiki/tiki.css
index 0dbc3ea0e0..1d8704c780 100644
--- a/mode/tiki/tiki.css
+++ b/mode/tiki/tiki.css
@@ -15,7 +15,7 @@
 }
 
 .cm-tw-box {
-	border-top-width: 0px ! important;
+	border-top-width: 0px !important;
 	border-style: solid;
 	border-width: 1px;
 	border-color: inherit;

From 5be632c47b1207fe946cf7b95d65c051aad58c50 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 4 Jan 2016 11:13:26 +0100
Subject: [PATCH 2540/4742] [ruby mode] Use electricInput instead of
 electricChars

To avoid false positives.

Closes #3752
---
 mode/ruby/ruby.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 089a971d4b..10cad8d9f1 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -275,7 +275,7 @@ CodeMirror.defineMode("ruby", function(config) {
         (state.continuedLine ? config.indentUnit : 0);
     },
 
-    electricChars: "}de", // enD and rescuE
+    electricInput: /^\s*(?:end|rescue|\})$/,
     lineComment: "#"
   };
 });

From e43609830a50104779999ef0ca521b92042dcd20 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 6 Jan 2016 12:53:17 +0100
Subject: [PATCH 2541/4742] Fix spurious setting of hitSide in findPosH

Closes #3753
---
 lib/codemirror.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index aa5664a173..98163e645a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4816,10 +4816,9 @@
   function findPosH(doc, pos, dir, unit, visually) {
     var line = pos.line, ch = pos.ch, origDir = dir;
     var lineObj = getLine(doc, line);
-    var possible = true;
     function findNextLine() {
       var l = line + dir;
-      if (l < doc.first || l >= doc.first + doc.size) return (possible = false);
+      if (l < doc.first || l >= doc.first + doc.size) return false
       line = l;
       return lineObj = getLine(doc, l);
     }
@@ -4829,14 +4828,16 @@
         if (!boundToLine && findNextLine()) {
           if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
           else ch = dir < 0 ? lineObj.text.length : 0;
-        } else return (possible = false);
+        } else return false
       } else ch = next;
       return true;
     }
 
-    if (unit == "char") moveOnce();
-    else if (unit == "column") moveOnce(true);
-    else if (unit == "word" || unit == "group") {
+    if (unit == "char") {
+      moveOnce()
+    } else if (unit == "column") {
+      moveOnce(true)
+    } else if (unit == "word" || unit == "group") {
       var sawType = null, group = unit == "group";
       var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
       for (var first = true;; first = false) {
@@ -4857,7 +4858,7 @@
       }
     }
     var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
-    if (!possible) result.hitSide = true;
+    if (!cmp(pos, result)) result.hitSide = true;
     return result;
   }
 

From 273c803a7c9b1fc18a60902dcd1589dce5b08971 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 7 Jan 2016 10:25:41 +0100
Subject: [PATCH 2542/4742] [contributing.md] Update anchor links

---
 CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 77ed15b52d..c4cd019a7c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 # How to contribute
 
-- [Getting help](#getting-help-)
-- [Submitting bug reports](#submitting-bug-reports-)
-- [Contributing code](#contributing-code-)
+- [Getting help](#getting-help)
+- [Submitting bug reports](#submitting-bug-reports)
+- [Contributing code](#contributing-code)
 
 ## Getting help
 

From c73ab133ec8e2adaab5c0675d01a0472c44cc10e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 8 Jan 2016 12:18:06 +0100
Subject: [PATCH 2543/4742] [folgutter addon] Respond to swapDoc event
 asynchronously

Since the viewport info isn't updated until the redraw, and the event
fires before the redraw.

See https://discuss.codemirror.net/t/whats-wrong-fold-gutters-do-not-show-up-after-swapdoc-call/580
---
 addon/fold/foldgutter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index ed7bd87d34..f101e26709 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -20,7 +20,7 @@
       cm.off("viewportChange", onViewportChange);
       cm.off("fold", onFold);
       cm.off("unfold", onFold);
-      cm.off("swapDoc", updateInViewport);
+      cm.off("swapDoc", onChange);
     }
     if (val) {
       cm.state.foldGutter = new State(parseOptions(val));
@@ -30,7 +30,7 @@
       cm.on("viewportChange", onViewportChange);
       cm.on("fold", onFold);
       cm.on("unfold", onFold);
-      cm.on("swapDoc", updateInViewport);
+      cm.on("swapDoc", onChange);
     }
   });
 

From 97c855980e815941822cdbb785c9eef48e74c610 Mon Sep 17 00:00:00 2001
From: Leonid Khachaturov <Leonid.Khachaturov@jetbrains.com>
Date: Tue, 5 Jan 2016 15:12:52 +0100
Subject: [PATCH 2544/4742] [jade mode] Fix typos

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

diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index 96fadb19e5..fd16cbca61 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -74,7 +74,7 @@ CodeMirror.defineMode('jade', function (config) {
     res.javaScriptArguments = this.javaScriptArguments;
     res.javaScriptArgumentsDepth = this.javaScriptArgumentsDepth;
     res.isInterpolating = this.isInterpolating;
-    res.interpolationNesting = this.intpolationNesting;
+    res.interpolationNesting = this.interpolationNesting;
 
     res.jsState = CodeMirror.copyState(jsMode, this.jsState);
 
@@ -167,7 +167,7 @@ CodeMirror.defineMode('jade', function (config) {
         if (state.interpolationNesting < 0) {
           stream.next();
           state.isInterpolating = false;
-          return 'puncutation';
+          return 'punctuation';
         }
       } else if (stream.peek() === '{') {
         state.interpolationNesting++;

From e5a8791b91909f7513a83f5f4e6f9182c5102842 Mon Sep 17 00:00:00 2001
From: Leonid Khachaturov <Leonid.Khachaturov@jetbrains.com>
Date: Tue, 5 Jan 2016 15:18:02 +0100
Subject: [PATCH 2545/4742] [real-world uses] Update Upsource URL

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

diff --git a/doc/realworld.html b/doc/realworld.html
index ab33409a64..b107bfd2e6 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -156,7 +156,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>
       <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
-      <li><a href="https://upsource.jetbrains.com/#idea/view/923f30395f2603cd9f42a32bcafd13b6c28de0ff/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java">Upsource</a> (code viewer)</li>
+      <li><a href="https://upsource.jetbrains.com/idea-ce/file/idea-ce-7706e7832aa9e2fd0c2decdb5cbef2225692c696/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorFactoryImpl.java">Upsource</a> (code browser and review tool)</li>
       <li><a href="https://github.com/mgaitan/waliki">Waliki</a> (wiki engine)</li>
       <li><a href="http://wamer.net/">Wamer</a> (web application builder)</li>
       <li><a href="https://github.com/brettz9/webappfind">webappfind</a> (windows file bindings for webapps)</li>

From 754939707b06bf69b309a974dded9a705431c159 Mon Sep 17 00:00:00 2001
From: Leonid Khachaturov <Leonid.Khachaturov@jetbrains.com>
Date: Tue, 5 Jan 2016 16:21:00 +0100
Subject: [PATCH 2546/4742] [jade and haskell-literate modes] Specify mode
 dependencies

---
 mode/haskell-literate/haskell-literate.js | 2 +-
 mode/jade/jade.js                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/haskell-literate/haskell-literate.js b/mode/haskell-literate/haskell-literate.js
index f51e96b604..9358994db9 100644
--- a/mode/haskell-literate/haskell-literate.js
+++ b/mode/haskell-literate/haskell-literate.js
@@ -37,7 +37,7 @@
         return state.inCode ? {state: state.baseState, mode: baseMode} : null
       }
     }
-  })
+  }, "haskell")
 
   CodeMirror.defineMIME("text/x-literate-haskell", "haskell-literate")
 })
diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index fd16cbca61..1db069a90e 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -583,7 +583,7 @@ CodeMirror.defineMode('jade', function (config) {
     copyState: copyState,
     token: nextToken
   };
-});
+}, 'javascript', 'css', 'htmlmixed');
 
 CodeMirror.defineMIME('text/x-jade', 'jade');
 

From 5b4f22418da8c963527e13401cd59a9831d3f67d Mon Sep 17 00:00:00 2001
From: Gavin Douglas <gavin@gdouglas.org>
Date: Wed, 6 Jan 2016 10:07:42 -0800
Subject: [PATCH 2547/4742] [real-world uses] Add https://textbox.io

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

diff --git a/doc/realworld.html b/doc/realworld.html
index b107bfd2e6..f82ff86773 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -148,6 +148,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://xuanji.appspot.com/isicp/">Structure and Interpretation of Computer Programs</a>, Interactive Version</li>
       <li><a href="http://syframework.alwaysdata.net">SyBox</a> (PHP playground)</li>
       <li><a href="http://www.tagspaces.org/">TagSpaces</a> (personal data manager)</li>
+      <li><a href="https://textbox.io/">Textbox.io</a> (WYSIWYG rich text editor)</a></li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
       <li><a href="http://www.mapbox.com/tilemill/">TileMill</a> (map design tool)</li>
       <li><a href="http://doc.tiki.org/Syntax+Highlighter">Tiki</a> (wiki CMS groupware)</li>

From 5b5976a6b0b20813bb1cd8f425390a5ed07f6d18 Mon Sep 17 00:00:00 2001
From: Devin Abbott <devinabbott@gmail.com>
Date: Wed, 6 Jan 2016 13:50:41 -0800
Subject: [PATCH 2548/4742] [jsx mode] Improve indention of js blocks

Issue #3745
---
 mode/jsx/jsx.js  | 17 ++++++++++++++++-
 mode/jsx/test.js |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index af0e26338a..758cf11cbf 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -53,7 +53,22 @@
 
       if (stream.peek() == "{") {
         xmlMode.skipAttribute(cx.state)
-        state.context = new Context(CodeMirror.startState(jsMode, flatXMLIndent(cx.state)),
+
+        var indent = flatXMLIndent(cx.state), xmlContext = cx.state.context
+        // If JS starts on same line as tag
+        if (xmlContext && stream.string.slice(0, stream.pos).match(/>\s*$/)) {
+          while (xmlContext.prev && !xmlContext.startOfLine)
+            xmlContext = xmlContext.prev
+          // If tag starts the line, use XML indentation level
+          if (xmlContext.startOfLine) indent -= config.indentUnit
+          // Else use JS indentation level
+          else if (cx.prev.state.lexical) indent = cx.prev.state.lexical.indented
+        // Else if inside of tag
+        } else if (cx.depth == 1) {
+          indent += config.indentUnit
+        }
+
+        state.context = new Context(CodeMirror.startState(jsMode, indent),
                                     jsMode, 0, state.context)
         return null
       }
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index 0ea9901784..c54a8b24c9 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -57,8 +57,8 @@
   MT("indent_js",
      "([bracket&tag <][tag foo][bracket&tag >]",
      "    [bracket&tag <][tag bar] [attribute baz]={[keyword function]() {",
-     "      [keyword return] [number 10]",
-     "    }}[bracket&tag />]",
+     "        [keyword return] [number 10]",
+     "      }}[bracket&tag />]",
      "  [bracket&tag </][tag foo][bracket&tag >])")
 
   MT("spread",

From d40f5e2704a25ad4b95900e5d17390db4db42189 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 12 Jan 2016 16:01:49 +0100
Subject: [PATCH 2549/4742] [jsx mode] More robust and less invasive
 end-of-line check

Issue #3759
---
 mode/jsx/jsx.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 758cf11cbf..bc2ea79758 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -56,7 +56,7 @@
 
         var indent = flatXMLIndent(cx.state), xmlContext = cx.state.context
         // If JS starts on same line as tag
-        if (xmlContext && stream.string.slice(0, stream.pos).match(/>\s*$/)) {
+        if (xmlContext && stream.match(/^[^>]*>\s*$/, false)) {
           while (xmlContext.prev && !xmlContext.startOfLine)
             xmlContext = xmlContext.prev
           // If tag starts the line, use XML indentation level

From 4a6810852658ed52bf654cd70d1fdde99ed5ac2b Mon Sep 17 00:00:00 2001
From: Arnab Bose <hirak@google.com>
Date: Fri, 8 Jan 2016 14:44:45 -0800
Subject: [PATCH 2550/4742] [match-highlighter addon] Add annotateScrollbar
 option

When enabled, and the annotatescrollbar addon is loaded, matches will
be shown on the scrollbar.
---
 AUTHORS                           |  2 +
 addon/search/match-highlighter.js | 43 +++++++++++++++------
 demo/matchhighlighter.html        | 64 +++++++++++++++++++++++++++++--
 3 files changed, 94 insertions(+), 15 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 830a968c27..880169dd42 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -59,6 +59,7 @@ Anthony Gégo
 Anthony Grimes
 Anton Kovalyov
 AQNOUCH Mohammed
+Arnab Bose
 areos
 as3boyan
 AtomicPages LLC
@@ -183,6 +184,7 @@ Gergely Hegykozi
 Giovanni Calò
 Glenn Jorde
 Glenn Ruehle
+Google Inc.
 Golevka
 Gordon Smith
 Grant Skinner
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index e9a22721f7..8f02f01c87 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -16,13 +16,14 @@
 // highlighted only if the selected text is a word. showToken, when enabled,
 // will cause the current token to be highlighted when nothing is selected.
 // delay is used to specify how much time to wait, in milliseconds, before
-// highlighting the matches.
+// highlighting the matches. If annotateScrollbar is enabled, the occurances
+// will be highlighted on the scrollbar via the matchesonscrollbar addon.
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), require("./matchesonscrollbar"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "./matchesonscrollbar"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
@@ -40,18 +41,19 @@
       this.showToken = options.showToken;
       this.delay = options.delay;
       this.wordsOnly = options.wordsOnly;
+      this.annotateScrollbar = options.annotateScrollbar;
     }
     if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
     if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
     if (this.delay == null) this.delay = DEFAULT_DELAY;
     if (this.wordsOnly == null) this.wordsOnly = DEFAULT_WORDS_ONLY;
     this.overlay = this.timeout = null;
+    this.matchesonscroll = null;
   }
 
   CodeMirror.defineOption("highlightSelectionMatches", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
-      var over = cm.state.matchHighlighter.overlay;
-      if (over) cm.removeOverlay(over);
+      removeOverlay(cm);
       clearTimeout(cm.state.matchHighlighter.timeout);
       cm.state.matchHighlighter = null;
       cm.off("cursorActivity", cursorActivity);
@@ -69,20 +71,39 @@
     state.timeout = setTimeout(function() {highlightMatches(cm);}, state.delay);
   }
 
+  function addOverlay(cm, query, hasBoundary, style) {
+    var state = cm.state.matchHighlighter;
+    cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
+    if (state.annotateScrollbar) {
+      var searchFor = hasBoundary ? new RegExp("\\b" + query + "\\b") : query;
+      state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, true,
+        {className: "CodeMirror-selection-highlight-scrollbar"});
+    }
+  }
+
+  function removeOverlay(cm) {
+    var state = cm.state.matchHighlighter;
+    if (state.overlay) {
+      cm.removeOverlay(state.overlay);
+      state.overlay = null;
+      if (state.annotateScrollbar) {
+        state.matchesonscroll.clear();
+        state.matchesonscroll = null;
+      }
+    }
+  }
+
   function highlightMatches(cm) {
     cm.operation(function() {
       var state = cm.state.matchHighlighter;
-      if (state.overlay) {
-        cm.removeOverlay(state.overlay);
-        state.overlay = null;
-      }
+      removeOverlay(cm);
       if (!cm.somethingSelected() && state.showToken) {
         var re = state.showToken === true ? /[\w$]/ : state.showToken;
         var cur = cm.getCursor(), line = cm.getLine(cur.line), start = cur.ch, end = start;
         while (start && re.test(line.charAt(start - 1))) --start;
         while (end < line.length && re.test(line.charAt(end))) ++end;
         if (start < end)
-          cm.addOverlay(state.overlay = makeOverlay(line.slice(start, end), re, state.style));
+          addOverlay(cm, line.slice(start, end), re, state.style);
         return;
       }
       var from = cm.getCursor("from"), to = cm.getCursor("to");
@@ -90,7 +111,7 @@
       if (state.wordsOnly && !isWord(cm, from, to)) return;
       var selection = cm.getRange(from, to).replace(/^\s+|\s+$/g, "");
       if (selection.length >= state.minChars)
-        cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
+        addOverlay(cm, selection, false, state.style);
     });
   }
 
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index c60109009e..893d72134b 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -6,6 +6,8 @@
 
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
+<script src="../addon/scroll/annotatescrollbar.js"></script>
+<script src="../addon/search/matchesonscrollbar.js"></script>
 <script src="../addon/search/searchcursor.js"></script>
 <script src="../addon/search/match-highlighter.js"></script>
 <style type="text/css">
@@ -15,6 +17,8 @@
         background-position: bottom;
         background-repeat: repeat-x;
       }
+      .cm-matchhighlight {background-color: lightgreen}
+      .CodeMirror-selection-highlight-scrollbar {background-color: green}
     </style>
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
@@ -31,14 +35,66 @@
 
 <article>
 <h2>Match Highlighter Demo</h2>
-<form><textarea id="code" name="code">Select this text: hardToSpotVar
-	And everywhere else in your code where hardToSpotVar appears will automatically illuminate.
-Give it a try!  No more hardToSpotVars.</textarea></form>
+<form><textarea id="code" name="code">Select this text: hardtospot
+  And everywhere else in your code where hardtospot appears will
+automatically illuminate.  Give it a try!  No more hard to spot
+variables - stay in context of your code all the time.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut pharetra
+interdum dui eu pulvinar. Mauris maximus ligula venenatis tempus
+interdum. Cras hendrerit, ipsum sed ultrices pharetra, ligula diam
+porttitor lacus, ac tempor eros est a massa. Nam orci elit, vulputate
+in tristique quis, consectetur vitae metus. Pellentesque et enim
+elementum, lobortis augue in, lacinia sapien. Morbi eu nunc semper,
+sagittis felis a, pellentesque mauris. Lorem ipsum dolor sit amet,
+consectetur adipiscing elit. Aenean quis diam turpis.
+
+Fusce lobortis nisl quis aliquet euismod. Aenean vitae nulla non ipsum
+efficitur scelerisque. Curabitur auctor, lorem non rhoncus porttitor,
+augue ligula lacinia dolor, et vehicula magna lorem imperdiet velit.
+Fusce risus sem, hardtospot commodo eleifend hendrerit vitae, mollis
+quis risus. Cras tincidunt, justo vitae hendrerit venenatis, urna
+dolor placerat tortor, eu lobortis lectus dolor in ligula. Nullam non
+erat non nisl vulputate ultrices sit amet vestibulum dolor. Quisque in
+tortor porta, pellentesque odio nec, malesuada nibh.
+
+In a dui feugiat, ullamcorper urna in, accumsan magna. Donec egestas
+sem nec eros rhoncus, vel gravida purus ornare. Nulla orci mauris,
+porta nec pharetra sed, ornare et lorem. Donec luctus turpis nunc,
+eget dictum felis mollis et.  Sed sodales hardtospot nunc vitae leo
+rhoncus imperdiet. Donec elementum malesuada velit quis placerat.
+Proin accumsan lorem id nisi volutpat ullamcorper. Vivamus laoreet
+dolor ac sem malesuada, ac scelerisque ex efficitur. Aliquam tempus
+libero velit, vel tristique augue vulputate nec.
+
+Mauris ultrices leo felis, sit amet congue augue aliquam condimentum.
+Vivamus purus leo, mattis vitae dignissim vel, ultricies ac ex. Mauris
+eu dolor eu purus ultricies ultrices. Sed euismod feugiat ex et
+mattis. Morbi cursus laoreet pharetra. Donec eu dolor sodales,
+ultricies nisi et, malesuada urna.  Praesent sit amet fringilla felis.
+Nam rhoncus, est blandit auctor auctor, lorem ipsum laoreet ipsum,
+quis sodales libero odio in lorem. Phasellus odio dolor, elementum
+sagittis nibh non, fermentum semper libero. Mauris hendrerit
+hardtospot lectus sit amet commodo eleifend. Morbi pulvinar eget nisl
+at eleifend. Fusce eget porta erat, vitae lobortis libero.
+
+Phasellus sit amet massa in massa pharetra malesuada. Vestibulum at
+quam vel libero aliquam volutpat at ut dui. Praesent scelerisque vel
+mauris sit amet vehicula. Phasellus at mi nec ligula cursus interdum
+sit amet non quam. Aliquam tempus sollicitudin euismod. Nulla euismod
+mollis enim tincidunt placerat.  Proin ac scelerisque enim, quis
+sollicitudin metus. Pellentesque congue nec sapien ut rhoncus. Sed
+eget ornare diam, ut consectetur ante. Aenean eleifend mauris quis
+ornare accumsan. In hac habitasse hardtospot platea dictumst.
+
+</textarea></form>
 
     <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   lineNumbers: true,
-  highlightSelectionMatches: {showToken: /\w/}
+  // To highlight on scrollbars as well, pass annotateScrollbar in options
+  // as below.
+  highlightSelectionMatches: {showToken: /\w/, annotateScrollbar: true}
 });
 </script>
 

From 100d9b01a7ce0f3d021bf6822ee3f2f8a4428c15 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 12 Jan 2016 16:16:16 +0100
Subject: [PATCH 2551/4742] [yaml-frontmatter mode] Fix bug breaking the
 frontmatter being optional

Issue #3760
---
 mode/yaml-frontmatter/yaml-frontmatter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
index 5b65dffbf7..9f081b009a 100644
--- a/mode/yaml-frontmatter/yaml-frontmatter.js
+++ b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -40,7 +40,7 @@
             state.state = FRONTMATTER
             return yamlMode.token(stream, state.inner)
           } else {
-            stream.state = BODY
+            state.state = BODY
             state.inner = CodeMirror.startState(innerMode)
             return innerMode.token(stream, state.inner)
           }

From fd6209ec5f2518f766d4f7d929613549ab050874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pi=C3=ABt=20Delport?= <pjdelport@gmail.com>
Date: Mon, 11 Jan 2016 17:37:01 +0200
Subject: [PATCH 2552/4742] [manual] Fix typos and spelling

---
 doc/manual.html | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 25e66ed69a..e56899ae90 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -577,7 +577,7 @@ <h2>Events</h2>
       <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>
+      <dt id="event_electricInput"><code><strong>"electricInput"</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>
@@ -1273,7 +1273,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
 
       <dt id="getCursor"><code><strong>doc.getCursor</strong>(?start: string) → {line, ch}</code></dt>
       <dd>Retrieve one end of the <em>primary</em>
-      selection. <code>start</code> is a an optional string indicating
+      selection. <code>start</code> is an optional string indicating
       which end of the selection to return. It may
       be <code>"from"</code>, <code>"to"</code>, <code>"head"</code>
       (the side of the selection that moves when you press
@@ -1307,7 +1307,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
         <dd>Determines whether the selection head should be scrolled
         into view. Defaults to true.</dd>
         <dt id="selection_origin"><code><strong>origin</strong>: string</code></dt>
-        <dd>Detemines whether the selection history event may be
+        <dd>Determines whether the selection history event may be
         merged with the previous one. When an origin starts with the
         character <code>+</code>, and the last recorded selection had
         the same origin and was similar (close
@@ -1442,7 +1442,7 @@ <h3 id="api_configuration">Configuration methods</h3>
       <dt id="removeOverlay"><code><strong>cm.removeOverlay</strong>(mode: string|object)</code></dt>
       <dd>Pass this the exact value passed for the <code>mode</code>
       parameter to <a href="#addOverlay"><code>addOverlay</code></a>,
-      or a string that corresponds to the <code>name</code> propery of
+      or a string that corresponds to the <code>name</code> property of
       that value, to remove an overlay again.</dd>
 
       <dt id="on"><code><strong>cm.on</strong>(type: string, func: (...args))</code></dt>
@@ -1787,7 +1787,7 @@ <h3 id="api_sizing">Sizing, scrolling and positioning methods</h3>
 
     <dl>
       <dt id="setSize"><code><strong>cm.setSize</strong>(width: number|string, height: number|string)</code></dt>
-      <dd>Programatically set the size of the editor (overriding the
+      <dd>Programmatically set the size of the editor (overriding the
       applicable <a href="#css-resize">CSS
       rules</a>). <code>width</code> and <code>height</code>
       can be either numbers (interpreted as pixels) or CSS units
@@ -2112,7 +2112,7 @@ <h3 id="api_static">Static properties</h3>
       through <a href="#setOption"><code>setOption</code></a>.</dd>
 
       <dt id="defineInitHook"><code><strong>CodeMirror.defineInitHook</strong>(func: function)</code></dt>
-      <dd>If your extention just needs to run some
+      <dd>If your extension just needs to run some
       code whenever a CodeMirror instance is initialized,
       use <code>CodeMirror.defineInitHook</code>. Give it a function as
       its only argument, and from then on, that function will be called
@@ -2298,7 +2298,7 @@ <h2 id="addons">Addons</h2>
       the <code>CodeMirror-matchingtag</code> class). Also
       defines
       a <a href="#commands">command</a> <code>toMatchingTag</code>,
-      which you can bind a key to in order to jump to the tag mathing
+      which you can bind a key to in order to jump to the tag matching
       the one under the cursor. Depends on
       the <code>addon/fold/xml-fold.js</code>
       addon. <a href="../demo/matchtags.html">Demo here.</a></dd>
@@ -2460,7 +2460,7 @@ <h2 id="addons">Addons</h2>
       <dd>Can be used to run a CodeMirror mode over text without
       actually opening an editor instance.
       See <a href="../demo/runmode.html">the demo</a> for an example.
-      There are alternate versions of the file avaible for
+      There are alternate versions of the file available for
       running <a href="../addon/runmode/runmode-standalone.js">stand-alone</a>
       (without including all of CodeMirror) and
       for <a href="../addon/runmode/runmode.node.js">running under
@@ -2597,9 +2597,9 @@ <h2 id="addons">Addons</h2>
         has <code>moveFocus(n)</code>, <code>setFocus(n)</code>, <code>pick()</code>,
         and <code>close()</code> methods (see the source for details),
         that can be used to change the focused element, pick the
-        current element or close the menu. Additionnaly <code>menuSize()</code>
+        current element or close the menu. Additionally <code>menuSize()</code>
         can give you access to the size of the current dropdown menu,
-        <code>length</code> give you the number of availlable completions, and
+        <code>length</code> give you the number of available completions, and
         <code>data</code> give you full access to the completion returned by the
         hinting function.</dd>
         <dt><code><strong>extraKeys</strong>: keymap</code></dt>
@@ -2807,7 +2807,7 @@ <h2 id="addons">Addons</h2>
       here</a>.</dd>
 
       <dt id="addon_autorefresh"><a href="../addon/display/autorefresh.js"><code>display/autorefresh.js</code></a></dt>
-      <dd>This addon can be useful when initalizing an editor in a
+      <dd>This addon can be useful when initializing an editor in a
       hidden DOM node, in cases where it is difficult to
       call <a href="#refresh"><code>refresh</code></a> when the editor
       becomes visible. It defines an option <code>autoRefresh</code>
@@ -2839,14 +2839,14 @@ <h2 id="addons">Addons</h2>
       set of annotations. The method returns an object
       whose <code>update</code> method can be called with an array
       of <code>{from: Pos, to: Pos}</code> objects marking the ranges
-      to be higlighed. To detach the annotations, call the
+      to be highlighted. To detach the annotations, call the
       object's <code>clear</code> method.</dd>
 
       <dt id="addon_rulers"><a href="../addon/display/rulers.js"><code>display/rulers.js</code></a></dt>
       <dd>Adds a <code>rulers</code> option, which can be used to show
       one or more vertical rulers in the editor. The option, if
       defined, should be given an array of <code>{column [, className,
-      color, lineStyle, width]}</code> objects or numbers (wich
+      color, lineStyle, width]}</code> objects or numbers (which
       indicate a column). The ruler will be displayed at the column
       indicated by the number or the <code>column</code> property.
       The <code>className</code> property can be used to assign a
@@ -2904,7 +2904,7 @@ <h2 id="addons">Addons</h2>
           <dt><code><strong>wrapRange</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>
           <dd>Wraps the given range as one big paragraph.</dd>
           <dt><code><strong>wrapParagraphsInRange</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>
-          <dd>Wrapps the paragraphs in (and overlapping with) the
+          <dd>Wraps the paragraphs in (and overlapping with) the
           given range individually.</dd>
         </dl>
         The following options are recognized:

From df00bf36986fd4dcddb741f0d49f7e3db5478589 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han <jacky_cute0808@hotmail.com>
Date: Tue, 12 Jan 2016 10:18:18 -0600
Subject: [PATCH 2553/4742] [real-world uses] Added HackMD

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

diff --git a/doc/realworld.html b/doc/realworld.html
index f82ff86773..705a5943ae 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -85,6 +85,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
       <li><a href="http://web.uvic.ca/~siefkenj/graphit/graphit.html">Graphit</a> (function graphing)</li>
+      <li><a href="https://hackmd.io">HackMD</a> (Realtime collaborative markdown notes on all platforms)</li>
       <li><a href="http://www.handcraft.com/">Handcraft</a> (HTML prototyping)</li>
       <li><a href="http://hawkee.com/">Hawkee</a></li>
       <li><a href="http://try.haxe.org">Haxe</a> (Haxe Playground) </li>

From 8403db21a4b965c716877326a29fbb0885822a1c Mon Sep 17 00:00:00 2001
From: Tim Alby <timothee.alby@gmail.com>
Date: Fri, 15 Jan 2016 14:47:43 +0100
Subject: [PATCH 2554/4742] [mbo theme] Adjust matching bracket color

---
 theme/mbo.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/mbo.css b/theme/mbo.css
index 59ff5da7c6..e164fcf42a 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -33,5 +33,5 @@
 .cm-s-mbo span.cm-qualifier { color: #ffffec; }
 
 .cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
-.cm-s-mbo .CodeMirror-matchingbracket { color: #222 !important; }
+.cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
 .cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }

From db3c12d08b2f14592cf3260320520154c534487c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 18 Jan 2016 11:01:55 +0100
Subject: [PATCH 2555/4742] [django mode] Fix tokenizing of comments

Closes #3767
---
 mode/django/django.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mode/django/django.js b/mode/django/django.js
index eb8d65914e..a8a7d8311d 100644
--- a/mode/django/django.js
+++ b/mode/django/django.js
@@ -61,7 +61,7 @@
 
       // Ignore completely any stream series that do not match the
       // Django template opening tags.
-      while (stream.next() != null && !stream.match("{{", false) && !stream.match("{%", false)) {}
+      while (stream.next() != null && !stream.match(/\{[{%#]/, false)) {}
       return null;
     }
 
@@ -317,9 +317,8 @@
 
     // Mark everything as comment inside the tag and the tag itself.
     function inComment (stream, state) {
-      if (stream.match("#}")) {
-        state.tokenize = tokenBase;
-      }
+      if (stream.match(/^.*?#\}/)) state.tokenize = tokenBase
+      else stream.skipToEnd()
       return "comment";
     }
 

From 8850e2684113e18b543bd1c43a3920238e8c7f69 Mon Sep 17 00:00:00 2001
From: Prayag Verma <prayag.verma@gmail.com>
Date: Sun, 17 Jan 2016 16:47:20 +0530
Subject: [PATCH 2556/4742] Update license year to 2016

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index f4a5a4a25f..766132177a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2015 by Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (C) 2016 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 17a0538900ea95af1992337586229736190006d2 Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel.horner@gmail.com>
Date: Sun, 17 Jan 2016 10:30:07 -0500
Subject: [PATCH 2557/4742] [clojure mode] Fix token type for spaces inside
 string

Spaces inside string are reporting null type instead of string.
Fix from
https://github.com/LightTable/Clojure/commit/bcac085f3556cb296134b75e5dbd13913af6c1f4
---
 mode/clojure/clojure.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 44948d04e7..55c6a1c4f0 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -142,7 +142,7 @@ CodeMirror.defineMode("clojure", function (options) {
             }
 
             // skip spaces
-            if (stream.eatSpace()) {
+            if (state.mode != "string" && stream.eatSpace()) {
                 return null;
             }
             var returnType = null;

From e6b2f4f310f2b5debdeabe99273f07f60de90592 Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel.horner@gmail.com>
Date: Sun, 17 Jan 2016 11:23:06 -0500
Subject: [PATCH 2558/4742] [clojure mode] Add clojurescript mime type

While the syntax highlighting is the same as clojure, clojurescript
is its own language with differing builtins
---
 mode/clojure/clojure.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 55c6a1c4f0..ed4b440110 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -243,5 +243,6 @@ CodeMirror.defineMode("clojure", function (options) {
 });
 
 CodeMirror.defineMIME("text/x-clojure", "clojure");
+CodeMirror.defineMIME("text/x-clojurescript", "clojure");
 
 });

From 61c89c320dcc0dfd4fe6c471a081a5e58d38ced3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 18 Jan 2016 11:13:19 +0100
Subject: [PATCH 2559/4742] [mode/meta] Add ClojureScript entry

Issue #3775
---
 mode/meta.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/meta.js b/mode/meta.js
index 49520717fd..e561b0fb24 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -22,6 +22,7 @@
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
+    {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
     {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
     {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
     {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},

From 75d597c411884f7b843e87ba19cc04241a72f1f5 Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel.horner@gmail.com>
Date: Sun, 17 Jan 2016 12:06:51 -0500
Subject: [PATCH 2560/4742] [clojure mode] Allow namespaced forms to smartly
 indent

Fix from
https://github.com/glenjamin/LightTable-Clojure/commit/0b104acedb8ef4dedb1ba2eb23001172fa9a948b
---
 mode/clojure/clojure.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index ed4b440110..fd5e66ff26 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -59,7 +59,8 @@ CodeMirror.defineMode("clojure", function (options) {
         sign: /[+-]/,
         exponent: /e/i,
         keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/
+        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/,
+        block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
     };
 
     function stateStack(indent, type, prev) { // represents a state stack object
@@ -190,7 +191,7 @@ CodeMirror.defineMode("clojure", function (options) {
                         }
 
                         if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) ||
-                                                   /^(?:def|with)/.test(keyWord))) { // indent-word
+                                                   tests.block_indent.test(keyWord))) { // indent-word
                             pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
                         } else { // non-indent word
                             // we continue eating the spaces

From 724a0d32820fd28d145a1b8dae12f7bb813f925c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 18 Jan 2016 11:25:25 +0100
Subject: [PATCH 2561/4742] [markdown mode] Allow leaving an indented fenced
 code block

Closes #3777
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 70889205d3..64fb4d60b8 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -235,7 +235,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function local(stream, state) {
-    if (stream.sol() && state.fencedChars && stream.match(state.fencedChars, false)) {
+    if (state.fencedChars && stream.match(state.fencedChars, false)) {
       state.localMode = state.localState = null;
       state.f = state.block = leavingLocal;
       return null;

From 7abbf6f0241dc4681701236b9758188f066a776a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 19 Jan 2016 10:48:53 +0100
Subject: [PATCH 2562/4742] [swift mode] Add support for indentation

Issue #3766
---
 mode/swift/swift.js | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 7a2339fcdf..86d1c6b9b8 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -34,13 +34,13 @@
                        "private","extension"])
   var operators = "+-/*%=|&<>#"
   var punc = ";,.(){}[]"
-  var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/
   var number = /^-?(?:(?:[\d_]+\.[_\d]*|\.[_\d]+|0o[0-7_\.]+|0b[01_\.]+)(?:e-?[\d_]+)?|0x[\d_a-f\.]+(?:p-?[\d_]+)?)/i
   var identifier = /^[_A-Za-z$][_A-Za-z$0-9]*/
   var property = /^[@\.][_A-Za-z$][_A-Za-z$0-9]*/
   var regexp = /^\/(?!\s)(?:\/\/)?(?:\\.|[^\/])+\//
 
   function tokenBase(stream, state, prev) {
+    if (stream.sol()) state.indented = stream.indentation()
     if (stream.eatSpace()) return null
 
     var ch = stream.peek()
@@ -60,7 +60,8 @@
       return "operator"
     }
     if (punc.indexOf(ch) > -1) {
-      stream.match(delimiters)
+      stream.next()
+      stream.match("..")
       return "punctuation"
     }
     if (ch == '"' || ch == "'") {
@@ -136,14 +137,35 @@
     return "comment"
   }
 
-  CodeMirror.defineMode("swift", function() {
+  function Context(prev, align, indented) {
+    this.prev = prev
+    this.align = align
+    this.indented = indented
+  }
+
+  function pushContext(state, stream) {
+    var align = stream.match(/^\s*($|\/[\/\*])/, false) ? null : stream.column() + 1
+    state.context = new Context(state.context, align, state.indented)
+  }
+
+  function popContext(state) {
+    if (state.context) {
+      state.indented = state.context.indented
+      state.context = state.context.prev
+    }
+  }
+
+  CodeMirror.defineMode("swift", function(config) {
     return {
       startState: function() {
         return {
           prev: null,
+          context: null,
+          indented: 0,
           tokenize: []
         }
       },
+
       token: function(stream, state) {
         var prev = state.prev
         state.prev = null
@@ -151,8 +173,25 @@
         var style = tokenize(stream, state, prev)
         if (!style || style == "comment") state.prev = prev
         else if (!state.prev) state.prev = style
+
+        if (style == "punctuation") {
+          var bracket = /[\(\[\{]|([\]\)\}])/.exec(stream.current())
+          if (bracket) (bracket[1] ? popContext : pushContext)(state, stream)
+        }
+
         return style
       },
+
+      indent: function(state, textAfter) {
+        var cx = state.context
+        if (!cx) return 0
+        var closing = /^[\]\}\)]/.test(textAfter)
+        if (cx.align != null) return cx.align - (closing ? 1 : 0)
+        return cx.indented + (closing ? 0 : config.indentUnit)
+      },
+
+      electricInput: /^\s*[\)\}\]]$/,
+
       lineComment: "//",
       blockCommentStart: "/*",
       blockCommentEnd: "*/"

From 7d43f32bb56f83a9c47addb3f91170b3102f3ead Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 20 Jan 2016 11:46:18 +0100
Subject: [PATCH 2563/4742] Mark release 5.11.0

---
 AUTHORS           | 14 ++++++++++++--
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 13 ++++++++++++-
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 880169dd42..09fe9a893c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Alex Piggott
 Aliaksei Chapyzhenka
 Allen Sarkisyan
 Amin Shali
+Amin Ullah Khan
 amshali@google.com
 Amsul
 amuntean
@@ -59,8 +60,8 @@ Anthony Gégo
 Anthony Grimes
 Anton Kovalyov
 AQNOUCH Mohammed
-Arnab Bose
 areos
+Arnab Bose
 as3boyan
 AtomicPages LLC
 Atul Bhouraskar
@@ -97,6 +98,7 @@ Chandra Sekhar Pydi
 Charles Skelton
 Cheah Chu Yeow
 Chris Coyier
+Chris Ford
 Chris Granger
 Chris Houseknecht
 Chris Lohfink
@@ -136,6 +138,7 @@ David Pathakjee
 David Vázquez
 deebugger
 Deep Thought
+Devin Abbott
 Devon Carew
 dignifiedquire
 Dimage Sapelkin
@@ -178,14 +181,15 @@ Gabriel Horner
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
+Gavin Douglas
 gekkoe
 Gerard Braad
 Gergely Hegykozi
 Giovanni Calò
 Glenn Jorde
 Glenn Ruehle
-Google Inc.
 Golevka
+Google Inc.
 Gordon Smith
 Grant Skinner
 greengiant
@@ -400,6 +404,7 @@ noragrossman
 Norman Rzepka
 Oreoluwa Onatemowo
 pablo
+pabloferz
 Page
 Panupong Pasupat
 paris
@@ -418,10 +423,13 @@ Peter Flynn
 peterkroon
 Peter Kroon
 Philip Stadermann
+Piët Delport
 prasanthj
 Prasanth J
+Prayag Verma
 Radek Piórkowski
 Rahul
+Rahul Anand
 ramwin1
 Randall Mason
 Randy Burden
@@ -515,10 +523,12 @@ wenli
 Wes Cossick
 Wesley Wiser
 Will Binns-Smith
+Will Dean
 William Jamieson
 William Stein
 Willy
 Wojtek Ptak
+Wu Cheng-Han
 Xavier Mendez
 Yassin N. Hassan
 YNH Webdev
diff --git a/doc/compress.html b/doc/compress.html
index a79b3097a3..46c529646d 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.11.0;f=">5.11</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.10.0;f=">5.10</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.9.0;f=">5.9</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.8.0;f=">5.8</option>
diff --git a/doc/manual.html b/doc/manual.html
index e56899ae90..96e4186ab2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.10.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.11.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 6df8f04c65..43ee827413 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: Release History</title>
 <meta charset="utf-8"/>
@@ -30,6 +30,17 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-01-2016: <a href="http://codemirror.net/codemirror-5.11.zip">Version 5.11</a>:</p>
+
+  <ul>
+    <li>New modes: <a href="../mode/jsx/index.html">JSX</a>, <a href="../mode/haskell-literate/index.html">literate Haskell</a></li>
+    <li>The editor now forwards more <a href="manual.html#event_dom">DOM events</a>: <code>cut</code>, <code>copy</code>, <code>paste</code>, and <code>touchstart</code>. It will also forward <code>mousedown</code> for drag events</li>
+    <li>Fixes a bug where bookmarks next to collapsed spans were not rendered</li>
+    <li>The <a href="../mode/swift/index.html">Swift</a> mode now supports auto-indentation</li>
+    <li>Frontmatters in the <a href="../mode/yaml-frontmatter/index.html">YAML frontmatter</a> mode are now optional as intended</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.10.0...5.11.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">21-12-2015: <a href="http://codemirror.net/codemirror-5.10.zip">Version 5.10</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 2e8dcc5cfd..2bb1f41d1f 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.10</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.11</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 98163e645a..090e421617 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8884,7 +8884,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.10.1";
+  CodeMirror.version = "5.11.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 165631b906..d1783b495e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.10.1",
+    "version":"5.11.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From fbf1486e3f8d1d80fa4d573a6c4a85d0164e38fd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 20 Jan 2016 11:48:19 +0100
Subject: [PATCH 2564/4742] Bump version number post-5.11

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 96e4186ab2..bfc63245f9 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.11.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.11.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 090e421617..23760ab39e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8884,7 +8884,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.11.0";
+  CodeMirror.version = "5.11.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index d1783b495e..b9c45ed803 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.11.0",
+    "version":"5.11.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 933aedc5804e0a2da9b2c5c348178e9b53f7396b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 24 Jan 2016 15:53:52 +0100
Subject: [PATCH 2565/4742] [markdown mode] Fix irresponsible use of
 global/static variable

Closes #3787
---
 mode/markdown/markdown.js | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 64fb4d60b8..63ab0fc6f4 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -55,8 +55,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.tokenTypeOverrides === undefined)
     modeCfg.tokenTypeOverrides = {};
 
-  var codeDepth = 0;
-
   var tokenTypes = {
     header: "header",
     code: "comment",
@@ -215,7 +213,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (state.localMode) state.localState = state.localMode.startState();
       state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
-      state.code = true;
+      state.code = -1
       return getType(state);
     }
 
@@ -253,9 +251,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.f = inlineNormal;
     state.fencedChars = null;
     if (modeCfg.highlightFormatting) state.formatting = "code-block";
-    state.code = true;
+    state.code = 1
     var returnType = getType(state);
-    state.code = false;
+    state.code = 0
     return returnType;
   }
 
@@ -405,21 +403,18 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (ch === '`') {
       var previousFormatting = state.formatting;
       if (modeCfg.highlightFormatting) state.formatting = "code";
-      var t = getType(state);
-      var before = stream.pos;
       stream.eatWhile('`');
-      var difference = 1 + stream.pos - before;
-      if (!state.code) {
-        codeDepth = difference;
-        state.code = true;
-        return getType(state);
+      var count = stream.current().length
+      if (state.code == 0) {
+        state.code = count
+        return getType(state)
+      } else if (count == state.code) { // Must be exact
+        var t = getType(state)
+        state.code = 0
+        return t
       } else {
-        if (difference === codeDepth) { // Must be exact
-          state.code = false;
-          return t;
-        }
-        state.formatting = previousFormatting;
-        return getType(state);
+        state.formatting = previousFormatting
+        return getType(state)
       }
     } else if (state.code) {
       return getType(state);
@@ -692,6 +687,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         linkText: false,
         linkHref: false,
         linkTitle: false,
+        code: 0,
         em: false,
         strong: false,
         header: 0,

From bb199ec51207e106b4d5927842d875f51a3f7772 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 24 Jan 2016 16:00:23 +0100
Subject: [PATCH 2566/4742] [handlebars mode] Document base option

Issue #3624
---
 mode/handlebars/index.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
index 4f82d60282..b1bfad1ca3 100644
--- a/mode/handlebars/index.html
+++ b/mode/handlebars/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: Handlebars mode</title>
 <meta charset="utf-8"/>
@@ -71,4 +71,9 @@ <h1>{{t 'article_list'}}</h1>
     <p>Handlebars syntax highlighting for CodeMirror.</p>
 
     <p><strong>MIME types defined:</strong> <code>text/x-handlebars-template</code></p>
+
+    <p>Supported options: <code>base</code> to set the mode to
+    wrap. For example, use</p>
+    <pre>mode: {name: "handlebars", base: "text/html"}</pre>
+    <p>to highlight an HTML template.</p>
 </article>

From 29555c986ddb5be91be177055ecbab605717b397 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 24 Jan 2016 22:38:14 +0100
Subject: [PATCH 2567/4742] Fix clipping of horizontal scroll positions

To avoid messing up the position of the gutter when an offset
bigger than the max offset is given.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 23760ab39e..d5790013ee 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3139,7 +3139,7 @@
       display.scroller.scrollTop = doc.scrollTop;
     }
     if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - displayWidth(cm), op.scrollLeft));
+      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
       display.scrollbars.setScrollLeft(doc.scrollLeft);
       display.scroller.scrollLeft = doc.scrollLeft;
       alignHorizontally(cm);

From dbb2a5c270f2b2e626ae03157ed3863626268a6d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 25 Jan 2016 10:06:20 +0100
Subject: [PATCH 2568/4742] [clike mode] Improve indentation of Scala =>
 functions

Issue #3779
---
 mode/clike/clike.js | 83 +++++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 37 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 4f5c0cf370..db7f89373d 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -11,6 +11,42 @@
 })(function(CodeMirror) {
 "use strict";
 
+function Context(indented, column, type, align, prev) {
+  this.indented = indented;
+  this.column = column;
+  this.type = type;
+  this.align = align;
+  this.prev = prev;
+}
+function isStatement(type) {
+  return type == "statement" || type == "switchstatement" || type == "namespace";
+}
+function pushContext(state, col, type) {
+  var indent = state.indented;
+  if (state.context && isStatement(state.context.type) && !isStatement(type))
+    indent = state.context.indented;
+  return state.context = new Context(indent, col, type, null, state.context);
+}
+function popContext(state) {
+  var t = state.context.type;
+  if (t == ")" || t == "]" || t == "}")
+    state.indented = state.context.indented;
+  return state.context = state.context.prev;
+}
+
+function typeBefore(stream, state) {
+  if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
+  if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
+}
+
+function isTopScope(context) {
+  for (;;) {
+    if (!context || context.type == "top") return true;
+    if (context.type == "}" && context.prev.type != "namespace") return false;
+    context = context.prev;
+  }
+}
+
 CodeMirror.defineMode("clike", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
@@ -111,42 +147,6 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return "comment";
   }
 
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function isStatement(type) {
-    return type == "statement" || type == "switchstatement" || type == "namespace";
-  }
-  function pushContext(state, col, type) {
-    var indent = state.indented;
-    if (state.context && isStatement(state.context.type) && !isStatement(type))
-      indent = state.context.indented;
-    return state.context = new Context(indent, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  function typeBefore(stream, state) {
-    if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
-    if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
-  }
-
-  function isTopScope(context) {
-    for (;;) {
-      if (!context || context.type == "top") return true;
-      if (context.type == "}" && context.prev.type != "namespace") return false;
-      context = context.prev;
-    }
-  }
-
   // Interface
 
   return {
@@ -497,7 +497,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     ),
     types: words(
       "AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either " +
-      "Enumeration Equiv Error Exception Fractional Function IndexedSeq Integral Iterable " +
+      "Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable " +
       "Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering " +
       "Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder " +
       "StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector " +
@@ -527,6 +527,15 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "'": function(stream) {
         stream.eatWhile(/[\w\$_\xa1-\uffff]/);
         return "atom";
+      },
+      "=": function(stream, state) {
+        var cx = state.context
+        if (cx.type == "}" && cx.align && stream.eat(">")) {
+          state.context = new Context(cx.indented, cx.column, cx.type, null, cx.prev)
+          return "operator"
+        } else {
+          return false
+        }
       }
     },
     modeProps: {closeBrackets: {triples: '"'}}

From 6792348c4a33f8009e5278f89be0af2bce0e4f4e Mon Sep 17 00:00:00 2001
From: Glebov Boris <bglebov@ussc.ru>
Date: Wed, 27 Jan 2016 17:44:58 +0500
Subject: [PATCH 2569/4742] [fcl mode] Add

---
 mode/fcl/fcl.js     | 173 ++++++++++++++++++++++++++++++++++++++++++++
 mode/fcl/index.html | 108 +++++++++++++++++++++++++++
 2 files changed, 281 insertions(+)
 create mode 100644 mode/fcl/fcl.js
 create mode 100644 mode/fcl/index.html

diff --git a/mode/fcl/fcl.js b/mode/fcl/fcl.js
new file mode 100644
index 0000000000..518116976a
--- /dev/null
+++ b/mode/fcl/fcl.js
@@ -0,0 +1,173 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("fcl", function(config) {
+  var indentUnit = config.indentUnit;
+
+  var keywords = {
+      "term": true,
+      "method": true, "accu": true,
+      "rule": true, "then": true, "is": true, "and": true, "or": true,
+      "if": true, "default": true
+  };
+
+  var start_blocks = {
+      "var_input": true,
+      "var_output": true,
+      "fuzzify": true,
+      "defuzzify": true,
+      "function_block": true,
+      "ruleblock": true
+  };
+
+  var end_blocks = {
+      "end_ruleblock": true,
+      "end_defuzzify": true,
+      "end_function_block": true,
+      "end_fuzzify": true,
+      "end_var": true
+  };
+
+  var atoms = {
+      "true": true, "false": true, "nan": true,
+      "real": true, "min": true, "max": true, "cog": true, "cogs": true
+  };
+
+  var isOperatorChar = /[+\-*&^%:=<>!|\/]/;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+
+    if (/[\d\.]/.test(ch)) {
+      if (ch == ".") {
+        stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
+      } else if (ch == "0") {
+        stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
+      } else {
+        stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
+      }
+      return "number";
+    }
+
+    if (ch == "/" || ch == "(") {
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+
+    var cur = stream.current().toLowerCase();
+    if (keywords.propertyIsEnumerable(cur) ||
+        start_blocks.propertyIsEnumerable(cur) ||
+        end_blocks.propertyIsEnumerable(cur)) {
+      return "keyword";
+    }
+    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    return "variable";
+  }
+
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if ((ch == "/" || ch == ")") && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+
+  function popContext(state) {
+    if (!state.context.prev) return;
+    var t = state.context.type;
+    if (t == "end_block")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
+    },
+
+    token: function(stream, state) {
+        var ctx = state.context;
+        if (stream.sol()) {
+            if (ctx.align == null) ctx.align = false;
+            state.indented = stream.indentation();
+            state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+
+        var style = (state.tokenize || tokenBase)(stream, state);
+        if (style == "comment") return style;
+        if (ctx.align == null) ctx.align = true;
+
+        var cur = stream.current().toLowerCase();
+
+        if (start_blocks.propertyIsEnumerable(cur)) pushContext(state, stream.column(), "end_block");
+        else if (end_blocks.propertyIsEnumerable(cur))  popContext(state);
+
+        state.startOfLine = false;
+        return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+      var ctx = state.context;
+
+      var closing = end_blocks.propertyIsEnumerable(textAfter);
+      if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricChars: "ryk",
+    fold: "brace",
+    blockCommentStart: "(*",
+    blockCommentEnd: "*)",
+    lineComment: "//"
+  };
+});
+
+CodeMirror.defineMIME("text/x-fcl", "fcl");
+});
diff --git a/mode/fcl/index.html b/mode/fcl/index.html
new file mode 100644
index 0000000000..3c18d0b3c7
--- /dev/null
+++ b/mode/fcl/index.html
@@ -0,0 +1,108 @@
+<!doctype html>
+
+<title>CodeMirror: FCL mode</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../../doc/docs.css">
+
+<link rel="stylesheet" href="../../lib/codemirror.css">
+<link rel="stylesheet" href="../../theme/elegant.css">
+<script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
+<script src="fcl.js"></script>
+<style>.CodeMirror {border:1px solid #999; background:#ffc}</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="#">FCL</a>
+  </ul>
+</div>
+
+<article>
+<h2>FCL mode</h2>
+<form><textarea id="code" name="code">
+  FUNCTION_BLOCK Fuzzy_FB
+      VAR_INPUT
+          TimeDay : REAL; (* RANGE(0 .. 23) *)
+          ApplicateHost: REAL;
+          TimeConfiguration: REAL;
+          TimeRequirements: REAL;
+      END_VAR
+
+      VAR_OUTPUT
+          ProbabilityDistribution: REAL;
+          ProbabilityAccess: REAL;
+      END_VAR
+
+      FUZZIFY TimeDay
+          TERM inside := (0, 0) (8, 1) (22,0);
+          TERM outside := (0, 1) (8, 0) (22, 1);
+      END_FUZZIFY
+
+      FUZZIFY ApplicateHost
+          TERM few := (0, 1) (100, 0) (200, 0);
+          TERM many := (0, 0) (100, 0) (200, 1);
+      END_FUZZIFY
+
+      FUZZIFY TimeConfiguration
+          TERM recently := (0, 1) (30, 1) (120, 0);
+          TERM long := (0, 0) (30, 0) (120, 1);
+      END_FUZZIFY
+
+      FUZZIFY TimeRequirements
+          TERM recently := (0, 1) (30, 1) (365, 0);
+          TERM long := (0, 0) (30, 0) (365, 1);
+      END_FUZZIFY
+
+      DEFUZZIFY ProbabilityAccess
+          TERM hight := 1;
+          TERM medium := 0.5;
+          TERM low := 0;
+          ACCU: MAX;
+          METHOD: COGS;
+          DEFAULT := 0;
+      END_DEFUZZIFY
+
+      DEFUZZIFY ProbabilityDistribution
+          TERM hight := 1;
+          TERM medium := 0.5;
+          TERM low := 0;
+          ACCU: MAX;
+          METHOD: COGS;
+          DEFAULT := 0;
+      END_DEFUZZIFY
+
+      RULEBLOCK No1
+          AND : MIN;
+          RULE 1 : IF TimeDay IS outside AND ApplicateHost IS few THEN ProbabilityAccess IS hight;
+          RULE 2 : IF ApplicateHost IS many THEN ProbabilityAccess IS hight;
+          RULE 3 : IF TimeDay IS inside AND ApplicateHost IS few THEN ProbabilityAccess IS low;
+      END_RULEBLOCK
+
+      RULEBLOCK No2
+          AND : MIN;
+          RULE 1 : IF ApplicateHost IS many THEN ProbabilityDistribution IS hight;
+      END_RULEBLOCK
+
+  END_FUNCTION_BLOCK
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        theme: "elegant",
+        matchBrackets: true,
+        indentUnit: 8,
+        tabSize: 8,
+        indentWithTabs: true,
+        mode: "text/x-fcl"
+      });
+    </script>
+
+    <p><strong>MIME type:</strong> <code>text/x-fcl</code></p>
+  </article>

From 86560dab2ee0f20f963f25bee0a2634752cf2eb3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Feb 2016 11:08:13 +0100
Subject: [PATCH 2570/4742] [fcl mode] Integrate

Issue #3790
---
 doc/compress.html | 1 +
 mode/index.html   | 1 +
 mode/meta.js      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/doc/compress.html b/doc/compress.html
index 46c529646d..517d57511a 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -140,6 +140,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/elm/elm.js">eml.js</option>
           <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
           <option value="http://codemirror.net/mode/factor/factor.js">factor.js</option>
+          <option value="http://codemirror.net/mode/fcl/fcl.js">fcl.js</option>
           <option value="http://codemirror.net/mode/forth/forth.js">forth.js</option>
           <option value="http://codemirror.net/mode/fortran/fortran.js">fortran.js</option>
           <option value="http://codemirror.net/mode/gfm/gfm.js">gfm.js</option>
diff --git a/mode/index.html b/mode/index.html
index a6c293ec28..08f5e97b9a 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -59,6 +59,7 @@ <h2>Language modes</h2>
       <li><a href="elm/index.html">Elm</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
       <li><a href="factor/index.html">Factor</a></li>
+      <li><a href="fcl/index.html">FCL</a></li>
       <li><a href="forth/index.html">Forth</a></li>
       <li><a href="fortran/index.html">Fortran</a></li>
       <li><a href="mllike/index.html">F#</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index e561b0fb24..01116ac4ba 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -47,6 +47,7 @@
     {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
     {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
+    {name: "FCL", mime: "text/x-fcl", mode: "fcl"},
     {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
     {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
     {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},

From 4ffe46b9c21f223a21c1af306b39cf84525024d7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Feb 2016 11:15:01 +0100
Subject: [PATCH 2571/4742] [lint demo] Hot-link another version of csslint.js

Closes #3791
---
 demo/lint.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/lint.html b/demo/lint.html
index 29936a8d96..96009b4e1f 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -11,7 +11,7 @@
 <script src="../mode/css/css.js"></script>
 <script src="//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
 <script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
-<script src="https://rawgithub.amrom.workers.dev/stubbornella/csslint/master/release/csslint.js"></script>
+<script src="http://csslint.net/js/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
 <script src="../addon/lint/javascript-lint.js"></script>
 <script src="../addon/lint/json-lint.js"></script>

From dfeafe0c14478404288dc1f188a0b54baf0f40d5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Feb 2016 11:32:04 +0100
Subject: [PATCH 2572/4742] Don't use position: fixed in context-menu hack

It doesn't work inside of a transformed container, even for zero
transforms (which some components seem to love putting on root
elements, for whichever reason)

Closes #3238
---
 lib/codemirror.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d5790013ee..47e21e4842 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1482,10 +1482,11 @@
       if (reset && cm.doc.sel.contains(pos) == -1)
         operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
 
-      var oldCSS = te.style.cssText;
-      input.wrapper.style.position = "absolute";
-      te.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-        "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
+      var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
+      input.wrapper.style.cssText = "position: absolute"
+      var wrapperBox = input.wrapper.getBoundingClientRect()
+      te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
+        "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
         (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
         "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
       if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
@@ -1516,7 +1517,7 @@
       }
       function rehide() {
         input.contextMenuPending = false;
-        input.wrapper.style.position = "relative";
+        input.wrapper.style.cssText = oldWrapperCSS
         te.style.cssText = oldCSS;
         if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
 

From be795a9dba2f7888caa3c16e9a40731c8999ced0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Feb 2016 11:37:37 +0100
Subject: [PATCH 2573/4742] [sublime bindings] Fix key bound to deleteLine

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index e0d0e92b91..49db3b871c 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -105,7 +105,7 @@
     cm.setSelections(extended);
   };
 
-  map["Shift-" + ctrl + "K"] = "deleteLine";
+  map["Shift-Ctrl-K"] = "deleteLine";
 
   function insertLine(cm, above) {
     if (cm.isReadOnly()) return CodeMirror.Pass

From a4918547c9bf5c64f6329c5452a5acc0ada32ba1 Mon Sep 17 00:00:00 2001
From: pabloferz <pabloferz@yahoo.com.mx>
Date: Mon, 18 Jan 2016 11:40:15 +0100
Subject: [PATCH 2574/4742] [julia mode] Refactor some code into tokens, use
 electricInput

---
 mode/julia/julia.js | 150 ++++++++++++++++++++++++++------------------
 1 file changed, 89 insertions(+), 61 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 4471896b76..004de4431c 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -14,27 +14,34 @@
 CodeMirror.defineMode("julia", function(_conf, parserConf) {
   var ERRORCLASS = 'error';
 
-  function wordRegexp(words) {
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
+  function wordRegexp(words, end) {
+    if (typeof end === 'undefined') { end = "\\b"; }
+    return new RegExp("^((" + words.join(")|(") + "))" + end);
   }
 
+  var octChar = "\\\\[0-7]{1,3}";
+  var hexChar = "\\\\x[A-Fa-f0-9]{1,2}";
+  var specialChar = "\\\\[abfnrtv0%?'\"\\\\]";
+  var singleChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
   var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b(?!\()|[\u2208\u2209](?!\()/;
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
-  var identifiers = parserConf.identifiers || /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
+  var identifiers = parserConf.identifiers || /^[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
+  var charsList = [octChar, hexChar, specialChar, singleChar];
   var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
   var blockClosers = ["end", "else", "elseif", "catch", "finally"];
   var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype'];
   var builtinList = ['true', 'false', 'nothing', 'NaN', 'Inf'];
 
   //var stringPrefixes = new RegExp("^[br]?('|\")")
-  var stringPrefixes = /^(`|'|"{3}|([brv]?"))/;
+  var stringPrefixes = /^(`|"{3}|([brv]?"))/;
+  var chars = wordRegexp(charsList, "'");
   var keywords = wordRegexp(keywordList);
   var builtins = wordRegexp(builtinList);
   var openers = wordRegexp(blockOpeners);
   var closers = wordRegexp(blockClosers);
-  var macro = /^@[_A-Za-z][_A-Za-z0-9]*/;
-  var symbol = /^:[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
-  var typeAnnotation = /^::[^.,;"{()=$\s]+({[^}]*}+)*/;
+  var macro = /^@[_A-Za-z][\w]*/;
+  var symbol = /^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
+  var typeAnnotation = /^::[^,;"{()=$\s]+({[^}]*}+)*/;
 
   function inArray(state) {
     var ch = currentScope(state);
@@ -53,19 +60,10 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
   // tokenizers
   function tokenBase(stream, state) {
-    //Handle multiline comments
-    if (stream.match(/^#=\s*/)) {
-      state.scopes.push('#=');
-    }
-    if (currentScope(state) == '#=' && stream.match(/^=#/)) {
-      state.scopes.pop();
-      return 'comment';
-    }
-    if (state.scopes.indexOf('#=') >= 0) {
-      if (!stream.match(/.*?(?=(#=|=#))/)) {
-        stream.skipToEnd();
-      }
-      return 'comment';
+    // Handle multiline comments
+    if (stream.match(/^#=/, false)) {
+      state.tokenize = tokenComment;
+      return state.tokenize(stream, state);
     }
 
     // Handle scope changes
@@ -100,6 +98,10 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       state.scopes.push('[');
     }
 
+    if (ch === '(') {
+      state.scopes.push('(');
+    }
+
     var scope = currentScope(state);
 
     if (scope == '[' && ch === ']') {
@@ -137,33 +139,20 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     // Handle Number Literals
     if (stream.match(/^[0-9\.]/, false)) {
       var imMatcher = RegExp(/^im\b/);
-      var floatLiteral = false;
+      var numberLiteral = false;
       // Floats
-      if (stream.match(/^\d*\.(?!\.)\d+([ef][\+\-]?\d+)?/i)) { floatLiteral = true; }
-      if (stream.match(/^\d+\.(?!\.)\d*/)) { floatLiteral = true; }
-      if (stream.match(/^\.\d+/)) { floatLiteral = true; }
-      if (stream.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)) { floatLiteral = true; }
-      if (floatLiteral) {
-          // Float literals may be "imaginary"
-          stream.match(imMatcher);
-          state.leavingExpr = true;
-          return 'number';
-      }
+      if (stream.match(/^\d*\.(?!\.)\d*([Eef][\+\-]?\d+)?/i)) { numberLiteral = true; }
+      if (stream.match(/^\d+\.(?!\.)\d*/)) { numberLiteral = true; }
+      if (stream.match(/^\.\d+/)) { numberLiteral = true; }
+      if (stream.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)) { numberLiteral = true; }
       // Integers
-      var intLiteral = false;
-      // Hex
-      if (stream.match(/^0x[0-9a-f]+/i)) { intLiteral = true; }
-      // Binary
-      if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
-      // Octal
-      if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
-      // Decimal
-      if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
-          intLiteral = true;
-      }
+      if (stream.match(/^0x[0-9a-f]+/i)) { numberLiteral = true; } // Hex
+      if (stream.match(/^0b[01]+/i)) { numberLiteral = true; } // Binary
+      if (stream.match(/^0o[0-7]+/i)) { numberLiteral = true; } // Octal
+      if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) { numberLiteral = true; } // Decimal
       // Zero by itself with no other piece of number.
-      if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-      if (intLiteral) {
+      if (stream.match(/^0(?![\dx])/i)) { numberLiteral = true; }
+      if (numberLiteral) {
           // Integer literals may be "long"
           stream.match(imMatcher);
           state.leavingExpr = true;
@@ -194,6 +183,12 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return 'operator';
     }
 
+    // Handle Chars
+    if (stream.match(/^'/)) {
+      state.tokenize = tokenChar;
+      return state.tokenize(stream, state);
+    }
+
     // Handle Strings
     if (stream.match(stringPrefixes)) {
       state.tokenize = tokenStringFactory(stream.current());
@@ -269,7 +264,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     // over two or more lines.
     if (stream.match(/^$/g, false)) {
       stream.backUp(state.charsAdvanced);
-      while (state.scopes.length > state.firstParenPos + 1)
+      while (state.scopes.length > state.firstParenPos)
         state.scopes.pop();
       state.firstParenPos = -1;
       state.charsAdvanced = 0;
@@ -279,33 +274,65 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     return callOrDef(stream, state);
   }
 
+  function tokenComment(stream, state) {
+    if (stream.match(/^#=/)) {
+      state.weakScopes++;
+    }
+    if (!stream.match(/.*?(?=(#=|=#))/)) {
+      stream.skipToEnd();
+    }
+    if (stream.match(/^=#/)) {
+      state.weakScopes--;
+      if (state.weakScopes == 0)
+        state.tokenize = tokenBase;
+    }
+    return 'comment';
+  }
+
+  function tokenChar(stream, state) {
+    var isChar = false, match;
+    if (stream.match(chars)) {
+      isChar = true;
+    } else if (match = stream.match(/\\u([a-f0-9]{1,4})(?=')/i)) {
+      var value = parseInt(match[1], 16);
+      if (value <= 55295 || value >= 57344) { // (U+0,U+D7FF), (U+E000,U+FFFF)
+        isChar = true;
+        stream.next();
+      }
+    } else if (match = stream.match(/\\U([A-Fa-f0-9]{5,8})(?=')/)) {
+      var value = parseInt(match[1], 16);
+      if (value <= 1114111) { // U+10FFFF
+        isChar = true;
+        stream.next();
+      }
+    }
+    if (isChar) {
+      state.leavingExpr = true;
+      state.tokenize = tokenBase;
+      return 'string';
+    }
+    if (!stream.match(/^[^']+(?=')/)) { stream.skipToEnd(); }
+    if (stream.match(/^'/)) { state.tokenize = tokenBase; }
+    return ERRORCLASS;
+  }
+
   function tokenStringFactory(delimiter) {
     while ('bruv'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
       delimiter = delimiter.substr(1);
     }
-    var singleline = delimiter == "'";
     var OUTCLASS = 'string';
 
     function tokenString(stream, state) {
       while (!stream.eol()) {
-        stream.eatWhile(/[^'"\\]/);
+        stream.eatWhile(/[^"\\]/);
         if (stream.eat('\\')) {
             stream.next();
-            if (singleline && stream.eol()) {
-              return OUTCLASS;
-            }
         } else if (stream.match(delimiter)) {
             state.tokenize = tokenBase;
+            state.leavingExpr = true;
             return OUTCLASS;
         } else {
-            stream.eat(/['"]/);
-        }
-      }
-      if (singleline) {
-        if (parserConf.singleLineStringErrors) {
-            return ERRORCLASS;
-        } else {
-            state.tokenize = tokenBase;
+            stream.eat(/["]/);
         }
       }
       return OUTCLASS;
@@ -319,6 +346,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return {
         tokenize: tokenBase,
         scopes: [],
+        weakScopes: 0,
         lastToken: null,
         leavingExpr: false,
         isDefinition: false,
@@ -345,15 +373,15 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
     indent: function(state, textAfter) {
       var delta = 0;
-      if (textAfter == "end" || textAfter == "]" || textAfter == "}" || textAfter == "else" || textAfter == "elseif" || textAfter == "catch" || textAfter == "finally") {
+      if (textAfter == "]" || textAfter == ")" || textAfter == "end" || textAfter == "else" || textAfter == "elseif" || textAfter == "catch" || textAfter == "finally") {
         delta = -1;
       }
       return (state.scopes.length + delta) * _conf.indentUnit;
     },
 
+    electricInput: /(end|else(if)?|catch|finally)$/,
     lineComment: "#",
-    fold: "indent",
-    electricChars: "edlsifyh]}"
+    fold: "indent"
   };
   return external;
 });

From 3df470adc8e7bef877b75ac02d5a547bd35337f5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Feb 2016 13:19:40 +0100
Subject: [PATCH 2575/4742] [python mode] Improve handling of indentation in
 bracketed code

Closes #3797
Closes #3794
---
 mode/python/python.js | 63 ++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 553f2d6fc8..c4b84da948 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -53,7 +53,7 @@
     var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
     var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
 
-    if (parserConf.version && parseInt(parserConf.version, 10) == 3){
+    if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
         // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
         var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
         var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
@@ -65,12 +65,12 @@
     var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
 
     var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
-    if(parserConf.extra_keywords != undefined){
+    if (parserConf.extra_keywords != undefined)
       myKeywords = myKeywords.concat(parserConf.extra_keywords);
-    }
-    if(parserConf.extra_builtins != undefined){
+
+    if (parserConf.extra_builtins != undefined)
       myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
-    }
+
     if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
       myKeywords = myKeywords.concat(py3.keywords);
       myBuiltins = myBuiltins.concat(py3.builtins);
@@ -87,11 +87,12 @@
     function tokenBase(stream, state) {
       // Handle scope changes
       if (stream.sol() && top(state).type == "py") {
+        state.indent = stream.indentation()
         var scopeOffset = top(state).offset;
         if (stream.eatSpace()) {
           var lineOffset = stream.indentation();
           if (lineOffset > scopeOffset)
-            pushScope(stream, state, "py");
+            pushPyScope(state);
           else if (lineOffset < scopeOffset && dedent(stream, state))
             state.errorToken = true;
           return null;
@@ -224,16 +225,18 @@
       return tokenString;
     }
 
-    function pushScope(stream, state, type) {
-      var offset = 0, align = null;
-      if (type == "py") {
-        while (top(state).type != "py")
-          state.scopes.pop();
-      }
-      offset = top(state).offset + (type == "py" ? conf.indentUnit : hangingIndent);
-      if (type != "py" && !stream.match(/^(\s|#.*)*$/, false))
-        align = stream.column() + 1;
-      state.scopes.push({offset: offset, type: type, align: align});
+    function pushPyScope(state) {
+      while (top(state).type != "py") state.scopes.pop()
+      state.scopes.push({offset: top(state).offset + conf.indentUnit,
+                         type: "py",
+                         align: null})
+    }
+
+    function pushBracketScope(stream, state, type) {
+      var align = stream.match(/^([\s\[\{\(]|#.*)*$/, false) ? null : stream.column() + 1
+      state.scopes.push({offset: state.indent + hangingIndent,
+                         type: type,
+                         align: align})
     }
 
     function dedent(stream, state) {
@@ -250,12 +253,11 @@
       var current = stream.current();
 
       // Handle decorators
-      if (current == "@"){
-        if(parserConf.version && parseInt(parserConf.version, 10) == 3){
-            return stream.match(identifiers, false) ? "meta" : "operator";
-        } else {
-            return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
-        }
+      if (current == "@") {
+        if (parserConf.version && parseInt(parserConf.version, 10) == 3)
+          return stream.match(identifiers, false) ? "meta" : "operator";
+        else
+          return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
       }
 
       if ((style == "variable" || style == "builtin")
@@ -268,15 +270,15 @@
 
       if (current == "lambda") state.lambda = true;
       if (current == ":" && !state.lambda && top(state).type == "py")
-        pushScope(stream, state, "py");
+        pushPyScope(state);
 
       var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1;
       if (delimiter_index != -1)
-        pushScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+        pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
 
       delimiter_index = "])}".indexOf(current);
       if (delimiter_index != -1) {
-        if (top(state).type == current) state.scopes.pop();
+        if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
         else return ERRORCLASS;
       }
       if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
@@ -292,6 +294,7 @@
         return {
           tokenize: tokenBase,
           scopes: [{offset: basecolumn || 0, type: "py", align: null}],
+          indent: basecolumn || 0,
           lastToken: null,
           lambda: false,
           dedent: 0
@@ -316,16 +319,14 @@
         if (state.tokenize != tokenBase)
           return state.tokenize.isString ? CodeMirror.Pass : 0;
 
-        var scope = top(state);
-        var closing = textAfter && textAfter.charAt(0) == scope.type;
+        var scope = top(state), closing = scope.type == textAfter.charAt(0)
         if (scope.align != null)
-          return scope.align - (closing ? 1 : 0);
-        else if (closing && state.scopes.length > 1)
-          return state.scopes[state.scopes.length - 2].offset;
+          return scope.align - (closing ? 1 : 0)
         else
-          return scope.offset;
+          return scope.offset - (closing ? hangingIndent : 0)
       },
 
+      electricInput: /^\s*[\}\]\)]$/,
       closeBrackets: {triples: "'\""},
       lineComment: "#",
       fold: "indent"

From f9b1e2d4cc26729bed57ca361e6eaa50b1b352c4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Feb 2016 15:41:53 +0100
Subject: [PATCH 2576/4742] [htmlmixed mode] Support multi-line opening tags
 for other-language blocks

Closes #3804
---
 mode/htmlmixed/htmlmixed.js | 42 +++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 21e74f163d..6574fbd569 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -44,13 +44,9 @@
     return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*");
   }
 
-  function getAttrValue(stream, attr) {
-    var pos = stream.pos, match;
-    while (pos >= 0 && stream.string.charAt(pos) !== "<") pos--;
-    if (pos < 0) return pos;
-    if (match = stream.string.slice(pos, stream.pos).match(getAttrRegexp(attr)))
-      return match[2];
-    return "";
+  function getAttrValue(text, attr) {
+    var match = text.match(getAttrRegexp(attr))
+    return match ? match[2] : ""
   }
 
   function getTagRegexp(tagName, anchored) {
@@ -66,10 +62,10 @@
     }
   }
 
-  function findMatchingMode(tagInfo, stream) {
+  function findMatchingMode(tagInfo, tagText) {
     for (var i = 0; i < tagInfo.length; i++) {
       var spec = tagInfo[i];
-      if (!spec[0] || spec[1].test(getAttrValue(stream, spec[0]))) return spec[2];
+      if (!spec[0] || spec[1].test(getAttrValue(tagText, spec[0]))) return spec[2];
     }
   }
 
@@ -89,15 +85,17 @@
       tags.script.unshift(["type", configScript[i].matches, configScript[i].mode])
 
     function html(stream, state) {
-      var tagName = state.htmlState.tagName && state.htmlState.tagName.toLowerCase();
-      var tagInfo = tagName && tags.hasOwnProperty(tagName) && tags[tagName];
-
-      var style = htmlMode.token(stream, state.htmlState), modeSpec;
-
-      if (tagInfo && /\btag\b/.test(style) && stream.current() === ">" &&
-          (modeSpec = findMatchingMode(tagInfo, stream))) {
-        var mode = CodeMirror.getMode(config, modeSpec);
-        var endTagA = getTagRegexp(tagName, true), endTag = getTagRegexp(tagName, false);
+      var style = htmlMode.token(stream, state.htmlState), tag = /\btag\b/.test(style), tagName
+      if (tag && !/[<>\s\/]/.test(stream.current()) &&
+          (tagName = state.htmlState.tagName && state.htmlState.tagName.toLowerCase()) &&
+          tags.hasOwnProperty(tagName)) {
+        state.inTag = tagName + " "
+      } else if (state.inTag && tag && />$/.test(stream.current())) {
+        var inTag = /^([\S]+) (.*)/.exec(state.inTag)
+        state.inTag = null
+        var modeSpec = stream.current() == ">" && findMatchingMode(tags[inTag[1]], inTag[2])
+        var mode = CodeMirror.getMode(config, modeSpec)
+        var endTagA = getTagRegexp(inTag[1], true), endTag = getTagRegexp(inTag[1], false);
         state.token = function (stream, state) {
           if (stream.match(endTagA, false)) {
             state.token = html;
@@ -108,6 +106,9 @@
         };
         state.localMode = mode;
         state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
+      } else if (state.inTag) {
+        state.inTag += stream.current()
+        if (stream.eol()) state.inTag += " "
       }
       return style;
     };
@@ -115,7 +116,7 @@
     return {
       startState: function () {
         var state = htmlMode.startState();
-        return {token: html, localMode: null, localState: null, htmlState: state};
+        return {token: html, inTag: null, localMode: null, localState: null, htmlState: state};
       },
 
       copyState: function (state) {
@@ -123,7 +124,8 @@
         if (state.localState) {
           local = CodeMirror.copyState(state.localMode, state.localState);
         }
-        return {token: state.token, localMode: state.localMode, localState: local,
+        return {token: state.token, inTag: state.inTag,
+                localMode: state.localMode, localState: local,
                 htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
       },
 

From 63f762bfd35cb3ee6c622fb100392b494f6cbcda Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Feb 2016 15:59:01 +0100
Subject: [PATCH 2577/4742] [markdown mode] Don't allow backslash-escaping in
 code fragments

Closes #3800
---
 mode/markdown/markdown.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 63ab0fc6f4..c81bb0d5ff 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -376,15 +376,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     var ch = stream.next();
 
-    if (ch === '\\') {
-      stream.next();
-      if (modeCfg.highlightFormatting) {
-        var type = getType(state);
-        var formattingEscape = tokenTypes.formatting + "-escape";
-        return type ? type + " " + formattingEscape : formattingEscape;
-      }
-    }
-
     // Matches link titles present on next line
     if (state.linkTitle) {
       state.linkTitle = false;
@@ -420,6 +411,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return getType(state);
     }
 
+    if (ch === '\\') {
+      stream.next();
+      if (modeCfg.highlightFormatting) {
+        var type = getType(state);
+        var formattingEscape = tokenTypes.formatting + "-escape";
+        return type ? type + " " + formattingEscape : formattingEscape;
+      }
+    }
+
     if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
       stream.match(/\[[^\]]*\]/);
       state.inline = state.f = linkHref;

From b5f9810307aa7a59424a19dcef3a4e7196a2640a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 2 Feb 2016 16:06:30 +0100
Subject: [PATCH 2578/4742] [merge addon] Fix bug when merging a deletion at
 the bottom of the document

Closes #3802
---
 addon/merge/merge.css | 1 +
 addon/merge/merge.js  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/merge/merge.css b/addon/merge/merge.css
index a6a80e43e0..bda3d9f806 100644
--- a/addon/merge/merge.css
+++ b/addon/merge/merge.css
@@ -60,6 +60,7 @@
   position: absolute;
   cursor: pointer;
   color: #44c;
+  z-index: 3;
 }
 
 .CodeMirror-merge-copy-reverse {
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 830a5f027a..129fafff56 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -427,8 +427,9 @@
 
   function copyChunk(dv, to, from, chunk) {
     if (dv.diffOutOfDate) return;
+    var start = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
     to.replaceRange(from.getRange(Pos(chunk.origFrom, 0), Pos(chunk.origTo, 0)),
-                         Pos(chunk.editFrom, 0), Pos(chunk.editTo, 0));
+                    start, Pos(chunk.editTo, 0));
   }
 
   // Merge view, containing 0, 1, or 2 diff views.

From 10ad16cdd7d794ea04304021ef518cbd49fa5634 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Feb 2016 15:35:25 +0100
Subject: [PATCH 2579/4742] [vim bindings] Make C-q an alias for C-v

Closes #3806
---
 keymap/vim.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0548b75be7..436f05e710 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -164,6 +164,7 @@
     { keys: 'v', type: 'action', action: 'toggleVisualMode' },
     { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
     { keys: '<C-v>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
+    { keys: '<C-q>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
     { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
     { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
     { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},

From 612db45f3d8cea0fbe78381dc4d599c5be9c3529 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Feb 2016 15:40:57 +0100
Subject: [PATCH 2580/4742] [python mode] Fix indentation tracking

Issue #3794
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index c4b84da948..196b026c69 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -85,9 +85,9 @@
 
     // tokenizers
     function tokenBase(stream, state) {
+      if (stream.sol()) state.indent = stream.indentation()
       // Handle scope changes
       if (stream.sol() && top(state).type == "py") {
-        state.indent = stream.indentation()
         var scopeOffset = top(state).offset;
         if (stream.eatSpace()) {
           var lineOffset = stream.indentation();

From c4908be7be3e989567a926401317b3fcfc3401a4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Feb 2016 15:42:20 +0100
Subject: [PATCH 2581/4742] Add lint script to package.json

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b9c45ed803..f24c06fc24 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,10 @@
     "description": "In-browser code editing made bearable",
     "license": "MIT",
     "directories": {"lib": "./lib"},
-    "scripts": {"test": "node ./test/run.js"},
+    "scripts": {
+      "test": "node ./test/run.js",
+      "lint": "bin/lint"
+    },
     "devDependencies": {"node-static": "0.6.0",
                         "phantomjs": "1.9.2-5",
                         "blint": ">=0.1.1"},

From 18d3e0ba9bca1416f1ab1c05c24f215e24220fc6 Mon Sep 17 00:00:00 2001
From: Steffen Bruchmann <hi@sbruchmann.me>
Date: Wed, 3 Feb 2016 06:18:42 +0100
Subject: [PATCH 2582/4742] [active-line addon] Add active line number

This patch enables styling of active line numbers by
adding a `CodeMirror-activeline-gutter` class to the
line's gutter space.
---
 addon/selection/active-line.js | 3 +++
 doc/manual.html                | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index 22da2e0aac..b0b3f61af2 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -18,6 +18,7 @@
   "use strict";
   var WRAP_CLASS = "CodeMirror-activeline";
   var BACK_CLASS = "CodeMirror-activeline-background";
+  var GUTT_CLASS = "CodeMirror-activeline-gutter";
 
   CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
@@ -36,6 +37,7 @@
     for (var i = 0; i < cm.state.activeLines.length; i++) {
       cm.removeLineClass(cm.state.activeLines[i], "wrap", WRAP_CLASS);
       cm.removeLineClass(cm.state.activeLines[i], "background", BACK_CLASS);
+      cm.removeLineClass(cm.state.activeLines[i], "gutter", GUTT_CLASS);
     }
   }
 
@@ -60,6 +62,7 @@
       for (var i = 0; i < active.length; i++) {
         cm.addLineClass(active[i], "wrap", WRAP_CLASS);
         cm.addLineClass(active[i], "background", BACK_CLASS);
+        cm.addLineClass(active[i], "gutter", GUTT_CLASS);
       }
       cm.state.activeLines = active;
     });
diff --git a/doc/manual.html b/doc/manual.html
index bfc63245f9..57a003b485 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2736,8 +2736,10 @@ <h2 id="addons">Addons</h2>
       <dt id="addon_active-line"><a href="../addon/selection/active-line.js"><code>selection/active-line.js</code></a></dt>
       <dd>Defines a <code>styleActiveLine</code> option that, when enabled,
       gives the wrapper of the active line the class <code>CodeMirror-activeline</code>,
-      and adds a background with the class <code>CodeMirror-activeline-background</code>.
-      is enabled. See the <a href="../demo/activeline.html">demo</a>.</dd>
+      adds a background with the class <code>CodeMirror-activeline-background</code>,
+      and adds the class <code>CodeMirror-activeline-gutter</code> to the
+      line's gutter space is enabled. See the
+      <a href="../demo/activeline.html">demo</a>.</dd>
 
       <dt id="addon_selection-pointer"><a href="../addon/selection/selection-pointer.js"><code>selection/selection-pointer.js</code></a></dt>
       <dd>Defines a <code>selectionPointer</code> option which you can

From c8fcffc2ba40251d85dc94c6a88c30b3343d8cb7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Feb 2016 16:07:13 +0100
Subject: [PATCH 2583/4742] [sparql mode] Close pattern context at closing
 brace

Closes #3808
---
 mode/sparql/sparql.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 0cf40f58bc..90b08e18f2 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -135,7 +135,11 @@ CodeMirror.defineMode("sparql", function(config) {
       else if (curPunc == "{") pushContext(state, "}", stream.column());
       else if (/[\]\}\)]/.test(curPunc)) {
         while (state.context && state.context.type == "pattern") popContext(state);
-        if (state.context && curPunc == state.context.type) popContext(state);
+        if (state.context && curPunc == state.context.type) {
+          popContext(state);
+          if (curPunc == "}" && state.context && state.context.type == "pattern")
+            popContext(state);
+        }
       }
       else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state);
       else if (/atom|string|variable/.test(style) && state.context) {

From d48783013e0c5b8a23b216812ea6da17b8111801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= <jonan88@gmail.com>
Date: Fri, 12 Feb 2016 12:12:36 +0100
Subject: [PATCH 2584/4742] [mode/meta] Add .gradle extension to Groovy

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

diff --git a/mode/meta.js b/mode/meta.js
index 01116ac4ba..bc34cf8320 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -55,7 +55,7 @@
     {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
     {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
     {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
-    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]},
+    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"]},
     {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
     {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
     {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},

From e1a8c836dff79ffdd5134e3186f054f6c8e15313 Mon Sep 17 00:00:00 2001
From: Daniel Kesler <danielckesler@gmail.com>
Date: Fri, 5 Feb 2016 10:39:45 -0700
Subject: [PATCH 2585/4742] [spreadsheet mode] Make sure stream is advanced on
 backslash

---
 mode/spreadsheet/spreadsheet.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/spreadsheet/spreadsheet.js b/mode/spreadsheet/spreadsheet.js
index 6fab00fdda..222f297668 100644
--- a/mode/spreadsheet/spreadsheet.js
+++ b/mode/spreadsheet/spreadsheet.js
@@ -70,7 +70,10 @@
           return "operator";
         case "\\":
           if (stream.match(/\\[a-z]+/)) return "string-2";
-          else return null;
+          else {
+            stream.next();
+            return "atom";
+          }
         case ".":
         case ",":
         case ";":

From ba9d400659bc1e90bd99f6a743c115f67c541a8d Mon Sep 17 00:00:00 2001
From: Pavel <pavel.evst@gmail.com>
Date: Mon, 8 Feb 2016 19:48:02 +0700
Subject: [PATCH 2586/4742] [sql mode] Add text/x-pgsql for PostgreSQL

---
 mode/sql/index.html |  1 +
 mode/sql/sql.js     | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index a0d8d9e1b9..7ea4b6934a 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -57,6 +57,7 @@ <h2>SQL Mode for CodeMirror</h2>
             <code><a href="?mime=text/x-plsql">text/x-plsql</a></code>,
             <code><a href="?mime=text/x-mssql">text/x-mssql</a></code>,
             <code><a href="?mime=text/x-hive">text/x-hive</a></code>.
+            <code><a href="?mime=text/x-pgsql">text/x-pgsql</a></code>.
         </p>
 <script>
 window.onload = function() {
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 86c68f7235..e91c706c76 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -257,7 +257,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   }
 
   // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
-  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit";
+  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit ";
 
   // turn a space-separated list into an array
   function set(str) {
@@ -357,6 +357,20 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     dateSQL: set("date timestamp"),
     support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
   });
+
+  CodeMirror.defineMIME("text/x-pgsql", {
+    name: "sql",
+    client: set("source"),
+    // http://www.postgresql.org/docs/9.5/static/sql-keywords-appendix.html
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat"),
+    // http://www.postgresql.org/docs/9.5/static/datatype.html
+    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
+    atoms: set("false true null unknown"),
+    operatorChars: /^[*+\-%<>!=&|^]/,
+    dateSQL: set("date time timestamp"),
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast commentHash commentSpaceRequired")
+  });
+
 }());
 
 });

From e8aaf70d3a1186497d117036cb74b48acea67bb9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 12 Feb 2016 14:24:55 +0100
Subject: [PATCH 2587/4742] [xml mode] Add a matchClosing option

See https://discuss.codemirror.net/t/any-way-to-override-syntax-error-highlighting-in-asp-net-like-code/642
---
 mode/xml/index.html | 6 +++++-
 mode/xml/xml.js     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/xml/index.html b/mode/xml/index.html
index 7149f06b2a..c56b8b6eb7 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -42,12 +42,16 @@ <h2>XML mode</h2>
         lineNumbers: true
       });
     </script>
-    <p>The XML mode supports two configuration parameters:</p>
+    <p>The XML mode supports these configuration parameters:</p>
     <dl>
       <dt><code>htmlMode (boolean)</code></dt>
       <dd>This switches the mode to parse HTML instead of XML. This
       means attributes do not have to be quoted, and some elements
       (such as <code>br</code>) do not require a closing tag.</dd>
+      <dt><code>matchClosing (boolean)</code></dt>
+      <dd>Controls whether the mode checks that close tags match the
+      corresponding opening tag, and highlights mismatches as errors.
+      Defaults to true.</dd>
       <dt><code>alignCDATA (boolean)</code></dt>
       <dd>Setting this to true will force the opening tag of CDATA
       blocks to not be indented.</dd>
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 014f7d846d..f987a3a3ce 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -237,7 +237,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
       if (state.context && state.context.tagName != tagName &&
           config.implicitlyClosed.hasOwnProperty(state.context.tagName))
         popContext(state);
-      if (state.context && state.context.tagName == tagName) {
+      if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) {
         setStyle = "tag";
         return closeState;
       } else {

From 8be7d325651996f272813906a156f892d75a0330 Mon Sep 17 00:00:00 2001
From: Prayag Verma <prayag.verma@gmail.com>
Date: Thu, 11 Feb 2016 15:23:00 +0530
Subject: [PATCH 2588/4742] Fix typos
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`serializeable` → `serializable`
Replace `an` with `a`
Remove extra `command`
---
 doc/manual.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 57a003b485..c48a35f90e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1540,7 +1540,7 @@ <h3 id="api_history">History-related methods</h3>
       <dt id="clearHistory"><code><strong>doc.clearHistory</strong>()</code></dt>
       <dd>Clears the editor's undo history.</dd>
       <dt id="getHistory"><code><strong>doc.getHistory</strong>() → object</code></dt>
-      <dd>Get a (JSON-serializeable) representation of the undo history.</dd>
+      <dd>Get a (JSON-serializable) representation of the undo history.</dd>
       <dt id="setHistory"><code><strong>doc.setHistory</strong>(history: object)</code></dt>
       <dd>Replace the editor's undo history with the one provided,
       which must be a value as returned
@@ -2322,7 +2322,7 @@ <h2 id="addons">Addons</h2>
       <dt id="addon_continuelist"><a href="../addon/edit/continuelist.js"><code>edit/continuelist.js</code></a></dt>
       <dd>Markdown specific. Defines
       a <code>"newlineAndIndentContinueMarkdownList"</code> <a href="#commands">command</a>
-      command that can be bound to <code>enter</code> to automatically
+      that can be bound to <code>enter</code> to automatically
       insert the leading characters for continuing a list. See
       the <a href="../mode/markdown/index.html">Markdown mode
       demo</a>.</dd>
@@ -3068,7 +3068,7 @@ <h2>Writing CodeMirror Modes</h2>
 
       <dt><code><strong>peek</strong>() → string</code></dt>
       <dd>Returns the next character in the stream without advancing
-      it. Will return an <code>null</code> at the end of the
+      it. Will return a <code>null</code> at the end of the
       line.</dd>
       <dt><code><strong>next</strong>() → string</code></dt>
       <dd>Returns the next character in the stream and advances it.

From 9a80b6976bd7efb2220603f22b2b844525570f1a Mon Sep 17 00:00:00 2001
From: Steve Champagne <champagst@gmail.com>
Date: Sat, 13 Feb 2016 18:49:40 -0600
Subject: [PATCH 2589/4742] [dialog addon] Set the focus before setting the
 text.

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

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 323b20078e..f10bb5bf19 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -56,6 +56,8 @@
 
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
+      inp.focus();
+
       if (options.value) {
         inp.value = options.value;
         if (options.selectValueOnOpen !== false) {
@@ -79,8 +81,6 @@
       });
 
       if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);
-
-      inp.focus();
     } else if (button = dialog.getElementsByTagName("button")[0]) {
       CodeMirror.on(button, "click", function() {
         close();

From 90d025e6d6ac8b18f9eb84765a2990bd9db8c281 Mon Sep 17 00:00:00 2001
From: Zac Anger <zac@zacanger.com>
Date: Sun, 14 Feb 2016 23:07:07 -0700
Subject: [PATCH 2590/4742] [real-world uses] Add Pharaoh

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 705a5943ae..03a67c7d20 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -124,6 +124,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://clrhome.org/asm/">ORG</a> (z80 assembly IDE)</li>
       <li><a href="https://github.com/mamacdon/orion-codemirror">Orion-CodeMirror integration</a> (running CodeMirror modes in Orion)</li>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
+      <li><a href="http://pharaoh.js.org/">Pharaoh</a> (browser &amp; desktop editor for the classroom)</li>
       <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
       <li><a href="https://pypi.python.org/pypi/PubliForge/">PubliForge</a> (online publishing system)</li>

From 49bd5d12a8712772d59556adacf6a51f03f050a2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 17 Feb 2016 16:41:54 +0100
Subject: [PATCH 2591/4742] [markdown mode] Include any HTML mode

Rather than hard-coding the bare XML mode.

Issue #3829
---
 mode/markdown/markdown.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index c81bb0d5ff..ed8452abe6 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -13,8 +13,8 @@
 
 CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
-  var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
-  var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
+  var htmlMode = CodeMirror.getMode(cmCfg, "text/html");
+  var htmlModeMissing = htmlMode.name == "null"
 
   function getMode(name) {
     if (CodeMirror.findModeByName) {
@@ -119,7 +119,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.quote = 0;
     // Reset state.indentedCode
     state.indentedCode = false;
-    if (!htmlFound && state.f == htmlBlock) {
+    if (htmlModeMissing && state.f == htmlBlock) {
       state.f = inlineNormal;
       state.block = blockNormal;
     }
@@ -222,12 +222,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function htmlBlock(stream, state) {
     var style = htmlMode.token(stream, state.htmlState);
-    if ((htmlFound && state.htmlState.tagStart === null &&
-         (!state.htmlState.context && state.htmlState.tokenize.isInText)) ||
-        (state.md_inside && stream.current().indexOf(">") > -1)) {
-      state.f = inlineNormal;
-      state.block = blockNormal;
-      state.htmlState = null;
+    if (!htmlModeMissing) {
+      var inner = CodeMirror.innerMode(htmlMode, state.htmlState)
+      if ((inner.mode.name == "xml" && inner.state.tagStart === null &&
+           (!inner.state.context && inner.state.tokenize.isInText)) ||
+          (state.md_inside && stream.current().indexOf(">") > -1)) {
+        state.f = inlineNormal;
+        state.block = blockNormal;
+        state.htmlState = null;
+      }
     }
     return style;
   }

From bf34a602f4eeeb300212cfed92d7935998ede07c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 17 Feb 2016 17:00:53 +0100
Subject: [PATCH 2592/4742] [vim demo] Add note about lack of mainainter

---
 demo/vim.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/demo/vim.html b/demo/vim.html
index be4b857213..f27b8b8e2b 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -32,6 +32,14 @@
 
 <article>
 <h2>Vim bindings demo</h2>
+
+<p><strong style="color: #c33; text-decoration: none">Note:</strong> The CodeMirror vim bindings do not have an
+active maintainer. That means that if you report bugs in it, they are
+likely to go unanswered. It also means that if you want to help, you
+are very welcome to look
+at <a href="https://github.com/codemirror/codemirror/issues?q=is%3Aissue+is%3Aopen+label%3Avim">the
+open issues</a> and see which ones you can solve.</p>
+
 <form><textarea id="code" name="code">
 #include "syscalls.h"
 /* getchar:  simple buffered version */

From 0b06a49113a5acd01cce747516366abf6b960142 Mon Sep 17 00:00:00 2001
From: Gabriel Horner <gabriel.horner@gmail.com>
Date: Sat, 6 Feb 2016 12:37:53 -0500
Subject: [PATCH 2593/4742] [vim bindings] Add Vim.unmap to public api to undo
 Vim.map

---
 keymap/vim.js    | 3 +++
 test/vim_test.js | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 436f05e710..87b94e352b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -682,6 +682,9 @@
         // Add user defined key bindings.
         exCommandDispatcher.map(lhs, rhs, ctx);
       },
+      unmap: function(lhs, ctx) {
+        exCommandDispatcher.unmap(lhs, 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,
diff --git a/test/vim_test.js b/test/vim_test.js
index 25f7e75e90..c75e003a47 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3950,7 +3950,13 @@ testVim('ex_imap', function(cm, vim, helpers) {
   is(vim.insertMode);
   helpers.doKeys('j', 'k');
   is(!vim.insertMode);
-})
+});
+testVim('ex_unmap_api', function(cm, vim, helpers) {
+  CodeMirror.Vim.map('<Alt-X>', 'gg', 'normal');
+  is(CodeMirror.Vim.handleKey(cm, "<Alt-X>", "normal"), "Alt-X key is mapped");
+  CodeMirror.Vim.unmap("<Alt-X>", "normal");
+  is(!CodeMirror.Vim.handleKey(cm, "<Alt-X>", "normal"), "Alt-X key is unmapped");
+});
 
 // Testing registration of functions as ex-commands and mapping to <Key>-keys
 testVim('ex_api_test', function(cm, vim, helpers) {

From 3316d3589dbbeed21e0316855897a341ffd3a933 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Feb 2016 14:30:16 +0100
Subject: [PATCH 2594/4742] Use a border-bottom on heightforcer to ensure extra
 hscrollbar space

Issue #3821
---
 lib/codemirror.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 47e21e4842..14c8b7389d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -543,6 +543,7 @@
 
     d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
     d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
+    d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
 
     if (sizes.right && sizes.bottom) {
       d.scrollbarFiller.style.display = "block";
@@ -787,9 +788,9 @@
 
   function setDocumentHeight(cm, measure) {
     cm.display.sizer.style.minHeight = measure.docHeight + "px";
-    var total = measure.docHeight + cm.display.barHeight;
-    cm.display.heightForcer.style.top = total + "px";
-    cm.display.gutters.style.height = Math.max(total + scrollGap(cm), measure.clientHeight) + "px";
+    cm.display.heightForcer.style.top = measure.docHeight + "px";
+    cm.display.gutters.style.height = Math.max(measure.docHeight + cm.display.barHeight + scrollGap(cm),
+                                               measure.clientHeight) + "px";
   }
 
   // Read the actual heights of the rendered lines, and update their

From ee9890f78ead7ac8eb203cd0216eb4e6c1314445 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Feb 2016 16:34:59 +0100
Subject: [PATCH 2595/4742] Remove accidental gap above CodeMirror-gutter
 elements

Closes #3834
---
 lib/codemirror.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 1067b3ee6b..ebfe4f697f 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -197,6 +197,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   white-space: normal;
   height: 100%;
   display: inline-block;
+  vertical-align: top;
   margin-bottom: -30px;
   /* Hack to make IE7 behave */
   *zoom:1;

From 3adb6c4139973ec0cc7022bf37950bfe7ee3e8f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Feb 2016 16:48:18 +0100
Subject: [PATCH 2596/4742] Add a CHANGELOG.md

---
 CHANGELOG.md | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 300 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..609d73cb5c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,300 @@
+## 5.11.0
+
+* New modes: [JSX](http://codemirror.net/mode/jsx/index.html), [literate Haskell](http://codemirror.net/mode/haskell-literate/index.html)
+* The editor now forwards more [DOM events](http://codemirror.net/doc/manual.html#event_dom): `cut`, `copy`, `paste`, and `touchstart`. It will also forward `mousedown` for drag events
+* Fixes a bug where bookmarks next to collapsed spans were not rendered
+* The [Swift](http://codemirror.net/mode/swift/index.html) mode now supports auto-indentation
+* Frontmatters in the [YAML frontmatter](http://codemirror.net/mode/yaml-frontmatter/index.html) mode are now optional as intended
+
+## 5.10.0
+
+* Modify the way [atomic ranges](http://codemirror.net/doc/manual.html#mark_atomic) are skipped by selection to try and make it less surprising.
+* The [Swift mode](http://codemirror.net/mode/swift/index.html) was rewritten.
+* New addon: [jump-to-line](http://codemirror.net/doc/manual.html#addon_jump-to-line).
+* New method: [`isReadOnly`](http://codemirror.net/doc/manual.html#isReadOnly).
+* The [show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint) now defaults to picking completions on single click.
+* The object passed to [`"beforeSelectionChange"`](http://codemirror.net/doc/manual.html#event_beforeSelectionChange) events now has an `origin` property.
+* New mode: [Crystal](http://codemirror.net/mode/crystal/index.html).
+
+## 5.9.0
+
+* Improve the way overlay (OS X-style) scrollbars are handled
+* Make [annotatescrollbar](http://codemirror.net/doc/manual.html#addon_annotatescrollbar) and scrollpastend addons work properly together
+* Make [show-hint](http://codemirror.net/doc/manual.html#addon_show-hint) addon select options on single click by default, move selection to hovered item
+* Properly fold comments that include block-comment-start markers
+* Many small language mode fixes
+
+## 5.8.0
+
+* Fixes an infinite loop in the [hardwrap addon](http://codemirror.net/doc/manual.html#addon_hardwrap)
+* New modes: [NSIS](http://codemirror.net/mode/nsis/index.html), [Ceylon](http://codemirror.net/mode/clike/index.html)
+* The Kotlin mode is now a [clike](http://codemirror.net/mode/clike/index.html) dialect, rather than a stand-alone mode
+* New option: [`allowDropFileTypes`](http://codemirror.net/doc/manual.html#option_allowDropFileTypes). Binary files can no longer be dropped into CodeMirror
+* New themes: [bespin](http://codemirror.net/demo/theme.html#bespin), [hopscotch](http://codemirror.net/demo/theme.html#hopscotch), [isotope](http://codemirror.net/demo/theme.html#isotope), [railscasts](http://codemirror.net/demo/theme.html#railscasts)
+
+## 5.7.0
+
+* New modes: [Vue](http://codemirror.net/mode/vue/index.html), [Oz](http://codemirror.net/mode/oz/index.html), [MscGen](http://codemirror.net/mode/mscgen/index.html) (and dialects), [Closure Stylesheets](http://codemirror.net/mode/css/gss.html)
+* Implement [CommonMark](http://commonmark.org)-style flexible list indent and cross-line code spans in [Markdown](http://codemirror.net/mode/markdown/index.html) mode
+* Add a replace-all button to the [search addon](http://codemirror.net/doc/manual.html#addon_search), and make the persistent search dialog transparent when it obscures the match
+* Handle `acync`/`await` and ocal and binary numbers in [JavaScript mode](http://codemirror.net/mode/javascript/index.html)
+* Fix various issues with the [Haxe mode](http://codemirror.net/mode/haxe/index.html)
+* Make the [closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets) select only the wrapped text when wrapping selection in brackets
+* Tokenize properties as properties in the [CoffeeScript mode](http://codemirror.net/mode/coffeescript/index.html)
+* The [placeholder addon](http://codemirror.net/doc/manual.html#addon_placeholder) now accepts a DOM node as well as a string placeholder
+
+## 5.6.0
+
+* Fix bug where you could paste into a `readOnly` editor
+* Show a cursor at the drop location when dragging over the editor
+* The [Rust mode](http://codemirror.net/mode/rust/index.html) was
+  rewritten to handle modern Rust
+* The editor and theme CSS was cleaned up. Some selectors are now
+  less specific than before
+* New theme: [abcdef](http://codemirror.net/demo/theme.html#abcdef)
+* Lines longer than [`maxHighlightLength`](http://codemirror.net/doc/manual.html#option_maxHighlightLength)
+  are now less likely to mess up indentation
+* New addons: [`autorefresh`](http://codemirror.net/doc/manual.html#addon_autorefresh)
+  for refreshing an editor the first time it becomes visible, and `html-lint` for using [HTMLHint](http://htmlhint.com/)
+* The [`search`](http://codemirror.net/doc/manual.html#addon_search)
+  addon now recognizes `\r` and `\n` in pattern and replacement input
+
+## v2.0
+
+CodeMirror 2 is a complete rewrite that's faster, smaller, simpler to use, and less dependent on browser quirks. See [this](http://codemirror.net/doc/internals.html) and [this](http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580) for more information.
+
+## v2.01
+
+*   Add a [Smalltalk mode](http://codemirror.net/mode/smalltalk/index.html).
+*   Add a [reStructuredText mode](http://codemirror.net/mode/rst/index.html).
+*   Add a [Python mode](http://codemirror.net/mode/python/index.html).
+*   Add a [PL/SQL mode](http://codemirror.net/mode/plsql/index.html).
+*   `coordsChar` now works
+*   Fix a problem where `onCursorActivity` interfered with `onChange`.
+*   Fix a number of scrolling and mouse-click-position glitches.
+*   Pass information about the changed lines to `onChange`.
+*   Support cmd-up/down on OS X.
+*   Add triple-click line selection.
+*   Don't handle shift when changing the selection through the API.
+*   Support `"nocursor"` mode for `readOnly` option.
+*   Add an `onHighlightComplete` option.
+*   Fix the context menu for Firefox.
+
+## v2.02
+
+*   Add a [Lua mode](http://codemirror.net/mode/lua/index.html).
+*   Fix reverse-searching for a regexp.
+*   Empty lines can no longer break highlighting.
+*   Rework scrolling model (the outer wrapper no longer does the scrolling).
+*   Solve horizontal jittering on long lines.
+*   Add [runmode.js](http://codemirror.net/demo/runmode.html).
+*   Immediately re-highlight text when typing.
+*   Fix problem with 'sticking' horizontal scrollbar.
+
+## v2.1
+
+Add a [theme](http://codemirror.net/doc/manual.html#option_theme) system ([demo](http://codemirror.net/demo/theme.html)). Note that this is not backwards-compatible—you'll have to update your styles and modes!
+
+## v2.11
+
+*   Add a [Scheme mode](http://codemirror.net/mode/scheme/index.html).
+*   Add a `replace` method to search cursors, for cursor-preserving replacements.
+*   Make the [C-like mode](http://codemirror.net/mode/clike/index.html) mode more customizable.
+*   Update XML mode to spot mismatched tags.
+*   Add `getStateAfter` API and `compareState` mode API methods for finer-grained mode magic.
+*   Add a `getScrollerElement` API method to manipulate the scrolling DIV.
+*   Fix drag-and-drop for Firefox.
+*   Add a C# configuration for the [C-like mode](http://codemirror.net/mode/clike/index.html).
+*   Add [full-screen editing](http://codemirror.net/demo/fullscreen.html) and [mode-changing](http://codemirror.net/demo/changemode.html) demos.
+
+## v2.12
+
+*   Add a [SPARQL](http://codemirror.net/mode/sparql/index.html) mode.
+*   Fix bug with cursor jumping around in an unfocused editor in IE.
+*   Allow key and mouse events to bubble out of the editor. Ignore widget clicks.
+*   Solve cursor flakiness after undo/redo.
+*   Fix block-reindent ignoring the last few lines.
+*   Fix parsing of multi-line attrs in XML mode.
+*   Use `innerHTML` for HTML-escaping.
+*   Some fixes to indentation in C-like mode.
+*   Shrink horiz scrollbars when long lines removed.
+*   Fix width feedback loop bug that caused the width of an inner DIV to shrink.
+
+## v2.13
+
+*   Add [Ruby](http://codemirror.net/mode/ruby/index.html), [R](http://codemirror.net/mode/r/index.html), [CoffeeScript](http://codemirror.net/mode/coffeescript/index.html), and [Velocity](http://codemirror.net/mode/velocity/index.html) modes.
+*   Add [`getGutterElement`](http://codemirror.net/doc/manual.html#getGutterElement) to API.
+*   Several fixes to scrolling and positioning.
+*   Add [`smartHome`](http://codemirror.net/doc/manual.html#option_smartHome) option.
+*   Add an experimental [pure XML](http://codemirror.net/mode/xmlpure/index.html) mode.
+
+## v2.14
+
+*   Add [Clojure](http://codemirror.net/mode/clojure/index.html), [Pascal](http://codemirror.net/mode/pascal/index.html), [NTriples](http://codemirror.net/mode/ntriples/index.html), [Jinja2](http://codemirror.net/mode/jinja2/index.html), and [Markdown](http://codemirror.net/mode/markdown/index.html) modes.
+*   Add [Cobalt](http://codemirror.net/theme/cobalt.css) and [Eclipse](http://codemirror.net/theme/eclipse.css) themes.
+*   Add a [`fixedGutter`](http://codemirror.net/doc/manual.html#option_fixedGutter) option.
+*   Fix bug with `setValue` breaking cursor movement.
+*   Make gutter updates much more efficient.
+*   Allow dragging of text out of the editor (on modern browsers).
+
+## v2.15
+
+Fix bug that snuck into 2.14: Clicking the character that currently has the cursor didn't re-focus the editor.
+
+## v2.16
+
+*   Add [Perl](http://codemirror.net/mode/perl/index.html), [Rust](http://codemirror.net/mode/rust/index.html), [TiddlyWiki](http://codemirror.net/mode/tiddlywiki/index.html), and [Groovy](http://codemirror.net/mode/groovy/index.html) modes.
+*   Dragging text inside the editor now moves, rather than copies.
+*   Add a [`coordsFromIndex`](http://codemirror.net/doc/manual.html#coordsFromIndex) method.
+*   **API change**: `setValue` now no longer clears history. Use [`clearHistory`](http://codemirror.net/doc/manual.html#clearHistory) for that.
+*   **API change**: [`markText`](http://codemirror.net/doc/manual.html#markText) now returns an object with `clear` and `find` methods. Marked text is now more robust when edited.
+*   Fix editing code with tabs in Internet Explorer.
+
+## v2.17
+
+*   Add support for [line wrapping](http://codemirror.net/doc/manual.html#option_lineWrapping) and [code folding](http://codemirror.net/doc/manual.html#hideLine).
+*   Add [Github-style Markdown](http://codemirror.net/mode/gfm/index.html) mode.
+*   Add [Monokai](http://codemirror.net/theme/monokai.css) and [Rubyblue](http://codemirror.net/theme/rubyblue.css) themes.
+*   Add [`setBookmark`](http://codemirror.net/doc/manual.html#setBookmark) method.
+*   Move some of the demo code into reusable components under [`lib/util`](http://codemirror.net/addon/).
+*   Make screen-coord-finding code faster and more reliable.
+*   Fix drag-and-drop in Firefox.
+*   Improve support for IME.
+*   Speed up content rendering.
+*   Fix browser's built-in search in Webkit.
+*   Make double- and triple-click work in IE.
+*   Various fixes to modes.
+
+## v2.18
+
+Fixes `TextMarker.clear`, which is broken in 2.17.
+
+## v2.2
+
+*   Slightly incompatible API changes. Read [this](http://codemirror.net/doc/upgrade_v2.2.html).
+*   New approach to [binding](http://codemirror.net/doc/manual.html#option_extraKeys) keys, support for [custom bindings](http://codemirror.net/doc/manual.html#option_keyMap).
+*   Support for overwrite (insert).
+*   [Custom-width](http://codemirror.net/doc/manual.html#option_tabSize) and [stylable](http://codemirror.net/demo/visibletabs.html) tabs.
+*   Moved more code into [add-on scripts](http://codemirror.net/doc/manual.html#addons).
+*   Support for sane vertical cursor movement in wrapped lines.
+*   More reliable handling of editing [marked text](http://codemirror.net/doc/manual.html#markText).
+*   Add minimal [emacs](http://codemirror.net/demo/emacs.html) and [vim](http://codemirror.net/demo/vim.html) bindings.
+*   Rename `coordsFromIndex` to [`posFromIndex`](http://codemirror.net/doc/manual.html#posFromIndex), add [`indexFromPos`](http://codemirror.net/doc/manual.html#indexFromPos) method.
+
+## v2.21
+
+*   Added [LESS](http://codemirror.net/mode/less/index.html), [MySQL](http://codemirror.net/mode/mysql/index.html), [Go](http://codemirror.net/mode/go/index.html), and [Verilog](http://codemirror.net/mode/verilog/index.html) modes.
+*   Add [`smartIndent`](http://codemirror.net/doc/manual.html#option_smartIndent) option.
+*   Support a cursor in [`readOnly`](http://codemirror.net/doc/manual.html#option_readOnly)-mode.
+*   Support assigning multiple styles to a token.
+*   Use a new approach to drawing the selection.
+*   Add [`scrollTo`](http://codemirror.net/doc/manual.html#scrollTo) method.
+*   Allow undo/redo events to span non-adjacent lines.
+*   Lots and lots of bugfixes.
+
+## v2.22
+
+*   Allow [key handlers](http://codemirror.net/doc/manual.html#keymaps) to pass up events, allow binding characters.
+*   Add [`autoClearEmptyLines`](http://codemirror.net/doc/manual.html#option_autoClearEmptyLines) option.
+*   Properly use tab stops when rendering tabs.
+*   Make PHP mode more robust.
+*   Support indentation blocks in [code folder](http://codemirror.net/doc/manual.html#addon_foldcode).
+*   Add a script for [highlighting instances of the selection](http://codemirror.net/doc/manual.html#addon_match-highlighter).
+*   New [.properties](http://codemirror.net/mode/properties/index.html) mode.
+*   Fix many bugs.
+
+## v2.23
+
+*   Change **default binding for tab**. Starting in 2.23, these bindings are default:
+
+    *   Tab: Insert tab character
+    *   Shift-tab: Reset line indentation to default
+    *   Ctrl/Cmd-[: Reduce line indentation (old tab behaviour)
+    *   Ctrl/Cmd-]: Increase line indentation (old shift-tab behaviour)
+
+*   New modes: [XQuery](http://codemirror.net/mode/xquery/index.html) and [VBScript](http://codemirror.net/mode/vbscript/index.html).
+*   Two new themes: [lesser-dark](http://codemirror.net/mode/less/index.html) and [xq-dark](http://codemirror.net/mode/xquery/index.html).
+*   Differentiate between background and text styles in [`setLineClass`](http://codemirror.net/doc/manual.html#setLineClass).
+*   Fix drag-and-drop in IE9+.
+*   Extend [`charCoords`](http://codemirror.net/doc/manual.html#charCoords) and [`cursorCoords`](http://codemirror.net/doc/manual.html#cursorCoords) with a `mode` argument.
+*   Add [`autofocus`](http://codemirror.net/doc/manual.html#option_autofocus) option.
+*   Add [`findMarksAt`](http://codemirror.net/doc/manual.html#findMarksAt) method.
+
+## v2.24
+
+*   **Drop support for Internet Explorer 6**.
+*   New modes: [Shell](http://codemirror.net/mode/shell/index.html), [Tiki wiki](http://codemirror.net/mode/tiki/index.html), [Pig Latin](http://codemirror.net/mode/pig/index.html).
+*   New themes: [Ambiance](http://codemirror.net/demo/theme.html#ambiance), [Blackboard](http://codemirror.net/demo/theme.html#blackboard).
+*   More control over drag/drop with [`dragDrop`](http://codemirror.net/doc/manual.html#option_dragDrop) and [`onDragEvent`](http://codemirror.net/doc/manual.html#option_onDragEvent) options.
+*   Make HTML mode a bit less pedantic.
+*   Add [`compoundChange`](http://codemirror.net/doc/manual.html#compoundChange) API method.
+*   Several fixes in undo history and line hiding.
+*   Remove (broken) support for `catchall` in key maps, add `nofallthrough` boolean field instead.
+
+## v2.25
+
+*   New mode: [Erlang](http://codemirror.net/mode/erlang/index.html).
+*   **Remove xmlpure mode** (use [xml.js](http://codemirror.net/mode/xml/index.html)).
+*   Fix line-wrapping in Opera.
+*   Fix X Windows middle-click paste in Chrome.
+*   Fix bug that broke pasting of huge documents.
+*   Fix backspace and tab key repeat in Opera.
+
+## v2.3
+
+*   **New scrollbar implementation**. Should flicker less. Changes DOM structure of the editor.
+*   New theme: [vibrant-ink](http://codemirror.net/demo/theme.html#vibrant-ink).
+*   Many extensions to the VIM keymap (including text objects).
+*   Add [mode-multiplexing](http://codemirror.net/demo/multiplex.html) utility script.
+*   Fix bug where right-click paste works in read-only mode.
+*   Add a [`getScrollInfo`](http://codemirror.net/doc/manual.html#getScrollInfo) method.
+*   Lots of other [fixes](https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3).
+
+## v2.31
+
+*   New modes: [OCaml](http://codemirror.net/mode/ocaml/index.html), [Haxe](http://codemirror.net/mode/haxe/index.html), and [VB.NET](http://codemirror.net/mode/vb/index.html).
+*   Several fixes to the new scrolling model.
+*   Add a [`setSize`](http://codemirror.net/doc/manual.html#setSize) method for programmatic resizing.
+*   Add [`getHistory`](http://codemirror.net/doc/manual.html#getHistory) and [`setHistory`](http://codemirror.net/doc/manual.html#setHistory) methods.
+*   Allow custom line separator string in [`getValue`](http://codemirror.net/doc/manual.html#getValue) and [`getRange`](http://codemirror.net/doc/manual.html#getRange).
+*   Support double- and triple-click drag, double-clicking whitespace.
+*   And more... [(all patches)](https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31)
+
+## v2.32
+
+Emergency fix for a bug where an editor with line wrapping on IE will break when there is _no_ scrollbar.
+
+## v2.33
+
+*   New mode: [Sieve](http://codemirror.net/mode/sieve/index.html).
+*   New [`getViewPort`](http://codemirror.net/doc/manual.html#getViewport) and [`onViewportChange`](http://codemirror.net/doc/manual.html#option_onViewportChange) API.
+*   [Configurable](http://codemirror.net/doc/manual.html#option_cursorBlinkRate) cursor blink rate.
+*   Make binding a key to `false` disabling handling (again).
+*   Show non-printing characters as red dots.
+*   More tweaks to the scrolling model.
+*   Expanded testsuite. Basic linter added.
+*   Remove most uses of `innerHTML`. Remove `CodeMirror.htmlEscape`.
+*   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.32...v2.33) of patches.
+
+## v2.34
+
+*   New mode: [Common Lisp](http://codemirror.net/mode/commonlisp/index.html).
+*   Fix right-click select-all on most browsers.
+*   Change the way highlighting happens:  
+      Saves memory and CPU cycles.  
+      `compareStates` is no longer needed.  
+      `onHighlightComplete` no longer works.
+*   Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.
+*   Add a [`CodeMirror.version`](http://codemirror.net/doc/manual.html#version) property.
+*   More robust handling of nested modes in [formatting](http://codemirror.net/demo/formatting.html) and [closetag](http://codemirror.net/demo/closetag.html) plug-ins.
+*   Un/redo now preserves [marked text](http://codemirror.net/doc/manual.html#markText) and bookmarks.
+*   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34) of patches.
+
+## v2.35
+
+*   New (sub) mode: [TypeScript](http://codemirror.net/mode/javascript/typescript.html).
+*   Don't overwrite (insert key) when pasting.
+*   Fix several bugs in [`markText`](http://codemirror.net/doc/manual.html#markText)/undo interaction.
+*   Better indentation of JavaScript code without semicolons.
+*   Add [`defineInitHook`](http://codemirror.net/doc/manual.html#defineInitHook) function.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35).

From 94688507bd1ff202f8287711dc6c426d6942e3e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Feb 2016 16:58:13 +0100
Subject: [PATCH 2597/4742] Properly generate CHANGELOG.md

---
 CHANGELOG.md | 712 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 527 insertions(+), 185 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 609d73cb5c..d26c697786 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,110 +47,473 @@
 
 * Fix bug where you could paste into a `readOnly` editor
 * Show a cursor at the drop location when dragging over the editor
-* The [Rust mode](http://codemirror.net/mode/rust/index.html) was
-  rewritten to handle modern Rust
-* The editor and theme CSS was cleaned up. Some selectors are now
-  less specific than before
+* The [Rust mode](http://codemirror.net/mode/rust/index.html) was rewritten to handle modern Rust
+* The editor and theme CSS was cleaned up. Some selectors are now less specific than before
 * New theme: [abcdef](http://codemirror.net/demo/theme.html#abcdef)
-* Lines longer than [`maxHighlightLength`](http://codemirror.net/doc/manual.html#option_maxHighlightLength)
-  are now less likely to mess up indentation
-* New addons: [`autorefresh`](http://codemirror.net/doc/manual.html#addon_autorefresh)
-  for refreshing an editor the first time it becomes visible, and `html-lint` for using [HTMLHint](http://htmlhint.com/)
-* The [`search`](http://codemirror.net/doc/manual.html#addon_search)
-  addon now recognizes `\r` and `\n` in pattern and replacement input
+* Lines longer than [`maxHighlightLength`](http://codemirror.net/doc/manual.html#option_maxHighlightLength) are now less likely to mess up indentation
+* New addons: [`autorefresh`](http://codemirror.net/doc/manual.html#addon_autorefresh) for refreshing an editor the first time it becomes visible, and `html-lint` for using [HTMLHint](http://htmlhint.com/)
+* The [`search`](http://codemirror.net/doc/manual.html#addon_search) addon now recognizes `\r` and `\n` in pattern and replacement input
 
-## v2.0
+## 5.5.0
 
-CodeMirror 2 is a complete rewrite that's faster, smaller, simpler to use, and less dependent on browser quirks. See [this](http://codemirror.net/doc/internals.html) and [this](http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580) for more information.
+*   New option: [`lineSeparator`](http://codemirror.net/doc/manual.html#option_lineSeparator) (with corresponding [method](http://codemirror.net/doc/manual.html#lineSeparator))
+*   New themes: [dracula](http://codemirror.net/demo/theme.html#dracula), [seti](http://codemirror.net/demo/theme.html#seti), [yeti](http://codemirror.net/demo/theme.html#yeti), [material](http://codemirror.net/demo/theme.html#material), and [icecoder](http://codemirror.net/demo/theme.html#icecoder)
+*   New modes: [Brainfuck](http://codemirror.net/mode/brainfuck/index.html), [VHDL](http://codemirror.net/mode/vhdl/index.html), Squirrel ([clike](http://codemirror.net/mode/clike/index.html) dialect)
+*   Define a `findPersistent` command in the [search](http://codemirror.net/demo/search.html) addon, for a dialog that stays open as you cycle through matches
+*   From this release on, the NPM module doesn't include documentation and demos
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.4.0...5.5.0)
+
+## 5.4.0
+
+*   New modes: [Twig](http://codemirror.net/mode/twig/index.html), [Elm](http://codemirror.net/mode/elm/index.html), [Factor](http://codemirror.net/mode/factor/index.html), [Swift](http://codemirror.net/mode/swift/index.html)
+*   Prefer clipboard API (if available) when pasting
+*   Refined definition highlighting in [clike](http://codemirror.net/mode/clike/index.html) mode
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.3.0...5.4.0)
+
+## 5.3.0
+
+*   Fix several regressions in the [`show-hint`](http://codemirror.net/doc/manual.html#addon_show-hint) addon (`completeSingle` option, `"shown"` and `"close"` events)
+*   The [vim mode](http://codemirror.net/demo/vim.html) API was [documented](http://codemirror.net/doc/manual.html#vimapi)
+*   New modes: [ASN.1](http://codemirror.net/mode/asn.1/index.html), [TTCN](http://codemirror.net/mode/ttcn/index.html), and [TTCN-CFG](http://codemirror.net/mode/ttcn-cfg/index.html)
+*   The [clike](http://codemirror.net/mode/clike/index.html) mode can now deep-indent `switch` statements, and roughly recognizes types and defined identifiers
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.2.0...5.3.0)
+
+## 5.2.0
+
+*   Fix several race conditions in [`show-hint`](http://codemirror.net/doc/manual.html#addon_show-hint)'s asynchronous mode
+*   Fix backspace binding in [Sublime bindings](http://codemirror.net/demo/sublime.html)
+*   Change the way IME is handled in the `"textarea"` [input style](http://codemirror.net/doc/manual.html#option_inputStyle)
+*   New modes: [MUMPS](http://codemirror.net/mode/mumps/index.html), [Handlebars](http://codemirror.net/mode/handlebars/index.html)
+*   Rewritten modes: [Django](http://codemirror.net/mode/django/index.html), [Z80](http://codemirror.net/mode/z80/index.html)
+*   New theme: [Liquibyte](http://codemirror.net/demo/theme.html#liquibyte)
+*   New option: [`lineWiseCopyCut`](http://codemirror.net/doc/manual.html#option_lineWiseCopyCut)
+*   The [Vim mode](http://codemirror.net/demo/vim.html) now supports buffer-local options and the `filetype` setting
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.1.0...5.2.0)
+
+## 5.1.0
+
+*   New modes: [ASCII armor](http://codemirror.net/mode/asciiarmor/index.html) (PGP data), [Troff](http://codemirror.net/mode/troff/index.html), and [CMake](http://codemirror.net/mode/cmake/index.html).
+*   Remove SmartyMixed mode, rewrite [Smarty](http://codemirror.net/mode/smarty/index.html) mode to supersede it.
+*   New commands in the [merge addon](http://codemirror.net/doc/manual.html#addon_merge): `goNextDiff` and `goPrevDiff`.
+*   The [closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets) can now be configured per mode.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.0.0...5.1.0).
+
+## 5.0.0
+
+*   Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)
+*   New option [`inputStyle`](http://codemirror.net/doc/manual.html#option_inputStyle) to switch between hidden textarea and contenteditable input.
+*   The [`getInputField`](http://codemirror.net/doc/manual.html#getInputField) method is no longer guaranteed to return a textarea.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.13.0...5.0.0).
+
+## 4.13.0
+
+*   Fix the way the [`closetag`](http://codemirror.net/demo/closetag.html) demo handles the slash character.
+*   New modes: [Forth](http://codemirror.net/mode/forth/index.html), [Stylus](http://codemirror.net/mode/stylus/index.html).
+*   Make the [CSS mode](http://codemirror.net/mode/css/index.html) understand some modern CSS extensions.
+*   Have the [Scala mode](http://codemirror.net/mode/clike/index.html) handle symbols and triple-quoted strings.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0).
+
+## 4.12.0
+
+*   The [`closetag`](http://codemirror.net/doc/manual.html#addon_closetag) addon now defines a `"closeTag"` command.
+*   Adds a `findModeByFileName` to the [mode metadata](http://codemirror.net/doc/manual.html#addon_meta) addon.
+*   [Simple mode](http://codemirror.net/demo/simplemode.html) rules can now contain a `sol` property to only match at the start of a line.
+*   New addon: [`selection-pointer`](http://codemirror.net/doc/manual.html#addon_selection-pointer) to style the mouse cursor over the selection.
+*   Improvements to the [Sass mode](http://codemirror.net/mode/sass/index.html)'s indentation.
+*   The [Vim keymap](http://codemirror.net/demo/vim.html)'s search functionality now supports [scrollbar annotation](http://codemirror.net/doc/manual.html#addon_matchesonscrollbar).
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.11.0...4.12.0).
+
+## 4.11.0
+
+Unfortunately, 4.10 did not take care of the Firefox scrolling issue entirely. This release adds two more patches to address that.
+
+## 4.10.0
+
+Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the cursor could end up behind the horizontal scrollbar.
+
+## 4.9.0
+
+*   Overhauled scroll bar handling. Add pluggable [scrollbar implementations](http://codemirror.net/demo/simplescrollbars.html).
+*   Tweaked behavior for the [completion addons](http://codemirror.net/doc/manual.html#addon_show-hint) to not take text after cursor into account.
+*   Two new optional features in the [merge addon](http://codemirror.net/doc/manual.html#addon_merge): aligning editors, and folding unchanged text.
+*   New modes: [Dart](http://codemirror.net/mode/dart/index.html), [EBNF](http://codemirror.net/mode/ebnf/index.html), [spreadsheet](http://codemirror.net/mode/spreadsheet/index.html), and [Soy](http://codemirror.net/mode/soy/index.html).
+*   New [addon](http://codemirror.net/demo/panel.html) to show persistent panels below/above an editor.
+*   New themes: [zenburn](http://codemirror.net/demo/theme.html#zenburn) and [tomorrow night bright](http://codemirror.net/demo/theme.html#tomorrow-night-bright).
+*   Allow ctrl-click to clear existing cursors.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.8.0...4.9.0).
+
+## 4.8.0
+
+*   Built-in support for [multi-stroke key bindings](http://codemirror.net/doc/manual.html#normalizeKeyMap).
+*   New method: [`getLineTokens`](http://codemirror.net/doc/manual.html#getLineTokens).
+*   New modes: [dockerfile](http://codemirror.net/mode/dockerfile/index.html), [IDL](http://codemirror.net/mode/idl/index.html), [Objective C](http://codemirror.net/mode/clike/index.html) (crude).
+*   Support styling of gutter backgrounds, allow `"gutter"` styles in [`addLineClass`](http://codemirror.net/doc/manual.html#addLineClass).
+*   Many improvements to the [Vim mode](http://codemirror.net/demo/vim.html), rewritten visual mode.
+*   Improvements to modes: [gfm](http://codemirror.net/mode/gfm/index.html) (strikethrough), [SPARQL](http://codemirror.net/mode/sparql/index.html) (version 1.1 support), and [sTeX](http://codemirror.net/mode/stex/index.html) (no more runaway math mode).
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.7.0...4.8.0).
+
+## 4.7.0
+
+*   **Incompatible**: The [lint addon](http://codemirror.net/demo/lint.html) now passes the editor's value as first argument to asynchronous lint functions, for consistency. The editor is still passed, as fourth argument.
+*   Improved handling of unicode identifiers in modes for languages that support them.
+*   More mode improvements: [CoffeeScript](http://codemirror.net/mode/coffeescript/index.html) (indentation), [Verilog](http://codemirror.net/mode/verilog/index.html) (indentation), [Scala](http://codemirror.net/mode/clike/index.html) (indentation, triple-quoted strings), and [PHP](http://codemirror.net/mode/php/index.html) (interpolated variables in heredoc strings).
+*   New modes: [Textile](http://codemirror.net/mode/textile/index.html) and [Tornado templates](http://codemirror.net/mode/tornado/index.html).
+*   Experimental new [way to define modes](http://codemirror.net/demo/simplemode.html).
+*   Improvements to the [Vim bindings](http://codemirror.net/demo/vim.html): Arbitrary insert mode key mappings are now possible, and text objects are supported in visual mode.
+*   The mode [meta-information file](http://codemirror.net/mode/meta.js) now includes information about file extensions, and [helper functions](http://codemirror.net/doc/manual.html#addon_meta) `findModeByMIME` and `findModeByExtension`.
+*   New logo!
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.6.0...4.7.0).
+
+## 4.6.0
+
+*   New mode: [Modelica](http://codemirror.net/mode/modelica/index.html)
+*   New method: [`findWordAt`](http://codemirror.net/doc/manual.html#findWordAt)
+*   Make it easier to [use text background styling](http://codemirror.net/demo/markselection.html)
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.5.0...4.6.0).
+
+## 4.5.0
+
+*   Fix several serious bugs with horizontal scrolling
+*   New mode: [Slim](http://codemirror.net/mode/slim/index.html)
+*   New command: [`goLineLeftSmart`](http://codemirror.net/doc/manual.html#command_goLineLeftSmart)
+*   More fixes and extensions for the [Vim](http://codemirror.net/demo/vim.html) visual block mode
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.4.0...4.5.0).
+
+## 4.4.0
+
+*   **Note:** Some events might now fire in slightly different order (`"change"` is still guaranteed to fire before `"cursorActivity"`)
+*   Nested operations in multiple editors are now synced (complete at same time, reducing DOM reflows)
+*   Visual block mode for [vim](http://codemirror.net/demo/vim.html) (<C-v>) is nearly complete
+*   New mode: [Kotlin](http://codemirror.net/mode/kotlin/index.html)
+*   Better multi-selection paste for text copied from multiple CodeMirror selections
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.3.0...4.4.0).
+
+## 4.3.0
 
-## v2.01
+*   Several [vim bindings](http://codemirror.net/demo/vim.html) improvements: search and exCommand history, global flag for `:substitute`, `:global` command.
+*   Allow hiding the cursor by setting [`cursorBlinkRate`](http://codemirror.net/doc/manual.html#option_cursorBlinkRate) to a negative value.
+*   Make gutter markers themeable, use this in foldgutter.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.2.0...4.3.0).
+
+## 4.2.0
+
+*   Fix problem where some modes were broken by the fact that empty tokens were forbidden.
+*   Several fixes to context menu handling.
+*   On undo, scroll _change_, not cursor, into view.
+*   Rewritten [Jade](http://codemirror.net/mode/jade/index.html) mode.
+*   Various improvements to [Shell](http://codemirror.net/mode/shell/index.html) (support for more syntax) and [Python](http://codemirror.net/mode/python/index.html) (better indentation) modes.
+*   New mode: [Cypher](http://codemirror.net/mode/cypher/index.html).
+*   New theme: [Neo](http://codemirror.net/demo/theme.html#neo).
+*   Support direct styling options (color, line style, width) in the [rulers](http://codemirror.net/doc/manual.html#addon_rulers) addon.
+*   Recognize per-editor configuration for the [show-hint](http://codemirror.net/doc/manual.html#addon_show-hint) and [foldcode](http://codemirror.net/doc/manual.html#addon_foldcode) addons.
+*   More intelligent scanning for existing close tags in [closetag](http://codemirror.net/doc/manual.html#addon_closetag) addon.
+*   In the [Vim bindings](http://codemirror.net/demo/vim.html): Fix bracket matching, support case conversion in visual mode, visual paste, append action.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.1.0...4.2.0).
+
+## 4.1.0
+
+*   _Slightly incompatible_: The [`"cursorActivity"`](http://codemirror.net/doc/manual.html#event_cursorActivity) event now fires after all other events for the operation (and only for handlers that were actually registered at the time the activity happened).
+*   New command: [`insertSoftTab`](http://codemirror.net/doc/manual.html#command_insertSoftTab).
+*   New mode: [Django](http://codemirror.net/mode/django/index.html).
+*   Improved modes: [Verilog](http://codemirror.net/mode/verilog/index.html) (rewritten), [Jinja2](http://codemirror.net/mode/jinja2/index.html), [Haxe](http://codemirror.net/mode/haxe/index.html), [PHP](http://codemirror.net/mode/php/index.html) (string interpolation highlighted), [JavaScript](http://codemirror.net/mode/javascript/index.html) (indentation of trailing else, template strings), [LiveScript](http://codemirror.net/mode/livescript/index.html) (multi-line strings).
+*   Many small issues from the 3.x→4.x transition were found and fixed.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.0.3...4.1.0).
+
+## 3.24.0
+
+Merges the improvements from 4.1 that could easily be applied to the 3.x code. Also improves the way the editor size is updated when line widgets change.
+
+## 3.23.0
+
+*   In the [XML mode](http://codemirror.net/mode/xml/index.html), add `brackets` style to angle brackets, fix case-sensitivity of tags for HTML.
+*   New mode: [Dylan](http://codemirror.net/mode/dylan/index.html).
+*   Many improvements to the [Vim bindings](http://codemirror.net/demo/vim.html).
+
+## 3.22.0
+
+*   Adds the [`findMarks`](http://codemirror.net/doc/manual.html#findMarks) method.
+*   New addons: [rulers](http://codemirror.net/doc/manual.html#addon_rulers), markdown-fold, yaml-lint.
+*   New theme: [mdn-like](http://codemirror.net/demo/theme.html#mdn-like).
+*   New mode: [Solr](http://codemirror.net/mode/solr/index.html).
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.21.0...3.22.0).
+
+## 3.21.0
+
+*   Auto-indenting a block will no longer add trailing whitespace to blank lines.
+*   Marking text has a new option [`clearWhenEmpty`](http://codemirror.net/doc/manual.html#markText) to control auto-removal.
+*   Several bugfixes in the handling of bidirectional text.
+*   The [XML](http://codemirror.net/mode/xml/index.html) and [CSS](http://codemirror.net/mode/css/index.html) modes were largely rewritten. [LESS](http://codemirror.net/mode/css/less.html) support was added to the CSS mode.
+*   The OCaml mode was moved to an [mllike](http://codemirror.net/mode/mllike/index.html) mode, F# support added.
+*   Make it possible to fetch multiple applicable helper values with [`getHelpers`](http://codemirror.net/doc/manual.html#getHelpers), and to register helpers matched on predicates with [`registerGlobalHelper`](http://codemirror.net/doc/manual.html#registerGlobalHelper).
+*   New theme [pastel-on-dark](http://codemirror.net/demo/theme.html#pastel-on-dark).
+*   Better ECMAScript 6 support in [JavaScript](http://codemirror.net/mode/javascript/index.html) mode.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.20.0...3.21.0).
+
+## 3.20.0
+
+*   New modes: [Julia](http://codemirror.net/mode/julia/index.html) and [PEG.js](http://codemirror.net/mode/pegjs/index.html).
+*   Support ECMAScript 6 in the [JavaScript mode](http://codemirror.net/mode/javascript/index.html).
+*   Improved indentation for the [CoffeeScript mode](http://codemirror.net/mode/coffeescript/index.html).
+*   Make non-printable-character representation [configurable](http://codemirror.net/doc/manual.html#option_specialChars).
+*   Add ‘notification’ functionality to [dialog](http://codemirror.net/doc/manual.html#addon_dialog) addon.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.19.0...3.20.0).
+
+## 3.19.0
+
+*   New modes: [Eiffel](http://codemirror.net/mode/eiffel/index.html), [Gherkin](http://codemirror.net/mode/gherkin/index.html), [MSSQL dialect](http://codemirror.net/mode/sql/?mime=text/x-mssql).
+*   New addons: [hardwrap](http://codemirror.net/doc/manual.html#addon_hardwrap), [sql-hint](http://codemirror.net/doc/manual.html#addon_sql-hint).
+*   New theme: [MBO](http://codemirror.net/demo/theme.html#mbo).
+*   Add [support](http://codemirror.net/doc/manual.html#token_style_line) for line-level styling from mode tokenizers.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.18.0...3.19.0).
+
+## 3.18.0
+
+Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", false)` would raise an error.
+
+## 3.17.0
+
+*   New modes: [Fortran](http://codemirror.net/mode/fortran/index.html), [Octave](http://codemirror.net/mode/octave/index.html) (Matlab), [TOML](http://codemirror.net/mode/toml/index.html), and [DTD](http://codemirror.net/mode/dtd/index.html).
+*   New addons: [`css-lint`](http://codemirror.net/addon/lint/css-lint.js), [`css-hint`](http://codemirror.net/doc/manual.html#addon_css-hint).
+*   Improve resilience to CSS 'frameworks' that globally mess up `box-sizing`.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.16.0...3.17.0).
+
+## 3.16.0
+
+*   The whole codebase is now under a single [license](http://codemirror.net/LICENSE) file.
+*   The project page was overhauled and redesigned.
+*   New themes: [Paraiso](http://codemirror.net/demo/theme.html#paraiso-dark) ([light](http://codemirror.net/demo/theme.html#paraiso-light)), [The Matrix](http://codemirror.net/demo/theme.html#the-matrix).
+*   Improved interaction between themes and [active-line](http://codemirror.net/doc/manual.html#addon_active-line)/[matchbrackets](http://codemirror.net/doc/manual.html#addon_matchbrackets) addons.
+*   New [folding](http://codemirror.net/doc/manual.html#addon_foldcode) function `CodeMirror.fold.comment`.
+*   Added [fullscreen](http://codemirror.net/doc/manual.html#addon_fullscreen) addon.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.15.0...3.16.0).
+
+## 3.15.0
+
+*   New modes: [Jade](http://codemirror.net/mode/jade/index.html), [Nginx](http://codemirror.net/mode/nginx/index.html).
+*   New addons: [Tern](http://codemirror.net/demo/tern.html), [matchtags](http://codemirror.net/doc/manual.html#addon_matchtags), and [foldgutter](http://codemirror.net/doc/manual.html#addon_foldgutter).
+*   Introduced [_helper_](http://codemirror.net/doc/manual.html#getHelper) concept ([context](https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ)).
+*   New method: [`getModeAt`](http://codemirror.net/doc/manual.html#getModeAt).
+*   New themes: base16 [dark](http://codemirror.net/demo/theme.html#base16-dark)/[light](http://codemirror.net/demo/theme.html#base16-light), 3024 [dark](http://codemirror.net/demo/theme.html#3024-night)/[light](http://codemirror.net/demo/theme.html#3024-day), [tomorrow-night](http://codemirror.net/demo/theme.html#tomorrow-night-eighties).
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.14.0...3.15.0).
+
+## 3.14.0
+
+*   New addons: [trailing space highlight](http://codemirror.net/doc/manual.html#addon_trailingspace), [XML completion](http://codemirror.net/doc/manual.html#addon_xml-hint) (rewritten), and [diff merging](http://codemirror.net/doc/manual.html#addon_merge).
+*   [`markText`](http://codemirror.net/doc/manual.html#markText) and [`addLineWidget`](http://codemirror.net/doc/manual.html#addLineWidget) now take a `handleMouseEvents` option.
+*   New methods: [`lineAtHeight`](http://codemirror.net/doc/manual.html#lineAtHeight), [`getTokenTypeAt`](http://codemirror.net/doc/manual.html#getTokenTypeAt).
+*   More precise cleanness-tracking using [`changeGeneration`](http://codemirror.net/doc/manual.html#changeGeneration) and [`isClean`](http://codemirror.net/doc/manual.html#isClean).
+*   Many extensions to [Emacs](http://codemirror.net/demo/emacs.html) mode (prefixes, more navigation units, and more).
+*   New events [`"keyHandled"`](http://codemirror.net/doc/manual.html#event_keyHandled) and [`"inputRead"`](http://codemirror.net/doc/manual.html#event_inputRead).
+*   Various improvements to [Ruby](http://codemirror.net/mode/ruby/index.html), [Smarty](http://codemirror.net/mode/smarty/index.html), [SQL](http://codemirror.net/mode/sql/index.html), and [Vim](http://codemirror.net/demo/vim.html) modes.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.13.0...3.14.0).
+
+## 3.13.0
+
+*   New modes: [COBOL](http://codemirror.net/mode/cobol/index.html) and [HAML](http://codemirror.net/mode/haml/index.html).
+*   New options: [`cursorScrollMargin`](http://codemirror.net/doc/manual.html#option_cursorScrollMargin) and [`coverGutterNextToScrollbar`](http://codemirror.net/doc/manual.html#option_coverGutterNextToScrollbar).
+*   New addon: [commenting](http://codemirror.net/doc/manual.html#addon_comment).
+*   More features added to the [Vim keymap](http://codemirror.net/demo/vim.html).
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.12...3.13.0).
+
+## 3.12.0
+
+*   New mode: [GNU assembler](http://codemirror.net/mode/gas/index.html).
+*   New options: [`maxHighlightLength`](http://codemirror.net/doc/manual.html#option_maxHighlightLength) and [`historyEventDelay`](http://codemirror.net/doc/manual.html#option_historyEventDelay).
+*   Added [`addToHistory`](http://codemirror.net/doc/manual.html#mark_addToHistory) option for `markText`.
+*   Various fixes to JavaScript tokenization and indentation corner cases.
+*   Further improvements to the vim mode.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.11...v3.12).
+
+## 3.11.0
+
+*   **Removed code:** `collapserange`, `formatting`, and `simple-hint` addons. `plsql` and `mysql` modes (use [`sql`](http://codemirror.net/mode/sql/index.html) mode).
+*   **Moved code:** the range-finding functions for folding now have [their own files](http://codemirror.net/addon/fold/).
+*   **Changed interface:** the [`continuecomment`](http://codemirror.net/doc/manual.html#addon_continuecomment) addon now exposes an option, rather than a command.
+*   New modes: [SCSS](http://codemirror.net/mode/css/scss.html), [Tcl](http://codemirror.net/mode/tcl/index.html), [LiveScript](http://codemirror.net/mode/livescript/index.html), and [mIRC](http://codemirror.net/mode/mirc/index.html).
+*   New addons: [`placeholder`](http://codemirror.net/demo/placeholder.html), [HTML completion](http://codemirror.net/demo/html5complete.html).
+*   New methods: [`hasFocus`](http://codemirror.net/doc/manual.html#hasFocus), [`defaultCharWidth`](http://codemirror.net/doc/manual.html#defaultCharWidth).
+*   New events: [`beforeCursorEnter`](http://codemirror.net/doc/manual.html#event_beforeCursorEnter), [`renderLine`](http://codemirror.net/doc/manual.html#event_renderLine).
+*   Many improvements to the [`show-hint`](http://codemirror.net/doc/manual.html#addon_show-hint) completion dialog addon.
+*   Tweak behavior of by-word cursor motion.
+*   Further improvements to the [vim mode](http://codemirror.net/demo/vim.html).
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.1...v3.11).
+
+## 3.02.0
+
+Single-bugfix release. Fixes a problem that prevents CodeMirror instances from being garbage-collected after they become unused.
+
+## 3.01.0
+
+*   Move all add-ons into an organized directory structure under [`/addon`](http://codemirror.net/addon/). **You might have to adjust your paths.**
+*   New modes: [D](http://codemirror.net/mode/d/index.html), [Sass](http://codemirror.net/mode/sass/index.html), [APL](http://codemirror.net/mode/apl/index.html), [SQL](http://codemirror.net/mode/sql/index.html) (configurable), and [Asterisk](http://codemirror.net/mode/asterisk/index.html).
+*   Several bugfixes in right-to-left text support.
+*   Add [`rtlMoveVisually`](http://codemirror.net/doc/manual.html#option_rtlMoveVisually) option.
+*   Improvements to vim keymap.
+*   Add built-in (lightweight) [overlay mode](http://codemirror.net/doc/manual.html#addOverlay) support.
+*   Support `showIfHidden` option for [line widgets](http://codemirror.net/doc/manual.html#addLineWidget).
+*   Add simple [Python hinter](http://codemirror.net/doc/manual.html#addon_python-hint).
+*   Bring back the [`fixedGutter`](http://codemirror.net/doc/manual.html#option_fixedGutter) option.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.0...v3.01).
+
+## 3.1.0
+
+*   **Incompatible:** key handlers may now _return_, rather than _throw_ `CodeMirror.Pass` to signal they didn't handle the key.
+*   Make documents a [first-class construct](http://codemirror.net/doc/manual.html#api_doc), support split views and subviews.
+*   Add a [new module](http://codemirror.net/doc/manual.html#addon_show-hint) for showing completion hints. Deprecate `simple-hint.js`.
+*   Extend [htmlmixed mode](http://codemirror.net/mode/htmlmixed/index.html) to allow custom handling of script types.
+*   Support an `insertLeft` option to [`setBookmark`](http://codemirror.net/doc/manual.html#setBookmark).
+*   Add an [`eachLine`](http://codemirror.net/doc/manual.html#eachLine) method to iterate over a document.
+*   New addon modules: [selection marking](http://codemirror.net/demo/markselection.html), [linting](http://codemirror.net/demo/lint.html), and [automatic bracket closing](http://codemirror.net/demo/closebrackets.html).
+*   Add [`"beforeChange"`](http://codemirror.net/doc/manual.html#event_beforeChange) and [`"beforeSelectionChange"`](http://codemirror.net/doc/manual.html#event_beforeSelectionChange) events.
+*   Add [`"hide"`](http://codemirror.net/doc/manual.html#event_hide) and [`"unhide"`](http://codemirror.net/doc/manual.html#event_unhide) events to marked ranges.
+*   Fix [`coordsChar`](http://codemirror.net/doc/manual.html#coordsChar)'s interpretation of its argument to match the documentation.
+*   New modes: [Turtle](http://codemirror.net/mode/turtle/index.html) and [Q](http://codemirror.net/mode/q/index.html).
+*   Further improvements to the [vim mode](http://codemirror.net/demo/vim.html).
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.01...v3.1).
+
+## 3.0.0
+
+**New major version**. Only partially backwards-compatible. See the [upgrading guide](http://codemirror.net/doc/upgrade_v3.html) for more information. Changes since release candidate 2:
+
+*   Rewritten VIM mode.
+*   Fix a few minor scrolling and sizing issues.
+*   Work around Safari segfault when dragging.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.0rc2...v3.0).
+
+## 2.38.0
+
+Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](http://codemirror.net/mode/d/index.html), [Sass](http://codemirror.net/mode/sass/index.html), [APL](http://codemirror.net/mode/apl/index.html)) from the v3 branch.
+
+## 2.37.0
+
+*   New mode: [SQL](http://codemirror.net/mode/sql/index.html) (will replace [plsql](http://codemirror.net/mode/plsql/index.html) and [mysql](http://codemirror.net/mode/mysql/index.html) modes).
+*   Further work on the new VIM mode.
+*   Fix Cmd/Ctrl keys on recent Operas on OS X.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.36...v2.37).
+
+## 2.36.0
+
+*   New mode: [Z80 assembly](http://codemirror.net/mode/z80/index.html).
+*   New theme: [Twilight](http://codemirror.net/demo/theme.html#twilight).
+*   Add command-line compression helper.
+*   Make [`scrollIntoView`](http://codemirror.net/doc/manual.html#scrollIntoView) public.
+*   Add [`defaultTextHeight`](http://codemirror.net/doc/manual.html#defaultTextHeight) method.
+*   Various extensions to the vim keymap.
+*   Make [PHP mode](http://codemirror.net/mode/php/index.html) build on [mixed HTML mode](http://codemirror.net/mode/htmlmixed/index.html).
+*   Add [comment-continuing](http://codemirror.net/doc/manual.html#addon_continuecomment) add-on.
+*   Full [list of patches](http://codemirror.net/https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36).
+
+## 2.35.0
 
-*   Add a [Smalltalk mode](http://codemirror.net/mode/smalltalk/index.html).
-*   Add a [reStructuredText mode](http://codemirror.net/mode/rst/index.html).
-*   Add a [Python mode](http://codemirror.net/mode/python/index.html).
-*   Add a [PL/SQL mode](http://codemirror.net/mode/plsql/index.html).
-*   `coordsChar` now works
-*   Fix a problem where `onCursorActivity` interfered with `onChange`.
-*   Fix a number of scrolling and mouse-click-position glitches.
-*   Pass information about the changed lines to `onChange`.
-*   Support cmd-up/down on OS X.
-*   Add triple-click line selection.
-*   Don't handle shift when changing the selection through the API.
-*   Support `"nocursor"` mode for `readOnly` option.
-*   Add an `onHighlightComplete` option.
-*   Fix the context menu for Firefox.
+*   New (sub) mode: [TypeScript](http://codemirror.net/mode/javascript/typescript.html).
+*   Don't overwrite (insert key) when pasting.
+*   Fix several bugs in [`markText`](http://codemirror.net/doc/manual.html#markText)/undo interaction.
+*   Better indentation of JavaScript code without semicolons.
+*   Add [`defineInitHook`](http://codemirror.net/doc/manual.html#defineInitHook) function.
+*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35).
 
-## v2.02
+## 2.34.0
 
-*   Add a [Lua mode](http://codemirror.net/mode/lua/index.html).
-*   Fix reverse-searching for a regexp.
-*   Empty lines can no longer break highlighting.
-*   Rework scrolling model (the outer wrapper no longer does the scrolling).
-*   Solve horizontal jittering on long lines.
-*   Add [runmode.js](http://codemirror.net/demo/runmode.html).
-*   Immediately re-highlight text when typing.
-*   Fix problem with 'sticking' horizontal scrollbar.
+*   New mode: [Common Lisp](http://codemirror.net/mode/commonlisp/index.html).
+*   Fix right-click select-all on most browsers.
+*   Change the way highlighting happens:  
+      Saves memory and CPU cycles.  
+      `compareStates` is no longer needed.  
+      `onHighlightComplete` no longer works.
+*   Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.
+*   Add a [`CodeMirror.version`](http://codemirror.net/doc/manual.html#version) property.
+*   More robust handling of nested modes in [formatting](http://codemirror.net/demo/formatting.html) and [closetag](http://codemirror.net/demo/closetag.html) plug-ins.
+*   Un/redo now preserves [marked text](http://codemirror.net/doc/manual.html#markText) and bookmarks.
+*   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34) of patches.
 
-## v2.1
+## 2.33.0
 
-Add a [theme](http://codemirror.net/doc/manual.html#option_theme) system ([demo](http://codemirror.net/demo/theme.html)). Note that this is not backwards-compatible—you'll have to update your styles and modes!
+*   New mode: [Sieve](http://codemirror.net/mode/sieve/index.html).
+*   New [`getViewPort`](http://codemirror.net/doc/manual.html#getViewport) and [`onViewportChange`](http://codemirror.net/doc/manual.html#option_onViewportChange) API.
+*   [Configurable](http://codemirror.net/doc/manual.html#option_cursorBlinkRate) cursor blink rate.
+*   Make binding a key to `false` disabling handling (again).
+*   Show non-printing characters as red dots.
+*   More tweaks to the scrolling model.
+*   Expanded testsuite. Basic linter added.
+*   Remove most uses of `innerHTML`. Remove `CodeMirror.htmlEscape`.
+*   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.32...v2.33) of patches.
 
-## v2.11
+## 2.32.0
 
-*   Add a [Scheme mode](http://codemirror.net/mode/scheme/index.html).
-*   Add a `replace` method to search cursors, for cursor-preserving replacements.
-*   Make the [C-like mode](http://codemirror.net/mode/clike/index.html) mode more customizable.
-*   Update XML mode to spot mismatched tags.
-*   Add `getStateAfter` API and `compareState` mode API methods for finer-grained mode magic.
-*   Add a `getScrollerElement` API method to manipulate the scrolling DIV.
-*   Fix drag-and-drop for Firefox.
-*   Add a C# configuration for the [C-like mode](http://codemirror.net/mode/clike/index.html).
-*   Add [full-screen editing](http://codemirror.net/demo/fullscreen.html) and [mode-changing](http://codemirror.net/demo/changemode.html) demos.
+Emergency fix for a bug where an editor with line wrapping on IE will break when there is _no_ scrollbar.
 
-## v2.12
+## 2.31.0
 
-*   Add a [SPARQL](http://codemirror.net/mode/sparql/index.html) mode.
-*   Fix bug with cursor jumping around in an unfocused editor in IE.
-*   Allow key and mouse events to bubble out of the editor. Ignore widget clicks.
-*   Solve cursor flakiness after undo/redo.
-*   Fix block-reindent ignoring the last few lines.
-*   Fix parsing of multi-line attrs in XML mode.
-*   Use `innerHTML` for HTML-escaping.
-*   Some fixes to indentation in C-like mode.
-*   Shrink horiz scrollbars when long lines removed.
-*   Fix width feedback loop bug that caused the width of an inner DIV to shrink.
+*   New modes: [OCaml](http://codemirror.net/mode/ocaml/index.html), [Haxe](http://codemirror.net/mode/haxe/index.html), and [VB.NET](http://codemirror.net/mode/vb/index.html).
+*   Several fixes to the new scrolling model.
+*   Add a [`setSize`](http://codemirror.net/doc/manual.html#setSize) method for programmatic resizing.
+*   Add [`getHistory`](http://codemirror.net/doc/manual.html#getHistory) and [`setHistory`](http://codemirror.net/doc/manual.html#setHistory) methods.
+*   Allow custom line separator string in [`getValue`](http://codemirror.net/doc/manual.html#getValue) and [`getRange`](http://codemirror.net/doc/manual.html#getRange).
+*   Support double- and triple-click drag, double-clicking whitespace.
+*   And more... [(all patches)](https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31)
 
-## v2.13
+## 2.25.0
 
-*   Add [Ruby](http://codemirror.net/mode/ruby/index.html), [R](http://codemirror.net/mode/r/index.html), [CoffeeScript](http://codemirror.net/mode/coffeescript/index.html), and [Velocity](http://codemirror.net/mode/velocity/index.html) modes.
-*   Add [`getGutterElement`](http://codemirror.net/doc/manual.html#getGutterElement) to API.
-*   Several fixes to scrolling and positioning.
-*   Add [`smartHome`](http://codemirror.net/doc/manual.html#option_smartHome) option.
-*   Add an experimental [pure XML](http://codemirror.net/mode/xmlpure/index.html) mode.
+*   New mode: [Erlang](http://codemirror.net/mode/erlang/index.html).
+*   **Remove xmlpure mode** (use [xml.js](http://codemirror.net/mode/xml/index.html)).
+*   Fix line-wrapping in Opera.
+*   Fix X Windows middle-click paste in Chrome.
+*   Fix bug that broke pasting of huge documents.
+*   Fix backspace and tab key repeat in Opera.
 
-## v2.14
+## 2.24.0
 
-*   Add [Clojure](http://codemirror.net/mode/clojure/index.html), [Pascal](http://codemirror.net/mode/pascal/index.html), [NTriples](http://codemirror.net/mode/ntriples/index.html), [Jinja2](http://codemirror.net/mode/jinja2/index.html), and [Markdown](http://codemirror.net/mode/markdown/index.html) modes.
-*   Add [Cobalt](http://codemirror.net/theme/cobalt.css) and [Eclipse](http://codemirror.net/theme/eclipse.css) themes.
-*   Add a [`fixedGutter`](http://codemirror.net/doc/manual.html#option_fixedGutter) option.
-*   Fix bug with `setValue` breaking cursor movement.
-*   Make gutter updates much more efficient.
-*   Allow dragging of text out of the editor (on modern browsers).
+*   **Drop support for Internet Explorer 6**.
+*   New modes: [Shell](http://codemirror.net/mode/shell/index.html), [Tiki wiki](http://codemirror.net/mode/tiki/index.html), [Pig Latin](http://codemirror.net/mode/pig/index.html).
+*   New themes: [Ambiance](http://codemirror.net/demo/theme.html#ambiance), [Blackboard](http://codemirror.net/demo/theme.html#blackboard).
+*   More control over drag/drop with [`dragDrop`](http://codemirror.net/doc/manual.html#option_dragDrop) and [`onDragEvent`](http://codemirror.net/doc/manual.html#option_onDragEvent) options.
+*   Make HTML mode a bit less pedantic.
+*   Add [`compoundChange`](http://codemirror.net/doc/manual.html#compoundChange) API method.
+*   Several fixes in undo history and line hiding.
+*   Remove (broken) support for `catchall` in key maps, add `nofallthrough` boolean field instead.
 
-## v2.15
+## 2.23.0
 
-Fix bug that snuck into 2.14: Clicking the character that currently has the cursor didn't re-focus the editor.
+*   Change **default binding for tab**. Starting in 2.23, these bindings are default:
+    *   Tab: Insert tab character
+    *   Shift-tab: Reset line indentation to default
+    *   Ctrl/Cmd-[: Reduce line indentation (old tab behaviour)
+    *   Ctrl/Cmd-]: Increase line indentation (old shift-tab behaviour)
+*   New modes: [XQuery](http://codemirror.net/mode/xquery/index.html) and [VBScript](http://codemirror.net/mode/vbscript/index.html).
+*   Two new themes: [lesser-dark](http://codemirror.net/mode/less/index.html) and [xq-dark](http://codemirror.net/mode/xquery/index.html).
+*   Differentiate between background and text styles in [`setLineClass`](http://codemirror.net/doc/manual.html#setLineClass).
+*   Fix drag-and-drop in IE9+.
+*   Extend [`charCoords`](http://codemirror.net/doc/manual.html#charCoords) and [`cursorCoords`](http://codemirror.net/doc/manual.html#cursorCoords) with a `mode` argument.
+*   Add [`autofocus`](http://codemirror.net/doc/manual.html#option_autofocus) option.
+*   Add [`findMarksAt`](http://codemirror.net/doc/manual.html#findMarksAt) method.
 
-## v2.16
+## 2.22.0
 
-*   Add [Perl](http://codemirror.net/mode/perl/index.html), [Rust](http://codemirror.net/mode/rust/index.html), [TiddlyWiki](http://codemirror.net/mode/tiddlywiki/index.html), and [Groovy](http://codemirror.net/mode/groovy/index.html) modes.
-*   Dragging text inside the editor now moves, rather than copies.
-*   Add a [`coordsFromIndex`](http://codemirror.net/doc/manual.html#coordsFromIndex) method.
-*   **API change**: `setValue` now no longer clears history. Use [`clearHistory`](http://codemirror.net/doc/manual.html#clearHistory) for that.
-*   **API change**: [`markText`](http://codemirror.net/doc/manual.html#markText) now returns an object with `clear` and `find` methods. Marked text is now more robust when edited.
-*   Fix editing code with tabs in Internet Explorer.
+*   Allow [key handlers](http://codemirror.net/doc/manual.html#keymaps) to pass up events, allow binding characters.
+*   Add [`autoClearEmptyLines`](http://codemirror.net/doc/manual.html#option_autoClearEmptyLines) option.
+*   Properly use tab stops when rendering tabs.
+*   Make PHP mode more robust.
+*   Support indentation blocks in [code folder](http://codemirror.net/doc/manual.html#addon_foldcode).
+*   Add a script for [highlighting instances of the selection](http://codemirror.net/doc/manual.html#addon_match-highlighter).
+*   New [.properties](http://codemirror.net/mode/properties/index.html) mode.
+*   Fix many bugs.
 
-## v2.17
+## 2.21.0
+
+*   Added [LESS](http://codemirror.net/mode/less/index.html), [MySQL](http://codemirror.net/mode/mysql/index.html), [Go](http://codemirror.net/mode/go/index.html), and [Verilog](http://codemirror.net/mode/verilog/index.html) modes.
+*   Add [`smartIndent`](http://codemirror.net/doc/manual.html#option_smartIndent) option.
+*   Support a cursor in [`readOnly`](http://codemirror.net/doc/manual.html#option_readOnly)-mode.
+*   Support assigning multiple styles to a token.
+*   Use a new approach to drawing the selection.
+*   Add [`scrollTo`](http://codemirror.net/doc/manual.html#scrollTo) method.
+*   Allow undo/redo events to span non-adjacent lines.
+*   Lots and lots of bugfixes.
+
+## 2.18.0
+
+Fixes `TextMarker.clear`, which is broken in 2.17.
+
+## 2.17.0
 
 *   Add support for [line wrapping](http://codemirror.net/doc/manual.html#option_lineWrapping) and [code folding](http://codemirror.net/doc/manual.html#hideLine).
 *   Add [Github-style Markdown](http://codemirror.net/mode/gfm/index.html) mode.
@@ -165,82 +528,62 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 *   Make double- and triple-click work in IE.
 *   Various fixes to modes.
 
-## v2.18
-
-Fixes `TextMarker.clear`, which is broken in 2.17.
-
-## v2.2
-
-*   Slightly incompatible API changes. Read [this](http://codemirror.net/doc/upgrade_v2.2.html).
-*   New approach to [binding](http://codemirror.net/doc/manual.html#option_extraKeys) keys, support for [custom bindings](http://codemirror.net/doc/manual.html#option_keyMap).
-*   Support for overwrite (insert).
-*   [Custom-width](http://codemirror.net/doc/manual.html#option_tabSize) and [stylable](http://codemirror.net/demo/visibletabs.html) tabs.
-*   Moved more code into [add-on scripts](http://codemirror.net/doc/manual.html#addons).
-*   Support for sane vertical cursor movement in wrapped lines.
-*   More reliable handling of editing [marked text](http://codemirror.net/doc/manual.html#markText).
-*   Add minimal [emacs](http://codemirror.net/demo/emacs.html) and [vim](http://codemirror.net/demo/vim.html) bindings.
-*   Rename `coordsFromIndex` to [`posFromIndex`](http://codemirror.net/doc/manual.html#posFromIndex), add [`indexFromPos`](http://codemirror.net/doc/manual.html#indexFromPos) method.
-
-## v2.21
+## 2.16.0
 
-*   Added [LESS](http://codemirror.net/mode/less/index.html), [MySQL](http://codemirror.net/mode/mysql/index.html), [Go](http://codemirror.net/mode/go/index.html), and [Verilog](http://codemirror.net/mode/verilog/index.html) modes.
-*   Add [`smartIndent`](http://codemirror.net/doc/manual.html#option_smartIndent) option.
-*   Support a cursor in [`readOnly`](http://codemirror.net/doc/manual.html#option_readOnly)-mode.
-*   Support assigning multiple styles to a token.
-*   Use a new approach to drawing the selection.
-*   Add [`scrollTo`](http://codemirror.net/doc/manual.html#scrollTo) method.
-*   Allow undo/redo events to span non-adjacent lines.
-*   Lots and lots of bugfixes.
+*   Add [Perl](http://codemirror.net/mode/perl/index.html), [Rust](http://codemirror.net/mode/rust/index.html), [TiddlyWiki](http://codemirror.net/mode/tiddlywiki/index.html), and [Groovy](http://codemirror.net/mode/groovy/index.html) modes.
+*   Dragging text inside the editor now moves, rather than copies.
+*   Add a [`coordsFromIndex`](http://codemirror.net/doc/manual.html#coordsFromIndex) method.
+*   **API change**: `setValue` now no longer clears history. Use [`clearHistory`](http://codemirror.net/doc/manual.html#clearHistory) for that.
+*   **API change**: [`markText`](http://codemirror.net/doc/manual.html#markText) now returns an object with `clear` and `find` methods. Marked text is now more robust when edited.
+*   Fix editing code with tabs in Internet Explorer.
 
-## v2.22
+## 2.15.0
 
-*   Allow [key handlers](http://codemirror.net/doc/manual.html#keymaps) to pass up events, allow binding characters.
-*   Add [`autoClearEmptyLines`](http://codemirror.net/doc/manual.html#option_autoClearEmptyLines) option.
-*   Properly use tab stops when rendering tabs.
-*   Make PHP mode more robust.
-*   Support indentation blocks in [code folder](http://codemirror.net/doc/manual.html#addon_foldcode).
-*   Add a script for [highlighting instances of the selection](http://codemirror.net/doc/manual.html#addon_match-highlighter).
-*   New [.properties](http://codemirror.net/mode/properties/index.html) mode.
-*   Fix many bugs.
+Fix bug that snuck into 2.14: Clicking the character that currently has the cursor didn't re-focus the editor.
 
-## v2.23
+## 2.14.0
 
-*   Change **default binding for tab**. Starting in 2.23, these bindings are default:
+*   Add [Clojure](http://codemirror.net/mode/clojure/index.html), [Pascal](http://codemirror.net/mode/pascal/index.html), [NTriples](http://codemirror.net/mode/ntriples/index.html), [Jinja2](http://codemirror.net/mode/jinja2/index.html), and [Markdown](http://codemirror.net/mode/markdown/index.html) modes.
+*   Add [Cobalt](http://codemirror.net/theme/cobalt.css) and [Eclipse](http://codemirror.net/theme/eclipse.css) themes.
+*   Add a [`fixedGutter`](http://codemirror.net/doc/manual.html#option_fixedGutter) option.
+*   Fix bug with `setValue` breaking cursor movement.
+*   Make gutter updates much more efficient.
+*   Allow dragging of text out of the editor (on modern browsers).
 
-    *   Tab: Insert tab character
-    *   Shift-tab: Reset line indentation to default
-    *   Ctrl/Cmd-[: Reduce line indentation (old tab behaviour)
-    *   Ctrl/Cmd-]: Increase line indentation (old shift-tab behaviour)
+## 2.13.0
 
-*   New modes: [XQuery](http://codemirror.net/mode/xquery/index.html) and [VBScript](http://codemirror.net/mode/vbscript/index.html).
-*   Two new themes: [lesser-dark](http://codemirror.net/mode/less/index.html) and [xq-dark](http://codemirror.net/mode/xquery/index.html).
-*   Differentiate between background and text styles in [`setLineClass`](http://codemirror.net/doc/manual.html#setLineClass).
-*   Fix drag-and-drop in IE9+.
-*   Extend [`charCoords`](http://codemirror.net/doc/manual.html#charCoords) and [`cursorCoords`](http://codemirror.net/doc/manual.html#cursorCoords) with a `mode` argument.
-*   Add [`autofocus`](http://codemirror.net/doc/manual.html#option_autofocus) option.
-*   Add [`findMarksAt`](http://codemirror.net/doc/manual.html#findMarksAt) method.
+*   Add [Ruby](http://codemirror.net/mode/ruby/index.html), [R](http://codemirror.net/mode/r/index.html), [CoffeeScript](http://codemirror.net/mode/coffeescript/index.html), and [Velocity](http://codemirror.net/mode/velocity/index.html) modes.
+*   Add [`getGutterElement`](http://codemirror.net/doc/manual.html#getGutterElement) to API.
+*   Several fixes to scrolling and positioning.
+*   Add [`smartHome`](http://codemirror.net/doc/manual.html#option_smartHome) option.
+*   Add an experimental [pure XML](http://codemirror.net/mode/xmlpure/index.html) mode.
 
-## v2.24
+## 2.12.0
 
-*   **Drop support for Internet Explorer 6**.
-*   New modes: [Shell](http://codemirror.net/mode/shell/index.html), [Tiki wiki](http://codemirror.net/mode/tiki/index.html), [Pig Latin](http://codemirror.net/mode/pig/index.html).
-*   New themes: [Ambiance](http://codemirror.net/demo/theme.html#ambiance), [Blackboard](http://codemirror.net/demo/theme.html#blackboard).
-*   More control over drag/drop with [`dragDrop`](http://codemirror.net/doc/manual.html#option_dragDrop) and [`onDragEvent`](http://codemirror.net/doc/manual.html#option_onDragEvent) options.
-*   Make HTML mode a bit less pedantic.
-*   Add [`compoundChange`](http://codemirror.net/doc/manual.html#compoundChange) API method.
-*   Several fixes in undo history and line hiding.
-*   Remove (broken) support for `catchall` in key maps, add `nofallthrough` boolean field instead.
+*   Add a [SPARQL](http://codemirror.net/mode/sparql/index.html) mode.
+*   Fix bug with cursor jumping around in an unfocused editor in IE.
+*   Allow key and mouse events to bubble out of the editor. Ignore widget clicks.
+*   Solve cursor flakiness after undo/redo.
+*   Fix block-reindent ignoring the last few lines.
+*   Fix parsing of multi-line attrs in XML mode.
+*   Use `innerHTML` for HTML-escaping.
+*   Some fixes to indentation in C-like mode.
+*   Shrink horiz scrollbars when long lines removed.
+*   Fix width feedback loop bug that caused the width of an inner DIV to shrink.
 
-## v2.25
+## 2.11.0
 
-*   New mode: [Erlang](http://codemirror.net/mode/erlang/index.html).
-*   **Remove xmlpure mode** (use [xml.js](http://codemirror.net/mode/xml/index.html)).
-*   Fix line-wrapping in Opera.
-*   Fix X Windows middle-click paste in Chrome.
-*   Fix bug that broke pasting of huge documents.
-*   Fix backspace and tab key repeat in Opera.
+*   Add a [Scheme mode](http://codemirror.net/mode/scheme/index.html).
+*   Add a `replace` method to search cursors, for cursor-preserving replacements.
+*   Make the [C-like mode](http://codemirror.net/mode/clike/index.html) mode more customizable.
+*   Update XML mode to spot mismatched tags.
+*   Add `getStateAfter` API and `compareState` mode API methods for finer-grained mode magic.
+*   Add a `getScrollerElement` API method to manipulate the scrolling DIV.
+*   Fix drag-and-drop for Firefox.
+*   Add a C# configuration for the [C-like mode](http://codemirror.net/mode/clike/index.html).
+*   Add [full-screen editing](http://codemirror.net/demo/fullscreen.html) and [mode-changing](http://codemirror.net/demo/changemode.html) demos.
 
-## v2.3
+## 2.3.0
 
 *   **New scrollbar implementation**. Should flicker less. Changes DOM structure of the editor.
 *   New theme: [vibrant-ink](http://codemirror.net/demo/theme.html#vibrant-ink).
@@ -250,51 +593,50 @@ Fixes `TextMarker.clear`, which is broken in 2.17.
 *   Add a [`getScrollInfo`](http://codemirror.net/doc/manual.html#getScrollInfo) method.
 *   Lots of other [fixes](https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3).
 
-## v2.31
+## 2.2.0
 
-*   New modes: [OCaml](http://codemirror.net/mode/ocaml/index.html), [Haxe](http://codemirror.net/mode/haxe/index.html), and [VB.NET](http://codemirror.net/mode/vb/index.html).
-*   Several fixes to the new scrolling model.
-*   Add a [`setSize`](http://codemirror.net/doc/manual.html#setSize) method for programmatic resizing.
-*   Add [`getHistory`](http://codemirror.net/doc/manual.html#getHistory) and [`setHistory`](http://codemirror.net/doc/manual.html#setHistory) methods.
-*   Allow custom line separator string in [`getValue`](http://codemirror.net/doc/manual.html#getValue) and [`getRange`](http://codemirror.net/doc/manual.html#getRange).
-*   Support double- and triple-click drag, double-clicking whitespace.
-*   And more... [(all patches)](https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31)
+*   Slightly incompatible API changes. Read [this](http://codemirror.net/doc/upgrade_v2.2.html).
+*   New approach to [binding](http://codemirror.net/doc/manual.html#option_extraKeys) keys, support for [custom bindings](http://codemirror.net/doc/manual.html#option_keyMap).
+*   Support for overwrite (insert).
+*   [Custom-width](http://codemirror.net/doc/manual.html#option_tabSize) and [stylable](http://codemirror.net/demo/visibletabs.html) tabs.
+*   Moved more code into [add-on scripts](http://codemirror.net/doc/manual.html#addons).
+*   Support for sane vertical cursor movement in wrapped lines.
+*   More reliable handling of editing [marked text](http://codemirror.net/doc/manual.html#markText).
+*   Add minimal [emacs](http://codemirror.net/demo/emacs.html) and [vim](http://codemirror.net/demo/vim.html) bindings.
+*   Rename `coordsFromIndex` to [`posFromIndex`](http://codemirror.net/doc/manual.html#posFromIndex), add [`indexFromPos`](http://codemirror.net/doc/manual.html#indexFromPos) method.
 
-## v2.32
+## 2.2.0
 
-Emergency fix for a bug where an editor with line wrapping on IE will break when there is _no_ scrollbar.
+*   Add a [Lua mode](http://codemirror.net/mode/lua/index.html).
+*   Fix reverse-searching for a regexp.
+*   Empty lines can no longer break highlighting.
+*   Rework scrolling model (the outer wrapper no longer does the scrolling).
+*   Solve horizontal jittering on long lines.
+*   Add [runmode.js](http://codemirror.net/demo/runmode.html).
+*   Immediately re-highlight text when typing.
+*   Fix problem with 'sticking' horizontal scrollbar.
 
-## v2.33
+## 2.1.0
 
-*   New mode: [Sieve](http://codemirror.net/mode/sieve/index.html).
-*   New [`getViewPort`](http://codemirror.net/doc/manual.html#getViewport) and [`onViewportChange`](http://codemirror.net/doc/manual.html#option_onViewportChange) API.
-*   [Configurable](http://codemirror.net/doc/manual.html#option_cursorBlinkRate) cursor blink rate.
-*   Make binding a key to `false` disabling handling (again).
-*   Show non-printing characters as red dots.
-*   More tweaks to the scrolling model.
-*   Expanded testsuite. Basic linter added.
-*   Remove most uses of `innerHTML`. Remove `CodeMirror.htmlEscape`.
-*   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.32...v2.33) of patches.
+Add a [theme](http://codemirror.net/doc/manual.html#option_theme) system ([demo](http://codemirror.net/demo/theme.html)). Note that this is not backwards-compatible—you'll have to update your styles and modes!
 
-## v2.34
+## 2.1.0
 
-*   New mode: [Common Lisp](http://codemirror.net/mode/commonlisp/index.html).
-*   Fix right-click select-all on most browsers.
-*   Change the way highlighting happens:  
-      Saves memory and CPU cycles.  
-      `compareStates` is no longer needed.  
-      `onHighlightComplete` no longer works.
-*   Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.
-*   Add a [`CodeMirror.version`](http://codemirror.net/doc/manual.html#version) property.
-*   More robust handling of nested modes in [formatting](http://codemirror.net/demo/formatting.html) and [closetag](http://codemirror.net/demo/closetag.html) plug-ins.
-*   Un/redo now preserves [marked text](http://codemirror.net/doc/manual.html#markText) and bookmarks.
-*   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34) of patches.
+*   Add a [Smalltalk mode](http://codemirror.net/mode/smalltalk/index.html).
+*   Add a [reStructuredText mode](http://codemirror.net/mode/rst/index.html).
+*   Add a [Python mode](http://codemirror.net/mode/python/index.html).
+*   Add a [PL/SQL mode](http://codemirror.net/mode/plsql/index.html).
+*   `coordsChar` now works
+*   Fix a problem where `onCursorActivity` interfered with `onChange`.
+*   Fix a number of scrolling and mouse-click-position glitches.
+*   Pass information about the changed lines to `onChange`.
+*   Support cmd-up/down on OS X.
+*   Add triple-click line selection.
+*   Don't handle shift when changing the selection through the API.
+*   Support `"nocursor"` mode for `readOnly` option.
+*   Add an `onHighlightComplete` option.
+*   Fix the context menu for Firefox.
 
-## v2.35
+## 2.0.0
 
-*   New (sub) mode: [TypeScript](http://codemirror.net/mode/javascript/typescript.html).
-*   Don't overwrite (insert key) when pasting.
-*   Fix several bugs in [`markText`](http://codemirror.net/doc/manual.html#markText)/undo interaction.
-*   Better indentation of JavaScript code without semicolons.
-*   Add [`defineInitHook`](http://codemirror.net/doc/manual.html#defineInitHook) function.
-*   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35).
+CodeMirror 2 is a complete rewrite that's faster, smaller, simpler to use, and less dependent on browser quirks. See [this](http://codemirror.net/doc/internals.html) and [this](http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580) for more information.

From 546d2a283814890b3bc12dac1f0cf4081eaf30fb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Feb 2016 17:05:22 +0100
Subject: [PATCH 2598/4742] Show dates in CHANGELOG.md

---
 CHANGELOG.md | 182 +++++++++++++++++++++++++--------------------------
 1 file changed, 91 insertions(+), 91 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d26c697786..b702c3583b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 5.11.0
+## 5.11.0 (2016-01-20)
 
 * New modes: [JSX](http://codemirror.net/mode/jsx/index.html), [literate Haskell](http://codemirror.net/mode/haskell-literate/index.html)
 * The editor now forwards more [DOM events](http://codemirror.net/doc/manual.html#event_dom): `cut`, `copy`, `paste`, and `touchstart`. It will also forward `mousedown` for drag events
@@ -6,7 +6,7 @@
 * The [Swift](http://codemirror.net/mode/swift/index.html) mode now supports auto-indentation
 * Frontmatters in the [YAML frontmatter](http://codemirror.net/mode/yaml-frontmatter/index.html) mode are now optional as intended
 
-## 5.10.0
+## 5.10.0 (2015-12-21)
 
 * Modify the way [atomic ranges](http://codemirror.net/doc/manual.html#mark_atomic) are skipped by selection to try and make it less surprising.
 * The [Swift mode](http://codemirror.net/mode/swift/index.html) was rewritten.
@@ -16,7 +16,7 @@
 * The object passed to [`"beforeSelectionChange"`](http://codemirror.net/doc/manual.html#event_beforeSelectionChange) events now has an `origin` property.
 * New mode: [Crystal](http://codemirror.net/mode/crystal/index.html).
 
-## 5.9.0
+## 5.9.0 (2015-11-23)
 
 * Improve the way overlay (OS X-style) scrollbars are handled
 * Make [annotatescrollbar](http://codemirror.net/doc/manual.html#addon_annotatescrollbar) and scrollpastend addons work properly together
@@ -24,7 +24,7 @@
 * Properly fold comments that include block-comment-start markers
 * Many small language mode fixes
 
-## 5.8.0
+## 5.8.0 (2015-10-20)
 
 * Fixes an infinite loop in the [hardwrap addon](http://codemirror.net/doc/manual.html#addon_hardwrap)
 * New modes: [NSIS](http://codemirror.net/mode/nsis/index.html), [Ceylon](http://codemirror.net/mode/clike/index.html)
@@ -32,7 +32,7 @@
 * New option: [`allowDropFileTypes`](http://codemirror.net/doc/manual.html#option_allowDropFileTypes). Binary files can no longer be dropped into CodeMirror
 * New themes: [bespin](http://codemirror.net/demo/theme.html#bespin), [hopscotch](http://codemirror.net/demo/theme.html#hopscotch), [isotope](http://codemirror.net/demo/theme.html#isotope), [railscasts](http://codemirror.net/demo/theme.html#railscasts)
 
-## 5.7.0
+## 5.7.0 (2015-09-21)
 
 * New modes: [Vue](http://codemirror.net/mode/vue/index.html), [Oz](http://codemirror.net/mode/oz/index.html), [MscGen](http://codemirror.net/mode/mscgen/index.html) (and dialects), [Closure Stylesheets](http://codemirror.net/mode/css/gss.html)
 * Implement [CommonMark](http://commonmark.org)-style flexible list indent and cross-line code spans in [Markdown](http://codemirror.net/mode/markdown/index.html) mode
@@ -43,7 +43,7 @@
 * Tokenize properties as properties in the [CoffeeScript mode](http://codemirror.net/mode/coffeescript/index.html)
 * The [placeholder addon](http://codemirror.net/doc/manual.html#addon_placeholder) now accepts a DOM node as well as a string placeholder
 
-## 5.6.0
+## 5.6.0 (2015-08-20)
 
 * Fix bug where you could paste into a `readOnly` editor
 * Show a cursor at the drop location when dragging over the editor
@@ -54,7 +54,7 @@
 * New addons: [`autorefresh`](http://codemirror.net/doc/manual.html#addon_autorefresh) for refreshing an editor the first time it becomes visible, and `html-lint` for using [HTMLHint](http://htmlhint.com/)
 * The [`search`](http://codemirror.net/doc/manual.html#addon_search) addon now recognizes `\r` and `\n` in pattern and replacement input
 
-## 5.5.0
+## 5.5.0 (2015-07-20)
 
 *   New option: [`lineSeparator`](http://codemirror.net/doc/manual.html#option_lineSeparator) (with corresponding [method](http://codemirror.net/doc/manual.html#lineSeparator))
 *   New themes: [dracula](http://codemirror.net/demo/theme.html#dracula), [seti](http://codemirror.net/demo/theme.html#seti), [yeti](http://codemirror.net/demo/theme.html#yeti), [material](http://codemirror.net/demo/theme.html#material), and [icecoder](http://codemirror.net/demo/theme.html#icecoder)
@@ -63,14 +63,14 @@
 *   From this release on, the NPM module doesn't include documentation and demos
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.4.0...5.5.0)
 
-## 5.4.0
+## 5.4.0 (2015-06-25)
 
 *   New modes: [Twig](http://codemirror.net/mode/twig/index.html), [Elm](http://codemirror.net/mode/elm/index.html), [Factor](http://codemirror.net/mode/factor/index.html), [Swift](http://codemirror.net/mode/swift/index.html)
 *   Prefer clipboard API (if available) when pasting
 *   Refined definition highlighting in [clike](http://codemirror.net/mode/clike/index.html) mode
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.3.0...5.4.0)
 
-## 5.3.0
+## 5.3.0 (2015-05-20)
 
 *   Fix several regressions in the [`show-hint`](http://codemirror.net/doc/manual.html#addon_show-hint) addon (`completeSingle` option, `"shown"` and `"close"` events)
 *   The [vim mode](http://codemirror.net/demo/vim.html) API was [documented](http://codemirror.net/doc/manual.html#vimapi)
@@ -78,7 +78,7 @@
 *   The [clike](http://codemirror.net/mode/clike/index.html) mode can now deep-indent `switch` statements, and roughly recognizes types and defined identifiers
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.2.0...5.3.0)
 
-## 5.2.0
+## 5.2.0 (2015-04-20)
 
 *   Fix several race conditions in [`show-hint`](http://codemirror.net/doc/manual.html#addon_show-hint)'s asynchronous mode
 *   Fix backspace binding in [Sublime bindings](http://codemirror.net/demo/sublime.html)
@@ -90,7 +90,7 @@
 *   The [Vim mode](http://codemirror.net/demo/vim.html) now supports buffer-local options and the `filetype` setting
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.1.0...5.2.0)
 
-## 5.1.0
+## 5.1.0 (2015-03-23)
 
 *   New modes: [ASCII armor](http://codemirror.net/mode/asciiarmor/index.html) (PGP data), [Troff](http://codemirror.net/mode/troff/index.html), and [CMake](http://codemirror.net/mode/cmake/index.html).
 *   Remove SmartyMixed mode, rewrite [Smarty](http://codemirror.net/mode/smarty/index.html) mode to supersede it.
@@ -98,14 +98,14 @@
 *   The [closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets) can now be configured per mode.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.0.0...5.1.0).
 
-## 5.0.0
+## 5.0.0 (2015-02-20)
 
 *   Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)
 *   New option [`inputStyle`](http://codemirror.net/doc/manual.html#option_inputStyle) to switch between hidden textarea and contenteditable input.
 *   The [`getInputField`](http://codemirror.net/doc/manual.html#getInputField) method is no longer guaranteed to return a textarea.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.13.0...5.0.0).
 
-## 4.13.0
+## 4.13.0 (2015-02-20)
 
 *   Fix the way the [`closetag`](http://codemirror.net/demo/closetag.html) demo handles the slash character.
 *   New modes: [Forth](http://codemirror.net/mode/forth/index.html), [Stylus](http://codemirror.net/mode/stylus/index.html).
@@ -113,7 +113,7 @@
 *   Have the [Scala mode](http://codemirror.net/mode/clike/index.html) handle symbols and triple-quoted strings.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0).
 
-## 4.12.0
+## 4.12.0 (2015-01-22)
 
 *   The [`closetag`](http://codemirror.net/doc/manual.html#addon_closetag) addon now defines a `"closeTag"` command.
 *   Adds a `findModeByFileName` to the [mode metadata](http://codemirror.net/doc/manual.html#addon_meta) addon.
@@ -123,15 +123,15 @@
 *   The [Vim keymap](http://codemirror.net/demo/vim.html)'s search functionality now supports [scrollbar annotation](http://codemirror.net/doc/manual.html#addon_matchesonscrollbar).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.11.0...4.12.0).
 
-## 4.11.0
+## 4.11.0 (2015-01-09)
 
 Unfortunately, 4.10 did not take care of the Firefox scrolling issue entirely. This release adds two more patches to address that.
 
-## 4.10.0
+## 4.10.0 (2014-12-29)
 
 Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the cursor could end up behind the horizontal scrollbar.
 
-## 4.9.0
+## 4.9.0 (2014-12-23)
 
 *   Overhauled scroll bar handling. Add pluggable [scrollbar implementations](http://codemirror.net/demo/simplescrollbars.html).
 *   Tweaked behavior for the [completion addons](http://codemirror.net/doc/manual.html#addon_show-hint) to not take text after cursor into account.
@@ -142,7 +142,7 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 *   Allow ctrl-click to clear existing cursors.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.8.0...4.9.0).
 
-## 4.8.0
+## 4.8.0 (2014-11-22)
 
 *   Built-in support for [multi-stroke key bindings](http://codemirror.net/doc/manual.html#normalizeKeyMap).
 *   New method: [`getLineTokens`](http://codemirror.net/doc/manual.html#getLineTokens).
@@ -152,7 +152,7 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 *   Improvements to modes: [gfm](http://codemirror.net/mode/gfm/index.html) (strikethrough), [SPARQL](http://codemirror.net/mode/sparql/index.html) (version 1.1 support), and [sTeX](http://codemirror.net/mode/stex/index.html) (no more runaway math mode).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.7.0...4.8.0).
 
-## 4.7.0
+## 4.7.0 (2014-10-20)
 
 *   **Incompatible**: The [lint addon](http://codemirror.net/demo/lint.html) now passes the editor's value as first argument to asynchronous lint functions, for consistency. The editor is still passed, as fourth argument.
 *   Improved handling of unicode identifiers in modes for languages that support them.
@@ -164,14 +164,14 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 *   New logo!
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.6.0...4.7.0).
 
-## 4.6.0
+## 4.6.0 (2014-09-19)
 
 *   New mode: [Modelica](http://codemirror.net/mode/modelica/index.html)
 *   New method: [`findWordAt`](http://codemirror.net/doc/manual.html#findWordAt)
 *   Make it easier to [use text background styling](http://codemirror.net/demo/markselection.html)
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.5.0...4.6.0).
 
-## 4.5.0
+## 4.5.0 (2014-08-21)
 
 *   Fix several serious bugs with horizontal scrolling
 *   New mode: [Slim](http://codemirror.net/mode/slim/index.html)
@@ -179,7 +179,7 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 *   More fixes and extensions for the [Vim](http://codemirror.net/demo/vim.html) visual block mode
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.4.0...4.5.0).
 
-## 4.4.0
+## 4.4.0 (2014-07-21)
 
 *   **Note:** Some events might now fire in slightly different order (`"change"` is still guaranteed to fire before `"cursorActivity"`)
 *   Nested operations in multiple editors are now synced (complete at same time, reducing DOM reflows)
@@ -188,14 +188,14 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 *   Better multi-selection paste for text copied from multiple CodeMirror selections
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.3.0...4.4.0).
 
-## 4.3.0
+## 4.3.0 (2014-06-23)
 
 *   Several [vim bindings](http://codemirror.net/demo/vim.html) improvements: search and exCommand history, global flag for `:substitute`, `:global` command.
 *   Allow hiding the cursor by setting [`cursorBlinkRate`](http://codemirror.net/doc/manual.html#option_cursorBlinkRate) to a negative value.
 *   Make gutter markers themeable, use this in foldgutter.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.2.0...4.3.0).
 
-## 4.2.0
+## 4.2.0 (2014-05-19)
 
 *   Fix problem where some modes were broken by the fact that empty tokens were forbidden.
 *   Several fixes to context menu handling.
@@ -210,7 +210,7 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 *   In the [Vim bindings](http://codemirror.net/demo/vim.html): Fix bracket matching, support case conversion in visual mode, visual paste, append action.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.1.0...4.2.0).
 
-## 4.1.0
+## 4.1.0 (2014-04-22)
 
 *   _Slightly incompatible_: The [`"cursorActivity"`](http://codemirror.net/doc/manual.html#event_cursorActivity) event now fires after all other events for the operation (and only for handlers that were actually registered at the time the activity happened).
 *   New command: [`insertSoftTab`](http://codemirror.net/doc/manual.html#command_insertSoftTab).
@@ -219,17 +219,17 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 *   Many small issues from the 3.x→4.x transition were found and fixed.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.0.3...4.1.0).
 
-## 3.24.0
+## 3.24.0 (2014-04-22)
 
 Merges the improvements from 4.1 that could easily be applied to the 3.x code. Also improves the way the editor size is updated when line widgets change.
 
-## 3.23.0
+## 3.23.0 (2014-03-20)
 
 *   In the [XML mode](http://codemirror.net/mode/xml/index.html), add `brackets` style to angle brackets, fix case-sensitivity of tags for HTML.
 *   New mode: [Dylan](http://codemirror.net/mode/dylan/index.html).
 *   Many improvements to the [Vim bindings](http://codemirror.net/demo/vim.html).
 
-## 3.22.0
+## 3.22.0 (2014-02-21)
 
 *   Adds the [`findMarks`](http://codemirror.net/doc/manual.html#findMarks) method.
 *   New addons: [rulers](http://codemirror.net/doc/manual.html#addon_rulers), markdown-fold, yaml-lint.
@@ -237,7 +237,7 @@ Merges the improvements from 4.1 that could easily be applied to the 3.x code. A
 *   New mode: [Solr](http://codemirror.net/mode/solr/index.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.21.0...3.22.0).
 
-## 3.21.0
+## 3.21.0 (2014-01-16)
 
 *   Auto-indenting a block will no longer add trailing whitespace to blank lines.
 *   Marking text has a new option [`clearWhenEmpty`](http://codemirror.net/doc/manual.html#markText) to control auto-removal.
@@ -249,7 +249,7 @@ Merges the improvements from 4.1 that could easily be applied to the 3.x code. A
 *   Better ECMAScript 6 support in [JavaScript](http://codemirror.net/mode/javascript/index.html) mode.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.20.0...3.21.0).
 
-## 3.20.0
+## 3.20.0 (2013-11-21)
 
 *   New modes: [Julia](http://codemirror.net/mode/julia/index.html) and [PEG.js](http://codemirror.net/mode/pegjs/index.html).
 *   Support ECMAScript 6 in the [JavaScript mode](http://codemirror.net/mode/javascript/index.html).
@@ -258,7 +258,7 @@ Merges the improvements from 4.1 that could easily be applied to the 3.x code. A
 *   Add ‘notification’ functionality to [dialog](http://codemirror.net/doc/manual.html#addon_dialog) addon.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.19.0...3.20.0).
 
-## 3.19.0
+## 3.19.0 (2013-10-21)
 
 *   New modes: [Eiffel](http://codemirror.net/mode/eiffel/index.html), [Gherkin](http://codemirror.net/mode/gherkin/index.html), [MSSQL dialect](http://codemirror.net/mode/sql/?mime=text/x-mssql).
 *   New addons: [hardwrap](http://codemirror.net/doc/manual.html#addon_hardwrap), [sql-hint](http://codemirror.net/doc/manual.html#addon_sql-hint).
@@ -266,18 +266,18 @@ Merges the improvements from 4.1 that could easily be applied to the 3.x code. A
 *   Add [support](http://codemirror.net/doc/manual.html#token_style_line) for line-level styling from mode tokenizers.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.18.0...3.19.0).
 
-## 3.18.0
+## 3.18.0 (2013-09-23)
 
 Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", false)` would raise an error.
 
-## 3.17.0
+## 3.17.0 (2013-09-23)
 
 *   New modes: [Fortran](http://codemirror.net/mode/fortran/index.html), [Octave](http://codemirror.net/mode/octave/index.html) (Matlab), [TOML](http://codemirror.net/mode/toml/index.html), and [DTD](http://codemirror.net/mode/dtd/index.html).
 *   New addons: [`css-lint`](http://codemirror.net/addon/lint/css-lint.js), [`css-hint`](http://codemirror.net/doc/manual.html#addon_css-hint).
 *   Improve resilience to CSS 'frameworks' that globally mess up `box-sizing`.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.16.0...3.17.0).
 
-## 3.16.0
+## 3.16.0 (2013-08-21)
 
 *   The whole codebase is now under a single [license](http://codemirror.net/LICENSE) file.
 *   The project page was overhauled and redesigned.
@@ -287,7 +287,7 @@ Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", fals
 *   Added [fullscreen](http://codemirror.net/doc/manual.html#addon_fullscreen) addon.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.15.0...3.16.0).
 
-## 3.15.0
+## 3.15.0 (2013-07-29)
 
 *   New modes: [Jade](http://codemirror.net/mode/jade/index.html), [Nginx](http://codemirror.net/mode/nginx/index.html).
 *   New addons: [Tern](http://codemirror.net/demo/tern.html), [matchtags](http://codemirror.net/doc/manual.html#addon_matchtags), and [foldgutter](http://codemirror.net/doc/manual.html#addon_foldgutter).
@@ -296,7 +296,7 @@ Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", fals
 *   New themes: base16 [dark](http://codemirror.net/demo/theme.html#base16-dark)/[light](http://codemirror.net/demo/theme.html#base16-light), 3024 [dark](http://codemirror.net/demo/theme.html#3024-night)/[light](http://codemirror.net/demo/theme.html#3024-day), [tomorrow-night](http://codemirror.net/demo/theme.html#tomorrow-night-eighties).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.14.0...3.15.0).
 
-## 3.14.0
+## 3.14.0 (2013-06-20)
 
 *   New addons: [trailing space highlight](http://codemirror.net/doc/manual.html#addon_trailingspace), [XML completion](http://codemirror.net/doc/manual.html#addon_xml-hint) (rewritten), and [diff merging](http://codemirror.net/doc/manual.html#addon_merge).
 *   [`markText`](http://codemirror.net/doc/manual.html#markText) and [`addLineWidget`](http://codemirror.net/doc/manual.html#addLineWidget) now take a `handleMouseEvents` option.
@@ -307,7 +307,7 @@ Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", fals
 *   Various improvements to [Ruby](http://codemirror.net/mode/ruby/index.html), [Smarty](http://codemirror.net/mode/smarty/index.html), [SQL](http://codemirror.net/mode/sql/index.html), and [Vim](http://codemirror.net/demo/vim.html) modes.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.13.0...3.14.0).
 
-## 3.13.0
+## 3.13.0 (2013-05-20)
 
 *   New modes: [COBOL](http://codemirror.net/mode/cobol/index.html) and [HAML](http://codemirror.net/mode/haml/index.html).
 *   New options: [`cursorScrollMargin`](http://codemirror.net/doc/manual.html#option_cursorScrollMargin) and [`coverGutterNextToScrollbar`](http://codemirror.net/doc/manual.html#option_coverGutterNextToScrollbar).
@@ -315,7 +315,7 @@ Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", fals
 *   More features added to the [Vim keymap](http://codemirror.net/demo/vim.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.12...3.13.0).
 
-## 3.12.0
+## 3.12.0 (2013-04-19)
 
 *   New mode: [GNU assembler](http://codemirror.net/mode/gas/index.html).
 *   New options: [`maxHighlightLength`](http://codemirror.net/doc/manual.html#option_maxHighlightLength) and [`historyEventDelay`](http://codemirror.net/doc/manual.html#option_historyEventDelay).
@@ -324,7 +324,7 @@ Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", fals
 *   Further improvements to the vim mode.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.11...v3.12).
 
-## 3.11.0
+## 3.11.0 (2013-03-20)
 
 *   **Removed code:** `collapserange`, `formatting`, and `simple-hint` addons. `plsql` and `mysql` modes (use [`sql`](http://codemirror.net/mode/sql/index.html) mode).
 *   **Moved code:** the range-finding functions for folding now have [their own files](http://codemirror.net/addon/fold/).
@@ -338,11 +338,11 @@ Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", fals
 *   Further improvements to the [vim mode](http://codemirror.net/demo/vim.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.1...v3.11).
 
-## 3.02.0
+## 3.02.0 (2013-01-25)
 
 Single-bugfix release. Fixes a problem that prevents CodeMirror instances from being garbage-collected after they become unused.
 
-## 3.01.0
+## 3.01.0 (2013-01-21)
 
 *   Move all add-ons into an organized directory structure under [`/addon`](http://codemirror.net/addon/). **You might have to adjust your paths.**
 *   New modes: [D](http://codemirror.net/mode/d/index.html), [Sass](http://codemirror.net/mode/sass/index.html), [APL](http://codemirror.net/mode/apl/index.html), [SQL](http://codemirror.net/mode/sql/index.html) (configurable), and [Asterisk](http://codemirror.net/mode/asterisk/index.html).
@@ -355,7 +355,7 @@ Single-bugfix release. Fixes a problem that prevents CodeMirror instances from b
 *   Bring back the [`fixedGutter`](http://codemirror.net/doc/manual.html#option_fixedGutter) option.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.0...v3.01).
 
-## 3.1.0
+## 3.1.0 (2013-02-21)
 
 *   **Incompatible:** key handlers may now _return_, rather than _throw_ `CodeMirror.Pass` to signal they didn't handle the key.
 *   Make documents a [first-class construct](http://codemirror.net/doc/manual.html#api_doc), support split views and subviews.
@@ -371,7 +371,7 @@ Single-bugfix release. Fixes a problem that prevents CodeMirror instances from b
 *   Further improvements to the [vim mode](http://codemirror.net/demo/vim.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.01...v3.1).
 
-## 3.0.0
+## 3.0.0 (2012-12-10)
 
 **New major version**. Only partially backwards-compatible. See the [upgrading guide](http://codemirror.net/doc/upgrade_v3.html) for more information. Changes since release candidate 2:
 
@@ -380,18 +380,18 @@ Single-bugfix release. Fixes a problem that prevents CodeMirror instances from b
 *   Work around Safari segfault when dragging.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.0rc2...v3.0).
 
-## 2.38.0
+## 2.38.0 (2013-01-21)
 
 Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](http://codemirror.net/mode/d/index.html), [Sass](http://codemirror.net/mode/sass/index.html), [APL](http://codemirror.net/mode/apl/index.html)) from the v3 branch.
 
-## 2.37.0
+## 2.37.0 (2012-12-20)
 
 *   New mode: [SQL](http://codemirror.net/mode/sql/index.html) (will replace [plsql](http://codemirror.net/mode/plsql/index.html) and [mysql](http://codemirror.net/mode/mysql/index.html) modes).
 *   Further work on the new VIM mode.
 *   Fix Cmd/Ctrl keys on recent Operas on OS X.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.36...v2.37).
 
-## 2.36.0
+## 2.36.0 (2012-11-20)
 
 *   New mode: [Z80 assembly](http://codemirror.net/mode/z80/index.html).
 *   New theme: [Twilight](http://codemirror.net/demo/theme.html#twilight).
@@ -403,7 +403,7 @@ Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](http
 *   Add [comment-continuing](http://codemirror.net/doc/manual.html#addon_continuecomment) add-on.
 *   Full [list of patches](http://codemirror.net/https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36).
 
-## 2.35.0
+## 2.35.0 (2012-10-22)
 
 *   New (sub) mode: [TypeScript](http://codemirror.net/mode/javascript/typescript.html).
 *   Don't overwrite (insert key) when pasting.
@@ -412,7 +412,7 @@ Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](http
 *   Add [`defineInitHook`](http://codemirror.net/doc/manual.html#defineInitHook) function.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35).
 
-## 2.34.0
+## 2.34.0 (2012-09-19)
 
 *   New mode: [Common Lisp](http://codemirror.net/mode/commonlisp/index.html).
 *   Fix right-click select-all on most browsers.
@@ -426,7 +426,7 @@ Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](http
 *   Un/redo now preserves [marked text](http://codemirror.net/doc/manual.html#markText) and bookmarks.
 *   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34) of patches.
 
-## 2.33.0
+## 2.33.0 (2012-08-23)
 
 *   New mode: [Sieve](http://codemirror.net/mode/sieve/index.html).
 *   New [`getViewPort`](http://codemirror.net/doc/manual.html#getViewport) and [`onViewportChange`](http://codemirror.net/doc/manual.html#option_onViewportChange) API.
@@ -438,11 +438,11 @@ Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](http
 *   Remove most uses of `innerHTML`. Remove `CodeMirror.htmlEscape`.
 *   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.32...v2.33) of patches.
 
-## 2.32.0
+## 2.32.0 (2012-07-23)
 
 Emergency fix for a bug where an editor with line wrapping on IE will break when there is _no_ scrollbar.
 
-## 2.31.0
+## 2.31.0 (2012-07-20)
 
 *   New modes: [OCaml](http://codemirror.net/mode/ocaml/index.html), [Haxe](http://codemirror.net/mode/haxe/index.html), and [VB.NET](http://codemirror.net/mode/vb/index.html).
 *   Several fixes to the new scrolling model.
@@ -452,7 +452,17 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 *   Support double- and triple-click drag, double-clicking whitespace.
 *   And more... [(all patches)](https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31)
 
-## 2.25.0
+## 2.30.0 (2012-06-22)
+
+*   **New scrollbar implementation**. Should flicker less. Changes DOM structure of the editor.
+*   New theme: [vibrant-ink](http://codemirror.net/demo/theme.html#vibrant-ink).
+*   Many extensions to the VIM keymap (including text objects).
+*   Add [mode-multiplexing](http://codemirror.net/demo/multiplex.html) utility script.
+*   Fix bug where right-click paste works in read-only mode.
+*   Add a [`getScrollInfo`](http://codemirror.net/doc/manual.html#getScrollInfo) method.
+*   Lots of other [fixes](https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3).
+
+## 2.25.0 (2012-05-23)
 
 *   New mode: [Erlang](http://codemirror.net/mode/erlang/index.html).
 *   **Remove xmlpure mode** (use [xml.js](http://codemirror.net/mode/xml/index.html)).
@@ -461,7 +471,7 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 *   Fix bug that broke pasting of huge documents.
 *   Fix backspace and tab key repeat in Opera.
 
-## 2.24.0
+## 2.24.0 (2012-04-23)
 
 *   **Drop support for Internet Explorer 6**.
 *   New modes: [Shell](http://codemirror.net/mode/shell/index.html), [Tiki wiki](http://codemirror.net/mode/tiki/index.html), [Pig Latin](http://codemirror.net/mode/pig/index.html).
@@ -472,7 +482,7 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 *   Several fixes in undo history and line hiding.
 *   Remove (broken) support for `catchall` in key maps, add `nofallthrough` boolean field instead.
 
-## 2.23.0
+## 2.23.0 (2012-03-26)
 
 *   Change **default binding for tab**. Starting in 2.23, these bindings are default:
     *   Tab: Insert tab character
@@ -487,7 +497,7 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 *   Add [`autofocus`](http://codemirror.net/doc/manual.html#option_autofocus) option.
 *   Add [`findMarksAt`](http://codemirror.net/doc/manual.html#findMarksAt) method.
 
-## 2.22.0
+## 2.22.0 (2012-02-27)
 
 *   Allow [key handlers](http://codemirror.net/doc/manual.html#keymaps) to pass up events, allow binding characters.
 *   Add [`autoClearEmptyLines`](http://codemirror.net/doc/manual.html#option_autoClearEmptyLines) option.
@@ -498,7 +508,7 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 *   New [.properties](http://codemirror.net/mode/properties/index.html) mode.
 *   Fix many bugs.
 
-## 2.21.0
+## 2.21.0 (2012-01-27)
 
 *   Added [LESS](http://codemirror.net/mode/less/index.html), [MySQL](http://codemirror.net/mode/mysql/index.html), [Go](http://codemirror.net/mode/go/index.html), and [Verilog](http://codemirror.net/mode/verilog/index.html) modes.
 *   Add [`smartIndent`](http://codemirror.net/doc/manual.html#option_smartIndent) option.
@@ -509,11 +519,23 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 *   Allow undo/redo events to span non-adjacent lines.
 *   Lots and lots of bugfixes.
 
-## 2.18.0
+## 2.20.0 (2011-12-20)
+
+*   Slightly incompatible API changes. Read [this](http://codemirror.net/doc/upgrade_v2.2.html).
+*   New approach to [binding](http://codemirror.net/doc/manual.html#option_extraKeys) keys, support for [custom bindings](http://codemirror.net/doc/manual.html#option_keyMap).
+*   Support for overwrite (insert).
+*   [Custom-width](http://codemirror.net/doc/manual.html#option_tabSize) and [stylable](http://codemirror.net/demo/visibletabs.html) tabs.
+*   Moved more code into [add-on scripts](http://codemirror.net/doc/manual.html#addons).
+*   Support for sane vertical cursor movement in wrapped lines.
+*   More reliable handling of editing [marked text](http://codemirror.net/doc/manual.html#markText).
+*   Add minimal [emacs](http://codemirror.net/demo/emacs.html) and [vim](http://codemirror.net/demo/vim.html) bindings.
+*   Rename `coordsFromIndex` to [`posFromIndex`](http://codemirror.net/doc/manual.html#posFromIndex), add [`indexFromPos`](http://codemirror.net/doc/manual.html#indexFromPos) method.
+
+## 2.18.0 (2011-11-21)
 
 Fixes `TextMarker.clear`, which is broken in 2.17.
 
-## 2.17.0
+## 2.17.0 (2011-11-21)
 
 *   Add support for [line wrapping](http://codemirror.net/doc/manual.html#option_lineWrapping) and [code folding](http://codemirror.net/doc/manual.html#hideLine).
 *   Add [Github-style Markdown](http://codemirror.net/mode/gfm/index.html) mode.
@@ -528,7 +550,7 @@ Fixes `TextMarker.clear`, which is broken in 2.17.
 *   Make double- and triple-click work in IE.
 *   Various fixes to modes.
 
-## 2.16.0
+## 2.16.0 (2011-10-27)
 
 *   Add [Perl](http://codemirror.net/mode/perl/index.html), [Rust](http://codemirror.net/mode/rust/index.html), [TiddlyWiki](http://codemirror.net/mode/tiddlywiki/index.html), and [Groovy](http://codemirror.net/mode/groovy/index.html) modes.
 *   Dragging text inside the editor now moves, rather than copies.
@@ -537,11 +559,11 @@ Fixes `TextMarker.clear`, which is broken in 2.17.
 *   **API change**: [`markText`](http://codemirror.net/doc/manual.html#markText) now returns an object with `clear` and `find` methods. Marked text is now more robust when edited.
 *   Fix editing code with tabs in Internet Explorer.
 
-## 2.15.0
+## 2.15.0 (2011-09-26)
 
 Fix bug that snuck into 2.14: Clicking the character that currently has the cursor didn't re-focus the editor.
 
-## 2.14.0
+## 2.14.0 (2011-09-26)
 
 *   Add [Clojure](http://codemirror.net/mode/clojure/index.html), [Pascal](http://codemirror.net/mode/pascal/index.html), [NTriples](http://codemirror.net/mode/ntriples/index.html), [Jinja2](http://codemirror.net/mode/jinja2/index.html), and [Markdown](http://codemirror.net/mode/markdown/index.html) modes.
 *   Add [Cobalt](http://codemirror.net/theme/cobalt.css) and [Eclipse](http://codemirror.net/theme/eclipse.css) themes.
@@ -550,7 +572,7 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 *   Make gutter updates much more efficient.
 *   Allow dragging of text out of the editor (on modern browsers).
 
-## 2.13.0
+## 2.13.0 (2011-08-23)
 
 *   Add [Ruby](http://codemirror.net/mode/ruby/index.html), [R](http://codemirror.net/mode/r/index.html), [CoffeeScript](http://codemirror.net/mode/coffeescript/index.html), and [Velocity](http://codemirror.net/mode/velocity/index.html) modes.
 *   Add [`getGutterElement`](http://codemirror.net/doc/manual.html#getGutterElement) to API.
@@ -558,7 +580,7 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 *   Add [`smartHome`](http://codemirror.net/doc/manual.html#option_smartHome) option.
 *   Add an experimental [pure XML](http://codemirror.net/mode/xmlpure/index.html) mode.
 
-## 2.12.0
+## 2.12.0 (2011-07-25)
 
 *   Add a [SPARQL](http://codemirror.net/mode/sparql/index.html) mode.
 *   Fix bug with cursor jumping around in an unfocused editor in IE.
@@ -571,7 +593,7 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 *   Shrink horiz scrollbars when long lines removed.
 *   Fix width feedback loop bug that caused the width of an inner DIV to shrink.
 
-## 2.11.0
+## 2.11.0 (2011-07-04)
 
 *   Add a [Scheme mode](http://codemirror.net/mode/scheme/index.html).
 *   Add a `replace` method to search cursors, for cursor-preserving replacements.
@@ -583,29 +605,11 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 *   Add a C# configuration for the [C-like mode](http://codemirror.net/mode/clike/index.html).
 *   Add [full-screen editing](http://codemirror.net/demo/fullscreen.html) and [mode-changing](http://codemirror.net/demo/changemode.html) demos.
 
-## 2.3.0
-
-*   **New scrollbar implementation**. Should flicker less. Changes DOM structure of the editor.
-*   New theme: [vibrant-ink](http://codemirror.net/demo/theme.html#vibrant-ink).
-*   Many extensions to the VIM keymap (including text objects).
-*   Add [mode-multiplexing](http://codemirror.net/demo/multiplex.html) utility script.
-*   Fix bug where right-click paste works in read-only mode.
-*   Add a [`getScrollInfo`](http://codemirror.net/doc/manual.html#getScrollInfo) method.
-*   Lots of other [fixes](https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3).
-
-## 2.2.0
+## 2.10.0 (2011-06-07)
 
-*   Slightly incompatible API changes. Read [this](http://codemirror.net/doc/upgrade_v2.2.html).
-*   New approach to [binding](http://codemirror.net/doc/manual.html#option_extraKeys) keys, support for [custom bindings](http://codemirror.net/doc/manual.html#option_keyMap).
-*   Support for overwrite (insert).
-*   [Custom-width](http://codemirror.net/doc/manual.html#option_tabSize) and [stylable](http://codemirror.net/demo/visibletabs.html) tabs.
-*   Moved more code into [add-on scripts](http://codemirror.net/doc/manual.html#addons).
-*   Support for sane vertical cursor movement in wrapped lines.
-*   More reliable handling of editing [marked text](http://codemirror.net/doc/manual.html#markText).
-*   Add minimal [emacs](http://codemirror.net/demo/emacs.html) and [vim](http://codemirror.net/demo/vim.html) bindings.
-*   Rename `coordsFromIndex` to [`posFromIndex`](http://codemirror.net/doc/manual.html#posFromIndex), add [`indexFromPos`](http://codemirror.net/doc/manual.html#indexFromPos) method.
+Add a [theme](http://codemirror.net/doc/manual.html#option_theme) system ([demo](http://codemirror.net/demo/theme.html)). Note that this is not backwards-compatible—you'll have to update your styles and modes!
 
-## 2.2.0
+## 2.2.0 (2011-06-07)
 
 *   Add a [Lua mode](http://codemirror.net/mode/lua/index.html).
 *   Fix reverse-searching for a regexp.
@@ -616,11 +620,7 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 *   Immediately re-highlight text when typing.
 *   Fix problem with 'sticking' horizontal scrollbar.
 
-## 2.1.0
-
-Add a [theme](http://codemirror.net/doc/manual.html#option_theme) system ([demo](http://codemirror.net/demo/theme.html)). Note that this is not backwards-compatible—you'll have to update your styles and modes!
-
-## 2.1.0
+## 2.1.0 (2011-05-26)
 
 *   Add a [Smalltalk mode](http://codemirror.net/mode/smalltalk/index.html).
 *   Add a [reStructuredText mode](http://codemirror.net/mode/rst/index.html).
@@ -637,6 +637,6 @@ Add a [theme](http://codemirror.net/doc/manual.html#option_theme) system ([demo]
 *   Add an `onHighlightComplete` option.
 *   Fix the context menu for Firefox.
 
-## 2.0.0
+## 2.0.0 (2011-03-28)
 
 CodeMirror 2 is a complete rewrite that's faster, smaller, simpler to use, and less dependent on browser quirks. See [this](http://codemirror.net/doc/internals.html) and [this](http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580) for more information.

From 9e2e337d45937a341514d1e385d7b2a664eaa99e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Feb 2016 17:41:37 +0100
Subject: [PATCH 2599/4742] Mark release 5.12.0

---
 AUTHORS           |  7 +++++++
 CHANGELOG.md      | 42 ++++++++++++++++++++++++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 23 +++++++++++++++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 8 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 09fe9a893c..741ba1e35e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -124,6 +124,7 @@ Daniel, Dao Quang Minh
 Daniele Di Sarli
 Daniel Faust
 Daniel Huigens
+Daniel Kesler
 Daniel KJ
 Daniel Neel
 Daniel Parnell
@@ -186,6 +187,7 @@ gekkoe
 Gerard Braad
 Gergely Hegykozi
 Giovanni Calò
+Glebov Boris
 Glenn Jorde
 Glenn Ruehle
 Golevka
@@ -255,6 +257,7 @@ John Engler
 John Lees-Miller
 John Snelson
 John Van Der Loo
+Jon Ander Peñalba
 Jonas Döbertin
 Jonathan Malmaud
 jongalloway
@@ -414,6 +417,7 @@ Patrick Stoica
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
+Pavel
 Pavel Feldman
 Pavel Strashkin
 Paweł Bartkiewicz
@@ -481,7 +485,9 @@ Stanislav Oaserele
 Stas Kobzar
 Stefan Borsje
 Steffen Beyer
+Steffen Bruchmann
 Stephen Lavelle
+Steve Champagne
 Steve O'Hara
 stoskov
 Stu Kennedy
@@ -534,6 +540,7 @@ Yassin N. Hassan
 YNH Webdev
 Yunchi Luo
 Yuvi Panda
+Zac Anger
 Zachary Dremann
 Zhang Hao
 zziuni
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b702c3583b..7eb70e9c53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,45 @@
+## 5.12.0 (2015-02-19)
+
+### New features
+
+[Vim bindings](http://codemirror.net/demo/vim.html): Ctrl-Q is now an alias for Ctrl-V.
+
+[Vim bindings](http://codemirror.net/demo/vim.html): The Vim API now exposes an `unmap` method to unmap bindings.
+
+[active-line addon](http://codemirror.net/demo/activeline.html): This addon can now style the active line's gutter.
+
+[FCL mode](http://codemirror.net/mode/fcl/): Newly added.
+
+[SQL mode](http://codemirror.net/mode/sql/): Now has a Postgresql dialect.
+
+### Bugfixes
+
+Fix [issue](https://github.com/codemirror/CodeMirror/issues/3781) where trying to scroll to a horizontal position outside of the document's width could cause the gutter to be positioned incorrectly.
+
+Use absolute, rather than fixed positioning in the context-menu intercept hack, to work around a [problem](https://github.com/codemirror/CodeMirror/issues/3238) when the editor is inside a transformed parent container.
+
+Solve a [problem](https://github.com/codemirror/CodeMirror/issues/3821) where the horizontal scrollbar could hide text in Firefox.
+
+Fix a [bug](https://github.com/codemirror/CodeMirror/issues/3834) that caused phantom scroll space under the text in some situations.
+
+[Sublime Text bindings](http://codemirror.net/demo/sublime.html): Bind delete-line to Shift-Ctrl-K on OS X.
+
+[Markdown mode](http://codemirror.net/mode/markdown/): Fix [issue](https://github.com/codemirror/CodeMirror/issues/3787) where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.
+
+[Markdown mode](http://codemirror.net/mode/markdown/): Ignore backslashes in code fragments.
+
+[Markdown mode](http://codemirror.net/mode/markdown/): Use whichever mode is registered as `text/html` to parse HTML.
+
+[Clike mode](http://codemirror.net/mode/clike/): Improve indentation of Scala `=>` functions.
+
+[Python mode](http://codemirror.net/mode/python/): Improve indentation of bracketed code.
+
+[HTMLMixed mode](http://codemirror.net/mode/htmlmixed/): Support multi-line opening tags for sub-languages (`<script>`, `<style>`, etc).
+
+[Spreadsheet mode](http://codemirror.net/mode/spreadsheet/): Fix bug where the mode did not advance the stream when finding a backslash.
+
+[XML mode](http://codemirror.net/mode/xml/): The mode now takes a `matchClosing` option to configure whether mismatched closing tags should be highlighted as errors.
+
 ## 5.11.0 (2016-01-20)
 
 * New modes: [JSX](http://codemirror.net/mode/jsx/index.html), [literate Haskell](http://codemirror.net/mode/haskell-literate/index.html)
diff --git a/doc/compress.html b/doc/compress.html
index 517d57511a..8f0d3e9f42 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.12.0;f=">5.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.11.0;f=">5.11</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.10.0;f=">5.10</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.9.0;f=">5.9</option>
diff --git a/doc/manual.html b/doc/manual.html
index c48a35f90e..8081d8ca40 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.11.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.12.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 43ee827413..a8e15ac059 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,29 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">19-02-2016: <a href="http://codemirror.net/codemirror-5.12.zip">Version 5.12</a>:</p>
+
+  <ul>
+    <li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: Ctrl-Q is now an alias for Ctrl-V.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: The Vim API now exposes an <code>unmap</code> method to unmap bindings.</li>
+    <li><a href="http://codemirror.net/demo/activeline.html">active-line addon</a>: This addon can now style the active line's gutter.</li>
+    <li><a href="http://codemirror.net/mode/fcl/">FCL mode</a>: Newly added.</li>
+    <li><a href="http://codemirror.net/mode/sql/">SQL mode</a>: Now has a Postgresql dialect.</li>
+    <li>Fix <a href="https://github.com/codemirror/CodeMirror/issues/3781">issue</a> where trying to scroll to a horizontal position outside of the document's width could cause the gutter to be positioned incorrectly.</li>
+    <li>Use absolute, rather than fixed positioning in the context-menu intercept hack, to work around a <a href="https://github.com/codemirror/CodeMirror/issues/3238">problem</a> when the editor is inside a transformed parent container.</li>
+    <li>Solve a <a href="https://github.com/codemirror/CodeMirror/issues/3821">problem</a> where the horizontal scrollbar could hide text in Firefox.</li>
+    <li>Fix a <a href="https://github.com/codemirror/CodeMirror/issues/3834">bug</a> that caused phantom scroll space under the text in some situations.</li>
+    <li><a href="http://codemirror.net/demo/sublime.html">Sublime Text bindings</a>: Bind delete-line to Shift-Ctrl-K on OS X.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">Markdown mode</a>: Fix <a href="https://github.com/codemirror/CodeMirror/issues/3787">issue</a> where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">Markdown mode</a>: Ignore backslashes in code fragments.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">Markdown mode</a>: Use whichever mode is registered as <code>text/html</code> to parse HTML.</li>
+    <li><a href="http://codemirror.net/mode/clike/">Clike mode</a>: Improve indentation of Scala <code>=&gt;</code> functions.</li>
+    <li><a href="http://codemirror.net/mode/python/">Python mode</a>: Improve indentation of bracketed code.</li>
+    <li><a href="http://codemirror.net/mode/htmlmixed/">HTMLMixed mode</a>: Support multi-line opening tags for sub-languages (<code>&lt;script&gt;</code>, <code>&lt;style&gt;</code>, etc).</li>
+    <li><a href="http://codemirror.net/mode/spreadsheet/">Spreadsheet mode</a>: Fix bug where the mode did not advance the stream when finding a backslash.</li>
+    <li><a href="http://codemirror.net/mode/xml/">XML mode</a>: The mode now takes a <code>matchClosing</code> option to configure whether mismatched closing tags should be highlighted as errors.</li>
+  </ul>
+
   <p class="rel">20-01-2016: <a href="http://codemirror.net/codemirror-5.11.zip">Version 5.11</a>:</p>
 
   <ul>
diff --git a/index.html b/index.html
index 2bb1f41d1f..1762598d8d 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.11</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.12</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 14c8b7389d..e803211bc2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8886,7 +8886,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.11.1";
+  CodeMirror.version = "5.12.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index f24c06fc24..0ff734e8ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.11.1",
+    "version":"5.12.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From a196861f9a44db63f946bbe68119f8ab903f3bd5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 19 Feb 2016 17:42:39 +0100
Subject: [PATCH 2600/4742] Bump version number post-5.12

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8081d8ca40..29a7ed38e0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.12.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.12.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index e803211bc2..f771880464 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8886,7 +8886,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.12.0";
+  CodeMirror.version = "5.12.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 0ff734e8ce..1b4f32e523 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.12.0",
+    "version":"5.12.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 68076a88d5e6949a08193e7fcc5b7fc6203fb19a Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Fri, 19 Feb 2016 15:49:57 -0500
Subject: [PATCH 2601/4742] Delete duplicate entry "MariaDB" from mode/meta.js

It's already listed above as "MariaDB SQL".

Also add the ".mps" extension to the MUMPS mode.
---
 mode/meta.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mode/meta.js b/mode/meta.js
index bc34cf8320..e90ab29448 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -84,7 +84,7 @@
     {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
     {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
     {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
-    {name: "MUMPS", mime: "text/x-mumps", mode: "mumps"},
+    {name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
     {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},
@@ -127,7 +127,6 @@
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
     {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
     {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
-    {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
     {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
     {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},

From aae30f7cd4216b1ef23c7cd3e901c81bbeba437e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 22 Feb 2016 16:42:41 +0100
Subject: [PATCH 2602/4742] Fix boundary detection logic in findMarks

Closes #3840
---
 lib/codemirror.js | 6 +++---
 test/test.js      | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f771880464..1d3cb03d18 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7622,9 +7622,9 @@
         var spans = line.markedSpans;
         if (spans) for (var i = 0; i < spans.length; i++) {
           var span = spans[i];
-          if (!(lineNo == from.line && from.ch > span.to ||
-                span.from == null && lineNo != from.line||
-                lineNo == to.line && span.from > to.ch) &&
+          if (!(span.to != null && lineNo == from.line && from.ch > span.to ||
+                span.from == null && lineNo != from.line ||
+                span.from != null && lineNo == to.line && span.from > to.ch) &&
               (!filter || filter(span.marker)))
             found.push(span.marker.parent || span.marker);
         }
diff --git a/test/test.js b/test/test.js
index 01efbce866..82ee231e35 100644
--- a/test/test.js
+++ b/test/test.js
@@ -509,6 +509,13 @@ testCM("markClearBetween", function(cm) {
   eq(cm.findMarksAt(Pos(1, 1)).length, 0);
 });
 
+testCM("findMarksMiddle", function(cm) {
+  var mark = cm.markText(Pos(1, 1), Pos(3, 1));
+  var found = cm.findMarks(Pos(2, 1), Pos(2, 2));
+  eq(found.length, 1);
+  eq(found[0], mark);
+}, {value: "line 0\nline 1\nline 2\nline 3"});
+
 testCM("deleteSpanCollapsedInclusiveLeft", function(cm) {
   var from = Pos(1, 0), to = Pos(1, 1);
   var m = cm.markText(from, to, {collapsed: true, inclusiveLeft: true});

From caed3308e3c406b911ed6ed9397fb92c3e92383e Mon Sep 17 00:00:00 2001
From: ken restivo <ken@restivo.org>
Date: Sat, 20 Feb 2016 16:10:43 -0800
Subject: [PATCH 2603/4742] [mode/meta] Add cljc, cljx, and edn extensions for
 clojure language

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

diff --git a/mode/meta.js b/mode/meta.js
index e90ab29448..8ef78dbe91 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -21,7 +21,7 @@
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
-    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
+    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx", "edn"]},
     {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
     {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
     {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},

From 8b9066a7f9f64474b3f6035de9f6af74c18e96b6 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Mon, 22 Feb 2016 16:16:51 -0500
Subject: [PATCH 2604/4742] Nit: add semicolons to the end of several modes.

Fixes #3842.
---
 mode/haskell-literate/haskell-literate.js | 2 +-
 mode/jsx/jsx.js                           | 2 +-
 mode/swift/swift.js                       | 2 +-
 mode/yaml-frontmatter/yaml-frontmatter.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/haskell-literate/haskell-literate.js b/mode/haskell-literate/haskell-literate.js
index 9358994db9..906415b4c1 100644
--- a/mode/haskell-literate/haskell-literate.js
+++ b/mode/haskell-literate/haskell-literate.js
@@ -40,4 +40,4 @@
   }, "haskell")
 
   CodeMirror.defineMIME("text/x-literate-haskell", "haskell-literate")
-})
+});
diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index bc2ea79758..0c018318f2 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -144,4 +144,4 @@
   }, "xml", "javascript")
 
   CodeMirror.defineMIME("text/jsx", "jsx")
-})
+});
diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 86d1c6b9b8..3c28ced329 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -199,4 +199,4 @@
   })
 
   CodeMirror.defineMIME("text/x-swift","swift")
-})
+});
diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
index 9f081b009a..5f49772370 100644
--- a/mode/yaml-frontmatter/yaml-frontmatter.js
+++ b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -65,4 +65,4 @@
       }
     }
   })
-})
+});

From 3f752d0c4ec639a40fb081020843a098840f1fae Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Mon, 22 Feb 2016 15:00:46 +0700
Subject: [PATCH 2605/4742] [dylan mode] Improve and add tests

 * Support nested block comments.
 * Improve number and operator parsing.
 * Improve string parsing.
 * Style brackets correctly.
 * Improve #-words.
---
 mode/dylan/dylan.js | 85 ++++++++++++++++++++++++++++++++++---------
 mode/dylan/test.js  | 88 +++++++++++++++++++++++++++++++++++++++++++++
 test/index.html     |  2 ++
 3 files changed, 159 insertions(+), 16 deletions(-)
 create mode 100644 mode/dylan/test.js

diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index 85f0166c10..1b46bc8284 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -169,15 +169,16 @@ CodeMirror.defineMode("dylan", function(_config) {
       } else if (stream.eat("/")) {
         stream.skipToEnd();
         return "comment";
-      } else {
-        stream.skipTo(" ");
-        return "operator";
       }
+      stream.backUp(1);
     }
     // Decimal
-    else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:e[+\-]?\d+)?/);
-      return "number";
+    else if (/[+\-\d\.]/.test(ch)) {
+      if (stream.match(/^[+-]?[0-9]*\.[0-9]*([esdx][+-]?[0-9]+)?/i) ||
+          stream.match(/^[+-]?[0-9]+([esdx][+-]?[0-9]+)/i) ||
+          stream.match(/^[+-]?\d+/)) {
+        return "number";
+      }
     }
     // Hash
     else if (ch == "#") {
@@ -186,7 +187,7 @@ CodeMirror.defineMode("dylan", function(_config) {
       ch = stream.peek();
       if (ch == '"') {
         stream.next();
-        return chain(stream, state, tokenString('"', "string-2"));
+        return chain(stream, state, tokenString('"', "string"));
       }
       // Binary number
       else if (ch == "b") {
@@ -206,11 +207,51 @@ CodeMirror.defineMode("dylan", function(_config) {
         stream.eatWhile(/[0-7]/);
         return "number";
       }
+      // Token concatenation in macros
+      else if (ch == '#') {
+        stream.next();
+        return "punctuation";
+      }
+      // Sequence literals
+      else if ((ch == '[') || (ch == '(')) {
+        stream.next();
+        return "bracket";
       // Hash symbol
-      else {
+      } else if (stream.match(/f|t|all-keys|include|key|next|rest/i)) {
+        return "atom";
+      } else {
         stream.eatWhile(/[-a-zA-Z]/);
-        return "keyword";
+        return "error";
+      }
+    } else if (ch == "~") {
+      stream.next();
+      ch = stream.peek();
+      if (ch == "=") {
+        stream.next();
+        ch = stream.peek();
+        if (ch == "=") {
+          stream.next();
+          return "operator";
+        }
+        return "operator";
       }
+      return "operator";
+    } else if (ch == ":") {
+      stream.next();
+      ch = stream.peek();
+      if (ch == "=") {
+        stream.next();
+        return "operator";
+      } else if (ch == ":") {
+        stream.next();
+        return "punctuation";
+      }
+    } else if ("[](){}".indexOf(ch) != -1) {
+      stream.next();
+      return "bracket";
+    } else if (".,".indexOf(ch) != -1) {
+      stream.next();
+      return "punctuation";
     } else if (stream.match("end")) {
       return "keyword";
     }
@@ -223,6 +264,10 @@ CodeMirror.defineMode("dylan", function(_config) {
           return patternStyles[name];
       }
     }
+    if (/[+\-*\/^=<>&|]/.test(ch)) {
+      stream.next();
+      return "operator";
+    }
     if (stream.match("define")) {
       return "def";
     } else {
@@ -240,29 +285,37 @@ CodeMirror.defineMode("dylan", function(_config) {
   }
 
   function tokenComment(stream, state) {
-    var maybeEnd = false,
-    ch;
+    var maybeEnd = false, maybeNested = false, nestedCount = 0, ch;
     while ((ch = stream.next())) {
       if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
+        if (nestedCount > 0) {
+          nestedCount--;
+        } else {
+          state.tokenize = tokenBase;
+          break;
+        }
+      } else if (ch == "*" && maybeNested) {
+        nestedCount++;
       }
       maybeEnd = (ch == "*");
+      maybeNested = (ch == "/");
     }
     return "comment";
   }
 
   function tokenString(quote, style) {
     return function(stream, state) {
-      var next, end = false;
+      var escaped = false, next, end = false;
       while ((next = stream.next()) != null) {
-        if (next == quote) {
+        if (next == quote && !escaped) {
           end = true;
           break;
         }
+        escaped = !escaped && next == "\\";
       }
-      if (end)
+      if (end || !escaped) {
         state.tokenize = tokenBase;
+      }
       return style;
     };
   }
diff --git a/mode/dylan/test.js b/mode/dylan/test.js
new file mode 100644
index 0000000000..bf25be27e1
--- /dev/null
+++ b/mode/dylan/test.js
@@ -0,0 +1,88 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "dylan");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT('comments',
+     '[comment // This is a line comment]',
+     '[comment /* This is a block comment */]',
+     '[comment /* This is a multi]',
+     '[comment line comment]',
+     '[comment */]',
+     '[comment /* And this is a /*]',
+     '[comment /* nested */ comment */]');
+
+  MT('unary_operators',
+     '[operator -][variable a]',
+     '[operator -] [variable a]',
+     '[operator ~][variable a]',
+     '[operator ~] [variable a]');
+
+  MT('binary_operators',
+     '[variable a] [operator +] [variable b]',
+     '[variable a] [operator -] [variable b]',
+     '[variable a] [operator *] [variable b]',
+     '[variable a] [operator /] [variable b]',
+     '[variable a] [operator ^] [variable b]',
+     '[variable a] [operator =] [variable b]',
+     '[variable a] [operator ==] [variable b]',
+     '[variable a] [operator ~=] [variable b]',
+     '[variable a] [operator ~==] [variable b]',
+     '[variable a] [operator <] [variable b]',
+     '[variable a] [operator <=] [variable b]',
+     '[variable a] [operator >] [variable b]',
+     '[variable a] [operator >=] [variable b]',
+     '[variable a] [operator &] [variable b]',
+     '[variable a] [operator |] [variable b]',
+     '[variable a] [operator :=] [variable b]');
+
+  MT('integers',
+     '[number 1]',
+     '[number 123]',
+     '[number -123]',
+     '[number +456]',
+     '[number #b010]',
+     '[number #o073]',
+     '[number #xabcDEF123]');
+
+  MT('floats',
+     '[number .3]',
+     '[number -1.]',
+     '[number -2.335]',
+     '[number +3.78d1]',
+     '[number 3.78s-1]',
+     '[number -3.32e+5]');
+
+  MT('characters_and_strings',
+     "[string 'a']",
+     "[string '\\\\'']",
+     '[string ""]',
+     '[string "a"]',
+     '[string "abc def"]',
+     '[string "More escaped characters: \\\\\\\\ \\\\a \\\\b \\\\e \\\\f \\\\n \\\\r \\\\t \\\\0 ..."]');
+
+  MT('brackets',
+     '[bracket #[[]]]',
+     '[bracket #()]',
+     '[bracket #(][number 1][bracket )]',
+     '[bracket [[][number 1][punctuation ,] [number 3][bracket ]]]',
+     '[bracket ()]',
+     '[bracket {}]',
+     '[keyword if] [bracket (][variable foo][bracket )]',
+     '[bracket (][number 1][bracket )]',
+     '[bracket [[][number 1][bracket ]]]');
+
+  MT('hash_words',
+     '[punctuation ##]',
+     '[atom #f]', '[atom #F]',
+     '[atom #t]', '[atom #T]',
+     '[atom #all-keys]',
+     '[atom #include]',
+     '[atom #key]',
+     '[atom #next]',
+     '[atom #rest]',
+     '[string #"foo"]',
+     '[error #invalid]');
+})();
diff --git a/test/index.html b/test/index.html
index 3e227a061d..5f8ebadc15 100644
--- a/test/index.html
+++ b/test/index.html
@@ -40,6 +40,7 @@
 <script src="../keymap/vim.js"></script>
 <script src="../mode/rust/rust.js"></script>
 <script src="../mode/mscgen/mscgen.js"></script>
+<script src="../mode/dylan/dylan.js"></script>
 
 <style type="text/css">
   .ok {color: #090;}
@@ -123,6 +124,7 @@ <h2>Test Suite</h2>
     <script src="../mode/mscgen/mscgen_test.js"></script>
     <script src="../mode/mscgen/xu_test.js"></script>
     <script src="../mode/mscgen/msgenny_test.js"></script>
+    <script src="../mode/dylan/test.js"></script>
     <script src="../addon/mode/multiplex_test.js"></script>
     <script src="emacs_test.js"></script>
     <script src="sql-hint-test.js"></script>

From 430ee2daf209dd646b290f535abd22f8c49cd2da Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 28 Feb 2016 22:37:01 +0100
Subject: [PATCH 2606/4742] Fix bad assumption in skipAtomic

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1d3cb03d18..44c93594ea 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2264,7 +2264,8 @@
         }
 
         var far = m.find(dir < 0 ? -1 : 1);
-        if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight) far = movePos(doc, far, dir, line);
+        if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+          far = movePos(doc, far, dir, far.line == pos.line ? line : null);
         return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
       }
     }

From 4df2c76a63997c84954c48ee31f8645855f14434 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 28 Feb 2016 23:16:58 +0100
Subject: [PATCH 2607/4742] [sql-hint addon] Clean up table matching, make
 case-insensitive

Closes #3847
---
 addon/hint/sql-hint.js | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 22124b58f7..0bef7a29a1 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -30,10 +30,22 @@
     return typeof item == "string" ? item : item.text;
   }
 
-  function getItem(list, item) {
-    if (!list.slice) return list[item];
-    for (var i = list.length - 1; i >= 0; i--) if (getText(list[i]) == item)
-      return list[i];
+  function parseTables(input) {
+    var result = {}
+    if (Object.prototype.toString.call(input) == "[object Array]") {
+      for (var i = input.length - 1; i >= 0; i--) {
+        var item = input[i]
+        result[getText(item).toUpperCase()] = item
+      }
+    } else if (input) {
+      for (var name in input)
+        result[name.toUpperCase()] = input[name]
+    }
+    return result
+  }
+
+  function getTable(name) {
+    return tables[name.toUpperCase()]
   }
 
   function shallowClone(object) {
@@ -115,13 +127,13 @@
     var alias = false;
     var aliasTable = table;
     // Check if table is available. If not, find table by Alias
-    if (!getItem(tables, table)) {
+    if (!getTable(table)) {
       var oldTable = table;
       table = findTableByAlias(table, editor);
       if (table !== oldTable) alias = true;
     }
 
-    var columns = getItem(tables, table);
+    var columns = getTable(table);
     if (columns && columns.columns)
       columns = columns.columns;
 
@@ -184,7 +196,7 @@
     //find valid range
     var prevItem = 0;
     var current = convertCurToNumber(editor.getCursor());
-    for (var i=0; i< separator.length; i++) {
+    for (var i = 0; i < separator.length; i++) {
       var _v = convertCurToNumber(separator[i]);
       if (current > prevItem && current <= _v) {
         validRange = { start: convertNumberToCur(prevItem), end: convertNumberToCur(_v) };
@@ -199,7 +211,7 @@
       var lineText = query[i];
       eachWord(lineText, function(word) {
         var wordUpperCase = word.toUpperCase();
-        if (wordUpperCase === aliasUpperCase && getItem(tables, previousWord))
+        if (wordUpperCase === aliasUpperCase && getTable(previousWord))
           table = previousWord;
         if (wordUpperCase !== CONS.ALIAS_KEYWORD)
           previousWord = word;
@@ -210,10 +222,10 @@
   }
 
   CodeMirror.registerHelper("hint", "sql", function(editor, options) {
-    tables = (options && options.tables) || {};
+    tables = parseTables(options && options.tables)
     var defaultTableName = options && options.defaultTable;
     var disableKeywords = options && options.disableKeywords;
-    defaultTable = defaultTableName && getItem(tables, defaultTableName);
+    defaultTable = defaultTableName && getTable(defaultTableName);
     keywords = keywords || getKeywords(editor);
 
     if (defaultTableName && !defaultTable)

From 3e1e203b174405ff5e9809053f8ca50d8989dad7 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Mon, 22 Feb 2016 15:47:26 -0500
Subject: [PATCH 2608/4742] [merge demo] Prepend link to diff-match-patch.js
 with "https:"

---
 demo/merge.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/merge.html b/demo/merge.html
index c60e653297..20783b866c 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -11,7 +11,7 @@
 <script src="../mode/css/css.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"></script>
 <script src="../addon/merge/merge.js"></script>
 <style>
     .CodeMirror { line-height: 1.2; }

From 9e31c01e11af098b76e059cf85ea5c9f9527fc99 Mon Sep 17 00:00:00 2001
From: geowarin <geowarin@gmail.com>
Date: Thu, 25 Feb 2016 18:13:33 +0100
Subject: [PATCH 2609/4742] [lint addon] Show all hints in tooltip for
 overlapping annotations

When hovering a line with multiple lint annotations, codeMirror will
now show all the attached markers instead of just the first one
---
 addon/lint/lint.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 5afe49d0fc..01f322b5d5 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -186,9 +186,14 @@
     state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
   }
 
-  function popupSpanTooltip(ann, e) {
+  function popupTooltips(annotations, e) {
     var target = e.target || e.srcElement;
-    showTooltipFor(e, annotationTooltip(ann), target);
+    var tooltip = document.createDocumentFragment();
+    for (var i = 0; i < annotations.length; i++) {
+      var ann = annotations[i];
+      tooltip.appendChild(annotationTooltip(ann));
+    }
+    showTooltipFor(e, tooltip, target);
   }
 
   function onMouseOver(cm, e) {
@@ -196,10 +201,12 @@
     if (!/\bCodeMirror-lint-mark-/.test(target.className)) return;
     var box = target.getBoundingClientRect(), x = (box.left + box.right) / 2, y = (box.top + box.bottom) / 2;
     var spans = cm.findMarksAt(cm.coordsChar({left: x, top: y}, "client"));
+
+    var annotations = [];
     for (var i = 0; i < spans.length; ++i) {
-      var ann = spans[i].__annotation;
-      if (ann) return popupSpanTooltip(ann, e);
+      annotations.push(spans[i].__annotation);
     }
+    if (annotations.length) popupTooltips(annotations, e);
   }
 
   CodeMirror.defineOption("lint", false, function(cm, val, old) {

From ffa4589b7cf8876cbc1d2f98f817b54c024d6352 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 28 Feb 2016 23:46:34 +0100
Subject: [PATCH 2610/4742] [sql-hint addon] Make tests pass again

---
 addon/hint/sql-hint.js | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 0bef7a29a1..798fbb1f38 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -20,6 +20,8 @@
   };
   var Pos = CodeMirror.Pos;
 
+  function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }
+
   function getKeywords(editor) {
     var mode = editor.doc.modeOption;
     if (mode === "sql") mode = "text/x-sql";
@@ -30,16 +32,22 @@
     return typeof item == "string" ? item : item.text;
   }
 
+  function wrapTable(name, value) {
+    if (isArray(value)) value = {columns: value}
+    if (!value.text) value.text = name
+    return value
+  }
+
   function parseTables(input) {
     var result = {}
-    if (Object.prototype.toString.call(input) == "[object Array]") {
+    if (isArray(input)) {
       for (var i = input.length - 1; i >= 0; i--) {
         var item = input[i]
-        result[getText(item).toUpperCase()] = item
+        result[getText(item).toUpperCase()] = wrapTable(getText(item), item)
       }
     } else if (input) {
       for (var name in input)
-        result[name.toUpperCase()] = input[name]
+        result[name.toUpperCase()] = wrapTable(name, input[name])
     }
     return result
   }
@@ -62,11 +70,18 @@
   }
 
   function addMatches(result, search, wordlist, formatter) {
-    for (var word in wordlist) {
-      if (!wordlist.hasOwnProperty(word)) continue;
-      if (wordlist.slice) word = wordlist[word];
-
-      if (match(search, word)) result.push(formatter(word));
+    if (isArray(wordlist)) {
+      for (var i = 0; i < wordlist.length; i++)
+        if (match(search, wordlist[i])) result.push(formatter(wordlist[i]))
+    } else {
+      for (var word in wordlist) if (wordlist.hasOwnProperty(word)) {
+        var val = wordlist[word]
+        if (!val || val === true)
+          val = word
+        else
+          val = val.displayText ? {text: val.text, displayText: val.displayText} : val.text
+        if (match(search, val)) result.push(formatter(val))
+      }
     }
   }
 

From 0291f72325ebd74cf567f1dcafea88524cebe2bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Feb 2016 11:46:12 +0100
Subject: [PATCH 2611/4742] Don't draw selections outside of the viewport

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 44c93594ea..4cbff09ec8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2312,6 +2312,7 @@
     for (var i = 0; i < doc.sel.ranges.length; i++) {
       if (primary === false && i == doc.sel.primIndex) continue;
       var range = doc.sel.ranges[i];
+      if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue;
       var collapsed = range.empty();
       if (collapsed || cm.options.showCursorWhenSelecting)
         drawSelectionCursor(cm, range.head, curFragment);

From f1eca87518daa759841597ef3be440e1e1145826 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Feb 2016 11:56:23 +0100
Subject: [PATCH 2612/4742] [tcl mode] Normalize if/else formatting

---
 mode/tcl/tcl.js | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index 056accb2df..87632a8dd1 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -42,42 +42,34 @@ CodeMirror.defineMode("tcl", function() {
       var beforeParams = state.beforeParams;
       state.beforeParams = false;
       var ch = stream.next();
-      if ((ch == '"' || ch == "'") && state.inParams)
+      if ((ch == '"' || ch == "'") && state.inParams) {
         return chain(stream, state, tokenString(ch));
-      else if (/[\[\]{}\(\),;\.]/.test(ch)) {
+      } else if (/[\[\]{}\(\),;\.]/.test(ch)) {
         if (ch == "(" && beforeParams) state.inParams = true;
         else if (ch == ")") state.inParams = false;
           return null;
-      }
-      else if (/\d/.test(ch)) {
+      } else if (/\d/.test(ch)) {
         stream.eatWhile(/[\w\.]/);
         return "number";
-      }
-      else if (ch == "#" && stream.eat("*")) {
+      } else if (ch == "#" && stream.eat("*")) {
         return chain(stream, state, tokenComment);
-      }
-      else if (ch == "#" && stream.match(/ *\[ *\[/)) {
+      } else if (ch == "#" && stream.match(/ *\[ *\[/)) {
         return chain(stream, state, tokenUnparsed);
-      }
-      else if (ch == "#" && stream.eat("#")) {
+      } else if (ch == "#" && stream.eat("#")) {
         stream.skipToEnd();
         return "comment";
-      }
-      else if (ch == '"') {
+      } else if (ch == '"') {
         stream.skipTo(/"/);
         return "comment";
-      }
-      else if (ch == "$") {
+      } else if (ch == "$") {
         stream.eatWhile(/[$_a-z0-9A-Z\.{:]/);
         stream.eatWhile(/}/);
         state.beforeParams = true;
         return "builtin";
-      }
-      else if (isOperatorChar.test(ch)) {
+      } else if (isOperatorChar.test(ch)) {
         stream.eatWhile(isOperatorChar);
         return "comment";
-      }
-      else {
+      } else {
         stream.eatWhile(/[\w\$_{}\xa1-\uffff]/);
         var word = stream.current().toLowerCase();
         if (keywords && keywords.propertyIsEnumerable(word))

From 6c2d9b5af3b31dc266184a699a4c887cf454935e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Feb 2016 11:58:35 +0100
Subject: [PATCH 2613/4742] [night theme] Brighten comment style to create
 contrast

---
 theme/night.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/theme/night.css b/theme/night.css
index 4dbb86624a..fd4e561933 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -10,7 +10,7 @@
 .cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
 .cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
 
-.cm-s-night span.cm-comment { color: #6900a1; }
+.cm-s-night span.cm-comment { color: #8900d1; }
 .cm-s-night span.cm-atom { color: #845dc4; }
 .cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
 .cm-s-night span.cm-keyword { color: #599eff; }
@@ -19,7 +19,6 @@
 .cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
 .cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
 .cm-s-night span.cm-bracket { color: #8da6ce; }
-.cm-s-night span.cm-comment { color: #6900a1; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
 .cm-s-night span.cm-link { color: #845dc4; }
 .cm-s-night span.cm-error { color: #9d1e15; }

From 9a88838fed2628edbe822b2cb3142a05c191ecd1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Feb 2016 11:59:22 +0100
Subject: [PATCH 2614/4742] [tcl mode] More liberally recognize comments

Closes #3853
---
 mode/tcl/tcl.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index 87632a8dd1..8c76d52ca0 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -51,11 +51,11 @@ CodeMirror.defineMode("tcl", function() {
       } else if (/\d/.test(ch)) {
         stream.eatWhile(/[\w\.]/);
         return "number";
-      } else if (ch == "#" && stream.eat("*")) {
-        return chain(stream, state, tokenComment);
-      } else if (ch == "#" && stream.match(/ *\[ *\[/)) {
-        return chain(stream, state, tokenUnparsed);
-      } else if (ch == "#" && stream.eat("#")) {
+      } else if (ch == "#") {
+        if (stream.eat("*"))
+          return chain(stream, state, tokenComment);
+        if (ch == "#" && stream.match(/ *\[ *\[/))
+          return chain(stream, state, tokenUnparsed);
         stream.skipToEnd();
         return "comment";
       } else if (ch == '"') {

From f95803c2997b288ed2d76e14528946fe575d6c73 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 29 Feb 2016 16:13:51 +0100
Subject: [PATCH 2615/4742] [show-hint addon] Don't close completion when text
 is moved

Closes #3849
---
 addon/hint/show-hint.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index cbe3b39a30..7661f6c2cd 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -121,11 +121,13 @@
 
     finishUpdate: function(data, first) {
       if (this.data) CodeMirror.signal(this.data, "update");
-      if (data && this.data && CodeMirror.cmpPos(data.from, this.data.from)) data = null;
-      this.data = data;
 
       var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
       if (this.widget) this.widget.close();
+
+      if (data && this.data && isNewCompletion(this.data, data)) return;
+      this.data = data;
+
       if (data && data.list.length) {
         if (picked && data.list.length == 1) {
           this.pick(data, 0);
@@ -137,6 +139,11 @@
     }
   };
 
+  function isNewCompletion(old, nw) {
+    var moved = CodeMirror.cmpPos(nw.from, old.from)
+    return moved > 0 && old.to.ch - old.from.ch != nw.to.ch - nw.from.ch
+  }
+
   function parseOptions(cm, pos, options) {
     var editor = cm.options.hintOptions;
     var out = {};

From 24d60578042ae03ee471bf54f3e851de9684fe79 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Tue, 1 Mar 2016 00:12:29 -0500
Subject: [PATCH 2616/4742] Fix one more bad assumption in skipAtomic

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4cbff09ec8..d1599c99e9 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2258,7 +2258,8 @@
 
         if (oldPos) {
           var near = m.find(dir < 0 ? 1 : -1), diff;
-          if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft) near = movePos(doc, near, -dir, line);
+          if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+            near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null);
           if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
             return skipAtomicInner(doc, near, pos, dir, mayClear);
         }

From 877b2b1766a40bed35d5f035f15e01d8f9a66e4f Mon Sep 17 00:00:00 2001
From: Philipp A <flying-sheep@web.de>
Date: Tue, 1 Mar 2016 09:53:03 +0100
Subject: [PATCH 2617/4742] =?UTF-8?q?[r=20mode]=20Add=20=E2=80=9C.?=
 =?UTF-8?q?=E2=80=9D=20to=20wordChars?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mode/r/r.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/r/r.js b/mode/r/r.js
index 1ab4a9565a..d41d1c54c1 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -11,6 +11,8 @@
 })(function(CodeMirror) {
 "use strict";
 
+CodeMirror.registerHelper("wordChars", "r", /[\w.]/);
+
 CodeMirror.defineMode("r", function(config) {
   function wordObj(str) {
     var words = str.split(" "), res = {};

From 8799d1d4fb325c9f3c5336d5a54e2a9ff42fcd78 Mon Sep 17 00:00:00 2001
From: David Whittington <djwhitt@gmail.com>
Date: Tue, 1 Mar 2016 20:40:33 -0600
Subject: [PATCH 2618/4742] [mode/meta] Add a mime type and separate modeInfo
 entry for edn

This allows findModeByName to work for edn and seems more consistent
with how JSON is handled.
---
 mode/clojure/clojure.js | 1 +
 mode/meta.js            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index fd5e66ff26..cd8129f757 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -245,5 +245,6 @@ CodeMirror.defineMode("clojure", function (options) {
 
 CodeMirror.defineMIME("text/x-clojure", "clojure");
 CodeMirror.defineMIME("text/x-clojurescript", "clojure");
+CodeMirror.defineMIME("application/edn", "clojure");
 
 });
diff --git a/mode/meta.js b/mode/meta.js
index 8ef78dbe91..03ae66d36a 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -21,7 +21,7 @@
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
-    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx", "edn"]},
+    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
     {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
     {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
     {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
@@ -41,6 +41,7 @@
     {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
     {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
     {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
+    {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
     {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
     {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},

From 11f3d9694d74d60328234756cc670f9c1e78f9d3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 2 Mar 2016 13:16:23 +0100
Subject: [PATCH 2619/4742] [merge addon] Correctly compute chunk start when
 copying at end of document

Closes #3802
---
 addon/merge/merge.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 129fafff56..d67b760cae 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -427,9 +427,9 @@
 
   function copyChunk(dv, to, from, chunk) {
     if (dv.diffOutOfDate) return;
-    var start = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
-    to.replaceRange(from.getRange(Pos(chunk.origFrom, 0), Pos(chunk.origTo, 0)),
-                    start, Pos(chunk.editTo, 0));
+    var editStart = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
+    var origStart = chunk.origTo > from.lastLine() ? Pos(chunk.origFrom - 1) : Pos(chunk.origFrom, 0)
+    to.replaceRange(from.getRange(origStart, Pos(chunk.origTo, 0)), editStart, Pos(chunk.editTo, 0))
   }
 
   // Merge view, containing 0, 1, or 2 diff views.

From a448b97d5cc04544bb6ee4555258381289c7e5f2 Mon Sep 17 00:00:00 2001
From: TDaglis <ath.daglis@gmail.com>
Date: Wed, 2 Mar 2016 11:01:48 +0200
Subject: [PATCH 2620/4742] [twig mode] Support a base mode option

---
 mode/twig/twig.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/mode/twig/twig.js b/mode/twig/twig.js
index aa676dc480..1f2854bef2 100644
--- a/mode/twig/twig.js
+++ b/mode/twig/twig.js
@@ -3,15 +3,15 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"),  require("../../addon/mode/multiplex"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "../../addon/mode/multiplex"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineMode("twig", function() {
+  CodeMirror.defineMode("twig:inner", function() {
     var keywords = ["and", "as", "autoescape", "endautoescape", "block", "do", "endblock", "else", "elseif", "extends", "for", "endfor", "embed", "endembed", "filter", "endfilter", "flush", "from", "if", "endif", "in", "is", "include", "import", "not", "or", "set", "spaceless", "endspaceless", "with", "endwith", "trans", "endtrans", "blocktrans", "endblocktrans", "macro", "endmacro", "use", "verbatim", "endverbatim"],
         operator = /^[+\-*&%=<>!?|~^]/,
         sign = /^[:\[\(\{]/,
@@ -128,5 +128,14 @@
     };
   });
 
+  CodeMirror.defineMode("twig", function(config, parserConfig) {
+    var twigInner = CodeMirror.getMode(config, "twig:inner");
+    if (!parserConfig || !parserConfig.base) return twigInner;
+    return CodeMirror.multiplexingMode(
+      CodeMirror.getMode(config, parserConfig.base), {
+        open: /\{[{#%]/, close: /[}#%]\}/, mode: twigInner, parseDelimiters: true
+      }
+    );
+  });
   CodeMirror.defineMIME("text/x-twig", "twig");
 });

From d867743666a80e6e6ea933ae1a856301faf98d4f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Mar 2016 09:41:47 +0100
Subject: [PATCH 2621/4742] [clike mode] Fix parsing a comment after an
 operator

Closes #3864
---
 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 db7f89373d..34d3a5afd3 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -100,7 +100,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
     }
     if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
+      while (!stream.match(/^\/[\/*]/, false) && stream.eat(isOperatorChar)) {}
       return "operator";
     }
     stream.eatWhile(/[\w\$_\xa1-\uffff]/);

From 72d4770f2f6841a9a5f6584c1e2b45726cdd2c51 Mon Sep 17 00:00:00 2001
From: Tristan Tarrant <ttarrant@redhat.com>
Date: Wed, 2 Mar 2016 17:25:31 +0100
Subject: [PATCH 2622/4742] [protobuf mode] Add

Closes #3861
---
 mode/protobuf/index.html  | 64 ++++++++++++++++++++++++++++++++++
 mode/protobuf/protobuf.js | 72 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 mode/protobuf/index.html
 create mode 100644 mode/protobuf/protobuf.js

diff --git a/mode/protobuf/index.html b/mode/protobuf/index.html
new file mode 100644
index 0000000000..cfe7b9dcd3
--- /dev/null
+++ b/mode/protobuf/index.html
@@ -0,0 +1,64 @@
+<!doctype html>
+
+<title>CodeMirror: ProtoBuf 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="protobuf.js"></script>
+<style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</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="#">ProtoBuf</a>
+  </ul>
+</div>
+
+<article>
+<h2>ProtoBuf mode</h2>
+<form><textarea id="code" name="code">
+package addressbook;
+
+message Address {
+   required string street = 1;
+   required string postCode = 2;
+}
+
+message PhoneNumber {
+   required string number = 1;
+}
+
+message Person {
+   optional int32 id = 1;
+   required string name = 2;
+   required string surname = 3;
+   optional Address address = 4;
+   repeated PhoneNumber phoneNumbers = 5;
+   optional uint32 age = 6;
+   repeated uint32 favouriteNumbers = 7;
+   optional string license = 8;
+   enum Gender {
+      MALE = 0;
+      FEMALE = 1;
+   }
+   optional Gender gender = 9;
+   optional fixed64 lastUpdate = 10;
+   required bool deleted = 11 [default = false];
+}
+
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-protobuf</code>.</p>
+
+  </article>
diff --git a/mode/protobuf/protobuf.js b/mode/protobuf/protobuf.js
new file mode 100644
index 0000000000..fdbf8fdec6
--- /dev/null
+++ b/mode/protobuf/protobuf.js
@@ -0,0 +1,72 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+  };
+
+  var keywordArray = [
+    "package", "message", "import", "syntax",
+    "required", "optional", "repeated", "reserved", "default", "extensions", "packed",
+    "bool", "bytes", "double", "enum", "float", "string",
+    "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64"
+  ];
+  var keywords = wordRegexp(keywordArray);
+
+  CodeMirror.registerHelper("hintWords", "protobuf", keywordArray);
+
+  var identifiers = new RegExp("^[_A-Za-z\xa1-\uffff][_A-Za-z0-9\xa1-\uffff]*");
+
+  function tokenBase(stream) {
+    // whitespaces
+    if (stream.eatSpace()) return null;
+
+    // Handle one line Comments
+    if (stream.match("//")) {
+      stream.skipToEnd();
+      return "comment";
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.+-]/, false)) {
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/))
+        return "number";
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/))
+        return "number";
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/))
+        return "number";
+    }
+
+    // Handle Strings
+    if (stream.match(/^"([^"]|(""))*"/)) { return "string"; }
+    if (stream.match(/^'([^']|(''))*'/)) { return "string"; }
+
+    // Handle words
+    if (stream.match(keywords)) { return "keyword"; }
+    if (stream.match(identifiers)) { return "variable"; } ;
+
+    // Handle non-detected items
+    stream.next();
+    return null;
+  };
+
+  CodeMirror.defineMode("protobuf", function() {
+    return {
+      token: function(stream) {
+        return tokenBase(stream);
+      }
+    };
+  });
+
+  CodeMirror.defineMIME("text/x-protobuf", "protobuf");
+});

From 4787735aad6a31ef75598665f128932282430a92 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 3 Mar 2016 11:24:14 +0100
Subject: [PATCH 2623/4742] [protobuf mode] Integrate

Issue #3862
---
 doc/compress.html         | 1 +
 mode/index.html           | 1 +
 mode/meta.js              | 1 +
 mode/protobuf/protobuf.js | 6 +-----
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 8f0d3e9f42..302890c477 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -181,6 +181,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/php/php.js">php.js</option>
           <option value="http://codemirror.net/mode/pig/pig.js">pig.js</option>
           <option value="http://codemirror.net/mode/properties/properties.js">properties.js</option>
+          <option value="http://codemirror.net/mode/protobuf/protobuf.js">protobuf.js</option>
           <option value="http://codemirror.net/mode/python/python.js">python.js</option>
           <option value="http://codemirror.net/mode/puppet/puppet.js">puppet.js</option>
           <option value="http://codemirror.net/mode/q/q.js">q.js</option>
diff --git a/mode/index.html b/mode/index.html
index 08f5e97b9a..5e77655bf4 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -104,6 +104,7 @@ <h2>Language modes</h2>
       <li><a href="php/index.html">PHP</a></li>
       <li><a href="pig/index.html">Pig Latin</a></li>
       <li><a href="properties/index.html">Properties files</a></li>
+      <li><a href="protobuf/index.html">ProtoBuf</a></li>
       <li><a href="puppet/index.html">Puppet</a></li>
       <li><a href="python/index.html">Python</a></li>
       <li><a href="q/index.html">Q</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 03ae66d36a..8852e7cdeb 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -103,6 +103,7 @@
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
     {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
+    {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
     {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
     {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
     {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
diff --git a/mode/protobuf/protobuf.js b/mode/protobuf/protobuf.js
index fdbf8fdec6..bcae276e8d 100644
--- a/mode/protobuf/protobuf.js
+++ b/mode/protobuf/protobuf.js
@@ -61,11 +61,7 @@
   };
 
   CodeMirror.defineMode("protobuf", function() {
-    return {
-      token: function(stream) {
-        return tokenBase(stream);
-      }
-    };
+    return {token: tokenBase};
   });
 
   CodeMirror.defineMIME("text/x-protobuf", "protobuf");

From afed95af113abc53c1bc1306b3898495609dbff7 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Fri, 4 Mar 2016 00:16:09 -0500
Subject: [PATCH 2624/4742] [markdown mode] Fix indentation rules to match
 CommonMark

See http://spec.commonmark.org/0.24/#list-items

Closes #3833
---
 mode/markdown/markdown.js | 27 ++++++++++++++++-----------
 mode/markdown/test.js     | 12 ++++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index ed8452abe6..a6942b39c8 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -149,10 +149,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         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;
       }
     }
 
@@ -199,7 +197,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
       state.indentation = stream.column() + stream.current().length;
       state.list = true;
-      state.listDepth++;
+
+      // While this list item's marker's indentation
+      // is less than the deepest list item's content's indentation,
+      // pop the deepest list item indentation off the stack.
+      while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) {
+        state.listStack.pop();
+      }
+
+      // Add this list item's content's indentation to the stack
+      state.listStack.push(state.indentation);
+
       if (modeCfg.taskLists && stream.match(taskListRE, false)) {
         state.taskList = true;
       }
@@ -321,7 +329,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (state.list !== false) {
-      var listMod = (state.listDepth - 1) % 3;
+      var listMod = (state.listStack.length - 1) % 3;
       if (!listMod) {
         styles.push(tokenTypes.list1);
       } else if (listMod === 1) {
@@ -697,7 +705,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         hr: false,
         taskList: false,
         list: false,
-        listDepth: 0,
+        listStack: [],
         quote: 0,
         trailingSpace: 0,
         trailingSpaceNewLine: false,
@@ -732,7 +740,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         hr: s.hr,
         taskList: s.taskList,
         list: s.list,
-        listDepth: s.listDepth,
+        listStack: s.listStack.slice(0),
         quote: s.quote,
         indentedCode: s.indentedCode,
         trailingSpace: s.trailingSpace,
@@ -772,11 +780,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         state.f = state.block;
         var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
-        var difference = Math.floor((indentation - state.indentation) / 4) * 4;
-        if (difference > 4) difference = 4;
-        var adjustedIndentation = state.indentation + difference;
-        state.indentationDiff = adjustedIndentation - state.indentation;
-        state.indentation = adjustedIndentation;
+        state.indentationDiff = Math.min(indentation - state.indentation, 4);
+        state.indentation = state.indentation + state.indentationDiff;
         if (indentation > 0) return null;
       }
       return state.f(stream, state);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 6d7829fa57..a48d153107 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -452,6 +452,18 @@
      "",
      "hello");
 
+  MT("listCommonMarkIndentationCode",
+     "[variable-2 * Code blocks also affect]",
+     "  [variable-3 * The next level starts where the contents start.]",
+     "   [variable-3 *    Anything less than that will keep the item on the same level.]",
+     "       [variable-3 * Each list item can indent the first level further and further.]",
+     "  [variable-3 * For the most part, this makes sense while writing a list.]",
+     "    [keyword * This means two items with same indentation can be different levels.]",
+     "     [keyword *  Each level has an indent requirement that can change between items.]",
+     "       [keyword * A list item that meets this will be part of the next level.]",
+     "   [variable-3 * Otherwise, it will be part of the level where it does meet this.]",
+     " [variable-2 * World]");
+
   // Blockquote
   MT("blockquote",
      "[variable-2 * foo]",

From 12168b275d6e26b736b9e7d3b478131327fba8fa Mon Sep 17 00:00:00 2001
From: sinkuu <sinkuupump@gmail.com>
Date: Mon, 7 Mar 2016 09:39:01 +0900
Subject: [PATCH 2625/4742] [troff mode] Fix MIME type

`text/troff` is the standard approved by IANA. Also add some
non-standard MIME types.
https://bugs.freedesktop.org/show_bug.cgi?id=5072
---
 mode/troff/troff.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/troff/troff.js b/mode/troff/troff.js
index beca778eeb..7e043a11f0 100644
--- a/mode/troff/troff.js
+++ b/mode/troff/troff.js
@@ -77,6 +77,9 @@ CodeMirror.defineMode('troff', function() {
   };
 });
 
+CodeMirror.defineMIME('text/troff', 'troff');
+CodeMirror.defineMIME('text/x-troff', 'troff');
+CodeMirror.defineMIME('application/x-troff', 'troff');
 CodeMirror.defineMIME('troff', 'troff');
 
 });

From 0514f28ea6776911f093ba559b9bef11401f05e4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 7 Mar 2016 15:41:26 +0100
Subject: [PATCH 2626/4742] [troff mode] Remove bogus MIME string

Issue #3869
---
 mode/meta.js        | 2 +-
 mode/troff/troff.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mode/meta.js b/mode/meta.js
index 8852e7cdeb..3cb9de21e1 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -138,7 +138,7 @@
     {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
     {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
     {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
-    {name: "troff", mime: "troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
+    {name: "troff", mime: "text/troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
     {name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
     {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
diff --git a/mode/troff/troff.js b/mode/troff/troff.js
index 7e043a11f0..86154b6e14 100644
--- a/mode/troff/troff.js
+++ b/mode/troff/troff.js
@@ -80,6 +80,5 @@ CodeMirror.defineMode('troff', function() {
 CodeMirror.defineMIME('text/troff', 'troff');
 CodeMirror.defineMIME('text/x-troff', 'troff');
 CodeMirror.defineMIME('application/x-troff', 'troff');
-CodeMirror.defineMIME('troff', 'troff');
 
 });

From 79193c029ba25818cd5c891f34feaaca8675ea5b Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 5 Mar 2016 19:25:38 +0400
Subject: [PATCH 2627/4742] [vim] fix s in visual block mode

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 87b94e352b..65555313cf 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -64,9 +64,9 @@
     { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
     { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
     { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
-    { keys: 's', type: 'keyToKey', toKeys: 'xi', context: 'visual'},
+    { keys: 's', type: 'keyToKey', toKeys: 'c', context: 'visual'},
     { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
-    { keys: 'S', type: 'keyToKey', toKeys: 'dcc', context: 'visual' },
+    { keys: 'S', type: 'keyToKey', toKeys: 'VdO', context: 'visual' },
     { keys: '<Home>', type: 'keyToKey', toKeys: '0' },
     { keys: '<End>', type: 'keyToKey', toKeys: '$' },
     { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
diff --git a/test/vim_test.js b/test/vim_test.js
index c75e003a47..bd62724b62 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1045,6 +1045,20 @@ testVim('D_visual_block', function(cm, vim, helpers) {
   eq('1\n5\na', cm.getValue());
 }, {value: '1234\n5678\nabcdefg'});
 
+testVim('s_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 's');
+  var replacement = fillArray('hello{', 3);
+  cm.replaceSelections(replacement);
+  eq('1hello{\n5hello{\nahello{fg\n', cm.getValue());
+  helpers.doKeys('<Esc>');
+  cm.setCursor(2, 3);
+  helpers.doKeys('<C-v>', '1', 'k', 'h', 'S');
+  replacement = fillArray('world', 1);
+  cm.replaceSelections(replacement);
+  eq('1hello{\n  world\n', cm.getValue());
+}, {value: '1234\n5678\nabcdefg\n'});
+
 // Swapcase commands edit in place and do not modify registers.
 testVim('g~w_repeat', function(cm, vim, helpers) {
   // Assert that dw does delete newline if it should go to the next line, and

From d9b821a9b21b5b1622396b67744d226f57b69d2e Mon Sep 17 00:00:00 2001
From: Ben Mosher <me@benmosher.com>
Date: Mon, 7 Mar 2016 17:12:03 -0500
Subject: [PATCH 2628/4742] [placeholder addon] Handle swapDoc event

---
 addon/display/placeholder.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index babddfb1fe..2f8b1f84ae 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -14,10 +14,12 @@
     if (val && !prev) {
       cm.on("blur", onBlur);
       cm.on("change", onChange);
+      cm.on("swapDoc", onChange);
       onChange(cm);
     } else if (!val && prev) {
       cm.off("blur", onBlur);
       cm.off("change", onChange);
+      cm.off("swapDoc", onChange);
       clearPlaceholder(cm);
       var wrapper = cm.getWrapperElement();
       wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");

From be7612de2d879e9442025698d9e93b39d2f0749f Mon Sep 17 00:00:00 2001
From: Steve O'Hara <steve.ohara@4energy.co.uk>
Date: Wed, 9 Mar 2016 21:56:19 +0000
Subject: [PATCH 2629/4742] [velocity mode] Fix parsing of variables in nested
 quotes

Closes #3876
---
 mode/velocity/index.html  | 2 ++
 mode/velocity/velocity.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index 2747878667..7eba8f4185 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -77,6 +77,8 @@ <h2>Velocity mode</h2>
 
 $someObject("This plus $something in the middle").method(7567).property
 
+#set($something = "Parseable string with '$quotes'!")
+
 #macro( tablerows $color $somelist )
     #foreach( $something in $somelist )
         <tr><td bgcolor=$color>$something</td></tr>
diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index 8fc4f95d05..12ee221249 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -34,7 +34,7 @@ CodeMirror.defineMode("velocity", function() {
         state.beforeParams = false;
         var ch = stream.next();
         // start of unparsed string?
-        if ((ch == "'") && state.inParams) {
+        if ((ch == "'") && !state.inString && state.inParams) {
             state.lastTokenWasBuiltin = false;
             return chain(stream, state, tokenString(ch));
         }

From 934dd97dda56d2a8f8f5650c0ddaab65b47e6af9 Mon Sep 17 00:00:00 2001
From: guraga <rulumasi@dodsi.com>
Date: Sat, 19 Mar 2016 14:51:08 +0600
Subject: [PATCH 2630/4742] [changelog] Fix typo in date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7eb70e9c53..fe78c71d5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 5.12.0 (2015-02-19)
+## 5.12.0 (2016-02-19)
 
 ### New features
 

From 1de61c6a2031b06045d0c867c7c27b5b9bbb7e3a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Mar 2016 09:47:46 +0100
Subject: [PATCH 2631/4742] [jsx mode] Support a 'base' configuration parameter

To configure the inner mode.

Closes #3893
---
 mode/jsx/jsx.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 0c018318f2..aff01b8d35 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -25,9 +25,9 @@
                        context.prev && copyContext(context.prev))
   }
 
-  CodeMirror.defineMode("jsx", function(config) {
+  CodeMirror.defineMode("jsx", function(config, modeConfig) {
     var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true, multilineTagIndentPastTag: false})
-    var jsMode = CodeMirror.getMode(config, "javascript")
+    var jsMode = CodeMirror.getMode(config, modeConfig && modeConfig.base || "javascript")
 
     function flatXMLIndent(state) {
       var tagName = state.tagName

From fa1a355a23977abf5abe22217ac2d74a77d58510 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Mar 2016 10:05:53 +0100
Subject: [PATCH 2632/4742] [simplescrollbar addon] Make sure bar position is
 clipped after update

Closes #3891
---
 addon/scroll/simplescrollbars.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/addon/scroll/simplescrollbars.js b/addon/scroll/simplescrollbars.js
index f78353a130..32ba2f35ea 100644
--- a/addon/scroll/simplescrollbars.js
+++ b/addon/scroll/simplescrollbars.js
@@ -59,16 +59,20 @@
     CodeMirror.on(this.node, "DOMMouseScroll", onWheel);
   }
 
-  Bar.prototype.moveTo = function(pos, update) {
+  Bar.prototype.setPos = function(pos) {
     if (pos < 0) pos = 0;
     if (pos > this.total - this.screen) pos = this.total - this.screen;
-    if (pos == this.pos) return;
+    if (pos == this.pos) return false;
     this.pos = pos;
     this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
       (pos * (this.size / this.total)) + "px";
-    if (update !== false) this.scroll(pos, this.orientation);
+    return true
   };
 
+  Bar.prototype.moveTo = function(pos) {
+    if (this.setPos(pos)) this.scroll(pos, this.orientation);
+  }
+
   var minButtonSize = 10;
 
   Bar.prototype.update = function(scrollSize, clientSize, barSize) {
@@ -83,8 +87,7 @@
     }
     this.inner.style[this.orientation == "horizontal" ? "width" : "height"] =
       buttonSize + "px";
-    this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
-      this.pos * (this.size / this.total) + "px";
+    this.setPos(this.pos);
   };
 
   function SimpleScrollbars(cls, place, scroll) {
@@ -111,7 +114,6 @@
     if (needsV) {
       this.vert.update(measure.scrollHeight, measure.clientHeight,
                        measure.viewHeight - (needsH ? width : 0));
-      this.vert.node.style.display = "block";
       this.vert.node.style.bottom = needsH ? width + "px" : "0";
     }
     if (needsH) {
@@ -125,11 +127,11 @@
   };
 
   SimpleScrollbars.prototype.setScrollTop = function(pos) {
-    this.vert.moveTo(pos, false);
+    this.vert.setPos(pos);
   };
 
   SimpleScrollbars.prototype.setScrollLeft = function(pos) {
-    this.horiz.moveTo(pos, false);
+    this.horiz.setPos(pos);
   };
 
   SimpleScrollbars.prototype.clear = function() {

From d4dbbcef22e3aadf25dad811a9faa988a50a0df4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Mar 2016 10:24:33 +0100
Subject: [PATCH 2633/4742] [dart mode] Support nested block comments

Closes #3878
---
 mode/dart/dart.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index d92eb5190c..8d383a95ef 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -72,6 +72,12 @@
           return null;
         }
         return false;
+      },
+
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false
+        state.tokenize = tokenNestedComment(1)
+        return state.tokenize(stream, state)
       }
     }
   });
@@ -121,6 +127,27 @@
     return "variable";
   }
 
+  function tokenNestedComment(depth) {
+    return function (stream, state) {
+      var ch
+      while (ch = stream.next()) {
+        if (ch == "*" && stream.eat("/")) {
+          if (depth == 1) {
+            state.tokenize = null
+            break
+          } else {
+            state.tokenize = tokenNestedComment(depth - 1)
+            return state.tokenize(stream, state)
+          }
+        } else if (ch == "/" && stream.eat("*")) {
+          state.tokenize = tokenNestedComment(depth + 1)
+          return state.tokenize(stream, state)
+        }
+      }
+      return "comment"
+    }
+  }
+
   CodeMirror.registerHelper("hintWords", "application/dart", keywords.concat(atoms).concat(builtins));
 
   // This is needed to make loading through meta.js work.

From 66b0b4d383818f8ed80009c89a40097aa37a5990 Mon Sep 17 00:00:00 2001
From: Pierre Gerold <gerold@crans.org>
Date: Fri, 11 Mar 2016 13:48:26 +0100
Subject: [PATCH 2634/4742] [vim mode] Fix insert/command mode behavior
 difference

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 65555313cf..5ed2d9bf73 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1696,11 +1696,12 @@
         var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
         var first = cm.firstLine();
         var last = cm.lastLine();
-        // Vim cancels linewise motions that start on an edge and move beyond
-        // that edge. It does not cancel motions that do not start on an edge.
-        if ((line < first && cur.line == first) ||
-            (line > last && cur.line == last)) {
-          return;
+        // Vim go to line begin or line end when cursor at first/last line and
+        // move to previous/next line is triggered.
+        if (line < first && cur.line == first){
+          return this.moveToStartOfLine(cm, head, motionArgs, vim);
+        }else if (line > last && cur.line == last){
+            return this.moveToEol(cm, head, motionArgs, vim);
         }
         if (motionArgs.toFirstChar){
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
diff --git a/test/vim_test.js b/test/vim_test.js
index bd62724b62..7080c3062f 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -634,11 +634,11 @@ testVim('dj_end_of_document', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);
   cm.setCursor(curStart);
   helpers.doKeys('d', 'j');
-  eq(' word1 ', cm.getValue());
+  eq('', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
+  eq(' word1 \n', register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1 ' });
 testVim('dk', function(cm, vim, helpers) {
   var curStart = makeCursor(1, 3);
@@ -654,11 +654,11 @@ testVim('dk_start_of_document', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);
   cm.setCursor(curStart);
   helpers.doKeys('d', 'k');
-  eq(' word1 ', cm.getValue());
+  eq('', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
+  eq(' word1 \n', register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, 0);
 }, { value: ' word1 ' });
 testVim('dw_space', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 0);

From feed440b7e8343752e65e3683d25130593c78897 Mon Sep 17 00:00:00 2001
From: Julien Rebetez <julien@fhtagn.net>
Date: Fri, 11 Mar 2016 20:03:51 +0100
Subject: [PATCH 2635/4742] Allow applications to listen for the dragleave
 event.

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

diff --git a/doc/manual.html b/doc/manual.html
index 29a7ed38e0..82687528f5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -657,7 +657,8 @@ <h2>Events</h2>
       <strong>"keydown"</strong>, <strong>"keypress"</strong>,
       <strong>"keyup"</strong>, <strong>"cut"</strong>, <strong>"copy"</strong>, <strong>"paste"</strong>,
       <strong>"dragstart"</strong>, <strong>"dragenter"</strong>,
-      <strong>"dragover"</strong>, <strong>"drop"</strong>
+      <strong>"dragover"</strong>, <strong>"dragleave"</strong>,
+      <strong>"drop"</strong>
       (instance: CodeMirror, event: Event)</code></dt>
       <dd>Fired when CodeMirror is handling a DOM event of this type.
       You can <code>preventDefault</code> the event, or give it a
diff --git a/lib/codemirror.js b/lib/codemirror.js
index d1599c99e9..372020d873 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3495,7 +3495,7 @@
       over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
       start: function(e){onDragStart(cm, e);},
       drop: operation(cm, onDrop),
-      leave: function() {clearDragCursor(cm);}
+      leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
     };
 
     var inp = d.input.getField();

From ecaa8914751ad5472f315bce5f0c49c232aa5c26 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Mar 2016 11:18:29 +0100
Subject: [PATCH 2636/4742] Make sure gutters are never left higher than the
 view height

Closes #3884
---
 lib/codemirror.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 372020d873..c736708ee4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -747,6 +747,7 @@
 
   function postUpdateDisplay(cm, update) {
     var viewport = update.viewport;
+
     for (var first = true;; first = false) {
       if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
         // Clip forced viewport to actual scrollable area.
@@ -766,6 +767,9 @@
       updateScrollbars(cm, barMeasure);
     }
 
+    if (parseInt(cm.display.gutters.style.height) > cm.display.scroller.clientHeight)
+      cm.display.gutters.style.height = cm.display.scroller.clientHeight + "px"
+
     update.signal(cm, "update", cm);
     if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
       update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);

From 8e6158c94c79797d9aa818d0572f6f2ac8c6113d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Mar 2016 11:37:00 +0100
Subject: [PATCH 2637/4742] Mark release 5.13.0

---
 AUTHORS           | 10 ++++++++++
 CHANGELOG.md      | 28 ++++++++++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 21 +++++++++++++++++++--
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 8 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 741ba1e35e..c3680eb4d8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -75,6 +75,7 @@ benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
+Ben Mosher
 Bernhard Sirlinger
 Bert Chang
 Billy Moon
@@ -137,6 +138,7 @@ David Barnett
 David Mignot
 David Pathakjee
 David Vázquez
+David Whittington
 deebugger
 Deep Thought
 Devin Abbott
@@ -184,6 +186,7 @@ galambalazs
 Gautam Mehta
 Gavin Douglas
 gekkoe
+geowarin
 Gerard Braad
 Gergely Hegykozi
 Giovanni Calò
@@ -198,6 +201,7 @@ greengiant
 Gregory Koberger
 Guillaume Massé
 Guillaume Massé
+guraga
 Gustavo Rodrigues
 Hakan Tunc
 Hans Engel
@@ -274,6 +278,7 @@ ju1ius
 Juan Benavides Romero
 Jucovschi Constantin
 Juho Vuori
+Julien Rebetez
 Justin Andresen
 Justin Hileman
 jwallers@gmail.com
@@ -281,6 +286,7 @@ kaniga
 karevn
 Kayur Patel
 Ken Newman
+ken restivo
 Ken Rockot
 Kevin Earls
 Kevin Sawicki
@@ -426,7 +432,9 @@ peter
 Peter Flynn
 peterkroon
 Peter Kroon
+Philipp A
 Philip Stadermann
+Pierre Gerold
 Piët Delport
 prasanthj
 Prasanth J
@@ -476,6 +484,7 @@ Shiv Deepak
 Shmuel Englard
 Shubham Jain
 silverwind
+sinkuu
 snasa
 soliton4
 sonson
@@ -518,6 +527,7 @@ Tom MacWright
 Tony Jian
 Travis Heppe
 Triangle717
+Tristan Tarrant
 TSUYUSATO Kitsune
 twifkak
 Vestimir Markov
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe78c71d5e..60ec9df51b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 5.13.0 (2016-03-21)
+
+### New features
+
+New DOM event forwarded: [`"dragleave"`](http://codemirror.net/doc/manual.html#event_dom).
+
+[protobuf mode](http://codemirror.net/mode/protobuf/index.html): Newly added.
+
+### Bugfixes
+
+Fix problem where [`findMarks`](http://codemirror.net/doc/manual.html#findMarks) sometimes failed to find multi-line marks.
+
+Fix crash that showed up when atomic ranges and bidi text were combined.
+
+[show-hint addon](http://codemirror.net/demo/complete.html): Completion widgets no longer close when the line indented or dedented.
+
+[merge addon](http://codemirror.net/demo/merge.html): Fix bug when merging chunks at the end of the file.
+
+[placeholder addon](http://codemirror.net/doc/manual.html#addon_placeholder): No longer gets confused by [`swapDoc`](http://codemirror.net/doc/manual.html#swapDoc).
+
+[simplescrollbars addon](http://codemirror.net/doc/manual.html#addon_simplescrollbars): Fix invalid state when deleting at end of document.
+
+[clike mode](http://codemirror.net/mode/clike/index.html): No longer gets confused when a comment starts after an operator.
+
+[markdown mode](http://codemirror.net/mode/markdown/index.html): Now supports CommonMark-style flexible list indentation.
+
+[dylan mode](http://codemirror.net/mode/dylan/index.html): Several improvements and fixes.
+
 ## 5.12.0 (2016-02-19)
 
 ### New features
diff --git a/doc/compress.html b/doc/compress.html
index 302890c477..a0d4364a3e 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.13.0;f=">5.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.12.0;f=">5.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.11.0;f=">5.11</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.10.0;f=">5.10</option>
diff --git a/doc/manual.html b/doc/manual.html
index 82687528f5..f5cb235d1a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.12.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.13.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 a8e15ac059..f99334d254 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,9 +30,26 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-03-2016: <a href="http://codemirror.net/codemirror-5.13.zip">Version 5.13</a>:</p>
+
+  <ul class="rel-note">
+    <li>New DOM event forwarded: <a href="http://codemirror.net/doc/manual.html#event_dom"><code>&quot;dragleave&quot;</code></a>.</li>
+    <li><a href="http://codemirror.net/mode/protobuf/index.html">protobuf mode</a>: Newly added.</li>
+    <li>Fix problem where <a href="http://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a> sometimes failed to find multi-line marks.</li>
+    <li>Fix crash that showed up when atomic ranges and bidi text were combined.</li>
+    <li><a href="http://codemirror.net/demo/complete.html">show-hint addon</a>: Completion widgets no longer close when the line indented or dedented.</li>
+    <li><a href="http://codemirror.net/demo/merge.html">merge addon</a>: Fix bug when merging chunks at the end of the file.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: No longer gets confused by <a href="http://codemirror.net/doc/manual.html#swapDoc"><code>swapDoc</code></a>.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_simplescrollbars">simplescrollbars addon</a>: Fix invalid state when deleting at end of document.</li>
+    <li><a href="http://codemirror.net/mode/clike/index.html">clike mode</a>: No longer gets confused when a comment starts after an operator.</li>
+    <li><a href="http://codemirror.net/mode/markdown/index.html">markdown mode</a>: Now supports CommonMark-style flexible list indentation.</li>
+    <li><a href="http://codemirror.net/mode/dylan/index.html">dylan mode</a>: Several improvements and fixes.</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.12.0...5.13.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">19-02-2016: <a href="http://codemirror.net/codemirror-5.12.zip">Version 5.12</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: Ctrl-Q is now an alias for Ctrl-V.</li>
     <li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: The Vim API now exposes an <code>unmap</code> method to unmap bindings.</li>
     <li><a href="http://codemirror.net/demo/activeline.html">active-line addon</a>: This addon can now style the active line's gutter.</li>
@@ -55,7 +72,7 @@ <h2>Version 5.x</h2>
 
   <p class="rel">20-01-2016: <a href="http://codemirror.net/codemirror-5.11.zip">Version 5.11</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li>New modes: <a href="../mode/jsx/index.html">JSX</a>, <a href="../mode/haskell-literate/index.html">literate Haskell</a></li>
     <li>The editor now forwards more <a href="manual.html#event_dom">DOM events</a>: <code>cut</code>, <code>copy</code>, <code>paste</code>, and <code>touchstart</code>. It will also forward <code>mousedown</code> for drag events</li>
     <li>Fixes a bug where bookmarks next to collapsed spans were not rendered</li>
diff --git a/index.html b/index.html
index 1762598d8d..a136e0b167 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.12</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.13</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 c736708ee4..4779d12de4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8893,7 +8893,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.12.1";
+  CodeMirror.version = "5.13.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 1b4f32e523..71ddfae935 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.12.1",
+    "version":"5.13.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 2a8e2e030dee09f08e612ad4ddfc0ab221c80e8c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 21 Mar 2016 11:37:37 +0100
Subject: [PATCH 2638/4742] Bump version number post-5.13

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f5cb235d1a..da2cc0bd39 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.13.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.13.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4779d12de4..6090fd4f59 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8893,7 +8893,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.13.0";
+  CodeMirror.version = "5.13.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 71ddfae935..feb4e813c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.13.0",
+    "version":"5.13.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 3101742ee5b20afb86be5d8f79c445bdc4a3f150 Mon Sep 17 00:00:00 2001
From: Hugues Malphettes <hmalphettes@gmail.com>
Date: Tue, 22 Mar 2016 17:01:53 +0800
Subject: [PATCH 2639/4742] [package.json] Add a jspm field to make CodeMirror
 installable with that tool

---
 package.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index feb4e813c3..7d23ce0b25 100644
--- a/package.json
+++ b/package.json
@@ -19,5 +19,10 @@
                     "email": "marijnh@gmail.com",
                     "web": "http://marijnhaverbeke.nl"}],
     "repository": {"type": "git",
-                   "url": "https://github.com/codemirror/CodeMirror.git"}
+                   "url": "https://github.com/codemirror/CodeMirror.git"},
+    "jspm": {
+      "directories": {},
+      "dependencies": {},
+      "devDependencies": {}
+    }
 }

From 247c6342d560e90c61854ffd1b62adf98b2af7e3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 22 Mar 2016 21:00:13 +0100
Subject: [PATCH 2640/4742] Disable ligatures inside the editor

Closes #3899
---
 lib/codemirror.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index ebfe4f697f..2d1a4d1903 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -245,6 +245,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   position: relative;
   overflow: visible;
   -webkit-tap-highlight-color: transparent;
+  -webkit-font-variant-ligatures: none;
+  font-variant-ligatures: none;
 }
 .CodeMirror-wrap pre {
   word-wrap: break-word;

From 0814679c16bea101b2003156f1835225b28a596b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Mar 2016 08:36:19 +0100
Subject: [PATCH 2641/4742] Remove code that causes a broken/invisible gutter

Issue #3884
---
 lib/codemirror.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6090fd4f59..26911e6221 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -767,9 +767,6 @@
       updateScrollbars(cm, barMeasure);
     }
 
-    if (parseInt(cm.display.gutters.style.height) > cm.display.scroller.clientHeight)
-      cm.display.gutters.style.height = cm.display.scroller.clientHeight + "px"
-
     update.signal(cm, "update", cm);
     if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
       update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);

From 89ae5d27cdce0e6a4b407c6b5b9339f342ee700f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Mar 2016 09:27:29 +0100
Subject: [PATCH 2642/4742] Use CSS min-height to ensure gutter covers whole
 view

Issue #3884
---
 lib/codemirror.css |  1 +
 lib/codemirror.js  | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 2d1a4d1903..1cf66a9fa9 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -191,6 +191,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-gutters {
   position: absolute; left: 0; top: 0;
+  min-height: 100%;
   z-index: 3;
 }
 .CodeMirror-gutter {
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 26911e6221..d5a9e34000 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -763,8 +763,8 @@
       updateHeightsInViewport(cm);
       var barMeasure = measureForScrollbars(cm);
       updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
       updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
     }
 
     update.signal(cm, "update", cm);
@@ -781,8 +781,8 @@
       postUpdateDisplay(cm, update);
       var barMeasure = measureForScrollbars(cm);
       updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
       updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
       update.finish();
     }
   }
@@ -790,8 +790,7 @@
   function setDocumentHeight(cm, measure) {
     cm.display.sizer.style.minHeight = measure.docHeight + "px";
     cm.display.heightForcer.style.top = measure.docHeight + "px";
-    cm.display.gutters.style.height = Math.max(measure.docHeight + cm.display.barHeight + scrollGap(cm),
-                                               measure.clientHeight) + "px";
+    cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
   }
 
   // Read the actual heights of the rendered lines, and update their
@@ -3116,10 +3115,10 @@
 
     if (op.preparedSelection)
       cm.display.input.showSelection(op.preparedSelection);
-    if (op.updatedDisplay)
-      setDocumentHeight(cm, op.barMeasure);
     if (op.updatedDisplay || op.startHeight != cm.doc.height)
       updateScrollbars(cm, op.barMeasure);
+    if (op.updatedDisplay)
+      setDocumentHeight(cm, op.barMeasure);
 
     if (op.selectionChanged) restartBlink(cm);
 

From c1a3e0eaa32eee04c43bab13cb459d53af11b9ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Mar 2016 09:30:48 +0100
Subject: [PATCH 2643/4742] Mark release 5.13.2

---
 AUTHORS           | 1 +
 CHANGELOG.md      | 6 ++++++
 doc/compress.html | 1 +
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 7 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index c3680eb4d8..03b1ac5b0a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -212,6 +212,7 @@ Herculano Campos
 Hiroyuki Makino
 hitsthings
 Hocdoc
+Hugues Malphettes
 Ian Beck
 Ian Dickinson
 Ian Wehrman
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60ec9df51b..b0a6ab57ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.13.2 (2016-03-23)
+
+### Bugfixes
+
+Solves a problem where the gutter would sometimes not extend all the way to the end of the document.
+
 ## 5.13.0 (2016-03-21)
 
 ### New features
diff --git a/doc/compress.html b/doc/compress.html
index a0d4364a3e..47d689429f 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.13.2;f=">5.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.0;f=">5.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.12.0;f=">5.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.11.0;f=">5.11</option>
diff --git a/doc/manual.html b/doc/manual.html
index da2cc0bd39..9642a11ada 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.13.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.13.2</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 f99334d254..99306b91cb 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-03-2016: <a href="http://codemirror.net/codemirror-5.13.2.zip">Version 5.13.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Solves a problem where the gutter would sometimes not extend all the way to the end of the document.</li>
+  </ul>
+
   <p class="rel">21-03-2016: <a href="http://codemirror.net/codemirror-5.13.zip">Version 5.13</a>:</p>
 
   <ul class="rel-note">
diff --git a/lib/codemirror.js b/lib/codemirror.js
index d5a9e34000..ec49e3a338 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8889,7 +8889,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.13.1";
+  CodeMirror.version = "5.13.2";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 7d23ce0b25..7440fd5b34 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.13.1",
+    "version":"5.13.2",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From 1e246293de1653bba7d08e26c85eae812bbbeb78 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Mar 2016 09:31:47 +0100
Subject: [PATCH 2644/4742] Bump version number post-5.13.2

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 9642a11ada..9cbb3a3a41 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.13.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.13.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index ec49e3a338..a261a09b37 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8889,7 +8889,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.13.2";
+  CodeMirror.version = "5.13.3";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 7440fd5b34..11551de2d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.13.2",
+    "version":"5.13.3",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From eca7fd6c0de24889956a3e1d2a44e0973263e9a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 23 Mar 2016 21:15:57 +0100
Subject: [PATCH 2645/4742] Show correct version in index page

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

diff --git a/index.html b/index.html
index a136e0b167..1f775abc69 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.13</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.13.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>.

From 36821970d225d430fb6d6dc6612d259c75d28d4d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 24 Mar 2016 17:20:54 +0100
Subject: [PATCH 2646/4742] Make posFromIndex and indexFromPos take
 lineSeparator into account

Closes #3905
---
 lib/codemirror.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a261a09b37..22186b45ad 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7646,9 +7646,9 @@
     },
 
     posFromIndex: function(off) {
-      var ch, lineNo = this.first;
+      var ch, lineNo = this.first, sepSize = this.lineSeparator().length;
       this.iter(function(line) {
-        var sz = line.text.length + 1;
+        var sz = line.text.length + sepSize;
         if (sz > off) { ch = off; return true; }
         off -= sz;
         ++lineNo;
@@ -7659,8 +7659,9 @@
       coords = clipPos(this, coords);
       var index = coords.ch;
       if (coords.line < this.first || coords.ch < 0) return 0;
+      var sepSize = this.lineSeparator().length;
       this.iter(this.first, coords.line, function (line) {
-        index += line.text.length + 1;
+        index += line.text.length + sepSize;
       });
       return index;
     },

From 65964cf64475ef850ea90d077cb0da4ab2a8e968 Mon Sep 17 00:00:00 2001
From: Bharad <recursion@google.com>
Date: Wed, 23 Mar 2016 12:42:19 -0700
Subject: [PATCH 2647/4742] [vim mode] Added yank command to yank the current
 line

---
 keymap/vim.js    | 8 ++++++++
 test/vim_test.js | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 5ed2d9bf73..4484f7a8ea 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -226,6 +226,7 @@
     { name: 'sort', shortName: 'sor' },
     { name: 'substitute', shortName: 's', possiblyAsync: true },
     { name: 'nohlsearch', shortName: 'noh' },
+    { name: 'yank', shortName: 'y' },
     { name: 'delmarks', shortName: 'delm' },
     { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
     { name: 'global', shortName: 'g' }
@@ -4522,6 +4523,13 @@
       nohlsearch: function(cm) {
         clearSearchHighlight(cm);
       },
+      yank: function (cm) {
+        var cur = copyCursor(cm.getCursor());
+        var line = cur.line;
+        var lineText = cm.getLine(line);
+        vimGlobalState.registerController.pushText(
+          '0', 'yank', lineText, true, true);
+      },
       delmarks: function(cm, params) {
         if (!params.argString || !trim(params.argString)) {
           showConfirm(cm, 'Argument required');
diff --git a/test/vim_test.js b/test/vim_test.js
index 7080c3062f..800791debc 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3725,6 +3725,14 @@ testVim('ex_noh_clearSearchHighlight', function(cm, vim, helpers) {
   helpers.doKeys('n');
   helpers.assertCursorAt(0, 11,'can\'t resume search after clearing highlighting');
 }, { value: 'match nope match \n nope Match' });
+testVim('ex_yank', function (cm, vim, helpers) {
+  var curStart = makeCursor(3, 0);
+  cm.setCursor(curStart);
+  helpers.doEx('y');
+  var register = helpers.getRegisterController().getRegister();
+  var line = cm.getLine(3);
+  eq(line + '\n', register.toString());
+});
 testVim('set_boolean', function(cm, vim, helpers) {
   CodeMirror.Vim.defineOption('testoption', true, 'boolean');
   // Test default value is set.

From 1cc93d94e55373541a2b0837a2fca1c9fdf5df97 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Fri, 25 Mar 2016 17:32:01 -0400
Subject: [PATCH 2648/4742] [vim bindings] Check if cm.save() is available
 before saving

cm.save() might not exist if CodeMirror is not created from a
textarea. This adds an additional check to prevent TypeErrors.
---
 keymap/vim.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 4484f7a8ea..54f2827248 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4515,8 +4515,8 @@
         if (CodeMirror.commands.save) {
           // If a save command is defined, call it.
           CodeMirror.commands.save(cm);
-        } else {
-          // Saves to text area if no save command is defined.
+        } else if (cm.save) {
+          // Saves to text area if no save command is defined and cm.save() is available.
           cm.save();
         }
       },

From fa705ea05a35cb297a115c0752271bd39c183ae8 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Fri, 25 Mar 2016 18:11:23 -0400
Subject: [PATCH 2649/4742] [real-world uses] Fix the link to Gerrit Code
 Review

The code.google.com link is deprecated. Also add that CodeMirror
is being used as Gerrit's inline editor.
---
 doc/realworld.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index 03a67c7d20..82082bff21 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -79,7 +79,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://github.com/simogeo/Filemanager">Filemanager</a></li>
       <li><a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox Developer Tools</a></li>
       <li><a href="http://www.firepad.io">Firepad</a> (collaborative text editor)</li>
-      <li><a href="https://code.google.com/p/gerrit/">Gerrit</a>'s diff view</li>
+      <li><a href="https://gerritcodereview.com/">Gerrit</a>'s diff view and inline editor</li>
       <li><a href="https://github.com/maks/git-crx">Git Crx</a> (Chrome App for browsing local git repos)</li>
       <li><a href="http://tour.golang.org">Go language tour</a></li>
       <li><a href="https://github.com/github/android">GitHub's Android app</a></li>

From 14639ccc69a7fe34ce275d3578b7149763edf5c4 Mon Sep 17 00:00:00 2001
From: VapidWorx <daniel@vapidworx.com>
Date: Tue, 23 Jul 2013 02:40:46 +1200
Subject: [PATCH 2650/4742] [powershell mode] Initial commit

---
 mode/powershell/index.html    | 107 +++++++++++++++++++
 mode/powershell/powershell.js | 191 ++++++++++++++++++++++++++++++++++
 2 files changed, 298 insertions(+)
 create mode 100644 mode/powershell/index.html
 create mode 100644 mode/powershell/powershell.js

diff --git a/mode/powershell/index.html b/mode/powershell/index.html
new file mode 100644
index 0000000000..940840c3b6
--- /dev/null
+++ b/mode/powershell/index.html
@@ -0,0 +1,107 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: Powershell mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
+  <script src="../../addon/comment/comment.js"></script>
+    <script src="powershell.js"></script>
+    <link rel="stylesheet" href="../../doc/docs.css">
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+  </head>
+  <body>
+    <h1>CodeMirror: Powershell mode</h1>
+    
+    <div><textarea id="code" name="code">
+# Literals
+1234
+0.0e101
+.123
+0b01010011100
+0o01234567
+0x0987654321abcdef
+7
+2147483647
+3L
+79228162514264337593543950336L
+0x100000000L
+79228162514264337593543950336
+0xdeadbeef
+3.14j
+10.j
+10j
+.001j
+1e100j
+3.14e-10j
+
+
+# String Literals
+'For\''
+"God\""
+"""so loved
+the world"""
+''
+@" Multi
+line
+string "@
+
+# Identifiers
+$Variable = value
+${Variable with spaces in it} = value
+
+# Operators
++ - * / % & | ^ ~ < >
+== != <= >= <> << >> // **
+and or not in is
+
+# Delimiters
+() [] {} , : ` = ; @ .  # Note that @ and . require the proper context.
++= -= *= /= %= &= |= ^=
+//= >>= <<= **=
+
+# Keywords
+as assert break class continue def del elif else except
+finally for from global if import lambda pass raise
+return try while with yield
+
+# Types
+bool classmethod complex dict enumerate float frozenset int list object
+property reversed set slice staticmethod str super tuple type
+
+# Some Example code
+import os
+from package import ParentClass
+
+@nonsenseDecorator
+def doesNothing():
+    pass
+
+class ExampleClass(ParentClass):
+    @staticmethod
+    def example(inputStr):
+        a = list(inputStr)
+        a.reverse()
+        return ''.join(a)
+
+    def __init__(self, mixin = 'Hello'):
+        self.mixin = mixin
+
+</textarea></div>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: {name: "powershell",
+               version: 2,
+               singleLineStringErrors: false},
+        lineNumbers: true,
+        indentUnit: 4,
+        tabMode: "shift",
+        matchBrackets: true
+      });
+    </script>
+
+
+    <p><strong>MIME types defined:</strong> <code>text/x-powershell</code>.</p>
+  </body>
+</html>
diff --git a/mode/powershell/powershell.js b/mode/powershell/powershell.js
new file mode 100644
index 0000000000..944088fbbe
--- /dev/null
+++ b/mode/powershell/powershell.js
@@ -0,0 +1,191 @@
+CodeMirror.defineMode("powershell", function() {
+    var ERRORCLASS = 'error';
+
+    function wordRegexp(words) {
+        return new RegExp("^((" + words.join(")|(") + "))\\b");
+    }
+
+    var wordOperators = wordRegexp(['-eq', '-ne', '-gt', '-lt', '-le', '-ge']);
+    var commonkeywords = ['begin', 'break', 'continue', 'do', 'default', 'else', 'elseif',
+  					  'end', 'filter', 'for', 'foreach', 'function', 'if', 'in', 'param', 
+						  'process', 'return', 'switch', 'until', 'where', 'while'];
+
+	var isOperatorChar = /[+\-*&^%:=<>!|\/]/;
+	var isString = /("|')(\`?.)*?\1/;
+	
+	var keywords = wordRegexp(commonkeywords);
+    //var builtins = wordRegexp(commonBuiltins);
+
+    var indentInfo = null;
+
+    // tokenizers
+    function tokenBase(stream, state) {
+        
+
+		
+		// Handle Comments        
+		//var ch = stream.peek();
+		
+		   if (stream.match(keywords)) {
+           return('variable-2');
+        }
+		
+		   if (stream.match(isString)) {
+           return('string');
+        }
+		
+			if (stream.match(wordOperators)) {
+           return('variable-2');
+        }
+			if (stream.match(isOperatorChar)) {
+			return('variable-1');
+		}
+			
+		
+		// Handle Variables
+
+				
+        // Handle Number Literals
+        if (stream.match(/^[0-9\.]/, false)) {
+            var floatLiteral = false;
+            // Floats
+            if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
+            if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
+            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(/^0x[0-9a-f]+/i)) { intLiteral = true; }
+            // Binary
+            if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
+            // Octal
+            if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
+            // Decimal
+            if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
+                // 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.
+            if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
+            if (intLiteral) {
+                // Integer literals may be "long"
+                stream.eat(/L/i);
+                return 'number';
+            }
+        }
+
+		var ch = stream.next();
+
+		if (ch === '$') {
+			if (stream.eat('{')) {
+				state.tokenize = tokenVariable;
+				return tokenVariable(stream, state);
+			} else {
+			stream.eatWhile(/[\w\\\-]/);
+			return 'variable-2';
+			}
+		}
+		
+        if (ch === '<' && stream.eat('#')) {
+			state.tokenize = tokenComment;
+			return tokenComment(stream, state);
+			}
+        
+		if (ch === '#') {
+            stream.skipToEnd();
+            return 'comment';
+        }
+
+		if (ch === '@' && stream.eat('\"')) {
+				state.tokenize = tokenMultiString;
+				return tokenMultiString(stream, state);
+			}
+		
+		//if (isOperatorChar.test(ch)) {
+		//	stream.eat;
+			//stream.next;
+		//	return("variable-1");
+		//	}
+
+        stream.next();
+        return ERRORCLASS;
+    }
+
+	
+	function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+      while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == ">") {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch === '#');
+    }
+    return("comment");
+	}
+   
+	function tokenVariable(stream, state) {
+      while ((ch = stream.next()) != null) {
+      if (ch == "}") {
+        state.tokenize = tokenBase;
+        break;
+      }
+    }
+    return("variable-2");
+	}
+	
+	function tokenMultiString(stream, state) {
+    var maybeEnd = false, ch;
+      while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == "@") {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch === '"');
+    }
+    return("string");
+	}
+	
+    function tokenLexer(stream, state) {
+        //indentInfo = null;
+        var style = state.tokenize(stream, state);
+        //var current = stream.current();
+        return style;
+    }
+
+    var external = {
+        startState: function(basecolumn) {
+            return {
+              tokenize: tokenBase,
+              scopes: [{offset:basecolumn || 0, type:'py'}],
+              lastToken: null,
+              lambda: false,
+              dedent: 0
+          };
+        },
+
+        token: function(stream, state) {
+            var style = tokenLexer(stream, state);
+            state.lastToken = {style:style, content: stream.current()};
+            if (stream.eol() && stream.lambda) {
+                state.lambda = false;
+            }
+
+            return style;
+        },
+
+		blockCommentStart: "<#",
+		blockCommentEnd: "#>",
+        lineComment: "#"
+    };
+    return external;
+});
+
+CodeMirror.defineMIME("text/x-powershell", "powershell");

From 20641be6a4973f7914d4a7ef4261f78ebe969411 Mon Sep 17 00:00:00 2001
From: Andrey Shchekin <ashmind@gmail.com>
Date: Mon, 30 Jun 2014 00:20:00 +1200
Subject: [PATCH 2651/4742] [powershell mode] Implement actual PowerShell
 syntax.

---
 mode/powershell/index.html    | 231 +++++++++++------
 mode/powershell/powershell.js | 462 ++++++++++++++++++++++------------
 2 files changed, 464 insertions(+), 229 deletions(-)

diff --git a/mode/powershell/index.html b/mode/powershell/index.html
index 940840c3b6..bc0f9c486c 100644
--- a/mode/powershell/index.html
+++ b/mode/powershell/index.html
@@ -3,97 +3,179 @@
   <head>
     <meta charset="utf-8">
     <title>CodeMirror: Powershell mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../../addon/edit/matchbrackets.js"></script>
-  <script src="../../addon/comment/comment.js"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.css">
+    <link rel="stylesheet" href="tests.css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js"></script>
     <script src="powershell.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
   </head>
   <body>
     <h1>CodeMirror: Powershell mode</h1>
-    
-    <div><textarea id="code" name="code">
-# Literals
-1234
-0.0e101
-.123
-0b01010011100
-0o01234567
-0x0987654321abcdef
-7
-2147483647
-3L
-79228162514264337593543950336L
-0x100000000L
-79228162514264337593543950336
-0xdeadbeef
-3.14j
-10.j
-10j
-.001j
-1e100j
-3.14e-10j
 
+    <div><textarea id="code" name="code">
+# Number Literals
+0 12345
+12kb 12mb 12gB 12Tb 12PB 12L 12D 12lkb 12dtb
+1.234 1.234e56 1. 1.e2 .2 .2e34
+1.2MB 1.kb .1dTb 1.e1gb
+0x1 0xabcdef 0x3tb 0xelmb
 
 # String Literals
-'For\''
-"God\""
-"""so loved
-the world"""
-''
-@" Multi
-line
-string "@
+'Literal escaping'''
+'Literal $variable'
+"Escaping 1`""
+"Escaping 2"""
+"Escaped `$variable"
+"Text, $variable and more text"
+"Text, ${variable with spaces} and more text."
+"Text, $($expression + 3) and more text."
+"Text, $("interpolation $("inception")") and more text."
 
-# Identifiers
-$Variable = value
-${Variable with spaces in it} = value
+@"
+Multiline
+string
+"@
+# --
+@"
+Multiline
+string with quotes "'
+"@
+# --
+@'
+Multiline literal
+string with quotes "'
+'@
 
-# Operators
-+ - * / % & | ^ ~ < >
-== != <= >= <> << >> // **
-and or not in is
+# Array and Hash literals
+@( 'a','b','c' )
+@{ 'key': 'value' }
 
-# Delimiters
-() [] {} , : ` = ; @ .  # Note that @ and . require the proper context.
-+= -= *= /= %= &= |= ^=
-//= >>= <<= **=
-
-# Keywords
-as assert break class continue def del elif else except
-finally for from global if import lambda pass raise
-return try while with yield
+# Variables
+$Variable = 5
+$global:variable = 5
+${Variable with spaces} = 5
 
-# Types
-bool classmethod complex dict enumerate float frozenset int list object
-property reversed set slice staticmethod str super tuple type
-
-# Some Example code
-import os
-from package import ParentClass
+# Operators
+= += -= *= /= %=
+++ -- .. -f * / % + -
+-not ! -bnot
+-split -isplit -csplit
+-join
+-is -isnot -as
+-eq -ieq -ceq -ne -ine -cne
+-gt -igt -cgt -ge -ige -cge
+-lt -ilt -clt -le -ile -cle
+-like -ilike -clike -notlike -inotlike -cnotlike
+-match -imatch -cmatch -notmatch -inotmatch -cnotmatch
+-contains -icontains -ccontains -notcontains -inotcontains -cnotcontains
+-replace -ireplace -creplace
+-band	-bor -bxor
+-and -or -xor
 
-@nonsenseDecorator
-def doesNothing():
-    pass
+# Punctuation
+() [] {} , : ` = ; .
 
-class ExampleClass(ParentClass):
-    @staticmethod
-    def example(inputStr):
-        a = list(inputStr)
-        a.reverse()
-        return ''.join(a)
+# Keywords
+elseif begin function for foreach return else trap while do data dynamicparam
+until end break if throw param continue finally in switch exit filter from try
+process catch
 
-    def __init__(self, mixin = 'Hello'):
-        self.mixin = mixin
+# Built-in variables
+$$ $? $^ $_
+$args $ConfirmPreference $ConsoleFileName $DebugPreference $Error
+$ErrorActionPreference $ErrorView $ExecutionContext $false $FormatEnumerationLimit
+$HOME $Host $input $MaximumAliasCount $MaximumDriveCount $MaximumErrorCount
+$MaximumFunctionCount $MaximumHistoryCount $MaximumVariableCount $MyInvocation
+$NestedPromptLevel $null $OutputEncoding $PID $PROFILE $ProgressPreference
+$PSBoundParameters $PSCommandPath $PSCulture $PSDefaultParameterValues
+$PSEmailServer $PSHOME $PSScriptRoot $PSSessionApplicationName
+$PSSessionConfigurationName $PSSessionOption $PSUICulture $PSVersionTable $PWD
+$ShellId $StackTrace $true $VerbosePreference $WarningPreference $WhatIfPreference
+$true $false $null
 
-</textarea></div>
+# Built-in functions
+A:
+Add-Computer Add-Content Add-History Add-Member Add-PSSnapin Add-Type
+B:
+C:
+Checkpoint-Computer Clear-Content Clear-EventLog Clear-History Clear-Host Clear-Item
+Clear-ItemProperty Clear-Variable Compare-Object Complete-Transaction Connect-PSSession
+ConvertFrom-Csv ConvertFrom-Json ConvertFrom-SecureString ConvertFrom-StringData
+Convert-Path ConvertTo-Csv ConvertTo-Html ConvertTo-Json ConvertTo-SecureString
+ConvertTo-Xml Copy-Item Copy-ItemProperty
+D:
+Debug-Process Disable-ComputerRestore Disable-PSBreakpoint Disable-PSRemoting
+Disable-PSSessionConfiguration Disconnect-PSSession
+E:
+Enable-ComputerRestore Enable-PSBreakpoint Enable-PSRemoting Enable-PSSessionConfiguration
+Enter-PSSession Exit-PSSession Export-Alias Export-Clixml Export-Console Export-Counter
+Export-Csv Export-FormatData Export-ModuleMember Export-PSSession
+F:
+ForEach-Object Format-Custom Format-List Format-Table Format-Wide
+G:
+Get-Acl Get-Alias Get-AuthenticodeSignature Get-ChildItem Get-Command Get-ComputerRestorePoint
+Get-Content Get-ControlPanelItem Get-Counter Get-Credential Get-Culture Get-Date
+Get-Event Get-EventLog Get-EventSubscriber Get-ExecutionPolicy Get-FormatData Get-Help
+Get-History Get-Host Get-HotFix Get-Item Get-ItemProperty Get-Job Get-Location Get-Member
+Get-Module Get-PfxCertificate Get-Process Get-PSBreakpoint Get-PSCallStack Get-PSDrive
+Get-PSProvider Get-PSSession Get-PSSessionConfiguration Get-PSSnapin Get-Random Get-Service
+Get-TraceSource Get-Transaction Get-TypeData Get-UICulture  Get-Unique Get-Variable Get-Verb
+Get-WinEvent Get-WmiObject Group-Object
+H:
+help
+I:
+Import-Alias Import-Clixml Import-Counter Import-Csv Import-LocalizedData Import-Module
+Import-PSSession ImportSystemModules Invoke-Command Invoke-Expression Invoke-History
+Invoke-Item Invoke-RestMethod Invoke-WebRequest Invoke-WmiMethod
+J:
+Join-Path
+K:
+L:
+Limit-EventLog
+M:
+Measure-Command Measure-Object mkdir more Move-Item Move-ItemProperty
+N:
+New-Alias New-Event New-EventLog New-Item New-ItemProperty New-Module New-ModuleManifest
+New-Object New-PSDrive New-PSSession New-PSSessionConfigurationFile New-PSSessionOption
+New-PSTransportOption New-Service New-TimeSpan New-Variable New-WebServiceProxy
+New-WinEvent
+O:
+oss Out-Default Out-File Out-GridView Out-Host Out-Null Out-Printer Out-String
+P:
+Pause Pop-Location prompt Push-Location
+Q:
+R:
+Read-Host Receive-Job Receive-PSSession Register-EngineEvent Register-ObjectEvent
+Register-PSSessionConfiguration Register-WmiEvent Remove-Computer Remove-Event
+Remove-EventLog Remove-Item Remove-ItemProperty Remove-Job Remove-Module
+Remove-PSBreakpoint Remove-PSDrive Remove-PSSession Remove-PSSnapin Remove-TypeData
+Remove-Variable Remove-WmiObject Rename-Computer Rename-Item Rename-ItemProperty
+Reset-ComputerMachinePassword Resolve-Path Restart-Computer Restart-Service
+Restore-Computer Resume-Job Resume-Service
+S:
+Save-Help Select-Object Select-String Select-Xml Send-MailMessage Set-Acl Set-Alias
+Set-AuthenticodeSignature Set-Content Set-Date Set-ExecutionPolicy Set-Item
+Set-ItemProperty Set-Location Set-PSBreakpoint Set-PSDebug
+Set-PSSessionConfiguration Set-Service Set-StrictMode Set-TraceSource Set-Variable
+Set-WmiInstance Show-Command Show-ControlPanelItem Show-EventLog Sort-Object
+Split-Path Start-Job Start-Process Start-Service Start-Sleep Start-Transaction
+Start-Transcript Stop-Computer Stop-Job Stop-Process Stop-Service Stop-Transcript
+Suspend-Job Suspend-Service
+T:
+TabExpansion2 Tee-Object Test-ComputerSecureChannel Test-Connection
+Test-ModuleManifest Test-Path Test-PSSessionConfigurationFile Trace-Command
+U:
+Unblock-File Undo-Transaction Unregister-Event Unregister-PSSessionConfiguration
+Update-FormatData Update-Help Update-List Update-TypeData Use-Transaction
+V:
+W:
+Wait-Event Wait-Job Wait-Process Where-Object Write-Debug Write-Error Write-EventLog
+Write-Host Write-Output Write-Progress Write-Verbose Write-Warning
+X:
+Y:
+Z:</textarea></div>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "powershell",
-               version: 2,
-               singleLineStringErrors: false},
+        mode: "powershell",
         lineNumbers: true,
         indentUnit: 4,
         tabMode: "shift",
@@ -101,7 +183,6 @@ <h1>CodeMirror: Powershell mode</h1>
       });
     </script>
 
-
     <p><strong>MIME types defined:</strong> <code>text/x-powershell</code>.</p>
   </body>
 </html>
diff --git a/mode/powershell/powershell.js b/mode/powershell/powershell.js
index 944088fbbe..f63111b2c8 100644
--- a/mode/powershell/powershell.js
+++ b/mode/powershell/powershell.js
@@ -1,191 +1,345 @@
-CodeMirror.defineMode("powershell", function() {
-    var ERRORCLASS = 'error';
+// Initially based on CodeMirror Python mode, copyright (c) by Marijn Haverbeke and others
+// PowerShell mode, copyright (c) Andrey Shchekin, VapidWorx and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
 
-    function wordRegexp(words) {
-        return new RegExp("^((" + words.join(")|(") + "))\\b");
+(function(mod) {
+  'use strict';
+  if (typeof exports == 'object' && typeof module == 'object') // CommonJS
+    mod(require('codemirror'));
+  else if (typeof define == 'function' && define.amd) // AMD
+    define(['codemirror'], mod);
+  else // Plain browser env
+    mod(window.CodeMirror);
+})(function(CodeMirror) {
+'use strict';
+
+CodeMirror.defineMode('powershell', function() {
+    function buildRegexp(patterns, options) {
+        options = options || {};
+        var prefix = options.prefix !== undefined ? options.prefix : '^';
+        var suffix = options.suffix !== undefined ? options.suffix : '\\b';
+
+        for (var i = 0; i < patterns.length; i++) {
+            if (patterns[i] instanceof RegExp) {
+                patterns[i] = patterns[i].source;
+            }
+            else {
+                patterns[i] = patterns[i].replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+            }
+        }
+
+        return new RegExp(prefix + '(' + patterns.join('|') + ')' + suffix, 'i');
     }
 
-    var wordOperators = wordRegexp(['-eq', '-ne', '-gt', '-lt', '-le', '-ge']);
-    var commonkeywords = ['begin', 'break', 'continue', 'do', 'default', 'else', 'elseif',
-  					  'end', 'filter', 'for', 'foreach', 'function', 'if', 'in', 'param', 
-						  'process', 'return', 'switch', 'until', 'where', 'while'];
+    var notCharacterOrDash = '(?=[^A-Z\\d\\-_]|$)';
+    var keywords = buildRegexp([
+        /begin|break|catch|continue|data|default|do|dynamicparam/,
+        /else|elseif|end|exit|filter|finally|for|foreach|from|function|if|in/,
+        /param|process|return|switch|throw|trap|try|until|where|while/
+    ], { suffix: notCharacterOrDash });
+
+    var punctuation = /[\[\]{},;`\.]|@[({]/;
+    var wordOperators = buildRegexp([
+        'f',
+        /b?not/,
+        /[ic]?split/, 'join',
+        /is(not)?/, 'as',
+        /[ic]?(eq|ne|[gl][te])/,
+        /[ic]?(not)?(like|match|contains)/,
+        /[ic]?replace/,
+        /b?(and|or|xor)/
+    ], { prefix: '-' });
+    var symbolOperators = /[+\-*\/%]=|\+\+|--|\.\.|[+\-*&^%:=<>!|\/]/;
+    var operators = buildRegexp([wordOperators, symbolOperators], { suffix: '' });
+
+    var numbers = /^[+-]?(0x[\da-f]+|(\d+(\.\d+)?|\.\d*)(e[\+\-]?\d+)?)[ld]?([kmgtp]b)?/i;
 
-	var isOperatorChar = /[+\-*&^%:=<>!|\/]/;
-	var isString = /("|')(\`?.)*?\1/;
-	
-	var keywords = wordRegexp(commonkeywords);
-    //var builtins = wordRegexp(commonBuiltins);
+    var identifiers = /^[A-Za-z\_][A-Za-z\-\_\d]*\b/;
 
-    var indentInfo = null;
+    var symbolBuiltins = /[A-Z]:|%|\?/i;
+    var namedBuiltins = buildRegexp([
+        /Add-(Computer|Content|History|Member|PSSnapin|Type)/,
+        /Checkpoint-Computer/,
+        /Clear-(Content|EventLog|History|Host|Item(Property)?|Variable)/,
+        /Compare-Object/,
+        /Complete-Transaction/,
+        /Connect-PSSession/,
+        /ConvertFrom-(Csv|Json|SecureString|StringData)/,
+        /Convert-Path/,
+        /ConvertTo-(Csv|Html|Json|SecureString|Xml)/,
+        /Copy-Item(Property)?/,
+        /Debug-Process/,
+        /Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,
+        /Disconnect-PSSession/,
+        /Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,
+        /(Enter|Exit)-PSSession/,
+        /Export-(Alias|Clixml|Console|Counter|Csv|FormatData|ModuleMember|PSSession)/,
+        /ForEach-Object/,
+        /Format-(Custom|List|Table|Wide)/,
+        new RegExp('Get-(Acl|Alias|AuthenticodeSignature|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Counter|Credential'
+          + '|Culture|Date|Event|EventLog|EventSubscriber|ExecutionPolicy|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job'
+          + '|Location|Member|Module|PfxCertificate|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration'
+          + '|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|Verb|WinEvent|WmiObject)'),
+        /Group-Object/,
+        /Import-(Alias|Clixml|Counter|Csv|LocalizedData|Module|PSSession)/,
+        /ImportSystemModules/,
+        /Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)/,
+        /Join-Path/,
+        /Limit-EventLog/,
+        /Measure-(Command|Object)/,
+        /Move-Item(Property)?/,
+        new RegExp('New-(Alias|Event|EventLog|Item(Property)?|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile'
+          + '|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy|WinEvent)'),
+        /Out-(Default|File|GridView|Host|Null|Printer|String)/,
+        /Pause/,
+        /(Pop|Push)-Location/,
+        /Read-Host/,
+        /Receive-(Job|PSSession)/,
+        /Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)/,
+        /Remove-(Computer|Event|EventLog|Item(Property)?|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)/,
+        /Rename-(Computer|Item(Property)?)/,
+        /Reset-ComputerMachinePassword/,
+        /Resolve-Path/,
+        /Restart-(Computer|Service)/,
+        /Restore-Computer/,
+        /Resume-(Job|Service)/,
+        /Save-Help/,
+        /Select-(Object|String|Xml)/,
+        /Send-MailMessage/,
+        new RegExp('Set-(Acl|Alias|AuthenticodeSignature|Content|Date|ExecutionPolicy|Item(Property)?|Location|PSBreakpoint|PSDebug'
+          + '|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)'),
+        /Show-(Command|ControlPanelItem|EventLog)/,
+        /Sort-Object/,
+        /Split-Path/,
+        /Start-(Job|Process|Service|Sleep|Transaction|Transcript)/,
+        /Stop-(Computer|Job|Process|Service|Transcript)/,
+        /Suspend-(Job|Service)/,
+        /TabExpansion2/,
+        /Tee-Object/,
+        /Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)/,
+        /Trace-Command/,
+        /Unblock-File/,
+        /Undo-Transaction/,
+        /Unregister-(Event|PSSessionConfiguration)/,
+        /Update-(FormatData|Help|List|TypeData)/,
+        /Use-Transaction/,
+        /Wait-(Event|Job|Process)/,
+        /Where-Object/,
+        /Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning)/,
+        /cd|help|mkdir|more|oss|prompt/,
+        /ac|asnp|cat|cd|chdir|clc|clear|clhy|cli|clp|cls|clv|cnsn|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|dnsn|ebp/,
+        /echo|epal|epcsv|epsn|erase|etsn|exsn|fc|fl|foreach|ft|fw|gal|gbp|gc|gci|gcm|gcs|gdr|ghy|gi|gjb|gl|gm|gmo|gp|gps/,
+        /group|gsn|gsnp|gsv|gu|gv|gwmi|h|history|icm|iex|ihy|ii|ipal|ipcsv|ipmo|ipsn|irm|ise|iwmi|iwr|kill|lp|ls|man|md/,
+        /measure|mi|mount|move|mp|mv|nal|ndr|ni|nmo|npssc|nsn|nv|ogv|oh|popd|ps|pushd|pwd|r|rbp|rcjb|rcsn|rd|rdr|ren|ri/,
+        /rjb|rm|rmdir|rmo|rni|rnp|rp|rsn|rsnp|rujb|rv|rvpa|rwmi|sajb|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls/,
+        /sort|sp|spjb|spps|spsv|start|sujb|sv|swmi|tee|trcm|type|where|wjb|write/,
+    ], { prefix: '', suffix: '' });
+    var variableBuiltins = buildRegexp([
+        /[$?^_]|Args|ConfirmPreference|ConsoleFileName|DebugPreference|Error|ErrorActionPreference|ErrorView|ExecutionContext/,
+        /FormatEnumerationLimit|Home|Host|Input|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount/,
+        /MaximumHistoryCount|MaximumVariableCount|MyInvocation|NestedPromptLevel|OutputEncoding|Pid|Profile|ProgressPreference/,
+        /PSBoundParameters|PSCommandPath|PSCulture|PSDefaultParameterValues|PSEmailServer|PSHome|PSScriptRoot|PSSessionApplicationName/,
+        /PSSessionConfigurationName|PSSessionOption|PSUICulture|PSVersionTable|Pwd|ShellId|StackTrace|VerbosePreference/,
+        /WarningPreference|WhatIfPreference/,
+
+        /Event|EventArgs|EventSubscriber|Sender/,
+        /Matches|Ofs|ForEach|LastExitCode|PSCmdlet|PSItem|PSSenderInfo|This/,
+        /true|false|null/
+    ], { prefix: '\\$', suffix: '' });
+
+    var builtins = buildRegexp([ symbolBuiltins, namedBuiltins, variableBuiltins ], { suffix: notCharacterOrDash });
+
+    var grammar = {
+        keyword: keywords,
+        number: numbers,
+        operator: operators,
+        builtin: builtins,
+        punctuation: punctuation,
+        indetifier: identifiers
+    };
 
     // tokenizers
     function tokenBase(stream, state) {
-        
-
-		
-		// Handle Comments        
-		//var ch = stream.peek();
-		
-		   if (stream.match(keywords)) {
-           return('variable-2');
-        }
-		
-		   if (stream.match(isString)) {
-           return('string');
-        }
-		
-			if (stream.match(wordOperators)) {
-           return('variable-2');
-        }
-			if (stream.match(isOperatorChar)) {
-			return('variable-1');
-		}
-			
-		
-		// Handle Variables
-
-				
-        // Handle Number Literals
-        if (stream.match(/^[0-9\.]/, false)) {
-            var floatLiteral = false;
-            // Floats
-            if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
-            if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
-            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(/^0x[0-9a-f]+/i)) { intLiteral = true; }
-            // Binary
-            if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
-            // Octal
-            if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
-            // Decimal
-            if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
-                // 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.
-            if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-            if (intLiteral) {
-                // Integer literals may be "long"
-                stream.eat(/L/i);
-                return 'number';
+        // Handle Comments
+        //var ch = stream.peek();
+
+        if (stream.eatSpace()) {
+            return null;
+        }
+
+        var parent = state.returnStack[state.returnStack.length - 1];
+        if (parent && parent.shouldReturnFrom(state)) {
+            state.tokenize = parent.tokenize;
+            state.returnStack.pop();
+            return state.tokenize(stream, state);
+        }
+
+        if (stream.eat('(')) {
+            state.bracketNesting += 1;
+            return 'punctuation';
+        }
+
+        if (stream.eat(')')) {
+            state.bracketNesting -= 1;
+            return 'punctuation';
+        }
+
+        for (var key in grammar) {
+            if (stream.match(grammar[key])) {
+                return key;
             }
         }
 
-		var ch = stream.next();
+        // single-quote string
+        if (stream.match(/'([^']|'')+'/)) {
+            return 'string';
+        }
+
+        var ch = stream.next();
+        if (ch === '$') {
+            return tokenVariable(stream, state);
+        }
+
+        // double-quote string
+        if (ch === '"') {
+            return tokenDoubleQuoteString(stream, state);
+        }
 
-		if (ch === '$') {
-			if (stream.eat('{')) {
-				state.tokenize = tokenVariable;
-				return tokenVariable(stream, state);
-			} else {
-			stream.eatWhile(/[\w\\\-]/);
-			return 'variable-2';
-			}
-		}
-		
         if (ch === '<' && stream.eat('#')) {
-			state.tokenize = tokenComment;
-			return tokenComment(stream, state);
-			}
-        
-		if (ch === '#') {
+            state.tokenize = tokenComment;
+            return tokenComment(stream, state);
+        }
+
+        if (ch === '#') {
             stream.skipToEnd();
             return 'comment';
         }
 
-		if (ch === '@' && stream.eat('\"')) {
-				state.tokenize = tokenMultiString;
-				return tokenMultiString(stream, state);
-			}
-		
-		//if (isOperatorChar.test(ch)) {
-		//	stream.eat;
-			//stream.next;
-		//	return("variable-1");
-		//	}
+        if (ch === '@') {
+            var quoteMatch = stream.eat(/["']/);
+            if (quoteMatch && stream.eol()) {
+                state.tokenize = tokenMultiString;
+                state.startQuote = quoteMatch[0];
+                return tokenMultiString(stream, state);
+            }
+        }
 
         stream.next();
-        return ERRORCLASS;
+        return 'error';
+    }
+
+    function tokenDoubleQuoteString(stream, state) {
+        var ch;
+        while((ch = stream.peek()) != null) {
+            if (ch === '$') {
+                state.tokenize = tokenInterpolation;
+                return 'string';
+            }
+
+            stream.next();
+            if (ch === '`') {
+                stream.next();
+                continue;
+            }
+
+            if (ch === '"' && !stream.eat('"')) {
+                state.tokenize = tokenBase;
+                return 'string';
+            }
+        }
+
+        return 'error';
+    }
+
+    function tokenInterpolation(stream, state) {
+        if (stream.match('$(')) {
+            var savedBracketNesting = state.bracketNesting;
+            state.returnStack.push({
+                /*jshint loopfunc:true */
+                shouldReturnFrom: function(state) {
+                    return state.bracketNesting === savedBracketNesting;
+                },
+                tokenize: tokenDoubleQuoteString
+            });
+            state.tokenize = tokenBase;
+            state.bracketNesting += 1;
+            return 'punctuation';
+        } else {
+            stream.next();
+            state.returnStack.push({
+                shouldReturnFrom: function() { return true; },
+                tokenize: tokenDoubleQuoteString
+            });
+            state.tokenize = tokenVariable;
+            return state.tokenize(stream, state);
+        }
     }
 
-	
-	function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-      while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == ">") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch === '#');
+    function tokenComment(stream, state) {
+        var maybeEnd = false, ch;
+        while ((ch = stream.next()) != null) {
+          if (maybeEnd && ch == '>') {
+              state.tokenize = tokenBase;
+              break;
+          }
+          maybeEnd = (ch === '#');
+        }
+        return 'comment';
     }
-    return("comment");
-	}
-   
-	function tokenVariable(stream, state) {
-      while ((ch = stream.next()) != null) {
-      if (ch == "}") {
-        state.tokenize = tokenBase;
-        break;
-      }
+
+    function tokenVariable(stream, state) {
+        if (stream.eat('{')) {
+            state.tokenize = tokenVariableWithBraces;
+            return tokenVariableWithBraces(stream, state);
+        } else {
+            stream.eatWhile(/[\w\\\-:]/);
+            state.tokenize = tokenBase;
+            return 'variable-2';
+        }
     }
-    return("variable-2");
-	}
-	
-	function tokenMultiString(stream, state) {
-    var maybeEnd = false, ch;
-      while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "@") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch === '"');
+
+    function tokenVariableWithBraces(stream, state) {
+        var ch;
+        while ((ch = stream.next()) != null) {
+            if (ch === '}') {
+                state.tokenize = tokenBase;
+                break;
+            }
+        }
+        return 'variable-2';
     }
-    return("string");
-	}
-	
-    function tokenLexer(stream, state) {
-        //indentInfo = null;
-        var style = state.tokenize(stream, state);
-        //var current = stream.current();
-        return style;
+
+    function tokenMultiString(stream, state) {
+        var quote = state.startQuote;
+        if (stream.sol() && stream.match(new RegExp(quote + '@'))) {
+            state.tokenize = tokenBase;
+        }
+        else {
+            stream.skipToEnd();
+        }
+
+        return 'string';
     }
 
     var external = {
-        startState: function(basecolumn) {
+        startState: function() {
             return {
-              tokenize: tokenBase,
-              scopes: [{offset:basecolumn || 0, type:'py'}],
-              lastToken: null,
-              lambda: false,
-              dedent: 0
-          };
+                returnStack: [],
+                bracketNesting: 0,
+                tokenize: tokenBase
+            };
         },
 
         token: function(stream, state) {
-            var style = tokenLexer(stream, state);
-            state.lastToken = {style:style, content: stream.current()};
-            if (stream.eol() && stream.lambda) {
-                state.lambda = false;
-            }
-
-            return style;
+            return state.tokenize(stream, state);
         },
 
-		blockCommentStart: "<#",
-		blockCommentEnd: "#>",
-        lineComment: "#"
+        blockCommentStart: '<#',
+        blockCommentEnd: '#>',
+        lineComment: '#'
     };
     return external;
 });
 
-CodeMirror.defineMIME("text/x-powershell", "powershell");
+CodeMirror.defineMIME('text/x-powershell', 'powershell');
+});
\ No newline at end of file

From d0e82a76f88a1e359447da39df2cb68c31067f6a Mon Sep 17 00:00:00 2001
From: Ben Miller <benmiller@google.com>
Date: Thu, 24 Sep 2015 15:48:23 +1200
Subject: [PATCH 2652/4742] [powershell mode] Improve

corrected angle bracket matching in operators (fixes block comments)
corrected digit matching regex
corrected spelling of 'identifier' in grammar dictionary
notCharacterOrDash explicitly includes lowercase characters
improved variable matching
splatted variables now match
bare '$' and '@' are errors, not variables
moved single-quoted string processing into tokenSingleQuoteString
incomplete strings are errors now
empty strings are no longer errors
added support for here-string interpolation with nesting support
added highlighting for splatted vars
removed arbitrary stream advancement prior to default error in tokenBase
enabled folding braces
---
 mode/powershell/powershell.js | 104 ++++++++++++++++++++++++++--------
 1 file changed, 80 insertions(+), 24 deletions(-)

diff --git a/mode/powershell/powershell.js b/mode/powershell/powershell.js
index f63111b2c8..8295635a6f 100644
--- a/mode/powershell/powershell.js
+++ b/mode/powershell/powershell.js
@@ -1,6 +1,9 @@
-// Initially based on CodeMirror Python mode, copyright (c) by Marijn Haverbeke and others
-// PowerShell mode, copyright (c) Andrey Shchekin, VapidWorx and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+/**
+ * @license
+ * Initially based on CodeMirror Python mode, copyright (c) by Marijn Haverbeke and others
+ * PowerShell mode, copyright (c) Andrey Shchekin, VapidWorx and others
+ * Distributed under an MIT license: http://codemirror.net/LICENSE
+ */
 
 (function(mod) {
   'use strict';
@@ -31,7 +34,8 @@ CodeMirror.defineMode('powershell', function() {
         return new RegExp(prefix + '(' + patterns.join('|') + ')' + suffix, 'i');
     }
 
-    var notCharacterOrDash = '(?=[^A-Z\\d\\-_]|$)';
+    var notCharacterOrDash = '(?=[^A-Za-z\\d\\-_]|$)';
+    var varNames = /[\w\-:]/
     var keywords = buildRegexp([
         /begin|break|catch|continue|data|default|do|dynamicparam/,
         /else|elseif|end|exit|filter|finally|for|foreach|from|function|if|in/,
@@ -49,10 +53,10 @@ CodeMirror.defineMode('powershell', function() {
         /[ic]?replace/,
         /b?(and|or|xor)/
     ], { prefix: '-' });
-    var symbolOperators = /[+\-*\/%]=|\+\+|--|\.\.|[+\-*&^%:=<>!|\/]/;
+    var symbolOperators = /[+\-*\/%]=|\+\+|--|\.\.|[+\-*&^%:=!|\/]|<(?!#)|(?!#)>/;
     var operators = buildRegexp([wordOperators, symbolOperators], { suffix: '' });
 
-    var numbers = /^[+-]?(0x[\da-f]+|(\d+(\.\d+)?|\.\d*)(e[\+\-]?\d+)?)[ld]?([kmgtp]b)?/i;
+    var numbers = /^[+-]?((0x[\da-f]+)|((\d+\.\d+|\d\.|\.\d+|\d+)(e[\+\-]?\d+)?))[ld]?([kmgtp]b)?/i;
 
     var identifiers = /^[A-Za-z\_][A-Za-z\-\_\d]*\b/;
 
@@ -106,8 +110,8 @@ CodeMirror.defineMode('powershell', function() {
         /Save-Help/,
         /Select-(Object|String|Xml)/,
         /Send-MailMessage/,
-        new RegExp('Set-(Acl|Alias|AuthenticodeSignature|Content|Date|ExecutionPolicy|Item(Property)?|Location|PSBreakpoint|PSDebug'
-          + '|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)'),
+        new RegExp('Set-(Acl|Alias|AuthenticodeSignature|Content|Date|ExecutionPolicy|Item(Property)?|Location|PSBreakpoint|PSDebug' +
+                   '|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)'),
         /Show-(Command|ControlPanelItem|EventLog)/,
         /Sort-Object/,
         /Split-Path/,
@@ -132,7 +136,7 @@ CodeMirror.defineMode('powershell', function() {
         /group|gsn|gsnp|gsv|gu|gv|gwmi|h|history|icm|iex|ihy|ii|ipal|ipcsv|ipmo|ipsn|irm|ise|iwmi|iwr|kill|lp|ls|man|md/,
         /measure|mi|mount|move|mp|mv|nal|ndr|ni|nmo|npssc|nsn|nv|ogv|oh|popd|ps|pushd|pwd|r|rbp|rcjb|rcsn|rd|rdr|ren|ri/,
         /rjb|rm|rmdir|rmo|rni|rnp|rp|rsn|rsnp|rujb|rv|rvpa|rwmi|sajb|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls/,
-        /sort|sp|spjb|spps|spsv|start|sujb|sv|swmi|tee|trcm|type|where|wjb|write/,
+        /sort|sp|spjb|spps|spsv|start|sujb|sv|swmi|tee|trcm|type|where|wjb|write/
     ], { prefix: '', suffix: '' });
     var variableBuiltins = buildRegexp([
         /[$?^_]|Args|ConfirmPreference|ConsoleFileName|DebugPreference|Error|ErrorActionPreference|ErrorView|ExecutionContext/,
@@ -147,7 +151,7 @@ CodeMirror.defineMode('powershell', function() {
         /true|false|null/
     ], { prefix: '\\$', suffix: '' });
 
-    var builtins = buildRegexp([ symbolBuiltins, namedBuiltins, variableBuiltins ], { suffix: notCharacterOrDash });
+    var builtins = buildRegexp([symbolBuiltins, namedBuiltins, variableBuiltins], { suffix: notCharacterOrDash });
 
     var grammar = {
         keyword: keywords,
@@ -155,7 +159,7 @@ CodeMirror.defineMode('powershell', function() {
         operator: operators,
         builtin: builtins,
         punctuation: punctuation,
-        indetifier: identifiers
+        identifier: identifiers
     };
 
     // tokenizers
@@ -190,12 +194,13 @@ CodeMirror.defineMode('powershell', function() {
             }
         }
 
+        var ch = stream.next();
+
         // single-quote string
-        if (stream.match(/'([^']|'')+'/)) {
-            return 'string';
+        if (ch === "'") {
+            return tokenSingleQuoteString(stream, state);
         }
 
-        var ch = stream.next();
         if (ch === '$') {
             return tokenVariable(stream, state);
         }
@@ -221,18 +226,35 @@ CodeMirror.defineMode('powershell', function() {
                 state.tokenize = tokenMultiString;
                 state.startQuote = quoteMatch[0];
                 return tokenMultiString(stream, state);
+            } else if (stream.peek().match(/[({]/)) {
+                return 'punctuation';
+            } else if (stream.match(varNames)) {
+              // splatted variable
+              return tokenVariable(stream, state);
+            }
+        }
+        return 'error';
+    }
+
+    function tokenSingleQuoteString(stream, state) {
+        var ch;
+        while ((ch = stream.peek()) != null) {
+            stream.next();
+
+            if (ch === "'" && !stream.eat("'")) {
+                state.tokenize = tokenBase;
+                return 'string';
             }
         }
 
-        stream.next();
         return 'error';
     }
 
     function tokenDoubleQuoteString(stream, state) {
         var ch;
-        while((ch = stream.peek()) != null) {
+        while ((ch = stream.peek()) != null) {
             if (ch === '$') {
-                state.tokenize = tokenInterpolation;
+                state.tokenize = tokenStringInterpolation;
                 return 'string';
             }
 
@@ -251,7 +273,22 @@ CodeMirror.defineMode('powershell', function() {
         return 'error';
     }
 
-    function tokenInterpolation(stream, state) {
+    function tokenStringInterpolation(stream, state) {
+        return tokenInterpolation(stream, state, tokenDoubleQuoteString);
+    }
+
+    function tokenMultiStringReturn(stream, state) {
+        state.tokenize = tokenMultiString;
+        state.startQuote = '"'
+        return tokenMultiString(stream, state);
+    }
+
+    function tokenHereStringInterpolation(stream, state) {
+        var saved;
+        return tokenInterpolation(stream, state, tokenMultiStringReturn);
+    }
+
+    function tokenInterpolation(stream, state, parentTokenize) {
         if (stream.match('$(')) {
             var savedBracketNesting = state.bracketNesting;
             state.returnStack.push({
@@ -259,7 +296,7 @@ CodeMirror.defineMode('powershell', function() {
                 shouldReturnFrom: function(state) {
                     return state.bracketNesting === savedBracketNesting;
                 },
-                tokenize: tokenDoubleQuoteString
+                tokenize: parentTokenize
             });
             state.tokenize = tokenBase;
             state.bracketNesting += 1;
@@ -268,7 +305,7 @@ CodeMirror.defineMode('powershell', function() {
             stream.next();
             state.returnStack.push({
                 shouldReturnFrom: function() { return true; },
-                tokenize: tokenDoubleQuoteString
+                tokenize: parentTokenize
             });
             state.tokenize = tokenVariable;
             return state.tokenize(stream, state);
@@ -288,13 +325,17 @@ CodeMirror.defineMode('powershell', function() {
     }
 
     function tokenVariable(stream, state) {
+        var ch = stream.peek();
         if (stream.eat('{')) {
             state.tokenize = tokenVariableWithBraces;
             return tokenVariableWithBraces(stream, state);
-        } else {
-            stream.eatWhile(/[\w\\\-:]/);
+        } else if (ch != undefined && ch.match(varNames)) {
+            stream.eatWhile(varNames);
             state.tokenize = tokenBase;
             return 'variable-2';
+        } else {
+            state.tokenize = tokenBase;
+            return 'error';
         }
     }
 
@@ -314,6 +355,20 @@ CodeMirror.defineMode('powershell', function() {
         if (stream.sol() && stream.match(new RegExp(quote + '@'))) {
             state.tokenize = tokenBase;
         }
+        else if (quote === '"') {
+            while (!stream.eol()) {
+                var ch = stream.peek();
+                if (ch === '$') {
+                    state.tokenize = tokenHereStringInterpolation;
+                    return 'string';
+                }
+
+                stream.next();
+                if (ch === '`') {
+                    stream.next();
+                }
+            }
+        }
         else {
             stream.skipToEnd();
         }
@@ -336,10 +391,11 @@ CodeMirror.defineMode('powershell', function() {
 
         blockCommentStart: '<#',
         blockCommentEnd: '#>',
-        lineComment: '#'
+        lineComment: '#',
+        fold: 'brace'
     };
     return external;
 });
 
 CodeMirror.defineMIME('text/x-powershell', 'powershell');
-});
\ No newline at end of file
+});

From 95f6840611f8b7025de3783f8408e9f353a830cc Mon Sep 17 00:00:00 2001
From: Andrey Shchekin <ashmind@gmail.com>
Date: Sun, 27 Mar 2016 22:11:07 +1300
Subject: [PATCH 2653/4742] [powershell mode] Prepare for merge into CodeMirror
 repository

Added tests and fixed some issues uncovered by testing.
---
 mode/powershell/index.html    |  46 ++-
 mode/powershell/powershell.js | 697 +++++++++++++++++-----------------
 mode/powershell/test.js       |  72 ++++
 test/index.html               |   2 +
 4 files changed, 451 insertions(+), 366 deletions(-)
 create mode 100644 mode/powershell/test.js

diff --git a/mode/powershell/index.html b/mode/powershell/index.html
index bc0f9c486c..6b235df8f1 100644
--- a/mode/powershell/index.html
+++ b/mode/powershell/index.html
@@ -3,15 +3,30 @@
   <head>
     <meta charset="utf-8">
     <title>CodeMirror: Powershell mode</title>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.css">
-    <link rel="stylesheet" href="tests.css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/4.3.0/codemirror.js"></script>
+    <link rel="stylesheet" href="../../doc/docs.css">
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
     <script src="powershell.js"></script>
+    <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
   </head>
   <body>
-    <h1>CodeMirror: Powershell mode</h1>
+    <div id=nav>
+      <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
-    <div><textarea id="code" name="code">
+      <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="#">JavaScript</a>
+      </ul>
+    </div>
+    <article>
+      <h2>PowerShell mode</h2>
+
+      <div><textarea id="code" name="code">
 # Number Literals
 0 12345
 12kb 12mb 12gB 12Tb 12PB 12L 12D 12lkb 12dtb
@@ -173,16 +188,17 @@ <h1>CodeMirror: Powershell mode</h1>
 X:
 Y:
 Z:</textarea></div>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "powershell",
-        lineNumbers: true,
-        indentUnit: 4,
-        tabMode: "shift",
-        matchBrackets: true
-      });
-    </script>
+      <script>
+        var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+          mode: "powershell",
+          lineNumbers: true,
+          indentUnit: 4,
+          tabMode: "shift",
+          matchBrackets: true
+        });
+      </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-powershell</code>.</p>
+      <p><strong>MIME types defined:</strong> <code>application/x-powershell</code>.</p>
+    </article>
   </body>
 </html>
diff --git a/mode/powershell/powershell.js b/mode/powershell/powershell.js
index 8295635a6f..c443e7232d 100644
--- a/mode/powershell/powershell.js
+++ b/mode/powershell/powershell.js
@@ -1,9 +1,5 @@
-/**
- * @license
- * Initially based on CodeMirror Python mode, copyright (c) by Marijn Haverbeke and others
- * PowerShell mode, copyright (c) Andrey Shchekin, VapidWorx and others
- * Distributed under an MIT license: http://codemirror.net/LICENSE
- */
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
   'use strict';
@@ -17,385 +13,384 @@
 'use strict';
 
 CodeMirror.defineMode('powershell', function() {
-    function buildRegexp(patterns, options) {
-        options = options || {};
-        var prefix = options.prefix !== undefined ? options.prefix : '^';
-        var suffix = options.suffix !== undefined ? options.suffix : '\\b';
-
-        for (var i = 0; i < patterns.length; i++) {
-            if (patterns[i] instanceof RegExp) {
-                patterns[i] = patterns[i].source;
-            }
-            else {
-                patterns[i] = patterns[i].replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-            }
-        }
-
-        return new RegExp(prefix + '(' + patterns.join('|') + ')' + suffix, 'i');
+  function buildRegexp(patterns, options) {
+    options = options || {};
+    var prefix = options.prefix !== undefined ? options.prefix : '^';
+    var suffix = options.suffix !== undefined ? options.suffix : '\\b';
+
+    for (var i = 0; i < patterns.length; i++) {
+      if (patterns[i] instanceof RegExp) {
+        patterns[i] = patterns[i].source;
+      }
+      else {
+        patterns[i] = patterns[i].replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+      }
     }
 
-    var notCharacterOrDash = '(?=[^A-Za-z\\d\\-_]|$)';
-    var varNames = /[\w\-:]/
-    var keywords = buildRegexp([
-        /begin|break|catch|continue|data|default|do|dynamicparam/,
-        /else|elseif|end|exit|filter|finally|for|foreach|from|function|if|in/,
-        /param|process|return|switch|throw|trap|try|until|where|while/
-    ], { suffix: notCharacterOrDash });
-
-    var punctuation = /[\[\]{},;`\.]|@[({]/;
-    var wordOperators = buildRegexp([
-        'f',
-        /b?not/,
-        /[ic]?split/, 'join',
-        /is(not)?/, 'as',
-        /[ic]?(eq|ne|[gl][te])/,
-        /[ic]?(not)?(like|match|contains)/,
-        /[ic]?replace/,
-        /b?(and|or|xor)/
-    ], { prefix: '-' });
-    var symbolOperators = /[+\-*\/%]=|\+\+|--|\.\.|[+\-*&^%:=!|\/]|<(?!#)|(?!#)>/;
-    var operators = buildRegexp([wordOperators, symbolOperators], { suffix: '' });
-
-    var numbers = /^[+-]?((0x[\da-f]+)|((\d+\.\d+|\d\.|\.\d+|\d+)(e[\+\-]?\d+)?))[ld]?([kmgtp]b)?/i;
-
-    var identifiers = /^[A-Za-z\_][A-Za-z\-\_\d]*\b/;
-
-    var symbolBuiltins = /[A-Z]:|%|\?/i;
-    var namedBuiltins = buildRegexp([
-        /Add-(Computer|Content|History|Member|PSSnapin|Type)/,
-        /Checkpoint-Computer/,
-        /Clear-(Content|EventLog|History|Host|Item(Property)?|Variable)/,
-        /Compare-Object/,
-        /Complete-Transaction/,
-        /Connect-PSSession/,
-        /ConvertFrom-(Csv|Json|SecureString|StringData)/,
-        /Convert-Path/,
-        /ConvertTo-(Csv|Html|Json|SecureString|Xml)/,
-        /Copy-Item(Property)?/,
-        /Debug-Process/,
-        /Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,
-        /Disconnect-PSSession/,
-        /Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,
-        /(Enter|Exit)-PSSession/,
-        /Export-(Alias|Clixml|Console|Counter|Csv|FormatData|ModuleMember|PSSession)/,
-        /ForEach-Object/,
-        /Format-(Custom|List|Table|Wide)/,
-        new RegExp('Get-(Acl|Alias|AuthenticodeSignature|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Counter|Credential'
-          + '|Culture|Date|Event|EventLog|EventSubscriber|ExecutionPolicy|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job'
-          + '|Location|Member|Module|PfxCertificate|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration'
-          + '|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|Verb|WinEvent|WmiObject)'),
-        /Group-Object/,
-        /Import-(Alias|Clixml|Counter|Csv|LocalizedData|Module|PSSession)/,
-        /ImportSystemModules/,
-        /Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)/,
-        /Join-Path/,
-        /Limit-EventLog/,
-        /Measure-(Command|Object)/,
-        /Move-Item(Property)?/,
-        new RegExp('New-(Alias|Event|EventLog|Item(Property)?|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile'
-          + '|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy|WinEvent)'),
-        /Out-(Default|File|GridView|Host|Null|Printer|String)/,
-        /Pause/,
-        /(Pop|Push)-Location/,
-        /Read-Host/,
-        /Receive-(Job|PSSession)/,
-        /Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)/,
-        /Remove-(Computer|Event|EventLog|Item(Property)?|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)/,
-        /Rename-(Computer|Item(Property)?)/,
-        /Reset-ComputerMachinePassword/,
-        /Resolve-Path/,
-        /Restart-(Computer|Service)/,
-        /Restore-Computer/,
-        /Resume-(Job|Service)/,
-        /Save-Help/,
-        /Select-(Object|String|Xml)/,
-        /Send-MailMessage/,
-        new RegExp('Set-(Acl|Alias|AuthenticodeSignature|Content|Date|ExecutionPolicy|Item(Property)?|Location|PSBreakpoint|PSDebug' +
-                   '|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)'),
-        /Show-(Command|ControlPanelItem|EventLog)/,
-        /Sort-Object/,
-        /Split-Path/,
-        /Start-(Job|Process|Service|Sleep|Transaction|Transcript)/,
-        /Stop-(Computer|Job|Process|Service|Transcript)/,
-        /Suspend-(Job|Service)/,
-        /TabExpansion2/,
-        /Tee-Object/,
-        /Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)/,
-        /Trace-Command/,
-        /Unblock-File/,
-        /Undo-Transaction/,
-        /Unregister-(Event|PSSessionConfiguration)/,
-        /Update-(FormatData|Help|List|TypeData)/,
-        /Use-Transaction/,
-        /Wait-(Event|Job|Process)/,
-        /Where-Object/,
-        /Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning)/,
-        /cd|help|mkdir|more|oss|prompt/,
-        /ac|asnp|cat|cd|chdir|clc|clear|clhy|cli|clp|cls|clv|cnsn|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|dnsn|ebp/,
-        /echo|epal|epcsv|epsn|erase|etsn|exsn|fc|fl|foreach|ft|fw|gal|gbp|gc|gci|gcm|gcs|gdr|ghy|gi|gjb|gl|gm|gmo|gp|gps/,
-        /group|gsn|gsnp|gsv|gu|gv|gwmi|h|history|icm|iex|ihy|ii|ipal|ipcsv|ipmo|ipsn|irm|ise|iwmi|iwr|kill|lp|ls|man|md/,
-        /measure|mi|mount|move|mp|mv|nal|ndr|ni|nmo|npssc|nsn|nv|ogv|oh|popd|ps|pushd|pwd|r|rbp|rcjb|rcsn|rd|rdr|ren|ri/,
-        /rjb|rm|rmdir|rmo|rni|rnp|rp|rsn|rsnp|rujb|rv|rvpa|rwmi|sajb|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls/,
-        /sort|sp|spjb|spps|spsv|start|sujb|sv|swmi|tee|trcm|type|where|wjb|write/
-    ], { prefix: '', suffix: '' });
-    var variableBuiltins = buildRegexp([
-        /[$?^_]|Args|ConfirmPreference|ConsoleFileName|DebugPreference|Error|ErrorActionPreference|ErrorView|ExecutionContext/,
-        /FormatEnumerationLimit|Home|Host|Input|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount/,
-        /MaximumHistoryCount|MaximumVariableCount|MyInvocation|NestedPromptLevel|OutputEncoding|Pid|Profile|ProgressPreference/,
-        /PSBoundParameters|PSCommandPath|PSCulture|PSDefaultParameterValues|PSEmailServer|PSHome|PSScriptRoot|PSSessionApplicationName/,
-        /PSSessionConfigurationName|PSSessionOption|PSUICulture|PSVersionTable|Pwd|ShellId|StackTrace|VerbosePreference/,
-        /WarningPreference|WhatIfPreference/,
-
-        /Event|EventArgs|EventSubscriber|Sender/,
-        /Matches|Ofs|ForEach|LastExitCode|PSCmdlet|PSItem|PSSenderInfo|This/,
-        /true|false|null/
-    ], { prefix: '\\$', suffix: '' });
-
-    var builtins = buildRegexp([symbolBuiltins, namedBuiltins, variableBuiltins], { suffix: notCharacterOrDash });
-
-    var grammar = {
-        keyword: keywords,
-        number: numbers,
-        operator: operators,
-        builtin: builtins,
-        punctuation: punctuation,
-        identifier: identifiers
-    };
-
-    // tokenizers
-    function tokenBase(stream, state) {
-        // Handle Comments
-        //var ch = stream.peek();
-
-        if (stream.eatSpace()) {
-            return null;
-        }
-
-        var parent = state.returnStack[state.returnStack.length - 1];
-        if (parent && parent.shouldReturnFrom(state)) {
-            state.tokenize = parent.tokenize;
-            state.returnStack.pop();
-            return state.tokenize(stream, state);
-        }
-
-        if (stream.eat('(')) {
-            state.bracketNesting += 1;
-            return 'punctuation';
-        }
-
-        if (stream.eat(')')) {
-            state.bracketNesting -= 1;
-            return 'punctuation';
-        }
-
-        for (var key in grammar) {
-            if (stream.match(grammar[key])) {
-                return key;
-            }
-        }
-
-        var ch = stream.next();
-
-        // single-quote string
-        if (ch === "'") {
-            return tokenSingleQuoteString(stream, state);
-        }
-
-        if (ch === '$') {
-            return tokenVariable(stream, state);
-        }
+    return new RegExp(prefix + '(' + patterns.join('|') + ')' + suffix, 'i');
+  }
+
+  var notCharacterOrDash = '(?=[^A-Za-z\\d\\-_]|$)';
+  var varNames = /[\w\-:]/
+  var keywords = buildRegexp([
+    /begin|break|catch|continue|data|default|do|dynamicparam/,
+    /else|elseif|end|exit|filter|finally|for|foreach|from|function|if|in/,
+    /param|process|return|switch|throw|trap|try|until|where|while/
+  ], { suffix: notCharacterOrDash });
+
+  var punctuation = /[\[\]{},;`\.]|@[({]/;
+  var wordOperators = buildRegexp([
+    'f',
+    /b?not/,
+    /[ic]?split/, 'join',
+    /is(not)?/, 'as',
+    /[ic]?(eq|ne|[gl][te])/,
+    /[ic]?(not)?(like|match|contains)/,
+    /[ic]?replace/,
+    /b?(and|or|xor)/
+  ], { prefix: '-' });
+  var symbolOperators = /[+\-*\/%]=|\+\+|--|\.\.|[+\-*&^%:=!|\/]|<(?!#)|(?!#)>/;
+  var operators = buildRegexp([wordOperators, symbolOperators], { suffix: '' });
+
+  var numbers = /^((0x[\da-f]+)|((\d+\.\d+|\d\.|\.\d+|\d+)(e[\+\-]?\d+)?))[ld]?([kmgtp]b)?/i;
+
+  var identifiers = /^[A-Za-z\_][A-Za-z\-\_\d]*\b/;
+
+  var symbolBuiltins = /[A-Z]:|%|\?/i;
+  var namedBuiltins = buildRegexp([
+    /Add-(Computer|Content|History|Member|PSSnapin|Type)/,
+    /Checkpoint-Computer/,
+    /Clear-(Content|EventLog|History|Host|Item(Property)?|Variable)/,
+    /Compare-Object/,
+    /Complete-Transaction/,
+    /Connect-PSSession/,
+    /ConvertFrom-(Csv|Json|SecureString|StringData)/,
+    /Convert-Path/,
+    /ConvertTo-(Csv|Html|Json|SecureString|Xml)/,
+    /Copy-Item(Property)?/,
+    /Debug-Process/,
+    /Disable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,
+    /Disconnect-PSSession/,
+    /Enable-(ComputerRestore|PSBreakpoint|PSRemoting|PSSessionConfiguration)/,
+    /(Enter|Exit)-PSSession/,
+    /Export-(Alias|Clixml|Console|Counter|Csv|FormatData|ModuleMember|PSSession)/,
+    /ForEach-Object/,
+    /Format-(Custom|List|Table|Wide)/,
+    new RegExp('Get-(Acl|Alias|AuthenticodeSignature|ChildItem|Command|ComputerRestorePoint|Content|ControlPanelItem|Counter|Credential'
+      + '|Culture|Date|Event|EventLog|EventSubscriber|ExecutionPolicy|FormatData|Help|History|Host|HotFix|Item|ItemProperty|Job'
+      + '|Location|Member|Module|PfxCertificate|Process|PSBreakpoint|PSCallStack|PSDrive|PSProvider|PSSession|PSSessionConfiguration'
+      + '|PSSnapin|Random|Service|TraceSource|Transaction|TypeData|UICulture|Unique|Variable|Verb|WinEvent|WmiObject)'),
+    /Group-Object/,
+    /Import-(Alias|Clixml|Counter|Csv|LocalizedData|Module|PSSession)/,
+    /ImportSystemModules/,
+    /Invoke-(Command|Expression|History|Item|RestMethod|WebRequest|WmiMethod)/,
+    /Join-Path/,
+    /Limit-EventLog/,
+    /Measure-(Command|Object)/,
+    /Move-Item(Property)?/,
+    new RegExp('New-(Alias|Event|EventLog|Item(Property)?|Module|ModuleManifest|Object|PSDrive|PSSession|PSSessionConfigurationFile'
+      + '|PSSessionOption|PSTransportOption|Service|TimeSpan|Variable|WebServiceProxy|WinEvent)'),
+    /Out-(Default|File|GridView|Host|Null|Printer|String)/,
+    /Pause/,
+    /(Pop|Push)-Location/,
+    /Read-Host/,
+    /Receive-(Job|PSSession)/,
+    /Register-(EngineEvent|ObjectEvent|PSSessionConfiguration|WmiEvent)/,
+    /Remove-(Computer|Event|EventLog|Item(Property)?|Job|Module|PSBreakpoint|PSDrive|PSSession|PSSnapin|TypeData|Variable|WmiObject)/,
+    /Rename-(Computer|Item(Property)?)/,
+    /Reset-ComputerMachinePassword/,
+    /Resolve-Path/,
+    /Restart-(Computer|Service)/,
+    /Restore-Computer/,
+    /Resume-(Job|Service)/,
+    /Save-Help/,
+    /Select-(Object|String|Xml)/,
+    /Send-MailMessage/,
+    new RegExp('Set-(Acl|Alias|AuthenticodeSignature|Content|Date|ExecutionPolicy|Item(Property)?|Location|PSBreakpoint|PSDebug' +
+               '|PSSessionConfiguration|Service|StrictMode|TraceSource|Variable|WmiInstance)'),
+    /Show-(Command|ControlPanelItem|EventLog)/,
+    /Sort-Object/,
+    /Split-Path/,
+    /Start-(Job|Process|Service|Sleep|Transaction|Transcript)/,
+    /Stop-(Computer|Job|Process|Service|Transcript)/,
+    /Suspend-(Job|Service)/,
+    /TabExpansion2/,
+    /Tee-Object/,
+    /Test-(ComputerSecureChannel|Connection|ModuleManifest|Path|PSSessionConfigurationFile)/,
+    /Trace-Command/,
+    /Unblock-File/,
+    /Undo-Transaction/,
+    /Unregister-(Event|PSSessionConfiguration)/,
+    /Update-(FormatData|Help|List|TypeData)/,
+    /Use-Transaction/,
+    /Wait-(Event|Job|Process)/,
+    /Where-Object/,
+    /Write-(Debug|Error|EventLog|Host|Output|Progress|Verbose|Warning)/,
+    /cd|help|mkdir|more|oss|prompt/,
+    /ac|asnp|cat|cd|chdir|clc|clear|clhy|cli|clp|cls|clv|cnsn|compare|copy|cp|cpi|cpp|cvpa|dbp|del|diff|dir|dnsn|ebp/,
+    /echo|epal|epcsv|epsn|erase|etsn|exsn|fc|fl|foreach|ft|fw|gal|gbp|gc|gci|gcm|gcs|gdr|ghy|gi|gjb|gl|gm|gmo|gp|gps/,
+    /group|gsn|gsnp|gsv|gu|gv|gwmi|h|history|icm|iex|ihy|ii|ipal|ipcsv|ipmo|ipsn|irm|ise|iwmi|iwr|kill|lp|ls|man|md/,
+    /measure|mi|mount|move|mp|mv|nal|ndr|ni|nmo|npssc|nsn|nv|ogv|oh|popd|ps|pushd|pwd|r|rbp|rcjb|rcsn|rd|rdr|ren|ri/,
+    /rjb|rm|rmdir|rmo|rni|rnp|rp|rsn|rsnp|rujb|rv|rvpa|rwmi|sajb|sal|saps|sasv|sbp|sc|select|set|shcm|si|sl|sleep|sls/,
+    /sort|sp|spjb|spps|spsv|start|sujb|sv|swmi|tee|trcm|type|where|wjb|write/
+  ], { prefix: '', suffix: '' });
+  var variableBuiltins = buildRegexp([
+    /[$?^_]|Args|ConfirmPreference|ConsoleFileName|DebugPreference|Error|ErrorActionPreference|ErrorView|ExecutionContext/,
+    /FormatEnumerationLimit|Home|Host|Input|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount/,
+    /MaximumHistoryCount|MaximumVariableCount|MyInvocation|NestedPromptLevel|OutputEncoding|Pid|Profile|ProgressPreference/,
+    /PSBoundParameters|PSCommandPath|PSCulture|PSDefaultParameterValues|PSEmailServer|PSHome|PSScriptRoot|PSSessionApplicationName/,
+    /PSSessionConfigurationName|PSSessionOption|PSUICulture|PSVersionTable|Pwd|ShellId|StackTrace|VerbosePreference/,
+    /WarningPreference|WhatIfPreference/,
+
+    /Event|EventArgs|EventSubscriber|Sender/,
+    /Matches|Ofs|ForEach|LastExitCode|PSCmdlet|PSItem|PSSenderInfo|This/,
+    /true|false|null/
+  ], { prefix: '\\$', suffix: '' });
+
+  var builtins = buildRegexp([symbolBuiltins, namedBuiltins, variableBuiltins], { suffix: notCharacterOrDash });
+
+  var grammar = {
+    keyword: keywords,
+    number: numbers,
+    operator: operators,
+    builtin: builtins,
+    punctuation: punctuation,
+    identifier: identifiers
+  };
+
+  // tokenizers
+  function tokenBase(stream, state) {
+    // Handle Comments
+    //var ch = stream.peek();
+
+    var parent = state.returnStack[state.returnStack.length - 1];
+    if (parent && parent.shouldReturnFrom(state)) {
+      state.tokenize = parent.tokenize;
+      state.returnStack.pop();
+      return state.tokenize(stream, state);
+    }
 
-        // double-quote string
-        if (ch === '"') {
-            return tokenDoubleQuoteString(stream, state);
-        }
+    if (stream.eatSpace()) {
+      return null;
+    }
 
-        if (ch === '<' && stream.eat('#')) {
-            state.tokenize = tokenComment;
-            return tokenComment(stream, state);
-        }
+    if (stream.eat('(')) {
+      state.bracketNesting += 1;
+      return 'punctuation';
+    }
 
-        if (ch === '#') {
-            stream.skipToEnd();
-            return 'comment';
-        }
+    if (stream.eat(')')) {
+      state.bracketNesting -= 1;
+      return 'punctuation';
+    }
 
-        if (ch === '@') {
-            var quoteMatch = stream.eat(/["']/);
-            if (quoteMatch && stream.eol()) {
-                state.tokenize = tokenMultiString;
-                state.startQuote = quoteMatch[0];
-                return tokenMultiString(stream, state);
-            } else if (stream.peek().match(/[({]/)) {
-                return 'punctuation';
-            } else if (stream.match(varNames)) {
-              // splatted variable
-              return tokenVariable(stream, state);
-            }
-        }
-        return 'error';
+    for (var key in grammar) {
+      if (stream.match(grammar[key])) {
+        return key;
+      }
     }
 
-    function tokenSingleQuoteString(stream, state) {
-        var ch;
-        while ((ch = stream.peek()) != null) {
-            stream.next();
+    var ch = stream.next();
 
-            if (ch === "'" && !stream.eat("'")) {
-                state.tokenize = tokenBase;
-                return 'string';
-            }
-        }
+    // single-quote string
+    if (ch === "'") {
+      return tokenSingleQuoteString(stream, state);
+    }
 
-        return 'error';
+    if (ch === '$') {
+      return tokenVariable(stream, state);
     }
 
-    function tokenDoubleQuoteString(stream, state) {
-        var ch;
-        while ((ch = stream.peek()) != null) {
-            if (ch === '$') {
-                state.tokenize = tokenStringInterpolation;
-                return 'string';
-            }
-
-            stream.next();
-            if (ch === '`') {
-                stream.next();
-                continue;
-            }
-
-            if (ch === '"' && !stream.eat('"')) {
-                state.tokenize = tokenBase;
-                return 'string';
-            }
-        }
+    // double-quote string
+    if (ch === '"') {
+      return tokenDoubleQuoteString(stream, state);
+    }
 
-        return 'error';
+    if (ch === '<' && stream.eat('#')) {
+      state.tokenize = tokenComment;
+      return tokenComment(stream, state);
     }
 
-    function tokenStringInterpolation(stream, state) {
-        return tokenInterpolation(stream, state, tokenDoubleQuoteString);
+    if (ch === '#') {
+      stream.skipToEnd();
+      return 'comment';
     }
 
-    function tokenMultiStringReturn(stream, state) {
+    if (ch === '@') {
+      var quoteMatch = stream.eat(/["']/);
+      if (quoteMatch && stream.eol()) {
         state.tokenize = tokenMultiString;
-        state.startQuote = '"'
+        state.startQuote = quoteMatch[0];
         return tokenMultiString(stream, state);
+      } else if (stream.peek().match(/[({]/)) {
+        return 'punctuation';
+      } else if (stream.peek().match(varNames)) {
+        // splatted variable
+        return tokenVariable(stream, state);
+      }
     }
+    return 'error';
+  }
+
+  function tokenSingleQuoteString(stream, state) {
+    var ch;
+    while ((ch = stream.peek()) != null) {
+      stream.next();
 
-    function tokenHereStringInterpolation(stream, state) {
-        var saved;
-        return tokenInterpolation(stream, state, tokenMultiStringReturn);
+      if (ch === "'" && !stream.eat("'")) {
+        state.tokenize = tokenBase;
+        return 'string';
+      }
     }
 
-    function tokenInterpolation(stream, state, parentTokenize) {
-        if (stream.match('$(')) {
-            var savedBracketNesting = state.bracketNesting;
-            state.returnStack.push({
-                /*jshint loopfunc:true */
-                shouldReturnFrom: function(state) {
-                    return state.bracketNesting === savedBracketNesting;
-                },
-                tokenize: parentTokenize
-            });
-            state.tokenize = tokenBase;
-            state.bracketNesting += 1;
-            return 'punctuation';
-        } else {
-            stream.next();
-            state.returnStack.push({
-                shouldReturnFrom: function() { return true; },
-                tokenize: parentTokenize
-            });
-            state.tokenize = tokenVariable;
-            return state.tokenize(stream, state);
-        }
+    return 'error';
+  }
+
+  function tokenDoubleQuoteString(stream, state) {
+    var ch;
+    while ((ch = stream.peek()) != null) {
+      if (ch === '$') {
+        state.tokenize = tokenStringInterpolation;
+        return 'string';
+      }
+
+      stream.next();
+      if (ch === '`') {
+        stream.next();
+        continue;
+      }
+
+      if (ch === '"' && !stream.eat('"')) {
+        state.tokenize = tokenBase;
+        return 'string';
+      }
     }
 
-    function tokenComment(stream, state) {
-        var maybeEnd = false, ch;
-        while ((ch = stream.next()) != null) {
-          if (maybeEnd && ch == '>') {
-              state.tokenize = tokenBase;
-              break;
-          }
-          maybeEnd = (ch === '#');
-        }
-        return 'comment';
+    return 'error';
+  }
+
+  function tokenStringInterpolation(stream, state) {
+    return tokenInterpolation(stream, state, tokenDoubleQuoteString);
+  }
+
+  function tokenMultiStringReturn(stream, state) {
+    state.tokenize = tokenMultiString;
+    state.startQuote = '"'
+    return tokenMultiString(stream, state);
+  }
+
+  function tokenHereStringInterpolation(stream, state) {
+    return tokenInterpolation(stream, state, tokenMultiStringReturn);
+  }
+
+  function tokenInterpolation(stream, state, parentTokenize) {
+    if (stream.match('$(')) {
+      var savedBracketNesting = state.bracketNesting;
+      state.returnStack.push({
+        /*jshint loopfunc:true */
+        shouldReturnFrom: function(state) {
+          return state.bracketNesting === savedBracketNesting;
+        },
+        tokenize: parentTokenize
+      });
+      state.tokenize = tokenBase;
+      state.bracketNesting += 1;
+      return 'punctuation';
+    } else {
+      stream.next();
+      state.returnStack.push({
+        shouldReturnFrom: function() { return true; },
+        tokenize: parentTokenize
+      });
+      state.tokenize = tokenVariable;
+      return state.tokenize(stream, state);
+    }
+  }
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == '>') {
+          state.tokenize = tokenBase;
+          break;
+      }
+      maybeEnd = (ch === '#');
+    }
+    return 'comment';
+  }
+
+  function tokenVariable(stream, state) {
+    var ch = stream.peek();
+    if (stream.eat('{')) {
+      state.tokenize = tokenVariableWithBraces;
+      return tokenVariableWithBraces(stream, state);
+    } else if (ch != undefined && ch.match(varNames)) {
+      stream.eatWhile(varNames);
+      state.tokenize = tokenBase;
+      return 'variable-2';
+    } else {
+      state.tokenize = tokenBase;
+      return 'error';
+    }
+  }
+
+  function tokenVariableWithBraces(stream, state) {
+    var ch;
+    while ((ch = stream.next()) != null) {
+      if (ch === '}') {
+        state.tokenize = tokenBase;
+        break;
+      }
     }
+    return 'variable-2';
+  }
 
-    function tokenVariable(stream, state) {
+  function tokenMultiString(stream, state) {
+    var quote = state.startQuote;
+    if (stream.sol() && stream.match(new RegExp(quote + '@'))) {
+      state.tokenize = tokenBase;
+    }
+    else if (quote === '"') {
+      while (!stream.eol()) {
         var ch = stream.peek();
-        if (stream.eat('{')) {
-            state.tokenize = tokenVariableWithBraces;
-            return tokenVariableWithBraces(stream, state);
-        } else if (ch != undefined && ch.match(varNames)) {
-            stream.eatWhile(varNames);
-            state.tokenize = tokenBase;
-            return 'variable-2';
-        } else {
-            state.tokenize = tokenBase;
-            return 'error';
+        if (ch === '$') {
+          state.tokenize = tokenHereStringInterpolation;
+          return 'string';
         }
-    }
 
-    function tokenVariableWithBraces(stream, state) {
-        var ch;
-        while ((ch = stream.next()) != null) {
-            if (ch === '}') {
-                state.tokenize = tokenBase;
-                break;
-            }
+        stream.next();
+        if (ch === '`') {
+          stream.next();
         }
-        return 'variable-2';
+      }
     }
-
-    function tokenMultiString(stream, state) {
-        var quote = state.startQuote;
-        if (stream.sol() && stream.match(new RegExp(quote + '@'))) {
-            state.tokenize = tokenBase;
-        }
-        else if (quote === '"') {
-            while (!stream.eol()) {
-                var ch = stream.peek();
-                if (ch === '$') {
-                    state.tokenize = tokenHereStringInterpolation;
-                    return 'string';
-                }
-
-                stream.next();
-                if (ch === '`') {
-                    stream.next();
-                }
-            }
-        }
-        else {
-            stream.skipToEnd();
-        }
-
-        return 'string';
+    else {
+      stream.skipToEnd();
     }
 
-    var external = {
-        startState: function() {
-            return {
-                returnStack: [],
-                bracketNesting: 0,
-                tokenize: tokenBase
-            };
-        },
-
-        token: function(stream, state) {
-            return state.tokenize(stream, state);
-        },
-
-        blockCommentStart: '<#',
-        blockCommentEnd: '#>',
-        lineComment: '#',
-        fold: 'brace'
-    };
-    return external;
+    return 'string';
+  }
+
+  var external = {
+    startState: function() {
+      return {
+        returnStack: [],
+        bracketNesting: 0,
+        tokenize: tokenBase
+      };
+    },
+
+    token: function(stream, state) {
+      return state.tokenize(stream, state);
+    },
+
+    blockCommentStart: '<#',
+    blockCommentEnd: '#>',
+    lineComment: '#',
+    fold: 'brace'
+  };
+  return external;
 });
 
-CodeMirror.defineMIME('text/x-powershell', 'powershell');
+CodeMirror.defineMIME('application/x-powershell', 'powershell');
 });
diff --git a/mode/powershell/test.js b/mode/powershell/test.js
new file mode 100644
index 0000000000..59b8e6fca9
--- /dev/null
+++ b/mode/powershell/test.js
@@ -0,0 +1,72 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "powershell");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT('comment', '[number 1][comment # A]');
+  MT('comment_multiline', '[number 1][comment <#]',
+    '[comment ABC]',
+  '[comment #>][number 2]');
+
+  [
+    '0', '1234',
+    '12kb', '12mb', '12Gb', '12Tb', '12PB', '12L', '12D', '12lkb', '12dtb',
+    '1.234', '1.234e56', '1.', '1.e2', '.2', '.2e34',
+    '1.2MB', '1.kb', '.1dTB', '1.e1gb', '.2', '.2e34',
+    '0x1', '0xabcdef', '0x3tb', '0xelmb'
+  ].forEach(function(number) {
+    MT("number_" + number, "[number " + number + "]");
+  });
+
+  MT('string_literal_escaping', "[string 'a''']");
+  MT('string_literal_variable', "[string 'a $x']");
+  MT('string_escaping_1', '[string "a `""]');
+  MT('string_escaping_2', '[string "a """]');
+  MT('string_variable_escaping', '[string "a `$x"]');
+  MT('string_variable', '[string "a ][variable-2 $x][string  b"]');
+  MT('string_variable_spaces', '[string "a ][variable-2 ${x y}][string  b"]');
+  MT('string_expression', '[string "a ][punctuation $(][variable-2 $x][operator +][number 3][punctuation )][string  b"]');
+  MT('string_expression_nested', '[string "A][punctuation $(][string "a][punctuation $(][string "w"][punctuation )][string b"][punctuation )][string B"]');
+
+  MT('string_heredoc', '[string @"]',
+    '[string abc]',
+  '[string "@]');
+  MT('string_heredoc_quotes', '[string @"]',
+    '[string abc "\']',
+  '[string "@]');
+  MT('string_heredoc_variable', '[string @"]',
+    '[string a ][variable-2 $x][string  b]',
+  '[string "@]');
+  MT('string_heredoc_nested_string', '[string @"]',
+    '[string a][punctuation $(][string "w"][punctuation )][string b]',
+  '[string "@]');
+  MT('string_heredoc_literal_quotes', "[string @']",
+    '[string abc "\']',
+  "[string '@]");
+
+  MT('array', "[punctuation @(][string 'a'][punctuation ,][string 'b'][punctuation )]");
+  MT('hash', "[punctuation @{][string 'key'][operator :][string 'value'][punctuation }]");
+
+  MT('variable', "[variable-2 $test]");
+  MT('variable_global',  "[variable-2 $global:test]");
+  MT('variable_spaces',  "[variable-2 ${test test}]");
+  MT('operator_splat',   "[variable-2 @x]");
+  MT('variable_builtin', "[builtin $ErrorActionPreference]");
+  MT('variable_builtin_symbols', "[builtin $$]");
+
+  MT('operator', "[operator +]");
+  MT('operator_unary', "[operator +][number 3]");
+  MT('operator_long', "[operator -match]");
+
+  [
+    '(', ')', '[[', ']]', '{', '}', ',', '`', ';', '.'
+  ].forEach(function(punctuation) {
+    MT("punctuation_" + punctuation.replace(/^[\[\]]/,''), "[punctuation " + punctuation + "]");
+  });
+
+  MT('keyword', "[keyword if]");
+
+  MT('call_builtin', "[builtin Get-ChildItem]");
+})();
diff --git a/test/index.html b/test/index.html
index 5f8ebadc15..1612ed0867 100644
--- a/test/index.html
+++ b/test/index.html
@@ -26,6 +26,7 @@
 <script src="../mode/jsx/jsx.js"></script>
 <script src="../mode/markdown/markdown.js"></script>
 <script src="../mode/php/php.js"></script>
+<script src="../mode/powershell/powershell.js"></script>
 <script src="../mode/ruby/ruby.js"></script>
 <script src="../mode/shell/shell.js"></script>
 <script src="../mode/slim/slim.js"></script>
@@ -112,6 +113,7 @@ <h2>Test Suite</h2>
     <script src="../mode/jsx/test.js"></script>
     <script src="../mode/markdown/test.js"></script>
     <script src="../mode/php/test.js"></script>
+    <script src="../mode/powershell/test.js"></script>
     <script src="../mode/ruby/test.js"></script>
     <script src="../mode/shell/test.js"></script>
     <script src="../mode/slim/test.js"></script>

From c9b28f6268a596efca0d106872568485fb1796c9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Sun, 27 Mar 2016 21:55:19 +0200
Subject: [PATCH 2654/4742] [powershell mode] Integrate

Issue #3911
---
 doc/compress.html | 1 +
 mode/index.html   | 1 +
 mode/meta.js      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/doc/compress.html b/doc/compress.html
index 47d689429f..538ecbe5f0 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -182,6 +182,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/perl/perl.js">perl.js</option>
           <option value="http://codemirror.net/mode/php/php.js">php.js</option>
           <option value="http://codemirror.net/mode/pig/pig.js">pig.js</option>
+          <option value="http://codemirror.net/mode/powershell/powershell.js">powershell.js</option>
           <option value="http://codemirror.net/mode/properties/properties.js">properties.js</option>
           <option value="http://codemirror.net/mode/protobuf/protobuf.js">protobuf.js</option>
           <option value="http://codemirror.net/mode/python/python.js">python.js</option>
diff --git a/mode/index.html b/mode/index.html
index 5e77655bf4..67b8774641 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -103,6 +103,7 @@ <h2>Language modes</h2>
       <li><a href="asciiarmor/index.html">PGP (ASCII armor)</a></li>
       <li><a href="php/index.html">PHP</a></li>
       <li><a href="pig/index.html">Pig Latin</a></li>
+      <li><a href="powershell/index.html">PowerShell</a></li>
       <li><a href="properties/index.html">Properties files</a></li>
       <li><a href="protobuf/index.html">ProtoBuf</a></li>
       <li><a href="puppet/index.html">Puppet</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 3cb9de21e1..5b9b8ad403 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -102,6 +102,7 @@
     {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
+    {name: "PowerShell", mime: "application/x-powershell", mode: "powershell"},
     {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
     {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
     {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},

From 98f2ce54c2ee1c332bdf5080981ce601a9968cf9 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Sun, 27 Mar 2016 16:44:08 -0400
Subject: [PATCH 2655/4742] [powershell mode] Add extensions ps1, psd1 and psm1
 to mode/meta.js

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

diff --git a/mode/meta.js b/mode/meta.js
index 5b9b8ad403..2949cde822 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -102,7 +102,7 @@
     {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
-    {name: "PowerShell", mime: "application/x-powershell", mode: "powershell"},
+    {name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
     {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
     {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
     {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},

From c3d22466ca870b0bc104ca4b79e74a92aee26916 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Sun, 27 Mar 2016 22:45:27 -0400
Subject: [PATCH 2656/4742] [vim bindings] Remove dead code and initialize a
 property

The Error after the while(true) loop is not reachable and should
be removed. The "this.iterator" property should be given an
initial value of 0. This fixes two warnings reported by Closure
Compiler.
---
 keymap/vim.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 54f2827248..b7e8d85889 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1048,7 +1048,7 @@
     };
     function HistoryController() {
         this.historyBuffer = [];
-        this.iterator;
+        this.iterator = 0;
         this.initialPrefix = null;
     }
     HistoryController.prototype = {
@@ -3290,8 +3290,6 @@
         line = cm.getLine(lineNum);
         pos = (dir > 0) ? 0 : line.length;
       }
-      // Should never get here.
-      throw new Error('The impossible happened.');
     }
 
     /**

From aa0b24961a7f2eb8f0ae50840a6b676cd596fe2a Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Sun, 27 Mar 2016 23:33:02 -0400
Subject: [PATCH 2657/4742] [properties mode] Use empty block instead of empty
 statement

This eliminates a warning from Closure Compiler.
---
 mode/properties/properties.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/properties/properties.js b/mode/properties/properties.js
index 9da5baf420..ef8bf37eea 100644
--- a/mode/properties/properties.js
+++ b/mode/properties/properties.js
@@ -34,7 +34,7 @@ CodeMirror.defineMode("properties", function() {
       }
 
       if (sol) {
-        while(stream.eatSpace());
+        while(stream.eatSpace()) {}
       }
 
       var ch = stream.next();

From ab455f2247d4629d833f308e1320205388dcc29e Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Sun, 27 Mar 2016 23:15:37 -0400
Subject: [PATCH 2658/4742] [dtd mode] Fix code that lacks side-effects

The 6 "n"s are reported as suspicious code by Closure Compiler.
They can just be empty statements instead.
---
 mode/dtd/dtd.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index f37029a77d..52d76ee114 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -114,17 +114,17 @@ CodeMirror.defineMode("dtd", function(config) {
 
       if( textAfter.match(/\]\s+|\]/) )n=n-1;
       else if(textAfter.substr(textAfter.length-1, textAfter.length) === ">"){
-        if(textAfter.substr(0,1) === "<")n;
-        else if( type == "doindent" && textAfter.length > 1 )n;
+        if(textAfter.substr(0,1) === "<") {}
+        else if( type == "doindent" && textAfter.length > 1 ) {}
         else if( type == "doindent")n--;
-        else if( type == ">" && textAfter.length > 1)n;
-        else if( type == "tag" && textAfter !== ">")n;
+        else if( type == ">" && textAfter.length > 1) {}
+        else if( type == "tag" && textAfter !== ">") {}
         else if( type == "tag" && state.stack[state.stack.length-1] == "rule")n--;
         else if( type == "tag")n++;
         else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule" && type === ">")n--;
-        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule")n;
+        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule") {}
         else if( textAfter.substr(0,1) !== "<" && textAfter.substr(0,1) === ">" )n=n-1;
-        else if( textAfter === ">")n;
+        else if( textAfter === ">") {}
         else n=n-1;
         //over rule them all
         if(type == null || type == "]")n--;

From 420bdf16846c43d57b6b87f87e4627200e054f2d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Mar 2016 20:41:14 +0200
Subject: [PATCH 2659/4742] [tiddlywiki mode] Fix weird return statements

Closes #3914
---
 mode/tiddlywiki/tiddlywiki.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index 1df01647ae..5ab0d51309 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -324,12 +324,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
     word = stream.current();
     known = keywords.propertyIsEnumerable(word) && keywords[word];
 
-    if (known) {
-      return known.style, word;
-    }
-    else {
-      return null, word;
-    }
+    return word;
   }
 
   // Interface

From ea6382a7f3a75cc7219d07581d388eb684517be5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 28 Mar 2016 21:13:22 +0200
Subject: [PATCH 2660/4742] [tiddlywiki mode] Try to sanitize code a little

---
 mode/tiddlywiki/tiddlywiki.js | 201 +++++++++++++---------------------
 1 file changed, 78 insertions(+), 123 deletions(-)

diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index 5ab0d51309..1a3b3bc68a 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -16,7 +16,6 @@
     ! Info
     CoreVersion parameter is needed for TiddlyWiki only!
 ***/
-//{{{
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -32,73 +31,60 @@ CodeMirror.defineMode("tiddlywiki", function () {
   // Tokenizer
   var textwords = {};
 
-  var keywords = function () {
-    function kw(type) {
-      return { type: type, style: "macro"};
-    }
-    return {
-      "allTags": kw('allTags'), "closeAll": kw('closeAll'), "list": kw('list'),
-      "newJournal": kw('newJournal'), "newTiddler": kw('newTiddler'),
-      "permaview": kw('permaview'), "saveChanges": kw('saveChanges'),
-      "search": kw('search'), "slider": kw('slider'),   "tabs": kw('tabs'),
-      "tag": kw('tag'), "tagging": kw('tagging'),       "tags": kw('tags'),
-      "tiddler": kw('tiddler'), "timeline": kw('timeline'),
-      "today": kw('today'), "version": kw('version'),   "option": kw('option'),
-
-      "with": kw('with'),
-      "filter": kw('filter')
-    };
-  }();
+  var keywords = {
+    "allTags": true, "closeAll": true, "list": true,
+    "newJournal": true, "newTiddler": true,
+    "permaview": true, "saveChanges": true,
+    "search": true, "slider": true, "tabs": true,
+    "tag": true, "tagging": true, "tags": true,
+    "tiddler": true, "timeline": true,
+    "today": true, "version": true, "option": true,
+    "with": true, "filter": true
+  };
 
   var isSpaceName = /[\w_\-]/i,
-  reHR = /^\-\-\-\-+$/,                                 // <hr>
-  reWikiCommentStart = /^\/\*\*\*$/,            // /***
-  reWikiCommentStop = /^\*\*\*\/$/,             // ***/
-  reBlockQuote = /^<<<$/,
+      reHR = /^\-\-\-\-+$/,                                 // <hr>
+      reWikiCommentStart = /^\/\*\*\*$/,            // /***
+      reWikiCommentStop = /^\*\*\*\/$/,             // ***/
+      reBlockQuote = /^<<<$/,
 
-  reJsCodeStart = /^\/\/\{\{\{$/,                       // //{{{ js block start
-  reJsCodeStop = /^\/\/\}\}\}$/,                        // //}}} js stop
-  reXmlCodeStart = /^<!--\{\{\{-->$/,           // xml block start
-  reXmlCodeStop = /^<!--\}\}\}-->$/,            // xml stop
+      reJsCodeStart = /^\/\/\{\{\{$/,                       // //{{{ js block start
+      reJsCodeStop = /^\/\/\}\}\}$/,                        // //}}} js stop
+      reXmlCodeStart = /^<!--\{\{\{-->$/,           // xml block start
+      reXmlCodeStop = /^<!--\}\}\}-->$/,            // xml stop
 
-  reCodeBlockStart = /^\{\{\{$/,                        // {{{ TW text div block start
-  reCodeBlockStop = /^\}\}\}$/,                 // }}} TW text stop
+      reCodeBlockStart = /^\{\{\{$/,                        // {{{ TW text div block start
+      reCodeBlockStop = /^\}\}\}$/,                 // }}} TW text stop
 
-  reUntilCodeStop = /.*?\}\}\}/;
+      reUntilCodeStop = /.*?\}\}\}/;
 
   function chain(stream, state, f) {
     state.tokenize = f;
     return f(stream, state);
   }
 
-  function jsTokenBase(stream, state) {
-    var sol = stream.sol(), ch;
+  function tokenBase(stream, state) {
+    var sol = stream.sol(), ch = stream.peek();
 
     state.block = false;        // indicates the start of a code block.
 
-    ch = stream.peek();         // don't eat, to make matching simpler
-
     // check start of  blocks
     if (sol && /[<\/\*{}\-]/.test(ch)) {
       if (stream.match(reCodeBlockStart)) {
         state.block = true;
         return chain(stream, state, twTokenCode);
       }
-      if (stream.match(reBlockQuote)) {
+      if (stream.match(reBlockQuote))
         return 'quote';
-      }
-      if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) {
+      if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop))
         return 'comment';
-      }
-      if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) {
+      if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop))
         return 'comment';
-      }
-      if (stream.match(reHR)) {
+      if (stream.match(reHR))
         return 'hr';
-      }
-    } // sol
-    ch = stream.next();
+    }
 
+    stream.next();
     if (sol && /[\/\*!#;:>|]/.test(ch)) {
       if (ch == "!") { // tw header
         stream.skipToEnd();
@@ -124,95 +110,77 @@ CodeMirror.defineMode("tiddlywiki", function () {
         stream.eatWhile(">");
         return "quote";
       }
-      if (ch == '|') {
+      if (ch == '|')
         return 'header';
-      }
     }
 
-    if (ch == '{' && stream.match(/\{\{/)) {
+    if (ch == '{' && stream.match(/\{\{/))
       return chain(stream, state, twTokenCode);
-    }
 
     // rudimentary html:// file:// link matching. TW knows much more ...
-    if (/[hf]/i.test(ch)) {
-      if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) {
-        return "link";
-      }
-    }
+    if (/[hf]/i.test(ch) &&
+        /[ti]/i.test(stream.peek()) &&
+        stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i))
+      return "link";
+
     // just a little string indicator, don't want to have the whole string covered
-    if (ch == '"') {
+    if (ch == '"')
       return 'string';
-    }
-    if (ch == '~') {    // _no_ CamelCase indicator should be bold
+
+    if (ch == '~')    // _no_ CamelCase indicator should be bold
       return 'brace';
-    }
-    if (/[\[\]]/.test(ch)) { // check for [[..]]
-      if (stream.peek() == ch) {
-        stream.next();
-        return 'brace';
-      }
-    }
+
+    if (/[\[\]]/.test(ch) && stream.match(ch)) // check for [[..]]
+      return 'brace';
+
     if (ch == "@") {    // check for space link. TODO fix @@...@@ highlighting
       stream.eatWhile(isSpaceName);
       return "link";
     }
+
     if (/\d/.test(ch)) {        // numbers
       stream.eatWhile(/\d/);
       return "number";
     }
+
     if (ch == "/") { // tw invisible comment
       if (stream.eat("%")) {
         return chain(stream, state, twTokenComment);
-      }
-      else if (stream.eat("/")) { //
+      } else if (stream.eat("/")) { //
         return chain(stream, state, twTokenEm);
       }
     }
-    if (ch == "_") { // tw underline
-      if (stream.eat("_")) {
+
+    if (ch == "_" && stream.eat("_")) // tw underline
         return chain(stream, state, twTokenUnderline);
-      }
-    }
+
     // strikethrough and mdash handling
-    if (ch == "-") {
-      if (stream.eat("-")) {
-        // if strikethrough looks ugly, change CSS.
-        if (stream.peek() != ' ')
-          return chain(stream, state, twTokenStrike);
-        // mdash
-        if (stream.peek() == ' ')
-          return 'brace';
-      }
-    }
-    if (ch == "'") { // tw bold
-      if (stream.eat("'")) {
-        return chain(stream, state, twTokenStrong);
-      }
-    }
-    if (ch == "<") { // tw macro
-      if (stream.eat("<")) {
-        return chain(stream, state, twTokenMacro);
-      }
-    }
-    else {
-      return null;
+    if (ch == "-" && stream.eat("-")) {
+      // if strikethrough looks ugly, change CSS.
+      if (stream.peek() != ' ')
+        return chain(stream, state, twTokenStrike);
+      // mdash
+      if (stream.peek() == ' ')
+        return 'brace';
     }
 
+    if (ch == "'" && stream.eat("'")) // tw bold
+      return chain(stream, state, twTokenStrong);
+
+    if (ch == "<" && stream.eat("<")) // tw macro
+      return chain(stream, state, twTokenMacro);
+
     // core macro handling
     stream.eatWhile(/[\w\$_]/);
-    var word = stream.current(),
-    known = textwords.propertyIsEnumerable(word) && textwords[word];
-
-    return known ? known.style : null;
-  } // jsTokenBase()
+    return textwords.propertyIsEnumerable(stream.current()) ? "keyword" : null
+  }
 
   // tw invisible comment
   function twTokenComment(stream, state) {
-    var maybeEnd = false,
-    ch;
+    var maybeEnd = false, ch;
     while (ch = stream.next()) {
       if (ch == "/" && maybeEnd) {
-        state.tokenize = jsTokenBase;
+        state.tokenize = tokenBase;
         break;
       }
       maybeEnd = (ch == "%");
@@ -226,7 +194,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
     ch;
     while (ch = stream.next()) {
       if (ch == "'" && maybeEnd) {
-        state.tokenize = jsTokenBase;
+        state.tokenize = tokenBase;
         break;
       }
       maybeEnd = (ch == "'");
@@ -243,12 +211,12 @@ CodeMirror.defineMode("tiddlywiki", function () {
     }
 
     if (!sb && stream.match(reUntilCodeStop)) {
-      state.tokenize = jsTokenBase;
+      state.tokenize = tokenBase;
       return "comment";
     }
 
     if (sb && stream.sol() && stream.match(reCodeBlockStop)) {
-      state.tokenize = jsTokenBase;
+      state.tokenize = tokenBase;
       return "comment";
     }
 
@@ -262,7 +230,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
     ch;
     while (ch = stream.next()) {
       if (ch == "/" && maybeEnd) {
-        state.tokenize = jsTokenBase;
+        state.tokenize = tokenBase;
         break;
       }
       maybeEnd = (ch == "/");
@@ -276,7 +244,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
     ch;
     while (ch = stream.next()) {
       if (ch == "_" && maybeEnd) {
-        state.tokenize = jsTokenBase;
+        state.tokenize = tokenBase;
         break;
       }
       maybeEnd = (ch == "_");
@@ -291,7 +259,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
 
     while (ch = stream.next()) {
       if (ch == "-" && maybeEnd) {
-        state.tokenize = jsTokenBase;
+        state.tokenize = tokenBase;
         break;
       }
       maybeEnd = (ch == "-");
@@ -301,53 +269,40 @@ CodeMirror.defineMode("tiddlywiki", function () {
 
   // macro
   function twTokenMacro(stream, state) {
-    var ch, word, known;
-
     if (stream.current() == '<<') {
       return 'macro';
     }
 
-    ch = stream.next();
+    var ch = stream.next();
     if (!ch) {
-      state.tokenize = jsTokenBase;
+      state.tokenize = tokenBase;
       return null;
     }
     if (ch == ">") {
       if (stream.peek() == '>') {
         stream.next();
-        state.tokenize = jsTokenBase;
+        state.tokenize = tokenBase;
         return "macro";
       }
     }
 
     stream.eatWhile(/[\w\$_]/);
-    word = stream.current();
-    known = keywords.propertyIsEnumerable(word) && keywords[word];
-
-    return word;
+    return keywords.propertyIsEnumerable(stream.current()) ? "keyword" : null
   }
 
   // Interface
   return {
     startState: function () {
-      return {
-        tokenize: jsTokenBase,
-        indented: 0,
-        level: 0
-      };
+      return {tokenize: tokenBase};
     },
 
     token: function (stream, state) {
       if (stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
       return style;
-    },
-
-    electricChars: ""
+    }
   };
 });
 
 CodeMirror.defineMIME("text/x-tiddlywiki", "tiddlywiki");
 });
-
-//}}}

From c4390fb0d619531d537ea1abfaf3f8237157b231 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Mar 2016 09:36:37 +0200
Subject: [PATCH 2661/4742] [search addon] Reset search position when starting
 a new persistent search

Closes #3920
---
 addon/search/search.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 93e90b36ed..e946aa9e97 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -121,7 +121,10 @@
       persistentDialog(cm, queryDialog, q, function(query, event) {
         CodeMirror.e_stop(event);
         if (!query) return;
-        if (query != state.queryText) startSearch(cm, state, query);
+        if (query != state.queryText) {
+          startSearch(cm, state, query);
+          state.posFrom = state.posTo = cm.getCursor();
+        }
         if (hiding) hiding.style.opacity = 1
         findNext(cm, event.shiftKey, function(_, to) {
           var dialog

From 78aaa547dbbe7da67096d1198f9e0362a88f2d48 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 29 Mar 2016 17:10:17 +0200
Subject: [PATCH 2662/4742] [sparl mode] Add 'bind' as op

Closes #3922
---
 mode/sparql/sparql.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 90b08e18f2..095dcca653 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -25,7 +25,7 @@ CodeMirror.defineMode("sparql", function(config) {
                         "strbefore", "strafter", "year", "month", "day", "hours", "minutes", "seconds",
                         "timezone", "tz", "now", "uuid", "struuid", "md5", "sha1", "sha256", "sha384",
                         "sha512", "coalesce", "if", "strlang", "strdt", "isnumeric", "regex", "exists",
-                        "isblank", "isliteral", "a"]);
+                        "isblank", "isliteral", "a", "bind"]);
   var keywords = wordRegexp(["base", "prefix", "select", "distinct", "reduced", "construct", "describe",
                              "ask", "from", "named", "where", "order", "limit", "offset", "filter", "optional",
                              "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group",

From 4d1e417f0793caaa6fbe7864675a359ef8d9b6a3 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Wed, 30 Mar 2016 19:36:27 +0000
Subject: [PATCH 2663/4742] Many spelling corrections

---
 addon/hint/sql-hint.js            |  2 +-
 addon/search/match-highlighter.js |  2 +-
 bin/compress                      |  4 ++--
 doc/manual.html                   |  2 +-
 index.html                        |  2 +-
 keymap/vim.js                     | 16 ++++++++--------
 mode/clike/clike.js               |  2 +-
 mode/crystal/crystal.js           |  2 +-
 mode/django/django.js             | 16 ++++++++--------
 mode/gfm/index.html               |  2 +-
 mode/haml/haml.js                 |  2 +-
 mode/htmlembedded/index.html      |  2 +-
 mode/markdown/test.js             |  6 +++---
 mode/octave/index.html            |  2 +-
 mode/pegjs/pegjs.js               | 10 +++++-----
 mode/perl/perl.js                 |  2 +-
 mode/puppet/puppet.js             |  2 +-
 mode/python/index.html            |  2 +-
 mode/sql/sql.js                   |  4 ++--
 mode/verilog/index.html           |  2 +-
 mode/verilog/test.js              |  2 +-
 mode/verilog/verilog.js           |  2 +-
 mode/vhdl/vhdl.js                 |  2 +-
 mode/xquery/xquery.js             |  2 +-
 mode/yaml-frontmatter/index.html  |  2 +-
 test/vim_test.js                  |  8 ++++----
 26 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 798fbb1f38..62c4f68d64 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -105,7 +105,7 @@
   }
 
   function nameCompletion(cur, token, result, editor) {
-    // Try to complete table, colunm names and return start position of completion
+    // Try to complete table, column names and return start position of completion
     var useBacktick = false;
     var nameParts = [];
     var start = token.start;
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 8f02f01c87..79218c3175 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -16,7 +16,7 @@
 // highlighted only if the selected text is a word. showToken, when enabled,
 // will cause the current token to be highlighted when nothing is selected.
 // delay is used to specify how much time to wait, in milliseconds, before
-// highlighting the matches. If annotateScrollbar is enabled, the occurances
+// highlighting the matches. If annotateScrollbar is enabled, the occurences
 // will be highlighted on the scrollbar via the matchesonscrollbar addon.
 
 (function(mod) {
diff --git a/bin/compress b/bin/compress
index 809fbe83d4..d358f9c3a0 100755
--- a/bin/compress
+++ b/bin/compress
@@ -18,7 +18,7 @@
 // Script files are specified without .js ending. Prefixing them with
 // their full (local) path is optional. So you may say lib/codemirror
 // or mode/xml/xml to be more precise. In fact, even the .js suffix
-// may be speficied, if wanted.
+// may be specified, if wanted.
 
 "use strict";
 
@@ -68,7 +68,7 @@ walk("mode/");
 if (!local && !blob) help(false);
 
 if (files.length) {
-  console.log("Some speficied files were not found: " +
+  console.log("Some specified files were not found: " +
               files.map(function(a){return a.name;}).join(", "));
   process.exit(1);
 }
diff --git a/doc/manual.html b/doc/manual.html
index 9cbb3a3a41..59419027c0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2100,7 +2100,7 @@ <h3 id="api_static">Static properties</h3>
       created from then on.</dd>
 
       <dt id="defineDocExtension"><code><strong>CodeMirror.defineDocExtension</strong>(name: string, value: any)</code></dt>
-      <dd>Like <a href="#defineExtenstion"><code>defineExtension</code></a>,
+      <dd>Like <a href="#defineExtension"><code>defineExtension</code></a>,
       but the method will be added to the interface
       for <a href="#Doc"><code>Doc</code></a> objects instead.</dd>
 
diff --git a/index.html b/index.html
index 1f775abc69..da5a06c49d 100644
--- a/index.html
+++ b/index.html
@@ -106,7 +106,7 @@ <h2>This is CodeMirror</h2>
       maintainers need to subsist.<br>
       Current funding status = <img src="https://marijnhaverbeke.nl/fund/status_s.png" title="Current maintainer happiness" style="vertical-align: middle; height: 16px; width: 16px"><br>
       You can help <a href="https://marijnhaverbeke.nl/fund/" title="Set up a monthly contribution">per month</a> or
-      <a title="Donate with Paypal" href="javascript:document.getElementById('paypal').submit();">once</a>.
+      <a title="Donate with PayPal" href="javascript:document.getElementById('paypal').submit();">once</a>.
       <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal">
         <input type="hidden" name="cmd" value="_s-xclick"/>
         <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/>
diff --git a/keymap/vim.js b/keymap/vim.js
index b7e8d85889..7f2fb62743 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -26,7 +26,7 @@
  *  2. Variable declarations and short basic helpers
  *  3. Instance (External API) implementation
  *  4. Internal state tracking objects (input state, counter) implementation
- *     and instanstiation
+ *     and instantiation
  *  5. Key handler (the main command dispatcher) implementation
  *  6. Motion, operator, and action implementations
  *  7. Helper functions for the key handler, motions, operators, and actions
@@ -642,7 +642,7 @@
         jumpList: createCircularJumpList(),
         macroModeState: new MacroModeState,
         // Recording latest f, t, F or T motion command.
-        lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
+        lastCharacterSearch: {increment:0, forward:true, selectedCharacter:''},
         registerController: new RegisterController({}),
         // search history buffer
         searchHistoryController: new HistoryController({}),
@@ -1373,7 +1373,7 @@
         }
       },
       evalInput: function(cm, vim) {
-        // If the motion comand is set, execute both the operator and motion.
+        // If the motion command is set, execute both the operator and motion.
         // Otherwise return.
         var inputState = vim.inputState;
         var motion = inputState.motion;
@@ -1910,7 +1910,7 @@
       },
 
       repeatLastCharacterSearch: function(cm, head, motionArgs) {
-        var lastSearch = vimGlobalState.lastChararacterSearch;
+        var lastSearch = vimGlobalState.lastCharacterSearch;
         var repeat = motionArgs.repeat;
         var forward = motionArgs.forward === lastSearch.forward;
         var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
@@ -3089,9 +3089,9 @@
     }
 
     function recordLastCharacterSearch(increment, args) {
-        vimGlobalState.lastChararacterSearch.increment = increment;
-        vimGlobalState.lastChararacterSearch.forward = args.forward;
-        vimGlobalState.lastChararacterSearch.selectedCharacter = args.selectedCharacter;
+        vimGlobalState.lastCharacterSearch.increment = increment;
+        vimGlobalState.lastCharacterSearch.forward = args.forward;
+        vimGlobalState.lastCharacterSearch.selectedCharacter = args.selectedCharacter;
     }
 
     var symbolToMode = {
@@ -3451,7 +3451,7 @@
     }
 
     // TODO: perhaps this finagling of start and end positions belonds
-    // in codmirror/replaceRange?
+    // in codemirror/replaceRange?
     function selectCompanionObject(cm, head, symb, inclusive) {
       var cur = head, start, end;
 
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 34d3a5afd3..695d5ceff3 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -667,7 +667,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-objectivec", {
     name: "clike",
-    keywords: words(cKeywords + "inline restrict _Bool _Complex _Imaginery BOOL Class bycopy byref id IMP in " +
+    keywords: words(cKeywords + "inline restrict _Bool _Complex _Imaginary BOOL Class bycopy byref id IMP in " +
                     "inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
     types: words(cTypes),
     atoms: words("YES NO NULL NILL ON OFF true false"),
diff --git a/mode/crystal/crystal.js b/mode/crystal/crystal.js
index 2e74bee436..e63627cee8 100644
--- a/mode/crystal/crystal.js
+++ b/mode/crystal/crystal.js
@@ -209,7 +209,7 @@
 
       // Operators
       if (stream.match(operators)) {
-        stream.eat("="); // Operators can follow assigin symbol.
+        stream.eat("="); // Operators can follow assign symbol.
         return "operator";
       }
 
diff --git a/mode/django/django.js b/mode/django/django.js
index a8a7d8311d..7b4ef3b566 100644
--- a/mode/django/django.js
+++ b/mode/django/django.js
@@ -66,11 +66,11 @@
     }
 
     // A string can be included in either single or double quotes (this is
-    // the delimeter). Mark everything as a string until the start delimeter
+    // the delimiter). Mark everything as a string until the start delimiter
     // occurs again.
-    function inString (delimeter, previousTokenizer) {
+    function inString (delimiter, previousTokenizer) {
       return function (stream, state) {
-        if (!state.escapeNext && stream.eat(delimeter)) {
+        if (!state.escapeNext && stream.eat(delimiter)) {
           state.tokenize = previousTokenizer;
         } else {
           if (state.escapeNext) {
@@ -80,7 +80,7 @@
           var ch = stream.next();
 
           // Take into account the backslash for escaping characters, such as
-          // the string delimeter.
+          // the string delimiter.
           if (ch == "\\") {
             state.escapeNext = true;
           }
@@ -100,7 +100,7 @@
           return "null";
         }
 
-        // Dot folowed by a non-word character should be considered an error.
+        // Dot followed by a non-word character should be considered an error.
         if (stream.match(/\.\W+/)) {
           return "error";
         } else if (stream.eat(".")) {
@@ -119,7 +119,7 @@
           return "null";
         }
 
-        // Pipe folowed by a non-word character should be considered an error.
+        // Pipe followed by a non-word character should be considered an error.
         if (stream.match(/\.\W+/)) {
           return "error";
         } else if (stream.eat("|")) {
@@ -199,7 +199,7 @@
           return "null";
         }
 
-        // Dot folowed by a non-word character should be considered an error.
+        // Dot followed by a non-word character should be considered an error.
         if (stream.match(/\.\W+/)) {
           return "error";
         } else if (stream.eat(".")) {
@@ -218,7 +218,7 @@
           return "null";
         }
 
-        // Pipe folowed by a non-word character should be considered an error.
+        // Pipe followed by a non-word character should be considered an error.
         if (stream.match(/\.\W+/)) {
           return "error";
         } else if (stream.eat("|")) {
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index 7e38c52d60..24c90c068e 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -47,7 +47,7 @@ <h2>GFM mode</h2>
 GFM adds syntax to strikethrough text, which is missing from standard Markdown.
 
 ~~Mistaken text.~~
-~~**works with other fomatting**~~
+~~**works with other formatting**~~
 
 ~~spans across
 lines~~
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 03ce83355c..86def73ebb 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -11,7 +11,7 @@
 })(function(CodeMirror) {
 "use strict";
 
-  // full haml mode. This handled embeded ruby and html fragments too
+  // full haml mode. This handled embedded ruby and html fragments too
   CodeMirror.defineMode("haml", function(config) {
     var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"});
     var rubyMode = CodeMirror.getMode(config, "ruby");
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index 365ef8f366..f27582ef86 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -52,7 +52,7 @@ <h2>Html Embedded Scripts mode</h2>
     </script>
 
     <p>Mode for html embedded scripts like JSP and ASP.NET. Depends on HtmlMixed which in turn depends on
-    JavaScript, CSS and XML.<br />Other dependancies include those of the scriping language chosen.</p>
+    JavaScript, CSS and XML.<br />Other dependencies include those of the scripting language chosen.</p>
 
     <p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET), 
     <code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)</p>
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index a48d153107..e2b3a81527 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -647,7 +647,7 @@
   MT("linkReferenceEmStrong",
      "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url [[bar]]] hello");
 
-  // Reference-style links with optional space separator (per docuentation)
+  // Reference-style links with optional space separator (per documentation)
   // "You can optionally use a space to separate the sets of brackets"
   MT("linkReferenceSpace",
      "[link [[foo]]] [string&url [[bar]]] hello");
@@ -683,7 +683,7 @@
   MT("labelTitleSingleQuotes",
      "[link [[foo]]:] [string&url http://example.com/  'bar']");
 
-  MT("labelTitleParenthese",
+  MT("labelTitleParentheses",
      "[link [[foo]]:] [string&url http://example.com/  (bar)]");
 
   MT("labelTitleInvalid",
@@ -700,7 +700,7 @@
      "[link [[foo]]:] [string&url http://example.com/]",
      "[string 'bar'] hello");
 
-  MT("labelTitleNextParenthese",
+  MT("labelTitleNextParentheses",
      "[link [[foo]]:] [string&url http://example.com/]",
      "[string (bar)] hello");
 
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 79df581199..3490ee6371 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -65,7 +65,7 @@ <h2>Octave mode</h2>
 
 %one line comment
 %{ multi 
-line commment %}
+line comment %}
 
     </textarea></div>
     <script>
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index 306e3768c9..8e87b59eca 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -24,7 +24,7 @@ CodeMirror.defineMode("pegjs", function (config) {
         inString: false,
         stringType: null,
         inComment: false,
-        inChracterClass: false,
+        inCharacterClass: false,
         braced: 0,
         lhs: true,
         localState: null
@@ -66,15 +66,15 @@ CodeMirror.defineMode("pegjs", function (config) {
           }
         }
         return "comment";
-      } else if (state.inChracterClass) {
-          while (state.inChracterClass && !stream.eol()) {
+      } else if (state.inCharacterClass) {
+          while (state.inCharacterClass && !stream.eol()) {
             if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
-              state.inChracterClass = false;
+              state.inCharacterClass = false;
             }
           }
       } else if (stream.peek() === '[') {
         stream.next();
-        state.inChracterClass = true;
+        state.inCharacterClass = true;
         return 'bracket';
       } else if (stream.match(/^\/\//)) {
         stream.skipToEnd();
diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index bef62bc7d9..66e4ed034c 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -268,7 +268,7 @@ CodeMirror.defineMode("perl",function(){
                 chmod                           :1,     // - changes the permissions on a list of files
                 chomp                           :1,     // - remove a trailing record separator from a string
                 chop                            :1,     // - remove the last character from a string
-                chown                           :1,     // - change the owership on a list of files
+                chown                           :1,     // - change the ownership on a list of files
                 chr                             :1,     // - get character this number represents
                 chroot                          :1,     // - make directory new root for path lookups
                 close                           :1,     // - close file (or pipe or socket) handle
diff --git a/mode/puppet/puppet.js b/mode/puppet/puppet.js
index e7f799f78a..57041300af 100644
--- a/mode/puppet/puppet.js
+++ b/mode/puppet/puppet.js
@@ -126,7 +126,7 @@ CodeMirror.defineMode("puppet", function () {
     if (word && words.hasOwnProperty(word)) {
       // Negates the initial next()
       stream.backUp(1);
-      // Acutally move the stream
+      // rs move the stream
       stream.match(/[\w]+/);
       // We want to process these words differently
       // do to the importance they have in Puppet
diff --git a/mode/python/index.html b/mode/python/index.html
index 86eb3d52f7..6116a13b6b 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -186,7 +186,7 @@ <h2>Advanced Configuration Options:</h2>
       <li>singleOperators - RegEx - Regular Expression for single operator matching,  default : <pre>^[\\+\\-\\*/%&amp;|\\^~&lt;&gt;!]</pre> including <pre>@</pre> on Python 3</li>
       <li>singleDelimiters - RegEx - Regular Expression for single delimiter matching, default :  <pre>^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]</pre></li>
       <li>doubleOperators - RegEx - Regular Expression for double operators matching, default : <pre>^((==)|(!=)|(&lt;=)|(&gt;=)|(&lt;&gt;)|(&lt;&lt;)|(&gt;&gt;)|(//)|(\\*\\*))</pre></li>
-      <li>doubleDelimiters - RegEx - Regular Expressoin for double delimiters matching, default : <pre>^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&amp;=)|(\\|=)|(\\^=))</pre></li>
+      <li>doubleDelimiters - RegEx - Regular Expression for double delimiters matching, default : <pre>^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&amp;=)|(\\|=)|(\\^=))</pre></li>
       <li>tripleDelimiters - RegEx - Regular Expression for triple delimiters matching, default : <pre>^((//=)|(&gt;&gt;=)|(&lt;&lt;=)|(\\*\\*=))</pre></li>
       <li>identifiers - RegEx - Regular Expression for identifier, default : <pre>^[_A-Za-z][_A-Za-z0-9]*</pre> on Python 2 and <pre>^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*</pre> on Python 3.</li>
       <li>extra_keywords - list of string - List of extra words ton consider as keywords</li>
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index e91c706c76..8ac2298c9b 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -65,7 +65,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
       return "keyword";
     } else if (/^[\(\),\;\[\]]/.test(ch)) {
-      // no highlightning
+      // no highlighting
       return null;
     } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) {
       // 1-line comment
@@ -341,7 +341,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name:       "sql",
     client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
     keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
-    builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),
+    builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least length lengthb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),
     operatorChars: /^[*+\-%<>!=~]/,
     dateSQL:    set("date time timestamp"),
     support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index 96b3d64766..9c52722afb 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -112,7 +112,7 @@ <h2>SystemVerilog mode</h2>
 Syntax highlighting and indentation for the Verilog and SystemVerilog languages (IEEE 1800).
 <h2>Configuration options:</h2>
   <ul>
-    <li><strong>noIndentKeywords</strong> - List of keywords which should not cause identation to increase. E.g. ["package", "module"]. Default: None</li>
+    <li><strong>noIndentKeywords</strong> - List of keywords which should not cause indentation to increase. E.g. ["package", "module"]. Default: None</li>
   </ul>
 </p>
 
diff --git a/mode/verilog/test.js b/mode/verilog/test.js
index 9c8c094940..8334fab05b 100644
--- a/mode/verilog/test.js
+++ b/mode/verilog/test.js
@@ -263,7 +263,7 @@
     ""
   );
 
-  MT("covergoup_with_function_indents_properly",
+  MT("covergroup_with_function_indents_properly",
     "[keyword covergroup] [variable cg] [keyword with] [keyword function] [variable sample][bracket (][keyword bit] [variable b][bracket )];",
     "    [variable c] : [keyword coverpoint] [variable c];",
     "[keyword endgroup]: [variable cg]",
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 9d2a4cd582..7513dcede2 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -250,7 +250,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     if (text == contextClosing) {
       return true;
     } else {
-      // contextClosing may be mulitple keywords separated by ;
+      // contextClosing may be multiple keywords separated by ;
       var closingKeywords = contextClosing.split(";");
       for (var i in closingKeywords) {
         if (text == closingKeywords[i]) {
diff --git a/mode/vhdl/vhdl.js b/mode/vhdl/vhdl.js
index d3b555aa0d..97e086e42b 100644
--- a/mode/vhdl/vhdl.js
+++ b/mode/vhdl/vhdl.js
@@ -36,7 +36,7 @@ CodeMirror.defineMode("vhdl", function(config, parserConfig) {
       multiLineStrings = parserConfig.multiLineStrings;
 
   var keywords = words("abs,access,after,alias,all,and,architecture,array,assert,attribute,begin,block," +
-      "body,buffer,bus,case,component,configuration,constant,disconnent,downto,else,elsif,end,end block,end case," +
+      "body,buffer,bus,case,component,configuration,constant,disconnect,downto,else,elsif,end,end block,end case," +
       "end component,end for,end generate,end if,end loop,end process,end record,end units,entity,exit,file,for," +
       "function,generate,generic,generic map,group,guarded,if,impure,in,inertial,inout,is,label,library,linkage," +
       "literal,loop,map,mod,nand,new,next,nor,null,of,on,open,or,others,out,package,package body,port,port map," +
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index c642ee58fa..75dcbee3ea 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -17,7 +17,7 @@ CodeMirror.defineMode("xquery", function() {
   // function. Each keyword is a property of the keywords object whose
   // value is {type: atype, style: astyle}
   var keywords = function(){
-    // conveinence functions used to build keywords object
+    // convenience functions used to build keywords object
     function kw(type) {return {type: type, style: "keyword"};}
     var A = kw("keyword a")
       , B = kw("keyword b")
diff --git a/mode/yaml-frontmatter/index.html b/mode/yaml-frontmatter/index.html
index 30bed2f855..30cb294e80 100644
--- a/mode/yaml-frontmatter/index.html
+++ b/mode/yaml-frontmatter/index.html
@@ -78,7 +78,7 @@ <h2>YAML front matter mode</h2>
 GFM adds syntax to strikethrough text, which is missing from standard Markdown.
 
 ~~Mistaken text.~~
-~~**works with other fomatting**~~
+~~**works with other formatting**~~
 
 ~~spans across
 lines~~
diff --git a/test/vim_test.js b/test/vim_test.js
index 800791debc..fb612b1407 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -273,10 +273,10 @@ testJumplist('jumplist_repeat_<c-i>', ['*', '*', '*', '3', '<C-o>', '2', '<C-i>'
 testJumplist('jumplist_repeated_motion', ['3', '*', '<C-o>'], [2,3], [2,3]);
 testJumplist('jumplist_/', ['/', '<C-o>'], [2,3], [2,3], 'dialog');
 testJumplist('jumplist_?', ['?', '<C-o>'], [2,3], [2,3], 'dialog');
-testJumplist('jumplist_skip_delted_mark<c-o>',
+testJumplist('jumplist_skip_deleted_mark<c-o>',
              ['*', 'n', 'n', 'k', 'd', 'k', '<C-o>', '<C-o>', '<C-o>'],
              [0,2], [0,2]);
-testJumplist('jumplist_skip_delted_mark<c-i>',
+testJumplist('jumplist_skip_deleted_mark<c-i>',
              ['*', 'n', 'n', 'k', 'd', 'k', '<C-o>', '<C-i>', '<C-i>'],
              [1,0], [0,2]);
 
@@ -482,7 +482,7 @@ testVim('gj_gk', function(cm, vim, helpers) {
   var topLeftCharCoords = cm.charCoords(makeCursor(0, 0));
   var endingCharCoords = cm.charCoords(endingPos);
   is(topLeftCharCoords.left == endingCharCoords.left, 'gj should end up on column 0');
-},{ lineNumbers: false, lineWrapping:true, value: 'Thislineisintentiallylongtotestmovementofgjandgkoverwrappedlines.' });
+},{ lineNumbers: false, lineWrapping:true, value: 'Thislineisintentionallylongtotestmovementofgjandgkoverwrappedlines.' });
 testVim('}', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('}');
@@ -3682,7 +3682,7 @@ function testSubstituteConfirm(name, command, initialValue, expectedValue, keys,
     } catch(e) {
       throw e
     } finally {
-      // Restore overriden functions.
+      // Restore overridden functions.
       CodeMirror.keyName = savedKeyName;
       cm.openDialog = savedOpenDialog;
     }

From 8f095df4c6262fb6301d66159957288b657c6a42 Mon Sep 17 00:00:00 2001
From: Lu Fangjian <ttyrueiwoqp@users.noreply.github.com>
Date: Tue, 29 Mar 2016 17:53:08 +0900
Subject: [PATCH 2664/4742] [search addon] Upon replace, search from the start
 of selection

---
 addon/search/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index e946aa9e97..e6b4f85a05 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -196,7 +196,7 @@
           replaceAll(cm, query, text)
         } else {
           clearSearch(cm);
-          var cursor = getSearchCursor(cm, query, cm.getCursor());
+          var cursor = getSearchCursor(cm, query, cm.getCursor("from"));
           var advance = function() {
             var start = cursor.from(), match;
             if (!(match = cursor.findNext())) {

From eb639c135500b9475e043e90d4d82f3dda620037 Mon Sep 17 00:00:00 2001
From: Gary Sheng <gary.sheng@duke.edu>
Date: Mon, 4 Apr 2016 17:19:35 -0400
Subject: [PATCH 2665/4742] [sql mode] Add text/x-gql MIME type

---
 mode/sql/index.html | 5 +++--
 mode/sql/sql.js     | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index 7ea4b6934a..dba069dc81 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -56,8 +56,9 @@ <h2>SQL Mode for CodeMirror</h2>
             <code><a href="?mime=text/x-cassandra">text/x-cassandra</a></code>,
             <code><a href="?mime=text/x-plsql">text/x-plsql</a></code>,
             <code><a href="?mime=text/x-mssql">text/x-mssql</a></code>,
-            <code><a href="?mime=text/x-hive">text/x-hive</a></code>.
-            <code><a href="?mime=text/x-pgsql">text/x-pgsql</a></code>.
+            <code><a href="?mime=text/x-hive">text/x-hive</a></code>,
+            <code><a href="?mime=text/x-pgsql">text/x-pgsql</a></code>,
+            <code><a href="?mime=text/x-gql">text/x-gql</a></code>.
         </p>
 <script>
 window.onload = function() {
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 8ac2298c9b..c90918b7f2 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -371,6 +371,14 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast commentHash commentSpaceRequired")
   });
 
+  // Google's SQL-like query language, GQL
+  CodeMirror.defineMIME("text/x-gql", {
+    name: "sql",
+    keywords: set("ancestor and asc by contains desc descendant distinct from group has in is limit offset on order select superset where"),
+    atoms: set("false true"),
+    builtin: set("blob datetime first key string integer double boolean null"),
+    operatorChars: /^[*+\-%<>!=]/
+  });
 }());
 
 });

From 3265e11e5cb097360e07f60053ce5a33888bf3f6 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Thu, 31 Mar 2016 00:00:34 +0000
Subject: [PATCH 2666/4742] [vim keymap] Fix spelling of 'whitespace'

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 7f2fb62743..b2bee5a1c7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3003,7 +3003,7 @@
       // Only clip if the selection ends with trailing newline + whitespace
       if (/\n\s*$/.test(selection)) {
         var lines = selection.split('\n');
-        // We know this is all whitepsace.
+        // We know this is all whitespace.
         lines.pop();
 
         // Cases:

From 6f1ce2a85589b681abbba9e6ee70bb1a54fd24f9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 5 Apr 2016 10:09:47 +0200
Subject: [PATCH 2667/4742] [tern addon] Make argument hint caching actually
 work

Closes #3934
---
 addon/tern/tern.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index c345c49781..efdf2ed628 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -179,7 +179,7 @@
     var data = findDoc(ts, doc);
 
     var argHints = ts.cachedArgHints;
-    if (argHints && argHints.doc == doc && cmpPos(argHints.start, change.to) <= 0)
+    if (argHints && argHints.doc == doc && cmpPos(argHints.start, change.to) >= 0)
       ts.cachedArgHints = null;
 
     var changed = data.changed;
@@ -306,7 +306,7 @@
     ts.request(cm, {type: "type", preferFunction: true, end: start}, function(error, data) {
       if (error || !data.type || !(/^fn\(/).test(data.type)) return;
       ts.cachedArgHints = {
-        start: pos,
+        start: start,
         type: parseFnType(data.type),
         name: data.exprName || data.name || "fn",
         guess: data.guess,

From 6fa575229f64f164df5cd2f9d4bd48484ce9789c Mon Sep 17 00:00:00 2001
From: John Van Der Loo <jvanderloo@atlassian.com>
Date: Sun, 3 Apr 2016 20:41:58 +1000
Subject: [PATCH 2668/4742] [mathematica mode] Fix stuck-stream error on
 unrecognized syntax

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

diff --git a/mode/mathematica/mathematica.js b/mode/mathematica/mathematica.js
index 5ae6f55cb5..d6977088ce 100644
--- a/mode/mathematica/mathematica.js
+++ b/mode/mathematica/mathematica.js
@@ -126,6 +126,7 @@ CodeMirror.defineMode('mathematica', function(_config, _parserConfig) {
     }
 
     // everything else is an error
+    stream.next(); // advance the stream.
     return 'error';
   }
 

From be36e3e9f9602d5230679361292455801f3d1b90 Mon Sep 17 00:00:00 2001
From: Grzegorz Mazur <teoretyk@gmail.com>
Date: Tue, 22 Dec 2015 14:44:12 +0100
Subject: [PATCH 2669/4742] [yacas mode] Add

---
 mode/index.html       |   1 +
 mode/meta.js          |   1 +
 mode/yacas/index.html |  87 ++++++++++++++++++++++++++
 mode/yacas/yacas.js   | 138 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 227 insertions(+)
 create mode 100644 mode/yacas/index.html
 create mode 100644 mode/yacas/yacas.js

diff --git a/mode/index.html b/mode/index.html
index 67b8774641..efb64143a1 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -151,6 +151,7 @@ <h2>Language modes</h2>
       <li><a href="vue/index.html">Vue.js app</a></li>
       <li><a href="xml/index.html">XML/HTML</a></li>
       <li><a href="xquery/index.html">XQuery</a></li>
+      <li><a href="yacas/index.html">Yacas</a></li>
       <li><a href="yaml/index.html">YAML</a></li>
       <li><a href="yaml-frontmatter/index.html">YAML frontmatter</a></li>
       <li><a href="z80/index.html">Z80</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 2949cde822..3539beaa17 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -152,6 +152,7 @@
     {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
     {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
+    {name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
     {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
     {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
     {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
diff --git a/mode/yacas/index.html b/mode/yacas/index.html
new file mode 100644
index 0000000000..8e52cafb10
--- /dev/null
+++ b/mode/yacas/index.html
@@ -0,0 +1,87 @@
+<!doctype html>
+
+<title>CodeMirror: yacas 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/edit/matchbrackets.js></script>
+<script src=yacas.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="#">yacas</a>
+  </ul>
+</div>
+
+<article>
+<h2>yacas mode</h2>
+
+
+<textarea id="yacasCode">
+// example yacas code
+Graph(edges_IsList) <-- [
+    Local(v, e, f, t);
+
+    vertices := {};
+
+    ForEach (e, edges) [
+        If (IsList(e), e := Head(e));
+        {f, t} := Tail(Listify(e));
+
+        DestructiveAppend(vertices, f);
+        DestructiveAppend(vertices, t);
+    ];
+
+    Graph(RemoveDuplicates(vertices), edges);
+];
+
+10 # IsGraph(Graph(vertices_IsList, edges_IsList)) <-- True;
+20 # IsGraph(_x) <-- False;
+
+Edges(Graph(vertices_IsList, edges_IsList)) <-- edges;
+Vertices(Graph(vertices_IsList, edges_IsList)) <-- vertices;
+
+AdjacencyList(g_IsGraph) <-- [
+    Local(l, vertices, edges, e, op, f, t);
+
+    l := Association'Create();
+
+    vertices := Vertices(g);
+    ForEach (v, vertices)
+        Association'Set(l, v, {});
+
+    edges := Edges(g);
+
+    ForEach(e, edges) [
+        If (IsList(e), e := Head(e));
+        {op, f, t} := Listify(e);
+        DestructiveAppend(Association'Get(l, f), t);
+        If (String(op) = "<->", DestructiveAppend(Association'Get(l, t), f));
+    ];
+
+    l;
+];
+</textarea>
+
+<script>
+  var yacasEditor = CodeMirror.fromTextArea(document.getElementById('yacasCode'), {
+    mode: 'text/x-yacas',
+    lineNumbers: true,
+    matchBrackets: true
+  });
+</script>
+
+<p><strong>MIME types defined:</strong> <code>text/x-yacas</code> (yacas).</p>
+</article>
diff --git a/mode/yacas/yacas.js b/mode/yacas/yacas.js
new file mode 100644
index 0000000000..2967382b43
--- /dev/null
+++ b/mode/yacas/yacas.js
@@ -0,0 +1,138 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Yacas mode copyright (c) 2015 by Grzegorz Mazur
+// Loosely based on mathematica mode by Calin Barbat
+
+(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('yacas', function(_config, _parserConfig) {
+
+  // patterns
+  var pFloatForm  = "(?:(?:\\.\\d+|\\d+\\.\\d*|\\d+)(?:[eE][+-]?\\d+)?)";
+  var pIdentifier = "(?:[a-zA-Z\\$'][a-zA-Z0-9\\$']*)";
+
+  // regular expressions
+  var reFloatForm    = new RegExp(pFloatForm);
+  var reIdentifier   = new RegExp(pIdentifier);
+  var rePattern      = new RegExp(pIdentifier + "?_" + pIdentifier);
+  var reFunctionLike = new RegExp(pIdentifier + "\\s*\\(");
+
+  function tokenBase(stream, state) {
+    var ch;
+
+    // get next character
+    ch = stream.next();
+
+    // string
+    if (ch === '"') {
+      state.tokenize = tokenString;
+      return state.tokenize(stream, state);
+    }
+
+    // comment
+    if (ch === '/') {
+      if (stream.eat('*')) {
+        state.tokenize = tokenComment;
+        return state.tokenize(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+
+    // go back one character
+    stream.backUp(1);
+
+    // look for ordered rules
+    if (stream.match(/\d+ *#/, true, false)) {
+      return 'qualifier';
+    }
+
+    // look for numbers
+    if (stream.match(reFloatForm, true, false)) {
+      return 'number';
+    }
+
+    // look for placeholders
+    if (stream.match(rePattern, true, false)) {
+      return 'variable-3';
+    }
+
+    // match all braces separately
+    if (stream.match(/(?:\[|\]|{|}|\(|\))/, true, false)) {
+      return 'bracket';
+    }
+
+    // literals looking like function calls
+    if (stream.match(reFunctionLike, true, false)) {
+      stream.backUp(1);
+      return 'variable';
+    }
+
+    // all other identifiers
+    if (stream.match(reIdentifier, true, false)) {
+      return 'variable-2';
+    }
+
+    // operators; note that operators like @@ or /; are matched separately for each symbol.
+    if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%)/, true, false)) {
+      return 'operator';
+    }
+
+    // everything else is an error
+    return 'error';
+  }
+
+  function tokenString(stream, state) {
+    var next, end = false, escaped = false;
+    while ((next = stream.next()) != null) {
+      if (next === '"' && !escaped) {
+        end = true;
+        break;
+      }
+      escaped = !escaped && next === '\\';
+    }
+    if (end && !escaped) {
+      state.tokenize = tokenBase;
+    }
+    return 'string';
+  };
+
+  function tokenComment(stream, state) {
+    var prev, next;
+    while((next = stream.next()) != null) {
+      if (prev === '*' && next === '/')
+        break;
+      prev = next;
+    }
+    state.tokenize = tokenBase;
+    return 'comment';
+  }
+
+  return {
+    startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return state.tokenize(stream, state);
+    },
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
+  };
+});
+
+CodeMirror.defineMIME('text/x-yacas', {
+  name: 'yacas'
+});
+
+});

From 66fd40ff072151a1a451e2f1b80e34340d293d38 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 6 Apr 2016 10:25:46 +0200
Subject: [PATCH 2670/4742] [manual] Explain the way fromTextArea can leak
 memory

Issue #3938
---
 doc/manual.html | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 59419027c0..ce03bd30c3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: User Manual</title>
 <meta charset="utf-8"/>
@@ -2064,26 +2064,29 @@ <h3 id="api_static">Static properties</h3>
       else (usually one) for dev snapshots.</dd>
 
       <dt id="fromTextArea"><code><strong>CodeMirror.fromTextArea</strong>(textArea: TextAreaElement, ?config: object)</code></dt>
-      <dd>
-        The method provides another way to initialize an editor. It
-        takes a textarea DOM node as first argument and an optional
-        configuration object as second. It will replace the textarea
-        with a CodeMirror instance, and wire up the form of that
-        textarea (if any) to make sure the editor contents are put
-        into the textarea when the form is submitted. The text in the
-        textarea will provide the content for the editor. A CodeMirror
-        instance created this way has three additional methods:
-        <dl>
-          <dt id="save"><code><strong>cm.save</strong>()</code></dt>
-          <dd>Copy the content of the editor into the textarea.</dd>
-
-          <dt id="toTextArea"><code><strong>cm.toTextArea</strong>()</code></dt>
-          <dd>Remove the editor, and restore the original textarea (with
-          the editor's current content).</dd>
-
-          <dt id="getTextArea"><code><strong>cm.getTextArea</strong>() → TextAreaElement</code></dt>
-          <dd>Returns the textarea that the instance was based on.</dd>
-        </dl>
+      <dd>This method provides another way to initialize an editor. It
+      takes a textarea DOM node as first argument and an optional
+      configuration object as second. It will replace the textarea
+      with a CodeMirror instance, and wire up the form of that
+      textarea (if any) to make sure the editor contents are put into
+      the textarea when the form is submitted. The text in the
+      textarea will provide the content for the editor. A CodeMirror
+      instance created this way has three additional methods:
+      <dl>
+        <dt id="save"><code><strong>cm.save</strong>()</code></dt>
+        <dd>Copy the content of the editor into the textarea.</dd>
+
+        <dt id="toTextArea"><code><strong>cm.toTextArea</strong>()</code></dt>
+        <dd>Remove the editor, and restore the original textarea (with
+        the editor's current content). If you dynamically create and
+        destroy editors made with `fromTextArea`, without destroying
+        the form they are part of, you should make sure to call
+        `toTextArea` to remove the editor, or its `"submit"` handler
+        on the form will cause a memory leak.</dd>
+
+        <dt id="getTextArea"><code><strong>cm.getTextArea</strong>() → TextAreaElement</code></dt>
+        <dd>Returns the textarea that the instance was based on.</dd>
+      </dl>
       </dd>
 
       <dt id="defaults"><code><strong>CodeMirror.defaults</strong>: object</code></dt>

From 225a35fc4a107fc0027c544743fe6c10d86f9f52 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 6 Apr 2016 21:55:28 +0200
Subject: [PATCH 2671/4742] Bump version number to 5.13.5

5.13.4 was a trivial release restoring a LICENSE file.
---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index ce03bd30c3..b513bf9408 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.13.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.13.5</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 22186b45ad..19baf0098f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8890,7 +8890,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.13.3";
+  CodeMirror.version = "5.13.5";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 11551de2d6..ca0d787e49 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.13.3",
+    "version":"5.13.5",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From d6e8f34ae926f782379e96a1d911e74363a6a416 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Wed, 6 Apr 2016 23:20:39 +0100
Subject: [PATCH 2672/4742] [icecoder theme] Warmer background and fixed
 matchingbracket

---
 theme/icecoder.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/theme/icecoder.css b/theme/icecoder.css
index d70d26e820..ffebaf2f0b 100644
--- a/theme/icecoder.css
+++ b/theme/icecoder.css
@@ -2,7 +2,7 @@
 ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
 */
 
-.cm-s-icecoder { color: #666; background: #141612; }
+.cm-s-icecoder { color: #666; background: #1d1d1b; }
 
 .cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
 .cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
@@ -37,7 +37,7 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 
 .cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
 .cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
-.cm-s-icecoder .CodeMirror-gutters { background: #141612; min-width: 41px; border-right: 0; }
+.cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
 .cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
-.cm-s-icecoder .CodeMirror-matchingbracket { border: 1px solid grey; color: black !important; }
-.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
\ No newline at end of file
+.cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
+.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }

From adb73ffa1810807bfedf4a218e8cd1462425df14 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 2 Apr 2016 20:25:41 -0700
Subject: [PATCH 2673/4742] [webidl mode] Add

---
 doc/compress.html      |   1 +
 mode/index.html        |   1 +
 mode/meta.js           |   1 +
 mode/webidl/index.html |  71 +++++++++++++++
 mode/webidl/webidl.js  | 197 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 271 insertions(+)
 create mode 100644 mode/webidl/index.html
 create mode 100644 mode/webidl/webidl.js

diff --git a/doc/compress.html b/doc/compress.html
index 538ecbe5f0..44e6fea828 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -226,6 +226,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/verilog/verilog.js">verilog.js</option>
           <option value="http://codemirror.net/mode/vhdl/vhdl.js">vhdl.js</option>
           <option value="http://codemirror.net/mode/vue/vue.js">vue.js</option>
+          <option value="http://codemirror.net/mode/webidl/webidl.js">webidl.js</option>
           <option value="http://codemirror.net/mode/xml/xml.js">xml.js</option>
           <option value="http://codemirror.net/mode/xquery/xquery.js">xquery.js</option>
           <option value="http://codemirror.net/mode/yaml/yaml.js">yaml.js</option>
diff --git a/mode/index.html b/mode/index.html
index efb64143a1..822f04fc61 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -149,6 +149,7 @@ <h2>Language modes</h2>
       <li><a href="verilog/index.html">Verilog/SystemVerilog</a></li>
       <li><a href="vhdl/index.html">VHDL</a></li>
       <li><a href="vue/index.html">Vue.js app</a></li>
+      <li><a href="webidl/index.html">Web IDL</a></li>
       <li><a href="xml/index.html">XML/HTML</a></li>
       <li><a href="xquery/index.html">XQuery</a></li>
       <li><a href="yacas/index.html">Yacas</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index 3539beaa17..dcdcdab9c0 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -145,6 +145,7 @@
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
     {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
     {name: "Twig", mime: "text/x-twig", mode: "twig"},
+    {name: "Web IDL", mime: "text/x-webidl", mode: "webidl", ext: ["webidl"]},
     {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
     {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
     {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
diff --git a/mode/webidl/index.html b/mode/webidl/index.html
new file mode 100644
index 0000000000..1d4112e1c3
--- /dev/null
+++ b/mode/webidl/index.html
@@ -0,0 +1,71 @@
+<!doctype html>
+
+<title>CodeMirror: Web IDL 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/edit/matchbrackets.js"></script>
+<script src="webidl.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="#">Web IDL</a>
+  </ul>
+</div>
+
+<article>
+  <h2>Web IDL mode</h2>
+
+  <div>
+<textarea id="code" name="code">
+[NamedConstructor=Image(optional unsigned long width, optional unsigned long height)]
+interface HTMLImageElement : HTMLElement {
+           attribute DOMString alt;
+           attribute DOMString src;
+           attribute DOMString srcset;
+           attribute DOMString sizes;
+           attribute DOMString? crossOrigin;
+           attribute DOMString useMap;
+           attribute boolean isMap;
+           attribute unsigned long width;
+           attribute unsigned long height;
+  readonly attribute unsigned long naturalWidth;
+  readonly attribute unsigned long naturalHeight;
+  readonly attribute boolean complete;
+  readonly attribute DOMString currentSrc;
+
+  // also has obsolete members
+};
+
+partial interface HTMLImageElement {
+  attribute DOMString name;
+  attribute DOMString lowsrc;
+  attribute DOMString align;
+  attribute unsigned long hspace;
+  attribute unsigned long vspace;
+  attribute DOMString longDesc;
+
+  [TreatNullAs=EmptyString] attribute DOMString border;
+};
+</textarea>
+  </div>
+
+  <script>
+    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+      lineNumbers: true,
+      matchBrackets: true
+    });
+  </script>
+
+  <p><strong>MIME type defined:</strong> <code>text/x-webidl</code>.</p>
+</article>
diff --git a/mode/webidl/webidl.js b/mode/webidl/webidl.js
new file mode 100644
index 0000000000..6a60fa23ef
--- /dev/null
+++ b/mode/webidl/webidl.js
@@ -0,0 +1,197 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+function wordRegexp(words) {
+  return new RegExp("^((" + words.join(")|(") + "))\\b");
+};
+
+var builtinArray = [
+  "Clamp",
+  "Constructor",
+  "EnforceRange",
+  "Exposed",
+  "ImplicitThis",
+  "Global", "PrimaryGlobal",
+  "LegacyArrayClass",
+  "LegacyUnenumerableNamedProperties",
+  "LenientThis",
+  "NamedConstructor",
+  "NewObject",
+  "NoInterfaceObject",
+  "OverrideBuiltins",
+  "PutForwards",
+  "Replaceable",
+  "SameObject",
+  "TreatNonObjectAsNull",
+  "TreatNullAs",
+    "EmptyString",
+  "Unforgeable",
+  "Unscopeable"
+];
+var builtins = wordRegexp(builtinArray);
+
+var typeArray = [
+  "unsigned", "short", "long",                  // UnsignedIntegerType
+  "unrestricted", "float", "double",            // UnrestrictedFloatType
+  "boolean", "byte", "octet",                   // Rest of PrimitiveType
+  "Promise",                                    // PromiseType
+  "ArrayBuffer", "DataView", "Int8Array", "Int16Array", "Int32Array",
+  "Uint8Array", "Uint16Array", "Uint32Array", "Uint8ClampedArray",
+  "Float32Array", "Float64Array",               // BufferRelatedType
+  "ByteString", "DOMString", "USVString", "sequence", "object", "RegExp",
+  "Error", "DOMException", "FrozenArray",       // Rest of NonAnyType
+  "any",                                        // Rest of SingleType
+  "void"                                        // Rest of ReturnType
+];
+var types = wordRegexp(typeArray);
+
+var keywordArray = [
+  "attribute", "callback", "const", "deleter", "dictionary", "enum", "getter",
+  "implements", "inherit", "interface", "iterable", "legacycaller", "maplike",
+  "partial", "required", "serializer", "setlike", "setter", "static",
+  "stringifier", "typedef",                     // ArgumentNameKeyword except
+                                                // "unrestricted"
+  "optional", "readonly", "or"
+];
+var keywords = wordRegexp(keywordArray);
+
+var atomArray = [
+  "true", "false",                              // BooleanLiteral
+  "Infinity", "NaN",                            // FloatLiteral
+  "null"                                        // Rest of ConstValue
+];
+var atoms = wordRegexp(atomArray);
+
+CodeMirror.registerHelper("hintWords", "webidl",
+    builtinArray.concat(typeArray).concat(keywordArray).concat(atomArray));
+
+var startDefArray = ["callback", "dictionary", "enum", "interface"];
+var startDefs = wordRegexp(startDefArray);
+
+var endDefArray = ["typedef"];
+var endDefs = wordRegexp(endDefArray);
+
+var singleOperators = /^[:<=>?]/;
+var integers = /^-?([1-9][0-9]*|0[Xx][0-9A-Fa-f]+|0[0-7]*)/;
+var floats = /^-?(([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([Ee][+-]?[0-9]+)?|[0-9]+[Ee][+-]?[0-9]+)/;
+var identifiers = /^_?[A-Za-z][0-9A-Z_a-z-]*/;
+var strings = /^"[^"]*"/;
+var multilineComments = /^\/\*.*?\*\//;
+var multilineCommentsStart = /^\/\*.*/;
+var multilineCommentsEnd = /^.*?\*\//;
+
+function readToken(stream, state) {
+  // whitespace
+  if (stream.eatSpace()) return null;
+
+  // comment
+  if (state.inComment) {
+    if (stream.match(multilineCommentsEnd)) {
+      state.inComment = false;
+      return "comment";
+    }
+    stream.skipToEnd();
+    return "comment";
+  }
+  if (stream.match("//")) {
+    stream.skipToEnd();
+    return "comment";
+  }
+  if (stream.match(multilineComments)) return "comment";
+  if (stream.match(multilineCommentsStart)) {
+    state.inComment = true;
+    return "comment";
+  }
+
+  // integer and float
+  if (stream.match(/^-?[0-9\.]/, false)) {
+    if (stream.match(integers) || stream.match(floats)) return "number";
+  }
+
+  // string
+  if (stream.match(strings)) return "string";
+
+  // identifier
+  var pos = stream.pos;
+  if (stream.match(identifiers)) {
+    if (state.startDef) return "def";
+    if (state.endDef && stream.match(/^\s*;/, false)) {
+      state.endDef = false;
+      return "def";
+    }
+    stream.pos = pos;
+  }
+
+  if (stream.match(keywords)) return "keyword";
+
+  if (stream.match(types)) {
+    var lastToken = state.lastToken;
+    var nextToken = (stream.match(/^\s*(.+?)\b/, false) || [])[1];
+
+    if (lastToken === ":" || lastToken === "implements" ||
+        nextToken === "implements" || nextToken === "=") {
+      // Used as identifier
+      return "builtin";
+    } else {
+      // Used as type
+      return "variable-3";
+    }
+  }
+
+  if (stream.match(builtins)) return "builtin";
+  if (stream.match(atoms)) return "atom";
+  if (stream.match(identifiers)) return "variable";
+
+  // other
+  if (stream.match(singleOperators)) return "operator";
+
+  // unrecognized
+  stream.next();
+  return null;
+};
+
+CodeMirror.defineMode("webidl", function() {
+  return {
+    startState: function() {
+      return {
+        // Is in multiline comment
+        inComment: false,
+        // Last non-whitespace, matched token
+        lastToken: "",
+        // Next token is a definition
+        startDef: false,
+        // Last token of the statement is a definition
+        endDef: false
+      };
+    },
+    token: function(stream, state) {
+      var style = readToken(stream, state);
+
+      if (style) {
+        var cur = stream.current();
+        state.lastToken = cur;
+        if (style === "keyword") {
+          state.startDef = startDefs.test(cur);
+          state.endDef = state.endDef || endDefs.test(cur);
+        } else {
+          state.startDef = false;
+        }
+      }
+
+      return style;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-webidl", "webidl");
+});

From def70631ca7a50cfb5bf414c27df4db53f899a15 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Thu, 7 Apr 2016 06:36:38 -0700
Subject: [PATCH 2674/4742] [webidl mode] Remove unnecessary pos saving

---
 mode/webidl/webidl.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mode/webidl/webidl.js b/mode/webidl/webidl.js
index 6a60fa23ef..6f024c63f8 100644
--- a/mode/webidl/webidl.js
+++ b/mode/webidl/webidl.js
@@ -122,14 +122,12 @@ function readToken(stream, state) {
   if (stream.match(strings)) return "string";
 
   // identifier
-  var pos = stream.pos;
   if (stream.match(identifiers)) {
     if (state.startDef) return "def";
     if (state.endDef && stream.match(/^\s*;/, false)) {
       state.endDef = false;
       return "def";
     }
-    stream.pos = pos;
   }
 
   if (stream.match(keywords)) return "keyword";

From 300f7f8eb885fa5ff5cdbf0a43126849a7881095 Mon Sep 17 00:00:00 2001
From: Kris Ciccarello <kmctown@users.noreply.github.com>
Date: Thu, 7 Apr 2016 13:35:42 -0400
Subject: [PATCH 2675/4742] [docs] `doc.getSelections` returns an array of
 strings.

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

diff --git a/doc/manual.html b/doc/manual.html
index b513bf9408..8b600eac54 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1254,7 +1254,7 @@ <h3 id="api_selection">Cursor and selection methods</h3>
       separator to put between the lines in the output. When multiple
       selections are present, they are concatenated with instances
       of <code>lineSep</code> in between.</dd>
-      <dt id="getSelections"><code><strong>doc.getSelections</strong>(?lineSep: string) → string</code></dt>
+      <dt id="getSelections"><code><strong>doc.getSelections</strong>(?lineSep: string) → array&lt;string&gt;</code></dt>
       <dd>Returns an array containing a string for each selection,
       representing the content of the selections.</dd>
 

From bef7e37a093a55ca7f14e1cd823431db07326200 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Thu, 7 Apr 2016 17:10:23 -0400
Subject: [PATCH 2676/4742] [mode/meta] Recognize Bazel, Buck and Pants build
 files as Python in mode/meta.js

BUCK, BUILD, *.BUILD and *.bzl files are build files for the three build
systems mentioned, and they are all valid Python files.
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index dcdcdab9c0..20ebe0ae22 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -105,7 +105,7 @@
     {name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
     {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
     {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
-    {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
+    {name: "Python", mime: "text/x-python", mode: "python", ext: ["BUILD", "bzl", "py", "pyw"], file: /^(BUCK|BUILD)$/},
     {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
     {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
     {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},

From 44e4bd42c7ecbd67a48d1c005bdde6140f8475cd Mon Sep 17 00:00:00 2001
From: Gary Sheng <gary.sheng@duke.edu>
Date: Thu, 7 Apr 2016 17:07:17 -0400
Subject: [PATCH 2677/4742] [sql mode] Add __key__ keyword to GQL MIME
 definition

---
 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 c90918b7f2..daec60ce6f 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -376,7 +376,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name: "sql",
     keywords: set("ancestor and asc by contains desc descendant distinct from group has in is limit offset on order select superset where"),
     atoms: set("false true"),
-    builtin: set("blob datetime first key string integer double boolean null"),
+    builtin: set("blob datetime first key __key__ string integer double boolean null"),
     operatorChars: /^[*+\-%<>!=]/
   });
 }());

From 7fa0cdc493e48571e163317d27b58483f5c8d464 Mon Sep 17 00:00:00 2001
From: Jared Dean <Jared.Dean@sas.com>
Date: Fri, 1 Apr 2016 11:37:36 -0400
Subject: [PATCH 2678/4742] [sas mode] Add

---
 AUTHORS             |   1 +
 mode/meta.js        |   1 +
 mode/sas/index.html |  87 ++++++++++
 mode/sas/sas.js     | 381 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 470 insertions(+)
 create mode 100644 mode/sas/index.html
 create mode 100755 mode/sas/sas.js

diff --git a/AUTHORS b/AUTHORS
index 03b1ac5b0a..2c8a9bf3d1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -238,6 +238,7 @@ Jan Keromnes
 Jan Odvarko
 Jan Schär
 Jan T. Sott
+Jared Dean
 Jared Forsyth
 Jason
 Jason Barnabe
diff --git a/mode/meta.js b/mode/meta.js
index 20ebe0ae22..f93078c00b 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -114,6 +114,7 @@
     {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
     {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]},
     {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
+    {name: "SAS", mime: "text/x-sas", mode: "sas", ext: ["sas"]},
     {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
     {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
     {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
diff --git a/mode/sas/index.html b/mode/sas/index.html
new file mode 100644
index 0000000000..80957403d5
--- /dev/null
+++ b/mode/sas/index.html
@@ -0,0 +1,87 @@
+<!doctype html>
+
+<title>CodeMirror: SAS 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/edit/continuelist.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="sas.js"></script>
+<style type="text/css">
+      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+      .cm-s-default .cm-trailing-space-a:before,
+      .cm-s-default .cm-trailing-space-b:before {position: absolute; content: "\00B7"; color: #777;}
+      .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
+    </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="#">SAS</a>
+  </ul>
+</div>
+
+<article>
+<h2>SAS mode</h2>
+<form><textarea id="code" name="code">
+libname foo "/tmp/foobar";
+%let count=1;
+
+/* Multi line
+Comment
+*/
+data _null_;
+    x=ranuni();
+    * single comment;
+    x2=x**2;
+    sx=sqrt(x);
+    if x=x2 then put "x must be 1";
+    else do;
+        put x=;
+    end;
+run;
+
+/* embedded comment
+* comment;
+*/
+
+proc glm data=sashelp.class;
+    class sex;
+    model weight = height sex;
+run;
+
+proc sql;
+    select count(*)
+    from sashelp.class;
+
+    create table foo as
+    select * from sashelp.class;
+
+    select * 
+    from foo;
+quit;
+
+</textarea></form>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: 'sas',
+        lineNumbers: true,
+        theme: "default",
+        extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"}
+      });
+    </script>
+
+   
+    <p><strong>MIME types defined:</strong> <code>text/x-sas</code>.</p>
+
+
+  </article>
diff --git a/mode/sas/sas.js b/mode/sas/sas.js
new file mode 100755
index 0000000000..4043bc7027
--- /dev/null
+++ b/mode/sas/sas.js
@@ -0,0 +1,381 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+
+// SAS mode copyright (c) 2016 Jared Dean, SAS Institute
+// Created by Jared Dean
+
+// TODO
+// indent and de-indent
+// identify macro variables
+
+
+//Definitions
+//  comment -- text withing * ; or /* */
+//  keyword -- SAS language variable
+//  variable -- macro variables starts with '&' or variable formats
+//  variable-2 -- DATA Step, proc, or macro names
+//  string -- text within ' ' or " "
+//  operator -- numeric operator + / - * ** le eq ge ... and so on
+//  builtin -- proc %macro data run mend
+//  atom
+//  def
+
+
+(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("sas", function () {
+        var words = {};
+        var isDoubleOperatorSym = {
+            eq: 'operator',
+            lt: 'operator',
+            le: 'operator',
+            gt: 'operator',
+            ge: 'operator',
+            in: 'operator',
+            ne: 'operator',
+            or: 'operator'
+        };
+        var isDoubleOperatorChar = /(<=|>=|!=|<>)/;
+        var isSingleOperatorChar = /[=\(:\),{}.*<>+\-\/^\[\]]/;
+
+        // Takes a string of words separated by spaces and adds them as
+        // keys with the value of the first argument 'style'
+        var define = function (style, string, context) {
+            if (context) {
+                var split = string.split(' ');
+                for (var i = 0; i < split.length; i++) {
+                    words[split[i]] = {style: style, state: context};
+                }
+            }
+        };
+        //datastep
+        define('def', 'stack pgm view source debug nesting nolist', ['inDataStep']);
+        define('def', 'if while until for do do; end end; then else cancel', ['inDataStep']);
+        define('def', 'label format _n_ _error_', ['inDataStep']);
+        define('def', 'ALTER BUFNO BUFSIZE CNTLLEV COMPRESS DLDMGACTION ENCRYPT ENCRYPTKEY EXTENDOBSCOUNTER GENMAX GENNUM INDEX LABEL OBSBUF OUTREP PW PWREQ READ REPEMPTY REPLACE REUSE ROLE SORTEDBY SPILL TOBSNO TYPE WRITE FILECLOSE FIRSTOBS IN OBS POINTOBS WHERE WHEREUP IDXNAME IDXWHERE DROP KEEP RENAME', ['inDataStep']);
+        define('def', 'filevar finfo finv fipname fipnamel fipstate first firstobs floor', ['inDataStep']);
+        define('def', 'varfmt varinfmt varlabel varlen varname varnum varray varrayx vartype verify vformat vformatd vformatdx vformatn vformatnx vformatw vformatwx vformatx vinarray vinarrayx vinformat vinformatd vinformatdx vinformatn vinformatnx vinformatw vinformatwx vinformatx vlabel vlabelx vlength vlengthx vname vnamex vnferr vtype vtypex weekday', ['inDataStep']);
+        define('def', 'zipfips zipname zipnamel zipstate', ['inDataStep']);
+        define('def', 'put putc putn', ['inDataStep']);
+        define('builtin', 'data run', ['inDataStep']);
+
+
+        //proc
+        define('def', 'data', ['inProc']);
+
+        // flow control for macros
+        define('def', '%if %end %end; %else %else; %do %do; %then', ['inMacro']);
+
+        //everywhere
+        define('builtin', 'proc run; quit; libname filename %macro %mend option options', ['ALL']);
+
+        define('def', 'footnote title libname ods', ['ALL']);
+        define('def', '%let %put %global %sysfunc %eval ', ['ALL']);
+        // automatic macro variables http://support.sas.com/documentation/cdl/en/mcrolref/61885/HTML/default/viewer.htm#a003167023.htm
+        define('variable', '&sysbuffr &syscc &syscharwidth &syscmd &sysdate &sysdate9 &sysday &sysdevic &sysdmg &sysdsn &sysencoding &sysenv &syserr &syserrortext &sysfilrc &syshostname &sysindex &sysinfo &sysjobid &syslast &syslckrc &syslibrc &syslogapplname &sysmacroname &sysmenv &sysmsg &sysncpu &sysodspath &sysparm &syspbuff &sysprocessid &sysprocessname &sysprocname &sysrc &sysscp &sysscpl &sysscpl &syssite &sysstartid &sysstartname &systcpiphostname &systime &sysuserid &sysver &sysvlong &sysvlong4 &syswarningtext', ['ALL']);
+
+        //footnote[1-9]? title[1-9]?
+
+        //options statement
+        define('def', 'source2 nosource2 page pageno pagesize', ['ALL']);
+
+        //proc and datastep
+        define('def', '_all_ _character_ _cmd_ _freq_ _i_ _infile_ _last_ _msg_ _null_ _numeric_ _temporary_ _type_ abort abs addr adjrsq airy alpha alter altlog altprint and arcos array arsin as atan attrc attrib attrn authserver autoexec awscontrol awsdef awsmenu awsmenumerge awstitle backward band base betainv between blocksize blshift bnot bor brshift bufno bufsize bxor by byerr byline byte calculated call cards cards4 catcache cbufno cdf ceil center cexist change chisq cinv class cleanup close cnonct cntllev coalesce codegen col collate collin column comamid comaux1 comaux2 comdef compbl compound compress config continue convert cos cosh cpuid create cross crosstab css curobs cv daccdb daccdbsl daccsl daccsyd dacctab dairy datalines datalines4 datejul datepart datetime day dbcslang dbcstype dclose ddm delete delimiter depdb depdbsl depsl depsyd deptab dequote descending descript design= device dflang dhms dif digamma dim dinfo display distinct dkricond dkrocond dlm dnum do dopen doptname doptnum dread drop dropnote dsname dsnferr echo else emaildlg emailid emailpw emailserver emailsys encrypt end endsas engine eof eov erf erfc error errorcheck errors exist exp fappend fclose fcol fdelete feedback fetch fetchobs fexist fget file fileclose fileexist filefmt filename fileref  fmterr fmtsearch fnonct fnote font fontalias  fopen foptname foptnum force formatted formchar formdelim formdlim forward fpoint fpos fput fread frewind frlen from fsep fuzz fwrite gaminv gamma getoption getvarc getvarn go goto group gwindow hbar hbound helpenv helploc hms honorappearance hosthelp hostprint hour hpct html hvar ibessel ibr id if index indexc indexw initcmd initstmt inner input inputc inputn inr insert int intck intnx into intrr invaliddata irr is jbessel join juldate keep kentb kurtosis label lag last lbound leave left length levels lgamma lib  library libref line linesize link list log log10 log2 logpdf logpmf logsdf lostcard lowcase lrecl ls macro macrogen maps mautosource max maxdec maxr mdy mean measures median memtype merge merror min minute missing missover mlogic mod mode model modify month mopen mort mprint mrecall msglevel msymtabmax mvarsize myy n nest netpv new news nmiss no nobatch nobs nocaps nocardimage nocenter nocharcode nocmdmac nocol nocum nodate nodbcs nodetails nodmr nodms nodmsbatch nodup nodupkey noduplicates noechoauto noequals noerrorabend noexitwindows nofullstimer noicon noimplmac noint nolist noloadlist nomiss nomlogic nomprint nomrecall nomsgcase nomstored nomultenvappl nonotes nonumber noobs noovp nopad nopercent noprint noprintinit normal norow norsasuser nosetinit  nosplash nosymbolgen note notes notitle notitles notsorted noverbose noxsync noxwait npv null number numkeys nummousekeys nway obs  on open     order ordinal otherwise out outer outp= output over ovp p(1 5 10 25 50 75 90 95 99) pad pad2  paired parm parmcards path pathdll pathname pdf peek peekc pfkey pmf point poisson poke position printer probbeta probbnml probchi probf probgam probhypr probit probnegb probnorm probsig probt procleave prt ps  pw pwreq qtr quote r ranbin rancau ranexp rangam range ranks rannor ranpoi rantbl rantri ranuni read recfm register regr remote remove rename repeat replace resolve retain return reuse reverse rewind right round rsquare rtf rtrace rtraceloc s s2 samploc sasautos sascontrol sasfrscr sasmsg sasmstore sasscript sasuser saving scan sdf second select selection separated seq serror set setcomm setot sign simple sin sinh siteinfo skewness skip sle sls sortedby sortpgm sortseq sortsize soundex  spedis splashlocation split spool sqrt start std stderr stdin stfips stimer stname stnamel stop stopover subgroup subpopn substr sum sumwgt symbol symbolgen symget symput sysget sysin sysleave sysmsg sysparm sysprint sysprintfont sysprod sysrc system t table tables tan tanh tapeclose tbufsize terminal test then timepart tinv  tnonct to today tol tooldef totper transformout translate trantab tranwrd trigamma trim trimn trunc truncover type unformatted uniform union until upcase update user usericon uss validate value var  weight when where while wincharset window work workinit workterm write wsum xsync xwait yearcutoff yes yyq  min max', ['inDataStep', 'inProc']);
+        define('operator', 'and not ', ['inDataStep', 'inProc']);
+
+        // Main function
+        function tokenize(stream, state) {
+            // Finally advance the stream
+            var ch = stream.next();
+
+            // BLOCKCOMMENT
+            if (ch === '/' && stream.eat('*')) {
+                state.continueComment = true;
+                return "comment";
+            }
+            // in comment block
+            else if (state.continueComment === true) {
+                //comment ends at the beginning of the line
+                if (ch === '*' && stream.peek() === '/') {
+                    stream.next();
+                    state.continueComment = false;
+                }
+                //comment is potentially later in line
+                else if (stream.skipTo('*')) {
+                    stream.skipTo('*');
+                    stream.next();
+                    if (stream.eat('/')) {
+                        state.continueComment = false;
+                    }
+                }
+                else {
+                    stream.skipToEnd();
+                }
+                return "comment";
+            }
+
+            // DoubleOperator match
+            var doubleOperator = ch + stream.peek();
+
+            // Match all line comments.
+            var myString = stream.string;
+            var myRegexp = /(?:^\s*|[;]\s*)(\*.*?);/ig;
+            var match = myRegexp.exec(myString);
+            if (match !== null)
+            {
+                if (match.index === 0 && (stream.column() !== (match.index + match[0].length - 1))) {
+                    stream.backUp(stream.column());
+                    stream.skipTo(';');
+                    stream.next();
+                    return 'comment';
+                }
+                // the ';' triggers the match so move one past it to start
+                // the comment block that is why match.index+1
+                else if (match.index + 1 < stream.column() && stream.column() < match.index + match[0].length - 1) {
+                    stream.backUp(stream.column() - match.index - 1);
+                    stream.skipTo(';');
+                    stream.next();
+                    return 'comment';
+                }
+            }
+        // Have we found a string?
+        else
+            if (!state.continueString && (ch === '"' || ch === "'")) {
+                state.continueString = ch; //save the matching quote in the state
+                return "string";
+            }
+            else if (state.continueString !== null) {
+                if (stream.skipTo(state.continueString)) {
+                    // quote found on this line
+                    stream.next();
+                    state.continueString = null;
+                }
+                else {
+                    stream.skipToEnd();
+                }
+                return "string";
+            }
+            else if (state.continueString !== null && stream.eol()) {
+                stream.skipTo(state.continueString) || stream.skipToEnd();
+                return "string";
+            }
+            //find numbers
+            else if (/[\d\.]/.test(ch)) {
+                if (ch === ".") {
+                    stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
+                } else if (ch === "0") {
+                    stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
+                } else {
+                    stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
+                }
+                return "number";
+            }
+            // TWO SYMBOL TOKENS
+            else if (isDoubleOperatorChar.test(ch + stream.peek())) {
+                stream.next();
+                state.tokenize = null;
+                return "operator";
+            }
+            else if (isDoubleOperatorSym.hasOwnProperty(doubleOperator)) {
+                stream.next();
+                if (stream.peek() === ' ') {
+                    return isDoubleOperatorSym[doubleOperator.toLowerCase()];
+                }
+
+            }
+            // SINGLE SYMBOL TOKENS
+            else if (isSingleOperatorChar.test(ch)) {
+                state.tokenize = null;
+                return "operator";
+            }
+
+            // Matches one whole word -- even if the word is a character
+            var word;
+            if (stream.match(/[%&;\w]+/, false) != null) {
+                word = ch + stream.match(/[%&;\w]+/, true);
+                if (/&/.test(word)) {
+                    return 'variable'
+                }
+            }
+            else {
+
+                word = ch;
+            }
+            // the word after DATA PROC or MACRO
+            if (state.nextword) {
+                stream.match(/[\w]+/);
+                // match memname.libname
+                if (stream.peek() === '.') {
+                    stream.skipTo(' ');
+                }
+                state.nextword = false;
+                return 'variable-2';
+
+            }
+
+            // Are we in a DATA Step?
+            if (state.inDataStep) {
+                if (word.toLowerCase() === 'run;' || stream.match(/run\s;/)) {
+                    state.inDataStep = false;
+                    return 'builtin';
+                }
+                // variable formats
+                if ((word) && stream.next() === '.') {
+                    //either a format or libname.memname
+                    if (/\w/.test(stream.peek())) {
+                        //libname.memname
+                        return 'variable-2';
+                    }
+                    else {
+                        //format
+                        return 'variable';
+                    }
+                }
+                // do we have a DATA Step keyword
+                if (word && words.hasOwnProperty(word.toLowerCase()) && (words[word.toLowerCase()].state.indexOf("inDataStep") !== -1 || words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+                    //backup to the start of the word
+                    if (stream.start < stream.pos) {
+                        stream.backUp(stream.pos - stream.start);
+                    }
+                    //advance the length of the word and return
+                    for (var i = 0; i < word.length; ++i) {
+                        stream.next();
+                    }
+                    return words[word.toLowerCase()].style;
+                }
+
+
+            }
+            // Are we in an Proc statement?
+            if (state.inProc) {
+                if (word.toLowerCase() === 'run;' || word.toLowerCase() === 'quit;') {
+                    state.inProc = false;
+                    return 'builtin';
+                }
+                // do we have a proc keyword
+                if (word && words.hasOwnProperty(word.toLowerCase()) && (words[word.toLowerCase()].state.indexOf("inProc") !== -1 || words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+                    stream.match(/[\w]+/);
+                    return words[word].style;
+                }
+
+
+            }
+            // Are we in a Macro statement?
+            if (state.inMacro) {
+                if (word.toLowerCase() === '%mend') {
+                    if (stream.peek() === ';') {
+                        stream.next();
+                    }
+                    state.inMacro = false;
+                    return 'builtin';
+                }
+                if (word && words.hasOwnProperty(word.toLowerCase()) && (words[word.toLowerCase()].state.indexOf("inMacro") !== -1 || words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+                    stream.match(/[\w]+/);
+                    return words[word.toLowerCase()].style;
+                }
+
+                return 'atom';
+            }
+            // Do we have Keywords specific words?
+            if (word && words.hasOwnProperty(word.toLowerCase())) {
+                // Negates the initial next()
+                stream.backUp(1);
+                // Actually move the stream
+                stream.match(/[\w]+/);
+                if (word.toLowerCase() === 'data' && /=/.test(stream.peek()) === false) {
+                    state.inDataStep = true;
+                    state.nextword = true;
+                    return 'builtin';
+                }
+                if (word.toLowerCase() === 'proc') {
+                    state.inProc = true;
+                    state.nextword = true;
+                    return 'builtin';
+                }
+                if (word.toLowerCase() === '%macro') {
+                    state.inMacro = true;
+                    state.nextword = true;
+                    return 'builtin';
+                }
+                if (/title[1-9]/i.test(word/*+stream.peek()*/)) {
+                    //if (/title[1-9]/.test(word.toLowerCase()))  {
+                    //stream.next();
+                    return 'def';
+                }
+                if (word.toLowerCase() === 'footnote' && /[1-9]/.test(stream.peek())) {
+                    stream.eat();
+                    return 'def';
+                }
+                else if (word.toLowerCase() === 'footnote') {
+                    return 'def';
+                }
+
+                // Returns their value as state in the prior define methods
+                if (state.inDataStep === true && words[word.toLowerCase()].state.indexOf("inDataStep") !== -1) {
+                    return words[word.toLowerCase()].style;
+                }
+                else if (state.inProc === true && words[word.toLowerCase()].state.indexOf("inProc") !== -1) {
+                    return words[word.toLowerCase()].style;
+                }
+                else if (state.inMacro === true && words[word.toLowerCase()].state.indexOf("inMacro") !== -1) {
+                    return words[word.toLowerCase()].style;
+                }
+                else if (words[word.toLowerCase()].state.indexOf("ALL") !== -1) {
+                    return words[word.toLowerCase()].style;
+                }
+                else {
+                    return null;
+                }
+            }
+            // Return a blank line for everything else
+            return null;
+        }
+
+        // Start here
+        return {
+            startState: function () {
+                var state = {};
+                state.inDataStep = false;
+                state.inProc = false;
+                state.inMacro = false;
+                state.pending = false;
+                state.lastToken = null;
+                state.nextword = false;
+                state.continueString = null;
+                state.continueComment = false;
+                state.tokenize = null;
+                return state;
+            },
+            token: function (stream, state) {
+                if (state.tokenize != null) {
+                    return state.tokenize(stream, state);
+                }
+                // Strip the spaces, but regex will account for them either way
+                if (stream.eatSpace()) return null;
+                var style = state.tokenize;
+                if (style === "comment") return style;
+                // Go through the main process
+                return tokenize(stream, state);
+            },
+
+            blockCommentStart: "/*",
+            blockCommentEnd: "*/"
+        };
+
+    });
+
+    CodeMirror.defineMIME("text/x-sas", "sas");
+
+});

From 9389a050790e2be94530f34a3513e34602d39483 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 8 Apr 2016 16:44:18 +0200
Subject: [PATCH 2679/4742] [sas mode] Code style, integrate

Issue #3932
---
 mode/index.html     |   1 +
 mode/sas/index.html |  34 +--
 mode/sas/sas.js     | 624 ++++++++++++++++++++------------------------
 3 files changed, 294 insertions(+), 365 deletions(-)

diff --git a/mode/index.html b/mode/index.html
index 822f04fc61..be583159e1 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -114,6 +114,7 @@ <h2>Language modes</h2>
       <li><a href="rst/index.html">reStructuredText</a></li>
       <li><a href="ruby/index.html">Ruby</a></li>
       <li><a href="rust/index.html">Rust</a></li>
+      <li><a href="sas/index.html">SAS</a></li>
       <li><a href="sass/index.html">Sass</a></li>
       <li><a href="spreadsheet/index.html">Spreadsheet</a></li>
       <li><a href="clike/scala.html">Scala</a></li>
diff --git a/mode/sas/index.html b/mode/sas/index.html
index 80957403d5..636e06594b 100644
--- a/mode/sas/index.html
+++ b/mode/sas/index.html
@@ -6,15 +6,14 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/continuelist.js"></script>
 <script src="../xml/xml.js"></script>
 <script src="sas.js"></script>
 <style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .cm-s-default .cm-trailing-space-a:before,
-      .cm-s-default .cm-trailing-space-b:before {position: absolute; content: "\00B7"; color: #777;}
-      .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
-    </style>
+  .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+  .cm-s-default .cm-trailing-space-a:before,
+  .cm-s-default .cm-trailing-space-b:before {position: absolute; content: "\00B7"; color: #777;}
+  .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
+</style>
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
@@ -65,23 +64,18 @@ <h2>SAS mode</h2>
     create table foo as
     select * from sashelp.class;
 
-    select * 
+    select *
     from foo;
 quit;
-
 </textarea></form>
 
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: 'sas',
-        lineNumbers: true,
-        theme: "default",
-        extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"}
-      });
-    </script>
-
-   
-    <p><strong>MIME types defined:</strong> <code>text/x-sas</code>.</p>
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    mode: 'sas',
+    lineNumbers: true
+  });
+</script>
 
+<p><strong>MIME types defined:</strong> <code>text/x-sas</code>.</p>
 
-  </article>
+</article>
diff --git a/mode/sas/sas.js b/mode/sas/sas.js
index 4043bc7027..fe114827c0 100755
--- a/mode/sas/sas.js
+++ b/mode/sas/sas.js
@@ -21,361 +21,295 @@
 //  atom
 //  def
 
-
-(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(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("sas", function () {
+    var words = {};
+    var isDoubleOperatorSym = {
+      eq: 'operator',
+      lt: 'operator',
+      le: 'operator',
+      gt: 'operator',
+      ge: 'operator',
+      "in": 'operator',
+      ne: 'operator',
+      or: 'operator'
+    };
+    var isDoubleOperatorChar = /(<=|>=|!=|<>)/;
+    var isSingleOperatorChar = /[=\(:\),{}.*<>+\-\/^\[\]]/;
+
+    // Takes a string of words separated by spaces and adds them as
+    // keys with the value of the first argument 'style'
+    function define(style, string, context) {
+      if (context) {
+        var split = string.split(' ');
+        for (var i = 0; i < split.length; i++) {
+          words[split[i]] = {style: style, state: context};
+        }
+      }
     }
-})(function (CodeMirror) {
-    "use strict";
-
-    CodeMirror.defineMode("sas", function () {
-        var words = {};
-        var isDoubleOperatorSym = {
-            eq: 'operator',
-            lt: 'operator',
-            le: 'operator',
-            gt: 'operator',
-            ge: 'operator',
-            in: 'operator',
-            ne: 'operator',
-            or: 'operator'
-        };
-        var isDoubleOperatorChar = /(<=|>=|!=|<>)/;
-        var isSingleOperatorChar = /[=\(:\),{}.*<>+\-\/^\[\]]/;
-
-        // Takes a string of words separated by spaces and adds them as
-        // keys with the value of the first argument 'style'
-        var define = function (style, string, context) {
-            if (context) {
-                var split = string.split(' ');
-                for (var i = 0; i < split.length; i++) {
-                    words[split[i]] = {style: style, state: context};
-                }
-            }
-        };
-        //datastep
-        define('def', 'stack pgm view source debug nesting nolist', ['inDataStep']);
-        define('def', 'if while until for do do; end end; then else cancel', ['inDataStep']);
-        define('def', 'label format _n_ _error_', ['inDataStep']);
-        define('def', 'ALTER BUFNO BUFSIZE CNTLLEV COMPRESS DLDMGACTION ENCRYPT ENCRYPTKEY EXTENDOBSCOUNTER GENMAX GENNUM INDEX LABEL OBSBUF OUTREP PW PWREQ READ REPEMPTY REPLACE REUSE ROLE SORTEDBY SPILL TOBSNO TYPE WRITE FILECLOSE FIRSTOBS IN OBS POINTOBS WHERE WHEREUP IDXNAME IDXWHERE DROP KEEP RENAME', ['inDataStep']);
-        define('def', 'filevar finfo finv fipname fipnamel fipstate first firstobs floor', ['inDataStep']);
-        define('def', 'varfmt varinfmt varlabel varlen varname varnum varray varrayx vartype verify vformat vformatd vformatdx vformatn vformatnx vformatw vformatwx vformatx vinarray vinarrayx vinformat vinformatd vinformatdx vinformatn vinformatnx vinformatw vinformatwx vinformatx vlabel vlabelx vlength vlengthx vname vnamex vnferr vtype vtypex weekday', ['inDataStep']);
-        define('def', 'zipfips zipname zipnamel zipstate', ['inDataStep']);
-        define('def', 'put putc putn', ['inDataStep']);
-        define('builtin', 'data run', ['inDataStep']);
-
-
-        //proc
-        define('def', 'data', ['inProc']);
-
-        // flow control for macros
-        define('def', '%if %end %end; %else %else; %do %do; %then', ['inMacro']);
-
-        //everywhere
-        define('builtin', 'proc run; quit; libname filename %macro %mend option options', ['ALL']);
-
-        define('def', 'footnote title libname ods', ['ALL']);
-        define('def', '%let %put %global %sysfunc %eval ', ['ALL']);
-        // automatic macro variables http://support.sas.com/documentation/cdl/en/mcrolref/61885/HTML/default/viewer.htm#a003167023.htm
-        define('variable', '&sysbuffr &syscc &syscharwidth &syscmd &sysdate &sysdate9 &sysday &sysdevic &sysdmg &sysdsn &sysencoding &sysenv &syserr &syserrortext &sysfilrc &syshostname &sysindex &sysinfo &sysjobid &syslast &syslckrc &syslibrc &syslogapplname &sysmacroname &sysmenv &sysmsg &sysncpu &sysodspath &sysparm &syspbuff &sysprocessid &sysprocessname &sysprocname &sysrc &sysscp &sysscpl &sysscpl &syssite &sysstartid &sysstartname &systcpiphostname &systime &sysuserid &sysver &sysvlong &sysvlong4 &syswarningtext', ['ALL']);
-
-        //footnote[1-9]? title[1-9]?
-
-        //options statement
-        define('def', 'source2 nosource2 page pageno pagesize', ['ALL']);
-
-        //proc and datastep
-        define('def', '_all_ _character_ _cmd_ _freq_ _i_ _infile_ _last_ _msg_ _null_ _numeric_ _temporary_ _type_ abort abs addr adjrsq airy alpha alter altlog altprint and arcos array arsin as atan attrc attrib attrn authserver autoexec awscontrol awsdef awsmenu awsmenumerge awstitle backward band base betainv between blocksize blshift bnot bor brshift bufno bufsize bxor by byerr byline byte calculated call cards cards4 catcache cbufno cdf ceil center cexist change chisq cinv class cleanup close cnonct cntllev coalesce codegen col collate collin column comamid comaux1 comaux2 comdef compbl compound compress config continue convert cos cosh cpuid create cross crosstab css curobs cv daccdb daccdbsl daccsl daccsyd dacctab dairy datalines datalines4 datejul datepart datetime day dbcslang dbcstype dclose ddm delete delimiter depdb depdbsl depsl depsyd deptab dequote descending descript design= device dflang dhms dif digamma dim dinfo display distinct dkricond dkrocond dlm dnum do dopen doptname doptnum dread drop dropnote dsname dsnferr echo else emaildlg emailid emailpw emailserver emailsys encrypt end endsas engine eof eov erf erfc error errorcheck errors exist exp fappend fclose fcol fdelete feedback fetch fetchobs fexist fget file fileclose fileexist filefmt filename fileref  fmterr fmtsearch fnonct fnote font fontalias  fopen foptname foptnum force formatted formchar formdelim formdlim forward fpoint fpos fput fread frewind frlen from fsep fuzz fwrite gaminv gamma getoption getvarc getvarn go goto group gwindow hbar hbound helpenv helploc hms honorappearance hosthelp hostprint hour hpct html hvar ibessel ibr id if index indexc indexw initcmd initstmt inner input inputc inputn inr insert int intck intnx into intrr invaliddata irr is jbessel join juldate keep kentb kurtosis label lag last lbound leave left length levels lgamma lib  library libref line linesize link list log log10 log2 logpdf logpmf logsdf lostcard lowcase lrecl ls macro macrogen maps mautosource max maxdec maxr mdy mean measures median memtype merge merror min minute missing missover mlogic mod mode model modify month mopen mort mprint mrecall msglevel msymtabmax mvarsize myy n nest netpv new news nmiss no nobatch nobs nocaps nocardimage nocenter nocharcode nocmdmac nocol nocum nodate nodbcs nodetails nodmr nodms nodmsbatch nodup nodupkey noduplicates noechoauto noequals noerrorabend noexitwindows nofullstimer noicon noimplmac noint nolist noloadlist nomiss nomlogic nomprint nomrecall nomsgcase nomstored nomultenvappl nonotes nonumber noobs noovp nopad nopercent noprint noprintinit normal norow norsasuser nosetinit  nosplash nosymbolgen note notes notitle notitles notsorted noverbose noxsync noxwait npv null number numkeys nummousekeys nway obs  on open     order ordinal otherwise out outer outp= output over ovp p(1 5 10 25 50 75 90 95 99) pad pad2  paired parm parmcards path pathdll pathname pdf peek peekc pfkey pmf point poisson poke position printer probbeta probbnml probchi probf probgam probhypr probit probnegb probnorm probsig probt procleave prt ps  pw pwreq qtr quote r ranbin rancau ranexp rangam range ranks rannor ranpoi rantbl rantri ranuni read recfm register regr remote remove rename repeat replace resolve retain return reuse reverse rewind right round rsquare rtf rtrace rtraceloc s s2 samploc sasautos sascontrol sasfrscr sasmsg sasmstore sasscript sasuser saving scan sdf second select selection separated seq serror set setcomm setot sign simple sin sinh siteinfo skewness skip sle sls sortedby sortpgm sortseq sortsize soundex  spedis splashlocation split spool sqrt start std stderr stdin stfips stimer stname stnamel stop stopover subgroup subpopn substr sum sumwgt symbol symbolgen symget symput sysget sysin sysleave sysmsg sysparm sysprint sysprintfont sysprod sysrc system t table tables tan tanh tapeclose tbufsize terminal test then timepart tinv  tnonct to today tol tooldef totper transformout translate trantab tranwrd trigamma trim trimn trunc truncover type unformatted uniform union until upcase update user usericon uss validate value var  weight when where while wincharset window work workinit workterm write wsum xsync xwait yearcutoff yes yyq  min max', ['inDataStep', 'inProc']);
-        define('operator', 'and not ', ['inDataStep', 'inProc']);
-
-        // Main function
-        function tokenize(stream, state) {
-            // Finally advance the stream
-            var ch = stream.next();
-
-            // BLOCKCOMMENT
-            if (ch === '/' && stream.eat('*')) {
-                state.continueComment = true;
-                return "comment";
-            }
-            // in comment block
-            else if (state.continueComment === true) {
-                //comment ends at the beginning of the line
-                if (ch === '*' && stream.peek() === '/') {
-                    stream.next();
-                    state.continueComment = false;
-                }
-                //comment is potentially later in line
-                else if (stream.skipTo('*')) {
-                    stream.skipTo('*');
-                    stream.next();
-                    if (stream.eat('/')) {
-                        state.continueComment = false;
-                    }
-                }
-                else {
-                    stream.skipToEnd();
-                }
-                return "comment";
-            }
-
-            // DoubleOperator match
-            var doubleOperator = ch + stream.peek();
-
-            // Match all line comments.
-            var myString = stream.string;
-            var myRegexp = /(?:^\s*|[;]\s*)(\*.*?);/ig;
-            var match = myRegexp.exec(myString);
-            if (match !== null)
-            {
-                if (match.index === 0 && (stream.column() !== (match.index + match[0].length - 1))) {
-                    stream.backUp(stream.column());
-                    stream.skipTo(';');
-                    stream.next();
-                    return 'comment';
-                }
-                // the ';' triggers the match so move one past it to start
-                // the comment block that is why match.index+1
-                else if (match.index + 1 < stream.column() && stream.column() < match.index + match[0].length - 1) {
-                    stream.backUp(stream.column() - match.index - 1);
-                    stream.skipTo(';');
-                    stream.next();
-                    return 'comment';
-                }
-            }
+    //datastep
+    define('def', 'stack pgm view source debug nesting nolist', ['inDataStep']);
+    define('def', 'if while until for do do; end end; then else cancel', ['inDataStep']);
+    define('def', 'label format _n_ _error_', ['inDataStep']);
+    define('def', 'ALTER BUFNO BUFSIZE CNTLLEV COMPRESS DLDMGACTION ENCRYPT ENCRYPTKEY EXTENDOBSCOUNTER GENMAX GENNUM INDEX LABEL OBSBUF OUTREP PW PWREQ READ REPEMPTY REPLACE REUSE ROLE SORTEDBY SPILL TOBSNO TYPE WRITE FILECLOSE FIRSTOBS IN OBS POINTOBS WHERE WHEREUP IDXNAME IDXWHERE DROP KEEP RENAME', ['inDataStep']);
+    define('def', 'filevar finfo finv fipname fipnamel fipstate first firstobs floor', ['inDataStep']);
+    define('def', 'varfmt varinfmt varlabel varlen varname varnum varray varrayx vartype verify vformat vformatd vformatdx vformatn vformatnx vformatw vformatwx vformatx vinarray vinarrayx vinformat vinformatd vinformatdx vinformatn vinformatnx vinformatw vinformatwx vinformatx vlabel vlabelx vlength vlengthx vname vnamex vnferr vtype vtypex weekday', ['inDataStep']);
+    define('def', 'zipfips zipname zipnamel zipstate', ['inDataStep']);
+    define('def', 'put putc putn', ['inDataStep']);
+    define('builtin', 'data run', ['inDataStep']);
+
+
+    //proc
+    define('def', 'data', ['inProc']);
+
+    // flow control for macros
+    define('def', '%if %end %end; %else %else; %do %do; %then', ['inMacro']);
+
+    //everywhere
+    define('builtin', 'proc run; quit; libname filename %macro %mend option options', ['ALL']);
+
+    define('def', 'footnote title libname ods', ['ALL']);
+    define('def', '%let %put %global %sysfunc %eval ', ['ALL']);
+    // automatic macro variables http://support.sas.com/documentation/cdl/en/mcrolref/61885/HTML/default/viewer.htm#a003167023.htm
+    define('variable', '&sysbuffr &syscc &syscharwidth &syscmd &sysdate &sysdate9 &sysday &sysdevic &sysdmg &sysdsn &sysencoding &sysenv &syserr &syserrortext &sysfilrc &syshostname &sysindex &sysinfo &sysjobid &syslast &syslckrc &syslibrc &syslogapplname &sysmacroname &sysmenv &sysmsg &sysncpu &sysodspath &sysparm &syspbuff &sysprocessid &sysprocessname &sysprocname &sysrc &sysscp &sysscpl &sysscpl &syssite &sysstartid &sysstartname &systcpiphostname &systime &sysuserid &sysver &sysvlong &sysvlong4 &syswarningtext', ['ALL']);
+
+    //footnote[1-9]? title[1-9]?
+
+    //options statement
+    define('def', 'source2 nosource2 page pageno pagesize', ['ALL']);
+
+    //proc and datastep
+    define('def', '_all_ _character_ _cmd_ _freq_ _i_ _infile_ _last_ _msg_ _null_ _numeric_ _temporary_ _type_ abort abs addr adjrsq airy alpha alter altlog altprint and arcos array arsin as atan attrc attrib attrn authserver autoexec awscontrol awsdef awsmenu awsmenumerge awstitle backward band base betainv between blocksize blshift bnot bor brshift bufno bufsize bxor by byerr byline byte calculated call cards cards4 catcache cbufno cdf ceil center cexist change chisq cinv class cleanup close cnonct cntllev coalesce codegen col collate collin column comamid comaux1 comaux2 comdef compbl compound compress config continue convert cos cosh cpuid create cross crosstab css curobs cv daccdb daccdbsl daccsl daccsyd dacctab dairy datalines datalines4 datejul datepart datetime day dbcslang dbcstype dclose ddm delete delimiter depdb depdbsl depsl depsyd deptab dequote descending descript design= device dflang dhms dif digamma dim dinfo display distinct dkricond dkrocond dlm dnum do dopen doptname doptnum dread drop dropnote dsname dsnferr echo else emaildlg emailid emailpw emailserver emailsys encrypt end endsas engine eof eov erf erfc error errorcheck errors exist exp fappend fclose fcol fdelete feedback fetch fetchobs fexist fget file fileclose fileexist filefmt filename fileref  fmterr fmtsearch fnonct fnote font fontalias  fopen foptname foptnum force formatted formchar formdelim formdlim forward fpoint fpos fput fread frewind frlen from fsep fuzz fwrite gaminv gamma getoption getvarc getvarn go goto group gwindow hbar hbound helpenv helploc hms honorappearance hosthelp hostprint hour hpct html hvar ibessel ibr id if index indexc indexw initcmd initstmt inner input inputc inputn inr insert int intck intnx into intrr invaliddata irr is jbessel join juldate keep kentb kurtosis label lag last lbound leave left length levels lgamma lib  library libref line linesize link list log log10 log2 logpdf logpmf logsdf lostcard lowcase lrecl ls macro macrogen maps mautosource max maxdec maxr mdy mean measures median memtype merge merror min minute missing missover mlogic mod mode model modify month mopen mort mprint mrecall msglevel msymtabmax mvarsize myy n nest netpv new news nmiss no nobatch nobs nocaps nocardimage nocenter nocharcode nocmdmac nocol nocum nodate nodbcs nodetails nodmr nodms nodmsbatch nodup nodupkey noduplicates noechoauto noequals noerrorabend noexitwindows nofullstimer noicon noimplmac noint nolist noloadlist nomiss nomlogic nomprint nomrecall nomsgcase nomstored nomultenvappl nonotes nonumber noobs noovp nopad nopercent noprint noprintinit normal norow norsasuser nosetinit  nosplash nosymbolgen note notes notitle notitles notsorted noverbose noxsync noxwait npv null number numkeys nummousekeys nway obs  on open     order ordinal otherwise out outer outp= output over ovp p(1 5 10 25 50 75 90 95 99) pad pad2  paired parm parmcards path pathdll pathname pdf peek peekc pfkey pmf point poisson poke position printer probbeta probbnml probchi probf probgam probhypr probit probnegb probnorm probsig probt procleave prt ps  pw pwreq qtr quote r ranbin rancau ranexp rangam range ranks rannor ranpoi rantbl rantri ranuni read recfm register regr remote remove rename repeat replace resolve retain return reuse reverse rewind right round rsquare rtf rtrace rtraceloc s s2 samploc sasautos sascontrol sasfrscr sasmsg sasmstore sasscript sasuser saving scan sdf second select selection separated seq serror set setcomm setot sign simple sin sinh siteinfo skewness skip sle sls sortedby sortpgm sortseq sortsize soundex  spedis splashlocation split spool sqrt start std stderr stdin stfips stimer stname stnamel stop stopover subgroup subpopn substr sum sumwgt symbol symbolgen symget symput sysget sysin sysleave sysmsg sysparm sysprint sysprintfont sysprod sysrc system t table tables tan tanh tapeclose tbufsize terminal test then timepart tinv  tnonct to today tol tooldef totper transformout translate trantab tranwrd trigamma trim trimn trunc truncover type unformatted uniform union until upcase update user usericon uss validate value var  weight when where while wincharset window work workinit workterm write wsum xsync xwait yearcutoff yes yyq  min max', ['inDataStep', 'inProc']);
+    define('operator', 'and not ', ['inDataStep', 'inProc']);
+
+    // Main function
+    function tokenize(stream, state) {
+      // Finally advance the stream
+      var ch = stream.next();
+
+      // BLOCKCOMMENT
+      if (ch === '/' && stream.eat('*')) {
+        state.continueComment = true;
+        return "comment";
+      } else if (state.continueComment === true) { // in comment block
+        //comment ends at the beginning of the line
+        if (ch === '*' && stream.peek() === '/') {
+          stream.next();
+          state.continueComment = false;
+        } else if (stream.skipTo('*')) { //comment is potentially later in line
+          stream.skipTo('*');
+          stream.next();
+          if (stream.eat('/'))
+            state.continueComment = false;
+        } else {
+          stream.skipToEnd();
+        }
+        return "comment";
+      }
+
+      // DoubleOperator match
+      var doubleOperator = ch + stream.peek();
+
+      // Match all line comments.
+      var myString = stream.string;
+      var myRegexp = /(?:^\s*|[;]\s*)(\*.*?);/ig;
+      var match = myRegexp.exec(myString);
+      if (match !== null) {
+        if (match.index === 0 && (stream.column() !== (match.index + match[0].length - 1))) {
+          stream.backUp(stream.column());
+          stream.skipTo(';');
+          stream.next();
+          return 'comment';
+        } else if (match.index + 1 < stream.column() && stream.column() < match.index + match[0].length - 1) {
+          // the ';' triggers the match so move one past it to start
+          // the comment block that is why match.index+1
+          stream.backUp(stream.column() - match.index - 1);
+          stream.skipTo(';');
+          stream.next();
+          return 'comment';
+        }
+      } else if (!state.continueString && (ch === '"' || ch === "'")) {
         // Have we found a string?
+        state.continueString = ch; //save the matching quote in the state
+        return "string";
+      } else if (state.continueString !== null) {
+        if (stream.skipTo(state.continueString)) {
+          // quote found on this line
+          stream.next();
+          state.continueString = null;
+        } else {
+          stream.skipToEnd();
+        }
+        return "string";
+      } else if (state.continueString !== null && stream.eol()) {
+        stream.skipTo(state.continueString) || stream.skipToEnd();
+        return "string";
+      } else if (/[\d\.]/.test(ch)) { //find numbers
+        if (ch === ".")
+          stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
+        else if (ch === "0")
+          stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
         else
-            if (!state.continueString && (ch === '"' || ch === "'")) {
-                state.continueString = ch; //save the matching quote in the state
-                return "string";
-            }
-            else if (state.continueString !== null) {
-                if (stream.skipTo(state.continueString)) {
-                    // quote found on this line
-                    stream.next();
-                    state.continueString = null;
-                }
-                else {
-                    stream.skipToEnd();
-                }
-                return "string";
-            }
-            else if (state.continueString !== null && stream.eol()) {
-                stream.skipTo(state.continueString) || stream.skipToEnd();
-                return "string";
-            }
-            //find numbers
-            else if (/[\d\.]/.test(ch)) {
-                if (ch === ".") {
-                    stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
-                } else if (ch === "0") {
-                    stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
-                } else {
-                    stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
-                }
-                return "number";
-            }
-            // TWO SYMBOL TOKENS
-            else if (isDoubleOperatorChar.test(ch + stream.peek())) {
-                stream.next();
-                state.tokenize = null;
-                return "operator";
-            }
-            else if (isDoubleOperatorSym.hasOwnProperty(doubleOperator)) {
-                stream.next();
-                if (stream.peek() === ' ') {
-                    return isDoubleOperatorSym[doubleOperator.toLowerCase()];
-                }
-
-            }
-            // SINGLE SYMBOL TOKENS
-            else if (isSingleOperatorChar.test(ch)) {
-                state.tokenize = null;
-                return "operator";
-            }
-
-            // Matches one whole word -- even if the word is a character
-            var word;
-            if (stream.match(/[%&;\w]+/, false) != null) {
-                word = ch + stream.match(/[%&;\w]+/, true);
-                if (/&/.test(word)) {
-                    return 'variable'
-                }
-            }
-            else {
-
-                word = ch;
-            }
-            // the word after DATA PROC or MACRO
-            if (state.nextword) {
-                stream.match(/[\w]+/);
-                // match memname.libname
-                if (stream.peek() === '.') {
-                    stream.skipTo(' ');
-                }
-                state.nextword = false;
-                return 'variable-2';
-
-            }
-
-            // Are we in a DATA Step?
-            if (state.inDataStep) {
-                if (word.toLowerCase() === 'run;' || stream.match(/run\s;/)) {
-                    state.inDataStep = false;
-                    return 'builtin';
-                }
-                // variable formats
-                if ((word) && stream.next() === '.') {
-                    //either a format or libname.memname
-                    if (/\w/.test(stream.peek())) {
-                        //libname.memname
-                        return 'variable-2';
-                    }
-                    else {
-                        //format
-                        return 'variable';
-                    }
-                }
-                // do we have a DATA Step keyword
-                if (word && words.hasOwnProperty(word.toLowerCase()) && (words[word.toLowerCase()].state.indexOf("inDataStep") !== -1 || words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
-                    //backup to the start of the word
-                    if (stream.start < stream.pos) {
-                        stream.backUp(stream.pos - stream.start);
-                    }
-                    //advance the length of the word and return
-                    for (var i = 0; i < word.length; ++i) {
-                        stream.next();
-                    }
-                    return words[word.toLowerCase()].style;
-                }
-
-
-            }
-            // Are we in an Proc statement?
-            if (state.inProc) {
-                if (word.toLowerCase() === 'run;' || word.toLowerCase() === 'quit;') {
-                    state.inProc = false;
-                    return 'builtin';
-                }
-                // do we have a proc keyword
-                if (word && words.hasOwnProperty(word.toLowerCase()) && (words[word.toLowerCase()].state.indexOf("inProc") !== -1 || words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
-                    stream.match(/[\w]+/);
-                    return words[word].style;
-                }
-
-
-            }
-            // Are we in a Macro statement?
-            if (state.inMacro) {
-                if (word.toLowerCase() === '%mend') {
-                    if (stream.peek() === ';') {
-                        stream.next();
-                    }
-                    state.inMacro = false;
-                    return 'builtin';
-                }
-                if (word && words.hasOwnProperty(word.toLowerCase()) && (words[word.toLowerCase()].state.indexOf("inMacro") !== -1 || words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
-                    stream.match(/[\w]+/);
-                    return words[word.toLowerCase()].style;
-                }
+          stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
+        return "number";
+      } else if (isDoubleOperatorChar.test(ch + stream.peek())) { // TWO SYMBOL TOKENS
+        stream.next();
+        return "operator";
+      } else if (isDoubleOperatorSym.hasOwnProperty(doubleOperator)) {
+        stream.next();
+        if (stream.peek() === ' ')
+          return isDoubleOperatorSym[doubleOperator.toLowerCase()];
+      } else if (isSingleOperatorChar.test(ch)) { // SINGLE SYMBOL TOKENS
+        return "operator";
+      }
+
+      // Matches one whole word -- even if the word is a character
+      var word;
+      if (stream.match(/[%&;\w]+/, false) != null) {
+        word = ch + stream.match(/[%&;\w]+/, true);
+        if (/&/.test(word)) return 'variable'
+      } else {
+        word = ch;
+      }
+      // the word after DATA PROC or MACRO
+      if (state.nextword) {
+        stream.match(/[\w]+/);
+        // match memname.libname
+        if (stream.peek() === '.') stream.skipTo(' ');
+        state.nextword = false;
+        return 'variable-2';
+
+      }
+
+      // Are we in a DATA Step?
+      if (state.inDataStep) {
+        if (word.toLowerCase() === 'run;' || stream.match(/run\s;/)) {
+          state.inDataStep = false;
+          return 'builtin';
+        }
+        // variable formats
+        if ((word) && stream.next() === '.') {
+          //either a format or libname.memname
+          if (/\w/.test(stream.peek())) return 'variable-2';
+          else return 'variable';
+        }
+        // do we have a DATA Step keyword
+        if (word && words.hasOwnProperty(word.toLowerCase()) &&
+            (words[word.toLowerCase()].state.indexOf("inDataStep") !== -1 ||
+             words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+          //backup to the start of the word
+          if (stream.start < stream.pos)
+            stream.backUp(stream.pos - stream.start);
+          //advance the length of the word and return
+          for (var i = 0; i < word.length; ++i) stream.next();
+          return words[word.toLowerCase()].style;
+        }
+      }
+      // Are we in an Proc statement?
+      if (state.inProc) {
+        if (word.toLowerCase() === 'run;' || word.toLowerCase() === 'quit;') {
+          state.inProc = false;
+          return 'builtin';
+        }
+        // do we have a proc keyword
+        if (word && words.hasOwnProperty(word.toLowerCase()) &&
+            (words[word.toLowerCase()].state.indexOf("inProc") !== -1 ||
+             words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+          stream.match(/[\w]+/);
+          return words[word].style;
+        }
+      }
+      // Are we in a Macro statement?
+      if (state.inMacro) {
+        if (word.toLowerCase() === '%mend') {
+          if (stream.peek() === ';') stream.next();
+          state.inMacro = false;
+          return 'builtin';
+        }
+        if (word && words.hasOwnProperty(word.toLowerCase()) &&
+            (words[word.toLowerCase()].state.indexOf("inMacro") !== -1 ||
+             words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+          stream.match(/[\w]+/);
+          return words[word.toLowerCase()].style;
+        }
 
-                return 'atom';
-            }
-            // Do we have Keywords specific words?
-            if (word && words.hasOwnProperty(word.toLowerCase())) {
-                // Negates the initial next()
-                stream.backUp(1);
-                // Actually move the stream
-                stream.match(/[\w]+/);
-                if (word.toLowerCase() === 'data' && /=/.test(stream.peek()) === false) {
-                    state.inDataStep = true;
-                    state.nextword = true;
-                    return 'builtin';
-                }
-                if (word.toLowerCase() === 'proc') {
-                    state.inProc = true;
-                    state.nextword = true;
-                    return 'builtin';
-                }
-                if (word.toLowerCase() === '%macro') {
-                    state.inMacro = true;
-                    state.nextword = true;
-                    return 'builtin';
-                }
-                if (/title[1-9]/i.test(word/*+stream.peek()*/)) {
-                    //if (/title[1-9]/.test(word.toLowerCase()))  {
-                    //stream.next();
-                    return 'def';
-                }
-                if (word.toLowerCase() === 'footnote' && /[1-9]/.test(stream.peek())) {
-                    stream.eat();
-                    return 'def';
-                }
-                else if (word.toLowerCase() === 'footnote') {
-                    return 'def';
-                }
+        return 'atom';
+      }
+      // Do we have Keywords specific words?
+      if (word && words.hasOwnProperty(word.toLowerCase())) {
+        // Negates the initial next()
+        stream.backUp(1);
+        // Actually move the stream
+        stream.match(/[\w]+/);
+        if (word.toLowerCase() === 'data' && /=/.test(stream.peek()) === false) {
+          state.inDataStep = true;
+          state.nextword = true;
+          return 'builtin';
+        }
+        if (word.toLowerCase() === 'proc') {
+          state.inProc = true;
+          state.nextword = true;
+          return 'builtin';
+        }
+        if (word.toLowerCase() === '%macro') {
+          state.inMacro = true;
+          state.nextword = true;
+          return 'builtin';
+        }
+        if (/title[1-9]/i.test(word)) return 'def';
 
-                // Returns their value as state in the prior define methods
-                if (state.inDataStep === true && words[word.toLowerCase()].state.indexOf("inDataStep") !== -1) {
-                    return words[word.toLowerCase()].style;
-                }
-                else if (state.inProc === true && words[word.toLowerCase()].state.indexOf("inProc") !== -1) {
-                    return words[word.toLowerCase()].style;
-                }
-                else if (state.inMacro === true && words[word.toLowerCase()].state.indexOf("inMacro") !== -1) {
-                    return words[word.toLowerCase()].style;
-                }
-                else if (words[word.toLowerCase()].state.indexOf("ALL") !== -1) {
-                    return words[word.toLowerCase()].style;
-                }
-                else {
-                    return null;
-                }
-            }
-            // Return a blank line for everything else
-            return null;
+        if (word.toLowerCase() === 'footnote') {
+          stream.eat(/[1-9]/);
+          return 'def';
         }
 
-        // Start here
-        return {
-            startState: function () {
-                var state = {};
-                state.inDataStep = false;
-                state.inProc = false;
-                state.inMacro = false;
-                state.pending = false;
-                state.lastToken = null;
-                state.nextword = false;
-                state.continueString = null;
-                state.continueComment = false;
-                state.tokenize = null;
-                return state;
-            },
-            token: function (stream, state) {
-                if (state.tokenize != null) {
-                    return state.tokenize(stream, state);
-                }
-                // Strip the spaces, but regex will account for them either way
-                if (stream.eatSpace()) return null;
-                var style = state.tokenize;
-                if (style === "comment") return style;
-                // Go through the main process
-                return tokenize(stream, state);
-            },
+        // Returns their value as state in the prior define methods
+        if (state.inDataStep === true && words[word.toLowerCase()].state.indexOf("inDataStep") !== -1)
+          return words[word.toLowerCase()].style;
+        if (state.inProc === true && words[word.toLowerCase()].state.indexOf("inProc") !== -1)
+          return words[word.toLowerCase()].style;
+        if (state.inMacro === true && words[word.toLowerCase()].state.indexOf("inMacro") !== -1)
+          return words[word.toLowerCase()].style;
+        if (words[word.toLowerCase()].state.indexOf("ALL") !== -1)
+          return words[word.toLowerCase()].style;
+        return null;
+      }
+      // Unrecognized syntax
+      return null;
+    }
 
-            blockCommentStart: "/*",
-            blockCommentEnd: "*/"
+    return {
+      startState: function () {
+        return {
+          inDataStep: false,
+          inProc: false,
+          inMacro: false,
+          nextword: false,
+          continueString: null,
+          continueComment: false
         };
+      },
+      token: function (stream, state) {
+        // Strip the spaces, but regex will account for them either way
+        if (stream.eatSpace()) return null;
+        // Go through the main process
+        return tokenize(stream, state);
+      },
 
-    });
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/"
+    };
 
-    CodeMirror.defineMIME("text/x-sas", "sas");
+  });
 
+  CodeMirror.defineMIME("text/x-sas", "sas");
 });

From 90ef4bd80c92d22b029aec376c3907e631f93e4e Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Sun, 10 Apr 2016 04:58:59 -0700
Subject: [PATCH 2680/4742] [sublime keymap] Use goLineStartSmart for cmd-left

---
 keymap/sublime.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 49db3b871c..3cf67413ab 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -55,6 +55,8 @@
   cmds[map["Alt-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
   cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
 
+  if (mac) map["Cmd-Left"] = "goLineStartSmart";
+
   var scrollLineCombo = mac ? "Ctrl-Alt-" : "Ctrl-";
 
   cmds[map[scrollLineCombo + "Up"] = "scrollLineUp"] = function(cm) {

From f486fcd0572c0fd070739eb12b2269373120c974 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Apr 2016 09:53:23 +0200
Subject: [PATCH 2681/4742] [comment addon] Don't toggle comments inside
 multi-line strings

Issue #3941
---
 addon/comment/comment.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 3aa468089e..2c4f975d08 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -44,9 +44,17 @@
     }
   });
 
+  // Rough heuristic to try and detect lines that are part of multi-line string
+  function probablyInsideString(cm, pos, line) {
+    return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"`]/.test(line)
+  }
+
   CodeMirror.defineExtension("lineComment", function(from, to, options) {
     if (!options) options = noOptions;
     var self = this, mode = self.getModeAt(from);
+    var firstLine = self.getLine(from.line);
+    if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
+
     var commentString = options.lineComment || mode.lineComment;
     if (!commentString) {
       if (options.blockCommentStart || mode.blockCommentStart) {
@@ -55,8 +63,7 @@
       }
       return;
     }
-    var firstLine = self.getLine(from.line);
-    if (firstLine == null) return;
+
     var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
     var pad = options.padding == null ? " " : options.padding;
     var blankLines = options.commentBlankLines || from.line == to.line;

From 44410cd64888e041d84bb50348b6b227cfb23726 Mon Sep 17 00:00:00 2001
From: James Howard <jameshoward@mac.com>
Date: Mon, 11 Apr 2016 13:23:01 -0700
Subject: [PATCH 2682/4742] [gfm mode] Fix fenced code block mode switching for
 objective-c

There were two issues:

1. Github flavored markdown calls Objective C `objective-c`
2. The gfm.js mode didn't include `-` in its fenced code block regex

Additionally, test/index.html did not import the mode/meta.js file,
which prevented mode lookup by name from working in unit tests.
---
 mode/gfm/test.js          | 6 ++++++
 mode/markdown/markdown.js | 2 +-
 mode/meta.js              | 2 +-
 test/index.html           | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 0dcd3619a3..7a1a4ccf21 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -51,6 +51,12 @@
      "[comment ```]",
      "bar");
 
+  MT("fencedCodeBlockModeSwitchingObjc",
+     "[comment ```objective-c]",
+     "[keyword @property] [variable NSString] [operator *] [variable foo];",
+     "[comment ```]",
+     "bar");
+
   MT("fencedCodeBlocksNoTildes",
      "~~~",
      "foo",
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index a6942b39c8..8bd3cc7a25 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -88,7 +88,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
   ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
-                                ")[ \\t]*([\\w+#]*)");
+                                ")[ \\t]*([\\w+#\-]*)");
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
diff --git a/mode/meta.js b/mode/meta.js
index f93078c00b..6980593ffc 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -91,7 +91,7 @@
     {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
     {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
     {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
-    {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
+    {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
     {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
diff --git a/test/index.html b/test/index.html
index 1612ed0867..68dc4dfc06 100644
--- a/test/index.html
+++ b/test/index.html
@@ -8,6 +8,7 @@
 <link rel="stylesheet" href="mode_test.css">
 <script src="../doc/activebookmark.js"></script>
 <script src="../lib/codemirror.js"></script>
+<script src="../mode/meta.js"></script>
 <script src="../addon/mode/overlay.js"></script>
 <script src="../addon/mode/multiplex.js"></script>
 <script src="../addon/search/searchcursor.js"></script>

From 0374f3f35ad6f1320a0dba69532c5fda6586aad6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 13 Apr 2016 20:35:30 +0200
Subject: [PATCH 2683/4742] Use Shift-Meta-drag for rectangular selection on
 Chrome OS

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 19baf0098f..70e3fec539 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -41,6 +41,7 @@
   // This is woefully incomplete. Suggestions for alternative methods welcome.
   var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
   var mac = ios || /Mac/.test(platform);
+  var chromeOS = /\bCrOS\b/.test(userAgent);
   var windows = /win/i.test(platform);
 
   var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
@@ -3680,7 +3681,7 @@
       ourIndex = doc.sel.primIndex;
     }
 
-    if (e.altKey) {
+    if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
       type = "rect";
       if (!addNew) ourRange = new Range(start, start);
       start = posFromMouse(cm, e, true, true);

From 060445d17afa190fd6959c85b98e5bad263dbd53 Mon Sep 17 00:00:00 2001
From: Grzegorz Mazur <teoretyk@gmail.com>
Date: Sun, 17 Apr 2016 08:17:59 +0200
Subject: [PATCH 2684/4742] [yacas mode] fix multiline comments

---
 mode/yacas/yacas.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/yacas/yacas.js b/mode/yacas/yacas.js
index 2967382b43..51399fbf59 100644
--- a/mode/yacas/yacas.js
+++ b/mode/yacas/yacas.js
@@ -111,11 +111,12 @@ CodeMirror.defineMode('yacas', function(_config, _parserConfig) {
   function tokenComment(stream, state) {
     var prev, next;
     while((next = stream.next()) != null) {
-      if (prev === '*' && next === '/')
+      if (prev === '*' && next === '/') {
+        state.tokenize = tokenBase;
         break;
+      }
       prev = next;
     }
-    state.tokenize = tokenBase;
     return 'comment';
   }
 

From 479cc65f9f4ab5af43456588dfc398e85c6ef6ec Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 16 Apr 2016 16:14:30 -0700
Subject: [PATCH 2685/4742] [webidl mode] Fix stream handling

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

diff --git a/mode/webidl/webidl.js b/mode/webidl/webidl.js
index 6f024c63f8..814333620a 100644
--- a/mode/webidl/webidl.js
+++ b/mode/webidl/webidl.js
@@ -85,6 +85,7 @@ var singleOperators = /^[:<=>?]/;
 var integers = /^-?([1-9][0-9]*|0[Xx][0-9A-Fa-f]+|0[0-7]*)/;
 var floats = /^-?(([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([Ee][+-]?[0-9]+)?|[0-9]+[Ee][+-]?[0-9]+)/;
 var identifiers = /^_?[A-Za-z][0-9A-Z_a-z-]*/;
+var identifiersEnd = /^_?[A-Za-z][0-9A-Z_a-z-]*(?=\s*;)/;
 var strings = /^"[^"]*"/;
 var multilineComments = /^\/\*.*?\*\//;
 var multilineCommentsStart = /^\/\*.*/;
@@ -122,12 +123,11 @@ function readToken(stream, state) {
   if (stream.match(strings)) return "string";
 
   // identifier
-  if (stream.match(identifiers)) {
-    if (state.startDef) return "def";
-    if (state.endDef && stream.match(/^\s*;/, false)) {
-      state.endDef = false;
-      return "def";
-    }
+  if (state.startDef && stream.match(identifiers)) return "def";
+
+  if (state.endDef && stream.match(identifiersEnd)) {
+    state.endDef = false;
+    return "def";
   }
 
   if (stream.match(keywords)) return "keyword";

From aa9808798ad9624912049be1ad17a02ebd75207d Mon Sep 17 00:00:00 2001
From: Grzegorz Mazur <teoretyk@gmail.com>
Date: Mon, 18 Apr 2016 13:48:38 +0200
Subject: [PATCH 2686/4742] [yacas mode] Implement indentation

---
 mode/yacas/yacas.js | 67 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/mode/yacas/yacas.js b/mode/yacas/yacas.js
index 51399fbf59..30bd60b2ff 100644
--- a/mode/yacas/yacas.js
+++ b/mode/yacas/yacas.js
@@ -16,6 +16,19 @@
 
 CodeMirror.defineMode('yacas', function(_config, _parserConfig) {
 
+  function words(str) {
+    var obj = {}, words = str.split(" ");
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  var bodiedOps = words("Assert BackQuote D Defun Deriv For ForEach FromFile " +
+                        "FromString Function Integrate InverseTaylor Limit " +
+                        "LocalSymbols Macro MacroRule MacroRulePattern " +
+                        "NIntegrate Rule RulePattern Subst TD TExplicitSum " +
+                        "TSum Taylor Taylor1 Taylor2 Taylor3 ToFile " +
+                        "ToStdout ToString TraceRule Until While");
+
   // patterns
   var pFloatForm  = "(?:(?:\\.\\d+|\\d+\\.\\d*|\\d+)(?:[eE][+-]?\\d+)?)";
   var pIdentifier = "(?:[a-zA-Z\\$'][a-zA-Z0-9\\$']*)";
@@ -53,6 +66,33 @@ CodeMirror.defineMode('yacas', function(_config, _parserConfig) {
     // go back one character
     stream.backUp(1);
 
+    // update scope info
+    var m = stream.match(/^(\w+)\s*\(/, false);
+    if (m !== null && bodiedOps.hasOwnProperty(m[1]))
+      state.scopes.push('bodied');
+
+    var scope = currentScope(state);
+
+    if (scope === 'bodied' && ch === '[')
+      state.scopes.pop();
+
+    if (ch === '[' || ch === '{' || ch === '(')
+      state.scopes.push(ch);
+
+    scope = currentScope(state);
+
+    if (scope === '[' && ch === ']' ||
+        scope === '{' && ch === '}' ||
+        scope === '(' && ch === ')')
+      state.scopes.pop();
+
+    if (ch === ';') {
+      while (scope === 'bodied') {
+        state.scopes.pop();
+        scope = currentScope(state);
+      }
+    }
+
     // look for ordered rules
     if (stream.match(/\d+ *#/, true, false)) {
       return 'qualifier';
@@ -120,12 +160,37 @@ CodeMirror.defineMode('yacas', function(_config, _parserConfig) {
     return 'comment';
   }
 
+  function currentScope(state) {
+    var scope = null;
+    if (state.scopes.length > 0)
+      scope = state.scopes[state.scopes.length - 1];
+    return scope;
+  }
+
   return {
-    startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
+    startState: function() {
+      return {
+        tokenize: tokenBase,
+        scopes: []
+      };
+    },
     token: function(stream, state) {
       if (stream.eatSpace()) return null;
       return state.tokenize(stream, state);
     },
+    indent: function(state, textAfter) {
+      if (state.tokenize !== tokenBase && state.tokenize !== null)
+        return CodeMirror.Pass;
+
+      var delta = 0;
+      if (textAfter === ']' || textAfter === '];' ||
+          textAfter === '}' || textAfter === '};' ||
+          textAfter === ');')
+        delta = -1;
+
+      return (state.scopes.length + delta) * _config.indentUnit;
+    },
+    electricChars: "{}[]();",
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
     lineComment: "//"

From 5c9a17c5feebb88213f414f33b50d5065e04fe2c Mon Sep 17 00:00:00 2001
From: joelpinheiro <joelpinheiro@ua.pt>
Date: Mon, 18 Apr 2016 18:01:50 +0100
Subject: [PATCH 2687/4742] [real-world uses] Add iTrading

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 82082bff21..7129e21618 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -94,6 +94,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.homegenie.it/docs/automation_getstarted.php">Homegenie</a> (home automation server)</li>
       <li><a href="http://icecoder.net">ICEcoder</a> (web IDE)</li>
       <li><a href="http://ipython.org/">IPython</a> (interactive computing shell)</li>
+      <li><a href="joelpinheiro.github.io/itrading/">iTrading</a> (Algorithmic Trading)</li>
       <li><a href="http://i-mos.org/imos/">i-MOS</a> (modeling and simulation platform)</li>
       <li><a href="http://www.janvas.com/">Janvas</a> (vector graphics editor)</li>
       <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>

From 71be4dc37ecd08db0314f968d01b1eafb87fc7f7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Apr 2016 23:11:49 +0200
Subject: [PATCH 2688/4742] [match-highlighter addon] Clean up handling of
 options

---
 addon/search/match-highlighter.js | 45 ++++++++++++++-----------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 79218c3175..187cbb2572 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -29,24 +29,19 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var DEFAULT_MIN_CHARS = 2;
-  var DEFAULT_TOKEN_STYLE = "matchhighlight";
-  var DEFAULT_DELAY = 100;
-  var DEFAULT_WORDS_ONLY = false;
+  var defaults = {
+    style: "matchhighlight",
+    minChars: 2,
+    delay: 100,
+    wordsOnly: false,
+    annotateScrollbar: false,
+    showToken: false
+  }
 
   function State(options) {
-    if (typeof options == "object") {
-      this.minChars = options.minChars;
-      this.style = options.style;
-      this.showToken = options.showToken;
-      this.delay = options.delay;
-      this.wordsOnly = options.wordsOnly;
-      this.annotateScrollbar = options.annotateScrollbar;
-    }
-    if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
-    if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
-    if (this.delay == null) this.delay = DEFAULT_DELAY;
-    if (this.wordsOnly == null) this.wordsOnly = DEFAULT_WORDS_ONLY;
+    this.options = {}
+    for (var name in defaults)
+      this.options[name] = (options && options.hasOwnProperty(name) ? options : defaults)[name]
     this.overlay = this.timeout = null;
     this.matchesonscroll = null;
   }
@@ -68,13 +63,13 @@
   function cursorActivity(cm) {
     var state = cm.state.matchHighlighter;
     clearTimeout(state.timeout);
-    state.timeout = setTimeout(function() {highlightMatches(cm);}, state.delay);
+    state.timeout = setTimeout(function() {highlightMatches(cm);}, state.options.delay);
   }
 
   function addOverlay(cm, query, hasBoundary, style) {
     var state = cm.state.matchHighlighter;
     cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
-    if (state.annotateScrollbar) {
+    if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
       var searchFor = hasBoundary ? new RegExp("\\b" + query + "\\b") : query;
       state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, true,
         {className: "CodeMirror-selection-highlight-scrollbar"});
@@ -86,7 +81,7 @@
     if (state.overlay) {
       cm.removeOverlay(state.overlay);
       state.overlay = null;
-      if (state.annotateScrollbar) {
+      if (state.matchesonscroll) {
         state.matchesonscroll.clear();
         state.matchesonscroll = null;
       }
@@ -97,21 +92,21 @@
     cm.operation(function() {
       var state = cm.state.matchHighlighter;
       removeOverlay(cm);
-      if (!cm.somethingSelected() && state.showToken) {
-        var re = state.showToken === true ? /[\w$]/ : state.showToken;
+      if (!cm.somethingSelected() && state.options.showToken) {
+        var re = state.options.showToken === true ? /[\w$]/ : state.options.showToken;
         var cur = cm.getCursor(), line = cm.getLine(cur.line), start = cur.ch, end = start;
         while (start && re.test(line.charAt(start - 1))) --start;
         while (end < line.length && re.test(line.charAt(end))) ++end;
         if (start < end)
-          addOverlay(cm, line.slice(start, end), re, state.style);
+          addOverlay(cm, line.slice(start, end), re, state.options.style);
         return;
       }
       var from = cm.getCursor("from"), to = cm.getCursor("to");
       if (from.line != to.line) return;
-      if (state.wordsOnly && !isWord(cm, from, to)) return;
+      if (state.options.wordsOnly && !isWord(cm, from, to)) return;
       var selection = cm.getRange(from, to).replace(/^\s+|\s+$/g, "");
-      if (selection.length >= state.minChars)
-        addOverlay(cm, selection, false, state.style);
+      if (selection.length >= state.options.minChars)
+        addOverlay(cm, selection, false, state.options.style);
     });
   }
 

From 86315336bcfbc40371b683ef569a17499af50f83 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Apr 2016 23:14:56 +0200
Subject: [PATCH 2689/4742] [match-highlighter addon] Add a trim option

Closes #3972
---
 addon/search/match-highlighter.js | 6 ++++--
 doc/manual.html                   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 187cbb2572..2c2914a9d0 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -35,7 +35,8 @@
     delay: 100,
     wordsOnly: false,
     annotateScrollbar: false,
-    showToken: false
+    showToken: false,
+    trim: true
   }
 
   function State(options) {
@@ -104,7 +105,8 @@
       var from = cm.getCursor("from"), to = cm.getCursor("to");
       if (from.line != to.line) return;
       if (state.options.wordsOnly && !isWord(cm, from, to)) return;
-      var selection = cm.getRange(from, to).replace(/^\s+|\s+$/g, "");
+      var selection = cm.getRange(from, to)
+      if (state.options.trim) selection = selection.replace(/^\s+|\s+$/g, "")
       if (selection.length >= state.options.minChars)
         addOverlay(cm, selection, false, state.options.style);
     });
diff --git a/doc/manual.html b/doc/manual.html
index 8b600eac54..dad3fe32d8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2696,7 +2696,8 @@ <h2 id="addons">Addons</h2>
       (default 2), <code>style</code>, for the style to be used to
       highlight the matches (default <code>"matchhighlight"</code>,
       which will correspond to CSS
-      class <code>cm-matchhighlight</code>),
+      class <code>cm-matchhighlight</code>), <code>trim</code>, which
+      controls whether whitespace is trimmed from the selection,
       and <code>showToken</code> which can be set to <code>true</code>
       or to a regexp matching the characters that make up a word. When
       enabled, it causes the current word to be highlighted when

From 03d684f06bc5eb5d2fa2111e082386c945a95be7 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 19 Apr 2016 18:23:26 +0200
Subject: [PATCH 2690/4742] Update valid string prefix for Python 3.

`u` prefix are valid (again) since 3.3, and `f` prefix are now allowed
starting at 3.6 (which is not released yet though).
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 196b026c69..9160b8e74b 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -74,7 +74,7 @@
     if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
       myKeywords = myKeywords.concat(py3.keywords);
       myBuiltins = myBuiltins.concat(py3.builtins);
-      var stringPrefixes = new RegExp("^(([rb]|(br))?('{3}|\"{3}|['\"]))", "i");
+      var stringPrefixes = new RegExp("^(([rbuf]|(br))?('{3}|\"{3}|['\"]))", "i");
     } else {
       myKeywords = myKeywords.concat(py2.keywords);
       myBuiltins = myBuiltins.concat(py2.builtins);

From 9e1ad23ab756707fc07935396b1d1b8dd5616605 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Mon, 18 Apr 2016 19:46:46 +0200
Subject: [PATCH 2691/4742] [show-hint addon] Allow hinting functions to return
 Promises

Even if we don't use promise internally, check for the existence of
`.then` attributes on the return results of a hinting function, and if
so assume it is a promise.

Internally also convert all hinters to use the asynchronous interface
for consistency and simplification of code paths.

Closes #3971
---
 addon/hint/show-hint.js | 68 +++++++++++++++++-------------------
 demo/complete.html      | 76 +++++++++++++++++++++++++++++++++++++++++
 doc/manual.html         |  8 +++--
 3 files changed, 113 insertions(+), 39 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 7661f6c2cd..46ca61b96c 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -109,14 +109,12 @@
 
     update: function(first) {
       if (this.tick == null) return;
-      if (!this.options.hint.async) {
-        this.finishUpdate(this.options.hint(this.cm, this.options), first);
-      } else {
-        var myTick = ++this.tick, self = this;
-        this.options.hint(this.cm, function(data) {
-          if (self.tick == myTick) self.finishUpdate(data, first);
-        }, this.options);
-      }
+      var self = this;
+      var hint = asynchronifyHinter(this.options.hint)
+      var myTick = ++this.tick;
+      hint(this.cm, function(data) {
+        if (self.tick == myTick) self.finishUpdate(data, first);
+      }, this.options);
     },
 
     finishUpdate: function(data, first) {
@@ -362,40 +360,36 @@
     return result
   }
 
+  function asynchronifyHinter(helper){
+    // given a hinter function, return an async one.
+    if(helper.async) return helper
+    var _help = function(cm, callback, option){
+      var res = helper(cm, option)
+      if(res && res.then) return res.then(callback)
+      return callback(res)
+    }
+    _help.async = true;
+    _help.supportsSelection = helper.supportsSelection;
+    return _help;
+  }
+
   function resolveAutoHints(cm, pos) {
     var helpers = cm.getHelpers(pos, "hint"), words
     if (helpers.length) {
-      var async = false, resolved
-      for (var i = 0; i < helpers.length; i++) if (helpers[i].async) async = true
-      if (async) {
-        resolved = function(cm, callback, options) {
-          var app = applicableHelpers(cm, helpers)
-          function run(i, result) {
-            if (i == app.length) return callback(null)
-            var helper = app[i]
-            if (helper.async) {
-              helper(cm, function(result) {
-                if (result) callback(result)
-                else run(i + 1)
-              }, options)
-            } else {
-              var result = helper(cm, options)
-              if (result) callback(result)
-              else run(i + 1)
-            }
-          }
-          run(0)
-        }
-        resolved.async = true
-      } else {
-        resolved = function(cm, options) {
-          var app = applicableHelpers(cm, helpers)
-          for (var i = 0; i < app.length; i++) {
-            var cur = app[i](cm, options)
-            if (cur && cur.list.length) return cur
-          }
+      var resolved = function(cm, callback, options) {
+        var app = applicableHelpers(cm, helpers);
+        function run(i) {
+          if (i == app.length) return callback(null)
+          var helper = app[i]
+          helper = asynchronifyHinter(helper);
+          helper(cm, function(result) {
+            if (result && result.list.length > 0) callback(result)
+            else run(i + 1)
+          }, options)
         }
+        run(0)
       }
+      resolved.async = true
       resolved.supportsSelection = true
       return resolved
     } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
diff --git a/demo/complete.html b/demo/complete.html
index cdf49dbeb9..fac48cbf25 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -10,6 +10,7 @@
 <script src="../addon/hint/show-hint.js"></script>
 <script src="../addon/hint/javascript-hint.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
+<script src="../mode/markdown/markdown.js"></script>
 
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
@@ -69,11 +70,86 @@ <h2>Autocomplete Demo</h2>
 and <a href="../doc/manual.html#addon_javascript-hint"><code>javascript-hint</code></a>
 addons.</p>
 
+
+<form><textarea id="synonyms" name="synonyms">
+Here, the completion use an asynchronous hinting functions to provide
+synonyms for each words. If your browser support `Promises`, the
+hinting function can also return one.
+</textarea></form>
+
+
+
+     <script>
+        var comp=[
+            ['Here', 'Hither'],
+            ['asynchronous', 'nonsynchronous'],
+            ['completion','achievement','conclusion','culmination','expirations'],
+            ['hinting', 'advive', 'broach', 'imply'],
+            ['function','action'],
+            ['provide', 'add', 'bring', 'give'],
+            ['synonyms', 'equivalents'],
+            ['words','token'],
+            ['each','every'],
+        ]
+        
+        var async_synonyms =  function(editor, callback ,option){
+                var cursor = editor.getCursor();
+                var token = editor.getTokenAt(cursor);
+                var start = {line:cursor.line, ch:token.start};
+                var end = {line:cursor.line, ch:token.end};
+                var res = [];
+                var name = token.string;
+                for(var i in comp){
+                    if(comp[i].indexOf(name) !== -1){
+                        res = comp[i];
+                        break;
+                    }
+                }
+                callback({list:res, from:start, to:end})
+            }
+        async_synonyms.async = true;
+        CodeMirror.registerGlobalHelper('hint', 'synonyms', function(mode){
+            if ( mode && mode.name === 'markdown')
+                return true;
+            return false;
+        }, async_synonyms)
+
+
+        if(typeof Promise !== undefined){
+            CodeMirror.registerGlobalHelper('hint', 'synonyms', function(mode){
+            if ( mode && mode.name === 'markdown')
+                return true;
+            return false;
+            }, function(editor, optio){
+                var cursor = editor.getCursor();
+                var token = editor.getTokenAt(cursor);
+                var start = {line:cursor.line, ch:token.start};
+                var end = {line:cursor.line, ch:token.end};
+                var res = ['No','completions','but','you', 'can','use', 'Promises'];
+                
+                return Promise.resolve({list:res, from:start, to:end})
+
+            })
+
+        }
+     </script>
+
+
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         extraKeys: {"Ctrl-Space": "autocomplete"},
         mode: {name: "javascript", globalVars: true}
       });
+
+      var editor2 = CodeMirror.fromTextArea(document.getElementById("synonyms"), {
+        extraKeys: {"Ctrl-Space": "autocomplete"},
+        lineNumbers: true,
+        lineWrapping: true,
+        mode: 'text/x-markdown'
+      });
+      editor2.setSize(null, '7em')
+
     </script>
+
   </article>
diff --git a/doc/manual.html b/doc/manual.html
index dad3fe32d8..6588e71ce3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2569,7 +2569,8 @@ <h2 id="addons">Addons</h2>
         <dd>Optional <code>to</code> position that will be used by <code>pick()</code> instead
         of the global one passed with the full list of completions.</dd>
       </dl>
-      The plugin understands the following options (the options object
+      
+      <dd> The plugin understands the following options (the options object
       will also be passed along to the hinting function, which may
       understand additional options):
       <dl>
@@ -2580,7 +2581,10 @@ <h2 id="addons">Addons</h2>
         arguments <code>(cm, callback, ?options)</code>, and the
         completion interface will only be popped up when the hinting
         function calls the callback, passing it the object holding the
-        completions. By default, hinting only works when there is no
+        completions.
+        The hinting function can also return a promise, and the completion
+        interface will only be popped when the promise resolves.
+        By default, hinting only works when there is no
         selection. You can give a hinting function
         a <code>supportsSelection</code> property with a truthy value
         to indicate that it supports selections.</dd>

From 87d10fa06bfe63b94ace873df0014128f9769107 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 10:23:44 +0200
Subject: [PATCH 2692/4742] [show-hint addon] Simplify Promise support

Issue #3974
---
 addon/hint/show-hint.js |  35 +++++-------
 demo/complete.html      | 123 +++++++++++++++-------------------------
 doc/manual.html         |   4 +-
 3 files changed, 63 insertions(+), 99 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 46ca61b96c..f426b5c8ca 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -108,13 +108,11 @@
     },
 
     update: function(first) {
-      if (this.tick == null) return;
-      var self = this;
-      var hint = asynchronifyHinter(this.options.hint)
-      var myTick = ++this.tick;
-      hint(this.cm, function(data) {
-        if (self.tick == myTick) self.finishUpdate(data, first);
-      }, this.options);
+      if (this.tick == null) return
+      var self = this, myTick = ++this.tick
+      fetchHints(this.options.hint, this.cm, this.options, function(data) {
+        if (self.tick == myTick) self.finishUpdate(data, first)
+      })
     },
 
     finishUpdate: function(data, first) {
@@ -360,17 +358,14 @@
     return result
   }
 
-  function asynchronifyHinter(helper){
-    // given a hinter function, return an async one.
-    if(helper.async) return helper
-    var _help = function(cm, callback, option){
-      var res = helper(cm, option)
-      if(res && res.then) return res.then(callback)
-      return callback(res)
+  function fetchHints(hint, cm, options, callback) {
+    if (hint.async) {
+      hint(cm, callback, options)
+    } else {
+      var result = hint(cm, options)
+      if (result && result.then) result.then(callback)
+      else callback(result)
     }
-    _help.async = true;
-    _help.supportsSelection = helper.supportsSelection;
-    return _help;
   }
 
   function resolveAutoHints(cm, pos) {
@@ -380,12 +375,10 @@
         var app = applicableHelpers(cm, helpers);
         function run(i) {
           if (i == app.length) return callback(null)
-          var helper = app[i]
-          helper = asynchronifyHinter(helper);
-          helper(cm, function(result) {
+          fetchHints(app[i], cm, options, function(result) {
             if (result && result.list.length > 0) callback(result)
             else run(i + 1)
-          }, options)
+          })
         }
         run(0)
       }
diff --git a/demo/complete.html b/demo/complete.html
index fac48cbf25..18e17c8126 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -70,86 +70,57 @@ <h2>Autocomplete Demo</h2>
 and <a href="../doc/manual.html#addon_javascript-hint"><code>javascript-hint</code></a>
 addons.</p>
 
-
-<form><textarea id="synonyms" name="synonyms">
+<form><textarea style="display: none" id="synonyms" name="synonyms">
 Here, the completion use an asynchronous hinting functions to provide
 synonyms for each words. If your browser support `Promises`, the
 hinting function can also return one.
 </textarea></form>
 
+<script>
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+  lineNumbers: true,
+  extraKeys: {"Ctrl-Space": "autocomplete"},
+  mode: {name: "javascript", globalVars: true}
+});
+
+if (typeof Promise !== undefined) {
+  var comp = [
+    ["here", "hither"],
+    ["asynchronous", "nonsynchronous"],
+    ["completion", "achievement", "conclusion", "culmination", "expirations"],
+    ["hinting", "advive", "broach", "imply"],
+    ["function","action"],
+    ["provide", "add", "bring", "give"],
+    ["synonyms", "equivalents"],
+    ["words", "token"],
+    ["each", "every"],
+  ]
+
+  function synonyms(cm, option) {
+    return new Promise(function(accept) {
+      setTimeout(function() {
+        var cursor = cm.getCursor(), line = cm.getLine(cursor.line)
+        var start = cursor.ch, end = cursor.ch
+        while (start && /\w/.test(line.charAt(start - 1))) --start
+        while (end < line.length && /\w/.test(line.charAt(end))) ++end
+        var word = line.slice(start, end).toLowerCase()
+        for (var i = 0; i < comp.length; i++) if (comp[i].indexOf(word) != -1)
+          return accept({list: comp[i],
+                         from: CodeMirror.Pos(cursor.line, start),
+                         to: CodeMirror.Pos(cursor.line, end)})
+        return accept(null)
+      }, 100)
+    })
+  }
 
+  var editor2 = CodeMirror.fromTextArea(document.getElementById("synonyms"), {
+    extraKeys: {"Ctrl-Space": "autocomplete"},
+    lineNumbers: true,
+    lineWrapping: true,
+    mode: "text/x-markdown",
+    hintOptions: {hint: synonyms}
+  })
+}
+</script>
 
-     <script>
-        var comp=[
-            ['Here', 'Hither'],
-            ['asynchronous', 'nonsynchronous'],
-            ['completion','achievement','conclusion','culmination','expirations'],
-            ['hinting', 'advive', 'broach', 'imply'],
-            ['function','action'],
-            ['provide', 'add', 'bring', 'give'],
-            ['synonyms', 'equivalents'],
-            ['words','token'],
-            ['each','every'],
-        ]
-        
-        var async_synonyms =  function(editor, callback ,option){
-                var cursor = editor.getCursor();
-                var token = editor.getTokenAt(cursor);
-                var start = {line:cursor.line, ch:token.start};
-                var end = {line:cursor.line, ch:token.end};
-                var res = [];
-                var name = token.string;
-                for(var i in comp){
-                    if(comp[i].indexOf(name) !== -1){
-                        res = comp[i];
-                        break;
-                    }
-                }
-                callback({list:res, from:start, to:end})
-            }
-        async_synonyms.async = true;
-        CodeMirror.registerGlobalHelper('hint', 'synonyms', function(mode){
-            if ( mode && mode.name === 'markdown')
-                return true;
-            return false;
-        }, async_synonyms)
-
-
-        if(typeof Promise !== undefined){
-            CodeMirror.registerGlobalHelper('hint', 'synonyms', function(mode){
-            if ( mode && mode.name === 'markdown')
-                return true;
-            return false;
-            }, function(editor, optio){
-                var cursor = editor.getCursor();
-                var token = editor.getTokenAt(cursor);
-                var start = {line:cursor.line, ch:token.start};
-                var end = {line:cursor.line, ch:token.end};
-                var res = ['No','completions','but','you', 'can','use', 'Promises'];
-                
-                return Promise.resolve({list:res, from:start, to:end})
-
-            })
-
-        }
-     </script>
-
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        extraKeys: {"Ctrl-Space": "autocomplete"},
-        mode: {name: "javascript", globalVars: true}
-      });
-
-      var editor2 = CodeMirror.fromTextArea(document.getElementById("synonyms"), {
-        extraKeys: {"Ctrl-Space": "autocomplete"},
-        lineNumbers: true,
-        lineWrapping: true,
-        mode: 'text/x-markdown'
-      });
-      editor2.setSize(null, '7em')
-
-    </script>
-
-  </article>
+</article>
diff --git a/doc/manual.html b/doc/manual.html
index 6588e71ce3..5f3b2330b0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2568,9 +2568,9 @@ <h2 id="addons">Addons</h2>
         <dt><code><strong>to</strong>: {line, ch}</code></dt>
         <dd>Optional <code>to</code> position that will be used by <code>pick()</code> instead
         of the global one passed with the full list of completions.</dd>
-      </dl>
+      </dl></dd>
       
-      <dd> The plugin understands the following options (the options object
+      <dd>The plugin understands the following options (the options object
       will also be passed along to the hinting function, which may
       understand additional options):
       <dl>

From db62891c78fb9240ad9e4020020e7ed81a03ef6a Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 19 Apr 2016 10:24:13 +0200
Subject: [PATCH 2693/4742] [Python] distinguish decorator at beginning of line
 from __matmul__

@ as __matmul__ operator only on Python 3,

Add tests for Python mode for this use case.

Closes #3957
---
 mode/python/python.js | 19 ++++++++++++++-----
 mode/python/test.js   | 28 ++++++++++++++++++++++++++++
 test/index.html       |  2 ++
 3 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 mode/python/test.js

diff --git a/mode/python/python.js b/mode/python/python.js
index 9160b8e74b..95e4d1fe90 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -249,15 +249,24 @@
     }
 
     function tokenLexer(stream, state) {
+      var sol = stream.sol();
+      if (sol){
+          state.whiteSpaceAtBeginningOfLine = true;
+      }
       var style = state.tokenize(stream, state);
       var current = stream.current();
 
       // Handle decorators
-      if (current == "@") {
-        if (parserConf.version && parseInt(parserConf.version, 10) == 3)
-          return stream.match(identifiers, false) ? "meta" : "operator";
-        else
-          return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
+      if (state.whiteSpaceAtBeginningOfLine){
+          if (current == "@") {
+            if (parserConf.version && parseInt(parserConf.version, 10) == 3)
+              return stream.match(identifiers, false) ? "meta" : "operator";
+            else
+              return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
+          }
+      }
+      if(!current.match(/^ +$/, false)){
+          state.whiteSpaceAtBeginningOfLine = false;
       }
 
       if ((style == "variable" || style == "builtin")
diff --git a/mode/python/test.js b/mode/python/test.js
new file mode 100644
index 0000000000..342c6cf33a
--- /dev/null
+++ b/mode/python/test.js
@@ -0,0 +1,28 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 4},
+              {name: "python",
+               version: 3,
+               singleLineStringErrors: false});
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  // Error, because "foobarhello" is neither a known type or property, but
+  // property was expected (after "and"), and it should be in parentheses.
+  MT("decoratorStartOfLine",
+     "[meta @dec]",
+     "[keyword def] [def function]():",
+     "    [keyword pass]");
+
+  MT("decoratorIndented",
+     "[keyword class] [def Foo]:",
+     "    [meta @dec]",
+     "    [keyword def] [def function]():",
+     "        [keyword pass]");
+
+  MT("matmulWithSpace:", "[variable a] [operator @] [variable b]");
+  MT("matmulWithoutSpace:", "[variable a][operator @][variable b]");
+  MT("matmulSpaceBefore:", "[variable a] [operator @][variable b]");
+
+})();
diff --git a/test/index.html b/test/index.html
index 68dc4dfc06..90c0335171 100644
--- a/test/index.html
+++ b/test/index.html
@@ -27,6 +27,7 @@
 <script src="../mode/jsx/jsx.js"></script>
 <script src="../mode/markdown/markdown.js"></script>
 <script src="../mode/php/php.js"></script>
+<script src="../mode/python/python.js"></script>
 <script src="../mode/powershell/powershell.js"></script>
 <script src="../mode/ruby/ruby.js"></script>
 <script src="../mode/shell/shell.js"></script>
@@ -123,6 +124,7 @@ <h2>Test Suite</h2>
     <script src="../mode/verilog/test.js"></script>
     <script src="../mode/xml/test.js"></script>
     <script src="../mode/xquery/test.js"></script>
+    <script src="../mode/python/test.js"></script>
     <script src="../mode/rust/test.js"></script>
     <script src="../mode/mscgen/mscgen_test.js"></script>
     <script src="../mode/mscgen/xu_test.js"></script>

From 3b36e587eec6df1d907d48129cd61db45e83a71f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 10:35:21 +0200
Subject: [PATCH 2694/4742] [python mode] Clean up previous patch

---
 mode/python/python.js | 55 +++++++++++++++----------------------------
 1 file changed, 19 insertions(+), 36 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 95e4d1fe90..ec662b1a95 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -32,13 +32,6 @@
                         "sorted", "staticmethod", "str", "sum", "super", "tuple",
                         "type", "vars", "zip", "__import__", "NotImplemented",
                         "Ellipsis", "__debug__"];
-  var py2 = {builtins: ["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
-                        "file", "intern", "long", "raw_input", "reduce", "reload",
-                        "unichr", "unicode", "xrange", "False", "True", "None"],
-             keywords: ["exec", "print"]};
-  var py3 = {builtins: ["ascii", "bytes", "exec", "print"],
-             keywords: ["nonlocal", "False", "True", "None", "async", "await"]};
-
   CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
 
   function top(state) {
@@ -53,15 +46,6 @@
     var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
     var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
 
-    if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
-        // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
-        var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
-        var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
-    } else {
-        var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
-        var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
-    }
-
     var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
 
     var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
@@ -71,13 +55,21 @@
     if (parserConf.extra_builtins != undefined)
       myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
 
-    if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
-      myKeywords = myKeywords.concat(py3.keywords);
-      myBuiltins = myBuiltins.concat(py3.builtins);
+    var py3 = parserConf.version && parseInt(parserConf.version, 10) == 3
+    if (py3) {
+      // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
+      var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
+      var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
+      myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
+      myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
       var stringPrefixes = new RegExp("^(([rbuf]|(br))?('{3}|\"{3}|['\"]))", "i");
     } else {
-      myKeywords = myKeywords.concat(py2.keywords);
-      myBuiltins = myBuiltins.concat(py2.builtins);
+      var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
+      var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
+      myKeywords = myKeywords.concat(["exec", "print"]);
+      myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
+                                      "file", "intern", "long", "raw_input", "reduce", "reload",
+                                      "unichr", "unicode", "xrange", "False", "True", "None"]);
       var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
     }
     var keywords = wordRegexp(myKeywords);
@@ -249,25 +241,16 @@
     }
 
     function tokenLexer(stream, state) {
-      var sol = stream.sol();
-      if (sol){
-          state.whiteSpaceAtBeginningOfLine = true;
-      }
+      if (stream.sol()) state.beginningOfLine = true;
+
       var style = state.tokenize(stream, state);
       var current = stream.current();
 
       // Handle decorators
-      if (state.whiteSpaceAtBeginningOfLine){
-          if (current == "@") {
-            if (parserConf.version && parseInt(parserConf.version, 10) == 3)
-              return stream.match(identifiers, false) ? "meta" : "operator";
-            else
-              return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
-          }
-      }
-      if(!current.match(/^ +$/, false)){
-          state.whiteSpaceAtBeginningOfLine = false;
-      }
+      if (state.beginningOfLine && current == "@")
+        return stream.match(identifiers, false) ? "meta" : py3 ? "operator" : ERRORCLASS;
+
+      if (/\S/.test(current)) state.beginningOfLine = false;
 
       if ((style == "variable" || style == "builtin")
           && state.lastToken == "meta")

From a579a10d7b6934f3efa7307dccd382b981a728a9 Mon Sep 17 00:00:00 2001
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: Tue, 19 Apr 2016 10:24:13 +0200
Subject: [PATCH 2695/4742] [python mode] Add two more tests

Issue #3973
---
 mode/python/test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/python/test.js b/mode/python/test.js
index 342c6cf33a..c1a9c6a990 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -25,4 +25,6 @@
   MT("matmulWithoutSpace:", "[variable a][operator @][variable b]");
   MT("matmulSpaceBefore:", "[variable a] [operator @][variable b]");
 
+  MT("fValidStringPrefix", "[string f'this is a {formatted} string']");
+  MT("uValidStringPrefix", "[string u'this is an unicode string']");
 })();

From b609227f0f8e2a5d431960a708ef0a0a0db79adc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 11:09:20 +0200
Subject: [PATCH 2696/4742] Make findMarks only returns marks that overlap the
 range

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 70e3fec539..6b9b71c701 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7626,9 +7626,9 @@
         var spans = line.markedSpans;
         if (spans) for (var i = 0; i < spans.length; i++) {
           var span = spans[i];
-          if (!(span.to != null && lineNo == from.line && from.ch > span.to ||
+          if (!(span.to != null && lineNo == from.line && from.ch >= span.to ||
                 span.from == null && lineNo != from.line ||
-                span.from != null && lineNo == to.line && span.from > to.ch) &&
+                span.from != null && lineNo == to.line && span.from >= to.ch) &&
               (!filter || filter(span.marker)))
             found.push(span.marker.parent || span.marker);
         }

From a7868e1519c67bc6e4f74dbd5ef94098003438df Mon Sep 17 00:00:00 2001
From: Manideep <manideepami@live.com>
Date: Fri, 15 Apr 2016 12:27:33 +0530
Subject: [PATCH 2697/4742] [real-world uses] Add OpenCampus

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 7129e21618..31139f2e99 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -122,6 +122,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://github.com/soliton4/nodeMirror">nodeMirror</a> (IDE project)</li>
       <li><a href="https://notex.ch">NoTex</a> (rST authoring)</li>
       <li><a href="http://oakoutliner.com">Oak</a> (online outliner)</li>
+      <li><a href="http://www.greycampus.com/opencampus">OpenCampus</a></li>
       <li><a href="http://clrhome.org/asm/">ORG</a> (z80 assembly IDE)</li>
       <li><a href="https://github.com/mamacdon/orion-codemirror">Orion-CodeMirror integration</a> (running CodeMirror modes in Orion)</li>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>

From bf8e72f4a51ef588880aa8530388b9b76488f169 Mon Sep 17 00:00:00 2001
From: Sergey Tselovalnikov <Sergey.Tselovalnikov@jetbrains.com>
Date: Fri, 15 Apr 2016 13:14:45 +0300
Subject: [PATCH 2698/4742] [lint addon] Return null checks for annotation

Fix "Uncaught TypeError: Cannot read property 'severity' of undefined"
---
 addon/lint/lint.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 01f322b5d5..e3a452766d 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -204,7 +204,8 @@
 
     var annotations = [];
     for (var i = 0; i < spans.length; ++i) {
-      annotations.push(spans[i].__annotation);
+      var ann = spans[i].__annotation;
+      if (ann) annotations.push(ann);
     }
     if (annotations.length) popupTooltips(annotations, e);
   }

From 0055101e4527d0b168f3b147680a678eabca8c50 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 16 Apr 2016 18:23:11 -0700
Subject: [PATCH 2699/4742] [mbox mode] Add

---
 doc/compress.html    |   1 +
 mode/index.html      |   1 +
 mode/mbox/index.html |  44 +++++++++++++++
 mode/mbox/mbox.js    | 129 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 175 insertions(+)
 create mode 100644 mode/mbox/index.html
 create mode 100644 mode/mbox/mbox.js

diff --git a/doc/compress.html b/doc/compress.html
index 44e6fea828..4459f46edb 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -168,6 +168,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
           <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
           <option value="http://codemirror.net/mode/mathematica/mathematica.js">mathematica.js</option>
+          <option value="http://codemirror.net/mode/mbox/mbox.js">mbox.js</option>
           <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>
diff --git a/mode/index.html b/mode/index.html
index be583159e1..732e0e52cd 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -86,6 +86,7 @@ <h2>Language modes</h2>
       <li><a href="lua/index.html">Lua</a></li>
       <li><a href="markdown/index.html">Markdown</a> (<a href="gfm/index.html">GitHub-flavour</a>)</li>
       <li><a href="mathematica/index.html">Mathematica</a></li>
+      <li><a href="mbox/index.html">mbox</a></li>
       <li><a href="mirc/index.html">mIRC</a></li>
       <li><a href="modelica/index.html">Modelica</a></li>
       <li><a href="mscgen/index.html">MscGen</a></li>
diff --git a/mode/mbox/index.html b/mode/mbox/index.html
new file mode 100644
index 0000000000..248ea98e18
--- /dev/null
+++ b/mode/mbox/index.html
@@ -0,0 +1,44 @@
+<!doctype html>
+
+<title>CodeMirror: mbox 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="mbox.js"></script>
+<style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</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="#">mbox</a>
+  </ul>
+</div>
+
+<article>
+<h2>mbox mode</h2>
+<form><textarea id="code" name="code">
+From timothygu99@gmail.com Sun Apr 17 01:40:43 2016
+From: Timothy Gu &lt;timothygu99@gmail.com&gt;
+Date: Sat, 16 Apr 2016 18:40:43 -0700
+Subject: mbox mode
+Message-ID: &lt;Z8d+bTT50U/az94FZnyPkDjZmW0=@gmail.com&gt;
+
+mbox mode is working!
+
+Timothy
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>application/mbox</code>.</p>
+
+  </article>
diff --git a/mode/mbox/mbox.js b/mode/mbox/mbox.js
new file mode 100644
index 0000000000..ba2416ac81
--- /dev/null
+++ b/mode/mbox/mbox.js
@@ -0,0 +1,129 @@
+// 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"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+var rfc2822 = [
+  "From", "Sender", "Reply-To", "To", "Cc", "Bcc", "Message-ID",
+  "In-Reply-To", "References", "Resent-From", "Resent-Sender", "Resent-To",
+  "Resent-Cc", "Resent-Bcc", "Resent-Message-ID", "Return-Path", "Received"
+];
+var rfc2822NoEmail = [
+  "Date", "Subject", "Comments", "Keywords", "Resent-Date"
+];
+
+CodeMirror.registerHelper("hintWords", "mbox", rfc2822.concat(rfc2822NoEmail));
+
+var whitespace = /^[ \t]/;
+var separator = /^From /; // See RFC 4155
+var rfc2822Header = new RegExp("^(" + rfc2822.join("|") + "): ");
+var rfc2822HeaderNoEmail = new RegExp("^(" + rfc2822NoEmail.join("|") + "): ");
+var header = /^[^:]+:/; // Optional fields defined in RFC 2822
+var email = /^[^ ]+@[^ ]+/;
+var untilEmail = /^.*?(?=[^ ]+?@[^ ]+)/;
+var bracketedEmail = /^<.*?>/;
+var untilBracketedEmail = /^.*?(?=<.*>)/;
+
+function styleForHeader(header) {
+  if (header === "Subject") return "header";
+  return "string";
+}
+
+function readToken(stream, state) {
+  if (stream.sol()) {
+    // From last line
+    state.inSeparator = false;
+    if (state.inHeader && stream.match(whitespace)) {
+      // Header folding
+      return null;
+    } else {
+      state.inHeader = false;
+      state.header = null;
+    }
+
+    if (stream.match(separator)) {
+      state.inHeaders = true;
+      state.inSeparator = true;
+      return "atom";
+    }
+
+    var match;
+    var emailPermitted = false;
+    if ((match = stream.match(rfc2822HeaderNoEmail)) ||
+        (emailPermitted = true) && (match = stream.match(rfc2822Header))) {
+      state.inHeaders = true;
+      state.inHeader = true;
+      state.emailPermitted = emailPermitted;
+      state.header = match[1];
+      return "atom";
+    }
+
+    // Use vim's heuristics: recognize custom headers only if the line is in a
+    // block of legitimate headers.
+    if (state.inHeaders && (match = stream.match(header))) {
+      state.inHeader = true;
+      state.emailPermitted = true;
+      state.header = match[1];
+      return "atom";
+    }
+
+    state.inHeaders = false;
+    stream.skipToEnd();
+    return null;
+  }
+
+  if (state.inSeparator) {
+    if (stream.match(email)) return "link";
+    if (stream.match(untilEmail)) return "atom";
+    stream.skipToEnd();
+    return "atom";
+  }
+
+  if (state.inHeader) {
+    var style = styleForHeader(state.header);
+
+    if (state.emailPermitted) {
+      if (stream.match(bracketedEmail)) return style + " link";
+      if (stream.match(untilBracketedEmail)) return style;
+    }
+    stream.skipToEnd();
+    return style;
+  }
+
+  stream.skipToEnd();
+  return null;
+};
+
+CodeMirror.defineMode("mbox", function() {
+  return {
+    startState: function() {
+      return {
+        // Is in a mbox separator
+        inSeparator: false,
+        // Is in a mail header
+        inHeader: false,
+        // If bracketed email is permitted. Only applicable when inHeader
+        emailPermitted: false,
+        // Name of current header
+        header: null,
+        // Is in a region of mail headers
+        inHeaders: false
+      };
+    },
+    token: readToken,
+    blankLine: function(state) {
+      state.inHeaders = state.inSeparator = state.inHeader = false;
+    }
+  };
+});
+
+CodeMirror.defineMIME("application/mbox", "mbox");
+});

From 83483ef884d43264e682357e3cb6e6d652d96c65 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 11:41:40 +0200
Subject: [PATCH 2700/4742] Mark release 5.14.0

---
 AUTHORS           | 14 ++++++++++++++
 CHANGELOG.md      | 30 ++++++++++++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 18 ++++++++++++++++++
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2c8a9bf3d1..f64cb6d103 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,6 +45,7 @@ Andre von Houck
 Andrey Fedorov
 Andrey Klyuchnikov
 Andrey Lushnikov
+Andrey Shchekin
 Andy Joslin
 Andy Kimball
 Andy Li
@@ -75,9 +76,11 @@ benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
+Ben Miller
 Ben Mosher
 Bernhard Sirlinger
 Bert Chang
+Bharad
 Billy Moon
 binny
 B Krishna Chaitanya
@@ -183,6 +186,7 @@ Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
 galambalazs
+Gary Sheng
 Gautam Mehta
 Gavin Douglas
 gekkoe
@@ -199,6 +203,7 @@ Gordon Smith
 Grant Skinner
 greengiant
 Gregory Koberger
+Grzegorz Mazur
 Guillaume Massé
 Guillaume Massé
 guraga
@@ -230,6 +235,7 @@ Jakob Miland
 Jakub Vrana
 Jakub Vrána
 James Campos
+James Howard
 James Thorne
 Jamie Hill
 Jan Jongboom
@@ -257,6 +263,7 @@ Jim
 JobJob
 jochenberger
 Jochen Berger
+joelpinheiro
 Johan Ask
 John Connor
 John Engler
@@ -272,6 +279,7 @@ Jon Sangster
 Joost-Wim Boekesteijn
 Joseph Pecoraro
 Josh Cohen
+Josh Soref
 Joshua Newman
 Josh Watzman
 jots
@@ -298,6 +306,7 @@ Koh Zi Han, Cliff
 komakino
 Konstantin Lopuhin
 koops
+Kris Ciccarello
 ks-ifware
 kubelsmieci
 KwanEsq
@@ -315,6 +324,7 @@ LM
 lochel
 Lorenzo Stoakes
 Luciano Longo
+Lu Fangjian
 Luke Stagner
 lynschinzer
 M1cha
@@ -322,6 +332,7 @@ Madhura Jayaratne
 Maksim Lin
 Maksym Taran
 Malay Majithia
+Manideep
 Manuel Rego Casasnovas
 Marat Dreizin
 Marcel Gerber
@@ -476,6 +487,7 @@ Scott Aikin
 Scott Goodhew
 Sebastian Zaha
 Sergey Goder
+Sergey Tselovalnikov
 Se-Won Kim
 shaund
 shaun gilchrist
@@ -520,6 +532,7 @@ Thomas Schmid
 Tim Alby
 Tim Baumann
 Timothy Farrell
+Timothy Gu
 Timothy Hatcher
 TobiasBg
 Tomas-A
@@ -532,6 +545,7 @@ Triangle717
 Tristan Tarrant
 TSUYUSATO Kitsune
 twifkak
+VapidWorx
 Vestimir Markov
 vf
 Victor Bocharsky
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0a6ab57ff..d6e39cce9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 5.14.0 (2016-04-20)
+
+### Bugfixes
+
+[`posFromIndex`](http://codemirror.net/doc/manual.html#posFromIndex) and [`indexFromPos`](http://codemirror.net/doc/manual.html#indexFromPos) now take [`lineSeparator`](http://codemirror.net/doc/manual.html#option_lineSeparator) into account.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Only call `.save()` when it is actually available.
+
+[commend addon](http://codemirror.net/doc/manual.html#addon_comment): Be careful not to mangle multi-line strings.
+
+[Python mode](http://codemirror.net/mode/python/index.html): Improve distinguishing of decorators from `@` operators.
+
+[`findMarks`](http://codemirror.net/doc/manual.html#findMarks): No longer return marks that touch but don't overlap given range.
+
+### New features
+
+[vim bindings](http://codemirror.net/demo/vim.html): Add yank command.
+
+[match-highlighter addon](http://codemirror.net/doc/manual.html#addon_match-highlighter): Add `trim` option to disable ignoring of whitespace.
+
+[PowerShell mode](http://codemirror.net/mode/powershell/index.html): Added.
+
+[Yacas mode](http://codemirror.net/mode/yacas/index.html): Added.
+
+[Web IDL mode](http://codemirror.net/mode/webidl/index.html): Added.
+
+[SAS mode](http://codemirror.net/mode/sas/index.html): Added.
+
+[mbox mode](http://codemirror.net/mode/mbox/index.html): Added.
+
 ## 5.13.2 (2016-03-23)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 4459f46edb..1e507c6c7a 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.14.0;f=">5.14</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.2;f=">5.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.0;f=">5.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.12.0;f=">5.12</option>
diff --git a/doc/manual.html b/doc/manual.html
index 5f3b2330b0..19c60b33a3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.13.5</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.14.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 99306b91cb..5e6a2b2b0b 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,24 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2016: <a href="http://codemirror.net/codemirror-5.14.0.zip">Version 5.14.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="http://codemirror.net/doc/manual.html#posFromIndex"><code>posFromIndex</code></a> and <a href="http://codemirror.net/doc/manual.html#indexFromPos"><code>indexFromPos</code></a> now take <a href="http://codemirror.net/doc/manual.html#option_lineSeparator"><code>lineSeparator</code></a> into account</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Only call <code>.save()</code> when it is actually available</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">commend addon</a>: Be careful not to mangle multi-line strings</li>
+    <li><a href="http://codemirror.net/mode/python/index.html">Python mode</a>: Improve distinguishing of decorators from <code>@</code> operators</li>
+    <li><a href="http://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a>: No longer return marks that touch but don't overlap given range</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Add yank command</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Add <code>trim</code> option to disable ignoring of whitespace</li>
+    <li><a href="http://codemirror.net/mode/powershell/index.html">PowerShell mode</a>: Added</li>
+    <li><a href="http://codemirror.net/mode/yacas/index.html">Yacas mode</a>: Added</li>
+    <li><a href="http://codemirror.net/mode/webidl/index.html">Web IDL mode</a>: Added</li>
+    <li><a href="http://codemirror.net/mode/sas/index.html">SAS mode</a>: Added</li>
+    <li><a href="http://codemirror.net/mode/mbox/index.html">mbox mode</a>: Added</li>
+    <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.13.4...5.14.0">list of patches</a></li>
+  </ul>
+
   <p class="rel">21-03-2016: <a href="http://codemirror.net/codemirror-5.13.2.zip">Version 5.13.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6b9b71c701..94de3279da 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8891,7 +8891,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.13.5";
+  CodeMirror.version = "5.14.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index ca0d787e49..544fd86f56 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.13.5",
+    "version":"5.14.0",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From e2ad4f121aaff921a713d433aec42083917050d1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 11:45:59 +0200
Subject: [PATCH 2701/4742] Bump version number post-5.14.0

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 19c60b33a3..25bee51ffa 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.14.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.14.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 94de3279da..4159737af3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8891,7 +8891,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.14.0";
+  CodeMirror.version = "5.14.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 544fd86f56..8df9e0d64a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.14.0",
+    "version":"5.14.1",
     "main": "lib/codemirror.js",
     "description": "In-browser code editing made bearable",
     "license": "MIT",

From f02048ad0b4a8f96d5e2c9036580be25facb32d6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 12:01:04 +0200
Subject: [PATCH 2702/4742] Update package.json description

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8df9e0d64a..1c3ac8843b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "codemirror",
     "version":"5.14.1",
     "main": "lib/codemirror.js",
-    "description": "In-browser code editing made bearable",
+    "description": "Full-featured in-browser code editor",
     "license": "MIT",
     "directories": {"lib": "./lib"},
     "scripts": {

From ad44ab3f3fc020052884ffb554a8976ce7b4082c Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Wed, 20 Apr 2016 12:06:01 -0400
Subject: [PATCH 2703/4742] Update the "current version" in index.html

Update from 5.13.2 to 5.14.0.
---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index da5a06c49d..0893e0f8fb 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.13.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.14.0</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>.
@@ -113,7 +113,7 @@ <h2>This is CodeMirror</h2>
       </form>
     </div>
   </div>
-  
+
 </section>
 
 <section id=features>

From b936ddd1623f6d1c2109ac85bd92a9198b112ed2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 21:07:51 +0200
Subject: [PATCH 2704/4742] Fix release script to properly update index.html

Issue #3976
---
 bin/release | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/release b/bin/release
index b782739fa8..2d78557fd0 100755
--- a/bin/release
+++ b/bin/release
@@ -40,6 +40,6 @@ rewrite("doc/compress.html", function(cmp) {
 });
 
 rewrite("index.html", function(index) {
-  return index.replace(/\.zip">\d+\.\d+<\/a>/,
-                       ".zip\">" + simple + "</a>");
+  return index.replace(/\.zip">\d+\.\d+\.\d+<\/a>/,
+                       ".zip\">" + number + "</a>");
 });

From 339e623ad3fb9d8719ced2d958a89fe975ea45e5 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Wed, 20 Apr 2016 12:27:19 -0400
Subject: [PATCH 2705/4742] [mode/meta] Add the mbox mode

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

diff --git a/mode/meta.js b/mode/meta.js
index 6980593ffc..eb25e242dd 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -87,6 +87,7 @@
     {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
     {name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
     {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
+    {name: "mbox", mime: "application/mbox", mode: "mbox", ext: ["mbox"]},
     {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
     {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
     {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},

From b751d25953caeefa9241a0ff3bfdfb0a56178389 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Wed, 20 Apr 2016 12:30:59 -0400
Subject: [PATCH 2706/4742] Fix a small typo in doc/releases.html and
 CHANGELOG.md

"commend addon" should be "comment addon".
---
 CHANGELOG.md      | 8 ++++----
 doc/releases.html | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6e39cce9a..8451136a05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 [vim bindings](http://codemirror.net/demo/vim.html): Only call `.save()` when it is actually available.
 
-[commend addon](http://codemirror.net/doc/manual.html#addon_comment): Be careful not to mangle multi-line strings.
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Be careful not to mangle multi-line strings.
 
 [Python mode](http://codemirror.net/mode/python/index.html): Improve distinguishing of decorators from `@` operators.
 
@@ -522,9 +522,9 @@ Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](http
 
 *   New mode: [Common Lisp](http://codemirror.net/mode/commonlisp/index.html).
 *   Fix right-click select-all on most browsers.
-*   Change the way highlighting happens:  
-      Saves memory and CPU cycles.  
-      `compareStates` is no longer needed.  
+*   Change the way highlighting happens:
+      Saves memory and CPU cycles.
+      `compareStates` is no longer needed.
       `onHighlightComplete` no longer works.
 *   Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.
 *   Add a [`CodeMirror.version`](http://codemirror.net/doc/manual.html#version) property.
diff --git a/doc/releases.html b/doc/releases.html
index 5e6a2b2b0b..a8a7408b09 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -35,7 +35,7 @@ <h2>Version 5.x</h2>
   <ul class="rel-note">
     <li><a href="http://codemirror.net/doc/manual.html#posFromIndex"><code>posFromIndex</code></a> and <a href="http://codemirror.net/doc/manual.html#indexFromPos"><code>indexFromPos</code></a> now take <a href="http://codemirror.net/doc/manual.html#option_lineSeparator"><code>lineSeparator</code></a> into account</li>
     <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Only call <code>.save()</code> when it is actually available</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">commend addon</a>: Be careful not to mangle multi-line strings</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Be careful not to mangle multi-line strings</li>
     <li><a href="http://codemirror.net/mode/python/index.html">Python mode</a>: Improve distinguishing of decorators from <code>@</code> operators</li>
     <li><a href="http://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a>: No longer return marks that touch but don't overlap given range</li>
     <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Add yank command</li>
@@ -210,7 +210,7 @@ <h2>Version 5.x</h2>
     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>New theme: <a href="../demo/theme.html#liquibyte">Liquibyte</a></li>
@@ -664,7 +664,7 @@ <h2>Version 3.x</h2>
     <li>Further improvements to the <a href="../demo/vim.html">vim mode</a>.</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.01...v3.1">list of patches</a>.</li>
   </ul>
-  
+
 
   <p class="rel">25-01-2013: <a href="http://codemirror.net/codemirror-3.02.zip">Version 3.02</a>:</p>
 
@@ -704,7 +704,7 @@ <h2>Version 3.x</h2>
     <li>Work around Safari segfault when dragging.</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
   </ul>
-  
+
   <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
 
   <ul class="rel-note">

From c22da6f3329f2c2ee67585416669da4c8954e791 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 21:20:55 +0200
Subject: [PATCH 2707/4742] Set dataTransfer.effectAllowed in dragstart handler

See https://discuss.codemirror.net/t/drag-drop-modifiers/721
---
 lib/codemirror.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4159737af3..f93c95e93a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3906,6 +3906,7 @@
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
 
     e.dataTransfer.setData("Text", cm.getSelection());
+    e.dataTransfer.effectAllowed = "copyMove"
 
     // Use dummy image instead of default browsers image.
     // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.

From a25a29159346102591733d2474d6015e170cea06 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 21:59:43 +0200
Subject: [PATCH 2708/4742] Use full version numbers in doc/compress.html

---
 bin/release       |  4 +---
 doc/compress.html | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/bin/release b/bin/release
index 2d78557fd0..18c5cdafc7 100755
--- a/bin/release
+++ b/bin/release
@@ -32,11 +32,9 @@ if (bumpOnly) process.exit(0);
 
 child.exec("bash bin/authors.sh", function(){});
 
-var simple = number.slice(0, number.lastIndexOf("."));
-
 rewrite("doc/compress.html", function(cmp) {
   return cmp.replace(/<option value="http:\/\/codemirror.net\/">HEAD<\/option>/,
-                     "<option value=\"http://codemirror.net/\">HEAD</option>\n        <option value=\"http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=" + number + ";f=\">" + simple + "</option>");
+                     "<option value=\"http://codemirror.net/\">HEAD</option>\n        <option value=\"http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=" + number + ";f=\">" + number + "</option>");
 });
 
 rewrite("index.html", function(index) {
diff --git a/doc/compress.html b/doc/compress.html
index 1e507c6c7a..78014a62fa 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,22 +36,22 @@ <h2>Script compression helper</h2>
       <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.14.0;f=">5.14</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.2;f=">5.13</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.0;f=">5.13</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.12.0;f=">5.12</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.11.0;f=">5.11</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.10.0;f=">5.10</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.9.0;f=">5.9</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.8.0;f=">5.8</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.7.0;f=">5.7</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.6.0;f=">5.6</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.5.0;f=">5.5</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.4.0;f=">5.4</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.3.0;f=">5.3</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=5.14.0;f=">5.14.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.2;f=">5.13.2</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.0;f=">5.13.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.12.0;f=">5.12.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.11.0;f=">5.11.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.10.0;f=">5.10.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.9.0;f=">5.9.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.8.0;f=">5.8.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.7.0;f=">5.7.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.6.0;f=">5.6.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.5.0;f=">5.5.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.4.0;f=">5.4.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.3.0;f=">5.3.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.2.0;f=">5.2.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.1.0;f=">5.1.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.0.0;f=">5.0.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.13.0;f=">4.13</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.12.0;f=">4.12</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.11.0;f=">4.11</option>

From c50b08ba4411a68dce8050f3d283fb9cc2b5f8cf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 22:07:27 +0200
Subject: [PATCH 2709/4742] Mark release 5.14.2

---
 CHANGELOG.md      | 10 ++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8451136a05..f6f3123732 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.14.2 (2016-04-20)
+
+### Bugfixes
+
+Push a new package to NPM due to an [NPM bug](https://github.com/npm/npm/issues/5082) omitting the LICENSE file in 5.14.0.
+
+Set `dataTransfer.effectAllowed` in `dragstart` handler to help browsers use the right drag icon.
+
+Add the [mbox mode](http://codemirror.net/mode/mbox/index.html) to `mode/meta.js`.
+
 ## 5.14.0 (2016-04-20)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 78014a62fa..479126921c 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.14.2;f=">5.14.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.0;f=">5.14.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.2;f=">5.13.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.0;f=">5.13.0</option>
diff --git a/doc/manual.html b/doc/manual.html
index 25bee51ffa..8d698b5732 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.14.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.14.2</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/index.html b/index.html
index 0893e0f8fb..99c649141f 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.14.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.14.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 f93c95e93a..aa0d3b4ffb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8892,7 +8892,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.14.1";
+  CodeMirror.version = "5.14.2";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 1c3ac8843b..216cf3b4c4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.14.1",
+    "version":"5.14.2",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 6164344b260b9af76826fd71b6923684a156984d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2016 22:08:13 +0200
Subject: [PATCH 2710/4742] Bump version number post-5.14.2

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8d698b5732..4e5f5cede2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.14.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.14.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index aa0d3b4ffb..238aa4380a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8892,7 +8892,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.14.2";
+  CodeMirror.version = "5.14.3";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 216cf3b4c4..e7d64b40c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.14.2",
+    "version":"5.14.3",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 255d019adb8a62eaad6740a6d81b6e4f80f891f0 Mon Sep 17 00:00:00 2001
From: Basarat Ali Syed <basaratali@gmail.com>
Date: Fri, 22 Apr 2016 05:02:01 +1000
Subject: [PATCH 2711/4742] [real-world uses] Add alm.tools

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 31139f2e99..4d8871d4b6 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -26,6 +26,7 @@ <h2>CodeMirror real-world uses</h2>
 
     <ul>
       <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
+      <li><a href="http://alm.tools">ALM Tools</a> (TypeScript powered IDE)</li>
       <li><a href="http://amber-lang.net/">Amber</a> (JavaScript-based Smalltalk system)</li>
       <li><a href="http://apachegui.ca/">Apache GUI</a></li>
       <li><a href="http://apeye.org/">APEye</a> (tool for testing &amp; documenting APIs)</li>

From 11cd0c68c9bead2762e767181e9e8ec2e0a47579 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 22 Apr 2016 11:01:08 +0200
Subject: [PATCH 2712/4742] [markdown mode] Fix some issues with link matching

Closes #3981
---
 mode/markdown/markdown.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 8bd3cc7a25..8995fd5f5a 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -437,13 +437,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return tokenTypes.image;
     }
 
-    if (ch === '[' && stream.match(/.*\](\(.*\)| ?\[.*\])/, false)) {
+    if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false)) {
       state.linkText = true;
       if (modeCfg.highlightFormatting) state.formatting = "link";
       return getType(state);
     }
 
-    if (ch === ']' && state.linkText && stream.match(/\(.*\)| ?\[.*\]/, false)) {
+    if (ch === ']' && state.linkText && stream.match(/\(.*?\)| ?\[.*?\]/, false)) {
       if (modeCfg.highlightFormatting) state.formatting = "link";
       var type = getType(state);
       state.linkText = false;

From 045882730f65ff0e853e54a32d729fd66e5a7489 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 26 Apr 2016 10:08:57 +0200
Subject: [PATCH 2713/4742] [vim bindings] Prevent line-wrapping between prompt
 prefix and prompt input

Issue #3991
---
 keymap/vim.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b2bee5a1c7..4278ee9798 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3782,17 +3782,10 @@
       }
     }
     function makePrompt(prefix, desc) {
-      var raw = '';
-      if (prefix) {
-        raw += '<span style="font-family: monospace">' + prefix + '</span>';
-      }
-      raw += '<input type="text"/> ' +
-          '<span style="color: #888">';
-      if (desc) {
-        raw += '<span style="color: #888">';
-        raw += desc;
-        raw += '</span>';
-      }
+      var raw = '<span style="font-family: monospace; white-space: pre">' +
+          (prefix || "") + '<input type="text"></span>';
+      if (desc)
+        raw += ' <span style="color: #888">' + desc + '</span>';
       return raw;
     }
     var searchPromptDesc = '(Javascript regexp)';

From 85ef20aa66a408f65103ab86e12b91aad3200795 Mon Sep 17 00:00:00 2001
From: Camilo Roca <carocad@unal.edu.co>
Date: Fri, 29 Apr 2016 22:14:42 +0200
Subject: [PATCH 2714/4742] [clojure more] Split long string into several lines

---
 mode/clojure/clojure.js | 62 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index cd8129f757..b4844baf02 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -31,14 +31,70 @@ CodeMirror.defineMode("clojure", function (options) {
     var atoms = makeKeywords("true false nil");
 
     var keywords = makeKeywords(
-      "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle");
+      "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest " +
+      "slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn " +
+      "do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync " +
+      "doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars " +
+      "binding gen-class gen-and-load-class gen-and-save-class handler-case handle");
 
     var builtins = makeKeywords(
-        "* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *compiler-options* *data-readers* *e *err* *file* *flush-on-newline* *fn-loader* *in* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> ->> ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE accessor aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? declare default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash hash-combine hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc inc' init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int rand-nth range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap *default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! set-agent-send-off-executor! some-> some->>");
+        "* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* " +
+        "*compile-path* *compiler-options* *data-readers* *e *err* *file* *flush-on-newline* *fn-loader* *in* " +
+        "*math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* " +
+        "*source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> " +
+        "->> ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE accessor " +
+        "aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! " +
+        "alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double " +
+        "aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 " +
+        "bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set " +
+        "bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast " +
+        "byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append " +
+        "chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors " +
+        "clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp " +
+        "conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? " +
+        "declare default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol " +
+        "defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc " +
+        "dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last " +
+        "drop-while empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info " +
+        "extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword " +
+        "find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? " +
+        "fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? " +
+        "gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash " +
+        "hash-combine hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc inc' init-proxy instance? " +
+        "int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep " +
+        "keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file " +
+        "load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array " +
+        "make-hierarchy map map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods " +
+        "min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty " +
+        "not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias " +
+        "ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all " +
+        "partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers " +
+        "primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str " +
+        "prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues " +
+        "quot rand rand-int rand-nth range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern " +
+        "re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history " +
+        "ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods " +
+        "remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest " +
+        "restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? " +
+        "seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts " +
+        "shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? " +
+        "special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol " +
+        "symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline " +
+        "transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec " +
+        "unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int " +
+        "unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int "+
+        "unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote " +
+        "unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of " +
+        "vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context " +
+        "with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap " +
+        "*default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! " +
+        "set-agent-send-off-executor! some-> some->>");
 
     var indentKeys = makeKeywords(
         // Built-ins
-        "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch " +
+        "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto " +
+        "locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type " +
+        "try catch " +
 
         // Binding forms
         "let letfn binding loop for doseq dotimes when-let if-let " +

From ea22650592d378d39a644997ef66b422478791b7 Mon Sep 17 00:00:00 2001
From: Camilo Roca <carocad@unal.edu.co>
Date: Fri, 29 Apr 2016 22:36:45 +0200
Subject: [PATCH 2715/4742] [clojure mode] Add functions names from Clojure
 v1.7

according to Clojure's changelog: https://github.com/clojure/clojure/blob/master/changes.md
---
 mode/clojure/clojure.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index b4844baf02..ed6af2c83c 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -48,14 +48,14 @@ CodeMirror.defineMode("clojure", function (options) {
         "aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 " +
         "bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set " +
         "bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast " +
-        "byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append " +
+        "byte byte-array bytes case cat cast char char-array char-escape-string char-name-string char? chars chunk chunk-append " +
         "chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors " +
-        "clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp " +
+        "clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement completing concat cond condp " +
         "conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? " +
-        "declare default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol " +
+        "declare dedupe default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol " +
         "defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc " +
         "dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last " +
-        "drop-while empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info " +
+        "drop-while eduction empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info " +
         "extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword " +
         "find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? " +
         "fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? " +
@@ -71,7 +71,7 @@ CodeMirror.defineMode("clojure", function (options) {
         "partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers " +
         "primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str " +
         "prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues " +
-        "quot rand rand-int rand-nth range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern " +
+        "quot rand rand-int rand-nth random-sample range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern " +
         "re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history " +
         "ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods " +
         "remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest " +
@@ -79,13 +79,13 @@ CodeMirror.defineMode("clojure", function (options) {
         "seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts " +
         "shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? " +
         "special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol " +
-        "symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline " +
+        "symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transduce " +
         "transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec " +
         "unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int " +
         "unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int "+
         "unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote " +
-        "unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of " +
-        "vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context " +
+        "unquote-splicing update update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of " +
+        "vector? volatile! volatile? vreset! vswap! when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context " +
         "with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap " +
         "*default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! " +
         "set-agent-send-off-executor! some-> some->>");

From f9b042fc97873aa6a43d6a1ed76ea9961109766e Mon Sep 17 00:00:00 2001
From: Chris Smith <cdsmith@gmail.com>
Date: Sat, 30 Apr 2016 17:14:00 -0700
Subject: [PATCH 2716/4742] Update URL for CodeWorld in real world uses

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 4d8871d4b6..7b7eeeaf1a 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -39,7 +39,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
-      <li><a href="http://codeworld.info/">CodeWorld</a> (Haskell playground)</li>
+      <li><a href="http://code.world/">CodeWorld</a> (Haskell playground)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
       <li><a href="https://codeanywhere.com/">Codeanywhere</a> (multi-platform cloud editor)</li>
       <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>

From 329b9e6ec334f92cf615644d0602090cb3f79d38 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 May 2016 10:57:39 +0200
Subject: [PATCH 2717/4742] [clike mode] Provide a dontIndentStatement option

Use it to make the C++ mode not indent template statements

Closes #4001
---
 mode/clike/clike.js | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 695d5ceff3..cac358a5df 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -11,21 +11,19 @@
 })(function(CodeMirror) {
 "use strict";
 
-function Context(indented, column, type, align, prev) {
+function Context(indented, column, type, info, align, prev) {
   this.indented = indented;
   this.column = column;
   this.type = type;
+  this.info = info;
   this.align = align;
   this.prev = prev;
 }
-function isStatement(type) {
-  return type == "statement" || type == "switchstatement" || type == "namespace";
-}
-function pushContext(state, col, type) {
+function pushContext(state, col, type, info) {
   var indent = state.indented;
-  if (state.context && isStatement(state.context.type) && !isStatement(type))
+  if (state.context && state.context.type != "statement" && type != "statement")
     indent = state.context.indented;
-  return state.context = new Context(indent, col, type, null, state.context);
+  return state.context = new Context(indent, col, type, info, null, state.context);
 }
 function popContext(state) {
   var t = state.context.type;
@@ -42,7 +40,7 @@ function typeBefore(stream, state) {
 function isTopScope(context) {
   for (;;) {
     if (!context || context.type == "top") return true;
-    if (context.type == "}" && context.prev.type != "namespace") return false;
+    if (context.type == "}" && context.prev.info != "namespace") return false;
     context = context.prev;
   }
 }
@@ -173,25 +171,20 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (style == "comment" || style == "meta") return style;
       if (ctx.align == null) ctx.align = true;
 
-      if (endStatement.test(curPunc)) while (isStatement(state.context.type)) popContext(state);
+      if (endStatement.test(curPunc)) while (state.context.type != "statement") popContext(state);
       else if (curPunc == "{") pushContext(state, stream.column(), "}");
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
       else if (curPunc == "}") {
-        while (isStatement(ctx.type)) ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
         if (ctx.type == "}") ctx = popContext(state);
-        while (isStatement(ctx.type)) ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
       }
       else if (curPunc == ctx.type) popContext(state);
       else if (indentStatements &&
                (((ctx.type == "}" || ctx.type == "top") && curPunc != ";") ||
-                (isStatement(ctx.type) && curPunc == "newstatement"))) {
-        var type = "statement";
-        if (curPunc == "newstatement" && indentSwitch && stream.current() == "switch")
-          type = "switchstatement";
-        else if (style == "keyword" && stream.current() == "namespace")
-          type = "namespace";
-        pushContext(state, stream.column(), type);
+                (ctx.type == "statement" && curPunc == "newstatement"))) {
+        pushContext(state, stream.column(), "statement", stream.current());
       }
 
       if (style == "variable" &&
@@ -215,18 +208,21 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     indent: function(state, textAfter) {
       if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (isStatement(ctx.type) && firstChar == "}") ctx = ctx.prev;
+      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
+      if (parserConfig.dontIndentStatements)
+        while (ctx.type == "statement" && parserConfig.dontIndentStatements.test(ctx.info))
+          ctx = ctx.prev
       if (hooks.indent) {
         var hook = hooks.indent(state, ctx, textAfter);
         if (typeof hook == "number") return hook
       }
       var closing = firstChar == ctx.type;
-      var switchBlock = ctx.prev && ctx.prev.type == "switchstatement";
+      var switchBlock = ctx.prev && ctx.prev.info == "switch";
       if (parserConfig.allmanIndentation && /[{(]/.test(firstChar)) {
         while (ctx.type != "top" && ctx.type != "}") ctx = ctx.prev
         return ctx.indented
       }
-      if (isStatement(ctx.type))
+      if (ctx.type == "statement")
         return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
       if (ctx.align && (!dontAlignCalls || ctx.type != ")"))
         return ctx.column + (closing ? 0 : 1);
@@ -386,6 +382,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     defKeywords: words("class namespace struct enum union"),
     typeFirstDefinitions: true,
     atoms: words("true false null"),
+    dontIndentStatements: /^template$/,
     hooks: {
       "#": cppHook,
       "*": pointerHook,

From 6ddab774c022754022106330ba966a74faae7ced Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 May 2016 11:05:25 +0200
Subject: [PATCH 2718/4742] [clike mode] Fix broken indentation caused by
 refactor in 329b9e6

Issue #4001
---
 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 cac358a5df..17c7f2ac19 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -171,7 +171,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (style == "comment" || style == "meta") return style;
       if (ctx.align == null) ctx.align = true;
 
-      if (endStatement.test(curPunc)) while (state.context.type != "statement") popContext(state);
+      if (endStatement.test(curPunc)) while (state.context.type == "statement") popContext(state);
       else if (curPunc == "{") pushContext(state, stream.column(), "}");
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");

From b9e0c4cd0bab86a440cb10e3505bd6691bb0f001 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 May 2016 11:42:50 +0200
Subject: [PATCH 2719/4742] Fix dropping of selection in contenteditable input
 style

Issue #3979
---
 lib/codemirror.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 238aa4380a..3d78108fd0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1663,9 +1663,9 @@
       return result;
     },
 
-    showSelection: function(info) {
+    showSelection: function(info, takeFocus) {
       if (!info || !this.cm.display.view.length) return;
-      if (info.focus) this.showPrimarySelection();
+      if (info.focus || takeFocus) this.showPrimarySelection();
       this.showMultipleSelections(info);
     },
 
@@ -3101,7 +3101,7 @@
     }
 
     if (op.updatedDisplay || op.selectionChanged)
-      op.preparedSelection = display.input.prepareSelection();
+      op.preparedSelection = display.input.prepareSelection(op.focus);
   }
 
   function endOperation_W2(op) {
@@ -3114,8 +3114,9 @@
       cm.display.maxLineChanged = false;
     }
 
+    var takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
     if (op.preparedSelection)
-      cm.display.input.showSelection(op.preparedSelection);
+      cm.display.input.showSelection(op.preparedSelection, takeFocus);
     if (op.updatedDisplay || op.startHeight != cm.doc.height)
       updateScrollbars(cm, op.barMeasure);
     if (op.updatedDisplay)
@@ -3125,8 +3126,7 @@
 
     if (cm.state.focused && op.updateInput)
       cm.display.input.reset(op.typing);
-    if (op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus()))
-      ensureFocus(op.cm);
+    if (takeFocus) ensureFocus(op.cm);
   }
 
   function endOperation_finish(op) {

From 9ac5d204e359950c40bd655baeb18dfd97417c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Petr=C5=BEela?= <pavel@petrzela.eu>
Date: Wed, 20 Apr 2016 14:29:16 +0200
Subject: [PATCH 2720/4742] [sublime keymap] Auto-indent after insertLine

---
 keymap/sublime.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 3cf67413ab..d9b64ba9af 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -124,6 +124,7 @@
       }
       cm.setSelections(newSelection);
     });
+    cm.execCommand("indentAuto");
   }
 
   cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { return insertLine(cm, false); };

From bef43ea825f5fdc865ce1942a046cd0a1fc63aeb Mon Sep 17 00:00:00 2001
From: ngn <nick.nickolov@gmail.com>
Date: Mon, 25 Apr 2016 14:14:47 +0100
Subject: [PATCH 2721/4742] Include all ASCII control codes in specialChars

* \x1a-\x1f were missing though it looks like the intention was to cover all below \x20 (space)
* added \x7f which is usually considered non-printable
* removed \t which was already covered in \x00-\x19 as \x09
---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3d78108fd0..3c154b9516 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5392,7 +5392,7 @@
     for (var i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   });
-  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
+  option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
     if (old != CodeMirror.Init) cm.refresh();
   });

From 5b84f3d0a9d37bc837d5f2f914c2c75b4b6776e5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 May 2016 11:55:51 +0200
Subject: [PATCH 2722/4742] Update manual to reflect current default of
 specialChars

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

diff --git a/doc/manual.html b/doc/manual.html
index 4e5f5cede2..8c99a99efa 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -285,7 +285,7 @@ <h2>Configuration</h2>
       should be replaced by a
       special <a href="#option_specialCharPlaceholder">placeholder</a>.
       Mostly useful for non-printing special characters. The default
-      is <code>/[\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/</code>.</dd>
+      is <code>/[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/</code>.</dd>
       <dt id="option_specialCharPlaceholder"><code><strong>specialCharPlaceholder</strong>: function(char) → Element</code></dt>
       <dd>A function that, given a special character identified by
       the <a href="#option_specialChars"><code>specialChars</code></a>

From b38eb3f49c0582f7dcc8b5bf4a35ab2404616318 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 May 2016 12:00:46 +0200
Subject: [PATCH 2723/4742] Use CodeMirror.startState helper when getting state
 for inner modes

Closes #3994
---
 mode/ebnf/ebnf.js           | 2 +-
 mode/haml/haml.js           | 4 ++--
 mode/htmlmixed/htmlmixed.js | 2 +-
 mode/jade/jade.js           | 6 +++---
 mode/markdown/markdown.js   | 2 +-
 mode/pegjs/pegjs.js         | 2 +-
 mode/slim/slim.js           | 8 ++++----
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mode/ebnf/ebnf.js b/mode/ebnf/ebnf.js
index 6b51aba07e..9618f8e42b 100644
--- a/mode/ebnf/ebnf.js
+++ b/mode/ebnf/ebnf.js
@@ -94,7 +94,7 @@
 
         if (bracesMode !== null && (state.braced || peek === "{")) {
           if (state.localState === null)
-            state.localState = bracesMode.startState();
+            state.localState = CodeMirror.startState(bracesMode);
 
           var token = bracesMode.token(stream, state.localState),
           text = stream.current();
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 86def73ebb..20ae1e19ca 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -98,8 +98,8 @@
     return {
       // default to html mode
       startState: function() {
-        var htmlState = htmlMode.startState();
-        var rubyState = rubyMode.startState();
+        var htmlState = CodeMirror.startState(htmlMode);
+        var rubyState = CodeMirror.startState(rubyMode);
         return {
           htmlState: htmlState,
           rubyState: rubyState,
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 6574fbd569..d74083ee1a 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -115,7 +115,7 @@
 
     return {
       startState: function () {
-        var state = htmlMode.startState();
+        var state = CodeMirror.startState(htmlMode);
         return {token: html, inTag: null, localMode: null, localState: null, htmlState: state};
       },
 
diff --git a/mode/jade/jade.js b/mode/jade/jade.js
index 1db069a90e..51ed105aca 100644
--- a/mode/jade/jade.js
+++ b/mode/jade/jade.js
@@ -36,7 +36,7 @@ CodeMirror.defineMode('jade', function (config) {
     this.isInterpolating = false;
     this.interpolationNesting = 0;
 
-    this.jsState = jsMode.startState();
+    this.jsState = CodeMirror.startState(jsMode);
 
     this.restOfLine = '';
 
@@ -386,7 +386,7 @@ CodeMirror.defineMode('jade', function (config) {
       if (state.inAttributeName && stream.match(/^[^=,\)!]+/)) {
         if (stream.peek() === '=' || stream.peek() === '!') {
           state.inAttributeName = false;
-          state.jsState = jsMode.startState();
+          state.jsState = CodeMirror.startState(jsMode);
           if (state.lastTag === 'script' && stream.current().trim().toLowerCase() === 'type') {
             state.attributeIsType = true;
           } else {
@@ -492,7 +492,7 @@ CodeMirror.defineMode('jade', function (config) {
     if (stream.indentation() > state.indentOf || (state.innerModeForLine && !stream.sol()) || force) {
       if (state.innerMode) {
         if (!state.innerState) {
-          state.innerState = state.innerMode.startState ? state.innerMode.startState(stream.indentation()) : {};
+          state.innerState = state.innerMode.startState ? CodeMirror.startState(state.innerMode, stream.indentation()) : {};
         }
         return stream.hideFirstChars(state.indentOf + 2, function () {
           return state.innerMode.token(stream, state.innerState) || true;
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 8995fd5f5a..fd8f647fd2 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -218,7 +218,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.fencedChars = match[1]
       // try switching mode
       state.localMode = getMode(match[2]);
-      if (state.localMode) state.localState = state.localMode.startState();
+      if (state.localMode) state.localState = CodeMirror.startState(state.localMode);
       state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
       state.code = -1
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index 8e87b59eca..6c72074666 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -81,7 +81,7 @@ CodeMirror.defineMode("pegjs", function (config) {
         return "comment";
       } else if (state.braced || stream.peek() === '{') {
         if (state.localState === null) {
-          state.localState = jsMode.startState();
+          state.localState = CodeMirror.startState(jsMode);
         }
         var token = jsMode.token(stream, state.localState);
         var text = stream.current();
diff --git a/mode/slim/slim.js b/mode/slim/slim.js
index 164464d066..991a97efcd 100644
--- a/mode/slim/slim.js
+++ b/mode/slim/slim.js
@@ -165,7 +165,7 @@
       };
       return function(stream, state) {
         rubyState = state.rubyState;
-        state.rubyState = rubyMode.startState();
+        state.rubyState = CodeMirror.startState(rubyMode);
         state.tokenize = runSplat;
         return ruby(stream, state);
       };
@@ -317,7 +317,7 @@
 
     function startSubMode(mode, state) {
       var subMode = getMode(mode);
-      var subState = subMode.startState && subMode.startState();
+      var subState = CodeMirror.startState(subMode);
 
       state.subMode = subMode;
       state.subState = subState;
@@ -507,8 +507,8 @@
     var mode = {
       // default to html mode
       startState: function() {
-        var htmlState = htmlMode.startState();
-        var rubyState = rubyMode.startState();
+        var htmlState = CodeMirror.startState(htmlMode);
+        var rubyState = CodeMirror.startState(rubyMode);
         return {
           htmlState: htmlState,
           rubyState: rubyState,

From 0587510a41598fbcb14ce22782e8d4ec0fbc8f9f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 May 2016 12:16:50 +0200
Subject: [PATCH 2724/4742] Fix bug in check for overlapping collapsed ranges

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3c154b9516..f00f2da966 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6560,8 +6560,8 @@
       var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
       var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
       if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
-      if (fromCmp <= 0 && (cmp(found.to, from) > 0 || (sp.marker.inclusiveRight && marker.inclusiveLeft)) ||
-          fromCmp >= 0 && (cmp(found.from, to) < 0 || (sp.marker.inclusiveLeft && marker.inclusiveRight)))
+      if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
+          fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
         return true;
     }
   }

From 848c524d450abb44895277e3865c4832f3a117c6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 5 May 2016 21:05:51 +0200
Subject: [PATCH 2725/4742] [markdown mode] Better heuristic for finding the
 end of a link URL

Closes #4013
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index fd8f647fd2..2e2b5fe46c 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -608,7 +608,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return function(stream, state) {
       var ch = stream.next();
 
-      if (ch === endChar) {
+      if (ch === endChar && stream.match(/^([.,\s;:]|[^\]\)]*$)/, false)) {
         state.f = state.inline = inlineNormal;
         if (modeCfg.highlightFormatting) state.formatting = "link-string";
         var returnState = getType(state);

From 575d1aa98a081ebfb65efd2039f0c48afbefacc8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 5 May 2016 21:32:01 +0200
Subject: [PATCH 2726/4742] [markdown mode] Make link parsing conform to
 CommonMark spec

Issue #4013
---
 mode/markdown/markdown.js | 26 ++++++++------------------
 mode/markdown/test.js     |  3 +++
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 2e2b5fe46c..37329c2385 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -596,7 +596,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
     var ch = stream.next();
     if (ch === '(' || ch === '[') {
-      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]");
+      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]", 0);
       if (modeCfg.highlightFormatting) state.formatting = "link-string";
       state.linkHref = true;
       return getType(state);
@@ -604,11 +604,16 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return 'error';
   }
 
+  var linkRE = {
+    ")": /^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,
+    "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\\]]|\\.)*\])*?(?=\])/
+  }
+
   function getLinkHrefInside(endChar) {
     return function(stream, state) {
       var ch = stream.next();
 
-      if (ch === endChar && stream.match(/^([.,\s;:]|[^\]\)]*$)/, false)) {
+      if (ch === endChar) {
         state.f = state.inline = inlineNormal;
         if (modeCfg.highlightFormatting) state.formatting = "link-string";
         var returnState = getType(state);
@@ -616,10 +621,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         return returnState;
       }
 
-      if (stream.match(inlineRE(endChar), true)) {
-        stream.backUp(1);
-      }
-
+      stream.match(linkRE[endChar])
       state.linkHref = true;
       return getType(state);
     };
@@ -667,18 +669,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return tokenTypes.linkHref + " url";
   }
 
-  var savedInlineRE = [];
-  function inlineRE(endChar) {
-    if (!savedInlineRE[endChar]) {
-      // Escape endChar for RegExp (taken from http://stackoverflow.com/a/494122/526741)
-      endChar = (endChar+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
-      // Match any non-endChar, escaped character, as well as the closing
-      // endChar.
-      savedInlineRE[endChar] = new RegExp('^(?:[^\\\\]|\\\\.)*?(' + endChar + ')');
-    }
-    return savedInlineRE[endChar];
-  }
-
   var mode = {
     startState: function() {
       return {
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index e2b3a81527..e76eae9027 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -782,6 +782,9 @@
   MT("emStrongMixed",
      "[em *foo][em&strong __bar_hello** world]");
 
+  MT("linkWithNestedParens",
+     "[link [[foo]]][string&url (bar(baz))]")
+
   // These characters should be escaped:
   // \   backslash
   // `   backtick

From f3027c4f810fd5870e3626de008bf85dc0dc8edf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 5 May 2016 21:33:55 +0200
Subject: [PATCH 2727/4742] [php mode] Add some builtins

Closes #4009
---
 mode/php/php.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index 22494467b2..57ba812d72 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -86,7 +86,7 @@
     "die echo empty exit eval include include_once isset list require require_once return " +
     "print unset __halt_compiler self static parent yield insteadof finally";
   var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
-  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
+  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
   CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
   CodeMirror.registerHelper("wordChars", "php", /[\w$]/);
 

From 14dae96542c63c155adf6e7dfce79df1b0a43218 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 5 May 2016 21:58:59 +0200
Subject: [PATCH 2728/4742] [clike mode] Look across lines to recognize defined
 names after types

Closes #4012
---
 mode/clike/clike.js | 17 ++++++++++++-----
 mode/clike/test.js  |  4 ++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 17c7f2ac19..8f6757c58e 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -32,9 +32,10 @@ function popContext(state) {
   return state.context = state.context.prev;
 }
 
-function typeBefore(stream, state) {
+function typeBefore(stream, state, pos) {
   if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
-  if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
+  if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, pos))) return true;
+  if (state.typeAtEndOfLine && stream.column() == stream.indentation()) return true;
 }
 
 function isTopScope(context) {
@@ -145,6 +146,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return "comment";
   }
 
+  function maybeEOL(stream, state) {
+    if (parserConfig.typeFirstDefinitions && stream.eol() && isTopScope(state.context))
+      state.typeAtEndOfLine = typeBefore(stream, state, stream.pos)
+  }
+
   // Interface
 
   return {
@@ -165,7 +171,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         state.indented = stream.indentation();
         state.startOfLine = true;
       }
-      if (stream.eatSpace()) return null;
+      if (stream.eatSpace()) { maybeEOL(stream, state); return null; }
       curPunc = isDefKeyword = null;
       var style = (state.tokenize || tokenBase)(stream, state);
       if (style == "comment" || style == "meta") return style;
@@ -189,7 +195,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
       if (style == "variable" &&
           ((state.prevToken == "def" ||
-            (parserConfig.typeFirstDefinitions && typeBefore(stream, state) &&
+            (parserConfig.typeFirstDefinitions && typeBefore(stream, state, stream.start) &&
              isTopScope(state.context) && stream.match(/^\s*\(/, false)))))
         style = "def";
 
@@ -202,11 +208,12 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
       state.startOfLine = false;
       state.prevToken = isDefKeyword ? "def" : style || curPunc;
+      maybeEOL(stream, state);
       return style;
     },
 
     indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
+      if (state.tokenize != tokenBase && state.tokenize != null || state.typeAtEndOfLine) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
       if (parserConfig.dontIndentStatements)
diff --git a/mode/clike/test.js b/mode/clike/test.js
index c26003266c..bea85b8693 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -25,6 +25,10 @@
      "[keyword struct] [def bar]{}",
      "[variable-3 int] [variable-3 *][def baz]() {}");
 
+  MT("def_new_line",
+     "::[variable std]::[variable SomeTerribleType][operator <][variable T][operator >]",
+     "[def SomeLongMethodNameThatDoesntFitIntoOneLine]([keyword const] [variable MyType][operator &] [variable param]) {}")
+
   MT("double_block",
      "[keyword for] (;;)",
      "  [keyword for] (;;)",

From 90d8250048153cc33b2e72d50a000670dbbbc33b Mon Sep 17 00:00:00 2001
From: TDaglis <ath.daglis@gmail.com>
Date: Mon, 9 May 2016 18:03:59 +0300
Subject: [PATCH 2729/4742] [fortran mode] Fix typo in demo page

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

diff --git a/mode/fortran/index.html b/mode/fortran/index.html
index 102e8f8269..9aed0efccc 100644
--- a/mode/fortran/index.html
+++ b/mode/fortran/index.html
@@ -77,5 +77,5 @@ <h2>Fortran mode</h2>
       });
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-Fortran</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/x-fortran</code>.</p>
   </article>

From 948235002deeb6a7a50ed98f4c19e7b18e1136ae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 11 May 2016 12:09:14 +0200
Subject: [PATCH 2730/4742] Clean up Array.join kludge

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f00f2da966..33928bc8ea 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5721,7 +5721,7 @@
       for (var i = 0; i < ranges.length; i++) {
         var pos = ranges[i].from();
         var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
-        spaces.push(new Array(tabSize - col % tabSize + 1).join(" "));
+        spaces.push(spaceStr(tabSize - col % tabSize));
       }
       cm.replaceSelections(spaces);
     },

From 7dd2cfd7ceb131f711cccf965bef086b238264e2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 May 2016 09:40:02 +0200
Subject: [PATCH 2731/4742] [clike mode] Fix bug in context copying

Closes #4020
---
 mode/clike/clike.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 8f6757c58e..aadab9e114 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -157,7 +157,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     startState: function(basecolumn) {
       return {
         tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", null, false),
         indented: 0,
         startOfLine: true,
         prevToken: null
@@ -535,7 +535,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "=": function(stream, state) {
         var cx = state.context
         if (cx.type == "}" && cx.align && stream.eat(">")) {
-          state.context = new Context(cx.indented, cx.column, cx.type, null, cx.prev)
+          state.context = new Context(cx.indented, cx.column, cx.type, cx.info, null, cx.prev)
           return "operator"
         } else {
           return false

From 5cf02c9187a8b951664d54cc531ce9b67f7226c6 Mon Sep 17 00:00:00 2001
From: Jared Jacobs <jaredjacobs@forwardnetworks.com>
Date: Wed, 11 May 2016 17:44:28 -0700
Subject: [PATCH 2732/4742] Optimizing BranchChunk.insertInner for large files

---
 lib/codemirror.js | 63 ++++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 33928bc8ea..2fe344e071 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7315,13 +7315,20 @@
         var child = this.children[i], sz = child.chunkSize();
         if (at <= sz) {
           child.insertInner(at, lines, height);
-          if (child.lines && child.lines.length > 50) {
-            while (child.lines.length > 50) {
-              var spilled = child.lines.splice(child.lines.length - 25, 25);
-              var newleaf = new LeafChunk(spilled);
-              child.height -= newleaf.height;
-              this.children.splice(i + 1, 0, newleaf);
-              newleaf.parent = this;
+          var childLines = child.lines;
+          var childLinesLen = childLines && childLines.length;
+          if (childLinesLen > 50) {
+            // To avoid memory thrashing when childLines is huge (e.g. first view of a large file), it's never spliced.
+            // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
+            var numNewLeafs = Math.ceil((childLinesLen - 50) / 25);
+            var newChildLinesLen = childLinesLen - numNewLeafs * 25;
+            child.lines = childLines.slice(0, newChildLinesLen);
+            for (var j = 0; j < numNewLeafs; j++) {
+              var leafStart = newChildLinesLen + j * 25;
+              var leaf = new LeafChunk(childLines.slice(leafStart, leafStart + 25));
+              child.height -= leaf.height;
+              this.children.push(leaf);
+              leaf.parent = this;
             }
             this.maybeSpill();
           }
@@ -7332,25 +7339,31 @@
     },
     // When a node has grown, check whether it should be split.
     maybeSpill: function() {
-      if (this.children.length <= 10) return;
       var me = this;
-      do {
-        var spilled = me.children.splice(me.children.length - 5, 5);
-        var sibling = new BranchChunk(spilled);
-        if (!me.parent) { // Become the parent node
-          var copy = new BranchChunk(me.children);
-          copy.parent = me;
-          me.children = [copy, sibling];
-          me = copy;
-        } else {
-          me.size -= sibling.size;
-          me.height -= sibling.height;
-          var myIndex = indexOf(me.parent.children, me);
-          me.parent.children.splice(myIndex + 1, 0, sibling);
-        }
-        sibling.parent = me.parent;
-      } while (me.children.length > 10);
-      me.parent.maybeSpill();
+      var children = me.children;
+      var numChildren = children.length;
+      if (numChildren <= 10) return;
+      // To avoid memory thrashing when the children array is huge (e.g. first view of a large file), it's never spliced.
+      // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
+      var parent = me.parent || me;
+      var numMoreBranches = Math.ceil((numChildren - 10) / 5);
+      var firstBranchNumChildren = numChildren - numMoreBranches * 5;
+      var firstBranch = new BranchChunk(children.slice(0, firstBranchNumChildren));
+      var branches = [firstBranch];
+      firstBranch.parent = parent;
+      for (var i = 0; i < numMoreBranches; i++) {
+        var branchStart = firstBranchNumChildren + i * 5;
+        var branch = new BranchChunk(children.slice(branchStart, branchStart + 5));
+        branches.push(branch);
+        branch.parent = parent;
+      }
+      if (parent === me) {
+        parent.children = branches;
+      } else {
+        var myIndex = indexOf(parent.children, me);
+        parent.children.splice(myIndex, 1, branches);
+      }
+      parent.maybeSpill();
     },
     iterN: function(at, n, op) {
       for (var i = 0; i < this.children.length; ++i) {

From 9ad383797c28dab90ef9182083c96ccd8a96bb58 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 May 2016 10:11:30 +0200
Subject: [PATCH 2733/4742] Update code in 5cf02c9187

Issue #4022
---
 lib/codemirror.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2fe344e071..37a0fd92dd 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7315,21 +7315,17 @@
         var child = this.children[i], sz = child.chunkSize();
         if (at <= sz) {
           child.insertInner(at, lines, height);
-          var childLines = child.lines;
-          var childLinesLen = childLines && childLines.length;
-          if (childLinesLen > 50) {
-            // To avoid memory thrashing when childLines is huge (e.g. first view of a large file), it's never spliced.
+          if (child.lines && child.lines.length > 50) {
+            // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
             // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
-            var numNewLeafs = Math.ceil((childLinesLen - 50) / 25);
-            var newChildLinesLen = childLinesLen - numNewLeafs * 25;
-            child.lines = childLines.slice(0, newChildLinesLen);
-            for (var j = 0; j < numNewLeafs; j++) {
-              var leafStart = newChildLinesLen + j * 25;
-              var leaf = new LeafChunk(childLines.slice(leafStart, leafStart + 25));
+            var remaining = child.lines.length % 25 + 25
+            for (var pos = remaining; pos < child.lines.length;) {
+              var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
               child.height -= leaf.height;
-              this.children.push(leaf);
+              this.children.splice(++i, 0, leaf);
               leaf.parent = this;
             }
+            child.lines = child.lines.slice(0, remaining);
             this.maybeSpill();
           }
           break;

From 1943fc428a26ad298d4e18eb049b268add4d0347 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 May 2016 10:53:29 +0200
Subject: [PATCH 2734/4742] Make workaround for Webkit whitespace: pre bug more
 robust

Issue #2901
---
 lib/codemirror.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 37a0fd92dd..fe51bd3bdc 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6963,8 +6963,11 @@
     }
 
     // See issue #2901
-    if (webkit && /\bcm-tab\b/.test(builder.content.lastChild.className))
-      builder.content.className = "cm-tab-wrap-hack";
+    if (webkit) {
+      var last = builder.content.lastChild
+      if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
+        builder.content.className = "cm-tab-wrap-hack";
+    }
 
     signal(cm, "renderLine", cm, lineView.line, builder.pre);
     if (builder.pre.className)

From 0ca8205af4a691683ce336949780e8d42e05cd52 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 15 May 2016 21:56:30 +0200
Subject: [PATCH 2735/4742] [lint addon] Set precise colors for tooltips

Closes #4025
---
 addon/lint/lint.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index 414a9a0e06..f097cfe345 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -4,10 +4,10 @@
 }
 
 .CodeMirror-lint-tooltip {
-  background-color: infobackground;
+  background-color: #ffd;
   border: 1px solid black;
   border-radius: 4px 4px 4px 4px;
-  color: infotext;
+  color: black;
   font-family: monospace;
   font-size: 10pt;
   overflow: hidden;

From cdabb671e357cf7d52f16abc0df2f73e01cec816 Mon Sep 17 00:00:00 2001
From: Weiyan Shao <lighteningman@gmail.com>
Date: Tue, 17 May 2016 11:19:30 +0200
Subject: [PATCH 2736/4742] [htmlembedded mode] Update documentation

1. Mention multiplex as a dependency
2. Add ERB as a MIME-type
---
 mode/htmlembedded/index.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index f27582ef86..9ed33cffef 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -51,9 +51,10 @@ <h2>Html Embedded Scripts mode</h2>
       });
     </script>
 
-    <p>Mode for html embedded scripts like JSP and ASP.NET. Depends on HtmlMixed which in turn depends on
+    <p>Mode for html embedded scripts like JSP and ASP.NET. Depends on multiplex and HtmlMixed which in turn depends on
     JavaScript, CSS and XML.<br />Other dependencies include those of the scripting language chosen.</p>
 
-    <p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET), 
-    <code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)</p>
+    <p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET),
+    <code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)
+    and <code>application/x-erb</code></p>
   </article>

From 601cb37f77aea0e512cc2546d00814eedfb2d011 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 2 May 2016 15:11:32 +0200
Subject: [PATCH 2737/4742] [css mode] Update Grid Layout properties and values

Add gutters properties (grid-gap, grid-column-gap and grid-row-gap):
https://www.w3.org/TR/css-grid-1/#gutters

Take advantage to add some missing keywors:
* grid and inline-grid: https://www.w3.org/TR/css-grid-1/#grid-containers
* dense: https://www.w3.org/TR/css-grid-1/#grid-auto-flow-property

It's been a while since the list of properties has been updated:
https://drafts.csswg.org/css-grid/#property-index
---
 mode/css/css.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index e9656e3dcc..ea7bd01d84 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -484,9 +484,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
     "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
     "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow",
-    "grid-auto-position", "grid-auto-rows", "grid-column", "grid-column-end",
-    "grid-column-start", "grid-row", "grid-row-end", "grid-row-start",
-    "grid-template", "grid-template-areas", "grid-template-columns",
+    "grid-auto-rows", "grid-column", "grid-column-end", "grid-column-gap",
+    "grid-column-start", "grid-gap", "grid-row", "grid-row-end", "grid-row-gap",
+    "grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
     "grid-template-rows", "hanging-punctuation", "height", "hyphens",
     "icon", "image-orientation", "image-rendering", "image-resolution",
     "inline-box-align", "justify-content", "left", "letter-spacing",
@@ -601,7 +601,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "compact", "condensed", "contain", "content",
     "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
     "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
-    "decimal-leading-zero", "default", "default-button", "destination-atop",
+    "decimal-leading-zero", "default", "default-button", "dense", "destination-atop",
     "destination-in", "destination-out", "destination-over", "devanagari", "difference",
     "disc", "discard", "disclosure-closed", "disclosure-open", "document",
     "dot-dash", "dot-dot-dash",
@@ -615,13 +615,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
     "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
     "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
-    "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
+    "forwards", "from", "geometricPrecision", "georgian", "graytext", "grid", "groove",
     "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
     "help", "hidden", "hide", "higher", "highlight", "highlighttext",
     "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore",
     "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
     "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
-    "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert",
+    "inline-block", "inline-flex", "inline-grid", "inline-table", "inset", "inside", "intrinsic", "invert",
     "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
     "katakana", "katakana-iroha", "keep-all", "khmer",
     "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",

From 5067baec7bbbe33633c14049d82a0198d9e168b7 Mon Sep 17 00:00:00 2001
From: TDaglis <ath.daglis@gmail.com>
Date: Wed, 11 May 2016 12:44:54 +0300
Subject: [PATCH 2738/4742] [vim mode] Fix fat-cursor border

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

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 1cf66a9fa9..4bd815eb54 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -52,7 +52,7 @@
 }
 .cm-fat-cursor .CodeMirror-cursor {
   width: auto;
-  border: 0;
+  border: 0 !important;
   background: #7e7;
 }
 .cm-fat-cursor div.CodeMirror-cursors {

From 55a47a5ecb40e3303d2cdbf602f6dbbe87ee5a3a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 17 May 2016 15:27:24 +0200
Subject: [PATCH 2739/4742] Revert "[sublime keymap] Add sublime-style smart
 backspace"

This reverts commit 8dbb84f44d3f4cdecde25e910277ca1816f80a24.

Issue #3127
---
 keymap/sublime.js | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index d9b64ba9af..c1749e7196 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -420,27 +420,6 @@
 
   map[cK + ctrl + "Backspace"] = "delLineLeft";
 
-  cmds[map["Backspace"] = "smartBackspace"] = function(cm) {
-    if (cm.somethingSelected()) return CodeMirror.Pass;
-
-    var cursor = cm.getCursor();
-    var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
-    var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
-    var indentUnit = cm.getOption("indentUnit");
-
-    if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) {
-      var prevIndent = new Pos(cursor.line,
-        CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit));
-
-      // If no smart delete is happening (due to tab sizing) just do a regular delete
-      if (prevIndent.ch == cursor.ch) return CodeMirror.Pass;
-
-      return cm.replaceRange("", prevIndent, cursor, "+delete");
-    } else {
-      return CodeMirror.Pass;
-    }
-  };
-
   cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();

From ea280945f56262d47e2e33ffa212e20e913bc0e6 Mon Sep 17 00:00:00 2001
From: Markus Bordihn <mbordihn@google.com>
Date: Fri, 13 May 2016 12:06:25 +0200
Subject: [PATCH 2740/4742] Fixed redeclared variables to avoid compiler
 warnings.

---
 addon/edit/closebrackets.js |  2 +-
 addon/fold/brace-fold.js    | 16 ++++++++--------
 addon/fold/xml-fold.js      |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 3eb9d8eae7..af7fce2a82 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -109,7 +109,7 @@
     var ranges = cm.listSelections();
     var opening = pos % 2 == 0;
 
-    var type, next;
+    var type;
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i], cur = range.head, curType;
       var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 1605f6c2a9..13c0f0cd88 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -13,7 +13,7 @@
 
 CodeMirror.registerHelper("fold", "brace", function(cm, start) {
   var line = start.line, lineText = cm.getLine(line);
-  var startCh, tokenType;
+  var tokenType;
 
   function findOpening(openCh) {
     for (var at = start.ch, pass = 0;;) {
@@ -72,15 +72,15 @@ CodeMirror.registerHelper("fold", "import", function(cm, start) {
     }
   }
 
-  var start = start.line, has = hasImport(start), prev;
-  if (!has || hasImport(start - 1) || ((prev = hasImport(start - 2)) && prev.end.line == start - 1))
+  var startLine = start.line, has = hasImport(startLine), prev;
+  if (!has || hasImport(startLine - 1) || ((prev = hasImport(startLine - 2)) && prev.end.line == startLine - 1))
     return null;
   for (var end = has.end;;) {
     var next = hasImport(end.line + 1);
     if (next == null) break;
     end = next.end;
   }
-  return {from: cm.clipPos(CodeMirror.Pos(start, has.startCh + 1)), to: end};
+  return {from: cm.clipPos(CodeMirror.Pos(startLine, has.startCh + 1)), to: end};
 });
 
 CodeMirror.registerHelper("fold", "include", function(cm, start) {
@@ -91,14 +91,14 @@ CodeMirror.registerHelper("fold", "include", function(cm, start) {
     if (start.type == "meta" && start.string.slice(0, 8) == "#include") return start.start + 8;
   }
 
-  var start = start.line, has = hasInclude(start);
-  if (has == null || hasInclude(start - 1) != null) return null;
-  for (var end = start;;) {
+  var startLine = start.line, has = hasInclude(startLine);
+  if (has == null || hasInclude(startLine - 1) != null) return null;
+  for (var end = startLine;;) {
     var next = hasInclude(end + 1);
     if (next == null) break;
     ++end;
   }
-  return {from: CodeMirror.Pos(start, has + 1),
+  return {from: CodeMirror.Pos(startLine, has + 1),
           to: cm.clipPos(CodeMirror.Pos(end))};
 });
 
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 504727f38c..f8c67b8976 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -140,9 +140,9 @@
       var openTag = toNextTag(iter), end;
       if (!openTag || iter.line != start.line || !(end = toTagEnd(iter))) return;
       if (!openTag[1] && end != "selfClose") {
-        var start = Pos(iter.line, iter.ch);
-        var close = findMatchingClose(iter, openTag[2]);
-        return close && {from: start, to: close.from};
+        var startPos = Pos(iter.line, iter.ch);
+        var endPos = findMatchingClose(iter, openTag[2]);
+        return endPos && {from: startPos, to: endPos.from};
       }
     }
   });

From 65eee1b8c2a893311d68c7db070393590ba68d85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 17 May 2016 15:49:53 +0200
Subject: [PATCH 2741/4742] Bind Ctrl-O to openLine on OS X

Closes #745
---
 lib/codemirror.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fe51bd3bdc..0a343efaa8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5764,6 +5764,7 @@
         ensureCursorVisible(cm);
       });
     },
+    openLine: function(cm) {cm.replaceSelection("\n", "start")},
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}
   };
 
@@ -5798,7 +5799,8 @@
     "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
     "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
     "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
-    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
+    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
+    "Ctrl-O": "openLine"
   };
   keyMap.macDefault = {
     "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",

From 981217306a2a1250a95d5ca8a829b5380f7a618b Mon Sep 17 00:00:00 2001
From: matthewhayes <matthewhayes@localhost>
Date: Mon, 16 May 2016 19:25:16 -0700
Subject: [PATCH 2742/4742] Paste linewise-copied content at beginning of line

Closes #3983
---
 lib/codemirror.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0a343efaa8..a51a525e2d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1100,6 +1100,10 @@
   // when pasting, we know what kind of selections the copied text
   // was made out of.
   var lastCopied = null;
+  // This will be true when the last copy/cut occurred with no selection
+  // and lineWiseCopyCut was enabled.  This allows us to alter the paste
+  // behavior to be more convenient when lineWiseCopyCut is enabled.
+  var lastCopiedLinewise = false;
 
   function applyTextInput(cm, inserted, deleted, sel, origin) {
     var doc = cm.doc;
@@ -1130,6 +1134,8 @@
           from = Pos(from.line, from.ch - deleted);
         else if (cm.state.overwrite && !paste) // Handle overwrite
           to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
+        else if (paste && lastCopiedLinewise && cm.options.lineWiseCopyCut) // Handle paste after lineWiseCopyCut
+          from = to = Pos(from.line, 0)
       }
       var updateInput = cm.curOp.updateInput;
       var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
@@ -1261,6 +1267,7 @@
 
       function prepareCopyCut(e) {
         if (signalDOMEvent(cm, e)) return
+        lastCopiedLinewise = false;
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
           if (input.inaccurateSelection) {
@@ -1274,6 +1281,7 @@
         } else {
           var ranges = copyableRanges(cm);
           lastCopied = ranges.text;
+          lastCopiedLinewise = true;
           if (e.type == "cut") {
             cm.setSelections(ranges.ranges, null, sel_dontScroll);
           } else {
@@ -1620,6 +1628,7 @@
 
       function onCopyCut(e) {
         if (signalDOMEvent(cm, e)) return
+        lastCopiedLinewise = false;
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
           if (e.type == "cut") cm.replaceSelection("", null, "cut");
@@ -1628,6 +1637,7 @@
         } else {
           var ranges = copyableRanges(cm);
           lastCopied = ranges.text;
+          lastCopiedLinewise = true;
           if (e.type == "cut") {
             cm.operation(function() {
               cm.setSelections(ranges.ranges, 0, sel_dontScroll);

From 889098f1232a1223c52d5f0bbf1631b24b66e79f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 17 May 2016 15:59:42 +0200
Subject: [PATCH 2743/4742] Tie lastCopied and lastCopiedLineWise into single
 value

To make it clearer that they are updated together

Issue #4028
---
 lib/codemirror.js | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a51a525e2d..c289defd14 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1096,14 +1096,10 @@
     if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
   }
 
-  // This will be set to an array of strings when copying, so that,
-  // when pasting, we know what kind of selections the copied text
-  // was made out of.
+  // This will be set to a {lineWise: bool, text: [string]} object, so
+  // that, when pasting, we know what kind of selections the copied
+  // text was made out of.
   var lastCopied = null;
-  // This will be true when the last copy/cut occurred with no selection
-  // and lineWiseCopyCut was enabled.  This allows us to alter the paste
-  // behavior to be more convenient when lineWiseCopyCut is enabled.
-  var lastCopiedLinewise = false;
 
   function applyTextInput(cm, inserted, deleted, sel, origin) {
     var doc = cm.doc;
@@ -1114,11 +1110,11 @@
     var textLines = doc.splitLines(inserted), multiPaste = null;
     // When pasing N lines into N selections, insert one line per selection
     if (paste && sel.ranges.length > 1) {
-      if (lastCopied && lastCopied.join("\n") == inserted) {
-        if (sel.ranges.length % lastCopied.length == 0) {
+      if (lastCopied && lastCopied.text.join("\n") == inserted) {
+        if (sel.ranges.length % lastCopied.text.length == 0) {
           multiPaste = [];
-          for (var i = 0; i < lastCopied.length; i++)
-            multiPaste.push(doc.splitLines(lastCopied[i]));
+          for (var i = 0; i < lastCopied.text.length; i++)
+            multiPaste.push(doc.splitLines(lastCopied.text[i]));
         }
       } else if (textLines.length == sel.ranges.length) {
         multiPaste = map(textLines, function(l) { return [l]; });
@@ -1134,7 +1130,7 @@
           from = Pos(from.line, from.ch - deleted);
         else if (cm.state.overwrite && !paste) // Handle overwrite
           to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-        else if (paste && lastCopiedLinewise && cm.options.lineWiseCopyCut) // Handle paste after lineWiseCopyCut
+        else if (paste && lastCopied.lineWise && cm.options.lineWiseCopyCut) // Handle paste after lineWiseCopyCut
           from = to = Pos(from.line, 0)
       }
       var updateInput = cm.curOp.updateInput;
@@ -1267,21 +1263,19 @@
 
       function prepareCopyCut(e) {
         if (signalDOMEvent(cm, e)) return
-        lastCopiedLinewise = false;
         if (cm.somethingSelected()) {
-          lastCopied = cm.getSelections();
+          lastCopied = {lineWise: false, text: cm.getSelections()};
           if (input.inaccurateSelection) {
             input.prevInput = "";
             input.inaccurateSelection = false;
-            te.value = lastCopied.join("\n");
+            te.value = lastCopied.text.join("\n");
             selectInput(te);
           }
         } else if (!cm.options.lineWiseCopyCut) {
           return;
         } else {
           var ranges = copyableRanges(cm);
-          lastCopied = ranges.text;
-          lastCopiedLinewise = true;
+          lastCopied = {lineWise: true, text: ranges.text};
           if (e.type == "cut") {
             cm.setSelections(ranges.ranges, null, sel_dontScroll);
           } else {
@@ -1628,16 +1622,14 @@
 
       function onCopyCut(e) {
         if (signalDOMEvent(cm, e)) return
-        lastCopiedLinewise = false;
         if (cm.somethingSelected()) {
-          lastCopied = cm.getSelections();
+          lastCopied = {lineWise: false, text: cm.getSelections()};
           if (e.type == "cut") cm.replaceSelection("", null, "cut");
         } else if (!cm.options.lineWiseCopyCut) {
           return;
         } else {
           var ranges = copyableRanges(cm);
-          lastCopied = ranges.text;
-          lastCopiedLinewise = true;
+          lastCopied = {lineWise: true, text: ranges.text};
           if (e.type == "cut") {
             cm.operation(function() {
               cm.setSelections(ranges.ranges, 0, sel_dontScroll);
@@ -1649,12 +1641,12 @@
         if (e.clipboardData && !ios) {
           e.preventDefault();
           e.clipboardData.clearData();
-          e.clipboardData.setData("text/plain", lastCopied.join("\n"));
+          e.clipboardData.setData("text/plain", lastCopied.text.join("\n"));
         } else {
           // Old-fashioned briefly-focus-a-textarea hack
           var kludge = hiddenTextarea(), te = kludge.firstChild;
           cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
-          te.value = lastCopied.join("\n");
+          te.value = lastCopied.text.join("\n");
           var hadFocus = document.activeElement;
           selectInput(te);
           setTimeout(function() {

From b2c11167b61d20cbba14eaebde00a28f0a8e4bc5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 17 May 2016 16:08:32 +0200
Subject: [PATCH 2744/4742] [javascript mode] Support async and await

Closes #3926
Closes #4026
---
 mode/javascript/javascript.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fa5721d5d0..a929321d2f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -42,7 +42,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
       "this": kw("this"), "class": kw("class"), "super": kw("atom"),
-      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
+      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
+      "await": C, "async": kw("async")
     };
 
     // Extend the 'normal' keywords with the TypeScript language extensions
@@ -366,6 +367,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
     if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
+    if (type == "async") return cont(statement)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {

From 28abd453ff7f6cf9b3ca35f74a2de6ff4e00d339 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 19 May 2016 09:36:21 +0200
Subject: [PATCH 2745/4742] Only read lastCopied.lineWise when lastCopied
 matches clipboard

Closes #4030
Closes #4031
---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c289defd14..6cca44657c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1107,10 +1107,11 @@
     if (!sel) sel = doc.sel;
 
     var paste = cm.state.pasteIncoming || origin == "paste";
-    var textLines = doc.splitLines(inserted), multiPaste = null;
+    var textLines = doc.splitLines(inserted), multiPaste = null, lineWisePaste = false;
     // When pasing N lines into N selections, insert one line per selection
     if (paste && sel.ranges.length > 1) {
       if (lastCopied && lastCopied.text.join("\n") == inserted) {
+        lineWisePaste = lastCopied.lineWise
         if (sel.ranges.length % lastCopied.text.length == 0) {
           multiPaste = [];
           for (var i = 0; i < lastCopied.text.length; i++)
@@ -1130,7 +1131,7 @@
           from = Pos(from.line, from.ch - deleted);
         else if (cm.state.overwrite && !paste) // Handle overwrite
           to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-        else if (paste && lastCopied.lineWise && cm.options.lineWiseCopyCut) // Handle paste after lineWiseCopyCut
+        else if (lineWisePaste)
           from = to = Pos(from.line, 0)
       }
       var updateInput = cm.curOp.updateInput;

From 20d981f539eb8934ca73c44135b5e545a3d33902 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 19 May 2016 23:17:06 +0200
Subject: [PATCH 2746/4742] Fix patch 28abd453ff7

Issue #3983
---
 lib/codemirror.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6cca44657c..99df533b9b 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1107,11 +1107,10 @@
     if (!sel) sel = doc.sel;
 
     var paste = cm.state.pasteIncoming || origin == "paste";
-    var textLines = doc.splitLines(inserted), multiPaste = null, lineWisePaste = false;
+    var textLines = doc.splitLines(inserted), multiPaste = null
     // When pasing N lines into N selections, insert one line per selection
     if (paste && sel.ranges.length > 1) {
       if (lastCopied && lastCopied.text.join("\n") == inserted) {
-        lineWisePaste = lastCopied.lineWise
         if (sel.ranges.length % lastCopied.text.length == 0) {
           multiPaste = [];
           for (var i = 0; i < lastCopied.text.length; i++)
@@ -1131,7 +1130,7 @@
           from = Pos(from.line, from.ch - deleted);
         else if (cm.state.overwrite && !paste) // Handle overwrite
           to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-        else if (lineWisePaste)
+        else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
           from = to = Pos(from.line, 0)
       }
       var updateInput = cm.curOp.updateInput;

From 59c4ebd9e6e3bec3adeabd2724e2048143872856 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 10:40:02 +0200
Subject: [PATCH 2747/4742] [clike mode] Allow underscores in Java numbers

Closes #3900
---
 mode/clike/clike.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index aadab9e114..a37921fdae 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -433,6 +433,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     typeFirstDefinitions: true,
     atoms: words("true false null"),
     endStatement: /^[;:]$/,
+    number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);

From eb3eab7088989841d8dba74400c584bdeb0084ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 10:56:39 +0200
Subject: [PATCH 2748/4742] [simplescrollbars addon] Make sure thumb position
 is updated when size changes

Closes #3896
---
 addon/scroll/simplescrollbars.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/addon/scroll/simplescrollbars.js b/addon/scroll/simplescrollbars.js
index 32ba2f35ea..23f3e03f81 100644
--- a/addon/scroll/simplescrollbars.js
+++ b/addon/scroll/simplescrollbars.js
@@ -59,10 +59,10 @@
     CodeMirror.on(this.node, "DOMMouseScroll", onWheel);
   }
 
-  Bar.prototype.setPos = function(pos) {
+  Bar.prototype.setPos = function(pos, force) {
     if (pos < 0) pos = 0;
     if (pos > this.total - this.screen) pos = this.total - this.screen;
-    if (pos == this.pos) return false;
+    if (!force && pos == this.pos) return false;
     this.pos = pos;
     this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
       (pos * (this.size / this.total)) + "px";
@@ -76,9 +76,12 @@
   var minButtonSize = 10;
 
   Bar.prototype.update = function(scrollSize, clientSize, barSize) {
-    this.screen = clientSize;
-    this.total = scrollSize;
-    this.size = barSize;
+    var sizeChanged = this.screen != clientSize || this.total != scrollSize || this.size != barSize
+    if (sizeChanged) {
+      this.screen = clientSize;
+      this.total = scrollSize;
+      this.size = barSize;
+    }
 
     var buttonSize = this.screen * (this.size / this.total);
     if (buttonSize < minButtonSize) {
@@ -87,7 +90,7 @@
     }
     this.inner.style[this.orientation == "horizontal" ? "width" : "height"] =
       buttonSize + "px";
-    this.setPos(this.pos);
+    this.setPos(this.pos, sizeChanged);
   };
 
   function SimpleScrollbars(cls, place, scroll) {

From 8c00b06b12fcaaec59b36649fb3a672ef6045a9c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 11:11:39 +0200
Subject: [PATCH 2749/4742] [javascript mode] Improve parsing of TypeScript
 types

Closes #3796
---
 mode/javascript/javascript.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index a929321d2f..5f3b3d64df 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -264,6 +264,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     while(true) {
       var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
+      if (!combinator.call) console.log(combinator)
       if (combinator(type, content)) {
         while(cc.length && cc[cc.length - 1].lex)
           cc.pop()();
@@ -490,17 +491,17 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "(") return pass(functiondef);
   }
   function commasep(what, end) {
-    function proceed(type) {
+    function proceed(type, value) {
       if (type == ",") {
         var lex = cx.state.lexical;
         if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
         return cont(what, proceed);
       }
-      if (type == end) return cont();
+      if (type == end || value == end) return cont();
       return cont(expect(end));
     }
-    return function(type) {
-      if (type == end) return cont();
+    return function(type, value) {
+      if (type == end || value == end) return cont();
       return pass(what, proceed);
     };
   }
@@ -514,13 +515,17 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(statement, block);
   }
   function maybetype(type) {
-    if (isTS && type == ":") return cont(typedef);
+    if (isTS && type == ":") return cont(typeexpr);
   }
   function maybedefault(_, value) {
     if (value == "=") return cont(expressionNoComma);
   }
-  function typedef(type) {
-    if (type == "variable") {cx.marked = "variable-3"; return cont();}
+  function typeexpr(type) {
+    if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
+  }
+  function afterType(type, value) {
+    if (value == "<") return cont(commasep(typeexpr, ">"), afterType)
+    if (type == "[") return cont(expect("]"), afterType)
   }
   function vardef() {
     return pass(pattern, maybetype, maybeAssign, vardefCont);
@@ -575,7 +580,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function functiondef(type, value) {
     if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
     if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, statement, popcontext);
+    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, maybetype, statement, popcontext);
   }
   function funarg(type) {
     if (type == "spread") return cont(funarg);

From b27701cb1e0cfa4b8c9ee3ca2bc1ce4e4caf24e6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 11:23:36 +0200
Subject: [PATCH 2750/4742] [sql-hint addon] Don't reuse global keywords
 variable

See https://discuss.codemirror.net/t/dynamically-switch-mode-with-sql-hint-addon-bugs/751
---
 addon/hint/sql-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 62c4f68d64..ed8f6d856c 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -241,7 +241,7 @@
     var defaultTableName = options && options.defaultTable;
     var disableKeywords = options && options.disableKeywords;
     defaultTable = defaultTableName && getTable(defaultTableName);
-    keywords = keywords || getKeywords(editor);
+    keywords = getKeywords(editor);
 
     if (defaultTableName && !defaultTable)
       defaultTable = findTableByAlias(defaultTableName, editor);

From 5473c7ae4fc9585f406202bbca2a8d1f23dbb541 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 11:24:36 +0200
Subject: [PATCH 2751/4742] 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 5f3b3d64df..ca875411a2 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -264,7 +264,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     while(true) {
       var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
-      if (!combinator.call) console.log(combinator)
       if (combinator(type, content)) {
         while(cc.length && cc[cc.length - 1].lex)
           cc.pop()();

From 28844205a6ab2f62bdd577351cdea22560f52a8e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 12:01:05 +0200
Subject: [PATCH 2752/4742] Mark release 5.15.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 26 ++++++++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 15 +++++++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 8 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f64cb6d103..5e373a0202 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -97,6 +97,7 @@ Brian Sletten
 Bruce Mitchener
 Caitlin Potter
 Calin Barbat
+Camilo Roca
 Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
@@ -107,6 +108,7 @@ Chris Granger
 Chris Houseknecht
 Chris Lohfink
 Chris Morgan
+Chris Smith
 Christian Oyarzun
 Christian Petrov
 Christopher Brown
@@ -246,6 +248,7 @@ Jan Schär
 Jan T. Sott
 Jared Dean
 Jared Forsyth
+Jared Jacobs
 Jason
 Jason Barnabe
 Jason Grout
@@ -360,6 +363,7 @@ mats cronqvist
 Matt Gaide
 Matthew Bauer
 Matthew Beale
+matthewhayes
 Matthew Rathbone
 Matthias Bussonnier
 Matthias BUSSONNIER
@@ -438,6 +442,7 @@ Paul Garvin
 Paul Ivanov
 Pavel
 Pavel Feldman
+Pavel Petržela
 Pavel Strashkin
 Paweł Bartkiewicz
 peteguhl
@@ -551,6 +556,7 @@ vf
 Victor Bocharsky
 Vincent Woo
 Volker Mische
+Weiyan Shao
 wenli
 Wes Cossick
 Wesley Wiser
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6f3123732..562034a186 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 5.15.0 (2016-05-20)
+
+### Bugfixes
+
+Fix bug that caused the selection to reset when focusing the editor in contentEditable input mode.
+
+Fix issue where not all ASCII control characters were being replaced by placeholders.
+
+Remove the assumption that all modes have a `startState` method from several wrapping modes.
+
+Fix issue where the editor would complain about overlapping collapsed ranges when there weren't any.
+
+Optimize document tree building when loading or pasting huge chunks of content.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix several issues in matching link targets.
+
+[clike mode](http://codemirror.net/mode/clike/): Improve indentation of C++ template declarations.
+
+### New features
+
+Explicitly bind Ctrl-O on OS X to make that binding (“open line”) act as expected.
+
+Pasting [linewise-copied](http://codemirror.net/doc/manual.html#option_lineWiseCopyCut) content when there is no selection now inserts the lines above the current line.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support `async`/`await` and improve support for TypeScript type syntax.
+
 ## 5.14.2 (2016-04-20)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 479126921c..061c3c6971 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.15.0;f=">5.15.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.2;f=">5.14.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.0;f=">5.14.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.2;f=">5.13.2</option>
diff --git a/doc/manual.html b/doc/manual.html
index 8c99a99efa..99d01e7394 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.14.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.15.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 a8a7408b09..587406b292 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,21 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-05-2016: <a href="http://codemirror.net/codemirror-5.15.0.zip">Version 5.15.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix bug that caused the selection to reset when focusing the editor in contentEditable input mode.</li>
+    <li>Fix issue where not all ASCII control characters were being replaced by placeholders.</li>
+    <li>Remove the assumption that all modes have a <code>startState</code> method from several wrapping modes.</li>
+    <li>Fix issue where the editor would complain about overlapping collapsed ranges when there weren't any.</li>
+    <li>Optimize document tree building when loading or pasting huge chunks of content.</li>
+    <li>Explicitly bind Ctrl-O on OS X to make that binding (“open line”) act as expected.</li>
+    <li>Pasting <a href="http://codemirror.net/doc/manual.html#option_lineWiseCopyCut">linewise-copied</a> content when there is no selection now inserts the lines above the current line.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix several issues in matching link targets.</li>
+    <li><a href="http://codemirror.net/mode/clike/">clike mode</a>: Improve indentation of C++ template declarations.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support <code>async</code>/<code>await</code> and improve support for TypeScript type syntax.</li>
+  </ul>
+
   <p class="rel">20-04-2016: <a href="http://codemirror.net/codemirror-5.14.0.zip">Version 5.14.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 99c649141f..eb8847f341 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.14.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.15.0</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 99df533b9b..8944bea502 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8908,7 +8908,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.14.3";
+  CodeMirror.version = "5.15.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index e7d64b40c5..f9539664ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.14.3",
+    "version":"5.15.0",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From ac3530e32682618c59002fab33b84be2f6b8728e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 12:03:08 +0200
Subject: [PATCH 2753/4742] Bump version number post-5.15.0

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 99d01e7394..ab4810a484 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.15.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.15.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8944bea502..2b57b0f780 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8908,7 +8908,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.15.0";
+  CodeMirror.version = "5.15.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index f9539664ec..58d703f151 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.15.0",
+    "version":"5.15.1",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 0d4374d10ee32be30796de780311aaca8e4fc6d0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 20:58:40 +0200
Subject: [PATCH 2754/4742] Revert part of 9ad383797c28

It breaks document tree rebalancing.

Closes #4032
---
 lib/codemirror.js | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2b57b0f780..937ce05a28 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7342,31 +7342,25 @@
     },
     // When a node has grown, check whether it should be split.
     maybeSpill: function() {
+      if (this.children.length <= 10) return;
       var me = this;
-      var children = me.children;
-      var numChildren = children.length;
-      if (numChildren <= 10) return;
-      // To avoid memory thrashing when the children array is huge (e.g. first view of a large file), it's never spliced.
-      // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
-      var parent = me.parent || me;
-      var numMoreBranches = Math.ceil((numChildren - 10) / 5);
-      var firstBranchNumChildren = numChildren - numMoreBranches * 5;
-      var firstBranch = new BranchChunk(children.slice(0, firstBranchNumChildren));
-      var branches = [firstBranch];
-      firstBranch.parent = parent;
-      for (var i = 0; i < numMoreBranches; i++) {
-        var branchStart = firstBranchNumChildren + i * 5;
-        var branch = new BranchChunk(children.slice(branchStart, branchStart + 5));
-        branches.push(branch);
-        branch.parent = parent;
-      }
-      if (parent === me) {
-        parent.children = branches;
-      } else {
-        var myIndex = indexOf(parent.children, me);
-        parent.children.splice(myIndex, 1, branches);
-      }
-      parent.maybeSpill();
+      do {
+        var spilled = me.children.splice(me.children.length - 5, 5);
+        var sibling = new BranchChunk(spilled);
+        if (!me.parent) { // Become the parent node
+          var copy = new BranchChunk(me.children);
+          copy.parent = me;
+          me.children = [copy, sibling];
+          me = copy;
+       } else {
+          me.size -= sibling.size;
+          me.height -= sibling.height;
+          var myIndex = indexOf(me.parent.children, me);
+          me.parent.children.splice(myIndex + 1, 0, sibling);
+        }
+        sibling.parent = me.parent;
+      } while (me.children.length > 10);
+      me.parent.maybeSpill();
     },
     iterN: function(at, n, op) {
       for (var i = 0; i < this.children.length; ++i) {

From 8097c7e75ce7ef0512debe9967d7568626106e53 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 21:00:19 +0200
Subject: [PATCH 2755/4742] Mark release 5.15.2

---
 CHANGELOG.md      | 6 ++++++
 doc/compress.html | 1 +
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 562034a186..146af30edd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.15.2 (2016-05-20)
+
+### Bugfixes
+
+Fix a critical document corruption bug that occurs when a document is gradually grown.
+
 ## 5.15.0 (2016-05-20)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 061c3c6971..fe27e025cc 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.15.2;f=">5.15.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.0;f=">5.15.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.2;f=">5.14.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.0;f=">5.14.0</option>
diff --git a/doc/manual.html b/doc/manual.html
index ab4810a484..3f898bd9ff 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.15.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.15.2</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 587406b292..594298ef6a 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-05-2016: <a href="http://codemirror.net/codemirror-5.15.2.zip">Version 5.15.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix a critical document corruption bug that occurs when a document is gradually grown.</li>
+  </ul>
+
   <p class="rel">20-05-2016: <a href="http://codemirror.net/codemirror-5.15.0.zip">Version 5.15.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index eb8847f341..e987926921 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.15.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.15.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 937ce05a28..5439299b39 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8902,7 +8902,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.15.1";
+  CodeMirror.version = "5.15.2";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 58d703f151..3200d2326a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.15.1",
+    "version":"5.15.2",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 208af47a5963c04a45406b78ea18d716a9e0cd44 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2016 21:01:55 +0200
Subject: [PATCH 2756/4742] Bump version number post-5.15.2

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 3f898bd9ff..8c39e7f941 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.15.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.15.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5439299b39..c56e147eeb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8902,7 +8902,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.15.2";
+  CodeMirror.version = "5.15.3";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 3200d2326a..d4dd2b00ef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.15.2",
+    "version":"5.15.3",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 14f9ee8730d2acfdc74a4963b1e1a8ea3f5ef47e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 21 May 2016 10:58:22 +0200
Subject: [PATCH 2757/4742] Add a github release upload script

---
 bin/upload-release.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 bin/upload-release.js

diff --git a/bin/upload-release.js b/bin/upload-release.js
new file mode 100644
index 0000000000..7c8551468c
--- /dev/null
+++ b/bin/upload-release.js
@@ -0,0 +1,35 @@
+"use strict"
+
+let version = process.argv[2]
+let auth = process.argv[3]
+
+if (!auth) {
+  console.log("Usage: upload-release.js [TAG] [github-user:password]")
+  process.exit(1)
+}
+
+require('child_process').exec("git --no-pager show -s --format='%s' " + version, (error, stdout) => {
+  if (error) throw error
+  let message = stdout.split("\n").slice(2)
+  message = message.slice(0, message.indexOf("-----BEGIN PGP SIGNATURE-----")).join("\n")
+
+  let req = require("https").request({
+    host: "api.github.com",
+    auth: auth,
+    headers: {"user-agent": "Release uploader"},
+    path: "/repos/codemirror/codemirror/releases",
+    method: "POST"
+  }, res => {
+    if (res.statusCode >= 300) {
+      console.error(res.statusMessage)
+      res.on("data", d => console.log(d.toString()))
+      res.on("end", process.exit(1))
+    }
+  })
+  req.write(JSON.stringify({
+    tag_name: version,
+    name: version,
+    body: message
+  }))
+  req.end()
+})

From 320b301b67ceadb1bd77414aaf0aa0852730de01 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 23 May 2016 22:55:12 -0700
Subject: [PATCH 2758/4742] [solarized theme] Overhaul

---
 theme/solarized.css | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index 7882c93763..4b1e16307a 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -4,7 +4,7 @@ http://ethanschoonover.com/solarized
 */
 
 /*
-Solarized color pallet
+Solarized color palette
 http://ethanschoonover.com/solarized/img/solarized-palette.png
 */
 
@@ -34,7 +34,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 }
 .cm-s-solarized.cm-s-dark {
   color: #839496;
-  background-color:  #002b36;
+  background-color: #002b36;
   text-shadow: #002b36 0 1px;
 }
 .cm-s-solarized.cm-s-light {
@@ -113,32 +113,34 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   box-shadow: inset 7px 0 12px -6px #000;
 }
 
-/* Gutter border and some shadow from it  */
+/* Remove gutter border */
 .cm-s-solarized .CodeMirror-gutters {
-  border-right: 1px solid;
+  border-right: 0;
 }
 
 /* Gutter colors and line number styling based of color scheme (dark / light) */
 
 /* Dark */
 .cm-s-solarized.cm-s-dark .CodeMirror-gutters {
-  background-color:  #002b36;
-  border-color: #00232c;
+  background-color: #073642;
 }
 
 .cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
+  color: #586e75;
   text-shadow: #021014 0 -1px;
 }
 
 /* Light */
 .cm-s-solarized.cm-s-light .CodeMirror-gutters {
-  background-color: #fdf6e3;
-  border-color: #eee8d5;
+  background-color: #eee8d5;
+}
+
+.cm-s-solarized.cm-s-light .CodeMirror-linenumber {
+  color: #839496;
 }
 
 /* Common */
 .cm-s-solarized .CodeMirror-linenumber {
-  color: #586e75;
   padding: 0 5px;
 }
 .cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
@@ -149,15 +151,19 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   color: #586e75;
 }
 
+/* Cursor */
 .cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
 
-/*
-Active line. Negative margin compensates left padding of the text in the
-view-port
-*/
+/* Fat cursor */
+.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #fdf6e3; }
+.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #fdf6e3; }
+.cm-s-solarized.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: #586e75; }
+.cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }
+
+/* Active line */
 .cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
-  background: rgba(255, 255, 255, 0.10);
+  background: rgba(255, 255, 255, 0.06);
 }
 .cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
-  background: rgba(0, 0, 0, 0.10);
+  background: rgba(0, 0, 0, 0.06);
 }

From 352e34ca49b7da33add8b4b85599271323cfba8e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 25 May 2016 22:37:08 +0200
Subject: [PATCH 2759/4742] [show-hint addon] Fix scrollbar on hint widget
 overlapping text

See https://discuss.codemirror.net/t/width-of-sql-hint-dropdown-in-firefox-is-not-always-correct/757
---
 addon/hint/show-hint.css | 1 -
 addon/hint/show-hint.js  | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.css b/addon/hint/show-hint.css
index 924e638f7f..f3c4f245dd 100644
--- a/addon/hint/show-hint.css
+++ b/addon/hint/show-hint.css
@@ -26,7 +26,6 @@
   padding: 0 4px;
   border-radius: 2px;
   max-width: 19em;
-  overflow: hidden;
   white-space: pre;
   color: black;
   cursor: pointer;
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index f426b5c8ca..cc47af206c 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -229,6 +229,7 @@
     var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
     (completion.options.container || document.body).appendChild(hints);
     var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
+    var scrolls = hints.scrollHeight > hints.clientHeight + 1
     if (overlapY > 0) {
       var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
       if (curTop - height > 0) { // Fits above cursor
@@ -253,6 +254,7 @@
       }
       hints.style.left = (left = pos.left - overlapX) + "px";
     }
+    if (scrolls) hints.style.paddingRight = cm.display.nativeBarWidth + "px"
 
     cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
       moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },

From df3a0ae0fb7876a4ef58c324878e6eea03b0d66f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 26 May 2016 09:54:05 +0200
Subject: [PATCH 2760/4742] [show-hint addon] Fix selected-option background
 size for scrolling widget

---
 addon/hint/show-hint.css | 2 +-
 addon/hint/show-hint.js  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.css b/addon/hint/show-hint.css
index f3c4f245dd..453dee4bb7 100644
--- a/addon/hint/show-hint.css
+++ b/addon/hint/show-hint.css
@@ -16,6 +16,7 @@
   background: white;
   font-size: 90%;
   font-family: monospace;
+  max-width: 19em;
 
   max-height: 20em;
   overflow-y: auto;
@@ -25,7 +26,6 @@
   margin: 0;
   padding: 0 4px;
   border-radius: 2px;
-  max-width: 19em;
   white-space: pre;
   color: black;
   cursor: pointer;
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index cc47af206c..64ec9289cc 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -254,7 +254,8 @@
       }
       hints.style.left = (left = pos.left - overlapX) + "px";
     }
-    if (scrolls) hints.style.paddingRight = cm.display.nativeBarWidth + "px"
+    if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling)
+      node.style.paddingRight = cm.display.nativeBarWidth + "px"
 
     cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
       moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },

From dabefce1b7405871564b2aab3bedbfb6cc261753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Vr=C3=A1na?= <jakub@vrana.cz>
Date: Wed, 1 Jun 2016 16:06:39 -0700
Subject: [PATCH 2761/4742] [soy mode] Support backslash in strings

---
 mode/soy/soy.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 79bfc24dfd..580c306f15 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -121,10 +121,11 @@
             return tokenUntil(stream, state, /\{\/literal}/);
 
           case "string":
-            if (stream.match(/^.*?"/)) {
-              state.soyState.pop();
-            } else {
+            var match = stream.match(/^.*?("|\\[\s\S])/);
+            if (!match) {
               stream.skipToEnd();
+            } else if (match[1] == "\"") {
+              state.soyState.pop();
             }
             return "string";
         }

From bb91581b0a3ab11ca325445d621d814de5a84c97 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Jun 2016 10:16:18 +0200
Subject: [PATCH 2762/4742] [rulers addon] Make sure rulers don't cause
 scrollbars

Closes #4042
---
 addon/display/rulers.js | 38 +++++++++++++-------------------------
 lib/codemirror.css      |  6 ++++++
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index 01f65667c4..730054473a 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -11,30 +11,26 @@
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineOption("rulers", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      clearRulers(cm);
-      cm.off("refresh", refreshRulers);
+  CodeMirror.defineOption("rulers", false, function(cm, val) {
+    if (cm.state.rulerDiv) {
+      cm.display.lineSpace.removeChild(cm.state.rulerDiv)
+      cm.state.rulerDiv = null
+      cm.off("refresh", drawRulers)
     }
     if (val && val.length) {
-      setRulers(cm);
-      cm.on("refresh", refreshRulers);
+      cm.state.rulerDiv = cm.display.lineSpace.insertBefore(document.createElement("div"), cm.display.cursorDiv)
+      cm.state.rulerDiv.className = "CodeMirror-rulers"
+      drawRulers(cm)
+      cm.on("refresh", drawRulers)
     }
   });
 
-  function clearRulers(cm) {
-    for (var i = cm.display.lineSpace.childNodes.length - 1; i >= 0; i--) {
-      var node = cm.display.lineSpace.childNodes[i];
-      if (/(^|\s)CodeMirror-ruler($|\s)/.test(node.className))
-        node.parentNode.removeChild(node);
-    }
-  }
-
-  function setRulers(cm) {
+  function drawRulers(cm) {
+    cm.state.rulerDiv.textContent = ""
     var val = cm.getOption("rulers");
     var cw = cm.defaultCharWidth();
     var left = cm.charCoords(CodeMirror.Pos(cm.firstLine(), 0), "div").left;
-    var minH = cm.display.scroller.offsetHeight + 30;
+    cm.state.rulerDiv.style.minHeight = (cm.display.scroller.offsetHeight + 30) + "px";
     for (var i = 0; i < val.length; i++) {
       var elt = document.createElement("div");
       elt.className = "CodeMirror-ruler";
@@ -49,15 +45,7 @@
         if (conf.width) elt.style.borderLeftWidth = conf.width;
       }
       elt.style.left = (left + col * cw) + "px";
-      elt.style.top = "-50px";
-      elt.style.bottom = "-20px";
-      elt.style.minHeight = minH + "px";
-      cm.display.lineSpace.insertBefore(elt, cm.display.cursorDiv);
+      cm.state.rulerDiv.appendChild(elt)
     }
   }
-
-  function refreshRulers(cm) {
-    clearRulers(cm);
-    setRulers(cm);
-  }
 });
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 4bd815eb54..1e24ed8f7e 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -88,8 +88,14 @@
 
 .cm-tab { display: inline-block; text-decoration: inherit; }
 
+.CodeMirror-rulers {
+  position: absolute;
+  left: 0; right: 0; top: -50px; bottom: -20px;
+  overflow: hidden;
+}
 .CodeMirror-ruler {
   border-left: 1px solid #ccc;
+  top: 0; bottom: 0;
   position: absolute;
 }
 

From bda854e0711d3d1f21a0804aa4d3b6d972e3a930 Mon Sep 17 00:00:00 2001
From: Sam Wilson <sam.wilson@appian.com>
Date: Thu, 2 Jun 2016 13:36:20 -0400
Subject: [PATCH 2763/4742] [foldcode addon] Add clearOnEnter option

Add option 'clearOnEnter' to foldcode.js and default it to true.
This option determines whether the marker added when folding a
line clears when the cursor enters it.
---
 addon/fold/foldcode.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 62911f9352..78b36c4641 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -49,7 +49,7 @@
     });
     var myRange = cm.markText(range.from, range.to, {
       replacedWith: myWidget,
-      clearOnEnter: true,
+      clearOnEnter: getOption(cm, options, "clearOnEnter"),
       __isFold: true
     });
     myRange.on("clear", function(from, to) {
@@ -129,7 +129,8 @@
     rangeFinder: CodeMirror.fold.auto,
     widget: "\u2194",
     minFoldSize: 0,
-    scanUp: false
+    scanUp: false,
+    clearOnEnter: true
   };
 
   CodeMirror.defineOption("foldOptions", null);

From 431dd1b16818c2516c9cbbf5d957189881283ac6 Mon Sep 17 00:00:00 2001
From: Sam Wilson <sam.wilson@appian.com>
Date: Thu, 2 Jun 2016 15:37:46 -0400
Subject: [PATCH 2764/4742] [foldcode addon] Change arrow appearance when a
 single line is collapsed

Use findMarks instead of findMarksAt in foldGutter.js to correctly
find marks when a single line is collapsed so that the arrow displays
correctly as collapsed.
---
 addon/fold/foldgutter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index f101e26709..9d32326566 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -50,7 +50,7 @@
   }
 
   function isFolded(cm, line) {
-    var marks = cm.findMarksAt(Pos(line));
+    var marks = cm.findMarks(Pos(line, 0), Pos(line + 1, 0));
     for (var i = 0; i < marks.length; ++i)
       if (marks[i].__isFold && marks[i].find().from.line == line) return marks[i];
   }

From ecd6976f2be26614366831c37819738efc8e9dfa Mon Sep 17 00:00:00 2001
From: Harshvardhan Gupta <harshvardhan145@gmail.com>
Date: Tue, 7 Jun 2016 01:57:53 -0400
Subject: [PATCH 2765/4742] [sql-hint addon] Use all applicable decimal
 positions in convertNumberToCur

Closes #4057
---
 addon/hint/sql-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index ed8f6d856c..4e84ab9b91 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -184,7 +184,7 @@
   }
 
   function convertNumberToCur(num) {
-    return Pos(Math.floor(num), +num.toString().split('.').pop());
+    return Pos(Math.floor(num), +num.toFixed(6).toString().split('.').pop());
   }
 
   function findTableByAlias(alias, editor) {

From 92e9634f25f162220eff5cf5569c4f42b970f33b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 Jun 2016 09:45:00 +0200
Subject: [PATCH 2766/4742] [sql-hint addon] Remove strange hack

Issue #4057
---
 addon/hint/sql-hint.js | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 4e84ab9b91..1ee4f0bbed 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -18,7 +18,7 @@
     QUERY_DIV: ";",
     ALIAS_KEYWORD: "AS"
   };
-  var Pos = CodeMirror.Pos;
+  var Pos = CodeMirror.Pos, cmpPos = CodeMirror.cmpPos;
 
   function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }
 
@@ -178,15 +178,6 @@
     }
   }
 
-  function convertCurToNumber(cur) {
-    // max characters of a line is 999,999.
-    return cur.line + cur.ch / Math.pow(10, 6);
-  }
-
-  function convertNumberToCur(num) {
-    return Pos(Math.floor(num), +num.toFixed(6).toString().split('.').pop());
-  }
-
   function findTableByAlias(alias, editor) {
     var doc = editor.doc;
     var fullQuery = doc.getValue();
@@ -209,15 +200,14 @@
     separator.push(Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).text.length));
 
     //find valid range
-    var prevItem = 0;
-    var current = convertCurToNumber(editor.getCursor());
+    var prevItem = null;
+    var current = editor.getCursor()
     for (var i = 0; i < separator.length; i++) {
-      var _v = convertCurToNumber(separator[i]);
-      if (current > prevItem && current <= _v) {
-        validRange = { start: convertNumberToCur(prevItem), end: convertNumberToCur(_v) };
+      if ((prevItem == null || cmpPos(current, prevItem) > 0) && cmpPos(current, separator[i]) <= 0) {
+        validRange = {start: prevItem, end: separator[i]};
         break;
       }
-      prevItem = _v;
+      prevItem = separator[i];
     }
 
     var query = doc.getRange(validRange.start, validRange.end, false);

From 2543f795ae42dd4e86fcd31c1238f0eb404413a0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 Jun 2016 12:03:55 +0200
Subject: [PATCH 2767/4742] Disable pointer-events on cursor divs

So that they don't interfere with clicking and dragging

Issue #2556
---
 lib/codemirror.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 1e24ed8f7e..18b0bf70db 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -297,7 +297,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   visibility: hidden;
 }
 
-.CodeMirror-cursor { position: absolute; }
+.CodeMirror-cursor {
+  position: absolute;
+  pointer-events: none;
+}
 .CodeMirror-measure pre { position: static; }
 
 div.CodeMirror-cursors {

From eabf5b5d9aefcaa858124e255fdc258b3631d555 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 Jun 2016 12:05:21 +0200
Subject: [PATCH 2768/4742] Work around fact that FF doesn't set modifiers on
 drop events

Store the modifier in the original mouse event to choose between
move and copy drags.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index c56e147eeb..ac0bd54078 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3660,6 +3660,7 @@
     // Let the drag handler handle this.
     if (webkit) display.scroller.draggable = true;
     cm.state.draggingText = dragEnd;
+    dragEnd.copy = mac ? e.altKey : e.ctrlKey
     // IE's approach to draggable
     if (display.scroller.dragDrop) display.scroller.dragDrop();
     on(document, "mouseup", dragEnd);
@@ -3890,7 +3891,7 @@
       try {
         var text = e.dataTransfer.getData("Text");
         if (text) {
-          if (cm.state.draggingText && !(mac ? e.altKey : e.ctrlKey))
+          if (cm.state.draggingText && !cm.state.draggingText.copy)
             var selected = cm.listSelections();
           setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
           if (selected) for (var i = 0; i < selected.length; ++i)

From 8eb15883501464b4518e40d22421bd2feafa8544 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 Jun 2016 12:30:53 +0200
Subject: [PATCH 2769/4742] [comment-fold addon] Fix bug that broke folding of
 comments at start of line

Closes #4056
---
 addon/fold/comment-fold.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index 60fa3e43df..e8d800eb59 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -29,7 +29,7 @@ CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
     }
     if (pass == 1 && found < start.ch) return;
     if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1))) &&
-        (lineText.slice(found - endToken.length, found) == endToken ||
+        (found == 0 || lineText.slice(found - endToken.length, found) == endToken ||
          !/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found))))) {
       startCh = found + startToken.length;
       break;

From 5c6025a337ff2964f7af29dffe25b4714e8516a4 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Fri, 3 Jun 2016 12:29:20 +0100
Subject: [PATCH 2770/4742] [search addon] Capture keys for search-related
 commands in persistent dialog

---
 addon/search/search.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index e6b4f85a05..0f5d941889 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -62,7 +62,21 @@
       value: deflt,
       selectValueOnOpen: true,
       closeOnEnter: false,
-      onClose: function() { clearSearch(cm); }
+      onClose: function() { clearSearch(cm); },
+      onKeyDown: function(ev, query) {
+        var cmd = CodeMirror.keyMap['default'][CodeMirror.keyName(ev)];
+        if (cmd) {
+          var nextSearchCmds = ['findNext', 'findPrev'];
+          var searchCmds = ['find', 'findPersistent'];
+          if (nextSearchCmds.indexOf(cmd) !== -1) {
+            startSearch(cm, getSearchState(cm), query);
+            CodeMirror.commands[cmd](cm);
+            CodeMirror.e_stop(ev);
+          } else if (searchCmds.indexOf(cmd) !== -1) {
+            f(query, ev);
+          }
+        }
+      }
     });
   }
 

From b7b4269499a6d3a49609c30f661b3bb579283639 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 Jun 2016 17:19:03 +0200
Subject: [PATCH 2771/4742] [search addon] Adjust patch 5c6025a

Issue #4050
---
 addon/search/search.js | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 0f5d941889..00f53a0e01 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -57,26 +57,13 @@
     return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
   }
 
-  function persistentDialog(cm, text, deflt, f) {
-    cm.openDialog(text, f, {
+  function persistentDialog(cm, text, deflt, onEnter, onKeyDown) {
+    cm.openDialog(text, onEnter, {
       value: deflt,
       selectValueOnOpen: true,
       closeOnEnter: false,
       onClose: function() { clearSearch(cm); },
-      onKeyDown: function(ev, query) {
-        var cmd = CodeMirror.keyMap['default'][CodeMirror.keyName(ev)];
-        if (cmd) {
-          var nextSearchCmds = ['findNext', 'findPrev'];
-          var searchCmds = ['find', 'findPersistent'];
-          if (nextSearchCmds.indexOf(cmd) !== -1) {
-            startSearch(cm, getSearchState(cm), query);
-            CodeMirror.commands[cmd](cm);
-            CodeMirror.e_stop(ev);
-          } else if (searchCmds.indexOf(cmd) !== -1) {
-            f(query, ev);
-          }
-        }
-      }
+      onKeyDown: onKeyDown
     });
   }
 
@@ -132,7 +119,7 @@
     var q = cm.getSelection() || state.lastQuery;
     if (persistent && cm.openDialog) {
       var hiding = null
-      persistentDialog(cm, queryDialog, q, function(query, event) {
+      var searchNext = function(query, event) {
         CodeMirror.e_stop(event);
         if (!query) return;
         if (query != state.queryText) {
@@ -147,6 +134,17 @@
               dialog.getBoundingClientRect().bottom - 4 > cm.cursorCoords(to, "window").top)
             (hiding = dialog).style.opacity = .4
         })
+      };
+      persistentDialog(cm, queryDialog, q, searchNext, function(event, query) {
+        var cmd = CodeMirror.keyMap[cm.getOption("keyMap")][CodeMirror.keyName(event)];
+        if (cmd == "findNext" || cmd == "findPrev") {
+          CodeMirror.e_stop(event);
+          startSearch(cm, getSearchState(cm), query);
+          cm.execCommand(cmd);
+        } else if (cmd == "find" || cmd == "findPersistent") {
+          CodeMirror.e_stop(event);
+          searchNext(query, event);
+        }
       });
     } else {
       dialog(cm, queryDialog, "Search for:", q, function(query) {

From 440395dd715bc063488f402790ee8990b95cedd2 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Fri, 3 Jun 2016 13:11:21 +0100
Subject: [PATCH 2772/4742] [search addon] Add commands to find next/prev with
 persistent dialog

---
 addon/search/search.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 00f53a0e01..c005866f16 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -113,7 +113,7 @@
     }
   }
 
-  function doSearch(cm, rev, persistent) {
+  function doSearch(cm, rev, persistent, immediate) {
     var state = getSearchState(cm);
     if (state.query) return findNext(cm, rev);
     var q = cm.getSelection() || state.lastQuery;
@@ -146,6 +146,10 @@
           searchNext(query, event);
         }
       });
+      if (immediate) {
+        startSearch(cm, state, q);
+        findNext(cm, rev);
+      }
     } else {
       dialog(cm, queryDialog, "Search for:", q, function(query) {
         if (query && !state.query) cm.operation(function() {
@@ -235,6 +239,8 @@
 
   CodeMirror.commands.find = function(cm) {clearSearch(cm); doSearch(cm);};
   CodeMirror.commands.findPersistent = function(cm) {clearSearch(cm); doSearch(cm, false, true);};
+  CodeMirror.commands.findPersistentNext = function(cm) {doSearch(cm, false, true, true);};
+  CodeMirror.commands.findPersistentPrev = function(cm) {doSearch(cm, true, true, true);};
   CodeMirror.commands.findNext = doSearch;
   CodeMirror.commands.findPrev = function(cm) {doSearch(cm, true);};
   CodeMirror.commands.clearSearch = clearSearch;

From 79bec105b4b40a4d159f8613d34d93128c9c3a7d Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Thu, 26 May 2016 20:13:32 -0700
Subject: [PATCH 2773/4742] [sublime] Implement smart backspace with
 multi-cursor support

---
 keymap/sublime.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index c1749e7196..0da347a99e 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -420,6 +420,34 @@
 
   map[cK + ctrl + "Backspace"] = "delLineLeft";
 
+  cmds[map["Backspace"] = "smartBackspace"] = function(cm) {
+    if (cm.somethingSelected()) return CodeMirror.Pass;
+
+    cm.operation(function() {
+      var cursors = cm.listSelections();
+      var indentUnit = cm.getOption("indentUnit");
+
+      for (var i = cursors.length - 1; i >= 0; i--) {
+        var cursor = cursors[i].head;
+        var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
+        var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
+
+        // Delete by one character by default
+        var deletePos = cm.findPosH(cursor, -1, "char", false);
+
+        if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) {
+          var prevIndent = new Pos(cursor.line,
+            CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit));
+
+          // Smart delete only if we found a valid prevIndent location
+          if (prevIndent.ch != cursor.ch) deletePos = prevIndent;
+        }
+
+        cm.replaceRange("", deletePos, cursor, "+delete");
+      }
+    });
+  };
+
   cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();

From 1843b8c277256b756f9ffb241318ce39e24dd5fb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Jun 2016 09:31:13 +0200
Subject: [PATCH 2774/4742] [sublime bindings] Add test for smartBackspace

Issue #4038
---
 test/sublime_test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/sublime_test.js b/test/sublime_test.js
index c93e041b87..c5c19c0a23 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -274,6 +274,10 @@
          "clearBookmarks",
          Pos(0, 0), "selectBookmarks", at(0, 0));
 
+  stTest("smartBackspace", "  foo\n    bar",
+         setSel(0, 2, 0, 2, 1, 4, 1, 4, 1, 6, 1, 6), "smartBackspace",
+         val("foo\n  br"))
+
   stTest("upAndDowncaseAtCursor", "abc\ndef  x\nghI",
          setSel(0, 1, 0, 3,
                 1, 1, 1, 1,

From 14307f60e6b90cddcaf009cdb40064a50ea0c428 Mon Sep 17 00:00:00 2001
From: "David H. Bronke" <dbronke@armt.com>
Date: Fri, 10 Jun 2016 11:24:10 -0500
Subject: [PATCH 2775/4742] [sql mode] Removed `commentHash` and
 `commentSpaceRequired` from `text/x-pgsql`.

Closes #3888
Closes #4063.
---
 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 daec60ce6f..17a096c5fc 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -368,7 +368,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast commentHash commentSpaceRequired")
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
   });
 
   // Google's SQL-like query language, GQL

From 58b549d2147ba2d4a9f9b4a5394982818455b58c Mon Sep 17 00:00:00 2001
From: "David H. Bronke" <dbronke@armt.com>
Date: Fri, 10 Jun 2016 12:20:05 -0500
Subject: [PATCH 2776/4742] [sql mode] Added missing operator characters for
 `text/x-pgsql`.

Closes #4064.
---
 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 17a096c5fc..01ebd80ae1 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -366,7 +366,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     // http://www.postgresql.org/docs/9.5/static/datatype.html
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=&|^]/,
+    operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
     dateSQL: set("date time timestamp"),
     support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
   });

From 047afd24c563e97f6ceab8e700deabff272ec51b Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Tue, 14 Jun 2016 14:56:31 -0700
Subject: [PATCH 2777/4742] [go mode] Add `error` as highlighted type

It is, per https://golang.org/ref/spec#Predeclared_identifiers
---
 mode/go/go.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/go/go.js b/mode/go/go.js
index 21fe9a2d6e..3c9ef6b989 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -23,7 +23,7 @@ CodeMirror.defineMode("go", function(config) {
     "bool":true, "byte":true, "complex64":true, "complex128":true,
     "float32":true, "float64":true, "int8":true, "int16":true, "int32":true,
     "int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true,
-    "uint64":true, "int":true, "uint":true, "uintptr":true
+    "uint64":true, "int":true, "uint":true, "uintptr":true, "error": true
   };
 
   var atoms = {

From 3aba5a8ce1ea24dc243df1198920a81957d17c5b Mon Sep 17 00:00:00 2001
From: Jeff Jenkins <velo@google.com>
Date: Wed, 1 Jun 2016 07:06:43 -0400
Subject: [PATCH 2778/4742] [sublime keymap] Mimic sublime on OS X with
 ctrl-shift for selectLines

---
 keymap/sublime.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 0da347a99e..ed6b847428 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -500,7 +500,8 @@
     cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
   };
 
-  cmds[map["Shift-Alt-Up"] = "selectLinesUpward"] = function(cm) {
+  var selectLinesCombo = mac ? "Ctrl-Shift-" : "Ctrl-Alt-";
+  cmds[map[selectLinesCombo + "Up"] = "selectLinesUpward"] = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();
       for (var i = 0; i < ranges.length; i++) {
@@ -510,7 +511,7 @@
       }
     });
   };
-  cmds[map["Shift-Alt-Down"] = "selectLinesDownward"] = function(cm) {
+  cmds[map[selectLinesCombo + "Down"] = "selectLinesDownward"] = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();
       for (var i = 0; i < ranges.length; i++) {

From 76e252d6c87626a4de5cf6a47ada554bb8a14f57 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jun 2016 10:38:36 +0200
Subject: [PATCH 2779/4742] Add kludge to improve handling of clicks after line
 wrapping breaks

Issue #4078
---
 lib/codemirror.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ac0bd54078..7fd38c976e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2933,10 +2933,23 @@
     for (;;) {
       if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
         var ch = x < fromX || x - fromX <= toX - x ? from : to;
+        var outside = ch == from ? fromOutside : toOutside
         var xDiff = x - (ch == from ? fromX : toX);
+        // This is a kludge to handle the case where the coordinates
+        // are after a line-wrapped line. We should replace it with a
+        // more general handling of cursor positions around line
+        // breaks. (Issue #4078)
+        if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
+            ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
+          var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right");
+          if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
+            outside = false
+            ch++
+            xDiff = x - charSize.right
+          }
+        }
         while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
-        var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,
-                              xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
+        var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
         return pos;
       }
       var step = Math.ceil(dist / 2), middle = from + step;

From 592b4d1743a7fb3708c940b079a5913ba6df788d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jun 2016 11:24:14 +0200
Subject: [PATCH 2780/4742] [hardwrap addon] Fix corner case for words whose
 length equals the wrap column

Issue #4069
---
 addon/wrap/hardwrap.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 8806fbe2f2..04851f99ff 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -30,7 +30,9 @@
   }
 
   function findBreakPoint(text, column, wrapOn, killTrailingSpace) {
-    for (var at = column; at > 0; --at)
+    var at = column
+    while (at < text.length && text.charAt(at) == " ") at++
+    for (; at > 0; --at)
       if (wrapOn.test(text.slice(at - 1, at + 1))) break;
     for (var first = true;; first = false) {
       var endOfText = at;

From e1201757de3ec5621a7271f32bd9ac2280a0cf3f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jun 2016 11:39:43 +0200
Subject: [PATCH 2781/4742] [scrollpastend addon] Work around potential
 infinite event-handler recursion

See https://discuss.codemirror.net/t/range-error-with-scrollpastend-addon/773
---
 addon/scroll/scrollpastend.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/scroll/scrollpastend.js b/addon/scroll/scrollpastend.js
index 008ae4c7ba..a2ed089b48 100644
--- a/addon/scroll/scrollpastend.js
+++ b/addon/scroll/scrollpastend.js
@@ -40,7 +40,9 @@
     if (cm.state.scrollPastEndPadding != padding) {
       cm.state.scrollPastEndPadding = padding;
       cm.display.lineSpace.parentNode.style.paddingBottom = padding;
+      cm.off("refresh", updateBottomMargin);
       cm.setSize();
+      cm.on("refresh", updateBottomMargin);
     }
   }
 });

From 6bd09fcc278ed625d8478177e3a284e91d0b8695 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jun 2016 11:57:58 +0200
Subject: [PATCH 2782/4742] Mark version 5.16.0

---
 AUTHORS           |  5 +++++
 CHANGELOG.md      | 20 ++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 7 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5e373a0202..ce2be8d6d2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,6 +14,7 @@ Ahmad Amireh
 Ahmad M. Zawawi
 ahoward
 Akeksandr Motsjonov
+Alasdair Smith
 Alberto González Palomo
 Alberto Pose
 Albert Xing
@@ -140,6 +141,7 @@ Darius Roberts
 Dave Brondsema
 Dave Myers
 David Barnett
+David H. Bronke
 David Mignot
 David Pathakjee
 David Vázquez
@@ -213,6 +215,7 @@ Gustavo Rodrigues
 Hakan Tunc
 Hans Engel
 Hardest
+Harshvardhan Gupta
 Hasan Karahan
 Hector Oswaldo Caballero
 Herculano Campos
@@ -258,6 +261,7 @@ Jason Siefken
 Jaydeep Solanki
 Jean Boussier
 Jeff Blaisdell
+Jeff Jenkins
 jeffkenton
 Jeff Pickhardt
 jem (graphite)
@@ -479,6 +483,7 @@ Ruslan Osmanov
 Ryan Prior
 sabaca
 Samuel Ainsworth
+Sam Wilson
 sandeepshetty
 Sander AKA Redsandro
 santec
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 146af30edd..a34cf82ffa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.16.0 (2016-06-20)
+
+### Bugfixes
+
+Fix glitches when dragging content caused by the drop indicator receiving mouse events.
+
+Make Control-drag work on Firefox.
+
+Make clicking or selection-dragging at the end of a wrapped line select the right position.
+
+[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Prevent widget scrollbar from hiding part of the hint text.
+
+[rulers addon](http://codemirror.net/doc/manual.html#addon_rulers): Prevent rulers from forcing a horizontal editor scrollbar.
+
+### New features
+
+[search addon](http://codemirror.net/doc/manual.html#addon_search): Automatically bind search-related keys in persistent dialog.
+
+[sublime keymap](http://codemirror.net/demo/sublime.html): Add a multi-cursor aware smart backspace binding.
+
 ## 5.15.2 (2016-05-20)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index fe27e025cc..b890bee021 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.16.0;f=">5.16.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.2;f=">5.15.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.0;f=">5.15.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.2;f=">5.14.2</option>
diff --git a/doc/manual.html b/doc/manual.html
index 8c39e7f941..55b22efd65 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.15.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.16.0</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/index.html b/index.html
index e987926921..528b3a430a 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.15.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.16.0</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 7fd38c976e..7dc842d3ba 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8916,7 +8916,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.15.3";
+  CodeMirror.version = "5.16.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index d4dd2b00ef..5638b12a1f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.15.3",
+    "version":"5.16.0",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 3adfe9388f1ab6e97ff7c08aa0ff732fd412ccad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jun 2016 11:59:45 +0200
Subject: [PATCH 2783/4742] Bump version post-5.16.0

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 55b22efd65..030287c3ef 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.16.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.16.2</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7dc842d3ba..570eba1b35 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8916,7 +8916,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.16.0";
+  CodeMirror.version = "5.16.2";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 5638b12a1f..276c2d29e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.16.0",
+    "version":"5.16.2",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 3a9730faf6bfe9bbb5245d31d471cf2d735e7573 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jun 2016 12:02:15 +0200
Subject: [PATCH 2784/4742] Add forgotten release notes to web site

---
 doc/releases.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/releases.html b/doc/releases.html
index 594298ef6a..052f7809c0 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-06-2016: <a href="http://codemirror.net/codemirror-5.16.0.zip">Version 5.16.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix glitches when dragging content caused by the drop indicator receiving mouse events.</li>
+    <li>Make Control-drag work on Firefox.</li>
+    <li>Make clicking or selection-dragging at the end of a wrapped line select the right position.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Prevent widget scrollbar from hiding part of the hint text.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_rulers">rulers addon</a>: Prevent rulers from forcing a horizontal editor scrollbar.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_search">search addon</a>: Automatically bind search-related keys in persistent dialog.</li>
+    <li><a href="http://codemirror.net/demo/sublime.html">sublime keymap</a>: Add a multi-cursor aware smart backspace binding.</li>
+  </ul>
+
   <p class="rel">20-05-2016: <a href="http://codemirror.net/codemirror-5.15.2.zip">Version 5.15.2</a>:</p>
 
   <ul class="rel-note">

From 23196659003e0cd18d5e5af7f500146a552e5c7d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 23 Jun 2016 15:13:55 +0200
Subject: [PATCH 2785/4742] [javascript mode] Improve support for async keyword

Closes #4085
---
 mode/javascript/javascript.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index ca875411a2..ddb46bab27 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -386,7 +386,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
     if (type == "function") return cont(functiondef, maybeop);
-    if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
+    if (type == "keyword c" || type == "async") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
@@ -463,6 +463,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {cx.marked = "property"; return cont();}
   }
   function objprop(type, value) {
+    if (type == "async") return cont(objprop);
     if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);

From 54d0d82e2f3645444c52d4bb8055d5bb8a3c0b5c Mon Sep 17 00:00:00 2001
From: Yunchi Luo <mightyguava@gmail.com>
Date: Sat, 25 Jun 2016 23:12:42 -0400
Subject: [PATCH 2786/4742] [vim mode] Fix Backspace in replace mode...

and remove autocomplete bindings
---
 keymap/vim.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 4278ee9798..9891eb5fcb 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -53,6 +53,7 @@
     { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
     { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
     { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'},
+    { keys: '<BS>', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }, context: 'insert'},
     { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
     { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B', context: 'normal' },
     { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
@@ -4771,13 +4772,6 @@
     CodeMirror.keyMap['vim-insert'] = {
       // TODO: override navigation keys so that Esc will cancel automatic
       // indentation from o, O, i_<CR>
-      'Ctrl-N': 'autocomplete',
-      'Ctrl-P': 'autocomplete',
-      'Enter': function(cm) {
-        var fn = CodeMirror.commands.newlineAndIndentContinueComment ||
-            CodeMirror.commands.newlineAndIndent;
-        fn(cm);
-      },
       fallthrough: ['default'],
       attach: attachVimMap,
       detach: detachVimMap,
@@ -4785,7 +4779,6 @@
     };
 
     CodeMirror.keyMap['vim-replace'] = {
-      'Backspace': 'goCharLeft',
       fallthrough: ['vim-insert'],
       attach: attachVimMap,
       detach: detachVimMap,

From fb3e1dc58d2c80c4535d55911f9326729ef5bc73 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 28 Jun 2016 11:16:50 +0200
Subject: [PATCH 2787/4742] [show-hint addon] Drop default max-width for hint
 widget

Closes #4080
---
 addon/hint/show-hint.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addon/hint/show-hint.css b/addon/hint/show-hint.css
index 453dee4bb7..5617ccca2b 100644
--- a/addon/hint/show-hint.css
+++ b/addon/hint/show-hint.css
@@ -16,7 +16,6 @@
   background: white;
   font-size: 90%;
   font-family: monospace;
-  max-width: 19em;
 
   max-height: 20em;
   overflow-y: auto;

From 2c913e5d2914fdc64df80031544a384940006feb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 28 Jun 2016 11:37:05 +0200
Subject: [PATCH 2788/4742] Make hack to break up adjacent spaces work for
 single-space tokens

Closes #4087
---
 lib/codemirror.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 570eba1b35..476ab2e6e5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6944,6 +6944,7 @@
     var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
     var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
                    col: 0, pos: 0, cm: cm,
+                   trailingSpace: false,
                    splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
     lineView.measure = {};
 
@@ -7005,7 +7006,7 @@
   // the line map. Takes care to render special characters separately.
   function buildToken(builder, text, style, startStyle, endStyle, title, css) {
     if (!text) return;
-    var displayText = builder.splitSpaces ? text.replace(/ {3,}/g, splitSpaces) : text;
+    var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
     var special = builder.cm.state.specialChars, mustWrap = false;
     if (!special.test(text)) {
       builder.col += text.length;
@@ -7050,6 +7051,7 @@
         builder.pos++;
       }
     }
+    builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
     if (style || startStyle || endStyle || mustWrap || css) {
       var fullStyle = style || "";
       if (startStyle) fullStyle += startStyle;
@@ -7061,11 +7063,17 @@
     builder.content.appendChild(content);
   }
 
-  function splitSpaces(old) {
-    var out = " ";
-    for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
-    out += " ";
-    return out;
+  function splitSpaces(text, trailingBefore) {
+    if (text.length > 1 && !/  /.test(text)) return text
+    var spaceBefore = trailingBefore, result = ""
+    for (var i = 0; i < text.length; i++) {
+      var ch = text.charAt(i)
+      if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
+        ch = "\u00a0"
+      result += ch
+      spaceBefore = ch == " "
+    }
+    return result
   }
 
   // Work around nonsense dimensions being reported for stretches of
@@ -7102,6 +7110,7 @@
       builder.content.appendChild(widget);
     }
     builder.pos += size;
+    builder.trailingSpace = false
   }
 
   // Outputs a number of spans to make up a line, taking highlighting

From 24d86a87890bd21f8ba23e4c2bb8cfa25db00b3c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 28 Jun 2016 11:40:20 +0200
Subject: [PATCH 2789/4742] Stop blocking selection-undo in read-only mode

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 476ab2e6e5..7be2fac1db 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4419,7 +4419,7 @@
 
   // Revert a change stored in a document's history.
   function makeChangeFromHistory(doc, type, allowSelectionOnly) {
-    if (doc.cm && doc.cm.state.suppressEdits) return;
+    if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return;
 
     var hist = doc.history, event, selAfter = doc.sel;
     var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;

From 34b3a7b9e77aa8fe67b792fdf5575bd1cdb55132 Mon Sep 17 00:00:00 2001
From: Hendrik Wallbaum <mail@hendrikwallbaum.de>
Date: Fri, 24 Jun 2016 17:04:28 +0800
Subject: [PATCH 2790/4742] [markdown mode] Add more token styles for image
 references

- Images now come with tons of information to style them. This mainly
  enables to style alt-texts and potentially make them look like links.
  While still differentialting between links and images.

Closes #4082
---
 mode/markdown/markdown.js | 30 ++++++++++++++++++++++++++----
 mode/markdown/test.js     | 29 ++++++++++++++++++++++++-----
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 37329c2385..9dd44574fc 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -63,7 +63,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     list2: "variable-3",
     list3: "keyword",
     hr: "hr",
-    image: "tag",
+    image: "image",
+    imageAltText: "image-alt-text",
+    imageMarker: "image-marker",
     formatting: "formatting",
     linkInline: "link",
     linkEmail: "link",
@@ -313,6 +315,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
       if (state.linkText) { styles.push(tokenTypes.linkText); }
       if (state.code) { styles.push(tokenTypes.code); }
+      if (state.image) { styles.push(tokenTypes.image); }
+      if (state.imageAltText) { styles.push(tokenTypes.imageAltText, "link"); }
+      if (state.imageMarker) { styles.push(tokenTypes.imageMarker); }
     }
 
     if (state.header) { styles.push(tokenTypes.header, tokenTypes.header + "-" + state.header); }
@@ -432,12 +437,29 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
-      stream.match(/\[[^\]]*\]/);
+      state.imageMarker = true;
+      state.image = true;
+      if (modeCfg.highlightFormatting) state.formatting = "image";
+      return getType(state);
+    }
+
+    if (ch === '[' && state.imageMarker) {
+      state.imageMarker = false;
+      state.imageAltText = true
+      if (modeCfg.highlightFormatting) state.formatting = "image";
+      return getType(state);
+    }
+
+    if (ch === ']' && state.imageAltText) {
+      if (modeCfg.highlightFormatting) state.formatting = "image";
+      var type = getType(state);
+      state.imageAltText = false;
+      state.image = false;
       state.inline = state.f = linkHref;
-      return tokenTypes.image;
+      return type;
     }
 
-    if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false)) {
+    if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false) && !state.image) {
       state.linkText = true;
       if (modeCfg.highlightFormatting) state.formatting = "link";
       return getType(state);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index e76eae9027..2f43a170ca 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -22,6 +22,8 @@
       "list3" : "override-list3",
       "hr" : "override-hr",
       "image" : "override-image",
+      "imageAltText": "override-image-alt-text",
+      "imageMarker": "override-image-marker",
       "linkInline" : "override-link-inline",
       "linkEmail" : "override-link-email",
       "linkText" : "override-link-text",
@@ -89,6 +91,9 @@
   FT("formatting_escape",
      "[formatting-escape \\*]");
 
+  FT("formatting_image",
+     "[formatting&formatting-image&image&image-marker !][formatting&formatting-image&image&image-alt-text&link [[][image&image-alt-text&link alt text][formatting&formatting-image&image&image-alt-text&link ]]][formatting&formatting-link-string&string&url (][url&string http://link.to/image.jpg][formatting&formatting-link-string&string&url )]");
+
   MT("plainText",
      "foo");
 
@@ -589,6 +594,20 @@
   MT("hrDashLong",
      "[hr ---------------------------------------]");
 
+  //Images
+  MT("Images",
+     "[image&image-marker !][image&image-alt-text&link [[alt text]]][string&url (http://link.to/image.jpg)]")
+
+  //Images with highlight alt text
+  MT("imageEm",
+     "[image&image-marker !][image&image-alt-text&link [[][image-alt-text&em&image&link *alt text*][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]");
+
+  MT("imageStrong",
+     "[image&image-marker !][image&image-alt-text&link [[][image-alt-text&strong&image&link **alt text**][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]");
+
+  MT("imageEmStrong",
+     "[image&image-marker !][image&image-alt-text&link [[][image-alt-text&image&strong&link **][image&image-alt-text&em&strong&link *alt text**][image&image-alt-text&em&link *][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]");
+
   // Inline link with title
   MT("linkTitle",
      "[link [[foo]]][string&url (http://example.com/ \"bar\")] hello");
@@ -599,7 +618,7 @@
 
   // Inline link with image
   MT("linkImage",
-     "[link [[][tag ![[foo]]][string&url (http://example.com/)][link ]]][string&url (http://example.com/)] bar");
+     "[link [[][link&image&image-marker !][link&image&image-alt-text&link [[alt text]]][string&url (http://link.to/image.jpg)][link ]]][string&url (http://example.com/)] bar");
 
   // Inline link with Em
   MT("linkEm",
@@ -615,15 +634,15 @@
 
   // Image with title
   MT("imageTitle",
-     "[tag ![[foo]]][string&url (http://example.com/ \"bar\")] hello");
+     "[image&image-marker !][image&image-alt-text&link [[alt text]]][string&url (http://example.com/ \"bar\")] hello");
 
   // Image without title
   MT("imageNoTitle",
-     "[tag ![[foo]]][string&url (http://example.com/)] bar");
+     "[image&image-marker !][image&image-alt-text&link [[alt text]]][string&url (http://example.com/)] bar");
 
   // Image with asterisks
   MT("imageAsterisks",
-     "[tag ![[*foo*]]][string&url (http://example.com/)] bar");
+     "[image&image-marker !][image&image-alt-text&link [[ ][image&image-alt-text&em&link *alt text*][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)] bar");
 
   // Not a link. Should be normal text due to square brackets being used
   // regularly in text, especially in quoted material, and no space is allowed
@@ -878,7 +897,7 @@
     "[override-hr * * *]");
 
   TokenTypeOverrideTest("overrideImage",
-    "[override-image ![[foo]]][override-link-href&url (http://example.com/)]")
+    "[override-image&override-image-marker !][override-image&override-image-alt-text&link [[alt text]]][override-link-href&url (http://link.to/image.jpg)]");
 
   TokenTypeOverrideTest("overrideLinkText",
     "[override-link-text [[foo]]][override-link-href&url (http://example.com)]");

From 6a845599c638513c75b8f04880965314099988b4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 1 Jul 2016 09:51:12 +0200
Subject: [PATCH 2791/4742] [show-hint addon] Move call to getScrollInto to
 avoid a reflow

---
 addon/hint/show-hint.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 64ec9289cc..604bd3b715 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -230,6 +230,8 @@
     (completion.options.container || document.body).appendChild(hints);
     var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
     var scrolls = hints.scrollHeight > hints.clientHeight + 1
+    var startScroll = cm.getScrollInfo();
+
     if (overlapY > 0) {
       var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
       if (curTop - height > 0) { // Fits above cursor
@@ -273,7 +275,6 @@
       cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
     }
 
-    var startScroll = cm.getScrollInfo();
     cm.on("scroll", this.onScroll = function() {
       var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
       var newTop = top + startScroll.top - curScroll.top;

From a0547b7b9d887db173b1463b79e64a77f4fd8c32 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Fri, 1 Jul 2016 16:01:35 -0700
Subject: [PATCH 2792/4742] [sublime] Make goSubwordLeft/Right shortcuts match
 Sublime on OSX

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index ed6b847428..db9f54de16 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -52,8 +52,10 @@
     });
   }
 
-  cmds[map["Alt-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
-  cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
+  var goSubwordCombo = mac ? "Ctrl-" : "Alt-";
+
+  cmds[map[goSubwordCombo + "Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
+  cmds[map[goSubwordCombo + "Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
 
   if (mac) map["Cmd-Left"] = "goLineStartSmart";
 

From 84dc2d07fa19c237479c1681385a63d64fddcc74 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <lukegb@google.com>
Date: Wed, 6 Jul 2016 13:28:29 +0100
Subject: [PATCH 2793/4742] [vim bindings] Make Backspace delete characters

In Replace mode (or Overwrite mode) it should still go backwards
without deleting characters.
---
 keymap/vim.js    | 19 ++++++++++++++++---
 test/vim_test.js | 28 +++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9891eb5fcb..afed132e36 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -53,7 +53,6 @@
     { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
     { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
     { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'},
-    { keys: '<BS>', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }, context: 'insert'},
     { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
     { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B', context: 'normal' },
     { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
@@ -73,6 +72,7 @@
     { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
     { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
     { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
+    { keys: '<Ins>', type: 'action', action: 'toggleOverwrite', context: 'insert' },
     // Motions
     { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
     { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
@@ -277,6 +277,7 @@
 
     function cmKey(key, cm) {
       if (!cm) { return undefined; }
+      if (this[key]) { return this[key]; }
       var vimKey = cmKeyToVimKey(key);
       if (!vimKey) {
         return false;
@@ -289,7 +290,7 @@
     }
 
     var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
-    var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del'};
+    var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del',Insert:'Ins'};
     function cmKeyToVimKey(key) {
       if (key.charAt(0) == '\'') {
         // Keypress character binding of format "'a'"
@@ -2175,6 +2176,17 @@
         var registerName = actionArgs.selectedCharacter;
         macroModeState.enterMacroRecordMode(cm, registerName);
       },
+      toggleOverwrite: function(cm) {
+        if (!cm.state.overwrite) {
+          cm.toggleOverwrite(true);
+          cm.setOption('keyMap', 'vim-replace');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
+        } else {
+          cm.toggleOverwrite(false);
+          cm.setOption('keyMap', 'vim-insert');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
+        }
+      },
       enterInsertMode: function(cm, actionArgs, vim) {
         if (cm.getOption('readOnly')) { return; }
         vim.insertMode = true;
@@ -2220,7 +2232,6 @@
             return;
           }
         }
-        cm.setOption('keyMap', 'vim-insert');
         cm.setOption('disableInput', false);
         if (actionArgs && actionArgs.replace) {
           // Handle Replace-mode as a special case of insert mode.
@@ -2228,6 +2239,7 @@
           cm.setOption('keyMap', 'vim-replace');
           CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
         } else {
+          cm.toggleOverwrite(false);
           cm.setOption('keyMap', 'vim-insert');
           CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
         }
@@ -4779,6 +4791,7 @@
     };
 
     CodeMirror.keyMap['vim-replace'] = {
+      'Backspace': 'goCharLeft',
       fallthrough: ['vim-insert'],
       attach: attachVimMap,
       detach: detachVimMap,
diff --git a/test/vim_test.js b/test/vim_test.js
index fb612b1407..159114cecd 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -145,7 +145,7 @@ function testVim(name, run, opts, expectedFail) {
         for (var i = 0; i < arguments.length; i++) {
           var key = arguments[i];
           // Find key in keymap and handle.
-          var handled = CodeMirror.lookupKey(key, 'vim-insert', executeHandler);
+          var handled = CodeMirror.lookupKey(key, cm.getOption('keyMap'), executeHandler, cm);
           // Record for insert mode.
           if (handled == "handled" && cm.state.vim.insertMode && arguments[i] != 'Esc') {
             var lastChange = CodeMirror.Vim.getVimGlobalState_().macroModeState.lastInsertModeChanges;
@@ -1419,6 +1419,32 @@ testVim('i_repeat_delete', function(cm, vim, helpers) {
   eq('abe', cm.getValue());
   helpers.assertCursorAt(0, 1);
 }, { value: 'abcde' });
+testVim('insert', function(cm, vim, helpers) {
+  helpers.doKeys('i');
+  eq('vim-insert', cm.getOption('keyMap'));
+  eq(false, cm.state.overwrite);
+  helpers.doKeys('<Ins>');
+  eq('vim-replace', cm.getOption('keyMap'));
+  eq(true, cm.state.overwrite);
+  helpers.doKeys('<Ins>');
+  eq('vim-insert', cm.getOption('keyMap'));
+  eq(false, cm.state.overwrite);
+});
+testVim('i_backspace', function(cm, vim, helpers) {
+  cm.setCursor(0, 10);
+  helpers.doKeys('i');
+  helpers.doInsertModeKeys('Backspace');
+  helpers.assertCursorAt(0, 9);
+  eq('012345678', cm.getValue());
+}, { value: '0123456789'});
+testVim('i_overwrite_backspace', function(cm, vim, helpers) {
+  cm.setCursor(0, 10);
+  helpers.doKeys('i');
+  helpers.doKeys('<Ins>');
+  helpers.doInsertModeKeys('Backspace');
+  helpers.assertCursorAt(0, 9);
+  eq('0123456789', cm.getValue());
+}, { value: '0123456789'});
 testVim('A', function(cm, vim, helpers) {
   helpers.doKeys('A');
   helpers.assertCursorAt(0, lines[0].length);

From 51a1e7da60a99e019f026a118dc7c98c2b1f9d62 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Jul 2016 11:26:11 +0200
Subject: [PATCH 2794/4742] Reposition hidden textarea to work around Chrome
 IME issue

Chrome would show the IME widget too high because it noticed the textarea
was cut off by the wrapping DIV.

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 7be2fac1db..71010ddab2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1221,7 +1221,7 @@
   };
 
   function hiddenTextarea() {
-    var te = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
+    var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");
     var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
     // The textarea is kept positioned near the cursor to prevent the
     // fact that it'll be scrolled into view on input from scrolling

From 43749f8ca08bab0958631e20b8030a3a8de5fddc Mon Sep 17 00:00:00 2001
From: Paul Masson <paulmasson@comcast.net>
Date: Thu, 14 Jul 2016 19:40:48 -0700
Subject: [PATCH 2795/4742] Minor rebase to remove Arabic textnode

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 71010ddab2..d89b3b48f4 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8558,8 +8558,9 @@
     if (badBidiRects != null) return badBidiRects;
     var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
     var r0 = range(txt, 0, 1).getBoundingClientRect();
-    if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
     var r1 = range(txt, 1, 2).getBoundingClientRect();
+    removeChildren(measure);
+    if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
     return badBidiRects = (r1.right - r0.right < 3);
   }
 

From a3d9a31655e11b0088108ac4066111451942e72f Mon Sep 17 00:00:00 2001
From: Siamak Mokhtari <s.mokhtari75@gmail.com>
Date: Thu, 23 Jun 2016 16:19:57 +0430
Subject: [PATCH 2796/4742] [panda-syntax theme] Add

---
 demo/theme.html        |  2 +
 theme/panda-syntax.css | 94 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 theme/panda-syntax.css

diff --git a/demo/theme.html b/demo/theme.html
index 300e2625e3..60f36d6980 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -32,6 +32,7 @@
 <link rel="stylesheet" href="../theme/neat.css">
 <link rel="stylesheet" href="../theme/neo.css">
 <link rel="stylesheet" href="../theme/night.css">
+<link rel="stylesheet" href="../theme/panda-syntax.css">
 <link rel="stylesheet" href="../theme/paraiso-dark.css">
 <link rel="stylesheet" href="../theme/paraiso-light.css">
 <link rel="stylesheet" href="../theme/pastel-on-dark.css">
@@ -114,6 +115,7 @@ <h2>Theme Demo</h2>
     <option>neat</option>
     <option>neo</option>
     <option>night</option>
+    <option>panda-syntax</option>
     <option>paraiso-dark</option>
     <option>paraiso-light</option>
     <option>pastel-on-dark</option>
diff --git a/theme/panda-syntax.css b/theme/panda-syntax.css
new file mode 100644
index 0000000000..0e03500328
--- /dev/null
+++ b/theme/panda-syntax.css
@@ -0,0 +1,94 @@
+/*
+
+	Name:       Panda Syntax
+	Author:     Siamak Mokhtari (http://github.com/siamak/)
+
+	CodeMirror template by Siamak Mokhtari (https://github.com/siamak/atom-panda-syntax)
+
+*/
+.cm-s-panda-syntax {
+	/*font-family: 'Operator Mono', 'Source Sans Pro', Helvetica, Arial, sans-serif;*/
+	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
+	background: #292A2B;
+	color: #E6E6E6;
+}
+.cm-s-panda-syntax .CodeMirror-activeline-background {
+	background: #404954;
+}
+
+.cm-s-panda-syntax .cm-comment {
+	font-style: italic;
+	color: #676B79;
+}
+.cm-s-panda-syntax .cm-string,
+.cm-s-panda-syntax .cm-string-2 {
+	color: #19F9D8;
+}
+.cm-s-panda-syntax .cm-number {
+	color: #FFB86C;
+}
+.cm-s-panda-syntax .cm-atom {
+	color: #FFB86C;
+}
+
+.cm-s-panda-syntax .cm-keyword {
+	color: #FF75B5;
+}
+.cm-s-panda-syntax .cm-keyword-2 {
+	color: #FF75B5;
+}
+.cm-s-panda-syntax .cm-keyword-3 {
+	color: #B084EB;
+}
+
+.cm-s-panda-syntax .cm-variable {
+	color: #FF9AC1;
+}
+.cm-s-panda-syntax .cm-variable-2 {
+	color: #e6e6e6;
+}
+.cm-s-panda-syntax .cm-variable-3 {
+	color: #82B1FF;
+}
+
+.cm-s-panda-syntax .cm-def {
+	/*font-style: italic;*/
+	color: #e6e6e6;
+}
+.cm-s-panda-syntax .cm-def-2 {
+	font-style: italic;
+	color: #ffcc95;
+}
+
+
+.cm-s-panda-syntax .cm-property {
+	color: #6FC1FF;
+}
+
+.cm-s-panda-syntax .cm-matchingbracket,
+.CodeMirror .CodeMirror-matchingbracket {
+	color: #E6E6E6 !important;
+	border-bottom: 1px dotted #19f9d8;
+	padding-bottom: 2px;
+}
+
+.cm-s-panda-syntax .CodeMirror-gutters {
+	background: #292A2B;
+	color: #757575;
+	border: none;
+}
+.cm-s-panda-syntax .CodeMirror-guttermarker, .cm-s-panda-syntax .CodeMirror-guttermarker-subtle, .cm-s-panda-syntax .CodeMirror-linenumber {
+	color: #757575;
+}
+.cm-s-panda-syntax .CodeMirror-linenumber {
+	padding-right: 10px;
+}
+.cm-s-panda-syntax .CodeMirror-cursor {
+	border-left: 1px solid #757575;
+}
+/*.cm-s-panda-syntax div.CodeMirror-selected { background: rgba(255, 255, 255, 0.5); }*/
+.cm-s-panda-syntax.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.25); }
+.cm-s-panda-syntax .CodeMirror-line::selection, .cm-s-panda-syntax .CodeMirror-line > span::selection, .cm-s-panda-syntax .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-panda-syntax .CodeMirror-line::-moz-selection, .cm-s-panda-syntax .CodeMirror-line > span::-moz-selection, .cm-s-panda-syntax .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+
+.cm-s-panda-syntax .CodeMirror-activeline-background { background: rgba(99, 123, 156, 0.125); }

From e60f4b7dd88b71e227f79200932c028ca047d78e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 13:26:35 +0200
Subject: [PATCH 2797/4742] Don't trust bounding client rects for characters

In some cases, on wrapping points, they span the whole line

Issue #4097
---
 lib/codemirror.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d89b3b48f4..c78a6f22da 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2688,6 +2688,16 @@
     return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
   }
 
+  function getUsefulRect(rects, bias) {
+    var rect = nullRect
+    if (bias == "left") for (var i = 0; i < rects.length; i++) {
+      if ((rect = rects[i]).left != rect.right) break
+    } else for (var i = rects.length - 1; i >= 0; i--) {
+      if ((rect = rects[i]).left != rect.right) break
+    }
+    return rect
+  }
+
   function measureCharInner(cm, prepared, ch, bias) {
     var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
     var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
@@ -2697,17 +2707,10 @@
       for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
         while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
         while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
-        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) {
+        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
           rect = node.parentNode.getBoundingClientRect();
-        } else if (ie && cm.options.lineWrapping) {
-          var rects = range(node, start, end).getClientRects();
-          if (rects.length)
-            rect = rects[bias == "right" ? rects.length - 1 : 0];
-          else
-            rect = nullRect;
-        } else {
-          rect = range(node, start, end).getBoundingClientRect() || nullRect;
-        }
+        else
+          rect = getUsefulRect(range(node, start, end).getClientRects(), bias)
         if (rect.left || rect.right || start == 0) break;
         end = start;
         start = start - 1;

From 31eb1b2f0b3ef57881d16287bfaf1a14d4df1f4e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 13:39:38 +0200
Subject: [PATCH 2798/4742] [javascript mode] Handle trailing commas better

---
 mode/javascript/javascript.js | 5 ++++-
 mode/javascript/test.js       | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index ddb46bab27..d0dc9f0647 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -495,7 +495,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (type == ",") {
         var lex = cx.state.lexical;
         if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
-        return cont(what, proceed);
+        return cont(function(type, value) {
+          if (type == end || value == end) return pass()
+          return pass(what)
+        }, proceed);
       }
       if (type == end || value == end) return cont();
       return cont(expect(end));
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index cb43d0894d..18f1bd54c9 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -44,6 +44,9 @@
      "  [keyword import] { [def encrypt], [def decrypt] } [keyword from] [string 'crypto'];",
      "}");
 
+  MT("import_trailing_comma",
+     "[keyword import] {[def foo], [def bar],} [keyword from] [string 'baz']")
+
   MT("const",
      "[keyword function] [def f]() {",
      "  [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",

From b8c8a3ee7bfc98e2d3fc2448058a881ec74130ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 13:40:51 +0200
Subject: [PATCH 2799/4742] [javascript mode] Remove support for array/iterator
 comprehension

---
 mode/javascript/javascript.js | 13 ++-----------
 mode/javascript/test.js       |  6 ------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d0dc9f0647..3909c85e6a 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -387,7 +387,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
     if (type == "function") return cont(functiondef, maybeop);
     if (type == "keyword c" || type == "async") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
+    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
@@ -641,16 +641,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function arrayLiteral(type) {
     if (type == "]") return cont();
-    return pass(expressionNoComma, maybeArrayComprehension);
-  }
-  function maybeArrayComprehension(type) {
-    if (type == "for") return pass(comprehension, expect("]"));
-    if (type == ",") return cont(commasep(maybeexpressionNoComma, "]"));
-    return pass(commasep(expressionNoComma, "]"));
-  }
-  function comprehension(type) {
-    if (type == "for") return cont(forspec, comprehension);
-    if (type == "if") return cont(expression, comprehension);
+    return pass(expressionNoComma, commasep(expressionNoComma, "]"));
   }
 
   function isContinuedStatement(state, textAfter) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 18f1bd54c9..8916b7558f 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -78,12 +78,6 @@
      "  [variable something]([variable-2 a], [meta ...][variable-2 b]);",
      "}");
 
-  MT("comprehension",
-     "[keyword function] [def f]() {",
-     "  [[([variable x] [operator +] [number 1]) [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
-     "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] [operator ===] [string 'blue']));",
-     "}");
-
   MT("quasi",
      "[variable re][string-2 `fofdlakj${][variable x] [operator +] ([variable re][string-2 `foo`]) [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
 

From e873e9d67e181c4c303b2594af116533c6332526 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 13:48:36 +0200
Subject: [PATCH 2800/4742] [python mode] Make sure the base scope is never
 dropped

Closes #4105
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index ec662b1a95..be65ad7687 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -233,7 +233,7 @@
 
     function dedent(stream, state) {
       var indented = stream.indentation();
-      while (top(state).offset > indented) {
+      while (state.scopes.length > 1 && top(state).offset > indented) {
         if (top(state).type != "py") return true;
         state.scopes.pop();
       }

From dc4198f467f032ca8240afb773f922547847856e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 13:51:08 +0200
Subject: [PATCH 2801/4742] [real-world uses] Add Kodit

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 7b7eeeaf1a..1b272862b8 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -107,6 +107,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>
       <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://www.kodhus.com/kodity/">Kodit</a></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>

From 8019d7cd83fc1712ea94a59b8a2ea27b946c23fe Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Tue, 12 Jul 2016 14:57:18 -0700
Subject: [PATCH 2802/4742] [match-highlighter addon] Make scrollbar
 annotations case-sensitive

To match the actual match-highlights in the editor.
---
 addon/search/match-highlighter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 2c2914a9d0..2121de417b 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -72,7 +72,7 @@
     cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
     if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
       var searchFor = hasBoundary ? new RegExp("\\b" + query + "\\b") : query;
-      state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, true,
+      state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
         {className: "CodeMirror-selection-highlight-scrollbar"});
     }
   }

From f532bda3aacaa621fd5d72ee1d114f312359ccff Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 14:02:51 +0200
Subject: [PATCH 2803/4742] [merge addon] Adjust for space above editor when
 drawing connections

Issue #4112
---
 addon/merge/merge.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index d67b760cae..e8a8d689f5 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -284,7 +284,9 @@
     if (dv.copyButtons) clear(dv.copyButtons);
 
     var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
-    var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
+    var outerTop = dv.mv.wrap.getBoundingClientRect().top
+    var sTopEdit = outerTop - dv.edit.getScrollerElement().getBoundingClientRect().top + dv.edit.getScrollInfo().top
+    let sTopOrig = outerTop - dv.orig.getScrollerElement().getBoundingClientRect().top + dv.orig.getScrollInfo().top;
     for (var i = 0; i < dv.chunks.length; i++) {
       var ch = dv.chunks[i];
       if (ch.editFrom <= vpEdit.to && ch.editTo >= vpEdit.from &&

From 5d9808a0f4f659b56f3076727acbd2bd9ddb7f8e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 14:06:37 +0200
Subject: [PATCH 2804/4742] Fix accidental 'let'

---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index e8a8d689f5..cc94cafb8c 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -286,7 +286,7 @@
     var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
     var outerTop = dv.mv.wrap.getBoundingClientRect().top
     var sTopEdit = outerTop - dv.edit.getScrollerElement().getBoundingClientRect().top + dv.edit.getScrollInfo().top
-    let sTopOrig = outerTop - dv.orig.getScrollerElement().getBoundingClientRect().top + dv.orig.getScrollInfo().top;
+    var sTopOrig = outerTop - dv.orig.getScrollerElement().getBoundingClientRect().top + dv.orig.getScrollInfo().top;
     for (var i = 0; i < dv.chunks.length; i++) {
       var ch = dv.chunks[i];
       if (ch.editFrom <= vpEdit.to && ch.editTo >= vpEdit.from &&

From b6c7f3ff2e04a3d41937c30cdedbd004e5eb22d2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 14:16:33 +0200
Subject: [PATCH 2805/4742] Mark release 5.17.0

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 20 ++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 12 ++++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 8 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ce2be8d6d2..6a96b87c0a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -218,6 +218,7 @@ Hardest
 Harshvardhan Gupta
 Hasan Karahan
 Hector Oswaldo Caballero
+Hendrik Wallbaum
 Herculano Campos
 Hiroyuki Makino
 hitsthings
@@ -332,6 +333,7 @@ lochel
 Lorenzo Stoakes
 Luciano Longo
 Lu Fangjian
+Luke Granger-Brown
 Luke Stagner
 lynschinzer
 M1cha
@@ -444,6 +446,7 @@ Patrick Stoica
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
+Paul Masson
 Pavel
 Pavel Feldman
 Pavel Petržela
@@ -507,6 +510,7 @@ sheopory
 Shiv Deepak
 Shmuel Englard
 Shubham Jain
+Siamak Mokhtari
 silverwind
 sinkuu
 snasa
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a34cf82ffa..55ace8ffa3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.17.0 (2016-07-19)
+
+### Bugfixes
+
+Fix problem with wrapped trailing whitespace displaying incorrectly.
+
+Prevent IME dialog from overlapping typed content in Chrome.
+
+Improve measuring of characters near a line wrap.
+
+[javascript mode](http://codemirror.net/mode/javascript): Improve support for `async`, allow trailing commas in `import` lists.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Fix backspace in replace mode.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Fix some key bindings on OS X to match Sublime Text.
+
+### New features
+
+[markdown mode](http://codemirror.net/mode/markdown): Add more classes to image links in highlight-formatting mode.
+
 ## 5.16.0 (2016-06-20)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index b890bee021..7f08f71c24 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.17.0;f=">5.17.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.16.0;f=">5.16.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.2;f=">5.15.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.0;f=">5.15.0</option>
diff --git a/doc/manual.html b/doc/manual.html
index 030287c3ef..f61c1e1d7a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.16.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.17.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 052f7809c0..17ec88a96d 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">19-07-2016: <a href="http://codemirror.net/codemirror-5.17.0.zip">Version 5.17.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix problem with wrapped trailing whitespace displaying incorrectly.</li>
+    <li>Prevent IME dialog from overlapping typed content in Chrome.</li>
+    <li>Improve measuring of characters near a line wrap.</li>
+    <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Improve support for <code>async</code>, allow trailing commas in <code>import</code> lists.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Fix backspace in replace mode.</li>
+    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix some key bindings on OS X to match Sublime Text.</li>
+    <li><a href="http://codemirror.net/mode/markdown">markdown mode</a>: Add more classes to image links in highlight-formatting mode.</li>
+  </ul>
+
   <p class="rel">20-06-2016: <a href="http://codemirror.net/codemirror-5.16.0.zip">Version 5.16.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 528b3a430a..8860f8b4e3 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.16.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.17.0</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 c78a6f22da..5009f836cb 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8929,7 +8929,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.16.2";
+  CodeMirror.version = "5.17.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 276c2d29e9..fa09ced888 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.16.2",
+    "version":"5.17.0",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 791fdd1f9874c284319b176f080e1dfdfc06e5d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 14:19:58 +0200
Subject: [PATCH 2806/4742] Bump version number post-5.17.0

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f61c1e1d7a..408ac8bceb 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.17.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.17.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5009f836cb..ff7126fb7f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8929,7 +8929,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.17.0";
+  CodeMirror.version = "5.17.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index fa09ced888..135a9608c1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.17.0",
+    "version":"5.17.1",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 8a1dd1604974840fe69163f958ad204010442aea Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 23:14:59 +0200
Subject: [PATCH 2807/4742] [lint demo] Remove css lint example

Since the only pre-build version of csslint was changed to some
global-scope-polluting mess that breaks our module loader headers.

Issue #4123
---
 demo/lint.html | 68 --------------------------------------------------
 1 file changed, 68 deletions(-)

diff --git a/demo/lint.html b/demo/lint.html
index 96009b4e1f..ea0297b27d 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -11,11 +11,9 @@
 <script src="../mode/css/css.js"></script>
 <script src="//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
 <script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
-<script src="http://csslint.net/js/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
 <script src="../addon/lint/javascript-lint.js"></script>
 <script src="../addon/lint/json-lint.js"></script>
-<script src="../addon/lint/css-lint.js"></script>
 <style type="text/css">
       .CodeMirror {border: 1px solid black;}
     </style>
@@ -85,66 +83,6 @@ <h2>Linter Demo</h2>
 ]
 </textarea></p>
 
-    <p><textarea id="code-css">@charset "UTF-8";
-
-@import url("booya.css") print, screen;
-@import "whatup.css" screen;
-@import "wicked.css";
-
-/*Error*/
-@charset "UTF-8";
-
-
-@namespace "http://www.w3.org/1999/xhtml";
-@namespace svg "http://www.w3.org/2000/svg";
-
-/*Warning: empty ruleset */
-.foo {
-}
-
-h1 {
-    font-weight: bold;
-}
-
-/*Warning: qualified heading */
-.foo h1 {
-    font-weight: bold;
-}
-
-/*Warning: adjoining classes */
-.foo.bar {
-    zoom: 1;
-}
-
-li.inline {
-    width: 100%;  /*Warning: 100% can be problematic*/
-}
-
-li.last {
-  display: inline;
-  padding-left: 3px !important;
-  padding-right: 3px;
-  border-right: 0px;
-}
-
-@media print {
-    li.inline {
-      color: black;
-    }
-}
-
-@page {
-  margin: 10%;
-  counter-increment: page;
-
-  @top-center {
-    font-family: sans-serif;
-    font-weight: bold;
-    font-size: 2em;
-    content: counter(page);
-  }
-}
-</textarea></p>
 <script>
   var editor = CodeMirror.fromTextArea(document.getElementById("code-js"), {
     lineNumbers: true,
@@ -160,12 +98,6 @@ <h2>Linter Demo</h2>
     lint: true
   });
   
-  var editor_css = CodeMirror.fromTextArea(document.getElementById("code-css"), {
-    lineNumbers: true,
-    mode: "css",
-    gutters: ["CodeMirror-lint-markers"],
-    lint: true
-  });
 </script>
 
   </article>

From 23172fded8ddc9c9b1bee9c2617f25c884ed9d0d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2016 23:17:38 +0200
Subject: [PATCH 2808/4742] Add missing scripts to compression helper

Closes #4122
---
 doc/compress.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/compress.html b/doc/compress.html
index 7f08f71c24..80de52da93 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -252,12 +252,14 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/addon/comment/continuecomment.js">continuecomment.js</option>
           <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>
           <option value="http://codemirror.net/addon/hint/css-hint.js">css-hint.js</option>
+          <option value="http://codemirror.net/addon/lint/css-lint.js">css-lint.js</option>
           <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
           <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
           <option value="http://codemirror.net/addon/fold/foldgutter.js">foldgutter.js</option>
           <option value="http://codemirror.net/addon/display/fullscreen.js">fullscreen.js</option>
           <option value="http://codemirror.net/addon/wrap/hardwrap.js">hardwrap.js</option>
           <option value="http://codemirror.net/addon/hint/html-hint.js">html-hint.js</option>
+          <option value="http://codemirror.net/addon/lint/html-lint.js">html-lint.js</option>
           <option value="http://codemirror.net/addon/fold/indent-fold.js">indent-fold.js</option>
           <option value="http://codemirror.net/addon/hint/javascript-hint.js">javascript-hint.js</option>
           <option value="http://codemirror.net/addon/lint/javascript-lint.js">javascript-lint.js</option>

From f8b765b2eb5ab7d99b038f41de3d35621d71baee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 22 Jul 2016 13:54:18 +0200
Subject: [PATCH 2809/4742] [matchbrackets addon] Clear matched brackets when
 the addon is turned off

Closes #4128
---
 addon/edit/matchbrackets.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 70e1ae18c7..76754ed557 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -102,8 +102,10 @@
   }
 
   CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init)
+    if (old && old != CodeMirror.Init) {
       cm.off("cursorActivity", doMatchBrackets);
+      if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
+    }
     if (val) {
       cm.state.matchBrackets = typeof val == "object" ? val : {};
       cm.on("cursorActivity", doMatchBrackets);

From 5e29ee6e8e157efb6c9bf5291324348bc02a8ef8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 23 Jul 2016 22:40:00 +0200
Subject: [PATCH 2810/4742] [javascript mode] Fix bug in array literal parsing

Closes #4130
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 3909c85e6a..923f42e248 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -641,7 +641,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function arrayLiteral(type) {
     if (type == "]") return cont();
-    return pass(expressionNoComma, commasep(expressionNoComma, "]"));
+    return pass(commasep(expressionNoComma, "]"));
   }
 
   function isContinuedStatement(state, textAfter) {

From b3482bb9306be0388d3ab09740863932875eb998 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 25 Jul 2016 09:25:35 +0200
Subject: [PATCH 2811/4742] [javascript mode] Fix a bug in parsing of arrow
 function with no args

Closes #4131
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 923f42e248..da6b760f78 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -216,7 +216,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       var bracket = brackets.indexOf(ch);
       if (bracket >= 0 && bracket < 3) {
         if (!depth) { ++pos; break; }
-        if (--depth == 0) break;
+        if (--depth == 0) { if (ch == "(") sawSomething = true; break; }
       } else if (bracket >= 3 && bracket < 6) {
         ++depth;
       } else if (wordRE.test(ch)) {

From 6d1379e29ad5a7bcef3ecfec7c6cd739a53567d9 Mon Sep 17 00:00:00 2001
From: Joel Einbinder <einbinder@chromium.org>
Date: Fri, 29 Jul 2016 12:31:37 -0700
Subject: [PATCH 2812/4742] Fix gutterBackgrounds to a fixedGutter

---
 lib/codemirror.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ff7126fb7f..4568673e3c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -592,8 +592,12 @@
     var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
     var gutterW = display.gutters.offsetWidth, left = comp + "px";
     for (var i = 0; i < view.length; i++) if (!view[i].hidden) {
-      if (cm.options.fixedGutter && view[i].gutter)
-        view[i].gutter.style.left = left;
+      if (cm.options.fixedGutter) {
+        if (view[i].gutter)
+          view[i].gutter.style.left = left;
+        if (view[i].gutterBackground)
+          view[i].gutterBackground.style.left = left;
+      }
       var align = view[i].alignable;
       if (align) for (var j = 0; j < align.length; j++)
         align[j].style.left = left;

From 597a8c81b5109b86dca7274ea47dd64dbf2870ee Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 4 Aug 2016 17:15:32 +0200
Subject: [PATCH 2813/4742] [htmlmixed mode] Strip whitespace from attribute
 values

Closes #4147
---
 mode/htmlmixed/htmlmixed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index d74083ee1a..eb21fcc149 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -46,7 +46,7 @@
 
   function getAttrValue(text, attr) {
     var match = text.match(getAttrRegexp(attr))
-    return match ? match[2] : ""
+    return match ? /^\s*(.*?)\s*$/.exec(match[2])[1] : ""
   }
 
   function getTagRegexp(tagName, anchored) {

From 46b93a27f88b865c24ce87b7f4af80ad36d6fe7b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 5 Aug 2016 14:00:03 +0200
Subject: [PATCH 2814/4742] [javascript mode] Support for TypeScript object
 types

Closes #4149
---
 mode/javascript/javascript.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index da6b760f78..79239ef46f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -525,6 +525,15 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function typeexpr(type) {
     if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
+    if (type == "{") return cont(commasep(typeprop, "}"))
+  }
+  function typeprop(type, value) {
+    if (type == "variable" || cx.style == "keyword") {
+      cx.marked = "property"
+      return cont(typeprop)
+    } else if (type == ":") {
+      return cont(typeexpr)
+    }
   }
   function afterType(type, value) {
     if (value == "<") return cont(commasep(typeexpr, ">"), afterType)

From da81eebc0e3d90e1c1d3a690a1a945a91d4cf647 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 5 Aug 2016 14:04:52 +0200
Subject: [PATCH 2815/4742] Fix linter issue

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 79239ef46f..092bc6f356 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -527,7 +527,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
     if (type == "{") return cont(commasep(typeprop, "}"))
   }
-  function typeprop(type, value) {
+  function typeprop(type) {
     if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property"
       return cont(typeprop)

From 524d006e33b09e32a00d993845ea34356067f6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Stoll=C3=A1r?= <stollarf@gmail.com>
Date: Mon, 8 Aug 2016 15:05:24 +0100
Subject: [PATCH 2816/4742] [solarized theme] Fix fat cursor color in light
 mode

---
 theme/solarized.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index 4b1e16307a..1f39c7edb2 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -155,8 +155,8 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
 
 /* Fat cursor */
-.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #fdf6e3; }
-.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #fdf6e3; }
+.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #77ee77; }
+.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #77ee77; }
 .cm-s-solarized.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: #586e75; }
 .cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }
 

From 92b64d23ad6bc792dd23ffb4889ab070760c5e05 Mon Sep 17 00:00:00 2001
From: callodacity <callodacity@users.noreply.github.com>
Date: Tue, 9 Aug 2016 12:48:16 +1000
Subject: [PATCH 2817/4742] Fix typo in comment

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 4568673e3c..d08aa67f67 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -7962,7 +7962,7 @@
   }
 
   // Register a change in the history. Merges changes that are within
-  // a single operation, ore are close together with an origin that
+  // a single operation, or are close together with an origin that
   // allows merging (starting with "+") into a single event.
   function addChangeToHistory(doc, change, selAfter, opId) {
     var hist = doc.history;

From e47ab5f92d291ed3890459833c8897d7fb1e3fcd Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Tue, 9 Aug 2016 16:51:45 +0100
Subject: [PATCH 2818/4742] [search addon] Fix error on immediate search with
 no previous query

Searching with findPersistentNext or findPersistentPrev will
immediately run a search with the previous query, however it will throw
and error if no previous query exists. This commit fixes by preventing
the immediate execution if no previous query is set
---
 addon/search/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index c005866f16..cd61256519 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -146,7 +146,7 @@
           searchNext(query, event);
         }
       });
-      if (immediate) {
+      if (immediate && q) {
         startSearch(cm, state, q);
         findNext(cm, rev);
       }

From e452ba29689cffa2b81dd8759d3dadf679cd3ab0 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 10 Aug 2016 14:04:49 +0100
Subject: [PATCH 2819/4742] [search addon] Find in extraKeys when handling
 next/prev command in persistent search

When persistent search dialog is open, looking up commands for findNext/
Prev keys would only search the current keyMap. This commit changes this
to also look up commands in extraKeys
---
 addon/search/search.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index cd61256519..be14c93eed 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -136,7 +136,9 @@
         })
       };
       persistentDialog(cm, queryDialog, q, searchNext, function(event, query) {
-        var cmd = CodeMirror.keyMap[cm.getOption("keyMap")][CodeMirror.keyName(event)];
+        var keyName = CodeMirror.keyName(event)
+        var cmd = CodeMirror.keyMap[cm.getOption("keyMap")][keyName]
+        if (!cmd) cmd = cm.getOption('extraKeys')[keyName]
         if (cmd == "findNext" || cmd == "findPrev") {
           CodeMirror.e_stop(event);
           startSearch(cm, getSearchState(cm), query);

From 26d8c7109aa175adf8d234a92649c46bdf3b2bb2 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Wed, 10 Aug 2016 14:07:31 +0100
Subject: [PATCH 2820/4742] [search addon] Add findPersistentNext/Prev commands
 to execute in search dialog

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

diff --git a/addon/search/search.js b/addon/search/search.js
index be14c93eed..753b1afe1e 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -139,7 +139,8 @@
         var keyName = CodeMirror.keyName(event)
         var cmd = CodeMirror.keyMap[cm.getOption("keyMap")][keyName]
         if (!cmd) cmd = cm.getOption('extraKeys')[keyName]
-        if (cmd == "findNext" || cmd == "findPrev") {
+        if (cmd == "findNext" || cmd == "findPrev" ||
+          cmd == "findPersistentNext" || cmd == "findPersistentPrev") {
           CodeMirror.e_stop(event);
           startSearch(cm, getSearchState(cm), query);
           cm.execCommand(cmd);

From 5738f9b2cff5241ea13e32db3579eb347e56e7a0 Mon Sep 17 00:00:00 2001
From: Timothy Hatcher <timothy@apple.com>
Date: Fri, 12 Aug 2016 17:30:55 -0700
Subject: [PATCH 2821/4742] Special case JSON based MIME-types.

Fixes issue #4163.
---
 lib/codemirror.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d08aa67f67..65bfc7999e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5533,6 +5533,8 @@
       spec.name = found.name;
     } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
       return CodeMirror.resolveMode("application/xml");
+    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {
+      return CodeMirror.resolveMode("application/json");
     }
     if (typeof spec == "string") return {name: spec};
     else return spec || {name: "null"};

From 4fda0e229a099b62be077a0d7f3c2f431308e9e9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 12:19:09 +0200
Subject: [PATCH 2822/4742] [manual] Clarify findMarks behavior

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

diff --git a/doc/manual.html b/doc/manual.html
index 408ac8bceb..b912a78f19 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1674,7 +1674,7 @@ <h3 id="api_marker">Text-marking methods</h3>
 
       <dt id="findMarks"><code><strong>doc.findMarks</strong>(from: {line, ch}, to: {line, ch}) → array&lt;TextMarker&gt;</code></dt>
       <dd>Returns an array of all the bookmarks and marked ranges
-      found between the given positions.</dd>
+      found between the given positions (non-inclusive).</dd>
       <dt id="findMarksAt"><code><strong>doc.findMarksAt</strong>(pos: {line, ch}) → array&lt;TextMarker&gt;</code></dt>
       <dd>Returns an array of all the bookmarks and marked ranges
       present at the given position.</dd>

From 6b307573e476e2f5215681303b0a39d3068a9d2f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 12:20:41 +0200
Subject: [PATCH 2823/4742] [livescript mode] Fix bug with use of last token

Closes #4140
---
 mode/livescript/livescript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index 4b26e04619..1e363f8769 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -50,7 +50,7 @@
       startState: function(){
         return {
           next: 'start',
-          lastToken: null
+          lastToken: {style: null, indent: 0, content: ""}
         };
       },
       token: function(stream, state){

From 3ac216b65f8281f0c24b3b2dfac7c892bff08399 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 12:34:39 +0200
Subject: [PATCH 2824/4742] [comment addon] Remove misguided test

Closes #4148
---
 addon/comment/comment.js | 2 +-
 test/comment_test.js     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 2c4f975d08..2f2f071df9 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -140,7 +140,7 @@
         var line = self.getLine(i);
         var found = line.indexOf(lineString);
         if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
-        if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
+        if (found == -1 && nonWS.test(line)) break lineComment;
         if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
         lines.push(line);
       }
diff --git a/test/comment_test.js b/test/comment_test.js
index 26e474493b..3e6a86bbf2 100644
--- a/test/comment_test.js
+++ b/test/comment_test.js
@@ -97,4 +97,9 @@ namespace = "comment_";
   test("dontMessWithStrings3", "javascript", function(cm) {
     cm.execCommand("toggleComment");
   }, "// console.log(\"// string\");", "console.log(\"// string\");");
+
+  test("includeLastLine", "javascript", function(cm) {
+    cm.execCommand("selectAll")
+    cm.execCommand("toggleComment")
+  }, "// foo\n// bar\nbaz", "// // foo\n// // bar\n// baz")
 })();

From a7bfe347ca6d9e402526bd1331437b025c868c46 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 12:39:58 +0200
Subject: [PATCH 2825/4742] [jsx mode] Add a MIME type for TypeScript+JSX

Issue #3893
---
 mode/jsx/index.html | 2 +-
 mode/jsx/jsx.js     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/jsx/index.html b/mode/jsx/index.html
index cb51edb364..1054bbcc0a 100644
--- a/mode/jsx/index.html
+++ b/mode/jsx/index.html
@@ -84,6 +84,6 @@ <h2>JSX mode</h2>
 <p>JSX Mode for <a href="http://facebook.github.io/react">React</a>'s
 JavaScript syntax extension.</p>
 
-<p><strong>MIME types defined:</strong> <code>text/jsx</code>.</p>
+<p><strong>MIME types defined:</strong> <code>text/jsx</code>, <code>text/typescript-jsx</code>.</p>
 
 </article>
diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index aff01b8d35..45c3024aba 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -144,4 +144,5 @@
   }, "xml", "javascript")
 
   CodeMirror.defineMIME("text/jsx", "jsx")
+  CodeMirror.defineMIME("text/typescript-jsx", {name: "jsx", base: {name: "javascript", typescript: true}})
 });

From cbbd9415a09835d10978cfe29750cfe3f4cc392d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 12:53:42 +0200
Subject: [PATCH 2826/4742] [javascript mode] Improve handling of async in
 object literal

Closes #4152
---
 mode/javascript/javascript.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 092bc6f356..18c65e90dd 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -463,8 +463,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {cx.marked = "property"; return cont();}
   }
   function objprop(type, value) {
-    if (type == "async") return cont(objprop);
-    if (type == "variable" || cx.style == "keyword") {
+    if (type == "async") {
+      cx.marked = "property";
+      return cont(objprop);
+    } else if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);
       return cont(afterprop);
@@ -479,6 +481,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(expression, expect("]"), afterprop);
     } else if (type == "spread") {
       return cont(expression);
+    } else if (type == ":") {
+      return pass(afterprop)
     }
   }
   function getterSetter(type) {

From 7061a5a4016b2fb24fe79ad39e8f320e5136ff92 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 13:07:10 +0200
Subject: [PATCH 2827/4742] [javascript mode] Recognize TypeScript function
 types

Closes #4150
---
 mode/javascript/javascript.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 18c65e90dd..17f05045c9 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -530,6 +530,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function typeexpr(type) {
     if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
     if (type == "{") return cont(commasep(typeprop, "}"))
+    if (type == "(") return cont(commasep(typeprop, ")"), maybeReturnType)
+  }
+  function maybeReturnType(type) {
+    if (type == "=>") return cont(typeexpr)
   }
   function typeprop(type) {
     if (type == "variable" || cx.style == "keyword") {

From c5c1e9272504445a11cec3afc7253fe35db4f46c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 13:13:51 +0200
Subject: [PATCH 2828/4742] Add experimental spellcheck option

Closes #4113
---
 lib/codemirror.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 65bfc7999e..0d34b8521a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1197,10 +1197,10 @@
     return {text: text, ranges: ranges};
   }
 
-  function disableBrowserMagic(field) {
+  function disableBrowserMagic(field, spellcheck) {
     field.setAttribute("autocorrect", "off");
     field.setAttribute("autocapitalize", "off");
-    field.setAttribute("spellcheck", "false");
+    field.setAttribute("spellcheck", !!spellcheck);
   }
 
   // TEXTAREA INPUT STYLE
@@ -1578,7 +1578,7 @@
     init: function(display) {
       var input = this, cm = input.cm;
       var div = input.div = display.lineDiv;
-      disableBrowserMagic(div);
+      disableBrowserMagic(div, cm.options.spellcheck);
 
       on(div, "paste", function(e) {
         if (!signalDOMEvent(cm, e)) handlePaste(e, cm);
@@ -5424,6 +5424,9 @@
   option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
     throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
   }, true);
+  option("spellcheck", false, function(cm, val) {
+    cm.getInputField().spellcheck = val
+  }, true);
   option("rtlMoveVisually", !windows);
   option("wholeLineUpdateBefore", true);
 

From 85888eb1db2b9042a69885f1ef9641f45ab1d527 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 13:41:15 +0200
Subject: [PATCH 2829/4742] Add a priority option to addOverlay

See https://discuss.codemirror.net/t/addoverlay-removeoverlay-and-opaque/835
---
 doc/manual.html   | 20 +++++++++++++++-----
 lib/codemirror.js | 12 +++++++++++-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index b912a78f19..8da9cbb2a3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1435,11 +1435,21 @@ <h3 id="api_configuration">Configuration methods</h3>
       spec</a> or a mode object (an object with
       a <a href="#token"><code>token</code></a> method).
       The <code>options</code> parameter is optional. If given, it
-      should be an object. Currently, only the <code>opaque</code>
-      option is recognized. This defaults to off, but can be given to
-      allow the overlay styling, when not <code>null</code>, to
-      override the styling of the base mode entirely, instead of the
-      two being applied together.</dd>
+      should be an object, optionally containing the following options:
+        <dl>
+          <dt><code><strong>opaque</strong>: bool</code></dt>
+          <dd>Defaults to off, but can be given to allow the overlay
+          styling, when not <code>null</code>, to override the styling of
+          the base mode entirely, instead of the two being applied
+          together.</dd>
+          <dt><code><strong>priority</strong>: number</code></dt>
+          <dd>Determines the ordering in which the overlays are
+          applied. Those with high priority are applied after those
+          with lower priority, and able to override the opaqueness of
+          the ones that come before. Defaults to 0.</dd>
+        </dl>
+      </dd>
+
       <dt id="removeOverlay"><code><strong>cm.removeOverlay</strong>(mode: string|object)</code></dt>
       <dd>Pass this the exact value passed for the <code>mode</code>
       parameter to <a href="#addOverlay"><code>addOverlay</code></a>,
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0d34b8521a..b36b3697fa 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4952,7 +4952,10 @@
     addOverlay: methodOp(function(spec, options) {
       var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
       if (mode.startState) throw new Error("Overlays may not be stateful.");
-      this.state.overlays.push({mode: mode, modeSpec: spec, opaque: options && options.opaque});
+      insertSorted(this.state.overlays,
+                   {mode: mode, modeSpec: spec, opaque: options && options.opaque,
+                    priority: (options && options.priority) || 0},
+                   function(overlay) { return overlay.priority })
       this.state.modeGen++;
       regChange(this);
     }),
@@ -8370,6 +8373,13 @@
     return out;
   }
 
+  function insertSorted(array, value, score) {
+    console.log(array)
+    var pos = 0, priority = score(value)
+    while (pos < array.length && score(array[pos]) <= priority) pos++
+    array.splice(pos, 0, value)
+  }
+
   function nothing() {}
 
   function createObj(base, props) {

From 41d73785ae1b0976b20dc27a6d5ae92cd3ca785e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 13:41:45 +0200
Subject: [PATCH 2830/4742] Remove debug statement

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index b36b3697fa..1702dbe9b8 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8374,7 +8374,6 @@
   }
 
   function insertSorted(array, value, score) {
-    console.log(array)
     var pos = 0, priority = score(value)
     while (pos < array.length && score(array[pos]) <= priority) pos++
     array.splice(pos, 0, value)

From 08c34ebdde097c5aca49df530a2ff203727cdfa9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Aug 2016 13:46:20 +0200
Subject: [PATCH 2831/4742] [pug mode] Rename from Jade

Closes #4166
---
 doc/compress.html                 |  2 +-
 mode/index.html                   |  2 +-
 mode/meta.js                      |  2 +-
 mode/{jade => pug}/index.html     | 16 ++++++++--------
 mode/{jade/jade.js => pug/pug.js} |  5 +++--
 5 files changed, 14 insertions(+), 13 deletions(-)
 rename mode/{jade => pug}/index.html (83%)
 rename mode/{jade/jade.js => pug/pug.js} (99%)

diff --git a/doc/compress.html b/doc/compress.html
index 80de52da93..3487d75e5a 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -166,7 +166,6 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option>
           <option value="http://codemirror.net/mode/http/http.js">http.js</option>
           <option value="http://codemirror.net/mode/idl/idl.js">idl.js</option>
-          <option value="http://codemirror.net/mode/jade/jade.js">jade.js</option>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
           <option value="http://codemirror.net/mode/julia/julia.js">julia.js</option>
@@ -193,6 +192,7 @@ <h2>Script compression helper</h2>
           <option value="http://codemirror.net/mode/properties/properties.js">properties.js</option>
           <option value="http://codemirror.net/mode/protobuf/protobuf.js">protobuf.js</option>
           <option value="http://codemirror.net/mode/python/python.js">python.js</option>
+          <option value="http://codemirror.net/mode/pug/pug.js">pug.js</option>
           <option value="http://codemirror.net/mode/puppet/puppet.js">puppet.js</option>
           <option value="http://codemirror.net/mode/q/q.js">q.js</option>
           <option value="http://codemirror.net/mode/r/r.js">r.js</option>
diff --git a/mode/index.html b/mode/index.html
index 732e0e52cd..3a2fe5513e 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -76,7 +76,6 @@ <h2>Language modes</h2>
       <li><a href="http/index.html">HTTP</a></li>
       <li><a href="idl/index.html">IDL</a></li>
       <li><a href="clike/index.html">Java</a></li>
-      <li><a href="jade/index.html">Jade</a></li>
       <li><a href="javascript/index.html">JavaScript</a> (<a href="jsx/index.html">JSX</a>)</li>
       <li><a href="jinja2/index.html">Jinja2</a></li>
       <li><a href="julia/index.html">Julia</a></li>
@@ -107,6 +106,7 @@ <h2>Language modes</h2>
       <li><a href="powershell/index.html">PowerShell</a></li>
       <li><a href="properties/index.html">Properties files</a></li>
       <li><a href="protobuf/index.html">ProtoBuf</a></li>
+      <li><a href="pug/index.html">Pug</a></li>
       <li><a href="puppet/index.html">Puppet</a></li>
       <li><a href="python/index.html">Python</a></li>
       <li><a href="q/index.html">Q</a></li>
diff --git a/mode/meta.js b/mode/meta.js
index eb25e242dd..2e9ac7ce4b 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -66,7 +66,7 @@
     {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
     {name: "HTTP", mime: "message/http", mode: "http"},
     {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
-    {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
+    {name: "Pug", mime: "text/x-pug", mode: "pug", ext: ["jade", "pug"], alias: ["jade"]},
     {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
     {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
     {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
diff --git a/mode/jade/index.html b/mode/pug/index.html
similarity index 83%
rename from mode/jade/index.html
rename to mode/pug/index.html
index e534981b20..1765853a1f 100644
--- a/mode/jade/index.html
+++ b/mode/pug/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror: Jade Templating Mode</title>
+<title>CodeMirror: Pug Templating Mode</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
 
@@ -10,7 +10,7 @@
 <script src="../css/css.js"></script>
 <script src="../xml/xml.js"></script>
 <script src="../htmlmixed/htmlmixed.js"></script>
-<script src="jade.js"></script>
+<script src="pug.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>
@@ -22,17 +22,17 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Jade Templating Mode</a>
+    <li><a class=active href="#">Pug Templating Mode</a>
   </ul>
 </div>
 
 <article>
-<h2>Jade Templating Mode</h2>
+<h2>Pug Templating Mode</h2>
 <form><textarea id="code" name="code">
 doctype html
   html
     head
-      title= "Jade Templating CodeMirror Mode Example"
+      title= "Pug Templating CodeMirror Mode Example"
       link(rel='stylesheet', href='/css/bootstrap.min.css')
       link(rel='stylesheet', href='/css/index.css')
       script(type='text/javascript', src='/js/jquery-1.9.1.min.js')
@@ -60,11 +60,11 @@ <h2>Jade Templating Mode</h2>
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: {name: "jade", alignCDATA: true},
+        mode: {name: "pug", alignCDATA: true},
         lineNumbers: true
       });
     </script>
-    <h3>The Jade Templating Mode</h3>
+    <h3>The Pug Templating Mode</h3>
       <p> Created by Forbes Lindesay. Managed as part of a Brackets extension at <a href="https://github.com/ForbesLindesay/jade-brackets">https://github.com/ForbesLindesay/jade-brackets</a>.</p>
-    <p><strong>MIME type defined:</strong> <code>text/x-jade</code>.</p>
+    <p><strong>MIME type defined:</strong> <code>text/x-pug</code>, <code>text/x-jade</code>.</p>
   </article>
diff --git a/mode/jade/jade.js b/mode/pug/pug.js
similarity index 99%
rename from mode/jade/jade.js
rename to mode/pug/pug.js
index 51ed105aca..401823365c 100644
--- a/mode/jade/jade.js
+++ b/mode/pug/pug.js
@@ -11,7 +11,7 @@
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode('jade', function (config) {
+CodeMirror.defineMode("pug", function (config) {
   // token types
   var KEYWORD = 'keyword';
   var DOCTYPE = 'meta';
@@ -585,6 +585,7 @@ CodeMirror.defineMode('jade', function (config) {
   };
 }, 'javascript', 'css', 'htmlmixed');
 
-CodeMirror.defineMIME('text/x-jade', 'jade');
+CodeMirror.defineMIME('text/x-pug', 'pug');
+CodeMirror.defineMIME('text/x-jade', 'pug');
 
 });

From fafb7dc17d45d24ef5e84d3f61696ae9a4ea28fd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 16 Aug 2016 14:37:06 +0200
Subject: [PATCH 2832/4742] Improve paste handling on IE in contentEditable
 mode

Issue #4091
---
 lib/codemirror.js | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1702dbe9b8..0d3b7ba597 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1153,7 +1153,7 @@
   }
 
   function handlePaste(e, cm) {
-    var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
+    var pasted = e.clipboardData && e.clipboardData.getData("Text");
     if (pasted) {
       e.preventDefault();
       if (!cm.isReadOnly() && !cm.options.disableInput)
@@ -1581,7 +1581,9 @@
       disableBrowserMagic(div, cm.options.spellcheck);
 
       on(div, "paste", function(e) {
-        if (!signalDOMEvent(cm, e)) handlePaste(e, cm);
+        if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
+        // IE doesn't fire input events, so we schedule a read for the pasted content in this way
+        if (ie_version <= 11) setTimeout(operation(cm, function() {regChange(cm);}), 20)
       })
 
       on(div, "compositionstart", function(e) {
@@ -1641,23 +1643,26 @@
             });
           }
         }
-        // iOS exposes the clipboard API, but seems to discard content inserted into it
-        if (e.clipboardData && !ios) {
-          e.preventDefault();
+        if (e.clipboardData) {
           e.clipboardData.clearData();
-          e.clipboardData.setData("text/plain", lastCopied.text.join("\n"));
-        } else {
-          // Old-fashioned briefly-focus-a-textarea hack
-          var kludge = hiddenTextarea(), te = kludge.firstChild;
-          cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
-          te.value = lastCopied.text.join("\n");
-          var hadFocus = document.activeElement;
-          selectInput(te);
-          setTimeout(function() {
-            cm.display.lineSpace.removeChild(kludge);
-            hadFocus.focus();
-          }, 50);
+          var content = lastCopied.text.join("\n")
+          // iOS exposes the clipboard API, but seems to discard content inserted into it
+          e.clipboardData.setData("Text", content);
+          if (e.clipboardData.getData("Text") == content) {
+            e.preventDefault();
+            return
+          }
         }
+        // Old-fashioned briefly-focus-a-textarea hack
+        var kludge = hiddenTextarea(), te = kludge.firstChild;
+        cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
+        te.value = lastCopied.text.join("\n");
+        var hadFocus = document.activeElement;
+        selectInput(te);
+        setTimeout(function() {
+          cm.display.lineSpace.removeChild(kludge);
+          hadFocus.focus();
+        }, 50);
       }
       on(div, "copy", onCopyCut);
       on(div, "cut", onCopyCut);

From a2b3204e31aef62fd9fb46b061d763e07616440d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 17 Aug 2016 14:15:09 +0200
Subject: [PATCH 2833/4742] [match-highlighter addon] Don't start highlighting
 until the editor is focused

Issue #4162
---
 addon/search/match-highlighter.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 2121de417b..73ba0e0537 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -45,6 +45,7 @@
       this.options[name] = (options && options.hasOwnProperty(name) ? options : defaults)[name]
     this.overlay = this.timeout = null;
     this.matchesonscroll = null;
+    this.active = false;
   }
 
   CodeMirror.defineOption("highlightSelectionMatches", false, function(cm, val, old) {
@@ -53,16 +54,34 @@
       clearTimeout(cm.state.matchHighlighter.timeout);
       cm.state.matchHighlighter = null;
       cm.off("cursorActivity", cursorActivity);
+      cm.off("focus", onFocus)
     }
     if (val) {
-      cm.state.matchHighlighter = new State(val);
-      highlightMatches(cm);
+      var state = cm.state.matchHighlighter = new State(val);
+      if (cm.hasFocus()) {
+        state.active = true
+        highlightMatches(cm)
+      } else {
+        cm.on("focus", onFocus)
+      }
       cm.on("cursorActivity", cursorActivity);
     }
   });
 
   function cursorActivity(cm) {
     var state = cm.state.matchHighlighter;
+    if (state.active || cm.hasFocus()) scheduleHighlight(cm, state)
+  }
+
+  function onFocus(cm) {
+    var state = cm.state.matchHighlighter
+    if (!state.active) {
+      state.active = true
+      scheduleHighlight(cm, state)
+    }
+  }
+
+  function scheduleHighlight(cm, state) {
     clearTimeout(state.timeout);
     state.timeout = setTimeout(function() {highlightMatches(cm);}, state.options.delay);
   }

From 476b06e70aa524981c4c57a8c2b7728bbecb7ba3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 17 Aug 2016 16:36:28 +0200
Subject: [PATCH 2834/4742] [tern demo] Adjust to change in Tern

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

diff --git a/demo/tern.html b/demo/tern.html
index b7b65608e6..d0dee8a70e 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 
 <title>CodeMirror: Tern Demo</title>
 <meta charset="utf-8"/>
@@ -109,8 +109,8 @@ <h2>Tern Demo</h2>
   }
 
   var server;
-  getURL("//ternjs.net/defs/ecma5.json", function(err, code) {
-    if (err) throw new Error("Request for ecma5.json: " + err);
+  getURL("//ternjs.net/defs/ecmascript.json", function(err, code) {
+    if (err) throw new Error("Request for ecmascript.json: " + err);
     server = new CodeMirror.TernServer({defs: [JSON.parse(code)]});
     editor.setOption("extraKeys", {
       "Ctrl-Space": function(cm) { server.complete(cm); },

From f8c3009222c71c05e4614de7a770ac0b90b3d7a1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 10:38:35 +0200
Subject: [PATCH 2835/4742] Prevent clearing of selection after focus-textarea
 copy kludge

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 0d3b7ba597..aa125b66e2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1662,6 +1662,7 @@
         setTimeout(function() {
           cm.display.lineSpace.removeChild(kludge);
           hadFocus.focus();
+          if (hadFocus == div) input.showPrimarySelection()
         }, 50);
       }
       on(div, "copy", onCopyCut);

From 1fe94513f14a49cfcce17fc6a96fdf40bf1fb467 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 10:39:19 +0200
Subject: [PATCH 2836/4742] Fix copy-pasted bug in locateNodeInLineView

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index aa125b66e2..292eda966d 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1971,7 +1971,7 @@
       if (found)
         return badPos(Pos(found.line, found.ch + dist), bad);
       else
-        dist += after.textContent.length;
+        dist += before.textContent.length;
     }
   }
 

From a4984139632e15e0d8d95acdafb268a73c1878a5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 10:39:49 +0200
Subject: [PATCH 2837/4742] Fix read-dom-on-paste workaround for IE

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 292eda966d..58c45f4579 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1583,7 +1583,9 @@
       on(div, "paste", function(e) {
         if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
         // IE doesn't fire input events, so we schedule a read for the pasted content in this way
-        if (ie_version <= 11) setTimeout(operation(cm, function() {regChange(cm);}), 20)
+        if (ie_version <= 11) setTimeout(operation(cm, function() {
+          if (!input.pollContent()) regChange(cm);
+        }), 20)
       })
 
       on(div, "compositionstart", function(e) {

From bd1a7b621680de4b8ec2538168421d7104816ddc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 10:47:40 +0200
Subject: [PATCH 2838/4742] [dialog addon] Improve docs

---
 doc/manual.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8da9cbb2a3..40892d92ef 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2188,23 +2188,23 @@ <h2 id="addons">Addons</h2>
       which, if called, will close the dialog immediately.
       <strong><code>openDialog</code></strong> takes the following options:
         <dl>
-          <dt><code><strong>closeOnEnter</strong></code>:</dt>
+          <dt><code><strong>closeOnEnter</strong>: bool</code></dt>
           <dd>If true, the dialog will be closed when the user presses
           enter in the input. Defaults to <code>true</code>.</dd>
-          <dt><code><strong>onKeyDown</strong></code>:</dt>
-          <dd>An event handler of the signature <code>(event, value, closeFunction)</code>
-          that will be called whenever <code>keydown</code> fires in the
+          <dt><code><strong>closeOnBlur</strong>: bool</code></dt>
+          <dd>Determines whether the dialog is closed when it loses focus. Defaults to <code>true</code>.</dd>
+          <dt><code><strong>onKeyDown</strong>: fn(event: KeyboardEvent, value: string, close: fn()) → bool</code></dt>
+          <dd>An event handler that will be called whenever <code>keydown</code> fires in the
           dialog's input. If your callback returns <code>true</code>,
           the dialog will not do any further processing of the event.</dd>
-          <dt><code><strong>onKeyUp</strong></code>:</dt>
+          <dt><code><strong>onKeyUp</strong>: fn(event: KeyboardEvent, value: string, close: fn()) → bool</code></dt>
           <dd>Same as <code>onKeyDown</code> but for the
           <code>keyup</code> event.</dd>
-          <dt><code><strong>onInput</strong></code>:</dt>
+          <dt><code><strong>onInput</strong>: fn(event: InputEvent, value: string, close: fn()) → bool</code></dt>
           <dd>Same as <code>onKeyDown</code> but for the
           <code>input</code> event.</dd>
-          <dt><code><strong>onClose</strong></code>:</dt>
-          <dd>A callback of the signature <code>(dialogInstance)</code>
-          that will be called after the dialog has been closed and
+          <dt><code><strong>onClose</strong>: fn(instance)</code>:</dt>
+          <dd>A callback that will be called after the dialog has been closed and
           removed from the DOM. No return value.</dd>
         </dl>
 

From 1c884ebabf690423e5988e6dde61c94ceb1433fc Mon Sep 17 00:00:00 2001
From: Sam Lee <orionlee@yahoo.com>
Date: Wed, 17 Aug 2016 17:34:53 -0700
Subject: [PATCH 2839/4742] [javascript hint] autocomplete non-enumerable
 properties, e.g., window.Promise

---
 addon/hint/javascript-hint.js | 42 ++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 7bcbf4a057..36d7dadf98 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -103,10 +103,50 @@
       if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
     }
     function gatherCompletions(obj) {
+      function gatherCompletionsOfTypeObj(obj) {
+
+        /**
+         * Helper to get all properties of an object, including non-enumerable ones
+         * as completon candidates.
+         *
+         * In Chrome 51, most top-level classes, e.g., Event, Promise, etc., are not enumerable,
+         * therefore only available for javascript hint via this new code path.
+         * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/getOwnPropertyNames
+         */
+        function getAllPropertyNames(obj) {
+          // Consider a generator-=like variation getAllPropertyNamesForEach(obj, fn),
+          // which takens additional callback fn (analous to Array.forEach)
+          // It has the advantage of avoiding names array build-up.
+
+          var names = [];
+          // Traverse up prototype chain to get all properties (not just direct one)
+          // of obj.
+          for(var o = obj; o; o = Object.getPrototypeOf(o)) {
+            // concat() in place, plus more environment supports it
+            // Conceptually it is names.push(e[0], e[1], e[2], ...)
+            names.push.apply(names, Object.getOwnPropertyNames(o));
+          }
+          return names;
+        } // function getAllPropertyNames(..)
+
+        // a helper method to determine if the function is supported in the
+        // environment (really old browsers will not support it)
+        function getAllPropertyNamesIsSupported() {
+          return ((Object.getOwnPropertyNames && Object.getPrototypeOf) ? true : false);
+        }; // function getAllPropertyNamesIsSupported()
+
+        if (getAllPropertyNamesIsSupported()) {
+          getAllPropertyNames(obj).forEach(maybeAdd);
+        } else {
+          // Old code path where non-enumerable properties will not be listed
+          for (var name in obj) maybeAdd(name);
+        }
+      } // function gatherCompletionsOfTypeObj(..)
+
       if (typeof obj == "string") forEach(stringProps, maybeAdd);
       else if (obj instanceof Array) forEach(arrayProps, maybeAdd);
       else if (obj instanceof Function) forEach(funcProps, maybeAdd);
-      for (var name in obj) maybeAdd(name);
+      gatherCompletionsOfTypeObj(obj);
     }
 
     if (context && context.length) {

From 5fea9c5737eaa19be5b7335603660e0ea1bb9945 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 10:58:01 +0200
Subject: [PATCH 2840/4742] [javascript-hint] More concise coding style for
 property enumeration

Issue #4175
---
 addon/hint/javascript-hint.js | 51 +++++++----------------------------
 1 file changed, 10 insertions(+), 41 deletions(-)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 36d7dadf98..d7088c191b 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -97,56 +97,25 @@
   var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
                   "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
 
+  function forAllProps(obj, callback) {
+    if (!Object.getOwnPropertyNames || !Object.getPrototypeOf) {
+      for (var name in obj) callback(name)
+    } else {
+      for (var o = obj; o; o = Object.getPrototypeOf(o))
+        Object.getOwnPropertyNames(o).forEach(callback)
+    }
+  }
+
   function getCompletions(token, context, keywords, options) {
     var found = [], start = token.string, global = options && options.globalScope || window;
     function maybeAdd(str) {
       if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
     }
     function gatherCompletions(obj) {
-      function gatherCompletionsOfTypeObj(obj) {
-
-        /**
-         * Helper to get all properties of an object, including non-enumerable ones
-         * as completon candidates.
-         *
-         * In Chrome 51, most top-level classes, e.g., Event, Promise, etc., are not enumerable,
-         * therefore only available for javascript hint via this new code path.
-         * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/getOwnPropertyNames
-         */
-        function getAllPropertyNames(obj) {
-          // Consider a generator-=like variation getAllPropertyNamesForEach(obj, fn),
-          // which takens additional callback fn (analous to Array.forEach)
-          // It has the advantage of avoiding names array build-up.
-
-          var names = [];
-          // Traverse up prototype chain to get all properties (not just direct one)
-          // of obj.
-          for(var o = obj; o; o = Object.getPrototypeOf(o)) {
-            // concat() in place, plus more environment supports it
-            // Conceptually it is names.push(e[0], e[1], e[2], ...)
-            names.push.apply(names, Object.getOwnPropertyNames(o));
-          }
-          return names;
-        } // function getAllPropertyNames(..)
-
-        // a helper method to determine if the function is supported in the
-        // environment (really old browsers will not support it)
-        function getAllPropertyNamesIsSupported() {
-          return ((Object.getOwnPropertyNames && Object.getPrototypeOf) ? true : false);
-        }; // function getAllPropertyNamesIsSupported()
-
-        if (getAllPropertyNamesIsSupported()) {
-          getAllPropertyNames(obj).forEach(maybeAdd);
-        } else {
-          // Old code path where non-enumerable properties will not be listed
-          for (var name in obj) maybeAdd(name);
-        }
-      } // function gatherCompletionsOfTypeObj(..)
-
       if (typeof obj == "string") forEach(stringProps, maybeAdd);
       else if (obj instanceof Array) forEach(arrayProps, maybeAdd);
       else if (obj instanceof Function) forEach(funcProps, maybeAdd);
-      gatherCompletionsOfTypeObj(obj);
+      forAllProps(obj, maybeAdd)
     }
 
     if (context && context.length) {

From 4f70169d9e9aa40c9e6d64a6721b47728ba361d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 11:01:55 +0200
Subject: [PATCH 2841/4742] [python mode] Default to Python 3

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

diff --git a/mode/python/python.js b/mode/python/python.js
index be65ad7687..4873a3e3a6 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -55,7 +55,7 @@
     if (parserConf.extra_builtins != undefined)
       myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
 
-    var py3 = parserConf.version && parseInt(parserConf.version, 10) == 3
+    var py3 = parserConf.version && Number(parserConf.version) < 3
     if (py3) {
       // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
       var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;

From acb20c0929b67062df989f7b3e24d777b487031f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 11:08:16 +0200
Subject: [PATCH 2842/4742] [sas mode] Fix tokenizing of empty strings

Closes #4178
---
 mode/sas/sas.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mode/sas/sas.js b/mode/sas/sas.js
index fe114827c0..e88744be27 100755
--- a/mode/sas/sas.js
+++ b/mode/sas/sas.js
@@ -137,10 +137,9 @@
           stream.next();
           return 'comment';
         }
-      } else if (!state.continueString && (ch === '"' || ch === "'")) {
-        // Have we found a string?
-        state.continueString = ch; //save the matching quote in the state
-        return "string";
+      } else if (ch === '"' || ch === "'") {
+        state.continueString = state.continueString == ch ? null : ch
+        return "string"
       } else if (state.continueString !== null) {
         if (stream.skipTo(state.continueString)) {
           // quote found on this line

From 83e56a6783e1ec19609814d8c4cf4f73156d0575 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 11:10:01 +0200
Subject: [PATCH 2843/4742] [python mode] Fix version detection

Issue #4176
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 4873a3e3a6..5142f97077 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -55,7 +55,7 @@
     if (parserConf.extra_builtins != undefined)
       myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
 
-    var py3 = parserConf.version && Number(parserConf.version) < 3
+    var py3 = !(parserConf.version && Number(parserConf.version) < 3)
     if (py3) {
       // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
       var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;

From f87597dd55df81585191771f74ebf9f514423d52 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 11:13:53 +0200
Subject: [PATCH 2844/4742] [javascript mode] Parse class extends clause as a
 type in TypeScript mode

Closes #4179
---
 mode/javascript/javascript.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 17f05045c9..df5f714f7a 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -1,8 +1,6 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
-// TODO actually recognize syntax of TypeScript constructs
-
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"));
@@ -610,7 +608,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
   function classNameAfter(type, value) {
-    if (value == "extends") return cont(expression, classNameAfter);
+    if (value == "extends") return cont(isTS ? typeexpr : expression, classNameAfter);
     if (type == "{") return cont(pushlex("}"), classBody, poplex);
   }
   function classBody(type, value) {

From c45674b11e990fe37abc662b0c507d3bb1f635e7 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Fri, 19 Aug 2016 11:28:17 +0100
Subject: [PATCH 2845/4742] [python mode] Add f to delimiter stripping for
 Python mode

So f-strings get terminated correctly
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 5142f97077..efeed7f154 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -185,7 +185,7 @@
     }
 
     function tokenStringFactory(delimiter) {
-      while ("rub".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
+      while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
         delimiter = delimiter.substr(1);
 
       var singleline = delimiter.length == 1;

From 51e7bacb8bd14729c0e9da343e5403b4a57efd74 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 23:11:03 +0200
Subject: [PATCH 2846/4742] [sas mode] Properly fix string tokenizing

Issue #4178
---
 mode/sas/sas.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mode/sas/sas.js b/mode/sas/sas.js
index e88744be27..9ec22d5fa5 100755
--- a/mode/sas/sas.js
+++ b/mode/sas/sas.js
@@ -137,11 +137,13 @@
           stream.next();
           return 'comment';
         }
-      } else if (ch === '"' || ch === "'") {
-        state.continueString = state.continueString == ch ? null : ch
+      } else if ((ch === '"' || ch === "'") && !state.continueString) {
+        state.continueString = ch
         return "string"
-      } else if (state.continueString !== null) {
-        if (stream.skipTo(state.continueString)) {
+      } else if (state.continueString) {
+        if (state.continueString == ch) {
+          state.continueString = null;
+        } else if (stream.skipTo(state.continueString)) {
           // quote found on this line
           stream.next();
           state.continueString = null;

From ee6368d2b8c0731c744f2eea4569964b463f2c2d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Aug 2016 23:21:29 +0200
Subject: [PATCH 2847/4742] [sas mode] Fix and simplify case-insensitive
 keyword lookup

Closes #4185
---
 mode/sas/sas.js | 58 ++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/mode/sas/sas.js b/mode/sas/sas.js
index 9ec22d5fa5..a6109eb11c 100755
--- a/mode/sas/sas.js
+++ b/mode/sas/sas.js
@@ -188,12 +188,12 @@
         if (stream.peek() === '.') stream.skipTo(' ');
         state.nextword = false;
         return 'variable-2';
-
       }
 
+      word = word.toLowerCase()
       // Are we in a DATA Step?
       if (state.inDataStep) {
-        if (word.toLowerCase() === 'run;' || stream.match(/run\s;/)) {
+        if (word === 'run;' || stream.match(/run\s;/)) {
           state.inDataStep = false;
           return 'builtin';
         }
@@ -204,84 +204,84 @@
           else return 'variable';
         }
         // do we have a DATA Step keyword
-        if (word && words.hasOwnProperty(word.toLowerCase()) &&
-            (words[word.toLowerCase()].state.indexOf("inDataStep") !== -1 ||
-             words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+        if (word && words.hasOwnProperty(word) &&
+            (words[word].state.indexOf("inDataStep") !== -1 ||
+             words[word].state.indexOf("ALL") !== -1)) {
           //backup to the start of the word
           if (stream.start < stream.pos)
             stream.backUp(stream.pos - stream.start);
           //advance the length of the word and return
           for (var i = 0; i < word.length; ++i) stream.next();
-          return words[word.toLowerCase()].style;
+          return words[word].style;
         }
       }
       // Are we in an Proc statement?
       if (state.inProc) {
-        if (word.toLowerCase() === 'run;' || word.toLowerCase() === 'quit;') {
+        if (word === 'run;' || word === 'quit;') {
           state.inProc = false;
           return 'builtin';
         }
         // do we have a proc keyword
-        if (word && words.hasOwnProperty(word.toLowerCase()) &&
-            (words[word.toLowerCase()].state.indexOf("inProc") !== -1 ||
-             words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+        if (word && words.hasOwnProperty(word) &&
+            (words[word].state.indexOf("inProc") !== -1 ||
+             words[word].state.indexOf("ALL") !== -1)) {
           stream.match(/[\w]+/);
           return words[word].style;
         }
       }
       // Are we in a Macro statement?
       if (state.inMacro) {
-        if (word.toLowerCase() === '%mend') {
+        if (word === '%mend') {
           if (stream.peek() === ';') stream.next();
           state.inMacro = false;
           return 'builtin';
         }
-        if (word && words.hasOwnProperty(word.toLowerCase()) &&
-            (words[word.toLowerCase()].state.indexOf("inMacro") !== -1 ||
-             words[word.toLowerCase()].state.indexOf("ALL") !== -1)) {
+        if (word && words.hasOwnProperty(word) &&
+            (words[word].state.indexOf("inMacro") !== -1 ||
+             words[word].state.indexOf("ALL") !== -1)) {
           stream.match(/[\w]+/);
-          return words[word.toLowerCase()].style;
+          return words[word].style;
         }
 
         return 'atom';
       }
       // Do we have Keywords specific words?
-      if (word && words.hasOwnProperty(word.toLowerCase())) {
+      if (word && words.hasOwnProperty(word)) {
         // Negates the initial next()
         stream.backUp(1);
         // Actually move the stream
         stream.match(/[\w]+/);
-        if (word.toLowerCase() === 'data' && /=/.test(stream.peek()) === false) {
+        if (word === 'data' && /=/.test(stream.peek()) === false) {
           state.inDataStep = true;
           state.nextword = true;
           return 'builtin';
         }
-        if (word.toLowerCase() === 'proc') {
+        if (word === 'proc') {
           state.inProc = true;
           state.nextword = true;
           return 'builtin';
         }
-        if (word.toLowerCase() === '%macro') {
+        if (word === '%macro') {
           state.inMacro = true;
           state.nextword = true;
           return 'builtin';
         }
-        if (/title[1-9]/i.test(word)) return 'def';
+        if (/title[1-9]/.test(word)) return 'def';
 
-        if (word.toLowerCase() === 'footnote') {
+        if (word === 'footnote') {
           stream.eat(/[1-9]/);
           return 'def';
         }
 
         // Returns their value as state in the prior define methods
-        if (state.inDataStep === true && words[word.toLowerCase()].state.indexOf("inDataStep") !== -1)
-          return words[word.toLowerCase()].style;
-        if (state.inProc === true && words[word.toLowerCase()].state.indexOf("inProc") !== -1)
-          return words[word.toLowerCase()].style;
-        if (state.inMacro === true && words[word.toLowerCase()].state.indexOf("inMacro") !== -1)
-          return words[word.toLowerCase()].style;
-        if (words[word.toLowerCase()].state.indexOf("ALL") !== -1)
-          return words[word.toLowerCase()].style;
+        if (state.inDataStep === true && words[word].state.indexOf("inDataStep") !== -1)
+          return words[word].style;
+        if (state.inProc === true && words[word].state.indexOf("inProc") !== -1)
+          return words[word].style;
+        if (state.inMacro === true && words[word].state.indexOf("inMacro") !== -1)
+          return words[word].style;
+        if (words[word].state.indexOf("ALL") !== -1)
+          return words[word].style;
         return null;
       }
       // Unrecognized syntax

From e387d21d867759b73f817f7d19c4adc23a0931e2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 Aug 2016 11:11:14 +0200
Subject: [PATCH 2848/4742] [javascript mode] Add two TypeScript tests

Issue #4188
---
 mode/javascript/javascript.js |  6 +++++-
 mode/javascript/test.js       | 11 +++++++++++
 test/mode_test.js             |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index df5f714f7a..d7c5716b08 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -528,7 +528,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function typeexpr(type) {
     if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
     if (type == "{") return cont(commasep(typeprop, "}"))
-    if (type == "(") return cont(commasep(typeprop, ")"), maybeReturnType)
+    if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
   }
   function maybeReturnType(type) {
     if (type == "=>") return cont(typeexpr)
@@ -541,6 +541,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(typeexpr)
     }
   }
+  function typearg(type) {
+    if (type == "variable") return cont(typearg)
+    else if (type == ":") return cont(typeexpr)
+  }
   function afterType(type, value) {
     if (value == "<") return cont(commasep(typeexpr, ">"), afterType)
     if (type == "[") return cont(expect("]"), afterType)
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 8916b7558f..11a13568db 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -167,6 +167,17 @@
      "  }",
      "}");
 
+  var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
+  function TS(name) {
+    test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))
+  }
+
+  TS("extend_type",
+     "[keyword class] [def Foo] [keyword extends] [variable-3 Some][operator <][variable-3 Type][operator >] {}")
+
+  TS("arrow_type",
+     "[keyword let] [def x]: ([variable arg]: [variable-3 Type]) [operator =>] [variable-3 ReturnType]")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}
diff --git a/test/mode_test.js b/test/mode_test.js
index 0aed50f7dc..f706c4f5c6 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -61,6 +61,7 @@
 
   test.mode = function(name, mode, tokens, modeName) {
     var data = parseTokens(tokens);
+    if (name == "extend_type") console.log("set", (modeName || mode.name) + "_" + name)
     return test((modeName || mode.name) + "_" + name, function() {
       return compare(data.plain, data.tokens, mode);
     });

From 751fd52c3e16f10739a0df54769b8b44a836b35b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 Aug 2016 15:45:37 +0200
Subject: [PATCH 2849/4742] Mark release 5.18.0

---
 AUTHORS           |  5 +++++
 CHANGELOG.md      | 28 ++++++++++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 15 +++++++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 8 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6a96b87c0a..0f2bc1bbf3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -98,6 +98,7 @@ Brian Sletten
 Bruce Mitchener
 Caitlin Potter
 Calin Barbat
+callodacity
 Camilo Roca
 Chad Jolly
 Chandra Sekhar Pydi
@@ -180,6 +181,7 @@ feizhang365
 Felipe Lalanne
 Felix Raab
 Filip Noetzel
+Filip Stollár
 flack
 ForbesLindesay
 Forbes Lindesay
@@ -271,6 +273,7 @@ Jim
 JobJob
 jochenberger
 Jochen Berger
+Joel Einbinder
 joelpinheiro
 Johan Ask
 John Connor
@@ -485,6 +488,7 @@ Rrandom
 Ruslan Osmanov
 Ryan Prior
 sabaca
+Sam Lee
 Samuel Ainsworth
 Sam Wilson
 sandeepshetty
@@ -542,6 +546,7 @@ thanasis
 TheHowl
 think
 Thomas Dvornik
+Thomas Kluyver
 Thomas Schmid
 Tim Alby
 Tim Baumann
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55ace8ffa3..5e1973fbf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 5.18.0 (2016-08-22)
+
+### Bugfixes
+
+Make sure [gutter backgrounds](http://codemirror.net/doc/manual.html#addLineClass) stick to the rest of the gutter during horizontal scrolling.
+
+The contenteditable [`inputStyle`](http://codemirror.net/doc/manual.html#option_inputStyle) now properly supports pasting on pre-Edge IE versions.
+
+[javascript mode](http://codemirror.net/mode/javascript): Fix some small parsing bugs and improve TypeScript support.
+
+[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Fix bug where active highlighting was left in editor when the addon was disabled.
+
+[match-highlighter addon](http://codemirror.net/doc/manual.html#addon_match-highlighter): Only start highlighting things when the editor gains focus.
+
+[javascript-hint addon](http://codemirror.net/doc/manual.html#addon_javascript-hint): Also complete non-enumerable properties.
+
+### New features
+
+The [`addOverlay`](http://codemirror.net/doc/manual.html#addOverlay) method now supports a `priority` option to control the order in which overlays are applied.
+
+MIME types that end in `+json` now default to the JSON mode when the MIME itself is not defined.
+
+### Breaking changes
+
+The mode formerly known as Jade was renamed to [Pug](http://codemirror.net/mode/pug).
+
+The [Python mode](http://codemirror.net/mode/python) now defaults to Python 3 (rather than 2) syntax.
+
 ## 5.17.0 (2016-07-19)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 3487d75e5a..1cded19a7e 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.18.0;f=">5.18.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.17.0;f=">5.17.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.16.0;f=">5.16.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.2;f=">5.15.2</option>
diff --git a/doc/manual.html b/doc/manual.html
index 40892d92ef..9d5c7b9cd2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.17.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.18.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 17ec88a96d..9a615030e4 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,21 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">22-08-2016: <a href="http://codemirror.net/codemirror-5.18.0.zip">Version 5.18.0</a>:</p>
+
+  <ul class=rel-note>
+    <li>Make sure <a href="http://codemirror.net/doc/manual.html#addLineClass">gutter backgrounds</a> stick to the rest of the gutter during horizontal scrolling.</li>
+    <li>The contenteditable <a href="http://codemirror.net/doc/manual.html#option_inputStyle"><code>inputStyle</code></a> now properly supports pasting on pre-Edge IE versions.</li>
+    <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Fix some small parsing bugs and improve TypeScript support.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix bug where active highlighting was left in editor when the addon was disabled.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Only start highlighting things when the editor gains focus.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Also complete non-enumerable properties.</li>
+    <li>The <a href="http://codemirror.net/doc/manual.html#addOverlay"><code>addOverlay</code></a> method now supports a <code>priority</code> option to control the order in which overlays are applied.</li>
+    <li>MIME types that end in <code>+json</code> now default to the JSON mode when the MIME itself is not defined.</li>
+    <li>The mode formerly known as Jade was renamed to <a href="http://codemirror.net/mode/pug">Pug</a>.</li>
+    <li>The <a href="http://codemirror.net/mode/python">Python mode</a> now defaults to Python 3 (rather than 2) syntax.</li>
+  </ul>
+
   <p class="rel">19-07-2016: <a href="http://codemirror.net/codemirror-5.17.0.zip">Version 5.17.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 8860f8b4e3..ab03ca7521 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.17.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.18.0</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 58c45f4579..68b4e953fa 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8955,7 +8955,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.17.1";
+  CodeMirror.version = "5.18.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 135a9608c1..5f02281f4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.17.1",
+    "version":"5.18.0",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 29722b14f06a849d70ee1622e58f52c0b797d963 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 Aug 2016 15:46:55 +0200
Subject: [PATCH 2850/4742] Bump version post-5.18

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 9d5c7b9cd2..f1162f186b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.18.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.18.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 68b4e953fa..763034d2b3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8955,7 +8955,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.18.0";
+  CodeMirror.version = "5.18.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 5f02281f4d..76ebc3ee27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.18.0",
+    "version":"5.18.1",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From f0cb87d4cde902e2e64b2d66e793ba76327e9367 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 Aug 2016 14:31:18 +0200
Subject: [PATCH 2851/4742] =?UTF-8?q?[vue=20mode]=20Fix=20dependency=20on?=
 =?UTF-8?q?=20Jade=E2=86=92Pug=20mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4190
---
 mode/vue/index.html |  2 +-
 mode/vue/vue.js     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mode/vue/index.html b/mode/vue/index.html
index cccb9764f3..e0b45b9452 100644
--- a/mode/vue/index.html
+++ b/mode/vue/index.html
@@ -14,7 +14,7 @@
 <script src="../css/css.js"></script>
 <script src="../coffeescript/coffeescript.js"></script>
 <script src="../sass/sass.js"></script>
-<script src="../jade/jade.js"></script>
+<script src="../pug/pug.js"></script>
 
 <script src="../handlebars/handlebars.js"></script>
 <script src="../htmlmixed/htmlmixed.js"></script>
diff --git a/mode/vue/vue.js b/mode/vue/vue.js
index d89a552387..f8089af501 100644
--- a/mode/vue/vue.js
+++ b/mode/vue/vue.js
@@ -12,7 +12,7 @@
         require("../css/css"),
         require("../sass/sass"),
         require("../stylus/stylus"),
-        require("../jade/jade"),
+        require("../pug/pug"),
         require("../handlebars/handlebars"));
   } else if (typeof define === "function" && define.amd) { // AMD
     define(["../../lib/codemirror",
@@ -23,7 +23,7 @@
             "../css/css",
             "../sass/sass",
             "../stylus/stylus",
-            "../jade/jade",
+            "../pug/pug",
             "../handlebars/handlebars"], mod);
   } else { // Plain browser env
     mod(CodeMirror);
@@ -42,9 +42,9 @@
     ],
     template: [
       ["lang", /^vue-template$/i, "vue"],
-      ["lang", /^jade$/i, "jade"],
+      ["lang", /^pug$/i, "pug"],
       ["lang", /^handlebars$/i, "handlebars"],
-      ["type", /^(text\/)?(x-)?jade$/i, "jade"],
+      ["type", /^(text\/)?(x-)?pug$/i, "pug"],
       ["type", /^text\/x-handlebars-template$/i, "handlebars"],
       [null, null, "vue-template"]
     ]
@@ -63,7 +63,7 @@
 
   CodeMirror.defineMode("vue", function (config) {
     return CodeMirror.getMode(config, {name: "htmlmixed", tags: tagLanguages});
-  }, "htmlmixed", "xml", "javascript", "coffeescript", "css", "sass", "stylus", "jade", "handlebars");
+  }, "htmlmixed", "xml", "javascript", "coffeescript", "css", "sass", "stylus", "pug", "handlebars");
 
   CodeMirror.defineMIME("script/x-vue", "vue");
 });

From 136324e0b7c8f3c163d633161fb01ed2066d57b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 Aug 2016 17:02:53 +0200
Subject: [PATCH 2852/4742] Mark release 5.18.2

---
 CHANGELOG.md      | 6 ++++++
 doc/compress.html | 1 +
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e1973fbf7..9470deb79f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.18.2 (2016-08-23)
+
+### Bugfixes
+
+[vue mode](http://codemirror.net/mode/vue): Fix outdated references to renamed Pug mode dependency.
+
 ## 5.18.0 (2016-08-22)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 1cded19a7e..7f12f2c430 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.18.2;f=">5.18.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.18.0;f=">5.18.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.17.0;f=">5.17.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.16.0;f=">5.16.0</option>
diff --git a/doc/manual.html b/doc/manual.html
index f1162f186b..d6f5c521c4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.18.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.18.2</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 9a615030e4..fa1dd69ac8 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">23-08-2016: <a href="http://codemirror.net/codemirror-5.18.2.zip">Version 5.18.2</a>:</p>
+
+  <ul class=rel-note>
+    <li><a href="http://codemirror.net/mode/vue">vue mode</a>: Fix outdated references to renamed Pug mode dependency.</li>
+  </ul>
+
   <p class="rel">22-08-2016: <a href="http://codemirror.net/codemirror-5.18.0.zip">Version 5.18.0</a>:</p>
 
   <ul class=rel-note>
diff --git a/index.html b/index.html
index ab03ca7521..f3aba01bdf 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.18.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.18.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 763034d2b3..1071bb9c90 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8955,7 +8955,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.18.1";
+  CodeMirror.version = "5.18.2";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 76ebc3ee27..2fa2915918 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.18.1",
+    "version":"5.18.2",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From 08b8b7b0d4a2168756829d421649ca149e3cc151 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 Aug 2016 17:04:22 +0200
Subject: [PATCH 2853/4742] Bump version number post-5.18.2

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index d6f5c521c4..d7c15f653d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.18.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.18.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1071bb9c90..6e0b69c610 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8955,7 +8955,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.18.2";
+  CodeMirror.version = "5.18.3";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 2fa2915918..86b65fbdfe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"5.18.2",
+    "version":"5.18.3",
     "main": "lib/codemirror.js",
     "description": "Full-featured in-browser code editor",
     "license": "MIT",

From c44a084f4446b5120fa28ace99786c2a92b691a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 26 Aug 2016 13:00:53 +0200
Subject: [PATCH 2854/4742] [python mode] Update docs to reflect new version
 default

Closes #4201
---
 mode/python/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/index.html b/mode/python/index.html
index 6116a13b6b..0ac02a3333 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -176,7 +176,7 @@ <h2>Cython mode</h2>
     </script>
     <h2>Configuration Options for Python mode:</h2>
     <ul>
-      <li>version - 2/3 - The version of Python to recognize.  Default is 2.</li>
+      <li>version - 2/3 - The version of Python to recognize.  Default is 3.</li>
       <li>singleLineStringErrors - true/false - If you have a single-line string that is not terminated at the end of the line, this will show subsequent lines as errors if true, otherwise it will consider the newline as the end of the string. Default is false.</li>
       <li>hangingIndent - int - If you want to write long arguments to a function starting on a new line, how much that line should be indented. Defaults to one normal indentation unit.</li>
     </ul>

From 2f814b2b8a5a9b1267e173bedcf45dddaf7196f0 Mon Sep 17 00:00:00 2001
From: Daniele Di Sarli <danieleds0@gmail.com>
Date: Sun, 28 Aug 2016 20:05:22 +0200
Subject: [PATCH 2855/4742] [pastel-on-dark theme] Remove absolute font size

Closes #4206
---
 theme/pastel-on-dark.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index 7197509205..2603d36205 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -11,7 +11,6 @@
 	background: #2c2827;
 	color: #8F938F;
 	line-height: 1.5;
-	font-size: 14px;
 }
 .cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
 .cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }

From ba1b1e513901a18637bf41b74bb4a4136f672cce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 28 Aug 2016 20:28:28 +0200
Subject: [PATCH 2856/4742] Move to phantom-prebuilt for headless testing

And hopefully get Travis to run our tests again
---
 package.json | 64 ++++++++++++++++++++++++++++++++--------------------
 test/run.js  |  2 +-
 test/test.js |  1 +
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index 86b65fbdfe..23dfd5211f 100644
--- a/package.json
+++ b/package.json
@@ -1,28 +1,42 @@
 {
-    "name": "codemirror",
-    "version":"5.18.3",
-    "main": "lib/codemirror.js",
-    "description": "Full-featured in-browser code editor",
-    "license": "MIT",
-    "directories": {"lib": "./lib"},
-    "scripts": {
-      "test": "node ./test/run.js",
-      "lint": "bin/lint"
-    },
-    "devDependencies": {"node-static": "0.6.0",
-                        "phantomjs": "1.9.2-5",
-                        "blint": ">=0.1.1"},
-    "bugs": "http://github.com/codemirror/CodeMirror/issues",
-    "keywords": ["JavaScript", "CodeMirror", "Editor"],
-    "homepage": "http://codemirror.net",
-    "maintainers":[{"name": "Marijn Haverbeke",
-                    "email": "marijnh@gmail.com",
-                    "web": "http://marijnhaverbeke.nl"}],
-    "repository": {"type": "git",
-                   "url": "https://github.com/codemirror/CodeMirror.git"},
-    "jspm": {
-      "directories": {},
-      "dependencies": {},
-      "devDependencies": {}
+  "name": "codemirror",
+  "version": "5.18.3",
+  "main": "lib/codemirror.js",
+  "description": "Full-featured in-browser code editor",
+  "license": "MIT",
+  "directories": {
+    "lib": "./lib"
+  },
+  "scripts": {
+    "test": "node ./test/run.js",
+    "lint": "bin/lint"
+  },
+  "devDependencies": {
+    "node-static": "0.6.0",
+    "phantomjs-prebuilt": "^2.1.12",
+    "blint": ">=0.1.1"
+  },
+  "bugs": "http://github.com/codemirror/CodeMirror/issues",
+  "keywords": [
+    "JavaScript",
+    "CodeMirror",
+    "Editor"
+  ],
+  "homepage": "http://codemirror.net",
+  "maintainers": [
+    {
+      "name": "Marijn Haverbeke",
+      "email": "marijnh@gmail.com",
+      "web": "http://marijnhaverbeke.nl"
     }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/codemirror/CodeMirror.git"
+  },
+  "jspm": {
+    "directories": {},
+    "dependencies": {},
+    "devDependencies": {}
+  }
 }
diff --git a/test/run.js b/test/run.js
index 24b835c37c..54984e73a5 100755
--- a/test/run.js
+++ b/test/run.js
@@ -17,7 +17,7 @@ var server = require('http').createServer(function (req, res) {
   throw err;
 }).listen(3000, function () {
   var childProcess = require('child_process');
-  var phantomjs = require("phantomjs");
+  var phantomjs = require("phantomjs-prebuilt");
   var childArgs = [
     require("path").join(__dirname, 'phantom_driver.js')
   ];
diff --git a/test/test.js b/test/test.js
index 82ee231e35..1b3721a647 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1088,6 +1088,7 @@ testCM("wrappingAndResizing", function(cm) {
 }, null, ie_lt8);
 
 testCM("measureEndOfLine", function(cm) {
+  if (phantom) return;
   cm.setSize(null, "auto");
   var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
   var lh = inner.offsetHeight;

From 607d0e8a9fbbd0c5faa2db318937d92337b3cf53 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 29 Aug 2016 17:00:25 +0200
Subject: [PATCH 2857/4742] [javascript mode] Better support for
 TypeScript-style class syntax

Closes #4188
---
 mode/javascript/javascript.js | 14 +++++++-------
 mode/javascript/test.js       |  8 +++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d7c5716b08..8ac121644d 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -617,13 +617,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function classBody(type, value) {
     if (type == "variable" || cx.style == "keyword") {
-      if (value == "static") {
+      if ((value == "static" || value == "get" || value == "set" ||
+           (isTS && (value == "public" || value == "private" || value == "protected"))) &&
+          cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false)) {
         cx.marked = "keyword";
         return cont(classBody);
       }
       cx.marked = "property";
-      if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody);
-      return cont(functiondef, classBody);
+      return cont(isTS ? classfield : functiondef, classBody);
     }
     if (value == "*") {
       cx.marked = "keyword";
@@ -632,10 +633,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ";") return cont(classBody);
     if (type == "}") return cont();
   }
-  function classGetterSetter(type) {
-    if (type != "variable") return pass();
-    cx.marked = "property";
-    return cont();
+  function classfield(type) {
+    if (type == ":") return cont(typeexpr)
+    return pass(functiondef)
   }
   function afterExport(_type, value) {
     if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 11a13568db..7e88837ed8 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -31,7 +31,7 @@
 
   MT("class",
      "[keyword class] [def Point] [keyword extends] [variable SuperThing] {",
-     "  [property get] [property prop]() { [keyword return] [number 24]; }",
+     "  [keyword get] [property prop]() { [keyword return] [number 24]; }",
      "  [property constructor]([def x], [def y]) {",
      "    [keyword super]([string 'something']);",
      "    [keyword this].[property x] [operator =] [variable-2 x];",
@@ -178,6 +178,12 @@
   TS("arrow_type",
      "[keyword let] [def x]: ([variable arg]: [variable-3 Type]) [operator =>] [variable-3 ReturnType]")
 
+  TS("typescript_class",
+     "[keyword class] [def Foo] {",
+     "  [keyword public] [keyword static] [property main]() {}",
+     "  [keyword private] [property _foo]: [variable-3 string];",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 45cf0aefe1681814567b1c6c8145f34544f630b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 4 Sep 2016 21:43:22 +0200
Subject: [PATCH 2858/4742] [simplemode demo] Highlight strings even when
 unclosed

Issue #4217
---
 demo/simplemode.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/simplemode.html b/demo/simplemode.html
index 49778ef1e2..d719b63d18 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -132,7 +132,7 @@ <h2>Simple Mode Demo</h2>
   // The start state contains the rules that are intially used
   start: [
     // The regex matches the token, the token property contains the type
-    {regex: /"(?:[^\\]|\\.)*?"/, token: "string"},
+    {regex: /"(?:[^\\]|\\.)*?(?:"|$)/, token: "string"},
     // You can match multiple tokens at once. Note that the captured
     // groups must span the whole string in this case
     {regex: /(function)(\s+)([a-z$][\w$]*)/,

From 40210a5aa08cbb81b3b6646da5509fb20be4a258 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 4 Sep 2016 21:48:38 +0200
Subject: [PATCH 2859/4742] [javascript mode] Support typescript's type keyword

Closes #4220
---
 mode/javascript/javascript.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 8ac121644d..15ffe03e67 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -54,6 +54,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         "namespace": C,
         "module": kw("module"),
         "enum": kw("module"),
+        "type": kw("type"),
 
         // scope modifiers
         "public": kw("modifier"),
@@ -365,6 +366,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
     if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
+    if (type == "type") return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
     if (type == "async") return cont(statement)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }

From 62dd0f089077feeac03befcd9108908553517c68 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 2 Sep 2016 23:52:51 +0400
Subject: [PATCH 2860/4742] [vim] fix issues with repeating after mutltiselect
 edit

---
 keymap/vim.js    | 20 ++++++++++++++++----
 test/vim_test.js | 41 +++++++++++++++++++++++++++++++----------
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index afed132e36..a166f72b10 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -780,8 +780,12 @@
 
           if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
           if (keysAreChars) {
-            var here = cm.getCursor();
-            cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
+            var selections = cm.listSelections();
+            for (var i = 0; i < selections.length; i++) {
+              var here = selections[i].head;
+              cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
+            }
+            vimGlobalState.macroModeState.lastInsertModeChanges.changes.pop();
           }
           clearInputState(cm);
           return match.command;
@@ -818,7 +822,7 @@
           // TODO: Look into using CodeMirror's multi-key handling.
           // Return no-op since we are caching the key. Counts as handled, but
           // don't want act on it just yet.
-          return function() {};
+          return function() { return true; };
         } else {
           return function() {
             return cm.operation(function() {
@@ -4874,6 +4878,10 @@
           if (changeObj.origin == '+input' || changeObj.origin == 'paste'
               || changeObj.origin === undefined /* only in testing */) {
             var text = changeObj.text.join('\n');
+            if (lastChange.maybeReset) {
+              lastChange.changes = [];
+              lastChange.maybeReset = false;
+            }
             lastChange.changes.push(text);
           }
           // Change objects may be chained with next.
@@ -4896,7 +4904,7 @@
           lastChange.expectCursorActivityForChange = false;
         } else {
           // Cursor moved outside the context of an edit. Reset the change.
-          lastChange.changes = [];
+          lastChange.maybeReset = true;
         }
       } else if (!cm.curOp.isVimOp) {
         handleExternalSelection(cm, vim);
@@ -4960,6 +4968,10 @@
       var keyName = CodeMirror.keyName(e);
       if (!keyName) { return; }
       function onKeyFound() {
+        if (lastChange.maybeReset) {
+          lastChange.changes = [];
+          lastChange.maybeReset = false;
+        }
         lastChange.changes.push(new InsertModeKey(keyName));
         return true;
       }
diff --git a/test/vim_test.js b/test/vim_test.js
index 159114cecd..6eea5553db 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -127,7 +127,10 @@ function testVim(name, run, opts, expectedFail) {
           arguments = args;
         }
         for (var i = 0; i < arguments.length; i++) {
-          CodeMirror.Vim.handleKey(cm, arguments[i]);
+          var result = CodeMirror.Vim.handleKey(cm, arguments[i]);
+          if (!result && cm.state.vim.insertMode) {
+            cm.replaceSelections(fillArray(arguments[i], cm.listSelections().length));
+          }
         }
       }
     }
@@ -149,7 +152,7 @@ function testVim(name, run, opts, expectedFail) {
           // Record for insert mode.
           if (handled == "handled" && cm.state.vim.insertMode && arguments[i] != 'Esc') {
             var lastChange = CodeMirror.Vim.getVimGlobalState_().macroModeState.lastInsertModeChanges;
-            if (lastChange) {
+            if (lastChange && (key.indexOf('Delete') != -1 || key.indexOf('Backspace') != -1)) {
               lastChange.changes.push(new CodeMirror.Vim.InsertModeKey(key));
             }
           }
@@ -1980,7 +1983,7 @@ testVim('visual_block_mode_switch', function(cm, vim, helpers) {
   cm.setCursor(1, 1);
   // blockwise to characterwise visual
   helpers.doKeys('<C-v>', 'j', 'l', 'v');
-  selections = cm.getSelections();
+  var selections = cm.getSelections();
   eq('7891\nabc', selections.join(''));
   // characterwise to blockwise
   helpers.doKeys('<C-v>');
@@ -2841,6 +2844,14 @@ testVim('._insert', function(cm, vim, helpers) {
   helpers.doKeys('.');
   eq('testestt', cm.getValue());
   helpers.assertCursorAt(0, 6);
+  helpers.doKeys('O');
+  cm.replaceRange('xyz', cm.getCursor());
+  helpers.doInsertModeKeys('Backspace');
+  helpers.doInsertModeKeys('Down');
+  helpers.doKeys('<Esc>');
+  helpers.doKeys('.');
+  eq('xy\nxy\ntestestt', cm.getValue());
+  helpers.assertCursorAt(1, 1);
 }, { value: ''});
 testVim('._insert_repeat', function(cm, vim, helpers) {
   helpers.doKeys('i');
@@ -3767,7 +3778,7 @@ testVim('set_boolean', function(cm, vim, helpers) {
     // Test fail to set to non-boolean
     CodeMirror.Vim.setOption('testoption', '5');
     fail();
-  } catch (expected) {};
+  } catch (expected) {}
   // Test setOption
   CodeMirror.Vim.setOption('testoption', false);
   is(!CodeMirror.Vim.getOption('testoption'));
@@ -3780,7 +3791,7 @@ testVim('ex_set_boolean', function(cm, vim, helpers) {
     // Test fail to set to non-boolean
     helpers.doEx('set testoption=22');
     fail();
-  } catch (expected) {};
+  } catch (expected) {}
   // Test setOption
   helpers.doEx('set notestoption');
   is(!CodeMirror.Vim.getOption('testoption'));
@@ -3793,12 +3804,12 @@ testVim('set_string', function(cm, vim, helpers) {
     // Test fail to set non-string.
     CodeMirror.Vim.setOption('testoption', true);
     fail();
-  } catch (expected) {};
+  } catch (expected) {}
   try {
     // Test fail to set 'notestoption'
     CodeMirror.Vim.setOption('notestoption', 'b');
     fail();
-  } catch (expected) {};
+  } catch (expected) {}
   // Test setOption
   CodeMirror.Vim.setOption('testoption', 'c');
   eq('c', CodeMirror.Vim.getOption('testoption'));
@@ -3811,7 +3822,7 @@ testVim('ex_set_string', function(cm, vim, helpers) {
     // Test fail to set 'notestopt'
     helpers.doEx('set notestopt=b');
     fail();
-  } catch (expected) {};
+  } catch (expected) {}
   // Test setOption
   helpers.doEx('set testopt=c')
   eq('c', CodeMirror.Vim.getOption('testopt'));
@@ -3861,7 +3872,7 @@ testVim('ex_set_callback', function(cm, vim, helpers) {
     // Test fail to set 'notestopt'
     helpers.doEx('set notestopt=b');
     fail();
-  } catch (expected) {};
+  } catch (expected) {}
   // 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
@@ -3998,7 +4009,17 @@ testVim('ex_imap', function(cm, vim, helpers) {
   is(vim.insertMode);
   helpers.doKeys('j', 'k');
   is(!vim.insertMode);
-});
+  cm.setCursor(0, 1);
+  CodeMirror.Vim.map('jj', '<Esc>', 'insert');
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
+  var replacement = fillArray('fo', 3);
+  cm.replaceSelections(replacement);
+  eq('1fo4\n5fo8\nafodefg', cm.getValue());
+  helpers.doKeys('j', 'j');
+  cm.setCursor(0, 0);
+  helpers.doKeys('.');
+  eq('foo4\nfoo8\nfoodefg', cm.getValue());
+}, { value: '1234\n5678\nabcdefg' });
 testVim('ex_unmap_api', function(cm, vim, helpers) {
   CodeMirror.Vim.map('<Alt-X>', 'gg', 'normal');
   is(CodeMirror.Vim.handleKey(cm, "<Alt-X>", "normal"), "Alt-X key is mapped");

From 15dbafc8c5f200b5c4e2362a93d91e5675ddb3b5 Mon Sep 17 00:00:00 2001
From: Mike Kobit <mkobit@gmail.com>
Date: Sun, 4 Sep 2016 22:44:34 -0500
Subject: [PATCH 2861/4742] [mode/meta] Add Groovy recognition for Jenkinsfile

`Jenkinsfile` is used in Jenkins 2.0 for defining your pipeline as code.

See https://jenkins.io/doc/pipeline/jenkinsfile
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index 2e9ac7ce4b..1e078eedee 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -56,7 +56,7 @@
     {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
     {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
     {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
-    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"]},
+    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"], file: /^Jenkinsfile$/},
     {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
     {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
     {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},

From a6c9a59395cebd1ce58deecc3b9b922d36f23f6b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 7 Sep 2016 10:25:58 +0200
Subject: [PATCH 2862/4742] [panda-syntax theme] Fix rule for matching brackets

Closes #4230
---
 theme/panda-syntax.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/theme/panda-syntax.css b/theme/panda-syntax.css
index 0e03500328..5d47fe5063 100644
--- a/theme/panda-syntax.css
+++ b/theme/panda-syntax.css
@@ -65,8 +65,7 @@
 	color: #6FC1FF;
 }
 
-.cm-s-panda-syntax .cm-matchingbracket,
-.CodeMirror .CodeMirror-matchingbracket {
+.cm-s-panda-syntax .CodeMirror-matchingbracket {
 	color: #E6E6E6 !important;
 	border-bottom: 1px dotted #19f9d8;
 	padding-bottom: 2px;

From 3d89b71b955b72e61430f7f38e2350489cad9e15 Mon Sep 17 00:00:00 2001
From: Remi Nyborg <remi@nyborg.priv.no>
Date: Tue, 13 Sep 2016 09:59:39 +0200
Subject: [PATCH 2863/4742] Add passing the FocusEvent to blur and focus

---
 doc/manual.html   |  4 ++--
 lib/codemirror.js | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index d7c15f653d..4d20f50f2e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -626,10 +626,10 @@ <h2>Events</h2>
       You can <code>preventDefault</code> the event, to signal that
       CodeMirror should do no further handling.</dd>
 
-      <dt id="event_focus"><code><strong>"focus"</strong> (instance: CodeMirror)</code></dt>
+      <dt id="event_focus"><code><strong>"focus"</strong> (instance: CodeMirror, event: Event)</code></dt>
       <dd>Fires whenever the editor is focused.</dd>
 
-      <dt id="event_blur"><code><strong>"blur"</strong> (instance: CodeMirror)</code></dt>
+      <dt id="event_blur"><code><strong>"blur"</strong> (instance: CodeMirror, event: Event)</code></dt>
       <dd>Fires whenever the editor is unfocused.</dd>
 
       <dt id="event_scroll"><code><strong>"scroll"</strong> (instance: CodeMirror)</code></dt>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6e0b69c610..a44bf0e531 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3533,8 +3533,8 @@
     on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
     on(inp, "keydown", operation(cm, onKeyDown));
     on(inp, "keypress", operation(cm, onKeyPress));
-    on(inp, "focus", bind(onFocus, cm));
-    on(inp, "blur", bind(onBlur, cm));
+    on(inp, "focus", function (e) { onFocus(cm, e); });
+    on(inp, "blur", function (e) { onBlur(cm, e); });
   }
 
   function dragDropChanged(cm, value, old) {
@@ -4262,12 +4262,12 @@
     }, 100);
   }
 
-  function onFocus(cm) {
+  function onFocus(cm, e) {
     if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
 
     if (cm.options.readOnly == "nocursor") return;
     if (!cm.state.focused) {
-      signal(cm, "focus", cm);
+      signal(cm, "focus", cm, e);
       cm.state.focused = true;
       addClass(cm.display.wrapper, "CodeMirror-focused");
       // This test prevents this from firing when a context
@@ -4281,11 +4281,11 @@
     }
     restartBlink(cm);
   }
-  function onBlur(cm) {
+  function onBlur(cm, e) {
     if (cm.state.delayingBlurEvent) return;
 
     if (cm.state.focused) {
-      signal(cm, "blur", cm);
+      signal(cm, "blur", cm, e);
       cm.state.focused = false;
       rmClass(cm.display.wrapper, "CodeMirror-focused");
     }

From 7db967f97565335c6e028b6f72617cac84316170 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 15 Sep 2016 15:58:58 +0200
Subject: [PATCH 2864/4742] [xml-fold addon] Clip iterator range to editor
 range

Closes #4018
---
 addon/fold/xml-fold.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index f8c67b8976..75a9e305bd 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -21,8 +21,8 @@
   function Iter(cm, line, ch, range) {
     this.line = line; this.ch = ch;
     this.cm = cm; this.text = cm.getLine(line);
-    this.min = range ? range.from : cm.firstLine();
-    this.max = range ? range.to - 1 : cm.lastLine();
+    this.min = range ? Math.max(range.from, cm.firstLine()) : cm.firstLine();
+    this.max = range ? Math.min(range.to - 1, cm.lastLine()) : cm.lastLine();
   }
 
   function tagAt(iter, ch) {

From 02d4ab46ce9d0b5acadbd6b3c3d39bfaf5e76815 Mon Sep 17 00:00:00 2001
From: Siamak Mokhtari <siamak@users.noreply.github.com>
Date: Fri, 16 Sep 2016 20:46:46 +0430
Subject: [PATCH 2865/4742] [panda-syntax theme] Adjust colors

---
 theme/panda-syntax.css | 92 +++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 50 deletions(-)

diff --git a/theme/panda-syntax.css b/theme/panda-syntax.css
index 5d47fe5063..8c0c754082 100644
--- a/theme/panda-syntax.css
+++ b/theme/panda-syntax.css
@@ -1,93 +1,85 @@
 /*
-
 	Name:       Panda Syntax
 	Author:     Siamak Mokhtari (http://github.com/siamak/)
-
 	CodeMirror template by Siamak Mokhtari (https://github.com/siamak/atom-panda-syntax)
-
 */
 .cm-s-panda-syntax {
-	/*font-family: 'Operator Mono', 'Source Sans Pro', Helvetica, Arial, sans-serif;*/
-	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
 	background: #292A2B;
 	color: #E6E6E6;
+	line-height: 1.5;
+	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
 }
+.cm-s-panda-syntax .CodeMirror-cursor { border-color: #ff2c6d; }
 .cm-s-panda-syntax .CodeMirror-activeline-background {
-	background: #404954;
+	background: rgba(99, 123, 156, 0.1);
+}
+.cm-s-panda-syntax .CodeMirror-selected {
+	background: #FFF;
 }
-
 .cm-s-panda-syntax .cm-comment {
 	font-style: italic;
 	color: #676B79;
 }
-.cm-s-panda-syntax .cm-string,
-.cm-s-panda-syntax .cm-string-2 {
+.cm-s-panda-syntax .cm-operator {
+	color: #f3f3f3;
+}
+.cm-s-panda-syntax .cm-string {
 	color: #19F9D8;
 }
+.cm-s-panda-syntax .cm-string-2 {
+    color: #FFB86C;
+}
+
+.cm-s-panda-syntax .cm-tag {
+	color: #ff2c6d;
+}
+.cm-s-panda-syntax .cm-meta {
+	color: #b084eb;
+}
+
 .cm-s-panda-syntax .cm-number {
 	color: #FFB86C;
 }
 .cm-s-panda-syntax .cm-atom {
-	color: #FFB86C;
+	color: #ff2c6d;
 }
-
 .cm-s-panda-syntax .cm-keyword {
 	color: #FF75B5;
 }
-.cm-s-panda-syntax .cm-keyword-2 {
-	color: #FF75B5;
-}
-.cm-s-panda-syntax .cm-keyword-3 {
-	color: #B084EB;
-}
-
 .cm-s-panda-syntax .cm-variable {
-	color: #FF9AC1;
+	color: #ffb86c;
 }
 .cm-s-panda-syntax .cm-variable-2 {
-	color: #e6e6e6;
+	color: #ff9ac1;
 }
 .cm-s-panda-syntax .cm-variable-3 {
-	color: #82B1FF;
+	color: #ff9ac1;
 }
 
 .cm-s-panda-syntax .cm-def {
-	/*font-style: italic;*/
 	color: #e6e6e6;
 }
-.cm-s-panda-syntax .cm-def-2 {
-	font-style: italic;
-	color: #ffcc95;
-}
-
-
 .cm-s-panda-syntax .cm-property {
-	color: #6FC1FF;
+	color: #f3f3f3;
 }
-
-.cm-s-panda-syntax .CodeMirror-matchingbracket {
-	color: #E6E6E6 !important;
-	border-bottom: 1px dotted #19f9d8;
-	padding-bottom: 2px;
+.cm-s-panda-syntax .cm-unit {
+    color: #ffb86c;
 }
 
-.cm-s-panda-syntax .CodeMirror-gutters {
-	background: #292A2B;
-	color: #757575;
-	border: none;
+.cm-s-panda-syntax .cm-attribute {
+    color: #ffb86c;
 }
-.cm-s-panda-syntax .CodeMirror-guttermarker, .cm-s-panda-syntax .CodeMirror-guttermarker-subtle, .cm-s-panda-syntax .CodeMirror-linenumber {
-	color: #757575;
+
+.cm-s-panda-syntax .CodeMirror-matchingbracket {
+    border-bottom: 1px dotted #19F9D8;
+    padding-bottom: 2px;
+    color: #e6e6e6;
 }
-.cm-s-panda-syntax .CodeMirror-linenumber {
-	padding-right: 10px;
+.CodeMirror-gutters {
+    background: #292a2b;
+    border-right-color: rgba(255, 255, 255, 0.1);
 }
-.cm-s-panda-syntax .CodeMirror-cursor {
-	border-left: 1px solid #757575;
+.CodeMirror-linenumber {
+    color: #e6e6e6;
+    opacity: 0.6;
 }
-/*.cm-s-panda-syntax div.CodeMirror-selected { background: rgba(255, 255, 255, 0.5); }*/
-.cm-s-panda-syntax.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.25); }
-.cm-s-panda-syntax .CodeMirror-line::selection, .cm-s-panda-syntax .CodeMirror-line > span::selection, .cm-s-panda-syntax .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-panda-syntax .CodeMirror-line::-moz-selection, .cm-s-panda-syntax .CodeMirror-line > span::-moz-selection, .cm-s-panda-syntax .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-.cm-s-panda-syntax .CodeMirror-activeline-background { background: rgba(99, 123, 156, 0.125); }

From 953a5dca4e2e8ffa251069bd46a8da29ab977f74 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 19 Sep 2016 21:09:51 +0200
Subject: [PATCH 2866/4742] [erlang mode] Fix problem with dereferencing empty
 context array

Closes #4244
---
 mode/erlang/erlang.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index 5aed76a526..9528e19f93 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -433,15 +433,16 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
   }
 
   function maybe_drop_post(s) {
+    if (!s.length) return s
     var last = s.length-1;
 
     if (s[last].type === "dot") {
       return [];
     }
-    if (s[last].type === "fun" && s[last-1].token === "fun") {
+    if (last > 1 && s[last].type === "fun" && s[last-1].token === "fun") {
       return s.slice(0,last-1);
     }
-    switch (s[s.length-1].token) {
+    switch (s[last].token) {
       case "}":    return d(s,{g:["{"]});
       case "]":    return d(s,{i:["["]});
       case ")":    return d(s,{i:["("]});

From e865bdef6ce087db02686267d57c34478da8621b Mon Sep 17 00:00:00 2001
From: Pontus Melke <pontusmelke@gmail.com>
Date: Wed, 24 Aug 2016 14:41:27 +0200
Subject: [PATCH 2867/4742] [cypher mode] Added CALL and YIELD as keywords

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

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 107e4f6d21..f99abe2385 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -62,7 +62,7 @@
     var curPunc;
     var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "reverse", "right", "round", "rtrim", "shortestPath", "sign", "sin", "size", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "toString", "trim", "type", "upper"]);
     var preds = wordRegexp(["all", "and", "any", "contains", "exists", "has", "in", "none", "not", "or", "single", "xor"]);
-    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with", "call", "yield"]);
     var operatorChars = /[*+\-<>=&|~%^]/;
 
     return {

From 45f97d2f83f766108b13f52594b74071b11698f7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Sep 2016 10:47:45 +0200
Subject: [PATCH 2868/4742] [comment addon] Use first closing token when
 uncommenting

And don't block-comment inside a block comment

Closes #4208
---
 addon/comment/comment.js | 11 +++++++----
 test/comment_test.js     |  9 +++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 2f2f071df9..d71cf43603 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -103,6 +103,7 @@
         self.lineComment(from, to, options);
       return;
     }
+    if (/\bcomment\b/.test(self.getTokenTypeAt(Pos(from.line, 0)))) return
 
     var end = Math.min(to.line, self.lastLine());
     if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
@@ -162,13 +163,15 @@
     var endString = options.blockCommentEnd || mode.blockCommentEnd;
     if (!startString || !endString) return false;
     var lead = options.blockCommentLead || mode.blockCommentLead;
-    var startLine = self.getLine(start), endLine = end == start ? startLine : self.getLine(end);
-    var open = startLine.indexOf(startString), close = endLine.lastIndexOf(endString);
+    var startLine = self.getLine(start), open = startLine.indexOf(startString)
+    if (open == -1) return false
+    var endLine = end == start ? startLine : self.getLine(end)
+    var close = endLine.indexOf(endString, end == start ? open + startString.length : 0);
     if (close == -1 && start != end) {
       endLine = self.getLine(--end);
-      close = endLine.lastIndexOf(endString);
+      close = endLine.indexOf(endString);
     }
-    if (open == -1 || close == -1 ||
+    if (close == -1 ||
         !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
         !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
       return false;
diff --git a/test/comment_test.js b/test/comment_test.js
index 3e6a86bbf2..c6b9fe8109 100644
--- a/test/comment_test.js
+++ b/test/comment_test.js
@@ -102,4 +102,13 @@ namespace = "comment_";
     cm.execCommand("selectAll")
     cm.execCommand("toggleComment")
   }, "// foo\n// bar\nbaz", "// // foo\n// // bar\n// baz")
+
+  test("uncommentWithTrailingBlockEnd", "xml", function(cm) {
+    cm.execCommand("toggleComment")
+  }, "<!-- foo --> -->", "foo -->")
+
+  test("dontCommentInComment", "xml", function(cm) {
+    cm.setCursor(1, 0)
+    cm.execCommand("toggleComment")
+  }, "<!-- foo\nbar -->", "<!-- foo\nbar -->")
 })();

From 653f64cc744cf2b1e5658cc818d4d3ff52417d47 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Sep 2016 10:51:06 +0200
Subject: [PATCH 2869/4742] [javascript mode] Recognize TypeScript-style
 optional arguments

Closes #4212
---
 mode/javascript/javascript.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 15ffe03e67..c27b01f7a6 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -521,8 +521,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "}") return cont();
     return pass(statement, block);
   }
-  function maybetype(type) {
-    if (isTS && type == ":") return cont(typeexpr);
+  function maybetype(type, value) {
+    if (isTS) {
+      if (type == ":") return cont(typeexpr);
+      if (value == "?") return cont(maybetype);
+    }
   }
   function maybedefault(_, value) {
     if (value == "=") return cont(expressionNoComma);

From 88c54d1d8daf2cba70d49c06b9e142ab2917a067 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Sep 2016 11:03:34 +0200
Subject: [PATCH 2870/4742] Remove debug statement

---
 test/mode_test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/mode_test.js b/test/mode_test.js
index f706c4f5c6..0aed50f7dc 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -61,7 +61,6 @@
 
   test.mode = function(name, mode, tokens, modeName) {
     var data = parseTokens(tokens);
-    if (name == "extend_type") console.log("set", (modeName || mode.name) + "_" + name)
     return test((modeName || mode.name) + "_" + name, function() {
       return compare(data.plain, data.tokens, mode);
     });

From 14c8a436efa943060682c1b9845c63bbcee491cf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Sep 2016 11:23:10 +0200
Subject: [PATCH 2871/4742] [javascript mode] Improve indentation with missing
 semicolons

Closes #4214
---
 mode/javascript/javascript.js | 18 +++++++++++++-----
 mode/javascript/test.js       | 13 +++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c27b01f7a6..e23560746d 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -344,19 +344,19 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   function statement(type, value) {
     if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
-    if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
+    if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex);
     if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
     if (type == "{") return cont(pushlex("}"), block, poplex);
     if (type == ";") return cont();
     if (type == "if") {
       if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
         cx.state.cc.pop()();
-      return cont(pushlex("form"), expression, statement, poplex, maybeelse);
+      return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse);
     }
     if (type == "function") return cont(functiondef);
     if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
     if (type == "variable") return cont(pushlex("stat"), maybelabel);
-    if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
+    if (type == "switch") return cont(pushlex("form"), parenExpr, pushlex("}", "switch"), expect("{"),
                                       block, poplex, poplex);
     if (type == "case") return cont(expression, expect(":"));
     if (type == "default") return cont(expect(":"));
@@ -376,6 +376,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function expressionNoComma(type) {
     return expressionInner(type, true);
   }
+  function parenExpr(type) {
+    if (type != "(") return pass()
+    return cont(pushlex(")"), expression, expect(")"), poplex)
+  }
   function expressionInner(type, noComma) {
     if (cx.state.fatArrowAt == cx.stream.start) {
       var body = noComma ? arrowBodyNoComma : arrowBody;
@@ -709,14 +713,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     indent: function(state, textAfter) {
       if (state.tokenize == tokenComment) return CodeMirror.Pass;
       if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
+      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, top
       // Kludge to prevent 'maybelse' from blocking lexical scope pops
       if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
         var c = state.cc[i];
         if (c == poplex) lexical = lexical.prev;
         else if (c != maybeelse) break;
       }
-      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
+      while ((lexical.type == "stat" || lexical.type == "form") &&
+             (firstChar == "}" || ((top = state.cc[state.cc.length - 1]) &&
+                                   (top == maybeoperatorComma || top == maybeoperatorNoComma) &&
+                                   !/^[,\.=+\-*:?[\(]/.test(textAfter))))
+        lexical = lexical.prev;
       if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
         lexical = lexical.prev;
       var type = lexical.type, closing = firstChar == type;
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 7e88837ed8..91c8b7434a 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -140,6 +140,19 @@
      "    [number 1];",
      "[number 2];");
 
+  MT("indent_semicolonless_if",
+     "[keyword function] [def foo]() {",
+     "  [keyword if] ([variable x])",
+     "    [variable foo]()",
+     "}")
+
+  MT("indent_semicolonless_if_with_statement",
+     "[keyword function] [def foo]() {",
+     "  [keyword if] ([variable x])",
+     "    [variable foo]()",
+     "  [variable bar]()",
+     "}")
+
   MT("multilinestring",
      "[keyword var] [def x] [operator =] [string 'foo\\]",
      "[string bar'];");

From e59d75ad99d5499bb78e0a3103ad4ec51a184542 Mon Sep 17 00:00:00 2001
From: Joel Einbinder <einbinder@chromium.org>
Date: Wed, 31 Aug 2016 17:17:55 -0700
Subject: [PATCH 2872/4742] Always move in the right direction for
 PageUp/PageDown

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index a44bf0e531..251469c909 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4907,7 +4907,8 @@
     var doc = cm.doc, x = pos.left, y;
     if (unit == "page") {
       var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
-      y = pos.top + dir * (pageSize - (dir < 0 ? 1.5 : .5) * textHeight(cm.display));
+      var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3);
+      y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount;
     } else if (unit == "line") {
       y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
     }
diff --git a/test/test.js b/test/test.js
index 1b3721a647..a7658311e7 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1336,6 +1336,37 @@ testCM("verticalMovementCommandsWrapping", function(cm) {
 }, {value: "a very long line that wraps around somehow so that we can test cursor movement\nshortone\nk",
     lineWrapping: true});
 
+testCM("verticalMovementCommandsSingleLine", function(cm) {
+  cm.display.wrapper.style.height = "auto";
+  cm.refresh();
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(0, 11));
+  cm.setCursor(Pos(0, 5));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(0, 11));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(0, 11));
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goPageDown");
+  eqPos(cm.getCursor(), Pos(0, 11));
+  cm.execCommand("goPageDown"); cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(0, 11));
+  cm.execCommand("goPageUp");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.setCursor(Pos(0, 5));
+  cm.execCommand("goPageUp");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.setCursor(Pos(0, 5));
+  cm.execCommand("goPageDown");
+  eqPos(cm.getCursor(), Pos(0, 11));
+}, {value: "single line"});
+
+
 testCM("rtlMovement", function(cm) {
   if (cm.getOption("inputStyle") != "textarea") return;
   forEach(["خحج", "خحabcخحج", "abخحخحجcd", "abخde", "abخح2342خ1حج", "خ1ح2خح3حxج",
@@ -1487,7 +1518,7 @@ testCM("lineWidgetChanged", function(cm) {
     // Good:
     // | ------------- display width ------------- |
     // | ------- widget-width when measured ------ |
-    // | | -- under-half -- | | -- under-half -- | | 
+    // | | -- under-half -- | | -- under-half -- | |
     // | | --- over-half --- |                     |
     // | | --- over-half --- |                     |
     // Height: measured as 3 lines, same as it will be when actually displayed
@@ -1504,7 +1535,7 @@ testCM("lineWidgetChanged", function(cm) {
     // Bad (too wide):
     // | ------------- display width ------------- |
     // | -------- widget-width when measured ------- | < -- uh oh
-    // | | -- under-half -- | | -- under-half -- |   | 
+    // | | -- under-half -- | | -- under-half -- |   |
     // | | --- over-half --- | | --- over-half --- | | < -- when measured, combined on one line
     // Height: measured as 2 lines, less than expected. Will be displayed as 3 lines!
 

From cc817cd9281fcc0e9a69fd8c7f0965313ea014ff Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Sep 2016 12:00:45 +0200
Subject: [PATCH 2873/4742] Lower max token size to 5000

Closes #4233
---
 lib/codemirror.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 251469c909..17c3112236 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -6861,7 +6861,7 @@
       }
       if (!flattenSpans || curStyle != style) {
         while (curStart < stream.start) {
-          curStart = Math.min(stream.start, curStart + 50000);
+          curStart = Math.min(stream.start, curStart + 5000);
           f(curStart, curStyle);
         }
         curStyle = style;
@@ -6869,8 +6869,10 @@
       stream.start = stream.pos;
     }
     while (curStart < stream.pos) {
-      // Webkit seems to refuse to render text nodes longer than 57444 characters
-      var pos = Math.min(stream.pos, curStart + 50000);
+      // Webkit seems to refuse to render text nodes longer than 57444
+      // characters, and returns inaccurate measurements in nodes
+      // starting around 5000 chars.
+      var pos = Math.min(stream.pos, curStart + 5000);
       f(pos, curStyle);
       curStart = pos;
     }

From a350d03f15df2892e41b094faa85a08459942845 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Sep 2016 12:26:58 +0200
Subject: [PATCH 2874/4742] Mark release 5.19.0

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 20 ++++++++++++++++++++
 doc/compress.html |  1 +
 doc/manual.html   |  2 +-
 doc/releases.html | 12 ++++++++++++
 index.html        |  2 +-
 lib/codemirror.js |  2 +-
 package.json      |  2 +-
 8 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 0f2bc1bbf3..ada8c3f9cf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -405,6 +405,7 @@ Mike Brevoort
 Mike Diaz
 Mike Ivanov
 Mike Kadin
+Mike Kobit
 MinRK
 Miraculix87
 misfo
@@ -464,6 +465,7 @@ Philipp A
 Philip Stadermann
 Pierre Gerold
 Piët Delport
+Pontus Melke
 prasanthj
 Prasanth J
 Prayag Verma
@@ -477,6 +479,7 @@ Randy Edmunds
 Rasmus Erik Voel Jensen
 ray ratchup
 Ray Ratchup
+Remi Nyborg
 Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9470deb79f..f368485cfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.19.0 (2016-09-20)
+
+### Bugfixes
+
+[erlang mode](http://codemirror.net/mode/erlang): Fix mode crash when trying to read an empty context.
+
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Fix broken behavior when toggling comments inside a comment.
+
+xml-fold addon: Fix a null-dereference bug.
+
+Page up and page down now do something even in single-line documents.
+
+Fix an issue where the cursor position could be off in really long (~8000 character) tokens.
+
+### New features
+
+[javascript mode](http://codemirror.net/mode/javascript): Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the `type` keyword.
+
+The [`blur`](http://codemirror.net/doc/manual.html#event_blur) and [`focus`](http://codemirror.net/doc/manual.html#event_focus) events now pass the DOM event to their handlers.
+
 ## 5.18.2 (2016-08-23)
 
 ### Bugfixes
diff --git a/doc/compress.html b/doc/compress.html
index 7f12f2c430..c013d3b744 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -36,6 +36,7 @@ <h2>Script compression helper</h2>
       <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.19.0;f=">5.19.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.18.2;f=">5.18.2</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.18.0;f=">5.18.0</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.17.0;f=">5.17.0</option>
diff --git a/doc/manual.html b/doc/manual.html
index 4d20f50f2e..5bdca1e0f7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.18.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.19.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 fa1dd69ac8..5a0c6b715c 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-09-2016: <a href="http://codemirror.net/codemirror-5.19.0.zip">Version 5.19.0</a>:</p>
+
+  <ul class=rel-note>
+    <li><a href="http://codemirror.net/mode/erlang">erlang mode</a>: Fix mode crash when trying to read an empty context.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix broken behavior when toggling comments inside a comment.</li>
+    <li>xml-fold addon: Fix a null-dereference bug.</li>
+    <li>Page up and page down now do something even in single-line documents.</li>
+    <li>Fix an issue where the cursor position could be off in really long (~8000 character) tokens.</li>
+    <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the <code>type</code> keyword.</li>
+    <li>The <a href="http://codemirror.net/doc/manual.html#event_blur"><code>blur</code></a> and <a href="http://codemirror.net/doc/manual.html#event_focus"><code>focus</code></a> events now pass the DOM event to their handlers.</li>
+  </ul>
+
   <p class="rel">23-08-2016: <a href="http://codemirror.net/codemirror-5.18.2.zip">Version 5.18.2</a>:</p>
 
   <ul class=rel-note>
diff --git a/index.html b/index.html
index f3aba01bdf..636639ec08 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.18.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.19.0</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 17c3112236..32d9743981 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8958,7 +8958,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.18.3";
+  CodeMirror.version = "5.19.0";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 23dfd5211f..6744d254fa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.18.3",
+  "version": "5.19.0",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",

From de605105f9bab51f110ddd3f69444d5fde0da10b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Sep 2016 12:33:11 +0200
Subject: [PATCH 2875/4742] Fix release script to handle spaces in JSON

---
 bin/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/release b/bin/release
index 18c5cdafc7..5b31da8efd 100755
--- a/bin/release
+++ b/bin/release
@@ -21,7 +21,7 @@ rewrite("lib/codemirror.js", function(lib) {
                      "CodeMirror.version = \"" + number + "\"");
 });
 function rewriteJSON(pack) {
-  return pack.replace(/"version":"\d+\.\d+\.\d+"/, "\"version\":\"" + number + "\"");
+  return pack.replace(/"version":\s*"\d+\.\d+\.\d+"/, "\"version\": \"" + number + "\"");
 }
 rewrite("package.json", rewriteJSON);
 rewrite("doc/manual.html", function(manual) {

From 8f5974021f791b0d1d80f20c76ef1223bc23316e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Sep 2016 12:33:34 +0200
Subject: [PATCH 2876/4742] Bump version number post-5.19.0

---
 doc/manual.html   | 2 +-
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 5bdca1e0f7..8a0e2dcb81 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.19.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.19.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 32d9743981..48ebdf141a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -8958,7 +8958,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.19.0";
+  CodeMirror.version = "5.19.1";
 
   return CodeMirror;
 });
diff --git a/package.json b/package.json
index 6744d254fa..1e4c7e0b06 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.19.0",
+  "version": "5.19.1",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",

From 6f0fe4da3440bb9c90c9ac7edd3f97c7a5831c5d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Sep 2016 11:36:16 +0200
Subject: [PATCH 2877/4742] Make newlineAndIndent work with multiple cursors on
 same line

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

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 48ebdf141a..9fb06561c3 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5796,7 +5796,7 @@
     newlineAndIndent: function(cm) {
       runInOp(cm, function() {
         var len = cm.listSelections().length;
-        for (var i = 0; i < len; i++) {
+        for (var i = len - 1; i >= 0; i--) {
           var range = cm.listSelections()[i];
           cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
           cm.indentLine(range.from().line + 1, null, true);

From d3e8160274f1b4662ce9f7052651d8e4af836372 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Sep 2016 11:52:36 +0200
Subject: [PATCH 2878/4742] Amend previous patch

Indentation should happen top-to-bottom so that subsequent
indents are based on the updated code above

Issue #4248
---
 lib/codemirror.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 9fb06561c3..3798e5ec6c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -5795,12 +5795,12 @@
     },
     newlineAndIndent: function(cm) {
       runInOp(cm, function() {
-        var len = cm.listSelections().length;
-        for (var i = len - 1; i >= 0; i--) {
-          var range = cm.listSelections()[i];
-          cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
-          cm.indentLine(range.from().line + 1, null, true);
-        }
+        var sels = cm.listSelections()
+        for (var i = sels.length - 1; i >= 0; i--)
+          cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input")
+        sels = cm.listSelections()
+        for (var i = 0; i < sels.length; i++)
+          cm.indentLine(sels[i].from().line, null, true)
         ensureCursorVisible(cm);
       });
     },

From 8f5ff2b2435c8408f447876c1f5436bb96549832 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Sep 2016 20:35:38 +0200
Subject: [PATCH 2879/4742] Revert "[lint demo] Remove css lint example"

This reverts commit 8a1dd1604974840fe69163f958ad204010442aea.

Issue #4123
---
 demo/lint.html | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/demo/lint.html b/demo/lint.html
index ea0297b27d..96009b4e1f 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -11,9 +11,11 @@
 <script src="../mode/css/css.js"></script>
 <script src="//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
 <script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
+<script src="http://csslint.net/js/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
 <script src="../addon/lint/javascript-lint.js"></script>
 <script src="../addon/lint/json-lint.js"></script>
+<script src="../addon/lint/css-lint.js"></script>
 <style type="text/css">
       .CodeMirror {border: 1px solid black;}
     </style>
@@ -83,6 +85,66 @@ <h2>Linter Demo</h2>
 ]
 </textarea></p>
 
+    <p><textarea id="code-css">@charset "UTF-8";
+
+@import url("booya.css") print, screen;
+@import "whatup.css" screen;
+@import "wicked.css";
+
+/*Error*/
+@charset "UTF-8";
+
+
+@namespace "http://www.w3.org/1999/xhtml";
+@namespace svg "http://www.w3.org/2000/svg";
+
+/*Warning: empty ruleset */
+.foo {
+}
+
+h1 {
+    font-weight: bold;
+}
+
+/*Warning: qualified heading */
+.foo h1 {
+    font-weight: bold;
+}
+
+/*Warning: adjoining classes */
+.foo.bar {
+    zoom: 1;
+}
+
+li.inline {
+    width: 100%;  /*Warning: 100% can be problematic*/
+}
+
+li.last {
+  display: inline;
+  padding-left: 3px !important;
+  padding-right: 3px;
+  border-right: 0px;
+}
+
+@media print {
+    li.inline {
+      color: black;
+    }
+}
+
+@page {
+  margin: 10%;
+  counter-increment: page;
+
+  @top-center {
+    font-family: sans-serif;
+    font-weight: bold;
+    font-size: 2em;
+    content: counter(page);
+  }
+}
+</textarea></p>
 <script>
   var editor = CodeMirror.fromTextArea(document.getElementById("code-js"), {
     lineNumbers: true,
@@ -98,6 +160,12 @@ <h2>Linter Demo</h2>
     lint: true
   });
   
+  var editor_css = CodeMirror.fromTextArea(document.getElementById("code-css"), {
+    lineNumbers: true,
+    mode: "css",
+    gutters: ["CodeMirror-lint-markers"],
+    lint: true
+  });
 </script>
 
   </article>

From 562e8eff5b0916d3b63fc59eda9540f8f455c6ed Mon Sep 17 00:00:00 2001
From: Luke Browning <luke-browning@users.noreply.github.com>
Date: Thu, 22 Sep 2016 14:55:40 +0100
Subject: [PATCH 2880/4742] [sql mode] Add exec keyword to mssql

---
 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 01ebd80ae1..e3cbae54cf 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 declare"),
+    keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare exec"),
     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 e15e2d5e50cce51e940f3a66cb03044dfd935bad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 24 Sep 2016 15:52:45 +0200
Subject: [PATCH 2881/4742] Ignore keypress events for backspace

Closes #4253
---
 lib/codemirror.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 3798e5ec6c..ececc94c23 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -4246,6 +4246,8 @@
     if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
     if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
     var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
+    // Some browsers fire keypress events for backspace
+    if (ch == "\x08") return;
     if (handleCharBinding(cm, e, ch)) return;
     cm.display.input.onKeyPress(e);
   }

From 383c40e468319d0e98e86e7c9a6dcfbe256c8476 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 26 Sep 2016 12:59:43 +0200
Subject: [PATCH 2882/4742] [javascript mode] Fix indentation in TypeScript
 demo

---
 mode/javascript/typescript.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index 2cfc5381fe..1f26d7fe1b 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -28,13 +28,13 @@ <h2>TypeScript mode</h2>
 
 <div><textarea id="code" name="code">
 class Greeter {
-	greeting: string;
-	constructor (message: string) {
-		this.greeting = message;
-	}
-	greet() {
-		return "Hello, " + this.greeting;
-	}
+  greeting: string;
+  constructor (message: string) {
+    this.greeting = message;
+  }
+  greet() {
+    return "Hello, " + this.greeting;
+  }
 }   
 
 var greeter = new Greeter("world");
@@ -42,7 +42,7 @@ <h2>TypeScript mode</h2>
 var button = document.createElement('button')
 button.innerText = "Say Hello"
 button.onclick = function() {
-	alert(greeter.greet())
+  alert(greeter.greet())
 }
 
 document.body.appendChild(button)

From 1716aec3b2a1a5ec87d088773041e7c95b5d61f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 26 Sep 2016 13:00:35 +0200
Subject: [PATCH 2883/4742] [javascript mode] Support TypeScript-style optional
 class properties

Closes #4254
---
 mode/javascript/javascript.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index e23560746d..2267f443d3 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -531,9 +531,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (value == "?") return cont(maybetype);
     }
   }
-  function maybedefault(_, value) {
-    if (value == "=") return cont(expressionNoComma);
-  }
   function typeexpr(type) {
     if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
     if (type == "{") return cont(commasep(typeprop, "}"))
@@ -615,7 +612,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function funarg(type) {
     if (type == "spread") return cont(funarg);
-    return pass(pattern, maybetype, maybedefault);
+    return pass(pattern, maybetype, maybeAssign);
   }
   function className(type, value) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
@@ -627,7 +624,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function classBody(type, value) {
     if (type == "variable" || cx.style == "keyword") {
       if ((value == "static" || value == "get" || value == "set" ||
-           (isTS && (value == "public" || value == "private" || value == "protected"))) &&
+           (isTS && (value == "public" || value == "private" || value == "protected" || value == "readonly"))) &&
           cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false)) {
         cx.marked = "keyword";
         return cont(classBody);
@@ -642,8 +639,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ";") return cont(classBody);
     if (type == "}") return cont();
   }
-  function classfield(type) {
-    if (type == ":") return cont(typeexpr)
+  function classfield(type, value) {
+    if (value == "?") return cont(classfield)
+    if (type == ":") return cont(typeexpr, maybeAssign)
     return pass(functiondef)
   }
   function afterExport(_type, value) {

From 189e3ca7354b90047c34618774ced3df69c403e4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 26 Sep 2016 13:04:05 +0200
Subject: [PATCH 2884/4742] [javascript mode] Handle TypeScript keyword
 'abstract' better

Closes #4255
---
 mode/javascript/javascript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 2267f443d3..65f85f3a98 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -618,13 +618,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
   function classNameAfter(type, value) {
-    if (value == "extends") return cont(isTS ? typeexpr : expression, classNameAfter);
+    if (value == "extends" || value == "implements") return cont(isTS ? typeexpr : expression, classNameAfter);
     if (type == "{") return cont(pushlex("}"), classBody, poplex);
   }
   function classBody(type, value) {
     if (type == "variable" || cx.style == "keyword") {
       if ((value == "static" || value == "get" || value == "set" ||
-           (isTS && (value == "public" || value == "private" || value == "protected" || value == "readonly"))) &&
+           (isTS && (value == "public" || value == "private" || value == "protected" || value == "readonly" || value == "abstract"))) &&
           cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false)) {
         cx.marked = "keyword";
         return cont(classBody);

From aa6e9903a786477a789f431c39a8fd030b8046d5 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 23 Aug 2016 08:41:51 +0200
Subject: [PATCH 2885/4742] Split into ES6 modules (Closes #747)

---
 lib/codemirror.js                       | 8966 -----------------------
 package.json                            |    7 +-
 src/banner.js                           |    8 +
 src/codemirror.js                       |    3 +
 src/display/Display.js                  |  105 +
 src/display/focus.js                    |   49 +
 src/display/gutters.js                  |   33 +
 src/display/highlight_worker.js         |   51 +
 src/display/line_numbers.js             |   48 +
 src/display/mode_state.js               |   22 +
 src/display/operations.js               |  215 +
 src/display/scroll_events.js            |  138 +
 src/display/scrollbars.js               |  188 +
 src/display/scrolling.js                |  132 +
 src/display/selection.js                |  137 +
 src/display/update_display.js           |  227 +
 src/display/update_lines.js             |   62 +
 src/display/view_tracking.js            |  152 +
 src/edit/CodeMirror.js                  |  213 +
 src/edit/commands.js                    |  199 +
 src/edit/deleteNearSelection.js         |   30 +
 src/edit/drop_events.js                 |  118 +
 src/edit/fromTextArea.js                |   59 +
 src/edit/global_events.js               |   46 +
 src/edit/key_events.js                  |  153 +
 src/edit/legacy.js                      |   62 +
 src/edit/main.js                        |   71 +
 src/edit/methods.js                     |  573 ++
 src/edit/mouse_events.js                |  307 +
 src/edit/options.js                     |  196 +
 src/edit/utils.js                       |    7 +
 src/input/ContentEditableInput.js       |  468 ++
 src/input/TextareaInput.js              |  359 +
 src/input/indent.js                     |   71 +
 src/input/input.js                      |  133 +
 src/input/keymap.js                     |  139 +
 src/input/keynames.js                   |   17 +
 src/line/highlight.js                   |  204 +
 src/line/line_data.js                   |  330 +
 src/line/pos.js                         |   35 +
 src/line/saw_special_spans.js           |   10 +
 src/line/spans.js                       |  362 +
 src/line/utils_line.js                  |   83 +
 src/measurement/position_measurement.js |  580 ++
 src/measurement/update_line.js          |  189 +
 src/measurement/widgets.js              |   26 +
 src/model/Doc.js                        |  384 +
 src/model/change_measurement.js         |   61 +
 src/model/changes.js                    |  329 +
 src/model/chunk.js                      |  157 +
 src/model/document_data.js              |   97 +
 src/model/history.js                    |  224 +
 src/model/line_widget.js                |   67 +
 src/model/mark_text.js                  |  288 +
 src/model/selection.js                  |   79 +
 src/model/selection_updates.js          |  205 +
 src/modes.js                            |   95 +
 src/util/StringStream.js                |   80 +
 src/util/bidi.js                        |  274 +
 src/util/browser.js                     |   31 +
 src/util/dom.js                         |   89 +
 src/util/event.js                       |  102 +
 src/util/feature_detection.js           |   83 +
 src/util/misc.js                        |  126 +
 src/util/operation_group.js             |   73 +
 65 files changed, 9460 insertions(+), 8967 deletions(-)
 delete mode 100644 lib/codemirror.js
 create mode 100644 src/banner.js
 create mode 100644 src/codemirror.js
 create mode 100644 src/display/Display.js
 create mode 100644 src/display/focus.js
 create mode 100644 src/display/gutters.js
 create mode 100644 src/display/highlight_worker.js
 create mode 100644 src/display/line_numbers.js
 create mode 100644 src/display/mode_state.js
 create mode 100644 src/display/operations.js
 create mode 100644 src/display/scroll_events.js
 create mode 100644 src/display/scrollbars.js
 create mode 100644 src/display/scrolling.js
 create mode 100644 src/display/selection.js
 create mode 100644 src/display/update_display.js
 create mode 100644 src/display/update_lines.js
 create mode 100644 src/display/view_tracking.js
 create mode 100644 src/edit/CodeMirror.js
 create mode 100644 src/edit/commands.js
 create mode 100644 src/edit/deleteNearSelection.js
 create mode 100644 src/edit/drop_events.js
 create mode 100644 src/edit/fromTextArea.js
 create mode 100644 src/edit/global_events.js
 create mode 100644 src/edit/key_events.js
 create mode 100644 src/edit/legacy.js
 create mode 100644 src/edit/main.js
 create mode 100644 src/edit/methods.js
 create mode 100644 src/edit/mouse_events.js
 create mode 100644 src/edit/options.js
 create mode 100644 src/edit/utils.js
 create mode 100644 src/input/ContentEditableInput.js
 create mode 100644 src/input/TextareaInput.js
 create mode 100644 src/input/indent.js
 create mode 100644 src/input/input.js
 create mode 100644 src/input/keymap.js
 create mode 100644 src/input/keynames.js
 create mode 100644 src/line/highlight.js
 create mode 100644 src/line/line_data.js
 create mode 100644 src/line/pos.js
 create mode 100644 src/line/saw_special_spans.js
 create mode 100644 src/line/spans.js
 create mode 100644 src/line/utils_line.js
 create mode 100644 src/measurement/position_measurement.js
 create mode 100644 src/measurement/update_line.js
 create mode 100644 src/measurement/widgets.js
 create mode 100644 src/model/Doc.js
 create mode 100644 src/model/change_measurement.js
 create mode 100644 src/model/changes.js
 create mode 100644 src/model/chunk.js
 create mode 100644 src/model/document_data.js
 create mode 100644 src/model/history.js
 create mode 100644 src/model/line_widget.js
 create mode 100644 src/model/mark_text.js
 create mode 100644 src/model/selection.js
 create mode 100644 src/model/selection_updates.js
 create mode 100644 src/modes.js
 create mode 100644 src/util/StringStream.js
 create mode 100644 src/util/bidi.js
 create mode 100644 src/util/browser.js
 create mode 100644 src/util/dom.js
 create mode 100644 src/util/event.js
 create mode 100644 src/util/feature_detection.js
 create mode 100644 src/util/misc.js
 create mode 100644 src/util/operation_group.js

diff --git a/lib/codemirror.js b/lib/codemirror.js
deleted file mode 100644
index ececc94c23..0000000000
--- a/lib/codemirror.js
+++ /dev/null
@@ -1,8966 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// This is CodeMirror (http://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    module.exports = mod();
-  else if (typeof define == "function" && define.amd) // AMD
-    return define([], mod);
-  else // Plain browser env
-    (this || window).CodeMirror = mod();
-})(function() {
-  "use strict";
-
-  // BROWSER SNIFFING
-
-  // Kludges for bugs and behavior differences that can't be feature
-  // detected are enabled based on userAgent etc sniffing.
-  var userAgent = navigator.userAgent;
-  var platform = navigator.platform;
-
-  var gecko = /gecko\/\d/i.test(userAgent);
-  var ie_upto10 = /MSIE \d/.test(userAgent);
-  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
-  var ie = ie_upto10 || ie_11up;
-  var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
-  var webkit = /WebKit\//.test(userAgent);
-  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
-  var chrome = /Chrome\//.test(userAgent);
-  var presto = /Opera\//.test(userAgent);
-  var safari = /Apple Computer/.test(navigator.vendor);
-  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
-  var phantom = /PhantomJS/.test(userAgent);
-
-  var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
-  // This is woefully incomplete. Suggestions for alternative methods welcome.
-  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
-  var mac = ios || /Mac/.test(platform);
-  var chromeOS = /\bCrOS\b/.test(userAgent);
-  var windows = /win/i.test(platform);
-
-  var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
-  if (presto_version) presto_version = Number(presto_version[1]);
-  if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
-  // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-  var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
-  var captureRightClick = gecko || (ie && ie_version >= 9);
-
-  // Optimize some code when these features are not used.
-  var sawReadOnlySpans = false, sawCollapsedSpans = false;
-
-  // EDITOR CONSTRUCTOR
-
-  // A CodeMirror instance represents an editor. This is the object
-  // that user code is usually dealing with.
-
-  function CodeMirror(place, options) {
-    if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
-
-    this.options = options = options ? copyObj(options) : {};
-    // Determine effective options based on given values and defaults.
-    copyObj(defaults, options, false);
-    setGuttersForLineNumbers(options);
-
-    var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator);
-    this.doc = doc;
-
-    var input = new CodeMirror.inputStyles[options.inputStyle](this);
-    var display = this.display = new Display(place, doc, input);
-    display.wrapper.CodeMirror = this;
-    updateGutters(this);
-    themeChanged(this);
-    if (options.lineWrapping)
-      this.display.wrapper.className += " CodeMirror-wrap";
-    if (options.autofocus && !mobile) display.input.focus();
-    initScrollbars(this);
-
-    this.state = {
-      keyMaps: [],  // stores maps added by addKeyMap
-      overlays: [], // highlighting overlays, as added by addOverlay
-      modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
-      overwrite: false,
-      delayingBlurEvent: false,
-      focused: false,
-      suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
-      pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
-      selectingText: false,
-      draggingText: false,
-      highlight: new Delayed(), // stores highlight worker timeout
-      keySeq: null,  // Unfinished key sequence
-      specialChars: null
-    };
-
-    var cm = this;
-
-    // Override magic textarea content restore that IE sometimes does
-    // on our hidden textarea on reload
-    if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20);
-
-    registerEventHandlers(this);
-    ensureGlobalHandlers();
-
-    startOperation(this);
-    this.curOp.forceUpdate = true;
-    attachDoc(this, doc);
-
-    if ((options.autofocus && !mobile) || cm.hasFocus())
-      setTimeout(bind(onFocus, this), 20);
-    else
-      onBlur(this);
-
-    for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
-      optionHandlers[opt](this, options[opt], Init);
-    maybeUpdateLineNumberWidth(this);
-    if (options.finishInit) options.finishInit(this);
-    for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
-    endOperation(this);
-    // Suppress optimizelegibility in Webkit, since it breaks text
-    // measuring on line wrapping boundaries.
-    if (webkit && options.lineWrapping &&
-        getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
-      display.lineDiv.style.textRendering = "auto";
-  }
-
-  // DISPLAY CONSTRUCTOR
-
-  // The display handles the DOM integration, both for input reading
-  // and content drawing. It holds references to DOM nodes and
-  // display-related state.
-
-  function Display(place, doc, input) {
-    var d = this;
-    this.input = input;
-
-    // Covers bottom-right square when both scrollbars are present.
-    d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
-    d.scrollbarFiller.setAttribute("cm-not-content", "true");
-    // Covers bottom of gutter when coverGutterNextToScrollbar is on
-    // and h scrollbar is present.
-    d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
-    d.gutterFiller.setAttribute("cm-not-content", "true");
-    // Will contain the actual code, positioned to cover the viewport.
-    d.lineDiv = elt("div", null, "CodeMirror-code");
-    // Elements are added to these to represent selection and cursors.
-    d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
-    d.cursorDiv = elt("div", null, "CodeMirror-cursors");
-    // A visibility: hidden element used to find the size of things.
-    d.measure = elt("div", null, "CodeMirror-measure");
-    // When lines outside of the viewport are measured, they are drawn in this.
-    d.lineMeasure = elt("div", null, "CodeMirror-measure");
-    // Wraps everything that needs to exist inside the vertically-padded coordinate system
-    d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
-                      null, "position: relative; outline: none");
-    // Moved around its parent to cover visible view.
-    d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
-    // Set to the height of the document, allowing scrolling.
-    d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
-    d.sizerWidth = null;
-    // Behavior of elts with overflow: auto and padding is
-    // inconsistent across browsers. This is used to ensure the
-    // scrollable area is big enough.
-    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
-    // Will contain the gutters, if any.
-    d.gutters = elt("div", null, "CodeMirror-gutters");
-    d.lineGutter = null;
-    // Actual scrollable element.
-    d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
-    d.scroller.setAttribute("tabIndex", "-1");
-    // The element in which the editor lives.
-    d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
-
-    // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
-    if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-    if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
-
-    if (place) {
-      if (place.appendChild) place.appendChild(d.wrapper);
-      else place(d.wrapper);
-    }
-
-    // Current rendered range (may be bigger than the view window).
-    d.viewFrom = d.viewTo = doc.first;
-    d.reportedViewFrom = d.reportedViewTo = doc.first;
-    // Information about the rendered lines.
-    d.view = [];
-    d.renderedView = null;
-    // Holds info about a single rendered line when it was rendered
-    // for measurement, while not in view.
-    d.externalMeasured = null;
-    // Empty space (in pixels) above the view
-    d.viewOffset = 0;
-    d.lastWrapHeight = d.lastWrapWidth = 0;
-    d.updateLineNumbers = null;
-
-    d.nativeBarWidth = d.barHeight = d.barWidth = 0;
-    d.scrollbarsClipped = false;
-
-    // Used to only resize the line number gutter when necessary (when
-    // the amount of lines crosses a boundary that makes its width change)
-    d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
-    // Set to true when a non-horizontal-scrolling line widget is
-    // added. As an optimization, line widget aligning is skipped when
-    // this is false.
-    d.alignWidgets = false;
-
-    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
-
-    // Tracks the maximum line length so that the horizontal scrollbar
-    // can be kept static when scrolling.
-    d.maxLine = null;
-    d.maxLineLength = 0;
-    d.maxLineChanged = false;
-
-    // Used for measuring wheel scrolling granularity
-    d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
-
-    // True when shift is held down.
-    d.shift = false;
-
-    // Used to track whether anything happened since the context menu
-    // was opened.
-    d.selForContextMenu = null;
-
-    d.activeTouch = null;
-
-    input.init(d);
-  }
-
-  // STATE UPDATES
-
-  // Used to get the editor into a consistent state again when options change.
-
-  function loadMode(cm) {
-    cm.doc.mode = CodeMirror.getMode(cm.options, cm.doc.modeOption);
-    resetModeState(cm);
-  }
-
-  function resetModeState(cm) {
-    cm.doc.iter(function(line) {
-      if (line.stateAfter) line.stateAfter = null;
-      if (line.styles) line.styles = null;
-    });
-    cm.doc.frontier = cm.doc.first;
-    startWorker(cm, 100);
-    cm.state.modeGen++;
-    if (cm.curOp) regChange(cm);
-  }
-
-  function wrappingChanged(cm) {
-    if (cm.options.lineWrapping) {
-      addClass(cm.display.wrapper, "CodeMirror-wrap");
-      cm.display.sizer.style.minWidth = "";
-      cm.display.sizerWidth = null;
-    } else {
-      rmClass(cm.display.wrapper, "CodeMirror-wrap");
-      findMaxLine(cm);
-    }
-    estimateLineHeights(cm);
-    regChange(cm);
-    clearCaches(cm);
-    setTimeout(function(){updateScrollbars(cm);}, 100);
-  }
-
-  // Returns a function that estimates the height of a line, to use as
-  // first approximation until the line becomes visible (and is thus
-  // properly measurable).
-  function estimateHeight(cm) {
-    var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
-    var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
-    return function(line) {
-      if (lineIsHidden(cm.doc, line)) return 0;
-
-      var widgetsHeight = 0;
-      if (line.widgets) for (var i = 0; i < line.widgets.length; i++) {
-        if (line.widgets[i].height) widgetsHeight += line.widgets[i].height;
-      }
-
-      if (wrapping)
-        return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th;
-      else
-        return widgetsHeight + th;
-    };
-  }
-
-  function estimateLineHeights(cm) {
-    var doc = cm.doc, est = estimateHeight(cm);
-    doc.iter(function(line) {
-      var estHeight = est(line);
-      if (estHeight != line.height) updateLineHeight(line, estHeight);
-    });
-  }
-
-  function themeChanged(cm) {
-    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
-      cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
-    clearCaches(cm);
-  }
-
-  function guttersChanged(cm) {
-    updateGutters(cm);
-    regChange(cm);
-    setTimeout(function(){alignHorizontally(cm);}, 20);
-  }
-
-  // Rebuild the gutter elements, ensure the margin to the left of the
-  // code matches their width.
-  function updateGutters(cm) {
-    var gutters = cm.display.gutters, specs = cm.options.gutters;
-    removeChildren(gutters);
-    for (var i = 0; i < specs.length; ++i) {
-      var gutterClass = specs[i];
-      var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass));
-      if (gutterClass == "CodeMirror-linenumbers") {
-        cm.display.lineGutter = gElt;
-        gElt.style.width = (cm.display.lineNumWidth || 1) + "px";
-      }
-    }
-    gutters.style.display = i ? "" : "none";
-    updateGutterSpace(cm);
-  }
-
-  function updateGutterSpace(cm) {
-    var width = cm.display.gutters.offsetWidth;
-    cm.display.sizer.style.marginLeft = width + "px";
-  }
-
-  // Compute the character length of a line, taking into account
-  // collapsed ranges (see markText) that might hide parts, and join
-  // other lines onto it.
-  function lineLength(line) {
-    if (line.height == 0) return 0;
-    var len = line.text.length, merged, cur = line;
-    while (merged = collapsedSpanAtStart(cur)) {
-      var found = merged.find(0, true);
-      cur = found.from.line;
-      len += found.from.ch - found.to.ch;
-    }
-    cur = line;
-    while (merged = collapsedSpanAtEnd(cur)) {
-      var found = merged.find(0, true);
-      len -= cur.text.length - found.from.ch;
-      cur = found.to.line;
-      len += cur.text.length - found.to.ch;
-    }
-    return len;
-  }
-
-  // Find the longest line in the document.
-  function findMaxLine(cm) {
-    var d = cm.display, doc = cm.doc;
-    d.maxLine = getLine(doc, doc.first);
-    d.maxLineLength = lineLength(d.maxLine);
-    d.maxLineChanged = true;
-    doc.iter(function(line) {
-      var len = lineLength(line);
-      if (len > d.maxLineLength) {
-        d.maxLineLength = len;
-        d.maxLine = line;
-      }
-    });
-  }
-
-  // Make sure the gutters options contains the element
-  // "CodeMirror-linenumbers" when the lineNumbers option is true.
-  function setGuttersForLineNumbers(options) {
-    var found = indexOf(options.gutters, "CodeMirror-linenumbers");
-    if (found == -1 && options.lineNumbers) {
-      options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
-    } else if (found > -1 && !options.lineNumbers) {
-      options.gutters = options.gutters.slice(0);
-      options.gutters.splice(found, 1);
-    }
-  }
-
-  // SCROLLBARS
-
-  // Prepare DOM reads needed to update the scrollbars. Done in one
-  // shot to minimize update/measure roundtrips.
-  function measureForScrollbars(cm) {
-    var d = cm.display, gutterW = d.gutters.offsetWidth;
-    var docH = Math.round(cm.doc.height + paddingVert(cm.display));
-    return {
-      clientHeight: d.scroller.clientHeight,
-      viewHeight: d.wrapper.clientHeight,
-      scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
-      viewWidth: d.wrapper.clientWidth,
-      barLeft: cm.options.fixedGutter ? gutterW : 0,
-      docHeight: docH,
-      scrollHeight: docH + scrollGap(cm) + d.barHeight,
-      nativeBarWidth: d.nativeBarWidth,
-      gutterWidth: gutterW
-    };
-  }
-
-  function NativeScrollbars(place, scroll, cm) {
-    this.cm = cm;
-    var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
-    var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
-    place(vert); place(horiz);
-
-    on(vert, "scroll", function() {
-      if (vert.clientHeight) scroll(vert.scrollTop, "vertical");
-    });
-    on(horiz, "scroll", function() {
-      if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
-    });
-
-    this.checkedZeroWidth = false;
-    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
-  }
-
-  NativeScrollbars.prototype = copyObj({
-    update: function(measure) {
-      var needsH = measure.scrollWidth > measure.clientWidth + 1;
-      var needsV = measure.scrollHeight > measure.clientHeight + 1;
-      var sWidth = measure.nativeBarWidth;
-
-      if (needsV) {
-        this.vert.style.display = "block";
-        this.vert.style.bottom = needsH ? sWidth + "px" : "0";
-        var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
-        // A bug in IE8 can cause this value to be negative, so guard it.
-        this.vert.firstChild.style.height =
-          Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
-      } else {
-        this.vert.style.display = "";
-        this.vert.firstChild.style.height = "0";
-      }
-
-      if (needsH) {
-        this.horiz.style.display = "block";
-        this.horiz.style.right = needsV ? sWidth + "px" : "0";
-        this.horiz.style.left = measure.barLeft + "px";
-        var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
-        this.horiz.firstChild.style.width =
-          (measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
-      } else {
-        this.horiz.style.display = "";
-        this.horiz.firstChild.style.width = "0";
-      }
-
-      if (!this.checkedZeroWidth && measure.clientHeight > 0) {
-        if (sWidth == 0) this.zeroWidthHack();
-        this.checkedZeroWidth = true;
-      }
-
-      return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
-    },
-    setScrollLeft: function(pos) {
-      if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
-      if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz);
-    },
-    setScrollTop: function(pos) {
-      if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
-      if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert);
-    },
-    zeroWidthHack: function() {
-      var w = mac && !mac_geMountainLion ? "12px" : "18px";
-      this.horiz.style.height = this.vert.style.width = w;
-      this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
-      this.disableHoriz = new Delayed;
-      this.disableVert = new Delayed;
-    },
-    enableZeroWidthBar: function(bar, delay) {
-      bar.style.pointerEvents = "auto";
-      function maybeDisable() {
-        // To find out whether the scrollbar is still visible, we
-        // check whether the element under the pixel in the bottom
-        // left corner of the scrollbar box is the scrollbar box
-        // itself (when the bar is still visible) or its filler child
-        // (when the bar is hidden). If it is still visible, we keep
-        // it enabled, if it's hidden, we disable pointer events.
-        var box = bar.getBoundingClientRect();
-        var elt = document.elementFromPoint(box.left + 1, box.bottom - 1);
-        if (elt != bar) bar.style.pointerEvents = "none";
-        else delay.set(1000, maybeDisable);
-      }
-      delay.set(1000, maybeDisable);
-    },
-    clear: function() {
-      var parent = this.horiz.parentNode;
-      parent.removeChild(this.horiz);
-      parent.removeChild(this.vert);
-    }
-  }, NativeScrollbars.prototype);
-
-  function NullScrollbars() {}
-
-  NullScrollbars.prototype = copyObj({
-    update: function() { return {bottom: 0, right: 0}; },
-    setScrollLeft: function() {},
-    setScrollTop: function() {},
-    clear: function() {}
-  }, NullScrollbars.prototype);
-
-  CodeMirror.scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
-
-  function initScrollbars(cm) {
-    if (cm.display.scrollbars) {
-      cm.display.scrollbars.clear();
-      if (cm.display.scrollbars.addClass)
-        rmClass(cm.display.wrapper, cm.display.scrollbars.addClass);
-    }
-
-    cm.display.scrollbars = new CodeMirror.scrollbarModel[cm.options.scrollbarStyle](function(node) {
-      cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
-      // Prevent clicks in the scrollbars from killing focus
-      on(node, "mousedown", function() {
-        if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
-      });
-      node.setAttribute("cm-not-content", "true");
-    }, function(pos, axis) {
-      if (axis == "horizontal") setScrollLeft(cm, pos);
-      else setScrollTop(cm, pos);
-    }, cm);
-    if (cm.display.scrollbars.addClass)
-      addClass(cm.display.wrapper, cm.display.scrollbars.addClass);
-  }
-
-  function updateScrollbars(cm, measure) {
-    if (!measure) measure = measureForScrollbars(cm);
-    var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
-    updateScrollbarsInner(cm, measure);
-    for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
-      if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
-        updateHeightsInViewport(cm);
-      updateScrollbarsInner(cm, measureForScrollbars(cm));
-      startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
-    }
-  }
-
-  // Re-synchronize the fake scrollbars with the actual size of the
-  // content.
-  function updateScrollbarsInner(cm, measure) {
-    var d = cm.display;
-    var sizes = d.scrollbars.update(measure);
-
-    d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
-    d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
-    d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
-
-    if (sizes.right && sizes.bottom) {
-      d.scrollbarFiller.style.display = "block";
-      d.scrollbarFiller.style.height = sizes.bottom + "px";
-      d.scrollbarFiller.style.width = sizes.right + "px";
-    } else d.scrollbarFiller.style.display = "";
-    if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
-      d.gutterFiller.style.display = "block";
-      d.gutterFiller.style.height = sizes.bottom + "px";
-      d.gutterFiller.style.width = measure.gutterWidth + "px";
-    } else d.gutterFiller.style.display = "";
-  }
-
-  // Compute the lines that are visible in a given viewport (defaults
-  // the the current scroll position). viewport may contain top,
-  // height, and ensure (see op.scrollToPos) properties.
-  function visibleLines(display, doc, viewport) {
-    var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
-    top = Math.floor(top - paddingTop(display));
-    var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
-
-    var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
-    // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
-    // forces those lines into the viewport (if possible).
-    if (viewport && viewport.ensure) {
-      var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
-      if (ensureFrom < from) {
-        from = ensureFrom;
-        to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
-      } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
-        from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
-        to = ensureTo;
-      }
-    }
-    return {from: from, to: Math.max(to, from + 1)};
-  }
-
-  // LINE NUMBERS
-
-  // Re-align line numbers and gutter marks to compensate for
-  // horizontal scrolling.
-  function alignHorizontally(cm) {
-    var display = cm.display, view = display.view;
-    if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
-    var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
-    var gutterW = display.gutters.offsetWidth, left = comp + "px";
-    for (var i = 0; i < view.length; i++) if (!view[i].hidden) {
-      if (cm.options.fixedGutter) {
-        if (view[i].gutter)
-          view[i].gutter.style.left = left;
-        if (view[i].gutterBackground)
-          view[i].gutterBackground.style.left = left;
-      }
-      var align = view[i].alignable;
-      if (align) for (var j = 0; j < align.length; j++)
-        align[j].style.left = left;
-    }
-    if (cm.options.fixedGutter)
-      display.gutters.style.left = (comp + gutterW) + "px";
-  }
-
-  // Used to ensure that the line number gutter is still the right
-  // size for the current document size. Returns true when an update
-  // is needed.
-  function maybeUpdateLineNumberWidth(cm) {
-    if (!cm.options.lineNumbers) return false;
-    var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
-    if (last.length != display.lineNumChars) {
-      var test = display.measure.appendChild(elt("div", [elt("div", last)],
-                                                 "CodeMirror-linenumber CodeMirror-gutter-elt"));
-      var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
-      display.lineGutter.style.width = "";
-      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
-      display.lineNumWidth = display.lineNumInnerWidth + padding;
-      display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
-      display.lineGutter.style.width = display.lineNumWidth + "px";
-      updateGutterSpace(cm);
-      return true;
-    }
-    return false;
-  }
-
-  function lineNumberFor(options, i) {
-    return String(options.lineNumberFormatter(i + options.firstLineNumber));
-  }
-
-  // Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
-  // but using getBoundingClientRect to get a sub-pixel-accurate
-  // result.
-  function compensateForHScroll(display) {
-    return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left;
-  }
-
-  // DISPLAY DRAWING
-
-  function DisplayUpdate(cm, viewport, force) {
-    var display = cm.display;
-
-    this.viewport = viewport;
-    // Store some values that we'll need later (but don't want to force a relayout for)
-    this.visible = visibleLines(display, cm.doc, viewport);
-    this.editorIsHidden = !display.wrapper.offsetWidth;
-    this.wrapperHeight = display.wrapper.clientHeight;
-    this.wrapperWidth = display.wrapper.clientWidth;
-    this.oldDisplayWidth = displayWidth(cm);
-    this.force = force;
-    this.dims = getDimensions(cm);
-    this.events = [];
-  }
-
-  DisplayUpdate.prototype.signal = function(emitter, type) {
-    if (hasHandler(emitter, type))
-      this.events.push(arguments);
-  };
-  DisplayUpdate.prototype.finish = function() {
-    for (var i = 0; i < this.events.length; i++)
-      signal.apply(null, this.events[i]);
-  };
-
-  function maybeClipScrollbars(cm) {
-    var display = cm.display;
-    if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
-      display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
-      display.heightForcer.style.height = scrollGap(cm) + "px";
-      display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
-      display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
-      display.scrollbarsClipped = true;
-    }
-  }
-
-  // Does the actual updating of the line display. Bails out
-  // (returning false) when there is nothing to be done and forced is
-  // false.
-  function updateDisplayIfNeeded(cm, update) {
-    var display = cm.display, doc = cm.doc;
-
-    if (update.editorIsHidden) {
-      resetView(cm);
-      return false;
-    }
-
-    // Bail out if the visible area is already rendered and nothing changed.
-    if (!update.force &&
-        update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
-        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
-        display.renderedView == display.view && countDirtyView(cm) == 0)
-      return false;
-
-    if (maybeUpdateLineNumberWidth(cm)) {
-      resetView(cm);
-      update.dims = getDimensions(cm);
-    }
-
-    // Compute a suitable new viewport (from & to)
-    var end = doc.first + doc.size;
-    var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
-    var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
-    if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
-    if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
-    if (sawCollapsedSpans) {
-      from = visualLineNo(cm.doc, from);
-      to = visualLineEndNo(cm.doc, to);
-    }
-
-    var different = from != display.viewFrom || to != display.viewTo ||
-      display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
-    adjustView(cm, from, to);
-
-    display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
-    // Position the mover div to align with the current scroll position
-    cm.display.mover.style.top = display.viewOffset + "px";
-
-    var toUpdate = countDirtyView(cm);
-    if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
-        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
-      return false;
-
-    // For big changes, we hide the enclosing element during the
-    // update, since that speeds up the operations on most browsers.
-    var focused = activeElt();
-    if (toUpdate > 4) display.lineDiv.style.display = "none";
-    patchDisplay(cm, display.updateLineNumbers, update.dims);
-    if (toUpdate > 4) display.lineDiv.style.display = "";
-    display.renderedView = display.view;
-    // There might have been a widget with a focused element that got
-    // hidden or updated, if so re-focus it.
-    if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
-
-    // Prevent selection and cursors from interfering with the scroll
-    // width and height.
-    removeChildren(display.cursorDiv);
-    removeChildren(display.selectionDiv);
-    display.gutters.style.height = display.sizer.style.minHeight = 0;
-
-    if (different) {
-      display.lastWrapHeight = update.wrapperHeight;
-      display.lastWrapWidth = update.wrapperWidth;
-      startWorker(cm, 400);
-    }
-
-    display.updateLineNumbers = null;
-
-    return true;
-  }
-
-  function postUpdateDisplay(cm, update) {
-    var viewport = update.viewport;
-
-    for (var first = true;; first = false) {
-      if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
-        // Clip forced viewport to actual scrollable area.
-        if (viewport && viewport.top != null)
-          viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
-        // Updated line heights might result in the drawn area not
-        // actually covering the viewport. Keep looping until it does.
-        update.visible = visibleLines(cm.display, cm.doc, viewport);
-        if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
-          break;
-      }
-      if (!updateDisplayIfNeeded(cm, update)) break;
-      updateHeightsInViewport(cm);
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      updateScrollbars(cm, barMeasure);
-      setDocumentHeight(cm, barMeasure);
-    }
-
-    update.signal(cm, "update", cm);
-    if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
-      update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
-      cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
-    }
-  }
-
-  function updateDisplaySimple(cm, viewport) {
-    var update = new DisplayUpdate(cm, viewport);
-    if (updateDisplayIfNeeded(cm, update)) {
-      updateHeightsInViewport(cm);
-      postUpdateDisplay(cm, update);
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      updateScrollbars(cm, barMeasure);
-      setDocumentHeight(cm, barMeasure);
-      update.finish();
-    }
-  }
-
-  function setDocumentHeight(cm, measure) {
-    cm.display.sizer.style.minHeight = measure.docHeight + "px";
-    cm.display.heightForcer.style.top = measure.docHeight + "px";
-    cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
-  }
-
-  // Read the actual heights of the rendered lines, and update their
-  // stored heights to match.
-  function updateHeightsInViewport(cm) {
-    var display = cm.display;
-    var prevBottom = display.lineDiv.offsetTop;
-    for (var i = 0; i < display.view.length; i++) {
-      var cur = display.view[i], height;
-      if (cur.hidden) continue;
-      if (ie && ie_version < 8) {
-        var bot = cur.node.offsetTop + cur.node.offsetHeight;
-        height = bot - prevBottom;
-        prevBottom = bot;
-      } else {
-        var box = cur.node.getBoundingClientRect();
-        height = box.bottom - box.top;
-      }
-      var diff = cur.line.height - height;
-      if (height < 2) height = textHeight(display);
-      if (diff > .001 || diff < -.001) {
-        updateLineHeight(cur.line, height);
-        updateWidgetHeight(cur.line);
-        if (cur.rest) for (var j = 0; j < cur.rest.length; j++)
-          updateWidgetHeight(cur.rest[j]);
-      }
-    }
-  }
-
-  // Read and store the height of line widgets associated with the
-  // given line.
-  function updateWidgetHeight(line) {
-    if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
-      line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight;
-  }
-
-  // Do a bulk-read of the DOM positions and sizes needed to draw the
-  // view, so that we don't interleave reading and writing to the DOM.
-  function getDimensions(cm) {
-    var d = cm.display, left = {}, width = {};
-    var gutterLeft = d.gutters.clientLeft;
-    for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-      left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
-      width[cm.options.gutters[i]] = n.clientWidth;
-    }
-    return {fixedPos: compensateForHScroll(d),
-            gutterTotalWidth: d.gutters.offsetWidth,
-            gutterLeft: left,
-            gutterWidth: width,
-            wrapperWidth: d.wrapper.clientWidth};
-  }
-
-  // Sync the actual display DOM structure with display.view, removing
-  // nodes for lines that are no longer in view, and creating the ones
-  // that are not there yet, and updating the ones that are out of
-  // date.
-  function patchDisplay(cm, updateNumbersFrom, dims) {
-    var display = cm.display, lineNumbers = cm.options.lineNumbers;
-    var container = display.lineDiv, cur = container.firstChild;
-
-    function rm(node) {
-      var next = node.nextSibling;
-      // Works around a throw-scroll bug in OS X Webkit
-      if (webkit && mac && cm.display.currentWheelTarget == node)
-        node.style.display = "none";
-      else
-        node.parentNode.removeChild(node);
-      return next;
-    }
-
-    var view = display.view, lineN = display.viewFrom;
-    // Loop over the elements in the view, syncing cur (the DOM nodes
-    // in display.lineDiv) with the view as we go.
-    for (var i = 0; i < view.length; i++) {
-      var lineView = view[i];
-      if (lineView.hidden) {
-      } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
-        var node = buildLineElement(cm, lineView, lineN, dims);
-        container.insertBefore(node, cur);
-      } else { // Already drawn
-        while (cur != lineView.node) cur = rm(cur);
-        var updateNumber = lineNumbers && updateNumbersFrom != null &&
-          updateNumbersFrom <= lineN && lineView.lineNumber;
-        if (lineView.changes) {
-          if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false;
-          updateLineForChanges(cm, lineView, lineN, dims);
-        }
-        if (updateNumber) {
-          removeChildren(lineView.lineNumber);
-          lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
-        }
-        cur = lineView.node.nextSibling;
-      }
-      lineN += lineView.size;
-    }
-    while (cur) cur = rm(cur);
-  }
-
-  // When an aspect of a line changes, a string is added to
-  // lineView.changes. This updates the relevant part of the line's
-  // DOM structure.
-  function updateLineForChanges(cm, lineView, lineN, dims) {
-    for (var j = 0; j < lineView.changes.length; j++) {
-      var type = lineView.changes[j];
-      if (type == "text") updateLineText(cm, lineView);
-      else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
-      else if (type == "class") updateLineClasses(lineView);
-      else if (type == "widget") updateLineWidgets(cm, lineView, dims);
-    }
-    lineView.changes = null;
-  }
-
-  // Lines with gutter elements, widgets or a background class need to
-  // be wrapped, and have the extra elements added to the wrapper div
-  function ensureLineWrapped(lineView) {
-    if (lineView.node == lineView.text) {
-      lineView.node = elt("div", null, null, "position: relative");
-      if (lineView.text.parentNode)
-        lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
-      lineView.node.appendChild(lineView.text);
-      if (ie && ie_version < 8) lineView.node.style.zIndex = 2;
-    }
-    return lineView.node;
-  }
-
-  function updateLineBackground(lineView) {
-    var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
-    if (cls) cls += " CodeMirror-linebackground";
-    if (lineView.background) {
-      if (cls) lineView.background.className = cls;
-      else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
-    } else if (cls) {
-      var wrap = ensureLineWrapped(lineView);
-      lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
-    }
-  }
-
-  // Wrapper around buildLineContent which will reuse the structure
-  // in display.externalMeasured when possible.
-  function getLineContent(cm, lineView) {
-    var ext = cm.display.externalMeasured;
-    if (ext && ext.line == lineView.line) {
-      cm.display.externalMeasured = null;
-      lineView.measure = ext.measure;
-      return ext.built;
-    }
-    return buildLineContent(cm, lineView);
-  }
-
-  // Redraw the line's text. Interacts with the background and text
-  // classes because the mode may output tokens that influence these
-  // classes.
-  function updateLineText(cm, lineView) {
-    var cls = lineView.text.className;
-    var built = getLineContent(cm, lineView);
-    if (lineView.text == lineView.node) lineView.node = built.pre;
-    lineView.text.parentNode.replaceChild(built.pre, lineView.text);
-    lineView.text = built.pre;
-    if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
-      lineView.bgClass = built.bgClass;
-      lineView.textClass = built.textClass;
-      updateLineClasses(lineView);
-    } else if (cls) {
-      lineView.text.className = cls;
-    }
-  }
-
-  function updateLineClasses(lineView) {
-    updateLineBackground(lineView);
-    if (lineView.line.wrapClass)
-      ensureLineWrapped(lineView).className = lineView.line.wrapClass;
-    else if (lineView.node != lineView.text)
-      lineView.node.className = "";
-    var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
-    lineView.text.className = textClass || "";
-  }
-
-  function updateLineGutter(cm, lineView, lineN, dims) {
-    if (lineView.gutter) {
-      lineView.node.removeChild(lineView.gutter);
-      lineView.gutter = null;
-    }
-    if (lineView.gutterBackground) {
-      lineView.node.removeChild(lineView.gutterBackground);
-      lineView.gutterBackground = null;
-    }
-    if (lineView.line.gutterClass) {
-      var wrap = ensureLineWrapped(lineView);
-      lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
-                                      "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
-                                      "px; width: " + dims.gutterTotalWidth + "px");
-      wrap.insertBefore(lineView.gutterBackground, lineView.text);
-    }
-    var markers = lineView.line.gutterMarkers;
-    if (cm.options.lineNumbers || markers) {
-      var wrap = ensureLineWrapped(lineView);
-      var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
-                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px");
-      cm.display.input.setUneditable(gutterWrap);
-      wrap.insertBefore(gutterWrap, lineView.text);
-      if (lineView.line.gutterClass)
-        gutterWrap.className += " " + lineView.line.gutterClass;
-      if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
-        lineView.lineNumber = gutterWrap.appendChild(
-          elt("div", lineNumberFor(cm.options, lineN),
-              "CodeMirror-linenumber CodeMirror-gutter-elt",
-              "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
-              + cm.display.lineNumInnerWidth + "px"));
-      if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) {
-        var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
-        if (found)
-          gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
-                                     dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"));
-      }
-    }
-  }
-
-  function updateLineWidgets(cm, lineView, dims) {
-    if (lineView.alignable) lineView.alignable = null;
-    for (var node = lineView.node.firstChild, next; node; node = next) {
-      var next = node.nextSibling;
-      if (node.className == "CodeMirror-linewidget")
-        lineView.node.removeChild(node);
-    }
-    insertLineWidgets(cm, lineView, dims);
-  }
-
-  // Build a line's DOM representation from scratch
-  function buildLineElement(cm, lineView, lineN, dims) {
-    var built = getLineContent(cm, lineView);
-    lineView.text = lineView.node = built.pre;
-    if (built.bgClass) lineView.bgClass = built.bgClass;
-    if (built.textClass) lineView.textClass = built.textClass;
-
-    updateLineClasses(lineView);
-    updateLineGutter(cm, lineView, lineN, dims);
-    insertLineWidgets(cm, lineView, dims);
-    return lineView.node;
-  }
-
-  // A lineView may contain multiple logical lines (when merged by
-  // collapsed spans). The widgets for all of them need to be drawn.
-  function insertLineWidgets(cm, lineView, dims) {
-    insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
-    if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-      insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false);
-  }
-
-  function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
-    if (!line.widgets) return;
-    var wrap = ensureLineWrapped(lineView);
-    for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
-      var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
-      if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
-      positionLineWidget(widget, node, lineView, dims);
-      cm.display.input.setUneditable(node);
-      if (allowAbove && widget.above)
-        wrap.insertBefore(node, lineView.gutter || lineView.text);
-      else
-        wrap.appendChild(node);
-      signalLater(widget, "redraw");
-    }
-  }
-
-  function positionLineWidget(widget, node, lineView, dims) {
-    if (widget.noHScroll) {
-      (lineView.alignable || (lineView.alignable = [])).push(node);
-      var width = dims.wrapperWidth;
-      node.style.left = dims.fixedPos + "px";
-      if (!widget.coverGutter) {
-        width -= dims.gutterTotalWidth;
-        node.style.paddingLeft = dims.gutterTotalWidth + "px";
-      }
-      node.style.width = width + "px";
-    }
-    if (widget.coverGutter) {
-      node.style.zIndex = 5;
-      node.style.position = "relative";
-      if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px";
-    }
-  }
-
-  // POSITION OBJECT
-
-  // A Pos instance represents a position within the text.
-  var Pos = CodeMirror.Pos = function(line, ch) {
-    if (!(this instanceof Pos)) return new Pos(line, ch);
-    this.line = line; this.ch = ch;
-  };
-
-  // Compare two positions, return 0 if they are the same, a negative
-  // number when a is less, and a positive number otherwise.
-  var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; };
-
-  function copyPos(x) {return Pos(x.line, x.ch);}
-  function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
-  function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
-
-  // INPUT HANDLING
-
-  function ensureFocus(cm) {
-    if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
-  }
-
-  // This will be set to a {lineWise: bool, text: [string]} object, so
-  // that, when pasting, we know what kind of selections the copied
-  // text was made out of.
-  var lastCopied = null;
-
-  function applyTextInput(cm, inserted, deleted, sel, origin) {
-    var doc = cm.doc;
-    cm.display.shift = false;
-    if (!sel) sel = doc.sel;
-
-    var paste = cm.state.pasteIncoming || origin == "paste";
-    var textLines = doc.splitLines(inserted), multiPaste = null
-    // When pasing N lines into N selections, insert one line per selection
-    if (paste && sel.ranges.length > 1) {
-      if (lastCopied && lastCopied.text.join("\n") == inserted) {
-        if (sel.ranges.length % lastCopied.text.length == 0) {
-          multiPaste = [];
-          for (var i = 0; i < lastCopied.text.length; i++)
-            multiPaste.push(doc.splitLines(lastCopied.text[i]));
-        }
-      } else if (textLines.length == sel.ranges.length) {
-        multiPaste = map(textLines, function(l) { return [l]; });
-      }
-    }
-
-    // Normal behavior is to insert the new text into every selection
-    for (var i = sel.ranges.length - 1; i >= 0; i--) {
-      var range = sel.ranges[i];
-      var from = range.from(), to = range.to();
-      if (range.empty()) {
-        if (deleted && deleted > 0) // Handle deletion
-          from = Pos(from.line, from.ch - deleted);
-        else if (cm.state.overwrite && !paste) // Handle overwrite
-          to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-        else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
-          from = to = Pos(from.line, 0)
-      }
-      var updateInput = cm.curOp.updateInput;
-      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
-                         origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
-      makeChange(cm.doc, changeEvent);
-      signalLater(cm, "inputRead", cm, changeEvent);
-    }
-    if (inserted && !paste)
-      triggerElectric(cm, inserted);
-
-    ensureCursorVisible(cm);
-    cm.curOp.updateInput = updateInput;
-    cm.curOp.typing = true;
-    cm.state.pasteIncoming = cm.state.cutIncoming = false;
-  }
-
-  function handlePaste(e, cm) {
-    var pasted = e.clipboardData && e.clipboardData.getData("Text");
-    if (pasted) {
-      e.preventDefault();
-      if (!cm.isReadOnly() && !cm.options.disableInput)
-        runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
-      return true;
-    }
-  }
-
-  function triggerElectric(cm, inserted) {
-    // When an 'electric' character is inserted, immediately trigger a reindent
-    if (!cm.options.electricChars || !cm.options.smartIndent) return;
-    var sel = cm.doc.sel;
-
-    for (var i = sel.ranges.length - 1; i >= 0; i--) {
-      var range = sel.ranges[i];
-      if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue;
-      var mode = cm.getModeAt(range.head);
-      var indented = false;
-      if (mode.electricChars) {
-        for (var j = 0; j < mode.electricChars.length; j++)
-          if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
-            indented = indentLine(cm, range.head.line, "smart");
-            break;
-          }
-      } else if (mode.electricInput) {
-        if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
-          indented = indentLine(cm, range.head.line, "smart");
-      }
-      if (indented) signalLater(cm, "electricInput", cm, range.head.line);
-    }
-  }
-
-  function copyableRanges(cm) {
-    var text = [], ranges = [];
-    for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
-      var line = cm.doc.sel.ranges[i].head.line;
-      var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
-      ranges.push(lineRange);
-      text.push(cm.getRange(lineRange.anchor, lineRange.head));
-    }
-    return {text: text, ranges: ranges};
-  }
-
-  function disableBrowserMagic(field, spellcheck) {
-    field.setAttribute("autocorrect", "off");
-    field.setAttribute("autocapitalize", "off");
-    field.setAttribute("spellcheck", !!spellcheck);
-  }
-
-  // TEXTAREA INPUT STYLE
-
-  function TextareaInput(cm) {
-    this.cm = cm;
-    // See input.poll and input.reset
-    this.prevInput = "";
-
-    // Flag that indicates whether we expect input to appear real soon
-    // now (after some event like 'keypress' or 'input') and are
-    // polling intensively.
-    this.pollingFast = false;
-    // Self-resetting timeout for the poller
-    this.polling = new Delayed();
-    // Tracks when input.reset has punted to just putting a short
-    // string into the textarea instead of the full selection.
-    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() {
-    var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");
-    var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The textarea is kept positioned near the cursor to prevent the
-    // fact that it'll be scrolled into view on input from scrolling
-    // our fake cursor out of view. On webkit, when wrap=off, paste is
-    // very slow. So make the area wide instead.
-    if (webkit) te.style.width = "1000px";
-    else te.setAttribute("wrap", "off");
-    // If border: 0; -- iOS fails to open keyboard (issue #1287)
-    if (ios) te.style.border = "1px solid black";
-    disableBrowserMagic(te);
-    return div;
-  }
-
-  TextareaInput.prototype = copyObj({
-    init: function(display) {
-      var input = this, cm = this.cm;
-
-      // Wraps and hides input textarea
-      var div = this.wrapper = hiddenTextarea();
-      // The semihidden textarea that is focused when the editor is
-      // focused, and receives input.
-      var te = this.textarea = div.firstChild;
-      display.wrapper.insertBefore(div, display.wrapper.firstChild);
-
-      // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
-      if (ios) te.style.width = "0px";
-
-      on(te, "input", function() {
-        if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
-        input.poll();
-      });
-
-      on(te, "paste", function(e) {
-        if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
-
-        cm.state.pasteIncoming = true;
-        input.fastPoll();
-      });
-
-      function prepareCopyCut(e) {
-        if (signalDOMEvent(cm, e)) return
-        if (cm.somethingSelected()) {
-          lastCopied = {lineWise: false, text: cm.getSelections()};
-          if (input.inaccurateSelection) {
-            input.prevInput = "";
-            input.inaccurateSelection = false;
-            te.value = lastCopied.text.join("\n");
-            selectInput(te);
-          }
-        } else if (!cm.options.lineWiseCopyCut) {
-          return;
-        } else {
-          var ranges = copyableRanges(cm);
-          lastCopied = {lineWise: true, text: ranges.text};
-          if (e.type == "cut") {
-            cm.setSelections(ranges.ranges, null, sel_dontScroll);
-          } else {
-            input.prevInput = "";
-            te.value = ranges.text.join("\n");
-            selectInput(te);
-          }
-        }
-        if (e.type == "cut") cm.state.cutIncoming = true;
-      }
-      on(te, "cut", prepareCopyCut);
-      on(te, "copy", prepareCopyCut);
-
-      on(display.scroller, "paste", function(e) {
-        if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return;
-        cm.state.pasteIncoming = true;
-        input.focus();
-      });
-
-      // Prevent normal selection in the editor (we handle our own)
-      on(display.lineSpace, "selectstart", function(e) {
-        if (!eventInWidget(display, e)) e_preventDefault(e);
-      });
-
-      on(te, "compositionstart", function() {
-        var start = cm.getCursor("from");
-        if (input.composing) input.composing.range.clear()
-        input.composing = {
-          start: start,
-          range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
-        };
-      });
-      on(te, "compositionend", function() {
-        if (input.composing) {
-          input.poll();
-          input.composing.range.clear();
-          input.composing = null;
-        }
-      });
-    },
-
-    prepareSelection: function() {
-      // Redraw the selection and/or cursor
-      var cm = this.cm, display = cm.display, doc = cm.doc;
-      var result = prepareSelection(cm);
-
-      // Move the hidden textarea near the cursor to prevent scrolling artifacts
-      if (cm.options.moveInputWithCursor) {
-        var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
-        var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
-        result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                            headPos.top + lineOff.top - wrapOff.top));
-        result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                             headPos.left + lineOff.left - wrapOff.left));
-      }
-
-      return result;
-    },
-
-    showSelection: function(drawn) {
-      var cm = this.cm, display = cm.display;
-      removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
-      removeChildrenAndAdd(display.selectionDiv, drawn.selection);
-      if (drawn.teTop != null) {
-        this.wrapper.style.top = drawn.teTop + "px";
-        this.wrapper.style.left = drawn.teLeft + "px";
-      }
-    },
-
-    // Reset the input to correspond to the selection (or to be empty,
-    // when not typing and nothing is selected)
-    reset: function(typing) {
-      if (this.contextMenuPending) return;
-      var minimal, selected, cm = this.cm, doc = cm.doc;
-      if (cm.somethingSelected()) {
-        this.prevInput = "";
-        var range = doc.sel.primary();
-        minimal = hasCopyEvent &&
-          (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
-        var content = minimal ? "-" : selected || cm.getSelection();
-        this.textarea.value = content;
-        if (cm.state.focused) selectInput(this.textarea);
-        if (ie && ie_version >= 9) this.hasSelection = content;
-      } else if (!typing) {
-        this.prevInput = this.textarea.value = "";
-        if (ie && ie_version >= 9) this.hasSelection = null;
-      }
-      this.inaccurateSelection = minimal;
-    },
-
-    getField: function() { return this.textarea; },
-
-    supportsTouch: function() { return false; },
-
-    focus: function() {
-      if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
-        try { this.textarea.focus(); }
-        catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
-      }
-    },
-
-    blur: function() { this.textarea.blur(); },
-
-    resetPosition: function() {
-      this.wrapper.style.top = this.wrapper.style.left = 0;
-    },
-
-    receivedFocus: function() { this.slowPoll(); },
-
-    // Poll for input changes, using the normal rate of polling. This
-    // runs as long as the editor is focused.
-    slowPoll: function() {
-      var input = this;
-      if (input.pollingFast) return;
-      input.polling.set(this.cm.options.pollInterval, function() {
-        input.poll();
-        if (input.cm.state.focused) input.slowPoll();
-      });
-    },
-
-    // When an event has just come in that is likely to add or change
-    // something in the input textarea, we poll faster, to ensure that
-    // the change appears on the screen quickly.
-    fastPoll: function() {
-      var missed = false, input = this;
-      input.pollingFast = true;
-      function p() {
-        var changed = input.poll();
-        if (!changed && !missed) {missed = true; input.polling.set(60, p);}
-        else {input.pollingFast = false; input.slowPoll();}
-      }
-      input.polling.set(20, p);
-    },
-
-    // Read input from the textarea, and update the document to match.
-    // When something is selected, it is present in the textarea, and
-    // selected (unless it is huge, in which case a placeholder is
-    // used). When nothing is selected, the cursor sits after previously
-    // seen text (can be empty), which is stored in prevInput (we must
-    // not reset the textarea when typing, because that breaks IME).
-    poll: function() {
-      var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
-      // Since this is called a *lot*, try to bail out as cheaply as
-      // 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.contextMenuPending || !cm.state.focused ||
-          (hasSelection(input) && !prevInput && !this.composing) ||
-          cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
-        return false;
-
-      var text = input.value;
-      // If nothing changed, bail.
-      if (text == prevInput && !cm.somethingSelected()) return false;
-      // Work around nonsensical selection resetting in IE9/10, and
-      // inexplicable appearance of private area unicode characters on
-      // some key combos in Mac (#2689).
-      if (ie && ie_version >= 9 && this.hasSelection === text ||
-          mac && /[\uf700-\uf7ff]/.test(text)) {
-        cm.display.input.reset();
-        return false;
-      }
-
-      if (cm.doc.sel == cm.display.selForContextMenu) {
-        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);
-      while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-
-      var self = this;
-      runInOp(cm, function() {
-        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;
-    },
-
-    ensurePolled: function() {
-      if (this.pollingFast && this.poll()) this.pollingFast = false;
-    },
-
-    onKeyPress: function() {
-      if (ie && ie_version >= 9) this.hasSelection = null;
-      this.fastPoll();
-    },
-
-    onContextMenu: function(e) {
-      var input = this, cm = input.cm, display = cm.display, te = input.textarea;
-      var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
-      if (!pos || presto) return; // Opera is difficult.
-
-      // Reset the current text selection only if the click is done outside of the selection
-      // and 'resetSelectionOnContextMenu' option is true.
-      var reset = cm.options.resetSelectionOnContextMenu;
-      if (reset && cm.doc.sel.contains(pos) == -1)
-        operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
-
-      var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
-      input.wrapper.style.cssText = "position: absolute"
-      var wrapperBox = input.wrapper.getBoundingClientRect()
-      te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
-        "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
-        (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
-        "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
-      if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
-      display.input.focus();
-      if (webkit) window.scrollTo(null, oldScrollY);
-      display.input.reset();
-      // Adds "Select all" to context menu in FF
-      if (!cm.somethingSelected()) te.value = input.prevInput = " ";
-      input.contextMenuPending = true;
-      display.selForContextMenu = cm.doc.sel;
-      clearTimeout(display.detectingSelectAll);
-
-      // Select-all will be greyed out if there's nothing to select, so
-      // this adds a zero-width space so that we can later check whether
-      // it got selected.
-      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
-          te.value = extval;
-          input.prevInput = selected ? "" : "\u200b";
-          te.selectionStart = 1; te.selectionEnd = extval.length;
-          // Re-set this, in case some other handler touched the
-          // selection in the meantime.
-          display.selForContextMenu = cm.doc.sel;
-        }
-      }
-      function rehide() {
-        input.contextMenuPending = false;
-        input.wrapper.style.cssText = oldWrapperCSS
-        te.style.cssText = oldCSS;
-        if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
-
-        // Try to detect the user choosing select-all
-        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 &&
-                te.selectionEnd > 0 && input.prevInput == "\u200b")
-              operation(cm, commands.selectAll)(cm);
-            else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
-            else display.input.reset();
-          };
-          display.detectingSelectAll = setTimeout(poll, 200);
-        }
-      }
-
-      if (ie && ie_version >= 9) prepareSelectAllHack();
-      if (captureRightClick) {
-        e_stop(e);
-        var mouseup = function() {
-          off(window, "mouseup", mouseup);
-          setTimeout(rehide, 20);
-        };
-        on(window, "mouseup", mouseup);
-      } else {
-        setTimeout(rehide, 50);
-      }
-    },
-
-    readOnlyChanged: function(val) {
-      if (!val) this.reset();
-    },
-
-    setUneditable: nothing,
-
-    needsContentAttribute: false
-  }, TextareaInput.prototype);
-
-  // CONTENTEDITABLE INPUT STYLE
-
-  function ContentEditableInput(cm) {
-    this.cm = cm;
-    this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
-    this.polling = new Delayed();
-    this.gracePeriod = false;
-  }
-
-  ContentEditableInput.prototype = copyObj({
-    init: function(display) {
-      var input = this, cm = input.cm;
-      var div = input.div = display.lineDiv;
-      disableBrowserMagic(div, cm.options.spellcheck);
-
-      on(div, "paste", function(e) {
-        if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
-        // IE doesn't fire input events, so we schedule a read for the pasted content in this way
-        if (ie_version <= 11) setTimeout(operation(cm, function() {
-          if (!input.pollContent()) regChange(cm);
-        }), 20)
-      })
-
-      on(div, "compositionstart", function(e) {
-        var data = e.data;
-        input.composing = {sel: cm.doc.sel, data: data, startData: data};
-        if (!data) return;
-        var prim = cm.doc.sel.primary();
-        var line = cm.getLine(prim.head.line);
-        var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
-        if (found > -1 && found <= prim.head.ch)
-          input.composing.sel = simpleSelection(Pos(prim.head.line, found),
-                                                Pos(prim.head.line, found + data.length));
-      });
-      on(div, "compositionupdate", function(e) {
-        input.composing.data = e.data;
-      });
-      on(div, "compositionend", function(e) {
-        var ours = input.composing;
-        if (!ours) return;
-        if (e.data != ours.startData && !/\u200b/.test(e.data))
-          ours.data = e.data;
-        // Need a small delay to prevent other code (input event,
-        // selection polling) from doing damage when fired right after
-        // compositionend.
-        setTimeout(function() {
-          if (!ours.handled)
-            input.applyComposition(ours);
-          if (input.composing == ours)
-            input.composing = null;
-        }, 50);
-      });
-
-      on(div, "touchstart", function() {
-        input.forceCompositionEnd();
-      });
-
-      on(div, "input", function() {
-        if (input.composing) return;
-        if (cm.isReadOnly() || !input.pollContent())
-          runInOp(input.cm, function() {regChange(cm);});
-      });
-
-      function onCopyCut(e) {
-        if (signalDOMEvent(cm, e)) return
-        if (cm.somethingSelected()) {
-          lastCopied = {lineWise: false, text: cm.getSelections()};
-          if (e.type == "cut") cm.replaceSelection("", null, "cut");
-        } else if (!cm.options.lineWiseCopyCut) {
-          return;
-        } else {
-          var ranges = copyableRanges(cm);
-          lastCopied = {lineWise: true, text: ranges.text};
-          if (e.type == "cut") {
-            cm.operation(function() {
-              cm.setSelections(ranges.ranges, 0, sel_dontScroll);
-              cm.replaceSelection("", null, "cut");
-            });
-          }
-        }
-        if (e.clipboardData) {
-          e.clipboardData.clearData();
-          var content = lastCopied.text.join("\n")
-          // iOS exposes the clipboard API, but seems to discard content inserted into it
-          e.clipboardData.setData("Text", content);
-          if (e.clipboardData.getData("Text") == content) {
-            e.preventDefault();
-            return
-          }
-        }
-        // Old-fashioned briefly-focus-a-textarea hack
-        var kludge = hiddenTextarea(), te = kludge.firstChild;
-        cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
-        te.value = lastCopied.text.join("\n");
-        var hadFocus = document.activeElement;
-        selectInput(te);
-        setTimeout(function() {
-          cm.display.lineSpace.removeChild(kludge);
-          hadFocus.focus();
-          if (hadFocus == div) input.showPrimarySelection()
-        }, 50);
-      }
-      on(div, "copy", onCopyCut);
-      on(div, "cut", onCopyCut);
-    },
-
-    prepareSelection: function() {
-      var result = prepareSelection(this.cm, false);
-      result.focus = this.cm.state.focused;
-      return result;
-    },
-
-    showSelection: function(info, takeFocus) {
-      if (!info || !this.cm.display.view.length) return;
-      if (info.focus || takeFocus) this.showPrimarySelection();
-      this.showMultipleSelections(info);
-    },
-
-    showPrimarySelection: function() {
-      var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
-      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
-      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
-      if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
-          cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
-          cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
-        return;
-
-      var start = posToDOM(this.cm, prim.from());
-      var end = posToDOM(this.cm, prim.to());
-      if (!start && !end) return;
-
-      var view = this.cm.display.view;
-      var old = sel.rangeCount && sel.getRangeAt(0);
-      if (!start) {
-        start = {node: view[0].measure.map[2], offset: 0};
-      } else if (!end) { // FIXME dangerously hacky
-        var measure = view[view.length - 1].measure;
-        var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
-        end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
-      }
-
-      try { var rng = range(start.node, start.offset, end.offset, end.node); }
-      catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
-      if (rng) {
-        if (!gecko && this.cm.state.focused) {
-          sel.collapse(start.node, start.offset);
-          if (!rng.collapsed) sel.addRange(rng);
-        } else {
-          sel.removeAllRanges();
-          sel.addRange(rng);
-        }
-        if (old && sel.anchorNode == null) sel.addRange(old);
-        else if (gecko) this.startGracePeriod();
-      }
-      this.rememberSelection();
-    },
-
-    startGracePeriod: function() {
-      var input = this;
-      clearTimeout(this.gracePeriod);
-      this.gracePeriod = setTimeout(function() {
-        input.gracePeriod = false;
-        if (input.selectionChanged())
-          input.cm.operation(function() { input.cm.curOp.selectionChanged = true; });
-      }, 20);
-    },
-
-    showMultipleSelections: function(info) {
-      removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
-      removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
-    },
-
-    rememberSelection: function() {
-      var sel = window.getSelection();
-      this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
-      this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
-    },
-
-    selectionInEditor: function() {
-      var sel = window.getSelection();
-      if (!sel.rangeCount) return false;
-      var node = sel.getRangeAt(0).commonAncestorContainer;
-      return contains(this.div, node);
-    },
-
-    focus: function() {
-      if (this.cm.options.readOnly != "nocursor") this.div.focus();
-    },
-    blur: function() { this.div.blur(); },
-    getField: function() { return this.div; },
-
-    supportsTouch: function() { return true; },
-
-    receivedFocus: function() {
-      var input = this;
-      if (this.selectionInEditor())
-        this.pollSelection();
-      else
-        runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; });
-
-      function poll() {
-        if (input.cm.state.focused) {
-          input.pollSelection();
-          input.polling.set(input.cm.options.pollInterval, poll);
-        }
-      }
-      this.polling.set(this.cm.options.pollInterval, poll);
-    },
-
-    selectionChanged: function() {
-      var sel = window.getSelection();
-      return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
-        sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset;
-    },
-
-    pollSelection: function() {
-      if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
-        var sel = window.getSelection(), cm = this.cm;
-        this.rememberSelection();
-        var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
-        var head = domToPos(cm, sel.focusNode, sel.focusOffset);
-        if (anchor && head) runInOp(cm, function() {
-          setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
-          if (anchor.bad || head.bad) cm.curOp.selectionChanged = true;
-        });
-      }
-    },
-
-    pollContent: function() {
-      var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
-      var from = sel.from(), to = sel.to();
-      if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
-
-      var fromIndex;
-      if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
-        var fromLine = lineNo(display.view[0].line);
-        var fromNode = display.view[0].node;
-      } else {
-        var fromLine = lineNo(display.view[fromIndex].line);
-        var fromNode = display.view[fromIndex - 1].node.nextSibling;
-      }
-      var toIndex = findViewIndex(cm, to.line);
-      if (toIndex == display.view.length - 1) {
-        var toLine = display.viewTo - 1;
-        var toNode = display.lineDiv.lastChild;
-      } else {
-        var toLine = lineNo(display.view[toIndex + 1].line) - 1;
-        var toNode = display.view[toIndex + 1].node.previousSibling;
-      }
-
-      var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
-      var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
-      while (newText.length > 1 && oldText.length > 1) {
-        if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
-        else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
-        else break;
-      }
-
-      var cutFront = 0, cutEnd = 0;
-      var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
-      while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
-        ++cutFront;
-      var newBot = lst(newText), oldBot = lst(oldText);
-      var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
-                               oldBot.length - (oldText.length == 1 ? cutFront : 0));
-      while (cutEnd < maxCutEnd &&
-             newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
-        ++cutEnd;
-
-      newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
-      newText[0] = newText[0].slice(cutFront);
-
-      var chFrom = Pos(fromLine, cutFront);
-      var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
-      if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
-        replaceRange(cm.doc, newText, chFrom, chTo, "+input");
-        return true;
-      }
-    },
-
-    ensurePolled: function() {
-      this.forceCompositionEnd();
-    },
-    reset: function() {
-      this.forceCompositionEnd();
-    },
-    forceCompositionEnd: function() {
-      if (!this.composing || this.composing.handled) return;
-      this.applyComposition(this.composing);
-      this.composing.handled = true;
-      this.div.blur();
-      this.div.focus();
-    },
-    applyComposition: function(composing) {
-      if (this.cm.isReadOnly())
-        operation(this.cm, regChange)(this.cm)
-      else if (composing.data && composing.data != composing.startData)
-        operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
-    },
-
-    setUneditable: function(node) {
-      node.contentEditable = "false"
-    },
-
-    onKeyPress: function(e) {
-      e.preventDefault();
-      if (!this.cm.isReadOnly())
-        operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
-    },
-
-    readOnlyChanged: function(val) {
-      this.div.contentEditable = String(val != "nocursor")
-    },
-
-    onContextMenu: nothing,
-    resetPosition: nothing,
-
-    needsContentAttribute: true
-  }, ContentEditableInput.prototype);
-
-  function posToDOM(cm, pos) {
-    var view = findViewForLine(cm, pos.line);
-    if (!view || view.hidden) return null;
-    var line = getLine(cm.doc, pos.line);
-    var info = mapFromLineView(view, line, pos.line);
-
-    var order = getOrder(line), side = "left";
-    if (order) {
-      var partPos = getBidiPartAt(order, pos.ch);
-      side = partPos % 2 ? "right" : "left";
-    }
-    var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
-    result.offset = result.collapse == "right" ? result.end : result.start;
-    return result;
-  }
-
-  function badPos(pos, bad) { if (bad) pos.bad = true; return pos; }
-
-  function domToPos(cm, node, offset) {
-    var lineNode;
-    if (node == cm.display.lineDiv) {
-      lineNode = cm.display.lineDiv.childNodes[offset];
-      if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true);
-      node = null; offset = 0;
-    } else {
-      for (lineNode = node;; lineNode = lineNode.parentNode) {
-        if (!lineNode || lineNode == cm.display.lineDiv) return null;
-        if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
-      }
-    }
-    for (var i = 0; i < cm.display.view.length; i++) {
-      var lineView = cm.display.view[i];
-      if (lineView.node == lineNode)
-        return locateNodeInLineView(lineView, node, offset);
-    }
-  }
-
-  function locateNodeInLineView(lineView, node, offset) {
-    var wrapper = lineView.text.firstChild, bad = false;
-    if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true);
-    if (node == wrapper) {
-      bad = true;
-      node = wrapper.childNodes[offset];
-      offset = 0;
-      if (!node) {
-        var line = lineView.rest ? lst(lineView.rest) : lineView.line;
-        return badPos(Pos(lineNo(line), line.text.length), bad);
-      }
-    }
-
-    var textNode = node.nodeType == 3 ? node : null, topNode = node;
-    if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
-      textNode = node.firstChild;
-      if (offset) offset = textNode.nodeValue.length;
-    }
-    while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
-    var measure = lineView.measure, maps = measure.maps;
-
-    function find(textNode, topNode, offset) {
-      for (var i = -1; i < (maps ? maps.length : 0); i++) {
-        var map = i < 0 ? measure.map : maps[i];
-        for (var j = 0; j < map.length; j += 3) {
-          var curNode = map[j + 2];
-          if (curNode == textNode || curNode == topNode) {
-            var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
-            var ch = map[j] + offset;
-            if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)];
-            return Pos(line, ch);
-          }
-        }
-      }
-    }
-    var found = find(textNode, topNode, offset);
-    if (found) return badPos(found, bad);
-
-    // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
-    for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
-      found = find(after, after.firstChild, 0);
-      if (found)
-        return badPos(Pos(found.line, found.ch - dist), bad);
-      else
-        dist += after.textContent.length;
-    }
-    for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
-      found = find(before, before.firstChild, -1);
-      if (found)
-        return badPos(Pos(found.line, found.ch + dist), bad);
-      else
-        dist += before.textContent.length;
-    }
-  }
-
-  function domTextBetween(cm, from, to, fromLine, toLine) {
-    var text = "", closing = false, lineSep = cm.doc.lineSeparator();
-    function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
-    function walk(node) {
-      if (node.nodeType == 1) {
-        var cmText = node.getAttribute("cm-text");
-        if (cmText != null) {
-          if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
-          text += cmText;
-          return;
-        }
-        var markerID = node.getAttribute("cm-marker"), range;
-        if (markerID) {
-          var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
-          if (found.length && (range = found[0].find()))
-            text += getBetween(cm.doc, range.from, range.to).join(lineSep);
-          return;
-        }
-        if (node.getAttribute("contenteditable") == "false") return;
-        for (var i = 0; i < node.childNodes.length; i++)
-          walk(node.childNodes[i]);
-        if (/^(pre|div|p)$/i.test(node.nodeName))
-          closing = true;
-      } else if (node.nodeType == 3) {
-        var val = node.nodeValue;
-        if (!val) return;
-        if (closing) {
-          text += lineSep;
-          closing = false;
-        }
-        text += val;
-      }
-    }
-    for (;;) {
-      walk(from);
-      if (from == to) break;
-      from = from.nextSibling;
-    }
-    return text;
-  }
-
-  CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
-
-  // SELECTION / CURSOR
-
-  // Selection objects are immutable. A new one is created every time
-  // the selection changes. A selection is one or more non-overlapping
-  // (and non-touching) ranges, sorted, and an integer that indicates
-  // which one is the primary selection (the one that's scrolled into
-  // view, that getCursor returns, etc).
-  function Selection(ranges, primIndex) {
-    this.ranges = ranges;
-    this.primIndex = primIndex;
-  }
-
-  Selection.prototype = {
-    primary: function() { return this.ranges[this.primIndex]; },
-    equals: function(other) {
-      if (other == this) return true;
-      if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false;
-      for (var i = 0; i < this.ranges.length; i++) {
-        var here = this.ranges[i], there = other.ranges[i];
-        if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false;
-      }
-      return true;
-    },
-    deepCopy: function() {
-      for (var out = [], i = 0; i < this.ranges.length; i++)
-        out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head));
-      return new Selection(out, this.primIndex);
-    },
-    somethingSelected: function() {
-      for (var i = 0; i < this.ranges.length; i++)
-        if (!this.ranges[i].empty()) return true;
-      return false;
-    },
-    contains: function(pos, end) {
-      if (!end) end = pos;
-      for (var i = 0; i < this.ranges.length; i++) {
-        var range = this.ranges[i];
-        if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
-          return i;
-      }
-      return -1;
-    }
-  };
-
-  function Range(anchor, head) {
-    this.anchor = anchor; this.head = head;
-  }
-
-  Range.prototype = {
-    from: function() { return minPos(this.anchor, this.head); },
-    to: function() { return maxPos(this.anchor, this.head); },
-    empty: function() {
-      return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch;
-    }
-  };
-
-  // Take an unsorted, potentially overlapping set of ranges, and
-  // build a selection out of it. 'Consumes' ranges array (modifying
-  // it).
-  function normalizeSelection(ranges, primIndex) {
-    var prim = ranges[primIndex];
-    ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
-    primIndex = indexOf(ranges, prim);
-    for (var i = 1; i < ranges.length; i++) {
-      var cur = ranges[i], prev = ranges[i - 1];
-      if (cmp(prev.to(), cur.from()) >= 0) {
-        var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
-        var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
-        if (i <= primIndex) --primIndex;
-        ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
-      }
-    }
-    return new Selection(ranges, primIndex);
-  }
-
-  function simpleSelection(anchor, head) {
-    return new Selection([new Range(anchor, head || anchor)], 0);
-  }
-
-  // Most of the external API clips given positions to make sure they
-  // actually exist within the document.
-  function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));}
-  function clipPos(doc, pos) {
-    if (pos.line < doc.first) return Pos(doc.first, 0);
-    var last = doc.first + doc.size - 1;
-    if (pos.line > last) return Pos(last, getLine(doc, last).text.length);
-    return clipToLen(pos, getLine(doc, pos.line).text.length);
-  }
-  function clipToLen(pos, linelen) {
-    var ch = pos.ch;
-    if (ch == null || ch > linelen) return Pos(pos.line, linelen);
-    else if (ch < 0) return Pos(pos.line, 0);
-    else return pos;
-  }
-  function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
-  function clipPosArray(doc, array) {
-    for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]);
-    return out;
-  }
-
-  // SELECTION UPDATES
-
-  // The 'scroll' parameter given to many of these indicated whether
-  // the new cursor position should be scrolled into view after
-  // modifying the selection.
-
-  // If shift is held or the extend flag is set, extends a range to
-  // include a given position (and optionally a second position).
-  // Otherwise, simply returns the range between the given positions.
-  // Used for cursor motion and such.
-  function extendRange(doc, range, head, other) {
-    if (doc.cm && doc.cm.display.shift || doc.extend) {
-      var anchor = range.anchor;
-      if (other) {
-        var posBefore = cmp(head, anchor) < 0;
-        if (posBefore != (cmp(other, anchor) < 0)) {
-          anchor = head;
-          head = other;
-        } else if (posBefore != (cmp(head, other) < 0)) {
-          head = other;
-        }
-      }
-      return new Range(anchor, head);
-    } else {
-      return new Range(other || head, head);
-    }
-  }
-
-  // Extend the primary selection range, discard the rest.
-  function extendSelection(doc, head, other, options) {
-    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options);
-  }
-
-  // Extend all selections (pos is an array of selections with length
-  // equal the number of selections)
-  function extendSelections(doc, heads, options) {
-    for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
-      out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
-    var newSel = normalizeSelection(out, doc.sel.primIndex);
-    setSelection(doc, newSel, options);
-  }
-
-  // Updates a single range in the selection.
-  function replaceOneSelection(doc, i, range, options) {
-    var ranges = doc.sel.ranges.slice(0);
-    ranges[i] = range;
-    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options);
-  }
-
-  // Reset the selection to a single range.
-  function setSimpleSelection(doc, anchor, head, options) {
-    setSelection(doc, simpleSelection(anchor, head), options);
-  }
-
-  // Give beforeSelectionChange handlers a change to influence a
-  // selection update.
-  function filterSelectionChange(doc, sel, options) {
-    var obj = {
-      ranges: sel.ranges,
-      update: function(ranges) {
-        this.ranges = [];
-        for (var i = 0; i < ranges.length; i++)
-          this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
-                                     clipPos(doc, ranges[i].head));
-      },
-      origin: options && options.origin
-    };
-    signal(doc, "beforeSelectionChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
-    if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1);
-    else return sel;
-  }
-
-  function setSelectionReplaceHistory(doc, sel, options) {
-    var done = doc.history.done, last = lst(done);
-    if (last && last.ranges) {
-      done[done.length - 1] = sel;
-      setSelectionNoUndo(doc, sel, options);
-    } else {
-      setSelection(doc, sel, options);
-    }
-  }
-
-  // Set a new selection.
-  function setSelection(doc, sel, options) {
-    setSelectionNoUndo(doc, sel, options);
-    addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
-  }
-
-  function setSelectionNoUndo(doc, sel, options) {
-    if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-      sel = filterSelectionChange(doc, sel, options);
-
-    var bias = options && options.bias ||
-      (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
-    setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
-
-    if (!(options && options.scroll === false) && doc.cm)
-      ensureCursorVisible(doc.cm);
-  }
-
-  function setSelectionInner(doc, sel) {
-    if (sel.equals(doc.sel)) return;
-
-    doc.sel = sel;
-
-    if (doc.cm) {
-      doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;
-      signalCursorActivity(doc.cm);
-    }
-    signalLater(doc, "cursorActivity", doc);
-  }
-
-  // Verify that the selection does not partially select any atomic
-  // marked ranges.
-  function reCheckSelection(doc) {
-    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll);
-  }
-
-  // Return a selection that does not partially select any atomic
-  // ranges.
-  function skipAtomicInSelection(doc, sel, bias, mayClear) {
-    var out;
-    for (var i = 0; i < sel.ranges.length; i++) {
-      var range = sel.ranges[i];
-      var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
-      var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
-      var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
-      if (out || newAnchor != range.anchor || newHead != range.head) {
-        if (!out) out = sel.ranges.slice(0, i);
-        out[i] = new Range(newAnchor, newHead);
-      }
-    }
-    return out ? normalizeSelection(out, sel.primIndex) : sel;
-  }
-
-  function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
-    var line = getLine(doc, pos.line);
-    if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-      var sp = line.markedSpans[i], m = sp.marker;
-      if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
-          (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
-        if (mayClear) {
-          signal(m, "beforeCursorEnter");
-          if (m.explicitlyCleared) {
-            if (!line.markedSpans) break;
-            else {--i; continue;}
-          }
-        }
-        if (!m.atomic) continue;
-
-        if (oldPos) {
-          var near = m.find(dir < 0 ? 1 : -1), diff;
-          if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
-            near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null);
-          if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
-            return skipAtomicInner(doc, near, pos, dir, mayClear);
-        }
-
-        var far = m.find(dir < 0 ? -1 : 1);
-        if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
-          far = movePos(doc, far, dir, far.line == pos.line ? line : null);
-        return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
-      }
-    }
-    return pos;
-  }
-
-  // Ensure a given position is not inside an atomic range.
-  function skipAtomic(doc, pos, oldPos, bias, mayClear) {
-    var dir = bias || 1;
-    var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
-        (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
-        skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
-        (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
-    if (!found) {
-      doc.cantEdit = true;
-      return Pos(doc.first, 0);
-    }
-    return found;
-  }
-
-  function movePos(doc, pos, dir, line) {
-    if (dir < 0 && pos.ch == 0) {
-      if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1));
-      else return null;
-    } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
-      if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0);
-      else return null;
-    } else {
-      return new Pos(pos.line, pos.ch + dir);
-    }
-  }
-
-  // SELECTION DRAWING
-
-  function updateSelection(cm) {
-    cm.display.input.showSelection(cm.display.input.prepareSelection());
-  }
-
-  function prepareSelection(cm, primary) {
-    var doc = cm.doc, result = {};
-    var curFragment = result.cursors = document.createDocumentFragment();
-    var selFragment = result.selection = document.createDocumentFragment();
-
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      if (primary === false && i == doc.sel.primIndex) continue;
-      var range = doc.sel.ranges[i];
-      if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue;
-      var collapsed = range.empty();
-      if (collapsed || cm.options.showCursorWhenSelecting)
-        drawSelectionCursor(cm, range.head, curFragment);
-      if (!collapsed)
-        drawSelectionRange(cm, range, selFragment);
-    }
-    return result;
-  }
-
-  // Draws a cursor for the given range
-  function drawSelectionCursor(cm, head, output) {
-    var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
-
-    var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
-    cursor.style.left = pos.left + "px";
-    cursor.style.top = pos.top + "px";
-    cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
-
-    if (pos.other) {
-      // Secondary cursor, shown when on a 'jump' in bi-directional text
-      var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
-      otherCursor.style.display = "";
-      otherCursor.style.left = pos.other.left + "px";
-      otherCursor.style.top = pos.other.top + "px";
-      otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
-    }
-  }
-
-  // Draws the given range as a highlighted selection
-  function drawSelectionRange(cm, range, output) {
-    var display = cm.display, doc = cm.doc;
-    var fragment = document.createDocumentFragment();
-    var padding = paddingH(cm.display), leftSide = padding.left;
-    var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
-
-    function add(left, top, width, bottom) {
-      if (top < 0) top = 0;
-      top = Math.round(top);
-      bottom = Math.round(bottom);
-      fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
-                               "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) +
-                               "px; height: " + (bottom - top) + "px"));
-    }
-
-    function drawForLine(line, fromArg, toArg) {
-      var lineObj = getLine(doc, line);
-      var lineLen = lineObj.text.length;
-      var start, end;
-      function coords(ch, bias) {
-        return charCoords(cm, Pos(line, ch), "div", lineObj, bias);
-      }
-
-      iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
-        var leftPos = coords(from, "left"), rightPos, left, right;
-        if (from == to) {
-          rightPos = leftPos;
-          left = right = leftPos.left;
-        } else {
-          rightPos = coords(to - 1, "right");
-          if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; }
-          left = leftPos.left;
-          right = rightPos.right;
-        }
-        if (fromArg == null && from == 0) left = leftSide;
-        if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
-          add(left, leftPos.top, null, leftPos.bottom);
-          left = leftSide;
-          if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);
-        }
-        if (toArg == null && to == lineLen) right = rightSide;
-        if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
-          start = leftPos;
-        if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
-          end = rightPos;
-        if (left < leftSide + 1) left = leftSide;
-        add(left, rightPos.top, right - left, rightPos.bottom);
-      });
-      return {start: start, end: end};
-    }
-
-    var sFrom = range.from(), sTo = range.to();
-    if (sFrom.line == sTo.line) {
-      drawForLine(sFrom.line, sFrom.ch, sTo.ch);
-    } else {
-      var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
-      var singleVLine = visualLine(fromLine) == visualLine(toLine);
-      var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
-      var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
-      if (singleVLine) {
-        if (leftEnd.top < rightStart.top - 2) {
-          add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
-          add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
-        } else {
-          add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
-        }
-      }
-      if (leftEnd.bottom < rightStart.top)
-        add(leftSide, leftEnd.bottom, null, rightStart.top);
-    }
-
-    output.appendChild(fragment);
-  }
-
-  // Cursor-blinking
-  function restartBlink(cm) {
-    if (!cm.state.focused) return;
-    var display = cm.display;
-    clearInterval(display.blinker);
-    var on = true;
-    display.cursorDiv.style.visibility = "";
-    if (cm.options.cursorBlinkRate > 0)
-      display.blinker = setInterval(function() {
-        display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
-      }, cm.options.cursorBlinkRate);
-    else if (cm.options.cursorBlinkRate < 0)
-      display.cursorDiv.style.visibility = "hidden";
-  }
-
-  // HIGHLIGHT WORKER
-
-  function startWorker(cm, time) {
-    if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
-      cm.state.highlight.set(time, bind(highlightWorker, cm));
-  }
-
-  function highlightWorker(cm) {
-    var doc = cm.doc;
-    if (doc.frontier < doc.first) doc.frontier = doc.first;
-    if (doc.frontier >= cm.display.viewTo) return;
-    var end = +new Date + cm.options.workTime;
-    var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
-    var changedLines = [];
-
-    doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
-      if (doc.frontier >= cm.display.viewFrom) { // Visible
-        var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength;
-        var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true);
-        line.styles = highlighted.styles;
-        var oldCls = line.styleClasses, newCls = highlighted.classes;
-        if (newCls) line.styleClasses = newCls;
-        else if (oldCls) line.styleClasses = null;
-        var ischange = !oldStyles || oldStyles.length != line.styles.length ||
-          oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
-        for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
-        if (ischange) changedLines.push(doc.frontier);
-        line.stateAfter = tooLong ? state : copyState(doc.mode, state);
-      } else {
-        if (line.text.length <= cm.options.maxHighlightLength)
-          processLine(cm, line.text, state);
-        line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
-      }
-      ++doc.frontier;
-      if (+new Date > end) {
-        startWorker(cm, cm.options.workDelay);
-        return true;
-      }
-    });
-    if (changedLines.length) runInOp(cm, function() {
-      for (var i = 0; i < changedLines.length; i++)
-        regLineChange(cm, changedLines[i], "text");
-    });
-  }
-
-  // Finds the line to start with when starting a parse. Tries to
-  // find a line with a stateAfter, so that it can start with a
-  // valid state. If that fails, it returns the line with the
-  // smallest indentation, which tends to need the least context to
-  // parse correctly.
-  function findStartLine(cm, n, precise) {
-    var minindent, minline, doc = cm.doc;
-    var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
-    for (var search = n; search > lim; --search) {
-      if (search <= doc.first) return doc.first;
-      var line = getLine(doc, search - 1);
-      if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
-      var indented = countColumn(line.text, null, cm.options.tabSize);
-      if (minline == null || minindent > indented) {
-        minline = search - 1;
-        minindent = indented;
-      }
-    }
-    return minline;
-  }
-
-  function getStateBefore(cm, n, precise) {
-    var doc = cm.doc, display = cm.display;
-    if (!doc.mode.startState) return true;
-    var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
-    if (!state) state = startState(doc.mode);
-    else state = copyState(doc.mode, state);
-    doc.iter(pos, n, function(line) {
-      processLine(cm, line.text, state);
-      var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo;
-      line.stateAfter = save ? copyState(doc.mode, state) : null;
-      ++pos;
-    });
-    if (precise) doc.frontier = pos;
-    return state;
-  }
-
-  // POSITION MEASUREMENT
-
-  function paddingTop(display) {return display.lineSpace.offsetTop;}
-  function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;}
-  function paddingH(display) {
-    if (display.cachedPaddingH) return display.cachedPaddingH;
-    var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
-    var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
-    var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
-    if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data;
-    return data;
-  }
-
-  function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; }
-  function displayWidth(cm) {
-    return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth;
-  }
-  function displayHeight(cm) {
-    return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight;
-  }
-
-  // Ensure the lineView.wrapping.heights array is populated. This is
-  // an array of bottom offsets for the lines that make up a drawn
-  // line. When lineWrapping is on, there might be more than one
-  // height.
-  function ensureLineHeights(cm, lineView, rect) {
-    var wrapping = cm.options.lineWrapping;
-    var curWidth = wrapping && displayWidth(cm);
-    if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
-      var heights = lineView.measure.heights = [];
-      if (wrapping) {
-        lineView.measure.width = curWidth;
-        var rects = lineView.text.firstChild.getClientRects();
-        for (var i = 0; i < rects.length - 1; i++) {
-          var cur = rects[i], next = rects[i + 1];
-          if (Math.abs(cur.bottom - next.bottom) > 2)
-            heights.push((cur.bottom + next.top) / 2 - rect.top);
-        }
-      }
-      heights.push(rect.bottom - rect.top);
-    }
-  }
-
-  // Find a line map (mapping character offsets to text nodes) and a
-  // measurement cache for the given line number. (A line view might
-  // contain multiple lines when collapsed ranges are present.)
-  function mapFromLineView(lineView, line, lineN) {
-    if (lineView.line == line)
-      return {map: lineView.measure.map, cache: lineView.measure.cache};
-    for (var i = 0; i < lineView.rest.length; i++)
-      if (lineView.rest[i] == line)
-        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]};
-    for (var i = 0; i < lineView.rest.length; i++)
-      if (lineNo(lineView.rest[i]) > lineN)
-        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true};
-  }
-
-  // Render a line into the hidden node display.externalMeasured. Used
-  // when measurement is needed for a line that's not in the viewport.
-  function updateExternalMeasurement(cm, line) {
-    line = visualLine(line);
-    var lineN = lineNo(line);
-    var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
-    view.lineN = lineN;
-    var built = view.built = buildLineContent(cm, view);
-    view.text = built.pre;
-    removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
-    return view;
-  }
-
-  // Get a {top, bottom, left, right} box (in line-local coordinates)
-  // for a given character.
-  function measureChar(cm, line, ch, bias) {
-    return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias);
-  }
-
-  // Find a line view that corresponds to the given line number.
-  function findViewForLine(cm, lineN) {
-    if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
-      return cm.display.view[findViewIndex(cm, lineN)];
-    var ext = cm.display.externalMeasured;
-    if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
-      return ext;
-  }
-
-  // Measurement can be split in two steps, the set-up work that
-  // applies to the whole line, and the measurement of the actual
-  // character. Functions like coordsChar, that need to do a lot of
-  // measurements in a row, can thus ensure that the set-up work is
-  // only done once.
-  function prepareMeasureForLine(cm, line) {
-    var lineN = lineNo(line);
-    var view = findViewForLine(cm, lineN);
-    if (view && !view.text) {
-      view = null;
-    } else if (view && view.changes) {
-      updateLineForChanges(cm, view, lineN, getDimensions(cm));
-      cm.curOp.forceUpdate = true;
-    }
-    if (!view)
-      view = updateExternalMeasurement(cm, line);
-
-    var info = mapFromLineView(view, line, lineN);
-    return {
-      line: line, view: view, rect: null,
-      map: info.map, cache: info.cache, before: info.before,
-      hasHeights: false
-    };
-  }
-
-  // Given a prepared measurement object, measures the position of an
-  // actual character (or fetches it from the cache).
-  function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
-    if (prepared.before) ch = -1;
-    var key = ch + (bias || ""), found;
-    if (prepared.cache.hasOwnProperty(key)) {
-      found = prepared.cache[key];
-    } else {
-      if (!prepared.rect)
-        prepared.rect = prepared.view.text.getBoundingClientRect();
-      if (!prepared.hasHeights) {
-        ensureLineHeights(cm, prepared.view, prepared.rect);
-        prepared.hasHeights = true;
-      }
-      found = measureCharInner(cm, prepared, ch, bias);
-      if (!found.bogus) prepared.cache[key] = found;
-    }
-    return {left: found.left, right: found.right,
-            top: varHeight ? found.rtop : found.top,
-            bottom: varHeight ? found.rbottom : found.bottom};
-  }
-
-  var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
-
-  function nodeAndOffsetInLineMap(map, ch, bias) {
-    var node, start, end, collapse;
-    // First, search the line map for the text node corresponding to,
-    // or closest to, the target character.
-    for (var i = 0; i < map.length; i += 3) {
-      var mStart = map[i], mEnd = map[i + 1];
-      if (ch < mStart) {
-        start = 0; end = 1;
-        collapse = "left";
-      } else if (ch < mEnd) {
-        start = ch - mStart;
-        end = start + 1;
-      } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {
-        end = mEnd - mStart;
-        start = end - 1;
-        if (ch >= mEnd) collapse = "right";
-      }
-      if (start != null) {
-        node = map[i + 2];
-        if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
-          collapse = bias;
-        if (bias == "left" && start == 0)
-          while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {
-            node = map[(i -= 3) + 2];
-            collapse = "left";
-          }
-        if (bias == "right" && start == mEnd - mStart)
-          while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {
-            node = map[(i += 3) + 2];
-            collapse = "right";
-          }
-        break;
-      }
-    }
-    return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
-  }
-
-  function getUsefulRect(rects, bias) {
-    var rect = nullRect
-    if (bias == "left") for (var i = 0; i < rects.length; i++) {
-      if ((rect = rects[i]).left != rect.right) break
-    } else for (var i = rects.length - 1; i >= 0; i--) {
-      if ((rect = rects[i]).left != rect.right) break
-    }
-    return rect
-  }
-
-  function measureCharInner(cm, prepared, ch, bias) {
-    var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
-    var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
-
-    var rect;
-    if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
-      for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
-        while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
-        while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
-        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
-          rect = node.parentNode.getBoundingClientRect();
-        else
-          rect = getUsefulRect(range(node, start, end).getClientRects(), bias)
-        if (rect.left || rect.right || start == 0) break;
-        end = start;
-        start = start - 1;
-        collapse = "right";
-      }
-      if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
-    } else { // If it is a widget, simply get the box for the whole widget.
-      if (start > 0) collapse = bias = "right";
-      var rects;
-      if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
-        rect = rects[bias == "right" ? rects.length - 1 : 0];
-      else
-        rect = node.getBoundingClientRect();
-    }
-    if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
-      var rSpan = node.parentNode.getClientRects()[0];
-      if (rSpan)
-        rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
-      else
-        rect = nullRect;
-    }
-
-    var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
-    var mid = (rtop + rbot) / 2;
-    var heights = prepared.view.measure.heights;
-    for (var i = 0; i < heights.length - 1; i++)
-      if (mid < heights[i]) break;
-    var top = i ? heights[i - 1] : 0, bot = heights[i];
-    var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
-                  right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
-                  top: top, bottom: bot};
-    if (!rect.left && !rect.right) result.bogus = true;
-    if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
-
-    return result;
-  }
-
-  // Work around problem with bounding client rects on ranges being
-  // returned incorrectly when zoomed on IE10 and below.
-  function maybeUpdateRectForZooming(measure, rect) {
-    if (!window.screen || screen.logicalXDPI == null ||
-        screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
-      return rect;
-    var scaleX = screen.logicalXDPI / screen.deviceXDPI;
-    var scaleY = screen.logicalYDPI / screen.deviceYDPI;
-    return {left: rect.left * scaleX, right: rect.right * scaleX,
-            top: rect.top * scaleY, bottom: rect.bottom * scaleY};
-  }
-
-  function clearLineMeasurementCacheFor(lineView) {
-    if (lineView.measure) {
-      lineView.measure.cache = {};
-      lineView.measure.heights = null;
-      if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-        lineView.measure.caches[i] = {};
-    }
-  }
-
-  function clearLineMeasurementCache(cm) {
-    cm.display.externalMeasure = null;
-    removeChildren(cm.display.lineMeasure);
-    for (var i = 0; i < cm.display.view.length; i++)
-      clearLineMeasurementCacheFor(cm.display.view[i]);
-  }
-
-  function clearCaches(cm) {
-    clearLineMeasurementCache(cm);
-    cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
-    if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
-    cm.display.lineNumChars = null;
-  }
-
-  function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }
-  function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }
-
-  // Converts a {top, bottom, left, right} box from line-local
-  // coordinates into another coordinate system. Context may be one of
-  // "line", "div" (display.lineDiv), "local"/null (editor), "window",
-  // or "page".
-  function intoCoordSystem(cm, lineObj, rect, context) {
-    if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
-      var size = widgetHeight(lineObj.widgets[i]);
-      rect.top += size; rect.bottom += size;
-    }
-    if (context == "line") return rect;
-    if (!context) context = "local";
-    var yOff = heightAtLine(lineObj);
-    if (context == "local") yOff += paddingTop(cm.display);
-    else yOff -= cm.display.viewOffset;
-    if (context == "page" || context == "window") {
-      var lOff = cm.display.lineSpace.getBoundingClientRect();
-      yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
-      var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
-      rect.left += xOff; rect.right += xOff;
-    }
-    rect.top += yOff; rect.bottom += yOff;
-    return rect;
-  }
-
-  // Coverts a box from "div" coords to another coordinate system.
-  // Context may be "window", "page", "div", or "local"/null.
-  function fromCoordSystem(cm, coords, context) {
-    if (context == "div") return coords;
-    var left = coords.left, top = coords.top;
-    // First move into "page" coordinate system
-    if (context == "page") {
-      left -= pageScrollX();
-      top -= pageScrollY();
-    } else if (context == "local" || !context) {
-      var localBox = cm.display.sizer.getBoundingClientRect();
-      left += localBox.left;
-      top += localBox.top;
-    }
-
-    var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
-    return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
-  }
-
-  function charCoords(cm, pos, context, lineObj, bias) {
-    if (!lineObj) lineObj = getLine(cm.doc, pos.line);
-    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context);
-  }
-
-  // Returns a box for a given cursor position, which may have an
-  // 'other' property containing the position of the secondary cursor
-  // on a bidi boundary.
-  function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
-    lineObj = lineObj || getLine(cm.doc, pos.line);
-    if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
-    function get(ch, right) {
-      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
-      if (right) m.left = m.right; else m.right = m.left;
-      return intoCoordSystem(cm, lineObj, m, context);
-    }
-    function getBidi(ch, partPos) {
-      var part = order[partPos], right = part.level % 2;
-      if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
-        part = order[--partPos];
-        ch = bidiRight(part) - (part.level % 2 ? 0 : 1);
-        right = true;
-      } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
-        part = order[++partPos];
-        ch = bidiLeft(part) - part.level % 2;
-        right = false;
-      }
-      if (right && ch == part.to && ch > part.from) return get(ch - 1);
-      return get(ch, right);
-    }
-    var order = getOrder(lineObj), ch = pos.ch;
-    if (!order) return get(ch);
-    var partPos = getBidiPartAt(order, ch);
-    var val = getBidi(ch, partPos);
-    if (bidiOther != null) val.other = getBidi(ch, bidiOther);
-    return val;
-  }
-
-  // Used to cheaply estimate the coordinates for a position. Used for
-  // intermediate scroll updates.
-  function estimateCoords(cm, pos) {
-    var left = 0, pos = clipPos(cm.doc, pos);
-    if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch;
-    var lineObj = getLine(cm.doc, pos.line);
-    var top = heightAtLine(lineObj) + paddingTop(cm.display);
-    return {left: left, right: left, top: top, bottom: top + lineObj.height};
-  }
-
-  // Positions returned by coordsChar contain some extra information.
-  // xRel is the relative x position of the input coordinates compared
-  // to the found position (so xRel > 0 means the coordinates are to
-  // the right of the character position, for example). When outside
-  // is true, that means the coordinates lie outside the line's
-  // vertical range.
-  function PosWithInfo(line, ch, outside, xRel) {
-    var pos = Pos(line, ch);
-    pos.xRel = xRel;
-    if (outside) pos.outside = true;
-    return pos;
-  }
-
-  // Compute the character position closest to the given coordinates.
-  // Input must be lineSpace-local ("div" coordinate system).
-  function coordsChar(cm, x, y) {
-    var doc = cm.doc;
-    y += cm.display.viewOffset;
-    if (y < 0) return PosWithInfo(doc.first, 0, true, -1);
-    var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
-    if (lineN > last)
-      return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);
-    if (x < 0) x = 0;
-
-    var lineObj = getLine(doc, lineN);
-    for (;;) {
-      var found = coordsCharInner(cm, lineObj, lineN, x, y);
-      var merged = collapsedSpanAtEnd(lineObj);
-      var mergedPos = merged && merged.find(0, true);
-      if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
-        lineN = lineNo(lineObj = mergedPos.to.line);
-      else
-        return found;
-    }
-  }
-
-  function coordsCharInner(cm, lineObj, lineNo, x, y) {
-    var innerOff = y - heightAtLine(lineObj);
-    var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
-    var preparedMeasure = prepareMeasureForLine(cm, lineObj);
-
-    function getX(ch) {
-      var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure);
-      wrongLine = true;
-      if (innerOff > sp.bottom) return sp.left - adjust;
-      else if (innerOff < sp.top) return sp.left + adjust;
-      else wrongLine = false;
-      return sp.left;
-    }
-
-    var bidi = getOrder(lineObj), dist = lineObj.text.length;
-    var from = lineLeft(lineObj), to = lineRight(lineObj);
-    var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;
-
-    if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1);
-    // Do a binary search between these bounds.
-    for (;;) {
-      if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-        var ch = x < fromX || x - fromX <= toX - x ? from : to;
-        var outside = ch == from ? fromOutside : toOutside
-        var xDiff = x - (ch == from ? fromX : toX);
-        // This is a kludge to handle the case where the coordinates
-        // are after a line-wrapped line. We should replace it with a
-        // more general handling of cursor positions around line
-        // breaks. (Issue #4078)
-        if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
-            ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
-          var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right");
-          if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
-            outside = false
-            ch++
-            xDiff = x - charSize.right
-          }
-        }
-        while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
-        var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
-        return pos;
-      }
-      var step = Math.ceil(dist / 2), middle = from + step;
-      if (bidi) {
-        middle = from;
-        for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1);
-      }
-      var middleX = getX(middle);
-      if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;}
-      else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;}
-    }
-  }
-
-  var measureText;
-  // Compute the default text height.
-  function textHeight(display) {
-    if (display.cachedTextHeight != null) return display.cachedTextHeight;
-    if (measureText == null) {
-      measureText = elt("pre");
-      // Measure a bunch of lines, for browsers that compute
-      // fractional heights.
-      for (var i = 0; i < 49; ++i) {
-        measureText.appendChild(document.createTextNode("x"));
-        measureText.appendChild(elt("br"));
-      }
-      measureText.appendChild(document.createTextNode("x"));
-    }
-    removeChildrenAndAdd(display.measure, measureText);
-    var height = measureText.offsetHeight / 50;
-    if (height > 3) display.cachedTextHeight = height;
-    removeChildren(display.measure);
-    return height || 1;
-  }
-
-  // Compute the default character width.
-  function charWidth(display) {
-    if (display.cachedCharWidth != null) return display.cachedCharWidth;
-    var anchor = elt("span", "xxxxxxxxxx");
-    var pre = elt("pre", [anchor]);
-    removeChildrenAndAdd(display.measure, pre);
-    var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
-    if (width > 2) display.cachedCharWidth = width;
-    return width || 10;
-  }
-
-  // OPERATIONS
-
-  // Operations are used to wrap a series of changes to the editor
-  // state in such a way that each change won't have to update the
-  // cursor and display (which would be awkward, slow, and
-  // error-prone). Instead, display updates are batched and then all
-  // combined and executed at once.
-
-  var operationGroup = null;
-
-  var nextOpId = 0;
-  // Start a new operation.
-  function startOperation(cm) {
-    cm.curOp = {
-      cm: cm,
-      viewChanged: false,      // Flag that indicates that lines might need to be redrawn
-      startHeight: cm.doc.height, // Used to detect need to update scrollbar
-      forceUpdate: false,      // Used to force a redraw
-      updateInput: null,       // Whether to reset the input textarea
-      typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
-      changeObjs: null,        // Accumulated changes, for firing change events
-      cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
-      cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
-      selectionChanged: false, // Whether the selection needs to be redrawn
-      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) {
-      operationGroup.ops.push(cm.curOp);
-    } else {
-      cm.curOp.ownsGroup = operationGroup = {
-        ops: [cm.curOp],
-        delayedCallbacks: []
-      };
-    }
-  }
-
-  function fireCallbacksForOps(group) {
-    // Calls delayed callbacks and cursorActivity handlers until no
-    // new ones appear
-    var callbacks = group.delayedCallbacks, i = 0;
-    do {
-      for (; i < callbacks.length; i++)
-        callbacks[i].call(null);
-      for (var j = 0; j < group.ops.length; j++) {
-        var op = group.ops[j];
-        if (op.cursorActivityHandlers)
-          while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
-            op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm);
-      }
-    } while (i < callbacks.length);
-  }
-
-  // Finish an operation, updating the display and signalling delayed events
-  function endOperation(cm) {
-    var op = cm.curOp, group = op.ownsGroup;
-    if (!group) return;
-
-    try { fireCallbacksForOps(group); }
-    finally {
-      operationGroup = null;
-      for (var i = 0; i < group.ops.length; i++)
-        group.ops[i].cm.curOp = null;
-      endOperations(group);
-    }
-  }
-
-  // The DOM updates done when an operation finishes are batched so
-  // that the minimum number of relayouts are required.
-  function endOperations(group) {
-    var ops = group.ops;
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_R1(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-      endOperation_W1(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_R2(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-      endOperation_W2(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_finish(ops[i]);
-  }
-
-  function endOperation_R1(op) {
-    var cm = op.cm, display = cm.display;
-    maybeClipScrollbars(cm);
-    if (op.updateMaxLine) findMaxLine(cm);
-
-    op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
-      op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
-                         op.scrollToPos.to.line >= display.viewTo) ||
-      display.maxLineChanged && cm.options.lineWrapping;
-    op.update = op.mustUpdate &&
-      new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
-  }
-
-  function endOperation_W1(op) {
-    op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
-  }
-
-  function endOperation_R2(op) {
-    var cm = op.cm, display = cm.display;
-    if (op.updatedDisplay) updateHeightsInViewport(cm);
-
-    op.barMeasure = measureForScrollbars(cm);
-
-    // If the max line changed since it was last measured, measure it,
-    // and ensure the document's width matches it.
-    // updateDisplay_W2 will use these properties to do the actual resizing
-    if (display.maxLineChanged && !cm.options.lineWrapping) {
-      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
-      cm.display.sizerWidth = op.adjustWidthTo;
-      op.barMeasure.scrollWidth =
-        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
-      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
-    }
-
-    if (op.updatedDisplay || op.selectionChanged)
-      op.preparedSelection = display.input.prepareSelection(op.focus);
-  }
-
-  function endOperation_W2(op) {
-    var cm = op.cm;
-
-    if (op.adjustWidthTo != null) {
-      cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
-      if (op.maxScrollLeft < cm.doc.scrollLeft)
-        setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
-      cm.display.maxLineChanged = false;
-    }
-
-    var takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
-    if (op.preparedSelection)
-      cm.display.input.showSelection(op.preparedSelection, takeFocus);
-    if (op.updatedDisplay || op.startHeight != cm.doc.height)
-      updateScrollbars(cm, op.barMeasure);
-    if (op.updatedDisplay)
-      setDocumentHeight(cm, op.barMeasure);
-
-    if (op.selectionChanged) restartBlink(cm);
-
-    if (cm.state.focused && op.updateInput)
-      cm.display.input.reset(op.typing);
-    if (takeFocus) ensureFocus(op.cm);
-  }
-
-  function endOperation_finish(op) {
-    var cm = op.cm, display = cm.display, doc = cm.doc;
-
-    if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
-
-    // Abort mouse wheel delta measurement, when scrolling explicitly
-    if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
-      display.wheelStartX = display.wheelStartY = null;
-
-    // Propagate the scroll position to the actual DOM scroller
-    if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
-      doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
-      display.scrollbars.setScrollTop(doc.scrollTop);
-      display.scroller.scrollTop = doc.scrollTop;
-    }
-    if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
-      display.scrollbars.setScrollLeft(doc.scrollLeft);
-      display.scroller.scrollLeft = doc.scrollLeft;
-      alignHorizontally(cm);
-    }
-    // If we need to scroll a specific position into view, do so.
-    if (op.scrollToPos) {
-      var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
-                                     clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
-      if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
-    }
-
-    // Fire events for markers that are hidden/unidden by editing or
-    // undoing
-    var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
-    if (hidden) for (var i = 0; i < hidden.length; ++i)
-      if (!hidden[i].lines.length) signal(hidden[i], "hide");
-    if (unhidden) for (var i = 0; i < unhidden.length; ++i)
-      if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
-
-    if (display.wrapper.offsetHeight)
-      doc.scrollTop = cm.display.scroller.scrollTop;
-
-    // Fire change events, and delayed event handlers
-    if (op.changeObjs)
-      signal(cm, "changes", cm, op.changeObjs);
-    if (op.update)
-      op.update.finish();
-  }
-
-  // Run the given function in an operation
-  function runInOp(cm, f) {
-    if (cm.curOp) return f();
-    startOperation(cm);
-    try { return f(); }
-    finally { endOperation(cm); }
-  }
-  // Wraps a function in an operation. Returns the wrapped function.
-  function operation(cm, f) {
-    return function() {
-      if (cm.curOp) return f.apply(cm, arguments);
-      startOperation(cm);
-      try { return f.apply(cm, arguments); }
-      finally { endOperation(cm); }
-    };
-  }
-  // Used to add methods to editor and doc instances, wrapping them in
-  // operations.
-  function methodOp(f) {
-    return function() {
-      if (this.curOp) return f.apply(this, arguments);
-      startOperation(this);
-      try { return f.apply(this, arguments); }
-      finally { endOperation(this); }
-    };
-  }
-  function docMethodOp(f) {
-    return function() {
-      var cm = this.cm;
-      if (!cm || cm.curOp) return f.apply(this, arguments);
-      startOperation(cm);
-      try { return f.apply(this, arguments); }
-      finally { endOperation(cm); }
-    };
-  }
-
-  // VIEW TRACKING
-
-  // These objects are used to represent the visible (currently drawn)
-  // part of the document. A LineView may correspond to multiple
-  // logical lines, if those are connected by collapsed ranges.
-  function LineView(doc, line, lineN) {
-    // The starting line
-    this.line = line;
-    // Continuing lines, if any
-    this.rest = visualLineContinued(line);
-    // Number of logical lines in this visual line
-    this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
-    this.node = this.text = null;
-    this.hidden = lineIsHidden(doc, line);
-  }
-
-  // Create a range of LineView objects for the given lines.
-  function buildViewArray(cm, from, to) {
-    var array = [], nextPos;
-    for (var pos = from; pos < to; pos = nextPos) {
-      var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
-      nextPos = pos + view.size;
-      array.push(view);
-    }
-    return array;
-  }
-
-  // Updates the display.view data structure for a given change to the
-  // document. From and to are in pre-change coordinates. Lendiff is
-  // the amount of lines added or subtracted by the change. This is
-  // used for changes that span multiple lines, or change the way
-  // lines are divided into visual lines. regLineChange (below)
-  // registers single-line changes.
-  function regChange(cm, from, to, lendiff) {
-    if (from == null) from = cm.doc.first;
-    if (to == null) to = cm.doc.first + cm.doc.size;
-    if (!lendiff) lendiff = 0;
-
-    var display = cm.display;
-    if (lendiff && to < display.viewTo &&
-        (display.updateLineNumbers == null || display.updateLineNumbers > from))
-      display.updateLineNumbers = from;
-
-    cm.curOp.viewChanged = true;
-
-    if (from >= display.viewTo) { // Change after
-      if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
-        resetView(cm);
-    } else if (to <= display.viewFrom) { // Change before
-      if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
-        resetView(cm);
-      } else {
-        display.viewFrom += lendiff;
-        display.viewTo += lendiff;
-      }
-    } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
-      resetView(cm);
-    } else if (from <= display.viewFrom) { // Top overlap
-      var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
-      if (cut) {
-        display.view = display.view.slice(cut.index);
-        display.viewFrom = cut.lineN;
-        display.viewTo += lendiff;
-      } else {
-        resetView(cm);
-      }
-    } else if (to >= display.viewTo) { // Bottom overlap
-      var cut = viewCuttingPoint(cm, from, from, -1);
-      if (cut) {
-        display.view = display.view.slice(0, cut.index);
-        display.viewTo = cut.lineN;
-      } else {
-        resetView(cm);
-      }
-    } else { // Gap in the middle
-      var cutTop = viewCuttingPoint(cm, from, from, -1);
-      var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
-      if (cutTop && cutBot) {
-        display.view = display.view.slice(0, cutTop.index)
-          .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
-          .concat(display.view.slice(cutBot.index));
-        display.viewTo += lendiff;
-      } else {
-        resetView(cm);
-      }
-    }
-
-    var ext = display.externalMeasured;
-    if (ext) {
-      if (to < ext.lineN)
-        ext.lineN += lendiff;
-      else if (from < ext.lineN + ext.size)
-        display.externalMeasured = null;
-    }
-  }
-
-  // Register a change to a single line. Type must be one of "text",
-  // "gutter", "class", "widget"
-  function regLineChange(cm, line, type) {
-    cm.curOp.viewChanged = true;
-    var display = cm.display, ext = cm.display.externalMeasured;
-    if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
-      display.externalMeasured = null;
-
-    if (line < display.viewFrom || line >= display.viewTo) return;
-    var lineView = display.view[findViewIndex(cm, line)];
-    if (lineView.node == null) return;
-    var arr = lineView.changes || (lineView.changes = []);
-    if (indexOf(arr, type) == -1) arr.push(type);
-  }
-
-  // Clear the view.
-  function resetView(cm) {
-    cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
-    cm.display.view = [];
-    cm.display.viewOffset = 0;
-  }
-
-  // Find the view element corresponding to a given line. Return null
-  // when the line isn't visible.
-  function findViewIndex(cm, n) {
-    if (n >= cm.display.viewTo) return null;
-    n -= cm.display.viewFrom;
-    if (n < 0) return null;
-    var view = cm.display.view;
-    for (var i = 0; i < view.length; i++) {
-      n -= view[i].size;
-      if (n < 0) return i;
-    }
-  }
-
-  function viewCuttingPoint(cm, oldN, newN, dir) {
-    var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
-    if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
-      return {index: index, lineN: newN};
-    for (var i = 0, n = cm.display.viewFrom; i < index; i++)
-      n += view[i].size;
-    if (n != oldN) {
-      if (dir > 0) {
-        if (index == view.length - 1) return null;
-        diff = (n + view[index].size) - oldN;
-        index++;
-      } else {
-        diff = n - oldN;
-      }
-      oldN += diff; newN += diff;
-    }
-    while (visualLineNo(cm.doc, newN) != newN) {
-      if (index == (dir < 0 ? 0 : view.length - 1)) return null;
-      newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
-      index += dir;
-    }
-    return {index: index, lineN: newN};
-  }
-
-  // Force the view to cover a given range, adding empty view element
-  // or clipping off existing ones as needed.
-  function adjustView(cm, from, to) {
-    var display = cm.display, view = display.view;
-    if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
-      display.view = buildViewArray(cm, from, to);
-      display.viewFrom = from;
-    } else {
-      if (display.viewFrom > from)
-        display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view);
-      else if (display.viewFrom < from)
-        display.view = display.view.slice(findViewIndex(cm, from));
-      display.viewFrom = from;
-      if (display.viewTo < to)
-        display.view = display.view.concat(buildViewArray(cm, display.viewTo, to));
-      else if (display.viewTo > to)
-        display.view = display.view.slice(0, findViewIndex(cm, to));
-    }
-    display.viewTo = to;
-  }
-
-  // Count the number of lines in the view whose DOM representation is
-  // out of date (or nonexistent).
-  function countDirtyView(cm) {
-    var view = cm.display.view, dirty = 0;
-    for (var i = 0; i < view.length; i++) {
-      var lineView = view[i];
-      if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty;
-    }
-    return dirty;
-  }
-
-  // EVENT HANDLERS
-
-  // Attach the necessary event handlers when initializing the editor
-  function registerEventHandlers(cm) {
-    var d = cm.display;
-    on(d.scroller, "mousedown", operation(cm, onMouseDown));
-    // Older IE's will not fire a second mousedown for a double click
-    if (ie && ie_version < 11)
-      on(d.scroller, "dblclick", operation(cm, function(e) {
-        if (signalDOMEvent(cm, e)) return;
-        var pos = posFromMouse(cm, e);
-        if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
-        e_preventDefault(e);
-        var word = cm.findWordAt(pos);
-        extendSelection(cm.doc, word.anchor, word.head);
-      }));
-    else
-      on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
-    // Some browsers fire contextmenu *after* opening the menu, at
-    // which point we can't mess with it anymore. Context menu is
-    // handled in onMouseDown for these browsers.
-    if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
-
-    // Used to suppress mouse event handling when a touch happens
-    var touchFinished, prevTouch = {end: 0};
-    function finishTouch() {
-      if (d.activeTouch) {
-        touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000);
-        prevTouch = d.activeTouch;
-        prevTouch.end = +new Date;
-      }
-    };
-    function isMouseLikeTouchEvent(e) {
-      if (e.touches.length != 1) return false;
-      var touch = e.touches[0];
-      return touch.radiusX <= 1 && touch.radiusY <= 1;
-    }
-    function farAway(touch, other) {
-      if (other.left == null) return true;
-      var dx = other.left - touch.left, dy = other.top - touch.top;
-      return dx * dx + dy * dy > 20 * 20;
-    }
-    on(d.scroller, "touchstart", function(e) {
-      if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
-        clearTimeout(touchFinished);
-        var now = +new Date;
-        d.activeTouch = {start: now, moved: false,
-                         prev: now - prevTouch.end <= 300 ? prevTouch : null};
-        if (e.touches.length == 1) {
-          d.activeTouch.left = e.touches[0].pageX;
-          d.activeTouch.top = e.touches[0].pageY;
-        }
-      }
-    });
-    on(d.scroller, "touchmove", function() {
-      if (d.activeTouch) d.activeTouch.moved = true;
-    });
-    on(d.scroller, "touchend", function(e) {
-      var touch = d.activeTouch;
-      if (touch && !eventInWidget(d, e) && touch.left != null &&
-          !touch.moved && new Date - touch.start < 300) {
-        var pos = cm.coordsChar(d.activeTouch, "page"), range;
-        if (!touch.prev || farAway(touch, touch.prev)) // Single tap
-          range = new Range(pos, pos);
-        else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
-          range = cm.findWordAt(pos);
-        else // Triple tap
-          range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)));
-        cm.setSelection(range.anchor, range.head);
-        cm.focus();
-        e_preventDefault(e);
-      }
-      finishTouch();
-    });
-    on(d.scroller, "touchcancel", finishTouch);
-
-    // Sync scrolling between fake scrollbars and real scrollable
-    // area, ensure viewport is updated when scrolling.
-    on(d.scroller, "scroll", function() {
-      if (d.scroller.clientHeight) {
-        setScrollTop(cm, d.scroller.scrollTop);
-        setScrollLeft(cm, d.scroller.scrollLeft, true);
-        signal(cm, "scroll", cm);
-      }
-    });
-
-    // Listen to wheel events in order to try and update the viewport on time.
-    on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
-    on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
-
-    // Prevent wrapper from ever scrolling
-    on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
-
-    d.dragFunctions = {
-      enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
-      over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
-      start: function(e){onDragStart(cm, e);},
-      drop: operation(cm, onDrop),
-      leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
-    };
-
-    var inp = d.input.getField();
-    on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
-    on(inp, "keydown", operation(cm, onKeyDown));
-    on(inp, "keypress", operation(cm, onKeyPress));
-    on(inp, "focus", function (e) { onFocus(cm, e); });
-    on(inp, "blur", function (e) { onBlur(cm, e); });
-  }
-
-  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.enter);
-      toggle(cm.display.scroller, "dragover", funcs.over);
-      toggle(cm.display.scroller, "dragleave", funcs.leave);
-      toggle(cm.display.scroller, "drop", funcs.drop);
-    }
-  }
-
-  // Called when the window resizes
-  function onResize(cm) {
-    var d = cm.display;
-    if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
-      return;
-    // Might be a text scaling operation, clear size caches.
-    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
-    d.scrollbarsClipped = false;
-    cm.setSize();
-  }
-
-  // MOUSE EVENTS
-
-  // Return true when the given mouse event happened in a widget
-  function eventInWidget(display, e) {
-    for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
-      if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
-          (n.parentNode == display.sizer && n != display.mover))
-        return true;
-    }
-  }
-
-  // Given a mouse event, find the corresponding position. If liberal
-  // is false, it checks whether a gutter or scrollbar was clicked,
-  // and returns null if it was. forRect is used by rectangular
-  // selections, and tries to estimate a character position even for
-  // coordinates beyond the right of the text.
-  function posFromMouse(cm, e, liberal, forRect) {
-    var display = cm.display;
-    if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null;
-
-    var x, y, space = display.lineSpace.getBoundingClientRect();
-    // Fails unpredictably on IE[67] when mouse is dragged around quickly.
-    try { x = e.clientX - space.left; y = e.clientY - space.top; }
-    catch (e) { return null; }
-    var coords = coordsChar(cm, x, y), line;
-    if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
-      var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
-      coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
-    }
-    return coords;
-  }
-
-  // A mouse down can be a single click, double click, triple click,
-  // start of selection drag, start of text drag, new cursor
-  // (ctrl-click), rectangle drag (alt-drag), or xwin
-  // middle-click-paste. Or it might be a click on something we should
-  // not interfere with, such as a scrollbar or widget.
-  function onMouseDown(e) {
-    var cm = this, display = cm.display;
-    if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return;
-    display.shift = e.shiftKey;
-
-    if (eventInWidget(display, e)) {
-      if (!webkit) {
-        // Briefly turn off draggability, to allow widgets to do
-        // normal dragging things.
-        display.scroller.draggable = false;
-        setTimeout(function(){display.scroller.draggable = true;}, 100);
-      }
-      return;
-    }
-    if (clickInGutter(cm, e)) return;
-    var start = posFromMouse(cm, e);
-    window.focus();
-
-    switch (e_button(e)) {
-    case 1:
-      // #3261: make sure, that we're not starting a second selection
-      if (cm.state.selectingText)
-        cm.state.selectingText(e);
-      else if (start)
-        leftButtonDown(cm, e, start);
-      else if (e_target(e) == display.scroller)
-        e_preventDefault(e);
-      break;
-    case 2:
-      if (webkit) cm.state.lastMiddleDown = +new Date;
-      if (start) extendSelection(cm.doc, start);
-      setTimeout(function() {display.input.focus();}, 20);
-      e_preventDefault(e);
-      break;
-    case 3:
-      if (captureRightClick) onContextMenu(cm, e);
-      else delayBlurEvent(cm);
-      break;
-    }
-  }
-
-  var lastClick, lastDoubleClick;
-  function leftButtonDown(cm, e, start) {
-    if (ie) setTimeout(bind(ensureFocus, cm), 0);
-    else cm.curOp.focus = activeElt();
-
-    var now = +new Date, type;
-    if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
-      type = "triple";
-    } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
-      type = "double";
-      lastDoubleClick = {time: now, pos: start};
-    } else {
-      type = "single";
-      lastClick = {time: now, pos: start};
-    }
-
-    var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
-    if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
-        type == "single" && (contained = sel.contains(start)) > -1 &&
-        (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
-        (cmp(contained.to(), start) > 0 || start.xRel < 0))
-      leftButtonStartDrag(cm, e, start, modifier);
-    else
-      leftButtonSelect(cm, e, start, type, modifier);
-  }
-
-  // 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, startTime = +new Date;
-    var dragEnd = operation(cm, function(e2) {
-      if (webkit) display.scroller.draggable = false;
-      cm.state.draggingText = false;
-      off(document, "mouseup", dragEnd);
-      off(display.scroller, "drop", dragEnd);
-      if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-        e_preventDefault(e2);
-        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)
-          setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
-        else
-          display.input.focus();
-      }
-    });
-    // Let the drag handler handle this.
-    if (webkit) display.scroller.draggable = true;
-    cm.state.draggingText = dragEnd;
-    dragEnd.copy = mac ? e.altKey : e.ctrlKey
-    // IE's approach to draggable
-    if (display.scroller.dragDrop) display.scroller.dragDrop();
-    on(document, "mouseup", dragEnd);
-    on(display.scroller, "drop", dragEnd);
-  }
-
-  // Normal selection, as opposed to text dragging.
-  function leftButtonSelect(cm, e, start, type, addNew) {
-    var display = cm.display, doc = cm.doc;
-    e_preventDefault(e);
-
-    var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
-    if (addNew && !e.shiftKey) {
-      ourIndex = doc.sel.contains(start);
-      if (ourIndex > -1)
-        ourRange = ranges[ourIndex];
-      else
-        ourRange = new Range(start, start);
-    } else {
-      ourRange = doc.sel.primary();
-      ourIndex = doc.sel.primIndex;
-    }
-
-    if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
-      type = "rect";
-      if (!addNew) ourRange = new Range(start, start);
-      start = posFromMouse(cm, e, true, true);
-      ourIndex = -1;
-    } else if (type == "double") {
-      var word = cm.findWordAt(start);
-      if (cm.display.shift || doc.extend)
-        ourRange = extendRange(doc, ourRange, word.anchor, word.head);
-      else
-        ourRange = word;
-    } else if (type == "triple") {
-      var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)));
-      if (cm.display.shift || doc.extend)
-        ourRange = extendRange(doc, ourRange, line.anchor, line.head);
-      else
-        ourRange = line;
-    } else {
-      ourRange = extendRange(doc, ourRange, start);
-    }
-
-    if (!addNew) {
-      ourIndex = 0;
-      setSelection(doc, new Selection([ourRange], 0), sel_mouse);
-      startSel = doc.sel;
-    } else if (ourIndex == -1) {
-      ourIndex = ranges.length;
-      setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
-                   {scroll: false, origin: "*mouse"});
-    } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
-      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
-                   {scroll: false, origin: "*mouse"});
-      startSel = doc.sel;
-    } else {
-      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
-    }
-
-    var lastPos = start;
-    function extendTo(pos) {
-      if (cmp(lastPos, pos) == 0) return;
-      lastPos = pos;
-
-      if (type == "rect") {
-        var ranges = [], tabSize = cm.options.tabSize;
-        var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
-        var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
-        var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
-        for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
-             line <= end; line++) {
-          var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
-          if (left == right)
-            ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)));
-          else if (text.length > leftPos)
-            ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
-        }
-        if (!ranges.length) ranges.push(new Range(start, start));
-        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
-                     {origin: "*mouse", scroll: false});
-        cm.scrollIntoView(pos);
-      } else {
-        var oldRange = ourRange;
-        var anchor = oldRange.anchor, head = pos;
-        if (type != "single") {
-          if (type == "double")
-            var range = cm.findWordAt(pos);
-          else
-            var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
-          if (cmp(range.anchor, anchor) > 0) {
-            head = range.head;
-            anchor = minPos(oldRange.from(), range.anchor);
-          } else {
-            head = range.anchor;
-            anchor = maxPos(oldRange.to(), range.head);
-          }
-        }
-        var ranges = startSel.ranges.slice(0);
-        ranges[ourIndex] = new Range(clipPos(doc, anchor), head);
-        setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse);
-      }
-    }
-
-    var editorSize = display.wrapper.getBoundingClientRect();
-    // Used to ensure timeout re-tries don't fire when another extend
-    // happened in the meantime (clearTimeout isn't reliable -- at
-    // least on Chrome, the timeouts still happen even when cleared,
-    // if the clear happens after their scheduled firing time).
-    var counter = 0;
-
-    function extend(e) {
-      var curCount = ++counter;
-      var cur = posFromMouse(cm, e, true, type == "rect");
-      if (!cur) return;
-      if (cmp(cur, lastPos) != 0) {
-        cm.curOp.focus = activeElt();
-        extendTo(cur);
-        var visible = visibleLines(display, doc);
-        if (cur.line >= visible.to || cur.line < visible.from)
-          setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150);
-      } else {
-        var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
-        if (outside) setTimeout(operation(cm, function() {
-          if (counter != curCount) return;
-          display.scroller.scrollTop += outside;
-          extend(e);
-        }), 50);
-      }
-    }
-
-    function done(e) {
-      cm.state.selectingText = false;
-      counter = Infinity;
-      e_preventDefault(e);
-      display.input.focus();
-      off(document, "mousemove", move);
-      off(document, "mouseup", up);
-      doc.history.lastSelOrigin = null;
-    }
-
-    var move = operation(cm, function(e) {
-      if (!e_button(e)) done(e);
-      else extend(e);
-    });
-    var up = operation(cm, done);
-    cm.state.selectingText = up;
-    on(document, "mousemove", move);
-    on(document, "mouseup", up);
-  }
-
-  // Determines whether an event happened in the gutter, and fires the
-  // handlers for the corresponding event.
-  function gutterEvent(cm, e, type, prevent) {
-    try { var mX = e.clientX, mY = e.clientY; }
-    catch(e) { return false; }
-    if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
-    if (prevent) e_preventDefault(e);
-
-    var display = cm.display;
-    var lineBox = display.lineDiv.getBoundingClientRect();
-
-    if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);
-    mY -= lineBox.top - display.viewOffset;
-
-    for (var i = 0; i < cm.options.gutters.length; ++i) {
-      var g = display.gutters.childNodes[i];
-      if (g && g.getBoundingClientRect().right >= mX) {
-        var line = lineAtHeight(cm.doc, mY);
-        var gutter = cm.options.gutters[i];
-        signal(cm, type, cm, line, gutter, e);
-        return e_defaultPrevented(e);
-      }
-    }
-  }
-
-  function clickInGutter(cm, e) {
-    return gutterEvent(cm, e, "gutterClick", true);
-  }
-
-  // Kludge to work around strange IE behavior where it'll sometimes
-  // re-fire a series of drag-related events right after the drop (#1551)
-  var lastDrop = 0;
-
-  function onDrop(e) {
-    var cm = this;
-    clearDragCursor(cm);
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
-      return;
-    e_preventDefault(e);
-    if (ie) lastDrop = +new Date;
-    var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-    if (!pos || cm.isReadOnly()) return;
-    // Might be a file drop, in which case we simply extract the text
-    // and insert it.
-    if (files && files.length && window.FileReader && window.File) {
-      var n = files.length, text = Array(n), read = 0;
-      var loadFile = function(file, i) {
-        if (cm.options.allowDropFileTypes &&
-            indexOf(cm.options.allowDropFileTypes, file.type) == -1)
-          return;
-
-        var reader = new FileReader;
-        reader.onload = operation(cm, function() {
-          var content = reader.result;
-          if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = "";
-          text[i] = content;
-          if (++read == n) {
-            pos = clipPos(cm.doc, pos);
-            var change = {from: pos, to: pos,
-                          text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
-                          origin: "paste"};
-            makeChange(cm.doc, change);
-            setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
-          }
-        });
-        reader.readAsText(file);
-      };
-      for (var i = 0; i < n; ++i) loadFile(files[i], i);
-    } else { // Normal drop
-      // Don't do a replace if the drop happened inside of the selected text.
-      if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
-        cm.state.draggingText(e);
-        // Ensure the editor is re-focused
-        setTimeout(function() {cm.display.input.focus();}, 20);
-        return;
-      }
-      try {
-        var text = e.dataTransfer.getData("Text");
-        if (text) {
-          if (cm.state.draggingText && !cm.state.draggingText.copy)
-            var selected = cm.listSelections();
-          setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
-          if (selected) for (var i = 0; i < selected.length; ++i)
-            replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
-          cm.replaceSelection(text, "around", "paste");
-          cm.display.input.focus();
-        }
-      }
-      catch(e){}
-    }
-  }
-
-  function onDragStart(cm, e) {
-    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
-
-    e.dataTransfer.setData("Text", cm.getSelection());
-    e.dataTransfer.effectAllowed = "copyMove"
-
-    // Use dummy image instead of default browsers image.
-    // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
-    if (e.dataTransfer.setDragImage && !safari) {
-      var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
-      img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
-      if (presto) {
-        img.width = img.height = 1;
-        cm.display.wrapper.appendChild(img);
-        // Force a relayout, or Opera won't use our image for some obscure reason
-        img._top = img.offsetTop;
-      }
-      e.dataTransfer.setDragImage(img, 0, 0);
-      if (presto) img.parentNode.removeChild(img);
-    }
-  }
-
-  function onDragOver(cm, e) {
-    var pos = posFromMouse(cm, e);
-    if (!pos) return;
-    var frag = document.createDocumentFragment();
-    drawSelectionCursor(cm, pos, frag);
-    if (!cm.display.dragCursor) {
-      cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
-      cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
-    }
-    removeChildrenAndAdd(cm.display.dragCursor, frag);
-  }
-
-  function clearDragCursor(cm) {
-    if (cm.display.dragCursor) {
-      cm.display.lineSpace.removeChild(cm.display.dragCursor);
-      cm.display.dragCursor = null;
-    }
-  }
-
-  // SCROLL EVENTS
-
-  // Sync the scrollable area and scrollbars, ensure the viewport
-  // covers the visible area.
-  function setScrollTop(cm, val) {
-    if (Math.abs(cm.doc.scrollTop - val) < 2) return;
-    cm.doc.scrollTop = val;
-    if (!gecko) updateDisplaySimple(cm, {top: val});
-    if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
-    cm.display.scrollbars.setScrollTop(val);
-    if (gecko) updateDisplaySimple(cm);
-    startWorker(cm, 100);
-  }
-  // Sync scroller and scrollbar, ensure the gutter elements are
-  // aligned.
-  function setScrollLeft(cm, val, isScroller) {
-    if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;
-    val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
-    cm.doc.scrollLeft = val;
-    alignHorizontally(cm);
-    if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
-    cm.display.scrollbars.setScrollLeft(val);
-  }
-
-  // Since the delta values reported on mouse wheel events are
-  // unstandardized between browsers and even browser versions, and
-  // generally horribly unpredictable, this code starts by measuring
-  // the scroll effect that the first few mouse wheel events have,
-  // and, from that, detects the way it can convert deltas to pixel
-  // offsets afterwards.
-  //
-  // The reason we want to know the amount a wheel event will scroll
-  // is that it gives us a chance to update the display before the
-  // actual scrolling happens, reducing flickering.
-
-  var wheelSamples = 0, wheelPixelsPerUnit = null;
-  // Fill in a browser-detected starting value on browsers where we
-  // know one. These don't have to be accurate -- the result of them
-  // being wrong would just be a slight flicker on the first wheel
-  // scroll (if it is large enough).
-  if (ie) wheelPixelsPerUnit = -.53;
-  else if (gecko) wheelPixelsPerUnit = 15;
-  else if (chrome) wheelPixelsPerUnit = -.7;
-  else if (safari) wheelPixelsPerUnit = -1/3;
-
-  var wheelEventDelta = function(e) {
-    var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
-    if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
-    if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
-    else if (dy == null) dy = e.wheelDelta;
-    return {x: dx, y: dy};
-  };
-  CodeMirror.wheelEventPixels = function(e) {
-    var delta = wheelEventDelta(e);
-    delta.x *= wheelPixelsPerUnit;
-    delta.y *= wheelPixelsPerUnit;
-    return delta;
-  };
-
-  function onScrollWheel(cm, e) {
-    var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
-
-    var display = cm.display, scroll = display.scroller;
-    // Quit if there's nothing to scroll here
-    var canScrollX = scroll.scrollWidth > scroll.clientWidth;
-    var canScrollY = scroll.scrollHeight > scroll.clientHeight;
-    if (!(dx && canScrollX || dy && canScrollY)) return;
-
-    // Webkit browsers on OS X abort momentum scrolls when the target
-    // of the scroll event is removed from the scrollable element.
-    // This hack (see related code in patchDisplay) makes sure the
-    // element is kept around.
-    if (dy && mac && webkit) {
-      outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
-        for (var i = 0; i < view.length; i++) {
-          if (view[i].node == cur) {
-            cm.display.currentWheelTarget = cur;
-            break outer;
-          }
-        }
-      }
-    }
-
-    // On some browsers, horizontal scrolling will cause redraws to
-    // happen before the gutter has been realigned, causing it to
-    // wriggle around in a most unseemly way. When we have an
-    // estimated pixels/delta value, we just handle horizontal
-    // scrolling entirely here. It'll be slightly off from native, but
-    // better than glitching out.
-    if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
-      if (dy && canScrollY)
-        setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
-      setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-      // Only prevent default scrolling if vertical scrolling is
-      // actually possible. Otherwise, it causes vertical scroll
-      // jitter on OSX trackpads when deltaX is small and deltaY
-      // is large (issue #3579)
-      if (!dy || (dy && canScrollY))
-        e_preventDefault(e);
-      display.wheelStartX = null; // Abort measurement, if in progress
-      return;
-    }
-
-    // 'Project' the visible viewport to cover the area that is being
-    // scrolled into view (if we know enough to estimate it).
-    if (dy && wheelPixelsPerUnit != null) {
-      var pixels = dy * wheelPixelsPerUnit;
-      var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
-      if (pixels < 0) top = Math.max(0, top + pixels - 50);
-      else bot = Math.min(cm.doc.height, bot + pixels + 50);
-      updateDisplaySimple(cm, {top: top, bottom: bot});
-    }
-
-    if (wheelSamples < 20) {
-      if (display.wheelStartX == null) {
-        display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
-        display.wheelDX = dx; display.wheelDY = dy;
-        setTimeout(function() {
-          if (display.wheelStartX == null) return;
-          var movedX = scroll.scrollLeft - display.wheelStartX;
-          var movedY = scroll.scrollTop - display.wheelStartY;
-          var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
-            (movedX && display.wheelDX && movedX / display.wheelDX);
-          display.wheelStartX = display.wheelStartY = null;
-          if (!sample) return;
-          wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
-          ++wheelSamples;
-        }, 200);
-      } else {
-        display.wheelDX += dx; display.wheelDY += dy;
-      }
-    }
-  }
-
-  // KEY EVENTS
-
-  // Run a handler that was bound to a key.
-  function doHandleBinding(cm, bound, dropShift) {
-    if (typeof bound == "string") {
-      bound = commands[bound];
-      if (!bound) return false;
-    }
-    // Ensure previous input has been read, so that the handler sees a
-    // consistent view of the document
-    cm.display.input.ensurePolled();
-    var prevShift = cm.display.shift, done = false;
-    try {
-      if (cm.isReadOnly()) cm.state.suppressEdits = true;
-      if (dropShift) cm.display.shift = false;
-      done = bound(cm) != Pass;
-    } finally {
-      cm.display.shift = prevShift;
-      cm.state.suppressEdits = false;
-    }
-    return done;
-  }
-
-  function lookupKeyForEditor(cm, name, handle) {
-    for (var i = 0; i < cm.state.keyMaps.length; i++) {
-      var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
-      if (result) return result;
-    }
-    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
-      || lookupKey(name, cm.options.keyMap, handle, cm);
-  }
-
-  var stopSeq = new Delayed;
-  function dispatchKey(cm, name, e, handle) {
-    var seq = cm.state.keySeq;
-    if (seq) {
-      if (isModifierKey(name)) return "handled";
-      stopSeq.set(50, function() {
-        if (cm.state.keySeq == seq) {
-          cm.state.keySeq = null;
-          cm.display.input.reset();
-        }
-      });
-      name = seq + " " + name;
-    }
-    var result = lookupKeyForEditor(cm, name, handle);
-
-    if (result == "multi")
-      cm.state.keySeq = name;
-    if (result == "handled")
-      signalLater(cm, "keyHandled", cm, name, e);
-
-    if (result == "handled" || result == "multi") {
-      e_preventDefault(e);
-      restartBlink(cm);
-    }
-
-    if (seq && !result && /\'$/.test(name)) {
-      e_preventDefault(e);
-      return true;
-    }
-    return !!result;
-  }
-
-  // Handle a key from the keydown event.
-  function handleKeyBinding(cm, e) {
-    var name = keyName(e, true);
-    if (!name) return false;
-
-    if (e.shiftKey && !cm.state.keySeq) {
-      // First try to resolve full name (including 'Shift-'). Failing
-      // that, see if there is a cursor-motion command (starting with
-      // 'go') bound to the keyname without 'Shift-'.
-      return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
-          || dispatchKey(cm, name, e, function(b) {
-               if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
-                 return doHandleBinding(cm, b);
-             });
-    } else {
-      return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
-    }
-  }
-
-  // Handle a key from the keypress event
-  function handleCharBinding(cm, e, ch) {
-    return dispatchKey(cm, "'" + ch + "'", e,
-                       function(b) { return doHandleBinding(cm, b, true); });
-  }
-
-  var lastStoppedKey = null;
-  function onKeyDown(e) {
-    var cm = this;
-    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;
-    var code = e.keyCode;
-    cm.display.shift = code == 16 || e.shiftKey;
-    var handled = handleKeyBinding(cm, e);
-    if (presto) {
-      lastStoppedKey = handled ? code : null;
-      // Opera has no cut event... we try to at least catch the key combo
-      if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
-        cm.replaceSelection("", null, "cut");
-    }
-
-    // Turn mouse into crosshair when Alt is held on Mac.
-    if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
-      showCrossHair(cm);
-  }
-
-  function showCrossHair(cm) {
-    var lineDiv = cm.display.lineDiv;
-    addClass(lineDiv, "CodeMirror-crosshair");
-
-    function up(e) {
-      if (e.keyCode == 18 || !e.altKey) {
-        rmClass(lineDiv, "CodeMirror-crosshair");
-        off(document, "keyup", up);
-        off(document, "mouseover", up);
-      }
-    }
-    on(document, "keyup", up);
-    on(document, "mouseover", up);
-  }
-
-  function onKeyUp(e) {
-    if (e.keyCode == 16) this.doc.sel.shift = false;
-    signalDOMEvent(this, e);
-  }
-
-  function onKeyPress(e) {
-    var cm = this;
-    if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
-    var keyCode = e.keyCode, charCode = e.charCode;
-    if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-    if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
-    var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
-    // Some browsers fire keypress events for backspace
-    if (ch == "\x08") return;
-    if (handleCharBinding(cm, e, ch)) return;
-    cm.display.input.onKeyPress(e);
-  }
-
-  // FOCUS/BLUR EVENTS
-
-  function delayBlurEvent(cm) {
-    cm.state.delayingBlurEvent = true;
-    setTimeout(function() {
-      if (cm.state.delayingBlurEvent) {
-        cm.state.delayingBlurEvent = false;
-        onBlur(cm);
-      }
-    }, 100);
-  }
-
-  function onFocus(cm, e) {
-    if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
-
-    if (cm.options.readOnly == "nocursor") return;
-    if (!cm.state.focused) {
-      signal(cm, "focus", cm, e);
-      cm.state.focused = true;
-      addClass(cm.display.wrapper, "CodeMirror-focused");
-      // This test prevents this from firing when a context
-      // menu is closed (since the input reset would kill the
-      // select-all detection hack)
-      if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
-        cm.display.input.reset();
-        if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
-      }
-      cm.display.input.receivedFocus();
-    }
-    restartBlink(cm);
-  }
-  function onBlur(cm, e) {
-    if (cm.state.delayingBlurEvent) return;
-
-    if (cm.state.focused) {
-      signal(cm, "blur", cm, e);
-      cm.state.focused = false;
-      rmClass(cm.display.wrapper, "CodeMirror-focused");
-    }
-    clearInterval(cm.display.blinker);
-    setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150);
-  }
-
-  // CONTEXT MENU HANDLING
-
-  // To make the context menu work, we need to briefly unhide the
-  // textarea (making it as unobtrusive as possible) to let the
-  // right-click take effect on it.
-  function onContextMenu(cm, e) {
-    if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
-    if (signalDOMEvent(cm, e, "contextmenu")) return;
-    cm.display.input.onContextMenu(e);
-  }
-
-  function contextMenuInGutter(cm, e) {
-    if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false);
-  }
-
-  // UPDATING
-
-  // Compute the position of the end of a change (its 'to' property
-  // refers to the pre-change end).
-  var changeEnd = CodeMirror.changeEnd = function(change) {
-    if (!change.text) return change.to;
-    return Pos(change.from.line + change.text.length - 1,
-               lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
-  };
-
-  // Adjust a position to refer to the post-change position of the
-  // same text, or the end of the change if the change covers it.
-  function adjustForChange(pos, change) {
-    if (cmp(pos, change.from) < 0) return pos;
-    if (cmp(pos, change.to) <= 0) return changeEnd(change);
-
-    var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
-    if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch;
-    return Pos(line, ch);
-  }
-
-  function computeSelAfterChange(doc, change) {
-    var out = [];
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      var range = doc.sel.ranges[i];
-      out.push(new Range(adjustForChange(range.anchor, change),
-                         adjustForChange(range.head, change)));
-    }
-    return normalizeSelection(out, doc.sel.primIndex);
-  }
-
-  function offsetPos(pos, old, nw) {
-    if (pos.line == old.line)
-      return Pos(nw.line, pos.ch - old.ch + nw.ch);
-    else
-      return Pos(nw.line + (pos.line - old.line), pos.ch);
-  }
-
-  // Used by replaceSelections to allow moving the selection to the
-  // start or around the replaced test. Hint may be "start" or "around".
-  function computeReplacedSel(doc, changes, hint) {
-    var out = [];
-    var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
-    for (var i = 0; i < changes.length; i++) {
-      var change = changes[i];
-      var from = offsetPos(change.from, oldPrev, newPrev);
-      var to = offsetPos(changeEnd(change), oldPrev, newPrev);
-      oldPrev = change.to;
-      newPrev = to;
-      if (hint == "around") {
-        var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
-        out[i] = new Range(inv ? to : from, inv ? from : to);
-      } else {
-        out[i] = new Range(from, from);
-      }
-    }
-    return new Selection(out, doc.sel.primIndex);
-  }
-
-  // Allow "beforeChange" event handlers to influence a change
-  function filterChange(doc, change, update) {
-    var obj = {
-      canceled: false,
-      from: change.from,
-      to: change.to,
-      text: change.text,
-      origin: change.origin,
-      cancel: function() { this.canceled = true; }
-    };
-    if (update) obj.update = function(from, to, text, origin) {
-      if (from) this.from = clipPos(doc, from);
-      if (to) this.to = clipPos(doc, to);
-      if (text) this.text = text;
-      if (origin !== undefined) this.origin = origin;
-    };
-    signal(doc, "beforeChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj);
-
-    if (obj.canceled) return null;
-    return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin};
-  }
-
-  // Apply a change to a document, and add it to the document's
-  // history, and propagating it to all linked documents.
-  function makeChange(doc, change, ignoreReadOnly) {
-    if (doc.cm) {
-      if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly);
-      if (doc.cm.state.suppressEdits) return;
-    }
-
-    if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
-      change = filterChange(doc, change, true);
-      if (!change) return;
-    }
-
-    // Possibly split or suppress the update based on the presence
-    // of read-only spans in its range.
-    var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
-    if (split) {
-      for (var i = split.length - 1; i >= 0; --i)
-        makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text});
-    } else {
-      makeChangeInner(doc, change);
-    }
-  }
-
-  function makeChangeInner(doc, change) {
-    if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return;
-    var selAfter = computeSelAfterChange(doc, change);
-    addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
-
-    makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
-    var rebased = [];
-
-    linkedDocs(doc, function(doc, sharedHist) {
-      if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-        rebaseHist(doc.history, change);
-        rebased.push(doc.history);
-      }
-      makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
-    });
-  }
-
-  // Revert a change stored in a document's history.
-  function makeChangeFromHistory(doc, type, allowSelectionOnly) {
-    if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return;
-
-    var hist = doc.history, event, selAfter = doc.sel;
-    var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
-
-    // Verify that there is a useable event (so that ctrl-z won't
-    // needlessly clear selection events)
-    for (var i = 0; i < source.length; i++) {
-      event = source[i];
-      if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
-        break;
-    }
-    if (i == source.length) return;
-    hist.lastOrigin = hist.lastSelOrigin = null;
-
-    for (;;) {
-      event = source.pop();
-      if (event.ranges) {
-        pushSelectionToHistory(event, dest);
-        if (allowSelectionOnly && !event.equals(doc.sel)) {
-          setSelection(doc, event, {clearRedo: false});
-          return;
-        }
-        selAfter = event;
-      }
-      else break;
-    }
-
-    // Build up a reverse change object to add to the opposite history
-    // stack (redo when undoing, and vice versa).
-    var antiChanges = [];
-    pushSelectionToHistory(selAfter, dest);
-    dest.push({changes: antiChanges, generation: hist.generation});
-    hist.generation = event.generation || ++hist.maxGeneration;
-
-    var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
-
-    for (var i = event.changes.length - 1; i >= 0; --i) {
-      var change = event.changes[i];
-      change.origin = type;
-      if (filter && !filterChange(doc, change, false)) {
-        source.length = 0;
-        return;
-      }
-
-      antiChanges.push(historyChangeFromChange(doc, change));
-
-      var after = i ? computeSelAfterChange(doc, change) : lst(source);
-      makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
-      if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)});
-      var rebased = [];
-
-      // Propagate to the linked documents
-      linkedDocs(doc, function(doc, sharedHist) {
-        if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-          rebaseHist(doc.history, change);
-          rebased.push(doc.history);
-        }
-        makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
-      });
-    }
-  }
-
-  // Sub-views need their line numbers shifted when text is added
-  // above or below them in the parent document.
-  function shiftDoc(doc, distance) {
-    if (distance == 0) return;
-    doc.first += distance;
-    doc.sel = new Selection(map(doc.sel.ranges, function(range) {
-      return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
-                       Pos(range.head.line + distance, range.head.ch));
-    }), doc.sel.primIndex);
-    if (doc.cm) {
-      regChange(doc.cm, doc.first, doc.first - distance, distance);
-      for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
-        regLineChange(doc.cm, l, "gutter");
-    }
-  }
-
-  // More lower-level change function, handling only a single document
-  // (not linked ones).
-  function makeChangeSingleDoc(doc, change, selAfter, spans) {
-    if (doc.cm && !doc.cm.curOp)
-      return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans);
-
-    if (change.to.line < doc.first) {
-      shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
-      return;
-    }
-    if (change.from.line > doc.lastLine()) return;
-
-    // Clip the change to the size of this doc
-    if (change.from.line < doc.first) {
-      var shift = change.text.length - 1 - (doc.first - change.from.line);
-      shiftDoc(doc, shift);
-      change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
-                text: [lst(change.text)], origin: change.origin};
-    }
-    var last = doc.lastLine();
-    if (change.to.line > last) {
-      change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
-                text: [change.text[0]], origin: change.origin};
-    }
-
-    change.removed = getBetween(doc, change.from, change.to);
-
-    if (!selAfter) selAfter = computeSelAfterChange(doc, change);
-    if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
-    else updateDoc(doc, change, spans);
-    setSelectionNoUndo(doc, selAfter, sel_dontScroll);
-  }
-
-  // Handle the interaction of a change to a document with the editor
-  // that this document is part of.
-  function makeChangeSingleDocInEditor(cm, change, spans) {
-    var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
-
-    var recomputeMaxLength = false, checkWidthStart = from.line;
-    if (!cm.options.lineWrapping) {
-      checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
-      doc.iter(checkWidthStart, to.line + 1, function(line) {
-        if (line == display.maxLine) {
-          recomputeMaxLength = true;
-          return true;
-        }
-      });
-    }
-
-    if (doc.sel.contains(change.from, change.to) > -1)
-      signalCursorActivity(cm);
-
-    updateDoc(doc, change, spans, estimateHeight(cm));
-
-    if (!cm.options.lineWrapping) {
-      doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
-        var len = lineLength(line);
-        if (len > display.maxLineLength) {
-          display.maxLine = line;
-          display.maxLineLength = len;
-          display.maxLineChanged = true;
-          recomputeMaxLength = false;
-        }
-      });
-      if (recomputeMaxLength) cm.curOp.updateMaxLine = true;
-    }
-
-    // Adjust frontier, schedule worker
-    doc.frontier = Math.min(doc.frontier, from.line);
-    startWorker(cm, 400);
-
-    var lendiff = change.text.length - (to.line - from.line) - 1;
-    // Remember that these lines changed, for updating the display
-    if (change.full)
-      regChange(cm);
-    else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
-      regLineChange(cm, from.line, "text");
-    else
-      regChange(cm, from.line, to.line + 1, lendiff);
-
-    var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
-    if (changeHandler || changesHandler) {
-      var obj = {
-        from: from, to: to,
-        text: change.text,
-        removed: change.removed,
-        origin: change.origin
-      };
-      if (changeHandler) signalLater(cm, "change", cm, obj);
-      if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj);
-    }
-    cm.display.selForContextMenu = null;
-  }
-
-  function replaceRange(doc, code, from, to, origin) {
-    if (!to) to = from;
-    if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
-    if (typeof code == "string") code = doc.splitLines(code);
-    makeChange(doc, {from: from, to: to, text: code, origin: origin});
-  }
-
-  // SCROLLING THINGS INTO VIEW
-
-  // If an editor sits on the top or bottom of the window, partially
-  // scrolled out of view, this ensures that the cursor is visible.
-  function maybeScrollWindow(cm, coords) {
-    if (signalDOMEvent(cm, "scrollCursorIntoView")) return;
-
-    var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
-    if (coords.top + box.top < 0) doScroll = true;
-    else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
-    if (doScroll != null && !phantom) {
-      var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
-                           (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
-                           (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
-                           coords.left + "px; width: 2px;");
-      cm.display.lineSpace.appendChild(scrollNode);
-      scrollNode.scrollIntoView(doScroll);
-      cm.display.lineSpace.removeChild(scrollNode);
-    }
-  }
-
-  // Scroll a given position into view (immediately), verifying that
-  // it actually became visible (as line heights are accurately
-  // measured, the position of something may 'drift' during drawing).
-  function scrollPosIntoView(cm, pos, end, margin) {
-    if (margin == null) margin = 0;
-    for (var limit = 0; limit < 5; limit++) {
-      var changed = false, coords = cursorCoords(cm, pos);
-      var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
-      var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
-                                         Math.min(coords.top, endCoords.top) - margin,
-                                         Math.max(coords.left, endCoords.left),
-                                         Math.max(coords.bottom, endCoords.bottom) + margin);
-      var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
-      if (scrollPos.scrollTop != null) {
-        setScrollTop(cm, scrollPos.scrollTop);
-        if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true;
-      }
-      if (scrollPos.scrollLeft != null) {
-        setScrollLeft(cm, scrollPos.scrollLeft);
-        if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
-      }
-      if (!changed) break;
-    }
-    return coords;
-  }
-
-  // Scroll a given set of coordinates into view (immediately).
-  function scrollIntoView(cm, x1, y1, x2, y2) {
-    var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2);
-    if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop);
-    if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft);
-  }
-
-  // Calculate a new scroll position needed to scroll the given
-  // rectangle into view. Returns an object with scrollTop and
-  // scrollLeft properties. When these are undefined, the
-  // vertical/horizontal position does not need to be adjusted.
-  function calculateScrollPos(cm, x1, y1, x2, y2) {
-    var display = cm.display, snapMargin = textHeight(cm.display);
-    if (y1 < 0) y1 = 0;
-    var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
-    var screen = displayHeight(cm), result = {};
-    if (y2 - y1 > screen) y2 = y1 + screen;
-    var docBottom = cm.doc.height + paddingVert(display);
-    var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
-    if (y1 < screentop) {
-      result.scrollTop = atTop ? 0 : y1;
-    } else if (y2 > screentop + screen) {
-      var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen);
-      if (newTop != screentop) result.scrollTop = newTop;
-    }
-
-    var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
-    var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
-    var tooWide = x2 - x1 > screenw;
-    if (tooWide) x2 = x1 + screenw;
-    if (x1 < 10)
-      result.scrollLeft = 0;
-    else if (x1 < screenleft)
-      result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
-    else if (x2 > screenw + screenleft - 3)
-      result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
-    return result;
-  }
-
-  // Store a relative adjustment to the scroll position in the current
-  // operation (to be applied when the operation finishes).
-  function addToScrollPos(cm, left, top) {
-    if (left != null || top != null) resolveScrollToPos(cm);
-    if (left != null)
-      cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left;
-    if (top != null)
-      cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
-  }
-
-  // Make sure that at the end of the operation the current cursor is
-  // shown.
-  function ensureCursorVisible(cm) {
-    resolveScrollToPos(cm);
-    var cur = cm.getCursor(), from = cur, to = cur;
-    if (!cm.options.lineWrapping) {
-      from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur;
-      to = Pos(cur.line, cur.ch + 1);
-    }
-    cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true};
-  }
-
-  // When an operation has its scrollToPos property set, and another
-  // scroll action is applied before the end of the operation, this
-  // 'simulates' scrolling that position into view in a cheap way, so
-  // that the effect of intermediate scroll commands is not ignored.
-  function resolveScrollToPos(cm) {
-    var range = cm.curOp.scrollToPos;
-    if (range) {
-      cm.curOp.scrollToPos = null;
-      var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to);
-      var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
-                                    Math.min(from.top, to.top) - range.margin,
-                                    Math.max(from.right, to.right),
-                                    Math.max(from.bottom, to.bottom) + range.margin);
-      cm.scrollTo(sPos.scrollLeft, sPos.scrollTop);
-    }
-  }
-
-  // API UTILITIES
-
-  // Indent the given line. The how parameter can be "smart",
-  // "add"/null, "subtract", or "prev". When aggressive is false
-  // (typically set to true for forced single-line indents), empty
-  // lines are not indented, and places where the mode returns Pass
-  // are left alone.
-  function indentLine(cm, n, how, aggressive) {
-    var doc = cm.doc, state;
-    if (how == null) how = "add";
-    if (how == "smart") {
-      // Fall back to "prev" when the mode doesn't have an indentation
-      // method.
-      if (!doc.mode.indent) how = "prev";
-      else state = getStateBefore(cm, n);
-    }
-
-    var tabSize = cm.options.tabSize;
-    var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
-    if (line.stateAfter) line.stateAfter = null;
-    var curSpaceString = line.text.match(/^\s*/)[0], indentation;
-    if (!aggressive && !/\S/.test(line.text)) {
-      indentation = 0;
-      how = "not";
-    } else if (how == "smart") {
-      indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
-      if (indentation == Pass || indentation > 150) {
-        if (!aggressive) return;
-        how = "prev";
-      }
-    }
-    if (how == "prev") {
-      if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize);
-      else indentation = 0;
-    } else if (how == "add") {
-      indentation = curSpace + cm.options.indentUnit;
-    } else if (how == "subtract") {
-      indentation = curSpace - cm.options.indentUnit;
-    } else if (typeof how == "number") {
-      indentation = curSpace + how;
-    }
-    indentation = Math.max(0, indentation);
-
-    var indentString = "", pos = 0;
-    if (cm.options.indentWithTabs)
-      for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
-    if (pos < indentation) indentString += spaceStr(indentation - pos);
-
-    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.
-      for (var i = 0; i < doc.sel.ranges.length; i++) {
-        var range = doc.sel.ranges[i];
-        if (range.head.line == n && range.head.ch < curSpaceString.length) {
-          var pos = Pos(n, curSpaceString.length);
-          replaceOneSelection(doc, i, new Range(pos, pos));
-          break;
-        }
-      }
-    }
-  }
-
-  // Utility for applying a change to a line by handle or number,
-  // returning the number and optionally registering the line as
-  // changed.
-  function changeLine(doc, handle, changeType, op) {
-    var no = handle, line = handle;
-    if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
-    else no = lineNo(handle);
-    if (no == null) return null;
-    if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType);
-    return line;
-  }
-
-  // Helper for deleting text near the selection(s), used to implement
-  // backspace, delete, and similar functionality.
-  function deleteNearSelection(cm, compute) {
-    var ranges = cm.doc.sel.ranges, kill = [];
-    // Build up a set of ranges to kill first, merging overlapping
-    // ranges.
-    for (var i = 0; i < ranges.length; i++) {
-      var toKill = compute(ranges[i]);
-      while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
-        var replaced = kill.pop();
-        if (cmp(replaced.from, toKill.from) < 0) {
-          toKill.from = replaced.from;
-          break;
-        }
-      }
-      kill.push(toKill);
-    }
-    // Next, remove those actual ranges.
-    runInOp(cm, function() {
-      for (var i = kill.length - 1; i >= 0; i--)
-        replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
-      ensureCursorVisible(cm);
-    });
-  }
-
-  // Used for horizontal relative motion. Dir is -1 or 1 (left or
-  // right), unit can be "char", "column" (like char, but doesn't
-  // cross line boundaries), "word" (across next word), or "group" (to
-  // the start of next group of word or non-word-non-whitespace
-  // chars). The visually param controls whether, in right-to-left
-  // text, direction 1 means to move towards the next index in the
-  // string, or towards the character to the right of the current
-  // position. The resulting position will have a hitSide=true
-  // property if it reached the end of the document.
-  function findPosH(doc, pos, dir, unit, visually) {
-    var line = pos.line, ch = pos.ch, origDir = dir;
-    var lineObj = getLine(doc, line);
-    function findNextLine() {
-      var l = line + dir;
-      if (l < doc.first || l >= doc.first + doc.size) return false
-      line = l;
-      return lineObj = getLine(doc, l);
-    }
-    function moveOnce(boundToLine) {
-      var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true);
-      if (next == null) {
-        if (!boundToLine && findNextLine()) {
-          if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
-          else ch = dir < 0 ? lineObj.text.length : 0;
-        } else return false
-      } else ch = next;
-      return true;
-    }
-
-    if (unit == "char") {
-      moveOnce()
-    } else if (unit == "column") {
-      moveOnce(true)
-    } else if (unit == "word" || unit == "group") {
-      var sawType = null, group = unit == "group";
-      var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
-      for (var first = true;; first = false) {
-        if (dir < 0 && !moveOnce(!first)) break;
-        var cur = lineObj.text.charAt(ch) || "\n";
-        var type = isWordChar(cur, helper) ? "w"
-          : group && cur == "\n" ? "n"
-          : !group || /\s/.test(cur) ? null
-          : "p";
-        if (group && !first && !type) type = "s";
-        if (sawType && sawType != type) {
-          if (dir < 0) {dir = 1; moveOnce();}
-          break;
-        }
-
-        if (type) sawType = type;
-        if (dir > 0 && !moveOnce(!first)) break;
-      }
-    }
-    var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
-    if (!cmp(pos, result)) result.hitSide = true;
-    return result;
-  }
-
-  // For relative vertical movement. Dir may be -1 or 1. Unit can be
-  // "page" or "line". The resulting position will have a hitSide=true
-  // property if it reached the end of the document.
-  function findPosV(cm, pos, dir, unit) {
-    var doc = cm.doc, x = pos.left, y;
-    if (unit == "page") {
-      var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
-      var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3);
-      y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount;
-    } else if (unit == "line") {
-      y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
-    }
-    for (;;) {
-      var target = coordsChar(cm, x, y);
-      if (!target.outside) break;
-      if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }
-      y += dir * 5;
-    }
-    return target;
-  }
-
-  // EDITOR METHODS
-
-  // The publicly visible API. Note that methodOp(f) means
-  // 'wrap f in an operation, performed on its `this` parameter'.
-
-  // This is not the complete set of editor methods. Most of the
-  // methods defined on the Doc type are also injected into
-  // CodeMirror.prototype, for backwards compatibility and
-  // convenience.
-
-  CodeMirror.prototype = {
-    constructor: CodeMirror,
-    focus: function(){window.focus(); this.display.input.focus();},
-
-    setOption: function(option, value) {
-      var options = this.options, old = options[option];
-      if (options[option] == value && option != "mode") return;
-      options[option] = value;
-      if (optionHandlers.hasOwnProperty(option))
-        operation(this, optionHandlers[option])(this, value, old);
-    },
-
-    getOption: function(option) {return this.options[option];},
-    getDoc: function() {return this.doc;},
-
-    addKeyMap: function(map, bottom) {
-      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
-    },
-    removeKeyMap: function(map) {
-      var maps = this.state.keyMaps;
-      for (var i = 0; i < maps.length; ++i)
-        if (maps[i] == map || maps[i].name == map) {
-          maps.splice(i, 1);
-          return true;
-        }
-    },
-
-    addOverlay: methodOp(function(spec, options) {
-      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
-      if (mode.startState) throw new Error("Overlays may not be stateful.");
-      insertSorted(this.state.overlays,
-                   {mode: mode, modeSpec: spec, opaque: options && options.opaque,
-                    priority: (options && options.priority) || 0},
-                   function(overlay) { return overlay.priority })
-      this.state.modeGen++;
-      regChange(this);
-    }),
-    removeOverlay: methodOp(function(spec) {
-      var overlays = this.state.overlays;
-      for (var i = 0; i < overlays.length; ++i) {
-        var cur = overlays[i].modeSpec;
-        if (cur == spec || typeof spec == "string" && cur.name == spec) {
-          overlays.splice(i, 1);
-          this.state.modeGen++;
-          regChange(this);
-          return;
-        }
-      }
-    }),
-
-    indentLine: methodOp(function(n, dir, aggressive) {
-      if (typeof dir != "string" && typeof dir != "number") {
-        if (dir == null) dir = this.options.smartIndent ? "smart" : "prev";
-        else dir = dir ? "add" : "subtract";
-      }
-      if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
-    }),
-    indentSelection: methodOp(function(how) {
-      var ranges = this.doc.sel.ranges, end = -1;
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (!range.empty()) {
-          var from = range.from(), to = range.to();
-          var start = Math.max(end, from.line);
-          end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
-          for (var j = start; j < end; ++j)
-            indentLine(this, j, how);
-          var newRanges = this.doc.sel.ranges;
-          if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
-            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll);
-        } else if (range.head.line > end) {
-          indentLine(this, range.head.line, how, true);
-          end = range.head.line;
-          if (i == this.doc.sel.primIndex) ensureCursorVisible(this);
-        }
-      }
-    }),
-
-    // Fetch the parser token for a given character. Useful for hacks
-    // that want to inspect the mode state (say, for completion).
-    getTokenAt: function(pos, precise) {
-      return takeToken(this, pos, precise);
-    },
-
-    getLineTokens: function(line, precise) {
-      return takeToken(this, Pos(line), precise, true);
-    },
-
-    getTokenTypeAt: function(pos) {
-      pos = clipPos(this.doc, pos);
-      var styles = getLineStyles(this, getLine(this.doc, pos.line));
-      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
-      var type;
-      if (ch == 0) type = styles[2];
-      else for (;;) {
-        var mid = (before + after) >> 1;
-        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
-        else if (styles[mid * 2 + 1] < ch) before = mid + 1;
-        else { type = styles[mid * 2 + 2]; break; }
-      }
-      var cut = type ? type.indexOf("cm-overlay ") : -1;
-      return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1);
-    },
-
-    getModeAt: function(pos) {
-      var mode = this.doc.mode;
-      if (!mode.innerMode) return mode;
-      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;
-    },
-
-    getHelper: function(pos, type) {
-      return this.getHelpers(pos, type)[0];
-    },
-
-    getHelpers: function(pos, type) {
-      var found = [];
-      if (!helpers.hasOwnProperty(type)) return found;
-      var help = helpers[type], mode = this.getModeAt(pos);
-      if (typeof mode[type] == "string") {
-        if (help[mode[type]]) found.push(help[mode[type]]);
-      } else if (mode[type]) {
-        for (var i = 0; i < mode[type].length; i++) {
-          var val = help[mode[type][i]];
-          if (val) found.push(val);
-        }
-      } else if (mode.helperType && help[mode.helperType]) {
-        found.push(help[mode.helperType]);
-      } else if (help[mode.name]) {
-        found.push(help[mode.name]);
-      }
-      for (var i = 0; i < help._global.length; i++) {
-        var cur = help._global[i];
-        if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)
-          found.push(cur.val);
-      }
-      return found;
-    },
-
-    getStateAfter: function(line, precise) {
-      var doc = this.doc;
-      line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
-      return getStateBefore(this, line + 1, precise);
-    },
-
-    cursorCoords: function(start, mode) {
-      var pos, range = this.doc.sel.primary();
-      if (start == null) pos = range.head;
-      else if (typeof start == "object") pos = clipPos(this.doc, start);
-      else pos = start ? range.from() : range.to();
-      return cursorCoords(this, pos, mode || "page");
-    },
-
-    charCoords: function(pos, mode) {
-      return charCoords(this, clipPos(this.doc, pos), mode || "page");
-    },
-
-    coordsChar: function(coords, mode) {
-      coords = fromCoordSystem(this, coords, mode || "page");
-      return coordsChar(this, coords.left, coords.top);
-    },
-
-    lineAtHeight: function(height, mode) {
-      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
-      return lineAtHeight(this.doc, height + this.display.viewOffset);
-    },
-    heightAtLine: function(line, mode) {
-      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);
-    },
-
-    defaultTextHeight: function() { return textHeight(this.display); },
-    defaultCharWidth: function() { return charWidth(this.display); },
-
-    setGutterMarker: methodOp(function(line, gutterID, value) {
-      return changeLine(this.doc, line, "gutter", function(line) {
-        var markers = line.gutterMarkers || (line.gutterMarkers = {});
-        markers[gutterID] = value;
-        if (!value && isEmpty(markers)) line.gutterMarkers = null;
-        return true;
-      });
-    }),
-
-    clearGutter: methodOp(function(gutterID) {
-      var cm = this, doc = cm.doc, i = doc.first;
-      doc.iter(function(line) {
-        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
-          line.gutterMarkers[gutterID] = null;
-          regLineChange(cm, i, "gutter");
-          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null;
-        }
-        ++i;
-      });
-    }),
-
-    lineInfo: function(line) {
-      if (typeof line == "number") {
-        if (!isLine(this.doc, line)) return null;
-        var n = line;
-        line = getLine(this.doc, line);
-        if (!line) return null;
-      } else {
-        var n = lineNo(line);
-        if (n == null) return null;
-      }
-      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
-              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
-              widgets: line.widgets};
-    },
-
-    getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo};},
-
-    addWidget: function(pos, node, scroll, vert, horiz) {
-      var display = this.display;
-      pos = cursorCoords(this, clipPos(this.doc, pos));
-      var top = pos.bottom, left = pos.left;
-      node.style.position = "absolute";
-      node.setAttribute("cm-ignore-events", "true");
-      this.display.input.setUneditable(node);
-      display.sizer.appendChild(node);
-      if (vert == "over") {
-        top = pos.top;
-      } else if (vert == "above" || vert == "near") {
-        var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
-        hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
-        // Default to positioning above (if specified and possible); otherwise default to positioning below
-        if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
-          top = pos.top - node.offsetHeight;
-        else if (pos.bottom + node.offsetHeight <= vspace)
-          top = pos.bottom;
-        if (left + node.offsetWidth > hspace)
-          left = hspace - node.offsetWidth;
-      }
-      node.style.top = top + "px";
-      node.style.left = node.style.right = "";
-      if (horiz == "right") {
-        left = display.sizer.clientWidth - node.offsetWidth;
-        node.style.right = "0px";
-      } else {
-        if (horiz == "left") left = 0;
-        else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2;
-        node.style.left = left + "px";
-      }
-      if (scroll)
-        scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight);
-    },
-
-    triggerOnKeyDown: methodOp(onKeyDown),
-    triggerOnKeyPress: methodOp(onKeyPress),
-    triggerOnKeyUp: onKeyUp,
-
-    execCommand: function(cmd) {
-      if (commands.hasOwnProperty(cmd))
-        return commands[cmd].call(null, this);
-    },
-
-    triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
-
-    findPosH: function(from, amount, unit, visually) {
-      var dir = 1;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        cur = findPosH(this.doc, cur, dir, unit, visually);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveH: methodOp(function(dir, unit) {
-      var cm = this;
-      cm.extendSelectionsBy(function(range) {
-        if (cm.display.shift || cm.doc.extend || range.empty())
-          return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
-        else
-          return dir < 0 ? range.from() : range.to();
-      }, sel_move);
-    }),
-
-    deleteH: methodOp(function(dir, unit) {
-      var sel = this.doc.sel, doc = this.doc;
-      if (sel.somethingSelected())
-        doc.replaceSelection("", null, "+delete");
-      else
-        deleteNearSelection(this, function(range) {
-          var other = findPosH(doc, range.head, dir, unit, false);
-          return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other};
-        });
-    }),
-
-    findPosV: function(from, amount, unit, goalColumn) {
-      var dir = 1, x = goalColumn;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        var coords = cursorCoords(this, cur, "div");
-        if (x == null) x = coords.left;
-        else coords.left = x;
-        cur = findPosV(this, coords, dir, unit);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveV: methodOp(function(dir, unit) {
-      var cm = this, doc = this.doc, goals = [];
-      var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected();
-      doc.extendSelectionsBy(function(range) {
-        if (collapse)
-          return dir < 0 ? range.from() : range.to();
-        var headPos = cursorCoords(cm, range.head, "div");
-        if (range.goalColumn != null) headPos.left = range.goalColumn;
-        goals.push(headPos.left);
-        var pos = findPosV(cm, headPos, dir, unit);
-        if (unit == "page" && range == doc.sel.primary())
-          addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top);
-        return pos;
-      }, sel_move);
-      if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
-        doc.sel.ranges[i].goalColumn = goals[i];
-    }),
-
-    // Find the word at the given position (as returned by coordsChar).
-    findWordAt: function(pos) {
-      var doc = this.doc, line = getLine(doc, pos.line).text;
-      var start = pos.ch, end = pos.ch;
-      if (line) {
-        var helper = this.getHelper(pos, "wordChars");
-        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
-        var startChar = line.charAt(start);
-        var check = isWordChar(startChar, helper)
-          ? function(ch) { return isWordChar(ch, helper); }
-          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
-          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-        while (start > 0 && check(line.charAt(start - 1))) --start;
-        while (end < line.length && check(line.charAt(end))) ++end;
-      }
-      return new Range(Pos(pos.line, start), Pos(pos.line, end));
-    },
-
-    toggleOverwrite: function(value) {
-      if (value != null && value == this.state.overwrite) return;
-      if (this.state.overwrite = !this.state.overwrite)
-        addClass(this.display.cursorDiv, "CodeMirror-overwrite");
-      else
-        rmClass(this.display.cursorDiv, "CodeMirror-overwrite");
-
-      signal(this, "overwriteToggle", this, this.state.overwrite);
-    },
-    hasFocus: function() { return this.display.input.getField() == activeElt(); },
-    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); },
-
-    scrollTo: methodOp(function(x, y) {
-      if (x != null || y != null) resolveScrollToPos(this);
-      if (x != null) this.curOp.scrollLeft = x;
-      if (y != null) this.curOp.scrollTop = y;
-    }),
-    getScrollInfo: function() {
-      var scroller = this.display.scroller;
-      return {left: scroller.scrollLeft, top: scroller.scrollTop,
-              height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
-              width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
-              clientHeight: displayHeight(this), clientWidth: displayWidth(this)};
-    },
-
-    scrollIntoView: methodOp(function(range, margin) {
-      if (range == null) {
-        range = {from: this.doc.sel.primary().head, to: null};
-        if (margin == null) margin = this.options.cursorScrollMargin;
-      } else if (typeof range == "number") {
-        range = {from: Pos(range, 0), to: null};
-      } else if (range.from == null) {
-        range = {from: range, to: null};
-      }
-      if (!range.to) range.to = range.from;
-      range.margin = margin || 0;
-
-      if (range.from.line != null) {
-        resolveScrollToPos(this);
-        this.curOp.scrollToPos = range;
-      } else {
-        var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
-                                      Math.min(range.from.top, range.to.top) - range.margin,
-                                      Math.max(range.from.right, range.to.right),
-                                      Math.max(range.from.bottom, range.to.bottom) + range.margin);
-        this.scrollTo(sPos.scrollLeft, sPos.scrollTop);
-      }
-    }),
-
-    setSize: methodOp(function(width, height) {
-      var cm = this;
-      function interpret(val) {
-        return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
-      }
-      if (width != null) cm.display.wrapper.style.width = interpret(width);
-      if (height != null) cm.display.wrapper.style.height = interpret(height);
-      if (cm.options.lineWrapping) clearLineMeasurementCache(this);
-      var lineNo = cm.display.viewFrom;
-      cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
-        if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
-          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; }
-        ++lineNo;
-      });
-      cm.curOp.forceUpdate = true;
-      signal(cm, "refresh", this);
-    }),
-
-    operation: function(f){return runInOp(this, f);},
-
-    refresh: methodOp(function() {
-      var oldHeight = this.display.cachedTextHeight;
-      regChange(this);
-      this.curOp.forceUpdate = true;
-      clearCaches(this);
-      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
-      updateGutterSpace(this);
-      if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
-        estimateLineHeights(this);
-      signal(this, "refresh", this);
-    }),
-
-    swapDoc: methodOp(function(doc) {
-      var old = this.doc;
-      old.cm = null;
-      attachDoc(this, doc);
-      clearCaches(this);
-      this.display.input.reset();
-      this.scrollTo(doc.scrollLeft, doc.scrollTop);
-      this.curOp.forceScroll = true;
-      signalLater(this, "swapDoc", this, old);
-      return old;
-    }),
-
-    getInputField: function(){return this.display.input.getField();},
-    getWrapperElement: function(){return this.display.wrapper;},
-    getScrollerElement: function(){return this.display.scroller;},
-    getGutterElement: function(){return this.display.gutters;}
-  };
-  eventMixin(CodeMirror);
-
-  // OPTION DEFAULTS
-
-  // The default configuration options.
-  var defaults = CodeMirror.defaults = {};
-  // Functions to run when options are changed.
-  var optionHandlers = CodeMirror.optionHandlers = {};
-
-  function option(name, deflt, handle, notOnInit) {
-    CodeMirror.defaults[name] = deflt;
-    if (handle) optionHandlers[name] =
-      notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle;
-  }
-
-  // Passed to option handlers when there is no old value.
-  var Init = CodeMirror.Init = {toString: function(){return "CodeMirror.Init";}};
-
-  // These two are, on init, called from the constructor because they
-  // have to be initialized before the editor can start at all.
-  option("value", "", function(cm, val) {
-    cm.setValue(val);
-  }, true);
-  option("mode", null, function(cm, val) {
-    cm.doc.modeOption = val;
-    loadMode(cm);
-  }, true);
-
-  option("indentUnit", 2, loadMode, true);
-  option("indentWithTabs", false);
-  option("smartIndent", true);
-  option("tabSize", 4, function(cm) {
-    resetModeState(cm);
-    clearCaches(cm);
-    regChange(cm);
-  }, true);
-  option("lineSeparator", null, function(cm, val) {
-    cm.doc.lineSep = val;
-    if (!val) return;
-    var newBreaks = [], lineNo = cm.doc.first;
-    cm.doc.iter(function(line) {
-      for (var pos = 0;;) {
-        var found = line.text.indexOf(val, pos);
-        if (found == -1) break;
-        pos = found + val.length;
-        newBreaks.push(Pos(lineNo, found));
-      }
-      lineNo++;
-    });
-    for (var i = newBreaks.length - 1; i >= 0; i--)
-      replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
-  });
-  option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
-    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
-    if (old != CodeMirror.Init) cm.refresh();
-  });
-  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
-  option("electricChars", true);
-  option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
-    throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
-  }, true);
-  option("spellcheck", false, function(cm, val) {
-    cm.getInputField().spellcheck = val
-  }, true);
-  option("rtlMoveVisually", !windows);
-  option("wholeLineUpdateBefore", true);
-
-  option("theme", "default", function(cm) {
-    themeChanged(cm);
-    guttersChanged(cm);
-  }, true);
-  option("keyMap", "default", function(cm, val, old) {
-    var next = getKeyMap(val);
-    var prev = old != CodeMirror.Init && getKeyMap(old);
-    if (prev && prev.detach) prev.detach(cm, next);
-    if (next.attach) next.attach(cm, prev || null);
-  });
-  option("extraKeys", null);
-
-  option("lineWrapping", false, wrappingChanged, true);
-  option("gutters", [], function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("fixedGutter", true, function(cm, val) {
-    cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
-    cm.refresh();
-  }, true);
-  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true);
-  option("scrollbarStyle", "native", function(cm) {
-    initScrollbars(cm);
-    updateScrollbars(cm);
-    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
-    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
-  }, true);
-  option("lineNumbers", false, function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("firstLineNumber", 1, guttersChanged, true);
-  option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true);
-  option("showCursorWhenSelecting", false, updateSelection, true);
-
-  option("resetSelectionOnContextMenu", true);
-  option("lineWiseCopyCut", true);
-
-  option("readOnly", false, function(cm, val) {
-    if (val == "nocursor") {
-      onBlur(cm);
-      cm.display.input.blur();
-      cm.display.disabled = true;
-    } else {
-      cm.display.disabled = false;
-    }
-    cm.display.input.readOnlyChanged(val)
-  });
-  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
-  option("dragDrop", true, dragDropChanged);
-  option("allowDropFileTypes", null);
-
-  option("cursorBlinkRate", 530);
-  option("cursorScrollMargin", 0);
-  option("cursorHeight", 1, updateSelection, true);
-  option("singleCursorHeightPerLine", true, updateSelection, true);
-  option("workTime", 100);
-  option("workDelay", 100);
-  option("flattenSpans", true, resetModeState, true);
-  option("addModeClass", false, resetModeState, true);
-  option("pollInterval", 100);
-  option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
-  option("historyEventDelay", 1250);
-  option("viewportMargin", 10, function(cm){cm.refresh();}, true);
-  option("maxHighlightLength", 10000, resetModeState, true);
-  option("moveInputWithCursor", true, function(cm, val) {
-    if (!val) cm.display.input.resetPosition();
-  });
-
-  option("tabindex", null, function(cm, val) {
-    cm.display.input.getField().tabIndex = val || "";
-  });
-  option("autofocus", null);
-
-  // MODE DEFINITION AND QUERYING
-
-  // Known modes, by name and by MIME
-  var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-
-  // Extra arguments are stored as the mode's dependencies, which is
-  // used by (legacy) mechanisms like loadmode.js to automatically
-  // load a mode. (Preferred mechanism is the require/define calls.)
-  CodeMirror.defineMode = function(name, mode) {
-    if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-    if (arguments.length > 2)
-      mode.dependencies = Array.prototype.slice.call(arguments, 2);
-    modes[name] = mode;
-  };
-
-  CodeMirror.defineMIME = function(mime, spec) {
-    mimeModes[mime] = spec;
-  };
-
-  // Given a MIME type, a {name, ...options} config object, or a name
-  // string, return a mode config object.
-  CodeMirror.resolveMode = function(spec) {
-    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-      spec = mimeModes[spec];
-    } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-      var found = mimeModes[spec.name];
-      if (typeof found == "string") found = {name: found};
-      spec = createObj(found, spec);
-      spec.name = found.name;
-    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
-      return CodeMirror.resolveMode("application/xml");
-    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {
-      return CodeMirror.resolveMode("application/json");
-    }
-    if (typeof spec == "string") return {name: spec};
-    else return spec || {name: "null"};
-  };
-
-  // Given a mode spec (anything that resolveMode accepts), find and
-  // initialize an actual mode object.
-  CodeMirror.getMode = function(options, spec) {
-    var spec = CodeMirror.resolveMode(spec);
-    var mfactory = modes[spec.name];
-    if (!mfactory) return CodeMirror.getMode(options, "text/plain");
-    var modeObj = mfactory(options, spec);
-    if (modeExtensions.hasOwnProperty(spec.name)) {
-      var exts = modeExtensions[spec.name];
-      for (var prop in exts) {
-        if (!exts.hasOwnProperty(prop)) continue;
-        if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
-        modeObj[prop] = exts[prop];
-      }
-    }
-    modeObj.name = spec.name;
-    if (spec.helperType) modeObj.helperType = spec.helperType;
-    if (spec.modeProps) for (var prop in spec.modeProps)
-      modeObj[prop] = spec.modeProps[prop];
-
-    return modeObj;
-  };
-
-  // Minimal default mode.
-  CodeMirror.defineMode("null", function() {
-    return {token: function(stream) {stream.skipToEnd();}};
-  });
-  CodeMirror.defineMIME("text/plain", "null");
-
-  // This can be used to attach properties to mode objects from
-  // outside the actual mode definition.
-  var modeExtensions = CodeMirror.modeExtensions = {};
-  CodeMirror.extendMode = function(mode, properties) {
-    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-    copyObj(properties, exts);
-  };
-
-  // EXTENSIONS
-
-  CodeMirror.defineExtension = function(name, func) {
-    CodeMirror.prototype[name] = func;
-  };
-  CodeMirror.defineDocExtension = function(name, func) {
-    Doc.prototype[name] = func;
-  };
-  CodeMirror.defineOption = option;
-
-  var initHooks = [];
-  CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
-
-  var helpers = CodeMirror.helpers = {};
-  CodeMirror.registerHelper = function(type, name, value) {
-    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []};
-    helpers[type][name] = value;
-  };
-  CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
-    CodeMirror.registerHelper(type, name, value);
-    helpers[type]._global.push({pred: predicate, val: value});
-  };
-
-  // MODE STATE HANDLING
-
-  // Utility functions for working with state. Exported because nested
-  // modes need to do this for their inner modes.
-
-  var copyState = CodeMirror.copyState = function(mode, state) {
-    if (state === true) return state;
-    if (mode.copyState) return mode.copyState(state);
-    var nstate = {};
-    for (var n in state) {
-      var val = state[n];
-      if (val instanceof Array) val = val.concat([]);
-      nstate[n] = val;
-    }
-    return nstate;
-  };
-
-  var startState = CodeMirror.startState = function(mode, a1, a2) {
-    return mode.startState ? mode.startState(a1, a2) : true;
-  };
-
-  // Given a mode and a state (for that mode), find the inner mode and
-  // state at the position that the state refers to.
-  CodeMirror.innerMode = function(mode, state) {
-    while (mode.innerMode) {
-      var info = mode.innerMode(state);
-      if (!info || info.mode == mode) break;
-      state = info.state;
-      mode = info.mode;
-    }
-    return info || {mode: mode, state: state};
-  };
-
-  // STANDARD COMMANDS
-
-  // Commands are parameter-less actions that can be performed on an
-  // editor, mostly used for keybindings.
-  var commands = CodeMirror.commands = {
-    selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);},
-    singleSelection: function(cm) {
-      cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll);
-    },
-    killLine: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        if (range.empty()) {
-          var len = getLine(cm.doc, range.head.line).text.length;
-          if (range.head.ch == len && range.head.line < cm.lastLine())
-            return {from: range.head, to: Pos(range.head.line + 1, 0)};
-          else
-            return {from: range.head, to: Pos(range.head.line, len)};
-        } else {
-          return {from: range.from(), to: range.to()};
-        }
-      });
-    },
-    deleteLine: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        return {from: Pos(range.from().line, 0),
-                to: clipPos(cm.doc, Pos(range.to().line + 1, 0))};
-      });
-    },
-    delLineLeft: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        return {from: Pos(range.from().line, 0), to: range.from()};
-      });
-    },
-    delWrappedLineLeft: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var leftPos = cm.coordsChar({left: 0, top: top}, "div");
-        return {from: leftPos, to: range.from()};
-      });
-    },
-    delWrappedLineRight: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-        return {from: range.from(), to: rightPos };
-      });
-    },
-    undo: function(cm) {cm.undo();},
-    redo: function(cm) {cm.redo();},
-    undoSelection: function(cm) {cm.undoSelection();},
-    redoSelection: function(cm) {cm.redoSelection();},
-    goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
-    goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
-    goLineStart: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); },
-                            {origin: "+move", bias: 1});
-    },
-    goLineStartSmart: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        return lineStartSmart(cm, range.head);
-      }, {origin: "+move", bias: 1});
-    },
-    goLineEnd: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); },
-                            {origin: "+move", bias: -1});
-    },
-    goLineRight: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-      }, sel_move);
-    },
-    goLineLeft: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        return cm.coordsChar({left: 0, top: top}, "div");
-      }, sel_move);
-    },
-    goLineLeftSmart: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var pos = cm.coordsChar({left: 0, top: top}, "div");
-        if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head);
-        return pos;
-      }, sel_move);
-    },
-    goLineUp: function(cm) {cm.moveV(-1, "line");},
-    goLineDown: function(cm) {cm.moveV(1, "line");},
-    goPageUp: function(cm) {cm.moveV(-1, "page");},
-    goPageDown: function(cm) {cm.moveV(1, "page");},
-    goCharLeft: function(cm) {cm.moveH(-1, "char");},
-    goCharRight: function(cm) {cm.moveH(1, "char");},
-    goColumnLeft: function(cm) {cm.moveH(-1, "column");},
-    goColumnRight: function(cm) {cm.moveH(1, "column");},
-    goWordLeft: function(cm) {cm.moveH(-1, "word");},
-    goGroupRight: function(cm) {cm.moveH(1, "group");},
-    goGroupLeft: function(cm) {cm.moveH(-1, "group");},
-    goWordRight: function(cm) {cm.moveH(1, "word");},
-    delCharBefore: function(cm) {cm.deleteH(-1, "char");},
-    delCharAfter: function(cm) {cm.deleteH(1, "char");},
-    delWordBefore: function(cm) {cm.deleteH(-1, "word");},
-    delWordAfter: function(cm) {cm.deleteH(1, "word");},
-    delGroupBefore: function(cm) {cm.deleteH(-1, "group");},
-    delGroupAfter: function(cm) {cm.deleteH(1, "group");},
-    indentAuto: function(cm) {cm.indentSelection("smart");},
-    indentMore: function(cm) {cm.indentSelection("add");},
-    indentLess: function(cm) {cm.indentSelection("subtract");},
-    insertTab: function(cm) {cm.replaceSelection("\t");},
-    insertSoftTab: function(cm) {
-      var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
-      for (var i = 0; i < ranges.length; i++) {
-        var pos = ranges[i].from();
-        var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
-        spaces.push(spaceStr(tabSize - col % tabSize));
-      }
-      cm.replaceSelections(spaces);
-    },
-    defaultTab: function(cm) {
-      if (cm.somethingSelected()) cm.indentSelection("add");
-      else cm.execCommand("insertTab");
-    },
-    transposeChars: function(cm) {
-      runInOp(cm, function() {
-        var ranges = cm.listSelections(), newSel = [];
-        for (var i = 0; i < ranges.length; i++) {
-          var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
-          if (line) {
-            if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1);
-            if (cur.ch > 0) {
-              cur = new Pos(cur.line, cur.ch + 1);
-              cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
-                              Pos(cur.line, cur.ch - 2), cur, "+transpose");
-            } else if (cur.line > cm.doc.first) {
-              var prev = getLine(cm.doc, cur.line - 1).text;
-              if (prev)
-                cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
-                                prev.charAt(prev.length - 1),
-                                Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
-            }
-          }
-          newSel.push(new Range(cur, cur));
-        }
-        cm.setSelections(newSel);
-      });
-    },
-    newlineAndIndent: function(cm) {
-      runInOp(cm, function() {
-        var sels = cm.listSelections()
-        for (var i = sels.length - 1; i >= 0; i--)
-          cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input")
-        sels = cm.listSelections()
-        for (var i = 0; i < sels.length; i++)
-          cm.indentLine(sels[i].from().line, null, true)
-        ensureCursorVisible(cm);
-      });
-    },
-    openLine: function(cm) {cm.replaceSelection("\n", "start")},
-    toggleOverwrite: function(cm) {cm.toggleOverwrite();}
-  };
-
-
-  // STANDARD KEYMAPS
-
-  var keyMap = CodeMirror.keyMap = {};
-
-  keyMap.basic = {
-    "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
-    "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
-    "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
-    "Tab": "defaultTab", "Shift-Tab": "indentAuto",
-    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
-    "Esc": "singleSelection"
-  };
-  // Note that the save and find-related commands aren't defined by
-  // default. User code or addons can define them. Unknown commands
-  // are simply ignored.
-  keyMap.pcDefault = {
-    "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
-    "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
-    "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
-    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
-    "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
-    "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
-    fallthrough: "basic"
-  };
-  // Very basic readline/emacs-style bindings, which are standard on Mac.
-  keyMap.emacsy = {
-    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
-    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
-    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
-    "Ctrl-O": "openLine"
-  };
-  keyMap.macDefault = {
-    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
-    "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
-    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
-    "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
-    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
-    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
-    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
-    fallthrough: ["basic", "emacsy"]
-  };
-  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
-
-  // KEYMAP DISPATCH
-
-  function normalizeKeyName(name) {
-    var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
-    var alt, ctrl, shift, cmd;
-    for (var i = 0; i < parts.length - 1; i++) {
-      var mod = parts[i];
-      if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
-      else if (/^a(lt)?$/i.test(mod)) alt = true;
-      else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
-      else if (/^s(hift)$/i.test(mod)) shift = true;
-      else throw new Error("Unrecognized modifier name: " + mod);
-    }
-    if (alt) name = "Alt-" + name;
-    if (ctrl) name = "Ctrl-" + name;
-    if (cmd) name = "Cmd-" + name;
-    if (shift) name = "Shift-" + name;
-    return name;
-  }
-
-  // This is a kludge to keep keymaps mostly working as raw objects
-  // (backwards compatibility) while at the same time support features
-  // like normalization and multi-stroke key bindings. It compiles a
-  // new normalized keymap, and then updates the old object to reflect
-  // this.
-  CodeMirror.normalizeKeyMap = function(keymap) {
-    var copy = {};
-    for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
-      var value = keymap[keyname];
-      if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
-      if (value == "...") { delete keymap[keyname]; continue; }
-
-      var keys = map(keyname.split(" "), normalizeKeyName);
-      for (var i = 0; i < keys.length; i++) {
-        var val, name;
-        if (i == keys.length - 1) {
-          name = keys.join(" ");
-          val = value;
-        } else {
-          name = keys.slice(0, i + 1).join(" ");
-          val = "...";
-        }
-        var prev = copy[name];
-        if (!prev) copy[name] = val;
-        else if (prev != val) throw new Error("Inconsistent bindings for " + name);
-      }
-      delete keymap[keyname];
-    }
-    for (var prop in copy) keymap[prop] = copy[prop];
-    return keymap;
-  };
-
-  var lookupKey = CodeMirror.lookupKey = function(key, map, handle, context) {
-    map = getKeyMap(map);
-    var found = map.call ? map.call(key, context) : map[key];
-    if (found === false) return "nothing";
-    if (found === "...") return "multi";
-    if (found != null && handle(found)) return "handled";
-
-    if (map.fallthrough) {
-      if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
-        return lookupKey(key, map.fallthrough, handle, context);
-      for (var i = 0; i < map.fallthrough.length; i++) {
-        var result = lookupKey(key, map.fallthrough[i], handle, context);
-        if (result) return result;
-      }
-    }
-  };
-
-  // Modifier key presses don't count as 'real' key presses for the
-  // purpose of keymap fallthrough.
-  var isModifierKey = CodeMirror.isModifierKey = function(value) {
-    var name = typeof value == "string" ? value : keyNames[value.keyCode];
-    return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
-  };
-
-  // Look up the name of a key as indicated by an event object.
-  var keyName = CodeMirror.keyName = function(event, noShift) {
-    if (presto && event.keyCode == 34 && event["char"]) return false;
-    var base = keyNames[event.keyCode], name = base;
-    if (name == null || event.altGraphKey) return false;
-    if (event.altKey && base != "Alt") name = "Alt-" + name;
-    if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
-    if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
-    if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
-    return name;
-  };
-
-  function getKeyMap(val) {
-    return typeof val == "string" ? keyMap[val] : val;
-  }
-
-  // FROMTEXTAREA
-
-  CodeMirror.fromTextArea = function(textarea, options) {
-    options = options ? copyObj(options) : {};
-    options.value = textarea.value;
-    if (!options.tabindex && textarea.tabIndex)
-      options.tabindex = textarea.tabIndex;
-    if (!options.placeholder && textarea.placeholder)
-      options.placeholder = textarea.placeholder;
-    // Set autofocus to true if this textarea is focused, or if it has
-    // autofocus and no other element is focused.
-    if (options.autofocus == null) {
-      var hasFocus = activeElt();
-      options.autofocus = hasFocus == textarea ||
-        textarea.getAttribute("autofocus") != null && hasFocus == document.body;
-    }
-
-    function save() {textarea.value = cm.getValue();}
-    if (textarea.form) {
-      on(textarea.form, "submit", save);
-      // Deplorable hack to make the submit method do the right thing.
-      if (!options.leaveSubmitMethodAlone) {
-        var form = textarea.form, realSubmit = form.submit;
-        try {
-          var wrappedSubmit = form.submit = function() {
-            save();
-            form.submit = realSubmit;
-            form.submit();
-            form.submit = wrappedSubmit;
-          };
-        } catch(e) {}
-      }
-    }
-
-    options.finishInit = function(cm) {
-      cm.save = save;
-      cm.getTextArea = function() { return textarea; };
-      cm.toTextArea = function() {
-        cm.toTextArea = isNaN; // Prevent this from being ran twice
-        save();
-        textarea.parentNode.removeChild(cm.getWrapperElement());
-        textarea.style.display = "";
-        if (textarea.form) {
-          off(textarea.form, "submit", save);
-          if (typeof textarea.form.submit == "function")
-            textarea.form.submit = realSubmit;
-        }
-      };
-    };
-
-    textarea.style.display = "none";
-    var cm = CodeMirror(function(node) {
-      textarea.parentNode.insertBefore(node, textarea.nextSibling);
-    }, options);
-    return cm;
-  };
-
-  // STRING STREAM
-
-  // Fed to the mode parsers, provides helper functions to make
-  // parsers more succinct.
-
-  var StringStream = CodeMirror.StringStream = function(string, tabSize) {
-    this.pos = this.start = 0;
-    this.string = string;
-    this.tabSize = tabSize || 8;
-    this.lastColumnPos = this.lastColumnValue = 0;
-    this.lineStart = 0;
-  };
-
-  StringStream.prototype = {
-    eol: function() {return this.pos >= this.string.length;},
-    sol: function() {return this.pos == this.lineStart;},
-    peek: function() {return this.string.charAt(this.pos) || undefined;},
-    next: function() {
-      if (this.pos < this.string.length)
-        return this.string.charAt(this.pos++);
-    },
-    eat: function(match) {
-      var ch = this.string.charAt(this.pos);
-      if (typeof match == "string") var ok = ch == match;
-      else var ok = ch && (match.test ? match.test(ch) : match(ch));
-      if (ok) {++this.pos; return ch;}
-    },
-    eatWhile: function(match) {
-      var start = this.pos;
-      while (this.eat(match)){}
-      return this.pos > start;
-    },
-    eatSpace: function() {
-      var start = this.pos;
-      while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-      return this.pos > start;
-    },
-    skipToEnd: function() {this.pos = this.string.length;},
-    skipTo: function(ch) {
-      var found = this.string.indexOf(ch, this.pos);
-      if (found > -1) {this.pos = found; return true;}
-    },
-    backUp: function(n) {this.pos -= n;},
-    column: function() {
-      if (this.lastColumnPos < this.start) {
-        this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
-        this.lastColumnPos = this.start;
-      }
-      return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-    },
-    indentation: function() {
-      return countColumn(this.string, null, this.tabSize) -
-        (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-    },
-    match: function(pattern, consume, caseInsensitive) {
-      if (typeof pattern == "string") {
-        var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-        var substr = this.string.substr(this.pos, pattern.length);
-        if (cased(substr) == cased(pattern)) {
-          if (consume !== false) this.pos += pattern.length;
-          return true;
-        }
-      } else {
-        var match = this.string.slice(this.pos).match(pattern);
-        if (match && match.index > 0) return null;
-        if (match && consume !== false) this.pos += match[0].length;
-        return match;
-      }
-    },
-    current: function(){return this.string.slice(this.start, this.pos);},
-    hideFirstChars: function(n, inner) {
-      this.lineStart += n;
-      try { return inner(); }
-      finally { this.lineStart -= n; }
-    }
-  };
-
-  // TEXTMARKERS
-
-  // Created with markText and setBookmark methods. A TextMarker is a
-  // handle that can be used to clear or find a marked position in the
-  // document. Line objects hold arrays (markedSpans) containing
-  // {from, to, marker} object pointing to such marker objects, and
-  // indicating that such a marker is present on that line. Multiple
-  // lines may point to the same marker when it spans across lines.
-  // The spans will have null for their from/to properties when the
-  // marker continues beyond the start/end of the line. Markers have
-  // links back to the lines they currently touch.
-
-  var nextMarkerId = 0;
-
-  var TextMarker = CodeMirror.TextMarker = function(doc, type) {
-    this.lines = [];
-    this.type = type;
-    this.doc = doc;
-    this.id = ++nextMarkerId;
-  };
-  eventMixin(TextMarker);
-
-  // Clear the marker.
-  TextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    var cm = this.doc.cm, withOp = cm && !cm.curOp;
-    if (withOp) startOperation(cm);
-    if (hasHandler(this, "clear")) {
-      var found = this.find();
-      if (found) signalLater(this, "clear", found.from, found.to);
-    }
-    var min = null, max = null;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text");
-      else if (cm) {
-        if (span.to != null) max = lineNo(line);
-        if (span.from != null) min = lineNo(line);
-      }
-      line.markedSpans = removeMarkedSpan(line.markedSpans, span);
-      if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
-        updateLineHeight(line, textHeight(cm.display));
-    }
-    if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
-      var visual = visualLine(this.lines[i]), len = lineLength(visual);
-      if (len > cm.display.maxLineLength) {
-        cm.display.maxLine = visual;
-        cm.display.maxLineLength = len;
-        cm.display.maxLineChanged = true;
-      }
-    }
-
-    if (min != null && cm && this.collapsed) regChange(cm, min, max + 1);
-    this.lines.length = 0;
-    this.explicitlyCleared = true;
-    if (this.atomic && this.doc.cantEdit) {
-      this.doc.cantEdit = false;
-      if (cm) reCheckSelection(cm.doc);
-    }
-    if (cm) signalLater(cm, "markerCleared", cm, this);
-    if (withOp) endOperation(cm);
-    if (this.parent) this.parent.clear();
-  };
-
-  // Find the position of the marker in the document. Returns a {from,
-  // to} object by default. Side can be passed to get a specific side
-  // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
-  // Pos objects returned contain a line object, rather than a line
-  // number (used to prevent looking up the same line twice).
-  TextMarker.prototype.find = function(side, lineObj) {
-    if (side == null && this.type == "bookmark") side = 1;
-    var from, to;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (span.from != null) {
-        from = Pos(lineObj ? line : lineNo(line), span.from);
-        if (side == -1) return from;
-      }
-      if (span.to != null) {
-        to = Pos(lineObj ? line : lineNo(line), span.to);
-        if (side == 1) return to;
-      }
-    }
-    return from && {from: from, to: to};
-  };
-
-  // Signals that the marker's widget changed, and surrounding layout
-  // should be recomputed.
-  TextMarker.prototype.changed = function() {
-    var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
-    if (!pos || !cm) return;
-    runInOp(cm, function() {
-      var line = pos.line, lineN = lineNo(pos.line);
-      var view = findViewForLine(cm, lineN);
-      if (view) {
-        clearLineMeasurementCacheFor(view);
-        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
-      }
-      cm.curOp.updateMaxLine = true;
-      if (!lineIsHidden(widget.doc, line) && widget.height != null) {
-        var oldHeight = widget.height;
-        widget.height = null;
-        var dHeight = widgetHeight(widget) - oldHeight;
-        if (dHeight)
-          updateLineHeight(line, line.height + dHeight);
-      }
-    });
-  };
-
-  TextMarker.prototype.attachLine = function(line) {
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
-        (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this);
-    }
-    this.lines.push(line);
-  };
-  TextMarker.prototype.detachLine = function(line) {
-    this.lines.splice(indexOf(this.lines, line), 1);
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
-    }
-  };
-
-  // Collapsed markers have unique ids, in order to be able to order
-  // them, which is needed for uniquely determining an outer marker
-  // when they overlap (they may nest, but not partially overlap).
-  var nextMarkerId = 0;
-
-  // Create a marker, wire it up to the right lines, and
-  function markText(doc, from, to, options, type) {
-    // Shared markers (across linked documents) are handled separately
-    // (markTextShared will call out to this again, once per
-    // document).
-    if (options && options.shared) return markTextShared(doc, from, to, options, type);
-    // Ensure we are in an operation.
-    if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
-
-    var marker = new TextMarker(doc, type), diff = cmp(from, to);
-    if (options) copyObj(options, marker, false);
-    // Don't connect empty markers unless clearWhenEmpty is false
-    if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
-      return marker;
-    if (marker.replacedWith) {
-      // Showing up as a widget implies collapsed (widget replaces text)
-      marker.collapsed = true;
-      marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
-      if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true");
-      if (options.insertLeft) marker.widgetNode.insertLeft = true;
-    }
-    if (marker.collapsed) {
-      if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
-          from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
-        throw new Error("Inserting collapsed marker partially overlapping an existing one");
-      sawCollapsedSpans = true;
-    }
-
-    if (marker.addToHistory)
-      addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN);
-
-    var curLine = from.line, cm = doc.cm, updateMaxLine;
-    doc.iter(curLine, to.line + 1, function(line) {
-      if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
-        updateMaxLine = true;
-      if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0);
-      addMarkedSpan(line, new MarkedSpan(marker,
-                                         curLine == from.line ? from.ch : null,
-                                         curLine == to.line ? to.ch : null));
-      ++curLine;
-    });
-    // lineIsHidden depends on the presence of the spans, so needs a second pass
-    if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
-      if (lineIsHidden(doc, line)) updateLineHeight(line, 0);
-    });
-
-    if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear(); });
-
-    if (marker.readOnly) {
-      sawReadOnlySpans = true;
-      if (doc.history.done.length || doc.history.undone.length)
-        doc.clearHistory();
-    }
-    if (marker.collapsed) {
-      marker.id = ++nextMarkerId;
-      marker.atomic = true;
-    }
-    if (cm) {
-      // Sync editor state
-      if (updateMaxLine) cm.curOp.updateMaxLine = true;
-      if (marker.collapsed)
-        regChange(cm, from.line, to.line + 1);
-      else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
-        for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
-      if (marker.atomic) reCheckSelection(cm.doc);
-      signalLater(cm, "markerAdded", cm, marker);
-    }
-    return marker;
-  }
-
-  // SHARED TEXTMARKERS
-
-  // A shared marker spans multiple linked documents. It is
-  // implemented as a meta-marker-object controlling multiple normal
-  // markers.
-  var SharedTextMarker = CodeMirror.SharedTextMarker = function(markers, primary) {
-    this.markers = markers;
-    this.primary = primary;
-    for (var i = 0; i < markers.length; ++i)
-      markers[i].parent = this;
-  };
-  eventMixin(SharedTextMarker);
-
-  SharedTextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    this.explicitlyCleared = true;
-    for (var i = 0; i < this.markers.length; ++i)
-      this.markers[i].clear();
-    signalLater(this, "clear");
-  };
-  SharedTextMarker.prototype.find = function(side, lineObj) {
-    return this.primary.find(side, lineObj);
-  };
-
-  function markTextShared(doc, from, to, options, type) {
-    options = copyObj(options);
-    options.shared = false;
-    var markers = [markText(doc, from, to, options, type)], primary = markers[0];
-    var widget = options.widgetNode;
-    linkedDocs(doc, function(doc) {
-      if (widget) options.widgetNode = widget.cloneNode(true);
-      markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
-      for (var i = 0; i < doc.linked.length; ++i)
-        if (doc.linked[i].isParent) return;
-      primary = lst(markers);
-    });
-    return new SharedTextMarker(markers, primary);
-  }
-
-  function findSharedMarkers(doc) {
-    return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())),
-                         function(m) { return m.parent; });
-  }
-
-  function copySharedMarkers(doc, markers) {
-    for (var i = 0; i < markers.length; i++) {
-      var marker = markers[i], pos = marker.find();
-      var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
-      if (cmp(mFrom, mTo)) {
-        var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
-        marker.markers.push(subMark);
-        subMark.parent = marker;
-      }
-    }
-  }
-
-  function detachSharedMarkers(markers) {
-    for (var i = 0; i < markers.length; i++) {
-      var marker = markers[i], linked = [marker.primary.doc];;
-      linkedDocs(marker.primary.doc, function(d) { linked.push(d); });
-      for (var j = 0; j < marker.markers.length; j++) {
-        var subMarker = marker.markers[j];
-        if (indexOf(linked, subMarker.doc) == -1) {
-          subMarker.parent = null;
-          marker.markers.splice(j--, 1);
-        }
-      }
-    }
-  }
-
-  // TEXTMARKER SPANS
-
-  function MarkedSpan(marker, from, to) {
-    this.marker = marker;
-    this.from = from; this.to = to;
-  }
-
-  // Search an array of spans for a span matching the given marker.
-  function getMarkedSpanFor(spans, marker) {
-    if (spans) for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.marker == marker) return span;
-    }
-  }
-  // Remove a span from an array, returning undefined if no spans are
-  // left (we don't store arrays for lines without spans).
-  function removeMarkedSpan(spans, span) {
-    for (var r, i = 0; i < spans.length; ++i)
-      if (spans[i] != span) (r || (r = [])).push(spans[i]);
-    return r;
-  }
-  // Add a span to a line.
-  function addMarkedSpan(line, span) {
-    line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
-    span.marker.attachLine(line);
-  }
-
-  // Used for the algorithm that adjusts markers for a change in the
-  // document. These functions cut an array of spans at a given
-  // character position, returning an array of remaining chunks (or
-  // undefined if nothing remains).
-  function markedSpansBefore(old, startCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
-      if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
-        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
-        (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
-      }
-    }
-    return nw;
-  }
-  function markedSpansAfter(old, endCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
-      if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
-        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
-        (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
-                                              span.to == null ? null : span.to - endCh));
-      }
-    }
-    return nw;
-  }
-
-  // Given a change object, compute the new set of marker spans that
-  // cover the line in which the change took place. Removes spans
-  // entirely within the change, reconnects spans belonging to the
-  // same marker that appear on both sides of the change, and cuts off
-  // spans partially within the change. Returns an array of span
-  // arrays with one element for each line in (after) the change.
-  function stretchSpansOverChange(doc, change) {
-    if (change.full) return null;
-    var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
-    var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
-    if (!oldFirst && !oldLast) return null;
-
-    var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
-    // Get the spans that 'stick out' on both sides
-    var first = markedSpansBefore(oldFirst, startCh, isInsert);
-    var last = markedSpansAfter(oldLast, endCh, isInsert);
-
-    // Next, merge those two ends
-    var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
-    if (first) {
-      // Fix up .to properties of first
-      for (var i = 0; i < first.length; ++i) {
-        var span = first[i];
-        if (span.to == null) {
-          var found = getMarkedSpanFor(last, span.marker);
-          if (!found) span.to = startCh;
-          else if (sameLine) span.to = found.to == null ? null : found.to + offset;
-        }
-      }
-    }
-    if (last) {
-      // Fix up .from in last (or move them into first in case of sameLine)
-      for (var i = 0; i < last.length; ++i) {
-        var span = last[i];
-        if (span.to != null) span.to += offset;
-        if (span.from == null) {
-          var found = getMarkedSpanFor(first, span.marker);
-          if (!found) {
-            span.from = offset;
-            if (sameLine) (first || (first = [])).push(span);
-          }
-        } else {
-          span.from += offset;
-          if (sameLine) (first || (first = [])).push(span);
-        }
-      }
-    }
-    // Make sure we didn't create any zero-length spans
-    if (first) first = clearEmptySpans(first);
-    if (last && last != first) last = clearEmptySpans(last);
-
-    var newMarkers = [first];
-    if (!sameLine) {
-      // Fill gap with whole-line-spans
-      var gap = change.text.length - 2, gapMarkers;
-      if (gap > 0 && first)
-        for (var i = 0; i < first.length; ++i)
-          if (first[i].to == null)
-            (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null));
-      for (var i = 0; i < gap; ++i)
-        newMarkers.push(gapMarkers);
-      newMarkers.push(last);
-    }
-    return newMarkers;
-  }
-
-  // Remove spans that are empty and don't have a clearWhenEmpty
-  // option of false.
-  function clearEmptySpans(spans) {
-    for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
-        spans.splice(i--, 1);
-    }
-    if (!spans.length) return null;
-    return spans;
-  }
-
-  // Used for un/re-doing changes from the history. Combines the
-  // result of computing the existing spans with the set of spans that
-  // existed in the history (so that deleting around a span and then
-  // undoing brings back the span).
-  function mergeOldSpans(doc, change) {
-    var old = getOldSpans(doc, change);
-    var stretched = stretchSpansOverChange(doc, change);
-    if (!old) return stretched;
-    if (!stretched) return old;
-
-    for (var i = 0; i < old.length; ++i) {
-      var oldCur = old[i], stretchCur = stretched[i];
-      if (oldCur && stretchCur) {
-        spans: for (var j = 0; j < stretchCur.length; ++j) {
-          var span = stretchCur[j];
-          for (var k = 0; k < oldCur.length; ++k)
-            if (oldCur[k].marker == span.marker) continue spans;
-          oldCur.push(span);
-        }
-      } else if (stretchCur) {
-        old[i] = stretchCur;
-      }
-    }
-    return old;
-  }
-
-  // Used to 'clip' out readOnly ranges when making a change.
-  function removeReadOnlyRanges(doc, from, to) {
-    var markers = null;
-    doc.iter(from.line, to.line + 1, function(line) {
-      if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-        var mark = line.markedSpans[i].marker;
-        if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
-          (markers || (markers = [])).push(mark);
-      }
-    });
-    if (!markers) return null;
-    var parts = [{from: from, to: to}];
-    for (var i = 0; i < markers.length; ++i) {
-      var mk = markers[i], m = mk.find(0);
-      for (var j = 0; j < parts.length; ++j) {
-        var p = parts[j];
-        if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue;
-        var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
-        if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
-          newParts.push({from: p.from, to: m.from});
-        if (dto > 0 || !mk.inclusiveRight && !dto)
-          newParts.push({from: m.to, to: p.to});
-        parts.splice.apply(parts, newParts);
-        j += newParts.length - 1;
-      }
-    }
-    return parts;
-  }
-
-  // Connect or disconnect spans from a line.
-  function detachMarkedSpans(line) {
-    var spans = line.markedSpans;
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.detachLine(line);
-    line.markedSpans = null;
-  }
-  function attachMarkedSpans(line, spans) {
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.attachLine(line);
-    line.markedSpans = spans;
-  }
-
-  // Helpers used when computing which overlapping collapsed span
-  // counts as the larger one.
-  function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; }
-  function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; }
-
-  // Returns a number indicating which of two overlapping collapsed
-  // spans is larger (and thus includes the other). Falls back to
-  // comparing ids when the spans cover exactly the same range.
-  function compareCollapsedMarkers(a, b) {
-    var lenDiff = a.lines.length - b.lines.length;
-    if (lenDiff != 0) return lenDiff;
-    var aPos = a.find(), bPos = b.find();
-    var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
-    if (fromCmp) return -fromCmp;
-    var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
-    if (toCmp) return toCmp;
-    return b.id - a.id;
-  }
-
-  // Find out whether a line ends or starts in a collapsed span. If
-  // so, return the marker for that span.
-  function collapsedSpanAtSide(line, start) {
-    var sps = sawCollapsedSpans && line.markedSpans, found;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
-          (!found || compareCollapsedMarkers(found, sp.marker) < 0))
-        found = sp.marker;
-    }
-    return found;
-  }
-  function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }
-  function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }
-
-  // Test whether there exists a collapsed span that partially
-  // overlaps (covers the start or end, but not both) of a new span.
-  // Such overlap is not allowed.
-  function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
-    var line = getLine(doc, lineNo);
-    var sps = sawCollapsedSpans && line.markedSpans;
-    if (sps) for (var i = 0; i < sps.length; ++i) {
-      var sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      var found = sp.marker.find(0);
-      var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
-      var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
-      if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
-      if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
-          fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
-        return true;
-    }
-  }
-
-  // A visual line is a line as drawn on the screen. Folding, for
-  // example, can cause multiple logical lines to appear on the same
-  // visual line. This finds the start of the visual line that the
-  // given line is part of (usually that is the line itself).
-  function visualLine(line) {
-    var merged;
-    while (merged = collapsedSpanAtStart(line))
-      line = merged.find(-1, true).line;
-    return line;
-  }
-
-  // Returns an array of logical lines that continue the visual line
-  // started by the argument, or undefined if there are no such lines.
-  function visualLineContinued(line) {
-    var merged, lines;
-    while (merged = collapsedSpanAtEnd(line)) {
-      line = merged.find(1, true).line;
-      (lines || (lines = [])).push(line);
-    }
-    return lines;
-  }
-
-  // Get the line number of the start of the visual line that the
-  // given line number is part of.
-  function visualLineNo(doc, lineN) {
-    var line = getLine(doc, lineN), vis = visualLine(line);
-    if (line == vis) return lineN;
-    return lineNo(vis);
-  }
-  // Get the line number of the start of the next visual line after
-  // the given line.
-  function visualLineEndNo(doc, lineN) {
-    if (lineN > doc.lastLine()) return lineN;
-    var line = getLine(doc, lineN), merged;
-    if (!lineIsHidden(doc, line)) return lineN;
-    while (merged = collapsedSpanAtEnd(line))
-      line = merged.find(1, true).line;
-    return lineNo(line) + 1;
-  }
-
-  // Compute whether a line is hidden. Lines count as hidden when they
-  // are part of a visual line that starts with another line, or when
-  // they are entirely covered by collapsed, non-widget span.
-  function lineIsHidden(doc, line) {
-    var sps = sawCollapsedSpans && line.markedSpans;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      if (sp.from == null) return true;
-      if (sp.marker.widgetNode) continue;
-      if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
-        return true;
-    }
-  }
-  function lineIsHiddenInner(doc, line, span) {
-    if (span.to == null) {
-      var end = span.marker.find(1, true);
-      return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker));
-    }
-    if (span.marker.inclusiveRight && span.to == line.text.length)
-      return true;
-    for (var sp, i = 0; i < line.markedSpans.length; ++i) {
-      sp = line.markedSpans[i];
-      if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
-          (sp.to == null || sp.to != span.from) &&
-          (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
-          lineIsHiddenInner(doc, line, sp)) return true;
-    }
-  }
-
-  // LINE WIDGETS
-
-  // Line widgets are block elements displayed above or below a line.
-
-  var LineWidget = CodeMirror.LineWidget = function(doc, node, options) {
-    if (options) for (var opt in options) if (options.hasOwnProperty(opt))
-      this[opt] = options[opt];
-    this.doc = doc;
-    this.node = node;
-  };
-  eventMixin(LineWidget);
-
-  function adjustScrollWhenAboveVisible(cm, line, diff) {
-    if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
-      addToScrollPos(cm, null, diff);
-  }
-
-  LineWidget.prototype.clear = function() {
-    var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
-    if (no == null || !ws) return;
-    for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
-    if (!ws.length) line.widgets = null;
-    var height = widgetHeight(this);
-    updateLineHeight(line, Math.max(0, line.height - height));
-    if (cm) runInOp(cm, function() {
-      adjustScrollWhenAboveVisible(cm, line, -height);
-      regLineChange(cm, no, "widget");
-    });
-  };
-  LineWidget.prototype.changed = function() {
-    var oldH = this.height, cm = this.doc.cm, line = this.line;
-    this.height = null;
-    var diff = widgetHeight(this) - oldH;
-    if (!diff) return;
-    updateLineHeight(line, line.height + diff);
-    if (cm) runInOp(cm, function() {
-      cm.curOp.forceUpdate = true;
-      adjustScrollWhenAboveVisible(cm, line, diff);
-    });
-  };
-
-  function widgetHeight(widget) {
-    if (widget.height != null) return widget.height;
-    var cm = widget.doc.cm;
-    if (!cm) return 0;
-    if (!contains(document.body, widget.node)) {
-      var parentStyle = "position: relative;";
-      if (widget.coverGutter)
-        parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;";
-      if (widget.noHScroll)
-        parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
-      removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
-    }
-    return widget.height = widget.node.parentNode.offsetHeight;
-  }
-
-  function addLineWidget(doc, handle, node, options) {
-    var widget = new LineWidget(doc, node, options);
-    var cm = doc.cm;
-    if (cm && widget.noHScroll) cm.display.alignWidgets = true;
-    changeLine(doc, handle, "widget", function(line) {
-      var widgets = line.widgets || (line.widgets = []);
-      if (widget.insertAt == null) widgets.push(widget);
-      else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
-      widget.line = line;
-      if (cm && !lineIsHidden(doc, line)) {
-        var aboveVisible = heightAtLine(line) < doc.scrollTop;
-        updateLineHeight(line, line.height + widgetHeight(widget));
-        if (aboveVisible) addToScrollPos(cm, null, widget.height);
-        cm.curOp.forceUpdate = true;
-      }
-      return true;
-    });
-    return widget;
-  }
-
-  // LINE DATA STRUCTURE
-
-  // Line objects. These hold state related to a line, including
-  // highlighting info (the styles array).
-  var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) {
-    this.text = text;
-    attachMarkedSpans(this, markedSpans);
-    this.height = estimateHeight ? estimateHeight(this) : 1;
-  };
-  eventMixin(Line);
-  Line.prototype.lineNo = function() { return lineNo(this); };
-
-  // Change the content (text, markers) of a line. Automatically
-  // invalidates cached information and tries to re-estimate the
-  // line's height.
-  function updateLine(line, text, markedSpans, estimateHeight) {
-    line.text = text;
-    if (line.stateAfter) line.stateAfter = null;
-    if (line.styles) line.styles = null;
-    if (line.order != null) line.order = null;
-    detachMarkedSpans(line);
-    attachMarkedSpans(line, markedSpans);
-    var estHeight = estimateHeight ? estimateHeight(line) : 1;
-    if (estHeight != line.height) updateLineHeight(line, estHeight);
-  }
-
-  // Detach a line from the document tree and its markers.
-  function cleanUpLine(line) {
-    line.parent = null;
-    detachMarkedSpans(line);
-  }
-
-  function extractLineClasses(type, output) {
-    if (type) for (;;) {
-      var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
-      if (!lineClass) break;
-      type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
-      var prop = lineClass[1] ? "bgClass" : "textClass";
-      if (output[prop] == null)
-        output[prop] = lineClass[2];
-      else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
-        output[prop] += " " + lineClass[2];
-    }
-    return type;
-  }
-
-  function callBlankLine(mode, state) {
-    if (mode.blankLine) return mode.blankLine(state);
-    if (!mode.innerMode) return;
-    var inner = CodeMirror.innerMode(mode, state);
-    if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
-  }
-
-  function readToken(mode, stream, state, inner) {
-    for (var i = 0; i < 10; i++) {
-      if (inner) inner[0] = CodeMirror.innerMode(mode, state).mode;
-      var style = mode.token(stream, state);
-      if (stream.pos > stream.start) return style;
-    }
-    throw new Error("Mode " + mode.name + " failed to advance stream.");
-  }
-
-  // Utility for getTokenAt and getLineTokens
-  function takeToken(cm, pos, precise, asArray) {
-    function getObj(copy) {
-      return {start: stream.start, end: stream.pos,
-              string: stream.current(),
-              type: style || null,
-              state: copy ? copyState(doc.mode, state) : state};
-    }
-
-    var doc = cm.doc, mode = doc.mode, style;
-    pos = clipPos(doc, pos);
-    var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
-    var stream = new StringStream(line.text, cm.options.tabSize), tokens;
-    if (asArray) tokens = [];
-    while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
-      stream.start = stream.pos;
-      style = readToken(mode, stream, state);
-      if (asArray) tokens.push(getObj(true));
-    }
-    return asArray ? tokens : getObj();
-  }
-
-  // Run the given mode's parser over a line, calling f for each token.
-  function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
-    var flattenSpans = mode.flattenSpans;
-    if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
-    var curStart = 0, curStyle = null;
-    var stream = new StringStream(text, cm.options.tabSize), style;
-    var inner = cm.options.addModeClass && [null];
-    if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
-    while (!stream.eol()) {
-      if (stream.pos > cm.options.maxHighlightLength) {
-        flattenSpans = false;
-        if (forceToEnd) processLine(cm, text, state, stream.pos);
-        stream.pos = text.length;
-        style = null;
-      } else {
-        style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
-      }
-      if (inner) {
-        var mName = inner[0].name;
-        if (mName) style = "m-" + (style ? mName + " " + style : mName);
-      }
-      if (!flattenSpans || curStyle != style) {
-        while (curStart < stream.start) {
-          curStart = Math.min(stream.start, curStart + 5000);
-          f(curStart, curStyle);
-        }
-        curStyle = style;
-      }
-      stream.start = stream.pos;
-    }
-    while (curStart < stream.pos) {
-      // Webkit seems to refuse to render text nodes longer than 57444
-      // characters, and returns inaccurate measurements in nodes
-      // starting around 5000 chars.
-      var pos = Math.min(stream.pos, curStart + 5000);
-      f(pos, curStyle);
-      curStart = pos;
-    }
-  }
-
-  // Compute a style array (an array starting with a mode generation
-  // -- for invalidation -- followed by pairs of end positions and
-  // style strings), which is used to highlight the tokens on the
-  // line.
-  function highlightLine(cm, line, state, forceToEnd) {
-    // A styles array always starts with a number identifying the
-    // mode/overlays that it is based on (for easy invalidation).
-    var st = [cm.state.modeGen], lineClasses = {};
-    // Compute the base array of styles
-    runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
-      st.push(end, style);
-    }, lineClasses, forceToEnd);
-
-    // Run overlays, adjust style array.
-    for (var o = 0; o < cm.state.overlays.length; ++o) {
-      var overlay = cm.state.overlays[o], i = 1, at = 0;
-      runMode(cm, line.text, overlay.mode, true, function(end, style) {
-        var start = i;
-        // Ensure there's a token end at the current position, and that i points at it
-        while (at < end) {
-          var i_end = st[i];
-          if (i_end > end)
-            st.splice(i, 1, end, st[i+1], i_end);
-          i += 2;
-          at = Math.min(end, i_end);
-        }
-        if (!style) return;
-        if (overlay.opaque) {
-          st.splice(start, i - start, end, "cm-overlay " + style);
-          i = start + 2;
-        } else {
-          for (; start < i; start += 2) {
-            var cur = st[start+1];
-            st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style;
-          }
-        }
-      }, lineClasses);
-    }
-
-    return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
-  }
-
-  function getLineStyles(cm, line, updateFrontier) {
-    if (!line.styles || line.styles[0] != cm.state.modeGen) {
-      var state = getStateBefore(cm, lineNo(line));
-      var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state);
-      line.stateAfter = state;
-      line.styles = result.styles;
-      if (result.classes) line.styleClasses = result.classes;
-      else if (line.styleClasses) line.styleClasses = null;
-      if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
-    }
-    return line.styles;
-  }
-
-  // Lightweight form of highlight -- proceed over this line and
-  // update state, but don't save a style array. Used for lines that
-  // aren't currently visible.
-  function processLine(cm, text, state, startAt) {
-    var mode = cm.doc.mode;
-    var stream = new StringStream(text, cm.options.tabSize);
-    stream.start = stream.pos = startAt || 0;
-    if (text == "") callBlankLine(mode, state);
-    while (!stream.eol()) {
-      readToken(mode, stream, state);
-      stream.start = stream.pos;
-    }
-  }
-
-  // Convert a style as returned by a mode (either null, or a string
-  // containing one or more styles) to a CSS style. This is cached,
-  // and also looks for line-wide styles.
-  var styleToClassCache = {}, styleToClassCacheWithMode = {};
-  function interpretTokenStyle(style, options) {
-    if (!style || /^\s*$/.test(style)) return null;
-    var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
-    return cache[style] ||
-      (cache[style] = style.replace(/\S+/g, "cm-$&"));
-  }
-
-  // Render the DOM representation of the text of a line. Also builds
-  // up a 'line map', which points at the DOM nodes that represent
-  // specific stretches of text, and is used by the measuring code.
-  // The returned object contains the DOM node, this map, and
-  // information about line-wide styles that were set by the mode.
-  function buildLineContent(cm, lineView) {
-    // The padding-right forces the element to have a 'border', which
-    // is needed on Webkit to be able to get line-level bounding
-    // rectangles for it (in measureChar).
-    var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
-    var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
-                   col: 0, pos: 0, cm: cm,
-                   trailingSpace: false,
-                   splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
-    lineView.measure = {};
-
-    // Iterate over the logical lines that make up this visual line.
-    for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
-      var line = i ? lineView.rest[i - 1] : lineView.line, order;
-      builder.pos = 0;
-      builder.addToken = buildToken;
-      // Optionally wire in some hacks into the token-rendering
-      // algorithm, to deal with browser quirks.
-      if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
-        builder.addToken = buildTokenBadBidi(builder.addToken, order);
-      builder.map = [];
-      var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
-      insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
-      if (line.styleClasses) {
-        if (line.styleClasses.bgClass)
-          builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");
-        if (line.styleClasses.textClass)
-          builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "");
-      }
-
-      // Ensure at least a single node is present, for measuring.
-      if (builder.map.length == 0)
-        builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
-
-      // Store the map and a cache object for the current logical line
-      if (i == 0) {
-        lineView.measure.map = builder.map;
-        lineView.measure.cache = {};
-      } else {
-        (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map);
-        (lineView.measure.caches || (lineView.measure.caches = [])).push({});
-      }
-    }
-
-    // See issue #2901
-    if (webkit) {
-      var last = builder.content.lastChild
-      if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
-        builder.content.className = "cm-tab-wrap-hack";
-    }
-
-    signal(cm, "renderLine", cm, lineView.line, builder.pre);
-    if (builder.pre.className)
-      builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
-
-    return builder;
-  }
-
-  function defaultSpecialCharPlaceholder(ch) {
-    var token = elt("span", "\u2022", "cm-invalidchar");
-    token.title = "\\u" + ch.charCodeAt(0).toString(16);
-    token.setAttribute("aria-label", token.title);
-    return token;
-  }
-
-  // Build up the DOM representation for a single token, and add it to
-  // the line map. Takes care to render special characters separately.
-  function buildToken(builder, text, style, startStyle, endStyle, title, css) {
-    if (!text) return;
-    var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
-    var special = builder.cm.state.specialChars, mustWrap = false;
-    if (!special.test(text)) {
-      builder.col += text.length;
-      var content = document.createTextNode(displayText);
-      builder.map.push(builder.pos, builder.pos + text.length, content);
-      if (ie && ie_version < 9) mustWrap = true;
-      builder.pos += text.length;
-    } else {
-      var content = document.createDocumentFragment(), pos = 0;
-      while (true) {
-        special.lastIndex = pos;
-        var m = special.exec(text);
-        var skipped = m ? m.index - pos : text.length - pos;
-        if (skipped) {
-          var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
-          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-          else content.appendChild(txt);
-          builder.map.push(builder.pos, builder.pos + skipped, txt);
-          builder.col += skipped;
-          builder.pos += skipped;
-        }
-        if (!m) break;
-        pos += skipped + 1;
-        if (m[0] == "\t") {
-          var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
-          var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
-          txt.setAttribute("role", "presentation");
-          txt.setAttribute("cm-text", "\t");
-          builder.col += tabWidth;
-        } else if (m[0] == "\r" || m[0] == "\n") {
-          var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
-          txt.setAttribute("cm-text", m[0]);
-          builder.col += 1;
-        } else {
-          var txt = builder.cm.options.specialCharPlaceholder(m[0]);
-          txt.setAttribute("cm-text", m[0]);
-          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-          else content.appendChild(txt);
-          builder.col += 1;
-        }
-        builder.map.push(builder.pos, builder.pos + 1, txt);
-        builder.pos++;
-      }
-    }
-    builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
-    if (style || startStyle || endStyle || mustWrap || css) {
-      var fullStyle = style || "";
-      if (startStyle) fullStyle += startStyle;
-      if (endStyle) fullStyle += endStyle;
-      var token = elt("span", [content], fullStyle, css);
-      if (title) token.title = title;
-      return builder.content.appendChild(token);
-    }
-    builder.content.appendChild(content);
-  }
-
-  function splitSpaces(text, trailingBefore) {
-    if (text.length > 1 && !/  /.test(text)) return text
-    var spaceBefore = trailingBefore, result = ""
-    for (var i = 0; i < text.length; i++) {
-      var ch = text.charAt(i)
-      if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
-        ch = "\u00a0"
-      result += ch
-      spaceBefore = ch == " "
-    }
-    return result
-  }
-
-  // Work around nonsense dimensions being reported for stretches of
-  // right-to-left text.
-  function buildTokenBadBidi(inner, order) {
-    return function(builder, text, style, startStyle, endStyle, title, css) {
-      style = style ? style + " cm-force-border" : "cm-force-border";
-      var start = builder.pos, end = start + text.length;
-      for (;;) {
-        // Find the part that overlaps with the start of this text
-        for (var i = 0; i < order.length; i++) {
-          var part = order[i];
-          if (part.to > start && part.from <= start) break;
-        }
-        if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css);
-        inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
-        startStyle = null;
-        text = text.slice(part.to - start);
-        start = part.to;
-      }
-    };
-  }
-
-  function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
-    var widget = !ignoreWidget && marker.widgetNode;
-    if (widget) builder.map.push(builder.pos, builder.pos + size, widget);
-    if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
-      if (!widget)
-        widget = builder.content.appendChild(document.createElement("span"));
-      widget.setAttribute("cm-marker", marker.id);
-    }
-    if (widget) {
-      builder.cm.display.input.setUneditable(widget);
-      builder.content.appendChild(widget);
-    }
-    builder.pos += size;
-    builder.trailingSpace = false
-  }
-
-  // Outputs a number of spans to make up a line, taking highlighting
-  // and marked text into account.
-  function insertLineContent(line, builder, styles) {
-    var spans = line.markedSpans, allText = line.text, at = 0;
-    if (!spans) {
-      for (var i = 1; i < styles.length; i+=2)
-        builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options));
-      return;
-    }
-
-    var len = allText.length, pos = 0, i = 1, text = "", style, css;
-    var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
-    for (;;) {
-      if (nextChange == pos) { // Update current marker set
-        spanStyle = spanEndStyle = spanStartStyle = title = css = "";
-        collapsed = null; nextChange = Infinity;
-        var foundBookmarks = [], endStyles
-        for (var j = 0; j < spans.length; ++j) {
-          var sp = spans[j], m = sp.marker;
-          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 = (css ? css + ";" : "") + m.css;
-            if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
-            if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
-            if (m.title && !title) title = m.title;
-            if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
-              collapsed = sp;
-          } else if (sp.from > pos && nextChange > sp.from) {
-            nextChange = sp.from;
-          }
-        }
-        if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
-          if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
-
-        if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
-          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
-        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 (pos >= len) break;
-
-      var upto = Math.min(len, nextChange);
-      while (true) {
-        if (text) {
-          var end = pos + text.length;
-          if (!collapsed) {
-            var tokenText = end > upto ? text.slice(0, upto - pos) : text;
-            builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
-          }
-          if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
-          pos = end;
-          spanStartStyle = "";
-        }
-        text = allText.slice(at, at = styles[i++]);
-        style = interpretTokenStyle(styles[i++], builder.cm.options);
-      }
-    }
-  }
-
-  // DOCUMENT DATA STRUCTURE
-
-  // By default, updates that start and end at the beginning of a line
-  // are treated specially, in order to make the association of line
-  // widgets and marker elements with the text behave more intuitive.
-  function isWholeLineUpdate(doc, change) {
-    return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
-      (!doc.cm || doc.cm.options.wholeLineUpdateBefore);
-  }
-
-  // Perform a change on the document data structure.
-  function updateDoc(doc, change, markedSpans, estimateHeight) {
-    function spansFor(n) {return markedSpans ? markedSpans[n] : null;}
-    function update(line, text, spans) {
-      updateLine(line, text, spans, estimateHeight);
-      signalLater(line, "change", line, change);
-    }
-    function linesFor(start, end) {
-      for (var i = start, result = []; i < end; ++i)
-        result.push(new Line(text[i], spansFor(i), estimateHeight));
-      return result;
-    }
-
-    var from = change.from, to = change.to, text = change.text;
-    var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
-    var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
-
-    // Adjust the line structure
-    if (change.full) {
-      doc.insert(0, linesFor(0, text.length));
-      doc.remove(text.length, doc.size - text.length);
-    } else if (isWholeLineUpdate(doc, change)) {
-      // This is a whole-line replace. Treated specially to make
-      // sure line objects move the way they are supposed to.
-      var added = linesFor(0, text.length - 1);
-      update(lastLine, lastLine.text, lastSpans);
-      if (nlines) doc.remove(from.line, nlines);
-      if (added.length) doc.insert(from.line, added);
-    } else if (firstLine == lastLine) {
-      if (text.length == 1) {
-        update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
-      } else {
-        var added = linesFor(1, text.length - 1);
-        added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
-        update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-        doc.insert(from.line + 1, added);
-      }
-    } else if (text.length == 1) {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
-      doc.remove(from.line + 1, nlines);
-    } else {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-      update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
-      var added = linesFor(1, text.length - 1);
-      if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
-      doc.insert(from.line + 1, added);
-    }
-
-    signalLater(doc, "change", doc, change);
-  }
-
-  // The document is represented as a BTree consisting of leaves, with
-  // chunk of lines in them, and branches, with up to ten leaves or
-  // other branch nodes below them. The top node is always a branch
-  // node, and is the document object itself (meaning it has
-  // additional methods and properties).
-  //
-  // All nodes have parent links. The tree is used both to go from
-  // line numbers to line objects, and to go from objects to numbers.
-  // It also indexes by height, and is used to convert between height
-  // and line object, and to find the total height of the document.
-  //
-  // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
-
-  function LeafChunk(lines) {
-    this.lines = lines;
-    this.parent = null;
-    for (var i = 0, height = 0; i < lines.length; ++i) {
-      lines[i].parent = this;
-      height += lines[i].height;
-    }
-    this.height = height;
-  }
-
-  LeafChunk.prototype = {
-    chunkSize: function() { return this.lines.length; },
-    // Remove the n lines at offset 'at'.
-    removeInner: function(at, n) {
-      for (var i = at, e = at + n; i < e; ++i) {
-        var line = this.lines[i];
-        this.height -= line.height;
-        cleanUpLine(line);
-        signalLater(line, "delete");
-      }
-      this.lines.splice(at, n);
-    },
-    // Helper used to collapse a small branch into a single leaf.
-    collapse: function(lines) {
-      lines.push.apply(lines, this.lines);
-    },
-    // Insert the given array of lines at offset 'at', count them as
-    // having the given height.
-    insertInner: function(at, lines, height) {
-      this.height += height;
-      this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
-      for (var i = 0; i < lines.length; ++i) lines[i].parent = this;
-    },
-    // Used to iterate over a part of the tree.
-    iterN: function(at, n, op) {
-      for (var e = at + n; at < e; ++at)
-        if (op(this.lines[at])) return true;
-    }
-  };
-
-  function BranchChunk(children) {
-    this.children = children;
-    var size = 0, height = 0;
-    for (var i = 0; i < children.length; ++i) {
-      var ch = children[i];
-      size += ch.chunkSize(); height += ch.height;
-      ch.parent = this;
-    }
-    this.size = size;
-    this.height = height;
-    this.parent = null;
-  }
-
-  BranchChunk.prototype = {
-    chunkSize: function() { return this.size; },
-    removeInner: function(at, n) {
-      this.size -= n;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var rm = Math.min(n, sz - at), oldHeight = child.height;
-          child.removeInner(at, rm);
-          this.height -= oldHeight - child.height;
-          if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
-          if ((n -= rm) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-      // If the result is smaller than 25 lines, ensure that it is a
-      // single leaf node.
-      if (this.size - n < 25 &&
-          (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
-        var lines = [];
-        this.collapse(lines);
-        this.children = [new LeafChunk(lines)];
-        this.children[0].parent = this;
-      }
-    },
-    collapse: function(lines) {
-      for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines);
-    },
-    insertInner: function(at, lines, height) {
-      this.size += lines.length;
-      this.height += height;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at <= sz) {
-          child.insertInner(at, lines, height);
-          if (child.lines && child.lines.length > 50) {
-            // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
-            // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
-            var remaining = child.lines.length % 25 + 25
-            for (var pos = remaining; pos < child.lines.length;) {
-              var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
-              child.height -= leaf.height;
-              this.children.splice(++i, 0, leaf);
-              leaf.parent = this;
-            }
-            child.lines = child.lines.slice(0, remaining);
-            this.maybeSpill();
-          }
-          break;
-        }
-        at -= sz;
-      }
-    },
-    // When a node has grown, check whether it should be split.
-    maybeSpill: function() {
-      if (this.children.length <= 10) return;
-      var me = this;
-      do {
-        var spilled = me.children.splice(me.children.length - 5, 5);
-        var sibling = new BranchChunk(spilled);
-        if (!me.parent) { // Become the parent node
-          var copy = new BranchChunk(me.children);
-          copy.parent = me;
-          me.children = [copy, sibling];
-          me = copy;
-       } else {
-          me.size -= sibling.size;
-          me.height -= sibling.height;
-          var myIndex = indexOf(me.parent.children, me);
-          me.parent.children.splice(myIndex + 1, 0, sibling);
-        }
-        sibling.parent = me.parent;
-      } while (me.children.length > 10);
-      me.parent.maybeSpill();
-    },
-    iterN: function(at, n, op) {
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var used = Math.min(n, sz - at);
-          if (child.iterN(at, used, op)) return true;
-          if ((n -= used) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-    }
-  };
-
-  var nextDocId = 0;
-  var Doc = CodeMirror.Doc = function(text, mode, firstLine, lineSep) {
-    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep);
-    if (firstLine == null) firstLine = 0;
-
-    BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
-    this.first = firstLine;
-    this.scrollTop = this.scrollLeft = 0;
-    this.cantEdit = false;
-    this.cleanGeneration = 1;
-    this.frontier = firstLine;
-    var start = Pos(firstLine, 0);
-    this.sel = simpleSelection(start);
-    this.history = new History(null);
-    this.id = ++nextDocId;
-    this.modeOption = mode;
-    this.lineSep = lineSep;
-    this.extend = false;
-
-    if (typeof text == "string") text = this.splitLines(text);
-    updateDoc(this, {from: start, to: start, text: text});
-    setSelection(this, simpleSelection(start), sel_dontScroll);
-  };
-
-  Doc.prototype = createObj(BranchChunk.prototype, {
-    constructor: Doc,
-    // Iterate over the document. Supports two forms -- with only one
-    // argument, it calls that for each line in the document. With
-    // three, it iterates over the range given by the first two (with
-    // the second being non-inclusive).
-    iter: function(from, to, op) {
-      if (op) this.iterN(from - this.first, to - from, op);
-      else this.iterN(this.first, this.first + this.size, from);
-    },
-
-    // Non-public interface for adding and removing lines.
-    insert: function(at, lines) {
-      var height = 0;
-      for (var i = 0; i < lines.length; ++i) height += lines[i].height;
-      this.insertInner(at - this.first, lines, height);
-    },
-    remove: function(at, n) { this.removeInner(at - this.first, n); },
-
-    // From here, the methods are part of the public interface. Most
-    // are also available from CodeMirror (editor) instances.
-
-    getValue: function(lineSep) {
-      var lines = getLines(this, this.first, this.first + this.size);
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || this.lineSeparator());
-    },
-    setValue: docMethodOp(function(code) {
-      var top = Pos(this.first, 0), last = this.first + this.size - 1;
-      makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: this.splitLines(code), origin: "setValue", full: true}, true);
-      setSelection(this, simpleSelection(top));
-    }),
-    replaceRange: function(code, from, to, origin) {
-      from = clipPos(this, from);
-      to = to ? clipPos(this, to) : from;
-      replaceRange(this, code, from, to, origin);
-    },
-    getRange: function(from, to, lineSep) {
-      var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || this.lineSeparator());
-    },
-
-    getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
-
-    getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
-    getLineNumber: function(line) {return lineNo(line);},
-
-    getLineHandleVisualStart: function(line) {
-      if (typeof line == "number") line = getLine(this, line);
-      return visualLine(line);
-    },
-
-    lineCount: function() {return this.size;},
-    firstLine: function() {return this.first;},
-    lastLine: function() {return this.first + this.size - 1;},
-
-    clipPos: function(pos) {return clipPos(this, pos);},
-
-    getCursor: function(start) {
-      var range = this.sel.primary(), pos;
-      if (start == null || start == "head") pos = range.head;
-      else if (start == "anchor") pos = range.anchor;
-      else if (start == "end" || start == "to" || start === false) pos = range.to();
-      else pos = range.from();
-      return pos;
-    },
-    listSelections: function() { return this.sel.ranges; },
-    somethingSelected: function() {return this.sel.somethingSelected();},
-
-    setCursor: docMethodOp(function(line, ch, options) {
-      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
-    }),
-    setSelection: docMethodOp(function(anchor, head, options) {
-      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
-    }),
-    extendSelection: docMethodOp(function(head, other, options) {
-      extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
-    }),
-    extendSelections: docMethodOp(function(heads, options) {
-      extendSelections(this, clipPosArray(this, heads), options);
-    }),
-    extendSelectionsBy: docMethodOp(function(f, options) {
-      var heads = map(this.sel.ranges, f);
-      extendSelections(this, clipPosArray(this, heads), options);
-    }),
-    setSelections: docMethodOp(function(ranges, primary, options) {
-      if (!ranges.length) return;
-      for (var i = 0, out = []; i < ranges.length; i++)
-        out[i] = new Range(clipPos(this, ranges[i].anchor),
-                           clipPos(this, ranges[i].head));
-      if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex);
-      setSelection(this, normalizeSelection(out, primary), options);
-    }),
-    addSelection: docMethodOp(function(anchor, head, options) {
-      var ranges = this.sel.ranges.slice(0);
-      ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
-      setSelection(this, normalizeSelection(ranges, ranges.length - 1), options);
-    }),
-
-    getSelection: function(lineSep) {
-      var ranges = this.sel.ranges, lines;
-      for (var i = 0; i < ranges.length; i++) {
-        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        lines = lines ? lines.concat(sel) : sel;
-      }
-      if (lineSep === false) return lines;
-      else return lines.join(lineSep || this.lineSeparator());
-    },
-    getSelections: function(lineSep) {
-      var parts = [], ranges = this.sel.ranges;
-      for (var i = 0; i < ranges.length; i++) {
-        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator());
-        parts[i] = sel;
-      }
-      return parts;
-    },
-    replaceSelection: function(code, collapse, origin) {
-      var dup = [];
-      for (var i = 0; i < this.sel.ranges.length; i++)
-        dup[i] = code;
-      this.replaceSelections(dup, collapse, origin || "+input");
-    },
-    replaceSelections: docMethodOp(function(code, collapse, origin) {
-      var changes = [], sel = this.sel;
-      for (var i = 0; i < sel.ranges.length; i++) {
-        var range = sel.ranges[i];
-        changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
-      }
-      var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
-      for (var i = changes.length - 1; i >= 0; i--)
-        makeChange(this, changes[i]);
-      if (newSel) setSelectionReplaceHistory(this, newSel);
-      else if (this.cm) ensureCursorVisible(this.cm);
-    }),
-    undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
-    redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
-    undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
-    redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
-
-    setExtending: function(val) {this.extend = val;},
-    getExtending: function() {return this.extend;},
-
-    historySize: function() {
-      var hist = this.history, done = 0, undone = 0;
-      for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done;
-      for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
-      return {undo: done, redo: undone};
-    },
-    clearHistory: function() {this.history = new History(this.history.maxGeneration);},
-
-    markClean: function() {
-      this.cleanGeneration = this.changeGeneration(true);
-    },
-    changeGeneration: function(forceSplit) {
-      if (forceSplit)
-        this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null;
-      return this.history.generation;
-    },
-    isClean: function (gen) {
-      return this.history.generation == (gen || this.cleanGeneration);
-    },
-
-    getHistory: function() {
-      return {done: copyHistoryArray(this.history.done),
-              undone: copyHistoryArray(this.history.undone)};
-    },
-    setHistory: function(histData) {
-      var hist = this.history = new History(this.history.maxGeneration);
-      hist.done = copyHistoryArray(histData.done.slice(0), null, true);
-      hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
-    },
-
-    addLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-        var prop = where == "text" ? "textClass"
-                 : where == "background" ? "bgClass"
-                 : where == "gutter" ? "gutterClass" : "wrapClass";
-        if (!line[prop]) line[prop] = cls;
-        else if (classTest(cls).test(line[prop])) return false;
-        else line[prop] += " " + cls;
-        return true;
-      });
-    }),
-    removeLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-        var prop = where == "text" ? "textClass"
-                 : where == "background" ? "bgClass"
-                 : where == "gutter" ? "gutterClass" : "wrapClass";
-        var cur = line[prop];
-        if (!cur) return false;
-        else if (cls == null) line[prop] = null;
-        else {
-          var found = cur.match(classTest(cls));
-          if (!found) return false;
-          var end = found.index + found[0].length;
-          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
-        }
-        return true;
-      });
-    }),
-
-    addLineWidget: docMethodOp(function(handle, node, options) {
-      return addLineWidget(this, handle, node, options);
-    }),
-    removeLineWidget: function(widget) { widget.clear(); },
-
-    markText: function(from, to, options) {
-      return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range");
-    },
-    setBookmark: function(pos, options) {
-      var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
-                      insertLeft: options && options.insertLeft,
-                      clearWhenEmpty: false, shared: options && options.shared,
-                      handleMouseEvents: options && options.handleMouseEvents};
-      pos = clipPos(this, pos);
-      return markText(this, pos, pos, realOpts, "bookmark");
-    },
-    findMarksAt: function(pos) {
-      pos = clipPos(this, pos);
-      var markers = [], spans = getLine(this, pos.line).markedSpans;
-      if (spans) for (var i = 0; i < spans.length; ++i) {
-        var span = spans[i];
-        if ((span.from == null || span.from <= pos.ch) &&
-            (span.to == null || span.to >= pos.ch))
-          markers.push(span.marker.parent || span.marker);
-      }
-      return markers;
-    },
-    findMarks: function(from, to, filter) {
-      from = clipPos(this, from); to = clipPos(this, to);
-      var found = [], lineNo = from.line;
-      this.iter(from.line, to.line + 1, function(line) {
-        var spans = line.markedSpans;
-        if (spans) for (var i = 0; i < spans.length; i++) {
-          var span = spans[i];
-          if (!(span.to != null && lineNo == from.line && from.ch >= span.to ||
-                span.from == null && lineNo != from.line ||
-                span.from != null && lineNo == to.line && span.from >= to.ch) &&
-              (!filter || filter(span.marker)))
-            found.push(span.marker.parent || span.marker);
-        }
-        ++lineNo;
-      });
-      return found;
-    },
-    getAllMarks: function() {
-      var markers = [];
-      this.iter(function(line) {
-        var sps = line.markedSpans;
-        if (sps) for (var i = 0; i < sps.length; ++i)
-          if (sps[i].from != null) markers.push(sps[i].marker);
-      });
-      return markers;
-    },
-
-    posFromIndex: function(off) {
-      var ch, lineNo = this.first, sepSize = this.lineSeparator().length;
-      this.iter(function(line) {
-        var sz = line.text.length + sepSize;
-        if (sz > off) { ch = off; return true; }
-        off -= sz;
-        ++lineNo;
-      });
-      return clipPos(this, Pos(lineNo, ch));
-    },
-    indexFromPos: function (coords) {
-      coords = clipPos(this, coords);
-      var index = coords.ch;
-      if (coords.line < this.first || coords.ch < 0) return 0;
-      var sepSize = this.lineSeparator().length;
-      this.iter(this.first, coords.line, function (line) {
-        index += line.text.length + sepSize;
-      });
-      return index;
-    },
-
-    copy: function(copyHistory) {
-      var doc = new Doc(getLines(this, this.first, this.first + this.size),
-                        this.modeOption, this.first, this.lineSep);
-      doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
-      doc.sel = this.sel;
-      doc.extend = false;
-      if (copyHistory) {
-        doc.history.undoDepth = this.history.undoDepth;
-        doc.setHistory(this.getHistory());
-      }
-      return doc;
-    },
-
-    linkedDoc: function(options) {
-      if (!options) options = {};
-      var from = this.first, to = this.first + this.size;
-      if (options.from != null && options.from > from) from = options.from;
-      if (options.to != null && options.to < to) to = options.to;
-      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep);
-      if (options.sharedHist) copy.history = this.history;
-      (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
-      copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
-      copySharedMarkers(copy, findSharedMarkers(this));
-      return copy;
-    },
-    unlinkDoc: function(other) {
-      if (other instanceof CodeMirror) other = other.doc;
-      if (this.linked) for (var i = 0; i < this.linked.length; ++i) {
-        var link = this.linked[i];
-        if (link.doc != other) continue;
-        this.linked.splice(i, 1);
-        other.unlinkDoc(this);
-        detachSharedMarkers(findSharedMarkers(this));
-        break;
-      }
-      // If the histories were shared, split them again
-      if (other.history == this.history) {
-        var splitIds = [other.id];
-        linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
-        other.history = new History(null);
-        other.history.done = copyHistoryArray(this.history.done, splitIds);
-        other.history.undone = copyHistoryArray(this.history.undone, splitIds);
-      }
-    },
-    iterLinkedDocs: function(f) {linkedDocs(this, f);},
-
-    getMode: function() {return this.mode;},
-    getEditor: function() {return this.cm;},
-
-    splitLines: function(str) {
-      if (this.lineSep) return str.split(this.lineSep);
-      return splitLinesAuto(str);
-    },
-    lineSeparator: function() { return this.lineSep || "\n"; }
-  });
-
-  // Public alias.
-  Doc.prototype.eachLine = Doc.prototype.iter;
-
-  // Set up methods on CodeMirror's prototype to redirect to the editor's document.
-  var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
-  for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
-    CodeMirror.prototype[prop] = (function(method) {
-      return function() {return method.apply(this.doc, arguments);};
-    })(Doc.prototype[prop]);
-
-  eventMixin(Doc);
-
-  // Call f for all linked documents.
-  function linkedDocs(doc, f, sharedHistOnly) {
-    function propagate(doc, skip, sharedHist) {
-      if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
-        var rel = doc.linked[i];
-        if (rel.doc == skip) continue;
-        var shared = sharedHist && rel.sharedHist;
-        if (sharedHistOnly && !shared) continue;
-        f(rel.doc, shared);
-        propagate(rel.doc, doc, shared);
-      }
-    }
-    propagate(doc, null, true);
-  }
-
-  // Attach a document to an editor.
-  function attachDoc(cm, doc) {
-    if (doc.cm) throw new Error("This document is already in use.");
-    cm.doc = doc;
-    doc.cm = cm;
-    estimateLineHeights(cm);
-    loadMode(cm);
-    if (!cm.options.lineWrapping) findMaxLine(cm);
-    cm.options.mode = doc.modeOption;
-    regChange(cm);
-  }
-
-  // LINE UTILITIES
-
-  // Find the line object corresponding to the given line number.
-  function getLine(doc, n) {
-    n -= doc.first;
-    if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.");
-    for (var chunk = doc; !chunk.lines;) {
-      for (var i = 0;; ++i) {
-        var child = chunk.children[i], sz = child.chunkSize();
-        if (n < sz) { chunk = child; break; }
-        n -= sz;
-      }
-    }
-    return chunk.lines[n];
-  }
-
-  // Get the part of a document between two positions, as an array of
-  // strings.
-  function getBetween(doc, start, end) {
-    var out = [], n = start.line;
-    doc.iter(start.line, end.line + 1, function(line) {
-      var text = line.text;
-      if (n == end.line) text = text.slice(0, end.ch);
-      if (n == start.line) text = text.slice(start.ch);
-      out.push(text);
-      ++n;
-    });
-    return out;
-  }
-  // Get the lines between from and to, as array of strings.
-  function getLines(doc, from, to) {
-    var out = [];
-    doc.iter(from, to, function(line) { out.push(line.text); });
-    return out;
-  }
-
-  // Update the height of a line, propagating the height change
-  // upwards to parent nodes.
-  function updateLineHeight(line, height) {
-    var diff = height - line.height;
-    if (diff) for (var n = line; n; n = n.parent) n.height += diff;
-  }
-
-  // Given a line object, find its line number by walking up through
-  // its parent links.
-  function lineNo(line) {
-    if (line.parent == null) return null;
-    var cur = line.parent, no = indexOf(cur.lines, line);
-    for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
-      for (var i = 0;; ++i) {
-        if (chunk.children[i] == cur) break;
-        no += chunk.children[i].chunkSize();
-      }
-    }
-    return no + cur.first;
-  }
-
-  // Find the line at the given vertical position, using the height
-  // information in the document tree.
-  function lineAtHeight(chunk, h) {
-    var n = chunk.first;
-    outer: do {
-      for (var i = 0; i < chunk.children.length; ++i) {
-        var child = chunk.children[i], ch = child.height;
-        if (h < ch) { chunk = child; continue outer; }
-        h -= ch;
-        n += child.chunkSize();
-      }
-      return n;
-    } while (!chunk.lines);
-    for (var i = 0; i < chunk.lines.length; ++i) {
-      var line = chunk.lines[i], lh = line.height;
-      if (h < lh) break;
-      h -= lh;
-    }
-    return n + i;
-  }
-
-
-  // Find the height above the given line.
-  function heightAtLine(lineObj) {
-    lineObj = visualLine(lineObj);
-
-    var h = 0, chunk = lineObj.parent;
-    for (var i = 0; i < chunk.lines.length; ++i) {
-      var line = chunk.lines[i];
-      if (line == lineObj) break;
-      else h += line.height;
-    }
-    for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
-      for (var i = 0; i < p.children.length; ++i) {
-        var cur = p.children[i];
-        if (cur == chunk) break;
-        else h += cur.height;
-      }
-    }
-    return h;
-  }
-
-  // Get the bidi ordering for the given line (and cache it). Returns
-  // false for lines that are fully left-to-right, and an array of
-  // BidiSpan objects otherwise.
-  function getOrder(line) {
-    var order = line.order;
-    if (order == null) order = line.order = bidiOrdering(line.text);
-    return order;
-  }
-
-  // HISTORY
-
-  function History(startGen) {
-    // Arrays of change events and selections. Doing something adds an
-    // event to done and clears undo. Undoing moves events from done
-    // to undone, redoing moves them in the other direction.
-    this.done = []; this.undone = [];
-    this.undoDepth = Infinity;
-    // Used to track when changes can be merged into a single undo
-    // event
-    this.lastModTime = this.lastSelTime = 0;
-    this.lastOp = this.lastSelOp = null;
-    this.lastOrigin = this.lastSelOrigin = null;
-    // Used by the isClean() method
-    this.generation = this.maxGeneration = startGen || 1;
-  }
-
-  // Create a history change event from an updateDoc-style change
-  // object.
-  function historyChangeFromChange(doc, change) {
-    var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
-    attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
-    linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
-    return histChange;
-  }
-
-  // Pop all selection events off the end of a history array. Stop at
-  // a change event.
-  function clearSelectionEvents(array) {
-    while (array.length) {
-      var last = lst(array);
-      if (last.ranges) array.pop();
-      else break;
-    }
-  }
-
-  // Find the top change event in the history. Pop off selection
-  // events that are in the way.
-  function lastChangeEvent(hist, force) {
-    if (force) {
-      clearSelectionEvents(hist.done);
-      return lst(hist.done);
-    } else if (hist.done.length && !lst(hist.done).ranges) {
-      return lst(hist.done);
-    } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
-      hist.done.pop();
-      return lst(hist.done);
-    }
-  }
-
-  // Register a change in the history. Merges changes that are within
-  // a single operation, or are close together with an origin that
-  // allows merging (starting with "+") into a single event.
-  function addChangeToHistory(doc, change, selAfter, opId) {
-    var hist = doc.history;
-    hist.undone.length = 0;
-    var time = +new Date, cur;
-
-    if ((hist.lastOp == opId ||
-         hist.lastOrigin == change.origin && change.origin &&
-         ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
-          change.origin.charAt(0) == "*")) &&
-        (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
-      // Merge this change into the last event
-      var last = lst(cur.changes);
-      if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
-        // Optimized case for simple insertion -- don't want to add
-        // new changesets for every character typed
-        last.to = changeEnd(change);
-      } else {
-        // Add new sub-event
-        cur.changes.push(historyChangeFromChange(doc, change));
-      }
-    } else {
-      // Can not be merged, start a new event.
-      var before = lst(hist.done);
-      if (!before || !before.ranges)
-        pushSelectionToHistory(doc.sel, hist.done);
-      cur = {changes: [historyChangeFromChange(doc, change)],
-             generation: hist.generation};
-      hist.done.push(cur);
-      while (hist.done.length > hist.undoDepth) {
-        hist.done.shift();
-        if (!hist.done[0].ranges) hist.done.shift();
-      }
-    }
-    hist.done.push(selAfter);
-    hist.generation = ++hist.maxGeneration;
-    hist.lastModTime = hist.lastSelTime = time;
-    hist.lastOp = hist.lastSelOp = opId;
-    hist.lastOrigin = hist.lastSelOrigin = change.origin;
-
-    if (!last) signal(doc, "historyAdded");
-  }
-
-  function selectionEventCanBeMerged(doc, origin, prev, sel) {
-    var ch = origin.charAt(0);
-    return ch == "*" ||
-      ch == "+" &&
-      prev.ranges.length == sel.ranges.length &&
-      prev.somethingSelected() == sel.somethingSelected() &&
-      new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500);
-  }
-
-  // Called whenever the selection changes, sets the new selection as
-  // the pending selection in the history, and pushes the old pending
-  // selection into the 'done' array when it was significantly
-  // different (in number of selected ranges, emptiness, or time).
-  function addSelectionToHistory(doc, sel, opId, options) {
-    var hist = doc.history, origin = options && options.origin;
-
-    // A new event is started when the previous origin does not match
-    // the current, or the origins don't allow matching. Origins
-    // starting with * are always merged, those starting with + are
-    // merged when similar and close together in time.
-    if (opId == hist.lastSelOp ||
-        (origin && hist.lastSelOrigin == origin &&
-         (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
-          selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
-      hist.done[hist.done.length - 1] = sel;
-    else
-      pushSelectionToHistory(sel, hist.done);
-
-    hist.lastSelTime = +new Date;
-    hist.lastSelOrigin = origin;
-    hist.lastSelOp = opId;
-    if (options && options.clearRedo !== false)
-      clearSelectionEvents(hist.undone);
-  }
-
-  function pushSelectionToHistory(sel, dest) {
-    var top = lst(dest);
-    if (!(top && top.ranges && top.equals(sel)))
-      dest.push(sel);
-  }
-
-  // Used to store marked span information in the history.
-  function attachLocalSpans(doc, change, from, to) {
-    var existing = change["spans_" + doc.id], n = 0;
-    doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
-      if (line.markedSpans)
-        (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans;
-      ++n;
-    });
-  }
-
-  // When un/re-doing restores text containing marked spans, those
-  // that have been explicitly cleared should not be restored.
-  function removeClearedSpans(spans) {
-    if (!spans) return null;
-    for (var i = 0, out; i < spans.length; ++i) {
-      if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); }
-      else if (out) out.push(spans[i]);
-    }
-    return !out ? spans : out.length ? out : null;
-  }
-
-  // Retrieve and filter the old marked spans stored in a change event.
-  function getOldSpans(doc, change) {
-    var found = change["spans_" + doc.id];
-    if (!found) return null;
-    for (var i = 0, nw = []; i < change.text.length; ++i)
-      nw.push(removeClearedSpans(found[i]));
-    return nw;
-  }
-
-  // Used both to provide a JSON-safe object in .getHistory, and, when
-  // detaching a document, to split the history in two
-  function copyHistoryArray(events, newGroup, instantiateSel) {
-    for (var i = 0, copy = []; i < events.length; ++i) {
-      var event = events[i];
-      if (event.ranges) {
-        copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
-        continue;
-      }
-      var changes = event.changes, newChanges = [];
-      copy.push({changes: newChanges});
-      for (var j = 0; j < changes.length; ++j) {
-        var change = changes[j], m;
-        newChanges.push({from: change.from, to: change.to, text: change.text});
-        if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
-          if (indexOf(newGroup, Number(m[1])) > -1) {
-            lst(newChanges)[prop] = change[prop];
-            delete change[prop];
-          }
-        }
-      }
-    }
-    return copy;
-  }
-
-  // Rebasing/resetting history to deal with externally-sourced changes
-
-  function rebaseHistSelSingle(pos, from, to, diff) {
-    if (to < pos.line) {
-      pos.line += diff;
-    } else if (from < pos.line) {
-      pos.line = from;
-      pos.ch = 0;
-    }
-  }
-
-  // Tries to rebase an array of history events given a change in the
-  // document. If the change touches the same lines as the event, the
-  // event, and everything 'behind' it, is discarded. If the change is
-  // before the event, the event's positions are updated. Uses a
-  // copy-on-write scheme for the positions, to avoid having to
-  // reallocate them all on every rebase, but also avoid problems with
-  // shared position objects being unsafely updated.
-  function rebaseHistArray(array, from, to, diff) {
-    for (var i = 0; i < array.length; ++i) {
-      var sub = array[i], ok = true;
-      if (sub.ranges) {
-        if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
-        for (var j = 0; j < sub.ranges.length; j++) {
-          rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
-          rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
-        }
-        continue;
-      }
-      for (var j = 0; j < sub.changes.length; ++j) {
-        var cur = sub.changes[j];
-        if (to < cur.from.line) {
-          cur.from = Pos(cur.from.line + diff, cur.from.ch);
-          cur.to = Pos(cur.to.line + diff, cur.to.ch);
-        } else if (from <= cur.to.line) {
-          ok = false;
-          break;
-        }
-      }
-      if (!ok) {
-        array.splice(0, i + 1);
-        i = 0;
-      }
-    }
-  }
-
-  function rebaseHist(hist, change) {
-    var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
-    rebaseHistArray(hist.done, from, to, diff);
-    rebaseHistArray(hist.undone, from, to, diff);
-  }
-
-  // EVENT UTILITIES
-
-  // Due to the fact that we still support jurassic IE versions, some
-  // compatibility wrappers are needed.
-
-  var e_preventDefault = CodeMirror.e_preventDefault = function(e) {
-    if (e.preventDefault) e.preventDefault();
-    else e.returnValue = false;
-  };
-  var e_stopPropagation = CodeMirror.e_stopPropagation = function(e) {
-    if (e.stopPropagation) e.stopPropagation();
-    else e.cancelBubble = true;
-  };
-  function e_defaultPrevented(e) {
-    return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;
-  }
-  var e_stop = CodeMirror.e_stop = function(e) {e_preventDefault(e); e_stopPropagation(e);};
-
-  function e_target(e) {return e.target || e.srcElement;}
-  function e_button(e) {
-    var b = e.which;
-    if (b == null) {
-      if (e.button & 1) b = 1;
-      else if (e.button & 2) b = 3;
-      else if (e.button & 4) b = 2;
-    }
-    if (mac && e.ctrlKey && b == 1) b = 3;
-    return b;
-  }
-
-  // EVENT HANDLING
-
-  // Lightweight event framework. on/off also work on DOM nodes,
-  // registering native DOM handlers.
-
-  var on = CodeMirror.on = function(emitter, type, f) {
-    if (emitter.addEventListener)
-      emitter.addEventListener(type, f, false);
-    else if (emitter.attachEvent)
-      emitter.attachEvent("on" + type, f);
-    else {
-      var map = emitter._handlers || (emitter._handlers = {});
-      var arr = map[type] || (map[type] = []);
-      arr.push(f);
-    }
-  };
-
-  var noHandlers = []
-  function getHandlers(emitter, type, copy) {
-    var arr = emitter._handlers && emitter._handlers[type]
-    if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers
-    else return arr || noHandlers
-  }
-
-  var off = CodeMirror.off = function(emitter, type, f) {
-    if (emitter.removeEventListener)
-      emitter.removeEventListener(type, f, false);
-    else if (emitter.detachEvent)
-      emitter.detachEvent("on" + type, f);
-    else {
-      var handlers = getHandlers(emitter, type, false)
-      for (var i = 0; i < handlers.length; ++i)
-        if (handlers[i] == f) { handlers.splice(i, 1); break; }
-    }
-  };
-
-  var signal = CodeMirror.signal = function(emitter, type /*, values...*/) {
-    var handlers = getHandlers(emitter, type, true)
-    if (!handlers.length) return;
-    var args = Array.prototype.slice.call(arguments, 2);
-    for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args);
-  };
-
-  var orphanDelayedCallbacks = null;
-
-  // Often, we want to signal events at a point where we are in the
-  // middle of some work, but don't want the handler to start calling
-  // other methods on the editor, which might be in an inconsistent
-  // state or simply not expect any other events to happen.
-  // signalLater looks whether there are any handlers, and schedules
-  // them to be executed when the last operation ends, or, if no
-  // operation is active, when a timeout fires.
-  function signalLater(emitter, type /*, values...*/) {
-    var arr = getHandlers(emitter, type, false)
-    if (!arr.length) return;
-    var args = Array.prototype.slice.call(arguments, 2), list;
-    if (operationGroup) {
-      list = operationGroup.delayedCallbacks;
-    } else if (orphanDelayedCallbacks) {
-      list = orphanDelayedCallbacks;
-    } else {
-      list = orphanDelayedCallbacks = [];
-      setTimeout(fireOrphanDelayed, 0);
-    }
-    function bnd(f) {return function(){f.apply(null, args);};};
-    for (var i = 0; i < arr.length; ++i)
-      list.push(bnd(arr[i]));
-  }
-
-  function fireOrphanDelayed() {
-    var delayed = orphanDelayedCallbacks;
-    orphanDelayedCallbacks = null;
-    for (var i = 0; i < delayed.length; ++i) delayed[i]();
-  }
-
-  // The DOM events that CodeMirror handles can be overridden by
-  // registering a (non-DOM) handler on the editor for the event name,
-  // and preventDefault-ing the event in that handler.
-  function signalDOMEvent(cm, e, override) {
-    if (typeof e == "string")
-      e = {type: e, preventDefault: function() { this.defaultPrevented = true; }};
-    signal(cm, override || e.type, cm, e);
-    return e_defaultPrevented(e) || e.codemirrorIgnore;
-  }
-
-  function signalCursorActivity(cm) {
-    var arr = cm._handlers && cm._handlers.cursorActivity;
-    if (!arr) return;
-    var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
-    for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1)
-      set.push(arr[i]);
-  }
-
-  function hasHandler(emitter, type) {
-    return getHandlers(emitter, type).length > 0
-  }
-
-  // Add on and off methods to a constructor's prototype, to make
-  // registering events on such objects more convenient.
-  function eventMixin(ctor) {
-    ctor.prototype.on = function(type, f) {on(this, type, f);};
-    ctor.prototype.off = function(type, f) {off(this, type, f);};
-  }
-
-  // MISC UTILITIES
-
-  // Number of pixels added to scroller and sizer to hide scrollbar
-  var scrollerGap = 30;
-
-  // Returned or thrown by various protocols to signal 'I'm not
-  // handling this'.
-  var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
-
-  // Reused option objects for setSelection & friends
-  var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"};
-
-  function Delayed() {this.id = null;}
-  Delayed.prototype.set = function(ms, f) {
-    clearTimeout(this.id);
-    this.id = setTimeout(f, ms);
-  };
-
-  // Counts the column offset in a string, taking tabs into account.
-  // Used mostly to find indentation.
-  var countColumn = CodeMirror.countColumn = function(string, end, tabSize, startIndex, startValue) {
-    if (end == null) {
-      end = string.search(/[^\s\u00a0]/);
-      if (end == -1) end = string.length;
-    }
-    for (var i = startIndex || 0, n = startValue || 0;;) {
-      var nextTab = string.indexOf("\t", i);
-      if (nextTab < 0 || nextTab >= end)
-        return n + (end - i);
-      n += nextTab - i;
-      n += tabSize - (n % tabSize);
-      i = nextTab + 1;
-    }
-  };
-
-  // The inverse of countColumn -- find the offset that corresponds to
-  // a particular column.
-  var findColumn = CodeMirror.findColumn = function(string, goal, tabSize) {
-    for (var pos = 0, col = 0;;) {
-      var nextTab = string.indexOf("\t", pos);
-      if (nextTab == -1) nextTab = string.length;
-      var skipped = nextTab - pos;
-      if (nextTab == string.length || col + skipped >= goal)
-        return pos + Math.min(skipped, goal - col);
-      col += nextTab - pos;
-      col += tabSize - (col % tabSize);
-      pos = nextTab + 1;
-      if (col >= goal) return pos;
-    }
-  }
-
-  var spaceStrs = [""];
-  function spaceStr(n) {
-    while (spaceStrs.length <= n)
-      spaceStrs.push(lst(spaceStrs) + " ");
-    return spaceStrs[n];
-  }
-
-  function lst(arr) { return arr[arr.length-1]; }
-
-  var selectInput = function(node) { node.select(); };
-  if (ios) // Mobile Safari apparently has a bug where select() is broken.
-    selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; };
-  else if (ie) // Suppress mysterious IE10 errors
-    selectInput = function(node) { try { node.select(); } catch(_e) {} };
-
-  function indexOf(array, elt) {
-    for (var i = 0; i < array.length; ++i)
-      if (array[i] == elt) return i;
-    return -1;
-  }
-  function map(array, f) {
-    var out = [];
-    for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
-    return out;
-  }
-
-  function insertSorted(array, value, score) {
-    var pos = 0, priority = score(value)
-    while (pos < array.length && score(array[pos]) <= priority) pos++
-    array.splice(pos, 0, value)
-  }
-
-  function nothing() {}
-
-  function createObj(base, props) {
-    var inst;
-    if (Object.create) {
-      inst = Object.create(base);
-    } else {
-      nothing.prototype = base;
-      inst = new nothing();
-    }
-    if (props) copyObj(props, inst);
-    return inst;
-  };
-
-  function copyObj(obj, target, overwrite) {
-    if (!target) target = {};
-    for (var prop in obj)
-      if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
-        target[prop] = obj[prop];
-    return target;
-  }
-
-  function bind(f) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return function(){return f.apply(null, args);};
-  }
-
-  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));
-  };
-  function isWordChar(ch, helper) {
-    if (!helper) return isWordCharBasic(ch);
-    if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true;
-    return helper.test(ch);
-  }
-
-  function isEmpty(obj) {
-    for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false;
-    return true;
-  }
-
-  // Extending unicode characters. A series of a non-extending char +
-  // any number of extending chars is treated as a single unit as far
-  // as editing and measuring is concerned. This is not fully correct,
-  // since some scripts/fonts/browsers also treat other configurations
-  // of code points as a group.
-  var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
-  function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); }
-
-  // DOM UTILITIES
-
-  function elt(tag, content, className, style) {
-    var e = document.createElement(tag);
-    if (className) e.className = className;
-    if (style) e.style.cssText = style;
-    if (typeof content == "string") e.appendChild(document.createTextNode(content));
-    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-    return e;
-  }
-
-  var range;
-  if (document.createRange) range = function(node, start, end, endNode) {
-    var r = document.createRange();
-    r.setEnd(endNode || node, end);
-    r.setStart(node, start);
-    return r;
-  };
-  else range = function(node, start, end) {
-    var r = document.body.createTextRange();
-    try { r.moveToElementText(node.parentNode); }
-    catch(e) { return r; }
-    r.collapse(true);
-    r.moveEnd("character", end);
-    r.moveStart("character", start);
-    return r;
-  };
-
-  function removeChildren(e) {
-    for (var count = e.childNodes.length; count > 0; --count)
-      e.removeChild(e.firstChild);
-    return e;
-  }
-
-  function removeChildrenAndAdd(parent, e) {
-    return removeChildren(parent).appendChild(e);
-  }
-
-  var contains = CodeMirror.contains = function(parent, child) {
-    if (child.nodeType == 3) // Android browser always returns false when child is a textnode
-      child = child.parentNode;
-    if (parent.contains)
-      return parent.contains(child);
-    do {
-      if (child.nodeType == 11) child = child.host;
-      if (child == parent) return true;
-    } while (child = child.parentNode);
-  };
-
-  function activeElt() {
-    var activeElement = document.activeElement;
-    while (activeElement && activeElement.root && activeElement.root.activeElement)
-      activeElement = activeElement.root.activeElement;
-    return activeElement;
-  }
-  // Older versions of IE throws unspecified error when touching
-  // document.activeElement in some cases (during loading, in iframe)
-  if (ie && ie_version < 11) activeElt = function() {
-    try { return document.activeElement; }
-    catch(e) { return document.body; }
-  };
-
-  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
-  var rmClass = CodeMirror.rmClass = function(node, cls) {
-    var current = node.className;
-    var match = classTest(cls).exec(current);
-    if (match) {
-      var after = current.slice(match.index + match[0].length);
-      node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
-    }
-  };
-  var addClass = CodeMirror.addClass = function(node, cls) {
-    var current = node.className;
-    if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
-  };
-  function joinClasses(a, b) {
-    var as = a.split(" ");
-    for (var i = 0; i < as.length; i++)
-      if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i];
-    return b;
-  }
-
-  // WINDOW-WIDE EVENTS
-
-  // These must be handled carefully, because naively registering a
-  // handler for each editor will cause the editors to never be
-  // garbage collected.
-
-  function forEachCodeMirror(f) {
-    if (!document.body.getElementsByClassName) return;
-    var byClass = document.body.getElementsByClassName("CodeMirror");
-    for (var i = 0; i < byClass.length; i++) {
-      var cm = byClass[i].CodeMirror;
-      if (cm) f(cm);
-    }
-  }
-
-  var globalsRegistered = false;
-  function ensureGlobalHandlers() {
-    if (globalsRegistered) return;
-    registerGlobalHandlers();
-    globalsRegistered = true;
-  }
-  function registerGlobalHandlers() {
-    // When the window resizes, we need to refresh active editors.
-    var resizeTimer;
-    on(window, "resize", function() {
-      if (resizeTimer == null) resizeTimer = setTimeout(function() {
-        resizeTimer = null;
-        forEachCodeMirror(onResize);
-      }, 100);
-    });
-    // When the window loses focus, we want to show the editor as blurred
-    on(window, "blur", function() {
-      forEachCodeMirror(onBlur);
-    });
-  }
-
-  // FEATURE DETECTION
-
-  // Detect drag-and-drop
-  var dragAndDrop = function() {
-    // There is *some* kind of drag-and-drop support in IE6-8, but I
-    // couldn't get it to work yet.
-    if (ie && ie_version < 9) return false;
-    var div = elt('div');
-    return "draggable" in div || "dragDrop" in div;
-  }();
-
-  var zwspSupported;
-  function zeroWidthElement(measure) {
-    if (zwspSupported == null) {
-      var test = elt("span", "\u200b");
-      removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
-      if (measure.firstChild.offsetHeight != 0)
-        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
-    }
-    var node = zwspSupported ? elt("span", "\u200b") :
-      elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
-    node.setAttribute("cm-text", "");
-    return node;
-  }
-
-  // Feature-detect IE's crummy client rect reporting for bidi text
-  var badBidiRects;
-  function hasBadBidiRects(measure) {
-    if (badBidiRects != null) return badBidiRects;
-    var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
-    var r0 = range(txt, 0, 1).getBoundingClientRect();
-    var r1 = range(txt, 1, 2).getBoundingClientRect();
-    removeChildren(measure);
-    if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
-    return badBidiRects = (r1.right - r0.right < 3);
-  }
-
-  // See if "".split is the broken IE version, if so, provide an
-  // alternative way to split lines.
-  var splitLinesAuto = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
-    var pos = 0, result = [], l = string.length;
-    while (pos <= l) {
-      var nl = string.indexOf("\n", pos);
-      if (nl == -1) nl = string.length;
-      var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
-      var rt = line.indexOf("\r");
-      if (rt != -1) {
-        result.push(line.slice(0, rt));
-        pos += rt + 1;
-      } else {
-        result.push(line);
-        pos = nl + 1;
-      }
-    }
-    return result;
-  } : function(string){return string.split(/\r\n?|\n/);};
-
-  var hasSelection = window.getSelection ? function(te) {
-    try { return te.selectionStart != te.selectionEnd; }
-    catch(e) { return false; }
-  } : function(te) {
-    try {var range = te.ownerDocument.selection.createRange();}
-    catch(e) {}
-    if (!range || range.parentElement() != te) return false;
-    return range.compareEndPoints("StartToEnd", range) != 0;
-  };
-
-  var hasCopyEvent = (function() {
-    var e = elt("div");
-    if ("oncopy" in e) return true;
-    e.setAttribute("oncopy", "return;");
-    return typeof e.oncopy == "function";
-  })();
-
-  var badZoomedRects = null;
-  function hasBadZoomedRects(measure) {
-    if (badZoomedRects != null) return badZoomedRects;
-    var node = removeChildrenAndAdd(measure, elt("span", "x"));
-    var normal = node.getBoundingClientRect();
-    var fromRange = range(node, 0, 1).getBoundingClientRect();
-    return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1;
-  }
-
-  // KEY NAMES
-
-  var keyNames = CodeMirror.keyNames = {
-    3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
-    19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
-    36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-    46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
-    106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
-    173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-    221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
-    63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
-  };
-  (function() {
-    // Number keys
-    for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);
-    // Alphabetic keys
-    for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
-    // Function keys
-    for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
-  })();
-
-  // BIDI HELPERS
-
-  function iterateBidiSections(order, from, to, f) {
-    if (!order) return f(from, to, "ltr");
-    var found = false;
-    for (var i = 0; i < order.length; ++i) {
-      var part = order[i];
-      if (part.from < to && part.to > from || from == to && part.to == from) {
-        f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
-        found = true;
-      }
-    }
-    if (!found) f(from, to, "ltr");
-  }
-
-  function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
-  function bidiRight(part) { return part.level % 2 ? part.from : part.to; }
-
-  function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; }
-  function lineRight(line) {
-    var order = getOrder(line);
-    if (!order) return line.text.length;
-    return bidiRight(lst(order));
-  }
-
-  function lineStart(cm, lineN) {
-    var line = getLine(cm.doc, lineN);
-    var visual = visualLine(line);
-    if (visual != line) lineN = lineNo(visual);
-    var order = getOrder(visual);
-    var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual);
-    return Pos(lineN, ch);
-  }
-  function lineEnd(cm, lineN) {
-    var merged, line = getLine(cm.doc, lineN);
-    while (merged = collapsedSpanAtEnd(line)) {
-      line = merged.find(1, true).line;
-      lineN = null;
-    }
-    var order = getOrder(line);
-    var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
-    return Pos(lineN == null ? lineNo(line) : lineN, ch);
-  }
-  function lineStartSmart(cm, pos) {
-    var start = lineStart(cm, pos.line);
-    var line = getLine(cm.doc, start.line);
-    var order = getOrder(line);
-    if (!order || order[0].level == 0) {
-      var firstNonWS = Math.max(0, line.text.search(/\S/));
-      var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
-      return Pos(start.line, inWS ? 0 : firstNonWS);
-    }
-    return start;
-  }
-
-  function compareBidiLevel(order, a, b) {
-    var linedir = order[0].level;
-    if (a == linedir) return true;
-    if (b == linedir) return false;
-    return a < b;
-  }
-  var bidiOther;
-  function getBidiPartAt(order, pos) {
-    bidiOther = null;
-    for (var i = 0, found; i < order.length; ++i) {
-      var cur = order[i];
-      if (cur.from < pos && cur.to > pos) return i;
-      if ((cur.from == pos || cur.to == pos)) {
-        if (found == null) {
-          found = i;
-        } else if (compareBidiLevel(order, cur.level, order[found].level)) {
-          if (cur.from != cur.to) bidiOther = found;
-          return i;
-        } else {
-          if (cur.from != cur.to) bidiOther = i;
-          return found;
-        }
-      }
-    }
-    return found;
-  }
-
-  function moveInLine(line, pos, dir, byUnit) {
-    if (!byUnit) return pos + dir;
-    do pos += dir;
-    while (pos > 0 && isExtendingChar(line.text.charAt(pos)));
-    return pos;
-  }
-
-  // This is needed in order to move 'visually' through bi-directional
-  // text -- i.e., pressing left should make the cursor go left, even
-  // when in RTL text. The tricky part is the 'jumps', where RTL and
-  // LTR text touch each other. This often requires the cursor offset
-  // to move more than one unit, in order to visually move one unit.
-  function moveVisually(line, start, dir, byUnit) {
-    var bidi = getOrder(line);
-    if (!bidi) return moveLogically(line, start, dir, byUnit);
-    var pos = getBidiPartAt(bidi, start), part = bidi[pos];
-    var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit);
-
-    for (;;) {
-      if (target > part.from && target < part.to) return target;
-      if (target == part.from || target == part.to) {
-        if (getBidiPartAt(bidi, target) == pos) return target;
-        part = bidi[pos += dir];
-        return (dir > 0) == part.level % 2 ? part.to : part.from;
-      } else {
-        part = bidi[pos += dir];
-        if (!part) return null;
-        if ((dir > 0) == part.level % 2)
-          target = moveInLine(line, part.to, -1, byUnit);
-        else
-          target = moveInLine(line, part.from, 1, byUnit);
-      }
-    }
-  }
-
-  function moveLogically(line, start, dir, byUnit) {
-    var target = start + dir;
-    if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir;
-    return target < 0 || target > line.text.length ? null : target;
-  }
-
-  // Bidirectional ordering algorithm
-  // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
-  // that this (partially) implements.
-
-  // One-char codes used for character types:
-  // L (L):   Left-to-Right
-  // R (R):   Right-to-Left
-  // r (AL):  Right-to-Left Arabic
-  // 1 (EN):  European Number
-  // + (ES):  European Number Separator
-  // % (ET):  European Number Terminator
-  // n (AN):  Arabic Number
-  // , (CS):  Common Number Separator
-  // m (NSM): Non-Spacing Mark
-  // b (BN):  Boundary Neutral
-  // s (B):   Paragraph Separator
-  // t (S):   Segment Separator
-  // w (WS):  Whitespace
-  // N (ON):  Other Neutrals
-
-  // Returns null if characters are ordered as they appear
-  // (left-to-right), or an array of sections ({from, to, level}
-  // objects) in the order in which they occur visually.
-  var bidiOrdering = (function() {
-    // Character types for codepoints 0 to 0xff
-    var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
-    // Character types for codepoints 0x600 to 0x6ff
-    var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm";
-    function charType(code) {
-      if (code <= 0xf7) return lowTypes.charAt(code);
-      else if (0x590 <= code && code <= 0x5f4) return "R";
-      else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600);
-      else if (0x6ee <= code && code <= 0x8ac) return "r";
-      else if (0x2000 <= code && code <= 0x200b) return "w";
-      else if (code == 0x200c) return "b";
-      else return "L";
-    }
-
-    var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
-    var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
-    // Browsers seem to always treat the boundaries of block elements as being L.
-    var outerType = "L";
-
-    function BidiSpan(level, from, to) {
-      this.level = level;
-      this.from = from; this.to = to;
-    }
-
-    return function(str) {
-      if (!bidiRE.test(str)) return false;
-      var len = str.length, types = [];
-      for (var i = 0, type; i < len; ++i)
-        types.push(type = charType(str.charCodeAt(i)));
-
-      // W1. Examine each non-spacing mark (NSM) in the level run, and
-      // change the type of the NSM to the type of the previous
-      // character. If the NSM is at the start of the level run, it will
-      // get the type of sor.
-      for (var i = 0, prev = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "m") types[i] = prev;
-        else prev = type;
-      }
-
-      // W2. Search backwards from each instance of a European number
-      // until the first strong type (R, L, AL, or sor) is found. If an
-      // AL is found, change the type of the European number to Arabic
-      // number.
-      // W3. Change all ALs to R.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "1" && cur == "r") types[i] = "n";
-        else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R"; }
-      }
-
-      // W4. A single European separator between two European numbers
-      // changes to a European number. A single common separator between
-      // two numbers of the same type changes to that type.
-      for (var i = 1, prev = types[0]; i < len - 1; ++i) {
-        var type = types[i];
-        if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1";
-        else if (type == "," && prev == types[i+1] &&
-                 (prev == "1" || prev == "n")) types[i] = prev;
-        prev = type;
-      }
-
-      // W5. A sequence of European terminators adjacent to European
-      // numbers changes to all European numbers.
-      // W6. Otherwise, separators and terminators change to Other
-      // Neutral.
-      for (var i = 0; i < len; ++i) {
-        var type = types[i];
-        if (type == ",") types[i] = "N";
-        else if (type == "%") {
-          for (var end = i + 1; end < len && types[end] == "%"; ++end) {}
-          var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // W7. Search backwards from each instance of a European number
-      // until the first strong type (R, L, or sor) is found. If an L is
-      // found, then change the type of the European number to L.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (cur == "L" && type == "1") types[i] = "L";
-        else if (isStrong.test(type)) cur = type;
-      }
-
-      // N1. A sequence of neutrals takes the direction of the
-      // surrounding strong text if the text on both sides has the same
-      // direction. European and Arabic numbers act as if they were R in
-      // terms of their influence on neutrals. Start-of-level-run (sor)
-      // and end-of-level-run (eor) are used at level run boundaries.
-      // N2. Any remaining neutrals take the embedding direction.
-      for (var i = 0; i < len; ++i) {
-        if (isNeutral.test(types[i])) {
-          for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
-          var before = (i ? types[i-1] : outerType) == "L";
-          var after = (end < len ? types[end] : outerType) == "L";
-          var replace = before || after ? "L" : "R";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // Here we depart from the documented algorithm, in order to avoid
-      // building up an actual levels array. Since there are only three
-      // levels (0, 1, 2) in an implementation that doesn't take
-      // explicit embedding into account, we can build up the order on
-      // the fly, without following the level-based algorithm.
-      var order = [], m;
-      for (var i = 0; i < len;) {
-        if (countsAsLeft.test(types[i])) {
-          var start = i;
-          for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
-          order.push(new BidiSpan(0, start, i));
-        } else {
-          var pos = i, at = order.length;
-          for (++i; i < len && types[i] != "L"; ++i) {}
-          for (var j = pos; j < i;) {
-            if (countsAsNum.test(types[j])) {
-              if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j));
-              var nstart = j;
-              for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
-              order.splice(at, 0, new BidiSpan(2, nstart, j));
-              pos = j;
-            } else ++j;
-          }
-          if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i));
-        }
-      }
-      if (order[0].level == 1 && (m = str.match(/^\s+/))) {
-        order[0].from = m[0].length;
-        order.unshift(new BidiSpan(0, 0, m[0].length));
-      }
-      if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
-        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));
-
-      return order;
-    };
-  })();
-
-  // THE END
-
-  CodeMirror.version = "5.19.1";
-
-  return CodeMirror;
-});
diff --git a/package.json b/package.json
index 1e4c7e0b06..1f4b036e12 100644
--- a/package.json
+++ b/package.json
@@ -8,13 +8,18 @@
     "lib": "./lib"
   },
   "scripts": {
+    "build": "rollup --banner \"`cat src/banner.js`\" --format umd -n CodeMirror src/codemirror.js -o lib/codemirror.js",
+    "watch": "rollup -w --banner \"`cat src/banner.js`\" --format umd -n CodeMirror src/codemirror.js -o lib/codemirror.js",
+    "prepublish": "npm run-script build",
     "test": "node ./test/run.js",
     "lint": "bin/lint"
   },
   "devDependencies": {
+    "blint": ">=0.1.1",
     "node-static": "0.6.0",
     "phantomjs-prebuilt": "^2.1.12",
-    "blint": ">=0.1.1"
+    "rollup": "^0.34.10",
+    "rollup-watch": "^2.5.0"
   },
   "bugs": "http://github.com/codemirror/CodeMirror/issues",
   "keywords": [
diff --git a/src/banner.js b/src/banner.js
new file mode 100644
index 0000000000..6bd6553f29
--- /dev/null
+++ b/src/banner.js
@@ -0,0 +1,8 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// This is CodeMirror (http://codemirror.net), a code editor
+// implemented in JavaScript on top of the browser's DOM.
+//
+// You can find some technical background for some of the code below
+// at http://marijnhaverbeke.nl/blog/#cm-internals .
diff --git a/src/codemirror.js b/src/codemirror.js
new file mode 100644
index 0000000000..4b75d8cbaf
--- /dev/null
+++ b/src/codemirror.js
@@ -0,0 +1,3 @@
+import { CodeMirror } from "./edit/main";
+
+export default CodeMirror;
diff --git a/src/display/Display.js b/src/display/Display.js
new file mode 100644
index 0000000000..e1cb6a0923
--- /dev/null
+++ b/src/display/Display.js
@@ -0,0 +1,105 @@
+import { gecko, ie, ie_version, mobile, webkit } from "../util/browser";
+import { elt } from "../util/dom";
+import { scrollerGap } from "../util/misc";
+
+// The display handles the DOM integration, both for input reading
+// and content drawing. It holds references to DOM nodes and
+// display-related state.
+
+export function Display(place, doc, input) {
+  var d = this;
+  this.input = input;
+
+  // Covers bottom-right square when both scrollbars are present.
+  d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
+  d.scrollbarFiller.setAttribute("cm-not-content", "true");
+  // Covers bottom of gutter when coverGutterNextToScrollbar is on
+  // and h scrollbar is present.
+  d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
+  d.gutterFiller.setAttribute("cm-not-content", "true");
+  // Will contain the actual code, positioned to cover the viewport.
+  d.lineDiv = elt("div", null, "CodeMirror-code");
+  // Elements are added to these to represent selection and cursors.
+  d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
+  d.cursorDiv = elt("div", null, "CodeMirror-cursors");
+  // A visibility: hidden element used to find the size of things.
+  d.measure = elt("div", null, "CodeMirror-measure");
+  // When lines outside of the viewport are measured, they are drawn in this.
+  d.lineMeasure = elt("div", null, "CodeMirror-measure");
+  // Wraps everything that needs to exist inside the vertically-padded coordinate system
+  d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
+                    null, "position: relative; outline: none");
+  // Moved around its parent to cover visible view.
+  d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
+  // Set to the height of the document, allowing scrolling.
+  d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
+  d.sizerWidth = null;
+  // Behavior of elts with overflow: auto and padding is
+  // inconsistent across browsers. This is used to ensure the
+  // scrollable area is big enough.
+  d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
+  // Will contain the gutters, if any.
+  d.gutters = elt("div", null, "CodeMirror-gutters");
+  d.lineGutter = null;
+  // Actual scrollable element.
+  d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
+  d.scroller.setAttribute("tabIndex", "-1");
+  // The element in which the editor lives.
+  d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
+
+  // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
+  if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
+  if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
+
+  if (place) {
+    if (place.appendChild) place.appendChild(d.wrapper);
+    else place(d.wrapper);
+  }
+
+  // Current rendered range (may be bigger than the view window).
+  d.viewFrom = d.viewTo = doc.first;
+  d.reportedViewFrom = d.reportedViewTo = doc.first;
+  // Information about the rendered lines.
+  d.view = [];
+  d.renderedView = null;
+  // Holds info about a single rendered line when it was rendered
+  // for measurement, while not in view.
+  d.externalMeasured = null;
+  // Empty space (in pixels) above the view
+  d.viewOffset = 0;
+  d.lastWrapHeight = d.lastWrapWidth = 0;
+  d.updateLineNumbers = null;
+
+  d.nativeBarWidth = d.barHeight = d.barWidth = 0;
+  d.scrollbarsClipped = false;
+
+  // Used to only resize the line number gutter when necessary (when
+  // the amount of lines crosses a boundary that makes its width change)
+  d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
+  // Set to true when a non-horizontal-scrolling line widget is
+  // added. As an optimization, line widget aligning is skipped when
+  // this is false.
+  d.alignWidgets = false;
+
+  d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+
+  // Tracks the maximum line length so that the horizontal scrollbar
+  // can be kept static when scrolling.
+  d.maxLine = null;
+  d.maxLineLength = 0;
+  d.maxLineChanged = false;
+
+  // Used for measuring wheel scrolling granularity
+  d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
+
+  // True when shift is held down.
+  d.shift = false;
+
+  // Used to track whether anything happened since the context menu
+  // was opened.
+  d.selForContextMenu = null;
+
+  d.activeTouch = null;
+
+  input.init(d);
+}
diff --git a/src/display/focus.js b/src/display/focus.js
new file mode 100644
index 0000000000..abe70f09d2
--- /dev/null
+++ b/src/display/focus.js
@@ -0,0 +1,49 @@
+import { restartBlink } from "./selection";
+import { webkit } from "../util/browser";
+import { addClass, rmClass } from "../util/dom";
+import { signal } from "../util/event";
+
+export function ensureFocus(cm) {
+  if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
+}
+
+export function delayBlurEvent(cm) {
+  cm.state.delayingBlurEvent = true;
+  setTimeout(function() {
+    if (cm.state.delayingBlurEvent) {
+      cm.state.delayingBlurEvent = false;
+      onBlur(cm);
+    }
+  }, 100);
+}
+
+export function onFocus(cm, e) {
+  if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
+
+  if (cm.options.readOnly == "nocursor") return;
+  if (!cm.state.focused) {
+    signal(cm, "focus", cm, e);
+    cm.state.focused = true;
+    addClass(cm.display.wrapper, "CodeMirror-focused");
+    // This test prevents this from firing when a context
+    // menu is closed (since the input reset would kill the
+    // select-all detection hack)
+    if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
+      cm.display.input.reset();
+      if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
+    }
+    cm.display.input.receivedFocus();
+  }
+  restartBlink(cm);
+}
+export function onBlur(cm, e) {
+  if (cm.state.delayingBlurEvent) return;
+
+  if (cm.state.focused) {
+    signal(cm, "blur", cm, e);
+    cm.state.focused = false;
+    rmClass(cm.display.wrapper, "CodeMirror-focused");
+  }
+  clearInterval(cm.display.blinker);
+  setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150);
+}
diff --git a/src/display/gutters.js b/src/display/gutters.js
new file mode 100644
index 0000000000..0a0f591a94
--- /dev/null
+++ b/src/display/gutters.js
@@ -0,0 +1,33 @@
+import { elt, removeChildren } from "../util/dom";
+import { indexOf } from "../util/misc";
+
+import { updateGutterSpace } from "./update_display";
+
+// Rebuild the gutter elements, ensure the margin to the left of the
+// code matches their width.
+export function updateGutters(cm) {
+  var gutters = cm.display.gutters, specs = cm.options.gutters;
+  removeChildren(gutters);
+  for (var i = 0; i < specs.length; ++i) {
+    var gutterClass = specs[i];
+    var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass));
+    if (gutterClass == "CodeMirror-linenumbers") {
+      cm.display.lineGutter = gElt;
+      gElt.style.width = (cm.display.lineNumWidth || 1) + "px";
+    }
+  }
+  gutters.style.display = i ? "" : "none";
+  updateGutterSpace(cm);
+}
+
+// Make sure the gutters options contains the element
+// "CodeMirror-linenumbers" when the lineNumbers option is true.
+export function setGuttersForLineNumbers(options) {
+  var found = indexOf(options.gutters, "CodeMirror-linenumbers");
+  if (found == -1 && options.lineNumbers) {
+    options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
+  } else if (found > -1 && !options.lineNumbers) {
+    options.gutters = options.gutters.slice(0);
+    options.gutters.splice(found, 1);
+  }
+}
diff --git a/src/display/highlight_worker.js b/src/display/highlight_worker.js
new file mode 100644
index 0000000000..101b9acb30
--- /dev/null
+++ b/src/display/highlight_worker.js
@@ -0,0 +1,51 @@
+import { getStateBefore, highlightLine, processLine } from "../line/highlight";
+import { copyState } from "../modes";
+import { bind } from "../util/misc";
+
+import { runInOp } from "./operations";
+import { regLineChange } from "./view_tracking";
+
+// HIGHLIGHT WORKER
+
+export function startWorker(cm, time) {
+  if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
+    cm.state.highlight.set(time, bind(highlightWorker, cm));
+}
+
+function highlightWorker(cm) {
+  var doc = cm.doc;
+  if (doc.frontier < doc.first) doc.frontier = doc.first;
+  if (doc.frontier >= cm.display.viewTo) return;
+  var end = +new Date + cm.options.workTime;
+  var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
+  var changedLines = [];
+
+  doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
+    if (doc.frontier >= cm.display.viewFrom) { // Visible
+      var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength;
+      var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true);
+      line.styles = highlighted.styles;
+      var oldCls = line.styleClasses, newCls = highlighted.classes;
+      if (newCls) line.styleClasses = newCls;
+      else if (oldCls) line.styleClasses = null;
+      var ischange = !oldStyles || oldStyles.length != line.styles.length ||
+        oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
+      for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
+      if (ischange) changedLines.push(doc.frontier);
+      line.stateAfter = tooLong ? state : copyState(doc.mode, state);
+    } else {
+      if (line.text.length <= cm.options.maxHighlightLength)
+        processLine(cm, line.text, state);
+      line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
+    }
+    ++doc.frontier;
+    if (+new Date > end) {
+      startWorker(cm, cm.options.workDelay);
+      return true;
+    }
+  });
+  if (changedLines.length) runInOp(cm, function() {
+    for (var i = 0; i < changedLines.length; i++)
+      regLineChange(cm, changedLines[i], "text");
+  });
+}
diff --git a/src/display/line_numbers.js b/src/display/line_numbers.js
new file mode 100644
index 0000000000..85964db7ba
--- /dev/null
+++ b/src/display/line_numbers.js
@@ -0,0 +1,48 @@
+import { lineNumberFor } from "../line/utils_line";
+import { compensateForHScroll } from "../measurement/position_measurement";
+import { elt } from "../util/dom";
+
+import { updateGutterSpace } from "./update_display";
+
+// Re-align line numbers and gutter marks to compensate for
+// horizontal scrolling.
+export function alignHorizontally(cm) {
+  var display = cm.display, view = display.view;
+  if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
+  var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
+  var gutterW = display.gutters.offsetWidth, left = comp + "px";
+  for (var i = 0; i < view.length; i++) if (!view[i].hidden) {
+    if (cm.options.fixedGutter) {
+      if (view[i].gutter)
+        view[i].gutter.style.left = left;
+      if (view[i].gutterBackground)
+        view[i].gutterBackground.style.left = left;
+    }
+    var align = view[i].alignable;
+    if (align) for (var j = 0; j < align.length; j++)
+      align[j].style.left = left;
+  }
+  if (cm.options.fixedGutter)
+    display.gutters.style.left = (comp + gutterW) + "px";
+}
+
+// Used to ensure that the line number gutter is still the right
+// size for the current document size. Returns true when an update
+// is needed.
+export function maybeUpdateLineNumberWidth(cm) {
+  if (!cm.options.lineNumbers) return false;
+  var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
+  if (last.length != display.lineNumChars) {
+    var test = display.measure.appendChild(elt("div", [elt("div", last)],
+                                               "CodeMirror-linenumber CodeMirror-gutter-elt"));
+    var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
+    display.lineGutter.style.width = "";
+    display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
+    display.lineNumWidth = display.lineNumInnerWidth + padding;
+    display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
+    display.lineGutter.style.width = display.lineNumWidth + "px";
+    updateGutterSpace(cm);
+    return true;
+  }
+  return false;
+}
diff --git a/src/display/mode_state.js b/src/display/mode_state.js
new file mode 100644
index 0000000000..005e60e3b0
--- /dev/null
+++ b/src/display/mode_state.js
@@ -0,0 +1,22 @@
+import { getMode } from "../modes";
+
+import { startWorker } from "./highlight_worker";
+import { regChange } from "./view_tracking";
+
+// Used to get the editor into a consistent state again when options change.
+
+export function loadMode(cm) {
+  cm.doc.mode = getMode(cm.options, cm.doc.modeOption);
+  resetModeState(cm);
+}
+
+export function resetModeState(cm) {
+  cm.doc.iter(function(line) {
+    if (line.stateAfter) line.stateAfter = null;
+    if (line.styles) line.styles = null;
+  });
+  cm.doc.frontier = cm.doc.first;
+  startWorker(cm, 100);
+  cm.state.modeGen++;
+  if (cm.curOp) regChange(cm);
+}
diff --git a/src/display/operations.js b/src/display/operations.js
new file mode 100644
index 0000000000..a3439d0056
--- /dev/null
+++ b/src/display/operations.js
@@ -0,0 +1,215 @@
+import { clipPos } from "../line/pos";
+import { findMaxLine } from "../line/spans";
+import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement";
+import { signal } from "../util/event";
+import { activeElt } from "../util/dom";
+import { finishOperation, pushOperation } from "../util/operation_group";
+
+import { ensureFocus } from "./focus";
+import { alignHorizontally } from "./line_numbers";
+import { measureForScrollbars, updateScrollbars } from "./scrollbars";
+import { setScrollLeft } from "./scroll_events";
+import { restartBlink } from "./selection";
+import { maybeScrollWindow, scrollPosIntoView } from "./scrolling";
+import { DisplayUpdate, maybeClipScrollbars, postUpdateDisplay, setDocumentHeight, updateDisplayIfNeeded } from "./update_display";
+import { updateHeightsInViewport } from "./update_lines";
+
+// Operations are used to wrap a series of changes to the editor
+// state in such a way that each change won't have to update the
+// cursor and display (which would be awkward, slow, and
+// error-prone). Instead, display updates are batched and then all
+// combined and executed at once.
+
+var nextOpId = 0;
+// Start a new operation.
+export function startOperation(cm) {
+  cm.curOp = {
+    cm: cm,
+    viewChanged: false,      // Flag that indicates that lines might need to be redrawn
+    startHeight: cm.doc.height, // Used to detect need to update scrollbar
+    forceUpdate: false,      // Used to force a redraw
+    updateInput: null,       // Whether to reset the input textarea
+    typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
+    changeObjs: null,        // Accumulated changes, for firing change events
+    cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
+    cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
+    selectionChanged: false, // Whether the selection needs to be redrawn
+    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
+  };
+  pushOperation(cm.curOp);
+}
+
+// Finish an operation, updating the display and signalling delayed events
+export function endOperation(cm) {
+  var op = cm.curOp;
+  finishOperation(op, function(group) {
+    for (var i = 0; i < group.ops.length; i++)
+      group.ops[i].cm.curOp = null;
+    endOperations(group);
+  });
+}
+
+// The DOM updates done when an operation finishes are batched so
+// that the minimum number of relayouts are required.
+function endOperations(group) {
+  var ops = group.ops;
+  for (var i = 0; i < ops.length; i++) // Read DOM
+    endOperation_R1(ops[i]);
+  for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+    endOperation_W1(ops[i]);
+  for (var i = 0; i < ops.length; i++) // Read DOM
+    endOperation_R2(ops[i]);
+  for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+    endOperation_W2(ops[i]);
+  for (var i = 0; i < ops.length; i++) // Read DOM
+    endOperation_finish(ops[i]);
+}
+
+function endOperation_R1(op) {
+  var cm = op.cm, display = cm.display;
+  maybeClipScrollbars(cm);
+  if (op.updateMaxLine) findMaxLine(cm);
+
+  op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
+    op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
+                       op.scrollToPos.to.line >= display.viewTo) ||
+    display.maxLineChanged && cm.options.lineWrapping;
+  op.update = op.mustUpdate &&
+    new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
+}
+
+function endOperation_W1(op) {
+  op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
+}
+
+function endOperation_R2(op) {
+  var cm = op.cm, display = cm.display;
+  if (op.updatedDisplay) updateHeightsInViewport(cm);
+
+  op.barMeasure = measureForScrollbars(cm);
+
+  // If the max line changed since it was last measured, measure it,
+  // and ensure the document's width matches it.
+  // updateDisplay_W2 will use these properties to do the actual resizing
+  if (display.maxLineChanged && !cm.options.lineWrapping) {
+    op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
+    cm.display.sizerWidth = op.adjustWidthTo;
+    op.barMeasure.scrollWidth =
+      Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
+    op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
+  }
+
+  if (op.updatedDisplay || op.selectionChanged)
+    op.preparedSelection = display.input.prepareSelection(op.focus);
+}
+
+function endOperation_W2(op) {
+  var cm = op.cm;
+
+  if (op.adjustWidthTo != null) {
+    cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
+    if (op.maxScrollLeft < cm.doc.scrollLeft)
+      setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
+    cm.display.maxLineChanged = false;
+  }
+
+  var takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
+  if (op.preparedSelection)
+    cm.display.input.showSelection(op.preparedSelection, takeFocus);
+  if (op.updatedDisplay || op.startHeight != cm.doc.height)
+    updateScrollbars(cm, op.barMeasure);
+  if (op.updatedDisplay)
+    setDocumentHeight(cm, op.barMeasure);
+
+  if (op.selectionChanged) restartBlink(cm);
+
+  if (cm.state.focused && op.updateInput)
+    cm.display.input.reset(op.typing);
+  if (takeFocus) ensureFocus(op.cm);
+}
+
+function endOperation_finish(op) {
+  var cm = op.cm, display = cm.display, doc = cm.doc;
+
+  if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
+
+  // Abort mouse wheel delta measurement, when scrolling explicitly
+  if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
+    display.wheelStartX = display.wheelStartY = null;
+
+  // Propagate the scroll position to the actual DOM scroller
+  if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
+    doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
+    display.scrollbars.setScrollTop(doc.scrollTop);
+    display.scroller.scrollTop = doc.scrollTop;
+  }
+  if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
+    doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
+    display.scrollbars.setScrollLeft(doc.scrollLeft);
+    display.scroller.scrollLeft = doc.scrollLeft;
+    alignHorizontally(cm);
+  }
+  // If we need to scroll a specific position into view, do so.
+  if (op.scrollToPos) {
+    var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+                                   clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
+    if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
+  }
+
+  // Fire events for markers that are hidden/unidden by editing or
+  // undoing
+  var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
+  if (hidden) for (var i = 0; i < hidden.length; ++i)
+    if (!hidden[i].lines.length) signal(hidden[i], "hide");
+  if (unhidden) for (var i = 0; i < unhidden.length; ++i)
+    if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
+
+  if (display.wrapper.offsetHeight)
+    doc.scrollTop = cm.display.scroller.scrollTop;
+
+  // Fire change events, and delayed event handlers
+  if (op.changeObjs)
+    signal(cm, "changes", cm, op.changeObjs);
+  if (op.update)
+    op.update.finish();
+}
+
+// Run the given function in an operation
+export function runInOp(cm, f) {
+  if (cm.curOp) return f();
+  startOperation(cm);
+  try { return f(); }
+  finally { endOperation(cm); }
+}
+// Wraps a function in an operation. Returns the wrapped function.
+export function operation(cm, f) {
+  return function() {
+    if (cm.curOp) return f.apply(cm, arguments);
+    startOperation(cm);
+    try { return f.apply(cm, arguments); }
+    finally { endOperation(cm); }
+  };
+}
+// Used to add methods to editor and doc instances, wrapping them in
+// operations.
+export function methodOp(f) {
+  return function() {
+    if (this.curOp) return f.apply(this, arguments);
+    startOperation(this);
+    try { return f.apply(this, arguments); }
+    finally { endOperation(this); }
+  };
+}
+export function docMethodOp(f) {
+  return function() {
+    var cm = this.cm;
+    if (!cm || cm.curOp) return f.apply(this, arguments);
+    startOperation(cm);
+    try { return f.apply(this, arguments); }
+    finally { endOperation(cm); }
+  };
+}
diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
new file mode 100644
index 0000000000..3c5a666e28
--- /dev/null
+++ b/src/display/scroll_events.js
@@ -0,0 +1,138 @@
+import { chrome, gecko, ie, mac, presto, safari, webkit } from "../util/browser";
+import { e_preventDefault } from "../util/event";
+
+import { startWorker } from "./highlight_worker";
+import { alignHorizontally } from "./line_numbers";
+import { updateDisplaySimple} from "./update_display";
+
+// Sync the scrollable area and scrollbars, ensure the viewport
+// covers the visible area.
+export function setScrollTop(cm, val) {
+  if (Math.abs(cm.doc.scrollTop - val) < 2) return;
+  cm.doc.scrollTop = val;
+  if (!gecko) updateDisplaySimple(cm, {top: val});
+  if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
+  cm.display.scrollbars.setScrollTop(val);
+  if (gecko) updateDisplaySimple(cm);
+  startWorker(cm, 100);
+}
+// Sync scroller and scrollbar, ensure the gutter elements are
+// aligned.
+export function setScrollLeft(cm, val, isScroller) {
+  if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;
+  val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
+  cm.doc.scrollLeft = val;
+  alignHorizontally(cm);
+  if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
+  cm.display.scrollbars.setScrollLeft(val);
+}
+
+// Since the delta values reported on mouse wheel events are
+// unstandardized between browsers and even browser versions, and
+// generally horribly unpredictable, this code starts by measuring
+// the scroll effect that the first few mouse wheel events have,
+// and, from that, detects the way it can convert deltas to pixel
+// offsets afterwards.
+//
+// The reason we want to know the amount a wheel event will scroll
+// is that it gives us a chance to update the display before the
+// actual scrolling happens, reducing flickering.
+
+var wheelSamples = 0, wheelPixelsPerUnit = null;
+// Fill in a browser-detected starting value on browsers where we
+// know one. These don't have to be accurate -- the result of them
+// being wrong would just be a slight flicker on the first wheel
+// scroll (if it is large enough).
+if (ie) wheelPixelsPerUnit = -.53;
+else if (gecko) wheelPixelsPerUnit = 15;
+else if (chrome) wheelPixelsPerUnit = -.7;
+else if (safari) wheelPixelsPerUnit = -1/3;
+
+var wheelEventDelta = function(e) {
+  var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
+  if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
+  if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
+  else if (dy == null) dy = e.wheelDelta;
+  return {x: dx, y: dy};
+};
+export function wheelEventPixels(e) {
+  var delta = wheelEventDelta(e);
+  delta.x *= wheelPixelsPerUnit;
+  delta.y *= wheelPixelsPerUnit;
+  return delta;
+}
+
+export function onScrollWheel(cm, e) {
+  var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
+
+  var display = cm.display, scroll = display.scroller;
+  // Quit if there's nothing to scroll here
+  var canScrollX = scroll.scrollWidth > scroll.clientWidth;
+  var canScrollY = scroll.scrollHeight > scroll.clientHeight;
+  if (!(dx && canScrollX || dy && canScrollY)) return;
+
+  // Webkit browsers on OS X abort momentum scrolls when the target
+  // of the scroll event is removed from the scrollable element.
+  // This hack (see related code in patchDisplay) makes sure the
+  // element is kept around.
+  if (dy && mac && webkit) {
+    outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
+      for (var i = 0; i < view.length; i++) {
+        if (view[i].node == cur) {
+          cm.display.currentWheelTarget = cur;
+          break outer;
+        }
+      }
+    }
+  }
+
+  // On some browsers, horizontal scrolling will cause redraws to
+  // happen before the gutter has been realigned, causing it to
+  // wriggle around in a most unseemly way. When we have an
+  // estimated pixels/delta value, we just handle horizontal
+  // scrolling entirely here. It'll be slightly off from native, but
+  // better than glitching out.
+  if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
+    if (dy && canScrollY)
+      setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
+    setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
+    // Only prevent default scrolling if vertical scrolling is
+    // actually possible. Otherwise, it causes vertical scroll
+    // jitter on OSX trackpads when deltaX is small and deltaY
+    // is large (issue #3579)
+    if (!dy || (dy && canScrollY))
+      e_preventDefault(e);
+    display.wheelStartX = null; // Abort measurement, if in progress
+    return;
+  }
+
+  // 'Project' the visible viewport to cover the area that is being
+  // scrolled into view (if we know enough to estimate it).
+  if (dy && wheelPixelsPerUnit != null) {
+    var pixels = dy * wheelPixelsPerUnit;
+    var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
+    if (pixels < 0) top = Math.max(0, top + pixels - 50);
+    else bot = Math.min(cm.doc.height, bot + pixels + 50);
+    updateDisplaySimple(cm, {top: top, bottom: bot});
+  }
+
+  if (wheelSamples < 20) {
+    if (display.wheelStartX == null) {
+      display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
+      display.wheelDX = dx; display.wheelDY = dy;
+      setTimeout(function() {
+        if (display.wheelStartX == null) return;
+        var movedX = scroll.scrollLeft - display.wheelStartX;
+        var movedY = scroll.scrollTop - display.wheelStartY;
+        var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
+          (movedX && display.wheelDX && movedX / display.wheelDX);
+        display.wheelStartX = display.wheelStartY = null;
+        if (!sample) return;
+        wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
+        ++wheelSamples;
+      }, 200);
+    } else {
+      display.wheelDX += dx; display.wheelDY += dy;
+    }
+  }
+}
diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
new file mode 100644
index 0000000000..a29444b5d3
--- /dev/null
+++ b/src/display/scrollbars.js
@@ -0,0 +1,188 @@
+import { addClass, elt, rmClass } from "../util/dom";
+import { on } from "../util/event";
+import { scrollGap, paddingVert } from "../measurement/position_measurement";
+import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser";
+import { updateHeightsInViewport } from "./update_lines";
+import { copyObj, Delayed } from "../util/misc";
+
+import { setScrollLeft, setScrollTop } from "./scroll_events";
+
+// SCROLLBARS
+
+// Prepare DOM reads needed to update the scrollbars. Done in one
+// shot to minimize update/measure roundtrips.
+export function measureForScrollbars(cm) {
+  var d = cm.display, gutterW = d.gutters.offsetWidth;
+  var docH = Math.round(cm.doc.height + paddingVert(cm.display));
+  return {
+    clientHeight: d.scroller.clientHeight,
+    viewHeight: d.wrapper.clientHeight,
+    scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
+    viewWidth: d.wrapper.clientWidth,
+    barLeft: cm.options.fixedGutter ? gutterW : 0,
+    docHeight: docH,
+    scrollHeight: docH + scrollGap(cm) + d.barHeight,
+    nativeBarWidth: d.nativeBarWidth,
+    gutterWidth: gutterW
+  };
+}
+
+function NativeScrollbars(place, scroll, cm) {
+  this.cm = cm;
+  var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
+  var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
+  place(vert); place(horiz);
+
+  on(vert, "scroll", function() {
+    if (vert.clientHeight) scroll(vert.scrollTop, "vertical");
+  });
+  on(horiz, "scroll", function() {
+    if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
+  });
+
+  this.checkedZeroWidth = false;
+  // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+  if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
+}
+
+NativeScrollbars.prototype = copyObj({
+  update: function(measure) {
+    var needsH = measure.scrollWidth > measure.clientWidth + 1;
+    var needsV = measure.scrollHeight > measure.clientHeight + 1;
+    var sWidth = measure.nativeBarWidth;
+
+    if (needsV) {
+      this.vert.style.display = "block";
+      this.vert.style.bottom = needsH ? sWidth + "px" : "0";
+      var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
+      // A bug in IE8 can cause this value to be negative, so guard it.
+      this.vert.firstChild.style.height =
+        Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
+    } else {
+      this.vert.style.display = "";
+      this.vert.firstChild.style.height = "0";
+    }
+
+    if (needsH) {
+      this.horiz.style.display = "block";
+      this.horiz.style.right = needsV ? sWidth + "px" : "0";
+      this.horiz.style.left = measure.barLeft + "px";
+      var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
+      this.horiz.firstChild.style.width =
+        (measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
+    } else {
+      this.horiz.style.display = "";
+      this.horiz.firstChild.style.width = "0";
+    }
+
+    if (!this.checkedZeroWidth && measure.clientHeight > 0) {
+      if (sWidth == 0) this.zeroWidthHack();
+      this.checkedZeroWidth = true;
+    }
+
+    return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
+  },
+  setScrollLeft: function(pos) {
+    if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
+    if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz);
+  },
+  setScrollTop: function(pos) {
+    if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
+    if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert);
+  },
+  zeroWidthHack: function() {
+    var w = mac && !mac_geMountainLion ? "12px" : "18px";
+    this.horiz.style.height = this.vert.style.width = w;
+    this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
+    this.disableHoriz = new Delayed;
+    this.disableVert = new Delayed;
+  },
+  enableZeroWidthBar: function(bar, delay) {
+    bar.style.pointerEvents = "auto";
+    function maybeDisable() {
+      // To find out whether the scrollbar is still visible, we
+      // check whether the element under the pixel in the bottom
+      // left corner of the scrollbar box is the scrollbar box
+      // itself (when the bar is still visible) or its filler child
+      // (when the bar is hidden). If it is still visible, we keep
+      // it enabled, if it's hidden, we disable pointer events.
+      var box = bar.getBoundingClientRect();
+      var elt = document.elementFromPoint(box.left + 1, box.bottom - 1);
+      if (elt != bar) bar.style.pointerEvents = "none";
+      else delay.set(1000, maybeDisable);
+    }
+    delay.set(1000, maybeDisable);
+  },
+  clear: function() {
+    var parent = this.horiz.parentNode;
+    parent.removeChild(this.horiz);
+    parent.removeChild(this.vert);
+  }
+}, NativeScrollbars.prototype);
+
+function NullScrollbars() {}
+
+NullScrollbars.prototype = copyObj({
+  update: function() { return {bottom: 0, right: 0}; },
+  setScrollLeft: function() {},
+  setScrollTop: function() {},
+  clear: function() {}
+}, NullScrollbars.prototype);
+
+export function updateScrollbars(cm, measure) {
+  if (!measure) measure = measureForScrollbars(cm);
+  var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
+  updateScrollbarsInner(cm, measure);
+  for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
+    if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
+      updateHeightsInViewport(cm);
+    updateScrollbarsInner(cm, measureForScrollbars(cm));
+    startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
+  }
+}
+
+// Re-synchronize the fake scrollbars with the actual size of the
+// content.
+function updateScrollbarsInner(cm, measure) {
+  var d = cm.display;
+  var sizes = d.scrollbars.update(measure);
+
+  d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
+  d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
+  d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
+
+  if (sizes.right && sizes.bottom) {
+    d.scrollbarFiller.style.display = "block";
+    d.scrollbarFiller.style.height = sizes.bottom + "px";
+    d.scrollbarFiller.style.width = sizes.right + "px";
+  } else d.scrollbarFiller.style.display = "";
+  if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
+    d.gutterFiller.style.display = "block";
+    d.gutterFiller.style.height = sizes.bottom + "px";
+    d.gutterFiller.style.width = measure.gutterWidth + "px";
+  } else d.gutterFiller.style.display = "";
+}
+
+export var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
+
+export function initScrollbars(cm) {
+  if (cm.display.scrollbars) {
+    cm.display.scrollbars.clear();
+    if (cm.display.scrollbars.addClass)
+      rmClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+  }
+
+  cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function(node) {
+    cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+    // Prevent clicks in the scrollbars from killing focus
+    on(node, "mousedown", function() {
+      if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
+    });
+    node.setAttribute("cm-not-content", "true");
+  }, function(pos, axis) {
+    if (axis == "horizontal") setScrollLeft(cm, pos);
+    else setScrollTop(cm, pos);
+  }, cm);
+  if (cm.display.scrollbars.addClass)
+    addClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+}
diff --git a/src/display/scrolling.js b/src/display/scrolling.js
new file mode 100644
index 0000000000..50ea401262
--- /dev/null
+++ b/src/display/scrolling.js
@@ -0,0 +1,132 @@
+import { Pos } from "../line/pos";
+import { cursorCoords, displayHeight, displayWidth, estimateCoords, paddingTop, paddingVert, scrollGap, textHeight } from "../measurement/position_measurement";
+import { phantom } from "../util/browser";
+import { elt } from "../util/dom";
+import { signalDOMEvent } from "../util/event";
+
+import { setScrollLeft, setScrollTop } from "./scroll_events";
+
+// SCROLLING THINGS INTO VIEW
+
+// If an editor sits on the top or bottom of the window, partially
+// scrolled out of view, this ensures that the cursor is visible.
+export function maybeScrollWindow(cm, coords) {
+  if (signalDOMEvent(cm, "scrollCursorIntoView")) return;
+
+  var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
+  if (coords.top + box.top < 0) doScroll = true;
+  else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
+  if (doScroll != null && !phantom) {
+    var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
+                         (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
+                         (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
+                         coords.left + "px; width: 2px;");
+    cm.display.lineSpace.appendChild(scrollNode);
+    scrollNode.scrollIntoView(doScroll);
+    cm.display.lineSpace.removeChild(scrollNode);
+  }
+}
+
+// Scroll a given position into view (immediately), verifying that
+// it actually became visible (as line heights are accurately
+// measured, the position of something may 'drift' during drawing).
+export function scrollPosIntoView(cm, pos, end, margin) {
+  if (margin == null) margin = 0;
+  for (var limit = 0; limit < 5; limit++) {
+    var changed = false, coords = cursorCoords(cm, pos);
+    var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
+    var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
+                                       Math.min(coords.top, endCoords.top) - margin,
+                                       Math.max(coords.left, endCoords.left),
+                                       Math.max(coords.bottom, endCoords.bottom) + margin);
+    var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
+    if (scrollPos.scrollTop != null) {
+      setScrollTop(cm, scrollPos.scrollTop);
+      if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true;
+    }
+    if (scrollPos.scrollLeft != null) {
+      setScrollLeft(cm, scrollPos.scrollLeft);
+      if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
+    }
+    if (!changed) break;
+  }
+  return coords;
+}
+
+// Scroll a given set of coordinates into view (immediately).
+export function scrollIntoView(cm, x1, y1, x2, y2) {
+  var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2);
+  if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop);
+  if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft);
+}
+
+// Calculate a new scroll position needed to scroll the given
+// rectangle into view. Returns an object with scrollTop and
+// scrollLeft properties. When these are undefined, the
+// vertical/horizontal position does not need to be adjusted.
+export function calculateScrollPos(cm, x1, y1, x2, y2) {
+  var display = cm.display, snapMargin = textHeight(cm.display);
+  if (y1 < 0) y1 = 0;
+  var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
+  var screen = displayHeight(cm), result = {};
+  if (y2 - y1 > screen) y2 = y1 + screen;
+  var docBottom = cm.doc.height + paddingVert(display);
+  var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
+  if (y1 < screentop) {
+    result.scrollTop = atTop ? 0 : y1;
+  } else if (y2 > screentop + screen) {
+    var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen);
+    if (newTop != screentop) result.scrollTop = newTop;
+  }
+
+  var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
+  var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
+  var tooWide = x2 - x1 > screenw;
+  if (tooWide) x2 = x1 + screenw;
+  if (x1 < 10)
+    result.scrollLeft = 0;
+  else if (x1 < screenleft)
+    result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
+  else if (x2 > screenw + screenleft - 3)
+    result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
+  return result;
+}
+
+// Store a relative adjustment to the scroll position in the current
+// operation (to be applied when the operation finishes).
+export function addToScrollPos(cm, left, top) {
+  if (left != null || top != null) resolveScrollToPos(cm);
+  if (left != null)
+    cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left;
+  if (top != null)
+    cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
+}
+
+// Make sure that at the end of the operation the current cursor is
+// shown.
+export function ensureCursorVisible(cm) {
+  resolveScrollToPos(cm);
+  var cur = cm.getCursor(), from = cur, to = cur;
+  if (!cm.options.lineWrapping) {
+    from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur;
+    to = Pos(cur.line, cur.ch + 1);
+  }
+  cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true};
+}
+
+// When an operation has its scrollToPos property set, and another
+// scroll action is applied before the end of the operation, this
+// 'simulates' scrolling that position into view in a cheap way, so
+// that the effect of intermediate scroll commands is not ignored.
+export function resolveScrollToPos(cm) {
+  var range = cm.curOp.scrollToPos;
+  if (range) {
+    cm.curOp.scrollToPos = null;
+    var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to);
+    var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
+                                  Math.min(from.top, to.top) - range.margin,
+                                  Math.max(from.right, to.right),
+                                  Math.max(from.bottom, to.bottom) + range.margin);
+    cm.scrollTo(sPos.scrollLeft, sPos.scrollTop);
+  }
+}
diff --git a/src/display/selection.js b/src/display/selection.js
new file mode 100644
index 0000000000..b6ca8b6f91
--- /dev/null
+++ b/src/display/selection.js
@@ -0,0 +1,137 @@
+import { Pos } from "../line/pos";
+import { visualLine } from "../line/spans";
+import { getLine } from "../line/utils_line";
+import { charCoords, cursorCoords, displayWidth, paddingH } from "../measurement/position_measurement";
+import { getOrder, iterateBidiSections } from "../util/bidi";
+import { elt } from "../util/dom";
+
+export function updateSelection(cm) {
+  cm.display.input.showSelection(cm.display.input.prepareSelection());
+}
+
+export function prepareSelection(cm, primary) {
+  var doc = cm.doc, result = {};
+  var curFragment = result.cursors = document.createDocumentFragment();
+  var selFragment = result.selection = document.createDocumentFragment();
+
+  for (var i = 0; i < doc.sel.ranges.length; i++) {
+    if (primary === false && i == doc.sel.primIndex) continue;
+    var range = doc.sel.ranges[i];
+    if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue;
+    var collapsed = range.empty();
+    if (collapsed || cm.options.showCursorWhenSelecting)
+      drawSelectionCursor(cm, range.head, curFragment);
+    if (!collapsed)
+      drawSelectionRange(cm, range, selFragment);
+  }
+  return result;
+}
+
+// Draws a cursor for the given range
+export function drawSelectionCursor(cm, head, output) {
+  var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
+
+  var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
+  cursor.style.left = pos.left + "px";
+  cursor.style.top = pos.top + "px";
+  cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
+
+  if (pos.other) {
+    // Secondary cursor, shown when on a 'jump' in bi-directional text
+    var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
+    otherCursor.style.display = "";
+    otherCursor.style.left = pos.other.left + "px";
+    otherCursor.style.top = pos.other.top + "px";
+    otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
+  }
+}
+
+// Draws the given range as a highlighted selection
+function drawSelectionRange(cm, range, output) {
+  var display = cm.display, doc = cm.doc;
+  var fragment = document.createDocumentFragment();
+  var padding = paddingH(cm.display), leftSide = padding.left;
+  var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
+
+  function add(left, top, width, bottom) {
+    if (top < 0) top = 0;
+    top = Math.round(top);
+    bottom = Math.round(bottom);
+    fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
+                             "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) +
+                             "px; height: " + (bottom - top) + "px"));
+  }
+
+  function drawForLine(line, fromArg, toArg) {
+    var lineObj = getLine(doc, line);
+    var lineLen = lineObj.text.length;
+    var start, end;
+    function coords(ch, bias) {
+      return charCoords(cm, Pos(line, ch), "div", lineObj, bias);
+    }
+
+    iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
+      var leftPos = coords(from, "left"), rightPos, left, right;
+      if (from == to) {
+        rightPos = leftPos;
+        left = right = leftPos.left;
+      } else {
+        rightPos = coords(to - 1, "right");
+        if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; }
+        left = leftPos.left;
+        right = rightPos.right;
+      }
+      if (fromArg == null && from == 0) left = leftSide;
+      if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
+        add(left, leftPos.top, null, leftPos.bottom);
+        left = leftSide;
+        if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);
+      }
+      if (toArg == null && to == lineLen) right = rightSide;
+      if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
+        start = leftPos;
+      if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
+        end = rightPos;
+      if (left < leftSide + 1) left = leftSide;
+      add(left, rightPos.top, right - left, rightPos.bottom);
+    });
+    return {start: start, end: end};
+  }
+
+  var sFrom = range.from(), sTo = range.to();
+  if (sFrom.line == sTo.line) {
+    drawForLine(sFrom.line, sFrom.ch, sTo.ch);
+  } else {
+    var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
+    var singleVLine = visualLine(fromLine) == visualLine(toLine);
+    var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
+    var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
+    if (singleVLine) {
+      if (leftEnd.top < rightStart.top - 2) {
+        add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
+        add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
+      } else {
+        add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
+      }
+    }
+    if (leftEnd.bottom < rightStart.top)
+      add(leftSide, leftEnd.bottom, null, rightStart.top);
+  }
+
+  output.appendChild(fragment);
+}
+
+// Cursor-blinking
+export function restartBlink(cm) {
+  if (!cm.state.focused) return;
+  var display = cm.display;
+  clearInterval(display.blinker);
+  var on = true;
+  display.cursorDiv.style.visibility = "";
+  if (cm.options.cursorBlinkRate > 0)
+    display.blinker = setInterval(function() {
+      display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
+    }, cm.options.cursorBlinkRate);
+  else if (cm.options.cursorBlinkRate < 0)
+    display.cursorDiv.style.visibility = "hidden";
+}
diff --git a/src/display/update_display.js b/src/display/update_display.js
new file mode 100644
index 0000000000..c69f75f9d4
--- /dev/null
+++ b/src/display/update_display.js
@@ -0,0 +1,227 @@
+import { sawCollapsedSpans } from "../line/saw_special_spans";
+import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans";
+import { getLine, lineNumberFor } from "../line/utils_line";
+import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement";
+import { buildLineElement, updateLineForChanges } from "../measurement/update_line";
+import { mac, webkit } from "../util/browser";
+import { activeElt, removeChildren } from "../util/dom";
+import { hasHandler, signal } from "../util/event";
+import { indexOf } from "../util/misc";
+
+import { startWorker } from "./highlight_worker";
+import { maybeUpdateLineNumberWidth } from "./line_numbers";
+import { measureForScrollbars, updateScrollbars } from "./scrollbars";
+import { updateSelection } from "./selection";
+import { updateHeightsInViewport, visibleLines } from "./update_lines";
+import { adjustView, countDirtyView, resetView } from "./view_tracking";
+
+// DISPLAY DRAWING
+
+export function DisplayUpdate(cm, viewport, force) {
+  var display = cm.display;
+
+  this.viewport = viewport;
+  // Store some values that we'll need later (but don't want to force a relayout for)
+  this.visible = visibleLines(display, cm.doc, viewport);
+  this.editorIsHidden = !display.wrapper.offsetWidth;
+  this.wrapperHeight = display.wrapper.clientHeight;
+  this.wrapperWidth = display.wrapper.clientWidth;
+  this.oldDisplayWidth = displayWidth(cm);
+  this.force = force;
+  this.dims = getDimensions(cm);
+  this.events = [];
+}
+
+DisplayUpdate.prototype.signal = function(emitter, type) {
+  if (hasHandler(emitter, type))
+    this.events.push(arguments);
+};
+DisplayUpdate.prototype.finish = function() {
+  for (var i = 0; i < this.events.length; i++)
+    signal.apply(null, this.events[i]);
+};
+
+export function maybeClipScrollbars(cm) {
+  var display = cm.display;
+  if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
+    display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
+    display.heightForcer.style.height = scrollGap(cm) + "px";
+    display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
+    display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
+    display.scrollbarsClipped = true;
+  }
+}
+
+// Does the actual updating of the line display. Bails out
+// (returning false) when there is nothing to be done and forced is
+// false.
+export function updateDisplayIfNeeded(cm, update) {
+  var display = cm.display, doc = cm.doc;
+
+  if (update.editorIsHidden) {
+    resetView(cm);
+    return false;
+  }
+
+  // Bail out if the visible area is already rendered and nothing changed.
+  if (!update.force &&
+      update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
+      (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
+      display.renderedView == display.view && countDirtyView(cm) == 0)
+    return false;
+
+  if (maybeUpdateLineNumberWidth(cm)) {
+    resetView(cm);
+    update.dims = getDimensions(cm);
+  }
+
+  // Compute a suitable new viewport (from & to)
+  var end = doc.first + doc.size;
+  var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
+  var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
+  if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
+  if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
+  if (sawCollapsedSpans) {
+    from = visualLineNo(cm.doc, from);
+    to = visualLineEndNo(cm.doc, to);
+  }
+
+  var different = from != display.viewFrom || to != display.viewTo ||
+    display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
+  adjustView(cm, from, to);
+
+  display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
+  // Position the mover div to align with the current scroll position
+  cm.display.mover.style.top = display.viewOffset + "px";
+
+  var toUpdate = countDirtyView(cm);
+  if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
+      (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
+    return false;
+
+  // For big changes, we hide the enclosing element during the
+  // update, since that speeds up the operations on most browsers.
+  var focused = activeElt();
+  if (toUpdate > 4) display.lineDiv.style.display = "none";
+  patchDisplay(cm, display.updateLineNumbers, update.dims);
+  if (toUpdate > 4) display.lineDiv.style.display = "";
+  display.renderedView = display.view;
+  // There might have been a widget with a focused element that got
+  // hidden or updated, if so re-focus it.
+  if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
+
+  // Prevent selection and cursors from interfering with the scroll
+  // width and height.
+  removeChildren(display.cursorDiv);
+  removeChildren(display.selectionDiv);
+  display.gutters.style.height = display.sizer.style.minHeight = 0;
+
+  if (different) {
+    display.lastWrapHeight = update.wrapperHeight;
+    display.lastWrapWidth = update.wrapperWidth;
+    startWorker(cm, 400);
+  }
+
+  display.updateLineNumbers = null;
+
+  return true;
+}
+
+export function postUpdateDisplay(cm, update) {
+  var viewport = update.viewport;
+
+  for (var first = true;; first = false) {
+    if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
+      // Clip forced viewport to actual scrollable area.
+      if (viewport && viewport.top != null)
+        viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
+      // Updated line heights might result in the drawn area not
+      // actually covering the viewport. Keep looping until it does.
+      update.visible = visibleLines(cm.display, cm.doc, viewport);
+      if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
+        break;
+    }
+    if (!updateDisplayIfNeeded(cm, update)) break;
+    updateHeightsInViewport(cm);
+    var barMeasure = measureForScrollbars(cm);
+    updateSelection(cm);
+    updateScrollbars(cm, barMeasure);
+    setDocumentHeight(cm, barMeasure);
+  }
+
+  update.signal(cm, "update", cm);
+  if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
+    update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
+    cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
+  }
+}
+
+export function updateDisplaySimple(cm, viewport) {
+  var update = new DisplayUpdate(cm, viewport);
+  if (updateDisplayIfNeeded(cm, update)) {
+    updateHeightsInViewport(cm);
+    postUpdateDisplay(cm, update);
+    var barMeasure = measureForScrollbars(cm);
+    updateSelection(cm);
+    updateScrollbars(cm, barMeasure);
+    setDocumentHeight(cm, barMeasure);
+    update.finish();
+  }
+}
+
+// Sync the actual display DOM structure with display.view, removing
+// nodes for lines that are no longer in view, and creating the ones
+// that are not there yet, and updating the ones that are out of
+// date.
+function patchDisplay(cm, updateNumbersFrom, dims) {
+  var display = cm.display, lineNumbers = cm.options.lineNumbers;
+  var container = display.lineDiv, cur = container.firstChild;
+
+  function rm(node) {
+    var next = node.nextSibling;
+    // Works around a throw-scroll bug in OS X Webkit
+    if (webkit && mac && cm.display.currentWheelTarget == node)
+      node.style.display = "none";
+    else
+      node.parentNode.removeChild(node);
+    return next;
+  }
+
+  var view = display.view, lineN = display.viewFrom;
+  // Loop over the elements in the view, syncing cur (the DOM nodes
+  // in display.lineDiv) with the view as we go.
+  for (var i = 0; i < view.length; i++) {
+    var lineView = view[i];
+    if (lineView.hidden) {
+    } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
+      var node = buildLineElement(cm, lineView, lineN, dims);
+      container.insertBefore(node, cur);
+    } else { // Already drawn
+      while (cur != lineView.node) cur = rm(cur);
+      var updateNumber = lineNumbers && updateNumbersFrom != null &&
+        updateNumbersFrom <= lineN && lineView.lineNumber;
+      if (lineView.changes) {
+        if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false;
+        updateLineForChanges(cm, lineView, lineN, dims);
+      }
+      if (updateNumber) {
+        removeChildren(lineView.lineNumber);
+        lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
+      }
+      cur = lineView.node.nextSibling;
+    }
+    lineN += lineView.size;
+  }
+  while (cur) cur = rm(cur);
+}
+
+export function updateGutterSpace(cm) {
+  var width = cm.display.gutters.offsetWidth;
+  cm.display.sizer.style.marginLeft = width + "px";
+}
+
+export function setDocumentHeight(cm, measure) {
+  cm.display.sizer.style.minHeight = measure.docHeight + "px";
+  cm.display.heightForcer.style.top = measure.docHeight + "px";
+  cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
+}
diff --git a/src/display/update_lines.js b/src/display/update_lines.js
new file mode 100644
index 0000000000..e10d8b9c1a
--- /dev/null
+++ b/src/display/update_lines.js
@@ -0,0 +1,62 @@
+import { heightAtLine } from "../line/spans";
+import { getLine, lineAtHeight, updateLineHeight } from "../line/utils_line";
+import { paddingTop, textHeight } from "../measurement/position_measurement";
+import { ie, ie_version } from "../util/browser";
+
+// Read the actual heights of the rendered lines, and update their
+// stored heights to match.
+export function updateHeightsInViewport(cm) {
+  var display = cm.display;
+  var prevBottom = display.lineDiv.offsetTop;
+  for (var i = 0; i < display.view.length; i++) {
+    var cur = display.view[i], height;
+    if (cur.hidden) continue;
+    if (ie && ie_version < 8) {
+      var bot = cur.node.offsetTop + cur.node.offsetHeight;
+      height = bot - prevBottom;
+      prevBottom = bot;
+    } else {
+      var box = cur.node.getBoundingClientRect();
+      height = box.bottom - box.top;
+    }
+    var diff = cur.line.height - height;
+    if (height < 2) height = textHeight(display);
+    if (diff > .001 || diff < -.001) {
+      updateLineHeight(cur.line, height);
+      updateWidgetHeight(cur.line);
+      if (cur.rest) for (var j = 0; j < cur.rest.length; j++)
+        updateWidgetHeight(cur.rest[j]);
+    }
+  }
+}
+
+// Read and store the height of line widgets associated with the
+// given line.
+function updateWidgetHeight(line) {
+  if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
+    line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight;
+}
+
+// Compute the lines that are visible in a given viewport (defaults
+// the the current scroll position). viewport may contain top,
+// height, and ensure (see op.scrollToPos) properties.
+export function visibleLines(display, doc, viewport) {
+  var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
+  top = Math.floor(top - paddingTop(display));
+  var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
+
+  var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
+  // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
+  // forces those lines into the viewport (if possible).
+  if (viewport && viewport.ensure) {
+    var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
+    if (ensureFrom < from) {
+      from = ensureFrom;
+      to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
+    } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
+      from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
+      to = ensureTo;
+    }
+  }
+  return {from: from, to: Math.max(to, from + 1)};
+}
diff --git a/src/display/view_tracking.js b/src/display/view_tracking.js
new file mode 100644
index 0000000000..fd535178ce
--- /dev/null
+++ b/src/display/view_tracking.js
@@ -0,0 +1,152 @@
+import { buildViewArray } from "../line/line_data";
+import { sawCollapsedSpans } from "../line/saw_special_spans";
+import { visualLineEndNo, visualLineNo } from "../line/spans";
+import { findViewIndex } from "../measurement/position_measurement";
+import { indexOf } from "../util/misc";
+
+// Updates the display.view data structure for a given change to the
+// document. From and to are in pre-change coordinates. Lendiff is
+// the amount of lines added or subtracted by the change. This is
+// used for changes that span multiple lines, or change the way
+// lines are divided into visual lines. regLineChange (below)
+// registers single-line changes.
+export function regChange(cm, from, to, lendiff) {
+  if (from == null) from = cm.doc.first;
+  if (to == null) to = cm.doc.first + cm.doc.size;
+  if (!lendiff) lendiff = 0;
+
+  var display = cm.display;
+  if (lendiff && to < display.viewTo &&
+      (display.updateLineNumbers == null || display.updateLineNumbers > from))
+    display.updateLineNumbers = from;
+
+  cm.curOp.viewChanged = true;
+
+  if (from >= display.viewTo) { // Change after
+    if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
+      resetView(cm);
+  } else if (to <= display.viewFrom) { // Change before
+    if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
+      resetView(cm);
+    } else {
+      display.viewFrom += lendiff;
+      display.viewTo += lendiff;
+    }
+  } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
+    resetView(cm);
+  } else if (from <= display.viewFrom) { // Top overlap
+    var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
+    if (cut) {
+      display.view = display.view.slice(cut.index);
+      display.viewFrom = cut.lineN;
+      display.viewTo += lendiff;
+    } else {
+      resetView(cm);
+    }
+  } else if (to >= display.viewTo) { // Bottom overlap
+    var cut = viewCuttingPoint(cm, from, from, -1);
+    if (cut) {
+      display.view = display.view.slice(0, cut.index);
+      display.viewTo = cut.lineN;
+    } else {
+      resetView(cm);
+    }
+  } else { // Gap in the middle
+    var cutTop = viewCuttingPoint(cm, from, from, -1);
+    var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
+    if (cutTop && cutBot) {
+      display.view = display.view.slice(0, cutTop.index)
+        .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
+        .concat(display.view.slice(cutBot.index));
+      display.viewTo += lendiff;
+    } else {
+      resetView(cm);
+    }
+  }
+
+  var ext = display.externalMeasured;
+  if (ext) {
+    if (to < ext.lineN)
+      ext.lineN += lendiff;
+    else if (from < ext.lineN + ext.size)
+      display.externalMeasured = null;
+  }
+}
+
+// Register a change to a single line. Type must be one of "text",
+// "gutter", "class", "widget"
+export function regLineChange(cm, line, type) {
+  cm.curOp.viewChanged = true;
+  var display = cm.display, ext = cm.display.externalMeasured;
+  if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
+    display.externalMeasured = null;
+
+  if (line < display.viewFrom || line >= display.viewTo) return;
+  var lineView = display.view[findViewIndex(cm, line)];
+  if (lineView.node == null) return;
+  var arr = lineView.changes || (lineView.changes = []);
+  if (indexOf(arr, type) == -1) arr.push(type);
+}
+
+// Clear the view.
+export function resetView(cm) {
+  cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
+  cm.display.view = [];
+  cm.display.viewOffset = 0;
+}
+
+function viewCuttingPoint(cm, oldN, newN, dir) {
+  var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
+  if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
+    return {index: index, lineN: newN};
+  for (var i = 0, n = cm.display.viewFrom; i < index; i++)
+    n += view[i].size;
+  if (n != oldN) {
+    if (dir > 0) {
+      if (index == view.length - 1) return null;
+      diff = (n + view[index].size) - oldN;
+      index++;
+    } else {
+      diff = n - oldN;
+    }
+    oldN += diff; newN += diff;
+  }
+  while (visualLineNo(cm.doc, newN) != newN) {
+    if (index == (dir < 0 ? 0 : view.length - 1)) return null;
+    newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
+    index += dir;
+  }
+  return {index: index, lineN: newN};
+}
+
+// Force the view to cover a given range, adding empty view element
+// or clipping off existing ones as needed.
+export function adjustView(cm, from, to) {
+  var display = cm.display, view = display.view;
+  if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
+    display.view = buildViewArray(cm, from, to);
+    display.viewFrom = from;
+  } else {
+    if (display.viewFrom > from)
+      display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view);
+    else if (display.viewFrom < from)
+      display.view = display.view.slice(findViewIndex(cm, from));
+    display.viewFrom = from;
+    if (display.viewTo < to)
+      display.view = display.view.concat(buildViewArray(cm, display.viewTo, to));
+    else if (display.viewTo > to)
+      display.view = display.view.slice(0, findViewIndex(cm, to));
+  }
+  display.viewTo = to;
+}
+
+// Count the number of lines in the view whose DOM representation is
+// out of date (or nonexistent).
+export function countDirtyView(cm) {
+  var view = cm.display.view, dirty = 0;
+  for (var i = 0; i < view.length; i++) {
+    var lineView = view[i];
+    if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty;
+  }
+  return dirty;
+}
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
new file mode 100644
index 0000000000..7bd6a60a50
--- /dev/null
+++ b/src/edit/CodeMirror.js
@@ -0,0 +1,213 @@
+import { Display } from "../display/Display";
+import { onFocus, onBlur } from "../display/focus";
+import { setGuttersForLineNumbers, updateGutters } from "../display/gutters";
+import { maybeUpdateLineNumberWidth } from "../display/line_numbers";
+import { endOperation, operation, startOperation } from "../display/operations";
+import { initScrollbars } from "../display/scrollbars";
+import { onScrollWheel, setScrollLeft, setScrollTop } from "../display/scroll_events";
+import { clipPos, Pos } from "../line/pos";
+import { posFromMouse } from "../measurement/position_measurement";
+import { eventInWidget } from "../measurement/widgets";
+import Doc from "../model/Doc";
+import { attachDoc } from "../model/document_data";
+import { Range } from "../model/selection";
+import { extendSelection } from "../model/selection_updates";
+import { captureRightClick, ie, ie_version, mobile, webkit } from "../util/browser";
+import { e_preventDefault, e_stop, on, signal, signalDOMEvent } from "../util/event";
+import { bind, copyObj, Delayed } from "../util/misc";
+
+import { clearDragCursor, onDragOver, onDragStart, onDrop } from "./drop_events";
+import { ensureGlobalHandlers } from "./global_events";
+import { onKeyDown, onKeyPress, onKeyUp } from "./key_events";
+import { clickInGutter, onContextMenu, onMouseDown } from "./mouse_events";
+import { themeChanged } from "./utils";
+import { defaults, optionHandlers, Init } from "./options";
+
+// A CodeMirror instance represents an editor. This is the object
+// that user code is usually dealing with.
+
+export function CodeMirror(place, options) {
+  if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
+
+  this.options = options = options ? copyObj(options) : {};
+  // Determine effective options based on given values and defaults.
+  copyObj(defaults, options, false);
+  setGuttersForLineNumbers(options);
+
+  var doc = options.value;
+  if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator);
+  this.doc = doc;
+
+  var input = new CodeMirror.inputStyles[options.inputStyle](this);
+  var display = this.display = new Display(place, doc, input);
+  display.wrapper.CodeMirror = this;
+  updateGutters(this);
+  themeChanged(this);
+  if (options.lineWrapping)
+    this.display.wrapper.className += " CodeMirror-wrap";
+  if (options.autofocus && !mobile) display.input.focus();
+  initScrollbars(this);
+
+  this.state = {
+    keyMaps: [],  // stores maps added by addKeyMap
+    overlays: [], // highlighting overlays, as added by addOverlay
+    modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
+    overwrite: false,
+    delayingBlurEvent: false,
+    focused: false,
+    suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
+    pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
+    selectingText: false,
+    draggingText: false,
+    highlight: new Delayed(), // stores highlight worker timeout
+    keySeq: null,  // Unfinished key sequence
+    specialChars: null
+  };
+
+  var cm = this;
+
+  // Override magic textarea content restore that IE sometimes does
+  // on our hidden textarea on reload
+  if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20);
+
+  registerEventHandlers(this);
+  ensureGlobalHandlers();
+
+  startOperation(this);
+  this.curOp.forceUpdate = true;
+  attachDoc(this, doc);
+
+  if ((options.autofocus && !mobile) || cm.hasFocus())
+    setTimeout(bind(onFocus, this), 20);
+  else
+    onBlur(this);
+
+  for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
+    optionHandlers[opt](this, options[opt], Init);
+  maybeUpdateLineNumberWidth(this);
+  if (options.finishInit) options.finishInit(this);
+  for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
+  endOperation(this);
+  // Suppress optimizelegibility in Webkit, since it breaks text
+  // measuring on line wrapping boundaries.
+  if (webkit && options.lineWrapping &&
+      getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
+    display.lineDiv.style.textRendering = "auto";
+}
+
+// The default configuration options.
+CodeMirror.defaults = defaults;
+// Functions to run when options are changed.
+CodeMirror.optionHandlers = optionHandlers;
+
+export default CodeMirror;
+
+// Attach the necessary event handlers when initializing the editor
+function registerEventHandlers(cm) {
+  var d = cm.display;
+  on(d.scroller, "mousedown", operation(cm, onMouseDown));
+  // Older IE's will not fire a second mousedown for a double click
+  if (ie && ie_version < 11)
+    on(d.scroller, "dblclick", operation(cm, function(e) {
+      if (signalDOMEvent(cm, e)) return;
+      var pos = posFromMouse(cm, e);
+      if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
+      e_preventDefault(e);
+      var word = cm.findWordAt(pos);
+      extendSelection(cm.doc, word.anchor, word.head);
+    }));
+  else
+    on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
+  // Some browsers fire contextmenu *after* opening the menu, at
+  // which point we can't mess with it anymore. Context menu is
+  // handled in onMouseDown for these browsers.
+  if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
+
+  // Used to suppress mouse event handling when a touch happens
+  var touchFinished, prevTouch = {end: 0};
+  function finishTouch() {
+    if (d.activeTouch) {
+      touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000);
+      prevTouch = d.activeTouch;
+      prevTouch.end = +new Date;
+    }
+  }
+  function isMouseLikeTouchEvent(e) {
+    if (e.touches.length != 1) return false;
+    var touch = e.touches[0];
+    return touch.radiusX <= 1 && touch.radiusY <= 1;
+  }
+  function farAway(touch, other) {
+    if (other.left == null) return true;
+    var dx = other.left - touch.left, dy = other.top - touch.top;
+    return dx * dx + dy * dy > 20 * 20;
+  }
+  on(d.scroller, "touchstart", function(e) {
+    if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
+      clearTimeout(touchFinished);
+      var now = +new Date;
+      d.activeTouch = {start: now, moved: false,
+                       prev: now - prevTouch.end <= 300 ? prevTouch : null};
+      if (e.touches.length == 1) {
+        d.activeTouch.left = e.touches[0].pageX;
+        d.activeTouch.top = e.touches[0].pageY;
+      }
+    }
+  });
+  on(d.scroller, "touchmove", function() {
+    if (d.activeTouch) d.activeTouch.moved = true;
+  });
+  on(d.scroller, "touchend", function(e) {
+    var touch = d.activeTouch;
+    if (touch && !eventInWidget(d, e) && touch.left != null &&
+        !touch.moved && new Date - touch.start < 300) {
+      var pos = cm.coordsChar(d.activeTouch, "page"), range;
+      if (!touch.prev || farAway(touch, touch.prev)) // Single tap
+        range = new Range(pos, pos);
+      else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
+        range = cm.findWordAt(pos);
+      else // Triple tap
+        range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)));
+      cm.setSelection(range.anchor, range.head);
+      cm.focus();
+      e_preventDefault(e);
+    }
+    finishTouch();
+  });
+  on(d.scroller, "touchcancel", finishTouch);
+
+  // Sync scrolling between fake scrollbars and real scrollable
+  // area, ensure viewport is updated when scrolling.
+  on(d.scroller, "scroll", function() {
+    if (d.scroller.clientHeight) {
+      setScrollTop(cm, d.scroller.scrollTop);
+      setScrollLeft(cm, d.scroller.scrollLeft, true);
+      signal(cm, "scroll", cm);
+    }
+  });
+
+  // Listen to wheel events in order to try and update the viewport on time.
+  on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
+  on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
+
+  // Prevent wrapper from ever scrolling
+  on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
+
+  d.dragFunctions = {
+    enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
+    over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
+    start: function(e){onDragStart(cm, e);},
+    drop: operation(cm, onDrop),
+    leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
+  };
+
+  var inp = d.input.getField();
+  on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
+  on(inp, "keydown", operation(cm, onKeyDown));
+  on(inp, "keypress", operation(cm, onKeyPress));
+  on(inp, "focus", function(e) { onFocus(cm, e); });
+  on(inp, "blur", function (e) { onBlur(cm, e); });
+}
+
+var initHooks = [];
+CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
diff --git a/src/edit/commands.js b/src/edit/commands.js
new file mode 100644
index 0000000000..3e8735ec13
--- /dev/null
+++ b/src/edit/commands.js
@@ -0,0 +1,199 @@
+import { deleteNearSelection } from "./deleteNearSelection";
+import { runInOp } from "../display/operations";
+import { ensureCursorVisible } from "../display/scrolling";
+import { clipPos, Pos } from "../line/pos";
+import { collapsedSpanAtEnd, visualLine } from "../line/spans";
+import { getLine, lineNo } from "../line/utils_line";
+import { Range } from "../model/selection";
+import { selectAll } from "../model/selection_updates";
+import { countColumn, sel_dontScroll, sel_move, spaceStr } from "../util/misc";
+import { getOrder, lineLeft, lineRight } from "../util/bidi";
+
+// Commands are parameter-less actions that can be performed on an
+// editor, mostly used for keybindings.
+export var commands = {
+  selectAll: selectAll,
+  singleSelection: function(cm) {
+    cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll);
+  },
+  killLine: function(cm) {
+    deleteNearSelection(cm, function(range) {
+      if (range.empty()) {
+        var len = getLine(cm.doc, range.head.line).text.length;
+        if (range.head.ch == len && range.head.line < cm.lastLine())
+          return {from: range.head, to: Pos(range.head.line + 1, 0)};
+        else
+          return {from: range.head, to: Pos(range.head.line, len)};
+      } else {
+        return {from: range.from(), to: range.to()};
+      }
+    });
+  },
+  deleteLine: function(cm) {
+    deleteNearSelection(cm, function(range) {
+      return {from: Pos(range.from().line, 0),
+              to: clipPos(cm.doc, Pos(range.to().line + 1, 0))};
+    });
+  },
+  delLineLeft: function(cm) {
+    deleteNearSelection(cm, function(range) {
+      return {from: Pos(range.from().line, 0), to: range.from()};
+    });
+  },
+  delWrappedLineLeft: function(cm) {
+    deleteNearSelection(cm, function(range) {
+      var top = cm.charCoords(range.head, "div").top + 5;
+      var leftPos = cm.coordsChar({left: 0, top: top}, "div");
+      return {from: leftPos, to: range.from()};
+    });
+  },
+  delWrappedLineRight: function(cm) {
+    deleteNearSelection(cm, function(range) {
+      var top = cm.charCoords(range.head, "div").top + 5;
+      var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
+      return {from: range.from(), to: rightPos };
+    });
+  },
+  undo: function(cm) {cm.undo();},
+  redo: function(cm) {cm.redo();},
+  undoSelection: function(cm) {cm.undoSelection();},
+  redoSelection: function(cm) {cm.redoSelection();},
+  goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
+  goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
+  goLineStart: function(cm) {
+    cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); },
+                          {origin: "+move", bias: 1});
+  },
+  goLineStartSmart: function(cm) {
+    cm.extendSelectionsBy(function(range) {
+      return lineStartSmart(cm, range.head);
+    }, {origin: "+move", bias: 1});
+  },
+  goLineEnd: function(cm) {
+    cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); },
+                          {origin: "+move", bias: -1});
+  },
+  goLineRight: function(cm) {
+    cm.extendSelectionsBy(function(range) {
+      var top = cm.charCoords(range.head, "div").top + 5;
+      return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
+    }, sel_move);
+  },
+  goLineLeft: function(cm) {
+    cm.extendSelectionsBy(function(range) {
+      var top = cm.charCoords(range.head, "div").top + 5;
+      return cm.coordsChar({left: 0, top: top}, "div");
+    }, sel_move);
+  },
+  goLineLeftSmart: function(cm) {
+    cm.extendSelectionsBy(function(range) {
+      var top = cm.charCoords(range.head, "div").top + 5;
+      var pos = cm.coordsChar({left: 0, top: top}, "div");
+      if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head);
+      return pos;
+    }, sel_move);
+  },
+  goLineUp: function(cm) {cm.moveV(-1, "line");},
+  goLineDown: function(cm) {cm.moveV(1, "line");},
+  goPageUp: function(cm) {cm.moveV(-1, "page");},
+  goPageDown: function(cm) {cm.moveV(1, "page");},
+  goCharLeft: function(cm) {cm.moveH(-1, "char");},
+  goCharRight: function(cm) {cm.moveH(1, "char");},
+  goColumnLeft: function(cm) {cm.moveH(-1, "column");},
+  goColumnRight: function(cm) {cm.moveH(1, "column");},
+  goWordLeft: function(cm) {cm.moveH(-1, "word");},
+  goGroupRight: function(cm) {cm.moveH(1, "group");},
+  goGroupLeft: function(cm) {cm.moveH(-1, "group");},
+  goWordRight: function(cm) {cm.moveH(1, "word");},
+  delCharBefore: function(cm) {cm.deleteH(-1, "char");},
+  delCharAfter: function(cm) {cm.deleteH(1, "char");},
+  delWordBefore: function(cm) {cm.deleteH(-1, "word");},
+  delWordAfter: function(cm) {cm.deleteH(1, "word");},
+  delGroupBefore: function(cm) {cm.deleteH(-1, "group");},
+  delGroupAfter: function(cm) {cm.deleteH(1, "group");},
+  indentAuto: function(cm) {cm.indentSelection("smart");},
+  indentMore: function(cm) {cm.indentSelection("add");},
+  indentLess: function(cm) {cm.indentSelection("subtract");},
+  insertTab: function(cm) {cm.replaceSelection("\t");},
+  insertSoftTab: function(cm) {
+    var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].from();
+      var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
+      spaces.push(spaceStr(tabSize - col % tabSize));
+    }
+    cm.replaceSelections(spaces);
+  },
+  defaultTab: function(cm) {
+    if (cm.somethingSelected()) cm.indentSelection("add");
+    else cm.execCommand("insertTab");
+  },
+  transposeChars: function(cm) {
+    runInOp(cm, function() {
+      var ranges = cm.listSelections(), newSel = [];
+      for (var i = 0; i < ranges.length; i++) {
+        var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
+        if (line) {
+          if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1);
+          if (cur.ch > 0) {
+            cur = new Pos(cur.line, cur.ch + 1);
+            cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
+                            Pos(cur.line, cur.ch - 2), cur, "+transpose");
+          } else if (cur.line > cm.doc.first) {
+            var prev = getLine(cm.doc, cur.line - 1).text;
+            if (prev)
+              cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
+                              prev.charAt(prev.length - 1),
+                              Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
+          }
+        }
+        newSel.push(new Range(cur, cur));
+      }
+      cm.setSelections(newSel);
+    });
+  },
+  newlineAndIndent: function(cm) {
+    runInOp(cm, function() {
+      var sels = cm.listSelections()
+      for (var i = sels.length - 1; i >= 0; i--)
+        cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input")
+      sels = cm.listSelections()
+      for (var i = 0; i < sels.length; i++)
+        cm.indentLine(sels[i].from().line, null, true)
+      ensureCursorVisible(cm);
+    });
+  },
+  openLine: function(cm) {cm.replaceSelection("\n", "start")},
+  toggleOverwrite: function(cm) {cm.toggleOverwrite();}
+};
+
+
+function lineStart(cm, lineN) {
+  var line = getLine(cm.doc, lineN);
+  var visual = visualLine(line);
+  if (visual != line) lineN = lineNo(visual);
+  var order = getOrder(visual);
+  var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual);
+  return Pos(lineN, ch);
+}
+function lineEnd(cm, lineN) {
+  var merged, line = getLine(cm.doc, lineN);
+  while (merged = collapsedSpanAtEnd(line)) {
+    line = merged.find(1, true).line;
+    lineN = null;
+  }
+  var order = getOrder(line);
+  var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
+  return Pos(lineN == null ? lineNo(line) : lineN, ch);
+}
+function lineStartSmart(cm, pos) {
+  var start = lineStart(cm, pos.line);
+  var line = getLine(cm.doc, start.line);
+  var order = getOrder(line);
+  if (!order || order[0].level == 0) {
+    var firstNonWS = Math.max(0, line.text.search(/\S/));
+    var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
+    return Pos(start.line, inWS ? 0 : firstNonWS);
+  }
+  return start;
+}
diff --git a/src/edit/deleteNearSelection.js b/src/edit/deleteNearSelection.js
new file mode 100644
index 0000000000..dd1369026c
--- /dev/null
+++ b/src/edit/deleteNearSelection.js
@@ -0,0 +1,30 @@
+import { runInOp } from "../display/operations";
+import { ensureCursorVisible } from "../display/scrolling";
+import { cmp } from "../line/pos";
+import { replaceRange } from "../model/changes";
+import { lst } from "../util/misc";
+
+// Helper for deleting text near the selection(s), used to implement
+// backspace, delete, and similar functionality.
+export function deleteNearSelection(cm, compute) {
+  var ranges = cm.doc.sel.ranges, kill = [];
+  // Build up a set of ranges to kill first, merging overlapping
+  // ranges.
+  for (var i = 0; i < ranges.length; i++) {
+    var toKill = compute(ranges[i]);
+    while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
+      var replaced = kill.pop();
+      if (cmp(replaced.from, toKill.from) < 0) {
+        toKill.from = replaced.from;
+        break;
+      }
+    }
+    kill.push(toKill);
+  }
+  // Next, remove those actual ranges.
+  runInOp(cm, function() {
+    for (var i = kill.length - 1; i >= 0; i--)
+      replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
+    ensureCursorVisible(cm);
+  });
+}
diff --git a/src/edit/drop_events.js b/src/edit/drop_events.js
new file mode 100644
index 0000000000..fac58a266e
--- /dev/null
+++ b/src/edit/drop_events.js
@@ -0,0 +1,118 @@
+import { drawSelectionCursor } from "../display/selection";
+import { operation } from "../display/operations";
+import { clipPos } from "../line/pos";
+import { posFromMouse } from "../measurement/position_measurement";
+import { eventInWidget } from "../measurement/widgets";
+import { makeChange, replaceRange } from "../model/changes";
+import { changeEnd } from "../model/change_measurement";
+import { simpleSelection } from "../model/selection";
+import { setSelectionNoUndo, setSelectionReplaceHistory } from "../model/selection_updates";
+import { ie, presto, safari } from "../util/browser";
+import { elt, removeChildrenAndAdd } from "../util/dom";
+import { e_preventDefault, e_stop, signalDOMEvent } from "../util/event";
+import { indexOf } from "../util/misc";
+
+// Kludge to work around strange IE behavior where it'll sometimes
+// re-fire a series of drag-related events right after the drop (#1551)
+var lastDrop = 0;
+
+export function onDrop(e) {
+  var cm = this;
+  clearDragCursor(cm);
+  if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
+    return;
+  e_preventDefault(e);
+  if (ie) lastDrop = +new Date;
+  var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
+  if (!pos || cm.isReadOnly()) return;
+  // Might be a file drop, in which case we simply extract the text
+  // and insert it.
+  if (files && files.length && window.FileReader && window.File) {
+    var n = files.length, text = Array(n), read = 0;
+    var loadFile = function(file, i) {
+      if (cm.options.allowDropFileTypes &&
+          indexOf(cm.options.allowDropFileTypes, file.type) == -1)
+        return;
+
+      var reader = new FileReader;
+      reader.onload = operation(cm, function() {
+        var content = reader.result;
+        if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = "";
+        text[i] = content;
+        if (++read == n) {
+          pos = clipPos(cm.doc, pos);
+          var change = {from: pos, to: pos,
+                        text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+                        origin: "paste"};
+          makeChange(cm.doc, change);
+          setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
+        }
+      });
+      reader.readAsText(file);
+    };
+    for (var i = 0; i < n; ++i) loadFile(files[i], i);
+  } else { // Normal drop
+    // Don't do a replace if the drop happened inside of the selected text.
+    if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
+      cm.state.draggingText(e);
+      // Ensure the editor is re-focused
+      setTimeout(function() {cm.display.input.focus();}, 20);
+      return;
+    }
+    try {
+      var text = e.dataTransfer.getData("Text");
+      if (text) {
+        if (cm.state.draggingText && !cm.state.draggingText.copy)
+          var selected = cm.listSelections();
+        setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
+        if (selected) for (var i = 0; i < selected.length; ++i)
+          replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
+        cm.replaceSelection(text, "around", "paste");
+        cm.display.input.focus();
+      }
+    }
+    catch(e){}
+  }
+}
+
+export function onDragStart(cm, e) {
+  if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
+  if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
+
+  e.dataTransfer.setData("Text", cm.getSelection());
+  e.dataTransfer.effectAllowed = "copyMove"
+
+  // Use dummy image instead of default browsers image.
+  // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
+  if (e.dataTransfer.setDragImage && !safari) {
+    var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
+    img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
+    if (presto) {
+      img.width = img.height = 1;
+      cm.display.wrapper.appendChild(img);
+      // Force a relayout, or Opera won't use our image for some obscure reason
+      img._top = img.offsetTop;
+    }
+    e.dataTransfer.setDragImage(img, 0, 0);
+    if (presto) img.parentNode.removeChild(img);
+  }
+}
+
+export function onDragOver(cm, e) {
+  var pos = posFromMouse(cm, e);
+  if (!pos) return;
+  var frag = document.createDocumentFragment();
+  drawSelectionCursor(cm, pos, frag);
+  if (!cm.display.dragCursor) {
+    cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
+    cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
+  }
+  removeChildrenAndAdd(cm.display.dragCursor, frag);
+}
+
+export function clearDragCursor(cm) {
+  if (cm.display.dragCursor) {
+    cm.display.lineSpace.removeChild(cm.display.dragCursor);
+    cm.display.dragCursor = null;
+  }
+}
diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
new file mode 100644
index 0000000000..aa1a040fa9
--- /dev/null
+++ b/src/edit/fromTextArea.js
@@ -0,0 +1,59 @@
+import { CodeMirror } from "./CodeMirror";
+import { activeElt } from "../util/dom";
+import { off, on } from "../util/event";
+import { copyObj } from "../util/misc";
+
+export function fromTextArea(textarea, options) {
+  options = options ? copyObj(options) : {};
+  options.value = textarea.value;
+  if (!options.tabindex && textarea.tabIndex)
+    options.tabindex = textarea.tabIndex;
+  if (!options.placeholder && textarea.placeholder)
+    options.placeholder = textarea.placeholder;
+  // Set autofocus to true if this textarea is focused, or if it has
+  // autofocus and no other element is focused.
+  if (options.autofocus == null) {
+    var hasFocus = activeElt();
+    options.autofocus = hasFocus == textarea ||
+      textarea.getAttribute("autofocus") != null && hasFocus == document.body;
+  }
+
+  function save() {textarea.value = cm.getValue();}
+  if (textarea.form) {
+    on(textarea.form, "submit", save);
+    // Deplorable hack to make the submit method do the right thing.
+    if (!options.leaveSubmitMethodAlone) {
+      var form = textarea.form, realSubmit = form.submit;
+      try {
+        var wrappedSubmit = form.submit = function() {
+          save();
+          form.submit = realSubmit;
+          form.submit();
+          form.submit = wrappedSubmit;
+        };
+      } catch(e) {}
+    }
+  }
+
+  options.finishInit = function(cm) {
+    cm.save = save;
+    cm.getTextArea = function() { return textarea; };
+    cm.toTextArea = function() {
+      cm.toTextArea = isNaN; // Prevent this from being ran twice
+      save();
+      textarea.parentNode.removeChild(cm.getWrapperElement());
+      textarea.style.display = "";
+      if (textarea.form) {
+        off(textarea.form, "submit", save);
+        if (typeof textarea.form.submit == "function")
+          textarea.form.submit = realSubmit;
+      }
+    };
+  };
+
+  textarea.style.display = "none";
+  var cm = CodeMirror(function(node) {
+    textarea.parentNode.insertBefore(node, textarea.nextSibling);
+  }, options);
+  return cm;
+}
diff --git a/src/edit/global_events.js b/src/edit/global_events.js
new file mode 100644
index 0000000000..b219285dfb
--- /dev/null
+++ b/src/edit/global_events.js
@@ -0,0 +1,46 @@
+import { onBlur } from "../display/focus";
+import { on } from "../util/event";
+
+// These must be handled carefully, because naively registering a
+// handler for each editor will cause the editors to never be
+// garbage collected.
+
+function forEachCodeMirror(f) {
+  if (!document.body.getElementsByClassName) return;
+  var byClass = document.body.getElementsByClassName("CodeMirror");
+  for (var i = 0; i < byClass.length; i++) {
+    var cm = byClass[i].CodeMirror;
+    if (cm) f(cm);
+  }
+}
+
+var globalsRegistered = false;
+export function ensureGlobalHandlers() {
+  if (globalsRegistered) return;
+  registerGlobalHandlers();
+  globalsRegistered = true;
+}
+function registerGlobalHandlers() {
+  // When the window resizes, we need to refresh active editors.
+  var resizeTimer;
+  on(window, "resize", function() {
+    if (resizeTimer == null) resizeTimer = setTimeout(function() {
+      resizeTimer = null;
+      forEachCodeMirror(onResize);
+    }, 100);
+  });
+  // When the window loses focus, we want to show the editor as blurred
+  on(window, "blur", function() {
+    forEachCodeMirror(onBlur);
+  });
+}
+// Called when the window resizes
+function onResize(cm) {
+  var d = cm.display;
+  if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
+    return;
+  // Might be a text scaling operation, clear size caches.
+  d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+  d.scrollbarsClipped = false;
+  cm.setSize();
+}
diff --git a/src/edit/key_events.js b/src/edit/key_events.js
new file mode 100644
index 0000000000..92763037c9
--- /dev/null
+++ b/src/edit/key_events.js
@@ -0,0 +1,153 @@
+import { signalLater } from "../util/operation_group";
+import { restartBlink } from "../display/selection";
+import { isModifierKey, keyName, lookupKey } from "../input/keymap";
+import { eventInWidget } from "../measurement/widgets";
+import { ie, ie_version, mac, presto } from "../util/browser";
+import { activeElt, addClass, rmClass } from "../util/dom";
+import { e_preventDefault, off, on, signalDOMEvent } from "../util/event";
+import { hasCopyEvent } from "../util/feature_detection";
+import { Delayed, Pass } from "../util/misc";
+
+import { commands } from "./commands";
+
+// Run a handler that was bound to a key.
+function doHandleBinding(cm, bound, dropShift) {
+  if (typeof bound == "string") {
+    bound = commands[bound];
+    if (!bound) return false;
+  }
+  // Ensure previous input has been read, so that the handler sees a
+  // consistent view of the document
+  cm.display.input.ensurePolled();
+  var prevShift = cm.display.shift, done = false;
+  try {
+    if (cm.isReadOnly()) cm.state.suppressEdits = true;
+    if (dropShift) cm.display.shift = false;
+    done = bound(cm) != Pass;
+  } finally {
+    cm.display.shift = prevShift;
+    cm.state.suppressEdits = false;
+  }
+  return done;
+}
+
+function lookupKeyForEditor(cm, name, handle) {
+  for (var i = 0; i < cm.state.keyMaps.length; i++) {
+    var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
+    if (result) return result;
+  }
+  return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
+    || lookupKey(name, cm.options.keyMap, handle, cm);
+}
+
+var stopSeq = new Delayed;
+function dispatchKey(cm, name, e, handle) {
+  var seq = cm.state.keySeq;
+  if (seq) {
+    if (isModifierKey(name)) return "handled";
+    stopSeq.set(50, function() {
+      if (cm.state.keySeq == seq) {
+        cm.state.keySeq = null;
+        cm.display.input.reset();
+      }
+    });
+    name = seq + " " + name;
+  }
+  var result = lookupKeyForEditor(cm, name, handle);
+
+  if (result == "multi")
+    cm.state.keySeq = name;
+  if (result == "handled")
+    signalLater(cm, "keyHandled", cm, name, e);
+
+  if (result == "handled" || result == "multi") {
+    e_preventDefault(e);
+    restartBlink(cm);
+  }
+
+  if (seq && !result && /\'$/.test(name)) {
+    e_preventDefault(e);
+    return true;
+  }
+  return !!result;
+}
+
+// Handle a key from the keydown event.
+function handleKeyBinding(cm, e) {
+  var name = keyName(e, true);
+  if (!name) return false;
+
+  if (e.shiftKey && !cm.state.keySeq) {
+    // First try to resolve full name (including 'Shift-'). Failing
+    // that, see if there is a cursor-motion command (starting with
+    // 'go') bound to the keyname without 'Shift-'.
+    return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
+        || dispatchKey(cm, name, e, function(b) {
+             if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
+               return doHandleBinding(cm, b);
+           });
+  } else {
+    return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
+  }
+}
+
+// Handle a key from the keypress event
+function handleCharBinding(cm, e, ch) {
+  return dispatchKey(cm, "'" + ch + "'", e,
+                     function(b) { return doHandleBinding(cm, b, true); });
+}
+
+var lastStoppedKey = null;
+export function onKeyDown(e) {
+  var cm = this;
+  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;
+  var code = e.keyCode;
+  cm.display.shift = code == 16 || e.shiftKey;
+  var handled = handleKeyBinding(cm, e);
+  if (presto) {
+    lastStoppedKey = handled ? code : null;
+    // Opera has no cut event... we try to at least catch the key combo
+    if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
+      cm.replaceSelection("", null, "cut");
+  }
+
+  // Turn mouse into crosshair when Alt is held on Mac.
+  if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
+    showCrossHair(cm);
+}
+
+function showCrossHair(cm) {
+  var lineDiv = cm.display.lineDiv;
+  addClass(lineDiv, "CodeMirror-crosshair");
+
+  function up(e) {
+    if (e.keyCode == 18 || !e.altKey) {
+      rmClass(lineDiv, "CodeMirror-crosshair");
+      off(document, "keyup", up);
+      off(document, "mouseover", up);
+    }
+  }
+  on(document, "keyup", up);
+  on(document, "mouseover", up);
+}
+
+export function onKeyUp(e) {
+  if (e.keyCode == 16) this.doc.sel.shift = false;
+  signalDOMEvent(this, e);
+}
+
+export function onKeyPress(e) {
+  var cm = this;
+  if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
+  var keyCode = e.keyCode, charCode = e.charCode;
+  if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
+  if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
+  var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
+  // Some browsers fire keypress events for backspace
+  if (ch == "\x08") return;
+  if (handleCharBinding(cm, e, ch)) return;
+  cm.display.input.onKeyPress(e);
+}
diff --git a/src/edit/legacy.js b/src/edit/legacy.js
new file mode 100644
index 0000000000..150f8a7225
--- /dev/null
+++ b/src/edit/legacy.js
@@ -0,0 +1,62 @@
+import { scrollbarModel } from "../display/scrollbars";
+import { wheelEventPixels } from "../display/scroll_events";
+import { keyMap, keyName, isModifierKey, lookupKey, normalizeKeyMap } from "../input/keymap";
+import { keyNames } from "../input/keynames";
+import { Line } from "../line/line_data";
+import { cmp, Pos } from "../line/pos";
+import { changeEnd } from "../model/change_measurement";
+import Doc from "../model/Doc";
+import { LineWidget } from "../model/line_widget";
+import { SharedTextMarker, TextMarker } from "../model/mark_text";
+import { copyState, extendMode, getMode, innerMode, mimeModes, modeExtensions, modes, resolveMode, startState } from "../modes";
+import { addClass, contains, rmClass } from "../util/dom";
+import { e_preventDefault, e_stop, e_stopPropagation, off, on, signal } from "../util/event";
+import { splitLinesAuto } from "../util/feature_detection";
+import { countColumn, findColumn, isWordCharBasic, Pass } from "../util/misc";
+import StringStream from "../util/StringStream";
+
+import { commands } from "./commands";
+
+export function addLegacyProps(CodeMirror) {
+  CodeMirror.off = off;
+  CodeMirror.on = on;
+  CodeMirror.wheelEventPixels = wheelEventPixels;
+  CodeMirror.Doc = Doc;
+  CodeMirror.splitLines = splitLinesAuto;
+  CodeMirror.countColumn = countColumn;
+  CodeMirror.findColumn = findColumn;
+  CodeMirror.isWordChar = isWordCharBasic;
+  CodeMirror.Pass = Pass;
+  CodeMirror.signal = signal;
+  CodeMirror.Line = Line;
+  CodeMirror.changeEnd = changeEnd;
+  CodeMirror.scrollbarModel = scrollbarModel;
+  CodeMirror.Pos = Pos;
+  CodeMirror.cmpPos = cmp;
+  CodeMirror.modes = modes;
+  CodeMirror.mimeModes = mimeModes;
+  CodeMirror.resolveMode = resolveMode;
+  CodeMirror.getMode = getMode;
+  CodeMirror.modeExtensions = modeExtensions;
+  CodeMirror.extendMode = extendMode;
+  CodeMirror.copyState = copyState;
+  CodeMirror.startState = startState;
+  CodeMirror.innerMode = innerMode;
+  CodeMirror.commands = commands;
+  CodeMirror.keyMap = keyMap;
+  CodeMirror.keyName = keyName;
+  CodeMirror.isModifierKey = isModifierKey;
+  CodeMirror.lookupKey = lookupKey;
+  CodeMirror.normalizeKeyMap = normalizeKeyMap;
+  CodeMirror.StringStream = StringStream;
+  CodeMirror.SharedTextMarker = SharedTextMarker;
+  CodeMirror.TextMarker = TextMarker;
+  CodeMirror.LineWidget = LineWidget;
+  CodeMirror.e_preventDefault = e_preventDefault;
+  CodeMirror.e_stopPropagation = e_stopPropagation;
+  CodeMirror.e_stop = e_stop;
+  CodeMirror.addClass = addClass;
+  CodeMirror.contains = contains;
+  CodeMirror.rmClass = rmClass;
+  CodeMirror.keyNames = keyNames;
+}
diff --git a/src/edit/main.js b/src/edit/main.js
new file mode 100644
index 0000000000..a955aaa197
--- /dev/null
+++ b/src/edit/main.js
@@ -0,0 +1,71 @@
+// EDITOR CONSTRUCTOR
+
+import { CodeMirror } from "./CodeMirror";
+export { CodeMirror } from "./CodeMirror";
+
+import { eventMixin } from "../util/event";
+import { indexOf } from "../util/misc";
+
+import { defineOptions } from "./options";
+
+defineOptions(CodeMirror);
+
+import addEditorMethods from "./methods";
+
+addEditorMethods(CodeMirror);
+
+import Doc from "../model/Doc";
+
+// Set up methods on CodeMirror's prototype to redirect to the editor's document.
+var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
+for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
+  CodeMirror.prototype[prop] = (function(method) {
+    return function() {return method.apply(this.doc, arguments);};
+  })(Doc.prototype[prop]);
+
+eventMixin(Doc);
+
+// INPUT HANDLING
+
+import ContentEditableInput from "../input/ContentEditableInput";
+import TextareaInput from "../input/TextareaInput";
+CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
+
+// MODE DEFINITION AND QUERYING
+
+import { defineMIME, defineMode } from "../modes";
+
+// Extra arguments are stored as the mode's dependencies, which is
+// used by (legacy) mechanisms like loadmode.js to automatically
+// load a mode. (Preferred mechanism is the require/define calls.)
+CodeMirror.defineMode = function(name/*, mode, …*/) {
+  if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
+  defineMode.apply(this, arguments);
+};
+
+CodeMirror.defineMIME = defineMIME;
+
+// Minimal default mode.
+CodeMirror.defineMode("null", function() {
+  return {token: function(stream) {stream.skipToEnd();}};
+});
+CodeMirror.defineMIME("text/plain", "null");
+
+// EXTENSIONS
+
+CodeMirror.defineExtension = function(name, func) {
+  CodeMirror.prototype[name] = func;
+};
+CodeMirror.defineDocExtension = function(name, func) {
+  Doc.prototype[name] = func;
+};
+
+import { fromTextArea } from "./fromTextArea";
+
+CodeMirror.fromTextArea = fromTextArea;
+
+import { addLegacyProps } from "./legacy";
+
+addLegacyProps(CodeMirror);
+
+CodeMirror.version = "5.19.1";
diff --git a/src/edit/methods.js b/src/edit/methods.js
new file mode 100644
index 0000000000..84aaf397b0
--- /dev/null
+++ b/src/edit/methods.js
@@ -0,0 +1,573 @@
+import { deleteNearSelection } from "./deleteNearSelection";
+import { changeLine } from "../model/changes";
+import { commands } from "./commands";
+import { attachDoc } from "../model/document_data";
+import { activeElt, addClass, rmClass } from "../util/dom";
+import { eventMixin, signal } from "../util/event";
+import { getLineStyles, getStateBefore, takeToken } from "../line/highlight";
+import { indentLine } from "../input/indent";
+import { triggerElectric } from "../input/input";
+import { onKeyDown, onKeyPress, onKeyUp } from "./key_events";
+import { getKeyMap } from "../input/keymap";
+import { methodOp, operation, runInOp } from "../display/operations";
+import { clipLine, clipPos, cmp, Pos } from "../line/pos";
+import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement";
+import { Range } from "../model/selection";
+import { replaceOneSelection, skipAtomic } from "../model/selection_updates";
+import { addToScrollPos, calculateScrollPos, ensureCursorVisible, resolveScrollToPos, scrollIntoView } from "../display/scrolling";
+import { heightAtLine } from "../line/spans";
+import { updateGutterSpace } from "../display/update_display";
+import { lineLeft, lineRight, moveLogically, moveVisually } from "../util/bidi";
+import { indexOf, insertSorted, isEmpty, isWordChar, sel_dontScroll, sel_move } from "../util/misc";
+import { signalLater } from "../util/operation_group";
+import { getLine, isLine, lineAtHeight, lineNo } from "../line/utils_line";
+import { regChange, regLineChange } from "../display/view_tracking";
+
+// The publicly visible API. Note that methodOp(f) means
+// 'wrap f in an operation, performed on its `this` parameter'.
+
+// This is not the complete set of editor methods. Most of the
+// methods defined on the Doc type are also injected into
+// CodeMirror.prototype, for backwards compatibility and
+// convenience.
+
+export default function(CodeMirror) {
+  var optionHandlers = CodeMirror.optionHandlers;
+
+  var helpers = CodeMirror.helpers = {};
+
+  CodeMirror.prototype = {
+    constructor: CodeMirror,
+    focus: function(){window.focus(); this.display.input.focus();},
+
+    setOption: function(option, value) {
+      var options = this.options, old = options[option];
+      if (options[option] == value && option != "mode") return;
+      options[option] = value;
+      if (optionHandlers.hasOwnProperty(option))
+        operation(this, optionHandlers[option])(this, value, old);
+    },
+
+    getOption: function(option) {return this.options[option];},
+    getDoc: function() {return this.doc;},
+
+    addKeyMap: function(map, bottom) {
+      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
+    },
+    removeKeyMap: function(map) {
+      var maps = this.state.keyMaps;
+      for (var i = 0; i < maps.length; ++i)
+        if (maps[i] == map || maps[i].name == map) {
+          maps.splice(i, 1);
+          return true;
+        }
+    },
+
+    addOverlay: methodOp(function(spec, options) {
+      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
+      if (mode.startState) throw new Error("Overlays may not be stateful.");
+      insertSorted(this.state.overlays,
+                   {mode: mode, modeSpec: spec, opaque: options && options.opaque,
+                    priority: (options && options.priority) || 0},
+                   function(overlay) { return overlay.priority })
+      this.state.modeGen++;
+      regChange(this);
+    }),
+    removeOverlay: methodOp(function(spec) {
+      var overlays = this.state.overlays;
+      for (var i = 0; i < overlays.length; ++i) {
+        var cur = overlays[i].modeSpec;
+        if (cur == spec || typeof spec == "string" && cur.name == spec) {
+          overlays.splice(i, 1);
+          this.state.modeGen++;
+          regChange(this);
+          return;
+        }
+      }
+    }),
+
+    indentLine: methodOp(function(n, dir, aggressive) {
+      if (typeof dir != "string" && typeof dir != "number") {
+        if (dir == null) dir = this.options.smartIndent ? "smart" : "prev";
+        else dir = dir ? "add" : "subtract";
+      }
+      if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
+    }),
+    indentSelection: methodOp(function(how) {
+      var ranges = this.doc.sel.ranges, end = -1;
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i];
+        if (!range.empty()) {
+          var from = range.from(), to = range.to();
+          var start = Math.max(end, from.line);
+          end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
+          for (var j = start; j < end; ++j)
+            indentLine(this, j, how);
+          var newRanges = this.doc.sel.ranges;
+          if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
+            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll);
+        } else if (range.head.line > end) {
+          indentLine(this, range.head.line, how, true);
+          end = range.head.line;
+          if (i == this.doc.sel.primIndex) ensureCursorVisible(this);
+        }
+      }
+    }),
+
+    // Fetch the parser token for a given character. Useful for hacks
+    // that want to inspect the mode state (say, for completion).
+    getTokenAt: function(pos, precise) {
+      return takeToken(this, pos, precise);
+    },
+
+    getLineTokens: function(line, precise) {
+      return takeToken(this, Pos(line), precise, true);
+    },
+
+    getTokenTypeAt: function(pos) {
+      pos = clipPos(this.doc, pos);
+      var styles = getLineStyles(this, getLine(this.doc, pos.line));
+      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
+      var type;
+      if (ch == 0) type = styles[2];
+      else for (;;) {
+        var mid = (before + after) >> 1;
+        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
+        else if (styles[mid * 2 + 1] < ch) before = mid + 1;
+        else { type = styles[mid * 2 + 2]; break; }
+      }
+      var cut = type ? type.indexOf("cm-overlay ") : -1;
+      return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1);
+    },
+
+    getModeAt: function(pos) {
+      var mode = this.doc.mode;
+      if (!mode.innerMode) return mode;
+      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;
+    },
+
+    getHelper: function(pos, type) {
+      return this.getHelpers(pos, type)[0];
+    },
+
+    getHelpers: function(pos, type) {
+      var found = [];
+      if (!helpers.hasOwnProperty(type)) return found;
+      var help = helpers[type], mode = this.getModeAt(pos);
+      if (typeof mode[type] == "string") {
+        if (help[mode[type]]) found.push(help[mode[type]]);
+      } else if (mode[type]) {
+        for (var i = 0; i < mode[type].length; i++) {
+          var val = help[mode[type][i]];
+          if (val) found.push(val);
+        }
+      } else if (mode.helperType && help[mode.helperType]) {
+        found.push(help[mode.helperType]);
+      } else if (help[mode.name]) {
+        found.push(help[mode.name]);
+      }
+      for (var i = 0; i < help._global.length; i++) {
+        var cur = help._global[i];
+        if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)
+          found.push(cur.val);
+      }
+      return found;
+    },
+
+    getStateAfter: function(line, precise) {
+      var doc = this.doc;
+      line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
+      return getStateBefore(this, line + 1, precise);
+    },
+
+    cursorCoords: function(start, mode) {
+      var pos, range = this.doc.sel.primary();
+      if (start == null) pos = range.head;
+      else if (typeof start == "object") pos = clipPos(this.doc, start);
+      else pos = start ? range.from() : range.to();
+      return cursorCoords(this, pos, mode || "page");
+    },
+
+    charCoords: function(pos, mode) {
+      return charCoords(this, clipPos(this.doc, pos), mode || "page");
+    },
+
+    coordsChar: function(coords, mode) {
+      coords = fromCoordSystem(this, coords, mode || "page");
+      return coordsChar(this, coords.left, coords.top);
+    },
+
+    lineAtHeight: function(height, mode) {
+      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
+      return lineAtHeight(this.doc, height + this.display.viewOffset);
+    },
+    heightAtLine: function(line, mode) {
+      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);
+    },
+
+    defaultTextHeight: function() { return textHeight(this.display); },
+    defaultCharWidth: function() { return charWidth(this.display); },
+
+    setGutterMarker: methodOp(function(line, gutterID, value) {
+      return changeLine(this.doc, line, "gutter", function(line) {
+        var markers = line.gutterMarkers || (line.gutterMarkers = {});
+        markers[gutterID] = value;
+        if (!value && isEmpty(markers)) line.gutterMarkers = null;
+        return true;
+      });
+    }),
+
+    clearGutter: methodOp(function(gutterID) {
+      var cm = this, doc = cm.doc, i = doc.first;
+      doc.iter(function(line) {
+        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
+          line.gutterMarkers[gutterID] = null;
+          regLineChange(cm, i, "gutter");
+          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null;
+        }
+        ++i;
+      });
+    }),
+
+    lineInfo: function(line) {
+      if (typeof line == "number") {
+        if (!isLine(this.doc, line)) return null;
+        var n = line;
+        line = getLine(this.doc, line);
+        if (!line) return null;
+      } else {
+        var n = lineNo(line);
+        if (n == null) return null;
+      }
+      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
+              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
+              widgets: line.widgets};
+    },
+
+    getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo};},
+
+    addWidget: function(pos, node, scroll, vert, horiz) {
+      var display = this.display;
+      pos = cursorCoords(this, clipPos(this.doc, pos));
+      var top = pos.bottom, left = pos.left;
+      node.style.position = "absolute";
+      node.setAttribute("cm-ignore-events", "true");
+      this.display.input.setUneditable(node);
+      display.sizer.appendChild(node);
+      if (vert == "over") {
+        top = pos.top;
+      } else if (vert == "above" || vert == "near") {
+        var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
+        hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
+        // Default to positioning above (if specified and possible); otherwise default to positioning below
+        if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
+          top = pos.top - node.offsetHeight;
+        else if (pos.bottom + node.offsetHeight <= vspace)
+          top = pos.bottom;
+        if (left + node.offsetWidth > hspace)
+          left = hspace - node.offsetWidth;
+      }
+      node.style.top = top + "px";
+      node.style.left = node.style.right = "";
+      if (horiz == "right") {
+        left = display.sizer.clientWidth - node.offsetWidth;
+        node.style.right = "0px";
+      } else {
+        if (horiz == "left") left = 0;
+        else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2;
+        node.style.left = left + "px";
+      }
+      if (scroll)
+        scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight);
+    },
+
+    triggerOnKeyDown: methodOp(onKeyDown),
+    triggerOnKeyPress: methodOp(onKeyPress),
+    triggerOnKeyUp: onKeyUp,
+
+    execCommand: function(cmd) {
+      if (commands.hasOwnProperty(cmd))
+        return commands[cmd].call(null, this);
+    },
+
+    triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
+
+    findPosH: function(from, amount, unit, visually) {
+      var dir = 1;
+      if (amount < 0) { dir = -1; amount = -amount; }
+      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
+        cur = findPosH(this.doc, cur, dir, unit, visually);
+        if (cur.hitSide) break;
+      }
+      return cur;
+    },
+
+    moveH: methodOp(function(dir, unit) {
+      var cm = this;
+      cm.extendSelectionsBy(function(range) {
+        if (cm.display.shift || cm.doc.extend || range.empty())
+          return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
+        else
+          return dir < 0 ? range.from() : range.to();
+      }, sel_move);
+    }),
+
+    deleteH: methodOp(function(dir, unit) {
+      var sel = this.doc.sel, doc = this.doc;
+      if (sel.somethingSelected())
+        doc.replaceSelection("", null, "+delete");
+      else
+        deleteNearSelection(this, function(range) {
+          var other = findPosH(doc, range.head, dir, unit, false);
+          return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other};
+        });
+    }),
+
+    findPosV: function(from, amount, unit, goalColumn) {
+      var dir = 1, x = goalColumn;
+      if (amount < 0) { dir = -1; amount = -amount; }
+      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
+        var coords = cursorCoords(this, cur, "div");
+        if (x == null) x = coords.left;
+        else coords.left = x;
+        cur = findPosV(this, coords, dir, unit);
+        if (cur.hitSide) break;
+      }
+      return cur;
+    },
+
+    moveV: methodOp(function(dir, unit) {
+      var cm = this, doc = this.doc, goals = [];
+      var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected();
+      doc.extendSelectionsBy(function(range) {
+        if (collapse)
+          return dir < 0 ? range.from() : range.to();
+        var headPos = cursorCoords(cm, range.head, "div");
+        if (range.goalColumn != null) headPos.left = range.goalColumn;
+        goals.push(headPos.left);
+        var pos = findPosV(cm, headPos, dir, unit);
+        if (unit == "page" && range == doc.sel.primary())
+          addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top);
+        return pos;
+      }, sel_move);
+      if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
+        doc.sel.ranges[i].goalColumn = goals[i];
+    }),
+
+    // Find the word at the given position (as returned by coordsChar).
+    findWordAt: function(pos) {
+      var doc = this.doc, line = getLine(doc, pos.line).text;
+      var start = pos.ch, end = pos.ch;
+      if (line) {
+        var helper = this.getHelper(pos, "wordChars");
+        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
+        var startChar = line.charAt(start);
+        var check = isWordChar(startChar, helper)
+          ? function(ch) { return isWordChar(ch, helper); }
+          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
+          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
+        while (start > 0 && check(line.charAt(start - 1))) --start;
+        while (end < line.length && check(line.charAt(end))) ++end;
+      }
+      return new Range(Pos(pos.line, start), Pos(pos.line, end));
+    },
+
+    toggleOverwrite: function(value) {
+      if (value != null && value == this.state.overwrite) return;
+      if (this.state.overwrite = !this.state.overwrite)
+        addClass(this.display.cursorDiv, "CodeMirror-overwrite");
+      else
+        rmClass(this.display.cursorDiv, "CodeMirror-overwrite");
+
+      signal(this, "overwriteToggle", this, this.state.overwrite);
+    },
+    hasFocus: function() { return this.display.input.getField() == activeElt(); },
+    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); },
+
+    scrollTo: methodOp(function(x, y) {
+      if (x != null || y != null) resolveScrollToPos(this);
+      if (x != null) this.curOp.scrollLeft = x;
+      if (y != null) this.curOp.scrollTop = y;
+    }),
+    getScrollInfo: function() {
+      var scroller = this.display.scroller;
+      return {left: scroller.scrollLeft, top: scroller.scrollTop,
+              height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
+              width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
+              clientHeight: displayHeight(this), clientWidth: displayWidth(this)};
+    },
+
+    scrollIntoView: methodOp(function(range, margin) {
+      if (range == null) {
+        range = {from: this.doc.sel.primary().head, to: null};
+        if (margin == null) margin = this.options.cursorScrollMargin;
+      } else if (typeof range == "number") {
+        range = {from: Pos(range, 0), to: null};
+      } else if (range.from == null) {
+        range = {from: range, to: null};
+      }
+      if (!range.to) range.to = range.from;
+      range.margin = margin || 0;
+
+      if (range.from.line != null) {
+        resolveScrollToPos(this);
+        this.curOp.scrollToPos = range;
+      } else {
+        var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
+                                      Math.min(range.from.top, range.to.top) - range.margin,
+                                      Math.max(range.from.right, range.to.right),
+                                      Math.max(range.from.bottom, range.to.bottom) + range.margin);
+        this.scrollTo(sPos.scrollLeft, sPos.scrollTop);
+      }
+    }),
+
+    setSize: methodOp(function(width, height) {
+      var cm = this;
+      function interpret(val) {
+        return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
+      }
+      if (width != null) cm.display.wrapper.style.width = interpret(width);
+      if (height != null) cm.display.wrapper.style.height = interpret(height);
+      if (cm.options.lineWrapping) clearLineMeasurementCache(this);
+      var lineNo = cm.display.viewFrom;
+      cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
+        if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
+          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; }
+        ++lineNo;
+      });
+      cm.curOp.forceUpdate = true;
+      signal(cm, "refresh", this);
+    }),
+
+    operation: function(f){return runInOp(this, f);},
+
+    refresh: methodOp(function() {
+      var oldHeight = this.display.cachedTextHeight;
+      regChange(this);
+      this.curOp.forceUpdate = true;
+      clearCaches(this);
+      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
+      updateGutterSpace(this);
+      if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
+        estimateLineHeights(this);
+      signal(this, "refresh", this);
+    }),
+
+    swapDoc: methodOp(function(doc) {
+      var old = this.doc;
+      old.cm = null;
+      attachDoc(this, doc);
+      clearCaches(this);
+      this.display.input.reset();
+      this.scrollTo(doc.scrollLeft, doc.scrollTop);
+      this.curOp.forceScroll = true;
+      signalLater(this, "swapDoc", this, old);
+      return old;
+    }),
+
+    getInputField: function(){return this.display.input.getField();},
+    getWrapperElement: function(){return this.display.wrapper;},
+    getScrollerElement: function(){return this.display.scroller;},
+    getGutterElement: function(){return this.display.gutters;}
+  };
+  eventMixin(CodeMirror);
+
+  CodeMirror.registerHelper = function(type, name, value) {
+    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []};
+    helpers[type][name] = value;
+  };
+  CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
+    CodeMirror.registerHelper(type, name, value);
+    helpers[type]._global.push({pred: predicate, val: value});
+  };
+}
+
+// Used for horizontal relative motion. Dir is -1 or 1 (left or
+// right), unit can be "char", "column" (like char, but doesn't
+// cross line boundaries), "word" (across next word), or "group" (to
+// the start of next group of word or non-word-non-whitespace
+// chars). The visually param controls whether, in right-to-left
+// text, direction 1 means to move towards the next index in the
+// string, or towards the character to the right of the current
+// position. The resulting position will have a hitSide=true
+// property if it reached the end of the document.
+function findPosH(doc, pos, dir, unit, visually) {
+  var line = pos.line, ch = pos.ch, origDir = dir;
+  var lineObj = getLine(doc, line);
+  function findNextLine() {
+    var l = line + dir;
+    if (l < doc.first || l >= doc.first + doc.size) return false
+    line = l;
+    return lineObj = getLine(doc, l);
+  }
+  function moveOnce(boundToLine) {
+    var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true);
+    if (next == null) {
+      if (!boundToLine && findNextLine()) {
+        if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
+        else ch = dir < 0 ? lineObj.text.length : 0;
+      } else return false
+    } else ch = next;
+    return true;
+  }
+
+  if (unit == "char") {
+    moveOnce()
+  } else if (unit == "column") {
+    moveOnce(true)
+  } else if (unit == "word" || unit == "group") {
+    var sawType = null, group = unit == "group";
+    var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
+    for (var first = true;; first = false) {
+      if (dir < 0 && !moveOnce(!first)) break;
+      var cur = lineObj.text.charAt(ch) || "\n";
+      var type = isWordChar(cur, helper) ? "w"
+        : group && cur == "\n" ? "n"
+        : !group || /\s/.test(cur) ? null
+        : "p";
+      if (group && !first && !type) type = "s";
+      if (sawType && sawType != type) {
+        if (dir < 0) {dir = 1; moveOnce();}
+        break;
+      }
+
+      if (type) sawType = type;
+      if (dir > 0 && !moveOnce(!first)) break;
+    }
+  }
+  var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
+  if (!cmp(pos, result)) result.hitSide = true;
+  return result;
+}
+
+// For relative vertical movement. Dir may be -1 or 1. Unit can be
+// "page" or "line". The resulting position will have a hitSide=true
+// property if it reached the end of the document.
+function findPosV(cm, pos, dir, unit) {
+  var doc = cm.doc, x = pos.left, y;
+  if (unit == "page") {
+    var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
+    var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3);
+    y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount;
+
+  } else if (unit == "line") {
+    y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
+  }
+  for (;;) {
+    var target = coordsChar(cm, x, y);
+    if (!target.outside) break;
+    if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }
+    y += dir * 5;
+  }
+  return target;
+}
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
new file mode 100644
index 0000000000..08a564bd2c
--- /dev/null
+++ b/src/edit/mouse_events.js
@@ -0,0 +1,307 @@
+import { delayBlurEvent, ensureFocus } from "../display/focus";
+import { operation } from "../display/operations";
+import { visibleLines } from "../display/update_lines";
+import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos";
+import { getLine, lineAtHeight } from "../line/utils_line";
+import { posFromMouse } from "../measurement/position_measurement";
+import { eventInWidget } from "../measurement/widgets";
+import { normalizeSelection, Range } from "../model/selection";
+import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates";
+import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser";
+import { activeElt } from "../util/dom";
+import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event";
+import { dragAndDrop } from "../util/feature_detection";
+import { bind, countColumn, findColumn, sel_mouse } from "../util/misc";
+
+// A mouse down can be a single click, double click, triple click,
+// start of selection drag, start of text drag, new cursor
+// (ctrl-click), rectangle drag (alt-drag), or xwin
+// middle-click-paste. Or it might be a click on something we should
+// not interfere with, such as a scrollbar or widget.
+export function onMouseDown(e) {
+  var cm = this, display = cm.display;
+  if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return;
+  display.shift = e.shiftKey;
+
+  if (eventInWidget(display, e)) {
+    if (!webkit) {
+      // Briefly turn off draggability, to allow widgets to do
+      // normal dragging things.
+      display.scroller.draggable = false;
+      setTimeout(function(){display.scroller.draggable = true;}, 100);
+    }
+    return;
+  }
+  if (clickInGutter(cm, e)) return;
+  var start = posFromMouse(cm, e);
+  window.focus();
+
+  switch (e_button(e)) {
+  case 1:
+    // #3261: make sure, that we're not starting a second selection
+    if (cm.state.selectingText)
+      cm.state.selectingText(e);
+    else if (start)
+      leftButtonDown(cm, e, start);
+    else if (e_target(e) == display.scroller)
+      e_preventDefault(e);
+    break;
+  case 2:
+    if (webkit) cm.state.lastMiddleDown = +new Date;
+    if (start) extendSelection(cm.doc, start);
+    setTimeout(function() {display.input.focus();}, 20);
+    e_preventDefault(e);
+    break;
+  case 3:
+    if (captureRightClick) onContextMenu(cm, e);
+    else delayBlurEvent(cm);
+    break;
+  }
+}
+
+var lastClick, lastDoubleClick;
+function leftButtonDown(cm, e, start) {
+  if (ie) setTimeout(bind(ensureFocus, cm), 0);
+  else cm.curOp.focus = activeElt();
+
+  var now = +new Date, type;
+  if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
+    type = "triple";
+  } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
+    type = "double";
+    lastDoubleClick = {time: now, pos: start};
+  } else {
+    type = "single";
+    lastClick = {time: now, pos: start};
+  }
+
+  var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
+  if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
+      type == "single" && (contained = sel.contains(start)) > -1 &&
+      (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
+      (cmp(contained.to(), start) > 0 || start.xRel < 0))
+    leftButtonStartDrag(cm, e, start, modifier);
+  else
+    leftButtonSelect(cm, e, start, type, modifier);
+}
+
+// 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, startTime = +new Date;
+  var dragEnd = operation(cm, function(e2) {
+    if (webkit) display.scroller.draggable = false;
+    cm.state.draggingText = false;
+    off(document, "mouseup", dragEnd);
+    off(display.scroller, "drop", dragEnd);
+    if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
+      e_preventDefault(e2);
+      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)
+        setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
+      else
+        display.input.focus();
+    }
+  });
+  // Let the drag handler handle this.
+  if (webkit) display.scroller.draggable = true;
+  cm.state.draggingText = dragEnd;
+  dragEnd.copy = mac ? e.altKey : e.ctrlKey
+  // IE's approach to draggable
+  if (display.scroller.dragDrop) display.scroller.dragDrop();
+  on(document, "mouseup", dragEnd);
+  on(display.scroller, "drop", dragEnd);
+}
+
+// Normal selection, as opposed to text dragging.
+function leftButtonSelect(cm, e, start, type, addNew) {
+  var display = cm.display, doc = cm.doc;
+  e_preventDefault(e);
+
+  var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
+  if (addNew && !e.shiftKey) {
+    ourIndex = doc.sel.contains(start);
+    if (ourIndex > -1)
+      ourRange = ranges[ourIndex];
+    else
+      ourRange = new Range(start, start);
+  } else {
+    ourRange = doc.sel.primary();
+    ourIndex = doc.sel.primIndex;
+  }
+
+  if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
+    type = "rect";
+    if (!addNew) ourRange = new Range(start, start);
+    start = posFromMouse(cm, e, true, true);
+    ourIndex = -1;
+  } else if (type == "double") {
+    var word = cm.findWordAt(start);
+    if (cm.display.shift || doc.extend)
+      ourRange = extendRange(doc, ourRange, word.anchor, word.head);
+    else
+      ourRange = word;
+  } else if (type == "triple") {
+    var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)));
+    if (cm.display.shift || doc.extend)
+      ourRange = extendRange(doc, ourRange, line.anchor, line.head);
+    else
+      ourRange = line;
+  } else {
+    ourRange = extendRange(doc, ourRange, start);
+  }
+
+  if (!addNew) {
+    ourIndex = 0;
+    setSelection(doc, new Selection([ourRange], 0), sel_mouse);
+    startSel = doc.sel;
+  } else if (ourIndex == -1) {
+    ourIndex = ranges.length;
+    setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
+                 {scroll: false, origin: "*mouse"});
+  } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
+    setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
+                 {scroll: false, origin: "*mouse"});
+    startSel = doc.sel;
+  } else {
+    replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
+  }
+
+  var lastPos = start;
+  function extendTo(pos) {
+    if (cmp(lastPos, pos) == 0) return;
+    lastPos = pos;
+
+    if (type == "rect") {
+      var ranges = [], tabSize = cm.options.tabSize;
+      var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
+      var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
+      var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
+      for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
+           line <= end; line++) {
+        var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
+        if (left == right)
+          ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)));
+        else if (text.length > leftPos)
+          ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
+      }
+      if (!ranges.length) ranges.push(new Range(start, start));
+      setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
+                   {origin: "*mouse", scroll: false});
+      cm.scrollIntoView(pos);
+    } else {
+      var oldRange = ourRange;
+      var anchor = oldRange.anchor, head = pos;
+      if (type != "single") {
+        if (type == "double")
+          var range = cm.findWordAt(pos);
+        else
+          var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
+        if (cmp(range.anchor, anchor) > 0) {
+          head = range.head;
+          anchor = minPos(oldRange.from(), range.anchor);
+        } else {
+          head = range.anchor;
+          anchor = maxPos(oldRange.to(), range.head);
+        }
+      }
+      var ranges = startSel.ranges.slice(0);
+      ranges[ourIndex] = new Range(clipPos(doc, anchor), head);
+      setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse);
+    }
+  }
+
+  var editorSize = display.wrapper.getBoundingClientRect();
+  // Used to ensure timeout re-tries don't fire when another extend
+  // happened in the meantime (clearTimeout isn't reliable -- at
+  // least on Chrome, the timeouts still happen even when cleared,
+  // if the clear happens after their scheduled firing time).
+  var counter = 0;
+
+  function extend(e) {
+    var curCount = ++counter;
+    var cur = posFromMouse(cm, e, true, type == "rect");
+    if (!cur) return;
+    if (cmp(cur, lastPos) != 0) {
+      cm.curOp.focus = activeElt();
+      extendTo(cur);
+      var visible = visibleLines(display, doc);
+      if (cur.line >= visible.to || cur.line < visible.from)
+        setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150);
+    } else {
+      var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
+      if (outside) setTimeout(operation(cm, function() {
+        if (counter != curCount) return;
+        display.scroller.scrollTop += outside;
+        extend(e);
+      }), 50);
+    }
+  }
+
+  function done(e) {
+    cm.state.selectingText = false;
+    counter = Infinity;
+    e_preventDefault(e);
+    display.input.focus();
+    off(document, "mousemove", move);
+    off(document, "mouseup", up);
+    doc.history.lastSelOrigin = null;
+  }
+
+  var move = operation(cm, function(e) {
+    if (!e_button(e)) done(e);
+    else extend(e);
+  });
+  var up = operation(cm, done);
+  cm.state.selectingText = up;
+  on(document, "mousemove", move);
+  on(document, "mouseup", up);
+}
+
+
+// Determines whether an event happened in the gutter, and fires the
+// handlers for the corresponding event.
+function gutterEvent(cm, e, type, prevent) {
+  try { var mX = e.clientX, mY = e.clientY; }
+  catch(e) { return false; }
+  if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
+  if (prevent) e_preventDefault(e);
+
+  var display = cm.display;
+  var lineBox = display.lineDiv.getBoundingClientRect();
+
+  if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);
+  mY -= lineBox.top - display.viewOffset;
+
+  for (var i = 0; i < cm.options.gutters.length; ++i) {
+    var g = display.gutters.childNodes[i];
+    if (g && g.getBoundingClientRect().right >= mX) {
+      var line = lineAtHeight(cm.doc, mY);
+      var gutter = cm.options.gutters[i];
+      signal(cm, type, cm, line, gutter, e);
+      return e_defaultPrevented(e);
+    }
+  }
+}
+
+export function clickInGutter(cm, e) {
+  return gutterEvent(cm, e, "gutterClick", true);
+}
+
+// CONTEXT MENU HANDLING
+
+// To make the context menu work, we need to briefly unhide the
+// textarea (making it as unobtrusive as possible) to let the
+// right-click take effect on it.
+export function onContextMenu(cm, e) {
+  if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
+  if (signalDOMEvent(cm, e, "contextmenu")) return;
+  cm.display.input.onContextMenu(e);
+}
+
+function contextMenuInGutter(cm, e) {
+  if (!hasHandler(cm, "gutterContextMenu")) return false;
+  return gutterEvent(cm, e, "gutterContextMenu", false);
+}
diff --git a/src/edit/options.js b/src/edit/options.js
new file mode 100644
index 0000000000..308eb574f2
--- /dev/null
+++ b/src/edit/options.js
@@ -0,0 +1,196 @@
+import { onBlur } from "../display/focus";
+import { setGuttersForLineNumbers, updateGutters } from "../display/gutters";
+import { alignHorizontally } from "../display/line_numbers";
+import { loadMode, resetModeState } from "../display/mode_state";
+import { initScrollbars, updateScrollbars } from "../display/scrollbars";
+import { updateSelection } from "../display/selection";
+import { regChange } from "../display/view_tracking";
+import { getKeyMap } from "../input/keymap";
+import { defaultSpecialCharPlaceholder } from "../line/line_data";
+import { Pos } from "../line/pos";
+import { findMaxLine } from "../line/spans";
+import { clearCaches, compensateForHScroll, estimateLineHeights } from "../measurement/position_measurement";
+import { replaceRange } from "../model/changes";
+import { mobile, windows } from "../util/browser";
+import { addClass, rmClass } from "../util/dom";
+import { off, on } from "../util/event";
+
+import { themeChanged } from "./utils";
+
+export var Init = {toString: function(){return "CodeMirror.Init";}};
+
+export var defaults = {};
+export var optionHandlers = {};
+
+export function defineOptions(CodeMirror) {
+  var optionHandlers = CodeMirror.optionHandlers;
+
+  function option(name, deflt, handle, notOnInit) {
+    CodeMirror.defaults[name] = deflt;
+    if (handle) optionHandlers[name] =
+      notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle;
+  }
+
+  CodeMirror.defineOption = option;
+
+  // Passed to option handlers when there is no old value.
+  CodeMirror.Init = Init;
+
+  // These two are, on init, called from the constructor because they
+  // have to be initialized before the editor can start at all.
+  option("value", "", function(cm, val) {
+    cm.setValue(val);
+  }, true);
+  option("mode", null, function(cm, val) {
+    cm.doc.modeOption = val;
+    loadMode(cm);
+  }, true);
+
+  option("indentUnit", 2, loadMode, true);
+  option("indentWithTabs", false);
+  option("smartIndent", true);
+  option("tabSize", 4, function(cm) {
+    resetModeState(cm);
+    clearCaches(cm);
+    regChange(cm);
+  }, true);
+  option("lineSeparator", null, function(cm, val) {
+    cm.doc.lineSep = val;
+    if (!val) return;
+    var newBreaks = [], lineNo = cm.doc.first;
+    cm.doc.iter(function(line) {
+      for (var pos = 0;;) {
+        var found = line.text.indexOf(val, pos);
+        if (found == -1) break;
+        pos = found + val.length;
+        newBreaks.push(Pos(lineNo, found));
+      }
+      lineNo++;
+    });
+    for (var i = newBreaks.length - 1; i >= 0; i--)
+      replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
+  });
+  option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
+    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
+    if (old != Init) cm.refresh();
+  });
+  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
+  option("electricChars", true);
+  option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
+    throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
+  }, true);
+  option("spellcheck", false, function(cm, val) {
+    cm.getInputField().spellcheck = val
+  }, true);
+  option("rtlMoveVisually", !windows);
+  option("wholeLineUpdateBefore", true);
+
+  option("theme", "default", function(cm) {
+    themeChanged(cm);
+    guttersChanged(cm);
+  }, true);
+  option("keyMap", "default", function(cm, val, old) {
+    var next = getKeyMap(val);
+    var prev = old != Init && getKeyMap(old);
+    if (prev && prev.detach) prev.detach(cm, next);
+    if (next.attach) next.attach(cm, prev || null);
+  });
+  option("extraKeys", null);
+
+  option("lineWrapping", false, wrappingChanged, true);
+  option("gutters", [], function(cm) {
+    setGuttersForLineNumbers(cm.options);
+    guttersChanged(cm);
+  }, true);
+  option("fixedGutter", true, function(cm, val) {
+    cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
+    cm.refresh();
+  }, true);
+  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true);
+  option("scrollbarStyle", "native", function(cm) {
+    initScrollbars(cm);
+    updateScrollbars(cm);
+    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
+    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
+  }, true);
+  option("lineNumbers", false, function(cm) {
+    setGuttersForLineNumbers(cm.options);
+    guttersChanged(cm);
+  }, true);
+  option("firstLineNumber", 1, guttersChanged, true);
+  option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true);
+  option("showCursorWhenSelecting", false, updateSelection, true);
+
+  option("resetSelectionOnContextMenu", true);
+  option("lineWiseCopyCut", true);
+
+  option("readOnly", false, function(cm, val) {
+    if (val == "nocursor") {
+      onBlur(cm);
+      cm.display.input.blur();
+      cm.display.disabled = true;
+    } else {
+      cm.display.disabled = false;
+    }
+    cm.display.input.readOnlyChanged(val)
+  });
+  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
+  option("dragDrop", true, dragDropChanged);
+  option("allowDropFileTypes", null);
+
+  option("cursorBlinkRate", 530);
+  option("cursorScrollMargin", 0);
+  option("cursorHeight", 1, updateSelection, true);
+  option("singleCursorHeightPerLine", true, updateSelection, true);
+  option("workTime", 100);
+  option("workDelay", 100);
+  option("flattenSpans", true, resetModeState, true);
+  option("addModeClass", false, resetModeState, true);
+  option("pollInterval", 100);
+  option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
+  option("historyEventDelay", 1250);
+  option("viewportMargin", 10, function(cm){cm.refresh();}, true);
+  option("maxHighlightLength", 10000, resetModeState, true);
+  option("moveInputWithCursor", true, function(cm, val) {
+    if (!val) cm.display.input.resetPosition();
+  });
+
+  option("tabindex", null, function(cm, val) {
+    cm.display.input.getField().tabIndex = val || "";
+  });
+  option("autofocus", null);
+}
+
+function guttersChanged(cm) {
+  updateGutters(cm);
+  regChange(cm);
+  setTimeout(function(){alignHorizontally(cm);}, 20);
+}
+
+function dragDropChanged(cm, value, old) {
+  var wasOn = old && old != 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.enter);
+    toggle(cm.display.scroller, "dragover", funcs.over);
+    toggle(cm.display.scroller, "dragleave", funcs.leave);
+    toggle(cm.display.scroller, "drop", funcs.drop);
+  }
+}
+
+function wrappingChanged(cm) {
+  if (cm.options.lineWrapping) {
+    addClass(cm.display.wrapper, "CodeMirror-wrap");
+    cm.display.sizer.style.minWidth = "";
+    cm.display.sizerWidth = null;
+  } else {
+    rmClass(cm.display.wrapper, "CodeMirror-wrap");
+    findMaxLine(cm);
+  }
+  estimateLineHeights(cm);
+  regChange(cm);
+  clearCaches(cm);
+  setTimeout(function(){updateScrollbars(cm);}, 100);
+}
diff --git a/src/edit/utils.js b/src/edit/utils.js
new file mode 100644
index 0000000000..cdef3156bb
--- /dev/null
+++ b/src/edit/utils.js
@@ -0,0 +1,7 @@
+import { clearCaches } from "../measurement/position_measurement";
+
+export function themeChanged(cm) {
+  cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
+    cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
+  clearCaches(cm);
+}
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
new file mode 100644
index 0000000000..69d53c0cbe
--- /dev/null
+++ b/src/input/ContentEditableInput.js
@@ -0,0 +1,468 @@
+import { operation, runInOp } from "../display/operations";
+import { prepareSelection } from "../display/selection";
+import { regChange } from "../display/view_tracking";
+import { applyTextInput, copyableRanges, disableBrowserMagic, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input";
+import { cmp, maxPos, minPos, Pos } from "../line/pos";
+import { getBetween, getLine, lineNo } from "../line/utils_line";
+import { findViewForLine, findViewIndex, mapFromLineView, nodeAndOffsetInLineMap } from "../measurement/position_measurement";
+import { replaceRange } from "../model/changes";
+import { simpleSelection } from "../model/selection";
+import { setSelection } from "../model/selection_updates";
+import { getBidiPartAt, getOrder } from "../util/bidi";
+import { gecko, ie_version } from "../util/browser";
+import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom";
+import { on, signalDOMEvent } from "../util/event";
+import { copyObj, Delayed, lst, nothing, sel_dontScroll } from "../util/misc";
+
+// CONTENTEDITABLE INPUT STYLE
+
+export default function ContentEditableInput(cm) {
+  this.cm = cm;
+  this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
+  this.polling = new Delayed();
+  this.gracePeriod = false;
+}
+
+ContentEditableInput.prototype = copyObj({
+  init: function(display) {
+    var input = this, cm = input.cm;
+    var div = input.div = display.lineDiv;
+    disableBrowserMagic(div, cm.options.spellcheck);
+
+    on(div, "paste", function(e) {
+      if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
+      // IE doesn't fire input events, so we schedule a read for the pasted content in this way
+      if (ie_version <= 11) setTimeout(operation(cm, function() {
+        if (!input.pollContent()) regChange(cm);
+      }), 20)
+    })
+
+    on(div, "compositionstart", function(e) {
+      var data = e.data;
+      input.composing = {sel: cm.doc.sel, data: data, startData: data};
+      if (!data) return;
+      var prim = cm.doc.sel.primary();
+      var line = cm.getLine(prim.head.line);
+      var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
+      if (found > -1 && found <= prim.head.ch)
+        input.composing.sel = simpleSelection(Pos(prim.head.line, found),
+                                              Pos(prim.head.line, found + data.length));
+    });
+    on(div, "compositionupdate", function(e) {
+      input.composing.data = e.data;
+    });
+    on(div, "compositionend", function(e) {
+      var ours = input.composing;
+      if (!ours) return;
+      if (e.data != ours.startData && !/\u200b/.test(e.data))
+        ours.data = e.data;
+      // Need a small delay to prevent other code (input event,
+      // selection polling) from doing damage when fired right after
+      // compositionend.
+      setTimeout(function() {
+        if (!ours.handled)
+          input.applyComposition(ours);
+        if (input.composing == ours)
+          input.composing = null;
+      }, 50);
+    });
+
+    on(div, "touchstart", function() {
+      input.forceCompositionEnd();
+    });
+
+    on(div, "input", function() {
+      if (input.composing) return;
+      if (cm.isReadOnly() || !input.pollContent())
+        runInOp(input.cm, function() {regChange(cm);});
+    });
+
+    function onCopyCut(e) {
+      if (signalDOMEvent(cm, e)) return
+      if (cm.somethingSelected()) {
+        setLastCopied({lineWise: false, text: cm.getSelections()});
+        if (e.type == "cut") cm.replaceSelection("", null, "cut");
+      } else if (!cm.options.lineWiseCopyCut) {
+        return;
+      } else {
+        var ranges = copyableRanges(cm);
+        setLastCopied({lineWise: true, text: ranges.text});
+        if (e.type == "cut") {
+          cm.operation(function() {
+            cm.setSelections(ranges.ranges, 0, sel_dontScroll);
+            cm.replaceSelection("", null, "cut");
+          });
+        }
+      }
+      if (e.clipboardData) {
+        e.clipboardData.clearData();
+        var content = lastCopied.text.join("\n")
+        // iOS exposes the clipboard API, but seems to discard content inserted into it
+        e.clipboardData.setData("Text", content);
+        if (e.clipboardData.getData("Text") == content) {
+          e.preventDefault();
+          return
+        }
+      }
+      // Old-fashioned briefly-focus-a-textarea hack
+      var kludge = hiddenTextarea(), te = kludge.firstChild;
+      cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
+      te.value = lastCopied.text.join("\n");
+      var hadFocus = document.activeElement;
+      selectInput(te);
+      setTimeout(function() {
+        cm.display.lineSpace.removeChild(kludge);
+        hadFocus.focus();
+        if (hadFocus == div) input.showPrimarySelection()
+      }, 50);
+    }
+    on(div, "copy", onCopyCut);
+    on(div, "cut", onCopyCut);
+  },
+
+  prepareSelection: function() {
+    var result = prepareSelection(this.cm, false);
+    result.focus = this.cm.state.focused;
+    return result;
+  },
+
+  showSelection: function(info, takeFocus) {
+    if (!info || !this.cm.display.view.length) return;
+    if (info.focus || takeFocus) this.showPrimarySelection();
+    this.showMultipleSelections(info);
+  },
+
+  showPrimarySelection: function() {
+    var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
+    var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
+    var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
+    if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
+        cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
+        cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
+      return;
+
+    var start = posToDOM(this.cm, prim.from());
+    var end = posToDOM(this.cm, prim.to());
+    if (!start && !end) return;
+
+    var view = this.cm.display.view;
+    var old = sel.rangeCount && sel.getRangeAt(0);
+    if (!start) {
+      start = {node: view[0].measure.map[2], offset: 0};
+    } else if (!end) { // FIXME dangerously hacky
+      var measure = view[view.length - 1].measure;
+      var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
+      end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
+    }
+
+    try { var rng = range(start.node, start.offset, end.offset, end.node); }
+    catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
+    if (rng) {
+      if (!gecko && this.cm.state.focused) {
+        sel.collapse(start.node, start.offset);
+        if (!rng.collapsed) sel.addRange(rng);
+      } else {
+        sel.removeAllRanges();
+        sel.addRange(rng);
+      }
+      if (old && sel.anchorNode == null) sel.addRange(old);
+      else if (gecko) this.startGracePeriod();
+    }
+    this.rememberSelection();
+  },
+
+  startGracePeriod: function() {
+    var input = this;
+    clearTimeout(this.gracePeriod);
+    this.gracePeriod = setTimeout(function() {
+      input.gracePeriod = false;
+      if (input.selectionChanged())
+        input.cm.operation(function() { input.cm.curOp.selectionChanged = true; });
+    }, 20);
+  },
+
+  showMultipleSelections: function(info) {
+    removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
+    removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
+  },
+
+  rememberSelection: function() {
+    var sel = window.getSelection();
+    this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
+    this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
+  },
+
+  selectionInEditor: function() {
+    var sel = window.getSelection();
+    if (!sel.rangeCount) return false;
+    var node = sel.getRangeAt(0).commonAncestorContainer;
+    return contains(this.div, node);
+  },
+
+  focus: function() {
+    if (this.cm.options.readOnly != "nocursor") this.div.focus();
+  },
+  blur: function() { this.div.blur(); },
+  getField: function() { return this.div; },
+
+  supportsTouch: function() { return true; },
+
+  receivedFocus: function() {
+    var input = this;
+    if (this.selectionInEditor())
+      this.pollSelection();
+    else
+      runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; });
+
+    function poll() {
+      if (input.cm.state.focused) {
+        input.pollSelection();
+        input.polling.set(input.cm.options.pollInterval, poll);
+      }
+    }
+    this.polling.set(this.cm.options.pollInterval, poll);
+  },
+
+  selectionChanged: function() {
+    var sel = window.getSelection();
+    return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
+      sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset;
+  },
+
+  pollSelection: function() {
+    if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
+      var sel = window.getSelection(), cm = this.cm;
+      this.rememberSelection();
+      var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+      var head = domToPos(cm, sel.focusNode, sel.focusOffset);
+      if (anchor && head) runInOp(cm, function() {
+        setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
+        if (anchor.bad || head.bad) cm.curOp.selectionChanged = true;
+      });
+    }
+  },
+
+  pollContent: function() {
+    var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
+    var from = sel.from(), to = sel.to();
+    if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
+
+    var fromIndex;
+    if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
+      var fromLine = lineNo(display.view[0].line);
+      var fromNode = display.view[0].node;
+    } else {
+      var fromLine = lineNo(display.view[fromIndex].line);
+      var fromNode = display.view[fromIndex - 1].node.nextSibling;
+    }
+    var toIndex = findViewIndex(cm, to.line);
+    if (toIndex == display.view.length - 1) {
+      var toLine = display.viewTo - 1;
+      var toNode = display.lineDiv.lastChild;
+    } else {
+      var toLine = lineNo(display.view[toIndex + 1].line) - 1;
+      var toNode = display.view[toIndex + 1].node.previousSibling;
+    }
+
+    var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
+    var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
+    while (newText.length > 1 && oldText.length > 1) {
+      if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
+      else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
+      else break;
+    }
+
+    var cutFront = 0, cutEnd = 0;
+    var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
+    while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
+      ++cutFront;
+    var newBot = lst(newText), oldBot = lst(oldText);
+    var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
+                             oldBot.length - (oldText.length == 1 ? cutFront : 0));
+    while (cutEnd < maxCutEnd &&
+           newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
+      ++cutEnd;
+
+    newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
+    newText[0] = newText[0].slice(cutFront);
+
+    var chFrom = Pos(fromLine, cutFront);
+    var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
+    if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
+      replaceRange(cm.doc, newText, chFrom, chTo, "+input");
+      return true;
+    }
+  },
+
+  ensurePolled: function() {
+    this.forceCompositionEnd();
+  },
+  reset: function() {
+    this.forceCompositionEnd();
+  },
+  forceCompositionEnd: function() {
+    if (!this.composing || this.composing.handled) return;
+    this.applyComposition(this.composing);
+    this.composing.handled = true;
+    this.div.blur();
+    this.div.focus();
+  },
+  applyComposition: function(composing) {
+    if (this.cm.isReadOnly())
+      operation(this.cm, regChange)(this.cm)
+    else if (composing.data && composing.data != composing.startData)
+      operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
+  },
+
+  setUneditable: function(node) {
+    node.contentEditable = "false"
+  },
+
+  onKeyPress: function(e) {
+    e.preventDefault();
+    if (!this.cm.isReadOnly())
+      operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
+  },
+
+  readOnlyChanged: function(val) {
+    this.div.contentEditable = String(val != "nocursor")
+  },
+
+  onContextMenu: nothing,
+  resetPosition: nothing,
+
+  needsContentAttribute: true
+  }, ContentEditableInput.prototype);
+
+function posToDOM(cm, pos) {
+  var view = findViewForLine(cm, pos.line);
+  if (!view || view.hidden) return null;
+  var line = getLine(cm.doc, pos.line);
+  var info = mapFromLineView(view, line, pos.line);
+
+  var order = getOrder(line), side = "left";
+  if (order) {
+    var partPos = getBidiPartAt(order, pos.ch);
+    side = partPos % 2 ? "right" : "left";
+  }
+  var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
+  result.offset = result.collapse == "right" ? result.end : result.start;
+  return result;
+}
+
+function badPos(pos, bad) { if (bad) pos.bad = true; return pos; }
+
+function domTextBetween(cm, from, to, fromLine, toLine) {
+  var text = "", closing = false, lineSep = cm.doc.lineSeparator();
+  function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
+  function walk(node) {
+    if (node.nodeType == 1) {
+      var cmText = node.getAttribute("cm-text");
+      if (cmText != null) {
+        if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
+        text += cmText;
+        return;
+      }
+      var markerID = node.getAttribute("cm-marker"), range;
+      if (markerID) {
+        var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
+        if (found.length && (range = found[0].find()))
+          text += getBetween(cm.doc, range.from, range.to).join(lineSep);
+        return;
+      }
+      if (node.getAttribute("contenteditable") == "false") return;
+      for (var i = 0; i < node.childNodes.length; i++)
+        walk(node.childNodes[i]);
+      if (/^(pre|div|p)$/i.test(node.nodeName))
+        closing = true;
+    } else if (node.nodeType == 3) {
+      var val = node.nodeValue;
+      if (!val) return;
+      if (closing) {
+        text += lineSep;
+        closing = false;
+      }
+      text += val;
+    }
+  }
+  for (;;) {
+    walk(from);
+    if (from == to) break;
+    from = from.nextSibling;
+  }
+  return text;
+}
+
+function domToPos(cm, node, offset) {
+  var lineNode;
+  if (node == cm.display.lineDiv) {
+    lineNode = cm.display.lineDiv.childNodes[offset];
+    if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true);
+    node = null; offset = 0;
+  } else {
+    for (lineNode = node;; lineNode = lineNode.parentNode) {
+      if (!lineNode || lineNode == cm.display.lineDiv) return null;
+      if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
+    }
+  }
+  for (var i = 0; i < cm.display.view.length; i++) {
+    var lineView = cm.display.view[i];
+    if (lineView.node == lineNode)
+      return locateNodeInLineView(lineView, node, offset);
+  }
+}
+
+function locateNodeInLineView(lineView, node, offset) {
+  var wrapper = lineView.text.firstChild, bad = false;
+  if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true);
+  if (node == wrapper) {
+    bad = true;
+    node = wrapper.childNodes[offset];
+    offset = 0;
+    if (!node) {
+      var line = lineView.rest ? lst(lineView.rest) : lineView.line;
+      return badPos(Pos(lineNo(line), line.text.length), bad);
+    }
+  }
+
+  var textNode = node.nodeType == 3 ? node : null, topNode = node;
+  if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
+    textNode = node.firstChild;
+    if (offset) offset = textNode.nodeValue.length;
+  }
+  while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
+  var measure = lineView.measure, maps = measure.maps;
+
+  function find(textNode, topNode, offset) {
+    for (var i = -1; i < (maps ? maps.length : 0); i++) {
+      var map = i < 0 ? measure.map : maps[i];
+      for (var j = 0; j < map.length; j += 3) {
+        var curNode = map[j + 2];
+        if (curNode == textNode || curNode == topNode) {
+          var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
+          var ch = map[j] + offset;
+          if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)];
+          return Pos(line, ch);
+        }
+      }
+    }
+  }
+  var found = find(textNode, topNode, offset);
+  if (found) return badPos(found, bad);
+
+  // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
+  for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
+    found = find(after, after.firstChild, 0);
+    if (found)
+      return badPos(Pos(found.line, found.ch - dist), bad);
+    else
+      dist += after.textContent.length;
+  }
+  for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
+    found = find(before, before.firstChild, -1);
+    if (found)
+      return badPos(Pos(found.line, found.ch + dist), bad);
+    else
+      dist += before.textContent.length;
+  }
+}
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
new file mode 100644
index 0000000000..421ce17a06
--- /dev/null
+++ b/src/input/TextareaInput.js
@@ -0,0 +1,359 @@
+import { operation, runInOp } from "../display/operations";
+import { prepareSelection } from "../display/selection";
+import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input";
+import { cursorCoords, posFromMouse } from "../measurement/position_measurement";
+import { eventInWidget } from "../measurement/widgets";
+import { simpleSelection } from "../model/selection";
+import { selectAll, setSelection } from "../model/selection_updates";
+import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser";
+import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom";
+import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event";
+import { hasCopyEvent, hasSelection } from "../util/feature_detection";
+import { copyObj, Delayed, nothing, sel_dontScroll } from "../util/misc";
+
+// TEXTAREA INPUT STYLE
+
+export default function TextareaInput(cm) {
+  this.cm = cm;
+  // See input.poll and input.reset
+  this.prevInput = "";
+
+  // Flag that indicates whether we expect input to appear real soon
+  // now (after some event like 'keypress' or 'input') and are
+  // polling intensively.
+  this.pollingFast = false;
+  // Self-resetting timeout for the poller
+  this.polling = new Delayed();
+  // Tracks when input.reset has punted to just putting a short
+  // string into the textarea instead of the full selection.
+  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;
+}
+
+TextareaInput.prototype = copyObj({
+  init: function(display) {
+    var input = this, cm = this.cm;
+
+    // Wraps and hides input textarea
+    var div = this.wrapper = hiddenTextarea();
+    // The semihidden textarea that is focused when the editor is
+    // focused, and receives input.
+    var te = this.textarea = div.firstChild;
+    display.wrapper.insertBefore(div, display.wrapper.firstChild);
+
+    // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
+    if (ios) te.style.width = "0px";
+
+    on(te, "input", function() {
+      if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
+      input.poll();
+    });
+
+    on(te, "paste", function(e) {
+      if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
+
+      cm.state.pasteIncoming = true;
+      input.fastPoll();
+    });
+
+    function prepareCopyCut(e) {
+      if (signalDOMEvent(cm, e)) return
+      if (cm.somethingSelected()) {
+        setLastCopied({lineWise: false, text: cm.getSelections()});
+        if (input.inaccurateSelection) {
+          input.prevInput = "";
+          input.inaccurateSelection = false;
+          te.value = lastCopied.text.join("\n");
+          selectInput(te);
+        }
+      } else if (!cm.options.lineWiseCopyCut) {
+        return;
+      } else {
+        var ranges = copyableRanges(cm);
+        setLastCopied({lineWise: true, text: ranges.text});
+        if (e.type == "cut") {
+          cm.setSelections(ranges.ranges, null, sel_dontScroll);
+        } else {
+          input.prevInput = "";
+          te.value = ranges.text.join("\n");
+          selectInput(te);
+        }
+      }
+      if (e.type == "cut") cm.state.cutIncoming = true;
+    }
+    on(te, "cut", prepareCopyCut);
+    on(te, "copy", prepareCopyCut);
+
+    on(display.scroller, "paste", function(e) {
+      if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return;
+      cm.state.pasteIncoming = true;
+      input.focus();
+    });
+
+    // Prevent normal selection in the editor (we handle our own)
+    on(display.lineSpace, "selectstart", function(e) {
+      if (!eventInWidget(display, e)) e_preventDefault(e);
+    });
+
+    on(te, "compositionstart", function() {
+      var start = cm.getCursor("from");
+      if (input.composing) input.composing.range.clear()
+      input.composing = {
+        start: start,
+        range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
+      };
+    });
+    on(te, "compositionend", function() {
+      if (input.composing) {
+        input.poll();
+        input.composing.range.clear();
+        input.composing = null;
+      }
+    });
+  },
+
+  prepareSelection: function() {
+    // Redraw the selection and/or cursor
+    var cm = this.cm, display = cm.display, doc = cm.doc;
+    var result = prepareSelection(cm);
+
+    // Move the hidden textarea near the cursor to prevent scrolling artifacts
+    if (cm.options.moveInputWithCursor) {
+      var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
+      var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
+      result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
+                                          headPos.top + lineOff.top - wrapOff.top));
+      result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
+                                           headPos.left + lineOff.left - wrapOff.left));
+    }
+
+    return result;
+  },
+
+  showSelection: function(drawn) {
+    var cm = this.cm, display = cm.display;
+    removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
+    removeChildrenAndAdd(display.selectionDiv, drawn.selection);
+    if (drawn.teTop != null) {
+      this.wrapper.style.top = drawn.teTop + "px";
+      this.wrapper.style.left = drawn.teLeft + "px";
+    }
+  },
+
+  // Reset the input to correspond to the selection (or to be empty,
+  // when not typing and nothing is selected)
+  reset: function(typing) {
+    if (this.contextMenuPending) return;
+    var minimal, selected, cm = this.cm, doc = cm.doc;
+    if (cm.somethingSelected()) {
+      this.prevInput = "";
+      var range = doc.sel.primary();
+      minimal = hasCopyEvent &&
+        (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
+      var content = minimal ? "-" : selected || cm.getSelection();
+      this.textarea.value = content;
+      if (cm.state.focused) selectInput(this.textarea);
+      if (ie && ie_version >= 9) this.hasSelection = content;
+    } else if (!typing) {
+      this.prevInput = this.textarea.value = "";
+      if (ie && ie_version >= 9) this.hasSelection = null;
+    }
+    this.inaccurateSelection = minimal;
+  },
+
+  getField: function() { return this.textarea; },
+
+  supportsTouch: function() { return false; },
+
+  focus: function() {
+    if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
+      try { this.textarea.focus(); }
+      catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
+    }
+  },
+
+  blur: function() { this.textarea.blur(); },
+
+  resetPosition: function() {
+    this.wrapper.style.top = this.wrapper.style.left = 0;
+  },
+
+  receivedFocus: function() { this.slowPoll(); },
+
+  // Poll for input changes, using the normal rate of polling. This
+  // runs as long as the editor is focused.
+  slowPoll: function() {
+    var input = this;
+    if (input.pollingFast) return;
+    input.polling.set(this.cm.options.pollInterval, function() {
+      input.poll();
+      if (input.cm.state.focused) input.slowPoll();
+    });
+  },
+
+  // When an event has just come in that is likely to add or change
+  // something in the input textarea, we poll faster, to ensure that
+  // the change appears on the screen quickly.
+  fastPoll: function() {
+    var missed = false, input = this;
+    input.pollingFast = true;
+    function p() {
+      var changed = input.poll();
+      if (!changed && !missed) {missed = true; input.polling.set(60, p);}
+      else {input.pollingFast = false; input.slowPoll();}
+    }
+    input.polling.set(20, p);
+  },
+
+  // Read input from the textarea, and update the document to match.
+  // When something is selected, it is present in the textarea, and
+  // selected (unless it is huge, in which case a placeholder is
+  // used). When nothing is selected, the cursor sits after previously
+  // seen text (can be empty), which is stored in prevInput (we must
+  // not reset the textarea when typing, because that breaks IME).
+  poll: function() {
+    var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
+    // Since this is called a *lot*, try to bail out as cheaply as
+    // 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.contextMenuPending || !cm.state.focused ||
+        (hasSelection(input) && !prevInput && !this.composing) ||
+        cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
+      return false;
+
+    var text = input.value;
+    // If nothing changed, bail.
+    if (text == prevInput && !cm.somethingSelected()) return false;
+    // Work around nonsensical selection resetting in IE9/10, and
+    // inexplicable appearance of private area unicode characters on
+    // some key combos in Mac (#2689).
+    if (ie && ie_version >= 9 && this.hasSelection === text ||
+        mac && /[\uf700-\uf7ff]/.test(text)) {
+      cm.display.input.reset();
+      return false;
+    }
+
+    if (cm.doc.sel == cm.display.selForContextMenu) {
+      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);
+    while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
+
+    var self = this;
+    runInOp(cm, function() {
+      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;
+  },
+
+  ensurePolled: function() {
+    if (this.pollingFast && this.poll()) this.pollingFast = false;
+  },
+
+  onKeyPress: function() {
+    if (ie && ie_version >= 9) this.hasSelection = null;
+    this.fastPoll();
+  },
+
+  onContextMenu: function(e) {
+    var input = this, cm = input.cm, display = cm.display, te = input.textarea;
+    var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
+    if (!pos || presto) return; // Opera is difficult.
+
+    // Reset the current text selection only if the click is done outside of the selection
+    // and 'resetSelectionOnContextMenu' option is true.
+    var reset = cm.options.resetSelectionOnContextMenu;
+    if (reset && cm.doc.sel.contains(pos) == -1)
+      operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
+
+    var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
+    input.wrapper.style.cssText = "position: absolute"
+    var wrapperBox = input.wrapper.getBoundingClientRect()
+    te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
+      "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
+      (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
+      "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
+    if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
+    display.input.focus();
+    if (webkit) window.scrollTo(null, oldScrollY);
+    display.input.reset();
+    // Adds "Select all" to context menu in FF
+    if (!cm.somethingSelected()) te.value = input.prevInput = " ";
+    input.contextMenuPending = true;
+    display.selForContextMenu = cm.doc.sel;
+    clearTimeout(display.detectingSelectAll);
+
+    // Select-all will be greyed out if there's nothing to select, so
+    // this adds a zero-width space so that we can later check whether
+    // it got selected.
+    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
+        te.value = extval;
+        input.prevInput = selected ? "" : "\u200b";
+        te.selectionStart = 1; te.selectionEnd = extval.length;
+        // Re-set this, in case some other handler touched the
+        // selection in the meantime.
+        display.selForContextMenu = cm.doc.sel;
+      }
+    }
+    function rehide() {
+      input.contextMenuPending = false;
+      input.wrapper.style.cssText = oldWrapperCSS
+      te.style.cssText = oldCSS;
+      if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
+
+      // Try to detect the user choosing select-all
+      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 &&
+              te.selectionEnd > 0 && input.prevInput == "\u200b")
+            operation(cm, selectAll)(cm);
+          else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
+          else display.input.reset();
+        };
+        display.detectingSelectAll = setTimeout(poll, 200);
+      }
+    }
+
+    if (ie && ie_version >= 9) prepareSelectAllHack();
+    if (captureRightClick) {
+      e_stop(e);
+      var mouseup = function() {
+        off(window, "mouseup", mouseup);
+        setTimeout(rehide, 20);
+      };
+      on(window, "mouseup", mouseup);
+    } else {
+      setTimeout(rehide, 50);
+    }
+  },
+
+  readOnlyChanged: function(val) {
+    if (!val) this.reset();
+  },
+
+  setUneditable: nothing,
+
+  needsContentAttribute: false
+}, TextareaInput.prototype);
diff --git a/src/input/indent.js b/src/input/indent.js
new file mode 100644
index 0000000000..d814452e8b
--- /dev/null
+++ b/src/input/indent.js
@@ -0,0 +1,71 @@
+import { getStateBefore } from "../line/highlight";
+import { Pos } from "../line/pos";
+import { getLine } from "../line/utils_line";
+import { replaceRange } from "../model/changes";
+import { Range } from "../model/selection";
+import { replaceOneSelection } from "../model/selection_updates";
+import { countColumn, Pass, spaceStr } from "../util/misc";
+
+// Indent the given line. The how parameter can be "smart",
+// "add"/null, "subtract", or "prev". When aggressive is false
+// (typically set to true for forced single-line indents), empty
+// lines are not indented, and places where the mode returns Pass
+// are left alone.
+export function indentLine(cm, n, how, aggressive) {
+  var doc = cm.doc, state;
+  if (how == null) how = "add";
+  if (how == "smart") {
+    // Fall back to "prev" when the mode doesn't have an indentation
+    // method.
+    if (!doc.mode.indent) how = "prev";
+    else state = getStateBefore(cm, n);
+  }
+
+  var tabSize = cm.options.tabSize;
+  var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
+  if (line.stateAfter) line.stateAfter = null;
+  var curSpaceString = line.text.match(/^\s*/)[0], indentation;
+  if (!aggressive && !/\S/.test(line.text)) {
+    indentation = 0;
+    how = "not";
+  } else if (how == "smart") {
+    indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
+    if (indentation == Pass || indentation > 150) {
+      if (!aggressive) return;
+      how = "prev";
+    }
+  }
+  if (how == "prev") {
+    if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize);
+    else indentation = 0;
+  } else if (how == "add") {
+    indentation = curSpace + cm.options.indentUnit;
+  } else if (how == "subtract") {
+    indentation = curSpace - cm.options.indentUnit;
+  } else if (typeof how == "number") {
+    indentation = curSpace + how;
+  }
+  indentation = Math.max(0, indentation);
+
+  var indentString = "", pos = 0;
+  if (cm.options.indentWithTabs)
+    for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
+  if (pos < indentation) indentString += spaceStr(indentation - pos);
+
+  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.
+    for (var i = 0; i < doc.sel.ranges.length; i++) {
+      var range = doc.sel.ranges[i];
+      if (range.head.line == n && range.head.ch < curSpaceString.length) {
+        var pos = Pos(n, curSpaceString.length);
+        replaceOneSelection(doc, i, new Range(pos, pos));
+        break;
+      }
+    }
+  }
+}
diff --git a/src/input/input.js b/src/input/input.js
new file mode 100644
index 0000000000..b017934a2c
--- /dev/null
+++ b/src/input/input.js
@@ -0,0 +1,133 @@
+import { runInOp } from "../display/operations";
+import { ensureCursorVisible } from "../display/scrolling";
+import { Pos } from "../line/pos";
+import { getLine } from "../line/utils_line";
+import { makeChange } from "../model/changes";
+import { ios, webkit } from "../util/browser";
+import { elt } from "../util/dom";
+import { lst, map } from "../util/misc";
+import { signalLater } from "../util/operation_group";
+
+import { indentLine } from "./indent";
+
+// This will be set to a {lineWise: bool, text: [string]} object, so
+// that, when pasting, we know what kind of selections the copied
+// text was made out of.
+export var lastCopied = null;
+
+export function setLastCopied(newLastCopied) {
+  lastCopied = newLastCopied;
+}
+
+export function applyTextInput(cm, inserted, deleted, sel, origin) {
+  var doc = cm.doc;
+  cm.display.shift = false;
+  if (!sel) sel = doc.sel;
+
+  var paste = cm.state.pasteIncoming || origin == "paste";
+  var textLines = doc.splitLines(inserted), multiPaste = null
+  // When pasing N lines into N selections, insert one line per selection
+  if (paste && sel.ranges.length > 1) {
+    if (lastCopied && lastCopied.text.join("\n") == inserted) {
+      if (sel.ranges.length % lastCopied.text.length == 0) {
+        multiPaste = [];
+        for (var i = 0; i < lastCopied.text.length; i++)
+          multiPaste.push(doc.splitLines(lastCopied.text[i]));
+      }
+    } else if (textLines.length == sel.ranges.length) {
+      multiPaste = map(textLines, function(l) { return [l]; });
+    }
+  }
+
+  // Normal behavior is to insert the new text into every selection
+  for (var i = sel.ranges.length - 1; i >= 0; i--) {
+    var range = sel.ranges[i];
+    var from = range.from(), to = range.to();
+    if (range.empty()) {
+      if (deleted && deleted > 0) // Handle deletion
+        from = Pos(from.line, from.ch - deleted);
+      else if (cm.state.overwrite && !paste) // Handle overwrite
+        to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
+      else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
+        from = to = Pos(from.line, 0)
+    }
+    var updateInput = cm.curOp.updateInput;
+    var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
+                       origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
+    makeChange(cm.doc, changeEvent);
+    signalLater(cm, "inputRead", cm, changeEvent);
+  }
+  if (inserted && !paste)
+    triggerElectric(cm, inserted);
+
+  ensureCursorVisible(cm);
+  cm.curOp.updateInput = updateInput;
+  cm.curOp.typing = true;
+  cm.state.pasteIncoming = cm.state.cutIncoming = false;
+}
+
+export function handlePaste(e, cm) {
+  var pasted = e.clipboardData && e.clipboardData.getData("Text");
+  if (pasted) {
+    e.preventDefault();
+    if (!cm.isReadOnly() && !cm.options.disableInput)
+      runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
+    return true;
+  }
+}
+
+export function triggerElectric(cm, inserted) {
+  // When an 'electric' character is inserted, immediately trigger a reindent
+  if (!cm.options.electricChars || !cm.options.smartIndent) return;
+  var sel = cm.doc.sel;
+
+  for (var i = sel.ranges.length - 1; i >= 0; i--) {
+    var range = sel.ranges[i];
+    if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue;
+    var mode = cm.getModeAt(range.head);
+    var indented = false;
+    if (mode.electricChars) {
+      for (var j = 0; j < mode.electricChars.length; j++)
+        if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
+          indented = indentLine(cm, range.head.line, "smart");
+          break;
+        }
+    } else if (mode.electricInput) {
+      if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
+        indented = indentLine(cm, range.head.line, "smart");
+    }
+    if (indented) signalLater(cm, "electricInput", cm, range.head.line);
+  }
+}
+
+export function copyableRanges(cm) {
+  var text = [], ranges = [];
+  for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
+    var line = cm.doc.sel.ranges[i].head.line;
+    var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
+    ranges.push(lineRange);
+    text.push(cm.getRange(lineRange.anchor, lineRange.head));
+  }
+  return {text: text, ranges: ranges};
+}
+
+export function disableBrowserMagic(field, spellcheck) {
+  field.setAttribute("autocorrect", "off");
+  field.setAttribute("autocapitalize", "off");
+  field.setAttribute("spellcheck", !!spellcheck);
+}
+
+export function hiddenTextarea() {
+  var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");
+  var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+  // The textarea is kept positioned near the cursor to prevent the
+  // fact that it'll be scrolled into view on input from scrolling
+  // our fake cursor out of view. On webkit, when wrap=off, paste is
+  // very slow. So make the area wide instead.
+  if (webkit) te.style.width = "1000px";
+  else te.setAttribute("wrap", "off");
+  // If border: 0; -- iOS fails to open keyboard (issue #1287)
+  if (ios) te.style.border = "1px solid black";
+  disableBrowserMagic(te);
+  return div;
+}
diff --git a/src/input/keymap.js b/src/input/keymap.js
new file mode 100644
index 0000000000..7b2879247e
--- /dev/null
+++ b/src/input/keymap.js
@@ -0,0 +1,139 @@
+import { flipCtrlCmd, mac, presto } from "../util/browser";
+import { map } from "../util/misc";
+
+import { keyNames } from "./keynames";
+
+export var keyMap = {};
+
+keyMap.basic = {
+  "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
+  "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
+  "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
+  "Tab": "defaultTab", "Shift-Tab": "indentAuto",
+  "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
+  "Esc": "singleSelection"
+};
+// Note that the save and find-related commands aren't defined by
+// default. User code or addons can define them. Unknown commands
+// are simply ignored.
+keyMap.pcDefault = {
+  "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
+  "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
+  "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
+  "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
+  "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
+  "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
+  "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
+  fallthrough: "basic"
+};
+// Very basic readline/emacs-style bindings, which are standard on Mac.
+keyMap.emacsy = {
+  "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
+  "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
+  "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
+  "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
+  "Ctrl-O": "openLine"
+};
+keyMap.macDefault = {
+  "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
+  "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
+  "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
+  "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
+  "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
+  "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
+  "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
+  fallthrough: ["basic", "emacsy"]
+};
+keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
+
+// KEYMAP DISPATCH
+
+function normalizeKeyName(name) {
+  var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
+  var alt, ctrl, shift, cmd;
+  for (var i = 0; i < parts.length - 1; i++) {
+    var mod = parts[i];
+    if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
+    else if (/^a(lt)?$/i.test(mod)) alt = true;
+    else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
+    else if (/^s(hift)$/i.test(mod)) shift = true;
+    else throw new Error("Unrecognized modifier name: " + mod);
+  }
+  if (alt) name = "Alt-" + name;
+  if (ctrl) name = "Ctrl-" + name;
+  if (cmd) name = "Cmd-" + name;
+  if (shift) name = "Shift-" + name;
+  return name;
+}
+
+// This is a kludge to keep keymaps mostly working as raw objects
+// (backwards compatibility) while at the same time support features
+// like normalization and multi-stroke key bindings. It compiles a
+// new normalized keymap, and then updates the old object to reflect
+// this.
+export function normalizeKeyMap(keymap) {
+  var copy = {};
+  for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
+    var value = keymap[keyname];
+    if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
+    if (value == "...") { delete keymap[keyname]; continue; }
+
+    var keys = map(keyname.split(" "), normalizeKeyName);
+    for (var i = 0; i < keys.length; i++) {
+      var val, name;
+      if (i == keys.length - 1) {
+        name = keys.join(" ");
+        val = value;
+      } else {
+        name = keys.slice(0, i + 1).join(" ");
+        val = "...";
+      }
+      var prev = copy[name];
+      if (!prev) copy[name] = val;
+      else if (prev != val) throw new Error("Inconsistent bindings for " + name);
+    }
+    delete keymap[keyname];
+  }
+  for (var prop in copy) keymap[prop] = copy[prop];
+  return keymap;
+}
+
+export function lookupKey(key, map, handle, context) {
+  map = getKeyMap(map);
+  var found = map.call ? map.call(key, context) : map[key];
+  if (found === false) return "nothing";
+  if (found === "...") return "multi";
+  if (found != null && handle(found)) return "handled";
+
+  if (map.fallthrough) {
+    if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
+      return lookupKey(key, map.fallthrough, handle, context);
+    for (var i = 0; i < map.fallthrough.length; i++) {
+      var result = lookupKey(key, map.fallthrough[i], handle, context);
+      if (result) return result;
+    }
+  }
+}
+
+// Modifier key presses don't count as 'real' key presses for the
+// purpose of keymap fallthrough.
+export function isModifierKey(value) {
+  var name = typeof value == "string" ? value : keyNames[value.keyCode];
+  return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
+}
+
+// Look up the name of a key as indicated by an event object.
+export function keyName(event, noShift) {
+  if (presto && event.keyCode == 34 && event["char"]) return false;
+  var base = keyNames[event.keyCode], name = base;
+  if (name == null || event.altGraphKey) return false;
+  if (event.altKey && base != "Alt") name = "Alt-" + name;
+  if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
+  if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
+  if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
+  return name;
+}
+
+export function getKeyMap(val) {
+  return typeof val == "string" ? keyMap[val] : val;
+}
diff --git a/src/input/keynames.js b/src/input/keynames.js
new file mode 100644
index 0000000000..5956093e82
--- /dev/null
+++ b/src/input/keynames.js
@@ -0,0 +1,17 @@
+export var keyNames = {
+  3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+  19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
+  36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
+  46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
+  106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
+  173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
+  221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
+  63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
+};
+
+// Number keys
+for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);
+// Alphabetic keys
+for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
+// Function keys
+for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
diff --git a/src/line/highlight.js b/src/line/highlight.js
new file mode 100644
index 0000000000..eada1a0671
--- /dev/null
+++ b/src/line/highlight.js
@@ -0,0 +1,204 @@
+import { countColumn } from "../util/misc";
+import { copyState, innerMode, startState } from "../modes";
+import StringStream from "../util/StringStream";
+
+import { getLine, lineNo } from "./utils_line";
+import { clipPos } from "./pos";
+
+// Compute a style array (an array starting with a mode generation
+// -- for invalidation -- followed by pairs of end positions and
+// style strings), which is used to highlight the tokens on the
+// line.
+export function highlightLine(cm, line, state, forceToEnd) {
+  // A styles array always starts with a number identifying the
+  // mode/overlays that it is based on (for easy invalidation).
+  var st = [cm.state.modeGen], lineClasses = {};
+  // Compute the base array of styles
+  runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
+    st.push(end, style);
+  }, lineClasses, forceToEnd);
+
+  // Run overlays, adjust style array.
+  for (var o = 0; o < cm.state.overlays.length; ++o) {
+    var overlay = cm.state.overlays[o], i = 1, at = 0;
+    runMode(cm, line.text, overlay.mode, true, function(end, style) {
+      var start = i;
+      // Ensure there's a token end at the current position, and that i points at it
+      while (at < end) {
+        var i_end = st[i];
+        if (i_end > end)
+          st.splice(i, 1, end, st[i+1], i_end);
+        i += 2;
+        at = Math.min(end, i_end);
+      }
+      if (!style) return;
+      if (overlay.opaque) {
+        st.splice(start, i - start, end, "cm-overlay " + style);
+        i = start + 2;
+      } else {
+        for (; start < i; start += 2) {
+          var cur = st[start+1];
+          st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style;
+        }
+      }
+    }, lineClasses);
+  }
+
+  return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
+}
+
+export function getLineStyles(cm, line, updateFrontier) {
+  if (!line.styles || line.styles[0] != cm.state.modeGen) {
+    var state = getStateBefore(cm, lineNo(line));
+    var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state);
+    line.stateAfter = state;
+    line.styles = result.styles;
+    if (result.classes) line.styleClasses = result.classes;
+    else if (line.styleClasses) line.styleClasses = null;
+    if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
+  }
+  return line.styles;
+}
+
+export function getStateBefore(cm, n, precise) {
+  var doc = cm.doc, display = cm.display;
+  if (!doc.mode.startState) return true;
+  var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
+  if (!state) state = startState(doc.mode);
+  else state = copyState(doc.mode, state);
+  doc.iter(pos, n, function(line) {
+    processLine(cm, line.text, state);
+    var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo;
+    line.stateAfter = save ? copyState(doc.mode, state) : null;
+    ++pos;
+  });
+  if (precise) doc.frontier = pos;
+  return state;
+}
+
+// Lightweight form of highlight -- proceed over this line and
+// update state, but don't save a style array. Used for lines that
+// aren't currently visible.
+export function processLine(cm, text, state, startAt) {
+  var mode = cm.doc.mode;
+  var stream = new StringStream(text, cm.options.tabSize);
+  stream.start = stream.pos = startAt || 0;
+  if (text == "") callBlankLine(mode, state);
+  while (!stream.eol()) {
+    readToken(mode, stream, state);
+    stream.start = stream.pos;
+  }
+}
+
+function callBlankLine(mode, state) {
+  if (mode.blankLine) return mode.blankLine(state);
+  if (!mode.innerMode) return;
+  var inner = innerMode(mode, state);
+  if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
+}
+
+export function readToken(mode, stream, state, inner) {
+  for (var i = 0; i < 10; i++) {
+    if (inner) inner[0] = innerMode(mode, state).mode;
+    var style = mode.token(stream, state);
+    if (stream.pos > stream.start) return style;
+  }
+  throw new Error("Mode " + mode.name + " failed to advance stream.");
+}
+
+// Utility for getTokenAt and getLineTokens
+export function takeToken(cm, pos, precise, asArray) {
+  function getObj(copy) {
+    return {start: stream.start, end: stream.pos,
+            string: stream.current(),
+            type: style || null,
+            state: copy ? copyState(doc.mode, state) : state};
+  }
+
+  var doc = cm.doc, mode = doc.mode, style;
+  pos = clipPos(doc, pos);
+  var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
+  var stream = new StringStream(line.text, cm.options.tabSize), tokens;
+  if (asArray) tokens = [];
+  while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
+    stream.start = stream.pos;
+    style = readToken(mode, stream, state);
+    if (asArray) tokens.push(getObj(true));
+  }
+  return asArray ? tokens : getObj();
+}
+
+function extractLineClasses(type, output) {
+  if (type) for (;;) {
+    var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
+    if (!lineClass) break;
+    type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
+    var prop = lineClass[1] ? "bgClass" : "textClass";
+    if (output[prop] == null)
+      output[prop] = lineClass[2];
+    else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
+      output[prop] += " " + lineClass[2];
+  }
+  return type;
+}
+
+// Run the given mode's parser over a line, calling f for each token.
+function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
+  var flattenSpans = mode.flattenSpans;
+  if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
+  var curStart = 0, curStyle = null;
+  var stream = new StringStream(text, cm.options.tabSize), style;
+  var inner = cm.options.addModeClass && [null];
+  if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
+  while (!stream.eol()) {
+    if (stream.pos > cm.options.maxHighlightLength) {
+      flattenSpans = false;
+      if (forceToEnd) processLine(cm, text, state, stream.pos);
+      stream.pos = text.length;
+      style = null;
+    } else {
+      style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
+    }
+    if (inner) {
+      var mName = inner[0].name;
+      if (mName) style = "m-" + (style ? mName + " " + style : mName);
+    }
+    if (!flattenSpans || curStyle != style) {
+      while (curStart < stream.start) {
+        curStart = Math.min(stream.start, curStart + 5000);
+        f(curStart, curStyle);
+      }
+      curStyle = style;
+    }
+    stream.start = stream.pos;
+  }
+  while (curStart < stream.pos) {
+    // Webkit seems to refuse to render text nodes longer than 57444
+    // characters, and returns inaccurate measurements in nodes
+    // starting around 5000 chars.
+    var pos = Math.min(stream.pos, curStart + 5000);
+    f(pos, curStyle);
+    curStart = pos;
+  }
+}
+
+// Finds the line to start with when starting a parse. Tries to
+// find a line with a stateAfter, so that it can start with a
+// valid state. If that fails, it returns the line with the
+// smallest indentation, which tends to need the least context to
+// parse correctly.
+function findStartLine(cm, n, precise) {
+  var minindent, minline, doc = cm.doc;
+  var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
+  for (var search = n; search > lim; --search) {
+    if (search <= doc.first) return doc.first;
+    var line = getLine(doc, search - 1);
+    if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
+    var indented = countColumn(line.text, null, cm.options.tabSize);
+    if (minline == null || minindent > indented) {
+      minline = search - 1;
+      minindent = indented;
+    }
+  }
+  return minline;
+}
diff --git a/src/line/line_data.js b/src/line/line_data.js
new file mode 100644
index 0000000000..018bd0e297
--- /dev/null
+++ b/src/line/line_data.js
@@ -0,0 +1,330 @@
+import { getOrder } from "../util/bidi";
+import { ie, ie_version, webkit } from "../util/browser";
+import { elt, joinClasses } from "../util/dom";
+import { eventMixin, signal } from "../util/event";
+import { hasBadBidiRects, zeroWidthElement } from "../util/feature_detection";
+import { lst, spaceStr } from "../util/misc";
+
+import { getLineStyles } from "./highlight";
+import { attachMarkedSpans, compareCollapsedMarkers, detachMarkedSpans, lineIsHidden, visualLineContinued } from "./spans";
+import { getLine, lineNo, updateLineHeight } from "./utils_line";
+
+// LINE DATA STRUCTURE
+
+// Line objects. These hold state related to a line, including
+// highlighting info (the styles array).
+export function Line(text, markedSpans, estimateHeight) {
+  this.text = text;
+  attachMarkedSpans(this, markedSpans);
+  this.height = estimateHeight ? estimateHeight(this) : 1;
+}
+eventMixin(Line);
+Line.prototype.lineNo = function() { return lineNo(this); };
+
+// Change the content (text, markers) of a line. Automatically
+// invalidates cached information and tries to re-estimate the
+// line's height.
+export function updateLine(line, text, markedSpans, estimateHeight) {
+  line.text = text;
+  if (line.stateAfter) line.stateAfter = null;
+  if (line.styles) line.styles = null;
+  if (line.order != null) line.order = null;
+  detachMarkedSpans(line);
+  attachMarkedSpans(line, markedSpans);
+  var estHeight = estimateHeight ? estimateHeight(line) : 1;
+  if (estHeight != line.height) updateLineHeight(line, estHeight);
+}
+
+// Detach a line from the document tree and its markers.
+export function cleanUpLine(line) {
+  line.parent = null;
+  detachMarkedSpans(line);
+}
+
+// Convert a style as returned by a mode (either null, or a string
+// containing one or more styles) to a CSS style. This is cached,
+// and also looks for line-wide styles.
+var styleToClassCache = {}, styleToClassCacheWithMode = {};
+function interpretTokenStyle(style, options) {
+  if (!style || /^\s*$/.test(style)) return null;
+  var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
+  return cache[style] ||
+    (cache[style] = style.replace(/\S+/g, "cm-$&"));
+}
+
+// Render the DOM representation of the text of a line. Also builds
+// up a 'line map', which points at the DOM nodes that represent
+// specific stretches of text, and is used by the measuring code.
+// The returned object contains the DOM node, this map, and
+// information about line-wide styles that were set by the mode.
+export function buildLineContent(cm, lineView) {
+  // The padding-right forces the element to have a 'border', which
+  // is needed on Webkit to be able to get line-level bounding
+  // rectangles for it (in measureChar).
+  var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
+  var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
+                 col: 0, pos: 0, cm: cm,
+                 trailingSpace: false,
+                 splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
+  lineView.measure = {};
+
+  // Iterate over the logical lines that make up this visual line.
+  for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
+    var line = i ? lineView.rest[i - 1] : lineView.line, order;
+    builder.pos = 0;
+    builder.addToken = buildToken;
+    // Optionally wire in some hacks into the token-rendering
+    // algorithm, to deal with browser quirks.
+    if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
+      builder.addToken = buildTokenBadBidi(builder.addToken, order);
+    builder.map = [];
+    var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
+    insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
+    if (line.styleClasses) {
+      if (line.styleClasses.bgClass)
+        builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");
+      if (line.styleClasses.textClass)
+        builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "");
+    }
+
+    // Ensure at least a single node is present, for measuring.
+    if (builder.map.length == 0)
+      builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
+
+    // Store the map and a cache object for the current logical line
+    if (i == 0) {
+      lineView.measure.map = builder.map;
+      lineView.measure.cache = {};
+    } else {
+      (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map);
+      (lineView.measure.caches || (lineView.measure.caches = [])).push({});
+    }
+  }
+
+  // See issue #2901
+  if (webkit) {
+    var last = builder.content.lastChild
+    if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
+      builder.content.className = "cm-tab-wrap-hack";
+  }
+
+  signal(cm, "renderLine", cm, lineView.line, builder.pre);
+  if (builder.pre.className)
+    builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
+
+  return builder;
+}
+
+export function defaultSpecialCharPlaceholder(ch) {
+  var token = elt("span", "\u2022", "cm-invalidchar");
+  token.title = "\\u" + ch.charCodeAt(0).toString(16);
+  token.setAttribute("aria-label", token.title);
+  return token;
+}
+
+// Build up the DOM representation for a single token, and add it to
+// the line map. Takes care to render special characters separately.
+function buildToken(builder, text, style, startStyle, endStyle, title, css) {
+  if (!text) return;
+  var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
+  var special = builder.cm.state.specialChars, mustWrap = false;
+  if (!special.test(text)) {
+    builder.col += text.length;
+    var content = document.createTextNode(displayText);
+    builder.map.push(builder.pos, builder.pos + text.length, content);
+    if (ie && ie_version < 9) mustWrap = true;
+    builder.pos += text.length;
+  } else {
+    var content = document.createDocumentFragment(), pos = 0;
+    while (true) {
+      special.lastIndex = pos;
+      var m = special.exec(text);
+      var skipped = m ? m.index - pos : text.length - pos;
+      if (skipped) {
+        var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
+        if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
+        else content.appendChild(txt);
+        builder.map.push(builder.pos, builder.pos + skipped, txt);
+        builder.col += skipped;
+        builder.pos += skipped;
+      }
+      if (!m) break;
+      pos += skipped + 1;
+      if (m[0] == "\t") {
+        var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
+        var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
+        txt.setAttribute("role", "presentation");
+        txt.setAttribute("cm-text", "\t");
+        builder.col += tabWidth;
+      } else if (m[0] == "\r" || m[0] == "\n") {
+        var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
+        txt.setAttribute("cm-text", m[0]);
+        builder.col += 1;
+      } else {
+        var txt = builder.cm.options.specialCharPlaceholder(m[0]);
+        txt.setAttribute("cm-text", m[0]);
+        if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
+        else content.appendChild(txt);
+        builder.col += 1;
+      }
+      builder.map.push(builder.pos, builder.pos + 1, txt);
+      builder.pos++;
+    }
+  }
+  builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
+  if (style || startStyle || endStyle || mustWrap || css) {
+    var fullStyle = style || "";
+    if (startStyle) fullStyle += startStyle;
+    if (endStyle) fullStyle += endStyle;
+    var token = elt("span", [content], fullStyle, css);
+    if (title) token.title = title;
+    return builder.content.appendChild(token);
+  }
+  builder.content.appendChild(content);
+}
+
+function splitSpaces(text, trailingBefore) {
+  if (text.length > 1 && !/  /.test(text)) return text
+  var spaceBefore = trailingBefore, result = ""
+  for (var i = 0; i < text.length; i++) {
+    var ch = text.charAt(i)
+    if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
+      ch = "\u00a0"
+    result += ch
+    spaceBefore = ch == " "
+  }
+  return result
+}
+
+// Work around nonsense dimensions being reported for stretches of
+// right-to-left text.
+function buildTokenBadBidi(inner, order) {
+  return function(builder, text, style, startStyle, endStyle, title, css) {
+    style = style ? style + " cm-force-border" : "cm-force-border";
+    var start = builder.pos, end = start + text.length;
+    for (;;) {
+      // Find the part that overlaps with the start of this text
+      for (var i = 0; i < order.length; i++) {
+        var part = order[i];
+        if (part.to > start && part.from <= start) break;
+      }
+      if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css);
+      inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
+      startStyle = null;
+      text = text.slice(part.to - start);
+      start = part.to;
+    }
+  };
+}
+
+function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
+  var widget = !ignoreWidget && marker.widgetNode;
+  if (widget) builder.map.push(builder.pos, builder.pos + size, widget);
+  if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
+    if (!widget)
+      widget = builder.content.appendChild(document.createElement("span"));
+    widget.setAttribute("cm-marker", marker.id);
+  }
+  if (widget) {
+    builder.cm.display.input.setUneditable(widget);
+    builder.content.appendChild(widget);
+  }
+  builder.pos += size;
+  builder.trailingSpace = false
+}
+
+// Outputs a number of spans to make up a line, taking highlighting
+// and marked text into account.
+function insertLineContent(line, builder, styles) {
+  var spans = line.markedSpans, allText = line.text, at = 0;
+  if (!spans) {
+    for (var i = 1; i < styles.length; i+=2)
+      builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options));
+    return;
+  }
+
+  var len = allText.length, pos = 0, i = 1, text = "", style, css;
+  var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
+  for (;;) {
+    if (nextChange == pos) { // Update current marker set
+      spanStyle = spanEndStyle = spanStartStyle = title = css = "";
+      collapsed = null; nextChange = Infinity;
+      var foundBookmarks = [], endStyles
+      for (var j = 0; j < spans.length; ++j) {
+        var sp = spans[j], m = sp.marker;
+        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 = (css ? css + ";" : "") + m.css;
+          if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
+          if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
+          if (m.title && !title) title = m.title;
+          if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
+            collapsed = sp;
+        } else if (sp.from > pos && nextChange > sp.from) {
+          nextChange = sp.from;
+        }
+      }
+      if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
+        if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
+
+      if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
+        buildCollapsedSpan(builder, 0, foundBookmarks[j]);
+      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 (pos >= len) break;
+
+    var upto = Math.min(len, nextChange);
+    while (true) {
+      if (text) {
+        var end = pos + text.length;
+        if (!collapsed) {
+          var tokenText = end > upto ? text.slice(0, upto - pos) : text;
+          builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
+                           spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
+        }
+        if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
+        pos = end;
+        spanStartStyle = "";
+      }
+      text = allText.slice(at, at = styles[i++]);
+      style = interpretTokenStyle(styles[i++], builder.cm.options);
+    }
+  }
+}
+
+
+// These objects are used to represent the visible (currently drawn)
+// part of the document. A LineView may correspond to multiple
+// logical lines, if those are connected by collapsed ranges.
+export function LineView(doc, line, lineN) {
+  // The starting line
+  this.line = line;
+  // Continuing lines, if any
+  this.rest = visualLineContinued(line);
+  // Number of logical lines in this visual line
+  this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
+  this.node = this.text = null;
+  this.hidden = lineIsHidden(doc, line);
+}
+
+// Create a range of LineView objects for the given lines.
+export function buildViewArray(cm, from, to) {
+  var array = [], nextPos;
+  for (var pos = from; pos < to; pos = nextPos) {
+    var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
+    nextPos = pos + view.size;
+    array.push(view);
+  }
+  return array;
+}
diff --git a/src/line/pos.js b/src/line/pos.js
new file mode 100644
index 0000000000..e81eb58493
--- /dev/null
+++ b/src/line/pos.js
@@ -0,0 +1,35 @@
+import { getLine } from "./utils_line";
+
+// A Pos instance represents a position within the text.
+export function Pos (line, ch) {
+  if (!(this instanceof Pos)) return new Pos(line, ch);
+  this.line = line; this.ch = ch;
+}
+
+// Compare two positions, return 0 if they are the same, a negative
+// number when a is less, and a positive number otherwise.
+export function cmp(a, b) { return a.line - b.line || a.ch - b.ch; }
+
+export function copyPos(x) {return Pos(x.line, x.ch);}
+export function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
+export function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
+
+// Most of the external API clips given positions to make sure they
+// actually exist within the document.
+export function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));}
+export function clipPos(doc, pos) {
+  if (pos.line < doc.first) return Pos(doc.first, 0);
+  var last = doc.first + doc.size - 1;
+  if (pos.line > last) return Pos(last, getLine(doc, last).text.length);
+  return clipToLen(pos, getLine(doc, pos.line).text.length);
+}
+function clipToLen(pos, linelen) {
+  var ch = pos.ch;
+  if (ch == null || ch > linelen) return Pos(pos.line, linelen);
+  else if (ch < 0) return Pos(pos.line, 0);
+  else return pos;
+}
+export function clipPosArray(doc, array) {
+  for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]);
+  return out;
+}
diff --git a/src/line/saw_special_spans.js b/src/line/saw_special_spans.js
new file mode 100644
index 0000000000..4c1f8e0bf0
--- /dev/null
+++ b/src/line/saw_special_spans.js
@@ -0,0 +1,10 @@
+// Optimize some code when these features are not used.
+export var sawReadOnlySpans = false, sawCollapsedSpans = false;
+
+export function seeReadOnlySpans() {
+  sawReadOnlySpans = true;
+}
+
+export function seeCollapsedSpans() {
+  sawCollapsedSpans = true;
+}
diff --git a/src/line/spans.js b/src/line/spans.js
new file mode 100644
index 0000000000..d114d8943f
--- /dev/null
+++ b/src/line/spans.js
@@ -0,0 +1,362 @@
+import { indexOf, lst } from "../util/misc";
+
+import { cmp } from "./pos";
+import { sawCollapsedSpans } from "./saw_special_spans";
+import { getLine, isLine, lineNo } from "./utils_line";
+
+// TEXTMARKER SPANS
+
+export function MarkedSpan(marker, from, to) {
+  this.marker = marker;
+  this.from = from; this.to = to;
+}
+
+// Search an array of spans for a span matching the given marker.
+export function getMarkedSpanFor(spans, marker) {
+  if (spans) for (var i = 0; i < spans.length; ++i) {
+    var span = spans[i];
+    if (span.marker == marker) return span;
+  }
+}
+// Remove a span from an array, returning undefined if no spans are
+// left (we don't store arrays for lines without spans).
+export function removeMarkedSpan(spans, span) {
+  for (var r, i = 0; i < spans.length; ++i)
+    if (spans[i] != span) (r || (r = [])).push(spans[i]);
+  return r;
+}
+// Add a span to a line.
+export function addMarkedSpan(line, span) {
+  line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
+  span.marker.attachLine(line);
+}
+
+// Used for the algorithm that adjusts markers for a change in the
+// document. These functions cut an array of spans at a given
+// character position, returning an array of remaining chunks (or
+// undefined if nothing remains).
+function markedSpansBefore(old, startCh, isInsert) {
+  if (old) for (var i = 0, nw; i < old.length; ++i) {
+    var span = old[i], marker = span.marker;
+    var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
+    if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
+      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
+      (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
+    }
+  }
+  return nw;
+}
+function markedSpansAfter(old, endCh, isInsert) {
+  if (old) for (var i = 0, nw; i < old.length; ++i) {
+    var span = old[i], marker = span.marker;
+    var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
+    if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
+      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
+      (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
+                                            span.to == null ? null : span.to - endCh));
+    }
+  }
+  return nw;
+}
+
+// Given a change object, compute the new set of marker spans that
+// cover the line in which the change took place. Removes spans
+// entirely within the change, reconnects spans belonging to the
+// same marker that appear on both sides of the change, and cuts off
+// spans partially within the change. Returns an array of span
+// arrays with one element for each line in (after) the change.
+export function stretchSpansOverChange(doc, change) {
+  if (change.full) return null;
+  var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
+  var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
+  if (!oldFirst && !oldLast) return null;
+
+  var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
+  // Get the spans that 'stick out' on both sides
+  var first = markedSpansBefore(oldFirst, startCh, isInsert);
+  var last = markedSpansAfter(oldLast, endCh, isInsert);
+
+  // Next, merge those two ends
+  var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
+  if (first) {
+    // Fix up .to properties of first
+    for (var i = 0; i < first.length; ++i) {
+      var span = first[i];
+      if (span.to == null) {
+        var found = getMarkedSpanFor(last, span.marker);
+        if (!found) span.to = startCh;
+        else if (sameLine) span.to = found.to == null ? null : found.to + offset;
+      }
+    }
+  }
+  if (last) {
+    // Fix up .from in last (or move them into first in case of sameLine)
+    for (var i = 0; i < last.length; ++i) {
+      var span = last[i];
+      if (span.to != null) span.to += offset;
+      if (span.from == null) {
+        var found = getMarkedSpanFor(first, span.marker);
+        if (!found) {
+          span.from = offset;
+          if (sameLine) (first || (first = [])).push(span);
+        }
+      } else {
+        span.from += offset;
+        if (sameLine) (first || (first = [])).push(span);
+      }
+    }
+  }
+  // Make sure we didn't create any zero-length spans
+  if (first) first = clearEmptySpans(first);
+  if (last && last != first) last = clearEmptySpans(last);
+
+  var newMarkers = [first];
+  if (!sameLine) {
+    // Fill gap with whole-line-spans
+    var gap = change.text.length - 2, gapMarkers;
+    if (gap > 0 && first)
+      for (var i = 0; i < first.length; ++i)
+        if (first[i].to == null)
+          (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null));
+    for (var i = 0; i < gap; ++i)
+      newMarkers.push(gapMarkers);
+    newMarkers.push(last);
+  }
+  return newMarkers;
+}
+
+// Remove spans that are empty and don't have a clearWhenEmpty
+// option of false.
+function clearEmptySpans(spans) {
+  for (var i = 0; i < spans.length; ++i) {
+    var span = spans[i];
+    if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
+      spans.splice(i--, 1);
+  }
+  if (!spans.length) return null;
+  return spans;
+}
+
+// Used to 'clip' out readOnly ranges when making a change.
+export function removeReadOnlyRanges(doc, from, to) {
+  var markers = null;
+  doc.iter(from.line, to.line + 1, function(line) {
+    if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
+      var mark = line.markedSpans[i].marker;
+      if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
+        (markers || (markers = [])).push(mark);
+    }
+  });
+  if (!markers) return null;
+  var parts = [{from: from, to: to}];
+  for (var i = 0; i < markers.length; ++i) {
+    var mk = markers[i], m = mk.find(0);
+    for (var j = 0; j < parts.length; ++j) {
+      var p = parts[j];
+      if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue;
+      var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
+      if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
+        newParts.push({from: p.from, to: m.from});
+      if (dto > 0 || !mk.inclusiveRight && !dto)
+        newParts.push({from: m.to, to: p.to});
+      parts.splice.apply(parts, newParts);
+      j += newParts.length - 1;
+    }
+  }
+  return parts;
+}
+
+// Connect or disconnect spans from a line.
+export function detachMarkedSpans(line) {
+  var spans = line.markedSpans;
+  if (!spans) return;
+  for (var i = 0; i < spans.length; ++i)
+    spans[i].marker.detachLine(line);
+  line.markedSpans = null;
+}
+export function attachMarkedSpans(line, spans) {
+  if (!spans) return;
+  for (var i = 0; i < spans.length; ++i)
+    spans[i].marker.attachLine(line);
+  line.markedSpans = spans;
+}
+
+// Helpers used when computing which overlapping collapsed span
+// counts as the larger one.
+function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; }
+function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; }
+
+// Returns a number indicating which of two overlapping collapsed
+// spans is larger (and thus includes the other). Falls back to
+// comparing ids when the spans cover exactly the same range.
+export function compareCollapsedMarkers(a, b) {
+  var lenDiff = a.lines.length - b.lines.length;
+  if (lenDiff != 0) return lenDiff;
+  var aPos = a.find(), bPos = b.find();
+  var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
+  if (fromCmp) return -fromCmp;
+  var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
+  if (toCmp) return toCmp;
+  return b.id - a.id;
+}
+
+// Find out whether a line ends or starts in a collapsed span. If
+// so, return the marker for that span.
+function collapsedSpanAtSide(line, start) {
+  var sps = sawCollapsedSpans && line.markedSpans, found;
+  if (sps) for (var sp, i = 0; i < sps.length; ++i) {
+    sp = sps[i];
+    if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
+        (!found || compareCollapsedMarkers(found, sp.marker) < 0))
+      found = sp.marker;
+  }
+  return found;
+}
+export function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }
+export function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }
+
+// Test whether there exists a collapsed span that partially
+// overlaps (covers the start or end, but not both) of a new span.
+// Such overlap is not allowed.
+export function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
+  var line = getLine(doc, lineNo);
+  var sps = sawCollapsedSpans && line.markedSpans;
+  if (sps) for (var i = 0; i < sps.length; ++i) {
+    var sp = sps[i];
+    if (!sp.marker.collapsed) continue;
+    var found = sp.marker.find(0);
+    var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
+    var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
+    if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
+    if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
+        fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
+      return true;
+  }
+}
+
+// A visual line is a line as drawn on the screen. Folding, for
+// example, can cause multiple logical lines to appear on the same
+// visual line. This finds the start of the visual line that the
+// given line is part of (usually that is the line itself).
+export function visualLine(line) {
+  var merged;
+  while (merged = collapsedSpanAtStart(line))
+    line = merged.find(-1, true).line;
+  return line;
+}
+
+// Returns an array of logical lines that continue the visual line
+// started by the argument, or undefined if there are no such lines.
+export function visualLineContinued(line) {
+  var merged, lines;
+  while (merged = collapsedSpanAtEnd(line)) {
+    line = merged.find(1, true).line;
+    (lines || (lines = [])).push(line);
+  }
+  return lines;
+}
+
+// Get the line number of the start of the visual line that the
+// given line number is part of.
+export function visualLineNo(doc, lineN) {
+  var line = getLine(doc, lineN), vis = visualLine(line);
+  if (line == vis) return lineN;
+  return lineNo(vis);
+}
+
+// Get the line number of the start of the next visual line after
+// the given line.
+export function visualLineEndNo(doc, lineN) {
+  if (lineN > doc.lastLine()) return lineN;
+  var line = getLine(doc, lineN), merged;
+  if (!lineIsHidden(doc, line)) return lineN;
+  while (merged = collapsedSpanAtEnd(line))
+    line = merged.find(1, true).line;
+  return lineNo(line) + 1;
+}
+
+// Compute whether a line is hidden. Lines count as hidden when they
+// are part of a visual line that starts with another line, or when
+// they are entirely covered by collapsed, non-widget span.
+export function lineIsHidden(doc, line) {
+  var sps = sawCollapsedSpans && line.markedSpans;
+  if (sps) for (var sp, i = 0; i < sps.length; ++i) {
+    sp = sps[i];
+    if (!sp.marker.collapsed) continue;
+    if (sp.from == null) return true;
+    if (sp.marker.widgetNode) continue;
+    if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
+      return true;
+  }
+}
+function lineIsHiddenInner(doc, line, span) {
+  if (span.to == null) {
+    var end = span.marker.find(1, true);
+    return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker));
+  }
+  if (span.marker.inclusiveRight && span.to == line.text.length)
+    return true;
+  for (var sp, i = 0; i < line.markedSpans.length; ++i) {
+    sp = line.markedSpans[i];
+    if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
+        (sp.to == null || sp.to != span.from) &&
+        (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
+        lineIsHiddenInner(doc, line, sp)) return true;
+  }
+}
+
+// Find the height above the given line.
+export function heightAtLine(lineObj) {
+  lineObj = visualLine(lineObj);
+
+  var h = 0, chunk = lineObj.parent;
+  for (var i = 0; i < chunk.lines.length; ++i) {
+    var line = chunk.lines[i];
+    if (line == lineObj) break;
+    else h += line.height;
+  }
+  for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
+    for (var i = 0; i < p.children.length; ++i) {
+      var cur = p.children[i];
+      if (cur == chunk) break;
+      else h += cur.height;
+    }
+  }
+  return h;
+}
+
+// Compute the character length of a line, taking into account
+// collapsed ranges (see markText) that might hide parts, and join
+// other lines onto it.
+export function lineLength(line) {
+  if (line.height == 0) return 0;
+  var len = line.text.length, merged, cur = line;
+  while (merged = collapsedSpanAtStart(cur)) {
+    var found = merged.find(0, true);
+    cur = found.from.line;
+    len += found.from.ch - found.to.ch;
+  }
+  cur = line;
+  while (merged = collapsedSpanAtEnd(cur)) {
+    var found = merged.find(0, true);
+    len -= cur.text.length - found.from.ch;
+    cur = found.to.line;
+    len += cur.text.length - found.to.ch;
+  }
+  return len;
+}
+
+// Find the longest line in the document.
+export function findMaxLine(cm) {
+  var d = cm.display, doc = cm.doc;
+  d.maxLine = getLine(doc, doc.first);
+  d.maxLineLength = lineLength(d.maxLine);
+  d.maxLineChanged = true;
+  doc.iter(function(line) {
+    var len = lineLength(line);
+    if (len > d.maxLineLength) {
+      d.maxLineLength = len;
+      d.maxLine = line;
+    }
+  });
+}
diff --git a/src/line/utils_line.js b/src/line/utils_line.js
new file mode 100644
index 0000000000..b194ff38b6
--- /dev/null
+++ b/src/line/utils_line.js
@@ -0,0 +1,83 @@
+import { indexOf } from "../util/misc";
+
+// Find the line object corresponding to the given line number.
+export function getLine(doc, n) {
+  n -= doc.first;
+  if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.");
+  for (var chunk = doc; !chunk.lines;) {
+    for (var i = 0;; ++i) {
+      var child = chunk.children[i], sz = child.chunkSize();
+      if (n < sz) { chunk = child; break; }
+      n -= sz;
+    }
+  }
+  return chunk.lines[n];
+}
+
+// Get the part of a document between two positions, as an array of
+// strings.
+export function getBetween(doc, start, end) {
+  var out = [], n = start.line;
+  doc.iter(start.line, end.line + 1, function(line) {
+    var text = line.text;
+    if (n == end.line) text = text.slice(0, end.ch);
+    if (n == start.line) text = text.slice(start.ch);
+    out.push(text);
+    ++n;
+  });
+  return out;
+}
+// Get the lines between from and to, as array of strings.
+export function getLines(doc, from, to) {
+  var out = [];
+  doc.iter(from, to, function(line) { out.push(line.text); });
+  return out;
+}
+
+// Update the height of a line, propagating the height change
+// upwards to parent nodes.
+export function updateLineHeight(line, height) {
+  var diff = height - line.height;
+  if (diff) for (var n = line; n; n = n.parent) n.height += diff;
+}
+
+// Given a line object, find its line number by walking up through
+// its parent links.
+export function lineNo(line) {
+  if (line.parent == null) return null;
+  var cur = line.parent, no = indexOf(cur.lines, line);
+  for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
+    for (var i = 0;; ++i) {
+      if (chunk.children[i] == cur) break;
+      no += chunk.children[i].chunkSize();
+    }
+  }
+  return no + cur.first;
+}
+
+// Find the line at the given vertical position, using the height
+// information in the document tree.
+export function lineAtHeight(chunk, h) {
+  var n = chunk.first;
+  outer: do {
+    for (var i = 0; i < chunk.children.length; ++i) {
+      var child = chunk.children[i], ch = child.height;
+      if (h < ch) { chunk = child; continue outer; }
+      h -= ch;
+      n += child.chunkSize();
+    }
+    return n;
+  } while (!chunk.lines);
+  for (var i = 0; i < chunk.lines.length; ++i) {
+    var line = chunk.lines[i], lh = line.height;
+    if (h < lh) break;
+    h -= lh;
+  }
+  return n + i;
+}
+
+export function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
+
+export function lineNumberFor(options, i) {
+  return String(options.lineNumberFormatter(i + options.firstLineNumber));
+}
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
new file mode 100644
index 0000000000..b479e25090
--- /dev/null
+++ b/src/measurement/position_measurement.js
@@ -0,0 +1,580 @@
+import { buildLineContent, LineView } from "../line/line_data";
+import { clipPos, Pos } from "../line/pos";
+import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans";
+import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line";
+import { bidiLeft, bidiRight, bidiOther, getBidiPartAt, getOrder, lineLeft, lineRight, moveVisually } from "../util/bidi";
+import { ie, ie_version } from "../util/browser";
+import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom";
+import { e_target } from "../util/event";
+import { hasBadZoomedRects } from "../util/feature_detection";
+import { countColumn, isExtendingChar, scrollerGap } from "../util/misc";
+
+import { updateLineForChanges } from "./update_line";
+import { widgetHeight } from "./widgets";
+
+// POSITION MEASUREMENT
+
+export function paddingTop(display) {return display.lineSpace.offsetTop;}
+export function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;}
+export function paddingH(display) {
+  if (display.cachedPaddingH) return display.cachedPaddingH;
+  var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
+  var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
+  var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
+  if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data;
+  return data;
+}
+
+export function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; }
+export function displayWidth(cm) {
+  return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth;
+}
+export function displayHeight(cm) {
+  return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight;
+}
+
+// Ensure the lineView.wrapping.heights array is populated. This is
+// an array of bottom offsets for the lines that make up a drawn
+// line. When lineWrapping is on, there might be more than one
+// height.
+function ensureLineHeights(cm, lineView, rect) {
+  var wrapping = cm.options.lineWrapping;
+  var curWidth = wrapping && displayWidth(cm);
+  if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
+    var heights = lineView.measure.heights = [];
+    if (wrapping) {
+      lineView.measure.width = curWidth;
+      var rects = lineView.text.firstChild.getClientRects();
+      for (var i = 0; i < rects.length - 1; i++) {
+        var cur = rects[i], next = rects[i + 1];
+        if (Math.abs(cur.bottom - next.bottom) > 2)
+          heights.push((cur.bottom + next.top) / 2 - rect.top);
+      }
+    }
+    heights.push(rect.bottom - rect.top);
+  }
+}
+
+// Find a line map (mapping character offsets to text nodes) and a
+// measurement cache for the given line number. (A line view might
+// contain multiple lines when collapsed ranges are present.)
+export function mapFromLineView(lineView, line, lineN) {
+  if (lineView.line == line)
+    return {map: lineView.measure.map, cache: lineView.measure.cache};
+  for (var i = 0; i < lineView.rest.length; i++)
+    if (lineView.rest[i] == line)
+      return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]};
+  for (var i = 0; i < lineView.rest.length; i++)
+    if (lineNo(lineView.rest[i]) > lineN)
+      return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true};
+}
+
+// Render a line into the hidden node display.externalMeasured. Used
+// when measurement is needed for a line that's not in the viewport.
+function updateExternalMeasurement(cm, line) {
+  line = visualLine(line);
+  var lineN = lineNo(line);
+  var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
+  view.lineN = lineN;
+  var built = view.built = buildLineContent(cm, view);
+  view.text = built.pre;
+  removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
+  return view;
+}
+
+// Get a {top, bottom, left, right} box (in line-local coordinates)
+// for a given character.
+export function measureChar(cm, line, ch, bias) {
+  return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias);
+}
+
+// Find a line view that corresponds to the given line number.
+export function findViewForLine(cm, lineN) {
+  if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
+    return cm.display.view[findViewIndex(cm, lineN)];
+  var ext = cm.display.externalMeasured;
+  if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
+    return ext;
+}
+
+// Measurement can be split in two steps, the set-up work that
+// applies to the whole line, and the measurement of the actual
+// character. Functions like coordsChar, that need to do a lot of
+// measurements in a row, can thus ensure that the set-up work is
+// only done once.
+function prepareMeasureForLine(cm, line) {
+  var lineN = lineNo(line);
+  var view = findViewForLine(cm, lineN);
+  if (view && !view.text) {
+    view = null;
+  } else if (view && view.changes) {
+    updateLineForChanges(cm, view, lineN, getDimensions(cm));
+    cm.curOp.forceUpdate = true;
+  }
+  if (!view)
+    view = updateExternalMeasurement(cm, line);
+
+  var info = mapFromLineView(view, line, lineN);
+  return {
+    line: line, view: view, rect: null,
+    map: info.map, cache: info.cache, before: info.before,
+    hasHeights: false
+  };
+}
+
+// Given a prepared measurement object, measures the position of an
+// actual character (or fetches it from the cache).
+function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
+  if (prepared.before) ch = -1;
+  var key = ch + (bias || ""), found;
+  if (prepared.cache.hasOwnProperty(key)) {
+    found = prepared.cache[key];
+  } else {
+    if (!prepared.rect)
+      prepared.rect = prepared.view.text.getBoundingClientRect();
+    if (!prepared.hasHeights) {
+      ensureLineHeights(cm, prepared.view, prepared.rect);
+      prepared.hasHeights = true;
+    }
+    found = measureCharInner(cm, prepared, ch, bias);
+    if (!found.bogus) prepared.cache[key] = found;
+  }
+  return {left: found.left, right: found.right,
+          top: varHeight ? found.rtop : found.top,
+          bottom: varHeight ? found.rbottom : found.bottom};
+}
+
+var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
+
+export function nodeAndOffsetInLineMap(map, ch, bias) {
+  var node, start, end, collapse;
+  // First, search the line map for the text node corresponding to,
+  // or closest to, the target character.
+  for (var i = 0; i < map.length; i += 3) {
+    var mStart = map[i], mEnd = map[i + 1];
+    if (ch < mStart) {
+      start = 0; end = 1;
+      collapse = "left";
+    } else if (ch < mEnd) {
+      start = ch - mStart;
+      end = start + 1;
+    } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {
+      end = mEnd - mStart;
+      start = end - 1;
+      if (ch >= mEnd) collapse = "right";
+    }
+    if (start != null) {
+      node = map[i + 2];
+      if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
+        collapse = bias;
+      if (bias == "left" && start == 0)
+        while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {
+          node = map[(i -= 3) + 2];
+          collapse = "left";
+        }
+      if (bias == "right" && start == mEnd - mStart)
+        while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {
+          node = map[(i += 3) + 2];
+          collapse = "right";
+        }
+      break;
+    }
+  }
+  return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
+}
+
+function getUsefulRect(rects, bias) {
+  var rect = nullRect
+  if (bias == "left") for (var i = 0; i < rects.length; i++) {
+    if ((rect = rects[i]).left != rect.right) break
+  } else for (var i = rects.length - 1; i >= 0; i--) {
+    if ((rect = rects[i]).left != rect.right) break
+  }
+  return rect
+}
+
+function measureCharInner(cm, prepared, ch, bias) {
+  var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
+  var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
+
+  var rect;
+  if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
+    for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
+      while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
+      while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
+      if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
+        rect = node.parentNode.getBoundingClientRect();
+      else
+        rect = getUsefulRect(range(node, start, end).getClientRects(), bias)
+      if (rect.left || rect.right || start == 0) break;
+      end = start;
+      start = start - 1;
+      collapse = "right";
+    }
+    if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
+  } else { // If it is a widget, simply get the box for the whole widget.
+    if (start > 0) collapse = bias = "right";
+    var rects;
+    if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
+      rect = rects[bias == "right" ? rects.length - 1 : 0];
+    else
+      rect = node.getBoundingClientRect();
+  }
+  if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
+    var rSpan = node.parentNode.getClientRects()[0];
+    if (rSpan)
+      rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
+    else
+      rect = nullRect;
+  }
+
+  var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
+  var mid = (rtop + rbot) / 2;
+  var heights = prepared.view.measure.heights;
+  for (var i = 0; i < heights.length - 1; i++)
+    if (mid < heights[i]) break;
+  var top = i ? heights[i - 1] : 0, bot = heights[i];
+  var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
+                right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
+                top: top, bottom: bot};
+  if (!rect.left && !rect.right) result.bogus = true;
+  if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
+
+  return result;
+}
+
+// Work around problem with bounding client rects on ranges being
+// returned incorrectly when zoomed on IE10 and below.
+function maybeUpdateRectForZooming(measure, rect) {
+  if (!window.screen || screen.logicalXDPI == null ||
+      screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
+    return rect;
+  var scaleX = screen.logicalXDPI / screen.deviceXDPI;
+  var scaleY = screen.logicalYDPI / screen.deviceYDPI;
+  return {left: rect.left * scaleX, right: rect.right * scaleX,
+          top: rect.top * scaleY, bottom: rect.bottom * scaleY};
+}
+
+export function clearLineMeasurementCacheFor(lineView) {
+  if (lineView.measure) {
+    lineView.measure.cache = {};
+    lineView.measure.heights = null;
+    if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
+      lineView.measure.caches[i] = {};
+  }
+}
+
+export function clearLineMeasurementCache(cm) {
+  cm.display.externalMeasure = null;
+  removeChildren(cm.display.lineMeasure);
+  for (var i = 0; i < cm.display.view.length; i++)
+    clearLineMeasurementCacheFor(cm.display.view[i]);
+}
+
+export function clearCaches(cm) {
+  clearLineMeasurementCache(cm);
+  cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
+  if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
+  cm.display.lineNumChars = null;
+}
+
+function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }
+function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }
+
+// Converts a {top, bottom, left, right} box from line-local
+// coordinates into another coordinate system. Context may be one of
+// "line", "div" (display.lineDiv), "local"./null (editor), "window",
+// or "page".
+export function intoCoordSystem(cm, lineObj, rect, context) {
+  if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
+    var size = widgetHeight(lineObj.widgets[i]);
+    rect.top += size; rect.bottom += size;
+  }
+  if (context == "line") return rect;
+  if (!context) context = "local";
+  var yOff = heightAtLine(lineObj);
+  if (context == "local") yOff += paddingTop(cm.display);
+  else yOff -= cm.display.viewOffset;
+  if (context == "page" || context == "window") {
+    var lOff = cm.display.lineSpace.getBoundingClientRect();
+    yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
+    var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
+    rect.left += xOff; rect.right += xOff;
+  }
+  rect.top += yOff; rect.bottom += yOff;
+  return rect;
+}
+
+// Coverts a box from "div" coords to another coordinate system.
+// Context may be "window", "page", "div", or "local"./null.
+export function fromCoordSystem(cm, coords, context) {
+  if (context == "div") return coords;
+  var left = coords.left, top = coords.top;
+  // First move into "page" coordinate system
+  if (context == "page") {
+    left -= pageScrollX();
+    top -= pageScrollY();
+  } else if (context == "local" || !context) {
+    var localBox = cm.display.sizer.getBoundingClientRect();
+    left += localBox.left;
+    top += localBox.top;
+  }
+
+  var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
+  return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
+}
+
+export function charCoords(cm, pos, context, lineObj, bias) {
+  if (!lineObj) lineObj = getLine(cm.doc, pos.line);
+  return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context);
+}
+
+// Returns a box for a given cursor position, which may have an
+// 'other' property containing the position of the secondary cursor
+// on a bidi boundary.
+export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
+  lineObj = lineObj || getLine(cm.doc, pos.line);
+  if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
+  function get(ch, right) {
+    var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
+    if (right) m.left = m.right; else m.right = m.left;
+    return intoCoordSystem(cm, lineObj, m, context);
+  }
+  function getBidi(ch, partPos) {
+    var part = order[partPos], right = part.level % 2;
+    if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
+      part = order[--partPos];
+      ch = bidiRight(part) - (part.level % 2 ? 0 : 1);
+      right = true;
+    } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
+      part = order[++partPos];
+      ch = bidiLeft(part) - part.level % 2;
+      right = false;
+    }
+    if (right && ch == part.to && ch > part.from) return get(ch - 1);
+    return get(ch, right);
+  }
+  var order = getOrder(lineObj), ch = pos.ch;
+  if (!order) return get(ch);
+  var partPos = getBidiPartAt(order, ch);
+  var val = getBidi(ch, partPos);
+  if (bidiOther != null) val.other = getBidi(ch, bidiOther);
+  return val;
+}
+
+// Used to cheaply estimate the coordinates for a position. Used for
+// intermediate scroll updates.
+export function estimateCoords(cm, pos) {
+  var left = 0, pos = clipPos(cm.doc, pos);
+  if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch;
+  var lineObj = getLine(cm.doc, pos.line);
+  var top = heightAtLine(lineObj) + paddingTop(cm.display);
+  return {left: left, right: left, top: top, bottom: top + lineObj.height};
+}
+
+// Positions returned by coordsChar contain some extra information.
+// xRel is the relative x position of the input coordinates compared
+// to the found position (so xRel > 0 means the coordinates are to
+// the right of the character position, for example). When outside
+// is true, that means the coordinates lie outside the line's
+// vertical range.
+function PosWithInfo(line, ch, outside, xRel) {
+  var pos = Pos(line, ch);
+  pos.xRel = xRel;
+  if (outside) pos.outside = true;
+  return pos;
+}
+
+// Compute the character position closest to the given coordinates.
+// Input must be lineSpace-local ("div" coordinate system).
+export function coordsChar(cm, x, y) {
+  var doc = cm.doc;
+  y += cm.display.viewOffset;
+  if (y < 0) return PosWithInfo(doc.first, 0, true, -1);
+  var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
+  if (lineN > last)
+    return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);
+  if (x < 0) x = 0;
+
+  var lineObj = getLine(doc, lineN);
+  for (;;) {
+    var found = coordsCharInner(cm, lineObj, lineN, x, y);
+    var merged = collapsedSpanAtEnd(lineObj);
+    var mergedPos = merged && merged.find(0, true);
+    if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
+      lineN = lineNo(lineObj = mergedPos.to.line);
+    else
+      return found;
+  }
+}
+
+function coordsCharInner(cm, lineObj, lineNo, x, y) {
+  var innerOff = y - heightAtLine(lineObj);
+  var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
+  var preparedMeasure = prepareMeasureForLine(cm, lineObj);
+
+  function getX(ch) {
+    var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure);
+    wrongLine = true;
+    if (innerOff > sp.bottom) return sp.left - adjust;
+    else if (innerOff < sp.top) return sp.left + adjust;
+    else wrongLine = false;
+    return sp.left;
+  }
+
+  var bidi = getOrder(lineObj), dist = lineObj.text.length;
+  var from = lineLeft(lineObj), to = lineRight(lineObj);
+  var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;
+
+  if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1);
+  // Do a binary search between these bounds.
+  for (;;) {
+    if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
+      var ch = x < fromX || x - fromX <= toX - x ? from : to;
+      var outside = ch == from ? fromOutside : toOutside
+      var xDiff = x - (ch == from ? fromX : toX);
+      // This is a kludge to handle the case where the coordinates
+      // are after a line-wrapped line. We should replace it with a
+      // more general handling of cursor positions around line
+      // breaks. (Issue #4078)
+      if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
+          ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
+        var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right");
+        if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
+          outside = false
+          ch++
+          xDiff = x - charSize.right
+        }
+      }
+      while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
+      var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
+      return pos;
+    }
+    var step = Math.ceil(dist / 2), middle = from + step;
+    if (bidi) {
+      middle = from;
+      for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1);
+    }
+    var middleX = getX(middle);
+    if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;}
+    else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;}
+  }
+}
+
+var measureText;
+// Compute the default text height.
+export function textHeight(display) {
+  if (display.cachedTextHeight != null) return display.cachedTextHeight;
+  if (measureText == null) {
+    measureText = elt("pre");
+    // Measure a bunch of lines, for browsers that compute
+    // fractional heights.
+    for (var i = 0; i < 49; ++i) {
+      measureText.appendChild(document.createTextNode("x"));
+      measureText.appendChild(elt("br"));
+    }
+    measureText.appendChild(document.createTextNode("x"));
+  }
+  removeChildrenAndAdd(display.measure, measureText);
+  var height = measureText.offsetHeight / 50;
+  if (height > 3) display.cachedTextHeight = height;
+  removeChildren(display.measure);
+  return height || 1;
+}
+
+// Compute the default character width.
+export function charWidth(display) {
+  if (display.cachedCharWidth != null) return display.cachedCharWidth;
+  var anchor = elt("span", "xxxxxxxxxx");
+  var pre = elt("pre", [anchor]);
+  removeChildrenAndAdd(display.measure, pre);
+  var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
+  if (width > 2) display.cachedCharWidth = width;
+  return width || 10;
+}
+
+// Do a bulk-read of the DOM positions and sizes needed to draw the
+// view, so that we don't interleave reading and writing to the DOM.
+export function getDimensions(cm) {
+  var d = cm.display, left = {}, width = {};
+  var gutterLeft = d.gutters.clientLeft;
+  for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
+    left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
+    width[cm.options.gutters[i]] = n.clientWidth;
+  }
+  return {fixedPos: compensateForHScroll(d),
+          gutterTotalWidth: d.gutters.offsetWidth,
+          gutterLeft: left,
+          gutterWidth: width,
+          wrapperWidth: d.wrapper.clientWidth};
+}
+
+// Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
+// but using getBoundingClientRect to get a sub-pixel-accurate
+// result.
+export function compensateForHScroll(display) {
+  return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left;
+}
+
+// Returns a function that estimates the height of a line, to use as
+// first approximation until the line becomes visible (and is thus
+// properly measurable).
+export function estimateHeight(cm) {
+  var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
+  var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
+  return function(line) {
+    if (lineIsHidden(cm.doc, line)) return 0;
+
+    var widgetsHeight = 0;
+    if (line.widgets) for (var i = 0; i < line.widgets.length; i++) {
+      if (line.widgets[i].height) widgetsHeight += line.widgets[i].height;
+    }
+
+    if (wrapping)
+      return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th;
+    else
+      return widgetsHeight + th;
+  };
+}
+
+export function estimateLineHeights(cm) {
+  var doc = cm.doc, est = estimateHeight(cm);
+  doc.iter(function(line) {
+    var estHeight = est(line);
+    if (estHeight != line.height) updateLineHeight(line, estHeight);
+  });
+}
+
+// Given a mouse event, find the corresponding position. If liberal
+// is false, it checks whether a gutter or scrollbar was clicked,
+// and returns null if it was. forRect is used by rectangular
+// selections, and tries to estimate a character position even for
+// coordinates beyond the right of the text.
+export function posFromMouse(cm, e, liberal, forRect) {
+  var display = cm.display;
+  if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null;
+
+  var x, y, space = display.lineSpace.getBoundingClientRect();
+  // Fails unpredictably on IE[67] when mouse is dragged around quickly.
+  try { x = e.clientX - space.left; y = e.clientY - space.top; }
+  catch (e) { return null; }
+  var coords = coordsChar(cm, x, y), line;
+  if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
+    var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
+    coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
+  }
+  return coords;
+}
+
+// Find the view element corresponding to a given line. Return null
+// when the line isn't visible.
+export function findViewIndex(cm, n) {
+  if (n >= cm.display.viewTo) return null;
+  n -= cm.display.viewFrom;
+  if (n < 0) return null;
+  var view = cm.display.view;
+  for (var i = 0; i < view.length; i++) {
+    n -= view[i].size;
+    if (n < 0) return i;
+  }
+}
diff --git a/src/measurement/update_line.js b/src/measurement/update_line.js
new file mode 100644
index 0000000000..5cac95db3e
--- /dev/null
+++ b/src/measurement/update_line.js
@@ -0,0 +1,189 @@
+import { buildLineContent } from "../line/line_data";
+import { lineNumberFor } from "../line/utils_line";
+import { ie, ie_version } from "../util/browser";
+import { elt } from "../util/dom";
+import { signalLater } from "../util/operation_group";
+
+// When an aspect of a line changes, a string is added to
+// lineView.changes. This updates the relevant part of the line's
+// DOM structure.
+export function updateLineForChanges(cm, lineView, lineN, dims) {
+  for (var j = 0; j < lineView.changes.length; j++) {
+    var type = lineView.changes[j];
+    if (type == "text") updateLineText(cm, lineView);
+    else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
+    else if (type == "class") updateLineClasses(lineView);
+    else if (type == "widget") updateLineWidgets(cm, lineView, dims);
+  }
+  lineView.changes = null;
+}
+
+// Lines with gutter elements, widgets or a background class need to
+// be wrapped, and have the extra elements added to the wrapper div
+function ensureLineWrapped(lineView) {
+  if (lineView.node == lineView.text) {
+    lineView.node = elt("div", null, null, "position: relative");
+    if (lineView.text.parentNode)
+      lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
+    lineView.node.appendChild(lineView.text);
+    if (ie && ie_version < 8) lineView.node.style.zIndex = 2;
+  }
+  return lineView.node;
+}
+
+function updateLineBackground(lineView) {
+  var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
+  if (cls) cls += " CodeMirror-linebackground";
+  if (lineView.background) {
+    if (cls) lineView.background.className = cls;
+    else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
+  } else if (cls) {
+    var wrap = ensureLineWrapped(lineView);
+    lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
+  }
+}
+
+// Wrapper around buildLineContent which will reuse the structure
+// in display.externalMeasured when possible.
+function getLineContent(cm, lineView) {
+  var ext = cm.display.externalMeasured;
+  if (ext && ext.line == lineView.line) {
+    cm.display.externalMeasured = null;
+    lineView.measure = ext.measure;
+    return ext.built;
+  }
+  return buildLineContent(cm, lineView);
+}
+
+// Redraw the line's text. Interacts with the background and text
+// classes because the mode may output tokens that influence these
+// classes.
+function updateLineText(cm, lineView) {
+  var cls = lineView.text.className;
+  var built = getLineContent(cm, lineView);
+  if (lineView.text == lineView.node) lineView.node = built.pre;
+  lineView.text.parentNode.replaceChild(built.pre, lineView.text);
+  lineView.text = built.pre;
+  if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
+    lineView.bgClass = built.bgClass;
+    lineView.textClass = built.textClass;
+    updateLineClasses(lineView);
+  } else if (cls) {
+    lineView.text.className = cls;
+  }
+}
+
+function updateLineClasses(lineView) {
+  updateLineBackground(lineView);
+  if (lineView.line.wrapClass)
+    ensureLineWrapped(lineView).className = lineView.line.wrapClass;
+  else if (lineView.node != lineView.text)
+    lineView.node.className = "";
+  var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
+  lineView.text.className = textClass || "";
+}
+
+function updateLineGutter(cm, lineView, lineN, dims) {
+  if (lineView.gutter) {
+    lineView.node.removeChild(lineView.gutter);
+    lineView.gutter = null;
+  }
+  if (lineView.gutterBackground) {
+    lineView.node.removeChild(lineView.gutterBackground);
+    lineView.gutterBackground = null;
+  }
+  if (lineView.line.gutterClass) {
+    var wrap = ensureLineWrapped(lineView);
+    lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
+                                    "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
+                                    "px; width: " + dims.gutterTotalWidth + "px");
+    wrap.insertBefore(lineView.gutterBackground, lineView.text);
+  }
+  var markers = lineView.line.gutterMarkers;
+  if (cm.options.lineNumbers || markers) {
+    var wrap = ensureLineWrapped(lineView);
+    var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
+                                           (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px");
+    cm.display.input.setUneditable(gutterWrap);
+    wrap.insertBefore(gutterWrap, lineView.text);
+    if (lineView.line.gutterClass)
+      gutterWrap.className += " " + lineView.line.gutterClass;
+    if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
+      lineView.lineNumber = gutterWrap.appendChild(
+        elt("div", lineNumberFor(cm.options, lineN),
+            "CodeMirror-linenumber CodeMirror-gutter-elt",
+            "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
+            + cm.display.lineNumInnerWidth + "px"));
+    if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) {
+      var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
+      if (found)
+        gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
+                                   dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"));
+    }
+  }
+}
+
+function updateLineWidgets(cm, lineView, dims) {
+  if (lineView.alignable) lineView.alignable = null;
+  for (var node = lineView.node.firstChild, next; node; node = next) {
+    var next = node.nextSibling;
+    if (node.className == "CodeMirror-linewidget")
+      lineView.node.removeChild(node);
+  }
+  insertLineWidgets(cm, lineView, dims);
+}
+
+// Build a line's DOM representation from scratch
+export function buildLineElement(cm, lineView, lineN, dims) {
+  var built = getLineContent(cm, lineView);
+  lineView.text = lineView.node = built.pre;
+  if (built.bgClass) lineView.bgClass = built.bgClass;
+  if (built.textClass) lineView.textClass = built.textClass;
+
+  updateLineClasses(lineView);
+  updateLineGutter(cm, lineView, lineN, dims);
+  insertLineWidgets(cm, lineView, dims);
+  return lineView.node;
+}
+
+// A lineView may contain multiple logical lines (when merged by
+// collapsed spans). The widgets for all of them need to be drawn.
+function insertLineWidgets(cm, lineView, dims) {
+  insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
+  if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
+    insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false);
+}
+
+function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
+  if (!line.widgets) return;
+  var wrap = ensureLineWrapped(lineView);
+  for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
+    var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
+    if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
+    positionLineWidget(widget, node, lineView, dims);
+    cm.display.input.setUneditable(node);
+    if (allowAbove && widget.above)
+      wrap.insertBefore(node, lineView.gutter || lineView.text);
+    else
+      wrap.appendChild(node);
+    signalLater(widget, "redraw");
+  }
+}
+
+function positionLineWidget(widget, node, lineView, dims) {
+  if (widget.noHScroll) {
+    (lineView.alignable || (lineView.alignable = [])).push(node);
+    var width = dims.wrapperWidth;
+    node.style.left = dims.fixedPos + "px";
+    if (!widget.coverGutter) {
+      width -= dims.gutterTotalWidth;
+      node.style.paddingLeft = dims.gutterTotalWidth + "px";
+    }
+    node.style.width = width + "px";
+  }
+  if (widget.coverGutter) {
+    node.style.zIndex = 5;
+    node.style.position = "relative";
+    if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px";
+  }
+}
diff --git a/src/measurement/widgets.js b/src/measurement/widgets.js
new file mode 100644
index 0000000000..283740e2c0
--- /dev/null
+++ b/src/measurement/widgets.js
@@ -0,0 +1,26 @@
+import { contains, elt, removeChildrenAndAdd } from "../util/dom";
+import { e_target } from "../util/event";
+
+export function widgetHeight(widget) {
+  if (widget.height != null) return widget.height;
+  var cm = widget.doc.cm;
+  if (!cm) return 0;
+  if (!contains(document.body, widget.node)) {
+    var parentStyle = "position: relative;";
+    if (widget.coverGutter)
+      parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;";
+    if (widget.noHScroll)
+      parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
+    removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
+  }
+  return widget.height = widget.node.parentNode.offsetHeight;
+}
+
+// Return true when the given mouse event happened in a widget
+export function eventInWidget(display, e) {
+  for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
+    if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
+        (n.parentNode == display.sizer && n != display.mover))
+      return true;
+  }
+}
diff --git a/src/model/Doc.js b/src/model/Doc.js
new file mode 100644
index 0000000000..68d38c90d9
--- /dev/null
+++ b/src/model/Doc.js
@@ -0,0 +1,384 @@
+import CodeMirror from "../edit/CodeMirror";
+import { docMethodOp } from "../display/operations";
+import { Line } from "../line/line_data";
+import { clipPos, clipPosArray, Pos } from "../line/pos";
+import { visualLine } from "../line/spans";
+import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_line";
+import { classTest } from "../util/dom";
+import { splitLinesAuto } from "../util/feature_detection";
+import { createObj, map, sel_dontScroll } from "../util/misc";
+import { ensureCursorVisible } from "../display/scrolling";
+
+import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes";
+import { computeReplacedSel } from "./change_measurement";
+import { BranchChunk, LeafChunk } from "./chunk";
+import { linkedDocs, updateDoc } from "./document_data";
+import { copyHistoryArray, History } from "./history";
+import { addLineWidget } from "./line_widget";
+import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } from "./mark_text";
+import { normalizeSelection, Range, simpleSelection } from "./selection";
+import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates";
+
+var nextDocId = 0;
+var Doc = function(text, mode, firstLine, lineSep) {
+  if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep);
+  if (firstLine == null) firstLine = 0;
+
+  BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
+  this.first = firstLine;
+  this.scrollTop = this.scrollLeft = 0;
+  this.cantEdit = false;
+  this.cleanGeneration = 1;
+  this.frontier = firstLine;
+  var start = Pos(firstLine, 0);
+  this.sel = simpleSelection(start);
+  this.history = new History(null);
+  this.id = ++nextDocId;
+  this.modeOption = mode;
+  this.lineSep = lineSep;
+  this.extend = false;
+
+  if (typeof text == "string") text = this.splitLines(text);
+  updateDoc(this, {from: start, to: start, text: text});
+  setSelection(this, simpleSelection(start), sel_dontScroll);
+};
+
+Doc.prototype = createObj(BranchChunk.prototype, {
+  constructor: Doc,
+  // Iterate over the document. Supports two forms -- with only one
+  // argument, it calls that for each line in the document. With
+  // three, it iterates over the range given by the first two (with
+  // the second being non-inclusive).
+  iter: function(from, to, op) {
+    if (op) this.iterN(from - this.first, to - from, op);
+    else this.iterN(this.first, this.first + this.size, from);
+  },
+
+  // Non-public interface for adding and removing lines.
+  insert: function(at, lines) {
+    var height = 0;
+    for (var i = 0; i < lines.length; ++i) height += lines[i].height;
+    this.insertInner(at - this.first, lines, height);
+  },
+  remove: function(at, n) { this.removeInner(at - this.first, n); },
+
+  // From here, the methods are part of the public interface. Most
+  // are also available from CodeMirror (editor) instances.
+
+  getValue: function(lineSep) {
+    var lines = getLines(this, this.first, this.first + this.size);
+    if (lineSep === false) return lines;
+    return lines.join(lineSep || this.lineSeparator());
+  },
+  setValue: docMethodOp(function(code) {
+    var top = Pos(this.first, 0), last = this.first + this.size - 1;
+    makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
+                      text: this.splitLines(code), origin: "setValue", full: true}, true);
+    setSelection(this, simpleSelection(top));
+  }),
+  replaceRange: function(code, from, to, origin) {
+    from = clipPos(this, from);
+    to = to ? clipPos(this, to) : from;
+    replaceRange(this, code, from, to, origin);
+  },
+  getRange: function(from, to, lineSep) {
+    var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
+    if (lineSep === false) return lines;
+    return lines.join(lineSep || this.lineSeparator());
+  },
+
+  getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
+
+  getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
+  getLineNumber: function(line) {return lineNo(line);},
+
+  getLineHandleVisualStart: function(line) {
+    if (typeof line == "number") line = getLine(this, line);
+    return visualLine(line);
+  },
+
+  lineCount: function() {return this.size;},
+  firstLine: function() {return this.first;},
+  lastLine: function() {return this.first + this.size - 1;},
+
+  clipPos: function(pos) {return clipPos(this, pos);},
+
+  getCursor: function(start) {
+    var range = this.sel.primary(), pos;
+    if (start == null || start == "head") pos = range.head;
+    else if (start == "anchor") pos = range.anchor;
+    else if (start == "end" || start == "to" || start === false) pos = range.to();
+    else pos = range.from();
+    return pos;
+  },
+  listSelections: function() { return this.sel.ranges; },
+  somethingSelected: function() {return this.sel.somethingSelected();},
+
+  setCursor: docMethodOp(function(line, ch, options) {
+    setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
+  }),
+  setSelection: docMethodOp(function(anchor, head, options) {
+    setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
+  }),
+  extendSelection: docMethodOp(function(head, other, options) {
+    extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
+  }),
+  extendSelections: docMethodOp(function(heads, options) {
+    extendSelections(this, clipPosArray(this, heads), options);
+  }),
+  extendSelectionsBy: docMethodOp(function(f, options) {
+    var heads = map(this.sel.ranges, f);
+    extendSelections(this, clipPosArray(this, heads), options);
+  }),
+  setSelections: docMethodOp(function(ranges, primary, options) {
+    if (!ranges.length) return;
+    for (var i = 0, out = []; i < ranges.length; i++)
+      out[i] = new Range(clipPos(this, ranges[i].anchor),
+                         clipPos(this, ranges[i].head));
+    if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex);
+    setSelection(this, normalizeSelection(out, primary), options);
+  }),
+  addSelection: docMethodOp(function(anchor, head, options) {
+    var ranges = this.sel.ranges.slice(0);
+    ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
+    setSelection(this, normalizeSelection(ranges, ranges.length - 1), options);
+  }),
+
+  getSelection: function(lineSep) {
+    var ranges = this.sel.ranges, lines;
+    for (var i = 0; i < ranges.length; i++) {
+      var sel = getBetween(this, ranges[i].from(), ranges[i].to());
+      lines = lines ? lines.concat(sel) : sel;
+    }
+    if (lineSep === false) return lines;
+    else return lines.join(lineSep || this.lineSeparator());
+  },
+  getSelections: function(lineSep) {
+    var parts = [], ranges = this.sel.ranges;
+    for (var i = 0; i < ranges.length; i++) {
+      var sel = getBetween(this, ranges[i].from(), ranges[i].to());
+      if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator());
+      parts[i] = sel;
+    }
+    return parts;
+  },
+  replaceSelection: function(code, collapse, origin) {
+    var dup = [];
+    for (var i = 0; i < this.sel.ranges.length; i++)
+      dup[i] = code;
+    this.replaceSelections(dup, collapse, origin || "+input");
+  },
+  replaceSelections: docMethodOp(function(code, collapse, origin) {
+    var changes = [], sel = this.sel;
+    for (var i = 0; i < sel.ranges.length; i++) {
+      var range = sel.ranges[i];
+      changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
+    }
+    var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
+    for (var i = changes.length - 1; i >= 0; i--)
+      makeChange(this, changes[i]);
+    if (newSel) setSelectionReplaceHistory(this, newSel);
+    else if (this.cm) ensureCursorVisible(this.cm);
+  }),
+  undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
+  redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
+  undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
+  redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
+
+  setExtending: function(val) {this.extend = val;},
+  getExtending: function() {return this.extend;},
+
+  historySize: function() {
+    var hist = this.history, done = 0, undone = 0;
+    for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done;
+    for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
+    return {undo: done, redo: undone};
+  },
+  clearHistory: function() {this.history = new History(this.history.maxGeneration);},
+
+  markClean: function() {
+    this.cleanGeneration = this.changeGeneration(true);
+  },
+  changeGeneration: function(forceSplit) {
+    if (forceSplit)
+      this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null;
+    return this.history.generation;
+  },
+  isClean: function (gen) {
+    return this.history.generation == (gen || this.cleanGeneration);
+  },
+
+  getHistory: function() {
+    return {done: copyHistoryArray(this.history.done),
+            undone: copyHistoryArray(this.history.undone)};
+  },
+  setHistory: function(histData) {
+    var hist = this.history = new History(this.history.maxGeneration);
+    hist.done = copyHistoryArray(histData.done.slice(0), null, true);
+    hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
+  },
+
+  addLineClass: docMethodOp(function(handle, where, cls) {
+    return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+      var prop = where == "text" ? "textClass"
+               : where == "background" ? "bgClass"
+               : where == "gutter" ? "gutterClass" : "wrapClass";
+      if (!line[prop]) line[prop] = cls;
+      else if (classTest(cls).test(line[prop])) return false;
+      else line[prop] += " " + cls;
+      return true;
+    });
+  }),
+  removeLineClass: docMethodOp(function(handle, where, cls) {
+    return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+      var prop = where == "text" ? "textClass"
+               : where == "background" ? "bgClass"
+               : where == "gutter" ? "gutterClass" : "wrapClass";
+      var cur = line[prop];
+      if (!cur) return false;
+      else if (cls == null) line[prop] = null;
+      else {
+        var found = cur.match(classTest(cls));
+        if (!found) return false;
+        var end = found.index + found[0].length;
+        line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
+      }
+      return true;
+    });
+  }),
+
+  addLineWidget: docMethodOp(function(handle, node, options) {
+    return addLineWidget(this, handle, node, options);
+  }),
+  removeLineWidget: function(widget) { widget.clear(); },
+
+  markText: function(from, to, options) {
+    return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range");
+  },
+  setBookmark: function(pos, options) {
+    var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
+                    insertLeft: options && options.insertLeft,
+                    clearWhenEmpty: false, shared: options && options.shared,
+                    handleMouseEvents: options && options.handleMouseEvents};
+    pos = clipPos(this, pos);
+    return markText(this, pos, pos, realOpts, "bookmark");
+  },
+  findMarksAt: function(pos) {
+    pos = clipPos(this, pos);
+    var markers = [], spans = getLine(this, pos.line).markedSpans;
+    if (spans) for (var i = 0; i < spans.length; ++i) {
+      var span = spans[i];
+      if ((span.from == null || span.from <= pos.ch) &&
+          (span.to == null || span.to >= pos.ch))
+        markers.push(span.marker.parent || span.marker);
+    }
+    return markers;
+  },
+  findMarks: function(from, to, filter) {
+    from = clipPos(this, from); to = clipPos(this, to);
+    var found = [], lineNo = from.line;
+    this.iter(from.line, to.line + 1, function(line) {
+      var spans = line.markedSpans;
+      if (spans) for (var i = 0; i < spans.length; i++) {
+        var span = spans[i];
+        if (!(span.to != null && lineNo == from.line && from.ch >= span.to ||
+              span.from == null && lineNo != from.line ||
+              span.from != null && lineNo == to.line && span.from >= to.ch) &&
+            (!filter || filter(span.marker)))
+          found.push(span.marker.parent || span.marker);
+      }
+      ++lineNo;
+    });
+    return found;
+  },
+  getAllMarks: function() {
+    var markers = [];
+    this.iter(function(line) {
+      var sps = line.markedSpans;
+      if (sps) for (var i = 0; i < sps.length; ++i)
+        if (sps[i].from != null) markers.push(sps[i].marker);
+    });
+    return markers;
+  },
+
+  posFromIndex: function(off) {
+    var ch, lineNo = this.first, sepSize = this.lineSeparator().length;
+    this.iter(function(line) {
+      var sz = line.text.length + sepSize;
+      if (sz > off) { ch = off; return true; }
+      off -= sz;
+      ++lineNo;
+    });
+    return clipPos(this, Pos(lineNo, ch));
+  },
+  indexFromPos: function (coords) {
+    coords = clipPos(this, coords);
+    var index = coords.ch;
+    if (coords.line < this.first || coords.ch < 0) return 0;
+    var sepSize = this.lineSeparator().length;
+    this.iter(this.first, coords.line, function (line) {
+      index += line.text.length + sepSize;
+    });
+    return index;
+  },
+
+  copy: function(copyHistory) {
+    var doc = new Doc(getLines(this, this.first, this.first + this.size),
+                      this.modeOption, this.first, this.lineSep);
+    doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
+    doc.sel = this.sel;
+    doc.extend = false;
+    if (copyHistory) {
+      doc.history.undoDepth = this.history.undoDepth;
+      doc.setHistory(this.getHistory());
+    }
+    return doc;
+  },
+
+  linkedDoc: function(options) {
+    if (!options) options = {};
+    var from = this.first, to = this.first + this.size;
+    if (options.from != null && options.from > from) from = options.from;
+    if (options.to != null && options.to < to) to = options.to;
+    var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep);
+    if (options.sharedHist) copy.history = this.history;
+    (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
+    copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
+    copySharedMarkers(copy, findSharedMarkers(this));
+    return copy;
+  },
+  unlinkDoc: function(other) {
+    if (other instanceof CodeMirror) other = other.doc;
+    if (this.linked) for (var i = 0; i < this.linked.length; ++i) {
+      var link = this.linked[i];
+      if (link.doc != other) continue;
+      this.linked.splice(i, 1);
+      other.unlinkDoc(this);
+      detachSharedMarkers(findSharedMarkers(this));
+      break;
+    }
+    // If the histories were shared, split them again
+    if (other.history == this.history) {
+      var splitIds = [other.id];
+      linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
+      other.history = new History(null);
+      other.history.done = copyHistoryArray(this.history.done, splitIds);
+      other.history.undone = copyHistoryArray(this.history.undone, splitIds);
+    }
+  },
+  iterLinkedDocs: function(f) {linkedDocs(this, f);},
+
+  getMode: function() {return this.mode;},
+  getEditor: function() {return this.cm;},
+
+  splitLines: function(str) {
+    if (this.lineSep) return str.split(this.lineSep);
+    return splitLinesAuto(str);
+  },
+  lineSeparator: function() { return this.lineSep || "\n"; }
+});
+
+// Public alias.
+Doc.prototype.eachLine = Doc.prototype.iter;
+
+export default Doc;
diff --git a/src/model/change_measurement.js b/src/model/change_measurement.js
new file mode 100644
index 0000000000..cb2bb2d1d8
--- /dev/null
+++ b/src/model/change_measurement.js
@@ -0,0 +1,61 @@
+import { cmp, Pos } from "../line/pos";
+import { lst } from "../util/misc";
+
+import { normalizeSelection, Range, Selection } from "./selection";
+
+// Compute the position of the end of a change (its 'to' property
+// refers to the pre-change end).
+export function changeEnd(change) {
+  if (!change.text) return change.to;
+  return Pos(change.from.line + change.text.length - 1,
+             lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
+}
+
+// Adjust a position to refer to the post-change position of the
+// same text, or the end of the change if the change covers it.
+function adjustForChange(pos, change) {
+  if (cmp(pos, change.from) < 0) return pos;
+  if (cmp(pos, change.to) <= 0) return changeEnd(change);
+
+  var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
+  if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch;
+  return Pos(line, ch);
+}
+
+export function computeSelAfterChange(doc, change) {
+  var out = [];
+  for (var i = 0; i < doc.sel.ranges.length; i++) {
+    var range = doc.sel.ranges[i];
+    out.push(new Range(adjustForChange(range.anchor, change),
+                       adjustForChange(range.head, change)));
+  }
+  return normalizeSelection(out, doc.sel.primIndex);
+}
+
+function offsetPos(pos, old, nw) {
+  if (pos.line == old.line)
+    return Pos(nw.line, pos.ch - old.ch + nw.ch);
+  else
+    return Pos(nw.line + (pos.line - old.line), pos.ch);
+}
+
+// Used by replaceSelections to allow moving the selection to the
+// start or around the replaced test. Hint may be "start" or "around".
+export function computeReplacedSel(doc, changes, hint) {
+  var out = [];
+  var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
+  for (var i = 0; i < changes.length; i++) {
+    var change = changes[i];
+    var from = offsetPos(change.from, oldPrev, newPrev);
+    var to = offsetPos(changeEnd(change), oldPrev, newPrev);
+    oldPrev = change.to;
+    newPrev = to;
+    if (hint == "around") {
+      var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
+      out[i] = new Range(inv ? to : from, inv ? from : to);
+    } else {
+      out[i] = new Range(from, from);
+    }
+  }
+  return new Selection(out, doc.sel.primIndex);
+}
diff --git a/src/model/changes.js b/src/model/changes.js
new file mode 100644
index 0000000000..01526d2943
--- /dev/null
+++ b/src/model/changes.js
@@ -0,0 +1,329 @@
+import { startWorker } from "../display/highlight_worker";
+import { operation } from "../display/operations";
+import { regChange, regLineChange } from "../display/view_tracking";
+import { clipLine, clipPos, cmp, Pos } from "../line/pos";
+import { sawReadOnlySpans } from "../line/saw_special_spans";
+import { lineLength, removeReadOnlyRanges, stretchSpansOverChange, visualLine } from "../line/spans";
+import { getBetween, getLine, lineNo } from "../line/utils_line";
+import { estimateHeight } from "../measurement/position_measurement";
+import { hasHandler, signal, signalCursorActivity } from "../util/event";
+import { indexOf, lst, map, sel_dontScroll } from "../util/misc";
+import { signalLater } from "../util/operation_group";
+
+import { changeEnd, computeSelAfterChange } from "./change_measurement";
+import { isWholeLineUpdate, linkedDocs, updateDoc } from "./document_data";
+import { addChangeToHistory, historyChangeFromChange, mergeOldSpans, pushSelectionToHistory } from "./history";
+import { Range, Selection } from "./selection";
+import { setSelection, setSelectionNoUndo } from "./selection_updates";
+
+// UPDATING
+
+// Allow "beforeChange" event handlers to influence a change
+function filterChange(doc, change, update) {
+  var obj = {
+    canceled: false,
+    from: change.from,
+    to: change.to,
+    text: change.text,
+    origin: change.origin,
+    cancel: function() { this.canceled = true; }
+  };
+  if (update) obj.update = function(from, to, text, origin) {
+    if (from) this.from = clipPos(doc, from);
+    if (to) this.to = clipPos(doc, to);
+    if (text) this.text = text;
+    if (origin !== undefined) this.origin = origin;
+  };
+  signal(doc, "beforeChange", doc, obj);
+  if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj);
+
+  if (obj.canceled) return null;
+  return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin};
+}
+
+// Apply a change to a document, and add it to the document's
+// history, and propagating it to all linked documents.
+export function makeChange(doc, change, ignoreReadOnly) {
+  if (doc.cm) {
+    if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly);
+    if (doc.cm.state.suppressEdits) return;
+  }
+
+  if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
+    change = filterChange(doc, change, true);
+    if (!change) return;
+  }
+
+  // Possibly split or suppress the update based on the presence
+  // of read-only spans in its range.
+  var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
+  if (split) {
+    for (var i = split.length - 1; i >= 0; --i)
+      makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text});
+  } else {
+    makeChangeInner(doc, change);
+  }
+}
+
+function makeChangeInner(doc, change) {
+  if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return;
+  var selAfter = computeSelAfterChange(doc, change);
+  addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
+
+  makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
+  var rebased = [];
+
+  linkedDocs(doc, function(doc, sharedHist) {
+    if (!sharedHist && indexOf(rebased, doc.history) == -1) {
+      rebaseHist(doc.history, change);
+      rebased.push(doc.history);
+    }
+    makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
+  });
+}
+
+// Revert a change stored in a document's history.
+export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
+  if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return;
+
+  var hist = doc.history, event, selAfter = doc.sel;
+  var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
+
+  // Verify that there is a useable event (so that ctrl-z won't
+  // needlessly clear selection events)
+  for (var i = 0; i < source.length; i++) {
+    event = source[i];
+    if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
+      break;
+  }
+  if (i == source.length) return;
+  hist.lastOrigin = hist.lastSelOrigin = null;
+
+  for (;;) {
+    event = source.pop();
+    if (event.ranges) {
+      pushSelectionToHistory(event, dest);
+      if (allowSelectionOnly && !event.equals(doc.sel)) {
+        setSelection(doc, event, {clearRedo: false});
+        return;
+      }
+      selAfter = event;
+    }
+    else break;
+  }
+
+  // Build up a reverse change object to add to the opposite history
+  // stack (redo when undoing, and vice versa).
+  var antiChanges = [];
+  pushSelectionToHistory(selAfter, dest);
+  dest.push({changes: antiChanges, generation: hist.generation});
+  hist.generation = event.generation || ++hist.maxGeneration;
+
+  var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
+
+  for (var i = event.changes.length - 1; i >= 0; --i) {
+    var change = event.changes[i];
+    change.origin = type;
+    if (filter && !filterChange(doc, change, false)) {
+      source.length = 0;
+      return;
+    }
+
+    antiChanges.push(historyChangeFromChange(doc, change));
+
+    var after = i ? computeSelAfterChange(doc, change) : lst(source);
+    makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
+    if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)});
+    var rebased = [];
+
+    // Propagate to the linked documents
+    linkedDocs(doc, function(doc, sharedHist) {
+      if (!sharedHist && indexOf(rebased, doc.history) == -1) {
+        rebaseHist(doc.history, change);
+        rebased.push(doc.history);
+      }
+      makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
+    });
+  }
+}
+
+// Sub-views need their line numbers shifted when text is added
+// above or below them in the parent document.
+function shiftDoc(doc, distance) {
+  if (distance == 0) return;
+  doc.first += distance;
+  doc.sel = new Selection(map(doc.sel.ranges, function(range) {
+    return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
+                     Pos(range.head.line + distance, range.head.ch));
+  }), doc.sel.primIndex);
+  if (doc.cm) {
+    regChange(doc.cm, doc.first, doc.first - distance, distance);
+    for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
+      regLineChange(doc.cm, l, "gutter");
+  }
+}
+
+// More lower-level change function, handling only a single document
+// (not linked ones).
+function makeChangeSingleDoc(doc, change, selAfter, spans) {
+  if (doc.cm && !doc.cm.curOp)
+    return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans);
+
+  if (change.to.line < doc.first) {
+    shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
+    return;
+  }
+  if (change.from.line > doc.lastLine()) return;
+
+  // Clip the change to the size of this doc
+  if (change.from.line < doc.first) {
+    var shift = change.text.length - 1 - (doc.first - change.from.line);
+    shiftDoc(doc, shift);
+    change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
+              text: [lst(change.text)], origin: change.origin};
+  }
+  var last = doc.lastLine();
+  if (change.to.line > last) {
+    change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
+              text: [change.text[0]], origin: change.origin};
+  }
+
+  change.removed = getBetween(doc, change.from, change.to);
+
+  if (!selAfter) selAfter = computeSelAfterChange(doc, change);
+  if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
+  else updateDoc(doc, change, spans);
+  setSelectionNoUndo(doc, selAfter, sel_dontScroll);
+}
+
+// Handle the interaction of a change to a document with the editor
+// that this document is part of.
+function makeChangeSingleDocInEditor(cm, change, spans) {
+  var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
+
+  var recomputeMaxLength = false, checkWidthStart = from.line;
+  if (!cm.options.lineWrapping) {
+    checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
+    doc.iter(checkWidthStart, to.line + 1, function(line) {
+      if (line == display.maxLine) {
+        recomputeMaxLength = true;
+        return true;
+      }
+    });
+  }
+
+  if (doc.sel.contains(change.from, change.to) > -1)
+    signalCursorActivity(cm);
+
+  updateDoc(doc, change, spans, estimateHeight(cm));
+
+  if (!cm.options.lineWrapping) {
+    doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
+      var len = lineLength(line);
+      if (len > display.maxLineLength) {
+        display.maxLine = line;
+        display.maxLineLength = len;
+        display.maxLineChanged = true;
+        recomputeMaxLength = false;
+      }
+    });
+    if (recomputeMaxLength) cm.curOp.updateMaxLine = true;
+  }
+
+  // Adjust frontier, schedule worker
+  doc.frontier = Math.min(doc.frontier, from.line);
+  startWorker(cm, 400);
+
+  var lendiff = change.text.length - (to.line - from.line) - 1;
+  // Remember that these lines changed, for updating the display
+  if (change.full)
+    regChange(cm);
+  else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
+    regLineChange(cm, from.line, "text");
+  else
+    regChange(cm, from.line, to.line + 1, lendiff);
+
+  var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
+  if (changeHandler || changesHandler) {
+    var obj = {
+      from: from, to: to,
+      text: change.text,
+      removed: change.removed,
+      origin: change.origin
+    };
+    if (changeHandler) signalLater(cm, "change", cm, obj);
+    if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj);
+  }
+  cm.display.selForContextMenu = null;
+}
+
+export function replaceRange(doc, code, from, to, origin) {
+  if (!to) to = from;
+  if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
+  if (typeof code == "string") code = doc.splitLines(code);
+  makeChange(doc, {from: from, to: to, text: code, origin: origin});
+}
+
+// Rebasing/resetting history to deal with externally-sourced changes
+
+function rebaseHistSelSingle(pos, from, to, diff) {
+  if (to < pos.line) {
+    pos.line += diff;
+  } else if (from < pos.line) {
+    pos.line = from;
+    pos.ch = 0;
+  }
+}
+
+// Tries to rebase an array of history events given a change in the
+// document. If the change touches the same lines as the event, the
+// event, and everything 'behind' it, is discarded. If the change is
+// before the event, the event's positions are updated. Uses a
+// copy-on-write scheme for the positions, to avoid having to
+// reallocate them all on every rebase, but also avoid problems with
+// shared position objects being unsafely updated.
+function rebaseHistArray(array, from, to, diff) {
+  for (var i = 0; i < array.length; ++i) {
+    var sub = array[i], ok = true;
+    if (sub.ranges) {
+      if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
+      for (var j = 0; j < sub.ranges.length; j++) {
+        rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
+        rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
+      }
+      continue;
+    }
+    for (var j = 0; j < sub.changes.length; ++j) {
+      var cur = sub.changes[j];
+      if (to < cur.from.line) {
+        cur.from = Pos(cur.from.line + diff, cur.from.ch);
+        cur.to = Pos(cur.to.line + diff, cur.to.ch);
+      } else if (from <= cur.to.line) {
+        ok = false;
+        break;
+      }
+    }
+    if (!ok) {
+      array.splice(0, i + 1);
+      i = 0;
+    }
+  }
+}
+
+function rebaseHist(hist, change) {
+  var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
+  rebaseHistArray(hist.done, from, to, diff);
+  rebaseHistArray(hist.undone, from, to, diff);
+}
+
+// Utility for applying a change to a line by handle or number,
+// returning the number and optionally registering the line as
+// changed.
+export function changeLine(doc, handle, changeType, op) {
+  var no = handle, line = handle;
+  if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
+  else no = lineNo(handle);
+  if (no == null) return null;
+  if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType);
+  return line;
+}
diff --git a/src/model/chunk.js b/src/model/chunk.js
new file mode 100644
index 0000000000..28fd4153b5
--- /dev/null
+++ b/src/model/chunk.js
@@ -0,0 +1,157 @@
+import { cleanUpLine } from "../line/line_data";
+import { indexOf } from "../util/misc";
+import { signalLater } from "../util/operation_group";
+
+// The document is represented as a BTree consisting of leaves, with
+// chunk of lines in them, and branches, with up to ten leaves or
+// other branch nodes below them. The top node is always a branch
+// node, and is the document object itself (meaning it has
+// additional methods and properties).
+//
+// All nodes have parent links. The tree is used both to go from
+// line numbers to line objects, and to go from objects to numbers.
+// It also indexes by height, and is used to convert between height
+// and line object, and to find the total height of the document.
+//
+// See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
+
+export function LeafChunk(lines) {
+  this.lines = lines;
+  this.parent = null;
+  for (var i = 0, height = 0; i < lines.length; ++i) {
+    lines[i].parent = this;
+    height += lines[i].height;
+  }
+  this.height = height;
+}
+
+LeafChunk.prototype = {
+  chunkSize: function() { return this.lines.length; },
+  // Remove the n lines at offset 'at'.
+  removeInner: function(at, n) {
+    for (var i = at, e = at + n; i < e; ++i) {
+      var line = this.lines[i];
+      this.height -= line.height;
+      cleanUpLine(line);
+      signalLater(line, "delete");
+    }
+    this.lines.splice(at, n);
+  },
+  // Helper used to collapse a small branch into a single leaf.
+  collapse: function(lines) {
+    lines.push.apply(lines, this.lines);
+  },
+  // Insert the given array of lines at offset 'at', count them as
+  // having the given height.
+  insertInner: function(at, lines, height) {
+    this.height += height;
+    this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
+    for (var i = 0; i < lines.length; ++i) lines[i].parent = this;
+  },
+  // Used to iterate over a part of the tree.
+  iterN: function(at, n, op) {
+    for (var e = at + n; at < e; ++at)
+      if (op(this.lines[at])) return true;
+  }
+};
+
+export function BranchChunk(children) {
+  this.children = children;
+  var size = 0, height = 0;
+  for (var i = 0; i < children.length; ++i) {
+    var ch = children[i];
+    size += ch.chunkSize(); height += ch.height;
+    ch.parent = this;
+  }
+  this.size = size;
+  this.height = height;
+  this.parent = null;
+}
+
+BranchChunk.prototype = {
+  chunkSize: function() { return this.size; },
+  removeInner: function(at, n) {
+    this.size -= n;
+    for (var i = 0; i < this.children.length; ++i) {
+      var child = this.children[i], sz = child.chunkSize();
+      if (at < sz) {
+        var rm = Math.min(n, sz - at), oldHeight = child.height;
+        child.removeInner(at, rm);
+        this.height -= oldHeight - child.height;
+        if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
+        if ((n -= rm) == 0) break;
+        at = 0;
+      } else at -= sz;
+    }
+    // If the result is smaller than 25 lines, ensure that it is a
+    // single leaf node.
+    if (this.size - n < 25 &&
+        (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
+      var lines = [];
+      this.collapse(lines);
+      this.children = [new LeafChunk(lines)];
+      this.children[0].parent = this;
+    }
+  },
+  collapse: function(lines) {
+    for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines);
+  },
+  insertInner: function(at, lines, height) {
+    this.size += lines.length;
+    this.height += height;
+    for (var i = 0; i < this.children.length; ++i) {
+      var child = this.children[i], sz = child.chunkSize();
+      if (at <= sz) {
+        child.insertInner(at, lines, height);
+        if (child.lines && child.lines.length > 50) {
+          // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
+          // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
+          var remaining = child.lines.length % 25 + 25
+          for (var pos = remaining; pos < child.lines.length;) {
+            var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
+            child.height -= leaf.height;
+            this.children.splice(++i, 0, leaf);
+            leaf.parent = this;
+          }
+          child.lines = child.lines.slice(0, remaining);
+          this.maybeSpill();
+        }
+        break;
+      }
+      at -= sz;
+    }
+  },
+  // When a node has grown, check whether it should be split.
+  maybeSpill: function() {
+    if (this.children.length <= 10) return;
+    var me = this;
+    do {
+      var spilled = me.children.splice(me.children.length - 5, 5);
+      var sibling = new BranchChunk(spilled);
+      if (!me.parent) { // Become the parent node
+        var copy = new BranchChunk(me.children);
+        copy.parent = me;
+        me.children = [copy, sibling];
+        me = copy;
+     } else {
+        me.size -= sibling.size;
+        me.height -= sibling.height;
+        var myIndex = indexOf(me.parent.children, me);
+        me.parent.children.splice(myIndex + 1, 0, sibling);
+      }
+      sibling.parent = me.parent;
+    } while (me.children.length > 10);
+    me.parent.maybeSpill();
+  },
+  iterN: function(at, n, op) {
+    for (var i = 0; i < this.children.length; ++i) {
+      var child = this.children[i], sz = child.chunkSize();
+      if (at < sz) {
+        var used = Math.min(n, sz - at);
+        if (child.iterN(at, used, op)) return true;
+        if ((n -= used) == 0) break;
+        at = 0;
+      } else at -= sz;
+    }
+  }
+};
diff --git a/src/model/document_data.js b/src/model/document_data.js
new file mode 100644
index 0000000000..62ee034adf
--- /dev/null
+++ b/src/model/document_data.js
@@ -0,0 +1,97 @@
+import { loadMode } from "../display/mode_state";
+import { regChange } from "../display/view_tracking";
+import { Line, updateLine } from "../line/line_data";
+import { findMaxLine } from "../line/spans";
+import { getLine } from "../line/utils_line";
+import { estimateLineHeights } from "../measurement/position_measurement";
+import { lst } from "../util/misc";
+import { signalLater } from "../util/operation_group";
+
+// DOCUMENT DATA STRUCTURE
+
+// By default, updates that start and end at the beginning of a line
+// are treated specially, in order to make the association of line
+// widgets and marker elements with the text behave more intuitive.
+export function isWholeLineUpdate(doc, change) {
+  return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
+    (!doc.cm || doc.cm.options.wholeLineUpdateBefore);
+}
+
+// Perform a change on the document data structure.
+export function updateDoc(doc, change, markedSpans, estimateHeight) {
+  function spansFor(n) {return markedSpans ? markedSpans[n] : null;}
+  function update(line, text, spans) {
+    updateLine(line, text, spans, estimateHeight);
+    signalLater(line, "change", line, change);
+  }
+  function linesFor(start, end) {
+    for (var i = start, result = []; i < end; ++i)
+      result.push(new Line(text[i], spansFor(i), estimateHeight));
+    return result;
+  }
+
+  var from = change.from, to = change.to, text = change.text;
+  var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
+  var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
+
+  // Adjust the line structure
+  if (change.full) {
+    doc.insert(0, linesFor(0, text.length));
+    doc.remove(text.length, doc.size - text.length);
+  } else if (isWholeLineUpdate(doc, change)) {
+    // This is a whole-line replace. Treated specially to make
+    // sure line objects move the way they are supposed to.
+    var added = linesFor(0, text.length - 1);
+    update(lastLine, lastLine.text, lastSpans);
+    if (nlines) doc.remove(from.line, nlines);
+    if (added.length) doc.insert(from.line, added);
+  } else if (firstLine == lastLine) {
+    if (text.length == 1) {
+      update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
+    } else {
+      var added = linesFor(1, text.length - 1);
+      added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
+      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
+      doc.insert(from.line + 1, added);
+    }
+  } else if (text.length == 1) {
+    update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
+    doc.remove(from.line + 1, nlines);
+  } else {
+    update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
+    update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
+    var added = linesFor(1, text.length - 1);
+    if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
+    doc.insert(from.line + 1, added);
+  }
+
+  signalLater(doc, "change", doc, change);
+}
+
+// Call f for all linked documents.
+export function linkedDocs(doc, f, sharedHistOnly) {
+  function propagate(doc, skip, sharedHist) {
+    if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
+      var rel = doc.linked[i];
+      if (rel.doc == skip) continue;
+      var shared = sharedHist && rel.sharedHist;
+      if (sharedHistOnly && !shared) continue;
+      f(rel.doc, shared);
+      propagate(rel.doc, doc, shared);
+    }
+  }
+  propagate(doc, null, true);
+}
+
+// Attach a document to an editor.
+export function attachDoc(cm, doc) {
+  if (doc.cm) throw new Error("This document is already in use.");
+  cm.doc = doc;
+  doc.cm = cm;
+  estimateLineHeights(cm);
+  loadMode(cm);
+  if (!cm.options.lineWrapping) findMaxLine(cm);
+  cm.options.mode = doc.modeOption;
+  regChange(cm);
+}
+
diff --git a/src/model/history.js b/src/model/history.js
new file mode 100644
index 0000000000..8e34427330
--- /dev/null
+++ b/src/model/history.js
@@ -0,0 +1,224 @@
+import { cmp, copyPos } from "../line/pos";
+import { stretchSpansOverChange } from "../line/spans";
+import { getBetween } from "../line/utils_line";
+import { signal } from "../util/event";
+import { indexOf, lst } from "../util/misc";
+
+import { changeEnd } from "./change_measurement";
+import { linkedDocs } from "./document_data";
+import { Selection } from "./selection";
+
+export function History(startGen) {
+  // Arrays of change events and selections. Doing something adds an
+  // event to done and clears undo. Undoing moves events from done
+  // to undone, redoing moves them in the other direction.
+  this.done = []; this.undone = [];
+  this.undoDepth = Infinity;
+  // Used to track when changes can be merged into a single undo
+  // event
+  this.lastModTime = this.lastSelTime = 0;
+  this.lastOp = this.lastSelOp = null;
+  this.lastOrigin = this.lastSelOrigin = null;
+  // Used by the isClean() method
+  this.generation = this.maxGeneration = startGen || 1;
+}
+
+// Create a history change event from an updateDoc-style change
+// object.
+export function historyChangeFromChange(doc, change) {
+  var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
+  attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
+  linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
+  return histChange;
+}
+
+// Pop all selection events off the end of a history array. Stop at
+// a change event.
+function clearSelectionEvents(array) {
+  while (array.length) {
+    var last = lst(array);
+    if (last.ranges) array.pop();
+    else break;
+  }
+}
+
+// Find the top change event in the history. Pop off selection
+// events that are in the way.
+function lastChangeEvent(hist, force) {
+  if (force) {
+    clearSelectionEvents(hist.done);
+    return lst(hist.done);
+  } else if (hist.done.length && !lst(hist.done).ranges) {
+    return lst(hist.done);
+  } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
+    hist.done.pop();
+    return lst(hist.done);
+  }
+}
+
+// Register a change in the history. Merges changes that are within
+// a single operation, or are close together with an origin that
+// allows merging (starting with "+") into a single event.
+export function addChangeToHistory(doc, change, selAfter, opId) {
+  var hist = doc.history;
+  hist.undone.length = 0;
+  var time = +new Date, cur;
+
+  if ((hist.lastOp == opId ||
+       hist.lastOrigin == change.origin && change.origin &&
+       ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
+        change.origin.charAt(0) == "*")) &&
+      (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
+    // Merge this change into the last event
+    var last = lst(cur.changes);
+    if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
+      // Optimized case for simple insertion -- don't want to add
+      // new changesets for every character typed
+      last.to = changeEnd(change);
+    } else {
+      // Add new sub-event
+      cur.changes.push(historyChangeFromChange(doc, change));
+    }
+  } else {
+    // Can not be merged, start a new event.
+    var before = lst(hist.done);
+    if (!before || !before.ranges)
+      pushSelectionToHistory(doc.sel, hist.done);
+    cur = {changes: [historyChangeFromChange(doc, change)],
+           generation: hist.generation};
+    hist.done.push(cur);
+    while (hist.done.length > hist.undoDepth) {
+      hist.done.shift();
+      if (!hist.done[0].ranges) hist.done.shift();
+    }
+  }
+  hist.done.push(selAfter);
+  hist.generation = ++hist.maxGeneration;
+  hist.lastModTime = hist.lastSelTime = time;
+  hist.lastOp = hist.lastSelOp = opId;
+  hist.lastOrigin = hist.lastSelOrigin = change.origin;
+
+  if (!last) signal(doc, "historyAdded");
+}
+
+function selectionEventCanBeMerged(doc, origin, prev, sel) {
+  var ch = origin.charAt(0);
+  return ch == "*" ||
+    ch == "+" &&
+    prev.ranges.length == sel.ranges.length &&
+    prev.somethingSelected() == sel.somethingSelected() &&
+    new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500);
+}
+
+// Called whenever the selection changes, sets the new selection as
+// the pending selection in the history, and pushes the old pending
+// selection into the 'done' array when it was significantly
+// different (in number of selected ranges, emptiness, or time).
+export function addSelectionToHistory(doc, sel, opId, options) {
+  var hist = doc.history, origin = options && options.origin;
+
+  // A new event is started when the previous origin does not match
+  // the current, or the origins don't allow matching. Origins
+  // starting with * are always merged, those starting with + are
+  // merged when similar and close together in time.
+  if (opId == hist.lastSelOp ||
+      (origin && hist.lastSelOrigin == origin &&
+       (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
+        selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
+    hist.done[hist.done.length - 1] = sel;
+  else
+    pushSelectionToHistory(sel, hist.done);
+
+  hist.lastSelTime = +new Date;
+  hist.lastSelOrigin = origin;
+  hist.lastSelOp = opId;
+  if (options && options.clearRedo !== false)
+    clearSelectionEvents(hist.undone);
+}
+
+export function pushSelectionToHistory(sel, dest) {
+  var top = lst(dest);
+  if (!(top && top.ranges && top.equals(sel)))
+    dest.push(sel);
+}
+
+// Used to store marked span information in the history.
+function attachLocalSpans(doc, change, from, to) {
+  var existing = change["spans_" + doc.id], n = 0;
+  doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
+    if (line.markedSpans)
+      (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans;
+    ++n;
+  });
+}
+
+// When un/re-doing restores text containing marked spans, those
+// that have been explicitly cleared should not be restored.
+function removeClearedSpans(spans) {
+  if (!spans) return null;
+  for (var i = 0, out; i < spans.length; ++i) {
+    if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); }
+    else if (out) out.push(spans[i]);
+  }
+  return !out ? spans : out.length ? out : null;
+}
+
+// Retrieve and filter the old marked spans stored in a change event.
+function getOldSpans(doc, change) {
+  var found = change["spans_" + doc.id];
+  if (!found) return null;
+  for (var i = 0, nw = []; i < change.text.length; ++i)
+    nw.push(removeClearedSpans(found[i]));
+  return nw;
+}
+
+// Used for un/re-doing changes from the history. Combines the
+// result of computing the existing spans with the set of spans that
+// existed in the history (so that deleting around a span and then
+// undoing brings back the span).
+export function mergeOldSpans(doc, change) {
+  var old = getOldSpans(doc, change);
+  var stretched = stretchSpansOverChange(doc, change);
+  if (!old) return stretched;
+  if (!stretched) return old;
+
+  for (var i = 0; i < old.length; ++i) {
+    var oldCur = old[i], stretchCur = stretched[i];
+    if (oldCur && stretchCur) {
+      spans: for (var j = 0; j < stretchCur.length; ++j) {
+        var span = stretchCur[j];
+        for (var k = 0; k < oldCur.length; ++k)
+          if (oldCur[k].marker == span.marker) continue spans;
+        oldCur.push(span);
+      }
+    } else if (stretchCur) {
+      old[i] = stretchCur;
+    }
+  }
+  return old;
+}
+
+// Used both to provide a JSON-safe object in .getHistory, and, when
+// detaching a document, to split the history in two
+export function copyHistoryArray(events, newGroup, instantiateSel) {
+  for (var i = 0, copy = []; i < events.length; ++i) {
+    var event = events[i];
+    if (event.ranges) {
+      copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
+      continue;
+    }
+    var changes = event.changes, newChanges = [];
+    copy.push({changes: newChanges});
+    for (var j = 0; j < changes.length; ++j) {
+      var change = changes[j], m;
+      newChanges.push({from: change.from, to: change.to, text: change.text});
+      if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
+        if (indexOf(newGroup, Number(m[1])) > -1) {
+          lst(newChanges)[prop] = change[prop];
+          delete change[prop];
+        }
+      }
+    }
+  }
+  return copy;
+}
diff --git a/src/model/line_widget.js b/src/model/line_widget.js
new file mode 100644
index 0000000000..241327ce77
--- /dev/null
+++ b/src/model/line_widget.js
@@ -0,0 +1,67 @@
+import { runInOp } from "../display/operations";
+import { addToScrollPos } from "../display/scrolling";
+import { regLineChange } from "../display/view_tracking";
+import { heightAtLine, lineIsHidden } from "../line/spans";
+import { lineNo, updateLineHeight } from "../line/utils_line";
+import { widgetHeight } from "../measurement/widgets";
+import { changeLine } from "./changes";
+import { eventMixin } from "../util/event";
+
+// Line widgets are block elements displayed above or below a line.
+
+export function LineWidget(doc, node, options) {
+  if (options) for (var opt in options) if (options.hasOwnProperty(opt))
+    this[opt] = options[opt];
+  this.doc = doc;
+  this.node = node;
+}
+eventMixin(LineWidget);
+
+function adjustScrollWhenAboveVisible(cm, line, diff) {
+  if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
+    addToScrollPos(cm, null, diff);
+}
+
+LineWidget.prototype.clear = function() {
+  var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
+  if (no == null || !ws) return;
+  for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
+  if (!ws.length) line.widgets = null;
+  var height = widgetHeight(this);
+  updateLineHeight(line, Math.max(0, line.height - height));
+  if (cm) runInOp(cm, function() {
+    adjustScrollWhenAboveVisible(cm, line, -height);
+    regLineChange(cm, no, "widget");
+  });
+};
+LineWidget.prototype.changed = function() {
+  var oldH = this.height, cm = this.doc.cm, line = this.line;
+  this.height = null;
+  var diff = widgetHeight(this) - oldH;
+  if (!diff) return;
+  updateLineHeight(line, line.height + diff);
+  if (cm) runInOp(cm, function() {
+    cm.curOp.forceUpdate = true;
+    adjustScrollWhenAboveVisible(cm, line, diff);
+  });
+};
+
+export function addLineWidget(doc, handle, node, options) {
+  var widget = new LineWidget(doc, node, options);
+  var cm = doc.cm;
+  if (cm && widget.noHScroll) cm.display.alignWidgets = true;
+  changeLine(doc, handle, "widget", function(line) {
+    var widgets = line.widgets || (line.widgets = []);
+    if (widget.insertAt == null) widgets.push(widget);
+    else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
+    widget.line = line;
+    if (cm && !lineIsHidden(doc, line)) {
+      var aboveVisible = heightAtLine(line) < doc.scrollTop;
+      updateLineHeight(line, line.height + widgetHeight(widget));
+      if (aboveVisible) addToScrollPos(cm, null, widget.height);
+      cm.curOp.forceUpdate = true;
+    }
+    return true;
+  });
+  return widget;
+}
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
new file mode 100644
index 0000000000..7a334e5352
--- /dev/null
+++ b/src/model/mark_text.js
@@ -0,0 +1,288 @@
+import { elt } from "../util/dom";
+import { eventMixin, hasHandler, on } from "../util/event";
+import { endOperation, operation, runInOp, startOperation } from "../display/operations";
+import { clipPos, cmp, Pos } from "../line/pos";
+import { lineNo, updateLineHeight } from "../line/utils_line";
+import { clearLineMeasurementCacheFor, findViewForLine, textHeight } from "../measurement/position_measurement";
+import { seeReadOnlySpans, seeCollapsedSpans } from "../line/saw_special_spans";
+import { addMarkedSpan, conflictingCollapsedRange, getMarkedSpanFor, lineIsHidden, lineLength, MarkedSpan, removeMarkedSpan, visualLine } from "../line/spans";
+import { copyObj, indexOf, lst } from "../util/misc";
+import { signalLater } from "../util/operation_group";
+import { widgetHeight } from "../measurement/widgets";
+import { regChange, regLineChange } from "../display/view_tracking";
+
+import { linkedDocs } from "./document_data";
+import { addChangeToHistory } from "./history";
+import { reCheckSelection } from "./selection_updates";
+
+// TEXTMARKERS
+
+// Created with markText and setBookmark methods. A TextMarker is a
+// handle that can be used to clear or find a marked position in the
+// document. Line objects hold arrays (markedSpans) containing
+// {from, to, marker} object pointing to such marker objects, and
+// indicating that such a marker is present on that line. Multiple
+// lines may point to the same marker when it spans across lines.
+// The spans will have null for their from/to properties when the
+// marker continues beyond the start/end of the line. Markers have
+// links back to the lines they currently touch.
+
+var nextMarkerId = 0;
+
+export function TextMarker(doc, type) {
+  this.lines = [];
+  this.type = type;
+  this.doc = doc;
+  this.id = ++nextMarkerId;
+}
+eventMixin(TextMarker);
+
+// Clear the marker.
+TextMarker.prototype.clear = function() {
+  if (this.explicitlyCleared) return;
+  var cm = this.doc.cm, withOp = cm && !cm.curOp;
+  if (withOp) startOperation(cm);
+  if (hasHandler(this, "clear")) {
+    var found = this.find();
+    if (found) signalLater(this, "clear", found.from, found.to);
+  }
+  var min = null, max = null;
+  for (var i = 0; i < this.lines.length; ++i) {
+    var line = this.lines[i];
+    var span = getMarkedSpanFor(line.markedSpans, this);
+    if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text");
+    else if (cm) {
+      if (span.to != null) max = lineNo(line);
+      if (span.from != null) min = lineNo(line);
+    }
+    line.markedSpans = removeMarkedSpan(line.markedSpans, span);
+    if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
+      updateLineHeight(line, textHeight(cm.display));
+  }
+  if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
+    var visual = visualLine(this.lines[i]), len = lineLength(visual);
+    if (len > cm.display.maxLineLength) {
+      cm.display.maxLine = visual;
+      cm.display.maxLineLength = len;
+      cm.display.maxLineChanged = true;
+    }
+  }
+
+  if (min != null && cm && this.collapsed) regChange(cm, min, max + 1);
+  this.lines.length = 0;
+  this.explicitlyCleared = true;
+  if (this.atomic && this.doc.cantEdit) {
+    this.doc.cantEdit = false;
+    if (cm) reCheckSelection(cm.doc);
+  }
+  if (cm) signalLater(cm, "markerCleared", cm, this);
+  if (withOp) endOperation(cm);
+  if (this.parent) this.parent.clear();
+};
+
+// Find the position of the marker in the document. Returns a {from,
+// to} object by default. Side can be passed to get a specific side
+// -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
+// Pos objects returned contain a line object, rather than a line
+// number (used to prevent looking up the same line twice).
+TextMarker.prototype.find = function(side, lineObj) {
+  if (side == null && this.type == "bookmark") side = 1;
+  var from, to;
+  for (var i = 0; i < this.lines.length; ++i) {
+    var line = this.lines[i];
+    var span = getMarkedSpanFor(line.markedSpans, this);
+    if (span.from != null) {
+      from = Pos(lineObj ? line : lineNo(line), span.from);
+      if (side == -1) return from;
+    }
+    if (span.to != null) {
+      to = Pos(lineObj ? line : lineNo(line), span.to);
+      if (side == 1) return to;
+    }
+  }
+  return from && {from: from, to: to};
+};
+
+// Signals that the marker's widget changed, and surrounding layout
+// should be recomputed.
+TextMarker.prototype.changed = function() {
+  var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
+  if (!pos || !cm) return;
+  runInOp(cm, function() {
+    var line = pos.line, lineN = lineNo(pos.line);
+    var view = findViewForLine(cm, lineN);
+    if (view) {
+      clearLineMeasurementCacheFor(view);
+      cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
+    }
+    cm.curOp.updateMaxLine = true;
+    if (!lineIsHidden(widget.doc, line) && widget.height != null) {
+      var oldHeight = widget.height;
+      widget.height = null;
+      var dHeight = widgetHeight(widget) - oldHeight;
+      if (dHeight)
+        updateLineHeight(line, line.height + dHeight);
+    }
+  });
+};
+
+TextMarker.prototype.attachLine = function(line) {
+  if (!this.lines.length && this.doc.cm) {
+    var op = this.doc.cm.curOp;
+    if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
+      (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this);
+  }
+  this.lines.push(line);
+};
+TextMarker.prototype.detachLine = function(line) {
+  this.lines.splice(indexOf(this.lines, line), 1);
+  if (!this.lines.length && this.doc.cm) {
+    var op = this.doc.cm.curOp;
+    (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
+  }
+};
+
+// Collapsed markers have unique ids, in order to be able to order
+// them, which is needed for uniquely determining an outer marker
+// when they overlap (they may nest, but not partially overlap).
+var nextMarkerId = 0;
+
+// Create a marker, wire it up to the right lines, and
+export function markText(doc, from, to, options, type) {
+  // Shared markers (across linked documents) are handled separately
+  // (markTextShared will call out to this again, once per
+  // document).
+  if (options && options.shared) return markTextShared(doc, from, to, options, type);
+  // Ensure we are in an operation.
+  if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
+
+  var marker = new TextMarker(doc, type), diff = cmp(from, to);
+  if (options) copyObj(options, marker, false);
+  // Don't connect empty markers unless clearWhenEmpty is false
+  if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
+    return marker;
+  if (marker.replacedWith) {
+    // Showing up as a widget implies collapsed (widget replaces text)
+    marker.collapsed = true;
+    marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
+    if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true");
+    if (options.insertLeft) marker.widgetNode.insertLeft = true;
+  }
+  if (marker.collapsed) {
+    if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
+        from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
+      throw new Error("Inserting collapsed marker partially overlapping an existing one");
+    seeCollapsedSpans();
+  }
+
+  if (marker.addToHistory)
+    addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN);
+
+  var curLine = from.line, cm = doc.cm, updateMaxLine;
+  doc.iter(curLine, to.line + 1, function(line) {
+    if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
+      updateMaxLine = true;
+    if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0);
+    addMarkedSpan(line, new MarkedSpan(marker,
+                                       curLine == from.line ? from.ch : null,
+                                       curLine == to.line ? to.ch : null));
+    ++curLine;
+  });
+  // lineIsHidden depends on the presence of the spans, so needs a second pass
+  if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
+    if (lineIsHidden(doc, line)) updateLineHeight(line, 0);
+  });
+
+  if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear(); });
+
+  if (marker.readOnly) {
+    seeReadOnlySpans();
+    if (doc.history.done.length || doc.history.undone.length)
+      doc.clearHistory();
+  }
+  if (marker.collapsed) {
+    marker.id = ++nextMarkerId;
+    marker.atomic = true;
+  }
+  if (cm) {
+    // Sync editor state
+    if (updateMaxLine) cm.curOp.updateMaxLine = true;
+    if (marker.collapsed)
+      regChange(cm, from.line, to.line + 1);
+    else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
+      for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
+    if (marker.atomic) reCheckSelection(cm.doc);
+    signalLater(cm, "markerAdded", cm, marker);
+  }
+  return marker;
+}
+
+// SHARED TEXTMARKERS
+
+// A shared marker spans multiple linked documents. It is
+// implemented as a meta-marker-object controlling multiple normal
+// markers.
+export function SharedTextMarker(markers, primary) {
+  this.markers = markers;
+  this.primary = primary;
+  for (var i = 0; i < markers.length; ++i)
+    markers[i].parent = this;
+}
+eventMixin(SharedTextMarker);
+
+SharedTextMarker.prototype.clear = function() {
+  if (this.explicitlyCleared) return;
+  this.explicitlyCleared = true;
+  for (var i = 0; i < this.markers.length; ++i)
+    this.markers[i].clear();
+  signalLater(this, "clear");
+};
+SharedTextMarker.prototype.find = function(side, lineObj) {
+  return this.primary.find(side, lineObj);
+};
+
+function markTextShared(doc, from, to, options, type) {
+  options = copyObj(options);
+  options.shared = false;
+  var markers = [markText(doc, from, to, options, type)], primary = markers[0];
+  var widget = options.widgetNode;
+  linkedDocs(doc, function(doc) {
+    if (widget) options.widgetNode = widget.cloneNode(true);
+    markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
+    for (var i = 0; i < doc.linked.length; ++i)
+      if (doc.linked[i].isParent) return;
+    primary = lst(markers);
+  });
+  return new SharedTextMarker(markers, primary);
+}
+
+export function findSharedMarkers(doc) {
+  return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())),
+                       function(m) { return m.parent; });
+}
+
+export function copySharedMarkers(doc, markers) {
+  for (var i = 0; i < markers.length; i++) {
+    var marker = markers[i], pos = marker.find();
+    var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
+    if (cmp(mFrom, mTo)) {
+      var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
+      marker.markers.push(subMark);
+      subMark.parent = marker;
+    }
+  }
+}
+
+export function detachSharedMarkers(markers) {
+  for (var i = 0; i < markers.length; i++) {
+    var marker = markers[i], linked = [marker.primary.doc];
+    linkedDocs(marker.primary.doc, function(d) { linked.push(d); });
+    for (var j = 0; j < marker.markers.length; j++) {
+      var subMarker = marker.markers[j];
+      if (indexOf(linked, subMarker.doc) == -1) {
+        subMarker.parent = null;
+        marker.markers.splice(j--, 1);
+      }
+    }
+  }
+}
diff --git a/src/model/selection.js b/src/model/selection.js
new file mode 100644
index 0000000000..ce3c228c8b
--- /dev/null
+++ b/src/model/selection.js
@@ -0,0 +1,79 @@
+import { cmp, copyPos, maxPos, minPos } from "../line/pos";
+import { indexOf } from "../util/misc";
+
+// Selection objects are immutable. A new one is created every time
+// the selection changes. A selection is one or more non-overlapping
+// (and non-touching) ranges, sorted, and an integer that indicates
+// which one is the primary selection (the one that's scrolled into
+// view, that getCursor returns, etc).
+export function Selection(ranges, primIndex) {
+  this.ranges = ranges;
+  this.primIndex = primIndex;
+}
+
+Selection.prototype = {
+  primary: function() { return this.ranges[this.primIndex]; },
+  equals: function(other) {
+    if (other == this) return true;
+    if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false;
+    for (var i = 0; i < this.ranges.length; i++) {
+      var here = this.ranges[i], there = other.ranges[i];
+      if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false;
+    }
+    return true;
+  },
+  deepCopy: function() {
+    for (var out = [], i = 0; i < this.ranges.length; i++)
+      out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head));
+    return new Selection(out, this.primIndex);
+  },
+  somethingSelected: function() {
+    for (var i = 0; i < this.ranges.length; i++)
+      if (!this.ranges[i].empty()) return true;
+    return false;
+  },
+  contains: function(pos, end) {
+    if (!end) end = pos;
+    for (var i = 0; i < this.ranges.length; i++) {
+      var range = this.ranges[i];
+      if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
+        return i;
+    }
+    return -1;
+  }
+};
+
+export function Range(anchor, head) {
+  this.anchor = anchor; this.head = head;
+}
+
+Range.prototype = {
+  from: function() { return minPos(this.anchor, this.head); },
+  to: function() { return maxPos(this.anchor, this.head); },
+  empty: function() {
+    return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch;
+  }
+};
+
+// Take an unsorted, potentially overlapping set of ranges, and
+// build a selection out of it. 'Consumes' ranges array (modifying
+// it).
+export function normalizeSelection(ranges, primIndex) {
+  var prim = ranges[primIndex];
+  ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
+  primIndex = indexOf(ranges, prim);
+  for (var i = 1; i < ranges.length; i++) {
+    var cur = ranges[i], prev = ranges[i - 1];
+    if (cmp(prev.to(), cur.from()) >= 0) {
+      var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
+      var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
+      if (i <= primIndex) --primIndex;
+      ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
+    }
+  }
+  return new Selection(ranges, primIndex);
+}
+
+export function simpleSelection(anchor, head) {
+  return new Selection([new Range(anchor, head || anchor)], 0);
+}
diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
new file mode 100644
index 0000000000..e105afa9e0
--- /dev/null
+++ b/src/model/selection_updates.js
@@ -0,0 +1,205 @@
+import { signalLater } from "../util/operation_group";
+import { ensureCursorVisible } from "../display/scrolling";
+import { clipPos, cmp, Pos } from "../line/pos";
+import { getLine } from "../line/utils_line";
+import { hasHandler, signal, signalCursorActivity } from "../util/event";
+import { lst, sel_dontScroll } from "../util/misc";
+
+import { addSelectionToHistory } from "./history";
+import { normalizeSelection, Range, Selection, simpleSelection } from "./selection";
+
+// The 'scroll' parameter given to many of these indicated whether
+// the new cursor position should be scrolled into view after
+// modifying the selection.
+
+// If shift is held or the extend flag is set, extends a range to
+// include a given position (and optionally a second position).
+// Otherwise, simply returns the range between the given positions.
+// Used for cursor motion and such.
+export function extendRange(doc, range, head, other) {
+  if (doc.cm && doc.cm.display.shift || doc.extend) {
+    var anchor = range.anchor;
+    if (other) {
+      var posBefore = cmp(head, anchor) < 0;
+      if (posBefore != (cmp(other, anchor) < 0)) {
+        anchor = head;
+        head = other;
+      } else if (posBefore != (cmp(head, other) < 0)) {
+        head = other;
+      }
+    }
+    return new Range(anchor, head);
+  } else {
+    return new Range(other || head, head);
+  }
+}
+
+// Extend the primary selection range, discard the rest.
+export function extendSelection(doc, head, other, options) {
+  setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options);
+}
+
+// Extend all selections (pos is an array of selections with length
+// equal the number of selections)
+export function extendSelections(doc, heads, options) {
+  for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
+    out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
+  var newSel = normalizeSelection(out, doc.sel.primIndex);
+  setSelection(doc, newSel, options);
+}
+
+// Updates a single range in the selection.
+export function replaceOneSelection(doc, i, range, options) {
+  var ranges = doc.sel.ranges.slice(0);
+  ranges[i] = range;
+  setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options);
+}
+
+// Reset the selection to a single range.
+export function setSimpleSelection(doc, anchor, head, options) {
+  setSelection(doc, simpleSelection(anchor, head), options);
+}
+
+// Give beforeSelectionChange handlers a change to influence a
+// selection update.
+function filterSelectionChange(doc, sel, options) {
+  var obj = {
+    ranges: sel.ranges,
+    update: function(ranges) {
+      this.ranges = [];
+      for (var i = 0; i < ranges.length; i++)
+        this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
+                                   clipPos(doc, ranges[i].head));
+    },
+    origin: options && options.origin
+  };
+  signal(doc, "beforeSelectionChange", doc, obj);
+  if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
+  if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1);
+  else return sel;
+}
+
+export function setSelectionReplaceHistory(doc, sel, options) {
+  var done = doc.history.done, last = lst(done);
+  if (last && last.ranges) {
+    done[done.length - 1] = sel;
+    setSelectionNoUndo(doc, sel, options);
+  } else {
+    setSelection(doc, sel, options);
+  }
+}
+
+// Set a new selection.
+export function setSelection(doc, sel, options) {
+  setSelectionNoUndo(doc, sel, options);
+  addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
+}
+
+export function setSelectionNoUndo(doc, sel, options) {
+  if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
+    sel = filterSelectionChange(doc, sel, options);
+
+  var bias = options && options.bias ||
+    (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
+  setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
+
+  if (!(options && options.scroll === false) && doc.cm)
+    ensureCursorVisible(doc.cm);
+}
+
+function setSelectionInner(doc, sel) {
+  if (sel.equals(doc.sel)) return;
+
+  doc.sel = sel;
+
+  if (doc.cm) {
+    doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;
+    signalCursorActivity(doc.cm);
+  }
+  signalLater(doc, "cursorActivity", doc);
+}
+
+// Verify that the selection does not partially select any atomic
+// marked ranges.
+export function reCheckSelection(doc) {
+  setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll);
+}
+
+// Return a selection that does not partially select any atomic
+// ranges.
+function skipAtomicInSelection(doc, sel, bias, mayClear) {
+  var out;
+  for (var i = 0; i < sel.ranges.length; i++) {
+    var range = sel.ranges[i];
+    var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
+    var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
+    var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
+    if (out || newAnchor != range.anchor || newHead != range.head) {
+      if (!out) out = sel.ranges.slice(0, i);
+      out[i] = new Range(newAnchor, newHead);
+    }
+  }
+  return out ? normalizeSelection(out, sel.primIndex) : sel;
+}
+
+function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
+  var line = getLine(doc, pos.line);
+  if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
+    var sp = line.markedSpans[i], m = sp.marker;
+    if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+        (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+      if (mayClear) {
+        signal(m, "beforeCursorEnter");
+        if (m.explicitlyCleared) {
+          if (!line.markedSpans) break;
+          else {--i; continue;}
+        }
+      }
+      if (!m.atomic) continue;
+
+      if (oldPos) {
+        var near = m.find(dir < 0 ? 1 : -1), diff;
+        if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+          near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null);
+        if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
+          return skipAtomicInner(doc, near, pos, dir, mayClear);
+      }
+
+      var far = m.find(dir < 0 ? -1 : 1);
+      if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+        far = movePos(doc, far, dir, far.line == pos.line ? line : null);
+      return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
+    }
+  }
+  return pos;
+}
+
+// Ensure a given position is not inside an atomic range.
+export function skipAtomic(doc, pos, oldPos, bias, mayClear) {
+  var dir = bias || 1;
+  var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
+      (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
+      skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
+      (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
+  if (!found) {
+    doc.cantEdit = true;
+    return Pos(doc.first, 0);
+  }
+  return found;
+}
+
+function movePos(doc, pos, dir, line) {
+  if (dir < 0 && pos.ch == 0) {
+    if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1));
+    else return null;
+  } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
+    if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0);
+    else return null;
+  } else {
+    return new Pos(pos.line, pos.ch + dir);
+  }
+}
+
+export function selectAll(cm) {
+  cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);
+}
diff --git a/src/modes.js b/src/modes.js
new file mode 100644
index 0000000000..ed5e918039
--- /dev/null
+++ b/src/modes.js
@@ -0,0 +1,95 @@
+import { copyObj, createObj } from "./util/misc";
+
+// Known modes, by name and by MIME
+export var modes = {}, mimeModes = {};
+
+// Extra arguments are stored as the mode's dependencies, which is
+// used by (legacy) mechanisms like loadmode.js to automatically
+// load a mode. (Preferred mechanism is the require/define calls.)
+export function defineMode(name, mode) {
+  if (arguments.length > 2)
+    mode.dependencies = Array.prototype.slice.call(arguments, 2);
+  modes[name] = mode;
+}
+
+export function defineMIME(mime, spec) {
+  mimeModes[mime] = spec;
+}
+
+// Given a MIME type, a {name, ...options} config object, or a name
+// string, return a mode config object.
+export function resolveMode(spec) {
+  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
+    spec = mimeModes[spec];
+  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
+    var found = mimeModes[spec.name];
+    if (typeof found == "string") found = {name: found};
+    spec = createObj(found, spec);
+    spec.name = found.name;
+  } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
+    return resolveMode("application/xml");
+  } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {
+    return resolveMode("application/json");
+  }
+  if (typeof spec == "string") return {name: spec};
+  else return spec || {name: "null"};
+}
+
+// Given a mode spec (anything that resolveMode accepts), find and
+// initialize an actual mode object.
+export function getMode(options, spec) {
+  var spec = resolveMode(spec);
+  var mfactory = modes[spec.name];
+  if (!mfactory) return getMode(options, "text/plain");
+  var modeObj = mfactory(options, spec);
+  if (modeExtensions.hasOwnProperty(spec.name)) {
+    var exts = modeExtensions[spec.name];
+    for (var prop in exts) {
+      if (!exts.hasOwnProperty(prop)) continue;
+      if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
+      modeObj[prop] = exts[prop];
+    }
+  }
+  modeObj.name = spec.name;
+  if (spec.helperType) modeObj.helperType = spec.helperType;
+  if (spec.modeProps) for (var prop in spec.modeProps)
+    modeObj[prop] = spec.modeProps[prop];
+
+  return modeObj;
+}
+
+// This can be used to attach properties to mode objects from
+// outside the actual mode definition.
+export var modeExtensions = {};
+export function extendMode(mode, properties) {
+  var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
+  copyObj(properties, exts);
+}
+
+export function copyState(mode, state) {
+  if (state === true) return state;
+  if (mode.copyState) return mode.copyState(state);
+  var nstate = {};
+  for (var n in state) {
+    var val = state[n];
+    if (val instanceof Array) val = val.concat([]);
+    nstate[n] = val;
+  }
+  return nstate;
+}
+
+// Given a mode and a state (for that mode), find the inner mode and
+// state at the position that the state refers to.
+export function innerMode(mode, state) {
+  while (mode.innerMode) {
+    var info = mode.innerMode(state);
+    if (!info || info.mode == mode) break;
+    state = info.state;
+    mode = info.mode;
+  }
+  return info || {mode: mode, state: state};
+}
+
+export function startState(mode, a1, a2) {
+  return mode.startState ? mode.startState(a1, a2) : true;
+}
diff --git a/src/util/StringStream.js b/src/util/StringStream.js
new file mode 100644
index 0000000000..f07357befc
--- /dev/null
+++ b/src/util/StringStream.js
@@ -0,0 +1,80 @@
+import { countColumn } from "./misc";
+
+// STRING STREAM
+
+// Fed to the mode parsers, provides helper functions to make
+// parsers more succinct.
+
+var StringStream = function(string, tabSize) {
+  this.pos = this.start = 0;
+  this.string = string;
+  this.tabSize = tabSize || 8;
+  this.lastColumnPos = this.lastColumnValue = 0;
+  this.lineStart = 0;
+};
+
+StringStream.prototype = {
+  eol: function() {return this.pos >= this.string.length;},
+  sol: function() {return this.pos == this.lineStart;},
+  peek: function() {return this.string.charAt(this.pos) || undefined;},
+  next: function() {
+    if (this.pos < this.string.length)
+      return this.string.charAt(this.pos++);
+  },
+  eat: function(match) {
+    var ch = this.string.charAt(this.pos);
+    if (typeof match == "string") var ok = ch == match;
+    else var ok = ch && (match.test ? match.test(ch) : match(ch));
+    if (ok) {++this.pos; return ch;}
+  },
+  eatWhile: function(match) {
+    var start = this.pos;
+    while (this.eat(match)){}
+    return this.pos > start;
+  },
+  eatSpace: function() {
+    var start = this.pos;
+    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
+    return this.pos > start;
+  },
+  skipToEnd: function() {this.pos = this.string.length;},
+  skipTo: function(ch) {
+    var found = this.string.indexOf(ch, this.pos);
+    if (found > -1) {this.pos = found; return true;}
+  },
+  backUp: function(n) {this.pos -= n;},
+  column: function() {
+    if (this.lastColumnPos < this.start) {
+      this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
+      this.lastColumnPos = this.start;
+    }
+    return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
+  },
+  indentation: function() {
+    return countColumn(this.string, null, this.tabSize) -
+      (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
+  },
+  match: function(pattern, consume, caseInsensitive) {
+    if (typeof pattern == "string") {
+      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
+      var substr = this.string.substr(this.pos, pattern.length);
+      if (cased(substr) == cased(pattern)) {
+        if (consume !== false) this.pos += pattern.length;
+        return true;
+      }
+    } else {
+      var match = this.string.slice(this.pos).match(pattern);
+      if (match && match.index > 0) return null;
+      if (match && consume !== false) this.pos += match[0].length;
+      return match;
+    }
+  },
+  current: function(){return this.string.slice(this.start, this.pos);},
+  hideFirstChars: function(n, inner) {
+    this.lineStart += n;
+    try { return inner(); }
+    finally { this.lineStart -= n; }
+  }
+};
+
+export default StringStream;
diff --git a/src/util/bidi.js b/src/util/bidi.js
new file mode 100644
index 0000000000..776319d022
--- /dev/null
+++ b/src/util/bidi.js
@@ -0,0 +1,274 @@
+import { isExtendingChar, lst } from "./misc";
+
+// BIDI HELPERS
+
+export function iterateBidiSections(order, from, to, f) {
+  if (!order) return f(from, to, "ltr");
+  var found = false;
+  for (var i = 0; i < order.length; ++i) {
+    var part = order[i];
+    if (part.from < to && part.to > from || from == to && part.to == from) {
+      f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
+      found = true;
+    }
+  }
+  if (!found) f(from, to, "ltr");
+}
+
+export function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
+export function bidiRight(part) { return part.level % 2 ? part.from : part.to; }
+
+export function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; }
+export function lineRight(line) {
+  var order = getOrder(line);
+  if (!order) return line.text.length;
+  return bidiRight(lst(order));
+}
+
+function compareBidiLevel(order, a, b) {
+  var linedir = order[0].level;
+  if (a == linedir) return true;
+  if (b == linedir) return false;
+  return a < b;
+}
+
+export var bidiOther = null;
+export function getBidiPartAt(order, pos) {
+  bidiOther = null;
+  for (var i = 0, found; i < order.length; ++i) {
+    var cur = order[i];
+    if (cur.from < pos && cur.to > pos) return i;
+    if ((cur.from == pos || cur.to == pos)) {
+      if (found == null) {
+        found = i;
+      } else if (compareBidiLevel(order, cur.level, order[found].level)) {
+        if (cur.from != cur.to) bidiOther = found;
+        return i;
+      } else {
+        if (cur.from != cur.to) bidiOther = i;
+        return found;
+      }
+    }
+  }
+  return found;
+}
+
+function moveInLine(line, pos, dir, byUnit) {
+  if (!byUnit) return pos + dir;
+  do pos += dir;
+  while (pos > 0 && isExtendingChar(line.text.charAt(pos)));
+  return pos;
+}
+
+// This is needed in order to move 'visually' through bi-directional
+// text -- i.e., pressing left should make the cursor go left, even
+// when in RTL text. The tricky part is the 'jumps', where RTL and
+// LTR text touch each other. This often requires the cursor offset
+// to move more than one unit, in order to visually move one unit.
+export function moveVisually(line, start, dir, byUnit) {
+  var bidi = getOrder(line);
+  if (!bidi) return moveLogically(line, start, dir, byUnit);
+  var pos = getBidiPartAt(bidi, start), part = bidi[pos];
+  var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit);
+
+  for (;;) {
+    if (target > part.from && target < part.to) return target;
+    if (target == part.from || target == part.to) {
+      if (getBidiPartAt(bidi, target) == pos) return target;
+      part = bidi[pos += dir];
+      return (dir > 0) == part.level % 2 ? part.to : part.from;
+    } else {
+      part = bidi[pos += dir];
+      if (!part) return null;
+      if ((dir > 0) == part.level % 2)
+        target = moveInLine(line, part.to, -1, byUnit);
+      else
+        target = moveInLine(line, part.from, 1, byUnit);
+    }
+  }
+}
+
+export function moveLogically(line, start, dir, byUnit) {
+  var target = start + dir;
+  if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir;
+  return target < 0 || target > line.text.length ? null : target;
+}
+
+// Bidirectional ordering algorithm
+// See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
+// that this (partially) implements.
+
+// One-char codes used for character types:
+// L (L):   Left-to-Right
+// R (R):   Right-to-Left
+// r (AL):  Right-to-Left Arabic
+// 1 (EN):  European Number
+// + (ES):  European Number Separator
+// % (ET):  European Number Terminator
+// n (AN):  Arabic Number
+// , (CS):  Common Number Separator
+// m (NSM): Non-Spacing Mark
+// b (BN):  Boundary Neutral
+// s (B):   Paragraph Separator
+// t (S):   Segment Separator
+// w (WS):  Whitespace
+// N (ON):  Other Neutrals
+
+// Returns null if characters are ordered as they appear
+// (left-to-right), or an array of sections ({from, to, level}
+// objects) in the order in which they occur visually.
+export var bidiOrdering = (function() {
+  // Character types for codepoints 0 to 0xff
+  var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
+  // Character types for codepoints 0x600 to 0x6ff
+  var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm";
+  function charType(code) {
+    if (code <= 0xf7) return lowTypes.charAt(code);
+    else if (0x590 <= code && code <= 0x5f4) return "R";
+    else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600);
+    else if (0x6ee <= code && code <= 0x8ac) return "r";
+    else if (0x2000 <= code && code <= 0x200b) return "w";
+    else if (code == 0x200c) return "b";
+    else return "L";
+  }
+
+  var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
+  var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
+  // Browsers seem to always treat the boundaries of block elements as being L.
+  var outerType = "L";
+
+  function BidiSpan(level, from, to) {
+    this.level = level;
+    this.from = from; this.to = to;
+  }
+
+  return function(str) {
+    if (!bidiRE.test(str)) return false;
+    var len = str.length, types = [];
+    for (var i = 0, type; i < len; ++i)
+      types.push(type = charType(str.charCodeAt(i)));
+
+    // W1. Examine each non-spacing mark (NSM) in the level run, and
+    // change the type of the NSM to the type of the previous
+    // character. If the NSM is at the start of the level run, it will
+    // get the type of sor.
+    for (var i = 0, prev = outerType; i < len; ++i) {
+      var type = types[i];
+      if (type == "m") types[i] = prev;
+      else prev = type;
+    }
+
+    // W2. Search backwards from each instance of a European number
+    // until the first strong type (R, L, AL, or sor) is found. If an
+    // AL is found, change the type of the European number to Arabic
+    // number.
+    // W3. Change all ALs to R.
+    for (var i = 0, cur = outerType; i < len; ++i) {
+      var type = types[i];
+      if (type == "1" && cur == "r") types[i] = "n";
+      else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R"; }
+    }
+
+    // W4. A single European separator between two European numbers
+    // changes to a European number. A single common separator between
+    // two numbers of the same type changes to that type.
+    for (var i = 1, prev = types[0]; i < len - 1; ++i) {
+      var type = types[i];
+      if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1";
+      else if (type == "," && prev == types[i+1] &&
+               (prev == "1" || prev == "n")) types[i] = prev;
+      prev = type;
+    }
+
+    // W5. A sequence of European terminators adjacent to European
+    // numbers changes to all European numbers.
+    // W6. Otherwise, separators and terminators change to Other
+    // Neutral.
+    for (var i = 0; i < len; ++i) {
+      var type = types[i];
+      if (type == ",") types[i] = "N";
+      else if (type == "%") {
+        for (var end = i + 1; end < len && types[end] == "%"; ++end) {}
+        var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
+        for (var j = i; j < end; ++j) types[j] = replace;
+        i = end - 1;
+      }
+    }
+
+    // W7. Search backwards from each instance of a European number
+    // until the first strong type (R, L, or sor) is found. If an L is
+    // found, then change the type of the European number to L.
+    for (var i = 0, cur = outerType; i < len; ++i) {
+      var type = types[i];
+      if (cur == "L" && type == "1") types[i] = "L";
+      else if (isStrong.test(type)) cur = type;
+    }
+
+    // N1. A sequence of neutrals takes the direction of the
+    // surrounding strong text if the text on both sides has the same
+    // direction. European and Arabic numbers act as if they were R in
+    // terms of their influence on neutrals. Start-of-level-run (sor)
+    // and end-of-level-run (eor) are used at level run boundaries.
+    // N2. Any remaining neutrals take the embedding direction.
+    for (var i = 0; i < len; ++i) {
+      if (isNeutral.test(types[i])) {
+        for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
+        var before = (i ? types[i-1] : outerType) == "L";
+        var after = (end < len ? types[end] : outerType) == "L";
+        var replace = before || after ? "L" : "R";
+        for (var j = i; j < end; ++j) types[j] = replace;
+        i = end - 1;
+      }
+    }
+
+    // Here we depart from the documented algorithm, in order to avoid
+    // building up an actual levels array. Since there are only three
+    // levels (0, 1, 2) in an implementation that doesn't take
+    // explicit embedding into account, we can build up the order on
+    // the fly, without following the level-based algorithm.
+    var order = [], m;
+    for (var i = 0; i < len;) {
+      if (countsAsLeft.test(types[i])) {
+        var start = i;
+        for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
+        order.push(new BidiSpan(0, start, i));
+      } else {
+        var pos = i, at = order.length;
+        for (++i; i < len && types[i] != "L"; ++i) {}
+        for (var j = pos; j < i;) {
+          if (countsAsNum.test(types[j])) {
+            if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j));
+            var nstart = j;
+            for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
+            order.splice(at, 0, new BidiSpan(2, nstart, j));
+            pos = j;
+          } else ++j;
+        }
+        if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i));
+      }
+    }
+    if (order[0].level == 1 && (m = str.match(/^\s+/))) {
+      order[0].from = m[0].length;
+      order.unshift(new BidiSpan(0, 0, m[0].length));
+    }
+    if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
+      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));
+
+    return order;
+  };
+})();
+
+// Get the bidi ordering for the given line (and cache it). Returns
+// false for lines that are fully left-to-right, and an array of
+// BidiSpan objects otherwise.
+export function getOrder(line) {
+  var order = line.order;
+  if (order == null) order = line.order = bidiOrdering(line.text);
+  return order;
+}
diff --git a/src/util/browser.js b/src/util/browser.js
new file mode 100644
index 0000000000..7941f930d7
--- /dev/null
+++ b/src/util/browser.js
@@ -0,0 +1,31 @@
+// Kludges for bugs and behavior differences that can't be feature
+// detected are enabled based on userAgent etc sniffing.
+var userAgent = navigator.userAgent;
+var platform = navigator.platform;
+
+export var gecko = /gecko\/\d/i.test(userAgent);
+var ie_upto10 = /MSIE \d/.test(userAgent);
+var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
+export var ie = ie_upto10 || ie_11up;
+export var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
+export var webkit = /WebKit\//.test(userAgent);
+var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
+export var chrome = /Chrome\//.test(userAgent);
+export var presto = /Opera\//.test(userAgent);
+export var safari = /Apple Computer/.test(navigator.vendor);
+export var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
+export var phantom = /PhantomJS/.test(userAgent);
+
+export var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
+// This is woefully incomplete. Suggestions for alternative methods welcome.
+export var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
+export var mac = ios || /Mac/.test(platform);
+export var chromeOS = /\bCrOS\b/.test(userAgent);
+export var windows = /win/i.test(platform);
+
+var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
+if (presto_version) presto_version = Number(presto_version[1]);
+if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
+// Some browsers use the wrong event properties to signal cmd/ctrl on OS X
+export var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
+export var captureRightClick = gecko || (ie && ie_version >= 9);
diff --git a/src/util/dom.js b/src/util/dom.js
new file mode 100644
index 0000000000..478402e668
--- /dev/null
+++ b/src/util/dom.js
@@ -0,0 +1,89 @@
+import { ie, ie_version, ios } from "./browser";
+
+export function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
+
+export var rmClass = function(node, cls) {
+  var current = node.className;
+  var match = classTest(cls).exec(current);
+  if (match) {
+    var after = current.slice(match.index + match[0].length);
+    node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
+  }
+};
+
+export function removeChildren(e) {
+  for (var count = e.childNodes.length; count > 0; --count)
+    e.removeChild(e.firstChild);
+  return e;
+}
+
+export function removeChildrenAndAdd(parent, e) {
+  return removeChildren(parent).appendChild(e);
+}
+
+export function elt(tag, content, className, style) {
+  var e = document.createElement(tag);
+  if (className) e.className = className;
+  if (style) e.style.cssText = style;
+  if (typeof content == "string") e.appendChild(document.createTextNode(content));
+  else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
+  return e;
+}
+
+export var range;
+if (document.createRange) range = function(node, start, end, endNode) {
+  var r = document.createRange();
+  r.setEnd(endNode || node, end);
+  r.setStart(node, start);
+  return r;
+};
+else range = function(node, start, end) {
+  var r = document.body.createTextRange();
+  try { r.moveToElementText(node.parentNode); }
+  catch(e) { return r; }
+  r.collapse(true);
+  r.moveEnd("character", end);
+  r.moveStart("character", start);
+  return r;
+};
+
+export function contains(parent, child) {
+  if (child.nodeType == 3) // Android browser always returns false when child is a textnode
+    child = child.parentNode;
+  if (parent.contains)
+    return parent.contains(child);
+  do {
+    if (child.nodeType == 11) child = child.host;
+    if (child == parent) return true;
+  } while (child = child.parentNode);
+}
+
+export var activeElt = function() {
+  var activeElement = document.activeElement;
+  while (activeElement && activeElement.root && activeElement.root.activeElement)
+    activeElement = activeElement.root.activeElement;
+  return activeElement;
+}
+// Older versions of IE throws unspecified error when touching
+// document.activeElement in some cases (during loading, in iframe)
+if (ie && ie_version < 11) activeElt = function() {
+  try { return document.activeElement; }
+  catch(e) { return document.body; }
+};
+
+export function addClass(node, cls) {
+  var current = node.className;
+  if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
+}
+export function joinClasses(a, b) {
+  var as = a.split(" ");
+  for (var i = 0; i < as.length; i++)
+    if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i];
+  return b;
+}
+
+export var selectInput = function(node) { node.select(); };
+if (ios) // Mobile Safari apparently has a bug where select() is broken.
+  selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; };
+else if (ie) // Suppress mysterious IE10 errors
+  selectInput = function(node) { try { node.select(); } catch(_e) {} };
diff --git a/src/util/event.js b/src/util/event.js
new file mode 100644
index 0000000000..4c479cbd25
--- /dev/null
+++ b/src/util/event.js
@@ -0,0 +1,102 @@
+import { mac } from "./browser";
+import { indexOf } from "./misc";
+
+// EVENT HANDLING
+
+// Lightweight event framework. on/off also work on DOM nodes,
+// registering native DOM handlers.
+
+export var on = function(emitter, type, f) {
+  if (emitter.addEventListener)
+    emitter.addEventListener(type, f, false);
+  else if (emitter.attachEvent)
+    emitter.attachEvent("on" + type, f);
+  else {
+    var map = emitter._handlers || (emitter._handlers = {});
+    var arr = map[type] || (map[type] = []);
+    arr.push(f);
+  }
+};
+
+var noHandlers = []
+export function getHandlers(emitter, type, copy) {
+  var arr = emitter._handlers && emitter._handlers[type]
+  if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers
+  else return arr || noHandlers
+}
+
+export function off(emitter, type, f) {
+  if (emitter.removeEventListener)
+    emitter.removeEventListener(type, f, false);
+  else if (emitter.detachEvent)
+    emitter.detachEvent("on" + type, f);
+  else {
+    var handlers = getHandlers(emitter, type, false)
+    for (var i = 0; i < handlers.length; ++i)
+      if (handlers[i] == f) { handlers.splice(i, 1); break; }
+  }
+}
+
+export function signal(emitter, type /*, values...*/) {
+  var handlers = getHandlers(emitter, type, true)
+  if (!handlers.length) return;
+  var args = Array.prototype.slice.call(arguments, 2);
+  for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args);
+}
+
+// The DOM events that CodeMirror handles can be overridden by
+// registering a (non-DOM) handler on the editor for the event name,
+// and preventDefault-ing the event in that handler.
+export function signalDOMEvent(cm, e, override) {
+  if (typeof e == "string")
+    e = {type: e, preventDefault: function() { this.defaultPrevented = true; }};
+  signal(cm, override || e.type, cm, e);
+  return e_defaultPrevented(e) || e.codemirrorIgnore;
+}
+
+export function signalCursorActivity(cm) {
+  var arr = cm._handlers && cm._handlers.cursorActivity;
+  if (!arr) return;
+  var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
+  for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1)
+    set.push(arr[i]);
+}
+
+export function hasHandler(emitter, type) {
+  return getHandlers(emitter, type).length > 0
+}
+
+// Add on and off methods to a constructor's prototype, to make
+// registering events on such objects more convenient.
+export function eventMixin(ctor) {
+  ctor.prototype.on = function(type, f) {on(this, type, f);};
+  ctor.prototype.off = function(type, f) {off(this, type, f);};
+}
+
+// Due to the fact that we still support jurassic IE versions, some
+// compatibility wrappers are needed.
+
+export function e_preventDefault(e) {
+  if (e.preventDefault) e.preventDefault();
+  else e.returnValue = false;
+}
+export function e_stopPropagation(e) {
+  if (e.stopPropagation) e.stopPropagation();
+  else e.cancelBubble = true;
+}
+export function e_defaultPrevented(e) {
+  return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;
+}
+export function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
+
+export function e_target(e) {return e.target || e.srcElement;}
+export function e_button(e) {
+  var b = e.which;
+  if (b == null) {
+    if (e.button & 1) b = 1;
+    else if (e.button & 2) b = 3;
+    else if (e.button & 4) b = 2;
+  }
+  if (mac && e.ctrlKey && b == 1) b = 3;
+  return b;
+}
diff --git a/src/util/feature_detection.js b/src/util/feature_detection.js
new file mode 100644
index 0000000000..bce86ad220
--- /dev/null
+++ b/src/util/feature_detection.js
@@ -0,0 +1,83 @@
+import { elt, range, removeChildren, removeChildrenAndAdd } from "./dom";
+import { ie, ie_version } from "./browser";
+
+// Detect drag-and-drop
+export var dragAndDrop = function() {
+  // There is *some* kind of drag-and-drop support in IE6-8, but I
+  // couldn't get it to work yet.
+  if (ie && ie_version < 9) return false;
+  var div = elt('div');
+  return "draggable" in div || "dragDrop" in div;
+}();
+
+var zwspSupported;
+export function zeroWidthElement(measure) {
+  if (zwspSupported == null) {
+    var test = elt("span", "\u200b");
+    removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
+    if (measure.firstChild.offsetHeight != 0)
+      zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
+  }
+  var node = zwspSupported ? elt("span", "\u200b") :
+    elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
+  node.setAttribute("cm-text", "");
+  return node;
+}
+
+// Feature-detect IE's crummy client rect reporting for bidi text
+var badBidiRects;
+export function hasBadBidiRects(measure) {
+  if (badBidiRects != null) return badBidiRects;
+  var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
+  var r0 = range(txt, 0, 1).getBoundingClientRect();
+  var r1 = range(txt, 1, 2).getBoundingClientRect();
+  removeChildren(measure);
+  if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
+  return badBidiRects = (r1.right - r0.right < 3);
+}
+
+// See if "".split is the broken IE version, if so, provide an
+// alternative way to split lines.
+export var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) {
+  var pos = 0, result = [], l = string.length;
+  while (pos <= l) {
+    var nl = string.indexOf("\n", pos);
+    if (nl == -1) nl = string.length;
+    var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
+    var rt = line.indexOf("\r");
+    if (rt != -1) {
+      result.push(line.slice(0, rt));
+      pos += rt + 1;
+    } else {
+      result.push(line);
+      pos = nl + 1;
+    }
+  }
+  return result;
+} : function(string){return string.split(/\r\n?|\n/);};
+
+export var hasSelection = window.getSelection ? function(te) {
+  try { return te.selectionStart != te.selectionEnd; }
+  catch(e) { return false; }
+} : function(te) {
+  try {var range = te.ownerDocument.selection.createRange();}
+  catch(e) {}
+  if (!range || range.parentElement() != te) return false;
+  return range.compareEndPoints("StartToEnd", range) != 0;
+};
+
+export var hasCopyEvent = (function() {
+  var e = elt("div");
+  if ("oncopy" in e) return true;
+  e.setAttribute("oncopy", "return;");
+  return typeof e.oncopy == "function";
+})();
+
+var badZoomedRects = null;
+export function hasBadZoomedRects(measure) {
+  if (badZoomedRects != null) return badZoomedRects;
+  var node = removeChildrenAndAdd(measure, elt("span", "x"));
+  var normal = node.getBoundingClientRect();
+  var fromRange = range(node, 0, 1).getBoundingClientRect();
+  return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1;
+}
diff --git a/src/util/misc.js b/src/util/misc.js
new file mode 100644
index 0000000000..a98a18832b
--- /dev/null
+++ b/src/util/misc.js
@@ -0,0 +1,126 @@
+export function bind(f) {
+  var args = Array.prototype.slice.call(arguments, 1);
+  return function(){return f.apply(null, args);};
+}
+
+export function copyObj(obj, target, overwrite) {
+  if (!target) target = {};
+  for (var prop in obj)
+    if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
+      target[prop] = obj[prop];
+  return target;
+}
+
+// Counts the column offset in a string, taking tabs into account.
+// Used mostly to find indentation.
+export function countColumn(string, end, tabSize, startIndex, startValue) {
+  if (end == null) {
+    end = string.search(/[^\s\u00a0]/);
+    if (end == -1) end = string.length;
+  }
+  for (var i = startIndex || 0, n = startValue || 0;;) {
+    var nextTab = string.indexOf("\t", i);
+    if (nextTab < 0 || nextTab >= end)
+      return n + (end - i);
+    n += nextTab - i;
+    n += tabSize - (n % tabSize);
+    i = nextTab + 1;
+  }
+}
+
+export function Delayed() {this.id = null;}
+Delayed.prototype.set = function(ms, f) {
+  clearTimeout(this.id);
+  this.id = setTimeout(f, ms);
+};
+
+export function indexOf(array, elt) {
+  for (var i = 0; i < array.length; ++i)
+    if (array[i] == elt) return i;
+  return -1;
+}
+
+// Number of pixels added to scroller and sizer to hide scrollbar
+export var scrollerGap = 30;
+
+// Returned or thrown by various protocols to signal 'I'm not
+// handling this'.
+export var Pass = {toString: function(){return "CodeMirror.Pass";}};
+
+// Reused option objects for setSelection & friends
+export var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"};
+
+// The inverse of countColumn -- find the offset that corresponds to
+// a particular column.
+export function findColumn(string, goal, tabSize) {
+  for (var pos = 0, col = 0;;) {
+    var nextTab = string.indexOf("\t", pos);
+    if (nextTab == -1) nextTab = string.length;
+    var skipped = nextTab - pos;
+    if (nextTab == string.length || col + skipped >= goal)
+      return pos + Math.min(skipped, goal - col);
+    col += nextTab - pos;
+    col += tabSize - (col % tabSize);
+    pos = nextTab + 1;
+    if (col >= goal) return pos;
+  }
+}
+
+var spaceStrs = [""];
+export function spaceStr(n) {
+  while (spaceStrs.length <= n)
+    spaceStrs.push(lst(spaceStrs) + " ");
+  return spaceStrs[n];
+}
+
+export function lst(arr) { return arr[arr.length-1]; }
+
+export function map(array, f) {
+  var out = [];
+  for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
+  return out;
+}
+
+export function insertSorted(array, value, score) {
+  var pos = 0, priority = score(value)
+  while (pos < array.length && score(array[pos]) <= priority) pos++
+  array.splice(pos, 0, value)
+}
+
+export function nothing() {}
+
+export function createObj(base, props) {
+  var inst;
+  if (Object.create) {
+    inst = Object.create(base);
+  } else {
+    nothing.prototype = base;
+    inst = new nothing();
+  }
+  if (props) copyObj(props, inst);
+  return inst;
+}
+
+var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+export function isWordCharBasic(ch) {
+  return /\w/.test(ch) || ch > "\x80" &&
+    (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
+}
+export function isWordChar(ch, helper) {
+  if (!helper) return isWordCharBasic(ch);
+  if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true;
+  return helper.test(ch);
+}
+
+export function isEmpty(obj) {
+  for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false;
+  return true;
+}
+
+// Extending unicode characters. A series of a non-extending char +
+// any number of extending chars is treated as a single unit as far
+// as editing and measuring is concerned. This is not fully correct,
+// since some scripts/fonts/browsers also treat other configurations
+// of code points as a group.
+var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
+export function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); }
diff --git a/src/util/operation_group.js b/src/util/operation_group.js
new file mode 100644
index 0000000000..478f07283e
--- /dev/null
+++ b/src/util/operation_group.js
@@ -0,0 +1,73 @@
+import { getHandlers } from "./event";
+
+var operationGroup = null;
+
+export function pushOperation(op) {
+  if (operationGroup) {
+    operationGroup.ops.push(op);
+  } else {
+    op.ownsGroup = operationGroup = {
+      ops: [op],
+      delayedCallbacks: []
+    };
+  }
+}
+
+function fireCallbacksForOps(group) {
+  // Calls delayed callbacks and cursorActivity handlers until no
+  // new ones appear
+  var callbacks = group.delayedCallbacks, i = 0;
+  do {
+    for (; i < callbacks.length; i++)
+      callbacks[i].call(null);
+    for (var j = 0; j < group.ops.length; j++) {
+      var op = group.ops[j];
+      if (op.cursorActivityHandlers)
+        while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
+          op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm);
+    }
+  } while (i < callbacks.length);
+}
+
+export function finishOperation(op, endCb) {
+  var group = op.ownsGroup;
+  if (!group) return;
+
+  try { fireCallbacksForOps(group); }
+  finally {
+    operationGroup = null;
+    endCb(group);
+  }
+}
+
+var orphanDelayedCallbacks = null;
+
+// Often, we want to signal events at a point where we are in the
+// middle of some work, but don't want the handler to start calling
+// other methods on the editor, which might be in an inconsistent
+// state or simply not expect any other events to happen.
+// signalLater looks whether there are any handlers, and schedules
+// them to be executed when the last operation ends, or, if no
+// operation is active, when a timeout fires.
+export function signalLater(emitter, type /*, values...*/) {
+  var arr = getHandlers(emitter, type, false)
+  if (!arr.length) return;
+  var args = Array.prototype.slice.call(arguments, 2), list;
+  if (operationGroup) {
+    list = operationGroup.delayedCallbacks;
+  } else if (orphanDelayedCallbacks) {
+    list = orphanDelayedCallbacks;
+  } else {
+    list = orphanDelayedCallbacks = [];
+    setTimeout(fireOrphanDelayed, 0);
+  }
+  function bnd(f) {return function(){f.apply(null, args);};}
+  for (var i = 0; i < arr.length; ++i)
+    list.push(bnd(arr[i]));
+}
+
+function fireOrphanDelayed() {
+  var delayed = orphanDelayedCallbacks;
+  orphanDelayedCallbacks = null;
+  for (var i = 0; i < delayed.length; ++i) delayed[i]();
+}

From 4d0d2ffd0c41f931dee42dfd6e2ecbb4a8ef6485 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 19 Sep 2016 21:13:23 +0200
Subject: [PATCH 2886/4742] Add lint for src/

---
 test/lint.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/lint.js b/test/lint.js
index 35777562ef..10b68a8deb 100644
--- a/test/lint.js
+++ b/test/lint.js
@@ -8,4 +8,12 @@ var blint = require("blint");
   });
 });
 
+["src"].forEach(function(dir) {
+  blint.checkDir(dir, {
+    browser: true,
+    blob: "// CodeMirror, copyright (c) by Marijn Haverbeke and others\n// Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n",
+    ecmaVersion: 6
+  });
+});
+
 module.exports = {ok: blint.success()};

From a02dd4036b4fb6c6aaf7e3e4761496d892dfbc78 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 23 Sep 2016 22:26:53 +0200
Subject: [PATCH 2887/4742] Remove version blob check

---
 test/lint.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/lint.js b/test/lint.js
index 10b68a8deb..355b3e1c04 100644
--- a/test/lint.js
+++ b/test/lint.js
@@ -11,7 +11,6 @@ var blint = require("blint");
 ["src"].forEach(function(dir) {
   blint.checkDir(dir, {
     browser: true,
-    blob: "// CodeMirror, copyright (c) by Marijn Haverbeke and others\n// Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n",
     ecmaVersion: 6
   });
 });

From 518fb67418baeec4d3eef41976af79cc0ce45e93 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 26 Sep 2016 14:12:08 +0200
Subject: [PATCH 2888/4742] Drop the compression helper

The kludge of pulling files from github no longer works now
that we have a build process, and since most people have their
own build pipeline now, I don't feel that supporting on-website
builds is that important anymore.
---
 bin/release       |   5 -
 doc/compress.html | 360 ----------------------------------------------
 doc/manual.html   |   3 +-
 index.html        |   6 +-
 4 files changed, 4 insertions(+), 370 deletions(-)
 delete mode 100644 doc/compress.html

diff --git a/bin/release b/bin/release
index 5b31da8efd..df1fb269c3 100755
--- a/bin/release
+++ b/bin/release
@@ -32,11 +32,6 @@ if (bumpOnly) process.exit(0);
 
 child.exec("bash bin/authors.sh", function(){});
 
-rewrite("doc/compress.html", function(cmp) {
-  return cmp.replace(/<option value="http:\/\/codemirror.net\/">HEAD<\/option>/,
-                     "<option value=\"http://codemirror.net/\">HEAD</option>\n        <option value=\"http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=" + number + ";f=\">" + number + "</option>");
-});
-
 rewrite("index.html", function(index) {
   return index.replace(/\.zip">\d+\.\d+\.\d+<\/a>/,
                        ".zip\">" + number + "</a>");
diff --git a/doc/compress.html b/doc/compress.html
deleted file mode 100644
index c013d3b744..0000000000
--- a/doc/compress.html
+++ /dev/null
@@ -1,360 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Compression Helper</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="docs.css">
-<script src="../lib/codemirror.js"></script>
-<script src="../mode/javascript/javascript.js"></script>
-<link rel=stylesheet href="../lib/codemirror.css">
-
-<div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Compression helper</a>
-  </ul>
-</div>
-
-<article>
-
-<h2>Script compression helper</h2>
-
-    <p>To optimize loading CodeMirror, especially when including a
-    bunch of different modes, it is recommended that you combine and
-    minify (and preferably also gzip) the scripts. This page makes
-    those first two steps very easy. Simply select the version and
-    scripts you need in the form below, and
-    click <strong>Compress</strong> to download the minified script
-    file.</p>
-
-    <form id="form" action="http://marijnhaverbeke.nl/uglifyjs" method="post" onsubmit="generateHeader();">
-      <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.19.0;f=">5.19.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.18.2;f=">5.18.2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.18.0;f=">5.18.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.17.0;f=">5.17.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.16.0;f=">5.16.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.2;f=">5.15.2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.15.0;f=">5.15.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.2;f=">5.14.2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.14.0;f=">5.14.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.2;f=">5.13.2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.13.0;f=">5.13.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.12.0;f=">5.12.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.11.0;f=">5.11.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.10.0;f=">5.10.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.9.0;f=">5.9.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.8.0;f=">5.8.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.7.0;f=">5.7.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.6.0;f=">5.6.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.5.0;f=">5.5.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.4.0;f=">5.4.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.3.0;f=">5.3.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.2.0;f=">5.2.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.1.0;f=">5.1.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=5.0.0;f=">5.0.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.13.0;f=">4.13</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.12.0;f=">4.12</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.11.0;f=">4.11</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.10.0;f=">4.10</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.9.0;f=">4.9</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.8.0;f=">4.8</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.7.0;f=">4.7</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.6.0;f=">4.6</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.5.0;f=">4.5</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.4.0;f=">4.4</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.3.0;f=">4.3</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.2.1;f=">4.2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.2.0;f=">4.2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.1.0;f=">4.1</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=4.0.3;f=">4.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.23.0;f=">3.23</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.22.0;f=">3.22</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.21.0;f=">3.21</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.20.0;f=">3.20</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.19.0;f=">3.19</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.18.0;f=">3.18</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.16.0;f=">3.16</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.15.0;f=">3.15</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.14.0;f=">3.14</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=3.13.0;f=">3.13</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.12;f=">3.12</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.11;f=">3.11</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.1;f=">3.1</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.02;f=">3.02</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.01;f=">3.01</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.0;f=">3.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.38;f=">2.38</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.37;f=">2.37</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.36;f=">2.36</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.35;f=">2.35</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.34;f=">2.34</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.33;f=">2.33</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.32;f=">2.32</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.31;f=">2.31</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.3;f=">2.3</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.25;f=">2.25</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.24;f=">2.24</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.23;f=">2.23</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.22;f=">2.22</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.21;f=">2.21</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.2;f=">2.2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.18;f=">2.18</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.16;f=">2.16</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.15;f=">2.15</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.13;f=">2.13</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.12;f=">2.12</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.11;f=">2.11</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.1;f=">2.1</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.02;f=">2.02</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.01;f=">2.01</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.0;f=">2.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=beta2;f=">beta2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=beta1;f=">beta1</option>
-      </select></p>
-
-      <select multiple="multiple" size="20" name="code_url" style="width: 40em;" class="field" id="files">
-        <optgroup label="CodeMirror Library">
-          <option value="http://codemirror.net/lib/codemirror.js" selected>codemirror.js</option>
-        </optgroup>
-        <optgroup label="Modes">
-          <option value="http://codemirror.net/mode/apl/apl.js">apl.js</option>
-          <option value="http://codemirror.net/mode/asn.1/asn.1.js">asn.1.js</option>
-          <option value="http://codemirror.net/mode/asterisk/asterisk.js">asterisk.js</option>
-          <option value="http://codemirror.net/mode/asciiarmor/asciiarmor.js">asciiarmor.js</option>
-          <option value="http://codemirror.net/mode/brainfuck/brainfuck.js">brainfuck.js</option>
-          <option value="http://codemirror.net/mode/clike/clike.js">clike.js</option>
-          <option value="http://codemirror.net/mode/clojure/clojure.js">clojure.js</option>
-          <option value="http://codemirror.net/mode/cmake/cmake.js">cmake.js</option>
-          <option value="http://codemirror.net/mode/cobol/cobol.js">cobol.js</option>
-          <option value="http://codemirror.net/mode/coffeescript/coffeescript.js">coffeescript.js</option>
-          <option value="http://codemirror.net/mode/commonlisp/commonlisp.js">commonlisp.js</option>
-          <option value="http://codemirror.net/mode/crystal/crystal.js">crystal.js</option>
-          <option value="http://codemirror.net/mode/css/css.js">css.js</option>
-          <option value="http://codemirror.net/mode/cypher/cypher.js">cypher.js</option>
-          <option value="http://codemirror.net/mode/d/d.js">d.js</option>
-          <option value="http://codemirror.net/mode/dart/dart.js">dart.js</option>
-          <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
-          <option value="http://codemirror.net/mode/django/django.js">django.js</option>
-          <option value="http://codemirror.net/mode/dockerfile/dockerfile.js">dockerfile.js</option>
-          <option value="http://codemirror.net/mode/dtd/dtd.js">dtd.js</option>
-          <option value="http://codemirror.net/mode/dylan/dylan.js">dylan.js</option>
-          <option value="http://codemirror.net/mode/ebnf/ebnf.js">ebnf.js</option>
-          <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
-          <option value="http://codemirror.net/mode/eiffel/eiffel.js">eiffel.js</option>
-          <option value="http://codemirror.net/mode/elm/elm.js">eml.js</option>
-          <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
-          <option value="http://codemirror.net/mode/factor/factor.js">factor.js</option>
-          <option value="http://codemirror.net/mode/fcl/fcl.js">fcl.js</option>
-          <option value="http://codemirror.net/mode/forth/forth.js">forth.js</option>
-          <option value="http://codemirror.net/mode/fortran/fortran.js">fortran.js</option>
-          <option value="http://codemirror.net/mode/gfm/gfm.js">gfm.js</option>
-          <option value="http://codemirror.net/mode/gas/gas.js">gas.js</option>
-          <option value="http://codemirror.net/mode/gherkin/gherkin.js">gherkin.js</option>
-          <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/haskell-literate/haskell-literate.js">haskell-literate.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>
-          <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option>
-          <option value="http://codemirror.net/mode/http/http.js">http.js</option>
-          <option value="http://codemirror.net/mode/idl/idl.js">idl.js</option>
-          <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
-          <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
-          <option value="http://codemirror.net/mode/julia/julia.js">julia.js</option>
-          <option value="http://codemirror.net/mode/jsx/jsx.js">jsx.js</option>
-          <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
-          <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
-          <option value="http://codemirror.net/mode/mathematica/mathematica.js">mathematica.js</option>
-          <option value="http://codemirror.net/mode/mbox/mbox.js">mbox.js</option>
-          <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/mscgen/mscgen.js">mscgen.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>
-          <option value="http://codemirror.net/mode/oz/oz.js">oz.js</option>
-          <option value="http://codemirror.net/mode/pascal/pascal.js">pascal.js</option>
-          <option value="http://codemirror.net/mode/pegjs/pegjs.js">pegjs.js</option>
-          <option value="http://codemirror.net/mode/perl/perl.js">perl.js</option>
-          <option value="http://codemirror.net/mode/php/php.js">php.js</option>
-          <option value="http://codemirror.net/mode/pig/pig.js">pig.js</option>
-          <option value="http://codemirror.net/mode/powershell/powershell.js">powershell.js</option>
-          <option value="http://codemirror.net/mode/properties/properties.js">properties.js</option>
-          <option value="http://codemirror.net/mode/protobuf/protobuf.js">protobuf.js</option>
-          <option value="http://codemirror.net/mode/python/python.js">python.js</option>
-          <option value="http://codemirror.net/mode/pug/pug.js">pug.js</option>
-          <option value="http://codemirror.net/mode/puppet/puppet.js">puppet.js</option>
-          <option value="http://codemirror.net/mode/q/q.js">q.js</option>
-          <option value="http://codemirror.net/mode/r/r.js">r.js</option>
-          <option value="http://codemirror.net/mode/rpm/rpm.js">rpm.js</option>
-          <option value="http://codemirror.net/mode/rst/rst.js">rst.js</option>
-          <option value="http://codemirror.net/mode/ruby/ruby.js">ruby.js</option>
-          <option value="http://codemirror.net/mode/rust/rust.js">rust.js</option>
-          <option value="http://codemirror.net/mode/sass/sass.js">sass.js</option>
-          <option value="http://codemirror.net/mode/scala/scala.js">scala.js</option>
-          <option value="http://codemirror.net/mode/scheme/scheme.js">scheme.js</option>
-          <option value="http://codemirror.net/mode/shell/shell.js">shell.js</option>
-          <option value="http://codemirror.net/mode/sieve/sieve.js">sieve.js</option>
-          <option value="http://codemirror.net/mode/slim/slim.js">slim.js</option>
-          <option value="http://codemirror.net/mode/smalltalk/smalltalk.js">smalltalk.js</option>
-          <option value="http://codemirror.net/mode/smarty/smarty.js">smarty.js</option>
-          <option value="http://codemirror.net/mode/solr/solr.js">solr.js</option>
-          <option value="http://codemirror.net/mode/soy/soy.js">soy.js</option>
-          <option value="http://codemirror.net/mode/sparql/sparql.js">sparql.js</option>
-          <option value="http://codemirror.net/mode/swift/swift.js">swift.js</option>
-          <option value="http://codemirror.net/mode/spreadsheet/spreadsheet.js">spreadsheet.js</option>
-          <option value="http://codemirror.net/mode/stylus/stylus.js">stylus.js</option>
-          <option value="http://codemirror.net/mode/sql/sql.js">sql.js</option>
-          <option value="http://codemirror.net/mode/stex/stex.js">stex.js</option>
-          <option value="http://codemirror.net/mode/tcl/tcl.js">tcl.js</option>
-          <option value="http://codemirror.net/mode/textile/textile.js">textile.js</option>
-          <option value="http://codemirror.net/mode/tiddlywiki/tiddlywiki.js">tiddlywiki.js</option>
-          <option value="http://codemirror.net/mode/tiki/tiki.js">tiki.js</option>
-          <option value="http://codemirror.net/mode/toml/toml.js">toml.js</option>
-          <option value="http://codemirror.net/mode/tornado/tornado.js">tornado.js</option>
-          <option value="http://codemirror.net/mode/troff/troff.js">troff.js</option>
-          <option value="http://codemirror.net/mode/ttcn/ttcn.js">ttcn.js</option>
-          <option value="http://codemirror.net/mode/ttcn-cfg/ttcn-cfg.js">ttcn-cfg.js</option>
-          <option value="http://codemirror.net/mode/turtle/turtle.js">turtle.js</option>
-          <option value="http://codemirror.net/mode/twig/twig.js">twig.js</option>
-          <option value="http://codemirror.net/mode/vb/vb.js">vb.js</option>
-          <option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
-          <option value="http://codemirror.net/mode/velocity/velocity.js">velocity.js</option>
-          <option value="http://codemirror.net/mode/verilog/verilog.js">verilog.js</option>
-          <option value="http://codemirror.net/mode/vhdl/vhdl.js">vhdl.js</option>
-          <option value="http://codemirror.net/mode/vue/vue.js">vue.js</option>
-          <option value="http://codemirror.net/mode/webidl/webidl.js">webidl.js</option>
-          <option value="http://codemirror.net/mode/xml/xml.js">xml.js</option>
-          <option value="http://codemirror.net/mode/xquery/xquery.js">xquery.js</option>
-          <option value="http://codemirror.net/mode/yaml/yaml.js">yaml.js</option>
-          <option value="http://codemirror.net/mode/yaml-frontmatter/yaml-frontmatter.js">yaml-frontmatter.js</option>
-          <option value="http://codemirror.net/mode/z80/z80.js">z80.js</option>
-        </optgroup>
-        <optgroup label="Add-ons">
-          <option value="http://codemirror.net/addon/selection/active-line.js">active-line.js</option>
-          <option value="http://codemirror.net/addon/hint/anyword-hint.js">anyword-hint.js</option>
-          <option value="http://codemirror.net/addon/fold/brace-fold.js">brace-fold.js</option>
-          <option value="http://codemirror.net/addon/edit/closebrackets.js">closebrackets.js</option>
-          <option value="http://codemirror.net/addon/edit/closetag.js">closetag.js</option>
-          <option value="http://codemirror.net/addon/runmode/colorize.js">colorize.js</option>
-          <option value="http://codemirror.net/addon/comment/comment.js">comment.js</option>
-          <option value="http://codemirror.net/addon/fold/comment-fold.js">comment-fold.js</option>
-          <option value="http://codemirror.net/addon/comment/continuecomment.js">continuecomment.js</option>
-          <option value="http://codemirror.net/addon/edit/continuelist.js">continuelist.js</option>
-          <option value="http://codemirror.net/addon/hint/css-hint.js">css-hint.js</option>
-          <option value="http://codemirror.net/addon/lint/css-lint.js">css-lint.js</option>
-          <option value="http://codemirror.net/addon/dialog/dialog.js">dialog.js</option>
-          <option value="http://codemirror.net/addon/fold/foldcode.js">foldcode.js</option>
-          <option value="http://codemirror.net/addon/fold/foldgutter.js">foldgutter.js</option>
-          <option value="http://codemirror.net/addon/display/fullscreen.js">fullscreen.js</option>
-          <option value="http://codemirror.net/addon/wrap/hardwrap.js">hardwrap.js</option>
-          <option value="http://codemirror.net/addon/hint/html-hint.js">html-hint.js</option>
-          <option value="http://codemirror.net/addon/lint/html-lint.js">html-lint.js</option>
-          <option value="http://codemirror.net/addon/fold/indent-fold.js">indent-fold.js</option>
-          <option value="http://codemirror.net/addon/hint/javascript-hint.js">javascript-hint.js</option>
-          <option value="http://codemirror.net/addon/lint/javascript-lint.js">javascript-lint.js</option>
-          <option value="http://codemirror.net/addon/lint/json-lint.js">json-lint.js</option>
-          <option value="http://codemirror.net/addon/search/jump-to-line.js">jump-to-line.js</option>
-          <option value="http://codemirror.net/addon/lint/lint.js">lint.js</option>
-          <option value="http://codemirror.net/addon/mode/loadmode.js">loadmode.js</option>
-          <option value="http://codemirror.net/addon/fold/markdown-fold.js">markdown-fold.js</option>
-          <option value="http://codemirror.net/addon/selection/mark-selection.js">mark-selection.js</option>
-          <option value="http://codemirror.net/addon/search/match-highlighter.js">match-highlighter.js</option>
-          <option value="http://codemirror.net/addon/edit/matchbrackets.js">matchbrackets.js</option>
-          <option value="http://codemirror.net/addon/edit/matchtags.js">matchtags.js</option>
-          <option value="http://codemirror.net/addon/merge/merge.js">merge.js</option>
-          <option value="http://codemirror.net/addon/mode/multiplex.js">multiplex.js</option>
-          <option value="http://codemirror.net/addon/mode/overlay.js">overlay.js</option>
-          <option value="http://codemirror.net/addon/display/placeholder.js">placeholder.js</option>
-          <option value="http://codemirror.net/addon/display/rulers.js">rulers.js</option>
-          <option value="http://codemirror.net/addon/runmode/runmode.js">runmode.js</option>
-          <option value="http://codemirror.net/addon/runmode/runmode.node.js">runmode.node.js</option>
-          <option value="http://codemirror.net/addon/runmode/runmode-standalone.js">runmode-standalone.js</option>
-          <option value="http://codemirror.net/addon/search/search.js">search.js</option>
-          <option value="http://codemirror.net/addon/search/searchcursor.js">searchcursor.js</option>
-          <option value="http://codemirror.net/addon/hint/show-hint.js">show-hint.js</option>
-          <option value="http://codemirror.net/addon/mode/simple.js">simple.js</option>
-          <option value="http://codemirror.net/addon/scroll/simplescrollbars.js">simplescrollbars.js</option>
-          <option value="http://codemirror.net/addon/hint/sql-hint.js">sql-hint.js</option>
-          <option value="http://codemirror.net/addon/edit/trailingspace.js">trailingspace.js</option>
-          <option value="http://codemirror.net/addon/tern/tern.js">tern.js</option>
-          <option value="http://codemirror.net/addon/fold/xml-fold.js">xml-fold.js</option>
-          <option value="http://codemirror.net/addon/hint/xml-hint.js">xml-hint.js</option>
-          <option value="http://codemirror.net/addon/hint/yaml-lint.js">yaml-lint.js</option>
-        </optgroup>
-        <optgroup label="Keymaps">
-          <option value="http://codemirror.net/keymap/emacs.js">emacs.js</option>
-          <option value="http://codemirror.net/keymap/sublime.js">sublime.js</option>
-          <option value="http://codemirror.net/keymap/vim.js">vim.js</option>
-        </optgroup>
-      </select>
-
-      <p>
-        <button type="submit">Compress</button> with <a href="http://github.com/mishoo/UglifyJS/">UglifyJS</a>
-      </p>
-      <input type="hidden" id="header" name="header">
-      <p>Custom code to add to the compressed file:<textarea name="js_code" style="width: 100%; height: 15em;" class="field" id="js_code"></textarea></p>
-    </form>
-
-    <script type="text/javascript">
-      CodeMirror.fromTextArea(document.getElementById("js_code")).getWrapperElement().className += " field";
-
-      function setVersion(ver) {
-        var urlprefix = ver.options[ver.selectedIndex].value;
-        var select = document.getElementById("files"), m;
-        for (var optgr = select.firstChild; optgr; optgr = optgr.nextSibling)
-          for (var opt = optgr.firstChild; opt; opt = opt.nextSibling) {
-            if (opt.nodeName != "OPTION")
-              continue;
-            else if (m = opt.value.match(/^http:\/\/codemirror.net\/(.*)$/))
-              opt.value = urlprefix + m[1];
-            else if (m = opt.value.match(/http:\/\/marijnhaverbeke.nl\/git\/codemirror\?a=blob_plain;hb=[^;]+;f=(.*)$/))
-              opt.value = urlprefix + m[1];
-          }
-       }
-       
-       function generateHeader() {
-         var versionNode = document.getElementById("version");
-         var version = versionNode.options[versionNode.selectedIndex].label
-         var filesNode = document.getElementById("files");
-         var optGroupHeaderIncluded;
-
-         // Generate the comment
-         var str = "/* CodeMirror - Minified & Bundled\n";
-         str += "   Generated on " + new Date().toLocaleDateString() + " with http://codemirror.net/doc/compress.html\n";
-         str += "   Version: " + version + "\n\n";
-
-         for (var group = filesNode.firstChild; group; group = group.nextSibling) {
-           optGroupHeaderIncluded = false;
-           for (var option = group.firstChild; option; option = option.nextSibling) {
-             if (option.nodeName !== "OPTION") {
-               continue;
-             } else if (option.selected) {
-               if (!optGroupHeaderIncluded) {
-                 str += "   " + group.label + ":\n";
-                 optGroupHeaderIncluded = true;
-               }
-               str += "   - " + option.label + "\n";
-             }
-           }
-         }
-         str += " */\n\n";
-
-         document.getElementById("header").value = str;
-       }
-    </script>
-
-</article>
diff --git a/doc/manual.html b/doc/manual.html
index 8a0e2dcb81..e97ce07e14 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -96,8 +96,7 @@ <h2>Basic Usage</h2>
     <p>The easiest way to use CodeMirror is to simply load the script
     and style sheet found under <code>lib/</code> in the distribution,
     plus a mode script from one of the <code>mode/</code> directories.
-    (See <a href="compress.html">the compression helper</a> for an
-    easy way to combine scripts.) For example:</p>
+    For example:</p>
 
     <pre data-lang="text/html">&lt;script src="lib/codemirror.js">&lt;/script>
 &lt;link rel="stylesheet" href="lib/codemirror.css">
diff --git a/index.html b/index.html
index 636639ec08..3423eab209 100644
--- a/index.html
+++ b/index.html
@@ -97,9 +97,9 @@ <h2>This is CodeMirror</h2>
     </div>
     <div class=actionsleft>
       Get the current version: <a href="http://codemirror.net/codemirror.zip">5.19.0</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>.
+      You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
+      read the <a href="doc/releases.html">release notes</a>,<br>
+      or study the <a href="doc/manual.html">user manual</a>.
     </div>
     <div class=actionsright>
       Software needs maintenance,<br>

From 7955eadf723a9b6420fc4c822436bed1d8dd0203 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 26 Sep 2016 16:52:17 +0200
Subject: [PATCH 2889/4742] Add missing import

Closes #4258
---
 src/edit/mouse_events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 08a564bd2c..ebda0c28a9 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -5,7 +5,7 @@ import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos";
 import { getLine, lineAtHeight } from "../line/utils_line";
 import { posFromMouse } from "../measurement/position_measurement";
 import { eventInWidget } from "../measurement/widgets";
-import { normalizeSelection, Range } from "../model/selection";
+import { normalizeSelection, Range, Selection } from "../model/selection";
 import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates";
 import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser";
 import { activeElt } from "../util/dom";

From ac205e6783c631cf42a6e4771216d790f1a70e10 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 26 Sep 2016 09:55:06 +0200
Subject: [PATCH 2890/4742] Remove semicolons

---
 package.json                            |   2 +-
 src/codemirror.js                       |   4 +-
 src/display/Display.js                  |  98 ++--
 src/display/focus.js                    |  48 +-
 src/display/gutters.js                  |  30 +-
 src/display/highlight_worker.js         |  60 +--
 src/display/line_numbers.js             |  50 +-
 src/display/mode_state.js               |  24 +-
 src/display/operations.js               | 180 ++++----
 src/display/scroll_events.js            | 124 ++---
 src/display/scrollbars.js               | 178 ++++----
 src/display/scrolling.js                | 118 ++---
 src/display/selection.js                | 152 +++----
 src/display/update_display.js           | 228 +++++-----
 src/display/update_lines.js             |  58 +--
 src/display/view_tracking.js            | 138 +++---
 src/edit/CodeMirror.js                  | 242 +++++-----
 src/edit/commands.js                    | 230 +++++-----
 src/edit/deleteNearSelection.js         |  28 +-
 src/edit/drop_events.js                 | 126 ++---
 src/edit/fromTextArea.js                |  64 +--
 src/edit/global_events.js               |  44 +-
 src/edit/key_events.js                  | 150 +++---
 src/edit/legacy.js                      | 116 ++---
 src/edit/main.js                        |  66 +--
 src/edit/methods.js                     | 582 ++++++++++++------------
 src/edit/mouse_events.js                | 320 ++++++-------
 src/edit/options.js                     | 276 +++++------
 src/edit/utils.js                       |   6 +-
 src/input/ContentEditableInput.js       | 468 +++++++++----------
 src/input/TextareaInput.js              | 322 ++++++-------
 src/input/indent.js                     |  72 +--
 src/input/input.js                      | 124 ++---
 src/input/keymap.js                     | 114 ++---
 src/input/keynames.js                   |   8 +-
 src/line/highlight.js                   | 202 ++++----
 src/line/line_data.js                   | 304 ++++++-------
 src/line/pos.js                         |  36 +-
 src/line/saw_special_spans.js           |   6 +-
 src/line/spans.js                       | 310 ++++++-------
 src/line/utils_line.js                  |  76 ++--
 src/measurement/position_measurement.js | 532 +++++++++++-----------
 src/measurement/update_line.js          | 178 ++++----
 src/measurement/widgets.js              |  22 +-
 src/model/Doc.js                        | 436 +++++++++---------
 src/model/change_measurement.js         |  54 +--
 src/model/changes.js                    | 300 ++++++------
 src/model/chunk.js                      | 154 +++----
 src/model/document_data.js              | 102 ++---
 src/model/history.js                    | 174 +++----
 src/model/line_widget.js                |  92 ++--
 src/model/mark_text.js                  | 284 ++++++------
 src/model/selection.js                  |  68 +--
 src/model/selection_updates.js          | 156 +++----
 src/modes.js                            |  84 ++--
 src/util/StringStream.js                |  84 ++--
 src/util/bidi.js                        | 216 ++++-----
 src/util/browser.js                     |  48 +-
 src/util/dom.js                         |  98 ++--
 src/util/event.js                       |  72 +--
 src/util/feature_detection.js           |  98 ++--
 src/util/misc.js                        | 102 ++---
 src/util/operation_group.js             |  52 +--
 63 files changed, 4595 insertions(+), 4595 deletions(-)

diff --git a/package.json b/package.json
index 1f4b036e12..a6e61d06dc 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "lint": "bin/lint"
   },
   "devDependencies": {
-    "blint": ">=0.1.1",
+    "blint": "^0.5.1",
     "node-static": "0.6.0",
     "phantomjs-prebuilt": "^2.1.12",
     "rollup": "^0.34.10",
diff --git a/src/codemirror.js b/src/codemirror.js
index 4b75d8cbaf..3c16cc875e 100644
--- a/src/codemirror.js
+++ b/src/codemirror.js
@@ -1,3 +1,3 @@
-import { CodeMirror } from "./edit/main";
+import { CodeMirror } from "./edit/main"
 
-export default CodeMirror;
+export default CodeMirror
diff --git a/src/display/Display.js b/src/display/Display.js
index e1cb6a0923..fa4c52fef7 100644
--- a/src/display/Display.js
+++ b/src/display/Display.js
@@ -1,105 +1,105 @@
-import { gecko, ie, ie_version, mobile, webkit } from "../util/browser";
-import { elt } from "../util/dom";
-import { scrollerGap } from "../util/misc";
+import { gecko, ie, ie_version, mobile, webkit } from "../util/browser"
+import { elt } from "../util/dom"
+import { scrollerGap } from "../util/misc"
 
 // The display handles the DOM integration, both for input reading
 // and content drawing. It holds references to DOM nodes and
 // display-related state.
 
 export function Display(place, doc, input) {
-  var d = this;
-  this.input = input;
+  var d = this
+  this.input = input
 
   // Covers bottom-right square when both scrollbars are present.
-  d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
-  d.scrollbarFiller.setAttribute("cm-not-content", "true");
+  d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler")
+  d.scrollbarFiller.setAttribute("cm-not-content", "true")
   // Covers bottom of gutter when coverGutterNextToScrollbar is on
   // and h scrollbar is present.
-  d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
-  d.gutterFiller.setAttribute("cm-not-content", "true");
+  d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler")
+  d.gutterFiller.setAttribute("cm-not-content", "true")
   // Will contain the actual code, positioned to cover the viewport.
-  d.lineDiv = elt("div", null, "CodeMirror-code");
+  d.lineDiv = elt("div", null, "CodeMirror-code")
   // Elements are added to these to represent selection and cursors.
-  d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
-  d.cursorDiv = elt("div", null, "CodeMirror-cursors");
+  d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1")
+  d.cursorDiv = elt("div", null, "CodeMirror-cursors")
   // A visibility: hidden element used to find the size of things.
-  d.measure = elt("div", null, "CodeMirror-measure");
+  d.measure = elt("div", null, "CodeMirror-measure")
   // When lines outside of the viewport are measured, they are drawn in this.
-  d.lineMeasure = elt("div", null, "CodeMirror-measure");
+  d.lineMeasure = elt("div", null, "CodeMirror-measure")
   // Wraps everything that needs to exist inside the vertically-padded coordinate system
   d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
-                    null, "position: relative; outline: none");
+                    null, "position: relative; outline: none")
   // Moved around its parent to cover visible view.
-  d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
+  d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative")
   // Set to the height of the document, allowing scrolling.
-  d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
-  d.sizerWidth = null;
+  d.sizer = elt("div", [d.mover], "CodeMirror-sizer")
+  d.sizerWidth = null
   // Behavior of elts with overflow: auto and padding is
   // inconsistent across browsers. This is used to ensure the
   // scrollable area is big enough.
-  d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
+  d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;")
   // Will contain the gutters, if any.
-  d.gutters = elt("div", null, "CodeMirror-gutters");
-  d.lineGutter = null;
+  d.gutters = elt("div", null, "CodeMirror-gutters")
+  d.lineGutter = null
   // Actual scrollable element.
-  d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
-  d.scroller.setAttribute("tabIndex", "-1");
+  d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll")
+  d.scroller.setAttribute("tabIndex", "-1")
   // The element in which the editor lives.
-  d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
+  d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror")
 
   // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
-  if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-  if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
+  if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0 }
+  if (!webkit && !(gecko && mobile)) d.scroller.draggable = true
 
   if (place) {
-    if (place.appendChild) place.appendChild(d.wrapper);
-    else place(d.wrapper);
+    if (place.appendChild) place.appendChild(d.wrapper)
+    else place(d.wrapper)
   }
 
   // Current rendered range (may be bigger than the view window).
-  d.viewFrom = d.viewTo = doc.first;
-  d.reportedViewFrom = d.reportedViewTo = doc.first;
+  d.viewFrom = d.viewTo = doc.first
+  d.reportedViewFrom = d.reportedViewTo = doc.first
   // Information about the rendered lines.
-  d.view = [];
-  d.renderedView = null;
+  d.view = []
+  d.renderedView = null
   // Holds info about a single rendered line when it was rendered
   // for measurement, while not in view.
-  d.externalMeasured = null;
+  d.externalMeasured = null
   // Empty space (in pixels) above the view
-  d.viewOffset = 0;
-  d.lastWrapHeight = d.lastWrapWidth = 0;
-  d.updateLineNumbers = null;
+  d.viewOffset = 0
+  d.lastWrapHeight = d.lastWrapWidth = 0
+  d.updateLineNumbers = null
 
-  d.nativeBarWidth = d.barHeight = d.barWidth = 0;
-  d.scrollbarsClipped = false;
+  d.nativeBarWidth = d.barHeight = d.barWidth = 0
+  d.scrollbarsClipped = false
 
   // Used to only resize the line number gutter when necessary (when
   // the amount of lines crosses a boundary that makes its width change)
-  d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
+  d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null
   // Set to true when a non-horizontal-scrolling line widget is
   // added. As an optimization, line widget aligning is skipped when
   // this is false.
-  d.alignWidgets = false;
+  d.alignWidgets = false
 
-  d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+  d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null
 
   // Tracks the maximum line length so that the horizontal scrollbar
   // can be kept static when scrolling.
-  d.maxLine = null;
-  d.maxLineLength = 0;
-  d.maxLineChanged = false;
+  d.maxLine = null
+  d.maxLineLength = 0
+  d.maxLineChanged = false
 
   // Used for measuring wheel scrolling granularity
-  d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
+  d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null
 
   // True when shift is held down.
-  d.shift = false;
+  d.shift = false
 
   // Used to track whether anything happened since the context menu
   // was opened.
-  d.selForContextMenu = null;
+  d.selForContextMenu = null
 
-  d.activeTouch = null;
+  d.activeTouch = null
 
-  input.init(d);
+  input.init(d)
 }
diff --git a/src/display/focus.js b/src/display/focus.js
index abe70f09d2..e6a9f5218d 100644
--- a/src/display/focus.js
+++ b/src/display/focus.js
@@ -1,49 +1,49 @@
-import { restartBlink } from "./selection";
-import { webkit } from "../util/browser";
-import { addClass, rmClass } from "../util/dom";
-import { signal } from "../util/event";
+import { restartBlink } from "./selection"
+import { webkit } from "../util/browser"
+import { addClass, rmClass } from "../util/dom"
+import { signal } from "../util/event"
 
 export function ensureFocus(cm) {
-  if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
+  if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm) }
 }
 
 export function delayBlurEvent(cm) {
-  cm.state.delayingBlurEvent = true;
+  cm.state.delayingBlurEvent = true
   setTimeout(function() {
     if (cm.state.delayingBlurEvent) {
-      cm.state.delayingBlurEvent = false;
-      onBlur(cm);
+      cm.state.delayingBlurEvent = false
+      onBlur(cm)
     }
-  }, 100);
+  }, 100)
 }
 
 export function onFocus(cm, e) {
-  if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
+  if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false
 
-  if (cm.options.readOnly == "nocursor") return;
+  if (cm.options.readOnly == "nocursor") return
   if (!cm.state.focused) {
-    signal(cm, "focus", cm, e);
-    cm.state.focused = true;
-    addClass(cm.display.wrapper, "CodeMirror-focused");
+    signal(cm, "focus", cm, e)
+    cm.state.focused = true
+    addClass(cm.display.wrapper, "CodeMirror-focused")
     // This test prevents this from firing when a context
     // menu is closed (since the input reset would kill the
     // select-all detection hack)
     if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
-      cm.display.input.reset();
-      if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
+      cm.display.input.reset()
+      if (webkit) setTimeout(function() { cm.display.input.reset(true) }, 20) // Issue #1730
     }
-    cm.display.input.receivedFocus();
+    cm.display.input.receivedFocus()
   }
-  restartBlink(cm);
+  restartBlink(cm)
 }
 export function onBlur(cm, e) {
-  if (cm.state.delayingBlurEvent) return;
+  if (cm.state.delayingBlurEvent) return
 
   if (cm.state.focused) {
-    signal(cm, "blur", cm, e);
-    cm.state.focused = false;
-    rmClass(cm.display.wrapper, "CodeMirror-focused");
+    signal(cm, "blur", cm, e)
+    cm.state.focused = false
+    rmClass(cm.display.wrapper, "CodeMirror-focused")
   }
-  clearInterval(cm.display.blinker);
-  setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150);
+  clearInterval(cm.display.blinker)
+  setTimeout(function() {if (!cm.state.focused) cm.display.shift = false}, 150)
 }
diff --git a/src/display/gutters.js b/src/display/gutters.js
index 0a0f591a94..3fe9a13447 100644
--- a/src/display/gutters.js
+++ b/src/display/gutters.js
@@ -1,33 +1,33 @@
-import { elt, removeChildren } from "../util/dom";
-import { indexOf } from "../util/misc";
+import { elt, removeChildren } from "../util/dom"
+import { indexOf } from "../util/misc"
 
-import { updateGutterSpace } from "./update_display";
+import { updateGutterSpace } from "./update_display"
 
 // Rebuild the gutter elements, ensure the margin to the left of the
 // code matches their width.
 export function updateGutters(cm) {
-  var gutters = cm.display.gutters, specs = cm.options.gutters;
-  removeChildren(gutters);
+  var gutters = cm.display.gutters, specs = cm.options.gutters
+  removeChildren(gutters)
   for (var i = 0; i < specs.length; ++i) {
-    var gutterClass = specs[i];
-    var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass));
+    var gutterClass = specs[i]
+    var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass))
     if (gutterClass == "CodeMirror-linenumbers") {
-      cm.display.lineGutter = gElt;
-      gElt.style.width = (cm.display.lineNumWidth || 1) + "px";
+      cm.display.lineGutter = gElt
+      gElt.style.width = (cm.display.lineNumWidth || 1) + "px"
     }
   }
-  gutters.style.display = i ? "" : "none";
-  updateGutterSpace(cm);
+  gutters.style.display = i ? "" : "none"
+  updateGutterSpace(cm)
 }
 
 // Make sure the gutters options contains the element
 // "CodeMirror-linenumbers" when the lineNumbers option is true.
 export function setGuttersForLineNumbers(options) {
-  var found = indexOf(options.gutters, "CodeMirror-linenumbers");
+  var found = indexOf(options.gutters, "CodeMirror-linenumbers")
   if (found == -1 && options.lineNumbers) {
-    options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
+    options.gutters = options.gutters.concat(["CodeMirror-linenumbers"])
   } else if (found > -1 && !options.lineNumbers) {
-    options.gutters = options.gutters.slice(0);
-    options.gutters.splice(found, 1);
+    options.gutters = options.gutters.slice(0)
+    options.gutters.splice(found, 1)
   }
 }
diff --git a/src/display/highlight_worker.js b/src/display/highlight_worker.js
index 101b9acb30..b8a48c0e91 100644
--- a/src/display/highlight_worker.js
+++ b/src/display/highlight_worker.js
@@ -1,51 +1,51 @@
-import { getStateBefore, highlightLine, processLine } from "../line/highlight";
-import { copyState } from "../modes";
-import { bind } from "../util/misc";
+import { getStateBefore, highlightLine, processLine } from "../line/highlight"
+import { copyState } from "../modes"
+import { bind } from "../util/misc"
 
-import { runInOp } from "./operations";
-import { regLineChange } from "./view_tracking";
+import { runInOp } from "./operations"
+import { regLineChange } from "./view_tracking"
 
 // HIGHLIGHT WORKER
 
 export function startWorker(cm, time) {
   if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
-    cm.state.highlight.set(time, bind(highlightWorker, cm));
+    cm.state.highlight.set(time, bind(highlightWorker, cm))
 }
 
 function highlightWorker(cm) {
-  var doc = cm.doc;
-  if (doc.frontier < doc.first) doc.frontier = doc.first;
-  if (doc.frontier >= cm.display.viewTo) return;
-  var end = +new Date + cm.options.workTime;
-  var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
-  var changedLines = [];
+  var doc = cm.doc
+  if (doc.frontier < doc.first) doc.frontier = doc.first
+  if (doc.frontier >= cm.display.viewTo) return
+  var end = +new Date + cm.options.workTime
+  var state = copyState(doc.mode, getStateBefore(cm, doc.frontier))
+  var changedLines = []
 
   doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
     if (doc.frontier >= cm.display.viewFrom) { // Visible
-      var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength;
-      var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true);
-      line.styles = highlighted.styles;
-      var oldCls = line.styleClasses, newCls = highlighted.classes;
-      if (newCls) line.styleClasses = newCls;
-      else if (oldCls) line.styleClasses = null;
+      var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength
+      var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true)
+      line.styles = highlighted.styles
+      var oldCls = line.styleClasses, newCls = highlighted.classes
+      if (newCls) line.styleClasses = newCls
+      else if (oldCls) line.styleClasses = null
       var ischange = !oldStyles || oldStyles.length != line.styles.length ||
-        oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
-      for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
-      if (ischange) changedLines.push(doc.frontier);
-      line.stateAfter = tooLong ? state : copyState(doc.mode, state);
+        oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass)
+      for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i]
+      if (ischange) changedLines.push(doc.frontier)
+      line.stateAfter = tooLong ? state : copyState(doc.mode, state)
     } else {
       if (line.text.length <= cm.options.maxHighlightLength)
-        processLine(cm, line.text, state);
-      line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
+        processLine(cm, line.text, state)
+      line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null
     }
-    ++doc.frontier;
+    ++doc.frontier
     if (+new Date > end) {
-      startWorker(cm, cm.options.workDelay);
-      return true;
+      startWorker(cm, cm.options.workDelay)
+      return true
     }
-  });
+  })
   if (changedLines.length) runInOp(cm, function() {
     for (var i = 0; i < changedLines.length; i++)
-      regLineChange(cm, changedLines[i], "text");
-  });
+      regLineChange(cm, changedLines[i], "text")
+  })
 }
diff --git a/src/display/line_numbers.js b/src/display/line_numbers.js
index 85964db7ba..22bd32ffc4 100644
--- a/src/display/line_numbers.js
+++ b/src/display/line_numbers.js
@@ -1,48 +1,48 @@
-import { lineNumberFor } from "../line/utils_line";
-import { compensateForHScroll } from "../measurement/position_measurement";
-import { elt } from "../util/dom";
+import { lineNumberFor } from "../line/utils_line"
+import { compensateForHScroll } from "../measurement/position_measurement"
+import { elt } from "../util/dom"
 
-import { updateGutterSpace } from "./update_display";
+import { updateGutterSpace } from "./update_display"
 
 // Re-align line numbers and gutter marks to compensate for
 // horizontal scrolling.
 export function alignHorizontally(cm) {
-  var display = cm.display, view = display.view;
-  if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
-  var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
-  var gutterW = display.gutters.offsetWidth, left = comp + "px";
+  var display = cm.display, view = display.view
+  if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return
+  var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft
+  var gutterW = display.gutters.offsetWidth, left = comp + "px"
   for (var i = 0; i < view.length; i++) if (!view[i].hidden) {
     if (cm.options.fixedGutter) {
       if (view[i].gutter)
-        view[i].gutter.style.left = left;
+        view[i].gutter.style.left = left
       if (view[i].gutterBackground)
-        view[i].gutterBackground.style.left = left;
+        view[i].gutterBackground.style.left = left
     }
-    var align = view[i].alignable;
+    var align = view[i].alignable
     if (align) for (var j = 0; j < align.length; j++)
-      align[j].style.left = left;
+      align[j].style.left = left
   }
   if (cm.options.fixedGutter)
-    display.gutters.style.left = (comp + gutterW) + "px";
+    display.gutters.style.left = (comp + gutterW) + "px"
 }
 
 // Used to ensure that the line number gutter is still the right
 // size for the current document size. Returns true when an update
 // is needed.
 export function maybeUpdateLineNumberWidth(cm) {
-  if (!cm.options.lineNumbers) return false;
-  var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
+  if (!cm.options.lineNumbers) return false
+  var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display
   if (last.length != display.lineNumChars) {
     var test = display.measure.appendChild(elt("div", [elt("div", last)],
-                                               "CodeMirror-linenumber CodeMirror-gutter-elt"));
-    var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
-    display.lineGutter.style.width = "";
-    display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
-    display.lineNumWidth = display.lineNumInnerWidth + padding;
-    display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
-    display.lineGutter.style.width = display.lineNumWidth + "px";
-    updateGutterSpace(cm);
-    return true;
+                                               "CodeMirror-linenumber CodeMirror-gutter-elt"))
+    var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW
+    display.lineGutter.style.width = ""
+    display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1
+    display.lineNumWidth = display.lineNumInnerWidth + padding
+    display.lineNumChars = display.lineNumInnerWidth ? last.length : -1
+    display.lineGutter.style.width = display.lineNumWidth + "px"
+    updateGutterSpace(cm)
+    return true
   }
-  return false;
+  return false
 }
diff --git a/src/display/mode_state.js b/src/display/mode_state.js
index 005e60e3b0..7742c722a4 100644
--- a/src/display/mode_state.js
+++ b/src/display/mode_state.js
@@ -1,22 +1,22 @@
-import { getMode } from "../modes";
+import { getMode } from "../modes"
 
-import { startWorker } from "./highlight_worker";
-import { regChange } from "./view_tracking";
+import { startWorker } from "./highlight_worker"
+import { regChange } from "./view_tracking"
 
 // Used to get the editor into a consistent state again when options change.
 
 export function loadMode(cm) {
-  cm.doc.mode = getMode(cm.options, cm.doc.modeOption);
-  resetModeState(cm);
+  cm.doc.mode = getMode(cm.options, cm.doc.modeOption)
+  resetModeState(cm)
 }
 
 export function resetModeState(cm) {
   cm.doc.iter(function(line) {
-    if (line.stateAfter) line.stateAfter = null;
-    if (line.styles) line.styles = null;
-  });
-  cm.doc.frontier = cm.doc.first;
-  startWorker(cm, 100);
-  cm.state.modeGen++;
-  if (cm.curOp) regChange(cm);
+    if (line.stateAfter) line.stateAfter = null
+    if (line.styles) line.styles = null
+  })
+  cm.doc.frontier = cm.doc.first
+  startWorker(cm, 100)
+  cm.state.modeGen++
+  if (cm.curOp) regChange(cm)
 }
diff --git a/src/display/operations.js b/src/display/operations.js
index a3439d0056..2873e0e91d 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -1,18 +1,18 @@
-import { clipPos } from "../line/pos";
-import { findMaxLine } from "../line/spans";
-import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement";
-import { signal } from "../util/event";
-import { activeElt } from "../util/dom";
-import { finishOperation, pushOperation } from "../util/operation_group";
-
-import { ensureFocus } from "./focus";
-import { alignHorizontally } from "./line_numbers";
-import { measureForScrollbars, updateScrollbars } from "./scrollbars";
-import { setScrollLeft } from "./scroll_events";
-import { restartBlink } from "./selection";
-import { maybeScrollWindow, scrollPosIntoView } from "./scrolling";
-import { DisplayUpdate, maybeClipScrollbars, postUpdateDisplay, setDocumentHeight, updateDisplayIfNeeded } from "./update_display";
-import { updateHeightsInViewport } from "./update_lines";
+import { clipPos } from "../line/pos"
+import { findMaxLine } from "../line/spans"
+import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement"
+import { signal } from "../util/event"
+import { activeElt } from "../util/dom"
+import { finishOperation, pushOperation } from "../util/operation_group"
+
+import { ensureFocus } from "./focus"
+import { alignHorizontally } from "./line_numbers"
+import { measureForScrollbars, updateScrollbars } from "./scrollbars"
+import { setScrollLeft } from "./scroll_events"
+import { restartBlink } from "./selection"
+import { maybeScrollWindow, scrollPosIntoView } from "./scrolling"
+import { DisplayUpdate, maybeClipScrollbars, postUpdateDisplay, setDocumentHeight, updateDisplayIfNeeded } from "./update_display"
+import { updateHeightsInViewport } from "./update_lines"
 
 // Operations are used to wrap a series of changes to the editor
 // state in such a way that each change won't have to update the
@@ -20,7 +20,7 @@ import { updateHeightsInViewport } from "./update_lines";
 // error-prone). Instead, display updates are batched and then all
 // combined and executed at once.
 
-var nextOpId = 0;
+var nextOpId = 0
 // Start a new operation.
 export function startOperation(cm) {
   cm.curOp = {
@@ -39,177 +39,177 @@ export function startOperation(cm) {
     scrollToPos: null,       // Used to scroll to a specific position
     focus: false,
     id: ++nextOpId           // Unique ID
-  };
-  pushOperation(cm.curOp);
+  }
+  pushOperation(cm.curOp)
 }
 
 // Finish an operation, updating the display and signalling delayed events
 export function endOperation(cm) {
-  var op = cm.curOp;
+  var op = cm.curOp
   finishOperation(op, function(group) {
     for (var i = 0; i < group.ops.length; i++)
-      group.ops[i].cm.curOp = null;
-    endOperations(group);
-  });
+      group.ops[i].cm.curOp = null
+    endOperations(group)
+  })
 }
 
 // The DOM updates done when an operation finishes are batched so
 // that the minimum number of relayouts are required.
 function endOperations(group) {
-  var ops = group.ops;
+  var ops = group.ops
   for (var i = 0; i < ops.length; i++) // Read DOM
-    endOperation_R1(ops[i]);
+    endOperation_R1(ops[i])
   for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-    endOperation_W1(ops[i]);
+    endOperation_W1(ops[i])
   for (var i = 0; i < ops.length; i++) // Read DOM
-    endOperation_R2(ops[i]);
+    endOperation_R2(ops[i])
   for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-    endOperation_W2(ops[i]);
+    endOperation_W2(ops[i])
   for (var i = 0; i < ops.length; i++) // Read DOM
-    endOperation_finish(ops[i]);
+    endOperation_finish(ops[i])
 }
 
 function endOperation_R1(op) {
-  var cm = op.cm, display = cm.display;
-  maybeClipScrollbars(cm);
-  if (op.updateMaxLine) findMaxLine(cm);
+  var cm = op.cm, display = cm.display
+  maybeClipScrollbars(cm)
+  if (op.updateMaxLine) findMaxLine(cm)
 
   op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
     op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
                        op.scrollToPos.to.line >= display.viewTo) ||
-    display.maxLineChanged && cm.options.lineWrapping;
+    display.maxLineChanged && cm.options.lineWrapping
   op.update = op.mustUpdate &&
-    new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
+    new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate)
 }
 
 function endOperation_W1(op) {
-  op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
+  op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update)
 }
 
 function endOperation_R2(op) {
-  var cm = op.cm, display = cm.display;
-  if (op.updatedDisplay) updateHeightsInViewport(cm);
+  var cm = op.cm, display = cm.display
+  if (op.updatedDisplay) updateHeightsInViewport(cm)
 
-  op.barMeasure = measureForScrollbars(cm);
+  op.barMeasure = measureForScrollbars(cm)
 
   // If the max line changed since it was last measured, measure it,
   // and ensure the document's width matches it.
   // updateDisplay_W2 will use these properties to do the actual resizing
   if (display.maxLineChanged && !cm.options.lineWrapping) {
-    op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
-    cm.display.sizerWidth = op.adjustWidthTo;
+    op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3
+    cm.display.sizerWidth = op.adjustWidthTo
     op.barMeasure.scrollWidth =
-      Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
-    op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
+      Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth)
+    op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm))
   }
 
   if (op.updatedDisplay || op.selectionChanged)
-    op.preparedSelection = display.input.prepareSelection(op.focus);
+    op.preparedSelection = display.input.prepareSelection(op.focus)
 }
 
 function endOperation_W2(op) {
-  var cm = op.cm;
+  var cm = op.cm
 
   if (op.adjustWidthTo != null) {
-    cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
+    cm.display.sizer.style.minWidth = op.adjustWidthTo + "px"
     if (op.maxScrollLeft < cm.doc.scrollLeft)
-      setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
-    cm.display.maxLineChanged = false;
+      setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true)
+    cm.display.maxLineChanged = false
   }
 
   var takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
   if (op.preparedSelection)
-    cm.display.input.showSelection(op.preparedSelection, takeFocus);
+    cm.display.input.showSelection(op.preparedSelection, takeFocus)
   if (op.updatedDisplay || op.startHeight != cm.doc.height)
-    updateScrollbars(cm, op.barMeasure);
+    updateScrollbars(cm, op.barMeasure)
   if (op.updatedDisplay)
-    setDocumentHeight(cm, op.barMeasure);
+    setDocumentHeight(cm, op.barMeasure)
 
-  if (op.selectionChanged) restartBlink(cm);
+  if (op.selectionChanged) restartBlink(cm)
 
   if (cm.state.focused && op.updateInput)
-    cm.display.input.reset(op.typing);
-  if (takeFocus) ensureFocus(op.cm);
+    cm.display.input.reset(op.typing)
+  if (takeFocus) ensureFocus(op.cm)
 }
 
 function endOperation_finish(op) {
-  var cm = op.cm, display = cm.display, doc = cm.doc;
+  var cm = op.cm, display = cm.display, doc = cm.doc
 
-  if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
+  if (op.updatedDisplay) postUpdateDisplay(cm, op.update)
 
   // Abort mouse wheel delta measurement, when scrolling explicitly
   if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
-    display.wheelStartX = display.wheelStartY = null;
+    display.wheelStartX = display.wheelStartY = null
 
   // Propagate the scroll position to the actual DOM scroller
   if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
-    doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
-    display.scrollbars.setScrollTop(doc.scrollTop);
-    display.scroller.scrollTop = doc.scrollTop;
+    doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop))
+    display.scrollbars.setScrollTop(doc.scrollTop)
+    display.scroller.scrollTop = doc.scrollTop
   }
   if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-    doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
-    display.scrollbars.setScrollLeft(doc.scrollLeft);
-    display.scroller.scrollLeft = doc.scrollLeft;
-    alignHorizontally(cm);
+    doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft))
+    display.scrollbars.setScrollLeft(doc.scrollLeft)
+    display.scroller.scrollLeft = doc.scrollLeft
+    alignHorizontally(cm)
   }
   // If we need to scroll a specific position into view, do so.
   if (op.scrollToPos) {
     var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
-                                   clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
-    if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
+                                   clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin)
+    if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords)
   }
 
   // Fire events for markers that are hidden/unidden by editing or
   // undoing
-  var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
+  var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers
   if (hidden) for (var i = 0; i < hidden.length; ++i)
-    if (!hidden[i].lines.length) signal(hidden[i], "hide");
+    if (!hidden[i].lines.length) signal(hidden[i], "hide")
   if (unhidden) for (var i = 0; i < unhidden.length; ++i)
-    if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
+    if (unhidden[i].lines.length) signal(unhidden[i], "unhide")
 
   if (display.wrapper.offsetHeight)
-    doc.scrollTop = cm.display.scroller.scrollTop;
+    doc.scrollTop = cm.display.scroller.scrollTop
 
   // Fire change events, and delayed event handlers
   if (op.changeObjs)
-    signal(cm, "changes", cm, op.changeObjs);
+    signal(cm, "changes", cm, op.changeObjs)
   if (op.update)
-    op.update.finish();
+    op.update.finish()
 }
 
 // Run the given function in an operation
 export function runInOp(cm, f) {
-  if (cm.curOp) return f();
-  startOperation(cm);
-  try { return f(); }
-  finally { endOperation(cm); }
+  if (cm.curOp) return f()
+  startOperation(cm)
+  try { return f() }
+  finally { endOperation(cm) }
 }
 // Wraps a function in an operation. Returns the wrapped function.
 export function operation(cm, f) {
   return function() {
-    if (cm.curOp) return f.apply(cm, arguments);
-    startOperation(cm);
-    try { return f.apply(cm, arguments); }
-    finally { endOperation(cm); }
-  };
+    if (cm.curOp) return f.apply(cm, arguments)
+    startOperation(cm)
+    try { return f.apply(cm, arguments) }
+    finally { endOperation(cm) }
+  }
 }
 // Used to add methods to editor and doc instances, wrapping them in
 // operations.
 export function methodOp(f) {
   return function() {
-    if (this.curOp) return f.apply(this, arguments);
-    startOperation(this);
-    try { return f.apply(this, arguments); }
-    finally { endOperation(this); }
-  };
+    if (this.curOp) return f.apply(this, arguments)
+    startOperation(this)
+    try { return f.apply(this, arguments) }
+    finally { endOperation(this) }
+  }
 }
 export function docMethodOp(f) {
   return function() {
-    var cm = this.cm;
-    if (!cm || cm.curOp) return f.apply(this, arguments);
-    startOperation(cm);
-    try { return f.apply(this, arguments); }
-    finally { endOperation(cm); }
-  };
+    var cm = this.cm
+    if (!cm || cm.curOp) return f.apply(this, arguments)
+    startOperation(cm)
+    try { return f.apply(this, arguments) }
+    finally { endOperation(cm) }
+  }
 }
diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index 3c5a666e28..99afe7ee50 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -1,30 +1,30 @@
-import { chrome, gecko, ie, mac, presto, safari, webkit } from "../util/browser";
-import { e_preventDefault } from "../util/event";
+import { chrome, gecko, ie, mac, presto, safari, webkit } from "../util/browser"
+import { e_preventDefault } from "../util/event"
 
-import { startWorker } from "./highlight_worker";
-import { alignHorizontally } from "./line_numbers";
-import { updateDisplaySimple} from "./update_display";
+import { startWorker } from "./highlight_worker"
+import { alignHorizontally } from "./line_numbers"
+import { updateDisplaySimple} from "./update_display"
 
 // Sync the scrollable area and scrollbars, ensure the viewport
 // covers the visible area.
 export function setScrollTop(cm, val) {
-  if (Math.abs(cm.doc.scrollTop - val) < 2) return;
-  cm.doc.scrollTop = val;
-  if (!gecko) updateDisplaySimple(cm, {top: val});
-  if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
-  cm.display.scrollbars.setScrollTop(val);
-  if (gecko) updateDisplaySimple(cm);
-  startWorker(cm, 100);
+  if (Math.abs(cm.doc.scrollTop - val) < 2) return
+  cm.doc.scrollTop = val
+  if (!gecko) updateDisplaySimple(cm, {top: val})
+  if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val
+  cm.display.scrollbars.setScrollTop(val)
+  if (gecko) updateDisplaySimple(cm)
+  startWorker(cm, 100)
 }
 // Sync scroller and scrollbar, ensure the gutter elements are
 // aligned.
 export function setScrollLeft(cm, val, isScroller) {
-  if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;
-  val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
-  cm.doc.scrollLeft = val;
-  alignHorizontally(cm);
-  if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
-  cm.display.scrollbars.setScrollLeft(val);
+  if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return
+  val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
+  cm.doc.scrollLeft = val
+  alignHorizontally(cm)
+  if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val
+  cm.display.scrollbars.setScrollLeft(val)
 }
 
 // Since the delta values reported on mouse wheel events are
@@ -38,38 +38,38 @@ export function setScrollLeft(cm, val, isScroller) {
 // is that it gives us a chance to update the display before the
 // actual scrolling happens, reducing flickering.
 
-var wheelSamples = 0, wheelPixelsPerUnit = null;
+var wheelSamples = 0, wheelPixelsPerUnit = null
 // Fill in a browser-detected starting value on browsers where we
 // know one. These don't have to be accurate -- the result of them
 // being wrong would just be a slight flicker on the first wheel
 // scroll (if it is large enough).
-if (ie) wheelPixelsPerUnit = -.53;
-else if (gecko) wheelPixelsPerUnit = 15;
-else if (chrome) wheelPixelsPerUnit = -.7;
-else if (safari) wheelPixelsPerUnit = -1/3;
+if (ie) wheelPixelsPerUnit = -.53
+else if (gecko) wheelPixelsPerUnit = 15
+else if (chrome) wheelPixelsPerUnit = -.7
+else if (safari) wheelPixelsPerUnit = -1/3
 
 var wheelEventDelta = function(e) {
-  var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
-  if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
-  if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
-  else if (dy == null) dy = e.wheelDelta;
-  return {x: dx, y: dy};
-};
+  var dx = e.wheelDeltaX, dy = e.wheelDeltaY
+  if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail
+  if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail
+  else if (dy == null) dy = e.wheelDelta
+  return {x: dx, y: dy}
+}
 export function wheelEventPixels(e) {
-  var delta = wheelEventDelta(e);
-  delta.x *= wheelPixelsPerUnit;
-  delta.y *= wheelPixelsPerUnit;
-  return delta;
+  var delta = wheelEventDelta(e)
+  delta.x *= wheelPixelsPerUnit
+  delta.y *= wheelPixelsPerUnit
+  return delta
 }
 
 export function onScrollWheel(cm, e) {
-  var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
+  var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y
 
-  var display = cm.display, scroll = display.scroller;
+  var display = cm.display, scroll = display.scroller
   // Quit if there's nothing to scroll here
-  var canScrollX = scroll.scrollWidth > scroll.clientWidth;
-  var canScrollY = scroll.scrollHeight > scroll.clientHeight;
-  if (!(dx && canScrollX || dy && canScrollY)) return;
+  var canScrollX = scroll.scrollWidth > scroll.clientWidth
+  var canScrollY = scroll.scrollHeight > scroll.clientHeight
+  if (!(dx && canScrollX || dy && canScrollY)) return
 
   // Webkit browsers on OS X abort momentum scrolls when the target
   // of the scroll event is removed from the scrollable element.
@@ -79,8 +79,8 @@ export function onScrollWheel(cm, e) {
     outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
       for (var i = 0; i < view.length; i++) {
         if (view[i].node == cur) {
-          cm.display.currentWheelTarget = cur;
-          break outer;
+          cm.display.currentWheelTarget = cur
+          break outer
         }
       }
     }
@@ -94,45 +94,45 @@ export function onScrollWheel(cm, e) {
   // better than glitching out.
   if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
     if (dy && canScrollY)
-      setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
-    setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
+      setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)))
+    setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)))
     // Only prevent default scrolling if vertical scrolling is
     // actually possible. Otherwise, it causes vertical scroll
     // jitter on OSX trackpads when deltaX is small and deltaY
     // is large (issue #3579)
     if (!dy || (dy && canScrollY))
-      e_preventDefault(e);
-    display.wheelStartX = null; // Abort measurement, if in progress
-    return;
+      e_preventDefault(e)
+    display.wheelStartX = null // Abort measurement, if in progress
+    return
   }
 
   // 'Project' the visible viewport to cover the area that is being
   // scrolled into view (if we know enough to estimate it).
   if (dy && wheelPixelsPerUnit != null) {
-    var pixels = dy * wheelPixelsPerUnit;
-    var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
-    if (pixels < 0) top = Math.max(0, top + pixels - 50);
-    else bot = Math.min(cm.doc.height, bot + pixels + 50);
-    updateDisplaySimple(cm, {top: top, bottom: bot});
+    var pixels = dy * wheelPixelsPerUnit
+    var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight
+    if (pixels < 0) top = Math.max(0, top + pixels - 50)
+    else bot = Math.min(cm.doc.height, bot + pixels + 50)
+    updateDisplaySimple(cm, {top: top, bottom: bot})
   }
 
   if (wheelSamples < 20) {
     if (display.wheelStartX == null) {
-      display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
-      display.wheelDX = dx; display.wheelDY = dy;
+      display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop
+      display.wheelDX = dx; display.wheelDY = dy
       setTimeout(function() {
-        if (display.wheelStartX == null) return;
-        var movedX = scroll.scrollLeft - display.wheelStartX;
-        var movedY = scroll.scrollTop - display.wheelStartY;
+        if (display.wheelStartX == null) return
+        var movedX = scroll.scrollLeft - display.wheelStartX
+        var movedY = scroll.scrollTop - display.wheelStartY
         var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
-          (movedX && display.wheelDX && movedX / display.wheelDX);
-        display.wheelStartX = display.wheelStartY = null;
-        if (!sample) return;
-        wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
-        ++wheelSamples;
-      }, 200);
+          (movedX && display.wheelDX && movedX / display.wheelDX)
+        display.wheelStartX = display.wheelStartY = null
+        if (!sample) return
+        wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1)
+        ++wheelSamples
+      }, 200)
     } else {
-      display.wheelDX += dx; display.wheelDY += dy;
+      display.wheelDX += dx; display.wheelDY += dy
     }
   }
 }
diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index a29444b5d3..075ae41a1b 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -1,19 +1,19 @@
-import { addClass, elt, rmClass } from "../util/dom";
-import { on } from "../util/event";
-import { scrollGap, paddingVert } from "../measurement/position_measurement";
-import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser";
-import { updateHeightsInViewport } from "./update_lines";
-import { copyObj, Delayed } from "../util/misc";
+import { addClass, elt, rmClass } from "../util/dom"
+import { on } from "../util/event"
+import { scrollGap, paddingVert } from "../measurement/position_measurement"
+import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser"
+import { updateHeightsInViewport } from "./update_lines"
+import { copyObj, Delayed } from "../util/misc"
 
-import { setScrollLeft, setScrollTop } from "./scroll_events";
+import { setScrollLeft, setScrollTop } from "./scroll_events"
 
 // SCROLLBARS
 
 // Prepare DOM reads needed to update the scrollbars. Done in one
 // shot to minimize update/measure roundtrips.
 export function measureForScrollbars(cm) {
-  var d = cm.display, gutterW = d.gutters.offsetWidth;
-  var docH = Math.round(cm.doc.height + paddingVert(cm.display));
+  var d = cm.display, gutterW = d.gutters.offsetWidth
+  var docH = Math.round(cm.doc.height + paddingVert(cm.display))
   return {
     clientHeight: d.scroller.clientHeight,
     viewHeight: d.wrapper.clientHeight,
@@ -24,81 +24,81 @@ export function measureForScrollbars(cm) {
     scrollHeight: docH + scrollGap(cm) + d.barHeight,
     nativeBarWidth: d.nativeBarWidth,
     gutterWidth: gutterW
-  };
+  }
 }
 
 function NativeScrollbars(place, scroll, cm) {
-  this.cm = cm;
-  var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
-  var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
-  place(vert); place(horiz);
+  this.cm = cm
+  var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar")
+  var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
+  place(vert); place(horiz)
 
   on(vert, "scroll", function() {
-    if (vert.clientHeight) scroll(vert.scrollTop, "vertical");
-  });
+    if (vert.clientHeight) scroll(vert.scrollTop, "vertical")
+  })
   on(horiz, "scroll", function() {
-    if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
-  });
+    if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal")
+  })
 
-  this.checkedZeroWidth = false;
+  this.checkedZeroWidth = false
   // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-  if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
+  if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px"
 }
 
 NativeScrollbars.prototype = copyObj({
   update: function(measure) {
-    var needsH = measure.scrollWidth > measure.clientWidth + 1;
-    var needsV = measure.scrollHeight > measure.clientHeight + 1;
-    var sWidth = measure.nativeBarWidth;
+    var needsH = measure.scrollWidth > measure.clientWidth + 1
+    var needsV = measure.scrollHeight > measure.clientHeight + 1
+    var sWidth = measure.nativeBarWidth
 
     if (needsV) {
-      this.vert.style.display = "block";
-      this.vert.style.bottom = needsH ? sWidth + "px" : "0";
-      var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
+      this.vert.style.display = "block"
+      this.vert.style.bottom = needsH ? sWidth + "px" : "0"
+      var totalHeight = measure.viewHeight - (needsH ? sWidth : 0)
       // A bug in IE8 can cause this value to be negative, so guard it.
       this.vert.firstChild.style.height =
-        Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
+        Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px"
     } else {
-      this.vert.style.display = "";
-      this.vert.firstChild.style.height = "0";
+      this.vert.style.display = ""
+      this.vert.firstChild.style.height = "0"
     }
 
     if (needsH) {
-      this.horiz.style.display = "block";
-      this.horiz.style.right = needsV ? sWidth + "px" : "0";
-      this.horiz.style.left = measure.barLeft + "px";
-      var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
+      this.horiz.style.display = "block"
+      this.horiz.style.right = needsV ? sWidth + "px" : "0"
+      this.horiz.style.left = measure.barLeft + "px"
+      var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0)
       this.horiz.firstChild.style.width =
-        (measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
+        (measure.scrollWidth - measure.clientWidth + totalWidth) + "px"
     } else {
-      this.horiz.style.display = "";
-      this.horiz.firstChild.style.width = "0";
+      this.horiz.style.display = ""
+      this.horiz.firstChild.style.width = "0"
     }
 
     if (!this.checkedZeroWidth && measure.clientHeight > 0) {
-      if (sWidth == 0) this.zeroWidthHack();
-      this.checkedZeroWidth = true;
+      if (sWidth == 0) this.zeroWidthHack()
+      this.checkedZeroWidth = true
     }
 
-    return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
+    return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0}
   },
   setScrollLeft: function(pos) {
-    if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
-    if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz);
+    if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos
+    if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz)
   },
   setScrollTop: function(pos) {
-    if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
-    if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert);
+    if (this.vert.scrollTop != pos) this.vert.scrollTop = pos
+    if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert)
   },
   zeroWidthHack: function() {
-    var w = mac && !mac_geMountainLion ? "12px" : "18px";
-    this.horiz.style.height = this.vert.style.width = w;
-    this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
-    this.disableHoriz = new Delayed;
-    this.disableVert = new Delayed;
+    var w = mac && !mac_geMountainLion ? "12px" : "18px"
+    this.horiz.style.height = this.vert.style.width = w
+    this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"
+    this.disableHoriz = new Delayed
+    this.disableVert = new Delayed
   },
   enableZeroWidthBar: function(bar, delay) {
-    bar.style.pointerEvents = "auto";
+    bar.style.pointerEvents = "auto"
     function maybeDisable() {
       // To find out whether the scrollbar is still visible, we
       // check whether the element under the pixel in the bottom
@@ -106,83 +106,83 @@ NativeScrollbars.prototype = copyObj({
       // itself (when the bar is still visible) or its filler child
       // (when the bar is hidden). If it is still visible, we keep
       // it enabled, if it's hidden, we disable pointer events.
-      var box = bar.getBoundingClientRect();
-      var elt = document.elementFromPoint(box.left + 1, box.bottom - 1);
-      if (elt != bar) bar.style.pointerEvents = "none";
-      else delay.set(1000, maybeDisable);
+      var box = bar.getBoundingClientRect()
+      var elt = document.elementFromPoint(box.left + 1, box.bottom - 1)
+      if (elt != bar) bar.style.pointerEvents = "none"
+      else delay.set(1000, maybeDisable)
     }
-    delay.set(1000, maybeDisable);
+    delay.set(1000, maybeDisable)
   },
   clear: function() {
-    var parent = this.horiz.parentNode;
-    parent.removeChild(this.horiz);
-    parent.removeChild(this.vert);
+    var parent = this.horiz.parentNode
+    parent.removeChild(this.horiz)
+    parent.removeChild(this.vert)
   }
-}, NativeScrollbars.prototype);
+}, NativeScrollbars.prototype)
 
 function NullScrollbars() {}
 
 NullScrollbars.prototype = copyObj({
-  update: function() { return {bottom: 0, right: 0}; },
+  update: function() { return {bottom: 0, right: 0} },
   setScrollLeft: function() {},
   setScrollTop: function() {},
   clear: function() {}
-}, NullScrollbars.prototype);
+}, NullScrollbars.prototype)
 
 export function updateScrollbars(cm, measure) {
-  if (!measure) measure = measureForScrollbars(cm);
-  var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
-  updateScrollbarsInner(cm, measure);
+  if (!measure) measure = measureForScrollbars(cm)
+  var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight
+  updateScrollbarsInner(cm, measure)
   for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
     if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
-      updateHeightsInViewport(cm);
-    updateScrollbarsInner(cm, measureForScrollbars(cm));
-    startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
+      updateHeightsInViewport(cm)
+    updateScrollbarsInner(cm, measureForScrollbars(cm))
+    startWidth = cm.display.barWidth; startHeight = cm.display.barHeight
   }
 }
 
 // Re-synchronize the fake scrollbars with the actual size of the
 // content.
 function updateScrollbarsInner(cm, measure) {
-  var d = cm.display;
-  var sizes = d.scrollbars.update(measure);
+  var d = cm.display
+  var sizes = d.scrollbars.update(measure)
 
-  d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
-  d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
+  d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px"
+  d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px"
   d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
 
   if (sizes.right && sizes.bottom) {
-    d.scrollbarFiller.style.display = "block";
-    d.scrollbarFiller.style.height = sizes.bottom + "px";
-    d.scrollbarFiller.style.width = sizes.right + "px";
-  } else d.scrollbarFiller.style.display = "";
+    d.scrollbarFiller.style.display = "block"
+    d.scrollbarFiller.style.height = sizes.bottom + "px"
+    d.scrollbarFiller.style.width = sizes.right + "px"
+  } else d.scrollbarFiller.style.display = ""
   if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
-    d.gutterFiller.style.display = "block";
-    d.gutterFiller.style.height = sizes.bottom + "px";
-    d.gutterFiller.style.width = measure.gutterWidth + "px";
-  } else d.gutterFiller.style.display = "";
+    d.gutterFiller.style.display = "block"
+    d.gutterFiller.style.height = sizes.bottom + "px"
+    d.gutterFiller.style.width = measure.gutterWidth + "px"
+  } else d.gutterFiller.style.display = ""
 }
 
-export var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
+export var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars}
 
 export function initScrollbars(cm) {
   if (cm.display.scrollbars) {
-    cm.display.scrollbars.clear();
+    cm.display.scrollbars.clear()
     if (cm.display.scrollbars.addClass)
-      rmClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+      rmClass(cm.display.wrapper, cm.display.scrollbars.addClass)
   }
 
   cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function(node) {
-    cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+    cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller)
     // Prevent clicks in the scrollbars from killing focus
     on(node, "mousedown", function() {
-      if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
-    });
-    node.setAttribute("cm-not-content", "true");
+      if (cm.state.focused) setTimeout(function() { cm.display.input.focus() }, 0)
+    })
+    node.setAttribute("cm-not-content", "true")
   }, function(pos, axis) {
-    if (axis == "horizontal") setScrollLeft(cm, pos);
-    else setScrollTop(cm, pos);
-  }, cm);
+    if (axis == "horizontal") setScrollLeft(cm, pos)
+    else setScrollTop(cm, pos)
+  }, cm)
   if (cm.display.scrollbars.addClass)
-    addClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+    addClass(cm.display.wrapper, cm.display.scrollbars.addClass)
 }
diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 50ea401262..ec8cec6715 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -1,29 +1,29 @@
-import { Pos } from "../line/pos";
-import { cursorCoords, displayHeight, displayWidth, estimateCoords, paddingTop, paddingVert, scrollGap, textHeight } from "../measurement/position_measurement";
-import { phantom } from "../util/browser";
-import { elt } from "../util/dom";
-import { signalDOMEvent } from "../util/event";
+import { Pos } from "../line/pos"
+import { cursorCoords, displayHeight, displayWidth, estimateCoords, paddingTop, paddingVert, scrollGap, textHeight } from "../measurement/position_measurement"
+import { phantom } from "../util/browser"
+import { elt } from "../util/dom"
+import { signalDOMEvent } from "../util/event"
 
-import { setScrollLeft, setScrollTop } from "./scroll_events";
+import { setScrollLeft, setScrollTop } from "./scroll_events"
 
 // SCROLLING THINGS INTO VIEW
 
 // If an editor sits on the top or bottom of the window, partially
 // scrolled out of view, this ensures that the cursor is visible.
 export function maybeScrollWindow(cm, coords) {
-  if (signalDOMEvent(cm, "scrollCursorIntoView")) return;
+  if (signalDOMEvent(cm, "scrollCursorIntoView")) return
 
-  var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
-  if (coords.top + box.top < 0) doScroll = true;
-  else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
+  var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null
+  if (coords.top + box.top < 0) doScroll = true
+  else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false
   if (doScroll != null && !phantom) {
     var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
                          (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
                          (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
-                         coords.left + "px; width: 2px;");
-    cm.display.lineSpace.appendChild(scrollNode);
-    scrollNode.scrollIntoView(doScroll);
-    cm.display.lineSpace.removeChild(scrollNode);
+                         coords.left + "px; width: 2px;")
+    cm.display.lineSpace.appendChild(scrollNode)
+    scrollNode.scrollIntoView(doScroll)
+    cm.display.lineSpace.removeChild(scrollNode)
   }
 }
 
@@ -31,33 +31,33 @@ export function maybeScrollWindow(cm, coords) {
 // it actually became visible (as line heights are accurately
 // measured, the position of something may 'drift' during drawing).
 export function scrollPosIntoView(cm, pos, end, margin) {
-  if (margin == null) margin = 0;
+  if (margin == null) margin = 0
   for (var limit = 0; limit < 5; limit++) {
-    var changed = false, coords = cursorCoords(cm, pos);
-    var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
+    var changed = false, coords = cursorCoords(cm, pos)
+    var endCoords = !end || end == pos ? coords : cursorCoords(cm, end)
     var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
                                        Math.min(coords.top, endCoords.top) - margin,
                                        Math.max(coords.left, endCoords.left),
-                                       Math.max(coords.bottom, endCoords.bottom) + margin);
-    var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
+                                       Math.max(coords.bottom, endCoords.bottom) + margin)
+    var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft
     if (scrollPos.scrollTop != null) {
-      setScrollTop(cm, scrollPos.scrollTop);
-      if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true;
+      setScrollTop(cm, scrollPos.scrollTop)
+      if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true
     }
     if (scrollPos.scrollLeft != null) {
-      setScrollLeft(cm, scrollPos.scrollLeft);
-      if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
+      setScrollLeft(cm, scrollPos.scrollLeft)
+      if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true
     }
-    if (!changed) break;
+    if (!changed) break
   }
-  return coords;
+  return coords
 }
 
 // Scroll a given set of coordinates into view (immediately).
 export function scrollIntoView(cm, x1, y1, x2, y2) {
-  var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2);
-  if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop);
-  if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft);
+  var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2)
+  if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop)
+  if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft)
 }
 
 // Calculate a new scroll position needed to scroll the given
@@ -65,53 +65,53 @@ export function scrollIntoView(cm, x1, y1, x2, y2) {
 // scrollLeft properties. When these are undefined, the
 // vertical/horizontal position does not need to be adjusted.
 export function calculateScrollPos(cm, x1, y1, x2, y2) {
-  var display = cm.display, snapMargin = textHeight(cm.display);
-  if (y1 < 0) y1 = 0;
-  var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
-  var screen = displayHeight(cm), result = {};
-  if (y2 - y1 > screen) y2 = y1 + screen;
-  var docBottom = cm.doc.height + paddingVert(display);
-  var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
+  var display = cm.display, snapMargin = textHeight(cm.display)
+  if (y1 < 0) y1 = 0
+  var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop
+  var screen = displayHeight(cm), result = {}
+  if (y2 - y1 > screen) y2 = y1 + screen
+  var docBottom = cm.doc.height + paddingVert(display)
+  var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin
   if (y1 < screentop) {
-    result.scrollTop = atTop ? 0 : y1;
+    result.scrollTop = atTop ? 0 : y1
   } else if (y2 > screentop + screen) {
-    var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen);
-    if (newTop != screentop) result.scrollTop = newTop;
+    var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen)
+    if (newTop != screentop) result.scrollTop = newTop
   }
 
-  var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
-  var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
-  var tooWide = x2 - x1 > screenw;
-  if (tooWide) x2 = x1 + screenw;
+  var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft
+  var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0)
+  var tooWide = x2 - x1 > screenw
+  if (tooWide) x2 = x1 + screenw
   if (x1 < 10)
-    result.scrollLeft = 0;
+    result.scrollLeft = 0
   else if (x1 < screenleft)
-    result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
+    result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10))
   else if (x2 > screenw + screenleft - 3)
-    result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
-  return result;
+    result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw
+  return result
 }
 
 // Store a relative adjustment to the scroll position in the current
 // operation (to be applied when the operation finishes).
 export function addToScrollPos(cm, left, top) {
-  if (left != null || top != null) resolveScrollToPos(cm);
+  if (left != null || top != null) resolveScrollToPos(cm)
   if (left != null)
-    cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left;
+    cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left
   if (top != null)
-    cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
+    cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top
 }
 
 // Make sure that at the end of the operation the current cursor is
 // shown.
 export function ensureCursorVisible(cm) {
-  resolveScrollToPos(cm);
-  var cur = cm.getCursor(), from = cur, to = cur;
+  resolveScrollToPos(cm)
+  var cur = cm.getCursor(), from = cur, to = cur
   if (!cm.options.lineWrapping) {
-    from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur;
-    to = Pos(cur.line, cur.ch + 1);
+    from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur
+    to = Pos(cur.line, cur.ch + 1)
   }
-  cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true};
+  cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true}
 }
 
 // When an operation has its scrollToPos property set, and another
@@ -119,14 +119,14 @@ export function ensureCursorVisible(cm) {
 // 'simulates' scrolling that position into view in a cheap way, so
 // that the effect of intermediate scroll commands is not ignored.
 export function resolveScrollToPos(cm) {
-  var range = cm.curOp.scrollToPos;
+  var range = cm.curOp.scrollToPos
   if (range) {
-    cm.curOp.scrollToPos = null;
-    var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to);
+    cm.curOp.scrollToPos = null
+    var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to)
     var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
                                   Math.min(from.top, to.top) - range.margin,
                                   Math.max(from.right, to.right),
-                                  Math.max(from.bottom, to.bottom) + range.margin);
-    cm.scrollTo(sPos.scrollLeft, sPos.scrollTop);
+                                  Math.max(from.bottom, to.bottom) + range.margin)
+    cm.scrollTo(sPos.scrollLeft, sPos.scrollTop)
   }
 }
diff --git a/src/display/selection.js b/src/display/selection.js
index b6ca8b6f91..3ee79fa358 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -1,137 +1,137 @@
-import { Pos } from "../line/pos";
-import { visualLine } from "../line/spans";
-import { getLine } from "../line/utils_line";
-import { charCoords, cursorCoords, displayWidth, paddingH } from "../measurement/position_measurement";
-import { getOrder, iterateBidiSections } from "../util/bidi";
-import { elt } from "../util/dom";
+import { Pos } from "../line/pos"
+import { visualLine } from "../line/spans"
+import { getLine } from "../line/utils_line"
+import { charCoords, cursorCoords, displayWidth, paddingH } from "../measurement/position_measurement"
+import { getOrder, iterateBidiSections } from "../util/bidi"
+import { elt } from "../util/dom"
 
 export function updateSelection(cm) {
-  cm.display.input.showSelection(cm.display.input.prepareSelection());
+  cm.display.input.showSelection(cm.display.input.prepareSelection())
 }
 
 export function prepareSelection(cm, primary) {
-  var doc = cm.doc, result = {};
-  var curFragment = result.cursors = document.createDocumentFragment();
-  var selFragment = result.selection = document.createDocumentFragment();
+  var doc = cm.doc, result = {}
+  var curFragment = result.cursors = document.createDocumentFragment()
+  var selFragment = result.selection = document.createDocumentFragment()
 
   for (var i = 0; i < doc.sel.ranges.length; i++) {
-    if (primary === false && i == doc.sel.primIndex) continue;
-    var range = doc.sel.ranges[i];
-    if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue;
-    var collapsed = range.empty();
+    if (primary === false && i == doc.sel.primIndex) continue
+    var range = doc.sel.ranges[i]
+    if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue
+    var collapsed = range.empty()
     if (collapsed || cm.options.showCursorWhenSelecting)
-      drawSelectionCursor(cm, range.head, curFragment);
+      drawSelectionCursor(cm, range.head, curFragment)
     if (!collapsed)
-      drawSelectionRange(cm, range, selFragment);
+      drawSelectionRange(cm, range, selFragment)
   }
-  return result;
+  return result
 }
 
 // Draws a cursor for the given range
 export function drawSelectionCursor(cm, head, output) {
-  var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
+  var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine)
 
-  var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
-  cursor.style.left = pos.left + "px";
-  cursor.style.top = pos.top + "px";
-  cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
+  var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"))
+  cursor.style.left = pos.left + "px"
+  cursor.style.top = pos.top + "px"
+  cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"
 
   if (pos.other) {
     // Secondary cursor, shown when on a 'jump' in bi-directional text
-    var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
-    otherCursor.style.display = "";
-    otherCursor.style.left = pos.other.left + "px";
-    otherCursor.style.top = pos.other.top + "px";
-    otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
+    var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"))
+    otherCursor.style.display = ""
+    otherCursor.style.left = pos.other.left + "px"
+    otherCursor.style.top = pos.other.top + "px"
+    otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px"
   }
 }
 
 // Draws the given range as a highlighted selection
 function drawSelectionRange(cm, range, output) {
-  var display = cm.display, doc = cm.doc;
-  var fragment = document.createDocumentFragment();
-  var padding = paddingH(cm.display), leftSide = padding.left;
-  var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
+  var display = cm.display, doc = cm.doc
+  var fragment = document.createDocumentFragment()
+  var padding = paddingH(cm.display), leftSide = padding.left
+  var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right
 
   function add(left, top, width, bottom) {
-    if (top < 0) top = 0;
-    top = Math.round(top);
-    bottom = Math.round(bottom);
+    if (top < 0) top = 0
+    top = Math.round(top)
+    bottom = Math.round(bottom)
     fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
                              "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) +
-                             "px; height: " + (bottom - top) + "px"));
+                             "px; height: " + (bottom - top) + "px"))
   }
 
   function drawForLine(line, fromArg, toArg) {
-    var lineObj = getLine(doc, line);
-    var lineLen = lineObj.text.length;
-    var start, end;
+    var lineObj = getLine(doc, line)
+    var lineLen = lineObj.text.length
+    var start, end
     function coords(ch, bias) {
-      return charCoords(cm, Pos(line, ch), "div", lineObj, bias);
+      return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
     }
 
     iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
-      var leftPos = coords(from, "left"), rightPos, left, right;
+      var leftPos = coords(from, "left"), rightPos, left, right
       if (from == to) {
-        rightPos = leftPos;
-        left = right = leftPos.left;
+        rightPos = leftPos
+        left = right = leftPos.left
       } else {
-        rightPos = coords(to - 1, "right");
-        if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; }
-        left = leftPos.left;
-        right = rightPos.right;
+        rightPos = coords(to - 1, "right")
+        if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp }
+        left = leftPos.left
+        right = rightPos.right
       }
-      if (fromArg == null && from == 0) left = leftSide;
+      if (fromArg == null && from == 0) left = leftSide
       if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
-        add(left, leftPos.top, null, leftPos.bottom);
-        left = leftSide;
-        if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);
+        add(left, leftPos.top, null, leftPos.bottom)
+        left = leftSide
+        if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top)
       }
-      if (toArg == null && to == lineLen) right = rightSide;
+      if (toArg == null && to == lineLen) right = rightSide
       if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
-        start = leftPos;
+        start = leftPos
       if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
-        end = rightPos;
-      if (left < leftSide + 1) left = leftSide;
-      add(left, rightPos.top, right - left, rightPos.bottom);
-    });
-    return {start: start, end: end};
+        end = rightPos
+      if (left < leftSide + 1) left = leftSide
+      add(left, rightPos.top, right - left, rightPos.bottom)
+    })
+    return {start: start, end: end}
   }
 
-  var sFrom = range.from(), sTo = range.to();
+  var sFrom = range.from(), sTo = range.to()
   if (sFrom.line == sTo.line) {
-    drawForLine(sFrom.line, sFrom.ch, sTo.ch);
+    drawForLine(sFrom.line, sFrom.ch, sTo.ch)
   } else {
-    var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
-    var singleVLine = visualLine(fromLine) == visualLine(toLine);
-    var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
-    var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
+    var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line)
+    var singleVLine = visualLine(fromLine) == visualLine(toLine)
+    var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end
+    var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start
     if (singleVLine) {
       if (leftEnd.top < rightStart.top - 2) {
-        add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
-        add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
+        add(leftEnd.right, leftEnd.top, null, leftEnd.bottom)
+        add(leftSide, rightStart.top, rightStart.left, rightStart.bottom)
       } else {
-        add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
+        add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom)
       }
     }
     if (leftEnd.bottom < rightStart.top)
-      add(leftSide, leftEnd.bottom, null, rightStart.top);
+      add(leftSide, leftEnd.bottom, null, rightStart.top)
   }
 
-  output.appendChild(fragment);
+  output.appendChild(fragment)
 }
 
 // Cursor-blinking
 export function restartBlink(cm) {
-  if (!cm.state.focused) return;
-  var display = cm.display;
-  clearInterval(display.blinker);
-  var on = true;
-  display.cursorDiv.style.visibility = "";
+  if (!cm.state.focused) return
+  var display = cm.display
+  clearInterval(display.blinker)
+  var on = true
+  display.cursorDiv.style.visibility = ""
   if (cm.options.cursorBlinkRate > 0)
     display.blinker = setInterval(function() {
-      display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
-    }, cm.options.cursorBlinkRate);
+      display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"
+    }, cm.options.cursorBlinkRate)
   else if (cm.options.cursorBlinkRate < 0)
-    display.cursorDiv.style.visibility = "hidden";
+    display.cursorDiv.style.visibility = "hidden"
 }
diff --git a/src/display/update_display.js b/src/display/update_display.js
index c69f75f9d4..06551eec8a 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -1,54 +1,54 @@
-import { sawCollapsedSpans } from "../line/saw_special_spans";
-import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans";
-import { getLine, lineNumberFor } from "../line/utils_line";
-import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement";
-import { buildLineElement, updateLineForChanges } from "../measurement/update_line";
-import { mac, webkit } from "../util/browser";
-import { activeElt, removeChildren } from "../util/dom";
-import { hasHandler, signal } from "../util/event";
-import { indexOf } from "../util/misc";
-
-import { startWorker } from "./highlight_worker";
-import { maybeUpdateLineNumberWidth } from "./line_numbers";
-import { measureForScrollbars, updateScrollbars } from "./scrollbars";
-import { updateSelection } from "./selection";
-import { updateHeightsInViewport, visibleLines } from "./update_lines";
-import { adjustView, countDirtyView, resetView } from "./view_tracking";
+import { sawCollapsedSpans } from "../line/saw_special_spans"
+import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans"
+import { getLine, lineNumberFor } from "../line/utils_line"
+import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement"
+import { buildLineElement, updateLineForChanges } from "../measurement/update_line"
+import { mac, webkit } from "../util/browser"
+import { activeElt, removeChildren } from "../util/dom"
+import { hasHandler, signal } from "../util/event"
+import { indexOf } from "../util/misc"
+
+import { startWorker } from "./highlight_worker"
+import { maybeUpdateLineNumberWidth } from "./line_numbers"
+import { measureForScrollbars, updateScrollbars } from "./scrollbars"
+import { updateSelection } from "./selection"
+import { updateHeightsInViewport, visibleLines } from "./update_lines"
+import { adjustView, countDirtyView, resetView } from "./view_tracking"
 
 // DISPLAY DRAWING
 
 export function DisplayUpdate(cm, viewport, force) {
-  var display = cm.display;
+  var display = cm.display
 
-  this.viewport = viewport;
+  this.viewport = viewport
   // Store some values that we'll need later (but don't want to force a relayout for)
-  this.visible = visibleLines(display, cm.doc, viewport);
-  this.editorIsHidden = !display.wrapper.offsetWidth;
-  this.wrapperHeight = display.wrapper.clientHeight;
-  this.wrapperWidth = display.wrapper.clientWidth;
-  this.oldDisplayWidth = displayWidth(cm);
-  this.force = force;
-  this.dims = getDimensions(cm);
-  this.events = [];
+  this.visible = visibleLines(display, cm.doc, viewport)
+  this.editorIsHidden = !display.wrapper.offsetWidth
+  this.wrapperHeight = display.wrapper.clientHeight
+  this.wrapperWidth = display.wrapper.clientWidth
+  this.oldDisplayWidth = displayWidth(cm)
+  this.force = force
+  this.dims = getDimensions(cm)
+  this.events = []
 }
 
 DisplayUpdate.prototype.signal = function(emitter, type) {
   if (hasHandler(emitter, type))
-    this.events.push(arguments);
-};
+    this.events.push(arguments)
+}
 DisplayUpdate.prototype.finish = function() {
   for (var i = 0; i < this.events.length; i++)
-    signal.apply(null, this.events[i]);
-};
+    signal.apply(null, this.events[i])
+}
 
 export function maybeClipScrollbars(cm) {
-  var display = cm.display;
+  var display = cm.display
   if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
-    display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
-    display.heightForcer.style.height = scrollGap(cm) + "px";
-    display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
-    display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
-    display.scrollbarsClipped = true;
+    display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth
+    display.heightForcer.style.height = scrollGap(cm) + "px"
+    display.sizer.style.marginBottom = -display.nativeBarWidth + "px"
+    display.sizer.style.borderRightWidth = scrollGap(cm) + "px"
+    display.scrollbarsClipped = true
   }
 }
 
@@ -56,11 +56,11 @@ export function maybeClipScrollbars(cm) {
 // (returning false) when there is nothing to be done and forced is
 // false.
 export function updateDisplayIfNeeded(cm, update) {
-  var display = cm.display, doc = cm.doc;
+  var display = cm.display, doc = cm.doc
 
   if (update.editorIsHidden) {
-    resetView(cm);
-    return false;
+    resetView(cm)
+    return false
   }
 
   // Bail out if the visible area is already rendered and nothing changed.
@@ -68,104 +68,104 @@ export function updateDisplayIfNeeded(cm, update) {
       update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
       (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
       display.renderedView == display.view && countDirtyView(cm) == 0)
-    return false;
+    return false
 
   if (maybeUpdateLineNumberWidth(cm)) {
-    resetView(cm);
-    update.dims = getDimensions(cm);
+    resetView(cm)
+    update.dims = getDimensions(cm)
   }
 
   // Compute a suitable new viewport (from & to)
-  var end = doc.first + doc.size;
-  var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
-  var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
-  if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
-  if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
+  var end = doc.first + doc.size
+  var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first)
+  var to = Math.min(end, update.visible.to + cm.options.viewportMargin)
+  if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom)
+  if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo)
   if (sawCollapsedSpans) {
-    from = visualLineNo(cm.doc, from);
-    to = visualLineEndNo(cm.doc, to);
+    from = visualLineNo(cm.doc, from)
+    to = visualLineEndNo(cm.doc, to)
   }
 
   var different = from != display.viewFrom || to != display.viewTo ||
-    display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
-  adjustView(cm, from, to);
+    display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth
+  adjustView(cm, from, to)
 
-  display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
+  display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom))
   // Position the mover div to align with the current scroll position
-  cm.display.mover.style.top = display.viewOffset + "px";
+  cm.display.mover.style.top = display.viewOffset + "px"
 
-  var toUpdate = countDirtyView(cm);
+  var toUpdate = countDirtyView(cm)
   if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
       (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
-    return false;
+    return false
 
   // For big changes, we hide the enclosing element during the
   // update, since that speeds up the operations on most browsers.
-  var focused = activeElt();
-  if (toUpdate > 4) display.lineDiv.style.display = "none";
-  patchDisplay(cm, display.updateLineNumbers, update.dims);
-  if (toUpdate > 4) display.lineDiv.style.display = "";
-  display.renderedView = display.view;
+  var focused = activeElt()
+  if (toUpdate > 4) display.lineDiv.style.display = "none"
+  patchDisplay(cm, display.updateLineNumbers, update.dims)
+  if (toUpdate > 4) display.lineDiv.style.display = ""
+  display.renderedView = display.view
   // There might have been a widget with a focused element that got
   // hidden or updated, if so re-focus it.
-  if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
+  if (focused && activeElt() != focused && focused.offsetHeight) focused.focus()
 
   // Prevent selection and cursors from interfering with the scroll
   // width and height.
-  removeChildren(display.cursorDiv);
-  removeChildren(display.selectionDiv);
-  display.gutters.style.height = display.sizer.style.minHeight = 0;
+  removeChildren(display.cursorDiv)
+  removeChildren(display.selectionDiv)
+  display.gutters.style.height = display.sizer.style.minHeight = 0
 
   if (different) {
-    display.lastWrapHeight = update.wrapperHeight;
-    display.lastWrapWidth = update.wrapperWidth;
-    startWorker(cm, 400);
+    display.lastWrapHeight = update.wrapperHeight
+    display.lastWrapWidth = update.wrapperWidth
+    startWorker(cm, 400)
   }
 
-  display.updateLineNumbers = null;
+  display.updateLineNumbers = null
 
-  return true;
+  return true
 }
 
 export function postUpdateDisplay(cm, update) {
-  var viewport = update.viewport;
+  var viewport = update.viewport
 
   for (var first = true;; first = false) {
     if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
       // Clip forced viewport to actual scrollable area.
       if (viewport && viewport.top != null)
-        viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
+        viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)}
       // Updated line heights might result in the drawn area not
       // actually covering the viewport. Keep looping until it does.
-      update.visible = visibleLines(cm.display, cm.doc, viewport);
+      update.visible = visibleLines(cm.display, cm.doc, viewport)
       if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
-        break;
+        break
     }
-    if (!updateDisplayIfNeeded(cm, update)) break;
-    updateHeightsInViewport(cm);
-    var barMeasure = measureForScrollbars(cm);
-    updateSelection(cm);
-    updateScrollbars(cm, barMeasure);
-    setDocumentHeight(cm, barMeasure);
+    if (!updateDisplayIfNeeded(cm, update)) break
+    updateHeightsInViewport(cm)
+    var barMeasure = measureForScrollbars(cm)
+    updateSelection(cm)
+    updateScrollbars(cm, barMeasure)
+    setDocumentHeight(cm, barMeasure)
   }
 
-  update.signal(cm, "update", cm);
+  update.signal(cm, "update", cm)
   if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
-    update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
-    cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
+    update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo)
+    cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo
   }
 }
 
 export function updateDisplaySimple(cm, viewport) {
-  var update = new DisplayUpdate(cm, viewport);
+  var update = new DisplayUpdate(cm, viewport)
   if (updateDisplayIfNeeded(cm, update)) {
-    updateHeightsInViewport(cm);
-    postUpdateDisplay(cm, update);
-    var barMeasure = measureForScrollbars(cm);
-    updateSelection(cm);
-    updateScrollbars(cm, barMeasure);
-    setDocumentHeight(cm, barMeasure);
-    update.finish();
+    updateHeightsInViewport(cm)
+    postUpdateDisplay(cm, update)
+    var barMeasure = measureForScrollbars(cm)
+    updateSelection(cm)
+    updateScrollbars(cm, barMeasure)
+    setDocumentHeight(cm, barMeasure)
+    update.finish()
   }
 }
 
@@ -174,54 +174,54 @@ export function updateDisplaySimple(cm, viewport) {
 // that are not there yet, and updating the ones that are out of
 // date.
 function patchDisplay(cm, updateNumbersFrom, dims) {
-  var display = cm.display, lineNumbers = cm.options.lineNumbers;
-  var container = display.lineDiv, cur = container.firstChild;
+  var display = cm.display, lineNumbers = cm.options.lineNumbers
+  var container = display.lineDiv, cur = container.firstChild
 
   function rm(node) {
-    var next = node.nextSibling;
+    var next = node.nextSibling
     // Works around a throw-scroll bug in OS X Webkit
     if (webkit && mac && cm.display.currentWheelTarget == node)
-      node.style.display = "none";
+      node.style.display = "none"
     else
-      node.parentNode.removeChild(node);
-    return next;
+      node.parentNode.removeChild(node)
+    return next
   }
 
-  var view = display.view, lineN = display.viewFrom;
+  var view = display.view, lineN = display.viewFrom
   // Loop over the elements in the view, syncing cur (the DOM nodes
   // in display.lineDiv) with the view as we go.
   for (var i = 0; i < view.length; i++) {
-    var lineView = view[i];
+    var lineView = view[i]
     if (lineView.hidden) {
     } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
-      var node = buildLineElement(cm, lineView, lineN, dims);
-      container.insertBefore(node, cur);
+      var node = buildLineElement(cm, lineView, lineN, dims)
+      container.insertBefore(node, cur)
     } else { // Already drawn
-      while (cur != lineView.node) cur = rm(cur);
+      while (cur != lineView.node) cur = rm(cur)
       var updateNumber = lineNumbers && updateNumbersFrom != null &&
-        updateNumbersFrom <= lineN && lineView.lineNumber;
+        updateNumbersFrom <= lineN && lineView.lineNumber
       if (lineView.changes) {
-        if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false;
-        updateLineForChanges(cm, lineView, lineN, dims);
+        if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false
+        updateLineForChanges(cm, lineView, lineN, dims)
       }
       if (updateNumber) {
-        removeChildren(lineView.lineNumber);
-        lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
+        removeChildren(lineView.lineNumber)
+        lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)))
       }
-      cur = lineView.node.nextSibling;
+      cur = lineView.node.nextSibling
     }
-    lineN += lineView.size;
+    lineN += lineView.size
   }
-  while (cur) cur = rm(cur);
+  while (cur) cur = rm(cur)
 }
 
 export function updateGutterSpace(cm) {
-  var width = cm.display.gutters.offsetWidth;
-  cm.display.sizer.style.marginLeft = width + "px";
+  var width = cm.display.gutters.offsetWidth
+  cm.display.sizer.style.marginLeft = width + "px"
 }
 
 export function setDocumentHeight(cm, measure) {
-  cm.display.sizer.style.minHeight = measure.docHeight + "px";
-  cm.display.heightForcer.style.top = measure.docHeight + "px";
-  cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
+  cm.display.sizer.style.minHeight = measure.docHeight + "px"
+  cm.display.heightForcer.style.top = measure.docHeight + "px"
+  cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px"
 }
diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index e10d8b9c1a..8de0698c6f 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -1,31 +1,31 @@
-import { heightAtLine } from "../line/spans";
-import { getLine, lineAtHeight, updateLineHeight } from "../line/utils_line";
-import { paddingTop, textHeight } from "../measurement/position_measurement";
-import { ie, ie_version } from "../util/browser";
+import { heightAtLine } from "../line/spans"
+import { getLine, lineAtHeight, updateLineHeight } from "../line/utils_line"
+import { paddingTop, textHeight } from "../measurement/position_measurement"
+import { ie, ie_version } from "../util/browser"
 
 // Read the actual heights of the rendered lines, and update their
 // stored heights to match.
 export function updateHeightsInViewport(cm) {
-  var display = cm.display;
-  var prevBottom = display.lineDiv.offsetTop;
+  var display = cm.display
+  var prevBottom = display.lineDiv.offsetTop
   for (var i = 0; i < display.view.length; i++) {
-    var cur = display.view[i], height;
-    if (cur.hidden) continue;
+    var cur = display.view[i], height
+    if (cur.hidden) continue
     if (ie && ie_version < 8) {
-      var bot = cur.node.offsetTop + cur.node.offsetHeight;
-      height = bot - prevBottom;
-      prevBottom = bot;
+      var bot = cur.node.offsetTop + cur.node.offsetHeight
+      height = bot - prevBottom
+      prevBottom = bot
     } else {
-      var box = cur.node.getBoundingClientRect();
-      height = box.bottom - box.top;
+      var box = cur.node.getBoundingClientRect()
+      height = box.bottom - box.top
     }
-    var diff = cur.line.height - height;
-    if (height < 2) height = textHeight(display);
+    var diff = cur.line.height - height
+    if (height < 2) height = textHeight(display)
     if (diff > .001 || diff < -.001) {
-      updateLineHeight(cur.line, height);
-      updateWidgetHeight(cur.line);
+      updateLineHeight(cur.line, height)
+      updateWidgetHeight(cur.line)
       if (cur.rest) for (var j = 0; j < cur.rest.length; j++)
-        updateWidgetHeight(cur.rest[j]);
+        updateWidgetHeight(cur.rest[j])
     }
   }
 }
@@ -34,29 +34,29 @@ export function updateHeightsInViewport(cm) {
 // given line.
 function updateWidgetHeight(line) {
   if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
-    line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight;
+    line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight
 }
 
 // Compute the lines that are visible in a given viewport (defaults
 // the the current scroll position). viewport may contain top,
 // height, and ensure (see op.scrollToPos) properties.
 export function visibleLines(display, doc, viewport) {
-  var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
-  top = Math.floor(top - paddingTop(display));
-  var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
+  var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop
+  top = Math.floor(top - paddingTop(display))
+  var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight
 
-  var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
+  var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom)
   // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
   // forces those lines into the viewport (if possible).
   if (viewport && viewport.ensure) {
-    var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
+    var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line
     if (ensureFrom < from) {
-      from = ensureFrom;
-      to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
+      from = ensureFrom
+      to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)
     } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
-      from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
-      to = ensureTo;
+      from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight)
+      to = ensureTo
     }
   }
-  return {from: from, to: Math.max(to, from + 1)};
+  return {from: from, to: Math.max(to, from + 1)}
 }
diff --git a/src/display/view_tracking.js b/src/display/view_tracking.js
index fd535178ce..d7ca682b1e 100644
--- a/src/display/view_tracking.js
+++ b/src/display/view_tracking.js
@@ -1,8 +1,8 @@
-import { buildViewArray } from "../line/line_data";
-import { sawCollapsedSpans } from "../line/saw_special_spans";
-import { visualLineEndNo, visualLineNo } from "../line/spans";
-import { findViewIndex } from "../measurement/position_measurement";
-import { indexOf } from "../util/misc";
+import { buildViewArray } from "../line/line_data"
+import { sawCollapsedSpans } from "../line/saw_special_spans"
+import { visualLineEndNo, visualLineNo } from "../line/spans"
+import { findViewIndex } from "../measurement/position_measurement"
+import { indexOf } from "../util/misc"
 
 // Updates the display.view data structure for a given change to the
 // document. From and to are in pre-change coordinates. Lendiff is
@@ -11,142 +11,142 @@ import { indexOf } from "../util/misc";
 // lines are divided into visual lines. regLineChange (below)
 // registers single-line changes.
 export function regChange(cm, from, to, lendiff) {
-  if (from == null) from = cm.doc.first;
-  if (to == null) to = cm.doc.first + cm.doc.size;
-  if (!lendiff) lendiff = 0;
+  if (from == null) from = cm.doc.first
+  if (to == null) to = cm.doc.first + cm.doc.size
+  if (!lendiff) lendiff = 0
 
-  var display = cm.display;
+  var display = cm.display
   if (lendiff && to < display.viewTo &&
       (display.updateLineNumbers == null || display.updateLineNumbers > from))
-    display.updateLineNumbers = from;
+    display.updateLineNumbers = from
 
-  cm.curOp.viewChanged = true;
+  cm.curOp.viewChanged = true
 
   if (from >= display.viewTo) { // Change after
     if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
-      resetView(cm);
+      resetView(cm)
   } else if (to <= display.viewFrom) { // Change before
     if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
-      resetView(cm);
+      resetView(cm)
     } else {
-      display.viewFrom += lendiff;
-      display.viewTo += lendiff;
+      display.viewFrom += lendiff
+      display.viewTo += lendiff
     }
   } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
-    resetView(cm);
+    resetView(cm)
   } else if (from <= display.viewFrom) { // Top overlap
-    var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
+    var cut = viewCuttingPoint(cm, to, to + lendiff, 1)
     if (cut) {
-      display.view = display.view.slice(cut.index);
-      display.viewFrom = cut.lineN;
-      display.viewTo += lendiff;
+      display.view = display.view.slice(cut.index)
+      display.viewFrom = cut.lineN
+      display.viewTo += lendiff
     } else {
-      resetView(cm);
+      resetView(cm)
     }
   } else if (to >= display.viewTo) { // Bottom overlap
-    var cut = viewCuttingPoint(cm, from, from, -1);
+    var cut = viewCuttingPoint(cm, from, from, -1)
     if (cut) {
-      display.view = display.view.slice(0, cut.index);
-      display.viewTo = cut.lineN;
+      display.view = display.view.slice(0, cut.index)
+      display.viewTo = cut.lineN
     } else {
-      resetView(cm);
+      resetView(cm)
     }
   } else { // Gap in the middle
-    var cutTop = viewCuttingPoint(cm, from, from, -1);
-    var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
+    var cutTop = viewCuttingPoint(cm, from, from, -1)
+    var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1)
     if (cutTop && cutBot) {
       display.view = display.view.slice(0, cutTop.index)
         .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
-        .concat(display.view.slice(cutBot.index));
-      display.viewTo += lendiff;
+        .concat(display.view.slice(cutBot.index))
+      display.viewTo += lendiff
     } else {
-      resetView(cm);
+      resetView(cm)
     }
   }
 
-  var ext = display.externalMeasured;
+  var ext = display.externalMeasured
   if (ext) {
     if (to < ext.lineN)
-      ext.lineN += lendiff;
+      ext.lineN += lendiff
     else if (from < ext.lineN + ext.size)
-      display.externalMeasured = null;
+      display.externalMeasured = null
   }
 }
 
 // Register a change to a single line. Type must be one of "text",
 // "gutter", "class", "widget"
 export function regLineChange(cm, line, type) {
-  cm.curOp.viewChanged = true;
-  var display = cm.display, ext = cm.display.externalMeasured;
+  cm.curOp.viewChanged = true
+  var display = cm.display, ext = cm.display.externalMeasured
   if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
-    display.externalMeasured = null;
+    display.externalMeasured = null
 
-  if (line < display.viewFrom || line >= display.viewTo) return;
-  var lineView = display.view[findViewIndex(cm, line)];
-  if (lineView.node == null) return;
-  var arr = lineView.changes || (lineView.changes = []);
-  if (indexOf(arr, type) == -1) arr.push(type);
+  if (line < display.viewFrom || line >= display.viewTo) return
+  var lineView = display.view[findViewIndex(cm, line)]
+  if (lineView.node == null) return
+  var arr = lineView.changes || (lineView.changes = [])
+  if (indexOf(arr, type) == -1) arr.push(type)
 }
 
 // Clear the view.
 export function resetView(cm) {
-  cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
-  cm.display.view = [];
-  cm.display.viewOffset = 0;
+  cm.display.viewFrom = cm.display.viewTo = cm.doc.first
+  cm.display.view = []
+  cm.display.viewOffset = 0
 }
 
 function viewCuttingPoint(cm, oldN, newN, dir) {
-  var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
+  var index = findViewIndex(cm, oldN), diff, view = cm.display.view
   if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
-    return {index: index, lineN: newN};
+    return {index: index, lineN: newN}
   for (var i = 0, n = cm.display.viewFrom; i < index; i++)
-    n += view[i].size;
+    n += view[i].size
   if (n != oldN) {
     if (dir > 0) {
-      if (index == view.length - 1) return null;
-      diff = (n + view[index].size) - oldN;
-      index++;
+      if (index == view.length - 1) return null
+      diff = (n + view[index].size) - oldN
+      index++
     } else {
-      diff = n - oldN;
+      diff = n - oldN
     }
-    oldN += diff; newN += diff;
+    oldN += diff; newN += diff
   }
   while (visualLineNo(cm.doc, newN) != newN) {
-    if (index == (dir < 0 ? 0 : view.length - 1)) return null;
-    newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
-    index += dir;
+    if (index == (dir < 0 ? 0 : view.length - 1)) return null
+    newN += dir * view[index - (dir < 0 ? 1 : 0)].size
+    index += dir
   }
-  return {index: index, lineN: newN};
+  return {index: index, lineN: newN}
 }
 
 // Force the view to cover a given range, adding empty view element
 // or clipping off existing ones as needed.
 export function adjustView(cm, from, to) {
-  var display = cm.display, view = display.view;
+  var display = cm.display, view = display.view
   if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
-    display.view = buildViewArray(cm, from, to);
-    display.viewFrom = from;
+    display.view = buildViewArray(cm, from, to)
+    display.viewFrom = from
   } else {
     if (display.viewFrom > from)
-      display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view);
+      display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view)
     else if (display.viewFrom < from)
-      display.view = display.view.slice(findViewIndex(cm, from));
-    display.viewFrom = from;
+      display.view = display.view.slice(findViewIndex(cm, from))
+    display.viewFrom = from
     if (display.viewTo < to)
-      display.view = display.view.concat(buildViewArray(cm, display.viewTo, to));
+      display.view = display.view.concat(buildViewArray(cm, display.viewTo, to))
     else if (display.viewTo > to)
-      display.view = display.view.slice(0, findViewIndex(cm, to));
+      display.view = display.view.slice(0, findViewIndex(cm, to))
   }
-  display.viewTo = to;
+  display.viewTo = to
 }
 
 // Count the number of lines in the view whose DOM representation is
 // out of date (or nonexistent).
 export function countDirtyView(cm) {
-  var view = cm.display.view, dirty = 0;
+  var view = cm.display.view, dirty = 0
   for (var i = 0; i < view.length; i++) {
-    var lineView = view[i];
-    if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty;
+    var lineView = view[i]
+    if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty
   }
-  return dirty;
+  return dirty
 }
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 7bd6a60a50..ee549d54c8 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -1,52 +1,52 @@
-import { Display } from "../display/Display";
-import { onFocus, onBlur } from "../display/focus";
-import { setGuttersForLineNumbers, updateGutters } from "../display/gutters";
-import { maybeUpdateLineNumberWidth } from "../display/line_numbers";
-import { endOperation, operation, startOperation } from "../display/operations";
-import { initScrollbars } from "../display/scrollbars";
-import { onScrollWheel, setScrollLeft, setScrollTop } from "../display/scroll_events";
-import { clipPos, Pos } from "../line/pos";
-import { posFromMouse } from "../measurement/position_measurement";
-import { eventInWidget } from "../measurement/widgets";
-import Doc from "../model/Doc";
-import { attachDoc } from "../model/document_data";
-import { Range } from "../model/selection";
-import { extendSelection } from "../model/selection_updates";
-import { captureRightClick, ie, ie_version, mobile, webkit } from "../util/browser";
-import { e_preventDefault, e_stop, on, signal, signalDOMEvent } from "../util/event";
-import { bind, copyObj, Delayed } from "../util/misc";
-
-import { clearDragCursor, onDragOver, onDragStart, onDrop } from "./drop_events";
-import { ensureGlobalHandlers } from "./global_events";
-import { onKeyDown, onKeyPress, onKeyUp } from "./key_events";
-import { clickInGutter, onContextMenu, onMouseDown } from "./mouse_events";
-import { themeChanged } from "./utils";
-import { defaults, optionHandlers, Init } from "./options";
+import { Display } from "../display/Display"
+import { onFocus, onBlur } from "../display/focus"
+import { setGuttersForLineNumbers, updateGutters } from "../display/gutters"
+import { maybeUpdateLineNumberWidth } from "../display/line_numbers"
+import { endOperation, operation, startOperation } from "../display/operations"
+import { initScrollbars } from "../display/scrollbars"
+import { onScrollWheel, setScrollLeft, setScrollTop } from "../display/scroll_events"
+import { clipPos, Pos } from "../line/pos"
+import { posFromMouse } from "../measurement/position_measurement"
+import { eventInWidget } from "../measurement/widgets"
+import Doc from "../model/Doc"
+import { attachDoc } from "../model/document_data"
+import { Range } from "../model/selection"
+import { extendSelection } from "../model/selection_updates"
+import { captureRightClick, ie, ie_version, mobile, webkit } from "../util/browser"
+import { e_preventDefault, e_stop, on, signal, signalDOMEvent } from "../util/event"
+import { bind, copyObj, Delayed } from "../util/misc"
+
+import { clearDragCursor, onDragOver, onDragStart, onDrop } from "./drop_events"
+import { ensureGlobalHandlers } from "./global_events"
+import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
+import { clickInGutter, onContextMenu, onMouseDown } from "./mouse_events"
+import { themeChanged } from "./utils"
+import { defaults, optionHandlers, Init } from "./options"
 
 // A CodeMirror instance represents an editor. This is the object
 // that user code is usually dealing with.
 
 export function CodeMirror(place, options) {
-  if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
+  if (!(this instanceof CodeMirror)) return new CodeMirror(place, options)
 
-  this.options = options = options ? copyObj(options) : {};
+  this.options = options = options ? copyObj(options) : {}
   // Determine effective options based on given values and defaults.
-  copyObj(defaults, options, false);
-  setGuttersForLineNumbers(options);
-
-  var doc = options.value;
-  if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator);
-  this.doc = doc;
-
-  var input = new CodeMirror.inputStyles[options.inputStyle](this);
-  var display = this.display = new Display(place, doc, input);
-  display.wrapper.CodeMirror = this;
-  updateGutters(this);
-  themeChanged(this);
+  copyObj(defaults, options, false)
+  setGuttersForLineNumbers(options)
+
+  var doc = options.value
+  if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator)
+  this.doc = doc
+
+  var input = new CodeMirror.inputStyles[options.inputStyle](this)
+  var display = this.display = new Display(place, doc, input)
+  display.wrapper.CodeMirror = this
+  updateGutters(this)
+  themeChanged(this)
   if (options.lineWrapping)
-    this.display.wrapper.className += " CodeMirror-wrap";
-  if (options.autofocus && !mobile) display.input.focus();
-  initScrollbars(this);
+    this.display.wrapper.className += " CodeMirror-wrap"
+  if (options.autofocus && !mobile) display.input.focus()
+  initScrollbars(this)
 
   this.state = {
     keyMaps: [],  // stores maps added by addKeyMap
@@ -62,152 +62,152 @@ export function CodeMirror(place, options) {
     highlight: new Delayed(), // stores highlight worker timeout
     keySeq: null,  // Unfinished key sequence
     specialChars: null
-  };
+  }
 
-  var cm = this;
+  var cm = this
 
   // Override magic textarea content restore that IE sometimes does
   // on our hidden textarea on reload
-  if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20);
+  if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true) }, 20)
 
-  registerEventHandlers(this);
-  ensureGlobalHandlers();
+  registerEventHandlers(this)
+  ensureGlobalHandlers()
 
-  startOperation(this);
-  this.curOp.forceUpdate = true;
-  attachDoc(this, doc);
+  startOperation(this)
+  this.curOp.forceUpdate = true
+  attachDoc(this, doc)
 
   if ((options.autofocus && !mobile) || cm.hasFocus())
-    setTimeout(bind(onFocus, this), 20);
+    setTimeout(bind(onFocus, this), 20)
   else
-    onBlur(this);
+    onBlur(this)
 
   for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
-    optionHandlers[opt](this, options[opt], Init);
-  maybeUpdateLineNumberWidth(this);
-  if (options.finishInit) options.finishInit(this);
-  for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
-  endOperation(this);
+    optionHandlers[opt](this, options[opt], Init)
+  maybeUpdateLineNumberWidth(this)
+  if (options.finishInit) options.finishInit(this)
+  for (var i = 0; i < initHooks.length; ++i) initHooks[i](this)
+  endOperation(this)
   // Suppress optimizelegibility in Webkit, since it breaks text
   // measuring on line wrapping boundaries.
   if (webkit && options.lineWrapping &&
       getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
-    display.lineDiv.style.textRendering = "auto";
+    display.lineDiv.style.textRendering = "auto"
 }
 
 // The default configuration options.
-CodeMirror.defaults = defaults;
+CodeMirror.defaults = defaults
 // Functions to run when options are changed.
-CodeMirror.optionHandlers = optionHandlers;
+CodeMirror.optionHandlers = optionHandlers
 
-export default CodeMirror;
+export default CodeMirror
 
 // Attach the necessary event handlers when initializing the editor
 function registerEventHandlers(cm) {
-  var d = cm.display;
-  on(d.scroller, "mousedown", operation(cm, onMouseDown));
+  var d = cm.display
+  on(d.scroller, "mousedown", operation(cm, onMouseDown))
   // Older IE's will not fire a second mousedown for a double click
   if (ie && ie_version < 11)
     on(d.scroller, "dblclick", operation(cm, function(e) {
-      if (signalDOMEvent(cm, e)) return;
-      var pos = posFromMouse(cm, e);
-      if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
-      e_preventDefault(e);
-      var word = cm.findWordAt(pos);
-      extendSelection(cm.doc, word.anchor, word.head);
-    }));
+      if (signalDOMEvent(cm, e)) return
+      var pos = posFromMouse(cm, e)
+      if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return
+      e_preventDefault(e)
+      var word = cm.findWordAt(pos)
+      extendSelection(cm.doc, word.anchor, word.head)
+    }))
   else
-    on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
+    on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e) })
   // Some browsers fire contextmenu *after* opening the menu, at
   // which point we can't mess with it anymore. Context menu is
   // handled in onMouseDown for these browsers.
-  if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
+  if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e)})
 
   // Used to suppress mouse event handling when a touch happens
-  var touchFinished, prevTouch = {end: 0};
+  var touchFinished, prevTouch = {end: 0}
   function finishTouch() {
     if (d.activeTouch) {
-      touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000);
-      prevTouch = d.activeTouch;
-      prevTouch.end = +new Date;
+      touchFinished = setTimeout(function() {d.activeTouch = null}, 1000)
+      prevTouch = d.activeTouch
+      prevTouch.end = +new Date
     }
   }
   function isMouseLikeTouchEvent(e) {
-    if (e.touches.length != 1) return false;
-    var touch = e.touches[0];
-    return touch.radiusX <= 1 && touch.radiusY <= 1;
+    if (e.touches.length != 1) return false
+    var touch = e.touches[0]
+    return touch.radiusX <= 1 && touch.radiusY <= 1
   }
   function farAway(touch, other) {
-    if (other.left == null) return true;
-    var dx = other.left - touch.left, dy = other.top - touch.top;
-    return dx * dx + dy * dy > 20 * 20;
+    if (other.left == null) return true
+    var dx = other.left - touch.left, dy = other.top - touch.top
+    return dx * dx + dy * dy > 20 * 20
   }
   on(d.scroller, "touchstart", function(e) {
     if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
-      clearTimeout(touchFinished);
-      var now = +new Date;
+      clearTimeout(touchFinished)
+      var now = +new Date
       d.activeTouch = {start: now, moved: false,
-                       prev: now - prevTouch.end <= 300 ? prevTouch : null};
+                       prev: now - prevTouch.end <= 300 ? prevTouch : null}
       if (e.touches.length == 1) {
-        d.activeTouch.left = e.touches[0].pageX;
-        d.activeTouch.top = e.touches[0].pageY;
+        d.activeTouch.left = e.touches[0].pageX
+        d.activeTouch.top = e.touches[0].pageY
       }
     }
-  });
+  })
   on(d.scroller, "touchmove", function() {
-    if (d.activeTouch) d.activeTouch.moved = true;
-  });
+    if (d.activeTouch) d.activeTouch.moved = true
+  })
   on(d.scroller, "touchend", function(e) {
-    var touch = d.activeTouch;
+    var touch = d.activeTouch
     if (touch && !eventInWidget(d, e) && touch.left != null &&
         !touch.moved && new Date - touch.start < 300) {
-      var pos = cm.coordsChar(d.activeTouch, "page"), range;
+      var pos = cm.coordsChar(d.activeTouch, "page"), range
       if (!touch.prev || farAway(touch, touch.prev)) // Single tap
-        range = new Range(pos, pos);
+        range = new Range(pos, pos)
       else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
-        range = cm.findWordAt(pos);
+        range = cm.findWordAt(pos)
       else // Triple tap
-        range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)));
-      cm.setSelection(range.anchor, range.head);
-      cm.focus();
-      e_preventDefault(e);
+        range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)))
+      cm.setSelection(range.anchor, range.head)
+      cm.focus()
+      e_preventDefault(e)
     }
-    finishTouch();
-  });
-  on(d.scroller, "touchcancel", finishTouch);
+    finishTouch()
+  })
+  on(d.scroller, "touchcancel", finishTouch)
 
   // Sync scrolling between fake scrollbars and real scrollable
   // area, ensure viewport is updated when scrolling.
   on(d.scroller, "scroll", function() {
     if (d.scroller.clientHeight) {
-      setScrollTop(cm, d.scroller.scrollTop);
-      setScrollLeft(cm, d.scroller.scrollLeft, true);
-      signal(cm, "scroll", cm);
+      setScrollTop(cm, d.scroller.scrollTop)
+      setScrollLeft(cm, d.scroller.scrollLeft, true)
+      signal(cm, "scroll", cm)
     }
-  });
+  })
 
   // Listen to wheel events in order to try and update the viewport on time.
-  on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
-  on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
+  on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e)})
+  on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e)})
 
   // Prevent wrapper from ever scrolling
-  on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
+  on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0 })
 
   d.dragFunctions = {
-    enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
-    over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
-    start: function(e){onDragStart(cm, e);},
+    enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e)},
+    over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e) }},
+    start: function(e){onDragStart(cm, e)},
     drop: operation(cm, onDrop),
-    leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
-  };
-
-  var inp = d.input.getField();
-  on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
-  on(inp, "keydown", operation(cm, onKeyDown));
-  on(inp, "keypress", operation(cm, onKeyPress));
-  on(inp, "focus", function(e) { onFocus(cm, e); });
-  on(inp, "blur", function (e) { onBlur(cm, e); });
+    leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm) }}
+  }
+
+  var inp = d.input.getField()
+  on(inp, "keyup", function(e) { onKeyUp.call(cm, e) })
+  on(inp, "keydown", operation(cm, onKeyDown))
+  on(inp, "keypress", operation(cm, onKeyPress))
+  on(inp, "focus", function(e) { onFocus(cm, e) })
+  on(inp, "blur", function (e) { onBlur(cm, e) })
 }
 
-var initHooks = [];
-CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
+var initHooks = []
+CodeMirror.defineInitHook = function(f) {initHooks.push(f)}
diff --git a/src/edit/commands.js b/src/edit/commands.js
index 3e8735ec13..2d670ab516 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -1,156 +1,156 @@
-import { deleteNearSelection } from "./deleteNearSelection";
-import { runInOp } from "../display/operations";
-import { ensureCursorVisible } from "../display/scrolling";
-import { clipPos, Pos } from "../line/pos";
-import { collapsedSpanAtEnd, visualLine } from "../line/spans";
-import { getLine, lineNo } from "../line/utils_line";
-import { Range } from "../model/selection";
-import { selectAll } from "../model/selection_updates";
-import { countColumn, sel_dontScroll, sel_move, spaceStr } from "../util/misc";
-import { getOrder, lineLeft, lineRight } from "../util/bidi";
+import { deleteNearSelection } from "./deleteNearSelection"
+import { runInOp } from "../display/operations"
+import { ensureCursorVisible } from "../display/scrolling"
+import { clipPos, Pos } from "../line/pos"
+import { collapsedSpanAtEnd, visualLine } from "../line/spans"
+import { getLine, lineNo } from "../line/utils_line"
+import { Range } from "../model/selection"
+import { selectAll } from "../model/selection_updates"
+import { countColumn, sel_dontScroll, sel_move, spaceStr } from "../util/misc"
+import { getOrder, lineLeft, lineRight } from "../util/bidi"
 
 // Commands are parameter-less actions that can be performed on an
 // editor, mostly used for keybindings.
 export var commands = {
   selectAll: selectAll,
   singleSelection: function(cm) {
-    cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll);
+    cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll)
   },
   killLine: function(cm) {
     deleteNearSelection(cm, function(range) {
       if (range.empty()) {
-        var len = getLine(cm.doc, range.head.line).text.length;
+        var len = getLine(cm.doc, range.head.line).text.length
         if (range.head.ch == len && range.head.line < cm.lastLine())
-          return {from: range.head, to: Pos(range.head.line + 1, 0)};
+          return {from: range.head, to: Pos(range.head.line + 1, 0)}
         else
-          return {from: range.head, to: Pos(range.head.line, len)};
+          return {from: range.head, to: Pos(range.head.line, len)}
       } else {
-        return {from: range.from(), to: range.to()};
+        return {from: range.from(), to: range.to()}
       }
-    });
+    })
   },
   deleteLine: function(cm) {
     deleteNearSelection(cm, function(range) {
       return {from: Pos(range.from().line, 0),
-              to: clipPos(cm.doc, Pos(range.to().line + 1, 0))};
-    });
+              to: clipPos(cm.doc, Pos(range.to().line + 1, 0))}
+    })
   },
   delLineLeft: function(cm) {
     deleteNearSelection(cm, function(range) {
-      return {from: Pos(range.from().line, 0), to: range.from()};
-    });
+      return {from: Pos(range.from().line, 0), to: range.from()}
+    })
   },
   delWrappedLineLeft: function(cm) {
     deleteNearSelection(cm, function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5;
-      var leftPos = cm.coordsChar({left: 0, top: top}, "div");
-      return {from: leftPos, to: range.from()};
-    });
+      var top = cm.charCoords(range.head, "div").top + 5
+      var leftPos = cm.coordsChar({left: 0, top: top}, "div")
+      return {from: leftPos, to: range.from()}
+    })
   },
   delWrappedLineRight: function(cm) {
     deleteNearSelection(cm, function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5;
-      var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-      return {from: range.from(), to: rightPos };
-    });
-  },
-  undo: function(cm) {cm.undo();},
-  redo: function(cm) {cm.redo();},
-  undoSelection: function(cm) {cm.undoSelection();},
-  redoSelection: function(cm) {cm.redoSelection();},
-  goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
-  goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
+      var top = cm.charCoords(range.head, "div").top + 5
+      var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
+      return {from: range.from(), to: rightPos }
+    })
+  },
+  undo: function(cm) {cm.undo()},
+  redo: function(cm) {cm.redo()},
+  undoSelection: function(cm) {cm.undoSelection()},
+  redoSelection: function(cm) {cm.redoSelection()},
+  goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0))},
+  goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()))},
   goLineStart: function(cm) {
-    cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); },
-                          {origin: "+move", bias: 1});
+    cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line) },
+                          {origin: "+move", bias: 1})
   },
   goLineStartSmart: function(cm) {
     cm.extendSelectionsBy(function(range) {
-      return lineStartSmart(cm, range.head);
-    }, {origin: "+move", bias: 1});
+      return lineStartSmart(cm, range.head)
+    }, {origin: "+move", bias: 1})
   },
   goLineEnd: function(cm) {
-    cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); },
-                          {origin: "+move", bias: -1});
+    cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line) },
+                          {origin: "+move", bias: -1})
   },
   goLineRight: function(cm) {
     cm.extendSelectionsBy(function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5;
-      return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-    }, sel_move);
+      var top = cm.charCoords(range.head, "div").top + 5
+      return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
+    }, sel_move)
   },
   goLineLeft: function(cm) {
     cm.extendSelectionsBy(function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5;
-      return cm.coordsChar({left: 0, top: top}, "div");
-    }, sel_move);
+      var top = cm.charCoords(range.head, "div").top + 5
+      return cm.coordsChar({left: 0, top: top}, "div")
+    }, sel_move)
   },
   goLineLeftSmart: function(cm) {
     cm.extendSelectionsBy(function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5;
-      var pos = cm.coordsChar({left: 0, top: top}, "div");
-      if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head);
-      return pos;
-    }, sel_move);
-  },
-  goLineUp: function(cm) {cm.moveV(-1, "line");},
-  goLineDown: function(cm) {cm.moveV(1, "line");},
-  goPageUp: function(cm) {cm.moveV(-1, "page");},
-  goPageDown: function(cm) {cm.moveV(1, "page");},
-  goCharLeft: function(cm) {cm.moveH(-1, "char");},
-  goCharRight: function(cm) {cm.moveH(1, "char");},
-  goColumnLeft: function(cm) {cm.moveH(-1, "column");},
-  goColumnRight: function(cm) {cm.moveH(1, "column");},
-  goWordLeft: function(cm) {cm.moveH(-1, "word");},
-  goGroupRight: function(cm) {cm.moveH(1, "group");},
-  goGroupLeft: function(cm) {cm.moveH(-1, "group");},
-  goWordRight: function(cm) {cm.moveH(1, "word");},
-  delCharBefore: function(cm) {cm.deleteH(-1, "char");},
-  delCharAfter: function(cm) {cm.deleteH(1, "char");},
-  delWordBefore: function(cm) {cm.deleteH(-1, "word");},
-  delWordAfter: function(cm) {cm.deleteH(1, "word");},
-  delGroupBefore: function(cm) {cm.deleteH(-1, "group");},
-  delGroupAfter: function(cm) {cm.deleteH(1, "group");},
-  indentAuto: function(cm) {cm.indentSelection("smart");},
-  indentMore: function(cm) {cm.indentSelection("add");},
-  indentLess: function(cm) {cm.indentSelection("subtract");},
-  insertTab: function(cm) {cm.replaceSelection("\t");},
+      var top = cm.charCoords(range.head, "div").top + 5
+      var pos = cm.coordsChar({left: 0, top: top}, "div")
+      if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head)
+      return pos
+    }, sel_move)
+  },
+  goLineUp: function(cm) {cm.moveV(-1, "line")},
+  goLineDown: function(cm) {cm.moveV(1, "line")},
+  goPageUp: function(cm) {cm.moveV(-1, "page")},
+  goPageDown: function(cm) {cm.moveV(1, "page")},
+  goCharLeft: function(cm) {cm.moveH(-1, "char")},
+  goCharRight: function(cm) {cm.moveH(1, "char")},
+  goColumnLeft: function(cm) {cm.moveH(-1, "column")},
+  goColumnRight: function(cm) {cm.moveH(1, "column")},
+  goWordLeft: function(cm) {cm.moveH(-1, "word")},
+  goGroupRight: function(cm) {cm.moveH(1, "group")},
+  goGroupLeft: function(cm) {cm.moveH(-1, "group")},
+  goWordRight: function(cm) {cm.moveH(1, "word")},
+  delCharBefore: function(cm) {cm.deleteH(-1, "char")},
+  delCharAfter: function(cm) {cm.deleteH(1, "char")},
+  delWordBefore: function(cm) {cm.deleteH(-1, "word")},
+  delWordAfter: function(cm) {cm.deleteH(1, "word")},
+  delGroupBefore: function(cm) {cm.deleteH(-1, "group")},
+  delGroupAfter: function(cm) {cm.deleteH(1, "group")},
+  indentAuto: function(cm) {cm.indentSelection("smart")},
+  indentMore: function(cm) {cm.indentSelection("add")},
+  indentLess: function(cm) {cm.indentSelection("subtract")},
+  insertTab: function(cm) {cm.replaceSelection("\t")},
   insertSoftTab: function(cm) {
-    var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
+    var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize
     for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].from();
-      var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
-      spaces.push(spaceStr(tabSize - col % tabSize));
+      var pos = ranges[i].from()
+      var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize)
+      spaces.push(spaceStr(tabSize - col % tabSize))
     }
-    cm.replaceSelections(spaces);
+    cm.replaceSelections(spaces)
   },
   defaultTab: function(cm) {
-    if (cm.somethingSelected()) cm.indentSelection("add");
-    else cm.execCommand("insertTab");
+    if (cm.somethingSelected()) cm.indentSelection("add")
+    else cm.execCommand("insertTab")
   },
   transposeChars: function(cm) {
     runInOp(cm, function() {
-      var ranges = cm.listSelections(), newSel = [];
+      var ranges = cm.listSelections(), newSel = []
       for (var i = 0; i < ranges.length; i++) {
-        var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
+        var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text
         if (line) {
-          if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1);
+          if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1)
           if (cur.ch > 0) {
-            cur = new Pos(cur.line, cur.ch + 1);
+            cur = new Pos(cur.line, cur.ch + 1)
             cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
-                            Pos(cur.line, cur.ch - 2), cur, "+transpose");
+                            Pos(cur.line, cur.ch - 2), cur, "+transpose")
           } else if (cur.line > cm.doc.first) {
-            var prev = getLine(cm.doc, cur.line - 1).text;
+            var prev = getLine(cm.doc, cur.line - 1).text
             if (prev)
               cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
                               prev.charAt(prev.length - 1),
-                              Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
+                              Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose")
           }
         }
-        newSel.push(new Range(cur, cur));
+        newSel.push(new Range(cur, cur))
       }
-      cm.setSelections(newSel);
-    });
+      cm.setSelections(newSel)
+    })
   },
   newlineAndIndent: function(cm) {
     runInOp(cm, function() {
@@ -160,40 +160,40 @@ export var commands = {
       sels = cm.listSelections()
       for (var i = 0; i < sels.length; i++)
         cm.indentLine(sels[i].from().line, null, true)
-      ensureCursorVisible(cm);
-    });
+      ensureCursorVisible(cm)
+    })
   },
   openLine: function(cm) {cm.replaceSelection("\n", "start")},
-  toggleOverwrite: function(cm) {cm.toggleOverwrite();}
-};
+  toggleOverwrite: function(cm) {cm.toggleOverwrite()}
+}
 
 
 function lineStart(cm, lineN) {
-  var line = getLine(cm.doc, lineN);
-  var visual = visualLine(line);
-  if (visual != line) lineN = lineNo(visual);
-  var order = getOrder(visual);
-  var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual);
-  return Pos(lineN, ch);
+  var line = getLine(cm.doc, lineN)
+  var visual = visualLine(line)
+  if (visual != line) lineN = lineNo(visual)
+  var order = getOrder(visual)
+  var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual)
+  return Pos(lineN, ch)
 }
 function lineEnd(cm, lineN) {
-  var merged, line = getLine(cm.doc, lineN);
+  var merged, line = getLine(cm.doc, lineN)
   while (merged = collapsedSpanAtEnd(line)) {
-    line = merged.find(1, true).line;
-    lineN = null;
+    line = merged.find(1, true).line
+    lineN = null
   }
-  var order = getOrder(line);
-  var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
-  return Pos(lineN == null ? lineNo(line) : lineN, ch);
+  var order = getOrder(line)
+  var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line)
+  return Pos(lineN == null ? lineNo(line) : lineN, ch)
 }
 function lineStartSmart(cm, pos) {
-  var start = lineStart(cm, pos.line);
-  var line = getLine(cm.doc, start.line);
-  var order = getOrder(line);
+  var start = lineStart(cm, pos.line)
+  var line = getLine(cm.doc, start.line)
+  var order = getOrder(line)
   if (!order || order[0].level == 0) {
-    var firstNonWS = Math.max(0, line.text.search(/\S/));
-    var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
-    return Pos(start.line, inWS ? 0 : firstNonWS);
+    var firstNonWS = Math.max(0, line.text.search(/\S/))
+    var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
+    return Pos(start.line, inWS ? 0 : firstNonWS)
   }
-  return start;
+  return start
 }
diff --git a/src/edit/deleteNearSelection.js b/src/edit/deleteNearSelection.js
index dd1369026c..00b4aa08b9 100644
--- a/src/edit/deleteNearSelection.js
+++ b/src/edit/deleteNearSelection.js
@@ -1,30 +1,30 @@
-import { runInOp } from "../display/operations";
-import { ensureCursorVisible } from "../display/scrolling";
-import { cmp } from "../line/pos";
-import { replaceRange } from "../model/changes";
-import { lst } from "../util/misc";
+import { runInOp } from "../display/operations"
+import { ensureCursorVisible } from "../display/scrolling"
+import { cmp } from "../line/pos"
+import { replaceRange } from "../model/changes"
+import { lst } from "../util/misc"
 
 // Helper for deleting text near the selection(s), used to implement
 // backspace, delete, and similar functionality.
 export function deleteNearSelection(cm, compute) {
-  var ranges = cm.doc.sel.ranges, kill = [];
+  var ranges = cm.doc.sel.ranges, kill = []
   // Build up a set of ranges to kill first, merging overlapping
   // ranges.
   for (var i = 0; i < ranges.length; i++) {
-    var toKill = compute(ranges[i]);
+    var toKill = compute(ranges[i])
     while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
-      var replaced = kill.pop();
+      var replaced = kill.pop()
       if (cmp(replaced.from, toKill.from) < 0) {
-        toKill.from = replaced.from;
-        break;
+        toKill.from = replaced.from
+        break
       }
     }
-    kill.push(toKill);
+    kill.push(toKill)
   }
   // Next, remove those actual ranges.
   runInOp(cm, function() {
     for (var i = kill.length - 1; i >= 0; i--)
-      replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
-    ensureCursorVisible(cm);
-  });
+      replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete")
+    ensureCursorVisible(cm)
+  })
 }
diff --git a/src/edit/drop_events.js b/src/edit/drop_events.js
index fac58a266e..d2aeaa7cef 100644
--- a/src/edit/drop_events.js
+++ b/src/edit/drop_events.js
@@ -1,74 +1,74 @@
-import { drawSelectionCursor } from "../display/selection";
-import { operation } from "../display/operations";
-import { clipPos } from "../line/pos";
-import { posFromMouse } from "../measurement/position_measurement";
-import { eventInWidget } from "../measurement/widgets";
-import { makeChange, replaceRange } from "../model/changes";
-import { changeEnd } from "../model/change_measurement";
-import { simpleSelection } from "../model/selection";
-import { setSelectionNoUndo, setSelectionReplaceHistory } from "../model/selection_updates";
-import { ie, presto, safari } from "../util/browser";
-import { elt, removeChildrenAndAdd } from "../util/dom";
-import { e_preventDefault, e_stop, signalDOMEvent } from "../util/event";
-import { indexOf } from "../util/misc";
+import { drawSelectionCursor } from "../display/selection"
+import { operation } from "../display/operations"
+import { clipPos } from "../line/pos"
+import { posFromMouse } from "../measurement/position_measurement"
+import { eventInWidget } from "../measurement/widgets"
+import { makeChange, replaceRange } from "../model/changes"
+import { changeEnd } from "../model/change_measurement"
+import { simpleSelection } from "../model/selection"
+import { setSelectionNoUndo, setSelectionReplaceHistory } from "../model/selection_updates"
+import { ie, presto, safari } from "../util/browser"
+import { elt, removeChildrenAndAdd } from "../util/dom"
+import { e_preventDefault, e_stop, signalDOMEvent } from "../util/event"
+import { indexOf } from "../util/misc"
 
 // Kludge to work around strange IE behavior where it'll sometimes
 // re-fire a series of drag-related events right after the drop (#1551)
-var lastDrop = 0;
+var lastDrop = 0
 
 export function onDrop(e) {
-  var cm = this;
-  clearDragCursor(cm);
+  var cm = this
+  clearDragCursor(cm)
   if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
-    return;
-  e_preventDefault(e);
-  if (ie) lastDrop = +new Date;
-  var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-  if (!pos || cm.isReadOnly()) return;
+    return
+  e_preventDefault(e)
+  if (ie) lastDrop = +new Date
+  var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files
+  if (!pos || cm.isReadOnly()) return
   // Might be a file drop, in which case we simply extract the text
   // and insert it.
   if (files && files.length && window.FileReader && window.File) {
-    var n = files.length, text = Array(n), read = 0;
+    var n = files.length, text = Array(n), read = 0
     var loadFile = function(file, i) {
       if (cm.options.allowDropFileTypes &&
           indexOf(cm.options.allowDropFileTypes, file.type) == -1)
-        return;
+        return
 
-      var reader = new FileReader;
+      var reader = new FileReader
       reader.onload = operation(cm, function() {
-        var content = reader.result;
-        if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = "";
-        text[i] = content;
+        var content = reader.result
+        if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = ""
+        text[i] = content
         if (++read == n) {
-          pos = clipPos(cm.doc, pos);
+          pos = clipPos(cm.doc, pos)
           var change = {from: pos, to: pos,
                         text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
-                        origin: "paste"};
-          makeChange(cm.doc, change);
-          setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
+                        origin: "paste"}
+          makeChange(cm.doc, change)
+          setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)))
         }
-      });
-      reader.readAsText(file);
-    };
-    for (var i = 0; i < n; ++i) loadFile(files[i], i);
+      })
+      reader.readAsText(file)
+    }
+    for (var i = 0; i < n; ++i) loadFile(files[i], i)
   } else { // Normal drop
     // Don't do a replace if the drop happened inside of the selected text.
     if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
-      cm.state.draggingText(e);
+      cm.state.draggingText(e)
       // Ensure the editor is re-focused
-      setTimeout(function() {cm.display.input.focus();}, 20);
-      return;
+      setTimeout(function() {cm.display.input.focus()}, 20)
+      return
     }
     try {
-      var text = e.dataTransfer.getData("Text");
+      var text = e.dataTransfer.getData("Text")
       if (text) {
         if (cm.state.draggingText && !cm.state.draggingText.copy)
-          var selected = cm.listSelections();
-        setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
+          var selected = cm.listSelections()
+        setSelectionNoUndo(cm.doc, simpleSelection(pos, pos))
         if (selected) for (var i = 0; i < selected.length; ++i)
-          replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
-        cm.replaceSelection(text, "around", "paste");
-        cm.display.input.focus();
+          replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag")
+        cm.replaceSelection(text, "around", "paste")
+        cm.display.input.focus()
       }
     }
     catch(e){}
@@ -76,43 +76,43 @@ export function onDrop(e) {
 }
 
 export function onDragStart(cm, e) {
-  if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
-  if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
+  if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return }
+  if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return
 
-  e.dataTransfer.setData("Text", cm.getSelection());
+  e.dataTransfer.setData("Text", cm.getSelection())
   e.dataTransfer.effectAllowed = "copyMove"
 
   // Use dummy image instead of default browsers image.
   // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
   if (e.dataTransfer.setDragImage && !safari) {
-    var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
-    img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
+    var img = elt("img", null, null, "position: fixed; left: 0; top: 0;")
+    img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
     if (presto) {
-      img.width = img.height = 1;
-      cm.display.wrapper.appendChild(img);
+      img.width = img.height = 1
+      cm.display.wrapper.appendChild(img)
       // Force a relayout, or Opera won't use our image for some obscure reason
-      img._top = img.offsetTop;
+      img._top = img.offsetTop
     }
-    e.dataTransfer.setDragImage(img, 0, 0);
-    if (presto) img.parentNode.removeChild(img);
+    e.dataTransfer.setDragImage(img, 0, 0)
+    if (presto) img.parentNode.removeChild(img)
   }
 }
 
 export function onDragOver(cm, e) {
-  var pos = posFromMouse(cm, e);
-  if (!pos) return;
-  var frag = document.createDocumentFragment();
-  drawSelectionCursor(cm, pos, frag);
+  var pos = posFromMouse(cm, e)
+  if (!pos) return
+  var frag = document.createDocumentFragment()
+  drawSelectionCursor(cm, pos, frag)
   if (!cm.display.dragCursor) {
-    cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
-    cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
+    cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors")
+    cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv)
   }
-  removeChildrenAndAdd(cm.display.dragCursor, frag);
+  removeChildrenAndAdd(cm.display.dragCursor, frag)
 }
 
 export function clearDragCursor(cm) {
   if (cm.display.dragCursor) {
-    cm.display.lineSpace.removeChild(cm.display.dragCursor);
-    cm.display.dragCursor = null;
+    cm.display.lineSpace.removeChild(cm.display.dragCursor)
+    cm.display.dragCursor = null
   }
 }
diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
index aa1a040fa9..dda26d4bff 100644
--- a/src/edit/fromTextArea.js
+++ b/src/edit/fromTextArea.js
@@ -1,59 +1,59 @@
-import { CodeMirror } from "./CodeMirror";
-import { activeElt } from "../util/dom";
-import { off, on } from "../util/event";
-import { copyObj } from "../util/misc";
+import { CodeMirror } from "./CodeMirror"
+import { activeElt } from "../util/dom"
+import { off, on } from "../util/event"
+import { copyObj } from "../util/misc"
 
 export function fromTextArea(textarea, options) {
-  options = options ? copyObj(options) : {};
-  options.value = textarea.value;
+  options = options ? copyObj(options) : {}
+  options.value = textarea.value
   if (!options.tabindex && textarea.tabIndex)
-    options.tabindex = textarea.tabIndex;
+    options.tabindex = textarea.tabIndex
   if (!options.placeholder && textarea.placeholder)
-    options.placeholder = textarea.placeholder;
+    options.placeholder = textarea.placeholder
   // Set autofocus to true if this textarea is focused, or if it has
   // autofocus and no other element is focused.
   if (options.autofocus == null) {
-    var hasFocus = activeElt();
+    var hasFocus = activeElt()
     options.autofocus = hasFocus == textarea ||
-      textarea.getAttribute("autofocus") != null && hasFocus == document.body;
+      textarea.getAttribute("autofocus") != null && hasFocus == document.body
   }
 
-  function save() {textarea.value = cm.getValue();}
+  function save() {textarea.value = cm.getValue()}
   if (textarea.form) {
-    on(textarea.form, "submit", save);
+    on(textarea.form, "submit", save)
     // Deplorable hack to make the submit method do the right thing.
     if (!options.leaveSubmitMethodAlone) {
-      var form = textarea.form, realSubmit = form.submit;
+      var form = textarea.form, realSubmit = form.submit
       try {
         var wrappedSubmit = form.submit = function() {
-          save();
-          form.submit = realSubmit;
-          form.submit();
-          form.submit = wrappedSubmit;
-        };
+          save()
+          form.submit = realSubmit
+          form.submit()
+          form.submit = wrappedSubmit
+        }
       } catch(e) {}
     }
   }
 
   options.finishInit = function(cm) {
-    cm.save = save;
-    cm.getTextArea = function() { return textarea; };
+    cm.save = save
+    cm.getTextArea = function() { return textarea }
     cm.toTextArea = function() {
-      cm.toTextArea = isNaN; // Prevent this from being ran twice
-      save();
-      textarea.parentNode.removeChild(cm.getWrapperElement());
-      textarea.style.display = "";
+      cm.toTextArea = isNaN // Prevent this from being ran twice
+      save()
+      textarea.parentNode.removeChild(cm.getWrapperElement())
+      textarea.style.display = ""
       if (textarea.form) {
-        off(textarea.form, "submit", save);
+        off(textarea.form, "submit", save)
         if (typeof textarea.form.submit == "function")
-          textarea.form.submit = realSubmit;
+          textarea.form.submit = realSubmit
       }
-    };
-  };
+    }
+  }
 
-  textarea.style.display = "none";
+  textarea.style.display = "none"
   var cm = CodeMirror(function(node) {
-    textarea.parentNode.insertBefore(node, textarea.nextSibling);
-  }, options);
-  return cm;
+    textarea.parentNode.insertBefore(node, textarea.nextSibling)
+  }, options)
+  return cm
 }
diff --git a/src/edit/global_events.js b/src/edit/global_events.js
index b219285dfb..57542f2d32 100644
--- a/src/edit/global_events.js
+++ b/src/edit/global_events.js
@@ -1,46 +1,46 @@
-import { onBlur } from "../display/focus";
-import { on } from "../util/event";
+import { onBlur } from "../display/focus"
+import { on } from "../util/event"
 
 // These must be handled carefully, because naively registering a
 // handler for each editor will cause the editors to never be
 // garbage collected.
 
 function forEachCodeMirror(f) {
-  if (!document.body.getElementsByClassName) return;
-  var byClass = document.body.getElementsByClassName("CodeMirror");
+  if (!document.body.getElementsByClassName) return
+  var byClass = document.body.getElementsByClassName("CodeMirror")
   for (var i = 0; i < byClass.length; i++) {
-    var cm = byClass[i].CodeMirror;
-    if (cm) f(cm);
+    var cm = byClass[i].CodeMirror
+    if (cm) f(cm)
   }
 }
 
-var globalsRegistered = false;
+var globalsRegistered = false
 export function ensureGlobalHandlers() {
-  if (globalsRegistered) return;
-  registerGlobalHandlers();
-  globalsRegistered = true;
+  if (globalsRegistered) return
+  registerGlobalHandlers()
+  globalsRegistered = true
 }
 function registerGlobalHandlers() {
   // When the window resizes, we need to refresh active editors.
-  var resizeTimer;
+  var resizeTimer
   on(window, "resize", function() {
     if (resizeTimer == null) resizeTimer = setTimeout(function() {
-      resizeTimer = null;
-      forEachCodeMirror(onResize);
-    }, 100);
-  });
+      resizeTimer = null
+      forEachCodeMirror(onResize)
+    }, 100)
+  })
   // When the window loses focus, we want to show the editor as blurred
   on(window, "blur", function() {
-    forEachCodeMirror(onBlur);
-  });
+    forEachCodeMirror(onBlur)
+  })
 }
 // Called when the window resizes
 function onResize(cm) {
-  var d = cm.display;
+  var d = cm.display
   if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
-    return;
+    return
   // Might be a text scaling operation, clear size caches.
-  d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
-  d.scrollbarsClipped = false;
-  cm.setSize();
+  d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null
+  d.scrollbarsClipped = false
+  cm.setSize()
 }
diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index 92763037c9..9a4944414c 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -1,153 +1,153 @@
-import { signalLater } from "../util/operation_group";
-import { restartBlink } from "../display/selection";
-import { isModifierKey, keyName, lookupKey } from "../input/keymap";
-import { eventInWidget } from "../measurement/widgets";
-import { ie, ie_version, mac, presto } from "../util/browser";
-import { activeElt, addClass, rmClass } from "../util/dom";
-import { e_preventDefault, off, on, signalDOMEvent } from "../util/event";
-import { hasCopyEvent } from "../util/feature_detection";
-import { Delayed, Pass } from "../util/misc";
-
-import { commands } from "./commands";
+import { signalLater } from "../util/operation_group"
+import { restartBlink } from "../display/selection"
+import { isModifierKey, keyName, lookupKey } from "../input/keymap"
+import { eventInWidget } from "../measurement/widgets"
+import { ie, ie_version, mac, presto } from "../util/browser"
+import { activeElt, addClass, rmClass } from "../util/dom"
+import { e_preventDefault, off, on, signalDOMEvent } from "../util/event"
+import { hasCopyEvent } from "../util/feature_detection"
+import { Delayed, Pass } from "../util/misc"
+
+import { commands } from "./commands"
 
 // Run a handler that was bound to a key.
 function doHandleBinding(cm, bound, dropShift) {
   if (typeof bound == "string") {
-    bound = commands[bound];
-    if (!bound) return false;
+    bound = commands[bound]
+    if (!bound) return false
   }
   // Ensure previous input has been read, so that the handler sees a
   // consistent view of the document
-  cm.display.input.ensurePolled();
-  var prevShift = cm.display.shift, done = false;
+  cm.display.input.ensurePolled()
+  var prevShift = cm.display.shift, done = false
   try {
-    if (cm.isReadOnly()) cm.state.suppressEdits = true;
-    if (dropShift) cm.display.shift = false;
-    done = bound(cm) != Pass;
+    if (cm.isReadOnly()) cm.state.suppressEdits = true
+    if (dropShift) cm.display.shift = false
+    done = bound(cm) != Pass
   } finally {
-    cm.display.shift = prevShift;
-    cm.state.suppressEdits = false;
+    cm.display.shift = prevShift
+    cm.state.suppressEdits = false
   }
-  return done;
+  return done
 }
 
 function lookupKeyForEditor(cm, name, handle) {
   for (var i = 0; i < cm.state.keyMaps.length; i++) {
-    var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
-    if (result) return result;
+    var result = lookupKey(name, cm.state.keyMaps[i], handle, cm)
+    if (result) return result
   }
   return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
-    || lookupKey(name, cm.options.keyMap, handle, cm);
+    || lookupKey(name, cm.options.keyMap, handle, cm)
 }
 
-var stopSeq = new Delayed;
+var stopSeq = new Delayed
 function dispatchKey(cm, name, e, handle) {
-  var seq = cm.state.keySeq;
+  var seq = cm.state.keySeq
   if (seq) {
-    if (isModifierKey(name)) return "handled";
+    if (isModifierKey(name)) return "handled"
     stopSeq.set(50, function() {
       if (cm.state.keySeq == seq) {
-        cm.state.keySeq = null;
-        cm.display.input.reset();
+        cm.state.keySeq = null
+        cm.display.input.reset()
       }
-    });
-    name = seq + " " + name;
+    })
+    name = seq + " " + name
   }
-  var result = lookupKeyForEditor(cm, name, handle);
+  var result = lookupKeyForEditor(cm, name, handle)
 
   if (result == "multi")
-    cm.state.keySeq = name;
+    cm.state.keySeq = name
   if (result == "handled")
-    signalLater(cm, "keyHandled", cm, name, e);
+    signalLater(cm, "keyHandled", cm, name, e)
 
   if (result == "handled" || result == "multi") {
-    e_preventDefault(e);
-    restartBlink(cm);
+    e_preventDefault(e)
+    restartBlink(cm)
   }
 
   if (seq && !result && /\'$/.test(name)) {
-    e_preventDefault(e);
-    return true;
+    e_preventDefault(e)
+    return true
   }
-  return !!result;
+  return !!result
 }
 
 // Handle a key from the keydown event.
 function handleKeyBinding(cm, e) {
-  var name = keyName(e, true);
-  if (!name) return false;
+  var name = keyName(e, true)
+  if (!name) return false
 
   if (e.shiftKey && !cm.state.keySeq) {
     // First try to resolve full name (including 'Shift-'). Failing
     // that, see if there is a cursor-motion command (starting with
     // 'go') bound to the keyname without 'Shift-'.
-    return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
+    return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true)})
         || dispatchKey(cm, name, e, function(b) {
              if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
-               return doHandleBinding(cm, b);
-           });
+               return doHandleBinding(cm, b)
+           })
   } else {
-    return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
+    return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b) })
   }
 }
 
 // Handle a key from the keypress event
 function handleCharBinding(cm, e, ch) {
   return dispatchKey(cm, "'" + ch + "'", e,
-                     function(b) { return doHandleBinding(cm, b, true); });
+                     function(b) { return doHandleBinding(cm, b, true) })
 }
 
-var lastStoppedKey = null;
+var lastStoppedKey = null
 export function onKeyDown(e) {
-  var cm = this;
-  cm.curOp.focus = activeElt();
-  if (signalDOMEvent(cm, e)) return;
+  var cm = this
+  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;
-  var code = e.keyCode;
-  cm.display.shift = code == 16 || e.shiftKey;
-  var handled = handleKeyBinding(cm, e);
+  if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false
+  var code = e.keyCode
+  cm.display.shift = code == 16 || e.shiftKey
+  var handled = handleKeyBinding(cm, e)
   if (presto) {
-    lastStoppedKey = handled ? code : null;
+    lastStoppedKey = handled ? code : null
     // Opera has no cut event... we try to at least catch the key combo
     if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
-      cm.replaceSelection("", null, "cut");
+      cm.replaceSelection("", null, "cut")
   }
 
   // Turn mouse into crosshair when Alt is held on Mac.
   if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
-    showCrossHair(cm);
+    showCrossHair(cm)
 }
 
 function showCrossHair(cm) {
-  var lineDiv = cm.display.lineDiv;
-  addClass(lineDiv, "CodeMirror-crosshair");
+  var lineDiv = cm.display.lineDiv
+  addClass(lineDiv, "CodeMirror-crosshair")
 
   function up(e) {
     if (e.keyCode == 18 || !e.altKey) {
-      rmClass(lineDiv, "CodeMirror-crosshair");
-      off(document, "keyup", up);
-      off(document, "mouseover", up);
+      rmClass(lineDiv, "CodeMirror-crosshair")
+      off(document, "keyup", up)
+      off(document, "mouseover", up)
     }
   }
-  on(document, "keyup", up);
-  on(document, "mouseover", up);
+  on(document, "keyup", up)
+  on(document, "mouseover", up)
 }
 
 export function onKeyUp(e) {
-  if (e.keyCode == 16) this.doc.sel.shift = false;
-  signalDOMEvent(this, e);
+  if (e.keyCode == 16) this.doc.sel.shift = false
+  signalDOMEvent(this, e)
 }
 
 export function onKeyPress(e) {
-  var cm = this;
-  if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
-  var keyCode = e.keyCode, charCode = e.charCode;
-  if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-  if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
-  var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
+  var cm = this
+  if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return
+  var keyCode = e.keyCode, charCode = e.charCode
+  if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}
+  if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return
+  var ch = String.fromCharCode(charCode == null ? keyCode : charCode)
   // Some browsers fire keypress events for backspace
-  if (ch == "\x08") return;
-  if (handleCharBinding(cm, e, ch)) return;
-  cm.display.input.onKeyPress(e);
+  if (ch == "\x08") return
+  if (handleCharBinding(cm, e, ch)) return
+  cm.display.input.onKeyPress(e)
 }
diff --git a/src/edit/legacy.js b/src/edit/legacy.js
index 150f8a7225..bc3df6c8f1 100644
--- a/src/edit/legacy.js
+++ b/src/edit/legacy.js
@@ -1,62 +1,62 @@
-import { scrollbarModel } from "../display/scrollbars";
-import { wheelEventPixels } from "../display/scroll_events";
-import { keyMap, keyName, isModifierKey, lookupKey, normalizeKeyMap } from "../input/keymap";
-import { keyNames } from "../input/keynames";
-import { Line } from "../line/line_data";
-import { cmp, Pos } from "../line/pos";
-import { changeEnd } from "../model/change_measurement";
-import Doc from "../model/Doc";
-import { LineWidget } from "../model/line_widget";
-import { SharedTextMarker, TextMarker } from "../model/mark_text";
-import { copyState, extendMode, getMode, innerMode, mimeModes, modeExtensions, modes, resolveMode, startState } from "../modes";
-import { addClass, contains, rmClass } from "../util/dom";
-import { e_preventDefault, e_stop, e_stopPropagation, off, on, signal } from "../util/event";
-import { splitLinesAuto } from "../util/feature_detection";
-import { countColumn, findColumn, isWordCharBasic, Pass } from "../util/misc";
-import StringStream from "../util/StringStream";
+import { scrollbarModel } from "../display/scrollbars"
+import { wheelEventPixels } from "../display/scroll_events"
+import { keyMap, keyName, isModifierKey, lookupKey, normalizeKeyMap } from "../input/keymap"
+import { keyNames } from "../input/keynames"
+import { Line } from "../line/line_data"
+import { cmp, Pos } from "../line/pos"
+import { changeEnd } from "../model/change_measurement"
+import Doc from "../model/Doc"
+import { LineWidget } from "../model/line_widget"
+import { SharedTextMarker, TextMarker } from "../model/mark_text"
+import { copyState, extendMode, getMode, innerMode, mimeModes, modeExtensions, modes, resolveMode, startState } from "../modes"
+import { addClass, contains, rmClass } from "../util/dom"
+import { e_preventDefault, e_stop, e_stopPropagation, off, on, signal } from "../util/event"
+import { splitLinesAuto } from "../util/feature_detection"
+import { countColumn, findColumn, isWordCharBasic, Pass } from "../util/misc"
+import StringStream from "../util/StringStream"
 
-import { commands } from "./commands";
+import { commands } from "./commands"
 
 export function addLegacyProps(CodeMirror) {
-  CodeMirror.off = off;
-  CodeMirror.on = on;
-  CodeMirror.wheelEventPixels = wheelEventPixels;
-  CodeMirror.Doc = Doc;
-  CodeMirror.splitLines = splitLinesAuto;
-  CodeMirror.countColumn = countColumn;
-  CodeMirror.findColumn = findColumn;
-  CodeMirror.isWordChar = isWordCharBasic;
-  CodeMirror.Pass = Pass;
-  CodeMirror.signal = signal;
-  CodeMirror.Line = Line;
-  CodeMirror.changeEnd = changeEnd;
-  CodeMirror.scrollbarModel = scrollbarModel;
-  CodeMirror.Pos = Pos;
-  CodeMirror.cmpPos = cmp;
-  CodeMirror.modes = modes;
-  CodeMirror.mimeModes = mimeModes;
-  CodeMirror.resolveMode = resolveMode;
-  CodeMirror.getMode = getMode;
-  CodeMirror.modeExtensions = modeExtensions;
-  CodeMirror.extendMode = extendMode;
-  CodeMirror.copyState = copyState;
-  CodeMirror.startState = startState;
-  CodeMirror.innerMode = innerMode;
-  CodeMirror.commands = commands;
-  CodeMirror.keyMap = keyMap;
-  CodeMirror.keyName = keyName;
-  CodeMirror.isModifierKey = isModifierKey;
-  CodeMirror.lookupKey = lookupKey;
-  CodeMirror.normalizeKeyMap = normalizeKeyMap;
-  CodeMirror.StringStream = StringStream;
-  CodeMirror.SharedTextMarker = SharedTextMarker;
-  CodeMirror.TextMarker = TextMarker;
-  CodeMirror.LineWidget = LineWidget;
-  CodeMirror.e_preventDefault = e_preventDefault;
-  CodeMirror.e_stopPropagation = e_stopPropagation;
-  CodeMirror.e_stop = e_stop;
-  CodeMirror.addClass = addClass;
-  CodeMirror.contains = contains;
-  CodeMirror.rmClass = rmClass;
-  CodeMirror.keyNames = keyNames;
+  CodeMirror.off = off
+  CodeMirror.on = on
+  CodeMirror.wheelEventPixels = wheelEventPixels
+  CodeMirror.Doc = Doc
+  CodeMirror.splitLines = splitLinesAuto
+  CodeMirror.countColumn = countColumn
+  CodeMirror.findColumn = findColumn
+  CodeMirror.isWordChar = isWordCharBasic
+  CodeMirror.Pass = Pass
+  CodeMirror.signal = signal
+  CodeMirror.Line = Line
+  CodeMirror.changeEnd = changeEnd
+  CodeMirror.scrollbarModel = scrollbarModel
+  CodeMirror.Pos = Pos
+  CodeMirror.cmpPos = cmp
+  CodeMirror.modes = modes
+  CodeMirror.mimeModes = mimeModes
+  CodeMirror.resolveMode = resolveMode
+  CodeMirror.getMode = getMode
+  CodeMirror.modeExtensions = modeExtensions
+  CodeMirror.extendMode = extendMode
+  CodeMirror.copyState = copyState
+  CodeMirror.startState = startState
+  CodeMirror.innerMode = innerMode
+  CodeMirror.commands = commands
+  CodeMirror.keyMap = keyMap
+  CodeMirror.keyName = keyName
+  CodeMirror.isModifierKey = isModifierKey
+  CodeMirror.lookupKey = lookupKey
+  CodeMirror.normalizeKeyMap = normalizeKeyMap
+  CodeMirror.StringStream = StringStream
+  CodeMirror.SharedTextMarker = SharedTextMarker
+  CodeMirror.TextMarker = TextMarker
+  CodeMirror.LineWidget = LineWidget
+  CodeMirror.e_preventDefault = e_preventDefault
+  CodeMirror.e_stopPropagation = e_stopPropagation
+  CodeMirror.e_stop = e_stop
+  CodeMirror.addClass = addClass
+  CodeMirror.contains = contains
+  CodeMirror.rmClass = rmClass
+  CodeMirror.keyNames = keyNames
 }
diff --git a/src/edit/main.js b/src/edit/main.js
index a955aaa197..3f76d70207 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -1,71 +1,71 @@
 // EDITOR CONSTRUCTOR
 
-import { CodeMirror } from "./CodeMirror";
-export { CodeMirror } from "./CodeMirror";
+import { CodeMirror } from "./CodeMirror"
+export { CodeMirror } from "./CodeMirror"
 
-import { eventMixin } from "../util/event";
-import { indexOf } from "../util/misc";
+import { eventMixin } from "../util/event"
+import { indexOf } from "../util/misc"
 
-import { defineOptions } from "./options";
+import { defineOptions } from "./options"
 
-defineOptions(CodeMirror);
+defineOptions(CodeMirror)
 
-import addEditorMethods from "./methods";
+import addEditorMethods from "./methods"
 
-addEditorMethods(CodeMirror);
+addEditorMethods(CodeMirror)
 
-import Doc from "../model/Doc";
+import Doc from "../model/Doc"
 
 // Set up methods on CodeMirror's prototype to redirect to the editor's document.
-var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
+var dontDelegate = "iter insert remove copy getEditor constructor".split(" ")
 for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
   CodeMirror.prototype[prop] = (function(method) {
-    return function() {return method.apply(this.doc, arguments);};
-  })(Doc.prototype[prop]);
+    return function() {return method.apply(this.doc, arguments)}
+  })(Doc.prototype[prop])
 
-eventMixin(Doc);
+eventMixin(Doc)
 
 // INPUT HANDLING
 
-import ContentEditableInput from "../input/ContentEditableInput";
-import TextareaInput from "../input/TextareaInput";
-CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
+import ContentEditableInput from "../input/ContentEditableInput"
+import TextareaInput from "../input/TextareaInput"
+CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput}
 
 // MODE DEFINITION AND QUERYING
 
-import { defineMIME, defineMode } from "../modes";
+import { defineMIME, defineMode } from "../modes"
 
 // Extra arguments are stored as the mode's dependencies, which is
 // used by (legacy) mechanisms like loadmode.js to automatically
 // load a mode. (Preferred mechanism is the require/define calls.)
 CodeMirror.defineMode = function(name/*, mode, …*/) {
-  if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-  defineMode.apply(this, arguments);
-};
+  if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name
+  defineMode.apply(this, arguments)
+}
 
-CodeMirror.defineMIME = defineMIME;
+CodeMirror.defineMIME = defineMIME
 
 // Minimal default mode.
 CodeMirror.defineMode("null", function() {
-  return {token: function(stream) {stream.skipToEnd();}};
-});
-CodeMirror.defineMIME("text/plain", "null");
+  return {token: function(stream) {stream.skipToEnd()}}
+})
+CodeMirror.defineMIME("text/plain", "null")
 
 // EXTENSIONS
 
 CodeMirror.defineExtension = function(name, func) {
-  CodeMirror.prototype[name] = func;
-};
+  CodeMirror.prototype[name] = func
+}
 CodeMirror.defineDocExtension = function(name, func) {
-  Doc.prototype[name] = func;
-};
+  Doc.prototype[name] = func
+}
 
-import { fromTextArea } from "./fromTextArea";
+import { fromTextArea } from "./fromTextArea"
 
-CodeMirror.fromTextArea = fromTextArea;
+CodeMirror.fromTextArea = fromTextArea
 
-import { addLegacyProps } from "./legacy";
+import { addLegacyProps } from "./legacy"
 
-addLegacyProps(CodeMirror);
+addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.19.1";
+CodeMirror.version = "5.19.1"
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 84aaf397b0..828304d3dc 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -1,27 +1,27 @@
-import { deleteNearSelection } from "./deleteNearSelection";
-import { changeLine } from "../model/changes";
-import { commands } from "./commands";
-import { attachDoc } from "../model/document_data";
-import { activeElt, addClass, rmClass } from "../util/dom";
-import { eventMixin, signal } from "../util/event";
-import { getLineStyles, getStateBefore, takeToken } from "../line/highlight";
-import { indentLine } from "../input/indent";
-import { triggerElectric } from "../input/input";
-import { onKeyDown, onKeyPress, onKeyUp } from "./key_events";
-import { getKeyMap } from "../input/keymap";
-import { methodOp, operation, runInOp } from "../display/operations";
-import { clipLine, clipPos, cmp, Pos } from "../line/pos";
-import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement";
-import { Range } from "../model/selection";
-import { replaceOneSelection, skipAtomic } from "../model/selection_updates";
-import { addToScrollPos, calculateScrollPos, ensureCursorVisible, resolveScrollToPos, scrollIntoView } from "../display/scrolling";
-import { heightAtLine } from "../line/spans";
-import { updateGutterSpace } from "../display/update_display";
-import { lineLeft, lineRight, moveLogically, moveVisually } from "../util/bidi";
-import { indexOf, insertSorted, isEmpty, isWordChar, sel_dontScroll, sel_move } from "../util/misc";
-import { signalLater } from "../util/operation_group";
-import { getLine, isLine, lineAtHeight, lineNo } from "../line/utils_line";
-import { regChange, regLineChange } from "../display/view_tracking";
+import { deleteNearSelection } from "./deleteNearSelection"
+import { changeLine } from "../model/changes"
+import { commands } from "./commands"
+import { attachDoc } from "../model/document_data"
+import { activeElt, addClass, rmClass } from "../util/dom"
+import { eventMixin, signal } from "../util/event"
+import { getLineStyles, getStateBefore, takeToken } from "../line/highlight"
+import { indentLine } from "../input/indent"
+import { triggerElectric } from "../input/input"
+import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
+import { getKeyMap } from "../input/keymap"
+import { methodOp, operation, runInOp } from "../display/operations"
+import { clipLine, clipPos, cmp, Pos } from "../line/pos"
+import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
+import { Range } from "../model/selection"
+import { replaceOneSelection, skipAtomic } from "../model/selection_updates"
+import { addToScrollPos, calculateScrollPos, ensureCursorVisible, resolveScrollToPos, scrollIntoView } from "../display/scrolling"
+import { heightAtLine } from "../line/spans"
+import { updateGutterSpace } from "../display/update_display"
+import { lineLeft, lineRight, moveLogically, moveVisually } from "../util/bidi"
+import { indexOf, insertSorted, isEmpty, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
+import { signalLater } from "../util/operation_group"
+import { getLine, isLine, lineAtHeight, lineNo } from "../line/utils_line"
+import { regChange, regLineChange } from "../display/view_tracking"
 
 // The publicly visible API. Note that methodOp(f) means
 // 'wrap f in an operation, performed on its `this` parameter'.
@@ -32,84 +32,84 @@ import { regChange, regLineChange } from "../display/view_tracking";
 // convenience.
 
 export default function(CodeMirror) {
-  var optionHandlers = CodeMirror.optionHandlers;
+  var optionHandlers = CodeMirror.optionHandlers
 
-  var helpers = CodeMirror.helpers = {};
+  var helpers = CodeMirror.helpers = {}
 
   CodeMirror.prototype = {
     constructor: CodeMirror,
-    focus: function(){window.focus(); this.display.input.focus();},
+    focus: function(){window.focus(); this.display.input.focus()},
 
     setOption: function(option, value) {
-      var options = this.options, old = options[option];
-      if (options[option] == value && option != "mode") return;
-      options[option] = value;
+      var options = this.options, old = options[option]
+      if (options[option] == value && option != "mode") return
+      options[option] = value
       if (optionHandlers.hasOwnProperty(option))
-        operation(this, optionHandlers[option])(this, value, old);
+        operation(this, optionHandlers[option])(this, value, old)
     },
 
-    getOption: function(option) {return this.options[option];},
-    getDoc: function() {return this.doc;},
+    getOption: function(option) {return this.options[option]},
+    getDoc: function() {return this.doc},
 
     addKeyMap: function(map, bottom) {
-      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
+      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map))
     },
     removeKeyMap: function(map) {
-      var maps = this.state.keyMaps;
+      var maps = this.state.keyMaps
       for (var i = 0; i < maps.length; ++i)
         if (maps[i] == map || maps[i].name == map) {
-          maps.splice(i, 1);
-          return true;
+          maps.splice(i, 1)
+          return true
         }
     },
 
     addOverlay: methodOp(function(spec, options) {
-      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
-      if (mode.startState) throw new Error("Overlays may not be stateful.");
+      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec)
+      if (mode.startState) throw new Error("Overlays may not be stateful.")
       insertSorted(this.state.overlays,
                    {mode: mode, modeSpec: spec, opaque: options && options.opaque,
                     priority: (options && options.priority) || 0},
                    function(overlay) { return overlay.priority })
-      this.state.modeGen++;
-      regChange(this);
+      this.state.modeGen++
+      regChange(this)
     }),
     removeOverlay: methodOp(function(spec) {
-      var overlays = this.state.overlays;
+      var overlays = this.state.overlays
       for (var i = 0; i < overlays.length; ++i) {
-        var cur = overlays[i].modeSpec;
+        var cur = overlays[i].modeSpec
         if (cur == spec || typeof spec == "string" && cur.name == spec) {
-          overlays.splice(i, 1);
-          this.state.modeGen++;
-          regChange(this);
-          return;
+          overlays.splice(i, 1)
+          this.state.modeGen++
+          regChange(this)
+          return
         }
       }
     }),
 
     indentLine: methodOp(function(n, dir, aggressive) {
       if (typeof dir != "string" && typeof dir != "number") {
-        if (dir == null) dir = this.options.smartIndent ? "smart" : "prev";
-        else dir = dir ? "add" : "subtract";
+        if (dir == null) dir = this.options.smartIndent ? "smart" : "prev"
+        else dir = dir ? "add" : "subtract"
       }
-      if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
+      if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive)
     }),
     indentSelection: methodOp(function(how) {
-      var ranges = this.doc.sel.ranges, end = -1;
+      var ranges = this.doc.sel.ranges, end = -1
       for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
+        var range = ranges[i]
         if (!range.empty()) {
-          var from = range.from(), to = range.to();
-          var start = Math.max(end, from.line);
-          end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
+          var from = range.from(), to = range.to()
+          var start = Math.max(end, from.line)
+          end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1
           for (var j = start; j < end; ++j)
-            indentLine(this, j, how);
-          var newRanges = this.doc.sel.ranges;
+            indentLine(this, j, how)
+          var newRanges = this.doc.sel.ranges
           if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
-            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll);
+            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll)
         } else if (range.head.line > end) {
-          indentLine(this, range.head.line, how, true);
-          end = range.head.line;
-          if (i == this.doc.sel.primIndex) ensureCursorVisible(this);
+          indentLine(this, range.head.line, how, true)
+          end = range.head.line
+          if (i == this.doc.sel.primIndex) ensureCursorVisible(this)
         }
       }
     }),
@@ -117,178 +117,178 @@ export default function(CodeMirror) {
     // Fetch the parser token for a given character. Useful for hacks
     // that want to inspect the mode state (say, for completion).
     getTokenAt: function(pos, precise) {
-      return takeToken(this, pos, precise);
+      return takeToken(this, pos, precise)
     },
 
     getLineTokens: function(line, precise) {
-      return takeToken(this, Pos(line), precise, true);
+      return takeToken(this, Pos(line), precise, true)
     },
 
     getTokenTypeAt: function(pos) {
-      pos = clipPos(this.doc, pos);
-      var styles = getLineStyles(this, getLine(this.doc, pos.line));
-      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
-      var type;
-      if (ch == 0) type = styles[2];
+      pos = clipPos(this.doc, pos)
+      var styles = getLineStyles(this, getLine(this.doc, pos.line))
+      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch
+      var type
+      if (ch == 0) type = styles[2]
       else for (;;) {
-        var mid = (before + after) >> 1;
-        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
-        else if (styles[mid * 2 + 1] < ch) before = mid + 1;
-        else { type = styles[mid * 2 + 2]; break; }
+        var mid = (before + after) >> 1
+        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid
+        else if (styles[mid * 2 + 1] < ch) before = mid + 1
+        else { type = styles[mid * 2 + 2]; break }
       }
-      var cut = type ? type.indexOf("cm-overlay ") : -1;
-      return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1);
+      var cut = type ? type.indexOf("cm-overlay ") : -1
+      return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1)
     },
 
     getModeAt: function(pos) {
-      var mode = this.doc.mode;
-      if (!mode.innerMode) return mode;
-      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;
+      var mode = this.doc.mode
+      if (!mode.innerMode) return mode
+      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode
     },
 
     getHelper: function(pos, type) {
-      return this.getHelpers(pos, type)[0];
+      return this.getHelpers(pos, type)[0]
     },
 
     getHelpers: function(pos, type) {
-      var found = [];
-      if (!helpers.hasOwnProperty(type)) return found;
-      var help = helpers[type], mode = this.getModeAt(pos);
+      var found = []
+      if (!helpers.hasOwnProperty(type)) return found
+      var help = helpers[type], mode = this.getModeAt(pos)
       if (typeof mode[type] == "string") {
-        if (help[mode[type]]) found.push(help[mode[type]]);
+        if (help[mode[type]]) found.push(help[mode[type]])
       } else if (mode[type]) {
         for (var i = 0; i < mode[type].length; i++) {
-          var val = help[mode[type][i]];
-          if (val) found.push(val);
+          var val = help[mode[type][i]]
+          if (val) found.push(val)
         }
       } else if (mode.helperType && help[mode.helperType]) {
-        found.push(help[mode.helperType]);
+        found.push(help[mode.helperType])
       } else if (help[mode.name]) {
-        found.push(help[mode.name]);
+        found.push(help[mode.name])
       }
       for (var i = 0; i < help._global.length; i++) {
-        var cur = help._global[i];
+        var cur = help._global[i]
         if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)
-          found.push(cur.val);
+          found.push(cur.val)
       }
-      return found;
+      return found
     },
 
     getStateAfter: function(line, precise) {
-      var doc = this.doc;
-      line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
-      return getStateBefore(this, line + 1, precise);
+      var doc = this.doc
+      line = clipLine(doc, line == null ? doc.first + doc.size - 1: line)
+      return getStateBefore(this, line + 1, precise)
     },
 
     cursorCoords: function(start, mode) {
-      var pos, range = this.doc.sel.primary();
-      if (start == null) pos = range.head;
-      else if (typeof start == "object") pos = clipPos(this.doc, start);
-      else pos = start ? range.from() : range.to();
-      return cursorCoords(this, pos, mode || "page");
+      var pos, range = this.doc.sel.primary()
+      if (start == null) pos = range.head
+      else if (typeof start == "object") pos = clipPos(this.doc, start)
+      else pos = start ? range.from() : range.to()
+      return cursorCoords(this, pos, mode || "page")
     },
 
     charCoords: function(pos, mode) {
-      return charCoords(this, clipPos(this.doc, pos), mode || "page");
+      return charCoords(this, clipPos(this.doc, pos), mode || "page")
     },
 
     coordsChar: function(coords, mode) {
-      coords = fromCoordSystem(this, coords, mode || "page");
-      return coordsChar(this, coords.left, coords.top);
+      coords = fromCoordSystem(this, coords, mode || "page")
+      return coordsChar(this, coords.left, coords.top)
     },
 
     lineAtHeight: function(height, mode) {
-      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
-      return lineAtHeight(this.doc, height + this.display.viewOffset);
+      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top
+      return lineAtHeight(this.doc, height + this.display.viewOffset)
     },
     heightAtLine: function(line, mode) {
-      var end = false, lineObj;
+      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);
+        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;
+        lineObj = line
       }
       return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
-        (end ? this.doc.height - heightAtLine(lineObj) : 0);
+        (end ? this.doc.height - heightAtLine(lineObj) : 0)
     },
 
-    defaultTextHeight: function() { return textHeight(this.display); },
-    defaultCharWidth: function() { return charWidth(this.display); },
+    defaultTextHeight: function() { return textHeight(this.display) },
+    defaultCharWidth: function() { return charWidth(this.display) },
 
     setGutterMarker: methodOp(function(line, gutterID, value) {
       return changeLine(this.doc, line, "gutter", function(line) {
-        var markers = line.gutterMarkers || (line.gutterMarkers = {});
-        markers[gutterID] = value;
-        if (!value && isEmpty(markers)) line.gutterMarkers = null;
-        return true;
-      });
+        var markers = line.gutterMarkers || (line.gutterMarkers = {})
+        markers[gutterID] = value
+        if (!value && isEmpty(markers)) line.gutterMarkers = null
+        return true
+      })
     }),
 
     clearGutter: methodOp(function(gutterID) {
-      var cm = this, doc = cm.doc, i = doc.first;
+      var cm = this, doc = cm.doc, i = doc.first
       doc.iter(function(line) {
         if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
-          line.gutterMarkers[gutterID] = null;
-          regLineChange(cm, i, "gutter");
-          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null;
+          line.gutterMarkers[gutterID] = null
+          regLineChange(cm, i, "gutter")
+          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null
         }
-        ++i;
-      });
+        ++i
+      })
     }),
 
     lineInfo: function(line) {
       if (typeof line == "number") {
-        if (!isLine(this.doc, line)) return null;
-        var n = line;
-        line = getLine(this.doc, line);
-        if (!line) return null;
+        if (!isLine(this.doc, line)) return null
+        var n = line
+        line = getLine(this.doc, line)
+        if (!line) return null
       } else {
-        var n = lineNo(line);
-        if (n == null) return null;
+        var n = lineNo(line)
+        if (n == null) return null
       }
       return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
               textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
-              widgets: line.widgets};
+              widgets: line.widgets}
     },
 
-    getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo};},
+    getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}},
 
     addWidget: function(pos, node, scroll, vert, horiz) {
-      var display = this.display;
-      pos = cursorCoords(this, clipPos(this.doc, pos));
-      var top = pos.bottom, left = pos.left;
-      node.style.position = "absolute";
-      node.setAttribute("cm-ignore-events", "true");
-      this.display.input.setUneditable(node);
-      display.sizer.appendChild(node);
+      var display = this.display
+      pos = cursorCoords(this, clipPos(this.doc, pos))
+      var top = pos.bottom, left = pos.left
+      node.style.position = "absolute"
+      node.setAttribute("cm-ignore-events", "true")
+      this.display.input.setUneditable(node)
+      display.sizer.appendChild(node)
       if (vert == "over") {
-        top = pos.top;
+        top = pos.top
       } else if (vert == "above" || vert == "near") {
         var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
-        hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
+        hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth)
         // Default to positioning above (if specified and possible); otherwise default to positioning below
         if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
-          top = pos.top - node.offsetHeight;
+          top = pos.top - node.offsetHeight
         else if (pos.bottom + node.offsetHeight <= vspace)
-          top = pos.bottom;
+          top = pos.bottom
         if (left + node.offsetWidth > hspace)
-          left = hspace - node.offsetWidth;
+          left = hspace - node.offsetWidth
       }
-      node.style.top = top + "px";
-      node.style.left = node.style.right = "";
+      node.style.top = top + "px"
+      node.style.left = node.style.right = ""
       if (horiz == "right") {
-        left = display.sizer.clientWidth - node.offsetWidth;
-        node.style.right = "0px";
+        left = display.sizer.clientWidth - node.offsetWidth
+        node.style.right = "0px"
       } else {
-        if (horiz == "left") left = 0;
-        else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2;
-        node.style.left = left + "px";
+        if (horiz == "left") left = 0
+        else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2
+        node.style.left = left + "px"
       }
       if (scroll)
-        scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight);
+        scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight)
     },
 
     triggerOnKeyDown: methodOp(onKeyDown),
@@ -297,199 +297,199 @@ export default function(CodeMirror) {
 
     execCommand: function(cmd) {
       if (commands.hasOwnProperty(cmd))
-        return commands[cmd].call(null, this);
+        return commands[cmd].call(null, this)
     },
 
-    triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
+    triggerElectric: methodOp(function(text) { triggerElectric(this, text) }),
 
     findPosH: function(from, amount, unit, visually) {
-      var dir = 1;
-      if (amount < 0) { dir = -1; amount = -amount; }
+      var dir = 1
+      if (amount < 0) { dir = -1; amount = -amount }
       for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        cur = findPosH(this.doc, cur, dir, unit, visually);
-        if (cur.hitSide) break;
+        cur = findPosH(this.doc, cur, dir, unit, visually)
+        if (cur.hitSide) break
       }
-      return cur;
+      return cur
     },
 
     moveH: methodOp(function(dir, unit) {
-      var cm = this;
+      var cm = this
       cm.extendSelectionsBy(function(range) {
         if (cm.display.shift || cm.doc.extend || range.empty())
-          return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
+          return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually)
         else
-          return dir < 0 ? range.from() : range.to();
-      }, sel_move);
+          return dir < 0 ? range.from() : range.to()
+      }, sel_move)
     }),
 
     deleteH: methodOp(function(dir, unit) {
-      var sel = this.doc.sel, doc = this.doc;
+      var sel = this.doc.sel, doc = this.doc
       if (sel.somethingSelected())
-        doc.replaceSelection("", null, "+delete");
+        doc.replaceSelection("", null, "+delete")
       else
         deleteNearSelection(this, function(range) {
-          var other = findPosH(doc, range.head, dir, unit, false);
-          return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other};
-        });
+          var other = findPosH(doc, range.head, dir, unit, false)
+          return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other}
+        })
     }),
 
     findPosV: function(from, amount, unit, goalColumn) {
-      var dir = 1, x = goalColumn;
-      if (amount < 0) { dir = -1; amount = -amount; }
+      var dir = 1, x = goalColumn
+      if (amount < 0) { dir = -1; amount = -amount }
       for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        var coords = cursorCoords(this, cur, "div");
-        if (x == null) x = coords.left;
-        else coords.left = x;
-        cur = findPosV(this, coords, dir, unit);
-        if (cur.hitSide) break;
+        var coords = cursorCoords(this, cur, "div")
+        if (x == null) x = coords.left
+        else coords.left = x
+        cur = findPosV(this, coords, dir, unit)
+        if (cur.hitSide) break
       }
-      return cur;
+      return cur
     },
 
     moveV: methodOp(function(dir, unit) {
-      var cm = this, doc = this.doc, goals = [];
-      var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected();
+      var cm = this, doc = this.doc, goals = []
+      var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected()
       doc.extendSelectionsBy(function(range) {
         if (collapse)
-          return dir < 0 ? range.from() : range.to();
-        var headPos = cursorCoords(cm, range.head, "div");
-        if (range.goalColumn != null) headPos.left = range.goalColumn;
-        goals.push(headPos.left);
-        var pos = findPosV(cm, headPos, dir, unit);
+          return dir < 0 ? range.from() : range.to()
+        var headPos = cursorCoords(cm, range.head, "div")
+        if (range.goalColumn != null) headPos.left = range.goalColumn
+        goals.push(headPos.left)
+        var pos = findPosV(cm, headPos, dir, unit)
         if (unit == "page" && range == doc.sel.primary())
-          addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top);
-        return pos;
-      }, sel_move);
+          addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top)
+        return pos
+      }, sel_move)
       if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
-        doc.sel.ranges[i].goalColumn = goals[i];
+        doc.sel.ranges[i].goalColumn = goals[i]
     }),
 
     // Find the word at the given position (as returned by coordsChar).
     findWordAt: function(pos) {
-      var doc = this.doc, line = getLine(doc, pos.line).text;
-      var start = pos.ch, end = pos.ch;
+      var doc = this.doc, line = getLine(doc, pos.line).text
+      var start = pos.ch, end = pos.ch
       if (line) {
-        var helper = this.getHelper(pos, "wordChars");
-        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
-        var startChar = line.charAt(start);
+        var helper = this.getHelper(pos, "wordChars")
+        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end
+        var startChar = line.charAt(start)
         var check = isWordChar(startChar, helper)
-          ? function(ch) { return isWordChar(ch, helper); }
-          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
-          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-        while (start > 0 && check(line.charAt(start - 1))) --start;
-        while (end < line.length && check(line.charAt(end))) ++end;
+          ? function(ch) { return isWordChar(ch, helper) }
+          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch)}
+          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch)}
+        while (start > 0 && check(line.charAt(start - 1))) --start
+        while (end < line.length && check(line.charAt(end))) ++end
       }
-      return new Range(Pos(pos.line, start), Pos(pos.line, end));
+      return new Range(Pos(pos.line, start), Pos(pos.line, end))
     },
 
     toggleOverwrite: function(value) {
-      if (value != null && value == this.state.overwrite) return;
+      if (value != null && value == this.state.overwrite) return
       if (this.state.overwrite = !this.state.overwrite)
-        addClass(this.display.cursorDiv, "CodeMirror-overwrite");
+        addClass(this.display.cursorDiv, "CodeMirror-overwrite")
       else
-        rmClass(this.display.cursorDiv, "CodeMirror-overwrite");
+        rmClass(this.display.cursorDiv, "CodeMirror-overwrite")
 
-      signal(this, "overwriteToggle", this, this.state.overwrite);
+      signal(this, "overwriteToggle", this, this.state.overwrite)
     },
-    hasFocus: function() { return this.display.input.getField() == activeElt(); },
-    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); },
+    hasFocus: function() { return this.display.input.getField() == activeElt() },
+    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
 
     scrollTo: methodOp(function(x, y) {
-      if (x != null || y != null) resolveScrollToPos(this);
-      if (x != null) this.curOp.scrollLeft = x;
-      if (y != null) this.curOp.scrollTop = y;
+      if (x != null || y != null) resolveScrollToPos(this)
+      if (x != null) this.curOp.scrollLeft = x
+      if (y != null) this.curOp.scrollTop = y
     }),
     getScrollInfo: function() {
-      var scroller = this.display.scroller;
+      var scroller = this.display.scroller
       return {left: scroller.scrollLeft, top: scroller.scrollTop,
               height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
               width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
-              clientHeight: displayHeight(this), clientWidth: displayWidth(this)};
+              clientHeight: displayHeight(this), clientWidth: displayWidth(this)}
     },
 
     scrollIntoView: methodOp(function(range, margin) {
       if (range == null) {
-        range = {from: this.doc.sel.primary().head, to: null};
-        if (margin == null) margin = this.options.cursorScrollMargin;
+        range = {from: this.doc.sel.primary().head, to: null}
+        if (margin == null) margin = this.options.cursorScrollMargin
       } else if (typeof range == "number") {
-        range = {from: Pos(range, 0), to: null};
+        range = {from: Pos(range, 0), to: null}
       } else if (range.from == null) {
-        range = {from: range, to: null};
+        range = {from: range, to: null}
       }
-      if (!range.to) range.to = range.from;
-      range.margin = margin || 0;
+      if (!range.to) range.to = range.from
+      range.margin = margin || 0
 
       if (range.from.line != null) {
-        resolveScrollToPos(this);
-        this.curOp.scrollToPos = range;
+        resolveScrollToPos(this)
+        this.curOp.scrollToPos = range
       } else {
         var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
                                       Math.min(range.from.top, range.to.top) - range.margin,
                                       Math.max(range.from.right, range.to.right),
-                                      Math.max(range.from.bottom, range.to.bottom) + range.margin);
-        this.scrollTo(sPos.scrollLeft, sPos.scrollTop);
+                                      Math.max(range.from.bottom, range.to.bottom) + range.margin)
+        this.scrollTo(sPos.scrollLeft, sPos.scrollTop)
       }
     }),
 
     setSize: methodOp(function(width, height) {
-      var cm = this;
+      var cm = this
       function interpret(val) {
-        return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
+        return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val
       }
-      if (width != null) cm.display.wrapper.style.width = interpret(width);
-      if (height != null) cm.display.wrapper.style.height = interpret(height);
-      if (cm.options.lineWrapping) clearLineMeasurementCache(this);
-      var lineNo = cm.display.viewFrom;
+      if (width != null) cm.display.wrapper.style.width = interpret(width)
+      if (height != null) cm.display.wrapper.style.height = interpret(height)
+      if (cm.options.lineWrapping) clearLineMeasurementCache(this)
+      var lineNo = cm.display.viewFrom
       cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
         if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
-          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; }
-        ++lineNo;
-      });
-      cm.curOp.forceUpdate = true;
-      signal(cm, "refresh", this);
+          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break }
+        ++lineNo
+      })
+      cm.curOp.forceUpdate = true
+      signal(cm, "refresh", this)
     }),
 
-    operation: function(f){return runInOp(this, f);},
+    operation: function(f){return runInOp(this, f)},
 
     refresh: methodOp(function() {
-      var oldHeight = this.display.cachedTextHeight;
-      regChange(this);
-      this.curOp.forceUpdate = true;
-      clearCaches(this);
-      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
-      updateGutterSpace(this);
+      var oldHeight = this.display.cachedTextHeight
+      regChange(this)
+      this.curOp.forceUpdate = true
+      clearCaches(this)
+      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop)
+      updateGutterSpace(this)
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
-        estimateLineHeights(this);
-      signal(this, "refresh", this);
+        estimateLineHeights(this)
+      signal(this, "refresh", this)
     }),
 
     swapDoc: methodOp(function(doc) {
-      var old = this.doc;
-      old.cm = null;
-      attachDoc(this, doc);
-      clearCaches(this);
-      this.display.input.reset();
-      this.scrollTo(doc.scrollLeft, doc.scrollTop);
-      this.curOp.forceScroll = true;
-      signalLater(this, "swapDoc", this, old);
-      return old;
+      var old = this.doc
+      old.cm = null
+      attachDoc(this, doc)
+      clearCaches(this)
+      this.display.input.reset()
+      this.scrollTo(doc.scrollLeft, doc.scrollTop)
+      this.curOp.forceScroll = true
+      signalLater(this, "swapDoc", this, old)
+      return old
     }),
 
-    getInputField: function(){return this.display.input.getField();},
-    getWrapperElement: function(){return this.display.wrapper;},
-    getScrollerElement: function(){return this.display.scroller;},
-    getGutterElement: function(){return this.display.gutters;}
-  };
-  eventMixin(CodeMirror);
+    getInputField: function(){return this.display.input.getField()},
+    getWrapperElement: function(){return this.display.wrapper},
+    getScrollerElement: function(){return this.display.scroller},
+    getGutterElement: function(){return this.display.gutters}
+  }
+  eventMixin(CodeMirror)
 
   CodeMirror.registerHelper = function(type, name, value) {
-    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []};
-    helpers[type][name] = value;
-  };
+    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []}
+    helpers[type][name] = value
+  }
   CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
-    CodeMirror.registerHelper(type, name, value);
-    helpers[type]._global.push({pred: predicate, val: value});
-  };
+    CodeMirror.registerHelper(type, name, value)
+    helpers[type]._global.push({pred: predicate, val: value})
+  }
 }
 
 // Used for horizontal relative motion. Dir is -1 or 1 (left or
@@ -502,23 +502,23 @@ export default function(CodeMirror) {
 // position. The resulting position will have a hitSide=true
 // property if it reached the end of the document.
 function findPosH(doc, pos, dir, unit, visually) {
-  var line = pos.line, ch = pos.ch, origDir = dir;
-  var lineObj = getLine(doc, line);
+  var line = pos.line, ch = pos.ch, origDir = dir
+  var lineObj = getLine(doc, line)
   function findNextLine() {
-    var l = line + dir;
+    var l = line + dir
     if (l < doc.first || l >= doc.first + doc.size) return false
-    line = l;
-    return lineObj = getLine(doc, l);
+    line = l
+    return lineObj = getLine(doc, l)
   }
   function moveOnce(boundToLine) {
-    var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true);
+    var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true)
     if (next == null) {
       if (!boundToLine && findNextLine()) {
-        if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
-        else ch = dir < 0 ? lineObj.text.length : 0;
+        if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj)
+        else ch = dir < 0 ? lineObj.text.length : 0
       } else return false
-    } else ch = next;
-    return true;
+    } else ch = next
+    return true
   }
 
   if (unit == "char") {
@@ -526,48 +526,48 @@ function findPosH(doc, pos, dir, unit, visually) {
   } else if (unit == "column") {
     moveOnce(true)
   } else if (unit == "word" || unit == "group") {
-    var sawType = null, group = unit == "group";
-    var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
+    var sawType = null, group = unit == "group"
+    var helper = doc.cm && doc.cm.getHelper(pos, "wordChars")
     for (var first = true;; first = false) {
-      if (dir < 0 && !moveOnce(!first)) break;
-      var cur = lineObj.text.charAt(ch) || "\n";
+      if (dir < 0 && !moveOnce(!first)) break
+      var cur = lineObj.text.charAt(ch) || "\n"
       var type = isWordChar(cur, helper) ? "w"
         : group && cur == "\n" ? "n"
         : !group || /\s/.test(cur) ? null
-        : "p";
-      if (group && !first && !type) type = "s";
+        : "p"
+      if (group && !first && !type) type = "s"
       if (sawType && sawType != type) {
-        if (dir < 0) {dir = 1; moveOnce();}
-        break;
+        if (dir < 0) {dir = 1; moveOnce()}
+        break
       }
 
-      if (type) sawType = type;
-      if (dir > 0 && !moveOnce(!first)) break;
+      if (type) sawType = type
+      if (dir > 0 && !moveOnce(!first)) break
     }
   }
-  var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
-  if (!cmp(pos, result)) result.hitSide = true;
-  return result;
+  var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true)
+  if (!cmp(pos, result)) result.hitSide = true
+  return result
 }
 
 // For relative vertical movement. Dir may be -1 or 1. Unit can be
 // "page" or "line". The resulting position will have a hitSide=true
 // property if it reached the end of the document.
 function findPosV(cm, pos, dir, unit) {
-  var doc = cm.doc, x = pos.left, y;
+  var doc = cm.doc, x = pos.left, y
   if (unit == "page") {
-    var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
-    var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3);
-    y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount;
+    var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight)
+    var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3)
+    y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount
 
   } else if (unit == "line") {
-    y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
+    y = dir > 0 ? pos.bottom + 3 : pos.top - 3
   }
   for (;;) {
-    var target = coordsChar(cm, x, y);
-    if (!target.outside) break;
-    if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }
-    y += dir * 5;
+    var target = coordsChar(cm, x, y)
+    if (!target.outside) break
+    if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break }
+    y += dir * 5
   }
-  return target;
+  return target
 }
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index ebda0c28a9..408cc497d1 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -1,17 +1,17 @@
-import { delayBlurEvent, ensureFocus } from "../display/focus";
-import { operation } from "../display/operations";
-import { visibleLines } from "../display/update_lines";
-import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos";
-import { getLine, lineAtHeight } from "../line/utils_line";
-import { posFromMouse } from "../measurement/position_measurement";
-import { eventInWidget } from "../measurement/widgets";
-import { normalizeSelection, Range, Selection } from "../model/selection";
-import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates";
-import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser";
-import { activeElt } from "../util/dom";
-import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event";
-import { dragAndDrop } from "../util/feature_detection";
-import { bind, countColumn, findColumn, sel_mouse } from "../util/misc";
+import { delayBlurEvent, ensureFocus } from "../display/focus"
+import { operation } from "../display/operations"
+import { visibleLines } from "../display/update_lines"
+import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos"
+import { getLine, lineAtHeight } from "../line/utils_line"
+import { posFromMouse } from "../measurement/position_measurement"
+import { eventInWidget } from "../measurement/widgets"
+import { normalizeSelection, Range, Selection } from "../model/selection"
+import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates"
+import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser"
+import { activeElt } from "../util/dom"
+import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event"
+import { dragAndDrop } from "../util/feature_detection"
+import { bind, countColumn, findColumn, sel_mouse } from "../util/misc"
 
 // A mouse down can be a single click, double click, triple click,
 // start of selection drag, start of text drag, new cursor
@@ -19,275 +19,275 @@ import { bind, countColumn, findColumn, sel_mouse } from "../util/misc";
 // middle-click-paste. Or it might be a click on something we should
 // not interfere with, such as a scrollbar or widget.
 export function onMouseDown(e) {
-  var cm = this, display = cm.display;
-  if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return;
-  display.shift = e.shiftKey;
+  var cm = this, display = cm.display
+  if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return
+  display.shift = e.shiftKey
 
   if (eventInWidget(display, e)) {
     if (!webkit) {
       // Briefly turn off draggability, to allow widgets to do
       // normal dragging things.
-      display.scroller.draggable = false;
-      setTimeout(function(){display.scroller.draggable = true;}, 100);
+      display.scroller.draggable = false
+      setTimeout(function(){display.scroller.draggable = true}, 100)
     }
-    return;
+    return
   }
-  if (clickInGutter(cm, e)) return;
-  var start = posFromMouse(cm, e);
-  window.focus();
+  if (clickInGutter(cm, e)) return
+  var start = posFromMouse(cm, e)
+  window.focus()
 
   switch (e_button(e)) {
   case 1:
     // #3261: make sure, that we're not starting a second selection
     if (cm.state.selectingText)
-      cm.state.selectingText(e);
+      cm.state.selectingText(e)
     else if (start)
-      leftButtonDown(cm, e, start);
+      leftButtonDown(cm, e, start)
     else if (e_target(e) == display.scroller)
-      e_preventDefault(e);
-    break;
+      e_preventDefault(e)
+    break
   case 2:
-    if (webkit) cm.state.lastMiddleDown = +new Date;
-    if (start) extendSelection(cm.doc, start);
-    setTimeout(function() {display.input.focus();}, 20);
-    e_preventDefault(e);
-    break;
+    if (webkit) cm.state.lastMiddleDown = +new Date
+    if (start) extendSelection(cm.doc, start)
+    setTimeout(function() {display.input.focus()}, 20)
+    e_preventDefault(e)
+    break
   case 3:
-    if (captureRightClick) onContextMenu(cm, e);
-    else delayBlurEvent(cm);
-    break;
+    if (captureRightClick) onContextMenu(cm, e)
+    else delayBlurEvent(cm)
+    break
   }
 }
 
-var lastClick, lastDoubleClick;
+var lastClick, lastDoubleClick
 function leftButtonDown(cm, e, start) {
-  if (ie) setTimeout(bind(ensureFocus, cm), 0);
-  else cm.curOp.focus = activeElt();
+  if (ie) setTimeout(bind(ensureFocus, cm), 0)
+  else cm.curOp.focus = activeElt()
 
-  var now = +new Date, type;
+  var now = +new Date, type
   if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
-    type = "triple";
+    type = "triple"
   } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
-    type = "double";
-    lastDoubleClick = {time: now, pos: start};
+    type = "double"
+    lastDoubleClick = {time: now, pos: start}
   } else {
-    type = "single";
-    lastClick = {time: now, pos: start};
+    type = "single"
+    lastClick = {time: now, pos: start}
   }
 
-  var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
+  var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained
   if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
       type == "single" && (contained = sel.contains(start)) > -1 &&
       (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
       (cmp(contained.to(), start) > 0 || start.xRel < 0))
-    leftButtonStartDrag(cm, e, start, modifier);
+    leftButtonStartDrag(cm, e, start, modifier)
   else
-    leftButtonSelect(cm, e, start, type, modifier);
+    leftButtonSelect(cm, e, start, type, modifier)
 }
 
 // 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, startTime = +new Date;
+  var display = cm.display, startTime = +new Date
   var dragEnd = operation(cm, function(e2) {
-    if (webkit) display.scroller.draggable = false;
-    cm.state.draggingText = false;
-    off(document, "mouseup", dragEnd);
-    off(display.scroller, "drop", dragEnd);
+    if (webkit) display.scroller.draggable = false
+    cm.state.draggingText = false
+    off(document, "mouseup", dragEnd)
+    off(display.scroller, "drop", dragEnd)
     if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-      e_preventDefault(e2);
+      e_preventDefault(e2)
       if (!modifier && +new Date - 200 < startTime)
-        extendSelection(cm.doc, start);
+        extendSelection(cm.doc, start)
       // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
       if (webkit || ie && ie_version == 9)
-        setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
+        setTimeout(function() {document.body.focus(); display.input.focus()}, 20)
       else
-        display.input.focus();
+        display.input.focus()
     }
-  });
+  })
   // Let the drag handler handle this.
-  if (webkit) display.scroller.draggable = true;
-  cm.state.draggingText = dragEnd;
+  if (webkit) display.scroller.draggable = true
+  cm.state.draggingText = dragEnd
   dragEnd.copy = mac ? e.altKey : e.ctrlKey
   // IE's approach to draggable
-  if (display.scroller.dragDrop) display.scroller.dragDrop();
-  on(document, "mouseup", dragEnd);
-  on(display.scroller, "drop", dragEnd);
+  if (display.scroller.dragDrop) display.scroller.dragDrop()
+  on(document, "mouseup", dragEnd)
+  on(display.scroller, "drop", dragEnd)
 }
 
 // Normal selection, as opposed to text dragging.
 function leftButtonSelect(cm, e, start, type, addNew) {
-  var display = cm.display, doc = cm.doc;
-  e_preventDefault(e);
+  var display = cm.display, doc = cm.doc
+  e_preventDefault(e)
 
-  var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
+  var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges
   if (addNew && !e.shiftKey) {
-    ourIndex = doc.sel.contains(start);
+    ourIndex = doc.sel.contains(start)
     if (ourIndex > -1)
-      ourRange = ranges[ourIndex];
+      ourRange = ranges[ourIndex]
     else
-      ourRange = new Range(start, start);
+      ourRange = new Range(start, start)
   } else {
-    ourRange = doc.sel.primary();
-    ourIndex = doc.sel.primIndex;
+    ourRange = doc.sel.primary()
+    ourIndex = doc.sel.primIndex
   }
 
   if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
-    type = "rect";
-    if (!addNew) ourRange = new Range(start, start);
-    start = posFromMouse(cm, e, true, true);
-    ourIndex = -1;
+    type = "rect"
+    if (!addNew) ourRange = new Range(start, start)
+    start = posFromMouse(cm, e, true, true)
+    ourIndex = -1
   } else if (type == "double") {
-    var word = cm.findWordAt(start);
+    var word = cm.findWordAt(start)
     if (cm.display.shift || doc.extend)
-      ourRange = extendRange(doc, ourRange, word.anchor, word.head);
+      ourRange = extendRange(doc, ourRange, word.anchor, word.head)
     else
-      ourRange = word;
+      ourRange = word
   } else if (type == "triple") {
-    var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)));
+    var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)))
     if (cm.display.shift || doc.extend)
-      ourRange = extendRange(doc, ourRange, line.anchor, line.head);
+      ourRange = extendRange(doc, ourRange, line.anchor, line.head)
     else
-      ourRange = line;
+      ourRange = line
   } else {
-    ourRange = extendRange(doc, ourRange, start);
+    ourRange = extendRange(doc, ourRange, start)
   }
 
   if (!addNew) {
-    ourIndex = 0;
-    setSelection(doc, new Selection([ourRange], 0), sel_mouse);
-    startSel = doc.sel;
+    ourIndex = 0
+    setSelection(doc, new Selection([ourRange], 0), sel_mouse)
+    startSel = doc.sel
   } else if (ourIndex == -1) {
-    ourIndex = ranges.length;
+    ourIndex = ranges.length
     setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
-                 {scroll: false, origin: "*mouse"});
+                 {scroll: false, origin: "*mouse"})
   } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
     setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
-                 {scroll: false, origin: "*mouse"});
-    startSel = doc.sel;
+                 {scroll: false, origin: "*mouse"})
+    startSel = doc.sel
   } else {
-    replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
+    replaceOneSelection(doc, ourIndex, ourRange, sel_mouse)
   }
 
-  var lastPos = start;
+  var lastPos = start
   function extendTo(pos) {
-    if (cmp(lastPos, pos) == 0) return;
-    lastPos = pos;
+    if (cmp(lastPos, pos) == 0) return
+    lastPos = pos
 
     if (type == "rect") {
-      var ranges = [], tabSize = cm.options.tabSize;
-      var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
-      var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
-      var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
+      var ranges = [], tabSize = cm.options.tabSize
+      var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize)
+      var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize)
+      var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol)
       for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
            line <= end; line++) {
-        var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
+        var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize)
         if (left == right)
-          ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)));
+          ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)))
         else if (text.length > leftPos)
-          ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
+          ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))))
       }
-      if (!ranges.length) ranges.push(new Range(start, start));
+      if (!ranges.length) ranges.push(new Range(start, start))
       setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
-                   {origin: "*mouse", scroll: false});
-      cm.scrollIntoView(pos);
+                   {origin: "*mouse", scroll: false})
+      cm.scrollIntoView(pos)
     } else {
-      var oldRange = ourRange;
-      var anchor = oldRange.anchor, head = pos;
+      var oldRange = ourRange
+      var anchor = oldRange.anchor, head = pos
       if (type != "single") {
         if (type == "double")
-          var range = cm.findWordAt(pos);
+          var range = cm.findWordAt(pos)
         else
-          var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
+          var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)))
         if (cmp(range.anchor, anchor) > 0) {
-          head = range.head;
-          anchor = minPos(oldRange.from(), range.anchor);
+          head = range.head
+          anchor = minPos(oldRange.from(), range.anchor)
         } else {
-          head = range.anchor;
-          anchor = maxPos(oldRange.to(), range.head);
+          head = range.anchor
+          anchor = maxPos(oldRange.to(), range.head)
         }
       }
-      var ranges = startSel.ranges.slice(0);
-      ranges[ourIndex] = new Range(clipPos(doc, anchor), head);
-      setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse);
+      var ranges = startSel.ranges.slice(0)
+      ranges[ourIndex] = new Range(clipPos(doc, anchor), head)
+      setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse)
     }
   }
 
-  var editorSize = display.wrapper.getBoundingClientRect();
+  var editorSize = display.wrapper.getBoundingClientRect()
   // Used to ensure timeout re-tries don't fire when another extend
   // happened in the meantime (clearTimeout isn't reliable -- at
   // least on Chrome, the timeouts still happen even when cleared,
   // if the clear happens after their scheduled firing time).
-  var counter = 0;
+  var counter = 0
 
   function extend(e) {
-    var curCount = ++counter;
-    var cur = posFromMouse(cm, e, true, type == "rect");
-    if (!cur) return;
+    var curCount = ++counter
+    var cur = posFromMouse(cm, e, true, type == "rect")
+    if (!cur) return
     if (cmp(cur, lastPos) != 0) {
-      cm.curOp.focus = activeElt();
-      extendTo(cur);
-      var visible = visibleLines(display, doc);
+      cm.curOp.focus = activeElt()
+      extendTo(cur)
+      var visible = visibleLines(display, doc)
       if (cur.line >= visible.to || cur.line < visible.from)
-        setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150);
+        setTimeout(operation(cm, function(){if (counter == curCount) extend(e)}), 150)
     } else {
-      var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
+      var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0
       if (outside) setTimeout(operation(cm, function() {
-        if (counter != curCount) return;
-        display.scroller.scrollTop += outside;
-        extend(e);
-      }), 50);
+        if (counter != curCount) return
+        display.scroller.scrollTop += outside
+        extend(e)
+      }), 50)
     }
   }
 
   function done(e) {
-    cm.state.selectingText = false;
-    counter = Infinity;
-    e_preventDefault(e);
-    display.input.focus();
-    off(document, "mousemove", move);
-    off(document, "mouseup", up);
-    doc.history.lastSelOrigin = null;
+    cm.state.selectingText = false
+    counter = Infinity
+    e_preventDefault(e)
+    display.input.focus()
+    off(document, "mousemove", move)
+    off(document, "mouseup", up)
+    doc.history.lastSelOrigin = null
   }
 
   var move = operation(cm, function(e) {
-    if (!e_button(e)) done(e);
-    else extend(e);
-  });
-  var up = operation(cm, done);
-  cm.state.selectingText = up;
-  on(document, "mousemove", move);
-  on(document, "mouseup", up);
+    if (!e_button(e)) done(e)
+    else extend(e)
+  })
+  var up = operation(cm, done)
+  cm.state.selectingText = up
+  on(document, "mousemove", move)
+  on(document, "mouseup", up)
 }
 
 
 // Determines whether an event happened in the gutter, and fires the
 // handlers for the corresponding event.
 function gutterEvent(cm, e, type, prevent) {
-  try { var mX = e.clientX, mY = e.clientY; }
-  catch(e) { return false; }
-  if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
-  if (prevent) e_preventDefault(e);
+  try { var mX = e.clientX, mY = e.clientY }
+  catch(e) { return false }
+  if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false
+  if (prevent) e_preventDefault(e)
 
-  var display = cm.display;
-  var lineBox = display.lineDiv.getBoundingClientRect();
+  var display = cm.display
+  var lineBox = display.lineDiv.getBoundingClientRect()
 
-  if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);
-  mY -= lineBox.top - display.viewOffset;
+  if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e)
+  mY -= lineBox.top - display.viewOffset
 
   for (var i = 0; i < cm.options.gutters.length; ++i) {
-    var g = display.gutters.childNodes[i];
+    var g = display.gutters.childNodes[i]
     if (g && g.getBoundingClientRect().right >= mX) {
-      var line = lineAtHeight(cm.doc, mY);
-      var gutter = cm.options.gutters[i];
-      signal(cm, type, cm, line, gutter, e);
-      return e_defaultPrevented(e);
+      var line = lineAtHeight(cm.doc, mY)
+      var gutter = cm.options.gutters[i]
+      signal(cm, type, cm, line, gutter, e)
+      return e_defaultPrevented(e)
     }
   }
 }
 
 export function clickInGutter(cm, e) {
-  return gutterEvent(cm, e, "gutterClick", true);
+  return gutterEvent(cm, e, "gutterClick", true)
 }
 
 // CONTEXT MENU HANDLING
@@ -296,12 +296,12 @@ export function clickInGutter(cm, e) {
 // textarea (making it as unobtrusive as possible) to let the
 // right-click take effect on it.
 export function onContextMenu(cm, e) {
-  if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
-  if (signalDOMEvent(cm, e, "contextmenu")) return;
-  cm.display.input.onContextMenu(e);
+  if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return
+  if (signalDOMEvent(cm, e, "contextmenu")) return
+  cm.display.input.onContextMenu(e)
 }
 
 function contextMenuInGutter(cm, e) {
-  if (!hasHandler(cm, "gutterContextMenu")) return false;
-  return gutterEvent(cm, e, "gutterContextMenu", false);
+  if (!hasHandler(cm, "gutterContextMenu")) return false
+  return gutterEvent(cm, e, "gutterContextMenu", false)
 }
diff --git a/src/edit/options.js b/src/edit/options.js
index 308eb574f2..cf0d4d8185 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -1,196 +1,196 @@
-import { onBlur } from "../display/focus";
-import { setGuttersForLineNumbers, updateGutters } from "../display/gutters";
-import { alignHorizontally } from "../display/line_numbers";
-import { loadMode, resetModeState } from "../display/mode_state";
-import { initScrollbars, updateScrollbars } from "../display/scrollbars";
-import { updateSelection } from "../display/selection";
-import { regChange } from "../display/view_tracking";
-import { getKeyMap } from "../input/keymap";
-import { defaultSpecialCharPlaceholder } from "../line/line_data";
-import { Pos } from "../line/pos";
-import { findMaxLine } from "../line/spans";
-import { clearCaches, compensateForHScroll, estimateLineHeights } from "../measurement/position_measurement";
-import { replaceRange } from "../model/changes";
-import { mobile, windows } from "../util/browser";
-import { addClass, rmClass } from "../util/dom";
-import { off, on } from "../util/event";
-
-import { themeChanged } from "./utils";
-
-export var Init = {toString: function(){return "CodeMirror.Init";}};
-
-export var defaults = {};
-export var optionHandlers = {};
+import { onBlur } from "../display/focus"
+import { setGuttersForLineNumbers, updateGutters } from "../display/gutters"
+import { alignHorizontally } from "../display/line_numbers"
+import { loadMode, resetModeState } from "../display/mode_state"
+import { initScrollbars, updateScrollbars } from "../display/scrollbars"
+import { updateSelection } from "../display/selection"
+import { regChange } from "../display/view_tracking"
+import { getKeyMap } from "../input/keymap"
+import { defaultSpecialCharPlaceholder } from "../line/line_data"
+import { Pos } from "../line/pos"
+import { findMaxLine } from "../line/spans"
+import { clearCaches, compensateForHScroll, estimateLineHeights } from "../measurement/position_measurement"
+import { replaceRange } from "../model/changes"
+import { mobile, windows } from "../util/browser"
+import { addClass, rmClass } from "../util/dom"
+import { off, on } from "../util/event"
+
+import { themeChanged } from "./utils"
+
+export var Init = {toString: function(){return "CodeMirror.Init"}}
+
+export var defaults = {}
+export var optionHandlers = {}
 
 export function defineOptions(CodeMirror) {
-  var optionHandlers = CodeMirror.optionHandlers;
+  var optionHandlers = CodeMirror.optionHandlers
 
   function option(name, deflt, handle, notOnInit) {
-    CodeMirror.defaults[name] = deflt;
+    CodeMirror.defaults[name] = deflt
     if (handle) optionHandlers[name] =
-      notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle;
+      notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old)} : handle
   }
 
-  CodeMirror.defineOption = option;
+  CodeMirror.defineOption = option
 
   // Passed to option handlers when there is no old value.
-  CodeMirror.Init = Init;
+  CodeMirror.Init = Init
 
   // These two are, on init, called from the constructor because they
   // have to be initialized before the editor can start at all.
   option("value", "", function(cm, val) {
-    cm.setValue(val);
-  }, true);
+    cm.setValue(val)
+  }, true)
   option("mode", null, function(cm, val) {
-    cm.doc.modeOption = val;
-    loadMode(cm);
-  }, true);
+    cm.doc.modeOption = val
+    loadMode(cm)
+  }, true)
 
-  option("indentUnit", 2, loadMode, true);
-  option("indentWithTabs", false);
-  option("smartIndent", true);
+  option("indentUnit", 2, loadMode, true)
+  option("indentWithTabs", false)
+  option("smartIndent", true)
   option("tabSize", 4, function(cm) {
-    resetModeState(cm);
-    clearCaches(cm);
-    regChange(cm);
-  }, true);
+    resetModeState(cm)
+    clearCaches(cm)
+    regChange(cm)
+  }, true)
   option("lineSeparator", null, function(cm, val) {
-    cm.doc.lineSep = val;
-    if (!val) return;
-    var newBreaks = [], lineNo = cm.doc.first;
+    cm.doc.lineSep = val
+    if (!val) return
+    var newBreaks = [], lineNo = cm.doc.first
     cm.doc.iter(function(line) {
       for (var pos = 0;;) {
-        var found = line.text.indexOf(val, pos);
-        if (found == -1) break;
-        pos = found + val.length;
-        newBreaks.push(Pos(lineNo, found));
+        var found = line.text.indexOf(val, pos)
+        if (found == -1) break
+        pos = found + val.length
+        newBreaks.push(Pos(lineNo, found))
       }
-      lineNo++;
-    });
+      lineNo++
+    })
     for (var i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
-  });
+  })
   option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
-    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
-    if (old != Init) cm.refresh();
-  });
-  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
-  option("electricChars", true);
+    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
+    if (old != Init) cm.refresh()
+  })
+  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh()}, true)
+  option("electricChars", true)
   option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
-    throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
-  }, true);
+    throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME
+  }, true)
   option("spellcheck", false, function(cm, val) {
     cm.getInputField().spellcheck = val
-  }, true);
-  option("rtlMoveVisually", !windows);
-  option("wholeLineUpdateBefore", true);
+  }, true)
+  option("rtlMoveVisually", !windows)
+  option("wholeLineUpdateBefore", true)
 
   option("theme", "default", function(cm) {
-    themeChanged(cm);
-    guttersChanged(cm);
-  }, true);
+    themeChanged(cm)
+    guttersChanged(cm)
+  }, true)
   option("keyMap", "default", function(cm, val, old) {
-    var next = getKeyMap(val);
-    var prev = old != Init && getKeyMap(old);
-    if (prev && prev.detach) prev.detach(cm, next);
-    if (next.attach) next.attach(cm, prev || null);
-  });
-  option("extraKeys", null);
-
-  option("lineWrapping", false, wrappingChanged, true);
+    var next = getKeyMap(val)
+    var prev = old != Init && getKeyMap(old)
+    if (prev && prev.detach) prev.detach(cm, next)
+    if (next.attach) next.attach(cm, prev || null)
+  })
+  option("extraKeys", null)
+
+  option("lineWrapping", false, wrappingChanged, true)
   option("gutters", [], function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
+    setGuttersForLineNumbers(cm.options)
+    guttersChanged(cm)
+  }, true)
   option("fixedGutter", true, function(cm, val) {
-    cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
-    cm.refresh();
-  }, true);
-  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true);
+    cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"
+    cm.refresh()
+  }, true)
+  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm)}, true)
   option("scrollbarStyle", "native", function(cm) {
-    initScrollbars(cm);
-    updateScrollbars(cm);
-    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
-    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
-  }, true);
+    initScrollbars(cm)
+    updateScrollbars(cm)
+    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop)
+    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft)
+  }, true)
   option("lineNumbers", false, function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("firstLineNumber", 1, guttersChanged, true);
-  option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true);
-  option("showCursorWhenSelecting", false, updateSelection, true);
+    setGuttersForLineNumbers(cm.options)
+    guttersChanged(cm)
+  }, true)
+  option("firstLineNumber", 1, guttersChanged, true)
+  option("lineNumberFormatter", function(integer) {return integer}, guttersChanged, true)
+  option("showCursorWhenSelecting", false, updateSelection, true)
 
-  option("resetSelectionOnContextMenu", true);
-  option("lineWiseCopyCut", true);
+  option("resetSelectionOnContextMenu", true)
+  option("lineWiseCopyCut", true)
 
   option("readOnly", false, function(cm, val) {
     if (val == "nocursor") {
-      onBlur(cm);
-      cm.display.input.blur();
-      cm.display.disabled = true;
+      onBlur(cm)
+      cm.display.input.blur()
+      cm.display.disabled = true
     } else {
-      cm.display.disabled = false;
+      cm.display.disabled = false
     }
     cm.display.input.readOnlyChanged(val)
-  });
-  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
-  option("dragDrop", true, dragDropChanged);
-  option("allowDropFileTypes", null);
-
-  option("cursorBlinkRate", 530);
-  option("cursorScrollMargin", 0);
-  option("cursorHeight", 1, updateSelection, true);
-  option("singleCursorHeightPerLine", true, updateSelection, true);
-  option("workTime", 100);
-  option("workDelay", 100);
-  option("flattenSpans", true, resetModeState, true);
-  option("addModeClass", false, resetModeState, true);
-  option("pollInterval", 100);
-  option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
-  option("historyEventDelay", 1250);
-  option("viewportMargin", 10, function(cm){cm.refresh();}, true);
-  option("maxHighlightLength", 10000, resetModeState, true);
+  })
+  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset()}, true)
+  option("dragDrop", true, dragDropChanged)
+  option("allowDropFileTypes", null)
+
+  option("cursorBlinkRate", 530)
+  option("cursorScrollMargin", 0)
+  option("cursorHeight", 1, updateSelection, true)
+  option("singleCursorHeightPerLine", true, updateSelection, true)
+  option("workTime", 100)
+  option("workDelay", 100)
+  option("flattenSpans", true, resetModeState, true)
+  option("addModeClass", false, resetModeState, true)
+  option("pollInterval", 100)
+  option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val})
+  option("historyEventDelay", 1250)
+  option("viewportMargin", 10, function(cm){cm.refresh()}, true)
+  option("maxHighlightLength", 10000, resetModeState, true)
   option("moveInputWithCursor", true, function(cm, val) {
-    if (!val) cm.display.input.resetPosition();
-  });
+    if (!val) cm.display.input.resetPosition()
+  })
 
   option("tabindex", null, function(cm, val) {
-    cm.display.input.getField().tabIndex = val || "";
-  });
-  option("autofocus", null);
+    cm.display.input.getField().tabIndex = val || ""
+  })
+  option("autofocus", null)
 }
 
 function guttersChanged(cm) {
-  updateGutters(cm);
-  regChange(cm);
-  setTimeout(function(){alignHorizontally(cm);}, 20);
+  updateGutters(cm)
+  regChange(cm)
+  setTimeout(function(){alignHorizontally(cm)}, 20)
 }
 
 function dragDropChanged(cm, value, old) {
-  var wasOn = old && old != Init;
+  var wasOn = old && old != 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.enter);
-    toggle(cm.display.scroller, "dragover", funcs.over);
-    toggle(cm.display.scroller, "dragleave", funcs.leave);
-    toggle(cm.display.scroller, "drop", funcs.drop);
+    var funcs = cm.display.dragFunctions
+    var toggle = value ? on : off
+    toggle(cm.display.scroller, "dragstart", funcs.start)
+    toggle(cm.display.scroller, "dragenter", funcs.enter)
+    toggle(cm.display.scroller, "dragover", funcs.over)
+    toggle(cm.display.scroller, "dragleave", funcs.leave)
+    toggle(cm.display.scroller, "drop", funcs.drop)
   }
 }
 
 function wrappingChanged(cm) {
   if (cm.options.lineWrapping) {
-    addClass(cm.display.wrapper, "CodeMirror-wrap");
-    cm.display.sizer.style.minWidth = "";
-    cm.display.sizerWidth = null;
+    addClass(cm.display.wrapper, "CodeMirror-wrap")
+    cm.display.sizer.style.minWidth = ""
+    cm.display.sizerWidth = null
   } else {
-    rmClass(cm.display.wrapper, "CodeMirror-wrap");
-    findMaxLine(cm);
+    rmClass(cm.display.wrapper, "CodeMirror-wrap")
+    findMaxLine(cm)
   }
-  estimateLineHeights(cm);
-  regChange(cm);
-  clearCaches(cm);
-  setTimeout(function(){updateScrollbars(cm);}, 100);
+  estimateLineHeights(cm)
+  regChange(cm)
+  clearCaches(cm)
+  setTimeout(function(){updateScrollbars(cm)}, 100)
 }
diff --git a/src/edit/utils.js b/src/edit/utils.js
index cdef3156bb..61f795572d 100644
--- a/src/edit/utils.js
+++ b/src/edit/utils.js
@@ -1,7 +1,7 @@
-import { clearCaches } from "../measurement/position_measurement";
+import { clearCaches } from "../measurement/position_measurement"
 
 export function themeChanged(cm) {
   cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
-    cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
-  clearCaches(cm);
+    cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-")
+  clearCaches(cm)
 }
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 69d53c0cbe..51597d19fa 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -1,317 +1,317 @@
-import { operation, runInOp } from "../display/operations";
-import { prepareSelection } from "../display/selection";
-import { regChange } from "../display/view_tracking";
-import { applyTextInput, copyableRanges, disableBrowserMagic, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input";
-import { cmp, maxPos, minPos, Pos } from "../line/pos";
-import { getBetween, getLine, lineNo } from "../line/utils_line";
-import { findViewForLine, findViewIndex, mapFromLineView, nodeAndOffsetInLineMap } from "../measurement/position_measurement";
-import { replaceRange } from "../model/changes";
-import { simpleSelection } from "../model/selection";
-import { setSelection } from "../model/selection_updates";
-import { getBidiPartAt, getOrder } from "../util/bidi";
-import { gecko, ie_version } from "../util/browser";
-import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom";
-import { on, signalDOMEvent } from "../util/event";
-import { copyObj, Delayed, lst, nothing, sel_dontScroll } from "../util/misc";
+import { operation, runInOp } from "../display/operations"
+import { prepareSelection } from "../display/selection"
+import { regChange } from "../display/view_tracking"
+import { applyTextInput, copyableRanges, disableBrowserMagic, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input"
+import { cmp, maxPos, minPos, Pos } from "../line/pos"
+import { getBetween, getLine, lineNo } from "../line/utils_line"
+import { findViewForLine, findViewIndex, mapFromLineView, nodeAndOffsetInLineMap } from "../measurement/position_measurement"
+import { replaceRange } from "../model/changes"
+import { simpleSelection } from "../model/selection"
+import { setSelection } from "../model/selection_updates"
+import { getBidiPartAt, getOrder } from "../util/bidi"
+import { gecko, ie_version } from "../util/browser"
+import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom"
+import { on, signalDOMEvent } from "../util/event"
+import { copyObj, Delayed, lst, nothing, sel_dontScroll } from "../util/misc"
 
 // CONTENTEDITABLE INPUT STYLE
 
 export default function ContentEditableInput(cm) {
-  this.cm = cm;
-  this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
-  this.polling = new Delayed();
-  this.gracePeriod = false;
+  this.cm = cm
+  this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null
+  this.polling = new Delayed()
+  this.gracePeriod = false
 }
 
 ContentEditableInput.prototype = copyObj({
   init: function(display) {
-    var input = this, cm = input.cm;
-    var div = input.div = display.lineDiv;
-    disableBrowserMagic(div, cm.options.spellcheck);
+    var input = this, cm = input.cm
+    var div = input.div = display.lineDiv
+    disableBrowserMagic(div, cm.options.spellcheck)
 
     on(div, "paste", function(e) {
       if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
       // IE doesn't fire input events, so we schedule a read for the pasted content in this way
       if (ie_version <= 11) setTimeout(operation(cm, function() {
-        if (!input.pollContent()) regChange(cm);
+        if (!input.pollContent()) regChange(cm)
       }), 20)
     })
 
     on(div, "compositionstart", function(e) {
-      var data = e.data;
-      input.composing = {sel: cm.doc.sel, data: data, startData: data};
-      if (!data) return;
-      var prim = cm.doc.sel.primary();
-      var line = cm.getLine(prim.head.line);
-      var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
+      var data = e.data
+      input.composing = {sel: cm.doc.sel, data: data, startData: data}
+      if (!data) return
+      var prim = cm.doc.sel.primary()
+      var line = cm.getLine(prim.head.line)
+      var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length))
       if (found > -1 && found <= prim.head.ch)
         input.composing.sel = simpleSelection(Pos(prim.head.line, found),
-                                              Pos(prim.head.line, found + data.length));
-    });
+                                              Pos(prim.head.line, found + data.length))
+    })
     on(div, "compositionupdate", function(e) {
-      input.composing.data = e.data;
-    });
+      input.composing.data = e.data
+    })
     on(div, "compositionend", function(e) {
-      var ours = input.composing;
-      if (!ours) return;
+      var ours = input.composing
+      if (!ours) return
       if (e.data != ours.startData && !/\u200b/.test(e.data))
-        ours.data = e.data;
+        ours.data = e.data
       // Need a small delay to prevent other code (input event,
       // selection polling) from doing damage when fired right after
       // compositionend.
       setTimeout(function() {
         if (!ours.handled)
-          input.applyComposition(ours);
+          input.applyComposition(ours)
         if (input.composing == ours)
-          input.composing = null;
-      }, 50);
-    });
+          input.composing = null
+      }, 50)
+    })
 
     on(div, "touchstart", function() {
-      input.forceCompositionEnd();
-    });
+      input.forceCompositionEnd()
+    })
 
     on(div, "input", function() {
-      if (input.composing) return;
+      if (input.composing) return
       if (cm.isReadOnly() || !input.pollContent())
-        runInOp(input.cm, function() {regChange(cm);});
-    });
+        runInOp(input.cm, function() {regChange(cm)})
+    })
 
     function onCopyCut(e) {
       if (signalDOMEvent(cm, e)) return
       if (cm.somethingSelected()) {
-        setLastCopied({lineWise: false, text: cm.getSelections()});
-        if (e.type == "cut") cm.replaceSelection("", null, "cut");
+        setLastCopied({lineWise: false, text: cm.getSelections()})
+        if (e.type == "cut") cm.replaceSelection("", null, "cut")
       } else if (!cm.options.lineWiseCopyCut) {
-        return;
+        return
       } else {
-        var ranges = copyableRanges(cm);
-        setLastCopied({lineWise: true, text: ranges.text});
+        var ranges = copyableRanges(cm)
+        setLastCopied({lineWise: true, text: ranges.text})
         if (e.type == "cut") {
           cm.operation(function() {
-            cm.setSelections(ranges.ranges, 0, sel_dontScroll);
-            cm.replaceSelection("", null, "cut");
-          });
+            cm.setSelections(ranges.ranges, 0, sel_dontScroll)
+            cm.replaceSelection("", null, "cut")
+          })
         }
       }
       if (e.clipboardData) {
-        e.clipboardData.clearData();
+        e.clipboardData.clearData()
         var content = lastCopied.text.join("\n")
         // iOS exposes the clipboard API, but seems to discard content inserted into it
-        e.clipboardData.setData("Text", content);
+        e.clipboardData.setData("Text", content)
         if (e.clipboardData.getData("Text") == content) {
-          e.preventDefault();
+          e.preventDefault()
           return
         }
       }
       // Old-fashioned briefly-focus-a-textarea hack
-      var kludge = hiddenTextarea(), te = kludge.firstChild;
-      cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
-      te.value = lastCopied.text.join("\n");
-      var hadFocus = document.activeElement;
-      selectInput(te);
+      var kludge = hiddenTextarea(), te = kludge.firstChild
+      cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild)
+      te.value = lastCopied.text.join("\n")
+      var hadFocus = document.activeElement
+      selectInput(te)
       setTimeout(function() {
-        cm.display.lineSpace.removeChild(kludge);
-        hadFocus.focus();
+        cm.display.lineSpace.removeChild(kludge)
+        hadFocus.focus()
         if (hadFocus == div) input.showPrimarySelection()
-      }, 50);
+      }, 50)
     }
-    on(div, "copy", onCopyCut);
-    on(div, "cut", onCopyCut);
+    on(div, "copy", onCopyCut)
+    on(div, "cut", onCopyCut)
   },
 
   prepareSelection: function() {
-    var result = prepareSelection(this.cm, false);
-    result.focus = this.cm.state.focused;
-    return result;
+    var result = prepareSelection(this.cm, false)
+    result.focus = this.cm.state.focused
+    return result
   },
 
   showSelection: function(info, takeFocus) {
-    if (!info || !this.cm.display.view.length) return;
-    if (info.focus || takeFocus) this.showPrimarySelection();
-    this.showMultipleSelections(info);
+    if (!info || !this.cm.display.view.length) return
+    if (info.focus || takeFocus) this.showPrimarySelection()
+    this.showMultipleSelections(info)
   },
 
   showPrimarySelection: function() {
-    var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
-    var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
-    var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
+    var sel = window.getSelection(), prim = this.cm.doc.sel.primary()
+    var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset)
+    var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset)
     if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
         cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
         cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
-      return;
+      return
 
-    var start = posToDOM(this.cm, prim.from());
-    var end = posToDOM(this.cm, prim.to());
-    if (!start && !end) return;
+    var start = posToDOM(this.cm, prim.from())
+    var end = posToDOM(this.cm, prim.to())
+    if (!start && !end) return
 
-    var view = this.cm.display.view;
-    var old = sel.rangeCount && sel.getRangeAt(0);
+    var view = this.cm.display.view
+    var old = sel.rangeCount && sel.getRangeAt(0)
     if (!start) {
-      start = {node: view[0].measure.map[2], offset: 0};
+      start = {node: view[0].measure.map[2], offset: 0}
     } else if (!end) { // FIXME dangerously hacky
-      var measure = view[view.length - 1].measure;
-      var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
-      end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
+      var measure = view[view.length - 1].measure
+      var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map
+      end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]}
     }
 
-    try { var rng = range(start.node, start.offset, end.offset, end.node); }
+    try { var rng = range(start.node, start.offset, end.offset, end.node) }
     catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
     if (rng) {
       if (!gecko && this.cm.state.focused) {
-        sel.collapse(start.node, start.offset);
-        if (!rng.collapsed) sel.addRange(rng);
+        sel.collapse(start.node, start.offset)
+        if (!rng.collapsed) sel.addRange(rng)
       } else {
-        sel.removeAllRanges();
-        sel.addRange(rng);
+        sel.removeAllRanges()
+        sel.addRange(rng)
       }
-      if (old && sel.anchorNode == null) sel.addRange(old);
-      else if (gecko) this.startGracePeriod();
+      if (old && sel.anchorNode == null) sel.addRange(old)
+      else if (gecko) this.startGracePeriod()
     }
-    this.rememberSelection();
+    this.rememberSelection()
   },
 
   startGracePeriod: function() {
-    var input = this;
-    clearTimeout(this.gracePeriod);
+    var input = this
+    clearTimeout(this.gracePeriod)
     this.gracePeriod = setTimeout(function() {
-      input.gracePeriod = false;
+      input.gracePeriod = false
       if (input.selectionChanged())
-        input.cm.operation(function() { input.cm.curOp.selectionChanged = true; });
-    }, 20);
+        input.cm.operation(function() { input.cm.curOp.selectionChanged = true })
+    }, 20)
   },
 
   showMultipleSelections: function(info) {
-    removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
-    removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
+    removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors)
+    removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection)
   },
 
   rememberSelection: function() {
-    var sel = window.getSelection();
-    this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
-    this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
+    var sel = window.getSelection()
+    this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset
+    this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset
   },
 
   selectionInEditor: function() {
-    var sel = window.getSelection();
-    if (!sel.rangeCount) return false;
-    var node = sel.getRangeAt(0).commonAncestorContainer;
-    return contains(this.div, node);
+    var sel = window.getSelection()
+    if (!sel.rangeCount) return false
+    var node = sel.getRangeAt(0).commonAncestorContainer
+    return contains(this.div, node)
   },
 
   focus: function() {
-    if (this.cm.options.readOnly != "nocursor") this.div.focus();
+    if (this.cm.options.readOnly != "nocursor") this.div.focus()
   },
-  blur: function() { this.div.blur(); },
-  getField: function() { return this.div; },
+  blur: function() { this.div.blur() },
+  getField: function() { return this.div },
 
-  supportsTouch: function() { return true; },
+  supportsTouch: function() { return true },
 
   receivedFocus: function() {
-    var input = this;
+    var input = this
     if (this.selectionInEditor())
-      this.pollSelection();
+      this.pollSelection()
     else
-      runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; });
+      runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true })
 
     function poll() {
       if (input.cm.state.focused) {
-        input.pollSelection();
-        input.polling.set(input.cm.options.pollInterval, poll);
+        input.pollSelection()
+        input.polling.set(input.cm.options.pollInterval, poll)
       }
     }
-    this.polling.set(this.cm.options.pollInterval, poll);
+    this.polling.set(this.cm.options.pollInterval, poll)
   },
 
   selectionChanged: function() {
-    var sel = window.getSelection();
+    var sel = window.getSelection()
     return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
-      sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset;
+      sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
   },
 
   pollSelection: function() {
     if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
-      var sel = window.getSelection(), cm = this.cm;
-      this.rememberSelection();
-      var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
-      var head = domToPos(cm, sel.focusNode, sel.focusOffset);
+      var sel = window.getSelection(), cm = this.cm
+      this.rememberSelection()
+      var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
+      var head = domToPos(cm, sel.focusNode, sel.focusOffset)
       if (anchor && head) runInOp(cm, function() {
-        setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
-        if (anchor.bad || head.bad) cm.curOp.selectionChanged = true;
-      });
+        setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll)
+        if (anchor.bad || head.bad) cm.curOp.selectionChanged = true
+      })
     }
   },
 
   pollContent: function() {
-    var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
-    var from = sel.from(), to = sel.to();
-    if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
+    var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary()
+    var from = sel.from(), to = sel.to()
+    if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false
 
-    var fromIndex;
+    var fromIndex
     if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
-      var fromLine = lineNo(display.view[0].line);
-      var fromNode = display.view[0].node;
+      var fromLine = lineNo(display.view[0].line)
+      var fromNode = display.view[0].node
     } else {
-      var fromLine = lineNo(display.view[fromIndex].line);
-      var fromNode = display.view[fromIndex - 1].node.nextSibling;
+      var fromLine = lineNo(display.view[fromIndex].line)
+      var fromNode = display.view[fromIndex - 1].node.nextSibling
     }
-    var toIndex = findViewIndex(cm, to.line);
+    var toIndex = findViewIndex(cm, to.line)
     if (toIndex == display.view.length - 1) {
-      var toLine = display.viewTo - 1;
-      var toNode = display.lineDiv.lastChild;
+      var toLine = display.viewTo - 1
+      var toNode = display.lineDiv.lastChild
     } else {
-      var toLine = lineNo(display.view[toIndex + 1].line) - 1;
-      var toNode = display.view[toIndex + 1].node.previousSibling;
+      var toLine = lineNo(display.view[toIndex + 1].line) - 1
+      var toNode = display.view[toIndex + 1].node.previousSibling
     }
 
-    var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
-    var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
+    var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine))
+    var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length))
     while (newText.length > 1 && oldText.length > 1) {
-      if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
-      else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
-      else break;
+      if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine-- }
+      else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++ }
+      else break
     }
 
-    var cutFront = 0, cutEnd = 0;
-    var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
+    var cutFront = 0, cutEnd = 0
+    var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length)
     while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
-      ++cutFront;
-    var newBot = lst(newText), oldBot = lst(oldText);
+      ++cutFront
+    var newBot = lst(newText), oldBot = lst(oldText)
     var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
-                             oldBot.length - (oldText.length == 1 ? cutFront : 0));
+                             oldBot.length - (oldText.length == 1 ? cutFront : 0))
     while (cutEnd < maxCutEnd &&
            newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
-      ++cutEnd;
+      ++cutEnd
 
-    newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
-    newText[0] = newText[0].slice(cutFront);
+    newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd)
+    newText[0] = newText[0].slice(cutFront)
 
-    var chFrom = Pos(fromLine, cutFront);
-    var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
+    var chFrom = Pos(fromLine, cutFront)
+    var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0)
     if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
-      replaceRange(cm.doc, newText, chFrom, chTo, "+input");
-      return true;
+      replaceRange(cm.doc, newText, chFrom, chTo, "+input")
+      return true
     }
   },
 
   ensurePolled: function() {
-    this.forceCompositionEnd();
+    this.forceCompositionEnd()
   },
   reset: function() {
-    this.forceCompositionEnd();
+    this.forceCompositionEnd()
   },
   forceCompositionEnd: function() {
-    if (!this.composing || this.composing.handled) return;
-    this.applyComposition(this.composing);
-    this.composing.handled = true;
-    this.div.blur();
-    this.div.focus();
+    if (!this.composing || this.composing.handled) return
+    this.applyComposition(this.composing)
+    this.composing.handled = true
+    this.div.blur()
+    this.div.focus()
   },
   applyComposition: function(composing) {
     if (this.cm.isReadOnly())
       operation(this.cm, regChange)(this.cm)
     else if (composing.data && composing.data != composing.startData)
-      operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
+      operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel)
   },
 
   setUneditable: function(node) {
@@ -319,9 +319,9 @@ ContentEditableInput.prototype = copyObj({
   },
 
   onKeyPress: function(e) {
-    e.preventDefault();
+    e.preventDefault()
     if (!this.cm.isReadOnly())
-      operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
+      operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0)
   },
 
   readOnlyChanged: function(val) {
@@ -332,137 +332,137 @@ ContentEditableInput.prototype = copyObj({
   resetPosition: nothing,
 
   needsContentAttribute: true
-  }, ContentEditableInput.prototype);
+  }, ContentEditableInput.prototype)
 
 function posToDOM(cm, pos) {
-  var view = findViewForLine(cm, pos.line);
-  if (!view || view.hidden) return null;
-  var line = getLine(cm.doc, pos.line);
-  var info = mapFromLineView(view, line, pos.line);
+  var view = findViewForLine(cm, pos.line)
+  if (!view || view.hidden) return null
+  var line = getLine(cm.doc, pos.line)
+  var info = mapFromLineView(view, line, pos.line)
 
-  var order = getOrder(line), side = "left";
+  var order = getOrder(line), side = "left"
   if (order) {
-    var partPos = getBidiPartAt(order, pos.ch);
-    side = partPos % 2 ? "right" : "left";
+    var partPos = getBidiPartAt(order, pos.ch)
+    side = partPos % 2 ? "right" : "left"
   }
-  var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
-  result.offset = result.collapse == "right" ? result.end : result.start;
-  return result;
+  var result = nodeAndOffsetInLineMap(info.map, pos.ch, side)
+  result.offset = result.collapse == "right" ? result.end : result.start
+  return result
 }
 
-function badPos(pos, bad) { if (bad) pos.bad = true; return pos; }
+function badPos(pos, bad) { if (bad) pos.bad = true; return pos }
 
 function domTextBetween(cm, from, to, fromLine, toLine) {
-  var text = "", closing = false, lineSep = cm.doc.lineSeparator();
-  function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
+  var text = "", closing = false, lineSep = cm.doc.lineSeparator()
+  function recognizeMarker(id) { return function(marker) { return marker.id == id } }
   function walk(node) {
     if (node.nodeType == 1) {
-      var cmText = node.getAttribute("cm-text");
+      var cmText = node.getAttribute("cm-text")
       if (cmText != null) {
-        if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
-        text += cmText;
-        return;
+        if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "")
+        text += cmText
+        return
       }
-      var markerID = node.getAttribute("cm-marker"), range;
+      var markerID = node.getAttribute("cm-marker"), range
       if (markerID) {
-        var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
+        var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID))
         if (found.length && (range = found[0].find()))
-          text += getBetween(cm.doc, range.from, range.to).join(lineSep);
-        return;
+          text += getBetween(cm.doc, range.from, range.to).join(lineSep)
+        return
       }
-      if (node.getAttribute("contenteditable") == "false") return;
+      if (node.getAttribute("contenteditable") == "false") return
       for (var i = 0; i < node.childNodes.length; i++)
-        walk(node.childNodes[i]);
+        walk(node.childNodes[i])
       if (/^(pre|div|p)$/i.test(node.nodeName))
-        closing = true;
+        closing = true
     } else if (node.nodeType == 3) {
-      var val = node.nodeValue;
-      if (!val) return;
+      var val = node.nodeValue
+      if (!val) return
       if (closing) {
-        text += lineSep;
-        closing = false;
+        text += lineSep
+        closing = false
       }
-      text += val;
+      text += val
     }
   }
   for (;;) {
-    walk(from);
-    if (from == to) break;
-    from = from.nextSibling;
+    walk(from)
+    if (from == to) break
+    from = from.nextSibling
   }
-  return text;
+  return text
 }
 
 function domToPos(cm, node, offset) {
-  var lineNode;
+  var lineNode
   if (node == cm.display.lineDiv) {
-    lineNode = cm.display.lineDiv.childNodes[offset];
-    if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true);
-    node = null; offset = 0;
+    lineNode = cm.display.lineDiv.childNodes[offset]
+    if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true)
+    node = null; offset = 0
   } else {
     for (lineNode = node;; lineNode = lineNode.parentNode) {
-      if (!lineNode || lineNode == cm.display.lineDiv) return null;
-      if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
+      if (!lineNode || lineNode == cm.display.lineDiv) return null
+      if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break
     }
   }
   for (var i = 0; i < cm.display.view.length; i++) {
-    var lineView = cm.display.view[i];
+    var lineView = cm.display.view[i]
     if (lineView.node == lineNode)
-      return locateNodeInLineView(lineView, node, offset);
+      return locateNodeInLineView(lineView, node, offset)
   }
 }
 
 function locateNodeInLineView(lineView, node, offset) {
-  var wrapper = lineView.text.firstChild, bad = false;
-  if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true);
+  var wrapper = lineView.text.firstChild, bad = false
+  if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true)
   if (node == wrapper) {
-    bad = true;
-    node = wrapper.childNodes[offset];
-    offset = 0;
+    bad = true
+    node = wrapper.childNodes[offset]
+    offset = 0
     if (!node) {
-      var line = lineView.rest ? lst(lineView.rest) : lineView.line;
-      return badPos(Pos(lineNo(line), line.text.length), bad);
+      var line = lineView.rest ? lst(lineView.rest) : lineView.line
+      return badPos(Pos(lineNo(line), line.text.length), bad)
     }
   }
 
-  var textNode = node.nodeType == 3 ? node : null, topNode = node;
+  var textNode = node.nodeType == 3 ? node : null, topNode = node
   if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
-    textNode = node.firstChild;
-    if (offset) offset = textNode.nodeValue.length;
+    textNode = node.firstChild
+    if (offset) offset = textNode.nodeValue.length
   }
-  while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
-  var measure = lineView.measure, maps = measure.maps;
+  while (topNode.parentNode != wrapper) topNode = topNode.parentNode
+  var measure = lineView.measure, maps = measure.maps
 
   function find(textNode, topNode, offset) {
     for (var i = -1; i < (maps ? maps.length : 0); i++) {
-      var map = i < 0 ? measure.map : maps[i];
+      var map = i < 0 ? measure.map : maps[i]
       for (var j = 0; j < map.length; j += 3) {
-        var curNode = map[j + 2];
+        var curNode = map[j + 2]
         if (curNode == textNode || curNode == topNode) {
-          var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
-          var ch = map[j] + offset;
-          if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)];
-          return Pos(line, ch);
+          var line = lineNo(i < 0 ? lineView.line : lineView.rest[i])
+          var ch = map[j] + offset
+          if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)]
+          return Pos(line, ch)
         }
       }
     }
   }
-  var found = find(textNode, topNode, offset);
-  if (found) return badPos(found, bad);
+  var found = find(textNode, topNode, offset)
+  if (found) return badPos(found, bad)
 
   // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
   for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
-    found = find(after, after.firstChild, 0);
+    found = find(after, after.firstChild, 0)
     if (found)
-      return badPos(Pos(found.line, found.ch - dist), bad);
+      return badPos(Pos(found.line, found.ch - dist), bad)
     else
-      dist += after.textContent.length;
+      dist += after.textContent.length
   }
   for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
-    found = find(before, before.firstChild, -1);
+    found = find(before, before.firstChild, -1)
     if (found)
-      return badPos(Pos(found.line, found.ch + dist), bad);
+      return badPos(Pos(found.line, found.ch + dist), bad)
     else
-      dist += before.textContent.length;
+      dist += before.textContent.length
   }
 }
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 421ce17a06..4c08f37797 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -1,210 +1,210 @@
-import { operation, runInOp } from "../display/operations";
-import { prepareSelection } from "../display/selection";
-import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input";
-import { cursorCoords, posFromMouse } from "../measurement/position_measurement";
-import { eventInWidget } from "../measurement/widgets";
-import { simpleSelection } from "../model/selection";
-import { selectAll, setSelection } from "../model/selection_updates";
-import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser";
-import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom";
-import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event";
-import { hasCopyEvent, hasSelection } from "../util/feature_detection";
-import { copyObj, Delayed, nothing, sel_dontScroll } from "../util/misc";
+import { operation, runInOp } from "../display/operations"
+import { prepareSelection } from "../display/selection"
+import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input"
+import { cursorCoords, posFromMouse } from "../measurement/position_measurement"
+import { eventInWidget } from "../measurement/widgets"
+import { simpleSelection } from "../model/selection"
+import { selectAll, setSelection } from "../model/selection_updates"
+import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser"
+import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom"
+import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event"
+import { hasCopyEvent, hasSelection } from "../util/feature_detection"
+import { copyObj, Delayed, nothing, sel_dontScroll } from "../util/misc"
 
 // TEXTAREA INPUT STYLE
 
 export default function TextareaInput(cm) {
-  this.cm = cm;
+  this.cm = cm
   // See input.poll and input.reset
-  this.prevInput = "";
+  this.prevInput = ""
 
   // Flag that indicates whether we expect input to appear real soon
   // now (after some event like 'keypress' or 'input') and are
   // polling intensively.
-  this.pollingFast = false;
+  this.pollingFast = false
   // Self-resetting timeout for the poller
-  this.polling = new Delayed();
+  this.polling = new Delayed()
   // Tracks when input.reset has punted to just putting a short
   // string into the textarea instead of the full selection.
-  this.inaccurateSelection = false;
+  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;
+  this.hasSelection = false
+  this.composing = null
 }
 
 TextareaInput.prototype = copyObj({
   init: function(display) {
-    var input = this, cm = this.cm;
+    var input = this, cm = this.cm
 
     // Wraps and hides input textarea
-    var div = this.wrapper = hiddenTextarea();
+    var div = this.wrapper = hiddenTextarea()
     // The semihidden textarea that is focused when the editor is
     // focused, and receives input.
-    var te = this.textarea = div.firstChild;
-    display.wrapper.insertBefore(div, display.wrapper.firstChild);
+    var te = this.textarea = div.firstChild
+    display.wrapper.insertBefore(div, display.wrapper.firstChild)
 
     // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
-    if (ios) te.style.width = "0px";
+    if (ios) te.style.width = "0px"
 
     on(te, "input", function() {
-      if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
-      input.poll();
-    });
+      if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null
+      input.poll()
+    })
 
     on(te, "paste", function(e) {
       if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
 
-      cm.state.pasteIncoming = true;
-      input.fastPoll();
-    });
+      cm.state.pasteIncoming = true
+      input.fastPoll()
+    })
 
     function prepareCopyCut(e) {
       if (signalDOMEvent(cm, e)) return
       if (cm.somethingSelected()) {
-        setLastCopied({lineWise: false, text: cm.getSelections()});
+        setLastCopied({lineWise: false, text: cm.getSelections()})
         if (input.inaccurateSelection) {
-          input.prevInput = "";
-          input.inaccurateSelection = false;
-          te.value = lastCopied.text.join("\n");
-          selectInput(te);
+          input.prevInput = ""
+          input.inaccurateSelection = false
+          te.value = lastCopied.text.join("\n")
+          selectInput(te)
         }
       } else if (!cm.options.lineWiseCopyCut) {
-        return;
+        return
       } else {
-        var ranges = copyableRanges(cm);
-        setLastCopied({lineWise: true, text: ranges.text});
+        var ranges = copyableRanges(cm)
+        setLastCopied({lineWise: true, text: ranges.text})
         if (e.type == "cut") {
-          cm.setSelections(ranges.ranges, null, sel_dontScroll);
+          cm.setSelections(ranges.ranges, null, sel_dontScroll)
         } else {
-          input.prevInput = "";
-          te.value = ranges.text.join("\n");
-          selectInput(te);
+          input.prevInput = ""
+          te.value = ranges.text.join("\n")
+          selectInput(te)
         }
       }
-      if (e.type == "cut") cm.state.cutIncoming = true;
+      if (e.type == "cut") cm.state.cutIncoming = true
     }
-    on(te, "cut", prepareCopyCut);
-    on(te, "copy", prepareCopyCut);
+    on(te, "cut", prepareCopyCut)
+    on(te, "copy", prepareCopyCut)
 
     on(display.scroller, "paste", function(e) {
-      if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return;
-      cm.state.pasteIncoming = true;
-      input.focus();
-    });
+      if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return
+      cm.state.pasteIncoming = true
+      input.focus()
+    })
 
     // Prevent normal selection in the editor (we handle our own)
     on(display.lineSpace, "selectstart", function(e) {
-      if (!eventInWidget(display, e)) e_preventDefault(e);
-    });
+      if (!eventInWidget(display, e)) e_preventDefault(e)
+    })
 
     on(te, "compositionstart", function() {
-      var start = cm.getCursor("from");
+      var start = cm.getCursor("from")
       if (input.composing) input.composing.range.clear()
       input.composing = {
         start: start,
         range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
-      };
-    });
+      }
+    })
     on(te, "compositionend", function() {
       if (input.composing) {
-        input.poll();
-        input.composing.range.clear();
-        input.composing = null;
+        input.poll()
+        input.composing.range.clear()
+        input.composing = null
       }
-    });
+    })
   },
 
   prepareSelection: function() {
     // Redraw the selection and/or cursor
-    var cm = this.cm, display = cm.display, doc = cm.doc;
-    var result = prepareSelection(cm);
+    var cm = this.cm, display = cm.display, doc = cm.doc
+    var result = prepareSelection(cm)
 
     // Move the hidden textarea near the cursor to prevent scrolling artifacts
     if (cm.options.moveInputWithCursor) {
-      var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
-      var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
+      var headPos = cursorCoords(cm, doc.sel.primary().head, "div")
+      var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect()
       result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                          headPos.top + lineOff.top - wrapOff.top));
+                                          headPos.top + lineOff.top - wrapOff.top))
       result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                           headPos.left + lineOff.left - wrapOff.left));
+                                           headPos.left + lineOff.left - wrapOff.left))
     }
 
-    return result;
+    return result
   },
 
   showSelection: function(drawn) {
-    var cm = this.cm, display = cm.display;
-    removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
-    removeChildrenAndAdd(display.selectionDiv, drawn.selection);
+    var cm = this.cm, display = cm.display
+    removeChildrenAndAdd(display.cursorDiv, drawn.cursors)
+    removeChildrenAndAdd(display.selectionDiv, drawn.selection)
     if (drawn.teTop != null) {
-      this.wrapper.style.top = drawn.teTop + "px";
-      this.wrapper.style.left = drawn.teLeft + "px";
+      this.wrapper.style.top = drawn.teTop + "px"
+      this.wrapper.style.left = drawn.teLeft + "px"
     }
   },
 
   // Reset the input to correspond to the selection (or to be empty,
   // when not typing and nothing is selected)
   reset: function(typing) {
-    if (this.contextMenuPending) return;
-    var minimal, selected, cm = this.cm, doc = cm.doc;
+    if (this.contextMenuPending) return
+    var minimal, selected, cm = this.cm, doc = cm.doc
     if (cm.somethingSelected()) {
-      this.prevInput = "";
-      var range = doc.sel.primary();
+      this.prevInput = ""
+      var range = doc.sel.primary()
       minimal = hasCopyEvent &&
-        (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
-      var content = minimal ? "-" : selected || cm.getSelection();
-      this.textarea.value = content;
-      if (cm.state.focused) selectInput(this.textarea);
-      if (ie && ie_version >= 9) this.hasSelection = content;
+        (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000)
+      var content = minimal ? "-" : selected || cm.getSelection()
+      this.textarea.value = content
+      if (cm.state.focused) selectInput(this.textarea)
+      if (ie && ie_version >= 9) this.hasSelection = content
     } else if (!typing) {
-      this.prevInput = this.textarea.value = "";
-      if (ie && ie_version >= 9) this.hasSelection = null;
+      this.prevInput = this.textarea.value = ""
+      if (ie && ie_version >= 9) this.hasSelection = null
     }
-    this.inaccurateSelection = minimal;
+    this.inaccurateSelection = minimal
   },
 
-  getField: function() { return this.textarea; },
+  getField: function() { return this.textarea },
 
-  supportsTouch: function() { return false; },
+  supportsTouch: function() { return false },
 
   focus: function() {
     if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
-      try { this.textarea.focus(); }
+      try { this.textarea.focus() }
       catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
     }
   },
 
-  blur: function() { this.textarea.blur(); },
+  blur: function() { this.textarea.blur() },
 
   resetPosition: function() {
-    this.wrapper.style.top = this.wrapper.style.left = 0;
+    this.wrapper.style.top = this.wrapper.style.left = 0
   },
 
-  receivedFocus: function() { this.slowPoll(); },
+  receivedFocus: function() { this.slowPoll() },
 
   // Poll for input changes, using the normal rate of polling. This
   // runs as long as the editor is focused.
   slowPoll: function() {
-    var input = this;
-    if (input.pollingFast) return;
+    var input = this
+    if (input.pollingFast) return
     input.polling.set(this.cm.options.pollInterval, function() {
-      input.poll();
-      if (input.cm.state.focused) input.slowPoll();
-    });
+      input.poll()
+      if (input.cm.state.focused) input.slowPoll()
+    })
   },
 
   // When an event has just come in that is likely to add or change
   // something in the input textarea, we poll faster, to ensure that
   // the change appears on the screen quickly.
   fastPoll: function() {
-    var missed = false, input = this;
-    input.pollingFast = true;
+    var missed = false, input = this
+    input.pollingFast = true
     function p() {
-      var changed = input.poll();
-      if (!changed && !missed) {missed = true; input.polling.set(60, p);}
-      else {input.pollingFast = false; input.slowPoll();}
+      var changed = input.poll()
+      if (!changed && !missed) {missed = true; input.polling.set(60, p)}
+      else {input.pollingFast = false; input.slowPoll()}
     }
-    input.polling.set(20, p);
+    input.polling.set(20, p)
   },
 
   // Read input from the textarea, and update the document to match.
@@ -214,7 +214,7 @@ TextareaInput.prototype = copyObj({
   // seen text (can be empty), which is stored in prevInput (we must
   // not reset the textarea when typing, because that breaks IME).
   poll: function() {
-    var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
+    var cm = this.cm, input = this.textarea, prevInput = this.prevInput
     // Since this is called a *lot*, try to bail out as cheaply as
     // possible when it is clear that nothing happened. hasSelection
     // will be the case when there is a lot of text in the textarea,
@@ -222,138 +222,138 @@ TextareaInput.prototype = copyObj({
     if (this.contextMenuPending || !cm.state.focused ||
         (hasSelection(input) && !prevInput && !this.composing) ||
         cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
-      return false;
+      return false
 
-    var text = input.value;
+    var text = input.value
     // If nothing changed, bail.
-    if (text == prevInput && !cm.somethingSelected()) return false;
+    if (text == prevInput && !cm.somethingSelected()) return false
     // Work around nonsensical selection resetting in IE9/10, and
     // inexplicable appearance of private area unicode characters on
     // some key combos in Mac (#2689).
     if (ie && ie_version >= 9 && this.hasSelection === text ||
         mac && /[\uf700-\uf7ff]/.test(text)) {
-      cm.display.input.reset();
-      return false;
+      cm.display.input.reset()
+      return false
     }
 
     if (cm.doc.sel == cm.display.selForContextMenu) {
-      var first = text.charCodeAt(0);
-      if (first == 0x200b && !prevInput) prevInput = "\u200b";
-      if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo"); }
+      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);
-    while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
+    var same = 0, l = Math.min(prevInput.length, text.length)
+    while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same
 
-    var self = this;
+    var self = this
     runInOp(cm, function() {
       applyTextInput(cm, text.slice(same), prevInput.length - same,
-                     null, self.composing ? "*compose" : null);
+                     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 (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.clear()
         self.composing.range = cm.markText(self.composing.start, cm.getCursor("to"),
-                                           {className: "CodeMirror-composing"});
+                                           {className: "CodeMirror-composing"})
       }
-    });
-    return true;
+    })
+    return true
   },
 
   ensurePolled: function() {
-    if (this.pollingFast && this.poll()) this.pollingFast = false;
+    if (this.pollingFast && this.poll()) this.pollingFast = false
   },
 
   onKeyPress: function() {
-    if (ie && ie_version >= 9) this.hasSelection = null;
-    this.fastPoll();
+    if (ie && ie_version >= 9) this.hasSelection = null
+    this.fastPoll()
   },
 
   onContextMenu: function(e) {
-    var input = this, cm = input.cm, display = cm.display, te = input.textarea;
-    var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
-    if (!pos || presto) return; // Opera is difficult.
+    var input = this, cm = input.cm, display = cm.display, te = input.textarea
+    var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop
+    if (!pos || presto) return // Opera is difficult.
 
     // Reset the current text selection only if the click is done outside of the selection
     // and 'resetSelectionOnContextMenu' option is true.
-    var reset = cm.options.resetSelectionOnContextMenu;
+    var reset = cm.options.resetSelectionOnContextMenu
     if (reset && cm.doc.sel.contains(pos) == -1)
-      operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
+      operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll)
 
-    var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
+    var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText
     input.wrapper.style.cssText = "position: absolute"
     var wrapperBox = input.wrapper.getBoundingClientRect()
     te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
       "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
       (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
-      "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
-    if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
-    display.input.focus();
-    if (webkit) window.scrollTo(null, oldScrollY);
-    display.input.reset();
+      "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"
+    if (webkit) var oldScrollY = window.scrollY // Work around Chrome issue (#2712)
+    display.input.focus()
+    if (webkit) window.scrollTo(null, oldScrollY)
+    display.input.reset()
     // Adds "Select all" to context menu in FF
-    if (!cm.somethingSelected()) te.value = input.prevInput = " ";
-    input.contextMenuPending = true;
-    display.selForContextMenu = cm.doc.sel;
-    clearTimeout(display.detectingSelectAll);
+    if (!cm.somethingSelected()) te.value = input.prevInput = " "
+    input.contextMenuPending = true
+    display.selForContextMenu = cm.doc.sel
+    clearTimeout(display.detectingSelectAll)
 
     // Select-all will be greyed out if there's nothing to select, so
     // this adds a zero-width space so that we can later check whether
     // it got selected.
     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
-        te.value = extval;
-        input.prevInput = selected ? "" : "\u200b";
-        te.selectionStart = 1; te.selectionEnd = extval.length;
+        var selected = cm.somethingSelected()
+        var extval = "\u200b" + (selected ? te.value : "")
+        te.value = "\u21da" // Used to catch context-menu undo
+        te.value = extval
+        input.prevInput = selected ? "" : "\u200b"
+        te.selectionStart = 1; te.selectionEnd = extval.length
         // Re-set this, in case some other handler touched the
         // selection in the meantime.
-        display.selForContextMenu = cm.doc.sel;
+        display.selForContextMenu = cm.doc.sel
       }
     }
     function rehide() {
-      input.contextMenuPending = false;
+      input.contextMenuPending = false
       input.wrapper.style.cssText = oldWrapperCSS
-      te.style.cssText = oldCSS;
-      if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
+      te.style.cssText = oldCSS
+      if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos)
 
       // Try to detect the user choosing select-all
       if (te.selectionStart != null) {
-        if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
+        if (!ie || (ie && ie_version < 9)) prepareSelectAllHack()
         var i = 0, poll = function() {
           if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
               te.selectionEnd > 0 && input.prevInput == "\u200b")
-            operation(cm, selectAll)(cm);
-          else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
-          else display.input.reset();
-        };
-        display.detectingSelectAll = setTimeout(poll, 200);
+            operation(cm, selectAll)(cm)
+          else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500)
+          else display.input.reset()
+        }
+        display.detectingSelectAll = setTimeout(poll, 200)
       }
     }
 
-    if (ie && ie_version >= 9) prepareSelectAllHack();
+    if (ie && ie_version >= 9) prepareSelectAllHack()
     if (captureRightClick) {
-      e_stop(e);
+      e_stop(e)
       var mouseup = function() {
-        off(window, "mouseup", mouseup);
-        setTimeout(rehide, 20);
-      };
-      on(window, "mouseup", mouseup);
+        off(window, "mouseup", mouseup)
+        setTimeout(rehide, 20)
+      }
+      on(window, "mouseup", mouseup)
     } else {
-      setTimeout(rehide, 50);
+      setTimeout(rehide, 50)
     }
   },
 
   readOnlyChanged: function(val) {
-    if (!val) this.reset();
+    if (!val) this.reset()
   },
 
   setUneditable: nothing,
 
   needsContentAttribute: false
-}, TextareaInput.prototype);
+}, TextareaInput.prototype)
diff --git a/src/input/indent.js b/src/input/indent.js
index d814452e8b..f0fc78fd05 100644
--- a/src/input/indent.js
+++ b/src/input/indent.js
@@ -1,10 +1,10 @@
-import { getStateBefore } from "../line/highlight";
-import { Pos } from "../line/pos";
-import { getLine } from "../line/utils_line";
-import { replaceRange } from "../model/changes";
-import { Range } from "../model/selection";
-import { replaceOneSelection } from "../model/selection_updates";
-import { countColumn, Pass, spaceStr } from "../util/misc";
+import { getStateBefore } from "../line/highlight"
+import { Pos } from "../line/pos"
+import { getLine } from "../line/utils_line"
+import { replaceRange } from "../model/changes"
+import { Range } from "../model/selection"
+import { replaceOneSelection } from "../model/selection_updates"
+import { countColumn, Pass, spaceStr } from "../util/misc"
 
 // Indent the given line. The how parameter can be "smart",
 // "add"/null, "subtract", or "prev". When aggressive is false
@@ -12,59 +12,59 @@ import { countColumn, Pass, spaceStr } from "../util/misc";
 // lines are not indented, and places where the mode returns Pass
 // are left alone.
 export function indentLine(cm, n, how, aggressive) {
-  var doc = cm.doc, state;
-  if (how == null) how = "add";
+  var doc = cm.doc, state
+  if (how == null) how = "add"
   if (how == "smart") {
     // Fall back to "prev" when the mode doesn't have an indentation
     // method.
-    if (!doc.mode.indent) how = "prev";
-    else state = getStateBefore(cm, n);
+    if (!doc.mode.indent) how = "prev"
+    else state = getStateBefore(cm, n)
   }
 
-  var tabSize = cm.options.tabSize;
-  var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
-  if (line.stateAfter) line.stateAfter = null;
-  var curSpaceString = line.text.match(/^\s*/)[0], indentation;
+  var tabSize = cm.options.tabSize
+  var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize)
+  if (line.stateAfter) line.stateAfter = null
+  var curSpaceString = line.text.match(/^\s*/)[0], indentation
   if (!aggressive && !/\S/.test(line.text)) {
-    indentation = 0;
-    how = "not";
+    indentation = 0
+    how = "not"
   } else if (how == "smart") {
-    indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
+    indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text)
     if (indentation == Pass || indentation > 150) {
-      if (!aggressive) return;
-      how = "prev";
+      if (!aggressive) return
+      how = "prev"
     }
   }
   if (how == "prev") {
-    if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize);
-    else indentation = 0;
+    if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize)
+    else indentation = 0
   } else if (how == "add") {
-    indentation = curSpace + cm.options.indentUnit;
+    indentation = curSpace + cm.options.indentUnit
   } else if (how == "subtract") {
-    indentation = curSpace - cm.options.indentUnit;
+    indentation = curSpace - cm.options.indentUnit
   } else if (typeof how == "number") {
-    indentation = curSpace + how;
+    indentation = curSpace + how
   }
-  indentation = Math.max(0, indentation);
+  indentation = Math.max(0, indentation)
 
-  var indentString = "", pos = 0;
+  var indentString = "", pos = 0
   if (cm.options.indentWithTabs)
-    for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
-  if (pos < indentation) indentString += spaceStr(indentation - pos);
+    for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t"}
+  if (pos < indentation) indentString += spaceStr(indentation - pos)
 
   if (indentString != curSpaceString) {
-    replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
-    line.stateAfter = null;
-    return true;
+    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.
     for (var i = 0; i < doc.sel.ranges.length; i++) {
-      var range = doc.sel.ranges[i];
+      var range = doc.sel.ranges[i]
       if (range.head.line == n && range.head.ch < curSpaceString.length) {
-        var pos = Pos(n, curSpaceString.length);
-        replaceOneSelection(doc, i, new Range(pos, pos));
-        break;
+        var pos = Pos(n, curSpaceString.length)
+        replaceOneSelection(doc, i, new Range(pos, pos))
+        break
       }
     }
   }
diff --git a/src/input/input.js b/src/input/input.js
index b017934a2c..a084e08f8b 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -1,133 +1,133 @@
-import { runInOp } from "../display/operations";
-import { ensureCursorVisible } from "../display/scrolling";
-import { Pos } from "../line/pos";
-import { getLine } from "../line/utils_line";
-import { makeChange } from "../model/changes";
-import { ios, webkit } from "../util/browser";
-import { elt } from "../util/dom";
-import { lst, map } from "../util/misc";
-import { signalLater } from "../util/operation_group";
+import { runInOp } from "../display/operations"
+import { ensureCursorVisible } from "../display/scrolling"
+import { Pos } from "../line/pos"
+import { getLine } from "../line/utils_line"
+import { makeChange } from "../model/changes"
+import { ios, webkit } from "../util/browser"
+import { elt } from "../util/dom"
+import { lst, map } from "../util/misc"
+import { signalLater } from "../util/operation_group"
 
-import { indentLine } from "./indent";
+import { indentLine } from "./indent"
 
 // This will be set to a {lineWise: bool, text: [string]} object, so
 // that, when pasting, we know what kind of selections the copied
 // text was made out of.
-export var lastCopied = null;
+export var lastCopied = null
 
 export function setLastCopied(newLastCopied) {
-  lastCopied = newLastCopied;
+  lastCopied = newLastCopied
 }
 
 export function applyTextInput(cm, inserted, deleted, sel, origin) {
-  var doc = cm.doc;
-  cm.display.shift = false;
-  if (!sel) sel = doc.sel;
+  var doc = cm.doc
+  cm.display.shift = false
+  if (!sel) sel = doc.sel
 
-  var paste = cm.state.pasteIncoming || origin == "paste";
+  var paste = cm.state.pasteIncoming || origin == "paste"
   var textLines = doc.splitLines(inserted), multiPaste = null
   // When pasing N lines into N selections, insert one line per selection
   if (paste && sel.ranges.length > 1) {
     if (lastCopied && lastCopied.text.join("\n") == inserted) {
       if (sel.ranges.length % lastCopied.text.length == 0) {
-        multiPaste = [];
+        multiPaste = []
         for (var i = 0; i < lastCopied.text.length; i++)
-          multiPaste.push(doc.splitLines(lastCopied.text[i]));
+          multiPaste.push(doc.splitLines(lastCopied.text[i]))
       }
     } else if (textLines.length == sel.ranges.length) {
-      multiPaste = map(textLines, function(l) { return [l]; });
+      multiPaste = map(textLines, function(l) { return [l] })
     }
   }
 
   // Normal behavior is to insert the new text into every selection
   for (var i = sel.ranges.length - 1; i >= 0; i--) {
-    var range = sel.ranges[i];
-    var from = range.from(), to = range.to();
+    var range = sel.ranges[i]
+    var from = range.from(), to = range.to()
     if (range.empty()) {
       if (deleted && deleted > 0) // Handle deletion
-        from = Pos(from.line, from.ch - deleted);
+        from = Pos(from.line, from.ch - deleted)
       else if (cm.state.overwrite && !paste) // Handle overwrite
-        to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
+        to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length))
       else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
         from = to = Pos(from.line, 0)
     }
-    var updateInput = cm.curOp.updateInput;
+    var updateInput = cm.curOp.updateInput
     var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
-                       origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
-    makeChange(cm.doc, changeEvent);
-    signalLater(cm, "inputRead", cm, changeEvent);
+                       origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")}
+    makeChange(cm.doc, changeEvent)
+    signalLater(cm, "inputRead", cm, changeEvent)
   }
   if (inserted && !paste)
-    triggerElectric(cm, inserted);
+    triggerElectric(cm, inserted)
 
-  ensureCursorVisible(cm);
-  cm.curOp.updateInput = updateInput;
-  cm.curOp.typing = true;
-  cm.state.pasteIncoming = cm.state.cutIncoming = false;
+  ensureCursorVisible(cm)
+  cm.curOp.updateInput = updateInput
+  cm.curOp.typing = true
+  cm.state.pasteIncoming = cm.state.cutIncoming = false
 }
 
 export function handlePaste(e, cm) {
-  var pasted = e.clipboardData && e.clipboardData.getData("Text");
+  var pasted = e.clipboardData && e.clipboardData.getData("Text")
   if (pasted) {
-    e.preventDefault();
+    e.preventDefault()
     if (!cm.isReadOnly() && !cm.options.disableInput)
-      runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
-    return true;
+      runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste") })
+    return true
   }
 }
 
 export function triggerElectric(cm, inserted) {
   // When an 'electric' character is inserted, immediately trigger a reindent
-  if (!cm.options.electricChars || !cm.options.smartIndent) return;
-  var sel = cm.doc.sel;
+  if (!cm.options.electricChars || !cm.options.smartIndent) return
+  var sel = cm.doc.sel
 
   for (var i = sel.ranges.length - 1; i >= 0; i--) {
-    var range = sel.ranges[i];
-    if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue;
-    var mode = cm.getModeAt(range.head);
-    var indented = false;
+    var range = sel.ranges[i]
+    if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue
+    var mode = cm.getModeAt(range.head)
+    var indented = false
     if (mode.electricChars) {
       for (var j = 0; j < mode.electricChars.length; j++)
         if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
-          indented = indentLine(cm, range.head.line, "smart");
-          break;
+          indented = indentLine(cm, range.head.line, "smart")
+          break
         }
     } else if (mode.electricInput) {
       if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
-        indented = indentLine(cm, range.head.line, "smart");
+        indented = indentLine(cm, range.head.line, "smart")
     }
-    if (indented) signalLater(cm, "electricInput", cm, range.head.line);
+    if (indented) signalLater(cm, "electricInput", cm, range.head.line)
   }
 }
 
 export function copyableRanges(cm) {
-  var text = [], ranges = [];
+  var text = [], ranges = []
   for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
-    var line = cm.doc.sel.ranges[i].head.line;
-    var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
-    ranges.push(lineRange);
-    text.push(cm.getRange(lineRange.anchor, lineRange.head));
+    var line = cm.doc.sel.ranges[i].head.line
+    var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)}
+    ranges.push(lineRange)
+    text.push(cm.getRange(lineRange.anchor, lineRange.head))
   }
-  return {text: text, ranges: ranges};
+  return {text: text, ranges: ranges}
 }
 
 export function disableBrowserMagic(field, spellcheck) {
-  field.setAttribute("autocorrect", "off");
-  field.setAttribute("autocapitalize", "off");
-  field.setAttribute("spellcheck", !!spellcheck);
+  field.setAttribute("autocorrect", "off")
+  field.setAttribute("autocapitalize", "off")
+  field.setAttribute("spellcheck", !!spellcheck)
 }
 
 export function hiddenTextarea() {
-  var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none");
-  var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+  var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none")
+  var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;")
   // The textarea is kept positioned near the cursor to prevent the
   // fact that it'll be scrolled into view on input from scrolling
   // our fake cursor out of view. On webkit, when wrap=off, paste is
   // very slow. So make the area wide instead.
-  if (webkit) te.style.width = "1000px";
-  else te.setAttribute("wrap", "off");
+  if (webkit) te.style.width = "1000px"
+  else te.setAttribute("wrap", "off")
   // If border: 0; -- iOS fails to open keyboard (issue #1287)
-  if (ios) te.style.border = "1px solid black";
-  disableBrowserMagic(te);
-  return div;
+  if (ios) te.style.border = "1px solid black"
+  disableBrowserMagic(te)
+  return div
 }
diff --git a/src/input/keymap.js b/src/input/keymap.js
index 7b2879247e..0f5941e81a 100644
--- a/src/input/keymap.js
+++ b/src/input/keymap.js
@@ -1,9 +1,9 @@
-import { flipCtrlCmd, mac, presto } from "../util/browser";
-import { map } from "../util/misc";
+import { flipCtrlCmd, mac, presto } from "../util/browser"
+import { map } from "../util/misc"
 
-import { keyNames } from "./keynames";
+import { keyNames } from "./keynames"
 
-export var keyMap = {};
+export var keyMap = {}
 
 keyMap.basic = {
   "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
@@ -12,7 +12,7 @@ keyMap.basic = {
   "Tab": "defaultTab", "Shift-Tab": "indentAuto",
   "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
   "Esc": "singleSelection"
-};
+}
 // Note that the save and find-related commands aren't defined by
 // default. User code or addons can define them. Unknown commands
 // are simply ignored.
@@ -25,7 +25,7 @@ keyMap.pcDefault = {
   "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
   "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
   fallthrough: "basic"
-};
+}
 // Very basic readline/emacs-style bindings, which are standard on Mac.
 keyMap.emacsy = {
   "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
@@ -33,7 +33,7 @@ keyMap.emacsy = {
   "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
   "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
   "Ctrl-O": "openLine"
-};
+}
 keyMap.macDefault = {
   "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
   "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
@@ -43,27 +43,27 @@ keyMap.macDefault = {
   "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
   "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
   fallthrough: ["basic", "emacsy"]
-};
-keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
+}
+keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault
 
 // KEYMAP DISPATCH
 
 function normalizeKeyName(name) {
-  var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
-  var alt, ctrl, shift, cmd;
+  var parts = name.split(/-(?!$)/), name = parts[parts.length - 1]
+  var alt, ctrl, shift, cmd
   for (var i = 0; i < parts.length - 1; i++) {
-    var mod = parts[i];
-    if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
-    else if (/^a(lt)?$/i.test(mod)) alt = true;
-    else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
-    else if (/^s(hift)$/i.test(mod)) shift = true;
-    else throw new Error("Unrecognized modifier name: " + mod);
+    var mod = parts[i]
+    if (/^(cmd|meta|m)$/i.test(mod)) cmd = true
+    else if (/^a(lt)?$/i.test(mod)) alt = true
+    else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true
+    else if (/^s(hift)$/i.test(mod)) shift = true
+    else throw new Error("Unrecognized modifier name: " + mod)
   }
-  if (alt) name = "Alt-" + name;
-  if (ctrl) name = "Ctrl-" + name;
-  if (cmd) name = "Cmd-" + name;
-  if (shift) name = "Shift-" + name;
-  return name;
+  if (alt) name = "Alt-" + name
+  if (ctrl) name = "Ctrl-" + name
+  if (cmd) name = "Cmd-" + name
+  if (shift) name = "Shift-" + name
+  return name
 }
 
 // This is a kludge to keep keymaps mostly working as raw objects
@@ -72,45 +72,45 @@ function normalizeKeyName(name) {
 // new normalized keymap, and then updates the old object to reflect
 // this.
 export function normalizeKeyMap(keymap) {
-  var copy = {};
+  var copy = {}
   for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
-    var value = keymap[keyname];
-    if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
-    if (value == "...") { delete keymap[keyname]; continue; }
+    var value = keymap[keyname]
+    if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue
+    if (value == "...") { delete keymap[keyname]; continue }
 
-    var keys = map(keyname.split(" "), normalizeKeyName);
+    var keys = map(keyname.split(" "), normalizeKeyName)
     for (var i = 0; i < keys.length; i++) {
-      var val, name;
+      var val, name
       if (i == keys.length - 1) {
-        name = keys.join(" ");
-        val = value;
+        name = keys.join(" ")
+        val = value
       } else {
-        name = keys.slice(0, i + 1).join(" ");
-        val = "...";
+        name = keys.slice(0, i + 1).join(" ")
+        val = "..."
       }
-      var prev = copy[name];
-      if (!prev) copy[name] = val;
-      else if (prev != val) throw new Error("Inconsistent bindings for " + name);
+      var prev = copy[name]
+      if (!prev) copy[name] = val
+      else if (prev != val) throw new Error("Inconsistent bindings for " + name)
     }
-    delete keymap[keyname];
+    delete keymap[keyname]
   }
-  for (var prop in copy) keymap[prop] = copy[prop];
-  return keymap;
+  for (var prop in copy) keymap[prop] = copy[prop]
+  return keymap
 }
 
 export function lookupKey(key, map, handle, context) {
-  map = getKeyMap(map);
-  var found = map.call ? map.call(key, context) : map[key];
-  if (found === false) return "nothing";
-  if (found === "...") return "multi";
-  if (found != null && handle(found)) return "handled";
+  map = getKeyMap(map)
+  var found = map.call ? map.call(key, context) : map[key]
+  if (found === false) return "nothing"
+  if (found === "...") return "multi"
+  if (found != null && handle(found)) return "handled"
 
   if (map.fallthrough) {
     if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
-      return lookupKey(key, map.fallthrough, handle, context);
+      return lookupKey(key, map.fallthrough, handle, context)
     for (var i = 0; i < map.fallthrough.length; i++) {
-      var result = lookupKey(key, map.fallthrough[i], handle, context);
-      if (result) return result;
+      var result = lookupKey(key, map.fallthrough[i], handle, context)
+      if (result) return result
     }
   }
 }
@@ -118,22 +118,22 @@ export function lookupKey(key, map, handle, context) {
 // Modifier key presses don't count as 'real' key presses for the
 // purpose of keymap fallthrough.
 export function isModifierKey(value) {
-  var name = typeof value == "string" ? value : keyNames[value.keyCode];
-  return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
+  var name = typeof value == "string" ? value : keyNames[value.keyCode]
+  return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
 }
 
 // Look up the name of a key as indicated by an event object.
 export function keyName(event, noShift) {
-  if (presto && event.keyCode == 34 && event["char"]) return false;
-  var base = keyNames[event.keyCode], name = base;
-  if (name == null || event.altGraphKey) return false;
-  if (event.altKey && base != "Alt") name = "Alt-" + name;
-  if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
-  if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
-  if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
-  return name;
+  if (presto && event.keyCode == 34 && event["char"]) return false
+  var base = keyNames[event.keyCode], name = base
+  if (name == null || event.altGraphKey) return false
+  if (event.altKey && base != "Alt") name = "Alt-" + name
+  if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name
+  if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name
+  if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name
+  return name
 }
 
 export function getKeyMap(val) {
-  return typeof val == "string" ? keyMap[val] : val;
+  return typeof val == "string" ? keyMap[val] : val
 }
diff --git a/src/input/keynames.js b/src/input/keynames.js
index 5956093e82..8cf11f38cd 100644
--- a/src/input/keynames.js
+++ b/src/input/keynames.js
@@ -7,11 +7,11 @@ export var keyNames = {
   173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
   221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
   63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
-};
+}
 
 // Number keys
-for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);
+for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i)
 // Alphabetic keys
-for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
+for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i)
 // Function keys
-for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
+for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i
diff --git a/src/line/highlight.js b/src/line/highlight.js
index eada1a0671..0632be6e3e 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -1,9 +1,9 @@
-import { countColumn } from "../util/misc";
-import { copyState, innerMode, startState } from "../modes";
-import StringStream from "../util/StringStream";
+import { countColumn } from "../util/misc"
+import { copyState, innerMode, startState } from "../modes"
+import StringStream from "../util/StringStream"
 
-import { getLine, lineNo } from "./utils_line";
-import { clipPos } from "./pos";
+import { getLine, lineNo } from "./utils_line"
+import { clipPos } from "./pos"
 
 // Compute a style array (an array starting with a mode generation
 // -- for invalidation -- followed by pairs of end positions and
@@ -12,98 +12,98 @@ import { clipPos } from "./pos";
 export function highlightLine(cm, line, state, forceToEnd) {
   // A styles array always starts with a number identifying the
   // mode/overlays that it is based on (for easy invalidation).
-  var st = [cm.state.modeGen], lineClasses = {};
+  var st = [cm.state.modeGen], lineClasses = {}
   // Compute the base array of styles
   runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
-    st.push(end, style);
-  }, lineClasses, forceToEnd);
+    st.push(end, style)
+  }, lineClasses, forceToEnd)
 
   // Run overlays, adjust style array.
   for (var o = 0; o < cm.state.overlays.length; ++o) {
-    var overlay = cm.state.overlays[o], i = 1, at = 0;
+    var overlay = cm.state.overlays[o], i = 1, at = 0
     runMode(cm, line.text, overlay.mode, true, function(end, style) {
-      var start = i;
+      var start = i
       // Ensure there's a token end at the current position, and that i points at it
       while (at < end) {
-        var i_end = st[i];
+        var i_end = st[i]
         if (i_end > end)
-          st.splice(i, 1, end, st[i+1], i_end);
-        i += 2;
-        at = Math.min(end, i_end);
+          st.splice(i, 1, end, st[i+1], i_end)
+        i += 2
+        at = Math.min(end, i_end)
       }
-      if (!style) return;
+      if (!style) return
       if (overlay.opaque) {
-        st.splice(start, i - start, end, "cm-overlay " + style);
-        i = start + 2;
+        st.splice(start, i - start, end, "cm-overlay " + style)
+        i = start + 2
       } else {
         for (; start < i; start += 2) {
-          var cur = st[start+1];
-          st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style;
+          var cur = st[start+1]
+          st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style
         }
       }
-    }, lineClasses);
+    }, lineClasses)
   }
 
-  return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
+  return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
 }
 
 export function getLineStyles(cm, line, updateFrontier) {
   if (!line.styles || line.styles[0] != cm.state.modeGen) {
-    var state = getStateBefore(cm, lineNo(line));
-    var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state);
-    line.stateAfter = state;
-    line.styles = result.styles;
-    if (result.classes) line.styleClasses = result.classes;
-    else if (line.styleClasses) line.styleClasses = null;
-    if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
+    var state = getStateBefore(cm, lineNo(line))
+    var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state)
+    line.stateAfter = state
+    line.styles = result.styles
+    if (result.classes) line.styleClasses = result.classes
+    else if (line.styleClasses) line.styleClasses = null
+    if (updateFrontier === cm.doc.frontier) cm.doc.frontier++
   }
-  return line.styles;
+  return line.styles
 }
 
 export function getStateBefore(cm, n, precise) {
-  var doc = cm.doc, display = cm.display;
-  if (!doc.mode.startState) return true;
-  var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
-  if (!state) state = startState(doc.mode);
-  else state = copyState(doc.mode, state);
+  var doc = cm.doc, display = cm.display
+  if (!doc.mode.startState) return true
+  var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter
+  if (!state) state = startState(doc.mode)
+  else state = copyState(doc.mode, state)
   doc.iter(pos, n, function(line) {
-    processLine(cm, line.text, state);
-    var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo;
-    line.stateAfter = save ? copyState(doc.mode, state) : null;
-    ++pos;
-  });
-  if (precise) doc.frontier = pos;
-  return state;
+    processLine(cm, line.text, state)
+    var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo
+    line.stateAfter = save ? copyState(doc.mode, state) : null
+    ++pos
+  })
+  if (precise) doc.frontier = pos
+  return state
 }
 
 // Lightweight form of highlight -- proceed over this line and
 // update state, but don't save a style array. Used for lines that
 // aren't currently visible.
 export function processLine(cm, text, state, startAt) {
-  var mode = cm.doc.mode;
-  var stream = new StringStream(text, cm.options.tabSize);
-  stream.start = stream.pos = startAt || 0;
-  if (text == "") callBlankLine(mode, state);
+  var mode = cm.doc.mode
+  var stream = new StringStream(text, cm.options.tabSize)
+  stream.start = stream.pos = startAt || 0
+  if (text == "") callBlankLine(mode, state)
   while (!stream.eol()) {
-    readToken(mode, stream, state);
-    stream.start = stream.pos;
+    readToken(mode, stream, state)
+    stream.start = stream.pos
   }
 }
 
 function callBlankLine(mode, state) {
-  if (mode.blankLine) return mode.blankLine(state);
-  if (!mode.innerMode) return;
-  var inner = innerMode(mode, state);
-  if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
+  if (mode.blankLine) return mode.blankLine(state)
+  if (!mode.innerMode) return
+  var inner = innerMode(mode, state)
+  if (inner.mode.blankLine) return inner.mode.blankLine(inner.state)
 }
 
 export function readToken(mode, stream, state, inner) {
   for (var i = 0; i < 10; i++) {
-    if (inner) inner[0] = innerMode(mode, state).mode;
-    var style = mode.token(stream, state);
-    if (stream.pos > stream.start) return style;
+    if (inner) inner[0] = innerMode(mode, state).mode
+    var style = mode.token(stream, state)
+    if (stream.pos > stream.start) return style
   }
-  throw new Error("Mode " + mode.name + " failed to advance stream.");
+  throw new Error("Mode " + mode.name + " failed to advance stream.")
 }
 
 // Utility for getTokenAt and getLineTokens
@@ -112,73 +112,73 @@ export function takeToken(cm, pos, precise, asArray) {
     return {start: stream.start, end: stream.pos,
             string: stream.current(),
             type: style || null,
-            state: copy ? copyState(doc.mode, state) : state};
+            state: copy ? copyState(doc.mode, state) : state}
   }
 
-  var doc = cm.doc, mode = doc.mode, style;
-  pos = clipPos(doc, pos);
-  var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
-  var stream = new StringStream(line.text, cm.options.tabSize), tokens;
-  if (asArray) tokens = [];
+  var doc = cm.doc, mode = doc.mode, style
+  pos = clipPos(doc, pos)
+  var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise)
+  var stream = new StringStream(line.text, cm.options.tabSize), tokens
+  if (asArray) tokens = []
   while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
-    stream.start = stream.pos;
-    style = readToken(mode, stream, state);
-    if (asArray) tokens.push(getObj(true));
+    stream.start = stream.pos
+    style = readToken(mode, stream, state)
+    if (asArray) tokens.push(getObj(true))
   }
-  return asArray ? tokens : getObj();
+  return asArray ? tokens : getObj()
 }
 
 function extractLineClasses(type, output) {
   if (type) for (;;) {
-    var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
-    if (!lineClass) break;
-    type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
-    var prop = lineClass[1] ? "bgClass" : "textClass";
+    var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/)
+    if (!lineClass) break
+    type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length)
+    var prop = lineClass[1] ? "bgClass" : "textClass"
     if (output[prop] == null)
-      output[prop] = lineClass[2];
+      output[prop] = lineClass[2]
     else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
-      output[prop] += " " + lineClass[2];
+      output[prop] += " " + lineClass[2]
   }
-  return type;
+  return type
 }
 
 // Run the given mode's parser over a line, calling f for each token.
 function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
-  var flattenSpans = mode.flattenSpans;
-  if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
-  var curStart = 0, curStyle = null;
-  var stream = new StringStream(text, cm.options.tabSize), style;
-  var inner = cm.options.addModeClass && [null];
-  if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
+  var flattenSpans = mode.flattenSpans
+  if (flattenSpans == null) flattenSpans = cm.options.flattenSpans
+  var curStart = 0, curStyle = null
+  var stream = new StringStream(text, cm.options.tabSize), style
+  var inner = cm.options.addModeClass && [null]
+  if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses)
   while (!stream.eol()) {
     if (stream.pos > cm.options.maxHighlightLength) {
-      flattenSpans = false;
-      if (forceToEnd) processLine(cm, text, state, stream.pos);
-      stream.pos = text.length;
-      style = null;
+      flattenSpans = false
+      if (forceToEnd) processLine(cm, text, state, stream.pos)
+      stream.pos = text.length
+      style = null
     } else {
-      style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
+      style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses)
     }
     if (inner) {
-      var mName = inner[0].name;
-      if (mName) style = "m-" + (style ? mName + " " + style : mName);
+      var mName = inner[0].name
+      if (mName) style = "m-" + (style ? mName + " " + style : mName)
     }
     if (!flattenSpans || curStyle != style) {
       while (curStart < stream.start) {
-        curStart = Math.min(stream.start, curStart + 5000);
-        f(curStart, curStyle);
+        curStart = Math.min(stream.start, curStart + 5000)
+        f(curStart, curStyle)
       }
-      curStyle = style;
+      curStyle = style
     }
-    stream.start = stream.pos;
+    stream.start = stream.pos
   }
   while (curStart < stream.pos) {
     // Webkit seems to refuse to render text nodes longer than 57444
     // characters, and returns inaccurate measurements in nodes
     // starting around 5000 chars.
-    var pos = Math.min(stream.pos, curStart + 5000);
-    f(pos, curStyle);
-    curStart = pos;
+    var pos = Math.min(stream.pos, curStart + 5000)
+    f(pos, curStyle)
+    curStart = pos
   }
 }
 
@@ -188,17 +188,17 @@ function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
 // smallest indentation, which tends to need the least context to
 // parse correctly.
 function findStartLine(cm, n, precise) {
-  var minindent, minline, doc = cm.doc;
-  var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
+  var minindent, minline, doc = cm.doc
+  var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100)
   for (var search = n; search > lim; --search) {
-    if (search <= doc.first) return doc.first;
-    var line = getLine(doc, search - 1);
-    if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
-    var indented = countColumn(line.text, null, cm.options.tabSize);
+    if (search <= doc.first) return doc.first
+    var line = getLine(doc, search - 1)
+    if (line.stateAfter && (!precise || search <= doc.frontier)) return search
+    var indented = countColumn(line.text, null, cm.options.tabSize)
     if (minline == null || minindent > indented) {
-      minline = search - 1;
-      minindent = indented;
+      minline = search - 1
+      minindent = indented
     }
   }
-  return minline;
+  return minline
 }
diff --git a/src/line/line_data.js b/src/line/line_data.js
index 018bd0e297..688aa1bdd2 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -1,55 +1,55 @@
-import { getOrder } from "../util/bidi";
-import { ie, ie_version, webkit } from "../util/browser";
-import { elt, joinClasses } from "../util/dom";
-import { eventMixin, signal } from "../util/event";
-import { hasBadBidiRects, zeroWidthElement } from "../util/feature_detection";
-import { lst, spaceStr } from "../util/misc";
+import { getOrder } from "../util/bidi"
+import { ie, ie_version, webkit } from "../util/browser"
+import { elt, joinClasses } from "../util/dom"
+import { eventMixin, signal } from "../util/event"
+import { hasBadBidiRects, zeroWidthElement } from "../util/feature_detection"
+import { lst, spaceStr } from "../util/misc"
 
-import { getLineStyles } from "./highlight";
-import { attachMarkedSpans, compareCollapsedMarkers, detachMarkedSpans, lineIsHidden, visualLineContinued } from "./spans";
-import { getLine, lineNo, updateLineHeight } from "./utils_line";
+import { getLineStyles } from "./highlight"
+import { attachMarkedSpans, compareCollapsedMarkers, detachMarkedSpans, lineIsHidden, visualLineContinued } from "./spans"
+import { getLine, lineNo, updateLineHeight } from "./utils_line"
 
 // LINE DATA STRUCTURE
 
 // Line objects. These hold state related to a line, including
 // highlighting info (the styles array).
 export function Line(text, markedSpans, estimateHeight) {
-  this.text = text;
-  attachMarkedSpans(this, markedSpans);
-  this.height = estimateHeight ? estimateHeight(this) : 1;
+  this.text = text
+  attachMarkedSpans(this, markedSpans)
+  this.height = estimateHeight ? estimateHeight(this) : 1
 }
-eventMixin(Line);
-Line.prototype.lineNo = function() { return lineNo(this); };
+eventMixin(Line)
+Line.prototype.lineNo = function() { return lineNo(this) }
 
 // Change the content (text, markers) of a line. Automatically
 // invalidates cached information and tries to re-estimate the
 // line's height.
 export function updateLine(line, text, markedSpans, estimateHeight) {
-  line.text = text;
-  if (line.stateAfter) line.stateAfter = null;
-  if (line.styles) line.styles = null;
-  if (line.order != null) line.order = null;
-  detachMarkedSpans(line);
-  attachMarkedSpans(line, markedSpans);
-  var estHeight = estimateHeight ? estimateHeight(line) : 1;
-  if (estHeight != line.height) updateLineHeight(line, estHeight);
+  line.text = text
+  if (line.stateAfter) line.stateAfter = null
+  if (line.styles) line.styles = null
+  if (line.order != null) line.order = null
+  detachMarkedSpans(line)
+  attachMarkedSpans(line, markedSpans)
+  var estHeight = estimateHeight ? estimateHeight(line) : 1
+  if (estHeight != line.height) updateLineHeight(line, estHeight)
 }
 
 // Detach a line from the document tree and its markers.
 export function cleanUpLine(line) {
-  line.parent = null;
-  detachMarkedSpans(line);
+  line.parent = null
+  detachMarkedSpans(line)
 }
 
 // Convert a style as returned by a mode (either null, or a string
 // containing one or more styles) to a CSS style. This is cached,
 // and also looks for line-wide styles.
-var styleToClassCache = {}, styleToClassCacheWithMode = {};
+var styleToClassCache = {}, styleToClassCacheWithMode = {}
 function interpretTokenStyle(style, options) {
-  if (!style || /^\s*$/.test(style)) return null;
-  var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
+  if (!style || /^\s*$/.test(style)) return null
+  var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache
   return cache[style] ||
-    (cache[style] = style.replace(/\S+/g, "cm-$&"));
+    (cache[style] = style.replace(/\S+/g, "cm-$&"))
 }
 
 // Render the DOM representation of the text of a line. Also builds
@@ -61,43 +61,43 @@ export function buildLineContent(cm, lineView) {
   // The padding-right forces the element to have a 'border', which
   // is needed on Webkit to be able to get line-level bounding
   // rectangles for it (in measureChar).
-  var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
+  var content = elt("span", null, null, webkit ? "padding-right: .1px" : null)
   var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
                  col: 0, pos: 0, cm: cm,
                  trailingSpace: false,
-                 splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
-  lineView.measure = {};
+                 splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}
+  lineView.measure = {}
 
   // Iterate over the logical lines that make up this visual line.
   for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
-    var line = i ? lineView.rest[i - 1] : lineView.line, order;
-    builder.pos = 0;
-    builder.addToken = buildToken;
+    var line = i ? lineView.rest[i - 1] : lineView.line, order
+    builder.pos = 0
+    builder.addToken = buildToken
     // Optionally wire in some hacks into the token-rendering
     // algorithm, to deal with browser quirks.
     if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
-      builder.addToken = buildTokenBadBidi(builder.addToken, order);
-    builder.map = [];
-    var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
-    insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
+      builder.addToken = buildTokenBadBidi(builder.addToken, order)
+    builder.map = []
+    var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line)
+    insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate))
     if (line.styleClasses) {
       if (line.styleClasses.bgClass)
-        builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");
+        builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "")
       if (line.styleClasses.textClass)
-        builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "");
+        builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "")
     }
 
     // Ensure at least a single node is present, for measuring.
     if (builder.map.length == 0)
-      builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
+      builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)))
 
     // Store the map and a cache object for the current logical line
     if (i == 0) {
-      lineView.measure.map = builder.map;
-      lineView.measure.cache = {};
+      lineView.measure.map = builder.map
+      lineView.measure.cache = {}
     } else {
-      (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map);
-      (lineView.measure.caches || (lineView.measure.caches = [])).push({});
+      (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map)
+      ;(lineView.measure.caches || (lineView.measure.caches = [])).push({})
     }
   }
 
@@ -105,82 +105,82 @@ export function buildLineContent(cm, lineView) {
   if (webkit) {
     var last = builder.content.lastChild
     if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
-      builder.content.className = "cm-tab-wrap-hack";
+      builder.content.className = "cm-tab-wrap-hack"
   }
 
-  signal(cm, "renderLine", cm, lineView.line, builder.pre);
+  signal(cm, "renderLine", cm, lineView.line, builder.pre)
   if (builder.pre.className)
-    builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
+    builder.textClass = joinClasses(builder.pre.className, builder.textClass || "")
 
-  return builder;
+  return builder
 }
 
 export function defaultSpecialCharPlaceholder(ch) {
-  var token = elt("span", "\u2022", "cm-invalidchar");
-  token.title = "\\u" + ch.charCodeAt(0).toString(16);
-  token.setAttribute("aria-label", token.title);
-  return token;
+  var token = elt("span", "\u2022", "cm-invalidchar")
+  token.title = "\\u" + ch.charCodeAt(0).toString(16)
+  token.setAttribute("aria-label", token.title)
+  return token
 }
 
 // Build up the DOM representation for a single token, and add it to
 // the line map. Takes care to render special characters separately.
 function buildToken(builder, text, style, startStyle, endStyle, title, css) {
-  if (!text) return;
+  if (!text) return
   var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
-  var special = builder.cm.state.specialChars, mustWrap = false;
+  var special = builder.cm.state.specialChars, mustWrap = false
   if (!special.test(text)) {
-    builder.col += text.length;
-    var content = document.createTextNode(displayText);
-    builder.map.push(builder.pos, builder.pos + text.length, content);
-    if (ie && ie_version < 9) mustWrap = true;
-    builder.pos += text.length;
+    builder.col += text.length
+    var content = document.createTextNode(displayText)
+    builder.map.push(builder.pos, builder.pos + text.length, content)
+    if (ie && ie_version < 9) mustWrap = true
+    builder.pos += text.length
   } else {
-    var content = document.createDocumentFragment(), pos = 0;
+    var content = document.createDocumentFragment(), pos = 0
     while (true) {
-      special.lastIndex = pos;
-      var m = special.exec(text);
-      var skipped = m ? m.index - pos : text.length - pos;
+      special.lastIndex = pos
+      var m = special.exec(text)
+      var skipped = m ? m.index - pos : text.length - pos
       if (skipped) {
-        var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
-        if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-        else content.appendChild(txt);
-        builder.map.push(builder.pos, builder.pos + skipped, txt);
-        builder.col += skipped;
-        builder.pos += skipped;
+        var txt = document.createTextNode(displayText.slice(pos, pos + skipped))
+        if (ie && ie_version < 9) content.appendChild(elt("span", [txt]))
+        else content.appendChild(txt)
+        builder.map.push(builder.pos, builder.pos + skipped, txt)
+        builder.col += skipped
+        builder.pos += skipped
       }
-      if (!m) break;
-      pos += skipped + 1;
+      if (!m) break
+      pos += skipped + 1
       if (m[0] == "\t") {
-        var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
-        var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
-        txt.setAttribute("role", "presentation");
-        txt.setAttribute("cm-text", "\t");
-        builder.col += tabWidth;
+        var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize
+        var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"))
+        txt.setAttribute("role", "presentation")
+        txt.setAttribute("cm-text", "\t")
+        builder.col += tabWidth
       } else if (m[0] == "\r" || m[0] == "\n") {
-        var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
-        txt.setAttribute("cm-text", m[0]);
-        builder.col += 1;
+        var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"))
+        txt.setAttribute("cm-text", m[0])
+        builder.col += 1
       } else {
-        var txt = builder.cm.options.specialCharPlaceholder(m[0]);
-        txt.setAttribute("cm-text", m[0]);
-        if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-        else content.appendChild(txt);
-        builder.col += 1;
+        var txt = builder.cm.options.specialCharPlaceholder(m[0])
+        txt.setAttribute("cm-text", m[0])
+        if (ie && ie_version < 9) content.appendChild(elt("span", [txt]))
+        else content.appendChild(txt)
+        builder.col += 1
       }
-      builder.map.push(builder.pos, builder.pos + 1, txt);
-      builder.pos++;
+      builder.map.push(builder.pos, builder.pos + 1, txt)
+      builder.pos++
     }
   }
   builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
   if (style || startStyle || endStyle || mustWrap || css) {
-    var fullStyle = style || "";
-    if (startStyle) fullStyle += startStyle;
-    if (endStyle) fullStyle += endStyle;
-    var token = elt("span", [content], fullStyle, css);
-    if (title) token.title = title;
-    return builder.content.appendChild(token);
+    var fullStyle = style || ""
+    if (startStyle) fullStyle += startStyle
+    if (endStyle) fullStyle += endStyle
+    var token = elt("span", [content], fullStyle, css)
+    if (title) token.title = title
+    return builder.content.appendChild(token)
   }
-  builder.content.appendChild(content);
+  builder.content.appendChild(content)
 }
 
 function splitSpaces(text, trailingBefore) {
@@ -200,105 +200,105 @@ function splitSpaces(text, trailingBefore) {
 // right-to-left text.
 function buildTokenBadBidi(inner, order) {
   return function(builder, text, style, startStyle, endStyle, title, css) {
-    style = style ? style + " cm-force-border" : "cm-force-border";
-    var start = builder.pos, end = start + text.length;
+    style = style ? style + " cm-force-border" : "cm-force-border"
+    var start = builder.pos, end = start + text.length
     for (;;) {
       // Find the part that overlaps with the start of this text
       for (var i = 0; i < order.length; i++) {
-        var part = order[i];
-        if (part.to > start && part.from <= start) break;
+        var part = order[i]
+        if (part.to > start && part.from <= start) break
       }
-      if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css);
-      inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
-      startStyle = null;
-      text = text.slice(part.to - start);
-      start = part.to;
+      if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css)
+      inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css)
+      startStyle = null
+      text = text.slice(part.to - start)
+      start = part.to
     }
-  };
+  }
 }
 
 function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
-  var widget = !ignoreWidget && marker.widgetNode;
-  if (widget) builder.map.push(builder.pos, builder.pos + size, widget);
+  var widget = !ignoreWidget && marker.widgetNode
+  if (widget) builder.map.push(builder.pos, builder.pos + size, widget)
   if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
     if (!widget)
-      widget = builder.content.appendChild(document.createElement("span"));
-    widget.setAttribute("cm-marker", marker.id);
+      widget = builder.content.appendChild(document.createElement("span"))
+    widget.setAttribute("cm-marker", marker.id)
   }
   if (widget) {
-    builder.cm.display.input.setUneditable(widget);
-    builder.content.appendChild(widget);
+    builder.cm.display.input.setUneditable(widget)
+    builder.content.appendChild(widget)
   }
-  builder.pos += size;
+  builder.pos += size
   builder.trailingSpace = false
 }
 
 // Outputs a number of spans to make up a line, taking highlighting
 // and marked text into account.
 function insertLineContent(line, builder, styles) {
-  var spans = line.markedSpans, allText = line.text, at = 0;
+  var spans = line.markedSpans, allText = line.text, at = 0
   if (!spans) {
     for (var i = 1; i < styles.length; i+=2)
-      builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options));
-    return;
+      builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options))
+    return
   }
 
-  var len = allText.length, pos = 0, i = 1, text = "", style, css;
-  var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
+  var len = allText.length, pos = 0, i = 1, text = "", style, css
+  var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed
   for (;;) {
     if (nextChange == pos) { // Update current marker set
-      spanStyle = spanEndStyle = spanStartStyle = title = css = "";
-      collapsed = null; nextChange = Infinity;
+      spanStyle = spanEndStyle = spanStartStyle = title = css = ""
+      collapsed = null; nextChange = Infinity
       var foundBookmarks = [], endStyles
       for (var j = 0; j < spans.length; ++j) {
-        var sp = spans[j], m = sp.marker;
+        var sp = spans[j], m = sp.marker
         if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
-          foundBookmarks.push(m);
+          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 = "";
+            nextChange = sp.to
+            spanEndStyle = ""
           }
-          if (m.className) spanStyle += " " + m.className;
-          if (m.css) css = (css ? css + ";" : "") + m.css;
-          if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
+          if (m.className) spanStyle += " " + m.className
+          if (m.css) css = (css ? css + ";" : "") + m.css
+          if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle
           if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
-          if (m.title && !title) title = m.title;
+          if (m.title && !title) title = m.title
           if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
-            collapsed = sp;
+            collapsed = sp
         } else if (sp.from > pos && nextChange > sp.from) {
-          nextChange = sp.from;
+          nextChange = sp.from
         }
       }
       if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
         if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
 
       if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
-        buildCollapsedSpan(builder, 0, foundBookmarks[j]);
+        buildCollapsedSpan(builder, 0, foundBookmarks[j])
       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;
+                           collapsed.marker, collapsed.from == null)
+        if (collapsed.to == null) return
+        if (collapsed.to == pos) collapsed = false
       }
     }
-    if (pos >= len) break;
+    if (pos >= len) break
 
-    var upto = Math.min(len, nextChange);
+    var upto = Math.min(len, nextChange)
     while (true) {
       if (text) {
-        var end = pos + text.length;
+        var end = pos + text.length
         if (!collapsed) {
-          var tokenText = end > upto ? text.slice(0, upto - pos) : text;
+          var tokenText = end > upto ? text.slice(0, upto - pos) : text
           builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                           spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
+                           spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css)
         }
-        if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
-        pos = end;
-        spanStartStyle = "";
+        if (end >= upto) {text = text.slice(upto - pos); pos = upto; break}
+        pos = end
+        spanStartStyle = ""
       }
-      text = allText.slice(at, at = styles[i++]);
-      style = interpretTokenStyle(styles[i++], builder.cm.options);
+      text = allText.slice(at, at = styles[i++])
+      style = interpretTokenStyle(styles[i++], builder.cm.options)
     }
   }
 }
@@ -309,22 +309,22 @@ function insertLineContent(line, builder, styles) {
 // logical lines, if those are connected by collapsed ranges.
 export function LineView(doc, line, lineN) {
   // The starting line
-  this.line = line;
+  this.line = line
   // Continuing lines, if any
-  this.rest = visualLineContinued(line);
+  this.rest = visualLineContinued(line)
   // Number of logical lines in this visual line
-  this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
-  this.node = this.text = null;
-  this.hidden = lineIsHidden(doc, line);
+  this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1
+  this.node = this.text = null
+  this.hidden = lineIsHidden(doc, line)
 }
 
 // Create a range of LineView objects for the given lines.
 export function buildViewArray(cm, from, to) {
-  var array = [], nextPos;
+  var array = [], nextPos
   for (var pos = from; pos < to; pos = nextPos) {
-    var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
-    nextPos = pos + view.size;
-    array.push(view);
+    var view = new LineView(cm.doc, getLine(cm.doc, pos), pos)
+    nextPos = pos + view.size
+    array.push(view)
   }
-  return array;
+  return array
 }
diff --git a/src/line/pos.js b/src/line/pos.js
index e81eb58493..b5d2513abe 100644
--- a/src/line/pos.js
+++ b/src/line/pos.js
@@ -1,35 +1,35 @@
-import { getLine } from "./utils_line";
+import { getLine } from "./utils_line"
 
 // A Pos instance represents a position within the text.
 export function Pos (line, ch) {
-  if (!(this instanceof Pos)) return new Pos(line, ch);
-  this.line = line; this.ch = ch;
+  if (!(this instanceof Pos)) return new Pos(line, ch)
+  this.line = line; this.ch = ch
 }
 
 // Compare two positions, return 0 if they are the same, a negative
 // number when a is less, and a positive number otherwise.
-export function cmp(a, b) { return a.line - b.line || a.ch - b.ch; }
+export function cmp(a, b) { return a.line - b.line || a.ch - b.ch }
 
-export function copyPos(x) {return Pos(x.line, x.ch);}
-export function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
-export function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
+export function copyPos(x) {return Pos(x.line, x.ch)}
+export function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }
+export function minPos(a, b) { return cmp(a, b) < 0 ? a : b }
 
 // Most of the external API clips given positions to make sure they
 // actually exist within the document.
-export function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));}
+export function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))}
 export function clipPos(doc, pos) {
-  if (pos.line < doc.first) return Pos(doc.first, 0);
-  var last = doc.first + doc.size - 1;
-  if (pos.line > last) return Pos(last, getLine(doc, last).text.length);
-  return clipToLen(pos, getLine(doc, pos.line).text.length);
+  if (pos.line < doc.first) return Pos(doc.first, 0)
+  var last = doc.first + doc.size - 1
+  if (pos.line > last) return Pos(last, getLine(doc, last).text.length)
+  return clipToLen(pos, getLine(doc, pos.line).text.length)
 }
 function clipToLen(pos, linelen) {
-  var ch = pos.ch;
-  if (ch == null || ch > linelen) return Pos(pos.line, linelen);
-  else if (ch < 0) return Pos(pos.line, 0);
-  else return pos;
+  var ch = pos.ch
+  if (ch == null || ch > linelen) return Pos(pos.line, linelen)
+  else if (ch < 0) return Pos(pos.line, 0)
+  else return pos
 }
 export function clipPosArray(doc, array) {
-  for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]);
-  return out;
+  for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i])
+  return out
 }
diff --git a/src/line/saw_special_spans.js b/src/line/saw_special_spans.js
index 4c1f8e0bf0..0cf5ff320b 100644
--- a/src/line/saw_special_spans.js
+++ b/src/line/saw_special_spans.js
@@ -1,10 +1,10 @@
 // Optimize some code when these features are not used.
-export var sawReadOnlySpans = false, sawCollapsedSpans = false;
+export var sawReadOnlySpans = false, sawCollapsedSpans = false
 
 export function seeReadOnlySpans() {
-  sawReadOnlySpans = true;
+  sawReadOnlySpans = true
 }
 
 export function seeCollapsedSpans() {
-  sawCollapsedSpans = true;
+  sawCollapsedSpans = true
 }
diff --git a/src/line/spans.js b/src/line/spans.js
index d114d8943f..fd9bd55408 100644
--- a/src/line/spans.js
+++ b/src/line/spans.js
@@ -1,34 +1,34 @@
-import { indexOf, lst } from "../util/misc";
+import { indexOf, lst } from "../util/misc"
 
-import { cmp } from "./pos";
-import { sawCollapsedSpans } from "./saw_special_spans";
-import { getLine, isLine, lineNo } from "./utils_line";
+import { cmp } from "./pos"
+import { sawCollapsedSpans } from "./saw_special_spans"
+import { getLine, isLine, lineNo } from "./utils_line"
 
 // TEXTMARKER SPANS
 
 export function MarkedSpan(marker, from, to) {
-  this.marker = marker;
-  this.from = from; this.to = to;
+  this.marker = marker
+  this.from = from; this.to = to
 }
 
 // Search an array of spans for a span matching the given marker.
 export function getMarkedSpanFor(spans, marker) {
   if (spans) for (var i = 0; i < spans.length; ++i) {
-    var span = spans[i];
-    if (span.marker == marker) return span;
+    var span = spans[i]
+    if (span.marker == marker) return span
   }
 }
 // Remove a span from an array, returning undefined if no spans are
 // left (we don't store arrays for lines without spans).
 export function removeMarkedSpan(spans, span) {
   for (var r, i = 0; i < spans.length; ++i)
-    if (spans[i] != span) (r || (r = [])).push(spans[i]);
-  return r;
+    if (spans[i] != span) (r || (r = [])).push(spans[i])
+  return r
 }
 // Add a span to a line.
 export function addMarkedSpan(line, span) {
-  line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
-  span.marker.attachLine(line);
+  line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]
+  span.marker.attachLine(line)
 }
 
 // Used for the algorithm that adjusts markers for a change in the
@@ -37,26 +37,26 @@ export function addMarkedSpan(line, span) {
 // undefined if nothing remains).
 function markedSpansBefore(old, startCh, isInsert) {
   if (old) for (var i = 0, nw; i < old.length; ++i) {
-    var span = old[i], marker = span.marker;
-    var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
+    var span = old[i], marker = span.marker
+    var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh)
     if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
-      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
-      (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
+      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh)
+      ;(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to))
     }
   }
-  return nw;
+  return nw
 }
 function markedSpansAfter(old, endCh, isInsert) {
   if (old) for (var i = 0, nw; i < old.length; ++i) {
-    var span = old[i], marker = span.marker;
-    var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
+    var span = old[i], marker = span.marker
+    var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh)
     if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
-      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
-      (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
-                                            span.to == null ? null : span.to - endCh));
+      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh)
+      ;(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
+                                            span.to == null ? null : span.to - endCh))
     }
   }
-  return nw;
+  return nw
 }
 
 // Given a change object, compute the new set of marker spans that
@@ -66,171 +66,171 @@ function markedSpansAfter(old, endCh, isInsert) {
 // spans partially within the change. Returns an array of span
 // arrays with one element for each line in (after) the change.
 export function stretchSpansOverChange(doc, change) {
-  if (change.full) return null;
-  var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
-  var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
-  if (!oldFirst && !oldLast) return null;
+  if (change.full) return null
+  var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans
+  var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans
+  if (!oldFirst && !oldLast) return null
 
-  var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
+  var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0
   // Get the spans that 'stick out' on both sides
-  var first = markedSpansBefore(oldFirst, startCh, isInsert);
-  var last = markedSpansAfter(oldLast, endCh, isInsert);
+  var first = markedSpansBefore(oldFirst, startCh, isInsert)
+  var last = markedSpansAfter(oldLast, endCh, isInsert)
 
   // Next, merge those two ends
-  var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
+  var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0)
   if (first) {
     // Fix up .to properties of first
     for (var i = 0; i < first.length; ++i) {
-      var span = first[i];
+      var span = first[i]
       if (span.to == null) {
-        var found = getMarkedSpanFor(last, span.marker);
-        if (!found) span.to = startCh;
-        else if (sameLine) span.to = found.to == null ? null : found.to + offset;
+        var found = getMarkedSpanFor(last, span.marker)
+        if (!found) span.to = startCh
+        else if (sameLine) span.to = found.to == null ? null : found.to + offset
       }
     }
   }
   if (last) {
     // Fix up .from in last (or move them into first in case of sameLine)
     for (var i = 0; i < last.length; ++i) {
-      var span = last[i];
-      if (span.to != null) span.to += offset;
+      var span = last[i]
+      if (span.to != null) span.to += offset
       if (span.from == null) {
-        var found = getMarkedSpanFor(first, span.marker);
+        var found = getMarkedSpanFor(first, span.marker)
         if (!found) {
-          span.from = offset;
-          if (sameLine) (first || (first = [])).push(span);
+          span.from = offset
+          if (sameLine) (first || (first = [])).push(span)
         }
       } else {
-        span.from += offset;
-        if (sameLine) (first || (first = [])).push(span);
+        span.from += offset
+        if (sameLine) (first || (first = [])).push(span)
       }
     }
   }
   // Make sure we didn't create any zero-length spans
-  if (first) first = clearEmptySpans(first);
-  if (last && last != first) last = clearEmptySpans(last);
+  if (first) first = clearEmptySpans(first)
+  if (last && last != first) last = clearEmptySpans(last)
 
-  var newMarkers = [first];
+  var newMarkers = [first]
   if (!sameLine) {
     // Fill gap with whole-line-spans
-    var gap = change.text.length - 2, gapMarkers;
+    var gap = change.text.length - 2, gapMarkers
     if (gap > 0 && first)
       for (var i = 0; i < first.length; ++i)
         if (first[i].to == null)
-          (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null));
+          (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null))
     for (var i = 0; i < gap; ++i)
-      newMarkers.push(gapMarkers);
-    newMarkers.push(last);
+      newMarkers.push(gapMarkers)
+    newMarkers.push(last)
   }
-  return newMarkers;
+  return newMarkers
 }
 
 // Remove spans that are empty and don't have a clearWhenEmpty
 // option of false.
 function clearEmptySpans(spans) {
   for (var i = 0; i < spans.length; ++i) {
-    var span = spans[i];
+    var span = spans[i]
     if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
-      spans.splice(i--, 1);
+      spans.splice(i--, 1)
   }
-  if (!spans.length) return null;
-  return spans;
+  if (!spans.length) return null
+  return spans
 }
 
 // Used to 'clip' out readOnly ranges when making a change.
 export function removeReadOnlyRanges(doc, from, to) {
-  var markers = null;
+  var markers = null
   doc.iter(from.line, to.line + 1, function(line) {
     if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-      var mark = line.markedSpans[i].marker;
+      var mark = line.markedSpans[i].marker
       if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
-        (markers || (markers = [])).push(mark);
+        (markers || (markers = [])).push(mark)
     }
-  });
-  if (!markers) return null;
-  var parts = [{from: from, to: to}];
+  })
+  if (!markers) return null
+  var parts = [{from: from, to: to}]
   for (var i = 0; i < markers.length; ++i) {
-    var mk = markers[i], m = mk.find(0);
+    var mk = markers[i], m = mk.find(0)
     for (var j = 0; j < parts.length; ++j) {
-      var p = parts[j];
-      if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue;
-      var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
+      var p = parts[j]
+      if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue
+      var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to)
       if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
-        newParts.push({from: p.from, to: m.from});
+        newParts.push({from: p.from, to: m.from})
       if (dto > 0 || !mk.inclusiveRight && !dto)
-        newParts.push({from: m.to, to: p.to});
-      parts.splice.apply(parts, newParts);
-      j += newParts.length - 1;
+        newParts.push({from: m.to, to: p.to})
+      parts.splice.apply(parts, newParts)
+      j += newParts.length - 1
     }
   }
-  return parts;
+  return parts
 }
 
 // Connect or disconnect spans from a line.
 export function detachMarkedSpans(line) {
-  var spans = line.markedSpans;
-  if (!spans) return;
+  var spans = line.markedSpans
+  if (!spans) return
   for (var i = 0; i < spans.length; ++i)
-    spans[i].marker.detachLine(line);
-  line.markedSpans = null;
+    spans[i].marker.detachLine(line)
+  line.markedSpans = null
 }
 export function attachMarkedSpans(line, spans) {
-  if (!spans) return;
+  if (!spans) return
   for (var i = 0; i < spans.length; ++i)
-    spans[i].marker.attachLine(line);
-  line.markedSpans = spans;
+    spans[i].marker.attachLine(line)
+  line.markedSpans = spans
 }
 
 // Helpers used when computing which overlapping collapsed span
 // counts as the larger one.
-function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; }
-function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; }
+function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0 }
+function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 }
 
 // Returns a number indicating which of two overlapping collapsed
 // spans is larger (and thus includes the other). Falls back to
 // comparing ids when the spans cover exactly the same range.
 export function compareCollapsedMarkers(a, b) {
-  var lenDiff = a.lines.length - b.lines.length;
-  if (lenDiff != 0) return lenDiff;
-  var aPos = a.find(), bPos = b.find();
-  var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
-  if (fromCmp) return -fromCmp;
-  var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
-  if (toCmp) return toCmp;
-  return b.id - a.id;
+  var lenDiff = a.lines.length - b.lines.length
+  if (lenDiff != 0) return lenDiff
+  var aPos = a.find(), bPos = b.find()
+  var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b)
+  if (fromCmp) return -fromCmp
+  var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b)
+  if (toCmp) return toCmp
+  return b.id - a.id
 }
 
 // Find out whether a line ends or starts in a collapsed span. If
 // so, return the marker for that span.
 function collapsedSpanAtSide(line, start) {
-  var sps = sawCollapsedSpans && line.markedSpans, found;
+  var sps = sawCollapsedSpans && line.markedSpans, found
   if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-    sp = sps[i];
+    sp = sps[i]
     if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
         (!found || compareCollapsedMarkers(found, sp.marker) < 0))
-      found = sp.marker;
+      found = sp.marker
   }
-  return found;
+  return found
 }
-export function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }
-export function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }
+export function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
+export function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
 
 // Test whether there exists a collapsed span that partially
 // overlaps (covers the start or end, but not both) of a new span.
 // Such overlap is not allowed.
 export function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
-  var line = getLine(doc, lineNo);
-  var sps = sawCollapsedSpans && line.markedSpans;
+  var line = getLine(doc, lineNo)
+  var sps = sawCollapsedSpans && line.markedSpans
   if (sps) for (var i = 0; i < sps.length; ++i) {
-    var sp = sps[i];
-    if (!sp.marker.collapsed) continue;
-    var found = sp.marker.find(0);
-    var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
-    var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
-    if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
+    var sp = sps[i]
+    if (!sp.marker.collapsed) continue
+    var found = sp.marker.find(0)
+    var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker)
+    var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker)
+    if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue
     if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
         fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
-      return true;
+      return true
   }
 }
 
@@ -239,124 +239,124 @@ export function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
 // visual line. This finds the start of the visual line that the
 // given line is part of (usually that is the line itself).
 export function visualLine(line) {
-  var merged;
+  var merged
   while (merged = collapsedSpanAtStart(line))
-    line = merged.find(-1, true).line;
-  return line;
+    line = merged.find(-1, true).line
+  return line
 }
 
 // Returns an array of logical lines that continue the visual line
 // started by the argument, or undefined if there are no such lines.
 export function visualLineContinued(line) {
-  var merged, lines;
+  var merged, lines
   while (merged = collapsedSpanAtEnd(line)) {
-    line = merged.find(1, true).line;
-    (lines || (lines = [])).push(line);
+    line = merged.find(1, true).line
+    ;(lines || (lines = [])).push(line)
   }
-  return lines;
+  return lines
 }
 
 // Get the line number of the start of the visual line that the
 // given line number is part of.
 export function visualLineNo(doc, lineN) {
-  var line = getLine(doc, lineN), vis = visualLine(line);
-  if (line == vis) return lineN;
-  return lineNo(vis);
+  var line = getLine(doc, lineN), vis = visualLine(line)
+  if (line == vis) return lineN
+  return lineNo(vis)
 }
 
 // Get the line number of the start of the next visual line after
 // the given line.
 export function visualLineEndNo(doc, lineN) {
-  if (lineN > doc.lastLine()) return lineN;
-  var line = getLine(doc, lineN), merged;
-  if (!lineIsHidden(doc, line)) return lineN;
+  if (lineN > doc.lastLine()) return lineN
+  var line = getLine(doc, lineN), merged
+  if (!lineIsHidden(doc, line)) return lineN
   while (merged = collapsedSpanAtEnd(line))
-    line = merged.find(1, true).line;
-  return lineNo(line) + 1;
+    line = merged.find(1, true).line
+  return lineNo(line) + 1
 }
 
 // Compute whether a line is hidden. Lines count as hidden when they
 // are part of a visual line that starts with another line, or when
 // they are entirely covered by collapsed, non-widget span.
 export function lineIsHidden(doc, line) {
-  var sps = sawCollapsedSpans && line.markedSpans;
+  var sps = sawCollapsedSpans && line.markedSpans
   if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-    sp = sps[i];
-    if (!sp.marker.collapsed) continue;
-    if (sp.from == null) return true;
-    if (sp.marker.widgetNode) continue;
+    sp = sps[i]
+    if (!sp.marker.collapsed) continue
+    if (sp.from == null) return true
+    if (sp.marker.widgetNode) continue
     if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
-      return true;
+      return true
   }
 }
 function lineIsHiddenInner(doc, line, span) {
   if (span.to == null) {
-    var end = span.marker.find(1, true);
-    return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker));
+    var end = span.marker.find(1, true)
+    return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker))
   }
   if (span.marker.inclusiveRight && span.to == line.text.length)
-    return true;
+    return true
   for (var sp, i = 0; i < line.markedSpans.length; ++i) {
-    sp = line.markedSpans[i];
+    sp = line.markedSpans[i]
     if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
         (sp.to == null || sp.to != span.from) &&
         (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
-        lineIsHiddenInner(doc, line, sp)) return true;
+        lineIsHiddenInner(doc, line, sp)) return true
   }
 }
 
 // Find the height above the given line.
 export function heightAtLine(lineObj) {
-  lineObj = visualLine(lineObj);
+  lineObj = visualLine(lineObj)
 
-  var h = 0, chunk = lineObj.parent;
+  var h = 0, chunk = lineObj.parent
   for (var i = 0; i < chunk.lines.length; ++i) {
-    var line = chunk.lines[i];
-    if (line == lineObj) break;
-    else h += line.height;
+    var line = chunk.lines[i]
+    if (line == lineObj) break
+    else h += line.height
   }
   for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
     for (var i = 0; i < p.children.length; ++i) {
-      var cur = p.children[i];
-      if (cur == chunk) break;
-      else h += cur.height;
+      var cur = p.children[i]
+      if (cur == chunk) break
+      else h += cur.height
     }
   }
-  return h;
+  return h
 }
 
 // Compute the character length of a line, taking into account
 // collapsed ranges (see markText) that might hide parts, and join
 // other lines onto it.
 export function lineLength(line) {
-  if (line.height == 0) return 0;
-  var len = line.text.length, merged, cur = line;
+  if (line.height == 0) return 0
+  var len = line.text.length, merged, cur = line
   while (merged = collapsedSpanAtStart(cur)) {
-    var found = merged.find(0, true);
-    cur = found.from.line;
-    len += found.from.ch - found.to.ch;
+    var found = merged.find(0, true)
+    cur = found.from.line
+    len += found.from.ch - found.to.ch
   }
-  cur = line;
+  cur = line
   while (merged = collapsedSpanAtEnd(cur)) {
-    var found = merged.find(0, true);
-    len -= cur.text.length - found.from.ch;
-    cur = found.to.line;
-    len += cur.text.length - found.to.ch;
+    var found = merged.find(0, true)
+    len -= cur.text.length - found.from.ch
+    cur = found.to.line
+    len += cur.text.length - found.to.ch
   }
-  return len;
+  return len
 }
 
 // Find the longest line in the document.
 export function findMaxLine(cm) {
-  var d = cm.display, doc = cm.doc;
-  d.maxLine = getLine(doc, doc.first);
-  d.maxLineLength = lineLength(d.maxLine);
-  d.maxLineChanged = true;
+  var d = cm.display, doc = cm.doc
+  d.maxLine = getLine(doc, doc.first)
+  d.maxLineLength = lineLength(d.maxLine)
+  d.maxLineChanged = true
   doc.iter(function(line) {
-    var len = lineLength(line);
+    var len = lineLength(line)
     if (len > d.maxLineLength) {
-      d.maxLineLength = len;
-      d.maxLine = line;
+      d.maxLineLength = len
+      d.maxLine = line
     }
-  });
+  })
 }
diff --git a/src/line/utils_line.js b/src/line/utils_line.js
index b194ff38b6..4e10a1d8d8 100644
--- a/src/line/utils_line.js
+++ b/src/line/utils_line.js
@@ -1,83 +1,83 @@
-import { indexOf } from "../util/misc";
+import { indexOf } from "../util/misc"
 
 // Find the line object corresponding to the given line number.
 export function getLine(doc, n) {
-  n -= doc.first;
-  if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.");
+  n -= doc.first
+  if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.")
   for (var chunk = doc; !chunk.lines;) {
     for (var i = 0;; ++i) {
-      var child = chunk.children[i], sz = child.chunkSize();
-      if (n < sz) { chunk = child; break; }
-      n -= sz;
+      var child = chunk.children[i], sz = child.chunkSize()
+      if (n < sz) { chunk = child; break }
+      n -= sz
     }
   }
-  return chunk.lines[n];
+  return chunk.lines[n]
 }
 
 // Get the part of a document between two positions, as an array of
 // strings.
 export function getBetween(doc, start, end) {
-  var out = [], n = start.line;
+  var out = [], n = start.line
   doc.iter(start.line, end.line + 1, function(line) {
-    var text = line.text;
-    if (n == end.line) text = text.slice(0, end.ch);
-    if (n == start.line) text = text.slice(start.ch);
-    out.push(text);
-    ++n;
-  });
-  return out;
+    var text = line.text
+    if (n == end.line) text = text.slice(0, end.ch)
+    if (n == start.line) text = text.slice(start.ch)
+    out.push(text)
+    ++n
+  })
+  return out
 }
 // Get the lines between from and to, as array of strings.
 export function getLines(doc, from, to) {
-  var out = [];
-  doc.iter(from, to, function(line) { out.push(line.text); });
-  return out;
+  var out = []
+  doc.iter(from, to, function(line) { out.push(line.text) })
+  return out
 }
 
 // Update the height of a line, propagating the height change
 // upwards to parent nodes.
 export function updateLineHeight(line, height) {
-  var diff = height - line.height;
-  if (diff) for (var n = line; n; n = n.parent) n.height += diff;
+  var diff = height - line.height
+  if (diff) for (var n = line; n; n = n.parent) n.height += diff
 }
 
 // Given a line object, find its line number by walking up through
 // its parent links.
 export function lineNo(line) {
-  if (line.parent == null) return null;
-  var cur = line.parent, no = indexOf(cur.lines, line);
+  if (line.parent == null) return null
+  var cur = line.parent, no = indexOf(cur.lines, line)
   for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
     for (var i = 0;; ++i) {
-      if (chunk.children[i] == cur) break;
-      no += chunk.children[i].chunkSize();
+      if (chunk.children[i] == cur) break
+      no += chunk.children[i].chunkSize()
     }
   }
-  return no + cur.first;
+  return no + cur.first
 }
 
 // Find the line at the given vertical position, using the height
 // information in the document tree.
 export function lineAtHeight(chunk, h) {
-  var n = chunk.first;
+  var n = chunk.first
   outer: do {
     for (var i = 0; i < chunk.children.length; ++i) {
-      var child = chunk.children[i], ch = child.height;
-      if (h < ch) { chunk = child; continue outer; }
-      h -= ch;
-      n += child.chunkSize();
+      var child = chunk.children[i], ch = child.height
+      if (h < ch) { chunk = child; continue outer }
+      h -= ch
+      n += child.chunkSize()
     }
-    return n;
-  } while (!chunk.lines);
+    return n
+  } while (!chunk.lines)
   for (var i = 0; i < chunk.lines.length; ++i) {
-    var line = chunk.lines[i], lh = line.height;
-    if (h < lh) break;
-    h -= lh;
+    var line = chunk.lines[i], lh = line.height
+    if (h < lh) break
+    h -= lh
   }
-  return n + i;
+  return n + i
 }
 
-export function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
+export function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size}
 
 export function lineNumberFor(options, i) {
-  return String(options.lineNumberFormatter(i + options.firstLineNumber));
+  return String(options.lineNumberFormatter(i + options.firstLineNumber))
 }
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index b479e25090..75011a34d3 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -1,36 +1,36 @@
-import { buildLineContent, LineView } from "../line/line_data";
-import { clipPos, Pos } from "../line/pos";
-import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans";
-import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line";
-import { bidiLeft, bidiRight, bidiOther, getBidiPartAt, getOrder, lineLeft, lineRight, moveVisually } from "../util/bidi";
-import { ie, ie_version } from "../util/browser";
-import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom";
-import { e_target } from "../util/event";
-import { hasBadZoomedRects } from "../util/feature_detection";
-import { countColumn, isExtendingChar, scrollerGap } from "../util/misc";
-
-import { updateLineForChanges } from "./update_line";
-import { widgetHeight } from "./widgets";
+import { buildLineContent, LineView } from "../line/line_data"
+import { clipPos, Pos } from "../line/pos"
+import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans"
+import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line"
+import { bidiLeft, bidiRight, bidiOther, getBidiPartAt, getOrder, lineLeft, lineRight, moveVisually } from "../util/bidi"
+import { ie, ie_version } from "../util/browser"
+import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom"
+import { e_target } from "../util/event"
+import { hasBadZoomedRects } from "../util/feature_detection"
+import { countColumn, isExtendingChar, scrollerGap } from "../util/misc"
+
+import { updateLineForChanges } from "./update_line"
+import { widgetHeight } from "./widgets"
 
 // POSITION MEASUREMENT
 
-export function paddingTop(display) {return display.lineSpace.offsetTop;}
-export function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;}
+export function paddingTop(display) {return display.lineSpace.offsetTop}
+export function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
 export function paddingH(display) {
-  if (display.cachedPaddingH) return display.cachedPaddingH;
-  var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
-  var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
-  var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
-  if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data;
-  return data;
+  if (display.cachedPaddingH) return display.cachedPaddingH
+  var e = removeChildrenAndAdd(display.measure, elt("pre", "x"))
+  var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle
+  var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}
+  if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data
+  return data
 }
 
-export function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; }
+export function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth }
 export function displayWidth(cm) {
-  return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth;
+  return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth
 }
 export function displayHeight(cm) {
-  return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight;
+  return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight
 }
 
 // Ensure the lineView.wrapping.heights array is populated. This is
@@ -38,20 +38,20 @@ export function displayHeight(cm) {
 // line. When lineWrapping is on, there might be more than one
 // height.
 function ensureLineHeights(cm, lineView, rect) {
-  var wrapping = cm.options.lineWrapping;
-  var curWidth = wrapping && displayWidth(cm);
+  var wrapping = cm.options.lineWrapping
+  var curWidth = wrapping && displayWidth(cm)
   if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
-    var heights = lineView.measure.heights = [];
+    var heights = lineView.measure.heights = []
     if (wrapping) {
-      lineView.measure.width = curWidth;
-      var rects = lineView.text.firstChild.getClientRects();
+      lineView.measure.width = curWidth
+      var rects = lineView.text.firstChild.getClientRects()
       for (var i = 0; i < rects.length - 1; i++) {
-        var cur = rects[i], next = rects[i + 1];
+        var cur = rects[i], next = rects[i + 1]
         if (Math.abs(cur.bottom - next.bottom) > 2)
-          heights.push((cur.bottom + next.top) / 2 - rect.top);
+          heights.push((cur.bottom + next.top) / 2 - rect.top)
       }
     }
-    heights.push(rect.bottom - rect.top);
+    heights.push(rect.bottom - rect.top)
   }
 }
 
@@ -60,41 +60,41 @@ function ensureLineHeights(cm, lineView, rect) {
 // contain multiple lines when collapsed ranges are present.)
 export function mapFromLineView(lineView, line, lineN) {
   if (lineView.line == line)
-    return {map: lineView.measure.map, cache: lineView.measure.cache};
+    return {map: lineView.measure.map, cache: lineView.measure.cache}
   for (var i = 0; i < lineView.rest.length; i++)
     if (lineView.rest[i] == line)
-      return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]};
+      return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]}
   for (var i = 0; i < lineView.rest.length; i++)
     if (lineNo(lineView.rest[i]) > lineN)
-      return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true};
+      return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true}
 }
 
 // Render a line into the hidden node display.externalMeasured. Used
 // when measurement is needed for a line that's not in the viewport.
 function updateExternalMeasurement(cm, line) {
-  line = visualLine(line);
-  var lineN = lineNo(line);
-  var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
-  view.lineN = lineN;
-  var built = view.built = buildLineContent(cm, view);
-  view.text = built.pre;
-  removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
-  return view;
+  line = visualLine(line)
+  var lineN = lineNo(line)
+  var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN)
+  view.lineN = lineN
+  var built = view.built = buildLineContent(cm, view)
+  view.text = built.pre
+  removeChildrenAndAdd(cm.display.lineMeasure, built.pre)
+  return view
 }
 
 // Get a {top, bottom, left, right} box (in line-local coordinates)
 // for a given character.
 export function measureChar(cm, line, ch, bias) {
-  return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias);
+  return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias)
 }
 
 // Find a line view that corresponds to the given line number.
 export function findViewForLine(cm, lineN) {
   if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
-    return cm.display.view[findViewIndex(cm, lineN)];
-  var ext = cm.display.externalMeasured;
+    return cm.display.view[findViewIndex(cm, lineN)]
+  var ext = cm.display.externalMeasured
   if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
-    return ext;
+    return ext
 }
 
 // Measurement can be split in two steps, the set-up work that
@@ -103,84 +103,84 @@ export function findViewForLine(cm, lineN) {
 // measurements in a row, can thus ensure that the set-up work is
 // only done once.
 function prepareMeasureForLine(cm, line) {
-  var lineN = lineNo(line);
-  var view = findViewForLine(cm, lineN);
+  var lineN = lineNo(line)
+  var view = findViewForLine(cm, lineN)
   if (view && !view.text) {
-    view = null;
+    view = null
   } else if (view && view.changes) {
-    updateLineForChanges(cm, view, lineN, getDimensions(cm));
-    cm.curOp.forceUpdate = true;
+    updateLineForChanges(cm, view, lineN, getDimensions(cm))
+    cm.curOp.forceUpdate = true
   }
   if (!view)
-    view = updateExternalMeasurement(cm, line);
+    view = updateExternalMeasurement(cm, line)
 
-  var info = mapFromLineView(view, line, lineN);
+  var info = mapFromLineView(view, line, lineN)
   return {
     line: line, view: view, rect: null,
     map: info.map, cache: info.cache, before: info.before,
     hasHeights: false
-  };
+  }
 }
 
 // Given a prepared measurement object, measures the position of an
 // actual character (or fetches it from the cache).
 function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
-  if (prepared.before) ch = -1;
-  var key = ch + (bias || ""), found;
+  if (prepared.before) ch = -1
+  var key = ch + (bias || ""), found
   if (prepared.cache.hasOwnProperty(key)) {
-    found = prepared.cache[key];
+    found = prepared.cache[key]
   } else {
     if (!prepared.rect)
-      prepared.rect = prepared.view.text.getBoundingClientRect();
+      prepared.rect = prepared.view.text.getBoundingClientRect()
     if (!prepared.hasHeights) {
-      ensureLineHeights(cm, prepared.view, prepared.rect);
-      prepared.hasHeights = true;
+      ensureLineHeights(cm, prepared.view, prepared.rect)
+      prepared.hasHeights = true
     }
-    found = measureCharInner(cm, prepared, ch, bias);
-    if (!found.bogus) prepared.cache[key] = found;
+    found = measureCharInner(cm, prepared, ch, bias)
+    if (!found.bogus) prepared.cache[key] = found
   }
   return {left: found.left, right: found.right,
           top: varHeight ? found.rtop : found.top,
-          bottom: varHeight ? found.rbottom : found.bottom};
+          bottom: varHeight ? found.rbottom : found.bottom}
 }
 
-var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
+var nullRect = {left: 0, right: 0, top: 0, bottom: 0}
 
 export function nodeAndOffsetInLineMap(map, ch, bias) {
-  var node, start, end, collapse;
+  var node, start, end, collapse
   // First, search the line map for the text node corresponding to,
   // or closest to, the target character.
   for (var i = 0; i < map.length; i += 3) {
-    var mStart = map[i], mEnd = map[i + 1];
+    var mStart = map[i], mEnd = map[i + 1]
     if (ch < mStart) {
-      start = 0; end = 1;
-      collapse = "left";
+      start = 0; end = 1
+      collapse = "left"
     } else if (ch < mEnd) {
-      start = ch - mStart;
-      end = start + 1;
+      start = ch - mStart
+      end = start + 1
     } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {
-      end = mEnd - mStart;
-      start = end - 1;
-      if (ch >= mEnd) collapse = "right";
+      end = mEnd - mStart
+      start = end - 1
+      if (ch >= mEnd) collapse = "right"
     }
     if (start != null) {
-      node = map[i + 2];
+      node = map[i + 2]
       if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
-        collapse = bias;
+        collapse = bias
       if (bias == "left" && start == 0)
         while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {
-          node = map[(i -= 3) + 2];
-          collapse = "left";
+          node = map[(i -= 3) + 2]
+          collapse = "left"
         }
       if (bias == "right" && start == mEnd - mStart)
         while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {
-          node = map[(i += 3) + 2];
-          collapse = "right";
+          node = map[(i += 3) + 2]
+          collapse = "right"
         }
-      break;
+      break
     }
   }
-  return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
+  return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd}
 }
 
 function getUsefulRect(rects, bias) {
@@ -194,53 +194,53 @@ function getUsefulRect(rects, bias) {
 }
 
 function measureCharInner(cm, prepared, ch, bias) {
-  var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
-  var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
+  var place = nodeAndOffsetInLineMap(prepared.map, ch, bias)
+  var node = place.node, start = place.start, end = place.end, collapse = place.collapse
 
-  var rect;
+  var rect
   if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
     for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
-      while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
-      while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
+      while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start
+      while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end
       if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
-        rect = node.parentNode.getBoundingClientRect();
+        rect = node.parentNode.getBoundingClientRect()
       else
         rect = getUsefulRect(range(node, start, end).getClientRects(), bias)
-      if (rect.left || rect.right || start == 0) break;
-      end = start;
-      start = start - 1;
-      collapse = "right";
+      if (rect.left || rect.right || start == 0) break
+      end = start
+      start = start - 1
+      collapse = "right"
     }
-    if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
+    if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect)
   } else { // If it is a widget, simply get the box for the whole widget.
-    if (start > 0) collapse = bias = "right";
-    var rects;
+    if (start > 0) collapse = bias = "right"
+    var rects
     if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
-      rect = rects[bias == "right" ? rects.length - 1 : 0];
+      rect = rects[bias == "right" ? rects.length - 1 : 0]
     else
-      rect = node.getBoundingClientRect();
+      rect = node.getBoundingClientRect()
   }
   if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
-    var rSpan = node.parentNode.getClientRects()[0];
+    var rSpan = node.parentNode.getClientRects()[0]
     if (rSpan)
-      rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
+      rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom}
     else
-      rect = nullRect;
+      rect = nullRect
   }
 
-  var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
-  var mid = (rtop + rbot) / 2;
-  var heights = prepared.view.measure.heights;
+  var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top
+  var mid = (rtop + rbot) / 2
+  var heights = prepared.view.measure.heights
   for (var i = 0; i < heights.length - 1; i++)
-    if (mid < heights[i]) break;
-  var top = i ? heights[i - 1] : 0, bot = heights[i];
+    if (mid < heights[i]) break
+  var top = i ? heights[i - 1] : 0, bot = heights[i]
   var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
                 right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
-                top: top, bottom: bot};
-  if (!rect.left && !rect.right) result.bogus = true;
-  if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
+                top: top, bottom: bot}
+  if (!rect.left && !rect.right) result.bogus = true
+  if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot }
 
-  return result;
+  return result
 }
 
 // Work around problem with bounding client rects on ranges being
@@ -248,38 +248,38 @@ function measureCharInner(cm, prepared, ch, bias) {
 function maybeUpdateRectForZooming(measure, rect) {
   if (!window.screen || screen.logicalXDPI == null ||
       screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
-    return rect;
-  var scaleX = screen.logicalXDPI / screen.deviceXDPI;
-  var scaleY = screen.logicalYDPI / screen.deviceYDPI;
+    return rect
+  var scaleX = screen.logicalXDPI / screen.deviceXDPI
+  var scaleY = screen.logicalYDPI / screen.deviceYDPI
   return {left: rect.left * scaleX, right: rect.right * scaleX,
-          top: rect.top * scaleY, bottom: rect.bottom * scaleY};
+          top: rect.top * scaleY, bottom: rect.bottom * scaleY}
 }
 
 export function clearLineMeasurementCacheFor(lineView) {
   if (lineView.measure) {
-    lineView.measure.cache = {};
-    lineView.measure.heights = null;
+    lineView.measure.cache = {}
+    lineView.measure.heights = null
     if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-      lineView.measure.caches[i] = {};
+      lineView.measure.caches[i] = {}
   }
 }
 
 export function clearLineMeasurementCache(cm) {
-  cm.display.externalMeasure = null;
-  removeChildren(cm.display.lineMeasure);
+  cm.display.externalMeasure = null
+  removeChildren(cm.display.lineMeasure)
   for (var i = 0; i < cm.display.view.length; i++)
-    clearLineMeasurementCacheFor(cm.display.view[i]);
+    clearLineMeasurementCacheFor(cm.display.view[i])
 }
 
 export function clearCaches(cm) {
-  clearLineMeasurementCache(cm);
-  cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
-  if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
-  cm.display.lineNumChars = null;
+  clearLineMeasurementCache(cm)
+  cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null
+  if (!cm.options.lineWrapping) cm.display.maxLineChanged = true
+  cm.display.lineNumChars = null
 }
 
-function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }
-function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }
+function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft }
+function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop }
 
 // Converts a {top, bottom, left, right} box from line-local
 // coordinates into another coordinate system. Context may be one of
@@ -287,89 +287,89 @@ function pageScrollY() { return window.pageYOffset || (document.documentElement
 // or "page".
 export function intoCoordSystem(cm, lineObj, rect, context) {
   if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
-    var size = widgetHeight(lineObj.widgets[i]);
-    rect.top += size; rect.bottom += size;
+    var size = widgetHeight(lineObj.widgets[i])
+    rect.top += size; rect.bottom += size
   }
-  if (context == "line") return rect;
-  if (!context) context = "local";
-  var yOff = heightAtLine(lineObj);
-  if (context == "local") yOff += paddingTop(cm.display);
-  else yOff -= cm.display.viewOffset;
+  if (context == "line") return rect
+  if (!context) context = "local"
+  var yOff = heightAtLine(lineObj)
+  if (context == "local") yOff += paddingTop(cm.display)
+  else yOff -= cm.display.viewOffset
   if (context == "page" || context == "window") {
-    var lOff = cm.display.lineSpace.getBoundingClientRect();
-    yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
-    var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
-    rect.left += xOff; rect.right += xOff;
+    var lOff = cm.display.lineSpace.getBoundingClientRect()
+    yOff += lOff.top + (context == "window" ? 0 : pageScrollY())
+    var xOff = lOff.left + (context == "window" ? 0 : pageScrollX())
+    rect.left += xOff; rect.right += xOff
   }
-  rect.top += yOff; rect.bottom += yOff;
-  return rect;
+  rect.top += yOff; rect.bottom += yOff
+  return rect
 }
 
 // Coverts a box from "div" coords to another coordinate system.
 // Context may be "window", "page", "div", or "local"./null.
 export function fromCoordSystem(cm, coords, context) {
-  if (context == "div") return coords;
-  var left = coords.left, top = coords.top;
+  if (context == "div") return coords
+  var left = coords.left, top = coords.top
   // First move into "page" coordinate system
   if (context == "page") {
-    left -= pageScrollX();
-    top -= pageScrollY();
+    left -= pageScrollX()
+    top -= pageScrollY()
   } else if (context == "local" || !context) {
-    var localBox = cm.display.sizer.getBoundingClientRect();
-    left += localBox.left;
-    top += localBox.top;
+    var localBox = cm.display.sizer.getBoundingClientRect()
+    left += localBox.left
+    top += localBox.top
   }
 
-  var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
-  return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
+  var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect()
+  return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top}
 }
 
 export function charCoords(cm, pos, context, lineObj, bias) {
-  if (!lineObj) lineObj = getLine(cm.doc, pos.line);
-  return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context);
+  if (!lineObj) lineObj = getLine(cm.doc, pos.line)
+  return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context)
 }
 
 // Returns a box for a given cursor position, which may have an
 // 'other' property containing the position of the secondary cursor
 // on a bidi boundary.
 export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
-  lineObj = lineObj || getLine(cm.doc, pos.line);
-  if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
+  lineObj = lineObj || getLine(cm.doc, pos.line)
+  if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj)
   function get(ch, right) {
-    var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
-    if (right) m.left = m.right; else m.right = m.left;
-    return intoCoordSystem(cm, lineObj, m, context);
+    var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight)
+    if (right) m.left = m.right; else m.right = m.left
+    return intoCoordSystem(cm, lineObj, m, context)
   }
   function getBidi(ch, partPos) {
-    var part = order[partPos], right = part.level % 2;
+    var part = order[partPos], right = part.level % 2
     if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
-      part = order[--partPos];
-      ch = bidiRight(part) - (part.level % 2 ? 0 : 1);
-      right = true;
+      part = order[--partPos]
+      ch = bidiRight(part) - (part.level % 2 ? 0 : 1)
+      right = true
     } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
-      part = order[++partPos];
-      ch = bidiLeft(part) - part.level % 2;
-      right = false;
+      part = order[++partPos]
+      ch = bidiLeft(part) - part.level % 2
+      right = false
     }
-    if (right && ch == part.to && ch > part.from) return get(ch - 1);
-    return get(ch, right);
+    if (right && ch == part.to && ch > part.from) return get(ch - 1)
+    return get(ch, right)
   }
-  var order = getOrder(lineObj), ch = pos.ch;
-  if (!order) return get(ch);
-  var partPos = getBidiPartAt(order, ch);
-  var val = getBidi(ch, partPos);
-  if (bidiOther != null) val.other = getBidi(ch, bidiOther);
-  return val;
+  var order = getOrder(lineObj), ch = pos.ch
+  if (!order) return get(ch)
+  var partPos = getBidiPartAt(order, ch)
+  var val = getBidi(ch, partPos)
+  if (bidiOther != null) val.other = getBidi(ch, bidiOther)
+  return val
 }
 
 // Used to cheaply estimate the coordinates for a position. Used for
 // intermediate scroll updates.
 export function estimateCoords(cm, pos) {
-  var left = 0, pos = clipPos(cm.doc, pos);
-  if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch;
-  var lineObj = getLine(cm.doc, pos.line);
-  var top = heightAtLine(lineObj) + paddingTop(cm.display);
-  return {left: left, right: left, top: top, bottom: top + lineObj.height};
+  var left = 0, pos = clipPos(cm.doc, pos)
+  if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch
+  var lineObj = getLine(cm.doc, pos.line)
+  var top = heightAtLine(lineObj) + paddingTop(cm.display)
+  return {left: left, right: left, top: top, bottom: top + lineObj.height}
 }
 
 // Positions returned by coordsChar contain some extra information.
@@ -379,170 +379,170 @@ export function estimateCoords(cm, pos) {
 // is true, that means the coordinates lie outside the line's
 // vertical range.
 function PosWithInfo(line, ch, outside, xRel) {
-  var pos = Pos(line, ch);
-  pos.xRel = xRel;
-  if (outside) pos.outside = true;
-  return pos;
+  var pos = Pos(line, ch)
+  pos.xRel = xRel
+  if (outside) pos.outside = true
+  return pos
 }
 
 // Compute the character position closest to the given coordinates.
 // Input must be lineSpace-local ("div" coordinate system).
 export function coordsChar(cm, x, y) {
-  var doc = cm.doc;
-  y += cm.display.viewOffset;
-  if (y < 0) return PosWithInfo(doc.first, 0, true, -1);
-  var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
+  var doc = cm.doc
+  y += cm.display.viewOffset
+  if (y < 0) return PosWithInfo(doc.first, 0, true, -1)
+  var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1
   if (lineN > last)
-    return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);
-  if (x < 0) x = 0;
+    return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1)
+  if (x < 0) x = 0
 
-  var lineObj = getLine(doc, lineN);
+  var lineObj = getLine(doc, lineN)
   for (;;) {
-    var found = coordsCharInner(cm, lineObj, lineN, x, y);
-    var merged = collapsedSpanAtEnd(lineObj);
-    var mergedPos = merged && merged.find(0, true);
+    var found = coordsCharInner(cm, lineObj, lineN, x, y)
+    var merged = collapsedSpanAtEnd(lineObj)
+    var mergedPos = merged && merged.find(0, true)
     if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
-      lineN = lineNo(lineObj = mergedPos.to.line);
+      lineN = lineNo(lineObj = mergedPos.to.line)
     else
-      return found;
+      return found
   }
 }
 
 function coordsCharInner(cm, lineObj, lineNo, x, y) {
-  var innerOff = y - heightAtLine(lineObj);
-  var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
-  var preparedMeasure = prepareMeasureForLine(cm, lineObj);
+  var innerOff = y - heightAtLine(lineObj)
+  var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth
+  var preparedMeasure = prepareMeasureForLine(cm, lineObj)
 
   function getX(ch) {
-    var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure);
-    wrongLine = true;
-    if (innerOff > sp.bottom) return sp.left - adjust;
-    else if (innerOff < sp.top) return sp.left + adjust;
-    else wrongLine = false;
-    return sp.left;
+    var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure)
+    wrongLine = true
+    if (innerOff > sp.bottom) return sp.left - adjust
+    else if (innerOff < sp.top) return sp.left + adjust
+    else wrongLine = false
+    return sp.left
   }
 
-  var bidi = getOrder(lineObj), dist = lineObj.text.length;
-  var from = lineLeft(lineObj), to = lineRight(lineObj);
-  var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;
+  var bidi = getOrder(lineObj), dist = lineObj.text.length
+  var from = lineLeft(lineObj), to = lineRight(lineObj)
+  var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine
 
-  if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1);
+  if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1)
   // Do a binary search between these bounds.
   for (;;) {
     if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-      var ch = x < fromX || x - fromX <= toX - x ? from : to;
+      var ch = x < fromX || x - fromX <= toX - x ? from : to
       var outside = ch == from ? fromOutside : toOutside
-      var xDiff = x - (ch == from ? fromX : toX);
+      var xDiff = x - (ch == from ? fromX : toX)
       // This is a kludge to handle the case where the coordinates
       // are after a line-wrapped line. We should replace it with a
       // more general handling of cursor positions around line
       // breaks. (Issue #4078)
       if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
           ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
-        var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right");
+        var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right")
         if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
           outside = false
           ch++
           xDiff = x - charSize.right
         }
       }
-      while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
-      var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
-      return pos;
+      while (isExtendingChar(lineObj.text.charAt(ch))) ++ch
+      var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0)
+      return pos
     }
-    var step = Math.ceil(dist / 2), middle = from + step;
+    var step = Math.ceil(dist / 2), middle = from + step
     if (bidi) {
-      middle = from;
-      for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1);
+      middle = from
+      for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1)
     }
-    var middleX = getX(middle);
-    if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;}
-    else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;}
+    var middleX = getX(middle)
+    if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step}
+    else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step}
   }
 }
 
-var measureText;
+var measureText
 // Compute the default text height.
 export function textHeight(display) {
-  if (display.cachedTextHeight != null) return display.cachedTextHeight;
+  if (display.cachedTextHeight != null) return display.cachedTextHeight
   if (measureText == null) {
-    measureText = elt("pre");
+    measureText = elt("pre")
     // Measure a bunch of lines, for browsers that compute
     // fractional heights.
     for (var i = 0; i < 49; ++i) {
-      measureText.appendChild(document.createTextNode("x"));
-      measureText.appendChild(elt("br"));
+      measureText.appendChild(document.createTextNode("x"))
+      measureText.appendChild(elt("br"))
     }
-    measureText.appendChild(document.createTextNode("x"));
+    measureText.appendChild(document.createTextNode("x"))
   }
-  removeChildrenAndAdd(display.measure, measureText);
-  var height = measureText.offsetHeight / 50;
-  if (height > 3) display.cachedTextHeight = height;
-  removeChildren(display.measure);
-  return height || 1;
+  removeChildrenAndAdd(display.measure, measureText)
+  var height = measureText.offsetHeight / 50
+  if (height > 3) display.cachedTextHeight = height
+  removeChildren(display.measure)
+  return height || 1
 }
 
 // Compute the default character width.
 export function charWidth(display) {
-  if (display.cachedCharWidth != null) return display.cachedCharWidth;
-  var anchor = elt("span", "xxxxxxxxxx");
-  var pre = elt("pre", [anchor]);
-  removeChildrenAndAdd(display.measure, pre);
-  var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
-  if (width > 2) display.cachedCharWidth = width;
-  return width || 10;
+  if (display.cachedCharWidth != null) return display.cachedCharWidth
+  var anchor = elt("span", "xxxxxxxxxx")
+  var pre = elt("pre", [anchor])
+  removeChildrenAndAdd(display.measure, pre)
+  var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10
+  if (width > 2) display.cachedCharWidth = width
+  return width || 10
 }
 
 // Do a bulk-read of the DOM positions and sizes needed to draw the
 // view, so that we don't interleave reading and writing to the DOM.
 export function getDimensions(cm) {
-  var d = cm.display, left = {}, width = {};
-  var gutterLeft = d.gutters.clientLeft;
+  var d = cm.display, left = {}, width = {}
+  var gutterLeft = d.gutters.clientLeft
   for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-    left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
-    width[cm.options.gutters[i]] = n.clientWidth;
+    left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft
+    width[cm.options.gutters[i]] = n.clientWidth
   }
   return {fixedPos: compensateForHScroll(d),
           gutterTotalWidth: d.gutters.offsetWidth,
           gutterLeft: left,
           gutterWidth: width,
-          wrapperWidth: d.wrapper.clientWidth};
+          wrapperWidth: d.wrapper.clientWidth}
 }
 
 // Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
 // but using getBoundingClientRect to get a sub-pixel-accurate
 // result.
 export function compensateForHScroll(display) {
-  return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left;
+  return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left
 }
 
 // Returns a function that estimates the height of a line, to use as
 // first approximation until the line becomes visible (and is thus
 // properly measurable).
 export function estimateHeight(cm) {
-  var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
-  var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
+  var th = textHeight(cm.display), wrapping = cm.options.lineWrapping
+  var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3)
   return function(line) {
-    if (lineIsHidden(cm.doc, line)) return 0;
+    if (lineIsHidden(cm.doc, line)) return 0
 
-    var widgetsHeight = 0;
+    var widgetsHeight = 0
     if (line.widgets) for (var i = 0; i < line.widgets.length; i++) {
-      if (line.widgets[i].height) widgetsHeight += line.widgets[i].height;
+      if (line.widgets[i].height) widgetsHeight += line.widgets[i].height
     }
 
     if (wrapping)
-      return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th;
+      return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th
     else
-      return widgetsHeight + th;
-  };
+      return widgetsHeight + th
+  }
 }
 
 export function estimateLineHeights(cm) {
-  var doc = cm.doc, est = estimateHeight(cm);
+  var doc = cm.doc, est = estimateHeight(cm)
   doc.iter(function(line) {
-    var estHeight = est(line);
-    if (estHeight != line.height) updateLineHeight(line, estHeight);
-  });
+    var estHeight = est(line)
+    if (estHeight != line.height) updateLineHeight(line, estHeight)
+  })
 }
 
 // Given a mouse event, find the corresponding position. If liberal
@@ -551,30 +551,30 @@ export function estimateLineHeights(cm) {
 // selections, and tries to estimate a character position even for
 // coordinates beyond the right of the text.
 export function posFromMouse(cm, e, liberal, forRect) {
-  var display = cm.display;
-  if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null;
+  var display = cm.display
+  if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null
 
-  var x, y, space = display.lineSpace.getBoundingClientRect();
+  var x, y, space = display.lineSpace.getBoundingClientRect()
   // Fails unpredictably on IE[67] when mouse is dragged around quickly.
-  try { x = e.clientX - space.left; y = e.clientY - space.top; }
-  catch (e) { return null; }
-  var coords = coordsChar(cm, x, y), line;
+  try { x = e.clientX - space.left; y = e.clientY - space.top }
+  catch (e) { return null }
+  var coords = coordsChar(cm, x, y), line
   if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
-    var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
-    coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
+    var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length
+    coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff))
   }
-  return coords;
+  return coords
 }
 
 // Find the view element corresponding to a given line. Return null
 // when the line isn't visible.
 export function findViewIndex(cm, n) {
-  if (n >= cm.display.viewTo) return null;
-  n -= cm.display.viewFrom;
-  if (n < 0) return null;
-  var view = cm.display.view;
+  if (n >= cm.display.viewTo) return null
+  n -= cm.display.viewFrom
+  if (n < 0) return null
+  var view = cm.display.view
   for (var i = 0; i < view.length; i++) {
-    n -= view[i].size;
-    if (n < 0) return i;
+    n -= view[i].size
+    if (n < 0) return i
   }
 }
diff --git a/src/measurement/update_line.js b/src/measurement/update_line.js
index 5cac95db3e..a80d8c508c 100644
--- a/src/measurement/update_line.js
+++ b/src/measurement/update_line.js
@@ -1,189 +1,189 @@
-import { buildLineContent } from "../line/line_data";
-import { lineNumberFor } from "../line/utils_line";
-import { ie, ie_version } from "../util/browser";
-import { elt } from "../util/dom";
-import { signalLater } from "../util/operation_group";
+import { buildLineContent } from "../line/line_data"
+import { lineNumberFor } from "../line/utils_line"
+import { ie, ie_version } from "../util/browser"
+import { elt } from "../util/dom"
+import { signalLater } from "../util/operation_group"
 
 // When an aspect of a line changes, a string is added to
 // lineView.changes. This updates the relevant part of the line's
 // DOM structure.
 export function updateLineForChanges(cm, lineView, lineN, dims) {
   for (var j = 0; j < lineView.changes.length; j++) {
-    var type = lineView.changes[j];
-    if (type == "text") updateLineText(cm, lineView);
-    else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
-    else if (type == "class") updateLineClasses(lineView);
-    else if (type == "widget") updateLineWidgets(cm, lineView, dims);
+    var type = lineView.changes[j]
+    if (type == "text") updateLineText(cm, lineView)
+    else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims)
+    else if (type == "class") updateLineClasses(lineView)
+    else if (type == "widget") updateLineWidgets(cm, lineView, dims)
   }
-  lineView.changes = null;
+  lineView.changes = null
 }
 
 // Lines with gutter elements, widgets or a background class need to
 // be wrapped, and have the extra elements added to the wrapper div
 function ensureLineWrapped(lineView) {
   if (lineView.node == lineView.text) {
-    lineView.node = elt("div", null, null, "position: relative");
+    lineView.node = elt("div", null, null, "position: relative")
     if (lineView.text.parentNode)
-      lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
-    lineView.node.appendChild(lineView.text);
-    if (ie && ie_version < 8) lineView.node.style.zIndex = 2;
+      lineView.text.parentNode.replaceChild(lineView.node, lineView.text)
+    lineView.node.appendChild(lineView.text)
+    if (ie && ie_version < 8) lineView.node.style.zIndex = 2
   }
-  return lineView.node;
+  return lineView.node
 }
 
 function updateLineBackground(lineView) {
-  var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
-  if (cls) cls += " CodeMirror-linebackground";
+  var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass
+  if (cls) cls += " CodeMirror-linebackground"
   if (lineView.background) {
-    if (cls) lineView.background.className = cls;
-    else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
+    if (cls) lineView.background.className = cls
+    else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null }
   } else if (cls) {
-    var wrap = ensureLineWrapped(lineView);
-    lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
+    var wrap = ensureLineWrapped(lineView)
+    lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild)
   }
 }
 
 // Wrapper around buildLineContent which will reuse the structure
 // in display.externalMeasured when possible.
 function getLineContent(cm, lineView) {
-  var ext = cm.display.externalMeasured;
+  var ext = cm.display.externalMeasured
   if (ext && ext.line == lineView.line) {
-    cm.display.externalMeasured = null;
-    lineView.measure = ext.measure;
-    return ext.built;
+    cm.display.externalMeasured = null
+    lineView.measure = ext.measure
+    return ext.built
   }
-  return buildLineContent(cm, lineView);
+  return buildLineContent(cm, lineView)
 }
 
 // Redraw the line's text. Interacts with the background and text
 // classes because the mode may output tokens that influence these
 // classes.
 function updateLineText(cm, lineView) {
-  var cls = lineView.text.className;
-  var built = getLineContent(cm, lineView);
-  if (lineView.text == lineView.node) lineView.node = built.pre;
-  lineView.text.parentNode.replaceChild(built.pre, lineView.text);
-  lineView.text = built.pre;
+  var cls = lineView.text.className
+  var built = getLineContent(cm, lineView)
+  if (lineView.text == lineView.node) lineView.node = built.pre
+  lineView.text.parentNode.replaceChild(built.pre, lineView.text)
+  lineView.text = built.pre
   if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
-    lineView.bgClass = built.bgClass;
-    lineView.textClass = built.textClass;
-    updateLineClasses(lineView);
+    lineView.bgClass = built.bgClass
+    lineView.textClass = built.textClass
+    updateLineClasses(lineView)
   } else if (cls) {
-    lineView.text.className = cls;
+    lineView.text.className = cls
   }
 }
 
 function updateLineClasses(lineView) {
-  updateLineBackground(lineView);
+  updateLineBackground(lineView)
   if (lineView.line.wrapClass)
-    ensureLineWrapped(lineView).className = lineView.line.wrapClass;
+    ensureLineWrapped(lineView).className = lineView.line.wrapClass
   else if (lineView.node != lineView.text)
-    lineView.node.className = "";
-  var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
-  lineView.text.className = textClass || "";
+    lineView.node.className = ""
+  var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass
+  lineView.text.className = textClass || ""
 }
 
 function updateLineGutter(cm, lineView, lineN, dims) {
   if (lineView.gutter) {
-    lineView.node.removeChild(lineView.gutter);
-    lineView.gutter = null;
+    lineView.node.removeChild(lineView.gutter)
+    lineView.gutter = null
   }
   if (lineView.gutterBackground) {
-    lineView.node.removeChild(lineView.gutterBackground);
-    lineView.gutterBackground = null;
+    lineView.node.removeChild(lineView.gutterBackground)
+    lineView.gutterBackground = null
   }
   if (lineView.line.gutterClass) {
-    var wrap = ensureLineWrapped(lineView);
+    var wrap = ensureLineWrapped(lineView)
     lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
                                     "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
-                                    "px; width: " + dims.gutterTotalWidth + "px");
-    wrap.insertBefore(lineView.gutterBackground, lineView.text);
+                                    "px; width: " + dims.gutterTotalWidth + "px")
+    wrap.insertBefore(lineView.gutterBackground, lineView.text)
   }
-  var markers = lineView.line.gutterMarkers;
+  var markers = lineView.line.gutterMarkers
   if (cm.options.lineNumbers || markers) {
-    var wrap = ensureLineWrapped(lineView);
+    var wrap = ensureLineWrapped(lineView)
     var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
-                                           (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px");
-    cm.display.input.setUneditable(gutterWrap);
-    wrap.insertBefore(gutterWrap, lineView.text);
+                                           (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px")
+    cm.display.input.setUneditable(gutterWrap)
+    wrap.insertBefore(gutterWrap, lineView.text)
     if (lineView.line.gutterClass)
-      gutterWrap.className += " " + lineView.line.gutterClass;
+      gutterWrap.className += " " + lineView.line.gutterClass
     if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
       lineView.lineNumber = gutterWrap.appendChild(
         elt("div", lineNumberFor(cm.options, lineN),
             "CodeMirror-linenumber CodeMirror-gutter-elt",
             "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
-            + cm.display.lineNumInnerWidth + "px"));
+            + cm.display.lineNumInnerWidth + "px"))
     if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) {
-      var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
+      var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]
       if (found)
         gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
-                                   dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"));
+                                   dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"))
     }
   }
 }
 
 function updateLineWidgets(cm, lineView, dims) {
-  if (lineView.alignable) lineView.alignable = null;
+  if (lineView.alignable) lineView.alignable = null
   for (var node = lineView.node.firstChild, next; node; node = next) {
-    var next = node.nextSibling;
+    var next = node.nextSibling
     if (node.className == "CodeMirror-linewidget")
-      lineView.node.removeChild(node);
+      lineView.node.removeChild(node)
   }
-  insertLineWidgets(cm, lineView, dims);
+  insertLineWidgets(cm, lineView, dims)
 }
 
 // Build a line's DOM representation from scratch
 export function buildLineElement(cm, lineView, lineN, dims) {
-  var built = getLineContent(cm, lineView);
-  lineView.text = lineView.node = built.pre;
-  if (built.bgClass) lineView.bgClass = built.bgClass;
-  if (built.textClass) lineView.textClass = built.textClass;
+  var built = getLineContent(cm, lineView)
+  lineView.text = lineView.node = built.pre
+  if (built.bgClass) lineView.bgClass = built.bgClass
+  if (built.textClass) lineView.textClass = built.textClass
 
-  updateLineClasses(lineView);
-  updateLineGutter(cm, lineView, lineN, dims);
-  insertLineWidgets(cm, lineView, dims);
-  return lineView.node;
+  updateLineClasses(lineView)
+  updateLineGutter(cm, lineView, lineN, dims)
+  insertLineWidgets(cm, lineView, dims)
+  return lineView.node
 }
 
 // A lineView may contain multiple logical lines (when merged by
 // collapsed spans). The widgets for all of them need to be drawn.
 function insertLineWidgets(cm, lineView, dims) {
-  insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
+  insertLineWidgetsFor(cm, lineView.line, lineView, dims, true)
   if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-    insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false);
+    insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false)
 }
 
 function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
-  if (!line.widgets) return;
-  var wrap = ensureLineWrapped(lineView);
+  if (!line.widgets) return
+  var wrap = ensureLineWrapped(lineView)
   for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
-    var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
-    if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
-    positionLineWidget(widget, node, lineView, dims);
-    cm.display.input.setUneditable(node);
+    var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget")
+    if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true")
+    positionLineWidget(widget, node, lineView, dims)
+    cm.display.input.setUneditable(node)
     if (allowAbove && widget.above)
-      wrap.insertBefore(node, lineView.gutter || lineView.text);
+      wrap.insertBefore(node, lineView.gutter || lineView.text)
     else
-      wrap.appendChild(node);
-    signalLater(widget, "redraw");
+      wrap.appendChild(node)
+    signalLater(widget, "redraw")
   }
 }
 
 function positionLineWidget(widget, node, lineView, dims) {
   if (widget.noHScroll) {
-    (lineView.alignable || (lineView.alignable = [])).push(node);
-    var width = dims.wrapperWidth;
-    node.style.left = dims.fixedPos + "px";
+    (lineView.alignable || (lineView.alignable = [])).push(node)
+    var width = dims.wrapperWidth
+    node.style.left = dims.fixedPos + "px"
     if (!widget.coverGutter) {
-      width -= dims.gutterTotalWidth;
-      node.style.paddingLeft = dims.gutterTotalWidth + "px";
+      width -= dims.gutterTotalWidth
+      node.style.paddingLeft = dims.gutterTotalWidth + "px"
     }
-    node.style.width = width + "px";
+    node.style.width = width + "px"
   }
   if (widget.coverGutter) {
-    node.style.zIndex = 5;
-    node.style.position = "relative";
-    if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px";
+    node.style.zIndex = 5
+    node.style.position = "relative"
+    if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px"
   }
 }
diff --git a/src/measurement/widgets.js b/src/measurement/widgets.js
index 283740e2c0..f20d313e6d 100644
--- a/src/measurement/widgets.js
+++ b/src/measurement/widgets.js
@@ -1,19 +1,19 @@
-import { contains, elt, removeChildrenAndAdd } from "../util/dom";
-import { e_target } from "../util/event";
+import { contains, elt, removeChildrenAndAdd } from "../util/dom"
+import { e_target } from "../util/event"
 
 export function widgetHeight(widget) {
-  if (widget.height != null) return widget.height;
-  var cm = widget.doc.cm;
-  if (!cm) return 0;
+  if (widget.height != null) return widget.height
+  var cm = widget.doc.cm
+  if (!cm) return 0
   if (!contains(document.body, widget.node)) {
-    var parentStyle = "position: relative;";
+    var parentStyle = "position: relative;"
     if (widget.coverGutter)
-      parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;";
+      parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;"
     if (widget.noHScroll)
-      parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
-    removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
+      parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;"
+    removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle))
   }
-  return widget.height = widget.node.parentNode.offsetHeight;
+  return widget.height = widget.node.parentNode.offsetHeight
 }
 
 // Return true when the given mouse event happened in a widget
@@ -21,6 +21,6 @@ export function eventInWidget(display, e) {
   for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
     if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
         (n.parentNode == display.sizer && n != display.mover))
-      return true;
+      return true
   }
 }
diff --git a/src/model/Doc.js b/src/model/Doc.js
index 68d38c90d9..ba004631d3 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -1,47 +1,47 @@
-import CodeMirror from "../edit/CodeMirror";
-import { docMethodOp } from "../display/operations";
-import { Line } from "../line/line_data";
-import { clipPos, clipPosArray, Pos } from "../line/pos";
-import { visualLine } from "../line/spans";
-import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_line";
-import { classTest } from "../util/dom";
-import { splitLinesAuto } from "../util/feature_detection";
-import { createObj, map, sel_dontScroll } from "../util/misc";
-import { ensureCursorVisible } from "../display/scrolling";
+import CodeMirror from "../edit/CodeMirror"
+import { docMethodOp } from "../display/operations"
+import { Line } from "../line/line_data"
+import { clipPos, clipPosArray, Pos } from "../line/pos"
+import { visualLine } from "../line/spans"
+import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_line"
+import { classTest } from "../util/dom"
+import { splitLinesAuto } from "../util/feature_detection"
+import { createObj, map, sel_dontScroll } from "../util/misc"
+import { ensureCursorVisible } from "../display/scrolling"
 
-import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes";
-import { computeReplacedSel } from "./change_measurement";
-import { BranchChunk, LeafChunk } from "./chunk";
-import { linkedDocs, updateDoc } from "./document_data";
-import { copyHistoryArray, History } from "./history";
-import { addLineWidget } from "./line_widget";
-import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } from "./mark_text";
-import { normalizeSelection, Range, simpleSelection } from "./selection";
-import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates";
+import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes"
+import { computeReplacedSel } from "./change_measurement"
+import { BranchChunk, LeafChunk } from "./chunk"
+import { linkedDocs, updateDoc } from "./document_data"
+import { copyHistoryArray, History } from "./history"
+import { addLineWidget } from "./line_widget"
+import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } from "./mark_text"
+import { normalizeSelection, Range, simpleSelection } from "./selection"
+import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates"
 
-var nextDocId = 0;
+var nextDocId = 0
 var Doc = function(text, mode, firstLine, lineSep) {
-  if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep);
-  if (firstLine == null) firstLine = 0;
+  if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep)
+  if (firstLine == null) firstLine = 0
 
-  BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
-  this.first = firstLine;
-  this.scrollTop = this.scrollLeft = 0;
-  this.cantEdit = false;
-  this.cleanGeneration = 1;
-  this.frontier = firstLine;
-  var start = Pos(firstLine, 0);
-  this.sel = simpleSelection(start);
-  this.history = new History(null);
-  this.id = ++nextDocId;
-  this.modeOption = mode;
-  this.lineSep = lineSep;
-  this.extend = false;
+  BranchChunk.call(this, [new LeafChunk([new Line("", null)])])
+  this.first = firstLine
+  this.scrollTop = this.scrollLeft = 0
+  this.cantEdit = false
+  this.cleanGeneration = 1
+  this.frontier = firstLine
+  var start = Pos(firstLine, 0)
+  this.sel = simpleSelection(start)
+  this.history = new History(null)
+  this.id = ++nextDocId
+  this.modeOption = mode
+  this.lineSep = lineSep
+  this.extend = false
 
-  if (typeof text == "string") text = this.splitLines(text);
-  updateDoc(this, {from: start, to: start, text: text});
-  setSelection(this, simpleSelection(start), sel_dontScroll);
-};
+  if (typeof text == "string") text = this.splitLines(text)
+  updateDoc(this, {from: start, to: start, text: text})
+  setSelection(this, simpleSelection(start), sel_dontScroll)
+}
 
 Doc.prototype = createObj(BranchChunk.prototype, {
   constructor: Doc,
@@ -50,335 +50,335 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   // three, it iterates over the range given by the first two (with
   // the second being non-inclusive).
   iter: function(from, to, op) {
-    if (op) this.iterN(from - this.first, to - from, op);
-    else this.iterN(this.first, this.first + this.size, from);
+    if (op) this.iterN(from - this.first, to - from, op)
+    else this.iterN(this.first, this.first + this.size, from)
   },
 
   // Non-public interface for adding and removing lines.
   insert: function(at, lines) {
-    var height = 0;
-    for (var i = 0; i < lines.length; ++i) height += lines[i].height;
-    this.insertInner(at - this.first, lines, height);
+    var height = 0
+    for (var i = 0; i < lines.length; ++i) height += lines[i].height
+    this.insertInner(at - this.first, lines, height)
   },
-  remove: function(at, n) { this.removeInner(at - this.first, n); },
+  remove: function(at, n) { this.removeInner(at - this.first, n) },
 
   // From here, the methods are part of the public interface. Most
   // are also available from CodeMirror (editor) instances.
 
   getValue: function(lineSep) {
-    var lines = getLines(this, this.first, this.first + this.size);
-    if (lineSep === false) return lines;
-    return lines.join(lineSep || this.lineSeparator());
+    var lines = getLines(this, this.first, this.first + this.size)
+    if (lineSep === false) return lines
+    return lines.join(lineSep || this.lineSeparator())
   },
   setValue: docMethodOp(function(code) {
-    var top = Pos(this.first, 0), last = this.first + this.size - 1;
+    var top = Pos(this.first, 0), last = this.first + this.size - 1
     makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                      text: this.splitLines(code), origin: "setValue", full: true}, true);
-    setSelection(this, simpleSelection(top));
+                      text: this.splitLines(code), origin: "setValue", full: true}, true)
+    setSelection(this, simpleSelection(top))
   }),
   replaceRange: function(code, from, to, origin) {
-    from = clipPos(this, from);
-    to = to ? clipPos(this, to) : from;
-    replaceRange(this, code, from, to, origin);
+    from = clipPos(this, from)
+    to = to ? clipPos(this, to) : from
+    replaceRange(this, code, from, to, origin)
   },
   getRange: function(from, to, lineSep) {
-    var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
-    if (lineSep === false) return lines;
-    return lines.join(lineSep || this.lineSeparator());
+    var lines = getBetween(this, clipPos(this, from), clipPos(this, to))
+    if (lineSep === false) return lines
+    return lines.join(lineSep || this.lineSeparator())
   },
 
-  getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
+  getLine: function(line) {var l = this.getLineHandle(line); return l && l.text},
 
-  getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
-  getLineNumber: function(line) {return lineNo(line);},
+  getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line)},
+  getLineNumber: function(line) {return lineNo(line)},
 
   getLineHandleVisualStart: function(line) {
-    if (typeof line == "number") line = getLine(this, line);
-    return visualLine(line);
+    if (typeof line == "number") line = getLine(this, line)
+    return visualLine(line)
   },
 
-  lineCount: function() {return this.size;},
-  firstLine: function() {return this.first;},
-  lastLine: function() {return this.first + this.size - 1;},
+  lineCount: function() {return this.size},
+  firstLine: function() {return this.first},
+  lastLine: function() {return this.first + this.size - 1},
 
-  clipPos: function(pos) {return clipPos(this, pos);},
+  clipPos: function(pos) {return clipPos(this, pos)},
 
   getCursor: function(start) {
-    var range = this.sel.primary(), pos;
-    if (start == null || start == "head") pos = range.head;
-    else if (start == "anchor") pos = range.anchor;
-    else if (start == "end" || start == "to" || start === false) pos = range.to();
-    else pos = range.from();
-    return pos;
+    var range = this.sel.primary(), pos
+    if (start == null || start == "head") pos = range.head
+    else if (start == "anchor") pos = range.anchor
+    else if (start == "end" || start == "to" || start === false) pos = range.to()
+    else pos = range.from()
+    return pos
   },
-  listSelections: function() { return this.sel.ranges; },
-  somethingSelected: function() {return this.sel.somethingSelected();},
+  listSelections: function() { return this.sel.ranges },
+  somethingSelected: function() {return this.sel.somethingSelected()},
 
   setCursor: docMethodOp(function(line, ch, options) {
-    setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
+    setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options)
   }),
   setSelection: docMethodOp(function(anchor, head, options) {
-    setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
+    setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options)
   }),
   extendSelection: docMethodOp(function(head, other, options) {
-    extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
+    extendSelection(this, clipPos(this, head), other && clipPos(this, other), options)
   }),
   extendSelections: docMethodOp(function(heads, options) {
-    extendSelections(this, clipPosArray(this, heads), options);
+    extendSelections(this, clipPosArray(this, heads), options)
   }),
   extendSelectionsBy: docMethodOp(function(f, options) {
-    var heads = map(this.sel.ranges, f);
-    extendSelections(this, clipPosArray(this, heads), options);
+    var heads = map(this.sel.ranges, f)
+    extendSelections(this, clipPosArray(this, heads), options)
   }),
   setSelections: docMethodOp(function(ranges, primary, options) {
-    if (!ranges.length) return;
+    if (!ranges.length) return
     for (var i = 0, out = []; i < ranges.length; i++)
       out[i] = new Range(clipPos(this, ranges[i].anchor),
-                         clipPos(this, ranges[i].head));
-    if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex);
-    setSelection(this, normalizeSelection(out, primary), options);
+                         clipPos(this, ranges[i].head))
+    if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex)
+    setSelection(this, normalizeSelection(out, primary), options)
   }),
   addSelection: docMethodOp(function(anchor, head, options) {
-    var ranges = this.sel.ranges.slice(0);
-    ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
-    setSelection(this, normalizeSelection(ranges, ranges.length - 1), options);
+    var ranges = this.sel.ranges.slice(0)
+    ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)))
+    setSelection(this, normalizeSelection(ranges, ranges.length - 1), options)
   }),
 
   getSelection: function(lineSep) {
-    var ranges = this.sel.ranges, lines;
+    var ranges = this.sel.ranges, lines
     for (var i = 0; i < ranges.length; i++) {
-      var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-      lines = lines ? lines.concat(sel) : sel;
+      var sel = getBetween(this, ranges[i].from(), ranges[i].to())
+      lines = lines ? lines.concat(sel) : sel
     }
-    if (lineSep === false) return lines;
-    else return lines.join(lineSep || this.lineSeparator());
+    if (lineSep === false) return lines
+    else return lines.join(lineSep || this.lineSeparator())
   },
   getSelections: function(lineSep) {
-    var parts = [], ranges = this.sel.ranges;
+    var parts = [], ranges = this.sel.ranges
     for (var i = 0; i < ranges.length; i++) {
-      var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-      if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator());
-      parts[i] = sel;
+      var sel = getBetween(this, ranges[i].from(), ranges[i].to())
+      if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator())
+      parts[i] = sel
     }
-    return parts;
+    return parts
   },
   replaceSelection: function(code, collapse, origin) {
-    var dup = [];
+    var dup = []
     for (var i = 0; i < this.sel.ranges.length; i++)
-      dup[i] = code;
-    this.replaceSelections(dup, collapse, origin || "+input");
+      dup[i] = code
+    this.replaceSelections(dup, collapse, origin || "+input")
   },
   replaceSelections: docMethodOp(function(code, collapse, origin) {
-    var changes = [], sel = this.sel;
+    var changes = [], sel = this.sel
     for (var i = 0; i < sel.ranges.length; i++) {
-      var range = sel.ranges[i];
-      changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
+      var range = sel.ranges[i]
+      changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin}
     }
-    var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
+    var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse)
     for (var i = changes.length - 1; i >= 0; i--)
-      makeChange(this, changes[i]);
-    if (newSel) setSelectionReplaceHistory(this, newSel);
-    else if (this.cm) ensureCursorVisible(this.cm);
+      makeChange(this, changes[i])
+    if (newSel) setSelectionReplaceHistory(this, newSel)
+    else if (this.cm) ensureCursorVisible(this.cm)
   }),
-  undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
-  redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
-  undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
-  redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
+  undo: docMethodOp(function() {makeChangeFromHistory(this, "undo")}),
+  redo: docMethodOp(function() {makeChangeFromHistory(this, "redo")}),
+  undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true)}),
+  redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true)}),
 
-  setExtending: function(val) {this.extend = val;},
-  getExtending: function() {return this.extend;},
+  setExtending: function(val) {this.extend = val},
+  getExtending: function() {return this.extend},
 
   historySize: function() {
-    var hist = this.history, done = 0, undone = 0;
-    for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done;
-    for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
-    return {undo: done, redo: undone};
+    var hist = this.history, done = 0, undone = 0
+    for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done
+    for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone
+    return {undo: done, redo: undone}
   },
-  clearHistory: function() {this.history = new History(this.history.maxGeneration);},
+  clearHistory: function() {this.history = new History(this.history.maxGeneration)},
 
   markClean: function() {
-    this.cleanGeneration = this.changeGeneration(true);
+    this.cleanGeneration = this.changeGeneration(true)
   },
   changeGeneration: function(forceSplit) {
     if (forceSplit)
-      this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null;
-    return this.history.generation;
+      this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null
+    return this.history.generation
   },
   isClean: function (gen) {
-    return this.history.generation == (gen || this.cleanGeneration);
+    return this.history.generation == (gen || this.cleanGeneration)
   },
 
   getHistory: function() {
     return {done: copyHistoryArray(this.history.done),
-            undone: copyHistoryArray(this.history.undone)};
+            undone: copyHistoryArray(this.history.undone)}
   },
   setHistory: function(histData) {
-    var hist = this.history = new History(this.history.maxGeneration);
-    hist.done = copyHistoryArray(histData.done.slice(0), null, true);
-    hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
+    var hist = this.history = new History(this.history.maxGeneration)
+    hist.done = copyHistoryArray(histData.done.slice(0), null, true)
+    hist.undone = copyHistoryArray(histData.undone.slice(0), null, true)
   },
 
   addLineClass: docMethodOp(function(handle, where, cls) {
     return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
       var prop = where == "text" ? "textClass"
                : where == "background" ? "bgClass"
-               : where == "gutter" ? "gutterClass" : "wrapClass";
-      if (!line[prop]) line[prop] = cls;
-      else if (classTest(cls).test(line[prop])) return false;
-      else line[prop] += " " + cls;
-      return true;
-    });
+               : where == "gutter" ? "gutterClass" : "wrapClass"
+      if (!line[prop]) line[prop] = cls
+      else if (classTest(cls).test(line[prop])) return false
+      else line[prop] += " " + cls
+      return true
+    })
   }),
   removeLineClass: docMethodOp(function(handle, where, cls) {
     return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
       var prop = where == "text" ? "textClass"
                : where == "background" ? "bgClass"
-               : where == "gutter" ? "gutterClass" : "wrapClass";
-      var cur = line[prop];
-      if (!cur) return false;
-      else if (cls == null) line[prop] = null;
+               : where == "gutter" ? "gutterClass" : "wrapClass"
+      var cur = line[prop]
+      if (!cur) return false
+      else if (cls == null) line[prop] = null
       else {
-        var found = cur.match(classTest(cls));
-        if (!found) return false;
-        var end = found.index + found[0].length;
-        line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
+        var found = cur.match(classTest(cls))
+        if (!found) return false
+        var end = found.index + found[0].length
+        line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null
       }
-      return true;
-    });
+      return true
+    })
   }),
 
   addLineWidget: docMethodOp(function(handle, node, options) {
-    return addLineWidget(this, handle, node, options);
+    return addLineWidget(this, handle, node, options)
   }),
-  removeLineWidget: function(widget) { widget.clear(); },
+  removeLineWidget: function(widget) { widget.clear() },
 
   markText: function(from, to, options) {
-    return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range");
+    return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range")
   },
   setBookmark: function(pos, options) {
     var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
                     insertLeft: options && options.insertLeft,
                     clearWhenEmpty: false, shared: options && options.shared,
-                    handleMouseEvents: options && options.handleMouseEvents};
-    pos = clipPos(this, pos);
-    return markText(this, pos, pos, realOpts, "bookmark");
+                    handleMouseEvents: options && options.handleMouseEvents}
+    pos = clipPos(this, pos)
+    return markText(this, pos, pos, realOpts, "bookmark")
   },
   findMarksAt: function(pos) {
-    pos = clipPos(this, pos);
-    var markers = [], spans = getLine(this, pos.line).markedSpans;
+    pos = clipPos(this, pos)
+    var markers = [], spans = getLine(this, pos.line).markedSpans
     if (spans) for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
+      var span = spans[i]
       if ((span.from == null || span.from <= pos.ch) &&
           (span.to == null || span.to >= pos.ch))
-        markers.push(span.marker.parent || span.marker);
+        markers.push(span.marker.parent || span.marker)
     }
-    return markers;
+    return markers
   },
   findMarks: function(from, to, filter) {
-    from = clipPos(this, from); to = clipPos(this, to);
-    var found = [], lineNo = from.line;
+    from = clipPos(this, from); to = clipPos(this, to)
+    var found = [], lineNo = from.line
     this.iter(from.line, to.line + 1, function(line) {
-      var spans = line.markedSpans;
+      var spans = line.markedSpans
       if (spans) for (var i = 0; i < spans.length; i++) {
-        var span = spans[i];
+        var span = spans[i]
         if (!(span.to != null && lineNo == from.line && from.ch >= span.to ||
               span.from == null && lineNo != from.line ||
               span.from != null && lineNo == to.line && span.from >= to.ch) &&
             (!filter || filter(span.marker)))
-          found.push(span.marker.parent || span.marker);
+          found.push(span.marker.parent || span.marker)
       }
-      ++lineNo;
-    });
-    return found;
+      ++lineNo
+    })
+    return found
   },
   getAllMarks: function() {
-    var markers = [];
+    var markers = []
     this.iter(function(line) {
-      var sps = line.markedSpans;
+      var sps = line.markedSpans
       if (sps) for (var i = 0; i < sps.length; ++i)
-        if (sps[i].from != null) markers.push(sps[i].marker);
-    });
-    return markers;
+        if (sps[i].from != null) markers.push(sps[i].marker)
+    })
+    return markers
   },
 
   posFromIndex: function(off) {
-    var ch, lineNo = this.first, sepSize = this.lineSeparator().length;
+    var ch, lineNo = this.first, sepSize = this.lineSeparator().length
     this.iter(function(line) {
-      var sz = line.text.length + sepSize;
-      if (sz > off) { ch = off; return true; }
-      off -= sz;
-      ++lineNo;
-    });
-    return clipPos(this, Pos(lineNo, ch));
+      var sz = line.text.length + sepSize
+      if (sz > off) { ch = off; return true }
+      off -= sz
+      ++lineNo
+    })
+    return clipPos(this, Pos(lineNo, ch))
   },
   indexFromPos: function (coords) {
-    coords = clipPos(this, coords);
-    var index = coords.ch;
-    if (coords.line < this.first || coords.ch < 0) return 0;
-    var sepSize = this.lineSeparator().length;
+    coords = clipPos(this, coords)
+    var index = coords.ch
+    if (coords.line < this.first || coords.ch < 0) return 0
+    var sepSize = this.lineSeparator().length
     this.iter(this.first, coords.line, function (line) {
-      index += line.text.length + sepSize;
-    });
-    return index;
+      index += line.text.length + sepSize
+    })
+    return index
   },
 
   copy: function(copyHistory) {
     var doc = new Doc(getLines(this, this.first, this.first + this.size),
-                      this.modeOption, this.first, this.lineSep);
-    doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
-    doc.sel = this.sel;
-    doc.extend = false;
+                      this.modeOption, this.first, this.lineSep)
+    doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft
+    doc.sel = this.sel
+    doc.extend = false
     if (copyHistory) {
-      doc.history.undoDepth = this.history.undoDepth;
-      doc.setHistory(this.getHistory());
+      doc.history.undoDepth = this.history.undoDepth
+      doc.setHistory(this.getHistory())
     }
-    return doc;
+    return doc
   },
 
   linkedDoc: function(options) {
-    if (!options) options = {};
-    var from = this.first, to = this.first + this.size;
-    if (options.from != null && options.from > from) from = options.from;
-    if (options.to != null && options.to < to) to = options.to;
-    var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep);
-    if (options.sharedHist) copy.history = this.history;
-    (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
-    copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
-    copySharedMarkers(copy, findSharedMarkers(this));
-    return copy;
+    if (!options) options = {}
+    var from = this.first, to = this.first + this.size
+    if (options.from != null && options.from > from) from = options.from
+    if (options.to != null && options.to < to) to = options.to
+    var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep)
+    if (options.sharedHist) copy.history = this.history
+    ;(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist})
+    copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}]
+    copySharedMarkers(copy, findSharedMarkers(this))
+    return copy
   },
   unlinkDoc: function(other) {
-    if (other instanceof CodeMirror) other = other.doc;
+    if (other instanceof CodeMirror) other = other.doc
     if (this.linked) for (var i = 0; i < this.linked.length; ++i) {
-      var link = this.linked[i];
-      if (link.doc != other) continue;
-      this.linked.splice(i, 1);
-      other.unlinkDoc(this);
-      detachSharedMarkers(findSharedMarkers(this));
-      break;
+      var link = this.linked[i]
+      if (link.doc != other) continue
+      this.linked.splice(i, 1)
+      other.unlinkDoc(this)
+      detachSharedMarkers(findSharedMarkers(this))
+      break
     }
     // If the histories were shared, split them again
     if (other.history == this.history) {
-      var splitIds = [other.id];
-      linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
-      other.history = new History(null);
-      other.history.done = copyHistoryArray(this.history.done, splitIds);
-      other.history.undone = copyHistoryArray(this.history.undone, splitIds);
+      var splitIds = [other.id]
+      linkedDocs(other, function(doc) {splitIds.push(doc.id)}, true)
+      other.history = new History(null)
+      other.history.done = copyHistoryArray(this.history.done, splitIds)
+      other.history.undone = copyHistoryArray(this.history.undone, splitIds)
     }
   },
-  iterLinkedDocs: function(f) {linkedDocs(this, f);},
+  iterLinkedDocs: function(f) {linkedDocs(this, f)},
 
-  getMode: function() {return this.mode;},
-  getEditor: function() {return this.cm;},
+  getMode: function() {return this.mode},
+  getEditor: function() {return this.cm},
 
   splitLines: function(str) {
-    if (this.lineSep) return str.split(this.lineSep);
-    return splitLinesAuto(str);
+    if (this.lineSep) return str.split(this.lineSep)
+    return splitLinesAuto(str)
   },
-  lineSeparator: function() { return this.lineSep || "\n"; }
-});
+  lineSeparator: function() { return this.lineSep || "\n" }
+})
 
 // Public alias.
-Doc.prototype.eachLine = Doc.prototype.iter;
+Doc.prototype.eachLine = Doc.prototype.iter
 
-export default Doc;
+export default Doc
diff --git a/src/model/change_measurement.js b/src/model/change_measurement.js
index cb2bb2d1d8..ac14fa5458 100644
--- a/src/model/change_measurement.js
+++ b/src/model/change_measurement.js
@@ -1,61 +1,61 @@
-import { cmp, Pos } from "../line/pos";
-import { lst } from "../util/misc";
+import { cmp, Pos } from "../line/pos"
+import { lst } from "../util/misc"
 
-import { normalizeSelection, Range, Selection } from "./selection";
+import { normalizeSelection, Range, Selection } from "./selection"
 
 // Compute the position of the end of a change (its 'to' property
 // refers to the pre-change end).
 export function changeEnd(change) {
-  if (!change.text) return change.to;
+  if (!change.text) return change.to
   return Pos(change.from.line + change.text.length - 1,
-             lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
+             lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0))
 }
 
 // Adjust a position to refer to the post-change position of the
 // same text, or the end of the change if the change covers it.
 function adjustForChange(pos, change) {
-  if (cmp(pos, change.from) < 0) return pos;
-  if (cmp(pos, change.to) <= 0) return changeEnd(change);
+  if (cmp(pos, change.from) < 0) return pos
+  if (cmp(pos, change.to) <= 0) return changeEnd(change)
 
-  var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
-  if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch;
-  return Pos(line, ch);
+  var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch
+  if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch
+  return Pos(line, ch)
 }
 
 export function computeSelAfterChange(doc, change) {
-  var out = [];
+  var out = []
   for (var i = 0; i < doc.sel.ranges.length; i++) {
-    var range = doc.sel.ranges[i];
+    var range = doc.sel.ranges[i]
     out.push(new Range(adjustForChange(range.anchor, change),
-                       adjustForChange(range.head, change)));
+                       adjustForChange(range.head, change)))
   }
-  return normalizeSelection(out, doc.sel.primIndex);
+  return normalizeSelection(out, doc.sel.primIndex)
 }
 
 function offsetPos(pos, old, nw) {
   if (pos.line == old.line)
-    return Pos(nw.line, pos.ch - old.ch + nw.ch);
+    return Pos(nw.line, pos.ch - old.ch + nw.ch)
   else
-    return Pos(nw.line + (pos.line - old.line), pos.ch);
+    return Pos(nw.line + (pos.line - old.line), pos.ch)
 }
 
 // Used by replaceSelections to allow moving the selection to the
 // start or around the replaced test. Hint may be "start" or "around".
 export function computeReplacedSel(doc, changes, hint) {
-  var out = [];
-  var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
+  var out = []
+  var oldPrev = Pos(doc.first, 0), newPrev = oldPrev
   for (var i = 0; i < changes.length; i++) {
-    var change = changes[i];
-    var from = offsetPos(change.from, oldPrev, newPrev);
-    var to = offsetPos(changeEnd(change), oldPrev, newPrev);
-    oldPrev = change.to;
-    newPrev = to;
+    var change = changes[i]
+    var from = offsetPos(change.from, oldPrev, newPrev)
+    var to = offsetPos(changeEnd(change), oldPrev, newPrev)
+    oldPrev = change.to
+    newPrev = to
     if (hint == "around") {
-      var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
-      out[i] = new Range(inv ? to : from, inv ? from : to);
+      var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0
+      out[i] = new Range(inv ? to : from, inv ? from : to)
     } else {
-      out[i] = new Range(from, from);
+      out[i] = new Range(from, from)
     }
   }
-  return new Selection(out, doc.sel.primIndex);
+  return new Selection(out, doc.sel.primIndex)
 }
diff --git a/src/model/changes.js b/src/model/changes.js
index 01526d2943..6a8606afcb 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -1,20 +1,20 @@
-import { startWorker } from "../display/highlight_worker";
-import { operation } from "../display/operations";
-import { regChange, regLineChange } from "../display/view_tracking";
-import { clipLine, clipPos, cmp, Pos } from "../line/pos";
-import { sawReadOnlySpans } from "../line/saw_special_spans";
-import { lineLength, removeReadOnlyRanges, stretchSpansOverChange, visualLine } from "../line/spans";
-import { getBetween, getLine, lineNo } from "../line/utils_line";
-import { estimateHeight } from "../measurement/position_measurement";
-import { hasHandler, signal, signalCursorActivity } from "../util/event";
-import { indexOf, lst, map, sel_dontScroll } from "../util/misc";
-import { signalLater } from "../util/operation_group";
-
-import { changeEnd, computeSelAfterChange } from "./change_measurement";
-import { isWholeLineUpdate, linkedDocs, updateDoc } from "./document_data";
-import { addChangeToHistory, historyChangeFromChange, mergeOldSpans, pushSelectionToHistory } from "./history";
-import { Range, Selection } from "./selection";
-import { setSelection, setSelectionNoUndo } from "./selection_updates";
+import { startWorker } from "../display/highlight_worker"
+import { operation } from "../display/operations"
+import { regChange, regLineChange } from "../display/view_tracking"
+import { clipLine, clipPos, cmp, Pos } from "../line/pos"
+import { sawReadOnlySpans } from "../line/saw_special_spans"
+import { lineLength, removeReadOnlyRanges, stretchSpansOverChange, visualLine } from "../line/spans"
+import { getBetween, getLine, lineNo } from "../line/utils_line"
+import { estimateHeight } from "../measurement/position_measurement"
+import { hasHandler, signal, signalCursorActivity } from "../util/event"
+import { indexOf, lst, map, sel_dontScroll } from "../util/misc"
+import { signalLater } from "../util/operation_group"
+
+import { changeEnd, computeSelAfterChange } from "./change_measurement"
+import { isWholeLineUpdate, linkedDocs, updateDoc } from "./document_data"
+import { addChangeToHistory, historyChangeFromChange, mergeOldSpans, pushSelectionToHistory } from "./history"
+import { Range, Selection } from "./selection"
+import { setSelection, setSelectionNoUndo } from "./selection_updates"
 
 // UPDATING
 
@@ -26,140 +26,140 @@ function filterChange(doc, change, update) {
     to: change.to,
     text: change.text,
     origin: change.origin,
-    cancel: function() { this.canceled = true; }
-  };
+    cancel: function() { this.canceled = true }
+  }
   if (update) obj.update = function(from, to, text, origin) {
-    if (from) this.from = clipPos(doc, from);
-    if (to) this.to = clipPos(doc, to);
-    if (text) this.text = text;
-    if (origin !== undefined) this.origin = origin;
-  };
-  signal(doc, "beforeChange", doc, obj);
-  if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj);
-
-  if (obj.canceled) return null;
-  return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin};
+    if (from) this.from = clipPos(doc, from)
+    if (to) this.to = clipPos(doc, to)
+    if (text) this.text = text
+    if (origin !== undefined) this.origin = origin
+  }
+  signal(doc, "beforeChange", doc, obj)
+  if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj)
+
+  if (obj.canceled) return null
+  return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}
 }
 
 // Apply a change to a document, and add it to the document's
 // history, and propagating it to all linked documents.
 export function makeChange(doc, change, ignoreReadOnly) {
   if (doc.cm) {
-    if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly);
-    if (doc.cm.state.suppressEdits) return;
+    if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly)
+    if (doc.cm.state.suppressEdits) return
   }
 
   if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
-    change = filterChange(doc, change, true);
-    if (!change) return;
+    change = filterChange(doc, change, true)
+    if (!change) return
   }
 
   // Possibly split or suppress the update based on the presence
   // of read-only spans in its range.
-  var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
+  var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to)
   if (split) {
     for (var i = split.length - 1; i >= 0; --i)
-      makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text});
+      makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text})
   } else {
-    makeChangeInner(doc, change);
+    makeChangeInner(doc, change)
   }
 }
 
 function makeChangeInner(doc, change) {
-  if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return;
-  var selAfter = computeSelAfterChange(doc, change);
-  addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
+  if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return
+  var selAfter = computeSelAfterChange(doc, change)
+  addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN)
 
-  makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
-  var rebased = [];
+  makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change))
+  var rebased = []
 
   linkedDocs(doc, function(doc, sharedHist) {
     if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-      rebaseHist(doc.history, change);
-      rebased.push(doc.history);
+      rebaseHist(doc.history, change)
+      rebased.push(doc.history)
     }
-    makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
-  });
+    makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change))
+  })
 }
 
 // Revert a change stored in a document's history.
 export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
-  if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return;
+  if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return
 
-  var hist = doc.history, event, selAfter = doc.sel;
-  var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
+  var hist = doc.history, event, selAfter = doc.sel
+  var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done
 
   // Verify that there is a useable event (so that ctrl-z won't
   // needlessly clear selection events)
   for (var i = 0; i < source.length; i++) {
-    event = source[i];
+    event = source[i]
     if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
-      break;
+      break
   }
-  if (i == source.length) return;
-  hist.lastOrigin = hist.lastSelOrigin = null;
+  if (i == source.length) return
+  hist.lastOrigin = hist.lastSelOrigin = null
 
   for (;;) {
-    event = source.pop();
+    event = source.pop()
     if (event.ranges) {
-      pushSelectionToHistory(event, dest);
+      pushSelectionToHistory(event, dest)
       if (allowSelectionOnly && !event.equals(doc.sel)) {
-        setSelection(doc, event, {clearRedo: false});
-        return;
+        setSelection(doc, event, {clearRedo: false})
+        return
       }
-      selAfter = event;
+      selAfter = event
     }
-    else break;
+    else break
   }
 
   // Build up a reverse change object to add to the opposite history
   // stack (redo when undoing, and vice versa).
-  var antiChanges = [];
-  pushSelectionToHistory(selAfter, dest);
-  dest.push({changes: antiChanges, generation: hist.generation});
-  hist.generation = event.generation || ++hist.maxGeneration;
+  var antiChanges = []
+  pushSelectionToHistory(selAfter, dest)
+  dest.push({changes: antiChanges, generation: hist.generation})
+  hist.generation = event.generation || ++hist.maxGeneration
 
-  var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
+  var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")
 
   for (var i = event.changes.length - 1; i >= 0; --i) {
-    var change = event.changes[i];
-    change.origin = type;
+    var change = event.changes[i]
+    change.origin = type
     if (filter && !filterChange(doc, change, false)) {
-      source.length = 0;
-      return;
+      source.length = 0
+      return
     }
 
-    antiChanges.push(historyChangeFromChange(doc, change));
+    antiChanges.push(historyChangeFromChange(doc, change))
 
-    var after = i ? computeSelAfterChange(doc, change) : lst(source);
-    makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
-    if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)});
-    var rebased = [];
+    var after = i ? computeSelAfterChange(doc, change) : lst(source)
+    makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change))
+    if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)})
+    var rebased = []
 
     // Propagate to the linked documents
     linkedDocs(doc, function(doc, sharedHist) {
       if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-        rebaseHist(doc.history, change);
-        rebased.push(doc.history);
+        rebaseHist(doc.history, change)
+        rebased.push(doc.history)
       }
-      makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
-    });
+      makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change))
+    })
   }
 }
 
 // Sub-views need their line numbers shifted when text is added
 // above or below them in the parent document.
 function shiftDoc(doc, distance) {
-  if (distance == 0) return;
-  doc.first += distance;
+  if (distance == 0) return
+  doc.first += distance
   doc.sel = new Selection(map(doc.sel.ranges, function(range) {
     return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
-                     Pos(range.head.line + distance, range.head.ch));
-  }), doc.sel.primIndex);
+                     Pos(range.head.line + distance, range.head.ch))
+  }), doc.sel.primIndex)
   if (doc.cm) {
-    regChange(doc.cm, doc.first, doc.first - distance, distance);
+    regChange(doc.cm, doc.first, doc.first - distance, distance)
     for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
-      regLineChange(doc.cm, l, "gutter");
+      regLineChange(doc.cm, l, "gutter")
   }
 }
 
@@ -167,111 +167,111 @@ function shiftDoc(doc, distance) {
 // (not linked ones).
 function makeChangeSingleDoc(doc, change, selAfter, spans) {
   if (doc.cm && !doc.cm.curOp)
-    return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans);
+    return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans)
 
   if (change.to.line < doc.first) {
-    shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
-    return;
+    shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line))
+    return
   }
-  if (change.from.line > doc.lastLine()) return;
+  if (change.from.line > doc.lastLine()) return
 
   // Clip the change to the size of this doc
   if (change.from.line < doc.first) {
-    var shift = change.text.length - 1 - (doc.first - change.from.line);
-    shiftDoc(doc, shift);
+    var shift = change.text.length - 1 - (doc.first - change.from.line)
+    shiftDoc(doc, shift)
     change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
-              text: [lst(change.text)], origin: change.origin};
+              text: [lst(change.text)], origin: change.origin}
   }
-  var last = doc.lastLine();
+  var last = doc.lastLine()
   if (change.to.line > last) {
     change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
-              text: [change.text[0]], origin: change.origin};
+              text: [change.text[0]], origin: change.origin}
   }
 
-  change.removed = getBetween(doc, change.from, change.to);
+  change.removed = getBetween(doc, change.from, change.to)
 
-  if (!selAfter) selAfter = computeSelAfterChange(doc, change);
-  if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
-  else updateDoc(doc, change, spans);
-  setSelectionNoUndo(doc, selAfter, sel_dontScroll);
+  if (!selAfter) selAfter = computeSelAfterChange(doc, change)
+  if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans)
+  else updateDoc(doc, change, spans)
+  setSelectionNoUndo(doc, selAfter, sel_dontScroll)
 }
 
 // Handle the interaction of a change to a document with the editor
 // that this document is part of.
 function makeChangeSingleDocInEditor(cm, change, spans) {
-  var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
+  var doc = cm.doc, display = cm.display, from = change.from, to = change.to
 
-  var recomputeMaxLength = false, checkWidthStart = from.line;
+  var recomputeMaxLength = false, checkWidthStart = from.line
   if (!cm.options.lineWrapping) {
-    checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
+    checkWidthStart = lineNo(visualLine(getLine(doc, from.line)))
     doc.iter(checkWidthStart, to.line + 1, function(line) {
       if (line == display.maxLine) {
-        recomputeMaxLength = true;
-        return true;
+        recomputeMaxLength = true
+        return true
       }
-    });
+    })
   }
 
   if (doc.sel.contains(change.from, change.to) > -1)
-    signalCursorActivity(cm);
+    signalCursorActivity(cm)
 
-  updateDoc(doc, change, spans, estimateHeight(cm));
+  updateDoc(doc, change, spans, estimateHeight(cm))
 
   if (!cm.options.lineWrapping) {
     doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
-      var len = lineLength(line);
+      var len = lineLength(line)
       if (len > display.maxLineLength) {
-        display.maxLine = line;
-        display.maxLineLength = len;
-        display.maxLineChanged = true;
-        recomputeMaxLength = false;
+        display.maxLine = line
+        display.maxLineLength = len
+        display.maxLineChanged = true
+        recomputeMaxLength = false
       }
-    });
-    if (recomputeMaxLength) cm.curOp.updateMaxLine = true;
+    })
+    if (recomputeMaxLength) cm.curOp.updateMaxLine = true
   }
 
   // Adjust frontier, schedule worker
-  doc.frontier = Math.min(doc.frontier, from.line);
-  startWorker(cm, 400);
+  doc.frontier = Math.min(doc.frontier, from.line)
+  startWorker(cm, 400)
 
-  var lendiff = change.text.length - (to.line - from.line) - 1;
+  var lendiff = change.text.length - (to.line - from.line) - 1
   // Remember that these lines changed, for updating the display
   if (change.full)
-    regChange(cm);
+    regChange(cm)
   else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
-    regLineChange(cm, from.line, "text");
+    regLineChange(cm, from.line, "text")
   else
-    regChange(cm, from.line, to.line + 1, lendiff);
+    regChange(cm, from.line, to.line + 1, lendiff)
 
-  var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
+  var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change")
   if (changeHandler || changesHandler) {
     var obj = {
       from: from, to: to,
       text: change.text,
       removed: change.removed,
       origin: change.origin
-    };
-    if (changeHandler) signalLater(cm, "change", cm, obj);
-    if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj);
+    }
+    if (changeHandler) signalLater(cm, "change", cm, obj)
+    if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj)
   }
-  cm.display.selForContextMenu = null;
+  cm.display.selForContextMenu = null
 }
 
 export function replaceRange(doc, code, from, to, origin) {
-  if (!to) to = from;
-  if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
-  if (typeof code == "string") code = doc.splitLines(code);
-  makeChange(doc, {from: from, to: to, text: code, origin: origin});
+  if (!to) to = from
+  if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp }
+  if (typeof code == "string") code = doc.splitLines(code)
+  makeChange(doc, {from: from, to: to, text: code, origin: origin})
 }
 
 // Rebasing/resetting history to deal with externally-sourced changes
 
 function rebaseHistSelSingle(pos, from, to, diff) {
   if (to < pos.line) {
-    pos.line += diff;
+    pos.line += diff
   } else if (from < pos.line) {
-    pos.line = from;
-    pos.ch = 0;
+    pos.line = from
+    pos.ch = 0
   }
 }
 
@@ -284,46 +284,46 @@ function rebaseHistSelSingle(pos, from, to, diff) {
 // shared position objects being unsafely updated.
 function rebaseHistArray(array, from, to, diff) {
   for (var i = 0; i < array.length; ++i) {
-    var sub = array[i], ok = true;
+    var sub = array[i], ok = true
     if (sub.ranges) {
-      if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
+      if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true }
       for (var j = 0; j < sub.ranges.length; j++) {
-        rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
-        rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
+        rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff)
+        rebaseHistSelSingle(sub.ranges[j].head, from, to, diff)
       }
-      continue;
+      continue
     }
     for (var j = 0; j < sub.changes.length; ++j) {
-      var cur = sub.changes[j];
+      var cur = sub.changes[j]
       if (to < cur.from.line) {
-        cur.from = Pos(cur.from.line + diff, cur.from.ch);
-        cur.to = Pos(cur.to.line + diff, cur.to.ch);
+        cur.from = Pos(cur.from.line + diff, cur.from.ch)
+        cur.to = Pos(cur.to.line + diff, cur.to.ch)
       } else if (from <= cur.to.line) {
-        ok = false;
-        break;
+        ok = false
+        break
       }
     }
     if (!ok) {
-      array.splice(0, i + 1);
-      i = 0;
+      array.splice(0, i + 1)
+      i = 0
     }
   }
 }
 
 function rebaseHist(hist, change) {
-  var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
-  rebaseHistArray(hist.done, from, to, diff);
-  rebaseHistArray(hist.undone, from, to, diff);
+  var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1
+  rebaseHistArray(hist.done, from, to, diff)
+  rebaseHistArray(hist.undone, from, to, diff)
 }
 
 // Utility for applying a change to a line by handle or number,
 // returning the number and optionally registering the line as
 // changed.
 export function changeLine(doc, handle, changeType, op) {
-  var no = handle, line = handle;
-  if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
-  else no = lineNo(handle);
-  if (no == null) return null;
-  if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType);
-  return line;
+  var no = handle, line = handle
+  if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle))
+  else no = lineNo(handle)
+  if (no == null) return null
+  if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType)
+  return line
 }
diff --git a/src/model/chunk.js b/src/model/chunk.js
index 28fd4153b5..0aee95fe2f 100644
--- a/src/model/chunk.js
+++ b/src/model/chunk.js
@@ -1,6 +1,6 @@
-import { cleanUpLine } from "../line/line_data";
-import { indexOf } from "../util/misc";
-import { signalLater } from "../util/operation_group";
+import { cleanUpLine } from "../line/line_data"
+import { indexOf } from "../util/misc"
+import { signalLater } from "../util/operation_group"
 
 // The document is represented as a BTree consisting of leaves, with
 // chunk of lines in them, and branches, with up to ten leaves or
@@ -16,142 +16,142 @@ import { signalLater } from "../util/operation_group";
 // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
 
 export function LeafChunk(lines) {
-  this.lines = lines;
-  this.parent = null;
+  this.lines = lines
+  this.parent = null
   for (var i = 0, height = 0; i < lines.length; ++i) {
-    lines[i].parent = this;
-    height += lines[i].height;
+    lines[i].parent = this
+    height += lines[i].height
   }
-  this.height = height;
+  this.height = height
 }
 
 LeafChunk.prototype = {
-  chunkSize: function() { return this.lines.length; },
+  chunkSize: function() { return this.lines.length },
   // Remove the n lines at offset 'at'.
   removeInner: function(at, n) {
     for (var i = at, e = at + n; i < e; ++i) {
-      var line = this.lines[i];
-      this.height -= line.height;
-      cleanUpLine(line);
-      signalLater(line, "delete");
+      var line = this.lines[i]
+      this.height -= line.height
+      cleanUpLine(line)
+      signalLater(line, "delete")
     }
-    this.lines.splice(at, n);
+    this.lines.splice(at, n)
   },
   // Helper used to collapse a small branch into a single leaf.
   collapse: function(lines) {
-    lines.push.apply(lines, this.lines);
+    lines.push.apply(lines, this.lines)
   },
   // Insert the given array of lines at offset 'at', count them as
   // having the given height.
   insertInner: function(at, lines, height) {
-    this.height += height;
-    this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
-    for (var i = 0; i < lines.length; ++i) lines[i].parent = this;
+    this.height += height
+    this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at))
+    for (var i = 0; i < lines.length; ++i) lines[i].parent = this
   },
   // Used to iterate over a part of the tree.
   iterN: function(at, n, op) {
     for (var e = at + n; at < e; ++at)
-      if (op(this.lines[at])) return true;
+      if (op(this.lines[at])) return true
   }
-};
+}
 
 export function BranchChunk(children) {
-  this.children = children;
-  var size = 0, height = 0;
+  this.children = children
+  var size = 0, height = 0
   for (var i = 0; i < children.length; ++i) {
-    var ch = children[i];
-    size += ch.chunkSize(); height += ch.height;
-    ch.parent = this;
+    var ch = children[i]
+    size += ch.chunkSize(); height += ch.height
+    ch.parent = this
   }
-  this.size = size;
-  this.height = height;
-  this.parent = null;
+  this.size = size
+  this.height = height
+  this.parent = null
 }
 
 BranchChunk.prototype = {
-  chunkSize: function() { return this.size; },
+  chunkSize: function() { return this.size },
   removeInner: function(at, n) {
-    this.size -= n;
+    this.size -= n
     for (var i = 0; i < this.children.length; ++i) {
-      var child = this.children[i], sz = child.chunkSize();
+      var child = this.children[i], sz = child.chunkSize()
       if (at < sz) {
-        var rm = Math.min(n, sz - at), oldHeight = child.height;
-        child.removeInner(at, rm);
-        this.height -= oldHeight - child.height;
-        if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
-        if ((n -= rm) == 0) break;
-        at = 0;
-      } else at -= sz;
+        var rm = Math.min(n, sz - at), oldHeight = child.height
+        child.removeInner(at, rm)
+        this.height -= oldHeight - child.height
+        if (sz == rm) { this.children.splice(i--, 1); child.parent = null }
+        if ((n -= rm) == 0) break
+        at = 0
+      } else at -= sz
     }
     // If the result is smaller than 25 lines, ensure that it is a
     // single leaf node.
     if (this.size - n < 25 &&
         (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
-      var lines = [];
-      this.collapse(lines);
-      this.children = [new LeafChunk(lines)];
-      this.children[0].parent = this;
+      var lines = []
+      this.collapse(lines)
+      this.children = [new LeafChunk(lines)]
+      this.children[0].parent = this
     }
   },
   collapse: function(lines) {
-    for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines);
+    for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines)
   },
   insertInner: function(at, lines, height) {
-    this.size += lines.length;
-    this.height += height;
+    this.size += lines.length
+    this.height += height
     for (var i = 0; i < this.children.length; ++i) {
-      var child = this.children[i], sz = child.chunkSize();
+      var child = this.children[i], sz = child.chunkSize()
       if (at <= sz) {
-        child.insertInner(at, lines, height);
+        child.insertInner(at, lines, height)
         if (child.lines && child.lines.length > 50) {
           // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
           // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
           var remaining = child.lines.length % 25 + 25
           for (var pos = remaining; pos < child.lines.length;) {
-            var leaf = new LeafChunk(child.lines.slice(pos, pos += 25));
-            child.height -= leaf.height;
-            this.children.splice(++i, 0, leaf);
-            leaf.parent = this;
+            var leaf = new LeafChunk(child.lines.slice(pos, pos += 25))
+            child.height -= leaf.height
+            this.children.splice(++i, 0, leaf)
+            leaf.parent = this
           }
-          child.lines = child.lines.slice(0, remaining);
-          this.maybeSpill();
+          child.lines = child.lines.slice(0, remaining)
+          this.maybeSpill()
         }
-        break;
+        break
       }
-      at -= sz;
+      at -= sz
     }
   },
   // When a node has grown, check whether it should be split.
   maybeSpill: function() {
-    if (this.children.length <= 10) return;
-    var me = this;
+    if (this.children.length <= 10) return
+    var me = this
     do {
-      var spilled = me.children.splice(me.children.length - 5, 5);
-      var sibling = new BranchChunk(spilled);
+      var spilled = me.children.splice(me.children.length - 5, 5)
+      var sibling = new BranchChunk(spilled)
       if (!me.parent) { // Become the parent node
-        var copy = new BranchChunk(me.children);
-        copy.parent = me;
-        me.children = [copy, sibling];
-        me = copy;
+        var copy = new BranchChunk(me.children)
+        copy.parent = me
+        me.children = [copy, sibling]
+        me = copy
      } else {
-        me.size -= sibling.size;
-        me.height -= sibling.height;
-        var myIndex = indexOf(me.parent.children, me);
-        me.parent.children.splice(myIndex + 1, 0, sibling);
+        me.size -= sibling.size
+        me.height -= sibling.height
+        var myIndex = indexOf(me.parent.children, me)
+        me.parent.children.splice(myIndex + 1, 0, sibling)
       }
-      sibling.parent = me.parent;
-    } while (me.children.length > 10);
-    me.parent.maybeSpill();
+      sibling.parent = me.parent
+    } while (me.children.length > 10)
+    me.parent.maybeSpill()
   },
   iterN: function(at, n, op) {
     for (var i = 0; i < this.children.length; ++i) {
-      var child = this.children[i], sz = child.chunkSize();
+      var child = this.children[i], sz = child.chunkSize()
       if (at < sz) {
-        var used = Math.min(n, sz - at);
-        if (child.iterN(at, used, op)) return true;
-        if ((n -= used) == 0) break;
-        at = 0;
-      } else at -= sz;
+        var used = Math.min(n, sz - at)
+        if (child.iterN(at, used, op)) return true
+        if ((n -= used) == 0) break
+        at = 0
+      } else at -= sz
     }
   }
-};
+}
diff --git a/src/model/document_data.js b/src/model/document_data.js
index 62ee034adf..8e423bafd3 100644
--- a/src/model/document_data.js
+++ b/src/model/document_data.js
@@ -1,11 +1,11 @@
-import { loadMode } from "../display/mode_state";
-import { regChange } from "../display/view_tracking";
-import { Line, updateLine } from "../line/line_data";
-import { findMaxLine } from "../line/spans";
-import { getLine } from "../line/utils_line";
-import { estimateLineHeights } from "../measurement/position_measurement";
-import { lst } from "../util/misc";
-import { signalLater } from "../util/operation_group";
+import { loadMode } from "../display/mode_state"
+import { regChange } from "../display/view_tracking"
+import { Line, updateLine } from "../line/line_data"
+import { findMaxLine } from "../line/spans"
+import { getLine } from "../line/utils_line"
+import { estimateLineHeights } from "../measurement/position_measurement"
+import { lst } from "../util/misc"
+import { signalLater } from "../util/operation_group"
 
 // DOCUMENT DATA STRUCTURE
 
@@ -14,84 +14,84 @@ import { signalLater } from "../util/operation_group";
 // widgets and marker elements with the text behave more intuitive.
 export function isWholeLineUpdate(doc, change) {
   return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
-    (!doc.cm || doc.cm.options.wholeLineUpdateBefore);
+    (!doc.cm || doc.cm.options.wholeLineUpdateBefore)
 }
 
 // Perform a change on the document data structure.
 export function updateDoc(doc, change, markedSpans, estimateHeight) {
-  function spansFor(n) {return markedSpans ? markedSpans[n] : null;}
+  function spansFor(n) {return markedSpans ? markedSpans[n] : null}
   function update(line, text, spans) {
-    updateLine(line, text, spans, estimateHeight);
-    signalLater(line, "change", line, change);
+    updateLine(line, text, spans, estimateHeight)
+    signalLater(line, "change", line, change)
   }
   function linesFor(start, end) {
     for (var i = start, result = []; i < end; ++i)
-      result.push(new Line(text[i], spansFor(i), estimateHeight));
-    return result;
+      result.push(new Line(text[i], spansFor(i), estimateHeight))
+    return result
   }
 
-  var from = change.from, to = change.to, text = change.text;
-  var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
-  var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
+  var from = change.from, to = change.to, text = change.text
+  var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line)
+  var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line
 
   // Adjust the line structure
   if (change.full) {
-    doc.insert(0, linesFor(0, text.length));
-    doc.remove(text.length, doc.size - text.length);
+    doc.insert(0, linesFor(0, text.length))
+    doc.remove(text.length, doc.size - text.length)
   } else if (isWholeLineUpdate(doc, change)) {
     // This is a whole-line replace. Treated specially to make
     // sure line objects move the way they are supposed to.
-    var added = linesFor(0, text.length - 1);
-    update(lastLine, lastLine.text, lastSpans);
-    if (nlines) doc.remove(from.line, nlines);
-    if (added.length) doc.insert(from.line, added);
+    var added = linesFor(0, text.length - 1)
+    update(lastLine, lastLine.text, lastSpans)
+    if (nlines) doc.remove(from.line, nlines)
+    if (added.length) doc.insert(from.line, added)
   } else if (firstLine == lastLine) {
     if (text.length == 1) {
-      update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
+      update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans)
     } else {
-      var added = linesFor(1, text.length - 1);
-      added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-      doc.insert(from.line + 1, added);
+      var added = linesFor(1, text.length - 1)
+      added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight))
+      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0))
+      doc.insert(from.line + 1, added)
     }
   } else if (text.length == 1) {
-    update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
-    doc.remove(from.line + 1, nlines);
+    update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0))
+    doc.remove(from.line + 1, nlines)
   } else {
-    update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-    update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
-    var added = linesFor(1, text.length - 1);
-    if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
-    doc.insert(from.line + 1, added);
+    update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0))
+    update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans)
+    var added = linesFor(1, text.length - 1)
+    if (nlines > 1) doc.remove(from.line + 1, nlines - 1)
+    doc.insert(from.line + 1, added)
   }
 
-  signalLater(doc, "change", doc, change);
+  signalLater(doc, "change", doc, change)
 }
 
 // Call f for all linked documents.
 export function linkedDocs(doc, f, sharedHistOnly) {
   function propagate(doc, skip, sharedHist) {
     if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
-      var rel = doc.linked[i];
-      if (rel.doc == skip) continue;
-      var shared = sharedHist && rel.sharedHist;
-      if (sharedHistOnly && !shared) continue;
-      f(rel.doc, shared);
-      propagate(rel.doc, doc, shared);
+      var rel = doc.linked[i]
+      if (rel.doc == skip) continue
+      var shared = sharedHist && rel.sharedHist
+      if (sharedHistOnly && !shared) continue
+      f(rel.doc, shared)
+      propagate(rel.doc, doc, shared)
     }
   }
-  propagate(doc, null, true);
+  propagate(doc, null, true)
 }
 
 // Attach a document to an editor.
 export function attachDoc(cm, doc) {
-  if (doc.cm) throw new Error("This document is already in use.");
-  cm.doc = doc;
-  doc.cm = cm;
-  estimateLineHeights(cm);
-  loadMode(cm);
-  if (!cm.options.lineWrapping) findMaxLine(cm);
-  cm.options.mode = doc.modeOption;
-  regChange(cm);
+  if (doc.cm) throw new Error("This document is already in use.")
+  cm.doc = doc
+  doc.cm = cm
+  estimateLineHeights(cm)
+  loadMode(cm)
+  if (!cm.options.lineWrapping) findMaxLine(cm)
+  cm.options.mode = doc.modeOption
+  regChange(cm)
 }
 
diff --git a/src/model/history.js b/src/model/history.js
index 8e34427330..8cc77b1ab0 100644
--- a/src/model/history.js
+++ b/src/model/history.js
@@ -1,44 +1,44 @@
-import { cmp, copyPos } from "../line/pos";
-import { stretchSpansOverChange } from "../line/spans";
-import { getBetween } from "../line/utils_line";
-import { signal } from "../util/event";
-import { indexOf, lst } from "../util/misc";
+import { cmp, copyPos } from "../line/pos"
+import { stretchSpansOverChange } from "../line/spans"
+import { getBetween } from "../line/utils_line"
+import { signal } from "../util/event"
+import { indexOf, lst } from "../util/misc"
 
-import { changeEnd } from "./change_measurement";
-import { linkedDocs } from "./document_data";
-import { Selection } from "./selection";
+import { changeEnd } from "./change_measurement"
+import { linkedDocs } from "./document_data"
+import { Selection } from "./selection"
 
 export function History(startGen) {
   // Arrays of change events and selections. Doing something adds an
   // event to done and clears undo. Undoing moves events from done
   // to undone, redoing moves them in the other direction.
-  this.done = []; this.undone = [];
-  this.undoDepth = Infinity;
+  this.done = []; this.undone = []
+  this.undoDepth = Infinity
   // Used to track when changes can be merged into a single undo
   // event
-  this.lastModTime = this.lastSelTime = 0;
-  this.lastOp = this.lastSelOp = null;
-  this.lastOrigin = this.lastSelOrigin = null;
+  this.lastModTime = this.lastSelTime = 0
+  this.lastOp = this.lastSelOp = null
+  this.lastOrigin = this.lastSelOrigin = null
   // Used by the isClean() method
-  this.generation = this.maxGeneration = startGen || 1;
+  this.generation = this.maxGeneration = startGen || 1
 }
 
 // Create a history change event from an updateDoc-style change
 // object.
 export function historyChangeFromChange(doc, change) {
-  var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
-  attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
-  linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
-  return histChange;
+  var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)}
+  attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1)
+  linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1)}, true)
+  return histChange
 }
 
 // Pop all selection events off the end of a history array. Stop at
 // a change event.
 function clearSelectionEvents(array) {
   while (array.length) {
-    var last = lst(array);
-    if (last.ranges) array.pop();
-    else break;
+    var last = lst(array)
+    if (last.ranges) array.pop()
+    else break
   }
 }
 
@@ -46,13 +46,13 @@ function clearSelectionEvents(array) {
 // events that are in the way.
 function lastChangeEvent(hist, force) {
   if (force) {
-    clearSelectionEvents(hist.done);
-    return lst(hist.done);
+    clearSelectionEvents(hist.done)
+    return lst(hist.done)
   } else if (hist.done.length && !lst(hist.done).ranges) {
-    return lst(hist.done);
+    return lst(hist.done)
   } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
-    hist.done.pop();
-    return lst(hist.done);
+    hist.done.pop()
+    return lst(hist.done)
   }
 }
 
@@ -60,9 +60,9 @@ function lastChangeEvent(hist, force) {
 // a single operation, or are close together with an origin that
 // allows merging (starting with "+") into a single event.
 export function addChangeToHistory(doc, change, selAfter, opId) {
-  var hist = doc.history;
-  hist.undone.length = 0;
-  var time = +new Date, cur;
+  var hist = doc.history
+  hist.undone.length = 0
+  var time = +new Date, cur
 
   if ((hist.lastOp == opId ||
        hist.lastOrigin == change.origin && change.origin &&
@@ -70,44 +70,44 @@ export function addChangeToHistory(doc, change, selAfter, opId) {
         change.origin.charAt(0) == "*")) &&
       (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
     // Merge this change into the last event
-    var last = lst(cur.changes);
+    var last = lst(cur.changes)
     if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
       // Optimized case for simple insertion -- don't want to add
       // new changesets for every character typed
-      last.to = changeEnd(change);
+      last.to = changeEnd(change)
     } else {
       // Add new sub-event
-      cur.changes.push(historyChangeFromChange(doc, change));
+      cur.changes.push(historyChangeFromChange(doc, change))
     }
   } else {
     // Can not be merged, start a new event.
-    var before = lst(hist.done);
+    var before = lst(hist.done)
     if (!before || !before.ranges)
-      pushSelectionToHistory(doc.sel, hist.done);
+      pushSelectionToHistory(doc.sel, hist.done)
     cur = {changes: [historyChangeFromChange(doc, change)],
-           generation: hist.generation};
-    hist.done.push(cur);
+           generation: hist.generation}
+    hist.done.push(cur)
     while (hist.done.length > hist.undoDepth) {
-      hist.done.shift();
-      if (!hist.done[0].ranges) hist.done.shift();
+      hist.done.shift()
+      if (!hist.done[0].ranges) hist.done.shift()
     }
   }
-  hist.done.push(selAfter);
-  hist.generation = ++hist.maxGeneration;
-  hist.lastModTime = hist.lastSelTime = time;
-  hist.lastOp = hist.lastSelOp = opId;
-  hist.lastOrigin = hist.lastSelOrigin = change.origin;
+  hist.done.push(selAfter)
+  hist.generation = ++hist.maxGeneration
+  hist.lastModTime = hist.lastSelTime = time
+  hist.lastOp = hist.lastSelOp = opId
+  hist.lastOrigin = hist.lastSelOrigin = change.origin
 
-  if (!last) signal(doc, "historyAdded");
+  if (!last) signal(doc, "historyAdded")
 }
 
 function selectionEventCanBeMerged(doc, origin, prev, sel) {
-  var ch = origin.charAt(0);
+  var ch = origin.charAt(0)
   return ch == "*" ||
     ch == "+" &&
     prev.ranges.length == sel.ranges.length &&
     prev.somethingSelected() == sel.somethingSelected() &&
-    new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500);
+    new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500)
 }
 
 // Called whenever the selection changes, sets the new selection as
@@ -115,7 +115,7 @@ function selectionEventCanBeMerged(doc, origin, prev, sel) {
 // selection into the 'done' array when it was significantly
 // different (in number of selected ranges, emptiness, or time).
 export function addSelectionToHistory(doc, sel, opId, options) {
-  var hist = doc.history, origin = options && options.origin;
+  var hist = doc.history, origin = options && options.origin
 
   // A new event is started when the previous origin does not match
   // the current, or the origins don't allow matching. Origins
@@ -125,51 +125,51 @@ export function addSelectionToHistory(doc, sel, opId, options) {
       (origin && hist.lastSelOrigin == origin &&
        (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
         selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
-    hist.done[hist.done.length - 1] = sel;
+    hist.done[hist.done.length - 1] = sel
   else
-    pushSelectionToHistory(sel, hist.done);
+    pushSelectionToHistory(sel, hist.done)
 
-  hist.lastSelTime = +new Date;
-  hist.lastSelOrigin = origin;
-  hist.lastSelOp = opId;
+  hist.lastSelTime = +new Date
+  hist.lastSelOrigin = origin
+  hist.lastSelOp = opId
   if (options && options.clearRedo !== false)
-    clearSelectionEvents(hist.undone);
+    clearSelectionEvents(hist.undone)
 }
 
 export function pushSelectionToHistory(sel, dest) {
-  var top = lst(dest);
+  var top = lst(dest)
   if (!(top && top.ranges && top.equals(sel)))
-    dest.push(sel);
+    dest.push(sel)
 }
 
 // Used to store marked span information in the history.
 function attachLocalSpans(doc, change, from, to) {
-  var existing = change["spans_" + doc.id], n = 0;
+  var existing = change["spans_" + doc.id], n = 0
   doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
     if (line.markedSpans)
-      (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans;
-    ++n;
-  });
+      (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans
+    ++n
+  })
 }
 
 // When un/re-doing restores text containing marked spans, those
 // that have been explicitly cleared should not be restored.
 function removeClearedSpans(spans) {
-  if (!spans) return null;
+  if (!spans) return null
   for (var i = 0, out; i < spans.length; ++i) {
-    if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); }
-    else if (out) out.push(spans[i]);
+    if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i) }
+    else if (out) out.push(spans[i])
   }
-  return !out ? spans : out.length ? out : null;
+  return !out ? spans : out.length ? out : null
 }
 
 // Retrieve and filter the old marked spans stored in a change event.
 function getOldSpans(doc, change) {
-  var found = change["spans_" + doc.id];
-  if (!found) return null;
+  var found = change["spans_" + doc.id]
+  if (!found) return null
   for (var i = 0, nw = []; i < change.text.length; ++i)
-    nw.push(removeClearedSpans(found[i]));
-  return nw;
+    nw.push(removeClearedSpans(found[i]))
+  return nw
 }
 
 // Used for un/re-doing changes from the history. Combines the
@@ -177,48 +177,48 @@ function getOldSpans(doc, change) {
 // existed in the history (so that deleting around a span and then
 // undoing brings back the span).
 export function mergeOldSpans(doc, change) {
-  var old = getOldSpans(doc, change);
-  var stretched = stretchSpansOverChange(doc, change);
-  if (!old) return stretched;
-  if (!stretched) return old;
+  var old = getOldSpans(doc, change)
+  var stretched = stretchSpansOverChange(doc, change)
+  if (!old) return stretched
+  if (!stretched) return old
 
   for (var i = 0; i < old.length; ++i) {
-    var oldCur = old[i], stretchCur = stretched[i];
+    var oldCur = old[i], stretchCur = stretched[i]
     if (oldCur && stretchCur) {
       spans: for (var j = 0; j < stretchCur.length; ++j) {
-        var span = stretchCur[j];
+        var span = stretchCur[j]
         for (var k = 0; k < oldCur.length; ++k)
-          if (oldCur[k].marker == span.marker) continue spans;
-        oldCur.push(span);
+          if (oldCur[k].marker == span.marker) continue spans
+        oldCur.push(span)
       }
     } else if (stretchCur) {
-      old[i] = stretchCur;
+      old[i] = stretchCur
     }
   }
-  return old;
+  return old
 }
 
 // Used both to provide a JSON-safe object in .getHistory, and, when
 // detaching a document, to split the history in two
 export function copyHistoryArray(events, newGroup, instantiateSel) {
   for (var i = 0, copy = []; i < events.length; ++i) {
-    var event = events[i];
+    var event = events[i]
     if (event.ranges) {
-      copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
-      continue;
+      copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event)
+      continue
     }
-    var changes = event.changes, newChanges = [];
-    copy.push({changes: newChanges});
+    var changes = event.changes, newChanges = []
+    copy.push({changes: newChanges})
     for (var j = 0; j < changes.length; ++j) {
-      var change = changes[j], m;
-      newChanges.push({from: change.from, to: change.to, text: change.text});
+      var change = changes[j], m
+      newChanges.push({from: change.from, to: change.to, text: change.text})
       if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
         if (indexOf(newGroup, Number(m[1])) > -1) {
-          lst(newChanges)[prop] = change[prop];
-          delete change[prop];
+          lst(newChanges)[prop] = change[prop]
+          delete change[prop]
         }
       }
     }
   }
-  return copy;
+  return copy
 }
diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index 241327ce77..b3b422aafb 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -1,67 +1,67 @@
-import { runInOp } from "../display/operations";
-import { addToScrollPos } from "../display/scrolling";
-import { regLineChange } from "../display/view_tracking";
-import { heightAtLine, lineIsHidden } from "../line/spans";
-import { lineNo, updateLineHeight } from "../line/utils_line";
-import { widgetHeight } from "../measurement/widgets";
-import { changeLine } from "./changes";
-import { eventMixin } from "../util/event";
+import { runInOp } from "../display/operations"
+import { addToScrollPos } from "../display/scrolling"
+import { regLineChange } from "../display/view_tracking"
+import { heightAtLine, lineIsHidden } from "../line/spans"
+import { lineNo, updateLineHeight } from "../line/utils_line"
+import { widgetHeight } from "../measurement/widgets"
+import { changeLine } from "./changes"
+import { eventMixin } from "../util/event"
 
 // Line widgets are block elements displayed above or below a line.
 
 export function LineWidget(doc, node, options) {
   if (options) for (var opt in options) if (options.hasOwnProperty(opt))
-    this[opt] = options[opt];
-  this.doc = doc;
-  this.node = node;
+    this[opt] = options[opt]
+  this.doc = doc
+  this.node = node
 }
-eventMixin(LineWidget);
+eventMixin(LineWidget)
 
 function adjustScrollWhenAboveVisible(cm, line, diff) {
   if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
-    addToScrollPos(cm, null, diff);
+    addToScrollPos(cm, null, diff)
 }
 
 LineWidget.prototype.clear = function() {
-  var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
-  if (no == null || !ws) return;
-  for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
-  if (!ws.length) line.widgets = null;
-  var height = widgetHeight(this);
-  updateLineHeight(line, Math.max(0, line.height - height));
+  var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line)
+  if (no == null || !ws) return
+  for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1)
+  if (!ws.length) line.widgets = null
+  var height = widgetHeight(this)
+  updateLineHeight(line, Math.max(0, line.height - height))
   if (cm) runInOp(cm, function() {
-    adjustScrollWhenAboveVisible(cm, line, -height);
-    regLineChange(cm, no, "widget");
-  });
-};
+    adjustScrollWhenAboveVisible(cm, line, -height)
+    regLineChange(cm, no, "widget")
+  })
+}
 LineWidget.prototype.changed = function() {
-  var oldH = this.height, cm = this.doc.cm, line = this.line;
-  this.height = null;
-  var diff = widgetHeight(this) - oldH;
-  if (!diff) return;
-  updateLineHeight(line, line.height + diff);
+  var oldH = this.height, cm = this.doc.cm, line = this.line
+  this.height = null
+  var diff = widgetHeight(this) - oldH
+  if (!diff) return
+  updateLineHeight(line, line.height + diff)
   if (cm) runInOp(cm, function() {
-    cm.curOp.forceUpdate = true;
-    adjustScrollWhenAboveVisible(cm, line, diff);
-  });
-};
+    cm.curOp.forceUpdate = true
+    adjustScrollWhenAboveVisible(cm, line, diff)
+  })
+}
 
 export function addLineWidget(doc, handle, node, options) {
-  var widget = new LineWidget(doc, node, options);
-  var cm = doc.cm;
-  if (cm && widget.noHScroll) cm.display.alignWidgets = true;
+  var widget = new LineWidget(doc, node, options)
+  var cm = doc.cm
+  if (cm && widget.noHScroll) cm.display.alignWidgets = true
   changeLine(doc, handle, "widget", function(line) {
-    var widgets = line.widgets || (line.widgets = []);
-    if (widget.insertAt == null) widgets.push(widget);
-    else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
-    widget.line = line;
+    var widgets = line.widgets || (line.widgets = [])
+    if (widget.insertAt == null) widgets.push(widget)
+    else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget)
+    widget.line = line
     if (cm && !lineIsHidden(doc, line)) {
-      var aboveVisible = heightAtLine(line) < doc.scrollTop;
-      updateLineHeight(line, line.height + widgetHeight(widget));
-      if (aboveVisible) addToScrollPos(cm, null, widget.height);
-      cm.curOp.forceUpdate = true;
+      var aboveVisible = heightAtLine(line) < doc.scrollTop
+      updateLineHeight(line, line.height + widgetHeight(widget))
+      if (aboveVisible) addToScrollPos(cm, null, widget.height)
+      cm.curOp.forceUpdate = true
     }
-    return true;
-  });
-  return widget;
+    return true
+  })
+  return widget
 }
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index 7a334e5352..c103a57481 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -1,19 +1,19 @@
-import { elt } from "../util/dom";
-import { eventMixin, hasHandler, on } from "../util/event";
-import { endOperation, operation, runInOp, startOperation } from "../display/operations";
-import { clipPos, cmp, Pos } from "../line/pos";
-import { lineNo, updateLineHeight } from "../line/utils_line";
-import { clearLineMeasurementCacheFor, findViewForLine, textHeight } from "../measurement/position_measurement";
-import { seeReadOnlySpans, seeCollapsedSpans } from "../line/saw_special_spans";
-import { addMarkedSpan, conflictingCollapsedRange, getMarkedSpanFor, lineIsHidden, lineLength, MarkedSpan, removeMarkedSpan, visualLine } from "../line/spans";
-import { copyObj, indexOf, lst } from "../util/misc";
-import { signalLater } from "../util/operation_group";
-import { widgetHeight } from "../measurement/widgets";
-import { regChange, regLineChange } from "../display/view_tracking";
+import { elt } from "../util/dom"
+import { eventMixin, hasHandler, on } from "../util/event"
+import { endOperation, operation, runInOp, startOperation } from "../display/operations"
+import { clipPos, cmp, Pos } from "../line/pos"
+import { lineNo, updateLineHeight } from "../line/utils_line"
+import { clearLineMeasurementCacheFor, findViewForLine, textHeight } from "../measurement/position_measurement"
+import { seeReadOnlySpans, seeCollapsedSpans } from "../line/saw_special_spans"
+import { addMarkedSpan, conflictingCollapsedRange, getMarkedSpanFor, lineIsHidden, lineLength, MarkedSpan, removeMarkedSpan, visualLine } from "../line/spans"
+import { copyObj, indexOf, lst } from "../util/misc"
+import { signalLater } from "../util/operation_group"
+import { widgetHeight } from "../measurement/widgets"
+import { regChange, regLineChange } from "../display/view_tracking"
 
-import { linkedDocs } from "./document_data";
-import { addChangeToHistory } from "./history";
-import { reCheckSelection } from "./selection_updates";
+import { linkedDocs } from "./document_data"
+import { addChangeToHistory } from "./history"
+import { reCheckSelection } from "./selection_updates"
 
 // TEXTMARKERS
 
@@ -27,58 +27,58 @@ import { reCheckSelection } from "./selection_updates";
 // marker continues beyond the start/end of the line. Markers have
 // links back to the lines they currently touch.
 
-var nextMarkerId = 0;
+var nextMarkerId = 0
 
 export function TextMarker(doc, type) {
-  this.lines = [];
-  this.type = type;
-  this.doc = doc;
-  this.id = ++nextMarkerId;
+  this.lines = []
+  this.type = type
+  this.doc = doc
+  this.id = ++nextMarkerId
 }
-eventMixin(TextMarker);
+eventMixin(TextMarker)
 
 // Clear the marker.
 TextMarker.prototype.clear = function() {
-  if (this.explicitlyCleared) return;
-  var cm = this.doc.cm, withOp = cm && !cm.curOp;
-  if (withOp) startOperation(cm);
+  if (this.explicitlyCleared) return
+  var cm = this.doc.cm, withOp = cm && !cm.curOp
+  if (withOp) startOperation(cm)
   if (hasHandler(this, "clear")) {
-    var found = this.find();
-    if (found) signalLater(this, "clear", found.from, found.to);
+    var found = this.find()
+    if (found) signalLater(this, "clear", found.from, found.to)
   }
-  var min = null, max = null;
+  var min = null, max = null
   for (var i = 0; i < this.lines.length; ++i) {
-    var line = this.lines[i];
-    var span = getMarkedSpanFor(line.markedSpans, this);
-    if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text");
+    var line = this.lines[i]
+    var span = getMarkedSpanFor(line.markedSpans, this)
+    if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text")
     else if (cm) {
-      if (span.to != null) max = lineNo(line);
-      if (span.from != null) min = lineNo(line);
+      if (span.to != null) max = lineNo(line)
+      if (span.from != null) min = lineNo(line)
     }
-    line.markedSpans = removeMarkedSpan(line.markedSpans, span);
+    line.markedSpans = removeMarkedSpan(line.markedSpans, span)
     if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
-      updateLineHeight(line, textHeight(cm.display));
+      updateLineHeight(line, textHeight(cm.display))
   }
   if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
-    var visual = visualLine(this.lines[i]), len = lineLength(visual);
+    var visual = visualLine(this.lines[i]), len = lineLength(visual)
     if (len > cm.display.maxLineLength) {
-      cm.display.maxLine = visual;
-      cm.display.maxLineLength = len;
-      cm.display.maxLineChanged = true;
+      cm.display.maxLine = visual
+      cm.display.maxLineLength = len
+      cm.display.maxLineChanged = true
     }
   }
 
-  if (min != null && cm && this.collapsed) regChange(cm, min, max + 1);
-  this.lines.length = 0;
-  this.explicitlyCleared = true;
+  if (min != null && cm && this.collapsed) regChange(cm, min, max + 1)
+  this.lines.length = 0
+  this.explicitlyCleared = true
   if (this.atomic && this.doc.cantEdit) {
-    this.doc.cantEdit = false;
-    if (cm) reCheckSelection(cm.doc);
+    this.doc.cantEdit = false
+    if (cm) reCheckSelection(cm.doc)
   }
-  if (cm) signalLater(cm, "markerCleared", cm, this);
-  if (withOp) endOperation(cm);
-  if (this.parent) this.parent.clear();
-};
+  if (cm) signalLater(cm, "markerCleared", cm, this)
+  if (withOp) endOperation(cm)
+  if (this.parent) this.parent.clear()
+}
 
 // Find the position of the marker in the document. Returns a {from,
 // to} object by default. Side can be passed to get a specific side
@@ -86,135 +86,135 @@ TextMarker.prototype.clear = function() {
 // Pos objects returned contain a line object, rather than a line
 // number (used to prevent looking up the same line twice).
 TextMarker.prototype.find = function(side, lineObj) {
-  if (side == null && this.type == "bookmark") side = 1;
-  var from, to;
+  if (side == null && this.type == "bookmark") side = 1
+  var from, to
   for (var i = 0; i < this.lines.length; ++i) {
-    var line = this.lines[i];
-    var span = getMarkedSpanFor(line.markedSpans, this);
+    var line = this.lines[i]
+    var span = getMarkedSpanFor(line.markedSpans, this)
     if (span.from != null) {
-      from = Pos(lineObj ? line : lineNo(line), span.from);
-      if (side == -1) return from;
+      from = Pos(lineObj ? line : lineNo(line), span.from)
+      if (side == -1) return from
     }
     if (span.to != null) {
-      to = Pos(lineObj ? line : lineNo(line), span.to);
-      if (side == 1) return to;
+      to = Pos(lineObj ? line : lineNo(line), span.to)
+      if (side == 1) return to
     }
   }
-  return from && {from: from, to: to};
-};
+  return from && {from: from, to: to}
+}
 
 // Signals that the marker's widget changed, and surrounding layout
 // should be recomputed.
 TextMarker.prototype.changed = function() {
-  var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
-  if (!pos || !cm) return;
+  var pos = this.find(-1, true), widget = this, cm = this.doc.cm
+  if (!pos || !cm) return
   runInOp(cm, function() {
-    var line = pos.line, lineN = lineNo(pos.line);
-    var view = findViewForLine(cm, lineN);
+    var line = pos.line, lineN = lineNo(pos.line)
+    var view = findViewForLine(cm, lineN)
     if (view) {
-      clearLineMeasurementCacheFor(view);
-      cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
+      clearLineMeasurementCacheFor(view)
+      cm.curOp.selectionChanged = cm.curOp.forceUpdate = true
     }
-    cm.curOp.updateMaxLine = true;
+    cm.curOp.updateMaxLine = true
     if (!lineIsHidden(widget.doc, line) && widget.height != null) {
-      var oldHeight = widget.height;
-      widget.height = null;
-      var dHeight = widgetHeight(widget) - oldHeight;
+      var oldHeight = widget.height
+      widget.height = null
+      var dHeight = widgetHeight(widget) - oldHeight
       if (dHeight)
-        updateLineHeight(line, line.height + dHeight);
+        updateLineHeight(line, line.height + dHeight)
     }
-  });
-};
+  })
+}
 
 TextMarker.prototype.attachLine = function(line) {
   if (!this.lines.length && this.doc.cm) {
-    var op = this.doc.cm.curOp;
+    var op = this.doc.cm.curOp
     if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
-      (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this);
+      (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this)
   }
-  this.lines.push(line);
-};
+  this.lines.push(line)
+}
 TextMarker.prototype.detachLine = function(line) {
-  this.lines.splice(indexOf(this.lines, line), 1);
+  this.lines.splice(indexOf(this.lines, line), 1)
   if (!this.lines.length && this.doc.cm) {
-    var op = this.doc.cm.curOp;
-    (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
+    var op = this.doc.cm.curOp
+    ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this)
   }
-};
+}
 
 // Collapsed markers have unique ids, in order to be able to order
 // them, which is needed for uniquely determining an outer marker
 // when they overlap (they may nest, but not partially overlap).
-var nextMarkerId = 0;
+var nextMarkerId = 0
 
 // Create a marker, wire it up to the right lines, and
 export function markText(doc, from, to, options, type) {
   // Shared markers (across linked documents) are handled separately
   // (markTextShared will call out to this again, once per
   // document).
-  if (options && options.shared) return markTextShared(doc, from, to, options, type);
+  if (options && options.shared) return markTextShared(doc, from, to, options, type)
   // Ensure we are in an operation.
-  if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
+  if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type)
 
-  var marker = new TextMarker(doc, type), diff = cmp(from, to);
-  if (options) copyObj(options, marker, false);
+  var marker = new TextMarker(doc, type), diff = cmp(from, to)
+  if (options) copyObj(options, marker, false)
   // Don't connect empty markers unless clearWhenEmpty is false
   if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
-    return marker;
+    return marker
   if (marker.replacedWith) {
     // Showing up as a widget implies collapsed (widget replaces text)
-    marker.collapsed = true;
-    marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
-    if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true");
-    if (options.insertLeft) marker.widgetNode.insertLeft = true;
+    marker.collapsed = true
+    marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget")
+    if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true")
+    if (options.insertLeft) marker.widgetNode.insertLeft = true
   }
   if (marker.collapsed) {
     if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
         from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
-      throw new Error("Inserting collapsed marker partially overlapping an existing one");
-    seeCollapsedSpans();
+      throw new Error("Inserting collapsed marker partially overlapping an existing one")
+    seeCollapsedSpans()
   }
 
   if (marker.addToHistory)
-    addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN);
+    addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN)
 
-  var curLine = from.line, cm = doc.cm, updateMaxLine;
+  var curLine = from.line, cm = doc.cm, updateMaxLine
   doc.iter(curLine, to.line + 1, function(line) {
     if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
-      updateMaxLine = true;
-    if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0);
+      updateMaxLine = true
+    if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0)
     addMarkedSpan(line, new MarkedSpan(marker,
                                        curLine == from.line ? from.ch : null,
-                                       curLine == to.line ? to.ch : null));
-    ++curLine;
-  });
+                                       curLine == to.line ? to.ch : null))
+    ++curLine
+  })
   // lineIsHidden depends on the presence of the spans, so needs a second pass
   if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
-    if (lineIsHidden(doc, line)) updateLineHeight(line, 0);
-  });
+    if (lineIsHidden(doc, line)) updateLineHeight(line, 0)
+  })
 
-  if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear(); });
+  if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear() })
 
   if (marker.readOnly) {
-    seeReadOnlySpans();
+    seeReadOnlySpans()
     if (doc.history.done.length || doc.history.undone.length)
-      doc.clearHistory();
+      doc.clearHistory()
   }
   if (marker.collapsed) {
-    marker.id = ++nextMarkerId;
-    marker.atomic = true;
+    marker.id = ++nextMarkerId
+    marker.atomic = true
   }
   if (cm) {
     // Sync editor state
-    if (updateMaxLine) cm.curOp.updateMaxLine = true;
+    if (updateMaxLine) cm.curOp.updateMaxLine = true
     if (marker.collapsed)
-      regChange(cm, from.line, to.line + 1);
+      regChange(cm, from.line, to.line + 1)
     else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
-      for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
-    if (marker.atomic) reCheckSelection(cm.doc);
-    signalLater(cm, "markerAdded", cm, marker);
+      for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text")
+    if (marker.atomic) reCheckSelection(cm.doc)
+    signalLater(cm, "markerAdded", cm, marker)
   }
-  return marker;
+  return marker
 }
 
 // SHARED TEXTMARKERS
@@ -223,65 +223,65 @@ export function markText(doc, from, to, options, type) {
 // implemented as a meta-marker-object controlling multiple normal
 // markers.
 export function SharedTextMarker(markers, primary) {
-  this.markers = markers;
-  this.primary = primary;
+  this.markers = markers
+  this.primary = primary
   for (var i = 0; i < markers.length; ++i)
-    markers[i].parent = this;
+    markers[i].parent = this
 }
-eventMixin(SharedTextMarker);
+eventMixin(SharedTextMarker)
 
 SharedTextMarker.prototype.clear = function() {
-  if (this.explicitlyCleared) return;
-  this.explicitlyCleared = true;
+  if (this.explicitlyCleared) return
+  this.explicitlyCleared = true
   for (var i = 0; i < this.markers.length; ++i)
-    this.markers[i].clear();
-  signalLater(this, "clear");
-};
+    this.markers[i].clear()
+  signalLater(this, "clear")
+}
 SharedTextMarker.prototype.find = function(side, lineObj) {
-  return this.primary.find(side, lineObj);
-};
+  return this.primary.find(side, lineObj)
+}
 
 function markTextShared(doc, from, to, options, type) {
-  options = copyObj(options);
-  options.shared = false;
-  var markers = [markText(doc, from, to, options, type)], primary = markers[0];
-  var widget = options.widgetNode;
+  options = copyObj(options)
+  options.shared = false
+  var markers = [markText(doc, from, to, options, type)], primary = markers[0]
+  var widget = options.widgetNode
   linkedDocs(doc, function(doc) {
-    if (widget) options.widgetNode = widget.cloneNode(true);
-    markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
+    if (widget) options.widgetNode = widget.cloneNode(true)
+    markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type))
     for (var i = 0; i < doc.linked.length; ++i)
-      if (doc.linked[i].isParent) return;
-    primary = lst(markers);
-  });
-  return new SharedTextMarker(markers, primary);
+      if (doc.linked[i].isParent) return
+    primary = lst(markers)
+  })
+  return new SharedTextMarker(markers, primary)
 }
 
 export function findSharedMarkers(doc) {
   return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())),
-                       function(m) { return m.parent; });
+                       function(m) { return m.parent })
 }
 
 export function copySharedMarkers(doc, markers) {
   for (var i = 0; i < markers.length; i++) {
-    var marker = markers[i], pos = marker.find();
-    var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
+    var marker = markers[i], pos = marker.find()
+    var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to)
     if (cmp(mFrom, mTo)) {
-      var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
-      marker.markers.push(subMark);
-      subMark.parent = marker;
+      var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type)
+      marker.markers.push(subMark)
+      subMark.parent = marker
     }
   }
 }
 
 export function detachSharedMarkers(markers) {
   for (var i = 0; i < markers.length; i++) {
-    var marker = markers[i], linked = [marker.primary.doc];
-    linkedDocs(marker.primary.doc, function(d) { linked.push(d); });
+    var marker = markers[i], linked = [marker.primary.doc]
+    linkedDocs(marker.primary.doc, function(d) { linked.push(d) })
     for (var j = 0; j < marker.markers.length; j++) {
-      var subMarker = marker.markers[j];
+      var subMarker = marker.markers[j]
       if (indexOf(linked, subMarker.doc) == -1) {
-        subMarker.parent = null;
-        marker.markers.splice(j--, 1);
+        subMarker.parent = null
+        marker.markers.splice(j--, 1)
       }
     }
   }
diff --git a/src/model/selection.js b/src/model/selection.js
index ce3c228c8b..c75fcd6186 100644
--- a/src/model/selection.js
+++ b/src/model/selection.js
@@ -1,5 +1,5 @@
-import { cmp, copyPos, maxPos, minPos } from "../line/pos";
-import { indexOf } from "../util/misc";
+import { cmp, copyPos, maxPos, minPos } from "../line/pos"
+import { indexOf } from "../util/misc"
 
 // Selection objects are immutable. A new one is created every time
 // the selection changes. A selection is one or more non-overlapping
@@ -7,73 +7,73 @@ import { indexOf } from "../util/misc";
 // which one is the primary selection (the one that's scrolled into
 // view, that getCursor returns, etc).
 export function Selection(ranges, primIndex) {
-  this.ranges = ranges;
-  this.primIndex = primIndex;
+  this.ranges = ranges
+  this.primIndex = primIndex
 }
 
 Selection.prototype = {
-  primary: function() { return this.ranges[this.primIndex]; },
+  primary: function() { return this.ranges[this.primIndex] },
   equals: function(other) {
-    if (other == this) return true;
-    if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false;
+    if (other == this) return true
+    if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false
     for (var i = 0; i < this.ranges.length; i++) {
-      var here = this.ranges[i], there = other.ranges[i];
-      if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false;
+      var here = this.ranges[i], there = other.ranges[i]
+      if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false
     }
-    return true;
+    return true
   },
   deepCopy: function() {
     for (var out = [], i = 0; i < this.ranges.length; i++)
-      out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head));
-    return new Selection(out, this.primIndex);
+      out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head))
+    return new Selection(out, this.primIndex)
   },
   somethingSelected: function() {
     for (var i = 0; i < this.ranges.length; i++)
-      if (!this.ranges[i].empty()) return true;
-    return false;
+      if (!this.ranges[i].empty()) return true
+    return false
   },
   contains: function(pos, end) {
-    if (!end) end = pos;
+    if (!end) end = pos
     for (var i = 0; i < this.ranges.length; i++) {
-      var range = this.ranges[i];
+      var range = this.ranges[i]
       if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
-        return i;
+        return i
     }
-    return -1;
+    return -1
   }
-};
+}
 
 export function Range(anchor, head) {
-  this.anchor = anchor; this.head = head;
+  this.anchor = anchor; this.head = head
 }
 
 Range.prototype = {
-  from: function() { return minPos(this.anchor, this.head); },
-  to: function() { return maxPos(this.anchor, this.head); },
+  from: function() { return minPos(this.anchor, this.head) },
+  to: function() { return maxPos(this.anchor, this.head) },
   empty: function() {
-    return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch;
+    return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch
   }
-};
+}
 
 // Take an unsorted, potentially overlapping set of ranges, and
 // build a selection out of it. 'Consumes' ranges array (modifying
 // it).
 export function normalizeSelection(ranges, primIndex) {
-  var prim = ranges[primIndex];
-  ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
-  primIndex = indexOf(ranges, prim);
+  var prim = ranges[primIndex]
+  ranges.sort(function(a, b) { return cmp(a.from(), b.from()) })
+  primIndex = indexOf(ranges, prim)
   for (var i = 1; i < ranges.length; i++) {
-    var cur = ranges[i], prev = ranges[i - 1];
+    var cur = ranges[i], prev = ranges[i - 1]
     if (cmp(prev.to(), cur.from()) >= 0) {
-      var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
-      var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
-      if (i <= primIndex) --primIndex;
-      ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
+      var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to())
+      var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head
+      if (i <= primIndex) --primIndex
+      ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to))
     }
   }
-  return new Selection(ranges, primIndex);
+  return new Selection(ranges, primIndex)
 }
 
 export function simpleSelection(anchor, head) {
-  return new Selection([new Range(anchor, head || anchor)], 0);
+  return new Selection([new Range(anchor, head || anchor)], 0)
 }
diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index e105afa9e0..640af1f249 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -1,12 +1,12 @@
-import { signalLater } from "../util/operation_group";
-import { ensureCursorVisible } from "../display/scrolling";
-import { clipPos, cmp, Pos } from "../line/pos";
-import { getLine } from "../line/utils_line";
-import { hasHandler, signal, signalCursorActivity } from "../util/event";
-import { lst, sel_dontScroll } from "../util/misc";
+import { signalLater } from "../util/operation_group"
+import { ensureCursorVisible } from "../display/scrolling"
+import { clipPos, cmp, Pos } from "../line/pos"
+import { getLine } from "../line/utils_line"
+import { hasHandler, signal, signalCursorActivity } from "../util/event"
+import { lst, sel_dontScroll } from "../util/misc"
 
-import { addSelectionToHistory } from "./history";
-import { normalizeSelection, Range, Selection, simpleSelection } from "./selection";
+import { addSelectionToHistory } from "./history"
+import { normalizeSelection, Range, Selection, simpleSelection } from "./selection"
 
 // The 'scroll' parameter given to many of these indicated whether
 // the new cursor position should be scrolled into view after
@@ -18,46 +18,46 @@ import { normalizeSelection, Range, Selection, simpleSelection } from "./selecti
 // Used for cursor motion and such.
 export function extendRange(doc, range, head, other) {
   if (doc.cm && doc.cm.display.shift || doc.extend) {
-    var anchor = range.anchor;
+    var anchor = range.anchor
     if (other) {
-      var posBefore = cmp(head, anchor) < 0;
+      var posBefore = cmp(head, anchor) < 0
       if (posBefore != (cmp(other, anchor) < 0)) {
-        anchor = head;
-        head = other;
+        anchor = head
+        head = other
       } else if (posBefore != (cmp(head, other) < 0)) {
-        head = other;
+        head = other
       }
     }
-    return new Range(anchor, head);
+    return new Range(anchor, head)
   } else {
-    return new Range(other || head, head);
+    return new Range(other || head, head)
   }
 }
 
 // Extend the primary selection range, discard the rest.
 export function extendSelection(doc, head, other, options) {
-  setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options);
+  setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options)
 }
 
 // Extend all selections (pos is an array of selections with length
 // equal the number of selections)
 export function extendSelections(doc, heads, options) {
   for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
-    out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
-  var newSel = normalizeSelection(out, doc.sel.primIndex);
-  setSelection(doc, newSel, options);
+    out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null)
+  var newSel = normalizeSelection(out, doc.sel.primIndex)
+  setSelection(doc, newSel, options)
 }
 
 // Updates a single range in the selection.
 export function replaceOneSelection(doc, i, range, options) {
-  var ranges = doc.sel.ranges.slice(0);
-  ranges[i] = range;
-  setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options);
+  var ranges = doc.sel.ranges.slice(0)
+  ranges[i] = range
+  setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options)
 }
 
 // Reset the selection to a single range.
 export function setSimpleSelection(doc, anchor, head, options) {
-  setSelection(doc, simpleSelection(anchor, head), options);
+  setSelection(doc, simpleSelection(anchor, head), options)
 }
 
 // Give beforeSelectionChange handlers a change to influence a
@@ -66,140 +66,140 @@ function filterSelectionChange(doc, sel, options) {
   var obj = {
     ranges: sel.ranges,
     update: function(ranges) {
-      this.ranges = [];
+      this.ranges = []
       for (var i = 0; i < ranges.length; i++)
         this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
-                                   clipPos(doc, ranges[i].head));
+                                   clipPos(doc, ranges[i].head))
     },
     origin: options && options.origin
-  };
-  signal(doc, "beforeSelectionChange", doc, obj);
-  if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
-  if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1);
-  else return sel;
+  }
+  signal(doc, "beforeSelectionChange", doc, obj)
+  if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj)
+  if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1)
+  else return sel
 }
 
 export function setSelectionReplaceHistory(doc, sel, options) {
-  var done = doc.history.done, last = lst(done);
+  var done = doc.history.done, last = lst(done)
   if (last && last.ranges) {
-    done[done.length - 1] = sel;
-    setSelectionNoUndo(doc, sel, options);
+    done[done.length - 1] = sel
+    setSelectionNoUndo(doc, sel, options)
   } else {
-    setSelection(doc, sel, options);
+    setSelection(doc, sel, options)
   }
 }
 
 // Set a new selection.
 export function setSelection(doc, sel, options) {
-  setSelectionNoUndo(doc, sel, options);
-  addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
+  setSelectionNoUndo(doc, sel, options)
+  addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options)
 }
 
 export function setSelectionNoUndo(doc, sel, options) {
   if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-    sel = filterSelectionChange(doc, sel, options);
+    sel = filterSelectionChange(doc, sel, options)
 
   var bias = options && options.bias ||
-    (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
-  setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
+    (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1)
+  setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true))
 
   if (!(options && options.scroll === false) && doc.cm)
-    ensureCursorVisible(doc.cm);
+    ensureCursorVisible(doc.cm)
 }
 
 function setSelectionInner(doc, sel) {
-  if (sel.equals(doc.sel)) return;
+  if (sel.equals(doc.sel)) return
 
-  doc.sel = sel;
+  doc.sel = sel
 
   if (doc.cm) {
-    doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;
-    signalCursorActivity(doc.cm);
+    doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true
+    signalCursorActivity(doc.cm)
   }
-  signalLater(doc, "cursorActivity", doc);
+  signalLater(doc, "cursorActivity", doc)
 }
 
 // Verify that the selection does not partially select any atomic
 // marked ranges.
 export function reCheckSelection(doc) {
-  setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll);
+  setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll)
 }
 
 // Return a selection that does not partially select any atomic
 // ranges.
 function skipAtomicInSelection(doc, sel, bias, mayClear) {
-  var out;
+  var out
   for (var i = 0; i < sel.ranges.length; i++) {
-    var range = sel.ranges[i];
-    var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
-    var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
-    var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
+    var range = sel.ranges[i]
+    var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i]
+    var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear)
+    var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear)
     if (out || newAnchor != range.anchor || newHead != range.head) {
-      if (!out) out = sel.ranges.slice(0, i);
-      out[i] = new Range(newAnchor, newHead);
+      if (!out) out = sel.ranges.slice(0, i)
+      out[i] = new Range(newAnchor, newHead)
     }
   }
-  return out ? normalizeSelection(out, sel.primIndex) : sel;
+  return out ? normalizeSelection(out, sel.primIndex) : sel
 }
 
 function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
-  var line = getLine(doc, pos.line);
+  var line = getLine(doc, pos.line)
   if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-    var sp = line.markedSpans[i], m = sp.marker;
+    var sp = line.markedSpans[i], m = sp.marker
     if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
         (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
       if (mayClear) {
-        signal(m, "beforeCursorEnter");
+        signal(m, "beforeCursorEnter")
         if (m.explicitlyCleared) {
-          if (!line.markedSpans) break;
-          else {--i; continue;}
+          if (!line.markedSpans) break
+          else {--i; continue}
         }
       }
-      if (!m.atomic) continue;
+      if (!m.atomic) continue
 
       if (oldPos) {
-        var near = m.find(dir < 0 ? 1 : -1), diff;
+        var near = m.find(dir < 0 ? 1 : -1), diff
         if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
-          near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null);
+          near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null)
         if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
-          return skipAtomicInner(doc, near, pos, dir, mayClear);
+          return skipAtomicInner(doc, near, pos, dir, mayClear)
       }
 
-      var far = m.find(dir < 0 ? -1 : 1);
+      var far = m.find(dir < 0 ? -1 : 1)
       if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
-        far = movePos(doc, far, dir, far.line == pos.line ? line : null);
-      return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
+        far = movePos(doc, far, dir, far.line == pos.line ? line : null)
+      return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
     }
   }
-  return pos;
+  return pos
 }
 
 // Ensure a given position is not inside an atomic range.
 export function skipAtomic(doc, pos, oldPos, bias, mayClear) {
-  var dir = bias || 1;
+  var dir = bias || 1
   var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
       (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
       skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
-      (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
+      (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true))
   if (!found) {
-    doc.cantEdit = true;
-    return Pos(doc.first, 0);
+    doc.cantEdit = true
+    return Pos(doc.first, 0)
   }
-  return found;
+  return found
 }
 
 function movePos(doc, pos, dir, line) {
   if (dir < 0 && pos.ch == 0) {
-    if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1));
-    else return null;
+    if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1))
+    else return null
   } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
-    if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0);
-    else return null;
+    if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0)
+    else return null
   } else {
-    return new Pos(pos.line, pos.ch + dir);
+    return new Pos(pos.line, pos.ch + dir)
   }
 }
 
 export function selectAll(cm) {
-  cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);
+  cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll)
 }
diff --git a/src/modes.js b/src/modes.js
index ed5e918039..15d16cefcb 100644
--- a/src/modes.js
+++ b/src/modes.js
@@ -1,95 +1,95 @@
-import { copyObj, createObj } from "./util/misc";
+import { copyObj, createObj } from "./util/misc"
 
 // Known modes, by name and by MIME
-export var modes = {}, mimeModes = {};
+export var modes = {}, mimeModes = {}
 
 // Extra arguments are stored as the mode's dependencies, which is
 // used by (legacy) mechanisms like loadmode.js to automatically
 // load a mode. (Preferred mechanism is the require/define calls.)
 export function defineMode(name, mode) {
   if (arguments.length > 2)
-    mode.dependencies = Array.prototype.slice.call(arguments, 2);
-  modes[name] = mode;
+    mode.dependencies = Array.prototype.slice.call(arguments, 2)
+  modes[name] = mode
 }
 
 export function defineMIME(mime, spec) {
-  mimeModes[mime] = spec;
+  mimeModes[mime] = spec
 }
 
 // Given a MIME type, a {name, ...options} config object, or a name
 // string, return a mode config object.
 export function resolveMode(spec) {
   if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-    spec = mimeModes[spec];
+    spec = mimeModes[spec]
   } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-    var found = mimeModes[spec.name];
-    if (typeof found == "string") found = {name: found};
-    spec = createObj(found, spec);
-    spec.name = found.name;
+    var found = mimeModes[spec.name]
+    if (typeof found == "string") found = {name: found}
+    spec = createObj(found, spec)
+    spec.name = found.name
   } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
-    return resolveMode("application/xml");
+    return resolveMode("application/xml")
   } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+json$/.test(spec)) {
-    return resolveMode("application/json");
+    return resolveMode("application/json")
   }
-  if (typeof spec == "string") return {name: spec};
-  else return spec || {name: "null"};
+  if (typeof spec == "string") return {name: spec}
+  else return spec || {name: "null"}
 }
 
 // Given a mode spec (anything that resolveMode accepts), find and
 // initialize an actual mode object.
 export function getMode(options, spec) {
-  var spec = resolveMode(spec);
-  var mfactory = modes[spec.name];
-  if (!mfactory) return getMode(options, "text/plain");
-  var modeObj = mfactory(options, spec);
+  var spec = resolveMode(spec)
+  var mfactory = modes[spec.name]
+  if (!mfactory) return getMode(options, "text/plain")
+  var modeObj = mfactory(options, spec)
   if (modeExtensions.hasOwnProperty(spec.name)) {
-    var exts = modeExtensions[spec.name];
+    var exts = modeExtensions[spec.name]
     for (var prop in exts) {
-      if (!exts.hasOwnProperty(prop)) continue;
-      if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
-      modeObj[prop] = exts[prop];
+      if (!exts.hasOwnProperty(prop)) continue
+      if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop]
+      modeObj[prop] = exts[prop]
     }
   }
-  modeObj.name = spec.name;
-  if (spec.helperType) modeObj.helperType = spec.helperType;
+  modeObj.name = spec.name
+  if (spec.helperType) modeObj.helperType = spec.helperType
   if (spec.modeProps) for (var prop in spec.modeProps)
-    modeObj[prop] = spec.modeProps[prop];
+    modeObj[prop] = spec.modeProps[prop]
 
-  return modeObj;
+  return modeObj
 }
 
 // This can be used to attach properties to mode objects from
 // outside the actual mode definition.
-export var modeExtensions = {};
+export var modeExtensions = {}
 export function extendMode(mode, properties) {
-  var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-  copyObj(properties, exts);
+  var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {})
+  copyObj(properties, exts)
 }
 
 export function copyState(mode, state) {
-  if (state === true) return state;
-  if (mode.copyState) return mode.copyState(state);
-  var nstate = {};
+  if (state === true) return state
+  if (mode.copyState) return mode.copyState(state)
+  var nstate = {}
   for (var n in state) {
-    var val = state[n];
-    if (val instanceof Array) val = val.concat([]);
-    nstate[n] = val;
+    var val = state[n]
+    if (val instanceof Array) val = val.concat([])
+    nstate[n] = val
   }
-  return nstate;
+  return nstate
 }
 
 // Given a mode and a state (for that mode), find the inner mode and
 // state at the position that the state refers to.
 export function innerMode(mode, state) {
   while (mode.innerMode) {
-    var info = mode.innerMode(state);
-    if (!info || info.mode == mode) break;
-    state = info.state;
-    mode = info.mode;
+    var info = mode.innerMode(state)
+    if (!info || info.mode == mode) break
+    state = info.state
+    mode = info.mode
   }
-  return info || {mode: mode, state: state};
+  return info || {mode: mode, state: state}
 }
 
 export function startState(mode, a1, a2) {
-  return mode.startState ? mode.startState(a1, a2) : true;
+  return mode.startState ? mode.startState(a1, a2) : true
 }
diff --git a/src/util/StringStream.js b/src/util/StringStream.js
index f07357befc..d04807426c 100644
--- a/src/util/StringStream.js
+++ b/src/util/StringStream.js
@@ -1,4 +1,4 @@
-import { countColumn } from "./misc";
+import { countColumn } from "./misc"
 
 // STRING STREAM
 
@@ -6,75 +6,75 @@ import { countColumn } from "./misc";
 // parsers more succinct.
 
 var StringStream = function(string, tabSize) {
-  this.pos = this.start = 0;
-  this.string = string;
-  this.tabSize = tabSize || 8;
-  this.lastColumnPos = this.lastColumnValue = 0;
-  this.lineStart = 0;
-};
+  this.pos = this.start = 0
+  this.string = string
+  this.tabSize = tabSize || 8
+  this.lastColumnPos = this.lastColumnValue = 0
+  this.lineStart = 0
+}
 
 StringStream.prototype = {
-  eol: function() {return this.pos >= this.string.length;},
-  sol: function() {return this.pos == this.lineStart;},
-  peek: function() {return this.string.charAt(this.pos) || undefined;},
+  eol: function() {return this.pos >= this.string.length},
+  sol: function() {return this.pos == this.lineStart},
+  peek: function() {return this.string.charAt(this.pos) || undefined},
   next: function() {
     if (this.pos < this.string.length)
-      return this.string.charAt(this.pos++);
+      return this.string.charAt(this.pos++)
   },
   eat: function(match) {
-    var ch = this.string.charAt(this.pos);
-    if (typeof match == "string") var ok = ch == match;
-    else var ok = ch && (match.test ? match.test(ch) : match(ch));
-    if (ok) {++this.pos; return ch;}
+    var ch = this.string.charAt(this.pos)
+    if (typeof match == "string") var ok = ch == match
+    else var ok = ch && (match.test ? match.test(ch) : match(ch))
+    if (ok) {++this.pos; return ch}
   },
   eatWhile: function(match) {
-    var start = this.pos;
+    var start = this.pos
     while (this.eat(match)){}
-    return this.pos > start;
+    return this.pos > start
   },
   eatSpace: function() {
-    var start = this.pos;
-    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-    return this.pos > start;
+    var start = this.pos
+    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos
+    return this.pos > start
   },
-  skipToEnd: function() {this.pos = this.string.length;},
+  skipToEnd: function() {this.pos = this.string.length},
   skipTo: function(ch) {
-    var found = this.string.indexOf(ch, this.pos);
-    if (found > -1) {this.pos = found; return true;}
+    var found = this.string.indexOf(ch, this.pos)
+    if (found > -1) {this.pos = found; return true}
   },
-  backUp: function(n) {this.pos -= n;},
+  backUp: function(n) {this.pos -= n},
   column: function() {
     if (this.lastColumnPos < this.start) {
-      this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
-      this.lastColumnPos = this.start;
+      this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue)
+      this.lastColumnPos = this.start
     }
-    return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
+    return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
   },
   indentation: function() {
     return countColumn(this.string, null, this.tabSize) -
-      (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
+      (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
   },
   match: function(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
-      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-      var substr = this.string.substr(this.pos, pattern.length);
+      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str}
+      var substr = this.string.substr(this.pos, pattern.length)
       if (cased(substr) == cased(pattern)) {
-        if (consume !== false) this.pos += pattern.length;
-        return true;
+        if (consume !== false) this.pos += pattern.length
+        return true
       }
     } else {
-      var match = this.string.slice(this.pos).match(pattern);
-      if (match && match.index > 0) return null;
-      if (match && consume !== false) this.pos += match[0].length;
-      return match;
+      var match = this.string.slice(this.pos).match(pattern)
+      if (match && match.index > 0) return null
+      if (match && consume !== false) this.pos += match[0].length
+      return match
     }
   },
-  current: function(){return this.string.slice(this.start, this.pos);},
+  current: function(){return this.string.slice(this.start, this.pos)},
   hideFirstChars: function(n, inner) {
-    this.lineStart += n;
-    try { return inner(); }
-    finally { this.lineStart -= n; }
+    this.lineStart += n
+    try { return inner() }
+    finally { this.lineStart -= n }
   }
-};
+}
 
-export default StringStream;
+export default StringStream
diff --git a/src/util/bidi.js b/src/util/bidi.js
index 776319d022..f12dccf50b 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -1,63 +1,63 @@
-import { isExtendingChar, lst } from "./misc";
+import { isExtendingChar, lst } from "./misc"
 
 // BIDI HELPERS
 
 export function iterateBidiSections(order, from, to, f) {
-  if (!order) return f(from, to, "ltr");
-  var found = false;
+  if (!order) return f(from, to, "ltr")
+  var found = false
   for (var i = 0; i < order.length; ++i) {
-    var part = order[i];
+    var part = order[i]
     if (part.from < to && part.to > from || from == to && part.to == from) {
-      f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
-      found = true;
+      f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr")
+      found = true
     }
   }
-  if (!found) f(from, to, "ltr");
+  if (!found) f(from, to, "ltr")
 }
 
-export function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
-export function bidiRight(part) { return part.level % 2 ? part.from : part.to; }
+export function bidiLeft(part) { return part.level % 2 ? part.to : part.from }
+export function bidiRight(part) { return part.level % 2 ? part.from : part.to }
 
-export function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; }
+export function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0 }
 export function lineRight(line) {
-  var order = getOrder(line);
-  if (!order) return line.text.length;
-  return bidiRight(lst(order));
+  var order = getOrder(line)
+  if (!order) return line.text.length
+  return bidiRight(lst(order))
 }
 
 function compareBidiLevel(order, a, b) {
-  var linedir = order[0].level;
-  if (a == linedir) return true;
-  if (b == linedir) return false;
-  return a < b;
+  var linedir = order[0].level
+  if (a == linedir) return true
+  if (b == linedir) return false
+  return a < b
 }
 
-export var bidiOther = null;
+export var bidiOther = null
 export function getBidiPartAt(order, pos) {
-  bidiOther = null;
+  bidiOther = null
   for (var i = 0, found; i < order.length; ++i) {
-    var cur = order[i];
-    if (cur.from < pos && cur.to > pos) return i;
+    var cur = order[i]
+    if (cur.from < pos && cur.to > pos) return i
     if ((cur.from == pos || cur.to == pos)) {
       if (found == null) {
-        found = i;
+        found = i
       } else if (compareBidiLevel(order, cur.level, order[found].level)) {
-        if (cur.from != cur.to) bidiOther = found;
-        return i;
+        if (cur.from != cur.to) bidiOther = found
+        return i
       } else {
-        if (cur.from != cur.to) bidiOther = i;
-        return found;
+        if (cur.from != cur.to) bidiOther = i
+        return found
       }
     }
   }
-  return found;
+  return found
 }
 
 function moveInLine(line, pos, dir, byUnit) {
-  if (!byUnit) return pos + dir;
-  do pos += dir;
-  while (pos > 0 && isExtendingChar(line.text.charAt(pos)));
-  return pos;
+  if (!byUnit) return pos + dir
+  do pos += dir
+  while (pos > 0 && isExtendingChar(line.text.charAt(pos)))
+  return pos
 }
 
 // This is needed in order to move 'visually' through bi-directional
@@ -66,32 +66,32 @@ function moveInLine(line, pos, dir, byUnit) {
 // LTR text touch each other. This often requires the cursor offset
 // to move more than one unit, in order to visually move one unit.
 export function moveVisually(line, start, dir, byUnit) {
-  var bidi = getOrder(line);
-  if (!bidi) return moveLogically(line, start, dir, byUnit);
-  var pos = getBidiPartAt(bidi, start), part = bidi[pos];
-  var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit);
+  var bidi = getOrder(line)
+  if (!bidi) return moveLogically(line, start, dir, byUnit)
+  var pos = getBidiPartAt(bidi, start), part = bidi[pos]
+  var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit)
 
   for (;;) {
-    if (target > part.from && target < part.to) return target;
+    if (target > part.from && target < part.to) return target
     if (target == part.from || target == part.to) {
-      if (getBidiPartAt(bidi, target) == pos) return target;
-      part = bidi[pos += dir];
-      return (dir > 0) == part.level % 2 ? part.to : part.from;
+      if (getBidiPartAt(bidi, target) == pos) return target
+      part = bidi[pos += dir]
+      return (dir > 0) == part.level % 2 ? part.to : part.from
     } else {
-      part = bidi[pos += dir];
-      if (!part) return null;
+      part = bidi[pos += dir]
+      if (!part) return null
       if ((dir > 0) == part.level % 2)
-        target = moveInLine(line, part.to, -1, byUnit);
+        target = moveInLine(line, part.to, -1, byUnit)
       else
-        target = moveInLine(line, part.from, 1, byUnit);
+        target = moveInLine(line, part.from, 1, byUnit)
     }
   }
 }
 
 export function moveLogically(line, start, dir, byUnit) {
-  var target = start + dir;
-  if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir;
-  return target < 0 || target > line.text.length ? null : target;
+  var target = start + dir
+  if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir
+  return target < 0 || target > line.text.length ? null : target
 }
 
 // Bidirectional ordering algorithm
@@ -119,43 +119,43 @@ export function moveLogically(line, start, dir, byUnit) {
 // objects) in the order in which they occur visually.
 export var bidiOrdering = (function() {
   // Character types for codepoints 0 to 0xff
-  var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
+  var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"
   // Character types for codepoints 0x600 to 0x6ff
-  var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm";
+  var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm"
   function charType(code) {
-    if (code <= 0xf7) return lowTypes.charAt(code);
-    else if (0x590 <= code && code <= 0x5f4) return "R";
-    else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600);
-    else if (0x6ee <= code && code <= 0x8ac) return "r";
-    else if (0x2000 <= code && code <= 0x200b) return "w";
-    else if (code == 0x200c) return "b";
-    else return "L";
+    if (code <= 0xf7) return lowTypes.charAt(code)
+    else if (0x590 <= code && code <= 0x5f4) return "R"
+    else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600)
+    else if (0x6ee <= code && code <= 0x8ac) return "r"
+    else if (0x2000 <= code && code <= 0x200b) return "w"
+    else if (code == 0x200c) return "b"
+    else return "L"
   }
 
-  var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
-  var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
+  var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/
+  var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/
   // Browsers seem to always treat the boundaries of block elements as being L.
-  var outerType = "L";
+  var outerType = "L"
 
   function BidiSpan(level, from, to) {
-    this.level = level;
-    this.from = from; this.to = to;
+    this.level = level
+    this.from = from; this.to = to
   }
 
   return function(str) {
-    if (!bidiRE.test(str)) return false;
-    var len = str.length, types = [];
+    if (!bidiRE.test(str)) return false
+    var len = str.length, types = []
     for (var i = 0, type; i < len; ++i)
-      types.push(type = charType(str.charCodeAt(i)));
+      types.push(type = charType(str.charCodeAt(i)))
 
     // W1. Examine each non-spacing mark (NSM) in the level run, and
     // change the type of the NSM to the type of the previous
     // character. If the NSM is at the start of the level run, it will
     // get the type of sor.
     for (var i = 0, prev = outerType; i < len; ++i) {
-      var type = types[i];
-      if (type == "m") types[i] = prev;
-      else prev = type;
+      var type = types[i]
+      if (type == "m") types[i] = prev
+      else prev = type
     }
 
     // W2. Search backwards from each instance of a European number
@@ -164,20 +164,20 @@ export var bidiOrdering = (function() {
     // number.
     // W3. Change all ALs to R.
     for (var i = 0, cur = outerType; i < len; ++i) {
-      var type = types[i];
-      if (type == "1" && cur == "r") types[i] = "n";
-      else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R"; }
+      var type = types[i]
+      if (type == "1" && cur == "r") types[i] = "n"
+      else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R" }
     }
 
     // W4. A single European separator between two European numbers
     // changes to a European number. A single common separator between
     // two numbers of the same type changes to that type.
     for (var i = 1, prev = types[0]; i < len - 1; ++i) {
-      var type = types[i];
-      if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1";
+      var type = types[i]
+      if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1"
       else if (type == "," && prev == types[i+1] &&
-               (prev == "1" || prev == "n")) types[i] = prev;
-      prev = type;
+               (prev == "1" || prev == "n")) types[i] = prev
+      prev = type
     }
 
     // W5. A sequence of European terminators adjacent to European
@@ -185,13 +185,13 @@ export var bidiOrdering = (function() {
     // W6. Otherwise, separators and terminators change to Other
     // Neutral.
     for (var i = 0; i < len; ++i) {
-      var type = types[i];
-      if (type == ",") types[i] = "N";
+      var type = types[i]
+      if (type == ",") types[i] = "N"
       else if (type == "%") {
         for (var end = i + 1; end < len && types[end] == "%"; ++end) {}
-        var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
-        for (var j = i; j < end; ++j) types[j] = replace;
-        i = end - 1;
+        var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N"
+        for (var j = i; j < end; ++j) types[j] = replace
+        i = end - 1
       }
     }
 
@@ -199,9 +199,9 @@ export var bidiOrdering = (function() {
     // until the first strong type (R, L, or sor) is found. If an L is
     // found, then change the type of the European number to L.
     for (var i = 0, cur = outerType; i < len; ++i) {
-      var type = types[i];
-      if (cur == "L" && type == "1") types[i] = "L";
-      else if (isStrong.test(type)) cur = type;
+      var type = types[i]
+      if (cur == "L" && type == "1") types[i] = "L"
+      else if (isStrong.test(type)) cur = type
     }
 
     // N1. A sequence of neutrals takes the direction of the
@@ -213,11 +213,11 @@ export var bidiOrdering = (function() {
     for (var i = 0; i < len; ++i) {
       if (isNeutral.test(types[i])) {
         for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
-        var before = (i ? types[i-1] : outerType) == "L";
-        var after = (end < len ? types[end] : outerType) == "L";
-        var replace = before || after ? "L" : "R";
-        for (var j = i; j < end; ++j) types[j] = replace;
-        i = end - 1;
+        var before = (i ? types[i-1] : outerType) == "L"
+        var after = (end < len ? types[end] : outerType) == "L"
+        var replace = before || after ? "L" : "R"
+        for (var j = i; j < end; ++j) types[j] = replace
+        i = end - 1
       }
     }
 
@@ -226,49 +226,49 @@ export var bidiOrdering = (function() {
     // levels (0, 1, 2) in an implementation that doesn't take
     // explicit embedding into account, we can build up the order on
     // the fly, without following the level-based algorithm.
-    var order = [], m;
+    var order = [], m
     for (var i = 0; i < len;) {
       if (countsAsLeft.test(types[i])) {
-        var start = i;
+        var start = i
         for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
-        order.push(new BidiSpan(0, start, i));
+        order.push(new BidiSpan(0, start, i))
       } else {
-        var pos = i, at = order.length;
+        var pos = i, at = order.length
         for (++i; i < len && types[i] != "L"; ++i) {}
         for (var j = pos; j < i;) {
           if (countsAsNum.test(types[j])) {
-            if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j));
-            var nstart = j;
+            if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j))
+            var nstart = j
             for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
-            order.splice(at, 0, new BidiSpan(2, nstart, j));
-            pos = j;
-          } else ++j;
+            order.splice(at, 0, new BidiSpan(2, nstart, j))
+            pos = j
+          } else ++j
         }
-        if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i));
+        if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i))
       }
     }
     if (order[0].level == 1 && (m = str.match(/^\s+/))) {
-      order[0].from = m[0].length;
-      order.unshift(new BidiSpan(0, 0, m[0].length));
+      order[0].from = m[0].length
+      order.unshift(new BidiSpan(0, 0, m[0].length))
     }
     if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
-      lst(order).to -= m[0].length;
-      order.push(new BidiSpan(0, len - m[0].length, len));
+      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));
+      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));
+      order.push(new BidiSpan(order[0].level, len, len))
 
-    return order;
-  };
-})();
+    return order
+  }
+})()
 
 // Get the bidi ordering for the given line (and cache it). Returns
 // false for lines that are fully left-to-right, and an array of
 // BidiSpan objects otherwise.
 export function getOrder(line) {
-  var order = line.order;
-  if (order == null) order = line.order = bidiOrdering(line.text);
-  return order;
+  var order = line.order
+  if (order == null) order = line.order = bidiOrdering(line.text)
+  return order
 }
diff --git a/src/util/browser.js b/src/util/browser.js
index 7941f930d7..ae48fb5c65 100644
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -1,31 +1,31 @@
 // Kludges for bugs and behavior differences that can't be feature
 // detected are enabled based on userAgent etc sniffing.
-var userAgent = navigator.userAgent;
-var platform = navigator.platform;
+var userAgent = navigator.userAgent
+var platform = navigator.platform
 
-export var gecko = /gecko\/\d/i.test(userAgent);
-var ie_upto10 = /MSIE \d/.test(userAgent);
-var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
-export var ie = ie_upto10 || ie_11up;
-export var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
-export var webkit = /WebKit\//.test(userAgent);
-var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
-export var chrome = /Chrome\//.test(userAgent);
-export var presto = /Opera\//.test(userAgent);
-export var safari = /Apple Computer/.test(navigator.vendor);
-export var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
-export var phantom = /PhantomJS/.test(userAgent);
+export var gecko = /gecko\/\d/i.test(userAgent)
+var ie_upto10 = /MSIE \d/.test(userAgent)
+var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent)
+export var ie = ie_upto10 || ie_11up
+export var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1])
+export var webkit = /WebKit\//.test(userAgent)
+var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent)
+export var chrome = /Chrome\//.test(userAgent)
+export var presto = /Opera\//.test(userAgent)
+export var safari = /Apple Computer/.test(navigator.vendor)
+export var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
+export var phantom = /PhantomJS/.test(userAgent)
 
-export var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
+export var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
 // This is woefully incomplete. Suggestions for alternative methods welcome.
-export var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
-export var mac = ios || /Mac/.test(platform);
-export var chromeOS = /\bCrOS\b/.test(userAgent);
-export var windows = /win/i.test(platform);
+export var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
+export var mac = ios || /Mac/.test(platform)
+export var chromeOS = /\bCrOS\b/.test(userAgent)
+export var windows = /win/i.test(platform)
 
-var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
-if (presto_version) presto_version = Number(presto_version[1]);
-if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
+var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/)
+if (presto_version) presto_version = Number(presto_version[1])
+if (presto_version && presto_version >= 15) { presto = false; webkit = true }
 // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-export var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
-export var captureRightClick = gecko || (ie && ie_version >= 9);
+export var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11))
+export var captureRightClick = gecko || (ie && ie_version >= 9)
diff --git a/src/util/dom.js b/src/util/dom.js
index 478402e668..df2cfd0aac 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -1,89 +1,89 @@
-import { ie, ie_version, ios } from "./browser";
+import { ie, ie_version, ios } from "./browser"
 
-export function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
+export function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
 
 export var rmClass = function(node, cls) {
-  var current = node.className;
-  var match = classTest(cls).exec(current);
+  var current = node.className
+  var match = classTest(cls).exec(current)
   if (match) {
-    var after = current.slice(match.index + match[0].length);
-    node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
+    var after = current.slice(match.index + match[0].length)
+    node.className = current.slice(0, match.index) + (after ? match[1] + after : "")
   }
-};
+}
 
 export function removeChildren(e) {
   for (var count = e.childNodes.length; count > 0; --count)
-    e.removeChild(e.firstChild);
-  return e;
+    e.removeChild(e.firstChild)
+  return e
 }
 
 export function removeChildrenAndAdd(parent, e) {
-  return removeChildren(parent).appendChild(e);
+  return removeChildren(parent).appendChild(e)
 }
 
 export function elt(tag, content, className, style) {
-  var e = document.createElement(tag);
-  if (className) e.className = className;
-  if (style) e.style.cssText = style;
-  if (typeof content == "string") e.appendChild(document.createTextNode(content));
-  else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-  return e;
+  var e = document.createElement(tag)
+  if (className) e.className = className
+  if (style) e.style.cssText = style
+  if (typeof content == "string") e.appendChild(document.createTextNode(content))
+  else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i])
+  return e
 }
 
-export var range;
+export var range
 if (document.createRange) range = function(node, start, end, endNode) {
-  var r = document.createRange();
-  r.setEnd(endNode || node, end);
-  r.setStart(node, start);
-  return r;
-};
+  var r = document.createRange()
+  r.setEnd(endNode || node, end)
+  r.setStart(node, start)
+  return r
+}
 else range = function(node, start, end) {
-  var r = document.body.createTextRange();
-  try { r.moveToElementText(node.parentNode); }
-  catch(e) { return r; }
-  r.collapse(true);
-  r.moveEnd("character", end);
-  r.moveStart("character", start);
-  return r;
-};
+  var r = document.body.createTextRange()
+  try { r.moveToElementText(node.parentNode) }
+  catch(e) { return r }
+  r.collapse(true)
+  r.moveEnd("character", end)
+  r.moveStart("character", start)
+  return r
+}
 
 export function contains(parent, child) {
   if (child.nodeType == 3) // Android browser always returns false when child is a textnode
-    child = child.parentNode;
+    child = child.parentNode
   if (parent.contains)
-    return parent.contains(child);
+    return parent.contains(child)
   do {
-    if (child.nodeType == 11) child = child.host;
-    if (child == parent) return true;
-  } while (child = child.parentNode);
+    if (child.nodeType == 11) child = child.host
+    if (child == parent) return true
+  } while (child = child.parentNode)
 }
 
 export var activeElt = function() {
-  var activeElement = document.activeElement;
+  var activeElement = document.activeElement
   while (activeElement && activeElement.root && activeElement.root.activeElement)
-    activeElement = activeElement.root.activeElement;
-  return activeElement;
+    activeElement = activeElement.root.activeElement
+  return activeElement
 }
 // Older versions of IE throws unspecified error when touching
 // document.activeElement in some cases (during loading, in iframe)
 if (ie && ie_version < 11) activeElt = function() {
-  try { return document.activeElement; }
-  catch(e) { return document.body; }
-};
+  try { return document.activeElement }
+  catch(e) { return document.body }
+}
 
 export function addClass(node, cls) {
-  var current = node.className;
-  if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
+  var current = node.className
+  if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls
 }
 export function joinClasses(a, b) {
-  var as = a.split(" ");
+  var as = a.split(" ")
   for (var i = 0; i < as.length; i++)
-    if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i];
-  return b;
+    if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i]
+  return b
 }
 
-export var selectInput = function(node) { node.select(); };
+export var selectInput = function(node) { node.select() }
 if (ios) // Mobile Safari apparently has a bug where select() is broken.
-  selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; };
+  selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length }
 else if (ie) // Suppress mysterious IE10 errors
-  selectInput = function(node) { try { node.select(); } catch(_e) {} };
+  selectInput = function(node) { try { node.select() } catch(_e) {} }
diff --git a/src/util/event.js b/src/util/event.js
index 4c479cbd25..b2137583fb 100644
--- a/src/util/event.js
+++ b/src/util/event.js
@@ -1,5 +1,5 @@
-import { mac } from "./browser";
-import { indexOf } from "./misc";
+import { mac } from "./browser"
+import { indexOf } from "./misc"
 
 // EVENT HANDLING
 
@@ -8,15 +8,15 @@ import { indexOf } from "./misc";
 
 export var on = function(emitter, type, f) {
   if (emitter.addEventListener)
-    emitter.addEventListener(type, f, false);
+    emitter.addEventListener(type, f, false)
   else if (emitter.attachEvent)
-    emitter.attachEvent("on" + type, f);
+    emitter.attachEvent("on" + type, f)
   else {
-    var map = emitter._handlers || (emitter._handlers = {});
-    var arr = map[type] || (map[type] = []);
-    arr.push(f);
+    var map = emitter._handlers || (emitter._handlers = {})
+    var arr = map[type] || (map[type] = [])
+    arr.push(f)
   }
-};
+}
 
 var noHandlers = []
 export function getHandlers(emitter, type, copy) {
@@ -27,21 +27,21 @@ export function getHandlers(emitter, type, copy) {
 
 export function off(emitter, type, f) {
   if (emitter.removeEventListener)
-    emitter.removeEventListener(type, f, false);
+    emitter.removeEventListener(type, f, false)
   else if (emitter.detachEvent)
-    emitter.detachEvent("on" + type, f);
+    emitter.detachEvent("on" + type, f)
   else {
     var handlers = getHandlers(emitter, type, false)
     for (var i = 0; i < handlers.length; ++i)
-      if (handlers[i] == f) { handlers.splice(i, 1); break; }
+      if (handlers[i] == f) { handlers.splice(i, 1); break }
   }
 }
 
 export function signal(emitter, type /*, values...*/) {
   var handlers = getHandlers(emitter, type, true)
-  if (!handlers.length) return;
-  var args = Array.prototype.slice.call(arguments, 2);
-  for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args);
+  if (!handlers.length) return
+  var args = Array.prototype.slice.call(arguments, 2)
+  for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args)
 }
 
 // The DOM events that CodeMirror handles can be overridden by
@@ -49,17 +49,17 @@ export function signal(emitter, type /*, values...*/) {
 // and preventDefault-ing the event in that handler.
 export function signalDOMEvent(cm, e, override) {
   if (typeof e == "string")
-    e = {type: e, preventDefault: function() { this.defaultPrevented = true; }};
-  signal(cm, override || e.type, cm, e);
-  return e_defaultPrevented(e) || e.codemirrorIgnore;
+    e = {type: e, preventDefault: function() { this.defaultPrevented = true }}
+  signal(cm, override || e.type, cm, e)
+  return e_defaultPrevented(e) || e.codemirrorIgnore
 }
 
 export function signalCursorActivity(cm) {
-  var arr = cm._handlers && cm._handlers.cursorActivity;
-  if (!arr) return;
-  var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
+  var arr = cm._handlers && cm._handlers.cursorActivity
+  if (!arr) return
+  var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = [])
   for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1)
-    set.push(arr[i]);
+    set.push(arr[i])
 }
 
 export function hasHandler(emitter, type) {
@@ -69,34 +69,34 @@ export function hasHandler(emitter, type) {
 // Add on and off methods to a constructor's prototype, to make
 // registering events on such objects more convenient.
 export function eventMixin(ctor) {
-  ctor.prototype.on = function(type, f) {on(this, type, f);};
-  ctor.prototype.off = function(type, f) {off(this, type, f);};
+  ctor.prototype.on = function(type, f) {on(this, type, f)}
+  ctor.prototype.off = function(type, f) {off(this, type, f)}
 }
 
 // Due to the fact that we still support jurassic IE versions, some
 // compatibility wrappers are needed.
 
 export function e_preventDefault(e) {
-  if (e.preventDefault) e.preventDefault();
-  else e.returnValue = false;
+  if (e.preventDefault) e.preventDefault()
+  else e.returnValue = false
 }
 export function e_stopPropagation(e) {
-  if (e.stopPropagation) e.stopPropagation();
-  else e.cancelBubble = true;
+  if (e.stopPropagation) e.stopPropagation()
+  else e.cancelBubble = true
 }
 export function e_defaultPrevented(e) {
-  return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;
+  return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false
 }
-export function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);}
+export function e_stop(e) {e_preventDefault(e); e_stopPropagation(e)}
 
-export function e_target(e) {return e.target || e.srcElement;}
+export function e_target(e) {return e.target || e.srcElement}
 export function e_button(e) {
-  var b = e.which;
+  var b = e.which
   if (b == null) {
-    if (e.button & 1) b = 1;
-    else if (e.button & 2) b = 3;
-    else if (e.button & 4) b = 2;
+    if (e.button & 1) b = 1
+    else if (e.button & 2) b = 3
+    else if (e.button & 4) b = 2
   }
-  if (mac && e.ctrlKey && b == 1) b = 3;
-  return b;
+  if (mac && e.ctrlKey && b == 1) b = 3
+  return b
 }
diff --git a/src/util/feature_detection.js b/src/util/feature_detection.js
index bce86ad220..1e9baf41e5 100644
--- a/src/util/feature_detection.js
+++ b/src/util/feature_detection.js
@@ -1,83 +1,83 @@
-import { elt, range, removeChildren, removeChildrenAndAdd } from "./dom";
-import { ie, ie_version } from "./browser";
+import { elt, range, removeChildren, removeChildrenAndAdd } from "./dom"
+import { ie, ie_version } from "./browser"
 
 // Detect drag-and-drop
 export var dragAndDrop = function() {
   // There is *some* kind of drag-and-drop support in IE6-8, but I
   // couldn't get it to work yet.
-  if (ie && ie_version < 9) return false;
-  var div = elt('div');
-  return "draggable" in div || "dragDrop" in div;
-}();
+  if (ie && ie_version < 9) return false
+  var div = elt('div')
+  return "draggable" in div || "dragDrop" in div
+}()
 
-var zwspSupported;
+var zwspSupported
 export function zeroWidthElement(measure) {
   if (zwspSupported == null) {
-    var test = elt("span", "\u200b");
-    removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
+    var test = elt("span", "\u200b")
+    removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]))
     if (measure.firstChild.offsetHeight != 0)
-      zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
+      zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8)
   }
   var node = zwspSupported ? elt("span", "\u200b") :
-    elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
-  node.setAttribute("cm-text", "");
-  return node;
+    elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px")
+  node.setAttribute("cm-text", "")
+  return node
 }
 
 // Feature-detect IE's crummy client rect reporting for bidi text
-var badBidiRects;
+var badBidiRects
 export function hasBadBidiRects(measure) {
-  if (badBidiRects != null) return badBidiRects;
-  var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
-  var r0 = range(txt, 0, 1).getBoundingClientRect();
-  var r1 = range(txt, 1, 2).getBoundingClientRect();
-  removeChildren(measure);
-  if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
-  return badBidiRects = (r1.right - r0.right < 3);
+  if (badBidiRects != null) return badBidiRects
+  var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"))
+  var r0 = range(txt, 0, 1).getBoundingClientRect()
+  var r1 = range(txt, 1, 2).getBoundingClientRect()
+  removeChildren(measure)
+  if (!r0 || r0.left == r0.right) return false // Safari returns null in some cases (#2780)
+  return badBidiRects = (r1.right - r0.right < 3)
 }
 
 // See if "".split is the broken IE version, if so, provide an
 // alternative way to split lines.
 export var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) {
-  var pos = 0, result = [], l = string.length;
+  var pos = 0, result = [], l = string.length
   while (pos <= l) {
-    var nl = string.indexOf("\n", pos);
-    if (nl == -1) nl = string.length;
-    var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
-    var rt = line.indexOf("\r");
+    var nl = string.indexOf("\n", pos)
+    if (nl == -1) nl = string.length
+    var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl)
+    var rt = line.indexOf("\r")
     if (rt != -1) {
-      result.push(line.slice(0, rt));
-      pos += rt + 1;
+      result.push(line.slice(0, rt))
+      pos += rt + 1
     } else {
-      result.push(line);
-      pos = nl + 1;
+      result.push(line)
+      pos = nl + 1
     }
   }
-  return result;
-} : function(string){return string.split(/\r\n?|\n/);};
+  return result
+} : function(string){return string.split(/\r\n?|\n/)}
 
 export var hasSelection = window.getSelection ? function(te) {
-  try { return te.selectionStart != te.selectionEnd; }
-  catch(e) { return false; }
+  try { return te.selectionStart != te.selectionEnd }
+  catch(e) { return false }
 } : function(te) {
-  try {var range = te.ownerDocument.selection.createRange();}
+  try {var range = te.ownerDocument.selection.createRange()}
   catch(e) {}
-  if (!range || range.parentElement() != te) return false;
-  return range.compareEndPoints("StartToEnd", range) != 0;
-};
+  if (!range || range.parentElement() != te) return false
+  return range.compareEndPoints("StartToEnd", range) != 0
+}
 
 export var hasCopyEvent = (function() {
-  var e = elt("div");
-  if ("oncopy" in e) return true;
-  e.setAttribute("oncopy", "return;");
-  return typeof e.oncopy == "function";
-})();
+  var e = elt("div")
+  if ("oncopy" in e) return true
+  e.setAttribute("oncopy", "return;")
+  return typeof e.oncopy == "function"
+})()
 
-var badZoomedRects = null;
+var badZoomedRects = null
 export function hasBadZoomedRects(measure) {
-  if (badZoomedRects != null) return badZoomedRects;
-  var node = removeChildrenAndAdd(measure, elt("span", "x"));
-  var normal = node.getBoundingClientRect();
-  var fromRange = range(node, 0, 1).getBoundingClientRect();
-  return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1;
+  if (badZoomedRects != null) return badZoomedRects
+  var node = removeChildrenAndAdd(measure, elt("span", "x"))
+  var normal = node.getBoundingClientRect()
+  var fromRange = range(node, 0, 1).getBoundingClientRect()
+  return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1
 }
diff --git a/src/util/misc.js b/src/util/misc.js
index a98a18832b..a6e3340db1 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -1,84 +1,84 @@
 export function bind(f) {
-  var args = Array.prototype.slice.call(arguments, 1);
-  return function(){return f.apply(null, args);};
+  var args = Array.prototype.slice.call(arguments, 1)
+  return function(){return f.apply(null, args)}
 }
 
 export function copyObj(obj, target, overwrite) {
-  if (!target) target = {};
+  if (!target) target = {}
   for (var prop in obj)
     if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
-      target[prop] = obj[prop];
-  return target;
+      target[prop] = obj[prop]
+  return target
 }
 
 // Counts the column offset in a string, taking tabs into account.
 // Used mostly to find indentation.
 export function countColumn(string, end, tabSize, startIndex, startValue) {
   if (end == null) {
-    end = string.search(/[^\s\u00a0]/);
-    if (end == -1) end = string.length;
+    end = string.search(/[^\s\u00a0]/)
+    if (end == -1) end = string.length
   }
   for (var i = startIndex || 0, n = startValue || 0;;) {
-    var nextTab = string.indexOf("\t", i);
+    var nextTab = string.indexOf("\t", i)
     if (nextTab < 0 || nextTab >= end)
-      return n + (end - i);
-    n += nextTab - i;
-    n += tabSize - (n % tabSize);
-    i = nextTab + 1;
+      return n + (end - i)
+    n += nextTab - i
+    n += tabSize - (n % tabSize)
+    i = nextTab + 1
   }
 }
 
-export function Delayed() {this.id = null;}
+export function Delayed() {this.id = null}
 Delayed.prototype.set = function(ms, f) {
-  clearTimeout(this.id);
-  this.id = setTimeout(f, ms);
-};
+  clearTimeout(this.id)
+  this.id = setTimeout(f, ms)
+}
 
 export function indexOf(array, elt) {
   for (var i = 0; i < array.length; ++i)
-    if (array[i] == elt) return i;
-  return -1;
+    if (array[i] == elt) return i
+  return -1
 }
 
 // Number of pixels added to scroller and sizer to hide scrollbar
-export var scrollerGap = 30;
+export var scrollerGap = 30
 
 // Returned or thrown by various protocols to signal 'I'm not
 // handling this'.
-export var Pass = {toString: function(){return "CodeMirror.Pass";}};
+export var Pass = {toString: function(){return "CodeMirror.Pass"}}
 
 // Reused option objects for setSelection & friends
-export var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"};
+export var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"}
 
 // The inverse of countColumn -- find the offset that corresponds to
 // a particular column.
 export function findColumn(string, goal, tabSize) {
   for (var pos = 0, col = 0;;) {
-    var nextTab = string.indexOf("\t", pos);
-    if (nextTab == -1) nextTab = string.length;
-    var skipped = nextTab - pos;
+    var nextTab = string.indexOf("\t", pos)
+    if (nextTab == -1) nextTab = string.length
+    var skipped = nextTab - pos
     if (nextTab == string.length || col + skipped >= goal)
-      return pos + Math.min(skipped, goal - col);
-    col += nextTab - pos;
-    col += tabSize - (col % tabSize);
-    pos = nextTab + 1;
-    if (col >= goal) return pos;
+      return pos + Math.min(skipped, goal - col)
+    col += nextTab - pos
+    col += tabSize - (col % tabSize)
+    pos = nextTab + 1
+    if (col >= goal) return pos
   }
 }
 
-var spaceStrs = [""];
+var spaceStrs = [""]
 export function spaceStr(n) {
   while (spaceStrs.length <= n)
-    spaceStrs.push(lst(spaceStrs) + " ");
-  return spaceStrs[n];
+    spaceStrs.push(lst(spaceStrs) + " ")
+  return spaceStrs[n]
 }
 
-export function lst(arr) { return arr[arr.length-1]; }
+export function lst(arr) { return arr[arr.length-1] }
 
 export function map(array, f) {
-  var out = [];
-  for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
-  return out;
+  var out = []
+  for (var i = 0; i < array.length; i++) out[i] = f(array[i], i)
+  return out
 }
 
 export function insertSorted(array, value, score) {
@@ -90,31 +90,31 @@ export function insertSorted(array, value, score) {
 export function nothing() {}
 
 export function createObj(base, props) {
-  var inst;
+  var inst
   if (Object.create) {
-    inst = Object.create(base);
+    inst = Object.create(base)
   } else {
-    nothing.prototype = base;
-    inst = new nothing();
+    nothing.prototype = base
+    inst = new nothing()
   }
-  if (props) copyObj(props, inst);
-  return inst;
+  if (props) copyObj(props, inst)
+  return inst
 }
 
-var nonASCIISingleCaseWordChar = /[\u00df\u0587\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]/
 export function isWordCharBasic(ch) {
   return /\w/.test(ch) || ch > "\x80" &&
-    (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
+    (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch))
 }
 export function isWordChar(ch, helper) {
-  if (!helper) return isWordCharBasic(ch);
-  if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true;
-  return helper.test(ch);
+  if (!helper) return isWordCharBasic(ch)
+  if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true
+  return helper.test(ch)
 }
 
 export function isEmpty(obj) {
-  for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false;
-  return true;
+  for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false
+  return true
 }
 
 // Extending unicode characters. A series of a non-extending char +
@@ -122,5 +122,5 @@ export function isEmpty(obj) {
 // as editing and measuring is concerned. This is not fully correct,
 // since some scripts/fonts/browsers also treat other configurations
 // of code points as a group.
-var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
-export function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); }
+var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
+export function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
diff --git a/src/util/operation_group.js b/src/util/operation_group.js
index 478f07283e..d48f6eb32a 100644
--- a/src/util/operation_group.js
+++ b/src/util/operation_group.js
@@ -1,46 +1,46 @@
-import { getHandlers } from "./event";
+import { getHandlers } from "./event"
 
-var operationGroup = null;
+var operationGroup = null
 
 export function pushOperation(op) {
   if (operationGroup) {
-    operationGroup.ops.push(op);
+    operationGroup.ops.push(op)
   } else {
     op.ownsGroup = operationGroup = {
       ops: [op],
       delayedCallbacks: []
-    };
+    }
   }
 }
 
 function fireCallbacksForOps(group) {
   // Calls delayed callbacks and cursorActivity handlers until no
   // new ones appear
-  var callbacks = group.delayedCallbacks, i = 0;
+  var callbacks = group.delayedCallbacks, i = 0
   do {
     for (; i < callbacks.length; i++)
-      callbacks[i].call(null);
+      callbacks[i].call(null)
     for (var j = 0; j < group.ops.length; j++) {
-      var op = group.ops[j];
+      var op = group.ops[j]
       if (op.cursorActivityHandlers)
         while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
-          op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm);
+          op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm)
     }
-  } while (i < callbacks.length);
+  } while (i < callbacks.length)
 }
 
 export function finishOperation(op, endCb) {
-  var group = op.ownsGroup;
-  if (!group) return;
+  var group = op.ownsGroup
+  if (!group) return
 
-  try { fireCallbacksForOps(group); }
+  try { fireCallbacksForOps(group) }
   finally {
-    operationGroup = null;
-    endCb(group);
+    operationGroup = null
+    endCb(group)
   }
 }
 
-var orphanDelayedCallbacks = null;
+var orphanDelayedCallbacks = null
 
 // Often, we want to signal events at a point where we are in the
 // middle of some work, but don't want the handler to start calling
@@ -51,23 +51,23 @@ var orphanDelayedCallbacks = null;
 // operation is active, when a timeout fires.
 export function signalLater(emitter, type /*, values...*/) {
   var arr = getHandlers(emitter, type, false)
-  if (!arr.length) return;
-  var args = Array.prototype.slice.call(arguments, 2), list;
+  if (!arr.length) return
+  var args = Array.prototype.slice.call(arguments, 2), list
   if (operationGroup) {
-    list = operationGroup.delayedCallbacks;
+    list = operationGroup.delayedCallbacks
   } else if (orphanDelayedCallbacks) {
-    list = orphanDelayedCallbacks;
+    list = orphanDelayedCallbacks
   } else {
-    list = orphanDelayedCallbacks = [];
-    setTimeout(fireOrphanDelayed, 0);
+    list = orphanDelayedCallbacks = []
+    setTimeout(fireOrphanDelayed, 0)
   }
-  function bnd(f) {return function(){f.apply(null, args);};}
+  function bnd(f) {return function(){f.apply(null, args)}}
   for (var i = 0; i < arr.length; ++i)
-    list.push(bnd(arr[i]));
+    list.push(bnd(arr[i]))
 }
 
 function fireOrphanDelayed() {
-  var delayed = orphanDelayedCallbacks;
-  orphanDelayedCallbacks = null;
-  for (var i = 0; i < delayed.length; ++i) delayed[i]();
+  var delayed = orphanDelayedCallbacks
+  orphanDelayedCallbacks = null
+  for (var i = 0; i < delayed.length; ++i) delayed[i]()
 }

From 2182dfd79e92d9370802d39933cfbb446dd60081 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 26 Sep 2016 20:25:10 +0200
Subject: [PATCH 2891/4742] Disallow semicolons in src/

---
 test/lint.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lint.js b/test/lint.js
index 355b3e1c04..cc03ce64c0 100644
--- a/test/lint.js
+++ b/test/lint.js
@@ -11,7 +11,8 @@ var blint = require("blint");
 ["src"].forEach(function(dir) {
   blint.checkDir(dir, {
     browser: true,
-    ecmaVersion: 6
+    ecmaVersion: 6,
+    semicolons: false
   });
 });
 

From 5bb6a94ea4ed91e13ad7918fbde3b5c77df9df81 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 26 Sep 2016 22:30:44 +0200
Subject: [PATCH 2892/4742] Add semicolons to make the linter pass

---
 src/line/line_data.js          | 2 +-
 src/measurement/update_line.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/line/line_data.js b/src/line/line_data.js
index 688aa1bdd2..8b247d5306 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -96,7 +96,7 @@ export function buildLineContent(cm, lineView) {
       lineView.measure.map = builder.map
       lineView.measure.cache = {}
     } else {
-      (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map)
+      ;(lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map)
       ;(lineView.measure.caches || (lineView.measure.caches = [])).push({})
     }
   }
diff --git a/src/measurement/update_line.js b/src/measurement/update_line.js
index a80d8c508c..be94b00940 100644
--- a/src/measurement/update_line.js
+++ b/src/measurement/update_line.js
@@ -172,7 +172,7 @@ function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
 
 function positionLineWidget(widget, node, lineView, dims) {
   if (widget.noHScroll) {
-    (lineView.alignable || (lineView.alignable = [])).push(node)
+    ;(lineView.alignable || (lineView.alignable = [])).push(node)
     var width = dims.wrapperWidth
     node.style.left = dims.fixedPos + "px"
     if (!widget.coverGutter) {

From cae456c7f18711a94e528bded3203efd716597db Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 27 Sep 2016 09:40:33 +0200
Subject: [PATCH 2893/4742] Document the refresh event

---
 doc/manual.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index e97ce07e14..b1377928de 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -634,6 +634,11 @@ <h2>Events</h2>
       <dt id="event_scroll"><code><strong>"scroll"</strong> (instance: CodeMirror)</code></dt>
       <dd>Fires when the editor is scrolled.</dd>
 
+      <dt id="event_resize"><code><strong>"resize"</strong> (instance: CodeMirror)</code></dt>
+      <dd>Fires when the editor is <a href="#refresh">refreshed</a>
+      or <a href="#setSize">resized</a>. Mostly useful to invalidate
+      cached values that depend on the editor or character size.</dd>
+
       <dt id="event_scrollCursorIntoView"><code><strong>"scrollCursorIntoView"</strong> (instance: CodeMirror, event: Event)</code></dt>
       <dd>Fires when the editor tries to scroll its cursor into view.
       Can be hooked into to take care of additional scrollable

From 39ffcd8701c35363ab754b82c3c171913ecf478e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 27 Sep 2016 09:41:45 +0200
Subject: [PATCH 2894/4742] Fix event name in manual

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

diff --git a/doc/manual.html b/doc/manual.html
index b1377928de..65e030c0bf 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -634,7 +634,7 @@ <h2>Events</h2>
       <dt id="event_scroll"><code><strong>"scroll"</strong> (instance: CodeMirror)</code></dt>
       <dd>Fires when the editor is scrolled.</dd>
 
-      <dt id="event_resize"><code><strong>"resize"</strong> (instance: CodeMirror)</code></dt>
+      <dt id="event_refresh"><code><strong>"refresh"</strong> (instance: CodeMirror)</code></dt>
       <dd>Fires when the editor is <a href="#refresh">refreshed</a>
       or <a href="#setSize">resized</a>. Mostly useful to invalidate
       cached values that depend on the editor or character size.</dd>

From 581854eaeb3b3d5ecf4614b7ade0babc5aaa5fe6 Mon Sep 17 00:00:00 2001
From: Apollo Zhu <public-apollonian@outlook.com>
Date: Thu, 29 Sep 2016 01:09:40 -0400
Subject: [PATCH 2895/4742] [swift] Update to Swift3

- remove non-swifty keywords
- remove repeated keywords
- rearrange in more logical way
---
 mode/swift/swift.js | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 3c28ced329..9dcd822e91 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -19,24 +19,21 @@
     return set
   }
 
-  var keywords = wordSet(["var","let","class","deinit","enum","extension","func","import","init","protocol",
-                          "static","struct","subscript","typealias","as","dynamicType","is","new","super",
-                          "self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case",
-                          "continue","default","do","else","fallthrough","if","in","for","return","switch",
-                          "where","while","associativity","didSet","get","infix","inout","left","mutating",
-                          "none","nonmutating","operator","override","postfix","precedence","prefix","right",
-                          "set","unowned","weak","willSet"])
-  var definingKeywords = wordSet(["var","let","class","enum","extension","func","import","protocol","struct",
-                                  "typealias","dynamicType","for"])
-  var atoms = wordSet(["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null",
-                       "this","super"])
-  var types = wordSet(["String","bool","int","string","double","Double","Int","Float","float","public",
-                       "private","extension"])
-  var operators = "+-/*%=|&<>#"
+  var keywords = wordSet(["_","var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype",
+                          "open","public","internal","fileprivate","private","deinit","init","new","override","self","subscript","super",
+                          "convenience","dynamic","final","indirect","lazy","required","static","unowned","unowned(safe)","unowned(unsafe)","weak","as","is",
+                          "break","case","continue","default","else","fallthrough","for","guard","if","in","repeat","switch","where","while",
+                          "defer","return","inout","mutating","nonmutating","catch","do","rethrows","throw","throws","try","didSet","get","set","willSet",
+                          "assignment","associativity","infix","left","none","operator","postfix","precedence","precedencegroup","prefix","right",
+                          "Any","AnyObject","Type","dynamicType","Self","Protocol","__COLUMN__","__FILE__","__FUNCTION__","__LINE__"])
+  var definingKeywords = wordSet(["var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype"])
+  var atoms = wordSet(["true","false","nil","self","super","_"])
+  var types = wordSet(["Array","Bool","Dictionary","Double","Float","Int","Never","Optional","String","Void"])
+  var operators = "+-/*%=|&<>"
   var punc = ";,.(){}[]"
   var number = /^-?(?:(?:[\d_]+\.[_\d]*|\.[_\d]+|0o[0-7_\.]+|0b[01_\.]+)(?:e-?[\d_]+)?|0x[\d_a-f\.]+(?:p-?[\d_]+)?)/i
   var identifier = /^[_A-Za-z$][_A-Za-z$0-9]*/
-  var property = /^[@\.][_A-Za-z$][_A-Za-z$0-9]*/
+  var property = /^[@\#\.][_A-Za-z$][_A-Za-z$0-9]*/
   var regexp = /^\/(?!\s)(?:\/\/)?(?:\\.|[^\/])+\//
 
   function tokenBase(stream, state, prev) {

From 27acd6358252095da9cd51e499a4c086f82eabfe Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 27 Sep 2016 09:23:50 +0200
Subject: [PATCH 2896/4742] Move to rollup.config.js

---
 package.json                      | 4 ++--
 src/banner.js => rollup.config.js | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)
 rename src/banner.js => rollup.config.js (61%)

diff --git a/package.json b/package.json
index a6e61d06dc..4cbaa3096e 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
     "lib": "./lib"
   },
   "scripts": {
-    "build": "rollup --banner \"`cat src/banner.js`\" --format umd -n CodeMirror src/codemirror.js -o lib/codemirror.js",
-    "watch": "rollup -w --banner \"`cat src/banner.js`\" --format umd -n CodeMirror src/codemirror.js -o lib/codemirror.js",
+    "build": "rollup -c",
+    "watch": "rollup -w -c",
     "prepublish": "npm run-script build",
     "test": "node ./test/run.js",
     "lint": "bin/lint"
diff --git a/src/banner.js b/rollup.config.js
similarity index 61%
rename from src/banner.js
rename to rollup.config.js
index 6bd6553f29..c1c8c11ae8 100644
--- a/src/banner.js
+++ b/rollup.config.js
@@ -1,4 +1,5 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
+export default {
+  banner: `// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 // This is CodeMirror (http://codemirror.net), a code editor
@@ -6,3 +7,9 @@
 //
 // You can find some technical background for some of the code below
 // at http://marijnhaverbeke.nl/blog/#cm-internals .
+`,
+  entry: "src/codemirror.js",
+  format: "umd",
+  dest: "lib/codemirror.js",
+  moduleName: "CodeMirror"
+};

From 519b3ad211033ae1f855ceb0bc01f0248953be8e Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 27 Sep 2016 09:24:26 +0200
Subject: [PATCH 2897/4742] Add buble to rollup

---
 package.json     | 1 +
 rollup.config.js | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4cbaa3096e..057280c569 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "node-static": "0.6.0",
     "phantomjs-prebuilt": "^2.1.12",
     "rollup": "^0.34.10",
+    "rollup-plugin-buble": "^0.14.0",
     "rollup-watch": "^2.5.0"
   },
   "bugs": "http://github.com/codemirror/CodeMirror/issues",
diff --git a/rollup.config.js b/rollup.config.js
index c1c8c11ae8..584dfe1ec4 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,3 +1,5 @@
+import buble from 'rollup-plugin-buble';
+
 export default {
   banner: `// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
@@ -11,5 +13,6 @@ export default {
   entry: "src/codemirror.js",
   format: "umd",
   dest: "lib/codemirror.js",
-  moduleName: "CodeMirror"
+  moduleName: "CodeMirror",
+  plugins: [ buble() ]
 };

From c17d0230e0312c2189d1d0a4d805aaca70a4e2ed Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 27 Sep 2016 10:04:56 +0200
Subject: [PATCH 2898/4742] Replace var with let

---
 src/display/Display.js                  |   2 +-
 src/display/gutters.js                  |  11 +-
 src/display/highlight_worker.js         |  20 +--
 src/display/line_numbers.js             |  18 +--
 src/display/operations.js               |  38 ++---
 src/display/scroll_events.js            |  30 ++--
 src/display/scrollbars.js               |  36 ++---
 src/display/scrolling.js                |  44 ++---
 src/display/selection.js                |  50 +++---
 src/display/update_display.js           |  48 +++---
 src/display/update_lines.js             |  26 +--
 src/display/view_tracking.js            |  31 ++--
 src/edit/CodeMirror.js                  |  34 ++--
 src/edit/commands.js                    |  66 ++++----
 src/edit/deleteNearSelection.js         |  10 +-
 src/edit/drop_events.js                 |  31 ++--
 src/edit/fromTextArea.js                |  11 +-
 src/edit/global_events.js               |  12 +-
 src/edit/key_events.js                  |  30 ++--
 src/edit/main.js                        |   4 +-
 src/edit/methods.js                     | 160 +++++++++---------
 src/edit/mouse_events.js                |  78 ++++-----
 src/edit/options.js                     |  26 +--
 src/input/ContentEditableInput.js       | 160 +++++++++---------
 src/input/TextareaInput.js              |  63 ++++----
 src/input/indent.js                     |  18 +--
 src/input/input.js                      |  47 +++---
 src/input/keymap.js                     |  37 ++---
 src/input/keynames.js                   |   8 +-
 src/line/highlight.js                   |  64 ++++----
 src/line/line_data.js                   |  94 +++++------
 src/line/pos.js                         |   7 +-
 src/line/saw_special_spans.js           |   2 +-
 src/line/spans.js                       | 149 ++++++++---------
 src/line/utils_line.js                  |  34 ++--
 src/measurement/position_measurement.js | 205 ++++++++++++------------
 src/measurement/update_line.js          |  44 ++---
 src/measurement/widgets.js              |   6 +-
 src/model/Doc.js                        | 113 ++++++-------
 src/model/change_measurement.js         |  22 +--
 src/model/changes.js                    |  63 ++++----
 src/model/chunk.js                      |  53 +++---
 src/model/document_data.js              |  21 +--
 src/model/history.js                    |  56 ++++---
 src/model/line_widget.js                |  20 +--
 src/model/mark_text.js                  |  80 +++++----
 src/model/selection.js                  |  23 +--
 src/model/selection_updates.js          |  45 +++---
 src/modes.js                            |  29 ++--
 src/util/StringStream.js                |  21 +--
 src/util/bidi.js                        |  99 ++++++------
 src/util/browser.js                     |  44 ++---
 src/util/dom.js                         |  32 ++--
 src/util/event.js                       |  28 ++--
 src/util/feature_detection.js           |  45 +++---
 src/util/misc.js                        |  38 ++---
 src/util/operation_group.js             |  22 +--
 57 files changed, 1327 insertions(+), 1281 deletions(-)

diff --git a/src/display/Display.js b/src/display/Display.js
index fa4c52fef7..c1879e7b16 100644
--- a/src/display/Display.js
+++ b/src/display/Display.js
@@ -7,7 +7,7 @@ import { scrollerGap } from "../util/misc"
 // display-related state.
 
 export function Display(place, doc, input) {
-  var d = this
+  let d = this
   this.input = input
 
   // Covers bottom-right square when both scrollbars are present.
diff --git a/src/display/gutters.js b/src/display/gutters.js
index 3fe9a13447..7ccf119e80 100644
--- a/src/display/gutters.js
+++ b/src/display/gutters.js
@@ -6,11 +6,12 @@ import { updateGutterSpace } from "./update_display"
 // Rebuild the gutter elements, ensure the margin to the left of the
 // code matches their width.
 export function updateGutters(cm) {
-  var gutters = cm.display.gutters, specs = cm.options.gutters
+  let gutters = cm.display.gutters, specs = cm.options.gutters
   removeChildren(gutters)
-  for (var i = 0; i < specs.length; ++i) {
-    var gutterClass = specs[i]
-    var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass))
+  let i = 0
+  for (; i < specs.length; ++i) {
+    let gutterClass = specs[i]
+    let gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass))
     if (gutterClass == "CodeMirror-linenumbers") {
       cm.display.lineGutter = gElt
       gElt.style.width = (cm.display.lineNumWidth || 1) + "px"
@@ -23,7 +24,7 @@ export function updateGutters(cm) {
 // Make sure the gutters options contains the element
 // "CodeMirror-linenumbers" when the lineNumbers option is true.
 export function setGuttersForLineNumbers(options) {
-  var found = indexOf(options.gutters, "CodeMirror-linenumbers")
+  let found = indexOf(options.gutters, "CodeMirror-linenumbers")
   if (found == -1 && options.lineNumbers) {
     options.gutters = options.gutters.concat(["CodeMirror-linenumbers"])
   } else if (found > -1 && !options.lineNumbers) {
diff --git a/src/display/highlight_worker.js b/src/display/highlight_worker.js
index b8a48c0e91..5d535abe70 100644
--- a/src/display/highlight_worker.js
+++ b/src/display/highlight_worker.js
@@ -13,24 +13,24 @@ export function startWorker(cm, time) {
 }
 
 function highlightWorker(cm) {
-  var doc = cm.doc
+  let doc = cm.doc
   if (doc.frontier < doc.first) doc.frontier = doc.first
   if (doc.frontier >= cm.display.viewTo) return
-  var end = +new Date + cm.options.workTime
-  var state = copyState(doc.mode, getStateBefore(cm, doc.frontier))
-  var changedLines = []
+  let end = +new Date + cm.options.workTime
+  let state = copyState(doc.mode, getStateBefore(cm, doc.frontier))
+  let changedLines = []
 
   doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
     if (doc.frontier >= cm.display.viewFrom) { // Visible
-      var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength
-      var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true)
+      let oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength
+      let highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true)
       line.styles = highlighted.styles
-      var oldCls = line.styleClasses, newCls = highlighted.classes
+      let oldCls = line.styleClasses, newCls = highlighted.classes
       if (newCls) line.styleClasses = newCls
       else if (oldCls) line.styleClasses = null
-      var ischange = !oldStyles || oldStyles.length != line.styles.length ||
+      let ischange = !oldStyles || oldStyles.length != line.styles.length ||
         oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass)
-      for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i]
+      for (let i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i]
       if (ischange) changedLines.push(doc.frontier)
       line.stateAfter = tooLong ? state : copyState(doc.mode, state)
     } else {
@@ -45,7 +45,7 @@ function highlightWorker(cm) {
     }
   })
   if (changedLines.length) runInOp(cm, function() {
-    for (var i = 0; i < changedLines.length; i++)
+    for (let i = 0; i < changedLines.length; i++)
       regLineChange(cm, changedLines[i], "text")
   })
 }
diff --git a/src/display/line_numbers.js b/src/display/line_numbers.js
index 22bd32ffc4..c48f2204d5 100644
--- a/src/display/line_numbers.js
+++ b/src/display/line_numbers.js
@@ -7,19 +7,19 @@ import { updateGutterSpace } from "./update_display"
 // Re-align line numbers and gutter marks to compensate for
 // horizontal scrolling.
 export function alignHorizontally(cm) {
-  var display = cm.display, view = display.view
+  let display = cm.display, view = display.view
   if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return
-  var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft
-  var gutterW = display.gutters.offsetWidth, left = comp + "px"
-  for (var i = 0; i < view.length; i++) if (!view[i].hidden) {
+  let comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft
+  let gutterW = display.gutters.offsetWidth, left = comp + "px"
+  for (let i = 0; i < view.length; i++) if (!view[i].hidden) {
     if (cm.options.fixedGutter) {
       if (view[i].gutter)
         view[i].gutter.style.left = left
       if (view[i].gutterBackground)
         view[i].gutterBackground.style.left = left
     }
-    var align = view[i].alignable
-    if (align) for (var j = 0; j < align.length; j++)
+    let align = view[i].alignable
+    if (align) for (let j = 0; j < align.length; j++)
       align[j].style.left = left
   }
   if (cm.options.fixedGutter)
@@ -31,11 +31,11 @@ export function alignHorizontally(cm) {
 // is needed.
 export function maybeUpdateLineNumberWidth(cm) {
   if (!cm.options.lineNumbers) return false
-  var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display
+  let doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display
   if (last.length != display.lineNumChars) {
-    var test = display.measure.appendChild(elt("div", [elt("div", last)],
+    let test = display.measure.appendChild(elt("div", [elt("div", last)],
                                                "CodeMirror-linenumber CodeMirror-gutter-elt"))
-    var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW
+    let innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW
     display.lineGutter.style.width = ""
     display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1
     display.lineNumWidth = display.lineNumInnerWidth + padding
diff --git a/src/display/operations.js b/src/display/operations.js
index 2873e0e91d..cc6eef7bde 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -20,7 +20,7 @@ import { updateHeightsInViewport } from "./update_lines"
 // error-prone). Instead, display updates are batched and then all
 // combined and executed at once.
 
-var nextOpId = 0
+let nextOpId = 0
 // Start a new operation.
 export function startOperation(cm) {
   cm.curOp = {
@@ -45,9 +45,9 @@ export function startOperation(cm) {
 
 // Finish an operation, updating the display and signalling delayed events
 export function endOperation(cm) {
-  var op = cm.curOp
+  let op = cm.curOp
   finishOperation(op, function(group) {
-    for (var i = 0; i < group.ops.length; i++)
+    for (let i = 0; i < group.ops.length; i++)
       group.ops[i].cm.curOp = null
     endOperations(group)
   })
@@ -56,21 +56,21 @@ export function endOperation(cm) {
 // The DOM updates done when an operation finishes are batched so
 // that the minimum number of relayouts are required.
 function endOperations(group) {
-  var ops = group.ops
-  for (var i = 0; i < ops.length; i++) // Read DOM
+  let ops = group.ops
+  for (let i = 0; i < ops.length; i++) // Read DOM
     endOperation_R1(ops[i])
-  for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+  for (let i = 0; i < ops.length; i++) // Write DOM (maybe)
     endOperation_W1(ops[i])
-  for (var i = 0; i < ops.length; i++) // Read DOM
+  for (let i = 0; i < ops.length; i++) // Read DOM
     endOperation_R2(ops[i])
-  for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+  for (let i = 0; i < ops.length; i++) // Write DOM (maybe)
     endOperation_W2(ops[i])
-  for (var i = 0; i < ops.length; i++) // Read DOM
+  for (let i = 0; i < ops.length; i++) // Read DOM
     endOperation_finish(ops[i])
 }
 
 function endOperation_R1(op) {
-  var cm = op.cm, display = cm.display
+  let cm = op.cm, display = cm.display
   maybeClipScrollbars(cm)
   if (op.updateMaxLine) findMaxLine(cm)
 
@@ -87,7 +87,7 @@ function endOperation_W1(op) {
 }
 
 function endOperation_R2(op) {
-  var cm = op.cm, display = cm.display
+  let cm = op.cm, display = cm.display
   if (op.updatedDisplay) updateHeightsInViewport(cm)
 
   op.barMeasure = measureForScrollbars(cm)
@@ -108,7 +108,7 @@ function endOperation_R2(op) {
 }
 
 function endOperation_W2(op) {
-  var cm = op.cm
+  let cm = op.cm
 
   if (op.adjustWidthTo != null) {
     cm.display.sizer.style.minWidth = op.adjustWidthTo + "px"
@@ -117,7 +117,7 @@ function endOperation_W2(op) {
     cm.display.maxLineChanged = false
   }
 
-  var takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
+  let takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
   if (op.preparedSelection)
     cm.display.input.showSelection(op.preparedSelection, takeFocus)
   if (op.updatedDisplay || op.startHeight != cm.doc.height)
@@ -133,7 +133,7 @@ function endOperation_W2(op) {
 }
 
 function endOperation_finish(op) {
-  var cm = op.cm, display = cm.display, doc = cm.doc
+  let cm = op.cm, display = cm.display, doc = cm.doc
 
   if (op.updatedDisplay) postUpdateDisplay(cm, op.update)
 
@@ -155,17 +155,17 @@ function endOperation_finish(op) {
   }
   // If we need to scroll a specific position into view, do so.
   if (op.scrollToPos) {
-    var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+    let coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
                                    clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin)
     if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords)
   }
 
   // Fire events for markers that are hidden/unidden by editing or
   // undoing
-  var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers
-  if (hidden) for (var i = 0; i < hidden.length; ++i)
+  let hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers
+  if (hidden) for (let i = 0; i < hidden.length; ++i)
     if (!hidden[i].lines.length) signal(hidden[i], "hide")
-  if (unhidden) for (var i = 0; i < unhidden.length; ++i)
+  if (unhidden) for (let i = 0; i < unhidden.length; ++i)
     if (unhidden[i].lines.length) signal(unhidden[i], "unhide")
 
   if (display.wrapper.offsetHeight)
@@ -206,7 +206,7 @@ export function methodOp(f) {
 }
 export function docMethodOp(f) {
   return function() {
-    var cm = this.cm
+    let cm = this.cm
     if (!cm || cm.curOp) return f.apply(this, arguments)
     startOperation(cm)
     try { return f.apply(this, arguments) }
diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index 99afe7ee50..3c166b4855 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -38,7 +38,7 @@ export function setScrollLeft(cm, val, isScroller) {
 // is that it gives us a chance to update the display before the
 // actual scrolling happens, reducing flickering.
 
-var wheelSamples = 0, wheelPixelsPerUnit = null
+let wheelSamples = 0, wheelPixelsPerUnit = null
 // Fill in a browser-detected starting value on browsers where we
 // know one. These don't have to be accurate -- the result of them
 // being wrong would just be a slight flicker on the first wheel
@@ -48,27 +48,27 @@ else if (gecko) wheelPixelsPerUnit = 15
 else if (chrome) wheelPixelsPerUnit = -.7
 else if (safari) wheelPixelsPerUnit = -1/3
 
-var wheelEventDelta = function(e) {
-  var dx = e.wheelDeltaX, dy = e.wheelDeltaY
+let wheelEventDelta = function(e) {
+  let dx = e.wheelDeltaX, dy = e.wheelDeltaY
   if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail
   if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail
   else if (dy == null) dy = e.wheelDelta
   return {x: dx, y: dy}
 }
 export function wheelEventPixels(e) {
-  var delta = wheelEventDelta(e)
+  let delta = wheelEventDelta(e)
   delta.x *= wheelPixelsPerUnit
   delta.y *= wheelPixelsPerUnit
   return delta
 }
 
 export function onScrollWheel(cm, e) {
-  var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y
+  let delta = wheelEventDelta(e), dx = delta.x, dy = delta.y
 
-  var display = cm.display, scroll = display.scroller
+  let display = cm.display, scroll = display.scroller
   // Quit if there's nothing to scroll here
-  var canScrollX = scroll.scrollWidth > scroll.clientWidth
-  var canScrollY = scroll.scrollHeight > scroll.clientHeight
+  let canScrollX = scroll.scrollWidth > scroll.clientWidth
+  let canScrollY = scroll.scrollHeight > scroll.clientHeight
   if (!(dx && canScrollX || dy && canScrollY)) return
 
   // Webkit browsers on OS X abort momentum scrolls when the target
@@ -76,8 +76,8 @@ export function onScrollWheel(cm, e) {
   // This hack (see related code in patchDisplay) makes sure the
   // element is kept around.
   if (dy && mac && webkit) {
-    outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
-      for (var i = 0; i < view.length; i++) {
+    outer: for (let cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
+      for (let i = 0; i < view.length; i++) {
         if (view[i].node == cur) {
           cm.display.currentWheelTarget = cur
           break outer
@@ -109,8 +109,8 @@ export function onScrollWheel(cm, e) {
   // 'Project' the visible viewport to cover the area that is being
   // scrolled into view (if we know enough to estimate it).
   if (dy && wheelPixelsPerUnit != null) {
-    var pixels = dy * wheelPixelsPerUnit
-    var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight
+    let pixels = dy * wheelPixelsPerUnit
+    let top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight
     if (pixels < 0) top = Math.max(0, top + pixels - 50)
     else bot = Math.min(cm.doc.height, bot + pixels + 50)
     updateDisplaySimple(cm, {top: top, bottom: bot})
@@ -122,9 +122,9 @@ export function onScrollWheel(cm, e) {
       display.wheelDX = dx; display.wheelDY = dy
       setTimeout(function() {
         if (display.wheelStartX == null) return
-        var movedX = scroll.scrollLeft - display.wheelStartX
-        var movedY = scroll.scrollTop - display.wheelStartY
-        var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
+        let movedX = scroll.scrollLeft - display.wheelStartX
+        let movedY = scroll.scrollTop - display.wheelStartY
+        let sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
           (movedX && display.wheelDX && movedX / display.wheelDX)
         display.wheelStartX = display.wheelStartY = null
         if (!sample) return
diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index 075ae41a1b..a07f2a165d 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -12,8 +12,8 @@ import { setScrollLeft, setScrollTop } from "./scroll_events"
 // Prepare DOM reads needed to update the scrollbars. Done in one
 // shot to minimize update/measure roundtrips.
 export function measureForScrollbars(cm) {
-  var d = cm.display, gutterW = d.gutters.offsetWidth
-  var docH = Math.round(cm.doc.height + paddingVert(cm.display))
+  let d = cm.display, gutterW = d.gutters.offsetWidth
+  let docH = Math.round(cm.doc.height + paddingVert(cm.display))
   return {
     clientHeight: d.scroller.clientHeight,
     viewHeight: d.wrapper.clientHeight,
@@ -29,8 +29,8 @@ export function measureForScrollbars(cm) {
 
 function NativeScrollbars(place, scroll, cm) {
   this.cm = cm
-  var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar")
-  var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
+  let vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar")
+  let horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
   place(vert); place(horiz)
 
   on(vert, "scroll", function() {
@@ -47,14 +47,14 @@ function NativeScrollbars(place, scroll, cm) {
 
 NativeScrollbars.prototype = copyObj({
   update: function(measure) {
-    var needsH = measure.scrollWidth > measure.clientWidth + 1
-    var needsV = measure.scrollHeight > measure.clientHeight + 1
-    var sWidth = measure.nativeBarWidth
+    let needsH = measure.scrollWidth > measure.clientWidth + 1
+    let needsV = measure.scrollHeight > measure.clientHeight + 1
+    let sWidth = measure.nativeBarWidth
 
     if (needsV) {
       this.vert.style.display = "block"
       this.vert.style.bottom = needsH ? sWidth + "px" : "0"
-      var totalHeight = measure.viewHeight - (needsH ? sWidth : 0)
+      let totalHeight = measure.viewHeight - (needsH ? sWidth : 0)
       // A bug in IE8 can cause this value to be negative, so guard it.
       this.vert.firstChild.style.height =
         Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px"
@@ -67,7 +67,7 @@ NativeScrollbars.prototype = copyObj({
       this.horiz.style.display = "block"
       this.horiz.style.right = needsV ? sWidth + "px" : "0"
       this.horiz.style.left = measure.barLeft + "px"
-      var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0)
+      let totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0)
       this.horiz.firstChild.style.width =
         (measure.scrollWidth - measure.clientWidth + totalWidth) + "px"
     } else {
@@ -91,7 +91,7 @@ NativeScrollbars.prototype = copyObj({
     if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert)
   },
   zeroWidthHack: function() {
-    var w = mac && !mac_geMountainLion ? "12px" : "18px"
+    let w = mac && !mac_geMountainLion ? "12px" : "18px"
     this.horiz.style.height = this.vert.style.width = w
     this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"
     this.disableHoriz = new Delayed
@@ -106,15 +106,15 @@ NativeScrollbars.prototype = copyObj({
       // itself (when the bar is still visible) or its filler child
       // (when the bar is hidden). If it is still visible, we keep
       // it enabled, if it's hidden, we disable pointer events.
-      var box = bar.getBoundingClientRect()
-      var elt = document.elementFromPoint(box.left + 1, box.bottom - 1)
+      let box = bar.getBoundingClientRect()
+      let elt = document.elementFromPoint(box.left + 1, box.bottom - 1)
       if (elt != bar) bar.style.pointerEvents = "none"
       else delay.set(1000, maybeDisable)
     }
     delay.set(1000, maybeDisable)
   },
   clear: function() {
-    var parent = this.horiz.parentNode
+    let parent = this.horiz.parentNode
     parent.removeChild(this.horiz)
     parent.removeChild(this.vert)
   }
@@ -131,9 +131,9 @@ NullScrollbars.prototype = copyObj({
 
 export function updateScrollbars(cm, measure) {
   if (!measure) measure = measureForScrollbars(cm)
-  var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight
+  let startWidth = cm.display.barWidth, startHeight = cm.display.barHeight
   updateScrollbarsInner(cm, measure)
-  for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
+  for (let i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
     if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
       updateHeightsInViewport(cm)
     updateScrollbarsInner(cm, measureForScrollbars(cm))
@@ -144,8 +144,8 @@ export function updateScrollbars(cm, measure) {
 // Re-synchronize the fake scrollbars with the actual size of the
 // content.
 function updateScrollbarsInner(cm, measure) {
-  var d = cm.display
-  var sizes = d.scrollbars.update(measure)
+  let d = cm.display
+  let sizes = d.scrollbars.update(measure)
 
   d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px"
   d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px"
@@ -163,7 +163,7 @@ function updateScrollbarsInner(cm, measure) {
   } else d.gutterFiller.style.display = ""
 }
 
-export var scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars}
+export let scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars}
 
 export function initScrollbars(cm) {
   if (cm.display.scrollbars) {
diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index ec8cec6715..d58efe0bcf 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -13,11 +13,11 @@ import { setScrollLeft, setScrollTop } from "./scroll_events"
 export function maybeScrollWindow(cm, coords) {
   if (signalDOMEvent(cm, "scrollCursorIntoView")) return
 
-  var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null
+  let display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null
   if (coords.top + box.top < 0) doScroll = true
   else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false
   if (doScroll != null && !phantom) {
-    var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
+    let scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
                          (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
                          (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
                          coords.left + "px; width: 2px;")
@@ -32,14 +32,16 @@ export function maybeScrollWindow(cm, coords) {
 // measured, the position of something may 'drift' during drawing).
 export function scrollPosIntoView(cm, pos, end, margin) {
   if (margin == null) margin = 0
-  for (var limit = 0; limit < 5; limit++) {
-    var changed = false, coords = cursorCoords(cm, pos)
-    var endCoords = !end || end == pos ? coords : cursorCoords(cm, end)
-    var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
+  let coords
+  for (let limit = 0; limit < 5; limit++) {
+    let changed = false
+    coords = cursorCoords(cm, pos)
+    let endCoords = !end || end == pos ? coords : cursorCoords(cm, end)
+    let scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
                                        Math.min(coords.top, endCoords.top) - margin,
                                        Math.max(coords.left, endCoords.left),
                                        Math.max(coords.bottom, endCoords.bottom) + margin)
-    var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft
+    let startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft
     if (scrollPos.scrollTop != null) {
       setScrollTop(cm, scrollPos.scrollTop)
       if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true
@@ -55,7 +57,7 @@ export function scrollPosIntoView(cm, pos, end, margin) {
 
 // Scroll a given set of coordinates into view (immediately).
 export function scrollIntoView(cm, x1, y1, x2, y2) {
-  var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2)
+  let scrollPos = calculateScrollPos(cm, x1, y1, x2, y2)
   if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop)
   if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft)
 }
@@ -65,23 +67,23 @@ export function scrollIntoView(cm, x1, y1, x2, y2) {
 // scrollLeft properties. When these are undefined, the
 // vertical/horizontal position does not need to be adjusted.
 export function calculateScrollPos(cm, x1, y1, x2, y2) {
-  var display = cm.display, snapMargin = textHeight(cm.display)
+  let display = cm.display, snapMargin = textHeight(cm.display)
   if (y1 < 0) y1 = 0
-  var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop
-  var screen = displayHeight(cm), result = {}
+  let screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop
+  let screen = displayHeight(cm), result = {}
   if (y2 - y1 > screen) y2 = y1 + screen
-  var docBottom = cm.doc.height + paddingVert(display)
-  var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin
+  let docBottom = cm.doc.height + paddingVert(display)
+  let atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin
   if (y1 < screentop) {
     result.scrollTop = atTop ? 0 : y1
   } else if (y2 > screentop + screen) {
-    var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen)
+    let newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen)
     if (newTop != screentop) result.scrollTop = newTop
   }
 
-  var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft
-  var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0)
-  var tooWide = x2 - x1 > screenw
+  let screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft
+  let screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0)
+  let tooWide = x2 - x1 > screenw
   if (tooWide) x2 = x1 + screenw
   if (x1 < 10)
     result.scrollLeft = 0
@@ -106,7 +108,7 @@ export function addToScrollPos(cm, left, top) {
 // shown.
 export function ensureCursorVisible(cm) {
   resolveScrollToPos(cm)
-  var cur = cm.getCursor(), from = cur, to = cur
+  let cur = cm.getCursor(), from = cur, to = cur
   if (!cm.options.lineWrapping) {
     from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur
     to = Pos(cur.line, cur.ch + 1)
@@ -119,11 +121,11 @@ export function ensureCursorVisible(cm) {
 // 'simulates' scrolling that position into view in a cheap way, so
 // that the effect of intermediate scroll commands is not ignored.
 export function resolveScrollToPos(cm) {
-  var range = cm.curOp.scrollToPos
+  let range = cm.curOp.scrollToPos
   if (range) {
     cm.curOp.scrollToPos = null
-    var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to)
-    var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
+    let from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to)
+    let sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
                                   Math.min(from.top, to.top) - range.margin,
                                   Math.max(from.right, to.right),
                                   Math.max(from.bottom, to.bottom) + range.margin)
diff --git a/src/display/selection.js b/src/display/selection.js
index 3ee79fa358..9fa8f6eefb 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -10,15 +10,15 @@ export function updateSelection(cm) {
 }
 
 export function prepareSelection(cm, primary) {
-  var doc = cm.doc, result = {}
-  var curFragment = result.cursors = document.createDocumentFragment()
-  var selFragment = result.selection = document.createDocumentFragment()
+  let doc = cm.doc, result = {}
+  let curFragment = result.cursors = document.createDocumentFragment()
+  let selFragment = result.selection = document.createDocumentFragment()
 
-  for (var i = 0; i < doc.sel.ranges.length; i++) {
+  for (let i = 0; i < doc.sel.ranges.length; i++) {
     if (primary === false && i == doc.sel.primIndex) continue
-    var range = doc.sel.ranges[i]
+    let range = doc.sel.ranges[i]
     if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue
-    var collapsed = range.empty()
+    let collapsed = range.empty()
     if (collapsed || cm.options.showCursorWhenSelecting)
       drawSelectionCursor(cm, range.head, curFragment)
     if (!collapsed)
@@ -29,16 +29,16 @@ export function prepareSelection(cm, primary) {
 
 // Draws a cursor for the given range
 export function drawSelectionCursor(cm, head, output) {
-  var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine)
+  let pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine)
 
-  var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"))
+  let cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"))
   cursor.style.left = pos.left + "px"
   cursor.style.top = pos.top + "px"
   cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"
 
   if (pos.other) {
     // Secondary cursor, shown when on a 'jump' in bi-directional text
-    var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"))
+    let otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"))
     otherCursor.style.display = ""
     otherCursor.style.left = pos.other.left + "px"
     otherCursor.style.top = pos.other.top + "px"
@@ -48,10 +48,10 @@ export function drawSelectionCursor(cm, head, output) {
 
 // Draws the given range as a highlighted selection
 function drawSelectionRange(cm, range, output) {
-  var display = cm.display, doc = cm.doc
-  var fragment = document.createDocumentFragment()
-  var padding = paddingH(cm.display), leftSide = padding.left
-  var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right
+  let display = cm.display, doc = cm.doc
+  let fragment = document.createDocumentFragment()
+  let padding = paddingH(cm.display), leftSide = padding.left
+  let rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right
 
   function add(left, top, width, bottom) {
     if (top < 0) top = 0
@@ -63,21 +63,21 @@ function drawSelectionRange(cm, range, output) {
   }
 
   function drawForLine(line, fromArg, toArg) {
-    var lineObj = getLine(doc, line)
-    var lineLen = lineObj.text.length
-    var start, end
+    let lineObj = getLine(doc, line)
+    let lineLen = lineObj.text.length
+    let start, end
     function coords(ch, bias) {
       return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
     }
 
     iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
-      var leftPos = coords(from, "left"), rightPos, left, right
+      let leftPos = coords(from, "left"), rightPos, left, right
       if (from == to) {
         rightPos = leftPos
         left = right = leftPos.left
       } else {
         rightPos = coords(to - 1, "right")
-        if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp }
+        if (dir == "rtl") { let tmp = leftPos; leftPos = rightPos; rightPos = tmp }
         left = leftPos.left
         right = rightPos.right
       }
@@ -98,14 +98,14 @@ function drawSelectionRange(cm, range, output) {
     return {start: start, end: end}
   }
 
-  var sFrom = range.from(), sTo = range.to()
+  let sFrom = range.from(), sTo = range.to()
   if (sFrom.line == sTo.line) {
     drawForLine(sFrom.line, sFrom.ch, sTo.ch)
   } else {
-    var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line)
-    var singleVLine = visualLine(fromLine) == visualLine(toLine)
-    var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end
-    var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start
+    let fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line)
+    let singleVLine = visualLine(fromLine) == visualLine(toLine)
+    let leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end
+    let rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start
     if (singleVLine) {
       if (leftEnd.top < rightStart.top - 2) {
         add(leftEnd.right, leftEnd.top, null, leftEnd.bottom)
@@ -124,9 +124,9 @@ function drawSelectionRange(cm, range, output) {
 // Cursor-blinking
 export function restartBlink(cm) {
   if (!cm.state.focused) return
-  var display = cm.display
+  let display = cm.display
   clearInterval(display.blinker)
-  var on = true
+  let on = true
   display.cursorDiv.style.visibility = ""
   if (cm.options.cursorBlinkRate > 0)
     display.blinker = setInterval(function() {
diff --git a/src/display/update_display.js b/src/display/update_display.js
index 06551eec8a..a8d6a4de13 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -18,7 +18,7 @@ import { adjustView, countDirtyView, resetView } from "./view_tracking"
 // DISPLAY DRAWING
 
 export function DisplayUpdate(cm, viewport, force) {
-  var display = cm.display
+  let display = cm.display
 
   this.viewport = viewport
   // Store some values that we'll need later (but don't want to force a relayout for)
@@ -37,12 +37,12 @@ DisplayUpdate.prototype.signal = function(emitter, type) {
     this.events.push(arguments)
 }
 DisplayUpdate.prototype.finish = function() {
-  for (var i = 0; i < this.events.length; i++)
+  for (let i = 0; i < this.events.length; i++)
     signal.apply(null, this.events[i])
 }
 
 export function maybeClipScrollbars(cm) {
-  var display = cm.display
+  let display = cm.display
   if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
     display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth
     display.heightForcer.style.height = scrollGap(cm) + "px"
@@ -56,7 +56,7 @@ export function maybeClipScrollbars(cm) {
 // (returning false) when there is nothing to be done and forced is
 // false.
 export function updateDisplayIfNeeded(cm, update) {
-  var display = cm.display, doc = cm.doc
+  let display = cm.display, doc = cm.doc
 
   if (update.editorIsHidden) {
     resetView(cm)
@@ -76,9 +76,9 @@ export function updateDisplayIfNeeded(cm, update) {
   }
 
   // Compute a suitable new viewport (from & to)
-  var end = doc.first + doc.size
-  var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first)
-  var to = Math.min(end, update.visible.to + cm.options.viewportMargin)
+  let end = doc.first + doc.size
+  let from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first)
+  let to = Math.min(end, update.visible.to + cm.options.viewportMargin)
   if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom)
   if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo)
   if (sawCollapsedSpans) {
@@ -86,7 +86,7 @@ export function updateDisplayIfNeeded(cm, update) {
     to = visualLineEndNo(cm.doc, to)
   }
 
-  var different = from != display.viewFrom || to != display.viewTo ||
+  let different = from != display.viewFrom || to != display.viewTo ||
     display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth
   adjustView(cm, from, to)
 
@@ -94,14 +94,14 @@ export function updateDisplayIfNeeded(cm, update) {
   // Position the mover div to align with the current scroll position
   cm.display.mover.style.top = display.viewOffset + "px"
 
-  var toUpdate = countDirtyView(cm)
+  let toUpdate = countDirtyView(cm)
   if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
       (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
     return false
 
   // For big changes, we hide the enclosing element during the
   // update, since that speeds up the operations on most browsers.
-  var focused = activeElt()
+  let focused = activeElt()
   if (toUpdate > 4) display.lineDiv.style.display = "none"
   patchDisplay(cm, display.updateLineNumbers, update.dims)
   if (toUpdate > 4) display.lineDiv.style.display = ""
@@ -128,9 +128,9 @@ export function updateDisplayIfNeeded(cm, update) {
 }
 
 export function postUpdateDisplay(cm, update) {
-  var viewport = update.viewport
+  let viewport = update.viewport
 
-  for (var first = true;; first = false) {
+  for (let first = true;; first = false) {
     if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
       // Clip forced viewport to actual scrollable area.
       if (viewport && viewport.top != null)
@@ -143,7 +143,7 @@ export function postUpdateDisplay(cm, update) {
     }
     if (!updateDisplayIfNeeded(cm, update)) break
     updateHeightsInViewport(cm)
-    var barMeasure = measureForScrollbars(cm)
+    let barMeasure = measureForScrollbars(cm)
     updateSelection(cm)
     updateScrollbars(cm, barMeasure)
     setDocumentHeight(cm, barMeasure)
@@ -157,11 +157,11 @@ export function postUpdateDisplay(cm, update) {
 }
 
 export function updateDisplaySimple(cm, viewport) {
-  var update = new DisplayUpdate(cm, viewport)
+  let update = new DisplayUpdate(cm, viewport)
   if (updateDisplayIfNeeded(cm, update)) {
     updateHeightsInViewport(cm)
     postUpdateDisplay(cm, update)
-    var barMeasure = measureForScrollbars(cm)
+    let barMeasure = measureForScrollbars(cm)
     updateSelection(cm)
     updateScrollbars(cm, barMeasure)
     setDocumentHeight(cm, barMeasure)
@@ -174,11 +174,11 @@ export function updateDisplaySimple(cm, viewport) {
 // that are not there yet, and updating the ones that are out of
 // date.
 function patchDisplay(cm, updateNumbersFrom, dims) {
-  var display = cm.display, lineNumbers = cm.options.lineNumbers
-  var container = display.lineDiv, cur = container.firstChild
+  let display = cm.display, lineNumbers = cm.options.lineNumbers
+  let container = display.lineDiv, cur = container.firstChild
 
   function rm(node) {
-    var next = node.nextSibling
+    let next = node.nextSibling
     // Works around a throw-scroll bug in OS X Webkit
     if (webkit && mac && cm.display.currentWheelTarget == node)
       node.style.display = "none"
@@ -187,18 +187,18 @@ function patchDisplay(cm, updateNumbersFrom, dims) {
     return next
   }
 
-  var view = display.view, lineN = display.viewFrom
+  let view = display.view, lineN = display.viewFrom
   // Loop over the elements in the view, syncing cur (the DOM nodes
   // in display.lineDiv) with the view as we go.
-  for (var i = 0; i < view.length; i++) {
-    var lineView = view[i]
+  for (let i = 0; i < view.length; i++) {
+    let lineView = view[i]
     if (lineView.hidden) {
     } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
-      var node = buildLineElement(cm, lineView, lineN, dims)
+      let node = buildLineElement(cm, lineView, lineN, dims)
       container.insertBefore(node, cur)
     } else { // Already drawn
       while (cur != lineView.node) cur = rm(cur)
-      var updateNumber = lineNumbers && updateNumbersFrom != null &&
+      let updateNumber = lineNumbers && updateNumbersFrom != null &&
         updateNumbersFrom <= lineN && lineView.lineNumber
       if (lineView.changes) {
         if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false
@@ -216,7 +216,7 @@ function patchDisplay(cm, updateNumbersFrom, dims) {
 }
 
 export function updateGutterSpace(cm) {
-  var width = cm.display.gutters.offsetWidth
+  let width = cm.display.gutters.offsetWidth
   cm.display.sizer.style.marginLeft = width + "px"
 }
 
diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index 8de0698c6f..095cddef3f 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -6,25 +6,25 @@ import { ie, ie_version } from "../util/browser"
 // Read the actual heights of the rendered lines, and update their
 // stored heights to match.
 export function updateHeightsInViewport(cm) {
-  var display = cm.display
-  var prevBottom = display.lineDiv.offsetTop
-  for (var i = 0; i < display.view.length; i++) {
-    var cur = display.view[i], height
+  let display = cm.display
+  let prevBottom = display.lineDiv.offsetTop
+  for (let i = 0; i < display.view.length; i++) {
+    let cur = display.view[i], height
     if (cur.hidden) continue
     if (ie && ie_version < 8) {
-      var bot = cur.node.offsetTop + cur.node.offsetHeight
+      let bot = cur.node.offsetTop + cur.node.offsetHeight
       height = bot - prevBottom
       prevBottom = bot
     } else {
-      var box = cur.node.getBoundingClientRect()
+      let box = cur.node.getBoundingClientRect()
       height = box.bottom - box.top
     }
-    var diff = cur.line.height - height
+    let diff = cur.line.height - height
     if (height < 2) height = textHeight(display)
     if (diff > .001 || diff < -.001) {
       updateLineHeight(cur.line, height)
       updateWidgetHeight(cur.line)
-      if (cur.rest) for (var j = 0; j < cur.rest.length; j++)
+      if (cur.rest) for (let j = 0; j < cur.rest.length; j++)
         updateWidgetHeight(cur.rest[j])
     }
   }
@@ -33,7 +33,7 @@ export function updateHeightsInViewport(cm) {
 // Read and store the height of line widgets associated with the
 // given line.
 function updateWidgetHeight(line) {
-  if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
+  if (line.widgets) for (let i = 0; i < line.widgets.length; ++i)
     line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight
 }
 
@@ -41,15 +41,15 @@ function updateWidgetHeight(line) {
 // the the current scroll position). viewport may contain top,
 // height, and ensure (see op.scrollToPos) properties.
 export function visibleLines(display, doc, viewport) {
-  var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop
+  let top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop
   top = Math.floor(top - paddingTop(display))
-  var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight
+  let bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight
 
-  var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom)
+  let from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom)
   // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
   // forces those lines into the viewport (if possible).
   if (viewport && viewport.ensure) {
-    var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line
+    let ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line
     if (ensureFrom < from) {
       from = ensureFrom
       to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)
diff --git a/src/display/view_tracking.js b/src/display/view_tracking.js
index d7ca682b1e..b9abd2fc40 100644
--- a/src/display/view_tracking.js
+++ b/src/display/view_tracking.js
@@ -15,7 +15,7 @@ export function regChange(cm, from, to, lendiff) {
   if (to == null) to = cm.doc.first + cm.doc.size
   if (!lendiff) lendiff = 0
 
-  var display = cm.display
+  let display = cm.display
   if (lendiff && to < display.viewTo &&
       (display.updateLineNumbers == null || display.updateLineNumbers > from))
     display.updateLineNumbers = from
@@ -35,7 +35,7 @@ export function regChange(cm, from, to, lendiff) {
   } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
     resetView(cm)
   } else if (from <= display.viewFrom) { // Top overlap
-    var cut = viewCuttingPoint(cm, to, to + lendiff, 1)
+    let cut = viewCuttingPoint(cm, to, to + lendiff, 1)
     if (cut) {
       display.view = display.view.slice(cut.index)
       display.viewFrom = cut.lineN
@@ -44,7 +44,7 @@ export function regChange(cm, from, to, lendiff) {
       resetView(cm)
     }
   } else if (to >= display.viewTo) { // Bottom overlap
-    var cut = viewCuttingPoint(cm, from, from, -1)
+    let cut = viewCuttingPoint(cm, from, from, -1)
     if (cut) {
       display.view = display.view.slice(0, cut.index)
       display.viewTo = cut.lineN
@@ -52,8 +52,8 @@ export function regChange(cm, from, to, lendiff) {
       resetView(cm)
     }
   } else { // Gap in the middle
-    var cutTop = viewCuttingPoint(cm, from, from, -1)
-    var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1)
+    let cutTop = viewCuttingPoint(cm, from, from, -1)
+    let cutBot = viewCuttingPoint(cm, to, to + lendiff, 1)
     if (cutTop && cutBot) {
       display.view = display.view.slice(0, cutTop.index)
         .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
@@ -64,7 +64,7 @@ export function regChange(cm, from, to, lendiff) {
     }
   }
 
-  var ext = display.externalMeasured
+  let ext = display.externalMeasured
   if (ext) {
     if (to < ext.lineN)
       ext.lineN += lendiff
@@ -77,14 +77,14 @@ export function regChange(cm, from, to, lendiff) {
 // "gutter", "class", "widget"
 export function regLineChange(cm, line, type) {
   cm.curOp.viewChanged = true
-  var display = cm.display, ext = cm.display.externalMeasured
+  let display = cm.display, ext = cm.display.externalMeasured
   if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
     display.externalMeasured = null
 
   if (line < display.viewFrom || line >= display.viewTo) return
-  var lineView = display.view[findViewIndex(cm, line)]
+  let lineView = display.view[findViewIndex(cm, line)]
   if (lineView.node == null) return
-  var arr = lineView.changes || (lineView.changes = [])
+  let arr = lineView.changes || (lineView.changes = [])
   if (indexOf(arr, type) == -1) arr.push(type)
 }
 
@@ -96,10 +96,11 @@ export function resetView(cm) {
 }
 
 function viewCuttingPoint(cm, oldN, newN, dir) {
-  var index = findViewIndex(cm, oldN), diff, view = cm.display.view
+  let index = findViewIndex(cm, oldN), diff, view = cm.display.view
   if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
     return {index: index, lineN: newN}
-  for (var i = 0, n = cm.display.viewFrom; i < index; i++)
+  let n = cm.display.viewFrom
+  for (let i = 0; i < index; i++)
     n += view[i].size
   if (n != oldN) {
     if (dir > 0) {
@@ -122,7 +123,7 @@ function viewCuttingPoint(cm, oldN, newN, dir) {
 // Force the view to cover a given range, adding empty view element
 // or clipping off existing ones as needed.
 export function adjustView(cm, from, to) {
-  var display = cm.display, view = display.view
+  let display = cm.display, view = display.view
   if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
     display.view = buildViewArray(cm, from, to)
     display.viewFrom = from
@@ -143,9 +144,9 @@ export function adjustView(cm, from, to) {
 // Count the number of lines in the view whose DOM representation is
 // out of date (or nonexistent).
 export function countDirtyView(cm) {
-  var view = cm.display.view, dirty = 0
-  for (var i = 0; i < view.length; i++) {
-    var lineView = view[i]
+  let view = cm.display.view, dirty = 0
+  for (let i = 0; i < view.length; i++) {
+    let lineView = view[i]
     if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty
   }
   return dirty
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index ee549d54c8..90650ff059 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -34,12 +34,12 @@ export function CodeMirror(place, options) {
   copyObj(defaults, options, false)
   setGuttersForLineNumbers(options)
 
-  var doc = options.value
+  let doc = options.value
   if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator)
   this.doc = doc
 
-  var input = new CodeMirror.inputStyles[options.inputStyle](this)
-  var display = this.display = new Display(place, doc, input)
+  let input = new CodeMirror.inputStyles[options.inputStyle](this)
+  let display = this.display = new Display(place, doc, input)
   display.wrapper.CodeMirror = this
   updateGutters(this)
   themeChanged(this)
@@ -64,7 +64,7 @@ export function CodeMirror(place, options) {
     specialChars: null
   }
 
-  var cm = this
+  let cm = this
 
   // Override magic textarea content restore that IE sometimes does
   // on our hidden textarea on reload
@@ -82,11 +82,11 @@ export function CodeMirror(place, options) {
   else
     onBlur(this)
 
-  for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
+  for (let opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
     optionHandlers[opt](this, options[opt], Init)
   maybeUpdateLineNumberWidth(this)
   if (options.finishInit) options.finishInit(this)
-  for (var i = 0; i < initHooks.length; ++i) initHooks[i](this)
+  for (let i = 0; i < initHooks.length; ++i) initHooks[i](this)
   endOperation(this)
   // Suppress optimizelegibility in Webkit, since it breaks text
   // measuring on line wrapping boundaries.
@@ -104,16 +104,16 @@ export default CodeMirror
 
 // Attach the necessary event handlers when initializing the editor
 function registerEventHandlers(cm) {
-  var d = cm.display
+  let d = cm.display
   on(d.scroller, "mousedown", operation(cm, onMouseDown))
   // Older IE's will not fire a second mousedown for a double click
   if (ie && ie_version < 11)
     on(d.scroller, "dblclick", operation(cm, function(e) {
       if (signalDOMEvent(cm, e)) return
-      var pos = posFromMouse(cm, e)
+      let pos = posFromMouse(cm, e)
       if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return
       e_preventDefault(e)
-      var word = cm.findWordAt(pos)
+      let word = cm.findWordAt(pos)
       extendSelection(cm.doc, word.anchor, word.head)
     }))
   else
@@ -124,7 +124,7 @@ function registerEventHandlers(cm) {
   if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e)})
 
   // Used to suppress mouse event handling when a touch happens
-  var touchFinished, prevTouch = {end: 0}
+  let touchFinished, prevTouch = {end: 0}
   function finishTouch() {
     if (d.activeTouch) {
       touchFinished = setTimeout(function() {d.activeTouch = null}, 1000)
@@ -134,18 +134,18 @@ function registerEventHandlers(cm) {
   }
   function isMouseLikeTouchEvent(e) {
     if (e.touches.length != 1) return false
-    var touch = e.touches[0]
+    let touch = e.touches[0]
     return touch.radiusX <= 1 && touch.radiusY <= 1
   }
   function farAway(touch, other) {
     if (other.left == null) return true
-    var dx = other.left - touch.left, dy = other.top - touch.top
+    let dx = other.left - touch.left, dy = other.top - touch.top
     return dx * dx + dy * dy > 20 * 20
   }
   on(d.scroller, "touchstart", function(e) {
     if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
       clearTimeout(touchFinished)
-      var now = +new Date
+      let now = +new Date
       d.activeTouch = {start: now, moved: false,
                        prev: now - prevTouch.end <= 300 ? prevTouch : null}
       if (e.touches.length == 1) {
@@ -158,10 +158,10 @@ function registerEventHandlers(cm) {
     if (d.activeTouch) d.activeTouch.moved = true
   })
   on(d.scroller, "touchend", function(e) {
-    var touch = d.activeTouch
+    let touch = d.activeTouch
     if (touch && !eventInWidget(d, e) && touch.left != null &&
         !touch.moved && new Date - touch.start < 300) {
-      var pos = cm.coordsChar(d.activeTouch, "page"), range
+      let pos = cm.coordsChar(d.activeTouch, "page"), range
       if (!touch.prev || farAway(touch, touch.prev)) // Single tap
         range = new Range(pos, pos)
       else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
@@ -201,7 +201,7 @@ function registerEventHandlers(cm) {
     leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm) }}
   }
 
-  var inp = d.input.getField()
+  let inp = d.input.getField()
   on(inp, "keyup", function(e) { onKeyUp.call(cm, e) })
   on(inp, "keydown", operation(cm, onKeyDown))
   on(inp, "keypress", operation(cm, onKeyPress))
@@ -209,5 +209,5 @@ function registerEventHandlers(cm) {
   on(inp, "blur", function (e) { onBlur(cm, e) })
 }
 
-var initHooks = []
+let initHooks = []
 CodeMirror.defineInitHook = function(f) {initHooks.push(f)}
diff --git a/src/edit/commands.js b/src/edit/commands.js
index 2d670ab516..97a30d6d97 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -11,7 +11,7 @@ import { getOrder, lineLeft, lineRight } from "../util/bidi"
 
 // Commands are parameter-less actions that can be performed on an
 // editor, mostly used for keybindings.
-export var commands = {
+export let commands = {
   selectAll: selectAll,
   singleSelection: function(cm) {
     cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll)
@@ -19,7 +19,7 @@ export var commands = {
   killLine: function(cm) {
     deleteNearSelection(cm, function(range) {
       if (range.empty()) {
-        var len = getLine(cm.doc, range.head.line).text.length
+        let len = getLine(cm.doc, range.head.line).text.length
         if (range.head.ch == len && range.head.line < cm.lastLine())
           return {from: range.head, to: Pos(range.head.line + 1, 0)}
         else
@@ -42,15 +42,15 @@ export var commands = {
   },
   delWrappedLineLeft: function(cm) {
     deleteNearSelection(cm, function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5
-      var leftPos = cm.coordsChar({left: 0, top: top}, "div")
+      let top = cm.charCoords(range.head, "div").top + 5
+      let leftPos = cm.coordsChar({left: 0, top: top}, "div")
       return {from: leftPos, to: range.from()}
     })
   },
   delWrappedLineRight: function(cm) {
     deleteNearSelection(cm, function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5
-      var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
+      let top = cm.charCoords(range.head, "div").top + 5
+      let rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
       return {from: range.from(), to: rightPos }
     })
   },
@@ -75,20 +75,20 @@ export var commands = {
   },
   goLineRight: function(cm) {
     cm.extendSelectionsBy(function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5
+      let top = cm.charCoords(range.head, "div").top + 5
       return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
     }, sel_move)
   },
   goLineLeft: function(cm) {
     cm.extendSelectionsBy(function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5
+      let top = cm.charCoords(range.head, "div").top + 5
       return cm.coordsChar({left: 0, top: top}, "div")
     }, sel_move)
   },
   goLineLeftSmart: function(cm) {
     cm.extendSelectionsBy(function(range) {
-      var top = cm.charCoords(range.head, "div").top + 5
-      var pos = cm.coordsChar({left: 0, top: top}, "div")
+      let top = cm.charCoords(range.head, "div").top + 5
+      let pos = cm.coordsChar({left: 0, top: top}, "div")
       if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head)
       return pos
     }, sel_move)
@@ -116,10 +116,10 @@ export var commands = {
   indentLess: function(cm) {cm.indentSelection("subtract")},
   insertTab: function(cm) {cm.replaceSelection("\t")},
   insertSoftTab: function(cm) {
-    var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize
-    for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].from()
-      var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize)
+    let spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize
+    for (let i = 0; i < ranges.length; i++) {
+      let pos = ranges[i].from()
+      let col = countColumn(cm.getLine(pos.line), pos.ch, tabSize)
       spaces.push(spaceStr(tabSize - col % tabSize))
     }
     cm.replaceSelections(spaces)
@@ -130,9 +130,9 @@ export var commands = {
   },
   transposeChars: function(cm) {
     runInOp(cm, function() {
-      var ranges = cm.listSelections(), newSel = []
-      for (var i = 0; i < ranges.length; i++) {
-        var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text
+      let ranges = cm.listSelections(), newSel = []
+      for (let i = 0; i < ranges.length; i++) {
+        let cur = ranges[i].head, line = getLine(cm.doc, cur.line).text
         if (line) {
           if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1)
           if (cur.ch > 0) {
@@ -140,7 +140,7 @@ export var commands = {
             cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
                             Pos(cur.line, cur.ch - 2), cur, "+transpose")
           } else if (cur.line > cm.doc.first) {
-            var prev = getLine(cm.doc, cur.line - 1).text
+            let prev = getLine(cm.doc, cur.line - 1).text
             if (prev)
               cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
                               prev.charAt(prev.length - 1),
@@ -154,11 +154,11 @@ export var commands = {
   },
   newlineAndIndent: function(cm) {
     runInOp(cm, function() {
-      var sels = cm.listSelections()
-      for (var i = sels.length - 1; i >= 0; i--)
+      let sels = cm.listSelections()
+      for (let i = sels.length - 1; i >= 0; i--)
         cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input")
       sels = cm.listSelections()
-      for (var i = 0; i < sels.length; i++)
+      for (let i = 0; i < sels.length; i++)
         cm.indentLine(sels[i].from().line, null, true)
       ensureCursorVisible(cm)
     })
@@ -169,30 +169,30 @@ export var commands = {
 
 
 function lineStart(cm, lineN) {
-  var line = getLine(cm.doc, lineN)
-  var visual = visualLine(line)
+  let line = getLine(cm.doc, lineN)
+  let visual = visualLine(line)
   if (visual != line) lineN = lineNo(visual)
-  var order = getOrder(visual)
-  var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual)
+  let order = getOrder(visual)
+  let ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual)
   return Pos(lineN, ch)
 }
 function lineEnd(cm, lineN) {
-  var merged, line = getLine(cm.doc, lineN)
+  let merged, line = getLine(cm.doc, lineN)
   while (merged = collapsedSpanAtEnd(line)) {
     line = merged.find(1, true).line
     lineN = null
   }
-  var order = getOrder(line)
-  var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line)
+  let order = getOrder(line)
+  let ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line)
   return Pos(lineN == null ? lineNo(line) : lineN, ch)
 }
 function lineStartSmart(cm, pos) {
-  var start = lineStart(cm, pos.line)
-  var line = getLine(cm.doc, start.line)
-  var order = getOrder(line)
+  let start = lineStart(cm, pos.line)
+  let line = getLine(cm.doc, start.line)
+  let order = getOrder(line)
   if (!order || order[0].level == 0) {
-    var firstNonWS = Math.max(0, line.text.search(/\S/))
-    var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
+    let firstNonWS = Math.max(0, line.text.search(/\S/))
+    let inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
     return Pos(start.line, inWS ? 0 : firstNonWS)
   }
   return start
diff --git a/src/edit/deleteNearSelection.js b/src/edit/deleteNearSelection.js
index 00b4aa08b9..38c5342ff2 100644
--- a/src/edit/deleteNearSelection.js
+++ b/src/edit/deleteNearSelection.js
@@ -7,13 +7,13 @@ import { lst } from "../util/misc"
 // Helper for deleting text near the selection(s), used to implement
 // backspace, delete, and similar functionality.
 export function deleteNearSelection(cm, compute) {
-  var ranges = cm.doc.sel.ranges, kill = []
+  let ranges = cm.doc.sel.ranges, kill = []
   // Build up a set of ranges to kill first, merging overlapping
   // ranges.
-  for (var i = 0; i < ranges.length; i++) {
-    var toKill = compute(ranges[i])
+  for (let i = 0; i < ranges.length; i++) {
+    let toKill = compute(ranges[i])
     while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
-      var replaced = kill.pop()
+      let replaced = kill.pop()
       if (cmp(replaced.from, toKill.from) < 0) {
         toKill.from = replaced.from
         break
@@ -23,7 +23,7 @@ export function deleteNearSelection(cm, compute) {
   }
   // Next, remove those actual ranges.
   runInOp(cm, function() {
-    for (var i = kill.length - 1; i >= 0; i--)
+    for (let i = kill.length - 1; i >= 0; i--)
       replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete")
     ensureCursorVisible(cm)
   })
diff --git a/src/edit/drop_events.js b/src/edit/drop_events.js
index d2aeaa7cef..b8024d920d 100644
--- a/src/edit/drop_events.js
+++ b/src/edit/drop_events.js
@@ -14,34 +14,34 @@ import { indexOf } from "../util/misc"
 
 // Kludge to work around strange IE behavior where it'll sometimes
 // re-fire a series of drag-related events right after the drop (#1551)
-var lastDrop = 0
+let lastDrop = 0
 
 export function onDrop(e) {
-  var cm = this
+  let cm = this
   clearDragCursor(cm)
   if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
     return
   e_preventDefault(e)
   if (ie) lastDrop = +new Date
-  var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files
+  let pos = posFromMouse(cm, e, true), files = e.dataTransfer.files
   if (!pos || cm.isReadOnly()) return
   // Might be a file drop, in which case we simply extract the text
   // and insert it.
   if (files && files.length && window.FileReader && window.File) {
-    var n = files.length, text = Array(n), read = 0
-    var loadFile = function(file, i) {
+    let n = files.length, text = Array(n), read = 0
+    let loadFile = function(file, i) {
       if (cm.options.allowDropFileTypes &&
           indexOf(cm.options.allowDropFileTypes, file.type) == -1)
         return
 
-      var reader = new FileReader
+      let reader = new FileReader
       reader.onload = operation(cm, function() {
-        var content = reader.result
+        let content = reader.result
         if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = ""
         text[i] = content
         if (++read == n) {
           pos = clipPos(cm.doc, pos)
-          var change = {from: pos, to: pos,
+          let change = {from: pos, to: pos,
                         text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
                         origin: "paste"}
           makeChange(cm.doc, change)
@@ -50,7 +50,7 @@ export function onDrop(e) {
       })
       reader.readAsText(file)
     }
-    for (var i = 0; i < n; ++i) loadFile(files[i], i)
+    for (let i = 0; i < n; ++i) loadFile(files[i], i)
   } else { // Normal drop
     // Don't do a replace if the drop happened inside of the selected text.
     if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
@@ -60,12 +60,13 @@ export function onDrop(e) {
       return
     }
     try {
-      var text = e.dataTransfer.getData("Text")
+      let text = e.dataTransfer.getData("Text")
       if (text) {
+        let selected
         if (cm.state.draggingText && !cm.state.draggingText.copy)
-          var selected = cm.listSelections()
+          selected = cm.listSelections()
         setSelectionNoUndo(cm.doc, simpleSelection(pos, pos))
-        if (selected) for (var i = 0; i < selected.length; ++i)
+        if (selected) for (let i = 0; i < selected.length; ++i)
           replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag")
         cm.replaceSelection(text, "around", "paste")
         cm.display.input.focus()
@@ -85,7 +86,7 @@ export function onDragStart(cm, e) {
   // Use dummy image instead of default browsers image.
   // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
   if (e.dataTransfer.setDragImage && !safari) {
-    var img = elt("img", null, null, "position: fixed; left: 0; top: 0;")
+    let img = elt("img", null, null, "position: fixed; left: 0; top: 0;")
     img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
     if (presto) {
       img.width = img.height = 1
@@ -99,9 +100,9 @@ export function onDragStart(cm, e) {
 }
 
 export function onDragOver(cm, e) {
-  var pos = posFromMouse(cm, e)
+  let pos = posFromMouse(cm, e)
   if (!pos) return
-  var frag = document.createDocumentFragment()
+  let frag = document.createDocumentFragment()
   drawSelectionCursor(cm, pos, frag)
   if (!cm.display.dragCursor) {
     cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors")
diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
index dda26d4bff..7d22101469 100644
--- a/src/edit/fromTextArea.js
+++ b/src/edit/fromTextArea.js
@@ -13,19 +13,22 @@ export function fromTextArea(textarea, options) {
   // Set autofocus to true if this textarea is focused, or if it has
   // autofocus and no other element is focused.
   if (options.autofocus == null) {
-    var hasFocus = activeElt()
+    let hasFocus = activeElt()
     options.autofocus = hasFocus == textarea ||
       textarea.getAttribute("autofocus") != null && hasFocus == document.body
   }
 
   function save() {textarea.value = cm.getValue()}
+
+  let realSubmit
   if (textarea.form) {
     on(textarea.form, "submit", save)
     // Deplorable hack to make the submit method do the right thing.
     if (!options.leaveSubmitMethodAlone) {
-      var form = textarea.form, realSubmit = form.submit
+      let form = textarea.form
+      realSubmit = form.submit
       try {
-        var wrappedSubmit = form.submit = function() {
+        let wrappedSubmit = form.submit = function() {
           save()
           form.submit = realSubmit
           form.submit()
@@ -52,7 +55,7 @@ export function fromTextArea(textarea, options) {
   }
 
   textarea.style.display = "none"
-  var cm = CodeMirror(function(node) {
+  let cm = CodeMirror(function(node) {
     textarea.parentNode.insertBefore(node, textarea.nextSibling)
   }, options)
   return cm
diff --git a/src/edit/global_events.js b/src/edit/global_events.js
index 57542f2d32..a7ec22fe89 100644
--- a/src/edit/global_events.js
+++ b/src/edit/global_events.js
@@ -7,14 +7,14 @@ import { on } from "../util/event"
 
 function forEachCodeMirror(f) {
   if (!document.body.getElementsByClassName) return
-  var byClass = document.body.getElementsByClassName("CodeMirror")
-  for (var i = 0; i < byClass.length; i++) {
-    var cm = byClass[i].CodeMirror
+  let byClass = document.body.getElementsByClassName("CodeMirror")
+  for (let i = 0; i < byClass.length; i++) {
+    let cm = byClass[i].CodeMirror
     if (cm) f(cm)
   }
 }
 
-var globalsRegistered = false
+let globalsRegistered = false
 export function ensureGlobalHandlers() {
   if (globalsRegistered) return
   registerGlobalHandlers()
@@ -22,7 +22,7 @@ export function ensureGlobalHandlers() {
 }
 function registerGlobalHandlers() {
   // When the window resizes, we need to refresh active editors.
-  var resizeTimer
+  let resizeTimer
   on(window, "resize", function() {
     if (resizeTimer == null) resizeTimer = setTimeout(function() {
       resizeTimer = null
@@ -36,7 +36,7 @@ function registerGlobalHandlers() {
 }
 // Called when the window resizes
 function onResize(cm) {
-  var d = cm.display
+  let d = cm.display
   if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
     return
   // Might be a text scaling operation, clear size caches.
diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index 9a4944414c..8530aef315 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -19,7 +19,7 @@ function doHandleBinding(cm, bound, dropShift) {
   // Ensure previous input has been read, so that the handler sees a
   // consistent view of the document
   cm.display.input.ensurePolled()
-  var prevShift = cm.display.shift, done = false
+  let prevShift = cm.display.shift, done = false
   try {
     if (cm.isReadOnly()) cm.state.suppressEdits = true
     if (dropShift) cm.display.shift = false
@@ -32,17 +32,17 @@ function doHandleBinding(cm, bound, dropShift) {
 }
 
 function lookupKeyForEditor(cm, name, handle) {
-  for (var i = 0; i < cm.state.keyMaps.length; i++) {
-    var result = lookupKey(name, cm.state.keyMaps[i], handle, cm)
+  for (let i = 0; i < cm.state.keyMaps.length; i++) {
+    let result = lookupKey(name, cm.state.keyMaps[i], handle, cm)
     if (result) return result
   }
   return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
     || lookupKey(name, cm.options.keyMap, handle, cm)
 }
 
-var stopSeq = new Delayed
+let stopSeq = new Delayed
 function dispatchKey(cm, name, e, handle) {
-  var seq = cm.state.keySeq
+  let seq = cm.state.keySeq
   if (seq) {
     if (isModifierKey(name)) return "handled"
     stopSeq.set(50, function() {
@@ -53,7 +53,7 @@ function dispatchKey(cm, name, e, handle) {
     })
     name = seq + " " + name
   }
-  var result = lookupKeyForEditor(cm, name, handle)
+  let result = lookupKeyForEditor(cm, name, handle)
 
   if (result == "multi")
     cm.state.keySeq = name
@@ -74,7 +74,7 @@ function dispatchKey(cm, name, e, handle) {
 
 // Handle a key from the keydown event.
 function handleKeyBinding(cm, e) {
-  var name = keyName(e, true)
+  let name = keyName(e, true)
   if (!name) return false
 
   if (e.shiftKey && !cm.state.keySeq) {
@@ -97,16 +97,16 @@ function handleCharBinding(cm, e, ch) {
                      function(b) { return doHandleBinding(cm, b, true) })
 }
 
-var lastStoppedKey = null
+let lastStoppedKey = null
 export function onKeyDown(e) {
-  var cm = this
+  let cm = this
   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
-  var code = e.keyCode
+  let code = e.keyCode
   cm.display.shift = code == 16 || e.shiftKey
-  var handled = handleKeyBinding(cm, e)
+  let handled = handleKeyBinding(cm, e)
   if (presto) {
     lastStoppedKey = handled ? code : null
     // Opera has no cut event... we try to at least catch the key combo
@@ -120,7 +120,7 @@ export function onKeyDown(e) {
 }
 
 function showCrossHair(cm) {
-  var lineDiv = cm.display.lineDiv
+  let lineDiv = cm.display.lineDiv
   addClass(lineDiv, "CodeMirror-crosshair")
 
   function up(e) {
@@ -140,12 +140,12 @@ export function onKeyUp(e) {
 }
 
 export function onKeyPress(e) {
-  var cm = this
+  let cm = this
   if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return
-  var keyCode = e.keyCode, charCode = e.charCode
+  let keyCode = e.keyCode, charCode = e.charCode
   if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}
   if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return
-  var ch = String.fromCharCode(charCode == null ? keyCode : charCode)
+  let ch = String.fromCharCode(charCode == null ? keyCode : charCode)
   // Some browsers fire keypress events for backspace
   if (ch == "\x08") return
   if (handleCharBinding(cm, e, ch)) return
diff --git a/src/edit/main.js b/src/edit/main.js
index 3f76d70207..55432c0812 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -17,8 +17,8 @@ addEditorMethods(CodeMirror)
 import Doc from "../model/Doc"
 
 // Set up methods on CodeMirror's prototype to redirect to the editor's document.
-var dontDelegate = "iter insert remove copy getEditor constructor".split(" ")
-for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
+let dontDelegate = "iter insert remove copy getEditor constructor".split(" ")
+for (let prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
   CodeMirror.prototype[prop] = (function(method) {
     return function() {return method.apply(this.doc, arguments)}
   })(Doc.prototype[prop])
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 828304d3dc..04be851246 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -32,16 +32,16 @@ import { regChange, regLineChange } from "../display/view_tracking"
 // convenience.
 
 export default function(CodeMirror) {
-  var optionHandlers = CodeMirror.optionHandlers
+  let optionHandlers = CodeMirror.optionHandlers
 
-  var helpers = CodeMirror.helpers = {}
+  let helpers = CodeMirror.helpers = {}
 
   CodeMirror.prototype = {
     constructor: CodeMirror,
     focus: function(){window.focus(); this.display.input.focus()},
 
     setOption: function(option, value) {
-      var options = this.options, old = options[option]
+      let options = this.options, old = options[option]
       if (options[option] == value && option != "mode") return
       options[option] = value
       if (optionHandlers.hasOwnProperty(option))
@@ -55,8 +55,8 @@ export default function(CodeMirror) {
       this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map))
     },
     removeKeyMap: function(map) {
-      var maps = this.state.keyMaps
-      for (var i = 0; i < maps.length; ++i)
+      let maps = this.state.keyMaps
+      for (let i = 0; i < maps.length; ++i)
         if (maps[i] == map || maps[i].name == map) {
           maps.splice(i, 1)
           return true
@@ -64,7 +64,7 @@ export default function(CodeMirror) {
     },
 
     addOverlay: methodOp(function(spec, options) {
-      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec)
+      let mode = spec.token ? spec : CodeMirror.getMode(this.options, spec)
       if (mode.startState) throw new Error("Overlays may not be stateful.")
       insertSorted(this.state.overlays,
                    {mode: mode, modeSpec: spec, opaque: options && options.opaque,
@@ -74,9 +74,9 @@ export default function(CodeMirror) {
       regChange(this)
     }),
     removeOverlay: methodOp(function(spec) {
-      var overlays = this.state.overlays
-      for (var i = 0; i < overlays.length; ++i) {
-        var cur = overlays[i].modeSpec
+      let overlays = this.state.overlays
+      for (let i = 0; i < overlays.length; ++i) {
+        let cur = overlays[i].modeSpec
         if (cur == spec || typeof spec == "string" && cur.name == spec) {
           overlays.splice(i, 1)
           this.state.modeGen++
@@ -94,16 +94,16 @@ export default function(CodeMirror) {
       if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive)
     }),
     indentSelection: methodOp(function(how) {
-      var ranges = this.doc.sel.ranges, end = -1
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i]
+      let ranges = this.doc.sel.ranges, end = -1
+      for (let i = 0; i < ranges.length; i++) {
+        let range = ranges[i]
         if (!range.empty()) {
-          var from = range.from(), to = range.to()
-          var start = Math.max(end, from.line)
+          let from = range.from(), to = range.to()
+          let start = Math.max(end, from.line)
           end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1
-          for (var j = start; j < end; ++j)
+          for (let j = start; j < end; ++j)
             indentLine(this, j, how)
-          var newRanges = this.doc.sel.ranges
+          let newRanges = this.doc.sel.ranges
           if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
             replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll)
         } else if (range.head.line > end) {
@@ -126,22 +126,22 @@ export default function(CodeMirror) {
 
     getTokenTypeAt: function(pos) {
       pos = clipPos(this.doc, pos)
-      var styles = getLineStyles(this, getLine(this.doc, pos.line))
-      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch
-      var type
+      let styles = getLineStyles(this, getLine(this.doc, pos.line))
+      let before = 0, after = (styles.length - 1) / 2, ch = pos.ch
+      let type
       if (ch == 0) type = styles[2]
       else for (;;) {
-        var mid = (before + after) >> 1
+        let mid = (before + after) >> 1
         if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid
         else if (styles[mid * 2 + 1] < ch) before = mid + 1
         else { type = styles[mid * 2 + 2]; break }
       }
-      var cut = type ? type.indexOf("cm-overlay ") : -1
+      let cut = type ? type.indexOf("cm-overlay ") : -1
       return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1)
     },
 
     getModeAt: function(pos) {
-      var mode = this.doc.mode
+      let mode = this.doc.mode
       if (!mode.innerMode) return mode
       return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode
     },
@@ -151,14 +151,14 @@ export default function(CodeMirror) {
     },
 
     getHelpers: function(pos, type) {
-      var found = []
+      let found = []
       if (!helpers.hasOwnProperty(type)) return found
-      var help = helpers[type], mode = this.getModeAt(pos)
+      let help = helpers[type], mode = this.getModeAt(pos)
       if (typeof mode[type] == "string") {
         if (help[mode[type]]) found.push(help[mode[type]])
       } else if (mode[type]) {
-        for (var i = 0; i < mode[type].length; i++) {
-          var val = help[mode[type][i]]
+        for (let i = 0; i < mode[type].length; i++) {
+          let val = help[mode[type][i]]
           if (val) found.push(val)
         }
       } else if (mode.helperType && help[mode.helperType]) {
@@ -166,8 +166,8 @@ export default function(CodeMirror) {
       } else if (help[mode.name]) {
         found.push(help[mode.name])
       }
-      for (var i = 0; i < help._global.length; i++) {
-        var cur = help._global[i]
+      for (let i = 0; i < help._global.length; i++) {
+        let cur = help._global[i]
         if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)
           found.push(cur.val)
       }
@@ -175,13 +175,13 @@ export default function(CodeMirror) {
     },
 
     getStateAfter: function(line, precise) {
-      var doc = this.doc
+      let doc = this.doc
       line = clipLine(doc, line == null ? doc.first + doc.size - 1: line)
       return getStateBefore(this, line + 1, precise)
     },
 
     cursorCoords: function(start, mode) {
-      var pos, range = this.doc.sel.primary()
+      let pos, range = this.doc.sel.primary()
       if (start == null) pos = range.head
       else if (typeof start == "object") pos = clipPos(this.doc, start)
       else pos = start ? range.from() : range.to()
@@ -202,9 +202,9 @@ export default function(CodeMirror) {
       return lineAtHeight(this.doc, height + this.display.viewOffset)
     },
     heightAtLine: function(line, mode) {
-      var end = false, lineObj
+      let end = false, lineObj
       if (typeof line == "number") {
-        var last = this.doc.first + this.doc.size - 1
+        let 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)
@@ -220,7 +220,7 @@ export default function(CodeMirror) {
 
     setGutterMarker: methodOp(function(line, gutterID, value) {
       return changeLine(this.doc, line, "gutter", function(line) {
-        var markers = line.gutterMarkers || (line.gutterMarkers = {})
+        let markers = line.gutterMarkers || (line.gutterMarkers = {})
         markers[gutterID] = value
         if (!value && isEmpty(markers)) line.gutterMarkers = null
         return true
@@ -228,7 +228,7 @@ export default function(CodeMirror) {
     }),
 
     clearGutter: methodOp(function(gutterID) {
-      var cm = this, doc = cm.doc, i = doc.first
+      let cm = this, doc = cm.doc, i = doc.first
       doc.iter(function(line) {
         if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
           line.gutterMarkers[gutterID] = null
@@ -240,13 +240,14 @@ export default function(CodeMirror) {
     }),
 
     lineInfo: function(line) {
+      let n
       if (typeof line == "number") {
         if (!isLine(this.doc, line)) return null
-        var n = line
+        n = line
         line = getLine(this.doc, line)
         if (!line) return null
       } else {
-        var n = lineNo(line)
+        n = lineNo(line)
         if (n == null) return null
       }
       return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
@@ -257,9 +258,9 @@ export default function(CodeMirror) {
     getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}},
 
     addWidget: function(pos, node, scroll, vert, horiz) {
-      var display = this.display
+      let display = this.display
       pos = cursorCoords(this, clipPos(this.doc, pos))
-      var top = pos.bottom, left = pos.left
+      let top = pos.bottom, left = pos.left
       node.style.position = "absolute"
       node.setAttribute("cm-ignore-events", "true")
       this.display.input.setUneditable(node)
@@ -267,7 +268,7 @@ export default function(CodeMirror) {
       if (vert == "over") {
         top = pos.top
       } else if (vert == "above" || vert == "near") {
-        var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
+        let vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
         hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth)
         // Default to positioning above (if specified and possible); otherwise default to positioning below
         if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
@@ -303,9 +304,10 @@ export default function(CodeMirror) {
     triggerElectric: methodOp(function(text) { triggerElectric(this, text) }),
 
     findPosH: function(from, amount, unit, visually) {
-      var dir = 1
+      let dir = 1
       if (amount < 0) { dir = -1; amount = -amount }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
+      let cur = clipPos(this.doc, from)
+      for (let i = 0; i < amount; ++i) {
         cur = findPosH(this.doc, cur, dir, unit, visually)
         if (cur.hitSide) break
       }
@@ -313,7 +315,7 @@ export default function(CodeMirror) {
     },
 
     moveH: methodOp(function(dir, unit) {
-      var cm = this
+      let cm = this
       cm.extendSelectionsBy(function(range) {
         if (cm.display.shift || cm.doc.extend || range.empty())
           return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually)
@@ -323,21 +325,22 @@ export default function(CodeMirror) {
     }),
 
     deleteH: methodOp(function(dir, unit) {
-      var sel = this.doc.sel, doc = this.doc
+      let sel = this.doc.sel, doc = this.doc
       if (sel.somethingSelected())
         doc.replaceSelection("", null, "+delete")
       else
         deleteNearSelection(this, function(range) {
-          var other = findPosH(doc, range.head, dir, unit, false)
+          let other = findPosH(doc, range.head, dir, unit, false)
           return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other}
         })
     }),
 
     findPosV: function(from, amount, unit, goalColumn) {
-      var dir = 1, x = goalColumn
+      let dir = 1, x = goalColumn
       if (amount < 0) { dir = -1; amount = -amount }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        var coords = cursorCoords(this, cur, "div")
+      let cur = clipPos(this.doc, from)
+      for (let i = 0; i < amount; ++i) {
+        let coords = cursorCoords(this, cur, "div")
         if (x == null) x = coords.left
         else coords.left = x
         cur = findPosV(this, coords, dir, unit)
@@ -347,32 +350,32 @@ export default function(CodeMirror) {
     },
 
     moveV: methodOp(function(dir, unit) {
-      var cm = this, doc = this.doc, goals = []
-      var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected()
+      let cm = this, doc = this.doc, goals = []
+      let collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected()
       doc.extendSelectionsBy(function(range) {
         if (collapse)
           return dir < 0 ? range.from() : range.to()
-        var headPos = cursorCoords(cm, range.head, "div")
+        let headPos = cursorCoords(cm, range.head, "div")
         if (range.goalColumn != null) headPos.left = range.goalColumn
         goals.push(headPos.left)
-        var pos = findPosV(cm, headPos, dir, unit)
+        let pos = findPosV(cm, headPos, dir, unit)
         if (unit == "page" && range == doc.sel.primary())
           addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top)
         return pos
       }, sel_move)
-      if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
+      if (goals.length) for (let i = 0; i < doc.sel.ranges.length; i++)
         doc.sel.ranges[i].goalColumn = goals[i]
     }),
 
     // Find the word at the given position (as returned by coordsChar).
     findWordAt: function(pos) {
-      var doc = this.doc, line = getLine(doc, pos.line).text
-      var start = pos.ch, end = pos.ch
+      let doc = this.doc, line = getLine(doc, pos.line).text
+      let start = pos.ch, end = pos.ch
       if (line) {
-        var helper = this.getHelper(pos, "wordChars")
+        let helper = this.getHelper(pos, "wordChars")
         if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end
-        var startChar = line.charAt(start)
-        var check = isWordChar(startChar, helper)
+        let startChar = line.charAt(start)
+        let check = isWordChar(startChar, helper)
           ? function(ch) { return isWordChar(ch, helper) }
           : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch)}
           : function(ch) {return !/\s/.test(ch) && !isWordChar(ch)}
@@ -400,7 +403,7 @@ export default function(CodeMirror) {
       if (y != null) this.curOp.scrollTop = y
     }),
     getScrollInfo: function() {
-      var scroller = this.display.scroller
+      let scroller = this.display.scroller
       return {left: scroller.scrollLeft, top: scroller.scrollTop,
               height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
               width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
@@ -423,7 +426,7 @@ export default function(CodeMirror) {
         resolveScrollToPos(this)
         this.curOp.scrollToPos = range
       } else {
-        var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
+        let sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
                                       Math.min(range.from.top, range.to.top) - range.margin,
                                       Math.max(range.from.right, range.to.right),
                                       Math.max(range.from.bottom, range.to.bottom) + range.margin)
@@ -432,16 +435,16 @@ export default function(CodeMirror) {
     }),
 
     setSize: methodOp(function(width, height) {
-      var cm = this
+      let cm = this
       function interpret(val) {
         return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val
       }
       if (width != null) cm.display.wrapper.style.width = interpret(width)
       if (height != null) cm.display.wrapper.style.height = interpret(height)
       if (cm.options.lineWrapping) clearLineMeasurementCache(this)
-      var lineNo = cm.display.viewFrom
+      let lineNo = cm.display.viewFrom
       cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
-        if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
+        if (line.widgets) for (let i = 0; i < line.widgets.length; i++)
           if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break }
         ++lineNo
       })
@@ -452,7 +455,7 @@ export default function(CodeMirror) {
     operation: function(f){return runInOp(this, f)},
 
     refresh: methodOp(function() {
-      var oldHeight = this.display.cachedTextHeight
+      let oldHeight = this.display.cachedTextHeight
       regChange(this)
       this.curOp.forceUpdate = true
       clearCaches(this)
@@ -464,7 +467,7 @@ export default function(CodeMirror) {
     }),
 
     swapDoc: methodOp(function(doc) {
-      var old = this.doc
+      let old = this.doc
       old.cm = null
       attachDoc(this, doc)
       clearCaches(this)
@@ -502,16 +505,16 @@ export default function(CodeMirror) {
 // position. The resulting position will have a hitSide=true
 // property if it reached the end of the document.
 function findPosH(doc, pos, dir, unit, visually) {
-  var line = pos.line, ch = pos.ch, origDir = dir
-  var lineObj = getLine(doc, line)
+  let line = pos.line, ch = pos.ch, origDir = dir
+  let lineObj = getLine(doc, line)
   function findNextLine() {
-    var l = line + dir
+    let l = line + dir
     if (l < doc.first || l >= doc.first + doc.size) return false
     line = l
     return lineObj = getLine(doc, l)
   }
   function moveOnce(boundToLine) {
-    var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true)
+    let next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true)
     if (next == null) {
       if (!boundToLine && findNextLine()) {
         if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj)
@@ -526,12 +529,12 @@ function findPosH(doc, pos, dir, unit, visually) {
   } else if (unit == "column") {
     moveOnce(true)
   } else if (unit == "word" || unit == "group") {
-    var sawType = null, group = unit == "group"
-    var helper = doc.cm && doc.cm.getHelper(pos, "wordChars")
-    for (var first = true;; first = false) {
+    let sawType = null, group = unit == "group"
+    let helper = doc.cm && doc.cm.getHelper(pos, "wordChars")
+    for (let first = true;; first = false) {
       if (dir < 0 && !moveOnce(!first)) break
-      var cur = lineObj.text.charAt(ch) || "\n"
-      var type = isWordChar(cur, helper) ? "w"
+      let cur = lineObj.text.charAt(ch) || "\n"
+      let type = isWordChar(cur, helper) ? "w"
         : group && cur == "\n" ? "n"
         : !group || /\s/.test(cur) ? null
         : "p"
@@ -545,7 +548,7 @@ function findPosH(doc, pos, dir, unit, visually) {
       if (dir > 0 && !moveOnce(!first)) break
     }
   }
-  var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true)
+  let result = skipAtomic(doc, Pos(line, ch), pos, origDir, true)
   if (!cmp(pos, result)) result.hitSide = true
   return result
 }
@@ -554,17 +557,18 @@ function findPosH(doc, pos, dir, unit, visually) {
 // "page" or "line". The resulting position will have a hitSide=true
 // property if it reached the end of the document.
 function findPosV(cm, pos, dir, unit) {
-  var doc = cm.doc, x = pos.left, y
+  let doc = cm.doc, x = pos.left, y
   if (unit == "page") {
-    var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight)
-    var moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3)
+    let pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight)
+    let moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3)
     y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount
 
   } else if (unit == "line") {
     y = dir > 0 ? pos.bottom + 3 : pos.top - 3
   }
+  let target
   for (;;) {
-    var target = coordsChar(cm, x, y)
+    target = coordsChar(cm, x, y)
     if (!target.outside) break
     if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break }
     y += dir * 5
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 408cc497d1..5fe10ea39f 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -19,7 +19,7 @@ import { bind, countColumn, findColumn, sel_mouse } from "../util/misc"
 // middle-click-paste. Or it might be a click on something we should
 // not interfere with, such as a scrollbar or widget.
 export function onMouseDown(e) {
-  var cm = this, display = cm.display
+  let cm = this, display = cm.display
   if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return
   display.shift = e.shiftKey
 
@@ -33,7 +33,7 @@ export function onMouseDown(e) {
     return
   }
   if (clickInGutter(cm, e)) return
-  var start = posFromMouse(cm, e)
+  let start = posFromMouse(cm, e)
   window.focus()
 
   switch (e_button(e)) {
@@ -59,12 +59,12 @@ export function onMouseDown(e) {
   }
 }
 
-var lastClick, lastDoubleClick
+let lastClick, lastDoubleClick
 function leftButtonDown(cm, e, start) {
   if (ie) setTimeout(bind(ensureFocus, cm), 0)
   else cm.curOp.focus = activeElt()
 
-  var now = +new Date, type
+  let now = +new Date, type
   if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
     type = "triple"
   } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
@@ -75,7 +75,7 @@ function leftButtonDown(cm, e, start) {
     lastClick = {time: now, pos: start}
   }
 
-  var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained
+  let sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained
   if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
       type == "single" && (contained = sel.contains(start)) > -1 &&
       (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
@@ -88,8 +88,8 @@ function leftButtonDown(cm, e, start) {
 // 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, startTime = +new Date
-  var dragEnd = operation(cm, function(e2) {
+  let display = cm.display, startTime = +new Date
+  let dragEnd = operation(cm, function(e2) {
     if (webkit) display.scroller.draggable = false
     cm.state.draggingText = false
     off(document, "mouseup", dragEnd)
@@ -117,10 +117,10 @@ function leftButtonStartDrag(cm, e, start, modifier) {
 
 // Normal selection, as opposed to text dragging.
 function leftButtonSelect(cm, e, start, type, addNew) {
-  var display = cm.display, doc = cm.doc
+  let display = cm.display, doc = cm.doc
   e_preventDefault(e)
 
-  var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges
+  let ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges
   if (addNew && !e.shiftKey) {
     ourIndex = doc.sel.contains(start)
     if (ourIndex > -1)
@@ -138,13 +138,13 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     start = posFromMouse(cm, e, true, true)
     ourIndex = -1
   } else if (type == "double") {
-    var word = cm.findWordAt(start)
+    let word = cm.findWordAt(start)
     if (cm.display.shift || doc.extend)
       ourRange = extendRange(doc, ourRange, word.anchor, word.head)
     else
       ourRange = word
   } else if (type == "triple") {
-    var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)))
+    let line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)))
     if (cm.display.shift || doc.extend)
       ourRange = extendRange(doc, ourRange, line.anchor, line.head)
     else
@@ -169,19 +169,19 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     replaceOneSelection(doc, ourIndex, ourRange, sel_mouse)
   }
 
-  var lastPos = start
+  let lastPos = start
   function extendTo(pos) {
     if (cmp(lastPos, pos) == 0) return
     lastPos = pos
 
     if (type == "rect") {
-      var ranges = [], tabSize = cm.options.tabSize
-      var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize)
-      var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize)
-      var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol)
-      for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
+      let ranges = [], tabSize = cm.options.tabSize
+      let startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize)
+      let posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize)
+      let left = Math.min(startCol, posCol), right = Math.max(startCol, posCol)
+      for (let line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
            line <= end; line++) {
-        var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize)
+        let text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize)
         if (left == right)
           ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)))
         else if (text.length > leftPos)
@@ -192,13 +192,14 @@ function leftButtonSelect(cm, e, start, type, addNew) {
                    {origin: "*mouse", scroll: false})
       cm.scrollIntoView(pos)
     } else {
-      var oldRange = ourRange
-      var anchor = oldRange.anchor, head = pos
+      let oldRange = ourRange
+      let anchor = oldRange.anchor, head = pos
       if (type != "single") {
+        let range
         if (type == "double")
-          var range = cm.findWordAt(pos)
+          range = cm.findWordAt(pos)
         else
-          var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)))
+          range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)))
         if (cmp(range.anchor, anchor) > 0) {
           head = range.head
           anchor = minPos(oldRange.from(), range.anchor)
@@ -207,31 +208,31 @@ function leftButtonSelect(cm, e, start, type, addNew) {
           anchor = maxPos(oldRange.to(), range.head)
         }
       }
-      var ranges = startSel.ranges.slice(0)
+      let ranges = startSel.ranges.slice(0)
       ranges[ourIndex] = new Range(clipPos(doc, anchor), head)
       setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse)
     }
   }
 
-  var editorSize = display.wrapper.getBoundingClientRect()
+  let editorSize = display.wrapper.getBoundingClientRect()
   // Used to ensure timeout re-tries don't fire when another extend
   // happened in the meantime (clearTimeout isn't reliable -- at
   // least on Chrome, the timeouts still happen even when cleared,
   // if the clear happens after their scheduled firing time).
-  var counter = 0
+  let counter = 0
 
   function extend(e) {
-    var curCount = ++counter
-    var cur = posFromMouse(cm, e, true, type == "rect")
+    let curCount = ++counter
+    let cur = posFromMouse(cm, e, true, type == "rect")
     if (!cur) return
     if (cmp(cur, lastPos) != 0) {
       cm.curOp.focus = activeElt()
       extendTo(cur)
-      var visible = visibleLines(display, doc)
+      let visible = visibleLines(display, doc)
       if (cur.line >= visible.to || cur.line < visible.from)
         setTimeout(operation(cm, function(){if (counter == curCount) extend(e)}), 150)
     } else {
-      var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0
+      let outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0
       if (outside) setTimeout(operation(cm, function() {
         if (counter != curCount) return
         display.scroller.scrollTop += outside
@@ -250,11 +251,11 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     doc.history.lastSelOrigin = null
   }
 
-  var move = operation(cm, function(e) {
+  let move = operation(cm, function(e) {
     if (!e_button(e)) done(e)
     else extend(e)
   })
-  var up = operation(cm, done)
+  let up = operation(cm, done)
   cm.state.selectingText = up
   on(document, "mousemove", move)
   on(document, "mouseup", up)
@@ -264,22 +265,23 @@ function leftButtonSelect(cm, e, start, type, addNew) {
 // Determines whether an event happened in the gutter, and fires the
 // handlers for the corresponding event.
 function gutterEvent(cm, e, type, prevent) {
-  try { var mX = e.clientX, mY = e.clientY }
+  let mX, mY
+  try { mX = e.clientX; mY = e.clientY }
   catch(e) { return false }
   if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false
   if (prevent) e_preventDefault(e)
 
-  var display = cm.display
-  var lineBox = display.lineDiv.getBoundingClientRect()
+  let display = cm.display
+  let lineBox = display.lineDiv.getBoundingClientRect()
 
   if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e)
   mY -= lineBox.top - display.viewOffset
 
-  for (var i = 0; i < cm.options.gutters.length; ++i) {
-    var g = display.gutters.childNodes[i]
+  for (let i = 0; i < cm.options.gutters.length; ++i) {
+    let g = display.gutters.childNodes[i]
     if (g && g.getBoundingClientRect().right >= mX) {
-      var line = lineAtHeight(cm.doc, mY)
-      var gutter = cm.options.gutters[i]
+      let line = lineAtHeight(cm.doc, mY)
+      let gutter = cm.options.gutters[i]
       signal(cm, type, cm, line, gutter, e)
       return e_defaultPrevented(e)
     }
diff --git a/src/edit/options.js b/src/edit/options.js
index cf0d4d8185..a2ca1c6803 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -17,13 +17,13 @@ import { off, on } from "../util/event"
 
 import { themeChanged } from "./utils"
 
-export var Init = {toString: function(){return "CodeMirror.Init"}}
+export let Init = {toString: function(){return "CodeMirror.Init"}}
 
-export var defaults = {}
-export var optionHandlers = {}
+export let defaults = {}
+export let optionHandlers = {}
 
 export function defineOptions(CodeMirror) {
-  var optionHandlers = CodeMirror.optionHandlers
+  let optionHandlers = CodeMirror.optionHandlers
 
   function option(name, deflt, handle, notOnInit) {
     CodeMirror.defaults[name] = deflt
@@ -57,17 +57,17 @@ export function defineOptions(CodeMirror) {
   option("lineSeparator", null, function(cm, val) {
     cm.doc.lineSep = val
     if (!val) return
-    var newBreaks = [], lineNo = cm.doc.first
+    let newBreaks = [], lineNo = cm.doc.first
     cm.doc.iter(function(line) {
-      for (var pos = 0;;) {
-        var found = line.text.indexOf(val, pos)
+      for (let pos = 0;;) {
+        let found = line.text.indexOf(val, pos)
         if (found == -1) break
         pos = found + val.length
         newBreaks.push(Pos(lineNo, found))
       }
       lineNo++
     })
-    for (var i = newBreaks.length - 1; i >= 0; i--)
+    for (let i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   })
   option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
@@ -90,8 +90,8 @@ export function defineOptions(CodeMirror) {
     guttersChanged(cm)
   }, true)
   option("keyMap", "default", function(cm, val, old) {
-    var next = getKeyMap(val)
-    var prev = old != Init && getKeyMap(old)
+    let next = getKeyMap(val)
+    let prev = old != Init && getKeyMap(old)
     if (prev && prev.detach) prev.detach(cm, next)
     if (next.attach) next.attach(cm, prev || null)
   })
@@ -168,10 +168,10 @@ function guttersChanged(cm) {
 }
 
 function dragDropChanged(cm, value, old) {
-  var wasOn = old && old != Init
+  let wasOn = old && old != Init
   if (!value != !wasOn) {
-    var funcs = cm.display.dragFunctions
-    var toggle = value ? on : off
+    let funcs = cm.display.dragFunctions
+    let toggle = value ? on : off
     toggle(cm.display.scroller, "dragstart", funcs.start)
     toggle(cm.display.scroller, "dragenter", funcs.enter)
     toggle(cm.display.scroller, "dragover", funcs.over)
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 51597d19fa..80e91f847f 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -25,8 +25,8 @@ export default function ContentEditableInput(cm) {
 
 ContentEditableInput.prototype = copyObj({
   init: function(display) {
-    var input = this, cm = input.cm
-    var div = input.div = display.lineDiv
+    let input = this, cm = input.cm
+    let div = input.div = display.lineDiv
     disableBrowserMagic(div, cm.options.spellcheck)
 
     on(div, "paste", function(e) {
@@ -38,12 +38,12 @@ ContentEditableInput.prototype = copyObj({
     })
 
     on(div, "compositionstart", function(e) {
-      var data = e.data
+      let data = e.data
       input.composing = {sel: cm.doc.sel, data: data, startData: data}
       if (!data) return
-      var prim = cm.doc.sel.primary()
-      var line = cm.getLine(prim.head.line)
-      var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length))
+      let prim = cm.doc.sel.primary()
+      let line = cm.getLine(prim.head.line)
+      let found = line.indexOf(data, Math.max(0, prim.head.ch - data.length))
       if (found > -1 && found <= prim.head.ch)
         input.composing.sel = simpleSelection(Pos(prim.head.line, found),
                                               Pos(prim.head.line, found + data.length))
@@ -52,7 +52,7 @@ ContentEditableInput.prototype = copyObj({
       input.composing.data = e.data
     })
     on(div, "compositionend", function(e) {
-      var ours = input.composing
+      let ours = input.composing
       if (!ours) return
       if (e.data != ours.startData && !/\u200b/.test(e.data))
         ours.data = e.data
@@ -85,7 +85,7 @@ ContentEditableInput.prototype = copyObj({
       } else if (!cm.options.lineWiseCopyCut) {
         return
       } else {
-        var ranges = copyableRanges(cm)
+        let ranges = copyableRanges(cm)
         setLastCopied({lineWise: true, text: ranges.text})
         if (e.type == "cut") {
           cm.operation(function() {
@@ -96,7 +96,7 @@ ContentEditableInput.prototype = copyObj({
       }
       if (e.clipboardData) {
         e.clipboardData.clearData()
-        var content = lastCopied.text.join("\n")
+        let content = lastCopied.text.join("\n")
         // iOS exposes the clipboard API, but seems to discard content inserted into it
         e.clipboardData.setData("Text", content)
         if (e.clipboardData.getData("Text") == content) {
@@ -105,10 +105,10 @@ ContentEditableInput.prototype = copyObj({
         }
       }
       // Old-fashioned briefly-focus-a-textarea hack
-      var kludge = hiddenTextarea(), te = kludge.firstChild
+      let kludge = hiddenTextarea(), te = kludge.firstChild
       cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild)
       te.value = lastCopied.text.join("\n")
-      var hadFocus = document.activeElement
+      let hadFocus = document.activeElement
       selectInput(te)
       setTimeout(function() {
         cm.display.lineSpace.removeChild(kludge)
@@ -121,7 +121,7 @@ ContentEditableInput.prototype = copyObj({
   },
 
   prepareSelection: function() {
-    var result = prepareSelection(this.cm, false)
+    let result = prepareSelection(this.cm, false)
     result.focus = this.cm.state.focused
     return result
   },
@@ -133,29 +133,30 @@ ContentEditableInput.prototype = copyObj({
   },
 
   showPrimarySelection: function() {
-    var sel = window.getSelection(), prim = this.cm.doc.sel.primary()
-    var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset)
-    var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset)
+    let sel = window.getSelection(), prim = this.cm.doc.sel.primary()
+    let curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset)
+    let curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset)
     if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
         cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
         cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
       return
 
-    var start = posToDOM(this.cm, prim.from())
-    var end = posToDOM(this.cm, prim.to())
+    let start = posToDOM(this.cm, prim.from())
+    let end = posToDOM(this.cm, prim.to())
     if (!start && !end) return
 
-    var view = this.cm.display.view
-    var old = sel.rangeCount && sel.getRangeAt(0)
+    let view = this.cm.display.view
+    let old = sel.rangeCount && sel.getRangeAt(0)
     if (!start) {
       start = {node: view[0].measure.map[2], offset: 0}
     } else if (!end) { // FIXME dangerously hacky
-      var measure = view[view.length - 1].measure
-      var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map
+      let measure = view[view.length - 1].measure
+      let map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map
       end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]}
     }
 
-    try { var rng = range(start.node, start.offset, end.offset, end.node) }
+    let rng
+    try { rng = range(start.node, start.offset, end.offset, end.node) }
     catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
     if (rng) {
       if (!gecko && this.cm.state.focused) {
@@ -172,7 +173,7 @@ ContentEditableInput.prototype = copyObj({
   },
 
   startGracePeriod: function() {
-    var input = this
+    let input = this
     clearTimeout(this.gracePeriod)
     this.gracePeriod = setTimeout(function() {
       input.gracePeriod = false
@@ -187,15 +188,15 @@ ContentEditableInput.prototype = copyObj({
   },
 
   rememberSelection: function() {
-    var sel = window.getSelection()
+    let sel = window.getSelection()
     this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset
     this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset
   },
 
   selectionInEditor: function() {
-    var sel = window.getSelection()
+    let sel = window.getSelection()
     if (!sel.rangeCount) return false
-    var node = sel.getRangeAt(0).commonAncestorContainer
+    let node = sel.getRangeAt(0).commonAncestorContainer
     return contains(this.div, node)
   },
 
@@ -208,7 +209,7 @@ ContentEditableInput.prototype = copyObj({
   supportsTouch: function() { return true },
 
   receivedFocus: function() {
-    var input = this
+    let input = this
     if (this.selectionInEditor())
       this.pollSelection()
     else
@@ -224,17 +225,17 @@ ContentEditableInput.prototype = copyObj({
   },
 
   selectionChanged: function() {
-    var sel = window.getSelection()
+    let sel = window.getSelection()
     return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
       sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
   },
 
   pollSelection: function() {
     if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
-      var sel = window.getSelection(), cm = this.cm
+      let sel = window.getSelection(), cm = this.cm
       this.rememberSelection()
-      var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
-      var head = domToPos(cm, sel.focusNode, sel.focusOffset)
+      let anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
+      let head = domToPos(cm, sel.focusNode, sel.focusOffset)
       if (anchor && head) runInOp(cm, function() {
         setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll)
         if (anchor.bad || head.bad) cm.curOp.selectionChanged = true
@@ -243,41 +244,42 @@ ContentEditableInput.prototype = copyObj({
   },
 
   pollContent: function() {
-    var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary()
-    var from = sel.from(), to = sel.to()
+    let cm = this.cm, display = cm.display, sel = cm.doc.sel.primary()
+    let from = sel.from(), to = sel.to()
     if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false
 
-    var fromIndex
+    let fromIndex, fromLine, fromNode
     if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
-      var fromLine = lineNo(display.view[0].line)
-      var fromNode = display.view[0].node
+      fromLine = lineNo(display.view[0].line)
+      fromNode = display.view[0].node
     } else {
-      var fromLine = lineNo(display.view[fromIndex].line)
-      var fromNode = display.view[fromIndex - 1].node.nextSibling
+      fromLine = lineNo(display.view[fromIndex].line)
+      fromNode = display.view[fromIndex - 1].node.nextSibling
     }
-    var toIndex = findViewIndex(cm, to.line)
+    let toIndex = findViewIndex(cm, to.line)
+    let toLine, toNode
     if (toIndex == display.view.length - 1) {
-      var toLine = display.viewTo - 1
-      var toNode = display.lineDiv.lastChild
+      toLine = display.viewTo - 1
+      toNode = display.lineDiv.lastChild
     } else {
-      var toLine = lineNo(display.view[toIndex + 1].line) - 1
-      var toNode = display.view[toIndex + 1].node.previousSibling
+      toLine = lineNo(display.view[toIndex + 1].line) - 1
+      toNode = display.view[toIndex + 1].node.previousSibling
     }
 
-    var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine))
-    var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length))
+    let newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine))
+    let oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length))
     while (newText.length > 1 && oldText.length > 1) {
       if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine-- }
       else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++ }
       else break
     }
 
-    var cutFront = 0, cutEnd = 0
-    var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length)
+    let cutFront = 0, cutEnd = 0
+    let newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length)
     while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
       ++cutFront
-    var newBot = lst(newText), oldBot = lst(oldText)
-    var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
+    let newBot = lst(newText), oldBot = lst(oldText)
+    let maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
                              oldBot.length - (oldText.length == 1 ? cutFront : 0))
     while (cutEnd < maxCutEnd &&
            newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
@@ -286,8 +288,8 @@ ContentEditableInput.prototype = copyObj({
     newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd)
     newText[0] = newText[0].slice(cutFront)
 
-    var chFrom = Pos(fromLine, cutFront)
-    var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0)
+    let chFrom = Pos(fromLine, cutFront)
+    let chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0)
     if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
       replaceRange(cm.doc, newText, chFrom, chTo, "+input")
       return true
@@ -335,17 +337,17 @@ ContentEditableInput.prototype = copyObj({
   }, ContentEditableInput.prototype)
 
 function posToDOM(cm, pos) {
-  var view = findViewForLine(cm, pos.line)
+  let view = findViewForLine(cm, pos.line)
   if (!view || view.hidden) return null
-  var line = getLine(cm.doc, pos.line)
-  var info = mapFromLineView(view, line, pos.line)
+  let line = getLine(cm.doc, pos.line)
+  let info = mapFromLineView(view, line, pos.line)
 
-  var order = getOrder(line), side = "left"
+  let order = getOrder(line), side = "left"
   if (order) {
-    var partPos = getBidiPartAt(order, pos.ch)
+    let partPos = getBidiPartAt(order, pos.ch)
     side = partPos % 2 ? "right" : "left"
   }
-  var result = nodeAndOffsetInLineMap(info.map, pos.ch, side)
+  let result = nodeAndOffsetInLineMap(info.map, pos.ch, side)
   result.offset = result.collapse == "right" ? result.end : result.start
   return result
 }
@@ -353,30 +355,30 @@ function posToDOM(cm, pos) {
 function badPos(pos, bad) { if (bad) pos.bad = true; return pos }
 
 function domTextBetween(cm, from, to, fromLine, toLine) {
-  var text = "", closing = false, lineSep = cm.doc.lineSeparator()
+  let text = "", closing = false, lineSep = cm.doc.lineSeparator()
   function recognizeMarker(id) { return function(marker) { return marker.id == id } }
   function walk(node) {
     if (node.nodeType == 1) {
-      var cmText = node.getAttribute("cm-text")
+      let cmText = node.getAttribute("cm-text")
       if (cmText != null) {
         if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "")
         text += cmText
         return
       }
-      var markerID = node.getAttribute("cm-marker"), range
+      let markerID = node.getAttribute("cm-marker"), range
       if (markerID) {
-        var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID))
+        let found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID))
         if (found.length && (range = found[0].find()))
           text += getBetween(cm.doc, range.from, range.to).join(lineSep)
         return
       }
       if (node.getAttribute("contenteditable") == "false") return
-      for (var i = 0; i < node.childNodes.length; i++)
+      for (let i = 0; i < node.childNodes.length; i++)
         walk(node.childNodes[i])
       if (/^(pre|div|p)$/i.test(node.nodeName))
         closing = true
     } else if (node.nodeType == 3) {
-      var val = node.nodeValue
+      let val = node.nodeValue
       if (!val) return
       if (closing) {
         text += lineSep
@@ -394,7 +396,7 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
 }
 
 function domToPos(cm, node, offset) {
-  var lineNode
+  let lineNode
   if (node == cm.display.lineDiv) {
     lineNode = cm.display.lineDiv.childNodes[offset]
     if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true)
@@ -405,60 +407,60 @@ function domToPos(cm, node, offset) {
       if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break
     }
   }
-  for (var i = 0; i < cm.display.view.length; i++) {
-    var lineView = cm.display.view[i]
+  for (let i = 0; i < cm.display.view.length; i++) {
+    let lineView = cm.display.view[i]
     if (lineView.node == lineNode)
       return locateNodeInLineView(lineView, node, offset)
   }
 }
 
 function locateNodeInLineView(lineView, node, offset) {
-  var wrapper = lineView.text.firstChild, bad = false
+  let wrapper = lineView.text.firstChild, bad = false
   if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true)
   if (node == wrapper) {
     bad = true
     node = wrapper.childNodes[offset]
     offset = 0
     if (!node) {
-      var line = lineView.rest ? lst(lineView.rest) : lineView.line
+      let line = lineView.rest ? lst(lineView.rest) : lineView.line
       return badPos(Pos(lineNo(line), line.text.length), bad)
     }
   }
 
-  var textNode = node.nodeType == 3 ? node : null, topNode = node
+  let textNode = node.nodeType == 3 ? node : null, topNode = node
   if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
     textNode = node.firstChild
     if (offset) offset = textNode.nodeValue.length
   }
   while (topNode.parentNode != wrapper) topNode = topNode.parentNode
-  var measure = lineView.measure, maps = measure.maps
+  let measure = lineView.measure, maps = measure.maps
 
   function find(textNode, topNode, offset) {
-    for (var i = -1; i < (maps ? maps.length : 0); i++) {
-      var map = i < 0 ? measure.map : maps[i]
-      for (var j = 0; j < map.length; j += 3) {
-        var curNode = map[j + 2]
+    for (let i = -1; i < (maps ? maps.length : 0); i++) {
+      let map = i < 0 ? measure.map : maps[i]
+      for (let j = 0; j < map.length; j += 3) {
+        let curNode = map[j + 2]
         if (curNode == textNode || curNode == topNode) {
-          var line = lineNo(i < 0 ? lineView.line : lineView.rest[i])
-          var ch = map[j] + offset
+          let line = lineNo(i < 0 ? lineView.line : lineView.rest[i])
+          let ch = map[j] + offset
           if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)]
           return Pos(line, ch)
         }
       }
     }
   }
-  var found = find(textNode, topNode, offset)
+  let found = find(textNode, topNode, offset)
   if (found) return badPos(found, bad)
 
   // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
-  for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
+  for (let after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
     found = find(after, after.firstChild, 0)
     if (found)
       return badPos(Pos(found.line, found.ch - dist), bad)
     else
       dist += after.textContent.length
   }
-  for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
+  for (let before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
     found = find(before, before.firstChild, -1)
     if (found)
       return badPos(Pos(found.line, found.ch + dist), bad)
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 4c08f37797..e244a2d168 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -34,13 +34,13 @@ export default function TextareaInput(cm) {
 
 TextareaInput.prototype = copyObj({
   init: function(display) {
-    var input = this, cm = this.cm
+    let input = this, cm = this.cm
 
     // Wraps and hides input textarea
-    var div = this.wrapper = hiddenTextarea()
+    let div = this.wrapper = hiddenTextarea()
     // The semihidden textarea that is focused when the editor is
     // focused, and receives input.
-    var te = this.textarea = div.firstChild
+    let te = this.textarea = div.firstChild
     display.wrapper.insertBefore(div, display.wrapper.firstChild)
 
     // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
@@ -71,7 +71,7 @@ TextareaInput.prototype = copyObj({
       } else if (!cm.options.lineWiseCopyCut) {
         return
       } else {
-        var ranges = copyableRanges(cm)
+        let ranges = copyableRanges(cm)
         setLastCopied({lineWise: true, text: ranges.text})
         if (e.type == "cut") {
           cm.setSelections(ranges.ranges, null, sel_dontScroll)
@@ -98,7 +98,7 @@ TextareaInput.prototype = copyObj({
     })
 
     on(te, "compositionstart", function() {
-      var start = cm.getCursor("from")
+      let start = cm.getCursor("from")
       if (input.composing) input.composing.range.clear()
       input.composing = {
         start: start,
@@ -116,13 +116,13 @@ TextareaInput.prototype = copyObj({
 
   prepareSelection: function() {
     // Redraw the selection and/or cursor
-    var cm = this.cm, display = cm.display, doc = cm.doc
-    var result = prepareSelection(cm)
+    let cm = this.cm, display = cm.display, doc = cm.doc
+    let result = prepareSelection(cm)
 
     // Move the hidden textarea near the cursor to prevent scrolling artifacts
     if (cm.options.moveInputWithCursor) {
-      var headPos = cursorCoords(cm, doc.sel.primary().head, "div")
-      var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect()
+      let headPos = cursorCoords(cm, doc.sel.primary().head, "div")
+      let wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect()
       result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
                                           headPos.top + lineOff.top - wrapOff.top))
       result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
@@ -133,7 +133,7 @@ TextareaInput.prototype = copyObj({
   },
 
   showSelection: function(drawn) {
-    var cm = this.cm, display = cm.display
+    let cm = this.cm, display = cm.display
     removeChildrenAndAdd(display.cursorDiv, drawn.cursors)
     removeChildrenAndAdd(display.selectionDiv, drawn.selection)
     if (drawn.teTop != null) {
@@ -146,13 +146,13 @@ TextareaInput.prototype = copyObj({
   // when not typing and nothing is selected)
   reset: function(typing) {
     if (this.contextMenuPending) return
-    var minimal, selected, cm = this.cm, doc = cm.doc
+    let minimal, selected, cm = this.cm, doc = cm.doc
     if (cm.somethingSelected()) {
       this.prevInput = ""
-      var range = doc.sel.primary()
+      let range = doc.sel.primary()
       minimal = hasCopyEvent &&
         (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000)
-      var content = minimal ? "-" : selected || cm.getSelection()
+      let content = minimal ? "-" : selected || cm.getSelection()
       this.textarea.value = content
       if (cm.state.focused) selectInput(this.textarea)
       if (ie && ie_version >= 9) this.hasSelection = content
@@ -185,7 +185,7 @@ TextareaInput.prototype = copyObj({
   // Poll for input changes, using the normal rate of polling. This
   // runs as long as the editor is focused.
   slowPoll: function() {
-    var input = this
+    let input = this
     if (input.pollingFast) return
     input.polling.set(this.cm.options.pollInterval, function() {
       input.poll()
@@ -197,10 +197,10 @@ TextareaInput.prototype = copyObj({
   // something in the input textarea, we poll faster, to ensure that
   // the change appears on the screen quickly.
   fastPoll: function() {
-    var missed = false, input = this
+    let missed = false, input = this
     input.pollingFast = true
     function p() {
-      var changed = input.poll()
+      let changed = input.poll()
       if (!changed && !missed) {missed = true; input.polling.set(60, p)}
       else {input.pollingFast = false; input.slowPoll()}
     }
@@ -214,7 +214,7 @@ TextareaInput.prototype = copyObj({
   // seen text (can be empty), which is stored in prevInput (we must
   // not reset the textarea when typing, because that breaks IME).
   poll: function() {
-    var cm = this.cm, input = this.textarea, prevInput = this.prevInput
+    let cm = this.cm, input = this.textarea, prevInput = this.prevInput
     // Since this is called a *lot*, try to bail out as cheaply as
     // possible when it is clear that nothing happened. hasSelection
     // will be the case when there is a lot of text in the textarea,
@@ -224,7 +224,7 @@ TextareaInput.prototype = copyObj({
         cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
       return false
 
-    var text = input.value
+    let text = input.value
     // If nothing changed, bail.
     if (text == prevInput && !cm.somethingSelected()) return false
     // Work around nonsensical selection resetting in IE9/10, and
@@ -237,15 +237,15 @@ TextareaInput.prototype = copyObj({
     }
 
     if (cm.doc.sel == cm.display.selForContextMenu) {
-      var first = text.charCodeAt(0)
+      let 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)
+    let same = 0, l = Math.min(prevInput.length, text.length)
     while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same
 
-    var self = this
+    let self = this
     runInOp(cm, function() {
       applyTextInput(cm, text.slice(same), prevInput.length - same,
                      null, self.composing ? "*compose" : null)
@@ -273,24 +273,25 @@ TextareaInput.prototype = copyObj({
   },
 
   onContextMenu: function(e) {
-    var input = this, cm = input.cm, display = cm.display, te = input.textarea
-    var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop
+    let input = this, cm = input.cm, display = cm.display, te = input.textarea
+    let pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop
     if (!pos || presto) return // Opera is difficult.
 
     // Reset the current text selection only if the click is done outside of the selection
     // and 'resetSelectionOnContextMenu' option is true.
-    var reset = cm.options.resetSelectionOnContextMenu
+    let reset = cm.options.resetSelectionOnContextMenu
     if (reset && cm.doc.sel.contains(pos) == -1)
       operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll)
 
-    var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText
+    let oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText
     input.wrapper.style.cssText = "position: absolute"
-    var wrapperBox = input.wrapper.getBoundingClientRect()
+    let wrapperBox = input.wrapper.getBoundingClientRect()
     te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
       "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
       (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
       "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"
-    if (webkit) var oldScrollY = window.scrollY // Work around Chrome issue (#2712)
+    let oldScrollY
+    if (webkit) oldScrollY = window.scrollY // Work around Chrome issue (#2712)
     display.input.focus()
     if (webkit) window.scrollTo(null, oldScrollY)
     display.input.reset()
@@ -305,8 +306,8 @@ TextareaInput.prototype = copyObj({
     // it got selected.
     function prepareSelectAllHack() {
       if (te.selectionStart != null) {
-        var selected = cm.somethingSelected()
-        var extval = "\u200b" + (selected ? te.value : "")
+        let selected = cm.somethingSelected()
+        let extval = "\u200b" + (selected ? te.value : "")
         te.value = "\u21da" // Used to catch context-menu undo
         te.value = extval
         input.prevInput = selected ? "" : "\u200b"
@@ -325,7 +326,7 @@ TextareaInput.prototype = copyObj({
       // Try to detect the user choosing select-all
       if (te.selectionStart != null) {
         if (!ie || (ie && ie_version < 9)) prepareSelectAllHack()
-        var i = 0, poll = function() {
+        let i = 0, poll = function() {
           if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
               te.selectionEnd > 0 && input.prevInput == "\u200b")
             operation(cm, selectAll)(cm)
@@ -339,7 +340,7 @@ TextareaInput.prototype = copyObj({
     if (ie && ie_version >= 9) prepareSelectAllHack()
     if (captureRightClick) {
       e_stop(e)
-      var mouseup = function() {
+      let mouseup = function() {
         off(window, "mouseup", mouseup)
         setTimeout(rehide, 20)
       }
diff --git a/src/input/indent.js b/src/input/indent.js
index f0fc78fd05..2c1755eb9f 100644
--- a/src/input/indent.js
+++ b/src/input/indent.js
@@ -12,7 +12,7 @@ import { countColumn, Pass, spaceStr } from "../util/misc"
 // lines are not indented, and places where the mode returns Pass
 // are left alone.
 export function indentLine(cm, n, how, aggressive) {
-  var doc = cm.doc, state
+  let doc = cm.doc, state
   if (how == null) how = "add"
   if (how == "smart") {
     // Fall back to "prev" when the mode doesn't have an indentation
@@ -21,10 +21,10 @@ export function indentLine(cm, n, how, aggressive) {
     else state = getStateBefore(cm, n)
   }
 
-  var tabSize = cm.options.tabSize
-  var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize)
+  let tabSize = cm.options.tabSize
+  let line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize)
   if (line.stateAfter) line.stateAfter = null
-  var curSpaceString = line.text.match(/^\s*/)[0], indentation
+  let curSpaceString = line.text.match(/^\s*/)[0], indentation
   if (!aggressive && !/\S/.test(line.text)) {
     indentation = 0
     how = "not"
@@ -47,9 +47,9 @@ export function indentLine(cm, n, how, aggressive) {
   }
   indentation = Math.max(0, indentation)
 
-  var indentString = "", pos = 0
+  let indentString = "", pos = 0
   if (cm.options.indentWithTabs)
-    for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t"}
+    for (let i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t"}
   if (pos < indentation) indentString += spaceStr(indentation - pos)
 
   if (indentString != curSpaceString) {
@@ -59,10 +59,10 @@ export function indentLine(cm, n, how, aggressive) {
   } 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.
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      var range = doc.sel.ranges[i]
+    for (let i = 0; i < doc.sel.ranges.length; i++) {
+      let range = doc.sel.ranges[i]
       if (range.head.line == n && range.head.ch < curSpaceString.length) {
-        var pos = Pos(n, curSpaceString.length)
+        let pos = Pos(n, curSpaceString.length)
         replaceOneSelection(doc, i, new Range(pos, pos))
         break
       }
diff --git a/src/input/input.js b/src/input/input.js
index a084e08f8b..6cc3e9111f 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -13,25 +13,25 @@ import { indentLine } from "./indent"
 // This will be set to a {lineWise: bool, text: [string]} object, so
 // that, when pasting, we know what kind of selections the copied
 // text was made out of.
-export var lastCopied = null
+export let lastCopied = null
 
 export function setLastCopied(newLastCopied) {
   lastCopied = newLastCopied
 }
 
 export function applyTextInput(cm, inserted, deleted, sel, origin) {
-  var doc = cm.doc
+  let doc = cm.doc
   cm.display.shift = false
   if (!sel) sel = doc.sel
 
-  var paste = cm.state.pasteIncoming || origin == "paste"
-  var textLines = doc.splitLines(inserted), multiPaste = null
+  let paste = cm.state.pasteIncoming || origin == "paste"
+  let textLines = doc.splitLines(inserted), multiPaste = null
   // When pasing N lines into N selections, insert one line per selection
   if (paste && sel.ranges.length > 1) {
     if (lastCopied && lastCopied.text.join("\n") == inserted) {
       if (sel.ranges.length % lastCopied.text.length == 0) {
         multiPaste = []
-        for (var i = 0; i < lastCopied.text.length; i++)
+        for (let i = 0; i < lastCopied.text.length; i++)
           multiPaste.push(doc.splitLines(lastCopied.text[i]))
       }
     } else if (textLines.length == sel.ranges.length) {
@@ -39,10 +39,11 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
     }
   }
 
+  let updateInput
   // Normal behavior is to insert the new text into every selection
-  for (var i = sel.ranges.length - 1; i >= 0; i--) {
-    var range = sel.ranges[i]
-    var from = range.from(), to = range.to()
+  for (let i = sel.ranges.length - 1; i >= 0; i--) {
+    let range = sel.ranges[i]
+    let from = range.from(), to = range.to()
     if (range.empty()) {
       if (deleted && deleted > 0) // Handle deletion
         from = Pos(from.line, from.ch - deleted)
@@ -51,8 +52,8 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
       else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
         from = to = Pos(from.line, 0)
     }
-    var updateInput = cm.curOp.updateInput
-    var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
+    updateInput = cm.curOp.updateInput
+    let changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
                        origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")}
     makeChange(cm.doc, changeEvent)
     signalLater(cm, "inputRead", cm, changeEvent)
@@ -67,7 +68,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
 }
 
 export function handlePaste(e, cm) {
-  var pasted = e.clipboardData && e.clipboardData.getData("Text")
+  let pasted = e.clipboardData && e.clipboardData.getData("Text")
   if (pasted) {
     e.preventDefault()
     if (!cm.isReadOnly() && !cm.options.disableInput)
@@ -79,15 +80,15 @@ export function handlePaste(e, cm) {
 export function triggerElectric(cm, inserted) {
   // When an 'electric' character is inserted, immediately trigger a reindent
   if (!cm.options.electricChars || !cm.options.smartIndent) return
-  var sel = cm.doc.sel
+  let sel = cm.doc.sel
 
-  for (var i = sel.ranges.length - 1; i >= 0; i--) {
-    var range = sel.ranges[i]
+  for (let i = sel.ranges.length - 1; i >= 0; i--) {
+    let range = sel.ranges[i]
     if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue
-    var mode = cm.getModeAt(range.head)
-    var indented = false
+    let mode = cm.getModeAt(range.head)
+    let indented = false
     if (mode.electricChars) {
-      for (var j = 0; j < mode.electricChars.length; j++)
+      for (let j = 0; j < mode.electricChars.length; j++)
         if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
           indented = indentLine(cm, range.head.line, "smart")
           break
@@ -101,10 +102,10 @@ export function triggerElectric(cm, inserted) {
 }
 
 export function copyableRanges(cm) {
-  var text = [], ranges = []
-  for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
-    var line = cm.doc.sel.ranges[i].head.line
-    var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)}
+  let text = [], ranges = []
+  for (let i = 0; i < cm.doc.sel.ranges.length; i++) {
+    let line = cm.doc.sel.ranges[i].head.line
+    let lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)}
     ranges.push(lineRange)
     text.push(cm.getRange(lineRange.anchor, lineRange.head))
   }
@@ -118,8 +119,8 @@ export function disableBrowserMagic(field, spellcheck) {
 }
 
 export function hiddenTextarea() {
-  var te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none")
-  var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;")
+  let te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none")
+  let div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;")
   // The textarea is kept positioned near the cursor to prevent the
   // fact that it'll be scrolled into view on input from scrolling
   // our fake cursor out of view. On webkit, when wrap=off, paste is
diff --git a/src/input/keymap.js b/src/input/keymap.js
index 0f5941e81a..1b9564ef4f 100644
--- a/src/input/keymap.js
+++ b/src/input/keymap.js
@@ -3,7 +3,7 @@ import { map } from "../util/misc"
 
 import { keyNames } from "./keynames"
 
-export var keyMap = {}
+export let keyMap = {}
 
 keyMap.basic = {
   "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
@@ -49,10 +49,11 @@ keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault
 // KEYMAP DISPATCH
 
 function normalizeKeyName(name) {
-  var parts = name.split(/-(?!$)/), name = parts[parts.length - 1]
-  var alt, ctrl, shift, cmd
-  for (var i = 0; i < parts.length - 1; i++) {
-    var mod = parts[i]
+  let parts = name.split(/-(?!$)/)
+  name = parts[parts.length - 1]
+  let alt, ctrl, shift, cmd
+  for (let i = 0; i < parts.length - 1; i++) {
+    let mod = parts[i]
     if (/^(cmd|meta|m)$/i.test(mod)) cmd = true
     else if (/^a(lt)?$/i.test(mod)) alt = true
     else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true
@@ -72,15 +73,15 @@ function normalizeKeyName(name) {
 // new normalized keymap, and then updates the old object to reflect
 // this.
 export function normalizeKeyMap(keymap) {
-  var copy = {}
-  for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
-    var value = keymap[keyname]
+  let copy = {}
+  for (let keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
+    let value = keymap[keyname]
     if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue
     if (value == "...") { delete keymap[keyname]; continue }
 
-    var keys = map(keyname.split(" "), normalizeKeyName)
-    for (var i = 0; i < keys.length; i++) {
-      var val, name
+    let keys = map(keyname.split(" "), normalizeKeyName)
+    for (let i = 0; i < keys.length; i++) {
+      let val, name
       if (i == keys.length - 1) {
         name = keys.join(" ")
         val = value
@@ -88,19 +89,19 @@ export function normalizeKeyMap(keymap) {
         name = keys.slice(0, i + 1).join(" ")
         val = "..."
       }
-      var prev = copy[name]
+      let prev = copy[name]
       if (!prev) copy[name] = val
       else if (prev != val) throw new Error("Inconsistent bindings for " + name)
     }
     delete keymap[keyname]
   }
-  for (var prop in copy) keymap[prop] = copy[prop]
+  for (let prop in copy) keymap[prop] = copy[prop]
   return keymap
 }
 
 export function lookupKey(key, map, handle, context) {
   map = getKeyMap(map)
-  var found = map.call ? map.call(key, context) : map[key]
+  let found = map.call ? map.call(key, context) : map[key]
   if (found === false) return "nothing"
   if (found === "...") return "multi"
   if (found != null && handle(found)) return "handled"
@@ -108,8 +109,8 @@ export function lookupKey(key, map, handle, context) {
   if (map.fallthrough) {
     if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
       return lookupKey(key, map.fallthrough, handle, context)
-    for (var i = 0; i < map.fallthrough.length; i++) {
-      var result = lookupKey(key, map.fallthrough[i], handle, context)
+    for (let i = 0; i < map.fallthrough.length; i++) {
+      let result = lookupKey(key, map.fallthrough[i], handle, context)
       if (result) return result
     }
   }
@@ -118,14 +119,14 @@ export function lookupKey(key, map, handle, context) {
 // Modifier key presses don't count as 'real' key presses for the
 // purpose of keymap fallthrough.
 export function isModifierKey(value) {
-  var name = typeof value == "string" ? value : keyNames[value.keyCode]
+  let name = typeof value == "string" ? value : keyNames[value.keyCode]
   return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
 }
 
 // Look up the name of a key as indicated by an event object.
 export function keyName(event, noShift) {
   if (presto && event.keyCode == 34 && event["char"]) return false
-  var base = keyNames[event.keyCode], name = base
+  let base = keyNames[event.keyCode], name = base
   if (name == null || event.altGraphKey) return false
   if (event.altKey && base != "Alt") name = "Alt-" + name
   if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name
diff --git a/src/input/keynames.js b/src/input/keynames.js
index 8cf11f38cd..66bc80010c 100644
--- a/src/input/keynames.js
+++ b/src/input/keynames.js
@@ -1,4 +1,4 @@
-export var keyNames = {
+export let keyNames = {
   3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
   19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
   36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
@@ -10,8 +10,8 @@ export var keyNames = {
 }
 
 // Number keys
-for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i)
+for (let i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i)
 // Alphabetic keys
-for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i)
+for (let i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i)
 // Function keys
-for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i
+for (let i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i
diff --git a/src/line/highlight.js b/src/line/highlight.js
index 0632be6e3e..8fd6d47b99 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -12,20 +12,20 @@ import { clipPos } from "./pos"
 export function highlightLine(cm, line, state, forceToEnd) {
   // A styles array always starts with a number identifying the
   // mode/overlays that it is based on (for easy invalidation).
-  var st = [cm.state.modeGen], lineClasses = {}
+  let st = [cm.state.modeGen], lineClasses = {}
   // Compute the base array of styles
   runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
     st.push(end, style)
   }, lineClasses, forceToEnd)
 
   // Run overlays, adjust style array.
-  for (var o = 0; o < cm.state.overlays.length; ++o) {
-    var overlay = cm.state.overlays[o], i = 1, at = 0
+  for (let o = 0; o < cm.state.overlays.length; ++o) {
+    let overlay = cm.state.overlays[o], i = 1, at = 0
     runMode(cm, line.text, overlay.mode, true, function(end, style) {
-      var start = i
+      let start = i
       // Ensure there's a token end at the current position, and that i points at it
       while (at < end) {
-        var i_end = st[i]
+        let i_end = st[i]
         if (i_end > end)
           st.splice(i, 1, end, st[i+1], i_end)
         i += 2
@@ -37,7 +37,7 @@ export function highlightLine(cm, line, state, forceToEnd) {
         i = start + 2
       } else {
         for (; start < i; start += 2) {
-          var cur = st[start+1]
+          let cur = st[start+1]
           st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style
         }
       }
@@ -49,8 +49,8 @@ export function highlightLine(cm, line, state, forceToEnd) {
 
 export function getLineStyles(cm, line, updateFrontier) {
   if (!line.styles || line.styles[0] != cm.state.modeGen) {
-    var state = getStateBefore(cm, lineNo(line))
-    var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state)
+    let state = getStateBefore(cm, lineNo(line))
+    let result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state)
     line.stateAfter = state
     line.styles = result.styles
     if (result.classes) line.styleClasses = result.classes
@@ -61,14 +61,14 @@ export function getLineStyles(cm, line, updateFrontier) {
 }
 
 export function getStateBefore(cm, n, precise) {
-  var doc = cm.doc, display = cm.display
+  let doc = cm.doc, display = cm.display
   if (!doc.mode.startState) return true
-  var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter
+  let pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter
   if (!state) state = startState(doc.mode)
   else state = copyState(doc.mode, state)
   doc.iter(pos, n, function(line) {
     processLine(cm, line.text, state)
-    var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo
+    let save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo
     line.stateAfter = save ? copyState(doc.mode, state) : null
     ++pos
   })
@@ -80,8 +80,8 @@ export function getStateBefore(cm, n, precise) {
 // update state, but don't save a style array. Used for lines that
 // aren't currently visible.
 export function processLine(cm, text, state, startAt) {
-  var mode = cm.doc.mode
-  var stream = new StringStream(text, cm.options.tabSize)
+  let mode = cm.doc.mode
+  let stream = new StringStream(text, cm.options.tabSize)
   stream.start = stream.pos = startAt || 0
   if (text == "") callBlankLine(mode, state)
   while (!stream.eol()) {
@@ -93,14 +93,14 @@ export function processLine(cm, text, state, startAt) {
 function callBlankLine(mode, state) {
   if (mode.blankLine) return mode.blankLine(state)
   if (!mode.innerMode) return
-  var inner = innerMode(mode, state)
+  let inner = innerMode(mode, state)
   if (inner.mode.blankLine) return inner.mode.blankLine(inner.state)
 }
 
 export function readToken(mode, stream, state, inner) {
-  for (var i = 0; i < 10; i++) {
+  for (let i = 0; i < 10; i++) {
     if (inner) inner[0] = innerMode(mode, state).mode
-    var style = mode.token(stream, state)
+    let style = mode.token(stream, state)
     if (stream.pos > stream.start) return style
   }
   throw new Error("Mode " + mode.name + " failed to advance stream.")
@@ -115,10 +115,10 @@ export function takeToken(cm, pos, precise, asArray) {
             state: copy ? copyState(doc.mode, state) : state}
   }
 
-  var doc = cm.doc, mode = doc.mode, style
+  let doc = cm.doc, mode = doc.mode, style
   pos = clipPos(doc, pos)
-  var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise)
-  var stream = new StringStream(line.text, cm.options.tabSize), tokens
+  let line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise)
+  let stream = new StringStream(line.text, cm.options.tabSize), tokens
   if (asArray) tokens = []
   while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
     stream.start = stream.pos
@@ -130,10 +130,10 @@ export function takeToken(cm, pos, precise, asArray) {
 
 function extractLineClasses(type, output) {
   if (type) for (;;) {
-    var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/)
+    let lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/)
     if (!lineClass) break
     type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length)
-    var prop = lineClass[1] ? "bgClass" : "textClass"
+    let prop = lineClass[1] ? "bgClass" : "textClass"
     if (output[prop] == null)
       output[prop] = lineClass[2]
     else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
@@ -144,11 +144,11 @@ function extractLineClasses(type, output) {
 
 // Run the given mode's parser over a line, calling f for each token.
 function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
-  var flattenSpans = mode.flattenSpans
+  let flattenSpans = mode.flattenSpans
   if (flattenSpans == null) flattenSpans = cm.options.flattenSpans
-  var curStart = 0, curStyle = null
-  var stream = new StringStream(text, cm.options.tabSize), style
-  var inner = cm.options.addModeClass && [null]
+  let curStart = 0, curStyle = null
+  let stream = new StringStream(text, cm.options.tabSize), style
+  let inner = cm.options.addModeClass && [null]
   if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses)
   while (!stream.eol()) {
     if (stream.pos > cm.options.maxHighlightLength) {
@@ -160,7 +160,7 @@ function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
       style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses)
     }
     if (inner) {
-      var mName = inner[0].name
+      let mName = inner[0].name
       if (mName) style = "m-" + (style ? mName + " " + style : mName)
     }
     if (!flattenSpans || curStyle != style) {
@@ -176,7 +176,7 @@ function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
     // Webkit seems to refuse to render text nodes longer than 57444
     // characters, and returns inaccurate measurements in nodes
     // starting around 5000 chars.
-    var pos = Math.min(stream.pos, curStart + 5000)
+    let pos = Math.min(stream.pos, curStart + 5000)
     f(pos, curStyle)
     curStart = pos
   }
@@ -188,13 +188,13 @@ function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
 // smallest indentation, which tends to need the least context to
 // parse correctly.
 function findStartLine(cm, n, precise) {
-  var minindent, minline, doc = cm.doc
-  var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100)
-  for (var search = n; search > lim; --search) {
+  let minindent, minline, doc = cm.doc
+  let lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100)
+  for (let search = n; search > lim; --search) {
     if (search <= doc.first) return doc.first
-    var line = getLine(doc, search - 1)
+    let line = getLine(doc, search - 1)
     if (line.stateAfter && (!precise || search <= doc.frontier)) return search
-    var indented = countColumn(line.text, null, cm.options.tabSize)
+    let indented = countColumn(line.text, null, cm.options.tabSize)
     if (minline == null || minindent > indented) {
       minline = search - 1
       minindent = indented
diff --git a/src/line/line_data.js b/src/line/line_data.js
index 8b247d5306..7a3a412211 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -31,7 +31,7 @@ export function updateLine(line, text, markedSpans, estimateHeight) {
   if (line.order != null) line.order = null
   detachMarkedSpans(line)
   attachMarkedSpans(line, markedSpans)
-  var estHeight = estimateHeight ? estimateHeight(line) : 1
+  let estHeight = estimateHeight ? estimateHeight(line) : 1
   if (estHeight != line.height) updateLineHeight(line, estHeight)
 }
 
@@ -44,10 +44,10 @@ export function cleanUpLine(line) {
 // Convert a style as returned by a mode (either null, or a string
 // containing one or more styles) to a CSS style. This is cached,
 // and also looks for line-wide styles.
-var styleToClassCache = {}, styleToClassCacheWithMode = {}
+let styleToClassCache = {}, styleToClassCacheWithMode = {}
 function interpretTokenStyle(style, options) {
   if (!style || /^\s*$/.test(style)) return null
-  var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache
+  let cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache
   return cache[style] ||
     (cache[style] = style.replace(/\S+/g, "cm-$&"))
 }
@@ -61,16 +61,16 @@ export function buildLineContent(cm, lineView) {
   // The padding-right forces the element to have a 'border', which
   // is needed on Webkit to be able to get line-level bounding
   // rectangles for it (in measureChar).
-  var content = elt("span", null, null, webkit ? "padding-right: .1px" : null)
-  var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
+  let content = elt("span", null, null, webkit ? "padding-right: .1px" : null)
+  let builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
                  col: 0, pos: 0, cm: cm,
                  trailingSpace: false,
                  splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}
   lineView.measure = {}
 
   // Iterate over the logical lines that make up this visual line.
-  for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
-    var line = i ? lineView.rest[i - 1] : lineView.line, order
+  for (let i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
+    let line = i ? lineView.rest[i - 1] : lineView.line, order
     builder.pos = 0
     builder.addToken = buildToken
     // Optionally wire in some hacks into the token-rendering
@@ -78,7 +78,7 @@ export function buildLineContent(cm, lineView) {
     if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
       builder.addToken = buildTokenBadBidi(builder.addToken, order)
     builder.map = []
-    var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line)
+    let allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line)
     insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate))
     if (line.styleClasses) {
       if (line.styleClasses.bgClass)
@@ -103,7 +103,7 @@ export function buildLineContent(cm, lineView) {
 
   // See issue #2901
   if (webkit) {
-    var last = builder.content.lastChild
+    let last = builder.content.lastChild
     if (/\bcm-tab\b/.test(last.className) || (last.querySelector && last.querySelector(".cm-tab")))
       builder.content.className = "cm-tab-wrap-hack"
   }
@@ -116,7 +116,7 @@ export function buildLineContent(cm, lineView) {
 }
 
 export function defaultSpecialCharPlaceholder(ch) {
-  var token = elt("span", "\u2022", "cm-invalidchar")
+  let token = elt("span", "\u2022", "cm-invalidchar")
   token.title = "\\u" + ch.charCodeAt(0).toString(16)
   token.setAttribute("aria-label", token.title)
   return token
@@ -126,22 +126,24 @@ export function defaultSpecialCharPlaceholder(ch) {
 // the line map. Takes care to render special characters separately.
 function buildToken(builder, text, style, startStyle, endStyle, title, css) {
   if (!text) return
-  var displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
-  var special = builder.cm.state.specialChars, mustWrap = false
+  let displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
+  let special = builder.cm.state.specialChars, mustWrap = false
+  let content
   if (!special.test(text)) {
     builder.col += text.length
-    var content = document.createTextNode(displayText)
+    content = document.createTextNode(displayText)
     builder.map.push(builder.pos, builder.pos + text.length, content)
     if (ie && ie_version < 9) mustWrap = true
     builder.pos += text.length
   } else {
-    var content = document.createDocumentFragment(), pos = 0
+    content = document.createDocumentFragment()
+    let pos = 0
     while (true) {
       special.lastIndex = pos
-      var m = special.exec(text)
-      var skipped = m ? m.index - pos : text.length - pos
+      let m = special.exec(text)
+      let skipped = m ? m.index - pos : text.length - pos
       if (skipped) {
-        var txt = document.createTextNode(displayText.slice(pos, pos + skipped))
+        let txt = document.createTextNode(displayText.slice(pos, pos + skipped))
         if (ie && ie_version < 9) content.appendChild(elt("span", [txt]))
         else content.appendChild(txt)
         builder.map.push(builder.pos, builder.pos + skipped, txt)
@@ -150,18 +152,19 @@ function buildToken(builder, text, style, startStyle, endStyle, title, css) {
       }
       if (!m) break
       pos += skipped + 1
+      let txt
       if (m[0] == "\t") {
-        var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize
-        var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"))
+        let tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize
+        txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"))
         txt.setAttribute("role", "presentation")
         txt.setAttribute("cm-text", "\t")
         builder.col += tabWidth
       } else if (m[0] == "\r" || m[0] == "\n") {
-        var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"))
+        txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"))
         txt.setAttribute("cm-text", m[0])
         builder.col += 1
       } else {
-        var txt = builder.cm.options.specialCharPlaceholder(m[0])
+        txt = builder.cm.options.specialCharPlaceholder(m[0])
         txt.setAttribute("cm-text", m[0])
         if (ie && ie_version < 9) content.appendChild(elt("span", [txt]))
         else content.appendChild(txt)
@@ -173,10 +176,10 @@ function buildToken(builder, text, style, startStyle, endStyle, title, css) {
   }
   builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
   if (style || startStyle || endStyle || mustWrap || css) {
-    var fullStyle = style || ""
+    let fullStyle = style || ""
     if (startStyle) fullStyle += startStyle
     if (endStyle) fullStyle += endStyle
-    var token = elt("span", [content], fullStyle, css)
+    let token = elt("span", [content], fullStyle, css)
     if (title) token.title = title
     return builder.content.appendChild(token)
   }
@@ -185,9 +188,9 @@ function buildToken(builder, text, style, startStyle, endStyle, title, css) {
 
 function splitSpaces(text, trailingBefore) {
   if (text.length > 1 && !/  /.test(text)) return text
-  var spaceBefore = trailingBefore, result = ""
-  for (var i = 0; i < text.length; i++) {
-    var ch = text.charAt(i)
+  let spaceBefore = trailingBefore, result = ""
+  for (let i = 0; i < text.length; i++) {
+    let ch = text.charAt(i)
     if (ch == " " && spaceBefore && (i == text.length - 1 || text.charCodeAt(i + 1) == 32))
       ch = "\u00a0"
     result += ch
@@ -201,11 +204,12 @@ function splitSpaces(text, trailingBefore) {
 function buildTokenBadBidi(inner, order) {
   return function(builder, text, style, startStyle, endStyle, title, css) {
     style = style ? style + " cm-force-border" : "cm-force-border"
-    var start = builder.pos, end = start + text.length
+    let start = builder.pos, end = start + text.length
     for (;;) {
       // Find the part that overlaps with the start of this text
-      for (var i = 0; i < order.length; i++) {
-        var part = order[i]
+      let part
+      for (let i = 0; i < order.length; i++) {
+        part = order[i]
         if (part.to > start && part.from <= start) break
       }
       if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css)
@@ -218,7 +222,7 @@ function buildTokenBadBidi(inner, order) {
 }
 
 function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
-  var widget = !ignoreWidget && marker.widgetNode
+  let widget = !ignoreWidget && marker.widgetNode
   if (widget) builder.map.push(builder.pos, builder.pos + size, widget)
   if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
     if (!widget)
@@ -236,22 +240,22 @@ function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
 // Outputs a number of spans to make up a line, taking highlighting
 // and marked text into account.
 function insertLineContent(line, builder, styles) {
-  var spans = line.markedSpans, allText = line.text, at = 0
+  let spans = line.markedSpans, allText = line.text, at = 0
   if (!spans) {
-    for (var i = 1; i < styles.length; i+=2)
+    for (let i = 1; i < styles.length; i+=2)
       builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options))
     return
   }
 
-  var len = allText.length, pos = 0, i = 1, text = "", style, css
-  var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed
+  let len = allText.length, pos = 0, i = 1, text = "", style, css
+  let nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed
   for (;;) {
     if (nextChange == pos) { // Update current marker set
       spanStyle = spanEndStyle = spanStartStyle = title = css = ""
       collapsed = null; nextChange = Infinity
-      var foundBookmarks = [], endStyles
-      for (var j = 0; j < spans.length; ++j) {
-        var sp = spans[j], m = sp.marker
+      let foundBookmarks = [], endStyles
+      for (let j = 0; j < spans.length; ++j) {
+        let sp = spans[j], m = sp.marker
         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)) {
@@ -270,10 +274,10 @@ function insertLineContent(line, builder, styles) {
           nextChange = sp.from
         }
       }
-      if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
+      if (endStyles) for (let j = 0; j < endStyles.length; j += 2)
         if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
 
-      if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
+      if (!collapsed || collapsed.from == pos) for (let j = 0; j < foundBookmarks.length; ++j)
         buildCollapsedSpan(builder, 0, foundBookmarks[j])
       if (collapsed && (collapsed.from || 0) == pos) {
         buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
@@ -284,12 +288,12 @@ function insertLineContent(line, builder, styles) {
     }
     if (pos >= len) break
 
-    var upto = Math.min(len, nextChange)
+    let upto = Math.min(len, nextChange)
     while (true) {
       if (text) {
-        var end = pos + text.length
+        let end = pos + text.length
         if (!collapsed) {
-          var tokenText = end > upto ? text.slice(0, upto - pos) : text
+          let tokenText = end > upto ? text.slice(0, upto - pos) : text
           builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
                            spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css)
         }
@@ -320,9 +324,9 @@ export function LineView(doc, line, lineN) {
 
 // Create a range of LineView objects for the given lines.
 export function buildViewArray(cm, from, to) {
-  var array = [], nextPos
-  for (var pos = from; pos < to; pos = nextPos) {
-    var view = new LineView(cm.doc, getLine(cm.doc, pos), pos)
+  let array = [], nextPos
+  for (let pos = from; pos < to; pos = nextPos) {
+    let view = new LineView(cm.doc, getLine(cm.doc, pos), pos)
     nextPos = pos + view.size
     array.push(view)
   }
diff --git a/src/line/pos.js b/src/line/pos.js
index b5d2513abe..73b2e0b8e8 100644
--- a/src/line/pos.js
+++ b/src/line/pos.js
@@ -19,17 +19,18 @@ export function minPos(a, b) { return cmp(a, b) < 0 ? a : b }
 export function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1))}
 export function clipPos(doc, pos) {
   if (pos.line < doc.first) return Pos(doc.first, 0)
-  var last = doc.first + doc.size - 1
+  let last = doc.first + doc.size - 1
   if (pos.line > last) return Pos(last, getLine(doc, last).text.length)
   return clipToLen(pos, getLine(doc, pos.line).text.length)
 }
 function clipToLen(pos, linelen) {
-  var ch = pos.ch
+  let ch = pos.ch
   if (ch == null || ch > linelen) return Pos(pos.line, linelen)
   else if (ch < 0) return Pos(pos.line, 0)
   else return pos
 }
 export function clipPosArray(doc, array) {
-  for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i])
+  let out = []
+  for (let i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i])
   return out
 }
diff --git a/src/line/saw_special_spans.js b/src/line/saw_special_spans.js
index 0cf5ff320b..d315e7ba99 100644
--- a/src/line/saw_special_spans.js
+++ b/src/line/saw_special_spans.js
@@ -1,5 +1,5 @@
 // Optimize some code when these features are not used.
-export var sawReadOnlySpans = false, sawCollapsedSpans = false
+export let sawReadOnlySpans = false, sawCollapsedSpans = false
 
 export function seeReadOnlySpans() {
   sawReadOnlySpans = true
diff --git a/src/line/spans.js b/src/line/spans.js
index fd9bd55408..63acacfc83 100644
--- a/src/line/spans.js
+++ b/src/line/spans.js
@@ -13,15 +13,16 @@ export function MarkedSpan(marker, from, to) {
 
 // Search an array of spans for a span matching the given marker.
 export function getMarkedSpanFor(spans, marker) {
-  if (spans) for (var i = 0; i < spans.length; ++i) {
-    var span = spans[i]
+  if (spans) for (let i = 0; i < spans.length; ++i) {
+    let span = spans[i]
     if (span.marker == marker) return span
   }
 }
 // Remove a span from an array, returning undefined if no spans are
 // left (we don't store arrays for lines without spans).
 export function removeMarkedSpan(spans, span) {
-  for (var r, i = 0; i < spans.length; ++i)
+  let r
+  for (let i = 0; i < spans.length; ++i)
     if (spans[i] != span) (r || (r = [])).push(spans[i])
   return r
 }
@@ -36,22 +37,24 @@ export function addMarkedSpan(line, span) {
 // character position, returning an array of remaining chunks (or
 // undefined if nothing remains).
 function markedSpansBefore(old, startCh, isInsert) {
-  if (old) for (var i = 0, nw; i < old.length; ++i) {
-    var span = old[i], marker = span.marker
-    var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh)
+  let nw
+  if (old) for (let i = 0; i < old.length; ++i) {
+    let span = old[i], marker = span.marker
+    let startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh)
     if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
-      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh)
+      let endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh)
       ;(nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to))
     }
   }
   return nw
 }
 function markedSpansAfter(old, endCh, isInsert) {
-  if (old) for (var i = 0, nw; i < old.length; ++i) {
-    var span = old[i], marker = span.marker
-    var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh)
+  let nw
+  if (old) for (let i = 0; i < old.length; ++i) {
+    let span = old[i], marker = span.marker
+    let endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh)
     if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
-      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh)
+      let startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh)
       ;(nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
                                             span.to == null ? null : span.to - endCh))
     }
@@ -67,23 +70,23 @@ function markedSpansAfter(old, endCh, isInsert) {
 // arrays with one element for each line in (after) the change.
 export function stretchSpansOverChange(doc, change) {
   if (change.full) return null
-  var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans
-  var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans
+  let oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans
+  let oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans
   if (!oldFirst && !oldLast) return null
 
-  var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0
+  let startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0
   // Get the spans that 'stick out' on both sides
-  var first = markedSpansBefore(oldFirst, startCh, isInsert)
-  var last = markedSpansAfter(oldLast, endCh, isInsert)
+  let first = markedSpansBefore(oldFirst, startCh, isInsert)
+  let last = markedSpansAfter(oldLast, endCh, isInsert)
 
   // Next, merge those two ends
-  var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0)
+  let sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0)
   if (first) {
     // Fix up .to properties of first
-    for (var i = 0; i < first.length; ++i) {
-      var span = first[i]
+    for (let i = 0; i < first.length; ++i) {
+      let span = first[i]
       if (span.to == null) {
-        var found = getMarkedSpanFor(last, span.marker)
+        let found = getMarkedSpanFor(last, span.marker)
         if (!found) span.to = startCh
         else if (sameLine) span.to = found.to == null ? null : found.to + offset
       }
@@ -91,11 +94,11 @@ export function stretchSpansOverChange(doc, change) {
   }
   if (last) {
     // Fix up .from in last (or move them into first in case of sameLine)
-    for (var i = 0; i < last.length; ++i) {
-      var span = last[i]
+    for (let i = 0; i < last.length; ++i) {
+      let span = last[i]
       if (span.to != null) span.to += offset
       if (span.from == null) {
-        var found = getMarkedSpanFor(first, span.marker)
+        let found = getMarkedSpanFor(first, span.marker)
         if (!found) {
           span.from = offset
           if (sameLine) (first || (first = [])).push(span)
@@ -110,15 +113,15 @@ export function stretchSpansOverChange(doc, change) {
   if (first) first = clearEmptySpans(first)
   if (last && last != first) last = clearEmptySpans(last)
 
-  var newMarkers = [first]
+  let newMarkers = [first]
   if (!sameLine) {
     // Fill gap with whole-line-spans
-    var gap = change.text.length - 2, gapMarkers
+    let gap = change.text.length - 2, gapMarkers
     if (gap > 0 && first)
-      for (var i = 0; i < first.length; ++i)
+      for (let i = 0; i < first.length; ++i)
         if (first[i].to == null)
           (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null))
-    for (var i = 0; i < gap; ++i)
+    for (let i = 0; i < gap; ++i)
       newMarkers.push(gapMarkers)
     newMarkers.push(last)
   }
@@ -128,8 +131,8 @@ export function stretchSpansOverChange(doc, change) {
 // Remove spans that are empty and don't have a clearWhenEmpty
 // option of false.
 function clearEmptySpans(spans) {
-  for (var i = 0; i < spans.length; ++i) {
-    var span = spans[i]
+  for (let i = 0; i < spans.length; ++i) {
+    let span = spans[i]
     if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
       spans.splice(i--, 1)
   }
@@ -139,22 +142,22 @@ function clearEmptySpans(spans) {
 
 // Used to 'clip' out readOnly ranges when making a change.
 export function removeReadOnlyRanges(doc, from, to) {
-  var markers = null
+  let markers = null
   doc.iter(from.line, to.line + 1, function(line) {
-    if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-      var mark = line.markedSpans[i].marker
+    if (line.markedSpans) for (let i = 0; i < line.markedSpans.length; ++i) {
+      let mark = line.markedSpans[i].marker
       if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
         (markers || (markers = [])).push(mark)
     }
   })
   if (!markers) return null
-  var parts = [{from: from, to: to}]
-  for (var i = 0; i < markers.length; ++i) {
-    var mk = markers[i], m = mk.find(0)
-    for (var j = 0; j < parts.length; ++j) {
-      var p = parts[j]
+  let parts = [{from: from, to: to}]
+  for (let i = 0; i < markers.length; ++i) {
+    let mk = markers[i], m = mk.find(0)
+    for (let j = 0; j < parts.length; ++j) {
+      let p = parts[j]
       if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue
-      var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to)
+      let newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to)
       if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
         newParts.push({from: p.from, to: m.from})
       if (dto > 0 || !mk.inclusiveRight && !dto)
@@ -168,15 +171,15 @@ export function removeReadOnlyRanges(doc, from, to) {
 
 // Connect or disconnect spans from a line.
 export function detachMarkedSpans(line) {
-  var spans = line.markedSpans
+  let spans = line.markedSpans
   if (!spans) return
-  for (var i = 0; i < spans.length; ++i)
+  for (let i = 0; i < spans.length; ++i)
     spans[i].marker.detachLine(line)
   line.markedSpans = null
 }
 export function attachMarkedSpans(line, spans) {
   if (!spans) return
-  for (var i = 0; i < spans.length; ++i)
+  for (let i = 0; i < spans.length; ++i)
     spans[i].marker.attachLine(line)
   line.markedSpans = spans
 }
@@ -190,12 +193,12 @@ function extraRight(marker) { return marker.inclusiveRight ? 1 : 0 }
 // spans is larger (and thus includes the other). Falls back to
 // comparing ids when the spans cover exactly the same range.
 export function compareCollapsedMarkers(a, b) {
-  var lenDiff = a.lines.length - b.lines.length
+  let lenDiff = a.lines.length - b.lines.length
   if (lenDiff != 0) return lenDiff
-  var aPos = a.find(), bPos = b.find()
-  var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b)
+  let aPos = a.find(), bPos = b.find()
+  let fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b)
   if (fromCmp) return -fromCmp
-  var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b)
+  let toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b)
   if (toCmp) return toCmp
   return b.id - a.id
 }
@@ -203,8 +206,8 @@ export function compareCollapsedMarkers(a, b) {
 // Find out whether a line ends or starts in a collapsed span. If
 // so, return the marker for that span.
 function collapsedSpanAtSide(line, start) {
-  var sps = sawCollapsedSpans && line.markedSpans, found
-  if (sps) for (var sp, i = 0; i < sps.length; ++i) {
+  let sps = sawCollapsedSpans && line.markedSpans, found
+  if (sps) for (let sp, i = 0; i < sps.length; ++i) {
     sp = sps[i]
     if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
         (!found || compareCollapsedMarkers(found, sp.marker) < 0))
@@ -219,14 +222,14 @@ export function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, fals
 // overlaps (covers the start or end, but not both) of a new span.
 // Such overlap is not allowed.
 export function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
-  var line = getLine(doc, lineNo)
-  var sps = sawCollapsedSpans && line.markedSpans
-  if (sps) for (var i = 0; i < sps.length; ++i) {
-    var sp = sps[i]
+  let line = getLine(doc, lineNo)
+  let sps = sawCollapsedSpans && line.markedSpans
+  if (sps) for (let i = 0; i < sps.length; ++i) {
+    let sp = sps[i]
     if (!sp.marker.collapsed) continue
-    var found = sp.marker.find(0)
-    var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker)
-    var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker)
+    let found = sp.marker.find(0)
+    let fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker)
+    let toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker)
     if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue
     if (fromCmp <= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.to, from) >= 0 : cmp(found.to, from) > 0) ||
         fromCmp >= 0 && (sp.marker.inclusiveRight && marker.inclusiveLeft ? cmp(found.from, to) <= 0 : cmp(found.from, to) < 0))
@@ -239,7 +242,7 @@ export function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
 // visual line. This finds the start of the visual line that the
 // given line is part of (usually that is the line itself).
 export function visualLine(line) {
-  var merged
+  let merged
   while (merged = collapsedSpanAtStart(line))
     line = merged.find(-1, true).line
   return line
@@ -248,7 +251,7 @@ export function visualLine(line) {
 // Returns an array of logical lines that continue the visual line
 // started by the argument, or undefined if there are no such lines.
 export function visualLineContinued(line) {
-  var merged, lines
+  let merged, lines
   while (merged = collapsedSpanAtEnd(line)) {
     line = merged.find(1, true).line
     ;(lines || (lines = [])).push(line)
@@ -259,7 +262,7 @@ export function visualLineContinued(line) {
 // Get the line number of the start of the visual line that the
 // given line number is part of.
 export function visualLineNo(doc, lineN) {
-  var line = getLine(doc, lineN), vis = visualLine(line)
+  let line = getLine(doc, lineN), vis = visualLine(line)
   if (line == vis) return lineN
   return lineNo(vis)
 }
@@ -268,7 +271,7 @@ export function visualLineNo(doc, lineN) {
 // the given line.
 export function visualLineEndNo(doc, lineN) {
   if (lineN > doc.lastLine()) return lineN
-  var line = getLine(doc, lineN), merged
+  let line = getLine(doc, lineN), merged
   if (!lineIsHidden(doc, line)) return lineN
   while (merged = collapsedSpanAtEnd(line))
     line = merged.find(1, true).line
@@ -279,8 +282,8 @@ export function visualLineEndNo(doc, lineN) {
 // are part of a visual line that starts with another line, or when
 // they are entirely covered by collapsed, non-widget span.
 export function lineIsHidden(doc, line) {
-  var sps = sawCollapsedSpans && line.markedSpans
-  if (sps) for (var sp, i = 0; i < sps.length; ++i) {
+  let sps = sawCollapsedSpans && line.markedSpans
+  if (sps) for (let sp, i = 0; i < sps.length; ++i) {
     sp = sps[i]
     if (!sp.marker.collapsed) continue
     if (sp.from == null) return true
@@ -291,12 +294,12 @@ export function lineIsHidden(doc, line) {
 }
 function lineIsHiddenInner(doc, line, span) {
   if (span.to == null) {
-    var end = span.marker.find(1, true)
+    let end = span.marker.find(1, true)
     return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker))
   }
   if (span.marker.inclusiveRight && span.to == line.text.length)
     return true
-  for (var sp, i = 0; i < line.markedSpans.length; ++i) {
+  for (let sp, i = 0; i < line.markedSpans.length; ++i) {
     sp = line.markedSpans[i]
     if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
         (sp.to == null || sp.to != span.from) &&
@@ -309,15 +312,15 @@ function lineIsHiddenInner(doc, line, span) {
 export function heightAtLine(lineObj) {
   lineObj = visualLine(lineObj)
 
-  var h = 0, chunk = lineObj.parent
-  for (var i = 0; i < chunk.lines.length; ++i) {
-    var line = chunk.lines[i]
+  let h = 0, chunk = lineObj.parent
+  for (let i = 0; i < chunk.lines.length; ++i) {
+    let line = chunk.lines[i]
     if (line == lineObj) break
     else h += line.height
   }
-  for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
-    for (var i = 0; i < p.children.length; ++i) {
-      var cur = p.children[i]
+  for (let p = chunk.parent; p; chunk = p, p = chunk.parent) {
+    for (let i = 0; i < p.children.length; ++i) {
+      let cur = p.children[i]
       if (cur == chunk) break
       else h += cur.height
     }
@@ -330,15 +333,15 @@ export function heightAtLine(lineObj) {
 // other lines onto it.
 export function lineLength(line) {
   if (line.height == 0) return 0
-  var len = line.text.length, merged, cur = line
+  let len = line.text.length, merged, cur = line
   while (merged = collapsedSpanAtStart(cur)) {
-    var found = merged.find(0, true)
+    let found = merged.find(0, true)
     cur = found.from.line
     len += found.from.ch - found.to.ch
   }
   cur = line
   while (merged = collapsedSpanAtEnd(cur)) {
-    var found = merged.find(0, true)
+    let found = merged.find(0, true)
     len -= cur.text.length - found.from.ch
     cur = found.to.line
     len += cur.text.length - found.to.ch
@@ -348,12 +351,12 @@ export function lineLength(line) {
 
 // Find the longest line in the document.
 export function findMaxLine(cm) {
-  var d = cm.display, doc = cm.doc
+  let d = cm.display, doc = cm.doc
   d.maxLine = getLine(doc, doc.first)
   d.maxLineLength = lineLength(d.maxLine)
   d.maxLineChanged = true
   doc.iter(function(line) {
-    var len = lineLength(line)
+    let len = lineLength(line)
     if (len > d.maxLineLength) {
       d.maxLineLength = len
       d.maxLine = line
diff --git a/src/line/utils_line.js b/src/line/utils_line.js
index 4e10a1d8d8..647c07791e 100644
--- a/src/line/utils_line.js
+++ b/src/line/utils_line.js
@@ -4,9 +4,10 @@ import { indexOf } from "../util/misc"
 export function getLine(doc, n) {
   n -= doc.first
   if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.")
-  for (var chunk = doc; !chunk.lines;) {
-    for (var i = 0;; ++i) {
-      var child = chunk.children[i], sz = child.chunkSize()
+  let chunk = doc
+  while (!chunk.lines) {
+    for (let i = 0;; ++i) {
+      let child = chunk.children[i], sz = child.chunkSize()
       if (n < sz) { chunk = child; break }
       n -= sz
     }
@@ -17,9 +18,9 @@ export function getLine(doc, n) {
 // Get the part of a document between two positions, as an array of
 // strings.
 export function getBetween(doc, start, end) {
-  var out = [], n = start.line
+  let out = [], n = start.line
   doc.iter(start.line, end.line + 1, function(line) {
-    var text = line.text
+    let text = line.text
     if (n == end.line) text = text.slice(0, end.ch)
     if (n == start.line) text = text.slice(start.ch)
     out.push(text)
@@ -29,7 +30,7 @@ export function getBetween(doc, start, end) {
 }
 // Get the lines between from and to, as array of strings.
 export function getLines(doc, from, to) {
-  var out = []
+  let out = []
   doc.iter(from, to, function(line) { out.push(line.text) })
   return out
 }
@@ -37,17 +38,17 @@ export function getLines(doc, from, to) {
 // Update the height of a line, propagating the height change
 // upwards to parent nodes.
 export function updateLineHeight(line, height) {
-  var diff = height - line.height
-  if (diff) for (var n = line; n; n = n.parent) n.height += diff
+  let diff = height - line.height
+  if (diff) for (let n = line; n; n = n.parent) n.height += diff
 }
 
 // Given a line object, find its line number by walking up through
 // its parent links.
 export function lineNo(line) {
   if (line.parent == null) return null
-  var cur = line.parent, no = indexOf(cur.lines, line)
-  for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
-    for (var i = 0;; ++i) {
+  let cur = line.parent, no = indexOf(cur.lines, line)
+  for (let chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
+    for (let i = 0;; ++i) {
       if (chunk.children[i] == cur) break
       no += chunk.children[i].chunkSize()
     }
@@ -58,18 +59,19 @@ export function lineNo(line) {
 // Find the line at the given vertical position, using the height
 // information in the document tree.
 export function lineAtHeight(chunk, h) {
-  var n = chunk.first
+  let n = chunk.first
   outer: do {
-    for (var i = 0; i < chunk.children.length; ++i) {
-      var child = chunk.children[i], ch = child.height
+    for (let i = 0; i < chunk.children.length; ++i) {
+      let child = chunk.children[i], ch = child.height
       if (h < ch) { chunk = child; continue outer }
       h -= ch
       n += child.chunkSize()
     }
     return n
   } while (!chunk.lines)
-  for (var i = 0; i < chunk.lines.length; ++i) {
-    var line = chunk.lines[i], lh = line.height
+  let i = 0
+  for (; i < chunk.lines.length; ++i) {
+    let line = chunk.lines[i], lh = line.height
     if (h < lh) break
     h -= lh
   }
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 75011a34d3..63e3771b1f 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -18,9 +18,9 @@ export function paddingTop(display) {return display.lineSpace.offsetTop}
 export function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
 export function paddingH(display) {
   if (display.cachedPaddingH) return display.cachedPaddingH
-  var e = removeChildrenAndAdd(display.measure, elt("pre", "x"))
-  var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle
-  var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}
+  let e = removeChildrenAndAdd(display.measure, elt("pre", "x"))
+  let style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle
+  let data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}
   if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data
   return data
 }
@@ -38,15 +38,15 @@ export function displayHeight(cm) {
 // line. When lineWrapping is on, there might be more than one
 // height.
 function ensureLineHeights(cm, lineView, rect) {
-  var wrapping = cm.options.lineWrapping
-  var curWidth = wrapping && displayWidth(cm)
+  let wrapping = cm.options.lineWrapping
+  let curWidth = wrapping && displayWidth(cm)
   if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
-    var heights = lineView.measure.heights = []
+    let heights = lineView.measure.heights = []
     if (wrapping) {
       lineView.measure.width = curWidth
-      var rects = lineView.text.firstChild.getClientRects()
-      for (var i = 0; i < rects.length - 1; i++) {
-        var cur = rects[i], next = rects[i + 1]
+      let rects = lineView.text.firstChild.getClientRects()
+      for (let i = 0; i < rects.length - 1; i++) {
+        let cur = rects[i], next = rects[i + 1]
         if (Math.abs(cur.bottom - next.bottom) > 2)
           heights.push((cur.bottom + next.top) / 2 - rect.top)
       }
@@ -61,10 +61,10 @@ function ensureLineHeights(cm, lineView, rect) {
 export function mapFromLineView(lineView, line, lineN) {
   if (lineView.line == line)
     return {map: lineView.measure.map, cache: lineView.measure.cache}
-  for (var i = 0; i < lineView.rest.length; i++)
+  for (let i = 0; i < lineView.rest.length; i++)
     if (lineView.rest[i] == line)
       return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]}
-  for (var i = 0; i < lineView.rest.length; i++)
+  for (let i = 0; i < lineView.rest.length; i++)
     if (lineNo(lineView.rest[i]) > lineN)
       return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true}
 }
@@ -73,10 +73,10 @@ export function mapFromLineView(lineView, line, lineN) {
 // when measurement is needed for a line that's not in the viewport.
 function updateExternalMeasurement(cm, line) {
   line = visualLine(line)
-  var lineN = lineNo(line)
-  var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN)
+  let lineN = lineNo(line)
+  let view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN)
   view.lineN = lineN
-  var built = view.built = buildLineContent(cm, view)
+  let built = view.built = buildLineContent(cm, view)
   view.text = built.pre
   removeChildrenAndAdd(cm.display.lineMeasure, built.pre)
   return view
@@ -92,7 +92,7 @@ export function measureChar(cm, line, ch, bias) {
 export function findViewForLine(cm, lineN) {
   if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
     return cm.display.view[findViewIndex(cm, lineN)]
-  var ext = cm.display.externalMeasured
+  let ext = cm.display.externalMeasured
   if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
     return ext
 }
@@ -103,8 +103,8 @@ export function findViewForLine(cm, lineN) {
 // measurements in a row, can thus ensure that the set-up work is
 // only done once.
 function prepareMeasureForLine(cm, line) {
-  var lineN = lineNo(line)
-  var view = findViewForLine(cm, lineN)
+  let lineN = lineNo(line)
+  let view = findViewForLine(cm, lineN)
   if (view && !view.text) {
     view = null
   } else if (view && view.changes) {
@@ -114,7 +114,7 @@ function prepareMeasureForLine(cm, line) {
   if (!view)
     view = updateExternalMeasurement(cm, line)
 
-  var info = mapFromLineView(view, line, lineN)
+  let info = mapFromLineView(view, line, lineN)
   return {
     line: line, view: view, rect: null,
     map: info.map, cache: info.cache, before: info.before,
@@ -126,7 +126,7 @@ function prepareMeasureForLine(cm, line) {
 // actual character (or fetches it from the cache).
 function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
   if (prepared.before) ch = -1
-  var key = ch + (bias || ""), found
+  let key = ch + (bias || ""), found
   if (prepared.cache.hasOwnProperty(key)) {
     found = prepared.cache[key]
   } else {
@@ -144,14 +144,15 @@ function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
           bottom: varHeight ? found.rbottom : found.bottom}
 }
 
-var nullRect = {left: 0, right: 0, top: 0, bottom: 0}
+let nullRect = {left: 0, right: 0, top: 0, bottom: 0}
 
 export function nodeAndOffsetInLineMap(map, ch, bias) {
-  var node, start, end, collapse
+  let node, start, end, collapse, mStart, mEnd
   // First, search the line map for the text node corresponding to,
   // or closest to, the target character.
-  for (var i = 0; i < map.length; i += 3) {
-    var mStart = map[i], mEnd = map[i + 1]
+  for (let i = 0; i < map.length; i += 3) {
+    mStart = map[i]
+    mEnd = map[i + 1]
     if (ch < mStart) {
       start = 0; end = 1
       collapse = "left"
@@ -184,22 +185,22 @@ export function nodeAndOffsetInLineMap(map, ch, bias) {
 }
 
 function getUsefulRect(rects, bias) {
-  var rect = nullRect
-  if (bias == "left") for (var i = 0; i < rects.length; i++) {
+  let rect = nullRect
+  if (bias == "left") for (let i = 0; i < rects.length; i++) {
     if ((rect = rects[i]).left != rect.right) break
-  } else for (var i = rects.length - 1; i >= 0; i--) {
+  } else for (let i = rects.length - 1; i >= 0; i--) {
     if ((rect = rects[i]).left != rect.right) break
   }
   return rect
 }
 
 function measureCharInner(cm, prepared, ch, bias) {
-  var place = nodeAndOffsetInLineMap(prepared.map, ch, bias)
-  var node = place.node, start = place.start, end = place.end, collapse = place.collapse
+  let place = nodeAndOffsetInLineMap(prepared.map, ch, bias)
+  let node = place.node, start = place.start, end = place.end, collapse = place.collapse
 
-  var rect
+  let rect
   if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
-    for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
+    for (let i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
       while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start
       while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end
       if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart)
@@ -214,27 +215,28 @@ function measureCharInner(cm, prepared, ch, bias) {
     if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect)
   } else { // If it is a widget, simply get the box for the whole widget.
     if (start > 0) collapse = bias = "right"
-    var rects
+    let rects
     if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
       rect = rects[bias == "right" ? rects.length - 1 : 0]
     else
       rect = node.getBoundingClientRect()
   }
   if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
-    var rSpan = node.parentNode.getClientRects()[0]
+    let rSpan = node.parentNode.getClientRects()[0]
     if (rSpan)
       rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom}
     else
       rect = nullRect
   }
 
-  var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top
-  var mid = (rtop + rbot) / 2
-  var heights = prepared.view.measure.heights
-  for (var i = 0; i < heights.length - 1; i++)
+  let rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top
+  let mid = (rtop + rbot) / 2
+  let heights = prepared.view.measure.heights
+  let i = 0
+  for (; i < heights.length - 1; i++)
     if (mid < heights[i]) break
-  var top = i ? heights[i - 1] : 0, bot = heights[i]
-  var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
+  let top = i ? heights[i - 1] : 0, bot = heights[i]
+  let result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
                 right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
                 top: top, bottom: bot}
   if (!rect.left && !rect.right) result.bogus = true
@@ -249,8 +251,8 @@ function maybeUpdateRectForZooming(measure, rect) {
   if (!window.screen || screen.logicalXDPI == null ||
       screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
     return rect
-  var scaleX = screen.logicalXDPI / screen.deviceXDPI
-  var scaleY = screen.logicalYDPI / screen.deviceYDPI
+  let scaleX = screen.logicalXDPI / screen.deviceXDPI
+  let scaleY = screen.logicalYDPI / screen.deviceYDPI
   return {left: rect.left * scaleX, right: rect.right * scaleX,
           top: rect.top * scaleY, bottom: rect.bottom * scaleY}
 }
@@ -259,7 +261,7 @@ export function clearLineMeasurementCacheFor(lineView) {
   if (lineView.measure) {
     lineView.measure.cache = {}
     lineView.measure.heights = null
-    if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
+    if (lineView.rest) for (let i = 0; i < lineView.rest.length; i++)
       lineView.measure.caches[i] = {}
   }
 }
@@ -267,7 +269,7 @@ export function clearLineMeasurementCacheFor(lineView) {
 export function clearLineMeasurementCache(cm) {
   cm.display.externalMeasure = null
   removeChildren(cm.display.lineMeasure)
-  for (var i = 0; i < cm.display.view.length; i++)
+  for (let i = 0; i < cm.display.view.length; i++)
     clearLineMeasurementCacheFor(cm.display.view[i])
 }
 
@@ -286,19 +288,19 @@ function pageScrollY() { return window.pageYOffset || (document.documentElement
 // "line", "div" (display.lineDiv), "local"./null (editor), "window",
 // or "page".
 export function intoCoordSystem(cm, lineObj, rect, context) {
-  if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
-    var size = widgetHeight(lineObj.widgets[i])
+  if (lineObj.widgets) for (let i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
+    let size = widgetHeight(lineObj.widgets[i])
     rect.top += size; rect.bottom += size
   }
   if (context == "line") return rect
   if (!context) context = "local"
-  var yOff = heightAtLine(lineObj)
+  let yOff = heightAtLine(lineObj)
   if (context == "local") yOff += paddingTop(cm.display)
   else yOff -= cm.display.viewOffset
   if (context == "page" || context == "window") {
-    var lOff = cm.display.lineSpace.getBoundingClientRect()
+    let lOff = cm.display.lineSpace.getBoundingClientRect()
     yOff += lOff.top + (context == "window" ? 0 : pageScrollY())
-    var xOff = lOff.left + (context == "window" ? 0 : pageScrollX())
+    let xOff = lOff.left + (context == "window" ? 0 : pageScrollX())
     rect.left += xOff; rect.right += xOff
   }
   rect.top += yOff; rect.bottom += yOff
@@ -309,18 +311,18 @@ export function intoCoordSystem(cm, lineObj, rect, context) {
 // Context may be "window", "page", "div", or "local"./null.
 export function fromCoordSystem(cm, coords, context) {
   if (context == "div") return coords
-  var left = coords.left, top = coords.top
+  let left = coords.left, top = coords.top
   // First move into "page" coordinate system
   if (context == "page") {
     left -= pageScrollX()
     top -= pageScrollY()
   } else if (context == "local" || !context) {
-    var localBox = cm.display.sizer.getBoundingClientRect()
+    let localBox = cm.display.sizer.getBoundingClientRect()
     left += localBox.left
     top += localBox.top
   }
 
-  var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect()
+  let lineSpaceBox = cm.display.lineSpace.getBoundingClientRect()
   return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top}
 }
 
@@ -336,12 +338,12 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig
   lineObj = lineObj || getLine(cm.doc, pos.line)
   if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj)
   function get(ch, right) {
-    var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight)
+    let m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight)
     if (right) m.left = m.right; else m.right = m.left
     return intoCoordSystem(cm, lineObj, m, context)
   }
   function getBidi(ch, partPos) {
-    var part = order[partPos], right = part.level % 2
+    let part = order[partPos], right = part.level % 2
     if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
       part = order[--partPos]
       ch = bidiRight(part) - (part.level % 2 ? 0 : 1)
@@ -354,10 +356,10 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig
     if (right && ch == part.to && ch > part.from) return get(ch - 1)
     return get(ch, right)
   }
-  var order = getOrder(lineObj), ch = pos.ch
+  let order = getOrder(lineObj), ch = pos.ch
   if (!order) return get(ch)
-  var partPos = getBidiPartAt(order, ch)
-  var val = getBidi(ch, partPos)
+  let partPos = getBidiPartAt(order, ch)
+  let val = getBidi(ch, partPos)
   if (bidiOther != null) val.other = getBidi(ch, bidiOther)
   return val
 }
@@ -365,10 +367,11 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig
 // Used to cheaply estimate the coordinates for a position. Used for
 // intermediate scroll updates.
 export function estimateCoords(cm, pos) {
-  var left = 0, pos = clipPos(cm.doc, pos)
+  let left = 0
+  pos = clipPos(cm.doc, pos)
   if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch
-  var lineObj = getLine(cm.doc, pos.line)
-  var top = heightAtLine(lineObj) + paddingTop(cm.display)
+  let lineObj = getLine(cm.doc, pos.line)
+  let top = heightAtLine(lineObj) + paddingTop(cm.display)
   return {left: left, right: left, top: top, bottom: top + lineObj.height}
 }
 
@@ -379,7 +382,7 @@ export function estimateCoords(cm, pos) {
 // is true, that means the coordinates lie outside the line's
 // vertical range.
 function PosWithInfo(line, ch, outside, xRel) {
-  var pos = Pos(line, ch)
+  let pos = Pos(line, ch)
   pos.xRel = xRel
   if (outside) pos.outside = true
   return pos
@@ -388,19 +391,19 @@ function PosWithInfo(line, ch, outside, xRel) {
 // Compute the character position closest to the given coordinates.
 // Input must be lineSpace-local ("div" coordinate system).
 export function coordsChar(cm, x, y) {
-  var doc = cm.doc
+  let doc = cm.doc
   y += cm.display.viewOffset
   if (y < 0) return PosWithInfo(doc.first, 0, true, -1)
-  var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1
+  let lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1
   if (lineN > last)
     return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1)
   if (x < 0) x = 0
 
-  var lineObj = getLine(doc, lineN)
+  let lineObj = getLine(doc, lineN)
   for (;;) {
-    var found = coordsCharInner(cm, lineObj, lineN, x, y)
-    var merged = collapsedSpanAtEnd(lineObj)
-    var mergedPos = merged && merged.find(0, true)
+    let found = coordsCharInner(cm, lineObj, lineN, x, y)
+    let merged = collapsedSpanAtEnd(lineObj)
+    let mergedPos = merged && merged.find(0, true)
     if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
       lineN = lineNo(lineObj = mergedPos.to.line)
     else
@@ -409,12 +412,12 @@ export function coordsChar(cm, x, y) {
 }
 
 function coordsCharInner(cm, lineObj, lineNo, x, y) {
-  var innerOff = y - heightAtLine(lineObj)
-  var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth
-  var preparedMeasure = prepareMeasureForLine(cm, lineObj)
+  let innerOff = y - heightAtLine(lineObj)
+  let wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth
+  let preparedMeasure = prepareMeasureForLine(cm, lineObj)
 
   function getX(ch) {
-    var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure)
+    let sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure)
     wrongLine = true
     if (innerOff > sp.bottom) return sp.left - adjust
     else if (innerOff < sp.top) return sp.left + adjust
@@ -422,24 +425,24 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
     return sp.left
   }
 
-  var bidi = getOrder(lineObj), dist = lineObj.text.length
-  var from = lineLeft(lineObj), to = lineRight(lineObj)
-  var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine
+  let bidi = getOrder(lineObj), dist = lineObj.text.length
+  let from = lineLeft(lineObj), to = lineRight(lineObj)
+  let fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine
 
   if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1)
   // Do a binary search between these bounds.
   for (;;) {
     if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-      var ch = x < fromX || x - fromX <= toX - x ? from : to
-      var outside = ch == from ? fromOutside : toOutside
-      var xDiff = x - (ch == from ? fromX : toX)
+      let ch = x < fromX || x - fromX <= toX - x ? from : to
+      let outside = ch == from ? fromOutside : toOutside
+      let xDiff = x - (ch == from ? fromX : toX)
       // This is a kludge to handle the case where the coordinates
       // are after a line-wrapped line. We should replace it with a
       // more general handling of cursor positions around line
       // breaks. (Issue #4078)
       if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
           ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
-        var charSize = measureCharPrepared(cm, preparedMeasure, ch, "right")
+        let charSize = measureCharPrepared(cm, preparedMeasure, ch, "right")
         if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
           outside = false
           ch++
@@ -447,21 +450,21 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
         }
       }
       while (isExtendingChar(lineObj.text.charAt(ch))) ++ch
-      var pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0)
+      let pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0)
       return pos
     }
-    var step = Math.ceil(dist / 2), middle = from + step
+    let step = Math.ceil(dist / 2), middle = from + step
     if (bidi) {
       middle = from
-      for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1)
+      for (let i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1)
     }
-    var middleX = getX(middle)
+    let middleX = getX(middle)
     if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step}
     else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step}
   }
 }
 
-var measureText
+let measureText
 // Compute the default text height.
 export function textHeight(display) {
   if (display.cachedTextHeight != null) return display.cachedTextHeight
@@ -469,14 +472,14 @@ export function textHeight(display) {
     measureText = elt("pre")
     // Measure a bunch of lines, for browsers that compute
     // fractional heights.
-    for (var i = 0; i < 49; ++i) {
+    for (let i = 0; i < 49; ++i) {
       measureText.appendChild(document.createTextNode("x"))
       measureText.appendChild(elt("br"))
     }
     measureText.appendChild(document.createTextNode("x"))
   }
   removeChildrenAndAdd(display.measure, measureText)
-  var height = measureText.offsetHeight / 50
+  let height = measureText.offsetHeight / 50
   if (height > 3) display.cachedTextHeight = height
   removeChildren(display.measure)
   return height || 1
@@ -485,10 +488,10 @@ export function textHeight(display) {
 // Compute the default character width.
 export function charWidth(display) {
   if (display.cachedCharWidth != null) return display.cachedCharWidth
-  var anchor = elt("span", "xxxxxxxxxx")
-  var pre = elt("pre", [anchor])
+  let anchor = elt("span", "xxxxxxxxxx")
+  let pre = elt("pre", [anchor])
   removeChildrenAndAdd(display.measure, pre)
-  var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10
+  let rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10
   if (width > 2) display.cachedCharWidth = width
   return width || 10
 }
@@ -496,9 +499,9 @@ export function charWidth(display) {
 // Do a bulk-read of the DOM positions and sizes needed to draw the
 // view, so that we don't interleave reading and writing to the DOM.
 export function getDimensions(cm) {
-  var d = cm.display, left = {}, width = {}
-  var gutterLeft = d.gutters.clientLeft
-  for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
+  let d = cm.display, left = {}, width = {}
+  let gutterLeft = d.gutters.clientLeft
+  for (let n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
     left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft
     width[cm.options.gutters[i]] = n.clientWidth
   }
@@ -520,13 +523,13 @@ export function compensateForHScroll(display) {
 // first approximation until the line becomes visible (and is thus
 // properly measurable).
 export function estimateHeight(cm) {
-  var th = textHeight(cm.display), wrapping = cm.options.lineWrapping
-  var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3)
+  let th = textHeight(cm.display), wrapping = cm.options.lineWrapping
+  let perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3)
   return function(line) {
     if (lineIsHidden(cm.doc, line)) return 0
 
-    var widgetsHeight = 0
-    if (line.widgets) for (var i = 0; i < line.widgets.length; i++) {
+    let widgetsHeight = 0
+    if (line.widgets) for (let i = 0; i < line.widgets.length; i++) {
       if (line.widgets[i].height) widgetsHeight += line.widgets[i].height
     }
 
@@ -538,9 +541,9 @@ export function estimateHeight(cm) {
 }
 
 export function estimateLineHeights(cm) {
-  var doc = cm.doc, est = estimateHeight(cm)
+  let doc = cm.doc, est = estimateHeight(cm)
   doc.iter(function(line) {
-    var estHeight = est(line)
+    let estHeight = est(line)
     if (estHeight != line.height) updateLineHeight(line, estHeight)
   })
 }
@@ -551,16 +554,16 @@ export function estimateLineHeights(cm) {
 // selections, and tries to estimate a character position even for
 // coordinates beyond the right of the text.
 export function posFromMouse(cm, e, liberal, forRect) {
-  var display = cm.display
+  let display = cm.display
   if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null
 
-  var x, y, space = display.lineSpace.getBoundingClientRect()
+  let x, y, space = display.lineSpace.getBoundingClientRect()
   // Fails unpredictably on IE[67] when mouse is dragged around quickly.
   try { x = e.clientX - space.left; y = e.clientY - space.top }
   catch (e) { return null }
-  var coords = coordsChar(cm, x, y), line
+  let coords = coordsChar(cm, x, y), line
   if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
-    var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length
+    let colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length
     coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff))
   }
   return coords
@@ -572,8 +575,8 @@ export function findViewIndex(cm, n) {
   if (n >= cm.display.viewTo) return null
   n -= cm.display.viewFrom
   if (n < 0) return null
-  var view = cm.display.view
-  for (var i = 0; i < view.length; i++) {
+  let view = cm.display.view
+  for (let i = 0; i < view.length; i++) {
     n -= view[i].size
     if (n < 0) return i
   }
diff --git a/src/measurement/update_line.js b/src/measurement/update_line.js
index be94b00940..4a80a7666c 100644
--- a/src/measurement/update_line.js
+++ b/src/measurement/update_line.js
@@ -8,8 +8,8 @@ import { signalLater } from "../util/operation_group"
 // lineView.changes. This updates the relevant part of the line's
 // DOM structure.
 export function updateLineForChanges(cm, lineView, lineN, dims) {
-  for (var j = 0; j < lineView.changes.length; j++) {
-    var type = lineView.changes[j]
+  for (let j = 0; j < lineView.changes.length; j++) {
+    let type = lineView.changes[j]
     if (type == "text") updateLineText(cm, lineView)
     else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims)
     else if (type == "class") updateLineClasses(lineView)
@@ -32,13 +32,13 @@ function ensureLineWrapped(lineView) {
 }
 
 function updateLineBackground(lineView) {
-  var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass
+  let cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass
   if (cls) cls += " CodeMirror-linebackground"
   if (lineView.background) {
     if (cls) lineView.background.className = cls
     else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null }
   } else if (cls) {
-    var wrap = ensureLineWrapped(lineView)
+    let wrap = ensureLineWrapped(lineView)
     lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild)
   }
 }
@@ -46,7 +46,7 @@ function updateLineBackground(lineView) {
 // Wrapper around buildLineContent which will reuse the structure
 // in display.externalMeasured when possible.
 function getLineContent(cm, lineView) {
-  var ext = cm.display.externalMeasured
+  let ext = cm.display.externalMeasured
   if (ext && ext.line == lineView.line) {
     cm.display.externalMeasured = null
     lineView.measure = ext.measure
@@ -59,8 +59,8 @@ function getLineContent(cm, lineView) {
 // classes because the mode may output tokens that influence these
 // classes.
 function updateLineText(cm, lineView) {
-  var cls = lineView.text.className
-  var built = getLineContent(cm, lineView)
+  let cls = lineView.text.className
+  let built = getLineContent(cm, lineView)
   if (lineView.text == lineView.node) lineView.node = built.pre
   lineView.text.parentNode.replaceChild(built.pre, lineView.text)
   lineView.text = built.pre
@@ -79,7 +79,7 @@ function updateLineClasses(lineView) {
     ensureLineWrapped(lineView).className = lineView.line.wrapClass
   else if (lineView.node != lineView.text)
     lineView.node.className = ""
-  var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass
+  let textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass
   lineView.text.className = textClass || ""
 }
 
@@ -93,16 +93,16 @@ function updateLineGutter(cm, lineView, lineN, dims) {
     lineView.gutterBackground = null
   }
   if (lineView.line.gutterClass) {
-    var wrap = ensureLineWrapped(lineView)
+    let wrap = ensureLineWrapped(lineView)
     lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
                                     "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
                                     "px; width: " + dims.gutterTotalWidth + "px")
     wrap.insertBefore(lineView.gutterBackground, lineView.text)
   }
-  var markers = lineView.line.gutterMarkers
+  let markers = lineView.line.gutterMarkers
   if (cm.options.lineNumbers || markers) {
-    var wrap = ensureLineWrapped(lineView)
-    var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
+    let wrap = ensureLineWrapped(lineView)
+    let gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
                                            (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px")
     cm.display.input.setUneditable(gutterWrap)
     wrap.insertBefore(gutterWrap, lineView.text)
@@ -114,8 +114,8 @@ function updateLineGutter(cm, lineView, lineN, dims) {
             "CodeMirror-linenumber CodeMirror-gutter-elt",
             "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
             + cm.display.lineNumInnerWidth + "px"))
-    if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) {
-      var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]
+    if (markers) for (let k = 0; k < cm.options.gutters.length; ++k) {
+      let id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]
       if (found)
         gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
                                    dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"))
@@ -125,8 +125,8 @@ function updateLineGutter(cm, lineView, lineN, dims) {
 
 function updateLineWidgets(cm, lineView, dims) {
   if (lineView.alignable) lineView.alignable = null
-  for (var node = lineView.node.firstChild, next; node; node = next) {
-    var next = node.nextSibling
+  for (let node = lineView.node.firstChild, next; node; node = next) {
+    next = node.nextSibling
     if (node.className == "CodeMirror-linewidget")
       lineView.node.removeChild(node)
   }
@@ -135,7 +135,7 @@ function updateLineWidgets(cm, lineView, dims) {
 
 // Build a line's DOM representation from scratch
 export function buildLineElement(cm, lineView, lineN, dims) {
-  var built = getLineContent(cm, lineView)
+  let built = getLineContent(cm, lineView)
   lineView.text = lineView.node = built.pre
   if (built.bgClass) lineView.bgClass = built.bgClass
   if (built.textClass) lineView.textClass = built.textClass
@@ -150,15 +150,15 @@ export function buildLineElement(cm, lineView, lineN, dims) {
 // collapsed spans). The widgets for all of them need to be drawn.
 function insertLineWidgets(cm, lineView, dims) {
   insertLineWidgetsFor(cm, lineView.line, lineView, dims, true)
-  if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
+  if (lineView.rest) for (let i = 0; i < lineView.rest.length; i++)
     insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false)
 }
 
 function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
   if (!line.widgets) return
-  var wrap = ensureLineWrapped(lineView)
-  for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
-    var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget")
+  let wrap = ensureLineWrapped(lineView)
+  for (let i = 0, ws = line.widgets; i < ws.length; ++i) {
+    let widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget")
     if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true")
     positionLineWidget(widget, node, lineView, dims)
     cm.display.input.setUneditable(node)
@@ -173,7 +173,7 @@ function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
 function positionLineWidget(widget, node, lineView, dims) {
   if (widget.noHScroll) {
     ;(lineView.alignable || (lineView.alignable = [])).push(node)
-    var width = dims.wrapperWidth
+    let width = dims.wrapperWidth
     node.style.left = dims.fixedPos + "px"
     if (!widget.coverGutter) {
       width -= dims.gutterTotalWidth
diff --git a/src/measurement/widgets.js b/src/measurement/widgets.js
index f20d313e6d..554cf80977 100644
--- a/src/measurement/widgets.js
+++ b/src/measurement/widgets.js
@@ -3,10 +3,10 @@ import { e_target } from "../util/event"
 
 export function widgetHeight(widget) {
   if (widget.height != null) return widget.height
-  var cm = widget.doc.cm
+  let cm = widget.doc.cm
   if (!cm) return 0
   if (!contains(document.body, widget.node)) {
-    var parentStyle = "position: relative;"
+    let parentStyle = "position: relative;"
     if (widget.coverGutter)
       parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;"
     if (widget.noHScroll)
@@ -18,7 +18,7 @@ export function widgetHeight(widget) {
 
 // Return true when the given mouse event happened in a widget
 export function eventInWidget(display, e) {
-  for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
+  for (let n = e_target(e); n != display.wrapper; n = n.parentNode) {
     if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
         (n.parentNode == display.sizer && n != display.mover))
       return true
diff --git a/src/model/Doc.js b/src/model/Doc.js
index ba004631d3..c02fe062f1 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -19,8 +19,8 @@ import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } f
 import { normalizeSelection, Range, simpleSelection } from "./selection"
 import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates"
 
-var nextDocId = 0
-var Doc = function(text, mode, firstLine, lineSep) {
+let nextDocId = 0
+let Doc = function(text, mode, firstLine, lineSep) {
   if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep)
   if (firstLine == null) firstLine = 0
 
@@ -30,7 +30,7 @@ var Doc = function(text, mode, firstLine, lineSep) {
   this.cantEdit = false
   this.cleanGeneration = 1
   this.frontier = firstLine
-  var start = Pos(firstLine, 0)
+  let start = Pos(firstLine, 0)
   this.sel = simpleSelection(start)
   this.history = new History(null)
   this.id = ++nextDocId
@@ -56,8 +56,8 @@ Doc.prototype = createObj(BranchChunk.prototype, {
 
   // Non-public interface for adding and removing lines.
   insert: function(at, lines) {
-    var height = 0
-    for (var i = 0; i < lines.length; ++i) height += lines[i].height
+    let height = 0
+    for (let i = 0; i < lines.length; ++i) height += lines[i].height
     this.insertInner(at - this.first, lines, height)
   },
   remove: function(at, n) { this.removeInner(at - this.first, n) },
@@ -66,12 +66,12 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   // are also available from CodeMirror (editor) instances.
 
   getValue: function(lineSep) {
-    var lines = getLines(this, this.first, this.first + this.size)
+    let lines = getLines(this, this.first, this.first + this.size)
     if (lineSep === false) return lines
     return lines.join(lineSep || this.lineSeparator())
   },
   setValue: docMethodOp(function(code) {
-    var top = Pos(this.first, 0), last = this.first + this.size - 1
+    let top = Pos(this.first, 0), last = this.first + this.size - 1
     makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
                       text: this.splitLines(code), origin: "setValue", full: true}, true)
     setSelection(this, simpleSelection(top))
@@ -82,12 +82,12 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     replaceRange(this, code, from, to, origin)
   },
   getRange: function(from, to, lineSep) {
-    var lines = getBetween(this, clipPos(this, from), clipPos(this, to))
+    let lines = getBetween(this, clipPos(this, from), clipPos(this, to))
     if (lineSep === false) return lines
     return lines.join(lineSep || this.lineSeparator())
   },
 
-  getLine: function(line) {var l = this.getLineHandle(line); return l && l.text},
+  getLine: function(line) {let l = this.getLineHandle(line); return l && l.text},
 
   getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line)},
   getLineNumber: function(line) {return lineNo(line)},
@@ -104,7 +104,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   clipPos: function(pos) {return clipPos(this, pos)},
 
   getCursor: function(start) {
-    var range = this.sel.primary(), pos
+    let range = this.sel.primary(), pos
     if (start == null || start == "head") pos = range.head
     else if (start == "anchor") pos = range.anchor
     else if (start == "end" || start == "to" || start === false) pos = range.to()
@@ -127,55 +127,56 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     extendSelections(this, clipPosArray(this, heads), options)
   }),
   extendSelectionsBy: docMethodOp(function(f, options) {
-    var heads = map(this.sel.ranges, f)
+    let heads = map(this.sel.ranges, f)
     extendSelections(this, clipPosArray(this, heads), options)
   }),
   setSelections: docMethodOp(function(ranges, primary, options) {
     if (!ranges.length) return
-    for (var i = 0, out = []; i < ranges.length; i++)
+    let out = []
+    for (let i = 0; i < ranges.length; i++)
       out[i] = new Range(clipPos(this, ranges[i].anchor),
                          clipPos(this, ranges[i].head))
     if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex)
     setSelection(this, normalizeSelection(out, primary), options)
   }),
   addSelection: docMethodOp(function(anchor, head, options) {
-    var ranges = this.sel.ranges.slice(0)
+    let ranges = this.sel.ranges.slice(0)
     ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)))
     setSelection(this, normalizeSelection(ranges, ranges.length - 1), options)
   }),
 
   getSelection: function(lineSep) {
-    var ranges = this.sel.ranges, lines
-    for (var i = 0; i < ranges.length; i++) {
-      var sel = getBetween(this, ranges[i].from(), ranges[i].to())
+    let ranges = this.sel.ranges, lines
+    for (let i = 0; i < ranges.length; i++) {
+      let sel = getBetween(this, ranges[i].from(), ranges[i].to())
       lines = lines ? lines.concat(sel) : sel
     }
     if (lineSep === false) return lines
     else return lines.join(lineSep || this.lineSeparator())
   },
   getSelections: function(lineSep) {
-    var parts = [], ranges = this.sel.ranges
-    for (var i = 0; i < ranges.length; i++) {
-      var sel = getBetween(this, ranges[i].from(), ranges[i].to())
+    let parts = [], ranges = this.sel.ranges
+    for (let i = 0; i < ranges.length; i++) {
+      let sel = getBetween(this, ranges[i].from(), ranges[i].to())
       if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator())
       parts[i] = sel
     }
     return parts
   },
   replaceSelection: function(code, collapse, origin) {
-    var dup = []
-    for (var i = 0; i < this.sel.ranges.length; i++)
+    let dup = []
+    for (let i = 0; i < this.sel.ranges.length; i++)
       dup[i] = code
     this.replaceSelections(dup, collapse, origin || "+input")
   },
   replaceSelections: docMethodOp(function(code, collapse, origin) {
-    var changes = [], sel = this.sel
-    for (var i = 0; i < sel.ranges.length; i++) {
-      var range = sel.ranges[i]
+    let changes = [], sel = this.sel
+    for (let i = 0; i < sel.ranges.length; i++) {
+      let range = sel.ranges[i]
       changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin}
     }
-    var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse)
-    for (var i = changes.length - 1; i >= 0; i--)
+    let newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse)
+    for (let i = changes.length - 1; i >= 0; i--)
       makeChange(this, changes[i])
     if (newSel) setSelectionReplaceHistory(this, newSel)
     else if (this.cm) ensureCursorVisible(this.cm)
@@ -189,9 +190,9 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   getExtending: function() {return this.extend},
 
   historySize: function() {
-    var hist = this.history, done = 0, undone = 0
-    for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done
-    for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone
+    let hist = this.history, done = 0, undone = 0
+    for (let i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done
+    for (let i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone
     return {undo: done, redo: undone}
   },
   clearHistory: function() {this.history = new History(this.history.maxGeneration)},
@@ -213,14 +214,14 @@ Doc.prototype = createObj(BranchChunk.prototype, {
             undone: copyHistoryArray(this.history.undone)}
   },
   setHistory: function(histData) {
-    var hist = this.history = new History(this.history.maxGeneration)
+    let hist = this.history = new History(this.history.maxGeneration)
     hist.done = copyHistoryArray(histData.done.slice(0), null, true)
     hist.undone = copyHistoryArray(histData.undone.slice(0), null, true)
   },
 
   addLineClass: docMethodOp(function(handle, where, cls) {
     return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-      var prop = where == "text" ? "textClass"
+      let prop = where == "text" ? "textClass"
                : where == "background" ? "bgClass"
                : where == "gutter" ? "gutterClass" : "wrapClass"
       if (!line[prop]) line[prop] = cls
@@ -231,16 +232,16 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   }),
   removeLineClass: docMethodOp(function(handle, where, cls) {
     return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-      var prop = where == "text" ? "textClass"
+      let prop = where == "text" ? "textClass"
                : where == "background" ? "bgClass"
                : where == "gutter" ? "gutterClass" : "wrapClass"
-      var cur = line[prop]
+      let cur = line[prop]
       if (!cur) return false
       else if (cls == null) line[prop] = null
       else {
-        var found = cur.match(classTest(cls))
+        let found = cur.match(classTest(cls))
         if (!found) return false
-        var end = found.index + found[0].length
+        let end = found.index + found[0].length
         line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null
       }
       return true
@@ -256,7 +257,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range")
   },
   setBookmark: function(pos, options) {
-    var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
+    let realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
                     insertLeft: options && options.insertLeft,
                     clearWhenEmpty: false, shared: options && options.shared,
                     handleMouseEvents: options && options.handleMouseEvents}
@@ -265,9 +266,9 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   },
   findMarksAt: function(pos) {
     pos = clipPos(this, pos)
-    var markers = [], spans = getLine(this, pos.line).markedSpans
-    if (spans) for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i]
+    let markers = [], spans = getLine(this, pos.line).markedSpans
+    if (spans) for (let i = 0; i < spans.length; ++i) {
+      let span = spans[i]
       if ((span.from == null || span.from <= pos.ch) &&
           (span.to == null || span.to >= pos.ch))
         markers.push(span.marker.parent || span.marker)
@@ -276,11 +277,11 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   },
   findMarks: function(from, to, filter) {
     from = clipPos(this, from); to = clipPos(this, to)
-    var found = [], lineNo = from.line
+    let found = [], lineNo = from.line
     this.iter(from.line, to.line + 1, function(line) {
-      var spans = line.markedSpans
-      if (spans) for (var i = 0; i < spans.length; i++) {
-        var span = spans[i]
+      let spans = line.markedSpans
+      if (spans) for (let i = 0; i < spans.length; i++) {
+        let span = spans[i]
         if (!(span.to != null && lineNo == from.line && from.ch >= span.to ||
               span.from == null && lineNo != from.line ||
               span.from != null && lineNo == to.line && span.from >= to.ch) &&
@@ -292,19 +293,19 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     return found
   },
   getAllMarks: function() {
-    var markers = []
+    let markers = []
     this.iter(function(line) {
-      var sps = line.markedSpans
-      if (sps) for (var i = 0; i < sps.length; ++i)
+      let sps = line.markedSpans
+      if (sps) for (let i = 0; i < sps.length; ++i)
         if (sps[i].from != null) markers.push(sps[i].marker)
     })
     return markers
   },
 
   posFromIndex: function(off) {
-    var ch, lineNo = this.first, sepSize = this.lineSeparator().length
+    let ch, lineNo = this.first, sepSize = this.lineSeparator().length
     this.iter(function(line) {
-      var sz = line.text.length + sepSize
+      let sz = line.text.length + sepSize
       if (sz > off) { ch = off; return true }
       off -= sz
       ++lineNo
@@ -313,9 +314,9 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   },
   indexFromPos: function (coords) {
     coords = clipPos(this, coords)
-    var index = coords.ch
+    let index = coords.ch
     if (coords.line < this.first || coords.ch < 0) return 0
-    var sepSize = this.lineSeparator().length
+    let sepSize = this.lineSeparator().length
     this.iter(this.first, coords.line, function (line) {
       index += line.text.length + sepSize
     })
@@ -323,7 +324,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   },
 
   copy: function(copyHistory) {
-    var doc = new Doc(getLines(this, this.first, this.first + this.size),
+    let doc = new Doc(getLines(this, this.first, this.first + this.size),
                       this.modeOption, this.first, this.lineSep)
     doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft
     doc.sel = this.sel
@@ -337,10 +338,10 @@ Doc.prototype = createObj(BranchChunk.prototype, {
 
   linkedDoc: function(options) {
     if (!options) options = {}
-    var from = this.first, to = this.first + this.size
+    let from = this.first, to = this.first + this.size
     if (options.from != null && options.from > from) from = options.from
     if (options.to != null && options.to < to) to = options.to
-    var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep)
+    let copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep)
     if (options.sharedHist) copy.history = this.history
     ;(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist})
     copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}]
@@ -349,8 +350,8 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   },
   unlinkDoc: function(other) {
     if (other instanceof CodeMirror) other = other.doc
-    if (this.linked) for (var i = 0; i < this.linked.length; ++i) {
-      var link = this.linked[i]
+    if (this.linked) for (let i = 0; i < this.linked.length; ++i) {
+      let link = this.linked[i]
       if (link.doc != other) continue
       this.linked.splice(i, 1)
       other.unlinkDoc(this)
@@ -359,7 +360,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     }
     // If the histories were shared, split them again
     if (other.history == this.history) {
-      var splitIds = [other.id]
+      let splitIds = [other.id]
       linkedDocs(other, function(doc) {splitIds.push(doc.id)}, true)
       other.history = new History(null)
       other.history.done = copyHistoryArray(this.history.done, splitIds)
diff --git a/src/model/change_measurement.js b/src/model/change_measurement.js
index ac14fa5458..881f39eb46 100644
--- a/src/model/change_measurement.js
+++ b/src/model/change_measurement.js
@@ -17,15 +17,15 @@ function adjustForChange(pos, change) {
   if (cmp(pos, change.from) < 0) return pos
   if (cmp(pos, change.to) <= 0) return changeEnd(change)
 
-  var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch
+  let line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch
   if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch
   return Pos(line, ch)
 }
 
 export function computeSelAfterChange(doc, change) {
-  var out = []
-  for (var i = 0; i < doc.sel.ranges.length; i++) {
-    var range = doc.sel.ranges[i]
+  let out = []
+  for (let i = 0; i < doc.sel.ranges.length; i++) {
+    let range = doc.sel.ranges[i]
     out.push(new Range(adjustForChange(range.anchor, change),
                        adjustForChange(range.head, change)))
   }
@@ -42,16 +42,16 @@ function offsetPos(pos, old, nw) {
 // Used by replaceSelections to allow moving the selection to the
 // start or around the replaced test. Hint may be "start" or "around".
 export function computeReplacedSel(doc, changes, hint) {
-  var out = []
-  var oldPrev = Pos(doc.first, 0), newPrev = oldPrev
-  for (var i = 0; i < changes.length; i++) {
-    var change = changes[i]
-    var from = offsetPos(change.from, oldPrev, newPrev)
-    var to = offsetPos(changeEnd(change), oldPrev, newPrev)
+  let out = []
+  let oldPrev = Pos(doc.first, 0), newPrev = oldPrev
+  for (let i = 0; i < changes.length; i++) {
+    let change = changes[i]
+    let from = offsetPos(change.from, oldPrev, newPrev)
+    let to = offsetPos(changeEnd(change), oldPrev, newPrev)
     oldPrev = change.to
     newPrev = to
     if (hint == "around") {
-      var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0
+      let range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0
       out[i] = new Range(inv ? to : from, inv ? from : to)
     } else {
       out[i] = new Range(from, from)
diff --git a/src/model/changes.js b/src/model/changes.js
index 6a8606afcb..e39bc30392 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -20,7 +20,7 @@ import { setSelection, setSelectionNoUndo } from "./selection_updates"
 
 // Allow "beforeChange" event handlers to influence a change
 function filterChange(doc, change, update) {
-  var obj = {
+  let obj = {
     canceled: false,
     from: change.from,
     to: change.to,
@@ -56,9 +56,9 @@ export function makeChange(doc, change, ignoreReadOnly) {
 
   // Possibly split or suppress the update based on the presence
   // of read-only spans in its range.
-  var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to)
+  let split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to)
   if (split) {
-    for (var i = split.length - 1; i >= 0; --i)
+    for (let i = split.length - 1; i >= 0; --i)
       makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text})
   } else {
     makeChangeInner(doc, change)
@@ -67,11 +67,11 @@ export function makeChange(doc, change, ignoreReadOnly) {
 
 function makeChangeInner(doc, change) {
   if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return
-  var selAfter = computeSelAfterChange(doc, change)
+  let selAfter = computeSelAfterChange(doc, change)
   addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN)
 
   makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change))
-  var rebased = []
+  let rebased = []
 
   linkedDocs(doc, function(doc, sharedHist) {
     if (!sharedHist && indexOf(rebased, doc.history) == -1) {
@@ -86,12 +86,13 @@ function makeChangeInner(doc, change) {
 export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
   if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return
 
-  var hist = doc.history, event, selAfter = doc.sel
-  var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done
+  let hist = doc.history, event, selAfter = doc.sel
+  let source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done
 
   // Verify that there is a useable event (so that ctrl-z won't
   // needlessly clear selection events)
-  for (var i = 0; i < source.length; i++) {
+  let i = 0
+  for (; i < source.length; i++) {
     event = source[i]
     if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
       break
@@ -114,15 +115,15 @@ export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
 
   // Build up a reverse change object to add to the opposite history
   // stack (redo when undoing, and vice versa).
-  var antiChanges = []
+  let antiChanges = []
   pushSelectionToHistory(selAfter, dest)
   dest.push({changes: antiChanges, generation: hist.generation})
   hist.generation = event.generation || ++hist.maxGeneration
 
-  var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")
+  let filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")
 
-  for (var i = event.changes.length - 1; i >= 0; --i) {
-    var change = event.changes[i]
+  for (let i = event.changes.length - 1; i >= 0; --i) {
+    let change = event.changes[i]
     change.origin = type
     if (filter && !filterChange(doc, change, false)) {
       source.length = 0
@@ -131,10 +132,10 @@ export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
 
     antiChanges.push(historyChangeFromChange(doc, change))
 
-    var after = i ? computeSelAfterChange(doc, change) : lst(source)
+    let after = i ? computeSelAfterChange(doc, change) : lst(source)
     makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change))
     if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)})
-    var rebased = []
+    let rebased = []
 
     // Propagate to the linked documents
     linkedDocs(doc, function(doc, sharedHist) {
@@ -158,7 +159,7 @@ function shiftDoc(doc, distance) {
   }), doc.sel.primIndex)
   if (doc.cm) {
     regChange(doc.cm, doc.first, doc.first - distance, distance)
-    for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
+    for (let d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
       regLineChange(doc.cm, l, "gutter")
   }
 }
@@ -177,12 +178,12 @@ function makeChangeSingleDoc(doc, change, selAfter, spans) {
 
   // Clip the change to the size of this doc
   if (change.from.line < doc.first) {
-    var shift = change.text.length - 1 - (doc.first - change.from.line)
+    let shift = change.text.length - 1 - (doc.first - change.from.line)
     shiftDoc(doc, shift)
     change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
               text: [lst(change.text)], origin: change.origin}
   }
-  var last = doc.lastLine()
+  let last = doc.lastLine()
   if (change.to.line > last) {
     change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
               text: [change.text[0]], origin: change.origin}
@@ -199,9 +200,9 @@ function makeChangeSingleDoc(doc, change, selAfter, spans) {
 // Handle the interaction of a change to a document with the editor
 // that this document is part of.
 function makeChangeSingleDocInEditor(cm, change, spans) {
-  var doc = cm.doc, display = cm.display, from = change.from, to = change.to
+  let doc = cm.doc, display = cm.display, from = change.from, to = change.to
 
-  var recomputeMaxLength = false, checkWidthStart = from.line
+  let recomputeMaxLength = false, checkWidthStart = from.line
   if (!cm.options.lineWrapping) {
     checkWidthStart = lineNo(visualLine(getLine(doc, from.line)))
     doc.iter(checkWidthStart, to.line + 1, function(line) {
@@ -219,7 +220,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
 
   if (!cm.options.lineWrapping) {
     doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
-      var len = lineLength(line)
+      let len = lineLength(line)
       if (len > display.maxLineLength) {
         display.maxLine = line
         display.maxLineLength = len
@@ -234,7 +235,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
   doc.frontier = Math.min(doc.frontier, from.line)
   startWorker(cm, 400)
 
-  var lendiff = change.text.length - (to.line - from.line) - 1
+  let lendiff = change.text.length - (to.line - from.line) - 1
   // Remember that these lines changed, for updating the display
   if (change.full)
     regChange(cm)
@@ -243,9 +244,9 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
   else
     regChange(cm, from.line, to.line + 1, lendiff)
 
-  var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change")
+  let changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change")
   if (changeHandler || changesHandler) {
-    var obj = {
+    let obj = {
       from: from, to: to,
       text: change.text,
       removed: change.removed,
@@ -259,7 +260,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
 
 export function replaceRange(doc, code, from, to, origin) {
   if (!to) to = from
-  if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp }
+  if (cmp(to, from) < 0) { let tmp = to; to = from; from = tmp }
   if (typeof code == "string") code = doc.splitLines(code)
   makeChange(doc, {from: from, to: to, text: code, origin: origin})
 }
@@ -283,18 +284,18 @@ function rebaseHistSelSingle(pos, from, to, diff) {
 // reallocate them all on every rebase, but also avoid problems with
 // shared position objects being unsafely updated.
 function rebaseHistArray(array, from, to, diff) {
-  for (var i = 0; i < array.length; ++i) {
-    var sub = array[i], ok = true
+  for (let i = 0; i < array.length; ++i) {
+    let sub = array[i], ok = true
     if (sub.ranges) {
       if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true }
-      for (var j = 0; j < sub.ranges.length; j++) {
+      for (let j = 0; j < sub.ranges.length; j++) {
         rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff)
         rebaseHistSelSingle(sub.ranges[j].head, from, to, diff)
       }
       continue
     }
-    for (var j = 0; j < sub.changes.length; ++j) {
-      var cur = sub.changes[j]
+    for (let j = 0; j < sub.changes.length; ++j) {
+      let cur = sub.changes[j]
       if (to < cur.from.line) {
         cur.from = Pos(cur.from.line + diff, cur.from.ch)
         cur.to = Pos(cur.to.line + diff, cur.to.ch)
@@ -311,7 +312,7 @@ function rebaseHistArray(array, from, to, diff) {
 }
 
 function rebaseHist(hist, change) {
-  var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1
+  let from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1
   rebaseHistArray(hist.done, from, to, diff)
   rebaseHistArray(hist.undone, from, to, diff)
 }
@@ -320,7 +321,7 @@ function rebaseHist(hist, change) {
 // returning the number and optionally registering the line as
 // changed.
 export function changeLine(doc, handle, changeType, op) {
-  var no = handle, line = handle
+  let no = handle, line = handle
   if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle))
   else no = lineNo(handle)
   if (no == null) return null
diff --git a/src/model/chunk.js b/src/model/chunk.js
index 0aee95fe2f..2a05d7c545 100644
--- a/src/model/chunk.js
+++ b/src/model/chunk.js
@@ -18,7 +18,8 @@ import { signalLater } from "../util/operation_group"
 export function LeafChunk(lines) {
   this.lines = lines
   this.parent = null
-  for (var i = 0, height = 0; i < lines.length; ++i) {
+  let height = 0
+  for (let i = 0; i < lines.length; ++i) {
     lines[i].parent = this
     height += lines[i].height
   }
@@ -29,8 +30,8 @@ LeafChunk.prototype = {
   chunkSize: function() { return this.lines.length },
   // Remove the n lines at offset 'at'.
   removeInner: function(at, n) {
-    for (var i = at, e = at + n; i < e; ++i) {
-      var line = this.lines[i]
+    for (let i = at, e = at + n; i < e; ++i) {
+      let line = this.lines[i]
       this.height -= line.height
       cleanUpLine(line)
       signalLater(line, "delete")
@@ -46,20 +47,20 @@ LeafChunk.prototype = {
   insertInner: function(at, lines, height) {
     this.height += height
     this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at))
-    for (var i = 0; i < lines.length; ++i) lines[i].parent = this
+    for (let i = 0; i < lines.length; ++i) lines[i].parent = this
   },
   // Used to iterate over a part of the tree.
   iterN: function(at, n, op) {
-    for (var e = at + n; at < e; ++at)
+    for (let e = at + n; at < e; ++at)
       if (op(this.lines[at])) return true
   }
 }
 
 export function BranchChunk(children) {
   this.children = children
-  var size = 0, height = 0
-  for (var i = 0; i < children.length; ++i) {
-    var ch = children[i]
+  let size = 0, height = 0
+  for (let i = 0; i < children.length; ++i) {
+    let ch = children[i]
     size += ch.chunkSize(); height += ch.height
     ch.parent = this
   }
@@ -72,10 +73,10 @@ BranchChunk.prototype = {
   chunkSize: function() { return this.size },
   removeInner: function(at, n) {
     this.size -= n
-    for (var i = 0; i < this.children.length; ++i) {
-      var child = this.children[i], sz = child.chunkSize()
+    for (let i = 0; i < this.children.length; ++i) {
+      let child = this.children[i], sz = child.chunkSize()
       if (at < sz) {
-        var rm = Math.min(n, sz - at), oldHeight = child.height
+        let rm = Math.min(n, sz - at), oldHeight = child.height
         child.removeInner(at, rm)
         this.height -= oldHeight - child.height
         if (sz == rm) { this.children.splice(i--, 1); child.parent = null }
@@ -87,28 +88,28 @@ BranchChunk.prototype = {
     // single leaf node.
     if (this.size - n < 25 &&
         (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
-      var lines = []
+      let lines = []
       this.collapse(lines)
       this.children = [new LeafChunk(lines)]
       this.children[0].parent = this
     }
   },
   collapse: function(lines) {
-    for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines)
+    for (let i = 0; i < this.children.length; ++i) this.children[i].collapse(lines)
   },
   insertInner: function(at, lines, height) {
     this.size += lines.length
     this.height += height
-    for (var i = 0; i < this.children.length; ++i) {
-      var child = this.children[i], sz = child.chunkSize()
+    for (let i = 0; i < this.children.length; ++i) {
+      let child = this.children[i], sz = child.chunkSize()
       if (at <= sz) {
         child.insertInner(at, lines, height)
         if (child.lines && child.lines.length > 50) {
           // To avoid memory thrashing when child.lines is huge (e.g. first view of a large file), it's never spliced.
           // Instead, small slices are taken. They're taken in order because sequential memory accesses are fastest.
-          var remaining = child.lines.length % 25 + 25
-          for (var pos = remaining; pos < child.lines.length;) {
-            var leaf = new LeafChunk(child.lines.slice(pos, pos += 25))
+          let remaining = child.lines.length % 25 + 25
+          for (let pos = remaining; pos < child.lines.length;) {
+            let leaf = new LeafChunk(child.lines.slice(pos, pos += 25))
             child.height -= leaf.height
             this.children.splice(++i, 0, leaf)
             leaf.parent = this
@@ -124,19 +125,19 @@ BranchChunk.prototype = {
   // When a node has grown, check whether it should be split.
   maybeSpill: function() {
     if (this.children.length <= 10) return
-    var me = this
+    let me = this
     do {
-      var spilled = me.children.splice(me.children.length - 5, 5)
-      var sibling = new BranchChunk(spilled)
+      let spilled = me.children.splice(me.children.length - 5, 5)
+      let sibling = new BranchChunk(spilled)
       if (!me.parent) { // Become the parent node
-        var copy = new BranchChunk(me.children)
+        let copy = new BranchChunk(me.children)
         copy.parent = me
         me.children = [copy, sibling]
         me = copy
      } else {
         me.size -= sibling.size
         me.height -= sibling.height
-        var myIndex = indexOf(me.parent.children, me)
+        let myIndex = indexOf(me.parent.children, me)
         me.parent.children.splice(myIndex + 1, 0, sibling)
       }
       sibling.parent = me.parent
@@ -144,10 +145,10 @@ BranchChunk.prototype = {
     me.parent.maybeSpill()
   },
   iterN: function(at, n, op) {
-    for (var i = 0; i < this.children.length; ++i) {
-      var child = this.children[i], sz = child.chunkSize()
+    for (let i = 0; i < this.children.length; ++i) {
+      let child = this.children[i], sz = child.chunkSize()
       if (at < sz) {
-        var used = Math.min(n, sz - at)
+        let used = Math.min(n, sz - at)
         if (child.iterN(at, used, op)) return true
         if ((n -= used) == 0) break
         at = 0
diff --git a/src/model/document_data.js b/src/model/document_data.js
index 8e423bafd3..6ce2ae58e7 100644
--- a/src/model/document_data.js
+++ b/src/model/document_data.js
@@ -25,14 +25,15 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) {
     signalLater(line, "change", line, change)
   }
   function linesFor(start, end) {
-    for (var i = start, result = []; i < end; ++i)
+    let result = []
+    for (let i = start; i < end; ++i)
       result.push(new Line(text[i], spansFor(i), estimateHeight))
     return result
   }
 
-  var from = change.from, to = change.to, text = change.text
-  var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line)
-  var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line
+  let from = change.from, to = change.to, text = change.text
+  let firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line)
+  let lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line
 
   // Adjust the line structure
   if (change.full) {
@@ -41,7 +42,7 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) {
   } else if (isWholeLineUpdate(doc, change)) {
     // This is a whole-line replace. Treated specially to make
     // sure line objects move the way they are supposed to.
-    var added = linesFor(0, text.length - 1)
+    let added = linesFor(0, text.length - 1)
     update(lastLine, lastLine.text, lastSpans)
     if (nlines) doc.remove(from.line, nlines)
     if (added.length) doc.insert(from.line, added)
@@ -49,7 +50,7 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) {
     if (text.length == 1) {
       update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans)
     } else {
-      var added = linesFor(1, text.length - 1)
+      let added = linesFor(1, text.length - 1)
       added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight))
       update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0))
       doc.insert(from.line + 1, added)
@@ -60,7 +61,7 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) {
   } else {
     update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0))
     update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans)
-    var added = linesFor(1, text.length - 1)
+    let added = linesFor(1, text.length - 1)
     if (nlines > 1) doc.remove(from.line + 1, nlines - 1)
     doc.insert(from.line + 1, added)
   }
@@ -71,10 +72,10 @@ export function updateDoc(doc, change, markedSpans, estimateHeight) {
 // Call f for all linked documents.
 export function linkedDocs(doc, f, sharedHistOnly) {
   function propagate(doc, skip, sharedHist) {
-    if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
-      var rel = doc.linked[i]
+    if (doc.linked) for (let i = 0; i < doc.linked.length; ++i) {
+      let rel = doc.linked[i]
       if (rel.doc == skip) continue
-      var shared = sharedHist && rel.sharedHist
+      let shared = sharedHist && rel.sharedHist
       if (sharedHistOnly && !shared) continue
       f(rel.doc, shared)
       propagate(rel.doc, doc, shared)
diff --git a/src/model/history.js b/src/model/history.js
index 8cc77b1ab0..0c7cf5bba1 100644
--- a/src/model/history.js
+++ b/src/model/history.js
@@ -26,7 +26,7 @@ export function History(startGen) {
 // Create a history change event from an updateDoc-style change
 // object.
 export function historyChangeFromChange(doc, change) {
-  var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)}
+  let histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)}
   attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1)
   linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1)}, true)
   return histChange
@@ -36,7 +36,7 @@ export function historyChangeFromChange(doc, change) {
 // a change event.
 function clearSelectionEvents(array) {
   while (array.length) {
-    var last = lst(array)
+    let last = lst(array)
     if (last.ranges) array.pop()
     else break
   }
@@ -60,9 +60,10 @@ function lastChangeEvent(hist, force) {
 // a single operation, or are close together with an origin that
 // allows merging (starting with "+") into a single event.
 export function addChangeToHistory(doc, change, selAfter, opId) {
-  var hist = doc.history
+  let hist = doc.history
   hist.undone.length = 0
-  var time = +new Date, cur
+  let time = +new Date, cur
+  let last
 
   if ((hist.lastOp == opId ||
        hist.lastOrigin == change.origin && change.origin &&
@@ -70,7 +71,7 @@ export function addChangeToHistory(doc, change, selAfter, opId) {
         change.origin.charAt(0) == "*")) &&
       (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
     // Merge this change into the last event
-    var last = lst(cur.changes)
+    last = lst(cur.changes)
     if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
       // Optimized case for simple insertion -- don't want to add
       // new changesets for every character typed
@@ -81,7 +82,7 @@ export function addChangeToHistory(doc, change, selAfter, opId) {
     }
   } else {
     // Can not be merged, start a new event.
-    var before = lst(hist.done)
+    let before = lst(hist.done)
     if (!before || !before.ranges)
       pushSelectionToHistory(doc.sel, hist.done)
     cur = {changes: [historyChangeFromChange(doc, change)],
@@ -102,7 +103,7 @@ export function addChangeToHistory(doc, change, selAfter, opId) {
 }
 
 function selectionEventCanBeMerged(doc, origin, prev, sel) {
-  var ch = origin.charAt(0)
+  let ch = origin.charAt(0)
   return ch == "*" ||
     ch == "+" &&
     prev.ranges.length == sel.ranges.length &&
@@ -115,7 +116,7 @@ function selectionEventCanBeMerged(doc, origin, prev, sel) {
 // selection into the 'done' array when it was significantly
 // different (in number of selected ranges, emptiness, or time).
 export function addSelectionToHistory(doc, sel, opId, options) {
-  var hist = doc.history, origin = options && options.origin
+  let hist = doc.history, origin = options && options.origin
 
   // A new event is started when the previous origin does not match
   // the current, or the origins don't allow matching. Origins
@@ -137,14 +138,14 @@ export function addSelectionToHistory(doc, sel, opId, options) {
 }
 
 export function pushSelectionToHistory(sel, dest) {
-  var top = lst(dest)
+  let top = lst(dest)
   if (!(top && top.ranges && top.equals(sel)))
     dest.push(sel)
 }
 
 // Used to store marked span information in the history.
 function attachLocalSpans(doc, change, from, to) {
-  var existing = change["spans_" + doc.id], n = 0
+  let existing = change["spans_" + doc.id], n = 0
   doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
     if (line.markedSpans)
       (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans
@@ -156,7 +157,8 @@ function attachLocalSpans(doc, change, from, to) {
 // that have been explicitly cleared should not be restored.
 function removeClearedSpans(spans) {
   if (!spans) return null
-  for (var i = 0, out; i < spans.length; ++i) {
+  let out
+  for (let i = 0; i < spans.length; ++i) {
     if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i) }
     else if (out) out.push(spans[i])
   }
@@ -165,9 +167,10 @@ function removeClearedSpans(spans) {
 
 // Retrieve and filter the old marked spans stored in a change event.
 function getOldSpans(doc, change) {
-  var found = change["spans_" + doc.id]
+  let found = change["spans_" + doc.id]
   if (!found) return null
-  for (var i = 0, nw = []; i < change.text.length; ++i)
+  let nw = []
+  for (let i = 0; i < change.text.length; ++i)
     nw.push(removeClearedSpans(found[i]))
   return nw
 }
@@ -177,17 +180,17 @@ function getOldSpans(doc, change) {
 // existed in the history (so that deleting around a span and then
 // undoing brings back the span).
 export function mergeOldSpans(doc, change) {
-  var old = getOldSpans(doc, change)
-  var stretched = stretchSpansOverChange(doc, change)
+  let old = getOldSpans(doc, change)
+  let stretched = stretchSpansOverChange(doc, change)
   if (!old) return stretched
   if (!stretched) return old
 
-  for (var i = 0; i < old.length; ++i) {
-    var oldCur = old[i], stretchCur = stretched[i]
+  for (let i = 0; i < old.length; ++i) {
+    let oldCur = old[i], stretchCur = stretched[i]
     if (oldCur && stretchCur) {
-      spans: for (var j = 0; j < stretchCur.length; ++j) {
-        var span = stretchCur[j]
-        for (var k = 0; k < oldCur.length; ++k)
+      spans: for (let j = 0; j < stretchCur.length; ++j) {
+        let span = stretchCur[j]
+        for (let k = 0; k < oldCur.length; ++k)
           if (oldCur[k].marker == span.marker) continue spans
         oldCur.push(span)
       }
@@ -201,18 +204,19 @@ export function mergeOldSpans(doc, change) {
 // Used both to provide a JSON-safe object in .getHistory, and, when
 // detaching a document, to split the history in two
 export function copyHistoryArray(events, newGroup, instantiateSel) {
-  for (var i = 0, copy = []; i < events.length; ++i) {
-    var event = events[i]
+  let copy = []
+  for (let i = 0; i < events.length; ++i) {
+    let event = events[i]
     if (event.ranges) {
       copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event)
       continue
     }
-    var changes = event.changes, newChanges = []
+    let changes = event.changes, newChanges = []
     copy.push({changes: newChanges})
-    for (var j = 0; j < changes.length; ++j) {
-      var change = changes[j], m
+    for (let j = 0; j < changes.length; ++j) {
+      let change = changes[j], m
       newChanges.push({from: change.from, to: change.to, text: change.text})
-      if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
+      if (newGroup) for (let prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
         if (indexOf(newGroup, Number(m[1])) > -1) {
           lst(newChanges)[prop] = change[prop]
           delete change[prop]
diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index b3b422aafb..23b2381b95 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -10,7 +10,7 @@ import { eventMixin } from "../util/event"
 // Line widgets are block elements displayed above or below a line.
 
 export function LineWidget(doc, node, options) {
-  if (options) for (var opt in options) if (options.hasOwnProperty(opt))
+  if (options) for (let opt in options) if (options.hasOwnProperty(opt))
     this[opt] = options[opt]
   this.doc = doc
   this.node = node
@@ -23,11 +23,11 @@ function adjustScrollWhenAboveVisible(cm, line, diff) {
 }
 
 LineWidget.prototype.clear = function() {
-  var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line)
+  let cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line)
   if (no == null || !ws) return
-  for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1)
+  for (let i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1)
   if (!ws.length) line.widgets = null
-  var height = widgetHeight(this)
+  let height = widgetHeight(this)
   updateLineHeight(line, Math.max(0, line.height - height))
   if (cm) runInOp(cm, function() {
     adjustScrollWhenAboveVisible(cm, line, -height)
@@ -35,9 +35,9 @@ LineWidget.prototype.clear = function() {
   })
 }
 LineWidget.prototype.changed = function() {
-  var oldH = this.height, cm = this.doc.cm, line = this.line
+  let oldH = this.height, cm = this.doc.cm, line = this.line
   this.height = null
-  var diff = widgetHeight(this) - oldH
+  let diff = widgetHeight(this) - oldH
   if (!diff) return
   updateLineHeight(line, line.height + diff)
   if (cm) runInOp(cm, function() {
@@ -47,16 +47,16 @@ LineWidget.prototype.changed = function() {
 }
 
 export function addLineWidget(doc, handle, node, options) {
-  var widget = new LineWidget(doc, node, options)
-  var cm = doc.cm
+  let widget = new LineWidget(doc, node, options)
+  let cm = doc.cm
   if (cm && widget.noHScroll) cm.display.alignWidgets = true
   changeLine(doc, handle, "widget", function(line) {
-    var widgets = line.widgets || (line.widgets = [])
+    let widgets = line.widgets || (line.widgets = [])
     if (widget.insertAt == null) widgets.push(widget)
     else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget)
     widget.line = line
     if (cm && !lineIsHidden(doc, line)) {
-      var aboveVisible = heightAtLine(line) < doc.scrollTop
+      let aboveVisible = heightAtLine(line) < doc.scrollTop
       updateLineHeight(line, line.height + widgetHeight(widget))
       if (aboveVisible) addToScrollPos(cm, null, widget.height)
       cm.curOp.forceUpdate = true
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index c103a57481..f15cefb29a 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -27,7 +27,10 @@ import { reCheckSelection } from "./selection_updates"
 // marker continues beyond the start/end of the line. Markers have
 // links back to the lines they currently touch.
 
-var nextMarkerId = 0
+// Collapsed markers have unique ids, in order to be able to order
+// them, which is needed for uniquely determining an outer marker
+// when they overlap (they may nest, but not partially overlap).
+let nextMarkerId = 0
 
 export function TextMarker(doc, type) {
   this.lines = []
@@ -40,16 +43,16 @@ eventMixin(TextMarker)
 // Clear the marker.
 TextMarker.prototype.clear = function() {
   if (this.explicitlyCleared) return
-  var cm = this.doc.cm, withOp = cm && !cm.curOp
+  let cm = this.doc.cm, withOp = cm && !cm.curOp
   if (withOp) startOperation(cm)
   if (hasHandler(this, "clear")) {
-    var found = this.find()
+    let found = this.find()
     if (found) signalLater(this, "clear", found.from, found.to)
   }
-  var min = null, max = null
-  for (var i = 0; i < this.lines.length; ++i) {
-    var line = this.lines[i]
-    var span = getMarkedSpanFor(line.markedSpans, this)
+  let min = null, max = null
+  for (let i = 0; i < this.lines.length; ++i) {
+    let line = this.lines[i]
+    let span = getMarkedSpanFor(line.markedSpans, this)
     if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text")
     else if (cm) {
       if (span.to != null) max = lineNo(line)
@@ -59,8 +62,8 @@ TextMarker.prototype.clear = function() {
     if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
       updateLineHeight(line, textHeight(cm.display))
   }
-  if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
-    var visual = visualLine(this.lines[i]), len = lineLength(visual)
+  if (cm && this.collapsed && !cm.options.lineWrapping) for (let i = 0; i < this.lines.length; ++i) {
+    let visual = visualLine(this.lines[i]), len = lineLength(visual)
     if (len > cm.display.maxLineLength) {
       cm.display.maxLine = visual
       cm.display.maxLineLength = len
@@ -87,10 +90,10 @@ TextMarker.prototype.clear = function() {
 // number (used to prevent looking up the same line twice).
 TextMarker.prototype.find = function(side, lineObj) {
   if (side == null && this.type == "bookmark") side = 1
-  var from, to
-  for (var i = 0; i < this.lines.length; ++i) {
-    var line = this.lines[i]
-    var span = getMarkedSpanFor(line.markedSpans, this)
+  let from, to
+  for (let i = 0; i < this.lines.length; ++i) {
+    let line = this.lines[i]
+    let span = getMarkedSpanFor(line.markedSpans, this)
     if (span.from != null) {
       from = Pos(lineObj ? line : lineNo(line), span.from)
       if (side == -1) return from
@@ -106,20 +109,20 @@ TextMarker.prototype.find = function(side, lineObj) {
 // Signals that the marker's widget changed, and surrounding layout
 // should be recomputed.
 TextMarker.prototype.changed = function() {
-  var pos = this.find(-1, true), widget = this, cm = this.doc.cm
+  let pos = this.find(-1, true), widget = this, cm = this.doc.cm
   if (!pos || !cm) return
   runInOp(cm, function() {
-    var line = pos.line, lineN = lineNo(pos.line)
-    var view = findViewForLine(cm, lineN)
+    let line = pos.line, lineN = lineNo(pos.line)
+    let view = findViewForLine(cm, lineN)
     if (view) {
       clearLineMeasurementCacheFor(view)
       cm.curOp.selectionChanged = cm.curOp.forceUpdate = true
     }
     cm.curOp.updateMaxLine = true
     if (!lineIsHidden(widget.doc, line) && widget.height != null) {
-      var oldHeight = widget.height
+      let oldHeight = widget.height
       widget.height = null
-      var dHeight = widgetHeight(widget) - oldHeight
+      let dHeight = widgetHeight(widget) - oldHeight
       if (dHeight)
         updateLineHeight(line, line.height + dHeight)
     }
@@ -128,7 +131,7 @@ TextMarker.prototype.changed = function() {
 
 TextMarker.prototype.attachLine = function(line) {
   if (!this.lines.length && this.doc.cm) {
-    var op = this.doc.cm.curOp
+    let op = this.doc.cm.curOp
     if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
       (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this)
   }
@@ -137,16 +140,11 @@ TextMarker.prototype.attachLine = function(line) {
 TextMarker.prototype.detachLine = function(line) {
   this.lines.splice(indexOf(this.lines, line), 1)
   if (!this.lines.length && this.doc.cm) {
-    var op = this.doc.cm.curOp
+    let op = this.doc.cm.curOp
     ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this)
   }
 }
 
-// Collapsed markers have unique ids, in order to be able to order
-// them, which is needed for uniquely determining an outer marker
-// when they overlap (they may nest, but not partially overlap).
-var nextMarkerId = 0
-
 // Create a marker, wire it up to the right lines, and
 export function markText(doc, from, to, options, type) {
   // Shared markers (across linked documents) are handled separately
@@ -156,7 +154,7 @@ export function markText(doc, from, to, options, type) {
   // Ensure we are in an operation.
   if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type)
 
-  var marker = new TextMarker(doc, type), diff = cmp(from, to)
+  let marker = new TextMarker(doc, type), diff = cmp(from, to)
   if (options) copyObj(options, marker, false)
   // Don't connect empty markers unless clearWhenEmpty is false
   if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
@@ -178,7 +176,7 @@ export function markText(doc, from, to, options, type) {
   if (marker.addToHistory)
     addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN)
 
-  var curLine = from.line, cm = doc.cm, updateMaxLine
+  let curLine = from.line, cm = doc.cm, updateMaxLine
   doc.iter(curLine, to.line + 1, function(line) {
     if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
       updateMaxLine = true
@@ -210,7 +208,7 @@ export function markText(doc, from, to, options, type) {
     if (marker.collapsed)
       regChange(cm, from.line, to.line + 1)
     else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
-      for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text")
+      for (let i = from.line; i <= to.line; i++) regLineChange(cm, i, "text")
     if (marker.atomic) reCheckSelection(cm.doc)
     signalLater(cm, "markerAdded", cm, marker)
   }
@@ -225,7 +223,7 @@ export function markText(doc, from, to, options, type) {
 export function SharedTextMarker(markers, primary) {
   this.markers = markers
   this.primary = primary
-  for (var i = 0; i < markers.length; ++i)
+  for (let i = 0; i < markers.length; ++i)
     markers[i].parent = this
 }
 eventMixin(SharedTextMarker)
@@ -233,7 +231,7 @@ eventMixin(SharedTextMarker)
 SharedTextMarker.prototype.clear = function() {
   if (this.explicitlyCleared) return
   this.explicitlyCleared = true
-  for (var i = 0; i < this.markers.length; ++i)
+  for (let i = 0; i < this.markers.length; ++i)
     this.markers[i].clear()
   signalLater(this, "clear")
 }
@@ -244,12 +242,12 @@ SharedTextMarker.prototype.find = function(side, lineObj) {
 function markTextShared(doc, from, to, options, type) {
   options = copyObj(options)
   options.shared = false
-  var markers = [markText(doc, from, to, options, type)], primary = markers[0]
-  var widget = options.widgetNode
+  let markers = [markText(doc, from, to, options, type)], primary = markers[0]
+  let widget = options.widgetNode
   linkedDocs(doc, function(doc) {
     if (widget) options.widgetNode = widget.cloneNode(true)
     markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type))
-    for (var i = 0; i < doc.linked.length; ++i)
+    for (let i = 0; i < doc.linked.length; ++i)
       if (doc.linked[i].isParent) return
     primary = lst(markers)
   })
@@ -262,11 +260,11 @@ export function findSharedMarkers(doc) {
 }
 
 export function copySharedMarkers(doc, markers) {
-  for (var i = 0; i < markers.length; i++) {
-    var marker = markers[i], pos = marker.find()
-    var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to)
+  for (let i = 0; i < markers.length; i++) {
+    let marker = markers[i], pos = marker.find()
+    let mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to)
     if (cmp(mFrom, mTo)) {
-      var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type)
+      let subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type)
       marker.markers.push(subMark)
       subMark.parent = marker
     }
@@ -274,11 +272,11 @@ export function copySharedMarkers(doc, markers) {
 }
 
 export function detachSharedMarkers(markers) {
-  for (var i = 0; i < markers.length; i++) {
-    var marker = markers[i], linked = [marker.primary.doc]
+  for (let i = 0; i < markers.length; i++) {
+    let marker = markers[i], linked = [marker.primary.doc]
     linkedDocs(marker.primary.doc, function(d) { linked.push(d) })
-    for (var j = 0; j < marker.markers.length; j++) {
-      var subMarker = marker.markers[j]
+    for (let j = 0; j < marker.markers.length; j++) {
+      let subMarker = marker.markers[j]
       if (indexOf(linked, subMarker.doc) == -1) {
         subMarker.parent = null
         marker.markers.splice(j--, 1)
diff --git a/src/model/selection.js b/src/model/selection.js
index c75fcd6186..63371954e1 100644
--- a/src/model/selection.js
+++ b/src/model/selection.js
@@ -16,26 +16,27 @@ Selection.prototype = {
   equals: function(other) {
     if (other == this) return true
     if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false
-    for (var i = 0; i < this.ranges.length; i++) {
-      var here = this.ranges[i], there = other.ranges[i]
+    for (let i = 0; i < this.ranges.length; i++) {
+      let here = this.ranges[i], there = other.ranges[i]
       if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false
     }
     return true
   },
   deepCopy: function() {
-    for (var out = [], i = 0; i < this.ranges.length; i++)
+    let out = []
+    for (let i = 0; i < this.ranges.length; i++)
       out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head))
     return new Selection(out, this.primIndex)
   },
   somethingSelected: function() {
-    for (var i = 0; i < this.ranges.length; i++)
+    for (let i = 0; i < this.ranges.length; i++)
       if (!this.ranges[i].empty()) return true
     return false
   },
   contains: function(pos, end) {
     if (!end) end = pos
-    for (var i = 0; i < this.ranges.length; i++) {
-      var range = this.ranges[i]
+    for (let i = 0; i < this.ranges.length; i++) {
+      let range = this.ranges[i]
       if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
         return i
     }
@@ -59,14 +60,14 @@ Range.prototype = {
 // build a selection out of it. 'Consumes' ranges array (modifying
 // it).
 export function normalizeSelection(ranges, primIndex) {
-  var prim = ranges[primIndex]
+  let prim = ranges[primIndex]
   ranges.sort(function(a, b) { return cmp(a.from(), b.from()) })
   primIndex = indexOf(ranges, prim)
-  for (var i = 1; i < ranges.length; i++) {
-    var cur = ranges[i], prev = ranges[i - 1]
+  for (let i = 1; i < ranges.length; i++) {
+    let cur = ranges[i], prev = ranges[i - 1]
     if (cmp(prev.to(), cur.from()) >= 0) {
-      var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to())
-      var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head
+      let from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to())
+      let inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head
       if (i <= primIndex) --primIndex
       ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to))
     }
diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index 640af1f249..0e310a5d2d 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -18,9 +18,9 @@ import { normalizeSelection, Range, Selection, simpleSelection } from "./selecti
 // Used for cursor motion and such.
 export function extendRange(doc, range, head, other) {
   if (doc.cm && doc.cm.display.shift || doc.extend) {
-    var anchor = range.anchor
+    let anchor = range.anchor
     if (other) {
-      var posBefore = cmp(head, anchor) < 0
+      let posBefore = cmp(head, anchor) < 0
       if (posBefore != (cmp(other, anchor) < 0)) {
         anchor = head
         head = other
@@ -42,15 +42,16 @@ export function extendSelection(doc, head, other, options) {
 // Extend all selections (pos is an array of selections with length
 // equal the number of selections)
 export function extendSelections(doc, heads, options) {
-  for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
+  let out = []
+  for (let i = 0; i < doc.sel.ranges.length; i++)
     out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null)
-  var newSel = normalizeSelection(out, doc.sel.primIndex)
+  let newSel = normalizeSelection(out, doc.sel.primIndex)
   setSelection(doc, newSel, options)
 }
 
 // Updates a single range in the selection.
 export function replaceOneSelection(doc, i, range, options) {
-  var ranges = doc.sel.ranges.slice(0)
+  let ranges = doc.sel.ranges.slice(0)
   ranges[i] = range
   setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options)
 }
@@ -63,11 +64,11 @@ export function setSimpleSelection(doc, anchor, head, options) {
 // Give beforeSelectionChange handlers a change to influence a
 // selection update.
 function filterSelectionChange(doc, sel, options) {
-  var obj = {
+  let obj = {
     ranges: sel.ranges,
     update: function(ranges) {
       this.ranges = []
-      for (var i = 0; i < ranges.length; i++)
+      for (let i = 0; i < ranges.length; i++)
         this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
                                    clipPos(doc, ranges[i].head))
     },
@@ -80,7 +81,7 @@ function filterSelectionChange(doc, sel, options) {
 }
 
 export function setSelectionReplaceHistory(doc, sel, options) {
-  var done = doc.history.done, last = lst(done)
+  let done = doc.history.done, last = lst(done)
   if (last && last.ranges) {
     done[done.length - 1] = sel
     setSelectionNoUndo(doc, sel, options)
@@ -99,7 +100,7 @@ export function setSelectionNoUndo(doc, sel, options) {
   if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
     sel = filterSelectionChange(doc, sel, options)
 
-  var bias = options && options.bias ||
+  let bias = options && options.bias ||
     (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1)
   setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true))
 
@@ -128,12 +129,12 @@ export function reCheckSelection(doc) {
 // Return a selection that does not partially select any atomic
 // ranges.
 function skipAtomicInSelection(doc, sel, bias, mayClear) {
-  var out
-  for (var i = 0; i < sel.ranges.length; i++) {
-    var range = sel.ranges[i]
-    var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i]
-    var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear)
-    var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear)
+  let out
+  for (let i = 0; i < sel.ranges.length; i++) {
+    let range = sel.ranges[i]
+    let old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i]
+    let newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear)
+    let newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear)
     if (out || newAnchor != range.anchor || newHead != range.head) {
       if (!out) out = sel.ranges.slice(0, i)
       out[i] = new Range(newAnchor, newHead)
@@ -143,9 +144,9 @@ function skipAtomicInSelection(doc, sel, bias, mayClear) {
 }
 
 function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
-  var line = getLine(doc, pos.line)
-  if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-    var sp = line.markedSpans[i], m = sp.marker
+  let line = getLine(doc, pos.line)
+  if (line.markedSpans) for (let i = 0; i < line.markedSpans.length; ++i) {
+    let sp = line.markedSpans[i], m = sp.marker
     if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
         (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
       if (mayClear) {
@@ -158,14 +159,14 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
       if (!m.atomic) continue
 
       if (oldPos) {
-        var near = m.find(dir < 0 ? 1 : -1), diff
+        let near = m.find(dir < 0 ? 1 : -1), diff
         if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
           near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null)
         if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
           return skipAtomicInner(doc, near, pos, dir, mayClear)
       }
 
-      var far = m.find(dir < 0 ? -1 : 1)
+      let far = m.find(dir < 0 ? -1 : 1)
       if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
         far = movePos(doc, far, dir, far.line == pos.line ? line : null)
       return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
@@ -176,8 +177,8 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
 
 // Ensure a given position is not inside an atomic range.
 export function skipAtomic(doc, pos, oldPos, bias, mayClear) {
-  var dir = bias || 1
-  var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
+  let dir = bias || 1
+  let found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
       (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
       skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
       (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true))
diff --git a/src/modes.js b/src/modes.js
index 15d16cefcb..065a463b5b 100644
--- a/src/modes.js
+++ b/src/modes.js
@@ -1,7 +1,7 @@
 import { copyObj, createObj } from "./util/misc"
 
 // Known modes, by name and by MIME
-export var modes = {}, mimeModes = {}
+export let modes = {}, mimeModes = {}
 
 // Extra arguments are stored as the mode's dependencies, which is
 // used by (legacy) mechanisms like loadmode.js to automatically
@@ -22,7 +22,7 @@ export function resolveMode(spec) {
   if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
     spec = mimeModes[spec]
   } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-    var found = mimeModes[spec.name]
+    let found = mimeModes[spec.name]
     if (typeof found == "string") found = {name: found}
     spec = createObj(found, spec)
     spec.name = found.name
@@ -38,13 +38,13 @@ export function resolveMode(spec) {
 // Given a mode spec (anything that resolveMode accepts), find and
 // initialize an actual mode object.
 export function getMode(options, spec) {
-  var spec = resolveMode(spec)
-  var mfactory = modes[spec.name]
+  spec = resolveMode(spec)
+  let mfactory = modes[spec.name]
   if (!mfactory) return getMode(options, "text/plain")
-  var modeObj = mfactory(options, spec)
+  let modeObj = mfactory(options, spec)
   if (modeExtensions.hasOwnProperty(spec.name)) {
-    var exts = modeExtensions[spec.name]
-    for (var prop in exts) {
+    let exts = modeExtensions[spec.name]
+    for (let prop in exts) {
       if (!exts.hasOwnProperty(prop)) continue
       if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop]
       modeObj[prop] = exts[prop]
@@ -52,7 +52,7 @@ export function getMode(options, spec) {
   }
   modeObj.name = spec.name
   if (spec.helperType) modeObj.helperType = spec.helperType
-  if (spec.modeProps) for (var prop in spec.modeProps)
+  if (spec.modeProps) for (let prop in spec.modeProps)
     modeObj[prop] = spec.modeProps[prop]
 
   return modeObj
@@ -60,18 +60,18 @@ export function getMode(options, spec) {
 
 // This can be used to attach properties to mode objects from
 // outside the actual mode definition.
-export var modeExtensions = {}
+export let modeExtensions = {}
 export function extendMode(mode, properties) {
-  var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {})
+  let exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {})
   copyObj(properties, exts)
 }
 
 export function copyState(mode, state) {
   if (state === true) return state
   if (mode.copyState) return mode.copyState(state)
-  var nstate = {}
-  for (var n in state) {
-    var val = state[n]
+  let nstate = {}
+  for (let n in state) {
+    let val = state[n]
     if (val instanceof Array) val = val.concat([])
     nstate[n] = val
   }
@@ -81,8 +81,9 @@ export function copyState(mode, state) {
 // Given a mode and a state (for that mode), find the inner mode and
 // state at the position that the state refers to.
 export function innerMode(mode, state) {
+  let info
   while (mode.innerMode) {
-    var info = mode.innerMode(state)
+    info = mode.innerMode(state)
     if (!info || info.mode == mode) break
     state = info.state
     mode = info.mode
diff --git a/src/util/StringStream.js b/src/util/StringStream.js
index d04807426c..cf7b8244a9 100644
--- a/src/util/StringStream.js
+++ b/src/util/StringStream.js
@@ -5,7 +5,7 @@ import { countColumn } from "./misc"
 // Fed to the mode parsers, provides helper functions to make
 // parsers more succinct.
 
-var StringStream = function(string, tabSize) {
+let StringStream = function(string, tabSize) {
   this.pos = this.start = 0
   this.string = string
   this.tabSize = tabSize || 8
@@ -22,24 +22,25 @@ StringStream.prototype = {
       return this.string.charAt(this.pos++)
   },
   eat: function(match) {
-    var ch = this.string.charAt(this.pos)
-    if (typeof match == "string") var ok = ch == match
-    else var ok = ch && (match.test ? match.test(ch) : match(ch))
+    let ch = this.string.charAt(this.pos)
+    let ok
+    if (typeof match == "string") ok = ch == match
+    else ok = ch && (match.test ? match.test(ch) : match(ch))
     if (ok) {++this.pos; return ch}
   },
   eatWhile: function(match) {
-    var start = this.pos
+    let start = this.pos
     while (this.eat(match)){}
     return this.pos > start
   },
   eatSpace: function() {
-    var start = this.pos
+    let start = this.pos
     while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos
     return this.pos > start
   },
   skipToEnd: function() {this.pos = this.string.length},
   skipTo: function(ch) {
-    var found = this.string.indexOf(ch, this.pos)
+    let found = this.string.indexOf(ch, this.pos)
     if (found > -1) {this.pos = found; return true}
   },
   backUp: function(n) {this.pos -= n},
@@ -56,14 +57,14 @@ StringStream.prototype = {
   },
   match: function(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
-      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str}
-      var substr = this.string.substr(this.pos, pattern.length)
+      let cased = function(str) {return caseInsensitive ? str.toLowerCase() : str}
+      let substr = this.string.substr(this.pos, pattern.length)
       if (cased(substr) == cased(pattern)) {
         if (consume !== false) this.pos += pattern.length
         return true
       }
     } else {
-      var match = this.string.slice(this.pos).match(pattern)
+      let match = this.string.slice(this.pos).match(pattern)
       if (match && match.index > 0) return null
       if (match && consume !== false) this.pos += match[0].length
       return match
diff --git a/src/util/bidi.js b/src/util/bidi.js
index f12dccf50b..4c365f4c9b 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -4,9 +4,9 @@ import { isExtendingChar, lst } from "./misc"
 
 export function iterateBidiSections(order, from, to, f) {
   if (!order) return f(from, to, "ltr")
-  var found = false
-  for (var i = 0; i < order.length; ++i) {
-    var part = order[i]
+  let found = false
+  for (let i = 0; i < order.length; ++i) {
+    let part = order[i]
     if (part.from < to && part.to > from || from == to && part.to == from) {
       f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr")
       found = true
@@ -18,25 +18,26 @@ export function iterateBidiSections(order, from, to, f) {
 export function bidiLeft(part) { return part.level % 2 ? part.to : part.from }
 export function bidiRight(part) { return part.level % 2 ? part.from : part.to }
 
-export function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0 }
+export function lineLeft(line) { let order = getOrder(line); return order ? bidiLeft(order[0]) : 0 }
 export function lineRight(line) {
-  var order = getOrder(line)
+  let order = getOrder(line)
   if (!order) return line.text.length
   return bidiRight(lst(order))
 }
 
 function compareBidiLevel(order, a, b) {
-  var linedir = order[0].level
+  let linedir = order[0].level
   if (a == linedir) return true
   if (b == linedir) return false
   return a < b
 }
 
-export var bidiOther = null
+export let bidiOther = null
 export function getBidiPartAt(order, pos) {
+  let found
   bidiOther = null
-  for (var i = 0, found; i < order.length; ++i) {
-    var cur = order[i]
+  for (let i = 0; i < order.length; ++i) {
+    let cur = order[i]
     if (cur.from < pos && cur.to > pos) return i
     if ((cur.from == pos || cur.to == pos)) {
       if (found == null) {
@@ -66,10 +67,10 @@ function moveInLine(line, pos, dir, byUnit) {
 // LTR text touch each other. This often requires the cursor offset
 // to move more than one unit, in order to visually move one unit.
 export function moveVisually(line, start, dir, byUnit) {
-  var bidi = getOrder(line)
+  let bidi = getOrder(line)
   if (!bidi) return moveLogically(line, start, dir, byUnit)
-  var pos = getBidiPartAt(bidi, start), part = bidi[pos]
-  var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit)
+  let pos = getBidiPartAt(bidi, start), part = bidi[pos]
+  let target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit)
 
   for (;;) {
     if (target > part.from && target < part.to) return target
@@ -89,7 +90,7 @@ export function moveVisually(line, start, dir, byUnit) {
 }
 
 export function moveLogically(line, start, dir, byUnit) {
-  var target = start + dir
+  let target = start + dir
   if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir
   return target < 0 || target > line.text.length ? null : target
 }
@@ -117,11 +118,11 @@ export function moveLogically(line, start, dir, byUnit) {
 // Returns null if characters are ordered as they appear
 // (left-to-right), or an array of sections ({from, to, level}
 // objects) in the order in which they occur visually.
-export var bidiOrdering = (function() {
+export let bidiOrdering = (function() {
   // Character types for codepoints 0 to 0xff
-  var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"
+  let lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"
   // Character types for codepoints 0x600 to 0x6ff
-  var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm"
+  let arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm"
   function charType(code) {
     if (code <= 0xf7) return lowTypes.charAt(code)
     else if (0x590 <= code && code <= 0x5f4) return "R"
@@ -132,10 +133,10 @@ export var bidiOrdering = (function() {
     else return "L"
   }
 
-  var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/
-  var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/
+  let bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/
+  let isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/
   // Browsers seem to always treat the boundaries of block elements as being L.
-  var outerType = "L"
+  let outerType = "L"
 
   function BidiSpan(level, from, to) {
     this.level = level
@@ -144,16 +145,16 @@ export var bidiOrdering = (function() {
 
   return function(str) {
     if (!bidiRE.test(str)) return false
-    var len = str.length, types = []
-    for (var i = 0, type; i < len; ++i)
-      types.push(type = charType(str.charCodeAt(i)))
+    let len = str.length, types = []
+    for (let i = 0; i < len; ++i)
+      types.push(charType(str.charCodeAt(i)))
 
     // W1. Examine each non-spacing mark (NSM) in the level run, and
     // change the type of the NSM to the type of the previous
     // character. If the NSM is at the start of the level run, it will
     // get the type of sor.
-    for (var i = 0, prev = outerType; i < len; ++i) {
-      var type = types[i]
+    for (let i = 0, prev = outerType; i < len; ++i) {
+      let type = types[i]
       if (type == "m") types[i] = prev
       else prev = type
     }
@@ -163,8 +164,8 @@ export var bidiOrdering = (function() {
     // AL is found, change the type of the European number to Arabic
     // number.
     // W3. Change all ALs to R.
-    for (var i = 0, cur = outerType; i < len; ++i) {
-      var type = types[i]
+    for (let i = 0, cur = outerType; i < len; ++i) {
+      let type = types[i]
       if (type == "1" && cur == "r") types[i] = "n"
       else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R" }
     }
@@ -172,8 +173,8 @@ export var bidiOrdering = (function() {
     // W4. A single European separator between two European numbers
     // changes to a European number. A single common separator between
     // two numbers of the same type changes to that type.
-    for (var i = 1, prev = types[0]; i < len - 1; ++i) {
-      var type = types[i]
+    for (let i = 1, prev = types[0]; i < len - 1; ++i) {
+      let type = types[i]
       if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1"
       else if (type == "," && prev == types[i+1] &&
                (prev == "1" || prev == "n")) types[i] = prev
@@ -184,13 +185,14 @@ export var bidiOrdering = (function() {
     // numbers changes to all European numbers.
     // W6. Otherwise, separators and terminators change to Other
     // Neutral.
-    for (var i = 0; i < len; ++i) {
-      var type = types[i]
+    for (let i = 0; i < len; ++i) {
+      let type = types[i]
       if (type == ",") types[i] = "N"
       else if (type == "%") {
-        for (var end = i + 1; end < len && types[end] == "%"; ++end) {}
-        var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N"
-        for (var j = i; j < end; ++j) types[j] = replace
+        let end
+        for (end = i + 1; end < len && types[end] == "%"; ++end) {}
+        let replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N"
+        for (let j = i; j < end; ++j) types[j] = replace
         i = end - 1
       }
     }
@@ -198,8 +200,8 @@ export var bidiOrdering = (function() {
     // W7. Search backwards from each instance of a European number
     // until the first strong type (R, L, or sor) is found. If an L is
     // found, then change the type of the European number to L.
-    for (var i = 0, cur = outerType; i < len; ++i) {
-      var type = types[i]
+    for (let i = 0, cur = outerType; i < len; ++i) {
+      let type = types[i]
       if (cur == "L" && type == "1") types[i] = "L"
       else if (isStrong.test(type)) cur = type
     }
@@ -210,13 +212,14 @@ export var bidiOrdering = (function() {
     // terms of their influence on neutrals. Start-of-level-run (sor)
     // and end-of-level-run (eor) are used at level run boundaries.
     // N2. Any remaining neutrals take the embedding direction.
-    for (var i = 0; i < len; ++i) {
+    for (let i = 0; i < len; ++i) {
       if (isNeutral.test(types[i])) {
-        for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
-        var before = (i ? types[i-1] : outerType) == "L"
-        var after = (end < len ? types[end] : outerType) == "L"
-        var replace = before || after ? "L" : "R"
-        for (var j = i; j < end; ++j) types[j] = replace
+        let end
+        for (end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
+        let before = (i ? types[i-1] : outerType) == "L"
+        let after = (end < len ? types[end] : outerType) == "L"
+        let replace = before || after ? "L" : "R"
+        for (let j = i; j < end; ++j) types[j] = replace
         i = end - 1
       }
     }
@@ -226,19 +229,19 @@ export var bidiOrdering = (function() {
     // levels (0, 1, 2) in an implementation that doesn't take
     // explicit embedding into account, we can build up the order on
     // the fly, without following the level-based algorithm.
-    var order = [], m
-    for (var i = 0; i < len;) {
+    let order = [], m
+    for (let i = 0; i < len;) {
       if (countsAsLeft.test(types[i])) {
-        var start = i
+        let start = i
         for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
         order.push(new BidiSpan(0, start, i))
       } else {
-        var pos = i, at = order.length
+        let pos = i, at = order.length
         for (++i; i < len && types[i] != "L"; ++i) {}
-        for (var j = pos; j < i;) {
+        for (let j = pos; j < i;) {
           if (countsAsNum.test(types[j])) {
             if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j))
-            var nstart = j
+            let nstart = j
             for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
             order.splice(at, 0, new BidiSpan(2, nstart, j))
             pos = j
@@ -268,7 +271,7 @@ export var bidiOrdering = (function() {
 // false for lines that are fully left-to-right, and an array of
 // BidiSpan objects otherwise.
 export function getOrder(line) {
-  var order = line.order
+  let order = line.order
   if (order == null) order = line.order = bidiOrdering(line.text)
   return order
 }
diff --git a/src/util/browser.js b/src/util/browser.js
index ae48fb5c65..ce678a82a4 100644
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -1,31 +1,31 @@
 // Kludges for bugs and behavior differences that can't be feature
 // detected are enabled based on userAgent etc sniffing.
-var userAgent = navigator.userAgent
-var platform = navigator.platform
+let userAgent = navigator.userAgent
+let platform = navigator.platform
 
-export var gecko = /gecko\/\d/i.test(userAgent)
-var ie_upto10 = /MSIE \d/.test(userAgent)
-var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent)
-export var ie = ie_upto10 || ie_11up
-export var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1])
-export var webkit = /WebKit\//.test(userAgent)
-var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent)
-export var chrome = /Chrome\//.test(userAgent)
-export var presto = /Opera\//.test(userAgent)
-export var safari = /Apple Computer/.test(navigator.vendor)
-export var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
-export var phantom = /PhantomJS/.test(userAgent)
+export let gecko = /gecko\/\d/i.test(userAgent)
+let ie_upto10 = /MSIE \d/.test(userAgent)
+let ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent)
+export let ie = ie_upto10 || ie_11up
+export let ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1])
+export let webkit = /WebKit\//.test(userAgent)
+let qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent)
+export let chrome = /Chrome\//.test(userAgent)
+export let presto = /Opera\//.test(userAgent)
+export let safari = /Apple Computer/.test(navigator.vendor)
+export let mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
+export let phantom = /PhantomJS/.test(userAgent)
 
-export var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
+export let ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
 // This is woefully incomplete. Suggestions for alternative methods welcome.
-export var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
-export var mac = ios || /Mac/.test(platform)
-export var chromeOS = /\bCrOS\b/.test(userAgent)
-export var windows = /win/i.test(platform)
+export let mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
+export let mac = ios || /Mac/.test(platform)
+export let chromeOS = /\bCrOS\b/.test(userAgent)
+export let windows = /win/i.test(platform)
 
-var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/)
+let presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/)
 if (presto_version) presto_version = Number(presto_version[1])
 if (presto_version && presto_version >= 15) { presto = false; webkit = true }
 // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-export var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11))
-export var captureRightClick = gecko || (ie && ie_version >= 9)
+export let flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11))
+export let captureRightClick = gecko || (ie && ie_version >= 9)
diff --git a/src/util/dom.js b/src/util/dom.js
index df2cfd0aac..465dbb5a5e 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -2,17 +2,17 @@ import { ie, ie_version, ios } from "./browser"
 
 export function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
 
-export var rmClass = function(node, cls) {
-  var current = node.className
-  var match = classTest(cls).exec(current)
+export let rmClass = function(node, cls) {
+  let current = node.className
+  let match = classTest(cls).exec(current)
   if (match) {
-    var after = current.slice(match.index + match[0].length)
+    let after = current.slice(match.index + match[0].length)
     node.className = current.slice(0, match.index) + (after ? match[1] + after : "")
   }
 }
 
 export function removeChildren(e) {
-  for (var count = e.childNodes.length; count > 0; --count)
+  for (let count = e.childNodes.length; count > 0; --count)
     e.removeChild(e.firstChild)
   return e
 }
@@ -22,23 +22,23 @@ export function removeChildrenAndAdd(parent, e) {
 }
 
 export function elt(tag, content, className, style) {
-  var e = document.createElement(tag)
+  let e = document.createElement(tag)
   if (className) e.className = className
   if (style) e.style.cssText = style
   if (typeof content == "string") e.appendChild(document.createTextNode(content))
-  else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i])
+  else if (content) for (let i = 0; i < content.length; ++i) e.appendChild(content[i])
   return e
 }
 
-export var range
+export let range
 if (document.createRange) range = function(node, start, end, endNode) {
-  var r = document.createRange()
+  let r = document.createRange()
   r.setEnd(endNode || node, end)
   r.setStart(node, start)
   return r
 }
 else range = function(node, start, end) {
-  var r = document.body.createTextRange()
+  let r = document.body.createTextRange()
   try { r.moveToElementText(node.parentNode) }
   catch(e) { return r }
   r.collapse(true)
@@ -58,8 +58,8 @@ export function contains(parent, child) {
   } while (child = child.parentNode)
 }
 
-export var activeElt = function() {
-  var activeElement = document.activeElement
+export let activeElt = function() {
+  let activeElement = document.activeElement
   while (activeElement && activeElement.root && activeElement.root.activeElement)
     activeElement = activeElement.root.activeElement
   return activeElement
@@ -72,17 +72,17 @@ if (ie && ie_version < 11) activeElt = function() {
 }
 
 export function addClass(node, cls) {
-  var current = node.className
+  let current = node.className
   if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls
 }
 export function joinClasses(a, b) {
-  var as = a.split(" ")
-  for (var i = 0; i < as.length; i++)
+  let as = a.split(" ")
+  for (let i = 0; i < as.length; i++)
     if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i]
   return b
 }
 
-export var selectInput = function(node) { node.select() }
+export let selectInput = function(node) { node.select() }
 if (ios) // Mobile Safari apparently has a bug where select() is broken.
   selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length }
 else if (ie) // Suppress mysterious IE10 errors
diff --git a/src/util/event.js b/src/util/event.js
index b2137583fb..e667a9f3c0 100644
--- a/src/util/event.js
+++ b/src/util/event.js
@@ -6,21 +6,21 @@ import { indexOf } from "./misc"
 // Lightweight event framework. on/off also work on DOM nodes,
 // registering native DOM handlers.
 
-export var on = function(emitter, type, f) {
+export let on = function(emitter, type, f) {
   if (emitter.addEventListener)
     emitter.addEventListener(type, f, false)
   else if (emitter.attachEvent)
     emitter.attachEvent("on" + type, f)
   else {
-    var map = emitter._handlers || (emitter._handlers = {})
-    var arr = map[type] || (map[type] = [])
+    let map = emitter._handlers || (emitter._handlers = {})
+    let arr = map[type] || (map[type] = [])
     arr.push(f)
   }
 }
 
-var noHandlers = []
+let noHandlers = []
 export function getHandlers(emitter, type, copy) {
-  var arr = emitter._handlers && emitter._handlers[type]
+  let arr = emitter._handlers && emitter._handlers[type]
   if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers
   else return arr || noHandlers
 }
@@ -31,17 +31,17 @@ export function off(emitter, type, f) {
   else if (emitter.detachEvent)
     emitter.detachEvent("on" + type, f)
   else {
-    var handlers = getHandlers(emitter, type, false)
-    for (var i = 0; i < handlers.length; ++i)
+    let handlers = getHandlers(emitter, type, false)
+    for (let i = 0; i < handlers.length; ++i)
       if (handlers[i] == f) { handlers.splice(i, 1); break }
   }
 }
 
 export function signal(emitter, type /*, values...*/) {
-  var handlers = getHandlers(emitter, type, true)
+  let handlers = getHandlers(emitter, type, true)
   if (!handlers.length) return
-  var args = Array.prototype.slice.call(arguments, 2)
-  for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args)
+  let args = Array.prototype.slice.call(arguments, 2)
+  for (let i = 0; i < handlers.length; ++i) handlers[i].apply(null, args)
 }
 
 // The DOM events that CodeMirror handles can be overridden by
@@ -55,10 +55,10 @@ export function signalDOMEvent(cm, e, override) {
 }
 
 export function signalCursorActivity(cm) {
-  var arr = cm._handlers && cm._handlers.cursorActivity
+  let arr = cm._handlers && cm._handlers.cursorActivity
   if (!arr) return
-  var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = [])
-  for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1)
+  let set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = [])
+  for (let i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1)
     set.push(arr[i])
 }
 
@@ -91,7 +91,7 @@ export function e_stop(e) {e_preventDefault(e); e_stopPropagation(e)}
 
 export function e_target(e) {return e.target || e.srcElement}
 export function e_button(e) {
-  var b = e.which
+  let b = e.which
   if (b == null) {
     if (e.button & 1) b = 1
     else if (e.button & 2) b = 3
diff --git a/src/util/feature_detection.js b/src/util/feature_detection.js
index 1e9baf41e5..d98393af90 100644
--- a/src/util/feature_detection.js
+++ b/src/util/feature_detection.js
@@ -2,35 +2,35 @@ import { elt, range, removeChildren, removeChildrenAndAdd } from "./dom"
 import { ie, ie_version } from "./browser"
 
 // Detect drag-and-drop
-export var dragAndDrop = function() {
+export let dragAndDrop = function() {
   // There is *some* kind of drag-and-drop support in IE6-8, but I
   // couldn't get it to work yet.
   if (ie && ie_version < 9) return false
-  var div = elt('div')
+  let div = elt('div')
   return "draggable" in div || "dragDrop" in div
 }()
 
-var zwspSupported
+let zwspSupported
 export function zeroWidthElement(measure) {
   if (zwspSupported == null) {
-    var test = elt("span", "\u200b")
+    let test = elt("span", "\u200b")
     removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]))
     if (measure.firstChild.offsetHeight != 0)
       zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8)
   }
-  var node = zwspSupported ? elt("span", "\u200b") :
+  let node = zwspSupported ? elt("span", "\u200b") :
     elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px")
   node.setAttribute("cm-text", "")
   return node
 }
 
 // Feature-detect IE's crummy client rect reporting for bidi text
-var badBidiRects
+let badBidiRects
 export function hasBadBidiRects(measure) {
   if (badBidiRects != null) return badBidiRects
-  var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"))
-  var r0 = range(txt, 0, 1).getBoundingClientRect()
-  var r1 = range(txt, 1, 2).getBoundingClientRect()
+  let txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"))
+  let r0 = range(txt, 0, 1).getBoundingClientRect()
+  let r1 = range(txt, 1, 2).getBoundingClientRect()
   removeChildren(measure)
   if (!r0 || r0.left == r0.right) return false // Safari returns null in some cases (#2780)
   return badBidiRects = (r1.right - r0.right < 3)
@@ -38,13 +38,13 @@ export function hasBadBidiRects(measure) {
 
 // See if "".split is the broken IE version, if so, provide an
 // alternative way to split lines.
-export var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) {
-  var pos = 0, result = [], l = string.length
+export let splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) {
+  let pos = 0, result = [], l = string.length
   while (pos <= l) {
-    var nl = string.indexOf("\n", pos)
+    let nl = string.indexOf("\n", pos)
     if (nl == -1) nl = string.length
-    var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl)
-    var rt = line.indexOf("\r")
+    let line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl)
+    let rt = line.indexOf("\r")
     if (rt != -1) {
       result.push(line.slice(0, rt))
       pos += rt + 1
@@ -56,28 +56,29 @@ export var splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) {
   return result
 } : function(string){return string.split(/\r\n?|\n/)}
 
-export var hasSelection = window.getSelection ? function(te) {
+export let hasSelection = window.getSelection ? function(te) {
   try { return te.selectionStart != te.selectionEnd }
   catch(e) { return false }
 } : function(te) {
-  try {var range = te.ownerDocument.selection.createRange()}
+  let range
+  try {range = te.ownerDocument.selection.createRange()}
   catch(e) {}
   if (!range || range.parentElement() != te) return false
   return range.compareEndPoints("StartToEnd", range) != 0
 }
 
-export var hasCopyEvent = (function() {
-  var e = elt("div")
+export let hasCopyEvent = (function() {
+  let e = elt("div")
   if ("oncopy" in e) return true
   e.setAttribute("oncopy", "return;")
   return typeof e.oncopy == "function"
 })()
 
-var badZoomedRects = null
+let badZoomedRects = null
 export function hasBadZoomedRects(measure) {
   if (badZoomedRects != null) return badZoomedRects
-  var node = removeChildrenAndAdd(measure, elt("span", "x"))
-  var normal = node.getBoundingClientRect()
-  var fromRange = range(node, 0, 1).getBoundingClientRect()
+  let node = removeChildrenAndAdd(measure, elt("span", "x"))
+  let normal = node.getBoundingClientRect()
+  let fromRange = range(node, 0, 1).getBoundingClientRect()
   return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1
 }
diff --git a/src/util/misc.js b/src/util/misc.js
index a6e3340db1..c94de8bd2c 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -1,11 +1,11 @@
 export function bind(f) {
-  var args = Array.prototype.slice.call(arguments, 1)
+  let args = Array.prototype.slice.call(arguments, 1)
   return function(){return f.apply(null, args)}
 }
 
 export function copyObj(obj, target, overwrite) {
   if (!target) target = {}
-  for (var prop in obj)
+  for (let prop in obj)
     if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
       target[prop] = obj[prop]
   return target
@@ -18,8 +18,8 @@ export function countColumn(string, end, tabSize, startIndex, startValue) {
     end = string.search(/[^\s\u00a0]/)
     if (end == -1) end = string.length
   }
-  for (var i = startIndex || 0, n = startValue || 0;;) {
-    var nextTab = string.indexOf("\t", i)
+  for (let i = startIndex || 0, n = startValue || 0;;) {
+    let nextTab = string.indexOf("\t", i)
     if (nextTab < 0 || nextTab >= end)
       return n + (end - i)
     n += nextTab - i
@@ -35,28 +35,28 @@ Delayed.prototype.set = function(ms, f) {
 }
 
 export function indexOf(array, elt) {
-  for (var i = 0; i < array.length; ++i)
+  for (let i = 0; i < array.length; ++i)
     if (array[i] == elt) return i
   return -1
 }
 
 // Number of pixels added to scroller and sizer to hide scrollbar
-export var scrollerGap = 30
+export let scrollerGap = 30
 
 // Returned or thrown by various protocols to signal 'I'm not
 // handling this'.
-export var Pass = {toString: function(){return "CodeMirror.Pass"}}
+export let Pass = {toString: function(){return "CodeMirror.Pass"}}
 
 // Reused option objects for setSelection & friends
-export var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"}
+export let sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"}
 
 // The inverse of countColumn -- find the offset that corresponds to
 // a particular column.
 export function findColumn(string, goal, tabSize) {
-  for (var pos = 0, col = 0;;) {
-    var nextTab = string.indexOf("\t", pos)
+  for (let pos = 0, col = 0;;) {
+    let nextTab = string.indexOf("\t", pos)
     if (nextTab == -1) nextTab = string.length
-    var skipped = nextTab - pos
+    let skipped = nextTab - pos
     if (nextTab == string.length || col + skipped >= goal)
       return pos + Math.min(skipped, goal - col)
     col += nextTab - pos
@@ -66,7 +66,7 @@ export function findColumn(string, goal, tabSize) {
   }
 }
 
-var spaceStrs = [""]
+let spaceStrs = [""]
 export function spaceStr(n) {
   while (spaceStrs.length <= n)
     spaceStrs.push(lst(spaceStrs) + " ")
@@ -76,13 +76,13 @@ export function spaceStr(n) {
 export function lst(arr) { return arr[arr.length-1] }
 
 export function map(array, f) {
-  var out = []
-  for (var i = 0; i < array.length; i++) out[i] = f(array[i], i)
+  let out = []
+  for (let i = 0; i < array.length; i++) out[i] = f(array[i], i)
   return out
 }
 
 export function insertSorted(array, value, score) {
-  var pos = 0, priority = score(value)
+  let pos = 0, priority = score(value)
   while (pos < array.length && score(array[pos]) <= priority) pos++
   array.splice(pos, 0, value)
 }
@@ -90,7 +90,7 @@ export function insertSorted(array, value, score) {
 export function nothing() {}
 
 export function createObj(base, props) {
-  var inst
+  let inst
   if (Object.create) {
     inst = Object.create(base)
   } else {
@@ -101,7 +101,7 @@ export function createObj(base, props) {
   return inst
 }
 
-var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/
+let nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/
 export function isWordCharBasic(ch) {
   return /\w/.test(ch) || ch > "\x80" &&
     (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch))
@@ -113,7 +113,7 @@ export function isWordChar(ch, helper) {
 }
 
 export function isEmpty(obj) {
-  for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false
+  for (let n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false
   return true
 }
 
@@ -122,5 +122,5 @@ export function isEmpty(obj) {
 // as editing and measuring is concerned. This is not fully correct,
 // since some scripts/fonts/browsers also treat other configurations
 // of code points as a group.
-var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
+let extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
 export function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
diff --git a/src/util/operation_group.js b/src/util/operation_group.js
index d48f6eb32a..d743f994e5 100644
--- a/src/util/operation_group.js
+++ b/src/util/operation_group.js
@@ -1,6 +1,6 @@
 import { getHandlers } from "./event"
 
-var operationGroup = null
+let operationGroup = null
 
 export function pushOperation(op) {
   if (operationGroup) {
@@ -16,12 +16,12 @@ export function pushOperation(op) {
 function fireCallbacksForOps(group) {
   // Calls delayed callbacks and cursorActivity handlers until no
   // new ones appear
-  var callbacks = group.delayedCallbacks, i = 0
+  let callbacks = group.delayedCallbacks, i = 0
   do {
     for (; i < callbacks.length; i++)
       callbacks[i].call(null)
-    for (var j = 0; j < group.ops.length; j++) {
-      var op = group.ops[j]
+    for (let j = 0; j < group.ops.length; j++) {
+      let op = group.ops[j]
       if (op.cursorActivityHandlers)
         while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
           op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm)
@@ -30,7 +30,7 @@ function fireCallbacksForOps(group) {
 }
 
 export function finishOperation(op, endCb) {
-  var group = op.ownsGroup
+  let group = op.ownsGroup
   if (!group) return
 
   try { fireCallbacksForOps(group) }
@@ -40,7 +40,7 @@ export function finishOperation(op, endCb) {
   }
 }
 
-var orphanDelayedCallbacks = null
+let orphanDelayedCallbacks = null
 
 // Often, we want to signal events at a point where we are in the
 // middle of some work, but don't want the handler to start calling
@@ -50,9 +50,9 @@ var orphanDelayedCallbacks = null
 // them to be executed when the last operation ends, or, if no
 // operation is active, when a timeout fires.
 export function signalLater(emitter, type /*, values...*/) {
-  var arr = getHandlers(emitter, type, false)
+  let arr = getHandlers(emitter, type, false)
   if (!arr.length) return
-  var args = Array.prototype.slice.call(arguments, 2), list
+  let args = Array.prototype.slice.call(arguments, 2), list
   if (operationGroup) {
     list = operationGroup.delayedCallbacks
   } else if (orphanDelayedCallbacks) {
@@ -62,12 +62,12 @@ export function signalLater(emitter, type /*, values...*/) {
     setTimeout(fireOrphanDelayed, 0)
   }
   function bnd(f) {return function(){f.apply(null, args)}}
-  for (var i = 0; i < arr.length; ++i)
+  for (let i = 0; i < arr.length; ++i)
     list.push(bnd(arr[i]))
 }
 
 function fireOrphanDelayed() {
-  var delayed = orphanDelayedCallbacks
+  let delayed = orphanDelayedCallbacks
   orphanDelayedCallbacks = null
-  for (var i = 0; i < delayed.length; ++i) delayed[i]()
+  for (let i = 0; i < delayed.length; ++i) delayed[i]()
 }

From 6992c534ad33ce60e7500fe04a99a481ef8f548e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Sep 2016 11:16:44 +0200
Subject: [PATCH 2899/4742] =?UTF-8?q?Change=20one=20let=20back=20to=20var?=
 =?UTF-8?q?=20to=20work=20around=20a=20Bubl=C3=A9=20issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue #4261
---
 src/model/history.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/history.js b/src/model/history.js
index 0c7cf5bba1..2a7502cb8e 100644
--- a/src/model/history.js
+++ b/src/model/history.js
@@ -216,7 +216,7 @@ export function copyHistoryArray(events, newGroup, instantiateSel) {
     for (let j = 0; j < changes.length; ++j) {
       let change = changes[j], m
       newChanges.push({from: change.from, to: change.to, text: change.text})
-      if (newGroup) for (let prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
+      if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
         if (indexOf(newGroup, Number(m[1])) > -1) {
           lst(newChanges)[prop] = change[prop]
           delete change[prop]

From 9ad40ee76ffba6ab90f990b5b5bf1490b32410ef Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 29 Sep 2016 11:00:09 +0200
Subject: [PATCH 2900/4742] Convert anonymous to arrow functions

---
 src/display/focus.js                    |  14 +-
 src/display/highlight_worker.js         |   4 +-
 src/display/mode_state.js               |   2 +-
 src/display/operations.js               |   2 +-
 src/display/scroll_events.js            |   4 +-
 src/display/scrollbars.js               |  12 +-
 src/display/selection.js                |   7 +-
 src/edit/CodeMirror.js                  |  40 ++--
 src/edit/commands.js                    | 252 +++++++++++-------------
 src/edit/deleteNearSelection.js         |   2 +-
 src/edit/drop_events.js                 |   6 +-
 src/edit/fromTextArea.js                |  13 +-
 src/edit/global_events.js               |   8 +-
 src/edit/key_events.js                  |  11 +-
 src/edit/main.js                        |   8 +-
 src/edit/methods.js                     |  24 ++-
 src/edit/mouse_events.js                |  14 +-
 src/edit/options.js                     |  58 +++---
 src/input/ContentEditableInput.js       |  36 ++--
 src/input/TextareaInput.js              |  20 +-
 src/input/input.js                      |   4 +-
 src/line/highlight.js                   |  21 +-
 src/line/line_data.js                   |   2 +-
 src/line/spans.js                       |   4 +-
 src/line/utils_line.js                  |   4 +-
 src/measurement/position_measurement.js |   4 +-
 src/model/Doc.js                        |  14 +-
 src/model/changes.js                    |  28 +--
 src/model/history.js                    |   4 +-
 src/model/line_widget.js                |   6 +-
 src/model/mark_text.js                  |  15 +-
 src/model/selection.js                  |   2 +-
 src/util/StringStream.js                |   2 +-
 src/util/feature_detection.js           |  10 +-
 src/util/operation_group.js             |   3 +-
 35 files changed, 305 insertions(+), 355 deletions(-)

diff --git a/src/display/focus.js b/src/display/focus.js
index e6a9f5218d..ee52daffac 100644
--- a/src/display/focus.js
+++ b/src/display/focus.js
@@ -9,12 +9,10 @@ export function ensureFocus(cm) {
 
 export function delayBlurEvent(cm) {
   cm.state.delayingBlurEvent = true
-  setTimeout(function() {
-    if (cm.state.delayingBlurEvent) {
-      cm.state.delayingBlurEvent = false
-      onBlur(cm)
-    }
-  }, 100)
+  setTimeout(() => { if (cm.state.delayingBlurEvent) {
+    cm.state.delayingBlurEvent = false
+    onBlur(cm)
+  } }, 100)
 }
 
 export function onFocus(cm, e) {
@@ -30,7 +28,7 @@ export function onFocus(cm, e) {
     // select-all detection hack)
     if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
       cm.display.input.reset()
-      if (webkit) setTimeout(function() { cm.display.input.reset(true) }, 20) // Issue #1730
+      if (webkit) setTimeout(() => cm.display.input.reset(true), 20) // Issue #1730
     }
     cm.display.input.receivedFocus()
   }
@@ -45,5 +43,5 @@ export function onBlur(cm, e) {
     rmClass(cm.display.wrapper, "CodeMirror-focused")
   }
   clearInterval(cm.display.blinker)
-  setTimeout(function() {if (!cm.state.focused) cm.display.shift = false}, 150)
+  setTimeout(() => { if (!cm.state.focused) cm.display.shift = false }, 150)
 }
diff --git a/src/display/highlight_worker.js b/src/display/highlight_worker.js
index 5d535abe70..d34db2b42e 100644
--- a/src/display/highlight_worker.js
+++ b/src/display/highlight_worker.js
@@ -20,7 +20,7 @@ function highlightWorker(cm) {
   let state = copyState(doc.mode, getStateBefore(cm, doc.frontier))
   let changedLines = []
 
-  doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
+  doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), line => {
     if (doc.frontier >= cm.display.viewFrom) { // Visible
       let oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength
       let highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true)
@@ -44,7 +44,7 @@ function highlightWorker(cm) {
       return true
     }
   })
-  if (changedLines.length) runInOp(cm, function() {
+  if (changedLines.length) runInOp(cm, () => {
     for (let i = 0; i < changedLines.length; i++)
       regLineChange(cm, changedLines[i], "text")
   })
diff --git a/src/display/mode_state.js b/src/display/mode_state.js
index 7742c722a4..8c4c60b058 100644
--- a/src/display/mode_state.js
+++ b/src/display/mode_state.js
@@ -11,7 +11,7 @@ export function loadMode(cm) {
 }
 
 export function resetModeState(cm) {
-  cm.doc.iter(function(line) {
+  cm.doc.iter(line => {
     if (line.stateAfter) line.stateAfter = null
     if (line.styles) line.styles = null
   })
diff --git a/src/display/operations.js b/src/display/operations.js
index cc6eef7bde..30a63a613a 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -46,7 +46,7 @@ export function startOperation(cm) {
 // Finish an operation, updating the display and signalling delayed events
 export function endOperation(cm) {
   let op = cm.curOp
-  finishOperation(op, function(group) {
+  finishOperation(op, group => {
     for (let i = 0; i < group.ops.length; i++)
       group.ops[i].cm.curOp = null
     endOperations(group)
diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index 3c166b4855..e85d2a02fd 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -48,7 +48,7 @@ else if (gecko) wheelPixelsPerUnit = 15
 else if (chrome) wheelPixelsPerUnit = -.7
 else if (safari) wheelPixelsPerUnit = -1/3
 
-let wheelEventDelta = function(e) {
+function wheelEventDelta(e) {
   let dx = e.wheelDeltaX, dy = e.wheelDeltaY
   if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail
   if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail
@@ -120,7 +120,7 @@ export function onScrollWheel(cm, e) {
     if (display.wheelStartX == null) {
       display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop
       display.wheelDX = dx; display.wheelDY = dy
-      setTimeout(function() {
+      setTimeout(() => {
         if (display.wheelStartX == null) return
         let movedX = scroll.scrollLeft - display.wheelStartX
         let movedY = scroll.scrollTop - display.wheelStartY
diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index a07f2a165d..a85fffe9a5 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -33,10 +33,10 @@ function NativeScrollbars(place, scroll, cm) {
   let horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
   place(vert); place(horiz)
 
-  on(vert, "scroll", function() {
+  on(vert, "scroll", () => {
     if (vert.clientHeight) scroll(vert.scrollTop, "vertical")
   })
-  on(horiz, "scroll", function() {
+  on(horiz, "scroll", () => {
     if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal")
   })
 
@@ -172,14 +172,14 @@ export function initScrollbars(cm) {
       rmClass(cm.display.wrapper, cm.display.scrollbars.addClass)
   }
 
-  cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](function(node) {
+  cm.display.scrollbars = new scrollbarModel[cm.options.scrollbarStyle](node => {
     cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller)
     // Prevent clicks in the scrollbars from killing focus
-    on(node, "mousedown", function() {
-      if (cm.state.focused) setTimeout(function() { cm.display.input.focus() }, 0)
+    on(node, "mousedown", () => {
+      if (cm.state.focused) setTimeout(() => cm.display.input.focus(), 0)
     })
     node.setAttribute("cm-not-content", "true")
-  }, function(pos, axis) {
+  }, (pos, axis) => {
     if (axis == "horizontal") setScrollLeft(cm, pos)
     else setScrollTop(cm, pos)
   }, cm)
diff --git a/src/display/selection.js b/src/display/selection.js
index 9fa8f6eefb..8380de82e5 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -70,7 +70,7 @@ function drawSelectionRange(cm, range, output) {
       return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
     }
 
-    iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
+    iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir) => {
       let leftPos = coords(from, "left"), rightPos, left, right
       if (from == to) {
         rightPos = leftPos
@@ -129,9 +129,8 @@ export function restartBlink(cm) {
   let on = true
   display.cursorDiv.style.visibility = ""
   if (cm.options.cursorBlinkRate > 0)
-    display.blinker = setInterval(function() {
-      display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"
-    }, cm.options.cursorBlinkRate)
+    display.blinker = setInterval(() => display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden",
+      cm.options.cursorBlinkRate)
   else if (cm.options.cursorBlinkRate < 0)
     display.cursorDiv.style.visibility = "hidden"
 }
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 90650ff059..909ffcb185 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -68,7 +68,7 @@ export function CodeMirror(place, options) {
 
   // Override magic textarea content restore that IE sometimes does
   // on our hidden textarea on reload
-  if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true) }, 20)
+  if (ie && ie_version < 11) setTimeout(() => cm.display.input.reset(true), 20)
 
   registerEventHandlers(this)
   ensureGlobalHandlers()
@@ -108,7 +108,7 @@ function registerEventHandlers(cm) {
   on(d.scroller, "mousedown", operation(cm, onMouseDown))
   // Older IE's will not fire a second mousedown for a double click
   if (ie && ie_version < 11)
-    on(d.scroller, "dblclick", operation(cm, function(e) {
+    on(d.scroller, "dblclick", operation(cm, e => {
       if (signalDOMEvent(cm, e)) return
       let pos = posFromMouse(cm, e)
       if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return
@@ -117,17 +117,17 @@ function registerEventHandlers(cm) {
       extendSelection(cm.doc, word.anchor, word.head)
     }))
   else
-    on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e) })
+    on(d.scroller, "dblclick", e => signalDOMEvent(cm, e) || e_preventDefault(e))
   // Some browsers fire contextmenu *after* opening the menu, at
   // which point we can't mess with it anymore. Context menu is
   // handled in onMouseDown for these browsers.
-  if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e)})
+  if (!captureRightClick) on(d.scroller, "contextmenu", e => onContextMenu(cm, e))
 
   // Used to suppress mouse event handling when a touch happens
   let touchFinished, prevTouch = {end: 0}
   function finishTouch() {
     if (d.activeTouch) {
-      touchFinished = setTimeout(function() {d.activeTouch = null}, 1000)
+      touchFinished = setTimeout(() => d.activeTouch = null, 1000)
       prevTouch = d.activeTouch
       prevTouch.end = +new Date
     }
@@ -142,7 +142,7 @@ function registerEventHandlers(cm) {
     let dx = other.left - touch.left, dy = other.top - touch.top
     return dx * dx + dy * dy > 20 * 20
   }
-  on(d.scroller, "touchstart", function(e) {
+  on(d.scroller, "touchstart", e => {
     if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
       clearTimeout(touchFinished)
       let now = +new Date
@@ -154,10 +154,10 @@ function registerEventHandlers(cm) {
       }
     }
   })
-  on(d.scroller, "touchmove", function() {
+  on(d.scroller, "touchmove", () => {
     if (d.activeTouch) d.activeTouch.moved = true
   })
-  on(d.scroller, "touchend", function(e) {
+  on(d.scroller, "touchend", e => {
     let touch = d.activeTouch
     if (touch && !eventInWidget(d, e) && touch.left != null &&
         !touch.moved && new Date - touch.start < 300) {
@@ -178,7 +178,7 @@ function registerEventHandlers(cm) {
 
   // Sync scrolling between fake scrollbars and real scrollable
   // area, ensure viewport is updated when scrolling.
-  on(d.scroller, "scroll", function() {
+  on(d.scroller, "scroll", () => {
     if (d.scroller.clientHeight) {
       setScrollTop(cm, d.scroller.scrollTop)
       setScrollLeft(cm, d.scroller.scrollLeft, true)
@@ -187,27 +187,27 @@ function registerEventHandlers(cm) {
   })
 
   // Listen to wheel events in order to try and update the viewport on time.
-  on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e)})
-  on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e)})
+  on(d.scroller, "mousewheel", e => onScrollWheel(cm, e))
+  on(d.scroller, "DOMMouseScroll", e => onScrollWheel(cm, e))
 
   // Prevent wrapper from ever scrolling
-  on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0 })
+  on(d.wrapper, "scroll", () => d.wrapper.scrollTop = d.wrapper.scrollLeft = 0)
 
   d.dragFunctions = {
-    enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e)},
-    over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e) }},
-    start: function(e){onDragStart(cm, e)},
+    enter: e => {if (!signalDOMEvent(cm, e)) e_stop(e)},
+    over: e => {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e) }},
+    start: e => onDragStart(cm, e),
     drop: operation(cm, onDrop),
-    leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm) }}
+    leave: e => {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm) }}
   }
 
   let inp = d.input.getField()
-  on(inp, "keyup", function(e) { onKeyUp.call(cm, e) })
+  on(inp, "keyup", e => onKeyUp.call(cm, e))
   on(inp, "keydown", operation(cm, onKeyDown))
   on(inp, "keypress", operation(cm, onKeyPress))
-  on(inp, "focus", function(e) { onFocus(cm, e) })
-  on(inp, "blur", function (e) { onBlur(cm, e) })
+  on(inp, "focus", e => onFocus(cm, e))
+  on(inp, "blur", e => onBlur(cm, e))
 }
 
 let initHooks = []
-CodeMirror.defineInitHook = function(f) {initHooks.push(f)}
+CodeMirror.defineInitHook = f => initHooks.push(f)
diff --git a/src/edit/commands.js b/src/edit/commands.js
index 97a30d6d97..fe39ed727f 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -13,109 +13,87 @@ import { getOrder, lineLeft, lineRight } from "../util/bidi"
 // editor, mostly used for keybindings.
 export let commands = {
   selectAll: selectAll,
-  singleSelection: function(cm) {
-    cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll)
-  },
-  killLine: function(cm) {
-    deleteNearSelection(cm, function(range) {
-      if (range.empty()) {
-        let len = getLine(cm.doc, range.head.line).text.length
-        if (range.head.ch == len && range.head.line < cm.lastLine())
-          return {from: range.head, to: Pos(range.head.line + 1, 0)}
-        else
-          return {from: range.head, to: Pos(range.head.line, len)}
-      } else {
-        return {from: range.from(), to: range.to()}
-      }
-    })
-  },
-  deleteLine: function(cm) {
-    deleteNearSelection(cm, function(range) {
-      return {from: Pos(range.from().line, 0),
-              to: clipPos(cm.doc, Pos(range.to().line + 1, 0))}
-    })
-  },
-  delLineLeft: function(cm) {
-    deleteNearSelection(cm, function(range) {
-      return {from: Pos(range.from().line, 0), to: range.from()}
-    })
-  },
-  delWrappedLineLeft: function(cm) {
-    deleteNearSelection(cm, function(range) {
-      let top = cm.charCoords(range.head, "div").top + 5
-      let leftPos = cm.coordsChar({left: 0, top: top}, "div")
-      return {from: leftPos, to: range.from()}
-    })
-  },
-  delWrappedLineRight: function(cm) {
-    deleteNearSelection(cm, function(range) {
-      let top = cm.charCoords(range.head, "div").top + 5
-      let rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
-      return {from: range.from(), to: rightPos }
-    })
-  },
-  undo: function(cm) {cm.undo()},
-  redo: function(cm) {cm.redo()},
-  undoSelection: function(cm) {cm.undoSelection()},
-  redoSelection: function(cm) {cm.redoSelection()},
-  goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0))},
-  goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()))},
-  goLineStart: function(cm) {
-    cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line) },
-                          {origin: "+move", bias: 1})
-  },
-  goLineStartSmart: function(cm) {
-    cm.extendSelectionsBy(function(range) {
-      return lineStartSmart(cm, range.head)
-    }, {origin: "+move", bias: 1})
-  },
-  goLineEnd: function(cm) {
-    cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line) },
-                          {origin: "+move", bias: -1})
-  },
-  goLineRight: function(cm) {
-    cm.extendSelectionsBy(function(range) {
-      let top = cm.charCoords(range.head, "div").top + 5
-      return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
-    }, sel_move)
-  },
-  goLineLeft: function(cm) {
-    cm.extendSelectionsBy(function(range) {
-      let top = cm.charCoords(range.head, "div").top + 5
-      return cm.coordsChar({left: 0, top: top}, "div")
-    }, sel_move)
-  },
-  goLineLeftSmart: function(cm) {
-    cm.extendSelectionsBy(function(range) {
-      let top = cm.charCoords(range.head, "div").top + 5
-      let pos = cm.coordsChar({left: 0, top: top}, "div")
-      if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head)
-      return pos
-    }, sel_move)
-  },
-  goLineUp: function(cm) {cm.moveV(-1, "line")},
-  goLineDown: function(cm) {cm.moveV(1, "line")},
-  goPageUp: function(cm) {cm.moveV(-1, "page")},
-  goPageDown: function(cm) {cm.moveV(1, "page")},
-  goCharLeft: function(cm) {cm.moveH(-1, "char")},
-  goCharRight: function(cm) {cm.moveH(1, "char")},
-  goColumnLeft: function(cm) {cm.moveH(-1, "column")},
-  goColumnRight: function(cm) {cm.moveH(1, "column")},
-  goWordLeft: function(cm) {cm.moveH(-1, "word")},
-  goGroupRight: function(cm) {cm.moveH(1, "group")},
-  goGroupLeft: function(cm) {cm.moveH(-1, "group")},
-  goWordRight: function(cm) {cm.moveH(1, "word")},
-  delCharBefore: function(cm) {cm.deleteH(-1, "char")},
-  delCharAfter: function(cm) {cm.deleteH(1, "char")},
-  delWordBefore: function(cm) {cm.deleteH(-1, "word")},
-  delWordAfter: function(cm) {cm.deleteH(1, "word")},
-  delGroupBefore: function(cm) {cm.deleteH(-1, "group")},
-  delGroupAfter: function(cm) {cm.deleteH(1, "group")},
-  indentAuto: function(cm) {cm.indentSelection("smart")},
-  indentMore: function(cm) {cm.indentSelection("add")},
-  indentLess: function(cm) {cm.indentSelection("subtract")},
-  insertTab: function(cm) {cm.replaceSelection("\t")},
-  insertSoftTab: function(cm) {
+  singleSelection: cm => cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll),
+  killLine: cm => deleteNearSelection(cm, range => {
+    if (range.empty()) {
+      let len = getLine(cm.doc, range.head.line).text.length
+      if (range.head.ch == len && range.head.line < cm.lastLine())
+        return {from: range.head, to: Pos(range.head.line + 1, 0)}
+      else
+        return {from: range.head, to: Pos(range.head.line, len)}
+    } else {
+      return {from: range.from(), to: range.to()}
+    }
+  }),
+  deleteLine: cm => deleteNearSelection(cm, range => ({
+    from: Pos(range.from().line, 0),
+    to: clipPos(cm.doc, Pos(range.to().line + 1, 0))
+  })),
+  delLineLeft: cm => deleteNearSelection(cm, range => ({
+    from: Pos(range.from().line, 0), to: range.from()
+  })),
+  delWrappedLineLeft: cm => deleteNearSelection(cm, range => {
+    let top = cm.charCoords(range.head, "div").top + 5
+    let leftPos = cm.coordsChar({left: 0, top: top}, "div")
+    return {from: leftPos, to: range.from()}
+  }),
+  delWrappedLineRight: cm => deleteNearSelection(cm, range => {
+    let top = cm.charCoords(range.head, "div").top + 5
+    let rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
+    return {from: range.from(), to: rightPos }
+  }),
+  undo: cm => cm.undo(),
+  redo: cm => cm.redo(),
+  undoSelection: cm => cm.undoSelection(),
+  redoSelection: cm => cm.redoSelection(),
+  goDocStart: cm => cm.extendSelection(Pos(cm.firstLine(), 0)),
+  goDocEnd: cm => cm.extendSelection(Pos(cm.lastLine())),
+  goLineStart: cm => cm.extendSelectionsBy(range => lineStart(cm, range.head.line),
+    {origin: "+move", bias: 1}
+  ),
+  goLineStartSmart: cm => cm.extendSelectionsBy(range => lineStartSmart(cm, range.head),
+    {origin: "+move", bias: 1}
+  ),
+  goLineEnd: cm => cm.extendSelectionsBy(range => lineEnd(cm, range.head.line),
+    {origin: "+move", bias: -1}
+  ),
+  goLineRight: cm => cm.extendSelectionsBy(range => {
+    let top = cm.charCoords(range.head, "div").top + 5
+    return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
+  }, sel_move),
+  goLineLeft: cm => cm.extendSelectionsBy(range => {
+    let top = cm.charCoords(range.head, "div").top + 5
+    return cm.coordsChar({left: 0, top: top}, "div")
+  }, sel_move),
+  goLineLeftSmart: cm => cm.extendSelectionsBy(range => {
+    let top = cm.charCoords(range.head, "div").top + 5
+    let pos = cm.coordsChar({left: 0, top: top}, "div")
+    if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head)
+    return pos
+  }, sel_move),
+  goLineUp: cm => cm.moveV(-1, "line"),
+  goLineDown: cm => cm.moveV(1, "line"),
+  goPageUp: cm => cm.moveV(-1, "page"),
+  goPageDown: cm => cm.moveV(1, "page"),
+  goCharLeft: cm => cm.moveH(-1, "char"),
+  goCharRight: cm => cm.moveH(1, "char"),
+  goColumnLeft: cm => cm.moveH(-1, "column"),
+  goColumnRight: cm => cm.moveH(1, "column"),
+  goWordLeft: cm => cm.moveH(-1, "word"),
+  goGroupRight: cm => cm.moveH(1, "group"),
+  goGroupLeft: cm => cm.moveH(-1, "group"),
+  goWordRight: cm => cm.moveH(1, "word"),
+  delCharBefore: cm => cm.deleteH(-1, "char"),
+  delCharAfter: cm => cm.deleteH(1, "char"),
+  delWordBefore: cm => cm.deleteH(-1, "word"),
+  delWordAfter: cm => cm.deleteH(1, "word"),
+  delGroupBefore: cm => cm.deleteH(-1, "group"),
+  delGroupAfter: cm => cm.deleteH(1, "group"),
+  indentAuto: cm => cm.indentSelection("smart"),
+  indentMore: cm => cm.indentSelection("add"),
+  indentLess: cm => cm.indentSelection("subtract"),
+  insertTab: cm => cm.replaceSelection("\t"),
+  insertSoftTab: cm => {
     let spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize
     for (let i = 0; i < ranges.length; i++) {
       let pos = ranges[i].from()
@@ -124,47 +102,43 @@ export let commands = {
     }
     cm.replaceSelections(spaces)
   },
-  defaultTab: function(cm) {
+  defaultTab: cm => {
     if (cm.somethingSelected()) cm.indentSelection("add")
     else cm.execCommand("insertTab")
   },
-  transposeChars: function(cm) {
-    runInOp(cm, function() {
-      let ranges = cm.listSelections(), newSel = []
-      for (let i = 0; i < ranges.length; i++) {
-        let cur = ranges[i].head, line = getLine(cm.doc, cur.line).text
-        if (line) {
-          if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1)
-          if (cur.ch > 0) {
-            cur = new Pos(cur.line, cur.ch + 1)
-            cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
-                            Pos(cur.line, cur.ch - 2), cur, "+transpose")
-          } else if (cur.line > cm.doc.first) {
-            let prev = getLine(cm.doc, cur.line - 1).text
-            if (prev)
-              cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
-                              prev.charAt(prev.length - 1),
-                              Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose")
-          }
+  transposeChars: cm => runInOp(cm, () => {
+    let ranges = cm.listSelections(), newSel = []
+    for (let i = 0; i < ranges.length; i++) {
+      let cur = ranges[i].head, line = getLine(cm.doc, cur.line).text
+      if (line) {
+        if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1)
+        if (cur.ch > 0) {
+          cur = new Pos(cur.line, cur.ch + 1)
+          cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
+                          Pos(cur.line, cur.ch - 2), cur, "+transpose")
+        } else if (cur.line > cm.doc.first) {
+          let prev = getLine(cm.doc, cur.line - 1).text
+          if (prev)
+            cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
+                            prev.charAt(prev.length - 1),
+                            Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose")
         }
-        newSel.push(new Range(cur, cur))
       }
-      cm.setSelections(newSel)
-    })
-  },
-  newlineAndIndent: function(cm) {
-    runInOp(cm, function() {
-      let sels = cm.listSelections()
-      for (let i = sels.length - 1; i >= 0; i--)
-        cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input")
-      sels = cm.listSelections()
-      for (let i = 0; i < sels.length; i++)
-        cm.indentLine(sels[i].from().line, null, true)
-      ensureCursorVisible(cm)
-    })
-  },
-  openLine: function(cm) {cm.replaceSelection("\n", "start")},
-  toggleOverwrite: function(cm) {cm.toggleOverwrite()}
+      newSel.push(new Range(cur, cur))
+    }
+    cm.setSelections(newSel)
+  }),
+  newlineAndIndent: cm => runInOp(cm, () => {
+    let sels = cm.listSelections()
+    for (let i = sels.length - 1; i >= 0; i--)
+      cm.replaceRange(cm.doc.lineSeparator(), sels[i].anchor, sels[i].head, "+input")
+    sels = cm.listSelections()
+    for (let i = 0; i < sels.length; i++)
+      cm.indentLine(sels[i].from().line, null, true)
+    ensureCursorVisible(cm)
+  }),
+  openLine: cm => cm.replaceSelection("\n", "start"),
+  toggleOverwrite: cm => cm.toggleOverwrite()
 }
 
 
diff --git a/src/edit/deleteNearSelection.js b/src/edit/deleteNearSelection.js
index 38c5342ff2..5a9bd2cfd5 100644
--- a/src/edit/deleteNearSelection.js
+++ b/src/edit/deleteNearSelection.js
@@ -22,7 +22,7 @@ export function deleteNearSelection(cm, compute) {
     kill.push(toKill)
   }
   // Next, remove those actual ranges.
-  runInOp(cm, function() {
+  runInOp(cm, () => {
     for (let i = kill.length - 1; i >= 0; i--)
       replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete")
     ensureCursorVisible(cm)
diff --git a/src/edit/drop_events.js b/src/edit/drop_events.js
index b8024d920d..43e996fb68 100644
--- a/src/edit/drop_events.js
+++ b/src/edit/drop_events.js
@@ -29,13 +29,13 @@ export function onDrop(e) {
   // and insert it.
   if (files && files.length && window.FileReader && window.File) {
     let n = files.length, text = Array(n), read = 0
-    let loadFile = function(file, i) {
+    let loadFile = (file, i) => {
       if (cm.options.allowDropFileTypes &&
           indexOf(cm.options.allowDropFileTypes, file.type) == -1)
         return
 
       let reader = new FileReader
-      reader.onload = operation(cm, function() {
+      reader.onload = operation(cm, () => {
         let content = reader.result
         if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = ""
         text[i] = content
@@ -56,7 +56,7 @@ export function onDrop(e) {
     if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
       cm.state.draggingText(e)
       // Ensure the editor is re-focused
-      setTimeout(function() {cm.display.input.focus()}, 20)
+      setTimeout(() => cm.display.input.focus(), 20)
       return
     }
     try {
diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
index 7d22101469..5d920830b3 100644
--- a/src/edit/fromTextArea.js
+++ b/src/edit/fromTextArea.js
@@ -28,7 +28,7 @@ export function fromTextArea(textarea, options) {
       let form = textarea.form
       realSubmit = form.submit
       try {
-        let wrappedSubmit = form.submit = function() {
+        let wrappedSubmit = form.submit = () => {
           save()
           form.submit = realSubmit
           form.submit()
@@ -38,10 +38,10 @@ export function fromTextArea(textarea, options) {
     }
   }
 
-  options.finishInit = function(cm) {
+  options.finishInit = cm => {
     cm.save = save
-    cm.getTextArea = function() { return textarea }
-    cm.toTextArea = function() {
+    cm.getTextArea = () => textarea
+    cm.toTextArea = () => {
       cm.toTextArea = isNaN // Prevent this from being ran twice
       save()
       textarea.parentNode.removeChild(cm.getWrapperElement())
@@ -55,8 +55,7 @@ export function fromTextArea(textarea, options) {
   }
 
   textarea.style.display = "none"
-  let cm = CodeMirror(function(node) {
-    textarea.parentNode.insertBefore(node, textarea.nextSibling)
-  }, options)
+  let cm = CodeMirror(node => textarea.parentNode.insertBefore(node, textarea.nextSibling),
+    options)
   return cm
 }
diff --git a/src/edit/global_events.js b/src/edit/global_events.js
index a7ec22fe89..dd7d185308 100644
--- a/src/edit/global_events.js
+++ b/src/edit/global_events.js
@@ -23,16 +23,14 @@ export function ensureGlobalHandlers() {
 function registerGlobalHandlers() {
   // When the window resizes, we need to refresh active editors.
   let resizeTimer
-  on(window, "resize", function() {
-    if (resizeTimer == null) resizeTimer = setTimeout(function() {
+  on(window, "resize", () => {
+    if (resizeTimer == null) resizeTimer = setTimeout(() => {
       resizeTimer = null
       forEachCodeMirror(onResize)
     }, 100)
   })
   // When the window loses focus, we want to show the editor as blurred
-  on(window, "blur", function() {
-    forEachCodeMirror(onBlur)
-  })
+  on(window, "blur", () => forEachCodeMirror(onBlur))
 }
 // Called when the window resizes
 function onResize(cm) {
diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index 8530aef315..8e695473ba 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -45,7 +45,7 @@ function dispatchKey(cm, name, e, handle) {
   let seq = cm.state.keySeq
   if (seq) {
     if (isModifierKey(name)) return "handled"
-    stopSeq.set(50, function() {
+    stopSeq.set(50, () => {
       if (cm.state.keySeq == seq) {
         cm.state.keySeq = null
         cm.display.input.reset()
@@ -81,20 +81,19 @@ function handleKeyBinding(cm, e) {
     // First try to resolve full name (including 'Shift-'). Failing
     // that, see if there is a cursor-motion command (starting with
     // 'go') bound to the keyname without 'Shift-'.
-    return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true)})
-        || dispatchKey(cm, name, e, function(b) {
+    return dispatchKey(cm, "Shift-" + name, e, b => doHandleBinding(cm, b, true))
+        || dispatchKey(cm, name, e, b => {
              if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
                return doHandleBinding(cm, b)
            })
   } else {
-    return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b) })
+    return dispatchKey(cm, name, e, b => doHandleBinding(cm, b))
   }
 }
 
 // Handle a key from the keypress event
 function handleCharBinding(cm, e, ch) {
-  return dispatchKey(cm, "'" + ch + "'", e,
-                     function(b) { return doHandleBinding(cm, b, true) })
+  return dispatchKey(cm, "'" + ch + "'", e, b => doHandleBinding(cm, b, true))
 }
 
 let lastStoppedKey = null
diff --git a/src/edit/main.js b/src/edit/main.js
index 55432c0812..2831d2a03d 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -46,17 +46,15 @@ CodeMirror.defineMode = function(name/*, mode, …*/) {
 CodeMirror.defineMIME = defineMIME
 
 // Minimal default mode.
-CodeMirror.defineMode("null", function() {
-  return {token: function(stream) {stream.skipToEnd()}}
-})
+CodeMirror.defineMode("null", () => ({token: stream => stream.skipToEnd()}))
 CodeMirror.defineMIME("text/plain", "null")
 
 // EXTENSIONS
 
-CodeMirror.defineExtension = function(name, func) {
+CodeMirror.defineExtension = (name, func) => {
   CodeMirror.prototype[name] = func
 }
-CodeMirror.defineDocExtension = function(name, func) {
+CodeMirror.defineDocExtension = (name, func) => {
   Doc.prototype[name] = func
 }
 
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 04be851246..260ffa5df2 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -69,7 +69,7 @@ export default function(CodeMirror) {
       insertSorted(this.state.overlays,
                    {mode: mode, modeSpec: spec, opaque: options && options.opaque,
                     priority: (options && options.priority) || 0},
-                   function(overlay) { return overlay.priority })
+                   overlay => overlay.priority)
       this.state.modeGen++
       regChange(this)
     }),
@@ -219,7 +219,7 @@ export default function(CodeMirror) {
     defaultCharWidth: function() { return charWidth(this.display) },
 
     setGutterMarker: methodOp(function(line, gutterID, value) {
-      return changeLine(this.doc, line, "gutter", function(line) {
+      return changeLine(this.doc, line, "gutter", line => {
         let markers = line.gutterMarkers || (line.gutterMarkers = {})
         markers[gutterID] = value
         if (!value && isEmpty(markers)) line.gutterMarkers = null
@@ -229,7 +229,7 @@ export default function(CodeMirror) {
 
     clearGutter: methodOp(function(gutterID) {
       let cm = this, doc = cm.doc, i = doc.first
-      doc.iter(function(line) {
+      doc.iter(line => {
         if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
           line.gutterMarkers[gutterID] = null
           regLineChange(cm, i, "gutter")
@@ -316,7 +316,7 @@ export default function(CodeMirror) {
 
     moveH: methodOp(function(dir, unit) {
       let cm = this
-      cm.extendSelectionsBy(function(range) {
+      cm.extendSelectionsBy(range => {
         if (cm.display.shift || cm.doc.extend || range.empty())
           return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually)
         else
@@ -329,7 +329,7 @@ export default function(CodeMirror) {
       if (sel.somethingSelected())
         doc.replaceSelection("", null, "+delete")
       else
-        deleteNearSelection(this, function(range) {
+        deleteNearSelection(this, range => {
           let other = findPosH(doc, range.head, dir, unit, false)
           return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other}
         })
@@ -352,7 +352,7 @@ export default function(CodeMirror) {
     moveV: methodOp(function(dir, unit) {
       let cm = this, doc = this.doc, goals = []
       let collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected()
-      doc.extendSelectionsBy(function(range) {
+      doc.extendSelectionsBy(range => {
         if (collapse)
           return dir < 0 ? range.from() : range.to()
         let headPos = cursorCoords(cm, range.head, "div")
@@ -376,9 +376,9 @@ export default function(CodeMirror) {
         if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end
         let startChar = line.charAt(start)
         let check = isWordChar(startChar, helper)
-          ? function(ch) { return isWordChar(ch, helper) }
-          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch)}
-          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch)}
+          ? ch => isWordChar(ch, helper)
+          : /\s/.test(startChar) ? ch => /\s/.test(ch)
+          : ch => (!/\s/.test(ch) && !isWordChar(ch))
         while (start > 0 && check(line.charAt(start - 1))) --start
         while (end < line.length && check(line.charAt(end))) ++end
       }
@@ -436,14 +436,12 @@ export default function(CodeMirror) {
 
     setSize: methodOp(function(width, height) {
       let cm = this
-      function interpret(val) {
-        return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val
-      }
+      let interpret = val => typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val
       if (width != null) cm.display.wrapper.style.width = interpret(width)
       if (height != null) cm.display.wrapper.style.height = interpret(height)
       if (cm.options.lineWrapping) clearLineMeasurementCache(this)
       let lineNo = cm.display.viewFrom
-      cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
+      cm.doc.iter(lineNo, cm.display.viewTo, line => {
         if (line.widgets) for (let i = 0; i < line.widgets.length; i++)
           if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break }
         ++lineNo
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 5fe10ea39f..784f195b3e 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -28,7 +28,7 @@ export function onMouseDown(e) {
       // Briefly turn off draggability, to allow widgets to do
       // normal dragging things.
       display.scroller.draggable = false
-      setTimeout(function(){display.scroller.draggable = true}, 100)
+      setTimeout(() => display.scroller.draggable = true, 100)
     }
     return
   }
@@ -49,7 +49,7 @@ export function onMouseDown(e) {
   case 2:
     if (webkit) cm.state.lastMiddleDown = +new Date
     if (start) extendSelection(cm.doc, start)
-    setTimeout(function() {display.input.focus()}, 20)
+    setTimeout(() => display.input.focus(), 20)
     e_preventDefault(e)
     break
   case 3:
@@ -89,7 +89,7 @@ function leftButtonDown(cm, e, start) {
 // happen, and treat as a click if it didn't.
 function leftButtonStartDrag(cm, e, start, modifier) {
   let display = cm.display, startTime = +new Date
-  let dragEnd = operation(cm, function(e2) {
+  let dragEnd = operation(cm, e2 => {
     if (webkit) display.scroller.draggable = false
     cm.state.draggingText = false
     off(document, "mouseup", dragEnd)
@@ -100,7 +100,7 @@ function leftButtonStartDrag(cm, e, start, modifier) {
         extendSelection(cm.doc, start)
       // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
       if (webkit || ie && ie_version == 9)
-        setTimeout(function() {document.body.focus(); display.input.focus()}, 20)
+        setTimeout(() => {document.body.focus(); display.input.focus()}, 20)
       else
         display.input.focus()
     }
@@ -230,10 +230,10 @@ function leftButtonSelect(cm, e, start, type, addNew) {
       extendTo(cur)
       let visible = visibleLines(display, doc)
       if (cur.line >= visible.to || cur.line < visible.from)
-        setTimeout(operation(cm, function(){if (counter == curCount) extend(e)}), 150)
+        setTimeout(operation(cm, () => {if (counter == curCount) extend(e)}), 150)
     } else {
       let outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0
-      if (outside) setTimeout(operation(cm, function() {
+      if (outside) setTimeout(operation(cm, () => {
         if (counter != curCount) return
         display.scroller.scrollTop += outside
         extend(e)
@@ -251,7 +251,7 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     doc.history.lastSelOrigin = null
   }
 
-  let move = operation(cm, function(e) {
+  let move = operation(cm, e => {
     if (!e_button(e)) done(e)
     else extend(e)
   })
diff --git a/src/edit/options.js b/src/edit/options.js
index a2ca1c6803..ea19d5ba2a 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -28,7 +28,7 @@ export function defineOptions(CodeMirror) {
   function option(name, deflt, handle, notOnInit) {
     CodeMirror.defaults[name] = deflt
     if (handle) optionHandlers[name] =
-      notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old)} : handle
+      notOnInit ? (cm, val, old) => {if (old != Init) handle(cm, val, old)} : handle
   }
 
   CodeMirror.defineOption = option
@@ -38,10 +38,8 @@ export function defineOptions(CodeMirror) {
 
   // These two are, on init, called from the constructor because they
   // have to be initialized before the editor can start at all.
-  option("value", "", function(cm, val) {
-    cm.setValue(val)
-  }, true)
-  option("mode", null, function(cm, val) {
+  option("value", "", (cm, val) => cm.setValue(val), true)
+  option("mode", null, (cm, val) => {
     cm.doc.modeOption = val
     loadMode(cm)
   }, true)
@@ -49,16 +47,16 @@ export function defineOptions(CodeMirror) {
   option("indentUnit", 2, loadMode, true)
   option("indentWithTabs", false)
   option("smartIndent", true)
-  option("tabSize", 4, function(cm) {
+  option("tabSize", 4, cm => {
     resetModeState(cm)
     clearCaches(cm)
     regChange(cm)
   }, true)
-  option("lineSeparator", null, function(cm, val) {
+  option("lineSeparator", null, (cm, val) => {
     cm.doc.lineSep = val
     if (!val) return
     let newBreaks = [], lineNo = cm.doc.first
-    cm.doc.iter(function(line) {
+    cm.doc.iter(line => {
       for (let pos = 0;;) {
         let found = line.text.indexOf(val, pos)
         if (found == -1) break
@@ -70,26 +68,24 @@ export function defineOptions(CodeMirror) {
     for (let i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   })
-  option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
+  option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
     if (old != Init) cm.refresh()
   })
-  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh()}, true)
+  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, cm => cm.refresh(), true)
   option("electricChars", true)
-  option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
+  option("inputStyle", mobile ? "contenteditable" : "textarea", () => {
     throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME
   }, true)
-  option("spellcheck", false, function(cm, val) {
-    cm.getInputField().spellcheck = val
-  }, true)
+  option("spellcheck", false, (cm, val) => cm.getInputField().spellcheck = val, true)
   option("rtlMoveVisually", !windows)
   option("wholeLineUpdateBefore", true)
 
-  option("theme", "default", function(cm) {
+  option("theme", "default", cm => {
     themeChanged(cm)
     guttersChanged(cm)
   }, true)
-  option("keyMap", "default", function(cm, val, old) {
+  option("keyMap", "default", (cm, val, old) => {
     let next = getKeyMap(val)
     let prev = old != Init && getKeyMap(old)
     if (prev && prev.detach) prev.detach(cm, next)
@@ -98,33 +94,33 @@ export function defineOptions(CodeMirror) {
   option("extraKeys", null)
 
   option("lineWrapping", false, wrappingChanged, true)
-  option("gutters", [], function(cm) {
+  option("gutters", [], cm => {
     setGuttersForLineNumbers(cm.options)
     guttersChanged(cm)
   }, true)
-  option("fixedGutter", true, function(cm, val) {
+  option("fixedGutter", true, (cm, val) => {
     cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"
     cm.refresh()
   }, true)
-  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm)}, true)
-  option("scrollbarStyle", "native", function(cm) {
+  option("coverGutterNextToScrollbar", false, cm => updateScrollbars(cm), true)
+  option("scrollbarStyle", "native", cm => {
     initScrollbars(cm)
     updateScrollbars(cm)
     cm.display.scrollbars.setScrollTop(cm.doc.scrollTop)
     cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft)
   }, true)
-  option("lineNumbers", false, function(cm) {
+  option("lineNumbers", false, cm => {
     setGuttersForLineNumbers(cm.options)
     guttersChanged(cm)
   }, true)
   option("firstLineNumber", 1, guttersChanged, true)
-  option("lineNumberFormatter", function(integer) {return integer}, guttersChanged, true)
+  option("lineNumberFormatter", integer => integer, guttersChanged, true)
   option("showCursorWhenSelecting", false, updateSelection, true)
 
   option("resetSelectionOnContextMenu", true)
   option("lineWiseCopyCut", true)
 
-  option("readOnly", false, function(cm, val) {
+  option("readOnly", false, (cm, val) => {
     if (val == "nocursor") {
       onBlur(cm)
       cm.display.input.blur()
@@ -134,7 +130,7 @@ export function defineOptions(CodeMirror) {
     }
     cm.display.input.readOnlyChanged(val)
   })
-  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset()}, true)
+  option("disableInput", false, (cm, val) => {if (!val) cm.display.input.reset()}, true)
   option("dragDrop", true, dragDropChanged)
   option("allowDropFileTypes", null)
 
@@ -147,24 +143,22 @@ export function defineOptions(CodeMirror) {
   option("flattenSpans", true, resetModeState, true)
   option("addModeClass", false, resetModeState, true)
   option("pollInterval", 100)
-  option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val})
+  option("undoDepth", 200, (cm, val) => cm.doc.history.undoDepth = val)
   option("historyEventDelay", 1250)
-  option("viewportMargin", 10, function(cm){cm.refresh()}, true)
+  option("viewportMargin", 10, cm => cm.refresh(), true)
   option("maxHighlightLength", 10000, resetModeState, true)
-  option("moveInputWithCursor", true, function(cm, val) {
+  option("moveInputWithCursor", true, (cm, val) => {
     if (!val) cm.display.input.resetPosition()
   })
 
-  option("tabindex", null, function(cm, val) {
-    cm.display.input.getField().tabIndex = val || ""
-  })
+  option("tabindex", null, (cm, val) => cm.display.input.getField().tabIndex = val || "")
   option("autofocus", null)
 }
 
 function guttersChanged(cm) {
   updateGutters(cm)
   regChange(cm)
-  setTimeout(function(){alignHorizontally(cm)}, 20)
+  setTimeout(() => alignHorizontally(cm), 20)
 }
 
 function dragDropChanged(cm, value, old) {
@@ -192,5 +186,5 @@ function wrappingChanged(cm) {
   estimateLineHeights(cm)
   regChange(cm)
   clearCaches(cm)
-  setTimeout(function(){updateScrollbars(cm)}, 100)
+  setTimeout(() => updateScrollbars(cm), 100)
 }
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 80e91f847f..59ef55fa9d 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -29,15 +29,15 @@ ContentEditableInput.prototype = copyObj({
     let div = input.div = display.lineDiv
     disableBrowserMagic(div, cm.options.spellcheck)
 
-    on(div, "paste", function(e) {
+    on(div, "paste", e => {
       if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
       // IE doesn't fire input events, so we schedule a read for the pasted content in this way
-      if (ie_version <= 11) setTimeout(operation(cm, function() {
+      if (ie_version <= 11) setTimeout(operation(cm, () => {
         if (!input.pollContent()) regChange(cm)
       }), 20)
     })
 
-    on(div, "compositionstart", function(e) {
+    on(div, "compositionstart", e => {
       let data = e.data
       input.composing = {sel: cm.doc.sel, data: data, startData: data}
       if (!data) return
@@ -48,10 +48,8 @@ ContentEditableInput.prototype = copyObj({
         input.composing.sel = simpleSelection(Pos(prim.head.line, found),
                                               Pos(prim.head.line, found + data.length))
     })
-    on(div, "compositionupdate", function(e) {
-      input.composing.data = e.data
-    })
-    on(div, "compositionend", function(e) {
+    on(div, "compositionupdate", e => input.composing.data = e.data)
+    on(div, "compositionend", e => {
       let ours = input.composing
       if (!ours) return
       if (e.data != ours.startData && !/\u200b/.test(e.data))
@@ -59,7 +57,7 @@ ContentEditableInput.prototype = copyObj({
       // Need a small delay to prevent other code (input event,
       // selection polling) from doing damage when fired right after
       // compositionend.
-      setTimeout(function() {
+      setTimeout(() => {
         if (!ours.handled)
           input.applyComposition(ours)
         if (input.composing == ours)
@@ -67,14 +65,12 @@ ContentEditableInput.prototype = copyObj({
       }, 50)
     })
 
-    on(div, "touchstart", function() {
-      input.forceCompositionEnd()
-    })
+    on(div, "touchstart", () => input.forceCompositionEnd())
 
-    on(div, "input", function() {
+    on(div, "input", () => {
       if (input.composing) return
       if (cm.isReadOnly() || !input.pollContent())
-        runInOp(input.cm, function() {regChange(cm)})
+        runInOp(input.cm, () => regChange(cm))
     })
 
     function onCopyCut(e) {
@@ -88,7 +84,7 @@ ContentEditableInput.prototype = copyObj({
         let ranges = copyableRanges(cm)
         setLastCopied({lineWise: true, text: ranges.text})
         if (e.type == "cut") {
-          cm.operation(function() {
+          cm.operation(() => {
             cm.setSelections(ranges.ranges, 0, sel_dontScroll)
             cm.replaceSelection("", null, "cut")
           })
@@ -110,7 +106,7 @@ ContentEditableInput.prototype = copyObj({
       te.value = lastCopied.text.join("\n")
       let hadFocus = document.activeElement
       selectInput(te)
-      setTimeout(function() {
+      setTimeout(() => {
         cm.display.lineSpace.removeChild(kludge)
         hadFocus.focus()
         if (hadFocus == div) input.showPrimarySelection()
@@ -175,10 +171,10 @@ ContentEditableInput.prototype = copyObj({
   startGracePeriod: function() {
     let input = this
     clearTimeout(this.gracePeriod)
-    this.gracePeriod = setTimeout(function() {
+    this.gracePeriod = setTimeout(() => {
       input.gracePeriod = false
       if (input.selectionChanged())
-        input.cm.operation(function() { input.cm.curOp.selectionChanged = true })
+        input.cm.operation(() => input.cm.curOp.selectionChanged = true)
     }, 20)
   },
 
@@ -213,7 +209,7 @@ ContentEditableInput.prototype = copyObj({
     if (this.selectionInEditor())
       this.pollSelection()
     else
-      runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true })
+      runInOp(this.cm, () => input.cm.curOp.selectionChanged = true)
 
     function poll() {
       if (input.cm.state.focused) {
@@ -236,7 +232,7 @@ ContentEditableInput.prototype = copyObj({
       this.rememberSelection()
       let anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
       let head = domToPos(cm, sel.focusNode, sel.focusOffset)
-      if (anchor && head) runInOp(cm, function() {
+      if (anchor && head) runInOp(cm, () => {
         setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll)
         if (anchor.bad || head.bad) cm.curOp.selectionChanged = true
       })
@@ -356,7 +352,7 @@ function badPos(pos, bad) { if (bad) pos.bad = true; return pos }
 
 function domTextBetween(cm, from, to, fromLine, toLine) {
   let text = "", closing = false, lineSep = cm.doc.lineSeparator()
-  function recognizeMarker(id) { return function(marker) { return marker.id == id } }
+  function recognizeMarker(id) { return marker => marker.id == id }
   function walk(node) {
     if (node.nodeType == 1) {
       let cmText = node.getAttribute("cm-text")
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index e244a2d168..17f6f599cd 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -46,12 +46,12 @@ TextareaInput.prototype = copyObj({
     // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
     if (ios) te.style.width = "0px"
 
-    on(te, "input", function() {
+    on(te, "input", () => {
       if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null
       input.poll()
     })
 
-    on(te, "paste", function(e) {
+    on(te, "paste", e => {
       if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
 
       cm.state.pasteIncoming = true
@@ -86,18 +86,18 @@ TextareaInput.prototype = copyObj({
     on(te, "cut", prepareCopyCut)
     on(te, "copy", prepareCopyCut)
 
-    on(display.scroller, "paste", function(e) {
+    on(display.scroller, "paste", e => {
       if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return
       cm.state.pasteIncoming = true
       input.focus()
     })
 
     // Prevent normal selection in the editor (we handle our own)
-    on(display.lineSpace, "selectstart", function(e) {
+    on(display.lineSpace, "selectstart", e => {
       if (!eventInWidget(display, e)) e_preventDefault(e)
     })
 
-    on(te, "compositionstart", function() {
+    on(te, "compositionstart", () => {
       let start = cm.getCursor("from")
       if (input.composing) input.composing.range.clear()
       input.composing = {
@@ -105,7 +105,7 @@ TextareaInput.prototype = copyObj({
         range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
       }
     })
-    on(te, "compositionend", function() {
+    on(te, "compositionend", () => {
       if (input.composing) {
         input.poll()
         input.composing.range.clear()
@@ -187,7 +187,7 @@ TextareaInput.prototype = copyObj({
   slowPoll: function() {
     let input = this
     if (input.pollingFast) return
-    input.polling.set(this.cm.options.pollInterval, function() {
+    input.polling.set(this.cm.options.pollInterval, () => {
       input.poll()
       if (input.cm.state.focused) input.slowPoll()
     })
@@ -246,7 +246,7 @@ TextareaInput.prototype = copyObj({
     while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same
 
     let self = this
-    runInOp(cm, function() {
+    runInOp(cm, () => {
       applyTextInput(cm, text.slice(same), prevInput.length - same,
                      null, self.composing ? "*compose" : null)
 
@@ -326,7 +326,7 @@ TextareaInput.prototype = copyObj({
       // Try to detect the user choosing select-all
       if (te.selectionStart != null) {
         if (!ie || (ie && ie_version < 9)) prepareSelectAllHack()
-        let i = 0, poll = function() {
+        let i = 0, poll = () => {
           if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
               te.selectionEnd > 0 && input.prevInput == "\u200b")
             operation(cm, selectAll)(cm)
@@ -340,7 +340,7 @@ TextareaInput.prototype = copyObj({
     if (ie && ie_version >= 9) prepareSelectAllHack()
     if (captureRightClick) {
       e_stop(e)
-      let mouseup = function() {
+      let mouseup = () => {
         off(window, "mouseup", mouseup)
         setTimeout(rehide, 20)
       }
diff --git a/src/input/input.js b/src/input/input.js
index 6cc3e9111f..e51a90a119 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -35,7 +35,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
           multiPaste.push(doc.splitLines(lastCopied.text[i]))
       }
     } else if (textLines.length == sel.ranges.length) {
-      multiPaste = map(textLines, function(l) { return [l] })
+      multiPaste = map(textLines, l => [l])
     }
   }
 
@@ -72,7 +72,7 @@ export function handlePaste(e, cm) {
   if (pasted) {
     e.preventDefault()
     if (!cm.isReadOnly() && !cm.options.disableInput)
-      runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste") })
+      runInOp(cm, () => applyTextInput(cm, pasted, 0, null, "paste"))
     return true
   }
 }
diff --git a/src/line/highlight.js b/src/line/highlight.js
index 8fd6d47b99..f54e7eaa56 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -14,14 +14,13 @@ export function highlightLine(cm, line, state, forceToEnd) {
   // mode/overlays that it is based on (for easy invalidation).
   let st = [cm.state.modeGen], lineClasses = {}
   // Compute the base array of styles
-  runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
-    st.push(end, style)
-  }, lineClasses, forceToEnd)
+  runMode(cm, line.text, cm.doc.mode, state, (end, style) => st.push(end, style),
+    lineClasses, forceToEnd)
 
   // Run overlays, adjust style array.
   for (let o = 0; o < cm.state.overlays.length; ++o) {
     let overlay = cm.state.overlays[o], i = 1, at = 0
-    runMode(cm, line.text, overlay.mode, true, function(end, style) {
+    runMode(cm, line.text, overlay.mode, true, (end, style) => {
       let start = i
       // Ensure there's a token end at the current position, and that i points at it
       while (at < end) {
@@ -66,7 +65,7 @@ export function getStateBefore(cm, n, precise) {
   let pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter
   if (!state) state = startState(doc.mode)
   else state = copyState(doc.mode, state)
-  doc.iter(pos, n, function(line) {
+  doc.iter(pos, n, line => {
     processLine(cm, line.text, state)
     let save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo
     line.stateAfter = save ? copyState(doc.mode, state) : null
@@ -108,12 +107,12 @@ export function readToken(mode, stream, state, inner) {
 
 // Utility for getTokenAt and getLineTokens
 export function takeToken(cm, pos, precise, asArray) {
-  function getObj(copy) {
-    return {start: stream.start, end: stream.pos,
-            string: stream.current(),
-            type: style || null,
-            state: copy ? copyState(doc.mode, state) : state}
-  }
+  let getObj = copy => ({
+    start: stream.start, end: stream.pos,
+    string: stream.current(),
+    type: style || null,
+    state: copy ? copyState(doc.mode, state) : state
+  })
 
   let doc = cm.doc, mode = doc.mode, style
   pos = clipPos(doc, pos)
diff --git a/src/line/line_data.js b/src/line/line_data.js
index 7a3a412211..93b57577da 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -202,7 +202,7 @@ function splitSpaces(text, trailingBefore) {
 // Work around nonsense dimensions being reported for stretches of
 // right-to-left text.
 function buildTokenBadBidi(inner, order) {
-  return function(builder, text, style, startStyle, endStyle, title, css) {
+  return (builder, text, style, startStyle, endStyle, title, css) => {
     style = style ? style + " cm-force-border" : "cm-force-border"
     let start = builder.pos, end = start + text.length
     for (;;) {
diff --git a/src/line/spans.js b/src/line/spans.js
index 63acacfc83..267ee7182c 100644
--- a/src/line/spans.js
+++ b/src/line/spans.js
@@ -143,7 +143,7 @@ function clearEmptySpans(spans) {
 // Used to 'clip' out readOnly ranges when making a change.
 export function removeReadOnlyRanges(doc, from, to) {
   let markers = null
-  doc.iter(from.line, to.line + 1, function(line) {
+  doc.iter(from.line, to.line + 1, line => {
     if (line.markedSpans) for (let i = 0; i < line.markedSpans.length; ++i) {
       let mark = line.markedSpans[i].marker
       if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
@@ -355,7 +355,7 @@ export function findMaxLine(cm) {
   d.maxLine = getLine(doc, doc.first)
   d.maxLineLength = lineLength(d.maxLine)
   d.maxLineChanged = true
-  doc.iter(function(line) {
+  doc.iter(line => {
     let len = lineLength(line)
     if (len > d.maxLineLength) {
       d.maxLineLength = len
diff --git a/src/line/utils_line.js b/src/line/utils_line.js
index 647c07791e..e4e6943f55 100644
--- a/src/line/utils_line.js
+++ b/src/line/utils_line.js
@@ -19,7 +19,7 @@ export function getLine(doc, n) {
 // strings.
 export function getBetween(doc, start, end) {
   let out = [], n = start.line
-  doc.iter(start.line, end.line + 1, function(line) {
+  doc.iter(start.line, end.line + 1, line => {
     let text = line.text
     if (n == end.line) text = text.slice(0, end.ch)
     if (n == start.line) text = text.slice(start.ch)
@@ -31,7 +31,7 @@ export function getBetween(doc, start, end) {
 // Get the lines between from and to, as array of strings.
 export function getLines(doc, from, to) {
   let out = []
-  doc.iter(from, to, function(line) { out.push(line.text) })
+  doc.iter(from, to, line => { out.push(line.text) }) // iter aborts when callback returns truthy value
   return out
 }
 
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 63e3771b1f..5688836ee0 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -525,7 +525,7 @@ export function compensateForHScroll(display) {
 export function estimateHeight(cm) {
   let th = textHeight(cm.display), wrapping = cm.options.lineWrapping
   let perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3)
-  return function(line) {
+  return line => {
     if (lineIsHidden(cm.doc, line)) return 0
 
     let widgetsHeight = 0
@@ -542,7 +542,7 @@ export function estimateHeight(cm) {
 
 export function estimateLineHeights(cm) {
   let doc = cm.doc, est = estimateHeight(cm)
-  doc.iter(function(line) {
+  doc.iter(line => {
     let estHeight = est(line)
     if (estHeight != line.height) updateLineHeight(line, estHeight)
   })
diff --git a/src/model/Doc.js b/src/model/Doc.js
index c02fe062f1..fcb2c1e109 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -220,7 +220,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   },
 
   addLineClass: docMethodOp(function(handle, where, cls) {
-    return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+    return changeLine(this, handle, where == "gutter" ? "gutter" : "class", line => {
       let prop = where == "text" ? "textClass"
                : where == "background" ? "bgClass"
                : where == "gutter" ? "gutterClass" : "wrapClass"
@@ -231,7 +231,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     })
   }),
   removeLineClass: docMethodOp(function(handle, where, cls) {
-    return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+    return changeLine(this, handle, where == "gutter" ? "gutter" : "class", line => {
       let prop = where == "text" ? "textClass"
                : where == "background" ? "bgClass"
                : where == "gutter" ? "gutterClass" : "wrapClass"
@@ -278,7 +278,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   findMarks: function(from, to, filter) {
     from = clipPos(this, from); to = clipPos(this, to)
     let found = [], lineNo = from.line
-    this.iter(from.line, to.line + 1, function(line) {
+    this.iter(from.line, to.line + 1, line => {
       let spans = line.markedSpans
       if (spans) for (let i = 0; i < spans.length; i++) {
         let span = spans[i]
@@ -294,7 +294,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   },
   getAllMarks: function() {
     let markers = []
-    this.iter(function(line) {
+    this.iter(line => {
       let sps = line.markedSpans
       if (sps) for (let i = 0; i < sps.length; ++i)
         if (sps[i].from != null) markers.push(sps[i].marker)
@@ -304,7 +304,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
 
   posFromIndex: function(off) {
     let ch, lineNo = this.first, sepSize = this.lineSeparator().length
-    this.iter(function(line) {
+    this.iter(line => {
       let sz = line.text.length + sepSize
       if (sz > off) { ch = off; return true }
       off -= sz
@@ -317,7 +317,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     let index = coords.ch
     if (coords.line < this.first || coords.ch < 0) return 0
     let sepSize = this.lineSeparator().length
-    this.iter(this.first, coords.line, function (line) {
+    this.iter(this.first, coords.line, line => { // iter aborts when callback returns a truthy value
       index += line.text.length + sepSize
     })
     return index
@@ -361,7 +361,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     // If the histories were shared, split them again
     if (other.history == this.history) {
       let splitIds = [other.id]
-      linkedDocs(other, function(doc) {splitIds.push(doc.id)}, true)
+      linkedDocs(other, doc => splitIds.push(doc.id), true)
       other.history = new History(null)
       other.history.done = copyHistoryArray(this.history.done, splitIds)
       other.history.undone = copyHistoryArray(this.history.undone, splitIds)
diff --git a/src/model/changes.js b/src/model/changes.js
index e39bc30392..c6692d4c5a 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -26,13 +26,13 @@ function filterChange(doc, change, update) {
     to: change.to,
     text: change.text,
     origin: change.origin,
-    cancel: function() { this.canceled = true }
+    cancel: () => obj.canceled = true
   }
-  if (update) obj.update = function(from, to, text, origin) {
-    if (from) this.from = clipPos(doc, from)
-    if (to) this.to = clipPos(doc, to)
-    if (text) this.text = text
-    if (origin !== undefined) this.origin = origin
+  if (update) obj.update = (from, to, text, origin) => {
+    if (from) obj.from = clipPos(doc, from)
+    if (to) obj.to = clipPos(doc, to)
+    if (text) obj.text = text
+    if (origin !== undefined) obj.origin = origin
   }
   signal(doc, "beforeChange", doc, obj)
   if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj)
@@ -73,7 +73,7 @@ function makeChangeInner(doc, change) {
   makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change))
   let rebased = []
 
-  linkedDocs(doc, function(doc, sharedHist) {
+  linkedDocs(doc, (doc, sharedHist) => {
     if (!sharedHist && indexOf(rebased, doc.history) == -1) {
       rebaseHist(doc.history, change)
       rebased.push(doc.history)
@@ -138,7 +138,7 @@ export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
     let rebased = []
 
     // Propagate to the linked documents
-    linkedDocs(doc, function(doc, sharedHist) {
+    linkedDocs(doc, (doc, sharedHist) => {
       if (!sharedHist && indexOf(rebased, doc.history) == -1) {
         rebaseHist(doc.history, change)
         rebased.push(doc.history)
@@ -153,10 +153,10 @@ export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
 function shiftDoc(doc, distance) {
   if (distance == 0) return
   doc.first += distance
-  doc.sel = new Selection(map(doc.sel.ranges, function(range) {
-    return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
-                     Pos(range.head.line + distance, range.head.ch))
-  }), doc.sel.primIndex)
+  doc.sel = new Selection(map(doc.sel.ranges, range => new Range(
+    Pos(range.anchor.line + distance, range.anchor.ch),
+    Pos(range.head.line + distance, range.head.ch)
+  )), doc.sel.primIndex)
   if (doc.cm) {
     regChange(doc.cm, doc.first, doc.first - distance, distance)
     for (let d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
@@ -205,7 +205,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
   let recomputeMaxLength = false, checkWidthStart = from.line
   if (!cm.options.lineWrapping) {
     checkWidthStart = lineNo(visualLine(getLine(doc, from.line)))
-    doc.iter(checkWidthStart, to.line + 1, function(line) {
+    doc.iter(checkWidthStart, to.line + 1, line => {
       if (line == display.maxLine) {
         recomputeMaxLength = true
         return true
@@ -219,7 +219,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
   updateDoc(doc, change, spans, estimateHeight(cm))
 
   if (!cm.options.lineWrapping) {
-    doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
+    doc.iter(checkWidthStart, from.line + change.text.length, line => {
       let len = lineLength(line)
       if (len > display.maxLineLength) {
         display.maxLine = line
diff --git a/src/model/history.js b/src/model/history.js
index 2a7502cb8e..83938cf4c1 100644
--- a/src/model/history.js
+++ b/src/model/history.js
@@ -28,7 +28,7 @@ export function History(startGen) {
 export function historyChangeFromChange(doc, change) {
   let histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)}
   attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1)
-  linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1)}, true)
+  linkedDocs(doc, doc => attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1), true)
   return histChange
 }
 
@@ -146,7 +146,7 @@ export function pushSelectionToHistory(sel, dest) {
 // Used to store marked span information in the history.
 function attachLocalSpans(doc, change, from, to) {
   let existing = change["spans_" + doc.id], n = 0
-  doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
+  doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), line => {
     if (line.markedSpans)
       (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans
     ++n
diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index 23b2381b95..e832e8c483 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -29,7 +29,7 @@ LineWidget.prototype.clear = function() {
   if (!ws.length) line.widgets = null
   let height = widgetHeight(this)
   updateLineHeight(line, Math.max(0, line.height - height))
-  if (cm) runInOp(cm, function() {
+  if (cm) runInOp(cm, () => {
     adjustScrollWhenAboveVisible(cm, line, -height)
     regLineChange(cm, no, "widget")
   })
@@ -40,7 +40,7 @@ LineWidget.prototype.changed = function() {
   let diff = widgetHeight(this) - oldH
   if (!diff) return
   updateLineHeight(line, line.height + diff)
-  if (cm) runInOp(cm, function() {
+  if (cm) runInOp(cm, () => {
     cm.curOp.forceUpdate = true
     adjustScrollWhenAboveVisible(cm, line, diff)
   })
@@ -50,7 +50,7 @@ export function addLineWidget(doc, handle, node, options) {
   let widget = new LineWidget(doc, node, options)
   let cm = doc.cm
   if (cm && widget.noHScroll) cm.display.alignWidgets = true
-  changeLine(doc, handle, "widget", function(line) {
+  changeLine(doc, handle, "widget", line => {
     let widgets = line.widgets || (line.widgets = [])
     if (widget.insertAt == null) widgets.push(widget)
     else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget)
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index f15cefb29a..4250288ef3 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -111,7 +111,7 @@ TextMarker.prototype.find = function(side, lineObj) {
 TextMarker.prototype.changed = function() {
   let pos = this.find(-1, true), widget = this, cm = this.doc.cm
   if (!pos || !cm) return
-  runInOp(cm, function() {
+  runInOp(cm, () => {
     let line = pos.line, lineN = lineNo(pos.line)
     let view = findViewForLine(cm, lineN)
     if (view) {
@@ -177,7 +177,7 @@ export function markText(doc, from, to, options, type) {
     addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN)
 
   let curLine = from.line, cm = doc.cm, updateMaxLine
-  doc.iter(curLine, to.line + 1, function(line) {
+  doc.iter(curLine, to.line + 1, line => {
     if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
       updateMaxLine = true
     if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0)
@@ -187,11 +187,11 @@ export function markText(doc, from, to, options, type) {
     ++curLine
   })
   // lineIsHidden depends on the presence of the spans, so needs a second pass
-  if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
+  if (marker.collapsed) doc.iter(from.line, to.line + 1, line => {
     if (lineIsHidden(doc, line)) updateLineHeight(line, 0)
   })
 
-  if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear() })
+  if (marker.clearOnEnter) on(marker, "beforeCursorEnter", () => marker.clear())
 
   if (marker.readOnly) {
     seeReadOnlySpans()
@@ -244,7 +244,7 @@ function markTextShared(doc, from, to, options, type) {
   options.shared = false
   let markers = [markText(doc, from, to, options, type)], primary = markers[0]
   let widget = options.widgetNode
-  linkedDocs(doc, function(doc) {
+  linkedDocs(doc, doc => {
     if (widget) options.widgetNode = widget.cloneNode(true)
     markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type))
     for (let i = 0; i < doc.linked.length; ++i)
@@ -255,8 +255,7 @@ function markTextShared(doc, from, to, options, type) {
 }
 
 export function findSharedMarkers(doc) {
-  return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())),
-                       function(m) { return m.parent })
+  return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), m => m.parent)
 }
 
 export function copySharedMarkers(doc, markers) {
@@ -274,7 +273,7 @@ export function copySharedMarkers(doc, markers) {
 export function detachSharedMarkers(markers) {
   for (let i = 0; i < markers.length; i++) {
     let marker = markers[i], linked = [marker.primary.doc]
-    linkedDocs(marker.primary.doc, function(d) { linked.push(d) })
+    linkedDocs(marker.primary.doc, d => linked.push(d))
     for (let j = 0; j < marker.markers.length; j++) {
       let subMarker = marker.markers[j]
       if (indexOf(linked, subMarker.doc) == -1) {
diff --git a/src/model/selection.js b/src/model/selection.js
index 63371954e1..120af2a45c 100644
--- a/src/model/selection.js
+++ b/src/model/selection.js
@@ -61,7 +61,7 @@ Range.prototype = {
 // it).
 export function normalizeSelection(ranges, primIndex) {
   let prim = ranges[primIndex]
-  ranges.sort(function(a, b) { return cmp(a.from(), b.from()) })
+  ranges.sort((a, b) => cmp(a.from(), b.from()))
   primIndex = indexOf(ranges, prim)
   for (let i = 1; i < ranges.length; i++) {
     let cur = ranges[i], prev = ranges[i - 1]
diff --git a/src/util/StringStream.js b/src/util/StringStream.js
index cf7b8244a9..92dbc69062 100644
--- a/src/util/StringStream.js
+++ b/src/util/StringStream.js
@@ -57,7 +57,7 @@ StringStream.prototype = {
   },
   match: function(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
-      let cased = function(str) {return caseInsensitive ? str.toLowerCase() : str}
+      let cased = str => caseInsensitive ? str.toLowerCase() : str
       let substr = this.string.substr(this.pos, pattern.length)
       if (cased(substr) == cased(pattern)) {
         if (consume !== false) this.pos += pattern.length
diff --git a/src/util/feature_detection.js b/src/util/feature_detection.js
index d98393af90..e65881d4ca 100644
--- a/src/util/feature_detection.js
+++ b/src/util/feature_detection.js
@@ -38,7 +38,7 @@ export function hasBadBidiRects(measure) {
 
 // See if "".split is the broken IE version, if so, provide an
 // alternative way to split lines.
-export let splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) {
+export let splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? string => {
   let pos = 0, result = [], l = string.length
   while (pos <= l) {
     let nl = string.indexOf("\n", pos)
@@ -54,12 +54,12 @@ export let splitLinesAuto = "\n\nb".split(/\n/).length != 3 ? function(string) {
     }
   }
   return result
-} : function(string){return string.split(/\r\n?|\n/)}
+} : string => string.split(/\r\n?|\n/)
 
-export let hasSelection = window.getSelection ? function(te) {
+export let hasSelection = window.getSelection ? te => {
   try { return te.selectionStart != te.selectionEnd }
   catch(e) { return false }
-} : function(te) {
+} : te => {
   let range
   try {range = te.ownerDocument.selection.createRange()}
   catch(e) {}
@@ -67,7 +67,7 @@ export let hasSelection = window.getSelection ? function(te) {
   return range.compareEndPoints("StartToEnd", range) != 0
 }
 
-export let hasCopyEvent = (function() {
+export let hasCopyEvent = (() => {
   let e = elt("div")
   if ("oncopy" in e) return true
   e.setAttribute("oncopy", "return;")
diff --git a/src/util/operation_group.js b/src/util/operation_group.js
index d743f994e5..f50da343a9 100644
--- a/src/util/operation_group.js
+++ b/src/util/operation_group.js
@@ -61,9 +61,8 @@ export function signalLater(emitter, type /*, values...*/) {
     list = orphanDelayedCallbacks = []
     setTimeout(fireOrphanDelayed, 0)
   }
-  function bnd(f) {return function(){f.apply(null, args)}}
   for (let i = 0; i < arr.length; ++i)
-    list.push(bnd(arr[i]))
+    list.push(() => arr[i].apply(null, args))
 }
 
 function fireOrphanDelayed() {

From cef4089021830fc17e8374619a008ead8fb57d90 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 30 Sep 2016 10:27:29 +0200
Subject: [PATCH 2901/4742] Remove a few vars that worked around this-binding
 issue

---
 src/edit/CodeMirror.js            |  6 ++---
 src/edit/methods.js               | 38 +++++++++++++++----------------
 src/input/ContentEditableInput.js |  7 +++---
 src/input/TextareaInput.js        | 24 +++++++++----------
 4 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 909ffcb185..7e17002d15 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -64,11 +64,9 @@ export function CodeMirror(place, options) {
     specialChars: null
   }
 
-  let cm = this
-
   // Override magic textarea content restore that IE sometimes does
   // on our hidden textarea on reload
-  if (ie && ie_version < 11) setTimeout(() => cm.display.input.reset(true), 20)
+  if (ie && ie_version < 11) setTimeout(() => this.display.input.reset(true), 20)
 
   registerEventHandlers(this)
   ensureGlobalHandlers()
@@ -77,7 +75,7 @@ export function CodeMirror(place, options) {
   this.curOp.forceUpdate = true
   attachDoc(this, doc)
 
-  if ((options.autofocus && !mobile) || cm.hasFocus())
+  if ((options.autofocus && !mobile) || this.hasFocus())
     setTimeout(bind(onFocus, this), 20)
   else
     onBlur(this)
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 260ffa5df2..f609d912e0 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -228,11 +228,11 @@ export default function(CodeMirror) {
     }),
 
     clearGutter: methodOp(function(gutterID) {
-      let cm = this, doc = cm.doc, i = doc.first
+      let doc = this.doc, i = doc.first
       doc.iter(line => {
         if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
           line.gutterMarkers[gutterID] = null
-          regLineChange(cm, i, "gutter")
+          regLineChange(this, i, "gutter")
           if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null
         }
         ++i
@@ -315,10 +315,9 @@ export default function(CodeMirror) {
     },
 
     moveH: methodOp(function(dir, unit) {
-      let cm = this
-      cm.extendSelectionsBy(range => {
-        if (cm.display.shift || cm.doc.extend || range.empty())
-          return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually)
+      this.extendSelectionsBy(range => {
+        if (this.display.shift || this.doc.extend || range.empty())
+          return findPosH(this.doc, range.head, dir, unit, this.options.rtlMoveVisually)
         else
           return dir < 0 ? range.from() : range.to()
       }, sel_move)
@@ -350,17 +349,17 @@ export default function(CodeMirror) {
     },
 
     moveV: methodOp(function(dir, unit) {
-      let cm = this, doc = this.doc, goals = []
-      let collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected()
+      let doc = this.doc, goals = []
+      let collapse = !this.display.shift && !doc.extend && doc.sel.somethingSelected()
       doc.extendSelectionsBy(range => {
         if (collapse)
           return dir < 0 ? range.from() : range.to()
-        let headPos = cursorCoords(cm, range.head, "div")
+        let headPos = cursorCoords(this, range.head, "div")
         if (range.goalColumn != null) headPos.left = range.goalColumn
         goals.push(headPos.left)
-        let pos = findPosV(cm, headPos, dir, unit)
+        let pos = findPosV(this, headPos, dir, unit)
         if (unit == "page" && range == doc.sel.primary())
-          addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top)
+          addToScrollPos(this, null, charCoords(this, pos, "div").top - headPos.top)
         return pos
       }, sel_move)
       if (goals.length) for (let i = 0; i < doc.sel.ranges.length; i++)
@@ -435,19 +434,18 @@ export default function(CodeMirror) {
     }),
 
     setSize: methodOp(function(width, height) {
-      let cm = this
       let interpret = val => typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val
-      if (width != null) cm.display.wrapper.style.width = interpret(width)
-      if (height != null) cm.display.wrapper.style.height = interpret(height)
-      if (cm.options.lineWrapping) clearLineMeasurementCache(this)
-      let lineNo = cm.display.viewFrom
-      cm.doc.iter(lineNo, cm.display.viewTo, line => {
+      if (width != null) this.display.wrapper.style.width = interpret(width)
+      if (height != null) this.display.wrapper.style.height = interpret(height)
+      if (this.options.lineWrapping) clearLineMeasurementCache(this)
+      let lineNo = this.display.viewFrom
+      this.doc.iter(lineNo, this.display.viewTo, line => {
         if (line.widgets) for (let i = 0; i < line.widgets.length; i++)
-          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break }
+          if (line.widgets[i].noHScroll) { regLineChange(this, lineNo, "widget"); break }
         ++lineNo
       })
-      cm.curOp.forceUpdate = true
-      signal(cm, "refresh", this)
+      this.curOp.forceUpdate = true
+      signal(this, "refresh", this)
     }),
 
     operation: function(f){return runInOp(this, f)},
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 59ef55fa9d..fbb327f034 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -169,12 +169,11 @@ ContentEditableInput.prototype = copyObj({
   },
 
   startGracePeriod: function() {
-    let input = this
     clearTimeout(this.gracePeriod)
     this.gracePeriod = setTimeout(() => {
-      input.gracePeriod = false
-      if (input.selectionChanged())
-        input.cm.operation(() => input.cm.curOp.selectionChanged = true)
+      this.gracePeriod = false
+      if (this.selectionChanged())
+        this.cm.operation(() => this.cm.curOp.selectionChanged = true)
     }, 20)
   },
 
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 17f6f599cd..3193aa6890 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -47,7 +47,7 @@ TextareaInput.prototype = copyObj({
     if (ios) te.style.width = "0px"
 
     on(te, "input", () => {
-      if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null
+      if (ie && ie_version >= 9 && this.hasSelection) this.hasSelection = null
       input.poll()
     })
 
@@ -185,11 +185,10 @@ TextareaInput.prototype = copyObj({
   // Poll for input changes, using the normal rate of polling. This
   // runs as long as the editor is focused.
   slowPoll: function() {
-    let input = this
-    if (input.pollingFast) return
-    input.polling.set(this.cm.options.pollInterval, () => {
-      input.poll()
-      if (input.cm.state.focused) input.slowPoll()
+    if (this.pollingFast) return
+    this.polling.set(this.cm.options.pollInterval, () => {
+      this.poll()
+      if (this.cm.state.focused) this.slowPoll()
     })
   },
 
@@ -245,18 +244,17 @@ TextareaInput.prototype = copyObj({
     let same = 0, l = Math.min(prevInput.length, text.length)
     while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same
 
-    let self = this
     runInOp(cm, () => {
       applyTextInput(cm, text.slice(same), prevInput.length - same,
-                     null, self.composing ? "*compose" : null)
+                     null, this.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 (text.length > 1000 || text.indexOf("\n") > -1) input.value = this.prevInput = ""
+      else this.prevInput = text
 
-      if (self.composing) {
-        self.composing.range.clear()
-        self.composing.range = cm.markText(self.composing.start, cm.getCursor("to"),
+      if (this.composing) {
+        this.composing.range.clear()
+        this.composing.range = cm.markText(this.composing.start, cm.getCursor("to"),
                                            {className: "CodeMirror-composing"})
       }
     })

From 96cd8885ad759350273c71235493f6b225590442 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 29 Sep 2016 22:45:48 +0200
Subject: [PATCH 2902/4742] Convert a few long CSS strings to template strings

---
 src/display/scrolling.js       |  8 ++++----
 src/display/selection.js       |  6 +++---
 src/input/TextareaInput.js     |  8 ++++----
 src/measurement/update_line.js | 16 ++++++++--------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index d58efe0bcf..db9463cd04 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -17,10 +17,10 @@ export function maybeScrollWindow(cm, coords) {
   if (coords.top + box.top < 0) doScroll = true
   else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false
   if (doScroll != null && !phantom) {
-    let scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
-                         (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
-                         (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
-                         coords.left + "px; width: 2px;")
+    let scrollNode = elt("div", "\u200b", null, `position: absolute;
+                         top: ${coords.top - display.viewOffset - paddingTop(cm.display)}px;
+                         height: ${coords.bottom - coords.top + scrollGap(cm) + display.barHeight}px;
+                         left: ${coords.left}px; width: 2px;`)
     cm.display.lineSpace.appendChild(scrollNode)
     scrollNode.scrollIntoView(doScroll)
     cm.display.lineSpace.removeChild(scrollNode)
diff --git a/src/display/selection.js b/src/display/selection.js
index 8380de82e5..e3f912403a 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -57,9 +57,9 @@ function drawSelectionRange(cm, range, output) {
     if (top < 0) top = 0
     top = Math.round(top)
     bottom = Math.round(bottom)
-    fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
-                             "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) +
-                             "px; height: " + (bottom - top) + "px"))
+    fragment.appendChild(elt("div", null, "CodeMirror-selected", `position: absolute; left: ${left}px;
+                             top: ${top}px; width: ${width == null ? rightSide - left : width}px;
+                             height: ${bottom - top}px`))
   }
 
   function drawForLine(line, fromArg, toArg) {
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 3193aa6890..a150f05d16 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -284,10 +284,10 @@ TextareaInput.prototype = copyObj({
     let oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText
     input.wrapper.style.cssText = "position: absolute"
     let wrapperBox = input.wrapper.getBoundingClientRect()
-    te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
-      "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
-      (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
-      "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"
+    te.style.cssText = `position: absolute; width: 30px; height: 30px;
+      top: ${e.clientY - wrapperBox.top - 5}px; left: ${e.clientX - wrapperBox.left - 5}px;
+      z-index: 1000; background: ${ie ? "rgba(255, 255, 255, .05)" : "transparent"};
+      outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);`
     let oldScrollY
     if (webkit) oldScrollY = window.scrollY // Work around Chrome issue (#2712)
     display.input.focus()
diff --git a/src/measurement/update_line.js b/src/measurement/update_line.js
index 4a80a7666c..cbfa657b38 100644
--- a/src/measurement/update_line.js
+++ b/src/measurement/update_line.js
@@ -95,15 +95,15 @@ function updateLineGutter(cm, lineView, lineN, dims) {
   if (lineView.line.gutterClass) {
     let wrap = ensureLineWrapped(lineView)
     lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
-                                    "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
-                                    "px; width: " + dims.gutterTotalWidth + "px")
+                                    `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px
+                                    width: ${dims.gutterTotalWidth}px`)
     wrap.insertBefore(lineView.gutterBackground, lineView.text)
   }
   let markers = lineView.line.gutterMarkers
   if (cm.options.lineNumbers || markers) {
     let wrap = ensureLineWrapped(lineView)
-    let gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
-                                           (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px")
+    let gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", `left:
+                                           ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px`)
     cm.display.input.setUneditable(gutterWrap)
     wrap.insertBefore(gutterWrap, lineView.text)
     if (lineView.line.gutterClass)
@@ -112,13 +112,13 @@ function updateLineGutter(cm, lineView, lineN, dims) {
       lineView.lineNumber = gutterWrap.appendChild(
         elt("div", lineNumberFor(cm.options, lineN),
             "CodeMirror-linenumber CodeMirror-gutter-elt",
-            "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
-            + cm.display.lineNumInnerWidth + "px"))
+            `left: ${dims.gutterLeft["CodeMirror-linenumbers"]}px;
+            width: ${cm.display.lineNumInnerWidth}px`))
     if (markers) for (let k = 0; k < cm.options.gutters.length; ++k) {
       let id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]
       if (found)
-        gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
-                                   dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"))
+        gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt",
+                                   `left: ${dims.gutterLeft[id]}px; width: ${dims.gutterWidth[id]}px`))
     }
   }
 }

From 850671fa39bc5a6ab3c35340f22b87e1d98160eb Mon Sep 17 00:00:00 2001
From: Hasan Karahan <hasan.karahan@blackhan.com>
Date: Fri, 30 Sep 2016 14:41:17 +0400
Subject: [PATCH 2903/4742] Fix duplicate cm- prefix in overlay styling

Ensure that when an overlay is added that the class `cm-overlay` is
used to denote a `span` instead of `cm-cm-overlay` (with the `cm-`
prefix repeated twice).

* E.g. before fix:
```
<span class="cm-cm-overlay cm-spell-error">zpelling</span>
```

* And after fix:
```
<span class="cm-overlay cm-spell-error">zpelling</span>
```
---
 src/line/highlight.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/line/highlight.js b/src/line/highlight.js
index f54e7eaa56..dcf020adf7 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -32,12 +32,12 @@ export function highlightLine(cm, line, state, forceToEnd) {
       }
       if (!style) return
       if (overlay.opaque) {
-        st.splice(start, i - start, end, "cm-overlay " + style)
+        st.splice(start, i - start, end, "overlay " + style)
         i = start + 2
       } else {
         for (; start < i; start += 2) {
           let cur = st[start+1]
-          st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style
+          st[start+1] = (cur ? cur + " " : "") + "overlay " + style
         }
       }
     }, lineClasses)

From 920ecc1c6b82aa565a43702f3e7f1e766ab26849 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 30 Sep 2016 14:11:45 +0200
Subject: [PATCH 2904/4742] Fix ignoring of overlay styles in getTokenTypeAt

---
 src/edit/methods.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index f609d912e0..b63f9bd26b 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -136,7 +136,7 @@ export default function(CodeMirror) {
         else if (styles[mid * 2 + 1] < ch) before = mid + 1
         else { type = styles[mid * 2 + 2]; break }
       }
-      let cut = type ? type.indexOf("cm-overlay ") : -1
+      let cut = type ? type.indexOf("overlay ") : -1
       return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1)
     },
 

From 27018275ec6912f4cbdeadb11d89e96d54f48ce9 Mon Sep 17 00:00:00 2001
From: Kyle Kelley <rgbkrk@gmail.com>
Date: Sat, 1 Oct 2016 09:20:37 -0700
Subject: [PATCH 2905/4742] [real-world uses] Add nteract

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 1b272862b8..8db34cd9fa 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -123,6 +123,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.navigatecms.com">Navigate CMS</a></li>
       <li><a href="https://github.com/soliton4/nodeMirror">nodeMirror</a> (IDE project)</li>
       <li><a href="https://notex.ch">NoTex</a> (rST authoring)</li>
+      <li><a href="https://nteract.io">nteract</a> (interactive literate coding notebook)</li>
       <li><a href="http://oakoutliner.com">Oak</a> (online outliner)</li>
       <li><a href="http://www.greycampus.com/opencampus">OpenCampus</a></li>
       <li><a href="http://clrhome.org/asm/">ORG</a> (z80 assembly IDE)</li>

From 1233299f9f4e697102ad2d30f9cff5015d2623a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 2 Oct 2016 11:42:32 +0200
Subject: [PATCH 2906/4742] [python mode] Don't highlight comments with odd
 indentation as error

Closes #4276
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index efeed7f154..30f1428e3a 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -85,7 +85,7 @@
           var lineOffset = stream.indentation();
           if (lineOffset > scopeOffset)
             pushPyScope(state);
-          else if (lineOffset < scopeOffset && dedent(stream, state))
+          else if (lineOffset < scopeOffset && dedent(stream, state) && stream.peek() != "#")
             state.errorToken = true;
           return null;
         } else {

From 5f93b65403f06505f729b8336a0da8e7b46fe67c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 2 Oct 2016 12:11:40 +0200
Subject: [PATCH 2907/4742] [haskell mode] Make sure unfinished strings have
 token type string

To make closebrackets work with this mode

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

diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index fe0bab67ed..4197666a44 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -56,7 +56,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
       if (source.eat('\'')) {
         return "string";
       }
-      return "error";
+      return "string error";
     }
 
     if (ch == '"') {
@@ -166,7 +166,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
       }
     }
     setState(normal);
-    return "error";
+    return "string error";
   }
 
   function stringGap(source, setState) {
@@ -194,7 +194,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
       "module", "newtype", "of", "then", "type", "where", "_");
 
     setType("keyword")(
-      "\.\.", ":", "::", "=", "\\", "\"", "<-", "->", "@", "~", "=>");
+      "\.\.", ":", "::", "=", "\\", "<-", "->", "@", "~", "=>");
 
     setType("builtin")(
       "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "=<<",

From 4cedb7e56ad865ac5825a18de2ddae65def32cce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 2 Oct 2016 12:12:05 +0200
Subject: [PATCH 2908/4742] Add lib/codemirror.js to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f91c241f20..01019cf150 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 *.swp
 .idea
 *.iml
+/lib/codemirror.js

From 7dbaf144c085ccdccc9ee3b8e8fced2a349d7eda Mon Sep 17 00:00:00 2001
From: Leon Sorokin <leeoniya@gmail.com>
Date: Sun, 2 Oct 2016 17:45:27 -0500
Subject: [PATCH 2909/4742] [dracula theme] consistent selection styling
 regardless of focus

This prevents a selection from inheriting the default gray background when editor is defocused.
---
 theme/dracula.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/dracula.css b/theme/dracula.css
index 57f979ae69..b2ef62913c 100644
--- a/theme/dracula.css
+++ b/theme/dracula.css
@@ -16,7 +16,7 @@
 .cm-s-dracula .CodeMirror-gutters { color: #282a36; }
 .cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
 .cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-dracula.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
 .cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-dracula span.cm-comment { color: #6272a4; }

From ba82593e49c3622f1d3053d4e239e1a22b3e10f3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 4 Oct 2016 09:09:39 +0200
Subject: [PATCH 2910/4742] Remove IE7-related CSS kludges

---
 lib/codemirror.css | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 18b0bf70db..d7821d17df 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -206,9 +206,6 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   display: inline-block;
   vertical-align: top;
   margin-bottom: -30px;
-  /* Hack to make IE7 behave */
-  *zoom:1;
-  *display:inline;
 }
 .CodeMirror-gutter-wrapper {
   position: absolute;
@@ -327,9 +324,6 @@ div.CodeMirror-dragcursors {
   background: rgba(255, 255, 0, .4);
 }
 
-/* IE7 hack to prevent it from returning funny offsetTops on the spans */
-.CodeMirror span { *vertical-align: text-bottom; }
-
 /* Used to force a border model for a node */
 .cm-force-border { padding-right: .1px; }
 

From fb78601b475393d0e534662cf19910e5582b4101 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 4 Oct 2016 09:12:15 +0200
Subject: [PATCH 2911/4742] Fix normalizing of s- prefix to key names

---
 src/input/keymap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/keymap.js b/src/input/keymap.js
index 1b9564ef4f..3a107bb466 100644
--- a/src/input/keymap.js
+++ b/src/input/keymap.js
@@ -57,7 +57,7 @@ function normalizeKeyName(name) {
     if (/^(cmd|meta|m)$/i.test(mod)) cmd = true
     else if (/^a(lt)?$/i.test(mod)) alt = true
     else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true
-    else if (/^s(hift)$/i.test(mod)) shift = true
+    else if (/^s(hift)?$/i.test(mod)) shift = true
     else throw new Error("Unrecognized modifier name: " + mod)
   }
   if (alt) name = "Alt-" + name

From a194325bb17111d5fc6bfd5a384a9df6a30e9b4d Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sun, 2 Oct 2016 16:37:31 +0200
Subject: [PATCH 2912/4742] Add regression test for #4078

---
 test/test.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/test.js b/test/test.js
index a7658311e7..de2c66e830 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1107,6 +1107,23 @@ testCM("measureEndOfLine", function(cm) {
   eqPos(cm.coordsChar({left: endPos.left, top: endPos.top + 5}), Pos(0, 18));
 }, {mode: "text/html", value: "<!-- foo barrr -->", lineWrapping: true}, ie_lt8 || opera_lt10);
 
+testCM("measureWrappedEndOfLine", function(cm) {
+  if (phantom) return;
+  cm.setSize(null, "auto");
+  var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
+  var lh = inner.offsetHeight;
+  for (var step = 10, w = cm.charCoords(Pos(0, 7), "div").right;; w += step) {
+    cm.setSize(w);
+    if (inner.offsetHeight < 2.5 * lh) {
+      if (step == 10) { w -= 10; step = 1; }
+      else break;
+    }
+  }
+  var endPos = cm.charCoords(Pos(0, 12)); // Next-to-last since last would wrap (#1862)
+  endPos.left += w; // Add width of editor just to be sure that we are behind last character
+  eqPos(cm.coordsChar(endPos), Pos(0, 13));
+}, {mode: "text/html", value: "0123456789abcde0123456789", lineWrapping: true}, ie_lt8 || opera_lt10);
+
 testCM("scrollVerticallyAndHorizontally", function(cm) {
   if (cm.getOption("inputStyle") != "textarea") return;
   cm.setSize(100, 100);

From 6b3b6a600101eb29a53a45f6117ba3db14ba17c2 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sun, 2 Oct 2016 13:44:45 +0200
Subject: [PATCH 2913/4742] Document transposeChars, fix some inconsistencies

With non-empty selections, transposeChar would only work on the chars next to
head and ignore the selected chars. Also, a cursor at line start was not moved
on successful swapping.
---
 src/edit/commands.js | 14 ++++++++++++--
 test/emacs_test.js   |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/edit/commands.js b/src/edit/commands.js
index fe39ed727f..0b0125d1e9 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -106,9 +106,17 @@ export let commands = {
     if (cm.somethingSelected()) cm.indentSelection("add")
     else cm.execCommand("insertTab")
   },
+  // Swap the two chars left and right of each selection's head.
+  // Move cursor behind the two swapped characters afterwards.
+  //
+  // Doesn't consider line feeds a character.
+  // Doesn't scan more than one line above to find a character.
+  // Doesn't do anything on an empty line.
+  // Doesn't do anything with non-empty selections.
   transposeChars: cm => runInOp(cm, () => {
     let ranges = cm.listSelections(), newSel = []
     for (let i = 0; i < ranges.length; i++) {
+      if (!ranges[i].empty()) continue
       let cur = ranges[i].head, line = getLine(cm.doc, cur.line).text
       if (line) {
         if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1)
@@ -118,10 +126,12 @@ export let commands = {
                           Pos(cur.line, cur.ch - 2), cur, "+transpose")
         } else if (cur.line > cm.doc.first) {
           let prev = getLine(cm.doc, cur.line - 1).text
-          if (prev)
+          if (prev) {
+            cur = new Pos(cur.line, 1)
             cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
                             prev.charAt(prev.length - 1),
-                            Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose")
+                            Pos(cur.line - 1, prev.length - 1), cur, "+transpose")
+          }
         }
       }
       newSel.push(new Range(cur, cur))
diff --git a/test/emacs_test.js b/test/emacs_test.js
index 124575c724..628651c786 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -111,7 +111,7 @@
   sim("transposeChar", "abcd\ne",
       "Ctrl-F", "Ctrl-T", "Ctrl-T", txt("bcad\ne"), at(0, 3),
       "Ctrl-F", "Ctrl-T", "Ctrl-T", "Ctrl-T", txt("bcda\ne"), at(0, 4),
-      "Ctrl-F", "Ctrl-T", txt("bcde\na"), at(1, 0));
+      "Ctrl-F", "Ctrl-T", txt("bcde\na"), at(1, 1));
 
   sim("manipWordCase", "foo BAR bAZ",
       "Alt-C", "Alt-L", "Alt-U", txt("Foo bar BAZ"),

From f5751d0feb78bcb6c0307d4be527fba25341a691 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 6 Oct 2016 21:41:07 +0200
Subject: [PATCH 2914/4742] [javascript mode] Support TypeScript return type
 annotations on arrow functions

Closes #4256
---
 mode/javascript/javascript.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 65f85f3a98..8ff38b81bf 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -209,6 +209,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var arrow = stream.string.indexOf("=>", stream.start);
     if (arrow < 0) return;
 
+    if (isTS) { // Try to skip TypeScript return type declarations after the arguments
+      var m = /:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(stream.string.slice(stream.start, arrow))
+      if (m) arrow = m.index
+    }
+
     var depth = 0, sawSomething = false;
     for (var pos = arrow - 1; pos >= 0; --pos) {
       var ch = stream.string.charAt(pos);

From 437f3842a2b339297f9934e5d6cb9ce861c05e0a Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Tue, 11 Oct 2016 13:39:30 -0700
Subject: [PATCH 2915/4742] [sublime] Fix unfoldAll "ctrl+K ctrl+J" shortcut

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index db9f54de16..fada04c038 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -570,7 +570,7 @@
 
   map["Shift-" + ctrl + "["] = "fold";
   map["Shift-" + ctrl + "]"] = "unfold";
-  map[cK + ctrl + "0"] = map[cK + ctrl + "j"] = "unfoldAll";
+  map[cK + ctrl + "0"] = map[cK + ctrl + "J"] = "unfoldAll";
 
   map[ctrl + "I"] = "findIncremental";
   map["Shift-" + ctrl + "I"] = "findIncrementalReverse";

From 9903967353f5ca1a1f9a14e3d3f98809ef0aee5e Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Mon, 10 Oct 2016 18:28:59 -0700
Subject: [PATCH 2916/4742] [markdown] auto-close backticks

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 9dd44574fc..3dcce8d3b1 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -809,6 +809,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     getType: getType,
 
+    closeBrackets: "()[]{}''\"\"``",
     fold: "markdown"
   };
   return mode;

From 358086a5694d67424ccaa46c1bc0c9a16d4b3e09 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Mon, 10 Oct 2016 18:11:48 -0700
Subject: [PATCH 2917/4742] [go] auto-close backticks

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

diff --git a/mode/go/go.js b/mode/go/go.js
index 3c9ef6b989..803a5ba27b 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -173,6 +173,7 @@ CodeMirror.defineMode("go", function(config) {
     },
 
     electricChars: "{}):",
+    closeBrackets: "()[]{}''\"\"``",
     fold: "brace",
     blockCommentStart: "/*",
     blockCommentEnd: "*/",

From 147389d43293bc63fcab10e1c7d34f0c0a921016 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Mon, 10 Oct 2016 18:10:36 -0700
Subject: [PATCH 2918/4742] [shell] auto-close backticks

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

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index a684e8c233..570b4e2419 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -129,6 +129,7 @@ CodeMirror.defineMode('shell', function() {
     token: function(stream, state) {
       return tokenize(stream, state);
     },
+    closeBrackets: "()[]{}''\"\"``",
     lineComment: '#',
     fold: "brace"
   };

From 0e4c156a9ab63dcbc5fa9f60ada54e3c5d5ad03b Mon Sep 17 00:00:00 2001
From: Philipp A <flying-sheep@web.de>
Date: Tue, 11 Oct 2016 14:03:48 +0200
Subject: [PATCH 2919/4742] [r mode] Various improvements

Closes #4297
---
 mode/r/index.html | 65 +++++++++++++++++++++++++----------------------
 mode/r/r.js       | 15 ++++++++---
 2 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/mode/r/index.html b/mode/r/index.html
index 6dd9634659..01b6e664b7 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -31,47 +31,50 @@
 <article>
 <h2>R mode</h2>
 <form><textarea id="code" name="code">
-# Code from http://www.mayin.org/ajayshah/KB/R/
+X <- list(height = 5.4, weight = 54)
+cat("Printing objects: "); print(X)
+print("Accessing individual elements:")
+cat(sprintf("Your height is %s and your weight is %s\n", X$height, X$weight))
 
-# FIRST LEARN ABOUT LISTS --
-X = list(height=5.4, weight=54)
-print("Use default printing --")
-print(X)
-print("Accessing individual elements --")
-cat("Your height is ", X$height, " and your weight is ", X$weight, "\n")
-
-# FUNCTIONS --
+# Functions:
 square <- function(x) {
-  return(x*x)
+  return(x * x)
 }
-cat("The square of 3 is ", square(3), "\n")
+cat(sprintf("The square of 3 is %s\n", square(3)))
 
-                 # default value of the arg is set to 5.
-cube <- function(x=5) {
-  return(x*x*x);
+# In R, the last expression in a function is, by default, what is
+# returned. The idiomatic way to write the function is:
+square <- function(x) {
+  x * x
 }
-cat("Calling cube with 2 : ", cube(2), "\n")    # will give 2^3
-cat("Calling cube        : ", cube(), "\n")     # will default to 5^3.
+# or, for functions with short content:
+square <- function(x) x * x
 
-# LEARN ABOUT FUNCTIONS THAT RETURN MULTIPLE OBJECTS --
-powers <- function(x) {
-  parcel = list(x2=x*x, x3=x*x*x, x4=x*x*x*x);
-  return(parcel);
-}
+# Function arguments with default values:
+cube <- function(x = 5) x * x * x
+cat(sprintf("Calling cube with 2 : %s\n", cube(2))  # will give 2^3
+cat(sprintf("Calling cube        : %s\n", cube())   # will default to 5^3.
 
-X = powers(3);
-print("Showing powers of 3 --"); print(X);
+powers <- function(x) list(x2 = x*x, x3 = x*x*x, x4 = x*x*x*x)
 
-# WRITING THIS COMPACTLY (4 lines instead of 7)
+cat("Powers of 3: "); print(powers(3))
 
-powerful <- function(x) {
-  return(list(x2=x*x, x3=x*x*x, x4=x*x*x*x));
-}
-print("Showing powers of 3 --"); print(powerful(3));
+# Data frames
+df <- data.frame(letters = letters[1:5], '#letter' = 1:5)
+print(df$letters)
+print(df$`#letter`)
 
-# In R, the last expression in a function is, by default, what is
-# returned. So you could equally just say:
-powerful <- function(x) {list(x2=x*x, x3=x*x*x, x4=x*x*x*x)}
+# Operators:
+m1 <- matrix(1:6, 2, 3)
+m2 <- m1 %*% t(m1)
+cat("Matrix product: "); print(m2)
+
+# Assignments:
+a <- 1
+b <<- 2
+c = 3
+4 -> d
+5 ->> e
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
diff --git a/mode/r/r.js b/mode/r/r.js
index d41d1c54c1..7e15beac62 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -44,6 +44,9 @@ CodeMirror.defineMode("r", function(config) {
     } else if (ch == "'" || ch == '"') {
       state.tokenize = tokenString(ch);
       return "string";
+    } else if (ch == "`") {
+      stream.match(/[^`]+`/);
+      return "variable-3";
     } else if (ch == "." && stream.match(/.[.\d]+/)) {
       return "keyword";
     } else if (/[\w\.]/.test(ch) && ch != "_") {
@@ -62,13 +65,17 @@ CodeMirror.defineMode("r", function(config) {
       return "variable";
     } else if (ch == "%") {
       if (stream.skipTo("%")) stream.next();
-      return "variable-2";
-    } else if (ch == "<" && stream.eat("-")) {
-      return "arrow";
+      return "operator variable-2";
+    } else if (
+        (ch == "<" && stream.eat("-")) ||
+        (ch == "<" && stream.match("<-")) ||
+        (ch == "-" && stream.match(/>>?/))
+      ) {
+      return "operator arrow";
     } else if (ch == "=" && state.ctx.argList) {
       return "arg-is";
     } else if (opChars.test(ch)) {
-      if (ch == "$") return "dollar";
+      if (ch == "$") return "operator dollar";
       stream.eatWhile(opChars);
       return "operator";
     } else if (/[\(\){}\[\];]/.test(ch)) {

From 6954ddde73d24174a5540391050267b79204fbfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <oseg@google.com>
Date: Tue, 11 Oct 2016 17:38:17 +0200
Subject: [PATCH 2920/4742] [javascript mode] Fix tokenization for class
 expressions

---
 mode/javascript/javascript.js |  6 ++++++
 mode/javascript/test.js       | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 8ff38b81bf..a717745897 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -395,6 +395,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
     if (type == "function") return cont(functiondef, maybeop);
+    if (type == "class") return cont(pushlex("form"), classExpression, poplex);
     if (type == "keyword c" || type == "async") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
@@ -619,6 +620,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "spread") return cont(funarg);
     return pass(pattern, maybetype, maybeAssign);
   }
+  function classExpression(type, value) {
+    // Class expressions may have an optional name.
+    if (type == "variable") return className(type, value);
+    return classNameAfter(type, value);
+  }
   function className(type, value) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 91c8b7434a..41765e75dd 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -38,6 +38,16 @@
      "  }",
      "}");
 
+  MT("anonymous_class_expression",
+     "[keyword const] [def Adder] [operator =] [keyword class] [keyword extends] [variable Arithmetic] {",
+     "  [property add]([def a], [def b]) {}",
+     "};");
+
+  MT("named_class_expression",
+     "[keyword const] [def Subber] [operator =] [keyword class] [def Subtract] {",
+     "  [property sub]([def a], [def b]) {}",
+     "};");
+
   MT("import",
      "[keyword function] [def foo]() {",
      "  [keyword import] [def $] [keyword from] [string 'jquery'];",

From 32d02f021006a073c36d3c063c0270d13e5814bb Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Sun, 9 Oct 2016 22:00:39 +0200
Subject: [PATCH 2921/4742] [nsis mode] Improve regular expressions

* commands are first in a line
* constants can contains more than `\w`, e.g. `${xml::CreateNode}`
* same goes for language strings
---
 mode/nsis/nsis.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 172207c5a1..e7f111666b 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -24,16 +24,16 @@ CodeMirror.defineSimpleMode("nsis",{
     { regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
 
     // Compile Time Commands
-    {regex: /(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+    {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
 
     // Conditional Compilation
-    {regex: /(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
-    {regex: /(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
+    {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
+    {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /\b(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
-    {regex: /\b(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
-    {regex: /\b(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /^\s*b(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
+    {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
 
     // Command Options
     {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
@@ -74,10 +74,10 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /\$[\w]+/, token: "variable"},
 
     // Constant
-    {regex: /\${[\w]+}/,token: "variable-2"},
+    {regex: /\${[\w\.:-]+}/, token: "variable-2"},
 
     // Language String
-    {regex: /\$\([\w]+\)/,token: "variable-3"}
+    {regex: /\$\([\w\.:-]+\)/, token: "variable-3"}
   ],
   comment: [
     {regex: /.*?\*\//, token: "comment", next: "start"},

From 230f7d0c91d1c9341377e31dfb74a8bb5bfb39fd Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Wed, 12 Oct 2016 08:28:17 +0200
Subject: [PATCH 2922/4742] [nsis mode] Fix typo

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index e7f111666b..f1ffaf59f1 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -32,7 +32,7 @@ CodeMirror.defineSimpleMode("nsis",{
 
     // Runtime Commands
     {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
-    {regex: /^\s*b(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
+    {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
 
     // Command Options
@@ -71,7 +71,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /[-+\/*=<>!]+/, token: "operator"},
 
     // Variable
-    {regex: /\$[\w]+/, token: "variable"},
+    {regex: /\$\w+/, token: "variable"},
 
     // Constant
     {regex: /\${[\w\.:-]+}/, token: "variable-2"},

From 09594e2ef0a7c6e23bf0c5241e850af0b239936a Mon Sep 17 00:00:00 2001
From: Dick Choi <fluke8259@gmail.com>
Date: Thu, 13 Oct 2016 15:23:59 +0900
Subject: [PATCH 2923/4742] [mode/meta] Add Stylus mode

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

diff --git a/mode/meta.js b/mode/meta.js
index 1e078eedee..47e9a31ce8 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -131,6 +131,7 @@
     {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
     {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
+    {name: "Stylus", mime: "text/x-styl", mode: "stylus", ext: ["styl"]},
     {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
     {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},

From b4ec855fe599b9ac9048957a5bb2e8cd88a75b7d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 14 Oct 2016 16:47:43 +0200
Subject: [PATCH 2924/4742] [clike mode] Fix comma behavior

And fix another bug introduced by 329b9e6ec334f9

Closes #4310
---
 mode/clike/clike.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index a37921fdae..cad2d5145c 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -21,7 +21,7 @@ function Context(indented, column, type, info, align, prev) {
 }
 function pushContext(state, col, type, info) {
   var indent = state.indented;
-  if (state.context && state.context.type != "statement" && type != "statement")
+  if (state.context && state.context.type == "statement" && type != "statement")
     indent = state.context.indented;
   return state.context = new Context(indent, col, type, info, null, state.context);
 }
@@ -64,8 +64,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       isPunctuationChar = parserConfig.isPunctuationChar || /[\[\]{}\(\),;\:\.]/,
       numberStart = parserConfig.numberStart || /[\d\.]/,
       number = parserConfig.number || /^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,
-      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/,
-      endStatement = parserConfig.endStatement || /^[;:,]$/;
+      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/;
 
   var curPunc, isDefKeyword;
 
@@ -177,7 +176,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (style == "comment" || style == "meta") return style;
       if (ctx.align == null) ctx.align = true;
 
-      if (endStatement.test(curPunc)) while (state.context.type == "statement") popContext(state);
+      if (curPunc == ";" || curPunc == ":" || (curPunc == "," && stream.match(/^\s*(?:\/\/.*)?$/, false)))
+        while (state.context.type == "statement") popContext(state);
       else if (curPunc == "{") pushContext(state, stream.column(), "}");
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
@@ -432,7 +432,6 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     defKeywords: words("class interface package enum"),
     typeFirstDefinitions: true,
     atoms: words("true false null"),
-    endStatement: /^[;:]$/,
     number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
     hooks: {
       "@": function(stream) {

From 0733ad59c66968830607db2e1935ca9238ea751f Mon Sep 17 00:00:00 2001
From: Dick Choi <fluke8259@gmail.com>
Date: Sat, 15 Oct 2016 16:29:13 +0900
Subject: [PATCH 2925/4742] [sublime bindings] Don't bind transposeChar on OS X

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index fada04c038..98fce4d302 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -294,7 +294,7 @@
     });
   };
 
-  map[ctrl + "T"] = "transposeChars";
+  if (!mac) map[ctrl + "T"] = "transposeChars";
 
   function sortLines(cm, caseSensitive) {
     if (cm.isReadOnly()) return CodeMirror.Pass

From 6fde1170a7f066b8d105bbd4b22eb64511c97ef6 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Sat, 15 Oct 2016 21:00:00 +0200
Subject: [PATCH 2926/4742] [nsis mode] Remove deprecated command

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index f1ffaf59f1..dc8c74cdf4 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -31,7 +31,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
     {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
 

From 82ab0b436dec9ac807ca796741bf47d5802d8038 Mon Sep 17 00:00:00 2001
From: Jon Gacnik <jon@folderstudio.com>
Date: Sat, 15 Oct 2016 21:00:05 -0700
Subject: [PATCH 2927/4742] [continuelist addon] Add tasklist support

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

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index df5179fe47..6574ea335e 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -11,8 +11,8 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)([.)]))(\s*)/,
-      emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)[.)])(\s*)$/,
+  var listRE = /^(\s*)(>[> ]*|- \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/,
+      emptyListRE = /^(\s*)(>[> ]*|- \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/,
       unorderedListRE = /[*+-]\s/;
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
@@ -39,7 +39,7 @@
       } else {
         var indent = match[1], after = match[5];
         var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0
-          ? match[2]
+          ? match[2].replace("x", " ")
           : (parseInt(match[3], 10) + 1) + match[4];
 
         replacements[i] = "\n" + indent + bullet + after;

From 944ff929a1d79777bfe9caf4d96f83dfb68ad39e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 17 Oct 2016 21:04:19 +0200
Subject: [PATCH 2928/4742] Fix accidentally removed semicolon that broke the
 style of line gutter backgrounds

And don't put indentation in css strings.

Issue #4312
---
 src/measurement/update_line.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/measurement/update_line.js b/src/measurement/update_line.js
index cbfa657b38..007eba7ffe 100644
--- a/src/measurement/update_line.js
+++ b/src/measurement/update_line.js
@@ -95,15 +95,13 @@ function updateLineGutter(cm, lineView, lineN, dims) {
   if (lineView.line.gutterClass) {
     let wrap = ensureLineWrapped(lineView)
     lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
-                                    `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px
-                                    width: ${dims.gutterTotalWidth}px`)
+                                    `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px; width: ${dims.gutterTotalWidth}px`)
     wrap.insertBefore(lineView.gutterBackground, lineView.text)
   }
   let markers = lineView.line.gutterMarkers
   if (cm.options.lineNumbers || markers) {
     let wrap = ensureLineWrapped(lineView)
-    let gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", `left:
-                                           ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px`)
+    let gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px`)
     cm.display.input.setUneditable(gutterWrap)
     wrap.insertBefore(gutterWrap, lineView.text)
     if (lineView.line.gutterClass)
@@ -112,8 +110,7 @@ function updateLineGutter(cm, lineView, lineN, dims) {
       lineView.lineNumber = gutterWrap.appendChild(
         elt("div", lineNumberFor(cm.options, lineN),
             "CodeMirror-linenumber CodeMirror-gutter-elt",
-            `left: ${dims.gutterLeft["CodeMirror-linenumbers"]}px;
-            width: ${cm.display.lineNumInnerWidth}px`))
+            `left: ${dims.gutterLeft["CodeMirror-linenumbers"]}px; width: ${cm.display.lineNumInnerWidth}px`))
     if (markers) for (let k = 0; k < cm.options.gutters.length; ++k) {
       let id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]
       if (found)

From 658f9a07279fc978c6b533f3325172a735121262 Mon Sep 17 00:00:00 2001
From: atelierbram <bramdeh@gmail.com>
Date: Mon, 17 Oct 2016 16:23:55 +0200
Subject: [PATCH 2929/4742] [duotone themes] Add

---
 demo/theme.html         |  4 ++++
 theme/duotone-dark.css  | 35 +++++++++++++++++++++++++++++++++++
 theme/duotone-light.css | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 theme/duotone-dark.css
 create mode 100644 theme/duotone-light.css

diff --git a/demo/theme.html b/demo/theme.html
index 60f36d6980..9194dcea8b 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -16,6 +16,8 @@
 <link rel="stylesheet" href="../theme/cobalt.css">
 <link rel="stylesheet" href="../theme/colorforth.css">
 <link rel="stylesheet" href="../theme/dracula.css">
+<link rel="stylesheet" href="../theme/duotone-dark.css">
+<link rel="stylesheet" href="../theme/duotone-light.css">
 <link rel="stylesheet" href="../theme/eclipse.css">
 <link rel="stylesheet" href="../theme/elegant.css">
 <link rel="stylesheet" href="../theme/erlang-dark.css">
@@ -99,6 +101,8 @@ <h2>Theme Demo</h2>
     <option>cobalt</option>
     <option>colorforth</option>
     <option>dracula</option>
+    <option>duotone-dark</option>
+    <option>duotone-light</option>
     <option>eclipse</option>
     <option>elegant</option>
     <option>erlang-dark</option>
diff --git a/theme/duotone-dark.css b/theme/duotone-dark.css
new file mode 100644
index 0000000000..b09a585c97
--- /dev/null
+++ b/theme/duotone-dark.css
@@ -0,0 +1,35 @@
+/*
+Name:   DuoTone-Dark
+Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
+
+CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
+*/
+
+.cm-s-duotone-dark.CodeMirror { background: #2a2734; color: #6c6783; }
+.cm-s-duotone-dark div.CodeMirror-selected { background: #545167!important; }
+.cm-s-duotone-dark .CodeMirror-gutters { background: #2a2734; border-right: 0px; }
+.cm-s-duotone-dark .CodeMirror-linenumber { color: #545167; }
+
+/* begin cursor */
+.cm-s-duotone-dark .CodeMirror-cursor { border-left: 1px solid #ffad5c; /* border-left: 1px solid #ffad5c80; */ border-right: .5em solid #ffad5c; /* border-right: .5em solid #ffad5c80; */ opacity: .5; }
+.cm-s-duotone-dark .CodeMirror-activeline-background { background: #363342; /* background: #36334280;  */ opacity: .5;}
+.cm-s-duotone-dark .cm-fat-cursor .CodeMirror-cursor { background: #ffad5c; /* background: #ffad5c80; */ opacity: .5;}
+/* end cursor */
+
+.cm-s-duotone-dark span.cm-atom, .cm-s-duotone-dark span.cm-number, .cm-s-duotone-dark span.cm-keyword, .cm-s-duotone-dark span.cm-variable, .cm-s-duotone-dark span.cm-attribute, .cm-s-duotone-dark span.cm-quote, .cm-s-duotone-dark span.cm-hr, .cm-s-duotone-dark span.cm-link { color: #ffcc99; }
+
+.cm-s-duotone-dark span.cm-property { color: #9a86fd; }
+.cm-s-duotone-dark span.cm-punctuation, .cm-s-duotone-dark span.cm-unit, .cm-s-duotone-dark span.cm-negative { color: #e09142; }
+.cm-s-duotone-dark span.cm-string { color: #ffb870; }
+.cm-s-duotone-dark span.cm-operator { color: #ffad5c; }
+.cm-s-duotone-dark span.cm-positive { color: #6a51e6; }
+
+.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
+.cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
+.cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }
+
+/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
+.cm-s-duotone-dark span.cm-error, .cm-s-duotone-dark span.cm-invalidchar { color: #f00; }
+
+.cm-s-duotone-dark span.cm-header { font-weight: normal; }
+.cm-s-duotone-dark .CodeMirror-matchingbracket { text-decoration: underline; color: #eeebff !important; } 
diff --git a/theme/duotone-light.css b/theme/duotone-light.css
new file mode 100644
index 0000000000..80203d15d9
--- /dev/null
+++ b/theme/duotone-light.css
@@ -0,0 +1,36 @@
+/*
+Name:   DuoTone-Light
+Author: by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
+
+CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bram de Haan (https://github.com/atelierbram/)
+*/
+
+.cm-s-duotone-light.CodeMirror { background: #faf8f5; color: #b29762; }
+.cm-s-duotone-light div.CodeMirror-selected { background: #e3dcce !important; }
+.cm-s-duotone-light .CodeMirror-gutters { background: #faf8f5; border-right: 0px; }
+.cm-s-duotone-light .CodeMirror-linenumber { color: #cdc4b1; }
+
+/* begin cursor */
+.cm-s-duotone-light .CodeMirror-cursor { border-left: 1px solid #93abdc; /* border-left: 1px solid #93abdc80; */ border-right: .5em solid #93abdc; /* border-right: .5em solid #93abdc80; */ opacity: .5; }
+.cm-s-duotone-light .CodeMirror-activeline-background { background: #e3dcce;  /* background: #e3dcce80; */ opacity: .5; }
+.cm-s-duotone-light .cm-fat-cursor .CodeMirror-cursor { background: #93abdc; /* #93abdc80; */ opacity: .5; }
+/* end cursor */
+
+.cm-s-duotone-light span.cm-atom, .cm-s-duotone-light span.cm-number, .cm-s-duotone-light span.cm-keyword, .cm-s-duotone-light span.cm-variable, .cm-s-duotone-light span.cm-attribute, .cm-s-duotone-light span.cm-quote, .cm-s-duotone-light-light span.cm-hr, .cm-s-duotone-light-light span.cm-link { color: #063289; }
+
+.cm-s-duotone-light span.cm-property { color: #b29762; }
+.cm-s-duotone-light span.cm-punctuation, .cm-s-duotone-light span.cm-unit, .cm-s-duotone-light span.cm-negative { color: #063289; }
+.cm-s-duotone-light span.cm-string, .cm-s-duotone-light span.cm-operator { color: #1659df; }
+.cm-s-duotone-light span.cm-positive { color: #896724; }
+
+.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
+.cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
+.cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }
+
+/* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
+/* .cm-s-duotone-light span.cm-error { background: #896724; color: #728fcb; } */
+.cm-s-duotone-light span.cm-error, .cm-s-duotone-light span.cm-invalidchar { color: #f00; }
+
+.cm-s-duotone-light span.cm-header { font-weight: normal; }
+.cm-s-duotone-light .CodeMirror-matchingbracket { text-decoration: underline; color: #faf8f5 !important; }
+

From aada3904665ae3e36c588321e05685bd2e6fea41 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 17 Oct 2016 21:16:09 +0200
Subject: [PATCH 2930/4742] [panda-syntax theme] Fix leaking styles. Again

---
 theme/panda-syntax.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/panda-syntax.css b/theme/panda-syntax.css
index 8c0c754082..c93b2ea03a 100644
--- a/theme/panda-syntax.css
+++ b/theme/panda-syntax.css
@@ -75,11 +75,11 @@
     padding-bottom: 2px;
     color: #e6e6e6;
 }
-.CodeMirror-gutters {
+.cm-s-panda-syntax .CodeMirror-gutters {
     background: #292a2b;
     border-right-color: rgba(255, 255, 255, 0.1);
 }
-.CodeMirror-linenumber {
+.cm-s-panda-syntax .CodeMirror-linenumber {
     color: #e6e6e6;
     opacity: 0.6;
 }

From bda98794cb7b3a9e7209db26289c622918917ea8 Mon Sep 17 00:00:00 2001
From: Mark Peace <mark.peace@neotechnology.com>
Date: Mon, 17 Oct 2016 15:30:06 +0200
Subject: [PATCH 2931/4742] [cypher mode] Handle unbalanced strings

---
 mode/cypher/cypher.js |  8 ++++++--
 mode/cypher/test.js   | 19 +++++++++++++++++++
 test/index.html       |  2 ++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 mode/cypher/test.js

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index f99abe2385..1d9ca4334a 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -20,8 +20,12 @@
   CodeMirror.defineMode("cypher", function(config) {
     var tokenBase = function(stream/*, state*/) {
       var ch = stream.next();
-      if (ch === "\"" || ch === "'") {
-        stream.match(/.+?["']/);
+      if (ch === "\"") {
+        stream.match(/.+?["]/);
+        return "string";
+      }
+      if (ch === "'") {
+        stream.match(/.+?[']/);
         return "string";
       }
       if (/[{}\(\),\.;\[\]]/.test(ch)) {
diff --git a/mode/cypher/test.js b/mode/cypher/test.js
new file mode 100644
index 0000000000..34cf96caff
--- /dev/null
+++ b/mode/cypher/test.js
@@ -0,0 +1,19 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "cypher");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("unbalancedDoubledQuotedString",
+      "[string \"a'b\"][variable c]");
+
+  MT("unbalancedSingleQuotedString",
+      "[string 'a\"b'][variable c]");
+
+  MT("doubleQuotedString",
+      "[string \"a\"][variable b]");
+
+  MT("singleQuotedString",
+      "[string 'a'][variable b]");
+ })();
diff --git a/test/index.html b/test/index.html
index 90c0335171..8ac33c0913 100644
--- a/test/index.html
+++ b/test/index.html
@@ -20,6 +20,7 @@
 <script src="../mode/css/css.js"></script>
 <script src="../mode/clike/clike.js"></script>
 <!-- clike must be after css or vim and sublime tests will fail -->
+<script src="../mode/cypher/cypher.js"></script>
 <script src="../mode/gfm/gfm.js"></script>
 <script src="../mode/haml/haml.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
@@ -109,6 +110,7 @@ <h2>Test Suite</h2>
     <script src="../mode/css/gss_test.js"></script>
     <script src="../mode/css/scss_test.js"></script>
     <script src="../mode/css/less_test.js"></script>
+    <script src="../mode/cypher/test.js"></script>
     <script src="../mode/gfm/test.js"></script>
     <script src="../mode/haml/test.js"></script>
     <script src="../mode/javascript/test.js"></script>

From 55fb95f0e859c23b5eba667ac91e2fff7b07f375 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 17 Oct 2016 21:21:39 +0200
Subject: [PATCH 2932/4742] Move measurement/update_line to display/

Because it has nothing to do with measurement.
---
 src/display/update_display.js               | 2 +-
 src/{measurement => display}/update_line.js | 0
 src/measurement/position_measurement.js     | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{measurement => display}/update_line.js (100%)

diff --git a/src/display/update_display.js b/src/display/update_display.js
index a8d6a4de13..4e016a2515 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -2,12 +2,12 @@ import { sawCollapsedSpans } from "../line/saw_special_spans"
 import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans"
 import { getLine, lineNumberFor } from "../line/utils_line"
 import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement"
-import { buildLineElement, updateLineForChanges } from "../measurement/update_line"
 import { mac, webkit } from "../util/browser"
 import { activeElt, removeChildren } from "../util/dom"
 import { hasHandler, signal } from "../util/event"
 import { indexOf } from "../util/misc"
 
+import { buildLineElement, updateLineForChanges } from "./update_line"
 import { startWorker } from "./highlight_worker"
 import { maybeUpdateLineNumberWidth } from "./line_numbers"
 import { measureForScrollbars, updateScrollbars } from "./scrollbars"
diff --git a/src/measurement/update_line.js b/src/display/update_line.js
similarity index 100%
rename from src/measurement/update_line.js
rename to src/display/update_line.js
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 5688836ee0..4ece080e49 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -8,8 +8,8 @@ import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom"
 import { e_target } from "../util/event"
 import { hasBadZoomedRects } from "../util/feature_detection"
 import { countColumn, isExtendingChar, scrollerGap } from "../util/misc"
+import { updateLineForChanges } from "../display/update_line"
 
-import { updateLineForChanges } from "./update_line"
 import { widgetHeight } from "./widgets"
 
 // POSITION MEASUREMENT

From 05115c54a6d168535d78d303a21ce027fa4647d0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Oct 2016 22:06:08 +0200
Subject: [PATCH 2933/4742] [css mode] Make translateX/Y/Z highlight properly

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

diff --git a/mode/css/css.js b/mode/css/css.js
index ea7bd01d84..b6be4cd508 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -672,7 +672,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
     "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
     "trad-chinese-formal", "trad-chinese-informal",
-    "translate", "translate3d", "translateX", "translateY", "translateZ",
+    "translate", "translate3d", "translatex", "translatey", "translatez",
     "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
     "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",

From 344c8d560f7f4ea5c2a68209600e3689fbd61193 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Oct 2016 22:28:49 +0200
Subject: [PATCH 2934/4742] [css mode] Better fix for mixed-case keywords

Closes #4325
---
 mode/css/css.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index b6be4cd508..e56e3dd8c6 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -414,7 +414,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   function keySet(array) {
     var keys = {};
     for (var i = 0; i < array.length; ++i) {
-      keys[array[i]] = true;
+      keys[array[i].toLowerCase()] = true;
     }
     return keys;
   }
@@ -672,7 +672,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
     "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
     "trad-chinese-formal", "trad-chinese-informal",
-    "translate", "translate3d", "translatex", "translatey", "translatez",
+    "translate", "translate3d", "translateX", "translateY", "translateZ",
     "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
     "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",

From edd8e6180a5209d20c175ce6aae43b3621dee4cb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Oct 2016 09:50:25 +0200
Subject: [PATCH 2935/4742] [closebrackets addon] Don't skip over quotes at the
 start of a string

Closes #4287
---
 addon/edit/closebrackets.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index af7fce2a82..7c47bcd096 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -116,7 +116,9 @@
       if (opening && !range.empty()) {
         curType = "surround";
       } else if ((identical || !opening) && next == ch) {
-        if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
+        if (identical && stringStartsAfter(cm, cur))
+          curType = "both";
+        else if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
           curType = "skipThree";
         else
           curType = "skip";
@@ -192,4 +194,9 @@
       stream.start = stream.pos;
     }
   }
+
+  function stringStartsAfter(cm, pos) {
+    var token = cm.getTokenAt(Pos(pos.line, pos.ch + 1))
+    return /\bstring/.test(token.type) && token.start == pos.ch
+  }
 });

From b25f85746f7b036642ebd74cd9496a36b636cbbd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Oct 2016 09:58:35 +0200
Subject: [PATCH 2936/4742] Normalize line endings in inserted/pasted content

Issue #4289
---
 src/input/input.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/input/input.js b/src/input/input.js
index e51a90a119..57e4ea533b 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -7,6 +7,7 @@ import { ios, webkit } from "../util/browser"
 import { elt } from "../util/dom"
 import { lst, map } from "../util/misc"
 import { signalLater } from "../util/operation_group"
+import { splitLinesAuto } from "../util/feature_detection"
 
 import { indentLine } from "./indent"
 
@@ -25,7 +26,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
   if (!sel) sel = doc.sel
 
   let paste = cm.state.pasteIncoming || origin == "paste"
-  let textLines = doc.splitLines(inserted), multiPaste = null
+  let textLines = splitLinesAuto(inserted), multiPaste = null
   // When pasing N lines into N selections, insert one line per selection
   if (paste && sel.ranges.length > 1) {
     if (lastCopied && lastCopied.text.join("\n") == inserted) {

From 1502f805a868a2e3ee87d0574ff18e592fd9785f Mon Sep 17 00:00:00 2001
From: Todd Berman <tberman@github.com>
Date: Thu, 6 Oct 2016 14:37:54 -0700
Subject: [PATCH 2937/4742] Add `mergeMarkerLocation` to options to allow
 customization

---
 addon/merge/merge.js | 33 +++++++++++++++++++++++++--------
 doc/manual.html      |  6 +++++-
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index cc94cafb8c..2cfeabe426 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -40,6 +40,7 @@
       (this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
       this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
       this.orig.state.diffViews = [this];
+      this.classes.location = options.mergeMarkerLocation || "background";
 
       this.diff = getDiff(asString(orig), asString(options.value));
       this.chunks = getChunks(this.diff);
@@ -192,14 +193,20 @@
   // Updating the marks for editor content
 
   function clearMarks(editor, arr, classes) {
+    function removeLineClass(l, klass) {
+      var classList = Array.isArray(classes.location) ? classes.location : [classes.location]
+      for (var c = 0; c < classList.length; ++c) {
+        editor.removeLineClass(l, classList[c], klass)
+      }
+    }
     for (var i = 0; i < arr.length; ++i) {
       var mark = arr[i];
       if (mark instanceof CodeMirror.TextMarker) {
         mark.clear();
       } else if (mark.parent) {
-        editor.removeLineClass(mark, "background", classes.chunk);
-        editor.removeLineClass(mark, "background", classes.start);
-        editor.removeLineClass(mark, "background", classes.end);
+        removeLineClass(mark, classes.chunk);
+        removeLineClass(mark, classes.start);
+        removeLineClass(mark, classes.end);
       }
     }
     arr.length = 0;
@@ -231,19 +238,29 @@
     var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
     var cls = type == DIFF_DELETE ? classes.del : classes.insert;
     function markChunk(start, end) {
+      function addLineClass(l, klass) {
+        var classList = Array.isArray(classes.location) ? classes.location : [classes.location]
+        var ret = null
+        for (var c = 0; c < classList.length; ++c) {
+          ret = editor.addLineClass(l, classList[c], klass)
+        }
+
+        return ret
+      }
+
       var bfrom = Math.max(from, start), bto = Math.min(to, end);
       for (var i = bfrom; i < bto; ++i) {
-        var line = editor.addLineClass(i, "background", classes.chunk);
-        if (i == start) editor.addLineClass(line, "background", classes.start);
-        if (i == end - 1) editor.addLineClass(line, "background", classes.end);
+        var line = addLineClass(i, classes.chunk);
+        if (i == start) addLineClass(line, classes.start);
+        if (i == end - 1) addLineClass(line, classes.end);
         marks.push(line);
       }
       // When the chunk is empty, make sure a horizontal line shows up
       if (start == end && bfrom == end && bto == end) {
         if (bfrom)
-          marks.push(editor.addLineClass(bfrom - 1, "background", classes.end));
+          marks.push(addLineClass(bfrom - 1, classes.end));
         else
-          marks.push(editor.addLineClass(bfrom, "background", classes.start));
+          marks.push(addLineClass(bfrom, classes.start));
       }
     }
 
diff --git a/doc/manual.html b/doc/manual.html
index 65e030c0bf..baa8356fa0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2583,7 +2583,7 @@ <h2 id="addons">Addons</h2>
         <dd>Optional <code>to</code> position that will be used by <code>pick()</code> instead
         of the global one passed with the full list of completions.</dd>
       </dl></dd>
-      
+
       <dd>The plugin understands the following options (the options object
       will also be passed along to the hinting function, which may
       understand additional options):
@@ -2986,6 +2986,10 @@ <h2 id="addons">Addons</h2>
           <dt><code><strong>showDifferences</strong>: boolean</code></dt>
           <dd>When true (the default), changed pieces of text are
           highlighted.</dd>
+          <dt><code><strong>mergeMarkerLocations</strong>: string|Array</code></dt>
+          <dd>By default the merge highlights are added using addLineClass with "background".
+          Override this to customize it to be any valid `where` parameter or an Array of valid `where`
+          parameters.</dd>
         </dl>
         The addon also defines commands <code>"goNextDiff"</code>
         and <code>"goPrevDiff"</code> to quickly jump to the next

From 9a316b33d72439cf52ab189ab1e60a16e8b15fe5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Oct 2016 10:27:34 +0200
Subject: [PATCH 2938/4742] Update previous patch to change option name and
 clean up code

Issue #4288
---
 addon/merge/merge.js | 60 +++++++++++++++++++++-----------------------
 doc/manual.html      |  8 +++---
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 2cfeabe426..2f53406edc 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -40,7 +40,9 @@
       (this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
       this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
       this.orig.state.diffViews = [this];
-      this.classes.location = options.mergeMarkerLocation || "background";
+      var classLocation = options.chunkClassLocation || "background";
+      if (Object.prototype.toString.call(classLocation) != "[object Array]") classLocation = [classLocation]
+      this.classes.classLocation = classLocation
 
       this.diff = getDiff(asString(orig), asString(options.value));
       this.chunks = getChunks(this.diff);
@@ -192,22 +194,22 @@
 
   // Updating the marks for editor content
 
-  function clearMarks(editor, arr, classes) {
-    function removeLineClass(l, klass) {
-      var classList = Array.isArray(classes.location) ? classes.location : [classes.location]
-      for (var c = 0; c < classList.length; ++c) {
-        editor.removeLineClass(l, classList[c], klass)
-      }
+  function removeClass(editor, line, classes) {
+    var locs = classes.classLocation
+    for (var i = 0; i < locs.length; i++) {
+      editor.removeLineClass(line, locs[i], classes.chunk);
+      editor.removeLineClass(line, locs[i], classes.start);
+      editor.removeLineClass(line, locs[i], classes.chunk);
     }
+  }
+
+  function clearMarks(editor, arr, classes) {
     for (var i = 0; i < arr.length; ++i) {
       var mark = arr[i];
-      if (mark instanceof CodeMirror.TextMarker) {
+      if (mark instanceof CodeMirror.TextMarker)
         mark.clear();
-      } else if (mark.parent) {
-        removeLineClass(mark, classes.chunk);
-        removeLineClass(mark, classes.start);
-        removeLineClass(mark, classes.end);
-      }
+      else if (mark.parent)
+        removeClass(editor, mark, classes);
     }
     arr.length = 0;
   }
@@ -233,34 +235,30 @@
     });
   }
 
+  function addClass(editor, lineNr, classes, main, start, end) {
+    var locs = classes.classLocation, line = editor.getLineHandle(lineNr);
+    for (var i = 0; i < locs.length; i++) {
+      if (main) editor.addLineClass(line, locs[i], classes.chunk);
+      if (start) editor.addLineClass(line, locs[i], classes.start);
+      if (end) editor.addLineClass(line, locs[i], classes.end);
+    }
+    return line;
+  }
+
   function markChanges(editor, diff, type, marks, from, to, classes) {
     var pos = Pos(0, 0);
     var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
     var cls = type == DIFF_DELETE ? classes.del : classes.insert;
     function markChunk(start, end) {
-      function addLineClass(l, klass) {
-        var classList = Array.isArray(classes.location) ? classes.location : [classes.location]
-        var ret = null
-        for (var c = 0; c < classList.length; ++c) {
-          ret = editor.addLineClass(l, classList[c], klass)
-        }
-
-        return ret
-      }
-
       var bfrom = Math.max(from, start), bto = Math.min(to, end);
-      for (var i = bfrom; i < bto; ++i) {
-        var line = addLineClass(i, classes.chunk);
-        if (i == start) addLineClass(line, classes.start);
-        if (i == end - 1) addLineClass(line, classes.end);
-        marks.push(line);
-      }
+      for (var i = bfrom; i < bto; ++i)
+        marks.push(addClass(editor, i, classes, true, i == start, i == end - 1));
       // When the chunk is empty, make sure a horizontal line shows up
       if (start == end && bfrom == end && bto == end) {
         if (bfrom)
-          marks.push(addLineClass(bfrom - 1, classes.end));
+          marks.push(addClass(editor, bfrom - 1, classes, false, false, true));
         else
-          marks.push(addLineClass(bfrom, classes.start));
+          marks.push(addClass(editor, bfrom, classes, false, true, false));
       }
     }
 
diff --git a/doc/manual.html b/doc/manual.html
index baa8356fa0..f9e9946533 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2986,9 +2986,11 @@ <h2 id="addons">Addons</h2>
           <dt><code><strong>showDifferences</strong>: boolean</code></dt>
           <dd>When true (the default), changed pieces of text are
           highlighted.</dd>
-          <dt><code><strong>mergeMarkerLocations</strong>: string|Array</code></dt>
-          <dd>By default the merge highlights are added using addLineClass with "background".
-          Override this to customize it to be any valid `where` parameter or an Array of valid `where`
+          <dt><code><strong>chunkClassLocation</strong>: string|Array</code></dt>
+          <dd>By default the chunk highlights are added
+          using <a href="#addLineClass"><code>addLineClass</code></a>
+          with "background". Override this to customize it to be any
+          valid `where` parameter or an Array of valid `where`
           parameters.</dd>
         </dl>
         The addon also defines commands <code>"goNextDiff"</code>

From 7484049deddcff8ccc9a7ff1989adb4bb00a9e80 Mon Sep 17 00:00:00 2001
From: themrmax <max.flander@gmail.com>
Date: Mon, 10 Oct 2016 10:34:54 +1100
Subject: [PATCH 2939/4742] add quickstart to project readme

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index ff2622a2b8..84466293b4 100644
--- a/README.md
+++ b/README.md
@@ -26,3 +26,9 @@ The CodeMirror community aims to be welcoming to everybody. We use the
 [Contributor Covenant
 (1.1)](http://contributor-covenant.org/version/1/1/0/) as our code of
 conduct.
+
+### Quickstart
+
+To build the project, make sure you have Node.js installed (at least version 6)
+and then `npm install && npm build`. To run, just open `index.html` in your
+browser (you don't need to run a webserver). Run the tests with `npm test`.

From e1c3b9e9e7ab876abf4fb3458006b205709367c4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Oct 2016 11:00:48 +0200
Subject: [PATCH 2940/4742] [lint addon] Provide a way to show tooltips only on
 the gutter

Closes #4308
---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index e3a452766d..c1f1702f92 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -226,7 +226,7 @@
       var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
       if (state.options.lintOnChange !== false)
         cm.on("change", onChange);
-      if (state.options.tooltips != false)
+      if (state.options.tooltips != false && state.options.tooltips != "gutter")
         CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
 
       startLinting(cm);

From 1523a8b79afab2618e7bedaaf34adf5f232fd15b Mon Sep 17 00:00:00 2001
From: Mu-An Chiou <me@muanchiou.com>
Date: Wed, 12 Oct 2016 17:02:30 +0800
Subject: [PATCH 2941/4742] Fix addRange behavior in contenteditable mode

When selecting at the beginning of a line ranges need to be removed
for new range to be added properly. (in Safari)
---
 src/input/ContentEditableInput.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index fbb327f034..cdaa825488 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -157,7 +157,10 @@ ContentEditableInput.prototype = copyObj({
     if (rng) {
       if (!gecko && this.cm.state.focused) {
         sel.collapse(start.node, start.offset)
-        if (!rng.collapsed) sel.addRange(rng)
+        if (!rng.collapsed) {
+          sel.removeAllRanges()
+          sel.addRange(rng)
+        }
       } else {
         sel.removeAllRanges()
         sel.addRange(rng)

From 763575c2bd91747c7b44a70ebc24f79b85d71e6e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Oct 2016 11:29:52 +0200
Subject: [PATCH 2942/4742] Mark release 5.20.0

---
 AUTHORS           | 12 ++++++++++++
 CHANGELOG.md      | 24 ++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 14 ++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 6 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ada8c3f9cf..e2cb74a557 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@ Adam King
 adanlobato
 Adán Lobato
 Adrian Aichner
+Adrian Heine
 aeroson
 Ahmad Amireh
 Ahmad M. Zawawi
@@ -61,10 +62,12 @@ anthonygego
 Anthony Gégo
 Anthony Grimes
 Anton Kovalyov
+Apollo Zhu
 AQNOUCH Mohammed
 areos
 Arnab Bose
 as3boyan
+atelierbram
 AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
@@ -151,6 +154,7 @@ deebugger
 Deep Thought
 Devin Abbott
 Devon Carew
+Dick Choi
 dignifiedquire
 Dimage Sapelkin
 Dmitry Kiselyov
@@ -284,6 +288,7 @@ John Van Der Loo
 Jon Ander Peñalba
 Jonas Döbertin
 Jonathan Malmaud
+Jon Gacnik
 jongalloway
 Jon Malmaud
 Jon Sangster
@@ -321,6 +326,7 @@ Kris Ciccarello
 ks-ifware
 kubelsmieci
 KwanEsq
+Kyle Kelley
 Lanfei
 Lanny
 Laszlo Vidacs
@@ -336,6 +342,7 @@ lochel
 Lorenzo Stoakes
 Luciano Longo
 Lu Fangjian
+Luke Browning
 Luke Granger-Brown
 Luke Stagner
 lynschinzer
@@ -358,6 +365,7 @@ Mario Pietsch
 Mark Anderson
 Mark Lentczner
 Marko Bonaci
+Mark Peace
 Markus Bordihn
 Martin Balek
 Martín Gaitán
@@ -415,6 +423,7 @@ Moritz Schwörer
 mps
 ms
 mtaran-google
+Mu-An Chiou
 Narciso Jaramillo
 Nathan Williams
 ndr
@@ -439,6 +448,7 @@ nlwillia
 noragrossman
 Norman Rzepka
 Oreoluwa Onatemowo
+Oskar Segersvärd
 pablo
 pabloferz
 Page
@@ -547,6 +557,7 @@ tfjgeorge
 Thaddee Tyl
 thanasis
 TheHowl
+themrmax
 think
 Thomas Dvornik
 Thomas Kluyver
@@ -557,6 +568,7 @@ Timothy Farrell
 Timothy Gu
 Timothy Hatcher
 TobiasBg
+Todd Berman
 Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f368485cfe..b243546569 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 5.20.0 (2016-10-20)
+
+### Bug fixes
+
+Make `newlineAndIndent` command work with multiple cursors on the same line.
+
+Make sure keypress events for backspace are ignored.
+
+Tokens styled with overlays no longer get a nonsense `cm-cm-overlay` class.
+
+Line endings for pasted content are now normalized to the editor's [preferred ending](http://codemirror.net/doc/manual.html#option_lineSeparator).
+
+[javascript mode](http://codemirror.net/mode/javascript): Improve support for class expressions. Support TypeScript optional class properties, the `abstract` keyword, and return type declarations for arrow functions.
+
+[css mode](http://codemirror.net/mode/css): Fix highlighting of mixed-case keywords.
+
+[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Improve behavior when typing a quote before a string.
+
+### New features
+
+The core is now maintained as a number of small files, using ES6 syntax and modules, under the `src/` directory. A git checkout no longer contains a working `codemirror.js` until you `npm build` (but when installing from NPM, it is included).
+
+The [`refresh`](http://codemirror.net/doc/manual.html#event_refresh) event is now documented and stable.
+
 ## 5.19.0 (2016-09-20)
 
 ### Bugfixes
diff --git a/doc/manual.html b/doc/manual.html
index f9e9946533..36354b71f3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.19.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.20.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 5a0c6b715c..cfc366f3e2 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-10-2016: <a href="http://codemirror.net/codemirror-5.20.0.zip">Version 5.20.0</a>:</p>
+
+  <ul class=rel-note>
+    <li>Make <code>newlineAndIndent</code> command work with multiple cursors on the same line.</li>
+    <li>Make sure keypress events for backspace are ignored.</li>
+    <li>Tokens styled with overlays no longer get a nonsense <code>cm-cm-overlay</code> class.</li>
+    <li>Line endings for pasted content are now normalized to the editor's <a href="http://codemirror.net/doc/manual.html#option_lineSeparator">preferred ending</a>.</li>
+    <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Improve support for class expressions. Support TypeScript optional class properties, the <code>abstract</code> keyword, and return type declarations for arrow functions.</li>
+    <li><a href="http://codemirror.net/mode/css">css mode</a>: Fix highlighting of mixed-case keywords.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when typing a quote before a string.</li>
+    <li>The core is now maintained as a number of small files, using ES6 syntax and modules, under the <code>src/</code> directory. A git checkout no longer contains a working <code>codemirror.js</code> until you <code>npm build</code> (but when installing from NPM, it is included).</li>
+    <li>The <a href="http://codemirror.net/doc/manual.html#event_refresh"><code>refresh</code></a> event is now documented and stable.</li>
+  </ul>
+
   <p class="rel">20-09-2016: <a href="http://codemirror.net/codemirror-5.19.0.zip">Version 5.19.0</a>:</p>
 
   <ul class=rel-note>
diff --git a/index.html b/index.html
index 3423eab209..f4e56a70c8 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.19.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.20.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 057280c569..74040d5658 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.19.1",
+  "version": "5.20.0",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",

From 81d7f09b6de4044e2945bed39edb48e61d1f5495 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Oct 2016 11:33:05 +0200
Subject: [PATCH 2943/4742] Bump version number post-5.20

---
 doc/manual.html | 2 +-
 package.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 36354b71f3..0cff1be813 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.20.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.20.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 74040d5658..7dbf4751e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.20.0",
+  "version": "5.20.1",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",

From cea0e041e3fcefdb0869891cb02880bdc07ab966 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Oct 2016 15:39:49 +0200
Subject: [PATCH 2944/4742] Drop bower.json

To further underline our lack of commitment to having the
github repository serve as a package distribution mechanism.
---
 bower.json | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 bower.json

diff --git a/bower.json b/bower.json
deleted file mode 100644
index 903d9f55f8..0000000000
--- a/bower.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "codemirror",
-  "main": ["lib/codemirror.js", "lib/codemirror.css"],
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "components",
-    "bin",
-    "demo",
-    "doc",
-    "test",
-    "index.html",
-    "package.json",
-    "mode/*/*test.js",
-    "mode/*/*.html"
-  ]
-}

From 33f2044c8105b37b5f4b4e60893d457f696ba634 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Oct 2016 21:56:21 +0200
Subject: [PATCH 2945/4742] Fix installation instruction

Closes #4333
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 84466293b4..1b3309881c 100644
--- a/README.md
+++ b/README.md
@@ -30,5 +30,5 @@ conduct.
 ### Quickstart
 
 To build the project, make sure you have Node.js installed (at least version 6)
-and then `npm install && npm build`. To run, just open `index.html` in your
+and then `npm install && npm run build`. To run, just open `index.html` in your
 browser (you don't need to run a webserver). Run the tests with `npm test`.

From f73ff23d5aa3247e0fc46d3ffde73cf9c900f48d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Oct 2016 08:13:42 +0200
Subject: [PATCH 2946/4742] Fix release script to bump version in correct file

---
 bin/release      | 2 +-
 src/edit/main.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/release b/bin/release
index df1fb269c3..b31d511857 100755
--- a/bin/release
+++ b/bin/release
@@ -16,7 +16,7 @@ function rewrite(file, f) {
   fs.writeFileSync(file, f(fs.readFileSync(file, "utf8")), "utf8");
 }
 
-rewrite("lib/codemirror.js", function(lib) {
+rewrite("src/edit/main.js", function(lib) {
   return lib.replace(/CodeMirror\.version = "\d+\.\d+\.\d+"/,
                      "CodeMirror.version = \"" + number + "\"");
 });
diff --git a/src/edit/main.js b/src/edit/main.js
index 2831d2a03d..16dc032155 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.19.1"
+CodeMirror.version = "5.20.1"

From d221bf5d15680e06528e1558c014d178c4bc740d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Oct 2016 08:17:46 +0200
Subject: [PATCH 2947/4742] Mark release 5.20.2

---
 CHANGELOG.md     | 6 ++++++
 doc/manual.html  | 2 +-
 index.html       | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b243546569..a7e995ab4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.20.2 (2016-10-21)
+
+### Bug fixes
+
+Fix `CodeMirror.version` returning the wrong version number.
+
 ## 5.20.0 (2016-10-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 0cff1be813..2944f0d5e5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.20.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.20.2</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/index.html b/index.html
index f4e56a70c8..1d1bb3c8a2 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.20.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.20.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 7dbf4751e1..8a58fbded2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.20.1",
+  "version": "5.20.2",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 16dc032155..4335965626 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.20.1"
+CodeMirror.version = "5.20.2"

From 06431f4d7eb24b0945bc7bb0b775a4f644766c64 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Oct 2016 08:19:57 +0200
Subject: [PATCH 2948/4742] Bump version number post-5.20.2

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 2944f0d5e5..6ef27689ce 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.20.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.20.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 8a58fbded2..1d07d681b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.20.2",
+  "version": "5.20.3",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 4335965626..57fcffa04e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.20.2"
+CodeMirror.version = "5.20.3"

From 63bf6594d80b09359025ebc9282e49ed37574cd2 Mon Sep 17 00:00:00 2001
From: Todd Berman <tberman@github.com>
Date: Thu, 20 Oct 2016 20:37:42 -0700
Subject: [PATCH 2949/4742] Add classes to each pane for isolated style
 changes, handle document swapping

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

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 2f53406edc..b0f78c87fd 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -116,8 +116,14 @@
       // Update faster when a line was added/removed
       setDealign(change.text.length - 1 != change.to.line - change.from.line);
     }
+    function swapDoc() {
+      dv.diffOutOfDate = true;
+      update("full");
+    }
     dv.edit.on("change", change);
     dv.orig.on("change", change);
+    dv.edit.on("swapDoc", swapDoc);
+    dv.orig.on("swapDoc", swapDoc);
     dv.edit.on("markerAdded", setDealign);
     dv.edit.on("markerCleared", setDealign);
     dv.orig.on("markerAdded", setDealign);
@@ -464,18 +470,18 @@
 
     if (hasLeft) {
       left = this.left = new DiffView(this, "left");
-      var leftPane = elt("div", null, "CodeMirror-merge-pane");
+      var leftPane = elt("div", null, "CodeMirror-merge-pane CodeMirror-merge-left");
       wrap.push(leftPane);
       wrap.push(buildGap(left));
     }
 
-    var editPane = elt("div", null, "CodeMirror-merge-pane");
+    var editPane = elt("div", null, "CodeMirror-merge-pane CodeMirror-merge-editor");
     wrap.push(editPane);
 
     if (hasRight) {
       right = this.right = new DiffView(this, "right");
       wrap.push(buildGap(right));
-      var rightPane = elt("div", null, "CodeMirror-merge-pane");
+      var rightPane = elt("div", null, "CodeMirror-merge-pane CodeMirror-merge-right");
       wrap.push(rightPane);
     }
 

From e83ee37e5c54d0b088087bfdb897c7e3d5aacbad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 22 Oct 2016 09:03:43 +0200
Subject: [PATCH 2950/4742] [css mode] Drop marker-offset property

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

diff --git a/mode/css/css.js b/mode/css/css.js
index e56e3dd8c6..b75732034e 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -494,7 +494,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "line-stacking-shift", "line-stacking-strategy", "list-style",
     "list-style-image", "list-style-position", "list-style-type", "margin",
     "margin-bottom", "margin-left", "margin-right", "margin-top",
-    "marker-offset", "marks", "marquee-direction", "marquee-loop",
+    "marks", "marquee-direction", "marquee-loop",
     "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
     "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
     "nav-left", "nav-right", "nav-up", "object-fit", "object-position",

From db12d64243ee9d2994e12ffb2935ebac0cbf3c1c Mon Sep 17 00:00:00 2001
From: Todd Berman <tberman@github.com>
Date: Sat, 22 Oct 2016 17:59:55 -0700
Subject: [PATCH 2951/4742] [merge addon] Remove the end class when removing
 chunk styling

---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index b0f78c87fd..e9700821b1 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -205,7 +205,7 @@
     for (var i = 0; i < locs.length; i++) {
       editor.removeLineClass(line, locs[i], classes.chunk);
       editor.removeLineClass(line, locs[i], classes.start);
-      editor.removeLineClass(line, locs[i], classes.chunk);
+      editor.removeLineClass(line, locs[i], classes.end);
     }
   }
 

From 0164f02bf1ce823e300520ef198d620f30d47220 Mon Sep 17 00:00:00 2001
From: BigBlueHat <byoung@bigbluehat.com>
Date: Wed, 26 Oct 2016 17:01:08 -0400
Subject: [PATCH 2952/4742] [yaml mode] Add text/yaml MIME type

---
 mode/meta.js      | 2 +-
 mode/yaml/yaml.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index 47e9a31ce8..cb0684b984 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -157,7 +157,7 @@
     {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
     {name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
-    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
+    {name: "YAML", mimes: ["text/x-yaml", "text/yaml"], mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
     {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
     {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
     {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index b7015e599c..59c0ecdbec 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -113,5 +113,6 @@ CodeMirror.defineMode("yaml", function() {
 });
 
 CodeMirror.defineMIME("text/x-yaml", "yaml");
+CodeMirror.defineMIME("text/yaml", "yaml");
 
 });

From 2eb94e54b6e9e1df5004fe8089311be8e3b73146 Mon Sep 17 00:00:00 2001
From: BigBlueHat <byoung@bigbluehat.com>
Date: Thu, 27 Oct 2016 10:41:00 -0400
Subject: [PATCH 2953/4742] [vue mode] Fix media type

Demo had the correct `text/x-vue`
defineMIME was using `script/x-vue`

There is, however, no `script/*` top-level media type:
http://www.iana.org/assignments/media-types/media-types.xhtml

Left, old `script/x-vue` for backwards compatibility.
---
 mode/meta.js    | 1 +
 mode/vue/vue.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mode/meta.js b/mode/meta.js
index cb0684b984..8faf7677df 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -154,6 +154,7 @@
     {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
     {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
     {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
+    {name: "Vue.js Component", mimes: ["script/x-vue", "text/x-vue"], mode: "vue", ext: ["vue"]},
     {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
     {name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
diff --git a/mode/vue/vue.js b/mode/vue/vue.js
index f8089af501..c0eab6b82f 100644
--- a/mode/vue/vue.js
+++ b/mode/vue/vue.js
@@ -66,4 +66,5 @@
   }, "htmlmixed", "xml", "javascript", "coffeescript", "css", "sass", "stylus", "pug", "handlebars");
 
   CodeMirror.defineMIME("script/x-vue", "vue");
+  CodeMirror.defineMIME("text/x-vue", "vue");
 });

From e2c146e6463f31839b49bfef303e962116970a88 Mon Sep 17 00:00:00 2001
From: Adrien Bertrand <bertrand.adrien@gmail.com>
Date: Sat, 29 Oct 2016 19:14:54 +0200
Subject: [PATCH 2954/4742] Fix constructor typo for MergeView.

---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index e9700821b1..72526d0179 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -545,7 +545,7 @@
   }
 
   MergeView.prototype = {
-    constuctor: MergeView,
+    constructor: MergeView,
     editor: function() { return this.edit; },
     rightOriginal: function() { return this.right && this.right.orig; },
     leftOriginal: function() { return this.left && this.left.orig; },

From 7b00c30cdb959cf1980ca5f5cbac3cf331b83b08 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 31 Oct 2016 09:47:35 +0100
Subject: [PATCH 2955/4742] [ruby mode] Make else and elsif electric

Closes #4345
---
 mode/ruby/ruby.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 10cad8d9f1..085f909f5f 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -275,7 +275,7 @@ CodeMirror.defineMode("ruby", function(config) {
         (state.continuedLine ? config.indentUnit : 0);
     },
 
-    electricInput: /^\s*(?:end|rescue|\})$/,
+    electricInput: /^\s*(?:end|rescue|elsif|else|\})$/,
     lineComment: "#"
   };
 });

From c4d9363e18925842b7741e11611d870baf4bb14e Mon Sep 17 00:00:00 2001
From: sverweij <sverweij@users.noreply.github.com>
Date: Fri, 28 Oct 2016 23:03:34 +0200
Subject: [PATCH 2956/4742] [mscgen mode] adds support for language constants
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and adds the xù specific keyword 'xu'
---
 mode/mscgen/index.html      |  2 +-
 mode/mscgen/mscgen.js       |  8 +++++++-
 mode/mscgen/mscgen_test.js  | 10 +++++++++-
 mode/mscgen/msgenny_test.js |  7 ++++++-
 mode/mscgen/xu_test.js      | 19 +++++++++++++++----
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/mode/mscgen/index.html b/mode/mscgen/index.html
index 8c28ee6200..b1d7e7c2e6 100644
--- a/mode/mscgen/index.html
+++ b/mode/mscgen/index.html
@@ -59,7 +59,7 @@ <h2>Xù mode</h2>
 # Xù - expansions to MscGen to support inline expressions
 #      https://github.com/sverweij/mscgen_js/blob/master/wikum/xu.md
 # More samples: https://sverweij.github.io/mscgen_js
-msc {
+xu {
   hscale="0.8",
   width="700";
 
diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
index d61b470652..2cd6f42703 100644
--- a/mode/mscgen/mscgen.js
+++ b/mode/mscgen/mscgen.js
@@ -23,6 +23,7 @@
     mscgen: {
       "keywords" : ["msc"],
       "options" : ["hscale", "width", "arcgradient", "wordwraparcs"],
+      "constants" : ["true", "false", "on", "off"],
       "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
       "brackets" : ["\\{", "\\}"], // [ and  ] are brackets too, but these get handled in with lists
       "arcsWords" : ["note", "abox", "rbox", "box"],
@@ -31,8 +32,9 @@
       "operators" : ["="]
     },
     xu: {
-      "keywords" : ["msc"],
+      "keywords" : ["msc", "xu"],
       "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+      "constants" : ["true", "false", "on", "off", "auto"],
       "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
       "brackets" : ["\\{", "\\}"],  // [ and  ] are brackets too, but these get handled in with lists
       "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
@@ -43,6 +45,7 @@
     msgenny: {
       "keywords" : null,
       "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+      "constants" : ["true", "false", "on", "off", "auto"],
       "attributes" : null,
       "brackets" : ["\\{", "\\}"],
       "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
@@ -146,6 +149,9 @@
       if (!!pConfig.operators && pStream.match(wordRegexp(pConfig.operators), true, true))
         return "operator";
 
+      if (!!pConfig.constants && pStream.match(wordRegexp(pConfig.constants), true, true))
+        return "variable";
+
       /* attribute lists */
       if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match(/\[/, true, true)) {
         pConfig.inAttributeList = true;
diff --git a/mode/mscgen/mscgen_test.js b/mode/mscgen/mscgen_test.js
index e319a3997e..956c5758e1 100644
--- a/mode/mscgen/mscgen_test.js
+++ b/mode/mscgen/mscgen_test.js
@@ -29,6 +29,14 @@
     "[base alt loop opt ref else break par seq assert]"
   );
 
+  MT("xù/ msgenny constants classify as 'base'",
+    "[base auto]"
+  );
+
+  MT("mscgen constants classify as 'variable'",
+    "[variable true]", "[variable false]", "[variable on]", "[variable off]"
+  );
+
   MT("mscgen options classify as keyword",
     "[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
   );
@@ -63,7 +71,7 @@
   MT("a typical program",
     "[comment # typical mscgen program]",
     "[keyword msc][base  ][bracket {]",
-    "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][keyword arcgradient][operator =][base 30;]",
+    "[keyword wordwraparcs][operator =][variable true][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30;]",
     "[base   a][bracket [[][attribute label][operator =][string \"Entity A\"][bracket ]]][base ,]",
     "[base   b][bracket [[][attribute label][operator =][string \"Entity B\"][bracket ]]][base ,]",
     "[base   c][bracket [[][attribute label][operator =][string \"Entity C\"][bracket ]]][base ;]",
diff --git a/mode/mscgen/msgenny_test.js b/mode/mscgen/msgenny_test.js
index 80173de082..edf9da09af 100644
--- a/mode/mscgen/msgenny_test.js
+++ b/mode/mscgen/msgenny_test.js
@@ -23,6 +23,11 @@
     "[keyword alt]","[keyword loop]","[keyword opt]","[keyword ref]","[keyword else]","[keyword break]","[keyword par]","[keyword seq]","[keyword assert]"
   );
 
+  MT("xù/ msgenny constants classify as 'variable'",
+    "[variable auto]",
+    "[variable true]", "[variable false]", "[variable on]", "[variable off]"
+  );
+
   MT("mscgen options classify as keyword",
     "[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
   );
@@ -56,7 +61,7 @@
 
   MT("a typical program",
     "[comment # typical msgenny program]",
-    "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30;]",
+    "[keyword wordwraparcs][operator =][variable true][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30;]",
     "[base   a : ][string \"Entity A\"][base ,]",
     "[base   b : Entity B,]",
     "[base   c : Entity C;]",
diff --git a/mode/mscgen/xu_test.js b/mode/mscgen/xu_test.js
index f9a50f0af2..950aeca1f9 100644
--- a/mode/mscgen/xu_test.js
+++ b/mode/mscgen/xu_test.js
@@ -9,7 +9,13 @@
      "[keyword msc][bracket {]",
      "[base   ]",
      "[bracket }]"
-   );
+  );
+
+  MT("empty chart",
+     "[keyword xu][bracket {]",
+     "[base   ]",
+     "[bracket }]"
+  );
 
   MT("comments",
     "[comment // a single line comment]",
@@ -29,6 +35,11 @@
     "[keyword alt]","[keyword loop]","[keyword opt]","[keyword ref]","[keyword else]","[keyword break]","[keyword par]","[keyword seq]","[keyword assert]"
   );
 
+  MT("xù/ msgenny constants classify as 'variable'",
+    "[variable auto]",
+    "[variable true]", "[variable false]", "[variable on]", "[variable off]"
+  );
+
   MT("mscgen options classify as keyword",
     "[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
   );
@@ -61,9 +72,9 @@
   );
 
   MT("a typical program",
-    "[comment # typical mscgen program]",
-    "[keyword msc][base  ][bracket {]",
-    "[keyword wordwraparcs][operator =][string \"true\"][keyword hscale][operator =][string \"0.8\"][keyword arcgradient][operator =][base 30;]",
+    "[comment # typical xu program]",
+    "[keyword xu][base  ][bracket {]",
+    "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30, ][keyword width][operator =][variable auto][base ;]",
     "[base   a][bracket [[][attribute label][operator =][string \"Entity A\"][bracket ]]][base ,]",
     "[base   b][bracket [[][attribute label][operator =][string \"Entity B\"][bracket ]]][base ,]",
     "[base   c][bracket [[][attribute label][operator =][string \"Entity C\"][bracket ]]][base ;]",

From d34e94781fac24518a31a33b8d0980639ad8547e Mon Sep 17 00:00:00 2001
From: Steve Hoover <steve_git@hooverfam.net>
Date: Mon, 24 Oct 2016 14:57:06 -0400
Subject: [PATCH 2957/4742] [verilog mode] Cleanup/rewrite.

---
 mode/verilog/verilog.js | 400 ++++++++++++++++++++++++++--------------
 1 file changed, 264 insertions(+), 136 deletions(-)

diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 7513dcede2..1f6ecb9f99 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -302,7 +302,13 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
         state.indented = stream.indentation();
         state.startOfLine = true;
       }
-      if (hooks.token) hooks.token(stream, state);
+      if (hooks.token) {
+        // Call hook, with an optional return value of a style to override verilog styling.
+        var style = hooks.token(stream, state);
+        if (style !== undefined) {
+          return style;
+        }
+      }
       if (stream.eatSpace()) return null;
       curPunc = null;
       curKeyword = null;
@@ -375,163 +381,285 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     name: "verilog"
   });
 
-  // TLVVerilog mode
 
-  var tlvchScopePrefixes = {
-    ">": "property", "->": "property", "-": "hr", "|": "link", "?$": "qualifier", "?*": "qualifier",
-    "@-": "variable-3", "@": "variable-3", "?": "qualifier"
+
+  // TL-Verilog mode.
+  // See tl-x.org for language spec.
+  // See the mode in action at makerchip.com.
+  // Contact: steve.hoover@redwoodeda.com
+
+  // TLV Identifier prefixes.
+  // Note that sign is not treated separately, so "+/-" versions of numeric identifiers
+  // are included.
+  var tlvIdentifierStyle = {
+    "|": "link",
+    ">": "property",  // Should condition this off for > TLV 1c.
+    "$": "variable",
+    "$$": "variable",
+    "?$": "qualifier",
+    "?*": "qualifier",
+    "-": "hr",
+    "/": "property",
+    "/-": "property",
+    "@": "variable-3",
+    "@-": "variable-3",
+    "@++": "variable-3",
+    "@+=": "variable-3",
+    "@+=-": "variable-3",
+    "@--": "variable-3",
+    "@-=": "variable-3",
+    "%+": "tag",
+    "%-": "tag",
+    "%": "tag",
+    ">>": "tag",
+    "<<": "tag",
+    "<>": "tag",
+    "#": "tag",  // Need to choose a style for this.
+    "^": "attribute",
+    "^^": "attribute",
+    "^!": "attribute",
+    "*": "variable-2",
+    "**": "variable-2",
+    "\\": "keyword",
+    "\"": "comment"
   };
 
-  function tlvGenIndent(stream, state) {
-    var tlvindentUnit = 2;
-    var rtnIndent = -1, indentUnitRq = 0, curIndent = stream.indentation();
-    switch (state.tlvCurCtlFlowChar) {
-    case "\\":
-      curIndent = 0;
-      break;
-    case "|":
-      if (state.tlvPrevPrevCtlFlowChar == "@") {
-        indentUnitRq = -2; //-2 new pipe rq after cur pipe
-        break;
-      }
-      if (tlvchScopePrefixes[state.tlvPrevCtlFlowChar])
-        indentUnitRq = 1; // +1 new scope
-      break;
-    case "M":  // m4
-      if (state.tlvPrevPrevCtlFlowChar == "@") {
-        indentUnitRq = -2; //-2 new inst rq after  pipe
-        break;
-      }
-      if (tlvchScopePrefixes[state.tlvPrevCtlFlowChar])
-        indentUnitRq = 1; // +1 new scope
-      break;
-    case "@":
-      if (state.tlvPrevCtlFlowChar == "S")
-        indentUnitRq = -1; // new pipe stage after stmts
-      if (state.tlvPrevCtlFlowChar == "|")
-        indentUnitRq = 1; // 1st pipe stage
-      break;
-    case "S":
-      if (state.tlvPrevCtlFlowChar == "@")
-        indentUnitRq = 1; // flow in pipe stage
-      if (tlvchScopePrefixes[state.tlvPrevCtlFlowChar])
-        indentUnitRq = 1; // +1 new scope
-      break;
-    }
-    var statementIndentUnit = tlvindentUnit;
-    rtnIndent = curIndent + (indentUnitRq*statementIndentUnit);
-    return rtnIndent >= 0 ? rtnIndent : curIndent;
+  // Lines starting with these characters define scope (result in indentation).
+  var tlvScopePrefixChars = {
+    "/": "beh-hier",
+    ">": "beh-hier",
+    "-": "phys-hier",
+    "|": "pipe",
+    "?": "when",
+    "@": "stage",
+    "\\": "keyword"
+  };
+  var tlvIndentUnit = 3;
+  var tlvTrackStatements = false;
+  var tlvIdentMatch = /^([~!@#\$%\^&\*-\+=\?\/\\\|'"<>]+)([\d\w_]*)/;  // Matches an identifiere.
+  // Note that ':' is excluded, because of it's use in [:].
+  var tlvFirstLevelIndentMatch = /^[! ]  /;
+  var tlvLineIndentationMatch = /^[! ] */;
+  var tlvCommentMatch = /^\/[\/\*]/;
+
+
+  // Returns a style specific to the scope at the given indentation column.
+  // Type is one of: "indent", "scope-ident", "before-scope-ident".
+  function tlvScopeStyle(state, indentation, type) {
+    // Begin scope.
+    var depth = indentation / tlvIndentUnit;  // TODO: Pass this in instead.
+    return "tlv-" + state.tlvIndentationStyle[depth] + "-" + type;
+  }
+
+  // Return true if the next thing in the stream is an identifier with a mnemonic.
+  function tlvIdentNext(stream) {
+    var match;
+    return (match = stream.match(tlvIdentMatch, false)) && match[2].length > 0;
   }
 
   CodeMirror.defineMIME("text/x-tlv", {
     name: "verilog",
+
     hooks: {
-      "\\": function(stream, state) {
-        var vxIndent = 0, style = false;
-        var curPunc  = stream.string;
-        if ((stream.sol()) && ((/\\SV/.test(stream.string)) || (/\\TLV/.test(stream.string)))) {
-          curPunc = (/\\TLV_version/.test(stream.string))
-            ? "\\TLV_version" : stream.string;
-          stream.skipToEnd();
-          if (curPunc == "\\SV" && state.vxCodeActive) {state.vxCodeActive = false;};
-          if ((/\\TLV/.test(curPunc) && !state.vxCodeActive)
-            || (curPunc=="\\TLV_version" && state.vxCodeActive)) {state.vxCodeActive = true;};
-          style = "keyword";
-          state.tlvCurCtlFlowChar  = state.tlvPrevPrevCtlFlowChar
-            = state.tlvPrevCtlFlowChar = "";
-          if (state.vxCodeActive == true) {
-            state.tlvCurCtlFlowChar  = "\\";
-            vxIndent = tlvGenIndent(stream, state);
+
+      electricInput: false,
+
+
+      // Return undefined for verilog tokenizing, or style for TLV token (null not used).
+      // Standard CM styles are used for most formatting, but some TL-Verilog-specific highlighting
+      // can be enabled with the definition of cm-tlv-* styles, including highlighting for:
+      //   - M4 tokens
+      //   - TLV scope indentation
+      //   - Statement delimitation (enabled by tlvTrackStatements)
+      token: function(stream, state) {
+        var style = undefined;
+        var match;  // Return value of pattern matches.
+
+        // Set highlighting mode based on code region (TLV or SV).
+        if (stream.sol() && ! state.tlvInBlockComment) {
+          // Process region.
+          if (stream.peek() == '\\') {
+            style = "def";
+            stream.skipToEnd();
+            if (stream.string.match(/\\SV/)) {
+              state.tlvCodeActive = false;
+            } else if (stream.string.match(/\\TLV/)){
+              state.tlvCodeActive = true;
+            }
+          }
+          // Correct indentation in the face of a line prefix char.
+          if (state.tlvCodeActive && stream.pos == 0 &&
+              (state.indented == 0) && (match = stream.match(tlvLineIndentationMatch, false))) {
+            state.indented = match[0].length;
+          }
+
+          // Compute indentation state:
+          //   o Required indentation on next line
+          //   o Indentation scope styles
+          var indented = state.indented;
+          var depth = indented / tlvIndentUnit;
+          if (depth <= state.tlvIndentationStyle.length) {
+            // not deeper than current scope
+
+            var blankline = stream.string.length == indented;
+            var chPos = depth * tlvIndentUnit;
+            if (chPos < stream.string.length) {
+              var bodyString = stream.string.slice(chPos);
+              var ch = bodyString[0];
+              if (tlvScopePrefixChars[ch] && ((match = bodyString.match(tlvIdentMatch)) &&
+                  tlvIdentifierStyle[match[1]])) {
+                // this line begins scope (except non-region keyword identifiers, which are statements themselves)
+                if (!(ch == "\\" && chPos > 0)) {
+                  indented += tlvIndentUnit;
+                  state.tlvIndentationStyle[depth] = tlvScopePrefixChars[ch];
+                  if (tlvTrackStatements) {state.statementComment = false;}
+                  depth++;
+                }
+              }
+            }
+            // Clear out deeper indentation levels unless line is blank.
+            if (!blankline) {
+              while (state.tlvIndentationStyle.length > depth) {
+                state.tlvIndentationStyle.pop();
+              }
+            }
           }
-          state.vxIndentRq = vxIndent;
         }
-        return style;
-      },
-      tokenBase: function(stream, state) {
-        var vxIndent = 0, style = false;
-        var tlvisOperatorChar = /[\[\]=:]/;
-        var tlvkpScopePrefixs = {
-          "**":"variable-2", "*":"variable-2", "$$":"variable", "$":"variable",
-          "^^":"attribute", "^":"attribute"};
-        var ch = stream.peek();
-        var vxCurCtlFlowCharValueAtStart = state.tlvCurCtlFlowChar;
-        if (state.vxCodeActive == true) {
-          if (/[\[\]{}\(\);\:]/.test(ch)) {
-            // bypass nesting and 1 char punc
-            style = "meta";
-            stream.next();
-          } else if (ch == "/") {
-            stream.next();
-            if (stream.eat("/")) {
+
+        if (state.tlvCodeActive) {
+          // Highlight as TLV.
+
+          var beginStatement = false;
+          if (tlvTrackStatements) {
+            // This starts a statement if the position is at the scope level
+            // and we're not within a statement leading comment.
+            beginStatement =
+                   (stream.peek() != " ") &&   // not a space
+                   (style === undefined) &&    // not a region identifier
+                   !state.tlvInBlockComment && // not in block comment
+                   //!stream.match(tlvCommentMatch, false) && // not comment start
+                   (stream.column() == state.tlvIndentationStyle.length * tlvIndentUnit);  // at scope level
+            if (beginStatement) {
+              if (state.statementComment) {
+                // statement already started by comment
+                beginStatement = false;
+              }
+              state.statementComment =
+                   stream.match(tlvCommentMatch, false); // comment start
+            }
+          }
+
+          var match;
+          if (style !== undefined) {
+            // Region line.
+            style += " " + tlvScopeStyle(state, 0, "scope-ident")
+          } else if (((stream.pos / tlvIndentUnit) < state.tlvIndentationStyle.length) &&
+                     (match = stream.match(stream.sol() ? tlvFirstLevelIndentMatch : /^   /))) {
+            // Indentation
+            style = // make this style distinct from the previous one to prevent
+                    // codemirror from combining spans
+                    "tlv-indent-" + (((stream.pos % 2) == 0) ? "even" : "odd") +
+                    // and style it
+                    " " + tlvScopeStyle(state, stream.pos - tlvIndentUnit, "indent");
+            // Style the line prefix character.
+            if (match[0].charAt(0) == "!") {
+              style += " tlv-alert-line-prefix";
+            }
+            // Place a class before a scope identifier.
+            if (tlvIdentNext(stream)) {
+              style += " " + tlvScopeStyle(state, stream.pos, "before-scope-ident");
+            }
+          } else if (state.tlvInBlockComment) {
+            // In a block comment.
+            if (stream.match(/^.*?\*\//)) {
+              // Exit block comment.
+              state.tlvInBlockComment = false;
+              if (tlvTrackStatements && !stream.eol()) {
+                // Anything after comment is assumed to be real statement content.
+                state.statementComment = false;
+              }
+            } else {
+              stream.skipToEnd();
+            }
+            style = "comment";
+          } else if ((match = stream.match(tlvCommentMatch)) && !state.tlvInBlockComment) {
+            // Start comment.
+            if (match[0] == "//") {
+              // Line comment.
               stream.skipToEnd();
-              style = "comment";
-              state.tlvCurCtlFlowChar = "S";
             } else {
-              stream.backUp(1);
+              // Block comment.
+              state.tlvInBlockComment = true;
             }
-          } else if (ch == "@") {
-            // pipeline stage
-            style = tlvchScopePrefixes[ch];
-            state.tlvCurCtlFlowChar = "@";
-            stream.next();
-            stream.eatWhile(/[\w\$_]/);
-          } else if (stream.match(/\b[mM]4+/, true)) { // match: function(pattern, consume, caseInsensitive)
-            // m4 pre proc
-            stream.skipTo("(");
-            style = "def";
-            state.tlvCurCtlFlowChar = "M";
-          } else if (ch == "!" && stream.sol()) {
-            // v stmt in tlv region
-            // state.tlvCurCtlFlowChar  = "S";
             style = "comment";
+          } else if (match = stream.match(tlvIdentMatch)) {
+            // looks like an identifier (or identifier prefix)
+            var prefix = match[1];
+            var mnemonic = match[2];
+            if (// is identifier prefix
+                (prefix in tlvIdentifierStyle) &&
+                // has mnemonic or we're at the end of the line (maybe it hasn't been typed yet)
+                (mnemonic.length > 0 || stream.eol())) {
+              style = tlvIdentifierStyle[prefix];
+              if (stream.column() == state.indented) {
+                // Begin scope.
+                style += " " + tlvScopeStyle(state, stream.column(), "scope-ident")
+              }
+            } else {
+              // Just swallow one character and try again.
+              // This enables subsequent identifier match with preceding symbol character, which
+              //   is legal within a statement.  (Eg, !$reset).  It also enables detection of
+              //   comment start with preceding symbols.
+              stream.backUp(stream.current().length - 1);
+              style = "tlv-default";
+            }
+          } else if (stream.match(/^\t+/)) {
+            // Highlight tabs, which are illegal.
+            style = "tlv-tab";
+          } else if (stream.match(/^[\[\]{}\(\);\:]+/)) {
+            // [:], (), {}, ;.
+            style = "meta";
+          } else if (match = stream.match(/^[mM]4([\+_])?[\w\d_]*/)) {
+            // m4 pre proc
+            style = (match[1] == "+") ? "tlv-m4-plus" : "tlv-m4";
+          } else if (stream.match(/^ +/)){
+            // Skip over spaces.
+            if (stream.eol()) {
+              // Trailing spaces.
+              style = "error";
+            } else {
+              // Non-trailing spaces.
+              style = "tlv-default";
+            }
+          } else if (stream.match(/^[\w\d_]+/)) {
+            // alpha-numeric token.
+            style = "number";
+          } else {
+            // Eat the next char w/ no formatting.
             stream.next();
-          } else if (tlvisOperatorChar.test(ch)) {
-            // operators
-            stream.eatWhile(tlvisOperatorChar);
-            style = "operator";
-          } else if (ch == "#") {
-            // phy hier
-            state.tlvCurCtlFlowChar  = (state.tlvCurCtlFlowChar == "")
-              ? ch : state.tlvCurCtlFlowChar;
-            stream.next();
-            stream.eatWhile(/[+-]\d/);
-            style = "tag";
-          } else if (tlvkpScopePrefixs.propertyIsEnumerable(ch)) {
-            // special TLV operators
-            style = tlvkpScopePrefixs[ch];
-            state.tlvCurCtlFlowChar = state.tlvCurCtlFlowChar == "" ? "S" : state.tlvCurCtlFlowChar;  // stmt
-            stream.next();
-            stream.match(/[a-zA-Z_0-9]+/);
-          } else if (style = tlvchScopePrefixes[ch] || false) {
-            // special TLV operators
-            state.tlvCurCtlFlowChar = state.tlvCurCtlFlowChar == "" ? ch : state.tlvCurCtlFlowChar;
-            stream.next();
-            stream.match(/[a-zA-Z_0-9]+/);
+            style = "tlv-default";
+          }
+          if (beginStatement) {
+            style += " tlv-statement";
           }
-          if (state.tlvCurCtlFlowChar != vxCurCtlFlowCharValueAtStart) { // flow change
-            vxIndent = tlvGenIndent(stream, state);
-            state.vxIndentRq = vxIndent;
+        } else {
+          if (stream.match(/^[mM]4([\w\d_]*)/)) {
+            // m4 pre proc
+            style = "tlv-m4";
           }
         }
         return style;
       },
-      token: function(stream, state) {
-        if (state.vxCodeActive == true && stream.sol() && state.tlvCurCtlFlowChar != "") {
-          state.tlvPrevPrevCtlFlowChar = state.tlvPrevCtlFlowChar;
-          state.tlvPrevCtlFlowChar = state.tlvCurCtlFlowChar;
-          state.tlvCurCtlFlowChar = "";
-        }
-      },
-      indent: function(state) {
-        return (state.vxCodeActive == true) ? state.vxIndentRq : -1;
-      },
+
       startState: function(state) {
-        state.tlvCurCtlFlowChar = "";
-        state.tlvPrevCtlFlowChar = "";
-        state.tlvPrevPrevCtlFlowChar = "";
-        state.vxCodeActive = true;
-        state.vxIndentRq = 0;
+        state.tlvIndentationStyle = [];  // Styles to use for each level of indentation.
+        state.tlvCodeActive = true;  // True when we're in a TLV region (and at beginning of file).
+        state.tlvInBlockComment = false;  // True inside /**/ comment.
+        if (tlvTrackStatements) {
+          state.statementComment = false;  // True inside a statement's header comment.
+        }
       }
+
     }
   });
 });

From 5105da7fcd5a98dbaf276b769ce8581daac84121 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 1 Nov 2016 11:04:58 +0100
Subject: [PATCH 2958/4742] [merge addon] Fix bug in chunk-aligning algorithm

Closes #4353
---
 addon/merge/merge.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 72526d0179..e7772ace66 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -343,11 +343,12 @@
             j = -1;
             break;
           } else if (align[1] > chunk.editTo) {
+            j--
             break;
           }
         }
         if (j > -1)
-          linesToAlign.splice(j - 1, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
+          linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
       }
     }
     return linesToAlign;

From 6d3a7457d1d9b6c4165a5b066be6e1da99776e2b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 1 Nov 2016 11:07:10 +0100
Subject: [PATCH 2959/4742] [merge addon] Fix corner case in alignable-chunk
 sorting

Issue #4353
---
 addon/merge/merge.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index e7772ace66..1d7a5cccb0 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -340,14 +340,14 @@
         for (var j = 0; j < linesToAlign.length; j++) {
           var align = linesToAlign[j];
           if (align[1] == chunk.editTo) {
-            j = -1;
+            j = -2;
             break;
           } else if (align[1] > chunk.editTo) {
             j--
             break;
           }
         }
-        if (j > -1)
+        if (j > -2)
           linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
       }
     }

From ea796dad693cc1f7c7d7f4628a1ee4953ae6b3db Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 2 Nov 2016 10:07:05 +0100
Subject: [PATCH 2960/4742] [merge addon] Fix sorted insertion in aligned line
 set (again)

Issue #4353
---
 addon/merge/merge.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 1d7a5cccb0..9bd086580b 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -335,20 +335,14 @@
       linesToAlign.push([chunk.origTo, chunk.editTo, other ? getMatchingOrigLine(chunk.editTo, other.chunks) : null]);
     }
     if (other) {
-      for (var i = 0; i < other.chunks.length; i++) {
+      chunkLoop: for (var i = 0; i < other.chunks.length; i++) {
         var chunk = other.chunks[i];
         for (var j = 0; j < linesToAlign.length; j++) {
-          var align = linesToAlign[j];
-          if (align[1] == chunk.editTo) {
-            j = -2;
-            break;
-          } else if (align[1] > chunk.editTo) {
-            j--
-            break;
-          }
+          var diff = linesToAlign[j][1] - chunk.editTo;
+          if (diff == 0) continue chunkLoop
+          if (diff > 0) break;
         }
-        if (j > -2)
-          linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
+        linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
       }
     }
     return linesToAlign;

From 2466392a929761bd61e85cbea86cd533ac84eef4 Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Tue, 1 Nov 2016 22:30:50 -0700
Subject: [PATCH 2961/4742] [rulers addon] Draw rulers all the way when
 scrollPastEnd is on.

---
 addon/display/rulers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index 730054473a..151cc8205f 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -13,12 +13,12 @@
 
   CodeMirror.defineOption("rulers", false, function(cm, val) {
     if (cm.state.rulerDiv) {
-      cm.display.lineSpace.removeChild(cm.state.rulerDiv)
+      cm.state.rulerDiv.parentElement.removeChild(cm.state.rulerDiv)
       cm.state.rulerDiv = null
       cm.off("refresh", drawRulers)
     }
     if (val && val.length) {
-      cm.state.rulerDiv = cm.display.lineSpace.insertBefore(document.createElement("div"), cm.display.cursorDiv)
+      cm.state.rulerDiv = cm.display.lineSpace.parentElement.insertBefore(document.createElement("div"), cm.display.lineSpace)
       cm.state.rulerDiv.className = "CodeMirror-rulers"
       drawRulers(cm)
       cm.on("refresh", drawRulers)

From f5e211fa49315e0c0da212dffc275d769609d1ab Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 2 Nov 2016 11:08:17 +0100
Subject: [PATCH 2962/4742] Add an includeWidgets argument to heightAtLine

And use it in the merge addon to get the proper offsets for merge buttons

Issue #4364
---
 addon/merge/merge.js                    | 8 ++++----
 doc/manual.html                         | 7 +++++--
 src/edit/methods.js                     | 4 ++--
 src/measurement/position_measurement.js | 4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 9bd086580b..0c54a66464 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -408,13 +408,13 @@
 
   function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
     var flip = dv.type == "left";
-    var top = dv.orig.heightAtLine(chunk.origFrom, "local") - sTopOrig;
+    var top = dv.orig.heightAtLine(chunk.origFrom, "local", true) - sTopOrig;
     if (dv.svg) {
       var topLpx = top;
-      var topRpx = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
+      var topRpx = dv.edit.heightAtLine(chunk.editFrom, "local", true) - sTopEdit;
       if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
-      var botLpx = dv.orig.heightAtLine(chunk.origTo, "local") - sTopOrig;
-      var botRpx = dv.edit.heightAtLine(chunk.editTo, "local") - sTopEdit;
+      var botLpx = dv.orig.heightAtLine(chunk.origTo, "local", true) - sTopOrig;
+      var botRpx = dv.edit.heightAtLine(chunk.editTo, "local", true) - sTopEdit;
       if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
       var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
       var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
diff --git a/doc/manual.html b/doc/manual.html
index 6ef27689ce..e74ec36200 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1863,13 +1863,16 @@ <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: integer|LineHandle, ?mode: string) → number</code></dt>
+      <dt id="heightAtLine"><code><strong>cm.heightAtLine</strong>(line: integer|LineHandle, ?mode: string, ?includeWidgets: bool) → 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
       defaults to <code>"page"</code>. When a line below the bottom of
       the document is specified, the returned value is the bottom of
-      the last line in the document.</dd>
+      the last line in the document. By default, the position of the
+      actual text is returned. If `includeWidgets` is true and the
+      line has line widgets, the position above the first line widget
+      is returned.</dd>
       <dt id="defaultTextHeight"><code><strong>cm.defaultTextHeight</strong>() → number</code></dt>
       <dd>Returns the line height of the default font for the editor.</dd>
       <dt id="defaultCharWidth"><code><strong>cm.defaultCharWidth</strong>() → number</code></dt>
diff --git a/src/edit/methods.js b/src/edit/methods.js
index b63f9bd26b..8aa2a437b0 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -201,7 +201,7 @@ export default function(CodeMirror) {
       height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top
       return lineAtHeight(this.doc, height + this.display.viewOffset)
     },
-    heightAtLine: function(line, mode) {
+    heightAtLine: function(line, mode, includeWidgets) {
       let end = false, lineObj
       if (typeof line == "number") {
         let last = this.doc.first + this.doc.size - 1
@@ -211,7 +211,7 @@ export default function(CodeMirror) {
       } else {
         lineObj = line
       }
-      return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
+      return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets).top +
         (end ? this.doc.height - heightAtLine(lineObj) : 0)
     },
 
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 4ece080e49..f62672c494 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -287,8 +287,8 @@ function pageScrollY() { return window.pageYOffset || (document.documentElement
 // coordinates into another coordinate system. Context may be one of
 // "line", "div" (display.lineDiv), "local"./null (editor), "window",
 // or "page".
-export function intoCoordSystem(cm, lineObj, rect, context) {
-  if (lineObj.widgets) for (let i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
+export function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) {
+  if (!includeWidgets && lineObj.widgets) for (let i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
     let size = widgetHeight(lineObj.widgets[i])
     rect.top += size; rect.bottom += size
   }

From e6ec325be0535893137b26545ec14b1c411fb16d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 2 Nov 2016 11:15:32 +0100
Subject: [PATCH 2963/4742] Make sure initial connectors are drawn after
 aligning/collapsing

So that their vertical offsets actually match the position of the
corresponding lines.

Issue #4364
---
 addon/merge/merge.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 0c54a66464..f0d746449d 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -49,6 +49,8 @@
       this.diffOutOfDate = this.dealigned = false;
 
       this.showDifferences = options.showDifferences !== false;
+    },
+    registerEvents: function() {
       this.forceUpdate = registerUpdate(this);
       setScrollLock(this, true, false);
       registerScroll(this);
@@ -91,10 +93,11 @@
         updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
         updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
       }
-      makeConnections(dv);
 
       if (dv.mv.options.connect == "align")
         alignChunks(dv);
+      makeConnections(dv);
+
       updating = false;
     }
     function setDealign(fast) {
@@ -489,7 +492,6 @@
 
     if (left) left.init(leftPane, origLeft, options);
     if (right) right.init(rightPane, origRight, options);
-
     if (options.collapseIdentical)
       this.editor().operation(function() {
         collapseIdenticalStretches(self, options.collapseIdentical);
@@ -498,6 +500,9 @@
       this.aligners = [];
       alignChunks(this.left || this.right, true);
     }
+    if (left) left.registerEvents()
+    if (right) right.registerEvents()
+
 
     var onResize = function() {
       if (left) makeConnections(left);

From 73c5bf098ffff029a892a91d91bb8249d40c635f Mon Sep 17 00:00:00 2001
From: Steve Hoover <steve_git@hooverfam.net>
Date: Thu, 3 Nov 2016 10:37:00 -0400
Subject: [PATCH 2964/4742] [verilog mode] Fixed inadvertent removal of
 TL-Verilog indent(..) function.

---
 mode/verilog/verilog.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 1f6ecb9f99..460cdb3b1c 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -494,7 +494,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
           }
 
           // Compute indentation state:
-          //   o Required indentation on next line
+          //   o Auto indentation on next line
           //   o Indentation scope styles
           var indented = state.indented;
           var depth = indented / tlvIndentUnit;
@@ -508,9 +508,12 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
               var ch = bodyString[0];
               if (tlvScopePrefixChars[ch] && ((match = bodyString.match(tlvIdentMatch)) &&
                   tlvIdentifierStyle[match[1]])) {
-                // this line begins scope (except non-region keyword identifiers, which are statements themselves)
+                // This line begins scope.
+                // Next line gets indented one level.
+                indented += tlvIndentUnit;
+                // Style the next level of indentation (except non-region keyword identifiers,
+                //   which are statements themselves)
                 if (!(ch == "\\" && chPos > 0)) {
-                  indented += tlvIndentUnit;
                   state.tlvIndentationStyle[depth] = tlvScopePrefixChars[ch];
                   if (tlvTrackStatements) {state.statementComment = false;}
                   depth++;
@@ -524,6 +527,8 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
               }
             }
           }
+          // Set next level of indentation.
+          state.tlvNextIndent = indented;
         }
 
         if (state.tlvCodeActive) {
@@ -651,9 +656,14 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
         return style;
       },
 
+      indent: function(state) {
+        return (state.tlvCodeActive == true) ? state.tlvNextIndent : -1;
+      },
+
       startState: function(state) {
         state.tlvIndentationStyle = [];  // Styles to use for each level of indentation.
         state.tlvCodeActive = true;  // True when we're in a TLV region (and at beginning of file).
+        state.tlvNextIndent = -1;    // The number of spaces to autoindent the next line if tlvCodeActive.
         state.tlvInBlockComment = false;  // True inside /**/ comment.
         if (tlvTrackStatements) {
           state.statementComment = false;  // True inside a statement's header comment.

From dd10e2eef8a73349b3a8535508b3c878967a3215 Mon Sep 17 00:00:00 2001
From: pabloferz <pabloferz@yahoo.com.mx>
Date: Fri, 5 Feb 2016 12:09:26 +0100
Subject: [PATCH 2965/4742] [julia mode] Fixes for julia 0.5

---
 mode/julia/julia.js | 217 ++++++++++++++++++++++++--------------------
 1 file changed, 119 insertions(+), 98 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 004de4431c..6c40bf20ee 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -11,51 +11,62 @@
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode("julia", function(_conf, parserConf) {
-  var ERRORCLASS = 'error';
-
+CodeMirror.defineMode("julia", function(config, parserConf) {
   function wordRegexp(words, end) {
-    if (typeof end === 'undefined') { end = "\\b"; }
+    if (typeof end === "undefined") { end = "\\b"; }
     return new RegExp("^((" + words.join(")|(") + "))" + end);
   }
 
   var octChar = "\\\\[0-7]{1,3}";
   var hexChar = "\\\\x[A-Fa-f0-9]{1,2}";
-  var specialChar = "\\\\[abfnrtv0%?'\"\\\\]";
-  var singleChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
-  var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b(?!\()|[\u2208\u2209](?!\()/;
+  var sChar = "\\\\[abefnrtv0%?'\"\\\\]";
+  var uChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
+
+  var operators = parserConf.operators || wordRegexp([
+      "\\.?[\\\\%*+\\-<>!=\\/^]=?", "\\.?[|&\\u00F7\\u2260\\u2264\\u2265]",
+      "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2229",
+      "\\u222A", "\\u2286", "\\u2288", "\\u228A", "\\u22c5", "\\?", "~", ":",
+      "\\$", "\\.[<>]", "<<=?", ">>>?=?", "\\.[<>=]=", "->?", "\\/\\/", "=>",
+      "<:", "\\bin\\b(?!\\()"], "");
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
   var identifiers = parserConf.identifiers || /^[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
-  var charsList = [octChar, hexChar, specialChar, singleChar];
-  var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
-  var blockClosers = ["end", "else", "elseif", "catch", "finally"];
-  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype'];
-  var builtinList = ['true', 'false', 'nothing', 'NaN', 'Inf'];
-
-  //var stringPrefixes = new RegExp("^[br]?('|\")")
-  var stringPrefixes = /^(`|"{3}|([brv]?"))/;
-  var chars = wordRegexp(charsList, "'");
-  var keywords = wordRegexp(keywordList);
-  var builtins = wordRegexp(builtinList);
-  var openers = wordRegexp(blockOpeners);
-  var closers = wordRegexp(blockClosers);
+
+  var chars = wordRegexp([octChar, hexChar, sChar, uChar], "'");
+  var openers = wordRegexp(["begin", "function", "type", "immutable", "let",
+      "macro", "for", "while", "quote", "if", "else", "elseif", "try",
+      "finally", "catch", "do"]);
+  var closers = wordRegexp(["end", "else", "elseif", "catch", "finally"]);
+  var keywords = wordRegexp(["if", "else", "elseif", "while", "for", "begin",
+      "let", "end", "do", "try", "catch", "finally", "return", "break",
+      "continue", "global", "local", "const", "export", "import", "importall",
+      "using", "function", "macro", "module", "baremodule", "type",
+      "immutable", "quote", "typealias", "abstract", "bitstype"]);
+  var builtins = wordRegexp(["true", "false", "nothing", "NaN", "Inf"]);
+
   var macro = /^@[_A-Za-z][\w]*/;
   var symbol = /^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
-  var typeAnnotation = /^::[^,;"{()=$\s]+({[^}]*}+)*/;
+  var stringPrefixes = /^(`|"{3}|([_A-Za-z\u00A1-\uFFFF]*"))/;
 
   function inArray(state) {
-    var ch = currentScope(state);
-    if (ch == '[') {
+    return inGenerator(state, '[')
+  }
+
+  function inGenerator(state, bracket) {
+    var curr = currentScope(state),
+        prev = currentScope(state, 1);
+    if (typeof(bracket) === "undefined") { bracket = '('; }
+    if (curr === bracket || (prev === bracket && curr === "for")) {
       return true;
     }
     return false;
   }
 
-  function currentScope(state) {
-    if (state.scopes.length == 0) {
+  function currentScope(state, n) {
+    if (typeof(n) === "undefined") { n = 0; }
+    if (state.scopes.length <= n) {
       return null;
     }
-    return state.scopes[state.scopes.length - 1];
+    return state.scopes[state.scopes.length - (n + 1)];
   }
 
   // tokenizers
@@ -72,14 +83,15 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       leavingExpr = false;
     }
     state.leavingExpr = false;
+
     if (leavingExpr) {
       if (stream.match(/^'+/)) {
-        return 'operator';
+        return "operator";
       }
     }
 
     if (stream.match(/^\.{2,3}/)) {
-      return 'operator';
+      return "operator";
     }
 
     if (stream.eatSpace()) {
@@ -91,7 +103,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     // Handle single line comments
     if (ch === '#') {
       stream.skipToEnd();
-      return 'comment';
+      return "comment";
     }
 
     if (ch === '[') {
@@ -104,36 +116,55 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
 
     var scope = currentScope(state);
 
-    if (scope == '[' && ch === ']') {
+    if (inArray(state) && ch === ']') {
+      if (scope === "for") { state.scopes.pop(); }
       state.scopes.pop();
       state.leavingExpr = true;
     }
 
-    if (scope == '(' && ch === ')') {
+    if (inGenerator(state) && ch === ')') {
+      if (scope === "for") { state.scopes.pop(); }
       state.scopes.pop();
       state.leavingExpr = true;
     }
 
     var match;
-    if (!inArray(state) && (match=stream.match(openers, false))) {
-      state.scopes.push(match);
+    if (match = stream.match(openers, false)) {
+      state.scopes.push(match[0]);
     }
 
-    if (!inArray(state) && stream.match(closers, false)) {
+    if (stream.match(closers, false)) {
       state.scopes.pop();
     }
 
     if (inArray(state)) {
-      if (state.lastToken == 'end' && stream.match(/^:/)) {
-        return 'operator';
+      if (state.lastToken == "end" && stream.match(/^:/)) {
+        return "operator";
       }
       if (stream.match(/^end/)) {
-        return 'number';
+        return "number";
       }
     }
 
-    if (stream.match(/^=>/)) {
-      return 'operator';
+    // Handle type annotations
+    if (stream.match(/^::(?![:\$])/)) {
+      state.tokenize = tokenAnnotation;
+      return state.tokenize(stream, state);
+    }
+
+    // Handle symbols
+    if (!leavingExpr && stream.match(symbol) || stream.match(/:\./)) {
+      return "builtin";
+    }
+
+    // Handle parametric types
+    if (stream.match(/^{[^}]*}(?=\()/)) {
+      return "builtin";
+    }
+
+    // Handle operators and Delimiters
+    if (stream.match(operators)) {
+      return "operator";
     }
 
     // Handle Number Literals
@@ -156,33 +187,10 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
           // Integer literals may be "long"
           stream.match(imMatcher);
           state.leavingExpr = true;
-          return 'number';
+          return "number";
       }
     }
 
-    if (stream.match(/^<:/)) {
-      return 'operator';
-    }
-
-    if (stream.match(typeAnnotation)) {
-      return 'builtin';
-    }
-
-    // Handle symbols
-    if (!leavingExpr && stream.match(symbol) || stream.match(/:\./)) {
-      return 'builtin';
-    }
-
-    // Handle parametric types
-    if (stream.match(/^{[^}]*}(?=\()/)) {
-      return 'builtin';
-    }
-
-    // Handle operators and Delimiters
-    if (stream.match(operators)) {
-      return 'operator';
-    }
-
     // Handle Chars
     if (stream.match(/^'/)) {
       state.tokenize = tokenChar;
@@ -196,7 +204,7 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     }
 
     if (stream.match(macro)) {
-      return 'meta';
+      return "meta";
     }
 
     if (stream.match(delimiters)) {
@@ -204,38 +212,36 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     }
 
     if (stream.match(keywords)) {
-      return 'keyword';
+      return "keyword";
     }
 
     if (stream.match(builtins)) {
-      return 'builtin';
+      return "builtin";
     }
 
-    var isDefinition = state.isDefinition ||
-                       state.lastToken == 'function' ||
-                       state.lastToken == 'macro' ||
-                       state.lastToken == 'type' ||
-                       state.lastToken == 'immutable';
+    var isDefinition = state.isDefinition || state.lastToken == "function" ||
+                       state.lastToken == "macro" || state.lastToken == "type" ||
+                       state.lastToken == "immutable";
 
     if (stream.match(identifiers)) {
       if (isDefinition) {
         if (stream.peek() === '.') {
           state.isDefinition = true;
-          return 'variable';
+          return "variable";
         }
         state.isDefinition = false;
-        return 'def';
+        return "def";
       }
       if (stream.match(/^({[^}]*})*\(/, false)) {
         return callOrDef(stream, state);
       }
       state.leavingExpr = true;
-      return 'variable';
+      return "variable";
     }
 
     // Handle non-detected items
     stream.next();
-    return ERRORCLASS;
+    return "error";
   }
 
   function callOrDef(stream, state) {
@@ -255,8 +261,8 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
         state.firstParenPos = -1;
         state.charsAdvanced = 0;
         if (isDefinition)
-          return 'def';
-        return 'builtin';
+          return "def";
+        return "builtin";
       }
     }
     // Unfortunately javascript does not support multiline strings, so we have
@@ -268,25 +274,40 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
         state.scopes.pop();
       state.firstParenPos = -1;
       state.charsAdvanced = 0;
-      return 'builtin';
+      return "builtin";
     }
     state.charsAdvanced += stream.match(/^([^()]*)/)[1].length;
     return callOrDef(stream, state);
   }
 
+  function tokenAnnotation(stream, state) {
+    stream.match(/.*?(?=,|;|{|}|\(|\)|=|$|\s)/);
+    if (stream.match(/^{/)) {
+      state.nestedLevels++;
+    } else if (stream.match(/^}/)) {
+      state.nestedLevels--;
+    }
+    if (state.nestedLevels > 0) {
+      stream.match(/.*?(?={|})/);
+    } else if (state.nestedLevels == 0) {
+      state.tokenize = tokenBase;
+    }
+    return "builtin";
+  }
+
   function tokenComment(stream, state) {
     if (stream.match(/^#=/)) {
-      state.weakScopes++;
+      state.nestedLevels++;
     }
     if (!stream.match(/.*?(?=(#=|=#))/)) {
       stream.skipToEnd();
     }
     if (stream.match(/^=#/)) {
-      state.weakScopes--;
-      if (state.weakScopes == 0)
+      state.nestedLevels--;
+      if (state.nestedLevels == 0)
         state.tokenize = tokenBase;
     }
-    return 'comment';
+    return "comment";
   }
 
   function tokenChar(stream, state) {
@@ -309,33 +330,29 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
     if (isChar) {
       state.leavingExpr = true;
       state.tokenize = tokenBase;
-      return 'string';
+      return "string";
     }
     if (!stream.match(/^[^']+(?=')/)) { stream.skipToEnd(); }
     if (stream.match(/^'/)) { state.tokenize = tokenBase; }
-    return ERRORCLASS;
+    return "error";
   }
 
   function tokenStringFactory(delimiter) {
-    while ('bruv'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
-      delimiter = delimiter.substr(1);
-    }
-    var OUTCLASS = 'string';
-
+    delimiter = (delimiter === '`' || delimiter === '"""')  ? delimiter : '"'
     function tokenString(stream, state) {
       while (!stream.eol()) {
-        stream.eatWhile(/[^"\\]/);
+        stream.eatWhile(/[^\\"]/);
         if (stream.eat('\\')) {
             stream.next();
         } else if (stream.match(delimiter)) {
             state.tokenize = tokenBase;
             state.leavingExpr = true;
-            return OUTCLASS;
+            return "string";
         } else {
-            stream.eat(/["]/);
+            stream.eat('"');
         }
       }
-      return OUTCLASS;
+      return "string";
     }
     tokenString.isString = true;
     return tokenString;
@@ -346,10 +363,10 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       return {
         tokenize: tokenBase,
         scopes: [],
-        weakScopes: 0,
         lastToken: null,
         leavingExpr: false,
         isDefinition: false,
+        nestedLevels: 0,
         charsAdvanced: 0,
         firstParenPos: -1
       };
@@ -366,20 +383,24 @@ CodeMirror.defineMode("julia", function(_conf, parserConf) {
       // Handle '.' connected identifiers
       if (current === '.') {
         style = stream.match(identifiers, false) || stream.match(macro, false) ||
-                stream.match(/\(/, false) ? 'operator' : ERRORCLASS;
+                stream.match(/\(/, false) ? "operator" : "error";
       }
       return style;
     },
 
     indent: function(state, textAfter) {
       var delta = 0;
-      if (textAfter == "]" || textAfter == ")" || textAfter == "end" || textAfter == "else" || textAfter == "elseif" || textAfter == "catch" || textAfter == "finally") {
+      if ( textAfter === ']' || textAfter === ')' || textAfter === "end" ||
+           textAfter === "else" || textAfter === "catch" ||
+           textAfter === "finally" ) {
         delta = -1;
       }
-      return (state.scopes.length + delta) * _conf.indentUnit;
+      return (state.scopes.length + delta) * config.indentUnit;
     },
 
-    electricInput: /(end|else(if)?|catch|finally)$/,
+    electricInput: /\b(end|else|catch|finally)\b/,
+    blockCommentStart: "#=",
+    blockCommentEnd: "=#",
     lineComment: "#",
     fold: "indent"
   };

From 4a1ed91341378942e49a4ca1d978d99eff4dd33e Mon Sep 17 00:00:00 2001
From: Jim Avery <jlavery@us.ibm.com>
Date: Thu, 3 Nov 2016 16:38:14 -0500
Subject: [PATCH 2966/4742] [swift mode] Various improvements

 - Added for as a defining keyword
 - Added new types and operators
 - Fixed numbers so basic integers are represented
 - Identifiers can now be surrounded with backticks
 - Properties and #/@ instructions are now distinct, with the latter represented as a builtin type
 - Properties are now matched before punctuation. Code can now fold.
 - Remove the regexp checking as that syntax does not currently exist in Swift
 - Added tests
---
 mode/swift/swift.js |  39 +++++++-----
 mode/swift/test.js  | 149 ++++++++++++++++++++++++++++++++++++++++++++
 test/index.html     |   2 +
 3 files changed, 176 insertions(+), 14 deletions(-)
 create mode 100644 mode/swift/test.js

diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 9dcd822e91..329470664c 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -26,14 +26,20 @@
                           "defer","return","inout","mutating","nonmutating","catch","do","rethrows","throw","throws","try","didSet","get","set","willSet",
                           "assignment","associativity","infix","left","none","operator","postfix","precedence","precedencegroup","prefix","right",
                           "Any","AnyObject","Type","dynamicType","Self","Protocol","__COLUMN__","__FILE__","__FUNCTION__","__LINE__"])
-  var definingKeywords = wordSet(["var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype"])
+  var definingKeywords = wordSet(["var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype","for"])
   var atoms = wordSet(["true","false","nil","self","super","_"])
-  var types = wordSet(["Array","Bool","Dictionary","Double","Float","Int","Never","Optional","String","Void"])
-  var operators = "+-/*%=|&<>"
-  var punc = ";,.(){}[]"
-  var number = /^-?(?:(?:[\d_]+\.[_\d]*|\.[_\d]+|0o[0-7_\.]+|0b[01_\.]+)(?:e-?[\d_]+)?|0x[\d_a-f\.]+(?:p-?[\d_]+)?)/i
-  var identifier = /^[_A-Za-z$][_A-Za-z$0-9]*/
-  var property = /^[@\#\.][_A-Za-z$][_A-Za-z$0-9]*/
+  var types = wordSet(["Array","Bool","Character","Dictionary","Double","Float","Int","Int8","Int16","Int32","Int64","Never","Optional","Set","String",
+                       "UInt8","UInt16","UInt32","UInt64","Void"])
+  var operators = "+-/*%=|&<>~^?!"
+  var punc = ":;,.(){}[]"
+  var binary = /^\-?0b[01][01_]*/
+  var octal = /^\-?0o[0-7][0-7_]*/
+  var hexadecimal = /^\-?0x[\dA-Fa-f][\dA-Fa-f_]*(?:(?:\.[\dA-Fa-f][\dA-Fa-f_]*)?[Pp]\-?\d[\d_]*)?/
+  var decimal = /^\-?\d[\d_]*(?:\.\d[\d_]*)?(?:[Ee]\-?\d[\d_]*)?/
+  var identifier = /^\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1/
+  var property = /^\.(?:\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1)/
+  var instruction = /^\#[A-Za-z]+/
+  var attribute = /^@(?:\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1)/
   var regexp = /^\/(?!\s)(?:\/\/)?(?:\\.|[^\/])+\//
 
   function tokenBase(stream, state, prev) {
@@ -50,8 +56,14 @@
         state.tokenize.push(tokenComment)
         return tokenComment(stream, state)
       }
-      if (stream.match(regexp)) return "string-2"
     }
+    if (stream.match(instruction)) return "builtin"
+    if (stream.match(attribute)) return "attribute"
+    if (stream.match(binary)) return "number"
+    if (stream.match(octal)) return "number"
+    if (stream.match(hexadecimal)) return "number"
+    if (stream.match(decimal)) return "number"
+    if (stream.match(property)) return "property"
     if (operators.indexOf(ch) > -1) {
       stream.next()
       return "operator"
@@ -68,18 +80,15 @@
       return tokenize(stream, state)
     }
 
-    if (stream.match(number)) return "number"
-    if (stream.match(property)) return "property"
-
     if (stream.match(identifier)) {
       var ident = stream.current()
+      if (types.hasOwnProperty(ident)) return "variable-2"
+      if (atoms.hasOwnProperty(ident)) return "atom"
       if (keywords.hasOwnProperty(ident)) {
         if (definingKeywords.hasOwnProperty(ident))
           state.prev = "define"
         return "keyword"
       }
-      if (types.hasOwnProperty(ident)) return "variable-2"
-      if (atoms.hasOwnProperty(ident)) return "atom"
       if (prev == "define") return "def"
       return "variable"
     }
@@ -191,7 +200,9 @@
 
       lineComment: "//",
       blockCommentStart: "/*",
-      blockCommentEnd: "*/"
+      blockCommentEnd: "*/",
+      fold: "brace",
+      closeBrackets: "()[]{}''\"\"``"
     }
   })
 
diff --git a/mode/swift/test.js b/mode/swift/test.js
new file mode 100644
index 0000000000..8c8ee2f65a
--- /dev/null
+++ b/mode/swift/test.js
@@ -0,0 +1,149 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "swift");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  // Ensure all number types are properly represented.
+  MT("numbers",
+     "[keyword var] [def a] [operator =] [number 17]",
+     "[keyword var] [def b] [operator =] [number -0.5]",
+     "[keyword var] [def c] [operator =] [number 0.3456e-4]",
+     "[keyword var] [def d] [operator =] [number 345e2]",
+     "[keyword var] [def e] [operator =] [number 0o7324]",
+     "[keyword var] [def f] [operator =] [number 0b10010]",
+     "[keyword var] [def g] [operator =] [number -0x35ade]",
+     "[keyword var] [def h] [operator =] [number 0xaea.ep-13]".
+     "[keyword var] [def i] [operator =] [number 0x13ep6");
+
+  // Variable/class/etc definition.
+  MT("definition",
+     "[keyword var] [def a] [operator =] [number 5]",
+     "[keyword let] [def b][punctuation :] [variable-2 Int] [operator =] [number 10]",
+     "[keyword class] [def C] [punctuation {] [punctuation }]",
+     "[keyword struct] [def D] [punctuation {] [punctuation }]",
+     "[keyword enum] [def E] [punctuation {] [punctuation }]",
+     "[keyword extension] [def F] [punctuation {] [punctuation }]",
+     "[keyword protocol] [def G] [punctuation {] [punctuation }]",
+     "[keyword func] [def h][punctuation ()] [punctuation {] [punctuation }]",
+     "[keyword import] [def Foundation]",
+     "[keyword typealias] [def NewString] [operator =] [variable-2 String]",
+     "[keyword associatedtype] [def I]",
+     "[keyword for] [def j] [keyword in] [number 0][punctuation ..][operator <][number 3] [punctuation {] [punctuation }]");
+
+  // Strings and string interpolation.
+  MT("strings",
+     "[keyword var] [def a][punctuation :] [variable-2 String] [operator =] [string \"test\"]",
+     "[keyword var] [def b][punctuation :] [variable-2 String] [operator =] [string \"\\(][variable a][string )\"]");
+
+  // Comments.
+  MT("comments",
+     "[comment // This is a comment]",
+     "[comment /* This is another comment */]",
+     "[keyword var] [def a] [operator =] [number 5] [comment // Third comment]");
+
+  // Atoms.
+  MT("atoms",
+     "[keyword class] [def FooClass] [punctuation {]",
+     "  [keyword let] [def fooBool][punctuation :] [variable-2 Bool][operator ?]",
+     "  [keyword let] [def fooInt][punctuation :] [variable-2 Int][operator ?]",
+     "  [keyword func] [keyword init][punctuation (][variable fooBool][punctuation :] [variable-2 Bool][punctuation ,] [variable barBool][punctuation :] [variable-2 Bool][punctuation )] [punctuation {]",
+     "    [atom super][property .init][punctuation ()]",
+     "    [atom self][property .fooBool] [operator =] [variable fooBool]",
+     "    [variable fooInt] [operator =] [atom nil]",
+     "    [keyword if] [variable barBool] [operator ==] [atom true] [punctuation {]",
+     "      [variable print][punctuation (][string \"True!\"][punctuation )]",
+     "    [punctuation }] [keyword else] [keyword if] [variable barBool] [operator ==] [atom false] [punctuation {]",
+     "      [keyword for] [atom _] [keyword in] [number 0][punctuation ...][number 5] [punctuation {]",
+     "        [variable print][punctuation (][string \"False!\"][punctuation )]",
+     "      [punctuation }]",
+     "    [punctuation }]",
+     "  [punctuation }]",
+     "[punctuation }]");
+
+  // Types.
+  MT("types",
+     "[keyword var] [def a] [operator =] [variable-2 Array][operator <][variable-2 Int][operator >]",
+     "[keyword var] [def b] [operator =] [variable-2 Set][operator <][variable-2 Bool][operator >]",
+     "[keyword var] [def c] [operator =] [variable-2 Dictionary][operator <][variable-2 String][punctuation ,][variable-2 Character][operator >]",
+     "[keyword var] [def d][punctuation :] [variable-2 Int64][operator ?] [operator =] [variable-2 Optional][punctuation (][number 8][punctuation )]",
+     "[keyword func] [def e][punctuation ()] [operator ->] [variable-2 Void] [punctuation {]",
+     "  [keyword var] [def e1][punctuation :] [variable-2 Float] [operator =] [number 1.2]",
+     "[punctuation }]",
+     "[keyword func] [def f][punctuation ()] [operator ->] [variable-2 Never] [punctuation {]",
+     "  [keyword var] [def f1][punctuation :] [variable-2 Double] [operator =] [number 2.4]",
+     "[punctuation }]");
+
+  // Operators.
+  MT("operators",
+     "[keyword var] [def a] [operator =] [number 1] [operator +] [number 2]",
+     "[keyword var] [def b] [operator =] [number 1] [operator -] [number 2]",
+     "[keyword var] [def c] [operator =] [number 1] [operator *] [number 2]",
+     "[keyword var] [def d] [operator =] [number 1] [operator /] [number 2]",
+     "[keyword var] [def e] [operator =] [number 1] [operator %] [number 2]",
+     "[keyword var] [def f] [operator =] [number 1] [operator |] [number 2]",
+     "[keyword var] [def g] [operator =] [number 1] [operator &] [number 2]",
+     "[keyword var] [def h] [operator =] [number 1] [operator <<] [number 2]",
+     "[keyword var] [def i] [operator =] [number 1] [operator >>] [number 2]",
+     "[keyword var] [def j] [operator =] [number 1] [operator ^] [number 2]",
+     "[keyword var] [def k] [operator =] [operator ~][number 1]",
+     "[keyword var] [def l] [operator =] [variable foo] [operator ?] [number 1] [punctuation :] [number 2]",
+     "[keyword var] [def m][punctuation :] [variable-2 Int] [operator =] [variable-2 Optional][punctuation (][number 8][punctuation )][operator !]");
+
+  // Punctuation.
+  MT("punctuation",
+     "[keyword let] [def a] [operator =] [number 1][punctuation ;] [keyword let] [def b] [operator =] [number 2]",
+     "[keyword let] [def testArr][punctuation :] [punctuation [[][variable-2 Int][punctuation ]]] [operator =] [punctuation [[][variable a][punctuation ,] [variable b][punctuation ]]]",
+     "[keyword for] [def i] [keyword in] [number 0][punctuation ..][operator <][variable testArr][property .count] [punctuation {]",
+     "  [variable print][punctuation (][variable testArr][punctuation [[][variable i][punctuation ]])]",
+     "[punctuation }]");
+
+  // Identifiers.
+  MT("identifiers",
+     "[keyword let] [def abc] [operator =] [number 1]",
+     "[keyword let] [def ABC] [operator =] [number 2]",
+     "[keyword let] [def _123] [operator =] [number 3]",
+     "[keyword let] [def _$1$2$3] [operator =] [number 4]",
+     "[keyword let] [def A1$_c32_$_] [operator =] [number 5]",
+     "[keyword let] [def `var`] [operator =] [punctuation [[][number 1][punctuation ,] [number 2][punctuation ,] [number 3][punctuation ]]]",
+     "[keyword let] [def square$] [operator =] [variable `var`][property .map] [punctuation {][variable $0] [operator *] [variable $0][punctuation }]",
+     "$$ [number 1][variable a] $[atom _] [variable _$] [variable __] `[variable a] [variable b]`");
+
+  // Properties.
+  MT("properties",
+     "[variable print][punctuation (][variable foo][property .abc][punctuation )]",
+     "[variable print][punctuation (][variable foo][property .ABC][punctuation )]",
+     "[variable print][punctuation (][variable foo][property ._123][punctuation )]",
+     "[variable print][punctuation (][variable foo][property ._$1$2$3][punctuation )]",
+     "[variable print][punctuation (][variable foo][property .A1$_c32_$_][punctuation )]",
+     "[variable print][punctuation (][variable foo][property .`var`][punctuation )]",
+     "[variable print][punctuation (][variable foo][property .__][punctuation )]");
+
+  // Instructions or other things that start with #.
+  MT("instructions",
+     "[keyword if] [instruction #available][punctuation (][variable iOS] [number 9][punctuation ,] [operator *][punctuation )] [punctuation {}",
+     "[variable print][punctuation (][instruction #file][punctuation ,] [instruction #function][punctuation )]",
+     "[variable print][punctuation (][instruction #line][punctuation ,] [instruction #column][punctuation )]",
+     "[instruction #if] [atom true]",
+     "  [keyword import] [variable A]",
+     "[instruction #elseif] [atom false]",
+     "  [keyword import] [variable B]",
+     "[instruction #endif]",
+     "[instruction #sourceLocation][punctuation (][variable file][punctuation :] [string \"file.swift\"][punctuation ,] [variable line][punctuation :] [number 2][punctuation )]");
+
+  // Attributes; things that start with @.
+  MT("attributes",
+     "[instruction @objc][punctuation (][variable objcFoo][punctuation :)]",
+     "[instruction @available][punctuation (][variable iOS][punctuation )]");
+
+  // Property/number edge case.
+  MT("property_number",
+     "[variable print][punctuation (][variable foo][property ._123][punctuation )]",
+     "[variable print][punctuation (]")
+
+  // TODO: correctly identify when multiple variables are being declared
+  // by use of a comma-separated list.
+  // TODO: correctly identify when variables are being declared in a tuple.
+  // TODO: identify protocols as types when used before an extension?
+})();
diff --git a/test/index.html b/test/index.html
index 8ac33c0913..cfa3bb71fb 100644
--- a/test/index.html
+++ b/test/index.html
@@ -35,6 +35,7 @@
 <script src="../mode/slim/slim.js"></script>
 <script src="../mode/sql/sql.js"></script>
 <script src="../mode/stex/stex.js"></script>
+<script src="../mode/swift/swift.js"></script>
 <script src="../mode/textile/textile.js"></script>
 <script src="../mode/verilog/verilog.js"></script>
 <script src="../mode/xml/xml.js"></script>
@@ -122,6 +123,7 @@ <h2>Test Suite</h2>
     <script src="../mode/shell/test.js"></script>
     <script src="../mode/slim/test.js"></script>
     <script src="../mode/stex/test.js"></script>
+    <script src="../mode/swift/test.js"></script>
     <script src="../mode/textile/test.js"></script>
     <script src="../mode/verilog/test.js"></script>
     <script src="../mode/xml/test.js"></script>

From 18c1bcb556bd1e5bab56d2564fd79cefee4ddc79 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 9 Nov 2016 11:03:13 +0100
Subject: [PATCH 2967/4742] [swift mode] Make tests syntactically valid and in
 agreement with the mode

Issue #4374
---
 mode/swift/swift.js |  2 +-
 mode/swift/test.js  | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 329470664c..43ab7c8fb4 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -40,7 +40,7 @@
   var property = /^\.(?:\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1)/
   var instruction = /^\#[A-Za-z]+/
   var attribute = /^@(?:\$\d+|(`?)[_A-Za-z][_A-Za-z$0-9]*\1)/
-  var regexp = /^\/(?!\s)(?:\/\/)?(?:\\.|[^\/])+\//
+  //var regexp = /^\/(?!\s)(?:\/\/)?(?:\\.|[^\/])+\//
 
   function tokenBase(stream, state, prev) {
     if (stream.sol()) state.indented = stream.indentation()
diff --git a/mode/swift/test.js b/mode/swift/test.js
index 8c8ee2f65a..786b89e299 100644
--- a/mode/swift/test.js
+++ b/mode/swift/test.js
@@ -14,8 +14,8 @@
      "[keyword var] [def e] [operator =] [number 0o7324]",
      "[keyword var] [def f] [operator =] [number 0b10010]",
      "[keyword var] [def g] [operator =] [number -0x35ade]",
-     "[keyword var] [def h] [operator =] [number 0xaea.ep-13]".
-     "[keyword var] [def i] [operator =] [number 0x13ep6");
+     "[keyword var] [def h] [operator =] [number 0xaea.ep-13]",
+     "[keyword var] [def i] [operator =] [number 0x13ep6]");
 
   // Variable/class/etc definition.
   MT("definition",
@@ -122,20 +122,20 @@
 
   // Instructions or other things that start with #.
   MT("instructions",
-     "[keyword if] [instruction #available][punctuation (][variable iOS] [number 9][punctuation ,] [operator *][punctuation )] [punctuation {}",
-     "[variable print][punctuation (][instruction #file][punctuation ,] [instruction #function][punctuation )]",
-     "[variable print][punctuation (][instruction #line][punctuation ,] [instruction #column][punctuation )]",
-     "[instruction #if] [atom true]",
-     "  [keyword import] [variable A]",
-     "[instruction #elseif] [atom false]",
-     "  [keyword import] [variable B]",
-     "[instruction #endif]",
-     "[instruction #sourceLocation][punctuation (][variable file][punctuation :] [string \"file.swift\"][punctuation ,] [variable line][punctuation :] [number 2][punctuation )]");
+     "[keyword if] [builtin #available][punctuation (][variable iOS] [number 9][punctuation ,] [operator *][punctuation )] [punctuation {}]",
+     "[variable print][punctuation (][builtin #file][punctuation ,] [builtin #function][punctuation )]",
+     "[variable print][punctuation (][builtin #line][punctuation ,] [builtin #column][punctuation )]",
+     "[builtin #if] [atom true]",
+     "[keyword import] [def A]",
+     "[builtin #elseif] [atom false]",
+     "[keyword import] [def B]",
+     "[builtin #endif]",
+     "[builtin #sourceLocation][punctuation (][variable file][punctuation :] [string \"file.swift\"][punctuation ,] [variable line][punctuation :] [number 2][punctuation )]");
 
   // Attributes; things that start with @.
   MT("attributes",
-     "[instruction @objc][punctuation (][variable objcFoo][punctuation :)]",
-     "[instruction @available][punctuation (][variable iOS][punctuation )]");
+     "[attribute @objc][punctuation (][variable objcFoo][punctuation :)]",
+     "[attribute @available][punctuation (][variable iOS][punctuation )]");
 
   // Property/number edge case.
   MT("property_number",

From a34c02883bcf5ad0d9328de6fff0fafde9a7aa3f Mon Sep 17 00:00:00 2001
From: Paris Kasidiaris <paris@sourcelair.com>
Date: Thu, 10 Nov 2016 10:16:01 +0200
Subject: [PATCH 2968/4742] [real-world uses] Add SourceLair

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 8db34cd9fa..e52c9f00f8 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -146,6 +146,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
       <li><a href="http://www.skulpt.org/">Skulpt</a> (in-browser Python environment)</li>
+      <li><a href="https://www.sourcelair.com">SourceLair</a> (in-browser IDE for Django, Node.js, PHP and HTML5)</li>
       <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>

From 5d235c1b6ecb299892179ab8fe0f3f28693aabf1 Mon Sep 17 00:00:00 2001
From: Sander Verweij <sverweij@users.noreply.github.com>
Date: Sun, 13 Nov 2016 15:26:24 +0100
Subject: [PATCH 2969/4742] [real world uses] adds mscgen.js.org

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

diff --git a/doc/realworld.html b/doc/realworld.html
index e52c9f00f8..dc2a7f6a97 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -118,6 +118,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.iunbug.com/mihtool">MIHTool</a> (iOS web-app debugging tool)</li>
       <li><a href="http://mongo-mapreduce-webbrowser.opensagres.cloudbees.net/">Mongo MapReduce WebBrowser</a></li>
       <li><a href="http://montagestudio.com/">Montage Studio</a> (web app creator suite)</li>
+      <li><a href="http://mscgen.js.org/index.html">mscgen_js</a> (online sequence chart editor)</li>
       <li><a href="http://mvcplayground.apphb.com/">MVC Playground</a></li>
       <li><a href="https://www.my2ndgeneration.com/">My2ndGeneration</a> (social coding)</li>
       <li><a href="http://www.navigatecms.com">Navigate CMS</a></li>

From e6eebeb19291889aa05f2bd34ce113702ec44090 Mon Sep 17 00:00:00 2001
From: pabloferz <pabloferz@yahoo.com.mx>
Date: Sat, 12 Nov 2016 23:13:25 -0600
Subject: [PATCH 2970/4742] [julia mode] Fix string tokenizer

---
 mode/julia/julia.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 6c40bf20ee..0174210b55 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -338,23 +338,20 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   }
 
   function tokenStringFactory(delimiter) {
-    delimiter = (delimiter === '`' || delimiter === '"""')  ? delimiter : '"'
+    delimiter = (delimiter === '`' || delimiter === '"""') ? delimiter : '"';
     function tokenString(stream, state) {
-      while (!stream.eol()) {
-        stream.eatWhile(/[^\\"]/);
-        if (stream.eat('\\')) {
-            stream.next();
-        } else if (stream.match(delimiter)) {
-            state.tokenize = tokenBase;
-            state.leavingExpr = true;
-            return "string";
-        } else {
-            stream.eat('"');
-        }
+      if (stream.eat('\\')) {
+        stream.next();
+      } else if (stream.match(delimiter)) {
+        state.tokenize = tokenBase;
+        state.leavingExpr = true;
+        return "string";
+      } else {
+        stream.eat(/[`"]/);
       }
+      stream.eatWhile(/[^\\`"]/);
       return "string";
     }
-    tokenString.isString = true;
     return tokenString;
   }
 

From 0a90aa456c6c850956b2bdc45334dfe5ce7f0d5e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 14 Nov 2016 10:36:23 +0100
Subject: [PATCH 2971/4742] Simplify build instructions in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1b3309881c..3328e3bdfb 100644
--- a/README.md
+++ b/README.md
@@ -30,5 +30,5 @@ conduct.
 ### Quickstart
 
 To build the project, make sure you have Node.js installed (at least version 6)
-and then `npm install && npm run build`. To run, just open `index.html` in your
+and then `npm install`. To run, just open `index.html` in your
 browser (you don't need to run a webserver). Run the tests with `npm test`.

From 90819c54aae09c0002286cd43e57522432580d7c Mon Sep 17 00:00:00 2001
From: Mark Peace <mark.peace@neotechnology.com>
Date: Fri, 11 Nov 2016 16:48:36 +0000
Subject: [PATCH 2972/4742] [cypher mode] Highlight empty string literals
 correctly

---
 mode/cypher/cypher.js |  6 +++---
 mode/cypher/test.js   | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 1d9ca4334a..9b2490014c 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -20,12 +20,12 @@
   CodeMirror.defineMode("cypher", function(config) {
     var tokenBase = function(stream/*, state*/) {
       var ch = stream.next();
-      if (ch === "\"") {
-        stream.match(/.+?["]/);
+      if (ch ==='"') {
+        stream.match(/.*?"/);
         return "string";
       }
       if (ch === "'") {
-        stream.match(/.+?[']/);
+        stream.match(/.*?'/);
         return "string";
       }
       if (/[{}\(\),\.;\[\]]/.test(ch)) {
diff --git a/mode/cypher/test.js b/mode/cypher/test.js
index 34cf96caff..76d0d08296 100644
--- a/mode/cypher/test.js
+++ b/mode/cypher/test.js
@@ -16,4 +16,22 @@
 
   MT("singleQuotedString",
       "[string 'a'][variable b]");
+
+  MT("single attribute (with content)",
+      "[node {][atom a:][string 'a'][node }]");
+
+  MT("multiple attribute, singleQuotedString (with content)",
+      "[node {][atom a:][string 'a'][node ,][atom b:][string 'b'][node }]");
+
+  MT("multiple attribute, doubleQuotedString (with content)",
+      "[node {][atom a:][string \"a\"][node ,][atom b:][string \"b\"][node }]");
+
+  MT("single attribute (without content)",
+      "[node {][atom a:][string 'a'][node }]");
+
+  MT("multiple attribute, singleQuotedString (without content)",
+      "[node {][atom a:][string ''][node ,][atom b:][string ''][node }]");
+
+  MT("multiple attribute, doubleQuotedString (without content)",
+      "[node {][atom a:][string \"\"][node ,][atom b:][string \"\"][node }]");
  })();

From 532ae310c9248e696caa21ca34519b79367cd4eb Mon Sep 17 00:00:00 2001
From: Marcelo Camargo <marcelocamargo@linuxmail.org>
Date: Mon, 14 Nov 2016 17:37:54 -0200
Subject: [PATCH 2973/4742] [sql mode] Remove non-strict useless comparison for
 booleans

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

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index e3cbae54cf..32ced3e9de 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -32,13 +32,13 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       if (result !== false) return result;
     }
 
-    if (support.hexNumber == true &&
+    if (support.hexNumber &&
       ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/))
       || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/))) {
       // hex
       // ref: http://dev.mysql.com/doc/refman/5.5/en/hexadecimal-literals.html
       return "number";
-    } else if (support.binaryNumber == true &&
+    } else if (support.binaryNumber &&
       (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
       || (ch == "0" && stream.match(/^b[01]+/)))) {
       // bitstring
@@ -48,7 +48,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       // numbers
       // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
           stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
-      support.decimallessFloat == true && stream.eat('.');
+      support.decimallessFloat && stream.eat('.');
       return "number";
     } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
       // placeholders
@@ -58,8 +58,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
       state.tokenize = tokenLiteral(ch);
       return state.tokenize(stream, state);
-    } else if ((((support.nCharCast == true && (ch == "n" || ch == "N"))
-        || (support.charsetCast == true && ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
+    } else if ((((support.nCharCast && (ch == "n" || ch == "N"))
+        || (support.charsetCast && ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
         && (stream.peek() == "'" || stream.peek() == '"'))) {
       // charset casting: _utf8'str', N'str', n'str'
       // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
@@ -84,12 +84,12 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       return state.tokenize(stream, state);
     } else if (ch == ".") {
       // .1 for 0.1
-      if (support.zerolessFloat == true && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) {
+      if (support.zerolessFloat && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) {
         return "number";
       }
       // .table_name (ODBC)
       // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-      if (support.ODBCdotTable == true && stream.match(/^[a-zA-Z_]+/)) {
+      if (support.ODBCdotTable && stream.match(/^[a-zA-Z_]+/)) {
         return "variable-2";
       }
     } else if (operatorChars.test(ch)) {

From beb838248ad29721f11c5b33ce08c701d93875da Mon Sep 17 00:00:00 2001
From: takamori <takamori@users.noreply.github.com>
Date: Mon, 14 Nov 2016 12:44:30 -0800
Subject: [PATCH 2974/4742] [css mode] Support user-select.

As described in http://caniuse.com/#feat=user-select-none and https://developer.mozilla.org/en-US/docs/Web/CSS/user-select
---
 mode/css/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index b75732034e..985287f475 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -522,7 +522,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "text-wrap", "top", "transform", "transform-origin", "transform-style",
     "transition", "transition-delay", "transition-duration",
     "transition-property", "transition-timing-function", "unicode-bidi",
-    "vertical-align", "visibility", "voice-balance", "voice-duration",
+    "user-select", "vertical-align", "visibility", "voice-balance", "voice-duration",
     "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
     "voice-volume", "volume", "white-space", "widows", "width", "word-break",
     "word-spacing", "word-wrap", "z-index",

From 5012e8772371632bc4e4162e1a0f674d42cd1d79 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Nov 2016 13:18:46 +0100
Subject: [PATCH 2975/4742] [contenteditable input] Force editor selection in
 focus method

So that the selection isn't reset to the start of the element by
div.focus().
---
 src/input/ContentEditableInput.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index cdaa825488..594f17f663 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -199,7 +199,11 @@ ContentEditableInput.prototype = copyObj({
   },
 
   focus: function() {
-    if (this.cm.options.readOnly != "nocursor") this.div.focus()
+    if (this.cm.options.readOnly != "nocursor") {
+      if (!this.selectionInEditor())
+        this.showSelection(this.prepareSelection(), true)
+      this.div.focus()
+    }
   },
   blur: function() { this.div.blur() },
   getField: function() { return this.div },

From da8a35d05e720db980c4ae2307c7615aceaa53ac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Nov 2016 13:46:59 +0100
Subject: [PATCH 2976/4742] Handle compositionupdate events without
 corresponding compositionstart

Because Android, especially Google Keyboard, just doesn't care
---
 src/input/ContentEditableInput.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 594f17f663..524d571e5e 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -37,8 +37,7 @@ ContentEditableInput.prototype = copyObj({
       }), 20)
     })
 
-    on(div, "compositionstart", e => {
-      let data = e.data
+    function startComposing(data) {
       input.composing = {sel: cm.doc.sel, data: data, startData: data}
       if (!data) return
       let prim = cm.doc.sel.primary()
@@ -47,8 +46,13 @@ ContentEditableInput.prototype = copyObj({
       if (found > -1 && found <= prim.head.ch)
         input.composing.sel = simpleSelection(Pos(prim.head.line, found),
                                               Pos(prim.head.line, found + data.length))
+    }
+
+    on(div, "compositionstart", e => startComposing(e.data))
+    on(div, "compositionupdate", e => {
+      if (input.composing) input.composing.data = e.data
+      else startComposing(e.data)
     })
-    on(div, "compositionupdate", e => input.composing.data = e.data)
     on(div, "compositionend", e => {
       let ours = input.composing
       if (!ours) return

From 0e545326ddb3a82df1b76eb18b2221990536e588 Mon Sep 17 00:00:00 2001
From: Todd Berman <tberman@github.com>
Date: Tue, 8 Nov 2016 09:17:56 -0800
Subject: [PATCH 2977/4742] Move setGutterMarker, clearGutter and lineInfo to
 Doc

---
 doc/manual.html     |  6 +++---
 src/edit/methods.js | 42 ++----------------------------------------
 src/model/Doc.js    | 41 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index e74ec36200..ecfe3071f7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1699,7 +1699,7 @@ <h3 id="api_marker">Text-marking methods</h3>
     <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
 
     <dl>
-      <dt id="setGutterMarker"><code><strong>cm.setGutterMarker</strong>(line: integer|LineHandle, gutterID: string, value: Element) → LineHandle</code></dt>
+      <dt id="setGutterMarker"><code><strong>doc.setGutterMarker</strong>(line: integer|LineHandle, gutterID: string, value: Element) → LineHandle</code></dt>
       <dd>Sets the gutter marker for the given gutter (identified by
       its CSS class, see
       the <a href="#option_gutters"><code>gutters</code></a> option)
@@ -1708,7 +1708,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       will be shown in the specified gutter next to the specified
       line.</dd>
 
-      <dt id="clearGutter"><code><strong>cm.clearGutter</strong>(gutterID: string)</code></dt>
+      <dt id="clearGutter"><code><strong>doc.clearGutter</strong>(gutterID: string)</code></dt>
       <dd>Remove all gutter markers in
       the <a href="#option_gutters">gutter</a> with the given ID.</dd>
 
@@ -1733,7 +1733,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       can be left off to remove all classes for the specified node, or
       be a string to remove only a specific class.</dd>
 
-      <dt id="lineInfo"><code><strong>cm.lineInfo</strong>(line: integer|LineHandle) → object</code></dt>
+      <dt id="lineInfo"><code><strong>doc.lineInfo</strong>(line: integer|LineHandle) → object</code></dt>
       <dd>Returns the line number, text content, and marker status of
       the given line, which can be either a number or a line handle.
       The returned object has the structure <code>{line, handle, text,
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 8aa2a437b0..7efaf20e2c 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -1,5 +1,4 @@
 import { deleteNearSelection } from "./deleteNearSelection"
-import { changeLine } from "../model/changes"
 import { commands } from "./commands"
 import { attachDoc } from "../model/document_data"
 import { activeElt, addClass, rmClass } from "../util/dom"
@@ -18,9 +17,9 @@ import { addToScrollPos, calculateScrollPos, ensureCursorVisible, resolveScrollT
 import { heightAtLine } from "../line/spans"
 import { updateGutterSpace } from "../display/update_display"
 import { lineLeft, lineRight, moveLogically, moveVisually } from "../util/bidi"
-import { indexOf, insertSorted, isEmpty, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
+import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
 import { signalLater } from "../util/operation_group"
-import { getLine, isLine, lineAtHeight, lineNo } from "../line/utils_line"
+import { getLine, isLine, lineAtHeight } from "../line/utils_line"
 import { regChange, regLineChange } from "../display/view_tracking"
 
 // The publicly visible API. Note that methodOp(f) means
@@ -218,43 +217,6 @@ export default function(CodeMirror) {
     defaultTextHeight: function() { return textHeight(this.display) },
     defaultCharWidth: function() { return charWidth(this.display) },
 
-    setGutterMarker: methodOp(function(line, gutterID, value) {
-      return changeLine(this.doc, line, "gutter", line => {
-        let markers = line.gutterMarkers || (line.gutterMarkers = {})
-        markers[gutterID] = value
-        if (!value && isEmpty(markers)) line.gutterMarkers = null
-        return true
-      })
-    }),
-
-    clearGutter: methodOp(function(gutterID) {
-      let doc = this.doc, i = doc.first
-      doc.iter(line => {
-        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
-          line.gutterMarkers[gutterID] = null
-          regLineChange(this, i, "gutter")
-          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null
-        }
-        ++i
-      })
-    }),
-
-    lineInfo: function(line) {
-      let n
-      if (typeof line == "number") {
-        if (!isLine(this.doc, line)) return null
-        n = line
-        line = getLine(this.doc, line)
-        if (!line) return null
-      } else {
-        n = lineNo(line)
-        if (n == null) return null
-      }
-      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
-              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
-              widgets: line.widgets}
-    },
-
     getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo}},
 
     addWidget: function(pos, node, scroll, vert, horiz) {
diff --git a/src/model/Doc.js b/src/model/Doc.js
index fcb2c1e109..27b62d1945 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -6,7 +6,7 @@ import { visualLine } from "../line/spans"
 import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_line"
 import { classTest } from "../util/dom"
 import { splitLinesAuto } from "../util/feature_detection"
-import { createObj, map, sel_dontScroll } from "../util/misc"
+import { createObj, map, isEmpty, sel_dontScroll } from "../util/misc"
 import { ensureCursorVisible } from "../display/scrolling"
 
 import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes"
@@ -219,6 +219,45 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     hist.undone = copyHistoryArray(histData.undone.slice(0), null, true)
   },
 
+  setGutterMarker: docMethodOp(function(line, gutterID, value) {
+    return changeLine(this, line, "gutter", line => {
+      let markers = line.gutterMarkers || (line.gutterMarkers = {})
+      markers[gutterID] = value
+      if (!value && isEmpty(markers)) line.gutterMarkers = null
+      return true
+    })
+  }),
+
+  clearGutter: docMethodOp(function(gutterID) {
+    let i = this.first
+    this.iter(line => {
+      if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
+        changeLine(this, line, "gutter", () => {
+          line.gutterMarkers[gutterID] = null
+          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null
+          return true
+        })
+      }
+      ++i
+    })
+  }),
+
+  lineInfo: function(line) {
+    let n
+    if (typeof line == "number") {
+      if (!isLine(this, line)) return null
+      n = line
+      line = getLine(this, line)
+      if (!line) return null
+    } else {
+      n = lineNo(line)
+      if (n == null) return null
+    }
+    return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
+            textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
+            widgets: line.widgets}
+  },
+
   addLineClass: docMethodOp(function(handle, where, cls) {
     return changeLine(this, handle, where == "gutter" ? "gutter" : "class", line => {
       let prop = where == "text" ? "textClass"

From 441641e6cb75ebbd2f5551befe2b2cde9ddf9ab2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Nov 2016 14:54:05 +0100
Subject: [PATCH 2978/4742] [contenteditable input] Read from the DOM to get
 composition input

And do so only after a delay, so that subsequent input
events get a chance to fire.
---
 src/edit/CodeMirror.js            |  1 +
 src/edit/mouse_events.js          |  1 +
 src/input/ContentEditableInput.js | 67 +++++++++++++------------------
 3 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 7e17002d15..a3dc622cf1 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -142,6 +142,7 @@ function registerEventHandlers(cm) {
   }
   on(d.scroller, "touchstart", e => {
     if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
+      d.input.ensurePolled()
       clearTimeout(touchFinished)
       let now = +new Date
       d.activeTouch = {start: now, moved: false,
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 784f195b3e..0b96f4cfda 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -21,6 +21,7 @@ import { bind, countColumn, findColumn, sel_mouse } from "../util/misc"
 export function onMouseDown(e) {
   let cm = this, display = cm.display
   if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return
+  display.input.ensurePolled()
   display.shift = e.shiftKey
 
   if (eventInWidget(display, e)) {
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 524d571e5e..a7254b12c2 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -20,7 +20,9 @@ export default function ContentEditableInput(cm) {
   this.cm = cm
   this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null
   this.polling = new Delayed()
+  this.composing = null
   this.gracePeriod = false
+  this.readDOMTimeout = null
 }
 
 ContentEditableInput.prototype = copyObj({
@@ -37,44 +39,23 @@ ContentEditableInput.prototype = copyObj({
       }), 20)
     })
 
-    function startComposing(data) {
-      input.composing = {sel: cm.doc.sel, data: data, startData: data}
-      if (!data) return
-      let prim = cm.doc.sel.primary()
-      let line = cm.getLine(prim.head.line)
-      let found = line.indexOf(data, Math.max(0, prim.head.ch - data.length))
-      if (found > -1 && found <= prim.head.ch)
-        input.composing.sel = simpleSelection(Pos(prim.head.line, found),
-                                              Pos(prim.head.line, found + data.length))
-    }
-
-    on(div, "compositionstart", e => startComposing(e.data))
+    on(div, "compositionstart", e => {
+      this.composing = {data: e.data}
+    })
     on(div, "compositionupdate", e => {
-      if (input.composing) input.composing.data = e.data
-      else startComposing(e.data)
+      if (!this.composing) this.composing = {data: e.data}
     })
     on(div, "compositionend", e => {
-      let ours = input.composing
-      if (!ours) return
-      if (e.data != ours.startData && !/\u200b/.test(e.data))
-        ours.data = e.data
-      // Need a small delay to prevent other code (input event,
-      // selection polling) from doing damage when fired right after
-      // compositionend.
-      setTimeout(() => {
-        if (!ours.handled)
-          input.applyComposition(ours)
-        if (input.composing == ours)
-          input.composing = null
-      }, 50)
+      if (this.composing) {
+        if (e.data != this.composing.data) this.readFromDOMSoon()
+        this.composing = null
+      }
     })
 
     on(div, "touchstart", () => input.forceCompositionEnd())
 
     on(div, "input", () => {
-      if (input.composing) return
-      if (cm.isReadOnly() || !input.pollContent())
-        runInOp(input.cm, () => regChange(cm))
+      if (!this.composing) this.readFromDOMSoon()
     })
 
     function onCopyCut(e) {
@@ -237,7 +218,7 @@ ContentEditableInput.prototype = copyObj({
   },
 
   pollSelection: function() {
-    if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
+    if (!this.composing && this.readDOMTimeout == null && !this.gracePeriod && this.selectionChanged()) {
       let sel = window.getSelection(), cm = this.cm
       this.rememberSelection()
       let anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
@@ -250,6 +231,11 @@ ContentEditableInput.prototype = copyObj({
   },
 
   pollContent: function() {
+    if (this.readDOMTimeout != null) {
+      clearTimeout(this.readDOMTimeout)
+      this.readDOMTimeout = null
+    }
+
     let cm = this.cm, display = cm.display, sel = cm.doc.sel.primary()
     let from = sel.from(), to = sel.to()
     if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false
@@ -309,17 +295,20 @@ ContentEditableInput.prototype = copyObj({
     this.forceCompositionEnd()
   },
   forceCompositionEnd: function() {
-    if (!this.composing || this.composing.handled) return
-    this.applyComposition(this.composing)
-    this.composing.handled = true
+    if (!this.composing) return
+    this.composing = null
+    if (!this.pollContent()) regChange(this.cm)
     this.div.blur()
     this.div.focus()
   },
-  applyComposition: function(composing) {
-    if (this.cm.isReadOnly())
-      operation(this.cm, regChange)(this.cm)
-    else if (composing.data && composing.data != composing.startData)
-      operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel)
+  readFromDOMSoon: function() {
+    if (this.readDOMTimeout != null) return
+    this.readDOMTimeout = setTimeout(() => {
+      this.readDOMTimeout = null
+      if (this.composing) return
+      if (this.cm.isReadOnly() || !this.pollContent())
+        runInOp(this.cm, () => regChange(this.cm))
+    }, 80)
   },
 
   setUneditable: function(node) {

From d7b1370ca45d742c0961ce98d25ea2c2d3f0f484 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Nov 2016 17:04:49 +0100
Subject: [PATCH 2979/4742] Copy event handler arrays on write

Rather than on read
---
 src/util/event.js           | 35 ++++++++++++++++++-----------------
 src/util/operation_group.js |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/util/event.js b/src/util/event.js
index e667a9f3c0..29fd4c5981 100644
--- a/src/util/event.js
+++ b/src/util/event.js
@@ -6,39 +6,40 @@ import { indexOf } from "./misc"
 // Lightweight event framework. on/off also work on DOM nodes,
 // registering native DOM handlers.
 
+const noHandlers = []
+
 export let on = function(emitter, type, f) {
-  if (emitter.addEventListener)
+  if (emitter.addEventListener) {
     emitter.addEventListener(type, f, false)
-  else if (emitter.attachEvent)
+  } else if (emitter.attachEvent) {
     emitter.attachEvent("on" + type, f)
-  else {
+  } else {
     let map = emitter._handlers || (emitter._handlers = {})
-    let arr = map[type] || (map[type] = [])
-    arr.push(f)
+    map[type] = (map[type] || noHandlers).concat(f)
   }
 }
 
-let noHandlers = []
-export function getHandlers(emitter, type, copy) {
-  let arr = emitter._handlers && emitter._handlers[type]
-  if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers
-  else return arr || noHandlers
+export function getHandlers(emitter, type) {
+  return emitter._handlers && emitter._handlers[type] || noHandlers
 }
 
 export function off(emitter, type, f) {
-  if (emitter.removeEventListener)
+  if (emitter.removeEventListener) {
     emitter.removeEventListener(type, f, false)
-  else if (emitter.detachEvent)
+  } else if (emitter.detachEvent) {
     emitter.detachEvent("on" + type, f)
-  else {
-    let handlers = getHandlers(emitter, type, false)
-    for (let i = 0; i < handlers.length; ++i)
-      if (handlers[i] == f) { handlers.splice(i, 1); break }
+  } else {
+    let map = emitter._handlers, arr = map && map[type]
+    if (arr) {
+      let index = indexOf(arr, f)
+      if (index > -1)
+        map[type] = arr.slice(0, index).concat(arr.slice(index + 1))
+    }
   }
 }
 
 export function signal(emitter, type /*, values...*/) {
-  let handlers = getHandlers(emitter, type, true)
+  let handlers = getHandlers(emitter, type)
   if (!handlers.length) return
   let args = Array.prototype.slice.call(arguments, 2)
   for (let i = 0; i < handlers.length; ++i) handlers[i].apply(null, args)
diff --git a/src/util/operation_group.js b/src/util/operation_group.js
index f50da343a9..b8fa78ac48 100644
--- a/src/util/operation_group.js
+++ b/src/util/operation_group.js
@@ -50,7 +50,7 @@ let orphanDelayedCallbacks = null
 // them to be executed when the last operation ends, or, if no
 // operation is active, when a timeout fires.
 export function signalLater(emitter, type /*, values...*/) {
-  let arr = getHandlers(emitter, type, false)
+  let arr = getHandlers(emitter, type)
   if (!arr.length) return
   let args = Array.prototype.slice.call(arguments, 2), list
   if (operationGroup) {

From 6019b1308d4c513cb327f1e7c3f7ff86f258a217 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Nov 2016 17:33:10 +0100
Subject: [PATCH 2980/4742] [contenteditable input] Expand scanned range when
 selection at start/end of line

So that the code doesn't get confused when backspacing or
deleting across a line.

This is still flaky. Ideally we'd capture backspace as a key event,
but Android Chrome makes that impossible.

Issue #4307
---
 src/input/ContentEditableInput.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index a7254b12c2..c385bea12e 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -238,6 +238,10 @@ ContentEditableInput.prototype = copyObj({
 
     let cm = this.cm, display = cm.display, sel = cm.doc.sel.primary()
     let from = sel.from(), to = sel.to()
+    if (from.ch == 0 && from.line > cm.firstLine())
+      from = Pos(from.line - 1, getLine(cm.doc, from.line - 1).length)
+    if (to.ch == getLine(cm.doc, to.line).text.length && to.line < cm.lastLine())
+      to = Pos(to.line + 1, 0)
     if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false
 
     let fromIndex, fromLine, fromNode
@@ -258,6 +262,7 @@ ContentEditableInput.prototype = copyObj({
       toNode = display.view[toIndex + 1].node.previousSibling
     }
 
+    if (!fromNode) return false
     let newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine))
     let oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length))
     while (newText.length > 1 && oldText.length > 1) {

From 69669e4b74c30a6fa2c25751970b17daf53cf88c Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Tue, 15 Nov 2016 17:22:20 -0800
Subject: [PATCH 2981/4742] =?UTF-8?q?Avoid=20=E2=80=9CUnspecified=20Error?=
 =?UTF-8?q?=E2=80=9D=20in=20IE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

when accessing `document.activeElement` from inside an iframe.
---
 src/util/dom.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/util/dom.js b/src/util/dom.js
index 465dbb5a5e..349fae07d3 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -1,4 +1,4 @@
-import { ie, ie_version, ios } from "./browser"
+import { ie, ios } from "./browser"
 
 export function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
 
@@ -58,18 +58,20 @@ export function contains(parent, child) {
   } while (child = child.parentNode)
 }
 
-export let activeElt = function() {
-  let activeElement = document.activeElement
+export function activeElt() {
+  // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.
+  // IE < 10 will throw when accessed while the page is loading or in an iframe.
+  // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.
+  let activeElement
+  try {
+    activeElement = document.activeElement
+  } catch(e) {
+    activeElement = document.body || null
+  }
   while (activeElement && activeElement.root && activeElement.root.activeElement)
     activeElement = activeElement.root.activeElement
   return activeElement
 }
-// Older versions of IE throws unspecified error when touching
-// document.activeElement in some cases (during loading, in iframe)
-if (ie && ie_version < 11) activeElt = function() {
-  try { return document.activeElement }
-  catch(e) { return document.body }
-}
 
 export function addClass(node, cls) {
   let current = node.className

From 8ecbdc5c6aedbac6b4038d94c30b97bddc950b1b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Nov 2016 10:12:06 +0100
Subject: [PATCH 2982/4742] [markdown mode] Allow lists without a blank line
 above

As per CommonMark (conflicting with markdown.pl, but never
mind markdown.pl)

Closes #4395
---
 mode/markdown/markdown.js | 15 ++++-----------
 mode/markdown/test.js     |  7 +++----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 3dcce8d3b1..6aedc360b0 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -83,9 +83,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
-  ,   ulRE = /^[*\-+]\s+/
-  ,   olRE = /^[0-9]+([.)])\s+/
-  ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
+  ,   listRE = /^(?:[*\-+]|^[0-9]+([.)]))\s+/
+  ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow listRE
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
@@ -189,14 +188,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     } else if (stream.match(hrRE, true)) {
       state.hr = true;
       return tokenTypes.hr;
-    } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
-      var listType = null;
-      if (stream.match(ulRE, true)) {
-        listType = 'ul';
-      } else {
-        stream.match(olRE, true);
-        listType = 'ol';
-      }
+    } else if (match = stream.match(listRE)) {
+      var listType = match[1] ? "ol" : "ul";
       state.indentation = stream.column() + stream.current().length;
       state.list = true;
 
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 2f43a170ca..37ecb4bbfe 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -357,11 +357,10 @@
      "[variable-2 1. foo]",
      "[variable-2 2. bar]");
 
-  // Lists require a preceding blank line (per Dingus)
-  MT("listBogus",
+  MT("listFromParagraph",
      "foo",
-     "1. bar",
-     "2. hello");
+     "[variable-2 1. bar]",
+     "[variable-2 2. hello]");
 
   // List after hr
   MT("listAfterHr",

From 333a1f2bfb09151f8119b4c4de5ed26c47dba2f1 Mon Sep 17 00:00:00 2001
From: Kazuhito Hokamura <k.hokamura@gmail.com>
Date: Wed, 9 Nov 2016 23:21:13 +0900
Subject: [PATCH 2983/4742] [vim mode] Add keymap to indent

---
 keymap/vim.js    |  5 +++++
 test/vim_test.js | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index a166f72b10..34570bb889 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -190,6 +190,8 @@
     { keys: '.', type: 'action', action: 'repeatLastEdit' },
     { keys: '<C-a>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
     { keys: '<C-x>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
+    { keys: '<C-t>', type: 'action', action: 'indent', actionArgs: { indentRight: true }, context: 'insert' },
+    { keys: '<C-d>', type: 'action', action: 'indent', actionArgs: { indentRight: false }, context: 'insert' },
     // Text object motions
     { keys: 'a<character>', type: 'motion', motion: 'textObjectManipulation' },
     { keys: 'i<character>', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
@@ -2616,6 +2618,9 @@
         }
         repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
       },
+      indent: function(cm, actionArgs) {
+        cm.indentLine(cm.getCursor().line, actionArgs.indentRight);
+      },
       exitInsertMode: exitInsertMode
     };
 
diff --git a/test/vim_test.js b/test/vim_test.js
index 6eea5553db..703a07a779 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3393,6 +3393,21 @@ testVim('[m, ]m, [M, ]M', function(cm, vim, helpers) {
   helpers.assertCursorAt(7,3);
 }, { value: squareBracketMotionSandbox});
 
+testVim('i_indent_right', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  var expectedValue = '   word1\nword2\nword3 ';
+  helpers.doKeys('i', '<C-t>');
+  eq(expectedValue, cm.getValue());
+  helpers.assertCursorAt(0, 5);
+}, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
+testVim('i_indent_left', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  var expectedValue = ' word1\nword2\nword3 ';
+  helpers.doKeys('i', '<C-d>');
+  eq(expectedValue, cm.getValue());
+  helpers.assertCursorAt(0, 1);
+}, { value: '   word1\nword2\nword3 ', indentUnit: 2 });
+
 // Ex mode tests
 testVim('ex_go_to_line', function(cm, vim, helpers) {
   cm.setCursor(0, 0);

From 692393d609e4cc96a1726830ff161c3f4e56670e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Nov 2016 10:49:06 +0100
Subject: [PATCH 2984/4742] Drop zero-width spaces in text read from DOM

Issue #4307
---
 src/input/ContentEditableInput.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index c385bea12e..d76058ffd5 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -282,8 +282,8 @@ ContentEditableInput.prototype = copyObj({
            newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
       ++cutEnd
 
-    newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd)
-    newText[0] = newText[0].slice(cutFront)
+    newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, "")
+    newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, "")
 
     let chFrom = Pos(fromLine, cutFront)
     let chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0)
@@ -361,8 +361,8 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
     if (node.nodeType == 1) {
       let cmText = node.getAttribute("cm-text")
       if (cmText != null) {
-        if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "")
-        text += cmText
+        if (cmText == "") text += node.textContent.replace(/\u200b/g, "")
+        else text += cmText
         return
       }
       let markerID = node.getAttribute("cm-marker"), range

From b63d14df7846691db1b45e47ca11409ee3540482 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Nov 2016 11:12:00 +0100
Subject: [PATCH 2985/4742] Mark release 5.21.0

---
 AUTHORS           | 10 ++++++++++
 CHANGELOG.md      | 30 ++++++++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 17 +++++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index e2cb74a557..09fb4cc852 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@ adanlobato
 Adán Lobato
 Adrian Aichner
 Adrian Heine
+Adrien Bertrand
 aeroson
 Ahmad Amireh
 Ahmad M. Zawawi
@@ -85,6 +86,7 @@ Ben Mosher
 Bernhard Sirlinger
 Bert Chang
 Bharad
+BigBlueHat
 Billy Moon
 binny
 B Krishna Chaitanya
@@ -274,6 +276,7 @@ Jeff Pickhardt
 jem (graphite)
 Jeremy Parmenter
 Jim
+Jim Avery
 JobJob
 jochenberger
 Jochen Berger
@@ -281,6 +284,7 @@ Joel Einbinder
 joelpinheiro
 Johan Ask
 John Connor
+John-David Dalton
 John Engler
 John Lees-Miller
 John Snelson
@@ -311,6 +315,7 @@ jwallers@gmail.com
 kaniga
 karevn
 Kayur Patel
+Kazuhito Hokamura
 Ken Newman
 ken restivo
 Ken Rockot
@@ -355,6 +360,7 @@ Manideep
 Manuel Rego Casasnovas
 Marat Dreizin
 Marcel Gerber
+Marcelo Camargo
 Marco Aurélio
 Marco Munizaga
 Marcus Bointon
@@ -455,6 +461,7 @@ Page
 Panupong Pasupat
 paris
 Paris
+Paris Kasidiaris
 Patil Arpith
 Patrick Stoica
 Patrick Strawderman
@@ -506,6 +513,7 @@ Samuel Ainsworth
 Sam Wilson
 sandeepshetty
 Sander AKA Redsandro
+Sander Verweij
 santec
 Sascha Peilicke
 satamas
@@ -542,12 +550,14 @@ Steffen Beyer
 Steffen Bruchmann
 Stephen Lavelle
 Steve Champagne
+Steve Hoover
 Steve O'Hara
 stoskov
 Stu Kennedy
 Sungho Kim
 sverweij
 Taha Jahangir
+takamori
 Tako Schotanus
 Takuji Shimokawa
 Tarmil
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7e995ab4b..2404815f88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+## 5.21.0 (2016-11-21)
+
+### Bug fixes
+
+Tapping/clicking the editor in [contentEditable mode](http://codemirror.net/doc/manual.html#option_inputStyle) on Chrome now puts the cursor at the tapped position.
+
+Fix various crashes and misbehaviors when reading composition events in [contentEditable mode](http://codemirror.net/doc/manual.html#option_inputStyle).
+
+Catches and ignores an IE 'Unspecified Error' when creating an editor in an iframe before there is a `<body>`.
+
+[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Fix several issues in the chunk-aligning feature.
+
+[verilog mode](http://codemirror.net/mode/verilog): Rewritten to address various issues.
+
+[julia mode](http://codemirror.net/mode/julia): Recognize Julia 0.5 syntax.
+
+[swift mode](http://codemirror.net/mode/swift): Various fixes and adjustments to current syntax.
+
+[markdown mode](http://codemirror.net/mode/markdown): Allow lists without a blank line above them.
+
+### New features
+
+The [`setGutterMarker`](http://codemirror.net/doc/manual.html#setGutterMarker), [`clearGutter`](http://codemirror.net/doc/manual.html#clearGutter), and [`lineInfo`](http://codemirror.net/doc/manual.html#lineInfo) methods are now available on `Doc` objects.
+
+The [`heightAtLine`](http://codemirror.net/doc/manual.html#heightAtLine) method now takes an extra argument to allow finding the height at the top of the line's line widgets.
+
+[ruby mode](http://codemirror.net/mode/ruby): `else` and `elsif` are now immediately indented.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.
+
 ## 5.20.2 (2016-10-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index ecfe3071f7..be834f0f10 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.20.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.21.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 cfc366f3e2..5880469189 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,23 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-11-2016: <a href="http://codemirror.net/codemirror-5.21.0.zip">Version 5.21.0</a>:</p>
+
+  <ul class=rel-note>
+    <li>Tapping/clicking the editor in <a href="http://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a> on Chrome now puts the cursor at the tapped position.</li>
+    <li>Fix various crashes and misbehaviors when reading composition events in <a href="http://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a>.</li>
+    <li>Catches and ignores an IE 'Unspecified Error' when creating an editor in an iframe before there is a <code>&lt;body&gt;</code>.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Fix several issues in the chunk-aligning feature.</li>
+    <li><a href="http://codemirror.net/mode/verilog">verilog mode</a>: Rewritten to address various issues.</li>
+    <li><a href="http://codemirror.net/mode/julia">julia mode</a>: Recognize Julia 0.5 syntax.</li>
+    <li><a href="http://codemirror.net/mode/swift">swift mode</a>: Various fixes and adjustments to current syntax.</li>
+    <li><a href="http://codemirror.net/mode/markdown">markdown mode</a>: Allow lists without a blank line above them.</li>
+    <li>The <a href="http://codemirror.net/doc/manual.html#setGutterMarker"><code>setGutterMarker</code></a>, <a href="http://codemirror.net/doc/manual.html#clearGutter"><code>clearGutter</code></a>, and <a href="http://codemirror.net/doc/manual.html#lineInfo"><code>lineInfo</code></a> methods are now available on <code>Doc</code> objects.</li>
+    <li>The <a href="http://codemirror.net/doc/manual.html#heightAtLine"><code>heightAtLine</code></a> method now takes an extra argument to allow finding the height at the top of the line's line widgets.</li>
+    <li><a href="http://codemirror.net/mode/ruby">ruby mode</a>: <code>else</code> and <code>elsif</code> are now immediately indented.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.</li>
+  </ul>
+
   <p class="rel">20-10-2016: <a href="http://codemirror.net/codemirror-5.20.0.zip">Version 5.20.0</a>:</p>
 
   <ul class=rel-note>
diff --git a/index.html b/index.html
index 1d1bb3c8a2..7164296018 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.20.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.21.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 1d07d681b8..3235a47d8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.20.3",
+  "version": "5.21.0",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 57fcffa04e..78c6da49d3 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.20.3"
+CodeMirror.version = "5.21.0"

From 5fc55e8227b3c0d1d8e3178a45fbb37f6f581e48 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Nov 2016 11:24:43 +0100
Subject: [PATCH 2986/4742] Bump version number post-5.21.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index be834f0f10..05c49718c9 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.21.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.21.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 3235a47d8d..d2e45f2f87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.21.0",
+  "version": "5.21.1",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 78c6da49d3..64b647b5d2 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.21.0"
+CodeMirror.version = "5.21.1"

From d0cde7f8470d6638aee972ec29108abd564598e0 Mon Sep 17 00:00:00 2001
From: Todd Berman <tberman@github.com>
Date: Tue, 22 Nov 2016 11:23:04 -0800
Subject: [PATCH 2987/4742] [overlay addon] Fix the `combine` option for
 overlay modes inside blankLines

---
 addon/mode/overlay.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index e1b9ed3753..4e96010a65 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -76,8 +76,13 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
     innerMode: function(state) { return {state: state.base, mode: base}; },
 
     blankLine: function(state) {
-      if (base.blankLine) base.blankLine(state.base);
-      if (overlay.blankLine) overlay.blankLine(state.overlay);
+      var baseToken, overlayToken;
+      if (base.blankLine) baseToken = base.blankLine(state.base);
+      if (overlay.blankLine) overlayToken = overlay.blankLine(state.overlay);
+
+      return overlayToken == null ?
+        baseToken :
+        (combine ? baseToken + " " + overlayToken : overlayToken);
     }
   };
 };

From 214b6bf63ccf3d542930a303fe96f5c8f4134365 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 23 Nov 2016 09:39:07 +0100
Subject: [PATCH 2988/4742] [overlay addon] Fix another append-null-as-string
 issue

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

diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index 4e96010a65..4a9f99a072 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -82,7 +82,7 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
 
       return overlayToken == null ?
         baseToken :
-        (combine ? baseToken + " " + overlayToken : overlayToken);
+        (combine && baseToken != null ? baseToken + " " + overlayToken : overlayToken);
     }
   };
 };

From 8bfabc472acf00eaee0d4a099f3b90d8b5dd47a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 23 Nov 2016 09:42:52 +0100
Subject: [PATCH 2989/4742] [commonlisp mode] Recognize character literal
 syntax

Closes #4401
---
 mode/commonlisp/commonlisp.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index fb1f99c631..5b407a9285 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -48,6 +48,7 @@ CodeMirror.defineMode("commonlisp", function (config) {
       else if (/\d/.test(ch) && stream.match(/^\d*#/)) return null;
       else if (ch == "|") return (state.tokenize = inComment)(stream, state);
       else if (ch == ":") { readSym(stream); return "meta"; }
+      else if (ch == "\\") { stream.next(); readSym(stream); return "string-2" }
       else return "error";
     } else {
       var name = readSym(stream);

From 959f8690d2f643ba7730cc847da0154767c29777 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 23 Nov 2016 13:48:29 +0100
Subject: [PATCH 2990/4742] Correct bidi types for some chars

---
 src/util/bidi.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/bidi.js b/src/util/bidi.js
index 4c365f4c9b..6812d4fdeb 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -121,12 +121,12 @@ export function moveLogically(line, start, dir, byUnit) {
 export let bidiOrdering = (function() {
   // Character types for codepoints 0 to 0xff
   let lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"
-  // Character types for codepoints 0x600 to 0x6ff
-  let arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm"
+  // Character types for codepoints 0x600 to 0x6f9
+  let arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmrrmmNmmmmrr1111111111"
   function charType(code) {
     if (code <= 0xf7) return lowTypes.charAt(code)
     else if (0x590 <= code && code <= 0x5f4) return "R"
-    else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600)
+    else if (0x600 <= code && code <= 0x6f9) return arabicTypes.charAt(code - 0x600)
     else if (0x6ee <= code && code <= 0x8ac) return "r"
     else if (0x2000 <= code && code <= 0x200b) return "w"
     else if (code == 0x200c) return "b"

From dac0b89f8cd14b4dd64d657db6e35e4c320659ac Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 24 Nov 2016 11:38:45 +0100
Subject: [PATCH 2991/4742] Correct bidi types for remaining Arabic chars

---
 src/util/bidi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/bidi.js b/src/util/bidi.js
index 6812d4fdeb..6a84914035 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -122,7 +122,7 @@ export let bidiOrdering = (function() {
   // Character types for codepoints 0 to 0xff
   let lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"
   // Character types for codepoints 0x600 to 0x6f9
-  let arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmrrmmNmmmmrr1111111111"
+  let arabicTypes = "nnnnnnNNr%%r,rNNmmmmmmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmmmnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmnNmmmmmmrrmmNmmmmrr1111111111"
   function charType(code) {
     if (code <= 0xf7) return lowTypes.charAt(code)
     else if (0x590 <= code && code <= 0x5f4) return "R"

From 2bed274eb4287624cdc5c07762a32c4042e3b3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <oseg@google.com>
Date: Fri, 25 Nov 2016 14:42:07 +0100
Subject: [PATCH 2992/4742] [soy mode] Extend and add tests

Add template/variable definitions, checking, types, additional
keywords and indentation fixes.
---
 mode/soy/soy.js  | 123 ++++++++++++++++++++++++++++++++++++++++++-----
 mode/soy/test.js |  75 +++++++++++++++++++++++++++++
 test/index.html  |   2 +
 3 files changed, 189 insertions(+), 11 deletions(-)
 create mode 100644 mode/soy/test.js

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 580c306f15..9fd75c6d27 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -45,12 +45,40 @@
       return result;
     }
 
+    function contains(list, element) {
+      while (list) {
+        if (list.element === element) return true;
+        list = list.next;
+      }
+      return false;
+    }
+
+    function prepend(list, element) {
+      return {
+        element: element,
+        next: list
+      };
+    }
+
+    function pop(list) {
+      return list && list.next;
+    }
+
+    // Reference a variable `name` in `list`.
+    // Let `loose` be truthy to ignore missing identifiers.
+    function ref(list, name, loose) {
+      return contains(list, name) ? "variable-2" : (loose ? "variable" : "variable-2 error");
+    }
+
     return {
       startState: function() {
         return {
           kind: [],
           kindTag: [],
           soyState: [],
+          templates: null,
+          variables: null,
+          scopes: null,
           indent: 0,
           localMode: modes.html,
           localState: CodeMirror.startState(modes.html)
@@ -63,6 +91,9 @@
           kind: state.kind.concat([]), // Values of kind="" attributes.
           kindTag: state.kindTag.concat([]), // Opened tags with kind="" attributes.
           soyState: state.soyState.concat([]),
+          templates: state.templates,
+          variables: state.variables,
+          scopes: state.scopes,
           indent: state.indent, // Indentation of the following line.
           localMode: state.localMode,
           localState: CodeMirror.copyState(state.localMode, state.localState)
@@ -81,19 +112,71 @@
             }
             return "comment";
 
-          case "variable":
-            if (stream.match(/^}/)) {
-              state.indent -= 2 * config.indentUnit;
+          case "templ-def":
+            if (match = stream.match(/^\.?([\w]+(?!\.[\w]+)*)/)) {
+              state.templates = prepend(state.templates, match[1]);
+              state.scopes = prepend(state.scopes, state.variables);
+              state.soyState.pop();
+              return "def";
+            }
+            stream.next();
+            return null;
+
+          case "templ-ref":
+            if (match = stream.match(/^\.?([\w]+)/)) {
+              state.soyState.pop();
+              // If the first character is '.', try to match against a local template name.
+              if (match[0][0] == '.') {
+                return ref(state.templates, match[1], true);
+              }
+              // Otherwise
+              return "variable";
+            }
+            stream.next();
+            return null;
+
+          case "param-def":
+            if (match = stream.match(/^([\w]+)(?=:)/)) {
+              state.variables = prepend(state.variables, match[1]);
               state.soyState.pop();
-              return "variable-2";
+              state.soyState.push("param-type");
+              return "def";
+            }
+            stream.next();
+            return null;
+
+          case "param-type":
+            if (stream.peek() == "}") {
+              state.soyState.pop();
+              return null;
+            }
+            if (stream.eatWhile(/^[\w]+/)) {
+              return "variable-3";
+            }
+            stream.next();
+            return null;
+
+          case "var-def":
+            if (match = stream.match(/^\$([\w]+)/)) {
+              state.variables = prepend(state.variables, match[1]);
+              state.soyState.pop();
+              return "def";
             }
             stream.next();
             return null;
 
           case "tag":
             if (stream.match(/^\/?}/)) {
-              if (state.tag == "/template" || state.tag == "/deltemplate") state.indent = 0;
-              else state.indent -= (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1) * config.indentUnit;
+              if (state.tag == "/template" || state.tag == "/deltemplate") {
+                state.variables = state.scopes = pop(state.scopes);
+                state.indent = 0;
+              } else {
+                if (state.tag == "/for" || state.tag == "/foreach") {
+                  state.variables = state.scopes = pop(state.scopes);
+                }
+                state.indent -= config.indentUnit *
+                    (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1);
+              }
               state.soyState.pop();
               return "keyword";
             } else if (stream.match(/^([\w?]+)(?==)/)) {
@@ -109,6 +192,12 @@
               state.soyState.push("string");
               return "string";
             }
+            if (match = stream.match(/^\$([\w]+)/)) {
+              return ref(state.variables, match[1]);
+            }
+            if (stream.match(/(?:as|and|or|not|in)/)) {
+              return "keyword";
+            }
             stream.next();
             return null;
 
@@ -135,17 +224,13 @@
           return "comment";
         } else if (stream.match(stream.sol() ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
           return "comment";
-        } else if (stream.match(/^\{\$[\w?]*/)) {
-          state.indent += 2 * config.indentUnit;
-          state.soyState.push("variable");
-          return "variable-2";
         } else if (stream.match(/^\{literal}/)) {
           state.indent += config.indentUnit;
           state.soyState.push("literal");
           return "keyword";
         } 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.indent += (/^(\/|(else|elseif|ifempty|case|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
           state.tag = match[1];
           if (state.tag == "/" + last(state.kindTag)) {
             // We found the tag that opened the current kind="".
@@ -155,6 +240,22 @@
             state.localState = CodeMirror.startState(state.localMode);
           }
           state.soyState.push("tag");
+          if (state.tag == "template" || state.tag == "deltemplate") {
+            state.soyState.push("templ-def");
+          }
+          if (state.tag == "call" || state.tag == "delcall") {
+            state.soyState.push("templ-ref");
+          }
+          if (state.tag == "let") {
+            state.soyState.push("var-def");
+          }
+          if (state.tag == "for" || state.tag == "foreach") {
+            state.scopes = prepend(state.scopes, state.variables);
+            state.soyState.push("var-def");
+          }
+          if (state.tag.match(/^@param\??/)) {
+            state.soyState.push("param-def");
+          }
           return "keyword";
         }
 
diff --git a/mode/soy/test.js b/mode/soy/test.js
new file mode 100644
index 0000000000..1a962de3e7
--- /dev/null
+++ b/mode/soy/test.js
@@ -0,0 +1,75 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "soy");
+  function MT(name) {test.mode(name, mode, Array.prototype.slice.call(arguments, 1));}
+
+  MT('let-test',
+     '[keyword {template] [def .name][keyword }]',
+     '  [keyword {let] [def $name]: [string "world"][keyword /}]',
+     '  [tag&bracket <][tag h1][tag&bracket >]',
+     '    Hello, [keyword {][variable-2 $name][keyword }]',
+     '  [tag&bracket </][tag h1][tag&bracket >]',
+     '[keyword {/template}]',
+     '');
+
+  MT('param-type-test',
+     '[keyword {@param] [def a]: ' +
+         '[variable-3 list]<[[[variable-3 a]: [variable-3 int], ' +
+         '[variable-3 b]: [variable-3 map]<[variable-3 string], ' +
+         '[variable-3 bool]>]]>][keyword }]');
+
+  MT('undefined-var',
+     '[keyword {][variable-2&error $var]');
+
+  MT('param-scope-test',
+     '[keyword {template] [def .a][keyword }]',
+     '  [keyword {@param] [def x]: [variable-3 string][keyword }]',
+     '  [keyword {][variable-2 $x][keyword }]',
+     '[keyword {/template}]',
+     '',
+     '[keyword {template] [def .b][keyword }]',
+     '  [keyword {][variable-2&error $x][keyword }]',
+     '[keyword {/template}]',
+     '');
+
+  MT('if-variable-test',
+     '[keyword {if] [variable-2&error $showThing][keyword }]',
+     '  Yo!',
+     '[keyword {/if}]',
+     '');
+
+  MT('defined-if-variable-test',
+     '[keyword {template] [def .foo][keyword }]',
+     '  [keyword {@param?] [def showThing]: [variable-3 bool][keyword }]',
+     '  [keyword {if] [variable-2 $showThing][keyword }]',
+     '    Yo!',
+     '  [keyword {/if}]',
+     '[keyword {/template}]',
+     '');
+
+  MT('template-calls-test',
+     '[keyword {template] [def .foo][keyword }]',
+     '  Yo!',
+     '[keyword {/template}]',
+     '[keyword {call] [variable-2 .foo][keyword /}]',
+     '[keyword {call] [variable foo][keyword /}]',
+     '[keyword {call] [variable .bar][keyword /}]',
+     '[keyword {call] [variable bar][keyword /}]',
+     '');
+
+  MT('foreach-scope-test',
+     '[keyword {foreach] [def $foo] [keyword in] [variable-2&error $foos][keyword }]',
+     '  [keyword {][variable-2 $foo][keyword }]',
+     '[keyword {/foreach}]',
+     '[keyword {][variable-2&error $foo][keyword }]');
+
+  MT('foreach-ifempty-indent-test',
+     '[keyword {foreach] [def $foo] [keyword in] [variable-2&error $foos][keyword }]',
+     '  something',
+     '[keyword {ifempty}]',
+     '  nothing',
+     '[keyword {/foreach}]',
+     '');
+})();
diff --git a/test/index.html b/test/index.html
index cfa3bb71fb..6ddf5b1021 100644
--- a/test/index.html
+++ b/test/index.html
@@ -33,6 +33,7 @@
 <script src="../mode/ruby/ruby.js"></script>
 <script src="../mode/shell/shell.js"></script>
 <script src="../mode/slim/slim.js"></script>
+<script src="../mode/soy/soy.js"></script>
 <script src="../mode/sql/sql.js"></script>
 <script src="../mode/stex/stex.js"></script>
 <script src="../mode/swift/swift.js"></script>
@@ -122,6 +123,7 @@ <h2>Test Suite</h2>
     <script src="../mode/ruby/test.js"></script>
     <script src="../mode/shell/test.js"></script>
     <script src="../mode/slim/test.js"></script>
+    <script src="../mode/soy/test.js"></script>
     <script src="../mode/stex/test.js"></script>
     <script src="../mode/swift/test.js"></script>
     <script src="../mode/textile/test.js"></script>

From 0d296633aa4f297741a09ad8efa031589f6b2d9c Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 24 Nov 2016 17:38:01 +0200
Subject: [PATCH 2993/4742] [npmignore] add files that do nothing when
 installed with npm

---
 .npmignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.npmignore b/.npmignore
index 5ed053f893..de3a24080b 100644
--- a/.npmignore
+++ b/.npmignore
@@ -8,3 +8,5 @@
 /mode/*/*.html
 /mode/index.html
 .*
+bin
+rollup.config.js

From 69159ccd6780c51526f112a9e028b46fbf6ecb42 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 3 Dec 2016 10:18:14 +0100
Subject: [PATCH 2994/4742] [sublime bindings] Make selectBetweenBrackets
 multi-cursor-aware

Closes #4419
---
 keymap/sublime.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 98fce4d302..171e692e67 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -166,17 +166,23 @@
 
   var mirror = "(){}[]";
   function selectBetweenBrackets(cm) {
-    var pos = cm.getCursor(), opening = cm.scanForBracket(pos, -1);
-    if (!opening) return;
-    for (;;) {
-      var closing = cm.scanForBracket(pos, 1);
-      if (!closing) return;
-      if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) {
-        cm.setSelection(Pos(opening.pos.line, opening.pos.ch + 1), closing.pos, false);
-        return true;
+    var ranges = cm.listSelections(), newRanges = []
+    for (var i = 0; i < ranges.length; i++) {
+      let range = ranges[i], pos = range.head, opening = cm.scanForBracket(pos, -1);
+      if (!opening) return false;
+      for (;;) {
+        var closing = cm.scanForBracket(pos, 1);
+        if (!closing) return false;
+        if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) {
+          newRanges.push({anchor: Pos(opening.pos.line, opening.pos.ch + 1),
+                          head: closing.pos});
+          break;
+        }
+        pos = Pos(closing.pos.line, closing.pos.ch + 1);
       }
-      pos = Pos(closing.pos.line, closing.pos.ch + 1);
     }
+    cm.setSelections(newRanges);
+    return true;
   }
 
   cmds[map["Shift-" + ctrl + "Space"] = "selectScope"] = function(cm) {

From af766c48523eb70cbf672fae6165c7612ad04e1a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 3 Dec 2016 10:22:14 +0100
Subject: [PATCH 2995/4742] Fix accidental use of 'let'

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 171e692e67..c5d2906bc0 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -168,7 +168,7 @@
   function selectBetweenBrackets(cm) {
     var ranges = cm.listSelections(), newRanges = []
     for (var i = 0; i < ranges.length; i++) {
-      let range = ranges[i], pos = range.head, opening = cm.scanForBracket(pos, -1);
+      var range = ranges[i], pos = range.head, opening = cm.scanForBracket(pos, -1);
       if (!opening) return false;
       for (;;) {
         var closing = cm.scanForBracket(pos, 1);

From 5e342f21ed72f87f77f70e5ac69f111e32470704 Mon Sep 17 00:00:00 2001
From: Andrew Cheng <achengs@gmail.com>
Date: Wed, 7 Dec 2016 02:33:06 -0500
Subject: [PATCH 2996/4742] [emacs keymap] export kill, killRegion, repeated

so other potential emacs-type modules can use
---
 keymap/emacs.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 3eec1e5762..57cf6e8525 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -271,6 +271,8 @@
     clearMark(cm);
   }
 
+  CodeMirror.emacs = {kill: kill, killRegion: killRegion, repeated: repeated};
+
   // Actual keymap
 
   var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({

From 7760d1bb83f1f881834e9ee8ea780baeb01936e5 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 9 Dec 2016 10:54:48 +0100
Subject: [PATCH 2997/4742] Add U+061C Arabic Letter Mark to special chars

---
 src/edit/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/options.js b/src/edit/options.js
index ea19d5ba2a..97587f73e4 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -68,7 +68,7 @@ export function defineOptions(CodeMirror) {
     for (let i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   })
-  option("specialChars", /[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
+  option("specialChars", /[\u0000-\u001f\u007f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
     if (old != Init) cm.refresh()
   })

From 41804498097a446ee55390f2f90d27804d371c9f Mon Sep 17 00:00:00 2001
From: Tom Klancer <tom.klancer@appian.com>
Date: Wed, 30 Nov 2016 17:47:38 -0500
Subject: [PATCH 2998/4742] [active-line addon] Highlight active line even when
 text is selected

Adds an option to keep the active line highlighted even when text
inside the line is selected.
---
 addon/selection/active-line.js | 16 ++++++++++++----
 demo/activeline.html           | 14 +++++++++++++-
 doc/manual.html                | 26 ++++++++++++++++++++------
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index b0b3f61af2..68db3f4d3b 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -3,9 +3,13 @@
 
 // Because sometimes you need to style the cursor's line.
 //
-// Adds an option 'styleActiveLine' which, when enabled, gives the
-// active line's wrapping <div> the CSS class "CodeMirror-activeline",
-// and gives its background <div> the class "CodeMirror-activeline-background".
+// 'styleActiveLine': when enabled, gives the active line's wrapping
+// <div> the CSS class "CodeMirror-activeline", and gives its background
+// <div> the class "CodeMirror-activeline-background".
+//
+// 'styleActiveSelected': An optional parameter of 'styleActiveLine'.
+// When enabled, keeps the active line's styling active even when text is
+// selected within the line. Has no effect if 'styleActiveLine' is not enabled.
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -52,7 +56,11 @@
     var active = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i];
-      if (!range.empty()) continue;
+      if (cm.getOption('styleActiveLine').styleActiveSelected == true) {
+        if (range.anchor.line != range.head.line) continue;
+      } else {
+        if (!range.empty()) continue;
+      }
       var line = cm.getLineHandleVisualStart(range.head.line);
       if (active[active.length - 1] != line) active.push(line);
     }
diff --git a/demo/activeline.html b/demo/activeline.html
index 741f6c45a4..7a273a77ee 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -65,14 +65,26 @@ <h2>Active Line Demo</h2>
 </rss></textarea></form>
 
     <script>
+var styleActiveSelected = false;
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   mode: "application/xml",
-  styleActiveLine: true,
+  styleActiveLine: {
+    styleActiveSelected: styleActiveSelected
+  },
   lineNumbers: true,
   lineWrapping: true
 });
+
+function toggleSelProp() {
+  styleActiveSelected = !styleActiveSelected;
+  editor.setOption('styleActiveLine', {styleActiveSelected: styleActiveSelected});
+  var label = styleActiveSelected ? 'Disable styleActiveSelected option' : 'Enable styleActiveSelected option';
+  document.getElementById('toggleButton').innerText = label;
+}
 </script>
 
     <p>Styling the current cursor line.</p>
 
+    <button onclick="toggleSelProp()" id="toggleButton">Enable styleActiveSelected option</button>
+
   </article>
diff --git a/doc/manual.html b/doc/manual.html
index 05c49718c9..b5b451ae5c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2760,12 +2760,26 @@ <h2 id="addons">Addons</h2>
       like in <a href="../demo/markselection.html">this demo</a>.</dd>
 
       <dt id="addon_active-line"><a href="../addon/selection/active-line.js"><code>selection/active-line.js</code></a></dt>
-      <dd>Defines a <code>styleActiveLine</code> option that, when enabled,
-      gives the wrapper of the active line the class <code>CodeMirror-activeline</code>,
-      adds a background with the class <code>CodeMirror-activeline-background</code>,
-      and adds the class <code>CodeMirror-activeline-gutter</code> to the
-      line's gutter space is enabled. See the
-      <a href="../demo/activeline.html">demo</a>.</dd>
+      <dd>Controls highlighting of the active line.
+        <dd>Defines an option
+        <code>styleActiveLine</code> which, when enabled, gives the wrapper of
+        the active line the class <code>CodeMirror-activeline</code>, adds a
+        background with the class <code>CodeMirror-activeline-background</code>,
+        and adds the class <code>CodeMirror-activeline-gutter</code> to the
+        line's gutter space.
+        </dd>
+        <dd>
+        In addition, defines an option <code>styleActiveSelected</code>,
+        that controls highlighting behavior when selected.
+        <code>styleActiveSelected</code> is an optional parameter of
+        <code>styleActiveLine</code>. If <code>true</code>,
+        the active line will remain highlighted when text within the line is
+        selected. If <code>false</code> or unspecified, the active line will
+        become unhighlighted as soon as text is selected. Has no effect if
+        <code>styleActiveLine</code> is not enabled.
+        </dd>
+        <dd>See the <a href="../demo/activeline.html">demo</a>.</dd>
+      </dd>
 
       <dt id="addon_selection-pointer"><a href="../addon/selection/selection-pointer.js"><code>selection/selection-pointer.js</code></a></dt>
       <dd>Defines a <code>selectionPointer</code> option which you can

From 33d0057f1edbd8e48726bb357ba960645161a8b1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 13 Dec 2016 10:53:22 +0100
Subject: [PATCH 2999/4742] [active-line addon] Rename and clean up nonEmpty
 options

Issue #4413
---
 addon/selection/active-line.js | 32 +++++++++++---------------------
 demo/activeline.html           | 14 ++++++--------
 doc/manual.html                | 34 ++++++++++++++--------------------
 3 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index 68db3f4d3b..aa295d0d86 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -1,16 +1,6 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
-// Because sometimes you need to style the cursor's line.
-//
-// 'styleActiveLine': when enabled, gives the active line's wrapping
-// <div> the CSS class "CodeMirror-activeline", and gives its background
-// <div> the class "CodeMirror-activeline-background".
-//
-// 'styleActiveSelected': An optional parameter of 'styleActiveLine'.
-// When enabled, keeps the active line's styling active even when text is
-// selected within the line. Has no effect if 'styleActiveLine' is not enabled.
-
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"));
@@ -25,16 +15,18 @@
   var GUTT_CLASS = "CodeMirror-activeline-gutter";
 
   CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
-    var prev = old && old != CodeMirror.Init;
-    if (val && !prev) {
-      cm.state.activeLines = [];
-      updateActiveLines(cm, cm.listSelections());
-      cm.on("beforeSelectionChange", selectionChange);
-    } else if (!val && prev) {
+    var prev = old == CodeMirror.Init ? false : old;
+    if (val == prev) return
+    if (prev) {
       cm.off("beforeSelectionChange", selectionChange);
       clearActiveLines(cm);
       delete cm.state.activeLines;
     }
+    if (val) {
+      cm.state.activeLines = [];
+      updateActiveLines(cm, cm.listSelections());
+      cm.on("beforeSelectionChange", selectionChange);
+    }
   });
 
   function clearActiveLines(cm) {
@@ -56,11 +48,9 @@
     var active = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i];
-      if (cm.getOption('styleActiveLine').styleActiveSelected == true) {
-        if (range.anchor.line != range.head.line) continue;
-      } else {
-        if (!range.empty()) continue;
-      }
+      var option = cm.getOption("styleActiveLine");
+      if (typeof option == "object" && option.nonEmpty ? range.anchor.line != range.head.line : !range.empty())
+        continue
       var line = cm.getLineHandleVisualStart(range.head.line);
       if (active[active.length - 1] != line) active.push(line);
     }
diff --git a/demo/activeline.html b/demo/activeline.html
index 7a273a77ee..86c8c18e1d 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -65,26 +65,24 @@ <h2>Active Line Demo</h2>
 </rss></textarea></form>
 
     <script>
-var styleActiveSelected = false;
+var nonEmpty = false;
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   mode: "application/xml",
-  styleActiveLine: {
-    styleActiveSelected: styleActiveSelected
-  },
+  styleActiveLine: true,
   lineNumbers: true,
   lineWrapping: true
 });
 
 function toggleSelProp() {
-  styleActiveSelected = !styleActiveSelected;
-  editor.setOption('styleActiveLine', {styleActiveSelected: styleActiveSelected});
-  var label = styleActiveSelected ? 'Disable styleActiveSelected option' : 'Enable styleActiveSelected option';
+  nonEmpty = !nonEmpty;
+  editor.setOption("styleActiveLine", {nonEmpty: nonEmpty});
+  var label = nonEmpty ? 'Disable nonEmpty option' : 'Enable nonEmpty option';
   document.getElementById('toggleButton').innerText = label;
 }
 </script>
 
     <p>Styling the current cursor line.</p>
 
-    <button onclick="toggleSelProp()" id="toggleButton">Enable styleActiveSelected option</button>
+    <button onclick="toggleSelProp()" id="toggleButton">Enable <code>nonEmpty</code> option</button>
 
   </article>
diff --git a/doc/manual.html b/doc/manual.html
index b5b451ae5c..0065790810 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2760,26 +2760,20 @@ <h2 id="addons">Addons</h2>
       like in <a href="../demo/markselection.html">this demo</a>.</dd>
 
       <dt id="addon_active-line"><a href="../addon/selection/active-line.js"><code>selection/active-line.js</code></a></dt>
-      <dd>Controls highlighting of the active line.
-        <dd>Defines an option
-        <code>styleActiveLine</code> which, when enabled, gives the wrapper of
-        the active line the class <code>CodeMirror-activeline</code>, adds a
-        background with the class <code>CodeMirror-activeline-background</code>,
-        and adds the class <code>CodeMirror-activeline-gutter</code> to the
-        line's gutter space.
-        </dd>
-        <dd>
-        In addition, defines an option <code>styleActiveSelected</code>,
-        that controls highlighting behavior when selected.
-        <code>styleActiveSelected</code> is an optional parameter of
-        <code>styleActiveLine</code>. If <code>true</code>,
-        the active line will remain highlighted when text within the line is
-        selected. If <code>false</code> or unspecified, the active line will
-        become unhighlighted as soon as text is selected. Has no effect if
-        <code>styleActiveLine</code> is not enabled.
-        </dd>
-        <dd>See the <a href="../demo/activeline.html">demo</a>.</dd>
-      </dd>
+      <dd>Defines a <code>styleActiveLine</code> option that, when
+      enabled, gives the wrapper of the line that contains the cursor
+      the class <code>CodeMirror-activeline</code>, adds a background
+      with the class <code>CodeMirror-activeline-background</code>,
+      and adds the class <code>CodeMirror-activeline-gutter</code> to
+      the line's gutter space is enabled. The option's value may be a
+      boolean or an object specifying the following options:
+        <dl>
+          <dt><code><strong>nonEmpty</strong>: bool</code></dt>
+          <dd>Controls whether single-line selections, or just cursor
+          selections, are styled. Defaults to false (only cursor
+          selections).</dd>
+        </dl>
+      See the <a href="../demo/activeline.html">demo</a>.</dd>
 
       <dt id="addon_selection-pointer"><a href="../addon/selection/selection-pointer.js"><code>selection/selection-pointer.js</code></a></dt>
       <dd>Defines a <code>selectionPointer</code> option which you can

From 460452d73c3a6100662f33bf675e8eca07becaa0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 13 Dec 2016 23:05:37 +0100
Subject: [PATCH 3000/4742] =?UTF-8?q?Upgrade=20Bubl=C3=A9,=20use=20namedFu?=
 =?UTF-8?q?nctionExpressions=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json     | 2 +-
 rollup.config.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d2e45f2f87..e2b97a9cd1 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "node-static": "0.6.0",
     "phantomjs-prebuilt": "^2.1.12",
     "rollup": "^0.34.10",
-    "rollup-plugin-buble": "^0.14.0",
+    "rollup-plugin-buble": "^0.15.0",
     "rollup-watch": "^2.5.0"
   },
   "bugs": "http://github.com/codemirror/CodeMirror/issues",
diff --git a/rollup.config.js b/rollup.config.js
index 584dfe1ec4..9a17b24ff7 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -14,5 +14,5 @@ export default {
   format: "umd",
   dest: "lib/codemirror.js",
   moduleName: "CodeMirror",
-  plugins: [ buble() ]
+  plugins: [ buble({namedFunctionExpressions: false}) ]
 };

From 957c28f4d8c41afe8b0e0d6ec3a7a454590761ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 14 Dec 2016 08:26:07 +0100
Subject: [PATCH 3001/4742] [javascript mode] Accept strings and numbers as
 type expressions

Closes #4432
---
 mode/javascript/javascript.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index a717745897..b9f3925951 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -539,6 +539,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function typeexpr(type) {
     if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
+    if (type == "string" || type == "number") return cont(afterType);
     if (type == "{") return cont(commasep(typeprop, "}"))
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
   }
@@ -559,6 +560,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function afterType(type, value) {
     if (value == "<") return cont(commasep(typeexpr, ">"), afterType)
+    if (value == "|") return cont(typeexpr)
     if (type == "[") return cont(expect("]"), afterType)
   }
   function vardef() {

From 70ea4303bc4efcdb7ef1956bb6123667440f0a19 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 14 Dec 2016 18:49:33 +0100
Subject: [PATCH 3002/4742] [source-highlight util] Fix looking up of modes

---
 bin/source-highlight | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/bin/source-highlight b/bin/source-highlight
index 6d15f1ae3f..0d6239c2bc 100755
--- a/bin/source-highlight
+++ b/bin/source-highlight
@@ -17,14 +17,11 @@ if (sPos == -1 || sPos == process.argv.length - 1) {
    process.exit(1);
 }
 var lang = process.argv[sPos + 1].toLowerCase(), modeName = lang;
-CodeMirror.modeInfo.forEach(function(info) {
-  if (info.mime == lang) {
-    modeName = info.mode;
-  } else if (info.name.toLowerCase() == lang) {
-    modeName = info.mode;
-    lang = info.mime;
-  }
-});
+var found = CodeMirror.findModeByMIME(lang) || CodeMirror.findModeByName(lang)
+if (found) {
+  modeName = found.mode
+  lang = found.mime
+}
 
 if (!CodeMirror.modes[modeName])
   require("../mode/" + modeName + "/" + modeName + ".js");

From c2a11a315ebe95478134e9eb94c040f14021df4f Mon Sep 17 00:00:00 2001
From: ficristo <ficristo.work@gmail.com>
Date: Wed, 14 Dec 2016 20:35:27 +0100
Subject: [PATCH 3003/4742] [css mode] Add will-change property and its values

---
 mode/css/css.js       | 12 ++++++------
 mode/stylus/stylus.js |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 985287f475..a1d5a388e5 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -524,7 +524,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "transition-property", "transition-timing-function", "unicode-bidi",
     "user-select", "vertical-align", "visibility", "voice-balance", "voice-duration",
     "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
-    "voice-volume", "volume", "white-space", "widows", "width", "word-break",
+    "voice-volume", "volume", "white-space", "widows", "width", "will-change", "word-break",
     "word-spacing", "word-wrap", "z-index",
     // SVG-specific
     "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
@@ -598,7 +598,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
     "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
-    "compact", "condensed", "contain", "content",
+    "compact", "condensed", "contain", "content", "contents",
     "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
     "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "dense", "destination-atop",
@@ -641,7 +641,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
-    "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
+    "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "opacity", "open-quote",
     "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
     "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
     "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
@@ -653,7 +653,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
     "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
     "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
-    "scroll", "scrollbar", "se-resize", "searchfield",
+    "scroll", "scrollbar", "scroll-position", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",
     "searchfield-results-button", "searchfield-results-decoration",
     "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
@@ -671,9 +671,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
     "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
     "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
-    "trad-chinese-formal", "trad-chinese-informal",
+    "trad-chinese-formal", "trad-chinese-informal", "transform",
     "translate", "translate3d", "translateX", "translateY", "translateZ",
-    "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
+    "transparent", "ultra-condensed", "ultra-expanded", "underline", "unset", "up",
     "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
     "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 662cd03c04..8d83a01807 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -732,11 +732,11 @@
   var documentTypes_ = ["domain", "regexp", "url", "url-prefix"];
   var mediaTypes_ = ["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"];
   var mediaFeatures_ = ["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"];
-  var propertyKeywords_ = ["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"];
+  var propertyKeywords_ = ["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"];
   var nonStandardPropertyKeywords_ = ["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"];
   var fontProperties_ = ["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"];
   var colorKeywords_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
-  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around"];
+  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around", "unset"];
 
   var wordOperatorKeywords_ = ["in","and","or","not","is not","is a","is","isnt","defined","if unless"],
       blockKeywords_ = ["for","if","else","unless", "from", "to"],

From 897bb77e55846cfefca7d84ede99f83cf4b2747e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 15 Dec 2016 10:44:28 +0100
Subject: [PATCH 3004/4742] [javascript mode] Recognize TS bool literal types
 and type names with dots

Closes #4437
---
 mode/javascript/javascript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index b9f3925951..2ad7a1e970 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -539,7 +539,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function typeexpr(type) {
     if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
-    if (type == "string" || type == "number") return cont(afterType);
+    if (type == "string" || type == "number" || type == "atom") return cont(afterType);
     if (type == "{") return cont(commasep(typeprop, "}"))
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
   }
@@ -560,7 +560,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function afterType(type, value) {
     if (value == "<") return cont(commasep(typeexpr, ">"), afterType)
-    if (value == "|") return cont(typeexpr)
+    if (value == "|" || type == ".") return cont(typeexpr)
     if (type == "[") return cont(expect("]"), afterType)
   }
   function vardef() {

From b0d8dd4f53fa88d1e6447cf2d759159a53f84229 Mon Sep 17 00:00:00 2001
From: Rishi Goomar <rishig92@gmail.com>
Date: Thu, 1 Dec 2016 09:40:09 -0600
Subject: [PATCH 3005/4742] [mode/meta] Allow for syntax highlighting on ".R"
 files

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

diff --git a/mode/meta.js b/mode/meta.js
index 8faf7677df..47364448f1 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -109,7 +109,7 @@
     {name: "Python", mime: "text/x-python", mode: "python", ext: ["BUILD", "bzl", "py", "pyw"], file: /^(BUCK|BUILD)$/},
     {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
     {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
-    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},
+    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r", "R"], alias: ["rscript"]},
     {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
     {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
     {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},

From e157e82a86cf1464feb21d81c66218c6d14f6435 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 15 Dec 2016 11:51:20 +0100
Subject: [PATCH 3006/4742] Add optionChange event

Issue #4417
---
 doc/manual.html     | 3 +++
 src/edit/methods.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 0065790810..c6745e3ce6 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -639,6 +639,9 @@ <h2>Events</h2>
       or <a href="#setSize">resized</a>. Mostly useful to invalidate
       cached values that depend on the editor or character size.</dd>
 
+      <dt id="event_optionChange"><code><strong>"optionChange"</strong> (instance: CodeMirror, option: string)</code></dt>
+      <dd>Dispatched every time an option is changed with <a href="#setOption"><code>setOption</code></a>.</dd>
+
       <dt id="event_scrollCursorIntoView"><code><strong>"scrollCursorIntoView"</strong> (instance: CodeMirror, event: Event)</code></dt>
       <dd>Fires when the editor tries to scroll its cursor into view.
       Can be hooked into to take care of additional scrollable
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 7efaf20e2c..144e4773f6 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -45,6 +45,7 @@ export default function(CodeMirror) {
       options[option] = value
       if (optionHandlers.hasOwnProperty(option))
         operation(this, optionHandlers[option])(this, value, old)
+      signal(this, "optionChange", this, option)
     },
 
     getOption: function(option) {return this.options[option]},

From 35ec5ee2169aae3b0efe8ca437e063833c80f5d9 Mon Sep 17 00:00:00 2001
From: callodacity <callodacity@gmail.com>
Date: Sat, 10 Dec 2016 11:11:19 +1100
Subject: [PATCH 3007/4742] [markdown mode] Improve markdown image lookahead

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 6aedc360b0..86c017c3f0 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -436,7 +436,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return getType(state);
     }
 
-    if (ch === '[' && state.imageMarker) {
+    if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false) && state.imageMarker) {
       state.imageMarker = false;
       state.imageAltText = true
       if (modeCfg.highlightFormatting) state.formatting = "image";

From 1b9056f861f28d5baed07718eacae9988d0fd266 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 15 Dec 2016 12:07:22 +0100
Subject: [PATCH 3008/4742] [markdown mode] Make image lookahead a little
 cheaper

Issue #4426
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 86c017c3f0..4cc1dc6890 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -436,7 +436,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return getType(state);
     }
 
-    if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false) && state.imageMarker) {
+    if (ch === '[' && state.imageMarker && stream.match(/[^\]]*\](\(.*?\)| ?\[.*?\])/, false)) {
       state.imageMarker = false;
       state.imageAltText = true
       if (modeCfg.highlightFormatting) state.formatting = "image";

From 12bece3ae4cb814344d1cf3c786f2dc0e7026ad5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 15 Dec 2016 12:18:44 +0100
Subject: [PATCH 3009/4742] Remove timeout kludge in guttersChanged

Closes #4412
---
 src/edit/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/options.js b/src/edit/options.js
index 97587f73e4..dffc577be6 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -158,7 +158,7 @@ export function defineOptions(CodeMirror) {
 function guttersChanged(cm) {
   updateGutters(cm)
   regChange(cm)
-  setTimeout(() => alignHorizontally(cm), 20)
+  alignHorizontally(cm)
 }
 
 function dragDropChanged(cm, value, old) {

From 45c54ada1942566a25bc16bb32eb4ebd868ce22a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 15 Dec 2016 13:50:31 +0100
Subject: [PATCH 3010/4742] [merge addon] Don't use DMP's cleanupSemantic
 function

It sometimes produces invalid output.

Closes #4410
---
 addon/merge/merge.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index f0d746449d..352e27dc6f 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -571,7 +571,6 @@
   var dmp = new diff_match_patch();
   function getDiff(a, b) {
     var diff = dmp.diff_main(a, b);
-    dmp.diff_cleanupSemantic(diff);
     // The library sometimes leaves in empty parts, which confuse the algorithm
     for (var i = 0; i < diff.length; ++i) {
       var part = diff[i];

From 900659feeb6d4ce95abb68c7d68767c1bb586111 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 15 Dec 2016 13:54:30 +0100
Subject: [PATCH 3011/4742] Don't autofocus until the editor has a .state
 property

Since the input object might try to read from that on focusing

Issue #4439
---
 src/edit/CodeMirror.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index a3dc622cf1..3c482c599f 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -45,7 +45,6 @@ export function CodeMirror(place, options) {
   themeChanged(this)
   if (options.lineWrapping)
     this.display.wrapper.className += " CodeMirror-wrap"
-  if (options.autofocus && !mobile) display.input.focus()
   initScrollbars(this)
 
   this.state = {
@@ -64,6 +63,8 @@ export function CodeMirror(place, options) {
     specialChars: null
   }
 
+  if (options.autofocus && !mobile) display.input.focus()
+
   // Override magic textarea content restore that IE sometimes does
   // on our hidden textarea on reload
   if (ie && ie_version < 11) setTimeout(() => this.display.input.reset(true), 20)

From d5d12e0d0a631034c6363e113c808b0d6c466783 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 29 Sep 2016 11:11:38 +0200
Subject: [PATCH 3012/4742] Convert some classes to ES6

---
 src/display/scrollbars.js         |  81 +++++++++++----------
 src/display/update_display.js     |  44 ++++++------
 src/input/ContentEditableInput.js | 114 +++++++++++++++---------------
 src/input/TextareaInput.js        | 108 ++++++++++++++--------------
 src/util/misc.js                  |   2 +-
 5 files changed, 177 insertions(+), 172 deletions(-)

diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index a85fffe9a5..2026a3b0a1 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -3,7 +3,7 @@ import { on } from "../util/event"
 import { scrollGap, paddingVert } from "../measurement/position_measurement"
 import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser"
 import { updateHeightsInViewport } from "./update_lines"
-import { copyObj, Delayed } from "../util/misc"
+import { Delayed } from "../util/misc"
 
 import { setScrollLeft, setScrollTop } from "./scroll_events"
 
@@ -27,26 +27,26 @@ export function measureForScrollbars(cm) {
   }
 }
 
-function NativeScrollbars(place, scroll, cm) {
-  this.cm = cm
-  let vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar")
-  let horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
-  place(vert); place(horiz)
-
-  on(vert, "scroll", () => {
-    if (vert.clientHeight) scroll(vert.scrollTop, "vertical")
-  })
-  on(horiz, "scroll", () => {
-    if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal")
-  })
-
-  this.checkedZeroWidth = false
-  // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-  if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px"
-}
+class NativeScrollbars {
+  constructor(place, scroll, cm) {
+    this.cm = cm
+    let vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar")
+    let horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
+    place(vert); place(horiz)
+
+    on(vert, "scroll", () => {
+      if (vert.clientHeight) scroll(vert.scrollTop, "vertical")
+    })
+    on(horiz, "scroll", () => {
+      if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal")
+    })
+
+    this.checkedZeroWidth = false
+    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+    if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px"
+  }
 
-NativeScrollbars.prototype = copyObj({
-  update: function(measure) {
+  update(measure) {
     let needsH = measure.scrollWidth > measure.clientWidth + 1
     let needsV = measure.scrollHeight > measure.clientHeight + 1
     let sWidth = measure.nativeBarWidth
@@ -81,23 +81,27 @@ NativeScrollbars.prototype = copyObj({
     }
 
     return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0}
-  },
-  setScrollLeft: function(pos) {
+  }
+
+  setScrollLeft(pos) {
     if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos
     if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz)
-  },
-  setScrollTop: function(pos) {
+  }
+
+  setScrollTop(pos) {
     if (this.vert.scrollTop != pos) this.vert.scrollTop = pos
     if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert)
-  },
-  zeroWidthHack: function() {
+  }
+
+  zeroWidthHack() {
     let w = mac && !mac_geMountainLion ? "12px" : "18px"
     this.horiz.style.height = this.vert.style.width = w
     this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"
     this.disableHoriz = new Delayed
     this.disableVert = new Delayed
-  },
-  enableZeroWidthBar: function(bar, delay) {
+  }
+
+  enableZeroWidthBar(bar, delay) {
     bar.style.pointerEvents = "auto"
     function maybeDisable() {
       // To find out whether the scrollbar is still visible, we
@@ -112,22 +116,21 @@ NativeScrollbars.prototype = copyObj({
       else delay.set(1000, maybeDisable)
     }
     delay.set(1000, maybeDisable)
-  },
-  clear: function() {
+  }
+
+  clear() {
     let parent = this.horiz.parentNode
     parent.removeChild(this.horiz)
     parent.removeChild(this.vert)
   }
-}, NativeScrollbars.prototype)
-
-function NullScrollbars() {}
+}
 
-NullScrollbars.prototype = copyObj({
-  update: function() { return {bottom: 0, right: 0} },
-  setScrollLeft: function() {},
-  setScrollTop: function() {},
-  clear: function() {}
-}, NullScrollbars.prototype)
+class NullScrollbars {
+  update() { return {bottom: 0, right: 0} }
+  setScrollLeft() {}
+  setScrollTop() {}
+  clear() {}
+}
 
 export function updateScrollbars(cm, measure) {
   if (!measure) measure = measureForScrollbars(cm)
diff --git a/src/display/update_display.js b/src/display/update_display.js
index 4e016a2515..17d5a069e5 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -17,28 +17,30 @@ import { adjustView, countDirtyView, resetView } from "./view_tracking"
 
 // DISPLAY DRAWING
 
-export function DisplayUpdate(cm, viewport, force) {
-  let display = cm.display
-
-  this.viewport = viewport
-  // Store some values that we'll need later (but don't want to force a relayout for)
-  this.visible = visibleLines(display, cm.doc, viewport)
-  this.editorIsHidden = !display.wrapper.offsetWidth
-  this.wrapperHeight = display.wrapper.clientHeight
-  this.wrapperWidth = display.wrapper.clientWidth
-  this.oldDisplayWidth = displayWidth(cm)
-  this.force = force
-  this.dims = getDimensions(cm)
-  this.events = []
-}
+export class DisplayUpdate {
+  constructor(cm, viewport, force) {
+    let display = cm.display
+
+    this.viewport = viewport
+    // Store some values that we'll need later (but don't want to force a relayout for)
+    this.visible = visibleLines(display, cm.doc, viewport)
+    this.editorIsHidden = !display.wrapper.offsetWidth
+    this.wrapperHeight = display.wrapper.clientHeight
+    this.wrapperWidth = display.wrapper.clientWidth
+    this.oldDisplayWidth = displayWidth(cm)
+    this.force = force
+    this.dims = getDimensions(cm)
+    this.events = []
+  }
 
-DisplayUpdate.prototype.signal = function(emitter, type) {
-  if (hasHandler(emitter, type))
-    this.events.push(arguments)
-}
-DisplayUpdate.prototype.finish = function() {
-  for (let i = 0; i < this.events.length; i++)
-    signal.apply(null, this.events[i])
+  signal(emitter, type) {
+    if (hasHandler(emitter, type))
+      this.events.push(arguments)
+  }
+  finish() {
+    for (let i = 0; i < this.events.length; i++)
+      signal.apply(null, this.events[i])
+  }
 }
 
 export function maybeClipScrollbars(cm) {
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index d76058ffd5..57114af681 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -12,21 +12,21 @@ import { getBidiPartAt, getOrder } from "../util/bidi"
 import { gecko, ie_version } from "../util/browser"
 import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom"
 import { on, signalDOMEvent } from "../util/event"
-import { copyObj, Delayed, lst, nothing, sel_dontScroll } from "../util/misc"
+import { Delayed, lst, sel_dontScroll } from "../util/misc"
 
 // CONTENTEDITABLE INPUT STYLE
 
-export default function ContentEditableInput(cm) {
-  this.cm = cm
-  this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null
-  this.polling = new Delayed()
-  this.composing = null
-  this.gracePeriod = false
-  this.readDOMTimeout = null
-}
+export default class ContentEditableInput {
+  constructor(cm) {
+    this.cm = cm
+    this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null
+    this.polling = new Delayed()
+    this.composing = null
+    this.gracePeriod = false
+    this.readDOMTimeout = null
+  }
 
-ContentEditableInput.prototype = copyObj({
-  init: function(display) {
+  init(display) {
     let input = this, cm = input.cm
     let div = input.div = display.lineDiv
     disableBrowserMagic(div, cm.options.spellcheck)
@@ -99,21 +99,21 @@ ContentEditableInput.prototype = copyObj({
     }
     on(div, "copy", onCopyCut)
     on(div, "cut", onCopyCut)
-  },
+  }
 
-  prepareSelection: function() {
+  prepareSelection() {
     let result = prepareSelection(this.cm, false)
     result.focus = this.cm.state.focused
     return result
-  },
+  }
 
-  showSelection: function(info, takeFocus) {
+  showSelection(info, takeFocus) {
     if (!info || !this.cm.display.view.length) return
     if (info.focus || takeFocus) this.showPrimarySelection()
     this.showMultipleSelections(info)
-  },
+  }
 
-  showPrimarySelection: function() {
+  showPrimarySelection() {
     let sel = window.getSelection(), prim = this.cm.doc.sel.primary()
     let curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset)
     let curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset)
@@ -154,48 +154,48 @@ ContentEditableInput.prototype = copyObj({
       else if (gecko) this.startGracePeriod()
     }
     this.rememberSelection()
-  },
+  }
 
-  startGracePeriod: function() {
+  startGracePeriod() {
     clearTimeout(this.gracePeriod)
     this.gracePeriod = setTimeout(() => {
       this.gracePeriod = false
       if (this.selectionChanged())
         this.cm.operation(() => this.cm.curOp.selectionChanged = true)
     }, 20)
-  },
+  }
 
-  showMultipleSelections: function(info) {
+  showMultipleSelections(info) {
     removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors)
     removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection)
-  },
+  }
 
-  rememberSelection: function() {
+  rememberSelection() {
     let sel = window.getSelection()
     this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset
     this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset
-  },
+  }
 
-  selectionInEditor: function() {
+  selectionInEditor() {
     let sel = window.getSelection()
     if (!sel.rangeCount) return false
     let node = sel.getRangeAt(0).commonAncestorContainer
     return contains(this.div, node)
-  },
+  }
 
-  focus: function() {
+  focus() {
     if (this.cm.options.readOnly != "nocursor") {
       if (!this.selectionInEditor())
         this.showSelection(this.prepareSelection(), true)
       this.div.focus()
     }
-  },
-  blur: function() { this.div.blur() },
-  getField: function() { return this.div },
+  }
+  blur() { this.div.blur() }
+  getField() { return this.div }
 
-  supportsTouch: function() { return true },
+  supportsTouch() { return true }
 
-  receivedFocus: function() {
+  receivedFocus() {
     let input = this
     if (this.selectionInEditor())
       this.pollSelection()
@@ -209,15 +209,15 @@ ContentEditableInput.prototype = copyObj({
       }
     }
     this.polling.set(this.cm.options.pollInterval, poll)
-  },
+  }
 
-  selectionChanged: function() {
+  selectionChanged() {
     let sel = window.getSelection()
     return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
       sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
-  },
+  }
 
-  pollSelection: function() {
+  pollSelection() {
     if (!this.composing && this.readDOMTimeout == null && !this.gracePeriod && this.selectionChanged()) {
       let sel = window.getSelection(), cm = this.cm
       this.rememberSelection()
@@ -228,9 +228,9 @@ ContentEditableInput.prototype = copyObj({
         if (anchor.bad || head.bad) cm.curOp.selectionChanged = true
       })
     }
-  },
+  }
 
-  pollContent: function() {
+  pollContent() {
     if (this.readDOMTimeout != null) {
       clearTimeout(this.readDOMTimeout)
       this.readDOMTimeout = null
@@ -291,22 +291,22 @@ ContentEditableInput.prototype = copyObj({
       replaceRange(cm.doc, newText, chFrom, chTo, "+input")
       return true
     }
-  },
+  }
 
-  ensurePolled: function() {
+  ensurePolled() {
     this.forceCompositionEnd()
-  },
-  reset: function() {
+  }
+  reset() {
     this.forceCompositionEnd()
-  },
-  forceCompositionEnd: function() {
+  }
+  forceCompositionEnd() {
     if (!this.composing) return
     this.composing = null
     if (!this.pollContent()) regChange(this.cm)
     this.div.blur()
     this.div.focus()
-  },
-  readFromDOMSoon: function() {
+  }
+  readFromDOMSoon() {
     if (this.readDOMTimeout != null) return
     this.readDOMTimeout = setTimeout(() => {
       this.readDOMTimeout = null
@@ -314,27 +314,27 @@ ContentEditableInput.prototype = copyObj({
       if (this.cm.isReadOnly() || !this.pollContent())
         runInOp(this.cm, () => regChange(this.cm))
     }, 80)
-  },
+  }
 
-  setUneditable: function(node) {
+  setUneditable(node) {
     node.contentEditable = "false"
-  },
+  }
 
-  onKeyPress: function(e) {
+  onKeyPress(e) {
     e.preventDefault()
     if (!this.cm.isReadOnly())
       operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0)
-  },
+  }
 
-  readOnlyChanged: function(val) {
+  readOnlyChanged(val) {
     this.div.contentEditable = String(val != "nocursor")
-  },
+  }
 
-  onContextMenu: nothing,
-  resetPosition: nothing,
+  onContextMenu() {}
+  resetPosition() {}
+}
 
-  needsContentAttribute: true
-  }, ContentEditableInput.prototype)
+ContentEditableInput.prototype.needsContentAttribute = true
 
 function posToDOM(cm, pos) {
   let view = findViewForLine(cm, pos.line)
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index a150f05d16..28b3327376 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -9,31 +9,31 @@ import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } f
 import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom"
 import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event"
 import { hasCopyEvent, hasSelection } from "../util/feature_detection"
-import { copyObj, Delayed, nothing, sel_dontScroll } from "../util/misc"
+import { Delayed, sel_dontScroll } from "../util/misc"
 
 // TEXTAREA INPUT STYLE
 
-export default function TextareaInput(cm) {
-  this.cm = cm
-  // See input.poll and input.reset
-  this.prevInput = ""
-
-  // Flag that indicates whether we expect input to appear real soon
-  // now (after some event like 'keypress' or 'input') and are
-  // polling intensively.
-  this.pollingFast = false
-  // Self-resetting timeout for the poller
-  this.polling = new Delayed()
-  // Tracks when input.reset has punted to just putting a short
-  // string into the textarea instead of the full selection.
-  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
-}
-
-TextareaInput.prototype = copyObj({
-  init: function(display) {
+export default class TextareaInput {
+  constructor(cm) {
+    this.cm = cm
+    // See input.poll and input.reset
+    this.prevInput = ""
+
+    // Flag that indicates whether we expect input to appear real soon
+    // now (after some event like 'keypress' or 'input') and are
+    // polling intensively.
+    this.pollingFast = false
+    // Self-resetting timeout for the poller
+    this.polling = new Delayed()
+    // Tracks when input.reset has punted to just putting a short
+    // string into the textarea instead of the full selection.
+    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
+  }
+
+  init(display) {
     let input = this, cm = this.cm
 
     // Wraps and hides input textarea
@@ -112,9 +112,9 @@ TextareaInput.prototype = copyObj({
         input.composing = null
       }
     })
-  },
+  }
 
-  prepareSelection: function() {
+  prepareSelection() {
     // Redraw the selection and/or cursor
     let cm = this.cm, display = cm.display, doc = cm.doc
     let result = prepareSelection(cm)
@@ -130,9 +130,9 @@ TextareaInput.prototype = copyObj({
     }
 
     return result
-  },
+  }
 
-  showSelection: function(drawn) {
+  showSelection(drawn) {
     let cm = this.cm, display = cm.display
     removeChildrenAndAdd(display.cursorDiv, drawn.cursors)
     removeChildrenAndAdd(display.selectionDiv, drawn.selection)
@@ -140,11 +140,11 @@ TextareaInput.prototype = copyObj({
       this.wrapper.style.top = drawn.teTop + "px"
       this.wrapper.style.left = drawn.teLeft + "px"
     }
-  },
+  }
 
   // Reset the input to correspond to the selection (or to be empty,
   // when not typing and nothing is selected)
-  reset: function(typing) {
+  reset(typing) {
     if (this.contextMenuPending) return
     let minimal, selected, cm = this.cm, doc = cm.doc
     if (cm.somethingSelected()) {
@@ -161,41 +161,41 @@ TextareaInput.prototype = copyObj({
       if (ie && ie_version >= 9) this.hasSelection = null
     }
     this.inaccurateSelection = minimal
-  },
+  }
 
-  getField: function() { return this.textarea },
+  getField() { return this.textarea }
 
-  supportsTouch: function() { return false },
+  supportsTouch() { return false }
 
-  focus: function() {
+  focus() {
     if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
       try { this.textarea.focus() }
       catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
     }
-  },
+  }
 
-  blur: function() { this.textarea.blur() },
+  blur() { this.textarea.blur() }
 
-  resetPosition: function() {
+  resetPosition() {
     this.wrapper.style.top = this.wrapper.style.left = 0
-  },
+  }
 
-  receivedFocus: function() { this.slowPoll() },
+  receivedFocus() { this.slowPoll() }
 
   // Poll for input changes, using the normal rate of polling. This
   // runs as long as the editor is focused.
-  slowPoll: function() {
+  slowPoll() {
     if (this.pollingFast) return
     this.polling.set(this.cm.options.pollInterval, () => {
       this.poll()
       if (this.cm.state.focused) this.slowPoll()
     })
-  },
+  }
 
   // When an event has just come in that is likely to add or change
   // something in the input textarea, we poll faster, to ensure that
   // the change appears on the screen quickly.
-  fastPoll: function() {
+  fastPoll() {
     let missed = false, input = this
     input.pollingFast = true
     function p() {
@@ -204,7 +204,7 @@ TextareaInput.prototype = copyObj({
       else {input.pollingFast = false; input.slowPoll()}
     }
     input.polling.set(20, p)
-  },
+  }
 
   // Read input from the textarea, and update the document to match.
   // When something is selected, it is present in the textarea, and
@@ -212,7 +212,7 @@ TextareaInput.prototype = copyObj({
   // used). When nothing is selected, the cursor sits after previously
   // seen text (can be empty), which is stored in prevInput (we must
   // not reset the textarea when typing, because that breaks IME).
-  poll: function() {
+  poll() {
     let cm = this.cm, input = this.textarea, prevInput = this.prevInput
     // Since this is called a *lot*, try to bail out as cheaply as
     // possible when it is clear that nothing happened. hasSelection
@@ -259,18 +259,18 @@ TextareaInput.prototype = copyObj({
       }
     })
     return true
-  },
+  }
 
-  ensurePolled: function() {
+  ensurePolled() {
     if (this.pollingFast && this.poll()) this.pollingFast = false
-  },
+  }
 
-  onKeyPress: function() {
+  onKeyPress() {
     if (ie && ie_version >= 9) this.hasSelection = null
     this.fastPoll()
-  },
+  }
 
-  onContextMenu: function(e) {
+  onContextMenu(e) {
     let input = this, cm = input.cm, display = cm.display, te = input.textarea
     let pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop
     if (!pos || presto) return // Opera is difficult.
@@ -346,13 +346,13 @@ TextareaInput.prototype = copyObj({
     } else {
       setTimeout(rehide, 50)
     }
-  },
+  }
 
-  readOnlyChanged: function(val) {
+  readOnlyChanged(val) {
     if (!val) this.reset()
-  },
+  }
 
-  setUneditable: nothing,
+  setUneditable() {}
+}
 
-  needsContentAttribute: false
-}, TextareaInput.prototype)
+TextareaInput.prototype.needsContentAttribute = false
diff --git a/src/util/misc.js b/src/util/misc.js
index c94de8bd2c..2fb90914a8 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -87,7 +87,7 @@ export function insertSorted(array, value, score) {
   array.splice(pos, 0, value)
 }
 
-export function nothing() {}
+function nothing() {}
 
 export function createObj(base, props) {
   let inst

From b557c1592942d29086889e65d4811d59977843ca Mon Sep 17 00:00:00 2001
From: Philipp A <flying-sheep@web.de>
Date: Fri, 16 Dec 2016 12:46:39 +0100
Subject: [PATCH 3013/4742] CSS: Allow contextual glyph alternatives
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ligatures were disabled since some editors didn’t allow placing the cursor inside of them.

“Contextual alternatives” on the other hand still allow this, therefore this commit enables them to support e.g. Fira Code’s main gimmick.
---
 lib/codemirror.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index d7821d17df..2a6a262282 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -249,8 +249,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   position: relative;
   overflow: visible;
   -webkit-tap-highlight-color: transparent;
-  -webkit-font-variant-ligatures: none;
-  font-variant-ligatures: none;
+  -webkit-font-variant-ligatures: contextual;
+  font-variant-ligatures: contextual;
 }
 .CodeMirror-wrap pre {
   word-wrap: break-word;

From e7080dcc8ecede7658d2381a17d8a6342c564f94 Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Mon, 19 Dec 2016 09:16:42 +1100
Subject: [PATCH 3014/4742] add passing test for #4437

---
 mode/javascript/test.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 41765e75dd..971829d938 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -207,6 +207,18 @@
      "  [keyword private] [property _foo]: [variable-3 string];",
      "}")
 
+  TS("typescript_literal_types",
+     "[keyword import] [keyword *] [keyword as] [def Sequelize] [keyword from] [string 'sequelize'];",
+     "[keyword interface] [def MyAttributes] {",
+     "  [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",
+     "  [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",
+     "}",
+     "[keyword interface] [def MyInstance] [keyword extends] [variable-3 Sequelize].[variable-3 Instance] [operator <] [variable-3 MyAttributes] [operator >] {",
+     "  [property rawAttributes]: [variable-3 MyAttributes];",
+     "  [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",
+     "  [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From b50e4310a4d6339db6ac55c7c7b3e3ae0117063e Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Mon, 19 Dec 2016 09:42:22 +1100
Subject: [PATCH 3015/4742] test: double >> breaks typescript parsing

---
 mode/javascript/test.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 971829d938..a38865d4ae 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -219,6 +219,18 @@
      "  [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",
      "}")
 
+  TS("typescript_extend_operators",
+     "[keyword export] [keyword interface] [def UserModel] [keyword extends]",
+     "  [variable-3 Sequelize].[variable-3 Model] [operator <] [variable-3 UserInstance], [variable-3 UserAttributes] [operator >] {",
+     "    [property findById]: (",
+     "    [variable userId]: [variable-3 number]",
+     "    ) [operator =>] [variable-3 Promise] [operator <] [variable-3 Array] [operator <] { [property id], [property name] } [operator >][operator >];",
+     "    [property updateById]: (",
+     "    [variable userId]: [variable-3 number],",
+     "    [variable isActive]: [variable-3 boolean]",
+     "    ) [operator =>] [variable-3 Promise] [operator <] [variable-3 AccountHolderNotificationPreferenceInstance] [operator >];",
+     "  }")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From c71b86b9890c69f40d7dfdd44a9bb7d197201add Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 19 Dec 2016 09:59:25 +0100
Subject: [PATCH 3016/4742] [javascript mode] Parse '>>' as two separate ops in
 TS type param list

Closes #4448
---
 mode/javascript/javascript.js | 5 +++--
 mode/javascript/test.js       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 2ad7a1e970..10419bf9de 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -146,7 +146,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       stream.skipToEnd();
       return ret("error", "error");
     } else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
+      if (ch != ">" || !state.lexical || state.lexical.type != ">")
+        stream.eatWhile(isOperatorChar);
       return ret("operator", "operator", stream.current());
     } else if (wordRE.test(ch)) {
       stream.eatWhile(wordRE);
@@ -559,7 +560,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     else if (type == ":") return cont(typeexpr)
   }
   function afterType(type, value) {
-    if (value == "<") return cont(commasep(typeexpr, ">"), afterType)
+    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
     if (value == "|" || type == ".") return cont(typeexpr)
     if (type == "[") return cont(expect("]"), afterType)
   }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index a38865d4ae..2caefea439 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -224,7 +224,7 @@
      "  [variable-3 Sequelize].[variable-3 Model] [operator <] [variable-3 UserInstance], [variable-3 UserAttributes] [operator >] {",
      "    [property findById]: (",
      "    [variable userId]: [variable-3 number]",
-     "    ) [operator =>] [variable-3 Promise] [operator <] [variable-3 Array] [operator <] { [property id], [property name] } [operator >][operator >];",
+     "    ) [operator =>] [variable-3 Promise] [operator <] [variable-3 Array] [operator <] { [property id], [property name] } [operator >>];",
      "    [property updateById]: (",
      "    [variable userId]: [variable-3 number],",
      "    [variable isActive]: [variable-3 boolean]",

From b411c18740642ebe47ac135e3daeac0a1e58a704 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 19 Dec 2016 10:24:04 +0100
Subject: [PATCH 3017/4742] Link to elixir mode

---
 mode/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/index.html b/mode/index.html
index 3a2fe5513e..c0001a53ee 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -56,6 +56,7 @@ <h2>Language modes</h2>
       <li><a href="ebnf/index.html">EBNF</a></li>
       <li><a href="ecl/index.html">ECL</a></li>
       <li><a href="eiffel/index.html">Eiffel</a></li>
+      <li><a href="https://github.com/optick/codemirror-mode-elixir">Elixir</a></li>
       <li><a href="elm/index.html">Elm</a></li>
       <li><a href="erlang/index.html">Erlang</a></li>
       <li><a href="factor/index.html">Factor</a></li>

From d756ea1eb931d6ce7aa6f5eb3c8ea2e34a1bce20 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 19 Dec 2016 15:39:46 +0100
Subject: [PATCH 3018/4742] Make sure composition changes aren't dropped

when forced after compositionend event.

Issue #4441
---
 src/input/ContentEditableInput.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 57114af681..4c7b58ebde 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -40,15 +40,15 @@ export default class ContentEditableInput {
     })
 
     on(div, "compositionstart", e => {
-      this.composing = {data: e.data}
+      this.composing = {data: e.data, done: false}
     })
     on(div, "compositionupdate", e => {
-      if (!this.composing) this.composing = {data: e.data}
+      if (!this.composing) this.composing = {data: e.data, done: false}
     })
     on(div, "compositionend", e => {
       if (this.composing) {
         if (e.data != this.composing.data) this.readFromDOMSoon()
-        this.composing = null
+        this.composing.done = true
       }
     })
 
@@ -301,6 +301,7 @@ export default class ContentEditableInput {
   }
   forceCompositionEnd() {
     if (!this.composing) return
+    clearTimeout(this.readDOMTimeout)
     this.composing = null
     if (!this.pollContent()) regChange(this.cm)
     this.div.blur()
@@ -310,7 +311,10 @@ export default class ContentEditableInput {
     if (this.readDOMTimeout != null) return
     this.readDOMTimeout = setTimeout(() => {
       this.readDOMTimeout = null
-      if (this.composing) return
+      if (this.composing) {
+        if (this.composing.done) this.composing = null
+        else return
+      }
       if (this.cm.isReadOnly() || !this.pollContent())
         runInOp(this.cm, () => regChange(this.cm))
     }, 80)

From 33d920b06a7b52ceffbf9b083e1aab00993caef7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Dec 2016 10:12:28 +0100
Subject: [PATCH 3019/4742] [javascript mode] Properly tokenize a regexp after
 the export keyword

Closes #4452
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 10419bf9de..fe9b805f1f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -12,7 +12,7 @@
 "use strict";
 
 function expressionAllowed(stream, state, backUp) {
-  return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+  return /^(?:operator|sof|keyword c|case|new|export|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
     (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
 }
 

From 708084a28130a8c22553fd6193b7870ae66fee40 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Dec 2016 10:21:46 +0100
Subject: [PATCH 3020/4742] [javascript mode] Improve import/export parsing

Closes #4451
---
 mode/javascript/javascript.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fe9b805f1f..10fc95bd8a 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -658,14 +658,19 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ":") return cont(typeexpr, maybeAssign)
     return pass(functiondef)
   }
-  function afterExport(_type, value) {
+  function afterExport(type, value) {
     if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
     if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
+    if (type == "{") return cont(commasep(exportField, "}"), maybeFrom, expect(";"));
     return pass(statement);
   }
+  function exportField(type, value) {
+    if (value == "as") { cx.marked = "keyword"; return cont(expect("variable")); }
+    if (type == "variable") return pass(expressionNoComma, exportField);
+  }
   function afterImport(type) {
     if (type == "string") return cont();
-    return pass(importSpec, maybeFrom);
+    return pass(importSpec, maybeMoreImports, maybeFrom);
   }
   function importSpec(type, value) {
     if (type == "{") return contCommasep(importSpec, "}");
@@ -673,6 +678,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "*") cx.marked = "keyword";
     return cont(maybeAs);
   }
+  function maybeMoreImports(type) {
+    if (type == ",") return cont(importSpec, maybeMoreImports)
+  }
   function maybeAs(_type, value) {
     if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
   }

From ae45e2bdad8bb4a00c7f1cd7f6127a6963d9df8f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Dec 2016 14:04:43 +0100
Subject: [PATCH 3021/4742] [javascript mode] Also allow a regexp after
 'default'

(For 'export default' syntax)

Issue #4452
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 10fc95bd8a..c185106ce4 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -12,7 +12,7 @@
 "use strict";
 
 function expressionAllowed(stream, state, backUp) {
-  return /^(?:operator|sof|keyword c|case|new|export|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+  return /^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
     (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
 }
 

From bfdfb212f76f479b3e651daa688f5da6909e7f48 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Dec 2016 15:40:12 +0100
Subject: [PATCH 3022/4742] Mark version 5.22.0

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 18 ++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 13 ++++++++++++-
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 09fb4cc852..9b9b3355ba 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,6 +45,7 @@ Andrea G
 Andreas Reischuck
 Andres Taylor
 Andre von Houck
+Andrew Cheng
 Andrey Fedorov
 Andrey Klyuchnikov
 Andrey Lushnikov
@@ -186,6 +187,7 @@ fbuchinger
 feizhang365
 Felipe Lalanne
 Felix Raab
+ficristo
 Filip Noetzel
 Filip Stollár
 flack
@@ -500,6 +502,7 @@ Remi Nyborg
 Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
+Rishi Goomar
 Robert Crossfield
 Roberto Abdelkader Martínez Pérez
 robertop23
@@ -582,6 +585,7 @@ Todd Berman
 Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
+Tom Klancer
 Tom MacWright
 Tony Jian
 Travis Heppe
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2404815f88..f3eb79ff5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 5.22.0 (2016-12-20)
+
+### Bug fixes
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Make `selectBetweenBrackets` work with multiple cursors.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Fix issues with parsing complex TypeScript types, imports, and exports.
+
+A contentEditable editor instance with autofocus enabled no longer crashes during initializing.
+
+### New features
+
+[emacs bindings](http://codemirror.net/demo/emacs.html): Export `CodeMirror.emacs` to allow other addons to hook into Emacs-style functionality.
+
+[active-line addon](http://codemirror.net/doc/manual.html#addon_active-line): Add `nonEmpty` option.
+
+New event: [`optionChange`](http://codemirror.net/doc/manual.html#event_optionChange).
+
 ## 5.21.0 (2016-11-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index c6745e3ce6..704984fc71 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.21.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.22.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 5880469189..2dfd1fe482 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,7 +30,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
-  <p class="rel">21-11-2016: <a href="http://codemirror.net/codemirror-5.21.0.zip">Version 5.21.0</a>:</p>
+ <p class="rel">20-12-2016: <a href="http://codemirror.net/codemirror-5.22.0.zip">Version 5.22.0</a>:</p>
+
+ <ul class=rel-note>
+   <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Make <code>selectBetweenBrackets</code> work with multiple cursors.</li>
+   <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Fix issues with parsing complex TypeScript types, imports, and exports.</li>
+   <li>A contentEditable editor instance with autofocus enabled no longer crashes during initializing.</li>
+   <li><a href="http://codemirror.net/demo/emacs.html">emacs bindings</a>: Export <code>CodeMirror.emacs</code> to allow other addons to hook into Emacs-style functionality.</li>
+   <li><a href="http://codemirror.net/doc/manual.html#addon_active-line">active-line addon</a>: Add <code>nonEmpty</code> option.</li>
+   <li>New event: <a href="http://codemirror.net/doc/manual.html#event_optionChange"><code>optionChange</code></a>.</li>
+ </ul>
+
+ <p class="rel">21-11-2016: <a href="http://codemirror.net/codemirror-5.21.0.zip">Version 5.21.0</a>:</p>
 
   <ul class=rel-note>
     <li>Tapping/clicking the editor in <a href="http://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a> on Chrome now puts the cursor at the tapped position.</li>
diff --git a/index.html b/index.html
index 7164296018..06fdc1567f 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.21.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.22.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index e2b97a9cd1..c007b2a87c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.21.1",
+  "version": "5.22.0",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 64b647b5d2..8da8f48e3a 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.21.1"
+CodeMirror.version = "5.22.0"

From adfa066411473c6fe2f3a6fa15e076d52eceeb94 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Dec 2016 15:52:23 +0100
Subject: [PATCH 3023/4742] Bump version number post-5.22.0

---
 doc/manual.html  | 2 +-
 index.html       | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 704984fc71..98c160946f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.22.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.22.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/index.html b/index.html
index 06fdc1567f..dd4b1ded05 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.22.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.22.1</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index c007b2a87c..0c565e9b2b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.22.0",
+  "version": "5.22.1",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 8da8f48e3a..429cfe94e7 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.22.0"
+CodeMirror.version = "5.22.1"

From 38932a8e332ca02f73d395f899cfdfa76922e132 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Dec 2016 15:53:55 +0100
Subject: [PATCH 3024/4742] Remove link to google group

---
 index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index dd4b1ded05..9812829e52 100644
--- a/index.html
+++ b/index.html
@@ -163,10 +163,10 @@ <h2>Community</h2>
 
   <p>Discussion around the project is done on
   a <a href="https://discuss.codemirror.net">discussion forum</a>.
-  There is also
-  the <a href="http://groups.google.com/group/codemirror-announce">codemirror-announce</a>
-  list, which is only used for major announcements (such as new
-  versions). If needed, you can
+  Announcements related to the project, such as new versions, are
+  posted in the
+  forum's <a href="https://discuss.codemirror.net/c/announce">"announce"</a>
+  category. If needed, you can
   contact <a href="mailto:marijnh@gmail.com">the maintainer</a>
   directly. We aim to be an inclusive, welcoming community. To make
   that explicit, we have

From 12abb7c7f0fcfff441810eb5ce5a8905385c84c2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 22 Dec 2016 16:55:10 +0100
Subject: [PATCH 3025/4742] Remove check for license blob in linter

Closes #3909
---
 test/lint.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/lint.js b/test/lint.js
index cc03ce64c0..12146ffd28 100644
--- a/test/lint.js
+++ b/test/lint.js
@@ -3,8 +3,7 @@ var blint = require("blint");
 ["mode", "lib", "addon", "keymap"].forEach(function(dir) {
   blint.checkDir(dir, {
     browser: true,
-    allowedGlobals: ["CodeMirror", "define", "test", "requirejs"],
-    blob: "// CodeMirror, copyright (c) by Marijn Haverbeke and others\n// Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n"
+    allowedGlobals: ["CodeMirror", "define", "test", "requirejs"]
   });
 });
 

From 3dc1a5db143bd99fd3a1a9bca1ee1005ef5c828d Mon Sep 17 00:00:00 2001
From: Emmanuel Schanzer <schanzer@ccs.neu.edu>
Date: Thu, 22 Dec 2016 11:51:59 -0500
Subject: [PATCH 3026/4742] screenreader fixes

---
 src/line/line_data.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/line/line_data.js b/src/line/line_data.js
index 93b57577da..7583c3424e 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -66,6 +66,9 @@ export function buildLineContent(cm, lineView) {
                  col: 0, pos: 0, cm: cm,
                  trailingSpace: false,
                  splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}
+  // hide from accessibility tree
+  content.setAttribute("role", "presentation")
+  builder.pre.setAttribute("role", "presentation")
   lineView.measure = {}
 
   // Iterate over the logical lines that make up this visual line.

From 85956bed14dc8cdfd6610487c08243edf7ac0076 Mon Sep 17 00:00:00 2001
From: Emmanuel Schanzer <schanzer@ccs.neu.edu>
Date: Thu, 22 Dec 2016 13:39:29 -0500
Subject: [PATCH 3027/4742] Also give widgets a role attribute of
 'presentation'

---
 src/model/mark_text.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index 4250288ef3..15ec28498f 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -163,6 +163,7 @@ export function markText(doc, from, to, options, type) {
     // Showing up as a widget implies collapsed (widget replaces text)
     marker.collapsed = true
     marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget")
+    marker.widgetNode.setAttribute("role", "presentation") // hide from accessibility tree
     if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true")
     if (options.insertLeft) marker.widgetNode.insertLeft = true
   }

From aeb547774525ea6e3544a27ad3b2b387fb384e05 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 23 Dec 2016 14:03:58 +0100
Subject: [PATCH 3028/4742] Update htmlmixed documentation

---
 mode/htmlmixed/index.html | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index f94df9e21a..caa7546c1e 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -72,15 +72,26 @@ <h1>Mixed HTML Example</h1>
     <p>The HTML mixed mode depends on the XML, JavaScript, and CSS modes.</p>
 
     <p>It takes an optional mode configuration
-    option, <code>scriptTypes</code>, which can be used to add custom
-    behavior for specific <code>&lt;script type="..."></code> tags. If
-    given, it should hold an array of <code>{matches, mode}</code>
-    objects, where <code>matches</code> is a string or regexp that
-    matches the script type, and <code>mode</code> is
-    either <code>null</code>, for script types that should stay in
-    HTML mode, or a <a href="../../doc/manual.html#option_mode">mode
-    spec</a> corresponding to the mode that should be used for the
-    script.</p>
+    option, <code>tags</code>, which can be used to add custom
+    behavior for specific tags. When given, it should be an object
+    mapping tag names (for example <code>script</code>) to arrays or
+    three-element arrays. Those inner arrays indicate [attributeName,
+    valueRegexp, <a href="../../doc/manual.html#option_mode">modeSpec</a>]
+    specifications. For example, you could use <code>["type", /^foo$/,
+    "foo"]</code> to map the attribute <code>type="foo"</code> to
+    the <code>foo</code> mode. When the first two fields are null
+    (<code>[null, null, "mode"]</code>), the given mode is used for
+    any such tag that doesn't match any of the previously given
+    attributes. For example:</p>
+
+    <pre>var myModeSpec = {
+  name: "htmlmixed",
+  tags: {
+    style: [["type", /^text/(x-)?scss$/, "text/x-scss"],
+            [null, null, "css"]],
+    custom: [[null, null, "customMode"]]
+  }
+}</pre>
 
     <p><strong>MIME types defined:</strong> <code>text/html</code>
     (redefined, only takes effect if you load this parser after the

From 9a015790f9833dd2ef395e7fb7c505376dd46568 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 26 Dec 2016 11:47:18 +0100
Subject: [PATCH 3029/4742] Remove unused variable

This variable was unused after 0e545326ddb3a82df1b76eb18b2221990536e588.
---
 src/model/Doc.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/model/Doc.js b/src/model/Doc.js
index 27b62d1945..006598f1fe 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -229,7 +229,6 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   }),
 
   clearGutter: docMethodOp(function(gutterID) {
-    let i = this.first
     this.iter(line => {
       if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
         changeLine(this, line, "gutter", () => {
@@ -238,7 +237,6 @@ Doc.prototype = createObj(BranchChunk.prototype, {
           return true
         })
       }
-      ++i
     })
   }),
 

From 97eb5221f05c09cfeafefa45b52da022fbcc46af Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 26 Dec 2016 21:48:09 +0100
Subject: [PATCH 3030/4742] [python mode] Recognize f-strings

Closes #4462
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 30f1428e3a..4310f9fb6b 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -70,7 +70,7 @@
       myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
                                       "file", "intern", "long", "raw_input", "reduce", "reload",
                                       "unichr", "unicode", "xrange", "False", "True", "None"]);
-      var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
+      var stringPrefixes = new RegExp("^(([rubf]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
     }
     var keywords = wordRegexp(myKeywords);
     var builtins = wordRegexp(myBuiltins);

From 409c83aaf8f29a38328c4f751d4b3c460dee72a7 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Tue, 27 Dec 2016 12:32:27 +0100
Subject: [PATCH 3031/4742] [css mode] Add "auto-flow" value for grid property

See: https://drafts.csswg.org/css-grid/#grid-shorthand
---
 mode/css/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index a1d5a388e5..90de4ee795 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -589,7 +589,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "above", "absolute", "activeborder", "additive", "activecaption", "afar",
     "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
-    "arabic-indic", "armenian", "asterisks", "attr", "auto", "avoid", "avoid-column", "avoid-page",
+    "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",
     "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
     "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
     "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",

From ea5ee6466a916b9f6a85e480c543f877d138e626 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 28 Dec 2016 23:49:53 +0100
Subject: [PATCH 3032/4742] [groovy mode] Don't reindent block comment conent

Closes #4466
---
 mode/groovy/groovy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 721933b01c..daa798722e 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -210,7 +210,7 @@ CodeMirror.defineMode("groovy", function(config) {
     },
 
     indent: function(state, textAfter) {
-      if (!state.tokenize[state.tokenize.length-1].isBase) return 0;
+      if (!state.tokenize[state.tokenize.length-1].isBase) return CodeMirror.Pass;
       var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
       if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) ctx = ctx.prev;
       var closing = firstChar == ctx.type;

From 117ecfca5b28f9931c1407e257667972020d667c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <oseg@google.com>
Date: Wed, 28 Dec 2016 13:43:55 +0100
Subject: [PATCH 3033/4742] [soy mode] Fix bug when popping scopes.

---
 mode/soy/soy.js  | 15 +++++++++------
 mode/soy/test.js |  4 +++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 9fd75c6d27..3876333f94 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -60,16 +60,19 @@
       };
     }
 
-    function pop(list) {
-      return list && list.next;
-    }
-
     // Reference a variable `name` in `list`.
     // Let `loose` be truthy to ignore missing identifiers.
     function ref(list, name, loose) {
       return contains(list, name) ? "variable-2" : (loose ? "variable" : "variable-2 error");
     }
 
+    function popscope(state) {
+      if (state.scopes) {
+        state.variables = state.scopes.element;
+        state.scopes = state.scopes.next;
+      }
+    }
+
     return {
       startState: function() {
         return {
@@ -168,11 +171,11 @@
           case "tag":
             if (stream.match(/^\/?}/)) {
               if (state.tag == "/template" || state.tag == "/deltemplate") {
-                state.variables = state.scopes = pop(state.scopes);
+                popscope(state);
                 state.indent = 0;
               } else {
                 if (state.tag == "/for" || state.tag == "/foreach") {
-                  state.variables = state.scopes = pop(state.scopes);
+                  popscope(state);
                 }
                 state.indent -= config.indentUnit *
                     (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1);
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 1a962de3e7..1a4c6c934f 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -60,10 +60,12 @@
      '');
 
   MT('foreach-scope-test',
+     '[keyword {@param] [def bar]: [variable-3 string][keyword }]',
      '[keyword {foreach] [def $foo] [keyword in] [variable-2&error $foos][keyword }]',
      '  [keyword {][variable-2 $foo][keyword }]',
      '[keyword {/foreach}]',
-     '[keyword {][variable-2&error $foo][keyword }]');
+     '[keyword {][variable-2&error $foo][keyword }]',
+     '[keyword {][variable-2 $bar][keyword }]');
 
   MT('foreach-ifempty-indent-test',
      '[keyword {foreach] [def $foo] [keyword in] [variable-2&error $foos][keyword }]',

From 7a094220148815d025fcc62f7e8a0b56316a2744 Mon Sep 17 00:00:00 2001
From: Jake Peyser <jakepeyser@gmail.com>
Date: Wed, 28 Dec 2016 13:19:55 -0500
Subject: [PATCH 3034/4742] [materialy theme] Make general background selector
 more specific

---
 theme/material.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/material.css b/theme/material.css
index 91ed6cef29..01d867932a 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -7,7 +7,7 @@
 
 */
 
-.cm-s-material {
+.cm-s-material.CodeMirror {
   background-color: #263238;
   color: rgba(233, 237, 237, 1);
 }

From 6d3783d02911d51a16bf648b602febf2ad811bc7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Dec 2016 08:54:03 +0100
Subject: [PATCH 3035/4742] [mllike mode] Don't treat every unrecognized char
 as a variable

Closes #4473
---
 mode/mllike/mllike.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index bf0b8a674f..4d0be609c4 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -83,9 +83,12 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
     if ( /[+\-*&%=<>!?|]/.test(ch)) {
       return 'operator';
     }
-    stream.eatWhile(/\w/);
-    var cur = stream.current();
-    return words.hasOwnProperty(cur) ? words[cur] : 'variable';
+    if (/[\w\xa1-\uffff]/.test(ch)) {
+      stream.eatWhile(/[\w\xa1-\uffff]/);
+      var cur = stream.current();
+      return words.hasOwnProperty(cur) ? words[cur] : 'variable';
+    }
+    return null
   }
 
   function tokenString(stream, state) {

From 9fe20534371a496375e409f987d2176b90c6f1e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <oseg@google.com>
Date: Thu, 29 Dec 2016 11:01:27 +0100
Subject: [PATCH 3036/4742] [soy mode] Add missing `\b`s to keyword regex

Closes #4468
---
 mode/soy/soy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 3876333f94..3e9c04a49e 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -198,7 +198,7 @@
             if (match = stream.match(/^\$([\w]+)/)) {
               return ref(state.variables, match[1]);
             }
-            if (stream.match(/(?:as|and|or|not|in)/)) {
+            if (stream.match(/\b(?:as|and|or|not|in)\b/)) {
               return "keyword";
             }
             stream.next();

From 77eb24c188131a89a06990523c32bd37ccc96e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <oseg@google.com>
Date: Thu, 29 Dec 2016 11:47:11 +0100
Subject: [PATCH 3037/4742] [soy mode] Add tests for 9fe2053, find bug and fix
 it

---
 mode/soy/soy.js  | 4 ++--
 mode/soy/test.js | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 3e9c04a49e..b9eec59a4c 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -198,8 +198,8 @@
             if (match = stream.match(/^\$([\w]+)/)) {
               return ref(state.variables, match[1]);
             }
-            if (stream.match(/\b(?:as|and|or|not|in)\b/)) {
-              return "keyword";
+            if (match = stream.match(/^\w+/)) {
+              return /^(?:as|and|or|not|in)$/.test(match[0]) ? "keyword" : null;
             }
             stream.next();
             return null;
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 1a4c6c934f..9e265c1b0c 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -5,6 +5,12 @@
   var mode = CodeMirror.getMode({indentUnit: 2}, "soy");
   function MT(name) {test.mode(name, mode, Array.prototype.slice.call(arguments, 1));}
 
+  // Test of small keywords and words containing them.
+  MT('keywords-test',
+     '[keyword {] [keyword as] worrying [keyword and] notorious [keyword as]',
+     '    the Fandor-alias assassin, [keyword or]',
+     '    Corcand cannot fit [keyword in] [keyword }]');
+
   MT('let-test',
      '[keyword {template] [def .name][keyword }]',
      '  [keyword {let] [def $name]: [string "world"][keyword /}]',

From 4c39f5e8be2bcaa716c5c81f3db18d0db1810d76 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 Jan 2017 00:39:12 +0100
Subject: [PATCH 3038/4742] Make findModeByMIME +xml/+json aware

Issue #4476
---
 mode/meta.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index 47364448f1..bb60502416 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -155,7 +155,7 @@
     {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
     {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
     {name: "Vue.js Component", mimes: ["script/x-vue", "text/x-vue"], mode: "vue", ext: ["vue"]},
-    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
+    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd", "svg"], alias: ["rss", "wsdl", "xsd"]},
     {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
     {name: "Yacas", mime: "text/x-yacas", mode: "yacas", ext: ["ys"]},
     {name: "YAML", mimes: ["text/x-yaml", "text/yaml"], mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
@@ -178,6 +178,8 @@
       if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
         if (info.mimes[j] == mime) return info;
     }
+    if (/\+xml$/.test(mime)) return CodeMirror.findModeByMIME("application/xml")
+    if (/\+json$/.test(mime)) return CodeMirror.findModeByMIME("application/json")
   };
 
   CodeMirror.findModeByExtension = function(ext) {

From ec8e89ba441495c79710c5fda7fd05d61a6787b6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 Jan 2017 00:45:36 +0100
Subject: [PATCH 3039/4742] [closebrackets addon] Add override option

Closes #4478
---
 addon/edit/closebrackets.js | 2 +-
 doc/manual.html             | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 7c47bcd096..62b99c1ba8 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -45,7 +45,7 @@
 
   function getConfig(cm) {
     var deflt = cm.state.closeBrackets;
-    if (!deflt) return null;
+    if (!deflt || deflt.override) return deflt;
     var mode = cm.getModeAt(cm.getCursor());
     return mode.closeBrackets || deflt;
   }
diff --git a/doc/manual.html b/doc/manual.html
index 98c160946f..3c252381ba 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2314,7 +2314,13 @@ <h2 id="addons">Addons</h2>
       it. <code>explode</code> should be a similar string that gives
       the pairs of characters that, when enter is pressed between
       them, should have the second character also moved to its own
-      line. <a href="../demo/closebrackets.html">Demo here</a>.</dd>
+      line. By default, if the active mode has
+      a <code>closeBrackets</code> property, that overrides the
+      configuration given in the option. But you can add
+      an <code>override</code> property with a truthy value to
+      override mode-specific
+      configuration. <a href="../demo/closebrackets.html">Demo
+      here</a>.</dd>
 
       <dt id="addon_matchtags"><a href="../addon/edit/matchtags.js"><code>edit/matchtags.js</code></a></dt>
       <dd>Defines an option <code>matchTags</code> that, when enabled,

From 7ff3b02e724300d61d6a7b81eb8139778060a529 Mon Sep 17 00:00:00 2001
From: ficristo <ficristo.work@gmail.com>
Date: Mon, 2 Jan 2017 09:00:08 +0100
Subject: [PATCH 3040/4742] [javascript mode] add tests for async keyword

---
 mode/javascript/test.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 2caefea439..56b90e3cfe 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -190,6 +190,36 @@
      "  }",
      "}");
 
+  MT("async",
+     "[keyword async] [keyword function] [def foo]([def args]) { [keyword return] [atom true]; }");
+
+  MT("async_assignment",
+     "[keyword const] [def foo] [operator =] [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; };");
+
+  MT("async_object",
+     "[keyword let] [def obj] [operator =] { [property async]: [atom false] };");
+
+  // async be highlighet as keyword and foo as def, but it requires potentially expensive look-ahead. See #4173
+  MT("async_object_function",
+     "[keyword let] [def obj] [operator =] { [property async] [property foo]([def args]) { [keyword return] [atom true]; } };");
+
+  MT("async_object_properties",
+     "[keyword let] [def obj] [operator =] {",
+     "  [property prop1]: [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; },",
+     "  [property prop2]: [keyword async] [keyword function] ([def args]) { [keyword return] [atom true]; },",
+     "  [property prop3]: [keyword async] [keyword function] [def prop3]([def args]) { [keyword return] [atom true]; },",
+     "};");
+
+  MT("async_arrow",
+     "[keyword const] [def foo] [operator =] [keyword async] ([def args]) [operator =>] { [keyword return] [atom true]; };");
+
+  MT("async_jquery",
+     "[variable $].[property ajax]({",
+     "  [property url]: [variable url],",
+     "  [property async]: [atom true],",
+     "  [property method]: [string 'GET']",
+     "});");
+
   var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
   function TS(name) {
     test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))

From 90d7915450f33f03d0d251b6bdda7228289acd41 Mon Sep 17 00:00:00 2001
From: Paul Masson <paulmasson@comcast.net>
Date: Tue, 3 Jan 2017 14:03:42 -0800
Subject: [PATCH 3041/4742] Update LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 766132177a..1bca6bfed4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2016 by Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (C) 2017 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From d4e2e7ac0b745b04a82cd2f2847c44951b98822a Mon Sep 17 00:00:00 2001
From: Paul Masson <paulmasson@comcast.net>
Date: Tue, 3 Jan 2017 14:11:38 -0800
Subject: [PATCH 3042/4742] [real-world uses] Add SageMathCell

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

diff --git a/doc/realworld.html b/doc/realworld.html
index dc2a7f6a97..2429ba1655 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -142,6 +142,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://rascalmicro.com/docs/basic-tutorial-getting-started.html">Rascal</a> (tiny computer)</li>
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
       <li><a href="http://refork.com/">Refork</a> (animation demo gallery and sharing)</li>
+      <li><a href="http://sagecell.sagemath.org">SageMathCell</a> (interactive mathematical software)</li>
       <li><a href="https://cloud.sagemath.com/">SageMathCloud</a> (interactive mathematical software environment)</li>
       <li><a href="https://chrome.google.com/webstore/detail/servephp/mnpikomdchjhkhbhmbboehfdjkobbfpo">ServePHP</a> (PHP code testing in Chrome dev tools)</li>
       <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>

From 3a83dccdfa96e2dc90c3129d281525ff41241255 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 4 Jan 2017 09:58:53 +0100
Subject: [PATCH 3043/4742] [markdown mode] Be somewhat more restrictive about
 HTML open tags

Closes #4484
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 4cc1dc6890..1aeb34414c 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -490,7 +490,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return type + tokenTypes.linkEmail;
     }
 
-    if (ch === '<' && stream.match(/^(!--|\w)/, false)) {
+    if (ch === '<' && stream.match(/^(!--|[a-z]+(?:\s+[a-z_:.\-]+(?:\s*=\s*[^ >]+)?)*\s*>)/i, false)) {
       var end = stream.string.indexOf(">", stream.pos);
       if (end != -1) {
         var atts = stream.string.substring(stream.start, end);

From 6928fec6695f468f17b5031e48192ad2f7d505f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 4 Jan 2017 10:59:11 +0100
Subject: [PATCH 3044/4742] [panel addon] Implement a 'stable' option

Issue #4485
---
 addon/display/panel.js |  9 +++++++++
 demo/panel.html        |  4 ++--
 doc/manual.html        | 11 +++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/addon/display/panel.js b/addon/display/panel.js
index ba29484d6c..a6ac74f0ca 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -38,6 +38,9 @@
     var height = (options && options.height) || node.offsetHeight;
     this._setSize(null, info.heightLeft -= height);
     info.panels++;
+    if (options.stable && isAtTop(this, node))
+      this.scrollTo(null, this.getScrollInfo().top + height)
+
     return new Panel(this, node, options, height);
   });
 
@@ -109,4 +112,10 @@
     cm.setSize = cm._setSize;
     cm.setSize();
   }
+
+  function isAtTop(cm, dom) {
+    for (let sibling = dom.nextSibling; sibling; sibling = sibling.nextSibling)
+      if (sibling == cm.getWrapperElement()) return true
+    return false
+  }
 });
diff --git a/demo/panel.html b/demo/panel.html
index b3b0b7ca6b..1ce3d87c79 100644
--- a/demo/panel.html
+++ b/demo/panel.html
@@ -115,7 +115,7 @@ <h2>Panel Demo</h2>
 }
 function addPanel(where) {
   var node = makePanel(where);
-  panels[node.id] = editor.addPanel(node, {position: where});
+  panels[node.id] = editor.addPanel(node, {position: where, stable: true});
 }
 
 addPanel("top");
@@ -126,7 +126,7 @@ <h2>Panel Demo</h2>
   var panel = panels["panel-" + id];
   var node = makePanel("");
 
-  panels[node.id] = editor.addPanel(node, {replace: panel, position: "after-top"});
+  panels[node.id] = editor.addPanel(node, {replace: panel, position: "after-top", stable: true});
   return false;
 }
 </script>
diff --git a/doc/manual.html b/doc/manual.html
index 3c252381ba..7acc872b8b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2910,7 +2910,7 @@ <h2 id="addons">Addons</h2>
       changed.<br/>
       The method accepts the following options:
       <dl>
-        <dt><code><strong>position</strong> : string</code></dt>
+        <dt><code><strong>position</strong>: string</code></dt>
         <dd>Controls the position of the newly added panel. The
         following values are recognized:
           <dl>
@@ -2924,12 +2924,15 @@ <h2 id="addons">Addons</h2>
             <dd>Adds the panel at the top of the bottom panels.</dd>
           </dl>
         </dd>
-        <dt><code><strong>before</strong> : Panel</code></dt>
+        <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>
+        <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>
+        <dt><code><strong>replace</strong>: Panel</code></dt>
         <dd>The new panel will replace the given panel.</dd>
+        <dt><code><strong>stable</strong>: bool</code></dt>
+        <dd>Whether to scroll the editor to keep the text's vertical
+        position stable, when adding a panel above it. Defaults to false.</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 35f09250d7d3dbb3da28aa3a7efdf757bdfdc42f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 4 Jan 2017 11:02:56 +0100
Subject: [PATCH 3045/4742] Fix ES6-ism in addon

---
 addon/display/panel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/display/panel.js b/addon/display/panel.js
index a6ac74f0ca..7da34a42da 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -114,7 +114,7 @@
   }
 
   function isAtTop(cm, dom) {
-    for (let sibling = dom.nextSibling; sibling; sibling = sibling.nextSibling)
+    for (var sibling = dom.nextSibling; sibling; sibling = sibling.nextSibling)
       if (sibling == cm.getWrapperElement()) return true
     return false
   }

From f78c0915e5c403c925e48c714fd1fd671a4c35f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 4 Jan 2017 11:03:50 +0100
Subject: [PATCH 3046/4742] Lint addons and modes with ecmaVersion 5

---
 test/lint.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lint.js b/test/lint.js
index 12146ffd28..502706de8e 100644
--- a/test/lint.js
+++ b/test/lint.js
@@ -3,7 +3,8 @@ var blint = require("blint");
 ["mode", "lib", "addon", "keymap"].forEach(function(dir) {
   blint.checkDir(dir, {
     browser: true,
-    allowedGlobals: ["CodeMirror", "define", "test", "requirejs"]
+    allowedGlobals: ["CodeMirror", "define", "test", "requirejs"],
+    ecmaVersion: 5
   });
 });
 

From 0fb17df6694b0ba63ec0568d84709e9a07e19a9b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 5 Jan 2017 09:44:27 +0100
Subject: [PATCH 3047/4742] [panel plugin] Make stable option also take effect
 when a panel is removed

Issue #4485
---
 addon/display/panel.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/display/panel.js b/addon/display/panel.js
index 7da34a42da..74199ff059 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -57,6 +57,8 @@
     this.cleared = true;
     var info = this.cm.state.panels;
     this.cm._setSize(null, info.heightLeft += this.height);
+    if (this.options.stable && isAtTop(this.cm, this.node))
+      this.cm.scrollTo(null, this.cm.getScrollInfo().top - this.height)
     info.wrapper.removeChild(this.node);
     if (--info.panels == 0) removePanels(this.cm);
   };

From dc94b0f0c6ea97c09344d1a34da70f8e2d1d708f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 Jan 2017 14:35:32 +0100
Subject: [PATCH 3048/4742] [merge addon] Anchor copy button to editable side
 for insertions

Since showing it next to an empty chunk looks bad

Issue #4492
---
 addon/merge/merge.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 352e27dc6f..b3a9af405c 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -431,10 +431,10 @@
       var editOriginals = dv.mv.options.allowEditingOriginals;
       copy.title = editOriginals ? "Push to left" : "Revert chunk";
       copy.chunk = chunk;
-      copy.style.top = top + "px";
+      copy.style.top = (chunk.origTo < chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
 
       if (editOriginals) {
-        var topReverse = dv.orig.heightAtLine(chunk.editFrom, "local") - sTopEdit;
+        var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
         var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
                                                          "CodeMirror-merge-copy-reverse"));
         copyReverse.title = "Push to right";

From fc93599160949802e8752ecf32b63e24c0c1b461 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 Jan 2017 14:37:39 +0100
Subject: [PATCH 3049/4742] Don't exclude rollup.config.js from NPM

See https://discuss.codemirror.net/t/npm-install-failing-for-cm-git-dependency/1088
---
 .npmignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.npmignore b/.npmignore
index de3a24080b..f23ca7195d 100644
--- a/.npmignore
+++ b/.npmignore
@@ -9,4 +9,3 @@
 /mode/index.html
 .*
 bin
-rollup.config.js

From 8a0c813b208b5a2c0dae7b5a9b635168017165ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 Jan 2017 14:40:43 +0100
Subject: [PATCH 3050/4742] Include 5.22.2 in release notes

---
 CHANGELOG.md     | 6 ++++++
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3eb79ff5c..9074c1b0c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.22.2 (2017-01-12)
+
+### Bug fixes
+
+Include rollup.config.js in NPM package, so that it can be used to build from source.
+
 ## 5.22.0 (2016-12-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 7acc872b8b..f765185eb3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.22.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.22.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 0c565e9b2b..fa82dd11dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.22.1",
+  "version": "5.22.3",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 429cfe94e7..c16f377119 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.22.1"
+CodeMirror.version = "5.22.3"

From 66d9403c8e5511b5469e1009534e8266296d64ed Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 13 Jan 2017 08:19:44 +0100
Subject: [PATCH 3051/4742] [merge addon] Fix incorrect compare

Issue #4492
---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index b3a9af405c..a8132b605d 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -431,7 +431,7 @@
       var editOriginals = dv.mv.options.allowEditingOriginals;
       copy.title = editOriginals ? "Push to left" : "Revert chunk";
       copy.chunk = chunk;
-      copy.style.top = (chunk.origTo < chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
+      copy.style.top = (chunk.origTo > chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
 
       if (editOriginals) {
         var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;

From 379c1aeb941b8403c51be15a8e64c614ed61143f Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Mon, 16 Jan 2017 14:59:51 +1100
Subject: [PATCH 3052/4742] TypeScript: add a test for usage of interface
 syntax with const

---
 mode/javascript/test.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 56b90e3cfe..c02eb06c31 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -261,6 +261,12 @@
      "    ) [operator =>] [variable-3 Promise] [operator <] [variable-3 AccountHolderNotificationPreferenceInstance] [operator >];",
      "  }")
 
+  TS("typescript_interface_with_const",
+     "[keyword const] [def hello]: {",
+     "  [property prop1][operator ?]: [variable-3 string];",
+     "  [property prop2][operator ?]: [variable-3 string];",
+     "} [operator =] {};")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 7166a44efbfcc9b84dc9efb4ec36da478370663d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 16 Jan 2017 21:47:45 +0100
Subject: [PATCH 3053/4742] [javascript mode] Improve TypeScript interface type
 parsing

Issue #4494
---
 mode/javascript/javascript.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c185106ce4..17890dcc12 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -505,9 +505,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ":") return cont(expressionNoComma);
     if (type == "(") return pass(functiondef);
   }
-  function commasep(what, end) {
+  function commasep(what, end, sep) {
     function proceed(type, value) {
-      if (type == ",") {
+      if (sep ? sep.indexOf(type) > -1 : type == ",") {
         var lex = cx.state.lexical;
         if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
         return cont(function(type, value) {
@@ -541,16 +541,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function typeexpr(type) {
     if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
-    if (type == "{") return cont(commasep(typeprop, "}"))
+    if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex)
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
   }
   function maybeReturnType(type) {
     if (type == "=>") return cont(typeexpr)
   }
-  function typeprop(type) {
+  function typeprop(type, value) {
     if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property"
       return cont(typeprop)
+    } else if (value == "?") {
+      return cont(typeprop)
     } else if (type == ":") {
       return cont(typeexpr)
     }

From 6709974d3b01dc6aa153de37edf4170b0431b1f6 Mon Sep 17 00:00:00 2001
From: Zeno Rocha <zno.rocha@gmail.com>
Date: Wed, 18 Jan 2017 06:28:31 -0800
Subject: [PATCH 3054/4742] [dracula theme] Adjust colors, remove duplicate
 definition

---
 theme/dracula.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/theme/dracula.css b/theme/dracula.css
index b2ef62913c..53a660b521 100644
--- a/theme/dracula.css
+++ b/theme/dracula.css
@@ -24,8 +24,7 @@
 .cm-s-dracula span.cm-number { color: #bd93f9; }
 .cm-s-dracula span.cm-variable { color: #50fa7b; }
 .cm-s-dracula span.cm-variable-2 { color: white; }
-.cm-s-dracula span.cm-def { color: #ffb86c; }
-.cm-s-dracula span.cm-keyword { color: #ff79c6; }
+.cm-s-dracula span.cm-def { color: #50fa7b; }
 .cm-s-dracula span.cm-operator { color: #ff79c6; }
 .cm-s-dracula span.cm-keyword { color: #ff79c6; }
 .cm-s-dracula span.cm-atom { color: #bd93f9; }
@@ -35,7 +34,7 @@
 .cm-s-dracula span.cm-qualifier { color: #50fa7b; }
 .cm-s-dracula span.cm-property { color: #66d9ef; }
 .cm-s-dracula span.cm-builtin { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-3 { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-3 { color: #ffb86c; }
 
 .cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
 .cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

From 73c4e24a8e6c0bb078f5fb497edb484bd5523f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Vr=C3=A1na?= <jakub@vrana.cz>
Date: Tue, 20 Dec 2016 16:45:20 +0100
Subject: [PATCH 3055/4742] [sublime bindings] Don't sort last line with no
 selected chars

Selecting two full lines including line ends makes a selection from
line 1 to line 3 (ch: 0). This command used to sort three lines (1 to
3) which is not what I expect. This change makes it sort only two
lines if there are no selected characters on the last line.

It also fixes a fatal error if there are more than one selection on
the same line (the code used 'range' instead of 'ranges').

It also selects the trailing newline after sorting the lines so that
the whole lines are selected.
---
 keymap/sublime.js    | 5 +++--
 test/sublime_test.js | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index c5d2906bc0..3d112ab961 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -310,7 +310,8 @@
       if (range.empty()) continue;
       var from = range.from().line, to = range.to().line;
       while (i < ranges.length - 1 && ranges[i + 1].from().line == to)
-        to = range[++i].to().line;
+        to = ranges[++i].to().line;
+      if (!ranges[i].to().ch) to--;
       toSort.push(from, to);
     }
     if (toSort.length) selected = true;
@@ -331,7 +332,7 @@
             return a < b ? -1 : a == b ? 0 : 1;
           });
         cm.replaceRange(lines, start, end);
-        if (selected) ranges.push({anchor: start, head: end});
+        if (selected) ranges.push({anchor: start, head: Pos(to + 1, 0)});
       }
       if (selected) cm.setSelections(ranges, 0);
     });
diff --git a/test/sublime_test.js b/test/sublime_test.js
index c5c19c0a23..57f16485e1 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -249,11 +249,11 @@
          "undo",
          setSel(0, 0, 2, 0,
                 3, 0, 5, 0),
-         "sortLines", val("a\nb\nc\nA\nB\nC"),
-         hasSel(0, 0, 2, 1,
-                3, 0, 5, 1),
+         "sortLines", val("b\nc\na\nB\nC\nA"),
+         hasSel(0, 0, 2, 0,
+                3, 0, 5, 0),
          "undo",
-         setSel(1, 0, 4, 0), "sortLinesInsensitive", val("c\na\nB\nb\nC\nA"));
+         setSel(1, 0, 5, 0), "sortLinesInsensitive", val("c\na\nB\nb\nC\nA"));
 
   stTest("bookmarks", "abc\ndef\nghi\njkl",
          Pos(0, 1), "toggleBookmark",

From 73638df40c9631155b1985f0ee63b6ffe2398b6a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 19 Jan 2017 23:35:01 +0100
Subject: [PATCH 3056/4742] Mark version 5.23.0

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 34 ++++++++++++++++++++++------------
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 9b9b3355ba..866c78f842 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -175,6 +175,7 @@ eborden
 edsharp
 ekhaled
 Elisée
+Emmanuel Schanzer
 Enam Mijbah Noor
 Eric Allam
 Erik Welander
@@ -247,6 +248,7 @@ Irakli Gozalishvili
 Ivan Kurnosov
 Ivoah
 Jacob Lee
+Jake Peyser
 Jakob Miland
 Jakub Vrana
 Jakub Vrána
@@ -617,6 +619,7 @@ Yunchi Luo
 Yuvi Panda
 Zac Anger
 Zachary Dremann
+Zeno Rocha
 Zhang Hao
 zziuni
 魏鹏刚
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9074c1b0c5..07ed0295e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 5.23.0 (2017-01-19)
+
+### Bug fixes
+
+Presentation-related elements DOM elements are now marked as such to help screen readers.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Be more picky about what HTML tags look like to avoid false positives.
+
+### New features
+
+`findModeByMIME` now understands `+json` and `+xml` MIME suffixes.
+
+[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Add support for an `override` option to ignore language-specific defaults.
+
+[panel addon](http://codemirror.net/doc/manual.html#addon_panel): Add a `stable` option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.
+
 ## 5.22.2 (2017-01-12)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index f765185eb3..a5eb223355 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.22.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.23.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 2dfd1fe482..69c0e66b10 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,18 +30,28 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
- <p class="rel">20-12-2016: <a href="http://codemirror.net/codemirror-5.22.0.zip">Version 5.22.0</a>:</p>
-
- <ul class=rel-note>
-   <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Make <code>selectBetweenBrackets</code> work with multiple cursors.</li>
-   <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Fix issues with parsing complex TypeScript types, imports, and exports.</li>
-   <li>A contentEditable editor instance with autofocus enabled no longer crashes during initializing.</li>
-   <li><a href="http://codemirror.net/demo/emacs.html">emacs bindings</a>: Export <code>CodeMirror.emacs</code> to allow other addons to hook into Emacs-style functionality.</li>
-   <li><a href="http://codemirror.net/doc/manual.html#addon_active-line">active-line addon</a>: Add <code>nonEmpty</code> option.</li>
-   <li>New event: <a href="http://codemirror.net/doc/manual.html#event_optionChange"><code>optionChange</code></a>.</li>
- </ul>
-
- <p class="rel">21-11-2016: <a href="http://codemirror.net/codemirror-5.21.0.zip">Version 5.21.0</a>:</p>
+  <p class="rel">19-01-2017: <a href="http://codemirror.net/codemirror-5.23.0.zip">Version 5.23.0</a>:</p>
+
+  <ul class=rel-note>
+    <li>Presentation-related elements DOM elements are now marked as such to help screen readers.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Be more picky about what HTML tags look like to avoid false positives.</li>
+    <li><code>findModeByMIME</code> now understands <code>+json</code> and <code>+xml</code> MIME suffixes.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Add support for an <code>override</code> option to ignore language-specific defaults.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Add a <code>stable</code> option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.</li>
+  </ul>
+
+  <p class="rel">20-12-2016: <a href="http://codemirror.net/codemirror-5.22.0.zip">Version 5.22.0</a>:</p>
+
+  <ul class=rel-note>
+    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Make <code>selectBetweenBrackets</code> work with multiple cursors.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Fix issues with parsing complex TypeScript types, imports, and exports.</li>
+    <li>A contentEditable editor instance with autofocus enabled no longer crashes during initializing.</li>
+    <li><a href="http://codemirror.net/demo/emacs.html">emacs bindings</a>: Export <code>CodeMirror.emacs</code> to allow other addons to hook into Emacs-style functionality.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_active-line">active-line addon</a>: Add <code>nonEmpty</code> option.</li>
+    <li>New event: <a href="http://codemirror.net/doc/manual.html#event_optionChange"><code>optionChange</code></a>.</li>
+  </ul>
+
+  <p class="rel">21-11-2016: <a href="http://codemirror.net/codemirror-5.21.0.zip">Version 5.21.0</a>:</p>
 
   <ul class=rel-note>
     <li>Tapping/clicking the editor in <a href="http://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a> on Chrome now puts the cursor at the tapped position.</li>
diff --git a/index.html b/index.html
index 9812829e52..df98ffd096 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.22.1</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.23.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index fa82dd11dc..f7b617cd22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.22.3",
+  "version": "5.23.0",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index c16f377119..b6d3d488ad 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.22.3"
+CodeMirror.version = "5.23.0"

From 82162728938e8536d39a3f9937d7eb905e00eb9b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Jan 2017 08:25:33 +0100
Subject: [PATCH 3057/4742] [shell mode] Improve tokenizing of $'' strings

Closes #4505
---
 mode/shell/shell.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 570b4e2419..a636387395 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -108,8 +108,8 @@ CodeMirror.defineMode('shell', function() {
     if (state.tokens.length > 1) stream.eat('$');
     var ch = stream.next(), hungry = /\w/;
     if (ch === '{') hungry = /[^}]/;
-    if (ch === '(') {
-      state.tokens[0] = tokenString(')');
+    if (/['"(]/.test(ch)) {
+      state.tokens[0] = tokenString(ch == "(" ? ")" : ch);
       return tokenize(stream, state);
     }
     if (!/\d/.test(ch)) {

From 39ad3b619ba9ea481f2847fb85aed647b67d17d1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Jan 2017 22:12:11 +0100
Subject: [PATCH 3058/4742] [python mode] Accept underscores in number literals

Closes #4506
---
 mode/python/python.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 4310f9fb6b..b539d84aa6 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -113,8 +113,8 @@
       if (stream.match(/^[0-9\.]/, false)) {
         var floatLiteral = false;
         // Floats
-        if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
-        if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
+        if (stream.match(/^[\d_]*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
+        if (stream.match(/^[\d_]+\.\d*/)) { floatLiteral = true; }
         if (stream.match(/^\.\d+/)) { floatLiteral = true; }
         if (floatLiteral) {
           // Float literals may be "imaginary"
@@ -124,13 +124,13 @@
         // Integers
         var intLiteral = false;
         // Hex
-        if (stream.match(/^0x[0-9a-f]+/i)) intLiteral = true;
+        if (stream.match(/^0x[0-9a-f_]+/i)) intLiteral = true;
         // Binary
-        if (stream.match(/^0b[01]+/i)) intLiteral = true;
+        if (stream.match(/^0b[01_]+/i)) intLiteral = true;
         // Octal
-        if (stream.match(/^0o[0-7]+/i)) intLiteral = true;
+        if (stream.match(/^0o[0-7_]+/i)) intLiteral = true;
         // Decimal
-        if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
+        if (stream.match(/^[1-9][\d_]*(e[\+\-]?[\d_]+)?/)) {
           // Decimal literals may be "imaginary"
           stream.eat(/J/i);
           // TODO - Can you have imaginary longs?

From 71af74da531f7ac7b08e6fcad37892dbf5375664 Mon Sep 17 00:00:00 2001
From: ficristo <ficristo.work@gmail.com>
Date: Thu, 22 Dec 2016 16:33:50 +0100
Subject: [PATCH 3059/4742] [sass mode] Use same token types as CSS/SCSS mode.
 Add tests

---
 mode/sass/index.html |   4 +-
 mode/sass/sass.js    |  71 +++++++++++++++++++++--------
 mode/sass/test.js    | 103 +++++++++++++++++++++++++++++++++++++++++++
 test/index.html      |   2 +
 4 files changed, 161 insertions(+), 19 deletions(-)
 create mode 100644 mode/sass/test.js

diff --git a/mode/sass/index.html b/mode/sass/index.html
index 9f4a790221..6305649e5c 100644
--- a/mode/sass/index.html
+++ b/mode/sass/index.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
+<script src="../css/css.js"></script>
 <script src="sass.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
 <div id=nav>
@@ -58,7 +59,8 @@ <h2>Sass mode</h2>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers : true,
-        matchBrackets : true
+        matchBrackets : true,
+        mode: "sass"
       });
     </script>
 
diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 6973ece292..d2d2502968 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -3,19 +3,33 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
+    mod(require("../../lib/codemirror"), require("../css/css"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
+    define(["../../lib/codemirror", "../css/css"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
 "use strict";
 
 CodeMirror.defineMode("sass", function(config) {
+  var cssMode = CodeMirror.mimeModes["text/css"];
+  var propertyKeywords = cssMode.propertyKeywords || {},
+      colorKeywords = cssMode.colorKeywords || {},
+      valueKeywords = cssMode.valueKeywords || {};
+
   function tokenRegexp(words) {
     return new RegExp("^" + words.join("|"));
   }
 
+  function propWithVendorPrefix(keyset, string) {
+    if (string.indexOf('-') !== 0) {
+      return false;
+    }
+
+    var unvendored = string.substring(string.indexOf("-", 1) + 1);
+    return keyset.hasOwnProperty(unvendored);
+  }
+
   var keywords = ["true", "false", "null", "auto"];
   var keywordsRegexp = new RegExp("^" + keywords.join("|"));
 
@@ -25,6 +39,8 @@ CodeMirror.defineMode("sass", function(config) {
 
   var pseudoElementsRegexp = /^::?[a-zA-Z_][\w\-]*/;
 
+  var word;
+
   function urlTokens(stream, state) {
     var ch = stream.peek();
 
@@ -151,10 +167,10 @@ CodeMirror.defineMode("sass", function(config) {
         stream.next();
         if (stream.match(/^[\w-]+/)) {
           indent(state);
-          return "atom";
+          return "qualifier";
         } else if (stream.peek() === "#") {
           indent(state);
-          return "atom";
+          return "tag";
         }
       }
 
@@ -163,11 +179,11 @@ CodeMirror.defineMode("sass", function(config) {
         // ID selectors
         if (stream.match(/^[\w-]+/)) {
           indent(state);
-          return "atom";
+          return "builtin";
         }
         if (stream.peek() === "#") {
           indent(state);
-          return "atom";
+          return "tag";
         }
       }
 
@@ -220,31 +236,42 @@ CodeMirror.defineMode("sass", function(config) {
       // Indent Directives
       if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
         indent(state);
-        return "meta";
+        return "def";
       }
 
       // Other Directives
       if (ch === "@") {
         stream.next();
         stream.eatWhile(/[\w-]/);
-        return "meta";
+        return "def";
       }
 
       if (stream.eatWhile(/[\w-]/)){
         if(stream.match(/ *: *[\w-\+\$#!\("']/,false)){
-          return "property";
+          word = stream.current().toLowerCase();
+          var prop = state.prevProp + "-" + word;
+          if (propertyKeywords.hasOwnProperty(prop)) {
+            return "property";
+          } else if (propertyKeywords.hasOwnProperty(word)) {
+            state.prevProp = word;
+            return "property";
+          } else if (propWithVendorPrefix(propertyKeywords, word)) {
+            return "property";
+          }
+          return "tag";
         }
         else if(stream.match(/ *:/,false)){
           indent(state);
           state.cursorHalf = 1;
-          return "atom";
+          state.prevProp = stream.current().toLowerCase();
+          return "property";
         }
         else if(stream.match(/ *,/,false)){
-          return "atom";
+          return "tag";
         }
         else{
           indent(state);
-          return "atom";
+          return "tag";
         }
       }
 
@@ -309,20 +336,18 @@ CodeMirror.defineMode("sass", function(config) {
         if(!stream.peek()){
           state.cursorHalf = 0;
         }
-        return "variable-3";
+        return "variable-2";
       }
 
       // bang character for !important, !default, etc.
       if (ch === "!") {
         stream.next();
-        if(!stream.peek()){
-          state.cursorHalf = 0;
-        }
+        state.cursorHalf = 0;
         return stream.match(/^[\w]+/) ? "keyword": "operator";
       }
 
       if (stream.match(opRegexp)){
-        if(!stream.peek()){
+        if(!stream.peek() || stream.match(/\s+$/, false)){
           state.cursorHalf = 0;
         }
         return "operator";
@@ -333,7 +358,17 @@ CodeMirror.defineMode("sass", function(config) {
         if(!stream.peek()){
           state.cursorHalf = 0;
         }
-        return "attribute";
+        word = stream.current().toLowerCase();
+        if (valueKeywords.hasOwnProperty(word)) {
+          return "atom";
+        } else if (colorKeywords.hasOwnProperty(word)) {
+          return "keyword";
+        } else if (propertyKeywords.hasOwnProperty(word)) {
+          state.prevProp = stream.current().toLowerCase();
+          return "property";
+        } else {
+          return "tag";
+        }
       }
 
       //stream.eatSpace();
diff --git a/mode/sass/test.js b/mode/sass/test.js
new file mode 100644
index 0000000000..56ba006415
--- /dev/null
+++ b/mode/sass/test.js
@@ -0,0 +1,103 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "sass");
+  // Since Sass has an indent-based syntax, is almost impossible to test correctly the indentation in all cases.
+  // So disable it for tests.
+  mode.indent = undefined;
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("comment",
+     "[comment // this is a comment]",
+     "[comment   also this is a comment]")
+
+  MT("comment_multiline",
+     "[comment /* this is a comment]",
+     "[comment   also this is a comment]")
+
+  MT("variable",
+     "[variable-2 $page-width][operator :] [number 800][unit px]")
+
+  MT("global_attributes",
+     "[tag body]",
+     "  [property font][operator :]",
+     "    [property family][operator :] [atom sans-serif]",
+     "    [property size][operator :] [number 30][unit em]",
+     "    [property weight][operator :] [atom bold]")
+
+  MT("scoped_styles",
+     "[builtin #contents]",
+     "  [property width][operator :] [variable-2 $page-width]",
+     "  [builtin #sidebar]",
+     "    [property float][operator :] [atom right]",
+     "    [property width][operator :] [variable-2 $sidebar-width]",
+     "  [builtin #main]",
+     "    [property width][operator :] [variable-2 $page-width] [operator -] [variable-2 $sidebar-width]",
+     "    [property background][operator :] [variable-2 $primary-color]",
+     "    [tag h2]",
+     "      [property color][operator :] [keyword blue]")
+
+  // Sass allows to write the colon as first char instead of a "separator".
+  //   :color red
+  // Not supported
+  // MT("property_syntax",
+  //    "[qualifier .foo]",
+  //    "  [operator :][property color] [keyword red]")
+
+  MT("import",
+     "[def @import] [string \"sass/variables\"]",
+     // Probably it should parsed as above: as a string even without the " or '
+     // "[def @import] [string sass/baz]"
+     "[def @import] [tag sass][operator /][tag baz]")
+
+  MT("def",
+     "[def @if] [variable-2 $foo] [def @else]")
+
+  MT("tag_on_more_lines",
+    "[tag td],",
+    "[tag th]",
+    "  [property font-family][operator :] [string \"Arial\"], [atom serif]")
+
+  MT("important",
+     "[qualifier .foo]",
+     "  [property text-decoration][operator :] [atom none] [keyword !important]",
+     "[tag h1]",
+     "  [property font-size][operator :] [number 2.5][unit em]")
+
+  MT("selector",
+     // SCSS uses variable-3
+     // "[tag h1]:[variable-3 before],",
+     // "[tag h2]:[variable-3 before]",
+     "[tag h1][keyword :before],",
+     "[tag h2][keyword :before]",
+     "  [property content][operator :] [string \"::\"]")
+
+  MT("definition_mixin_equal",
+     "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
+     "[meta =bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )]",
+     // The vendor prefix is highlighted as "meta" in CSS mode
+     // "  [meta -webkit-][property box-sizing][operator :] [variable-2 $bs-type]",
+     "  [property -webkit-box-sizing][operator :] [variable-2 $bs-type]",
+     "  [property box-sizing][operator :] [variable-2 $bs-type]")
+
+  MT("definition_mixin_with_space",
+     "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
+     "[def @mixin] [tag bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )] ",
+     // The vendor prefix is highlighted as "meta" in CSS mode
+     // "  [meta -moz-][property box-sizing][operator :] [variable-2 $bs-type]",
+     "  [property -moz-box-sizing][operator :] [variable-2 $bs-type]",
+     "  [property box-sizing][operator :] [variable-2 $bs-type]")
+
+  MT("numbers_start_dot_include_plus",
+     // The % is not highlighted correctly
+     // "[meta =button-links][operator (][variable-2 $button-base][operator :] [atom darken][operator (][variable-2 $color11], [number 10][unit %][operator )][operator )]",
+     "[meta =button-links][operator (][variable-2 $button-base][operator :] [atom darken][operator (][variable-2 $color11], [number 10][operator %))]",
+     "  [property padding][operator :] [number .3][unit em] [number .6][unit em]",
+     "  [variable-3 +border-radius][operator (][number 8][unit px][operator )]",
+     "  [property background-color][operator :] [variable-2 $button-base]")
+
+  MT("include",
+     "[qualifier .bar]",
+     "  [def @include] [tag border-radius][operator (][number 8][unit px][operator )]")
+})();
diff --git a/test/index.html b/test/index.html
index 6ddf5b1021..deeb7781fb 100644
--- a/test/index.html
+++ b/test/index.html
@@ -31,6 +31,7 @@
 <script src="../mode/python/python.js"></script>
 <script src="../mode/powershell/powershell.js"></script>
 <script src="../mode/ruby/ruby.js"></script>
+<script src="../mode/sass/sass.js"></script>
 <script src="../mode/shell/shell.js"></script>
 <script src="../mode/slim/slim.js"></script>
 <script src="../mode/soy/soy.js"></script>
@@ -121,6 +122,7 @@ <h2>Test Suite</h2>
     <script src="../mode/php/test.js"></script>
     <script src="../mode/powershell/test.js"></script>
     <script src="../mode/ruby/test.js"></script>
+    <script src="../mode/sass/test.js"></script>
     <script src="../mode/shell/test.js"></script>
     <script src="../mode/slim/test.js"></script>
     <script src="../mode/soy/test.js"></script>

From 15aed69a5025cbda52960610eb54082f03f5a915 Mon Sep 17 00:00:00 2001
From: Geordie Hall <geordiemhall@gmail.com>
Date: Mon, 23 Jan 2017 15:35:59 +1100
Subject: [PATCH 3060/4742] [css mode] Support lineComment option, enable it
 for LESS, SCSS

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 90de4ee795..16d6f05b9f 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -28,6 +28,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       colorKeywords = parserConfig.colorKeywords || {},
       valueKeywords = parserConfig.valueKeywords || {},
       allowNested = parserConfig.allowNested,
+      lineComment = parserConfig.lineComment,
       supportsAtComponent = parserConfig.supportsAtComponent === true;
 
   var type, override;
@@ -407,6 +408,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     electricChars: "}",
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
+    lineComment: lineComment,
     fold: "brace"
   };
 });
@@ -730,6 +732,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     valueKeywords: valueKeywords,
     fontProperties: fontProperties,
     allowNested: true,
+    lineComment: "//",
     tokenHooks: {
       "/": function(stream, state) {
         if (stream.eat("/")) {
@@ -772,6 +775,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     valueKeywords: valueKeywords,
     fontProperties: fontProperties,
     allowNested: true,
+    lineComment: "//",
     tokenHooks: {
       "/": function(stream, state) {
         if (stream.eat("/")) {

From 268cf9905509b87de33a00342ee1cce9a1bdc5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <oseg@google.com>
Date: Mon, 23 Jan 2017 15:15:31 +0100
Subject: [PATCH 3061/4742] [java mode] Make @interface a defining keyword

---
 mode/clike/clike.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index cad2d5145c..bba2ec9056 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -425,16 +425,19 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "do else enum extends final finally float for goto if implements import " +
                     "instanceof interface native new package private protected public " +
                     "return static strictfp super switch synchronized this throw throws transient " +
-                    "try volatile while"),
+                    "try volatile while @interface"),
     types: words("byte short int long float double boolean char void Boolean Byte Character Double Float " +
                  "Integer Long Number Object Short String StringBuffer StringBuilder Void"),
     blockKeywords: words("catch class do else finally for if switch try while"),
-    defKeywords: words("class interface package enum"),
+    defKeywords: words("class interface package enum @interface"),
     typeFirstDefinitions: true,
     atoms: words("true false null"),
     number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
     hooks: {
       "@": function(stream) {
+        // Don't match the @interface keyword.
+        if (stream.match('interface', false)) return false;
+
         stream.eatWhile(/[\w\$_]/);
         return "meta";
       }

From 524f54a85c963f174cf4fc9c430da85b58b3e1cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arthur=20M=C3=BCller?= <amller@users.noreply.github.com>
Date: Tue, 31 Jan 2017 15:43:59 +0100
Subject: [PATCH 3062/4742] [go mode] Add builtin delete function to atoms

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

diff --git a/mode/go/go.js b/mode/go/go.js
index 803a5ba27b..c4e382db9e 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -28,7 +28,7 @@ CodeMirror.defineMode("go", function(config) {
 
   var atoms = {
     "true":true, "false":true, "iota":true, "nil":true, "append":true,
-    "cap":true, "close":true, "complex":true, "copy":true, "imag":true,
+    "cap":true, "close":true, "complex":true, "copy":true, "delete":true, "imag":true,
     "len":true, "make":true, "new":true, "panic":true, "print":true,
     "println":true, "real":true, "recover":true
   };

From 1ec2263e2f55f2c538a1b47301f74977e24f5bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arthur=20M=C3=BCller?= <amller@users.noreply.github.com>
Date: Wed, 1 Feb 2017 10:05:28 +0100
Subject: [PATCH 3063/4742] [go mode] Added missing keyword 'rune'

Reference: https://golang.org/pkg/builtin/#rune
---
 mode/go/go.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/go/go.js b/mode/go/go.js
index c4e382db9e..8896b57fb9 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -23,7 +23,8 @@ CodeMirror.defineMode("go", function(config) {
     "bool":true, "byte":true, "complex64":true, "complex128":true,
     "float32":true, "float64":true, "int8":true, "int16":true, "int32":true,
     "int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true,
-    "uint64":true, "int":true, "uint":true, "uintptr":true, "error": true
+    "uint64":true, "int":true, "uint":true, "uintptr":true, "error": true,
+    "rune":true
   };
 
   var atoms = {

From d0e3b2e727c41aa4fd89fbad0adfb3815339174c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arthur=20M=C3=BCller?= <amller@users.noreply.github.com>
Date: Wed, 1 Feb 2017 10:17:02 +0100
Subject: [PATCH 3064/4742] Added license name

Added the name of the license in the first line inorder to let Github recognize the License.
---
 LICENSE | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/LICENSE b/LICENSE
index 1bca6bfed4..ff7db4b99f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,5 @@
+MIT License
+
 Copyright (C) 2017 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

From 73044ab7cc377d4e039400d9ca23d044169cde0b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 1 Feb 2017 19:08:40 +0100
Subject: [PATCH 3065/4742] [julia mode] Properly indent elseif lines

Closes #4519
---
 mode/julia/julia.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 0174210b55..8fc999f5f9 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -388,7 +388,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     indent: function(state, textAfter) {
       var delta = 0;
       if ( textAfter === ']' || textAfter === ')' || textAfter === "end" ||
-           textAfter === "else" || textAfter === "catch" ||
+           textAfter === "else" || textAfter === "catch" || textAfter === "elseif" ||
            textAfter === "finally" ) {
         delta = -1;
       }

From d8166067bed6935d1a1db158acf58cc1a595ae31 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 11:36:18 +0100
Subject: [PATCH 3066/4742] Document the fact that skipTo can skip to any
 string

---
 doc/manual.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index a5eb223355..496494c4fc 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3141,11 +3141,11 @@ <h2>Writing CodeMirror Modes</h2>
       white-space.</dd>
       <dt><code><strong>skipToEnd</strong>()</code></dt>
       <dd>Moves the position to the end of the line.</dd>
-      <dt><code><strong>skipTo</strong>(ch: string) → boolean</code></dt>
-      <dd>Skips to the next occurrence of the given character, if
+      <dt><code><strong>skipTo</strong>(str: string) → boolean</code></dt>
+      <dd>Skips to the start of the next occurrence of the given string, if
       found on the current line (doesn't advance the stream if the
-      character does not occur on the line). Returns true if the
-      character was found.</dd>
+      string does not occur on the line). Returns true if the
+      string was found.</dd>
       <dt><code><strong>match</strong>(pattern: string, ?consume: boolean, ?caseFold: boolean) → boolean</code></dt>
       <dt><code><strong>match</strong>(pattern: regexp, ?consume: boolean) → array&lt;string&gt;</code></dt>
       <dd>Act like a

From 4206f287cb798df5511159ebfebcb27013cf54b0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 11:41:27 +0100
Subject: [PATCH 3067/4742] [markdown mode] Understand end-of-fenced-code
 inside other markup

Closes #4528
---
 mode/markdown/markdown.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 1aeb34414c..fde258fef4 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -239,10 +239,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function local(stream, state) {
-    if (state.fencedChars && stream.match(state.fencedChars, false)) {
+    if (state.fencedChars && stream.skipTo(state.fencedChars)) {
+      stream.match(state.fencedChars)
       state.localMode = state.localState = null;
       state.f = state.block = leavingLocal;
-      return null;
+      return "comment";
     } else if (state.localMode) {
       return state.localMode.token(stream, state.localState);
     } else {

From 6ea8a906d94994f34faacdde282988a8bb589f94 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 11:53:27 +0100
Subject: [PATCH 3068/4742] [markdown mode] Fix styling of closing code block
 fence

Issue #4528
---
 mode/markdown/markdown.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index fde258fef4..483422a90a 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -239,11 +239,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function local(stream, state) {
-    if (state.fencedChars && stream.skipTo(state.fencedChars)) {
-      stream.match(state.fencedChars)
+    if (state.fencedChars && stream.match(state.fencedChars)) {
+      if (modeCfg.highlightFormatting) state.formatting = "code-block";
       state.localMode = state.localState = null;
       state.f = state.block = leavingLocal;
-      return "comment";
+      return getType(state)
+    } else if (state.fencedChars && stream.skipTo(state.fencedChars)) {
+      return "commment"
     } else if (state.localMode) {
       return state.localMode.token(stream, state.localState);
     } else {

From b4820dd94c9a0ab40bfcccb72feb95d424729e12 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 11:55:59 +0100
Subject: [PATCH 3069/4742] [dylan mode] Remove dependency on ES5

---
 mode/dylan/dylan.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index 1b46bc8284..4520c14e30 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -11,6 +11,10 @@
 })(function(CodeMirror) {
 "use strict";
 
+function forEach(arr, f) {
+  for (let i = 0; i < arr.length; i++) f(arr[i], i)
+}
+
 CodeMirror.defineMode("dylan", function(_config) {
   // Words
   var words = {
@@ -136,13 +140,13 @@ CodeMirror.defineMode("dylan", function(_config) {
   var wordLookup = {};
   var styleLookup = {};
 
-  [
+  forEach([
     "keyword",
     "definition",
     "simpleDefinition",
     "signalingCalls"
-  ].forEach(function(type) {
-    words[type].forEach(function(word) {
+  ], function(type) {
+    forEach(words[type], function(word) {
       wordLookup[word] = type;
       styleLookup[word] = styles[type];
     });

From c8c77f97e661ad7ae578e95b34ec462bc5ff1990 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 11:59:19 +0100
Subject: [PATCH 3070/4742] [dylan mode] let -> var

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

diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index 4520c14e30..7d4c3ed2fd 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -12,7 +12,7 @@
 "use strict";
 
 function forEach(arr, f) {
-  for (let i = 0; i < arr.length; i++) f(arr[i], i)
+  for (var i = 0; i < arr.length; i++) f(arr[i], i)
 }
 
 CodeMirror.defineMode("dylan", function(_config) {

From 7268d97a86d482eb3d8a4307789ce2b71e4dce55 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 5 Oct 2016 13:09:23 +0200
Subject: [PATCH 3071/4742] Use Pos instead of object literals in vim_test

---
 test/vim_test.js | 109 ++++++++++++++++++++++++-----------------------
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/test/vim_test.js b/test/vim_test.js
index 703a07a779..d6b0ad16b2 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1,3 +1,4 @@
+var Pos = CodeMirror.Pos;
 CodeMirror.Vim.suppressErrorLogging = true;
 
 var code = '' +
@@ -39,63 +40,63 @@ var bracesLine = lines[3];
 var seekBraceLine = lines[4];
 
 var word1 = {
-  start: { line: wordLine.line, ch: 1 },
-  end: { line: wordLine.line, ch: 5 }
+  start: new Pos(wordLine.line, 1),
+  end: new Pos(wordLine.line, 5)
 };
 var word2 = {
-  start: { line: wordLine.line, ch: word1.end.ch + 2 },
-  end: { line: wordLine.line, ch: word1.end.ch + 4 }
+  start: new Pos(wordLine.line, word1.end.ch + 2),
+  end: new Pos(wordLine.line, word1.end.ch + 4)
 };
 var word3 = {
-  start: { line: bigWordLine.line, ch: 1 },
-  end: { line: bigWordLine.line, ch: 5 }
+  start: new Pos(bigWordLine.line, 1),
+  end: new Pos(bigWordLine.line, 5)
 };
 var bigWord1 = word1;
 var bigWord2 = word2;
 var bigWord3 = {
-  start: { line: bigWordLine.line, ch: 1 },
-  end: { line: bigWordLine.line, ch: 7 }
+  start: new Pos(bigWordLine.line, 1),
+  end: new Pos(bigWordLine.line, 7)
 };
 var bigWord4 = {
-  start: { line: bigWordLine.line, ch: bigWord1.end.ch + 3 },
-  end: { line: bigWordLine.line, ch: bigWord1.end.ch + 7 }
+  start: new Pos(bigWordLine.line, bigWord1.end.ch + 3),
+  end: new Pos(bigWordLine.line, bigWord1.end.ch + 7)
 };
 
-var oChars = [ { line: charLine.line, ch: 1 },
-    { line: charLine.line, ch: 3 },
-    { line: charLine.line, ch: 7 } ];
-var pChars = [ { line: charLine.line, ch: 2 },
-    { line: charLine.line, ch: 4 },
-    { line: charLine.line, ch: 6 },
-    { line: charLine.line, ch: 8 } ];
-var numChars = [ { line: charLine.line, ch: 10 },
-    { line: charLine.line, ch: 12 },
-    { line: charLine.line, ch: 14 },
-    { line: charLine.line, ch: 16 },
-    { line: charLine.line, ch: 18 }];
+var oChars = [ new Pos(charLine.line, 1),
+    new Pos(charLine.line, 3),
+    new Pos(charLine.line, 7) ];
+var pChars = [ new Pos(charLine.line, 2),
+    new Pos(charLine.line, 4),
+    new Pos(charLine.line, 6),
+    new Pos(charLine.line, 8) ];
+var numChars = [ new Pos(charLine.line, 10),
+    new Pos(charLine.line, 12),
+    new Pos(charLine.line, 14),
+    new Pos(charLine.line, 16),
+    new Pos(charLine.line, 18)];
 var parens1 = {
-  start: { line: bracesLine.line, ch: 1 },
-  end: { line: bracesLine.line, ch: 3 }
+  start: new Pos(bracesLine.line, 1),
+  end: new Pos(bracesLine.line, 3)
 };
 var squares1 = {
-  start: { line: bracesLine.line, ch: 5 },
-  end: { line: bracesLine.line, ch: 7 }
+  start: new Pos(bracesLine.line, 5),
+  end: new Pos(bracesLine.line, 7)
 };
 var curlys1 = {
-  start: { line: bracesLine.line, ch: 9 },
-  end: { line: bracesLine.line, ch: 11 }
+  start: new Pos(bracesLine.line, 9),
+  end: new Pos(bracesLine.line, 11)
 };
 var seekOutside = {
-  start: { line: seekBraceLine.line, ch: 1 },
-  end: { line: seekBraceLine.line, ch: 16 }
+  start: new Pos(seekBraceLine.line, 1),
+  end: new Pos(seekBraceLine.line, 16)
 };
 var seekInside = {
-  start: { line: seekBraceLine.line, ch: 14 },
-  end: { line: seekBraceLine.line, ch: 11 }
+  start: new Pos(seekBraceLine.line, 14),
+  end: new Pos(seekBraceLine.line, 11)
 };
 
 function copyCursor(cur) {
-  return { ch: cur.ch, line: cur.line };
+  return new Pos(cur.line, cur.ch);
 }
 
 function forEach(arr, func) {
@@ -292,7 +293,7 @@ testJumplist('jumplist_skip_deleted_mark<c-i>',
 function testMotion(name, keys, endPos, startPos) {
   testVim(name, function(cm, vim, helpers) {
     if (!startPos) {
-      startPos = { line: 0, ch: 0 };
+      startPos = new Pos(0, 0);
     }
     cm.setCursor(startPos);
     helpers.doKeys(keys);
@@ -301,11 +302,11 @@ function testMotion(name, keys, endPos, startPos) {
 };
 
 function makeCursor(line, ch) {
-  return { line: line, ch: ch };
+  return new Pos(line, ch);
 };
 
 function offsetCursor(cur, offsetLine, offsetCh) {
-  return { line: cur.line + offsetLine, ch: cur.ch + offsetCh };
+  return new Pos(cur.line + offsetLine, cur.ch + offsetCh);
 };
 
 // Motion tests
@@ -408,20 +409,20 @@ testVim('Changing lines after Eol operation', function(cm, vim, helpers) {
   helpers.doKeys(['$']);
   helpers.doKeys(['j']);
   // After moving to Eol and then down, we should be at Eol of line 2
-  helpers.assertCursorAt({ line: 1, ch: lines[1].length - 1 });
+  helpers.assertCursorAt(new Pos(1, lines[1].length - 1));
   helpers.doKeys(['j']);
   // After moving down, we should be at Eol of line 3
-  helpers.assertCursorAt({ line: 2, ch: lines[2].length - 1 });
+  helpers.assertCursorAt(new Pos(2, lines[2].length - 1));
   helpers.doKeys(['h']);
   helpers.doKeys(['j']);
   // After moving back one space and then down, since line 4 is shorter than line 2, we should
   // be at Eol of line 2 - 1
-  helpers.assertCursorAt({ line: 3, ch: lines[3].length - 1 });
+  helpers.assertCursorAt(new Pos(3, lines[3].length - 1));
   helpers.doKeys(['j']);
   helpers.doKeys(['j']);
   // After moving down again, since line 3 has enough characters, we should be back to the
   // same place we were at on line 1
-  helpers.assertCursorAt({ line: 5, ch: lines[2].length - 2 });
+  helpers.assertCursorAt(new Pos(5, lines[2].length - 2));
 });
 //making sure gj and gk recover from clipping
 testVim('gj_gk_clipping', function(cm,vim,helpers){
@@ -470,7 +471,7 @@ testVim('gj_gk', function(cm, vim, helpers) {
   // Test moving down preserves column position.
   helpers.doKeys('g', 'j');
   var pos1 = cm.getCursor();
-  var expectedPos2 = { line: 0, ch: (pos1.ch - 4) * 2 + 4};
+  var expectedPos2 = new Pos(0, (pos1.ch - 4) * 2 + 4);
   helpers.doKeys('g', 'j');
   helpers.assertCursorAt(expectedPos2);
 
@@ -865,8 +866,8 @@ testVim('d_reverse', function(cm, vim, helpers) {
 }, { value: ' word1\nword2 ' });
 testVim('dd', function(cm, vim, helpers) {
   cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 1, ch: 0 });
+  var expectedBuffer = cm.getRange(new Pos(0, 0),
+    new Pos(1, 0));
   var expectedLineCount = cm.lineCount() - 1;
   helpers.doKeys('d', 'd');
   eq(expectedLineCount, cm.lineCount());
@@ -877,8 +878,8 @@ testVim('dd', function(cm, vim, helpers) {
 });
 testVim('dd_prefix_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 2, ch: 0 });
+  var expectedBuffer = cm.getRange(new Pos(0, 0),
+    new Pos(2, 0));
   var expectedLineCount = cm.lineCount() - 2;
   helpers.doKeys('2', 'd', 'd');
   eq(expectedLineCount, cm.lineCount());
@@ -889,8 +890,8 @@ testVim('dd_prefix_repeat', function(cm, vim, helpers) {
 });
 testVim('dd_motion_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 2, ch: 0 });
+  var expectedBuffer = cm.getRange(new Pos(0, 0),
+    new Pos(2, 0));
   var expectedLineCount = cm.lineCount() - 2;
   helpers.doKeys('d', '2', 'd');
   eq(expectedLineCount, cm.lineCount());
@@ -901,8 +902,8 @@ testVim('dd_motion_repeat', function(cm, vim, helpers) {
 });
 testVim('dd_multiply_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 6, ch: 0 });
+  var expectedBuffer = cm.getRange(new Pos(0, 0),
+    new Pos(6, 0));
   var expectedLineCount = cm.lineCount() - 6;
   helpers.doKeys('2', 'd', '3', 'd');
   eq(expectedLineCount, cm.lineCount());
@@ -944,8 +945,8 @@ testVim('yw_repeat', function(cm, vim, helpers) {
 testVim('yy_multiply_repeat', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);
   cm.setCursor(curStart);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 6, ch: 0 });
+  var expectedBuffer = cm.getRange(new Pos(0, 0),
+    new Pos(6, 0));
   var expectedLineCount = cm.lineCount();
   helpers.doKeys('2', 'y', '3', 'y');
   eq(expectedLineCount, cm.lineCount());
@@ -978,8 +979,8 @@ testVim('cw_repeat', function(cm, vim, helpers) {
 }, { value: ' word1\nword2' });
 testVim('cc_multiply_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 6, ch: 0 });
+  var expectedBuffer = cm.getRange(new Pos(0, 0),
+    new Pos(6, 0));
   var expectedLineCount = cm.lineCount() - 5;
   helpers.doKeys('2', 'c', '3', 'c');
   eq(expectedLineCount, cm.lineCount());
@@ -1260,7 +1261,7 @@ testEdit('di[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'di[', 'foo (bAr)
 testEdit('di[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'di[', 'foo (bAr) baz');
 testEdit('da[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'da[', 'foo (bAr) baz');
 testEdit('da[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'da[', 'foo (bAr) baz');
-testMotion('di(_outside_should_stay', ['d', 'i', '('], { line: 0, ch: 0}, { line: 0, ch: 0});
+testMotion('di(_outside_should_stay', ['d', 'i', '('], new Pos(0, 0), new Pos(0, 0));
 
 //  Open and close on different lines, equally indented
 testEdit('di{_middle_spc', 'a{\n\tbar\n}b', /r/, 'di{', 'a{}b');

From 801c366934a6684e3c36f299ef361f1bd70a0df4 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sun, 2 Oct 2016 16:44:34 +0200
Subject: [PATCH 3072/4742] Add failing test for fix for #4078

---
 test/test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test.js b/test/test.js
index de2c66e830..07d029fba8 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1122,6 +1122,8 @@ testCM("measureWrappedEndOfLine", function(cm) {
   var endPos = cm.charCoords(Pos(0, 12)); // Next-to-last since last would wrap (#1862)
   endPos.left += w; // Add width of editor just to be sure that we are behind last character
   eqPos(cm.coordsChar(endPos), Pos(0, 13));
+  endPos.left += w * 100;
+  eqPos(cm.coordsChar(endPos), Pos(0, 13));
 }, {mode: "text/html", value: "0123456789abcde0123456789", lineWrapping: true}, ie_lt8 || opera_lt10);
 
 testCM("scrollVerticallyAndHorizontally", function(cm) {

From be7d7899d1544752b026778dc83136bfd9dbdf73 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sun, 2 Oct 2016 16:44:07 +0200
Subject: [PATCH 3073/4742] Make Pos stick to the character after or before

---
 src/line/pos.js                         | 10 +++++++---
 src/measurement/position_measurement.js | 17 ++++++++++-------
 test/driver.js                          |  4 ++--
 test/test.js                            | 11 ++++++++---
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/line/pos.js b/src/line/pos.js
index 73b2e0b8e8..4f5e4c5594 100644
--- a/src/line/pos.js
+++ b/src/line/pos.js
@@ -1,15 +1,19 @@
 import { getLine } from "./utils_line"
 
 // A Pos instance represents a position within the text.
-export function Pos (line, ch) {
-  if (!(this instanceof Pos)) return new Pos(line, ch)
-  this.line = line; this.ch = ch
+export function Pos(line, ch, sticky = null) {
+  if (!(this instanceof Pos)) return new Pos(line, ch, sticky)
+  this.line = line
+  this.ch = ch
+  this.sticky = sticky
 }
 
 // Compare two positions, return 0 if they are the same, a negative
 // number when a is less, and a positive number otherwise.
 export function cmp(a, b) { return a.line - b.line || a.ch - b.ch }
 
+export function equalCursorPos(a, b) { return a.sticky == b.sticky && cmp(a, b) == 0 }
+
 export function copyPos(x) {return Pos(x.line, x.ch)}
 export function maxPos(a, b) { return cmp(a, b) < 0 ? b : a }
 export function minPos(a, b) { return cmp(a, b) < 0 ? a : b }
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index f62672c494..4e8a3f839a 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -357,7 +357,7 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig
     return get(ch, right)
   }
   let order = getOrder(lineObj), ch = pos.ch
-  if (!order) return get(ch)
+  if (!order) return get(pos.sticky == "before" ? ch - 1 : ch, pos.sticky == "before")
   let partPos = getBidiPartAt(order, ch)
   let val = getBidi(ch, partPos)
   if (bidiOther != null) val.other = getBidi(ch, bidiOther)
@@ -381,8 +381,8 @@ export function estimateCoords(cm, pos) {
 // the right of the character position, for example). When outside
 // is true, that means the coordinates lie outside the line's
 // vertical range.
-function PosWithInfo(line, ch, outside, xRel) {
-  let pos = Pos(line, ch)
+function PosWithInfo(line, ch, sticky, outside, xRel) {
+  let pos = Pos(line, ch, sticky)
   pos.xRel = xRel
   if (outside) pos.outside = true
   return pos
@@ -393,10 +393,10 @@ function PosWithInfo(line, ch, outside, xRel) {
 export function coordsChar(cm, x, y) {
   let doc = cm.doc
   y += cm.display.viewOffset
-  if (y < 0) return PosWithInfo(doc.first, 0, true, -1)
+  if (y < 0) return PosWithInfo(doc.first, 0, null, true, -1)
   let lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1
   if (lineN > last)
-    return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1)
+    return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, true, 1)
   if (x < 0) x = 0
 
   let lineObj = getLine(doc, lineN)
@@ -429,7 +429,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
   let from = lineLeft(lineObj), to = lineRight(lineObj)
   let fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine
 
-  if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1)
+  if (x > toX) return PosWithInfo(lineNo, to, null, toOutside, 1)
   // Do a binary search between these bounds.
   for (;;) {
     if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
@@ -448,9 +448,12 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
           ch++
           xDiff = x - charSize.right
         }
+      let sticky = null
+      if (toX > cm.display.wrapper.clientWidth) {
+        sticky = "before"
       }
       while (isExtendingChar(lineObj.text.charAt(ch))) ++ch
-      let pos = PosWithInfo(lineNo, ch, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0)
+      let pos = PosWithInfo(lineNo, ch, sticky, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0)
       return pos
     }
     let step = Math.ceil(dist / 2), middle = from + step
diff --git a/test/driver.js b/test/driver.js
index c61d4c1f36..01736450f3 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -107,11 +107,11 @@ function near(a, b, margin, msg) {
     throw new Failure(label(a + " is not close to " + b + " (" + margin + ")", msg));
 }
 function eqPos(a, b, msg) {
-  function str(p) { return "{line:" + p.line + ",ch:" + p.ch + "}"; }
+  function str(p) { return "{line:" + p.line + ",ch:" + p.ch + ",sticky:" + p.sticky + "}"; }
   if (a == b) return;
   if (a == null) throw new Failure(label("comparing null to " + str(b), msg));
   if (b == null) throw new Failure(label("comparing " + str(a) + " to null", msg));
-  if (a.line != b.line || a.ch != b.ch) throw new Failure(label(str(a) + " != " + str(b), msg));
+  if (a.line != b.line || a.ch != b.ch || a.sticky != b.sticky) throw new Failure(label(str(a) + " != " + str(b), msg));
 }
 function is(a, msg) {
   if (!a) throw new Failure(label("assertion failed", msg));
diff --git a/test/test.js b/test/test.js
index 07d029fba8..37894190db 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1105,6 +1105,10 @@ testCM("measureEndOfLine", function(cm) {
   is(endPos.left > w - 20, "not at right");
   endPos = cm.charCoords(Pos(0, 18));
   eqPos(cm.coordsChar({left: endPos.left, top: endPos.top + 5}), Pos(0, 18));
+
+  var wrapPos = cm.cursorCoords(Pos(0, 9, "before"));
+  is(wrapPos.top < endPos.top, "wrapPos is actually in first line");
+  eqPos(cm.coordsChar({left: wrapPos.left + 10, top: wrapPos.top}), Pos(0, 9, "before"));
 }, {mode: "text/html", value: "<!-- foo barrr -->", lineWrapping: true}, ie_lt8 || opera_lt10);
 
 testCM("measureWrappedEndOfLine", function(cm) {
@@ -1121,9 +1125,9 @@ testCM("measureWrappedEndOfLine", function(cm) {
   }
   var endPos = cm.charCoords(Pos(0, 12)); // Next-to-last since last would wrap (#1862)
   endPos.left += w; // Add width of editor just to be sure that we are behind last character
-  eqPos(cm.coordsChar(endPos), Pos(0, 13));
+  eqPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
   endPos.left += w * 100;
-  eqPos(cm.coordsChar(endPos), Pos(0, 13));
+  eqPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
 }, {mode: "text/html", value: "0123456789abcde0123456789", lineWrapping: true}, ie_lt8 || opera_lt10);
 
 testCM("scrollVerticallyAndHorizontally", function(cm) {
@@ -1149,7 +1153,8 @@ testCM("moveVstuck", function(cm) {
   }
   cm.setCursor(Pos(0, val.length - 1));
   cm.moveV(-1, "line");
-  eqPos(cm.getCursor(), Pos(0, 26));
+  eqPos(cm.getCursor(), Pos(0, 26, "before"));
+  is(cm.cursorCoords(null, "local").top < h0, "cursor is in first visual line");
 }, {lineWrapping: true}, ie_lt8 || opera_lt10);
 
 testCM("collapseOnMove", function(cm) {

From 8ef8555e89abc889745b4222ffeefd1a3ea81f99 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 5 Oct 2016 20:05:10 +0200
Subject: [PATCH 3074/4742] Use cursor stickiness in cursor movement

Should fix #1862 for ltr text.
---
 src/edit/methods.js    | 6 +++---
 src/model/selection.js | 4 ++--
 test/test.js           | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index 144e4773f6..caf62b19f1 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -9,7 +9,7 @@ import { triggerElectric } from "../input/input"
 import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
 import { getKeyMap } from "../input/keymap"
 import { methodOp, operation, runInOp } from "../display/operations"
-import { clipLine, clipPos, cmp, Pos } from "../line/pos"
+import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos"
 import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
 import { Range } from "../model/selection"
 import { replaceOneSelection, skipAtomic } from "../model/selection_updates"
@@ -507,8 +507,8 @@ function findPosH(doc, pos, dir, unit, visually) {
       if (dir > 0 && !moveOnce(!first)) break
     }
   }
-  let result = skipAtomic(doc, Pos(line, ch), pos, origDir, true)
-  if (!cmp(pos, result)) result.hitSide = true
+  let result = skipAtomic(doc, Pos(line, ch, (!doc.cm || doc.cm.options.lineWrapping) ? (dir == -1 ? "after" : "before") : null), pos, origDir, true)
+  if (equalCursorPos(pos, result)) result.hitSide = true
   return result
 }
 
diff --git a/src/model/selection.js b/src/model/selection.js
index 120af2a45c..a47ede93fa 100644
--- a/src/model/selection.js
+++ b/src/model/selection.js
@@ -1,4 +1,4 @@
-import { cmp, copyPos, maxPos, minPos } from "../line/pos"
+import { cmp, copyPos, equalCursorPos, maxPos, minPos } from "../line/pos"
 import { indexOf } from "../util/misc"
 
 // Selection objects are immutable. A new one is created every time
@@ -18,7 +18,7 @@ Selection.prototype = {
     if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false
     for (let i = 0; i < this.ranges.length; i++) {
       let here = this.ranges[i], there = other.ranges[i]
-      if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false
+      if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) return false
     }
     return true
   },
diff --git a/test/test.js b/test/test.js
index 37894190db..8a064b6c97 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2205,3 +2205,10 @@ testCM("lineSeparator", function(cm) {
   eq(cm.lineCount(), 4);
 }, {value: "foo\nbar\r\nbaz\rquux",
     lineSeparator: "\n"});
+
+testCM("delete_wrapped", function(cm) {
+  makeItWrapAfter(cm, Pos(0, 2));
+  cm.doc.setCursor(Pos(0, 3, "after"));
+  cm.deleteH(-1, "char");
+  eq(cm.getLine(0), "1245");
+}, {value: "12345", lineWrapping: true})

From 959564ae90640529923c159822f33fbfc84a07d5 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 7 Nov 2016 14:18:17 +0100
Subject: [PATCH 3075/4742] Use stickiness in cursorCoords for bidi

---
 src/measurement/position_measurement.js | 50 +++++++++++++++----------
 src/util/bidi.js                        | 29 +++++---------
 2 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 4e8a3f839a..49581e656e 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -2,7 +2,7 @@ import { buildLineContent, LineView } from "../line/line_data"
 import { clipPos, Pos } from "../line/pos"
 import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans"
 import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line"
-import { bidiLeft, bidiRight, bidiOther, getBidiPartAt, getOrder, lineLeft, lineRight, moveVisually } from "../util/bidi"
+import { bidiOther, getBidiPartAt, getOrder, lineLeft, lineRight, moveVisually } from "../util/bidi"
 import { ie, ie_version } from "../util/browser"
 import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom"
 import { e_target } from "../util/event"
@@ -334,6 +334,19 @@ export function charCoords(cm, pos, context, lineObj, bias) {
 // Returns a box for a given cursor position, which may have an
 // 'other' property containing the position of the secondary cursor
 // on a bidi boundary.
+// A cursor Pos(line, char, "before") is on the same visual line as `char - 1`
+// and after `char - 1` in writing order of `char - 1`
+// A cursor Pos(line, char, "after") is on the same visual line as `char`
+// and before `char` in writing order of `char`
+// Examples (upper-case letters are RTL, lower-case are LTR):
+//     Pos(0, 1, ...)
+//     before   after
+// ab     a|b     a|b
+// aB     a|B     aB|
+// Ab     |Ab     A|b
+// AB     B|A     B|A
+// Every position after the last character on a line is considered to stick
+// to the last character on the line.
 export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
   lineObj = lineObj || getLine(cm.doc, pos.line)
   if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj)
@@ -342,25 +355,24 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig
     if (right) m.left = m.right; else m.right = m.left
     return intoCoordSystem(cm, lineObj, m, context)
   }
-  function getBidi(ch, partPos) {
-    let part = order[partPos], right = part.level % 2
-    if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
-      part = order[--partPos]
-      ch = bidiRight(part) - (part.level % 2 ? 0 : 1)
-      right = true
-    } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
-      part = order[++partPos]
-      ch = bidiLeft(part) - part.level % 2
-      right = false
-    }
-    if (right && ch == part.to && ch > part.from) return get(ch - 1)
-    return get(ch, right)
+  let order = getOrder(lineObj), ch = pos.ch, sticky = pos.sticky
+  if (ch >= lineObj.text.length) {
+    ch = lineObj.text.length
+    sticky = "before"
+  } else if (ch <= 0) {
+    ch = 0
+    sticky = "after"
+  }
+  if (!order) return get(sticky == "before" ? ch - 1 : ch, sticky == "before")
+
+  function getBidi(ch, partPos, invert) {
+    let part = order[partPos], right = (part.level % 2) != 0
+    return get(invert ? ch - 1 : ch, right != invert)
   }
-  let order = getOrder(lineObj), ch = pos.ch
-  if (!order) return get(pos.sticky == "before" ? ch - 1 : ch, pos.sticky == "before")
-  let partPos = getBidiPartAt(order, ch)
-  let val = getBidi(ch, partPos)
-  if (bidiOther != null) val.other = getBidi(ch, bidiOther)
+  let partPos = getBidiPartAt(order, ch, sticky)
+  let other = bidiOther
+  let val = getBidi(ch, partPos, sticky == "before")
+  if (other != null) val.other = getBidi(ch, other, sticky != "before")
   return val
 }
 
diff --git a/src/util/bidi.js b/src/util/bidi.js
index 6a84914035..7d08e36596 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -25,33 +25,24 @@ export function lineRight(line) {
   return bidiRight(lst(order))
 }
 
-function compareBidiLevel(order, a, b) {
-  let linedir = order[0].level
-  if (a == linedir) return true
-  if (b == linedir) return false
-  return a < b
-}
 
 export let bidiOther = null
-export function getBidiPartAt(order, pos) {
+export function getBidiPartAt(order, ch, sticky) {
   let found
   bidiOther = null
   for (let i = 0; i < order.length; ++i) {
     let cur = order[i]
-    if (cur.from < pos && cur.to > pos) return i
-    if ((cur.from == pos || cur.to == pos)) {
-      if (found == null) {
-        found = i
-      } else if (compareBidiLevel(order, cur.level, order[found].level)) {
-        if (cur.from != cur.to) bidiOther = found
-        return i
-      } else {
-        if (cur.from != cur.to) bidiOther = i
-        return found
-      }
+    if (cur.from < ch && cur.to > ch) return i
+    if (cur.to == ch) {
+      if (cur.from != cur.to && sticky == "before") found = i
+      else bidiOther = i
+    }
+    if (cur.from == ch) {
+      if (cur.from != cur.to && sticky != "before") found = i
+      else bidiOther = i
     }
   }
-  return found
+  return found != null ? found : bidiOther
 }
 
 function moveInLine(line, pos, dir, byUnit) {

From 3f9d7eab94f3cc4e0e596b357f06094046992f52 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 14 Dec 2016 11:53:03 +0100
Subject: [PATCH 3076/4742] Reimplement visual moving

---
 src/edit/methods.js                     |  17 ++-
 src/input/movement.js                   | 108 ++++++++++++++++++
 src/measurement/position_measurement.js |   5 +
 src/util/misc.js                        |  11 ++
 test/test.js                            | 139 ++++++++++++++++++++++++
 5 files changed, 274 insertions(+), 6 deletions(-)
 create mode 100644 src/input/movement.js

diff --git a/src/edit/methods.js b/src/edit/methods.js
index caf62b19f1..1cce4f3d23 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -8,6 +8,7 @@ import { indentLine } from "../input/indent"
 import { triggerElectric } from "../input/input"
 import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
 import { getKeyMap } from "../input/keymap"
+import { endOfLine, moveVisually } from "../input/movement"
 import { methodOp, operation, runInOp } from "../display/operations"
 import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos"
 import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
@@ -16,7 +17,7 @@ import { replaceOneSelection, skipAtomic } from "../model/selection_updates"
 import { addToScrollPos, calculateScrollPos, ensureCursorVisible, resolveScrollToPos, scrollIntoView } from "../display/scrolling"
 import { heightAtLine } from "../line/spans"
 import { updateGutterSpace } from "../display/update_display"
-import { lineLeft, lineRight, moveLogically, moveVisually } from "../util/bidi"
+import { moveLogically } from "../util/bidi"
 import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
 import { signalLater } from "../util/operation_group"
 import { getLine, isLine, lineAtHeight } from "../line/utils_line"
@@ -464,7 +465,7 @@ export default function(CodeMirror) {
 // position. The resulting position will have a hitSide=true
 // property if it reached the end of the document.
 function findPosH(doc, pos, dir, unit, visually) {
-  let line = pos.line, ch = pos.ch, origDir = dir
+  let {line, ch, sticky} = pos, origDir = dir
   let lineObj = getLine(doc, line)
   function findNextLine() {
     let l = line + dir
@@ -473,11 +474,15 @@ function findPosH(doc, pos, dir, unit, visually) {
     return lineObj = getLine(doc, l)
   }
   function moveOnce(boundToLine) {
-    let next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true)
+    let myMoveVisually = (line, start, dir, byUnit) => {
+      let res = moveVisually(doc.cm, line, start, dir, byUnit, sticky)
+      if (res.ch) sticky = res.sticky
+      return res.ch
+    }
+    let next = (visually ? myMoveVisually : moveLogically)(lineObj, ch, dir, true)
     if (next == null) {
       if (!boundToLine && findNextLine()) {
-        if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj)
-        else ch = dir < 0 ? lineObj.text.length : 0
+        ;({ch, sticky} = endOfLine(visually, doc.cm, lineObj, dir))
       } else return false
     } else ch = next
     return true
@@ -507,7 +512,7 @@ function findPosH(doc, pos, dir, unit, visually) {
       if (dir > 0 && !moveOnce(!first)) break
     }
   }
-  let result = skipAtomic(doc, Pos(line, ch, (!doc.cm || doc.cm.options.lineWrapping) ? (dir == -1 ? "after" : "before") : null), pos, origDir, true)
+  let result = skipAtomic(doc, Pos(line, ch, sticky), pos, origDir, true)
   if (equalCursorPos(pos, result)) result.hitSide = true
   return result
 }
diff --git a/src/input/movement.js b/src/input/movement.js
new file mode 100644
index 0000000000..0464361c9a
--- /dev/null
+++ b/src/input/movement.js
@@ -0,0 +1,108 @@
+import { prepareMeasureCharTop } from "../measurement/position_measurement"
+import { bidiLeft, bidiRight, getBidiPartAt, getOrder, lineLeft, lineRight, moveLogically } from "../util/bidi"
+import { findFirst } from "../util/misc"
+
+export function endOfLine(visually, cm, lineObj, dir) {
+  let ch, sticky = "before"
+  if (visually) {
+    let order = getOrder(lineObj)
+    if (order) {
+      let i = dir < 0 ? order.length - 1 : 0
+      while (order[i].to == order[i].from) i += dir
+      let part = order[i]
+      // With a wrapped rtl chunk (possibly spanning multiple bidi parts),
+      // it could be that the last bidi part is not on the last visual line,
+      // since visual lines contain content order-consecutive chunks.
+      // Thus, in rtl, we are looking for the first (content-order) character
+      // in the rtl chunk that is on the last line (that is, the same line
+      // as the last (content-order) character).
+      if (dir < 0 && part.level > 0) {
+        let getTop = prepareMeasureCharTop(cm, lineObj)
+        ch = lineObj.text.length - 1
+        let targetTop = getTop(ch)
+        ch = findFirst(ch => getTop(ch) == targetTop, part.from, ch)
+        if (part.level == 1) sticky = "after"
+        else ch = moveLogically(lineObj, ch, 1, true)
+        return {ch, sticky}
+      }
+      ch = (dir < 0 ? bidiRight : bidiLeft)(part)
+      return {ch, sticky}
+    }
+  }
+  if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj)
+  else ch = dir < 0 ? lineObj.text.length : 0
+  return {ch, sticky}
+}
+
+function getVisualLineAround(cm, line, target) {
+  if (!cm.options.lineWrapping) return [0, line.text.length - 1]
+  let measureTop = prepareMeasureCharTop(cm, line)
+  let targetTop = measureTop(target)
+  return [
+    findFirst(ch => targetTop == measureTop(ch), 0, target),
+    findFirst(ch => targetTop == measureTop(ch), line.text.length - 1, target)
+  ]
+}
+
+export function moveVisually(cm, line, start, dir, byUnit, startSticky) {
+  let mv = (ch, dir) => moveLogically(line, ch, dir, byUnit)
+  let bidi = getOrder(line)
+  if (!bidi) return {ch: mv(start, dir), sticky: dir < 0 ? "after" : "before"}
+  if (start >= line.text.length) {
+    start = line.text.length
+    startSticky = "before"
+  } else if (start <= 0) {
+    start = 0
+    startSticky = "after"
+  }
+  let partPos = getBidiPartAt(bidi, start, startSticky), part = bidi[partPos]
+  if (part.level % 2 == 0 && (dir > 0 ? part.to > start : part.from < start)) {
+    // Case 1: We move within an ltr part. Even with wrapped lines,
+    // nothing interesting happens.
+    return {ch: mv(start, dir), sticky: dir < 0 ? "after" : "before"}
+  }
+
+  let getVisualLine = ch => getVisualLineAround(cm, line, ch)
+  let visualLine = getVisualLine(startSticky == "before" ? mv(start, -1) : start)
+
+  if (part.level % 2 == 1) {
+    let ch = mv(start, -dir)
+    if (ch != null && (dir > 0 ? ch >= part.from && ch >= visualLine[0] : ch <= part.to && ch <= mv(visualLine[1], 1))) {
+      // Case 2: We move within an rtl part on the same visual line
+      let sticky = dir < 0 ? "before" : "after"
+      return {ch, sticky}
+    }
+  }
+
+  // Case 3: Could not move within this bidi part in this visual line, so leave
+  // the current bidi part
+
+  let searchInVisualLine = (partPos, dir, visualLine) => {
+    let getRes = (ch, moveInStorageOrder) => moveInStorageOrder
+      ? {ch: mv(ch, 1), sticky: "before"}
+      : {ch, sticky: "after"}
+
+    for (partPos += dir; partPos >= 0 && partPos < bidi.length; partPos += dir) {
+      let part = bidi[partPos]
+      let moveInStorageOrder = (dir > 0) == (part.level != 1)
+      let ch = moveInStorageOrder ? visualLine[0] : visualLine[1]
+      if (part.from <= ch && ch < part.to) return getRes(ch, moveInStorageOrder)
+      ch = moveInStorageOrder ? part.from : mv(part.to, -1)
+      if (visualLine[0] <= ch && ch <= visualLine[1]) return getRes(ch, moveInStorageOrder)
+    }
+  }
+
+  // Case 3a: Look for other bidi parts on the same visual line
+  let res = searchInVisualLine(partPos, dir, visualLine)
+  if (res) return res
+
+  // Case 3b: Look for other bidi parts on the next visual line
+  let nextCh = mv(visualLine[dir > 0 ? 1 : 0], dir)
+  if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) {
+    res = searchInVisualLine(dir > 0 ? 0 : bidi.length, dir, getVisualLine(nextCh))
+    if (res) return res
+  }
+
+  // Case 4: Nowhere to move
+  return {ch: null, sticky: null}
+}
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 49581e656e..d87ec7a0a5 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -88,6 +88,11 @@ export function measureChar(cm, line, ch, bias) {
   return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias)
 }
 
+export function prepareMeasureCharTop(cm, line) {
+  let preparedMeasure = prepareMeasureForLine(cm, line)
+  return ch => measureCharPrepared(cm, preparedMeasure, ch).top
+}
+
 // Find a line view that corresponds to the given line number.
 export function findViewForLine(cm, lineN) {
   if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
diff --git a/src/util/misc.js b/src/util/misc.js
index 2fb90914a8..dead8a6daf 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -124,3 +124,14 @@ export function isEmpty(obj) {
 // of code points as a group.
 let extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
 export function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
+
+// Returns the value from the range [`from`; `to`] that satisfies
+// `pred` and is closest to `from`. Assumes that at least `to` satisfies `pred`.
+export function findFirst(pred, from, to) {
+  for (;;) {
+    if (Math.abs(from - to) <= 1) return pred(from) ? from : to
+    let mid = Math.floor((from + to) / 2)
+    if (pred(mid)) to = mid
+    else from = mid
+  }
+}
diff --git a/test/test.js b/test/test.js
index 8a064b6c97..00c0be25ec 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2206,6 +2206,145 @@ testCM("lineSeparator", function(cm) {
 }, {value: "foo\nbar\r\nbaz\rquux",
     lineSeparator: "\n"});
 
+var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
+var getChar = function (noExtending) { var res; do {res = String.fromCharCode(Math.floor(Math.random()*0x8ac)); } while ([0x90].indexOf(res.charCodeAt(0)) != -1 || (noExtending && extendingChars.test(res))); return res }
+var getString = function (n) { var res = getChar(true); while (--n > 0) res += getChar(); return res }
+
+function makeItWrapAfter(cm, pos) {
+  var firstLineTop = cm.cursorCoords(Pos(0, 0)).top;
+  for(var w = 0, posTop; posTop != firstLineTop; ++w) {
+    cm.setSize(w);
+    posTop = cm.charCoords(pos).top;
+  }
+}
+
+function testMoveBidi(str) {
+  testCM("move_bidi_" + str, function(cm) {
+console.log("TESTING", encodeURIComponent(str))
+    cm.getScrollerElement().style.fontFamily = "monospace";
+    makeItWrapAfter(cm, Pos(0, 5));
+
+    var steps = str.length - str.split("").filter(extendingChars.test.bind(extendingChars)).length;
+    var lineBreaks = Object.create(null);
+    lineBreaks[6 - str.substr(0, 5).split("").filter(extendingChars.test.bind(extendingChars)).length] = 'w';
+    if (str.indexOf("\n") != -1) {
+      lineBreaks[steps - 2] = 'n';
+    }
+console.log("TESTING", str.length, steps, lineBreaks)
+
+    // Make sure we are at the visual beginning of the first line
+    var pos = Pos(0, 0), lastPos;
+    cm.doc.setCursor(pos);
+    do {
+      lastPos = pos;
+      cm.execCommand("goCharLeft");
+      pos = cm.doc.getCursor();
+    } while (pos != lastPos && pos.ch != 0)
+
+    var prevCoords = cm.cursorCoords(), coords;
+    for(var i = 0; i < steps; ++i) {
+      cm.execCommand("goCharRight");
+      coords = cm.cursorCoords();
+      if ((i >= 10 && i <= 12) && !lineBreaks[i] && coords.left < prevCoords.left && coords.top > prevCoords.top) {
+console.log("MOVED WRAPPED AT>", i)
+        // The first line wraps twice
+        lineBreaks[i] = 'w';
+      }
+      if (!lineBreaks[i]) {
+        is(coords.left > prevCoords.left, "In step " + i + ", cursor didn't move right");
+        eq(coords.top, prevCoords.top, "In step " + i + ", cursor moved out of line");
+console.log("MOVED", i, "right")
+      } else {
+        is(coords.left < prevCoords.left, i);
+        is(coords.top > prevCoords.top, i);
+console.log("MOVED", i, "down")
+      }
+      prevCoords = coords;
+    }
+
+    cm.execCommand("goCharRight");
+    coords = cm.cursorCoords();
+    eq(coords.left, prevCoords.left, "Moving " + steps + " steps right didn't reach the end");
+    eq(coords.top, prevCoords.top, "Moving " + steps + " steps right didn't reach the end");
+
+    for(i = steps - 1; i >= 0; --i) {
+      cm.execCommand("goCharLeft");
+      coords = cm.cursorCoords();
+      if (!(lineBreaks[i] == 'n' || lineBreaks[i + 1] == 'w')) {
+        is(coords.left < prevCoords.left, "In step " + i + ", cursor didn't move left");
+        eq(coords.top, prevCoords.top, "In step " + i + ", cursor is not at the same line anymore");
+console.log("MOVED", i, "left")
+      } else {
+        is(coords.left > prevCoords.left, i);
+        is(coords.top < prevCoords.top, i);
+console.log("MOVED", i, "up")
+      }
+      prevCoords = coords;
+    }
+
+    cm.execCommand("goCharLeft");
+    coords = cm.cursorCoords();
+    eq(coords.left, prevCoords.left, "Moving " + steps + " steps left didn't reach the beginning");
+    eq(coords.top, prevCoords.top, "Moving " + steps + " steps left didn't reach the beginning");
+  }, {value: str, lineWrapping: true})
+};
+
+testMoveBidi("Say ا ب جabj\nS"); // https://bugs.webkit.org/show_bug.cgi?id=165753
+testMoveBidi("Όȝǝڪȉۥ״ۺ׆ɀҩۏ\nҳ");
+testMoveBidi("ό׊۷٢ԜһОצЉيčǟ\nѩ");
+testMoveBidi("ۑÚҳҕڬġڹհяųKV\nr");
+testMoveBidi("ŌӰтقȤ؁ƥ؅٣ĎȺ١\nϚ");
+testMoveBidi("ٻоҤѕѽΩ־؉ïίքdz\nٵ");
+//testMoveBidi("Count ١ ٢ ٣ ٤");
+testMoveBidi("Sayyy ا ا ب ج");
+testMoveBidi("؅؁ĆՕƿɁǞϮؠȩóć\nď");
+testMoveBidi("źڻғúہ4ם1Ƞc1a\nԁ");
+testMoveBidi("ҒȨҟփƞ٦ԓȦڰғâƥ\nڤ");
+testMoveBidi("քմѧǮßپüŢҍҞўڳ\nӧ");
+testMoveBidi("RŨďңŪzϢŎƏԖڇڦ\nӈ");
+testMoveBidi("ϖسՉȏŧΔԛdžĎӟیڡ\nέ");
+testMoveBidi("۹ؼL۵ĺȧКԙػא7״\nم");
+//testMoveBidi("ӣאƦϰ؊ȓېÛوը٬ز\nϪ");
+//testMoveBidi("ҾճٳџIՖӻ٥׭֐؜ڏ\nێ");
+//testMoveBidi("ҬÓФ؜ڂį٦Ͽɓڐͳٵ\nՈ");
+//testMoveBidi("aѴNijȻهˇ҃ڱӧǻֵ\na");
+//testMoveBidi(" a٧ا٢ ب جa\nS");
+/*
+for (var i = 0; i < 5; ++i) {
+  testMoveBidi(getString(12) + "\n" + getString(1));
+}
+*/
+
+function testCoordsWrappedBidi(str) {
+  testCM("coords_wrapped_bidi_" + str, function(cm) {
+    cm.getScrollerElement().style.fontFamily = "monospace";
+    makeItWrapAfter(cm, Pos(0, 5));
+
+    // Make sure we are at the visual beginning of the first line
+    var pos = Pos(0, 0), lastPos;
+    cm.doc.setCursor(pos);
+    do {
+      lastPos = pos;
+      cm.execCommand("goCharLeft");
+      pos = cm.doc.getCursor();
+    } while (pos != lastPos)
+
+    var top = cm.charCoords(Pos(0, 0)).top, lastTop;
+    for (var i = 1; i < str.length; ++i) {
+      lastTop = top;
+      top = cm.charCoords(Pos(0, i)).top;
+      is(top >= lastTop);
+    }
+  }, {value: str, lineWrapping: true})
+};
+
+testCoordsWrappedBidi("Count ١ ٢ ٣ ٤");
+/*
+for (var i = 0; i < 5; ++i) {
+  testCoordsWrappedBidi(getString(50));
+}
+*/
+
 testCM("delete_wrapped", function(cm) {
   makeItWrapAfter(cm, Pos(0, 2));
   cm.doc.setCursor(Pos(0, 3, "after"));

From 79e5637b061a854dfd2e57ddb33ee23ac8d0dd74 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 14 Dec 2016 12:47:23 +0100
Subject: [PATCH 3077/4742] Simplify end-of-line commands

---
 src/edit/commands.js | 23 +++++++++--------------
 src/line/spans.js    |  7 +++++++
 src/util/bidi.js     | 14 ++++++++------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/edit/commands.js b/src/edit/commands.js
index 0b0125d1e9..ea14b9bccc 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -1,13 +1,14 @@
 import { deleteNearSelection } from "./deleteNearSelection"
 import { runInOp } from "../display/operations"
 import { ensureCursorVisible } from "../display/scrolling"
+import { endOfLine } from "../input/movement"
 import { clipPos, Pos } from "../line/pos"
-import { collapsedSpanAtEnd, visualLine } from "../line/spans"
+import { visualLine, visualLineEnd } from "../line/spans"
 import { getLine, lineNo } from "../line/utils_line"
 import { Range } from "../model/selection"
 import { selectAll } from "../model/selection_updates"
 import { countColumn, sel_dontScroll, sel_move, spaceStr } from "../util/misc"
-import { getOrder, lineLeft, lineRight } from "../util/bidi"
+import { getOrder } from "../util/bidi"
 
 // Commands are parameter-less actions that can be performed on an
 // editor, mostly used for keybindings.
@@ -156,19 +157,13 @@ function lineStart(cm, lineN) {
   let line = getLine(cm.doc, lineN)
   let visual = visualLine(line)
   if (visual != line) lineN = lineNo(visual)
-  let order = getOrder(visual)
-  let ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual)
-  return Pos(lineN, ch)
+  return endOfLine(true, cm, visual, lineN, 1)
 }
 function lineEnd(cm, lineN) {
-  let merged, line = getLine(cm.doc, lineN)
-  while (merged = collapsedSpanAtEnd(line)) {
-    line = merged.find(1, true).line
-    lineN = null
-  }
-  let order = getOrder(line)
-  let ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line)
-  return Pos(lineN == null ? lineNo(line) : lineN, ch)
+  let line = getLine(cm.doc, lineN)
+  let visual = visualLineEnd(line)
+  if (visual != line) lineN = lineNo(visual)
+  return endOfLine(true, cm, line, lineN, -1)
 }
 function lineStartSmart(cm, pos) {
   let start = lineStart(cm, pos.line)
@@ -177,7 +172,7 @@ function lineStartSmart(cm, pos) {
   if (!order || order[0].level == 0) {
     let firstNonWS = Math.max(0, line.text.search(/\S/))
     let inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
-    return Pos(start.line, inWS ? 0 : firstNonWS)
+    return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)
   }
   return start
 }
diff --git a/src/line/spans.js b/src/line/spans.js
index 267ee7182c..b9da7de7b1 100644
--- a/src/line/spans.js
+++ b/src/line/spans.js
@@ -248,6 +248,13 @@ export function visualLine(line) {
   return line
 }
 
+export function visualLineEnd(line) {
+  let merged
+  while (merged = collapsedSpanAtEnd(line))
+    line = merged.find(1, true).line
+  return line
+}
+
 // Returns an array of logical lines that continue the visual line
 // started by the argument, or undefined if there are no such lines.
 export function visualLineContinued(line) {
diff --git a/src/util/bidi.js b/src/util/bidi.js
index 7d08e36596..ce694be481 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -18,13 +18,16 @@ export function iterateBidiSections(order, from, to, f) {
 export function bidiLeft(part) { return part.level % 2 ? part.to : part.from }
 export function bidiRight(part) { return part.level % 2 ? part.from : part.to }
 
-export function lineLeft(line) { let order = getOrder(line); return order ? bidiLeft(order[0]) : 0 }
-export function lineRight(line) {
+function lineAt(line, dir) {
   let order = getOrder(line)
-  if (!order) return line.text.length
-  return bidiRight(lst(order))
+  if (!order) return dir == -1 ? line.text.length : 0
+  let pos = dir == -1 ? order.length - 1 : 0
+  while (order[pos].from == order[pos].to) pos += dir
+  return (dir == -1 ? bidiRight : bidiLeft)(order[pos])
 }
 
+export function lineLeft(line) { return lineAt(line, 1) }
+export function lineRight(line) { return lineAt(line, -1) }
 
 export let bidiOther = null
 export function getBidiPartAt(order, ch, sticky) {
@@ -81,8 +84,7 @@ export function moveVisually(line, start, dir, byUnit) {
 }
 
 export function moveLogically(line, start, dir, byUnit) {
-  let target = start + dir
-  if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir
+  let target = moveInLine(line, start, dir, byUnit)
   return target < 0 || target > line.text.length ? null : target
 }
 

From 4c69f2d5dedaf1886f7dbbf0356d2d8dae84981b Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 14 Dec 2016 21:15:12 +0100
Subject: [PATCH 3078/4742] Remove empty bidi spans

---
 src/input/movement.js | 1 -
 src/util/bidi.js      | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/src/input/movement.js b/src/input/movement.js
index 0464361c9a..bce3f5c276 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -8,7 +8,6 @@ export function endOfLine(visually, cm, lineObj, dir) {
     let order = getOrder(lineObj)
     if (order) {
       let i = dir < 0 ? order.length - 1 : 0
-      while (order[i].to == order[i].from) i += dir
       let part = order[i]
       // With a wrapped rtl chunk (possibly spanning multiple bidi parts),
       // it could be that the last bidi part is not on the last visual line,
diff --git a/src/util/bidi.js b/src/util/bidi.js
index ce694be481..4ec0578a92 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -22,7 +22,6 @@ function lineAt(line, dir) {
   let order = getOrder(line)
   if (!order) return dir == -1 ? line.text.length : 0
   let pos = dir == -1 ? order.length - 1 : 0
-  while (order[pos].from == order[pos].to) pos += dir
   return (dir == -1 ? bidiRight : bidiLeft)(order[pos])
 }
 
@@ -251,10 +250,6 @@ export let bidiOrdering = (function() {
       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))
 
     return order
   }

From 8dd86df691fbec21b1281cfefc33125615eed45b Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 21 Dec 2016 10:40:24 +0100
Subject: [PATCH 3079/4742] Use full Pos objects in move primitives

---
 src/edit/methods.js   | 31 +++++++++++++-------------
 src/input/movement.js | 51 +++++++++++++++++++++++--------------------
 src/util/bidi.js      |  7 +++---
 test/emacs_test.js    | 10 ++++-----
 test/test.js          | 40 ++++++++++++++++-----------------
 5 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index 1cce4f3d23..52ce0aee47 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -465,26 +465,27 @@ export default function(CodeMirror) {
 // position. The resulting position will have a hitSide=true
 // property if it reached the end of the document.
 function findPosH(doc, pos, dir, unit, visually) {
-  let {line, ch, sticky} = pos, origDir = dir
-  let lineObj = getLine(doc, line)
+  let oldPos = pos
+  let origDir = dir
+  let lineObj = getLine(doc, pos.line)
   function findNextLine() {
-    let l = line + dir
+    let l = pos.line + dir
     if (l < doc.first || l >= doc.first + doc.size) return false
-    line = l
+    pos = new Pos(l, pos.ch, pos.sticky)
     return lineObj = getLine(doc, l)
   }
   function moveOnce(boundToLine) {
-    let myMoveVisually = (line, start, dir, byUnit) => {
-      let res = moveVisually(doc.cm, line, start, dir, byUnit, sticky)
-      if (res.ch) sticky = res.sticky
-      return res.ch
+    let myMoveVisually = (line, start, dir) => moveVisually(doc.cm, line, start, dir)
+    let myMoveLogically = (line, start, dir) => {
+      let ch = moveLogically(line, start, dir)
+      return ch == null ?  null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
     }
-    let next = (visually ? myMoveVisually : moveLogically)(lineObj, ch, dir, true)
+    let next = (visually ? myMoveVisually : myMoveLogically)(lineObj, pos, dir)
     if (next == null) {
       if (!boundToLine && findNextLine()) {
-        ;({ch, sticky} = endOfLine(visually, doc.cm, lineObj, dir))
+        pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir)
       } else return false
-    } else ch = next
+    } else pos = next
     return true
   }
 
@@ -497,14 +498,14 @@ function findPosH(doc, pos, dir, unit, visually) {
     let helper = doc.cm && doc.cm.getHelper(pos, "wordChars")
     for (let first = true;; first = false) {
       if (dir < 0 && !moveOnce(!first)) break
-      let cur = lineObj.text.charAt(ch) || "\n"
+      let cur = lineObj.text.charAt(pos.ch) || "\n"
       let type = isWordChar(cur, helper) ? "w"
         : group && cur == "\n" ? "n"
         : !group || /\s/.test(cur) ? null
         : "p"
       if (group && !first && !type) type = "s"
       if (sawType && sawType != type) {
-        if (dir < 0) {dir = 1; moveOnce()}
+        if (dir < 0) {dir = 1; moveOnce(); pos.sticky = "after"}
         break
       }
 
@@ -512,8 +513,8 @@ function findPosH(doc, pos, dir, unit, visually) {
       if (dir > 0 && !moveOnce(!first)) break
     }
   }
-  let result = skipAtomic(doc, Pos(line, ch, sticky), pos, origDir, true)
-  if (equalCursorPos(pos, result)) result.hitSide = true
+  let result = skipAtomic(doc, pos, oldPos, origDir, true)
+  if (equalCursorPos(oldPos, result)) result.hitSide = true
   return result
 }
 
diff --git a/src/input/movement.js b/src/input/movement.js
index bce3f5c276..95cc50fc90 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -1,14 +1,16 @@
+import { Pos } from "../line/pos"
 import { prepareMeasureCharTop } from "../measurement/position_measurement"
 import { bidiLeft, bidiRight, getBidiPartAt, getOrder, lineLeft, lineRight, moveLogically } from "../util/bidi"
 import { findFirst } from "../util/misc"
 
-export function endOfLine(visually, cm, lineObj, dir) {
-  let ch, sticky = "before"
+export function endOfLine(visually, cm, lineObj, lineNo, dir) {
+  let ch
   if (visually) {
     let order = getOrder(lineObj)
     if (order) {
       let i = dir < 0 ? order.length - 1 : 0
       let part = order[i]
+      let sticky = (dir < 0) != (part.level == 1) ? "before" : "after"
       // With a wrapped rtl chunk (possibly spanning multiple bidi parts),
       // it could be that the last bidi part is not on the last visual line,
       // since visual lines contain content order-consecutive chunks.
@@ -20,17 +22,17 @@ export function endOfLine(visually, cm, lineObj, dir) {
         ch = lineObj.text.length - 1
         let targetTop = getTop(ch)
         ch = findFirst(ch => getTop(ch) == targetTop, part.from, ch)
-        if (part.level == 1) sticky = "after"
-        else ch = moveLogically(lineObj, ch, 1, true)
-        return {ch, sticky}
+        if (part.level != 1) ch = moveLogically(lineObj, new Pos(lineNo, ch, sticky), 1, true)
+        return new Pos(lineNo, ch, sticky)
       }
       ch = (dir < 0 ? bidiRight : bidiLeft)(part)
-      return {ch, sticky}
+      return new Pos(lineNo, ch, sticky)
     }
   }
+  let sticky = dir < 0 ? "before" : "after"
   if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj)
   else ch = dir < 0 ? lineObj.text.length : 0
-  return {ch, sticky}
+  return new Pos(lineNo, ch, sticky)
 }
 
 function getVisualLineAround(cm, line, target) {
@@ -43,33 +45,34 @@ function getVisualLineAround(cm, line, target) {
   ]
 }
 
-export function moveVisually(cm, line, start, dir, byUnit, startSticky) {
-  let mv = (ch, dir) => moveLogically(line, ch, dir, byUnit)
+export function moveVisually(cm, line, start, dir) {
+  let mkPos = (ch, sticky) => ch == null ? null : new Pos(start.line, ch, sticky)
+  let mv = (pos, dir) => moveLogically(line, pos instanceof Pos ? pos : new Pos(start.line, pos), dir)
   let bidi = getOrder(line)
-  if (!bidi) return {ch: mv(start, dir), sticky: dir < 0 ? "after" : "before"}
-  if (start >= line.text.length) {
-    start = line.text.length
-    startSticky = "before"
-  } else if (start <= 0) {
-    start = 0
-    startSticky = "after"
+  if (!bidi) return mkPos(mv(start, dir), dir < 0 ? "after" : "before")
+  if (start.ch >= line.text.length) {
+    start.ch = line.text.length
+    start.sticky = "before"
+  } else if (start.ch <= 0) {
+    start.ch = 0
+    start.sticky = "after"
   }
-  let partPos = getBidiPartAt(bidi, start, startSticky), part = bidi[partPos]
-  if (part.level % 2 == 0 && (dir > 0 ? part.to > start : part.from < start)) {
+  let partPos = getBidiPartAt(bidi, start.ch, start.sticky), part = bidi[partPos]
+  if (part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) {
     // Case 1: We move within an ltr part. Even with wrapped lines,
     // nothing interesting happens.
-    return {ch: mv(start, dir), sticky: dir < 0 ? "after" : "before"}
+    return mkPos(mv(start, dir), dir < 0 ? "after" : "before")
   }
 
   let getVisualLine = ch => getVisualLineAround(cm, line, ch)
-  let visualLine = getVisualLine(startSticky == "before" ? mv(start, -1) : start)
+  let visualLine = getVisualLine(start.sticky == "before" ? mv(start, -1) : start.ch)
 
   if (part.level % 2 == 1) {
     let ch = mv(start, -dir)
     if (ch != null && (dir > 0 ? ch >= part.from && ch >= visualLine[0] : ch <= part.to && ch <= mv(visualLine[1], 1))) {
       // Case 2: We move within an rtl part on the same visual line
       let sticky = dir < 0 ? "before" : "after"
-      return {ch, sticky}
+      return new Pos(start.line, ch, sticky)
     }
   }
 
@@ -78,8 +81,8 @@ export function moveVisually(cm, line, start, dir, byUnit, startSticky) {
 
   let searchInVisualLine = (partPos, dir, visualLine) => {
     let getRes = (ch, moveInStorageOrder) => moveInStorageOrder
-      ? {ch: mv(ch, 1), sticky: "before"}
-      : {ch, sticky: "after"}
+      ? new Pos(start.line, mv(ch, 1), "before")
+      : new Pos(start.line, ch, "after")
 
     for (partPos += dir; partPos >= 0 && partPos < bidi.length; partPos += dir) {
       let part = bidi[partPos]
@@ -103,5 +106,5 @@ export function moveVisually(cm, line, start, dir, byUnit, startSticky) {
   }
 
   // Case 4: Nowhere to move
-  return {ch: null, sticky: null}
+  return null
 }
diff --git a/src/util/bidi.js b/src/util/bidi.js
index 4ec0578a92..4f0e5a37f5 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -47,8 +47,7 @@ export function getBidiPartAt(order, ch, sticky) {
   return found != null ? found : bidiOther
 }
 
-function moveInLine(line, pos, dir, byUnit) {
-  if (!byUnit) return pos + dir
+function moveInLine(line, pos, dir) {
   do pos += dir
   while (pos > 0 && isExtendingChar(line.text.charAt(pos)))
   return pos
@@ -82,8 +81,8 @@ export function moveVisually(line, start, dir, byUnit) {
   }
 }
 
-export function moveLogically(line, start, dir, byUnit) {
-  let target = moveInLine(line, start, dir, byUnit)
+export function moveLogically(line, start, dir) {
+  let target = moveInLine(line, start.ch, dir)
   return target < 0 || target > line.text.length ? null : target
 }
 
diff --git a/test/emacs_test.js b/test/emacs_test.js
index 628651c786..acb4ba2bfb 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -48,13 +48,13 @@
       "Ctrl-5", "Ctrl-B", at(0, 0));
 
   sim("motionHWord", "abc. def ghi",
-      "Alt-F", at(0, 3), "Alt-F", at(0, 8),
-      "Ctrl-B", "Alt-B", at(0, 5), "Alt-B", at(0, 0));
+      "Alt-F", at(0, 3, "before"), "Alt-F", at(0, 8, "before"),
+      "Ctrl-B", "Alt-B", at(0, 5, "after"), "Alt-B", at(0, 0, "after"));
   sim("motionHWordMulti", "abc. def ghi ",
-      "Ctrl-3", "Alt-F", at(0, 12), "Ctrl-2", "Alt-B", at(0, 5),
-      "Ctrl--", "Alt-B", at(0, 8));
+      "Ctrl-3", "Alt-F", at(0, 12, "before"), "Ctrl-2", "Alt-B", at(0, 5, "after"),
+      "Ctrl--", "Alt-B", at(0, 8, "before"));
 
-  sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", at(1, 0));
+  sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", at(1, 0, "after"));
   sim("motionVMulti", "a\nb\nc\nd\ne\n",
       "Ctrl-2", "Ctrl-N", at(2, 0), "Ctrl-F", "Ctrl--", "Ctrl-N", at(1, 1),
       "Ctrl--", "Ctrl-3", "Ctrl-P", at(4, 1));
diff --git a/test/test.js b/test/test.js
index 00c0be25ec..e74f11d863 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1234,11 +1234,11 @@ testCM("wordMovementCommands", function(cm) {
   cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
   eqPos(cm.getCursor(), Pos(0, 7));
   cm.execCommand("goWordLeft");
-  eqPos(cm.getCursor(), Pos(0, 5));
+  eqCursorPos(cm.getCursor(), Pos(0, 5, "after"));
   cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
   eqPos(cm.getCursor(), Pos(0, 12));
   cm.execCommand("goWordLeft");
-  eqPos(cm.getCursor(), Pos(0, 9));
+  eqCursorPos(cm.getCursor(), Pos(0, 9, "after"));
   cm.execCommand("goWordRight"); cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
   eqPos(cm.getCursor(), Pos(0, 24));
   cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
@@ -1259,14 +1259,14 @@ testCM("groupMovementCommands", function(cm) {
   cm.execCommand("goGroupRight");
   eqPos(cm.getCursor(), Pos(0, 10));
   cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 7));
+  eqCursorPos(cm.getCursor(), Pos(0, 7, "after"));
   cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight");
   eqPos(cm.getCursor(), Pos(0, 15));
   cm.setCursor(Pos(0, 17));
   cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 16));
+  eqCursorPos(cm.getCursor(), Pos(0, 16, "after"));
   cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 14));
+  eqCursorPos(cm.getCursor(), Pos(0, 14, "after"));
   cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight");
   eqPos(cm.getCursor(), Pos(0, 20));
   cm.execCommand("goGroupRight");
@@ -1278,9 +1278,9 @@ testCM("groupMovementCommands", function(cm) {
   cm.execCommand("goGroupLeft"); cm.execCommand("goGroupLeft");
   eqPos(cm.getCursor(), Pos(1, 0));
   cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 20));
+  eqCursorPos(cm.getCursor(), Pos(0, 20, "after"));
   cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 16));
+  eqCursorPos(cm.getCursor(), Pos(0, 16, "after"));
 }, {value: "booo ba---quux. ffff\n  abc d"});
 
 testCM("groupsAndWhitespace", function(cm) {
@@ -1843,20 +1843,20 @@ testCM("addKeyMap", function(cm) {
 }, {value: "abc"});
 
 testCM("findPosH", function(cm) {
-  forEach([{from: Pos(0, 0), to: Pos(0, 1), by: 1},
+  forEach([{from: Pos(0, 0), to: Pos(0, 1, "before"), by: 1},
            {from: Pos(0, 0), to: Pos(0, 0), by: -1, hitSide: true},
-           {from: Pos(0, 0), to: Pos(0, 4), by: 1, unit: "word"},
-           {from: Pos(0, 0), to: Pos(0, 8), by: 2, unit: "word"},
-           {from: Pos(0, 0), to: Pos(2, 0), by: 20, unit: "word", hitSide: true},
-           {from: Pos(0, 7), to: Pos(0, 5), by: -1, unit: "word"},
-           {from: Pos(0, 4), to: Pos(0, 8), by: 1, unit: "word"},
-           {from: Pos(1, 0), to: Pos(1, 18), by: 3, unit: "word"},
-           {from: Pos(1, 22), to: Pos(1, 5), by: -3, unit: "word"},
-           {from: Pos(1, 15), to: Pos(1, 10), by: -5},
-           {from: Pos(1, 15), to: Pos(1, 10), by: -5, unit: "column"},
-           {from: Pos(1, 15), to: Pos(1, 0), by: -50, unit: "column", hitSide: true},
-           {from: Pos(1, 15), to: Pos(1, 24), by: 50, unit: "column", hitSide: true},
-           {from: Pos(1, 15), to: Pos(2, 0), by: 50, hitSide: true}], function(t) {
+           {from: Pos(0, 0), to: Pos(0, 4, "before"), by: 1, unit: "word"},
+           {from: Pos(0, 0), to: Pos(0, 8, "before"), by: 2, unit: "word"},
+           {from: Pos(0, 0), to: Pos(2, 0, "before"), by: 20, unit: "word", hitSide: true},
+           {from: Pos(0, 7), to: Pos(0, 5, "after"), by: -1, unit: "word"},
+           {from: Pos(0, 4), to: Pos(0, 8, "before"), by: 1, unit: "word"},
+           {from: Pos(1, 0), to: Pos(1, 18, "before"), by: 3, unit: "word"},
+           {from: Pos(1, 22), to: Pos(1, 5, "after"), by: -3, unit: "word"},
+           {from: Pos(1, 15), to: Pos(1, 10, "after"), by: -5},
+           {from: Pos(1, 15), to: Pos(1, 10, "after"), by: -5, unit: "column"},
+           {from: Pos(1, 15), to: Pos(1, 0, "after"), by: -50, unit: "column", hitSide: true},
+           {from: Pos(1, 15), to: Pos(1, 24, "before"), by: 50, unit: "column", hitSide: true},
+           {from: Pos(1, 15), to: Pos(2, 0, "before"), by: 50, hitSide: true}], function(t) {
     var r = cm.findPosH(t.from, t.by, t.unit || "char");
     eqPos(r, t.to);
     eq(!!r.hitSide, !!t.hitSide);

From 864a681b4d57823687c2bb6251e5c4bccbe7d1d4 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 3 Oct 2016 19:36:23 +0200
Subject: [PATCH 3080/4742] Reimplement coordsChar

---
 src/edit/methods.js                     |  2 +-
 src/measurement/position_measurement.js | 90 +++++++++++--------------
 src/util/bidi.js                        | 28 --------
 test/emacs_test.js                      |  4 +-
 test/test.js                            |  4 +-
 5 files changed, 44 insertions(+), 84 deletions(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index 52ce0aee47..18412d31b1 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -336,7 +336,7 @@ export default function(CodeMirror) {
       let start = pos.ch, end = pos.ch
       if (line) {
         let helper = this.getHelper(pos, "wordChars")
-        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end
+        if ((pos.sticky == "before" || end == line.length) && start) --start; else ++end
         let startChar = line.charAt(start)
         let check = isWordChar(startChar, helper)
           ? ch => isWordChar(ch, helper)
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index d87ec7a0a5..531ab1d737 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -1,13 +1,14 @@
+import { moveVisually } from "../input/movement"
 import { buildLineContent, LineView } from "../line/line_data"
 import { clipPos, Pos } from "../line/pos"
 import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans"
 import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line"
-import { bidiOther, getBidiPartAt, getOrder, lineLeft, lineRight, moveVisually } from "../util/bidi"
+import { bidiOther, getBidiPartAt, getOrder } from "../util/bidi"
 import { ie, ie_version } from "../util/browser"
 import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom"
 import { e_target } from "../util/event"
 import { hasBadZoomedRects } from "../util/feature_detection"
-import { countColumn, isExtendingChar, scrollerGap } from "../util/misc"
+import { countColumn, findFirst, isExtendingChar, scrollerGap } from "../util/misc"
 import { updateLineForChanges } from "../display/update_line"
 
 import { widgetHeight } from "./widgets"
@@ -429,59 +430,46 @@ export function coordsChar(cm, x, y) {
 }
 
 function coordsCharInner(cm, lineObj, lineNo, x, y) {
-  let innerOff = y - heightAtLine(lineObj)
-  let wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth
+  y -= heightAtLine(lineObj)
+  let begin = 0, end = lineObj.text.length - 1
   let preparedMeasure = prepareMeasureForLine(cm, lineObj)
-
-  function getX(ch) {
-    let sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure)
-    wrongLine = true
-    if (innerOff > sp.bottom) return sp.left - adjust
-    else if (innerOff < sp.top) return sp.left + adjust
-    else wrongLine = false
-    return sp.left
+  if (cm.options.lineWrapping) {
+    let measure = ch => intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
+    begin = findFirst(ch => measure(ch).bottom < y, end, begin - 1) + 1
+    end = findFirst(ch => measure(ch).top > y, begin, end + 1) - 1
   }
-
-  let bidi = getOrder(lineObj), dist = lineObj.text.length
-  let from = lineLeft(lineObj), to = lineRight(lineObj)
-  let fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine
-
-  if (x > toX) return PosWithInfo(lineNo, to, null, toOutside, 1)
-  // Do a binary search between these bounds.
-  for (;;) {
-    if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-      let ch = x < fromX || x - fromX <= toX - x ? from : to
-      let outside = ch == from ? fromOutside : toOutside
-      let xDiff = x - (ch == from ? fromX : toX)
-      // This is a kludge to handle the case where the coordinates
-      // are after a line-wrapped line. We should replace it with a
-      // more general handling of cursor positions around line
-      // breaks. (Issue #4078)
-      if (toOutside && !bidi && !/\s/.test(lineObj.text.charAt(ch)) && xDiff > 0 &&
-          ch < lineObj.text.length && preparedMeasure.view.measure.heights.length > 1) {
-        let charSize = measureCharPrepared(cm, preparedMeasure, ch, "right")
-        if (innerOff <= charSize.bottom && innerOff >= charSize.top && Math.abs(x - charSize.right) < xDiff) {
-          outside = false
-          ch++
-          xDiff = x - charSize.right
-        }
-      let sticky = null
-      if (toX > cm.display.wrapper.clientWidth) {
-        sticky = "before"
+  let pos
+  let order = getOrder(lineObj)
+  if (order) {
+    if (end == lineObj.text.length - 1) ++end
+    pos = new Pos(lineNo, begin)
+    let beginLeft = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left
+    let dir = beginLeft < x ? 1 : -1
+    let prevDiff, diff = beginLeft - x
+    do {
+      prevDiff = diff
+      let prevPos = pos
+      pos = moveVisually(cm, lineObj, pos, dir)
+      if (pos == null || pos.ch < begin || end < pos.ch) {
+        pos = prevPos
+        break
       }
-      while (isExtendingChar(lineObj.text.charAt(ch))) ++ch
-      let pos = PosWithInfo(lineNo, ch, sticky, outside, xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0)
-      return pos
-    }
-    let step = Math.ceil(dist / 2), middle = from + step
-    if (bidi) {
-      middle = from
-      for (let i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1)
-    }
-    let middleX = getX(middle)
-    if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step}
-    else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step}
+      diff = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left - x
+    } while ((dir < 0) != (diff < 0))
+    // moveVisually has the nice side effect of skipping extending chars and setting sticky
+    if (Math.abs(diff) > Math.abs(prevDiff)) pos = moveVisually(cm, lineObj, pos, -dir)
+  } else {
+    let ch = findFirst(ch => {
+      let box = measureCharPrepared(cm, preparedMeasure, ch)
+      return x - box.right < box.left - x
+    }, begin, end + 1)
+    while (isExtendingChar(lineObj.text.charAt(ch))) ++ch
+    pos = new Pos(lineNo, ch, (ch == end + 1) ? "before" : "after")
   }
+  let coords = cursorCoords(cm, pos, "line", lineObj, preparedMeasure)
+  if (y < coords.top || coords.bottom < y) pos.outside = true
+  pos.xRel = x < coords.left ? -1 : (x > coords.right ? 1 : 0)
+  return pos
 }
 
 let measureText
diff --git a/src/util/bidi.js b/src/util/bidi.js
index 4f0e5a37f5..f10ee707a9 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -53,34 +53,6 @@ function moveInLine(line, pos, dir) {
   return pos
 }
 
-// This is needed in order to move 'visually' through bi-directional
-// text -- i.e., pressing left should make the cursor go left, even
-// when in RTL text. The tricky part is the 'jumps', where RTL and
-// LTR text touch each other. This often requires the cursor offset
-// to move more than one unit, in order to visually move one unit.
-export function moveVisually(line, start, dir, byUnit) {
-  let bidi = getOrder(line)
-  if (!bidi) return moveLogically(line, start, dir, byUnit)
-  let pos = getBidiPartAt(bidi, start), part = bidi[pos]
-  let target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit)
-
-  for (;;) {
-    if (target > part.from && target < part.to) return target
-    if (target == part.from || target == part.to) {
-      if (getBidiPartAt(bidi, target) == pos) return target
-      part = bidi[pos += dir]
-      return (dir > 0) == part.level % 2 ? part.to : part.from
-    } else {
-      part = bidi[pos += dir]
-      if (!part) return null
-      if ((dir > 0) == part.level % 2)
-        target = moveInLine(line, part.to, -1, byUnit)
-      else
-        target = moveInLine(line, part.from, 1, byUnit)
-    }
-  }
-}
-
 export function moveLogically(line, start, dir) {
   let target = moveInLine(line, start.ch, dir)
   return target < 0 || target > line.text.length ? null : target
diff --git a/test/emacs_test.js b/test/emacs_test.js
index acb4ba2bfb..2e17642354 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -56,8 +56,8 @@
 
   sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", at(1, 0, "after"));
   sim("motionVMulti", "a\nb\nc\nd\ne\n",
-      "Ctrl-2", "Ctrl-N", at(2, 0), "Ctrl-F", "Ctrl--", "Ctrl-N", at(1, 1),
-      "Ctrl--", "Ctrl-3", "Ctrl-P", at(4, 1));
+      "Ctrl-2", "Ctrl-N", at(2, 0, "after"), "Ctrl-F", "Ctrl--", "Ctrl-N", at(1, 1, "before"),
+      "Ctrl--", "Ctrl-3", "Ctrl-P", at(4, 1, "before"));
 
   sim("killYank", "abc\ndef\nghi",
       "Ctrl-F", "Ctrl-Space", "Ctrl-N", "Ctrl-N", "Ctrl-W", "Ctrl-E", "Ctrl-Y",
diff --git a/test/test.js b/test/test.js
index e74f11d863..2367de6a65 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1104,7 +1104,7 @@ testCM("measureEndOfLine", function(cm) {
   is(endPos.top > lh * .8, "not at top");
   is(endPos.left > w - 20, "not at right");
   endPos = cm.charCoords(Pos(0, 18));
-  eqPos(cm.coordsChar({left: endPos.left, top: endPos.top + 5}), Pos(0, 18));
+  eqCursorPos(cm.coordsChar({left: endPos.left, top: endPos.top + 5}), Pos(0, 18, "before"));
 
   var wrapPos = cm.cursorCoords(Pos(0, 9, "before"));
   is(wrapPos.top < endPos.top, "wrapPos is actually in first line");
@@ -1153,7 +1153,7 @@ testCM("moveVstuck", function(cm) {
   }
   cm.setCursor(Pos(0, val.length - 1));
   cm.moveV(-1, "line");
-  eqPos(cm.getCursor(), Pos(0, 26, "before"));
+  eqPos(cm.getCursor(), Pos(0, 27, "before"));
   is(cm.cursorCoords(null, "local").top < h0, "cursor is in first visual line");
 }, {lineWrapping: true}, ie_lt8 || opera_lt10);
 

From a0f69ddf3d82a5bac7fe3dea8fbac5a818bd108e Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 14 Dec 2016 12:49:01 +0100
Subject: [PATCH 3081/4742] Adapt tests

---
 test/doc_test.js      |  24 +--
 test/driver.js        |   8 +-
 test/emacs_test.js    |   8 +-
 test/multi_test.js    |  18 +-
 test/search_test.js   |   8 +-
 test/sql-hint-test.js |   4 +-
 test/sublime_test.js  |   8 +-
 test/test.js          | 410 +++++++++++++++++++++---------------------
 test/vim_test.js      | 122 ++++++-------
 9 files changed, 304 insertions(+), 306 deletions(-)

diff --git a/test/doc_test.js b/test/doc_test.js
index 5f242f658d..3af20ff98d 100644
--- a/test/doc_test.js
+++ b/test/doc_test.js
@@ -163,13 +163,13 @@
   testDoc("undoKeepRanges", "A='abcdefg' B<A", function(a, b) {
     var m = a.markText(Pos(0, 1), Pos(0, 3), {className: "foo"});
     b.replaceRange("x", Pos(0, 0));
-    eqPos(m.find().from, Pos(0, 2));
+    eqCharPos(m.find().from, Pos(0, 2));
     b.replaceRange("yzzy", Pos(0, 1), Pos(0));
     eq(m.find(), null);
     b.undo();
-    eqPos(m.find().from, Pos(0, 2));
+    eqCharPos(m.find().from, Pos(0, 2));
     b.undo();
-    eqPos(m.find().from, Pos(0, 1));
+    eqCharPos(m.find().from, Pos(0, 1));
   });
 
   testDoc("longChain", "A='uv' B<A C<B D<C", function(a, b, c, d) {
@@ -271,12 +271,12 @@
     eq(b.getValue(), "2\n3");
     eq(b.firstLine(), 1);
     b.setCursor(Pos(4));
-    eqPos(b.getCursor(), Pos(2, 1));
+    eqCharPos(b.getCursor(), Pos(2, 1));
     a.replaceRange("-1\n0\n", Pos(0, 0));
     eq(b.firstLine(), 3);
-    eqPos(b.getCursor(), Pos(4, 1));
+    eqCharPos(b.getCursor(), Pos(4, 1));
     a.undo();
-    eqPos(b.getCursor(), Pos(2, 1));
+    eqCharPos(b.getCursor(), Pos(2, 1));
     b.replaceRange("oyoy\n", Pos(2, 0));
     eq(a.getValue(), "1\n2\noyoy\n3\n4\n5");
     b.undo();
@@ -305,11 +305,11 @@
     eq(found.length, 1);
     eq(found[0], mark);
     eq(c.findMarksAt(Pos(1, 1)).length, 1);
-    eqPos(mark.find().from, Pos(0, 1));
-    eqPos(mark.find().to, Pos(3, 1));
+    eqCharPos(mark.find().from, Pos(0, 1));
+    eqCharPos(mark.find().to, Pos(3, 1));
     b.replaceRange("x\ny\n", Pos(0, 0));
-    eqPos(mark.find().from, Pos(2, 1));
-    eqPos(mark.find().to, Pos(5, 1));
+    eqCharPos(mark.find().from, Pos(2, 1));
+    eqCharPos(mark.find().to, Pos(5, 1));
     var cleared = 0;
     CodeMirror.on(mark, "clear", function() {++cleared;});
     b.operation(function(){mark.clear();});
@@ -349,9 +349,9 @@
     eq(found.length, 1);
     eq(found[0], mark);
     eq(c.findMarksAt(Pos(1, 1)).length, 1);
-    eqPos(mark.find(), Pos(1, 1));
+    eqCharPos(mark.find(), Pos(1, 1));
     b.replaceRange("x\ny\n", Pos(0, 0));
-    eqPos(mark.find(), Pos(3, 1));
+    eqCharPos(mark.find(), Pos(3, 1));
     var cleared = 0;
     CodeMirror.on(mark, "clear", function() {++cleared;});
     b.operation(function() {mark.clear();});
diff --git a/test/driver.js b/test/driver.js
index 01736450f3..8789f73be9 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -106,12 +106,16 @@ function near(a, b, margin, msg) {
   if (Math.abs(a - b) > margin)
     throw new Failure(label(a + " is not close to " + b + " (" + margin + ")", msg));
 }
-function eqPos(a, b, msg) {
+function eqCharPos(a, b, msg) {
   function str(p) { return "{line:" + p.line + ",ch:" + p.ch + ",sticky:" + p.sticky + "}"; }
   if (a == b) return;
   if (a == null) throw new Failure(label("comparing null to " + str(b), msg));
   if (b == null) throw new Failure(label("comparing " + str(a) + " to null", msg));
-  if (a.line != b.line || a.ch != b.ch || a.sticky != b.sticky) throw new Failure(label(str(a) + " != " + str(b), msg));
+  if (a.line != b.line || a.ch != b.ch) throw new Failure(label(str(a) + " != " + str(b), msg));
+}
+function eqCursorPos(a, b, msg) {
+  eqCharPos(a, b, msg);
+  if (a) eq(a.sticky, b.sticky, msg ? msg + ' (sticky)' : 'sticky');
 }
 function is(a, msg) {
   if (!a) throw new Failure(label("assertion failed", msg));
diff --git a/test/emacs_test.js b/test/emacs_test.js
index 2e17642354..b73eedaa6a 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -39,13 +39,13 @@
     }, {keyMap: "emacs", value: start, mode: "javascript"});
   }
 
-  function at(line, ch) { return function(cm) { eqPos(cm.getCursor(), Pos(line, ch)); }; }
+  function at(line, ch, sticky) { return function(cm) { eqCursorPos(cm.getCursor(), Pos(line, ch, sticky)); }; }
   function txt(str) { return function(cm) { eq(cm.getValue(), str); }; }
 
-  sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", at(0, 1));
+  sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", at(0, 1, "after"));
   sim("motionHMulti", "abcde",
-      "Ctrl-4", "Ctrl-F", at(0, 4), "Ctrl--", "Ctrl-2", "Ctrl-F", at(0, 2),
-      "Ctrl-5", "Ctrl-B", at(0, 0));
+      "Ctrl-4", "Ctrl-F", at(0, 4, "before"), "Ctrl--", "Ctrl-2", "Ctrl-F", at(0, 2, "after"),
+      "Ctrl-5", "Ctrl-B", at(0, 0, "after"));
 
   sim("motionHWord", "abc. def ghi",
       "Alt-F", at(0, 3, "before"), "Alt-F", at(0, 8, "before"),
diff --git a/test/multi_test.js b/test/multi_test.js
index a8e760d27f..49169b9900 100644
--- a/test/multi_test.js
+++ b/test/multi_test.js
@@ -9,8 +9,8 @@
     for (var i = 0, p = 1; i < given; i++, p += 4) {
       var anchor = Pos(arguments[p], arguments[p + 1]);
       var head = Pos(arguments[p + 2], arguments[p + 3]);
-      eqPos(sels[i].anchor, anchor, "anchor of selection " + i);
-      eqPos(sels[i].head, head, "head of selection " + i);
+      eqCharPos(sels[i].anchor, anchor, "anchor of selection " + i);
+      eqCharPos(sels[i].head, head, "head of selection " + i);
     }
   }
   function hasCursors(cm) {
@@ -19,9 +19,9 @@
     if (sels.length != given)
       throw new Failure("expected " + given + " selections, found " + sels.length);
     for (var i = 0, p = 1; i < given; i++, p += 2) {
-      eqPos(sels[i].anchor, sels[i].head, "something selected for " + i);
+      eqCursorPos(sels[i].anchor, sels[i].head, "something selected for " + i);
       var head = Pos(arguments[p], arguments[p + 1]);
-      eqPos(sels[i].head, head, "selection " + i);
+      eqCharPos(sels[i].head, head, "selection " + i);
     }
   }
 
@@ -47,10 +47,10 @@
     cm.setSelections([{anchor: Pos(0, 1), head: Pos(0, 2)},
                       {anchor: Pos(1, 1), head: Pos(1, 2)},
                       {anchor: Pos(2, 1), head: Pos(2, 2)}], 1);
-    eqPos(cm.getCursor("head"), Pos(1, 2));
-    eqPos(cm.getCursor("anchor"), Pos(1, 1));
-    eqPos(cm.getCursor("from"), Pos(1, 1));
-    eqPos(cm.getCursor("to"), Pos(1, 2));
+    eqCharPos(cm.getCursor("head"), Pos(1, 2));
+    eqCharPos(cm.getCursor("anchor"), Pos(1, 1));
+    eqCharPos(cm.getCursor("from"), Pos(1, 1));
+    eqCharPos(cm.getCursor("to"), Pos(1, 2));
     cm.setCursor(Pos(1, 1));
     hasCursors(cm, 1, 1);
   }, {value: "abcde\nabcde\nabcde\n"});
@@ -274,7 +274,7 @@
     eq(cm.getSelection(), "1");
     cm.execCommand("undoSelection");
     eq(cm.getSelection(), "");
-    eqPos(cm.getCursor(), Pos(0, 0));
+    eqCharPos(cm.getCursor(), Pos(0, 0));
     cm.execCommand("redoSelection");
     eq(cm.getSelection(), "1");
     cm.execCommand("redoSelection");
diff --git a/test/search_test.js b/test/search_test.js
index 04a1e685ab..9fe898bacd 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -14,15 +14,15 @@
     for (var i = 3; i < arguments.length; i += 4) {
       var found = cursor.findNext();
       is(found, "not enough results (forward)");
-      eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, forward, " + (i - 3) / 4);
-      eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, forward, " + (i - 3) / 4);
+      eqCharPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, forward, " + (i - 3) / 4);
+      eqCharPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, forward, " + (i - 3) / 4);
     }
     is(!cursor.findNext(), "too many matches (forward)");
     for (var i = arguments.length - 4; i >= 3; i -= 4) {
       var found = cursor.findPrevious();
       is(found, "not enough results (backwards)");
-      eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, backwards, " + (i - 3) / 4);
-      eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, backwards, " + (i - 3) / 4);
+      eqCharPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, backwards, " + (i - 3) / 4);
+      eqCharPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, backwards, " + (i - 3) / 4);
     }
     is(!cursor.findPrevious(), "too many matches (backwards)");
   }
diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index 39f2172e1f..31d0490f19 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -30,8 +30,8 @@
       var completion = CodeMirror.hint.sql(cm, {tables: spec.tables});
       if (!deepCompare(completion.list, spec.list))
         throw new Failure("Wrong completion results " + JSON.stringify(completion.list) + " vs " + JSON.stringify(spec.list));
-      eqPos(completion.from, spec.from);
-      eqPos(completion.to, spec.to);
+      eqCharPos(completion.from, spec.from);
+      eqCharPos(completion.to, spec.to);
     }, {
       value: spec.value,
       mode: "text/x-mysql"
diff --git a/test/sublime_test.js b/test/sublime_test.js
index 57f16485e1..e9cd342ff4 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -24,8 +24,8 @@
   function at(line, ch, msg) {
     return function(cm) {
       eq(cm.listSelections().length, 1);
-      eqPos(cm.getCursor("head"), Pos(line, ch), msg);
-      eqPos(cm.getCursor("anchor"), Pos(line, ch), msg);
+      eqCursorPos(cm.getCursor("head"), Pos(line, ch), msg);
+      eqCursorPos(cm.getCursor("anchor"), Pos(line, ch), msg);
     };
   }
 
@@ -54,8 +54,8 @@
       if (sels.length != ranges.length)
         throw new Failure("Expected " + ranges.length + " selections, but found " + sels.length);
       for (var i = 0; i < sels.length; i++) {
-        eqPos(sels[i].anchor, ranges[i].anchor, "anchor " + i);
-        eqPos(sels[i].head, ranges[i].head, "head " + i);
+        eqCharPos(sels[i].anchor, ranges[i].anchor, "anchor " + i);
+        eqCharPos(sels[i].head, ranges[i].head, "head " + i);
       }
     };
   }
diff --git a/test/test.js b/test/test.js
index 2367de6a65..38659f875d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -34,6 +34,7 @@ var opera = /Opera\/\./.test(navigator.userAgent);
 var opera_version = opera && navigator.userAgent.match(/Version\/(\d+\.\d+)/);
 if (opera_version) opera_version = Number(opera_version);
 var opera_lt10 = opera && (!opera_version || opera_version < 10);
+var webkit = /WebKit\//.test(navigator.userAgent);
 
 namespace = "core_";
 
@@ -82,59 +83,59 @@ testCM("selection", function(cm) {
   cm.setSelection(Pos(0, 4), Pos(2, 2));
   is(cm.somethingSelected());
   eq(cm.getSelection(), "11\n222222\n33");
-  eqPos(cm.getCursor(false), Pos(2, 2));
-  eqPos(cm.getCursor(true), Pos(0, 4));
+  eqCursorPos(cm.getCursor(false), Pos(2, 2));
+  eqCursorPos(cm.getCursor(true), Pos(0, 4));
   cm.setSelection(Pos(1, 0));
   is(!cm.somethingSelected());
   eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(true), Pos(1, 0));
+  eqCursorPos(cm.getCursor(true), Pos(1, 0));
   cm.replaceSelection("abc", "around");
   eq(cm.getSelection(), "abc");
   eq(cm.getValue(), "111111\nabc222222\n333333");
   cm.replaceSelection("def", "end");
   eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(true), Pos(1, 3));
+  eqCursorPos(cm.getCursor(true), Pos(1, 3));
   cm.setCursor(Pos(2, 1));
-  eqPos(cm.getCursor(true), Pos(2, 1));
+  eqCursorPos(cm.getCursor(true), Pos(2, 1));
   cm.setCursor(1, 2);
-  eqPos(cm.getCursor(true), Pos(1, 2));
+  eqCursorPos(cm.getCursor(true), Pos(1, 2));
 }, {value: "111111\n222222\n333333"});
 
 testCM("extendSelection", function(cm) {
   cm.setExtending(true);
   addDoc(cm, 10, 10);
   cm.setSelection(Pos(3, 5));
-  eqPos(cm.getCursor("head"), Pos(3, 5));
-  eqPos(cm.getCursor("anchor"), Pos(3, 5));
+  eqCursorPos(cm.getCursor("head"), Pos(3, 5));
+  eqCursorPos(cm.getCursor("anchor"), Pos(3, 5));
   cm.setSelection(Pos(2, 5), Pos(5, 5));
-  eqPos(cm.getCursor("head"), Pos(5, 5));
-  eqPos(cm.getCursor("anchor"), Pos(2, 5));
-  eqPos(cm.getCursor("start"), Pos(2, 5));
-  eqPos(cm.getCursor("end"), Pos(5, 5));
+  eqCursorPos(cm.getCursor("head"), Pos(5, 5));
+  eqCursorPos(cm.getCursor("anchor"), Pos(2, 5));
+  eqCursorPos(cm.getCursor("start"), Pos(2, 5));
+  eqCursorPos(cm.getCursor("end"), Pos(5, 5));
   cm.setSelection(Pos(5, 5), Pos(2, 5));
-  eqPos(cm.getCursor("head"), Pos(2, 5));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
-  eqPos(cm.getCursor("start"), Pos(2, 5));
-  eqPos(cm.getCursor("end"), Pos(5, 5));
+  eqCursorPos(cm.getCursor("head"), Pos(2, 5));
+  eqCursorPos(cm.getCursor("anchor"), Pos(5, 5));
+  eqCursorPos(cm.getCursor("start"), Pos(2, 5));
+  eqCursorPos(cm.getCursor("end"), Pos(5, 5));
   cm.extendSelection(Pos(3, 2));
-  eqPos(cm.getCursor("head"), Pos(3, 2));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
+  eqCursorPos(cm.getCursor("head"), Pos(3, 2));
+  eqCursorPos(cm.getCursor("anchor"), Pos(5, 5));
   cm.extendSelection(Pos(6, 2));
-  eqPos(cm.getCursor("head"), Pos(6, 2));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
+  eqCursorPos(cm.getCursor("head"), Pos(6, 2));
+  eqCursorPos(cm.getCursor("anchor"), Pos(5, 5));
   cm.extendSelection(Pos(6, 3), Pos(6, 4));
-  eqPos(cm.getCursor("head"), Pos(6, 4));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
+  eqCursorPos(cm.getCursor("head"), Pos(6, 4));
+  eqCursorPos(cm.getCursor("anchor"), Pos(5, 5));
   cm.extendSelection(Pos(0, 3), Pos(0, 4));
-  eqPos(cm.getCursor("head"), Pos(0, 3));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
+  eqCursorPos(cm.getCursor("head"), Pos(0, 3));
+  eqCursorPos(cm.getCursor("anchor"), Pos(5, 5));
   cm.extendSelection(Pos(4, 5), Pos(6, 5));
-  eqPos(cm.getCursor("head"), Pos(6, 5));
-  eqPos(cm.getCursor("anchor"), Pos(4, 5));
+  eqCursorPos(cm.getCursor("head"), Pos(6, 5));
+  eqCursorPos(cm.getCursor("anchor"), Pos(4, 5));
   cm.setExtending(false);
   cm.extendSelection(Pos(0, 3), Pos(0, 4));
-  eqPos(cm.getCursor("head"), Pos(0, 3));
-  eqPos(cm.getCursor("anchor"), Pos(0, 4));
+  eqCursorPos(cm.getCursor("head"), Pos(0, 3));
+  eqCursorPos(cm.getCursor("anchor"), Pos(0, 4));
 });
 
 testCM("lines", function(cm) {
@@ -231,7 +232,7 @@ testCM("coordsChar", function(cm) {
         cm.setCursor(line, ch);
         var coords = cm.charCoords(Pos(line, ch), sys);
         var pos = cm.coordsChar({left: coords.left + 1, top: coords.top + 1}, sys);
-        eqPos(pos, Pos(line, ch));
+        eqCharPos(pos, Pos(line, ch));
       }
     }
   }
@@ -344,12 +345,12 @@ testCM("undoSelection", function(cm) {
   cm.replaceSelection("");
   cm.setCursor(Pos(1, 0));
   cm.undo();
-  eqPos(cm.getCursor(true), Pos(0, 2));
-  eqPos(cm.getCursor(false), Pos(0, 4));
+  eqCursorPos(cm.getCursor(true), Pos(0, 2));
+  eqCursorPos(cm.getCursor(false), Pos(0, 4));
   cm.setCursor(Pos(1, 0));
   cm.redo();
-  eqPos(cm.getCursor(true), Pos(0, 2));
-  eqPos(cm.getCursor(false), Pos(0, 2));
+  eqCursorPos(cm.getCursor(true), Pos(0, 2));
+  eqCursorPos(cm.getCursor(false), Pos(0, 2));
 }, {value: "abcdefgh\n"});
 
 testCM("undoSelectionAsBefore", function(cm) {
@@ -413,7 +414,7 @@ testCM("markTextMultiLine", function(cm) {
                         {className: "CodeMirror-matchingbracket"});
     cm.replaceRange(test.c, p(test.a), p(test.b));
     var f = r.find();
-    eqPos(f && f.from, p(test.f)); eqPos(f && f.to, p(test.t));
+    eqCursorPos(f && f.from, p(test.f)); eqCursorPos(f && f.to, p(test.t));
   });
 });
 
@@ -432,16 +433,16 @@ testCM("markTextUndo", function(cm) {
   cm.setValue("");
   eq(marker1.find(), null); eq(marker2.find(), null); eq(bookmark.find(), null);
   cm.undo();
-  eqPos(bookmark.find(), Pos(1, 5), "still there");
+  eqCursorPos(bookmark.find(), Pos(1, 5), "still there");
   cm.undo();
   var m1Pos = marker1.find(), m2Pos = marker2.find();
-  eqPos(m1Pos.from, Pos(0, 1)); eqPos(m1Pos.to, Pos(0, 3));
-  eqPos(m2Pos.from, Pos(0, 0)); eqPos(m2Pos.to, Pos(2, 1));
-  eqPos(bookmark.find(), Pos(1, 5));
+  eqCursorPos(m1Pos.from, Pos(0, 1)); eqCursorPos(m1Pos.to, Pos(0, 3));
+  eqCursorPos(m2Pos.from, Pos(0, 0)); eqCursorPos(m2Pos.to, Pos(2, 1));
+  eqCursorPos(bookmark.find(), Pos(1, 5));
   cm.redo(); cm.redo();
   eq(bookmark.find(), null);
   cm.undo();
-  eqPos(bookmark.find(), Pos(1, 5));
+  eqCursorPos(bookmark.find(), Pos(1, 5));
   eq(cm.getValue(), v1);
 }, {value: "1234\n56789\n00\n"});
 
@@ -491,12 +492,12 @@ testCM("undoPreservesNewMarks", function(cm) {
   var mAfter = cm.markText(Pos(0, 5), Pos(0, 6));
   var mAround = cm.markText(Pos(0, 2), Pos(0, 4));
   cm.undo();
-  eqPos(mBefore.find().from, Pos(0, 0));
-  eqPos(mBefore.find().to, Pos(0, 1));
-  eqPos(mAfter.find().from, Pos(3, 3));
-  eqPos(mAfter.find().to, Pos(3, 4));
-  eqPos(mAround.find().from, Pos(0, 2));
-  eqPos(mAround.find().to, Pos(3, 2));
+  eqCursorPos(mBefore.find().from, Pos(0, 0));
+  eqCursorPos(mBefore.find().to, Pos(0, 1));
+  eqCursorPos(mAfter.find().from, Pos(3, 3));
+  eqCursorPos(mAfter.find().to, Pos(3, 4));
+  eqCursorPos(mAround.find().from, Pos(0, 2));
+  eqCursorPos(mAround.find().to, Pos(3, 2));
   var found = cm.findMarksAt(Pos(2, 2));
   eq(found.length, 1);
   eq(found[0], mAround);
@@ -547,7 +548,7 @@ testCM("bookmark", function(cm) {
     cm.setValue("1234567890\n1234567890\n1234567890");
     var b = cm.setBookmark(p(test.bm) || Pos(1, 5));
     cm.replaceRange(test.c, p(test.a), p(test.b));
-    eqPos(b.find(), p(test.d));
+    eqCursorPos(b.find(), p(test.d));
   });
 });
 
@@ -556,14 +557,14 @@ testCM("bookmarkInsertLeft", function(cm) {
   var bl = cm.setBookmark(Pos(0, 2), {insertLeft: true});
   cm.setCursor(Pos(0, 2));
   cm.replaceSelection("hi");
-  eqPos(br.find(), Pos(0, 2));
-  eqPos(bl.find(), Pos(0, 4));
+  eqCursorPos(br.find(), Pos(0, 2));
+  eqCursorPos(bl.find(), Pos(0, 4));
   cm.replaceRange("", Pos(0, 4), Pos(0, 5));
   cm.replaceRange("", Pos(0, 2), Pos(0, 4));
   cm.replaceRange("", Pos(0, 1), Pos(0, 2));
   // Verify that deleting next to bookmarks doesn't kill them
-  eqPos(br.find(), Pos(0, 1));
-  eqPos(bl.find(), Pos(0, 1));
+  eqCursorPos(br.find(), Pos(0, 1));
+  eqCursorPos(bl.find(), Pos(0, 1));
 }, {value: "abcdef"});
 
 testCM("bookmarkCursor", function(cm) {
@@ -789,15 +790,15 @@ testCM("collapsedLines", function(cm) {
   CodeMirror.on(range, "clear", function() {cleared++;});
   cm.setCursor(Pos(3, 0));
   CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(5, 0));
+  eqCharPos(cm.getCursor(), Pos(5, 0));
   cm.replaceRange("abcdefg", Pos(3, 0), Pos(3));
   cm.setCursor(Pos(3, 6));
   CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(5, 4));
+  eqCharPos(cm.getCursor(), Pos(5, 4));
   cm.replaceRange("ab", Pos(3, 0), Pos(3));
   cm.setCursor(Pos(3, 2));
   CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(5, 2));
+  eqCharPos(cm.getCursor(), Pos(5, 2));
   cm.operation(function() {range.clear(); range.clear();});
   eq(cleared, 1);
 });
@@ -807,14 +808,14 @@ testCM("collapsedRangeCoordsChar", function(cm) {
   pos_1_3.left += 2; pos_1_3.top += 2;
   var opts = {collapsed: true, inclusiveLeft: true, inclusiveRight: true};
   var m1 = cm.markText(Pos(0, 0), Pos(2, 0), opts);
-  eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
+  eqCharPos(cm.coordsChar(pos_1_3), Pos(3, 3));
   m1.clear();
   var m1 = cm.markText(Pos(0, 0), Pos(1, 1), {collapsed: true, inclusiveLeft: true});
   var m2 = cm.markText(Pos(1, 1), Pos(2, 0), {collapsed: true, inclusiveRight: true});
-  eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
+  eqCharPos(cm.coordsChar(pos_1_3), Pos(3, 3));
   m1.clear(); m2.clear();
   var m1 = cm.markText(Pos(0, 0), Pos(1, 6), opts);
-  eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
+  eqCharPos(cm.coordsChar(pos_1_3), Pos(3, 3));
 }, {value: "123456\nabcdef\nghijkl\nmnopqr\n"});
 
 testCM("collapsedRangeBetweenLinesSelected", function(cm) {
@@ -852,7 +853,7 @@ testCM("hiddenLinesAutoUnfold", function(cm) {
   eq(cleared, 1);
   range = foldLines(cm, 1, 3, true);
   CodeMirror.on(range, "clear", function() {cleared++;});
-  eqPos(cm.getCursor(), Pos(3, 0));
+  eqCursorPos(cm.getCursor(), Pos(3, 0));
   cm.setCursor(Pos(0, 3));
   cm.execCommand("goCharRight");
   eq(cleared, 2);
@@ -863,8 +864,8 @@ testCM("hiddenLinesSelectAll", function(cm) {  // Issue #484
   foldLines(cm, 0, 10);
   foldLines(cm, 11, 20);
   CodeMirror.commands.selectAll(cm);
-  eqPos(cm.getCursor(true), Pos(10, 0));
-  eqPos(cm.getCursor(false), Pos(10, 4));
+  eqCursorPos(cm.getCursor(true), Pos(10, 0));
+  eqCursorPos(cm.getCursor(false), Pos(10, 4));
 });
 
 
@@ -891,9 +892,9 @@ testCM("structuredFold", function(cm) {
   });
   cm.setCursor(0, 3);
   CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(6, 2));
+  eqCharPos(cm.getCursor(), Pos(6, 2));
   CodeMirror.commands.goCharLeft(cm);
-  eqPos(cm.getCursor(), Pos(1, 2));
+  eqCharPos(cm.getCursor(), Pos(1, 2));
   CodeMirror.commands.delCharAfter(cm);
   eq(cm.getValue(), "xxxx\nxxxx\nxxxx");
   addDoc(cm, 4, 8);
@@ -905,9 +906,9 @@ testCM("structuredFold", function(cm) {
   CodeMirror.on(range, "clear", function(){++cleared;});
   cm.setCursor(0, 3);
   CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(6, 2));
+  eqCharPos(cm.getCursor(), Pos(6, 2));
   CodeMirror.commands.goCharLeft(cm);
-  eqPos(cm.getCursor(), Pos(6, 1));
+  eqCharPos(cm.getCursor(), Pos(6, 1));
   eq(cleared, 1);
   range.clear();
   eq(cleared, 1);
@@ -918,13 +919,13 @@ testCM("structuredFold", function(cm) {
   range.clear();
   cm.setCursor(1, 2);
   CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(1, 3));
+  eqCharPos(cm.getCursor(), Pos(1, 3));
   range = cm.markText(Pos(2, 0), Pos(4, 4), {
     replacedWith: document.createTextNode("M")
   });
   cm.setCursor(1, 0);
   CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(2, 0));
+  eqCharPos(cm.getCursor(), Pos(2, 0));
 }, null);
 
 testCM("nestedFold", function(cm) {
@@ -935,23 +936,23 @@ testCM("nestedFold", function(cm) {
   var inner1 = fold(0, 6, 1, 3), inner2 = fold(0, 2, 1, 8), outer = fold(0, 1, 2, 3), inner0 = fold(0, 5, 0, 6);
   cm.setCursor(0, 1);
   CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(2, 3));
+  eqCursorPos(cm.getCursor(), Pos(2, 3));
   inner0.clear();
   CodeMirror.commands.goCharLeft(cm);
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCursorPos(cm.getCursor(), Pos(0, 1));
   outer.clear();
   CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(0, 2));
+  eqCursorPos(cm.getCursor(), Pos(0, 2, "before"));
   CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(1, 8));
+  eqCursorPos(cm.getCursor(), Pos(1, 8));
   inner2.clear();
   CodeMirror.commands.goCharLeft(cm);
-  eqPos(cm.getCursor(), Pos(1, 7));
+  eqCursorPos(cm.getCursor(), Pos(1, 7, "after"));
   cm.setCursor(0, 5);
   CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(0, 6));
+  eqCursorPos(cm.getCursor(), Pos(0, 6, "before"));
   CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(1, 3));
+  eqCursorPos(cm.getCursor(), Pos(1, 3));
 });
 
 testCM("badNestedFold", function(cm) {
@@ -1045,13 +1046,13 @@ testCM("inlineWidget", function(cm) {
   var w = cm.setBookmark(Pos(0, 2), {widget: document.createTextNode("uu")});
   cm.setCursor(0, 2);
   CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(1, 4));
+  eqCharPos(cm.getCursor(), Pos(1, 4));
   cm.setCursor(0, 2);
   cm.replaceSelection("hi");
-  eqPos(w.find(), Pos(0, 2));
+  eqCharPos(w.find(), Pos(0, 2));
   cm.setCursor(0, 1);
   cm.replaceSelection("ay");
-  eqPos(w.find(), Pos(0, 4));
+  eqCharPos(w.find(), Pos(0, 4));
   eq(cm.getLine(0), "uayuhiuu");
 }, {value: "uuuu\nuuuuuu"});
 
@@ -1083,7 +1084,7 @@ testCM("wrappingAndResizing", function(cm) {
            Pos(0, 0), Pos(1, doc.length), Pos(1, doc.length - 1)],
           function(pos) {
     var coords = cm.charCoords(pos);
-    eqPos(pos, cm.coordsChar({left: coords.left + 2, top: coords.top + 5}));
+    eqCharPos(pos, cm.coordsChar({left: coords.left + 2, top: coords.top + 5}));
   });
 }, null, ie_lt8);
 
@@ -1102,13 +1103,13 @@ testCM("measureEndOfLine", function(cm) {
   cm.setValue(cm.getValue() + "\n\n");
   var endPos = cm.charCoords(Pos(0, 18), "local");
   is(endPos.top > lh * .8, "not at top");
-  is(endPos.left > w - 20, "not at right");
+  is(endPos.left > w - 20, "at right");
   endPos = cm.charCoords(Pos(0, 18));
   eqCursorPos(cm.coordsChar({left: endPos.left, top: endPos.top + 5}), Pos(0, 18, "before"));
 
   var wrapPos = cm.cursorCoords(Pos(0, 9, "before"));
   is(wrapPos.top < endPos.top, "wrapPos is actually in first line");
-  eqPos(cm.coordsChar({left: wrapPos.left + 10, top: wrapPos.top}), Pos(0, 9, "before"));
+  eqCursorPos(cm.coordsChar({left: wrapPos.left + 10, top: wrapPos.top}), Pos(0, 9, "before"));
 }, {mode: "text/html", value: "<!-- foo barrr -->", lineWrapping: true}, ie_lt8 || opera_lt10);
 
 testCM("measureWrappedEndOfLine", function(cm) {
@@ -1125,9 +1126,9 @@ testCM("measureWrappedEndOfLine", function(cm) {
   }
   var endPos = cm.charCoords(Pos(0, 12)); // Next-to-last since last would wrap (#1862)
   endPos.left += w; // Add width of editor just to be sure that we are behind last character
-  eqPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
+  eqCursorPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
   endPos.left += w * 100;
-  eqPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
+  eqCursorPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
 }, {mode: "text/html", value: "0123456789abcde0123456789", lineWrapping: true}, ie_lt8 || opera_lt10);
 
 testCM("scrollVerticallyAndHorizontally", function(cm) {
@@ -1153,7 +1154,7 @@ testCM("moveVstuck", function(cm) {
   }
   cm.setCursor(Pos(0, val.length - 1));
   cm.moveV(-1, "line");
-  eqPos(cm.getCursor(), Pos(0, 27, "before"));
+  eqCursorPos(cm.getCursor(), Pos(0, 27, "before"));
   is(cm.cursorCoords(null, "local").top < h0, "cursor is in first visual line");
 }, {lineWrapping: true}, ie_lt8 || opera_lt10);
 
@@ -1161,24 +1162,24 @@ testCM("collapseOnMove", function(cm) {
   cm.setSelection(Pos(0, 1), Pos(2, 4));
   cm.execCommand("goLineUp");
   is(!cm.somethingSelected());
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCharPos(cm.getCursor(), Pos(0, 1));
   cm.setSelection(Pos(0, 1), Pos(2, 4));
   cm.execCommand("goPageDown");
   is(!cm.somethingSelected());
-  eqPos(cm.getCursor(), Pos(2, 4));
+  eqCharPos(cm.getCursor(), Pos(2, 4));
   cm.execCommand("goLineUp");
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(0, 4));
+  eqCharPos(cm.getCursor(), Pos(0, 4));
   cm.setSelection(Pos(0, 1), Pos(2, 4));
   cm.execCommand("goCharLeft");
   is(!cm.somethingSelected());
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCharPos(cm.getCursor(), Pos(0, 1));
 }, {value: "aaaaa\nb\nccccc"});
 
 testCM("clickTab", function(cm) {
   var p0 = cm.charCoords(Pos(0, 0));
-  eqPos(cm.coordsChar({left: p0.left + 5, top: p0.top + 5}), Pos(0, 0));
-  eqPos(cm.coordsChar({left: p0.right - 5, top: p0.top + 5}), Pos(0, 1));
+  eqCharPos(cm.coordsChar({left: p0.left + 5, top: p0.top + 5}), Pos(0, 0));
+  eqCharPos(cm.coordsChar({left: p0.right - 5, top: p0.top + 5}), Pos(0, 1));
 }, {value: "\t\n\n", lineWrapping: true, tabSize: 8});
 
 testCM("verticalScroll", function(cm) {
@@ -1230,53 +1231,53 @@ testCM("extraKeys", function(cm) {
 
 testCM("wordMovementCommands", function(cm) {
   cm.execCommand("goWordLeft");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
   cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(0, 7));
+  eqCursorPos(cm.getCursor(), Pos(0, 7, "before"));
   cm.execCommand("goWordLeft");
   eqCursorPos(cm.getCursor(), Pos(0, 5, "after"));
   cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(0, 12));
+  eqCursorPos(cm.getCursor(), Pos(0, 12, "before"));
   cm.execCommand("goWordLeft");
   eqCursorPos(cm.getCursor(), Pos(0, 9, "after"));
   cm.execCommand("goWordRight"); cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(0, 24));
+  eqCursorPos(cm.getCursor(), Pos(0, 24, "before"));
   cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(1, 9));
+  eqCursorPos(cm.getCursor(), Pos(1, 9, "before"));
   cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(1, 13));
+  eqCursorPos(cm.getCursor(), Pos(1, 13, "before"));
   cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(2, 0));
+  eqCharPos(cm.getCursor(), Pos(2, 0));
 }, {value: "this is (the) firstline.\na foo12\u00e9\u00f8\u00d7bar\n"});
 
 testCM("groupMovementCommands", function(cm) {
   cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
   cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 4));
+  eqCursorPos(cm.getCursor(), Pos(0, 4, "before"));
   cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 7));
+  eqCursorPos(cm.getCursor(), Pos(0, 7, "before"));
   cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 10));
+  eqCursorPos(cm.getCursor(), Pos(0, 10, "before"));
   cm.execCommand("goGroupLeft");
   eqCursorPos(cm.getCursor(), Pos(0, 7, "after"));
   cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 15));
+  eqCursorPos(cm.getCursor(), Pos(0, 15, "before"));
   cm.setCursor(Pos(0, 17));
   cm.execCommand("goGroupLeft");
   eqCursorPos(cm.getCursor(), Pos(0, 16, "after"));
   cm.execCommand("goGroupLeft");
   eqCursorPos(cm.getCursor(), Pos(0, 14, "after"));
   cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 20));
+  eqCursorPos(cm.getCursor(), Pos(0, 20, "before"));
   cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(1, 0));
+  eqCursorPos(cm.getCursor(), Pos(1, 0, "after"));
   cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(1, 2));
+  eqCursorPos(cm.getCursor(), Pos(1, 2, "before"));
   cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(1, 5));
+  eqCursorPos(cm.getCursor(), Pos(1, 5, "before"));
   cm.execCommand("goGroupLeft"); cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(1, 0));
+  eqCursorPos(cm.getCursor(), Pos(1, 0, "after"));
   cm.execCommand("goGroupLeft");
   eqCursorPos(cm.getCursor(), Pos(0, 20, "after"));
   cm.execCommand("goGroupLeft");
@@ -1288,60 +1289,60 @@ testCM("groupsAndWhitespace", function(cm) {
                    Pos(1, 0), Pos(1, 2), Pos(1, 5)];
   for (var i = 1; i < positions.length; i++) {
     cm.execCommand("goGroupRight");
-    eqPos(cm.getCursor(), positions[i]);
+    eqCharPos(cm.getCursor(), positions[i]);
   }
   for (var i = positions.length - 2; i >= 0; i--) {
     cm.execCommand("goGroupLeft");
-    eqPos(cm.getCursor(), i == 2 ? Pos(0, 6) : positions[i]);
+    eqCharPos(cm.getCursor(), i == 2 ? Pos(0, 6, "before") : positions[i]);
   }
 }, {value: "  foo +++  \n  bar"});
 
 testCM("charMovementCommands", function(cm) {
   cm.execCommand("goCharLeft"); cm.execCommand("goColumnLeft");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
   cm.execCommand("goCharRight"); cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(0, 2));
+  eqCursorPos(cm.getCursor(), Pos(0, 2, "before"));
   cm.setCursor(Pos(1, 0));
   cm.execCommand("goColumnLeft");
-  eqPos(cm.getCursor(), Pos(1, 0));
+  eqCursorPos(cm.getCursor(), Pos(1, 0));
   cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(0, 5));
+  eqCursorPos(cm.getCursor(), Pos(0, 5, "before"));
   cm.execCommand("goColumnRight");
-  eqPos(cm.getCursor(), Pos(0, 5));
+  eqCursorPos(cm.getCursor(), Pos(0, 5, "before"));
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 0));
+  eqCursorPos(cm.getCursor(), Pos(1, 0, "after"));
   cm.execCommand("goLineEnd");
-  eqPos(cm.getCursor(), Pos(1, 5));
+  eqCursorPos(cm.getCursor(), Pos(1, 5, "before"));
   cm.execCommand("goLineStartSmart");
-  eqPos(cm.getCursor(), Pos(1, 1));
+  eqCursorPos(cm.getCursor(), Pos(1, 1, "after"));
   cm.execCommand("goLineStartSmart");
-  eqPos(cm.getCursor(), Pos(1, 0));
+  eqCursorPos(cm.getCursor(), Pos(1, 0, "after"));
   cm.setCursor(Pos(2, 0));
   cm.execCommand("goCharRight"); cm.execCommand("goColumnRight");
-  eqPos(cm.getCursor(), Pos(2, 0));
+  eqCursorPos(cm.getCursor(), Pos(2, 0));
 }, {value: "line1\n ine2\n"});
 
 testCM("verticalMovementCommands", function(cm) {
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCharPos(cm.getCursor(), Pos(0, 0));
   cm.execCommand("goLineDown");
   if (!phantom) // This fails in PhantomJS, though not in a real Webkit
-    eqPos(cm.getCursor(), Pos(1, 0));
+    eqCharPos(cm.getCursor(), Pos(1, 0));
   cm.setCursor(Pos(1, 12));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(2, 5));
+  eqCharPos(cm.getCursor(), Pos(2, 5));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(3, 0));
+  eqCharPos(cm.getCursor(), Pos(3, 0));
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(2, 5));
+  eqCharPos(cm.getCursor(), Pos(2, 5));
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(1, 12));
+  eqCharPos(cm.getCursor(), Pos(1, 12));
   cm.execCommand("goPageDown");
-  eqPos(cm.getCursor(), Pos(5, 0));
+  eqCharPos(cm.getCursor(), Pos(5, 0));
   cm.execCommand("goPageDown"); cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(5, 0));
+  eqCharPos(cm.getCursor(), Pos(5, 0));
   cm.execCommand("goPageUp");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCharPos(cm.getCursor(), Pos(0, 0));
 }, {value: "line1\nlong long line2\nline3\n\nline5\n"});
 
 testCM("verticalMovementCommandsWrapping", function(cm) {
@@ -1364,30 +1365,30 @@ testCM("verticalMovementCommandsSingleLine", function(cm) {
   cm.display.wrapper.style.height = "auto";
   cm.refresh();
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(0, 11));
+  eqCursorPos(cm.getCursor(), Pos(0, 11));
   cm.setCursor(Pos(0, 5));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(0, 11));
+  eqCursorPos(cm.getCursor(), Pos(0, 11));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(0, 11));
+  eqCursorPos(cm.getCursor(), Pos(0, 11));
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
   cm.execCommand("goPageDown");
-  eqPos(cm.getCursor(), Pos(0, 11));
+  eqCursorPos(cm.getCursor(), Pos(0, 11));
   cm.execCommand("goPageDown"); cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(0, 11));
+  eqCursorPos(cm.getCursor(), Pos(0, 11));
   cm.execCommand("goPageUp");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
   cm.setCursor(Pos(0, 5));
   cm.execCommand("goPageUp");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
   cm.setCursor(Pos(0, 5));
   cm.execCommand("goPageDown");
-  eqPos(cm.getCursor(), Pos(0, 11));
+  eqCursorPos(cm.getCursor(), Pos(0, 11));
 }, {value: "single line"});
 
 
@@ -1396,8 +1397,7 @@ testCM("rtlMovement", function(cm) {
   forEach(["خحج", "خحabcخحج", "abخحخحجcd", "abخde", "abخح2342خ1حج", "خ1ح2خح3حxج",
            "خحcd", "1خحcd", "abcdeح1ج", "خمرحبها مها!", "foobarر", "خ ة ق",
            "<img src=\"/בדיקה3.jpg\">", "يتم السحب في 05 فبراير 2014"], function(line) {
-    var inv = line.charCodeAt(0) > 128;
-    cm.setValue(line + "\n"); cm.execCommand(inv ? "goLineEnd" : "goLineStart");
+    cm.setValue(line + "\n"); cm.execCommand("goLineStart");
     var cursors = byClassName(cm.getWrapperElement(), "CodeMirror-cursors")[0];
     var cursor = cursors.firstChild;
     var prevX = cursor.offsetLeft, prevY = cursor.offsetTop;
@@ -1408,7 +1408,7 @@ testCM("rtlMovement", function(cm) {
       else is(cursor.offsetLeft > prevX, "moved right");
       prevX = cursor.offsetLeft; prevY = cursor.offsetTop;
     }
-    cm.setCursor(0, 0); cm.execCommand(inv ? "goLineStart" : "goLineEnd");
+    cm.setCursor(0, 0); cm.execCommand("goLineEnd");
     prevX = cursors.firstChild.offsetLeft;
     for (var i = 0; i < line.length; ++i) {
       cm.execCommand("goCharLeft");
@@ -1421,24 +1421,24 @@ testCM("rtlMovement", function(cm) {
 
 // Verify that updating a line clears its bidi ordering
 testCM("bidiUpdate", function(cm) {
-  cm.setCursor(Pos(0, 2));
+  cm.setCursor(Pos(0, 2, "before"));
   cm.replaceSelection("خحج", "start");
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(0, 4));
+  eqCursorPos(cm.getCursor(), Pos(0, 6, "before"));
 }, {value: "abcd\n"});
 
 testCM("movebyTextUnit", function(cm) {
   cm.setValue("בְּרֵאשִ\nééé́\n");
-  cm.execCommand("goLineEnd");
+  cm.execCommand("goLineStart");
   for (var i = 0; i < 4; ++i) cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0, "after"));
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 0));
+  eqCursorPos(cm.getCursor(), Pos(1, 0, "after"));
   cm.execCommand("goCharRight");
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 4));
+  eqCursorPos(cm.getCursor(), Pos(1, 4, "before"));
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 7));
+  eqCursorPos(cm.getCursor(), Pos(1, 7, "before"));
 });
 
 testCM("lineChangeEvents", function(cm) {
@@ -1478,9 +1478,9 @@ testCM("lineWidgets", function(cm) {
   is(last.top < cm.charCoords(Pos(2, 0)).top, "took up space");
   cm.setCursor(Pos(1, 1));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(2, 1));
+  eqCharPos(cm.getCursor(), Pos(2, 1));
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(1, 1));
+  eqCharPos(cm.getCursor(), Pos(1, 1));
 });
 
 testCM("lineWidgetFocus", function(cm) {
@@ -1604,25 +1604,25 @@ testCM("jumpTheGap", function(cm) {
   cm.refresh();
   cm.setCursor(Pos(0, 1));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(1, 1));
+  eqCharPos(cm.getCursor(), Pos(1, 1));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(2, 1));
+  eqCharPos(cm.getCursor(), Pos(2, 1));
   cm.execCommand("goLineDown");
   eq(cm.getCursor().line, 2);
   is(cm.getCursor().ch > 1);
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(2, 1));
+  eqCharPos(cm.getCursor(), Pos(2, 1));
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(1, 1));
+  eqCharPos(cm.getCursor(), Pos(1, 1));
   var node = document.createElement("div");
   node.innerHTML = "hi"; node.style.height = "30px";
   cm.addLineWidget(0, node);
   cm.addLineWidget(1, node.cloneNode(true), {above: true});
   cm.setCursor(Pos(0, 2));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(1, 2));
+  eqCharPos(cm.getCursor(), Pos(1, 2));
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(0, 2));
+  eqCharPos(cm.getCursor(), Pos(0, 2));
 }, {lineWrapping: true, value: "abc\ndef\nghi\njkl\n"});
 
 testCM("addLineClass", function(cm) {
@@ -1678,37 +1678,37 @@ testCM("atomicMarker", function(cm) {
   var m = atom(0, 1, 0, 5);
   cm.setCursor(Pos(0, 1));
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(0, 5));
+  eqCursorPos(cm.getCursor(), Pos(0, 5));
   cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCursorPos(cm.getCursor(), Pos(0, 1));
   m.clear();
   m = atom(0, 0, 0, 5, true);
-  eqPos(cm.getCursor(), Pos(0, 5), "pushed out");
+  eqCursorPos(cm.getCursor(), Pos(0, 5), "pushed out");
   cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(0, 5));
+  eqCursorPos(cm.getCursor(), Pos(0, 5));
   m.clear();
   m = atom(8, 4, 9, 10, false, true);
   cm.setCursor(Pos(9, 8));
-  eqPos(cm.getCursor(), Pos(8, 4), "set");
+  eqCursorPos(cm.getCursor(), Pos(8, 4), "set");
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(8, 4), "char right");
+  eqCursorPos(cm.getCursor(), Pos(8, 4), "char right");
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(8, 4), "line down");
+  eqCursorPos(cm.getCursor(), Pos(8, 4), "line down");
   cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(8, 3));
+  eqCursorPos(cm.getCursor(), Pos(8, 3, "after"));
   m.clear();
   m = atom(1, 1, 3, 8);
   cm.setCursor(Pos(0, 0));
   cm.setCursor(Pos(2, 0));
-  eqPos(cm.getCursor(), Pos(3, 8));
+  eqCursorPos(cm.getCursor(), Pos(3, 8));
   cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(1, 1));
+  eqCursorPos(cm.getCursor(), Pos(1, 1));
   cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(3, 8));
+  eqCursorPos(cm.getCursor(), Pos(3, 8));
   cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(1, 1));
+  eqCursorPos(cm.getCursor(), Pos(1, 1));
   cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(3, 8));
+  eqCursorPos(cm.getCursor(), Pos(3, 8));
   cm.execCommand("delCharBefore");
   eq(cm.getValue().length, 80, "del chunk");
   m = atom(3, 0, 5, 5);
@@ -1720,16 +1720,16 @@ testCM("atomicMarker", function(cm) {
 testCM("selectionBias", function(cm) {
   cm.markText(Pos(0, 1), Pos(0, 3), {atomic: true});
   cm.setCursor(Pos(0, 2));
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCursorPos(cm.getCursor(), Pos(0, 1));
   cm.setCursor(Pos(0, 2));
-  eqPos(cm.getCursor(), Pos(0, 3));
+  eqCursorPos(cm.getCursor(), Pos(0, 3));
   cm.setCursor(Pos(0, 2));
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCursorPos(cm.getCursor(), Pos(0, 1));
   cm.setCursor(Pos(0, 2), null, {bias: -1});
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCursorPos(cm.getCursor(), Pos(0, 1));
   cm.setCursor(Pos(0, 4));
   cm.setCursor(Pos(0, 2), null, {bias: 1});
-  eqPos(cm.getCursor(), Pos(0, 3));
+  eqCursorPos(cm.getCursor(), Pos(0, 3));
 }, {value: "12345"});
 
 testCM("selectionHomeEnd", function(cm) {
@@ -1737,9 +1737,9 @@ testCM("selectionHomeEnd", function(cm) {
   cm.markText(Pos(1, 3), Pos(1, 4), {atomic: true, inclusiveRight: true});
   cm.setCursor(Pos(1, 2));
   cm.execCommand("goLineStart");
-  eqPos(cm.getCursor(), Pos(1, 1));
+  eqCursorPos(cm.getCursor(), Pos(1, 1));
   cm.execCommand("goLineEnd");
-  eqPos(cm.getCursor(), Pos(1, 3));
+  eqCursorPos(cm.getCursor(), Pos(1, 3));
 }, {value: "ab\ncdef\ngh"});
 
 testCM("readOnlyMarker", function(cm) {
@@ -1750,30 +1750,30 @@ testCM("readOnlyMarker", function(cm) {
   var m = mark(0, 1, 0, 4);
   cm.setCursor(Pos(0, 2));
   cm.replaceSelection("hi", "end");
-  eqPos(cm.getCursor(), Pos(0, 2));
+  eqCursorPos(cm.getCursor(), Pos(0, 2));
   eq(cm.getLine(0), "abcde");
   cm.execCommand("selectAll");
   cm.replaceSelection("oops", "around");
   eq(cm.getValue(), "oopsbcd");
   cm.undo();
-  eqPos(m.find().from, Pos(0, 1));
-  eqPos(m.find().to, Pos(0, 4));
+  eqCursorPos(m.find().from, Pos(0, 1));
+  eqCursorPos(m.find().to, Pos(0, 4));
   m.clear();
   cm.setCursor(Pos(0, 2));
   cm.replaceSelection("hi", "around");
   eq(cm.getLine(0), "abhicde");
-  eqPos(cm.getCursor(), Pos(0, 4));
+  eqCursorPos(cm.getCursor(), Pos(0, 4));
   m = mark(0, 2, 2, 2, true);
   cm.setSelection(Pos(1, 1), Pos(2, 4));
   cm.replaceSelection("t", "end");
-  eqPos(cm.getCursor(), Pos(2, 3));
+  eqCursorPos(cm.getCursor(), Pos(2, 3));
   eq(cm.getLine(2), "klto");
   cm.execCommand("goCharLeft");
   cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(0, 2));
+  eqCursorPos(cm.getCursor(), Pos(0, 2));
   cm.setSelection(Pos(0, 1), Pos(0, 3));
   cm.replaceSelection("xx", "around");
-  eqPos(cm.getCursor(), Pos(0, 3));
+  eqCursorPos(cm.getCursor(), Pos(0, 3));
   eq(cm.getLine(0), "axxhicde");
 }, {value: "abcde\nfghij\nklmno\n"});
 
@@ -1817,12 +1817,12 @@ testCM("addKeyMap", function(cm) {
   }
 
   sendKey(39);
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCursorPos(cm.getCursor(), Pos(0, 1, "before"));
   var test = 0;
   var map1 = {Right: function() { ++test; }}, map2 = {Right: function() { test += 10; }}
   cm.addKeyMap(map1);
   sendKey(39);
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCursorPos(cm.getCursor(), Pos(0, 1, "before"));
   eq(test, 1);
   cm.addKeyMap(map2, true);
   sendKey(39);
@@ -1833,13 +1833,13 @@ testCM("addKeyMap", function(cm) {
   cm.removeKeyMap(map2);
   sendKey(39);
   eq(test, 12);
-  eqPos(cm.getCursor(), Pos(0, 2));
+  eqCursorPos(cm.getCursor(), Pos(0, 2, "before"));
   cm.addKeyMap({Right: function() { test = 55; }, name: "mymap"});
   sendKey(39);
   eq(test, 55);
   cm.removeKeyMap("mymap");
   sendKey(39);
-  eqPos(cm.getCursor(), Pos(0, 3));
+  eqCursorPos(cm.getCursor(), Pos(0, 3, "before"));
 }, {value: "abc"});
 
 testCM("findPosH", function(cm) {
@@ -1847,7 +1847,7 @@ testCM("findPosH", function(cm) {
            {from: Pos(0, 0), to: Pos(0, 0), by: -1, hitSide: true},
            {from: Pos(0, 0), to: Pos(0, 4, "before"), by: 1, unit: "word"},
            {from: Pos(0, 0), to: Pos(0, 8, "before"), by: 2, unit: "word"},
-           {from: Pos(0, 0), to: Pos(2, 0, "before"), by: 20, unit: "word", hitSide: true},
+           {from: Pos(0, 0), to: Pos(2, 0, "after"), by: 20, unit: "word", hitSide: true},
            {from: Pos(0, 7), to: Pos(0, 5, "after"), by: -1, unit: "word"},
            {from: Pos(0, 4), to: Pos(0, 8, "before"), by: 1, unit: "word"},
            {from: Pos(1, 0), to: Pos(1, 18, "before"), by: 3, unit: "word"},
@@ -1856,9 +1856,9 @@ testCM("findPosH", function(cm) {
            {from: Pos(1, 15), to: Pos(1, 10, "after"), by: -5, unit: "column"},
            {from: Pos(1, 15), to: Pos(1, 0, "after"), by: -50, unit: "column", hitSide: true},
            {from: Pos(1, 15), to: Pos(1, 24, "before"), by: 50, unit: "column", hitSide: true},
-           {from: Pos(1, 15), to: Pos(2, 0, "before"), by: 50, hitSide: true}], function(t) {
+           {from: Pos(1, 15), to: Pos(2, 0, "after"), by: 50, hitSide: true}], function(t) {
     var r = cm.findPosH(t.from, t.by, t.unit || "char");
-    eqPos(r, t.to);
+    eqCursorPos(r, t.to);
     eq(!!r.hitSide, !!t.hitSide);
   });
 }, {value: "line one\nline two.something.other\n"});
@@ -1907,10 +1907,10 @@ testCM("beforeSelectionChange", function(cm) {
 
   addDoc(cm, 10, 10);
   cm.execCommand("goLineEnd");
-  eqPos(cm.getCursor(), Pos(0, 9));
+  eqCursorPos(cm.getCursor(), Pos(0, 9));
   cm.execCommand("selectAll");
-  eqPos(cm.getCursor("start"), Pos(0, 0));
-  eqPos(cm.getCursor("end"), Pos(9, 9));
+  eqCursorPos(cm.getCursor("start"), Pos(0, 0));
+  eqCursorPos(cm.getCursor("end"), Pos(9, 9));
 });
 
 testCM("change_removedText", function(cm) {
@@ -2015,17 +2015,17 @@ testCM("selectionHistory", function(cm) {
   eq(cm.getSelection(), "c");
   cm.execCommand("undoSelection");
   eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(), Pos(0, 4));
+  eqCursorPos(cm.getCursor(), Pos(0, 4, "before"));
   cm.execCommand("undoSelection");
   eq(cm.getSelection(), "b");
   cm.execCommand("redoSelection");
   eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(), Pos(0, 4));
+  eqCursorPos(cm.getCursor(), Pos(0, 4, "before"));
   cm.execCommand("redoSelection");
   eq(cm.getSelection(), "c");
   cm.execCommand("redoSelection");
   eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(), Pos(0, 6));
+  eqCursorPos(cm.getCursor(), Pos(0, 6, "before"));
 }, {value: "a b c d"});
 
 testCM("selectionChangeReducesRedo", function(cm) {
@@ -2035,7 +2035,7 @@ testCM("selectionChangeReducesRedo", function(cm) {
   cm.execCommand("selectAll");
   cm.undoSelection();
   eq(cm.getValue(), "Xabc");
-  eqPos(cm.getCursor(), Pos(0, 1));
+  eqCursorPos(cm.getCursor(), Pos(0, 1));
   cm.undoSelection();
   eq(cm.getValue(), "abc");
 }, {value: "abc"});
@@ -2044,8 +2044,8 @@ testCM("selectionHistoryNonOverlapping", function(cm) {
   cm.setSelection(Pos(0, 0), Pos(0, 1));
   cm.setSelection(Pos(0, 2), Pos(0, 3));
   cm.execCommand("undoSelection");
-  eqPos(cm.getCursor("anchor"), Pos(0, 0));
-  eqPos(cm.getCursor("head"), Pos(0, 1));
+  eqCursorPos(cm.getCursor("anchor"), Pos(0, 0));
+  eqCursorPos(cm.getCursor("head"), Pos(0, 1));
 }, {value: "1234"});
 
 testCM("cursorMotionSplitsHistory", function(cm) {
@@ -2055,10 +2055,10 @@ testCM("cursorMotionSplitsHistory", function(cm) {
   cm.replaceSelection("c");
   cm.undo();
   eq(cm.getValue(), "a1234");
-  eqPos(cm.getCursor(), Pos(0, 2));
+  eqCursorPos(cm.getCursor(), Pos(0, 2, "before"));
   cm.undo();
   eq(cm.getValue(), "1234");
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
 }, {value: "1234"});
 
 testCM("selChangeInOperationDoesNotSplit", function(cm) {
@@ -2068,7 +2068,7 @@ testCM("selChangeInOperationDoesNotSplit", function(cm) {
       cm.setCursor(Pos(0, cm.getCursor().ch - 1));
     });
   }
-  eqPos(cm.getCursor(), Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
   eq(cm.getValue(), "xxxxa");
   cm.undo();
   eq(cm.getValue(), "a");
@@ -2220,7 +2220,7 @@ function makeItWrapAfter(cm, pos) {
 
 function testMoveBidi(str) {
   testCM("move_bidi_" + str, function(cm) {
-console.log("TESTING", encodeURIComponent(str))
+    if (cm.getOption("inputStyle") != "textarea" || webkit || !cm.getOption("rtlMoveVisually")) return;
     cm.getScrollerElement().style.fontFamily = "monospace";
     makeItWrapAfter(cm, Pos(0, 5));
 
@@ -2230,7 +2230,6 @@ console.log("TESTING", encodeURIComponent(str))
     if (str.indexOf("\n") != -1) {
       lineBreaks[steps - 2] = 'n';
     }
-console.log("TESTING", str.length, steps, lineBreaks)
 
     // Make sure we are at the visual beginning of the first line
     var pos = Pos(0, 0), lastPos;
@@ -2246,18 +2245,15 @@ console.log("TESTING", str.length, steps, lineBreaks)
       cm.execCommand("goCharRight");
       coords = cm.cursorCoords();
       if ((i >= 10 && i <= 12) && !lineBreaks[i] && coords.left < prevCoords.left && coords.top > prevCoords.top) {
-console.log("MOVED WRAPPED AT>", i)
         // The first line wraps twice
         lineBreaks[i] = 'w';
       }
       if (!lineBreaks[i]) {
         is(coords.left > prevCoords.left, "In step " + i + ", cursor didn't move right");
         eq(coords.top, prevCoords.top, "In step " + i + ", cursor moved out of line");
-console.log("MOVED", i, "right")
       } else {
         is(coords.left < prevCoords.left, i);
         is(coords.top > prevCoords.top, i);
-console.log("MOVED", i, "down")
       }
       prevCoords = coords;
     }
@@ -2273,11 +2269,9 @@ console.log("MOVED", i, "down")
       if (!(lineBreaks[i] == 'n' || lineBreaks[i + 1] == 'w')) {
         is(coords.left < prevCoords.left, "In step " + i + ", cursor didn't move left");
         eq(coords.top, prevCoords.top, "In step " + i + ", cursor is not at the same line anymore");
-console.log("MOVED", i, "left")
       } else {
         is(coords.left > prevCoords.left, i);
         is(coords.top < prevCoords.top, i);
-console.log("MOVED", i, "up")
       }
       prevCoords = coords;
     }
@@ -2289,7 +2283,7 @@ console.log("MOVED", i, "up")
   }, {value: str, lineWrapping: true})
 };
 
-testMoveBidi("Say ا ب جabj\nS"); // https://bugs.webkit.org/show_bug.cgi?id=165753
+testMoveBidi("Say ا ب جabj\nS");
 testMoveBidi("Όȝǝڪȉۥ״ۺ׆ɀҩۏ\nҳ");
 testMoveBidi("ό׊۷٢ԜһОצЉيčǟ\nѩ");
 testMoveBidi("ۑÚҳҕڬġڹհяųKV\nr");
diff --git a/test/vim_test.js b/test/vim_test.js
index d6b0ad16b2..acb5ba4be0 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -174,7 +174,7 @@ function testVim(name, run, opts, expectedFail) {
         } else {
           pos = makeCursor(line, ch);
         }
-        eqPos(pos, cm.getCursor());
+        eqCursorPos(cm.getCursor(), pos);
       }
     }
     function fakeOpenDialog(result) {
@@ -531,14 +531,14 @@ testVim('paragraph_motions', function(cm, vim, helpers) {
   // ip inside empty space
   cm.setCursor(10, 0);
   helpers.doKeys('v', 'i', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(12, 0), cm.getCursor('head'));
+  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(Pos(12, 0), cm.getCursor('head'));
   helpers.doKeys('i', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(13, 1), cm.getCursor('head'));
+  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(Pos(13, 1), cm.getCursor('head'));
   helpers.doKeys('2', 'i', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(16, 1), cm.getCursor('head'));
+  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(Pos(16, 1), cm.getCursor('head'));
 
   // should switch to visualLine mode
   cm.setCursor(14, 0);
@@ -547,31 +547,31 @@ testVim('paragraph_motions', function(cm, vim, helpers) {
 
   cm.setCursor(14, 0);
   helpers.doKeys('<Esc>', 'V', 'i', 'p');
-  eqPos(Pos(16, 1), cm.getCursor('head'));
+  eqCursorPos(Pos(16, 1), cm.getCursor('head'));
 
   // ap inside empty space
   cm.setCursor(10, 0);
   helpers.doKeys('<Esc>', 'v', 'a', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(13, 1), cm.getCursor('head'));
+  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(Pos(13, 1), cm.getCursor('head'));
   helpers.doKeys('a', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(16, 1), cm.getCursor('head'));
+  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(Pos(16, 1), cm.getCursor('head'));
 
   cm.setCursor(13, 0);
   helpers.doKeys('v', 'a', 'p');
-  eqPos(Pos(13, 0), cm.getCursor('anchor'));
-  eqPos(Pos(14, 0), cm.getCursor('head'));
+  eqCursorPos(Pos(13, 0), cm.getCursor('anchor'));
+  eqCursorPos(Pos(14, 0), cm.getCursor('head'));
 
   cm.setCursor(16, 0);
   helpers.doKeys('v', 'a', 'p');
-  eqPos(Pos(14, 0), cm.getCursor('anchor'));
-  eqPos(Pos(16, 1), cm.getCursor('head'));
+  eqCursorPos(Pos(14, 0), cm.getCursor('anchor'));
+  eqCursorPos(Pos(16, 1), cm.getCursor('head'));
 
   cm.setCursor(0, 0);
   helpers.doKeys('v', 'a', 'p');
-  eqPos(Pos(0, 0), cm.getCursor('anchor'));
-  eqPos(Pos(4, 0), cm.getCursor('head'));
+  eqCursorPos(Pos(0, 0), cm.getCursor('anchor'));
+  eqCursorPos(Pos(4, 0), cm.getCursor('head'));
 
   cm.setCursor(0, 0);
   helpers.doKeys('d', 'i', 'p');
@@ -593,7 +593,7 @@ testVim('dl', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq(' ', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
 testVim('dl_eol', function(cm, vim, helpers) {
   cm.setCursor(0, 6);
@@ -612,7 +612,7 @@ testVim('dl_repeat', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq(' w', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
 testVim('dh', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);
@@ -622,7 +622,7 @@ testVim('dh', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('o', register.toString());
   is(!register.linewise);
-  eqPos(offsetCursor(curStart, 0 , -1), cm.getCursor());
+  eqCursorPos(offsetCursor(curStart, 0 , -1), cm.getCursor());
 }, { value: ' word1 ' });
 testVim('dj', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);
@@ -672,7 +672,7 @@ testVim('dw_space', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq(' ', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
 testVim('dw_word', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 1);
@@ -682,7 +682,7 @@ testVim('dw_word', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1 ', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
 }, { value: ' word1 word2' });
 testVim('dw_unicode_word', function(cm, vim, helpers) {
   helpers.doKeys('d', 'w');
@@ -852,7 +852,7 @@ testVim('d_inclusive', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
 }, { value: ' word1 ' });
 testVim('d_reverse', function(cm, vim, helpers) {
   // Test that deleting in reverse works.
@@ -940,7 +940,7 @@ testVim('yw_repeat', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1\nword2', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2' });
 testVim('yy_multiply_repeat', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);
@@ -953,7 +953,7 @@ testVim('yy_multiply_repeat', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq(expectedBuffer, register.toString());
   is(register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
 });
 // Change commands behave like d commands except that it also enters insert
 // mode. In addition, when the change is linewise, an additional newline is
@@ -974,7 +974,7 @@ testVim('cw_repeat', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('word1\nword2', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
   eq('vim-insert', cm.getOption('keyMap'));
 }, { value: ' word1\nword2' });
 testVim('cc_multiply_repeat', function(cm, vim, helpers) {
@@ -1074,7 +1074,7 @@ testVim('g~w_repeat', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2' });
 testVim('g~g~', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 3);
@@ -1086,7 +1086,7 @@ testVim('g~g~', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
 }, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
 testVim('gu_and_gU', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 7);
@@ -1094,21 +1094,21 @@ testVim('gu_and_gU', function(cm, vim, helpers) {
   cm.setCursor(curStart);
   helpers.doKeys('2', 'g', 'U', 'w');
   eq(cm.getValue(), 'wa wb xX WC wd');
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
   helpers.doKeys('2', 'g', 'u', 'w');
   eq(cm.getValue(), value);
 
   helpers.doKeys('2', 'g', 'U', 'B');
   eq(cm.getValue(), 'wa WB Xx wc wd');
-  eqPos(makeCursor(0, 3), cm.getCursor());
+  eqCursorPos(makeCursor(0, 3), cm.getCursor());
 
   cm.setCursor(makeCursor(0, 4));
   helpers.doKeys('g', 'u', 'i', 'w');
   eq(cm.getValue(), 'wa wb Xx wc wd');
-  eqPos(makeCursor(0, 3), cm.getCursor());
+  eqCursorPos(makeCursor(0, 3), cm.getCursor());
 
   // TODO: support gUgU guu
-  // eqPos(makeCursor(0, 0), cm.getCursor());
+  // eqCursorPos(makeCursor(0, 0), cm.getCursor());
 
   var register = helpers.getRegisterController().getRegister();
   eq('', register.toString());
@@ -1333,7 +1333,7 @@ testVim('C', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('rd1', register.toString());
   is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
+  eqCursorPos(curStart, cm.getCursor());
   eq('vim-insert', cm.getOption('keyMap'));
 }, { value: ' word1\nword2\n word3' });
 testVim('Y', function(cm, vim, helpers) {
@@ -1446,7 +1446,7 @@ testVim('i_overwrite_backspace', function(cm, vim, helpers) {
   helpers.doKeys('i');
   helpers.doKeys('<Ins>');
   helpers.doInsertModeKeys('Backspace');
-  helpers.assertCursorAt(0, 9);
+  helpers.assertCursorAt(Pos(0, 9, "after"));
   eq('0123456789', cm.getValue());
 }, { value: '0123456789'});
 testVim('A', function(cm, vim, helpers) {
@@ -1879,7 +1879,7 @@ testVim('delmark_all', function(cm, vim, helpers) {
 testVim('visual', function(cm, vim, helpers) {
   helpers.doKeys('l', 'v', 'l', 'l');
   helpers.assertCursorAt(0, 4);
-  eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
+  eqCursorPos(makeCursor(0, 1), cm.getCursor('anchor'));
   helpers.doKeys('d');
   eq('15', cm.getValue());
 }, { value: '12345' });
@@ -1911,24 +1911,24 @@ testVim('visual_crossover_left', function(cm, vim, helpers) {
 testVim('visual_crossover_up', function(cm, vim, helpers) {
   cm.setCursor(3, 2);
   helpers.doKeys('v', 'j', 'k', 'k');
-  eqPos(Pos(2, 2), cm.getCursor('head'));
-  eqPos(Pos(3, 3), cm.getCursor('anchor'));
+  eqCursorPos(Pos(2, 2), cm.getCursor('head'));
+  eqCursorPos(Pos(3, 3), cm.getCursor('anchor'));
   helpers.doKeys('k');
-  eqPos(Pos(1, 2), cm.getCursor('head'));
-  eqPos(Pos(3, 3), cm.getCursor('anchor'));
+  eqCursorPos(Pos(1, 2), cm.getCursor('head'));
+  eqCursorPos(Pos(3, 3), cm.getCursor('anchor'));
 }, { value: 'cross\ncross\ncross\ncross\ncross\n'});
 testVim('visual_crossover_down', function(cm, vim, helpers) {
   cm.setCursor(1, 2);
   helpers.doKeys('v', 'k', 'j', 'j');
-  eqPos(Pos(2, 3), cm.getCursor('head'));
-  eqPos(Pos(1, 2), cm.getCursor('anchor'));
+  eqCursorPos(Pos(2, 3), cm.getCursor('head'));
+  eqCursorPos(Pos(1, 2), cm.getCursor('anchor'));
   helpers.doKeys('j');
-  eqPos(Pos(3, 3), cm.getCursor('head'));
-  eqPos(Pos(1, 2), cm.getCursor('anchor'));
+  eqCursorPos(Pos(3, 3), cm.getCursor('head'));
+  eqCursorPos(Pos(1, 2), cm.getCursor('anchor'));
 }, { value: 'cross\ncross\ncross\ncross\ncross\n'});
 testVim('visual_exit', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'l', 'j', 'j', '<Esc>');
-  eqPos(cm.getCursor('anchor'), cm.getCursor('head'));
+  eqCursorPos(cm.getCursor('anchor'), cm.getCursor('head'));
   eq(vim.visualMode, false);
 }, { value: 'hello\nworld\nfoo' });
 testVim('visual_line', function(cm, vim, helpers) {
@@ -2011,7 +2011,7 @@ testVim('visual_block_crossing_short_line', function(cm, vim, helpers) {
 testVim('visual_block_curPos_on_exit', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('<C-v>', '3' , 'l', '<Esc>');
-  eqPos(makeCursor(0, 3), cm.getCursor());
+  eqCursorPos(makeCursor(0, 3), cm.getCursor());
   helpers.doKeys('h', '<C-v>', '2' , 'j' ,'3' , 'l');
   eq(cm.getSelections().join(), "3456,,cdef");
   helpers.doKeys('4' , 'h');
@@ -2046,7 +2046,7 @@ testVim('visual_blank', function(cm, vim, helpers) {
 testVim('reselect_visual', function(cm, vim, helpers) {
   helpers.doKeys('l', 'v', 'l', 'l', 'l', 'y', 'g', 'v');
   helpers.assertCursorAt(0, 5);
-  eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
+  eqCursorPos(makeCursor(0, 1), cm.getCursor('anchor'));
   helpers.doKeys('v');
   cm.setCursor(1, 0);
   helpers.doKeys('v', 'l', 'l', 'p');
@@ -2055,15 +2055,15 @@ testVim('reselect_visual', function(cm, vim, helpers) {
   helpers.doKeys('g', 'v');
   // here the fake cursor is at (1, 3)
   helpers.assertCursorAt(1, 4);
-  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
+  eqCursorPos(makeCursor(1, 0), cm.getCursor('anchor'));
   helpers.doKeys('v');
   cm.setCursor(2, 0);
   helpers.doKeys('v', 'l', 'l', 'g', 'v');
   helpers.assertCursorAt(1, 4);
-  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
+  eqCursorPos(makeCursor(1, 0), cm.getCursor('anchor'));
   helpers.doKeys('g', 'v');
   helpers.assertCursorAt(2, 3);
-  eqPos(makeCursor(2, 0), cm.getCursor('anchor'));
+  eqCursorPos(makeCursor(2, 0), cm.getCursor('anchor'));
   eq('123456\n2345\nbar', cm.getValue());
 }, { value: '123456\nfoo\nbar' });
 testVim('reselect_visual_line', function(cm, vim, helpers) {
@@ -2079,14 +2079,14 @@ testVim('reselect_visual_block', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'k', 'h', '<C-v>');
   cm.setCursor(2, 1);
   helpers.doKeys('v', 'l', 'g', 'v');
-  eqPos(Pos(1, 2), vim.sel.anchor);
-  eqPos(Pos(0, 1), vim.sel.head);
+  eqCursorPos(Pos(1, 2), vim.sel.anchor);
+  eqCursorPos(Pos(0, 1), vim.sel.head);
   // Ensure selection is done with visual block mode rather than one
   // continuous range.
   eq(cm.getSelections().join(''), '23oo')
   helpers.doKeys('g', 'v');
-  eqPos(Pos(2, 1), vim.sel.anchor);
-  eqPos(Pos(2, 2), vim.sel.head);
+  eqCursorPos(Pos(2, 1), vim.sel.anchor);
+  eqCursorPos(Pos(2, 2), vim.sel.head);
   helpers.doKeys('<Esc>');
   // Ensure selection of deleted range
   cm.setCursor(1, 1);
@@ -2121,14 +2121,14 @@ testVim('o_visual', function(cm, vim, helpers) {
 testVim('o_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>','3','j','l','l', 'o');
-  eqPos(Pos(3, 3), vim.sel.anchor);
-  eqPos(Pos(0, 1), vim.sel.head);
+  eqCursorPos(Pos(3, 3), vim.sel.anchor);
+  eqCursorPos(Pos(0, 1), vim.sel.head);
   helpers.doKeys('O');
-  eqPos(Pos(3, 1), vim.sel.anchor);
-  eqPos(Pos(0, 3), vim.sel.head);
+  eqCursorPos(Pos(3, 1), vim.sel.anchor);
+  eqCursorPos(Pos(0, 3), vim.sel.head);
   helpers.doKeys('o');
-  eqPos(Pos(0, 3), vim.sel.anchor);
-  eqPos(Pos(3, 1), vim.sel.head);
+  eqCursorPos(Pos(0, 3), vim.sel.anchor);
+  eqCursorPos(Pos(3, 1), vim.sel.head);
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
 testVim('changeCase_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -4068,7 +4068,7 @@ testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
 // Test event handlers
 testVim('beforeSelectionChange', function(cm, vim, helpers) {
   cm.setCursor(0, 100);
-  eqPos(cm.getCursor('head'), cm.getCursor('anchor'));
+  eqCursorPos(cm.getCursor('head'), cm.getCursor('anchor'));
 }, { value: 'abc' });
 
 

From 6f39e7869b5dfe6a76b00ed5083c6a4d3049b709 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 16 Jan 2017 10:40:29 +0100
Subject: [PATCH 3082/4742] Work around Firefox > 50 in tests

---
 test/test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test.js b/test/test.js
index 38659f875d..c4941cfe3d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2216,6 +2216,8 @@ function makeItWrapAfter(cm, pos) {
     cm.setSize(w);
     posTop = cm.charCoords(pos).top;
   }
+  // Firefox > 50 compresses a space when two spaces from different bidi spans meet
+  cm.setSize(w + 10);
 }
 
 function testMoveBidi(str) {

From bdb0fb307f66d39c57eb0e076bb5a37060aa45b8 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 16 Jan 2017 23:03:30 +0100
Subject: [PATCH 3083/4742] Improve move_bidi test set

* Enable most in phantom
* Enable all in !phantom
* Disable two that trigger L1 which we don't do correctly currently
* Revert commit 5cc5d7f50efc7a016485f017a603c4fa2b035266 (L1 tests)
---
 test/test.js | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/test/test.js b/test/test.js
index c4941cfe3d..4853e6708d 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2216,13 +2216,11 @@ function makeItWrapAfter(cm, pos) {
     cm.setSize(w);
     posTop = cm.charCoords(pos).top;
   }
-  // Firefox > 50 compresses a space when two spaces from different bidi spans meet
-  cm.setSize(w + 10);
 }
 
 function testMoveBidi(str) {
   testCM("move_bidi_" + str, function(cm) {
-    if (cm.getOption("inputStyle") != "textarea" || webkit || !cm.getOption("rtlMoveVisually")) return;
+    if (cm.getOption("inputStyle") != "textarea" || !cm.getOption("rtlMoveVisually")) return;
     cm.getScrollerElement().style.fontFamily = "monospace";
     makeItWrapAfter(cm, Pos(0, 5));
 
@@ -2285,26 +2283,37 @@ function testMoveBidi(str) {
   }, {value: str, lineWrapping: true})
 };
 
+// We don't correctly implement L1 UBA
+// See https://bugzilla.mozilla.org/show_bug.cgi?id=1331501
+// and https://bugs.chromium.org/p/chromium/issues/detail?id=673405
+/*
 testMoveBidi("Say ا ب جabj\nS");
-testMoveBidi("Όȝǝڪȉۥ״ۺ׆ɀҩۏ\nҳ");
+testMoveBidi("Sayyy ا ا ب ج");
+*/
+
+if (!phantom) {
+  testMoveBidi("Όȝǝڪȉۥ״ۺ׆ɀҩۏ\nҳ");
+  testMoveBidi("ŌӰтقȤ؁ƥ؅٣ĎȺ١\nϚ");
+  testMoveBidi("ٻоҤѕѽΩ־؉ïίքdz\nٵ");
+  testMoveBidi("؅؁ĆՕƿɁǞϮؠȩóć\nď");
+  testMoveBidi("RŨďңŪzϢŎƏԖڇڦ\nӈ");
+}
+
 testMoveBidi("ό׊۷٢ԜһОצЉيčǟ\nѩ");
 testMoveBidi("ۑÚҳҕڬġڹհяųKV\nr");
-testMoveBidi("ŌӰтقȤ؁ƥ؅٣ĎȺ١\nϚ");
-testMoveBidi("ٻоҤѕѽΩ־؉ïίքdz\nٵ");
-//testMoveBidi("Count ١ ٢ ٣ ٤");
-testMoveBidi("Sayyy ا ا ب ج");
-testMoveBidi("؅؁ĆՕƿɁǞϮؠȩóć\nď");
 testMoveBidi("źڻғúہ4ם1Ƞc1a\nԁ");
 testMoveBidi("ҒȨҟփƞ٦ԓȦڰғâƥ\nڤ");
 testMoveBidi("քմѧǮßپüŢҍҞўڳ\nӧ");
-testMoveBidi("RŨďңŪzϢŎƏԖڇڦ\nӈ");
 testMoveBidi("ϖسՉȏŧΔԛdžĎӟیڡ\nέ");
 testMoveBidi("۹ؼL۵ĺȧКԙػא7״\nم");
+
+//testMoveBidi("Count ١ ٢ ٣ ٤");
 //testMoveBidi("ӣאƦϰ؊ȓېÛوը٬ز\nϪ");
 //testMoveBidi("ҾճٳџIՖӻ٥׭֐؜ڏ\nێ");
 //testMoveBidi("ҬÓФ؜ڂį٦Ͽɓڐͳٵ\nՈ");
 //testMoveBidi("aѴNijȻهˇ҃ڱӧǻֵ\na");
 //testMoveBidi(" a٧ا٢ ب جa\nS");
+
 /*
 for (var i = 0; i < 5; ++i) {
   testMoveBidi(getString(12) + "\n" + getString(1));

From a6b016982bacabb83d9524463be159e1325eb7ad Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 26 Jan 2017 09:27:44 +0100
Subject: [PATCH 3084/4742] Disable more tests in phantomjs

---
 test/test.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/test.js b/test/test.js
index 4853e6708d..1339e7f553 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2297,15 +2297,15 @@ if (!phantom) {
   testMoveBidi("ٻоҤѕѽΩ־؉ïίքdz\nٵ");
   testMoveBidi("؅؁ĆՕƿɁǞϮؠȩóć\nď");
   testMoveBidi("RŨďңŪzϢŎƏԖڇڦ\nӈ");
+  testMoveBidi("ό׊۷٢ԜһОצЉيčǟ\nѩ");
+  testMoveBidi("ۑÚҳҕڬġڹհяųKV\nr");
+  testMoveBidi("źڻғúہ4ם1Ƞc1a\nԁ");
+  testMoveBidi("ҒȨҟփƞ٦ԓȦڰғâƥ\nڤ");
+  testMoveBidi("ϖسՉȏŧΔԛdžĎӟیڡ\nέ");
+  testMoveBidi("۹ؼL۵ĺȧКԙػא7״\nم");
 }
 
-testMoveBidi("ό׊۷٢ԜһОצЉيčǟ\nѩ");
-testMoveBidi("ۑÚҳҕڬġڹհяųKV\nr");
-testMoveBidi("źڻғúہ4ם1Ƞc1a\nԁ");
-testMoveBidi("ҒȨҟփƞ٦ԓȦڰғâƥ\nڤ");
 testMoveBidi("քմѧǮßپüŢҍҞўڳ\nӧ");
-testMoveBidi("ϖسՉȏŧΔԛdžĎӟیڡ\nέ");
-testMoveBidi("۹ؼL۵ĺȧКԙػא7״\nم");
 
 //testMoveBidi("Count ١ ٢ ٣ ٤");
 //testMoveBidi("ӣאƦϰ؊ȓېÛوը٬ز\nϪ");

From 1cca0b47a4d424f8b1e9f29d1e525474b4768d40 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 26 Jan 2017 10:34:11 +0100
Subject: [PATCH 3085/4742] Fix Home with wrapped rtl content

---
 src/input/movement.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/input/movement.js b/src/input/movement.js
index 95cc50fc90..a3f3eab830 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -17,15 +17,13 @@ export function endOfLine(visually, cm, lineObj, lineNo, dir) {
       // Thus, in rtl, we are looking for the first (content-order) character
       // in the rtl chunk that is on the last line (that is, the same line
       // as the last (content-order) character).
-      if (dir < 0 && part.level > 0) {
+      if (part.level > 0) {
         let getTop = prepareMeasureCharTop(cm, lineObj)
-        ch = lineObj.text.length - 1
+        ch = dir < 0 ? lineObj.text.length - 1 : 0
         let targetTop = getTop(ch)
-        ch = findFirst(ch => getTop(ch) == targetTop, part.from, ch)
-        if (part.level != 1) ch = moveLogically(lineObj, new Pos(lineNo, ch, sticky), 1, true)
-        return new Pos(lineNo, ch, sticky)
-      }
-      ch = (dir < 0 ? bidiRight : bidiLeft)(part)
+        ch = findFirst(ch => getTop(ch) == targetTop, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch)
+        if (sticky == "before") ch = moveLogically(lineObj, new Pos(lineNo, ch, sticky), 1, true)
+      } else ch = (dir < 0 ? bidiRight : bidiLeft)(part)
       return new Pos(lineNo, ch, sticky)
     }
   }

From 1451a186f71dc4c37636d9dc075cf313c06f3592 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 26 Jan 2017 11:28:35 +0100
Subject: [PATCH 3086/4742] Fix moving into the 2nd wrapped line in 1st rtl
 span

---
 src/input/movement.js | 6 +++---
 test/test.js          | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/input/movement.js b/src/input/movement.js
index a3f3eab830..a97aa07458 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -82,7 +82,7 @@ export function moveVisually(cm, line, start, dir) {
       ? new Pos(start.line, mv(ch, 1), "before")
       : new Pos(start.line, ch, "after")
 
-    for (partPos += dir; partPos >= 0 && partPos < bidi.length; partPos += dir) {
+    for (; partPos >= 0 && partPos < bidi.length; partPos += dir) {
       let part = bidi[partPos]
       let moveInStorageOrder = (dir > 0) == (part.level != 1)
       let ch = moveInStorageOrder ? visualLine[0] : visualLine[1]
@@ -93,13 +93,13 @@ export function moveVisually(cm, line, start, dir) {
   }
 
   // Case 3a: Look for other bidi parts on the same visual line
-  let res = searchInVisualLine(partPos, dir, visualLine)
+  let res = searchInVisualLine(partPos + dir, dir, visualLine)
   if (res) return res
 
   // Case 3b: Look for other bidi parts on the next visual line
   let nextCh = mv(visualLine[dir > 0 ? 1 : 0], dir)
   if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) {
-    res = searchInVisualLine(dir > 0 ? 0 : bidi.length, dir, getVisualLine(nextCh))
+    res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getVisualLine(nextCh))
     if (res) return res
   }
 
diff --git a/test/test.js b/test/test.js
index 1339e7f553..633190ac6e 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2306,6 +2306,7 @@ if (!phantom) {
 }
 
 testMoveBidi("քմѧǮßپüŢҍҞўڳ\nӧ");
+testMoveBidi("ن (ي)\u2009أقواس"); // thin space to throw off Firefox 51's broken white-space compressing behavior
 
 //testMoveBidi("Count ١ ٢ ٣ ٤");
 //testMoveBidi("ӣאƦϰ؊ȓېÛوը٬ز\nϪ");

From 6fc751f89b971504cbaec7be83a7f5d3bc8c8455 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 26 Jan 2017 11:39:51 +0100
Subject: [PATCH 3087/4742] Trust and test goLineStart

---
 test/test.js | 74 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/test/test.js b/test/test.js
index 633190ac6e..7f6d5d860a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2232,13 +2232,7 @@ function testMoveBidi(str) {
     }
 
     // Make sure we are at the visual beginning of the first line
-    var pos = Pos(0, 0), lastPos;
-    cm.doc.setCursor(pos);
-    do {
-      lastPos = pos;
-      cm.execCommand("goCharLeft");
-      pos = cm.doc.getCursor();
-    } while (pos != lastPos && pos.ch != 0)
+    cm.execCommand("goLineStart");
 
     var prevCoords = cm.cursorCoords(), coords;
     for(var i = 0; i < steps; ++i) {
@@ -2283,37 +2277,61 @@ function testMoveBidi(str) {
   }, {value: str, lineWrapping: true})
 };
 
+function testMoveEndBidi(str) {
+  testCM("move_end_bidi_" + str, function(cm) {
+    cm.getScrollerElement().style.fontFamily = "monospace";
+    makeItWrapAfter(cm, Pos(0, 5));
+
+    cm.execCommand("goLineStart");
+    var pos = cm.doc.getCursor();
+    cm.execCommand("goCharLeft");
+    eqCursorPos(pos, cm.doc.getCursor());
+
+    cm.execCommand("goLineEnd");
+    pos = cm.doc.getCursor();
+    cm.execCommand("goColumnRight");
+    eqCursorPos(pos, cm.doc.getCursor());
+  }, {value: str, lineWrapping: true})
+};
+
+var bidiTests = [];
+
 // We don't correctly implement L1 UBA
 // See https://bugzilla.mozilla.org/show_bug.cgi?id=1331501
 // and https://bugs.chromium.org/p/chromium/issues/detail?id=673405
 /*
-testMoveBidi("Say ا ب جabj\nS");
-testMoveBidi("Sayyy ا ا ب ج");
+bidiTests.push("Say ا ب جabj\nS");
+bidiTests.push("Sayyy ا ا ب ج");
 */
 
 if (!phantom) {
-  testMoveBidi("Όȝǝڪȉۥ״ۺ׆ɀҩۏ\nҳ");
-  testMoveBidi("ŌӰтقȤ؁ƥ؅٣ĎȺ١\nϚ");
-  testMoveBidi("ٻоҤѕѽΩ־؉ïίքdz\nٵ");
-  testMoveBidi("؅؁ĆՕƿɁǞϮؠȩóć\nď");
-  testMoveBidi("RŨďңŪzϢŎƏԖڇڦ\nӈ");
-  testMoveBidi("ό׊۷٢ԜһОצЉيčǟ\nѩ");
-  testMoveBidi("ۑÚҳҕڬġڹհяųKV\nr");
-  testMoveBidi("źڻғúہ4ם1Ƞc1a\nԁ");
-  testMoveBidi("ҒȨҟփƞ٦ԓȦڰғâƥ\nڤ");
-  testMoveBidi("ϖسՉȏŧΔԛdžĎӟیڡ\nέ");
-  testMoveBidi("۹ؼL۵ĺȧКԙػא7״\nم");
+  bidiTests.push("Όȝǝڪȉۥ״ۺ׆ɀҩۏ\nҳ");
+  bidiTests.push("ŌӰтقȤ؁ƥ؅٣ĎȺ١\nϚ");
+  bidiTests.push("ٻоҤѕѽΩ־؉ïίքdz\nٵ");
+  bidiTests.push("؅؁ĆՕƿɁǞϮؠȩóć\nď");
+  bidiTests.push("RŨďңŪzϢŎƏԖڇڦ\nӈ");
+  bidiTests.push("ό׊۷٢ԜһОצЉيčǟ\nѩ");
+  bidiTests.push("ۑÚҳҕڬġڹհяųKV\nr");
+  bidiTests.push("źڻғúہ4ם1Ƞc1a\nԁ");
+  bidiTests.push("ҒȨҟփƞ٦ԓȦڰғâƥ\nڤ");
+  bidiTests.push("ϖسՉȏŧΔԛdžĎӟیڡ\nέ");
+  bidiTests.push("۹ؼL۵ĺȧКԙػא7״\nم");
 }
 
-testMoveBidi("քմѧǮßپüŢҍҞўڳ\nӧ");
-testMoveBidi("ن (ي)\u2009أقواس"); // thin space to throw off Firefox 51's broken white-space compressing behavior
+bidiTests.push("քմѧǮßپüŢҍҞўڳ\nӧ");
+bidiTests.push("ن (ي)\u2009أقواس"); // thin space to throw off Firefox 51's broken white-space compressing behavior
 
-//testMoveBidi("Count ١ ٢ ٣ ٤");
-//testMoveBidi("ӣאƦϰ؊ȓېÛوը٬ز\nϪ");
-//testMoveBidi("ҾճٳџIՖӻ٥׭֐؜ڏ\nێ");
-//testMoveBidi("ҬÓФ؜ڂį٦Ͽɓڐͳٵ\nՈ");
-//testMoveBidi("aѴNijȻهˇ҃ڱӧǻֵ\na");
-//testMoveBidi(" a٧ا٢ ب جa\nS");
+//bidiTests.push("Count ١ ٢ ٣ ٤");
+//bidiTests.push("ӣאƦϰ؊ȓېÛوը٬ز\nϪ");
+//bidiTests.push("ҾճٳџIՖӻ٥׭֐؜ڏ\nێ");
+//bidiTests.push("ҬÓФ؜ڂį٦Ͽɓڐͳٵ\nՈ");
+//bidiTests.push("aѴNijȻهˇ҃ڱӧǻֵ\na");
+//bidiTests.push(" a٧ا٢ ب جa\nS");
+
+for (var i = 0; i < bidiTests.length; ++i) {
+  testMoveBidi(bidiTests[i]);
+  testMoveEndBidi(bidiTests[i]);
+}
 
 /*
 for (var i = 0; i < 5; ++i) {

From 8a739ddba0860e3a78c2aecf0b4fa16ed6dc899c Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 26 Jan 2017 15:38:27 +0100
Subject: [PATCH 3088/4742] Disable test in phantom that fails on travis

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

diff --git a/test/test.js b/test/test.js
index 7f6d5d860a..93bca15e3a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2316,10 +2316,10 @@ if (!phantom) {
   bidiTests.push("ҒȨҟփƞ٦ԓȦڰғâƥ\nڤ");
   bidiTests.push("ϖسՉȏŧΔԛdžĎӟیڡ\nέ");
   bidiTests.push("۹ؼL۵ĺȧКԙػא7״\nم");
+  bidiTests.push("ن (ي)\u2009أقواس"); // thin space to throw off Firefox 51's broken white-space compressing behavior
 }
 
 bidiTests.push("քմѧǮßپüŢҍҞўڳ\nӧ");
-bidiTests.push("ن (ي)\u2009أقواس"); // thin space to throw off Firefox 51's broken white-space compressing behavior
 
 //bidiTests.push("Count ١ ٢ ٣ ٤");
 //bidiTests.push("ӣאƦϰ؊ȓېÛوը٬ز\nϪ");

From cfc17398a7e6ada1efdb4429227f75577d2c112c Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 31 Jan 2017 13:24:21 +0100
Subject: [PATCH 3089/4742] Greatly improve base-case performance in coordsChar

---
 src/measurement/position_measurement.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 531ab1d737..aa56336367 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -433,14 +433,14 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
   y -= heightAtLine(lineObj)
   let begin = 0, end = lineObj.text.length - 1
   let preparedMeasure = prepareMeasureForLine(cm, lineObj)
-  if (cm.options.lineWrapping) {
-    let measure = ch => intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
-    begin = findFirst(ch => measure(ch).bottom < y, end, begin - 1) + 1
-    end = findFirst(ch => measure(ch).top > y, begin, end + 1) - 1
-  }
   let pos
   let order = getOrder(lineObj)
   if (order) {
+    if (cm.options.lineWrapping) {
+      let measure = ch => intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
+      begin = findFirst(ch => measure(ch).bottom < y, end, begin - 1) + 1
+      end = findFirst(ch => measure(ch).top > y, begin, end + 1) - 1
+    }
     if (end == lineObj.text.length - 1) ++end
     pos = new Pos(lineNo, begin)
     let beginLeft = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left
@@ -461,7 +461,15 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
   } else {
     let ch = findFirst(ch => {
       let box = measureCharPrepared(cm, preparedMeasure, ch)
-      return x - box.right < box.left - x
+      if (box.top > y) {
+        // For the cursor stickiness
+        end = Math.min(ch - 1, end)
+        return true
+      }
+      else if (box.bottom < y) return false
+      else if (box.left > x) return true
+      else if (box.right < x) return false
+      else return (x - box.left < box.right - x)
     }, begin, end + 1)
     while (isExtendingChar(lineObj.text.charAt(ch))) ++ch
     pos = new Pos(lineNo, ch, (ch == end + 1) ? "before" : "after")

From a37da5ccb58e2c751567e73dd9d9da966c5b2419 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 1 Feb 2017 20:31:54 +0100
Subject: [PATCH 3090/4742] Fix failing jumpTheGap on Mac

---
 src/measurement/position_measurement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index aa56336367..dd2ec5497a 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -460,7 +460,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
     if (Math.abs(diff) > Math.abs(prevDiff)) pos = moveVisually(cm, lineObj, pos, -dir)
   } else {
     let ch = findFirst(ch => {
-      let box = measureCharPrepared(cm, preparedMeasure, ch)
+      let box = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
       if (box.top > y) {
         // For the cursor stickiness
         end = Math.min(ch - 1, end)

From 946d2bb76249b6176ef506f44ab032cddcbff1b6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 12:38:33 +0100
Subject: [PATCH 3091/4742] [powershell mode] Remove ES5-ism from tests

---
 mode/powershell/test.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mode/powershell/test.js b/mode/powershell/test.js
index 59b8e6fca9..9c9aed0d5d 100644
--- a/mode/powershell/test.js
+++ b/mode/powershell/test.js
@@ -5,18 +5,20 @@
   var mode = CodeMirror.getMode({indentUnit: 2}, "powershell");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
+  function forEach(arr, f) { for (var i = 0; i < arr.length; i++) f(arr[i], i) }
+
   MT('comment', '[number 1][comment # A]');
   MT('comment_multiline', '[number 1][comment <#]',
     '[comment ABC]',
   '[comment #>][number 2]');
 
-  [
+  forEach([
     '0', '1234',
     '12kb', '12mb', '12Gb', '12Tb', '12PB', '12L', '12D', '12lkb', '12dtb',
     '1.234', '1.234e56', '1.', '1.e2', '.2', '.2e34',
     '1.2MB', '1.kb', '.1dTB', '1.e1gb', '.2', '.2e34',
     '0x1', '0xabcdef', '0x3tb', '0xelmb'
-  ].forEach(function(number) {
+  ], function(number) {
     MT("number_" + number, "[number " + number + "]");
   });
 
@@ -60,9 +62,9 @@
   MT('operator_unary', "[operator +][number 3]");
   MT('operator_long', "[operator -match]");
 
-  [
+  forEach([
     '(', ')', '[[', ']]', '{', '}', ',', '`', ';', '.'
-  ].forEach(function(punctuation) {
+  ], function(punctuation) {
     MT("punctuation_" + punctuation.replace(/^[\[\]]/,''), "[punctuation " + punctuation + "]");
   });
 

From cde6a91246d00f6ed5b938e8376933060b7a91b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 12:56:25 +0100
Subject: [PATCH 3092/4742] Avoid setting a negative width style

Since this raises an exception in IE8
---
 src/display/scrollbars.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index 2026a3b0a1..d03850be0f 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -69,7 +69,7 @@ class NativeScrollbars {
       this.horiz.style.left = measure.barLeft + "px"
       let totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0)
       this.horiz.firstChild.style.width =
-        (measure.scrollWidth - measure.clientWidth + totalWidth) + "px"
+        Math.max(0, measure.scrollWidth - measure.clientWidth + totalWidth) + "px"
     } else {
       this.horiz.style.display = ""
       this.horiz.firstChild.style.width = "0"

From 3357762162b1a352d01ca500695b952303eec74d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 12:57:09 +0100
Subject: [PATCH 3093/4742] Fix some assumptions in tests that don't hold on
 IE8

ES5, breaking up of whitespace tokens
---
 test/index.html |  2 +-
 test/test.js    | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/index.html b/test/index.html
index deeb7781fb..5a0b3d68bf 100644
--- a/test/index.html
+++ b/test/index.html
@@ -222,7 +222,7 @@ <h2>Test Suite</h2>
       function displayTest(type, name, customMessage) {
         var message = "???";
         if (type != "done" && type != "skipped") ++count;
-        progress.style.width = (count * (progress.parentNode.clientWidth - 2) / totalTests) + "px";
+        progress.style.width = (count * (progress.parentNode.clientWidth - 2) / (totalTests || 1)) + "px";
         progressRan.nodeValue = count;
         if (type == "ok") {
           message = "Test '" + name + "' passed";
diff --git a/test/test.js b/test/test.js
index 93bca15e3a..37abdd3fe3 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1017,7 +1017,8 @@ testCM("showEmptyWidgetSpan", function(cm) {
     clearWhenEmpty: false,
     replacedWith: document.createTextNode("X")
   });
-  eq(cm.display.view[0].text.textContent, "abXc");
+  var text = cm.display.view[0].text;
+  eq(text.textContent || text.innerText, "abXc");
 }, {value: "abc"});
 
 testCM("changedInlineWidget", function(cm) {
@@ -1963,8 +1964,8 @@ testCM("lineStyleFromMode", function(cm) {
   is(!/parens.*parens/.test(parenElts[0].className));
   eq(parenElts[0].parentElement.nodeName, "DIV");
 
-  eq(byClassName(cm.getWrapperElement(), "bg").length, 1);
-  eq(byClassName(cm.getWrapperElement(), "line").length, 1);
+  is(byClassName(cm.getWrapperElement(), "bg").length > 0);
+  is(byClassName(cm.getWrapperElement(), "line").length > 0);
   var spanElts = byClassName(cm.getWrapperElement(), "cm-span");
   eq(spanElts.length, 2);
   is(/^\s*cm-span\s*$/.test(spanElts[0].className));
@@ -2218,15 +2219,21 @@ function makeItWrapAfter(cm, pos) {
   }
 }
 
+function countIf(arr, f) {
+  var result = 0
+  for (var i = 0; i < arr.length; i++) if (f[arr[i]]) result++
+  return result
+}
+
 function testMoveBidi(str) {
   testCM("move_bidi_" + str, function(cm) {
     if (cm.getOption("inputStyle") != "textarea" || !cm.getOption("rtlMoveVisually")) return;
     cm.getScrollerElement().style.fontFamily = "monospace";
     makeItWrapAfter(cm, Pos(0, 5));
 
-    var steps = str.length - str.split("").filter(extendingChars.test.bind(extendingChars)).length;
-    var lineBreaks = Object.create(null);
-    lineBreaks[6 - str.substr(0, 5).split("").filter(extendingChars.test.bind(extendingChars)).length] = 'w';
+    var steps = str.length - countIf(str.split(""), function(ch) { return extendingChars.test(ch) });
+    var lineBreaks = {}
+    lineBreaks[6 - countIf(str.substr(0, 5).split(""), function(ch) { return extendingChars.test(ch) })] = 'w';
     if (str.indexOf("\n") != -1) {
       lineBreaks[steps - 2] = 'n';
     }

From a430563a47baa59ed8bd5f15333a49e076617abe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 13:14:25 +0100
Subject: [PATCH 3094/4742] Remove unneccesary local functions in moveOnce

---
 src/edit/methods.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index 18412d31b1..2883909e82 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -475,17 +475,21 @@ function findPosH(doc, pos, dir, unit, visually) {
     return lineObj = getLine(doc, l)
   }
   function moveOnce(boundToLine) {
-    let myMoveVisually = (line, start, dir) => moveVisually(doc.cm, line, start, dir)
-    let myMoveLogically = (line, start, dir) => {
-      let ch = moveLogically(line, start, dir)
-      return ch == null ?  null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
+    let next
+    if (visually) {
+      next = moveVisually(doc.cm, lineObj, pos, dir)
+    } else {
+      let ch = moveLogically(lineObj, pos, dir)
+      next = ch == null ?  null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
     }
-    let next = (visually ? myMoveVisually : myMoveLogically)(lineObj, pos, dir)
     if (next == null) {
-      if (!boundToLine && findNextLine()) {
+      if (!boundToLine && findNextLine())
         pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir)
-      } else return false
-    } else pos = next
+      else
+        return false
+    } else {
+      pos = next
+    }
     return true
   }
 

From 3eba4a5c597525cd490ea62c9316e31ecfb0d126 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 13:32:55 +0100
Subject: [PATCH 3095/4742] Get rid of helper function prepareMeasureCharTop

---
 src/input/movement.js                   | 16 ++++++++--------
 src/measurement/position_measurement.js |  9 ++-------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/input/movement.js b/src/input/movement.js
index a97aa07458..80e8f25854 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -1,5 +1,5 @@
 import { Pos } from "../line/pos"
-import { prepareMeasureCharTop } from "../measurement/position_measurement"
+import { prepareMeasureForLine, measureCharPrepared } from "../measurement/position_measurement"
 import { bidiLeft, bidiRight, getBidiPartAt, getOrder, lineLeft, lineRight, moveLogically } from "../util/bidi"
 import { findFirst } from "../util/misc"
 
@@ -18,10 +18,10 @@ export function endOfLine(visually, cm, lineObj, lineNo, dir) {
       // in the rtl chunk that is on the last line (that is, the same line
       // as the last (content-order) character).
       if (part.level > 0) {
-        let getTop = prepareMeasureCharTop(cm, lineObj)
+        let prep = prepareMeasureForLine(cm, lineObj)
         ch = dir < 0 ? lineObj.text.length - 1 : 0
-        let targetTop = getTop(ch)
-        ch = findFirst(ch => getTop(ch) == targetTop, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch)
+        let targetTop = measureCharPrepared(cm, prep, ch).top
+        ch = findFirst(ch => measureCharPrepared(cm, prep, ch).top == targetTop, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch)
         if (sticky == "before") ch = moveLogically(lineObj, new Pos(lineNo, ch, sticky), 1, true)
       } else ch = (dir < 0 ? bidiRight : bidiLeft)(part)
       return new Pos(lineNo, ch, sticky)
@@ -35,11 +35,11 @@ export function endOfLine(visually, cm, lineObj, lineNo, dir) {
 
 function getVisualLineAround(cm, line, target) {
   if (!cm.options.lineWrapping) return [0, line.text.length - 1]
-  let measureTop = prepareMeasureCharTop(cm, line)
-  let targetTop = measureTop(target)
+  let prep = prepareMeasureForLine(cm, line)
+  let targetTop = measureCharPrepared(cm, prep, target).top
   return [
-    findFirst(ch => targetTop == measureTop(ch), 0, target),
-    findFirst(ch => targetTop == measureTop(ch), line.text.length - 1, target)
+    findFirst(ch => targetTop == measureCharPrepared(cm, prep, ch).top, 0, target),
+    findFirst(ch => targetTop == measureCharPrepared(cm, prep, ch).top, line.text.length - 1, target)
   ]
 }
 
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index dd2ec5497a..10334443fb 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -89,11 +89,6 @@ export function measureChar(cm, line, ch, bias) {
   return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias)
 }
 
-export function prepareMeasureCharTop(cm, line) {
-  let preparedMeasure = prepareMeasureForLine(cm, line)
-  return ch => measureCharPrepared(cm, preparedMeasure, ch).top
-}
-
 // Find a line view that corresponds to the given line number.
 export function findViewForLine(cm, lineN) {
   if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
@@ -108,7 +103,7 @@ export function findViewForLine(cm, lineN) {
 // character. Functions like coordsChar, that need to do a lot of
 // measurements in a row, can thus ensure that the set-up work is
 // only done once.
-function prepareMeasureForLine(cm, line) {
+export function prepareMeasureForLine(cm, line) {
   let lineN = lineNo(line)
   let view = findViewForLine(cm, lineN)
   if (view && !view.text) {
@@ -130,7 +125,7 @@ function prepareMeasureForLine(cm, line) {
 
 // Given a prepared measurement object, measures the position of an
 // actual character (or fetches it from the cache).
-function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
+export function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
   if (prepared.before) ch = -1
   let key = ch + (bias || ""), found
   if (prepared.cache.hasOwnProperty(key)) {

From d4d278b984650b399cc0e653b97c83ce254ddb6d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 13:43:42 +0100
Subject: [PATCH 3096/4742] Factor anon-function-heavy conditional into
 separate function

---
 src/measurement/position_measurement.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 10334443fb..4d24cdf57c 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -424,6 +424,14 @@ export function coordsChar(cm, x, y) {
   }
 }
 
+function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
+  let measure = ch => intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
+  let end = lineObj.text.length - 1
+  let begin = findFirst(ch => measure(ch).bottom < y, end, 0) + 1
+  end = findFirst(ch => measure(ch).top > y, begin, end + 1) - 1
+  return {begin, end}
+}
+
 function coordsCharInner(cm, lineObj, lineNo, x, y) {
   y -= heightAtLine(lineObj)
   let begin = 0, end = lineObj.text.length - 1
@@ -432,9 +440,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
   let order = getOrder(lineObj)
   if (order) {
     if (cm.options.lineWrapping) {
-      let measure = ch => intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
-      begin = findFirst(ch => measure(ch).bottom < y, end, begin - 1) + 1
-      end = findFirst(ch => measure(ch).top > y, begin, end + 1) - 1
+      ;({begin, end} = wrappedLineExtent(cm, lineObj, preparedMeasure, y))
     }
     if (end == lineObj.text.length - 1) ++end
     pos = new Pos(lineNo, begin)

From 4627e849852312a4805c85a47cfb76e74450d758 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 14:04:37 +0100
Subject: [PATCH 3097/4742] Simplify coordsCharInner by making end position
 exclusive

---
 src/measurement/position_measurement.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 4d24cdf57c..cd7bbfe36b 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -426,15 +426,15 @@ export function coordsChar(cm, x, y) {
 
 function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
   let measure = ch => intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
-  let end = lineObj.text.length - 1
-  let begin = findFirst(ch => measure(ch).bottom < y, end, 0) + 1
-  end = findFirst(ch => measure(ch).top > y, begin, end + 1) - 1
+  let end = lineObj.text.length
+  let begin = findFirst(ch => measure(ch).bottom < y, end - 1, 0) + 1
+  end = findFirst(ch => measure(ch).top > y, begin, end)
   return {begin, end}
 }
 
 function coordsCharInner(cm, lineObj, lineNo, x, y) {
   y -= heightAtLine(lineObj)
-  let begin = 0, end = lineObj.text.length - 1
+  let begin = 0, end = lineObj.text.length
   let preparedMeasure = prepareMeasureForLine(cm, lineObj)
   let pos
   let order = getOrder(lineObj)
@@ -442,7 +442,6 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
     if (cm.options.lineWrapping) {
       ;({begin, end} = wrappedLineExtent(cm, lineObj, preparedMeasure, y))
     }
-    if (end == lineObj.text.length - 1) ++end
     pos = new Pos(lineNo, begin)
     let beginLeft = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left
     let dir = beginLeft < x ? 1 : -1
@@ -451,7 +450,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
       prevDiff = diff
       let prevPos = pos
       pos = moveVisually(cm, lineObj, pos, dir)
-      if (pos == null || pos.ch < begin || end < pos.ch) {
+      if (pos == null || pos.ch < begin || end <= pos.ch) {
         pos = prevPos
         break
       }
@@ -464,16 +463,16 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
       let box = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
       if (box.top > y) {
         // For the cursor stickiness
-        end = Math.min(ch - 1, end)
+        end = Math.min(ch, end)
         return true
       }
       else if (box.bottom < y) return false
       else if (box.left > x) return true
       else if (box.right < x) return false
       else return (x - box.left < box.right - x)
-    }, begin, end + 1)
+    }, begin, end)
     while (isExtendingChar(lineObj.text.charAt(ch))) ++ch
-    pos = new Pos(lineNo, ch, (ch == end + 1) ? "before" : "after")
+    pos = new Pos(lineNo, ch, ch == end ? "before" : "after")
   }
   let coords = cursorCoords(cm, pos, "line", lineObj, preparedMeasure)
   if (y < coords.top || coords.bottom < y) pos.outside = true

From cdc7b716f24339ec0011e64fcb2da5a029ab55e9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 14:14:16 +0100
Subject: [PATCH 3098/4742] Use ES6 classes for Selection and Range

---
 src/model/selection.js | 46 ++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/model/selection.js b/src/model/selection.js
index a47ede93fa..97084fbc15 100644
--- a/src/model/selection.js
+++ b/src/model/selection.js
@@ -6,14 +6,15 @@ import { indexOf } from "../util/misc"
 // (and non-touching) ranges, sorted, and an integer that indicates
 // which one is the primary selection (the one that's scrolled into
 // view, that getCursor returns, etc).
-export function Selection(ranges, primIndex) {
-  this.ranges = ranges
-  this.primIndex = primIndex
-}
+export class Selection {
+  constructor(ranges, primIndex) {
+    this.ranges = ranges
+    this.primIndex = primIndex
+  }
+
+  primary() { return this.ranges[this.primIndex] }
 
-Selection.prototype = {
-  primary: function() { return this.ranges[this.primIndex] },
-  equals: function(other) {
+  equals(other) {
     if (other == this) return true
     if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false
     for (let i = 0; i < this.ranges.length; i++) {
@@ -21,19 +22,22 @@ Selection.prototype = {
       if (!equalCursorPos(here.anchor, there.anchor) || !equalCursorPos(here.head, there.head)) return false
     }
     return true
-  },
-  deepCopy: function() {
+  }
+
+  deepCopy() {
     let out = []
     for (let i = 0; i < this.ranges.length; i++)
       out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head))
     return new Selection(out, this.primIndex)
-  },
-  somethingSelected: function() {
+  }
+
+  somethingSelected() {
     for (let i = 0; i < this.ranges.length; i++)
       if (!this.ranges[i].empty()) return true
     return false
-  },
-  contains: function(pos, end) {
+  }
+
+  contains(pos, end) {
     if (!end) end = pos
     for (let i = 0; i < this.ranges.length; i++) {
       let range = this.ranges[i]
@@ -44,16 +48,14 @@ Selection.prototype = {
   }
 }
 
-export function Range(anchor, head) {
-  this.anchor = anchor; this.head = head
-}
-
-Range.prototype = {
-  from: function() { return minPos(this.anchor, this.head) },
-  to: function() { return maxPos(this.anchor, this.head) },
-  empty: function() {
-    return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch
+export class Range {
+  constructor(anchor, head) {
+    this.anchor = anchor; this.head = head
   }
+
+  from() { return minPos(this.anchor, this.head) }
+  to() { return maxPos(this.anchor, this.head) }
+  empty() { return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch }
 }
 
 // Take an unsorted, potentially overlapping set of ranges, and

From 7dad9d59fa95e3a9ee9864863762b0a131d6d55f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 14:22:50 +0100
Subject: [PATCH 3099/4742] Use ES6 classes for BranchChunk and LeafChunk

---
 src/model/chunk.js | 89 +++++++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/src/model/chunk.js b/src/model/chunk.js
index 2a05d7c545..3879da293d 100644
--- a/src/model/chunk.js
+++ b/src/model/chunk.js
@@ -15,21 +15,22 @@ import { signalLater } from "../util/operation_group"
 //
 // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
 
-export function LeafChunk(lines) {
-  this.lines = lines
-  this.parent = null
-  let height = 0
-  for (let i = 0; i < lines.length; ++i) {
-    lines[i].parent = this
-    height += lines[i].height
+export class LeafChunk {
+  constructor(lines) {
+    this.lines = lines
+    this.parent = null
+    let height = 0
+    for (let i = 0; i < lines.length; ++i) {
+      lines[i].parent = this
+      height += lines[i].height
+    }
+    this.height = height
   }
-  this.height = height
-}
 
-LeafChunk.prototype = {
-  chunkSize: function() { return this.lines.length },
+  chunkSize() { return this.lines.length }
+
   // Remove the n lines at offset 'at'.
-  removeInner: function(at, n) {
+  removeInner(at, n) {
     for (let i = at, e = at + n; i < e; ++i) {
       let line = this.lines[i]
       this.height -= line.height
@@ -37,41 +38,45 @@ LeafChunk.prototype = {
       signalLater(line, "delete")
     }
     this.lines.splice(at, n)
-  },
+  }
+
   // Helper used to collapse a small branch into a single leaf.
-  collapse: function(lines) {
+  collapse(lines) {
     lines.push.apply(lines, this.lines)
-  },
+  }
+
   // Insert the given array of lines at offset 'at', count them as
   // having the given height.
-  insertInner: function(at, lines, height) {
+  insertInner(at, lines, height) {
     this.height += height
     this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at))
     for (let i = 0; i < lines.length; ++i) lines[i].parent = this
-  },
+  }
+
   // Used to iterate over a part of the tree.
-  iterN: function(at, n, op) {
+  iterN(at, n, op) {
     for (let e = at + n; at < e; ++at)
       if (op(this.lines[at])) return true
   }
 }
 
-export function BranchChunk(children) {
-  this.children = children
-  let size = 0, height = 0
-  for (let i = 0; i < children.length; ++i) {
-    let ch = children[i]
-    size += ch.chunkSize(); height += ch.height
-    ch.parent = this
+export class BranchChunk {
+  constructor(children) {
+    this.children = children
+    let size = 0, height = 0
+    for (let i = 0; i < children.length; ++i) {
+      let ch = children[i]
+      size += ch.chunkSize(); height += ch.height
+      ch.parent = this
+    }
+    this.size = size
+    this.height = height
+    this.parent = null
   }
-  this.size = size
-  this.height = height
-  this.parent = null
-}
 
-BranchChunk.prototype = {
-  chunkSize: function() { return this.size },
-  removeInner: function(at, n) {
+  chunkSize() { return this.size }
+
+  removeInner(at, n) {
     this.size -= n
     for (let i = 0; i < this.children.length; ++i) {
       let child = this.children[i], sz = child.chunkSize()
@@ -93,11 +98,13 @@ BranchChunk.prototype = {
       this.children = [new LeafChunk(lines)]
       this.children[0].parent = this
     }
-  },
-  collapse: function(lines) {
+  }
+
+  collapse(lines) {
     for (let i = 0; i < this.children.length; ++i) this.children[i].collapse(lines)
-  },
-  insertInner: function(at, lines, height) {
+  }
+
+  insertInner(at, lines, height) {
     this.size += lines.length
     this.height += height
     for (let i = 0; i < this.children.length; ++i) {
@@ -121,9 +128,10 @@ BranchChunk.prototype = {
       }
       at -= sz
     }
-  },
+  }
+
   // When a node has grown, check whether it should be split.
-  maybeSpill: function() {
+  maybeSpill() {
     if (this.children.length <= 10) return
     let me = this
     do {
@@ -143,8 +151,9 @@ BranchChunk.prototype = {
       sibling.parent = me.parent
     } while (me.children.length > 10)
     me.parent.maybeSpill()
-  },
-  iterN: function(at, n, op) {
+  }
+
+  iterN(at, n, op) {
     for (let i = 0; i < this.children.length; ++i) {
       let child = this.children[i], sz = child.chunkSize()
       if (at < sz) {

From eba994a1385012ca47f36ac9d33e4044fb42d50d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 14:26:03 +0100
Subject: [PATCH 3100/4742] Use an ES6 class for StringStream

---
 src/util/StringStream.js | 62 ++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/util/StringStream.js b/src/util/StringStream.js
index 92dbc69062..0f7af07ca1 100644
--- a/src/util/StringStream.js
+++ b/src/util/StringStream.js
@@ -5,57 +5,57 @@ import { countColumn } from "./misc"
 // Fed to the mode parsers, provides helper functions to make
 // parsers more succinct.
 
-let StringStream = function(string, tabSize) {
-  this.pos = this.start = 0
-  this.string = string
-  this.tabSize = tabSize || 8
-  this.lastColumnPos = this.lastColumnValue = 0
-  this.lineStart = 0
-}
+class StringStream {
+  constructor(string, tabSize) {
+    this.pos = this.start = 0
+    this.string = string
+    this.tabSize = tabSize || 8
+    this.lastColumnPos = this.lastColumnValue = 0
+    this.lineStart = 0
+  }
 
-StringStream.prototype = {
-  eol: function() {return this.pos >= this.string.length},
-  sol: function() {return this.pos == this.lineStart},
-  peek: function() {return this.string.charAt(this.pos) || undefined},
-  next: function() {
+  eol() {return this.pos >= this.string.length}
+  sol() {return this.pos == this.lineStart}
+  peek() {return this.string.charAt(this.pos) || undefined}
+  next() {
     if (this.pos < this.string.length)
       return this.string.charAt(this.pos++)
-  },
-  eat: function(match) {
+  }
+  eat(match) {
     let ch = this.string.charAt(this.pos)
     let ok
     if (typeof match == "string") ok = ch == match
     else ok = ch && (match.test ? match.test(ch) : match(ch))
     if (ok) {++this.pos; return ch}
-  },
-  eatWhile: function(match) {
+  }
+  eatWhile(match) {
     let start = this.pos
     while (this.eat(match)){}
     return this.pos > start
-  },
-  eatSpace: function() {
+  }
+  eatSpace() {
     let start = this.pos
     while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos
     return this.pos > start
-  },
-  skipToEnd: function() {this.pos = this.string.length},
-  skipTo: function(ch) {
+  }
+  skipToEnd() {this.pos = this.string.length}
+  skipTo(ch) {
     let found = this.string.indexOf(ch, this.pos)
     if (found > -1) {this.pos = found; return true}
-  },
-  backUp: function(n) {this.pos -= n},
-  column: function() {
+  }
+  backUp(n) {this.pos -= n}
+  column() {
     if (this.lastColumnPos < this.start) {
       this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue)
       this.lastColumnPos = this.start
     }
     return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
-  },
-  indentation: function() {
+  }
+  indentation() {
     return countColumn(this.string, null, this.tabSize) -
       (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0)
-  },
-  match: function(pattern, consume, caseInsensitive) {
+  }
+  match(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
       let cased = str => caseInsensitive ? str.toLowerCase() : str
       let substr = this.string.substr(this.pos, pattern.length)
@@ -69,9 +69,9 @@ StringStream.prototype = {
       if (match && consume !== false) this.pos += match[0].length
       return match
     }
-  },
-  current: function(){return this.string.slice(this.start, this.pos)},
-  hideFirstChars: function(n, inner) {
+  }
+  current(){return this.string.slice(this.start, this.pos)}
+  hideFirstChars(n, inner) {
     this.lineStart += n
     try { return inner() }
     finally { this.lineStart -= n }

From 6ce369c7be197080112693bb1f0e9db1ea600556 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 14:31:17 +0100
Subject: [PATCH 3101/4742] Use ES6 classes for text markers and line objects

---
 src/line/line_data.js    |  13 ++-
 src/model/line_widget.js |  61 +++++-----
 src/model/mark_text.js   | 234 ++++++++++++++++++++-------------------
 src/util/misc.js         |  10 +-
 4 files changed, 166 insertions(+), 152 deletions(-)

diff --git a/src/line/line_data.js b/src/line/line_data.js
index 7583c3424e..552c56b152 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -13,13 +13,16 @@ import { getLine, lineNo, updateLineHeight } from "./utils_line"
 
 // Line objects. These hold state related to a line, including
 // highlighting info (the styles array).
-export function Line(text, markedSpans, estimateHeight) {
-  this.text = text
-  attachMarkedSpans(this, markedSpans)
-  this.height = estimateHeight ? estimateHeight(this) : 1
+export class Line {
+  constructor(text, markedSpans, estimateHeight) {
+    this.text = text
+    attachMarkedSpans(this, markedSpans)
+    this.height = estimateHeight ? estimateHeight(this) : 1
+  }
+
+  lineNo() { return lineNo(this) }
 }
 eventMixin(Line)
-Line.prototype.lineNo = function() { return lineNo(this) }
 
 // Change the content (text, markers) of a line. Automatically
 // invalidates cached information and tries to re-estimate the
diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index e832e8c483..5854e43df7 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -9,11 +9,38 @@ import { eventMixin } from "../util/event"
 
 // Line widgets are block elements displayed above or below a line.
 
-export function LineWidget(doc, node, options) {
-  if (options) for (let opt in options) if (options.hasOwnProperty(opt))
-    this[opt] = options[opt]
-  this.doc = doc
-  this.node = node
+export class LineWidget {
+  constructor(doc, node, options) {
+    if (options) for (let opt in options) if (options.hasOwnProperty(opt))
+      this[opt] = options[opt]
+    this.doc = doc
+    this.node = node
+  }
+
+  clear() {
+    let cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line)
+    if (no == null || !ws) return
+    for (let i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1)
+    if (!ws.length) line.widgets = null
+    let height = widgetHeight(this)
+    updateLineHeight(line, Math.max(0, line.height - height))
+    if (cm) runInOp(cm, () => {
+      adjustScrollWhenAboveVisible(cm, line, -height)
+      regLineChange(cm, no, "widget")
+    })
+  }
+
+  changed() {
+    let oldH = this.height, cm = this.doc.cm, line = this.line
+    this.height = null
+    let diff = widgetHeight(this) - oldH
+    if (!diff) return
+    updateLineHeight(line, line.height + diff)
+    if (cm) runInOp(cm, () => {
+      cm.curOp.forceUpdate = true
+      adjustScrollWhenAboveVisible(cm, line, diff)
+    })
+  }
 }
 eventMixin(LineWidget)
 
@@ -22,30 +49,6 @@ function adjustScrollWhenAboveVisible(cm, line, diff) {
     addToScrollPos(cm, null, diff)
 }
 
-LineWidget.prototype.clear = function() {
-  let cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line)
-  if (no == null || !ws) return
-  for (let i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1)
-  if (!ws.length) line.widgets = null
-  let height = widgetHeight(this)
-  updateLineHeight(line, Math.max(0, line.height - height))
-  if (cm) runInOp(cm, () => {
-    adjustScrollWhenAboveVisible(cm, line, -height)
-    regLineChange(cm, no, "widget")
-  })
-}
-LineWidget.prototype.changed = function() {
-  let oldH = this.height, cm = this.doc.cm, line = this.line
-  this.height = null
-  let diff = widgetHeight(this) - oldH
-  if (!diff) return
-  updateLineHeight(line, line.height + diff)
-  if (cm) runInOp(cm, () => {
-    cm.curOp.forceUpdate = true
-    adjustScrollWhenAboveVisible(cm, line, diff)
-  })
-}
-
 export function addLineWidget(doc, handle, node, options) {
   let widget = new LineWidget(doc, node, options)
   let cm = doc.cm
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index 15ec28498f..2e8ecf77bd 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -32,118 +32,121 @@ import { reCheckSelection } from "./selection_updates"
 // when they overlap (they may nest, but not partially overlap).
 let nextMarkerId = 0
 
-export function TextMarker(doc, type) {
-  this.lines = []
-  this.type = type
-  this.doc = doc
-  this.id = ++nextMarkerId
-}
-eventMixin(TextMarker)
-
-// Clear the marker.
-TextMarker.prototype.clear = function() {
-  if (this.explicitlyCleared) return
-  let cm = this.doc.cm, withOp = cm && !cm.curOp
-  if (withOp) startOperation(cm)
-  if (hasHandler(this, "clear")) {
-    let found = this.find()
-    if (found) signalLater(this, "clear", found.from, found.to)
+export class TextMarker {
+  constructor(doc, type) {
+    this.lines = []
+    this.type = type
+    this.doc = doc
+    this.id = ++nextMarkerId
   }
-  let min = null, max = null
-  for (let i = 0; i < this.lines.length; ++i) {
-    let line = this.lines[i]
-    let span = getMarkedSpanFor(line.markedSpans, this)
-    if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text")
-    else if (cm) {
-      if (span.to != null) max = lineNo(line)
-      if (span.from != null) min = lineNo(line)
+
+  // Clear the marker.
+  clear() {
+    if (this.explicitlyCleared) return
+    let cm = this.doc.cm, withOp = cm && !cm.curOp
+    if (withOp) startOperation(cm)
+    if (hasHandler(this, "clear")) {
+      let found = this.find()
+      if (found) signalLater(this, "clear", found.from, found.to)
     }
-    line.markedSpans = removeMarkedSpan(line.markedSpans, span)
-    if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
-      updateLineHeight(line, textHeight(cm.display))
+    let min = null, max = null
+    for (let i = 0; i < this.lines.length; ++i) {
+      let line = this.lines[i]
+      let span = getMarkedSpanFor(line.markedSpans, this)
+      if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text")
+      else if (cm) {
+        if (span.to != null) max = lineNo(line)
+        if (span.from != null) min = lineNo(line)
+      }
+      line.markedSpans = removeMarkedSpan(line.markedSpans, span)
+      if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
+        updateLineHeight(line, textHeight(cm.display))
+    }
+    if (cm && this.collapsed && !cm.options.lineWrapping) for (let i = 0; i < this.lines.length; ++i) {
+      let visual = visualLine(this.lines[i]), len = lineLength(visual)
+      if (len > cm.display.maxLineLength) {
+        cm.display.maxLine = visual
+        cm.display.maxLineLength = len
+        cm.display.maxLineChanged = true
+      }
+    }
+
+    if (min != null && cm && this.collapsed) regChange(cm, min, max + 1)
+    this.lines.length = 0
+    this.explicitlyCleared = true
+    if (this.atomic && this.doc.cantEdit) {
+      this.doc.cantEdit = false
+      if (cm) reCheckSelection(cm.doc)
+    }
+    if (cm) signalLater(cm, "markerCleared", cm, this)
+    if (withOp) endOperation(cm)
+    if (this.parent) this.parent.clear()
   }
-  if (cm && this.collapsed && !cm.options.lineWrapping) for (let i = 0; i < this.lines.length; ++i) {
-    let visual = visualLine(this.lines[i]), len = lineLength(visual)
-    if (len > cm.display.maxLineLength) {
-      cm.display.maxLine = visual
-      cm.display.maxLineLength = len
-      cm.display.maxLineChanged = true
+
+  // Find the position of the marker in the document. Returns a {from,
+  // to} object by default. Side can be passed to get a specific side
+  // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
+  // Pos objects returned contain a line object, rather than a line
+  // number (used to prevent looking up the same line twice).
+  find(side, lineObj) {
+    if (side == null && this.type == "bookmark") side = 1
+    let from, to
+    for (let i = 0; i < this.lines.length; ++i) {
+      let line = this.lines[i]
+      let span = getMarkedSpanFor(line.markedSpans, this)
+      if (span.from != null) {
+        from = Pos(lineObj ? line : lineNo(line), span.from)
+        if (side == -1) return from
+      }
+      if (span.to != null) {
+        to = Pos(lineObj ? line : lineNo(line), span.to)
+        if (side == 1) return to
+      }
     }
+    return from && {from: from, to: to}
   }
 
-  if (min != null && cm && this.collapsed) regChange(cm, min, max + 1)
-  this.lines.length = 0
-  this.explicitlyCleared = true
-  if (this.atomic && this.doc.cantEdit) {
-    this.doc.cantEdit = false
-    if (cm) reCheckSelection(cm.doc)
+  // Signals that the marker's widget changed, and surrounding layout
+  // should be recomputed.
+  changed() {
+    let pos = this.find(-1, true), widget = this, cm = this.doc.cm
+    if (!pos || !cm) return
+    runInOp(cm, () => {
+      let line = pos.line, lineN = lineNo(pos.line)
+      let view = findViewForLine(cm, lineN)
+      if (view) {
+        clearLineMeasurementCacheFor(view)
+        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true
+      }
+      cm.curOp.updateMaxLine = true
+      if (!lineIsHidden(widget.doc, line) && widget.height != null) {
+        let oldHeight = widget.height
+        widget.height = null
+        let dHeight = widgetHeight(widget) - oldHeight
+        if (dHeight)
+          updateLineHeight(line, line.height + dHeight)
+      }
+    })
   }
-  if (cm) signalLater(cm, "markerCleared", cm, this)
-  if (withOp) endOperation(cm)
-  if (this.parent) this.parent.clear()
-}
 
-// Find the position of the marker in the document. Returns a {from,
-// to} object by default. Side can be passed to get a specific side
-// -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
-// Pos objects returned contain a line object, rather than a line
-// number (used to prevent looking up the same line twice).
-TextMarker.prototype.find = function(side, lineObj) {
-  if (side == null && this.type == "bookmark") side = 1
-  let from, to
-  for (let i = 0; i < this.lines.length; ++i) {
-    let line = this.lines[i]
-    let span = getMarkedSpanFor(line.markedSpans, this)
-    if (span.from != null) {
-      from = Pos(lineObj ? line : lineNo(line), span.from)
-      if (side == -1) return from
-    }
-    if (span.to != null) {
-      to = Pos(lineObj ? line : lineNo(line), span.to)
-      if (side == 1) return to
+  attachLine(line) {
+    if (!this.lines.length && this.doc.cm) {
+      let op = this.doc.cm.curOp
+      if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
+        (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this)
     }
+    this.lines.push(line)
   }
-  return from && {from: from, to: to}
-}
 
-// Signals that the marker's widget changed, and surrounding layout
-// should be recomputed.
-TextMarker.prototype.changed = function() {
-  let pos = this.find(-1, true), widget = this, cm = this.doc.cm
-  if (!pos || !cm) return
-  runInOp(cm, () => {
-    let line = pos.line, lineN = lineNo(pos.line)
-    let view = findViewForLine(cm, lineN)
-    if (view) {
-      clearLineMeasurementCacheFor(view)
-      cm.curOp.selectionChanged = cm.curOp.forceUpdate = true
-    }
-    cm.curOp.updateMaxLine = true
-    if (!lineIsHidden(widget.doc, line) && widget.height != null) {
-      let oldHeight = widget.height
-      widget.height = null
-      let dHeight = widgetHeight(widget) - oldHeight
-      if (dHeight)
-        updateLineHeight(line, line.height + dHeight)
+  detachLine(line) {
+    this.lines.splice(indexOf(this.lines, line), 1)
+    if (!this.lines.length && this.doc.cm) {
+      let op = this.doc.cm.curOp
+      ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this)
     }
-  })
-}
-
-TextMarker.prototype.attachLine = function(line) {
-  if (!this.lines.length && this.doc.cm) {
-    let op = this.doc.cm.curOp
-    if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
-      (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this)
-  }
-  this.lines.push(line)
-}
-TextMarker.prototype.detachLine = function(line) {
-  this.lines.splice(indexOf(this.lines, line), 1)
-  if (!this.lines.length && this.doc.cm) {
-    let op = this.doc.cm.curOp
-    ;(op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this)
   }
 }
+eventMixin(TextMarker)
 
 // Create a marker, wire it up to the right lines, and
 export function markText(doc, from, to, options, type) {
@@ -221,24 +224,27 @@ export function markText(doc, from, to, options, type) {
 // A shared marker spans multiple linked documents. It is
 // implemented as a meta-marker-object controlling multiple normal
 // markers.
-export function SharedTextMarker(markers, primary) {
-  this.markers = markers
-  this.primary = primary
-  for (let i = 0; i < markers.length; ++i)
-    markers[i].parent = this
-}
-eventMixin(SharedTextMarker)
+export class SharedTextMarker {
+  constructor(markers, primary) {
+    this.markers = markers
+    this.primary = primary
+    for (let i = 0; i < markers.length; ++i)
+      markers[i].parent = this
+  }
 
-SharedTextMarker.prototype.clear = function() {
-  if (this.explicitlyCleared) return
-  this.explicitlyCleared = true
-  for (let i = 0; i < this.markers.length; ++i)
-    this.markers[i].clear()
-  signalLater(this, "clear")
-}
-SharedTextMarker.prototype.find = function(side, lineObj) {
-  return this.primary.find(side, lineObj)
+  clear() {
+    if (this.explicitlyCleared) return
+    this.explicitlyCleared = true
+    for (let i = 0; i < this.markers.length; ++i)
+      this.markers[i].clear()
+    signalLater(this, "clear")
+  }
+
+  find(side, lineObj) {
+    return this.primary.find(side, lineObj)
+  }
 }
+eventMixin(SharedTextMarker)
 
 function markTextShared(doc, from, to, options, type) {
   options = copyObj(options)
diff --git a/src/util/misc.js b/src/util/misc.js
index dead8a6daf..097eb050c6 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -28,10 +28,12 @@ export function countColumn(string, end, tabSize, startIndex, startValue) {
   }
 }
 
-export function Delayed() {this.id = null}
-Delayed.prototype.set = function(ms, f) {
-  clearTimeout(this.id)
-  this.id = setTimeout(f, ms)
+export class Delayed {
+  constructor() {this.id = null}
+  set(ms, f) {
+    clearTimeout(this.id)
+    this.id = setTimeout(f, ms)
+  }
 }
 
 export function indexOf(array, elt) {

From 223a43cd60968fe468835b61166a196c70607020 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Feb 2017 22:45:45 +0100
Subject: [PATCH 3102/4742] [continuelist addon] Don't clear quote characters
 on enter

Closes #4526
---
 addon/edit/continuelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 6574ea335e..5a845907d7 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -30,7 +30,7 @@
         return;
       }
       if (emptyListRE.test(line)) {
-        cm.replaceRange("", {
+        if (!/>\s*$/.test(line)) cm.replaceRange("", {
           line: pos.line, ch: 0
         }, {
           line: pos.line, ch: pos.ch + 1

From 234391388748eae5b00b941ed696c7763792d9a9 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 3 Feb 2017 11:00:03 +0100
Subject: [PATCH 3103/4742] Remove unused variable and duplicate white space

---
 src/edit/methods.js | 2 +-
 test/test.js        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index 2883909e82..e58a3b25b3 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -480,7 +480,7 @@ function findPosH(doc, pos, dir, unit, visually) {
       next = moveVisually(doc.cm, lineObj, pos, dir)
     } else {
       let ch = moveLogically(lineObj, pos, dir)
-      next = ch == null ?  null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
+      next = ch == null ? null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
     }
     if (next == null) {
       if (!boundToLine && findNextLine())
diff --git a/test/test.js b/test/test.js
index 37abdd3fe3..ab23757d0f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -34,7 +34,6 @@ var opera = /Opera\/\./.test(navigator.userAgent);
 var opera_version = opera && navigator.userAgent.match(/Version\/(\d+\.\d+)/);
 if (opera_version) opera_version = Number(opera_version);
 var opera_lt10 = opera && (!opera_version || opera_version < 10);
-var webkit = /WebKit\//.test(navigator.userAgent);
 
 namespace = "core_";
 

From ff84b9ee73b75851801bc4004b75e35fea6291cb Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 26 Dec 2016 10:59:03 +0100
Subject: [PATCH 3104/4742] Move moveLogically to input/movement

---
 src/edit/methods.js                     |  6 ++--
 src/input/movement.js                   | 38 ++++++++++++++-----------
 src/measurement/position_measurement.js |  4 +--
 src/util/bidi.js                        | 28 ++----------------
 src/util/misc.js                        |  6 ++++
 5 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index e58a3b25b3..6d69cfc250 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -8,7 +8,7 @@ import { indentLine } from "../input/indent"
 import { triggerElectric } from "../input/input"
 import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
 import { getKeyMap } from "../input/keymap"
-import { endOfLine, moveVisually } from "../input/movement"
+import { endOfLine, moveLogically, moveVisually } from "../input/movement"
 import { methodOp, operation, runInOp } from "../display/operations"
 import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos"
 import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
@@ -17,7 +17,6 @@ import { replaceOneSelection, skipAtomic } from "../model/selection_updates"
 import { addToScrollPos, calculateScrollPos, ensureCursorVisible, resolveScrollToPos, scrollIntoView } from "../display/scrolling"
 import { heightAtLine } from "../line/spans"
 import { updateGutterSpace } from "../display/update_display"
-import { moveLogically } from "../util/bidi"
 import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
 import { signalLater } from "../util/operation_group"
 import { getLine, isLine, lineAtHeight } from "../line/utils_line"
@@ -479,8 +478,7 @@ function findPosH(doc, pos, dir, unit, visually) {
     if (visually) {
       next = moveVisually(doc.cm, lineObj, pos, dir)
     } else {
-      let ch = moveLogically(lineObj, pos, dir)
-      next = ch == null ? null : new Pos(pos.line, ch, dir < 0 ? "after" : "before")
+      next = moveLogically(lineObj, pos, dir)
     }
     if (next == null) {
       if (!boundToLine && findNextLine())
diff --git a/src/input/movement.js b/src/input/movement.js
index 80e8f25854..ebb1bdf239 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -1,16 +1,26 @@
 import { Pos } from "../line/pos"
 import { prepareMeasureForLine, measureCharPrepared } from "../measurement/position_measurement"
-import { bidiLeft, bidiRight, getBidiPartAt, getOrder, lineLeft, lineRight, moveLogically } from "../util/bidi"
-import { findFirst } from "../util/misc"
+import { getBidiPartAt, getOrder } from "../util/bidi"
+import { findFirst, lst, skipExtendingChars } from "../util/misc"
+
+function moveCharLogically(line, ch, dir) {
+  let target = skipExtendingChars(line.text, ch + dir, dir)
+  return target < 0 || target > line.text.length ? null : target
+}
+
+export function moveLogically(line, start, dir) {
+  let ch = moveCharLogically(line, start.ch, dir)
+  return ch == null ? null : new Pos(start.line, ch, dir < 0 ? "after" : "before")
+}
 
 export function endOfLine(visually, cm, lineObj, lineNo, dir) {
-  let ch
   if (visually) {
     let order = getOrder(lineObj)
     if (order) {
-      let i = dir < 0 ? order.length - 1 : 0
-      let part = order[i]
-      let sticky = (dir < 0) != (part.level == 1) ? "before" : "after"
+      let part = dir < 0 ? lst(order) : order[0]
+      let moveInStorageOrder = (dir < 0) == (part.level == 1)
+      let sticky = moveInStorageOrder ? "after" : "before"
+      let ch
       // With a wrapped rtl chunk (possibly spanning multiple bidi parts),
       // it could be that the last bidi part is not on the last visual line,
       // since visual lines contain content order-consecutive chunks.
@@ -22,15 +32,12 @@ export function endOfLine(visually, cm, lineObj, lineNo, dir) {
         ch = dir < 0 ? lineObj.text.length - 1 : 0
         let targetTop = measureCharPrepared(cm, prep, ch).top
         ch = findFirst(ch => measureCharPrepared(cm, prep, ch).top == targetTop, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch)
-        if (sticky == "before") ch = moveLogically(lineObj, new Pos(lineNo, ch, sticky), 1, true)
-      } else ch = (dir < 0 ? bidiRight : bidiLeft)(part)
+        if (sticky == "before") ch = moveCharLogically(lineObj, ch, 1, true)
+      } else ch = dir < 0 ? part.to : part.from
       return new Pos(lineNo, ch, sticky)
     }
   }
-  let sticky = dir < 0 ? "before" : "after"
-  if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj)
-  else ch = dir < 0 ? lineObj.text.length : 0
-  return new Pos(lineNo, ch, sticky)
+  return new Pos(lineNo, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after")
 }
 
 function getVisualLineAround(cm, line, target) {
@@ -44,10 +51,8 @@ function getVisualLineAround(cm, line, target) {
 }
 
 export function moveVisually(cm, line, start, dir) {
-  let mkPos = (ch, sticky) => ch == null ? null : new Pos(start.line, ch, sticky)
-  let mv = (pos, dir) => moveLogically(line, pos instanceof Pos ? pos : new Pos(start.line, pos), dir)
   let bidi = getOrder(line)
-  if (!bidi) return mkPos(mv(start, dir), dir < 0 ? "after" : "before")
+  if (!bidi) return moveLogically(line, start, dir)
   if (start.ch >= line.text.length) {
     start.ch = line.text.length
     start.sticky = "before"
@@ -59,9 +64,10 @@ export function moveVisually(cm, line, start, dir) {
   if (part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) {
     // Case 1: We move within an ltr part. Even with wrapped lines,
     // nothing interesting happens.
-    return mkPos(mv(start, dir), dir < 0 ? "after" : "before")
+    return moveLogically(line, start, dir)
   }
 
+  let mv = (pos, dir) => moveCharLogically(line, pos instanceof Pos ? pos.ch : pos, dir)
   let getVisualLine = ch => getVisualLineAround(cm, line, ch)
   let visualLine = getVisualLine(start.sticky == "before" ? mv(start, -1) : start.ch)
 
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index cd7bbfe36b..4d2754b950 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -8,7 +8,7 @@ import { ie, ie_version } from "../util/browser"
 import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom"
 import { e_target } from "../util/event"
 import { hasBadZoomedRects } from "../util/feature_detection"
-import { countColumn, findFirst, isExtendingChar, scrollerGap } from "../util/misc"
+import { countColumn, findFirst, isExtendingChar, scrollerGap, skipExtendingChars } from "../util/misc"
 import { updateLineForChanges } from "../display/update_line"
 
 import { widgetHeight } from "./widgets"
@@ -471,7 +471,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
       else if (box.right < x) return false
       else return (x - box.left < box.right - x)
     }, begin, end)
-    while (isExtendingChar(lineObj.text.charAt(ch))) ++ch
+    ch = skipExtendingChars(lineObj.text, ch, 1)
     pos = new Pos(lineNo, ch, ch == end ? "before" : "after")
   }
   let coords = cursorCoords(cm, pos, "line", lineObj, preparedMeasure)
diff --git a/src/util/bidi.js b/src/util/bidi.js
index f10ee707a9..acc1ef8e63 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -1,4 +1,4 @@
-import { isExtendingChar, lst } from "./misc"
+import { lst } from "./misc"
 
 // BIDI HELPERS
 
@@ -15,19 +15,6 @@ export function iterateBidiSections(order, from, to, f) {
   if (!found) f(from, to, "ltr")
 }
 
-export function bidiLeft(part) { return part.level % 2 ? part.to : part.from }
-export function bidiRight(part) { return part.level % 2 ? part.from : part.to }
-
-function lineAt(line, dir) {
-  let order = getOrder(line)
-  if (!order) return dir == -1 ? line.text.length : 0
-  let pos = dir == -1 ? order.length - 1 : 0
-  return (dir == -1 ? bidiRight : bidiLeft)(order[pos])
-}
-
-export function lineLeft(line) { return lineAt(line, 1) }
-export function lineRight(line) { return lineAt(line, -1) }
-
 export let bidiOther = null
 export function getBidiPartAt(order, ch, sticky) {
   let found
@@ -47,17 +34,6 @@ export function getBidiPartAt(order, ch, sticky) {
   return found != null ? found : bidiOther
 }
 
-function moveInLine(line, pos, dir) {
-  do pos += dir
-  while (pos > 0 && isExtendingChar(line.text.charAt(pos)))
-  return pos
-}
-
-export function moveLogically(line, start, dir) {
-  let target = moveInLine(line, start.ch, dir)
-  return target < 0 || target > line.text.length ? null : target
-}
-
 // Bidirectional ordering algorithm
 // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
 // that this (partially) implements.
@@ -81,7 +57,7 @@ export function moveLogically(line, start, dir) {
 // Returns null if characters are ordered as they appear
 // (left-to-right), or an array of sections ({from, to, level}
 // objects) in the order in which they occur visually.
-export let bidiOrdering = (function() {
+let bidiOrdering = (function() {
   // Character types for codepoints 0 to 0xff
   let lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"
   // Character types for codepoints 0x600 to 0x6f9
diff --git a/src/util/misc.js b/src/util/misc.js
index 097eb050c6..2ad1d0ed73 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -127,6 +127,12 @@ export function isEmpty(obj) {
 let extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/
 export function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch) }
 
+// Returns a number from the range [`0`; `str.length`] unless `pos` is outside that range.
+export function skipExtendingChars(str, pos, dir) {
+  while ((dir < 0 ? pos > 0 : pos < str.length) && isExtendingChar(str.charAt(pos))) pos += dir
+  return pos
+}
+
 // Returns the value from the range [`from`; `to`] that satisfies
 // `pred` and is closest to `from`. Assumes that at least `to` satisfies `pred`.
 export function findFirst(pred, from, to) {

From f45dc108c79a21e34331b4369878e131e9b75049 Mon Sep 17 00:00:00 2001
From: Fabien Dubosson <fabien.dubosson@gmail.com>
Date: Sat, 4 Feb 2017 00:12:23 +0100
Subject: [PATCH 3105/4742] [vim] Allow to delete default bindings of the vim
 keymap through the API

The current situation prevents to remove bindings from the default keymap in vim
mode. It is sometimes required to be able to delete them in order to do some
custom mapping.

Example:

1. The `h` binding is defined in the default keymap for moving left.

2. The user want to set the custom binding `h<character>` to behave like
   `r<character>`. It can do so with:

     CodeMirror.Vim.mapCommand('h<character>', 'action', 'replace', {},
                               { isEdit: true, context: 'normal' });

3. When the user press the `h` key, the code searches for all the keybindings
   matching it [1].

4. Two bindings are found:

   - The default binding `h` for moving left. This is a FULL match.
   - The user-defined `h<character>`. This is only a PARTIAL match as it is
     expecting another character.

5. The code is preferring FULL matches over PARTIAL matches whenever they are in
   competition [2]. The code then selects the move left action.

6. The way to let the user-defined binding take over is to let the user delete
   the default binding:

     CodeMirror.Vim.unmap('h');

   but this is not possible because it is not allowed to delete bindings from
   the default keymap [3].

This commit remove such differentiation by treating all bindings in the same
way, letting the responsibility to the user to not mess with the bindings he
needs.

[1] https://github.com/codemirror/CodeMirror/blob/ff84b9ee73b75851801bc4004b75e35fea6291cb/keymap/vim.js#L1098
[2] https://github.com/codemirror/CodeMirror/blob/ff84b9ee73b75851801bc4004b75e35fea6291cb/keymap/vim.js#L1099-L1103
[3] https://github.com/codemirror/CodeMirror/blob/ff84b9ee73b75851801bc4004b75e35fea6291cb/keymap/vim.js#L4182

Signed-off-by: Fabien Dubosson <fabien.dubosson@gmail.com>
---
 keymap/vim.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 34570bb889..c6608bf694 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4147,8 +4147,8 @@
             var mapping = {
               keys: lhs,
               type: 'keyToEx',
-              exArgs: { input: rhs.substring(1) },
-              user: true};
+              exArgs: { input: rhs.substring(1) }
+            };
             if (ctx) { mapping.context = ctx; }
             defaultKeymap.unshift(mapping);
           } else {
@@ -4156,8 +4156,7 @@
             var mapping = {
               keys: lhs,
               type: 'keyToKey',
-              toKeys: rhs,
-              user: true
+              toKeys: rhs
             };
             if (ctx) { mapping.context = ctx; }
             defaultKeymap.unshift(mapping);
@@ -4178,8 +4177,7 @@
           var keys = lhs;
           for (var i = 0; i < defaultKeymap.length; i++) {
             if (keys == defaultKeymap[i].keys
-                && defaultKeymap[i].context === ctx
-                && defaultKeymap[i].user) {
+                && defaultKeymap[i].context === ctx) {
               defaultKeymap.splice(i, 1);
               return;
             }

From f2c63b670e6db4fe0b7f87699f35116df7696718 Mon Sep 17 00:00:00 2001
From: Kevin Muret <kevmuret@gmail.com>
Date: Sat, 4 Feb 2017 17:02:16 +0100
Subject: [PATCH 3106/4742] [vim bindings] regexp support (sort) fixed cursor
 pos (ex/search)

---
 keymap/vim.js    | 56 +++++++++++++++++++++++++++++++++---------------
 test/vim_test.js | 40 +++++++++++++++++++++++++---------
 2 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c6608bf694..08f4374cac 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1245,11 +1245,13 @@
           }
         }
         function onPromptKeyUp(e, query, close) {
-          var keyName = CodeMirror.keyName(e), up;
+          var keyName = CodeMirror.keyName(e), up, offset;
           if (keyName == 'Up' || keyName == 'Down') {
             up = keyName == 'Up' ? true : false;
+            offset = e.target ? e.target.selectionEnd : 0;
             query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
             close(query);
+            if (offset && e.target) e.target.selectionEnd = e.target.selectionStart = Math.min(offset, e.target.value.length);
           } else {
             if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
               vimGlobalState.searchHistoryController.reset();
@@ -1281,6 +1283,8 @@
             clearInputState(cm);
             close();
             cm.focus();
+          } else if (keyName == 'Up' || keyName == 'Down') {
+            CodeMirror.e_stop(e);
           } else if (keyName == 'Ctrl-U') {
             // Ctrl-U clears input.
             CodeMirror.e_stop(e);
@@ -1344,7 +1348,7 @@
           exCommandDispatcher.processCommand(cm, input);
         }
         function onPromptKeyDown(e, input, close) {
-          var keyName = CodeMirror.keyName(e), up;
+          var keyName = CodeMirror.keyName(e), up, offset;
           if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
               (keyName == 'Backspace' && input == '')) {
             vimGlobalState.exCommandHistoryController.pushInput(input);
@@ -1355,9 +1359,12 @@
             cm.focus();
           }
           if (keyName == 'Up' || keyName == 'Down') {
+            CodeMirror.e_stop(e);
             up = keyName == 'Up' ? true : false;
+            offset = e.target ? e.target.selectionEnd : 0;
             input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
             close(input);
+            if (offset && e.target) e.target.selectionEnd = e.target.selectionStart = Math.min(offset, e.target.value.length);
           } else if (keyName == 'Ctrl-U') {
             // Ctrl-U clears input.
             CodeMirror.e_stop(e);
@@ -4308,25 +4315,27 @@
         showConfirm(cm, regInfo);
       },
       sort: function(cm, params) {
-        var reverse, ignoreCase, unique, number;
+        var reverse, ignoreCase, unique, number, pattern;
         function parseArgs() {
           if (params.argString) {
             var args = new CodeMirror.StringStream(params.argString);
             if (args.eat('!')) { reverse = true; }
             if (args.eol()) { return; }
             if (!args.eatSpace()) { return 'Invalid arguments'; }
-            var opts = args.match(/[a-z]+/);
-            if (opts) {
-              opts = opts[0];
-              ignoreCase = opts.indexOf('i') != -1;
-              unique = opts.indexOf('u') != -1;
-              var decimal = opts.indexOf('d') != -1 && 1;
-              var hex = opts.indexOf('x') != -1 && 1;
-              var octal = opts.indexOf('o') != -1 && 1;
+            var opts = args.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);
+            if (!opts && !args.eol()) { return 'Invalid arguments'; }
+            if (opts[1]) {
+              ignoreCase = opts[1].indexOf('i') != -1;
+              unique = opts[1].indexOf('u') != -1;
+              var decimal = opts[1].indexOf('d') != -1 || opts[1].indexOf('n') != -1 && 1;
+              var hex = opts[1].indexOf('x') != -1 && 1;
+              var octal = opts[1].indexOf('o') != -1 && 1;
               if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
               number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
             }
-            if (args.match(/\/.*\//)) { return 'patterns not supported'; }
+            if (opts[2]) {
+              pattern = new RegExp(opts[2].substr(1, opts[2].length - 2), ignoreCase ? 'i' : '');
+            }
           }
         }
         var err = parseArgs();
@@ -4340,14 +4349,18 @@
         var curStart = Pos(lineStart, 0);
         var curEnd = Pos(lineEnd, lineLength(cm, lineEnd));
         var text = cm.getRange(curStart, curEnd).split('\n');
-        var numberRegex = (number == 'decimal') ? /(-?)([\d]+)/ :
+        var numberRegex = pattern ? pattern :
+           (number == 'decimal') ? /(-?)([\d]+)/ :
            (number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i :
            (number == 'octal') ? /([0-7]+)/ : null;
         var radix = (number == 'decimal') ? 10 : (number == 'hex') ? 16 : (number == 'octal') ? 8 : null;
         var numPart = [], textPart = [];
-        if (number) {
+        if (number || pattern) {
           for (var i = 0; i < text.length; i++) {
-            if (numberRegex.exec(text[i])) {
+            var matchPart = pattern ? text[i].match(pattern) : null;
+            if (matchPart && matchPart[0] != '') {
+              numPart.push(matchPart);
+            } else if (!pattern && numberRegex.exec(text[i])) {
               numPart.push(text[i]);
             } else {
               textPart.push(text[i]);
@@ -4366,8 +4379,17 @@
           bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix);
           return anum - bnum;
         }
-        numPart.sort(compareFn);
-        textPart.sort(compareFn);
+        function comparePatternFn(a, b) {
+          if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
+          if (ignoreCase) { a[0] = a[0].toLowerCase(); b[0] = b[0].toLowerCase(); }
+          return (a[0] < b[0]) ? -1 : 1;
+        }
+        numPart.sort(pattern ? comparePatternFn : compareFn);
+        if (pattern) {
+          for (var i = 0; i < numPart.length; i++) {
+            numPart[i] = numPart[i].input;
+          }
+        } else if (!number) { textPart.sort(compareFn); }
         text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart);
         if (unique) { // Remove duplicate lines
           var textOld = text;
diff --git a/test/vim_test.js b/test/vim_test.js
index acb5ba4be0..67cf8d8fea 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3477,24 +3477,44 @@ testVim('ex_sort_hex', function(cm, vim, helpers) {
 }, { value: '6\nd3\n s5\n&0xB\n.9'});
 testVim('ex_sort_octal', function(cm, vim, helpers) {
   helpers.doEx('sort o');
-  eq('.8\n.9\nd3\n s5\n6', cm.getValue());
+  eq('.9\n.8\nd3\n s5\n6', cm.getValue());
 }, { value: '6\nd3\n s5\n.9\n.8'});
 testVim('ex_sort_decimal_mixed', function(cm, vim, helpers) {
   helpers.doEx('sort d');
-  eq('y\nz\nc1\nb2\na3', cm.getValue());
+  eq('z\ny\nc1\nb2\na3', cm.getValue());
 }, { value: 'a3\nz\nc1\ny\nb2'});
 testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
   helpers.doEx('sort! d');
   eq('a3\nb2\nc1\nz\ny', cm.getValue());
 }, { value: 'a3\nz\nc1\ny\nb2'});
-testVim('ex_sort_patterns_not_supported', function(cm, vim, helpers) {
-  var notified = false;
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    notified = /patterns not supported/.test(text);
-  });
-  helpers.doEx('sort /abc/');
-  is(notified, 'No notification.');
-});
+testVim('ex_sort_pattern_alpha', function(cm, vim, helpers) {
+  helpers.doEx('sort /[a-z]/');
+  eq('a3\nb2\nc1\ny\nz', cm.getValue());
+}, { value: 'z\ny\nc1\nb2\na3'});
+testVim('ex_sort_pattern_alpha_reverse', function(cm, vim, helpers) {
+  helpers.doEx('sort! /[a-z]/');
+  eq('z\ny\nc1\nb2\na3', cm.getValue());
+}, { value: 'z\ny\nc1\nb2\na3'});
+testVim('ex_sort_pattern_alpha_ignoreCase', function(cm, vim, helpers) {
+  helpers.doEx('sort i/[a-z]/');
+  eq('a3\nb2\nC1\nY\nz', cm.getValue());
+}, { value: 'z\nY\nC1\nb2\na3'});
+testVim('ex_sort_pattern_alpha_longer', function(cm, vim, helpers) {
+  helpers.doEx('sort /[a-z]+/');
+  eq('a\naa\nab\nade\nadele\nadelle\nadriana\nalex\nalexandra\nb\nc\ny\nz', cm.getValue());
+}, { value: 'z\nab\naa\nade\nadelle\nalexandra\nalex\nadriana\nadele\ny\nc\nb\na'});
+testVim('ex_sort_pattern_alpha_only', function(cm, vim, helpers) {
+  helpers.doEx('sort /^[a-z]$/');
+  eq('z1\ny2\na3\nb\nc', cm.getValue());
+}, { value: 'z1\ny2\na3\nc\nb'});
+testVim('ex_sort_pattern_alpha_only_reverse', function(cm, vim, helpers) {
+  helpers.doEx('sort! /^[a-z]$/');
+  eq('c\nb\nz1\ny2\na3', cm.getValue());
+}, { value: 'z1\ny2\na3\nc\nb'});
+testVim('ex_sort_pattern_alpha_num', function(cm, vim, helpers) {
+  helpers.doEx('sort /[a-z][0-9]/');
+  eq('c\nb\na3\ny2\nz1', cm.getValue());
+}, { value: 'z1\ny2\na3\nc\nb'});
 // test for :global command
 testVim('ex_global', function(cm, vim, helpers) {
   cm.setCursor(0, 0);

From 407c52278068306470db2ab0d9718f569b22ec90 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 4 Feb 2017 22:38:16 +0100
Subject: [PATCH 3107/4742] [commonlisp mode] Fix wrong bracket

Closes #4545
---
 mode/commonlisp/commonlisp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 5b407a9285..8cd212d3a8 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -43,7 +43,7 @@ CodeMirror.defineMode("commonlisp", function (config) {
       else { stream.skipToEnd(); return "error"; }
     } else if (ch == "#") {
       var ch = stream.next();
-      if (ch == "[") { type = "open"; return "bracket"; }
+      if (ch == "(") { type = "open"; return "bracket"; }
       else if (/[+\-=\.']/.test(ch)) return null;
       else if (/\d/.test(ch) && stream.match(/^\d*#/)) return null;
       else if (ch == "|") return (state.tokenize = inComment)(stream, state);

From bb2cf359b607152afa7d77a8f9b6bb00cdecdb52 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 3 Feb 2017 12:03:44 +0100
Subject: [PATCH 3108/4742] Make sure coordsChar(charCoords) == id

---
 src/measurement/position_measurement.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 4d2754b950..1faa02ba3f 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -427,7 +427,7 @@ export function coordsChar(cm, x, y) {
 function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
   let measure = ch => intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
   let end = lineObj.text.length
-  let begin = findFirst(ch => measure(ch).bottom < y, end - 1, 0) + 1
+  let begin = findFirst(ch => measure(ch).bottom <= y, end - 1, 0) + 1
   end = findFirst(ch => measure(ch).top > y, begin, end)
   return {begin, end}
 }
@@ -466,7 +466,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
         end = Math.min(ch, end)
         return true
       }
-      else if (box.bottom < y) return false
+      else if (box.bottom <= y) return false
       else if (box.left > x) return true
       else if (box.right < x) return false
       else return (x - box.left < box.right - x)

From e49d5e893406edef58b8faaa02bf63300f1fe92e Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 3 Feb 2017 12:05:25 +0100
Subject: [PATCH 3109/4742] Add failing tests for coordsChar

1. End of wrapped line in bidi content is wrong (my mistake)
2. coordsChar({left:0, top: *}) in bidi content is wrong after Marijn's code
   style changes
---
 test/test.js | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/test/test.js b/test/test.js
index ab23757d0f..be970cd196 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1124,13 +1124,41 @@ testCM("measureWrappedEndOfLine", function(cm) {
       else break;
     }
   }
-  var endPos = cm.charCoords(Pos(0, 12)); // Next-to-last since last would wrap (#1862)
-  endPos.left += w; // Add width of editor just to be sure that we are behind last character
-  eqCursorPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
-  endPos.left += w * 100;
-  eqCursorPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
+  for (var i = 0; i < 2; ++i) {
+    var endPos = cm.charCoords(Pos(0, 12)); // Next-to-last since last would wrap (#1862)
+    endPos.left += w; // Add width of editor just to be sure that we are behind last character
+    eqCursorPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
+    endPos.left += w * 100;
+    eqCursorPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
+    cm.setValue("0123456789abcابجابجابجابج");
+  }
 }, {mode: "text/html", value: "0123456789abcde0123456789", lineWrapping: true}, ie_lt8 || opera_lt10);
 
+testCM("measureWrappedBeginOfLine", function(cm) {
+  if (phantom) return;
+  cm.setSize(null, "auto");
+  var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
+  var lh = inner.offsetHeight;
+  for (var step = 10, w = cm.charCoords(Pos(0, 7), "div").right;; w += step) {
+    cm.setSize(w);
+    if (inner.offsetHeight < 2.5 * lh) {
+      if (step == 10) { w -= 10; step = 1; }
+      else break;
+    }
+  }
+  var beginOfSecondLine = Pos(0, 13, "after");
+  for (var i = 0; i < 2; ++i) {
+    var beginPos = cm.charCoords(Pos(0, 0));
+    beginPos.left -= w;
+    eqCursorPos(cm.coordsChar(beginPos), Pos(0, 0, "after"));
+    beginPos = cm.cursorCoords(beginOfSecondLine);
+    beginPos.left = 0;
+    eqCursorPos(cm.coordsChar(beginPos), beginOfSecondLine);
+    cm.setValue("0123456789abcابجابجابجابج");
+    beginOfSecondLine = Pos(0, 25, "before");
+  }
+}, {mode: "text/html", value: "0123456789abcde0123456789", lineWrapping: true});
+
 testCM("scrollVerticallyAndHorizontally", function(cm) {
   if (cm.getOption("inputStyle") != "textarea") return;
   cm.setSize(100, 100);

From 7ad2ce628af039016b99e3d9a43f92df59e441af Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 3 Feb 2017 12:16:45 +0100
Subject: [PATCH 3110/4742] Fix coordsChar at end and beginning of wrapped bidi
 lines

---
 src/measurement/position_measurement.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 1faa02ba3f..16cfbed9e5 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -427,7 +427,7 @@ export function coordsChar(cm, x, y) {
 function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
   let measure = ch => intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
   let end = lineObj.text.length
-  let begin = findFirst(ch => measure(ch).bottom <= y, end - 1, 0) + 1
+  let begin = findFirst(ch => measure(ch - 1).bottom <= y, end, 0)
   end = findFirst(ch => measure(ch).top > y, begin, end)
   return {begin, end}
 }
@@ -450,7 +450,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
       prevDiff = diff
       let prevPos = pos
       pos = moveVisually(cm, lineObj, pos, dir)
-      if (pos == null || pos.ch < begin || end <= pos.ch) {
+      if (pos == null || pos.ch < begin || end <= (pos.sticky == "before" ? pos.ch - 1 : pos.ch)) {
         pos = prevPos
         break
       }

From a7f801814e5da9799e0815a2264cadb0aaa2ca2d Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 3 Feb 2017 13:15:48 +0100
Subject: [PATCH 3111/4742] Safeguard against infinite loops in coordsCharInner

---
 src/measurement/position_measurement.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 16cfbed9e5..ec72332e96 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -445,19 +445,21 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
     pos = new Pos(lineNo, begin)
     let beginLeft = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left
     let dir = beginLeft < x ? 1 : -1
-    let prevDiff, diff = beginLeft - x
+    let prevDiff, diff = beginLeft - x, prevPos
     do {
       prevDiff = diff
-      let prevPos = pos
+      prevPos = pos
       pos = moveVisually(cm, lineObj, pos, dir)
       if (pos == null || pos.ch < begin || end <= (pos.sticky == "before" ? pos.ch - 1 : pos.ch)) {
         pos = prevPos
         break
       }
       diff = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left - x
-    } while ((dir < 0) != (diff < 0))
-    // moveVisually has the nice side effect of skipping extending chars and setting sticky
-    if (Math.abs(diff) > Math.abs(prevDiff)) pos = moveVisually(cm, lineObj, pos, -dir)
+    } while ((dir < 0) != (diff < 0) && (Math.abs(diff) <= Math.abs(prevDiff)))
+    if (Math.abs(diff) > Math.abs(prevDiff)) {
+      if ((diff < 0) == (prevDiff < 0)) throw new Error("Broke out of infinite loop in coordsCharInner")
+      pos = prevPos
+    }
   } else {
     let ch = findFirst(ch => {
       let box = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")

From a89e94433a31e299088327db5bd9eea4b6c932b0 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 3 Feb 2017 13:17:08 +0100
Subject: [PATCH 3112/4742] Use wrappedLineExtent in moveVisually

---
 src/input/movement.js                   | 35 +++++++++++--------------
 src/measurement/position_measurement.js |  5 ++++
 test/test.js                            |  7 ++++-
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/input/movement.js b/src/input/movement.js
index ebb1bdf239..7f4643bec3 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -1,5 +1,5 @@
 import { Pos } from "../line/pos"
-import { prepareMeasureForLine, measureCharPrepared } from "../measurement/position_measurement"
+import { prepareMeasureForLine, measureCharPrepared, wrappedLineExtentChar } from "../measurement/position_measurement"
 import { getBidiPartAt, getOrder } from "../util/bidi"
 import { findFirst, lst, skipExtendingChars } from "../util/misc"
 
@@ -40,16 +40,6 @@ export function endOfLine(visually, cm, lineObj, lineNo, dir) {
   return new Pos(lineNo, dir < 0 ? lineObj.text.length : 0, dir < 0 ? "before" : "after")
 }
 
-function getVisualLineAround(cm, line, target) {
-  if (!cm.options.lineWrapping) return [0, line.text.length - 1]
-  let prep = prepareMeasureForLine(cm, line)
-  let targetTop = measureCharPrepared(cm, prep, target).top
-  return [
-    findFirst(ch => targetTop == measureCharPrepared(cm, prep, ch).top, 0, target),
-    findFirst(ch => targetTop == measureCharPrepared(cm, prep, ch).top, line.text.length - 1, target)
-  ]
-}
-
 export function moveVisually(cm, line, start, dir) {
   let bidi = getOrder(line)
   if (!bidi) return moveLogically(line, start, dir)
@@ -68,12 +58,17 @@ export function moveVisually(cm, line, start, dir) {
   }
 
   let mv = (pos, dir) => moveCharLogically(line, pos instanceof Pos ? pos.ch : pos, dir)
-  let getVisualLine = ch => getVisualLineAround(cm, line, ch)
-  let visualLine = getVisualLine(start.sticky == "before" ? mv(start, -1) : start.ch)
+  let prep
+  let getWrappedLineExtent = ch => {
+    if (!cm.options.lineWrapping) return {begin: 0, end: line.text.length}
+    prep = prep || prepareMeasureForLine(cm, line)
+    return wrappedLineExtentChar(cm, line, prep, ch)
+  }
+  let wrappedLineExtent = getWrappedLineExtent(start.sticky == "before" ? mv(start, -1) : start.ch)
 
   if (part.level % 2 == 1) {
     let ch = mv(start, -dir)
-    if (ch != null && (dir > 0 ? ch >= part.from && ch >= visualLine[0] : ch <= part.to && ch <= mv(visualLine[1], 1))) {
+    if (ch != null && (dir > 0 ? ch >= part.from && ch >= wrappedLineExtent.begin : ch <= part.to && ch <= wrappedLineExtent.end)) {
       // Case 2: We move within an rtl part on the same visual line
       let sticky = dir < 0 ? "before" : "after"
       return new Pos(start.line, ch, sticky)
@@ -83,7 +78,7 @@ export function moveVisually(cm, line, start, dir) {
   // Case 3: Could not move within this bidi part in this visual line, so leave
   // the current bidi part
 
-  let searchInVisualLine = (partPos, dir, visualLine) => {
+  let searchInVisualLine = (partPos, dir, wrappedLineExtent) => {
     let getRes = (ch, moveInStorageOrder) => moveInStorageOrder
       ? new Pos(start.line, mv(ch, 1), "before")
       : new Pos(start.line, ch, "after")
@@ -91,21 +86,21 @@ export function moveVisually(cm, line, start, dir) {
     for (; partPos >= 0 && partPos < bidi.length; partPos += dir) {
       let part = bidi[partPos]
       let moveInStorageOrder = (dir > 0) == (part.level != 1)
-      let ch = moveInStorageOrder ? visualLine[0] : visualLine[1]
+      let ch = moveInStorageOrder ? wrappedLineExtent.begin : mv(wrappedLineExtent.end, -1)
       if (part.from <= ch && ch < part.to) return getRes(ch, moveInStorageOrder)
       ch = moveInStorageOrder ? part.from : mv(part.to, -1)
-      if (visualLine[0] <= ch && ch <= visualLine[1]) return getRes(ch, moveInStorageOrder)
+      if (wrappedLineExtent.begin <= ch && ch < wrappedLineExtent.end) return getRes(ch, moveInStorageOrder)
     }
   }
 
   // Case 3a: Look for other bidi parts on the same visual line
-  let res = searchInVisualLine(partPos + dir, dir, visualLine)
+  let res = searchInVisualLine(partPos + dir, dir, wrappedLineExtent)
   if (res) return res
 
   // Case 3b: Look for other bidi parts on the next visual line
-  let nextCh = mv(visualLine[dir > 0 ? 1 : 0], dir)
+  let nextCh = dir > 0 ? wrappedLineExtent.end : mv(wrappedLineExtent.begin, -1)
   if (nextCh != null && !(dir > 0 && nextCh == line.text.length)) {
-    res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getVisualLine(nextCh))
+    res = searchInVisualLine(dir > 0 ? 0 : bidi.length - 1, dir, getWrappedLineExtent(nextCh))
     if (res) return res
   }
 
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index ec72332e96..92da0e809d 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -432,6 +432,11 @@ function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
   return {begin, end}
 }
 
+export function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) {
+  let targetTop = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, target), "line").top
+  return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop)
+}
+
 function coordsCharInner(cm, lineObj, lineNo, x, y) {
   y -= heightAtLine(lineObj)
   let begin = 0, end = lineObj.text.length
diff --git a/test/test.js b/test/test.js
index be970cd196..b9f5aa8c4c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1124,13 +1124,18 @@ testCM("measureWrappedEndOfLine", function(cm) {
       else break;
     }
   }
-  for (var i = 0; i < 2; ++i) {
+  for (var i = 0; i < 3; ++i) {
     var endPos = cm.charCoords(Pos(0, 12)); // Next-to-last since last would wrap (#1862)
     endPos.left += w; // Add width of editor just to be sure that we are behind last character
     eqCursorPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
     endPos.left += w * 100;
     eqCursorPos(cm.coordsChar(endPos), Pos(0, 13, "before"));
     cm.setValue("0123456789abcابجابجابجابج");
+    if (i == 1) {
+      var node = document.createElement("div");
+      node.innerHTML = "hi"; node.style.height = "30px";
+      cm.addLineWidget(0, node, {above: true});
+    }
   }
 }, {mode: "text/html", value: "0123456789abcde0123456789", lineWrapping: true}, ie_lt8 || opera_lt10);
 

From 13aed570c920420f0016b25f36e34f3b5e477b1e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 6 Feb 2017 14:33:49 +0100
Subject: [PATCH 3113/4742] Fix browser detection for Edge

Since it's increased the strangeness of the userAgent string again

Issue #4408
---
 src/util/browser.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/util/browser.js b/src/util/browser.js
index ce678a82a4..3891d13e9c 100644
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -6,17 +6,18 @@ let platform = navigator.platform
 export let gecko = /gecko\/\d/i.test(userAgent)
 let ie_upto10 = /MSIE \d/.test(userAgent)
 let ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent)
-export let ie = ie_upto10 || ie_11up
-export let ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1])
-export let webkit = /WebKit\//.test(userAgent)
+let edge = /Edge\/(\d+)/.exec(userAgent)
+export let ie = ie_upto10 || ie_11up || edge
+export let ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1])
+export let webkit = !edge && /WebKit\//.test(userAgent)
 let qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent)
-export let chrome = /Chrome\//.test(userAgent)
+export let chrome = !edge && /Chrome\//.test(userAgent)
 export let presto = /Opera\//.test(userAgent)
 export let safari = /Apple Computer/.test(navigator.vendor)
 export let mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
 export let phantom = /PhantomJS/.test(userAgent)
 
-export let ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
+export let ios = !edge && /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
 // This is woefully incomplete. Suggestions for alternative methods welcome.
 export let mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
 export let mac = ios || /Mac/.test(platform)

From 6b831b8306b01f463744a0e57eeb567795be5909 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 6 Feb 2017 22:48:11 +0100
Subject: [PATCH 3114/4742] [indent-fold addon] Ignore comment lines

Closes #4548
---
 addon/fold/indent-fold.js | 34 +++++++++++++++++++---------------
 demo/folding.html         | 29 +++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index e29f15e9da..743150c623 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -11,32 +11,36 @@
 })(function(CodeMirror) {
 "use strict";
 
+function lineIndent(cm, lineNo) {
+  var text = cm.getLine(lineNo)
+  var spaceTo = text.search(/\S/)
+  if (spaceTo == -1 || /\bcomment\b/.test(cm.getTokenTypeAt(CodeMirror.Pos(lineNo, spaceTo + 1))))
+    return -1
+  return CodeMirror.countColumn(text, null, cm.getOption("tabSize"))
+}
+               !
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
-  var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
-  if (!/\S/.test(firstLine)) return;
-  var getIndent = function(line) {
-    return CodeMirror.countColumn(line, null, tabSize);
-  };
-  var myIndent = getIndent(firstLine);
-  var lastLineInFold = null;
+  var myIndent = lineIndent(cm, start.line)
+  if (myIndent < 0) return
+  var lastLineInFold = null
+
   // Go through lines until we find a line that definitely doesn't belong in
   // the block we're folding, or to the end.
   for (var i = start.line + 1, end = cm.lastLine(); i <= end; ++i) {
-    var curLine = cm.getLine(i);
-    var curIndent = getIndent(curLine);
-    if (curIndent > myIndent) {
+    var indent = lineIndent(cm, i)
+    if (indent == -1) {
+    } else if (indent > myIndent) {
       // Lines with a greater indent are considered part of the block.
       lastLineInFold = i;
-    } else if (!/\S/.test(curLine)) {
-      // Empty lines might be breaks within the block we're trying to fold.
     } else {
-      // A non-empty line at an indent equal to or less than ours marks the
-      // start of another block.
+      // If this line has non-space, non-comment content, and is
+      // indented less or equal to the start line, it is the start of
+      // another block.
       break;
     }
   }
   if (lastLineInFold) return {
-    from: CodeMirror.Pos(start.line, firstLine.length),
+    from: CodeMirror.Pos(start.line, cm.getLine(start.line).length),
     to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
   };
 });
diff --git a/demo/folding.html b/demo/folding.html
index 81cbf9894b..06d5830208 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -12,10 +12,12 @@
   <script src="../addon/fold/foldgutter.js"></script>
   <script src="../addon/fold/brace-fold.js"></script>
   <script src="../addon/fold/xml-fold.js"></script>
+  <script src="../addon/fold/indent-fold.js"></script>
   <script src="../addon/fold/markdown-fold.js"></script>
   <script src="../addon/fold/comment-fold.js"></script>
   <script src="../mode/javascript/javascript.js"></script>
   <script src="../mode/xml/xml.js"></script>
+  <script src="../mode/python/python.js"></script>
   <script src="../mode/markdown/markdown.js"></script>
   <style type="text/css">
     .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
@@ -43,6 +45,24 @@ <h2>Code Folding Demo</h2>
     <textarea id="code" name="code"></textarea></div>
     <div style="max-width: 50em; margin-bottom: 1em">HTML:<br>
     <textarea id="code-html" name="code-html"></textarea></div>
+    <div style="max-width: 50em">Python:<br>
+    <textarea id="code-python" name="code">
+def foo():
+  do_some_stuff()
+  here
+  return None
+
+class Bar:
+  __init__(self):
+    if True:
+      print("True")
+    else:
+      print("False")
+
+  this_code_makes_no_sense():
+    pass
+
+# A comment</textarea></div>
     <div style="max-width: 50em">Markdown:<br>
     <textarea id="code-markdown" name="code"></textarea></div>
   </form>
@@ -57,6 +77,7 @@ <h2>Code Folding Demo</h2>
   sc.innerHTML = "";
   var te_html = document.getElementById("code-html");
   te_html.value = document.documentElement.innerHTML;
+  var te_python = document.getElementById("code-python");
   var te_markdown = document.getElementById("code-markdown");
   te_markdown.value = "# Foo\n## Bar\n\nblah blah\n\n## Baz\n\nblah blah\n\n# Quux\n\nblah blah\n"
 
@@ -81,6 +102,14 @@ <h2>Code Folding Demo</h2>
   editor_html.foldCode(CodeMirror.Pos(0, 0));
   editor_html.foldCode(CodeMirror.Pos(21, 0));
 
+  window.editor_python = CodeMirror.fromTextArea(te_python, {
+    mode: "python",
+    lineNumbers: true,
+    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
+    foldGutter: true,
+    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
+  });
+
   window.editor_markdown = CodeMirror.fromTextArea(te_markdown, {
     mode: "markdown",
     lineNumbers: true,

From 78539df64dd35dc8f44671ea6d98adadc76224d3 Mon Sep 17 00:00:00 2001
From: TSUYUSATO Kitsune <make.just.on@gmail.com>
Date: Tue, 7 Feb 2017 16:05:36 +0900
Subject: [PATCH 3115/4742] [crystal mode] Update

  - Update keywords (remove `ifdef`. add `select`, `uninitialized` and `__END_LINE__`.)
  - Add new string literals (%q string and here docs).
  - Remove global variable syntax (because it is no longer supported.)
  - Improve indentation (fix #3887, and correct indentation of `abstract class`)
---
 mode/crystal/crystal.js | 88 ++++++++++++++++++++++++++++++-----------
 mode/crystal/index.html | 17 ++++----
 2 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/mode/crystal/crystal.js b/mode/crystal/crystal.js
index e63627cee8..dada112da8 100644
--- a/mode/crystal/crystal.js
+++ b/mode/crystal/crystal.js
@@ -29,26 +29,22 @@
     var types = /^[A-Z_\u009F-\uFFFF][a-zA-Z0-9_\u009F-\uFFFF]*/;
     var keywords = wordRegExp([
       "abstract", "alias", "as", "asm", "begin", "break", "case", "class", "def", "do",
-      "else", "elsif", "end", "ensure", "enum", "extend", "for", "fun", "if", "ifdef",
+      "else", "elsif", "end", "ensure", "enum", "extend", "for", "fun", "if",
       "include", "instance_sizeof", "lib", "macro", "module", "next", "of", "out", "pointerof",
-      "private", "protected", "rescue", "return", "require", "sizeof", "struct",
-      "super", "then", "type", "typeof", "union", "unless", "until", "when", "while", "with",
-      "yield", "__DIR__", "__FILE__", "__LINE__"
+      "private", "protected", "rescue", "return", "require", "select", "sizeof", "struct",
+      "super", "then", "type", "typeof", "uninitialized", "union", "unless", "until", "when", "while", "with",
+      "yield", "__DIR__", "__END_LINE__", "__FILE__", "__LINE__"
     ]);
     var atomWords = wordRegExp(["true", "false", "nil", "self"]);
     var indentKeywordsArray = [
       "def", "fun", "macro",
       "class", "module", "struct", "lib", "enum", "union",
-      "if", "unless", "case", "while", "until", "begin", "then",
-      "do",
-      "for", "ifdef"
+      "do", "for"
     ];
     var indentKeywords = wordRegExp(indentKeywordsArray);
-    var dedentKeywordsArray = [
-      "end",
-      "else", "elsif",
-      "rescue", "ensure"
-    ];
+    var indentExpressionKeywordsArray = ["if", "unless", "case", "while", "until", "begin", "then"];
+    var indentExpressionKeywords = wordRegExp(indentExpressionKeywordsArray);
+    var dedentKeywordsArray = ["end", "else", "elsif", "rescue", "ensure"];
     var dedentKeywords = wordRegExp(dedentKeywordsArray);
     var dedentPunctualsArray = ["\\)", "\\}", "\\]"];
     var dedentPunctuals = new RegExp("^(?:" + dedentPunctualsArray.join("|") + ")$");
@@ -90,12 +86,15 @@
         } else if (state.lastToken == ".") {
           return "property";
         } else if (keywords.test(matched)) {
-          if (state.lastToken != "abstract" && indentKeywords.test(matched)) {
-            if (!(matched == "fun" && state.blocks.indexOf("lib") >= 0)) {
+          if (indentKeywords.test(matched)) {
+            if (!(matched == "fun" && state.blocks.indexOf("lib") >= 0) && !(matched == "def" && state.lastToken == "abstract")) {
               state.blocks.push(matched);
               state.currentIndent += 1;
             }
-          } else if (dedentKeywords.test(matched)) {
+          } else if ((state.lastStyle == "operator" || !state.lastStyle) && indentExpressionKeywords.test(matched)) {
+            state.blocks.push(matched);
+            state.currentIndent += 1;
+          } else if (matched == "end") {
             state.blocks.pop();
             state.currentIndent -= 1;
           }
@@ -124,12 +123,6 @@
         return "variable-2";
       }
 
-      // Global variables
-      if (stream.eat("$")) {
-        stream.eat(/[0-9]+|\?/) || stream.match(idents) || stream.match(types);
-        return "variable-3";
-      }
-
       // Constants and types
       if (stream.match(types)) {
         return "tag";
@@ -165,6 +158,9 @@
         } else if (stream.match("%w")) {
           embed = false;
           delim = stream.next();
+        } else if (stream.match("%q")) {
+          embed = false;
+          delim = stream.next();
         } else {
           if(delim = stream.match(/^%([^\w\s=])/)) {
             delim = delim[1];
@@ -183,6 +179,11 @@
         return chain(tokenQuote(delim, style, embed), stream, state);
       }
 
+      // Here Docs
+      if (matched = stream.match(/^<<-('?)([A-Z]\w*)\1/)) {
+        return chain(tokenHereDoc(matched[2], !matched[1]), stream, state)
+      }
+
       // Characters
       if (stream.eat("'")) {
         stream.match(/^(?:[^']|\\(?:[befnrtv0'"]|[0-7]{3}|u(?:[0-9a-fA-F]{4}|\{[0-9a-fA-F]{1,6}\})))/);
@@ -202,7 +203,7 @@
         return "number";
       }
 
-      if (stream.eat(/\d/)) {
+      if (stream.eat(/^\d/)) {
         stream.match(/^\d*(?:\.\d+)?(?:[eE][+-]?\d+)?/);
         return "number";
       }
@@ -339,7 +340,7 @@
               return style;
             }
 
-            escaped = ch == "\\";
+            escaped = embed && ch == "\\";
           } else {
             stream.next();
             escaped = false;
@@ -350,12 +351,52 @@
       };
     }
 
+    function tokenHereDoc(phrase, embed) {
+      return function (stream, state) {
+        if (stream.sol()) {
+          stream.eatSpace()
+          if (stream.match(phrase)) {
+            state.tokenize.pop();
+            return "string";
+          }
+        }
+
+        var escaped = false;
+        while (stream.peek()) {
+          if (!escaped) {
+            if (stream.match("{%", false)) {
+              state.tokenize.push(tokenMacro("%", "%"));
+              return "string";
+            }
+
+            if (stream.match("{{", false)) {
+              state.tokenize.push(tokenMacro("{", "}"));
+              return "string";
+            }
+
+            if (embed && stream.match("#{", false)) {
+              state.tokenize.push(tokenNest("#{", "}", "meta"));
+              return "string";
+            }
+
+            escaped = embed && stream.next() == "\\";
+          } else {
+            stream.next();
+            escaped = false;
+          }
+        }
+
+        return "string";
+      }
+    }
+
     return {
       startState: function () {
         return {
           tokenize: [tokenBase],
           currentIndent: 0,
           lastToken: null,
+          lastStyle: null,
           blocks: []
         };
       },
@@ -366,6 +407,7 @@
 
         if (style && style != "comment") {
           state.lastToken = token;
+          state.lastStyle = style;
         }
 
         return style;
diff --git a/mode/crystal/index.html b/mode/crystal/index.html
index ec03e25094..95412579f2 100644
--- a/mode/crystal/index.html
+++ b/mode/crystal/index.html
@@ -48,8 +48,6 @@ <h2>Crystal mode</h2>
 server.listen
 
 module Foo
-  def initialize(@foo); end
-
   abstract def abstract_method : String
 
   @[AlwaysInline]
@@ -58,7 +56,8 @@ <h2>Crystal mode</h2>
   end
 
   struct Foo
-    def initialize(@foo); end
+    def initialize(@foo : ::Foo)
+    end
 
     def hello_world
       @foo.abstract_method
@@ -71,8 +70,7 @@ <h2>Crystal mode</h2>
 
   @@foobar = 12345
 
-  def initialize(@bar)
-    super(@bar.not_nil! + 100)
+  def initialize(@bar : Int32)
   end
 
   macro alias_method(name, method)
@@ -87,11 +85,10 @@ <h2>Crystal mode</h2>
 
   alias_method abstract_method, a_method
 
-  macro def show_instance_vars : Nil
+  def show_instance_vars : Nil
     {% for var in @type.instance_vars %}
       puts "@{{ var }} = #{ @{{ var }} }"
     {% end %}
-    nil
   end
 end
 
@@ -101,9 +98,9 @@ <h2>Crystal mode</h2>
   fun c_puts = "puts"(str : Char*) : Int
 end
 
-$baz = Baz.new(100)
-$baz.show_instance_vars
-$baz.with_foofoo do
+baz = Baz.new(100)
+baz.show_instance_vars
+baz.with_foofoo do
   LibC.c_puts hello_world
 end
 </textarea></form>

From 4c71e9b25c79b2ff0143180b3d2c2bb022961217 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Feb 2017 20:00:50 +0100
Subject: [PATCH 3116/4742] [sublime bindings] Make selectNextOccurrence do
 nothing when all is selected

Closes #4552
---
 keymap/sublime.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 3d112ab961..0ce8955875 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -152,18 +152,25 @@
       var text = cm.getRange(from, to);
       var query = fullWord ? new RegExp("\\b" + text + "\\b") : text;
       var cur = cm.getSearchCursor(query, to);
-      if (cur.findNext()) {
-        cm.addSelection(cur.from(), cur.to());
-      } else {
+      var found = cur.findNext();
+      if (!found) {
         cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0));
-        if (cur.findNext())
-          cm.addSelection(cur.from(), cur.to());
+        found = cur.findNext();
       }
+      if (!found || isSelectedRange(cm.listSelections(), cur.from(), cur.to()))
+        return CodeMirror.Pass
+      cm.addSelection(cur.from(), cur.to());
     }
     if (fullWord)
       cm.state.sublimeFindFullWord = cm.doc.sel;
   };
 
+  function isSelectedRange(ranges, from, to) {
+    for (var i = 0; i < ranges.length; i++)
+      if (ranges[i].from() == from && ranges[i].to() == to) return true
+    return false
+  }
+
   var mirror = "(){}[]";
   function selectBetweenBrackets(cm) {
     var ranges = cm.listSelections(), newRanges = []

From c192f39289fa9f8b56e536a30df3b3c66b547d33 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Feb 2017 10:23:39 +0100
Subject: [PATCH 3117/4742] [scala mode] Treat #, :, and @ as operator
 characters

Closes #4553
---
 mode/clike/clike.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index bba2ec9056..7424c9a051 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -493,14 +493,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       /* scala */
       "abstract case catch class def do else extends final finally for forSome if " +
       "implicit import lazy match new null object override package private protected return " +
-      "sealed super this throw trait try type val var while with yield _ : = => <- <: " +
-      "<% >: # @ " +
+      "sealed super this throw trait try type val var while with yield _ " +
 
       /* package scala */
       "assert assume require print println printf readLine readBoolean readByte readShort " +
-      "readChar readInt readLong readFloat readDouble " +
-
-      ":: #:: "
+      "readChar readInt readLong readFloat readDouble"
     ),
     types: words(
       "AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either " +
@@ -521,6 +518,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     atoms: words("true false null"),
     indentStatements: false,
     indentSwitch: false,
+    isOperatorChar: /[+\-*&%=<>!?|\/#:@]/,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);

From eabba6396d45114734b0cfb43a9d6ce3afbf9050 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Feb 2017 10:59:29 +0100
Subject: [PATCH 3118/4742] [annotatescrollbar addon] Use slow/precise path
 when getting coords in lines with widgets

Closes #4554
---
 addon/scroll/annotatescrollbar.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 5e748e816d..11b18c1ee3 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -77,7 +77,8 @@
         curLine = pos.line;
         curLineObj = cm.getLineHandle(curLine);
       }
-      if (wrapping && curLineObj.height > singleLineH)
+      if ((curLineObj.widgets && curLineObj.widgets.length) ||
+          (wrapping && curLineObj.height > singleLineH))
         return cm.charCoords(pos, "local")[top ? "top" : "bottom"];
       var topY = cm.heightAtLine(curLineObj, "local");
       return topY + (top ? 0 : curLineObj.height);

From 3d6bb9447829fb097ffcc8550565cc89a2c4b6a7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 10 Feb 2017 11:56:49 +0100
Subject: [PATCH 3119/4742] [merge addon] Remove unneccesarily obscure logic

---
 addon/merge/merge.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index a8132b605d..46e9e67961 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -139,19 +139,19 @@
 
   function registerScroll(dv) {
     dv.edit.on("scroll", function() {
-      syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
+      syncScroll(dv, true) && makeConnections(dv);
     });
     dv.orig.on("scroll", function() {
-      syncScroll(dv, DIFF_DELETE) && makeConnections(dv);
+      syncScroll(dv, false) && makeConnections(dv);
     });
   }
 
-  function syncScroll(dv, type) {
+  function syncScroll(dv, toOrig) {
     // Change handler will do a refresh after a timeout when diff is out of date
     if (dv.diffOutOfDate) return false;
     if (!dv.lockScroll) return true;
     var editor, other, now = +new Date;
-    if (type == DIFF_INSERT) { editor = dv.edit; other = dv.orig; }
+    if (toOrig) { editor = dv.edit; other = dv.orig; }
     else { editor = dv.orig; other = dv.edit; }
     // Don't take action if the position of this editor was recently set
     // (to prevent feedback loops)
@@ -163,9 +163,9 @@
     } else {
       var halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
       var mid = editor.lineAtHeight(midY, "local");
-      var around = chunkBoundariesAround(dv.chunks, mid, type == DIFF_INSERT);
-      var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
-      var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
+      var around = chunkBoundariesAround(dv.chunks, mid, toOrig);
+      var off = getOffsets(editor, toOrig ? around.edit : around.orig);
+      var offOther = getOffsets(other, toOrig ? around.orig : around.edit);
       var ratio = (midY - off.top) / (off.bot - off.top);
       var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
 

From c9997b5978d213037f9a7ece937aa0b01041f881 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 10 Feb 2017 12:09:51 +0100
Subject: [PATCH 3120/4742] [merge addon] Don't drop scroll sync when scrolling
 happens with out-of-date diff

Issue #4556
---
 addon/merge/merge.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 46e9e67961..ed69a4fa6d 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -47,6 +47,7 @@
       this.diff = getDiff(asString(orig), asString(options.value));
       this.chunks = getChunks(this.diff);
       this.diffOutOfDate = this.dealigned = false;
+      this.needsScrollSync = null
 
       this.showDifferences = options.showDifferences !== false;
     },
@@ -97,6 +98,7 @@
       if (dv.mv.options.connect == "align")
         alignChunks(dv);
       makeConnections(dv);
+      if (dv.needsScrollSync != null) syncScroll(dv, dv.needsScrollSync)
 
       updating = false;
     }
@@ -148,7 +150,11 @@
 
   function syncScroll(dv, toOrig) {
     // Change handler will do a refresh after a timeout when diff is out of date
-    if (dv.diffOutOfDate) return false;
+    if (dv.diffOutOfDate) {
+      if (dv.lockScroll && dv.needsScrollSync == null) dv.needsScrollSync = toOrig
+      return false
+    }
+    dv.needsScrollSync = null
     if (!dv.lockScroll) return true;
     var editor, other, now = +new Date;
     if (toOrig) { editor = dv.edit; other = dv.orig; }

From 0ed93b4051c262deaffd57f8b3f07bacb1fe8d20 Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Fri, 10 Feb 2017 00:28:59 -0800
Subject: [PATCH 3121/4742] [annotatescrollbar addon] Avoid exception with
 annotations past EOF

---
 addon/scroll/annotatescrollbar.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 11b18c1ee3..ba7a7b2aaf 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -84,11 +84,14 @@
       return topY + (top ? 0 : curLineObj.height);
     }
 
+    var lastLine = cm.lineCount() - 1;
     if (cm.display.barWidth) for (var i = 0, nextTop; i < anns.length; i++) {
       var ann = anns[i];
+      if (ann.to.line > lastLine) continue;
       var top = nextTop || getY(ann.from, true) * hScale;
       var bottom = getY(ann.to, false) * hScale;
       while (i < anns.length - 1) {
+        if (anns[i + 1].to.line > lastLine) break;
         nextTop = getY(anns[i + 1].from, true) * hScale;
         if (nextTop > bottom + .9) break;
         ann = anns[++i];

From 4164d2847140cc8848393594b930821bdc9c8c60 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 10 Feb 2017 21:23:12 +0100
Subject: [PATCH 3122/4742] [annotatescrollbar addon] More correct way to
 determine last line

Issue #4560
---
 addon/scroll/annotatescrollbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index ba7a7b2aaf..f2276fc79f 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -84,7 +84,7 @@
       return topY + (top ? 0 : curLineObj.height);
     }
 
-    var lastLine = cm.lineCount() - 1;
+    var lastLine = cm.lastLine()
     if (cm.display.barWidth) for (var i = 0, nextTop; i < anns.length; i++) {
       var ann = anns[i];
       if (ann.to.line > lastLine) continue;

From 35ab32f5892b98c7954c5408712d18cead0da99c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 10 Feb 2017 21:42:39 +0100
Subject: [PATCH 3123/4742] [shell mode] Recognize nested parentheses

Closes #4472
---
 mode/shell/shell.js | 21 ++++++++++++---------
 mode/shell/test.js  |  3 +++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index a636387395..944f64dc52 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -46,7 +46,7 @@ CodeMirror.defineMode('shell', function() {
       return null;
     }
     if (ch === '\'' || ch === '"' || ch === '`') {
-      state.tokens.unshift(tokenString(ch));
+      state.tokens.unshift(tokenString(ch, ch === "`" ? "quote" : "string"));
       return tokenize(stream, state);
     }
     if (ch === '#') {
@@ -81,26 +81,29 @@ CodeMirror.defineMode('shell', function() {
     return words.hasOwnProperty(cur) ? words[cur] : null;
   }
 
-  function tokenString(quote) {
+  function tokenString(quote, style) {
+    var close = quote == "(" ? ")" : quote
     return function(stream, state) {
       var next, end = false, escaped = false;
       while ((next = stream.next()) != null) {
-        if (next === quote && !escaped) {
+        if (next === close && !escaped) {
           end = true;
           break;
         }
-        if (next === '$' && !escaped && quote !== '\'') {
+        if (next === '$' && !escaped && quote !== "'") {
           escaped = true;
           stream.backUp(1);
           state.tokens.unshift(tokenDollar);
           break;
         }
+        if (next === "(" && quote === "(") {
+          state.tokens.unshift(tokenString(quote, style))
+          return tokenize(stream, state)
+        }
         escaped = !escaped && next === '\\';
       }
-      if (end || !escaped) {
-        state.tokens.shift();
-      }
-      return (quote === '`' || quote === ')' ? 'quote' : 'string');
+      if (end || !escaped) state.tokens.shift();
+      return style;
     };
   };
 
@@ -109,7 +112,7 @@ CodeMirror.defineMode('shell', function() {
     var ch = stream.next(), hungry = /\w/;
     if (ch === '{') hungry = /[^}]/;
     if (/['"(]/.test(ch)) {
-      state.tokens[0] = tokenString(ch == "(" ? ")" : ch);
+      state.tokens[0] = tokenString(ch, ch == "(" ? "quote" : "string");
       return tokenize(stream, state);
     }
     if (!/\d/.test(ch)) {
diff --git a/mode/shell/test.js b/mode/shell/test.js
index a413b5a406..e42dd16287 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -55,4 +55,7 @@
      "[builtin ls] [attribute -l] [attribute --human-readable]");
   MT("operator",
      "[def var][operator =]value");
+
+  MT("doubleParens",
+     "foo [quote $((bar))]")
 })();

From 81b7760c7953482310491578cd37eb4beb046db3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 11 Feb 2017 22:28:57 +0100
Subject: [PATCH 3124/4742] [xml mode] Allow dashes in tag names

Closes #4563
---
 mode/xml/xml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index f987a3a3ce..16b8d3dca1 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -133,7 +133,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
       state.stringStartCol = stream.column();
       return state.tokenize(stream, state);
     } else {
-      stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/);
+      stream.match(/^[^\s\u00a0=<>\"\'\-]*[^\s\u00a0=<>\"\'\/\-]/);
       return "word";
     }
   }

From 526e2f590782a85e6ec823b1a5a9b7bd25b47056 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 11 Feb 2017 22:41:57 +0100
Subject: [PATCH 3125/4742] [comment addon] Support useInnerComments option for
 modes

To forbid using the comment strings from their inner modes

Closes #4562
---
 addon/comment/comment.js | 11 ++++++++---
 mode/soy/soy.js          |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index d71cf43603..1c9878716f 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -49,9 +49,14 @@
     return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"`]/.test(line)
   }
 
+  function getMode(cm, pos) {
+    var mode = cm.getMode()
+    return mode.useInnerComments === false || !mode.innerMode ? mode : cm.getModeAt(pos)
+  }
+
   CodeMirror.defineExtension("lineComment", function(from, to, options) {
     if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
+    var self = this, mode = getMode(self, from);
     var firstLine = self.getLine(from.line);
     if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
 
@@ -95,7 +100,7 @@
 
   CodeMirror.defineExtension("blockComment", function(from, to, options) {
     if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
+    var self = this, mode = getMode(self, from);
     var startString = options.blockCommentStart || mode.blockCommentStart;
     var endString = options.blockCommentEnd || mode.blockCommentEnd;
     if (!startString || !endString) {
@@ -129,7 +134,7 @@
 
   CodeMirror.defineExtension("uncomment", function(from, to, options) {
     if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
+    var self = this, mode = getMode(self, from);
     var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
 
     // Try finding line comments
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index b9eec59a4c..1c1f74d1dc 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -292,6 +292,7 @@
       blockCommentStart: "/*",
       blockCommentEnd: "*/",
       blockCommentContinue: " * ",
+      useInnerComments: false,
       fold: "indent"
     };
   }, "htmlmixed");

From 65043c79f2e0203b70458d3df096623fd037067d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 11 Feb 2017 23:48:52 +0100
Subject: [PATCH 3126/4742] Fix bug in heightAtLine

Where it would return a nonsense offset when called for the end of
the document if the last line had line widgets above it.

Issue #4557
---
 src/edit/methods.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index 6d69cfc250..d4efa31559 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -211,7 +211,7 @@ export default function(CodeMirror) {
       } else {
         lineObj = line
       }
-      return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets).top +
+      return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page", includeWidgets || end).top +
         (end ? this.doc.height - heightAtLine(lineObj) : 0)
     },
 

From d59a4bfb017e0f810f1bd9308e85c234fd8fa5b2 Mon Sep 17 00:00:00 2001
From: Grzegorz Mazur <teoretyk@gmail.com>
Date: Sun, 12 Feb 2017 12:30:07 +0100
Subject: [PATCH 3127/4742] [real world uses] Add yacas online

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 2429ba1655..2f36caf4a9 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -181,6 +181,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.xosystem.org/home/applications_websites/xosystem_website/xoside_EN.php">XOSide</a> (online editor)</li>
       <li><a href="http://videlibri.sourceforge.net/cgi-bin/xidelcgi">XQuery tester</a></li>
       <li><a href="http://q42jaap.github.io/xsd2codemirror/">xsd2codemirror</a> (convert XSD to CM XML completion info)</li>
+      <li><a href="http://www.yacas.org/yacas_online/yacas_online.html">Yacas Online</a> (interactive mathematical software)</li>
     </ul>
 
 </article>

From 423235222e2a2339f794b921c69af1a6596200e9 Mon Sep 17 00:00:00 2001
From: Rrrandom <emanonhere@gmail.com>
Date: Sun, 12 Feb 2017 22:06:52 +0800
Subject: [PATCH 3128/4742] fix broken link in demo/search

---
 demo/search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/search.html b/demo/search.html
index a5a8897190..4ca81e20f5 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -92,7 +92,7 @@ <h2>Search/Replace Demo</h2>
     <p>Searching is enabled by
     including <a href="../addon/search/search.js">addon/search/search.js</a>
     and <a href="../addon/search/searchcursor.js">addon/search/searchcursor.js</a>.
-    Jump to line - including <a href="../addon/search/jumpToLine.js">addon/search/jumpToLine.js</a>.</p>
+    Jump to line - including <a href="../addon/search/jump-to-line.js">addon/search/jump-to-line.js</a>.</p>
     <p>For good-looking input dialogs, you also want to include
     <a href="../addon/dialog/dialog.js">addon/dialog/dialog.js</a>
     and <a href="../addon/dialog/dialog.css">addon/dialog/dialog.css</a>.</p>

From a86de0c386e9470eff07fb4cb5be36b807e9f9ac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 13 Feb 2017 10:41:32 +0100
Subject: [PATCH 3129/4742] [merge addon] Add support for a revertChunk
 callback

Issue #4537
---
 addon/merge/merge.js | 10 ++++++++--
 doc/manual.html      |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index ed69a4fa6d..1f12671bce 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -454,9 +454,15 @@
 
   function copyChunk(dv, to, from, chunk) {
     if (dv.diffOutOfDate) return;
-    var editStart = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
     var origStart = chunk.origTo > from.lastLine() ? Pos(chunk.origFrom - 1) : Pos(chunk.origFrom, 0)
-    to.replaceRange(from.getRange(origStart, Pos(chunk.origTo, 0)), editStart, Pos(chunk.editTo, 0))
+    var origEnd = Pos(chunk.origTo, 0)
+    var editStart = chunk.editTo > to.lastLine() ? Pos(chunk.editFrom - 1) : Pos(chunk.editFrom, 0)
+    var editEnd = Pos(chunk.editTo, 0)
+    var handler = dv.mv.options.revertChunk
+    if (handler)
+      handler(dv.mv, from, origStart, origEnd, to, editStart, editEnd)
+    else
+      to.replaceRange(from.getRange(origStart, origEnd), editStart, editEnd)
   }
 
   // Merge view, containing 0, 1, or 2 diff views.
diff --git a/doc/manual.html b/doc/manual.html
index 496494c4fc..03250ad42e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2993,6 +2993,9 @@ <h2 id="addons">Addons</h2>
           <dt><code><strong>revertButtons</strong>: boolean</code></dt>
           <dd>Determines whether buttons that allow the user to revert
           changes are shown. Defaults to true.</dd>
+          <dt><code><strong>revertChunk</strong>: fn(mv: MergeView, from: CodeMirror, fromStart: Pos, fromEnd: Pos, to: CodeMirror, toStart: Pos, toEnd: Pos)</code></dt>
+          <dd>Can be used to define custom behavior when the user
+          reverts a changed chunk.</dd>
           <dt><code><strong>connect</strong>: string</code></dt>
           <dd>Sets the style used to connect changed chunks of code.
           By default, connectors are drawn. When this is set

From e3ac4c7ac8fb626ebe7a2d764ad1377dd5b850b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 13 Feb 2017 15:14:36 +0100
Subject: [PATCH 3130/4742] [closebrackets addon] Handle corner case for quotes
 in strings

Closes #4549
---
 addon/edit/closebrackets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 62b99c1ba8..01fdd96ce1 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -185,7 +185,7 @@
   function enteringString(cm, pos, ch) {
     var line = cm.getLine(pos.line);
     var token = cm.getTokenAt(pos);
-    if (/\bstring2?\b/.test(token.type)) return false;
+    if (/\bstring2?\b/.test(token.type) || stringStartsAfter(cm, pos)) return false;
     var stream = new CodeMirror.StringStream(line.slice(0, pos.ch) + ch + line.slice(pos.ch), 4);
     stream.pos = stream.start = token.start;
     for (;;) {

From beedc20c93215513c58c038a8606c0f508274507 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 13 Feb 2017 21:42:35 +0100
Subject: [PATCH 3131/4742] [markdown mode] Fix typo on token style

Closes #4568
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 483422a90a..4ba57e44ca 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -245,7 +245,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = state.block = leavingLocal;
       return getType(state)
     } else if (state.fencedChars && stream.skipTo(state.fencedChars)) {
-      return "commment"
+      return "comment"
     } else if (state.localMode) {
       return state.localMode.token(stream, state.localState);
     } else {

From aaa2540c1b4f54235b9188e6426b23f13f119c61 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 14 Feb 2017 08:37:06 +0100
Subject: [PATCH 3132/4742] [htmlmixed mode] Add script type=module

Closes #4573
---
 mode/htmlmixed/htmlmixed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index eb21fcc149..16b4f139fd 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -14,7 +14,7 @@
   var defaultTags = {
     script: [
       ["lang", /(javascript|babel)/i, "javascript"],
-      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, "javascript"],
+      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i, "javascript"],
       ["type", /./, "text/plain"],
       [null, null, "javascript"]
     ],

From 3406d7731d1de78af646780dd3dc699e5e42e672 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 14 Feb 2017 09:10:48 +0100
Subject: [PATCH 3133/4742] [javascript mode] Fix async methods

Closes #4499
---
 mode/javascript/javascript.js | 2 +-
 mode/javascript/test.js       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 17890dcc12..8a3679d7ff 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -639,7 +639,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function classBody(type, value) {
     if (type == "variable" || cx.style == "keyword") {
-      if ((value == "static" || value == "get" || value == "set" ||
+      if ((value == "async" || value == "static" || value == "get" || value == "set" ||
            (isTS && (value == "public" || value == "private" || value == "protected" || value == "readonly" || value == "abstract"))) &&
           cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false)) {
         cx.marked = "keyword";
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index c02eb06c31..246263a317 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -48,6 +48,12 @@
      "  [property sub]([def a], [def b]) {}",
      "};");
 
+  MT("class_async_method",
+     "[keyword class] [def Foo] {",
+     "  [property sayName1]() {}",
+     "  [keyword async] [property sayName2]() {}",
+     "}");
+
   MT("import",
      "[keyword function] [def foo]() {",
      "  [keyword import] [def $] [keyword from] [string 'jquery'];",

From 03cba9f82775047640074b2999ac717084f3c0a5 Mon Sep 17 00:00:00 2001
From: Josh Barnes <joshuacookebarnes@gmail.com>
Date: Mon, 13 Feb 2017 18:30:29 +0000
Subject: [PATCH 3134/4742] [octave mode] Add lineComment and indent property

---
 mode/octave/octave.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index a7bec030c2..f38b751d1b 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -126,7 +126,11 @@ CodeMirror.defineMode("octave", function() {
         state.tokenize = tokenTranspose;
       }
       return style;
-    }
+    },
+
+    lineComment: '%',
+
+    fold: 'indent'
   };
 });
 

From ad4d266cf5bab886c61be3ccfdced5f97bcb18b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 14 Feb 2017 10:38:27 +0100
Subject: [PATCH 3135/4742] [merge addon] Fix bug in drawing of changed chunks
 at end of doc

Issue #4572
---
 addon/merge/merge.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 1f12671bce..e26ef44136 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -277,7 +277,7 @@
       }
     }
 
-    var chunkStart = 0;
+    var chunkStart = 0, pending = false;
     for (var i = 0; i < diff.length; ++i) {
       var part = diff[i], tp = part[0], str = part[1];
       if (tp == DIFF_EQUAL) {
@@ -285,10 +285,11 @@
         moveOver(pos, str);
         var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
         if (cleanTo > cleanFrom) {
-          if (i) markChunk(chunkStart, cleanFrom);
+          if (pending) { markChunk(chunkStart, cleanFrom); pending = false }
           chunkStart = cleanTo;
         }
       } else {
+        pending = true
         if (tp == type) {
           var end = moveOver(pos, str, true);
           var a = posMax(top, pos), b = posMin(bot, end);
@@ -298,7 +299,7 @@
         }
       }
     }
-    if (chunkStart <= pos.line) markChunk(chunkStart, pos.line + 1);
+    if (pending) markChunk(chunkStart, pos.line + 1);
   }
 
   // Updating the gap between editor and original

From 459873b5c1807527314706c03580ec06515e8d1e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 14 Feb 2017 10:47:42 +0100
Subject: [PATCH 3136/4742] [merge addon] Fix bug in determining the extent of
 chunks near the end of the doc

Issue #4572
---
 addon/merge/merge.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index e26ef44136..cd6385f957 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -627,10 +627,10 @@
   function endOfLineClean(diff, i) {
     if (i == diff.length - 1) return true;
     var next = diff[i + 1][1];
-    if (next.length == 1 || next.charCodeAt(0) != 10) return false;
+    if ((next.length == 1 && i < diff.length - 2) || next.charCodeAt(0) != 10) return false;
     if (i == diff.length - 2) return true;
     next = diff[i + 2][1];
-    return next.length > 1 && next.charCodeAt(0) == 10;
+    return (next.length > 1 || i == diff.length - 3) && next.charCodeAt(0) == 10;
   }
 
   function startOfLineClean(diff, i) {

From 6c272f2c7f85f156779f3a08f0337dbd4693e69d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 14 Feb 2017 11:35:13 +0100
Subject: [PATCH 3137/4742] [merge addon] Fix cyclic scroll syncing issue

Issue #4559
---
 addon/merge/merge.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index cd6385f957..6694679da0 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -161,7 +161,7 @@
     else { editor = dv.orig; other = dv.edit; }
     // Don't take action if the position of this editor was recently set
     // (to prevent feedback loops)
-    if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
+    if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 250 > now) return false;
 
     var sInfo = editor.getScrollInfo();
     if (dv.mv.options.connect == "align") {
@@ -188,6 +188,8 @@
       }
     }
 
+    if (window.dv && other == window.dv.editor()) console.log("scroll fed back right to left", targetPos)
+    else console.log("propagate left to right", targetPos)
     other.scrollTo(sInfo.left, targetPos);
     other.state.scrollSetAt = now;
     other.state.scrollSetBy = dv;
@@ -386,8 +388,10 @@
     for (var ln = 0; ln < linesToAlign.length; ln++)
       alignLines(cm, linesToAlign[ln], aligners);
 
-    for (var i = 0; i < cm.length; i++)
+    for (var i = 0; i < cm.length; i++) {
+      if (i == 0) console.log("scroll to in align", scroll[i])
       cm[i].scrollTo(null, scroll[i]);
+    }
   }
 
   function alignLines(cm, lines, aligners) {

From fdf681984c1dc7b71daac72b5707a3fab87d5a87 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 14 Feb 2017 11:37:51 +0100
Subject: [PATCH 3138/4742] [merge addon] Remove debug statements

Issue #4559
---
 addon/merge/merge.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 6694679da0..22a86c1cb2 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -188,8 +188,6 @@
       }
     }
 
-    if (window.dv && other == window.dv.editor()) console.log("scroll fed back right to left", targetPos)
-    else console.log("propagate left to right", targetPos)
     other.scrollTo(sInfo.left, targetPos);
     other.state.scrollSetAt = now;
     other.state.scrollSetBy = dv;
@@ -388,10 +386,8 @@
     for (var ln = 0; ln < linesToAlign.length; ln++)
       alignLines(cm, linesToAlign[ln], aligners);
 
-    for (var i = 0; i < cm.length; i++) {
-      if (i == 0) console.log("scroll to in align", scroll[i])
+    for (var i = 0; i < cm.length; i++)
       cm[i].scrollTo(null, scroll[i]);
-    }
   }
 
   function alignLines(cm, lines, aligners) {

From d9241d6924c557e5eb236d002a42d34d787d6409 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 15 Feb 2017 11:03:18 +0100
Subject: [PATCH 3139/4742] Doc that annotatescrollbar expects a sorted array

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

diff --git a/doc/manual.html b/doc/manual.html
index 03250ad42e..48d90cfda5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2882,7 +2882,7 @@ <h2 id="addons">Addons</h2>
       method <code>annotateScrollbar</code> to editor instances that
       can be called, with a CSS class name as argument, to create a
       set of annotations. The method returns an object
-      whose <code>update</code> method can be called with an array
+      whose <code>update</code> method can be called with a sorted array
       of <code>{from: Pos, to: Pos}</code> objects marking the ranges
       to be highlighted. To detach the annotations, call the
       object's <code>clear</code> method.</dd>

From 6e1f8e81cf9709a002b978a077d5380cba979b13 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 15 Feb 2017 11:06:28 +0100
Subject: [PATCH 3140/4742] Fire lineWidgetAdded and lineWidgetCleared events

---
 src/model/line_widget.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index 5854e43df7..ba7c3829e2 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -6,6 +6,7 @@ import { lineNo, updateLineHeight } from "../line/utils_line"
 import { widgetHeight } from "../measurement/widgets"
 import { changeLine } from "./changes"
 import { eventMixin } from "../util/event"
+import { signalLater } from "../util/operation_group"
 
 // Line widgets are block elements displayed above or below a line.
 
@@ -24,10 +25,13 @@ export class LineWidget {
     if (!ws.length) line.widgets = null
     let height = widgetHeight(this)
     updateLineHeight(line, Math.max(0, line.height - height))
-    if (cm) runInOp(cm, () => {
-      adjustScrollWhenAboveVisible(cm, line, -height)
-      regLineChange(cm, no, "widget")
-    })
+    if (cm) {
+      runInOp(cm, () => {
+        adjustScrollWhenAboveVisible(cm, line, -height)
+        regLineChange(cm, no, "widget")
+      })
+      signalLater(cm, "lineWidgetCleared", cm, this)
+    }
   }
 
   changed() {
@@ -66,5 +70,6 @@ export function addLineWidget(doc, handle, node, options) {
     }
     return true
   })
+  signalLater(cm, "lineWidgetAdded", cm, widget)
   return widget
 }

From 3d669e59eb148af29fab81a498e0cd21dbd400b4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 15 Feb 2017 11:08:08 +0100
Subject: [PATCH 3141/4742] [merge addon] Listen to line widget events to
 realign chunks

Issue #4575
---
 addon/merge/merge.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 22a86c1cb2..da5dcca55a 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -129,10 +129,11 @@
     dv.orig.on("change", change);
     dv.edit.on("swapDoc", swapDoc);
     dv.orig.on("swapDoc", swapDoc);
-    dv.edit.on("markerAdded", setDealign);
-    dv.edit.on("markerCleared", setDealign);
-    dv.orig.on("markerAdded", setDealign);
-    dv.orig.on("markerCleared", setDealign);
+    var events = ["markerAdded", "markerCleared", "lineWidgetAdded", "lineWidgetCleared"]
+    for (var i = 0; i < events.length; i++) {
+      dv.edit.on(events[i], setDealign);
+      dv.orig.on(events[i], setDealign);
+    }
     dv.edit.on("viewportChange", function() { set(false); });
     dv.orig.on("viewportChange", function() { set(false); });
     update();

From 88b37cf580032c32e79b674e30cfaad20dd75960 Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Tue, 17 Jan 2017 10:48:09 +1100
Subject: [PATCH 3142/4742] [javascript mode] Support TypeScript-style comma
 separated extend

---
 mode/javascript/javascript.js |  6 +++++-
 mode/javascript/test.js       | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 8a3679d7ff..4286bba685 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -634,7 +634,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
   function classNameAfter(type, value) {
-    if (value == "extends" || value == "implements") return cont(isTS ? typeexpr : expression, classNameAfter);
+    if (value == "extends" || value == "implements") {
+      return isTS ?
+        cont(commasep(typeexpr, "{"), pushlex("}"), classBody, poplex) :
+        cont(expression, classNameAfter);
+    }
     if (type == "{") return cont(pushlex("}"), classBody, poplex);
   }
   function classBody(type, value) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 246263a317..8006588152 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -273,6 +273,16 @@
      "  [property prop2][operator ?]: [variable-3 string];",
      "} [operator =] {};")
 
+  TS("typescript_double_extend",
+     "[keyword export] [keyword interface] [def UserAttributes] {",
+     "  [property id][operator ?]: [variable-3 number];",
+     "  [property createdAt][operator ?]: [variable-3 Date];",
+     "}",
+     "[keyword export] [keyword interface] [def UserInstance] [keyword extends] [variable-3 Sequelize].[variable-3 Instance][operator <][variable-3 UserAttributes][operator >], [variable-3 UserAttributes] {",
+     "  [property id]: [variable-3 number];",
+     "  [property createdAt]: [variable-3 Date];",
+     "}");
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 53612ac34c5c5e4bdb4c7e46b498c01fdee20767 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 16 Feb 2017 08:57:39 +0100
Subject: [PATCH 3143/4742] [javascript mode] Simplify 88b37cf580

Issue #4497
---
 mode/javascript/javascript.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 4286bba685..1811b29c43 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -634,11 +634,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
   function classNameAfter(type, value) {
-    if (value == "extends" || value == "implements") {
-      return isTS ?
-        cont(commasep(typeexpr, "{"), pushlex("}"), classBody, poplex) :
-        cont(expression, classNameAfter);
-    }
+    if (value == "extends" || value == "implements" || (isTS && type == ","))
+      return cont(isTS ? typeexpr : expression, classNameAfter);
     if (type == "{") return cont(pushlex("}"), classBody, poplex);
   }
   function classBody(type, value) {

From b86bb0a70ffead18bb16dbc7f80900753eb4c6fa Mon Sep 17 00:00:00 2001
From: ficristo <Filippo@MacBook-Pro-7.local>
Date: Wed, 15 Feb 2017 17:56:17 +0100
Subject: [PATCH 3144/4742] [sass mode] Improvements

---
 mode/sass/sass.js | 47 ++++++++++++++++++++++++++---------------------
 mode/sass/test.js | 37 ++++++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index d2d2502968..ba0e05626c 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -15,21 +15,13 @@ CodeMirror.defineMode("sass", function(config) {
   var cssMode = CodeMirror.mimeModes["text/css"];
   var propertyKeywords = cssMode.propertyKeywords || {},
       colorKeywords = cssMode.colorKeywords || {},
-      valueKeywords = cssMode.valueKeywords || {};
+      valueKeywords = cssMode.valueKeywords || {},
+      fontProperties = cssMode.fontProperties || {};
 
   function tokenRegexp(words) {
     return new RegExp("^" + words.join("|"));
   }
 
-  function propWithVendorPrefix(keyset, string) {
-    if (string.indexOf('-') !== 0) {
-      return false;
-    }
-
-    var unvendored = string.substring(string.indexOf("-", 1) + 1);
-    return keyset.hasOwnProperty(unvendored);
-  }
-
   var keywords = ["true", "false", "null", "auto"];
   var keywordsRegexp = new RegExp("^" + keywords.join("|"));
 
@@ -41,6 +33,10 @@ CodeMirror.defineMode("sass", function(config) {
 
   var word;
 
+  function isEndLine(stream) {
+    return !stream.peek() || stream.match(/\s+$/, false);
+  }
+
   function urlTokens(stream, state) {
     var ch = stream.peek();
 
@@ -92,6 +88,9 @@ CodeMirror.defineMode("sass", function(config) {
 
       if (endingString) {
         if (nextChar !== quote && greedy) { stream.next(); }
+        if (isEndLine(stream)) {
+          state.cursorHalf = 0;
+        }
         state.tokenizer = tokenBase;
         return "string";
       } else if (nextChar === "#" && peekChar === "{") {
@@ -163,6 +162,12 @@ CodeMirror.defineMode("sass", function(config) {
     // first half i.e. before : for key-value pairs
     // including selectors
 
+      if (ch === "-") {
+        if (stream.match(/^-\w+-/)) {
+          return "meta";
+        }
+      }
+
       if (ch === ".") {
         stream.next();
         if (stream.match(/^[\w-]+/)) {
@@ -255,7 +260,7 @@ CodeMirror.defineMode("sass", function(config) {
           } else if (propertyKeywords.hasOwnProperty(word)) {
             state.prevProp = word;
             return "property";
-          } else if (propWithVendorPrefix(propertyKeywords, word)) {
+          } else if (fontProperties.hasOwnProperty(word)) {
             return "property";
           }
           return "tag";
@@ -277,7 +282,7 @@ CodeMirror.defineMode("sass", function(config) {
 
       if(ch === ":"){
         if (stream.match(pseudoElementsRegexp)){ // could be a pseudo-element
-          return "keyword";
+          return "variable-3";
         }
         stream.next();
         state.cursorHalf=1;
@@ -291,7 +296,7 @@ CodeMirror.defineMode("sass", function(config) {
         stream.next();
         // Hex numbers
         if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
-          if(!stream.peek()){
+          if (isEndLine(stream)) {
             state.cursorHalf = 0;
           }
           return "number";
@@ -300,7 +305,7 @@ CodeMirror.defineMode("sass", function(config) {
 
       // Numbers
       if (stream.match(/^-?[0-9\.]+/)){
-        if(!stream.peek()){
+        if (isEndLine(stream)) {
           state.cursorHalf = 0;
         }
         return "number";
@@ -308,14 +313,14 @@ CodeMirror.defineMode("sass", function(config) {
 
       // Units
       if (stream.match(/^(px|em|in)\b/)){
-        if(!stream.peek()){
+        if (isEndLine(stream)) {
           state.cursorHalf = 0;
         }
         return "unit";
       }
 
       if (stream.match(keywordsRegexp)){
-        if(!stream.peek()){
+        if (isEndLine(stream)) {
           state.cursorHalf = 0;
         }
         return "keyword";
@@ -323,7 +328,7 @@ CodeMirror.defineMode("sass", function(config) {
 
       if (stream.match(/^url/) && stream.peek() === "(") {
         state.tokenizer = urlTokens;
-        if(!stream.peek()){
+        if (isEndLine(stream)) {
           state.cursorHalf = 0;
         }
         return "atom";
@@ -333,7 +338,7 @@ CodeMirror.defineMode("sass", function(config) {
       if (ch === "$") {
         stream.next();
         stream.eatWhile(/[\w-]/);
-        if(!stream.peek()){
+        if (isEndLine(stream)) {
           state.cursorHalf = 0;
         }
         return "variable-2";
@@ -347,7 +352,7 @@ CodeMirror.defineMode("sass", function(config) {
       }
 
       if (stream.match(opRegexp)){
-        if(!stream.peek() || stream.match(/\s+$/, false)){
+        if (isEndLine(stream)) {
           state.cursorHalf = 0;
         }
         return "operator";
@@ -355,7 +360,7 @@ CodeMirror.defineMode("sass", function(config) {
 
       // attributes
       if (stream.eatWhile(/[\w-]/)) {
-        if(!stream.peek()){
+        if (isEndLine(stream)) {
           state.cursorHalf = 0;
         }
         word = stream.current().toLowerCase();
@@ -372,7 +377,7 @@ CodeMirror.defineMode("sass", function(config) {
       }
 
       //stream.eatSpace();
-      if(!stream.peek()){
+      if (isEndLine(stream)) {
         state.cursorHalf = 0;
         return null;
       }
diff --git a/mode/sass/test.js b/mode/sass/test.js
index 56ba006415..6b2f593218 100644
--- a/mode/sass/test.js
+++ b/mode/sass/test.js
@@ -66,27 +66,23 @@
      "  [property font-size][operator :] [number 2.5][unit em]")
 
   MT("selector",
-     // SCSS uses variable-3
+     // SCSS doesn't highlight the :
      // "[tag h1]:[variable-3 before],",
      // "[tag h2]:[variable-3 before]",
-     "[tag h1][keyword :before],",
-     "[tag h2][keyword :before]",
+     "[tag h1][variable-3 :before],",
+     "[tag h2][variable-3 :before]",
      "  [property content][operator :] [string \"::\"]")
 
   MT("definition_mixin_equal",
      "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
      "[meta =bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )]",
-     // The vendor prefix is highlighted as "meta" in CSS mode
-     // "  [meta -webkit-][property box-sizing][operator :] [variable-2 $bs-type]",
-     "  [property -webkit-box-sizing][operator :] [variable-2 $bs-type]",
+     "  [meta -webkit-][property box-sizing][operator :] [variable-2 $bs-type]",
      "  [property box-sizing][operator :] [variable-2 $bs-type]")
 
   MT("definition_mixin_with_space",
      "[variable-2 $defined-bs-type][operator :] [atom border-box] [keyword !default]",
      "[def @mixin] [tag bs][operator (][variable-2 $bs-type][operator :] [variable-2 $defined-bs-type][operator )] ",
-     // The vendor prefix is highlighted as "meta" in CSS mode
-     // "  [meta -moz-][property box-sizing][operator :] [variable-2 $bs-type]",
-     "  [property -moz-box-sizing][operator :] [variable-2 $bs-type]",
+     "  [meta -moz-][property box-sizing][operator :] [variable-2 $bs-type]",
      "  [property box-sizing][operator :] [variable-2 $bs-type]")
 
   MT("numbers_start_dot_include_plus",
@@ -100,4 +96,27 @@
   MT("include",
      "[qualifier .bar]",
      "  [def @include] [tag border-radius][operator (][number 8][unit px][operator )]")
+
+  MT("reference_parent",
+     "[qualifier .col]",
+     "  [property clear][operator :] [atom both]",
+     // SCSS doesn't highlight the :
+     // "  &:[variable-3 after]",
+     "  &[variable-3 :after]",
+     "    [property content][operator :] [string '']",
+     "    [property clear][operator :] [atom both]")
+
+  MT("reference_parent_with_spaces",
+     "[tag section]",
+     "  [property border-left][operator :]  [number 20][unit px] [atom transparent] [atom solid] ",
+     "  &[qualifier .section3]",
+     "    [qualifier .title]",
+     "      [property color][operator :] [keyword white] ",
+     "    [qualifier .vermas]",
+     "      [property display][operator :] [atom none]")
+
+  MT("font_face",
+     "[def @font-face]",
+     "  [property font-family][operator :] [string 'icomoon']",
+     "  [property src][operator :] [atom url][operator (][string fonts/icomoon.ttf][operator )]")
 })();

From 5161915df4b1d59b8e84eacabffd7a74fcf11087 Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Thu, 16 Feb 2017 17:07:57 -0800
Subject: [PATCH 3145/4742] [powershell mode] Fix exception with @ on EOL

---
 mode/powershell/powershell.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/powershell/powershell.js b/mode/powershell/powershell.js
index c443e7232d..5eae979488 100644
--- a/mode/powershell/powershell.js
+++ b/mode/powershell/powershell.js
@@ -222,6 +222,8 @@ CodeMirror.defineMode('powershell', function() {
         state.tokenize = tokenMultiString;
         state.startQuote = quoteMatch[0];
         return tokenMultiString(stream, state);
+      } else if (stream.eol()) {
+        return 'error';
       } else if (stream.peek().match(/[({]/)) {
         return 'punctuation';
       } else if (stream.peek().match(varNames)) {

From f74034ef9a46b40f8fa54c35fd729bbb936491a5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 17 Feb 2017 11:23:42 +0100
Subject: [PATCH 3146/4742] [css mode] Allow vendor prefixes in front of pseudo
 elements

Closes #4585
---
 mode/css/css.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/css/css.js b/mode/css/css.js
index 16d6f05b9f..23d0b4db0c 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -254,6 +254,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   };
 
   states.pseudo = function(type, stream, state) {
+    if (type == "meta") return "pseudo";
+
     if (type == "word") {
       override = "variable-3";
       return state.context.type;

From 2d01d7d12009319ca555b76cb0d3b3c48a843f69 Mon Sep 17 00:00:00 2001
From: Bryan Massoth <btmassoth@gmail.com>
Date: Fri, 17 Feb 2017 10:06:13 -0500
Subject: [PATCH 3147/4742] Subtract by 3 to account for the 2 extra parameters
 for splice and for replacing an existing part.

---
 src/line/spans.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/line/spans.js b/src/line/spans.js
index b9da7de7b1..6c413d2fc2 100644
--- a/src/line/spans.js
+++ b/src/line/spans.js
@@ -163,7 +163,7 @@ export function removeReadOnlyRanges(doc, from, to) {
       if (dto > 0 || !mk.inclusiveRight && !dto)
         newParts.push({from: m.to, to: p.to})
       parts.splice.apply(parts, newParts)
-      j += newParts.length - 1
+      j += newParts.length - 3
     }
   }
   return parts

From 76278ea61fbdf14d03a4e0d3ed138ecfed5fbc01 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Feb 2017 09:52:07 +0100
Subject: [PATCH 3148/4742] [css mode] Remove trailing comma in demo

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

diff --git a/mode/css/index.html b/mode/css/index.html
index 2d2b9b073c..0d85311f1d 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -64,7 +64,7 @@ <h2>CSS mode</h2>
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        extraKeys: {"Ctrl-Space": "autocomplete"},
+        extraKeys: {"Ctrl-Space": "autocomplete"}
       });
     </script>
 

From df00f3fc29abe5191548df70a0b20a35b6a34d76 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Feb 2017 13:03:49 +0100
Subject: [PATCH 3149/4742] Fix bad input reading after a cx menu copy +
 unfocus

Closes #4569
---
 src/input/TextareaInput.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 28b3327376..85d2c0054f 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -326,10 +326,14 @@ export default class TextareaInput {
         if (!ie || (ie && ie_version < 9)) prepareSelectAllHack()
         let i = 0, poll = () => {
           if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
-              te.selectionEnd > 0 && input.prevInput == "\u200b")
+              te.selectionEnd > 0 && input.prevInput == "\u200b") {
             operation(cm, selectAll)(cm)
-          else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500)
-          else display.input.reset()
+          } else if (i++ < 10) {
+            display.detectingSelectAll = setTimeout(poll, 500)
+          } else {
+            display.selForContextMenu = null
+            display.input.reset()
+          }
         }
         display.detectingSelectAll = setTimeout(poll, 200)
       }

From 068ba76e99bb0610f0a8515e9382d85fd78636fb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Feb 2017 13:12:03 +0100
Subject: [PATCH 3150/4742] [dylan mode] Fix bad behavior for words that are in
 Object.prototype

Closes #4590
---
 mode/dylan/dylan.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index 7d4c3ed2fd..2bb33efe92 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -277,7 +277,7 @@ CodeMirror.defineMode("dylan", function(_config) {
     } else {
       stream.eatWhile(/[\w\-]/);
       // Keyword
-      if (wordLookup[stream.current()]) {
+      if (wordLookup.hasOwnProperty(stream.current())) {
         return styleLookup[stream.current()];
       } else if (stream.current().match(symbol)) {
         return "variable";

From 4a0d0ca65190ca11d5c8ccfb4f4f0bc3f7038439 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Feb 2017 13:12:52 +0100
Subject: [PATCH 3151/4742] [dylan mode] Fix another ES5-ism

---
 mode/dylan/dylan.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index 2bb33efe92..0acc1a3888 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -14,6 +14,10 @@
 function forEach(arr, f) {
   for (var i = 0; i < arr.length; i++) f(arr[i], i)
 }
+function some(arr, f) {
+  for (var i = 0; i < arr.length; i++) if (f(arr[i], i)) return true
+  return false
+}
 
 CodeMirror.defineMode("dylan", function(_config) {
   // Words
@@ -262,7 +266,7 @@ CodeMirror.defineMode("dylan", function(_config) {
     for (var name in patterns) {
       if (patterns.hasOwnProperty(name)) {
         var pattern = patterns[name];
-        if ((pattern instanceof Array && pattern.some(function(p) {
+        if ((pattern instanceof Array && some(pattern, function(p) {
           return stream.match(p);
         })) || stream.match(pattern))
           return patternStyles[name];

From 0100ef38b0b81f6b94d608aa6f54cc9eae185c6e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Feb 2017 13:24:32 +0100
Subject: [PATCH 3152/4742] [manual] Mention Pos.sticky

---
 doc/manual.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 48d90cfda5..55f4ffa732 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1138,7 +1138,11 @@ <h2>Programming API</h2>
     shouldn't worry too much about sanitizing your coordinates. If you
     give <code>ch</code> a value of <code>null</code>, or don't
     specify it, it will be replaced with the length of the specified
-    line.</p>
+    line. Such positions may also have a <code>sticky</code> property
+    holding <code>"before"</code> or <code>"after"</code>, whether the
+    position is associated with the character before or after it. This
+    influences, for example, where the cursor is drawn on a
+    line-break or bidi-direction boundary.</p>
 
     <p>Methods prefixed with <code>doc.</code> can, unless otherwise
     specified, be called both on <code>CodeMirror</code> (editor)
@@ -2162,9 +2166,12 @@ <h3 id="api_static">Static properties</h3>
       whenever the given <code>predicate</code> returns true when
       called with the local mode and editor.</dd>
 
-      <dt id="Pos"><code><strong>CodeMirror.Pos</strong>(line: integer, ?ch: integer)</code></dt>
-      <dd>A constructor for the <code>{line, ch}</code> objects that
-      are used to represent positions in editor documents.</dd>
+      <dt id="Pos"><code><strong>CodeMirror.Pos</strong>(line: integer, ?ch: integer, ?sticky: string)</code></dt>
+      <dd>A constructor for the objects that are used to represent
+      positions in editor documents. <code>sticky</code> defaults to
+      null, but can be set to <code>"before"</code>
+      or <code>"after"</code> to make the position explicitly
+      associate with the character before or after it.</dd>
 
       <dt id="changeEnd"><code><strong>CodeMirror.changeEnd</strong>(change: object) → {line, ch}</code></dt>
       <dd>Utility function that computes an end position from a change

From e22a45188669014923585f0c8cc6e42ccad9345b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Feb 2017 13:30:22 +0100
Subject: [PATCH 3153/4742] [contenteditable input] Don't preventDefault
 keypress events when charCode==0

Closes #4589
---
 src/input/ContentEditableInput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 4c7b58ebde..898b74be72 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -325,6 +325,7 @@ export default class ContentEditableInput {
   }
 
   onKeyPress(e) {
+    if (e.charCode == 0) return
     e.preventDefault()
     if (!this.cm.isReadOnly())
       operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0)

From ddd5130e07e4f805866361c0d4b243a13d62adad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Feb 2017 14:32:07 +0100
Subject: [PATCH 3154/4742] Mark version 5.24.0

---
 AUTHORS           |  7 +++++++
 CHANGELOG.md      | 42 ++++++++++++++++++++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 21 +++++++++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 866c78f842..bc894e9f7a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -68,6 +68,7 @@ Apollo Zhu
 AQNOUCH Mohammed
 areos
 Arnab Bose
+Arthur Müller
 as3boyan
 atelierbram
 AtomicPages LLC
@@ -102,6 +103,7 @@ Brett Zamir
 Brian Grinstead
 Brian Sletten
 Bruce Mitchener
+Bryan Massoth
 Caitlin Potter
 Calin Barbat
 callodacity
@@ -180,6 +182,7 @@ Enam Mijbah Noor
 Eric Allam
 Erik Welander
 eustas
+Fabien Dubosson
 Fabien O'Carroll
 Fabio Zendhi Nagao
 Faiza Alsaied
@@ -205,6 +208,7 @@ Gary Sheng
 Gautam Mehta
 Gavin Douglas
 gekkoe
+Geordie Hall
 geowarin
 Gerard Braad
 Gergely Hegykozi
@@ -302,6 +306,7 @@ Jon Malmaud
 Jon Sangster
 Joost-Wim Boekesteijn
 Joseph Pecoraro
+Josh Barnes
 Josh Cohen
 Josh Soref
 Joshua Newman
@@ -324,6 +329,7 @@ Ken Newman
 ken restivo
 Ken Rockot
 Kevin Earls
+Kevin Muret
 Kevin Sawicki
 Kevin Ushey
 Klaus Silveira
@@ -510,6 +516,7 @@ Roberto Abdelkader Martínez Pérez
 robertop23
 Robert Plummer
 Rrandom
+Rrrandom
 Ruslan Osmanov
 Ryan Prior
 sabaca
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07ed0295e5..54c2578e12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,45 @@
+## 5.24.0 (2017-02-20)
+
+### Bug fixes
+
+A cursor directly before a line-wrapping break is now drawn before or after the line break depending on which direction you arrived from.
+
+Visual cursor motion in line-wrapped right-to-left text should be much more correct.
+
+Fix bug in handling of read-only marked text.
+
+[shell mode](http://codemirror.net/mode/shell/): Properly tokenize nested parentheses.
+
+[python mode](http://codemirror.net/mode/python/): Support underscores in number literals.
+
+[sass mode](http://codemirror.net/mode/sass/): Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset.
+
+[css mode](http://codemirror.net/mode/css/): Expose `lineComment` property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.
+
+[julia mode](http://codemirror.net/mode/julia/): Properly indent `elseif` lines.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Properly recognize the end of fenced code blocks when inside other markup.
+
+[scala mode](http://codemirror.net/mode/clike/): Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.
+
+[xml mode](http://codemirror.net/mode/xml/): Allow dashes in HTML tag names.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve parsing of async methods, TypeScript-style comma-separated superclass lists.
+
+[indent-fold addon](http://codemirror.net/demo/folding.html): Ignore comment lines.
+
+### New features
+
+Positions now support a `sticky` property which determines whether they should be associated with the character before (value `"before"`) or after (value `"after"`) them.
+
+[vim bindings](http://codemirror.net/mode/demo/vim.html): Make it possible to remove built-in bindings through the API.
+
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.
+
+### Breaking changes
+
+The [sass mode](http://codemirror.net/mode/sass/) now depends on the [css mode](http://codemirror.net/mode/css/).
+
 ## 5.23.0 (2017-01-19)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 55f4ffa732..912f0446e2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.23.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.24.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 69c0e66b10..1404a465cd 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,27 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-02-2017: <a href="http://codemirror.net/codemirror-5.24.0.zip">Version 5.24.0</a>:</p>
+
+  <ul class=rel-note>
+    <li>Positions now support a <code>sticky</code> property which determines whether they should be associated with the character before (value <code>"before"</code>) or after (value <code>"after"</code>) them.</li>
+    <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Make it possible to remove built-in bindings through the API.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.</li>
+    <li>A cursor directly before a line-wrapping break is now drawn before or after the line break depending on which direction you arrived from.</li>
+    <li>Visual cursor motion in line-wrapped right-to-left text should be much more correct.</li>
+    <li>Fix bug in handling of read-only marked text.</li>
+    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Properly tokenize nested parentheses.</li>
+    <li><a href="http://codemirror.net/mode/python/">python mode</a>: Support underscores in number literals.</li>
+    <li><a href="http://codemirror.net/mode/sass/">sass mode</a>: Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset. Now depends on the css mode.</li>
+    <li><a href="http://codemirror.net/mode/css/">css mode</a>: Expose <code>lineComment</code> property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.</li>
+    <li><a href="http://codemirror.net/mode/julia/">julia mode</a>: Properly indent <code>elseif</code> lines.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Properly recognize the end of fenced code blocks when inside other markup.</li>
+    <li><a href="http://codemirror.net/mode/clike/">scala mode</a>: Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.</li>
+    <li><a href="http://codemirror.net/mode/xml/">xml mode</a>: Allow dashes in HTML tag names.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing of async methods, TypeScript-style comma-separated superclass lists.</li>
+    <li><a href="http://codemirror.net/demo/folding.html">indent-fold addon</a>: Ignore comment lines.</li>
+  </ul>
+
   <p class="rel">19-01-2017: <a href="http://codemirror.net/codemirror-5.23.0.zip">Version 5.23.0</a>:</p>
 
   <ul class=rel-note>
diff --git a/index.html b/index.html
index df98ffd096..0b40b98e7b 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.23.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.24.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index f7b617cd22..ad86778c6d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.23.0",
+  "version": "5.24.0",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index b6d3d488ad..15fb891589 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.23.0"
+CodeMirror.version = "5.24.0"

From 4d7c8030268af738352acbc77ec1140fbae7111e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Feb 2017 14:33:38 +0100
Subject: [PATCH 3155/4742] Bump version number post-5.24

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 912f0446e2..47bc54cc1a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.24.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.24.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index ad86778c6d..f74d5d2fde 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.24.0",
+  "version": "5.24.1",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 15fb891589..c4c203d659 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.24.0"
+CodeMirror.version = "5.24.1"

From 7943e50e3c09d195dbe1679ea9294d717dc888d4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 21 Feb 2017 16:55:50 +0100
Subject: [PATCH 3156/4742] [merge addon] Improve aligning to work with
 collapsed markers and widgets

Issue #4575
---
 addon/merge/merge.js     | 217 ++++++++++++++++++++++++++++++++++-----
 src/model/line_widget.js |   4 +-
 src/model/mark_text.js   |   2 +-
 3 files changed, 197 insertions(+), 26 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index da5dcca55a..071fb280a1 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -37,8 +37,13 @@
     constructor: DiffView,
     init: function(pane, orig, options) {
       this.edit = this.mv.edit;
-      (this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
+      ;(this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
       this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
+      if (this.mv.options.connect == "align") {
+        if (!this.edit.state.trackAlignable) this.edit.state.trackAlignable = new TrackAlignable(this.edit)
+        this.orig.state.trackAlignable = new TrackAlignable(this.orig)
+      }
+
       this.orig.state.diffViews = [this];
       var classLocation = options.chunkClassLocation || "background";
       if (Object.prototype.toString.call(classLocation) != "[object Array]") classLocation = [classLocation]
@@ -129,10 +134,9 @@
     dv.orig.on("change", change);
     dv.edit.on("swapDoc", swapDoc);
     dv.orig.on("swapDoc", swapDoc);
-    var events = ["markerAdded", "markerCleared", "lineWidgetAdded", "lineWidgetCleared"]
-    for (var i = 0; i < events.length; i++) {
-      dv.edit.on(events[i], setDealign);
-      dv.orig.on(events[i], setDealign);
+    if (dv.mv.options.connect == "align") {
+      CodeMirror.on(dv.edit.state.trackAlignable, "realign", setDealign)
+      CodeMirror.on(dv.orig.state.trackAlignable, "realign", setDealign)
     }
     dv.edit.on("viewportChange", function() { set(false); });
     dv.orig.on("viewportChange", function() { set(false); });
@@ -339,24 +343,73 @@
     return origStart + (editLine - editStart);
   }
 
-  function findAlignedLines(dv, other) {
-    var linesToAlign = [];
-    for (var i = 0; i < dv.chunks.length; i++) {
-      var chunk = dv.chunks[i];
-      linesToAlign.push([chunk.origTo, chunk.editTo, other ? getMatchingOrigLine(chunk.editTo, other.chunks) : null]);
-    }
-    if (other) {
-      chunkLoop: for (var i = 0; i < other.chunks.length; i++) {
-        var chunk = other.chunks[i];
-        for (var j = 0; j < linesToAlign.length; j++) {
-          var diff = linesToAlign[j][1] - chunk.editTo;
-          if (diff == 0) continue chunkLoop
-          if (diff > 0) break;
-        }
-        linesToAlign.splice(j, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
+  // Combines information about chunks and widgets/markers to return
+  // an array of lines, in a single editor, that probably need to be
+  // aligned with their counterparts in the editor next to it.
+  function alignableFor(cm, chunks, isOrig) {
+    var tracker = cm.state.trackAlignable
+    var start = cm.firstLine(), trackI = 0
+    var result = []
+    for (var i = 0;; i++) {
+      var chunk = chunks[i]
+      var chunkStart = !chunk ? cm.lastLine() + 1 : isOrig ? chunk.origFrom : chunk.editFrom
+      for (; trackI < tracker.alignable.length; trackI += 2) {
+        var n = tracker.alignable[trackI] + 1
+        if (n <= start) continue
+        if (n < chunkStart) result.push(n)
+        else break
+      }
+      if (!chunk) break
+      result.push(start = isOrig ? chunk.origTo : chunk.editTo)
+    }
+    return result
+  }
+
+  // Given information about alignable lines in two editors, fill in
+  // the result (an array of three-element arrays) to reflect the
+  // lines that need to be aligned with each other.
+  function mergeAlignable(result, origAlignable, chunks, setIndex) {
+    var rI = 0, origI = 0, chunkI = 0, diff = 0
+    for (;; rI++) {
+      var nextR = result[rI], nextO = origAlignable[origI]
+      if (!nextR && nextO == null) break
+
+      var rLine = nextR ? nextR[0] : 1e9, oLine = nextO == null ? 1e9 : nextO
+      while (chunkI < chunks.length) {
+        var chunk = chunks[chunkI]
+        if (chunk.editTo > rLine) break
+        diff += (chunk.origTo - chunk.origFrom) - (chunk.editTo - chunk.editFrom)
+        chunkI++
+      }
+      if (rLine == oLine - diff) {
+        nextR[setIndex] = oLine
+        origI++
+      } else if (rLine < oLine - diff) {
+        nextR[setIndex] = rLine + diff
+      } else {
+        var record = [oLine - diff, null, null]
+        record[setIndex] = oLine
+        result.splice(rI, 0, record)
+        origI++
       }
     }
-    return linesToAlign;
+  }
+
+  function findAlignedLines(dv, other) {
+    var alignable = alignableFor(dv.edit, dv.chunks, false), result = []
+    if (other) for (var i = 0, j = 0; i < other.chunks.length; i++) {
+      var n = other.chunks[i].editTo
+      while (j < alignable.length && alignable[j] < n) j++
+      if (j == alignable.length || alignable[j] != n) alignable.splice(j++, 0, n)
+    }
+    for (var i = 0; i < alignable.length; i++)
+      result.push([alignable[i], null, null])
+
+    mergeAlignable(result, alignableFor(dv.orig, dv.chunks, true), dv.chunks, 1)
+    if (other)
+      mergeAlignable(result, alignableFor(other.orig, other.chunks, true), other.chunks, 2)
+
+    return result
   }
 
   function alignChunks(dv, force) {
@@ -379,7 +432,7 @@
       aligners[i].clear();
     aligners.length = 0;
 
-    var cm = [dv.orig, dv.edit], scroll = [];
+    var cm = [dv.edit, dv.orig], scroll = [];
     if (other) cm.push(other.orig);
     for (var i = 0; i < cm.length; i++)
       scroll.push(cm[i].getScrollInfo().top);
@@ -414,7 +467,7 @@
     var elt = document.createElement("div");
     elt.className = "CodeMirror-merge-spacer";
     elt.style.height = size + "px"; elt.style.minWidth = "1px";
-    return cm.addLineWidget(line, elt, {height: size, above: above});
+    return cm.addLineWidget(line, elt, {height: size, above: above, mergeSpacer: true});
   }
 
   function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
@@ -765,6 +818,124 @@
     return out;
   }
 
+  // Tracks collapsed markers and line widgets, in order to be able to
+  // accurately align the content of two editors.
+
+  var F_WIDGET = 1, F_WIDGET_BELOW = 2, F_MARKER = 4
+
+  function TrackAlignable(cm) {
+    this.cm = cm
+    this.alignable = []
+    var self = this
+    cm.on("markerAdded", function(_, marker) {
+      if (!marker.collapsed) return
+      var found = marker.find(1)
+      if (found != null) self.set(found.line, F_MARKER)
+    })
+    cm.on("markerCleared", function(_, marker, _min, max) {
+      if (max != null && marker.collapsed)
+        self.check(max, F_MARKER, self.hasMarker)
+    })
+    cm.on("lineWidgetAdded", function(_, widget, lineNo) {
+      if (widget.mergeSpacer) return
+      if (widget.above) self.set(lineNo - 1, F_WIDGET_BELOW)
+      else self.set(lineNo, F_WIDGET)
+    })
+    cm.on("lineWidgetCleared", function(_, widget, lineNo) {
+      if (widget.mergeSpacer) return
+      if (widget.above) self.check(lineNo - 1, F_WIDGET_BELOW, self.hasWidgetBelow)
+      else self.check(lineNo, F_WIDGET, self.hasWidget)
+    })
+    cm.on("change", function(_, change) {
+      var start = change.from.line, nBefore = change.to.line - change.from.line
+      var nAfter = change.text.length - 1, end = start + nAfter
+      if (nBefore || nAfter) self.map(start, nBefore, nAfter)
+      self.check(end, F_MARKER, self.hasMarker)
+      if (nBefore || nAfter) self.check(change.from.line, F_MARKER, self.hasMarker)
+    })
+  }
+
+  TrackAlignable.prototype = {
+    signal: function() {
+      CodeMirror.signal(this, "realign")
+    },
+
+    set: function(n, flags) {
+      var pos = -1
+      for (; pos < this.alignable.length; pos += 2) {
+        var diff = this.alignable[pos] - n
+        if (diff == 0) {
+          if ((this.alignable[pos + 1] & flags) == flags) return
+          this.alignable[pos + 1] |= flags
+          this.signal()
+          return
+        }
+        if (diff > 0) break
+      }
+      this.signal()
+      this.alignable.splice(pos, 0, n, flags)
+    },
+
+    find: function(n) {
+      for (var i = 0; i < this.alignable.length; i += 2)
+        if (this.alignable[i] == n) return i
+      return -1
+    },
+
+    check: function(n, flag, pred) {
+      var found = this.find(n)
+      if (found == -1 || !(this.alignable[found + 1] & flag)) return
+      if (!pred.call(this, n)) {
+        this.signal()
+        var flags = this.alignable[found + 1] & ~flag
+        if (flags) this.alignable[found + 1] = flags
+        else this.alignable.splice(found, 2)
+      }
+    },
+
+    hasMarker: function(n) {
+      var handle = this.cm.getLineHandle(n)
+      if (handle.markedSpans) for (var i = 0; i < handle.markedSpans.length; i++)
+        if (handle.markedSpans[i].mark.collapsed && handle.markedSpans[i].to != null)
+          return true
+      return false
+    },
+
+    hasWidget: function(n) {
+      var handle = this.cm.getLineHandle(n)
+      if (handle.widgets) for (var i = 0; i < handle.widgets.length; i++)
+        if (!handle.widgets[i].above && !handle.widgets[i].mergeSpacer) return true
+      return false
+    },
+
+    hasWidgetBelow: function(n) {
+      if (n == this.cm.lastLine()) return false
+      var handle = this.cm.getLineHandle(n + 1)
+      if (handle.widgets) for (var i = 0; i < handle.widgets.length; i++)
+        if (handle.widgets[i].above && !handle.widgets[i].mergeSpacer) return true
+      return false
+    },
+
+    map: function(from, nBefore, nAfter) {
+      var diff = nAfter - nBefore, to = from + nBefore, widgetFrom = -1, widgetTo = -1
+      for (var i = 0; i < this.alignable.length; i += 2) {
+        var n = this.alignable[i]
+        if (n == from && (this.alignable[i + 1] & F_WIDGET_BELOW)) widgetFrom = i
+        if (n == to && (this.alignable[i + 1] & F_WIDGET_BELOW)) widgetTo = i
+        if (n <= from) continue
+        else if (n < to) this.alignable.splice(i--, 2)
+        else this.alignable[i] += diff
+      }
+      if (widgetFrom > -1) {
+        var flags = this.alignable[widgetFrom + 1]
+        if (flags == F_WIDGET_BELOW) this.alignable.splice(widgetFrom, 2)
+        else this.alignable[widgetFrom + 1] = flags & ~F_WIDGET_BELOW
+      }
+      if (widgetTo > -1 && nAfter)
+        this.set(from + nAfter, F_WIDGET_BELOW)
+    }
+  }
+
   function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
   function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
   function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index ba7c3829e2..1ceebd2eea 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -30,7 +30,7 @@ export class LineWidget {
         adjustScrollWhenAboveVisible(cm, line, -height)
         regLineChange(cm, no, "widget")
       })
-      signalLater(cm, "lineWidgetCleared", cm, this)
+      signalLater(cm, "lineWidgetCleared", cm, this, no)
     }
   }
 
@@ -70,6 +70,6 @@ export function addLineWidget(doc, handle, node, options) {
     }
     return true
   })
-  signalLater(cm, "lineWidgetAdded", cm, widget)
+  signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle))
   return widget
 }
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index 2e8ecf77bd..68c90ab75f 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -78,7 +78,7 @@ export class TextMarker {
       this.doc.cantEdit = false
       if (cm) reCheckSelection(cm.doc)
     }
-    if (cm) signalLater(cm, "markerCleared", cm, this)
+    if (cm) signalLater(cm, "markerCleared", cm, this, min, max)
     if (withOp) endOperation(cm)
     if (this.parent) this.parent.clear()
   }

From 8595f5c0954630dfc7a0f9a78e40e8b0c2c4a0b1 Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Wed, 22 Feb 2017 14:48:55 +1100
Subject: [PATCH 3157/4742] test for typescript index signature

---
 mode/javascript/test.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 8006588152..402ce4baaf 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -283,6 +283,12 @@
      "  [property createdAt]: [variable-3 Date];",
      "}");
 
+  TS("typescript_index_signature",
+     "[keyword interface] [def A] {",
+     "  [[[property prop]: [variable-3 string]]]: [variable-3 any];",
+     "  [property prop1]: [variable-3 any];",
+     "}");
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 15609286c174bff2595b82e13ab981b7cdf60976 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Feb 2017 09:11:46 +0100
Subject: [PATCH 3158/4742] [merge addon] Notice changed() calls on widgets and
 markers when aligning

Issue #4575
---
 addon/merge/merge.js     |  2 ++
 demo/merge.html          |  5 ++++-
 src/model/line_widget.js | 11 +++++++----
 src/model/mark_text.js   |  1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 071fb280a1..66d160f360 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -836,6 +836,7 @@
       if (max != null && marker.collapsed)
         self.check(max, F_MARKER, self.hasMarker)
     })
+    cm.on("markerChanged", this.signal.bind(this))
     cm.on("lineWidgetAdded", function(_, widget, lineNo) {
       if (widget.mergeSpacer) return
       if (widget.above) self.set(lineNo - 1, F_WIDGET_BELOW)
@@ -846,6 +847,7 @@
       if (widget.above) self.check(lineNo - 1, F_WIDGET_BELOW, self.hasWidgetBelow)
       else self.check(lineNo, F_WIDGET, self.hasWidget)
     })
+    cm.on("lineWidgetChanged", this.signal.bind(this))
     cm.on("change", function(_, change) {
       var start = change.from.line, nBefore = change.to.line - change.from.line
       var nAfter = change.text.length - 1, end = start + nAfter
diff --git a/demo/merge.html b/demo/merge.html
index 20783b866c..1dc41d76f8 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -64,7 +64,7 @@ <h2>merge view demo</h2>
 library to compute the diffs.</p>
 
 <script>
-var value, orig1, orig2, dv, panes = 2, highlight = true, connect = null, collapse = false;
+var value, orig1, orig2, dv, panes = 3, highlight = true, connect = "align", collapse = false;
 function initUI() {
   if (value == null) return;
   var target = document.getElementById("view");
@@ -91,6 +91,9 @@ <h2>merge view demo</h2>
   orig2 = value.replace(/\u003cscript/g, "\u003cscript type=text/javascript ")
     .replace("white", "purple;\n      font: comic sans;\n      text-decoration: underline;\n      height: 15em");
   initUI();
+  window.div = document.createElement('div')
+  window.h = dv.editor().addLineWidget(118, div)
+  setTimeout(() => { window.div.style.height = "200px"; window.h.changed(); console.log("!", window.h) }, 500)
 };
 
 function mergeViewHeight(mergeView) {
diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index 1ceebd2eea..8347066d38 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -40,10 +40,13 @@ export class LineWidget {
     let diff = widgetHeight(this) - oldH
     if (!diff) return
     updateLineHeight(line, line.height + diff)
-    if (cm) runInOp(cm, () => {
-      cm.curOp.forceUpdate = true
-      adjustScrollWhenAboveVisible(cm, line, diff)
-    })
+    if (cm) {
+      runInOp(cm, () => {
+        cm.curOp.forceUpdate = true
+        adjustScrollWhenAboveVisible(cm, line, diff)
+        signalLater(cm, "lineWidgetChanged", cm, this, lineNo(line))
+      })
+    }
   }
 }
 eventMixin(LineWidget)
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index 68c90ab75f..af1b724b27 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -126,6 +126,7 @@ export class TextMarker {
         if (dHeight)
           updateLineHeight(line, line.height + dHeight)
       }
+      signalLater(cm, "markerChanged", cm, this)
     })
   }
 

From ec22459991f5e3f134cb754d910e733a18373a29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Feb 2017 09:16:13 +0100
Subject: [PATCH 3159/4742] [merge demo] Remove debug code

---
 demo/merge.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/demo/merge.html b/demo/merge.html
index 1dc41d76f8..20783b866c 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -64,7 +64,7 @@ <h2>merge view demo</h2>
 library to compute the diffs.</p>
 
 <script>
-var value, orig1, orig2, dv, panes = 3, highlight = true, connect = "align", collapse = false;
+var value, orig1, orig2, dv, panes = 2, highlight = true, connect = null, collapse = false;
 function initUI() {
   if (value == null) return;
   var target = document.getElementById("view");
@@ -91,9 +91,6 @@ <h2>merge view demo</h2>
   orig2 = value.replace(/\u003cscript/g, "\u003cscript type=text/javascript ")
     .replace("white", "purple;\n      font: comic sans;\n      text-decoration: underline;\n      height: 15em");
   initUI();
-  window.div = document.createElement('div')
-  window.h = dv.editor().addLineWidget(118, div)
-  setTimeout(() => { window.div.style.height = "200px"; window.h.changed(); console.log("!", window.h) }, 500)
 };
 
 function mergeViewHeight(mergeView) {

From 8a52fcee1850cd91a226d29e2e6598620af16b67 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Feb 2017 09:36:43 +0100
Subject: [PATCH 3160/4742] Revert "[xml mode] Allow dashes in tag names"

This reverts commit 81b7760c7953482310491578cd37eb4beb046db3.
---
 mode/xml/xml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 16b8d3dca1..f987a3a3ce 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -133,7 +133,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
       state.stringStartCol = stream.column();
       return state.tokenize(stream, state);
     } else {
-      stream.match(/^[^\s\u00a0=<>\"\'\-]*[^\s\u00a0=<>\"\'\/\-]/);
+      stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/);
       return "word";
     }
   }

From 96a1ca9fe602de643321ab75563bd87bab355ccb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Feb 2017 11:31:46 +0100
Subject: [PATCH 3161/4742] [javascript mode] Support computed class method
 names

Closes #4595
---
 mode/javascript/javascript.js | 2 ++
 mode/javascript/test.js       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 1811b29c43..e1a19ce817 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -649,6 +649,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       cx.marked = "property";
       return cont(isTS ? classfield : functiondef, classBody);
     }
+    if (type == "[")
+      return cont(expression, expect("]"), isTS ? classfield : functiondef, classBody)
     if (value == "*") {
       cx.marked = "keyword";
       return cont(classBody);
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 402ce4baaf..336c18747c 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -285,7 +285,7 @@
 
   TS("typescript_index_signature",
      "[keyword interface] [def A] {",
-     "  [[[property prop]: [variable-3 string]]]: [variable-3 any];",
+     "  [[ [variable prop]: [variable-3 string] ]]: [variable-3 any];",
      "  [property prop1]: [variable-3 any];",
      "}");
 

From 948f94fc254e44fff74bc2cb3b2b49e6739d01fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Feb 2017 11:36:26 +0100
Subject: [PATCH 3162/4742] Mark version 5.24.2

---
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54c2578e12..588d0318d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.24.2 (2017-02-22)
+
+### Bug fixes
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support computed class method names.
+
+[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Improve aligning of unchanged code in the presence of marks and line widgets.
+
 ## 5.24.0 (2017-02-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 47bc54cc1a..e6d2a70ca4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.24.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.24.2</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 1404a465cd..e975cbd03e 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,13 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">22-02-2017: <a href="http://codemirror.net/codemirror-5.24.2.zip">Version 5.24.2</a>:</p>
+
+  <ul class=rel-note>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support computed class method names.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Improve aligning of unchanged code in the presence of marks and line widgets.</li>
+  </ul>
+
   <p class="rel">20-02-2017: <a href="http://codemirror.net/codemirror-5.24.0.zip">Version 5.24.0</a>:</p>
 
   <ul class=rel-note>
diff --git a/index.html b/index.html
index 0b40b98e7b..8009154d1d 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.24.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.24.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index f74d5d2fde..487b2ddb40 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.24.1",
+  "version": "5.24.2",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index c4c203d659..ef599398d8 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.24.1"
+CodeMirror.version = "5.24.2"

From b74212c717a89a47354fda6533dab57db72a7f93 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Feb 2017 11:37:26 +0100
Subject: [PATCH 3163/4742] Bump version number post-5.24.2

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index e6d2a70ca4..1daeb322c3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.24.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.24.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 487b2ddb40..e4d3adc15a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.24.2",
+  "version": "5.24.3",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index ef599398d8..a558608d78 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.24.2"
+CodeMirror.version = "5.24.3"

From e68976f71af92a84df0d58d78d4a02848ad62f1b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 23 Feb 2017 09:22:57 +0100
Subject: [PATCH 3164/4742] [merge addon] Fix aligning around widgets directly
 before change or eol

Issue #4575
---
 addon/merge/merge.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 66d160f360..f2d062474c 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -352,11 +352,11 @@
     var result = []
     for (var i = 0;; i++) {
       var chunk = chunks[i]
-      var chunkStart = !chunk ? cm.lastLine() + 1 : isOrig ? chunk.origFrom : chunk.editFrom
+      var chunkStart = !chunk ? 1e9 : isOrig ? chunk.origFrom : chunk.editFrom
       for (; trackI < tracker.alignable.length; trackI += 2) {
         var n = tracker.alignable[trackI] + 1
         if (n <= start) continue
-        if (n < chunkStart) result.push(n)
+        if (n <= chunkStart) result.push(n)
         else break
       }
       if (!chunk) break

From 4c9e134d6f814cc5d0e89ff870b27a1f381f0bd2 Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Wed, 22 Feb 2017 11:17:58 -0800
Subject: [PATCH 3165/4742] Add U+0080 through U+009F to the specialChars
 default

---
 doc/manual.html     | 2 +-
 src/edit/options.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 1daeb322c3..5e619fdebf 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -284,7 +284,7 @@ <h2>Configuration</h2>
       should be replaced by a
       special <a href="#option_specialCharPlaceholder">placeholder</a>.
       Mostly useful for non-printing special characters. The default
-      is <code>/[\u0000-\u001f\u007f\u00ad\u200b-\u200f\u2028\u2029\ufeff]/</code>.</dd>
+      is <code>/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/</code>.</dd>
       <dt id="option_specialCharPlaceholder"><code><strong>specialCharPlaceholder</strong>: function(char) → Element</code></dt>
       <dd>A function that, given a special character identified by
       the <a href="#option_specialChars"><code>specialChars</code></a>
diff --git a/src/edit/options.js b/src/edit/options.js
index dffc577be6..324dc84b16 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -68,7 +68,7 @@ export function defineOptions(CodeMirror) {
     for (let i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   })
-  option("specialChars", /[\u0000-\u001f\u007f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
+  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
     if (old != Init) cm.refresh()
   })

From ebfed69e1c2b346a4c5bad52ea0a2203637619a1 Mon Sep 17 00:00:00 2001
From: Joel Einbinder <einbinder@chromium.org>
Date: Wed, 22 Feb 2017 13:12:33 -0800
Subject: [PATCH 3166/4742] [mark-selection addon] Protect from null
 markedSelection

---
 addon/selection/mark-selection.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index 5c42d21eb2..6cceeae6c7 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -34,11 +34,12 @@
   });
 
   function onCursorActivity(cm) {
-    cm.operation(function() { update(cm); });
+    if (cm.state.markedSelection)
+      cm.operation(function() { update(cm); });
   }
 
   function onChange(cm) {
-    if (cm.state.markedSelection.length)
+    if (cm.state.markedSelection && cm.state.markedSelection.length)
       cm.operation(function() { clear(cm); });
   }
 

From 53f699289c7d4001bea7ba3fa8dc295e7daca8c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 23 Feb 2017 09:45:29 +0100
Subject: [PATCH 3167/4742] [javascript mode] Recognize TypeScript generic
 class syntax

Closes #4599
---
 mode/javascript/javascript.js | 1 +
 mode/javascript/test.js       | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index e1a19ce817..316fe4a27a 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -634,6 +634,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
   function classNameAfter(type, value) {
+    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, classNameAfter)
     if (value == "extends" || value == "implements" || (isTS && type == ","))
       return cont(isTS ? typeexpr : expression, classNameAfter);
     if (type == "{") return cont(pushlex("}"), classBody, poplex);
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 336c18747c..9abbf365c4 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -289,6 +289,12 @@
      "  [property prop1]: [variable-3 any];",
      "}");
 
+  TS("generic_class",
+     "[keyword class] [def Foo][operator <][variable-3 T][operator >] {",
+     "  [property bar]() {}",
+     "  [property foo](): [variable-3 Foo] {}",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From bd308e71a13a53a13c6a40864167c1b9231e52ba Mon Sep 17 00:00:00 2001
From: Ryan Petrello <lists@ryanpetrello.com>
Date: Wed, 22 Feb 2017 17:07:04 -0500
Subject: [PATCH 3168/4742] [yaml-lint addon] Properly handle linting for
 multi-document YAML

js-yaml doesn't always provide line/mark data for certain exceptions;
handle this scenario more gracefully

Closes #4600
---
 addon/lint/yaml-lint.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addon/lint/yaml-lint.js b/addon/lint/yaml-lint.js
index 3f77e525b7..90b0eaab57 100644
--- a/addon/lint/yaml-lint.js
+++ b/addon/lint/yaml-lint.js
@@ -19,8 +19,15 @@ CodeMirror.registerHelper("lint", "yaml", function(text) {
   var found = [];
   try { jsyaml.load(text); }
   catch(e) {
-      var loc = e.mark;
-      found.push({ from: CodeMirror.Pos(loc.line, loc.column), to: CodeMirror.Pos(loc.line, loc.column), message: e.message });
+      var loc = e.mark,
+          // js-yaml YAMLException doesn't always provide an accurate lineno
+          // e.g., when there are multiple yaml docs
+          // ---
+          // ---
+          // foo:bar
+          from = loc ? CodeMirror.Pos(loc.line, loc.column) : CodeMirror.Pos(0, 0),
+          to = from;
+      found.push({ from: from, to: to, message: e.message });
   }
   return found;
 });

From c51c08e861ac0a81bf0ff46dddfd140ab45e9dcb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 23 Feb 2017 13:57:53 +0100
Subject: [PATCH 3169/4742] Use .shadowRoot rather than .root to descend shadow
 dom

Closes #4587
---
 src/util/dom.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/dom.js b/src/util/dom.js
index 349fae07d3..9b5d1e85ab 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -68,8 +68,8 @@ export function activeElt() {
   } catch(e) {
     activeElement = document.body || null
   }
-  while (activeElement && activeElement.root && activeElement.root.activeElement)
-    activeElement = activeElement.root.activeElement
+  while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement)
+    activeElement = activeElement.shadowRoot.activeElement
   return activeElement
 }
 

From c7348e705181e1b15f42f074a1353af16948947c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 26 Feb 2017 21:51:15 +0100
Subject: [PATCH 3170/4742] [merge demo] Make the editor handle mouse events on
 spacers

Closes #4605
---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index f2d062474c..eeca0ef518 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -467,7 +467,7 @@
     var elt = document.createElement("div");
     elt.className = "CodeMirror-merge-spacer";
     elt.style.height = size + "px"; elt.style.minWidth = "1px";
-    return cm.addLineWidget(line, elt, {height: size, above: above, mergeSpacer: true});
+    return cm.addLineWidget(line, elt, {height: size, above: above, mergeSpacer: true, handleMouseEvents: true});
   }
 
   function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {

From a44e76a0ca4c53f03b0e67a3b067015c72eb6579 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 26 Feb 2017 22:13:17 +0100
Subject: [PATCH 3171/4742] [active-line addon] Style active lines differently

So that line widgets aren't included in the background style

Closes #4606
---
 lib/codemirror.css                | 2 +-
 theme/3024-day.css                | 2 +-
 theme/3024-night.css              | 2 +-
 theme/abcdef.css                  | 2 +-
 theme/ambiance.css                | 2 +-
 theme/base16-dark.css             | 2 +-
 theme/base16-light.css            | 2 +-
 theme/bespin.css                  | 2 +-
 theme/blackboard.css              | 2 +-
 theme/cobalt.css                  | 2 +-
 theme/colorforth.css              | 2 +-
 theme/dracula.css                 | 2 +-
 theme/duotone-dark.css            | 2 +-
 theme/duotone-light.css           | 2 +-
 theme/eclipse.css                 | 2 +-
 theme/elegant.css                 | 2 +-
 theme/erlang-dark.css             | 2 +-
 theme/hopscotch.css               | 2 +-
 theme/icecoder.css                | 2 +-
 theme/isotope.css                 | 2 +-
 theme/lesser-dark.css             | 2 +-
 theme/liquibyte.css               | 2 +-
 theme/material.css                | 2 +-
 theme/mbo.css                     | 2 +-
 theme/mdn-like.css                | 2 +-
 theme/midnight.css                | 2 +-
 theme/monokai.css                 | 2 +-
 theme/neat.css                    | 2 +-
 theme/night.css                   | 2 +-
 theme/panda-syntax.css            | 2 +-
 theme/paraiso-dark.css            | 2 +-
 theme/paraiso-light.css           | 2 +-
 theme/pastel-on-dark.css          | 2 +-
 theme/railscasts.css              | 2 +-
 theme/rubyblue.css                | 2 +-
 theme/seti.css                    | 2 +-
 theme/solarized.css               | 4 ++--
 theme/the-matrix.css              | 2 +-
 theme/tomorrow-night-bright.css   | 2 +-
 theme/tomorrow-night-eighties.css | 2 +-
 theme/twilight.css                | 2 +-
 theme/vibrant-ink.css             | 2 +-
 theme/xq-dark.css                 | 2 +-
 theme/xq-light.css                | 2 +-
 theme/yeti.css                    | 2 +-
 theme/zenburn.css                 | 3 +--
 46 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 2a6a262282..319da75331 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -142,7 +142,7 @@
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
 div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 .CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
+.CodeMirror-activeline .CodeMirror-line {background: #e8f2ff;}
 
 /* STOP */
 
diff --git a/theme/3024-day.css b/theme/3024-day.css
index 7132655306..6b2a40fc8e 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -37,5 +37,5 @@
 .cm-s-3024-day span.cm-link { color: #a16a94; }
 .cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
 
-.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-3024-day .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
 .cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/theme/3024-night.css b/theme/3024-night.css
index adc5900ad1..5a4b0c8243 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -35,5 +35,5 @@
 .cm-s-3024-night span.cm-link { color: #a16a94; }
 .cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
 
-.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
+.cm-s-3024-night .CodeMirror-activeline .CodeMirror-line { background: #2F2F2F; }
 .cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/abcdef.css b/theme/abcdef.css
index 7f9d788704..8b772e078a 100644
--- a/theme/abcdef.css
+++ b/theme/abcdef.css
@@ -29,4 +29,4 @@
 .cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
 .cm-s-abcdef span.cm-link { color: blueviolet; }
 
-.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }
+.cm-s-abcdef .CodeMirror-activeline .CodeMirror-line { background: #314151; }
diff --git a/theme/ambiance.css b/theme/ambiance.css
index bce3446494..a73727f370 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -64,7 +64,7 @@
 
 .cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
 
-.cm-s-ambiance .CodeMirror-activeline-background {
+.cm-s-ambiance .CodeMirror-activeline .CodeMirror-line {
   background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
 }
 
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 026a816890..cc54ff0cb9 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -34,5 +34,5 @@
 .cm-s-base16-dark span.cm-link { color: #aa759f; }
 .cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
 
-.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
+.cm-s-base16-dark .CodeMirror-activeline .CodeMirror-line { background: #202020; }
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/base16-light.css b/theme/base16-light.css
index 474e0ca9d1..ef678a2404 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -34,5 +34,5 @@
 .cm-s-base16-light span.cm-link { color: #aa759f; }
 .cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
 
-.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
+.cm-s-base16-light .CodeMirror-activeline .CodeMirror-line { background: #DDDCDC; }
 .cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/bespin.css b/theme/bespin.css
index 60913ba938..fba3173f9a 100644
--- a/theme/bespin.css
+++ b/theme/bespin.css
@@ -31,4 +31,4 @@
 .cm-s-bespin span.cm-link {color: #9b859d;}
 
 .cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }
+.cm-s-bespin .CodeMirror-activeline .CodeMirror-line { background: #404040; }
diff --git a/theme/blackboard.css b/theme/blackboard.css
index b6eaedb180..db6150990c 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -28,5 +28,5 @@
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
 .cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 
-.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
+.cm-s-blackboard .CodeMirror-activeline .CodeMirror-line { background: #3C3636; }
 .cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/theme/cobalt.css b/theme/cobalt.css
index d88223ed80..713127b617 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -21,5 +21,5 @@
 .cm-s-cobalt span.cm-link { color: #845dc4; }
 .cm-s-cobalt span.cm-error { color: #9d1e15; }
 
-.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
+.cm-s-cobalt .CodeMirror-activeline .CodeMirror-line { background: #002D57; }
 .cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/theme/colorforth.css b/theme/colorforth.css
index 606899f309..e154700c65 100644
--- a/theme/colorforth.css
+++ b/theme/colorforth.css
@@ -30,4 +30,4 @@
 
 .cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
 
-.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }
+.cm-s-colorforth .CodeMirror-activeline .CodeMirror-line { background: #253540; }
diff --git a/theme/dracula.css b/theme/dracula.css
index 53a660b521..1df12e02ab 100644
--- a/theme/dracula.css
+++ b/theme/dracula.css
@@ -36,5 +36,5 @@
 .cm-s-dracula span.cm-builtin { color: #50fa7b; }
 .cm-s-dracula span.cm-variable-3 { color: #ffb86c; }
 
-.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
+.cm-s-dracula .CodeMirror-activeline .CodeMirror-line { background: rgba(255,255,255,0.1); }
 .cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/duotone-dark.css b/theme/duotone-dark.css
index b09a585c97..f60ec67072 100644
--- a/theme/duotone-dark.css
+++ b/theme/duotone-dark.css
@@ -12,7 +12,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 
 /* begin cursor */
 .cm-s-duotone-dark .CodeMirror-cursor { border-left: 1px solid #ffad5c; /* border-left: 1px solid #ffad5c80; */ border-right: .5em solid #ffad5c; /* border-right: .5em solid #ffad5c80; */ opacity: .5; }
-.cm-s-duotone-dark .CodeMirror-activeline-background { background: #363342; /* background: #36334280;  */ opacity: .5;}
+.cm-s-duotone-dark .CodeMirror-activeline .CodeMirror-line { background: #363342; /* background: #36334280;  */ opacity: .5;}
 .cm-s-duotone-dark .cm-fat-cursor .CodeMirror-cursor { background: #ffad5c; /* background: #ffad5c80; */ opacity: .5;}
 /* end cursor */
 
diff --git a/theme/duotone-light.css b/theme/duotone-light.css
index 80203d15d9..a8365cbf03 100644
--- a/theme/duotone-light.css
+++ b/theme/duotone-light.css
@@ -12,7 +12,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 
 /* begin cursor */
 .cm-s-duotone-light .CodeMirror-cursor { border-left: 1px solid #93abdc; /* border-left: 1px solid #93abdc80; */ border-right: .5em solid #93abdc; /* border-right: .5em solid #93abdc80; */ opacity: .5; }
-.cm-s-duotone-light .CodeMirror-activeline-background { background: #e3dcce;  /* background: #e3dcce80; */ opacity: .5; }
+.cm-s-duotone-light .CodeMirror-activeline .CodeMirror-line { background: #e3dcce;  /* background: #e3dcce80; */ opacity: .5; }
 .cm-s-duotone-light .cm-fat-cursor .CodeMirror-cursor { background: #93abdc; /* #93abdc80; */ opacity: .5; }
 /* end cursor */
 
diff --git a/theme/eclipse.css b/theme/eclipse.css
index 1bde460e90..1d956d7efe 100644
--- a/theme/eclipse.css
+++ b/theme/eclipse.css
@@ -19,5 +19,5 @@
 .cm-s-eclipse span.cm-link { color: #219; }
 .cm-s-eclipse span.cm-error { color: #f00; }
 
-.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-eclipse .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
 .cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/elegant.css b/theme/elegant.css
index 45b3ea655e..fc6d46da4f 100644
--- a/theme/elegant.css
+++ b/theme/elegant.css
@@ -9,5 +9,5 @@
 .cm-s-elegant span.cm-link { color: #762; }
 .cm-s-elegant span.cm-error { background-color: #fdd; }
 
-.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-elegant .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
 .cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index 65fe4814c1..1d5101b5f9 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -30,5 +30,5 @@
 .cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
 .cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
-.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
+.cm-s-erlang-dark .CodeMirror-activeline .CodeMirror-line { background: #013461; }
 .cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/hopscotch.css b/theme/hopscotch.css
index 7d05431bdc..9a80e73b04 100644
--- a/theme/hopscotch.css
+++ b/theme/hopscotch.css
@@ -31,4 +31,4 @@
 .cm-s-hopscotch span.cm-link {color: #c85e7c;}
 
 .cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }
+.cm-s-hopscotch .CodeMirror-activeline .CodeMirror-line { background: #302020; }
diff --git a/theme/icecoder.css b/theme/icecoder.css
index ffebaf2f0b..6575a495e8 100644
--- a/theme/icecoder.css
+++ b/theme/icecoder.css
@@ -40,4 +40,4 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 .cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
 .cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
 .cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
-.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
+.cm-s-icecoder .CodeMirror-activeline .CodeMirror-line { background: #000; }
diff --git a/theme/isotope.css b/theme/isotope.css
index d0d6263cf4..5fc5dc4131 100644
--- a/theme/isotope.css
+++ b/theme/isotope.css
@@ -31,4 +31,4 @@
 .cm-s-isotope span.cm-link {color: #cc00ff;}
 
 .cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }
+.cm-s-isotope .CodeMirror-activeline .CodeMirror-line { background: #202020; }
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 690c183d7b..a597c78e7e 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -43,5 +43,5 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-link { color: #00c; }
 .cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 
-.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
+.cm-s-lesser-dark .CodeMirror-activeline .CodeMirror-line { background: #3C3A3A; }
 .cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/liquibyte.css b/theme/liquibyte.css
index 9db8bde739..c832454c7b 100644
--- a/theme/liquibyte.css
+++ b/theme/liquibyte.css
@@ -51,7 +51,7 @@
 
 .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); }
+.cm-s-liquibyte .CodeMirror-activeline .CodeMirror-line { background-color: rgba(0, 255, 0, 0.15); }
 
 /* Default styles for common addons */
 .cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
diff --git a/theme/material.css b/theme/material.css
index 01d867932a..485de2ec61 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -23,7 +23,7 @@
 .cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 
-.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
+.cm-s-material .CodeMirror-activeline .CodeMirror-line { background: rgba(0, 0, 0, 0); }
 .cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
 .cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
 .cm-s-material .cm-variable-2 { color: #80CBC4; }
diff --git a/theme/mbo.css b/theme/mbo.css
index e164fcf42a..c129099b9e 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -32,6 +32,6 @@
 .cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
 .cm-s-mbo span.cm-qualifier { color: #ffffec; }
 
-.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
+.cm-s-mbo .CodeMirror-activeline .CodeMirror-line { background: #494b41; }
 .cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
 .cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index f325d45005..c3dd4bf90c 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -40,7 +40,7 @@
 .cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
 .cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
 
-div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
+div.cm-s-mdn-like .CodeMirror-activeline .CodeMirror-line { background: #efefff; }
 div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
 
 .cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }
diff --git a/theme/midnight.css b/theme/midnight.css
index e41f10560f..dea3e56c95 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -5,7 +5,7 @@
 .cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
 
 /*<!--activeline-->*/
-.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
+.cm-s-midnight .CodeMirror-activeline .CodeMirror-line { background: #253540; }
 
 .cm-s-midnight.CodeMirror {
     background: #0F192A;
diff --git a/theme/monokai.css b/theme/monokai.css
index 7c8a4c5d00..a086ffe5db 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -29,7 +29,7 @@
 .cm-s-monokai span.cm-link { color: #ae81ff; }
 .cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
 
-.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
+.cm-s-monokai .CodeMirror-activeline .CodeMirror-line { background: #373831; }
 .cm-s-monokai .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
diff --git a/theme/neat.css b/theme/neat.css
index 4267b1a37d..b773ad897a 100644
--- a/theme/neat.css
+++ b/theme/neat.css
@@ -8,5 +8,5 @@
 .cm-s-neat span.cm-meta { color: #555; }
 .cm-s-neat span.cm-link { color: #3a3; }
 
-.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-neat .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
 .cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/night.css b/theme/night.css
index fd4e561933..ae47b78585 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -23,5 +23,5 @@
 .cm-s-night span.cm-link { color: #845dc4; }
 .cm-s-night span.cm-error { color: #9d1e15; }
 
-.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
+.cm-s-night .CodeMirror-activeline .CodeMirror-line { background: #1C005A; }
 .cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/panda-syntax.css b/theme/panda-syntax.css
index c93b2ea03a..319bd048bd 100644
--- a/theme/panda-syntax.css
+++ b/theme/panda-syntax.css
@@ -10,7 +10,7 @@
 	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
 }
 .cm-s-panda-syntax .CodeMirror-cursor { border-color: #ff2c6d; }
-.cm-s-panda-syntax .CodeMirror-activeline-background {
+.cm-s-panda-syntax .CodeMirror-activeline .CodeMirror-line {
 	background: rgba(99, 123, 156, 0.1);
 }
 .cm-s-panda-syntax .CodeMirror-selected {
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index aa9d207e6d..b92cb010bc 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -34,5 +34,5 @@
 .cm-s-paraiso-dark span.cm-link { color: #815ba4; }
 .cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
 
-.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
+.cm-s-paraiso-dark .CodeMirror-activeline .CodeMirror-line { background: #4D344A; }
 .cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index ae0c755f89..88004bb6f5 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -34,5 +34,5 @@
 .cm-s-paraiso-light span.cm-link { color: #815ba4; }
 .cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
 
-.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
+.cm-s-paraiso-light .CodeMirror-activeline .CodeMirror-line { background: #CFD1C4; }
 .cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index 2603d36205..ac48da16ed 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -44,7 +44,7 @@
 	background: #757aD8;
 	color: #f8f8f0;
 }
-.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
+.cm-s-pastel-on-dark .CodeMirror-activeline .CodeMirror-line { background: rgba(255, 255, 255, 0.031); }
 .cm-s-pastel-on-dark .CodeMirror-matchingbracket {
 	border: 1px solid rgba(255,255,255,0.25);
 	color: #8F938F !important;
diff --git a/theme/railscasts.css b/theme/railscasts.css
index aeff0449d5..408e6dce57 100644
--- a/theme/railscasts.css
+++ b/theme/railscasts.css
@@ -31,4 +31,4 @@
 .cm-s-railscasts span.cm-link {color: #b6b3eb;}
 
 .cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }
+.cm-s-railscasts .CodeMirror-activeline .CodeMirror-line { background: #303040; }
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index 76d33e7798..d2fd1a17a6 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -22,4 +22,4 @@
 .cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
 .cm-s-rubyblue span.cm-error { color: #AF2018; }
 
-.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }
+.cm-s-rubyblue .CodeMirror-activeline .CodeMirror-line { background: #173047; }
diff --git a/theme/seti.css b/theme/seti.css
index 6632d3fc7f..dc67f72a58 100644
--- a/theme/seti.css
+++ b/theme/seti.css
@@ -40,5 +40,5 @@
 .cm-s-seti span.cm-property { color: #a074c4; }
 .cm-s-seti span.cm-variable-3 { color: #9fca56; }
 .cm-s-seti span.cm-builtin { color: #9fca56; }
-.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
+.cm-s-seti .CodeMirror-activeline .CodeMirror-line { background: #101213; }
 .cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 1f39c7edb2..88be235feb 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -161,9 +161,9 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }
 
 /* Active line */
-.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
+.cm-s-solarized.cm-s-dark .CodeMirror-activeline .CodeMirror-line {
   background: rgba(255, 255, 255, 0.06);
 }
-.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
+.cm-s-solarized.cm-s-light .CodeMirror-activeline .CodeMirror-line {
   background: rgba(0, 0, 0, 0.06);
 }
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index 3912a8dbd8..506f53d854 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -27,4 +27,4 @@
 .cm-s-the-matrix span.cm-attribute { color: #FFF700; }
 .cm-s-the-matrix span.cm-error { color: #FF0000; }
 
-.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }
+.cm-s-the-matrix .CodeMirror-activeline .CodeMirror-line { background: #040; }
diff --git a/theme/tomorrow-night-bright.css b/theme/tomorrow-night-bright.css
index b6dd4a9278..32c1d091b9 100644
--- a/theme/tomorrow-night-bright.css
+++ b/theme/tomorrow-night-bright.css
@@ -31,5 +31,5 @@
 .cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
 .cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
 
-.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
+.cm-s-tomorrow-night-bright .CodeMirror-activeline .CodeMirror-line { background: #2a2a2a; }
 .cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index 2a9debc327..ebc018fd81 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -34,5 +34,5 @@
 .cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
 .cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
 
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
+.cm-s-tomorrow-night-eighties .CodeMirror-activeline .CodeMirror-line { background: #343600; }
 .cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/twilight.css b/theme/twilight.css
index d342b899f6..3bf509d897 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -28,5 +28,5 @@
 .cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
 .cm-s-twilight .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-twilight .CodeMirror-activeline .CodeMirror-line { background: #27282E; }
 .cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index ac4ec6d87a..268e1da38f 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -30,5 +30,5 @@
 .cm-s-vibrant-ink .cm-link { color: blue; }
 .cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-vibrant-ink .CodeMirror-activeline .CodeMirror-line { background: #27282E; }
 .cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index e3bd960bbb..e42e80af03 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -49,5 +49,5 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-attribute { color: #FFF700; }
 .cm-s-xq-dark span.cm-error { color: #f00; }
 
-.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-xq-dark .CodeMirror-activeline .CodeMirror-line { background: #27282E; }
 .cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/xq-light.css b/theme/xq-light.css
index 8d2fcb667b..ec507e2314 100644
--- a/theme/xq-light.css
+++ b/theme/xq-light.css
@@ -39,5 +39,5 @@ THE SOFTWARE.
 .cm-s-xq-light span.cm-attribute { color: #7F007F; }
 .cm-s-xq-light span.cm-error { color: #f00; }
 
-.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-xq-light .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
 .cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/theme/yeti.css b/theme/yeti.css
index c70d4d214e..548dca9a27 100644
--- a/theme/yeti.css
+++ b/theme/yeti.css
@@ -40,5 +40,5 @@
 .cm-s-yeti span.cm-property { color: #a074c4; }
 .cm-s-yeti span.cm-builtin { color: #a074c4; }
 .cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
-.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
+.cm-s-yeti .CodeMirror-activeline .CodeMirror-line { background: #E7E4E0; }
 .cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/theme/zenburn.css b/theme/zenburn.css
index 781c40acac..bfdef926cb 100644
--- a/theme/zenburn.css
+++ b/theme/zenburn.css
@@ -31,7 +31,6 @@
 .cm-s-zenburn span.cm-operator { color: #f0efd0; }
 .cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
 .cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
-.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
-.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
+.cm-s-zenburn .CodeMirror-activeline .CodeMirror-line { background: #000000; }
 .cm-s-zenburn div.CodeMirror-selected { background: #545454; }
 .cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }

From 608e3f822d2489574a0e83aad58b032adc245a1e Mon Sep 17 00:00:00 2001
From: Arun Narasani <narasani@versa-networks.com>
Date: Fri, 24 Feb 2017 16:57:59 -0800
Subject: [PATCH 3172/4742] [merge addon] Support for ignoring whitespace
 within a line in diff

---
 addon/merge/merge.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index eeca0ef518..ae610b3965 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -49,7 +49,8 @@
       if (Object.prototype.toString.call(classLocation) != "[object Array]") classLocation = [classLocation]
       this.classes.classLocation = classLocation
 
-      this.diff = getDiff(asString(orig), asString(options.value));
+      var ignoreWS = this.mv.options.ignoreWS || false;
+      this.diff = getDiff(asString(orig), asString(options.value), ignoreWS);
       this.chunks = getChunks(this.diff);
       this.diffOutOfDate = this.dealigned = false;
       this.needsScrollSync = null
@@ -72,7 +73,8 @@
 
   function ensureDiff(dv) {
     if (dv.diffOutOfDate) {
-      dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
+      var ignoreWS = dv.mv.options.ignoreWS || false;
+      dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue(), ignoreWS);
       dv.chunks = getChunks(dv.diff);
       dv.diffOutOfDate = false;
       CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
@@ -636,12 +638,18 @@
   // Operations on diffs
 
   var dmp = new diff_match_patch();
-  function getDiff(a, b) {
+  function getDiff(a, b, ignoreWS) {
     var diff = dmp.diff_main(a, b);
+    var diffStr;
     // The library sometimes leaves in empty parts, which confuse the algorithm
     for (var i = 0; i < diff.length; ++i) {
       var part = diff[i];
-      if (!part[1]) {
+      if (ignoreWS) {
+        diffStr = part[1].replace(/[ \t]+/g, '');
+      } else {
+        diffStr = part[1]
+      }
+      if (!diffStr) {
         diff.splice(i--, 1);
       } else if (i && diff[i - 1][0] == part[0]) {
         diff.splice(i--, 1);

From a3891b51ecd510efa921365f656d358a77277063 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 26 Feb 2017 23:47:13 +0100
Subject: [PATCH 3173/4742] [merge adddon] Rename ignoreWS option, simplify
 code

Issue #4608
---
 addon/merge/merge.js | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index ae610b3965..c0c7c8ff76 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -49,8 +49,7 @@
       if (Object.prototype.toString.call(classLocation) != "[object Array]") classLocation = [classLocation]
       this.classes.classLocation = classLocation
 
-      var ignoreWS = this.mv.options.ignoreWS || false;
-      this.diff = getDiff(asString(orig), asString(options.value), ignoreWS);
+      this.diff = getDiff(asString(orig), asString(options.value), this.mv.options.ignoreWhitespace);
       this.chunks = getChunks(this.diff);
       this.diffOutOfDate = this.dealigned = false;
       this.needsScrollSync = null
@@ -73,8 +72,7 @@
 
   function ensureDiff(dv) {
     if (dv.diffOutOfDate) {
-      var ignoreWS = dv.mv.options.ignoreWS || false;
-      dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue(), ignoreWS);
+      dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue(), dv.mv.options.ignoreWhitespace);
       dv.chunks = getChunks(dv.diff);
       dv.diffOutOfDate = false;
       CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
@@ -638,18 +636,12 @@
   // Operations on diffs
 
   var dmp = new diff_match_patch();
-  function getDiff(a, b, ignoreWS) {
+  function getDiff(a, b, ignoreWhitespace) {
     var diff = dmp.diff_main(a, b);
-    var diffStr;
     // The library sometimes leaves in empty parts, which confuse the algorithm
     for (var i = 0; i < diff.length; ++i) {
       var part = diff[i];
-      if (ignoreWS) {
-        diffStr = part[1].replace(/[ \t]+/g, '');
-      } else {
-        diffStr = part[1]
-      }
-      if (!diffStr) {
+      if (ignoreWhitespace ? !/[^ \t]/.test(part[1]) : !part[1]) {
         diff.splice(i--, 1);
       } else if (i && diff[i - 1][0] == part[0]) {
         diff.splice(i--, 1);

From b2a4da9c1e0cf990d482ea50c5ae742805e5c15b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 27 Feb 2017 11:10:37 +0100
Subject: [PATCH 3174/4742] [merge addon] Fix corner case in getChunks

Issue #4607
---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index c0c7c8ff76..ad8002ca55 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -658,7 +658,7 @@
     for (var i = 0; i < diff.length; ++i) {
       var part = diff[i], tp = part[0];
       if (tp == DIFF_EQUAL) {
-        var startOff = startOfLineClean(diff, i) ? 0 : 1;
+        var startOff = !startOfLineClean(diff, i) || edit.line < startEdit || orig.line < startOrig ? 1 : 0;
         var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
         moveOver(edit, part[1], null, orig);
         var endOff = endOfLineClean(diff, i) ? 1 : 0;

From 6c38edbd20a131c0a39175ae3076c789d503177b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 27 Feb 2017 11:31:15 +0100
Subject: [PATCH 3175/4742] [r mode] Use a bitfield for lexical alignment info

Issue #4603
---
 mode/r/r.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mode/r/r.js b/mode/r/r.js
index 7e15beac62..bddf17fb52 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -108,10 +108,12 @@ CodeMirror.defineMode("r", function(config) {
     };
   }
 
+  var ALIGN_YES = 1, ALIGN_NO = 2
+
   function push(state, type, stream) {
     state.ctx = {type: type,
                  indent: state.indent,
-                 align: null,
+                 flags: 0,
                  column: stream.column(),
                  prev: state.ctx};
   }
@@ -125,19 +127,19 @@ CodeMirror.defineMode("r", function(config) {
       return {tokenize: tokenBase,
               ctx: {type: "top",
                     indent: -config.indentUnit,
-                    align: false},
+                    flags: ALIGN_NO},
               indent: 0,
               afterIdent: false};
     },
 
     token: function(stream, state) {
       if (stream.sol()) {
-        if (state.ctx.align == null) state.ctx.align = false;
+        if ((state.ctx.flags & 3) == 0) state.ctx.flags |= ALIGN_NO
         state.indent = stream.indentation();
       }
       if (stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
-      if (style != "comment" && state.ctx.align == null) state.ctx.align = true;
+      if (style != "comment" && (state.ctx.flags & ALIGN_NO) == 0) state.ctx.flags |= ALIGN_YES
 
       var ctype = state.ctx.type;
       if ((curPunc == ";" || curPunc == "{" || curPunc == "}") && ctype == "block") pop(state);
@@ -158,7 +160,7 @@ CodeMirror.defineMode("r", function(config) {
       var firstChar = textAfter && textAfter.charAt(0), ctx = state.ctx,
           closing = firstChar == ctx.type;
       if (ctx.type == "block") return ctx.indent + (firstChar == "{" ? 0 : config.indentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else if (ctx.flags & ALIGN_YES) return ctx.column + (closing ? 0 : 1);
       else return ctx.indent + (closing ? 0 : config.indentUnit);
     },
 

From 2295d3503b99b1657c5c60fe5b268d3cafb39bcc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 27 Feb 2017 11:54:59 +0100
Subject: [PATCH 3176/4742] [r mode] Do a better job at indenting braceless
 bodies without semicolon

Issue #4603
---
 mode/r/r.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/mode/r/r.js b/mode/r/r.js
index bddf17fb52..be7db46b85 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -108,7 +108,7 @@ CodeMirror.defineMode("r", function(config) {
     };
   }
 
-  var ALIGN_YES = 1, ALIGN_NO = 2
+  var ALIGN_YES = 1, ALIGN_NO = 2, BRACELESS = 4
 
   function push(state, type, stream) {
     state.ctx = {type: type,
@@ -117,6 +117,14 @@ CodeMirror.defineMode("r", function(config) {
                  column: stream.column(),
                  prev: state.ctx};
   }
+  function setFlag(state, flag) {
+    var ctx = state.ctx
+    state.ctx = {type: ctx.type,
+                 indent: ctx.indent,
+                 flags: ctx.flags | flag,
+                 column: ctx.column,
+                 prev: ctx.prev}
+  }
   function pop(state) {
     state.indent = state.ctx.indent;
     state.ctx = state.ctx.prev;
@@ -135,14 +143,14 @@ CodeMirror.defineMode("r", function(config) {
     token: function(stream, state) {
       if (stream.sol()) {
         if ((state.ctx.flags & 3) == 0) state.ctx.flags |= ALIGN_NO
+        if (state.ctx.flags & BRACELESS) pop(state)
         state.indent = stream.indentation();
       }
       if (stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
-      if (style != "comment" && (state.ctx.flags & ALIGN_NO) == 0) state.ctx.flags |= ALIGN_YES
+      if (style != "comment" && (state.ctx.flags & ALIGN_NO) == 0) setFlag(state, ALIGN_YES)
 
-      var ctype = state.ctx.type;
-      if ((curPunc == ";" || curPunc == "{" || curPunc == "}") && ctype == "block") pop(state);
+      if ((curPunc == ";" || curPunc == "{" || curPunc == "}") && state.ctx.type == "block") pop(state);
       if (curPunc == "{") push(state, "}", stream);
       else if (curPunc == "(") {
         push(state, ")", stream);
@@ -150,7 +158,8 @@ CodeMirror.defineMode("r", function(config) {
       }
       else if (curPunc == "[") push(state, "]", stream);
       else if (curPunc == "block") push(state, "block", stream);
-      else if (curPunc == ctype) pop(state);
+      else if (curPunc == state.ctx.type) pop(state);
+      else if (state.ctx.type == "block" && style != "comment") setFlag(state, BRACELESS)
       state.afterIdent = style == "variable" || style == "keyword";
       return style;
     },
@@ -159,6 +168,7 @@ CodeMirror.defineMode("r", function(config) {
       if (state.tokenize != tokenBase) return 0;
       var firstChar = textAfter && textAfter.charAt(0), ctx = state.ctx,
           closing = firstChar == ctx.type;
+      if (ctx.flags & BRACELESS) ctx = ctx.prev
       if (ctx.type == "block") return ctx.indent + (firstChar == "{" ? 0 : config.indentUnit);
       else if (ctx.flags & ALIGN_YES) return ctx.column + (closing ? 0 : 1);
       else return ctx.indent + (closing ? 0 : config.indentUnit);

From d8d7703551da4e85fa7db3d55984bdf4fc13854c Mon Sep 17 00:00:00 2001
From: Luca Fabbri <luca@keul.it>
Date: Mon, 27 Feb 2017 10:19:37 +0100
Subject: [PATCH 3177/4742] [lint addon] Add support for Promises

---
 addon/lint/lint.js | 6 +++++-
 doc/manual.html    | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index c1f1702f92..e5ee747747 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -140,7 +140,11 @@
     if (options.async || getAnnotations.async) {
       lintAsync(cm, getAnnotations, passOptions)
     } else {
-      updateLinting(cm, getAnnotations(cm.getValue(), passOptions, cm));
+      var annotations = getAnnotations(cm.getValue(), passOptions, cm);
+      if (annotations.then) annotations.then(function(issues) {
+        updateLinting(cm, issues);
+      });
+      else updateLinting(cm, annotations);
     }
   }
 
diff --git a/doc/manual.html b/doc/manual.html
index 5e619fdebf..e179b158ff 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2763,9 +2763,11 @@ <h2 id="addons">Addons</h2>
       representing problems. When the function has
       an <code>async</code> property with a truthy value, it will be
       called with an additional second argument, which is a callback
-      to pass the array to. By default, the linter will run
-      (debounced) whenever the document is changed. You can pass
-      a <code>lintOnChange: false</code> option to disable that.
+      to pass the array to.
+      The linting function can also return a promise, in that case the linter
+      will only be executed when the promise resolves.
+      By default, the linter will run (debounced) whenever the document is changed.
+      You can pass a <code>lintOnChange: false</code> option to disable that.
       Depends on <code>addon/lint/lint.css</code>. A demo can be
       found <a href="../demo/lint.html">here</a>.</dd>
 

From d45038f139756745dd0bd81b189351a595df26b5 Mon Sep 17 00:00:00 2001
From: satamas <se.atamas@gmail.com>
Date: Mon, 27 Feb 2017 13:41:55 +0300
Subject: [PATCH 3178/4742] [clike mode] Support number with underscores for
 Kotlin 1.1.

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

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 7424c9a051..1ce77ca99a 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -587,6 +587,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     intendSwitch: false,
     indentStatements: false,
     multiLineStrings: true,
+    number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
     blockKeywords: words("catch class do else finally for if where try while enum"),
     defKeywords: words("class val var object package interface fun"),
     atoms: words("true false null this"),

From 861d0802070d9e7c9f6620eda564ff9e785b7eb2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 27 Feb 2017 14:43:24 +0100
Subject: [PATCH 3179/4742] [markdown mode] Always make a blank line terminate
 an HTML block

As per http://spec.commonmark.org/0.27/#html-blocks

Issue #4611
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 4ba57e44ca..21120ab482 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -120,7 +120,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.quote = 0;
     // Reset state.indentedCode
     state.indentedCode = false;
-    if (htmlModeMissing && state.f == htmlBlock) {
+    if (state.f == htmlBlock) {
       state.f = inlineNormal;
       state.block = blockNormal;
     }

From d1d6ee2ddeaafc5d5f540b22c8d4fa58ce4bf92c Mon Sep 17 00:00:00 2001
From: satamas <se.atamas@gmail.com>
Date: Mon, 27 Feb 2017 18:51:26 +0300
Subject: [PATCH 3180/4742] [clike mode] Add suspend to Kotlin keywords

---
 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 1ce77ca99a..ee7b077ee8 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -575,7 +575,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "file import where by get set abstract enum open inner override private public internal " +
       "protected catch finally out final vararg reified dynamic companion constructor init " +
       "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
-      "external annotation crossinline const operator infix"
+      "external annotation crossinline const operator infix suspend"
     ),
     types: words(
       /* package java.lang */

From 17159fecb00e3cb543ba7308ee4fcf58dc6df1de Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Mon, 27 Feb 2017 22:36:26 -0800
Subject: [PATCH 3181/4742] [merge addon] Stop other side from trailing behind
 during scrolling

... in a 3-editor view, by immediately syncing the scrolling from the
left to the right and vice-versa.
---
 addon/merge/merge.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index ad8002ca55..d5c529ebd9 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -56,10 +56,10 @@
 
       this.showDifferences = options.showDifferences !== false;
     },
-    registerEvents: function() {
+    registerEvents: function(otherDv) {
       this.forceUpdate = registerUpdate(this);
       setScrollLock(this, true, false);
-      registerScroll(this);
+      registerScroll(this, otherDv);
     },
     setShowDifferences: function(val) {
       val = val !== false;
@@ -144,12 +144,13 @@
     return update;
   }
 
-  function registerScroll(dv) {
+  function registerScroll(dv, otherDv) {
     dv.edit.on("scroll", function() {
       syncScroll(dv, true) && makeConnections(dv);
     });
     dv.orig.on("scroll", function() {
       syncScroll(dv, false) && makeConnections(dv);
+      if (otherDv) syncScroll(otherDv, true) && makeConnections(otherDv);
     });
   }
 
@@ -567,8 +568,8 @@
       this.aligners = [];
       alignChunks(this.left || this.right, true);
     }
-    if (left) left.registerEvents()
-    if (right) right.registerEvents()
+    if (left) left.registerEvents(right)
+    if (right) right.registerEvents(left)
 
 
     var onResize = function() {

From 3126d9df613b03ef831ef73b31c47c967f6c4536 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sat, 25 Feb 2017 14:59:39 +0100
Subject: [PATCH 3182/4742] [vim bindings] Make Y behave like yy

https://vi.stackexchange.com/questions/6061
---
 keymap/vim.js    | 2 +-
 test/vim_test.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 08f4374cac..d8f298f3e8 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -142,7 +142,7 @@
     { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
     { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
     { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
-    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'expandToLine', motionArgs: { linewise: true }, context: 'normal'},
     { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
     { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
     { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
diff --git a/test/vim_test.js b/test/vim_test.js
index 67cf8d8fea..56c4055da0 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1342,8 +1342,8 @@ testVim('Y', function(cm, vim, helpers) {
   helpers.doKeys('Y');
   eq(' word1\nword2\n word3', cm.getValue());
   var register = helpers.getRegisterController().getRegister();
-  eq('rd1', register.toString());
-  is(!register.linewise);
+  eq(' word1\n', register.toString());
+  is(register.linewise);
   helpers.assertCursorAt(0, 3);
 }, { value: ' word1\nword2\n word3' });
 testVim('~', function(cm, vim, helpers) {

From dd53b20e5d9580332b2828ac7a42c1edef08f338 Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Wed, 1 Mar 2017 11:49:46 +1100
Subject: [PATCH 3183/4742] [javascript mode] Add tsx test

---
 mode/jsx/test.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index c54a8b24c9..c7def5a3ea 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -66,4 +66,20 @@
 
   MT("tag_attribute",
      "([bracket&tag <][tag foo] [attribute bar]=[bracket&tag <][tag foo][bracket&tag />/>][operator ++])")
+
+  var ts_mode = CodeMirror.getMode({indentUnit: 2}, "text/typescript-jsx")
+  function TS(name) { test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1)) }
+
+  TS("tsx_react_integration",
+     "[keyword interface] [def Props] {",
+     "  [property foo]: [variable-3 string];",
+     "}",
+     "[keyword class] [def MyComponent] [keyword extends] [variable-3 React].[variable-3 Component] [operator <] [variable-3 Props], [variable-3 any] [operator >] {",
+     "  [property render]() {",
+     "    [keyword return] [bracket&tag <][tag span][bracket&tag >]{[keyword this].[property props].[property foo]}[bracket&tag </][tag span][bracket&tag >]",
+     "  }",
+     "}",
+     "[bracket&tag <][tag MyComponent] [attribute foo]=[string \"bar\"] [bracket&tag />]; [comment //ok]",
+     "[bracket&tag <][tag MyComponent] [attribute foo]={[number 0]} [bracket&tag />]; [comment //error]")
+
 })()

From 5e427c431e3ac9d0bdb5ec328e6ad8523c1508ac Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Wed, 1 Mar 2017 11:57:32 +1100
Subject: [PATCH 3184/4742] [mode/meta] add TypeScript-JSX

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

diff --git a/mode/meta.js b/mode/meta.js
index bb60502416..54d1fe2786 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -147,6 +147,7 @@
     {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
     {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
+    {name: "TypeScript-JSX", mime: "text/typescript-jsx", mode: "jsx", ext: ["tsx"], alias: ["tsx"]},
     {name: "Twig", mime: "text/x-twig", mode: "twig"},
     {name: "Web IDL", mime: "text/x-webidl", mode: "webidl", ext: ["webidl"]},
     {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},

From d333c723487f38e67a5c262fd931d258d3fb1e42 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 1 Mar 2017 10:09:12 +0100
Subject: [PATCH 3185/4742] Revert "[active-line addon] Style active lines
 differently"

This reverts commit a44e76a0ca4c53f03b0e67a3b067015c72eb6579.

Issue #4606
---
 lib/codemirror.css                | 2 +-
 theme/3024-day.css                | 2 +-
 theme/3024-night.css              | 2 +-
 theme/abcdef.css                  | 2 +-
 theme/ambiance.css                | 2 +-
 theme/base16-dark.css             | 2 +-
 theme/base16-light.css            | 2 +-
 theme/bespin.css                  | 2 +-
 theme/blackboard.css              | 2 +-
 theme/cobalt.css                  | 2 +-
 theme/colorforth.css              | 2 +-
 theme/dracula.css                 | 2 +-
 theme/duotone-dark.css            | 2 +-
 theme/duotone-light.css           | 2 +-
 theme/eclipse.css                 | 2 +-
 theme/elegant.css                 | 2 +-
 theme/erlang-dark.css             | 2 +-
 theme/hopscotch.css               | 2 +-
 theme/icecoder.css                | 2 +-
 theme/isotope.css                 | 2 +-
 theme/lesser-dark.css             | 2 +-
 theme/liquibyte.css               | 2 +-
 theme/material.css                | 2 +-
 theme/mbo.css                     | 2 +-
 theme/mdn-like.css                | 2 +-
 theme/midnight.css                | 2 +-
 theme/monokai.css                 | 2 +-
 theme/neat.css                    | 2 +-
 theme/night.css                   | 2 +-
 theme/panda-syntax.css            | 2 +-
 theme/paraiso-dark.css            | 2 +-
 theme/paraiso-light.css           | 2 +-
 theme/pastel-on-dark.css          | 2 +-
 theme/railscasts.css              | 2 +-
 theme/rubyblue.css                | 2 +-
 theme/seti.css                    | 2 +-
 theme/solarized.css               | 4 ++--
 theme/the-matrix.css              | 2 +-
 theme/tomorrow-night-bright.css   | 2 +-
 theme/tomorrow-night-eighties.css | 2 +-
 theme/twilight.css                | 2 +-
 theme/vibrant-ink.css             | 2 +-
 theme/xq-dark.css                 | 2 +-
 theme/xq-light.css                | 2 +-
 theme/yeti.css                    | 2 +-
 theme/zenburn.css                 | 3 ++-
 46 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 319da75331..2a6a262282 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -142,7 +142,7 @@
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
 div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 .CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline .CodeMirror-line {background: #e8f2ff;}
+.CodeMirror-activeline-background {background: #e8f2ff;}
 
 /* STOP */
 
diff --git a/theme/3024-day.css b/theme/3024-day.css
index 6b2a40fc8e..7132655306 100644
--- a/theme/3024-day.css
+++ b/theme/3024-day.css
@@ -37,5 +37,5 @@
 .cm-s-3024-day span.cm-link { color: #a16a94; }
 .cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
 
-.cm-s-3024-day .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
+.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/theme/3024-night.css b/theme/3024-night.css
index 5a4b0c8243..adc5900ad1 100644
--- a/theme/3024-night.css
+++ b/theme/3024-night.css
@@ -35,5 +35,5 @@
 .cm-s-3024-night span.cm-link { color: #a16a94; }
 .cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
 
-.cm-s-3024-night .CodeMirror-activeline .CodeMirror-line { background: #2F2F2F; }
+.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
 .cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/abcdef.css b/theme/abcdef.css
index 8b772e078a..7f9d788704 100644
--- a/theme/abcdef.css
+++ b/theme/abcdef.css
@@ -29,4 +29,4 @@
 .cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
 .cm-s-abcdef span.cm-link { color: blueviolet; }
 
-.cm-s-abcdef .CodeMirror-activeline .CodeMirror-line { background: #314151; }
+.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }
diff --git a/theme/ambiance.css b/theme/ambiance.css
index a73727f370..bce3446494 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -64,7 +64,7 @@
 
 .cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
 
-.cm-s-ambiance .CodeMirror-activeline .CodeMirror-line {
+.cm-s-ambiance .CodeMirror-activeline-background {
   background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
 }
 
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index cc54ff0cb9..026a816890 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -34,5 +34,5 @@
 .cm-s-base16-dark span.cm-link { color: #aa759f; }
 .cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
 
-.cm-s-base16-dark .CodeMirror-activeline .CodeMirror-line { background: #202020; }
+.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/base16-light.css b/theme/base16-light.css
index ef678a2404..474e0ca9d1 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -34,5 +34,5 @@
 .cm-s-base16-light span.cm-link { color: #aa759f; }
 .cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
 
-.cm-s-base16-light .CodeMirror-activeline .CodeMirror-line { background: #DDDCDC; }
+.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
 .cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/bespin.css b/theme/bespin.css
index fba3173f9a..60913ba938 100644
--- a/theme/bespin.css
+++ b/theme/bespin.css
@@ -31,4 +31,4 @@
 .cm-s-bespin span.cm-link {color: #9b859d;}
 
 .cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-bespin .CodeMirror-activeline .CodeMirror-line { background: #404040; }
+.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }
diff --git a/theme/blackboard.css b/theme/blackboard.css
index db6150990c..b6eaedb180 100644
--- a/theme/blackboard.css
+++ b/theme/blackboard.css
@@ -28,5 +28,5 @@
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
 .cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 
-.cm-s-blackboard .CodeMirror-activeline .CodeMirror-line { background: #3C3636; }
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
 .cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/theme/cobalt.css b/theme/cobalt.css
index 713127b617..d88223ed80 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -21,5 +21,5 @@
 .cm-s-cobalt span.cm-link { color: #845dc4; }
 .cm-s-cobalt span.cm-error { color: #9d1e15; }
 
-.cm-s-cobalt .CodeMirror-activeline .CodeMirror-line { background: #002D57; }
+.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
 .cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/theme/colorforth.css b/theme/colorforth.css
index e154700c65..606899f309 100644
--- a/theme/colorforth.css
+++ b/theme/colorforth.css
@@ -30,4 +30,4 @@
 
 .cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
 
-.cm-s-colorforth .CodeMirror-activeline .CodeMirror-line { background: #253540; }
+.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }
diff --git a/theme/dracula.css b/theme/dracula.css
index 1df12e02ab..53a660b521 100644
--- a/theme/dracula.css
+++ b/theme/dracula.css
@@ -36,5 +36,5 @@
 .cm-s-dracula span.cm-builtin { color: #50fa7b; }
 .cm-s-dracula span.cm-variable-3 { color: #ffb86c; }
 
-.cm-s-dracula .CodeMirror-activeline .CodeMirror-line { background: rgba(255,255,255,0.1); }
+.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
 .cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/duotone-dark.css b/theme/duotone-dark.css
index f60ec67072..b09a585c97 100644
--- a/theme/duotone-dark.css
+++ b/theme/duotone-dark.css
@@ -12,7 +12,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 
 /* begin cursor */
 .cm-s-duotone-dark .CodeMirror-cursor { border-left: 1px solid #ffad5c; /* border-left: 1px solid #ffad5c80; */ border-right: .5em solid #ffad5c; /* border-right: .5em solid #ffad5c80; */ opacity: .5; }
-.cm-s-duotone-dark .CodeMirror-activeline .CodeMirror-line { background: #363342; /* background: #36334280;  */ opacity: .5;}
+.cm-s-duotone-dark .CodeMirror-activeline-background { background: #363342; /* background: #36334280;  */ opacity: .5;}
 .cm-s-duotone-dark .cm-fat-cursor .CodeMirror-cursor { background: #ffad5c; /* background: #ffad5c80; */ opacity: .5;}
 /* end cursor */
 
diff --git a/theme/duotone-light.css b/theme/duotone-light.css
index a8365cbf03..80203d15d9 100644
--- a/theme/duotone-light.css
+++ b/theme/duotone-light.css
@@ -12,7 +12,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 
 /* begin cursor */
 .cm-s-duotone-light .CodeMirror-cursor { border-left: 1px solid #93abdc; /* border-left: 1px solid #93abdc80; */ border-right: .5em solid #93abdc; /* border-right: .5em solid #93abdc80; */ opacity: .5; }
-.cm-s-duotone-light .CodeMirror-activeline .CodeMirror-line { background: #e3dcce;  /* background: #e3dcce80; */ opacity: .5; }
+.cm-s-duotone-light .CodeMirror-activeline-background { background: #e3dcce;  /* background: #e3dcce80; */ opacity: .5; }
 .cm-s-duotone-light .cm-fat-cursor .CodeMirror-cursor { background: #93abdc; /* #93abdc80; */ opacity: .5; }
 /* end cursor */
 
diff --git a/theme/eclipse.css b/theme/eclipse.css
index 1d956d7efe..1bde460e90 100644
--- a/theme/eclipse.css
+++ b/theme/eclipse.css
@@ -19,5 +19,5 @@
 .cm-s-eclipse span.cm-link { color: #219; }
 .cm-s-eclipse span.cm-error { color: #f00; }
 
-.cm-s-eclipse .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
+.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/elegant.css b/theme/elegant.css
index fc6d46da4f..45b3ea655e 100644
--- a/theme/elegant.css
+++ b/theme/elegant.css
@@ -9,5 +9,5 @@
 .cm-s-elegant span.cm-link { color: #762; }
 .cm-s-elegant span.cm-error { background-color: #fdd; }
 
-.cm-s-elegant .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
+.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index 1d5101b5f9..65fe4814c1 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -30,5 +30,5 @@
 .cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
 .cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
-.cm-s-erlang-dark .CodeMirror-activeline .CodeMirror-line { background: #013461; }
+.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
 .cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/hopscotch.css b/theme/hopscotch.css
index 9a80e73b04..7d05431bdc 100644
--- a/theme/hopscotch.css
+++ b/theme/hopscotch.css
@@ -31,4 +31,4 @@
 .cm-s-hopscotch span.cm-link {color: #c85e7c;}
 
 .cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-hopscotch .CodeMirror-activeline .CodeMirror-line { background: #302020; }
+.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }
diff --git a/theme/icecoder.css b/theme/icecoder.css
index 6575a495e8..ffebaf2f0b 100644
--- a/theme/icecoder.css
+++ b/theme/icecoder.css
@@ -40,4 +40,4 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 .cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
 .cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
 .cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
-.cm-s-icecoder .CodeMirror-activeline .CodeMirror-line { background: #000; }
+.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
diff --git a/theme/isotope.css b/theme/isotope.css
index 5fc5dc4131..d0d6263cf4 100644
--- a/theme/isotope.css
+++ b/theme/isotope.css
@@ -31,4 +31,4 @@
 .cm-s-isotope span.cm-link {color: #cc00ff;}
 
 .cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-isotope .CodeMirror-activeline .CodeMirror-line { background: #202020; }
+.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index a597c78e7e..690c183d7b 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -43,5 +43,5 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-link { color: #00c; }
 .cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 
-.cm-s-lesser-dark .CodeMirror-activeline .CodeMirror-line { background: #3C3A3A; }
+.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
 .cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/liquibyte.css b/theme/liquibyte.css
index c832454c7b..9db8bde739 100644
--- a/theme/liquibyte.css
+++ b/theme/liquibyte.css
@@ -51,7 +51,7 @@
 
 .cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
 
-.cm-s-liquibyte .CodeMirror-activeline .CodeMirror-line { background-color: rgba(0, 255, 0, 0.15); }
+.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
 
 /* Default styles for common addons */
 .cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
diff --git a/theme/material.css b/theme/material.css
index 485de2ec61..01d867932a 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -23,7 +23,7 @@
 .cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
 .cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 
-.cm-s-material .CodeMirror-activeline .CodeMirror-line { background: rgba(0, 0, 0, 0); }
+.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
 .cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
 .cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
 .cm-s-material .cm-variable-2 { color: #80CBC4; }
diff --git a/theme/mbo.css b/theme/mbo.css
index c129099b9e..e164fcf42a 100644
--- a/theme/mbo.css
+++ b/theme/mbo.css
@@ -32,6 +32,6 @@
 .cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
 .cm-s-mbo span.cm-qualifier { color: #ffffec; }
 
-.cm-s-mbo .CodeMirror-activeline .CodeMirror-line { background: #494b41; }
+.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
 .cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
 .cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index c3dd4bf90c..f325d45005 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -40,7 +40,7 @@
 .cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
 .cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
 
-div.cm-s-mdn-like .CodeMirror-activeline .CodeMirror-line { background: #efefff; }
+div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
 div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
 
 .cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }
diff --git a/theme/midnight.css b/theme/midnight.css
index dea3e56c95..e41f10560f 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -5,7 +5,7 @@
 .cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
 
 /*<!--activeline-->*/
-.cm-s-midnight .CodeMirror-activeline .CodeMirror-line { background: #253540; }
+.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
 
 .cm-s-midnight.CodeMirror {
     background: #0F192A;
diff --git a/theme/monokai.css b/theme/monokai.css
index a086ffe5db..7c8a4c5d00 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -29,7 +29,7 @@
 .cm-s-monokai span.cm-link { color: #ae81ff; }
 .cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
 
-.cm-s-monokai .CodeMirror-activeline .CodeMirror-line { background: #373831; }
+.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
 .cm-s-monokai .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
diff --git a/theme/neat.css b/theme/neat.css
index b773ad897a..4267b1a37d 100644
--- a/theme/neat.css
+++ b/theme/neat.css
@@ -8,5 +8,5 @@
 .cm-s-neat span.cm-meta { color: #555; }
 .cm-s-neat span.cm-link { color: #3a3; }
 
-.cm-s-neat .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
+.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/theme/night.css b/theme/night.css
index ae47b78585..fd4e561933 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -23,5 +23,5 @@
 .cm-s-night span.cm-link { color: #845dc4; }
 .cm-s-night span.cm-error { color: #9d1e15; }
 
-.cm-s-night .CodeMirror-activeline .CodeMirror-line { background: #1C005A; }
+.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
 .cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/panda-syntax.css b/theme/panda-syntax.css
index 319bd048bd..c93b2ea03a 100644
--- a/theme/panda-syntax.css
+++ b/theme/panda-syntax.css
@@ -10,7 +10,7 @@
 	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
 }
 .cm-s-panda-syntax .CodeMirror-cursor { border-color: #ff2c6d; }
-.cm-s-panda-syntax .CodeMirror-activeline .CodeMirror-line {
+.cm-s-panda-syntax .CodeMirror-activeline-background {
 	background: rgba(99, 123, 156, 0.1);
 }
 .cm-s-panda-syntax .CodeMirror-selected {
diff --git a/theme/paraiso-dark.css b/theme/paraiso-dark.css
index b92cb010bc..aa9d207e6d 100644
--- a/theme/paraiso-dark.css
+++ b/theme/paraiso-dark.css
@@ -34,5 +34,5 @@
 .cm-s-paraiso-dark span.cm-link { color: #815ba4; }
 .cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
 
-.cm-s-paraiso-dark .CodeMirror-activeline .CodeMirror-line { background: #4D344A; }
+.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
 .cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/paraiso-light.css b/theme/paraiso-light.css
index 88004bb6f5..ae0c755f89 100644
--- a/theme/paraiso-light.css
+++ b/theme/paraiso-light.css
@@ -34,5 +34,5 @@
 .cm-s-paraiso-light span.cm-link { color: #815ba4; }
 .cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
 
-.cm-s-paraiso-light .CodeMirror-activeline .CodeMirror-line { background: #CFD1C4; }
+.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
 .cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index ac48da16ed..2603d36205 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -44,7 +44,7 @@
 	background: #757aD8;
 	color: #f8f8f0;
 }
-.cm-s-pastel-on-dark .CodeMirror-activeline .CodeMirror-line { background: rgba(255, 255, 255, 0.031); }
+.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
 .cm-s-pastel-on-dark .CodeMirror-matchingbracket {
 	border: 1px solid rgba(255,255,255,0.25);
 	color: #8F938F !important;
diff --git a/theme/railscasts.css b/theme/railscasts.css
index 408e6dce57..aeff0449d5 100644
--- a/theme/railscasts.css
+++ b/theme/railscasts.css
@@ -31,4 +31,4 @@
 .cm-s-railscasts span.cm-link {color: #b6b3eb;}
 
 .cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
-.cm-s-railscasts .CodeMirror-activeline .CodeMirror-line { background: #303040; }
+.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index d2fd1a17a6..76d33e7798 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -22,4 +22,4 @@
 .cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
 .cm-s-rubyblue span.cm-error { color: #AF2018; }
 
-.cm-s-rubyblue .CodeMirror-activeline .CodeMirror-line { background: #173047; }
+.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }
diff --git a/theme/seti.css b/theme/seti.css
index dc67f72a58..6632d3fc7f 100644
--- a/theme/seti.css
+++ b/theme/seti.css
@@ -40,5 +40,5 @@
 .cm-s-seti span.cm-property { color: #a074c4; }
 .cm-s-seti span.cm-variable-3 { color: #9fca56; }
 .cm-s-seti span.cm-builtin { color: #9fca56; }
-.cm-s-seti .CodeMirror-activeline .CodeMirror-line { background: #101213; }
+.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
 .cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 88be235feb..1f39c7edb2 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -161,9 +161,9 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }
 
 /* Active line */
-.cm-s-solarized.cm-s-dark .CodeMirror-activeline .CodeMirror-line {
+.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
   background: rgba(255, 255, 255, 0.06);
 }
-.cm-s-solarized.cm-s-light .CodeMirror-activeline .CodeMirror-line {
+.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
   background: rgba(0, 0, 0, 0.06);
 }
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index 506f53d854..3912a8dbd8 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -27,4 +27,4 @@
 .cm-s-the-matrix span.cm-attribute { color: #FFF700; }
 .cm-s-the-matrix span.cm-error { color: #FF0000; }
 
-.cm-s-the-matrix .CodeMirror-activeline .CodeMirror-line { background: #040; }
+.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }
diff --git a/theme/tomorrow-night-bright.css b/theme/tomorrow-night-bright.css
index 32c1d091b9..b6dd4a9278 100644
--- a/theme/tomorrow-night-bright.css
+++ b/theme/tomorrow-night-bright.css
@@ -31,5 +31,5 @@
 .cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
 .cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
 
-.cm-s-tomorrow-night-bright .CodeMirror-activeline .CodeMirror-line { background: #2a2a2a; }
+.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
 .cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/tomorrow-night-eighties.css b/theme/tomorrow-night-eighties.css
index ebc018fd81..2a9debc327 100644
--- a/theme/tomorrow-night-eighties.css
+++ b/theme/tomorrow-night-eighties.css
@@ -34,5 +34,5 @@
 .cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
 .cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
 
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline .CodeMirror-line { background: #343600; }
+.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
 .cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/twilight.css b/theme/twilight.css
index 3bf509d897..d342b899f6 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -28,5 +28,5 @@
 .cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
 .cm-s-twilight .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-twilight .CodeMirror-activeline .CodeMirror-line { background: #27282E; }
+.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
 .cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index 268e1da38f..ac4ec6d87a 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -30,5 +30,5 @@
 .cm-s-vibrant-ink .cm-link { color: blue; }
 .cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-vibrant-ink .CodeMirror-activeline .CodeMirror-line { background: #27282E; }
+.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
 .cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index e42e80af03..e3bd960bbb 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -49,5 +49,5 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-attribute { color: #FFF700; }
 .cm-s-xq-dark span.cm-error { color: #f00; }
 
-.cm-s-xq-dark .CodeMirror-activeline .CodeMirror-line { background: #27282E; }
+.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
 .cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/theme/xq-light.css b/theme/xq-light.css
index ec507e2314..8d2fcb667b 100644
--- a/theme/xq-light.css
+++ b/theme/xq-light.css
@@ -39,5 +39,5 @@ THE SOFTWARE.
 .cm-s-xq-light span.cm-attribute { color: #7F007F; }
 .cm-s-xq-light span.cm-error { color: #f00; }
 
-.cm-s-xq-light .CodeMirror-activeline .CodeMirror-line { background: #e8f2ff; }
+.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
 .cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/theme/yeti.css b/theme/yeti.css
index 548dca9a27..c70d4d214e 100644
--- a/theme/yeti.css
+++ b/theme/yeti.css
@@ -40,5 +40,5 @@
 .cm-s-yeti span.cm-property { color: #a074c4; }
 .cm-s-yeti span.cm-builtin { color: #a074c4; }
 .cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
-.cm-s-yeti .CodeMirror-activeline .CodeMirror-line { background: #E7E4E0; }
+.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
 .cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/theme/zenburn.css b/theme/zenburn.css
index bfdef926cb..781c40acac 100644
--- a/theme/zenburn.css
+++ b/theme/zenburn.css
@@ -31,6 +31,7 @@
 .cm-s-zenburn span.cm-operator { color: #f0efd0; }
 .cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
 .cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
-.cm-s-zenburn .CodeMirror-activeline .CodeMirror-line { background: #000000; }
+.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
+.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
 .cm-s-zenburn div.CodeMirror-selected { background: #545454; }
 .cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }

From b359a0210ede0755dc010f465faf2d15d113f89e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 1 Mar 2017 10:40:14 +0100
Subject: [PATCH 3186/4742] [sql-hint tests] Fix result comparision function

Issue #4618
---
 test/sql-hint-test.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index 31d0490f19..f789b1818e 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -144,7 +144,7 @@
     value: "SELECT myt",
     cursor: Pos(0, 10),
     tables: displayTextTables,
-    list: displayTextTables,
+    list: [{text: "mytable", displayText: "mytable | The main table",}],
     from: Pos(0, 7),
     to: Pos(0, 10)
   });
@@ -179,11 +179,18 @@
   })
 
   function deepCompare(a, b) {
-    if (!a || typeof a != "object")
-      return a === b;
-    if (!b || typeof b != "object")
-      return false;
-    for (var prop in a) if (!deepCompare(a[prop], b[prop])) return false;
-    return true;
+    if (a === b) return true
+    if (!(a && typeof a == "object") ||
+        !(b && typeof b == "object")) return false
+    let array = Array.isArray(a)
+    if (Array.isArray(b) != array) return false
+    if (array) {
+      if (a.length != b.length) return false
+      for (let i = 0; i < a.length; i++) if (!deepCompare(a[i], b[i])) return false
+    } else {
+      for (let p in a) if (!(p in b) || !deepCompare(a[p], b[p])) return false
+      for (let p in b) if (!(p in a)) return false
+    }
+    return true
   }
 })();

From 1d8ba8a3679fc765d7f6aaa45799b7211b5aac4c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 1 Mar 2017 10:43:38 +0100
Subject: [PATCH 3187/4742] Remove es6-isms

---
 test/sql-hint-test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index f789b1818e..87a25df0a8 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -182,14 +182,14 @@
     if (a === b) return true
     if (!(a && typeof a == "object") ||
         !(b && typeof b == "object")) return false
-    let array = Array.isArray(a)
+    var array = Array.isArray(a)
     if (Array.isArray(b) != array) return false
     if (array) {
       if (a.length != b.length) return false
-      for (let i = 0; i < a.length; i++) if (!deepCompare(a[i], b[i])) return false
+      for (var i = 0; i < a.length; i++) if (!deepCompare(a[i], b[i])) return false
     } else {
-      for (let p in a) if (!(p in b) || !deepCompare(a[p], b[p])) return false
-      for (let p in b) if (!(p in a)) return false
+      for (var p in a) if (!(p in b) || !deepCompare(a[p], b[p])) return false
+      for (var p in b) if (!(p in a)) return false
     }
     return true
   }

From 84a01c3df6ce958d9e581be88f69b738891c73e0 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 1 Mar 2017 11:33:37 +0100
Subject: [PATCH 3188/4742] [bidi demo] Remove note for now-fixed bug

---
 demo/bidi.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/demo/bidi.html b/demo/bidi.html
index 6dd73bec3a..1be7db5c36 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -66,9 +66,4 @@ <h2>Bi-directional Text Demo</h2>
   the <a href="http://marijnhaverbeke.nl/blog/cursor-in-bidi-text.html">related
   blog post</a> for more background.</p>
 
-  <p><strong>Note:</strong> There is
-  a <a href="https://github.com/codemirror/CodeMirror/issues/1757">known
-  bug</a> with cursor motion and mouse clicks in bi-directional lines
-  that are line wrapped.</p>
-
 </article>

From 65c70cf5d18ac3a0c1a3fe717d90a81ff823aa9f Mon Sep 17 00:00:00 2001
From: Christopher Kramer <crazy4chrissi@gmail.com>
Date: Tue, 28 Feb 2017 22:34:38 +0100
Subject: [PATCH 3189/4742] [sql-hint addon] Support different identifier
 quotes

The identifier-quote that a language uses around identifiers can now
be defined using "identifierQuote" when defining a mimetype.
Previously, backticks where hardcoded, but this is not standard SQL
(which uses double quotes). For example, SQLite defines double quotes
as preferred way to quote identifiers:
http://sqlite.org/lang_keywords.html
---
 addon/hint/sql-hint.js | 30 +++++++++++++++++-----------
 test/sql-hint-test.js  | 44 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 1ee4f0bbed..d6b6774b29 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -14,6 +14,7 @@
   var tables;
   var defaultTable;
   var keywords;
+  var identifierQuote;
   var CONS = {
     QUERY_DIV: ";",
     ALIAS_KEYWORD: "AS"
@@ -28,6 +29,12 @@
     return CodeMirror.resolveMode(mode).keywords;
   }
 
+  function getIdentifierQuote(editor) {
+    var mode = editor.doc.modeOption;
+    if (mode === "sql") mode = "text/x-sql";
+    return CodeMirror.resolveMode(mode).identifierQuote || "`";
+  }
+
   function getText(item) {
     return typeof item == "string" ? item : item.text;
   }
@@ -86,17 +93,17 @@
   }
 
   function cleanName(name) {
-    // Get rid name from backticks(`) and preceding dot(.)
+    // Get rid name from identifierQuote and preceding dot(.)
     if (name.charAt(0) == ".") {
       name = name.substr(1);
     }
-    return name.replace(/`/g, "");
+    return name.replace(new RegExp(identifierQuote,"g"), "");
   }
 
-  function insertBackticks(name) {
+  function insertIdentifierQuotes(name) {
     var nameParts = getText(name).split(".");
     for (var i = 0; i < nameParts.length; i++)
-      nameParts[i] = "`" + nameParts[i] + "`";
+      nameParts[i] = identifierQuote + nameParts[i] + identifierQuote;
     var escaped = nameParts.join(".");
     if (typeof name == "string") return escaped;
     name = shallowClone(name);
@@ -106,13 +113,13 @@
 
   function nameCompletion(cur, token, result, editor) {
     // Try to complete table, column names and return start position of completion
-    var useBacktick = false;
+    var useIdentifierQuotes = false;
     var nameParts = [];
     var start = token.start;
     var cont = true;
     while (cont) {
       cont = (token.string.charAt(0) == ".");
-      useBacktick = useBacktick || (token.string.charAt(0) == "`");
+      useIdentifierQuotes = useIdentifierQuotes || (token.string.charAt(0) == identifierQuote);
 
       start = token.start;
       nameParts.unshift(cleanName(token.string));
@@ -127,12 +134,12 @@
     // Try to complete table names
     var string = nameParts.join(".");
     addMatches(result, string, tables, function(w) {
-      return useBacktick ? insertBackticks(w) : w;
+      return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
     });
 
     // Try to complete columns from defaultTable
     addMatches(result, string, defaultTable, function(w) {
-      return useBacktick ? insertBackticks(w) : w;
+      return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
     });
 
     // Try to complete columns
@@ -162,7 +169,7 @@
           w = shallowClone(w);
           w.text = tableInsert + "." + w.text;
         }
-        return useBacktick ? insertBackticks(w) : w;
+        return useIdentifierQuotes ? insertIdentifierQuotes(w) : w;
       });
     }
 
@@ -232,6 +239,7 @@
     var disableKeywords = options && options.disableKeywords;
     defaultTable = defaultTableName && getTable(defaultTableName);
     keywords = getKeywords(editor);
+    identifierQuote = getIdentifierQuote(editor);
 
     if (defaultTableName && !defaultTable)
       defaultTable = findTableByAlias(defaultTableName, editor);
@@ -249,7 +257,7 @@
       token.string = token.string.slice(0, cur.ch - token.start);
     }
 
-    if (token.string.match(/^[.`\w@]\w*$/)) {
+    if (token.string.match(/^[.`"\w@]\w*$/)) {
       search = token.string;
       start = token.start;
       end = token.end;
@@ -257,7 +265,7 @@
       start = end = cur.ch;
       search = "";
     }
-    if (search.charAt(0) == "." || search.charAt(0) == "`") {
+    if (search.charAt(0) == "." || search.charAt(0) == identifierQuote) {
       start = nameCompletion(cur, token, result, editor);
     } else {
       addMatches(result, search, tables, function(w) {return w;});
diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index 87a25df0a8..1094ec03de 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -34,7 +34,7 @@
       eqCharPos(completion.to, spec.to);
     }, {
       value: spec.value,
-      mode: "text/x-mysql"
+      mode: spec.mode || "text/x-mysql"
     });
   }
 
@@ -90,6 +90,16 @@
     to: Pos(0, 18)
   });
 
+  test("doublequoted", {
+    value: "SELECT \"users\".\"na",
+    cursor: Pos(0, 18),
+    tables: simpleTables,
+    list: ["\"users\".\"name\""],
+    from: Pos(0, 7),
+    to: Pos(0, 18),
+    mode: "text/x-sqlite"
+  });
+
   test("quotedcolumn", {
     value: "SELECT users.`na",
     cursor: Pos(0, 16),
@@ -99,6 +109,16 @@
     to: Pos(0, 16)
   });
 
+  test("doublequotedcolumn", {
+    value: "SELECT users.\"na",
+    cursor: Pos(0, 16),
+    tables: simpleTables,
+    list: ["\"users\".\"name\""],
+    from: Pos(0, 7),
+    to: Pos(0, 16),
+    mode: "text/x-sqlite"
+  });
+
   test("schema", {
     value: "SELECT schem",
     cursor: Pos(0, 12),
@@ -118,6 +138,16 @@
     to: Pos(0, 11)
   });
 
+  test("schemadoublequoted", {
+    value: "SELECT \"sch",
+    cursor: Pos(0, 11),
+    tables: schemaTables,
+    list: ["\"schema\".\"users\"", "\"schema\".\"countries\""],
+    from: Pos(0, 7),
+    to: Pos(0, 11),
+    mode: "text/x-sqlite"
+  });
+
   test("schemacolumn", {
     value: "SELECT schema.users.",
     cursor: Pos(0, 20),
@@ -140,6 +170,18 @@
     to: Pos(0, 24)
   });
 
+  test("schemacolumndoublequoted", {
+    value: "SELECT \"schema\".\"users\".",
+    cursor: Pos(0, 24),
+    tables: schemaTables,
+    list: ["\"schema\".\"users\".\"name\"",
+           "\"schema\".\"users\".\"score\"",
+           "\"schema\".\"users\".\"birthDate\""],
+    from: Pos(0, 7),
+    to: Pos(0, 24),
+    mode: "text/x-sqlite"
+  });
+
   test("displayText_table", {
     value: "SELECT myt",
     cursor: Pos(0, 10),

From c4387d6073b15ccf0f32773eb71a54f3b694f2f0 Mon Sep 17 00:00:00 2001
From: Christopher Kramer <crazy4chrissi@gmail.com>
Date: Tue, 28 Feb 2017 22:37:11 +0100
Subject: [PATCH 3190/4742] [sql mode] Add sqlite dialect

---
 mode/meta.js    |  1 +
 mode/sql/sql.js | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/mode/meta.js b/mode/meta.js
index 54d1fe2786..0a3dd2ca97 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -130,6 +130,7 @@
     {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
     {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+    {name: "SQLite", mime: "text/x-sqlite", mode: "sql"},
     {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
     {name: "Stylus", mime: "text/x-styl", mode: "stylus", ext: ["styl"]},
     {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 32ced3e9de..5734afa9f2 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -217,6 +217,19 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     return stream.eatWhile(/\w/) ? "variable-2" : null;
   }
 
+  // "identifier"
+  function hookIdentifierDoublequote(stream) {
+    // Standard SQL /SQLite identifiers
+    // ref: http://web.archive.org/web/20160813185132/http://savage.net.au/SQL/sql-99.bnf.html#delimited%20identifier
+    // ref: http://sqlite.org/lang_keywords.html
+    var ch;
+    while ((ch = stream.next()) != null) {
+      if (ch == "\"" && !stream.eat("\"")) return "variable-2";
+    }
+    stream.backUp(stream.current().length - 1);
+    return stream.eatWhile(/\w/) ? "variable-2" : null;
+  }
+
   // variable token
   function hookVar(stream) {
     // variables
@@ -322,6 +335,36 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     }
   });
 
+  // provided by the phpLiteAdmin project - phpliteadmin.org
+  CodeMirror.defineMIME("text/x-sqlite", {
+    name: "sql",
+    // commands of the official SQLite client, ref: https://www.sqlite.org/cli.html#dotcmd
+    client: set("auth backup bail binary changes check clone databases dbinfo dump echo eqp exit explain fullschema headers help import imposter indexes iotrace limit lint load log mode nullvalue once open output print prompt quit read restore save scanstats schema separator session shell show stats system tables testcase timeout timer trace vfsinfo vfslist vfsname width"),
+    // ref: http://sqlite.org/lang_keywords.html
+    keywords: set(sqlKeywords + "abort action add after all analyze attach autoincrement before begin cascade case cast check collate column commit conflict constraint cross current_date current_time current_timestamp database default deferrable deferred detach each else end escape except exclusive exists explain fail for foreign full glob if ignore immediate index indexed initially inner instead intersect isnull key left limit match natural no notnull null of offset outer plan pragma primary query raise recursive references regexp reindex release rename replace restrict right rollback row savepoint temp temporary then to transaction trigger unique using vacuum view virtual when with without"),
+    // SQLite is weakly typed, ref: http://sqlite.org/datatype3.html. This is just a list of some common types.
+    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text clob bigint int int2 int8 integer float double char varchar date datetime year unsigned signed numeric real"),
+    // ref: http://sqlite.org/syntax/literal-value.html
+    atoms: set("null current_date current_time current_timestamp"),
+    // ref: http://sqlite.org/lang_expr.html#binaryops
+    operatorChars: /^[*+\-%<>!=&|/~]/,
+    // SQLite is weakly typed, ref: http://sqlite.org/datatype3.html. This is just a list of some common types.
+    dateSQL: set("date time timestamp datetime"),
+    support: set("decimallessFloat zerolessFloat"),
+    identifierQuote: "\"",  //ref: http://sqlite.org/lang_keywords.html
+    hooks: {
+      // bind-parameters ref:http://sqlite.org/lang_expr.html#varparam
+      "@":   hookVar,
+      ":":   hookVar,
+      "?":   hookVar,
+      "$":   hookVar,
+      // The preferred way to escape Identifiers is using double quotes, ref: http://sqlite.org/lang_keywords.html
+      "\"":   hookIdentifierDoublequote,
+      // there is also support for backtics, ref: http://sqlite.org/lang_keywords.html
+      "`":   hookIdentifier
+    }
+  });
+
   // the query language used by Apache Cassandra is called CQL, but this mime type
   // is called Cassandra to avoid confusion with Contextual Query Language
   CodeMirror.defineMIME("text/x-cassandra", {

From 8d55250810333ad793223d3c7573a4728e4bee28 Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Wed, 1 Mar 2017 10:30:18 -0800
Subject: [PATCH 3191/4742] [merge addon] Re-align after swapping docs.

---
 addon/merge/merge.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index d5c529ebd9..6c4ab866ab 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -128,6 +128,7 @@
     }
     function swapDoc() {
       dv.diffOutOfDate = true;
+      dv.dealigned = true;
       update("full");
     }
     dv.edit.on("change", change);

From c41d05e283bba4b7f7c26da284135a60c7fc7f70 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 1 Mar 2017 21:58:02 +0100
Subject: [PATCH 3192/4742] [merge addon] Realign when a redraw updates a
 previously estimated line height

Closes #4621
---
 addon/merge/merge.js | 5 +++++
 demo/merge.html      | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 6c4ab866ab..35b992ea5d 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -828,6 +828,7 @@
   function TrackAlignable(cm) {
     this.cm = cm
     this.alignable = []
+    this.height = cm.doc.height
     var self = this
     cm.on("markerAdded", function(_, marker) {
       if (!marker.collapsed) return
@@ -857,11 +858,15 @@
       self.check(end, F_MARKER, self.hasMarker)
       if (nBefore || nAfter) self.check(change.from.line, F_MARKER, self.hasMarker)
     })
+    cm.on("viewportChange", function() {
+      if (self.cm.doc.height != self.height) self.signal()
+    })
   }
 
   TrackAlignable.prototype = {
     signal: function() {
       CodeMirror.signal(this, "realign")
+      this.height = this.cm.doc.height
     },
 
     set: function(n, flags) {
diff --git a/demo/merge.html b/demo/merge.html
index 20783b866c..9e2d14ea37 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -64,7 +64,7 @@ <h2>merge view demo</h2>
 library to compute the diffs.</p>
 
 <script>
-var value, orig1, orig2, dv, panes = 2, highlight = true, connect = null, collapse = false;
+var value, orig1, orig2, dv, panes = 2, highlight = true, connect = "align", collapse = false;
 function initUI() {
   if (value == null) return;
   var target = document.getElementById("view");
@@ -91,6 +91,7 @@ <h2>merge view demo</h2>
   orig2 = value.replace(/\u003cscript/g, "\u003cscript type=text/javascript ")
     .replace("white", "purple;\n      font: comic sans;\n      text-decoration: underline;\n      height: 15em");
   initUI();
+  let d = document.createElement("div"); d.style.cssText = "width: 50px; margin: 7px; height: 14px"; dv.editor().addLineWidget(57, d)
 };
 
 function mergeViewHeight(mergeView) {

From 595df8def8e5ebbb41f3d12a372dc0c645be3db7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Mar 2017 11:12:44 +0100
Subject: [PATCH 3193/4742] [ruby mode] Improve scanning for regexps

Closes #4623
---
 mode/ruby/ruby.js | 42 ++++++++++++++++++++++++++----------------
 mode/ruby/test.js |  2 ++
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 085f909f5f..68ebf122b4 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -46,22 +46,10 @@ CodeMirror.defineMode("ruby", function(config) {
     if (ch == "`" || ch == "'" || ch == '"') {
       return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
     } else if (ch == "/") {
-      var currentIndex = stream.current().length;
-      if (stream.skipTo("/")) {
-        var search_till = stream.current().length;
-        stream.backUp(stream.current().length - currentIndex);
-        var balance = 0;  // balance brackets
-        while (stream.current().length < search_till) {
-          var chchr = stream.next();
-          if (chchr == "(") balance += 1;
-          else if (chchr == ")") balance -= 1;
-          if (balance < 0) break;
-        }
-        stream.backUp(stream.current().length - currentIndex);
-        if (balance == 0)
-          return chain(readQuoted(ch, "string-2", true), stream, state);
-      }
-      return "operator";
+      if (regexpAhead(stream))
+        return chain(readQuoted(ch, "string-2", true), stream, state);
+      else
+        return "operator";
     } else if (ch == "%") {
       var style = "string", embed = true;
       if (stream.eat("s")) style = "atom";
@@ -148,6 +136,28 @@ CodeMirror.defineMode("ruby", function(config) {
     }
   }
 
+  function regexpAhead(stream) {
+    var start = stream.pos, depth = 0, next, found = false, escaped = false
+    while ((next = stream.next()) != null) {
+      if (!escaped) {
+        if ("[{(".indexOf(next) > -1) {
+          depth++
+        } else if ("]})".indexOf(next) > -1) {
+          depth--
+          if (depth < 0) break
+        } else if (next == "/" && depth == 0) {
+          found = true
+          break
+        }
+        escaped = next == "\\"
+      } else {
+        escaped = false
+      }
+    }
+    stream.backUp(stream.pos - start)
+    return found
+  }
+
   function tokenBaseUntilBrace(depth) {
     if (!depth) depth = 1;
     return function(stream, state) {
diff --git a/mode/ruby/test.js b/mode/ruby/test.js
index cade864ff9..3133bd63f4 100644
--- a/mode/ruby/test.js
+++ b/mode/ruby/test.js
@@ -11,4 +11,6 @@
   MT("divide_equal_operator_no_spacing",
      "[variable foo][operator /=][number 42]");
 
+  MT("complex_regexp",
+     "[keyword if] [variable cr] [operator =~] [string-2 /(?: \\( #{][tag RE_NOT][string-2 }\\( | #{][tag RE_NOT_PAR_OR][string-2 }* #{][tag RE_OPA_OR][string-2 } )/][variable x]")
 })();

From 3c816659d0898f1f92849ea5c96f18528b61d888 Mon Sep 17 00:00:00 2001
From: Christopher Kramer <crazy4chrissi@gmail.com>
Date: Sat, 4 Mar 2017 01:23:00 +0100
Subject: [PATCH 3194/4742] [sql-hint addon] Properly quote quotes

Identifiers that contain the identifierQuote like a table named
my"table are now doublicated correctly (e.g. quoting produces:
"my""table"). This fixes 2 failing tests, but 2 others still fail.
---
 addon/hint/sql-hint.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index d6b6774b29..e95b6bb4e9 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -97,13 +97,21 @@
     if (name.charAt(0) == ".") {
       name = name.substr(1);
     }
-    return name.replace(new RegExp(identifierQuote,"g"), "");
+    // replace doublicated identifierQuotes with single identifierQuotes
+    // and remove single identifierQuotes
+    var nameParts = name.split(identifierQuote+identifierQuote);
+    for (var i = 0; i < nameParts.length; i++)
+      nameParts[i] = nameParts[i].replace(new RegExp(identifierQuote,"g"), "");
+    return nameParts.join(identifierQuote);
   }
 
   function insertIdentifierQuotes(name) {
     var nameParts = getText(name).split(".");
     for (var i = 0; i < nameParts.length; i++)
-      nameParts[i] = identifierQuote + nameParts[i] + identifierQuote;
+      nameParts[i] = identifierQuote +
+        // doublicate identifierQuotes
+        nameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +
+        identifierQuote;
     var escaped = nameParts.join(".");
     if (typeof name == "string") return escaped;
     name = shallowClone(name);

From 4f091edc3755d34e9d4bba4206506f26eaed5447 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 28 Feb 2017 19:22:05 +0100
Subject: [PATCH 3195/4742] [vim mode] Basic implementation of special mark '

---
 keymap/vim.js    | 25 +++++++++++++++++--------
 test/vim_test.js | 11 +++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index d8f298f3e8..b2c404d45e 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1627,9 +1627,8 @@
         return findNext(cm, prev/** prev */, query, motionArgs.repeat);
       },
       goToMark: function(cm, _head, motionArgs, vim) {
-        var mark = vim.marks[motionArgs.selectedCharacter];
-        if (mark) {
-          var pos = mark.find();
+        var pos = getMarkPos(cm, vim, motionArgs.selectedCharacter);
+        if (pos) {
           return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos;
         }
         return null;
@@ -3973,6 +3972,17 @@
       return {top: from.line, bottom: to.line};
     }
 
+    function getMarkPos(cm, vim, markName) {
+      if (markName == '\'') {
+        var history = cm.doc.history.done;
+        var event = history[history.length - 2];
+        return event && event.ranges && event.ranges[0].head;
+      }
+
+      var mark = vim.marks[markName];
+      return mark && mark.find();
+    }
+
     var ExCommandDispatcher = function() {
       this.buildCommandMap_();
     };
@@ -4081,11 +4091,10 @@
           case '$':
             return cm.lastLine();
           case '\'':
-            var mark = cm.state.vim.marks[inputStream.next()];
-            if (mark && mark.find()) {
-              return mark.find().line;
-            }
-            throw new Error('Mark not set');
+            var markName = inputStream.next();
+            var markPos = getMarkPos(cm, cm.state.vim, markName);
+            if (!markPos) throw new Error('Mark not set');
+            return markPos.line;
           default:
             inputStream.backUp(1);
             return undefined;
diff --git a/test/vim_test.js b/test/vim_test.js
index 56c4055da0..36d452f025 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1640,6 +1640,17 @@ testVim('mark', function(cm, vim, helpers) {
   helpers.doKeys('\'', 't');
   helpers.assertCursorAt(2, 3);
 });
+testVim('mark\'', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  cm.setCursor(0, 0);
+  helpers.doKeys('`', '\'');
+  helpers.assertCursorAt(2, 2);
+  cm.setCursor(2, 0);
+  cm.replaceRange('   h', cm.getCursor());
+  cm.setCursor(0, 0);
+  helpers.doKeys('\'', '\'');
+  helpers.assertCursorAt(2, 3);
+});
 testVim('jumpToMark_next', function(cm, vim, helpers) {
   cm.setCursor(2, 2);
   helpers.doKeys('m', 't');

From 3c18925bc667a5f0c9580de846ec4deaced6abd5 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 2 Mar 2017 10:22:04 +0100
Subject: [PATCH 3196/4742] Implement global rtl mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is based on work by Radek Piórkowski <radek25c@gmail.com>.
---
 lib/codemirror.css                      |  2 ++
 src/display/selection.js                |  2 +-
 src/edit/CodeMirror.js                  |  2 +-
 src/edit/commands.js                    |  2 +-
 src/edit/options.js                     |  1 +
 src/input/ContentEditableInput.js       |  2 +-
 src/input/movement.js                   | 19 ++++++++++---------
 src/line/line_data.js                   |  2 +-
 src/measurement/position_measurement.js |  4 ++--
 src/model/Doc.js                        | 21 +++++++++++++++------
 src/model/document_data.js              | 13 +++++++++++++
 src/util/bidi.js                        | 16 ++++++++--------
 12 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 2a6a262282..75cc4c42f1 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -272,6 +272,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-widget {}
 
+.CodeMirror-rtl pre { direction: rtl; }
+
 .CodeMirror-code {
   outline: none;
 }
diff --git a/src/display/selection.js b/src/display/selection.js
index e3f912403a..d9b69d4921 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -70,7 +70,7 @@ function drawSelectionRange(cm, range, output) {
       return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
     }
 
-    iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir) => {
+    iterateBidiSections(getOrder(lineObj, doc.direction), fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir) => {
       let leftPos = coords(from, "left"), rightPos, left, right
       if (from == to) {
         rightPos = leftPos
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 3c482c599f..2d502c9ebc 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -35,7 +35,7 @@ export function CodeMirror(place, options) {
   setGuttersForLineNumbers(options)
 
   let doc = options.value
-  if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator)
+  if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction)
   this.doc = doc
 
   let input = new CodeMirror.inputStyles[options.inputStyle](this)
diff --git a/src/edit/commands.js b/src/edit/commands.js
index ea14b9bccc..fabf958214 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -168,7 +168,7 @@ function lineEnd(cm, lineN) {
 function lineStartSmart(cm, pos) {
   let start = lineStart(cm, pos.line)
   let line = getLine(cm.doc, start.line)
-  let order = getOrder(line)
+  let order = getOrder(line, cm.doc.direction)
   if (!order || order[0].level == 0) {
     let firstNonWS = Math.max(0, line.text.search(/\S/))
     let inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
diff --git a/src/edit/options.js b/src/edit/options.js
index 324dc84b16..930c41dd21 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -153,6 +153,7 @@ export function defineOptions(CodeMirror) {
 
   option("tabindex", null, (cm, val) => cm.display.input.getField().tabIndex = val || "")
   option("autofocus", null)
+  option("direction", "ltr", (cm, val) => cm.doc.setDirection(val), true)
 }
 
 function guttersChanged(cm) {
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 898b74be72..08debaa22a 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -347,7 +347,7 @@ function posToDOM(cm, pos) {
   let line = getLine(cm.doc, pos.line)
   let info = mapFromLineView(view, line, pos.line)
 
-  let order = getOrder(line), side = "left"
+  let order = getOrder(line, cm.doc.direction), side = "left"
   if (order) {
     let partPos = getBidiPartAt(order, pos.ch)
     side = partPos % 2 ? "right" : "left"
diff --git a/src/input/movement.js b/src/input/movement.js
index 7f4643bec3..5ce695e2b6 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -15,7 +15,7 @@ export function moveLogically(line, start, dir) {
 
 export function endOfLine(visually, cm, lineObj, lineNo, dir) {
   if (visually) {
-    let order = getOrder(lineObj)
+    let order = getOrder(lineObj, cm.doc.direction)
     if (order) {
       let part = dir < 0 ? lst(order) : order[0]
       let moveInStorageOrder = (dir < 0) == (part.level == 1)
@@ -41,7 +41,7 @@ export function endOfLine(visually, cm, lineObj, lineNo, dir) {
 }
 
 export function moveVisually(cm, line, start, dir) {
-  let bidi = getOrder(line)
+  let bidi = getOrder(line, cm.doc.direction)
   if (!bidi) return moveLogically(line, start, dir)
   if (start.ch >= line.text.length) {
     start.ch = line.text.length
@@ -51,8 +51,8 @@ export function moveVisually(cm, line, start, dir) {
     start.sticky = "after"
   }
   let partPos = getBidiPartAt(bidi, start.ch, start.sticky), part = bidi[partPos]
-  if (part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) {
-    // Case 1: We move within an ltr part. Even with wrapped lines,
+  if (cm.doc.direction == "ltr" && part.level % 2 == 0 && (dir > 0 ? part.to > start.ch : part.from < start.ch)) {
+    // Case 1: We move within an ltr part in an ltr editor. Even with wrapped lines,
     // nothing interesting happens.
     return moveLogically(line, start, dir)
   }
@@ -66,11 +66,12 @@ export function moveVisually(cm, line, start, dir) {
   }
   let wrappedLineExtent = getWrappedLineExtent(start.sticky == "before" ? mv(start, -1) : start.ch)
 
-  if (part.level % 2 == 1) {
-    let ch = mv(start, -dir)
-    if (ch != null && (dir > 0 ? ch >= part.from && ch >= wrappedLineExtent.begin : ch <= part.to && ch <= wrappedLineExtent.end)) {
-      // Case 2: We move within an rtl part on the same visual line
-      let sticky = dir < 0 ? "before" : "after"
+  if (cm.doc.direction == "rtl" || part.level == 1) {
+    let moveInStorageOrder = (part.level == 1) == (dir < 0)
+    let ch = mv(start, moveInStorageOrder ? 1 : -1)
+    if (ch != null && (!moveInStorageOrder ? ch >= part.from && ch >= wrappedLineExtent.begin : ch <= part.to && ch <= wrappedLineExtent.end)) {
+      // Case 2: We move within an rtl part or in an rtl editor on the same visual line
+      let sticky = moveInStorageOrder ? "before" : "after"
       return new Pos(start.line, ch, sticky)
     }
   }
diff --git a/src/line/line_data.js b/src/line/line_data.js
index 552c56b152..9c3b55d13a 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -81,7 +81,7 @@ export function buildLineContent(cm, lineView) {
     builder.addToken = buildToken
     // Optionally wire in some hacks into the token-rendering
     // algorithm, to deal with browser quirks.
-    if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
+    if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line, cm.doc.direction)))
       builder.addToken = buildTokenBadBidi(builder.addToken, order)
     builder.map = []
     let allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line)
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 92da0e809d..1d52078002 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -356,7 +356,7 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig
     if (right) m.left = m.right; else m.right = m.left
     return intoCoordSystem(cm, lineObj, m, context)
   }
-  let order = getOrder(lineObj), ch = pos.ch, sticky = pos.sticky
+  let order = getOrder(lineObj, cm.doc.direction), ch = pos.ch, sticky = pos.sticky
   if (ch >= lineObj.text.length) {
     ch = lineObj.text.length
     sticky = "before"
@@ -442,7 +442,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
   let begin = 0, end = lineObj.text.length
   let preparedMeasure = prepareMeasureForLine(cm, lineObj)
   let pos
-  let order = getOrder(lineObj)
+  let order = getOrder(lineObj, cm.doc.direction)
   if (order) {
     if (cm.options.lineWrapping) {
       ;({begin, end} = wrappedLineExtent(cm, lineObj, preparedMeasure, y))
diff --git a/src/model/Doc.js b/src/model/Doc.js
index 006598f1fe..0ee45247d5 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -12,7 +12,7 @@ import { ensureCursorVisible } from "../display/scrolling"
 import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes"
 import { computeReplacedSel } from "./change_measurement"
 import { BranchChunk, LeafChunk } from "./chunk"
-import { linkedDocs, updateDoc } from "./document_data"
+import { directionChanged, linkedDocs, updateDoc } from "./document_data"
 import { copyHistoryArray, History } from "./history"
 import { addLineWidget } from "./line_widget"
 import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } from "./mark_text"
@@ -20,8 +20,8 @@ import { normalizeSelection, Range, simpleSelection } from "./selection"
 import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates"
 
 let nextDocId = 0
-let Doc = function(text, mode, firstLine, lineSep) {
-  if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep)
+let Doc = function(text, mode, firstLine, lineSep, direction) {
+  if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep, direction)
   if (firstLine == null) firstLine = 0
 
   BranchChunk.call(this, [new LeafChunk([new Line("", null)])])
@@ -36,6 +36,7 @@ let Doc = function(text, mode, firstLine, lineSep) {
   this.id = ++nextDocId
   this.modeOption = mode
   this.lineSep = lineSep
+  this.direction = (direction == "rtl") ? "rtl" : "ltr"
   this.extend = false
 
   if (typeof text == "string") text = this.splitLines(text)
@@ -362,7 +363,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
 
   copy: function(copyHistory) {
     let doc = new Doc(getLines(this, this.first, this.first + this.size),
-                      this.modeOption, this.first, this.lineSep)
+                      this.modeOption, this.first, this.lineSep, this.direction)
     doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft
     doc.sel = this.sel
     doc.extend = false
@@ -378,7 +379,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     let from = this.first, to = this.first + this.size
     if (options.from != null && options.from > from) from = options.from
     if (options.to != null && options.to < to) to = options.to
-    let copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep)
+    let copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep, this.direction)
     if (options.sharedHist) copy.history = this.history
     ;(this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist})
     copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}]
@@ -413,7 +414,15 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     if (this.lineSep) return str.split(this.lineSep)
     return splitLinesAuto(str)
   },
-  lineSeparator: function() { return this.lineSep || "\n" }
+  lineSeparator: function() { return this.lineSep || "\n" },
+
+  setDirection: docMethodOp(function (dir) {
+    if (dir != "rtl") dir = "ltr"
+    if (dir == this.direction) return
+    this.direction = dir
+    this.iter(line => line.order = null)
+    if (this.cm) directionChanged(this.cm)
+  })
 })
 
 // Public alias.
diff --git a/src/model/document_data.js b/src/model/document_data.js
index 6ce2ae58e7..7f6e3367d1 100644
--- a/src/model/document_data.js
+++ b/src/model/document_data.js
@@ -1,9 +1,11 @@
 import { loadMode } from "../display/mode_state"
+import { runInOp } from "../display/operations"
 import { regChange } from "../display/view_tracking"
 import { Line, updateLine } from "../line/line_data"
 import { findMaxLine } from "../line/spans"
 import { getLine } from "../line/utils_line"
 import { estimateLineHeights } from "../measurement/position_measurement"
+import { addClass, rmClass } from "../util/dom"
 import { lst } from "../util/misc"
 import { signalLater } from "../util/operation_group"
 
@@ -91,8 +93,19 @@ export function attachDoc(cm, doc) {
   doc.cm = cm
   estimateLineHeights(cm)
   loadMode(cm)
+  setDirectionClass(cm)
   if (!cm.options.lineWrapping) findMaxLine(cm)
   cm.options.mode = doc.modeOption
   regChange(cm)
 }
 
+function setDirectionClass(cm) {
+  ;(cm.doc.direction == "rtl" ? addClass : rmClass)(cm.display.lineDiv, "CodeMirror-rtl")
+}
+
+export function directionChanged(cm) {
+  runInOp(cm, () => {
+    setDirectionClass(cm)
+    regChange(cm)
+  })
+}
diff --git a/src/util/bidi.js b/src/util/bidi.js
index acc1ef8e63..e7429fce06 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -74,16 +74,16 @@ let bidiOrdering = (function() {
 
   let bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/
   let isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/
-  // Browsers seem to always treat the boundaries of block elements as being L.
-  let outerType = "L"
 
   function BidiSpan(level, from, to) {
     this.level = level
     this.from = from; this.to = to
   }
 
-  return function(str) {
-    if (!bidiRE.test(str)) return false
+  return function(str, direction) {
+    let outerType = direction == "ltr" ? "L" : "R"
+
+    if (str.length == 0 || direction == "ltr" && !bidiRE.test(str)) return false
     let len = str.length, types = []
     for (let i = 0; i < len; ++i)
       types.push(charType(str.charCodeAt(i)))
@@ -157,7 +157,7 @@ let bidiOrdering = (function() {
         for (end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
         let before = (i ? types[i-1] : outerType) == "L"
         let after = (end < len ? types[end] : outerType) == "L"
-        let replace = before || after ? "L" : "R"
+        let replace = before == after ? (before ? "L" : "R") : outerType
         for (let j = i; j < end; ++j) types[j] = replace
         i = end - 1
       }
@@ -198,15 +198,15 @@ let bidiOrdering = (function() {
       order.push(new BidiSpan(0, len - m[0].length, len))
     }
 
-    return order
+    return direction == "rtl" ? order.reverse() : order
   }
 })()
 
 // Get the bidi ordering for the given line (and cache it). Returns
 // false for lines that are fully left-to-right, and an array of
 // BidiSpan objects otherwise.
-export function getOrder(line) {
+export function getOrder(line, direction) {
   let order = line.order
-  if (order == null) order = line.order = bidiOrdering(line.text)
+  if (order == null) order = line.order = bidiOrdering(line.text, direction)
   return order
 }

From 4f08a5c4f459f551d84703b61feaa0f479534d25 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@users.sf.net>
Date: Thu, 11 Dec 2014 15:29:47 +0200
Subject: [PATCH 3197/4742] [bidi demo] Expose global direction and
 rtlMoveVisually

---
 demo/bidi.html | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/demo/bidi.html b/demo/bidi.html
index 1be7db5c36..ceaffd32e6 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -8,8 +8,9 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-    </style>
+  .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+  fieldset {border: none}
+</style>
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
@@ -25,8 +26,8 @@
 
 <article>
 <h2>Bi-directional Text Demo</h2>
-<form><textarea id="code" name="code"><!-- Piece of the CodeMirror manual, 'translated' into Arabic by
-     Google Translate -->
+<form><textarea id="code" name="code"><!-- Piece of the CodeMirror manual, 'translated' into Arabic by Google Translate -->
+<!-- قطعة من دليل CodeMirror، "ترجم" إلى العربية بواسطة جوجل ترجمة -->
 
 <dl>
   <dt id=option_value><code>value (string or Doc)</code></dt>
@@ -53,13 +54,37 @@ <h2>Bi-directional Text Demo</h2>
   سيتم تعيين كل من <code>cm-s-foo</code> و <code>cm-s-bar</code>
   الطبقات إلى المحرر.</dd>
 </dl>
-</textarea></form>
+</textarea>
+  <fieldset>
+    Editor default direction:
+    <input type="radio" id="ltr" name="direction"/><label for="ltr">LTR</label>
+    <input type="radio" id="rtl" name="direction"/><label for="rtl">RTL</label>
+  </fieldset>
+  <fieldset>
+    <input type="checkbox" id="rtlMoveVisually"/><label for="rtlMoveVisually">Use visual order for arrow key movement.</label>
+  </fieldset>
+</form>
 
     <script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   mode: "text/html",
-  lineNumbers: true
+  lineNumbers: true,
+  lineWrapping: true,
+  direction: "rtl"
 });
+
+var dirRadios = {ltr: document.getElementById("ltr"),
+                 rtl: document.getElementById("rtl")};
+dirRadios[editor.getOption("direction")].checked = true;
+dirRadios["rtl"].onchange = dirRadios["ltr"].onchange = function() {
+  editor.setOption("direction", dirRadios["rtl"].checked ? "rtl" : "ltr");
+};
+
+var moveCheckbox = document.getElementById("rtlMoveVisually");
+moveCheckbox.checked = editor.getOption("rtlMoveVisually");
+moveCheckbox.onchange = function() {
+  editor.setOption("rtlMoveVisually", moveCheckbox.checked);
+};
 </script>
 
   <p>Demonstration of bi-directional text support. See

From bfbdd885989a868fae94a35786f5f5ff53961b4a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 Mar 2017 14:31:59 +0100
Subject: [PATCH 3198/4742] [merge addon] Don't try to align lines in deleted
 chunks

Issue #4627
---
 addon/merge/merge.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 35b992ea5d..76460dd864 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -372,14 +372,22 @@
   // lines that need to be aligned with each other.
   function mergeAlignable(result, origAlignable, chunks, setIndex) {
     var rI = 0, origI = 0, chunkI = 0, diff = 0
-    for (;; rI++) {
+    outer: for (;; rI++) {
       var nextR = result[rI], nextO = origAlignable[origI]
       if (!nextR && nextO == null) break
 
       var rLine = nextR ? nextR[0] : 1e9, oLine = nextO == null ? 1e9 : nextO
       while (chunkI < chunks.length) {
         var chunk = chunks[chunkI]
-        if (chunk.editTo > rLine) break
+        if (chunk.origFrom <= oLine && chunk.origTo > oLine) {
+          origI++
+          rI--
+          continue outer;
+        }
+        if (chunk.editTo > rLine) {
+          if (chunk.editFrom <= rLine) continue outer;
+          break
+        }
         diff += (chunk.origTo - chunk.origFrom) - (chunk.editTo - chunk.editFrom)
         chunkI++
       }

From d3e68b6ed4f0dcdee6bbc37d55aa9c8d87b7d6ac Mon Sep 17 00:00:00 2001
From: Ami Fischman <fischman@chromium.org>
Date: Tue, 7 Mar 2017 14:17:26 -0800
Subject: [PATCH 3199/4742] [emacs keymap] Update to match Emacs >= 24.4
 RET/C-j mappings.

Starting with Emacs 24.4 the meanings of Enter and Ctrl+J was swapped, so that
RET does newline-and-indent while C-j is the simple non-electric newline.  This
change makes codemirror4 match Emacs.
---
 keymap/emacs.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 57cf6e8525..2d5fe1b815 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -371,7 +371,9 @@
     "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
     "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
     "Alt-/": "autocomplete",
-    "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
+    "Enter": "newlineAndIndent",
+    "Ctrl-J": repeated(function(cm) { cm.replaceSelection("\n", "end"); }),
+    "Tab": "indentAuto",
 
     "Alt-G G": function(cm) {
       var prefix = getPrefix(cm, true);

From e8f3146784844c41157b9c210b5df82fcda31cc7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Mar 2017 10:15:39 +0100
Subject: [PATCH 3200/4742] [shell mode] Ignore escaped open parens in
 parenthesized content

Closes #4635
---
 mode/shell/shell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 944f64dc52..76c67cd2b7 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -96,7 +96,7 @@ CodeMirror.defineMode('shell', function() {
           state.tokens.unshift(tokenDollar);
           break;
         }
-        if (next === "(" && quote === "(") {
+        if (!escaped && next === "(" && quote === "(") {
           state.tokens.unshift(tokenString(quote, style))
           return tokenize(stream, state)
         }

From 64cffa1f844f8d2a1a42e9185359cc414fa25045 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Mar 2017 12:23:20 +0100
Subject: [PATCH 3201/4742] Make sure line backgrounds aren't treated as
 content in contentEditable mode

Issue #4194
Closes #4500
---
 src/display/update_line.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/display/update_line.js b/src/display/update_line.js
index 007eba7ffe..e9a4ae7e66 100644
--- a/src/display/update_line.js
+++ b/src/display/update_line.js
@@ -96,6 +96,7 @@ function updateLineGutter(cm, lineView, lineN, dims) {
     let wrap = ensureLineWrapped(lineView)
     lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
                                     `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px; width: ${dims.gutterTotalWidth}px`)
+    cm.display.input.setUneditable(gutterWrap)
     wrap.insertBefore(lineView.gutterBackground, lineView.text)
   }
   let markers = lineView.line.gutterMarkers

From f4913408198cdfd21d537121500de9beeac06180 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Mar 2017 12:27:08 +0100
Subject: [PATCH 3202/4742] Fix copy-paste mistake in previous patch

Issue #4194
Issue #4500
---
 src/display/update_line.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/update_line.js b/src/display/update_line.js
index e9a4ae7e66..28a0edb5d4 100644
--- a/src/display/update_line.js
+++ b/src/display/update_line.js
@@ -96,7 +96,7 @@ function updateLineGutter(cm, lineView, lineN, dims) {
     let wrap = ensureLineWrapped(lineView)
     lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
                                     `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px; width: ${dims.gutterTotalWidth}px`)
-    cm.display.input.setUneditable(gutterWrap)
+    cm.display.input.setUneditable(lineView.gutterBackground)
     wrap.insertBefore(lineView.gutterBackground, lineView.text)
   }
   let markers = lineView.line.gutterMarkers

From bad02ce6ea740b8415955ab21301dd5a4af5260f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Mar 2017 12:29:04 +0100
Subject: [PATCH 3203/4742] Make sure whole-line background is also uneditable

Issue #4194
Issue #4500
---
 src/display/update_line.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/display/update_line.js b/src/display/update_line.js
index 28a0edb5d4..15a2394257 100644
--- a/src/display/update_line.js
+++ b/src/display/update_line.js
@@ -12,7 +12,7 @@ export function updateLineForChanges(cm, lineView, lineN, dims) {
     let type = lineView.changes[j]
     if (type == "text") updateLineText(cm, lineView)
     else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims)
-    else if (type == "class") updateLineClasses(lineView)
+    else if (type == "class") updateLineClasses(cm, lineView)
     else if (type == "widget") updateLineWidgets(cm, lineView, dims)
   }
   lineView.changes = null
@@ -31,7 +31,7 @@ function ensureLineWrapped(lineView) {
   return lineView.node
 }
 
-function updateLineBackground(lineView) {
+function updateLineBackground(cm, lineView) {
   let cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass
   if (cls) cls += " CodeMirror-linebackground"
   if (lineView.background) {
@@ -40,6 +40,7 @@ function updateLineBackground(lineView) {
   } else if (cls) {
     let wrap = ensureLineWrapped(lineView)
     lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild)
+    cm.display.input.setUneditable(lineView.background)
   }
 }
 
@@ -67,14 +68,14 @@ function updateLineText(cm, lineView) {
   if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
     lineView.bgClass = built.bgClass
     lineView.textClass = built.textClass
-    updateLineClasses(lineView)
+    updateLineClasses(cm, lineView)
   } else if (cls) {
     lineView.text.className = cls
   }
 }
 
-function updateLineClasses(lineView) {
-  updateLineBackground(lineView)
+function updateLineClasses(cm, lineView) {
+  updateLineBackground(cm, lineView)
   if (lineView.line.wrapClass)
     ensureLineWrapped(lineView).className = lineView.line.wrapClass
   else if (lineView.node != lineView.text)
@@ -138,7 +139,7 @@ export function buildLineElement(cm, lineView, lineN, dims) {
   if (built.bgClass) lineView.bgClass = built.bgClass
   if (built.textClass) lineView.textClass = built.textClass
 
-  updateLineClasses(lineView)
+  updateLineClasses(cm, lineView)
   updateLineGutter(cm, lineView, lineN, dims)
   insertLineWidgets(cm, lineView, dims)
   return lineView.node

From 3842167fbb9a30a1dcc17e319e340a5dbd4c248e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Mar 2017 16:25:27 +0100
Subject: [PATCH 3204/4742] Add first contenteditable tests

---
 src/input/ContentEditableInput.js | 14 ++++---
 test/contenteditable_test.js      | 68 +++++++++++++++++++++++++++++++
 test/index.html                   |  1 +
 3 files changed, 77 insertions(+), 6 deletions(-)
 create mode 100644 test/contenteditable_test.js

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 08debaa22a..252d6a871b 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -34,9 +34,7 @@ export default class ContentEditableInput {
     on(div, "paste", e => {
       if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
       // IE doesn't fire input events, so we schedule a read for the pasted content in this way
-      if (ie_version <= 11) setTimeout(operation(cm, () => {
-        if (!input.pollContent()) regChange(cm)
-      }), 20)
+      if (ie_version <= 11) setTimeout(operation(cm, () => this.updateFromDOM()), 20)
     })
 
     on(div, "compositionstart", e => {
@@ -303,7 +301,7 @@ export default class ContentEditableInput {
     if (!this.composing) return
     clearTimeout(this.readDOMTimeout)
     this.composing = null
-    if (!this.pollContent()) regChange(this.cm)
+    this.updateFromDOM()
     this.div.blur()
     this.div.focus()
   }
@@ -315,11 +313,15 @@ export default class ContentEditableInput {
         if (this.composing.done) this.composing = null
         else return
       }
-      if (this.cm.isReadOnly() || !this.pollContent())
-        runInOp(this.cm, () => regChange(this.cm))
+      this.updateFromDOM()
     }, 80)
   }
 
+  updateFromDOM() {
+    if (this.cm.isReadOnly() || !this.pollContent())
+      runInOp(this.cm, () => regChange(this.cm))
+  }
+
   setUneditable(node) {
     node.contentEditable = "false"
   }
diff --git a/test/contenteditable_test.js b/test/contenteditable_test.js
new file mode 100644
index 0000000000..e9c2e09880
--- /dev/null
+++ b/test/contenteditable_test.js
@@ -0,0 +1,68 @@
+(function() {
+  "use strict";
+
+  namespace = "contenteditable_";
+  var Pos = CodeMirror.Pos
+
+  function findTextNode(dom, text) {
+    if (dom instanceof CodeMirror) dom = dom.getInputField()
+    if (dom.nodeType == 1) {
+      for (var ch = dom.firstChild; ch; ch = ch.nextSibling) {
+        var found = findTextNode(ch, text)
+        if (found) return found
+      }
+    } else if (dom.nodeType == 3 && dom.nodeValue == text) {
+      return dom
+    }
+  }
+
+  function lineElt(node) {
+    for (;;) {
+      var parent = node.parentNode
+      if (/CodeMirror-code/.test(parent.className)) return node
+      node = parent
+    }
+  }
+
+  testCM("insert_text", function(cm) {
+    findTextNode(cm, "foobar").nodeValue = "foo bar"
+    cm.display.input.updateFromDOM()
+    eq(cm.getValue(), "foo bar")
+  }, {inputStyle: "contenteditable", value: "foobar"})
+
+  testCM("split_line", function(cm) {
+    cm.setSelection(Pos(2, 3))
+    var node = findTextNode(cm, "foobar")
+    node.nodeValue = "foo"
+    var lineNode = lineElt(node)
+    lineNode.parentNode.insertBefore(document.createElement("pre"), lineNode.nextSibling).textContent = "bar"
+    cm.display.input.updateFromDOM()
+    eq(cm.getValue(), "one\ntwo\nfoo\nbar\nthree\nfour\n")
+  }, {inputStyle: "contenteditable", value: "one\ntwo\nfoobar\nthree\nfour\n"})
+
+  testCM("join_line", function(cm) {
+    cm.setSelection(Pos(2, 3))
+    var node = findTextNode(cm, "foo")
+    node.nodeValue = "foobar"
+    var lineNode = lineElt(node)
+    lineNode.parentNode.removeChild(lineNode.nextSibling)
+    cm.display.input.updateFromDOM()
+    eq(cm.getValue(), "one\ntwo\nfoobar\nthree\nfour\n")
+  }, {inputStyle: "contenteditable", value: "one\ntwo\nfoo\nbar\nthree\nfour\n"})
+
+  testCM("delete_multiple", function(cm) {
+    cm.setSelection(Pos(1, 3), Pos(4, 0))
+    var text = findTextNode(cm, "two"), startLine = lineElt(text)
+    for (var i = 0; i < 3; i++)
+      startLine.parentNode.removeChild(startLine.nextSibling)
+    text.nodeValue = "twothree"
+    cm.display.input.updateFromDOM()
+    eq(cm.getValue(), "one\ntwothree\nfour\n")
+  }, {inputStyle: "contenteditable", value: "one\ntwo\nfoo\nbar\nthree\nfour\n"})
+
+  testCM("force_redraw", function(cm) {
+    findTextNode(cm, "foo").parentNode.appendChild(document.createElement("hr")).className = "inserted"
+    cm.display.input.updateFromDOM()
+    eq(byClassName(cm.getInputField(), "inserted").length, 0)
+  }, {inputStyle: "contenteditable", value: "foo"})
+})();
diff --git a/test/index.html b/test/index.html
index 5a0b3d68bf..4146a4d45d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -103,6 +103,7 @@ <h2>Test Suite</h2>
     <script src="test.js"></script>
     <script src="doc_test.js"></script>
     <script src="multi_test.js"></script>
+    <script src="contenteditable_test.js"></script>
     <script src="scroll_test.js"></script>
     <script src="comment_test.js"></script>
     <script src="search_test.js"></script>

From c15090d1d47a7d15c67d9ddade9356fbcbbb2bec Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Mar 2017 16:41:19 +0100
Subject: [PATCH 3205/4742] Improve handling of ambiguous diffs in
 contenteditable input mode

---
 src/input/ContentEditableInput.js |  8 ++++++++
 test/contenteditable_test.js      | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 252d6a871b..34e5226821 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -279,6 +279,14 @@ export default class ContentEditableInput {
     while (cutEnd < maxCutEnd &&
            newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
       ++cutEnd
+    // Try to move start of change to start of selection if ambiguous
+    if (newText.length == 1 && oldText.length == 1 && fromLine == from.line) {
+      while (cutFront && cutFront > from.ch &&
+             newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1)) {
+        cutFront--
+        cutEnd++
+      }
+    }
 
     newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd).replace(/^\u200b+/, "")
     newText[0] = newText[0].slice(cutFront).replace(/\u200b+$/, "")
diff --git a/test/contenteditable_test.js b/test/contenteditable_test.js
index e9c2e09880..bc41c5a065 100644
--- a/test/contenteditable_test.js
+++ b/test/contenteditable_test.js
@@ -60,6 +60,27 @@
     eq(cm.getValue(), "one\ntwothree\nfour\n")
   }, {inputStyle: "contenteditable", value: "one\ntwo\nfoo\nbar\nthree\nfour\n"})
 
+  testCM("ambiguous_diff_middle", function(cm) {
+    cm.setSelection(Pos(0, 2))
+    findTextNode(cm, "baah").nodeValue = "baaah"
+    cm.display.input.updateFromDOM()
+    eqCharPos(cm.getCursor(), Pos(0, 3))
+  }, {inputStyle: "contenteditable", value: "baah"})
+
+  testCM("ambiguous_diff_start", function(cm) {
+    cm.setSelection(Pos(0, 1))
+    findTextNode(cm, "baah").nodeValue = "baaah"
+    cm.display.input.updateFromDOM()
+    eqCharPos(cm.getCursor(), Pos(0, 2))
+  }, {inputStyle: "contenteditable", value: "baah"})
+
+  testCM("ambiguous_diff_end", function(cm) {
+    cm.setSelection(Pos(0, 3))
+    findTextNode(cm, "baah").nodeValue = "baaah"
+    cm.display.input.updateFromDOM()
+    eqCharPos(cm.getCursor(), Pos(0, 4))
+  }, {inputStyle: "contenteditable", value: "baah"})
+
   testCM("force_redraw", function(cm) {
     findTextNode(cm, "foo").parentNode.appendChild(document.createElement("hr")).className = "inserted"
     cm.display.input.updateFromDOM()

From 438079cb951de946266be37af4487a8cd8719fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Vr=C3=A1na?= <jakub@vrana.cz>
Date: Wed, 8 Mar 2017 18:18:20 +0100
Subject: [PATCH 3206/4742] [soy mode] Treat {@inject} same as {@param}

`{@inject}` is used for injected parameters instead of normal
parameters. It behaves the same as `{@param}`.
---
 mode/soy/soy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 1c1f74d1dc..21f9f28303 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -256,7 +256,7 @@
             state.scopes = prepend(state.scopes, state.variables);
             state.soyState.push("var-def");
           }
-          if (state.tag.match(/^@param\??/)) {
+          if (state.tag.match(/^@(?:param\??|inject)/)) {
             state.soyState.push("param-def");
           }
           return "keyword";

From 168d2286d15419031be1cdba14d8b53facefe8e5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Mar 2017 14:56:50 +0100
Subject: [PATCH 3207/4742] Upgrade build tools

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e4d3adc15a..b08d4c9950 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
     "blint": "^0.5.1",
     "node-static": "0.6.0",
     "phantomjs-prebuilt": "^2.1.12",
-    "rollup": "^0.34.10",
+    "rollup": "^0.41.0",
     "rollup-plugin-buble": "^0.15.0",
-    "rollup-watch": "^2.5.0"
+    "rollup-watch": "^3.2.0"
   },
   "bugs": "http://github.com/codemirror/CodeMirror/issues",
   "keywords": [

From b470f2452d0fb514ed2101f9f86f4657669ad07c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Mar 2017 14:58:11 +0100
Subject: [PATCH 3208/4742] Clear contentEditable selection when it can't be
 drawn

So that we don't leave a stray selection that'll be reset
to some nonsense position by the DOM changes.

Closes #4625
---
 src/input/ContentEditableInput.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 34e5226821..7d73602a97 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -122,7 +122,10 @@ export default class ContentEditableInput {
 
     let start = posToDOM(this.cm, prim.from())
     let end = posToDOM(this.cm, prim.to())
-    if (!start && !end) return
+    if (!start && !end) {
+      sel.removeAllRanges()
+      return
+    }
 
     let view = this.cm.display.view
     let old = sel.rangeCount && sel.getRangeAt(0)

From facc9c869f1799d8c25ec0fd76995c5ed8f9d675 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Mar 2017 15:01:38 +0100
Subject: [PATCH 3209/4742] [linter] Allow tabs in lib/codemirror.css

Since rollup is now adding those
---
 test/lint.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lint.js b/test/lint.js
index 502706de8e..e7c114cd91 100644
--- a/test/lint.js
+++ b/test/lint.js
@@ -4,7 +4,8 @@ var blint = require("blint");
   blint.checkDir(dir, {
     browser: true,
     allowedGlobals: ["CodeMirror", "define", "test", "requirejs"],
-    ecmaVersion: 5
+    ecmaVersion: 5,
+    tabs: dir == "lib"
   });
 });
 

From c88b02c5badc415abb25ef83ed28e22a8f94f940 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Mar 2017 15:29:16 +0100
Subject: [PATCH 3210/4742] Always check whether to scroll window on
 .scrollIntoView

Issue #4491
---
 src/display/operations.js |  6 ++--
 src/display/scrolling.js  | 73 ++++++++++++++++++++-------------------
 src/edit/methods.js       | 12 ++++---
 3 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 30a63a613a..6c4a0e1392 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -155,9 +155,9 @@ function endOperation_finish(op) {
   }
   // If we need to scroll a specific position into view, do so.
   if (op.scrollToPos) {
-    let coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
-                                   clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin)
-    if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords)
+    let rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+                                 clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin)
+    maybeScrollWindow(cm, rect)
   }
 
   // Fire events for markers that are hidden/unidden by editing or
diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index db9463cd04..b2deb2ed64 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -10,17 +10,17 @@ import { setScrollLeft, setScrollTop } from "./scroll_events"
 
 // If an editor sits on the top or bottom of the window, partially
 // scrolled out of view, this ensures that the cursor is visible.
-export function maybeScrollWindow(cm, coords) {
+export function maybeScrollWindow(cm, rect) {
   if (signalDOMEvent(cm, "scrollCursorIntoView")) return
 
   let display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null
-  if (coords.top + box.top < 0) doScroll = true
-  else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false
+  if (rect.top + box.top < 0) doScroll = true
+  else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false
   if (doScroll != null && !phantom) {
     let scrollNode = elt("div", "\u200b", null, `position: absolute;
-                         top: ${coords.top - display.viewOffset - paddingTop(cm.display)}px;
-                         height: ${coords.bottom - coords.top + scrollGap(cm) + display.barHeight}px;
-                         left: ${coords.left}px; width: 2px;`)
+                         top: ${rect.top - display.viewOffset - paddingTop(cm.display)}px;
+                         height: ${rect.bottom - rect.top + scrollGap(cm) + display.barHeight}px;
+                         left: ${rect.left}px; width: ${Math.max(2, rect.right - rect.left)}px;`)
     cm.display.lineSpace.appendChild(scrollNode)
     scrollNode.scrollIntoView(doScroll)
     cm.display.lineSpace.removeChild(scrollNode)
@@ -32,15 +32,16 @@ export function maybeScrollWindow(cm, coords) {
 // measured, the position of something may 'drift' during drawing).
 export function scrollPosIntoView(cm, pos, end, margin) {
   if (margin == null) margin = 0
-  let coords
+  let rect
   for (let limit = 0; limit < 5; limit++) {
     let changed = false
-    coords = cursorCoords(cm, pos)
+    let coords = cursorCoords(cm, pos)
     let endCoords = !end || end == pos ? coords : cursorCoords(cm, end)
-    let scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
-                                       Math.min(coords.top, endCoords.top) - margin,
-                                       Math.max(coords.left, endCoords.left),
-                                       Math.max(coords.bottom, endCoords.bottom) + margin)
+    rect = {left: Math.min(coords.left, endCoords.left),
+            top: Math.min(coords.top, endCoords.top) - margin,
+            right: Math.max(coords.left, endCoords.left),
+            bottom: Math.max(coords.bottom, endCoords.bottom) + margin}
+    let scrollPos = calculateScrollPos(cm, rect)
     let startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft
     if (scrollPos.scrollTop != null) {
       setScrollTop(cm, scrollPos.scrollTop)
@@ -52,12 +53,12 @@ export function scrollPosIntoView(cm, pos, end, margin) {
     }
     if (!changed) break
   }
-  return coords
+  return rect
 }
 
 // Scroll a given set of coordinates into view (immediately).
-export function scrollIntoView(cm, x1, y1, x2, y2) {
-  let scrollPos = calculateScrollPos(cm, x1, y1, x2, y2)
+export function scrollIntoView(cm, rect) {
+  let scrollPos = calculateScrollPos(cm, rect)
   if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop)
   if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft)
 }
@@ -66,31 +67,31 @@ export function scrollIntoView(cm, x1, y1, x2, y2) {
 // rectangle into view. Returns an object with scrollTop and
 // scrollLeft properties. When these are undefined, the
 // vertical/horizontal position does not need to be adjusted.
-export function calculateScrollPos(cm, x1, y1, x2, y2) {
+export function calculateScrollPos(cm, rect) {
   let display = cm.display, snapMargin = textHeight(cm.display)
-  if (y1 < 0) y1 = 0
+  if (rect.top < 0) rect.top = 0
   let screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop
   let screen = displayHeight(cm), result = {}
-  if (y2 - y1 > screen) y2 = y1 + screen
+  if (rect.bottom - rect.top > screen) rect.bottom = rect.top + screen
   let docBottom = cm.doc.height + paddingVert(display)
-  let atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin
-  if (y1 < screentop) {
-    result.scrollTop = atTop ? 0 : y1
-  } else if (y2 > screentop + screen) {
-    let newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen)
+  let atTop = rect.top < snapMargin, atBottom = rect.bottom > docBottom - snapMargin
+  if (rect.top < screentop) {
+    result.scrollTop = atTop ? 0 : rect.top
+  } else if (rect.bottom > screentop + screen) {
+    let newTop = Math.min(rect.top, (atBottom ? docBottom : rect.bottom) - screen)
     if (newTop != screentop) result.scrollTop = newTop
   }
 
   let screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft
   let screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0)
-  let tooWide = x2 - x1 > screenw
-  if (tooWide) x2 = x1 + screenw
-  if (x1 < 10)
+  let tooWide = rect.right - rect.left > screenw
+  if (tooWide) rect.right = rect.left + screenw
+  if (rect.left < 10)
     result.scrollLeft = 0
-  else if (x1 < screenleft)
-    result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10))
-  else if (x2 > screenw + screenleft - 3)
-    result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw
+  else if (rect.left < screenleft)
+    result.scrollLeft = Math.max(0, rect.left - (tooWide ? 0 : 10))
+  else if (rect.right > screenw + screenleft - 3)
+    result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw
   return result
 }
 
@@ -113,7 +114,7 @@ export function ensureCursorVisible(cm) {
     from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur
     to = Pos(cur.line, cur.ch + 1)
   }
-  cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true}
+  cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin}
 }
 
 // When an operation has its scrollToPos property set, and another
@@ -125,10 +126,12 @@ export function resolveScrollToPos(cm) {
   if (range) {
     cm.curOp.scrollToPos = null
     let from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to)
-    let sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
-                                  Math.min(from.top, to.top) - range.margin,
-                                  Math.max(from.right, to.right),
-                                  Math.max(from.bottom, to.bottom) + range.margin)
+    let sPos = calculateScrollPos(cm, {
+      left: Math.min(from.left, to.left),
+      top: Math.min(from.top, to.top) - range.margin,
+      right: Math.max(from.right, to.right),
+      bottom: Math.max(from.bottom, to.bottom) + range.margin
+    })
     cm.scrollTo(sPos.scrollLeft, sPos.scrollTop)
   }
 }
diff --git a/src/edit/methods.js b/src/edit/methods.js
index d4efa31559..b8dd343d09 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -252,7 +252,7 @@ export default function(CodeMirror) {
         node.style.left = left + "px"
       }
       if (scroll)
-        scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight)
+        scrollIntoView(this, {left, top, right: left + node.offsetWidth, bottom: top + node.offsetHeight})
     },
 
     triggerOnKeyDown: methodOp(onKeyDown),
@@ -388,10 +388,12 @@ export default function(CodeMirror) {
         resolveScrollToPos(this)
         this.curOp.scrollToPos = range
       } else {
-        let sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
-                                      Math.min(range.from.top, range.to.top) - range.margin,
-                                      Math.max(range.from.right, range.to.right),
-                                      Math.max(range.from.bottom, range.to.bottom) + range.margin)
+        let sPos = calculateScrollPos(this, {
+          left: Math.min(range.from.left, range.to.left),
+          top: Math.min(range.from.top, range.to.top) - range.margin,
+          right: Math.max(range.from.right, range.to.right),
+          bottom: Math.max(range.from.bottom, range.to.bottom) + range.margin
+        })
         this.scrollTo(sPos.scrollLeft, sPos.scrollTop)
       }
     }),

From 7580a1dc1d7ce1ab929a0be7cd3875d976fcf056 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Mar 2017 15:46:32 +0100
Subject: [PATCH 3211/4742] [markdown mode] Simplify leaving fenced block

Closes #4628
---
 mode/markdown/markdown.js | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 21120ab482..e649b09179 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -241,9 +241,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   function local(stream, state) {
     if (state.fencedChars && stream.match(state.fencedChars)) {
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
+      var returnType = getType(state)
       state.localMode = state.localState = null;
-      state.f = state.block = leavingLocal;
-      return getType(state)
+      state.block = blockNormal;
+      state.f = inlineNormal;
+      state.fencedChars = null;
+      state.code = 0
+      return returnType;
     } else if (state.fencedChars && stream.skipTo(state.fencedChars)) {
       return "comment"
     } else if (state.localMode) {
@@ -254,18 +258,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
   }
 
-  function leavingLocal(stream, state) {
-    stream.match(state.fencedChars);
-    state.block = blockNormal;
-    state.f = inlineNormal;
-    state.fencedChars = null;
-    if (modeCfg.highlightFormatting) state.formatting = "code-block";
-    state.code = 1
-    var returnType = getType(state);
-    state.code = 0
-    return returnType;
-  }
-
   // Inline
   function getType(state) {
     var styles = [];

From aab23579713141613399605e3bb6a4a25a1c13dd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Mar 2017 15:51:38 +0100
Subject: [PATCH 3212/4742] [css mode] Add system-ui as value keyword

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 23d0b4db0c..02cc93d9cf 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -667,7 +667,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
     "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
     "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
-    "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
+    "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",
     "table-footer-group", "table-header-group", "table-row", "table-row-group",
     "tamil",

From cfcad600a6b2713347c64d2f434a6e78ffeb4e8f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Mar 2017 16:47:52 +0100
Subject: [PATCH 3213/4742] Fix bug in reading contenteditable text from DOM

Which often caused strangeness around empty lines

Issue #4307
---
 src/input/ContentEditableInput.js | 30 ++++++++++++++++++------------
 test/contenteditable_test.js      | 21 +++++++++++++++++++++
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 7d73602a97..a0452d4646 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -375,34 +375,40 @@ function badPos(pos, bad) { if (bad) pos.bad = true; return pos }
 function domTextBetween(cm, from, to, fromLine, toLine) {
   let text = "", closing = false, lineSep = cm.doc.lineSeparator()
   function recognizeMarker(id) { return marker => marker.id == id }
+  function close() {
+    if (closing) {
+      text += lineSep
+      closing = false
+    }
+  }
+  function addText(str) {
+    if (str) {
+      close()
+      text += str
+    }
+  }
   function walk(node) {
     if (node.nodeType == 1) {
       let cmText = node.getAttribute("cm-text")
       if (cmText != null) {
-        if (cmText == "") text += node.textContent.replace(/\u200b/g, "")
-        else text += cmText
+        addText(cmText || node.textContent.replace(/\u200b/g, ""))
         return
       }
       let markerID = node.getAttribute("cm-marker"), range
       if (markerID) {
         let found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID))
         if (found.length && (range = found[0].find()))
-          text += getBetween(cm.doc, range.from, range.to).join(lineSep)
+          addText(getBetween(cm.doc, range.from, range.to).join(lineSep))
         return
       }
       if (node.getAttribute("contenteditable") == "false") return
+      let isBlock = /^(pre|div|p)$/i.test(node.nodeName)
+      if (isBlock) close()
       for (let i = 0; i < node.childNodes.length; i++)
         walk(node.childNodes[i])
-      if (/^(pre|div|p)$/i.test(node.nodeName))
-        closing = true
+      if (isBlock) closing = true
     } else if (node.nodeType == 3) {
-      let val = node.nodeValue
-      if (!val) return
-      if (closing) {
-        text += lineSep
-        closing = false
-      }
-      text += val
+      addText(node.nodeValue)
     }
   }
   for (;;) {
diff --git a/test/contenteditable_test.js b/test/contenteditable_test.js
index bc41c5a065..9130fa4965 100644
--- a/test/contenteditable_test.js
+++ b/test/contenteditable_test.js
@@ -86,4 +86,25 @@
     cm.display.input.updateFromDOM()
     eq(byClassName(cm.getInputField(), "inserted").length, 0)
   }, {inputStyle: "contenteditable", value: "foo"})
+
+  testCM("type_on_empty_line", function(cm) {
+    cm.setSelection(Pos(1, 0))
+    findTextNode(cm, "\u200b").nodeValue += "hello"
+    cm.display.input.updateFromDOM()
+    eq(cm.getValue(), "foo\nhello\nbar")
+  }, {inputStyle: "contenteditable", value: "foo\n\nbar"})
+
+  testCM("type_after_empty_line", function(cm) {
+    cm.setSelection(Pos(2, 0))
+    findTextNode(cm, "bar").nodeValue = "hellobar"
+    cm.display.input.updateFromDOM()
+    eq(cm.getValue(), "foo\n\nhellobar")
+  }, {inputStyle: "contenteditable", value: "foo\n\nbar"})
+
+  testCM("type_before_empty_line", function(cm) {
+    cm.setSelection(Pos(0, 3))
+    findTextNode(cm, "foo").nodeValue = "foohello"
+    cm.display.input.updateFromDOM()
+    eq(cm.getValue(), "foohello\n\nbar")
+  }, {inputStyle: "contenteditable", value: "foo\n\nbar"})
 })();

From 1d00df9e9e6ced8516a3400e3f4bdb8147ab514d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 10 Mar 2017 13:40:29 +0100
Subject: [PATCH 3214/4742] Make backspace across lines work in Chrome Android

(when there is a gutter)

Issue #4637
---
 lib/codemirror.css                |  6 +----
 src/input/ContentEditableInput.js | 37 +++++++++++++++++++++++--------
 src/util/browser.js               |  3 ++-
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 75cc4c42f1..62b907dfa0 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -223,11 +223,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   cursor: default;
   z-index: 4;
 }
-.CodeMirror-gutter-wrapper {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-}
+.CodeMirror-gutter-wrapper ::selection { background-color: transparent }
 
 .CodeMirror-lines {
   cursor: text;
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index a0452d4646..7e7fca9a8b 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -13,6 +13,7 @@ import { gecko, ie_version } from "../util/browser"
 import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom"
 import { on, signalDOMEvent } from "../util/event"
 import { Delayed, lst, sel_dontScroll } from "../util/misc"
+import { chrome, android } from "../util/browser"
 
 // CONTENTEDITABLE INPUT STYLE
 
@@ -219,16 +220,28 @@ export default class ContentEditableInput {
   }
 
   pollSelection() {
-    if (!this.composing && this.readDOMTimeout == null && !this.gracePeriod && this.selectionChanged()) {
-      let sel = window.getSelection(), cm = this.cm
-      this.rememberSelection()
-      let anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
-      let head = domToPos(cm, sel.focusNode, sel.focusOffset)
-      if (anchor && head) runInOp(cm, () => {
-        setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll)
-        if (anchor.bad || head.bad) cm.curOp.selectionChanged = true
-      })
+    if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) return
+    let sel = window.getSelection(), cm = this.cm
+    // On Android Chrome (version 56, at least), backspacing into an
+    // uneditable block element will put the cursor in that element,
+    // and then, because it's not editable, hide the virtual keyboard.
+    // Because Android doesn't allow us to actually detect backspace
+    // presses in a sane way, this code checks for when that happens
+    // and simulates a backspace press in this case.
+    if (android && chrome && this.cm.options.gutters.length && isInGutter(sel.anchorNode)) {
+      this.cm.triggerOnKeyDown({type: "keydown", keyCode: 8, preventDefault: Math.abs})
+      this.blur()
+      this.focus()
+      return
     }
+    if (this.composing) return
+    this.rememberSelection()
+    let anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
+    let head = domToPos(cm, sel.focusNode, sel.focusOffset)
+    if (anchor && head) runInOp(cm, () => {
+      setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll)
+      if (anchor.bad || head.bad) cm.curOp.selectionChanged = true
+    })
   }
 
   pollContent() {
@@ -370,6 +383,12 @@ function posToDOM(cm, pos) {
   return result
 }
 
+function isInGutter(node) {
+  for (let scan = node; scan; scan = scan.parentNode)
+    if (/CodeMirror-gutter-wrapper/.test(scan.className)) return true
+  return false
+}
+
 function badPos(pos, bad) { if (bad) pos.bad = true; return pos }
 
 function domTextBetween(cm, from, to, fromLine, toLine) {
diff --git a/src/util/browser.js b/src/util/browser.js
index 3891d13e9c..9fc4602c68 100644
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -18,8 +18,9 @@ export let mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
 export let phantom = /PhantomJS/.test(userAgent)
 
 export let ios = !edge && /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
+export let android = /Android/.test(userAgent)
 // This is woefully incomplete. Suggestions for alternative methods welcome.
-export let mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
+export let mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)
 export let mac = ios || /Mac/.test(platform)
 export let chromeOS = /\bCrOS\b/.test(userAgent)
 export let windows = /win/i.test(platform)

From 27bfabac6e7f39088092b9ce9a692bdb382d3b1b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 10 Mar 2017 13:41:04 +0100
Subject: [PATCH 3215/4742] Also hide selection in gutter on Firefox

---
 lib/codemirror.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 62b907dfa0..b962b38374 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -224,6 +224,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   z-index: 4;
 }
 .CodeMirror-gutter-wrapper ::selection { background-color: transparent }
+.CodeMirror-gutter-wrapper ::-moz-selection { background-color: transparent }
 
 .CodeMirror-lines {
   cursor: text;

From 66c68db0c4fcbc6bb6ce735c2def8f03c3f43478 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 15 Mar 2017 10:39:11 +0100
Subject: [PATCH 3216/4742] [comment addon] When uncommenting a block comment,
 make sure its a single one

Closes #4641
---
 addon/comment/comment.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 1c9878716f..568e639dcd 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -46,7 +46,7 @@
 
   // Rough heuristic to try and detect lines that are part of multi-line string
   function probablyInsideString(cm, pos, line) {
-    return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"`]/.test(line)
+    return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"\`]/.test(line)
   }
 
   function getMode(cm, pos) {
@@ -176,9 +176,11 @@
       endLine = self.getLine(--end);
       close = endLine.indexOf(endString);
     }
+    var insideStart = Pos(start, open + 1), insideEnd = Pos(end, close + 1)
     if (close == -1 ||
-        !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
-        !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
+        !/comment/.test(self.getTokenTypeAt(insideStart)) ||
+        !/comment/.test(self.getTokenTypeAt(insideEnd)) ||
+        self.getRange(insideStart, insideEnd, "\n").indexOf(endString) > -1)
       return false;
 
     // Avoid killing block comments completely outside the selection.

From 2f43bccc955c06016aca79e7523a3f84e8f5d9f8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 15 Mar 2017 20:36:44 +0100
Subject: [PATCH 3217/4742] [javascript mode] Recognize TypeScript class fields
 without type

Closes #4643
---
 mode/javascript/javascript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 316fe4a27a..3f614cc2c5 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -662,6 +662,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function classfield(type, value) {
     if (value == "?") return cont(classfield)
     if (type == ":") return cont(typeexpr, maybeAssign)
+    if (value == "=") return cont(expressionNoComma)
     return pass(functiondef)
   }
   function afterExport(type, value) {

From c96aae3d946b3f8f78167e3ec8f22976f426a9ce Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <lewenhaupt@lewenhaupt-macbookpro.roam.corp.google.com>
Date: Sat, 25 Feb 2017 12:13:34 +0100
Subject: [PATCH 3218/4742] [soy mode] Fix indentation and restore previous
 local states

---
 mode/soy/soy.js  | 47 ++++++++++++++++++++++++++++++++++-------------
 mode/soy/test.js | 12 ++++++++++++
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 21f9f28303..cff7719b87 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -31,6 +31,12 @@
     }
 
     function tokenUntil(stream, state, untilRegExp) {
+      if (stream.sol()) {
+        for (var indent = 0; indent < state.indent; indent++) {
+          if (!stream.eat(/\s/)) break;
+        }
+        if (indent) return null;
+      }
       var oldString = stream.string;
       var match = untilRegExp.exec(oldString.substr(stream.pos));
       if (match) {
@@ -39,7 +45,8 @@
         stream.string = oldString.substr(0, stream.pos + match.index);
       }
       var result = stream.hideFirstChars(state.indent, function() {
-        return state.localMode.token(stream, state.localState);
+        var localState = last(state.localStates);
+        return localState.mode.token(stream, localState.state);
       });
       stream.string = oldString;
       return result;
@@ -83,8 +90,10 @@
           variables: null,
           scopes: null,
           indent: 0,
-          localMode: modes.html,
-          localState: CodeMirror.startState(modes.html)
+          localStates: [{
+            mode: modes.html,
+            state: CodeMirror.startState(modes.html)
+          }]
         };
       },
 
@@ -98,8 +107,12 @@
           variables: state.variables,
           scopes: state.scopes,
           indent: state.indent, // Indentation of the following line.
-          localMode: state.localMode,
-          localState: CodeMirror.copyState(state.localMode, state.localState)
+          localStates: state.localStates.map(function(localState) {
+            return {
+              mode: localState.mode,
+              state: CodeMirror.copyState(localState.mode, localState.state)
+            };
+          })
         };
       },
 
@@ -187,8 +200,13 @@
                 var kind = match[1];
                 state.kind.push(kind);
                 state.kindTag.push(state.tag);
-                state.localMode = modes[kind] || modes.html;
-                state.localState = CodeMirror.startState(state.localMode);
+                var mode = modes[kind] || modes.html;
+                var localState = last(state.localStates);
+                state.indent += localState.mode.indent(localState.state, "");
+                state.localStates.push({
+                  mode: mode,
+                  state: CodeMirror.startState(mode)
+                });
               }
               return "attribute";
             } else if (stream.match(/^"/)) {
@@ -233,14 +251,15 @@
           return "keyword";
         } else if (match = stream.match(/^\{([\/@\\]?[\w?]*)/)) {
           if (match[1] != "/switch")
-            state.indent += (/^(\/|(else|elseif|ifempty|case|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
+            state.indent += (/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
           state.tag = match[1];
           if (state.tag == "/" + last(state.kindTag)) {
             // We found the tag that opened the current kind="".
             state.kind.pop();
             state.kindTag.pop();
-            state.localMode = modes[last(state.kind)] || modes.html;
-            state.localState = CodeMirror.startState(state.localMode);
+            state.localStates.pop();
+            var localState = last(state.localStates);
+            state.indent -= localState.mode.indent(localState.state, "");
           }
           state.soyState.push("tag");
           if (state.tag == "template" || state.tag == "deltemplate") {
@@ -277,14 +296,16 @@
           if (state.tag != "switch" && /^\{(case|default)\b/.test(textAfter)) indent -= config.indentUnit;
           if (/^\{\/switch\b/.test(textAfter)) indent -= config.indentUnit;
         }
-        if (indent && state.localMode.indent)
-          indent += state.localMode.indent(state.localState, textAfter);
+        var localState = last(state.localStates);
+        if (indent && localState.mode.indent) {
+          indent += localState.mode.indent(localState.state, textAfter);
+        }
         return indent;
       },
 
       innerMode: function(state) {
         if (state.soyState.length && last(state.soyState) != "literal") return null;
-        else return {state: state.localState, mode: state.localMode};
+        else return last(state.localStates);
       },
 
       electricInput: /^\s*\{(\/|\/template|\/deltemplate|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 9e265c1b0c..38ad7cbeb4 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -80,4 +80,16 @@
      '  nothing',
      '[keyword {/foreach}]',
      '');
+
+  MT('nested-kind-test',
+     '[keyword {template] [def .foo] [attribute kind]=[string "html"][keyword }]',
+     '  [tag&bracket <][tag div][tag&bracket >]',
+     '    [keyword {call] [variable .bar][keyword }]',
+     '      [keyword {param] [attribute kind]=[string "js"][keyword }]',
+     '        [keyword var] [def bar] [operator =] [number 5];',
+     '      [keyword {/param}]',
+     '    [keyword {/call}]',
+     '  [tag&bracket </][tag div][tag&bracket >]',
+     '[keyword {/template}]',
+     '');
 })();

From 6b59a2c832fc3aec5e730da973081c822d1f3dfa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Mar 2017 11:20:26 +0100
Subject: [PATCH 3219/4742] [real-world uses] Add some links

---
 doc/realworld.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index 2f36caf4a9..c60597e076 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -82,8 +82,10 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.firepad.io">Firepad</a> (collaborative text editor)</li>
       <li><a href="https://gerritcodereview.com/">Gerrit</a>'s diff view and inline editor</li>
       <li><a href="https://github.com/maks/git-crx">Git Crx</a> (Chrome App for browsing local git repos)</li>
-      <li><a href="http://tour.golang.org">Go language tour</a></li>
       <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
+      <li><a href="https://github.com/">Github</a>'s in-browser edit feature</li>
+      <li><a href="https://glitch.com/">Glitch</a> (community-driven app building)</li>
+      <li><a href="http://tour.golang.org">Go language tour</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
       <li><a href="http://web.uvic.ca/~siefkenj/graphit/graphit.html">Graphit</a> (function graphing)</li>
       <li><a href="https://hackmd.io">HackMD</a> (Realtime collaborative markdown notes on all platforms)</li>
@@ -135,6 +137,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
       <li><a href="https://pypi.python.org/pypi/PubliForge/">PubliForge</a> (online publishing system)</li>
       <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>
+      <li><a href="https://chrome.google.com/webstore/detail/quantum/hmnlklahndgbhdoclhdnoafhafbhmnkm?hl=en-US">Quantum</a> (code editor for Chrome OS)</li>
       <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>
       <li><a href="http://qyapp.com">QiYun web app platform</a></li>
       <li><a href="http://ariya.ofilabs.com/2011/09/hybrid-webnative-desktop-codemirror.html">Qt+Webkit integration</a> (building a desktop CodeMirror app)</li>
@@ -145,6 +148,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://sagecell.sagemath.org">SageMathCell</a> (interactive mathematical software)</li>
       <li><a href="https://cloud.sagemath.com/">SageMathCloud</a> (interactive mathematical software environment)</li>
       <li><a href="https://chrome.google.com/webstore/detail/servephp/mnpikomdchjhkhbhmbboehfdjkobbfpo">ServePHP</a> (PHP code testing in Chrome dev tools)</li>
+      <li><a href="http://scala-lang.org/blog/2017/02/20/introducing-scastie.html">Scastie</a> (Scala playground)</li>
       <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
       <li><a href="http://www.skulpt.org/">Skulpt</a> (in-browser Python environment)</li>

From f583ab93d0e6f5f55eedbb9bd3c99e26a0270887 Mon Sep 17 00:00:00 2001
From: brrd <contact@brrd.fr>
Date: Thu, 16 Mar 2017 13:17:39 +0100
Subject: [PATCH 3220/4742] [continuelist addon] Continue task lists

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

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 5a845907d7..f13e521993 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -11,8 +11,8 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var listRE = /^(\s*)(>[> ]*|- \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/,
-      emptyListRE = /^(\s*)(>[> ]*|- \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/,
+  var listRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/,
+      emptyListRE = /^(\s*)(>[> ]*|[*+-] \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/,
       unorderedListRE = /[*+-]\s/;
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {

From 0b00c0e12fe919865929053e03b2c9dccda0779c Mon Sep 17 00:00:00 2001
From: Emmanuel Schanzer <schanzer@ccs.neu.edu>
Date: Thu, 16 Mar 2017 18:19:39 -0400
Subject: [PATCH 3221/4742] Add role=presentation to more elements to help
 screenreaders

---
 src/display/Display.js | 9 +++++----
 src/line/line_data.js  | 9 +++------
 src/model/mark_text.js | 5 ++---
 src/util/dom.js        | 6 ++++++
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/display/Display.js b/src/display/Display.js
index c1879e7b16..ad0256bdfd 100644
--- a/src/display/Display.js
+++ b/src/display/Display.js
@@ -1,5 +1,5 @@
 import { gecko, ie, ie_version, mobile, webkit } from "../util/browser"
-import { elt } from "../util/dom"
+import { elt, eltP } from "../util/dom"
 import { scrollerGap } from "../util/misc"
 
 // The display handles the DOM integration, both for input reading
@@ -18,7 +18,7 @@ export function Display(place, doc, input) {
   d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler")
   d.gutterFiller.setAttribute("cm-not-content", "true")
   // Will contain the actual code, positioned to cover the viewport.
-  d.lineDiv = elt("div", null, "CodeMirror-code")
+  d.lineDiv = eltP("div", null, "CodeMirror-code")
   // Elements are added to these to represent selection and cursors.
   d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1")
   d.cursorDiv = elt("div", null, "CodeMirror-cursors")
@@ -27,10 +27,11 @@ export function Display(place, doc, input) {
   // When lines outside of the viewport are measured, they are drawn in this.
   d.lineMeasure = elt("div", null, "CodeMirror-measure")
   // Wraps everything that needs to exist inside the vertically-padded coordinate system
-  d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
+  d.lineSpace = eltP("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
                     null, "position: relative; outline: none")
+  let lines = eltP("div", [d.lineSpace], "CodeMirror-lines")
   // Moved around its parent to cover visible view.
-  d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative")
+  d.mover = elt("div", [lines], null, "position: relative")
   // Set to the height of the document, allowing scrolling.
   d.sizer = elt("div", [d.mover], "CodeMirror-sizer")
   d.sizerWidth = null
diff --git a/src/line/line_data.js b/src/line/line_data.js
index 9c3b55d13a..e444184bb0 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -1,6 +1,6 @@
 import { getOrder } from "../util/bidi"
 import { ie, ie_version, webkit } from "../util/browser"
-import { elt, joinClasses } from "../util/dom"
+import { elt, eltP, joinClasses } from "../util/dom"
 import { eventMixin, signal } from "../util/event"
 import { hasBadBidiRects, zeroWidthElement } from "../util/feature_detection"
 import { lst, spaceStr } from "../util/misc"
@@ -64,14 +64,11 @@ export function buildLineContent(cm, lineView) {
   // The padding-right forces the element to have a 'border', which
   // is needed on Webkit to be able to get line-level bounding
   // rectangles for it (in measureChar).
-  let content = elt("span", null, null, webkit ? "padding-right: .1px" : null)
-  let builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
+  let content = eltP("span", null, null, webkit ? "padding-right: .1px" : null)
+  let builder = {pre: eltP("pre", [content], "CodeMirror-line"), content: content,
                  col: 0, pos: 0, cm: cm,
                  trailingSpace: false,
                  splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}
-  // hide from accessibility tree
-  content.setAttribute("role", "presentation")
-  builder.pre.setAttribute("role", "presentation")
   lineView.measure = {}
 
   // Iterate over the logical lines that make up this visual line.
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index af1b724b27..ccdcc9d3b8 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -1,4 +1,4 @@
-import { elt } from "../util/dom"
+import { eltP } from "../util/dom"
 import { eventMixin, hasHandler, on } from "../util/event"
 import { endOperation, operation, runInOp, startOperation } from "../display/operations"
 import { clipPos, cmp, Pos } from "../line/pos"
@@ -166,8 +166,7 @@ export function markText(doc, from, to, options, type) {
   if (marker.replacedWith) {
     // Showing up as a widget implies collapsed (widget replaces text)
     marker.collapsed = true
-    marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget")
-    marker.widgetNode.setAttribute("role", "presentation") // hide from accessibility tree
+    marker.widgetNode = eltP("span", [marker.replacedWith], "CodeMirror-widget")
     if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true")
     if (options.insertLeft) marker.widgetNode.insertLeft = true
   }
diff --git a/src/util/dom.js b/src/util/dom.js
index 9b5d1e85ab..94823c21b9 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -29,6 +29,12 @@ export function elt(tag, content, className, style) {
   else if (content) for (let i = 0; i < content.length; ++i) e.appendChild(content[i])
   return e
 }
+// wrapper for elt, which removes the elt from the accessibility tree
+export function eltP(tag, content, className, style) {
+  let e = elt(tag, content, className, style)
+  e.setAttribute("role", "presentation")
+  return e
+}
 
 export let range
 if (document.createRange) range = function(node, start, end, endNode) {

From f2d6eeeb94734429d0d82b05e7ffdece49736bd6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Mar 2017 11:40:04 +0100
Subject: [PATCH 3222/4742] [fold demo] Use htmlmixed mode in HTML folding demo

---
 demo/folding.html | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/demo/folding.html b/demo/folding.html
index 06d5830208..1882b7c810 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -5,6 +5,13 @@
   <meta charset="utf-8"/>
   <link rel=stylesheet href="../doc/docs.css">
 
+  <style>
+    .some-css {
+      color: red;
+      line-height: 2;
+    }
+  </style>
+
   <link rel="stylesheet" href="../lib/codemirror.css">
   <link rel="stylesheet" href="../addon/fold/foldgutter.css" />
   <script src="../lib/codemirror.js"></script>
@@ -17,6 +24,8 @@
   <script src="../addon/fold/comment-fold.js"></script>
   <script src="../mode/javascript/javascript.js"></script>
   <script src="../mode/xml/xml.js"></script>
+  <script src="../mode/css/css.js"></script>
+  <script src="../mode/htmlmixed/htmlmixed.js"></script>
   <script src="../mode/python/python.js"></script>
   <script src="../mode/markdown/markdown.js"></script>
   <style type="text/css">
@@ -100,7 +109,7 @@ <h2>Code Folding Demo</h2>
     gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
   });
   editor_html.foldCode(CodeMirror.Pos(0, 0));
-  editor_html.foldCode(CodeMirror.Pos(21, 0));
+  editor_html.foldCode(CodeMirror.Pos(34, 0));
 
   window.editor_python = CodeMirror.fromTextArea(te_python, {
     mode: "python",

From 727b10ab632bdd4eaa41a6ca3766a5c50b5562da Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Mar 2017 11:58:26 +0100
Subject: [PATCH 3223/4742] Mark version 5.25.0

---
 AUTHORS           |  7 +++++++
 CHANGELOG.md      | 40 ++++++++++++++++++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 22 ++++++++++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bc894e9f7a..08b2610bbe 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,6 +29,7 @@ alexey-k
 Alex Piggott
 Aliaksei Chapyzhenka
 Allen Sarkisyan
+Ami Fischman
 Amin Shali
 Amin Ullah Khan
 amshali@google.com
@@ -69,11 +70,13 @@ AQNOUCH Mohammed
 areos
 Arnab Bose
 Arthur Müller
+Arun Narasani
 as3boyan
 atelierbram
 AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
+Axel Lewenhaupt
 Barret Rennie
 Basarat Ali Syed
 Bastian Müller
@@ -102,6 +105,7 @@ Brandon Wamboldt
 Brett Zamir
 Brian Grinstead
 Brian Sletten
+brrd
 Bruce Mitchener
 Bryan Massoth
 Caitlin Potter
@@ -122,6 +126,7 @@ Chris Smith
 Christian Oyarzun
 Christian Petrov
 Christopher Brown
+Christopher Kramer
 Christopher Mitchell
 Christopher Pfohl
 Chunliang Lyu
@@ -355,6 +360,7 @@ LloydMilligan
 LM
 lochel
 Lorenzo Stoakes
+Luca Fabbri
 Luciano Longo
 Lu Fangjian
 Luke Browning
@@ -518,6 +524,7 @@ Robert Plummer
 Rrandom
 Rrrandom
 Ruslan Osmanov
+Ryan Petrello
 Ryan Prior
 sabaca
 Sam Lee
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 588d0318d5..758a1cc03f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,43 @@
+## 5.25.0 (2017-02-22)
+
+### Bug fixes
+
+In contentEditable-mode, properly locate changes that repeat a character when inserted with IME.
+
+Fix handling of selections bigger than the viewport in contentEditable mode.
+
+Improve handling of changes that insert or delete lines in contentEditable mode.
+
+Count Unicode control characters 0x80 to 0x9F as special (non-printing) chars.
+
+Fix handling of shadow DOM roots when finding the active element.
+
+Add `role=presentation` to more DOM elements to improve screen reader support.
+
+[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Make aligning of unchanged chunks more robust.
+
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+
+[r mode](http://codemirror.net/mode/r/): Fix indentation after semicolon-less statements.
+
+[shell mode](http://codemirror.net/mode/shell/): Properly handle escaped parentheses in parenthesized expressions.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix a few bugs around leaving fenced code blocks.
+
+[soy mode](http://codemirror.net/mode/soy/): Improve indentation.
+
+### New features
+
+[lint addon](http://codemirror.net/doc/manual.html#addon_lint): Support asynchronous linters that return promises.
+
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Support continuing task lists.
+
+[vim bindings](http://codemirror.net/mode/demo/vim.html): Make Y behave like yy.
+
+[sql mode](http://codemirror.net/mode/sql/): Support sqlite dialect.
+
 ## 5.24.2 (2017-02-22)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index e179b158ff..57934dfe39 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.24.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.25.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 e975cbd03e..681876c46a 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,28 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-03-2017: <a href="http://codemirror.net/codemirror-5.25.0.zip">Version 5.25.0</a>:</p>
+
+  <ul class=rel-note>
+    <li>In contentEditable-mode, properly locate changes that repeat a character when inserted with IME.</li>
+    <li>Fix handling of selections bigger than the viewport in contentEditable mode.</li>
+    <li>Improve handling of changes that insert or delete lines in contentEditable mode.</li>
+    <li>Count Unicode control characters 0x80 to 0x9F as special (non-printing) chars.</li>
+    <li>Fix handling of shadow DOM roots when finding the active element.</li>
+    <li>Add <code>role=presentation</code> to more DOM elements to improve screen reader support.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Make aligning of unchanged chunks more robust.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
+    <li><a href="http://codemirror.net/mode/r/">r mode</a>: Fix indentation after semicolon-less statements.</li>
+    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Properly handle escaped parentheses in parenthesized expressions.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix a few bugs around leaving fenced code blocks.</li>
+    <li><a href="http://codemirror.net/mode/soy/">soy mode</a>: Improve indentation.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Support asynchronous linters that return promises.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Support continuing task lists.</li>
+    <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Make Y behave like yy.</li>
+    <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Support sqlite dialect.</li>
+  </ul>
+
   <p class="rel">22-02-2017: <a href="http://codemirror.net/codemirror-5.24.2.zip">Version 5.24.2</a>:</p>
 
   <ul class=rel-note>
diff --git a/index.html b/index.html
index 8009154d1d..89370e2bb5 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.24.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.25.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index b08d4c9950..2d29a550a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.24.3",
+  "version": "5.25.0",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index a558608d78..7e04a3700c 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.24.3"
+CodeMirror.version = "5.25.0"

From 1e072d52a62f2bd359d61704c7eade2c35b0062d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Mar 2017 12:00:15 +0100
Subject: [PATCH 3224/4742] Bump version number post-5.25.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 57934dfe39..19b05cf9e5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.25.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.25.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 2d29a550a5..7d4c6943a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.25.0",
+  "version": "5.25.1",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 7e04a3700c..f1553f0baf 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.25.0"
+CodeMirror.version = "5.25.1"

From 8b1e6a52add02d89377751a599110b8f79ead97a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 30 Mar 2017 08:42:56 +0200
Subject: [PATCH 3225/4742] Improve drawing of selections that cover the whole
 viewport

Issue #4625
---
 src/input/ContentEditableInput.js | 39 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 7e7fca9a8b..4d19f20197 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -113,36 +113,41 @@ export default class ContentEditableInput {
   }
 
   showPrimarySelection() {
-    let sel = window.getSelection(), prim = this.cm.doc.sel.primary()
-    let curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset)
-    let curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset)
-    if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
-        cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
-        cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
-      return
+    let sel = window.getSelection(), cm = this.cm, prim = cm.doc.sel.primary()
+    let from = prim.from(), to = prim.to()
 
-    let start = posToDOM(this.cm, prim.from())
-    let end = posToDOM(this.cm, prim.to())
-    if (!start && !end) {
+    if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) {
       sel.removeAllRanges()
       return
     }
 
-    let view = this.cm.display.view
-    let old = sel.rangeCount && sel.getRangeAt(0)
-    if (!start) {
-      start = {node: view[0].measure.map[2], offset: 0}
-    } else if (!end) { // FIXME dangerously hacky
+    let curAnchor = domToPos(cm, sel.anchorNode, sel.anchorOffset)
+    let curFocus = domToPos(cm, sel.focusNode, sel.focusOffset)
+    if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
+        cmp(minPos(curAnchor, curFocus), from) == 0 &&
+        cmp(maxPos(curAnchor, curFocus), to) == 0)
+      return
+
+    let view = cm.display.view
+    let start = (from.line >= cm.display.viewFrom && posToDOM(cm, from)) ||
+        {node: view[0].measure.map[2], offset: 0}
+    let end = to.line < cm.display.viewTo && posToDOM(cm, to)
+    if (!end) {
       let measure = view[view.length - 1].measure
       let map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map
       end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]}
     }
 
-    let rng
+    if (!start || !end) {
+      sel.removeAllRanges()
+      return
+    }
+
+    let old = sel.rangeCount && sel.getRangeAt(0), rng
     try { rng = range(start.node, start.offset, end.offset, end.node) }
     catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
     if (rng) {
-      if (!gecko && this.cm.state.focused) {
+      if (!gecko && cm.state.focused) {
         sel.collapse(start.node, start.offset)
         if (!rng.collapsed) {
           sel.removeAllRanges()

From 1e186e75da306060ef4f79ce5593f4c6acf137eb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 30 Mar 2017 09:02:10 +0200
Subject: [PATCH 3226/4742] [sas mode] Remove buggy comment matching

Closes #4664
---
 mode/sas/sas.js | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/mode/sas/sas.js b/mode/sas/sas.js
index a6109eb11c..d85b33534c 100755
--- a/mode/sas/sas.js
+++ b/mode/sas/sas.js
@@ -11,7 +11,7 @@
 
 
 //Definitions
-//  comment -- text withing * ; or /* */
+//  comment -- text within * ; or /* */
 //  keyword -- SAS language variable
 //  variable -- macro variables starts with '&' or variable formats
 //  variable-2 -- DATA Step, proc, or macro names
@@ -116,28 +116,15 @@
         return "comment";
       }
 
+      if (ch == "*" && stream.column() == stream.indentation()) {
+        stream.skipToEnd()
+        return "comment"
+      }
+
       // DoubleOperator match
       var doubleOperator = ch + stream.peek();
 
-      // Match all line comments.
-      var myString = stream.string;
-      var myRegexp = /(?:^\s*|[;]\s*)(\*.*?);/ig;
-      var match = myRegexp.exec(myString);
-      if (match !== null) {
-        if (match.index === 0 && (stream.column() !== (match.index + match[0].length - 1))) {
-          stream.backUp(stream.column());
-          stream.skipTo(';');
-          stream.next();
-          return 'comment';
-        } else if (match.index + 1 < stream.column() && stream.column() < match.index + match[0].length - 1) {
-          // the ';' triggers the match so move one past it to start
-          // the comment block that is why match.index+1
-          stream.backUp(stream.column() - match.index - 1);
-          stream.skipTo(';');
-          stream.next();
-          return 'comment';
-        }
-      } else if ((ch === '"' || ch === "'") && !state.continueString) {
+      if ((ch === '"' || ch === "'") && !state.continueString) {
         state.continueString = ch
         return "string"
       } else if (state.continueString) {

From aadf2df682cf3c43d3f81d03a215ecf81f8a7ea7 Mon Sep 17 00:00:00 2001
From: Ziv <zuoww@ychcaptial.com>
Date: Thu, 30 Mar 2017 18:51:01 +0800
Subject: [PATCH 3227/4742] [lint addon] Add conditional judgment for null
 annotations

---
 addon/lint/lint.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index e5ee747747..4e0c71fb65 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -141,6 +141,7 @@
       lintAsync(cm, getAnnotations, passOptions)
     } else {
       var annotations = getAnnotations(cm.getValue(), passOptions, cm);
+      if (!annotations) return;
       if (annotations.then) annotations.then(function(issues) {
         updateLinting(cm, issues);
       });

From 3424cc35430480dec0e7eb37d35541c5e19ffd90 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 31 Mar 2017 08:55:30 +0200
Subject: [PATCH 3228/4742] Don't scroll cursor into view on setValue

Closes #4657
---
 src/model/Doc.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/model/Doc.js b/src/model/Doc.js
index 0ee45247d5..9abe3087a7 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -75,7 +75,8 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     let top = Pos(this.first, 0), last = this.first + this.size - 1
     makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
                       text: this.splitLines(code), origin: "setValue", full: true}, true)
-    setSelection(this, simpleSelection(top))
+    if (this.cm) this.cm.scrollTo(0, 0)
+    setSelection(this, simpleSelection(top), sel_dontScroll)
   }),
   replaceRange: function(code, from, to, origin) {
     from = clipPos(this, from)

From e42c97fa6f9d68d078911546ac9bef66efc4cd34 Mon Sep 17 00:00:00 2001
From: mce2 <mce2000@mail.ru>
Date: Sat, 1 Apr 2017 00:14:49 +0300
Subject: [PATCH 3229/4742] Add tag parameter to xml-fold findEnclosingTag

Add tag parameter to xml-fold findEnclosingTag to find enclosing tag of particular type.
---
 addon/fold/xml-fold.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 75a9e305bd..08e2149553 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -163,10 +163,10 @@
     }
   };
 
-  CodeMirror.findEnclosingTag = function(cm, pos, range) {
+  CodeMirror.findEnclosingTag = function(cm, pos, range, tag) {
     var iter = new Iter(cm, pos.line, pos.ch, range);
     for (;;) {
-      var open = findMatchingOpen(iter);
+      var open = findMatchingOpen(iter, tag);
       if (!open) break;
       var forward = new Iter(cm, pos.line, pos.ch, range);
       var close = findMatchingClose(forward, open.tag);

From a3cd7d33cc49b83c0e192a12b486a52a872f7469 Mon Sep 17 00:00:00 2001
From: Jamie Morris <maloric@hotmail.com>
Date: Mon, 3 Apr 2017 12:38:35 +0100
Subject: [PATCH 3230/4742] Added wrapping span to search dialog labels to make
 them easier to style

---
 addon/search/search.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 753b1afe1e..99c87e2ef7 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -99,7 +99,7 @@
   }
 
   var queryDialog =
-    'Search: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
+    '<span class="CodeMirror-search-label">Search:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
 
   function startSearch(cm, state, query) {
     state.queryText = query;
@@ -188,8 +188,8 @@
 
   var replaceQueryDialog =
     ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
-  var replacementQueryDialog = 'With: <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
-  var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>";
+  var replacementQueryDialog = '<span class="CodeMirror-search-label">With:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
+  var doReplaceConfirm = '<span class="CodeMirror-search-label">Replace?</span> <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>';
 
   function replaceAll(cm, query, text) {
     cm.operation(function() {
@@ -205,7 +205,7 @@
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
     var query = cm.getSelection() || getSearchState(cm).lastQuery;
-    var dialogText = all ? "Replace all:" : "Replace:"
+    var dialogText = '<span class="CodeMirror-search-label">' + (all ? 'Replace all:' : 'Replace:') + '</span>';
     dialog(cm, dialogText + replaceQueryDialog, dialogText, query, function(query) {
       if (!query) return;
       query = parseQuery(query);

From 407ef3aa638ddab13c83e76d8b742b30e3fe13c4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 5 Apr 2017 07:56:45 +0200
Subject: [PATCH 3231/4742] Mention not accepting new addons/modes in
 CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c4cd019a7c..1b0b104d3a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,6 +47,10 @@ should be asked on the
 
 ## Contributing code
 
+Note that we are not accepting any new addons or modes into the main
+distribution. If you've written such a module, please distribute it as
+a separate NPM package.
+
 - Make sure you have a [GitHub Account](https://github.com/signup/free)
 - Fork [CodeMirror](https://github.com/codemirror/CodeMirror/)
   ([how to fork a repo](https://help.github.com/articles/fork-a-repo))

From e799432a116ef69a50c882a02d0dd04193adb06f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 5 Apr 2017 22:19:57 +0200
Subject: [PATCH 3232/4742] [javascript mode] Recognize TypeScript-style type
 parameters for functions

Issue #4643
---
 mode/javascript/javascript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 3f614cc2c5..212737804e 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -620,6 +620,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
     if (type == "variable") {register(value); return cont(functiondef);}
     if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, maybetype, statement, popcontext);
+    if (isTS && value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, functiondef)
   }
   function funarg(type) {
     if (type == "spread") return cont(funarg);

From fa69bef4544d5aaba7bdd770ab5fc9d0b52dd692 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 5 Apr 2017 22:24:37 +0200
Subject: [PATCH 3233/4742] [javascript mode] Add rough support for decorators

Issue #4643
---
 mode/javascript/javascript.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 212737804e..7c09476b3d 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -77,7 +77,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return jsKeywords;
   }();
 
-  var isOperatorChar = /[+\-*&%=<>!?|~^]/;
+  var isOperatorChar = /[+\-*&%=<>!?|~^@]/;
   var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;
 
   function readRegexp(stream) {
@@ -374,6 +374,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
     if (type == "type") return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
     if (type == "async") return cont(statement)
+    if (value == "@") return cont(expression, statement)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {
@@ -659,6 +660,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     if (type == ";") return cont(classBody);
     if (type == "}") return cont();
+    if (value == "@") return cont(expression, classBody)
   }
   function classfield(type, value) {
     if (value == "?") return cont(classfield)

From e9760de5815cd09d054af3db669725b3c87d099c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 6 Apr 2017 12:31:46 +0200
Subject: [PATCH 3234/4742] Work around Android Chrome bug that breaks
 coordinate computations

---
 src/measurement/position_measurement.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 1d52078002..5fb6a6534b 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -4,7 +4,7 @@ import { clipPos, Pos } from "../line/pos"
 import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans"
 import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line"
 import { bidiOther, getBidiPartAt, getOrder } from "../util/bidi"
-import { ie, ie_version } from "../util/browser"
+import { chrome, android, ie, ie_version } from "../util/browser"
 import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom"
 import { e_target } from "../util/event"
 import { hasBadZoomedRects } from "../util/feature_detection"
@@ -281,8 +281,17 @@ export function clearCaches(cm) {
   cm.display.lineNumChars = null
 }
 
-function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft }
-function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop }
+function pageScrollX() {
+  // Work around https://bugs.chromium.org/p/chromium/issues/detail?id=489206
+  // which causes page_Offset and bounding client rects to use
+  // different reference viewports and invalidate our calculations.
+  if (chrome && android) return -(document.body.getBoundingClientRect().left - parseInt(getComputedStyle(document.body).marginLeft))
+  return window.pageXOffset || (document.documentElement || document.body).scrollLeft
+}
+function pageScrollY() {
+  if (chrome && android) return -(document.body.getBoundingClientRect().top - parseInt(getComputedStyle(document.body).marginTop))
+  return window.pageYOffset || (document.documentElement || document.body).scrollTop
+}
 
 // Converts a {top, bottom, left, right} box from line-local
 // coordinates into another coordinate system. Context may be one of

From 25bf31f0ae808cc9c76891f1d4664fe778038d5c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 7 Apr 2017 22:47:29 +0200
Subject: [PATCH 3235/4742] [shell mode] Handle nested braces

Closes #4680
---
 mode/shell/shell.js | 16 ++++++----------
 mode/shell/test.js  |  3 +++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 76c67cd2b7..09d9487240 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -82,7 +82,7 @@ CodeMirror.defineMode('shell', function() {
   }
 
   function tokenString(quote, style) {
-    var close = quote == "(" ? ")" : quote
+    var close = quote == "(" ? ")" : quote == "{" ? "}" : quote
     return function(stream, state) {
       var next, end = false, escaped = false;
       while ((next = stream.next()) != null) {
@@ -96,7 +96,7 @@ CodeMirror.defineMode('shell', function() {
           state.tokens.unshift(tokenDollar);
           break;
         }
-        if (!escaped && next === "(" && quote === "(") {
+        if (!escaped && next === quote && quote !== close) {
           state.tokens.unshift(tokenString(quote, style))
           return tokenize(stream, state)
         }
@@ -109,16 +109,12 @@ CodeMirror.defineMode('shell', function() {
 
   var tokenDollar = function(stream, state) {
     if (state.tokens.length > 1) stream.eat('$');
-    var ch = stream.next(), hungry = /\w/;
-    if (ch === '{') hungry = /[^}]/;
-    if (/['"(]/.test(ch)) {
-      state.tokens[0] = tokenString(ch, ch == "(" ? "quote" : "string");
+    var ch = stream.next()
+    if (/['"({]/.test(ch)) {
+      state.tokens[0] = tokenString(ch, ch == "(" ? "quote" : ch == "{" ? "def" : "string");
       return tokenize(stream, state);
     }
-    if (!/\d/.test(ch)) {
-      stream.eatWhile(hungry);
-      stream.eat('}');
-    }
+    if (!/\d/.test(ch)) stream.eatWhile(/\w/);
     state.tokens.shift();
     return 'def';
   };
diff --git a/mode/shell/test.js b/mode/shell/test.js
index e42dd16287..86e344c572 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -58,4 +58,7 @@
 
   MT("doubleParens",
      "foo [quote $((bar))]")
+
+  MT("nested braces",
+     "[builtin echo] [def ${A[${B}]]}]")
 })();

From 78b977105a8d8c5b20609eb298017044742b4e18 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 10 Apr 2017 12:34:09 +0200
Subject: [PATCH 3236/4742] Make sure long-hold-click on selection sets a
 cursor

(When the mouse didn't move.)

Closes #4677
---
 src/edit/mouse_events.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 0b96f4cfda..10195b575b 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -89,15 +89,16 @@ function leftButtonDown(cm, e, start) {
 // 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) {
-  let display = cm.display, startTime = +new Date
-  let dragEnd = operation(cm, e2 => {
+  let display = cm.display, moved = false
+  let dragEnd = operation(cm, e => {
     if (webkit) display.scroller.draggable = false
     cm.state.draggingText = false
     off(document, "mouseup", dragEnd)
+    off(document, "mousemove", mouseMove)
     off(display.scroller, "drop", dragEnd)
-    if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-      e_preventDefault(e2)
-      if (!modifier && +new Date - 200 < startTime)
+    if (!moved) {
+      e_preventDefault(e)
+      if (!modifier)
         extendSelection(cm.doc, start)
       // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
       if (webkit || ie && ie_version == 9)
@@ -106,6 +107,9 @@ function leftButtonStartDrag(cm, e, start, modifier) {
         display.input.focus()
     }
   })
+  let mouseMove = function(e2) {
+    moved = moved || Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) >= 10
+  }
   // Let the drag handler handle this.
   if (webkit) display.scroller.draggable = true
   cm.state.draggingText = dragEnd
@@ -113,6 +117,7 @@ function leftButtonStartDrag(cm, e, start, modifier) {
   // IE's approach to draggable
   if (display.scroller.dragDrop) display.scroller.dragDrop()
   on(document, "mouseup", dragEnd)
+  on(document, "mousemove", mouseMove)
   on(display.scroller, "drop", dragEnd)
 }
 

From fd052625df312dbaf19f705d44bd36262b3cc19b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 10 Apr 2017 22:19:32 +0200
Subject: [PATCH 3237/4742] [panel addon] Fix changed method of panels

Closes #4683
---
 addon/display/panel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/display/panel.js b/addon/display/panel.js
index 74199ff059..f88d152b80 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -66,7 +66,7 @@
   Panel.prototype.changed = function(height) {
     var newHeight = height == null ? this.node.offsetHeight : height;
     var info = this.cm.state.panels;
-    this.cm._setSize(null, info.height += (newHeight - this.height));
+    this.cm._setSize(null, info.heightLeft -= (newHeight - this.height));
     this.height = newHeight;
   };
 

From 415bdff0fce114f73896ea9624da4232ee8d0907 Mon Sep 17 00:00:00 2001
From: Pablo Zubieta <pabloferz@yahoo.com.mx>
Date: Tue, 11 Apr 2017 00:49:41 -0500
Subject: [PATCH 3238/4742] Fix #4668, properly handle string literals

---
 mode/julia/julia.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 8fc999f5f9..ad11d6b945 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -45,7 +45,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
 
   var macro = /^@[_A-Za-z][\w]*/;
   var symbol = /^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
-  var stringPrefixes = /^(`|"{3}|([_A-Za-z\u00A1-\uFFFF]*"))/;
+  var stringPrefixes = /^(`|([_A-Za-z\u00A1-\uFFFF]*"("")?))/;
 
   function inArray(state) {
     return inGenerator(state, '[')
@@ -338,7 +338,11 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   }
 
   function tokenStringFactory(delimiter) {
-    delimiter = (delimiter === '`' || delimiter === '"""') ? delimiter : '"';
+    if (delimiter.substr(-3) === '"""') {
+      delimiter = '"""';
+    } else if (delimiter.substr(-1) === '"') {
+      delimiter = '"';
+    }
     function tokenString(stream, state) {
       if (stream.eat('\\')) {
         stream.next();

From 5aa64cc41661cafbe4f5348e4a9a1cc467af08d2 Mon Sep 17 00:00:00 2001
From: Adam Particka <a.particka@gmail.com>
Date: Tue, 11 Apr 2017 16:42:33 -0600
Subject: [PATCH 3239/4742] [soy mode] Guard indent calls to inner mode

---
 mode/soy/soy.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index cff7719b87..ca0f6a46ab 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -202,7 +202,9 @@
                 state.kindTag.push(state.tag);
                 var mode = modes[kind] || modes.html;
                 var localState = last(state.localStates);
-                state.indent += localState.mode.indent(localState.state, "");
+                if (localState.mode.indent) {
+                  state.indent += localState.mode.indent(localState.state, "");
+                }
                 state.localStates.push({
                   mode: mode,
                   state: CodeMirror.startState(mode)
@@ -259,7 +261,9 @@
             state.kindTag.pop();
             state.localStates.pop();
             var localState = last(state.localStates);
-            state.indent -= localState.mode.indent(localState.state, "");
+            if (localState.mode.indent) {
+              state.indent -= localState.mode.indent(localState.state, "");
+            }
           }
           state.soyState.push("tag");
           if (state.tag == "template" || state.tag == "deltemplate") {

From ece893706392c226c100798f91aae44bc357702d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 12 Apr 2017 22:35:27 +0200
Subject: [PATCH 3240/4742] [markdown mode] Make strong/em delimiting more
 CommonMark-compliant

Closes #4686
---
 mode/gfm/gfm.js           |  1 -
 mode/markdown/markdown.js | 73 ++++++++++++++++-----------------------
 mode/markdown/test.js     | 24 ++++++-------
 3 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 6e74ad4fd6..23126ff465 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -113,7 +113,6 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
   };
 
   var markdownConfig = {
-    underscoresBreakWords: false,
     taskLists: true,
     fencedCodeBlocks: '```',
     strikethrough: true
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index e649b09179..6060ae3716 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -35,10 +35,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.maxBlockquoteDepth === undefined)
     modeCfg.maxBlockquoteDepth = 0;
 
-  // Should underscores in words open/close em/strong?
-  if (modeCfg.underscoresBreakWords === undefined)
-    modeCfg.underscoresBreakWords = true;
-
   // Use `fencedCodeBlocks` to configure fenced code blocks. false to
   // disable, string to specify a precise regexp that the fence should
   // match, and true to allow three or more backticks or tildes (as
@@ -89,7 +85,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
   ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
-                                ")[ \\t]*([\\w+#\-]*)");
+                                ")[ \\t]*([\\w+#\-]*)")
+  ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -375,9 +372,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return getType(state);
     }
 
-    // Get sol() value now, before character is consumed
-    var sol = stream.sol();
-
     var ch = stream.next();
 
     // Matches link titles present on next line
@@ -387,7 +381,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (ch === '(') {
         matchCh = ')';
       }
-      matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+      matchCh = (matchCh+'').replace(/([.?*+^\[\]\\(){}|-])/g, "\\$1");
       var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
       if (stream.match(new RegExp(regex), true)) {
         return tokenTypes.linkHref;
@@ -499,41 +493,34 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (ch === '<' && stream.match(/^\/\w*?>/)) {
       state.md_inside = false;
       return "tag";
-    }
-
-    var ignoreUnderscore = false;
-    if (!modeCfg.underscoresBreakWords) {
-      if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) {
-        var prevPos = stream.pos - 2;
-        if (prevPos >= 0) {
-          var prevCh = stream.string.charAt(prevPos);
-          if (prevCh !== '_' && prevCh.match(/(\w)/, false)) {
-            ignoreUnderscore = true;
-          }
-        }
+    } else if (ch === "*" || ch === "_") {
+      var len = 1, before = stream.pos == 1 ? " " : stream.string.charAt(stream.pos - 2)
+      while (len < 3 && stream.eat(ch)) len++
+      var after = stream.peek() || " "
+      // See http://spec.commonmark.org/0.27/#emphasis-and-strong-emphasis
+      var leftFlanking = !/\s/.test(after) && (!punctuation.test(after) || /\s/.test(before) || punctuation.test(before))
+      var rightFlanking = !/\s/.test(before) && (!punctuation.test(before) || /\s/.test(after) || punctuation.test(after))
+      var setEm = null, setStrong = null
+      if (len % 2) { // Em
+        if (!state.em && leftFlanking && (ch === "*" || !rightFlanking || punctuation.test(before)))
+          setEm = true
+        else if (state.em == ch && rightFlanking && (ch === "*" || !leftFlanking || punctuation.test(after)))
+          setEm = false
       }
-    }
-    if (ch === '*' || (ch === '_' && !ignoreUnderscore)) {
-      if (sol && stream.peek() === ' ') {
-        // Do nothing, surrounded by newline and space
-      } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
-        if (modeCfg.highlightFormatting) state.formatting = "strong";
-        var t = getType(state);
-        state.strong = false;
-        return t;
-      } else if (!state.strong && stream.eat(ch)) { // Add STRONG
-        state.strong = ch;
-        if (modeCfg.highlightFormatting) state.formatting = "strong";
-        return getType(state);
-      } else if (state.em === ch) { // Remove EM
-        if (modeCfg.highlightFormatting) state.formatting = "em";
-        var t = getType(state);
-        state.em = false;
-        return t;
-      } else if (!state.em) { // Add EM
-        state.em = ch;
-        if (modeCfg.highlightFormatting) state.formatting = "em";
-        return getType(state);
+      if (len > 1) { // Strong
+        if (!state.strong && leftFlanking && (ch === "*" || !rightFlanking || punctuation.test(before)))
+          setStrong = true
+        else if (state.strong == ch && rightFlanking && (ch === "*" || !leftFlanking || punctuation.test(after)))
+          setStrong = false
+      }
+      if (setStrong != null || setEm != null) {
+        if (modeCfg.highlightFormatting) state.formatting = setEm == null ? "strong" : setStrong == null ? "em" : "strong em"
+        if (setEm === true) state.em = ch
+        if (setStrong === true) state.strong = ch
+        var t = getType(state)
+        if (setEm === false) state.em = false
+        if (setStrong === false) state.strong = false
+        return t
       }
     } else if (ch === ' ') {
       if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 37ecb4bbfe..51b55706d9 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -381,28 +381,28 @@
   MT("listAsteriskFormatting",
      "[variable-2 * ][variable-2&em *foo*][variable-2  bar]",
      "[variable-2 * ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 * ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
+     "[variable-2 * ][variable-2&em&strong ***foo***][variable-2  bar]",
      "[variable-2 * ][variable-2&comment `foo`][variable-2  bar]");
 
   // Formatting in lists (+)
   MT("listPlusFormatting",
      "[variable-2 + ][variable-2&em *foo*][variable-2  bar]",
      "[variable-2 + ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 + ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
+     "[variable-2 + ][variable-2&em&strong ***foo***][variable-2  bar]",
      "[variable-2 + ][variable-2&comment `foo`][variable-2  bar]");
 
   // Formatting in lists (-)
   MT("listDashFormatting",
      "[variable-2 - ][variable-2&em *foo*][variable-2  bar]",
      "[variable-2 - ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 - ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
+     "[variable-2 - ][variable-2&em&strong ***foo***][variable-2  bar]",
      "[variable-2 - ][variable-2&comment `foo`][variable-2  bar]");
 
   // Formatting in lists (1.)
   MT("listNumberFormatting",
      "[variable-2 1. ][variable-2&em *foo*][variable-2  bar]",
      "[variable-2 2. ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 3. ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
+     "[variable-2 3. ][variable-2&em&strong ***foo***][variable-2  bar]",
      "[variable-2 4. ][variable-2&comment `foo`][variable-2  bar]");
 
   // Paragraph lists
@@ -605,7 +605,7 @@
      "[image&image-marker !][image&image-alt-text&link [[][image-alt-text&strong&image&link **alt text**][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]");
 
   MT("imageEmStrong",
-     "[image&image-marker !][image&image-alt-text&link [[][image-alt-text&image&strong&link **][image&image-alt-text&em&strong&link *alt text**][image&image-alt-text&em&link *][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]");
+     "[image&image-marker !][image&image-alt-text&link [[][image&image-alt-text&em&strong&link ***alt text***][image&image-alt-text&link ]]][string&url (http://link.to/image.jpg)]");
 
   // Inline link with title
   MT("linkTitle",
@@ -629,7 +629,7 @@
 
   // Inline link with EmStrong
   MT("linkEmStrong",
-     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url (http://example.com/)] bar");
+     "[link [[][link&em&strong ***foo***][link ]]][string&url (http://example.com/)] bar");
 
   // Image with title
   MT("imageTitle",
@@ -663,7 +663,7 @@
 
   // Reference-style links with EmStrong
   MT("linkReferenceEmStrong",
-     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url [[bar]]] hello");
+     "[link [[][link&em&strong ***foo***][link ]]][string&url [[bar]]] hello");
 
   // Reference-style links with optional space separator (per documentation)
   // "You can optionally use a space to separate the sets of brackets"
@@ -757,7 +757,7 @@
      "foo[em *bar*]hello");
 
   MT("emInWordUnderscore",
-     "foo[em _bar_]hello");
+     "foo_bar_hello");
 
   // Per documentation: "...surround an * or _ with spaces, it’ll be
   // treated as a literal asterisk or underscore."
@@ -766,11 +766,11 @@
      "foo [em _bar _ hello_] world");
 
   MT("emEscapedBySpaceOut",
-     "foo _ bar[em _hello_]world");
+     "foo _ bar [em _hello_] world");
 
   MT("emEscapedByNewline",
      "foo",
-     "_ bar[em _hello_]world");
+     "_ bar [em _hello_] world");
 
   // Unclosed emphasis characters
   // Instead of simply marking as EM / STRONG, it would be nice to have an
@@ -791,14 +791,14 @@
      "[em *foo][em&strong **bar*][strong hello**] world");
 
   MT("emStrongUnderscore",
-     "[em _foo][em&strong __bar_][strong hello__] world");
+     "[em _foo ][em&strong __bar_][strong  hello__] world");
 
   // "...same character must be used to open and close an emphasis span.""
   MT("emStrongMixed",
      "[em _foo][em&strong **bar*hello__ world]");
 
   MT("emStrongMixed",
-     "[em *foo][em&strong __bar_hello** world]");
+     "[em *foo ][em&strong __bar_hello** world]");
 
   MT("linkWithNestedParens",
      "[link [[foo]]][string&url (bar(baz))]")

From 9507a6e5b3786462a82c8e9e415d9b54069c995a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 12 Apr 2017 22:40:49 +0200
Subject: [PATCH 3241/4742] [gfm mode] Fix broken test caused by previous patch

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

diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 7a1a4ccf21..dbdcbb2752 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -35,7 +35,7 @@
      "foo_bar_hello");
 
   MT("emStrongUnderscore",
-     "[strong __][em&strong _foo__][em _] bar");
+     "[em&strong ___foo___] bar");
 
   MT("fencedCodeBlocks",
      "[comment ```]",

From 2c46d1b45af0baba87804f451c566de256c8d390 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 13 Apr 2017 14:41:42 +0200
Subject: [PATCH 3242/4742] [css mode] Prevent SCSS ': {' from being treated
 like a single token

Closes #4688
---
 mode/css/css.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 02cc93d9cf..7f8c46ebb6 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -748,8 +748,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
       },
       ":": function(stream) {
-        if (stream.match(/\s*\{/))
-          return [null, "{"];
+        if (stream.match(/\s*\{/, false))
+          return [null, null]
         return false;
       },
       "$": function(stream) {

From 7ae9e75770cfe37058db96b49312abc38123b7e5 Mon Sep 17 00:00:00 2001
From: Florian Felten <florian.felten@student.uclouvain.be>
Date: Fri, 14 Apr 2017 12:12:01 +0200
Subject: [PATCH 3243/4742] [oz mode] Add "div" keyword

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

diff --git a/mode/oz/oz.js b/mode/oz/oz.js
index ee8cb0ad15..50ffda37a6 100644
--- a/mode/oz/oz.js
+++ b/mode/oz/oz.js
@@ -27,7 +27,7 @@ CodeMirror.defineMode("oz", function (conf) {
 
   var atoms = wordRegexp(["true", "false", "nil", "unit"]);
   var commonKeywords = wordRegexp(["andthen", "at", "attr", "declare", "feat", "from", "lex",
-    "mod", "mode", "orelse", "parser", "prod", "prop", "scanner", "self", "syn", "token"]);
+    "mod", "div", "mode", "orelse", "parser", "prod", "prop", "scanner", "self", "syn", "token"]);
   var openingKeywords = wordRegexp(["local", "proc", "fun", "case", "class", "if", "cond", "or", "dis",
     "choice", "not", "thread", "try", "raise", "lock", "for", "suchthat", "meth", "functor"]);
   var middleKeywords = wordRegexp(middle);

From 1e4f5b8db174b0c8efb63e5aa4fe42826cc78fb1 Mon Sep 17 00:00:00 2001
From: Renaud Durlin <renaud.durlin@gmail.com>
Date: Sun, 16 Apr 2017 10:22:23 +0200
Subject: [PATCH 3244/4742] [clike mode] Improve destructor highlighting for
 C++

Destructor are now parsed the same way as constructor.
---
 mode/clike/clike.js | 4 ++--
 mode/clike/test.js  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index ee7b077ee8..ccd52aa8a5 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -103,7 +103,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     }
     stream.eatWhile(/[\w\$_\xa1-\uffff]/);
     if (namespaceSeparator) while (stream.match(namespaceSeparator))
-      stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+      stream.eatWhile(/[\w\$_~\xa1-\uffff]/);
 
     var cur = stream.current();
     if (contains(keywords, cur)) {
@@ -314,7 +314,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   }
 
   function cppLooksLikeConstructor(word) {
-    var lastTwo = /(\w+)::(\w+)$/.exec(word);
+    var lastTwo = /(\w+)::~?(\w+)$/.exec(word);
     return lastTwo && lastTwo[1] == lastTwo[2];
   }
 
diff --git a/mode/clike/test.js b/mode/clike/test.js
index bea85b8693..17e652b761 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -52,4 +52,8 @@
     "[number 0b10'000];",
     "[number 0x10'000];",
     "[string '100000'];");
+
+  MTCPP("ctor_dtor",
+     "[def Foo::Foo]() {}",
+     "[def Foo::~Foo]() {}");
 })();

From 78498753f920611baeaf379e515aa9fa089a8982 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 16 Apr 2017 23:02:37 +0200
Subject: [PATCH 3245/4742] [clike mode] Make set of identifier chars
 configurable

Issue #4693
---
 mode/clike/clike.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index ccd52aa8a5..4c2acd6cf1 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -64,7 +64,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       isPunctuationChar = parserConfig.isPunctuationChar || /[\[\]{}\(\),;\:\.]/,
       numberStart = parserConfig.numberStart || /[\d\.]/,
       number = parserConfig.number || /^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,
-      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/;
+      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/,
+      isIdentifierChar = parserConfig.isIdentifierChar || /[\w\$_\xa1-\uffff]/;
 
   var curPunc, isDefKeyword;
 
@@ -101,9 +102,9 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       while (!stream.match(/^\/[\/*]/, false) && stream.eat(isOperatorChar)) {}
       return "operator";
     }
-    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+    stream.eatWhile(isIdentifierChar);
     if (namespaceSeparator) while (stream.match(namespaceSeparator))
-      stream.eatWhile(/[\w\$_~\xa1-\uffff]/);
+      stream.eatWhile(isIdentifierChar);
 
     var cur = stream.current();
     if (contains(keywords, cur)) {
@@ -390,6 +391,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     typeFirstDefinitions: true,
     atoms: words("true false null"),
     dontIndentStatements: /^template$/,
+    isIdentifierChar: /[\w\$_~\xa1-\uffff]/,
     hooks: {
       "#": cppHook,
       "*": pointerHook,

From 63500b7c3121232e5a0834d09c11ca9f8946ce37 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 17 Apr 2017 21:14:05 +0200
Subject: [PATCH 3246/4742] Fix issue where dropped text was sometimes not
 selected

---
 src/edit/mouse_events.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 10195b575b..02d1da5191 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -95,6 +95,7 @@ function leftButtonStartDrag(cm, e, start, modifier) {
     cm.state.draggingText = false
     off(document, "mouseup", dragEnd)
     off(document, "mousemove", mouseMove)
+    off(display.scroller, "dragstart", dragStart)
     off(display.scroller, "drop", dragEnd)
     if (!moved) {
       e_preventDefault(e)
@@ -110,6 +111,7 @@ function leftButtonStartDrag(cm, e, start, modifier) {
   let mouseMove = function(e2) {
     moved = moved || Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) >= 10
   }
+  let dragStart = () => moved = true
   // Let the drag handler handle this.
   if (webkit) display.scroller.draggable = true
   cm.state.draggingText = dragEnd
@@ -118,6 +120,7 @@ function leftButtonStartDrag(cm, e, start, modifier) {
   if (display.scroller.dragDrop) display.scroller.dragDrop()
   on(document, "mouseup", dragEnd)
   on(document, "mousemove", mouseMove)
+  on(display.scroller, "dragstart", dragStart)
   on(display.scroller, "drop", dragEnd)
 }
 

From f821ebabd0643f2ee5702f2b552a0204636a3b6e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 17 Apr 2017 21:14:43 +0200
Subject: [PATCH 3247/4742] Focus the editor when starting to drag the
 selection

Issue #4694
---
 src/edit/mouse_events.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 02d1da5191..4af496847a 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -122,6 +122,8 @@ function leftButtonStartDrag(cm, e, start, modifier) {
   on(document, "mousemove", mouseMove)
   on(display.scroller, "dragstart", dragStart)
   on(display.scroller, "drop", dragEnd)
+
+  setTimeout(() => display.input.focus(), 20)
 }
 
 // Normal selection, as opposed to text dragging.

From a5d7882c87b62c7dd7851441cf93c6b6f9e467ae Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 17 Apr 2017 22:41:47 +0200
Subject: [PATCH 3248/4742] [octave mode] Make sure unterminated string tokens
 have string style

To make auto closing of quotes work
---
 mode/octave/octave.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index f38b751d1b..b77ad682ed 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -90,8 +90,8 @@ CodeMirror.defineMode("octave", function() {
     if (stream.match(wordRegexp(['nan','NaN','inf','Inf']))) { return 'number'; };
 
     // Handle Strings
-    if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; } ;
-    if (stream.match(/^'([^']|(''))*'/)) { return 'string'; } ;
+    var m = stream.match(/^"(?:[^"]|"")*("|$)/) || stream.match(/^'(?:[^']|'')*('|$)/)
+    if (m) { return m[1] ? 'string' : "string error"; }
 
     // Handle words
     if (stream.match(keywords)) { return 'keyword'; } ;

From 4271ba59e6b400cf586cfb83c045f73e0cc037d9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Apr 2017 10:16:19 +0200
Subject: [PATCH 3249/4742] Delay blur event when starting a possible selection
 drag

Issue #4694
---
 src/edit/mouse_events.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 4af496847a..52131bc5cd 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -123,6 +123,7 @@ function leftButtonStartDrag(cm, e, start, modifier) {
   on(display.scroller, "dragstart", dragStart)
   on(display.scroller, "drop", dragEnd)
 
+  delayBlurEvent(cm)
   setTimeout(() => display.input.focus(), 20)
 }
 

From 41e3936e4bfc9e60f91cc8a76cfd4a9e6fcd8f98 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 19 Apr 2017 07:41:37 +0200
Subject: [PATCH 3250/4742] [show-hint addon] Clarify passing options in the
 manual

Issue #4697
---
 doc/manual.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 19b05cf9e5..4895789b93 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2603,9 +2603,12 @@ <h2 id="addons">Addons</h2>
         of the global one passed with the full list of completions.</dd>
       </dl></dd>
 
-      <dd>The plugin understands the following options (the options object
-      will also be passed along to the hinting function, which may
-      understand additional options):
+      <dd>The plugin understands the following options, which may be
+      either passed directly in the argument to <code>showHint</code>,
+      or provided by setting an <code>hintOptions</code> editor
+      option to an object (the former takes precedence). The options
+      object will also be passed along to the hinting function, which
+      may understand additional options.
       <dl>
         <dt><code><strong>hint</strong>: function</code></dt>
         <dd>A hinting function, as specified above. It is possible to

From d56a5f95b009f4cfa0ee0b4b4b4710348e34728b Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 19 Apr 2017 11:49:09 +0200
Subject: [PATCH 3251/4742] Add a coordsChar test that runs the bidi code path

---
 test/test.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/test.js b/test/test.js
index b9f5aa8c4c..38e84d18d6 100644
--- a/test/test.js
+++ b/test/test.js
@@ -237,6 +237,23 @@ testCM("coordsChar", function(cm) {
   }
 }, {lineNumbers: true});
 
+testCM("coordsCharBidi", function(cm) {
+  addDoc(cm, 35, 70);
+  // Put an rtl character into each line to trigger the bidi code path in coordsChar
+  cm.setValue(cm.getValue().replace(/\bx/g, 'و'))
+  for (var i = 0; i < 2; ++i) {
+    var sys = i ? "local" : "page";
+    for (var ch = 2; ch <= 35; ch += 5) {
+      for (var line = 0; line < 70; line += 5) {
+        cm.setCursor(line, ch);
+        var coords = cm.charCoords(Pos(line, ch), sys);
+        var pos = cm.coordsChar({left: coords.left + 1, top: coords.top + 1}, sys);
+        eqCharPos(pos, Pos(line, ch));
+      }
+    }
+  }
+}, {lineNumbers: true});
+
 testCM("posFromIndex", function(cm) {
   cm.setValue(
     "This function should\n" +

From 66766a612d4e25d069b7817f29a739014275665b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 19 Apr 2017 23:11:17 +0200
Subject: [PATCH 3252/4742] List Safari as a user of CodeMirror

---
 index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 89370e2bb5..6e3673188a 100644
--- a/index.html
+++ b/index.html
@@ -146,8 +146,9 @@ <h2>Community</h2>
   <p>CodeMirror is an open-source project shared under
   an <a href="LICENSE">MIT license</a>. It is the editor used in the
   dev tools for
-  both <a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox</a>
-  and <a href="https://developers.google.com/chrome-developer-tools/">Chrome</a>, <a href="http://www.lighttable.com/">Light
+  <a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox</a>,
+  <a href="https://developers.google.com/chrome-developer-tools/">Chrome</a>,
+  and <a href="https://developer.apple.com/safari/tools/">Safari</a>, in <a href="http://www.lighttable.com/">Light
   Table</a>, <a href="http://brackets.io/">Adobe
   Brackets</a>, <a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a>,
   and <a href="doc/realworld.html">many other projects</a>.</p>

From 5dfab9c930f25d39cf6a2b7fcb279bdf3ddc5749 Mon Sep 17 00:00:00 2001
From: Saul Costa <saul@codevolve.com>
Date: Wed, 19 Apr 2017 17:31:20 -0700
Subject: [PATCH 3253/4742] [real-world uses] Add www.codevolve.com

We use Code Mirror for our code editor at Codevolve.
---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index c60597e076..ca8f5c79ba 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -54,6 +54,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://code-snippets.bungeshea.com/">Code Snippets</a> (WordPress snippet management plugin)</li>
       <li><a href="http://antonmi.github.io/code_together/">Code together</a> (collaborative editing)</li>
       <li><a href="http://codev.it/">Codev</a> (collaborative IDE)</li>
+      <li><a href="https://www.codevolve.com/">Codevolve</a> (programming lessons as-a-service)</li>
       <li><a href="http://www.codezample.com">CodeZample</a> (code snippet sharing)</li>
       <li><a href="http://codio.com">Codio</a> (Web IDE)</li>
       <li><a href="http://ot.substance.io/demo/">Collaborative CodeMirror demo</a> (CodeMirror + operational transforms)</li>

From ee05b5b2e834b116695e69f3a841322af07c4705 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Apr 2017 11:43:25 +0200
Subject: [PATCH 3254/4742] Improve zero-width-scrollbar pointer-event hack

To work with Chrome's overlay scrollbars

Issue #4676
---
 src/display/scrollbars.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index d03850be0f..af31c78140 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -85,12 +85,12 @@ class NativeScrollbars {
 
   setScrollLeft(pos) {
     if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos
-    if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz)
+    if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz, "horiz")
   }
 
   setScrollTop(pos) {
     if (this.vert.scrollTop != pos) this.vert.scrollTop = pos
-    if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert)
+    if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert, "vert")
   }
 
   zeroWidthHack() {
@@ -101,17 +101,18 @@ class NativeScrollbars {
     this.disableVert = new Delayed
   }
 
-  enableZeroWidthBar(bar, delay) {
+  enableZeroWidthBar(bar, delay, type) {
     bar.style.pointerEvents = "auto"
     function maybeDisable() {
       // To find out whether the scrollbar is still visible, we
       // check whether the element under the pixel in the bottom
-      // left corner of the scrollbar box is the scrollbar box
+      // right corner of the scrollbar box is the scrollbar box
       // itself (when the bar is still visible) or its filler child
       // (when the bar is hidden). If it is still visible, we keep
       // it enabled, if it's hidden, we disable pointer events.
       let box = bar.getBoundingClientRect()
-      let elt = document.elementFromPoint(box.left + 1, box.bottom - 1)
+      let elt = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2)
+          : document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1)
       if (elt != bar) bar.style.pointerEvents = "none"
       else delay.set(1000, maybeDisable)
     }

From 0597eeef5eb0650195c005e910046ef7be48b332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <oseg@google.com>
Date: Fri, 7 Apr 2017 17:44:06 +0200
Subject: [PATCH 3255/4742] [soy mode] Don't require colon in @params

---
 mode/soy/soy.js  | 4 ++--
 mode/soy/test.js | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index ca0f6a46ab..c0198609e7 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -152,8 +152,8 @@
             return null;
 
           case "param-def":
-            if (match = stream.match(/^([\w]+)(?=:)/)) {
-              state.variables = prepend(state.variables, match[1]);
+            if (match = stream.match(/^\w+/)) {
+              state.variables = prepend(state.variables, match[0]);
               state.soyState.pop();
               state.soyState.push("param-type");
               return "def";
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 38ad7cbeb4..2a9bdb501f 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -92,4 +92,13 @@
      '  [tag&bracket </][tag div][tag&bracket >]',
      '[keyword {/template}]',
      '');
+
+  MT('allow-missing-colon-in-@param',
+     '[keyword {template] [def .foo][keyword }]',
+     '  [keyword {@param] [def showThing] [variable-3 bool][keyword }]',
+     '  [keyword {if] [variable-2 $showThing][keyword }]',
+     '    Yo!',
+     '  [keyword {/if}]',
+     '[keyword {/template}]',
+     '');
 })();

From 2474ce6e2e1254812a7800b55fb7a295dc34669b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Apr 2017 12:10:10 +0200
Subject: [PATCH 3256/4742] Mark version 5.25.2

---
 AUTHORS           |  8 ++++++++
 CHANGELOG.md      | 22 +++++++++++++++++++++-
 doc/manual.html   |  2 +-
 doc/releases.html | 13 +++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 08b2610bbe..2ac995f950 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ Abdelouahab
 Abe Fettig
 Adam Ahmed
 Adam King
+Adam Particka
 adanlobato
 Adán Lobato
 Adrian Aichner
@@ -200,6 +201,7 @@ ficristo
 Filip Noetzel
 Filip Stollár
 flack
+Florian Felten
 ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
@@ -265,6 +267,7 @@ James Campos
 James Howard
 James Thorne
 Jamie Hill
+Jamie Morris
 Jan Jongboom
 jankeromnes
 Jan Keromnes
@@ -417,6 +420,7 @@ Max Schaefer
 Max Xiantu
 mbarkhau
 McBrainy
+mce2
 melpon
 Metatheos
 Micah Dubinko
@@ -473,6 +477,7 @@ Oreoluwa Onatemowo
 Oskar Segersvärd
 pablo
 pabloferz
+Pablo Zubieta
 Page
 Panupong Pasupat
 paris
@@ -513,6 +518,7 @@ Rasmus Erik Voel Jensen
 ray ratchup
 Ray Ratchup
 Remi Nyborg
+Renaud Durlin
 Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
@@ -538,6 +544,7 @@ Sascha Peilicke
 satamas
 satchmorun
 sathyamoorthi
+Saul Costa
 S. Chris Colbert
 SCLINIC\jdecker
 Scott Aikin
@@ -635,5 +642,6 @@ Zac Anger
 Zachary Dremann
 Zeno Rocha
 Zhang Hao
+Ziv
 zziuni
 魏鹏刚
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 758a1cc03f..fa356a01cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,24 @@
-## 5.25.0 (2017-02-22)
+## 5.25.2 (2017-04-20)
+
+### Bug fixes
+
+Better handling of selections that cover the whole viewport in contentEditable-mode.
+
+No longer accidentally scroll the editor into view when calling `setValue`.
+
+Work around Chrome Android bug when converting screen coordinates to editor positions.
+
+Make sure long-clicking a selection sets a cursor and doesn't show the editor losing focus.
+
+Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Recognize annotations and TypeScript-style type parameters.
+
+[shell mode](http://codemirror.net/mode/shell/): Handle nested braces.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Make parsing of strong/em delimiters CommonMark-compliant.
+
+## 5.25.0 (2017-03-20)
 
 ### Bug fixes
 
diff --git a/doc/manual.html b/doc/manual.html
index 4895789b93..160fafad6e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.25.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.25.2</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 681876c46a..ac4a58b66c 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2017: <a href="http://codemirror.net/codemirror-5.25.2.zip">Version 5.25.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Better handling of selections that cover the whole viewport in contentEditable-mode.</li>
+    <li>No longer accidentally scroll the editor into view when calling <code>setValue</code>.</li>
+    <li>Work around Chrome Android bug when converting screen coordinates to editor positions.</li>
+    <li>Make sure long-clicking a selection sets a cursor and doesn't show the editor losing focus.</li>
+    <li>Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Recognize annotations and TypeScript-style type parameters.</li>
+    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Handle nested braces.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Make parsing of strong/em delimiters CommonMark-compliant.</li>
+  </ul>
+
   <p class="rel">20-03-2017: <a href="http://codemirror.net/codemirror-5.25.0.zip">Version 5.25.0</a>:</p>
 
   <ul class=rel-note>
diff --git a/index.html b/index.html
index 6e3673188a..e021d17334 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.25.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.25.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 7d4c6943a2..111b77a4f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.25.1",
+  "version": "5.25.2",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index f1553f0baf..531d030046 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.25.1"
+CodeMirror.version = "5.25.2"

From 413ab86d4af5dd694a7c2aaef0027f2c5e1a6b61 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Apr 2017 12:11:35 +0200
Subject: [PATCH 3257/4742] Bump version post-5.25.2

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 160fafad6e..62d1801c8d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.25.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.25.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 111b77a4f1..dbff5cbdf8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.25.2",
+  "version": "5.25.3",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index 531d030046..e9dd8b8ae9 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.25.2"
+CodeMirror.version = "5.25.3"

From 63999b89192fedede7479b505175fb6f796447c4 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <sam.rawlins@gmail.com>
Date: Thu, 20 Apr 2017 12:42:22 -0700
Subject: [PATCH 3258/4742] [dart mode] Add 'covariant' keyword

Dart 1.22 added a new keyword: covariant. http://news.dartlang.org/2017/02/dart-122-faster-tools-assert-messages.html
---
 mode/dart/dart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 8d383a95ef..398f5ef3b5 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -13,7 +13,7 @@
 
   var keywords = ("this super static final const abstract class extends external factory " +
     "implements get native operator set typedef with enum throw rethrow " +
-    "assert break case continue default in return new deferred async await " +
+    "assert break case continue default in return new deferred async await covariant " +
     "try catch finally do else for if switch while import library export " +
     "part of show hide is as").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");

From 5abad5fe5b3e3c856a452199b30020ab3f935262 Mon Sep 17 00:00:00 2001
From: Jaimin <jaimin9999@gmail.com>
Date: Thu, 20 Apr 2017 15:32:40 -0400
Subject: [PATCH 3259/4742] [real-world uses] Add markdown editor built using
 CodeMirror

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

diff --git a/doc/realworld.html b/doc/realworld.html
index ca8f5c79ba..73246fc450 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -116,6 +116,7 @@ <h2>CodeMirror real-world uses</h2>
       <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>
+      <li><a href="https://github.com/TuvaLabs/markdown-delight-editor">Markdown Delight Editor</a> (extensible markdown editor polymer component)</li>
       <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>
       <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
       <li><a href="http://www.iunbug.com/mihtool">MIHTool</a> (iOS web-app debugging tool)</li>

From 00f59d1a50ecbd3ff0fcc0ea55d91871c863efda Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Thu, 2 Mar 2017 14:43:19 +1100
Subject: [PATCH 3260/4742] add tests for situation, where type should not be
 parsed as a keyword

---
 mode/javascript/test.js | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 9abbf365c4..06c44bf6ae 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -231,10 +231,10 @@
     test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))
   }
 
-  TS("extend_type",
+  TS("typescript_extend_type",
      "[keyword class] [def Foo] [keyword extends] [variable-3 Some][operator <][variable-3 Type][operator >] {}")
 
-  TS("arrow_type",
+  TS("typescript_arrow_type",
      "[keyword let] [def x]: ([variable arg]: [variable-3 Type]) [operator =>] [variable-3 ReturnType]")
 
   TS("typescript_class",
@@ -289,12 +289,30 @@
      "  [property prop1]: [variable-3 any];",
      "}");
 
-  TS("generic_class",
+  TS("typescript_generic_class",
      "[keyword class] [def Foo][operator <][variable-3 T][operator >] {",
      "  [property bar]() {}",
      "  [property foo](): [variable-3 Foo] {}",
      "}")
 
+  TS("typescript_type_when_keyword",
+     "[keyword export] [keyword type] [variable-3 AB] [operator =] [variable-3 A] [operator |] [variable-3 B];",
+     "[keyword type] [variable-3 Flags] [operator =] {",
+     "  [property p1]: [variable-3 string];",
+     "  [property p2]: [variable-3 boolean];",
+     "};")
+
+  TS("typescript_type_when_not_keyword",
+     "[keyword class] [def HasType] {",
+     "  [property type]: [variable-3 string];",
+     "  [property constructor]([def type]: [variable-3 string]) {",
+     "    [keyword this].[property type] [operator =] [variable-2 type];",
+     "  }",
+     "  [property setType]({ [def type] }: { [property type]: [variable-3 string]; }) {",
+     "    [keyword this].[property type] [operator =] [variable-2 type];",
+     "  }",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 486507818ab7d4e10198683122f92a3bad6c7c3d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Apr 2017 08:11:41 +0200
Subject: [PATCH 3261/4742] [javascript mode] Make TS type a contextual keyword

Issue #4622
---
 mode/javascript/javascript.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 7c09476b3d..3b203f64f8 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -54,7 +54,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         "namespace": C,
         "module": kw("module"),
         "enum": kw("module"),
-        "type": kw("type"),
 
         // scope modifiers
         "public": kw("modifier"),
@@ -361,7 +360,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     if (type == "function") return cont(functiondef);
     if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
-    if (type == "variable") return cont(pushlex("stat"), maybelabel);
+    if (type == "variable") {
+      if (isTS && value == "type") {
+        cx.marked = "keyword"
+        return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
+      } else {
+        return cont(pushlex("stat"), maybelabel);
+      }
+    }
     if (type == "switch") return cont(pushlex("form"), parenExpr, pushlex("}", "switch"), expect("{"),
                                       block, poplex, poplex);
     if (type == "case") return cont(expression, expect(":"));
@@ -372,7 +378,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
     if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
-    if (type == "type") return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
     if (type == "async") return cont(statement)
     if (value == "@") return cont(expression, statement)
     return pass(pushlex("stat"), expression, expect(";"), poplex);

From ffd2d8227361385d0d3f250af0e41c5a24222231 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Apr 2017 11:31:06 +0200
Subject: [PATCH 3262/4742] [julia mode] Make sure parser doesn't get stuck in
 annotation

Closes #4701
---
 mode/julia/julia.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index ad11d6b945..a8b114a723 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -288,7 +288,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       state.nestedLevels--;
     }
     if (state.nestedLevels > 0) {
-      stream.match(/.*?(?={|})/);
+      stream.match(/.*?(?={|})/) || stream.next();
     } else if (state.nestedLevels == 0) {
       state.tokenize = tokenBase;
     }

From 322a80b763a4401709cd06c977eec0c64d0d1d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ars=C3=A8ne=20von=20Wyss?= <avw@gmx.ch>
Date: Fri, 21 Apr 2017 14:12:23 +0200
Subject: [PATCH 3263/4742] [markdown mode] Fix error in linkRE regular
 expression literal

The original character class `[^\\\[\\]]` escapes `\\` instead of `\]`
(e.g. it would be the character class `[^\\\[]` followed by a `]`
which I think is wrong).
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 6060ae3716..caf0339eb6 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -603,7 +603,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var linkRE = {
     ")": /^(?:[^\\\(\)]|\\.|\((?:[^\\\(\)]|\\.)*\))*?(?=\))/,
-    "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\\]]|\\.)*\])*?(?=\])/
+    "]": /^(?:[^\\\[\]]|\\.|\[(?:[^\\\[\]]|\\.)*\])*?(?=\])/
   }
 
   function getLinkHrefInside(endChar) {

From 4bfec4e6f4c01f621d4c95d0fa7679dbd795e715 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 25 Apr 2017 11:10:41 +0200
Subject: [PATCH 3264/4742] Update paypal link

---
 index.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/index.html b/index.html
index e021d17334..527eb8ad48 100644
--- a/index.html
+++ b/index.html
@@ -106,11 +106,7 @@ <h2>This is CodeMirror</h2>
       maintainers need to subsist.<br>
       Current funding status = <img src="https://marijnhaverbeke.nl/fund/status_s.png" title="Current maintainer happiness" style="vertical-align: middle; height: 16px; width: 16px"><br>
       You can help <a href="https://marijnhaverbeke.nl/fund/" title="Set up a monthly contribution">per month</a> or
-      <a title="Donate with PayPal" href="javascript:document.getElementById('paypal').submit();">once</a>.
-      <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal">
-        <input type="hidden" name="cmd" value="_s-xclick"/>
-        <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/>
-      </form>
+      <a title="Donate with PayPal" href="https://www.paypal.me/marijnhaverbeke">once</a>.
     </div>
   </div>
 

From 3a462875f4a8c85576da9015b63943a1ae2b66a6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 25 Apr 2017 16:01:10 +0200
Subject: [PATCH 3265/4742] Clean up and optimize SVG logo

---
 doc/logo.svg | 200 +++++----------------------------------------------
 1 file changed, 19 insertions(+), 181 deletions(-)

diff --git a/doc/logo.svg b/doc/logo.svg
index 0aa6323f9e..b39b24c811 100644
--- a/doc/logo.svg
+++ b/doc/logo.svg
@@ -1,181 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="640"
-   height="640"
-   xml:space="preserve"
-   sodipodi:docname="logo.svg"
-   inkscape:export-filename="/home/marijn/src/js/codemirror/doc/logo.png"
-   inkscape:export-xdpi="16.601332"
-   inkscape:export-ydpi="16.601332"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath16"><path
-         d="M 0,512 512,512 512,0 0,0 0,512 z"
-         id="path18" /></clipPath><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath40"><path
-         d="m 435.607,369.899 31.242,0 0,-64.782 -31.242,0 0,64.782 z"
-         id="path42" /></clipPath><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath56"><path
-         d="m 421.796,349.477 39.074,0 0,-88.423 -39.074,0 0,88.423 z"
-         id="path58" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="875"
-     id="namedview4"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="0.52149125"
-     inkscape:cx="303.572"
-     inkscape:cy="574.48012"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g10" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="2014-10_codeMirror_logo_vectors"
-     transform="matrix(1.25,0,0,-1.25,0,640)"><path
-       inkscape:connector-curvature="0"
-       id="path22"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 233.97976,469.37438 c 0,0 7.01353,-14.94848 -2.94916,-31.42373 -4.97925,-8.23417 -130.50847,-34.94915 -179.50847,-102.94915 -30,-47 -76,-183 71,-273 66,-34 94,-33 94,-33 0,0 -44,31 -16,52 28,21 69,31 80,60 13,-10 34,-31 54,-29 -2,13 -7,18 9,20 16,2 24,2 24,2 0,0 -15,12 -32,13 -17,1 -49,34 -48,48 21,12 48,32 64,26 16,-6 32,-16 35,-25 0,-6 -3,-16 10,-8 13,8 10,13 15,24 5,11 6,13 -5,22 -11,9 -37,30 -58,24 -21,-6 -65,-23 -87,-2 9,20 23,52 16,74 13,10 28,21 30,39 15,2 47,11 41,27 -6,16 -48.59322,87.16949 -113.59322,73.16949"
-       sodipodi:nodetypes="cscccsccscscscsssscccsc" /><path
-       inkscape:connector-curvature="0"
-       id="path26"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 441.52213,306.0015 c 11,29 29,78 12,80 -17,2 -36,-44 -41,-56 -5,-12 -25,-72 -14,-80 11,-8 43,56 43,56" /><path
-       inkscape:connector-curvature="0"
-       id="path30"
-       style="fill:#da687d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 348.52213,384.0015 c 3.13,4.919 5.82086,0.64508 -7.67914,-0.35492 -13.5,-1 -29.62196,-5.18461 -32.38899,-11.04836 -5.19174,-11.00208 -6.93187,-38.09672 -26.43187,-44.09672 -1,-7 0,-23 27.5,-26 27.5,-3 28.5,15 44.5,14.5 16,-0.5 14.5,5.5 9,10 -5.5,4.5 -24.5,35 -24.5,45 0,10 6.5,6.5 10,12"
-       sodipodi:nodetypes="csscssssc" /><path
-       inkscape:connector-curvature="0"
-       id="path34"
-       style="fill:#da687d;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 103.02213,82.502 c 0,0 -8.5,22.5 16.5,34.5 25,12 47.5,2.5 52,-6 4.5,-8.5 -7.5,-42.5 -50.5,-43 -10.5,8.5 -18,14.5 -18,14.5" /><g
-       id="g38"
-       transform="translate(-21.47687,0)" /><g
-       id="g44"
-       transform="translate(-21.47687,0)"><g
-         style="opacity:0.69999701"
-         id="g46"
-         clip-path="url(#clipPath40)"><g
-           id="g48"
-           transform="translate(466.2583,369.8384)"><path
-             inkscape:connector-curvature="0"
-             id="path50"
-             style="fill:#da687d;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="M 0,0 C 0.423,-1.569 0.298,-3.199 0.255,-4.838 0.213,-6.452 0.062,-8.15 -0.349,-9.801 c 0.106,-0.377 -0.082,-0.814 -0.018,-1.201 -0.41,-0.515 -0.194,-0.903 -0.284,-1.354 0.661,-0.674 1.522,-1.313 1.152,-2.162 -0.259,-0.596 -0.874,-0.706 -1.464,-0.995 -0.389,-1.403 -0.709,-3.099 -1.028,-4.649 -0.097,-0.476 -0.044,-1.051 -0.187,-1.485 -0.334,-1.01 -0.691,-1.978 -0.971,-3.09 -0.237,-0.945 0.034,-2.689 -1.063,-2.811 -0.423,-1.049 -0.663,-1.841 -1.165,-2.83 -0.286,-0.163 -0.452,0.106 -0.692,0.009 -0.305,-0.348 -0.294,-0.823 -0.577,-1.114 -0.222,-0.229 -0.503,-0.163 -0.665,-0.385 -0.363,-0.5 -0.266,-1.24 -0.523,-1.902 -0.468,-0.4 -0.862,-0.905 -1.147,-1.478 -0.588,-1.179 -0.698,-2.681 -1.591,-3.593 -0.28,-0.286 -0.761,-0.365 -1.011,-0.647 -0.238,-0.269 -0.455,-0.665 -0.689,-0.98 -0.338,-0.452 -0.669,-1.045 -0.972,-1.583 -1.004,-1.787 -2.383,-3.71 -3.301,-5.664 -0.173,-0.369 -0.199,-0.805 -0.364,-1.165 -0.381,-0.827 -0.943,-1.579 -1.257,-2.333 -0.516,-1.239 -1.31,-3.339 -2.538,-4.42 -0.149,-0.131 -0.473,-0.254 -0.606,-0.414 -0.179,-0.215 -0.136,-0.568 -0.32,-0.808 -0.086,-0.113 -0.4,-0.164 -0.537,-0.302 -0.208,-0.211 -0.306,-0.481 -0.479,-0.639 -0.426,-0.388 -1.015,-0.555 -1.381,-0.959 -0.277,-0.306 -0.397,-0.743 -0.692,-1.127 -0.318,-0.413 -0.761,-0.784 -1.09,-1.202 -0.994,-1.264 -1.38,-2.8 -2.702,-3.396 -0.393,-0.178 -0.88,-0.12 -1.291,-0.241 -0.374,0.344 -0.078,0.818 -0.163,1.164 -0.055,0.222 -0.285,0.382 -0.346,0.583 -0.143,0.474 -0.347,1.336 -0.34,1.878 0.007,0.538 0.305,0.971 0.375,1.612 0.061,0.549 -0.137,1.246 -0.177,1.856 -0.021,0.306 0.064,0.624 0.059,0.956 -0.008,0.533 -0.066,0.801 0.008,1.442 0.086,0.743 -0.074,1.462 -0.171,2.152 0.342,1.705 0.531,3.008 1.09,4.919 0.258,0.881 0.721,2.367 1.18,3.346 0.886,1.895 1.64,3.964 2.6,5.945 0.319,0.656 0.825,1.196 1.139,1.852 0.182,0.381 0.211,0.828 0.395,1.215 1.617,3.398 3.877,6.233 5.565,9.731 1.399,2.859 2.88,5.418 4.745,8.545 0.842,1.415 1.568,2.917 2.434,4.086 0.66,0.891 1.632,2.413 2.334,3.916 0.278,0.596 0.269,1.073 1.005,1.102 0.758,0.948 1.326,2.018 2.119,2.824 0.2,0.202 0.51,0.303 0.733,0.498 0.26,0.228 0.383,0.57 0.638,0.778 0.541,0.441 1.432,0.832 2.035,1.659 0.16,0.22 0.229,0.451 0.406,0.682 0.414,0.539 1.191,1.866 1.81,2.013 C -0.241,0.085 -0.126,0.061 0,0" /></g></g></g><g
-       id="g54"
-       transform="translate(-21.47687,0)" /><g
-       id="g60"
-       transform="translate(-21.47687,0)"><g
-         style="opacity:0.69999701"
-         id="g62"
-         clip-path="url(#clipPath56)"><g
-           id="g64"
-           transform="translate(459.8965,349.4487)"><path
-             inkscape:connector-curvature="0"
-             id="path66"
-             style="fill:#da687d;fill-opacity:1;fill-rule:evenodd;stroke:none"
-             d="m 0,0 c 0.688,-1.936 0.765,-4.106 0.935,-6.266 -0.019,-2.14 -0.168,-4.579 -0.715,-6.943 0.098,-0.492 -0.155,-1.108 -0.109,-1.623 -0.519,-0.752 -0.295,-1.25 -0.438,-1.876 0.718,-0.835 1.666,-1.609 1.155,-2.836 -0.37,-0.846 -1.118,-1.037 -1.845,-1.479 -0.64,-1.905 -1.226,-4.263 -1.846,-6.305 -0.187,-0.635 -0.212,-1.395 -0.447,-1.977 -0.547,-1.362 -1.111,-2.656 -1.597,-4.101 -0.416,-1.238 -0.356,-3.498 -1.652,-3.689 -0.61,-1.355 -0.978,-2.373 -1.674,-3.651 -0.35,-0.217 -0.512,0.119 -0.801,-0.013 -0.392,-0.456 -0.442,-1.063 -0.795,-1.445 -0.269,-0.298 -0.585,-0.226 -0.785,-0.514 -0.449,-0.651 -0.386,-1.58 -0.723,-2.425 -0.282,-0.266 -0.546,-0.564 -0.784,-0.888 -0.119,-0.162 -0.233,-0.33 -0.337,-0.505 l -0.153,-0.266 -0.072,-0.136 -0.034,-0.069 -0.003,-0.004 0,-10e-4 c 0.099,0.238 0.028,0.066 0.05,0.119 l -10e-4,-0.002 -0.001,-10e-4 -0.004,-0.01 -0.008,-0.019 -0.016,-0.037 c -0.697,-1.635 -0.851,-3.63 -1.895,-4.955 -0.335,-0.421 -0.872,-0.577 -1.142,-0.971 -0.259,-0.375 -0.491,-0.912 -0.746,-1.347 -0.366,-0.625 -0.722,-1.432 -1.046,-2.164 -1.085,-2.456 -2.571,-5.274 -3.572,-8.03 -0.188,-0.523 -0.205,-1.106 -0.385,-1.617 -0.422,-1.173 -1.022,-2.273 -1.394,-3.342 -0.626,-1.753 -1.474,-4.727 -3.01,-6.377 -0.182,-0.2 -0.567,-0.415 -0.732,-0.65 -0.22,-0.315 -0.191,-0.786 -0.42,-1.137 -0.106,-0.164 -0.475,-0.275 -0.642,-0.48 -0.254,-0.313 -0.383,-0.69 -0.594,-0.926 -0.503,-0.581 -1.23,-0.865 -1.714,-1.438 -0.365,-0.435 -0.562,-1.029 -0.958,-1.568 -0.426,-0.578 -0.991,-1.104 -1.428,-1.683 -0.65,-0.928 -1.251,-1.786 -1.828,-2.608 -0.592,-0.813 -1.215,-1.514 -2.047,-1.884 -0.495,-0.219 -1.042,-0.12 -1.539,-0.256 -0.353,0.473 0.086,1.071 0.061,1.524 -0.018,0.288 -0.25,0.504 -0.28,0.766 -0.07,0.615 -0.141,1.712 -0.035,2.387 0.099,0.676 0.548,1.191 0.712,2.005 0.125,0.708 -0.034,1.591 -0.025,2.359 0.004,0.387 0.13,0.791 0.153,1.206 0.038,0.668 -0.008,0.999 0.13,1.795 0.163,0.922 -0.034,1.854 -0.121,2.709 0.426,2.191 0.686,3.806 1.265,6.362 0.273,1.176 0.786,3.104 1.265,4.488 0.472,1.315 0.904,2.681 1.347,4.063 0.445,1.4 0.906,2.841 1.424,4.249 0.347,0.939 0.896,1.734 1.274,2.728 0.213,0.565 0.249,1.192 0.465,1.767 0.475,1.25 0.99,2.514 1.541,3.656 0.553,1.123 1.13,2.228 1.711,3.336 l 0.938,1.807 c 0.326,0.58 0.653,1.161 0.981,1.745 0.649,1.172 1.283,2.367 1.886,3.609 1.027,1.966 2.073,3.828 3.188,5.725 1.116,1.844 2.324,3.757 3.629,5.817 1.158,1.853 2.248,3.825 3.357,5.355 0.827,1.167 2.173,3.163 3.042,5.126 0.342,0.78 0.349,1.38 1.197,1.482 0.907,1.274 1.649,2.697 2.452,3.773 0.214,0.276 0.563,0.445 0.808,0.722 0.286,0.323 0.408,0.762 0.693,1.065 0.582,0.653 1.672,1.277 2.21,2.569 0.151,0.332 0.198,0.653 0.368,1.006 0.397,0.822 1.098,2.779 1.78,3.145 C -0.284,0.044 -0.151,0.044 0,0" /></g></g></g><path
-       inkscape:connector-curvature="0"
-       id="path70"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 416.68863,327.0015 c 0,0 -8,-30.667 -4.667,-56 0.667,8 4.667,56 4.667,56" /><path
-       inkscape:connector-curvature="0"
-       id="path74"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 426.18913,347.7256 c -0.61,2.147 -4.597,-59.478 -3.432,-61.636 1.166,-2.159 7.147,48.575 3.432,61.636" /><path
-       inkscape:connector-curvature="0"
-       id="path78"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 235.24913,465.60369 c 0,0 4.667,-26.6198 -38.667,-40.6198 -43.333,-14 -103.0605,-25.98239 -147.0605,-78.64939 -44.0000004,-52.666 -52.0000004,-139.999 -22,-197.333 30,-57.333 103.333,-128.667 235.333,-128.667 132,0 236.85312,101.50582 236.85312,171.50582 0,36.667 -20.1469,28.4918 -27.11433,-5.90828 C 466.30468,154.88286 408.18863,39.0015 262.18863,39.0015 c -146,0 -220.667,88.667 -230,164.667 -9.334,76 11.898969,141.46925 88.56597,180.80225 76.667,39.334 125.32039,23.66435 114.65339,80.99735"
-       sodipodi:nodetypes="cssssssscsc" /><path
-       inkscape:connector-curvature="0"
-       id="path82"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 198.85713,260.335 c 0,0 -8.667,-40.001 -50.667,-59.333 -42,-19.334 -60,-30 -66,-63.334 16,26.666 62.667,32 88.667,58 26,26 28,64.667 28,64.667" /><path
-       inkscape:connector-curvature="0"
-       id="path86"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 210.19013,353.0015 c 0,0 36,-46.667 78.667,-24 42.666,22.667 20.667,75.333 20,78.667 -0.667,3.333 4.666,-58.667 -27.334,-69.334 -32,-10.666 -71.333,14.667 -71.333,14.667" /><path
-       inkscape:connector-curvature="0"
-       id="path90"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 116.18913,74.3359 c 0,0 22.666,-1.334 39.333,17.332 16.667,18.668 7.334,48 34.667,58.668 27.333,10.666 46,4 46,4 0,0 -48.667,-6.668 -52.667,-34.668 -4,-28 -10.666,-40.666 -21.333,-49.332 -10.667,-8.668 -24.667,-10 -24.667,-10 l -21.333,14 z" /><path
-       inkscape:connector-curvature="0"
-       id="path94"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 219.02213,219.502 c 0,0 40.523,6.783 59,48 15.167,33.833 5,63 5,63 l -20.5,-3 c 0,0 8.5,-24.5 2,-46.5 -6.5,-22 -21.5,-47.5 -45.5,-61.5" /><path
-       inkscape:connector-curvature="0"
-       id="path98"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 437.13303,313.1621 c -14.461,-36.13 -35.773,-62.068 -38.265,-60.674 -4.494,2.513 -0.358,34.036 14.104,70.166 14.46,36.13 32.432,63.635 39.104,61.014 6.672,-2.621 -0.483,-34.376 -14.943,-70.506 m 20.999,72.506 c -16.442,8.934 -36.644,-24.449 -53.276,-63.334 -16.633,-38.885 -18.542,-70.229 -5.759,-75.836 17.092,-7.496 33.127,22.285 49.759,61.17 16.632,38.885 24,70 9.276,78" /><path
-       inkscape:connector-curvature="0"
-       id="path102"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 159.52163,189.668 c 0,0 10.331,-31.037 62,-24.666 48.667,6 69.59,24.744 99.333,43.334 21.334,13.332 20,7.332 22.667,6.666 2.667,-0.666 14.667,-8 27.333,-6.666 0.667,-6.668 -5.999,-1.334 -8.666,-7.334 -1.333,-4 10.12,-22.824 26.666,-20 27.334,4.666 19.667,16 25.001,28.666 5.333,12.666 9,19.334 -17.667,37.334 -20.667,18.666 -32,13.999 -42,13.999 -10,0 -36,-13.999 -54,-10.666 -18,3.333 -29.334,10 -29.334,10 l -11.999,-13.333 c 0,0 21.999,-16.666 47.333,-10.666 25.333,6 44.001,25.332 66.001,15.332 22,-10 26.282,-16.701 32.999,-21.666 7.667,-5.668 8.333,-11.666 3,-17 -5.334,-5.334 0.001,-9.334 -3.332,-15.334 -3.334,-6 -20,-8.666 -20,-8.666 0,0 18.273,23.477 -4,25.332 -16,1.334 -26,22.668 -48.667,11.334 -32.55,-16.277 -78.668,-44 -110.668,-47.332 -31.193,-3.248 -42.667,6.666 -50.667,25.332 -9.333,-8 -11.333,-14 -11.333,-14" /><path
-       inkscape:connector-curvature="0"
-       id="path106"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 274.18863,183.002 c 0,0 22.667,-12 16,-38 -6.667,-26 -36.667,-44 -56,-52.668 -19.333,-8.666 -33.743,-20.127 -19.333,-27.332 12,-6 18.667,9.334 36,12 17.333,2.666 32.667,-4 34,-14 -7.334,4 -12.667,4 -12.667,4 0,0 6,-4 6.667,-10.668 0.666,-6.666 -0.667,-3.332 -4.667,-3.332 -10,0 -11.333,8.666 -20,7.332 -22,-2 -23.333,-11.334 -35.333,-12.666 -12,-1.334 -32,5.334 -29.334,20.666 2.667,15.334 23.334,26 42.667,34 19.333,8 48.667,33.334 44.667,56 -4,22.668 -21.334,18 -21.334,18 l 18.667,6.668 z" /><path
-       inkscape:connector-curvature="0"
-       id="path110"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 331.02213,371.7515 c 0,0 9.5,-4.75 15.5,-28.75 4,-8.667 9.333,-15.667 14,-17.667 4.667,-2 -2,-4 -5.333,-3.333 -3.334,0.667 -10.334,3.667 -15,-0.333 -4.667,-4 -16,-14.667 -32,-12 -16,2.666 -29.667,12.833 -29.667,12.833 0,0 6,-26.5 41.667,-24.833 24.721,1.155 19.333,14 36,16.666 16.666,2.667 14.893,11.089 11.333,18 -5.667,11 -23.333,13.667 -25.333,45.834 -2,3.333 -14.5,-0.417 -11.167,-6.417" /><path
-       inkscape:connector-curvature="0"
-       id="path114"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 388.01383,204.4707 c 1.506,-1.477 -11.825,-31.469 -11.825,-31.469 0,0 -2.667,-7.334 -9.814,-4.75 -7.311,2.645 -5.413,7.948 -5.413,7.948 l 17.026,30.837 c 0,0 9.353,-1.906 10.026,-2.566" /><path
-       inkscape:connector-curvature="0"
-       id="path118"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 406.74623,247.168 c -0.667,-2 -3.333,-10 -3.333,-10 l -10.891,8.334 2.891,6.332 11.333,-4.666 z" /><path
-       inkscape:connector-curvature="0"
-       id="path122"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 284.85563,189.002 c -2,-7.334 23.333,-50.002 40.667,-47.334 17.333,2.666 19.999,-2.668 14.666,-6 -5.333,-3.334 -14.666,-4.668 -13.333,-9.334 1.333,-4.666 5,-9.334 -3.667,-8 -8.666,1.334 -26.333,10.668 -37,28.668 -3.333,-10.668 -4.666,-14 -4.666,-14 0,0 34,-35.334 68.666,-20.668 -6,4.668 -22.666,3.334 -8.666,11.334 14,8 24.666,10.666 31.333,-2 3.333,0.666 3.333,30 -40.667,28 -15.333,2 -36,32 -36,47.334 -4,-4 -9.333,-0.666 -11.333,-8" /><path
-       inkscape:connector-curvature="0"
-       id="path126"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 420.44553,336.5015 c 0,0 -8.75,-26.286 -5.104,-48 0.729,6.857 5.104,48 5.104,48" /><path
-       inkscape:connector-curvature="0"
-       id="path130"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 429.40543,352.0503 c -0.444,1.66 -4.07,-45.761 -3.203,-47.435 0.868,-1.673 5.909,37.339 3.203,47.435" /><path
-       inkscape:connector-curvature="0"
-       id="path134"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 312.85513,378.335 c 0,0 37.667,3.333 31,18.333 -20.105,45.239 -58.333,71.667 -129,69 40,16 74.00021,14.00025 106.667,-14 16.33311,-13.99988 23.89324,-31.04069 29.74979,-44.08296 9.34044,-20.80074 6.58914,-22.74696 -3.74979,-28.58304 -12.56847,-7.0946 -34.191,-2.57 -34.667,-0.667"
-       sodipodi:nodetypes="cccsssc" /><path
-       inkscape:connector-curvature="0"
-       id="path138"
-       style="fill:#2d2b2c;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 316.7084,372.58242 c 0,0 10.36415,-7.13802 18.50215,-1.32602 3.74086,3.84884 6.23323,5.95026 -4.37137,5.51213 l -12.90479,0.52875 c -8.94116,1.82452 -8.7647,-0.93753 -1.22599,-4.71486 z"
-       sodipodi:nodetypes="ccccc" /></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="640" height="640">
+  <path d="M292.4 53.2s8.7 18.6-3.6 39.2c-6.2 10.2-163.1 43.6-224.3 128.6-37.5 58.7-95 228.7 88.7 341.2 82.5 42.5 117.5 41.2 117.5 41.2s-55-38.7-20-65 86.2-38.7 100-75c16.2 12.5 42.5 38.7 67.5 36.2-2.5-16.2-8.7-22.5 11.2-25s30-2.5 30-2.5-18.7-15-40-16.2-61.2-42.5-60-60c26.2-15 60-40 80-32.5s40 20 43.7 31.2c0 7.5-3.7 20 12.5 10s12.5-16.2 18.7-30 7.5-16.2-6.2-27.5-46.2-37.5-72.5-30-81.2 28.7-108.7 2.5c11.2-25 28.7-65 20-92.5 16.2-12.5 35-26.2 37.5-48.7 18.7-2.5 58.7-13.7 51.2-33.7S374.9 36.0 293.6 53.5" fill="#fff"/>
+  <path d="M551.9 257.4c13.7-36.2 36.2-97.5 15-100s-45 55-51.2 70-31.2 90-17.5 100 53.7-70 53.7-70" fill="#fff"/>
+  <path d="M435.6 159.9c3.9-6.1 7.2-.8-9.6.4-16.8 1.2-37.0 6.4-40.4 13.8-6.4 13.7-8.6 47.6-33.0 55.1-1.2 8.7 0 28.7 34.3 32.5s35.6-18.7 55.6-18.1 18.1-6.8 11.2-12.5-30.6-43.7-30.6-56.2 8.1-8.1 12.5-15M128.7 536.8s-10.6-28.1 20.6-43.1 59.3-3.1 65 7.5-9.3 53.1-63.1 53.7c-13.1-10.6-22.5-18.1-22.5-18.1" fill="#da687d"/>
+  <g opacity=".7" transform="matrix(1.25 0 0 -1.25 -26.846 640)">
+    <path d="M466.2 369.8c.4-1.5.2-3.1.2-4.8-.0-1.6-.1-3.3-.6-4.9.1-.3-.0-.8-.0-1.2-.4-.5-.1-.9-.2-1.3.6-.6 1.5-1.3 1.1-2.1-.2-.5-.8-.7-1.4-.9-.3-1.4-.7-3.0-1.0-4.6-.0-.4-.0-1.0-.1-1.4-.3-1.0-.6-1.9-.9-3.0-.2-.9.0-2.6-1.0-2.8-.4-1.0-.6-1.8-1.1-2.8-.2-.1-.4.1-.6.0-.3-.3-.2-.8-.5-1.1-.2-.2-.5-.1-.6-.3-.3-.5-.2-1.2-.5-1.9a4.7 4.7 0 0 1-1.1-1.4c-.5-1.1-.6-2.6-1.5-3.5-.2-.2-.7-.3-1.0-.6-.2-.2-.4-.6-.6-.9-.3-.4-.6-1.0-.9-1.5-1.0-1.7-2.3-3.7-3.3-5.6-.1-.3-.2-.8-.3-1.1-.3-.8-.9-1.5-1.2-2.3-.5-1.2-1.3-3.3-2.5-4.4-.1-.1-.4-.2-.6-.4-.1-.2-.1-.5-.3-.8-.0-.1-.4-.1-.5-.3-.2-.2-.3-.4-.4-.6-.4-.3-1.0-.5-1.3-.9-.2-.3-.3-.7-.6-1.1-.3-.4-.7-.7-1.0-1.2-.9-1.2-1.3-2.8-2.7-3.3-.3-.1-.8-.1-1.2-.2-.3.3-.0.8-.1 1.1-.0.2-.2.3-.3.5-.1.4-.3 1.3-.3 1.8.0.5.3.9.3 1.6.0.5-.1 1.2-.1 1.8-.0.3.0.6.0.9-.0.5-.0.8.0 1.4.0.7-.0 1.4-.1 2.1.3 1.7.5 3.0 1.0 4.9.2.8.7 2.3 1.1 3.3.8 1.8 1.6 3.9 2.6 5.9.3.6.8 1.1 1.1 1.8.1.3.2.8.3 1.2 1.6 3.3 3.8 6.2 5.5 9.7 1.4 2.8 2.8 5.4 4.7 8.5.8 1.4 1.5 2.9 2.4 4.0.6.8 1.6 2.4 2.3 3.9.2.5.2 1.0 1.0 1.1.7.9 1.3 2.0 2.1 2.8.2.2.5.3.7.4.2.2.3.5.6.7.5.4 1.4.8 2.0 1.6.1.2.2.4.4.6.4.5 1.1 1.8 1.8 2.0.0.0.2.0.3-.0" fill="#da687d"/>
+  </g>
+  <g opacity=".7" transform="matrix(1.25 0 0 -1.25 -26.846 640)">
+    <path d="M459.8 349.4c.6-1.9.7-4.1.9-6.2-.0-2.1-.1-4.5-.7-6.9.0-.4-.1-1.1-.1-1.6-.5-.7-.2-1.2-.4-1.8.7-.8 1.6-1.6 1.1-2.8-.3-.8-1.1-1.0-1.8-1.4-.6-1.9-1.2-4.2-1.8-6.3-.1-.6-.2-1.3-.4-1.9-.5-1.3-1.1-2.6-1.5-4.1-.4-1.2-.3-3.4-1.6-3.6-.6-1.3-.9-2.3-1.6-3.6-.3-.2-.5.1-.8-.0-.3-.4-.4-1.0-.7-1.4-.2-.2-.5-.2-.7-.5-.4-.6-.3-1.5-.7-2.4a6.5 6.5 0 0 1-1.1-1.3l-.1-.2-.0-.1-.0-.0-.0-.0v-.0l.0.1-.0-.0-.0-.0-.0-.0-.0-.0-.0-.0c-.6-1.6-.8-3.6-1.8-4.9-.3-.4-.8-.5-1.1-.9-.2-.3-.4-.9-.7-1.3-.3-.6-.7-1.4-1.0-2.1-1.0-2.4-2.5-5.2-3.5-8.0-.1-.5-.2-1.1-.3-1.6-.4-1.1-1.0-2.2-1.3-3.3-.6-1.7-1.4-4.7-3.0-6.3-.1-.2-.5-.4-.7-.6-.2-.3-.1-.7-.4-1.1-.1-.1-.4-.2-.6-.4-.2-.3-.3-.6-.5-.9-.5-.5-1.2-.8-1.7-1.4-.3-.4-.5-1.0-.9-1.5-.4-.5-.9-1.1-1.4-1.6l-1.8-2.6c-.5-.8-1.2-1.5-2.0-1.8-.4-.2-1.0-.1-1.5-.2-.3.4.0 1.0.0 1.5-.0.2-.2.5-.2.7-.0.6-.1 1.7-.0 2.3.0.6.5 1.1.7 2.0.1.7-.0 1.5-.0 2.3.0.3.1.7.1 1.2.0.6-.0.9.1 1.7.1.9-.0 1.8-.1 2.7.4 2.1.6 3.8 1.2 6.3.2 1.1.7 3.1 1.2 4.4.4 1.3.9 2.6 1.3 4.0.4 1.4.9 2.8 1.4 4.2.3.9.8 1.7 1.2 2.7.2.5.2 1.1.4 1.7.4 1.2.9 2.5 1.5 3.6a147.5 147.5 0 0 0 1.7 3.3l.9 1.8c.3.5.6 1.1.9 1.7a75.5 75.5 0 0 1 1.8 3.6 129.6 129.6 0 0 0 3.1 5.7 340.1 340.1 0 0 0 3.6 5.8c1.1 1.8 2.2 3.8 3.3 5.3.8 1.1 2.1 3.1 3.0 5.1.3.7.3 1.3 1.1 1.4.9 1.2 1.6 2.6 2.4 3.7.2.2.5.4.8.7.2.3.4.7.6 1.0.5.6 1.6 1.2 2.2 2.5.1.3.1.6.3 1.0.3.8 1.0 2.7 1.7 3.1.0.0.2.0.3.0" fill="#da687d"/>
+  </g>
+  <path d="M520.8 231.2s-10 38.3-5.8 70l5.8-70m11.8-25.9c-.7-2.6-5.7 74.3-4.2 77.0 1.4 2.6 8.9-60.7 4.2-77.0" fill="#fff"/>
+  <path d="M294.0 57.9s5.8 33.2-48.3 50.7-128.8 32.4-183.8 98.3c-55 65.8-65 174.9-27.5 246.6 37.5 71.6 129.1 160.8 294.1 160.8S624.6 487.7 624.6 400.2c0-45.8-25.1-35.6-33.8 7.3-7.8 38.8-80.5 183.6-263.0 183.6-182.5 0-275.8-110.8-287.5-205.8-11.6-95 14.8-176.8 110.7-226.0 95.8-49.1 156.6-29.5 143.3-101.2" fill="#2d2b2c"/>
+  <path d="M248.5 314.5s-10.8 50.0-63.3 74.1c-52.5 24.1-75 37.5-82.5 79.1 20-33.3 78.3-40 110.8-72.5s35-80.8 35-80.8m14.1-115.8s45 58.3 98.3 30c53.3-28.3 25.8-94.1 25-98.3-.8-4.1 5.8 73.3-34.1 86.6-40 13.3-89.1-18.3-89.1-18.3M145.2 547.0s28.3 1.6 49.1-21.6c20.8-23.3 9.1-60 43.3-73.3 34.1-13.3 57.5-5 57.5-5s-60.8 8.3-65.8 43.3-13.3 50.8-26.6 61.6c-13.3 10.8-30.8 12.5-30.8 12.5l-26.6-17.5z" fill="#2d2b2c"/>
+  <path d="M273.7 365.6s50.6-8.4 73.7-60c18.9-42.2 6.2-78.7 6.2-78.7l-25.6 3.7s10.6 30.6 2.5 58.1-26.8 59.3-56.8 76.8m272.6-117.0c-18.0 45.1-44.7 77.5-47.8 75.8-5.6-3.1-.4-42.5 17.6-87.7 18.0-45.1 40.5-79.5 48.8-76.2 8.3 3.2-.6 42.9-18.6 88.1m26.2-90.6c-20.5-11.1-45.8 30.5-66.5 79.1-20.7 48.6-23.1 87.7-7.1 94.7 21.3 9.3 41.4-27.8 62.1-76.4s30-87.5 11.5-97.5" fill="#2d2b2c"/>
+  <path d="M199.4 402.9s12.9 38.7 77.5 30.8c60.8-7.5 86.9-30.9 124.1-54.1 26.6-16.6 25-9.1 28.3-8.3 3.3.8 18.3 10 34.1 8.3.8 8.3-7.4 1.6-10.8 9.1-1.6 5 12.6 28.5 33.3 25 34.1-5.8 24.5-20 31.2-35.8 6.6-15.8 11.2-24.1-22.0-46.6-25.8-23.3-40-17.4-52.5-17.4s-45 17.4-67.5 13.3-36.6-12.5-36.6-12.5l-14.9 16.6s27.4 20.8 59.1 13.3c31.6-7.5 55.0-31.6 82.5-19.1 27.5 12.5 32.8 20.8 41.2 27.0 9.5 7.0 10.4 14.5 3.7 21.2-6.6 6.6.0 11.6-4.1 19.1-4.1 7.5-25 10.8-25 10.8s22.8-29.3-5-31.6c-20-1.6-32.5-28.3-60.8-14.1-40.6 20.3-98.3 55-138.3 59.1-38.9 4.0-53.3-8.3-63.3-31.6-11.6 10-14.1 17.5-14.1 17.5" fill="#2d2b2c"/>
+  <path d="M342.7 411.2s28.3 15 20 47.5-45.8 55-70 65.8c-24.1 10.8-42.1 25.1-24.1 34.1 15 7.5 23.3-11.6 45-15 21.6-3.3 40.8 5 42.5 17.5-9.1-5-15.8-5-15.8-5s7.5 5 8.3 13.3c.8 8.3-.8 4.1-5.8 4.1-12.5 0-14.1-10.8-25-9.1-27.5 2.5-29.1 14.1-44.1 15.8-15 1.6-40-6.6-36.6-25.8 3.3-19.1 29.1-32.5 53.3-42.5 24.1-10 60.8-41.6 55.8-70-5-28.3-26.6-22.5-26.6-22.5l23.3-8.3zm71.0-235.9s11.8 5.9 19.3 35.9c5 10.8 11.6 19.5 17.5 22.0 5.8 2.5-2.5 5-6.6 4.1-4.1-.8-12.9-4.5-18.7.4s-20 18.3-40 15c-20-3.3-37.0-16.0-37.0-16.0s7.5 33.1 52.0 31.0c30.9-1.4 24.1-17.5 45-20.8 20.8-3.3 18.6-13.8 14.1-22.5-7.0-13.7-29.1-17.0-31.6-57.2-2.5-4.1-18.1.5-13.9 8.0m71.2 209.1c1.8 1.8-14.7 39.3-14.7 39.3s-3.3 9.1-12.2 5.9c-9.1-3.3-6.7-9.9-6.7-9.9l21.2-38.5s11.6 2.3 12.5 3.2m23.4-53.3l-4.1 12.5-13.6-10.4 3.6-7.9 14.1 5.8z" fill="#2d2b2c"/>
+  <path d="M356.0 403.7c-2.5 9.1 29.1 62.5 50.8 59.1 21.6-3.3 24.9 3.3 18.3 7.5-6.6 4.1-18.3 5.8-16.6 11.6 1.6 5.8 6.2 11.6-4.5 10-10.8-1.6-32.9-13.3-46.2-35.8-4.1 13.3-5.8 17.5-5.8 17.5s42.5 44.1 85.8 25.8c-7.5-5.8-28.3-4.1-10.8-14.1s30.8-13.3 39.1 2.5c4.1-.8 4.1-37.5-50.8-35-19.1-2.5-45-40-45-59.1-5 5-11.6.8-14.1 10m169.4-184.3s-10.9 32.8-6.3 60l6.3-60m11.2-19.4c-.5-2.0-5.0 57.2-4.0 59.2 1.0 2.0 7.3-46.6 4.0-59.2m-145.6-32.8s47.0-4.1 38.7-22.9c-25.1-56.5-72.9-89.5-161.2-86.2 50-20 92.5-17.5 133.3 17.5 20.4 17.5 29.8 38.8 37.1 55.1 11.6 26 8.2 28.4-4.6 35.7-15.7 8.8-42.7 3.2-43.3.8" fill="#2d2b2c"/>
+  <path d="M395.8 174.2s12.9 8.9 23.1 1.6c4.6-4.8 7.7-7.4-5.4-6.8l-16.1-.6c-11.1-2.2-10.9 1.1-1.5 5.8z" fill="#2d2b2c"/>
+</svg>

From d8a95221775d22cee7656e55abd4a84a47bea122 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 25 Apr 2017 11:19:51 +0200
Subject: [PATCH 3266/4742] Re-use setScrollLeft in operations

---
 src/display/operations.js    | 8 +-------
 src/display/scroll_events.js | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 6c4a0e1392..e18fd084c9 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -6,7 +6,6 @@ import { activeElt } from "../util/dom"
 import { finishOperation, pushOperation } from "../util/operation_group"
 
 import { ensureFocus } from "./focus"
-import { alignHorizontally } from "./line_numbers"
 import { measureForScrollbars, updateScrollbars } from "./scrollbars"
 import { setScrollLeft } from "./scroll_events"
 import { restartBlink } from "./selection"
@@ -147,12 +146,7 @@ function endOperation_finish(op) {
     display.scrollbars.setScrollTop(doc.scrollTop)
     display.scroller.scrollTop = doc.scrollTop
   }
-  if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-    doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft))
-    display.scrollbars.setScrollLeft(doc.scrollLeft)
-    display.scroller.scrollLeft = doc.scrollLeft
-    alignHorizontally(cm)
-  }
+  if (op.scrollLeft != null) setScrollLeft(cm, op.scrollLeft, true, true)
   // If we need to scroll a specific position into view, do so.
   if (op.scrollToPos) {
     let rect = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index e85d2a02fd..38d91441c0 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -18,8 +18,8 @@ export function setScrollTop(cm, val) {
 }
 // Sync scroller and scrollbar, ensure the gutter elements are
 // aligned.
-export function setScrollLeft(cm, val, isScroller) {
-  if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return
+export function setScrollLeft(cm, val, isScroller, forceScroll) {
+  if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) return
   val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
   cm.doc.scrollLeft = val
   alignHorizontally(cm)

From 6ceca7f22d2bee24b6641cadbd862b7d4228e72c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 26 Apr 2017 08:26:50 +0200
Subject: [PATCH 3267/4742] [javascript mode] Fix indentation of switch closing
 brace

Closes #4707
---
 mode/javascript/javascript.js | 4 ++--
 mode/javascript/test.js       | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 3b203f64f8..402b596c6f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -368,7 +368,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         return cont(pushlex("stat"), maybelabel);
       }
     }
-    if (type == "switch") return cont(pushlex("form"), parenExpr, pushlex("}", "switch"), expect("{"),
+    if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"),
                                       block, poplex, poplex);
     if (type == "case") return cont(expression, expect(":"));
     if (type == "default") return cont(expect(":"));
@@ -377,7 +377,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "class") return cont(pushlex("form"), className, poplex);
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
-    if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
+    if (type == "module") return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
     if (type == "async") return cont(statement)
     if (value == "@") return cont(expression, statement)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 06c44bf6ae..e15216ad7f 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -226,6 +226,12 @@
      "  [property method]: [string 'GET']",
      "});");
 
+  MT("indent_switch",
+     "[keyword switch] ([variable x]) {",
+     "  [keyword default]:",
+     "    [keyword return] [number 2]",
+     "}")
+
   var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
   function TS(name) {
     test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))

From da42969763608141375788198b30b5964a3dfe86 Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Tue, 25 Apr 2017 19:11:40 -0700
Subject: [PATCH 3268/4742] [verilog mode] Fix js object names being
 highlighted as keywords.

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

diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 460cdb3b1c..6029bc8c57 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -602,7 +602,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
             var prefix = match[1];
             var mnemonic = match[2];
             if (// is identifier prefix
-                (prefix in tlvIdentifierStyle) &&
+                tlvIdentifierStyle.hasOwnProperty(prefix) &&
                 // has mnemonic or we're at the end of the line (maybe it hasn't been typed yet)
                 (mnemonic.length > 0 || stream.eol())) {
               style = tlvIdentifierStyle[prefix];

From 47be2933a5615ad04008881035f92cf28d389afc Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Wed, 26 Apr 2017 13:40:34 +1000
Subject: [PATCH 3269/4742] typescript: add failing test for generics

---
 mode/javascript/test.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index e15216ad7f..13b7d12819 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -319,6 +319,11 @@
      "  }",
      "}")
 
+  TS("typescript_function_generics",
+     "[keyword function] [def a]() {}",
+     "[keyword function] [def b][operator <][variable-3 IA] [keyword extends] [variable-3 object], [variable-3 IB] [keyword extends] [variable-3 object][operator >]() {}",
+     "[keyword function] [def c]() {}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From fed7992fca0945a21e8973b32ca0c461b6dd33a4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 26 Apr 2017 10:04:06 +0200
Subject: [PATCH 3270/4742] [javascript mode] Allow extends in type expressions

Issue #4710
---
 mode/javascript/javascript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 402b596c6f..4316078ed7 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -571,6 +571,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
     if (value == "|" || type == ".") return cont(typeexpr)
     if (type == "[") return cont(expect("]"), afterType)
+    if (value == "extends") return cont(typeexpr)
   }
   function vardef() {
     return pass(pattern, maybetype, maybeAssign, vardefCont);

From 0ad53e0a74871babb84ae7e6fc81ecd6614b4e35 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 26 Apr 2017 09:38:10 +0200
Subject: [PATCH 3271/4742] Reuse setScrollTop

---
 src/display/operations.js    |  9 +++------
 src/display/scroll_events.js | 16 +++++++++++-----
 src/display/scrollbars.js    |  4 ++--
 src/display/scrolling.js     |  6 +++---
 src/edit/CodeMirror.js       |  4 ++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index e18fd084c9..566eb5aa85 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -7,7 +7,7 @@ import { finishOperation, pushOperation } from "../util/operation_group"
 
 import { ensureFocus } from "./focus"
 import { measureForScrollbars, updateScrollbars } from "./scrollbars"
-import { setScrollLeft } from "./scroll_events"
+import { setScrollLeft, setScrollTop } from "./scroll_events"
 import { restartBlink } from "./selection"
 import { maybeScrollWindow, scrollPosIntoView } from "./scrolling"
 import { DisplayUpdate, maybeClipScrollbars, postUpdateDisplay, setDocumentHeight, updateDisplayIfNeeded } from "./update_display"
@@ -141,11 +141,8 @@ function endOperation_finish(op) {
     display.wheelStartX = display.wheelStartY = null
 
   // Propagate the scroll position to the actual DOM scroller
-  if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
-    doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop))
-    display.scrollbars.setScrollTop(doc.scrollTop)
-    display.scroller.scrollTop = doc.scrollTop
-  }
+  if (op.scrollTop != null) setScrollTop(cm, op.scrollTop, true)
+
   if (op.scrollLeft != null) setScrollLeft(cm, op.scrollLeft, true, true)
   // If we need to scroll a specific position into view, do so.
   if (op.scrollToPos) {
diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index 38d91441c0..b7ce0f583d 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -7,15 +7,21 @@ import { updateDisplaySimple} from "./update_display"
 
 // Sync the scrollable area and scrollbars, ensure the viewport
 // covers the visible area.
-export function setScrollTop(cm, val) {
+export function updateScrollTop(cm, val) {
   if (Math.abs(cm.doc.scrollTop - val) < 2) return
-  cm.doc.scrollTop = val
   if (!gecko) updateDisplaySimple(cm, {top: val})
-  if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val
-  cm.display.scrollbars.setScrollTop(val)
+  setScrollTop(cm, val)
   if (gecko) updateDisplaySimple(cm)
   startWorker(cm, 100)
 }
+export function setScrollTop(cm, val, forceScroll) {
+  val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)
+  if (cm.display.scroller.scrollTop == val && !forceScroll) return
+  cm.doc.scrollTop = val
+  cm.display.scrollbars.setScrollTop(val)
+  cm.display.scroller.scrollTop = val
+}
+
 // Sync scroller and scrollbar, ensure the gutter elements are
 // aligned.
 export function setScrollLeft(cm, val, isScroller, forceScroll) {
@@ -94,7 +100,7 @@ export function onScrollWheel(cm, e) {
   // better than glitching out.
   if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
     if (dy && canScrollY)
-      setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)))
+      updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * wheelPixelsPerUnit))
     setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)))
     // Only prevent default scrolling if vertical scrolling is
     // actually possible. Otherwise, it causes vertical scroll
diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index af31c78140..d2f73c9154 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -5,7 +5,7 @@ import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser"
 import { updateHeightsInViewport } from "./update_lines"
 import { Delayed } from "../util/misc"
 
-import { setScrollLeft, setScrollTop } from "./scroll_events"
+import { setScrollLeft, updateScrollTop } from "./scroll_events"
 
 // SCROLLBARS
 
@@ -185,7 +185,7 @@ export function initScrollbars(cm) {
     node.setAttribute("cm-not-content", "true")
   }, (pos, axis) => {
     if (axis == "horizontal") setScrollLeft(cm, pos)
-    else setScrollTop(cm, pos)
+    else updateScrollTop(cm, pos)
   }, cm)
   if (cm.display.scrollbars.addClass)
     addClass(cm.display.wrapper, cm.display.scrollbars.addClass)
diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index b2deb2ed64..5d06a63b50 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -4,7 +4,7 @@ import { phantom } from "../util/browser"
 import { elt } from "../util/dom"
 import { signalDOMEvent } from "../util/event"
 
-import { setScrollLeft, setScrollTop } from "./scroll_events"
+import { setScrollLeft, updateScrollTop } from "./scroll_events"
 
 // SCROLLING THINGS INTO VIEW
 
@@ -44,7 +44,7 @@ export function scrollPosIntoView(cm, pos, end, margin) {
     let scrollPos = calculateScrollPos(cm, rect)
     let startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft
     if (scrollPos.scrollTop != null) {
-      setScrollTop(cm, scrollPos.scrollTop)
+      updateScrollTop(cm, scrollPos.scrollTop)
       if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true
     }
     if (scrollPos.scrollLeft != null) {
@@ -59,7 +59,7 @@ export function scrollPosIntoView(cm, pos, end, margin) {
 // Scroll a given set of coordinates into view (immediately).
 export function scrollIntoView(cm, rect) {
   let scrollPos = calculateScrollPos(cm, rect)
-  if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop)
+  if (scrollPos.scrollTop != null) updateScrollTop(cm, scrollPos.scrollTop)
   if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft)
 }
 
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 2d502c9ebc..5f66c9f4f7 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -4,7 +4,7 @@ import { setGuttersForLineNumbers, updateGutters } from "../display/gutters"
 import { maybeUpdateLineNumberWidth } from "../display/line_numbers"
 import { endOperation, operation, startOperation } from "../display/operations"
 import { initScrollbars } from "../display/scrollbars"
-import { onScrollWheel, setScrollLeft, setScrollTop } from "../display/scroll_events"
+import { onScrollWheel, setScrollLeft, updateScrollTop } from "../display/scroll_events"
 import { clipPos, Pos } from "../line/pos"
 import { posFromMouse } from "../measurement/position_measurement"
 import { eventInWidget } from "../measurement/widgets"
@@ -180,7 +180,7 @@ function registerEventHandlers(cm) {
   // area, ensure viewport is updated when scrolling.
   on(d.scroller, "scroll", () => {
     if (d.scroller.clientHeight) {
-      setScrollTop(cm, d.scroller.scrollTop)
+      updateScrollTop(cm, d.scroller.scrollTop)
       setScrollLeft(cm, d.scroller.scrollLeft, true)
       signal(cm, "scroll", cm)
     }

From a565815973da6c9a2cfc9d46a7e490ae9525cda2 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 26 Apr 2017 09:38:38 +0200
Subject: [PATCH 3272/4742] Remove duplicate min() call for setScrollTop

---
 src/display/scroll_events.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index b7ce0f583d..cc4b50b866 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -25,8 +25,8 @@ export function setScrollTop(cm, val, forceScroll) {
 // Sync scroller and scrollbar, ensure the gutter elements are
 // aligned.
 export function setScrollLeft(cm, val, isScroller, forceScroll) {
-  if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) return
   val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
+  if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) return
   cm.doc.scrollLeft = val
   alignHorizontally(cm)
   if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val
@@ -101,7 +101,7 @@ export function onScrollWheel(cm, e) {
   if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
     if (dy && canScrollY)
       updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * wheelPixelsPerUnit))
-    setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)))
+    setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * wheelPixelsPerUnit))
     // Only prevent default scrolling if vertical scrolling is
     // actually possible. Otherwise, it causes vertical scroll
     // jitter on OSX trackpads when deltaX is small and deltaY

From 4c3fa2468f3f76cb5fb661163358117eaf2b38cf Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 26 Apr 2017 10:18:12 +0200
Subject: [PATCH 3273/4742] Move {set,update}Scroll{Left,Top} to
 display/scrolling

---
 src/display/operations.js    |  3 +--
 src/display/scroll_events.js | 33 ++-------------------------------
 src/display/scrollbars.js    |  2 +-
 src/display/scrolling.js     | 33 +++++++++++++++++++++++++++++++--
 src/edit/CodeMirror.js       |  3 ++-
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 566eb5aa85..15a041c6ab 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -7,9 +7,8 @@ import { finishOperation, pushOperation } from "../util/operation_group"
 
 import { ensureFocus } from "./focus"
 import { measureForScrollbars, updateScrollbars } from "./scrollbars"
-import { setScrollLeft, setScrollTop } from "./scroll_events"
 import { restartBlink } from "./selection"
-import { maybeScrollWindow, scrollPosIntoView } from "./scrolling"
+import { maybeScrollWindow, scrollPosIntoView, setScrollLeft, setScrollTop } from "./scrolling"
 import { DisplayUpdate, maybeClipScrollbars, postUpdateDisplay, setDocumentHeight, updateDisplayIfNeeded } from "./update_display"
 import { updateHeightsInViewport } from "./update_lines"
 
diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index cc4b50b866..d3902809e7 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -1,37 +1,8 @@
 import { chrome, gecko, ie, mac, presto, safari, webkit } from "../util/browser"
 import { e_preventDefault } from "../util/event"
 
-import { startWorker } from "./highlight_worker"
-import { alignHorizontally } from "./line_numbers"
-import { updateDisplaySimple} from "./update_display"
-
-// Sync the scrollable area and scrollbars, ensure the viewport
-// covers the visible area.
-export function updateScrollTop(cm, val) {
-  if (Math.abs(cm.doc.scrollTop - val) < 2) return
-  if (!gecko) updateDisplaySimple(cm, {top: val})
-  setScrollTop(cm, val)
-  if (gecko) updateDisplaySimple(cm)
-  startWorker(cm, 100)
-}
-export function setScrollTop(cm, val, forceScroll) {
-  val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)
-  if (cm.display.scroller.scrollTop == val && !forceScroll) return
-  cm.doc.scrollTop = val
-  cm.display.scrollbars.setScrollTop(val)
-  cm.display.scroller.scrollTop = val
-}
-
-// Sync scroller and scrollbar, ensure the gutter elements are
-// aligned.
-export function setScrollLeft(cm, val, isScroller, forceScroll) {
-  val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
-  if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) return
-  cm.doc.scrollLeft = val
-  alignHorizontally(cm)
-  if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val
-  cm.display.scrollbars.setScrollLeft(val)
-}
+import { updateDisplaySimple } from "./update_display"
+import { setScrollLeft, updateScrollTop } from "./scrolling"
 
 // Since the delta values reported on mouse wheel events are
 // unstandardized between browsers and even browser versions, and
diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index d2f73c9154..27060d18ef 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -5,7 +5,7 @@ import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser"
 import { updateHeightsInViewport } from "./update_lines"
 import { Delayed } from "../util/misc"
 
-import { setScrollLeft, updateScrollTop } from "./scroll_events"
+import { setScrollLeft, updateScrollTop } from "./scrolling"
 
 // SCROLLBARS
 
diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 5d06a63b50..12a13b454a 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -1,10 +1,12 @@
 import { Pos } from "../line/pos"
 import { cursorCoords, displayHeight, displayWidth, estimateCoords, paddingTop, paddingVert, scrollGap, textHeight } from "../measurement/position_measurement"
-import { phantom } from "../util/browser"
+import { gecko, phantom } from "../util/browser"
 import { elt } from "../util/dom"
 import { signalDOMEvent } from "../util/event"
 
-import { setScrollLeft, updateScrollTop } from "./scroll_events"
+import { startWorker } from "./highlight_worker"
+import { alignHorizontally } from "./line_numbers"
+import { updateDisplaySimple } from "./update_display"
 
 // SCROLLING THINGS INTO VIEW
 
@@ -135,3 +137,30 @@ export function resolveScrollToPos(cm) {
     cm.scrollTo(sPos.scrollLeft, sPos.scrollTop)
   }
 }
+// Sync the scrollable area and scrollbars, ensure the viewport
+// covers the visible area.
+export function updateScrollTop(cm, val) {
+  if (Math.abs(cm.doc.scrollTop - val) < 2) return
+  if (!gecko) updateDisplaySimple(cm, {top: val})
+  setScrollTop(cm, val)
+  if (gecko) updateDisplaySimple(cm)
+  startWorker(cm, 100)
+}
+export function setScrollTop(cm, val, forceScroll) {
+  val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)
+  if (cm.display.scroller.scrollTop == val && !forceScroll) return
+  cm.doc.scrollTop = val
+  cm.display.scrollbars.setScrollTop(val)
+  cm.display.scroller.scrollTop = val
+}
+
+// Sync scroller and scrollbar, ensure the gutter elements are
+// aligned.
+export function setScrollLeft(cm, val, isScroller, forceScroll) {
+  val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
+  if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) return
+  cm.doc.scrollLeft = val
+  alignHorizontally(cm)
+  if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val
+  cm.display.scrollbars.setScrollLeft(val)
+}
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 5f66c9f4f7..1b2758ec01 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -4,7 +4,8 @@ import { setGuttersForLineNumbers, updateGutters } from "../display/gutters"
 import { maybeUpdateLineNumberWidth } from "../display/line_numbers"
 import { endOperation, operation, startOperation } from "../display/operations"
 import { initScrollbars } from "../display/scrollbars"
-import { onScrollWheel, setScrollLeft, updateScrollTop } from "../display/scroll_events"
+import { onScrollWheel } from "../display/scroll_events"
+import { setScrollLeft, updateScrollTop } from "../display/scrolling"
 import { clipPos, Pos } from "../line/pos"
 import { posFromMouse } from "../measurement/position_measurement"
 import { eventInWidget } from "../measurement/widgets"

From 8e860c53f3bb3a671bef22f928c0eb68ed3a2bc9 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 26 Apr 2017 10:42:24 +0200
Subject: [PATCH 3274/4742] Make calculateScrollPos private, introduce
 scrollToCoordsRange

---
 src/display/scrolling.js | 21 +++++++++++++--------
 src/edit/methods.js      | 10 ++--------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 12a13b454a..9a84b7a996 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -69,7 +69,7 @@ export function scrollIntoView(cm, rect) {
 // rectangle into view. Returns an object with scrollTop and
 // scrollLeft properties. When these are undefined, the
 // vertical/horizontal position does not need to be adjusted.
-export function calculateScrollPos(cm, rect) {
+function calculateScrollPos(cm, rect) {
   let display = cm.display, snapMargin = textHeight(cm.display)
   if (rect.top < 0) rect.top = 0
   let screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop
@@ -128,15 +128,20 @@ export function resolveScrollToPos(cm) {
   if (range) {
     cm.curOp.scrollToPos = null
     let from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to)
-    let sPos = calculateScrollPos(cm, {
-      left: Math.min(from.left, to.left),
-      top: Math.min(from.top, to.top) - range.margin,
-      right: Math.max(from.right, to.right),
-      bottom: Math.max(from.bottom, to.bottom) + range.margin
-    })
-    cm.scrollTo(sPos.scrollLeft, sPos.scrollTop)
+    scrollToCoordsRange(cm, from, to, range.margin)
   }
 }
+
+export function scrollToCoordsRange(cm, from, to, margin) {
+  let sPos = calculateScrollPos(cm, {
+    left: Math.min(from.left, to.left),
+    top: Math.min(from.top, to.top) - margin,
+    right: Math.max(from.right, to.right),
+    bottom: Math.max(from.bottom, to.bottom) + margin
+  })
+  cm.scrollTo(sPos.scrollLeft, sPos.scrollTop)
+}
+
 // Sync the scrollable area and scrollbars, ensure the viewport
 // covers the visible area.
 export function updateScrollTop(cm, val) {
diff --git a/src/edit/methods.js b/src/edit/methods.js
index b8dd343d09..5262c4f9c5 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -14,7 +14,7 @@ import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos"
 import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
 import { Range } from "../model/selection"
 import { replaceOneSelection, skipAtomic } from "../model/selection_updates"
-import { addToScrollPos, calculateScrollPos, ensureCursorVisible, resolveScrollToPos, scrollIntoView } from "../display/scrolling"
+import { addToScrollPos, ensureCursorVisible, resolveScrollToPos, scrollIntoView, scrollToCoordsRange } from "../display/scrolling"
 import { heightAtLine } from "../line/spans"
 import { updateGutterSpace } from "../display/update_display"
 import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
@@ -388,13 +388,7 @@ export default function(CodeMirror) {
         resolveScrollToPos(this)
         this.curOp.scrollToPos = range
       } else {
-        let sPos = calculateScrollPos(this, {
-          left: Math.min(range.from.left, range.to.left),
-          top: Math.min(range.from.top, range.to.top) - range.margin,
-          right: Math.max(range.from.right, range.to.right),
-          bottom: Math.max(range.from.bottom, range.to.bottom) + range.margin
-        })
-        this.scrollTo(sPos.scrollLeft, sPos.scrollTop)
+        scrollToCoordsRange(this, range.from, range.to, range.margin)
       }
     }),
 

From 17977949f8ad445fac6b1fa99a8355526242e783 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 26 Apr 2017 10:44:57 +0200
Subject: [PATCH 3275/4742] Turn addToScrollPos into addToScrollTop

---
 src/display/scrolling.js | 10 ++++------
 src/edit/methods.js      |  4 ++--
 src/model/line_widget.js |  6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 9a84b7a996..37a1a6691e 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -99,12 +99,10 @@ function calculateScrollPos(cm, rect) {
 
 // Store a relative adjustment to the scroll position in the current
 // operation (to be applied when the operation finishes).
-export function addToScrollPos(cm, left, top) {
-  if (left != null || top != null) resolveScrollToPos(cm)
-  if (left != null)
-    cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left
-  if (top != null)
-    cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top
+export function addToScrollTop(cm, top) {
+  if (top == null) return
+  resolveScrollToPos(cm)
+  cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top
 }
 
 // Make sure that at the end of the operation the current cursor is
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 5262c4f9c5..8546e075e5 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -14,7 +14,7 @@ import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos"
 import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
 import { Range } from "../model/selection"
 import { replaceOneSelection, skipAtomic } from "../model/selection_updates"
-import { addToScrollPos, ensureCursorVisible, resolveScrollToPos, scrollIntoView, scrollToCoordsRange } from "../display/scrolling"
+import { addToScrollTop, ensureCursorVisible, resolveScrollToPos, scrollIntoView, scrollToCoordsRange } from "../display/scrolling"
 import { heightAtLine } from "../line/spans"
 import { updateGutterSpace } from "../display/update_display"
 import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
@@ -322,7 +322,7 @@ export default function(CodeMirror) {
         goals.push(headPos.left)
         let pos = findPosV(this, headPos, dir, unit)
         if (unit == "page" && range == doc.sel.primary())
-          addToScrollPos(this, null, charCoords(this, pos, "div").top - headPos.top)
+          addToScrollTop(this, charCoords(this, pos, "div").top - headPos.top)
         return pos
       }, sel_move)
       if (goals.length) for (let i = 0; i < doc.sel.ranges.length; i++)
diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index 8347066d38..a11f9c2742 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -1,5 +1,5 @@
 import { runInOp } from "../display/operations"
-import { addToScrollPos } from "../display/scrolling"
+import { addToScrollTop } from "../display/scrolling"
 import { regLineChange } from "../display/view_tracking"
 import { heightAtLine, lineIsHidden } from "../line/spans"
 import { lineNo, updateLineHeight } from "../line/utils_line"
@@ -53,7 +53,7 @@ eventMixin(LineWidget)
 
 function adjustScrollWhenAboveVisible(cm, line, diff) {
   if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
-    addToScrollPos(cm, null, diff)
+    addToScrollTop(cm, diff)
 }
 
 export function addLineWidget(doc, handle, node, options) {
@@ -68,7 +68,7 @@ export function addLineWidget(doc, handle, node, options) {
     if (cm && !lineIsHidden(doc, line)) {
       let aboveVisible = heightAtLine(line) < doc.scrollTop
       updateLineHeight(line, line.height + widgetHeight(widget))
-      if (aboveVisible) addToScrollPos(cm, null, widget.height)
+      if (aboveVisible) addToScrollTop(cm, widget.height)
       cm.curOp.forceUpdate = true
     }
     return true

From abd5bc2a1ba9fa5c45c8984b0c5ea3b3c98c895c Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 26 Apr 2017 10:55:31 +0200
Subject: [PATCH 3276/4742] Introduce scrollTo{Coords,Range} and make
 resolveScrollToPos private

---
 src/display/scrolling.js | 13 ++++++++++++-
 src/edit/methods.js      | 11 +++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 37a1a6691e..6751d7c3d5 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -117,11 +117,22 @@ export function ensureCursorVisible(cm) {
   cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin}
 }
 
+export function scrollToCoords(cm, x, y) {
+  if (x != null || y != null) resolveScrollToPos(cm)
+  if (x != null) cm.curOp.scrollLeft = x
+  if (y != null) cm.curOp.scrollTop = y
+}
+
+export function scrollToRange(cm, range) {
+  resolveScrollToPos(cm)
+  cm.curOp.scrollToPos = range
+}
+
 // When an operation has its scrollToPos property set, and another
 // scroll action is applied before the end of the operation, this
 // 'simulates' scrolling that position into view in a cheap way, so
 // that the effect of intermediate scroll commands is not ignored.
-export function resolveScrollToPos(cm) {
+function resolveScrollToPos(cm) {
   let range = cm.curOp.scrollToPos
   if (range) {
     cm.curOp.scrollToPos = null
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 8546e075e5..ece64a360a 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -14,7 +14,7 @@ import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos"
 import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
 import { Range } from "../model/selection"
 import { replaceOneSelection, skipAtomic } from "../model/selection_updates"
-import { addToScrollTop, ensureCursorVisible, resolveScrollToPos, scrollIntoView, scrollToCoordsRange } from "../display/scrolling"
+import { addToScrollTop, ensureCursorVisible, scrollIntoView, scrollToCoords, scrollToCoordsRange, scrollToRange } from "../display/scrolling"
 import { heightAtLine } from "../line/spans"
 import { updateGutterSpace } from "../display/update_display"
 import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
@@ -359,11 +359,7 @@ export default function(CodeMirror) {
     hasFocus: function() { return this.display.input.getField() == activeElt() },
     isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
 
-    scrollTo: methodOp(function(x, y) {
-      if (x != null || y != null) resolveScrollToPos(this)
-      if (x != null) this.curOp.scrollLeft = x
-      if (y != null) this.curOp.scrollTop = y
-    }),
+    scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y) }),
     getScrollInfo: function() {
       let scroller = this.display.scroller
       return {left: scroller.scrollLeft, top: scroller.scrollTop,
@@ -385,8 +381,7 @@ export default function(CodeMirror) {
       range.margin = margin || 0
 
       if (range.from.line != null) {
-        resolveScrollToPos(this)
-        this.curOp.scrollToPos = range
+        scrollToRange(this, range)
       } else {
         scrollToCoordsRange(this, range.from, range.to, range.margin)
       }

From ead38e82dd9f6e00f4c3cf059579a87b39718a5f Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 26 Apr 2017 11:13:35 +0200
Subject: [PATCH 3277/4742] Call scrollToCoords instead of cm.scrollTo

---
 src/display/scrolling.js | 2 +-
 src/edit/methods.js      | 4 ++--
 src/model/Doc.js         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 6751d7c3d5..be1a4e00a9 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -148,7 +148,7 @@ export function scrollToCoordsRange(cm, from, to, margin) {
     right: Math.max(from.right, to.right),
     bottom: Math.max(from.bottom, to.bottom) + margin
   })
-  cm.scrollTo(sPos.scrollLeft, sPos.scrollTop)
+  scrollToCoords(cm, sPos.scrollLeft, sPos.scrollTop)
 }
 
 // Sync the scrollable area and scrollbars, ensure the viewport
diff --git a/src/edit/methods.js b/src/edit/methods.js
index ece64a360a..4d34bacc33 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -409,7 +409,7 @@ export default function(CodeMirror) {
       regChange(this)
       this.curOp.forceUpdate = true
       clearCaches(this)
-      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop)
+      scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop)
       updateGutterSpace(this)
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
         estimateLineHeights(this)
@@ -422,7 +422,7 @@ export default function(CodeMirror) {
       attachDoc(this, doc)
       clearCaches(this)
       this.display.input.reset()
-      this.scrollTo(doc.scrollLeft, doc.scrollTop)
+      scrollToCoords(this, doc.scrollLeft, doc.scrollTop)
       this.curOp.forceScroll = true
       signalLater(this, "swapDoc", this, old)
       return old
diff --git a/src/model/Doc.js b/src/model/Doc.js
index 9abe3087a7..e76d3b152f 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -7,7 +7,7 @@ import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_lin
 import { classTest } from "../util/dom"
 import { splitLinesAuto } from "../util/feature_detection"
 import { createObj, map, isEmpty, sel_dontScroll } from "../util/misc"
-import { ensureCursorVisible } from "../display/scrolling"
+import { ensureCursorVisible, scrollToCoords } from "../display/scrolling"
 
 import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes"
 import { computeReplacedSel } from "./change_measurement"
@@ -75,7 +75,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     let top = Pos(this.first, 0), last = this.first + this.size - 1
     makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
                       text: this.splitLines(code), origin: "setValue", full: true}, true)
-    if (this.cm) this.cm.scrollTo(0, 0)
+    if (this.cm) scrollToCoords(this.cm, 0, 0)
     setSelection(this, simpleSelection(top), sel_dontScroll)
   }),
   replaceRange: function(code, from, to, origin) {

From 33068f96d148a129d6c12ff647a2fbb3cdb60006 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 26 Apr 2017 11:30:35 +0200
Subject: [PATCH 3278/4742] Merge duplicate imports

---
 src/input/ContentEditableInput.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 4d19f20197..d103d2d08f 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -9,11 +9,10 @@ import { replaceRange } from "../model/changes"
 import { simpleSelection } from "../model/selection"
 import { setSelection } from "../model/selection_updates"
 import { getBidiPartAt, getOrder } from "../util/bidi"
-import { gecko, ie_version } from "../util/browser"
+import { android, chrome, gecko, ie_version } from "../util/browser"
 import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom"
 import { on, signalDOMEvent } from "../util/event"
 import { Delayed, lst, sel_dontScroll } from "../util/misc"
-import { chrome, android } from "../util/browser"
 
 // CONTENTEDITABLE INPUT STYLE
 

From 37d59ff42f2db6e563376507eb6cf11427d0d972 Mon Sep 17 00:00:00 2001
From: Dimage Sapelkin <dimage@sharkrazoe.net>
Date: Sun, 23 Apr 2017 17:55:24 +0200
Subject: [PATCH 3279/4742] [factor mode] Various improvements

---
 mode/factor/factor.js | 50 ++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/mode/factor/factor.js b/mode/factor/factor.js
index 86d7adf627..e238c5ea64 100644
--- a/mode/factor/factor.js
+++ b/mode/factor/factor.js
@@ -22,52 +22,54 @@
       {regex: /#?!.*/, token: "comment"},
       // strings """, multiline --> state
       {regex: /"""/, token: "string", next: "string3"},
-      {regex: /"/, token: "string", next: "string"},
+      {regex: /(STRING:)(\s)/, token: ["keyword", null], next: "string2"},
+      {regex: /\S*?"/, token: "string", next: "string"},
       // numbers: dec, hex, unicode, bin, fractional, complex
-      {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
+      {regex: /(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\-?\d+.?\d*)(?=\s)/, token: "number"},
       //{regex: /[+-]?/} //fractional
       // definition: defining word, defined word, etc
-      {regex: /(\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "keyword"], next: "stack"},
+      {regex: /((?:GENERIC)|\:?\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "bracket"], next: "stack"},
+      // method definition: defining word, type, defined word, etc
+      {regex: /(M\:)(\s+)(\S+)(\s+)(\S+)/, token: ["keyword", null, "def", null, "tag"]},
       // vocabulary using --> state
       {regex: /USING\:/, token: "keyword", next: "vocabulary"},
       // vocabulary definition/use
-      {regex: /(USE\:|IN\:)(\s+)(\S+)/, token: ["keyword", null, "variable-2"]},
-      // <constructors>
-      {regex: /<\S+>/, token: "builtin"},
+      {regex: /(USE\:|IN\:)(\s+)(\S+)(?=\s|$)/, token: ["keyword", null, "tag"]},
+      // definition: a defining word, defined word
+      {regex: /(\S+\:)(\s+)(\S+)(?=\s|$)/, token: ["keyword", null, "def"]},
       // "keywords", incl. ; t f . [ ] { } defining words
-      {regex: /;|t|f|if|\.|\[|\]|\{|\}|MAIN:/, token: "keyword"},
+      {regex: /(?:;|\\|t|f|if|loop|while|until|do|PRIVATE>|<PRIVATE|\.|\S*\[|\]|\S*\{|\})(?=\s|$)/, token: "keyword"},
+      // <constructors> and the like
+      {regex: /\S+[\)>\.\*\?]+(?=\s|$)/, token: "builtin"},
+      {regex: /[\)><]+\S+(?=\s|$)/, token: "builtin"},
+      // operators
+      {regex: /(?:[\+\-\=\/\*<>])(?=\s|$)/, token: "keyword"},
       // any id (?)
       {regex: /\S+/, token: "variable"},
-
-      {
-        regex: /./,
-        token: null
-      }
+      {regex: /\s+|./, token: null}
     ],
     vocabulary: [
       {regex: /;/, token: "keyword", next: "start"},
-      {regex: /\S+/, token: "variable-2"},
-      {
-        regex: /./,
-        token: null
-      }
+      {regex: /\S+/, token: "tag"},
+      {regex: /\s+|./, token: null}
     ],
     string: [
       {regex: /(?:[^\\]|\\.)*?"/, token: "string", next: "start"},
       {regex: /.*/, token: "string"}
     ],
+    string2: [
+      {regex: /^;/, token: "keyword", next: "start"},
+      {regex: /.*/, token: "string"}
+    ],
     string3: [
       {regex: /(?:[^\\]|\\.)*?"""/, token: "string", next: "start"},
       {regex: /.*/, token: "string"}
     ],
     stack: [
-      {regex: /\)/, token: "meta", next: "start"},
-      {regex: /--/, token: "meta"},
-      {regex: /\S+/, token: "variable-3"},
-      {
-        regex: /./,
-        token: null
-      }
+      {regex: /\)/, token: "bracket", next: "start"},
+      {regex: /--/, token: "bracket"},
+      {regex: /\S+/, token: "meta"},
+      {regex: /\s+|./, token: null}
     ],
     // The meta property contains global information about the mode. It
     // can contain properties like lineComment, which are supported by

From afc9f08a237d066b1411fb3f72c86d886ed179ab Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 27 Apr 2017 09:46:27 +0200
Subject: [PATCH 3280/4742] [sql-hint addon] Be more intelligent about
 splitting a line into words

Issue #4712
---
 addon/hint/sql-hint.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index e95b6bb4e9..f5ec2cac1f 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -185,12 +185,9 @@
   }
 
   function eachWord(lineText, f) {
-    if (!lineText) return;
-    var excepted = /[,;]/g;
-    var words = lineText.split(" ");
-    for (var i = 0; i < words.length; i++) {
-      f(words[i]?words[i].replace(excepted, '') : '');
-    }
+    var words = lineText.split(/\s+/)
+    for (var i = 0; i < words.length; i++)
+      if (words[i]) f(words[i].replace(/[,;]/g, ''))
   }
 
   function findTableByAlias(alias, editor) {

From b93ab2d8b3d23e0bad735d620a6f488f347552ca Mon Sep 17 00:00:00 2001
From: Prayag Verma <prayag.verma@gmail.com>
Date: Thu, 27 Apr 2017 13:30:12 +0530
Subject: [PATCH 3281/4742] [real world uses] Update Blogger

The URL for the official blog has changed
Also, there has been a terminology change in the Blogger interface, now 'template' has been replaced by 'theme'
---
 doc/realworld.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index 73246fc450..3995f93e9d 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -33,7 +33,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://github.com/google/appengine-codiad">Appengine Codiad</a></li>
       <li><a href="https://chrome.google.com/webstore/detail/better-text-viewer/lcaidopdffhfemoefoaadecppnjdknkc">Better Text Viewer</a> (plain text reader app for Chrome)</li>
       <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a> (code hosting)</li>
-      <li><a href="http://buzz.blogger.com/2013/04/improvements-to-blogger-template-html.html">Blogger's template editor</a></li>
+      <li><a href="https://blogger.googleblog.com/2013/04/improvements-to-blogger-template-html.html">Blogger's theme editor</a></li>
       <li><a href="http://bluegriffon.org/">BlueGriffon</a> (HTML editor)</li>
       <li><a href="https://github.com/isdampe/BosonEditorExperimental">Boson Editor</a> (code editor)</li>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>

From c98bd2205625c1358e003f0a3d0b4a6f29e99b0a Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 28 Apr 2017 09:33:00 +0200
Subject: [PATCH 3282/4742] Fix wheel scrolling and set forceScroll from op

I broke this in 0ad53e0a74871babb84ae7e6fc81ecd6614b4e35. Closes #4713.
---
 src/display/operations.js | 2 +-
 src/display/scrolling.js  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 15a041c6ab..6748af43e3 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -140,7 +140,7 @@ function endOperation_finish(op) {
     display.wheelStartX = display.wheelStartY = null
 
   // Propagate the scroll position to the actual DOM scroller
-  if (op.scrollTop != null) setScrollTop(cm, op.scrollTop, true)
+  if (op.scrollTop != null) setScrollTop(cm, op.scrollTop, op.forceScroll)
 
   if (op.scrollLeft != null) setScrollLeft(cm, op.scrollLeft, true, true)
   // If we need to scroll a specific position into view, do so.
diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index be1a4e00a9..96192cab9b 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -156,16 +156,17 @@ export function scrollToCoordsRange(cm, from, to, margin) {
 export function updateScrollTop(cm, val) {
   if (Math.abs(cm.doc.scrollTop - val) < 2) return
   if (!gecko) updateDisplaySimple(cm, {top: val})
-  setScrollTop(cm, val)
+  setScrollTop(cm, val, true)
   if (gecko) updateDisplaySimple(cm)
   startWorker(cm, 100)
 }
+
 export function setScrollTop(cm, val, forceScroll) {
   val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)
   if (cm.display.scroller.scrollTop == val && !forceScroll) return
   cm.doc.scrollTop = val
   cm.display.scrollbars.setScrollTop(val)
-  cm.display.scroller.scrollTop = val
+  if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val
 }
 
 // Sync scroller and scrollbar, ensure the gutter elements are

From 21ea9a2a0e609278096e5920457b91952312398b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 28 Apr 2017 09:52:51 +0200
Subject: [PATCH 3283/4742] [vim bindings] Fix double-deref in defineRegister

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b2c404d45e..1f5d949d93 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -958,7 +958,7 @@
      * for a reference implementation.
      */
     function defineRegister(name, register) {
-      var registers = vimGlobalState.registerController.registers[name];
+      var registers = vimGlobalState.registerController.registers;
       if (!name || name.length != 1) {
         throw Error('Register name must be 1 character');
       }

From a91b714c2f84d55a585fc93bae7c5901f10c1d86 Mon Sep 17 00:00:00 2001
From: Rasmus Schultz <mindplay-dk@users.noreply.github.com>
Date: Sun, 30 Apr 2017 12:38:46 +0200
Subject: [PATCH 3284/4742] [manual] Mention the word "mouse" near coordsChar

Avoid duplicates for #4719
---
 doc/manual.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 62d1801c8d..3c1d2fe032 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1859,7 +1859,7 @@ <h3 id="api_sizing">Sizing, scrolling and positioning methods</h3>
       position that the cursor would have when it would sit at that
       position.</dd>
       <dt id="coordsChar"><code><strong>cm.coordsChar</strong>(object: {left, top}, ?mode: string) → {line, ch}</code></dt>
-      <dd>Given an <code>{left, top}</code> object, returns
+      <dd>Given an <code>{left, top}</code> object (e.g. coordinates of a mouse event) returns
       the <code>{line, ch}</code> position that corresponds to it. The
       optional <code>mode</code> parameter determines relative to what
       the coordinates are interpreted. It may

From 41da8714ddf4779019319fa8ee632cb75b5eb2cf Mon Sep 17 00:00:00 2001
From: Markus Bordihn <mbordihn@google.com>
Date: Sun, 30 Apr 2017 22:12:13 +0200
Subject: [PATCH 3285/4742] [indent-fold addon] Removed suspicious "!"
 character

---
 addon/fold/indent-fold.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 743150c623..f93edec22c 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -18,7 +18,7 @@ function lineIndent(cm, lineNo) {
     return -1
   return CodeMirror.countColumn(text, null, cm.getOption("tabSize"))
 }
-               !
+
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
   var myIndent = lineIndent(cm, start.line)
   if (myIndent < 0) return

From e611de746a21d0cdf0150f7ae732c0b9e937d0b7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 4 May 2017 12:41:28 +0200
Subject: [PATCH 3286/4742] Recompute outer rectangle on every test in
 scrollIntoView test

To avoid false negatives due to window scrolling
---
 test/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test.js b/test/test.js
index 38e84d18d6..fafb19bc39 100644
--- a/test/test.js
+++ b/test/test.js
@@ -667,10 +667,10 @@ testCM("scrollSnap", function(cm) {
 
 testCM("scrollIntoView", function(cm) {
   if (phantom) return;
-  var outer = cm.getWrapperElement().getBoundingClientRect();
   function test(line, ch, msg) {
     var pos = Pos(line, ch);
     cm.scrollIntoView(pos);
+    var outer = cm.getWrapperElement().getBoundingClientRect();
     var box = cm.charCoords(pos, "window");
     is(box.left >= outer.left, msg + " (left)");
     is(box.right <= outer.right, msg + " (right)");

From cba52cecb9f309e71899b2a8272f6ac6ce94031f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 4 May 2017 22:04:22 +0200
Subject: [PATCH 3287/4742] [liquibyte theme] Don't change scrollbar style
 unless enabled

Closes #4725
---
 theme/liquibyte.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/liquibyte.css b/theme/liquibyte.css
index 9db8bde739..ce0477fe72 100644
--- a/theme/liquibyte.css
+++ b/theme/liquibyte.css
@@ -59,10 +59,10 @@
 .CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
 /* Scrollbars */
 /* Simple */
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div:hover {
 	background-color: rgba(80, 80, 80, .7);
 }
-.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, .cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
 	background-color: rgba(80, 80, 80, .3);
 	border: 1px solid #404040;
 	border-radius: 5px;

From ea8aa6b995aa3a974e66f54e05a01653240266b0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 5 May 2017 11:24:18 +0200
Subject: [PATCH 3288/4742] Disable reset of textarea during composition

Issue #4726
---
 src/input/TextareaInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 85d2c0054f..2161c3f6ef 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -145,7 +145,7 @@ export default class TextareaInput {
   // Reset the input to correspond to the selection (or to be empty,
   // when not typing and nothing is selected)
   reset(typing) {
-    if (this.contextMenuPending) return
+    if (this.contextMenuPending || this.composing) return
     let minimal, selected, cm = this.cm, doc = cm.doc
     if (cm.somethingSelected()) {
       this.prevInput = ""

From 51707934fc1ffbdd9a8f4484a6e63edcf2e0f1a6 Mon Sep 17 00:00:00 2001
From: Robert Brignull <robertbrignull@gmail.com>
Date: Sun, 7 May 2017 22:31:05 +0100
Subject: [PATCH 3289/4742] [completion demo] Fix check for undefined

---
 demo/complete.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/complete.html b/demo/complete.html
index 18e17c8126..0464389ebf 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -83,7 +83,7 @@ <h2>Autocomplete Demo</h2>
   mode: {name: "javascript", globalVars: true}
 });
 
-if (typeof Promise !== undefined) {
+if (typeof Promise !== "undefined") {
   var comp = [
     ["here", "hither"],
     ["asynchronous", "nonsynchronous"],

From e29b193c691a7e994168a469a3a764f51ba3697d Mon Sep 17 00:00:00 2001
From: Robert Brignull <robertbrignull@gmail.com>
Date: Sun, 7 May 2017 22:13:31 +0100
Subject: [PATCH 3290/4742] [sieve mode] Remove a double semicolon

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

diff --git a/mode/sieve/sieve.js b/mode/sieve/sieve.js
index f67db2f553..0920d0bab3 100644
--- a/mode/sieve/sieve.js
+++ b/mode/sieve/sieve.js
@@ -170,7 +170,7 @@ CodeMirror.defineMode("sieve", function(config) {
       if (stream.eatSpace())
         return null;
 
-      return (state.tokenize || tokenBase)(stream, state);;
+      return (state.tokenize || tokenBase)(stream, state);
     },
 
     indent: function(state, _textAfter) {

From 98f2d9b2b471b7c56ed2edcef346d4e1cd42e42a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 8 May 2017 11:19:23 +0200
Subject: [PATCH 3291/4742] [vb mode] Remove bogus tests from demo page

Issue #4733
---
 mode/vb/index.html | 79 ++++++++--------------------------------------
 1 file changed, 13 insertions(+), 66 deletions(-)

diff --git a/mode/vb/index.html b/mode/vb/index.html
index adcc44fd39..8697248907 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -30,73 +30,20 @@
 
 <article>
 <h2>VB.NET mode</h2>
-
-<script type="text/javascript">
-function test(golden, text) {
-  var ok = true;
-  var i = 0;
-  function callback(token, style, lineNo, pos){
-		//console.log(String(token) + " " + String(style) + " " + String(lineNo) + " " + String(pos));
-    var result = [String(token), String(style)];
-    if (golden[i][0] != result[0] || golden[i][1] != result[1]){
-      return "Error, expected: " + String(golden[i]) + ", got: " + String(result);
-      ok = false;
-    }
-    i++;
-  }
-  CodeMirror.runMode(text, "text/x-vb",callback); 
-
-  if (ok) return "Tests OK";
-}
-function testTypes() {
-  var golden = [['Integer','keyword'],[' ','null'],['Float','keyword']]
-  var text =  "Integer Float";
-  return test(golden,text);
-}
-function testIf(){
-  var golden = [['If','keyword'],[' ','null'],['True','keyword'],[' ','null'],['End','keyword'],[' ','null'],['If','keyword']];
-  var text = 'If True End If';
-  return test(golden, text);
-}
-function testDecl(){
-   var golden = [['Dim','keyword'],[' ','null'],['x','variable'],[' ','null'],['as','keyword'],[' ','null'],['Integer','keyword']];
-   var text = 'Dim x as Integer';
-   return test(golden, text);
-}
-function testAll(){
-  var result = "";
-
-  result += testTypes() + "\n";
-  result += testIf() + "\n";
-  result += testDecl() + "\n";
-  return result;
-
-}
-function initText(editor) {
-  var content = 'Class rocket\nPrivate quality as Double\nPublic Sub launch() as String\nif quality > 0.8\nlaunch = "Successful"\nElse\nlaunch = "Failed"\nEnd If\nEnd sub\nEnd class\n';
-  editor.setValue(content);
-  for (var i =0; i< editor.lineCount(); i++) editor.indentLine(i);
-}
-function init() {
-    editor = CodeMirror.fromTextArea(document.getElementById("solution"), {
-        lineNumbers: true,
-        mode: "text/x-vb",
-        readOnly: false
-    });
-    runTest();
-}
-function runTest() {
-	document.getElementById('testresult').innerHTML = testAll();
-  initText(editor);
-	
-}
-document.body.onload = init;
-</script>
-
   <div id="edit">
-  <textarea style="width:95%;height:200px;padding:5px;" name="solution" id="solution" ></textarea>
+  <textarea name="code" id="code" >
+Class rocket
+  Private quality as Double
+  Public Sub launch() as String
+    If quality > 0.8
+      launch = "Successful"
+    Else
+      launch = "Failed"
+    End If
+  End sub
+End class
+</textarea>
   </div>
-  <pre id="testresult"></pre>
   <p>MIME type defined: <code>text/x-vb</code>.</p>
-
+<script>CodeMirror.fromTextArea(document.getElementById("code"))</script>
 </article>

From 9aa38eae92a3949cdc472c86c77c5f0443a8d31b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 9 May 2017 10:41:25 +0200
Subject: [PATCH 3292/4742] Also restore selection after redraw, when in a
 sub-component

Issue #4724
---
 src/display/update_display.js | 36 ++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/display/update_display.js b/src/display/update_display.js
index 17d5a069e5..affa2a759a 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -3,7 +3,7 @@ import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans"
 import { getLine, lineNumberFor } from "../line/utils_line"
 import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement"
 import { mac, webkit } from "../util/browser"
-import { activeElt, removeChildren } from "../util/dom"
+import { activeElt, removeChildren, contains } from "../util/dom"
 import { hasHandler, signal } from "../util/event"
 import { indexOf } from "../util/misc"
 
@@ -54,6 +54,36 @@ export function maybeClipScrollbars(cm) {
   }
 }
 
+function selectionSnapshot(cm) {
+  if (cm.hasFocus()) return null
+  let active = activeElt()
+  if (!active || !contains(cm.display.lineDiv, active)) return null
+  let result = {activeElt: active}
+  if (window.getSelection) {
+    let sel = window.getSelection()
+    if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) {
+      result.anchorNode = sel.anchorNode
+      result.anchorOffset = sel.anchorOffset
+      result.focusNode = sel.focusNode
+      result.focusOffset = sel.focusOffset
+    }
+  }
+  return result
+}
+
+function restoreSelection(snapshot) {
+  if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) return
+  snapshot.activeElt.focus()
+  if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+    let sel = window.getSelection(), range = document.createRange()
+    range.setEnd(snapshot.anchorNode, snapshot.anchorOffset)
+    range.collapse(false)
+    sel.removeAllRanges()
+    sel.addRange(range)
+    sel.extend(snapshot.focusNode, snapshot.focusOffset)
+  }
+}
+
 // Does the actual updating of the line display. Bails out
 // (returning false) when there is nothing to be done and forced is
 // false.
@@ -103,14 +133,14 @@ export function updateDisplayIfNeeded(cm, update) {
 
   // For big changes, we hide the enclosing element during the
   // update, since that speeds up the operations on most browsers.
-  let focused = activeElt()
+  let selSnapshot = selectionSnapshot(cm)
   if (toUpdate > 4) display.lineDiv.style.display = "none"
   patchDisplay(cm, display.updateLineNumbers, update.dims)
   if (toUpdate > 4) display.lineDiv.style.display = ""
   display.renderedView = display.view
   // There might have been a widget with a focused element that got
   // hidden or updated, if so re-focus it.
-  if (focused && activeElt() != focused && focused.offsetHeight) focused.focus()
+  restoreSelection(selSnapshot)
 
   // Prevent selection and cursors from interfering with the scroll
   // width and height.

From dcb6c3e7ca6f27f01bbfe429e9bf493f63913f75 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 9 May 2017 11:25:04 +0200
Subject: [PATCH 3293/4742] [markdown mode] Accept multi-line links

Issue #4735
---
 mode/gfm/test.js          | 29 +++++++++++++----------------
 mode/markdown/markdown.js |  7 ++++---
 mode/markdown/test.js     | 13 +++++++++----
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index dbdcbb2752..33078acf11 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -63,31 +63,28 @@
      "~~~");
 
   MT("taskListAsterisk",
-     "[variable-2 * []] foo]", // Invalid; must have space or x between []
-     "[variable-2 * [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 * [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 * ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
+     "[variable-2 * ][link&variable-2 [[]]][variable-2 foo]", // Invalid; must have space or x between []
+     "[variable-2 * ][link&variable-2 [[ ]]][variable-2 bar]", // Invalid; must have space after ]
+     "[variable-2 * ][link&variable-2 [[x]]][variable-2 hello]", // Invalid; must have space after ]
+     "[variable-2 * ][meta [ ]]][variable-2  ][link&variable-2 [[world]]]", // Valid; tests reference style links
      "    [variable-3 * ][property [x]]][variable-3  foo]"); // Valid; can be nested
 
   MT("taskListPlus",
-     "[variable-2 + []] foo]", // Invalid; must have space or x between []
-     "[variable-2 + [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 + [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 + ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
+     "[variable-2 + ][link&variable-2 [[]]][variable-2 foo]", // Invalid; must have space or x between []
+     "[variable-2 + ][link&variable-2 [[x]]][variable-2 hello]", // Invalid; must have space after ]
+     "[variable-2 + ][meta [ ]]][variable-2  ][link&variable-2 [[world]]]", // Valid; tests reference style links
      "    [variable-3 + ][property [x]]][variable-3  foo]"); // Valid; can be nested
 
   MT("taskListDash",
-     "[variable-2 - []] foo]", // Invalid; must have space or x between []
-     "[variable-2 - [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 - [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 - ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
+     "[variable-2 - ][link&variable-2 [[]]][variable-2 foo]", // Invalid; must have space or x between []
+     "[variable-2 - ][link&variable-2 [[x]]][variable-2 hello]", // Invalid; must have space after ]
+     "[variable-2 - ][meta [ ]]][variable-2  world]", // Valid; tests reference style links
      "    [variable-3 - ][property [x]]][variable-3  foo]"); // Valid; can be nested
 
   MT("taskListNumber",
-     "[variable-2 1. []] foo]", // Invalid; must have space or x between []
-     "[variable-2 2. [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 3. [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 4. ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
+     "[variable-2 1. ][link&variable-2 [[]]][variable-2 foo]", // Invalid; must have space or x between []
+     "[variable-2 2. ][link&variable-2 [[ ]]][variable-2 bar]", // Invalid; must have space after ]
+     "[variable-2 3. ][meta [ ]]][variable-2  world]", // Valid; tests reference style links
      "    [variable-3 1. ][property [x]]][variable-3  foo]"); // Valid; can be nested
 
   MT("SHA",
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index caf0339eb6..20e164d0e2 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -441,17 +441,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return type;
     }
 
-    if (ch === '[' && stream.match(/[^\]]*\](\(.*\)| ?\[.*?\])/, false) && !state.image) {
+    if (ch === '[' && !state.image) {
       state.linkText = true;
       if (modeCfg.highlightFormatting) state.formatting = "link";
       return getType(state);
     }
 
-    if (ch === ']' && state.linkText && stream.match(/\(.*?\)| ?\[.*?\]/, false)) {
+    if (ch === ']' && state.linkText) {
       if (modeCfg.highlightFormatting) state.formatting = "link";
       var type = getType(state);
       state.linkText = false;
-      state.inline = state.f = linkHref;
+      state.inline = state.f = stream.match(/\(.*?\)| ?\[.*?\]/, false) ? linkHref : inlineNormal
       return type;
     }
 
@@ -718,6 +718,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         inline: s.inline,
         text: s.text,
         formatting: false,
+        linkText: s.linkText,
         linkTitle: s.linkTitle,
         code: s.code,
         em: s.em,
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 51b55706d9..0f4259c3c0 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -631,6 +631,11 @@
   MT("linkEmStrong",
      "[link [[][link&em&strong ***foo***][link ]]][string&url (http://example.com/)] bar");
 
+  MT("multilineLink",
+     "[link [[foo]",
+     "[link bar]]][string&url (https://foo#_a)]",
+     "should not be italics")
+
   // Image with title
   MT("imageTitle",
      "[image&image-marker !][image&image-alt-text&link [[alt text]]][string&url (http://example.com/ \"bar\")] hello");
@@ -647,7 +652,7 @@
   // regularly in text, especially in quoted material, and no space is allowed
   // between square brackets and parentheses (per Dingus).
   MT("notALink",
-     "[[foo]] (bar)");
+     "[link [[foo]]] (bar)");
 
   // Reference-style links
   MT("linkReference",
@@ -672,7 +677,7 @@
 
   // Should only allow a single space ("...use *a* space...")
   MT("linkReferenceDoubleSpace",
-     "[[foo]]  [[bar]] hello");
+     "[link [[foo]]]  [link [[bar]]] hello");
 
   // Reference-style links with implicit link name
   MT("linkImplicit",
@@ -733,7 +738,7 @@
      "[link [[foo \\]]: bar]]:] [string&url http://example.com/]");
 
   MT("labelEscapeEnd",
-     "[[foo\\]]: http://example.com/");
+     "\\[[foo\\]]: http://example.com/");
 
   MT("linkWeb",
      "[link <http://example.com/>] foo");
@@ -919,7 +924,7 @@
   // Tests to make sure GFM-specific things aren't getting through
 
   MT("taskList",
-     "[variable-2 * [ ]] bar]");
+     "[variable-2 * ][link&variable-2 [[ ]]][variable-2 bar]");
 
   MT("noFencedCodeBlocks",
      "~~~",

From b9d044255a13731d759c8c1da479d7ff8b342f13 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Tue, 27 Dec 2016 10:58:11 +0100
Subject: [PATCH 3294/4742] [css mode] Add caret-color property

The property is defined in this spec:
https://drafts.csswg.org/css-ui/#caret-color

It has been recently implemented on Chromium and Firefox.
---
 mode/css/css.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 7f8c46ebb6..d8ded56518 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -472,7 +472,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "border-top-left-radius", "border-top-right-radius", "border-top-style",
     "border-top-width", "border-width", "bottom", "box-decoration-break",
     "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
-    "caption-side", "clear", "clip", "color", "color-profile", "column-count",
+    "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count",
     "column-fill", "column-gap", "column-rule", "column-rule-color",
     "column-rule-style", "column-rule-width", "column-span", "column-width",
     "columns", "content", "counter-increment", "counter-reset", "crop", "cue",

From dd839b5059bf8ffb41b55a9dc152796af5fd5b26 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 10 May 2017 20:49:14 +0200
Subject: [PATCH 3295/4742] [go mode] Return Pass when commenting inside
 string/comment

Closes #4739
---
 mode/go/go.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/go/go.js b/mode/go/go.js
index 8896b57fb9..04808adb6f 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -162,7 +162,7 @@ CodeMirror.defineMode("go", function(config) {
     },
 
     indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) {
         state.context.type = "}";

From eef65cb0998da7ad64a8fb0dd78497c662c5a483 Mon Sep 17 00:00:00 2001
From: Shil S <shil.sinha@gmail.com>
Date: Thu, 11 May 2017 23:28:52 -0400
Subject: [PATCH 3296/4742] [groovy mode] Add 'trait' keyword

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

diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index daa798722e..0df97dd0b7 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -21,9 +21,9 @@ CodeMirror.defineMode("groovy", function(config) {
     "abstract as assert boolean break byte case catch char class const continue def default " +
     "do double else enum extends final finally float for goto if implements import in " +
     "instanceof int interface long native new package private protected public return " +
-    "short static strictfp super switch synchronized threadsafe throw throws transient " +
+    "short static strictfp super switch synchronized threadsafe throw throws trait transient " +
     "try void volatile while");
-  var blockKeywords = words("catch class do else finally for if switch try while enum interface def");
+  var blockKeywords = words("catch class def do else enum finally for if interface switch trait try while");
   var standaloneKeywords = words("return break continue");
   var atoms = words("null true false this");
 

From e47753cf3b9418d0ff634c75424806ae0fb5173f Mon Sep 17 00:00:00 2001
From: opl- <opl-@users.noreply.github.com>
Date: Sun, 14 May 2017 23:41:53 +0200
Subject: [PATCH 3297/4742] [htmlmixed mode] Properly pass along indent
 arguments to sub-mode

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

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 16b4f139fd..33398ec5c0 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -133,11 +133,11 @@
         return state.token(stream, state);
       },
 
-      indent: function (state, textAfter) {
+      indent: function (state, textAfter, line) {
         if (!state.localMode || /^\s*<\//.test(textAfter))
           return htmlMode.indent(state.htmlState, textAfter);
         else if (state.localMode.indent)
-          return state.localMode.indent(state.localState, textAfter);
+          return state.localMode.indent(state.localState, textAfter, line);
         else
           return CodeMirror.Pass;
       },

From f47006e2889d93f27477292201612266f25613a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <oseg@google.com>
Date: Mon, 15 May 2017 13:45:27 +0200
Subject: [PATCH 3298/4742] [soy mode] Support single-quoted strings in tags

---
 mode/soy/soy.js  | 10 +++++++---
 mode/soy/test.js |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index c0198609e7..94ddad5f51 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -90,6 +90,7 @@
           variables: null,
           scopes: null,
           indent: 0,
+          quoteKind: null,
           localStates: [{
             mode: modes.html,
             state: CodeMirror.startState(modes.html)
@@ -107,6 +108,7 @@
           variables: state.variables,
           scopes: state.scopes,
           indent: state.indent, // Indentation of the following line.
+          quoteKind: state.quoteKind,
           localStates: state.localStates.map(function(localState) {
             return {
               mode: localState.mode,
@@ -211,8 +213,9 @@
                 });
               }
               return "attribute";
-            } else if (stream.match(/^"/)) {
+            } else if (match = stream.match(/^["']/)) {
               state.soyState.push("string");
+              state.quoteKind = match;
               return "string";
             }
             if (match = stream.match(/^\$([\w]+)/)) {
@@ -233,10 +236,11 @@
             return tokenUntil(stream, state, /\{\/literal}/);
 
           case "string":
-            var match = stream.match(/^.*?("|\\[\s\S])/);
+            var match = stream.match(/^.*?(["']|\\[\s\S])/);
             if (!match) {
               stream.skipToEnd();
-            } else if (match[1] == "\"") {
+            } else if (match[1] == state.quoteKind) {
+              state.quoteKind = null;
               state.soyState.pop();
             }
             return "string";
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 2a9bdb501f..7e0ed0f436 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -101,4 +101,8 @@
      '  [keyword {/if}]',
      '[keyword {/template}]',
      '');
+
+  MT('single-quote-strings',
+     '[keyword {][string "foo"] [string \'bar\'][keyword }]',
+     '');
 })();

From 2fb70c6d910731a65f6b134b64d58eee964143b4 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 15 May 2017 14:10:12 +0200
Subject: [PATCH 3299/4742] [css mode] Update CSS Box Alignment properties and
 values

These properties have been implemented in Firefox, Chrome and Safari.
In addition, the CSS WG has just resolved to move the spec to CR.

Spec: https://drafts.csswg.org/css-align/#property-index
---
 mode/css/css.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index d8ded56518..c9570ebfab 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -493,7 +493,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
     "grid-template-rows", "hanging-punctuation", "height", "hyphens",
     "icon", "image-orientation", "image-rendering", "image-resolution",
-    "inline-box-align", "justify-content", "left", "letter-spacing",
+    "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing",
     "line-break", "line-height", "line-stacking", "line-stacking-ruby",
     "line-stacking-shift", "line-stacking-strategy", "list-style",
     "list-style-image", "list-style-position", "list-style-type", "margin",
@@ -508,7 +508,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
     "page", "page-break-after", "page-break-before", "page-break-inside",
     "page-policy", "pause", "pause-after", "pause-before", "perspective",
-    "perspective-origin", "pitch", "pitch-range", "play-during", "position",
+    "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position",
     "presentation-level", "punctuation-trim", "quotes", "region-break-after",
     "region-break-before", "region-break-inside", "region-fragment",
     "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
@@ -659,13 +659,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
     "scroll", "scrollbar", "scroll-position", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",
-    "searchfield-results-button", "searchfield-results-decoration",
+    "searchfield-results-button", "searchfield-results-decoration", "self-start", "self-end",
     "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
     "simp-chinese-formal", "simp-chinese-informal", "single",
     "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
     "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
-    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
+    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",
     "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
     "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",

From 4c625b7a68abd00eda9f3c3c4d1901cc1173c66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Segersv=C3=A4rd?= <oseg@google.com>
Date: Mon, 15 May 2017 14:28:00 +0200
Subject: [PATCH 3300/4742] [soy mode] Don't highlight functions in the start
 of tags as keywords

---
 mode/soy/soy.js  | 11 ++++++++++-
 mode/soy/test.js |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 94ddad5f51..ba16363638 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -255,7 +255,9 @@
           state.indent += config.indentUnit;
           state.soyState.push("literal");
           return "keyword";
-        } else if (match = stream.match(/^\{([\/@\\]?[\w?]*)/)) {
+
+        // A tag-keyword must be followed by whitespace or a closing tag.
+        } else if (match = stream.match(/^\{([\/@\\]?\w+\??)(?=[\s\}])/)) {
           if (match[1] != "/switch")
             state.indent += (/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
           state.tag = match[1];
@@ -287,6 +289,13 @@
             state.soyState.push("param-def");
           }
           return "keyword";
+
+        // Not a tag-keyword; it's an implicit print tag.
+        } else if (stream.eat('{')) {
+          state.tag = "print";
+          state.indent += 2 * config.indentUnit;
+          state.soyState.push("tag");
+          return "keyword";
         }
 
         return tokenUntil(stream, state, /\{|\s+\/\/|\/\*/);
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 7e0ed0f436..7cd111f2f3 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -93,6 +93,12 @@
      '[keyword {/template}]',
      '');
 
+  MT('tag-starting-with-function-call-is-not-a-keyword',
+     '[keyword {]index([variable-2&error $foo])[keyword }]',
+     '[keyword {css] [string "some-class"][keyword }]',
+     '[keyword {]css([string "some-class"])[keyword }]',
+     '');
+
   MT('allow-missing-colon-in-@param',
      '[keyword {template] [def .foo][keyword }]',
      '  [keyword {@param] [def showThing] [variable-3 bool][keyword }]',

From 75add6f4744dbdaf5d2d78186fa0856f6ab33923 Mon Sep 17 00:00:00 2001
From: NetworkNode <khaimm+github@gmail.com>
Date: Mon, 15 May 2017 10:32:27 -0500
Subject: [PATCH 3301/4742] [vim bindings] Parse line offset ([+-]N) in line or
 range spec

---
 keymap/vim.js    | 25 +++++++++++++++--
 test/vim_test.js | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 1f5d949d93..fae952b243 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4083,23 +4083,42 @@
       parseLineSpec_: function(cm, inputStream) {
         var numberMatch = inputStream.match(/^(\d+)/);
         if (numberMatch) {
+          // Absolute line number plus offset (N+M or N-M) is probably a typo,
+          // not something the user actually wanted. (NB: vim does allow this.)
           return parseInt(numberMatch[1], 10) - 1;
         }
         switch (inputStream.next()) {
           case '.':
-            return cm.getCursor().line;
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
           case '$':
-            return cm.lastLine();
+            return this.parseLineSpecOffset_(inputStream, cm.lastLine());
           case '\'':
             var markName = inputStream.next();
             var markPos = getMarkPos(cm, cm.state.vim, markName);
             if (!markPos) throw new Error('Mark not set');
-            return markPos.line;
+            return this.parseLineSpecOffset_(inputStream, markPos.line);
+          case '-':
+          case '+':
+            inputStream.backUp(1);
+            // Offset is relative to current line if not otherwise specified.
+            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
           default:
             inputStream.backUp(1);
             return undefined;
         }
       },
+      parseLineSpecOffset_: function(inputStream, line) {
+        var offsetMatch = inputStream.match(/^([+-])?(\d+)/);
+        if (offsetMatch) {
+          var offset = parseInt(offsetMatch[2], 10);
+          if (offsetMatch[1] == "-") {
+            line -= offset;
+          } else {
+            line += offset;
+          }
+        }
+        return line;
+      },
       parseCommandArgs_: function(inputStream, params, command) {
         if (inputStream.eol()) {
           return;
diff --git a/test/vim_test.js b/test/vim_test.js
index 36d452f025..862eb4a7e9 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3426,6 +3426,35 @@ testVim('ex_go_to_line', function(cm, vim, helpers) {
   helpers.doEx('4');
   helpers.assertCursorAt(3, 0);
 }, { value: 'a\nb\nc\nd\ne\n'});
+testVim('ex_go_to_mark', function(cm, vim, helpers) {
+  cm.setCursor(3, 0);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(0, 0);
+  helpers.doEx('\'a');
+  helpers.assertCursorAt(3, 0);
+}, { value: 'a\nb\nc\nd\ne\n'});
+testVim('ex_go_to_line_offset', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doEx('+3');
+  helpers.assertCursorAt(3, 0);
+  helpers.doEx('-1');
+  helpers.assertCursorAt(2, 0);
+  helpers.doEx('.2');
+  helpers.assertCursorAt(4, 0);
+  helpers.doEx('.-3');
+  helpers.assertCursorAt(1, 0);
+}, { value: 'a\nb\nc\nd\ne\n'});
+testVim('ex_go_to_mark_offset', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(0, 0);
+  helpers.doEx('\'a1');
+  helpers.assertCursorAt(3, 0);
+  helpers.doEx('\'a-1');
+  helpers.assertCursorAt(1, 0);
+  helpers.doEx('\'a+2');
+  helpers.assertCursorAt(4, 0);
+}, { value: 'a\nb\nc\nd\ne\n'});
 testVim('ex_write', function(cm, vim, helpers) {
   var tmp = CodeMirror.commands.save;
   var written;
@@ -3577,6 +3606,50 @@ testVim('ex_substitute_input_range', function(cm, vim, helpers) {
   helpers.doEx('1,3s/\\d/0/g');
   eq('0\n0\n0\n4', cm.getValue());
 }, { value: '1\n2\n3\n4' });
+testVim('ex_substitute_range_current_to_input', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('.,3s/\\d/0/g');
+  eq('1\n0\n0\n4', cm.getValue());
+}, { value: '1\n2\n3\n4' });
+testVim('ex_substitute_range_input_to_current', function(cm, vim, helpers) {
+  cm.setCursor(3, 0);
+  helpers.doEx('2,.s/\\d/0/g');
+  eq('1\n0\n0\n0\n5', cm.getValue());
+}, { value: '1\n2\n3\n4\n5' });
+testVim('ex_substitute_range_offset', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doEx('-1,+1s/\\d/0/g');
+  eq('1\n0\n0\n0\n5', cm.getValue());
+}, { value: '1\n2\n3\n4\n5' });
+testVim('ex_substitute_range_implicit_offset', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doEx('.1,.3s/\\d/0/g');
+  eq('1\n0\n0\n0\n5', cm.getValue());
+}, { value: '1\n2\n3\n4\n5' });
+testVim('ex_substitute_to_eof', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doEx('.,$s/\\d/0/g');
+  eq('1\n2\n0\n0\n0', cm.getValue());
+}, { value: '1\n2\n3\n4\n5' });
+testVim('ex_substitute_to_relative_eof', function(cm, vim, helpers) {
+  cm.setCursor(4, 0);
+  helpers.doEx('2,$-2s/\\d/0/g');
+  eq('1\n0\n0\n4\n5', cm.getValue());
+}, { value: '1\n2\n3\n4\n5' });
+testVim('ex_substitute_range_mark', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('ma');
+  cm.setCursor(0, 0);
+  helpers.doEx('.,\'as/\\d/0/g');
+  eq('0\n0\n0\n4\n5', cm.getValue());
+}, { value: '1\n2\n3\n4\n5' });
+testVim('ex_substitute_range_mark_offset', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('ma');
+  cm.setCursor(0, 0);
+  helpers.doEx('\'a-1,\'a+1s/\\d/0/g');
+  eq('1\n0\n0\n0\n5', cm.getValue());
+}, { value: '1\n2\n3\n4\n5' });
 testVim('ex_substitute_visual_range', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   // Set last visual mode selection marks '< and '> at lines 2 and 4

From d599d6560e4ecfe5ae79d9a1dd02d9e0353c5a28 Mon Sep 17 00:00:00 2001
From: opl- <opl-@users.noreply.github.com>
Date: Thu, 18 May 2017 03:46:06 +0200
Subject: [PATCH 3302/4742] [stylus mode] Fix tab chars being treated like 1
 space

---
 mode/stylus/stylus.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 8d83a01807..b36ee385b3 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -15,6 +15,7 @@
 
   CodeMirror.defineMode("stylus", function(config) {
     var indentUnit = config.indentUnit,
+        indentUnitString = '',
         tagKeywords = keySet(tagKeywords_),
         tagVariablesRegexp = /^(a|b|i|s|col|em)$/i,
         propertyKeywords = keySet(propertyKeywords_),
@@ -38,6 +39,8 @@
         type,
         override;
 
+    while (indentUnitString.length < indentUnit) indentUnitString += ' ';
+
     /**
      * Tokenizers
      */
@@ -672,7 +675,7 @@
             ch = textAfter && textAfter.charAt(0),
             indent = cx.indent,
             lineFirstWord = firstWordOfLine(textAfter),
-            lineIndent = line.length - line.replace(/^\s*/, "").length,
+            lineIndent = line.match(/^\s*/)[0].replace(/\t/g, indentUnitString).length,
             prevLineFirstWord = state.context.prev ? state.context.prev.line.firstWord : "",
             prevLineIndent = state.context.prev ? state.context.prev.line.indent : lineIndent;
 

From 1fd26aa84956983712b459280d19a8a8476c6fc7 Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Fri, 19 May 2017 10:10:08 +1000
Subject: [PATCH 3303/4742] [javascript mode] Add test with complex type

---
 mode/javascript/test.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 13b7d12819..9631e96048 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -324,6 +324,14 @@
      "[keyword function] [def b][operator <][variable-3 IA] [keyword extends] [variable-3 object], [variable-3 IB] [keyword extends] [variable-3 object][operator >]() {}",
      "[keyword function] [def c]() {}")
 
+  TS("typescript_complex_return_type",
+     "[keyword function] [def A]() {",
+     "  [keyword return] [keyword this].[property property];",
+     "}",
+     "[keyword function] [def B](): [variable-3 Promise][operator <]{ [[ [variable key]: [variable-3 string] ]]: [variable-3 any] } [operator |] [atom null][operator >] {",
+     "  [keyword return] [keyword this].[property property];",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 0233aefaba03f590a168d9b6c87b3fd61eeb6332 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 May 2017 10:39:33 +0200
Subject: [PATCH 3304/4742] [javascript mode] Improve parsing of typescript
 object types

Issue #4754
---
 mode/javascript/javascript.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 4316078ed7..73113c6b99 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -547,7 +547,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function typeexpr(type) {
     if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
-    if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex)
+    if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
   }
   function maybeReturnType(type) {
@@ -561,6 +561,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(typeprop)
     } else if (type == ":") {
       return cont(typeexpr)
+    } else if (type == "[") {
+      return cont(expression, maybetype, expect("]"), typeprop)
     }
   }
   function typearg(type) {

From 714244ab7a42e0d630df6cba95df7463eabebfe4 Mon Sep 17 00:00:00 2001
From: Max Schaefer <xiemaisi@gmail.com>
Date: Mon, 22 May 2017 09:03:50 +0800
Subject: [PATCH 3305/4742] Fix character classes with duplicate characters.

Most cases look like simple typos, other cases suggest misunderstanding of regular expression syntax.
---
 mode/mirc/mirc.js       |  2 +-
 mode/q/q.js             | 12 ++++++------
 mode/scheme/scheme.js   |  2 +-
 mode/solr/solr.js       |  2 +-
 mode/textile/textile.js |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mode/mirc/mirc.js b/mode/mirc/mirc.js
index f0d5c6ad50..71ac4ddfd4 100644
--- a/mode/mirc/mirc.js
+++ b/mode/mirc/mirc.js
@@ -130,7 +130,7 @@ CodeMirror.defineMode("mirc", function() {
       }
     }
     else if (ch == "%") {
-      stream.eatWhile(/[^,^\s^\(^\)]/);
+      stream.eatWhile(/[^,\s()]/);
       state.beforeParams = true;
       return "string";
     }
diff --git a/mode/q/q.js b/mode/q/q.js
index a4af9383e7..8ede2657bc 100644
--- a/mode/q/q.js
+++ b/mode/q/q.js
@@ -34,25 +34,25 @@ CodeMirror.defineMode("q",function(config){
     if(c=='"')
       return(state.tokenize=tokenString)(stream,state);
     if(c=='`')
-      return stream.eatWhile(/[A-Z|a-z|\d|_|:|\/|\.]/),"symbol";
+      return stream.eatWhile(/[A-Za-z\d_:\/.]/),"symbol";
     if(("."==c&&/\d/.test(stream.peek()))||/\d/.test(c)){
       var t=null;
       stream.backUp(1);
-      if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([D|T](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
+      if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([DT](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
       || stream.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)
       || stream.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)
       || stream.match(/^\d+[ptuv]{1}/))
         t="temporal";
       else if(stream.match(/^0[NwW]{1}/)
-      || stream.match(/^0x[\d|a-f|A-F]*/)
-      || stream.match(/^[0|1]+[b]{1}/)
+      || stream.match(/^0x[\da-fA-F]*/)
+      || stream.match(/^[01]+[b]{1}/)
       || stream.match(/^\d+[chijn]{1}/)
       || stream.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))
         t="number";
       return(t&&(!(c=stream.peek())||E.test(c)))?t:(stream.next(),"error");
     }
-    if(/[A-Z|a-z]|\./.test(c))
-      return stream.eatWhile(/[A-Z|a-z|\.|_|\d]/),keywords.test(stream.current())?"keyword":"variable";
+    if(/[A-Za-z]|\./.test(c))
+      return stream.eatWhile(/[A-Za-z._\d]/),keywords.test(stream.current())?"keyword":"variable";
     if(/[|/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(c))
       return null;
     if(/[{}\(\[\]\)]/.test(c))
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 2234645911..1d8f7d17f0 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -224,7 +224,7 @@ CodeMirror.defineMode("scheme", function () {
                             }
                         }
                     } else {
-                        stream.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/);
+                        stream.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/);
 
                         if (keywords && keywords.propertyIsEnumerable(stream.current())) {
                             returnType = BUILTIN;
diff --git a/mode/solr/solr.js b/mode/solr/solr.js
index f7f7087891..8a7a78a84f 100644
--- a/mode/solr/solr.js
+++ b/mode/solr/solr.js
@@ -14,7 +14,7 @@
 CodeMirror.defineMode("solr", function() {
   "use strict";
 
-  var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\^\"\\]/;
+  var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\"\\]/;
   var isOperatorChar = /[\|\!\+\-\*\?\~\^\&]/;
   var isOperatorString = /^(OR|AND|NOT|TO)$/i;
 
diff --git a/mode/textile/textile.js b/mode/textile/textile.js
index a6f7576582..bc5a2f3692 100644
--- a/mode/textile/textile.js
+++ b/mode/textile/textile.js
@@ -203,7 +203,7 @@
     single: {
       bc: "bc",
       bq: "bq",
-      definitionList: /- [^(?::=)]+:=+/,
+      definitionList: /- .*?:=+/,
       definitionListEnd: /.*=:\s*$/,
       div: "div",
       drawTable: /\|.*\|/,

From 9013a0a16e2f70b26fc9a1d28cb73e752c29b79c Mon Sep 17 00:00:00 2001
From: Max Schaefer <xiemaisi@gmail.com>
Date: Mon, 22 May 2017 09:15:04 +0800
Subject: [PATCH 3306/4742] Remove a few spurious arguments.

---
 keymap/vim.js                  | 6 +++---
 mode/markdown/markdown.js      | 2 +-
 mode/q/q.js                    | 2 +-
 mode/solr/solr.js              | 2 +-
 mode/stylus/stylus.js          | 4 ++--
 src/input/movement.js          | 2 +-
 src/model/selection_updates.js | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fae952b243..4b562ea9c7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -259,7 +259,7 @@
         CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
 
       if (!next || next.attach != attachVimMap)
-        leaveVimMode(cm, false);
+        leaveVimMode(cm);
     }
     function attachVimMap(cm, prev) {
       if (this == CodeMirror.keyMap.vim)
@@ -649,9 +649,9 @@
         lastCharacterSearch: {increment:0, forward:true, selectedCharacter:''},
         registerController: new RegisterController({}),
         // search history buffer
-        searchHistoryController: new HistoryController({}),
+        searchHistoryController: new HistoryController(),
         // ex Command history buffer
-        exCommandHistoryController : new HistoryController({})
+        exCommandHistoryController : new HistoryController()
       };
       for (var optionName in options) {
         var option = options[optionName];
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 20e164d0e2..261a6a19bc 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -593,7 +593,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
     var ch = stream.next();
     if (ch === '(' || ch === '[') {
-      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]", 0);
+      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]");
       if (modeCfg.highlightFormatting) state.formatting = "link-string";
       state.linkHref = true;
       return getType(state);
diff --git a/mode/q/q.js b/mode/q/q.js
index 8ede2657bc..9aee18ab1e 100644
--- a/mode/q/q.js
+++ b/mode/q/q.js
@@ -25,7 +25,7 @@ CodeMirror.defineMode("q",function(config){
         return(state.tokenize=tokenLineComment)(stream,state);
       else if(c=="\\"){
         if(stream.eol()||/\s/.test(stream.peek()))
-          return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream, state):state.tokenize=tokenBase,"comment";
+          return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream):state.tokenize=tokenBase,"comment";
         else
           return state.tokenize=tokenBase,"builtin";
       }
diff --git a/mode/solr/solr.js b/mode/solr/solr.js
index 8a7a78a84f..dc8b82501e 100644
--- a/mode/solr/solr.js
+++ b/mode/solr/solr.js
@@ -19,7 +19,7 @@ CodeMirror.defineMode("solr", function() {
   var isOperatorString = /^(OR|AND|NOT|TO)$/i;
 
   function isNumber(word) {
-    return parseFloat(word, 10).toString() === word;
+    return parseFloat(word).toString() === word;
   }
 
   function tokenString(quote) {
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index b36ee385b3..8b1e8eeb14 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -316,7 +316,7 @@
           return pushContext(state, stream, "block", 0);
         }
       }
-      if (typeIsBlock(type, stream, state)) {
+      if (typeIsBlock(type, stream)) {
         return pushContext(state, stream, "block");
       }
       if (type == "}" && endOfLine(stream)) {
@@ -516,7 +516,7 @@
      */
     states.atBlock = function(type, stream, state) {
       if (type == "(") return pushContext(state, stream, "atBlock_parens");
-      if (typeIsBlock(type, stream, state)) {
+      if (typeIsBlock(type, stream)) {
         return pushContext(state, stream, "block");
       }
       if (typeIsInterpolation(type, stream)) {
diff --git a/src/input/movement.js b/src/input/movement.js
index 5ce695e2b6..b7fd01a836 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -32,7 +32,7 @@ export function endOfLine(visually, cm, lineObj, lineNo, dir) {
         ch = dir < 0 ? lineObj.text.length - 1 : 0
         let targetTop = measureCharPrepared(cm, prep, ch).top
         ch = findFirst(ch => measureCharPrepared(cm, prep, ch).top == targetTop, (dir < 0) == (part.level == 1) ? part.from : part.to - 1, ch)
-        if (sticky == "before") ch = moveCharLogically(lineObj, ch, 1, true)
+        if (sticky == "before") ch = moveCharLogically(lineObj, ch, 1)
       } else ch = dir < 0 ? part.to : part.from
       return new Pos(lineNo, ch, sticky)
     }
diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index 0e310a5d2d..246b328581 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -123,7 +123,7 @@ function setSelectionInner(doc, sel) {
 // Verify that the selection does not partially select any atomic
 // marked ranges.
 export function reCheckSelection(doc) {
-  setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll)
+  setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false))
 }
 
 // Return a selection that does not partially select any atomic

From 5255e81a6c18340b6301b6f8198d8b70ebdc5ad0 Mon Sep 17 00:00:00 2001
From: Max Schaefer <xiemaisi@gmail.com>
Date: Mon, 22 May 2017 09:17:01 +0800
Subject: [PATCH 3307/4742] Add missing spaces in keyword lists.

This fixes keyword highlighting for CPython and Verilog.
---
 mode/python/python.js   | 4 ++--
 mode/verilog/verilog.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index b539d84aa6..2d2b08c810 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -332,8 +332,8 @@
 
   CodeMirror.defineMIME("text/x-cython", {
     name: "python",
-    extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
-                          "extern gil include nogil property public"+
+    extra_keywords: words("by cdef cimport cpdef ctypedef enum except "+
+                          "extern gil include nogil property public "+
                           "readonly struct union DEF IF ELIF ELSE")
   });
 
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 6029bc8c57..3404686097 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -81,7 +81,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   // Block openings which are closed by a matching keyword in the form of ("end" + keyword)
   // E.g. "task" => "endtask"
   var blockKeywords = words(
-    "case checker class clocking config function generate interface module package" +
+    "case checker class clocking config function generate interface module package " +
     "primitive program property specify sequence table task"
   );
 

From 632a3eac27a599b27d92151ba676db71012f0d86 Mon Sep 17 00:00:00 2001
From: Max Schaefer <xiemaisi@gmail.com>
Date: Mon, 22 May 2017 09:20:37 +0800
Subject: [PATCH 3308/4742] Fix misleading indentation in `tiki.js`.

---
 mode/tiki/tiki.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index 5e05b1ff01..5bbd0d790b 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -298,13 +298,13 @@ return {
     if (context && context.noIndent) return 0;
     if (context && /^{\//.test(textAfter))
         context = context.prev;
-        while (context && !context.startOfLine)
-          context = context.prev;
-        if (context) return context.indent + indentUnit;
-        else return 0;
-       },
-    electricChars: "/"
-  };
+    while (context && !context.startOfLine)
+        context = context.prev;
+    if (context) return context.indent + indentUnit;
+    else return 0;
+  },
+  electricChars: "/"
+};
 });
 
 CodeMirror.defineMIME("text/tiki", "tiki");

From 28abf35b52c31726ad273ad6c82dc79077f7689a Mon Sep 17 00:00:00 2001
From: Max Schaefer <xiemaisi@gmail.com>
Date: Mon, 22 May 2017 09:26:55 +0800
Subject: [PATCH 3309/4742] Remove a few useless assignments.

---
 keymap/vim.js         | 1 -
 mode/css/css.js       | 1 -
 mode/go/go.js         | 2 +-
 mode/haxe/haxe.js     | 2 +-
 mode/jinja2/jinja2.js | 2 +-
 mode/stylus/stylus.js | 1 -
 mode/tiki/tiki.js     | 2 +-
 mode/twig/twig.js     | 2 +-
 mode/vb/vb.js         | 1 -
 9 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 4b562ea9c7..7309086c51 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2815,7 +2815,6 @@
         var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
         selections.push(range);
       }
-      primIndex = head.line == lastLine ? selections.length - 1 : 0;
       cm.setSelections(selections);
       selectionEnd.ch = headCh;
       base.ch = baseCh;
diff --git a/mode/css/css.js b/mode/css/css.js
index c9570ebfab..056c48e680 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -401,7 +401,6 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
             ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
           // Dedent relative to current context.
           indent = Math.max(0, cx.indent - indentUnit);
-          cx = cx.prev;
         }
       }
       return indent;
diff --git a/mode/go/go.js b/mode/go/go.js
index 04808adb6f..36131f10fe 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -155,7 +155,7 @@ CodeMirror.defineMode("go", function(config) {
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
       else if (curPunc == "case") ctx.type = "case";
-      else if (curPunc == "}" && ctx.type == "}") ctx = popContext(state);
+      else if (curPunc == "}" && ctx.type == "}") popContext(state);
       else if (curPunc == ctx.type) popContext(state);
       state.startOfLine = false;
       return style;
diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index a9573dd71b..d159d082e9 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -485,7 +485,7 @@ CodeMirror.defineMode("hxml", function () {
 
       if (state.inString == false && ch == "'") {
         state.inString = true;
-        ch = stream.next();
+        stream.next();
       }
 
       if (state.inString == true) {
diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index ed195581cf..5d57d13448 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -107,7 +107,7 @@
         }
         return "variable";
       } else if (stream.eat("{")) {
-        if (ch = stream.eat("#")) {
+        if (stream.eat("#")) {
           state.incomment = true;
           if(!stream.skipTo("#}")) {
             stream.skipToEnd();
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 8b1e8eeb14..b83be16f42 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -684,7 +684,6 @@
              ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
              ch == "{" && (cx.type == "at"))) {
           indent = cx.indent - indentUnit;
-          cx = cx.prev;
         } else if (!(/(\})/.test(ch))) {
           if (/@|\$|\d/.test(ch) ||
               /^\{/.test(textAfter) ||
diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index 5bbd0d790b..b4794e4334 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -144,7 +144,7 @@ CodeMirror.defineMode('tiki', function(config) {
       type = "equals";
 
       if (peek == ">") {
-        ch = stream.next();
+        stream.next();
         peek = stream.peek();
       }
 
diff --git a/mode/twig/twig.js b/mode/twig/twig.js
index 1f2854bef2..b4e98972bc 100644
--- a/mode/twig/twig.js
+++ b/mode/twig/twig.js
@@ -95,7 +95,7 @@
         }
         return "variable";
       } else if (stream.eat("{")) {
-        if (ch = stream.eat("#")) {
+        if (stream.eat("#")) {
           state.incomment = true;
           if (!stream.skipTo("#}")) {
             stream.skipToEnd();
diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index d78f91f701..735eb7f7e8 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -202,7 +202,6 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
         // Handle '.' connected identifiers
         if (current === '.') {
             style = state.tokenize(stream, state);
-            current = stream.current();
             if (style === 'variable') {
                 return 'variable';
             } else {

From a66bcf59d959b2ef724f80080f8d128d9dcf318e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 May 2017 10:13:00 +0200
Subject: [PATCH 3310/4742] Mark version 5.26.0

---
 AUTHORS           |  8 ++++++++
 CHANGELOG.md      | 22 ++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 13 +++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2ac995f950..ed1cfe1cde 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -70,6 +70,7 @@ Apollo Zhu
 AQNOUCH Mohammed
 areos
 Arnab Bose
+Arsène von Wyss
 Arthur Müller
 Arun Narasani
 as3boyan
@@ -259,6 +260,7 @@ Irakli Gozalishvili
 Ivan Kurnosov
 Ivoah
 Jacob Lee
+Jaimin
 Jake Peyser
 Jakob Miland
 Jakub Vrana
@@ -454,6 +456,7 @@ Narciso Jaramillo
 Nathan Williams
 ndr
 nerbert
+NetworkNode
 nextrevision
 ngn
 nguillaumin
@@ -473,6 +476,7 @@ Nisarg Jhaveri
 nlwillia
 noragrossman
 Norman Rzepka
+opl-
 Oreoluwa Onatemowo
 Oskar Segersvärd
 pablo
@@ -515,6 +519,7 @@ Randall Mason
 Randy Burden
 Randy Edmunds
 Rasmus Erik Voel Jensen
+Rasmus Schultz
 ray ratchup
 Ray Ratchup
 Remi Nyborg
@@ -523,6 +528,7 @@ Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
 Rishi Goomar
+Robert Brignull
 Robert Crossfield
 Roberto Abdelkader Martínez Pérez
 robertop23
@@ -534,6 +540,7 @@ Ryan Petrello
 Ryan Prior
 sabaca
 Sam Lee
+Sam Rawlins
 Samuel Ainsworth
 Sam Wilson
 sandeepshetty
@@ -558,6 +565,7 @@ shaun gilchrist
 Shawn A
 Shea Bunge
 sheopory
+Shil S
 Shiv Deepak
 Shmuel Englard
 Shubham Jain
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa356a01cb..5dd793cc57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 5.26.0 (2017-05-22)
+
+### Bug fixes
+
+In textarea-mode, don't reset the input field during composition.
+
+More careful restoration of selections in widgets, during editor redraw.
+
+[javascript mode](http://codemirror.net/mode/javascript/): More TypeScript parsing fixes.
+
+[julia mode](http://codemirror.net/mode/julia/): Fix issue where the mode gets stuck.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Understand cross-line links, parse all bracketed things as links.
+
+[soy mode](http://codemirror.net/mode/soy/): Support single-quoted strings.
+
+[go mode](http://codemirror.net/mode/go/): Don't try to indent inside strings or comments.
+
+### New features
+
+[vim bindings](http://codemirror.net/mode/demo/vim.html): Parse line offsets in line or range specs.
+
 ## 5.25.2 (2017-04-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 3c1d2fe032..aa153d47e8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.25.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.26.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 ac4a58b66c..a57a964a6b 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">22-05-2017: <a href="http://codemirror.net/codemirror-5.26.0.zip">Version 5.26.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>In textarea-mode, don't reset the input field during composition.</li>
+    <li>More careful restoration of selections in widgets, during editor redraw.</li>
+    <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Parse line offsets in line or range specs.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: More TypeScript parsing fixes.</li>
+    <li><a href="http://codemirror.net/mode/julia/">julia mode</a>: Fix issue where the mode gets stuck.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Understand cross-line links, parse all bracketed things as links.</li>
+    <li><a href="http://codemirror.net/mode/soy/">soy mode</a>: Support single-quoted strings.</li>
+    <li><a href="http://codemirror.net/mode/go/">go mode</a>: Don't try to indent inside strings or comments.</li>
+  </ul>
+
   <p class="rel">20-04-2017: <a href="http://codemirror.net/codemirror-5.25.2.zip">Version 5.25.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 527eb8ad48..49a7aa08b1 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.25.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.26.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index dbff5cbdf8..da5322f3af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.25.3",
+  "version": "5.26.0",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index e9dd8b8ae9..f7f558852f 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.25.3"
+CodeMirror.version = "5.26.0"

From 5f5084c848db188a9f027e92d42e08c8446a962c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 May 2017 10:17:01 +0200
Subject: [PATCH 3311/4742] Bump version post-5.26.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index aa153d47e8..5c0177f4fe 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.26.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.26.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index da5322f3af..8484f78a52 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.26.0",
+  "version": "5.26.1",
   "main": "lib/codemirror.js",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
diff --git a/src/edit/main.js b/src/edit/main.js
index f7f558852f..bcfb9de071 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.26.0"
+CodeMirror.version = "5.26.1"

From 2ba7b2c3daafbfda05d4f25aba03eb6422d3b1d7 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 22 May 2017 11:45:07 +0200
Subject: [PATCH 3312/4742] Faster coordsChar for bidi content

This closes #4691 and is based on an idea by Joel <joel.einbinder@gmail.com>.
---
 src/measurement/position_measurement.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 5fb6a6534b..b4bcfda5bc 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -456,20 +456,30 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
     if (cm.options.lineWrapping) {
       ;({begin, end} = wrappedLineExtent(cm, lineObj, preparedMeasure, y))
     }
-    pos = new Pos(lineNo, begin)
+    pos = new Pos(lineNo, Math.floor(begin + (end - begin) / 2))
     let beginLeft = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left
     let dir = beginLeft < x ? 1 : -1
     let prevDiff, diff = beginLeft - x, prevPos
-    do {
+    let steps = Math.ceil((end - begin) / 4)
+    outer: do {
       prevDiff = diff
       prevPos = pos
-      pos = moveVisually(cm, lineObj, pos, dir)
-      if (pos == null || pos.ch < begin || end <= (pos.sticky == "before" ? pos.ch - 1 : pos.ch)) {
-        pos = prevPos
-        break
+      let i = 0
+      for (; i < steps; ++i) {
+        let prevPos = pos
+        pos = moveVisually(cm, lineObj, pos, dir)
+        if (pos == null || pos.ch < begin || end <= (pos.sticky == "before" ? pos.ch - 1 : pos.ch)) {
+          pos = prevPos
+          break outer
+        }
       }
       diff = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left - x
-    } while ((dir < 0) != (diff < 0) && (Math.abs(diff) <= Math.abs(prevDiff)))
+      if (steps > 1) {
+        let diff_change_per_step = Math.abs(diff - prevDiff) / steps
+        steps = Math.min(steps, Math.ceil(Math.abs(diff) / diff_change_per_step))
+        dir = diff < 0 ? 1 : -1
+      }
+    } while (steps > 1 || ((dir < 0) != (diff < 0) && (Math.abs(diff) <= Math.abs(prevDiff))))
     if (Math.abs(diff) > Math.abs(prevDiff)) {
       if ((diff < 0) == (prevDiff < 0)) throw new Error("Broke out of infinite loop in coordsCharInner")
       pos = prevPos

From ce1ee844129c456b7f60425f60e70a35900db8ff Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 May 2017 22:57:20 +0200
Subject: [PATCH 3313/4742] [sql mode] Assign comment token to whitespace at
 start of continued comment line

See https://discuss.codemirror.net/t/how-to-check-if-inside-comment/1252
---
 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 5734afa9f2..eaf03ed8f6 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -170,7 +170,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
         if (state.context && state.context.align == null)
           state.context.align = false;
       }
-      if (stream.eatSpace()) return null;
+      if (state.tokenize == tokenBase && stream.eatSpace()) return null;
 
       var style = state.tokenize(stream, state);
       if (style == "comment") return style;

From 9d1cc45d486b9b7deb263677af305553bced33ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 May 2017 10:39:39 +0200
Subject: [PATCH 3314/4742] [sql mode] Support nested block comments

See https://discuss.codemirror.net/t/nested-block-comments-not-displayed-correctly/1253/3
---
 mode/sql/sql.js | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index eaf03ed8f6..be3b4c6407 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -80,7 +80,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (ch == "/" && stream.eat("*")) {
       // multi-line comments
       // ref: https://kb.askmonty.org/en/comment-syntax/
-      state.tokenize = tokenComment;
+      state.tokenize = tokenComment(1);
       return state.tokenize(stream, state);
     } else if (ch == ".") {
       // .1 for 0.1
@@ -130,20 +130,15 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       return "string";
     };
   }
-  function tokenComment(stream, state) {
-    while (true) {
-      if (stream.skipTo("*")) {
-        stream.next();
-        if (stream.eat("/")) {
-          state.tokenize = tokenBase;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        break;
-      }
+  function tokenComment(depth) {
+    return function(stream, state) {
+      var m = stream.match(/^.*?(\/\*|\*\/)/)
+      if (!m) stream.skipToEnd()
+      else if (m[1] == "/*") state.tokenize = tokenComment(depth + 1)
+      else if (depth > 1) state.tokenize = tokenComment(depth - 1)
+      else state.tokenize = tokenBase
+      return "comment"
     }
-    return "comment";
   }
 
   function pushContext(stream, state, type) {

From 84b9ae4c834a1c3073c41a3facaaa2eefe53da03 Mon Sep 17 00:00:00 2001
From: Martin Zagora <zaggino@gmail.com>
Date: Tue, 23 May 2017 13:38:42 +1000
Subject: [PATCH 3315/4742] [javascript mode] Add failing TS typecast test

---
 mode/javascript/test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 9631e96048..bfb238fb7b 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -332,6 +332,9 @@
      "  [keyword return] [keyword this].[property property];",
      "}")
 
+  TS("typescript_complex_type_casting",
+     "[keyword const] [def giftpay] [operator =] [variable config].[property get]([string 'giftpay']) [keyword as] { [[ [variable platformUuid]: [variable-3 string] ]]: { [property version]: [variable-3 number]; [property apiCode]: [variable-3 string]; } };")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From c3bf7122fd34ead06a37a9f7e41166f57ff30014 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 May 2017 10:44:08 +0200
Subject: [PATCH 3316/4742] [javascript mode] Support TypeScript-style type
 casts

Issue #4759
---
 mode/javascript/javascript.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 73113c6b99..d150d4c7be 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -61,9 +61,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         "protected": kw("modifier"),
         "abstract": kw("modifier"),
 
-        // operators
-        "as": operator,
-
         // types
         "string": type, "number": type, "boolean": type, "any": type
       };
@@ -439,6 +436,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
     if (type == ".") return cont(property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
+    if (isTS && value == "as") { cx.marked = "keyword"; return cont(typeexpr, me) }
   }
   function quasi(type, value) {
     if (type != "quasi") return pass();

From 51bb848104c1503c52301efbbc0209108f18cda3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 May 2017 11:30:04 +0200
Subject: [PATCH 3317/4742] Unset update.force before looping in
 postUpdateDisplay

Issue #4727
---
 src/display/update_display.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/display/update_display.js b/src/display/update_display.js
index affa2a759a..e58db48a51 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -179,6 +179,7 @@ export function postUpdateDisplay(cm, update) {
     updateSelection(cm)
     updateScrollbars(cm, barMeasure)
     setDocumentHeight(cm, barMeasure)
+    update.force = false
   }
 
   update.signal(cm, "update", cm)

From bd082d9fa6990dd3d85c8f9a59f439405d057ac6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 May 2017 15:30:37 +0200
Subject: [PATCH 3318/4742] Make mouse button behavior more configurable

FEATURE: Mouse button clicks can now be bound in keymaps by using
names like `"LeftClick"` or `"Ctrl-Alt-MiddleTripleClick"`. When bound
to a function, that function will be passed the position of the click
as second argument.

FEATURE: The behavior of mouse selection and dragging can now be
customized with the
[`configureMouse`](http://codemirror.net/doc/manual.html#option_configureMouse)
option.
---
 doc/manual.html                |  34 +++++-
 src/edit/key_events.js         |   5 +-
 src/edit/methods.js            |   2 +
 src/edit/mouse_events.js       | 206 ++++++++++++++++++++-------------
 src/edit/options.js            |   1 +
 src/input/keymap.js            |  15 ++-
 src/model/selection_updates.js |  12 +-
 test/test.js                   |  43 +++++++
 8 files changed, 225 insertions(+), 93 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 5c0177f4fe..cb7ee428d7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -314,6 +314,26 @@ <h2>Configuration</h2>
       by <a href="#option_keyMap"><code>keyMap</code></a>. Should be
       either null, or a valid <a href="#keymaps">key map</a> value.</dd>
 
+      <dt id="option_configureMouse"><code><strong>configureMouse</strong>: fn(cm: CodeMirror, repeat: "single" | "double" | "triple", event: Event) → Object</code></dt>
+      <dd>Allows you to configure the behavior of mouse selection and
+      dragging. The function is called when the left mouse button is
+      pressed. The returned object may have the following properties:
+        <dl>
+          <dt><code><strong>unit</strong>: "char" | "word" | "line" | "rectangle" | fn(CodeMirror, Pos) → {from: Pos, to: Pos}</code></dt>
+          <dd>The unit by which to select. May be one of the built-in
+          units, or a function that takes a position and returns a
+          range around that, for a custom unit.</dd>
+          <dt><code><strong>extend</strong>: bool</code></dt>
+          <dd>Whether to extend the existing selection range or start a new one.</dd>
+          <dt><code><strong>addNew</strong>: bool</code></dt>
+          <dd>When enabled, this adds a new range to the existing selection, rather than replacing it.</dd>
+          <dt><code><strong>moveOnDrag</strong>: bool</code></dt>
+          <dd>When the mouse even drags content around inside the
+          editor, this controls whether it is copied (false) or moved
+          (true).</dt>
+        </dl>
+      </dd>
+
       <dt id="option_lineWrapping"><code><strong>lineWrapping</strong>: boolean</code></dt>
       <dd>Whether CodeMirror should scroll or wrap for long lines.
       Defaults to <code>false</code> (scroll).</dd>
@@ -764,9 +784,10 @@ <h2>Events</h2>
 <section id=keymaps>
     <h2>Key Maps</h2>
 
-    <p>Key maps are ways to associate keys with functionality. A key map
-    is an object mapping strings that identify the keys to functions
-    that implement their functionality.</p>
+    <p>Key maps are ways to associate keys and mouse buttons with
+    functionality. A key map is an object mapping strings that
+    identify the buttons to functions that implement their
+    functionality.</p>
 
     <p>The CodeMirror distributions comes
     with <a href="../demo/emacs.html">Emacs</a>, <a href="../demo/vim.html">Vim</a>,
@@ -798,6 +819,13 @@ <h2>Key Maps</h2>
     or <code>'q'</code>. Due to limitations in the way browsers fire
     key events, these may not be prefixed with modifiers.</p>
 
+    <p>To bind mouse buttons, use the names `LeftClick`,
+    `MiddleClick`, and `RightClick`. These can also be prefixed with
+    modifiers, and in addition, the word `Double` or `Triple` can be
+    put before `Click` (as in `LeftDoubleClick`) to bind a double- or
+    triple-click. The function for such a binding is passed the
+    position that was clicked as second argument.</p>
+
     <p id="normalizeKeyMap">Multi-stroke key bindings can be specified
     by separating the key names by spaces in the property name, for
     example <code>Ctrl-X Ctrl-V</code>. When a map contains
diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index 8e695473ba..2955e4ae0c 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -40,8 +40,11 @@ function lookupKeyForEditor(cm, name, handle) {
     || lookupKey(name, cm.options.keyMap, handle, cm)
 }
 
+// Note that, despite the name, this function is also used to check
+// for bound mouse clicks.
+
 let stopSeq = new Delayed
-function dispatchKey(cm, name, e, handle) {
+export function dispatchKey(cm, name, e, handle) {
   let seq = cm.state.keySeq
   if (seq) {
     if (isModifierKey(name)) return "handled"
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 4d34bacc33..db2ffd68dd 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -7,6 +7,7 @@ import { getLineStyles, getStateBefore, takeToken } from "../line/highlight"
 import { indentLine } from "../input/indent"
 import { triggerElectric } from "../input/input"
 import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
+import { onMouseDown } from "./mouse_events"
 import { getKeyMap } from "../input/keymap"
 import { endOfLine, moveLogically, moveVisually } from "../input/movement"
 import { methodOp, operation, runInOp } from "../display/operations"
@@ -258,6 +259,7 @@ export default function(CodeMirror) {
     triggerOnKeyDown: methodOp(onKeyDown),
     triggerOnKeyPress: methodOp(onKeyPress),
     triggerOnKeyUp: onKeyUp,
+    triggerOnMouseDown: methodOp(onMouseDown),
 
     execCommand: function(cmd) {
       if (commands.hasOwnProperty(cmd))
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 52131bc5cd..f816a4ad41 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -12,6 +12,43 @@ import { activeElt } from "../util/dom"
 import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event"
 import { dragAndDrop } from "../util/feature_detection"
 import { bind, countColumn, findColumn, sel_mouse } from "../util/misc"
+import { addModifierNames } from "../input/keymap"
+import { Pass } from "../util/misc"
+
+import { dispatchKey } from "./key_events"
+import { commands } from "./commands"
+
+const DOUBLECLICK_DELAY = 400
+
+class PastClick {
+  constructor(time, pos, button) {
+    this.time = time
+    this.pos = pos
+    this.button = button
+  }
+
+  compare(time, pos, button) {
+    return this.time + DOUBLECLICK_DELAY > time &&
+      cmp(pos, this.pos) == 0 && button == this.button
+  }
+}
+
+let lastClick, lastDoubleClick
+function clickRepeat(pos, button) {
+  let now = +new Date
+  if (lastDoubleClick && lastDoubleClick.compare(now, pos, button)) {
+    lastClick = lastDoubleClick = null
+    return "triple"
+  } else if (lastClick && lastClick.compare(now, pos, button)) {
+    lastDoubleClick = new PastClick(now, pos, button)
+    lastClick = null
+    return "double"
+  } else {
+    lastClick = new PastClick(now, pos, button)
+    lastDoubleClick = null
+    return "single"
+  }
+}
 
 // A mouse down can be a single click, double click, triple click,
 // start of selection drag, start of text drag, new cursor
@@ -34,61 +71,79 @@ export function onMouseDown(e) {
     return
   }
   if (clickInGutter(cm, e)) return
-  let start = posFromMouse(cm, e)
+  let pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single"
   window.focus()
 
-  switch (e_button(e)) {
-  case 1:
-    // #3261: make sure, that we're not starting a second selection
-    if (cm.state.selectingText)
-      cm.state.selectingText(e)
-    else if (start)
-      leftButtonDown(cm, e, start)
-    else if (e_target(e) == display.scroller)
-      e_preventDefault(e)
-    break
-  case 2:
-    if (webkit) cm.state.lastMiddleDown = +new Date
-    if (start) extendSelection(cm.doc, start)
+  // #3261: make sure, that we're not starting a second selection
+  if (button == 1 && cm.state.selectingText)
+    cm.state.selectingText(e)
+
+  if (pos && handleMappedButton(cm, button, pos, repeat, e)) return
+
+  if (button == 1) {
+    if (pos) leftButtonDown(cm, pos, repeat, e)
+    else if (e_target(e) == display.scroller) e_preventDefault(e)
+  } else if (button == 2) {
+    if (pos) extendSelection(cm.doc, pos)
     setTimeout(() => display.input.focus(), 20)
-    e_preventDefault(e)
-    break
-  case 3:
+  } else if (button == 3) {
     if (captureRightClick) onContextMenu(cm, e)
     else delayBlurEvent(cm)
-    break
   }
 }
 
-let lastClick, lastDoubleClick
-function leftButtonDown(cm, e, start) {
+function handleMappedButton(cm, button, pos, repeat, event) {
+  let name = "Click"
+  if (repeat == "double") name = "Double" + name
+  else if (repeat == "triple") name = "Triple" + name
+  name = (button == 1 ? "Left" : button == 2 ? "Middle" : "Right") + name
+
+  return dispatchKey(cm,  addModifierNames(name, event), event, bound => {
+    if (typeof bound == "string") bound = commands[bound]
+    if (!bound) return false
+    let done = false
+    try {
+      if (cm.isReadOnly()) cm.state.suppressEdits = true
+      done = bound(cm, pos) != Pass
+    } finally {
+      cm.state.suppressEdits = false
+    }
+    return done
+  })
+}
+
+function configureMouse(cm, repeat, event) {
+  let option = cm.getOption("configureMouse")
+  let value = option ? option(cm, repeat, event) : {}
+  if (value.unit == null) {
+    let rect = chromeOS ? event.shiftKey && event.metaKey : event.altKey
+    value.unit = rect ? "rectangle" : repeat == "single" ? "char" : repeat == "double" ? "word" : "line"
+  }
+  if (value.extend == null || cm.doc.extend) value.extend = cm.doc.extend || event.shiftKey
+  if (value.addNew == null) value.addNew = mac ? event.metaKey : event.ctrlKey
+  if (value.moveOnDrag == null) value.moveOnDrag = !(mac ? event.altKey : event.ctrlKey)
+  return value
+}
+
+function leftButtonDown(cm, pos, repeat, event) {
   if (ie) setTimeout(bind(ensureFocus, cm), 0)
   else cm.curOp.focus = activeElt()
 
-  let now = +new Date, type
-  if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
-    type = "triple"
-  } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
-    type = "double"
-    lastDoubleClick = {time: now, pos: start}
-  } else {
-    type = "single"
-    lastClick = {time: now, pos: start}
-  }
+  let behavior = configureMouse(cm, repeat, event)
 
-  let sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained
+  let sel = cm.doc.sel, contained
   if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
-      type == "single" && (contained = sel.contains(start)) > -1 &&
-      (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
-      (cmp(contained.to(), start) > 0 || start.xRel < 0))
-    leftButtonStartDrag(cm, e, start, modifier)
+      repeat == "single" && (contained = sel.contains(pos)) > -1 &&
+      (cmp((contained = sel.ranges[contained]).from(), pos) < 0 || pos.xRel > 0) &&
+      (cmp(contained.to(), pos) > 0 || pos.xRel < 0))
+    leftButtonStartDrag(cm, event, pos, behavior)
   else
-    leftButtonSelect(cm, e, start, type, modifier)
+    leftButtonSelect(cm, event, pos, behavior)
 }
 
 // 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) {
+function leftButtonStartDrag(cm, event, pos, behavior) {
   let display = cm.display, moved = false
   let dragEnd = operation(cm, e => {
     if (webkit) display.scroller.draggable = false
@@ -99,8 +154,8 @@ function leftButtonStartDrag(cm, e, start, modifier) {
     off(display.scroller, "drop", dragEnd)
     if (!moved) {
       e_preventDefault(e)
-      if (!modifier)
-        extendSelection(cm.doc, start)
+      if (!behavior.addNew)
+        extendSelection(cm.doc, pos, null, null, behavior.extend)
       // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
       if (webkit || ie && ie_version == 9)
         setTimeout(() => {document.body.focus(); display.input.focus()}, 20)
@@ -109,13 +164,13 @@ function leftButtonStartDrag(cm, e, start, modifier) {
     }
   })
   let mouseMove = function(e2) {
-    moved = moved || Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) >= 10
+    moved = moved || Math.abs(event.clientX - e2.clientX) + Math.abs(event.clientY - e2.clientY) >= 10
   }
   let dragStart = () => moved = true
   // Let the drag handler handle this.
   if (webkit) display.scroller.draggable = true
   cm.state.draggingText = dragEnd
-  dragEnd.copy = mac ? e.altKey : e.ctrlKey
+  dragEnd.copy = !behavior.moveOnDrag
   // IE's approach to draggable
   if (display.scroller.dragDrop) display.scroller.dragDrop()
   on(document, "mouseup", dragEnd)
@@ -127,13 +182,21 @@ function leftButtonStartDrag(cm, e, start, modifier) {
   setTimeout(() => display.input.focus(), 20)
 }
 
+function rangeForUnit(cm, pos, unit) {
+  if (unit == "char") return new Range(pos, pos)
+  if (unit == "word") return cm.findWordAt(pos)
+  if (unit == "line") return new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)))
+  let result = unit(cm, pos)
+  return new Range(result.from, result.to)
+}
+
 // Normal selection, as opposed to text dragging.
-function leftButtonSelect(cm, e, start, type, addNew) {
+function leftButtonSelect(cm, event, start, behavior) {
   let display = cm.display, doc = cm.doc
-  e_preventDefault(e)
+  e_preventDefault(event)
 
   let ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges
-  if (addNew && !e.shiftKey) {
+  if (behavior.addNew && !behavior.extend) {
     ourIndex = doc.sel.contains(start)
     if (ourIndex > -1)
       ourRange = ranges[ourIndex]
@@ -144,28 +207,19 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     ourIndex = doc.sel.primIndex
   }
 
-  if (chromeOS ? e.shiftKey && e.metaKey : e.altKey) {
-    type = "rect"
-    if (!addNew) ourRange = new Range(start, start)
-    start = posFromMouse(cm, e, true, true)
+  if (behavior.unit == "rectangle") {
+    if (!behavior.addNew) ourRange = new Range(start, start)
+    start = posFromMouse(cm, event, true, true)
     ourIndex = -1
-  } else if (type == "double") {
-    let word = cm.findWordAt(start)
-    if (cm.display.shift || doc.extend)
-      ourRange = extendRange(doc, ourRange, word.anchor, word.head)
-    else
-      ourRange = word
-  } else if (type == "triple") {
-    let line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)))
-    if (cm.display.shift || doc.extend)
-      ourRange = extendRange(doc, ourRange, line.anchor, line.head)
-    else
-      ourRange = line
   } else {
-    ourRange = extendRange(doc, ourRange, start)
+    let range = rangeForUnit(cm, start, behavior.unit)
+    if (behavior.extend)
+      ourRange = extendRange(ourRange, range.anchor, range.head, behavior.extend)
+    else
+      ourRange = range
   }
 
-  if (!addNew) {
+  if (!behavior.addNew) {
     ourIndex = 0
     setSelection(doc, new Selection([ourRange], 0), sel_mouse)
     startSel = doc.sel
@@ -173,7 +227,7 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     ourIndex = ranges.length
     setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
                  {scroll: false, origin: "*mouse"})
-  } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
+  } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) {
     setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
                  {scroll: false, origin: "*mouse"})
     startSel = doc.sel
@@ -186,7 +240,7 @@ function leftButtonSelect(cm, e, start, type, addNew) {
     if (cmp(lastPos, pos) == 0) return
     lastPos = pos
 
-    if (type == "rect") {
+    if (behavior.unit == "rectangle") {
       let ranges = [], tabSize = cm.options.tabSize
       let startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize)
       let posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize)
@@ -205,20 +259,14 @@ function leftButtonSelect(cm, e, start, type, addNew) {
       cm.scrollIntoView(pos)
     } else {
       let oldRange = ourRange
-      let anchor = oldRange.anchor, head = pos
-      if (type != "single") {
-        let range
-        if (type == "double")
-          range = cm.findWordAt(pos)
-        else
-          range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)))
-        if (cmp(range.anchor, anchor) > 0) {
-          head = range.head
-          anchor = minPos(oldRange.from(), range.anchor)
-        } else {
-          head = range.anchor
-          anchor = maxPos(oldRange.to(), range.head)
-        }
+      let range = rangeForUnit(cm, pos, behavior.unit)
+      let anchor = oldRange.anchor, head
+      if (cmp(range.anchor, anchor) > 0) {
+        head = range.head
+        anchor = minPos(oldRange.from(), range.anchor)
+      } else {
+        head = range.anchor
+        anchor = maxPos(oldRange.to(), range.head)
       }
       let ranges = startSel.ranges.slice(0)
       ranges[ourIndex] = new Range(clipPos(doc, anchor), head)
@@ -235,7 +283,7 @@ function leftButtonSelect(cm, e, start, type, addNew) {
 
   function extend(e) {
     let curCount = ++counter
-    let cur = posFromMouse(cm, e, true, type == "rect")
+    let cur = posFromMouse(cm, e, true, behavior.unit == "rectangle")
     if (!cur) return
     if (cmp(cur, lastPos) != 0) {
       cm.curOp.focus = activeElt()
diff --git a/src/edit/options.js b/src/edit/options.js
index 930c41dd21..8154ba928c 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -92,6 +92,7 @@ export function defineOptions(CodeMirror) {
     if (next.attach) next.attach(cm, prev || null)
   })
   option("extraKeys", null)
+  option("configureMouse", null)
 
   option("lineWrapping", false, wrappingChanged, true)
   option("gutters", [], cm => {
diff --git a/src/input/keymap.js b/src/input/keymap.js
index 3a107bb466..36ac3e61b9 100644
--- a/src/input/keymap.js
+++ b/src/input/keymap.js
@@ -123,11 +123,8 @@ export function isModifierKey(value) {
   return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"
 }
 
-// Look up the name of a key as indicated by an event object.
-export function keyName(event, noShift) {
-  if (presto && event.keyCode == 34 && event["char"]) return false
-  let base = keyNames[event.keyCode], name = base
-  if (name == null || event.altGraphKey) return false
+export function addModifierNames(name, event, noShift) {
+  let base = name
   if (event.altKey && base != "Alt") name = "Alt-" + name
   if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name
   if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name
@@ -135,6 +132,14 @@ export function keyName(event, noShift) {
   return name
 }
 
+// Look up the name of a key as indicated by an event object.
+export function keyName(event, noShift) {
+  if (presto && event.keyCode == 34 && event["char"]) return false
+  let name = keyNames[event.keyCode]
+  if (name == null || event.altGraphKey) return false
+  return addModifierNames(name, event, noShift)
+}
+
 export function getKeyMap(val) {
   return typeof val == "string" ? keyMap[val] : val
 }
diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index 246b328581..bf5ad8c76f 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -16,8 +16,8 @@ import { normalizeSelection, Range, Selection, simpleSelection } from "./selecti
 // include a given position (and optionally a second position).
 // Otherwise, simply returns the range between the given positions.
 // Used for cursor motion and such.
-export function extendRange(doc, range, head, other) {
-  if (doc.cm && doc.cm.display.shift || doc.extend) {
+export function extendRange(range, head, other, extend) {
+  if (extend) {
     let anchor = range.anchor
     if (other) {
       let posBefore = cmp(head, anchor) < 0
@@ -35,16 +35,18 @@ export function extendRange(doc, range, head, other) {
 }
 
 // Extend the primary selection range, discard the rest.
-export function extendSelection(doc, head, other, options) {
-  setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options)
+export function extendSelection(doc, head, other, options, extend) {
+  if (extend == null) extend = doc.cm && (doc.cm.display.shift || doc.extend)
+  setSelection(doc, new Selection([extendRange(doc.sel.primary(), head, other, extend)], 0), options)
 }
 
 // Extend all selections (pos is an array of selections with length
 // equal the number of selections)
 export function extendSelections(doc, heads, options) {
   let out = []
+  let extend = doc.cm && (doc.cm.display.shift || doc.extend)
   for (let i = 0; i < doc.sel.ranges.length; i++)
-    out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null)
+    out[i] = extendRange(doc.sel.ranges[i], heads[i], null, extend)
   let newSel = normalizeSelection(out, doc.sel.primIndex)
   setSelection(doc, newSel, options)
 }
diff --git a/test/test.js b/test/test.js
index fafb19bc39..06f211c216 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1892,6 +1892,49 @@ testCM("addKeyMap", function(cm) {
   eqCursorPos(cm.getCursor(), Pos(0, 3, "before"));
 }, {value: "abc"});
 
+function mouseDown(cm, button, pos, mods) {
+  let coords = cm.charCoords(pos, "window")
+  let event = {type: "mousedown",
+               preventDefault: Math.min,
+               which: button,
+               target: cm.display.lineDiv,
+               clientX: coords.left, clientY: coords.top}
+  if (mods) for (let prop in mods) event[prop] = mods[prop]
+  cm.triggerOnMouseDown(event)
+}
+
+testCM("mouseBinding", function(cm) {
+  var fired = []
+  cm.addKeyMap({
+    "Shift-LeftClick": function(_cm, pos) {
+      eqCharPos(pos, Pos(1, 2))
+      fired.push("a")
+    },
+    "Shift-LeftDoubleClick": function() { fired.push("b") },
+    "Shift-LeftTripleClick": function() { fired.push("c") }
+  })
+
+  function send(button, mods) { mouseDown(cm, button, Pos(1, 2), mods) }
+  send(1, {shiftKey: true})
+  send(1, {shiftKey: true})
+  send(1, {shiftKey: true})
+  send(1, {})
+  send(2, {ctrlKey: true})
+  send(2, {ctrlKey: true})
+  eq(fired.join(" "), "a b c")
+}, {value: "foo\nbar\nbaz"})
+
+testCM("configureMouse", function(cm) {
+  cm.setOption("configureMouse", function() { return {unit: "word"} })
+  mouseDown(cm, 1, Pos(0, 5))
+  eqCharPos(cm.getCursor("from"), Pos(0, 4))
+  eqCharPos(cm.getCursor("to"), Pos(0, 7))
+  cm.setOption("configureMouse", function() { return {extend: true} })
+  mouseDown(cm, 1, Pos(0, 0))
+  eqCharPos(cm.getCursor("from"), Pos(0, 0))
+  eqCharPos(cm.getCursor("to"), Pos(0, 4))
+}, {value: "foo bar baz"})
+
 testCM("findPosH", function(cm) {
   forEach([{from: Pos(0, 0), to: Pos(0, 1, "before"), by: 1},
            {from: Pos(0, 0), to: Pos(0, 0), by: -1, hitSide: true},

From dda5d7220f0e3cbf8c203223ee4e7dc2d5c04bec Mon Sep 17 00:00:00 2001
From: Leonid Khachaturov <Leonid.Khachaturov@jetbrains.com>
Date: Tue, 23 May 2017 16:36:51 +0200
Subject: [PATCH 3319/4742] [sass mode] Fix auto-loading

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

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index ba0e05626c..7d8135bfe5 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -447,7 +447,7 @@ CodeMirror.defineMode("sass", function(config) {
       return state.scopes[0].offset;
     }
   };
-});
+}, "css");
 
 CodeMirror.defineMIME("text/x-sass", "sass");
 

From 09adaf419347ee69ac5dad816eb2da697f8f6106 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 May 2017 19:21:22 +0200
Subject: [PATCH 3320/4742] Fix ES6-isms in test.js

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

diff --git a/test/test.js b/test/test.js
index 06f211c216..d1abc7a812 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1893,13 +1893,13 @@ testCM("addKeyMap", function(cm) {
 }, {value: "abc"});
 
 function mouseDown(cm, button, pos, mods) {
-  let coords = cm.charCoords(pos, "window")
-  let event = {type: "mousedown",
+  var coords = cm.charCoords(pos, "window")
+  var event = {type: "mousedown",
                preventDefault: Math.min,
                which: button,
                target: cm.display.lineDiv,
                clientX: coords.left, clientY: coords.top}
-  if (mods) for (let prop in mods) event[prop] = mods[prop]
+  if (mods) for (var prop in mods) event[prop] = mods[prop]
   cm.triggerOnMouseDown(event)
 }
 

From 3c8b5a729bc5d4a99168be2ab6de070bcbaab16f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 May 2017 16:41:41 +0200
Subject: [PATCH 3321/4742] [searchcursor addon] Refactor

---
 addon/search/searchcursor.js | 310 +++++++++++++++++------------------
 test/search_test.js          |   8 +-
 2 files changed, 158 insertions(+), 160 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index b70242ee4b..85015f8245 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -1,189 +1,187 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
-(function(mod) {
+;(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";
-  var Pos = CodeMirror.Pos;
+  "use strict"
+  var Pos = CodeMirror.Pos
+
+  function ensureGlobal(regexp) {
+    return regexp.global ? regexp : new RegExp(regexp.source, regexp.ignoreCase ? "ig" : "g")
+  }
+
+  function searchRegexpForward(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) {
+      regexp.lastIndex = ch
+      var string = doc.getLine(line), match = regexp.exec(string)
+      if (match && match[0].length)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function searchRegexpBackward(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
+      var string = doc.getLine(line), cutOff = 0, match
+      if (ch > -1) string = string.slice(0, ch)
+      for (;;) {
+        regexp.lastIndex = cutOff
+        var newMatch = regexp.exec(string)
+        if (!newMatch) break
+        match = newMatch
+        cutOff = match.index + (match[0].length || 1)
+        if (cutOff == line.length) break
+      }
+
+      if (match && match[0].length)
+        return {from: Pos(line, match.index),
+                to: Pos(line, match.index + match[0].length),
+                match: match}
+    }
+  }
+
+  function doFold(str) { return str.toLowerCase() }
+  function noFold(str) { return str }
+
+  // Maps a position in a case-folded line back to a position in the original line
+  // (compensating for codepoints increasing in number during folding)
+  function adjustPos(orig, folded, pos) {
+    if (orig.length == folded.length) return pos
+    for (var pos1 = Math.min(pos, orig.length);;) {
+      var len1 = orig.slice(0, pos1).toLowerCase().length
+      if (len1 < pos) ++pos1
+      else if (len1 > pos) --pos1
+      else return pos1
+    }
+  }
+
+  function searchStringForward(doc, query, start, caseFold) {
+    // Empty string would match anything and never progress, so we
+    // define it to match nothing instead.
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, last = doc.lastLine() + 1 - lines.length; line <= last; line++, ch = 0) {
+      var orig = doc.getLine(line).slice(ch), string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.indexOf(lines[0])
+        if (found == -1) continue search
+        var start = adjustPos(orig, string, found) + ch
+        return {from: Pos(line, adjustPos(orig, string, found) + ch),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length) + ch)}
+      } else {
+        var cutFrom = string.length - lines[0].length
+        if (string.slice(cutFrom) != lines[0]) continue search
+        for (var i = 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(line + i)) != lines[i]) continue search
+        var end = doc.getLine(line + lines.length - 1), endString = fold(end), lastLine = lines[lines.length - 1]
+        if (end.slice(0, lastLine.length) != lastLine) continue search
+        return {from: Pos(line, adjustPos(orig, string, cutFrom) + ch),
+                to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length))}
+      }
+    }
+  }
+
+  function searchStringBackward(doc, query, start, caseFold) {
+    if (!query.length) return null
+    var fold = caseFold ? doFold : noFold
+    var lines = fold(query).split(/\r|\n\r?/)
+
+    search: for (var line = start.line, ch = start.ch, first = doc.firstLine() - 1 + lines.length; line >= first; line--, ch = -1) {
+      var orig = doc.getLine(line)
+      if (ch > -1) orig = orig.slice(0, ch)
+      var string = fold(orig)
+      if (lines.length == 1) {
+        var found = string.lastIndexOf(lines[0])
+        if (found == -1) continue search
+        return {from: Pos(line, adjustPos(orig, string, found)),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length))}
+      } else {
+        var lastLine = lines[lines.length - 1]
+        if (string.slice(0, lastLine.length) != lastLine) continue search
+        for (var i = 1, start = line - lines.length + 1; i < lines.length - 1; i++)
+          if (fold(doc.getLine(start + i)) != lines[i]) continue search
+        var top = doc.getLine(line + 1 - lines.length), topString = fold(top)
+        if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search
+        return {from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length)),
+                to: Pos(line, adjustPos(orig, string, lastLine.length))}
+      }
+    }
+  }
 
   function SearchCursor(doc, query, pos, caseFold) {
-    this.atOccurrence = false; this.doc = doc;
-    if (caseFold == null && typeof query == "string") caseFold = false;
-
-    pos = pos ? doc.clipPos(pos) : Pos(0, 0);
-    this.pos = {from: pos, to: pos};
-
-    // The matches method is filled in based on the type of query.
-    // It takes a position and a direction, and returns an object
-    // describing the next occurrence of the query, or null if no
-    // more matches were found.
-    if (typeof query != "string") { // Regexp match
-      if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "ig" : "g");
+    this.atOccurrence = false
+    this.doc = doc
+    pos = pos ? doc.clipPos(pos) : Pos(0, 0)
+    this.pos = {from: pos, to: pos}
+
+    if (typeof query == "string") {
+      if (caseFold == null) caseFold = false
       this.matches = function(reverse, pos) {
-        if (reverse) {
-          query.lastIndex = 0;
-          var line = doc.getLine(pos.line).slice(0, pos.ch), cutOff = 0, match, start;
-          for (;;) {
-            query.lastIndex = cutOff;
-            var newMatch = query.exec(line);
-            if (!newMatch) break;
-            match = newMatch;
-            start = match.index;
-            cutOff = match.index + (match[0].length || 1);
-            if (cutOff == line.length) break;
-          }
-          var matchLen = (match && match[0].length) || 0;
-          if (!matchLen) {
-            if (start == 0 && line.length == 0) {match = undefined;}
-            else if (start != doc.getLine(pos.line).length) {
-              matchLen++;
-            }
-          }
-        } else {
-          query.lastIndex = pos.ch;
-          var line = doc.getLine(pos.line), match = query.exec(line);
-          var matchLen = (match && match[0].length) || 0;
-          var start = match && match.index;
-          if (start + matchLen != line.length && !matchLen) matchLen = 1;
-        }
-        if (match && matchLen)
-          return {from: Pos(pos.line, start),
-                  to: Pos(pos.line, start + matchLen),
-                  match: match};
-      };
-    } else { // String query
-      var origQuery = query;
-      if (caseFold) query = query.toLowerCase();
-      var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
-      var target = query.split("\n");
-      // Different methods for single-line and multi-line queries
-      if (target.length == 1) {
-        if (!query.length) {
-          // Empty string would match anything and never progress, so
-          // we define it to match nothing instead.
-          this.matches = function() {};
-        } else {
-          this.matches = function(reverse, pos) {
-            if (reverse) {
-              var orig = doc.getLine(pos.line).slice(0, pos.ch), line = fold(orig);
-              var match = line.lastIndexOf(query);
-              if (match > -1) {
-                match = adjustPos(orig, line, match);
-                return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-              }
-             } else {
-               var orig = doc.getLine(pos.line).slice(pos.ch), line = fold(orig);
-               var match = line.indexOf(query);
-               if (match > -1) {
-                 match = adjustPos(orig, line, match) + pos.ch;
-                 return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-               }
-            }
-          };
-        }
-      } else {
-        var origTarget = origQuery.split("\n");
-        this.matches = function(reverse, pos) {
-          var last = target.length - 1;
-          if (reverse) {
-            if (pos.line - (target.length - 1) < doc.firstLine()) return;
-            if (fold(doc.getLine(pos.line).slice(0, origTarget[last].length)) != target[target.length - 1]) return;
-            var to = Pos(pos.line, origTarget[last].length);
-            for (var ln = pos.line - 1, i = last - 1; i >= 1; --i, --ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            var line = doc.getLine(ln), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            return {from: Pos(ln, cut), to: to};
-          } else {
-            if (pos.line + (target.length - 1) > doc.lastLine()) return;
-            var line = doc.getLine(pos.line), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            var from = Pos(pos.line, cut);
-            for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
-            return {from: from, to: Pos(ln, origTarget[last].length)};
-          }
-        };
+        return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos, caseFold)
+      }
+    } else {
+      query = ensureGlobal(query)
+      this.matches = function(reverse, pos) {
+        return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos)
       }
     }
   }
 
   SearchCursor.prototype = {
-    findNext: function() {return this.find(false);},
-    findPrevious: function() {return this.find(true);},
+    findNext: function() {return this.find(false)},
+    findPrevious: function() {return this.find(true)},
 
     find: function(reverse) {
-      var self = this, pos = this.doc.clipPos(reverse ? this.pos.from : this.pos.to);
-      function savePosAndFail(line) {
-        var pos = Pos(line, 0);
-        self.pos = {from: pos, to: pos};
-        self.atOccurrence = false;
-        return false;
-      }
-
-      for (;;) {
-        if (this.pos = this.matches(reverse, pos)) {
-          this.atOccurrence = true;
-          return this.pos.match || true;
-        }
-        if (reverse) {
-          if (!pos.line) return savePosAndFail(0);
-          pos = Pos(pos.line-1, this.doc.getLine(pos.line-1).length);
-        }
-        else {
-          var maxLine = this.doc.lineCount();
-          if (pos.line == maxLine - 1) return savePosAndFail(maxLine);
-          pos = Pos(pos.line + 1, 0);
-        }
+      var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
+      if (result) {
+        this.pos = result
+        this.atOccurrence = true
+        return this.pos.match || true
+      } else {
+        var end = Pos(reverse ? this.doc.firstLine() : this.doc.lastLine() + 1, 0)
+        this.pos = {from: end, to: end}
+        return this.atOccurrence = false
       }
     },
 
-    from: function() {if (this.atOccurrence) return this.pos.from;},
-    to: function() {if (this.atOccurrence) return this.pos.to;},
+    from: function() {if (this.atOccurrence) return this.pos.from},
+    to: function() {if (this.atOccurrence) return this.pos.to},
 
     replace: function(newText, origin) {
-      if (!this.atOccurrence) return;
-      var lines = CodeMirror.splitLines(newText);
-      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin);
+      if (!this.atOccurrence) return
+      var lines = CodeMirror.splitLines(newText)
+      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));
-    }
-  };
-
-  // Maps a position in a case-folded line back to a position in the original line
-  // (compensating for codepoints increasing in number during folding)
-  function adjustPos(orig, folded, pos) {
-    if (orig.length == folded.length) return pos;
-    for (var pos1 = Math.min(pos, orig.length);;) {
-      var len1 = orig.slice(0, pos1).toLowerCase().length;
-      if (len1 < pos) ++pos1;
-      else if (len1 > pos) --pos1;
-      else return pos1;
+                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0))
     }
   }
 
   CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this.doc, query, pos, caseFold);
-  });
+    return new SearchCursor(this.doc, query, pos, caseFold)
+  })
   CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this, query, pos, caseFold);
-  });
+    return new SearchCursor(this, query, pos, caseFold)
+  })
 
   CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
-    var ranges = [];
-    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
+    var ranges = []
+    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold)
     while (cur.findNext()) {
-      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
-      ranges.push({anchor: cur.from(), head: cur.to()});
+      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break
+      ranges.push({anchor: cur.from(), head: cur.to()})
     }
     if (ranges.length)
-      this.setSelections(ranges, 0);
-  });
-});
+      this.setSelections(ranges, 0)
+  })
+})
diff --git a/test/search_test.js b/test/search_test.js
index 9fe898bacd..4b050da7ba 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -31,10 +31,10 @@
     run(doc, "cde", false, 0, 2, 0, 5, 1, 2, 1, 5);
   });
 
-  test("multiline", "hallo", "goodbye", function(doc) {
-    run(doc, "llo\ngoo", false, 0, 2, 1, 3);
-    run(doc, "blah\nhall", false);
-    run(doc, "bye\neye", false);
+  test("multiline", "hallo", "a", "b", "goodbye", function(doc) {
+    run(doc, "llo\na\nb\ngoo", false, 0, 2, 3, 3);
+    run(doc, "blah\na\nb\nhall", false);
+    run(doc, "bye\nx\neye", false);
   });
 
   test("regexp", "abcde", "abcde", function(doc) {

From ff2e8dd433c34e345a1da108e50d96e913db9d27 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 24 May 2017 12:11:09 +0200
Subject: [PATCH 3322/4742] [searchcursor addon] Support multi-line regexp
 matching

---
 addon/search/search.js       |   2 +-
 addon/search/searchcursor.js | 109 ++++++++++++++++++++++++++++++-----
 doc/manual.html              |  14 +++--
 test/search_test.js          |  52 +++++++++++------
 4 files changed, 137 insertions(+), 40 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 99c87e2ef7..236e54cc40 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -54,7 +54,7 @@
 
   function getSearchCursor(cm, query, pos) {
     // Heuristic: if the query string is all lowercase, do a case insensitive search.
-    return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
+    return cm.getSearchCursor(query, pos, {caseFold: queryCaseInsensitive(query), multiline: true});
   }
 
   function persistentDialog(cm, text, deflt, onEnter, onKeyDown) {
diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 85015f8245..a8a779bacc 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -12,8 +12,19 @@
   "use strict"
   var Pos = CodeMirror.Pos
 
+  function regexpFlags(regexp) {
+    var flags = regexp.flags
+    return flags != null ? flags : (regexp.ignoreCase ? "i" : "")
+      + (regexp.global ? "g" : "")
+      + (regexp.multiline ? "m" : "")
+  }
+
   function ensureGlobal(regexp) {
-    return regexp.global ? regexp : new RegExp(regexp.source, regexp.ignoreCase ? "ig" : "g")
+    return regexp.global ? regexp : new RegExp(regexp.source, regexpFlags(regexp) + "g")
+  }
+
+  function maybeMultiline(regexp) {
+    return /\\s|\\n|\n|\\W|\\D|\[\^/.test(regexp.source)
   }
 
   function searchRegexpForward(doc, regexp, start) {
@@ -28,20 +39,53 @@
     }
   }
 
+  function searchRegexpForwardMultiline(doc, regexp, start) {
+    if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start)
+
+    regexp = ensureGlobal(regexp)
+    var string, chunk = 1
+    for (var line = start.line, last = doc.lastLine(); line <= last;) {
+      // This grows the search buffer in exponentially-sized chunks
+      // between matches, so that nearby matches are fast and don't
+      // require concatenating the whole document (in case we're
+      // searching for something that has tons of matches), but at the
+      // same time, the amount of retries is limited.
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line++)
+        string = string == null ? curLine : string + "\n" + curLine
+      }
+      chunk = chunk * 2
+      regexp.lastIndex = start.ch
+      var match = regexp.exec(string)
+      if (match && match[0].length) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = start.line + before.length - 1, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
+  function lastMatchIn(string, regexp) {
+    var cutOff = 0, match
+    for (;;) {
+      regexp.lastIndex = cutOff
+      var newMatch = regexp.exec(string)
+      if (!newMatch) return match
+      match = newMatch
+      cutOff = match.index + (match[0].length || 1)
+      if (cutOff == string.length) return match
+    }
+  }
+
   function searchRegexpBackward(doc, regexp, start) {
     regexp = ensureGlobal(regexp)
     for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
-      var string = doc.getLine(line), cutOff = 0, match
+      var string = doc.getLine(line)
       if (ch > -1) string = string.slice(0, ch)
-      for (;;) {
-        regexp.lastIndex = cutOff
-        var newMatch = regexp.exec(string)
-        if (!newMatch) break
-        match = newMatch
-        cutOff = match.index + (match[0].length || 1)
-        if (cutOff == line.length) break
-      }
-
+      var match = lastMatchIn(string, regexp)
       if (match && match[0].length)
         return {from: Pos(line, match.index),
                 to: Pos(line, match.index + match[0].length),
@@ -49,6 +93,28 @@
     }
   }
 
+  function searchRegexpBackwardMultiline(doc, regexp, start) {
+    regexp = ensureGlobal(regexp)
+    var string, chunk = 1
+    for (var line = start.line, first = doc.firstLine(); line >= first;) {
+      for (var i = 0; i < chunk; i++) {
+        var curLine = doc.getLine(line--)
+        string = string == null ? curLine.slice(0, start.ch) : curLine + "\n" + string
+      }
+      chunk *= 2
+
+      var match = lastMatchIn(string, regexp)
+      if (match && match[0].length) {
+        var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
+        var startLine = line + before.length, startCh = before[before.length - 1].length
+        return {from: Pos(startLine, startCh),
+                to: Pos(startLine + inside.length - 1,
+                        inside.length == 1 ? startCh + inside[0].length : inside[inside.length - 1].length),
+                match: match}
+      }
+    }
+  }
+
   function doFold(str) { return str.toLowerCase() }
   function noFold(str) { return str }
 
@@ -119,12 +185,20 @@
     }
   }
 
-  function SearchCursor(doc, query, pos, caseFold) {
+  function SearchCursor(doc, query, pos, options) {
     this.atOccurrence = false
     this.doc = doc
     pos = pos ? doc.clipPos(pos) : Pos(0, 0)
     this.pos = {from: pos, to: pos}
 
+    var caseFold
+    if (typeof options == "object") {
+      caseFold = options.caseFold
+    } else { // Backwards compat for when caseFold was the 4th argument
+      caseFold = options
+      options = null
+    }
+
     if (typeof query == "string") {
       if (caseFold == null) caseFold = false
       this.matches = function(reverse, pos) {
@@ -132,9 +206,14 @@
       }
     } else {
       query = ensureGlobal(query)
-      this.matches = function(reverse, pos) {
-        return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos)
-      }
+      if (!options || options.multiline !== false)
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos)
+        }
+      else
+        this.matches = function(reverse, pos) {
+          return (reverse ? searchRegexpBackward : searchRegexpForward)(doc, query, pos)
+        }
     }
   }
 
diff --git a/doc/manual.html b/doc/manual.html
index cb7ee428d7..dae1c027ff 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2263,16 +2263,18 @@ <h2 id="addons">Addons</h2>
       <p>Depends on <code>addon/dialog/dialog.css</code>.</p></dd>
 
       <dt id="addon_searchcursor"><a href="../addon/search/searchcursor.js"><code>search/searchcursor.js</code></a></dt>
-      <dd>Adds the <code>getSearchCursor(query, start, caseFold) →
+      <dd>Adds the <code>getSearchCursor(query, start, options) →
       cursor</code> method to CodeMirror instances, which can be used
       to implement search/replace functionality. <code>query</code>
-      can be a regular expression or a string (only strings will match
-      across lines—if they contain newlines). <code>start</code>
+      can be a regular expression or a string. <code>start</code>
       provides the starting position of the search. It can be
       a <code>{line, ch}</code> object, or can be left off to default
-      to the start of the document. <code>caseFold</code> is only
-      relevant when matching a string. It will cause the search to be
-      case-insensitive. A search cursor has the following methods:
+      to the start of the document. <code>options</code> is an
+      optional object, which can contain the property `caseFold:
+      false` to disable case folding when mathing a string, or the
+      property `multiline: disable` to disable multi-line matching for
+      regular expressions (which may help performance). A search
+      cursor has the following methods:
         <dl>
           <dt><code><strong>findNext</strong>() → boolean</code></dt>
           <dt><code><strong>findPrevious</strong>() → boolean</code></dt>
diff --git a/test/search_test.js b/test/search_test.js
index 4b050da7ba..be757bd818 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -1,16 +1,8 @@
 (function() {
   "use strict";
 
-  function test(name) {
-    var text = Array.prototype.slice.call(arguments, 1, arguments.length - 1).join("\n");
-    var body = arguments[arguments.length - 1];
-    return window.test("search_" + name, function() {
-      body(new CodeMirror.Doc(text));
-    });
-  }
-
-  function run(doc, query, insensitive) {
-    var cursor = doc.getSearchCursor(query, null, insensitive);
+  function run(doc, query, options) {
+    var cursor = doc.getSearchCursor(query, null, options);
     for (var i = 3; i < arguments.length; i += 4) {
       var found = cursor.findNext();
       is(found, "not enough results (forward)");
@@ -27,35 +19,59 @@
     is(!cursor.findPrevious(), "too many matches (backwards)");
   }
 
-  test("simple", "abcdefg", "abcdefg", function(doc) {
+  function test(name, f) { window.test("search_" + name, f) }
+
+  test("simple", function() {
+    var doc = new CodeMirror.Doc("abcdefg\nabcdefg")
     run(doc, "cde", false, 0, 2, 0, 5, 1, 2, 1, 5);
   });
 
-  test("multiline", "hallo", "a", "b", "goodbye", function(doc) {
+  test("multiline", function() {
+    var doc = new CodeMirror.Doc("hallo\na\nb\ngoodbye")
     run(doc, "llo\na\nb\ngoo", false, 0, 2, 3, 3);
     run(doc, "blah\na\nb\nhall", false);
     run(doc, "bye\nx\neye", false);
   });
 
-  test("regexp", "abcde", "abcde", function(doc) {
+  test("regexp", function() {
+    var doc = new CodeMirror.Doc("abcde\nabcde")
     run(doc, /bcd/, false, 0, 1, 0, 4, 1, 1, 1, 4);
     run(doc, /BCD/, false);
     run(doc, /BCD/i, false, 0, 1, 0, 4, 1, 1, 1, 4);
   });
 
-  test("insensitive", "hallo", "HALLO", "oink", "hAllO", function(doc) {
+  test("regexpMultiline", function() {
+    var doc = new CodeMirror.Doc("foo foo\nbar\nbaz")
+    run(doc, /fo[^]*az/, {multiline: true}, 0, 0, 2, 3)
+    run(doc, /[oa][^u]/, {multiline: true}, 0, 1, 0, 3, 0, 5, 0, 7, 1, 1, 1, 3, 2, 1, 2, 3)
+    run(doc, /[a][^u]{2}/, {multiline: true}, 1, 1, 2, 0)
+  })
+
+  test("insensitive", function() {
+    var doc = new CodeMirror.Doc("hallo\nHALLO\noink\nhAllO")
     run(doc, "All", false, 3, 1, 3, 4);
     run(doc, "All", true, 0, 1, 0, 4, 1, 1, 1, 4, 3, 1, 3, 4);
   });
 
-  test("multilineInsensitive", "zie ginds komT", "De Stoomboot", "uit Spanje weer aan", function(doc) {
+  test("multilineInsensitive", function() {
+    var doc = new CodeMirror.Doc("zie ginds komT\nDe Stoomboot\nuit Spanje weer aan")
     run(doc, "komt\nde stoomboot\nuit", false);
-    run(doc, "komt\nde stoomboot\nuit", true, 0, 10, 2, 3);
-    run(doc, "kOMt\ndE stOOmboot\nuiT", true, 0, 10, 2, 3);
+    run(doc, "komt\nde stoomboot\nuit", {caseFold: true}, 0, 10, 2, 3);
+    run(doc, "kOMt\ndE stOOmboot\nuiT", {caseFold: true}, 0, 10, 2, 3);
   });
 
-  test("expandingCaseFold", "<b>İİ İİ</b>", "<b>uu uu</b>", function(doc) {
+  test("multilineInsensitiveSlow", function() {
+    var text = ""
+    for (var i = 0; i < 1000; i++) text += "foo\nbar\n"
+    var doc = new CodeMirror.Doc("find\nme\n" + text + "find\nme\n")
+    var t0 = +new Date
+    run(doc, /find\nme/, {multiline: true}, 0, 0, 1, 2, 2002, 0, 2003, 2)
+    is(+new Date - t0 < 100)
+  })
+
+  test("expandingCaseFold", function() {
     if (phantom) return; // A Phantom bug makes this hang
+    var doc = new CodeMirror.Doc("<b>İİ İİ</b>\n<b>uu uu</b>")
     run(doc, "</b>", true, 0, 8, 0, 12, 1, 8, 1, 12);
     run(doc, "İİ", true, 0, 3, 0, 5, 0, 6, 0, 8);
   });

From 3091a34d2205985c606fe8481af2323e298dece5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 24 May 2017 12:15:49 +0200
Subject: [PATCH 3323/4742] Fix disabling of textarea on readOnly=nocursor

Closes #4760
---
 src/edit/options.js        | 3 ---
 src/input/TextareaInput.js | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/edit/options.js b/src/edit/options.js
index 8154ba928c..c0f06283b4 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -125,9 +125,6 @@ export function defineOptions(CodeMirror) {
     if (val == "nocursor") {
       onBlur(cm)
       cm.display.input.blur()
-      cm.display.disabled = true
-    } else {
-      cm.display.disabled = false
     }
     cm.display.input.readOnlyChanged(val)
   })
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 2161c3f6ef..68a1dde7ac 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -354,6 +354,7 @@ export default class TextareaInput {
 
   readOnlyChanged(val) {
     if (!val) this.reset()
+    this.textarea.disabled = val == "nocursor"
   }
 
   setUneditable() {}

From db794e83988688245dd0c8b58ae9614d4ca695e4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 24 May 2017 14:11:59 +0200
Subject: [PATCH 3324/4742] [searchcursor addon] Re-implement weird corner case
 behavior

Since the vim bindins are depending on that
---
 addon/search/searchcursor.js | 23 +++++++++++++++++++----
 test/vim_test.js             |  4 ----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index a8a779bacc..ee9046eccd 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -32,7 +32,7 @@
     for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) {
       regexp.lastIndex = ch
       var string = doc.getLine(line), match = regexp.exec(string)
-      if (match && match[0].length)
+      if (match)
         return {from: Pos(line, match.index),
                 to: Pos(line, match.index + match[0].length),
                 match: match}
@@ -57,7 +57,7 @@
       chunk = chunk * 2
       regexp.lastIndex = start.ch
       var match = regexp.exec(string)
-      if (match && match[0].length) {
+      if (match) {
         var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
         var startLine = start.line + before.length - 1, startCh = before[before.length - 1].length
         return {from: Pos(startLine, startCh),
@@ -86,7 +86,7 @@
       var string = doc.getLine(line)
       if (ch > -1) string = string.slice(0, ch)
       var match = lastMatchIn(string, regexp)
-      if (match && match[0].length)
+      if (match)
         return {from: Pos(line, match.index),
                 to: Pos(line, match.index + match[0].length),
                 match: match}
@@ -104,7 +104,7 @@
       chunk *= 2
 
       var match = lastMatchIn(string, regexp)
-      if (match && match[0].length) {
+      if (match) {
         var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
         var startLine = line + before.length, startCh = before[before.length - 1].length
         return {from: Pos(startLine, startCh),
@@ -223,6 +223,21 @@
 
     find: function(reverse) {
       var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
+
+      // Implements weird auto-growing behavior on null-matches for
+      // backwards-compatiblity with the vim code (unfortunately)
+      while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
+        if (reverse) {
+          if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1)
+          else if (result.from.line == this.doc.firstLine()) result = null
+          else result = this.matches(reverse, this.doc.clipPos(Pos(result.from.line - 1)))
+        } else {
+          if (result.to.ch < this.doc.getLine(result.to.line).length) result.to = Pos(result.to.line, result.to.ch + 1)
+          else if (result.to.line == this.doc.lastLine()) result = null
+          else result = this.matches(reverse, Pos(result.to.line + 1, 0))
+        }
+      }
+
       if (result) {
         this.pos = result
         this.atOccurrence = true
diff --git a/test/vim_test.js b/test/vim_test.js
index 862eb4a7e9..dd2f7fa48d 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2369,12 +2369,8 @@ testVim('?_greedy_0_or_more', function(cm, vim, helpers) {
   helpers.doKeys('?');
   helpers.assertCursorAt(1, 1);
   helpers.doKeys('n');
-  helpers.assertCursorAt(1, 0);
-  helpers.doKeys('n');
   helpers.assertCursorAt(0, 5);
   helpers.doKeys('n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
   helpers.assertCursorAt(0, 3);
   helpers.doKeys('n');
   helpers.assertCursorAt(0, 0);

From 5600b5ed1487212166cb1609052041935d388d04 Mon Sep 17 00:00:00 2001
From: KyleMcNutt <kylem@unity3d.com>
Date: Wed, 24 May 2017 23:16:36 +0200
Subject: [PATCH 3325/4742] [shell mode] Add hg and svn as highlighted commands

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

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 09d9487240..6af814c43e 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -30,9 +30,9 @@ CodeMirror.defineMode('shell', function() {
 
   // Commands
   define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
-    'curl cut diff echo find gawk gcc get git grep kill killall ln ls make ' +
+    'curl cut diff echo find gawk gcc get git grep hg kill killall ln ls make ' +
     'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
-    'shopt shred source sort sleep ssh start stop su sudo tee telnet top ' +
+    'shopt shred source sort sleep ssh start stop su sudo svn tee telnet top ' +
     'touch vi vim wall wc wget who write yes zsh');
 
   function tokenBase(stream, state) {

From 0ac67b10862d5b0350613dbc3775e98c60d7a20b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 25 May 2017 11:17:56 +0200
Subject: [PATCH 3326/4742] Add a dedicated 'type' token type

Rather than abusing variable-3. Coloring is the same for now.
---
 lib/codemirror.css            |  2 +-
 mode/clike/clike.js           |  8 ++---
 mode/clike/test.js            | 12 +++----
 mode/elm/elm.js               |  2 +-
 mode/javascript/javascript.js |  4 +--
 mode/javascript/test.js       | 64 +++++++++++++++++------------------
 mode/jsx/test.js              |  4 +--
 theme/abcdef.css              |  2 +-
 theme/ambiance.css            |  2 +-
 theme/cobalt.css              |  2 +-
 theme/colorforth.css          |  2 +-
 theme/dracula.css             |  2 +-
 theme/duotone-dark.css        |  2 +-
 theme/duotone-light.css       |  2 +-
 theme/eclipse.css             |  2 +-
 theme/erlang-dark.css         |  2 +-
 theme/icecoder.css            |  2 +-
 theme/lesser-dark.css         |  2 +-
 theme/liquibyte.css           |  2 +-
 theme/material.css            |  4 +--
 theme/mdn-like.css            |  2 +-
 theme/monokai.css             |  2 +-
 theme/night.css               |  2 +-
 theme/panda-syntax.css        |  2 +-
 theme/pastel-on-dark.css      |  2 +-
 theme/rubyblue.css            |  2 +-
 theme/seti.css                |  2 +-
 theme/solarized.css           |  2 +-
 theme/the-matrix.css          |  2 +-
 theme/ttcn.css                |  2 +-
 theme/twilight.css            |  2 +-
 theme/vibrant-ink.css         |  2 +-
 theme/xq-dark.css             |  2 +-
 theme/xq-light.css            |  2 +-
 theme/yeti.css                |  2 +-
 35 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index b962b38374..b008351a62 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -119,7 +119,7 @@
 .cm-s-default .cm-property,
 .cm-s-default .cm-operator {}
 .cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
+.cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
 .cm-s-default .cm-comment {color: #a50;}
 .cm-s-default .cm-string {color: #a11;}
 .cm-s-default .cm-string-2 {color: #f50;}
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 4c2acd6cf1..56c3a05b4f 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -33,7 +33,7 @@ function popContext(state) {
 }
 
 function typeBefore(stream, state, pos) {
-  if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
+  if (state.prevToken == "variable" || state.prevToken == "type") return true;
   if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, pos))) return true;
   if (state.typeAtEndOfLine && stream.column() == stream.indentation()) return true;
 }
@@ -112,7 +112,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (contains(defKeywords, cur)) isDefKeyword = true;
       return "keyword";
     }
-    if (contains(types, cur)) return "variable-3";
+    if (contains(types, cur)) return "type";
     if (contains(builtin, cur)) {
       if (contains(blockKeywords, cur)) curPunc = "newstatement";
       return "builtin";
@@ -281,7 +281,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   }
 
   function pointerHook(_stream, state) {
-    if (state.prevToken == "variable-3") return "variable-3";
+    if (state.prevToken == "type") return "type";
     return false;
   }
 
@@ -774,7 +774,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         return "atom";
       },
       token: function(_stream, state, style) {
-          if ((style == "variable" || style == "variable-3") &&
+          if ((style == "variable" || style == "type") &&
               state.prevToken == ".") {
             return "variable-2";
           }
diff --git a/mode/clike/test.js b/mode/clike/test.js
index 17e652b761..dad2e246ae 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -6,8 +6,8 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   MT("indent",
-     "[variable-3 void] [def foo]([variable-3 void*] [variable a], [variable-3 int] [variable b]) {",
-     "  [variable-3 int] [variable c] [operator =] [variable b] [operator +]",
+     "[type void] [def foo]([type void*] [variable a], [type int] [variable b]) {",
+     "  [type int] [variable c] [operator =] [variable b] [operator +]",
      "    [number 1];",
      "  [keyword return] [operator *][variable a];",
      "}");
@@ -21,9 +21,9 @@
      "}");
 
   MT("def",
-     "[variable-3 void] [def foo]() {}",
+     "[type void] [def foo]() {}",
      "[keyword struct] [def bar]{}",
-     "[variable-3 int] [variable-3 *][def baz]() {}");
+     "[type int] [type *][def baz]() {}");
 
   MT("def_new_line",
      "::[variable std]::[variable SomeTerribleType][operator <][variable T][operator >]",
@@ -37,10 +37,10 @@
 
   MT("preprocessor",
      "[meta #define FOO 3]",
-     "[variable-3 int] [variable foo];",
+     "[type int] [variable foo];",
      "[meta #define BAR\\]",
      "[meta 4]",
-     "[variable-3 unsigned] [variable-3 int] [variable bar] [operator =] [number 8];",
+     "[type unsigned] [type int] [variable bar] [operator =] [number 8];",
      "[meta #include <baz> ][comment // comment]")
 
 
diff --git a/mode/elm/elm.js b/mode/elm/elm.js
index b31e663757..9fcfc88371 100644
--- a/mode/elm/elm.js
+++ b/mode/elm/elm.js
@@ -70,7 +70,7 @@
         if (smallRE.test(ch)) {
           var isDef = source.pos === 1;
           source.eatWhile(idRE);
-          return isDef ? "variable-3" : "variable";
+          return isDef ? "type" : "variable";
         }
 
         if (digitRE.test(ch)) {
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d150d4c7be..c24fafd952 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -46,7 +46,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     // Extend the 'normal' keywords with the TypeScript language extensions
     if (isTS) {
-      var type = {type: "variable", style: "variable-3"};
+      var type = {type: "variable", style: "type"};
       var tsKeywords = {
         // object-like things
         "interface": kw("class"),
@@ -543,7 +543,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
   }
   function typeexpr(type) {
-    if (type == "variable") {cx.marked = "variable-3"; return cont(afterType);}
+    if (type == "variable") {cx.marked = "type"; return cont(afterType);}
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
     if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index bfb238fb7b..d0f4f96d4a 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -238,15 +238,15 @@
   }
 
   TS("typescript_extend_type",
-     "[keyword class] [def Foo] [keyword extends] [variable-3 Some][operator <][variable-3 Type][operator >] {}")
+     "[keyword class] [def Foo] [keyword extends] [type Some][operator <][type Type][operator >] {}")
 
   TS("typescript_arrow_type",
-     "[keyword let] [def x]: ([variable arg]: [variable-3 Type]) [operator =>] [variable-3 ReturnType]")
+     "[keyword let] [def x]: ([variable arg]: [type Type]) [operator =>] [type ReturnType]")
 
   TS("typescript_class",
      "[keyword class] [def Foo] {",
      "  [keyword public] [keyword static] [property main]() {}",
-     "  [keyword private] [property _foo]: [variable-3 string];",
+     "  [keyword private] [property _foo]: [type string];",
      "}")
 
   TS("typescript_literal_types",
@@ -255,85 +255,85 @@
      "  [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",
      "  [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",
      "}",
-     "[keyword interface] [def MyInstance] [keyword extends] [variable-3 Sequelize].[variable-3 Instance] [operator <] [variable-3 MyAttributes] [operator >] {",
-     "  [property rawAttributes]: [variable-3 MyAttributes];",
+     "[keyword interface] [def MyInstance] [keyword extends] [type Sequelize].[type Instance] [operator <] [type MyAttributes] [operator >] {",
+     "  [property rawAttributes]: [type MyAttributes];",
      "  [property truthy]: [string 'true'] [operator |] [number 1] [operator |] [atom true];",
      "  [property falsy]: [string 'false'] [operator |] [number 0] [operator |] [atom false];",
      "}")
 
   TS("typescript_extend_operators",
      "[keyword export] [keyword interface] [def UserModel] [keyword extends]",
-     "  [variable-3 Sequelize].[variable-3 Model] [operator <] [variable-3 UserInstance], [variable-3 UserAttributes] [operator >] {",
+     "  [type Sequelize].[type Model] [operator <] [type UserInstance], [type UserAttributes] [operator >] {",
      "    [property findById]: (",
-     "    [variable userId]: [variable-3 number]",
-     "    ) [operator =>] [variable-3 Promise] [operator <] [variable-3 Array] [operator <] { [property id], [property name] } [operator >>];",
+     "    [variable userId]: [type number]",
+     "    ) [operator =>] [type Promise] [operator <] [type Array] [operator <] { [property id], [property name] } [operator >>];",
      "    [property updateById]: (",
-     "    [variable userId]: [variable-3 number],",
-     "    [variable isActive]: [variable-3 boolean]",
-     "    ) [operator =>] [variable-3 Promise] [operator <] [variable-3 AccountHolderNotificationPreferenceInstance] [operator >];",
+     "    [variable userId]: [type number],",
+     "    [variable isActive]: [type boolean]",
+     "    ) [operator =>] [type Promise] [operator <] [type AccountHolderNotificationPreferenceInstance] [operator >];",
      "  }")
 
   TS("typescript_interface_with_const",
      "[keyword const] [def hello]: {",
-     "  [property prop1][operator ?]: [variable-3 string];",
-     "  [property prop2][operator ?]: [variable-3 string];",
+     "  [property prop1][operator ?]: [type string];",
+     "  [property prop2][operator ?]: [type string];",
      "} [operator =] {};")
 
   TS("typescript_double_extend",
      "[keyword export] [keyword interface] [def UserAttributes] {",
-     "  [property id][operator ?]: [variable-3 number];",
-     "  [property createdAt][operator ?]: [variable-3 Date];",
+     "  [property id][operator ?]: [type number];",
+     "  [property createdAt][operator ?]: [type Date];",
      "}",
-     "[keyword export] [keyword interface] [def UserInstance] [keyword extends] [variable-3 Sequelize].[variable-3 Instance][operator <][variable-3 UserAttributes][operator >], [variable-3 UserAttributes] {",
-     "  [property id]: [variable-3 number];",
-     "  [property createdAt]: [variable-3 Date];",
+     "[keyword export] [keyword interface] [def UserInstance] [keyword extends] [type Sequelize].[type Instance][operator <][type UserAttributes][operator >], [type UserAttributes] {",
+     "  [property id]: [type number];",
+     "  [property createdAt]: [type Date];",
      "}");
 
   TS("typescript_index_signature",
      "[keyword interface] [def A] {",
-     "  [[ [variable prop]: [variable-3 string] ]]: [variable-3 any];",
-     "  [property prop1]: [variable-3 any];",
+     "  [[ [variable prop]: [type string] ]]: [type any];",
+     "  [property prop1]: [type any];",
      "}");
 
   TS("typescript_generic_class",
-     "[keyword class] [def Foo][operator <][variable-3 T][operator >] {",
+     "[keyword class] [def Foo][operator <][type T][operator >] {",
      "  [property bar]() {}",
-     "  [property foo](): [variable-3 Foo] {}",
+     "  [property foo](): [type Foo] {}",
      "}")
 
   TS("typescript_type_when_keyword",
-     "[keyword export] [keyword type] [variable-3 AB] [operator =] [variable-3 A] [operator |] [variable-3 B];",
-     "[keyword type] [variable-3 Flags] [operator =] {",
-     "  [property p1]: [variable-3 string];",
-     "  [property p2]: [variable-3 boolean];",
+     "[keyword export] [keyword type] [type AB] [operator =] [type A] [operator |] [type B];",
+     "[keyword type] [type Flags] [operator =] {",
+     "  [property p1]: [type string];",
+     "  [property p2]: [type boolean];",
      "};")
 
   TS("typescript_type_when_not_keyword",
      "[keyword class] [def HasType] {",
-     "  [property type]: [variable-3 string];",
-     "  [property constructor]([def type]: [variable-3 string]) {",
+     "  [property type]: [type string];",
+     "  [property constructor]([def type]: [type string]) {",
      "    [keyword this].[property type] [operator =] [variable-2 type];",
      "  }",
-     "  [property setType]({ [def type] }: { [property type]: [variable-3 string]; }) {",
+     "  [property setType]({ [def type] }: { [property type]: [type string]; }) {",
      "    [keyword this].[property type] [operator =] [variable-2 type];",
      "  }",
      "}")
 
   TS("typescript_function_generics",
      "[keyword function] [def a]() {}",
-     "[keyword function] [def b][operator <][variable-3 IA] [keyword extends] [variable-3 object], [variable-3 IB] [keyword extends] [variable-3 object][operator >]() {}",
+     "[keyword function] [def b][operator <][type IA] [keyword extends] [type object], [type IB] [keyword extends] [type object][operator >]() {}",
      "[keyword function] [def c]() {}")
 
   TS("typescript_complex_return_type",
      "[keyword function] [def A]() {",
      "  [keyword return] [keyword this].[property property];",
      "}",
-     "[keyword function] [def B](): [variable-3 Promise][operator <]{ [[ [variable key]: [variable-3 string] ]]: [variable-3 any] } [operator |] [atom null][operator >] {",
+     "[keyword function] [def B](): [type Promise][operator <]{ [[ [variable key]: [type string] ]]: [type any] } [operator |] [atom null][operator >] {",
      "  [keyword return] [keyword this].[property property];",
      "}")
 
   TS("typescript_complex_type_casting",
-     "[keyword const] [def giftpay] [operator =] [variable config].[property get]([string 'giftpay']) [keyword as] { [[ [variable platformUuid]: [variable-3 string] ]]: { [property version]: [variable-3 number]; [property apiCode]: [variable-3 string]; } };")
+     "[keyword const] [def giftpay] [operator =] [variable config].[property get]([string 'giftpay']) [keyword as] { [[ [variable platformUuid]: [type string] ]]: { [property version]: [type number]; [property apiCode]: [type string]; } };")
 
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index c7def5a3ea..4a63b4eeca 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -72,9 +72,9 @@
 
   TS("tsx_react_integration",
      "[keyword interface] [def Props] {",
-     "  [property foo]: [variable-3 string];",
+     "  [property foo]: [type string];",
      "}",
-     "[keyword class] [def MyComponent] [keyword extends] [variable-3 React].[variable-3 Component] [operator <] [variable-3 Props], [variable-3 any] [operator >] {",
+     "[keyword class] [def MyComponent] [keyword extends] [type React].[type Component] [operator <] [type Props], [type any] [operator >] {",
      "  [property render]() {",
      "    [keyword return] [bracket&tag <][tag span][bracket&tag >]{[keyword this].[property props].[property foo]}[bracket&tag </][tag span][bracket&tag >]",
      "  }",
diff --git a/theme/abcdef.css b/theme/abcdef.css
index 7f9d788704..cf93530946 100644
--- a/theme/abcdef.css
+++ b/theme/abcdef.css
@@ -14,7 +14,7 @@
 .cm-s-abcdef span.cm-def { color: #fffabc; }
 .cm-s-abcdef span.cm-variable { color: #abcdef; }
 .cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
-.cm-s-abcdef span.cm-variable-3 { color: #def; }
+.cm-s-abcdef span.cm-variable-3, .cm-s-abcdef span.cm-type { color: #def; }
 .cm-s-abcdef span.cm-property { color: #fedcba; }
 .cm-s-abcdef span.cm-operator { color: #ff0; }
 .cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
diff --git a/theme/ambiance.css b/theme/ambiance.css
index bce3446494..782fca43f5 100644
--- a/theme/ambiance.css
+++ b/theme/ambiance.css
@@ -11,7 +11,7 @@
 .cm-s-ambiance .cm-def { color: #aac6e3; }
 .cm-s-ambiance .cm-variable { color: #ffb795; }
 .cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
-.cm-s-ambiance .cm-variable-3 { color: #faded3; }
+.cm-s-ambiance .cm-variable-3, .cm-s-ambiance .cm-type { color: #faded3; }
 .cm-s-ambiance .cm-property { color: #eed1b3; }
 .cm-s-ambiance .cm-operator { color: #fa8d6a; }
 .cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
diff --git a/theme/cobalt.css b/theme/cobalt.css
index d88223ed80..bbbda3b543 100644
--- a/theme/cobalt.css
+++ b/theme/cobalt.css
@@ -15,7 +15,7 @@
 .cm-s-cobalt span.cm-string { color: #3ad900; }
 .cm-s-cobalt span.cm-meta { color: #ff9d00; }
 .cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
-.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
+.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def, .cm-s-cobalt .cm-type { color: white; }
 .cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
 .cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
 .cm-s-cobalt span.cm-link { color: #845dc4; }
diff --git a/theme/colorforth.css b/theme/colorforth.css
index 606899f309..19095e41d9 100644
--- a/theme/colorforth.css
+++ b/theme/colorforth.css
@@ -15,7 +15,7 @@
 .cm-s-colorforth span.cm-atom        { color: #606060; }
 
 .cm-s-colorforth span.cm-variable-2  { color: #EEE; }
-.cm-s-colorforth span.cm-variable-3  { color: #DDD; }
+.cm-s-colorforth span.cm-variable-3, .cm-s-colorforth span.cm-type { color: #DDD; }
 .cm-s-colorforth span.cm-property    {}
 .cm-s-colorforth span.cm-operator    {}
 
diff --git a/theme/dracula.css b/theme/dracula.css
index 53a660b521..253133efe7 100644
--- a/theme/dracula.css
+++ b/theme/dracula.css
@@ -34,7 +34,7 @@
 .cm-s-dracula span.cm-qualifier { color: #50fa7b; }
 .cm-s-dracula span.cm-property { color: #66d9ef; }
 .cm-s-dracula span.cm-builtin { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-3 { color: #ffb86c; }
+.cm-s-dracula span.cm-variable-3, .cm-s-dracula span.cm-type { color: #ffb86c; }
 
 .cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
 .cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/duotone-dark.css b/theme/duotone-dark.css
index b09a585c97..88fdc76c8e 100644
--- a/theme/duotone-dark.css
+++ b/theme/duotone-dark.css
@@ -24,7 +24,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 .cm-s-duotone-dark span.cm-operator { color: #ffad5c; }
 .cm-s-duotone-dark span.cm-positive { color: #6a51e6; }
 
-.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
+.cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-type, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
 .cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
 .cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }
 
diff --git a/theme/duotone-light.css b/theme/duotone-light.css
index 80203d15d9..d99480f7c4 100644
--- a/theme/duotone-light.css
+++ b/theme/duotone-light.css
@@ -23,7 +23,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 .cm-s-duotone-light span.cm-string, .cm-s-duotone-light span.cm-operator { color: #1659df; }
 .cm-s-duotone-light span.cm-positive { color: #896724; }
 
-.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
+.cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-type, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
 .cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
 .cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }
 
diff --git a/theme/eclipse.css b/theme/eclipse.css
index 1bde460e90..800d603f6d 100644
--- a/theme/eclipse.css
+++ b/theme/eclipse.css
@@ -5,7 +5,7 @@
 .cm-s-eclipse span.cm-def { color: #00f; }
 .cm-s-eclipse span.cm-variable { color: black; }
 .cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
-.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
+.cm-s-eclipse span.cm-variable-3, .cm-s-eclipse span.cm-type { color: #0000C0; }
 .cm-s-eclipse span.cm-property { color: black; }
 .cm-s-eclipse span.cm-operator { color: black; }
 .cm-s-eclipse span.cm-comment { color: #3F7F5F; }
diff --git a/theme/erlang-dark.css b/theme/erlang-dark.css
index 65fe4814c1..8c8a4171a6 100644
--- a/theme/erlang-dark.css
+++ b/theme/erlang-dark.css
@@ -27,7 +27,7 @@
 .cm-s-erlang-dark span.cm-tag        { color: #9effff; }
 .cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
 .cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
-.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
+.cm-s-erlang-dark span.cm-variable-3, .cm-s-erlang-dark span.cm-type { color: #ccc; }
 .cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
 .cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
diff --git a/theme/icecoder.css b/theme/icecoder.css
index ffebaf2f0b..5440fbe27c 100644
--- a/theme/icecoder.css
+++ b/theme/icecoder.css
@@ -11,7 +11,7 @@ ICEcoder default theme by Matt Pass, used in code editor available at https://ic
 
 .cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
 .cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
-.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
+.cm-s-icecoder span.cm-variable-3, .cm-s-icecoder span.cm-type { color: #f9602c; } /* orange */
 
 .cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
 .cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 690c183d7b..b2ec418fdb 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -27,7 +27,7 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-def { color: white; }
 .cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
 .cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3 { color: white; }
+.cm-s-lesser-dark span.cm-variable-3, .cm-s-lesser-dark span.cm-type { color: white; }
 .cm-s-lesser-dark span.cm-property { color: #92A75C; }
 .cm-s-lesser-dark span.cm-operator { color: #92A75C; }
 .cm-s-lesser-dark span.cm-comment { color: #666; }
diff --git a/theme/liquibyte.css b/theme/liquibyte.css
index ce0477fe72..393825e029 100644
--- a/theme/liquibyte.css
+++ b/theme/liquibyte.css
@@ -36,7 +36,7 @@
 .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-variable-3, .cm-s-liquibyte span.cm-type { color: #c080ff; font-weight: bold; }
 .cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
 .cm-s-liquibyte span.cm-operator    { color: #fff; }
 
diff --git a/theme/material.css b/theme/material.css
index 01d867932a..84962a244b 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -27,7 +27,7 @@
 .cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
 .cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
 .cm-s-material .cm-variable-2 { color: #80CBC4; }
-.cm-s-material .cm-variable-3 { color: #82B1FF; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #82B1FF; }
 .cm-s-material .cm-builtin { color: #DECB6B; }
 .cm-s-material .cm-atom { color: #F77669; }
 .cm-s-material .cm-number { color: #F77669; }
@@ -41,7 +41,7 @@
 .cm-s-material .cm-attribute { color: #FFCB6B; }
 .cm-s-material .cm-property { color: #80CBAE; }
 .cm-s-material .cm-qualifier { color: #DECB6B; }
-.cm-s-material .cm-variable-3 { color: #DECB6B; }
+.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #DECB6B; }
 .cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
 .cm-s-material .cm-error {
   color: rgba(255, 255, 255, 1.0);
diff --git a/theme/mdn-like.css b/theme/mdn-like.css
index f325d45005..622ed3efb7 100644
--- a/theme/mdn-like.css
+++ b/theme/mdn-like.css
@@ -21,7 +21,7 @@
 .cm-s-mdn-like .cm-number { color:  #ca7841; }
 .cm-s-mdn-like .cm-def { color: #8DA6CE; }
 .cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
-.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; }
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def, .cm-s-mdn-like span.cm-type { color: #07a; }
 
 .cm-s-mdn-like .cm-variable { color: #07a; }
 .cm-s-mdn-like .cm-property { color: #905; }
diff --git a/theme/monokai.css b/theme/monokai.css
index 7c8a4c5d00..b5edd13fe6 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -21,7 +21,7 @@
 
 .cm-s-monokai span.cm-variable { color: #f8f8f2; }
 .cm-s-monokai span.cm-variable-2 { color: #9effff; }
-.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
+.cm-s-monokai span.cm-variable-3, .cm-s-monokai span.cm-type { color: #66d9ef; }
 .cm-s-monokai span.cm-def { color: #fd971f; }
 .cm-s-monokai span.cm-bracket { color: #f8f8f2; }
 .cm-s-monokai span.cm-tag { color: #f92672; }
diff --git a/theme/night.css b/theme/night.css
index fd4e561933..f631bf42c7 100644
--- a/theme/night.css
+++ b/theme/night.css
@@ -17,7 +17,7 @@
 .cm-s-night span.cm-string { color: #37f14a; }
 .cm-s-night span.cm-meta { color: #7678e2; }
 .cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
-.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
+.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def, .cm-s-night span.cm-type { color: white; }
 .cm-s-night span.cm-bracket { color: #8da6ce; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
 .cm-s-night span.cm-link { color: #845dc4; }
diff --git a/theme/panda-syntax.css b/theme/panda-syntax.css
index c93b2ea03a..6de58b56f4 100644
--- a/theme/panda-syntax.css
+++ b/theme/panda-syntax.css
@@ -52,7 +52,7 @@
 .cm-s-panda-syntax .cm-variable-2 {
 	color: #ff9ac1;
 }
-.cm-s-panda-syntax .cm-variable-3 {
+.cm-s-panda-syntax .cm-variable-3, .cm-s-panda-syntax .cm-type {
 	color: #ff9ac1;
 }
 
diff --git a/theme/pastel-on-dark.css b/theme/pastel-on-dark.css
index 2603d36205..60435dd15e 100644
--- a/theme/pastel-on-dark.css
+++ b/theme/pastel-on-dark.css
@@ -34,7 +34,7 @@
 .cm-s-pastel-on-dark span.cm-string { color: #66A968; }
 .cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
 .cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
-.cm-s-pastel-on-dark span.cm-variable-3 { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-variable-3, .cm-s-pastel-on-dark span.cm-type { color: #DE8E30; }
 .cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
 .cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
 .cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
diff --git a/theme/rubyblue.css b/theme/rubyblue.css
index 76d33e7798..1f181b06ec 100644
--- a/theme/rubyblue.css
+++ b/theme/rubyblue.css
@@ -15,7 +15,7 @@
 .cm-s-rubyblue span.cm-string { color: #F08047; }
 .cm-s-rubyblue span.cm-meta { color: #F0F; }
 .cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
-.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
+.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def, .cm-s-rubyblue span.cm-type { color: white; }
 .cm-s-rubyblue span.cm-bracket { color: #F0F; }
 .cm-s-rubyblue span.cm-link { color: #F4C20B; }
 .cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
diff --git a/theme/seti.css b/theme/seti.css
index 6632d3fc7f..814f76f7de 100644
--- a/theme/seti.css
+++ b/theme/seti.css
@@ -38,7 +38,7 @@
 .cm-s-seti span.cm-attribute { color: #9fca56; }
 .cm-s-seti span.cm-qualifier { color: #9fca56; }
 .cm-s-seti span.cm-property { color: #a074c4; }
-.cm-s-seti span.cm-variable-3 { color: #9fca56; }
+.cm-s-seti span.cm-variable-3, .cm-s-seti span.cm-type { color: #9fca56; }
 .cm-s-seti span.cm-builtin { color: #9fca56; }
 .cm-s-seti .CodeMirror-activeline-background { background: #101213; }
 .cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/theme/solarized.css b/theme/solarized.css
index 1f39c7edb2..d95f6c1b27 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -57,7 +57,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 .cm-s-solarized .cm-variable { color: #839496; }
 .cm-s-solarized .cm-variable-2 { color: #b58900; }
-.cm-s-solarized .cm-variable-3 { color: #6c71c4; }
+.cm-s-solarized .cm-variable-3, .cm-s-solarized .cm-type { color: #6c71c4; }
 
 .cm-s-solarized .cm-property { color: #2aa198; }
 .cm-s-solarized .cm-operator { color: #6c71c4; }
diff --git a/theme/the-matrix.css b/theme/the-matrix.css
index 3912a8dbd8..c4c93c11ea 100644
--- a/theme/the-matrix.css
+++ b/theme/the-matrix.css
@@ -14,7 +14,7 @@
 .cm-s-the-matrix span.cm-def { color: #99C; }
 .cm-s-the-matrix span.cm-variable { color: #F6C; }
 .cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
-.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
+.cm-s-the-matrix span.cm-variable-3, .cm-s-the-matrix span.cm-type { color: #96F; }
 .cm-s-the-matrix span.cm-property { color: #62FFA0; }
 .cm-s-the-matrix span.cm-operator { color: #999; }
 .cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
diff --git a/theme/ttcn.css b/theme/ttcn.css
index b3d465645b..0b14ac35d6 100644
--- a/theme/ttcn.css
+++ b/theme/ttcn.css
@@ -29,7 +29,7 @@
 .cm-s-ttcn .cm-tag { color: #170; }
 .cm-s-ttcn .cm-variable { color: #8B2252; }
 .cm-s-ttcn .cm-variable-2 { color: #05a; }
-.cm-s-ttcn .cm-variable-3 { color: #085; }
+.cm-s-ttcn .cm-variable-3, .cm-s-ttcn .cm-type { color: #085; }
 
 .cm-s-ttcn .cm-invalidchar { color: #f00; }
 
diff --git a/theme/twilight.css b/theme/twilight.css
index d342b899f6..b2b1b2aa93 100644
--- a/theme/twilight.css
+++ b/theme/twilight.css
@@ -14,7 +14,7 @@
 .cm-s-twilight .cm-number { color:  #ca7841; } /**/
 .cm-s-twilight .cm-def { color: #8DA6CE; }
 .cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
-.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
+.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def, .cm-s-twilight span.cm-type { color: #607392; } /**/
 .cm-s-twilight .cm-operator { color: #cda869; } /**/
 .cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
 .cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index ac4ec6d87a..b13ecf2164 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -16,7 +16,7 @@
 .cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
 .cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
 .cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def, .cm-s-vibrant span.cm-type { color: #FFC66D; }
 .cm-s-vibrant-ink .cm-operator { color: #888; }
 .cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
 .cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
diff --git a/theme/xq-dark.css b/theme/xq-dark.css
index e3bd960bbb..7da1a0f705 100644
--- a/theme/xq-dark.css
+++ b/theme/xq-dark.css
@@ -36,7 +36,7 @@ THE SOFTWARE.
 .cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
 .cm-s-xq-dark span.cm-variable { color: #FFF; }
 .cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
-.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
+.cm-s-xq-dark span.cm-variable-3, .cm-s-xq-dark span.cm-type { color: #DDD; }
 .cm-s-xq-dark span.cm-property {}
 .cm-s-xq-dark span.cm-operator {}
 .cm-s-xq-dark span.cm-comment { color: gray; }
diff --git a/theme/xq-light.css b/theme/xq-light.css
index 8d2fcb667b..7b182ea997 100644
--- a/theme/xq-light.css
+++ b/theme/xq-light.css
@@ -26,7 +26,7 @@ THE SOFTWARE.
 .cm-s-xq-light span.cm-def { text-decoration:underline; }
 .cm-s-xq-light span.cm-variable { color: black; }
 .cm-s-xq-light span.cm-variable-2 { color:black; }
-.cm-s-xq-light span.cm-variable-3 { color: black; }
+.cm-s-xq-light span.cm-variable-3, .cm-s-xq-light span.cm-type { color: black; }
 .cm-s-xq-light span.cm-property {}
 .cm-s-xq-light span.cm-operator {}
 .cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
diff --git a/theme/yeti.css b/theme/yeti.css
index c70d4d214e..d085f72497 100644
--- a/theme/yeti.css
+++ b/theme/yeti.css
@@ -39,6 +39,6 @@
 .cm-s-yeti span.cm-qualifier { color: #96c0d8; }
 .cm-s-yeti span.cm-property { color: #a074c4; }
 .cm-s-yeti span.cm-builtin { color: #a074c4; }
-.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
+.cm-s-yeti span.cm-variable-3, .cm-s-yeti span.cm-type { color: #96c0d8; }
 .cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
 .cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }

From 3dd914dc98ddff0dc149ae4e6a3f26709cd71a47 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 25 May 2017 13:33:32 +0200
Subject: [PATCH 3327/4742] Remove stray semicolon in mode_test.js

---
 test/mode_test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/mode_test.js b/test/mode_test.js
index 0aed50f7dc..16051a06e2 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -68,7 +68,6 @@
 
   function esc(str) {
     return str.replace('&', '&amp;').replace('<', '&lt;').replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
-;
   }
 
   function compare(text, expected, mode) {

From 341eeb970e499cef666ea95246b5e0f91ae9fad4 Mon Sep 17 00:00:00 2001
From: Tentone <tentone@outlook.com>
Date: Fri, 26 May 2017 22:05:29 +0100
Subject: [PATCH 3328/4742] Fix misplaced semicolon in searchcursor.js

---
 addon/search/searchcursor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index ee9046eccd..c5e74b79b7 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -1,7 +1,7 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
-;(function(mod) {
+(function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"))
   else if (typeof define == "function" && define.amd) // AMD
@@ -278,4 +278,4 @@
     if (ranges.length)
       this.setSelections(ranges, 0)
   })
-})
+});

From 52de20cad38a02501d9928ace2232432ba0653d4 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 27 May 2017 18:39:31 +0400
Subject: [PATCH 3329/4742] [vim] fix . repeat after replace

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 7309086c51..0dbbae734b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4921,7 +4921,7 @@
      * Listens for changes made in insert mode.
      * Should only be active in insert mode.
      */
-    function onChange(_cm, changeObj) {
+    function onChange(cm, changeObj) {
       var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       if (!macroModeState.isPlaying) {
@@ -4934,7 +4934,11 @@
               lastChange.changes = [];
               lastChange.maybeReset = false;
             }
-            lastChange.changes.push(text);
+            if (cm.state.overwrite && !/\n/.test(text)) {
+                lastChange.changes.push([text]);
+            } else {
+                lastChange.changes.push(text);
+            }
           }
           // Change objects may be chained with next.
           changeObj = changeObj.next;
@@ -5116,9 +5120,13 @@
           var change = changes[j];
           if (change instanceof InsertModeKey) {
             CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
-          } else {
+          } else if (typeof change == "string") {
             var cur = cm.getCursor();
             cm.replaceRange(change, cur, cur);
+          } else {
+            var start = cm.getCursor();
+            var end = offsetCursor(start, 0, change[0].length);
+            cm.replaceRange(change[0], start, end);
           }
         }
       }
diff --git a/test/vim_test.js b/test/vim_test.js
index dd2f7fa48d..9f0e5f7683 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2954,6 +2954,20 @@ testVim('._visual_>', function(cm, vim, helpers) {
   eq('  1\n  2\n  3\n  4', cm.getValue());
   helpers.assertCursorAt(2, 2);
 }, { value: '1\n2\n3\n4'});
+testVim('._replace_repeat', function(cm, vim, helpers) {
+  helpers.doKeys('R');
+  cm.replaceRange('123', cm.getCursor(), offsetCursor(cm.getCursor(), 0, 3));
+  cm.setCursor(0, 3);
+  helpers.doKeys('<Esc>');
+  helpers.doKeys('2', '.');
+  eq('12123123\nabcdefg', cm.getValue());
+  helpers.assertCursorAt(0, 7);
+  cm.setCursor(1, 0);
+  helpers.doKeys('.');
+  eq('12123123\n123123g', cm.getValue());
+  helpers.doKeys('l', '"', '.', 'p');
+  eq('12123123\n123123g123', cm.getValue());
+}, { value: 'abcdef\nabcdefg'});
 testVim('f;', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('f', 'x');

From 0426274fd46fb3a84e1ecf0c0d452d8a2f040997 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 27 May 2017 19:17:44 +0400
Subject: [PATCH 3330/4742] [vim] exit character exit mode on <C-c>

---
 keymap/vim.js    | 7 +++++--
 test/vim_test.js | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0dbbae734b..d4452c6973 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1110,7 +1110,9 @@
           }
         }
         if (bestMatch.keys.slice(-11) == '<character>') {
-          inputState.selectedCharacter = lastChar(keys);
+          var character = lastChar(keys);
+          if (!character) return {type: 'none'};
+          inputState.selectedCharacter = character;
         }
         return {type: 'full', command: bestMatch};
       },
@@ -2704,7 +2706,7 @@
       }
     }
     function lastChar(keys) {
-      var match = /^.*(<[\w\-]+>)$/.exec(keys);
+      var match = /^.*(<[^>]+>)$/.exec(keys);
       var selectedCharacter = match ? match[1] : keys.slice(-1);
       if (selectedCharacter.length > 1){
         switch(selectedCharacter){
@@ -2715,6 +2717,7 @@
             selectedCharacter=' ';
             break;
           default:
+            selectedCharacter='';
             break;
         }
       }
diff --git a/test/vim_test.js b/test/vim_test.js
index 9f0e5f7683..7d8f16fe83 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1607,6 +1607,13 @@ testVim('r', function(cm, vim, helpers) {
   cm.setCursor(0, 4);
   helpers.doKeys('v', 'j', 'h', 'r', '<Space>');
   eq('wuuu  \n    her', cm.getValue(),'Replacing selection by space-characters failed');
+  cm.setValue("ox");
+  helpers.doKeys('r', '<C-c>');
+  eq('ox', cm.getValue());
+  helpers.doKeys('r', '<Del>');
+  eq('ox', cm.getValue());
+  helpers.doKeys('r', '<CR>');
+  eq('\nx', cm.getValue());
 }, { value: 'wordet\nanother' });
 testVim('r_visual_block', function(cm, vim, helpers) {
   cm.setCursor(2, 3);

From c81cba4d351ee4a51a5994b446decc4c5438ac31 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 29 May 2017 23:12:02 +0200
Subject: [PATCH 3331/4742] Move LeafChunk/BranchChunk back to non-class
 constructors

So that Doc can do its auto-new trick before calling the
superclass constructor.

Closes #4768
---
 src/model/chunk.js | 62 +++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/model/chunk.js b/src/model/chunk.js
index 3879da293d..056ef91bb9 100644
--- a/src/model/chunk.js
+++ b/src/model/chunk.js
@@ -15,19 +15,19 @@ import { signalLater } from "../util/operation_group"
 //
 // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
 
-export class LeafChunk {
-  constructor(lines) {
-    this.lines = lines
-    this.parent = null
-    let height = 0
-    for (let i = 0; i < lines.length; ++i) {
-      lines[i].parent = this
-      height += lines[i].height
-    }
-    this.height = height
+export function LeafChunk(lines) {
+  this.lines = lines
+  this.parent = null
+  let height = 0
+  for (let i = 0; i < lines.length; ++i) {
+    lines[i].parent = this
+    height += lines[i].height
   }
+  this.height = height
+}
 
-  chunkSize() { return this.lines.length }
+LeafChunk.prototype = {
+  chunkSize() { return this.lines.length },
 
   // Remove the n lines at offset 'at'.
   removeInner(at, n) {
@@ -38,12 +38,12 @@ export class LeafChunk {
       signalLater(line, "delete")
     }
     this.lines.splice(at, n)
-  }
+  },
 
   // Helper used to collapse a small branch into a single leaf.
   collapse(lines) {
     lines.push.apply(lines, this.lines)
-  }
+  },
 
   // Insert the given array of lines at offset 'at', count them as
   // having the given height.
@@ -51,7 +51,7 @@ export class LeafChunk {
     this.height += height
     this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at))
     for (let i = 0; i < lines.length; ++i) lines[i].parent = this
-  }
+  },
 
   // Used to iterate over a part of the tree.
   iterN(at, n, op) {
@@ -60,21 +60,21 @@ export class LeafChunk {
   }
 }
 
-export class BranchChunk {
-  constructor(children) {
-    this.children = children
-    let size = 0, height = 0
-    for (let i = 0; i < children.length; ++i) {
-      let ch = children[i]
-      size += ch.chunkSize(); height += ch.height
-      ch.parent = this
-    }
-    this.size = size
-    this.height = height
-    this.parent = null
+export function BranchChunk(children) {
+  this.children = children
+  let size = 0, height = 0
+  for (let i = 0; i < children.length; ++i) {
+    let ch = children[i]
+    size += ch.chunkSize(); height += ch.height
+    ch.parent = this
   }
+  this.size = size
+  this.height = height
+  this.parent = null
+}
 
-  chunkSize() { return this.size }
+BranchChunk.prototype = {
+  chunkSize() { return this.size },
 
   removeInner(at, n) {
     this.size -= n
@@ -98,11 +98,11 @@ export class BranchChunk {
       this.children = [new LeafChunk(lines)]
       this.children[0].parent = this
     }
-  }
+  },
 
   collapse(lines) {
     for (let i = 0; i < this.children.length; ++i) this.children[i].collapse(lines)
-  }
+  },
 
   insertInner(at, lines, height) {
     this.size += lines.length
@@ -128,7 +128,7 @@ export class BranchChunk {
       }
       at -= sz
     }
-  }
+  },
 
   // When a node has grown, check whether it should be split.
   maybeSpill() {
@@ -151,7 +151,7 @@ export class BranchChunk {
       sibling.parent = me.parent
     } while (me.children.length > 10)
     me.parent.maybeSpill()
-  }
+  },
 
   iterN(at, n, op) {
     for (let i = 0; i < this.children.length; ++i) {

From 54ec95a4a467372d13cfc3dc843b5b7ffb6aa289 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 1 Jun 2017 08:45:15 +0200
Subject: [PATCH 3332/4742] [markdown mode] Don't swallow markup on indented
 lines in paragraph

Closes #4773
---
 mode/markdown/markdown.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 261a6a19bc..615200812b 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -131,7 +131,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function blockNormal(stream, state) {
-
     var sol = stream.sol();
 
     var prevLineIsList = state.list !== false,
@@ -153,15 +152,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     var match = null;
-    if (state.indentationDiff >= 4) {
+    if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || lineIsEmpty(state.prevLine))) {
       stream.skipToEnd();
-      if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
-        state.indentation -= 4;
-        state.indentedCode = true;
-        return tokenTypes.code;
-      } else {
-        return null;
-      }
+      state.indentation -= 4;
+      state.indentedCode = true;
+      return tokenTypes.code;
     } else if (stream.eatSpace()) {
       return null;
     } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) {

From 9d96a89386487c69c7da5e581f5a04e5f3ac3c71 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 1 Jun 2017 09:50:52 +0200
Subject: [PATCH 3333/4742] [javascript mode] Make tokenizing of async more
 context-sensitive

Closes #4774
---
 mode/javascript/javascript.js | 15 +++++++++++----
 mode/javascript/test.js       |  4 ++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c24fafd952..b9ce0eab12 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -41,7 +41,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
       "this": kw("this"), "class": kw("class"), "super": kw("atom"),
       "yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
-      "await": C, "async": kw("async")
+      "await": C
     };
 
     // Extend the 'normal' keywords with the TypeScript language extensions
@@ -147,9 +147,16 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return ret("operator", "operator", stream.current());
     } else if (wordRE.test(ch)) {
       stream.eatWhile(wordRE);
-      var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
-      return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
-                     ret("variable", "variable", word);
+      var word = stream.current()
+      if (state.lastType != ".") {
+        if (keywords.propertyIsEnumerable(word)) {
+          var kw = keywords[word]
+          return ret(kw.type, kw.style, word)
+        }
+        if (word == "async" && stream.match(/^\s*[\(\w]/, false))
+          return ret("async", "keyword", word)
+      }
+      return ret("variable", "variable", word)
     }
   }
 
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index d0f4f96d4a..328cbc2538 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -226,6 +226,10 @@
      "  [property method]: [string 'GET']",
      "});");
 
+  MT("async_variable",
+     "[keyword const] [def async] [operator =] {[property a]: [number 1]};",
+     "[keyword const] [def foo] [operator =] [string-2 `bar ${][variable async].[property a][string-2 }`];")
+
   MT("indent_switch",
      "[keyword switch] ([variable x]) {",
      "  [keyword default]:",

From 27de924efb5ff94afc926dad13ff5889193be2e0 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Wed, 31 May 2017 17:57:58 -0700
Subject: [PATCH 3334/4742] [vim] Don't throw errors to signal missing options

Addresses #4771
---
 keymap/vim.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index d4452c6973..c3375a743c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -411,11 +411,11 @@
       cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
-        throw Error('Unknown option: ' + name);
+        return new Error('Unknown option: ' + name);
       }
       if (option.type == 'boolean') {
         if (value && value !== true) {
-          throw Error('Invalid argument: ' + name + '=' + value);
+          return new Error('Invalid argument: ' + name + '=' + value);
         } else if (value !== false) {
           // Boolean options are set to true if value is not defined.
           value = true;
@@ -443,7 +443,7 @@
       cfg = cfg || {};
       var scope = cfg.scope;
       if (!option) {
-        throw Error('Unknown option: ' + name);
+        return new Error('Unknown option: ' + name);
       }
       if (option.callback) {
         var local = cm && option.callback(undefined, cm);
@@ -4300,13 +4300,18 @@
         // If no value is provided, then we assume this is a get.
         if (!optionIsBoolean && value === undefined || forceGet) {
           var oldValue = getOption(optionName, cm, setCfg);
-          if (oldValue === true || oldValue === false) {
+          if (oldValue instanceof Error) {
+            showConfirm(cm, oldValue.message);
+          } else if (oldValue === true || oldValue === false) {
             showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
           } else {
             showConfirm(cm, '  ' + optionName + '=' + oldValue);
           }
         } else {
-          setOption(optionName, value, cm, setCfg);
+          var setOptionReturn = setOption(optionName, value, cm, setCfg);
+          if (setOptionReturn instanceof Error) {
+            showConfirm(cm, setOptionReturn.message);
+          }
         }
       },
       setlocal: function (cm, params) {

From c4d8e10db32776e6d4aa7b2f9d38fd92b14a68a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Thu, 1 Jun 2017 14:32:53 +0200
Subject: [PATCH 3335/4742] [scala mode] Add enum

Enums are available in Dotty and soon will be available in Scala.
---
 mode/clike/clike.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 56c3a05b4f..ef5b16fc79 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -515,8 +515,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
     ),
     multiLineStrings: true,
-    blockKeywords: words("catch class do else finally for forSome if match switch try while"),
-    defKeywords: words("class def object package trait type val var"),
+    blockKeywords: words("catch class enum do else finally for forSome if match switch try while"),
+    defKeywords: words("class enum def object package trait type val var"),
     atoms: words("true false null"),
     indentStatements: false,
     indentSwitch: false,

From 782fd40eaf9cf8a75a48a0f15034d0f2ff9d916e Mon Sep 17 00:00:00 2001
From: Takuya Matsuyama <nora@odoruinu.net>
Date: Wed, 7 Jun 2017 14:52:43 +0900
Subject: [PATCH 3336/4742] [powershell mode] Fix invalid CodeMirror module
 path

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

diff --git a/mode/powershell/powershell.js b/mode/powershell/powershell.js
index 5eae979488..2728ef9d9d 100644
--- a/mode/powershell/powershell.js
+++ b/mode/powershell/powershell.js
@@ -4,9 +4,9 @@
 (function(mod) {
   'use strict';
   if (typeof exports == 'object' && typeof module == 'object') // CommonJS
-    mod(require('codemirror'));
+    mod(require('../../lib/codemirror'));
   else if (typeof define == 'function' && define.amd) // AMD
-    define(['codemirror'], mod);
+    define(['../../lib/codemirror'], mod);
   else // Plain browser env
     mod(window.CodeMirror);
 })(function(CodeMirror) {

From 6606ba4930ca8356d4871698e95c80c374e14829 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 8 Jun 2017 21:27:06 +0200
Subject: [PATCH 3337/4742] Break coordsCharInner loop if diff is 0

Closes #4786.
---
 src/measurement/position_measurement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index b4bcfda5bc..0f5f398757 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -479,7 +479,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
         steps = Math.min(steps, Math.ceil(Math.abs(diff) / diff_change_per_step))
         dir = diff < 0 ? 1 : -1
       }
-    } while (steps > 1 || ((dir < 0) != (diff < 0) && (Math.abs(diff) <= Math.abs(prevDiff))))
+    } while (diff != 0 && (steps > 1 || ((dir < 0) != (diff < 0) && (Math.abs(diff) <= Math.abs(prevDiff)))))
     if (Math.abs(diff) > Math.abs(prevDiff)) {
       if ((diff < 0) == (prevDiff < 0)) throw new Error("Broke out of infinite loop in coordsCharInner")
       pos = prevPos

From e87755621b52d24301dab04d01fa13649b947472 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 8 Jun 2017 21:28:10 +0200
Subject: [PATCH 3338/4742] Update blint dependency to fix npm t

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8484f78a52..54fb7e4808 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "lint": "bin/lint"
   },
   "devDependencies": {
-    "blint": "^0.5.1",
+    "blint": "^1",
     "node-static": "0.6.0",
     "phantomjs-prebuilt": "^2.1.12",
     "rollup": "^0.41.0",

From f62d2e040b5be36c019c3f45d00f620504901b56 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 8 Jun 2017 22:58:20 +0200
Subject: [PATCH 3339/4742] [javascript mode] Fix parsing of trailing commas
 after obj spread

Closes #4785
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index b9ce0eab12..692ffc61d8 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -502,7 +502,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
     } else if (type == "spread") {
-      return cont(expression);
+      return cont(expression, afterprop);
     } else if (type == ":") {
       return pass(afterprop)
     }

From 735ed37778f504a184c0b27c7af21dcfac1713a7 Mon Sep 17 00:00:00 2001
From: Grzegorz Mazur <teoretyk@gmail.com>
Date: Sat, 10 Jun 2017 11:47:53 +0200
Subject: [PATCH 3340/4742] [yacas mode] Tokenize '#' as an operator

(see grzegorzmazur/yacas#231)
---
 mode/yacas/yacas.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/yacas/yacas.js b/mode/yacas/yacas.js
index 30bd60b2ff..34c84fbd08 100644
--- a/mode/yacas/yacas.js
+++ b/mode/yacas/yacas.js
@@ -125,7 +125,7 @@ CodeMirror.defineMode('yacas', function(_config, _parserConfig) {
     }
 
     // operators; note that operators like @@ or /; are matched separately for each symbol.
-    if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%)/, true, false)) {
+    if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%|#)/, true, false)) {
       return 'operator';
     }
 

From 76f67a32225c48885052612326dfc0462cfa6b51 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Tue, 13 Jun 2017 04:10:57 -0700
Subject: [PATCH 3341/4742] Use document.getElementsByClassName directly

---
 src/edit/global_events.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/edit/global_events.js b/src/edit/global_events.js
index dd7d185308..b2ab7d57c1 100644
--- a/src/edit/global_events.js
+++ b/src/edit/global_events.js
@@ -6,8 +6,8 @@ import { on } from "../util/event"
 // garbage collected.
 
 function forEachCodeMirror(f) {
-  if (!document.body.getElementsByClassName) return
-  let byClass = document.body.getElementsByClassName("CodeMirror")
+  if (!document.getElementsByClassName) return
+  let byClass = document.getElementsByClassName("CodeMirror")
   for (let i = 0; i < byClass.length; i++) {
     let cm = byClass[i].CodeMirror
     if (cm) f(cm)

From 227ffed92411271888b1a02fbf275d4b4fb98f47 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@heppe-macbookpro4.roam.corp.google.com>
Date: Mon, 12 Jun 2017 19:44:10 -0700
Subject: [PATCH 3342/4742] [vim bindings] Avoid entering macro record mode
 with invalid register name

---
 keymap/vim.js    | 4 +++-
 test/vim_test.js | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c3375a743c..2763b5134f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2188,7 +2188,9 @@
       enterMacroRecordMode: function(cm, actionArgs) {
         var macroModeState = vimGlobalState.macroModeState;
         var registerName = actionArgs.selectedCharacter;
-        macroModeState.enterMacroRecordMode(cm, registerName);
+        if (vimGlobalState.registerController.isValidRegister(registerName)) {
+          macroModeState.enterMacroRecordMode(cm, registerName);
+        }
       },
       toggleOverwrite: function(cm) {
         if (!cm.state.overwrite) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 7d8f16fe83..d107e82cac 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2582,6 +2582,14 @@ testVim('macro_search_2f', function(cm, vim, helpers) {
   helpers.doKeys('@', 'a');
   helpers.assertCursorAt(0,9);
 }, { value: 'The quick brown fox jumped over the lazy dog.'});
+testVim('macro_yank_tick', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  // Start recording a macro into the \' register.
+  helpers.doKeys('q', '\'');
+  helpers.doKeys('y', '<Right>', '<Right>', '<Right>', '<Right>', 'p');
+  helpers.assertCursorAt(0,4);
+  eq('the tex parrot', cm.getValue());
+}, { value: 'the ex parrot'});
 testVim('yank_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('"', 'a', 'y', 'y');

From ed012e60b6021683b2b66c837a6c35d9c3e9ea93 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@heppe-macbookpro4.roam.corp.google.com>
Date: Wed, 14 Jun 2017 09:01:12 -0700
Subject: [PATCH 3343/4742] [vim bindings] Remove special handling for blank
 line from linewise delete.

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 2763b5134f..0310baded7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -986,9 +986,6 @@
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise, blockwise) {
-        if (linewise && text.charAt(0) == '\n') {
-          text = text.slice(1) + '\n';
-        }
         if (linewise && text.charAt(text.length - 1) !== '\n'){
           text += '\n';
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index d107e82cac..86a544756a 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -955,6 +955,10 @@ testVim('yy_multiply_repeat', function(cm, vim, helpers) {
   is(register.linewise);
   eqCursorPos(curStart, cm.getCursor());
 });
+testVim('2dd_blank_P', function(cm, vim, helpers) {
+  helpers.doKeys('2', 'd', 'd', 'P');
+  eq('\na\n\n', cm.getValue());
+}, { value: '\na\n\n' });
 // Change commands behave like d commands except that it also enters insert
 // mode. In addition, when the change is linewise, an additional newline is
 // inserted so that insert mode starts on that line.

From a07d43805f5df1ecc2b45e8c220806841e29ab09 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 17 Jun 2017 15:51:32 +0200
Subject: [PATCH 3344/4742] Add pasteLinesPerSelection option

Issue #4800
---
 doc/manual.html     | 7 +++++++
 src/edit/options.js | 1 +
 src/input/input.js  | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index dae1c027ff..636b7c02a3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -407,6 +407,13 @@ <h2>Configuration</h2>
       there is no selection will copy or cut the whole lines that have
       cursors on them.</dd>
 
+      <dt id="option_pasteLinesPerSelection"><code><strong>pasteLinesPerSelection</strong>: boolean</code></dt>
+      <dd>When pasting something from an external source (not from the
+      editor itself), if the number of lines matches the number of
+      selection, CodeMirror will by default insert one line per
+      selection. You can set this to <code>false</code> to disable
+      that behavior.</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/src/edit/options.js b/src/edit/options.js
index c0f06283b4..0601a83c3c 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -120,6 +120,7 @@ export function defineOptions(CodeMirror) {
 
   option("resetSelectionOnContextMenu", true)
   option("lineWiseCopyCut", true)
+  option("pasteLinesPerSelection", true)
 
   option("readOnly", false, (cm, val) => {
     if (val == "nocursor") {
diff --git a/src/input/input.js b/src/input/input.js
index 57e4ea533b..fa85209ee8 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -35,7 +35,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
         for (let i = 0; i < lastCopied.text.length; i++)
           multiPaste.push(doc.splitLines(lastCopied.text[i]))
       }
-    } else if (textLines.length == sel.ranges.length) {
+    } else if (textLines.length == sel.ranges.length && cm.options.pasteLinesPerSelection) {
       multiPaste = map(textLines, l => [l])
     }
   }

From f1d002ff8b31e0f6ddd0793428764bdf69849630 Mon Sep 17 00:00:00 2001
From: Danila Malyutin <danilaml@users.noreply.github.com>
Date: Sat, 17 Jun 2017 21:05:21 +0300
Subject: [PATCH 3345/4742] [rust mode] Add proper MIME type

leave the old one for now
---
 mode/rust/rust.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index 8558b53fe4..b635563ae6 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -68,4 +68,5 @@ CodeMirror.defineSimpleMode("rust",{
 
 
 CodeMirror.defineMIME("text/x-rustsrc", "rust");
+CodeMirror.defineMIME("text/rust", "rust");
 });

From dbb2645c3d7d2e23042a36e6eb673c8e2f237d2f Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@heppe-macbookpro4.roam.corp.google.com>
Date: Thu, 15 Jun 2017 07:59:21 -0700
Subject: [PATCH 3346/4742] [matchbrackets addon] Add afterCursor option

Default this to true when the fat-cursor style is active.

Issue #4803
---
 addon/edit/matchbrackets.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 76754ed557..7d1a43c1b4 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -18,7 +18,25 @@
 
   function findMatchingBracket(cm, where, strict, config) {
     var line = cm.getLineHandle(where.line), pos = where.ch - 1;
-    var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
+    var match;
+    var afterCursor;
+    if (!config || config.afterCursor === undefined) {
+      var paddedClassName = ' ' + cm.getWrapperElement().className + ' ';
+      afterCursor = (paddedClassName.indexOf(' cm-fat-cursor ') > -1);
+    } else {
+      afterCursor = config.afterCursor;
+    }
+
+    // A cursor is defined as between two characters, but in in vim command mode
+    // (i.e. not insert mode), the cursor is visually represented as a
+    // highlighted box on top of the 2nd character. Otherwise, we allow matches
+    // from before or after the cursor.
+    if (afterCursor) {
+      match = matching[line.text.charAt(++pos)];
+    } else {
+      match = (pos >= 0 && matching[line.text.charAt(pos)]) ||
+              matching[line.text.charAt(++pos)];
+    }
     if (!match) return null;
     var dir = match.charAt(1) == ">" ? 1 : -1;
     if (strict && (dir > 0) != (pos == where.ch)) return null;

From b9984efa7caa20caa21a1490dbf2ac112181f8fb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 17 Jun 2017 22:46:17 +0200
Subject: [PATCH 3347/4742] [matchbrackets addon] Simplify code a little

---
 addon/edit/matchbrackets.js | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 7d1a43c1b4..43473c1b12 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -18,25 +18,16 @@
 
   function findMatchingBracket(cm, where, strict, config) {
     var line = cm.getLineHandle(where.line), pos = where.ch - 1;
-    var match;
-    var afterCursor;
-    if (!config || config.afterCursor === undefined) {
-      var paddedClassName = ' ' + cm.getWrapperElement().className + ' ';
-      afterCursor = (paddedClassName.indexOf(' cm-fat-cursor ') > -1);
-    } else {
-      afterCursor = config.afterCursor;
-    }
+    var afterCursor = config && config.afterCursor
+    if (afterCursor == null)
+      afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
 
     // A cursor is defined as between two characters, but in in vim command mode
     // (i.e. not insert mode), the cursor is visually represented as a
     // highlighted box on top of the 2nd character. Otherwise, we allow matches
     // from before or after the cursor.
-    if (afterCursor) {
-      match = matching[line.text.charAt(++pos)];
-    } else {
-      match = (pos >= 0 && matching[line.text.charAt(pos)]) ||
-              matching[line.text.charAt(++pos)];
-    }
+    var match = (!afterCursor && pos >= 0 && matching[line.text.charAt(pos)]) ||
+        matching[line.text.charAt(++pos)];
     if (!match) return null;
     var dir = match.charAt(1) == ">" ? 1 : -1;
     if (strict && (dir > 0) != (pos == where.ch)) return null;

From 32d9b61633cf758c6e186a4bb5e37660b41d87d4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 17 Jun 2017 22:56:13 +0200
Subject: [PATCH 3348/4742] [vim bindings] Adjust % to handle changed
 findMatchingBracket behavior

Issue #4803
---
 keymap/vim.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0310baded7..336f1a7cc0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1835,16 +1835,16 @@
         var ch = cursor.ch;
         var lineText = cm.getLine(line);
         var symbol;
-        do {
-          symbol = lineText.charAt(ch++);
+        for (; ch < lineText.length; ch++) {
+          symbol = lineText.charAt(ch);
           if (symbol && isMatchableSymbol(symbol)) {
-            var style = cm.getTokenTypeAt(Pos(line, ch));
+            var style = cm.getTokenTypeAt(Pos(line, ch + 1));
             if (style !== "string" && style !== "comment") {
               break;
             }
           }
-        } while (symbol);
-        if (symbol) {
+        }
+        if (ch < lineText.length) {
           var matched = cm.findMatchingBracket(Pos(line, ch));
           return matched.to;
         } else {

From fdff25dfa76d7d87bd01faa95d1b213aa924684a Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@heppe-macbookpro4.roam.corp.google.com>
Date: Sun, 18 Jun 2017 09:04:07 -0700
Subject: [PATCH 3349/4742] [manual] Add a couple of sentences on new
 matchBrackets options.

---
 doc/manual.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 636b7c02a3..1e12062997 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2345,8 +2345,11 @@ <h2 id="addons">Addons</h2>
       cursor is next to them. It also adds a
       method <code>matchBrackets</code> that forces this to happen
       once, and a method <code>findMatchingBracket</code> that can be
-      used to run the bracket-finding algorithm that this uses
-      internally.</dd>
+      used to run the bracket-finding algorithm that this uses 
+      internally. By default, it will find the match to a matchable character
+      either before or after the cursor (preferring the one before),
+      but takes a boolean and config object to control some of the specifics
+      of the matching behavior.</dd>
 
       <dt id="addon_closebrackets"><a href="../addon/edit/closebrackets.js"><code>edit/closebrackets.js</code></a></dt>
       <dd>Defines an option <code>autoCloseBrackets</code> that will

From f11978387aa936538f1357dbd46e8a257af53de8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Jun 2017 08:51:48 +0200
Subject: [PATCH 3350/4742] [matchbrackets addon] Simplify interfact to
 findMatchingBracket

---
 addon/edit/matchbrackets.js | 19 ++++++++++++++-----
 keymap/emacs.js             |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 43473c1b12..4d7a230855 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -16,7 +16,7 @@
 
   var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
 
-  function findMatchingBracket(cm, where, strict, config) {
+  function findMatchingBracket(cm, where, config) {
     var line = cm.getLineHandle(where.line), pos = where.ch - 1;
     var afterCursor = config && config.afterCursor
     if (afterCursor == null)
@@ -30,7 +30,7 @@
         matching[line.text.charAt(++pos)];
     if (!match) return null;
     var dir = match.charAt(1) == ">" ? 1 : -1;
-    if (strict && (dir > 0) != (pos == where.ch)) return null;
+    if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
     var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
     var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
@@ -78,7 +78,7 @@
     var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
     var marks = [], ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
-      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config);
+      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
       if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
         var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
         marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
@@ -122,8 +122,17 @@
   });
 
   CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
-  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict, config){
-    return findMatchingBracket(this, pos, strict, config);
+  CodeMirror.defineExtension("findMatchingBracket", function(pos, config, oldConfig){
+    // Backwards-compatibility kludge
+    if (oldConfig || typeof config == "boolean") {
+      if (!oldConfig) {
+        config = config ? {strict: true} : null
+      } else {
+        oldConfig.strict = config
+        config = oldConfig
+      }
+    }
+    return findMatchingBracket(this, pos, config)
   });
   CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
     return scanForBracket(this, pos, dir, style, config);
diff --git a/keymap/emacs.js b/keymap/emacs.js
index 2d5fe1b815..63da52fa37 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -97,7 +97,7 @@
 
   function byExpr(cm, pos, dir) {
     var wrap;
-    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true))
+    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, {strict: true}))
         && wrap.match && (wrap.forward ? 1 : -1) == dir)
       return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
 

From 1c186477f5bcfbb445ce341185242169dc949a40 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Jun 2017 09:00:18 +0200
Subject: [PATCH 3351/4742] [manual] Clarify documentation for
 findMatchingBracket

---
 doc/manual.html | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 1e12062997..ed37692474 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2341,15 +2341,25 @@ <h2 id="addons">Addons</h2>
 
       <dt id="addon_matchbrackets"><a href="../addon/edit/matchbrackets.js"><code>edit/matchbrackets.js</code></a></dt>
       <dd>Defines an option <code>matchBrackets</code> which, when set
-      to true, causes matching brackets to be highlighted whenever the
-      cursor is next to them. It also adds a
+      to true or an options object, causes matching brackets to be
+      highlighted whenever the cursor is next to them. It also adds a
       method <code>matchBrackets</code> that forces this to happen
       once, and a method <code>findMatchingBracket</code> that can be
-      used to run the bracket-finding algorithm that this uses 
-      internally. By default, it will find the match to a matchable character
-      either before or after the cursor (preferring the one before),
-      but takes a boolean and config object to control some of the specifics
-      of the matching behavior.</dd>
+      used to run the bracket-finding algorithm that this uses
+      internally. It takes a start position and an optional config
+      object. By default, it will find the match to a matchable
+      character either before or after the cursor (preferring the one
+      before), but you can control its behavior with these options:
+        <dl>
+          <dt><strong><code>afterCursor</code></strong></dt>
+          <dd>Only use the character after the start position, never the one before it.</dd>
+          <dt><strong><code>strict</code></strong></dt>
+          <dd>Causes only matches where both brackets are at the same side of the start position to be considered.</dd>
+          <dt><strong><code>maxScanLines</code></strong></dt>
+          <dd>Stop after scanning this amount of lines without a successful match. Defaults to 1000.</dd>
+          <dt><strong><code>maxScanLineLength</code></strong></dt>
+          <dd>Ignore lines longer than this. Defaults to 10000.</dd>
+        </dl></dd>
 
       <dt id="addon_closebrackets"><a href="../addon/edit/closebrackets.js"><code>edit/closebrackets.js</code></a></dt>
       <dd>Defines an option <code>autoCloseBrackets</code> that will

From 58a487174b23740e76f42f883530ed50abd4f019 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Jun 2017 09:06:40 +0200
Subject: [PATCH 3352/4742] Mention undo from context menu not working in
 manual

Issue #4809
---
 doc/manual.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index ed37692474..809c2b6fe2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -930,7 +930,10 @@ <h2>Commands</h2>
       <dd>Delete the part of the line from the cursor to the right side of the visual line the cursor is on.</dd>
 
       <dt class=command id=command_undo><code><strong>undo</strong></code><span class=keybinding>Ctrl-Z (PC), Cmd-Z (Mac)</span></dt>
-      <dd>Undo the last change.</dd>
+      <dd>Undo the last change. Note that, because browsers still
+      don't make it possible for scripts to react to or customize the
+      context menu, selecting undo (or redo) from the context menu in
+      a CodeMirror instance does not work.</dd>
 
       <dt class=command id=command_redo><code><strong>redo</strong></code><span class=keybinding>Ctrl-Y (PC), Shift-Cmd-Z (Mac), Cmd-Y (Mac)</span></dt>
       <dd>Redo the last undone change.</dd>

From 1cbb7b736cdf8c17bd846c3568ac2a1a3999f819 Mon Sep 17 00:00:00 2001
From: Todd Kennedy <todd@selfassembled.org>
Date: Mon, 19 Jun 2017 16:25:47 -0700
Subject: [PATCH 3353/4742] Export style in package.json

This way it can be included more easily with javascript bundlers like
browserify/sheetify
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 54fb7e4808..694b03c6df 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "name": "codemirror",
   "version": "5.26.1",
   "main": "lib/codemirror.js",
+  "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
   "directories": {

From e268fdeba9c560716ededa024b03003d6b58e511 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Jun 2017 09:09:38 +0200
Subject: [PATCH 3354/4742] [sql mode] Add two Postgresql keywords

Closes #4813
---
 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 be3b4c6407..22a0d4fe46 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -400,7 +400,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name: "sql",
     client: set("source"),
     // http://www.postgresql.org/docs/9.5/static/sql-keywords-appendix.html
-    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat"),
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat"),
     // http://www.postgresql.org/docs/9.5/static/datatype.html
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),

From c1fd2ca086fd0fc6eb396350bf20925350d764e4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 4 May 2017 12:31:02 +0200
Subject: [PATCH 3355/4742] Implement lookahead for modes

---
 addon/runmode/runmode-standalone.js |   3 +-
 addon/runmode/runmode.node.js       |   3 +-
 src/display/highlight_worker.js     |  16 ++--
 src/edit/methods.js                 |   4 +-
 src/input/indent.js                 |   4 +-
 src/line/highlight.js               | 133 +++++++++++++++++++---------
 src/util/StringStream.js            |   7 +-
 7 files changed, 114 insertions(+), 56 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index f4f352c803..1bd808c787 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -65,7 +65,8 @@ StringStream.prototype = {
     this.lineStart += n;
     try { return inner(); }
     finally { this.lineStart -= n; }
-  }
+  },
+  lookAhead: function() { return null }
 };
 CodeMirror.StringStream = StringStream;
 
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index b22a5187f3..93487b6bd4 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -91,7 +91,8 @@ StringStream.prototype = {
     this.lineStart += n;
     try { return inner(); }
     finally { this.lineStart -= n; }
-  }
+  },
+  lookAhead: function() { return null }
 };
 exports.StringStream = StringStream;
 
diff --git a/src/display/highlight_worker.js b/src/display/highlight_worker.js
index d34db2b42e..1d964e640d 100644
--- a/src/display/highlight_worker.js
+++ b/src/display/highlight_worker.js
@@ -1,4 +1,4 @@
-import { getStateBefore, highlightLine, processLine } from "../line/highlight"
+import { getContextBefore, highlightLine, processLine } from "../line/highlight"
 import { copyState } from "../modes"
 import { bind } from "../util/misc"
 
@@ -17,13 +17,15 @@ function highlightWorker(cm) {
   if (doc.frontier < doc.first) doc.frontier = doc.first
   if (doc.frontier >= cm.display.viewTo) return
   let end = +new Date + cm.options.workTime
-  let state = copyState(doc.mode, getStateBefore(cm, doc.frontier))
+  let context = getContextBefore(cm, doc.frontier)
   let changedLines = []
 
   doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), line => {
     if (doc.frontier >= cm.display.viewFrom) { // Visible
-      let oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength
-      let highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true)
+      let oldStyles = line.styles
+      let resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null
+      let highlighted = highlightLine(cm, line, context, true)
+      if (resetState) context.state = resetState
       line.styles = highlighted.styles
       let oldCls = line.styleClasses, newCls = highlighted.classes
       if (newCls) line.styleClasses = newCls
@@ -32,11 +34,11 @@ function highlightWorker(cm) {
         oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass)
       for (let i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i]
       if (ischange) changedLines.push(doc.frontier)
-      line.stateAfter = tooLong ? state : copyState(doc.mode, state)
+      line.stateAfter = context.save()
     } else {
       if (line.text.length <= cm.options.maxHighlightLength)
-        processLine(cm, line.text, state)
-      line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null
+        processLine(cm, line.text, context)
+      line.stateAfter = doc.frontier % 5 == 0 ? context.save() : null
     }
     ++doc.frontier
     if (+new Date > end) {
diff --git a/src/edit/methods.js b/src/edit/methods.js
index db2ffd68dd..99f61da49e 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -3,7 +3,7 @@ import { commands } from "./commands"
 import { attachDoc } from "../model/document_data"
 import { activeElt, addClass, rmClass } from "../util/dom"
 import { eventMixin, signal } from "../util/event"
-import { getLineStyles, getStateBefore, takeToken } from "../line/highlight"
+import { getLineStyles, getContextBefore, takeToken } from "../line/highlight"
 import { indentLine } from "../input/indent"
 import { triggerElectric } from "../input/input"
 import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
@@ -178,7 +178,7 @@ export default function(CodeMirror) {
     getStateAfter: function(line, precise) {
       let doc = this.doc
       line = clipLine(doc, line == null ? doc.first + doc.size - 1: line)
-      return getStateBefore(this, line + 1, precise)
+      return getContextBefore(this, line + 1, precise).state
     },
 
     cursorCoords: function(start, mode) {
diff --git a/src/input/indent.js b/src/input/indent.js
index 2c1755eb9f..024f5f9254 100644
--- a/src/input/indent.js
+++ b/src/input/indent.js
@@ -1,4 +1,4 @@
-import { getStateBefore } from "../line/highlight"
+import { getContextBefore } from "../line/highlight"
 import { Pos } from "../line/pos"
 import { getLine } from "../line/utils_line"
 import { replaceRange } from "../model/changes"
@@ -18,7 +18,7 @@ export function indentLine(cm, n, how, aggressive) {
     // Fall back to "prev" when the mode doesn't have an indentation
     // method.
     if (!doc.mode.indent) how = "prev"
-    else state = getStateBefore(cm, n)
+    else state = getContextBefore(cm, n).state
   }
 
   let tabSize = cm.options.tabSize
diff --git a/src/line/highlight.js b/src/line/highlight.js
index dcf020adf7..f1114a5d98 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -5,22 +5,64 @@ import StringStream from "../util/StringStream"
 import { getLine, lineNo } from "./utils_line"
 import { clipPos } from "./pos"
 
+class SavedContext {
+  constructor(state, lookAhead) {
+    this.state = state
+    this.lookAhead = lookAhead
+  }
+}
+
+class Context {
+  constructor(doc, state, line, lookAhead) {
+    this.state = state
+    this.doc = doc
+    this.line = line
+    this.maxLookAhead = lookAhead || 0
+  }
+
+  lookAhead(n) {
+    let line = this.doc.getLine(this.line + n)
+    if (line != null && n > this.maxLookAhead) this.maxLookAhead = n
+    return line
+  }
+
+  nextLine() {
+    this.line++
+    if (this.maxLookAhead > 0) this.maxLookAhead--
+  }
+
+  static fromSaved(doc, saved, line) {
+    if (saved instanceof SavedContext)
+      return new Context(doc, copyState(doc.mode, saved.saved), line, saved.lookAhead)
+    else
+      return new Context(doc, copyState(doc.mode, saved), line)
+  }
+
+  save(copy) {
+    let state = copy ? copyState(this.doc.mode, this.state) : this.state
+    return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state
+  }
+}
+
+
 // Compute a style array (an array starting with a mode generation
 // -- for invalidation -- followed by pairs of end positions and
 // style strings), which is used to highlight the tokens on the
 // line.
-export function highlightLine(cm, line, state, forceToEnd) {
+export function highlightLine(cm, line, context, forceToEnd) {
   // A styles array always starts with a number identifying the
   // mode/overlays that it is based on (for easy invalidation).
   let st = [cm.state.modeGen], lineClasses = {}
   // Compute the base array of styles
-  runMode(cm, line.text, cm.doc.mode, state, (end, style) => st.push(end, style),
-    lineClasses, forceToEnd)
+  runMode(cm, line.text, cm.doc.mode, context, (end, style) => st.push(end, style),
+          lineClasses, forceToEnd)
+  let state = context.state
 
   // Run overlays, adjust style array.
   for (let o = 0; o < cm.state.overlays.length; ++o) {
     let overlay = cm.state.overlays[o], i = 1, at = 0
-    runMode(cm, line.text, overlay.mode, true, (end, style) => {
+    context.state = true
+    runMode(cm, line.text, overlay.mode, context, (end, style) => {
       let start = i
       // Ensure there's a token end at the current position, and that i points at it
       while (at < end) {
@@ -42,15 +84,18 @@ export function highlightLine(cm, line, state, forceToEnd) {
       }
     }, lineClasses)
   }
+  context.state = state
 
   return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
 }
 
 export function getLineStyles(cm, line, updateFrontier) {
   if (!line.styles || line.styles[0] != cm.state.modeGen) {
-    let state = getStateBefore(cm, lineNo(line))
-    let result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state)
-    line.stateAfter = state
+    let context = getContextBefore(cm, lineNo(line))
+    let resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state)
+    let result = highlightLine(cm, line, context)
+    if (resetState) context.state = resetState
+    line.stateAfter = context.save()
     line.styles = result.styles
     if (result.classes) line.styleClasses = result.classes
     else if (line.styleClasses) line.styleClasses = null
@@ -59,32 +104,33 @@ export function getLineStyles(cm, line, updateFrontier) {
   return line.styles
 }
 
-export function getStateBefore(cm, n, precise) {
+export function getContextBefore(cm, n, precise) {
   let doc = cm.doc, display = cm.display
-  if (!doc.mode.startState) return true
-  let pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter
-  if (!state) state = startState(doc.mode)
-  else state = copyState(doc.mode, state)
-  doc.iter(pos, n, line => {
-    processLine(cm, line.text, state)
-    let save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo
-    line.stateAfter = save ? copyState(doc.mode, state) : null
-    ++pos
+  if (!doc.mode.startState) return new Context(doc, true, n)
+  let start = findStartLine(cm, n, precise)
+  let saved = start > doc.first && getLine(doc, start - 1).stateAfter
+  let context = saved ? Context.fromSaved(doc, saved, start) : new Context(doc, startState(doc.mode), start)
+
+  doc.iter(start, n, line => {
+    processLine(cm, line.text, context)
+    let pos = context.line
+    line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null
+    context.nextLine()
   })
-  if (precise) doc.frontier = pos
-  return state
+  if (precise) doc.frontier = context.line
+  return context
 }
 
 // Lightweight form of highlight -- proceed over this line and
 // update state, but don't save a style array. Used for lines that
 // aren't currently visible.
-export function processLine(cm, text, state, startAt) {
+export function processLine(cm, text, context, startAt) {
   let mode = cm.doc.mode
-  let stream = new StringStream(text, cm.options.tabSize)
+  let stream = new StringStream(text, cm.options.tabSize, context)
   stream.start = stream.pos = startAt || 0
-  if (text == "") callBlankLine(mode, state)
+  if (text == "") callBlankLine(mode, context.state)
   while (!stream.eol()) {
-    readToken(mode, stream, state)
+    readToken(mode, stream, context.state)
     stream.start = stream.pos
   }
 }
@@ -105,26 +151,28 @@ export function readToken(mode, stream, state, inner) {
   throw new Error("Mode " + mode.name + " failed to advance stream.")
 }
 
+class Token {
+  constructor(stream, type, state) {
+    this.start = stream.start; this.end = stream.pos
+    this.string = stream.current()
+    this.type = type || null
+    this.state = state
+  }
+}
+
 // Utility for getTokenAt and getLineTokens
 export function takeToken(cm, pos, precise, asArray) {
-  let getObj = copy => ({
-    start: stream.start, end: stream.pos,
-    string: stream.current(),
-    type: style || null,
-    state: copy ? copyState(doc.mode, state) : state
-  })
-
   let doc = cm.doc, mode = doc.mode, style
   pos = clipPos(doc, pos)
-  let line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise)
-  let stream = new StringStream(line.text, cm.options.tabSize), tokens
+  let line = getLine(doc, pos.line), context = getContextBefore(cm, pos.line, precise)
+  let stream = new StringStream(line.text, cm.options.tabSize, context), tokens
   if (asArray) tokens = []
   while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
     stream.start = stream.pos
-    style = readToken(mode, stream, state)
-    if (asArray) tokens.push(getObj(true))
+    style = readToken(mode, stream, context.state)
+    if (asArray) tokens.push(new Token(stream, style, copyState(doc.mode, context.state)))
   }
-  return asArray ? tokens : getObj()
+  return asArray ? tokens : new Token(stream, style, context.state)
 }
 
 function extractLineClasses(type, output) {
@@ -142,21 +190,21 @@ function extractLineClasses(type, output) {
 }
 
 // Run the given mode's parser over a line, calling f for each token.
-function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
+function runMode(cm, text, mode, context, f, lineClasses, forceToEnd) {
   let flattenSpans = mode.flattenSpans
   if (flattenSpans == null) flattenSpans = cm.options.flattenSpans
   let curStart = 0, curStyle = null
-  let stream = new StringStream(text, cm.options.tabSize), style
+  let stream = new StringStream(text, cm.options.tabSize, context), style
   let inner = cm.options.addModeClass && [null]
-  if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses)
+  if (text == "") extractLineClasses(callBlankLine(mode, context.state), lineClasses)
   while (!stream.eol()) {
     if (stream.pos > cm.options.maxHighlightLength) {
       flattenSpans = false
-      if (forceToEnd) processLine(cm, text, state, stream.pos)
+      if (forceToEnd) processLine(cm, text, context, stream.pos)
       stream.pos = text.length
       style = null
     } else {
-      style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses)
+      style = extractLineClasses(readToken(mode, stream, context.state, inner), lineClasses)
     }
     if (inner) {
       let mName = inner[0].name
@@ -191,8 +239,9 @@ function findStartLine(cm, n, precise) {
   let lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100)
   for (let search = n; search > lim; --search) {
     if (search <= doc.first) return doc.first
-    let line = getLine(doc, search - 1)
-    if (line.stateAfter && (!precise || search <= doc.frontier)) return search
+    let line = getLine(doc, search - 1), after = line.stateAfter
+    if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.frontier))
+      return search
     let indented = countColumn(line.text, null, cm.options.tabSize)
     if (minline == null || minindent > indented) {
       minline = search - 1
diff --git a/src/util/StringStream.js b/src/util/StringStream.js
index 0f7af07ca1..ac9555f1ce 100644
--- a/src/util/StringStream.js
+++ b/src/util/StringStream.js
@@ -6,12 +6,13 @@ import { countColumn } from "./misc"
 // parsers more succinct.
 
 class StringStream {
-  constructor(string, tabSize) {
+  constructor(string, tabSize, lineOracle) {
     this.pos = this.start = 0
     this.string = string
     this.tabSize = tabSize || 8
     this.lastColumnPos = this.lastColumnValue = 0
     this.lineStart = 0
+    this.lineOracle = lineOracle
   }
 
   eol() {return this.pos >= this.string.length}
@@ -76,6 +77,10 @@ class StringStream {
     try { return inner() }
     finally { this.lineStart -= n }
   }
+  lookAhead(n) {
+    let oracle = this.lineOracle
+    return oracle && oracle.lookAhead(n)
+  }
 }
 
 export default StringStream

From f6b6dbe999d519e2e0949652f45ed5fb97dc28b0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 4 May 2017 14:15:22 +0200
Subject: [PATCH 3356/4742] Separate state and highlighting frontiers

Since moving the highlighting frontier forward when doing
things like getTokenAt is not safe at all.

Also properly update highlighting frontier when a change
happens.
---
 src/display/highlight_worker.js | 20 +++++++++++---------
 src/display/mode_state.js       |  2 +-
 src/line/highlight.js           | 28 +++++++++++++++++++++++-----
 src/model/Doc.js                |  2 +-
 src/model/changes.js            |  4 ++--
 test/test.js                    | 19 +++++++++++++++++++
 6 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/src/display/highlight_worker.js b/src/display/highlight_worker.js
index 1d964e640d..e868c42f3c 100644
--- a/src/display/highlight_worker.js
+++ b/src/display/highlight_worker.js
@@ -8,20 +8,19 @@ import { regLineChange } from "./view_tracking"
 // HIGHLIGHT WORKER
 
 export function startWorker(cm, time) {
-  if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
+  if (cm.doc.highlightFrontier < cm.display.viewTo)
     cm.state.highlight.set(time, bind(highlightWorker, cm))
 }
 
 function highlightWorker(cm) {
   let doc = cm.doc
-  if (doc.frontier < doc.first) doc.frontier = doc.first
-  if (doc.frontier >= cm.display.viewTo) return
+  if (doc.highlightFrontier >= cm.display.viewTo) return
   let end = +new Date + cm.options.workTime
-  let context = getContextBefore(cm, doc.frontier)
+  let context = getContextBefore(cm, doc.highlightFrontier)
   let changedLines = []
 
-  doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), line => {
-    if (doc.frontier >= cm.display.viewFrom) { // Visible
+  doc.iter(context.line, Math.min(doc.first + doc.size, cm.display.viewTo + 500), line => {
+    if (context.line >= cm.display.viewFrom) { // Visible
       let oldStyles = line.styles
       let resetState = line.text.length > cm.options.maxHighlightLength ? copyState(doc.mode, context.state) : null
       let highlighted = highlightLine(cm, line, context, true)
@@ -33,19 +32,22 @@ function highlightWorker(cm) {
       let ischange = !oldStyles || oldStyles.length != line.styles.length ||
         oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass)
       for (let i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i]
-      if (ischange) changedLines.push(doc.frontier)
+      if (ischange) changedLines.push(context.line)
       line.stateAfter = context.save()
+      context.nextLine()
     } else {
       if (line.text.length <= cm.options.maxHighlightLength)
         processLine(cm, line.text, context)
-      line.stateAfter = doc.frontier % 5 == 0 ? context.save() : null
+      line.stateAfter = context.line % 5 == 0 ? context.save() : null
+      context.nextLine()
     }
-    ++doc.frontier
     if (+new Date > end) {
       startWorker(cm, cm.options.workDelay)
       return true
     }
   })
+  doc.highlightFrontier = context.line
+  doc.modeFrontier = Math.max(doc.modeFrontier, context.line)
   if (changedLines.length) runInOp(cm, () => {
     for (let i = 0; i < changedLines.length; i++)
       regLineChange(cm, changedLines[i], "text")
diff --git a/src/display/mode_state.js b/src/display/mode_state.js
index 8c4c60b058..ca0a534ca4 100644
--- a/src/display/mode_state.js
+++ b/src/display/mode_state.js
@@ -15,7 +15,7 @@ export function resetModeState(cm) {
     if (line.stateAfter) line.stateAfter = null
     if (line.styles) line.styles = null
   })
-  cm.doc.frontier = cm.doc.first
+  cm.doc.modeFrontier = cm.doc.highlightFrontier = cm.doc.first
   startWorker(cm, 100)
   cm.state.modeGen++
   if (cm.curOp) regChange(cm)
diff --git a/src/line/highlight.js b/src/line/highlight.js
index f1114a5d98..e835aa0411 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -39,7 +39,7 @@ class Context {
   }
 
   save(copy) {
-    let state = copy ? copyState(this.doc.mode, this.state) : this.state
+    let state = copy !== false ? copyState(this.doc.mode, this.state) : this.state
     return this.maxLookAhead > 0 ? new SavedContext(state, this.maxLookAhead) : state
   }
 }
@@ -95,11 +95,12 @@ export function getLineStyles(cm, line, updateFrontier) {
     let resetState = line.text.length > cm.options.maxHighlightLength && copyState(cm.doc.mode, context.state)
     let result = highlightLine(cm, line, context)
     if (resetState) context.state = resetState
-    line.stateAfter = context.save()
+    line.stateAfter = context.save(!resetState)
     line.styles = result.styles
     if (result.classes) line.styleClasses = result.classes
     else if (line.styleClasses) line.styleClasses = null
-    if (updateFrontier === cm.doc.frontier) cm.doc.frontier++
+    if (updateFrontier === cm.doc.highlightFrontier)
+      cm.doc.modeFrontier = Math.max(cm.doc.modeFrontier, ++cm.doc.highlightFrontier)
   }
   return line.styles
 }
@@ -117,7 +118,7 @@ export function getContextBefore(cm, n, precise) {
     line.stateAfter = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo ? context.save() : null
     context.nextLine()
   })
-  if (precise) doc.frontier = context.line
+  if (precise) doc.modeFrontier = context.line
   return context
 }
 
@@ -240,7 +241,7 @@ function findStartLine(cm, n, precise) {
   for (let search = n; search > lim; --search) {
     if (search <= doc.first) return doc.first
     let line = getLine(doc, search - 1), after = line.stateAfter
-    if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.frontier))
+    if (after && (!precise || search + (after instanceof SavedContext ? after.lookAhead : 0) <= doc.modeFrontier))
       return search
     let indented = countColumn(line.text, null, cm.options.tabSize)
     if (minline == null || minindent > indented) {
@@ -250,3 +251,20 @@ function findStartLine(cm, n, precise) {
   }
   return minline
 }
+
+export function retreatFrontier(doc, n) {
+  doc.modeFrontier = Math.min(doc.modeFrontier, n)
+  if (doc.highlightFrontier < n - 10) return
+  let start = doc.first
+  for (let line = n - 1; line > start; line--) {
+    let saved = getLine(doc, line).stateAfter
+    // change is on 3
+    // state on line 1 looked ahead 2 -- so saw 3
+    // test 1 + 2 < 3 should cover this
+    if (saved && (!(saved instanceof SavedContext) || line + saved.lookAhead < n)) {
+      start = line + 1
+      break
+    }
+  }
+  doc.highlightFrontier = Math.min(doc.highlightFrontier, start)
+}
diff --git a/src/model/Doc.js b/src/model/Doc.js
index e76d3b152f..c3da76d74e 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -29,7 +29,7 @@ let Doc = function(text, mode, firstLine, lineSep, direction) {
   this.scrollTop = this.scrollLeft = 0
   this.cantEdit = false
   this.cleanGeneration = 1
-  this.frontier = firstLine
+  this.modeFrontier = this.highlightFrontier = firstLine
   let start = Pos(firstLine, 0)
   this.sel = simpleSelection(start)
   this.history = new History(null)
diff --git a/src/model/changes.js b/src/model/changes.js
index c6692d4c5a..214e0231ab 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -1,3 +1,4 @@
+import { retreatFrontier } from "../line/highlight"
 import { startWorker } from "../display/highlight_worker"
 import { operation } from "../display/operations"
 import { regChange, regLineChange } from "../display/view_tracking"
@@ -231,8 +232,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
     if (recomputeMaxLength) cm.curOp.updateMaxLine = true
   }
 
-  // Adjust frontier, schedule worker
-  doc.frontier = Math.min(doc.frontier, from.line)
+  retreatFrontier(doc, from.line)
   startWorker(cm, 400)
 
   let lendiff = change.text.length - (to.line - from.line) - 1
diff --git a/test/test.js b/test/test.js
index d1abc7a812..59b760d5ae 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2474,3 +2474,22 @@ testCM("delete_wrapped", function(cm) {
   cm.deleteH(-1, "char");
   eq(cm.getLine(0), "1245");
 }, {value: "12345", lineWrapping: true})
+
+CodeMirror.defineMode("lookahead_mode", function() {
+  // Colors text as atom if the line two lines down has an x in it
+  return {
+    token: function(stream) {
+      stream.skipToEnd()
+      return /x/.test(stream.lookAhead(2)) ? "atom" : null
+    }
+  }
+})
+
+testCM("mode_lookahead", function(cm) {
+  eq(cm.getTokenAt(Pos(0, 1)).type, "atom")
+  eq(cm.getTokenAt(Pos(1, 1)).type, "atom")
+  eq(cm.getTokenAt(Pos(2, 1)).type, null)
+  cm.replaceRange("\n", Pos(2, 0))
+  eq(cm.getTokenAt(Pos(0, 1)).type, null)
+  eq(cm.getTokenAt(Pos(1, 1)).type, "atom")
+}, {value: "foo\na\nx\nx\n", mode: "lookahead_mode"})

From 641e1197e4afd259817207ec246ce0dc0314213d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 30 May 2017 14:16:58 +0200
Subject: [PATCH 3357/4742] Add lookahead support to runmode.node.js

---
 addon/runmode/runmode.node.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 93487b6bd4..01d08ffed8 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -22,12 +22,13 @@ var countColumn = function(string, end, tabSize, startIndex, startValue) {
   }
 };
 
-function StringStream(string, tabSize) {
+function StringStream(string, tabSize, context) {
   this.pos = this.start = 0;
   this.string = string;
   this.tabSize = tabSize || 8;
   this.lastColumnPos = this.lastColumnValue = 0;
   this.lineStart = 0;
+  this.context = context
 };
 
 StringStream.prototype = {
@@ -92,7 +93,10 @@ StringStream.prototype = {
     try { return inner(); }
     finally { this.lineStart -= n; }
   },
-  lookAhead: function() { return null }
+  lookAhead: function(n) {
+    let line = this.context.line + n
+    return line >= this.context.lines.length ? null : this.context.lines[line]
+  }
 };
 exports.StringStream = StringStream;
 
@@ -164,9 +168,10 @@ exports.registerHelper = exports.registerGlobalHelper = Math.min;
 exports.runMode = function(string, modespec, callback, options) {
   var mode = exports.getMode({indentUnit: 2}, modespec);
   var lines = splitLines(string), state = (options && options.state) || exports.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
+  var context = {lines: lines, line: 0}
+  for (var i = 0, e = lines.length; i < e; ++i, ++context.line) {
     if (i) callback("\n");
-    var stream = new exports.StringStream(lines[i]);
+    var stream = new exports.StringStream(lines[i], 4, context);
     if (!stream.string && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
       var style = mode.token(stream, state);

From 55e52852c76e56be9f5705be23fe6af746fc6edb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Jun 2017 09:15:51 +0200
Subject: [PATCH 3358/4742] Document StringStream.lookahead

---
 doc/manual.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 809c2b6fe2..2e0dd16df1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3241,6 +3241,12 @@ <h2>Writing CodeMirror Modes</h2>
       <dt><code><strong>current</strong>() → string</code></dt>
       <dd>Get the string between the start of the current token and
       the current stream position.</dd>
+
+      <dt><code><strong>lookahead</strong>(n: number) → ?string</code></dt>
+      <dd>Get the line <code>n</code> (&gt;0) lines after the current
+      one, in order to scan ahead across line boundaries. Note that
+      you want to do this carefully, since looking far ahead will make
+      mode state caching much less effective.</dd>
     </dl>
 
     <p id="blankLine">By default, blank lines are simply skipped when

From 0aec8bfc93ece9d254588e781707001d22819fa4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Jun 2017 09:29:03 +0200
Subject: [PATCH 3359/4742] Fix accidental let

---
 addon/runmode/runmode.node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 01d08ffed8..833bd6ed76 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -94,7 +94,7 @@ StringStream.prototype = {
     finally { this.lineStart -= n; }
   },
   lookAhead: function(n) {
-    let line = this.context.line + n
+    var line = this.context.line + n
     return line >= this.context.lines.length ? null : this.context.lines[line]
   }
 };

From db1908a6ef80c3a712dc9a20ab914a4fc97e4276 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Jun 2017 09:29:23 +0200
Subject: [PATCH 3360/4742] [mode/simple addon] Allow token source to be a
 function

Issue #4787
---
 addon/mode/simple.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index df663365e8..de3848bb8b 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -77,6 +77,7 @@
 
   function asToken(val) {
     if (!val) return null;
+    if (val.apply) return val
     if (typeof val == "string") return val.replace(/\./g, " ");
     var result = [];
     for (var i = 0; i < val.length; i++)
@@ -133,17 +134,19 @@
             state.indent.push(stream.indentation() + config.indentUnit);
           if (rule.data.dedent)
             state.indent.pop();
+          var token = rule.token
+          if (token.apply) token = token(matches)
           if (matches.length > 2) {
             state.pending = [];
             for (var j = 2; j < matches.length; j++)
               if (matches[j])
                 state.pending.push({text: matches[j], token: rule.token[j - 1]});
             stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
-            return rule.token[0];
-          } else if (rule.token && rule.token.join) {
-            return rule.token[0];
+            return token[0];
+          } else if (token && token.join) {
+            return token[0];
           } else {
-            return rule.token;
+            return token;
           }
         }
       }

From d74d4ff2c046f64d5ee0ff380f3a317c32296a6f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 22 Jun 2017 08:11:26 +0200
Subject: [PATCH 3361/4742] [searchcursor addon] Normalize strings when
 supported

Issue #4784
---
 addon/search/searchcursor.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index c5e74b79b7..0e27ebc325 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -115,8 +115,14 @@
     }
   }
 
-  function doFold(str) { return str.toLowerCase() }
-  function noFold(str) { return str }
+  var doFold, noFold
+  if (String.prototype.normalize) {
+    doFold = function(str) { return str.normalize("NFD").toLowerCase() }
+    noFold = function(str) { return str.normalize("NFD") }
+  } else {
+    doFold = function(str) { return str.toLowerCase() }
+    noFold = function(str) { return str }
+  }
 
   // Maps a position in a case-folded line back to a position in the original line
   // (compensating for codepoints increasing in number during folding)

From ee3a8f72ee72f8eb6c8be0661dba3d4d96eb9034 Mon Sep 17 00:00:00 2001
From: mzabuawala <m_zabuawala@yahoo.com>
Date: Wed, 21 Jun 2017 15:13:49 +0530
Subject: [PATCH 3362/4742] [sql mode] Added new SQL keywords supported by
 Postgres 10

Ref: https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
---
 mode/sql/sql.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 22a0d4fe46..7a7c796b0e 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -399,10 +399,10 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-pgsql", {
     name: "sql",
     client: set("source"),
-    // http://www.postgresql.org/docs/9.5/static/sql-keywords-appendix.html
-    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat"),
-    // http://www.postgresql.org/docs/9.5/static/datatype.html
-    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
+    // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
+    // https://www.postgresql.org/docs/10/static/datatype.html
+    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
     dateSQL: set("date time timestamp"),

From 8dd9a875066472ab291e571206ca209bfc5de7b9 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@heppe-macbookpro4.roam.corp.google.com>
Date: Tue, 20 Jun 2017 20:15:09 -0700
Subject: [PATCH 3363/4742] [vim bindings] Rewrite queries that end in $

into a form that CodeMirror can understand.
---
 keymap/vim.js    | 4 ++++
 test/vim_test.js | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 336f1a7cc0..d8a2d60d41 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4509,6 +4509,10 @@
         if (tokens.length) {
           regexPart = tokens[0];
           replacePart = tokens[1];
+          if (regexPart && regexPart[regexPart.length - 1] === '$') {
+            regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
+            replacePart = replacePart ? replacePart + '\n' : '\n';
+          }
           if (replacePart !== undefined) {
             if (getOption('pcre')) {
               replacePart = unescapeRegexReplace(replacePart);
diff --git a/test/vim_test.js b/test/vim_test.js
index 86a544756a..da49a24cf6 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3789,6 +3789,14 @@ testSubstitute('ex_substitute_multibackslash_replacement', {
   value: 'one,two \n three,four',
   expectedValue: 'one\\\\\\\\two \n three\\\\\\\\four', // 2*8 backslashes.
   expr: '%s/,/\\\\\\\\\\\\\\\\/g'}); // 16 backslashes.
+testSubstitute('ex_substitute_dollar_match', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one,two ,\n three,four',
+  expr: '%s/$/,/g'});
+testSubstitute('ex_substitute_newline_match', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one,two , three,four',
+  expr: '%s/\\n/,/g'});
 testSubstitute('ex_substitute_newline_replacement', {
   value: 'one,two \n three,four',
   expectedValue: 'one\ntwo \n three\nfour',

From 314bd7fd473dc11a2a51f3a81edb2aa86132734a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 22 Jun 2017 09:44:52 +0200
Subject: [PATCH 3364/4742] Mark version 5.27.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 36 ++++++++++++++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 20 ++++++++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ed1cfe1cde..823dd88063 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -151,6 +151,7 @@ Daniel Kesler
 Daniel KJ
 Daniel Neel
 Daniel Parnell
+Danila Malyutin
 Danny Yoo
 darealshinji
 Darius Roberts
@@ -352,6 +353,7 @@ ks-ifware
 kubelsmieci
 KwanEsq
 Kyle Kelley
+KyleMcNutt
 Lanfei
 Lanny
 Laszlo Vidacs
@@ -452,6 +454,7 @@ mps
 ms
 mtaran-google
 Mu-An Chiou
+mzabuawala
 Narciso Jaramillo
 Nathan Williams
 ndr
@@ -594,9 +597,11 @@ Taha Jahangir
 takamori
 Tako Schotanus
 Takuji Shimokawa
+Takuya Matsuyama
 Tarmil
 TDaglis
 tel
+Tentone
 tfjgeorge
 Thaddee Tyl
 thanasis
@@ -613,6 +618,7 @@ Timothy Gu
 Timothy Hatcher
 TobiasBg
 Todd Berman
+Todd Kennedy
 Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dd793cc57..3df88c5b3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+## 5.27.0 (2017-06-22)
+
+### Bug fixes
+
+Fix infinite loop in forced display update.
+
+Properly disable the hidden textarea when `readOnly` is `"nocursor"`.
+
+Calling the `Doc` constructor without `new` works again.
+
+[sql mode](http://codemirror.net/mode/sql/): Handle nested comments.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix bug where markup was ignored on indented paragraph lines.
+
+[vim bindings](http://codemirror.net/mode/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
+
+[rust mode](http://codemirror.net/mode/rust/): Add the correct MIME type.
+
+[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Document options.
+
+### New features
+
+Mouse button clicks can now be bound in keymaps by using names like `"LeftClick"` or `"Ctrl-Alt-MiddleTripleClick"`. When bound to a function, that function will be passed the position of the click as second argument.
+
+The behavior of mouse selection and dragging can now be customized with the [`configureMouse`](http://codemirror.net/doc/manual.html#option_configureMouse) option.
+
+Modes can now look ahead across line boundaries with the [`StringStream`](http://codemirror.net/doc/manual.html#StringStream)`.lookahead` method.
+
+Introduces a `"type"` token type, makes modes that recognize types output it, and add styling for it to the themes.
+
+New [`pasteLinesPerSelection`](http://codemirror.net/doc/manual.html#option_pasteLinesPerSelection) option to control the behavior of pasting multiple lines into multiple selections.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Support multi-line regular expression matches, and normalize strings when matching.
+
 ## 5.26.0 (2017-05-22)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 2e0dd16df1..77f29b2356 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.26.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.27.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 a57a964a6b..0ec8fc4b10 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,26 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">22-06-2017: <a href="http://codemirror.net/codemirror-5.27.0.zip">Version 5.27.0</a>:</p>
+
+  <ul>
+    <li>Fix infinite loop in forced display update.</li>
+    <li>Properly disable the hidden textarea when <code>readOnly</code> is <code>&quot;nocursor&quot;</code>.</li>
+    <li>Calling the <code>Doc</code> constructor without <code>new</code> works again.</li>
+    <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Handle nested comments.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix bug where markup was ignored on indented paragraph lines.</li>
+    <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Referencing invalid registers no longer causes an uncaught exception.</li>
+    <li><a href="http://codemirror.net/mode/rust/">rust mode</a>: Add the correct MIME type.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Document options.</li>
+    <li>Mouse button clicks can now be bound in keymaps by using names like <code>&quot;LeftClick&quot;</code> or <code>&quot;Ctrl-Alt-MiddleTripleClick&quot;</code>. When bound to a function, that function will be passed the position of the click as second argument.</li>
+    <li>The behavior of mouse selection and dragging can now be customized with the <a href="http://codemirror.net/doc/manual.html#option_configureMouse"><code>configureMouse</code></a> option.</li>
+    <li>Modes can now look ahead across line boundaries with the <a href="http://codemirror.net/doc/manual.html#StringStream"><code>StringStream</code></a><code>.lookahead</code> method.</li>
+    <li>Introduces a <code>&quot;type&quot;</code> token type, makes modes that recognize types output it, and add styling for it to the themes.</li>
+    <li>New <a href="http://codemirror.net/doc/manual.html#option_pasteLinesPerSelection"><code>pasteLinesPerSelection</code></a> option to control the behavior of pasting multiple lines into multiple selections.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support multi-line regular expression matches, and normalize strings when matching.</li>
+  </ul>
+
   <p class="rel">22-05-2017: <a href="http://codemirror.net/codemirror-5.26.0.zip">Version 5.26.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 49a7aa08b1..815bc5d526 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.26.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.27.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 694b03c6df..7ef5ffd3b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.26.1",
+  "version": "5.27.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index bcfb9de071..3b7cd6dc45 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.26.1"
+CodeMirror.version = "5.27.0"

From 66c02a5f39659053bad1db747531e2833c496288 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 22 Jun 2017 09:46:20 +0200
Subject: [PATCH 3365/4742] Bump version number post-5.27.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 77f29b2356..cbd9e37f1b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.27.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.27.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 7ef5ffd3b9..3e4735381c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.27.0",
+  "version": "5.27.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 3b7cd6dc45..f78901838c 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.27.0"
+CodeMirror.version = "5.27.1"

From 9d630718653bf3ca73537e447213b60199f0c1fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 22 Jun 2017 22:13:53 +0200
Subject: [PATCH 3366/4742] [mode/simple addon] Fix crash bug

Issue #4819
---
 addon/mode/simple.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index de3848bb8b..15cc215825 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -135,7 +135,7 @@
           if (rule.data.dedent)
             state.indent.pop();
           var token = rule.token
-          if (token.apply) token = token(matches)
+          if (token && token.apply) token = token(matches)
           if (matches.length > 2) {
             state.pending = [];
             for (var j = 2; j < matches.length; j++)

From 682cb4fccc67bdad05e622744942edbf96cb4f3a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 22 Jun 2017 22:17:12 +0200
Subject: [PATCH 3367/4742] Mark version 5.27.2

---
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3df88c5b3a..a9e3c0014c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.27.2 (2017-06-22)
+
+### Bug fixes
+
+Fix crash in the [simple mode](http://codemirror.net/demo/simplemode.html) addon.
+
 ## 5.27.0 (2017-06-22)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index cbd9e37f1b..5d4cc9c7ff 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.27.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.27.2</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 0ec8fc4b10..70e722ed8f 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">22-06-2017: <a href="http://codemirror.net/codemirror-5.27.2.zip">Version 5.27.2</a>:</p>
+
+  <ul>
+    <li>Fix crash in the <a href="http://codemirror.net/demo/simplemode.html">simple mode</a> addon.</li>
+  </ul>
+
   <p class="rel">22-06-2017: <a href="http://codemirror.net/codemirror-5.27.0.zip">Version 5.27.0</a>:</p>
 
   <ul>
diff --git a/index.html b/index.html
index 815bc5d526..19ae78ad9e 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.27.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.27.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 3e4735381c..56108b3967 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.27.1",
+  "version": "5.27.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index f78901838c..f755f4f691 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.27.1"
+CodeMirror.version = "5.27.2"

From c890f1b76dcfcb6849dce0926baf838a22ea9417 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 25 Jun 2017 22:39:03 +0200
Subject: [PATCH 3368/4742] Bump version number post-5.27.2

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 5d4cc9c7ff..d143b348e2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.27.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.27.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 56108b3967..7c90aa2ec9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.27.2",
+  "version": "5.27.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index f755f4f691..ac62ebe918 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.27.2"
+CodeMirror.version = "5.27.3"

From 8332d69c9a2a29d06d3078b2a5936adaa669cd75 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 25 Jun 2017 22:39:56 +0200
Subject: [PATCH 3369/4742] [markdown mode] Forward indent requests to inner
 modes

See https://discuss.codemirror.net/t/gfm-mode-doesnt-seem-to-respect-codeblock-mode-specific-indentation/1286
---
 mode/markdown/markdown.js | 16 ++++++++++++----
 mode/markdown/test.js     | 17 +++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 615200812b..638d9aad72 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -762,10 +762,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         state.trailingSpaceNewLine = false;
 
         state.f = state.block;
-        var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
-        state.indentationDiff = Math.min(indentation - state.indentation, 4);
-        state.indentation = state.indentation + state.indentationDiff;
-        if (indentation > 0) return null;
+        if (state.f != htmlBlock) {
+          var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
+          state.indentationDiff = Math.min(indentation - state.indentation, 4);
+          state.indentation = state.indentation + state.indentationDiff;
+          if (indentation > 0) return null;
+        }
       }
       return state.f(stream, state);
     },
@@ -776,6 +778,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return {state: state, mode: mode};
     },
 
+    indent: function(state, textAfter, line) {
+      if (state.block == htmlBlock) return htmlMode.indent(state.htmlState, textAfter, line)
+      if (state.localState) return state.localMode.indent(state.localState, textAfter, line)
+      return CodeMirror.Pass
+    },
+
     blankLine: blankLine,
 
     getType: getType,
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 0f4259c3c0..04c72fdaf3 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -2,15 +2,16 @@
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "markdown");
+  var config = {tabSize: 4, indentUnit: 2}
+  var mode = CodeMirror.getMode(config, "markdown");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-  var modeHighlightFormatting = CodeMirror.getMode({tabSize: 4}, {name: "markdown", highlightFormatting: true});
+  var modeHighlightFormatting = CodeMirror.getMode(config, {name: "markdown", highlightFormatting: true});
   function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
-  var modeAtxNoSpace = CodeMirror.getMode({tabSize: 4}, {name: "markdown", allowAtxHeaderWithoutSpace: true});
+  var modeAtxNoSpace = CodeMirror.getMode(config, {name: "markdown", allowAtxHeaderWithoutSpace: true});
   function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); }
-  var modeFenced = CodeMirror.getMode({tabSize: 4}, {name: "markdown", fencedCodeBlocks: true});
+  var modeFenced = CodeMirror.getMode(config, {name: "markdown", fencedCodeBlocks: true});
   function FencedTest(name) { test.mode(name, modeFenced, Array.prototype.slice.call(arguments, 1)); }
-  var modeOverrideClasses = CodeMirror.getMode({tabsize: 4}, {
+  var modeOverrideClasses = CodeMirror.getMode(config, {
     name: "markdown",
     strikethrough: true,
     tokenTypeOverrides: {
@@ -33,7 +34,7 @@
       "strikethrough" : "override-strikethrough"
   }});
   function TokenTypeOverrideTest(name) { test.mode(name, modeOverrideClasses, Array.prototype.slice.call(arguments, 1)); }
-  var modeFormattingOverride = CodeMirror.getMode({tabsize: 4}, {
+  var modeFormattingOverride = CodeMirror.getMode(config, {
     name: "markdown",
     highlightFormatting: true,
     tokenTypeOverrides: {
@@ -977,8 +978,8 @@
 
   MT("xmlMode",
      "[tag&bracket <][tag div][tag&bracket >]",
-     "*foo*",
-     "[tag&bracket <][tag http://github.com][tag&bracket />]",
+     "  *foo*",
+     "  [tag&bracket <][tag http://github.com][tag&bracket />]",
      "[tag&bracket </][tag div][tag&bracket >]",
      "[link <http://github.com/>]");
 

From 4f6c8af23c8e4d70a1580ae245101092e222ab37 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 25 Jun 2017 22:44:18 +0200
Subject: [PATCH 3370/4742] [gfm mode] Fix broken test setup

---
 mode/gfm/test.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 33078acf11..3d7d7e0132 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -2,9 +2,10 @@
 // Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "gfm");
+  var config = {tabSize: 4, indentUnit: 2}
+  var mode = CodeMirror.getMode(config, "gfm");
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-  var modeHighlightFormatting = CodeMirror.getMode({tabSize: 4}, {name: "gfm", highlightFormatting: true});
+  var modeHighlightFormatting = CodeMirror.getMode(config, {name: "gfm", highlightFormatting: true});
   function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
 
   FT("codeBackticks",

From db8b79c131ddebc88ac76fc6871d018612cba3d7 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 27 Jun 2017 11:59:33 +0200
Subject: [PATCH 3371/4742] [search] Apply normalization in adjustPos, too

This prevents the test case search_expandingCaseFold from hanging in
Firefox 54 on Linux.
---
 addon/search/searchcursor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 0e27ebc325..3ad8edcf52 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -129,7 +129,7 @@
   function adjustPos(orig, folded, pos) {
     if (orig.length == folded.length) return pos
     for (var pos1 = Math.min(pos, orig.length);;) {
-      var len1 = orig.slice(0, pos1).toLowerCase().length
+      var len1 = doFold(orig.slice(0, pos1)).length
       if (len1 < pos) ++pos1
       else if (len1 > pos) --pos1
       else return pos1

From b2b1737ea8b32d2e86177c8b17fb008b9520d702 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 27 Jun 2017 12:02:23 +0200
Subject: [PATCH 3372/4742] Revert "Disable a search test on Phantom"

This reverts commit e7b737c8a470b210ac4b8fb342c126d4d19f47b0.
---
 test/search_test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/search_test.js b/test/search_test.js
index be757bd818..7a6a660461 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -70,7 +70,6 @@
   })
 
   test("expandingCaseFold", function() {
-    if (phantom) return; // A Phantom bug makes this hang
     var doc = new CodeMirror.Doc("<b>İİ İİ</b>\n<b>uu uu</b>")
     run(doc, "</b>", true, 0, 8, 0, 12, 1, 8, 1, 12);
     run(doc, "İİ", true, 0, 3, 0, 5, 0, 6, 0, 8);

From f1319c8d9bbeb02e76df86f3dd971f1afe215750 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 27 Jun 2017 17:59:42 +0200
Subject: [PATCH 3373/4742] [searchcursor addon] Make adjustPos use the right
 folding function

Issue #4824
---
 addon/search/searchcursor.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 3ad8edcf52..5feedd2677 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -126,10 +126,10 @@
 
   // Maps a position in a case-folded line back to a position in the original line
   // (compensating for codepoints increasing in number during folding)
-  function adjustPos(orig, folded, pos) {
+  function adjustPos(orig, folded, pos, foldFunc) {
     if (orig.length == folded.length) return pos
     for (var pos1 = Math.min(pos, orig.length);;) {
-      var len1 = doFold(orig.slice(0, pos1)).length
+      var len1 = foldFunc(orig.slice(0, pos1)).length
       if (len1 < pos) ++pos1
       else if (len1 > pos) --pos1
       else return pos1
@@ -148,9 +148,9 @@
       if (lines.length == 1) {
         var found = string.indexOf(lines[0])
         if (found == -1) continue search
-        var start = adjustPos(orig, string, found) + ch
-        return {from: Pos(line, adjustPos(orig, string, found) + ch),
-                to: Pos(line, adjustPos(orig, string, found + lines[0].length) + ch)}
+        var start = adjustPos(orig, string, found, fold) + ch
+        return {from: Pos(line, adjustPos(orig, string, found, fold) + ch),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold) + ch)}
       } else {
         var cutFrom = string.length - lines[0].length
         if (string.slice(cutFrom) != lines[0]) continue search
@@ -158,8 +158,8 @@
           if (fold(doc.getLine(line + i)) != lines[i]) continue search
         var end = doc.getLine(line + lines.length - 1), endString = fold(end), lastLine = lines[lines.length - 1]
         if (end.slice(0, lastLine.length) != lastLine) continue search
-        return {from: Pos(line, adjustPos(orig, string, cutFrom) + ch),
-                to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length))}
+        return {from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch),
+                to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold))}
       }
     }
   }
@@ -176,8 +176,8 @@
       if (lines.length == 1) {
         var found = string.lastIndexOf(lines[0])
         if (found == -1) continue search
-        return {from: Pos(line, adjustPos(orig, string, found)),
-                to: Pos(line, adjustPos(orig, string, found + lines[0].length))}
+        return {from: Pos(line, adjustPos(orig, string, found, fold)),
+                to: Pos(line, adjustPos(orig, string, found + lines[0].length, fold))}
       } else {
         var lastLine = lines[lines.length - 1]
         if (string.slice(0, lastLine.length) != lastLine) continue search
@@ -185,8 +185,8 @@
           if (fold(doc.getLine(start + i)) != lines[i]) continue search
         var top = doc.getLine(line + 1 - lines.length), topString = fold(top)
         if (topString.slice(topString.length - lines[0].length) != lines[0]) continue search
-        return {from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length)),
-                to: Pos(line, adjustPos(orig, string, lastLine.length))}
+        return {from: Pos(line + 1 - lines.length, adjustPos(top, topString, top.length - lines[0].length, fold)),
+                to: Pos(line, adjustPos(orig, string, lastLine.length, fold))}
       }
     }
   }

From 449eab87b3753c5ec1c16dbaab44484366da76e6 Mon Sep 17 00:00:00 2001
From: Simon Edwards <simon@simonzone.com>
Date: Wed, 28 Jun 2017 07:03:55 +0200
Subject: [PATCH 3374/4742] Make line height calculations more tolerant of
 browser rounding errors

---
 src/display/update_lines.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index 095cddef3f..7583f3c159 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -21,7 +21,7 @@ export function updateHeightsInViewport(cm) {
     }
     let diff = cur.line.height - height
     if (height < 2) height = textHeight(display)
-    if (diff > .001 || diff < -.001) {
+    if (diff > .005 || diff < -.005) {
       updateLineHeight(cur.line, height)
       updateWidgetHeight(cur.line)
       if (cur.rest) for (let j = 0; j < cur.rest.length; j++)

From 00367fff631e3fb985365c84e70a9d2de93c4481 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 28 Jun 2017 11:34:47 +0200
Subject: [PATCH 3375/4742] [runmode.node addon] Export countColumn

---
 addon/runmode/runmode.node.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 833bd6ed76..093cb30876 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -7,7 +7,7 @@ function splitLines(string){return string.split(/\r\n?|\n/);};
 
 // Counts the column offset in a string, taking tabs into account.
 // Used mostly to find indentation.
-var countColumn = function(string, end, tabSize, startIndex, startValue) {
+var countColumn = exports.countColumn = function(string, end, tabSize, startIndex, startValue) {
   if (end == null) {
     end = string.search(/[^\s\u00a0]/);
     if (end == -1) end = string.length;

From 695d00863086e25c73ff50e0f1045bdd3cb3417d Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 26 Jun 2017 14:15:01 +0200
Subject: [PATCH 3376/4742] Use cursor stickiness in scrollPosIntoView

This way, only one char's left and right edges are used, instead of its
(logical) neighbour's right edges.

In bidi content, this avoids trying to scroll to two logically close,
but visually far apart positions in some situations.
---
 src/display/scrolling.js | 15 +++++++++------
 test/scroll_test.js      | 11 +++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 96192cab9b..e16cf9ecac 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -35,6 +35,13 @@ export function maybeScrollWindow(cm, rect) {
 export function scrollPosIntoView(cm, pos, end, margin) {
   if (margin == null) margin = 0
   let rect
+  if (!cm.options.lineWrapping && pos == end) {
+    // Set pos and end to the cursor positions around the character pos sticks to
+    // If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch
+    // If pos == Pos(_, 0, "before"), pos and end are unchanged
+    pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos
+    end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos
+  }
   for (let limit = 0; limit < 5; limit++) {
     let changed = false
     let coords = cursorCoords(cm, pos)
@@ -109,12 +116,8 @@ export function addToScrollTop(cm, top) {
 // shown.
 export function ensureCursorVisible(cm) {
   resolveScrollToPos(cm)
-  let cur = cm.getCursor(), from = cur, to = cur
-  if (!cm.options.lineWrapping) {
-    from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur
-    to = Pos(cur.line, cur.ch + 1)
-  }
-  cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin}
+  let cur = cm.getCursor()
+  cm.curOp.scrollToPos = {from: cur, to: cur, margin: cm.options.cursorScrollMargin}
 }
 
 export function scrollToCoords(cm, x, y) {
diff --git a/test/scroll_test.js b/test/scroll_test.js
index 55aac78ebb..d1d2190057 100644
--- a/test/scroll_test.js
+++ b/test/scroll_test.js
@@ -112,4 +112,15 @@
     cm.scrollTo(null, 10);
     is(cm.getScrollInfo().top < 5);
   }, {lineNumbers: true});
+
+  testCM("bidi_ensureCursorVisible", function(cm) {
+    cm.setValue("<dd>وضع الاستخدام. عندما لا تعطى، وهذا الافتراضي إلى الطريقة الاولى\n");
+    cm.execCommand("goLineStart");
+    eq(cm.getScrollInfo().left, 0);
+    cm.execCommand("goCharRight");
+    cm.execCommand("goCharRight");
+    cm.execCommand("goCharRight");
+    eqCursorPos(cm.getCursor(), Pos(0, 3, "before"));
+    eq(cm.getScrollInfo().left, 0);
+  }, {lineWrapping: false});
 })();

From 1864e2230d5ce8523c9b09082272a124f1beb8f5 Mon Sep 17 00:00:00 2001
From: Todd Kennedy <todd@selfassembled.org>
Date: Wed, 28 Jun 2017 13:34:26 -0700
Subject: [PATCH 3377/4742] [manual] Upper-case A in lookAhead

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

diff --git a/doc/manual.html b/doc/manual.html
index d143b348e2..7f4a570263 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3242,7 +3242,7 @@ <h2>Writing CodeMirror Modes</h2>
       <dd>Get the string between the start of the current token and
       the current stream position.</dd>
 
-      <dt><code><strong>lookahead</strong>(n: number) → ?string</code></dt>
+      <dt><code><strong>lookAhead</strong>(n: number) → ?string</code></dt>
       <dd>Get the line <code>n</code> (&gt;0) lines after the current
       one, in order to scan ahead across line boundaries. Note that
       you want to do this carefully, since looking far ahead will make

From 553ffcfa999a2dbaa97212f2d177714ed9ecf17f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Jun 2017 14:49:24 +0200
Subject: [PATCH 3378/4742] [package.json] Use prepare rather than prepublish

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7c90aa2ec9..c856e9dfa3 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
   "scripts": {
     "build": "rollup -c",
     "watch": "rollup -w -c",
-    "prepublish": "npm run-script build",
+    "prepare": "npm run-script build",
     "test": "node ./test/run.js",
     "lint": "bin/lint"
   },

From 1652d585f958e4959e72da6f12beba994cf072ca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Jun 2017 14:58:01 +0200
Subject: [PATCH 3379/4742] Fix typo in mode state restoring

---
 src/line/highlight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/line/highlight.js b/src/line/highlight.js
index e835aa0411..430d86a224 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -33,7 +33,7 @@ class Context {
 
   static fromSaved(doc, saved, line) {
     if (saved instanceof SavedContext)
-      return new Context(doc, copyState(doc.mode, saved.saved), line, saved.lookAhead)
+      return new Context(doc, copyState(doc.mode, saved.state), line, saved.lookAhead)
     else
       return new Context(doc, copyState(doc.mode, saved), line)
   }

From b695f230da7243bf8ff0d3d0771cd7f43f583162 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Jun 2017 15:02:44 +0200
Subject: [PATCH 3380/4742] Mark version 5.27.4

---
 AUTHORS           | 1 +
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 823dd88063..88e625bec0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -574,6 +574,7 @@ Shmuel Englard
 Shubham Jain
 Siamak Mokhtari
 silverwind
+Simon Edwards
 sinkuu
 snasa
 soliton4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9e3c0014c..62b337e7c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.27.4 (2017-06-29)
+
+### Bug fixes
+
+Fix crash when using mode lookahead.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Don't block inner mode's indentation support.
+
 ## 5.27.2 (2017-06-22)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 7f4a570263..e28e801291 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.27.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.27.4</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 70e722ed8f..15bd24e163 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,13 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">29-06-2017: <a href="http://codemirror.net/codemirror-5.27.4.zip">Version 5.27.4</a>:</p>
+
+  <ul>
+    <li>Fix crash when using mode lookahead.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Don't block inner mode's indentation support.</li>
+  </ul>
+
   <p class="rel">22-06-2017: <a href="http://codemirror.net/codemirror-5.27.2.zip">Version 5.27.2</a>:</p>
 
   <ul>
diff --git a/index.html b/index.html
index 19ae78ad9e..baa0a33bf7 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.27.2</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.27.4</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index c856e9dfa3..159b945874 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.27.3",
+  "version": "5.27.4",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index ac62ebe918..c87aa33f51 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.27.3"
+CodeMirror.version = "5.27.4"

From 7bd58c0c5c9212e68aa3558c785ec39658b6cc31 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Jun 2017 15:03:58 +0200
Subject: [PATCH 3381/4742] Bump version number post-5.27.4

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index e28e801291..f7cd284656 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.27.4</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.27.5</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 159b945874..ef824b0b0a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.27.4",
+  "version": "5.27.5",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index c87aa33f51..54a7a6e3cc 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.27.4"
+CodeMirror.version = "5.27.5"

From faa527ee92fca8dd9eb796bdf0e2b7007b5cf260 Mon Sep 17 00:00:00 2001
From: paladox <paladox@users.noreply.github.com>
Date: Sun, 2 Jul 2017 14:58:56 +0100
Subject: [PATCH 3382/4742] [mode/meta] Allow for syntax highlighting on
 ".php7" files

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

diff --git a/mode/meta.js b/mode/meta.js
index 0a3dd2ca97..c4aa32b4ca 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -99,7 +99,7 @@
     {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
     {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
     {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
-    {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
+    {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
     {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},

From a7f209d006c6dd7e741f842245da4ac8b4ca9e60 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 4 Jul 2017 22:38:01 +0200
Subject: [PATCH 3383/4742] [sql mode] Allow digits in subscript names

Closes #4835
---
 mode/sql/sql.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 7a7c796b0e..62775128d4 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -47,7 +47,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
       // numbers
       // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
-          stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
+      stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
       support.decimallessFloat && stream.eat('.');
       return "number";
     } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
@@ -89,7 +89,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       }
       // .table_name (ODBC)
       // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-      if (support.ODBCdotTable && stream.match(/^[a-zA-Z_]+/)) {
+      if (support.ODBCdotTable && stream.match(/^[\w\d_]+/)) {
         return "variable-2";
       }
     } else if (operatorChars.test(ch)) {

From 61023686c42bf647bc604f481f32b515cee88cb1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 7 Jul 2017 12:59:27 +0200
Subject: [PATCH 3384/4742] [searchcursor addon] Fix infinite loop when a match
 starts inside a composed char

Closes #4839
---
 addon/search/searchcursor.js | 12 +++++++-----
 test/search_test.js          |  6 ++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 5feedd2677..24d885e7b0 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -128,11 +128,13 @@
   // (compensating for codepoints increasing in number during folding)
   function adjustPos(orig, folded, pos, foldFunc) {
     if (orig.length == folded.length) return pos
-    for (var pos1 = Math.min(pos, orig.length);;) {
-      var len1 = foldFunc(orig.slice(0, pos1)).length
-      if (len1 < pos) ++pos1
-      else if (len1 > pos) --pos1
-      else return pos1
+    for (var min = 0, max = pos + Math.max(0, orig.length - folded.length);;) {
+      if (min == max) return min
+      let mid = (min + max) >> 1
+      var len = foldFunc(orig.slice(0, mid)).length
+      if (len == pos) return mid
+      else if (len > pos) max = mid - 1
+      else min = mid + 1
     }
   }
 
diff --git a/test/search_test.js b/test/search_test.js
index 7a6a660461..99c8b7e7a8 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -74,4 +74,10 @@
     run(doc, "</b>", true, 0, 8, 0, 12, 1, 8, 1, 12);
     run(doc, "İİ", true, 0, 3, 0, 5, 0, 6, 0, 8);
   });
+
+  test("normalize", function() {
+    var doc = new CodeMirror.Doc("yılbaşı\n수 있을까")
+    run(doc, "s", false, 0, 5, 0, 6)
+    run(doc, "이", false, 1, 2, 1, 3)
+  })
 })();

From e2042a9a8b9a8cc3198e23974c565608d7d5538f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 7 Jul 2017 13:04:50 +0200
Subject: [PATCH 3385/4742] Remove let in code that should be ES5

---
 addon/search/searchcursor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 24d885e7b0..03db843cba 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -130,7 +130,7 @@
     if (orig.length == folded.length) return pos
     for (var min = 0, max = pos + Math.max(0, orig.length - folded.length);;) {
       if (min == max) return min
-      let mid = (min + max) >> 1
+      var mid = (min + max) >> 1
       var len = foldFunc(orig.slice(0, mid)).length
       if (len == pos) return mid
       else if (len > pos) max = mid - 1

From fa8bce997e6b7b24e0c2be8461a269c3d8fd8154 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 7 Jul 2017 13:09:33 +0200
Subject: [PATCH 3386/4742] Disable searchcursor normalize test when
 String.normalize isn't available

---
 test/search_test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/search_test.js b/test/search_test.js
index 99c8b7e7a8..a25090431e 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -76,6 +76,7 @@
   });
 
   test("normalize", function() {
+    if (!String.prototype.normalize) return
     var doc = new CodeMirror.Doc("yılbaşı\n수 있을까")
     run(doc, "s", false, 0, 5, 0, 6)
     run(doc, "이", false, 1, 2, 1, 3)

From a67f6a28f9ad8779aeddab46cab366b523dffb53 Mon Sep 17 00:00:00 2001
From: Pablo Zubieta <pabloferz@yahoo.com.mx>
Date: Sat, 8 Jul 2017 14:13:28 -0500
Subject: [PATCH 3387/4742] [julia mode] Consistent use tokens

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

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index a8b114a723..0f29000755 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -233,7 +233,8 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         return "def";
       }
       if (stream.match(/^({[^}]*})*\(/, false)) {
-        return callOrDef(stream, state);
+        state.tokenize = tokenCallOrDef;
+        return state.tokenize(stream, state);
       }
       state.leavingExpr = true;
       return "variable";
@@ -244,7 +245,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     return "error";
   }
 
-  function callOrDef(stream, state) {
+  function tokenCallOrDef(stream, state) {
     var match = stream.match(/^(\(\s*)/);
     if (match) {
       if (state.firstParenPos < 0)
@@ -260,6 +261,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         stream.backUp(state.charsAdvanced);
         state.firstParenPos = -1;
         state.charsAdvanced = 0;
+        state.tokenize = tokenBase;
         if (isDefinition)
           return "def";
         return "builtin";
@@ -274,10 +276,11 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         state.scopes.pop();
       state.firstParenPos = -1;
       state.charsAdvanced = 0;
+      state.tokenize = tokenBase;
       return "builtin";
     }
     state.charsAdvanced += stream.match(/^([^()]*)/)[1].length;
-    return callOrDef(stream, state);
+    return state.tokenize(stream, state);
   }
 
   function tokenAnnotation(stream, state) {

From d444cd1007bd32e418ace8ffed1cb0e692ee147d Mon Sep 17 00:00:00 2001
From: Pablo Zubieta <pabloferz@yahoo.com.mx>
Date: Sat, 8 Jul 2017 15:35:29 -0500
Subject: [PATCH 3388/4742] [julia mode] Julia 0.6 syntax updates

---
 mode/julia/julia.js | 65 +++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 0f29000755..9a36fd05a0 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -23,24 +23,27 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   var uChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
 
   var operators = parserConf.operators || wordRegexp([
-      "\\.?[\\\\%*+\\-<>!=\\/^]=?", "\\.?[|&\\u00F7\\u2260\\u2264\\u2265]",
-      "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2229",
-      "\\u222A", "\\u2286", "\\u2288", "\\u228A", "\\u22c5", "\\?", "~", ":",
-      "\\$", "\\.[<>]", "<<=?", ">>>?=?", "\\.[<>=]=", "->?", "\\/\\/", "=>",
-      "<:", "\\bin\\b(?!\\()"], "");
+      "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "->", "\\/\\/",
+      "[\\\\%*+\\-<>!=\\/^|&\\u00F7\\u22BB]=?", "\\?", "\\$", "~", ":",
+      "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2218",
+      "\\u221A", "\\u221B", "\\u2229", "\\u222A", "\\u2260", "\\u2264",
+      "\\u2265", "\\u2286", "\\u2288", "\\u228A", "\\u22C5",
+      "\\b(in|isa)\\b(?!\.?\\()"], "");
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
-  var identifiers = parserConf.identifiers || /^[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
+  var identifiers = parserConf.identifiers ||
+      /^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/;
 
   var chars = wordRegexp([octChar, hexChar, sChar, uChar], "'");
-  var openers = wordRegexp(["begin", "function", "type", "immutable", "let",
-      "macro", "for", "while", "quote", "if", "else", "elseif", "try",
+  var openers = wordRegexp(["begin", "function", "type", "struct", "immutable",
+      "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try",
       "finally", "catch", "do"]);
   var closers = wordRegexp(["end", "else", "elseif", "catch", "finally"]);
   var keywords = wordRegexp(["if", "else", "elseif", "while", "for", "begin",
       "let", "end", "do", "try", "catch", "finally", "return", "break",
       "continue", "global", "local", "const", "export", "import", "importall",
-      "using", "function", "macro", "module", "baremodule", "type",
-      "immutable", "quote", "typealias", "abstract", "bitstype"]);
+      "using", "function", "where", "macro", "module", "baremodule", "struct",
+      "type", "mutable", "immutable", "quote", "typealias", "abstract",
+      "primitive", "bitstype"]);
   var builtins = wordRegexp(["true", "false", "nothing", "NaN", "Inf"]);
 
   var macro = /^@[_A-Za-z][\w]*/;
@@ -90,7 +93,9 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       }
     }
 
-    if (stream.match(/^\.{2,3}/)) {
+    if (stream.match(/\.{4,}/)) {
+      return "error";
+    } else if (stream.match(/\.{1,3}/)) {
       return "operator";
     }
 
@@ -128,15 +133,6 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       state.leavingExpr = true;
     }
 
-    var match;
-    if (match = stream.match(openers, false)) {
-      state.scopes.push(match[0]);
-    }
-
-    if (stream.match(closers, false)) {
-      state.scopes.pop();
-    }
-
     if (inArray(state)) {
       if (state.lastToken == "end" && stream.match(/^:/)) {
         return "operator";
@@ -146,6 +142,15 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       }
     }
 
+    var match;
+    if (match = stream.match(openers, false)) {
+      state.scopes.push(match[0]);
+    }
+
+    if (stream.match(closers, false)) {
+      state.scopes.pop();
+    }
+
     // Handle type annotations
     if (stream.match(/^::(?![:\$])/)) {
       state.tokenize = tokenAnnotation;
@@ -153,14 +158,15 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     // Handle symbols
-    if (!leavingExpr && stream.match(symbol) || stream.match(/:\./)) {
+    if (!leavingExpr && stream.match(symbol) ||
+        stream.match(/:([<>]:|<<=?|>>>?=?|->|\/\/|\.{2,3}|[\.\\%*+\-<>!\/^|&]=?|[~\?\$])/)) {
       return "builtin";
     }
 
     // Handle parametric types
-    if (stream.match(/^{[^}]*}(?=\()/)) {
-      return "builtin";
-    }
+    //if (stream.match(/^{[^}]*}(?=\()/)) {
+    //  return "builtin";
+    //}
 
     // Handle operators and Delimiters
     if (stream.match(operators)) {
@@ -168,7 +174,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     // Handle Number Literals
-    if (stream.match(/^[0-9\.]/, false)) {
+    if (stream.match(/^\.?\d/, false)) {
       var imMatcher = RegExp(/^im\b/);
       var numberLiteral = false;
       // Floats
@@ -221,7 +227,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
 
     var isDefinition = state.isDefinition || state.lastToken == "function" ||
                        state.lastToken == "macro" || state.lastToken == "type" ||
-                       state.lastToken == "immutable";
+                       state.lastToken == "struct" || state.lastToken == "immutable";
 
     if (stream.match(identifiers)) {
       if (isDefinition) {
@@ -257,7 +263,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       state.scopes.pop();
       state.charsAdvanced += 1;
       if (state.scopes.length <= state.firstParenPos) {
-        var isDefinition = stream.match(/^\s*?=(?!=)/, false);
+        var isDefinition = stream.match(/^(\s*where\s+[^\s=]+)*\s*?=(?!=)/, false);
         stream.backUp(state.charsAdvanced);
         state.firstParenPos = -1;
         state.charsAdvanced = 0;
@@ -384,11 +390,6 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         state.lastToken = current;
       }
 
-      // Handle '.' connected identifiers
-      if (current === '.') {
-        style = stream.match(identifiers, false) || stream.match(macro, false) ||
-                stream.match(/\(/, false) ? "operator" : "error";
-      }
       return style;
     },
 

From 6892031fea5113e81c8d70f3442e3866056dd26b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 10 Jul 2017 10:24:16 +0200
Subject: [PATCH 3389/4742] Use cursorCoords in goLineLeft/goLineRight

Issue #4840
---
 src/edit/commands.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/edit/commands.js b/src/edit/commands.js
index fabf958214..45ae5eb059 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -59,11 +59,11 @@ export let commands = {
     {origin: "+move", bias: -1}
   ),
   goLineRight: cm => cm.extendSelectionsBy(range => {
-    let top = cm.charCoords(range.head, "div").top + 5
+    let top = cm.cursorCoords(range.head, "div").top + 5
     return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div")
   }, sel_move),
   goLineLeft: cm => cm.extendSelectionsBy(range => {
-    let top = cm.charCoords(range.head, "div").top + 5
+    let top = cm.cursorCoords(range.head, "div").top + 5
     return cm.coordsChar({left: 0, top: top}, "div")
   }, sel_move),
   goLineLeftSmart: cm => cm.extendSelectionsBy(range => {

From e516b1c04629ef5854ab90825e8084f08566f000 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 10 Jul 2017 21:44:15 +0200
Subject: [PATCH 3390/4742] [searchcursor addon] Fix bug in binary search in
 adjustPos

Issue #4839
---
 addon/search/searchcursor.js | 2 +-
 test/search_test.js          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 03db843cba..eccd81aab6 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -133,7 +133,7 @@
       var mid = (min + max) >> 1
       var len = foldFunc(orig.slice(0, mid)).length
       if (len == pos) return mid
-      else if (len > pos) max = mid - 1
+      else if (len > pos) max = mid
       else min = mid + 1
     }
   }
diff --git a/test/search_test.js b/test/search_test.js
index a25090431e..e3188de529 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -77,8 +77,9 @@
 
   test("normalize", function() {
     if (!String.prototype.normalize) return
-    var doc = new CodeMirror.Doc("yılbaşı\n수 있을까")
+    var doc = new CodeMirror.Doc("yılbaşı\n수 있을까\nLe taux d'humidité à London")
     run(doc, "s", false, 0, 5, 0, 6)
     run(doc, "이", false, 1, 2, 1, 3)
+    run(doc, "a", false, 0, 4, 0, 5, 2, 4, 2, 5, 2, 19, 2, 20)
   })
 })();

From c97cf8851f282e4b7bfbeafb9223afeb9af336d6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 10 Jul 2017 21:45:42 +0200
Subject: [PATCH 3391/4742] Use cursorCoords in goLineLeftSmart command

Closes #4840
---
 src/edit/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/commands.js b/src/edit/commands.js
index 45ae5eb059..eda54bcd04 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -67,7 +67,7 @@ export let commands = {
     return cm.coordsChar({left: 0, top: top}, "div")
   }, sel_move),
   goLineLeftSmart: cm => cm.extendSelectionsBy(range => {
-    let top = cm.charCoords(range.head, "div").top + 5
+    let top = cm.cursor(range.head, "div").top + 5
     let pos = cm.coordsChar({left: 0, top: top}, "div")
     if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head)
     return pos

From c7a3a4576dfaebb6073079cf2f8b89e79e985d0e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 11 Jul 2017 12:19:55 +0200
Subject: [PATCH 3392/4742] Remove minimal-selection-in-textarea hack

Modern browsers handle updates to a textarea's value fast enough
to not do this anymore.

Issue #2703
---
 src/input/TextareaInput.js | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 68a1dde7ac..3262ea1ba6 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -1,6 +1,6 @@
 import { operation, runInOp } from "../display/operations"
 import { prepareSelection } from "../display/selection"
-import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input"
+import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, setLastCopied } from "./input"
 import { cursorCoords, posFromMouse } from "../measurement/position_measurement"
 import { eventInWidget } from "../measurement/widgets"
 import { simpleSelection } from "../model/selection"
@@ -8,7 +8,7 @@ import { selectAll, setSelection } from "../model/selection_updates"
 import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser"
 import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom"
 import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event"
-import { hasCopyEvent, hasSelection } from "../util/feature_detection"
+import { hasSelection } from "../util/feature_detection"
 import { Delayed, sel_dontScroll } from "../util/misc"
 
 // TEXTAREA INPUT STYLE
@@ -25,9 +25,6 @@ export default class TextareaInput {
     this.pollingFast = false
     // Self-resetting timeout for the poller
     this.polling = new Delayed()
-    // Tracks when input.reset has punted to just putting a short
-    // string into the textarea instead of the full selection.
-    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
@@ -62,12 +59,6 @@ export default class TextareaInput {
       if (signalDOMEvent(cm, e)) return
       if (cm.somethingSelected()) {
         setLastCopied({lineWise: false, text: cm.getSelections()})
-        if (input.inaccurateSelection) {
-          input.prevInput = ""
-          input.inaccurateSelection = false
-          te.value = lastCopied.text.join("\n")
-          selectInput(te)
-        }
       } else if (!cm.options.lineWiseCopyCut) {
         return
       } else {
@@ -146,13 +137,10 @@ export default class TextareaInput {
   // when not typing and nothing is selected)
   reset(typing) {
     if (this.contextMenuPending || this.composing) return
-    let minimal, selected, cm = this.cm, doc = cm.doc
+    let cm = this.cm
     if (cm.somethingSelected()) {
       this.prevInput = ""
-      let range = doc.sel.primary()
-      minimal = hasCopyEvent &&
-        (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000)
-      let content = minimal ? "-" : selected || cm.getSelection()
+      let content = cm.getSelection()
       this.textarea.value = content
       if (cm.state.focused) selectInput(this.textarea)
       if (ie && ie_version >= 9) this.hasSelection = content
@@ -160,7 +148,6 @@ export default class TextareaInput {
       this.prevInput = this.textarea.value = ""
       if (ie && ie_version >= 9) this.hasSelection = null
     }
-    this.inaccurateSelection = minimal
   }
 
   getField() { return this.textarea }

From 0ea666fe3db9cd68dd951cc9178944cccdd9276d Mon Sep 17 00:00:00 2001
From: asolove <asolove@gmail.com>
Date: Tue, 11 Jul 2017 08:03:21 -0600
Subject: [PATCH 3393/4742] Expose startOperation/endOperation in CodeMirror
 API.

---
 doc/manual.html     | 11 +++++++++++
 src/edit/methods.js |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index f7cd284656..829cf7476a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2048,6 +2048,17 @@ <h3 id="api_misc">Miscellaneous methods</h3>
       lot faster. The return value from this method will be the return
       value of your function.</dd>
 
+      <dt><code><strong>cm.startOperation</strong>()</code></dt>
+      <dt><code><strong>cm.endOperation</strong>()</code></dt>
+      <dd>In normal circumstances, use the above <code>operation</code>
+      method. But if you want to buffer operations happening asynchronously,
+      or that can't all be wrapped in a callback function, you can
+      call <code>startOperation</code> to tell CodeMirror to start
+      buffering changes, and <code>endOperation</code> to actually
+      render all the updates. <em>Be careful:</em> if you use this
+      API and forget to call <code>endOperation</code>, the editor will
+      just never update.</dd>
+
       <dt id="indentLine"><code><strong>cm.indentLine</strong>(line: integer, ?dir: string|integer)</code></dt>
       <dd>Adjust the indentation of the given line. The second
       argument (which defaults to <code>"smart"</code>) may be one of:
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 99f61da49e..8dc692529e 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -10,7 +10,7 @@ import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
 import { onMouseDown } from "./mouse_events"
 import { getKeyMap } from "../input/keymap"
 import { endOfLine, moveLogically, moveVisually } from "../input/movement"
-import { methodOp, operation, runInOp } from "../display/operations"
+import { endOperation, methodOp, operation, runInOp, startOperation } from "../display/operations"
 import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos"
 import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
 import { Range } from "../model/selection"
@@ -405,6 +405,8 @@ export default function(CodeMirror) {
     }),
 
     operation: function(f){return runInOp(this, f)},
+    startOperation: function(){return startOperation(this)},
+    endOperation: function(){return endOperation(this)},
 
     refresh: methodOp(function() {
       let oldHeight = this.display.cachedTextHeight

From f7f04da45937151e36ea27727e566cdb8cc74c61 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 12 Jul 2017 14:37:36 +0200
Subject: [PATCH 3394/4742] [foldcode addon] Make sure DOM widgets are cloned
 before being used

So that the addon doesn't try to put a single DOM node in two places

Closes #4848
---
 addon/fold/foldcode.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 78b36c4641..826766b69f 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -65,6 +65,8 @@
       widget = document.createElement("span");
       widget.appendChild(text);
       widget.className = "CodeMirror-foldmarker";
+    } else if (widget) {
+      widget = widget.cloneNode(true)
     }
     return widget;
   }

From c4174e0569e70f1859995bd01c7df559ff5c6d6d Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Wed, 12 Jul 2017 21:21:45 +0200
Subject: [PATCH 3395/4742] fix typo in goLineLeftSmart

---
 src/edit/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/commands.js b/src/edit/commands.js
index eda54bcd04..e1a4327c8f 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -67,7 +67,7 @@ export let commands = {
     return cm.coordsChar({left: 0, top: top}, "div")
   }, sel_move),
   goLineLeftSmart: cm => cm.extendSelectionsBy(range => {
-    let top = cm.cursor(range.head, "div").top + 5
+    let top = cm.cursorCoords(range.head, "div").top + 5
     let pos = cm.coordsChar({left: 0, top: top}, "div")
     if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head)
     return pos

From b27d7a76741a827cd791bb4dd3966946e2d87a3a Mon Sep 17 00:00:00 2001
From: Benjamin Young <byoung2@wiley.com>
Date: Tue, 11 Jul 2017 09:44:03 -0400
Subject: [PATCH 3396/4742] Add defineMIME for correct N-Triples

Also correct links to specification.
---
 mode/index.html           |  2 +-
 mode/ntriples/index.html  |  8 ++++----
 mode/ntriples/ntriples.js | 11 ++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/mode/index.html b/mode/index.html
index c0001a53ee..53196b69b4 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -93,7 +93,7 @@ <h2>Language modes</h2>
       <li><a href="mumps/index.html">MUMPS</a></li>
       <li><a href="nginx/index.html">Nginx</a></li>
       <li><a href="nsis/index.html">NSIS</a></li>
-      <li><a href="ntriples/index.html">NTriples</a></li>
+      <li><a href="ntriples/index.html">N-Triples</a></li>
       <li><a href="clike/index.html">Objective C</a></li>
       <li><a href="mllike/index.html">OCaml</a></li>
       <li><a href="octave/index.html">Octave</a> (MATLAB)</li>
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index 1355e7189e..378a0be292 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror: NTriples mode</title>
+<title>CodeMirror: N-Triples mode</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="../../doc/docs.css">
 
@@ -22,12 +22,12 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">NTriples</a>
+    <li><a class=active href="#">N-Triples</a>
   </ul>
 </div>
 
 <article>
-<h2>NTriples mode</h2>
+  <h2><a href="https://www.w3.org/TR/n-triples/">N-Triples</a> mode</h2>
 <form>
 <textarea id="ntriples" name="ntriples">    
 <http://Sub1>     <http://pred1>     <http://obj> .
@@ -41,5 +41,5 @@ <h2>NTriples mode</h2>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("ntriples"), {});
     </script>
-    <p><strong>MIME types defined:</strong> <code>text/n-triples</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>application/n-triples</code>.</p>
   </article>
diff --git a/mode/ntriples/ntriples.js b/mode/ntriples/ntriples.js
index 0524b1e8ab..765be0cfb3 100644
--- a/mode/ntriples/ntriples.js
+++ b/mode/ntriples/ntriples.js
@@ -3,9 +3,9 @@
 
 /**********************************************************
 * This script provides syntax highlighting support for
-* the Ntriples format.
-* Ntriples format specification:
-*     http://www.w3.org/TR/rdf-testcases/#ntriples
+* the N-Triples format.
+* N-Triples format specification:
+*     https://www.w3.org/TR/n-triples/
 ***********************************************************/
 
 /*
@@ -181,6 +181,11 @@ CodeMirror.defineMode("ntriples", function() {
   };
 });
 
+// define the registered Media Type for n-triples:
+// https://www.w3.org/TR/n-triples/#n-triples-mediatype
+CodeMirror.defineMIME("application/n-triples", "ntriples");
+
+// previously used, though technically incorrect media type for n-triples
 CodeMirror.defineMIME("text/n-triples", "ntriples");
 
 });

From 19e46fb9f8fc57e373581830d38cb5954e6ff207 Mon Sep 17 00:00:00 2001
From: Benjamin Young <byoung2@wiley.com>
Date: Tue, 11 Jul 2017 10:09:56 -0400
Subject: [PATCH 3397/4742] Add N-Quads information to N-Triples mode/demo

---
 mode/index.html           |  2 +-
 mode/ntriples/index.html  | 27 ++++++++++++++++++++++++++-
 mode/ntriples/ntriples.js |  4 ++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/mode/index.html b/mode/index.html
index 53196b69b4..eee26fad0a 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -93,7 +93,7 @@ <h2>Language modes</h2>
       <li><a href="mumps/index.html">MUMPS</a></li>
       <li><a href="nginx/index.html">Nginx</a></li>
       <li><a href="nsis/index.html">NSIS</a></li>
-      <li><a href="ntriples/index.html">N-Triples</a></li>
+      <li><a href="ntriples/index.html">N-Triples/N-Quads</a></li>
       <li><a href="clike/index.html">Objective C</a></li>
       <li><a href="mllike/index.html">OCaml</a></li>
       <li><a href="octave/index.html">Octave</a> (MATLAB)</li>
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index 378a0be292..9c99846396 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -10,6 +10,7 @@
 <style type="text/css">
       .CodeMirror {
         border: 1px solid #eee;
+        height: auto;
       }
     </style>
 <div id=nav>
@@ -22,12 +23,15 @@
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">N-Triples</a>
+    <li><a class=active href="#">N-Triples/N-Quads</a>
   </ul>
 </div>
 
 <article>
   <h2><a href="https://www.w3.org/TR/n-triples/">N-Triples</a> mode</h2>
+  <p>The N-Triples mode also works well with on
+    <a href="https://www.w3.org/TR/n-quads/">N-Quad</a> documents.
+  </p>
 <form>
 <textarea id="ntriples" name="ntriples">    
 <http://Sub1>     <http://pred1>     <http://obj> .
@@ -42,4 +46,25 @@ <h2><a href="https://www.w3.org/TR/n-triples/">N-Triples</a> mode</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("ntriples"), {});
     </script>
     <p><strong>MIME types defined:</strong> <code>application/n-triples</code>.</p>
+
+    <hr />
+    <p><a href="https://www.w3.org/TR/n-quads/">N-Quads</a> add a fourth
+    element to the statement to track which graph the statement is from.
+    Otherwise, it's identical to N-Triples.</p>
+    <form>
+    <textarea id="nquads" name="nquads">
+
+    <http://Sub1>     <http://pred1>     <http://obj>   <http://graph3> .
+    <http://Sub2>     <http://pred2#an2> "literal 1"    <http://graph2> .
+    <http://Sub3#an3> <http://pred3>     _:bnode3     <http://graph2> .
+    _:bnode4          <http://pred4>     "literal 2"@lang     <http://graph2> .
+    # if a graph labe
+    _:bnode5          <http://pred5>     "literal 3"^^<http://type> .
+    </textarea>
+    </form>
+
+    <script>
+      var nquads_editor = CodeMirror.fromTextArea(document.getElementById("nquads"), {});
+    </script>
+    <p><strong>MIME types defined:</strong> <code>application/n-quads</code>.</p>
   </article>
diff --git a/mode/ntriples/ntriples.js b/mode/ntriples/ntriples.js
index 765be0cfb3..148272e1fd 100644
--- a/mode/ntriples/ntriples.js
+++ b/mode/ntriples/ntriples.js
@@ -185,6 +185,10 @@ CodeMirror.defineMode("ntriples", function() {
 // https://www.w3.org/TR/n-triples/#n-triples-mediatype
 CodeMirror.defineMIME("application/n-triples", "ntriples");
 
+// N-Quads is based on the N-Triples format (so same highlighting works)
+// https://www.w3.org/TR/n-quads/
+CodeMirror.defineMIME("application/n-quads", "ntriples");
+
 // previously used, though technically incorrect media type for n-triples
 CodeMirror.defineMIME("text/n-triples", "ntriples");
 

From d9e926358854f997b8cc900b9ec2eb777f7ebaab Mon Sep 17 00:00:00 2001
From: Benjamin Young <byoung2@wiley.com>
Date: Tue, 11 Jul 2017 10:24:44 -0400
Subject: [PATCH 3398/4742] Add application/n-triples, n-quads, .nq to meta

---
 mode/meta.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index c4aa32b4ca..edaae033eb 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -91,7 +91,8 @@
     {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
     {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
     {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
-    {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
+    {name: "NTriples", mimes: ["application/n-triples", "application/n-quads", "text/n-triples"],
+     mode: "ntriples", ext: ["nt", "nq"]},
     {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},

From 2f695c1eb2705c419f449d72925a2340d72f6a69 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Thu, 13 Jul 2017 11:00:43 +0200
Subject: [PATCH 3399/4742] add .editorconfig

---
 .editorconfig | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..7ed020678d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8

From 8005b65181328c1fa94efc08148bb8ca37f085cd Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Thu, 13 Jul 2017 11:01:01 +0200
Subject: [PATCH 3400/4742] ensure lf eol on checkout

---
 .gitattributes | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index f8bdd60f49..1c8c82d8f1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,8 @@
-*.txt   text
-*.js    text
-*.html  text
-*.md    text
-*.json  text
-*.yml   text
-*.css   text
-*.svg   text
+*.txt   text eol=lf
+*.js    text eol=lf
+*.html  text eol=lf
+*.md    text eol=lf
+*.json  text eol=lf
+*.yml   text eol=lf
+*.css   text eol=lf
+*.svg   text eol=lf

From 3073bdd97a4e55c3fa8c69ecbabdc18c4dd0b3a7 Mon Sep 17 00:00:00 2001
From: Nicolas Kick <nickasd@users.noreply.github.com>
Date: Thu, 13 Jul 2017 20:14:35 +0200
Subject: [PATCH 3401/4742] [sublime keymap] "Add to selection" bindings
 (Ctrl-Alt-Up/Down on Windows, Cmd-Shift-Up/Down on Mac)

---
 keymap/sublime.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 0ce8955875..98266e44f0 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -165,6 +165,23 @@
       cm.state.sublimeFindFullWord = cm.doc.sel;
   };
 
+  function addCursorToSelection(cm, dir) {
+    var ranges = cm.listSelections(), newRanges = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      var newAnchor = cm.findPosV(range.anchor, dir, "line");
+      var newHead = cm.findPosV(range.head, dir, "line");
+      var newRange = {anchor: newAnchor, head: newHead};
+      newRanges.push(range);
+      newRanges.push(newRange);
+    }
+    cm.setSelections(newRanges);
+  }
+
+  var addCursorToLineCombo = mac ? "Shift-Cmd" : 'Alt-Ctrl';
+  cmds[map[addCursorToLineCombo + "Up"] = "addCursorToPrevLine"] = function(cm) { addCursorToSelection(cm, -1); };
+  cmds[map[addCursorToLineCombo + "Down"] = "addCursorToNextLine"] = function(cm) { addCursorToSelection(cm, 1); };
+
   function isSelectedRange(ranges, from, to) {
     for (var i = 0; i < ranges.length; i++)
       if (ranges[i].from() == from && ranges[i].to() == to) return true

From 9a223d81a6233e916f730463a842ffd58cb960ab Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Fri, 14 Jul 2017 10:39:05 +0800
Subject: [PATCH 3402/4742] [midnight theme] Remove top border and bottom
 border

Because the borders don't make much visual sense. And they cause dual
scroll bar issue when the editor takes 100% of page height.

You ca reproduce the issue here: http://mdp.tylingsoft.com/ Press
<kbd>CMD-,</kbd> to bring up the preferences panel and change the
theme to midnight.
---
 theme/midnight.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/theme/midnight.css b/theme/midnight.css
index e41f10560f..17ed39c8bc 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -12,8 +12,6 @@
     color: #D1EDFF;
 }
 
-.cm-s-midnight.CodeMirror { border-top: 1px solid black; border-bottom: 1px solid black; }
-
 .cm-s-midnight div.CodeMirror-selected { background: #314D67; }
 .cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
 .cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }

From e371c094ccf1ba1de429b3ac099bb0053558d0ca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 14 Jul 2017 10:56:17 +0200
Subject: [PATCH 3403/4742] [sql mode] Make multiple dots their own token

Closes #4855
---
 mode/sql/sql.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 62775128d4..9f5c7987e5 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -47,8 +47,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
       // numbers
       // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
-      stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
-      support.decimallessFloat && stream.eat('.');
+      stream.match(/^[0-9]*(\.[0-9]+)?([eE][-+]?[0-9]+)?/);
+      support.decimallessFloat && stream.match(/^\.(?!\.)/);
       return "number";
     } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
       // placeholders
@@ -84,14 +84,14 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       return state.tokenize(stream, state);
     } else if (ch == ".") {
       // .1 for 0.1
-      if (support.zerolessFloat && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) {
+      if (support.zerolessFloat && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i))
         return "number";
-      }
+      if (stream.match(/^\.+/))
+        return null
       // .table_name (ODBC)
       // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-      if (support.ODBCdotTable && stream.match(/^[\w\d_]+/)) {
+      if (support.ODBCdotTable && stream.match(/^[\w\d_]+/))
         return "variable-2";
-      }
     } else if (operatorChars.test(ch)) {
       // operators
       stream.eatWhile(operatorChars);

From 0f8d75934cc2d058670aa9976f132049d1311a34 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Fri, 14 Jul 2017 22:01:46 +0200
Subject: [PATCH 3404/4742] [markdown mode] Further align list tokenizer with
 CommonMark

---
 mode/markdown/markdown.js | 55 +++++++++++++++++++++------------------
 mode/markdown/test.js     | 47 +++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 638d9aad72..78a9c100d9 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -87,6 +87,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
                                 ")[ \\t]*([\\w+#\-]*)")
   ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
+  ,   expandedTab = "    " // CommonMark specifies tab as 4 spaces
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -138,23 +139,34 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     state.indentedCode = 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) {
+    var lineIndentation;
+    // compute once per line (on first token)
+    if (state.indentationDiff === null) {
+      lineIndentation = state.indentation;
+      state.indentationDiff = state.indentation;
+      if (prevLineIsList) {
         state.list = null;
-      } else { // No longer a list
-        state.list = false;
+        // While this list item's marker's indentation is less than the deepest
+        //  list item's content's indentation,pop the deepest list item
+        //  indentation off the stack, and update block indentation state
+        while (lineIndentation < state.listStack[state.listStack.length - 1]) {
+          state.listStack.pop();
+          if (state.listStack.length) {
+            state.indentation = state.listStack[state.listStack.length - 1];
+          // less than the first list's indent -> the line is no longer a list
+          } else {
+            state.list = false;
+          }
+        }
+        if (state.list !== false) {
+          state.indentationDiff = lineIndentation - state.listStack[state.listStack.length - 1]
+        }
       }
     }
 
     var match = null;
     if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || lineIsEmpty(state.prevLine))) {
       stream.skipToEnd();
-      state.indentation -= 4;
       state.indentedCode = true;
       return tokenTypes.code;
     } else if (stream.eatSpace()) {
@@ -182,15 +194,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return tokenTypes.hr;
     } else if (match = stream.match(listRE)) {
       var listType = match[1] ? "ol" : "ul";
-      state.indentation = stream.column() + stream.current().length;
-      state.list = true;
 
-      // While this list item's marker's indentation
-      // is less than the deepest list item's content's indentation,
-      // pop the deepest list item indentation off the stack.
-      while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) {
-        state.listStack.pop();
-      }
+      state.indentation = lineIndentation + stream.current().length;
+      state.list = true;
 
       // Add this list item's content's indentation to the stack
       state.listStack.push(state.indentation);
@@ -739,16 +745,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.formatting = false;
 
       if (stream != state.thisLine) {
-        var forceBlankLine = state.header || state.hr;
-
         // Reset state.header and state.hr
         state.header = 0;
         state.hr = false;
 
-        if (stream.match(/^\s*$/, true) || forceBlankLine) {
+        if (stream.match(/^\s*$/, true)) {
           blankLine(state);
-          if (!forceBlankLine) return null
-          state.prevLine = null
+          return null;
         }
 
         state.prevLine = state.thisLine
@@ -763,9 +766,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         state.f = state.block;
         if (state.f != htmlBlock) {
-          var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
-          state.indentationDiff = Math.min(indentation - state.indentation, 4);
-          state.indentation = state.indentation + state.indentationDiff;
+          var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, expandedTab).length;
+          state.indentation = indentation;
+          state.indentationDiff = null;
           if (indentation > 0) return null;
         }
       }
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 04c72fdaf3..ef59890607 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -469,6 +469,53 @@
      "   [variable-3 * Otherwise, it will be part of the level where it does meet this.]",
      " [variable-2 * World]");
 
+  // should handle nested and un-nested lists
+  MT("listCommonMark_MixedIndents",
+     "[variable-2 * list1]",
+     "    [variable-2 list1]",
+     "  [variable-2&header&header-1 # heading still part of list1]",
+     "  [variable-2 text after heading still part of list1]",
+     "",
+     "      [comment indented codeblock]",
+     "  [variable-2 list1 after code block]",
+     "  [variable-3 * list2]",
+     // amount of spaces on empty lines between lists doesn't matter
+     "              ",
+     // extra empty lines irrelevant
+     "",
+     "",
+     "    [variable-3 indented text part of list2]",
+     "    [keyword * list3]",
+     "",
+     "    [variable-3 text at level of list2]",
+     "",
+     "  [variable-2 de-indented text part of list1 again]",
+     "",
+     "  [variable-2&comment ```]",
+     "  [variable-2&comment code]",
+     "  [variable-2&comment ```]",
+     "",
+     "  [variable-2 text after fenced code]");
+
+  // should correctly parse numbered list content indentation
+  MT("listCommonMark_NumeberedListIndent",
+     "[variable-2 1000. list with base indent of 6]",
+     "",
+     "      [variable-2 text must be indented 6 spaces at minimum]",
+     "",
+     "         [variable-2 9-spaces indented text still part of list]",
+     "",
+     "          [comment indented codeblock starts at 10 spaces]",
+     "",
+     "     [comment text indented by 5 spaces no longer belong to list]");
+
+  // should consider tab as 4 spaces
+  MT("listCommonMark_TabIndented",
+     "[variable-2 * list]",
+     "\t[variable-3 * list2]",
+     "",
+     "\t\t[variable-3 part of list2]");
+
   // Blockquote
   MT("blockquote",
      "[variable-2 * foo]",

From 7a2fa50d94c9a00771c33d28dfd8c58600aacd41 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 17 Jul 2017 11:59:03 +0200
Subject: [PATCH 3405/4742] [tern addon] Make argument hint tooltip vanish on
 blur/scroll/etc

Issue #3059
---
 addon/tern/tern.js | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index efdf2ed628..644e495f65 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -334,7 +334,11 @@
     tip.appendChild(document.createTextNode(tp.rettype ? ") ->\u00a0" : ")"));
     if (tp.rettype) tip.appendChild(elt("span", cls + "type", tp.rettype));
     var place = cm.cursorCoords(null, "page");
-    ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip);
+    var tooltip = ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip)
+    setTimeout(function() {
+      tooltip.clear = onEditorActivity(cm, function() {
+        if (ts.activeArgHints == tooltip) closeArgHints(ts) })
+    }, 20)
   }
 
   function parseFnType(text) {
@@ -604,11 +608,8 @@
     }
     function clear() {
       cm.state.ternTooltip = null;
-      if (!tip.parentNode) return;
-      cm.off("cursorActivity", clear);
-      cm.off('blur', clear);
-      cm.off('scroll', clear);
-      fadeOut(tip);
+      if (tip.parentNode) fadeOut(tip)
+      clearActivity()
     }
     var mouseOnTip = false, old = false;
     CodeMirror.on(tip, "mousemove", function() { mouseOnTip = true; });
@@ -619,9 +620,20 @@
       }
     });
     setTimeout(maybeClear, ts.options.hintDelay ? ts.options.hintDelay : 1700);
-    cm.on("cursorActivity", clear);
-    cm.on('blur', clear);
-    cm.on('scroll', clear);
+    var clearActivity = onEditorActivity(cm, clear)
+  }
+
+  function onEditorActivity(cm, f) {
+    cm.on("cursorActivity", f)
+    cm.on("blur", f)
+    cm.on("scroll", f)
+    cm.on("setDoc", f)
+    return function() {
+      cm.off("cursorActivity", f)
+      cm.off("blur", f)
+      cm.off("scroll", f)
+      cm.off("setDoc", f)
+    }
   }
 
   function makeTooltip(x, y, content) {
@@ -650,7 +662,11 @@
   }
 
   function closeArgHints(ts) {
-    if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
+    if (ts.activeArgHints) {
+      if (ts.activeArgHints.clear) ts.activeArgHints.clear()
+      remove(ts.activeArgHints)
+      ts.activeArgHints = null
+    }
   }
 
   function docValue(ts, doc) {

From 03d99e588aee36e0f1bb81a5ff2cc2dc343d5380 Mon Sep 17 00:00:00 2001
From: George Stephanis <georgestephanis@automattic.com>
Date: Thu, 29 Jun 2017 14:07:31 -0400
Subject: [PATCH 3406/4742] [lint plugins] Provide better error messages if the
 lint library is missing

This should help developers building this functionality out that may not
realize they need to source the linting library seperately.
---
 addon/lint/coffeescript-lint.js | 6 ++++++
 addon/lint/css-lint.js          | 7 ++++++-
 addon/lint/html-lint.js         | 7 ++++++-
 addon/lint/javascript-lint.js   | 7 ++++++-
 addon/lint/json-lint.js         | 6 ++++++
 addon/lint/yaml-lint.js         | 6 ++++++
 6 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
index 7e39428f7a..70621a1bdd 100644
--- a/addon/lint/coffeescript-lint.js
+++ b/addon/lint/coffeescript-lint.js
@@ -17,6 +17,12 @@
 
 CodeMirror.registerHelper("lint", "coffeescript", function(text) {
   var found = [];
+  if (!window.coffeelint) {
+    if (window.console) {
+      window.console.error("Error: window.coffeelint not defined, CodeMirror CoffeeScript linting cannot run.");
+    }
+    return found;
+  }
   var parseError = function(err) {
     var loc = err.lineNumber;
     found.push({from: CodeMirror.Pos(loc-1, 0),
diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index 1f61b479b2..b7e1a4fe5d 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -17,7 +17,12 @@
 
 CodeMirror.registerHelper("lint", "css", function(text) {
   var found = [];
-  if (!window.CSSLint) return found;
+  if (!window.CSSLint) {
+    if (window.console) {
+        window.console.error("Error: window.CSSLint not defined, CodeMirror CSS linting cannot run.");
+    }
+    return found;
+  }
   var results = CSSLint.verify(text), messages = results.messages, message = null;
   for ( var i = 0; i < messages.length; i++) {
     message = messages[i];
diff --git a/addon/lint/html-lint.js b/addon/lint/html-lint.js
index 1e8417098d..98c36b0b64 100644
--- a/addon/lint/html-lint.js
+++ b/addon/lint/html-lint.js
@@ -29,7 +29,12 @@
 
   CodeMirror.registerHelper("lint", "html", function(text, options) {
     var found = [];
-    if (!window.HTMLHint) return found;
+    if (!window.HTMLHint) {
+      if (window.console) {
+          window.console.error("Error: window.HTMLHint not defined, CodeMirror HTML linting cannot run.");
+      }
+      return found;
+    }
     var messages = HTMLHint.verify(text, options && options.rules || defaultRules);
     for (var i = 0; i < messages.length; i++) {
       var message = messages[i];
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index d4f2ae9a1f..c58f785025 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -22,7 +22,12 @@
                  "Unclosed string", "Stopping, unable to continue" ];
 
   function validator(text, options) {
-    if (!window.JSHINT) return [];
+    if (!window.JSHINT) {
+      if (window.console) {
+        window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run.");
+      }
+      return [];
+    }
     JSHINT(text, options, options.globals);
     var errors = JSHINT.data().errors, result = [];
     if (errors) parseErrors(errors, result);
diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index 9dbb616b3b..849641ee5e 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -17,6 +17,12 @@
 
 CodeMirror.registerHelper("lint", "json", function(text) {
   var found = [];
+  if (!window.jsonlint) {
+    if (window.console) {
+      window.console.error("Error: window.jsonlint not defined, CodeMirror JSON linting cannot run.");
+    }
+    return found;
+  }
   jsonlint.parseError = function(str, hash) {
     var loc = hash.loc;
     found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
diff --git a/addon/lint/yaml-lint.js b/addon/lint/yaml-lint.js
index 90b0eaab57..3954ed38eb 100644
--- a/addon/lint/yaml-lint.js
+++ b/addon/lint/yaml-lint.js
@@ -17,6 +17,12 @@
 
 CodeMirror.registerHelper("lint", "yaml", function(text) {
   var found = [];
+  if (!window.jsyaml) {
+    if (window.console) {
+      window.console.error("Error: window.jsyaml not defined, CodeMirror YAML linting cannot run.");
+    }
+    return found;
+  }
   try { jsyaml.load(text); }
   catch(e) {
       var loc = e.mark,

From 99c8d8b9029d7a32884f9a21ead90039144c53da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 18 Jul 2017 11:02:03 +0200
Subject: [PATCH 3407/4742] [lint plugins] Allow lint plugins to output HTML
 formatted messages

This is opt-in, the plugin needs to produce message_html instead of
message to be rendered as HTML.
---
 addon/lint/lint.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 4e0c71fb65..825065ed2a 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -112,7 +112,11 @@
     if (!severity) severity = "error";
     var tip = document.createElement("div");
     tip.className = "CodeMirror-lint-message-" + severity;
-    tip.appendChild(document.createTextNode(ann.message));
+    if (typeof ann.messageHTML != 'undefined') {
+        tip.innerHTML = ann.messageHTML;
+    } else {
+        tip.appendChild(document.createTextNode(ann.message));
+    }
     return tip;
   }
 

From b11179d1f6e1a82bb43d9cdecb03052119b89e09 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Thu, 20 Jul 2017 22:59:13 +0200
Subject: [PATCH 3408/4742] [gfm mode] Add emoji rule

---
 mode/gfm/gfm.js           |  3 ++-
 mode/gfm/index.html       |  6 +++++-
 mode/gfm/test.js          |  7 +++++++
 mode/markdown/markdown.js | 19 +++++++++++++++++--
 mode/markdown/test.js     |  7 ++++++-
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 23126ff465..aac04812d8 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -115,7 +115,8 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
   var markdownConfig = {
     taskLists: true,
     fencedCodeBlocks: '```',
-    strikethrough: true
+    strikethrough: true,
+    emoji: true
   };
   for (var attr in modeConfig) {
     markdownConfig[attr] = modeConfig[attr];
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index 24c90c068e..642c8ce71d 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -15,7 +15,10 @@
 <script src="../htmlmixed/htmlmixed.js"></script>
 <script src="../clike/clike.js"></script>
 <script src="../meta.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style type="text/css">
+  .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+  .cm-s-default .cm-emoji {color: #009688;}
+</style>
 <div id=nav>
   <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
@@ -73,6 +76,7 @@ <h2>GFM mode</h2>
 * \#Num: #1
 * User/#Num: mojombo#1
 * User/Project#Num: mojombo/god#1
+* emoji: :smile: (note: you must add the CSS rule yourself. Set `emoji: false` in mode options to disable)
 
 See http://github.github.com/github-flavored-markdown/.
 
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 3d7d7e0132..fa6db91a20 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -29,6 +29,9 @@
   FT("formatting_strikethrough",
      "foo [strikethrough&formatting&formatting-strikethrough ~~][strikethrough bar][strikethrough&formatting&formatting-strikethrough ~~]");
 
+  FT("formatting_emoji",
+     "foo [emoji&formatting&formatting-emoji :smile:] foo");
+
   MT("emInWordAsterisk",
      "foo[em *bar*]hello");
 
@@ -231,4 +234,8 @@
   MT("strikethroughStrong",
      "[strong **][strong&strikethrough ~~foo~~][strong **]");
 
+  MT("emoji",
+     "text [emoji :blush:] text [emoji :v:] text [emoji :+1:] text",
+     ":text text: [emoji :smiley_cat:]");
+
 })();
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 78a9c100d9..f67b4244d0 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -47,6 +47,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.strikethrough === undefined)
     modeCfg.strikethrough = false;
 
+  if (modeCfg.emoji === undefined)
+    modeCfg.emoji = false;
+
   // Allow token types to be overridden by user-provided token types.
   if (modeCfg.tokenTypeOverrides === undefined)
     modeCfg.tokenTypeOverrides = {};
@@ -69,7 +72,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     linkHref: "string",
     em: "em",
     strong: "strong",
-    strikethrough: "strikethrough"
+    strikethrough: "strikethrough",
+    emoji: "emoji"
   };
 
   for (var tokenType in tokenTypes) {
@@ -83,7 +87,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow listRE
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
-  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
+  ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
   ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
                                 ")[ \\t]*([\\w+#\-]*)")
   ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
@@ -299,6 +303,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (state.strong) { styles.push(tokenTypes.strong); }
       if (state.em) { styles.push(tokenTypes.em); }
       if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
+      if (state.emoji) { styles.push(tokenTypes.emoji); }
       if (state.linkText) { styles.push(tokenTypes.linkText); }
       if (state.code) { styles.push(tokenTypes.code); }
       if (state.image) { styles.push(tokenTypes.image); }
@@ -556,6 +561,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
+    if (modeCfg.emoji && ch === ":" && stream.match(/^[a-z_\d+-]+:/)) {
+      state.emoji = true;
+      if (modeCfg.highlightFormatting) state.formatting = "emoji";
+      var retType = getType(state);
+      state.emoji = false;
+      return retType;
+    }
+
     if (ch === ' ') {
       if (stream.match(/ +$/, false)) {
         state.trailingSpace++;
@@ -698,6 +711,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         trailingSpace: 0,
         trailingSpaceNewLine: false,
         strikethrough: false,
+        emoji: false,
         fencedChars: null
       };
     },
@@ -725,6 +739,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         em: s.em,
         strong: s.strong,
         strikethrough: s.strikethrough,
+        emoji: s.emoji,
         header: s.header,
         hr: s.hr,
         taskList: s.taskList,
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index ef59890607..8dac53aade 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -14,6 +14,7 @@
   var modeOverrideClasses = CodeMirror.getMode(config, {
     name: "markdown",
     strikethrough: true,
+    emoji: true,
     tokenTypeOverrides: {
       "header" : "override-header",
       "code" : "override-code",
@@ -31,7 +32,8 @@
       "linkHref" : "override-link-href",
       "em" : "override-em",
       "strong" : "override-strong",
-      "strikethrough" : "override-strikethrough"
+      "strikethrough" : "override-strikethrough",
+      "emoji" : "override-emoji"
   }});
   function TokenTypeOverrideTest(name) { test.mode(name, modeOverrideClasses, Array.prototype.slice.call(arguments, 1)); }
   var modeFormattingOverride = CodeMirror.getMode(config, {
@@ -966,6 +968,9 @@
   TokenTypeOverrideTest("overrideStrikethrough",
     "[override-strikethrough ~~foo~~]");
 
+  TokenTypeOverrideTest("overrideEmoji",
+    "[override-emoji :foo:]");
+
   FormatTokenTypeOverrideTest("overrideFormatting",
     "[override-formatting-escape \\*]");
 

From 4292c2ff1bad00278c87e0d3bb0e7fd8d32a4ab8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Jul 2017 11:51:38 +0200
Subject: [PATCH 3409/4742] [markdown mode] Change default emoji style to
 'builtin'

Issue #4864
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index f67b4244d0..db8359e9b9 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -73,7 +73,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     em: "em",
     strong: "strong",
     strikethrough: "strikethrough",
-    emoji: "emoji"
+    emoji: "builtin"
   };
 
   for (var tokenType in tokenTypes) {

From cb01fa18c8d42605489deda0d16881b42246c6c4 Mon Sep 17 00:00:00 2001
From: Kevin Kwok <antimatter15@gmail.com>
Date: Wed, 19 Jul 2017 12:00:04 -0700
Subject: [PATCH 3410/4742] [sql mode] Set lineComment to "--" when no other
 style is used

---
 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 9f5c7987e5..c98d9f686b 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -193,7 +193,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
-    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : null
+    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : "--"
   };
 });
 

From 6cad72fc3b484d3ea50c8cbb47ec98b8b795dd65 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Jul 2017 11:59:27 +0200
Subject: [PATCH 3411/4742] [gfm mode] Adjust tests to to change in emoji token
 type

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

diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index fa6db91a20..5c8b0332ac 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -30,7 +30,7 @@
      "foo [strikethrough&formatting&formatting-strikethrough ~~][strikethrough bar][strikethrough&formatting&formatting-strikethrough ~~]");
 
   FT("formatting_emoji",
-     "foo [emoji&formatting&formatting-emoji :smile:] foo");
+     "foo [builtin&formatting&formatting-emoji :smile:] foo");
 
   MT("emInWordAsterisk",
      "foo[em *bar*]hello");
@@ -235,7 +235,7 @@
      "[strong **][strong&strikethrough ~~foo~~][strong **]");
 
   MT("emoji",
-     "text [emoji :blush:] text [emoji :v:] text [emoji :+1:] text",
-     ":text text: [emoji :smiley_cat:]");
+     "text [builtin :blush:] text [builtin :v:] text [builtin :+1:] text",
+     ":text text: [builtin :smiley_cat:]");
 
 })();

From cde3e9902d56c6eda26669d0076b88f8a8a0833b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Jul 2017 12:08:50 +0200
Subject: [PATCH 3412/4742] Add anchor ids to startOperation/endOperation docs

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

diff --git a/doc/manual.html b/doc/manual.html
index 829cf7476a..8fcd5b45c0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2048,8 +2048,8 @@ <h3 id="api_misc">Miscellaneous methods</h3>
       lot faster. The return value from this method will be the return
       value of your function.</dd>
 
-      <dt><code><strong>cm.startOperation</strong>()</code></dt>
-      <dt><code><strong>cm.endOperation</strong>()</code></dt>
+      <dt id="startOperation"><code><strong>cm.startOperation</strong>()</code></dt>
+      <dt id="endOperation"><code><strong>cm.endOperation</strong>()</code></dt>
       <dd>In normal circumstances, use the above <code>operation</code>
       method. But if you want to buffer operations happening asynchronously,
       or that can't all be wrapped in a callback function, you can

From 6df6280ed80c8a39df62f515f31cd921329e3f47 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Jul 2017 12:19:50 +0200
Subject: [PATCH 3413/4742] Mark version 5.28.0

---
 AUTHORS           |  9 +++++++++
 CHANGELOG.md      | 22 ++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 17 ++++++++++++++---
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 88e625bec0..07b8fbd09e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -74,6 +74,7 @@ Arsène von Wyss
 Arthur Müller
 Arun Narasani
 as3boyan
+asolove
 atelierbram
 AtomicPages LLC
 Atul Bhouraskar
@@ -87,6 +88,7 @@ Bem Jones-Bey
 benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
+Benjamin Young
 Ben Keen
 Ben Miller
 Ben Mosher
@@ -181,6 +183,7 @@ Drew Khoury
 Drini Cami
 Dror BG
 duralog
+dwelle
 eborden
 edsharp
 ekhaled
@@ -218,6 +221,7 @@ Gautam Mehta
 Gavin Douglas
 gekkoe
 Geordie Hall
+George Stephanis
 geowarin
 Gerard Braad
 Gergely Hegykozi
@@ -340,6 +344,7 @@ Ken Newman
 ken restivo
 Ken Rockot
 Kevin Earls
+Kevin Kwok
 Kevin Muret
 Kevin Sawicki
 Kevin Ushey
@@ -434,6 +439,7 @@ Michael Grey
 Michael Kaminsky
 Michael Lehenbauer
 Michael Zhou
+Michal Čihař
 Michal Dorner
 Mighty Guava
 Miguel Castillo
@@ -468,6 +474,7 @@ Nicholas Bollweg
 Nicholas Bollweg (Nick)
 Nick Kreeger
 Nick Small
+Nicolas Kick
 Nicolò Ribaudo
 Niels van Groningen
 nightwing
@@ -486,6 +493,7 @@ pablo
 pabloferz
 Pablo Zubieta
 Page
+paladox
 Panupong Pasupat
 paris
 Paris
@@ -631,6 +639,7 @@ Triangle717
 Tristan Tarrant
 TSUYUSATO Kitsune
 twifkak
+Tyler Long
 VapidWorx
 Vestimir Markov
 vf
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62b337e7c9..2c0887ed5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 5.28.0 (2017-07-21)
+
+### Bug fixes
+
+Fix copying of, or replacing editor content with, a single dash character when copying a big selection in some corner cases.
+
+Make [`"goLineLeft"`](http://codemirror.net/doc/manual.html#command_goLineLeft)/`"goLineRight"` behave better on wrapped lines.
+
+[sql mode](http://codemirror.net/mode/sql/): Fix tokenizing of multi-dot operator and allow digits in subfield names.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix infinite loop on some composed character inputs.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Make list parsing more CommonMark-compliant.
+
+[gfm mode](http://codemirror.net/mode/gfm/): Highlight colon syntax for emoji.
+
+### New features
+
+Expose [`startOperation`](http://codemirror.net/doc/manual.html#startOperation) and `endOperation` for explicit operation management.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Add extend-selection (Ctrl-Alt- or Cmd-Shift-Up/Down).
+
 ## 5.27.4 (2017-06-29)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 8fcd5b45c0..b4500c375b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.27.5</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.28.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 15bd24e163..86cadb1512 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,22 +30,33 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-07-2017: <a href="http://codemirror.net/codemirror-5.28.0.zip">Version 5.28.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix copying of, or replacing editor content with, a single dash character when copying a big selection in some corner cases.</li>
+    <li>Make <a href="http://codemirror.net/doc/manual.html#command_goLineLeft"><code>&quot;goLineLeft&quot;</code></a>/<code>&quot;goLineRight&quot;</code> behave better on wrapped lines.</li>
+    <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Fix tokenizing of multi-dot operator and allow digits in subfield names.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix infinite loop on some composed character inputs.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Make list parsing more CommonMark-compliant.</li>
+    <li><a href="http://codemirror.net/mode/gfm/">gfm mode</a>: Highlight colon syntax for emoji.</li>
+  </ul>
+
   <p class="rel">29-06-2017: <a href="http://codemirror.net/codemirror-5.27.4.zip">Version 5.27.4</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li>Fix crash when using mode lookahead.</li>
     <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Don't block inner mode's indentation support.</li>
   </ul>
 
   <p class="rel">22-06-2017: <a href="http://codemirror.net/codemirror-5.27.2.zip">Version 5.27.2</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li>Fix crash in the <a href="http://codemirror.net/demo/simplemode.html">simple mode</a> addon.</li>
   </ul>
 
   <p class="rel">22-06-2017: <a href="http://codemirror.net/codemirror-5.27.0.zip">Version 5.27.0</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li>Fix infinite loop in forced display update.</li>
     <li>Properly disable the hidden textarea when <code>readOnly</code> is <code>&quot;nocursor&quot;</code>.</li>
     <li>Calling the <code>Doc</code> constructor without <code>new</code> works again.</li>
diff --git a/index.html b/index.html
index baa0a33bf7..c47eb6ec27 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.27.4</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.28.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index ef824b0b0a..e413d2c57b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.27.5",
+  "version": "5.28.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 54a7a6e3cc..5a20c6473e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.27.5"
+CodeMirror.version = "5.28.0"

From e246c6b165697c28ae584584d1cb56a31c87c707 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Jul 2017 12:21:43 +0200
Subject: [PATCH 3414/4742] Bump version number post-5.28.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index b4500c375b..da4423f960 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.28.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.28.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index e413d2c57b..ff6971cd8e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.28.0",
+  "version": "5.28.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 5a20c6473e..e7a2122d6e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.28.0"
+CodeMirror.version = "5.28.1"

From 0a1fb070028e2bc9ac6fb1e0c5940102bf7d0fa7 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Fri, 21 Jul 2017 17:56:58 +0200
Subject: [PATCH 3415/4742] [gfm mode] update doc

---
 mode/gfm/index.html | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index 642c8ce71d..bec130ca51 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -70,21 +70,32 @@ <h2>GFM mode</h2>
 
 ## A bit of GitHub spice
 
+See http://github.github.com/github-flavored-markdown/.
+
+(Set `gitHubSpice: false` in mode options to disable):
+
 * SHA: be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
 * User@SHA ref: mojombo@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
 * User/Project@SHA: mojombo/god@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
 * \#Num: #1
 * User/#Num: mojombo#1
 * User/Project#Num: mojombo/god#1
-* emoji: :smile: (note: you must add the CSS rule yourself. Set `emoji: false` in mode options to disable)
 
-See http://github.github.com/github-flavored-markdown/.
+(Set `emoji: false` in mode options to disable):
+
+* emoji: :smile:
+
 
 </textarea></form>
 
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: 'gfm',
+        mode: {
+          name: "gfm",
+          tokenTypeOverrides: {
+            emoji: "emoji"
+          }
+        },
         lineNumbers: true,
         theme: "default"
       });

From 432f0b7f737c170e5582732a99b9e2e7fe91f596 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 22 Jul 2017 18:43:40 +0200
Subject: [PATCH 3416/4742] Make lookAhead work in mode tests

Issue #4868
---
 test/mode_test.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/mode_test.js b/test/mode_test.js
index 16051a06e2..9773f80126 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -128,7 +128,9 @@
           (st.indentFailures || (st.indentFailures = [])).push(
             "Indentation of line " + (i + 1) + " is " + indent + " (expected " + ws.length + ")");
       }
-      var stream = new CodeMirror.StringStream(line);
+      var stream = new CodeMirror.StringStream(line, 4, {
+        lookAhead: function(n) { return lines[i + n] }
+      });
       if (line == "" && mode.blankLine) mode.blankLine(state);
       /* Start copied code from CodeMirror.highlight */
       while (!stream.eol()) {

From 92ee3d2b45ad7f4bf925339c452d39af02c47517 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 22 Jul 2017 18:48:20 +0200
Subject: [PATCH 3417/4742] [javascript mode] Add support for typescript keyof
 keyword

Closes #4869
---
 mode/javascript/javascript.js | 12 ++++++++++--
 mode/javascript/test.js       |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 692ffc61d8..d77862b1d5 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -549,8 +549,16 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (value == "?") return cont(maybetype);
     }
   }
-  function typeexpr(type) {
-    if (type == "variable") {cx.marked = "type"; return cont(afterType);}
+  function typeexpr(type, value) {
+    if (type == "variable") {
+      if (value == "keyof") {
+        cx.marked = "keyword"
+        return cont(typeexpr)
+      } else {
+        cx.marked = "type"
+        return cont(afterType)
+      }
+    }
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
     if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 328cbc2538..8fd13aee49 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -339,6 +339,10 @@
   TS("typescript_complex_type_casting",
      "[keyword const] [def giftpay] [operator =] [variable config].[property get]([string 'giftpay']) [keyword as] { [[ [variable platformUuid]: [type string] ]]: { [property version]: [type number]; [property apiCode]: [type string]; } };")
 
+  TS("typescript_keyof",
+     "[keyword function] [def x][operator <][type T] [keyword extends] [keyword keyof] [type X][operator >]([def a]: [type T]) {",
+     "  [keyword return]")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 7997c5d13326abbf5afcd3778d39b3e81c8629ff Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Mon, 24 Jul 2017 06:21:44 +0200
Subject: [PATCH 3418/4742] D Mode: Fix nested comments

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

diff --git a/mode/d/d.js b/mode/d/d.js
index c927a7e358..77b09c224e 100644
--- a/mode/d/d.js
+++ b/mode/d/d.js
@@ -44,7 +44,7 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
     }
     if (ch == "/") {
       if (stream.eat("+")) {
-        state.tokenize = tokenComment;
+        state.tokenize = tokenNestedComment;
         return tokenNestedComment(stream, state);
       }
       if (stream.eat("*")) {

From 5ed2e78e6dfe7344d3d4bf80b92f82d64f9f8239 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 24 Jul 2017 10:44:33 +0200
Subject: [PATCH 3419/4742] [d mode] Add test for nested comments

See #4872.
---
 mode/d/test.js  | 11 +++++++++++
 test/index.html |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 mode/d/test.js

diff --git a/mode/d/test.js b/mode/d/test.js
new file mode 100644
index 0000000000..d8de4ad35f
--- /dev/null
+++ b/mode/d/test.js
@@ -0,0 +1,11 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "d");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("nested_comments",
+     "[comment /+]","[comment comment]","[comment +/]","[variable void] [variable main](){}");
+
+})();
diff --git a/test/index.html b/test/index.html
index 4146a4d45d..99bee5bb9b 100644
--- a/test/index.html
+++ b/test/index.html
@@ -21,6 +21,7 @@
 <script src="../mode/clike/clike.js"></script>
 <!-- clike must be after css or vim and sublime tests will fail -->
 <script src="../mode/cypher/cypher.js"></script>
+<script src="../mode/d/d.js"></script>
 <script src="../mode/gfm/gfm.js"></script>
 <script src="../mode/haml/haml.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
@@ -115,6 +116,7 @@ <h2>Test Suite</h2>
     <script src="../mode/css/scss_test.js"></script>
     <script src="../mode/css/less_test.js"></script>
     <script src="../mode/cypher/test.js"></script>
+    <script src="../mode/d/test.js"></script>
     <script src="../mode/gfm/test.js"></script>
     <script src="../mode/haml/test.js"></script>
     <script src="../mode/javascript/test.js"></script>

From 3ec7088b8aef7910db0f554ccd4c94d1a77bd71c Mon Sep 17 00:00:00 2001
From: Michael Walker <mike@barrucadu.co.uk>
Date: Mon, 24 Jul 2017 09:45:42 +0100
Subject: [PATCH 3420/4742] Use background-color for cm-searching

---
 lib/codemirror.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index b008351a62..f4d3c5f40b 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -319,8 +319,8 @@ div.CodeMirror-dragcursors {
 .CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
 
 .cm-searching {
-  background: #ffa;
-  background: rgba(255, 255, 0, .4);
+  background-color: #ffa;
+  background-color: rgba(255, 255, 0, .4);
 }
 
 /* Used to force a border model for a node */

From c53dc1678a0a1fce9e75f57e902ff73fad2ce64b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 25 Jul 2017 19:09:51 +0200
Subject: [PATCH 3421/4742] [python mode] Simplify tokenizing of operators, fix
 recognition of several ops

Issue #4876
---
 mode/python/python.js | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 2d2b08c810..c318793207 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -41,10 +41,11 @@
   CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = "error";
 
-    var singleDelimiters = parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
-    var doubleOperators = parserConf.doubleOperators || /^([!<>]==|<>|<<|>>|\/\/|\*\*)/;
-    var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
-    var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
+    var delimiters = parserConf.delimiters || parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
+    //               (Backwards-compatiblity with old, cumbersome config system)
+    var operators = [parserConf.singleOperators, parserConf.doubleOperators, parserConf.doubleDelimiters, parserConf.tripleDelimiters,
+                     parserConf.operators || /^([-+*/%\/&|^]=?|[<>=]+|\/\/=?|\*\*=?|!=|[~!@])/]
+    for (var i = 0; i < operators.length; i++) if (!operators[i]) operators.splice(i--, 1)
 
     var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
 
@@ -58,13 +59,11 @@
     var py3 = !(parserConf.version && Number(parserConf.version) < 3)
     if (py3) {
       // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
-      var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
       var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
       myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
       myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
       var stringPrefixes = new RegExp("^(([rbuf]|(br))?('{3}|\"{3}|['\"]))", "i");
     } else {
-      var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
       var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
       myKeywords = myKeywords.concat(["exec", "print"]);
       myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
@@ -151,15 +150,10 @@
         return state.tokenize(stream, state);
       }
 
-      // Handle operators and Delimiters
-      if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
-        return "punctuation";
+      for (var i = 0; i < operators.length; i++)
+        if (stream.match(operators[i])) return "operator"
 
-      if (stream.match(doubleOperators) || stream.match(singleOperators))
-        return "operator";
-
-      if (stream.match(singleDelimiters))
-        return "punctuation";
+      if (stream.match(delimiters)) return "punctuation";
 
       if (state.lastToken == "." && stream.match(identifiers))
         return "property";

From e4c6f2b34f32681682c59f09d68f90a80d22d18a Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Thu, 27 Jul 2017 12:51:39 +0200
Subject: [PATCH 3422/4742] [markdown mode] disallow lists and fencedCode
 inside blockquote

---
 mode/markdown/markdown.js |  6 +++---
 mode/markdown/test.js     | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index db8359e9b9..d646d884b4 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -196,7 +196,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     } else if (stream.match(hrRE, true)) {
       state.hr = true;
       return tokenTypes.hr;
-    } else if (match = stream.match(listRE)) {
+    } else if (!state.quote && (match = stream.match(listRE))) {
       var listType = match[1] ? "ol" : "ul";
 
       state.indentation = lineIndentation + stream.current().length;
@@ -211,7 +211,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = state.inline;
       if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
       return getType(state);
-    } else if (modeCfg.fencedCodeBlocks && (match = stream.match(fencedCodeRE, true))) {
+    } else if (modeCfg.fencedCodeBlocks && !state.quote && (match = stream.match(fencedCodeRE, true))) {
       state.fencedChars = match[1]
       // try switching mode
       state.localMode = getMode(match[2]);
@@ -400,7 +400,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (modeCfg.highlightFormatting) state.formatting = "code";
       stream.eatWhile('`');
       var count = stream.current().length
-      if (state.code == 0) {
+      if (state.code == 0 && (!state.quote || count == 1)) {
         state.code = count
         return getType(state)
       } else if (count == state.code) { // Must be exact
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 8dac53aade..c2ac548305 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -323,6 +323,20 @@
      "",
      "hello");
 
+  // disallow lists inside blockquote for now because it causes problems outside blockquote
+  // TODO: fix to be CommonMark-compliant
+  MT("listNestedInBlockquote",
+     "[quote&quote-1 > - foo]");
+
+  // disallow fenced blocks inside blockquote because it causes problems outside blockquote
+  // TODO: fix to be CommonMark-compliant
+  MT("fencedBlockNestedInBlockquote",
+     "[quote&quote-1 > ```]",
+     "[quote&quote-1 > code]",
+     "[quote&quote-1 > ```]",
+     // ensure we still allow inline code
+     "[quote&quote-1 > ][quote&quote-1&comment `code`]");
+
   // Header with leading space after continued blockquote (#3287, negative indentation)
   MT("headerAfterContinuedBlockquote",
      "[quote&quote-1 > foo]",

From 0927b971c866c92602d7200f061d59ff78026e09 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Tue, 25 Jul 2017 22:32:28 +0200
Subject: [PATCH 3423/4742] [nsis mode] Add support for NSIS 3.02

---
 mode/nsis/nsis.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index dc8c74cdf4..d6c61facf3 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -24,20 +24,20 @@ CodeMirror.defineSimpleMode("nsis",{
     { regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
 
     // Compile Time Commands
-    {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+    {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|pragma|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
 
     // Conditional Compilation
     {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
     {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
 
     // Command Options
-    {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
-    {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
+    {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR(32|64)?|HKCU(32|64)?|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM(32|64)?|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
+    {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
 
     // LogicLib.nsh
     {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/, token: "variable-2", indent: true},

From 6bbdb75be5a839d6a9f92adaf7357a04af639705 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 28 Jul 2017 14:29:51 +0200
Subject: [PATCH 3424/4742] [continuecomment addon] Don't assume comment lines
 are a single token

Issue codemirror/google-modes#8
---
 addon/comment/continuecomment.js | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index b11d51e6ca..d7385ef223 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -18,30 +18,28 @@
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
     var ranges = cm.listSelections(), mode, inserts = [];
     for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].head, token = cm.getTokenAt(pos);
-      if (token.type != "comment") return CodeMirror.Pass;
-      var modeHere = CodeMirror.innerMode(cm.getMode(), token.state).mode;
+      var pos = ranges[i].head
+      if (!/\bcomment\b/.test(cm.getTokenTypeAt(pos))) return CodeMirror.Pass;
+      var modeHere = cm.getModeAt(pos)
       if (!mode) mode = modeHere;
       else if (mode != modeHere) return CodeMirror.Pass;
 
       var insert = null;
       if (mode.blockCommentStart && mode.blockCommentContinue) {
-        var end = token.string.indexOf(mode.blockCommentEnd);
-        var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
-        if (end != -1 && end == token.string.length - mode.blockCommentEnd.length && pos.ch >= end) {
+        var line = cm.getLine(pos.line).slice(0, pos.ch)
+        var end = line.indexOf(mode.blockCommentEnd), found
+        if (end != -1 && end == pos.ch - mode.blockCommentEnd.length) {
           // Comment ended, don't continue it
-        } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
-          insert = full.slice(0, token.start);
-          if (!/^\s*$/.test(insert)) {
-            insert = "";
-            for (var j = 0; j < token.start; ++j) insert += " ";
+        } else if ((found = line.indexOf(mode.blockCommentStart)) > -1) {
+          insert = line.slice(0, found)
+          if (/\S/.test(insert)) {
+            insert = ""
+            for (var j = 0; j < found; ++j) insert += " "
           }
-        } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
-                   found + mode.blockCommentContinue.length > token.start &&
-                   /^\s*$/.test(full.slice(0, found))) {
-          insert = full.slice(0, found);
+        } else if ((found = line.indexOf(mode.blockCommentContinue)) > -1 && !/\S/.test(line.slice(0, found))) {
+          insert = line.slice(0, found)
         }
-        if (insert != null) insert += mode.blockCommentContinue;
+        if (insert != null) insert += mode.blockCommentContinue
       }
       if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
         var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);

From 2b8b8e72e70b6e8e4205be3f35a8b9a50983595b Mon Sep 17 00:00:00 2001
From: Benjamin Young <byoung2@wiley.com>
Date: Fri, 28 Jul 2017 11:27:27 -0400
Subject: [PATCH 3425/4742] Add alternate media type for Shell

Seems Apache has its own list for non-registered
media types.
---
 mode/meta.js          | 2 +-
 mode/shell/index.html | 2 +-
 mode/shell/shell.js   | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mode/meta.js b/mode/meta.js
index edaae033eb..20973ace3d 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -121,7 +121,7 @@
     {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
     {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
     {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
-    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
+    {name: "Shell", mimes: ["text/x-sh", "application/x-sh"], mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
     {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
     {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
     {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
diff --git a/mode/shell/index.html b/mode/shell/index.html
index 0b56300b12..e42f4b5f3b 100644
--- a/mode/shell/index.html
+++ b/mode/shell/index.html
@@ -62,5 +62,5 @@ <h2>Shell mode</h2>
   });
 </script>
 
-<p><strong>MIME types defined:</strong> <code>text/x-sh</code>.</p>
+<p><strong>MIME types defined:</strong> <code>text/x-sh</code>, <code>application/x-sh</code>.</p>
 </article>
diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 6af814c43e..c5619afe7c 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -135,5 +135,8 @@ CodeMirror.defineMode('shell', function() {
 });
 
 CodeMirror.defineMIME('text/x-sh', 'shell');
+// Apache uses a slightly different Media Type for Shell scripts
+// http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
+CodeMirror.defineMIME('application/x-sh', 'shell');
 
 });

From 81103a3f32220dfe4cf9027f863aa3da893ca6c2 Mon Sep 17 00:00:00 2001
From: Benjamin Young <byoung2@wiley.com>
Date: Fri, 28 Jul 2017 11:32:12 -0400
Subject: [PATCH 3426/4742] Add application/pgp-encrypted MIME type

Also .asc and .sig extensions

Re: http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
---
 mode/asciiarmor/asciiarmor.js | 1 +
 mode/asciiarmor/index.html    | 2 +-
 mode/meta.js                  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/asciiarmor/asciiarmor.js b/mode/asciiarmor/asciiarmor.js
index d830903767..fa1b0f8c61 100644
--- a/mode/asciiarmor/asciiarmor.js
+++ b/mode/asciiarmor/asciiarmor.js
@@ -68,6 +68,7 @@
   });
 
   CodeMirror.defineMIME("application/pgp", "asciiarmor");
+  CodeMirror.defineMIME("application/pgp-encrypted", "asciiarmor");
   CodeMirror.defineMIME("application/pgp-keys", "asciiarmor");
   CodeMirror.defineMIME("application/pgp-signature", "asciiarmor");
 });
diff --git a/mode/asciiarmor/index.html b/mode/asciiarmor/index.html
index 8ba1b5c76c..4d584efbcd 100644
--- a/mode/asciiarmor/index.html
+++ b/mode/asciiarmor/index.html
@@ -41,6 +41,6 @@ <h2>ASCII Armor (PGP) mode</h2>
 </script>
 
 <p><strong>MIME types
-defined:</strong> <code>application/pgp</code>, <code>application/pgp-keys</code>, <code>application/pgp-signature</code></p>
+defined:</strong> <code>application/pgp</code>, <code>application/pgp-encrypted</code>, <code>application/pgp-keys</code>, <code>application/pgp-signature</code></p>
 
 </article>
diff --git a/mode/meta.js b/mode/meta.js
index 20973ace3d..b08ff933f4 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -13,7 +13,7 @@
 
   CodeMirror.modeInfo = [
     {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
-    {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
+    {name: "PGP", mimes: ["application/pgp", "application/pgp-encrypted", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["asc", "pgp", "sig"]},
     {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
     {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
     {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},

From 902571b643c5df6b1cc8965377e5e35800ed706e Mon Sep 17 00:00:00 2001
From: Benjamin Young <byoung2@wiley.com>
Date: Fri, 28 Jul 2017 11:51:35 -0400
Subject: [PATCH 3427/4742] Add additional CoffeeScript MIMES

IANA registered application/vnd.coffeescript

Also noted the text/coffeescript option in the demo
---
 mode/coffeescript/coffeescript.js | 4 ++++
 mode/coffeescript/index.html      | 2 +-
 mode/meta.js                      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index adf2184fd7..ae955db344 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -349,6 +349,10 @@ CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
   return external;
 });
 
+// IANA registered media type
+// https://www.iana.org/assignments/media-types/
+CodeMirror.defineMIME("application/vnd.coffeescript", "coffeescript");
+
 CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
 CodeMirror.defineMIME("text/coffeescript", "coffeescript");
 
diff --git a/mode/coffeescript/index.html b/mode/coffeescript/index.html
index 93a5f4f309..92d161e9dd 100644
--- a/mode/coffeescript/index.html
+++ b/mode/coffeescript/index.html
@@ -733,7 +733,7 @@ <h2>CoffeeScript mode</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/x-coffeescript</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>application/vnd.coffeescript</code>, <code>text/coffeescript</code>, <code>text/x-coffeescript</code>.</p>
 
     <p>The CoffeeScript mode was written by Jeff Pickhardt.</p>
 
diff --git a/mode/meta.js b/mode/meta.js
index b08ff933f4..d1c42a03a7 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -25,7 +25,7 @@
     {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
     {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
     {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
-    {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
+    {name: "CoffeeScript", mimes: ["application/vnd.coffeescript", "text/coffeescript", "text/x-coffeescript"], mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
     {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
     {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
     {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},

From 910e3becbd8de199165e65e7bd1ade10937f9e0e Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sat, 29 Jul 2017 00:41:32 +0200
Subject: [PATCH 3428/4742] [python mode] Add regression test for #4876

---
 mode/python/test.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mode/python/test.js b/mode/python/test.js
index c1a9c6a990..950eed51e6 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -24,6 +24,11 @@
   MT("matmulWithSpace:", "[variable a] [operator @] [variable b]");
   MT("matmulWithoutSpace:", "[variable a][operator @][variable b]");
   MT("matmulSpaceBefore:", "[variable a] [operator @][variable b]");
+  var before_equal_sign = ["+", "-", "*", "/", "=", "!", ">", "<"];
+  for (var i = 0; i < before_equal_sign.length; ++i) {
+    var c = before_equal_sign[i]
+    MT("before_equal_sign_" + c, "[variable a] [operator " + c + "=] [variable b]");
+  }
 
   MT("fValidStringPrefix", "[string f'this is a {formatted} string']");
   MT("uValidStringPrefix", "[string u'this is an unicode string']");

From 166959fcd0f1fe8c9c58479ec3abe4e3f34ebfd8 Mon Sep 17 00:00:00 2001
From: Kazuhito Hokamura <k.hokamura@gmail.com>
Date: Mon, 31 Jul 2017 20:29:06 +0900
Subject: [PATCH 3429/4742] Fix broken links

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c0887ed5c..49290390fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,7 +50,7 @@ Calling the `Doc` constructor without `new` works again.
 
 [markdown mode](http://codemirror.net/mode/markdown/): Fix bug where markup was ignored on indented paragraph lines.
 
-[vim bindings](http://codemirror.net/mode/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
+[vim bindings](http://codemirror.net/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
 
 [rust mode](http://codemirror.net/mode/rust/): Add the correct MIME type.
 
@@ -90,7 +90,7 @@ More careful restoration of selections in widgets, during editor redraw.
 
 ### New features
 
-[vim bindings](http://codemirror.net/mode/demo/vim.html): Parse line offsets in line or range specs.
+[vim bindings](http://codemirror.net/demo/vim.html): Parse line offsets in line or range specs.
 
 ## 5.25.2 (2017-04-20)
 
@@ -148,7 +148,7 @@ Add `role=presentation` to more DOM elements to improve screen reader support.
 
 [continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Support continuing task lists.
 
-[vim bindings](http://codemirror.net/mode/demo/vim.html): Make Y behave like yy.
+[vim bindings](http://codemirror.net/demo/vim.html): Make Y behave like yy.
 
 [sql mode](http://codemirror.net/mode/sql/): Support sqlite dialect.
 
@@ -194,7 +194,7 @@ Fix bug in handling of read-only marked text.
 
 Positions now support a `sticky` property which determines whether they should be associated with the character before (value `"before"`) or after (value `"after"`) them.
 
-[vim bindings](http://codemirror.net/mode/demo/vim.html): Make it possible to remove built-in bindings through the API.
+[vim bindings](http://codemirror.net/demo/vim.html): Make it possible to remove built-in bindings through the API.
 
 [comment addon](http://codemirror.net/doc/manual.html#addon_comment): Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.
 

From 4d448b29763032739a9fc356e3bdd326a23b3cd0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 1 Aug 2017 10:15:44 +0200
Subject: [PATCH 3430/4742] Also fix vim links in releases.html

---
 doc/releases.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/releases.html b/doc/releases.html
index 86cadb1512..1c882dc310 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -63,7 +63,7 @@ <h2>Version 5.x</h2>
     <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Handle nested comments.</li>
     <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
     <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix bug where markup was ignored on indented paragraph lines.</li>
-    <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Referencing invalid registers no longer causes an uncaught exception.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Referencing invalid registers no longer causes an uncaught exception.</li>
     <li><a href="http://codemirror.net/mode/rust/">rust mode</a>: Add the correct MIME type.</li>
     <li><a href="http://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Document options.</li>
     <li>Mouse button clicks can now be bound in keymaps by using names like <code>&quot;LeftClick&quot;</code> or <code>&quot;Ctrl-Alt-MiddleTripleClick&quot;</code>. When bound to a function, that function will be passed the position of the click as second argument.</li>
@@ -79,7 +79,7 @@ <h2>Version 5.x</h2>
   <ul class="rel-note">
     <li>In textarea-mode, don't reset the input field during composition.</li>
     <li>More careful restoration of selections in widgets, during editor redraw.</li>
-    <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Parse line offsets in line or range specs.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Parse line offsets in line or range specs.</li>
     <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: More TypeScript parsing fixes.</li>
     <li><a href="http://codemirror.net/mode/julia/">julia mode</a>: Fix issue where the mode gets stuck.</li>
     <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Understand cross-line links, parse all bracketed things as links.</li>
@@ -118,7 +118,7 @@ <h2>Version 5.x</h2>
     <li><a href="http://codemirror.net/mode/soy/">soy mode</a>: Improve indentation.</li>
     <li><a href="http://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Support asynchronous linters that return promises.</li>
     <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Support continuing task lists.</li>
-    <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Make Y behave like yy.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Make Y behave like yy.</li>
     <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Support sqlite dialect.</li>
   </ul>
 
@@ -133,7 +133,7 @@ <h2>Version 5.x</h2>
 
   <ul class=rel-note>
     <li>Positions now support a <code>sticky</code> property which determines whether they should be associated with the character before (value <code>"before"</code>) or after (value <code>"after"</code>) them.</li>
-    <li><a href="http://codemirror.net/mode/demo/vim.html">vim bindings</a>: Make it possible to remove built-in bindings through the API.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Make it possible to remove built-in bindings through the API.</li>
     <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.</li>
     <li>A cursor directly before a line-wrapping break is now drawn before or after the line break depending on which direction you arrived from.</li>
     <li>Visual cursor motion in line-wrapped right-to-left text should be much more correct.</li>

From d600b9479fbd830f0b6b8710241f2f346c7f05e5 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Sun, 23 Jul 2017 14:35:41 +0200
Subject: [PATCH 3431/4742] [markdown mode] improve setext & hr tokenization

---
 mode/markdown/markdown.js | 66 +++++++++++++++++++++++++------------
 mode/markdown/test.js     | 68 +++++++++++++++++++++++++++++++++++----
 2 files changed, 108 insertions(+), 26 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index d646d884b4..59a17012da 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -90,6 +90,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
   ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
                                 ")[ \\t]*([\\w+#\-]*)")
+  ,   linkDefRE = /^\s*\[[^\]]+?\]:\s*\S+(\s*\S*\s*)?$/ // naive link-definition
   ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
   ,   expandedTab = "    " // CommonMark specifies tab as 4 spaces
 
@@ -110,6 +111,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   // Blocks
 
   function blankLine(state) {
+    state.hr = false;
     // Reset linkTitle state
     state.linkTitle = false;
     // Reset EM state
@@ -137,16 +139,18 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function blockNormal(stream, state) {
     var sol = stream.sol();
+    var prevLineLineIsEmpty = lineIsEmpty(state.prevLine);
+    var prevLineIsIndentedCode = state.indentedCode;
+    var prevLineIsHr = state.hr;
+    var prevLineIsList = state.list !== false;
+    var maxNonCodeIndentation = (state.listStack[state.listStack.length - 1] || 0) + 3;
 
-    var prevLineIsList = state.list !== false,
-        prevLineIsIndentedCode = state.indentedCode;
-
+    state.hr = false;
     state.indentedCode = false;
 
-    var lineIndentation;
+    var lineIndentation = state.indentation;
     // compute once per line (on first token)
     if (state.indentationDiff === null) {
-      lineIndentation = state.indentation;
       state.indentationDiff = state.indentation;
       if (prevLineIsList) {
         state.list = null;
@@ -168,8 +172,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
+    var isHr = (state.list === false || prevLineIsHr || prevLineLineIsEmpty) &&
+      state.indentation <= maxNonCodeIndentation && stream.match(hrRE);
+
     var match = null;
-    if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || lineIsEmpty(state.prevLine))) {
+    if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || prevLineLineIsEmpty)) {
       stream.skipToEnd();
       state.indentedCode = true;
       return tokenTypes.code;
@@ -180,23 +187,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
       return getType(state);
-    } else if (!lineIsEmpty(state.prevLine) && !state.quote && !prevLineIsList &&
-               !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
-      state.header = match[0].charAt(0) == '=' ? 1 : 2;
-      if (modeCfg.highlightFormatting) state.formatting = "header";
-      state.f = state.inline;
-      return getType(state);
     } else if (stream.eat('>')) {
       state.quote = sol ? 1 : state.quote + 1;
       if (modeCfg.highlightFormatting) state.formatting = "quote";
       stream.eatSpace();
       return getType(state);
-    } else if (stream.peek() === '[') {
-      return switchInline(stream, state, footnoteLink);
-    } else if (stream.match(hrRE, true)) {
-      state.hr = true;
-      return tokenTypes.hr;
-    } else if (!state.quote && (match = stream.match(listRE))) {
+    } else if (!isHr && !state.quote && (match = stream.match(listRE))) {
       var listType = match[1] ? "ol" : "ul";
 
       state.indentation = lineIndentation + stream.current().length;
@@ -220,6 +216,35 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
       state.code = -1
       return getType(state);
+    // SETEXT has lowest block-scope precedence after HR, so check it after
+    //  the others (code, blockquote, list...)
+    } else if (
+      // if setext set, indicates line after ---/===
+      state.setext || (
+        // line before ---/===
+        !state.quote && state.list === false && !state.code && !isHr &&
+        !prevLineIsList && !linkDefRE.test(stream.string) &&
+        (match = stream.lookAhead(1)) && (match = match.match(setextHeaderRE))
+      )
+    ) {
+      if ( !state.setext ) {
+        state.header = match[0].charAt(0) == '=' ? 1 : 2;
+        state.setext = state.header;
+      } else {
+        state.header = state.setext;
+        // has no effect on type so we can reset it now
+        state.setext = 0;
+        stream.skipToEnd();
+        if (modeCfg.highlightFormatting) state.formatting = "header";
+      }
+      state.f = state.inline;
+      return getType(state);
+    } else if (isHr) {
+      stream.skipToEnd();
+      state.hr = true;
+      return tokenTypes.hr;
+    } else if (stream.peek() === '[') {
+      return switchInline(stream, state, footnoteLink);
     }
 
     return switchInline(stream, state, state.inline);
@@ -703,6 +728,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         em: false,
         strong: false,
         header: 0,
+        setext: 0,
         hr: false,
         taskList: false,
         list: false,
@@ -741,6 +767,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         strikethrough: s.strikethrough,
         emoji: s.emoji,
         header: s.header,
+        setext: s.setext,
         hr: s.hr,
         taskList: s.taskList,
         list: s.list,
@@ -760,9 +787,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.formatting = false;
 
       if (stream != state.thisLine) {
-        // Reset state.header and state.hr
+        // Reset state.header
         state.header = 0;
-        state.hr = false;
 
         if (stream.match(/^\s*$/, true)) {
           blankLine(state);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index c2ac548305..c2c9fb1120 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -67,7 +67,7 @@
      "[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",
+     "[header&header-1 foo]",
      "[header&header-1&formatting&formatting-header&formatting-header-1 =]");
 
   FT("formatting_blockquote",
@@ -237,27 +237,27 @@
   //
   // Check if single underlining = works
   MT("setextH1",
-     "foo",
+     "[header&header-1 foo]",
      "[header&header-1 =]");
 
   // Check if 3+ ='s work
   MT("setextH1",
-     "foo",
+     "[header&header-1 foo]",
      "[header&header-1 ===]");
 
   // Check if single underlining - works
   MT("setextH2",
-     "foo",
+     "[header&header-2 foo]",
      "[header&header-2 -]");
 
   // Check if 3+ -'s work
   MT("setextH2",
-     "foo",
+     "[header&header-2 foo]",
      "[header&header-2 ---]");
 
   // http://spec.commonmark.org/0.19/#example-45
   MT("setextH2AllowSpaces",
-     "foo",
+     "[header&header-2 foo]",
      "   [header&header-2 ----      ]");
 
   // http://spec.commonmark.org/0.19/#example-44
@@ -265,15 +265,50 @@
      "     [comment foo]",
      "[hr ---]");
 
+  MT("setextAfterFencedCode",
+     "[comment ```]",
+     "[comment foo]",
+     "[comment ```]",
+     "[header&header-2 bar]",
+     "[header&header-2 ---]");
+
+  MT("setextAferATX",
+     "[header&header-1 # foo]",
+     "[header&header-2 bar]",
+     "[header&header-2 ---]");
+
   // http://spec.commonmark.org/0.19/#example-51
   MT("noSetextAfterQuote",
      "[quote&quote-1 > foo]",
+     "[hr ---]",
+     "",
+     "[quote&quote-1 > foo]",
+     "[quote&quote-1 bar]",
      "[hr ---]");
 
   MT("noSetextAfterList",
      "[variable-2 - foo]",
+     "[hr ---]",
+     "",
+     "[variable-2 - foo]",
+     "bar",
+     "[hr ---]");
+
+  MT("setext_nestedInlineMarkup",
+     "[header&header-1 foo ][em&header&header-1 *bar*]",
+     "[header&header-1 =]");
+
+  MT("setext_linkDef",
+     "[link [[aaa]]:] [string&url http://google.com 'title']",
      "[hr ---]");
 
+  // currently, looks max one line ahead, thus won't catch valid CommonMark
+  //  markup
+  MT("setext_oneLineLookahead",
+     "foo",
+     "[header&header-1 bar]",
+     "[header&header-1 =]");
+
   // Single-line blockquote with trailing space
   MT("blockquoteSpace",
      "[quote&quote-1 > foo]");
@@ -394,6 +429,27 @@
      "[variable-2 - foo]",
      "[hr -----]");
 
+  MT("hrAfterFencedCode",
+     "[comment ```]",
+     "[comment code]",
+     "[comment ```]",
+     "[hr ---]");
+
+  // allow hr inside lists
+  // (require prev line to be empty or hr, TODO: non-CommonMark-compliant)
+  MT("hrInsideList",
+     "[variable-2 - foo]",
+     "",
+     "  [hr ---]",
+     "     [hr ---]",
+     "",
+     "      [comment ---]");
+
+  MT("consecutiveHr",
+     "[hr ---]",
+     "[hr ---]",
+     "[hr ---]");
+
   // Formatting in lists (*)
   MT("listAsteriskFormatting",
      "[variable-2 * ][variable-2&em *foo*][variable-2  bar]",

From 29fb2806bede834341dd8ea2b601084c31a35880 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Mon, 31 Jul 2017 19:22:35 +0200
Subject: [PATCH 3432/4742] [markdown mode] improve header, list & fencedCode
 behavior around blockquote & indentation

---
 mode/markdown/markdown.js | 10 +++++++---
 mode/markdown/test.js     | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 59a17012da..d7f225f82f 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -139,6 +139,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function blockNormal(stream, state) {
     var sol = stream.sol();
+    var firstTokenOnLine = stream.column() === state.indentation;
     var prevLineLineIsEmpty = lineIsEmpty(state.prevLine);
     var prevLineIsIndentedCode = state.indentedCode;
     var prevLineIsHr = state.hr;
@@ -182,7 +183,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return tokenTypes.code;
     } else if (stream.eatSpace()) {
       return null;
-    } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
+    } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
+      state.quote = 0;
       state.header = match[1].length;
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
@@ -192,11 +194,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (modeCfg.highlightFormatting) state.formatting = "quote";
       stream.eatSpace();
       return getType(state);
-    } else if (!isHr && !state.quote && (match = stream.match(listRE))) {
+    } else if (!isHr && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(listRE))) {
       var listType = match[1] ? "ol" : "ul";
 
       state.indentation = lineIndentation + stream.current().length;
       state.list = true;
+      state.quote = 0;
 
       // Add this list item's content's indentation to the stack
       state.listStack.push(state.indentation);
@@ -207,7 +210,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = state.inline;
       if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
       return getType(state);
-    } else if (modeCfg.fencedCodeBlocks && !state.quote && (match = stream.match(fencedCodeRE, true))) {
+    } else if (modeCfg.fencedCodeBlocks && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(fencedCodeRE, true))) {
+      state.quote = 0;
       state.fencedChars = match[1]
       // try switching mode
       state.localMode = getMode(match[2]);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index c2c9fb1120..d01b07300a 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -228,6 +228,19 @@
   MT("atxH1inline",
      "[header&header-1 # foo ][header&header-1&em *bar*]");
 
+  MT("atxIndentedTooMuch",
+     "[header&header-1 # foo]",
+     "    # bar");
+
+  // disable atx inside blockquote until we implement proper blockquote inner mode
+  // TODO: fix to be CommonMark-compliant
+  MT("atxNestedInsideBlockquote",
+     "[quote&quote-1 > # foo]");
+
+  MT("atxAfterBlockquote",
+     "[quote&quote-1 > foo]",
+     "[header&header-1 # bar]");
+
   // Setext headers - H1, H2
   // Per documentation, "Any number of underlining =’s or -’s will work."
   // http://daringfireball.net/projects/markdown/syntax#header
@@ -588,6 +601,19 @@
      "",
      "\t\t[variable-3 part of list2]");
 
+  MT("listAfterBlockquote",
+     "[quote&quote-1 > foo]",
+     "[variable-2 - bar]");
+
+  // shouldn't create sublist if it's indented more than allowed
+  MT("nestedListIndentedTooMuch",
+     "[variable-2 - foo]",
+     "          [variable-2 - bar]");
+
+  MT("listIndentedTooMuchAfterParagraph",
+     "foo",
+     "    - bar");
+
   // Blockquote
   MT("blockquote",
      "[variable-2 * foo]",
@@ -1096,6 +1122,19 @@
      "[comment ~~~]",
      "bar");
 
+  FencedTest("fencedCodeBlocksAfterBlockquote",
+     "[quote&quote-1 > foo]",
+     "[comment ```]",
+     "[comment bar]",
+     "[comment ```]");
+
+  // fencedCode indented too much should act as simple indentedCode
+  //  (hence has no highlight formatting)
+  FT("tooMuchIndentedFencedCode",
+     "    [comment ```]",
+     "    [comment code]",
+     "    [comment ```]");
+
   // Tests that require XML mode
 
   MT("xmlMode",

From 170885a12d2a41aa46229b3f6101449355576cc0 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Mon, 31 Jul 2017 19:45:32 +0200
Subject: [PATCH 3433/4742] [markdown mode] auto-terminate fencedCode after
 exiting list

---
 mode/markdown/markdown.js |  7 +++++--
 mode/markdown/test.js     | 10 ++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index d7f225f82f..6082eab8b2 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -270,14 +270,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function local(stream, state) {
-    if (state.fencedChars && stream.match(state.fencedChars)) {
+    var hasExitedList = state.indentation < state.listStack[state.listStack.length - 1];
+    if (state.fencedChars && (hasExitedList || stream.match(state.fencedChars))) {
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
-      var returnType = getType(state)
+      var returnType;
+      if (!hasExitedList) returnType = getType(state)
       state.localMode = state.localState = null;
       state.block = blockNormal;
       state.f = inlineNormal;
       state.fencedChars = null;
       state.code = 0
+      if (hasExitedList) return switchBlock(stream, state, state.block);
       return returnType;
     } else if (state.fencedChars && stream.skipTo(state.fencedChars)) {
       return "comment"
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index d01b07300a..e9025882f9 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -1135,6 +1135,16 @@
      "    [comment code]",
      "    [comment ```]");
 
+  FencedTest("autoTerminateFencedCodeWhenLeavingList",
+     "[variable-2 - list1]",
+     "  [variable-3 - list2]",
+     "    [variable-3&comment ```]",
+     "    [comment code]",
+     "  [variable-3 - list2]",
+     "  [variable-2&comment ```]",
+     "  [comment code]",
+     "[quote&quote-1 > foo]");
+
   // Tests that require XML mode
 
   MT("xmlMode",

From c81346e2c235961292ca5a7e797ee3e9e5fcf7a3 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Mon, 31 Jul 2017 19:55:02 +0200
Subject: [PATCH 3434/4742] [markdown mode] improve blockquote indentation
 behavior

---
 mode/markdown/markdown.js |  5 ++---
 mode/markdown/test.js     | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 6082eab8b2..0692f7eac3 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -138,7 +138,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function blockNormal(stream, state) {
-    var sol = stream.sol();
     var firstTokenOnLine = stream.column() === state.indentation;
     var prevLineLineIsEmpty = lineIsEmpty(state.prevLine);
     var prevLineIsIndentedCode = state.indentedCode;
@@ -189,8 +188,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
       return getType(state);
-    } else if (stream.eat('>')) {
-      state.quote = sol ? 1 : state.quote + 1;
+    } else if (state.indentation <= maxNonCodeIndentation && stream.eat('>')) {
+      state.quote = firstTokenOnLine ? 1 : state.quote + 1;
       if (modeCfg.highlightFormatting) state.formatting = "quote";
       stream.eatSpace();
       return getType(state);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index e9025882f9..21829afbd0 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -335,12 +335,22 @@
      "foo",
      "[quote&quote-1 > bar]");
 
-  // Nested blockquote
-  MT("blockquoteSpace",
+  MT("blockquoteNested",
      "[quote&quote-1 > foo]",
      "[quote&quote-1 >][quote&quote-2 > foo]",
      "[quote&quote-1 >][quote&quote-2 >][quote&quote-3 > foo]");
 
+  // ensure quote-level is inferred correctly even if indented
+  MT("blockquoteNestedIndented",
+     " [quote&quote-1 > foo]",
+     " [quote&quote-1 >][quote&quote-2 > foo]",
+     " [quote&quote-1 >][quote&quote-2 >][quote&quote-3 > foo]");
+
+  // ensure quote-level is inferred correctly even if indented
+  MT("blockquoteIndentedTooMuch",
+     "foo",
+     "    > bar");
+
   // Single-line blockquote followed by normal paragraph
   MT("blockquoteThenParagraph",
      "[quote&quote-1 >foo]",

From f8b9eeca8f0e90e8a8e8627796f60b4c8bec7954 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Tue, 1 Aug 2017 20:10:00 +0200
Subject: [PATCH 3435/4742] [markdown mode] support fencedCodeBlocks in base
 markdown as per CommonMark

---
 mode/gfm/gfm.js           |  1 -
 mode/gfm/test.js          | 46 -----------------------------------
 mode/markdown/index.html  | 50 +++++++++++++++++++++++----------------
 mode/markdown/markdown.js | 10 ++------
 mode/markdown/test.js     | 45 ++++++++++++++++++++++-------------
 5 files changed, 61 insertions(+), 91 deletions(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index aac04812d8..689cd6e2ec 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -114,7 +114,6 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
 
   var markdownConfig = {
     taskLists: true,
-    fencedCodeBlocks: '```',
     strikethrough: true,
     emoji: true
   };
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 5c8b0332ac..9cda5c45a3 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -14,11 +14,6 @@
   FT("doubleBackticks",
      "[comment&formatting&formatting-code ``][comment foo ` bar][comment&formatting&formatting-code ``]");
 
-  FT("codeBlock",
-     "[comment&formatting&formatting-code-block ```css]",
-     "[tag foo]",
-     "[comment&formatting&formatting-code-block ```]");
-
   FT("taskList",
      "[variable-2&formatting&formatting-list&formatting-list-ul - ][meta&formatting&formatting-task [ ]]][variable-2  foo]",
      "[variable-2&formatting&formatting-list&formatting-list-ul - ][property&formatting&formatting-task [x]]][variable-2  foo]");
@@ -41,31 +36,6 @@
   MT("emStrongUnderscore",
      "[em&strong ___foo___] bar");
 
-  MT("fencedCodeBlocks",
-     "[comment ```]",
-     "[comment foo]",
-     "",
-     "[comment ```]",
-     "bar");
-
-  MT("fencedCodeBlockModeSwitching",
-     "[comment ```javascript]",
-     "[variable foo]",
-     "",
-     "[comment ```]",
-     "bar");
-
-  MT("fencedCodeBlockModeSwitchingObjc",
-     "[comment ```objective-c]",
-     "[keyword @property] [variable NSString] [operator *] [variable foo];",
-     "[comment ```]",
-     "bar");
-
-  MT("fencedCodeBlocksNoTildes",
-     "~~~",
-     "foo",
-     "~~~");
-
   MT("taskListAsterisk",
      "[variable-2 * ][link&variable-2 [[]]][variable-2 foo]", // Invalid; must have space or x between []
      "[variable-2 * ][link&variable-2 [[ ]]][variable-2 bar]", // Invalid; must have space after ]
@@ -166,11 +136,6 @@
   MT("notALink",
      "foo asfd:asdf bar");
 
-  MT("notALink",
-     "[comment ```css]",
-     "[tag foo] {[property color]:[keyword black];}",
-     "[comment ```][link http://www.example.com/]");
-
   MT("notALink",
      "[comment ``foo `bar` http://www.example.com/``] hello");
 
@@ -181,17 +146,6 @@
      "",
      "[link http://www.example.com/]");
 
-  MT("headerCodeBlockGithub",
-     "[header&header-1 # heading]",
-     "",
-     "[comment ```]",
-     "[comment code]",
-     "[comment ```]",
-     "",
-     "Commit: [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2]",
-     "Issue: [link #1]",
-     "Link: [link http://www.example.com/]");
-
   MT("strikethrough",
      "[strikethrough ~~foo~~]");
 
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 15660c2618..77f56ab200 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -87,7 +87,7 @@ <h2>Markdown mode</h2>
 
     A First Level Header
     ====================
-    
+
     A Second Level Header
     ---------------------
 
@@ -97,11 +97,11 @@ <h2>Markdown mode</h2>
 
     The quick brown fox jumped over the lazy
     dog's back.
-    
+
     ### Header 3
 
     &gt; This is a blockquote.
-    &gt; 
+    &gt;
     &gt; This is the second paragraph in the blockquote.
     &gt;
     &gt; ## This is an H2 in a blockquote
@@ -110,23 +110,23 @@ <h2>Markdown mode</h2>
 Output:
 
     &lt;h1&gt;A First Level Header&lt;/h1&gt;
-    
+
     &lt;h2&gt;A Second Level Header&lt;/h2&gt;
-    
+
     &lt;p&gt;Now is the time for all good men to come to
     the aid of their country. This is just a
     regular paragraph.&lt;/p&gt;
-    
+
     &lt;p&gt;The quick brown fox jumped over the lazy
     dog's back.&lt;/p&gt;
-    
+
     &lt;h3&gt;Header 3&lt;/h3&gt;
-    
+
     &lt;blockquote&gt;
         &lt;p&gt;This is a blockquote.&lt;/p&gt;
-        
+
         &lt;p&gt;This is the second paragraph in the blockquote.&lt;/p&gt;
-        
+
         &lt;h2&gt;This is an H2 in a blockquote&lt;/h2&gt;
     &lt;/blockquote&gt;
 
@@ -140,7 +140,7 @@ <h2>Markdown mode</h2>
 
     Some of these words *are emphasized*.
     Some of these words _are emphasized also_.
-    
+
     Use two asterisks for **strong emphasis**.
     Or, if you prefer, __use two underscores instead__.
 
@@ -148,10 +148,10 @@ <h2>Markdown mode</h2>
 
     &lt;p&gt;Some of these words &lt;em&gt;are emphasized&lt;/em&gt;.
     Some of these words &lt;em&gt;are emphasized also&lt;/em&gt;.&lt;/p&gt;
-    
+
     &lt;p&gt;Use two asterisks for &lt;strong&gt;strong emphasis&lt;/strong&gt;.
     Or, if you prefer, &lt;strong&gt;use two underscores instead&lt;/strong&gt;.&lt;/p&gt;
-   
+
 
 
 ## Lists ##
@@ -204,7 +204,7 @@ <h2>Markdown mode</h2>
 the paragraphs by 4 spaces or 1 tab:
 
     *   A list item.
-    
+
         With multiple paragraphs.
 
     *   Another item in the list.
@@ -216,7 +216,7 @@ <h2>Markdown mode</h2>
     &lt;p&gt;With multiple paragraphs.&lt;/p&gt;&lt;/li&gt;
     &lt;li&gt;&lt;p&gt;Another item in the list.&lt;/p&gt;&lt;/li&gt;
     &lt;/ul&gt;
-    
+
 
 
 ### Links ###
@@ -311,7 +311,7 @@ <h2>Markdown mode</h2>
 
     &lt;p&gt;I strongly recommend against using any
     &lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
-    
+
     &lt;p&gt;I wish SmartyPants used named entities like
     &lt;code&gt;&amp;amp;mdash;&lt;/code&gt; instead of decimal-encoded
     entites like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
@@ -334,11 +334,20 @@ <h2>Markdown mode</h2>
 
     &lt;p&gt;If you want your page to validate under XHTML 1.0 Strict,
     you've got to put paragraph tags in your blockquotes:&lt;/p&gt;
-    
+
     &lt;pre&gt;&lt;code&gt;&amp;lt;blockquote&amp;gt;
         &amp;lt;p&amp;gt;For example.&amp;lt;/p&amp;gt;
     &amp;lt;/blockquote&amp;gt;
     &lt;/code&gt;&lt;/pre&gt;
+
+## Fenced code blocks (and syntax highlighting)
+
+```javascript
+for (var i = 0; i < items.length; i++) {
+    console.log(items[i], i); // log them
+}
+```
+
 </textarea></form>
 
     <script>
@@ -350,10 +359,11 @@ <h2>Markdown mode</h2>
       });
     </script>
 
-    <p>You might want to use the <a href="../gfm/index.html">Github-Flavored Markdown mode</a> instead, which adds support for fenced code blocks and a few other things.</p>
+    <p>If you also want support <code>strikethrough</code>, <code>emoji</code> and few other goodies, check out <a href="../gfm/index.html">Github-Flavored Markdown mode</a>.</p>
+
+    <p>Optionally depends on other modes for properly highlighted code blocks,
+      and XML mode for properly highlighted inline XML blocks.</p>
 
-    <p>Optionally depends on the XML mode for properly highlighted inline XML blocks.</p>
-    
     <p><strong>MIME types defined:</strong> <code>text/x-markdown</code>.</p>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#markdown_*">normal</a>,  <a href="../../test/index.html#verbose,markdown_*">verbose</a>.</p>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 0692f7eac3..beb29dd1e6 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -35,11 +35,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.maxBlockquoteDepth === undefined)
     modeCfg.maxBlockquoteDepth = 0;
 
-  // Use `fencedCodeBlocks` to configure fenced code blocks. false to
-  // disable, string to specify a precise regexp that the fence should
-  // match, and true to allow three or more backticks or tildes (as
-  // per CommonMark).
-
   // Turn on task lists? ("- [ ] " and "- [x] ")
   if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
 
@@ -88,8 +83,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
-  ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
-                                ")[ \\t]*([\\w+#\-]*)")
+  ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)/
   ,   linkDefRE = /^\s*\[[^\]]+?\]:\s*\S+(\s*\S*\s*)?$/ // naive link-definition
   ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
   ,   expandedTab = "    " // CommonMark specifies tab as 4 spaces
@@ -209,7 +203,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.f = state.inline;
       if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
       return getType(state);
-    } else if (modeCfg.fencedCodeBlocks && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(fencedCodeRE, true))) {
+    } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(fencedCodeRE, true))) {
       state.quote = 0;
       state.fencedChars = match[1]
       // try switching mode
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 21829afbd0..eb9d856abe 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -9,8 +9,6 @@
   function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
   var modeAtxNoSpace = CodeMirror.getMode(config, {name: "markdown", allowAtxHeaderWithoutSpace: true});
   function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); }
-  var modeFenced = CodeMirror.getMode(config, {name: "markdown", fencedCodeBlocks: true});
-  function FencedTest(name) { test.mode(name, modeFenced, Array.prototype.slice.call(arguments, 1)); }
   var modeOverrideClasses = CodeMirror.getMode(config, {
     name: "markdown",
     strikethrough: true,
@@ -97,6 +95,11 @@
   FT("formatting_image",
      "[formatting&formatting-image&image&image-marker !][formatting&formatting-image&image&image-alt-text&link [[][image&image-alt-text&link alt text][formatting&formatting-image&image&image-alt-text&link ]]][formatting&formatting-link-string&string&url (][url&string http://link.to/image.jpg][formatting&formatting-link-string&string&url )]");
 
+  FT("codeBlock",
+     "[comment&formatting&formatting-code-block ```css]",
+     "[tag foo]",
+     "[comment&formatting&formatting-code-block ```]");
+
   MT("plainText",
      "foo");
 
@@ -587,7 +590,7 @@
      "  [variable-2 de-indented text part of list1 again]",
      "",
      "  [variable-2&comment ```]",
-     "  [variable-2&comment code]",
+     "  [comment code]",
      "  [variable-2&comment ```]",
      "",
      "  [variable-2 text after fenced code]");
@@ -1085,18 +1088,28 @@
   MT("taskList",
      "[variable-2 * ][link&variable-2 [[ ]]][variable-2 bar]");
 
-  MT("noFencedCodeBlocks",
-     "~~~",
-     "foo",
-     "~~~");
-
-  FencedTest("fencedCodeBlocks",
+  MT("fencedCodeBlocks",
      "[comment ```]",
      "[comment foo]",
+     "",
+     "[comment bar]",
+     "[comment ```]",
+     "baz");
+
+  MT("fencedCodeBlockModeSwitching",
+     "[comment ```javascript]",
+     "[variable foo]",
+     "",
+     "[comment ```]",
+     "bar");
+
+  MT("fencedCodeBlockModeSwitchingObjc",
+     "[comment ```objective-c]",
+     "[keyword @property] [variable NSString] [operator *] [variable foo];",
      "[comment ```]",
      "bar");
 
-  FencedTest("fencedCodeBlocksMultipleChars",
+  MT("fencedCodeBlocksMultipleChars",
      "[comment `````]",
      "[comment foo]",
      "[comment ```]",
@@ -1104,20 +1117,20 @@
      "[comment `````]",
      "bar");
 
-  FencedTest("fencedCodeBlocksTildes",
+  MT("fencedCodeBlocksTildes",
      "[comment ~~~]",
      "[comment foo]",
      "[comment ~~~]",
      "bar");
 
-  FencedTest("fencedCodeBlocksTildesMultipleChars",
+  MT("fencedCodeBlocksTildesMultipleChars",
      "[comment ~~~~~]",
      "[comment ~~~]",
      "[comment foo]",
      "[comment ~~~~~]",
      "bar");
 
-  FencedTest("fencedCodeBlocksMultipleChars",
+  MT("fencedCodeBlocksMultipleChars",
      "[comment `````]",
      "[comment foo]",
      "[comment ```]",
@@ -1125,14 +1138,14 @@
      "[comment `````]",
      "bar");
 
-  FencedTest("fencedCodeBlocksMixed",
+  MT("fencedCodeBlocksMixed",
      "[comment ~~~]",
      "[comment ```]",
      "[comment foo]",
      "[comment ~~~]",
      "bar");
 
-  FencedTest("fencedCodeBlocksAfterBlockquote",
+  MT("fencedCodeBlocksAfterBlockquote",
      "[quote&quote-1 > foo]",
      "[comment ```]",
      "[comment bar]",
@@ -1145,7 +1158,7 @@
      "    [comment code]",
      "    [comment ```]");
 
-  FencedTest("autoTerminateFencedCodeWhenLeavingList",
+  MT("autoTerminateFencedCodeWhenLeavingList",
      "[variable-2 - list1]",
      "  [variable-3 - list2]",
      "    [variable-3&comment ```]",

From eb2cdcfa145660092d731ebcb6ceac58fb97869d Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Tue, 1 Aug 2017 23:45:31 +0200
Subject: [PATCH 3436/4742] [markdown mode] allow to disable xml and
 fencedCodeBlock highlighting

---
 mode/markdown/markdown.js | 12 +++++++++---
 mode/markdown/test.js     | 12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index beb29dd1e6..58f1dff8aa 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -45,6 +45,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.emoji === undefined)
     modeCfg.emoji = false;
 
+  if (modeCfg.fencedCodeBlockHighlighting === undefined)
+    modeCfg.fencedCodeBlockHighlighting = true;
+
+  if (modeCfg.xml === undefined)
+    modeCfg.xml = true;
+
   // Allow token types to be overridden by user-provided token types.
   if (modeCfg.tokenTypeOverrides === undefined)
     modeCfg.tokenTypeOverrides = {};
@@ -207,7 +213,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.quote = 0;
       state.fencedChars = match[1]
       // try switching mode
-      state.localMode = getMode(match[2]);
+      state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2]);
       if (state.localMode) state.localState = CodeMirror.startState(state.localMode);
       state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
@@ -510,7 +516,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return type + tokenTypes.linkEmail;
     }
 
-    if (ch === '<' && stream.match(/^(!--|[a-z]+(?:\s+[a-z_:.\-]+(?:\s*=\s*[^ >]+)?)*\s*>)/i, false)) {
+    if (modeCfg.xml && ch === '<' && stream.match(/^(!--|[a-z]+(?:\s+[a-z_:.\-]+(?:\s*=\s*[^ >]+)?)*\s*>)/i, false)) {
       var end = stream.string.indexOf(">", stream.pos);
       if (end != -1) {
         var atts = stream.string.substring(stream.start, end);
@@ -521,7 +527,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return switchBlock(stream, state, htmlBlock);
     }
 
-    if (ch === '<' && stream.match(/^\/\w*?>/)) {
+    if (modeCfg.xml && ch === '<' && stream.match(/^\/\w*?>/)) {
       state.md_inside = false;
       return "tag";
     } else if (ch === "*" || ch === "_") {
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index eb9d856abe..86935c9587 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -7,6 +7,10 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
   var modeHighlightFormatting = CodeMirror.getMode(config, {name: "markdown", highlightFormatting: true});
   function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
+  var modeMT_noXml = CodeMirror.getMode(config, {name: "markdown", xml: false});
+  function MT_noXml(name) { test.mode(name, modeMT_noXml, Array.prototype.slice.call(arguments, 1)); }
+  var modeMT_noFencedHighlight = CodeMirror.getMode(config, {name: "markdown", fencedCodeBlockHighlighting: false});
+  function MT_noFencedHighlight(name) { test.mode(name, modeMT_noFencedHighlight, Array.prototype.slice.call(arguments, 1)); }
   var modeAtxNoSpace = CodeMirror.getMode(config, {name: "markdown", allowAtxHeaderWithoutSpace: true});
   function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); }
   var modeOverrideClasses = CodeMirror.getMode(config, {
@@ -1103,6 +1107,11 @@
      "[comment ```]",
      "bar");
 
+  MT_noFencedHighlight("fencedCodeBlock_noHighlight",
+     "[comment ```javascript]",
+     "[comment foo]",
+     "[comment ```]");
+
   MT("fencedCodeBlockModeSwitchingObjc",
      "[comment ```objective-c]",
      "[keyword @property] [variable NSString] [operator *] [variable foo];",
@@ -1186,4 +1195,7 @@
      "[tag&bracket <][tag div][tag&bracket >]",
      "[tag&bracket </][tag div][tag&bracket >]");
 
+  MT_noXml("xmlHighlightDisabled",
+     "<div>foo</div>");
+
 })();

From ab83c3c80fb19333da876ed0a5eed76675324c33 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Tue, 1 Aug 2017 23:48:14 +0200
Subject: [PATCH 3437/4742] [markdown mode] update doc with available options

---
 mode/gfm/index.html      | 28 ++++++++++++++++++++++++++++
 mode/markdown/index.html | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index bec130ca51..ea4bac15fe 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -103,6 +103,34 @@ <h2>GFM mode</h2>
 
     <p>Optionally depends on other modes for properly highlighted code blocks.</p>
 
+    <p>Gfm mode supports these options (apart those from base Markdown mode):</p>
+    <ul>
+      <li>
+        <d1>
+          <dt><code>gitHubSpice: boolean</code></dt>
+          <dd>Hashes, issues... (default: <code>true</code>).</dd>
+        </d1>
+      </li>
+      <li>
+        <d1>
+          <dt><code>taskLists: boolean</code></dt>
+          <dd><code>- [ ]</code> syntax (default: <code>true</code>).</dd>
+        </d1>
+      </li>
+      <li>
+        <d1>
+          <dt><code>strikethrough: boolean</code></dt>
+          <dd><code>~~foo~~</code> syntax (default: <code>true</code>).</dd>
+        </d1>
+      </li>
+      <li>
+        <d1>
+          <dt><code>emoji: boolean</code></dt>
+          <dd><code>:emoji:</code> syntax (default: <code>true</code>).</dd>
+        </d1>
+      </li>
+    </ul>
+
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#gfm_*">normal</a>,  <a href="../../test/index.html#verbose,gfm_*">verbose</a>.</p>
 
   </article>
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 77f56ab200..abb379f61a 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -364,6 +364,40 @@ <h2>Markdown mode</h2>
     <p>Optionally depends on other modes for properly highlighted code blocks,
       and XML mode for properly highlighted inline XML blocks.</p>
 
+    <p>Markdown mode supports these options:</p>
+    <ul>
+      <li>
+        <d1>
+          <dt><code>highlightFormatting: boolean</code></dt>
+          <dd>Whether to separately highlight markdown meta characterts (<code>*[]()</code>etc.) (default: <code>false</code>).</dd>
+        </d1>
+      </li>
+      <li>
+        <d1>
+          <dt><code>maxBlockquoteDepth: boolean</code></dt>
+          <dd>Maximum allowed blockquote nesting (default: <code>0</code> - infinite nesting).</dd>
+        </d1>
+      </li>
+      <li>
+        <d1>
+          <dt><code>xml: boolean</code></dt>
+          <dd>Whether to highlight inline XML (default: <code>true</code>).</dd>
+        </d1>
+      </li>
+      <li>
+        <d1>
+          <dt><code>fencedCodeBlockHighlighting: boolean</code></dt>
+          <dd>Whether to syntax-highlight fenced code blocks, if given mode is included (default: <code>true</code>).</dd>
+        </d1>
+      </li>
+      <li>
+        <d1>
+          <dt><code>tokenTypeOverrides: Object</code></dt>
+          <dd>When you want ot override default token type names (e.g. <code>{code: "code"}</code>).</dd>
+        </d1>
+      </li>
+    </ul>
+
     <p><strong>MIME types defined:</strong> <code>text/x-markdown</code>.</p>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#markdown_*">normal</a>,  <a href="../../test/index.html#verbose,markdown_*">verbose</a>.</p>

From f80468537d4c96907bd6489f2ffcb132a90e8056 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 2 Aug 2017 13:25:30 +0200
Subject: [PATCH 3438/4742] Properly call marker.find when scanning DOM text

Issue #4889
---
 src/input/ContentEditableInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index d103d2d08f..67de3b1836 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -420,7 +420,7 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
       let markerID = node.getAttribute("cm-marker"), range
       if (markerID) {
         let found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID))
-        if (found.length && (range = found[0].find()))
+        if (found.length && (range = found[0].find(0)))
           addText(getBetween(cm.doc, range.from, range.to).join(lineSep))
         return
       }

From 4c3d3c79a40fce2b38b4b507d3d0e944b56db9ff Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 3 Aug 2017 10:58:36 +0200
Subject: [PATCH 3439/4742] Copy over origin when splitting change for
 read-only spans

---
 src/model/changes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/changes.js b/src/model/changes.js
index 214e0231ab..308dc6b399 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -60,7 +60,7 @@ export function makeChange(doc, change, ignoreReadOnly) {
   let split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to)
   if (split) {
     for (let i = split.length - 1; i >= 0; --i)
-      makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text})
+      makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text, origin: change.origin})
   } else {
     makeChangeInner(doc, change)
   }

From 6e44a5118f105268f7f8979845b1d5269f46c472 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 4 Aug 2017 08:41:29 +0200
Subject: [PATCH 3440/4742] [css mode] Don't feed comment tokens to the state
 machine

Closes #4892
---
 mode/css/css.js  | 3 ++-
 mode/css/test.js | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 056c48e680..bfe11d3b05 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -383,7 +383,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         style = style[0];
       }
       override = style;
-      state.state = states[state.state](type, stream, state);
+      if (type != "comment")
+        state.state = states[state.state](type, stream, state);
       return override;
     },
 
diff --git a/mode/css/test.js b/mode/css/test.js
index 7a496fb091..6fc6e33ca5 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -197,4 +197,10 @@
 
    MT("counter-style-symbols",
       "[tag ol] { [property list-style]: [atom symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
+
+  MT("comment-does-not-disrupt",
+     "[def @font-face] [comment /* foo */] {",
+     "  [property src]: [atom url]([string x]);",
+     "  [property font-family]: [variable One];",
+     "}")
 })();

From d02b119870a82cfe1aa1bf7ade17d35fae3653d7 Mon Sep 17 00:00:00 2001
From: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
Date: Thu, 3 Aug 2017 19:10:56 +0200
Subject: [PATCH 3441/4742] [verilog mode] add .sv and .svh extensions

Signed-off-by: Yvonnick Esnault <yvonnick.esnault@corp.ovh.com>
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index d1c42a03a7..c49bd6c737 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -137,7 +137,7 @@
     {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
     {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
-    {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
+    {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v", "sv", "svh"]},
     {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
     {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
     {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},

From 2fcce279de70ed80f2c682f16ca1151f0e0e3886 Mon Sep 17 00:00:00 2001
From: Moshe Wajnberg <wajnberg@il.ibm.com>
Date: Sun, 6 Aug 2017 16:31:26 +0300
Subject: [PATCH 3442/4742] Fix(bidi): Fix for bug
 /codemirror/CodeMirror/issues/4897

Fix for bug https://github.com/codemirror/CodeMirror/issues/4897
---
 demo/bidi.html     | 12 ++++++++++++
 lib/codemirror.css |  1 +
 2 files changed, 13 insertions(+)

diff --git a/demo/bidi.html b/demo/bidi.html
index ceaffd32e6..645e648c86 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -60,6 +60,11 @@ <h2>Bi-directional Text Demo</h2>
     <input type="radio" id="ltr" name="direction"/><label for="ltr">LTR</label>
     <input type="radio" id="rtl" name="direction"/><label for="rtl">RTL</label>
   </fieldset>
+  <fieldset>
+    HTML document direction:
+    <input type="radio" id="htmlltr" name="htmldirection"/><label for="htmlltr">LTR</label>
+    <input type="radio" id="htmlrtl" name="htmldirection"/><label for="htmlrtl">RTL</label>
+  </fieldset>
   <fieldset>
     <input type="checkbox" id="rtlMoveVisually"/><label for="rtlMoveVisually">Use visual order for arrow key movement.</label>
   </fieldset>
@@ -80,6 +85,13 @@ <h2>Bi-directional Text Demo</h2>
   editor.setOption("direction", dirRadios["rtl"].checked ? "rtl" : "ltr");
 };
 
+var HtmlDirRadios = {ltr: document.getElementById("htmlltr"),
+                 rtl: document.getElementById("htmlrtl")};
+HtmlDirRadios["ltr"].checked = true;
+HtmlDirRadios["rtl"].onchange = HtmlDirRadios["ltr"].onchange = function() {
+  document.dir = (HtmlDirRadios["rtl"].checked ? "rtl" : "ltr");
+};
+
 var moveCheckbox = document.getElementById("rtlMoveVisually");
 moveCheckbox.checked = editor.getOption("rtlMoveVisually");
 moveCheckbox.onchange = function() {
diff --git a/lib/codemirror.css b/lib/codemirror.css
index f4d3c5f40b..9d8ff0ce66 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -5,6 +5,7 @@
   font-family: monospace;
   height: 300px;
   color: black;
+  direction: ltr;
 }
 
 /* PADDING */

From 4b0ae027938a6ed83b9a2033db291bff8c0f8967 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 8 Aug 2017 22:12:49 +0200
Subject: [PATCH 3443/4742] [shell mode] Allow strings to span lines

Closes #4902
---
 mode/shell/shell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index c5619afe7c..9b8b90b305 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -102,7 +102,7 @@ CodeMirror.defineMode('shell', function() {
         }
         escaped = !escaped && next === '\\';
       }
-      if (end || !escaped) state.tokens.shift();
+      if (end) state.tokens.shift();
       return style;
     };
   };

From 974b698fac730685ec51761338786e6801ae366c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 8 Aug 2017 23:07:27 +0200
Subject: [PATCH 3444/4742] [javascript mode] Support typescript-style type
 params to new

Closes #4887
---
 mode/javascript/javascript.js | 4 ++++
 mode/javascript/test.js       | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d77862b1d5..50d33dde31 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -468,6 +468,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeTarget(noComma) {
     return function(type) {
       if (type == ".") return cont(noComma ? targetNoComma : target);
+      else if (type == "variable" && isTS) return cont(maybeTypeArgs, noComma ? maybeoperatorNoComma : maybeoperatorComma)
       else return pass(noComma ? expressionNoComma : expression);
     };
   }
@@ -588,6 +589,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "[") return cont(expect("]"), afterType)
     if (value == "extends") return cont(typeexpr)
   }
+  function maybeTypeArgs(_, value) {
+    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
+  }
   function vardef() {
     return pass(pattern, maybetype, maybeAssign, vardefCont);
   }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 8fd13aee49..2632fd1df5 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -343,6 +343,9 @@
      "[keyword function] [def x][operator <][type T] [keyword extends] [keyword keyof] [type X][operator >]([def a]: [type T]) {",
      "  [keyword return]")
 
+  TS("typescript_new_typeargs",
+     "[keyword let] [def x] [operator =] [keyword new] [variable Map][operator <][type string], [type Date][operator >]([string-2 `foo${][variable bar][string-2 }`])")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 2add03c7efbbb1c685e7da0c4c3733778c6f35d9 Mon Sep 17 00:00:00 2001
From: Jeff Hanke <geophree@tesglobal.com>
Date: Wed, 9 Aug 2017 04:13:27 -0700
Subject: [PATCH 3445/4742] [html-line addon] Play more nicely with
 node/webpack.

* Pass in and use the htmlhint module required.
* Check for verify() and try HTMLHint.HTMLHint if missing because of
  module nesting. it's require('htmlhint').HTMLHint in node.
---
 addon/lint/html-lint.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addon/lint/html-lint.js b/addon/lint/html-lint.js
index 98c36b0b64..23de9bb204 100644
--- a/addon/lint/html-lint.js
+++ b/addon/lint/html-lint.js
@@ -11,8 +11,8 @@
   else if (typeof define == "function" && define.amd) // AMD
     define(["../../lib/codemirror", "htmlhint"], mod);
   else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
+    mod(CodeMirror, window.HTMLHint);
+})(function(CodeMirror, HTMLHint) {
   "use strict";
 
   var defaultRules = {
@@ -29,9 +29,11 @@
 
   CodeMirror.registerHelper("lint", "html", function(text, options) {
     var found = [];
-    if (!window.HTMLHint) {
+    if (HTMLHint && !HTMLHint.verify) HTMLHint = HTMLHint.HTMLHint;
+    if (!HTMLHint) HTMLHint = window.HTMLHint;
+    if (!HTMLHint) {
       if (window.console) {
-          window.console.error("Error: window.HTMLHint not defined, CodeMirror HTML linting cannot run.");
+          window.console.error("Error: HTMLHint not found, not defined on window, or not available through define/require, CodeMirror HTML linting cannot run.");
       }
       return found;
     }

From 616116ba326cf4164df28c62380f15e508f65e9a Mon Sep 17 00:00:00 2001
From: CodeBitt <30704531+CodeBitt@users.noreply.github.com>
Date: Mon, 14 Aug 2017 17:32:17 -0400
Subject: [PATCH 3446/4742] [real-world uses] Add CodeBitt

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 3995f93e9d..7c5231ba81 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -43,6 +43,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
       <li><a href="https://codeanywhere.com/">Codeanywhere</a> (multi-platform cloud editor)</li>
       <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>
+      <li><a href="https://codebitt.com/">CodeBitt</a> (Code snippet sharing)</li>
       <li><a href="http://www.codebugapp.com/">Codebug</a> (PHP Xdebug front-end)</li>
       <li><a href="https://github.com/angelozerr/CodeMirror-Eclipse">CodeMirror Eclipse</a> (embed CM in Eclipse)</li>
       <li><a href="http://emmet.io/blog/codemirror-movie/">CodeMirror movie</a> (scripted editing demos)</li>

From c06c273afc78781ed0735c8a27680f35397f3f42 Mon Sep 17 00:00:00 2001
From: Sarah McAlear and Wenlin Zhang <pair+smcalear+wzhang@pivotal.io>
Date: Mon, 14 Aug 2017 14:41:01 +0800
Subject: [PATCH 3447/4742] [sql-mode] Add greenplum dialect as gpsql

---
 mode/sql/index.html |  3 ++-
 mode/sql/sql.js     | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index dba069dc81..cd95872820 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -58,7 +58,8 @@ <h2>SQL Mode for CodeMirror</h2>
             <code><a href="?mime=text/x-mssql">text/x-mssql</a></code>,
             <code><a href="?mime=text/x-hive">text/x-hive</a></code>,
             <code><a href="?mime=text/x-pgsql">text/x-pgsql</a></code>,
-            <code><a href="?mime=text/x-gql">text/x-gql</a></code>.
+            <code><a href="?mime=text/x-gql">text/x-gql</a></code>,
+            <code><a href="?mime=text/x-gpsql">text/x-gpsql</a></code>.
         </p>
 <script>
 window.onload = function() {
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index c98d9f686b..79754f3a46 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -417,6 +417,19 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     builtin: set("blob datetime first key __key__ string integer double boolean null"),
     operatorChars: /^[*+\-%<>!=]/
   });
+
+  // Greenplum
+  CodeMirror.defineMIME("text/x-gpsql", {
+    name: "sql",
+    client: set("source"),
+    //https://github.com/greenplum-db/gpdb/blob/master/src/include/parser/kwlist.h
+    keywords: set("abort absolute access action active add admin after aggregate all also alter always analyse analyze and any array as asc assertion assignment asymmetric at authorization backward before begin between bigint binary bit boolean both by cache called cascade cascaded case cast chain char character characteristics check checkpoint class close cluster coalesce codegen collate column comment commit committed concurrency concurrently configuration connection constraint constraints contains content continue conversion copy cost cpu_rate_limit create createdb createexttable createrole createuser cross csv cube current current_catalog current_date current_role current_schema current_time current_timestamp current_user cursor cycle data database day deallocate dec decimal declare decode default defaults deferrable deferred definer delete delimiter delimiters deny desc dictionary disable discard distinct distributed do document domain double drop dxl each else enable encoding encrypted end enum errors escape every except exchange exclude excluding exclusive execute exists explain extension external extract false family fetch fields filespace fill filter first float following for force foreign format forward freeze from full function global grant granted greatest group group_id grouping handler hash having header hold host hour identity if ignore ilike immediate immutable implicit in including inclusive increment index indexes inherit inherits initially inline inner inout input insensitive insert instead int integer intersect interval into invoker is isnull isolation join key language large last leading least left level like limit list listen load local localtime localtimestamp location lock log login mapping master match maxvalue median merge minute minvalue missing mode modifies modify month move name names national natural nchar new newline next no nocreatedb nocreateexttable nocreaterole nocreateuser noinherit nologin none noovercommit nosuperuser not nothing notify notnull nowait null nullif nulls numeric object of off offset oids old on only operator option options or order ordered others out outer over overcommit overlaps overlay owned owner parser partial partition partitions passing password percent percentile_cont percentile_disc placing plans position preceding precision prepare prepared preserve primary prior privileges procedural procedure protocol queue quote randomly range read readable reads real reassign recheck recursive ref references reindex reject relative release rename repeatable replace replica reset resource restart restrict returning returns revoke right role rollback rollup rootpartition row rows rule savepoint scatter schema scroll search second security segment select sequence serializable session session_user set setof sets share show similar simple smallint some split sql stable standalone start statement statistics stdin stdout storage strict strip subpartition subpartitions substring superuser symmetric sysid system table tablespace temp template temporary text then threshold ties time timestamp to trailing transaction treat trigger trim true truncate trusted type unbounded uncommitted unencrypted union unique unknown unlisten until update user using vacuum valid validation validator value values varchar variadic varying verbose version view volatile web when where whitespace window with within without work writable write xml xmlattributes xmlconcat xmlelement xmlexists xmlforest xmlparse xmlpi xmlroot xmlserialize year yes zone"),
+    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
+    atoms: set("false true null unknown"),
+    operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
+    dateSQL: set("date time timestamp"),
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
+  });
 }());
 
 });

From e822f2bf7c41e18663cc86692342e5844dcb4ec4 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Sun, 13 Aug 2017 16:30:26 +0200
Subject: [PATCH 3448/4742] [markdown mode] improve fencedCodeBlocks and code
 behavior

---
 mode/markdown/markdown.js | 36 ++++++++++++++------------
 mode/markdown/test.js     | 54 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 73 insertions(+), 17 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 58f1dff8aa..8a60d0cd7c 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -89,7 +89,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
-  ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)/
+  ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/
   ,   linkDefRE = /^\s*\[[^\]]+?\]:\s*\S+(\s*\S*\s*)?$/ // naive link-definition
   ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
   ,   expandedTab = "    " // CommonMark specifies tab as 4 spaces
@@ -133,13 +133,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.trailingSpaceNewLine = false;
     // Mark this line as blank
     state.prevLine = state.thisLine
-    state.thisLine = null
+    state.thisLine = {stream: null}
     return null;
   }
 
   function blockNormal(stream, state) {
     var firstTokenOnLine = stream.column() === state.indentation;
-    var prevLineLineIsEmpty = lineIsEmpty(state.prevLine);
+    var prevLineLineIsEmpty = lineIsEmpty(state.prevLine.stream);
     var prevLineIsIndentedCode = state.indentedCode;
     var prevLineIsHr = state.hr;
     var prevLineIsList = state.list !== false;
@@ -176,7 +176,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.indentation <= maxNonCodeIndentation && stream.match(hrRE);
 
     var match = null;
-    if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || prevLineLineIsEmpty)) {
+    if (state.indentationDiff >= 4 && (prevLineIsIndentedCode || state.prevLine.fencedCodeEnd ||
+         state.prevLine.header || prevLineLineIsEmpty)) {
       stream.skipToEnd();
       state.indentedCode = true;
       return tokenTypes.code;
@@ -185,6 +186,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
       state.quote = 0;
       state.header = match[1].length;
+      state.thisLine.header = true;
       if (modeCfg.highlightFormatting) state.formatting = "header";
       state.f = state.inline;
       return getType(state);
@@ -211,7 +213,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return getType(state);
     } else if (firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(fencedCodeRE, true))) {
       state.quote = 0;
-      state.fencedChars = match[1]
+      state.fencedEndRE = new RegExp(match[1] + "+ *$");
       // try switching mode
       state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2]);
       if (state.localMode) state.localState = CodeMirror.startState(state.localMode);
@@ -240,6 +242,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         stream.skipToEnd();
         if (modeCfg.highlightFormatting) state.formatting = "header";
       }
+      state.thisLine.header = true;
       state.f = state.inline;
       return getType(state);
     } else if (isHr) {
@@ -269,20 +272,21 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function local(stream, state) {
-    var hasExitedList = state.indentation < state.listStack[state.listStack.length - 1];
-    if (state.fencedChars && (hasExitedList || stream.match(state.fencedChars))) {
+    var currListInd = state.listStack[state.listStack.length - 1] || 0;
+    var hasExitedList = state.indentation < currListInd;
+    var maxFencedEndInd = currListInd + 3;
+    if (state.fencedEndRE && state.indentation <= maxFencedEndInd && (hasExitedList || stream.match(state.fencedEndRE))) {
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
       var returnType;
       if (!hasExitedList) returnType = getType(state)
       state.localMode = state.localState = null;
       state.block = blockNormal;
       state.f = inlineNormal;
-      state.fencedChars = null;
+      state.fencedEndRE = null;
       state.code = 0
+      state.thisLine.fencedCodeEnd = true;
       if (hasExitedList) return switchBlock(stream, state, state.block);
       return returnType;
-    } else if (state.fencedChars && stream.skipTo(state.fencedChars)) {
-      return "comment"
     } else if (state.localMode) {
       return state.localMode.token(stream, state.localState);
     } else {
@@ -716,8 +720,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return {
         f: blockNormal,
 
-        prevLine: null,
-        thisLine: null,
+        prevLine: {stream: null},
+        thisLine: {stream: null},
 
         block: blockNormal,
         htmlState: null,
@@ -744,7 +748,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         trailingSpaceNewLine: false,
         strikethrough: false,
         emoji: false,
-        fencedChars: null
+        fencedEndRE: null
       };
     },
 
@@ -783,7 +787,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         trailingSpace: s.trailingSpace,
         trailingSpaceNewLine: s.trailingSpaceNewLine,
         md_inside: s.md_inside,
-        fencedChars: s.fencedChars
+        fencedEndRE: s.fencedEndRE
       };
     },
 
@@ -792,8 +796,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       // Reset state.formatting
       state.formatting = false;
 
-      if (stream != state.thisLine) {
         // Reset state.header
+      if (stream != state.thisLine.stream) {
         state.header = 0;
 
         if (stream.match(/^\s*$/, true)) {
@@ -802,7 +806,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         }
 
         state.prevLine = state.thisLine
-        state.thisLine = stream
+        state.thisLine = {stream: stream}
 
         // Reset state.taskList
         state.taskList = false;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 86935c9587..66d0bded6d 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -151,6 +151,21 @@
      "Foo",
      "    Bar");
 
+  MT("codeBlocksAfterATX",
+     "[header&header-1 # foo]",
+     "    [comment code]");
+
+  MT("codeBlocksAfterSetext",
+     "[header&header-2 foo]",
+     "[header&header-2 ---]",
+     "    [comment code]");
+
+  MT("codeBlocksAfterFencedCode",
+     "[comment ```]",
+     "[comment foo]",
+     "[comment ```]",
+     "    [comment code]");
+
   // Inline code using backticks
   MT("inlineCodeUsingBackticks",
      "foo [comment `bar`]");
@@ -192,6 +207,10 @@
   MT("closedBackticks",
      "[comment ``foo ``` bar` hello``] world");
 
+  // info string cannot contain backtick, thus should result in inline code
+  MT("closingFencedMarksOnSameLine",
+     "[comment ``` code ```] foo");
+
   // atx headers
   // http://daringfireball.net/projects/markdown/syntax#header
 
@@ -237,7 +256,7 @@
 
   MT("atxIndentedTooMuch",
      "[header&header-1 # foo]",
-     "    # bar");
+     "    [comment # bar]");
 
   // disable atx inside blockquote until we implement proper blockquote inner mode
   // TODO: fix to be CommonMark-compliant
@@ -1100,6 +1119,39 @@
      "[comment ```]",
      "baz");
 
+  MT("fencedCodeBlocks_invalidClosingFence_trailingText",
+     "[comment ```]",
+     "[comment foo]",
+     "[comment ``` must not have trailing text]",
+     "[comment baz]");
+
+  MT("fencedCodeBlocks_invalidClosingFence_trailingTabs",
+     "[comment ```]",
+     "[comment foo]",
+     "[comment ```\t]",
+     "[comment baz]");
+
+  MT("fencedCodeBlocks_validClosingFence",
+     "[comment ```]",
+     "[comment foo]",
+     // may have trailing spaces
+     "[comment ```     ]",
+     "baz");
+
+  MT("fencedCodeBlocksInList_closingFenceIndented",
+     "[variable-2 - list]",
+     "    [variable-2&comment ```]",
+     "    [comment foo]",
+     "     [variable-2&comment ```]",
+     "    [variable-2 baz]");
+
+  MT("fencedCodeBlocksInList_closingFenceIndentedTooMuch",
+     "[variable-2 - list]",
+     "    [variable-2&comment ```]",
+     "    [comment foo]",
+     "      [comment ```]",
+     "    [comment baz]");
+
   MT("fencedCodeBlockModeSwitching",
      "[comment ```javascript]",
      "[variable foo]",

From 55aa50667c2664c0451b3e4467c7664ae0691375 Mon Sep 17 00:00:00 2001
From: dwelle <luzar.david@gmail.com>
Date: Sun, 13 Aug 2017 16:31:25 +0200
Subject: [PATCH 3449/4742] [markdown mode] improve setext behavior

---
 mode/markdown/markdown.js | 20 +++++++++++++-------
 mode/markdown/test.js     | 40 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 8a60d0cd7c..53f9164dde 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -111,7 +111,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   // Blocks
 
   function blankLine(state) {
-    state.hr = false;
     // Reset linkTitle state
     state.linkTitle = false;
     // Reset EM state
@@ -141,11 +140,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     var firstTokenOnLine = stream.column() === state.indentation;
     var prevLineLineIsEmpty = lineIsEmpty(state.prevLine.stream);
     var prevLineIsIndentedCode = state.indentedCode;
-    var prevLineIsHr = state.hr;
+    var prevLineIsHr = state.prevLine.hr;
     var prevLineIsList = state.list !== false;
     var maxNonCodeIndentation = (state.listStack[state.listStack.length - 1] || 0) + 3;
 
-    state.hr = false;
     state.indentedCode = false;
 
     var lineIndentation = state.indentation;
@@ -172,6 +170,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
+    // not comprehensive (currently only for setext detection purposes)
+    var allowsInlineContinuation = (
+        !prevLineLineIsEmpty && !prevLineIsHr && !state.prevLine.header &&
+        (!prevLineIsList || !prevLineIsIndentedCode) &&
+        !state.prevLine.fencedCodeEnd
+    );
+
     var isHr = (state.list === false || prevLineIsHr || prevLineLineIsEmpty) &&
       state.indentation <= maxNonCodeIndentation && stream.match(hrRE);
 
@@ -195,7 +200,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (modeCfg.highlightFormatting) state.formatting = "quote";
       stream.eatSpace();
       return getType(state);
-    } else if (!isHr && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(listRE))) {
+    } else if (!isHr && !state.setext && firstTokenOnLine && state.indentation <= maxNonCodeIndentation && (match = stream.match(listRE))) {
       var listType = match[1] ? "ol" : "ul";
 
       state.indentation = lineIndentation + stream.current().length;
@@ -227,8 +232,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       // if setext set, indicates line after ---/===
       state.setext || (
         // line before ---/===
-        !state.quote && state.list === false && !state.code && !isHr &&
-        !prevLineIsList && !linkDefRE.test(stream.string) &&
+        (!allowsInlineContinuation || !prevLineIsList) && !state.quote && state.list === false &&
+        !state.code && !isHr && !linkDefRE.test(stream.string) &&
         (match = stream.lookAhead(1)) && (match = match.match(setextHeaderRE))
       )
     ) {
@@ -248,6 +253,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     } else if (isHr) {
       stream.skipToEnd();
       state.hr = true;
+      state.thisLine.hr = true;
       return tokenTypes.hr;
     } else if (stream.peek() === '[') {
       return switchInline(stream, state, footnoteLink);
@@ -796,9 +802,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       // Reset state.formatting
       state.formatting = false;
 
-        // Reset state.header
       if (stream != state.thisLine.stream) {
         state.header = 0;
+        state.hr = false;
 
         if (stream.match(/^\s*$/, true)) {
           blankLine(state);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 66d0bded6d..a89fbca608 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -327,12 +327,42 @@
 
   MT("noSetextAfterList",
      "[variable-2 - foo]",
-     "[hr ---]",
-     "",
+     "[hr ---]");
+
+  MT("noSetextAfterList_listContinuation",
      "[variable-2 - foo]",
      "bar",
      "[hr ---]");
 
+  MT("setextAfterList_afterIndentedCode",
+     "[variable-2 - foo]",
+     "",
+     "      [comment bar]",
+     "[header&header-2 baz]",
+     "[header&header-2 ---]");
+
+  MT("setextAfterList_afterFencedCodeBlocks",
+     "[variable-2 - foo]",
+     "",
+     "      [comment ```]",
+     "      [comment bar]",
+     "      [comment ```]",
+     "[header&header-2 baz]",
+     "[header&header-2 ---]");
+
+  MT("setextAfterList_afterHeader",
+     "[variable-2 - foo]",
+     "  [variable-2&header&header-1 # bar]",
+     "[header&header-2 baz]",
+     "[header&header-2 ---]");
+
+  MT("setextAfterList_afterHr",
+     "[variable-2 - foo]",
+     "",
+     "  [hr ---]",
+     "[header&header-2 bar]",
+     "[header&header-2 ---]");
+
   MT("setext_nestedInlineMarkup",
      "[header&header-1 foo ][em&header&header-1 *bar*]",
      "[header&header-1 =]");
@@ -348,6 +378,12 @@
      "[header&header-1 bar]",
      "[header&header-1 =]");
 
+  // ensure we don't regard space after dash as a list
+  MT("setext_emptyList",
+     "[header&header-2 foo]",
+     "[header&header-2 - ]",
+     "foo");
+
   // Single-line blockquote with trailing space
   MT("blockquoteSpace",
      "[quote&quote-1 > foo]");

From c49bb5fed2add221218771b8f9a6766a1e2623eb Mon Sep 17 00:00:00 2001
From: Christian Gruen <christian.gruen@gmail.com>
Date: Sun, 13 Aug 2017 15:37:53 +0200
Subject: [PATCH 3450/4742] [xquery mode] Update keyword list (support for
 XQ31, XQFT, XQUP)

---
 mode/xquery/xquery.js | 52 +++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index 75dcbee3ea..ea0f5e8db4 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -29,31 +29,45 @@ CodeMirror.defineMode("xquery", function() {
 
     // kwObj is what is return from this function at the end
     var kwObj = {
-      'if': A, 'switch': A, 'while': A, 'for': A,
-      'else': B, 'then': B, 'try': B, 'finally': B, 'catch': B,
-      'element': C, 'attribute': C, 'let': C, 'implements': C, 'import': C, 'module': C, 'namespace': C,
-      'return': C, 'super': C, 'this': C, 'throws': C, 'where': C, 'private': C,
-      ',': punctuation,
-      'null': atom, 'fn:false()': atom, 'fn:true()': atom
+      ',': punctuation
     };
 
     // a list of 'basic' keywords. For each add a property to kwObj with the value of
     // {type: basic[i], style: "keyword"} e.g. 'after' --> {type: "after", style: "keyword"}
-    var basic = ['after','ancestor','ancestor-or-self','and','as','ascending','assert','attribute','before',
-    'by','case','cast','child','comment','declare','default','define','descendant','descendant-or-self',
-    'descending','document','document-node','element','else','eq','every','except','external','following',
-    'following-sibling','follows','for','function','if','import','in','instance','intersect','item',
-    'let','module','namespace','node','node','of','only','or','order','parent','precedes','preceding',
-    'preceding-sibling','processing-instruction','ref','return','returns','satisfies','schema','schema-element',
-    'self','some','sortby','stable','text','then','to','treat','typeswitch','union','variable','version','where',
-    'xquery', 'empty-sequence'];
+    var basic = ['after', 'all', 'allowing', 'ancestor', 'ancestor-or-self', 'any', 'array', 'as',
+    'ascending', 'at', 'attribute', 'base-uri', 'before', 'boundary-space', 'by', 'case', 'cast',
+    'castable', 'catch', 'child', 'collation', 'comment', 'construction', 'contains', 'content',
+    'context', 'copy', 'copy-namespaces', 'count', 'decimal-format', 'declare', 'default', 'delete',
+    'descendant', 'descendant-or-self', 'descending', 'diacritics', 'different', 'distance',
+    'document', 'document-node', 'element', 'else', 'empty', 'empty-sequence', 'encoding', 'end',
+    'entire', 'every', 'exactly', 'except', 'external', 'first', 'following', 'following-sibling',
+    'for', 'from', 'ftand', 'ftnot', 'ft-option', 'ftor', 'function', 'fuzzy', 'greatest', 'group',
+    'if', 'import', 'in', 'inherit', 'insensitive', 'insert', 'instance', 'intersect', 'into',
+    'invoke', 'is', 'item', 'language', 'last', 'lax', 'least', 'let', 'levels', 'lowercase', 'map',
+    'modify', 'module', 'most', 'namespace', 'next', 'no', 'node', 'nodes', 'no-inherit',
+    'no-preserve', 'not', 'occurs', 'of', 'only', 'option', 'order', 'ordered', 'ordering',
+    'paragraph', 'paragraphs', 'parent', 'phrase', 'preceding', 'preceding-sibling', 'preserve',
+    'previous', 'processing-instruction', 'relationship', 'rename', 'replace', 'return',
+    'revalidation', 'same', 'satisfies', 'schema', 'schema-attribute', 'schema-element', 'score',
+    'self', 'sensitive', 'sentence', 'sentences', 'sequence', 'skip', 'sliding', 'some', 'stable',
+    'start', 'stemming', 'stop', 'strict', 'strip', 'switch', 'text', 'then', 'thesaurus', 'times',
+    'to', 'transform', 'treat', 'try', 'tumbling', 'type', 'typeswitch', 'union', 'unordered',
+    'update', 'updating', 'uppercase', 'using', 'validate', 'value', 'variable', 'version',
+    'weight', 'when', 'where', 'wildcards', 'window', 'with', 'without', 'word', 'words', 'xquery'];
     for(var i=0, l=basic.length; i < l; i++) { kwObj[basic[i]] = kw(basic[i]);};
 
     // a list of types. For each add a property to kwObj with the value of
     // {type: "atom", style: "atom"}
-    var types = ['xs:string', 'xs:float', 'xs:decimal', 'xs:double', 'xs:integer', 'xs:boolean', 'xs:date', 'xs:dateTime',
-    'xs:time', 'xs:duration', 'xs:dayTimeDuration', 'xs:time', 'xs:yearMonthDuration', 'numeric', 'xs:hexBinary',
-    'xs:base64Binary', 'xs:anyURI', 'xs:QName', 'xs:byte','xs:boolean','xs:anyURI','xf:yearMonthDuration'];
+    var types = ['xs:anyAtomicType', 'xs:anySimpleType', 'xs:anyType', 'xs:anyURI',
+    'xs:base64Binary', 'xs:boolean', 'xs:byte', 'xs:date', 'xs:dateTime', 'xs:dateTimeStamp',
+    'xs:dayTimeDuration', 'xs:decimal', 'xs:double', 'xs:duration', 'xs:ENTITIES', 'xs:ENTITY',
+    'xs:float', 'xs:gDay', 'xs:gMonth', 'xs:gMonthDay', 'xs:gYear', 'xs:gYearMonth', 'xs:hexBinary',
+    'xs:ID', 'xs:IDREF', 'xs:IDREFS', 'xs:int', 'xs:integer', 'xs:item', 'xs:java', 'xs:language',
+    'xs:long', 'xs:Name', 'xs:NCName', 'xs:negativeInteger', 'xs:NMTOKEN', 'xs:NMTOKENS',
+    'xs:nonNegativeInteger', 'xs:nonPositiveInteger', 'xs:normalizedString', 'xs:NOTATION',
+    'xs:numeric', 'xs:positiveInteger', 'xs:precisionDecimal', 'xs:QName', 'xs:short', 'xs:string',
+    'xs:time', 'xs:token', 'xs:unsignedByte', 'xs:unsignedInt', 'xs:unsignedLong',
+    'xs:unsignedShort', 'xs:untyped', 'xs:untypedAtomic', 'xs:yearMonthDuration'];
     for(var i=0, l=types.length; i < l; i++) { kwObj[types[i]] = atom;};
 
     // each operator will add a property to kwObj with value of {type: "operator", style: "keyword"}
@@ -102,7 +116,7 @@ CodeMirror.defineMode("xquery", function() {
     }
     // start code block
     else if(ch == "{") {
-      pushStateStack(state,{ type: "codeblock"});
+      pushStateStack(state, { type: "codeblock"});
       return null;
     }
     // end code block
@@ -132,7 +146,7 @@ CodeMirror.defineMode("xquery", function() {
       return chain(stream, state, tokenComment);
     }
     // quoted string
-    else if (  !isEQName && (ch === '"' || ch === "'"))
+    else if (!isEQName && (ch === '"' || ch === "'"))
       return chain(stream, state, tokenString(ch));
     // variable
     else if(ch === "$") {

From 22861a03a517f02e505e79389eb92ff3a5392f03 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Aug 2017 18:14:07 +0200
Subject: [PATCH 3451/4742] Make linter pass

---
 mode/xquery/xquery.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index ea0f5e8db4..f5db831c1c 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -19,10 +19,7 @@ CodeMirror.defineMode("xquery", function() {
   var keywords = function(){
     // convenience functions used to build keywords object
     function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a")
-      , B = kw("keyword b")
-      , C = kw("keyword c")
-      , operator = kw("operator")
+    var operator = kw("operator")
       , atom = {type: "atom", style: "atom"}
       , punctuation = {type: "punctuation", style: null}
       , qualifier = {type: "axis_specifier", style: "qualifier"};

From 404d86952496d834f02bc1f5f841d508a7df8dc1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Aug 2017 18:30:22 +0200
Subject: [PATCH 3452/4742] [xquery mode] Adjust tests to updated keyword list

Issue #4910
---
 mode/xquery/test.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mode/xquery/test.js b/mode/xquery/test.js
index 1f148cdbbd..9697f9b0ac 100644
--- a/mode/xquery/test.js
+++ b/mode/xquery/test.js
@@ -20,14 +20,14 @@
      "          [def&variable fn:doc]()[[ [variable foo][keyword /][variable @bar] [keyword eq] [variable $let] ]],",
      "          [keyword //][variable x] }                 [comment (: a more 'evil' test :)]",
      "      [comment (: Modified Blakeley example (: with nested comment :) ... :)]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:declare]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:private]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:function]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:local]() {()}[variable ;]",
+     "      [keyword declare] [variable private] [keyword function] [def&variable local:declare]() {()}[variable ;]",
+     "      [keyword declare] [variable private] [keyword function] [def&variable local:private]() {()}[variable ;]",
+     "      [keyword declare] [variable private] [keyword function] [def&variable local:function]() {()}[variable ;]",
+     "      [keyword declare] [variable private] [keyword function] [def&variable local:local]() {()}[variable ;]",
      "      [keyword let] [variable $let] [keyword :=] [variable &lt;let&gt;let] [variable $let] [keyword :=] [variable &quot;let&quot;&lt;][keyword /let][variable &gt;]",
      "      [keyword return] [keyword element] [variable element] {",
      "          [keyword attribute] [variable attribute] { [keyword try] { [def&variable xdmp:version]() } [keyword catch]([variable $e]) { [def&variable xdmp:log]([variable $e]) } },",
-     "          [keyword attribute] [variable fn:doc] { [variable &quot;bar&quot;] [variable castable] [keyword as] [atom xs:string] },",
+     "          [keyword attribute] [variable fn:doc] { [variable &quot;bar&quot;] [keyword castable] [keyword as] [atom xs:string] },",
      "          [keyword element] [variable text] { [keyword text] { [variable &quot;text&quot;] } },",
      "          [def&variable fn:doc]()[[ [qualifier child::][variable eq][keyword /]([variable @bar] [keyword |] [qualifier attribute::][variable attribute]) [keyword eq] [variable $let] ]],",
      "          [keyword //][variable fn:doc]",

From c42322890d75a7566dd1eb042c1229be0a3997f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Aug 2017 18:44:09 +0200
Subject: [PATCH 3453/4742] [javascript mode] Fix expressionAllowed to return
 false when not in base tokenizer

Issue #4908
---
 mode/javascript/javascript.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 50d33dde31..acb0c109ba 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -11,11 +11,6 @@
 })(function(CodeMirror) {
 "use strict";
 
-function expressionAllowed(stream, state, backUp) {
-  return /^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
-    (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
-}
-
 CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var statementIndent = parserConfig.statementIndent;
@@ -733,6 +728,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       /[,.]/.test(textAfter.charAt(0));
   }
 
+  function expressionAllowed(stream, state, backUp) {
+    return state.tokenize == tokenBase &&
+      /^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+      (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
+  }
+
   // Interface
 
   return {
@@ -807,6 +808,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     jsonMode: jsonMode,
 
     expressionAllowed: expressionAllowed,
+
     skipExpression: function(state) {
       var top = state.cc[state.cc.length - 1]
       if (top == expression || top == expressionNoComma) state.cc.pop()

From a347f5e3cf84eaeb2a97a7ae1251782b179d1ff6 Mon Sep 17 00:00:00 2001
From: Pieter Ouwerkerk <pieter.ouwerkerk@gmail.com>
Date: Sat, 12 Aug 2017 15:25:50 -0700
Subject: [PATCH 3454/4742] [jsx mode] Add test for corner case

Issue #4909
---
 mode/jsx/test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index 4a63b4eeca..61f84ebe82 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -33,6 +33,9 @@
   MT("preserve_js_context",
      "[variable x] [operator =] [string-2 `quasi${][bracket&tag <][tag foo][bracket&tag />][string-2 }quoted`]")
 
+  MT("string_interpolation",
+    "[variable x] [operator =] [string-2 `quasi<code>${] [number 10] [string-2 }</code>`]")
+
   MT("line_comment",
      "([bracket&tag <][tag foo] [comment // hello]",
      "   [bracket&tag ></][tag foo][bracket&tag >][operator ++])")

From 369d3ce59e57ae950bfe4fe6b5202689c9252424 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 16 Aug 2017 10:16:15 +0200
Subject: [PATCH 3455/4742] Mention Edge in browser support

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

diff --git a/index.html b/index.html
index c47eb6ec27..0ce8fa6038 100644
--- a/index.html
+++ b/index.html
@@ -185,7 +185,7 @@ <h2>Browser support</h2>
     <tr><th>Firefox</th><td>version 4 and up</td></tr>
     <tr><th>Chrome</th><td>any version</td></tr>
     <tr><th>Safari</th><td>version 5.2 and up</td></tr>
-    <tr><th style="padding-right: 1em;">Internet Explorer</th><td>version 8 and up</td></tr>
+    <tr><th style="padding-right: 1em;">Internet Explorer/Edge</th><td>version 8 and up</td></tr>
     <tr><th>Opera</th><td>version 9 and up</td></tr>
   </table>
   <p>Support for modern mobile browsers is experimental. Recent

From 12cc4bc04fd2e088119aa19a4c2ff6ecdb924410 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 18 Aug 2017 08:41:03 +0200
Subject: [PATCH 3456/4742] [javascript mode] Recognize typescript declare
 keyword

Closes #4915
---
 mode/javascript/javascript.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index acb0c109ba..56813f83d4 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -363,6 +363,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (isTS && value == "type") {
         cx.marked = "keyword"
         return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
+      } if (isTS && value == "declare") {
+        cx.marked = "keyword"
+        return cont(statement)
       } else {
         return cont(pushlex("stat"), maybelabel);
       }

From 8ef19b4fab89aafb88ade1305773b23d00f9bee5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 18 Aug 2017 08:49:04 +0200
Subject: [PATCH 3457/4742] [javascript mode] Accept modifiers before
 parameters in TypeScript mode

Closes #4916
---
 mode/javascript/javascript.js | 18 ++++++++++--------
 mode/javascript/test.js       |  6 ++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 56813f83d4..b2166e5194 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -55,6 +55,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         "private": kw("modifier"),
         "protected": kw("modifier"),
         "abstract": kw("modifier"),
+        "readonly": kw("modifier"),
 
         // types
         "string": type, "number": type, "boolean": type, "any": type
@@ -647,7 +648,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (isTS && value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, functiondef)
   }
   function funarg(type) {
-    if (type == "spread") return cont(funarg);
+    if (type == "spread" || type == "modifier") return cont(funarg);
     return pass(pattern, maybetype, maybeAssign);
   }
   function classExpression(type, value) {
@@ -665,13 +666,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "{") return cont(pushlex("}"), classBody, poplex);
   }
   function classBody(type, value) {
-    if (type == "variable" || cx.style == "keyword") {
-      if ((value == "async" || value == "static" || value == "get" || value == "set" ||
-           (isTS && (value == "public" || value == "private" || value == "protected" || value == "readonly" || value == "abstract"))) &&
-          cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false)) {
-        cx.marked = "keyword";
-        return cont(classBody);
-      }
+    if (type == "modifier" || type == "async" ||
+        (type == "variable" &&
+         (value == "static" || value == "get" || value == "set") &&
+         cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false))) {
+      cx.marked = "keyword";
+      return cont(classBody);
+    }
+    if (type == "variable") {
       cx.marked = "property";
       return cont(isTS ? classfield : functiondef, classBody);
     }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 2632fd1df5..f110b5c263 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -346,6 +346,12 @@
   TS("typescript_new_typeargs",
      "[keyword let] [def x] [operator =] [keyword new] [variable Map][operator <][type string], [type Date][operator >]([string-2 `foo${][variable bar][string-2 }`])")
 
+  TS("modifiers",
+     "[keyword class] [def Foo] {",
+     "  [keyword public] [keyword abstract] [property bar]() {}",
+     "  [property constructor]([keyword readonly] [keyword private] [def x]) {}",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 02050aa979b3b23531f2239a78b03282c6e62238 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 18 Aug 2017 08:50:45 +0200
Subject: [PATCH 3458/4742] [javascript mode] Recognize TypeScript
 suffix-exclamation-mark operator

Closes #4917
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index b2166e5194..c3c7584665 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -433,7 +433,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var expr = noComma == false ? expression : expressionNoComma;
     if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
     if (type == "operator") {
-      if (/\+\+|--/.test(value)) return cont(me);
+      if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
       if (value == "?") return cont(expression, expect(":"), expr);
       return cont(expr);
     }

From 9571a1ffcaebab1376a4c31c6d459ce42ac7cae1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 18 Aug 2017 08:54:25 +0200
Subject: [PATCH 3459/4742] [javascript mode] Recognize TypeScript tuple syntax

Closes #4918
---
 mode/javascript/javascript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c3c7584665..e7242842b6 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -560,6 +560,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       }
     }
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
+    if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)
     if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
   }

From f82a09a242395144458b20d7dc902eb93c2623b0 Mon Sep 17 00:00:00 2001
From: Jonas Helfer <helfer@users.noreply.github.com>
Date: Thu, 17 Aug 2017 16:37:06 -0700
Subject: [PATCH 3460/4742] [sql mode] Add Spark MIME definition

---
 mode/sql/sql.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 79754f3a46..d7c6be1b00 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -430,6 +430,17 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     dateSQL: set("date time timestamp"),
     support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
   });
+
+  // Spark SQL
+  CodeMirror.defineMIME("text/x-sparksql", {
+    name: "sql",
+    keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases datata dbproperties defined delete delimited desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
+    builtin: set("tinyint smallint int bigint boolean float double string binary timestamp decimal array map struct uniontype delimited serde sequencefile textfile rcfile inputformat outputformat"),
+    atoms: set("false true null"),
+    operatorChars: /^[*+\-%<>!=~&|^]/,
+    dateSQL: set("date time timestamp"),
+    support: set("ODBCdotTable doubleQuote zerolessFloat")
+  });
 }());
 
 });

From b0dfcd02f6218325de7995bf325c831b63c9a9f6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 19 Aug 2017 18:22:19 +0200
Subject: [PATCH 3461/4742] [search addon] Prevent errors in persistent search
 when extraKeys is null

Issue #4922
---
 addon/search/search.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 236e54cc40..82938b9a56 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -137,8 +137,7 @@
       };
       persistentDialog(cm, queryDialog, q, searchNext, function(event, query) {
         var keyName = CodeMirror.keyName(event)
-        var cmd = CodeMirror.keyMap[cm.getOption("keyMap")][keyName]
-        if (!cmd) cmd = cm.getOption('extraKeys')[keyName]
+        var extra = cm.getOption('extraKeys'), cmd = (extra && extra[keyName]) || CodeMirror.keyMap[cm.getOption("keyMap")][keyName]
         if (cmd == "findNext" || cmd == "findPrev" ||
           cmd == "findPersistentNext" || cmd == "findPersistentPrev") {
           CodeMirror.e_stop(event);

From f611d278a7c991e180b82665f94f7e43d0580b6c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 19 Aug 2017 18:22:40 +0200
Subject: [PATCH 3462/4742] [emacs keymap] Bind ctrl-s/r to persistent search

Issue #4922
---
 keymap/emacs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 63da52fa37..33db0c15a2 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -369,7 +369,7 @@
     "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
     "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
     "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
-    "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
+    "Ctrl-S": "findPersistentNext", "Ctrl-R": "findPersistentPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
     "Alt-/": "autocomplete",
     "Enter": "newlineAndIndent",
     "Ctrl-J": repeated(function(cm) { cm.replaceSelection("\n", "end"); }),

From 91817cce7633aed7c637fbdb2b2b4210b513c064 Mon Sep 17 00:00:00 2001
From: Steffen Kowalski <scipper@myscipper.de>
Date: Thu, 24 Aug 2017 08:53:19 +0200
Subject: [PATCH 3463/4742] [merge addon] Lazily initialize diff_match_patch

---
 addon/merge/merge.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 76460dd864..c94b27a7b8 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -644,9 +644,10 @@
   }
 
   // Operations on diffs
-
-  var dmp = new diff_match_patch();
+  var dmp;
   function getDiff(a, b, ignoreWhitespace) {
+    if (!dmp) dmp = new diff_match_patch();
+
     var diff = dmp.diff_main(a, b);
     // The library sometimes leaves in empty parts, which confuse the algorithm
     for (var i = 0; i < diff.length; ++i) {

From ab868db8edda2293ffcda96390bd2cb29e97698f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 24 Aug 2017 13:45:16 +0200
Subject: [PATCH 3464/4742] Mark version 5.29.0

---
 AUTHORS           | 11 +++++++++++
 CHANGELOG.md      | 22 ++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 14 ++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 07b8fbd09e..280dea2f5f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -127,6 +127,7 @@ Chris Houseknecht
 Chris Lohfink
 Chris Morgan
 Chris Smith
+Christian Gruen
 Christian Oyarzun
 Christian Petrov
 Christopher Brown
@@ -136,6 +137,7 @@ Christopher Pfohl
 Chunliang Lyu
 ciaranj
 CodeAnimal
+CodeBitt
 coderaiser
 Cole R Lawrence
 ComFreek
@@ -293,6 +295,7 @@ Jason Siefken
 Jaydeep Solanki
 Jean Boussier
 Jeff Blaisdell
+Jeff Hanke
 Jeff Jenkins
 jeffkenton
 Jeff Pickhardt
@@ -314,6 +317,7 @@ John Snelson
 John Van Der Loo
 Jon Ander Peñalba
 Jonas Döbertin
+Jonas Helfer
 Jonathan Malmaud
 Jon Gacnik
 jongalloway
@@ -438,6 +442,7 @@ Michael Goderbauer
 Michael Grey
 Michael Kaminsky
 Michael Lehenbauer
+Michael Walker
 Michael Zhou
 Michal Čihař
 Michal Dorner
@@ -456,6 +461,7 @@ misfo
 mkaminsky11
 mloginov
 Moritz Schwörer
+Moshe Wajnberg
 mps
 ms
 mtaran-google
@@ -518,6 +524,7 @@ Philipp A
 Philip Stadermann
 Pierre Gerold
 Piët Delport
+Pieter Ouwerkerk
 Pontus Melke
 prasanthj
 Prasanth J
@@ -558,6 +565,7 @@ sandeepshetty
 Sander AKA Redsandro
 Sander Verweij
 santec
+Sarah McAlear and Wenlin Zhang
 Sascha Peilicke
 satamas
 satchmorun
@@ -567,6 +575,7 @@ S. Chris Colbert
 SCLINIC\jdecker
 Scott Aikin
 Scott Goodhew
+Sebastian Wilzbach
 Sebastian Zaha
 Sergey Goder
 Sergey Tselovalnikov
@@ -594,6 +603,7 @@ Stas Kobzar
 Stefan Borsje
 Steffen Beyer
 Steffen Bruchmann
+Steffen Kowalski
 Stephen Lavelle
 Steve Champagne
 Steve Hoover
@@ -662,6 +672,7 @@ Yassin N. Hassan
 YNH Webdev
 Yunchi Luo
 Yuvi Panda
+Yvonnick Esnault
 Zac Anger
 Zachary Dremann
 Zeno Rocha
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49290390fd..6cc7ed75fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 5.29.0 (2017-08-24)
+
+### Bug fixes
+
+Fix crash in contentEditable input style when editing near a bookmark.
+
+Make sure change origins are preserved when splitting changes on [read-only marks](http://codemirror.net/doc/manual.html#mark_readOnly).
+
+[javascript mode](http://codemirror.net/mode/javascript/): More support for TypeScript syntax.
+
+[d mode](http://codemirror.net/mode/d/): Support nested comments.
+
+[python mode](http://codemirror.net/mode/python/): Improve tokenizing of operators.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Further improve CommonMark conformance.
+
+[css mode](http://codemirror.net/mode/css/): Don't run comment tokens through the mode's state machine.
+
+[shell mode](http://codemirror.net/mode/shell/): Allow strings to span lines.
+
+[search addon](http://codemirror.net/demo/search/): Fix crash in persistent search when `extraKeys` is null.
+
 ## 5.28.0 (2017-07-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index da4423f960..866367a6bf 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.28.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.29.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 1c882dc310..586e2117f4 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">24-08-2017: <a href="http://codemirror.net/codemirror-5.29.0.zip">Version 5.29.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix crash in contentEditable input style when editing near a bookmark.</li>
+    <li>Make sure change origins are preserved when splitting changes on <a href="http://codemirror.net/doc/manual.html#mark_readOnly">read-only marks</a>.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: More support for TypeScript syntax.</li>
+    <li><a href="http://codemirror.net/mode/d/">d mode</a>: Support nested comments.</li>
+    <li><a href="http://codemirror.net/mode/python/">python mode</a>: Improve tokenizing of operators.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Further improve CommonMark conformance.</li>
+    <li><a href="http://codemirror.net/mode/css/">css mode</a>: Don't run comment tokens through the mode's state machine.</li>
+    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Allow strings to span lines.</li>
+    <li><a href="http://codemirror.net/demo/search/">search addon</a>: Fix crash in persistent search when <code>extraKeys</code> is null.</li>
+  </ul>
+
   <p class="rel">21-07-2017: <a href="http://codemirror.net/codemirror-5.28.0.zip">Version 5.28.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 0ce8fa6038..68b9e507a4 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.28.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.29.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index ff6971cd8e..3f108eb387 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.28.1",
+  "version": "5.29.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index e7a2122d6e..44779dc05a 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.28.1"
+CodeMirror.version = "5.29.0"

From 9d19fa49140e5d9f74b267c4c654b979fb485376 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 24 Aug 2017 13:46:50 +0200
Subject: [PATCH 3465/4742] Bump version number post-5.29.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 866367a6bf..758ccbcc06 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.29.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.29.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 3f108eb387..d5f2329ef9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.29.0",
+  "version": "5.29.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 44779dc05a..c75e3bbc61 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.29.0"
+CodeMirror.version = "5.29.1"

From e49a19f5cacb447558f162014eb26b8c45b30941 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 24 Aug 2017 16:16:24 +0200
Subject: [PATCH 3466/4742] Document CodeMirror.countColumn

Issue #4929
---
 doc/manual.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 758ccbcc06..354194e6cb 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2229,6 +2229,9 @@ <h3 id="api_static">Static properties</h3>
       various <a href="#event_change">event handlers</a>). The
       returned position will be the end of the changed
       range, <em>after</em> the change is applied.</dd>
+
+      <dt id="countColumn"><code><strong>CodeMirror.countColumn</strong>(line: string, index: number, tabSize: number) → number</code></dt>
+      <dd>Find the column position at a given string index using a given tabsize.</dd>
     </dl>
 </section>
 

From 35a5139ded0ece8e1ac92a84861ba9a3236949ff Mon Sep 17 00:00:00 2001
From: Franco Catena <francocatena@gmail.com>
Date: Fri, 25 Aug 2017 12:36:28 -0300
Subject: [PATCH 3467/4742] [ruby mode] Add fold info

---
 mode/ruby/ruby.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 68ebf122b4..874c1830e7 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -286,7 +286,8 @@ CodeMirror.defineMode("ruby", function(config) {
     },
 
     electricInput: /^\s*(?:end|rescue|elsif|else|\})$/,
-    lineComment: "#"
+    lineComment: "#",
+    fold: "indent"
   };
 });
 

From 03051a2e3b8232a41482eee99db809d0f1c931a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 26 Aug 2017 22:55:05 +0200
Subject: [PATCH 3468/4742] [javascript mode] Parse arrow function params as
 paramaters, not plain patterns

Closes #4933
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index e7242842b6..267717f8be 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -398,7 +398,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function expressionInner(type, noComma) {
     if (cx.state.fatArrowAt == cx.stream.start) {
       var body = noComma ? arrowBodyNoComma : arrowBody;
-      if (type == "(") return cont(pushcontext, pushlex(")"), commasep(pattern, ")"), poplex, expect("=>"), body, popcontext);
+      if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, expect("=>"), body, popcontext);
       else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
     }
 

From 883fd008d29fdcaab18b50f47c248e3d112f39ed Mon Sep 17 00:00:00 2001
From: Ian Davies <github@iandavies.org>
Date: Sun, 27 Aug 2017 09:30:07 +0100
Subject: [PATCH 3469/4742] [show-hint addon] Fire correct hint selection event
 specific hint is selected

Fixes #4935.
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 604bd3b715..f72a0a9c69 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -302,7 +302,7 @@
       setTimeout(function(){cm.focus();}, 20);
     });
 
-    CodeMirror.signal(data, "select", completions[0], hints.firstChild);
+    CodeMirror.signal(data, "select", completions[this.selectedHint], hints.childNodes[this.selectedHint]);
     return true;
   }
 

From 06ed8a17ae2458776c6a962e0e495c5e1c9902ca Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Mon, 28 Aug 2017 00:19:16 -0700
Subject: [PATCH 3470/4742] [css-lint addon] Pass lint options (rules) into
 CSSLint.verify()

---
 addon/lint/css-lint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index b7e1a4fe5d..135d031a35 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -15,7 +15,7 @@
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.registerHelper("lint", "css", function(text) {
+CodeMirror.registerHelper("lint", "css", function(text, options) {
   var found = [];
   if (!window.CSSLint) {
     if (window.console) {
@@ -23,7 +23,7 @@ CodeMirror.registerHelper("lint", "css", function(text) {
     }
     return found;
   }
-  var results = CSSLint.verify(text), messages = results.messages, message = null;
+  var results = CSSLint.verify(text, options), messages = results.messages, message = null;
   for ( var i = 0; i < messages.length; i++) {
     message = messages[i];
     var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;

From cbaf9b9f9c36997dd2f88589fa9836a3220fa5f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 29 Aug 2017 21:29:09 +0200
Subject: [PATCH 3471/4742] [javascript mode] Properly handle keywords as class
 method names

Closes #4941
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 267717f8be..7d62e92944 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -674,7 +674,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       cx.marked = "keyword";
       return cont(classBody);
     }
-    if (type == "variable") {
+    if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
       return cont(isTS ? classfield : functiondef, classBody);
     }

From 044850a01718d92fd61673dde3b08b1b07ccceb6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 29 Aug 2017 23:42:08 +0200
Subject: [PATCH 3472/4742] Rewrite selection drawing algorithm for RTL text

Issue #4926
---
 src/display/selection.js | 54 ++++++++++++++++++++++++----------------
 test/test.js             |  6 +++++
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/display/selection.js b/src/display/selection.js
index d9b69d4921..32c9a611fe 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -46,6 +46,8 @@ export function drawSelectionCursor(cm, head, output) {
   }
 }
 
+function cmpCoords(a, b) { return a.top - b.top || a.left - b.left }
+
 // Draws the given range as a highlighted selection
 function drawSelectionRange(cm, range, output) {
   let display = cm.display, doc = cm.doc
@@ -71,29 +73,37 @@ function drawSelectionRange(cm, range, output) {
     }
 
     iterateBidiSections(getOrder(lineObj, doc.direction), fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir) => {
-      let leftPos = coords(from, "left"), rightPos, left, right
-      if (from == to) {
-        rightPos = leftPos
-        left = right = leftPos.left
-      } else {
-        rightPos = coords(to - 1, "right")
-        if (dir == "rtl") { let tmp = leftPos; leftPos = rightPos; rightPos = tmp }
-        left = leftPos.left
-        right = rightPos.right
+      let fromPos, toPos
+      if (dir == "ltr") {
+        fromPos = coords(from, "left")
+        toPos = coords(to - 1, "right")
+        let fromLeft = fromArg == null && from == 0 ? leftSide : fromPos.left
+        let toRight = toArg == null && to == lineLen ? rightSide : toPos.right
+        if (toPos.top - fromPos.top <= 3) { // Single line
+          add(fromLeft, toPos.top, toRight - fromLeft, toPos.bottom)
+        } else { // Multiple lines
+          add(fromLeft, fromPos.top, null, fromPos.bottom)
+          if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top)
+          add(leftSide, toPos.top, toPos.right, toPos.bottom)
+        }
+      } else { // RTL
+        fromPos = coords(from, "right")
+        toPos = coords(to - 1, "left")
+        let fromRight = fromArg == null && from == 0 ? rightSide : fromPos.right
+        let toLeft = toArg == null && to == lineLen ? leftSide : toPos.left
+        if (toPos.top - fromPos.top <= 3) { // Single line
+          add(toLeft, toPos.top, fromRight - toLeft, toPos.bottom)
+        } else { // Multiple lines
+          add(leftSide, fromPos.top, fromRight - leftSide, fromPos.bottom)
+          if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top)
+          add(toLeft, toPos.top, null, toPos.bottom)
+        }
       }
-      if (fromArg == null && from == 0) left = leftSide
-      if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
-        add(left, leftPos.top, null, leftPos.bottom)
-        left = leftSide
-        if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top)
-      }
-      if (toArg == null && to == lineLen) right = rightSide
-      if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
-        start = leftPos
-      if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
-        end = rightPos
-      if (left < leftSide + 1) left = leftSide
-      add(left, rightPos.top, right - left, rightPos.bottom)
+
+      if (!start || cmpCoords(fromPos, start) < 0) start = fromPos
+      if (cmpCoords(toPos, start) < 0) start = toPos
+      if (!end || cmpCoords(fromPos, end) < 0) end = fromPos
+      if (cmpCoords(toPos, end) < 0) end = toPos
     })
     return {start: start, end: end}
   }
diff --git a/test/test.js b/test/test.js
index 59b760d5ae..0f1d8f830f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2468,6 +2468,12 @@ for (var i = 0; i < 5; ++i) {
 }
 */
 
+testCM("bidi_wrapped_selection", function(cm) {
+  cm.setSelection(Pos(0, 10), Pos(0, 190))
+  is(byClassName(cm.getWrapperElement(), "CodeMirror-selected").length >= 3)
+  is(false)
+}, {value: new Array(10).join(" فتي تم تضمينها فتي تم"), lineWrapping: true})
+
 testCM("delete_wrapped", function(cm) {
   makeItWrapAfter(cm, Pos(0, 2));
   cm.doc.setCursor(Pos(0, 3, "after"));

From cb2e469ace4af280802e1c8f0ec90390d369f9ed Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 29 Aug 2017 23:46:39 +0200
Subject: [PATCH 3473/4742] Remove debug statement

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

diff --git a/test/test.js b/test/test.js
index 0f1d8f830f..55d20864f1 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2471,7 +2471,6 @@ for (var i = 0; i < 5; ++i) {
 testCM("bidi_wrapped_selection", function(cm) {
   cm.setSelection(Pos(0, 10), Pos(0, 190))
   is(byClassName(cm.getWrapperElement(), "CodeMirror-selected").length >= 3)
-  is(false)
 }, {value: new Array(10).join(" فتي تم تضمينها فتي تم"), lineWrapping: true})
 
 testCM("delete_wrapped", function(cm) {

From 7975c320223c31f1c73f1d3cb1b93ab2ccaa59bc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 3 Sep 2017 14:15:31 +0200
Subject: [PATCH 3474/4742] [markdown mode] Don't call sub-mode indent unless
 it exists

Closes #4947
---
 mode/markdown/markdown.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 53f9164dde..b44a394e67 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -839,8 +839,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     },
 
     indent: function(state, textAfter, line) {
-      if (state.block == htmlBlock) return htmlMode.indent(state.htmlState, textAfter, line)
-      if (state.localState) return state.localMode.indent(state.localState, textAfter, line)
+      if (state.block == htmlBlock && htmlMode.indent) return htmlMode.indent(state.htmlState, textAfter, line)
+      if (state.localState && state.localMode.indent) return state.localMode.indent(state.localState, textAfter, line)
       return CodeMirror.Pass
     },
 

From 8705d1598410c2dd75a6de0f16e67be49f216106 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 3 Sep 2017 14:31:29 +0200
Subject: [PATCH 3475/4742] [javascript mode] Fix bad interaction between typed
 arrow params and object props

Closes #4942
---
 mode/javascript/javascript.js | 3 +++
 mode/javascript/test.js       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 7d62e92944..77bd59c372 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -491,6 +491,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);
+      var m // Work around fat-arrow-detection complication for detecting typescript typed arrow params
+      if (isTS && cx.state.fatArrowAt == cx.stream.start && (m = cx.stream.match(/^\s*:\s*/, false)))
+        cx.state.fatArrowAt = cx.stream.pos + m[0].length
       return cont(afterprop);
     } else if (type == "number" || type == "string") {
       cx.marked = jsonldMode ? "property" : (cx.style + " property");
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index f110b5c263..8b6ca41128 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -352,6 +352,9 @@
      "  [property constructor]([keyword readonly] [keyword private] [def x]) {}",
      "}")
 
+  TS("arrow prop",
+     "({[property a]: [def p] [operator =>] [variable-2 p]})")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 82693a9d2ff29c5ffcf3e29dd64dcdd4d992ebde Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakubvrana@google.com>
Date: Tue, 5 Sep 2017 14:41:54 +0200
Subject: [PATCH 3476/4742] [soy mode] Support injected data

Reference: https://developers.google.com/closure/templates/docs/concepts#injecteddata
---
 mode/soy/soy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index ba16363638..f986b8a064 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -87,7 +87,7 @@
           kindTag: [],
           soyState: [],
           templates: null,
-          variables: null,
+          variables: prepend(null, 'ij'),
           scopes: null,
           indent: 0,
           quoteKind: null,

From 5ef6dfc3ac46393bbca077b79aef1ad5d6f246b9 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 29 Aug 2017 20:58:03 -0700
Subject: [PATCH 3477/4742] [lint plugins] Undeprecate passing rules via
 lint.options

Linters like JSHint will complain if rules are mixed with the options for the linter addon, like onUpdateLinting and delay.
---
 addon/lint/lint.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 825065ed2a..a9eb8fa66b 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -138,7 +138,11 @@
 
   function startLinting(cm) {
     var state = cm.state.lint, options = state.options;
-    var passOptions = options.options || options; // Support deprecated passing of `options` property in options
+    /*
+     * Passing rules in `options` property prevents JSHint (and other linters) from complaining
+     * about unrecognized rules like `onUpdateLinting`, `delay`, `lintOnChange`, etc.
+     */
+    var passOptions = options.options || options;
     var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
     if (!getAnnotations) return;
     if (options.async || getAnnotations.async) {

From 850a92fb2083865fe4019e1df46a139c48441ec7 Mon Sep 17 00:00:00 2001
From: callodacity <callodacity@gmail.com>
Date: Sat, 9 Sep 2017 08:37:12 +1000
Subject: [PATCH 3478/4742] [mark-selection addon] Fix off-by-one bug

---
 addon/selection/mark-selection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index 6cceeae6c7..1602acc3de 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -86,7 +86,7 @@
     if (!array.length) return coverRange(cm, from, to);
 
     var coverStart = array[0].find(), coverEnd = array[array.length - 1].find();
-    if (!coverStart || !coverEnd || to.line - from.line < CHUNK_SIZE ||
+    if (!coverStart || !coverEnd || to.line - from.line <= CHUNK_SIZE ||
         cmp(from, coverEnd.to) >= 0 || cmp(to, coverStart.from) <= 0)
       return reset(cm);
 

From bde68f126ec80f5172969b921e72e25bb6600ba9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 11 Sep 2017 09:51:18 +0200
Subject: [PATCH 3479/4742] Set aria-label on input element in fromTextArea

Issue #4958
---
 src/edit/fromTextArea.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
index 5d920830b3..ec83232da9 100644
--- a/src/edit/fromTextArea.js
+++ b/src/edit/fromTextArea.js
@@ -57,5 +57,6 @@ export function fromTextArea(textarea, options) {
   textarea.style.display = "none"
   let cm = CodeMirror(node => textarea.parentNode.insertBefore(node, textarea.nextSibling),
     options)
+  if (textarea.id) cm.getInputField().setAttribute("aria-label", textarea.id)
   return cm
 }

From 248952edf26271b49ffe19ecc5792ed36a2c64fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 11 Sep 2017 16:41:13 +0200
Subject: [PATCH 3480/4742] Revert "Set aria-label on input element in
 fromTextArea"

As @afercia points out, this use of aria-label makes no sense.

Issue #4958

This reverts commit bde68f126ec80f5172969b921e72e25bb6600ba9.
---
 src/edit/fromTextArea.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
index ec83232da9..5d920830b3 100644
--- a/src/edit/fromTextArea.js
+++ b/src/edit/fromTextArea.js
@@ -57,6 +57,5 @@ export function fromTextArea(textarea, options) {
   textarea.style.display = "none"
   let cm = CodeMirror(node => textarea.parentNode.insertBefore(node, textarea.nextSibling),
     options)
-  if (textarea.id) cm.getInputField().setAttribute("aria-label", textarea.id)
   return cm
 }

From 2cff704fd44f418eae599ae05ac1547cc8c5e3fa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Sep 2017 08:15:36 +0200
Subject: [PATCH 3481/4742] [markdown mode] Allow uppercase X in task list
 syntax

Closes #4960
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index b44a394e67..f8b97694f3 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -85,7 +85,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
   ,   listRE = /^(?:[*\-+]|^[0-9]+([.)]))\s+/
-  ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow listRE
+  ,   taskListRE = /^\[(x| )\](?=\s)/i // Must follow listRE
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/

From e716c17e3bdfd10da477d92bd3fa2fb66cabbaa1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Sep 2017 10:53:52 +0200
Subject: [PATCH 3482/4742] [closebrackets addon] Make sure character sets
 passed as options are bound as keys

Issue #4956
---
 addon/edit/closebrackets.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 01fdd96ce1..36aec0d4b5 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -23,6 +23,7 @@
       cm.state.closeBrackets = null;
     }
     if (val) {
+      ensureBound(getOption(val, "pairs"))
       cm.state.closeBrackets = val;
       cm.addKeyMap(keyMap);
     }
@@ -34,10 +35,14 @@
     return defaults[name];
   }
 
-  var bind = defaults.pairs + "`";
   var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
-  for (var i = 0; i < bind.length; i++)
-    keyMap["'" + bind.charAt(i) + "'"] = handler(bind.charAt(i));
+  function ensureBound(chars) {
+    for (var i = 0; i < chars.length; i++) {
+      var ch = chars.charAt(i), key = "'" + ch + "'"
+      if (!keyMap[key]) keyMap[key] = handler(ch)
+    }
+  }
+  ensureBound(defaults.pairs + "`")
 
   function handler(ch) {
     return function(cm) { return handleChar(cm, ch); };

From 20f3c354fbce7802c9d6b838b8b4061e3e0c7210 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Sep 2017 16:09:13 +0200
Subject: [PATCH 3483/4742] [markdown mode] Fix another case of expecting task
 list x to be lowercase

Issue #4960
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index f8b97694f3..43b13f0f61 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -403,7 +403,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (state.taskList) {
-      var taskOpen = stream.match(taskListRE, true)[1] !== "x";
+      var taskOpen = stream.match(taskListRE, true)[1] !== " ";
       if (taskOpen) state.taskOpen = true;
       else state.taskClosed = true;
       if (modeCfg.highlightFormatting) state.formatting = "task";

From ee20357d279bf9edfed0047d3bf2a75b5f0a040f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Sep 2017 16:13:24 +0200
Subject: [PATCH 3484/4742] [markdown mode] Fix mistake in prev patch

Issue #4960
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 43b13f0f61..907059f101 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -403,7 +403,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (state.taskList) {
-      var taskOpen = stream.match(taskListRE, true)[1] !== " ";
+      var taskOpen = stream.match(taskListRE, true)[1] === " ";
       if (taskOpen) state.taskOpen = true;
       else state.taskClosed = true;
       if (modeCfg.highlightFormatting) state.formatting = "task";

From 3e1bb5fff682f8f6cbfaef0e56c61d62403d4798 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 13 Sep 2017 10:01:25 +0200
Subject: [PATCH 3485/4742] [search addon] Fix bug where empty query
 placeholder is treated as a real query

Closes #4963
---
 addon/search/search.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/search/search.js b/addon/search/search.js
index 82938b9a56..4059ccdd0e 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -117,6 +117,7 @@
     var state = getSearchState(cm);
     if (state.query) return findNext(cm, rev);
     var q = cm.getSelection() || state.lastQuery;
+    if (q instanceof RegExp && q.source == "x^") q = null
     if (persistent && cm.openDialog) {
       var hiding = null
       var searchNext = function(query, event) {

From 67379b827d111c97aaeebfca96f454b6ce0d3b23 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 13 Sep 2017 15:06:53 +0200
Subject: [PATCH 3486/4742] Work around bug in coordsChar-for-bidi algorithm

Issue #4926
---
 src/measurement/position_measurement.js | 10 ++++++----
 test/test.js                            |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 0f5f398757..72601559c9 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -464,8 +464,10 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
     outer: do {
       prevDiff = diff
       prevPos = pos
-      let i = 0
-      for (; i < steps; ++i) {
+      // Make these steps don't take us outside of the current bidi part
+      let bidiPart = order[getBidiPartAt(order, pos.ch, dir < 0 ? "before" : "after")]
+      let maxSteps = Math.max(1, Math.min(steps, (dir < 0) != (bidiPart.level % 2 > 0) ? pos.ch - bidiPart.from : bidiPart.to - pos.ch))
+      for (let i = 0; i < maxSteps; ++i) {
         let prevPos = pos
         pos = moveVisually(cm, lineObj, pos, dir)
         if (pos == null || pos.ch < begin || end <= (pos.sticky == "before" ? pos.ch - 1 : pos.ch)) {
@@ -475,8 +477,8 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
       }
       diff = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left - x
       if (steps > 1) {
-        let diff_change_per_step = Math.abs(diff - prevDiff) / steps
-        steps = Math.min(steps, Math.ceil(Math.abs(diff) / diff_change_per_step))
+        let diffChangePerStep = Math.abs(diff - prevDiff) / steps
+        steps = Math.min(steps, Math.ceil(Math.abs(diff) / diffChangePerStep))
         dir = diff < 0 ? 1 : -1
       }
     } while (diff != 0 && (steps > 1 || ((dir < 0) != (diff < 0) && (Math.abs(diff) <= Math.abs(prevDiff)))))
diff --git a/test/test.js b/test/test.js
index 55d20864f1..32a6c28080 100644
--- a/test/test.js
+++ b/test/test.js
@@ -254,6 +254,11 @@ testCM("coordsCharBidi", function(cm) {
   }
 }, {lineNumbers: true});
 
+testCM("badBidiOptimization", function(cm) {
+  let coords = cm.charCoords(Pos(0, 34))
+  eqCharPos(cm.coordsChar({left: coords.right, top: coords.top + 2}), Pos(0, 34))
+}, {value: "----------<p class=\"title\">هل يمكنك اختيار مستوى قسط التأمين الذي ترغب بدفعه؟</p>"})
+
 testCM("posFromIndex", function(cm) {
   cm.setValue(
     "This function should\n" +

From 79ab976875ea45aaedc060a409ffc0f54fec2d29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 13 Sep 2017 15:13:04 +0200
Subject: [PATCH 3487/4742] Fix ES6-ism in test.js

Which Phantom doesn't parse yet
---
 demo/bidi.html | 10 +++++++---
 test/test.js   |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/demo/bidi.html b/demo/bidi.html
index 645e648c86..349a3dba3e 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -26,8 +26,9 @@
 
 <article>
 <h2>Bi-directional Text Demo</h2>
-<form><textarea id="code" name="code"><!-- Piece of the CodeMirror manual, 'translated' into Arabic by Google Translate -->
+<form style="width: 70em"><textarea id="code" name="code"><!-- Piece of the CodeMirror manual, 'translated' into Arabic by Google Translate -->
 <!-- قطعة من دليل CodeMirror، "ترجم" إلى العربية بواسطة جوجل ترجمة -->
+          <p class="title">هل يمكنك اختيار مستوى قسط التأمين الذي ترغب بدفعه؟</p>
 
 <dl>
   <dt id=option_value><code>value (string or Doc)</code></dt>
@@ -74,8 +75,8 @@ <h2>Bi-directional Text Demo</h2>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   mode: "text/html",
   lineNumbers: true,
-  lineWrapping: true,
-  direction: "rtl"
+  lineWrapping: false,
+  direction: "ltr"
 });
 
 var dirRadios = {ltr: document.getElementById("ltr"),
@@ -97,6 +98,9 @@ <h2>Bi-directional Text Demo</h2>
 moveCheckbox.onchange = function() {
   editor.setOption("rtlMoveVisually", moveCheckbox.checked);
 };
+editor.on("cursorActivity", () => console.log(editor.getCursor("anchor"), editor.getCursor("head")))
+console.log(editor.coordsChar({left: 914, top: 122}, "window"))
+
 </script>
 
   <p>Demonstration of bi-directional text support. See
diff --git a/test/test.js b/test/test.js
index 32a6c28080..e61365d690 100644
--- a/test/test.js
+++ b/test/test.js
@@ -255,7 +255,7 @@ testCM("coordsCharBidi", function(cm) {
 }, {lineNumbers: true});
 
 testCM("badBidiOptimization", function(cm) {
-  let coords = cm.charCoords(Pos(0, 34))
+  var coords = cm.charCoords(Pos(0, 34))
   eqCharPos(cm.coordsChar({left: coords.right, top: coords.top + 2}), Pos(0, 34))
 }, {value: "----------<p class=\"title\">هل يمكنك اختيار مستوى قسط التأمين الذي ترغب بدفعه؟</p>"})
 

From 4ba596ea5af0a1f13fe0bb45588bbd7a12f48439 Mon Sep 17 00:00:00 2001
From: Aram Shatakhtsyan <aram90@users.noreply.github.com>
Date: Wed, 13 Sep 2017 17:50:45 -0700
Subject: [PATCH 3488/4742] Add CodeFights to the list of real-world users

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 7c5231ba81..f0a75abf72 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -45,6 +45,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>
       <li><a href="https://codebitt.com/">CodeBitt</a> (Code snippet sharing)</li>
       <li><a href="http://www.codebugapp.com/">Codebug</a> (PHP Xdebug front-end)</li>
+      <li><a href="http://codefights.com/">CodeFights</a> (practice programming)</li>
       <li><a href="https://github.com/angelozerr/CodeMirror-Eclipse">CodeMirror Eclipse</a> (embed CM in Eclipse)</li>
       <li><a href="http://emmet.io/blog/codemirror-movie/">CodeMirror movie</a> (scripted editing demos)</li>
       <li><a href="http://code.google.com/p/codemirror2-gwt/">CodeMirror2-GWT</a> (Google Web Toolkit wrapper)</li>

From 0506dfc565217bf6e5eed5c2770e2dbf30e1f6b2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 14 Sep 2017 09:05:51 +0200
Subject: [PATCH 3489/4742] Remove accidentally committed debug changes

---
 demo/bidi.html | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/demo/bidi.html b/demo/bidi.html
index 349a3dba3e..645e648c86 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -26,9 +26,8 @@
 
 <article>
 <h2>Bi-directional Text Demo</h2>
-<form style="width: 70em"><textarea id="code" name="code"><!-- Piece of the CodeMirror manual, 'translated' into Arabic by Google Translate -->
+<form><textarea id="code" name="code"><!-- Piece of the CodeMirror manual, 'translated' into Arabic by Google Translate -->
 <!-- قطعة من دليل CodeMirror، "ترجم" إلى العربية بواسطة جوجل ترجمة -->
-          <p class="title">هل يمكنك اختيار مستوى قسط التأمين الذي ترغب بدفعه؟</p>
 
 <dl>
   <dt id=option_value><code>value (string or Doc)</code></dt>
@@ -75,8 +74,8 @@ <h2>Bi-directional Text Demo</h2>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
   mode: "text/html",
   lineNumbers: true,
-  lineWrapping: false,
-  direction: "ltr"
+  lineWrapping: true,
+  direction: "rtl"
 });
 
 var dirRadios = {ltr: document.getElementById("ltr"),
@@ -98,9 +97,6 @@ <h2>Bi-directional Text Demo</h2>
 moveCheckbox.onchange = function() {
   editor.setOption("rtlMoveVisually", moveCheckbox.checked);
 };
-editor.on("cursorActivity", () => console.log(editor.getCursor("anchor"), editor.getCursor("head")))
-console.log(editor.coordsChar({left: 914, top: 122}, "window"))
-
 </script>
 
   <p>Demonstration of bi-directional text support. See

From 5a5c75fa68da86f5e0b85551d2282301b2c7c856 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 14 Sep 2017 11:11:51 +0200
Subject: [PATCH 3490/4742] Make binary search utility only call predicate once
 per position

---
 src/util/misc.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/util/misc.js b/src/util/misc.js
index 2ad1d0ed73..39661eb448 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -134,12 +134,17 @@ export function skipExtendingChars(str, pos, dir) {
 }
 
 // Returns the value from the range [`from`; `to`] that satisfies
-// `pred` and is closest to `from`. Assumes that at least `to` satisfies `pred`.
+// `pred` and is closest to `from`. Assumes that at least `to`
+// satisfies `pred`. Supports `from` being greater than `to`.
 export function findFirst(pred, from, to) {
+  // At any point we are certain `to` satisfies `pred`, don't know
+  // whether `from` does.
+  let dir = from > to ? -1 : 1
   for (;;) {
-    if (Math.abs(from - to) <= 1) return pred(from) ? from : to
-    let mid = Math.floor((from + to) / 2)
+    if (from == to) return from
+    let midF = (from + to) / 2, mid = dir < 0 ? Math.ceil(midF) : Math.floor(midF)
+    if (mid == from) return pred(mid) ? from : to
     if (pred(mid)) to = mid
-    else from = mid
+    else from = mid + dir
   }
 }

From 834199b2219284e6bfda083b653f5a83f2a01e6e Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 14 Sep 2017 21:56:41 +0200
Subject: [PATCH 3491/4742] [simplemode demo] Fix type of property `token`

---
 demo/simplemode.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/simplemode.html b/demo/simplemode.html
index d719b63d18..3774138049 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -67,7 +67,7 @@ <h2>Simple Mode Demo</h2>
   will be taken into account when matching the token. This regex
   should only capture groups when the <code>token</code> property is
   an array.</dd>
-  <dt><code><strong>token</strong></code>: string | null</dt>
+  <dt><code><strong>token</strong></code>: string | array&lt;string&gt; | null</dt>
   <dd>An optional token style. Multiple styles can be specified by
   separating them with dots or spaces. When the <code>regex</code> for
   this rule captures groups, it must capture <em>all</em> of the

From 57c1e62f44aee54967727af407595fc4f0d5a952 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 14 Sep 2017 22:37:41 +0200
Subject: [PATCH 3492/4742] [mode/simple addon] Don't try to style match groups
 when token is a string

Closes #4970
---
 addon/mode/simple.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index 15cc215825..744a66c034 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -136,7 +136,7 @@
             state.indent.pop();
           var token = rule.token
           if (token && token.apply) token = token(matches)
-          if (matches.length > 2) {
+          if (matches.length > 2 && typeof rule.token != "string") {
             state.pending = [];
             for (var j = 2; j < matches.length; j++)
               if (matches[j])

From 15b2903cc3ac98099ba13e18c61b34c8c92ec95c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 15 Sep 2017 13:05:12 +0200
Subject: [PATCH 3493/4742] Fix drawing of wrapped bidi selections

---
 src/display/selection.js                | 21 +++++++++++++++++----
 src/measurement/position_measurement.js |  1 +
 src/util/bidi.js                        |  4 ++--
 test/test.js                            | 12 +++++++++++-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/display/selection.js b/src/display/selection.js
index 32c9a611fe..2030b073d9 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -1,7 +1,7 @@
 import { Pos } from "../line/pos"
 import { visualLine } from "../line/spans"
 import { getLine } from "../line/utils_line"
-import { charCoords, cursorCoords, displayWidth, paddingH } from "../measurement/position_measurement"
+import { charCoords, cursorCoords, displayWidth, paddingH, wrappedLineExtentChar } from "../measurement/position_measurement"
 import { getOrder, iterateBidiSections } from "../util/bidi"
 import { elt } from "../util/dom"
 
@@ -72,7 +72,8 @@ function drawSelectionRange(cm, range, output) {
       return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
     }
 
-    iterateBidiSections(getOrder(lineObj, doc.direction), fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir) => {
+    let order = getOrder(lineObj, doc.direction)
+    iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir, i) => {
       let fromPos, toPos
       if (dir == "ltr") {
         fromPos = coords(from, "left")
@@ -94,9 +95,21 @@ function drawSelectionRange(cm, range, output) {
         if (toPos.top - fromPos.top <= 3) { // Single line
           add(toLeft, toPos.top, fromRight - toLeft, toPos.bottom)
         } else { // Multiple lines
-          add(leftSide, fromPos.top, fromRight - leftSide, fromPos.bottom)
+          let topLeft = leftSide
+          if (i) {
+            let topEnd = wrappedLineExtentChar(cm, lineObj, null, from).end
+            // The coordinates returned for an RTL wrapped space tend to
+            // be complete bogus, so try to skip that here.
+            topLeft = coords(topEnd - (/\s/.test(lineObj.text.charAt(topEnd - 1)) ? 2 : 1), "left").left
+          }
+          add(topLeft, fromPos.top, fromRight - topLeft, fromPos.bottom)
           if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top)
-          add(toLeft, toPos.top, null, toPos.bottom)
+          let botWidth = null
+          if (i < order.length  - 1 || true) {
+            let botStart = wrappedLineExtentChar(cm, lineObj, null, to).begin
+            botWidth = coords(botStart, "right").right - toLeft
+          }
+          add(toLeft, toPos.top, botWidth, toPos.bottom)
         }
       }
 
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 72601559c9..5995e91761 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -442,6 +442,7 @@ function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
 }
 
 export function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) {
+  if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj)
   let targetTop = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, target), "line").top
   return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop)
 }
diff --git a/src/util/bidi.js b/src/util/bidi.js
index e7429fce06..c3e63f7a3e 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -3,12 +3,12 @@ import { lst } from "./misc"
 // BIDI HELPERS
 
 export function iterateBidiSections(order, from, to, f) {
-  if (!order) return f(from, to, "ltr")
+  if (!order) return f(from, to, "ltr", 0)
   let found = false
   for (let i = 0; i < order.length; ++i) {
     let part = order[i]
     if (part.from < to && part.to > from || from == to && part.to == from) {
-      f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr")
+      f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr", i)
       found = true
     }
   }
diff --git a/test/test.js b/test/test.js
index e61365d690..15183511ec 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2473,11 +2473,21 @@ for (var i = 0; i < 5; ++i) {
 }
 */
 
-testCM("bidi_wrapped_selection", function(cm) {
+testCM("rtl_wrapped_selection", function(cm) {
   cm.setSelection(Pos(0, 10), Pos(0, 190))
   is(byClassName(cm.getWrapperElement(), "CodeMirror-selected").length >= 3)
 }, {value: new Array(10).join(" فتي تم تضمينها فتي تم"), lineWrapping: true})
 
+testCM("bidi_wrapped_selection", function(cm) {
+  cm.setSize(cm.charCoords(Pos(0, 10), "editor").left)
+  cm.setSelection(Pos(0, 37), Pos(0, 80))
+  var blocks = byClassName(cm.getWrapperElement(), "CodeMirror-selected")
+  eq(blocks.length, 2)
+  let boxTop = blocks[0].getBoundingClientRect(), boxBot = blocks[1].getBoundingClientRect()
+  is(boxTop.left > cm.charCoords(Pos(0, 1)).right)
+  is(boxBot.right < cm.charCoords(Pos(0, cm.getLine(0).length - 2)).left)
+}, {value: "<p>مفتي11 تم تضمينهفتي تم تضمينها فتي تفتي تم تضمينها فتي تفتي تم تضمينها فتي تفتي تم تضمينها فتي تا فت10ي ت</p>", lineWrapping: true})
+
 testCM("delete_wrapped", function(cm) {
   makeItWrapAfter(cm, Pos(0, 2));
   cm.doc.setCursor(Pos(0, 3, "after"));

From eb18ac4e7ca0153f52503ae3dc939308090545ab Mon Sep 17 00:00:00 2001
From: Louis Mauchet <louis.mauchet@atome.io>
Date: Fri, 15 Sep 2017 11:02:36 +0200
Subject: [PATCH 3494/4742] #4969 : Fix gutter click behaviour on touch devices

---
 src/edit/CodeMirror.js   | 2 ++
 src/edit/mouse_events.js | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 1b2758ec01..4cd2e39227 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -143,6 +143,8 @@ function registerEventHandlers(cm) {
     return dx * dx + dy * dy > 20 * 20
   }
   on(d.scroller, "touchstart", e => {
+    if (clickInGutter(cm, e)) return
+
     if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
       d.input.ensurePolled()
       clearTimeout(touchFinished)
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index f816a4ad41..25b7d4995c 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -326,8 +326,13 @@ function leftButtonSelect(cm, event, start, behavior) {
 // handlers for the corresponding event.
 function gutterEvent(cm, e, type, prevent) {
   let mX, mY
-  try { mX = e.clientX; mY = e.clientY }
-  catch(e) { return false }
+  if (e.type == "touchstart"){
+      try { mX = e.touches[0].clientX; mY = e.touches[0].clientY }
+      catch(e) { return false }
+  } else {
+      try { mX = e.clientX; mY = e.clientY }
+      catch(e) { return false }
+  }
   if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false
   if (prevent) e_preventDefault(e)
 

From dcbfd6e7053d1efd46f25f6a631b945ec04b25fd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 15 Sep 2017 13:10:06 +0200
Subject: [PATCH 3495/4742] Clean up previous patch

---
 src/edit/CodeMirror.js   |  4 +---
 src/edit/mouse_events.js | 10 +++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 4cd2e39227..0f0e58900c 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -143,9 +143,7 @@ function registerEventHandlers(cm) {
     return dx * dx + dy * dy > 20 * 20
   }
   on(d.scroller, "touchstart", e => {
-    if (clickInGutter(cm, e)) return
-
-    if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
+    if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e) && !clickInGutter(cm, e)) {
       d.input.ensurePolled()
       clearTimeout(touchFinished)
       let now = +new Date
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 25b7d4995c..e9b61ecdc7 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -326,12 +326,12 @@ function leftButtonSelect(cm, event, start, behavior) {
 // handlers for the corresponding event.
 function gutterEvent(cm, e, type, prevent) {
   let mX, mY
-  if (e.type == "touchstart"){
-      try { mX = e.touches[0].clientX; mY = e.touches[0].clientY }
-      catch(e) { return false }
+  if (e.touches) {
+    mX = e.touches[0].clientX
+    mY = e.touches[0].clientY
   } else {
-      try { mX = e.clientX; mY = e.clientY }
-      catch(e) { return false }
+    try { mX = e.clientX; mY = e.clientY }
+    catch(e) { return false }
   }
   if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false
   if (prevent) e_preventDefault(e)

From 6bb82e89a20b9cdf0384ff05567e856d7e1b138b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 15 Sep 2017 13:15:30 +0200
Subject: [PATCH 3496/4742] Fix tests again...

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

diff --git a/test/test.js b/test/test.js
index 15183511ec..2421c78a18 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2483,7 +2483,7 @@ testCM("bidi_wrapped_selection", function(cm) {
   cm.setSelection(Pos(0, 37), Pos(0, 80))
   var blocks = byClassName(cm.getWrapperElement(), "CodeMirror-selected")
   eq(blocks.length, 2)
-  let boxTop = blocks[0].getBoundingClientRect(), boxBot = blocks[1].getBoundingClientRect()
+  var boxTop = blocks[0].getBoundingClientRect(), boxBot = blocks[1].getBoundingClientRect()
   is(boxTop.left > cm.charCoords(Pos(0, 1)).right)
   is(boxBot.right < cm.charCoords(Pos(0, cm.getLine(0).length - 2)).left)
 }, {value: "<p>مفتي11 تم تضمينهفتي تم تضمينها فتي تفتي تم تضمينها فتي تفتي تم تضمينها فتي تفتي تم تضمينها فتي تا فت10ي ت</p>", lineWrapping: true})

From faadade2151e7a0801242c5302e92d4bd2156164 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 15 Sep 2017 13:18:57 +0200
Subject: [PATCH 3497/4742] Fix tests better

We really need to get rid of PhantomJS
---
 test/test.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/test.js b/test/test.js
index 2421c78a18..6faea6acac 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2482,8 +2482,9 @@ testCM("bidi_wrapped_selection", function(cm) {
   cm.setSize(cm.charCoords(Pos(0, 10), "editor").left)
   cm.setSelection(Pos(0, 37), Pos(0, 80))
   var blocks = byClassName(cm.getWrapperElement(), "CodeMirror-selected")
-  eq(blocks.length, 2)
-  var boxTop = blocks[0].getBoundingClientRect(), boxBot = blocks[1].getBoundingClientRect()
+  is(blocks.length >= 2)
+  is(blocks.length <= 3)
+  var boxTop = blocks[0].getBoundingClientRect(), boxBot = blocks[blocks.length - 1].getBoundingClientRect()
   is(boxTop.left > cm.charCoords(Pos(0, 1)).right)
   is(boxBot.right < cm.charCoords(Pos(0, cm.getLine(0).length - 2)).left)
 }, {value: "<p>مفتي11 تم تضمينهفتي تم تضمينها فتي تفتي تم تضمينها فتي تفتي تم تضمينها فتي تفتي تم تضمينها فتي تا فت10ي ت</p>", lineWrapping: true})

From 15912c3f7117b881e7d0df29a7ada5b29d269f39 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 14 Sep 2017 22:44:54 +0200
Subject: [PATCH 3498/4742] [mode/simple addon] Improve fix for #4970, adapt
 docs.

---
 addon/mode/simple.js |  2 +-
 demo/simplemode.html | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index 744a66c034..c0f801088c 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -136,7 +136,7 @@
             state.indent.pop();
           var token = rule.token
           if (token && token.apply) token = token(matches)
-          if (matches.length > 2 && typeof rule.token != "string") {
+          if (matches.length > 2 && rule.token && typeof rule.token != "string") {
             state.pending = [];
             for (var j = 2; j < matches.length; j++)
               if (matches[j])
diff --git a/demo/simplemode.html b/demo/simplemode.html
index 3774138049..04c194a4ba 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -65,15 +65,14 @@ <h2>Simple Mode Demo</h2>
   <dd>The regular expression that matches the token. May be a string
   or a regex object. When a regex, the <code>ignoreCase</code> flag
   will be taken into account when matching the token. This regex
-  should only capture groups when the <code>token</code> property is
-  an array.</dd>
+  has to capture groups when the <code>token</code> property is
+  an array. If it captures groups, it must capture <em>all</em> of the string
+  (since JS provides no way to find out where a group matched).</dd>
   <dt><code><strong>token</strong></code>: string | array&lt;string&gt; | null</dt>
   <dd>An optional token style. Multiple styles can be specified by
-  separating them with dots or spaces. When the <code>regex</code> for
-  this rule captures groups, it must capture <em>all</em> of the
-  string (since JS provides no way to find out where a group matched),
-  and this property must hold an array of token styles that has one
-  style for each matched group.</dd>
+  separating them with dots or spaces. When this property holds an array of token styles,
+  the <code>regex</code> for this rule must capture a group for each array item.
+  </dd>
   <dt><code><strong>sol</strong></code>: boolean</dt>
   <dd>When true, this token will only match at the start of the line.
   (The <code>^</code> regexp marker doesn't work as you'd expect in

From 5c087ac4e4fab2b3d9510caa006616535a207ff6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 15 Sep 2017 13:24:39 +0200
Subject: [PATCH 3499/4742] Give up and disable test on PhantomJS

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

diff --git a/test/test.js b/test/test.js
index 6faea6acac..6c7cf167ab 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2479,6 +2479,7 @@ testCM("rtl_wrapped_selection", function(cm) {
 }, {value: new Array(10).join(" فتي تم تضمينها فتي تم"), lineWrapping: true})
 
 testCM("bidi_wrapped_selection", function(cm) {
+  if (phantom) return
   cm.setSize(cm.charCoords(Pos(0, 10), "editor").left)
   cm.setSelection(Pos(0, 37), Pos(0, 80))
   var blocks = byClassName(cm.getWrapperElement(), "CodeMirror-selected")

From 68b4f44e3c6ea789abd454e1beac829c3afad26a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 14 Sep 2017 15:15:24 +0200
Subject: [PATCH 3500/4742] Rewrite coordsCharInner

Issue #4926
---
 src/measurement/position_measurement.js | 191 ++++++++++++++++--------
 test/test.js                            |  10 ++
 2 files changed, 141 insertions(+), 60 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 5995e91761..36e60601ae 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -1,4 +1,3 @@
-import { moveVisually } from "../input/movement"
 import { buildLineContent, LineView } from "../line/line_data"
 import { clipPos, Pos } from "../line/pos"
 import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans"
@@ -293,14 +292,21 @@ function pageScrollY() {
   return window.pageYOffset || (document.documentElement || document.body).scrollTop
 }
 
+function widgetTopHeight(lineObj) {
+  let height = 0
+  if (lineObj.widgets) for (let i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above)
+    height += widgetHeight(lineObj.widgets[i])
+  return height
+}
+
 // Converts a {top, bottom, left, right} box from line-local
 // coordinates into another coordinate system. Context may be one of
 // "line", "div" (display.lineDiv), "local"./null (editor), "window",
 // or "page".
 export function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) {
-  if (!includeWidgets && lineObj.widgets) for (let i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
-    let size = widgetHeight(lineObj.widgets[i])
-    rect.top += size; rect.bottom += size
+  if (!includeWidgets) {
+    let height = widgetTopHeight(lineObj)
+    rect.top += height; rect.bottom += height
   }
   if (context == "line") return rect
   if (!context) context = "local"
@@ -376,7 +382,7 @@ export function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeig
   if (!order) return get(sticky == "before" ? ch - 1 : ch, sticky == "before")
 
   function getBidi(ch, partPos, invert) {
-    let part = order[partPos], right = (part.level % 2) != 0
+    let part = order[partPos], right = part.level == 1
     return get(invert ? ch - 1 : ch, right != invert)
   }
   let partPos = getBidiPartAt(order, ch, sticky)
@@ -434,10 +440,10 @@ export function coordsChar(cm, x, y) {
 }
 
 function wrappedLineExtent(cm, lineObj, preparedMeasure, y) {
-  let measure = ch => intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
+  y -= widgetTopHeight(lineObj)
   let end = lineObj.text.length
-  let begin = findFirst(ch => measure(ch - 1).bottom <= y, end, 0)
-  end = findFirst(ch => measure(ch).top > y, begin, end)
+  let begin = findFirst(ch => measureCharPrepared(cm, preparedMeasure, ch - 1).bottom <= y, end, 0)
+  end = findFirst(ch => measureCharPrepared(cm, preparedMeasure, ch).top > y, begin, end)
   return {begin, end}
 }
 
@@ -447,66 +453,131 @@ export function wrappedLineExtentChar(cm, lineObj, preparedMeasure, target) {
   return wrappedLineExtent(cm, lineObj, preparedMeasure, targetTop)
 }
 
+// Returns true if the given side of a box is after the given
+// coordinates, in top-to-bottom, left-to-right order.
+function boxIsAfter(box, x, y, left) {
+  return box.bottom <= y ? false : box.top > y ? true : (left ? box.left : box.right) > x
+}
+
 function coordsCharInner(cm, lineObj, lineNo, x, y) {
+  // Move y into line-local coordinate space
   y -= heightAtLine(lineObj)
-  let begin = 0, end = lineObj.text.length
   let preparedMeasure = prepareMeasureForLine(cm, lineObj)
-  let pos
+  // When directly calling `measureCharPrepared`, we have to adjust
+  // for the widgets at this line.
+  let widgetHeight = widgetTopHeight(lineObj)
+  let begin = 0, end = lineObj.text.length, ltr = true
+
   let order = getOrder(lineObj, cm.doc.direction)
+  // If the line isn't plain left-to-right text, first figure out
+  // which bidi section the coordinates fall into.
   if (order) {
-    if (cm.options.lineWrapping) {
-      ;({begin, end} = wrappedLineExtent(cm, lineObj, preparedMeasure, y))
-    }
-    pos = new Pos(lineNo, Math.floor(begin + (end - begin) / 2))
-    let beginLeft = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left
-    let dir = beginLeft < x ? 1 : -1
-    let prevDiff, diff = beginLeft - x, prevPos
-    let steps = Math.ceil((end - begin) / 4)
-    outer: do {
-      prevDiff = diff
-      prevPos = pos
-      // Make these steps don't take us outside of the current bidi part
-      let bidiPart = order[getBidiPartAt(order, pos.ch, dir < 0 ? "before" : "after")]
-      let maxSteps = Math.max(1, Math.min(steps, (dir < 0) != (bidiPart.level % 2 > 0) ? pos.ch - bidiPart.from : bidiPart.to - pos.ch))
-      for (let i = 0; i < maxSteps; ++i) {
-        let prevPos = pos
-        pos = moveVisually(cm, lineObj, pos, dir)
-        if (pos == null || pos.ch < begin || end <= (pos.sticky == "before" ? pos.ch - 1 : pos.ch)) {
-          pos = prevPos
-          break outer
-        }
-      }
-      diff = cursorCoords(cm, pos, "line", lineObj, preparedMeasure).left - x
-      if (steps > 1) {
-        let diffChangePerStep = Math.abs(diff - prevDiff) / steps
-        steps = Math.min(steps, Math.ceil(Math.abs(diff) / diffChangePerStep))
-        dir = diff < 0 ? 1 : -1
-      }
-    } while (diff != 0 && (steps > 1 || ((dir < 0) != (diff < 0) && (Math.abs(diff) <= Math.abs(prevDiff)))))
-    if (Math.abs(diff) > Math.abs(prevDiff)) {
-      if ((diff < 0) == (prevDiff < 0)) throw new Error("Broke out of infinite loop in coordsCharInner")
-      pos = prevPos
+    let part = (cm.options.lineWrapping ? coordsBidiPartWrapped : coordsBidiPart)
+                 (cm, lineObj, lineNo, preparedMeasure, order, x, y)
+    ltr = part.level != 1
+    // The awkward -1 offsets are needed because findFirst (called
+    // on these below) will treat its first bound as inclusive,
+    // second as exclusive, but we want to actually address the
+    // characters in the part's range
+    begin = ltr ? part.from : part.to - 1
+    end = ltr ? part.to : part.from - 1
+  }
+
+  // A binary search to find the first character whose bounding box
+  // starts after the coordinates. If we run across any whose box wrap
+  // the coordinates, store that.
+  let chAround = null, boxAround = null
+  let ch = findFirst(ch => {
+    let box = measureCharPrepared(cm, preparedMeasure, ch)
+    box.top += widgetHeight; box.bottom += widgetHeight
+    if (!boxIsAfter(box, x, y, false)) return false
+    if (box.top <= y && box.left <= x) {
+      chAround = ch
+      boxAround = box
     }
+    return true
+  }, begin, end)
+
+  let baseX, sticky, outside = false
+  // If a box around the coordinates was found, use that
+  if (boxAround) {
+    // Distinguish coordinates nearer to the left or right side of the box
+    let atLeft = x - boxAround.left < boxAround.right - x, atStart = atLeft == ltr
+    ch = chAround + (atStart ? 0 : 1)
+    sticky = atStart ? "after" : "before"
+    baseX = atLeft ? boxAround.left : boxAround.right
   } else {
-    let ch = findFirst(ch => {
-      let box = intoCoordSystem(cm, lineObj, measureCharPrepared(cm, preparedMeasure, ch), "line")
-      if (box.top > y) {
-        // For the cursor stickiness
-        end = Math.min(ch, end)
-        return true
-      }
-      else if (box.bottom <= y) return false
-      else if (box.left > x) return true
-      else if (box.right < x) return false
-      else return (x - box.left < box.right - x)
-    }, begin, end)
-    ch = skipExtendingChars(lineObj.text, ch, 1)
-    pos = new Pos(lineNo, ch, ch == end ? "before" : "after")
+    // (Adjust for extended bound, if necessary.)
+    if (!ltr && (ch == end || ch == begin)) ch++
+    // To determine which side to associate with, get the box to the
+    // left of the character and compare it's vertical position to the
+    // coordinates
+    sticky = ch == 0 ? "after" : ch == lineObj.text.length ? "before" :
+      (measureCharPrepared(cm, preparedMeasure, ch - (ltr ? 1 : 0)).bottom + widgetHeight <= y) == ltr ?
+      "after" : "before"
+    // Now get accurate coordinates for this place, in order to get a
+    // base X position
+    let coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure)
+    baseX = coords.left
+    outside = y < coords.top || y > coords.bottom
   }
-  let coords = cursorCoords(cm, pos, "line", lineObj, preparedMeasure)
-  if (y < coords.top || coords.bottom < y) pos.outside = true
-  pos.xRel = x < coords.left ? -1 : (x > coords.right ? 1 : 0)
-  return pos
+
+  ch = skipExtendingChars(lineObj.text, ch, 1)
+  return PosWithInfo(lineNo, ch, sticky, outside, x - baseX)
+}
+
+function coordsBidiPart(cm, lineObj, lineNo, preparedMeasure, order, x, y) {
+  // Bidi parts are sorted left-to-right, and in a non-line-wrapping
+  // situation, we can take this ordering to correspond to the visual
+  // ordering. This finds the first part whose end is after the given
+  // coordinates.
+  let index = findFirst(i => {
+    let part = order[i], ltr = part.level != 1
+    return boxIsAfter(cursorCoords(cm, Pos(lineNo, ltr ? part.to : part.from, ltr ? "before" : "after"),
+                                   "line", lineObj, preparedMeasure), x, y, true)
+  }, 0, order.length - 1)
+  let part = order[index]
+  // If this isn't the first part, the part's start is also after
+  // the coordinates, and the coordinates aren't on the same line as
+  // that start, move one part back.
+  if (index > 0) {
+    let ltr = part.level != 1
+    let start = cursorCoords(cm, Pos(lineNo, ltr ? part.from : part.to, ltr ? "after" : "before"),
+                             "line", lineObj, preparedMeasure)
+    if (boxIsAfter(start, x, y, true) && start.top > y)
+      part = order[index - 1]
+  }
+  return part
+}
+
+function coordsBidiPartWrapped(cm, lineObj, _lineNo, preparedMeasure, order, x, y) {
+  // In a wrapped line, rtl text on wrapping boundaries can do things
+  // that don't correspond to the ordering in our `order` array at
+  // all, so a binary search doesn't work, and we want to return a
+  // part that only spans one line so that the binary search in
+  // coordsCharInner is safe. As such, we first find the extent of the
+  // wrapped line, and then do a flat search in which we discard any
+  // spans that aren't on the line.
+  let {begin, end} = wrappedLineExtent(cm, lineObj, preparedMeasure, y)
+  let part = null, closestDist = null
+  for (let i = 0; i < order.length; i++) {
+    let p = order[i]
+    if (p.from >= end || p.to <= begin) continue
+    let ltr = p.level != 1
+    let endX = measureCharPrepared(cm, preparedMeasure, ltr ? Math.min(end, p.to) - 1 : Math.max(begin, p.from)).right
+    // Weigh against spans ending before this, so that they are only
+    // picked if nothing ends after
+    let dist = endX < x ? x - endX + 1e9 : endX - x
+    if (!part || closestDist > dist) {
+      part = p
+      closestDist = dist
+    }
+  }
+  if (!part) part = order[order.length - 1]
+  // Clip the part to the wrapped line.
+  if (part.from < begin) part = {from: begin, to: part.to, level: part.level}
+  if (part.to > end) part = {from: part.from, to: end, level: part.level}
+  return part
 }
 
 let measureText
diff --git a/test/test.js b/test/test.js
index 6c7cf167ab..96e989d12c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1161,6 +1161,16 @@ testCM("measureWrappedEndOfLine", function(cm) {
   }
 }, {mode: "text/html", value: "0123456789abcde0123456789", lineWrapping: true}, ie_lt8 || opera_lt10);
 
+testCM("measureEndOfLineBidi", function(cm) {
+  eqCursorPos(cm.coordsChar({left: 5000, top: cm.charCoords(Pos(0, 0)).top}), Pos(0, 8, "after"))
+}, {value: "إإإإuuuuإإإإ"})
+
+testCM("measureWrappedBidiLevel2", function(cm) {
+  cm.setSize(cm.charCoords(Pos(0, 6), "editor").right + 60)
+  var c9 = cm.charCoords(Pos(0, 9))
+  eqCharPos(cm.coordsChar({left: c9.right - 1, top: c9.top + 1}), Pos(0, 9))
+}, {value: "foobar إإ إإ إإ إإ 555 بببببب", lineWrapping: true})
+
 testCM("measureWrappedBeginOfLine", function(cm) {
   if (phantom) return;
   cm.setSize(null, "auto");

From 1f06484ce98b0010e5a2531b2d1a7ae3f286a8a0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 18 Sep 2017 11:19:51 +0200
Subject: [PATCH 3501/4742] Fix issue when drawing selection starting at the
 end of an rtl line

---
 src/display/selection.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/display/selection.js b/src/display/selection.js
index 2030b073d9..252f1474fc 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -74,10 +74,9 @@ function drawSelectionRange(cm, range, output) {
 
     let order = getOrder(lineObj, doc.direction)
     iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir, i) => {
-      let fromPos, toPos
+      let fromPos = coords(from, dir == "ltr" ? "left" : "right")
+      let toPos = coords(to - 1, dir == "ltr" ? "right" : "left")
       if (dir == "ltr") {
-        fromPos = coords(from, "left")
-        toPos = coords(to - 1, "right")
         let fromLeft = fromArg == null && from == 0 ? leftSide : fromPos.left
         let toRight = toArg == null && to == lineLen ? rightSide : toPos.right
         if (toPos.top - fromPos.top <= 3) { // Single line
@@ -87,9 +86,7 @@ function drawSelectionRange(cm, range, output) {
           if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top)
           add(leftSide, toPos.top, toPos.right, toPos.bottom)
         }
-      } else { // RTL
-        fromPos = coords(from, "right")
-        toPos = coords(to - 1, "left")
+      } else if (from < to) { // RTL
         let fromRight = fromArg == null && from == 0 ? rightSide : fromPos.right
         let toLeft = toArg == null && to == lineLen ? leftSide : toPos.left
         if (toPos.top - fromPos.top <= 3) { // Single line

From febbe7cb4ae2d6785d7aaac6cbd14d6f93a6e179 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 18 Sep 2017 11:22:18 +0200
Subject: [PATCH 3502/4742] Normalize anchors on bidi jumps when
 mouse-selecting

To avoid unpredictable selection behavior depending on whether the
mouse drag started a pixel to the left or right of the boundary.

Issue #4926
---
 src/edit/mouse_events.js | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index e9b61ecdc7..688907669f 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -8,6 +8,7 @@ import { eventInWidget } from "../measurement/widgets"
 import { normalizeSelection, Range, Selection } from "../model/selection"
 import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates"
 import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser"
+import { getOrder, getBidiPartAt } from "../util/bidi"
 import { activeElt } from "../util/dom"
 import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event"
 import { dragAndDrop } from "../util/feature_detection"
@@ -269,7 +270,7 @@ function leftButtonSelect(cm, event, start, behavior) {
         anchor = maxPos(oldRange.to(), range.head)
       }
       let ranges = startSel.ranges.slice(0)
-      ranges[ourIndex] = new Range(clipPos(doc, anchor), head)
+      ranges[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head))
       setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse)
     }
   }
@@ -321,6 +322,32 @@ function leftButtonSelect(cm, event, start, behavior) {
   on(document, "mouseup", up)
 }
 
+// Used when mouse-selecting to adjust the anchor to the proper side
+// of a bidi jump depending on the visual position of the head.
+function bidiSimplify(cm, range) {
+  let {anchor, head} = range, anchorLine = getLine(cm.doc, anchor.line)
+  if (cmp(anchor, head) == 0 && anchor.sticky == head.sticky) return range
+  let order = getOrder(anchorLine)
+  if (!order) return range
+  let index = getBidiPartAt(order, anchor.ch, anchor.sticky), part = order[index]
+  if (part.from != anchor.ch && part.to != anchor.ch) return range
+  let boundary = index + ((part.from == anchor.ch) == (part.level != 1) ? 0 : 1)
+  if (boundary == 0 || boundary == order.length) return range
+
+  // Compute the relative visual position of the head compared to the
+  // anchor (<0 is to the left, >0 to the right)
+  let dir = head.line - anchor.line
+  if (dir == 0) {
+    let headIndex = getBidiPartAt(order, head.ch, head.sticky)
+    dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1)
+  }
+
+  let biasTo = boundary + (dir < 0 ? -1 : 0)
+  if (biasTo == index) return range
+  let targetPart = order[biasTo], from = (dir > 0) == (targetPart.level != 1)
+  return new Range(new Pos(anchor.line, from ? targetPart.from : targetPart.to, from ? "after" : "before"), head)
+}
+
 
 // Determines whether an event happened in the gutter, and fires the
 // handlers for the corresponding event.

From e5a13e622afb152e6411a8e8ce632a2cbe56b40a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 18 Sep 2017 11:38:26 +0200
Subject: [PATCH 3503/4742] [gfm mode] Require at least one number in the first
 6 digits of a SHA

To avoid matching words that happen to consist of a-f.

Closes #4966
---
 mode/gfm/gfm.js  | 2 +-
 mode/gfm/test.js | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 689cd6e2ec..471ae906b9 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -81,7 +81,7 @@ CodeMirror.defineMode("gfm", function(config, modeConfig) {
       if (stream.sol() || state.ateSpace) {
         state.ateSpace = false;
         if (modeConfig.gitHubSpice !== false) {
-          if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
+          if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?=.{0,6}\d)(?:[a-f0-9]{7,40}\b)/)) {
             // User/Project@SHA
             // User@SHA
             // SHA
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index 9cda5c45a3..e7135264c3 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -91,6 +91,9 @@
   MT("userProjectSHAEmphasis",
      "[em *foo ][em&link bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2][em *]");
 
+  MT("wordSHA",
+     "ask for feedbac")
+
   MT("num",
      "foo [link #1] bar");
 

From e4b1293d1246885025add6459c95e7188b66288b Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 18 Sep 2017 12:17:37 +0200
Subject: [PATCH 3504/4742] Don't check whether document has focus for
 takeFocus

Closes #4975. Checking `hasFocus` is a reasonable idea, but in Firefox
`hasFocus` returns false on `mousedown` if the window, but not the document
was focussed before. This leads to a wrong cursor in `contenteditable`
input style.
---
 src/display/operations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 6748af43e3..46e77cae3c 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -115,7 +115,7 @@ function endOperation_W2(op) {
     cm.display.maxLineChanged = false
   }
 
-  let takeFocus = op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus())
+  let takeFocus = op.focus && op.focus == activeElt()
   if (op.preparedSelection)
     cm.display.input.showSelection(op.preparedSelection, takeFocus)
   if (op.updatedDisplay || op.startHeight != cm.doc.height)

From 954c51e9c1b6db24ff566cc2fcb1c9c23f3a9da2 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 18 Sep 2017 12:26:09 +0200
Subject: [PATCH 3505/4742] Don't pass argument nobody expects

---
 src/display/operations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 46e77cae3c..c3004508e7 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -102,7 +102,7 @@ function endOperation_R2(op) {
   }
 
   if (op.updatedDisplay || op.selectionChanged)
-    op.preparedSelection = display.input.prepareSelection(op.focus)
+    op.preparedSelection = display.input.prepareSelection()
 }
 
 function endOperation_W2(op) {

From 635683b394cc486d869065858a5f3ef69bf26168 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 18 Sep 2017 12:27:22 +0200
Subject: [PATCH 3506/4742] Use more nice ES6 things

---
 src/display/selection.js | 4 ++--
 src/model/changes.js     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/display/selection.js b/src/display/selection.js
index 252f1474fc..ba6feb8f14 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -9,13 +9,13 @@ export function updateSelection(cm) {
   cm.display.input.showSelection(cm.display.input.prepareSelection())
 }
 
-export function prepareSelection(cm, primary) {
+export function prepareSelection(cm, primary = true) {
   let doc = cm.doc, result = {}
   let curFragment = result.cursors = document.createDocumentFragment()
   let selFragment = result.selection = document.createDocumentFragment()
 
   for (let i = 0; i < doc.sel.ranges.length; i++) {
-    if (primary === false && i == doc.sel.primIndex) continue
+    if (!primary && i == doc.sel.primIndex) continue
     let range = doc.sel.ranges[i]
     if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue
     let collapsed = range.empty()
diff --git a/src/model/changes.js b/src/model/changes.js
index 308dc6b399..fd5ddd4c25 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -260,9 +260,9 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
 
 export function replaceRange(doc, code, from, to, origin) {
   if (!to) to = from
-  if (cmp(to, from) < 0) { let tmp = to; to = from; from = tmp }
+  if (cmp(to, from) < 0) { [from, to] = [to, from] }
   if (typeof code == "string") code = doc.splitLines(code)
-  makeChange(doc, {from: from, to: to, text: code, origin: origin})
+  makeChange(doc, {from, to, text: code, origin})
 }
 
 // Rebasing/resetting history to deal with externally-sourced changes

From 8f35a1aa387c34677338d66086b15f0ed68f661a Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Mon, 18 Sep 2017 13:07:13 +0200
Subject: [PATCH 3507/4742] Remove superflous brackets and make blint happy

---
 src/model/changes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/changes.js b/src/model/changes.js
index fd5ddd4c25..cfad529c68 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -260,7 +260,7 @@ function makeChangeSingleDocInEditor(cm, change, spans) {
 
 export function replaceRange(doc, code, from, to, origin) {
   if (!to) to = from
-  if (cmp(to, from) < 0) { [from, to] = [to, from] }
+  if (cmp(to, from) < 0) [from, to] = [to, from]
   if (typeof code == "string") code = doc.splitLines(code)
   makeChange(doc, {from, to, text: code, origin})
 }

From ed6454389872e29af75adef63647621bee64c332 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakubvrana@google.com>
Date: Mon, 18 Sep 2017 16:19:54 +0200
Subject: [PATCH 3508/4742] [soy mode] Support @param declarations in comments

@param specified in a template comment is older but still supported way of
declaring a parameter. The comment must directly precede {template}.

Reference: https://developers.google.com/closure/templates/docs/concepts#namespace-decl
---
 mode/soy/soy.js | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index f986b8a064..0e24457042 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -128,6 +128,13 @@
             } else {
               stream.skipToEnd();
             }
+            if (!state.scopes) {
+              var paramRe = /@param\??\s+(\S+)/g;
+              var current = stream.current();
+              for (var match; (match = paramRe.exec(current)); ) {
+                state.variables = prepend(state.variables, match[1]);
+              }
+            }
             return "comment";
 
           case "templ-def":
@@ -187,6 +194,7 @@
             if (stream.match(/^\/?}/)) {
               if (state.tag == "/template" || state.tag == "/deltemplate") {
                 popscope(state);
+                state.variables = prepend(null, 'ij');
                 state.indent = 0;
               } else {
                 if (state.tag == "/for" || state.tag == "/foreach") {
@@ -248,8 +256,14 @@
 
         if (stream.match(/^\/\*/)) {
           state.soyState.push("comment");
+          if (!state.scopes) {
+            state.variables = prepend(null, 'ij');
+          }
           return "comment";
         } else if (stream.match(stream.sol() ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
+          if (!state.scopes) {
+            state.variables = prepend(null, 'ij');
+          }
           return "comment";
         } else if (stream.match(/^\{literal}/)) {
           state.indent += config.indentUnit;
@@ -274,18 +288,18 @@
           state.soyState.push("tag");
           if (state.tag == "template" || state.tag == "deltemplate") {
             state.soyState.push("templ-def");
-          }
-          if (state.tag == "call" || state.tag == "delcall") {
+          } else if (state.tag == "call" || state.tag == "delcall") {
             state.soyState.push("templ-ref");
-          }
-          if (state.tag == "let") {
+          } else if (state.tag == "let") {
             state.soyState.push("var-def");
-          }
-          if (state.tag == "for" || state.tag == "foreach") {
+          } else if (state.tag == "for" || state.tag == "foreach") {
             state.scopes = prepend(state.scopes, state.variables);
             state.soyState.push("var-def");
-          }
-          if (state.tag.match(/^@(?:param\??|inject)/)) {
+          } else if (state.tag == "namespace") {
+            if (!state.scopes) {
+              state.variables = prepend(null, 'ij');
+            }
+          } else if (state.tag.match(/^@(?:param\??|inject)/)) {
             state.soyState.push("param-def");
           }
           return "keyword";

From 6fccbea411dca29e8f985ca06f42d65acd71383b Mon Sep 17 00:00:00 2001
From: Daniel Thwaites <danthwaites30@btinternet.com>
Date: Mon, 18 Sep 2017 19:09:40 +0100
Subject: [PATCH 3509/4742] Emphasised on highlighting

Mentioned CodeMirror's great ability to highlight code.
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3328e3bdfb..a3a351be4d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@
 CodeMirror is a versatile text editor implemented in JavaScript for
 the browser. It is specialized for editing code, and comes with over
 100 language modes and various addons that implement more advanced
-editing functionality.
+editing functionality. Every language comes with fully-featured code
+and syntax highlighting to help with reading and editing complex code.
 
 A rich programming API and a CSS theming system are available for
 customizing CodeMirror to fit your application, and extending it with

From 697556c910521b916c6d53071820259ea2f7f7a2 Mon Sep 17 00:00:00 2001
From: Daniel Thwaites <danthwaites30@btinternet.com>
Date: Mon, 18 Sep 2017 19:21:11 +0100
Subject: [PATCH 3510/4742] Improved description

Improved the description of "make the problem occur", explaining that maintainers want to reproduce the error.
---
 doc/reporting.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/reporting.html b/doc/reporting.html
index 3c582d9618..1657400ce9 100644
--- a/doc/reporting.html
+++ b/doc/reporting.html
@@ -44,9 +44,8 @@ <h2>Reporting bugs effectively</h2>
 
   <li>Mention very precisely what went wrong. "X is broken" is not a
   good bug report. What did you expect to happen? What happened
-  instead? Describe the exact steps a maintainer has to take to make
-  the problem occur. We can not fix something that we can not
-  observe.</li>
+  instead? Describe the exact steps a maintainer has to take to reproduce
+  the error. We can not fix something that we can not observe.</li>
 
   <li>If the problem can not be reproduced in any of the demos
   included in the CodeMirror distribution, please provide an HTML

From 036beb5408be701e160597460d5a3a9e8cd96146 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Sep 2017 10:21:17 +0200
Subject: [PATCH 3511/4742] [javascript mode] Handle some corner cases around
 tokenizing regexps

Issue #4981
---
 mode/javascript/javascript.js | 9 +++++++--
 mode/javascript/test.js       | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 77bd59c372..a011eb8d70 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -28,7 +28,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     var jsKeywords = {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C,
+      "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "void": C, "throw": C, "debugger": C,
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
       "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
@@ -443,6 +443,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ".") return cont(property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
     if (isTS && value == "as") { cx.marked = "keyword"; return cont(typeexpr, me) }
+    if (type == "regexp") {
+      cx.state.lastType = cx.marked = "operator"
+      cx.stream.backUp(cx.stream.pos - cx.stream.start - 1)
+      return cont(expr)
+    }
   }
   function quasi(type, value) {
     if (type != "quasi") return pass();
@@ -739,7 +744,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   function expressionAllowed(stream, state, backUp) {
     return state.tokenize == tokenBase &&
-      /^(?:operator|sof|keyword c|case|new|export|default|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+      /^(?:operator|sof|keyword [bc]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
       (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
   }
 
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 8b6ca41128..7b0892cfab 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -236,6 +236,15 @@
      "    [keyword return] [number 2]",
      "}")
 
+  MT("regexp_corner_case",
+     "[operator +]{} [operator /] [atom undefined];",
+     "[[[meta ...][string-2 /\\//] ]];",
+     "[keyword void] [string-2 /\\//];",
+     "[keyword do] [string-2 /\\//]; [keyword while] ([number 0]);",
+     "[keyword if] ([number 0]) {} [keyword else] [string-2 /\\//];",
+     "[string-2 `${][variable async][operator ++][string-2 }//`];",
+     "[string-2 `${]{} [operator /] [string-2 /\\//}`];")
+
   var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
   function TS(name) {
     test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))

From c700778446124170e605dd5b96ffacd453934be2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Sep 2017 15:25:06 +0200
Subject: [PATCH 3512/4742] Further refine mouse-selection bidi adjustment

Issue #4926
---
 src/edit/mouse_events.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 688907669f..57159e3a14 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -336,16 +336,22 @@ function bidiSimplify(cm, range) {
 
   // Compute the relative visual position of the head compared to the
   // anchor (<0 is to the left, >0 to the right)
-  let dir = head.line - anchor.line
-  if (dir == 0) {
+  let leftSide
+  if (head.line != anchor.line) {
+    leftSide = (head.line - anchor.line) * (cm.doc.direction == "ltr" ? 1 : -1) > 0
+  } else {
     let headIndex = getBidiPartAt(order, head.ch, head.sticky)
-    dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1)
+    let dir = headIndex - index || (head.ch - anchor.ch) * (part.level == 1 ? -1 : 1)
+    if (headIndex == boundary - 1 || headIndex == boundary)
+      leftSide = dir < 0
+    else
+      leftSide = dir > 0
   }
 
-  let biasTo = boundary + (dir < 0 ? -1 : 0)
-  if (biasTo == index) return range
-  let targetPart = order[biasTo], from = (dir > 0) == (targetPart.level != 1)
-  return new Range(new Pos(anchor.line, from ? targetPart.from : targetPart.to, from ? "after" : "before"), head)
+  let usePart = order[boundary + (leftSide ? -1 : 0)]
+  let from = leftSide == (usePart.level == 1)
+  let ch = from ? usePart.from : usePart.to, sticky = from ? "after" : "before"
+  return anchor.ch == ch && anchor.sticky == sticky ? range : new Range(new Pos(anchor.line, ch, sticky), head)
 }
 
 

From d9be8fc44ff0b7751cc784285df07fc628b522de Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Sep 2017 15:51:10 +0200
Subject: [PATCH 3513/4742] [javascript mode] Allow decorators on parameters

Though the decorator proposal doesn't support this, it is
apparently something TypeScript adds.

Closes #4959
---
 mode/javascript/javascript.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index a011eb8d70..0a46dc7768 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -656,7 +656,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, maybetype, statement, popcontext);
     if (isTS && value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, functiondef)
   }
-  function funarg(type) {
+  function funarg(type, value) {
+    if (value == "@") cont(expression, funarg)
     if (type == "spread" || type == "modifier") return cont(funarg);
     return pass(pattern, maybetype, maybeAssign);
   }

From 3fef35109e688160412cf7715aafc09b7b05cc13 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Sep 2017 16:03:03 +0200
Subject: [PATCH 3514/4742] [tern addon] Fix corner case bug when editing near
 end of document

Closes #4954
---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 644e495f65..a80dc7e4b8 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -571,7 +571,7 @@
     return {type: "part",
             name: data.name,
             offsetLines: from.line,
-            text: doc.getRange(from, Pos(endLine, 0))};
+            text: doc.getRange(from, Pos(endLine, end.line == endLine ? null : 0))};
   }
 
   // Generic utilities

From 282cf36664d05f776eba88a1f8ace03c1f085cd0 Mon Sep 17 00:00:00 2001
From: Fredrik Borg <fredrikb@mnemonic.no>
Date: Tue, 19 Sep 2017 20:11:42 +0200
Subject: [PATCH 3515/4742] [sql mode] Support esper SQL dialect

---
 mode/meta.js        |  1 +
 mode/sql/index.html |  3 ++-
 mode/sql/sql.js     | 13 +++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index c49bd6c737..d5426a79b7 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -47,6 +47,7 @@
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
     {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+    {name: "Esper", mime: "text/x-esper", mode: "sql"},
     {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
     {name: "FCL", mime: "text/x-fcl", mode: "fcl"},
     {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
diff --git a/mode/sql/index.html b/mode/sql/index.html
index cd95872820..e12b289bfa 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -49,7 +49,7 @@ <h2>SQL Mode for CodeMirror</h2>
 	LIMIT 1 OFFSET 0;
 </textarea>
             </form>
-            <p><strong>MIME types defined:</strong> 
+            <p><strong>MIME types defined:</strong>
             <code><a href="?mime=text/x-sql">text/x-sql</a></code>,
             <code><a href="?mime=text/x-mysql">text/x-mysql</a></code>,
             <code><a href="?mime=text/x-mariadb">text/x-mariadb</a></code>,
@@ -60,6 +60,7 @@ <h2>SQL Mode for CodeMirror</h2>
             <code><a href="?mime=text/x-pgsql">text/x-pgsql</a></code>,
             <code><a href="?mime=text/x-gql">text/x-gql</a></code>,
             <code><a href="?mime=text/x-gpsql">text/x-gpsql</a></code>.
+            <code><a href="?mime=text/x-esper">text/x-esper</a></code>.
         </p>
 <script>
 window.onload = function() {
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index d7c6be1b00..da416f2048 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -441,6 +441,19 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     dateSQL: set("date time timestamp"),
     support: set("ODBCdotTable doubleQuote zerolessFloat")
   });
+
+  // Esper
+  CodeMirror.defineMIME("text/x-esper", {
+    name: "sql",
+    client: set("source"),
+    // http://www.espertech.com/esper/release-5.5.0/esper-reference/html/appendix_keywords.html
+    keywords: set("alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where limit after all and as at asc avedev avg between by case cast coalesce count create current_timestamp day days delete define desc distinct else end escape events every exists false first from full group having hour hours in inner insert instanceof into irstream is istream join last lastweekday left limit like max match_recognize matches median measures metadatasql min minute minutes msec millisecond milliseconds not null offset on or order outer output partition pattern prev prior regexp retain-union retain-intersection right rstream sec second seconds select set some snapshot sql stddev sum then true unidirectional until update variable weekday when where window"),
+    builtin: {},
+    atoms: set("false true null"),
+    operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
+    dateSQL: set("time"),
+    support: set("decimallessFloat zerolessFloat binaryNumber hexNumber")
+  });
 }());
 
 });

From 60f395169a8800ed739001f47cf6a2a1aaa22d40 Mon Sep 17 00:00:00 2001
From: ficristo <ficristo.work@gmail.com>
Date: Tue, 19 Sep 2017 21:48:22 +0200
Subject: [PATCH 3516/4742] [vue mode] Support more style types

---
 mode/vue/vue.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mode/vue/vue.js b/mode/vue/vue.js
index c0eab6b82f..84cd07c9a4 100644
--- a/mode/vue/vue.js
+++ b/mode/vue/vue.js
@@ -32,13 +32,20 @@
   var tagLanguages = {
     script: [
       ["lang", /coffee(script)?/, "coffeescript"],
-      ["type", /^(?:text|application)\/(?:x-)?coffee(?:script)?$/, "coffeescript"]
+      ["type", /^(?:text|application)\/(?:x-)?coffee(?:script)?$/, "coffeescript"],
+      ["lang", /^babel$/, "javascript"],
+      ["type", /^text\/babel$/, "javascript"],
+      ["type", /^text\/ecmascript-\d+$/, "javascript"]
     ],
     style: [
       ["lang", /^stylus$/i, "stylus"],
       ["lang", /^sass$/i, "sass"],
+      ["lang", /^less$/i, "text/x-less"],
+      ["lang", /^scss$/i, "text/x-scss"],
       ["type", /^(text\/)?(x-)?styl(us)?$/i, "stylus"],
-      ["type", /^text\/sass/i, "sass"]
+      ["type", /^text\/sass/i, "sass"],
+      ["type", /^(text\/)?(x-)?scss$/i, "text/x-scss"],
+      ["type", /^(text\/)?(x-)?less$/i, "text/x-less"]
     ],
     template: [
       ["lang", /^vue-template$/i, "vue"],

From 3d2723fe622ad180e576a58e2e6744e15803bfad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Sep 2017 11:08:52 +0200
Subject: [PATCH 3517/4742] Make outside prop in coordsChar non-inclusive at
 bottom

---
 src/measurement/position_measurement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 36e60601ae..cc55fb4d62 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -519,7 +519,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
     // base X position
     let coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure)
     baseX = coords.left
-    outside = y < coords.top || y > coords.bottom
+    outside = y < coords.top || y >= coords.bottom
   }
 
   ch = skipExtendingChars(lineObj.text, ch, 1)

From a0c562953581be28659ff8517a1d8879d40c56e4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Sep 2017 11:26:50 +0200
Subject: [PATCH 3518/4742] Mark version 5.30.0

---
 AUTHORS           |  7 +++++++
 CHANGELOG.md      | 26 +++++++++++++++++++++++++-
 doc/manual.html   |  2 +-
 doc/releases.html | 14 ++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 280dea2f5f..1264357043 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -68,6 +68,7 @@ Anthony Grimes
 Anton Kovalyov
 Apollo Zhu
 AQNOUCH Mohammed
+Aram Shatakhtsyan
 areos
 Arnab Bose
 Arsène von Wyss
@@ -155,6 +156,7 @@ Daniel Kesler
 Daniel KJ
 Daniel Neel
 Daniel Parnell
+Daniel Thwaites
 Danila Malyutin
 Danny Yoo
 darealshinji
@@ -213,7 +215,9 @@ ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
 Forrest Oliphant
+Franco Catena
 Frank Wiegand
+Fredrik Borg
 Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
@@ -255,6 +259,7 @@ hitsthings
 Hocdoc
 Hugues Malphettes
 Ian Beck
+Ian Davies
 Ian Dickinson
 Ian Wehrman
 Ian Wetherbee
@@ -376,6 +381,7 @@ LloydMilligan
 LM
 lochel
 Lorenzo Stoakes
+Louis Mauchet
 Luca Fabbri
 Luciano Longo
 Lu Fangjian
@@ -660,6 +666,7 @@ Weiyan Shao
 wenli
 Wes Cossick
 Wesley Wiser
+Weston Ruter
 Will Binns-Smith
 Will Dean
 William Jamieson
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cc7ed75fd..ff7d6e2311 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 5.30.0 (2017-09-20)
+
+### Bug fixes
+
+Fixed a number of issues with drawing right-to-left selections and mouse selection in bidirectional text.
+
+[search addon](http://codemirror.net/demo/search/): Fix crash when restarting search after doing empty search.
+
+[mark-selection addon](http://cm/doc/manual.html#addon_mark-selection): Fix off-by-one bug.
+
+[tern addon](http://codemirror.net/demo/tern.html): Fix bad request made when editing at the bottom of a large document.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve parsing in a number of corner cases.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.
+
+[gfm mode](http://codemirror.net/mode/gfm/): Don't highlight SHA1 'hashes' without numbers to avoid false positives.
+
+[soy mode](http://codemirror.net/mode/soy/): Support injected data and `@param` in comments.
+
+### New features
+
+[simple mode addon](http://codemirror.net/demo/simplemode.html): Allow groups in regexps when `token` isn't an array.
+
 ## 5.29.0 (2017-08-24)
 
 ### Bug fixes
@@ -54,7 +78,7 @@ Fix crash when using mode lookahead.
 
 ### Bug fixes
 
-Fix crash in the [simple mode](http://codemirror.net/demo/simplemode.html) addon.
+Fix crash in the [simple mode](http://codemirror.net/demo/simplemode.html)< addon.
 
 ## 5.27.0 (2017-06-22)
 
diff --git a/doc/manual.html b/doc/manual.html
index 354194e6cb..67d5e4258a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.29.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.30.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 586e2117f4..e16ab6dd43 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-09-2017: <a href="http://codemirror.net/codemirror-5.30.0.zip">Version 5.30.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fixed a number of issues with drawing right-to-left selections and mouse selection in bidirectional text.</li>
+    <li><a href="http://codemirror.net/demo/search/">search addon</a>: Fix crash when restarting search after doing empty search.</li>
+    <li><a href="http://cm/doc/manual.html#addon_mark-selection">mark-selection addon</a>: Fix off-by-one bug.</li>
+    <li><a href="http://codemirror.net/demo/tern.html">tern addon</a>: Fix bad request made when editing at the bottom of a large document.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing in a number of corner cases.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.</li>
+    <li><a href="http://codemirror.net/mode/gfm/">gfm mode</a>: Don't highlight SHA1 'hashes' without numbers to avoid false positives.</li>
+    <li><a href="http://codemirror.net/mode/soy/">soy mode</a>: Support injected data and <code>@param</code> in comments.</li>
+    <li><a href="http://codemirror.net/demo/simplemode.html">simple mode addon</a>: Allow groups in regexps when <code>token</code> isn't an array.</li>
+  </ul>
+
   <p class="rel">24-08-2017: <a href="http://codemirror.net/codemirror-5.29.0.zip">Version 5.29.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 68b9e507a4..d161e77c6f 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.29.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.30.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index d5f2329ef9..f251b238fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.29.1",
+  "version": "5.30.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index c75e3bbc61..4298c61ff1 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.29.1"
+CodeMirror.version = "5.30.0"

From 25e12b5fe1ee7b0be7e7ee4306608caa4e93c6d6 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Wed, 20 Sep 2017 14:31:19 +0300
Subject: [PATCH 3519/4742] [vim bindings] fix vim emulation ctrl-w behavior
 #4931

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

diff --git a/keymap/vim.js b/keymap/vim.js
index d8a2d60d41..8bf1fe5664 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2034,7 +2034,8 @@
         vimGlobalState.registerController.pushText(
             args.registerName, 'delete', text,
             args.linewise, vim.visualBlock);
-        return clipCursorToContent(cm, finalHead);
+        var includeLineBreak = vim.insertMode
+        return clipCursorToContent(cm, finalHead, includeLineBreak);
       },
       indent: function(cm, args, ranges) {
         var vim = cm.state.vim;

From 85e1162bd5b66c61bf426564c48f1942f3965007 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 20 Sep 2017 21:00:37 +0200
Subject: [PATCH 3520/4742] Correctly calculate end-of-line in rtl documents

Closes #4878.
---
 src/input/movement.js | 2 +-
 test/test.js          | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/input/movement.js b/src/input/movement.js
index b7fd01a836..927ed6e14d 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -27,7 +27,7 @@ export function endOfLine(visually, cm, lineObj, lineNo, dir) {
       // Thus, in rtl, we are looking for the first (content-order) character
       // in the rtl chunk that is on the last line (that is, the same line
       // as the last (content-order) character).
-      if (part.level > 0) {
+      if (part.level > 0 || cm.doc.direction == "rtl") {
         let prep = prepareMeasureForLine(cm, lineObj)
         ch = dir < 0 ? lineObj.text.length - 1 : 0
         let targetTop = measureCharPrepared(cm, prep, ch).top
diff --git a/test/test.js b/test/test.js
index 96e989d12c..ab63778758 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2507,6 +2507,13 @@ testCM("delete_wrapped", function(cm) {
   eq(cm.getLine(0), "1245");
 }, {value: "12345", lineWrapping: true})
 
+testCM("issue_4878", function(cm) {
+  cm.setCursor(Pos(1, 12, "after"));
+  cm.moveH(-1, "char");
+  eqCursorPos(cm.getCursor(), Pos(0, 113, "before"));
+}, {value: "  في تطبيق السمات مرة واحدة https://github.com/codemirror/CodeMirror/issues/4878#issuecomment-330550964على سبيل المثال <code>\"foo bar\"</code>\n" +
+"  سيتم تعيين", direction: "rtl", lineWrapping: true});
+
 CodeMirror.defineMode("lookahead_mode", function() {
   // Colors text as atom if the line two lines down has an x in it
   return {

From 35ce5f10d722b28e624b2152e05f2f4697c184b4 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 20 Sep 2017 21:25:17 +0200
Subject: [PATCH 3521/4742] Don't run the new test in Phantom

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

diff --git a/test/test.js b/test/test.js
index ab63778758..9c768e3f6b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2508,6 +2508,7 @@ testCM("delete_wrapped", function(cm) {
 }, {value: "12345", lineWrapping: true})
 
 testCM("issue_4878", function(cm) {
+  if (phantom) return
   cm.setCursor(Pos(1, 12, "after"));
   cm.moveH(-1, "char");
   eqCursorPos(cm.getCursor(), Pos(0, 113, "before"));

From 4b29bae25113f7518887dd80caf25ddc3f019fe1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 21 Sep 2017 08:13:16 +0200
Subject: [PATCH 3522/4742] [javascript mode] Allow void to be a type

Closes #4986
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 0a46dc7768..5a65a9b9d6 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -558,7 +558,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
   }
   function typeexpr(type, value) {
-    if (type == "variable") {
+    if (type == "variable" || value == "void") {
       if (value == "keyof") {
         cx.marked = "keyword"
         return cont(typeexpr)

From ad9732ae4c8b9af8d9f549cfbd24ca33658b17e5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 21 Sep 2017 08:15:18 +0200
Subject: [PATCH 3523/4742] [php mode] Allow overriding the HTML mode spec

Issue #4987
---
 mode/php/php.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/php/php.js b/mode/php/php.js
index 57ba812d72..589c9a6639 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -151,7 +151,7 @@
   };
 
   CodeMirror.defineMode("php", function(config, parserConfig) {
-    var htmlMode = CodeMirror.getMode(config, "text/html");
+    var htmlMode = CodeMirror.getMode(config, (parserConfig && parserConfig.htmlMode) || "text/html");
     var phpMode = CodeMirror.getMode(config, phpConfig);
 
     function dispatch(stream, state) {

From 06e1657dbe9ebf6e216ea1192c8c84e737180325 Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Thu, 21 Sep 2017 10:05:34 +0300
Subject: [PATCH 3524/4742] [vim binding] test for ctrl-w in insert mode

---
 test/vim_test.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/vim_test.js b/test/vim_test.js
index da49a24cf6..9c78685973 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1386,6 +1386,19 @@ testVim('<C-x>/<C-a> search forward', function(cm, vim, helpers) {
     helpers.assertCursorAt(0, 11);
   });
 }, {value: '__jmp1 jmp2 jmp'});
+testVim('insert_ctrl_w', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 10);
+  cm.setCursor(curStart);
+  helpers.doKeys('a');
+  helpers.doKeys('<C-w>');
+  eq('word1/', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word2', register.toString());
+  is(!register.linewise);
+  var curEnd = makeCursor(0, 6);
+  eqCursorPos(curEnd, cm.getCursor());
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: 'word1/word2' });
 testVim('a', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('a');

From bb0e1c3f130893e9f0c1bcdb8916e7445fd709e7 Mon Sep 17 00:00:00 2001
From: jkaplon <jody@kaplon.us>
Date: Wed, 6 Sep 2017 12:56:18 -0400
Subject: [PATCH 3525/4742] [vim mode] Add tick-dot and backtick-dot custom
 marks

---
 keymap/vim.js    |  9 +++++++++
 test/vim_test.js | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8bf1fe5664..3d990d1d58 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3979,6 +3979,15 @@
         var history = cm.doc.history.done;
         var event = history[history.length - 2];
         return event && event.ranges && event.ranges[0].head;
+      } else if (markName == '.') {
+        if (cm.doc.history.lastModTime == 0) {
+          return  // If no changes, bail out; don't bother to copy or reverse history array.
+        } else {
+          var changeHistory = cm.doc.history.done.filter(function(el){ if (el.changes !== undefined) { return el } });
+          changeHistory.reverse();
+          var lastEditPos = changeHistory[0].changes[0].to;
+        }
+        return lastEditPos;
       }
 
       var mark = vim.marks[markName];
diff --git a/test/vim_test.js b/test/vim_test.js
index 9c78685973..18268ee789 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1675,6 +1675,16 @@ testVim('mark\'', function(cm, vim, helpers) {
   helpers.doKeys('\'', '\'');
   helpers.assertCursorAt(2, 3);
 });
+testVim('mark.', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('O', 'testing', '<Esc>');
+  cm.setCursor(3, 3);
+  helpers.doKeys('\'', '.');
+  helpers.assertCursorAt(0, 0);
+  cm.setCursor(4, 4);
+  helpers.doKeys('`', '.');
+  helpers.assertCursorAt(0, 6);
+});
 testVim('jumpToMark_next', function(cm, vim, helpers) {
   cm.setCursor(2, 2);
   helpers.doKeys('m', 't');

From 70ad1762d176008ec57fab3533eda619bd669c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Haugb=C3=B8lle?= <henrikhaugboelle@gmail.com>
Date: Mon, 25 Sep 2017 10:57:47 +0200
Subject: [PATCH 3526/4742] Documenting allowAtxHeaderWithoutSpace

Adding documentation for the `allowAtxHeaderWithoutSpace` configuration parameter.
---
 mode/markdown/index.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index abb379f61a..3460744c14 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -396,6 +396,12 @@ <h2>Markdown mode</h2>
           <dd>When you want ot override default token type names (e.g. <code>{code: "code"}</code>).</dd>
         </d1>
       </li>
+      <li>
+        <d1>
+          <dt><code>allowAtxHeaderWithoutSpace: Object</code></dt>
+          <dd>Allow lazy headers without whitespace between hashtag and text (default: <code>false</code>).</dd>
+        </d1>
+      </li>
     </ul>
 
     <p><strong>MIME types defined:</strong> <code>text/x-markdown</code>.</p>

From e7b26592014c53c1f92aeb73dfa410ac6c528fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Haugb=C3=B8lle?= <henrikhaugboelle@gmail.com>
Date: Mon, 25 Sep 2017 13:14:50 +0200
Subject: [PATCH 3527/4742] Fixed wrong type for allowAtxHeaderWithoutSpace

When submitting the previous commit, I had not noticed that the parameter allowAtxHeaderWithoutSpace had type Object instead of type boolean. I've fixed this now.
---
 mode/markdown/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 3460744c14..f17ecdc9ac 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -398,7 +398,7 @@ <h2>Markdown mode</h2>
       </li>
       <li>
         <d1>
-          <dt><code>allowAtxHeaderWithoutSpace: Object</code></dt>
+          <dt><code>allowAtxHeaderWithoutSpace: boolean</code></dt>
           <dd>Allow lazy headers without whitespace between hashtag and text (default: <code>false</code>).</dd>
         </d1>
       </li>

From c9ea0ee56ea65c17150b92e50539dafc6515aba4 Mon Sep 17 00:00:00 2001
From: Thomas Brouard <contact@brrd.fr>
Date: Tue, 26 Sep 2017 19:39:19 +0200
Subject: [PATCH 3528/4742] [continuelist addon] Don't continue list when
 cursor is before bullet

---
 addon/edit/continuelist.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index f13e521993..02c8eff9fa 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -25,7 +25,8 @@
       var inQuote = eolState.quote !== 0;
 
       var line = cm.getLine(pos.line), match = listRE.exec(line);
-      if (!ranges[i].empty() || (!inList && !inQuote) || !match) {
+      var cursorBeforeBullet = /^\s*$/.test(line.slice(0, pos.ch));
+      if (!ranges[i].empty() || (!inList && !inQuote) || !match || cursorBeforeBullet) {
         cm.execCommand("newlineAndIndent");
         return;
       }

From c33683083952cac82b476c94c8e6debfa554e681 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 27 Sep 2017 10:09:05 +0200
Subject: [PATCH 3529/4742] [markdown mode] Always pass through to inner mode
 when a local mode is active

Closes #4999
---
 mode/markdown/markdown.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 907059f101..b2f79fc302 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -821,12 +821,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         state.trailingSpace = 0;
         state.trailingSpaceNewLine = false;
 
-        state.f = state.block;
-        if (state.f != htmlBlock) {
-          var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, expandedTab).length;
-          state.indentation = indentation;
-          state.indentationDiff = null;
-          if (indentation > 0) return null;
+        if (!state.localState) {
+          state.f = state.block;
+          if (state.f != htmlBlock) {
+            var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, expandedTab).length;
+            state.indentation = indentation;
+            state.indentationDiff = null;
+            if (indentation > 0) return null;
+          }
         }
       }
       return state.f(stream, state);

From 990634f7cb1b554581ef4df6138e209a216fb8a6 Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Wed, 27 Sep 2017 15:52:19 -0700
Subject: [PATCH 3530/4742] [vim] Fix crash on exiting insert mode.

Happened if you entered visual block mode in one editor and then tried to exit insert mode in another, since lastChange comes from vimGlobalState.
---
 keymap/vim.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 3d990d1d58..18b6d63445 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4798,7 +4798,8 @@
       // so as to update the ". register as expected in real vim.
       var text = [];
       if (!isPlaying) {
-        var selLength = lastChange.inVisualBlock ? vim.lastSelection.visualBlock.height : 1;
+        var selLength = lastChange.inVisualBlock && vim.lastSelection ?
+            vim.lastSelection.visualBlock.height : 1;
         var changes = lastChange.changes;
         var text = [];
         var i = 0;

From 2a5abc3b3bc9c7075ad01948569ed507c6ad4913 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 29 Sep 2017 09:34:18 +0200
Subject: [PATCH 3531/4742] [htmlmixed mode] Fix example on demo page

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

diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index caa7546c1e..e576c0592e 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -87,7 +87,7 @@ <h1>Mixed HTML Example</h1>
     <pre>var myModeSpec = {
   name: "htmlmixed",
   tags: {
-    style: [["type", /^text/(x-)?scss$/, "text/x-scss"],
+    style: [["type", /^text\/(x-)?scss$/, "text/x-scss"],
             [null, null, "css"]],
     custom: [[null, null, "customMode"]]
   }

From 5fd2133b9523360d244c0d434ec295740854b787 Mon Sep 17 00:00:00 2001
From: Andrew Dassonville <dassonville.andrew@gmail.com>
Date: Thu, 28 Sep 2017 21:16:10 -0700
Subject: [PATCH 3532/4742] [kotlin mode] Remove `package` from def keywords

---
 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 ef5b16fc79..0993ca4c4e 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -591,7 +591,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     multiLineStrings: true,
     number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
     blockKeywords: words("catch class do else finally for if where try while enum"),
-    defKeywords: words("class val var object package interface fun"),
+    defKeywords: words("class val var object interface fun"),
     atoms: words("true false null this"),
     hooks: {
       '"': function(stream, state) {

From 9f7ce5a47de118106133ed41219f64f5f3973619 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 29 Sep 2017 12:27:46 +0200
Subject: [PATCH 3533/4742] Rewrite selection drawing again

To take document direction into account
---
 src/display/selection.js | 68 +++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/display/selection.js b/src/display/selection.js
index ba6feb8f14..dca96a442b 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -54,6 +54,7 @@ function drawSelectionRange(cm, range, output) {
   let fragment = document.createDocumentFragment()
   let padding = paddingH(cm.display), leftSide = padding.left
   let rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right
+  let docLTR = doc.direction == "ltr"
 
   function add(left, top, width, bottom) {
     if (top < 0) top = 0
@@ -72,42 +73,43 @@ function drawSelectionRange(cm, range, output) {
       return charCoords(cm, Pos(line, ch), "div", lineObj, bias)
     }
 
+    function wrapX(pos, dir, side) {
+      let extent = wrappedLineExtentChar(cm, lineObj, null, pos)
+      let prop = (dir == "ltr") == (side == "after") ? "left" : "right"
+      let ch = side == "after" ? extent.begin : extent.end - (/\s/.test(lineObj.text.charAt(extent.end - 1)) ? 2 : 1)
+      return coords(ch, prop)[prop]
+    }
+
     let order = getOrder(lineObj, doc.direction)
     iterateBidiSections(order, fromArg || 0, toArg == null ? lineLen : toArg, (from, to, dir, i) => {
-      let fromPos = coords(from, dir == "ltr" ? "left" : "right")
-      let toPos = coords(to - 1, dir == "ltr" ? "right" : "left")
-      if (dir == "ltr") {
-        let fromLeft = fromArg == null && from == 0 ? leftSide : fromPos.left
-        let toRight = toArg == null && to == lineLen ? rightSide : toPos.right
-        if (toPos.top - fromPos.top <= 3) { // Single line
-          add(fromLeft, toPos.top, toRight - fromLeft, toPos.bottom)
-        } else { // Multiple lines
-          add(fromLeft, fromPos.top, null, fromPos.bottom)
-          if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top)
-          add(leftSide, toPos.top, toPos.right, toPos.bottom)
-        }
-      } else if (from < to) { // RTL
-        let fromRight = fromArg == null && from == 0 ? rightSide : fromPos.right
-        let toLeft = toArg == null && to == lineLen ? leftSide : toPos.left
-        if (toPos.top - fromPos.top <= 3) { // Single line
-          add(toLeft, toPos.top, fromRight - toLeft, toPos.bottom)
-        } else { // Multiple lines
-          let topLeft = leftSide
-          if (i) {
-            let topEnd = wrappedLineExtentChar(cm, lineObj, null, from).end
-            // The coordinates returned for an RTL wrapped space tend to
-            // be complete bogus, so try to skip that here.
-            topLeft = coords(topEnd - (/\s/.test(lineObj.text.charAt(topEnd - 1)) ? 2 : 1), "left").left
-          }
-          add(topLeft, fromPos.top, fromRight - topLeft, fromPos.bottom)
-          if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top)
-          let botWidth = null
-          if (i < order.length  - 1 || true) {
-            let botStart = wrappedLineExtentChar(cm, lineObj, null, to).begin
-            botWidth = coords(botStart, "right").right - toLeft
-          }
-          add(toLeft, toPos.top, botWidth, toPos.bottom)
+      let ltr = dir == "ltr"
+      let fromPos = coords(from, ltr ? "left" : "right")
+      let toPos = coords(to - 1, ltr ? "right" : "left")
+
+      let openStart = fromArg == null && from == 0, openEnd = toArg == null && to == lineLen
+      let first = i == 0, last = !order || i == order.length - 1
+      if (toPos.top - fromPos.top <= 3) { // Single line
+        let openLeft = (docLTR ? openStart : openEnd) && first
+        let openRight = (docLTR ? openEnd : openStart) && last
+        let left = openLeft ? leftSide : (ltr ? fromPos : toPos).left
+        let right = openRight ? rightSide : (ltr ? toPos : fromPos).right
+        add(left, fromPos.top, right - left, fromPos.bottom)
+      } else { // Multiple lines
+        let topLeft, topRight, botLeft, botRight
+        if (ltr) {
+          topLeft = docLTR && openStart && first ? leftSide : fromPos.left
+          topRight = docLTR ? rightSide : wrapX(from, dir, "before")
+          botLeft = docLTR ? leftSide : wrapX(to, dir, "after")
+          botRight = docLTR && openEnd && last ? rightSide : toPos.right
+        } else {
+          topLeft = !docLTR ? leftSide : wrapX(from, dir, "before")
+          topRight = !docLTR && openStart && first ? rightSide : fromPos.right
+          botLeft = !docLTR && openEnd && last ? leftSide : toPos.left
+          botRight = !docLTR ? rightSide : wrapX(to, dir, "after")
         }
+        add(topLeft, fromPos.top, topRight - topLeft, fromPos.bottom)
+        if (fromPos.bottom < toPos.top) add(leftSide, fromPos.bottom, null, toPos.top)
+        add(botLeft, toPos.top, botRight - botLeft, toPos.bottom)
       }
 
       if (!start || cmpCoords(fromPos, start) < 0) start = fromPos

From 09683988acf0930adf748539104d2d2364e4f89e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 Oct 2017 21:01:00 +0200
Subject: [PATCH 3534/4742] Disable bidi trailing/leading whitespace kludge in
 RTL editor

Since it produces orderings that don't correspond to what
the browser does then.
---
 src/util/bidi.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/util/bidi.js b/src/util/bidi.js
index c3e63f7a3e..3d13dd86d2 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -189,13 +189,15 @@ let bidiOrdering = (function() {
         if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i))
       }
     }
-    if (order[0].level == 1 && (m = str.match(/^\s+/))) {
-      order[0].from = m[0].length
-      order.unshift(new BidiSpan(0, 0, m[0].length))
-    }
-    if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
-      lst(order).to -= m[0].length
-      order.push(new BidiSpan(0, len - m[0].length, len))
+    if (direction == "ltr") {
+      if (order[0].level == 1 && (m = str.match(/^\s+/))) {
+        order[0].from = m[0].length
+        order.unshift(new BidiSpan(0, 0, m[0].length))
+      }
+      if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
+        lst(order).to -= m[0].length
+        order.push(new BidiSpan(0, len - m[0].length, len))
+      }
     }
 
     return direction == "rtl" ? order.reverse() : order

From 4fb9916cb54767892cadb23c9b8692dda3222d7e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 2 Oct 2017 21:26:01 +0200
Subject: [PATCH 3535/4742] Work around issue in coordsChar in wrapped bidi
 lines

---
 src/measurement/position_measurement.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index cc55fb4d62..78986e03db 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -559,6 +559,7 @@ function coordsBidiPartWrapped(cm, lineObj, _lineNo, preparedMeasure, order, x,
   // wrapped line, and then do a flat search in which we discard any
   // spans that aren't on the line.
   let {begin, end} = wrappedLineExtent(cm, lineObj, preparedMeasure, y)
+  if (/\s/.test(lineObj.text.charAt(end - 1))) end--
   let part = null, closestDist = null
   for (let i = 0; i < order.length; i++) {
     let p = order[i]

From 05287fbc448bd11f06b58bcd15ca735d020975e9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 6 Oct 2017 10:11:43 +0200
Subject: [PATCH 3536/4742] [dart mode] Remove 'operator' as keyword

Closes #5009
---
 mode/dart/dart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 398f5ef3b5..4db0d37159 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -12,7 +12,7 @@
   "use strict";
 
   var keywords = ("this super static final const abstract class extends external factory " +
-    "implements get native operator set typedef with enum throw rethrow " +
+    "implements get native set typedef with enum throw rethrow " +
     "assert break case continue default in return new deferred async await covariant " +
     "try catch finally do else for if switch while import library export " +
     "part of show hide is as").split(" ");

From e85f937810ba96b1b6fa96257658527c4fa6ec78 Mon Sep 17 00:00:00 2001
From: paladox <paladox@users.noreply.github.com>
Date: Sat, 7 Oct 2017 16:39:27 +0100
Subject: [PATCH 3537/4742] [vim bindings] Disable jsdoc for findWord by doing
 /* instead of /**

This is to prevent the closure compiler from failing with

bazel-out/darwin_x86_64-fastbuild/bin/polygerrit-ui/app/gr-app.js:51233: ERROR - Bad type annotation. expected closing } See https://github.com/google/closure-compiler/wiki/Bad-Type-Annotation for more information.
     * @return {Object{from:number, to:number, line: number}} The boundaries of
                      ^
  ProTip: "JSC_TYPE_PARSE_ERROR" or "checkTypes" can be added to the `suppress` attribute of:
  //polygerrit-ui/app:polygerrit_ui_closure_lib
  Alternatively /** @suppress {checkTypes} */ can be added to the source file.

1 error(s), 1 warning(s)
---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 18b6d63445..13c39a1ea0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3245,7 +3245,7 @@
       return cur;
     }
 
-    /**
+    /*
      * Returns the boundaries of the next word. If the cursor in the middle of
      * the word, then returns the boundaries of the current word, starting at
      * the cursor. If the cursor is at the start/end of a word, and we are going

From f18d202b80764c8ff513a77d8201f25491aca538 Mon Sep 17 00:00:00 2001
From: paladox <paladox@users.noreply.github.com>
Date: Sun, 8 Oct 2017 15:35:06 +0100
Subject: [PATCH 3538/4742] Add text/x-php to meta.js

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

diff --git a/mode/meta.js b/mode/meta.js
index d5426a79b7..34da269f33 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -101,7 +101,7 @@
     {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
     {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
     {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
-    {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
+    {name: "PHP", mime: ["application/x-httpd-php", "text/x-php"], mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
     {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},

From 2e91e07134e4e2ed0601fa2f9d90bd85f3019481 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 8 Oct 2017 21:12:14 +0200
Subject: [PATCH 3539/4742] [javascript mode] Only tokenize operators that
 actually exist

To avoid bad parses when unary and binary operators are squashed
together without spaces.

Issue #5013
---
 mode/javascript/javascript.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 5a65a9b9d6..b59eca3075 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -128,7 +128,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
         return ret("regexp", "string-2");
       } else {
-        stream.eatWhile(isOperatorChar);
+        stream.eat("=");
         return ret("operator", "operator", stream.current());
       }
     } else if (ch == "`") {
@@ -138,8 +138,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       stream.skipToEnd();
       return ret("error", "error");
     } else if (isOperatorChar.test(ch)) {
-      if (ch != ">" || !state.lexical || state.lexical.type != ">")
-        stream.eatWhile(isOperatorChar);
+      if (ch != ">" || !state.lexical || state.lexical.type != ">") {
+        if (stream.eat("=")) {
+          if (ch == "!" || ch == "=") stream.eat("=")
+        } else if (ch == "<" || ch == ">" || ch == "*") {
+          stream.eatWhile(ch);
+        }
+      }
       return ret("operator", "operator", stream.current());
     } else if (wordRE.test(ch)) {
       stream.eatWhile(wordRE);

From 53aa6c362867044fcfd1e133ae7b9502429cb658 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 8 Oct 2017 21:12:33 +0200
Subject: [PATCH 3540/4742] [javascript mode] Recognize generator stars in
 object literals

Issue #5013
---
 mode/javascript/javascript.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index b59eca3075..3e0a7382c6 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -516,6 +516,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(expression, expect("]"), afterprop);
     } else if (type == "spread") {
       return cont(expression, afterprop);
+    } else if (value == "*") {
+      cx.marked = "keyword";
+      return cont(objprop);
     } else if (type == ":") {
       return pass(afterprop)
     }

From 930c02f4facd49ccd237a30846e841e5a117e18f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 8 Oct 2017 21:21:52 +0200
Subject: [PATCH 3541/4742] [javascript mode] Fix tokenizing of ++ and --

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 3e0a7382c6..386ef3d846 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -141,7 +141,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (ch != ">" || !state.lexical || state.lexical.type != ">") {
         if (stream.eat("=")) {
           if (ch == "!" || ch == "=") stream.eat("=")
-        } else if (ch == "<" || ch == ">" || ch == "*") {
+        } else if (/[<>*+\-]/.test(ch)) {
           stream.eatWhile(ch);
         }
       }

From 9d9cb0ecdf500b3050ea5db65de118fe7fc2085f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 9 Oct 2017 23:29:08 +0200
Subject: [PATCH 3542/4742] Fix tokenizing of three + chars in a row

Issue #5016
---
 mode/javascript/javascript.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 386ef3d846..1928bcddaa 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -142,7 +142,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         if (stream.eat("=")) {
           if (ch == "!" || ch == "=") stream.eat("=")
         } else if (/[<>*+\-]/.test(ch)) {
-          stream.eatWhile(ch);
+          stream.eat(ch)
+          if (ch == ">") stream.eat(ch)
         }
       }
       return ret("operator", "operator", stream.current());

From 35be8fee7c96be49597578a92438e5b9b78b6fa0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 9 Oct 2017 23:40:10 +0200
Subject: [PATCH 3543/4742] [javascript mode] Eagerly insert semicolons after
 return/break/cont

Issue #5016
---
 mode/javascript/javascript.js | 10 ++++++----
 mode/javascript/test.js       |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 1928bcddaa..28775dd65e 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -23,13 +23,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   var keywords = function(){
     function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
+    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"), D = kw("keyword d");
     var operator = kw("operator"), atom = {type: "atom", style: "atom"};
 
     var jsKeywords = {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "void": C, "throw": C, "debugger": C,
-      "var": kw("var"), "const": kw("var"), "let": kw("var"),
+      "return": D, "break": D, "continue": D, "new": kw("new"), "delete": C, "void": C, "throw": C,
+      "debugger": kw("debugger"), "var": kw("var"), "const": kw("var"), "let": kw("var"),
       "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
       "in": operator, "typeof": operator, "instanceof": operator,
@@ -357,6 +357,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
     if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex);
     if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
+    if (type == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex);
+    if (type == "debugger") return cont(expect(";"));
     if (type == "{") return cont(pushlex("}"), block, poplex);
     if (type == ";") return cont();
     if (type == "if") {
@@ -412,7 +414,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
     if (type == "function") return cont(functiondef, maybeop);
     if (type == "class") return cont(pushlex("form"), classExpression, poplex);
-    if (type == "keyword c" || type == "async") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
+    if (type == "keyword c" || type == "async") return cont(noComma ? expressionNoComma : expression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 7b0892cfab..213bab06a8 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -245,6 +245,10 @@
      "[string-2 `${][variable async][operator ++][string-2 }//`];",
      "[string-2 `${]{} [operator /] [string-2 /\\//}`];")
 
+  MT("return_eol",
+     "[keyword return]",
+     "{} [string-2 /5/]")
+
   var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
   function TS(name) {
     test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))

From 28bc517692b67106136a357b9a27bbdccbd2e0e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 9 Oct 2017 23:51:36 +0200
Subject: [PATCH 3544/4742] [javascript mode] Fix expressionAllowed for changed
 handling of return

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 28775dd65e..40ebfca6b7 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -756,7 +756,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   function expressionAllowed(stream, state, backUp) {
     return state.tokenize == tokenBase &&
-      /^(?:operator|sof|keyword [bc]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+      /^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
       (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
   }
 

From 44ab67734e734d667f5d6259e59c587ec71daaa9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 9 Oct 2017 23:54:23 +0200
Subject: [PATCH 3545/4742] [javascript mode] Remove unused function

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 40ebfca6b7..d92f8622d4 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -427,10 +427,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type.match(/[;\}\)\],]/)) return pass();
     return pass(expression);
   }
-  function maybeexpressionNoComma(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expressionNoComma);
-  }
 
   function maybeoperatorComma(type, value) {
     if (type == ",") return cont(expression);

From dcdf0146e19e9452f8961c1df89534b325593d01 Mon Sep 17 00:00:00 2001
From: Julien CROUZET <contact@juliencrouzet.fr>
Date: Fri, 13 Oct 2017 17:44:51 +0200
Subject: [PATCH 3546/4742] [protobuf mode] Add protobuf3 / gRPC keywords

---
 mode/protobuf/index.html  | 42 ++++++++++++++++++++++++++++++++++++++-
 mode/protobuf/protobuf.js |  3 ++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/mode/protobuf/index.html b/mode/protobuf/index.html
index cfe7b9dcd3..55d4535666 100644
--- a/mode/protobuf/index.html
+++ b/mode/protobuf/index.html
@@ -54,9 +54,49 @@ <h2>ProtoBuf mode</h2>
    required bool deleted = 11 [default = false];
 }
 
-</textarea></form>
+</textarea>
+  <textarea id="code2" name="code2">
+syntax = "proto3";
+package tutorial;
+
+import "google/protobuf/timestamp.proto";
+option java_package = "com.example.tutorial";
+option java_outer_classname = "AddressBookProtos";
+option csharp_namespace = "Google.Protobuf.Examples.AddressBook";
+
+message Person {
+  string name = 1;
+  int32 id = 2;  // Unique ID number for this person.
+  string email = 3;
+
+  enum PhoneType {
+    MOBILE = 0;
+    HOME = 1;
+    WORK = 2;
+  }
+
+  message PhoneNumber {
+    string number = 1;
+    PhoneType type = 2;
+  }
+
+  repeated PhoneNumber phones = 4;
+
+  google.protobuf.Timestamp last_updated = 5;
+}
+
+// Our address book file is just one of these.
+message AddressBook {
+  repeated Person people = 1;
+}
+service Test {
+  rpc SayHello (HelloRequest) returns (HelloReply) {}
+  rpc SayHelloAgain (HelloRequest) returns (HelloReply) {}
+}</textarea>
+</form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+      var editor = CodeMirror.fromTextArea(document.getElementById("code2"), {});
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-protobuf</code>.</p>
diff --git a/mode/protobuf/protobuf.js b/mode/protobuf/protobuf.js
index bcae276e8d..93cb3b0e05 100644
--- a/mode/protobuf/protobuf.js
+++ b/mode/protobuf/protobuf.js
@@ -19,7 +19,8 @@
     "package", "message", "import", "syntax",
     "required", "optional", "repeated", "reserved", "default", "extensions", "packed",
     "bool", "bytes", "double", "enum", "float", "string",
-    "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64"
+    "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64",
+    "option", "service", "rpc", "returns"
   ];
   var keywords = wordRegexp(keywordArray);
 

From a073d18ea4b08d2e1aecdc075ecef8712c10e64f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 16 Oct 2017 11:19:27 +0200
Subject: [PATCH 3547/4742] Remove mode-mutating kludge in continuecomment

---
 addon/comment/continuecomment.js | 5 -----
 mode/clike/clike.js              | 1 +
 mode/css/css.js                  | 1 +
 mode/javascript/javascript.js    | 1 +
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index d7385ef223..6552b09bbf 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -9,11 +9,6 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
-  var modes = ["clike", "css", "javascript"];
-
-  for (var i = 0; i < modes.length; ++i)
-    CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
-
   function continueComment(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
     var ranges = cm.listSelections(), mode, inserts = [];
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 0993ca4c4e..d6d12c7117 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -244,6 +244,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     electricInput: indentSwitch ? /^\s*(?:case .*?:|default:|\{\}?|\})$/ : /^\s*[{}]$/,
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
+    blockCommentContinue: " * ",
     lineComment: "//",
     fold: "brace"
   };
diff --git a/mode/css/css.js b/mode/css/css.js
index bfe11d3b05..00e9b3df13 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -410,6 +410,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     electricChars: "}",
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
+    blockCommentContinue: " * ",
     lineComment: lineComment,
     fold: "brace"
   };
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d92f8622d4..d6cc4771bd 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -821,6 +821,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
     blockCommentStart: jsonMode ? null : "/*",
     blockCommentEnd: jsonMode ? null : "*/",
+    blockCommentContinue: jsonMode ? null : "   ",
     lineComment: jsonMode ? null : "//",
     fold: "brace",
     closeBrackets: "()[]{}''\"\"``",

From ad6635a5b40b20cc3f7ca9a77ef1b42634597790 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 16 Oct 2017 11:20:11 +0200
Subject: [PATCH 3548/4742] [vim bindings] Show fat cursor even in
 contentEditable mode

Issue #3552
---
 demo/vim.html      |  3 ++-
 keymap/vim.js      | 51 ++++++++++++++++++++++++++++++++++++++++++++--
 lib/codemirror.css |  7 ++++++-
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index f27b8b8e2b..bd704f7583 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -95,7 +95,8 @@ <h2>Vim bindings demo</h2>
         mode: "text/x-csrc",
         keyMap: "vim",
         matchBrackets: true,
-        showCursorWhenSelecting: true
+        showCursorWhenSelecting: true,
+        inputStyle: "contenteditable"
       });
       var commandDisplay = document.getElementById('command-display');
       var keys = '';
diff --git a/keymap/vim.js b/keymap/vim.js
index 13c39a1ea0..7cf5a956e0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -255,20 +255,67 @@
     }
 
     function detachVimMap(cm, next) {
-      if (this == CodeMirror.keyMap.vim)
+      if (this == CodeMirror.keyMap.vim) {
         CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
+        if (cm.getOption("inputStyle") == "contenteditable" && document.body.style.caretColor != null) {
+          disableFatCursorMark(cm);
+          cm.getInputField().style.caretColor = "";
+        }
+      }
 
       if (!next || next.attach != attachVimMap)
         leaveVimMode(cm);
     }
     function attachVimMap(cm, prev) {
-      if (this == CodeMirror.keyMap.vim)
+      if (this == CodeMirror.keyMap.vim) {
         CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
+        if (cm.getOption("inputStyle") == "contenteditable" && document.body.style.caretColor != null) {
+          enableFatCursorMark(cm);
+          cm.getInputField().style.caretColor = "transparent";
+        }
+      }
 
       if (!prev || prev.attach != attachVimMap)
         enterVimMode(cm);
     }
 
+    function fatCursorMarks(cm) {
+      var ranges = cm.listSelections(), result = []
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i]
+        if (range.empty()) {
+          if (range.anchor.ch < cm.getLine(range.anchor.line).length) {
+            result.push(cm.markText(range.anchor, Pos(range.anchor.line, range.anchor.ch + 1),
+                                    {className: "cm-fat-cursor-mark"}))
+          } else {
+            var widget = document.createElement("span")
+            widget.textContent = "\u00a0"
+            widget.className = "cm-fat-cursor-mark"
+            result.push(cm.setBookmark(range.anchor, {widget: widget}))
+          }
+        }
+      }
+      return result
+    }
+
+    function updateFatCursorMark(cm) {
+      var marks = cm.state.fatCursorMarks
+      if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear()
+      cm.state.fatCursorMarks = fatCursorMarks(cm)
+    }
+
+    function enableFatCursorMark(cm) {
+      cm.state.fatCursorMarks = fatCursorMarks(cm)
+      cm.on("cursorActivity", updateFatCursorMark)
+    }
+
+    function disableFatCursorMark(cm) {
+      var marks = cm.state.fatCursorMarks
+      if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear()
+      cm.state.fatCursorMarks = null
+      cm.off("cursorActivity", updateFatCursorMark)
+    }
+
     // Deprecated, simply setting the keymap works again.
     CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
       if (val && cm.getOption("keyMap") != "vim")
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 9d8ff0ce66..255de98606 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -59,7 +59,12 @@
 .cm-fat-cursor div.CodeMirror-cursors {
   z-index: 1;
 }
-
+.cm-fat-cursor-mark {
+  background-color: rgba(20, 255, 20, 0.5);
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  -moz-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+}
 .cm-animate-fat-cursor {
   width: auto;
   border: 0;

From 43d0324c4452e0d8bbc0782fb775cb4838f1d6cf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 16 Oct 2017 11:30:59 +0200
Subject: [PATCH 3549/4742] [continuecomment addon] Fix issue with single-line
 block comments

The addon would think it still was in a block comment when
one was opened and closed earlier on the line.

Issue codemirror/google-modes#58
---
 addon/comment/continuecomment.js | 4 ++--
 mode/javascript/javascript.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 6552b09bbf..d92318b345 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -22,10 +22,10 @@
       var insert = null;
       if (mode.blockCommentStart && mode.blockCommentContinue) {
         var line = cm.getLine(pos.line).slice(0, pos.ch)
-        var end = line.indexOf(mode.blockCommentEnd), found
+        var end = line.lastIndexOf(mode.blockCommentEnd), found
         if (end != -1 && end == pos.ch - mode.blockCommentEnd.length) {
           // Comment ended, don't continue it
-        } else if ((found = line.indexOf(mode.blockCommentStart)) > -1) {
+        } else if ((found = line.lastIndexOf(mode.blockCommentStart)) > -1 && found > end) {
           insert = line.slice(0, found)
           if (/\S/.test(insert)) {
             insert = ""
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d6cc4771bd..61a6de4be7 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -821,7 +821,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
     blockCommentStart: jsonMode ? null : "/*",
     blockCommentEnd: jsonMode ? null : "*/",
-    blockCommentContinue: jsonMode ? null : "   ",
+    blockCommentContinue: jsonMode ? null : " * ",
     lineComment: jsonMode ? null : "//",
     fold: "brace",
     closeBrackets: "()[]{}''\"\"``",

From 1951460e52e2ec1d3615b5240123fe3c284d2e17 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Wed, 11 Oct 2017 17:45:53 -0700
Subject: [PATCH 3550/4742] [sublime bindings] Export macSublime & pcSublime
 keymaps

This will make it easier to get programmatic access to the content of these keymaps, per #5020
---
 keymap/sublime.js | 247 +++++++++++++++++++++++++++++++---------------
 1 file changed, 169 insertions(+), 78 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 98266e44f0..eeccab1721 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -14,11 +14,8 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var map = CodeMirror.keyMap.sublime = {fallthrough: "default"};
   var cmds = CodeMirror.commands;
   var Pos = CodeMirror.Pos;
-  var mac = CodeMirror.keyMap["default"] == CodeMirror.keyMap.macDefault;
-  var ctrl = mac ? "Cmd-" : "Ctrl-";
 
   // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that.
   function findPosSubword(doc, start, dir) {
@@ -52,16 +49,10 @@
     });
   }
 
-  var goSubwordCombo = mac ? "Ctrl-" : "Alt-";
+  cmds.goSubwordLeft = function(cm) { moveSubword(cm, -1); };
+  cmds.goSubwordRight = function(cm) { moveSubword(cm, 1); };
 
-  cmds[map[goSubwordCombo + "Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
-  cmds[map[goSubwordCombo + "Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
-
-  if (mac) map["Cmd-Left"] = "goLineStartSmart";
-
-  var scrollLineCombo = mac ? "Ctrl-Alt-" : "Ctrl-";
-
-  cmds[map[scrollLineCombo + "Up"] = "scrollLineUp"] = function(cm) {
+  cmds.scrollLineUp = function(cm) {
     var info = cm.getScrollInfo();
     if (!cm.somethingSelected()) {
       var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local");
@@ -70,7 +61,7 @@
     }
     cm.scrollTo(null, info.top - cm.defaultTextHeight());
   };
-  cmds[map[scrollLineCombo + "Down"] = "scrollLineDown"] = function(cm) {
+  cmds.scrollLineDown = function(cm) {
     var info = cm.getScrollInfo();
     if (!cm.somethingSelected()) {
       var visibleTopLine = cm.lineAtHeight(info.top, "local")+1;
@@ -80,7 +71,7 @@
     cm.scrollTo(null, info.top + cm.defaultTextHeight());
   };
 
-  cmds[map["Shift-" + ctrl + "L"] = "splitSelectionByLine"] = function(cm) {
+  cmds.splitSelectionByLine = function(cm) {
     var ranges = cm.listSelections(), lineRanges = [];
     for (var i = 0; i < ranges.length; i++) {
       var from = ranges[i].from(), to = ranges[i].to();
@@ -92,14 +83,12 @@
     cm.setSelections(lineRanges, 0);
   };
 
-  map["Shift-Tab"] = "indentLess";
-
-  cmds[map["Esc"] = "singleSelectionTop"] = function(cm) {
+  cmds.singleSelectionTop = function(cm) {
     var range = cm.listSelections()[0];
     cm.setSelection(range.anchor, range.head, {scroll: false});
   };
 
-  cmds[map[ctrl + "L"] = "selectLine"] = function(cm) {
+  cmds.selectLine = function(cm) {
     var ranges = cm.listSelections(), extended = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i];
@@ -109,8 +98,6 @@
     cm.setSelections(extended);
   };
 
-  map["Shift-Ctrl-K"] = "deleteLine";
-
   function insertLine(cm, above) {
     if (cm.isReadOnly()) return CodeMirror.Pass
     cm.operation(function() {
@@ -129,9 +116,9 @@
     cm.execCommand("indentAuto");
   }
 
-  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { return insertLine(cm, false); };
+  cmds.insertLineAfter = function(cm) { return insertLine(cm, false); };
 
-  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { return insertLine(cm, true); };
+  cmds.insertLineBefore = function(cm) { return insertLine(cm, true); };
 
   function wordAt(cm, pos) {
     var start = pos.ch, end = start, line = cm.getLine(pos.line);
@@ -140,7 +127,7 @@
     return {from: Pos(pos.line, start), to: Pos(pos.line, end), word: line.slice(start, end)};
   }
 
-  cmds[map[ctrl + "D"] = "selectNextOccurrence"] = function(cm) {
+  cmds.selectNextOccurrence = function(cm) {
     var from = cm.getCursor("from"), to = cm.getCursor("to");
     var fullWord = cm.state.sublimeFindFullWord == cm.doc.sel;
     if (CodeMirror.cmpPos(from, to) == 0) {
@@ -177,10 +164,8 @@
     }
     cm.setSelections(newRanges);
   }
-
-  var addCursorToLineCombo = mac ? "Shift-Cmd" : 'Alt-Ctrl';
-  cmds[map[addCursorToLineCombo + "Up"] = "addCursorToPrevLine"] = function(cm) { addCursorToSelection(cm, -1); };
-  cmds[map[addCursorToLineCombo + "Down"] = "addCursorToNextLine"] = function(cm) { addCursorToSelection(cm, 1); };
+  cmds.addCursorToPrevLine = function(cm) { addCursorToSelection(cm, -1); };
+  cmds.addCursorToNextLine = function(cm) { addCursorToSelection(cm, 1); };
 
   function isSelectedRange(ranges, from, to) {
     for (var i = 0; i < ranges.length; i++)
@@ -209,14 +194,14 @@
     return true;
   }
 
-  cmds[map["Shift-" + ctrl + "Space"] = "selectScope"] = function(cm) {
+  cmds.selectScope = function(cm) {
     selectBetweenBrackets(cm) || cm.execCommand("selectAll");
   };
-  cmds[map["Shift-" + ctrl + "M"] = "selectBetweenBrackets"] = function(cm) {
+  cmds.selectBetweenBrackets = function(cm) {
     if (!selectBetweenBrackets(cm)) return CodeMirror.Pass;
   };
 
-  cmds[map[ctrl + "M"] = "goToBracket"] = function(cm) {
+  cmds.goToBracket = function(cm) {
     cm.extendSelectionsBy(function(range) {
       var next = cm.scanForBracket(range.head, 1);
       if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos;
@@ -225,9 +210,7 @@
     });
   };
 
-  var swapLineCombo = mac ? "Cmd-Ctrl-" : "Shift-Ctrl-";
-
-  cmds[map[swapLineCombo + "Up"] = "swapLineUp"] = function(cm) {
+  cmds.swapLineUp = function(cm) {
     if (cm.isReadOnly()) return CodeMirror.Pass
     var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = [];
     for (var i = 0; i < ranges.length; i++) {
@@ -254,7 +237,7 @@
     });
   };
 
-  cmds[map[swapLineCombo + "Down"] = "swapLineDown"] = function(cm) {
+  cmds.swapLineDown = function(cm) {
     if (cm.isReadOnly()) return CodeMirror.Pass
     var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
     for (var i = ranges.length - 1; i >= 0; i--) {
@@ -278,11 +261,11 @@
     });
   };
 
-  cmds[map[ctrl + "/"] = "toggleCommentIndented"] = function(cm) {
+  cmds.toggleCommentIndented = function(cm) {
     cm.toggleComment({ indent: true });
   }
 
-  cmds[map[ctrl + "J"] = "joinLines"] = function(cm) {
+  cmds.joinLines = function(cm) {
     var ranges = cm.listSelections(), joined = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i], from = range.from();
@@ -310,7 +293,7 @@
     });
   };
 
-  cmds[map["Shift-" + ctrl + "D"] = "duplicateLine"] = function(cm) {
+  cmds.duplicateLine = function(cm) {
     cm.operation(function() {
       var rangeCount = cm.listSelections().length;
       for (var i = 0; i < rangeCount; i++) {
@@ -324,7 +307,6 @@
     });
   };
 
-  if (!mac) map[ctrl + "T"] = "transposeChars";
 
   function sortLines(cm, caseSensitive) {
     if (cm.isReadOnly()) return CodeMirror.Pass
@@ -362,10 +344,10 @@
     });
   }
 
-  cmds[map["F9"] = "sortLines"] = function(cm) { sortLines(cm, true); };
-  cmds[map[ctrl + "F9"] = "sortLinesInsensitive"] = function(cm) { sortLines(cm, false); };
+  cmds.sortLines = function(cm) { sortLines(cm, true); };
+  cmds.sortLinesInsensitive = function(cm) { sortLines(cm, false); };
 
-  cmds[map["F2"] = "nextBookmark"] = function(cm) {
+  cmds.nextBookmark = function(cm) {
     var marks = cm.state.sublimeBookmarks;
     if (marks) while (marks.length) {
       var current = marks.shift();
@@ -377,7 +359,7 @@
     }
   };
 
-  cmds[map["Shift-F2"] = "prevBookmark"] = function(cm) {
+  cmds.prevBookmark = function(cm) {
     var marks = cm.state.sublimeBookmarks;
     if (marks) while (marks.length) {
       marks.unshift(marks.pop());
@@ -389,7 +371,7 @@
     }
   };
 
-  cmds[map[ctrl + "F2"] = "toggleBookmark"] = function(cm) {
+  cmds.toggleBookmark = function(cm) {
     var ranges = cm.listSelections();
     var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []);
     for (var i = 0; i < ranges.length; i++) {
@@ -409,13 +391,13 @@
     }
   };
 
-  cmds[map["Shift-" + ctrl + "F2"] = "clearBookmarks"] = function(cm) {
+  cmds.clearBookmarks = function(cm) {
     var marks = cm.state.sublimeBookmarks;
     if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
     marks.length = 0;
   };
 
-  cmds[map["Alt-F2"] = "selectBookmarks"] = function(cm) {
+  cmds.selectBookmarks = function(cm) {
     var marks = cm.state.sublimeBookmarks, ranges = [];
     if (marks) for (var i = 0; i < marks.length; i++) {
       var found = marks[i].find();
@@ -428,10 +410,6 @@
       cm.setSelections(ranges, 0);
   };
 
-  map["Alt-Q"] = "wrapLines";
-
-  var cK = ctrl + "K ";
-
   function modifyWordOrSelection(cm, mod) {
     cm.operation(function() {
       var ranges = cm.listSelections(), indices = [], replacements = [];
@@ -451,9 +429,7 @@
     });
   }
 
-  map[cK + ctrl + "Backspace"] = "delLineLeft";
-
-  cmds[map["Backspace"] = "smartBackspace"] = function(cm) {
+  cmds.smartBackspace = function(cm) {
     if (cm.somethingSelected()) return CodeMirror.Pass;
 
     cm.operation(function() {
@@ -481,7 +457,7 @@
     });
   };
 
-  cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
+  cmds.delLineRight = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();
       for (var i = ranges.length - 1; i >= 0; i--)
@@ -490,22 +466,22 @@
     });
   };
 
-  cmds[map[cK + ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
+  cmds.upcaseAtCursor = function(cm) {
     modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
   };
-  cmds[map[cK + ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
+  cmds.downcaseAtCursor = function(cm) {
     modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); });
   };
 
-  cmds[map[cK + ctrl + "Space"] = "setSublimeMark"] = function(cm) {
+  cmds.setSublimeMark = function(cm) {
     if (cm.state.sublimeMark) cm.state.sublimeMark.clear();
     cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
   };
-  cmds[map[cK + ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
+  cmds.selectToSublimeMark = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) cm.setSelection(cm.getCursor(), found);
   };
-  cmds[map[cK + ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
+  cmds.deleteToSublimeMark = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) {
       var from = cm.getCursor(), to = found;
@@ -514,7 +490,7 @@
       cm.replaceRange("", from, to);
     }
   };
-  cmds[map[cK + ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
+  cmds.swapWithSublimeMark = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) {
       cm.state.sublimeMark.clear();
@@ -522,19 +498,17 @@
       cm.setCursor(found);
     }
   };
-  cmds[map[cK + ctrl + "Y"] = "sublimeYank"] = function(cm) {
+  cmds.sublimeYank = function(cm) {
     if (cm.state.sublimeKilled != null)
       cm.replaceSelection(cm.state.sublimeKilled, null, "paste");
   };
 
-  map[cK + ctrl + "G"] = "clearBookmarks";
-  cmds[map[cK + ctrl + "C"] = "showInCenter"] = function(cm) {
+  cmds.showInCenter = function(cm) {
     var pos = cm.cursorCoords(null, "local");
     cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
   };
 
-  var selectLinesCombo = mac ? "Ctrl-Shift-" : "Ctrl-Alt-";
-  cmds[map[selectLinesCombo + "Up"] = "selectLinesUpward"] = function(cm) {
+  cmds.selectLinesUpward = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();
       for (var i = 0; i < ranges.length; i++) {
@@ -544,7 +518,7 @@
       }
     });
   };
-  cmds[map[selectLinesCombo + "Down"] = "selectLinesDownward"] = function(cm) {
+  cmds.selectLinesDownward = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();
       for (var i = 0; i < ranges.length; i++) {
@@ -583,9 +557,9 @@
         cm.setSelection(target.from, target.to);
     }
   };
-  cmds[map[ctrl + "F3"] = "findUnder"] = function(cm) { findAndGoTo(cm, true); };
-  cmds[map["Shift-" + ctrl + "F3"] = "findUnderPrevious"] = function(cm) { findAndGoTo(cm,false); };
-  cmds[map["Alt-F3"] = "findAllUnder"] = function(cm) {
+  cmds.findUnder = function(cm) { findAndGoTo(cm, true); };
+  cmds.findUnderPrevious = function(cm) { findAndGoTo(cm,false); };
+  cmds.findAllUnder = function(cm) {
     var target = getTarget(cm);
     if (!target) return;
     var cur = cm.getSearchCursor(target.query);
@@ -599,15 +573,132 @@
     cm.setSelections(matches, primaryIndex);
   };
 
-  map["Shift-" + ctrl + "["] = "fold";
-  map["Shift-" + ctrl + "]"] = "unfold";
-  map[cK + ctrl + "0"] = map[cK + ctrl + "J"] = "unfoldAll";
-
-  map[ctrl + "I"] = "findIncremental";
-  map["Shift-" + ctrl + "I"] = "findIncrementalReverse";
-  map[ctrl + "H"] = "replace";
-  map["F3"] = "findNext";
-  map["Shift-F3"] = "findPrev";
 
-  CodeMirror.normalizeKeyMap(map);
+  var keyMap = CodeMirror.keyMap;
+  keyMap.macSublime = {
+    "Cmd-Left": "goLineStartSmart",
+    "Shift-Tab": "indentLess",
+    "Shift-Ctrl-K": "deleteLine",
+    "Alt-Q": "wrapLines",
+    "Ctrl-Left": "goSubwordLeft",
+    "Ctrl-Right": "goSubwordRight",
+    "Ctrl-Alt-Up": "scrollLineUp",
+    "Ctrl-Alt-Down": "scrollLineDown",
+    "Cmd-L": "selectLine",
+    "Shift-Cmd-L": "splitSelectionByLine",
+    "Esc": "singleSelectionTop",
+    "Cmd-Enter": "insertLineAfter",
+    "Shift-Cmd-Enter": "insertLineBefore",
+    "Cmd-D": "selectNextOccurrence",
+    "Shift-Cmd-Up": "addCursorToPrevLine",
+    "Shift-Cmd-Down": "addCursorToNextLine",
+    "Shift-Cmd-Space": "selectScope",
+    "Shift-Cmd-M": "selectBetweenBrackets",
+    "Cmd-M": "goToBracket",
+    "Cmd-Ctrl-Up": "swapLineUp",
+    "Cmd-Ctrl-Down": "swapLineDown",
+    "Cmd-/": "toggleCommentIndented",
+    "Cmd-J": "joinLines",
+    "Shift-Cmd-D": "duplicateLine",
+    "F9": "sortLines",
+    "Cmd-F9": "sortLinesInsensitive",
+    "F2": "nextBookmark",
+    "Shift-F2": "prevBookmark",
+    "Cmd-F2": "toggleBookmark",
+    "Shift-Cmd-F2": "clearBookmarks",
+    "Alt-F2": "selectBookmarks",
+    "Backspace": "smartBackspace",
+    "Cmd-K Cmd-K": "delLineRight",
+    "Cmd-K Cmd-U": "upcaseAtCursor",
+    "Cmd-K Cmd-L": "downcaseAtCursor",
+    "Cmd-K Cmd-Space": "setSublimeMark",
+    "Cmd-K Cmd-A": "selectToSublimeMark",
+    "Cmd-K Cmd-W": "deleteToSublimeMark",
+    "Cmd-K Cmd-X": "swapWithSublimeMark",
+    "Cmd-K Cmd-Y": "sublimeYank",
+    "Cmd-K Cmd-C": "showInCenter",
+    "Cmd-K Cmd-G": "clearBookmarks",
+    "Cmd-K Cmd-Backspace": "delLineLeft",
+    "Cmd-K Cmd-0": "unfoldAll",
+    "Cmd-K Cmd-J": "unfoldAll",
+    "Ctrl-Shift-Up": "selectLinesUpward",
+    "Ctrl-Shift-Down": "selectLinesDownward",
+    "Cmd-F3": "findUnder",
+    "Shift-Cmd-F3": "findUnderPrevious",
+    "Alt-F3": "findAllUnder",
+    "Shift-Cmd-[": "fold",
+    "Shift-Cmd-]": "unfold",
+    "Cmd-I": "findIncremental",
+    "Shift-Cmd-I": "findIncrementalReverse",
+    "Cmd-H": "replace",
+    "F3": "findNext",
+    "Shift-F3": "findPrev",
+    "fallthrough": "pcDefault"
+  };
+  CodeMirror.normalizeKeyMap(keyMap.macSublime);
+
+  keyMap.pcSublime = {
+    "Shift-Tab": "indentLess",
+    "Shift-Ctrl-K": "deleteLine",
+    "Alt-Q": "wrapLines",
+    "Ctrl-T": "transposeChars",
+    "Alt-Left": "goSubwordLeft",
+    "Alt-Right": "goSubwordRight",
+    "Ctrl-Up": "scrollLineUp",
+    "Ctrl-Down": "scrollLineDown",
+    "Ctrl-L": "selectLine",
+    "Shift-Ctrl-L": "splitSelectionByLine",
+    "Esc": "singleSelectionTop",
+    "Ctrl-Enter": "insertLineAfter",
+    "Shift-Ctrl-Enter": "insertLineBefore",
+    "Ctrl-D": "selectNextOccurrence",
+    "Alt-CtrlUp": "addCursorToPrevLine",
+    "Alt-CtrlDown": "addCursorToNextLine",
+    "Shift-Ctrl-Space": "selectScope",
+    "Shift-Ctrl-M": "selectBetweenBrackets",
+    "Ctrl-M": "goToBracket",
+    "Shift-Ctrl-Up": "swapLineUp",
+    "Shift-Ctrl-Down": "swapLineDown",
+    "Ctrl-/": "toggleCommentIndented",
+    "Ctrl-J": "joinLines",
+    "Shift-Ctrl-D": "duplicateLine",
+    "F9": "sortLines",
+    "Ctrl-F9": "sortLinesInsensitive",
+    "F2": "nextBookmark",
+    "Shift-F2": "prevBookmark",
+    "Ctrl-F2": "toggleBookmark",
+    "Shift-Ctrl-F2": "clearBookmarks",
+    "Alt-F2": "selectBookmarks",
+    "Backspace": "smartBackspace",
+    "Ctrl-K Ctrl-K": "delLineRight",
+    "Ctrl-K Ctrl-U": "upcaseAtCursor",
+    "Ctrl-K Ctrl-L": "downcaseAtCursor",
+    "Ctrl-K Ctrl-Space": "setSublimeMark",
+    "Ctrl-K Ctrl-A": "selectToSublimeMark",
+    "Ctrl-K Ctrl-W": "deleteToSublimeMark",
+    "Ctrl-K Ctrl-X": "swapWithSublimeMark",
+    "Ctrl-K Ctrl-Y": "sublimeYank",
+    "Ctrl-K Ctrl-C": "showInCenter",
+    "Ctrl-K Ctrl-G": "clearBookmarks",
+    "Ctrl-K Ctrl-Backspace": "delLineLeft",
+    "Ctrl-K Ctrl-0": "unfoldAll",
+    "Ctrl-K Ctrl-J": "unfoldAll",
+    "Ctrl-Alt-Up": "selectLinesUpward",
+    "Ctrl-Alt-Down": "selectLinesDownward",
+    "Ctrl-F3": "findUnder",
+    "Shift-Ctrl-F3": "findUnderPrevious",
+    "Alt-F3": "findAllUnder",
+    "Shift-Ctrl-[": "fold",
+    "Shift-Ctrl-]": "unfold",
+    "Ctrl-I": "findIncremental",
+    "Shift-Ctrl-I": "findIncrementalReverse",
+    "Ctrl-H": "replace",
+    "F3": "findNext",
+    "Shift-F3": "findPrev",
+    "fallthrough": "pcDefault"
+  };
+  CodeMirror.normalizeKeyMap(keyMap.pcSublime);
+
+  var mac = keyMap.default == keyMap.macDefault;
+  keyMap.sublime = mac ? keyMap.macSublime : keyMap.pcSublime;
 });

From c1196ebc6260d4652ced5eee254d8c5d3cea10dd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 16 Oct 2017 16:17:48 +0200
Subject: [PATCH 3551/4742] [sublime keymap] Fix fallthrough for mac bindings

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index eeccab1721..08c9ebfb3f 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -633,7 +633,7 @@
     "Cmd-H": "replace",
     "F3": "findNext",
     "Shift-F3": "findPrev",
-    "fallthrough": "pcDefault"
+    "fallthrough": "macDefault"
   };
   CodeMirror.normalizeKeyMap(keyMap.macSublime);
 

From e5e2aefd0874463ff5d9aeb955d869e7853658b5 Mon Sep 17 00:00:00 2001
From: Guan Gui <guan@southbanksoftware.com>
Date: Mon, 16 Oct 2017 15:45:34 +1100
Subject: [PATCH 3552/4742] [closebrackets addon] Use editor line separator
 when exploding lines

Issue #5031
---
 addon/edit/closebrackets.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 36aec0d4b5..7b07f7fd8a 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -84,7 +84,8 @@
       if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
     }
     cm.operation(function() {
-      cm.replaceSelection("\n\n", null);
+      var linesep = cm.lineSeparator() || "\n";
+      cm.replaceSelection(linesep + linesep, null);
       cm.execCommand("goCharLeft");
       ranges = cm.listSelections();
       for (var i = 0; i < ranges.length; i++) {

From deaa842dc6f1711874c1cacc6b984f7264932f83 Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Tue, 17 Oct 2017 12:15:40 +0200
Subject: [PATCH 3553/4742] [runmode addon] Include CodeMirror.innerMode in
 runmode.node.js

The markdown mode uses `CodeMirror.innerMode` which isn't defined in
the stripped down node runmode. Since markdown is the only mode
(AFAICT) that uses it I'm not sure if it would make more sense rewrite
it to not use it but this seemed like the least risky option.
---
 addon/runmode/runmode.node.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 093cb30876..21c72696c8 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -163,6 +163,18 @@ exports.getMode = function(options, spec) {
 
   return modeObj;
 };
+
+exports.innerMode = function(mode, state) {
+  var info;
+  while (mode.innerMode) {
+    info = mode.innerMode(state);
+    if (!info || info.mode == mode) break;
+    state = info.state;
+    mode = info.mode;
+  }
+  return info || {mode: mode, state: state};
+}
+
 exports.registerHelper = exports.registerGlobalHelper = Math.min;
 
 exports.runMode = function(string, modespec, callback, options) {

From 79d266e60a8d02a865c7cf9340628a0f5d920394 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Jun 2017 14:20:30 +0200
Subject: [PATCH 3554/4742] Add a baseToken method to string streams

That overlay modes can use to access the underlying token info.
---
 doc/manual.html          |  6 ++++++
 src/line/highlight.js    | 16 +++++++++++++++-
 src/util/StringStream.js |  4 ++++
 test/test.js             | 15 +++++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 67d5e4258a..0ab9cf0d79 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3261,6 +3261,12 @@ <h2>Writing CodeMirror Modes</h2>
       one, in order to scan ahead across line boundaries. Note that
       you want to do this carefully, since looking far ahead will make
       mode state caching much less effective.</dd>
+
+      <dt><code><strong>baseToken</strong>() → ?{type: ?string, size: number}</code></dt>
+      <dd>Modes added
+      through <a href="#addOverlay"><code>addOverlay</code></a>
+      (and <em>only</em> such modes) can use this method to inspect
+      the current token produced by the underlying mode.</dd>
     </dl>
 
     <p id="blankLine">By default, blank lines are simply skipped when
diff --git a/src/line/highlight.js b/src/line/highlight.js
index 430d86a224..82e2aeee29 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -18,6 +18,8 @@ class Context {
     this.doc = doc
     this.line = line
     this.maxLookAhead = lookAhead || 0
+    this.baseTokens = null
+    this.baseTokenPos = 1
   }
 
   lookAhead(n) {
@@ -26,6 +28,15 @@ class Context {
     return line
   }
 
+  baseToken(n) {
+    if (!this.baseTokens) return null
+    while (this.baseTokens[this.baseTokenPos] >= n)
+      this.baseTokenPos += 2
+    let type = this.baseTokens[this.baseTokenPos + 1]
+    return {type: type && type.replace(/( |^)overlay .*/, ""),
+            size: this.baseTokens[this.baseTokenPos] - n}
+  }
+
   nextLine() {
     this.line++
     if (this.maxLookAhead > 0) this.maxLookAhead--
@@ -60,6 +71,7 @@ export function highlightLine(cm, line, context, forceToEnd) {
 
   // Run overlays, adjust style array.
   for (let o = 0; o < cm.state.overlays.length; ++o) {
+    context.baseTokens = st
     let overlay = cm.state.overlays[o], i = 1, at = 0
     context.state = true
     runMode(cm, line.text, overlay.mode, context, (end, style) => {
@@ -83,8 +95,10 @@ export function highlightLine(cm, line, context, forceToEnd) {
         }
       }
     }, lineClasses)
+    context.state = state
+    context.baseTokens = null
+    context.baseTokenPos = 1
   }
-  context.state = state
 
   return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}
 }
diff --git a/src/util/StringStream.js b/src/util/StringStream.js
index ac9555f1ce..a14b1b6430 100644
--- a/src/util/StringStream.js
+++ b/src/util/StringStream.js
@@ -81,6 +81,10 @@ class StringStream {
     let oracle = this.lineOracle
     return oracle && oracle.lookAhead(n)
   }
+  baseToken() {
+    let oracle = this.lineOracle
+    return oracle && oracle.baseToken(this.pos)
+  }
 }
 
 export default StringStream
diff --git a/test/test.js b/test/test.js
index 9c768e3f6b..415dd9f0bc 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2218,6 +2218,21 @@ testCM("getTokenTypeAt", function(cm) {
   eq(cm.getTokenTypeAt(Pos(0, 6)), "string");
 }, {value: "1 + 'foo'", mode: "javascript"});
 
+testCM("addOverlay", function(cm) {
+  cm.addOverlay({
+    token: function(stream) {
+      var base = stream.baseToken()
+      if (!/comment/.test(base.type) && stream.match(/\d+/)) return "x"
+      stream.next()
+    }
+  })
+  var x = byClassName(cm.getWrapperElement(), "cm-x")
+  is(x.length, 1)
+  is(x[0].textContent, "233")
+  cm.replaceRange("", Pos(0, 4), Pos(0, 6))
+  is(byClassName(cm.getWrapperElement(), "cm-x").length, 2)
+}, {value: "foo /* 100 */\nbar + 233;\nbaz", mode: "javascript"})
+
 testCM("resizeLineWidget", function(cm) {
   addDoc(cm, 200, 3);
   var widget = document.createElement("pre");

From 42a26328333a052583f1bd4623bfb8e42717e1dd Mon Sep 17 00:00:00 2001
From: vtripolitakis <vtripolitakis@gmail.com>
Date: Tue, 17 Oct 2017 21:59:21 +0300
Subject: [PATCH 3555/4742] [sql mode] Fix representation of table hinting in
 demo page

---
 mode/sql/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index e12b289bfa..b434f0f405 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -78,8 +78,8 @@ <h2>SQL Mode for CodeMirror</h2>
     autofocus: true,
     extraKeys: {"Ctrl-Space": "autocomplete"},
     hintOptions: {tables: {
-      users: {name: null, score: null, birthDate: null},
-      countries: {name: null, population: null, size: null}
+      users: ["name", "score", "birthDate"],
+      countries: ["name", "population", "size"]
     }}
   });
 };

From d14888a70bb4d172a60d968682f0e28ec5065c96 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 18 Oct 2017 11:11:11 +0200
Subject: [PATCH 3556/4742] [javascript mode] Fix bug in object literal spread
 parsing

Closes #5036
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 61a6de4be7..ca9fe8ba86 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -514,7 +514,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
     } else if (type == "spread") {
-      return cont(expression, afterprop);
+      return cont(expressionNoComma, afterprop);
     } else if (value == "*") {
       cx.marked = "keyword";
       return cont(objprop);

From d323ad7236a4b611b7c0898fe660136df6faaf43 Mon Sep 17 00:00:00 2001
From: Pi Delport <pjdelport@gmail.com>
Date: Wed, 18 Oct 2017 14:20:24 +0200
Subject: [PATCH 3557/4742] (Update my name)

---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 1264357043..e4206048bf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -529,7 +529,7 @@ Peter Kroon
 Philipp A
 Philip Stadermann
 Pierre Gerold
-Piët Delport
+Pi Delport
 Pieter Ouwerkerk
 Pontus Melke
 prasanthj

From cf799958cf8f7ec89c808b7400fe248494b61674 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 18 Oct 2017 14:27:02 +0200
Subject: [PATCH 3558/4742] [bin/authors.sh] Make sure changed name doesn't
 resurface from git history

Issue #5037
---
 bin/authors.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/authors.sh b/bin/authors.sh
index b3ee99c6dd..3f228c1fb0 100755
--- a/bin/authors.sh
+++ b/bin/authors.sh
@@ -1,6 +1,6 @@
 # Combine existing list of authors with everyone known in git, sort, add header.
 tail --lines=+3 AUTHORS > AUTHORS.tmp
-git log --format='%aN' >> AUTHORS.tmp
+git log --format='%aN' | grep -v "Piët Delport" >> AUTHORS.tmp
 echo -e "List of CodeMirror contributors. Updated before every release.\n" > AUTHORS
 sort -u AUTHORS.tmp >> AUTHORS
 rm -f AUTHORS.tmp

From 40a818295aef34d7fd73e9c036e720334336ae98 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 18 Oct 2017 17:02:48 +0200
Subject: [PATCH 3559/4742] Fix baseToken method

See https://github.com/codemirror/CodeMirror/commit/79d266e60a8d02a865c7cf9340628a0f5d920394#commitcomment-25055107
---
 src/line/highlight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/line/highlight.js b/src/line/highlight.js
index 82e2aeee29..13921585a7 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -30,7 +30,7 @@ class Context {
 
   baseToken(n) {
     if (!this.baseTokens) return null
-    while (this.baseTokens[this.baseTokenPos] >= n)
+    while (this.baseTokens[this.baseTokenPos] < n)
       this.baseTokenPos += 2
     let type = this.baseTokens[this.baseTokenPos + 1]
     return {type: type && type.replace(/( |^)overlay .*/, ""),

From a7f6e9f0a1ab1b1f3e9ca008579a17808e0e417f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Oct 2017 16:01:41 +0200
Subject: [PATCH 3560/4742] Fix baseToken to actually return the token ahead
 when on boundary

---
 src/line/highlight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/line/highlight.js b/src/line/highlight.js
index 13921585a7..c5e6b8aacc 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -30,7 +30,7 @@ class Context {
 
   baseToken(n) {
     if (!this.baseTokens) return null
-    while (this.baseTokens[this.baseTokenPos] < n)
+    while (this.baseTokens[this.baseTokenPos] <= n)
       this.baseTokenPos += 2
     let type = this.baseTokens[this.baseTokenPos + 1]
     return {type: type && type.replace(/( |^)overlay .*/, ""),

From f936d89e4a2aa68eee964f57d14f875ee1d71ff4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Oct 2017 17:35:00 +0200
Subject: [PATCH 3561/4742] Mark version 5.31.0

---
 AUTHORS           | 10 +++++++++-
 CHANGELOG.md      | 18 ++++++++++++++++++
 doc/manual.html   |  4 ++--
 doc/releases.html | 11 +++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index e4206048bf..f800b86b7d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,6 +48,7 @@ Andreas Reischuck
 Andres Taylor
 Andre von Houck
 Andrew Cheng
+Andrew Dassonville
 Andrey Fedorov
 Andrey Klyuchnikov
 Andrey Lushnikov
@@ -242,6 +243,7 @@ Grant Skinner
 greengiant
 Gregory Koberger
 Grzegorz Mazur
+Guan Gui
 Guillaume Massé
 Guillaume Massé
 guraga
@@ -253,6 +255,7 @@ Harshvardhan Gupta
 Hasan Karahan
 Hector Oswaldo Caballero
 Hendrik Wallbaum
+Henrik Haugbølle
 Herculano Campos
 Hiroyuki Makino
 hitsthings
@@ -308,6 +311,7 @@ jem (graphite)
 Jeremy Parmenter
 Jim
 Jim Avery
+jkaplon
 JobJob
 jochenberger
 Jochen Berger
@@ -341,6 +345,7 @@ ju1ius
 Juan Benavides Romero
 Jucovschi Constantin
 Juho Vuori
+Julien CROUZET
 Julien Rebetez
 Justin Andresen
 Justin Hileman
@@ -411,6 +416,7 @@ Mark Lentczner
 Marko Bonaci
 Mark Peace
 Markus Bordihn
+Markus Olsson
 Martin Balek
 Martín Gaitán
 Martin Hasoň
@@ -528,8 +534,8 @@ peterkroon
 Peter Kroon
 Philipp A
 Philip Stadermann
-Pierre Gerold
 Pi Delport
+Pierre Gerold
 Pieter Ouwerkerk
 Pontus Melke
 prasanthj
@@ -633,6 +639,7 @@ thanasis
 TheHowl
 themrmax
 think
+Thomas Brouard
 Thomas Dvornik
 Thomas Kluyver
 Thomas Schmid
@@ -662,6 +669,7 @@ vf
 Victor Bocharsky
 Vincent Woo
 Volker Mische
+vtripolitakis
 Weiyan Shao
 wenli
 Wes Cossick
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff7d6e2311..409c7234bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 5.31.0 (2017-10-20)
+
+### Bug fixes
+
+Further improve selection drawing and cursor motion in right-to-left documents.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable [input mode](http://codemirror.net/doc/manual.html#option_contentEditable).
+
+[continuecomment addon](http://codemirror.net/doc/manual.html#addon_continuecomment): Fix bug when pressing enter after a single-line block comment.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix issue with leaving indented fenced code blocks.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.
+
+### New features
+
+Modes added with [`addOverlay`](http://codemirror.net/doc/manual.html#addOverlay) now have access to a [`baseToken`](http://codemirror.net/doc/manual.html#baseToken) method on their input stream, giving access to the tokens of the underlying mode.
+
 ## 5.30.0 (2017-09-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 0ab9cf0d79..f2f04459b4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.30.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.31.0</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
@@ -3262,7 +3262,7 @@ <h2>Writing CodeMirror Modes</h2>
       you want to do this carefully, since looking far ahead will make
       mode state caching much less effective.</dd>
 
-      <dt><code><strong>baseToken</strong>() → ?{type: ?string, size: number}</code></dt>
+      <dt id="baseToken"><code><strong>baseToken</strong>() → ?{type: ?string, size: number}</code></dt>
       <dd>Modes added
       through <a href="#addOverlay"><code>addOverlay</code></a>
       (and <em>only</em> such modes) can use this method to inspect
diff --git a/doc/releases.html b/doc/releases.html
index e16ab6dd43..23de4c8023 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,17 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-10-2017: <a href="http://codemirror.net/codemirror-5.31.0.zip">Version 5.31.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Modes added with <a href="http://codemirror.net/doc/manual.html#addOverlay"><code>addOverlay</code></a> now have access to a <a href="http://codemirror.net/doc/manual.html#baseToken"><code>baseToken</code></a> method on their input stream, giving access to the tokens of the underlying mode.</li>
+    <li>Further improve selection drawing and cursor motion in right-to-left documents.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable <a href="http://codemirror.net/doc/manual.html#option_contentEditable">input mode</a>.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_continuecomment">continuecomment addon</a>: Fix bug when pressing enter after a single-line block comment.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix issue with leaving indented fenced code blocks.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.</li>
+  </ul>
+
   <p class="rel">20-09-2017: <a href="http://codemirror.net/codemirror-5.30.0.zip">Version 5.30.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index d161e77c6f..555e4804aa 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.30.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.31.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index f251b238fd..2241ad9317 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.30.0",
+  "version": "5.31.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 4298c61ff1..b0fd5de810 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.30.0"
+CodeMirror.version = "5.31.0"

From d6fea23efc1a9c1e16b18541691893860c653a13 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Oct 2017 17:36:29 +0200
Subject: [PATCH 3562/4742] Bump version number post-5.30.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f2f04459b4..7666e0df63 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.31.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.31.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 2241ad9317..6eda061f17 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.31.0",
+  "version": "5.31.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index b0fd5de810..6500e08d05 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.31.0"
+CodeMirror.version = "5.31.1"

From 070c338b3b6fd07f9f4481cbe661d7ab0253de38 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 23 Oct 2017 22:22:36 +0200
Subject: [PATCH 3563/4742] [clike mode] Stop treating package as defining in
 Java mode

Closes #5047
---
 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 d6d12c7117..02a85319ff 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -432,7 +432,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     types: words("byte short int long float double boolean char void Boolean Byte Character Double Float " +
                  "Integer Long Number Object Short String StringBuffer StringBuilder Void"),
     blockKeywords: words("catch class do else finally for if switch try while"),
-    defKeywords: words("class interface package enum @interface"),
+    defKeywords: words("class interface enum @interface"),
     typeFirstDefinitions: true,
     atoms: words("true false null"),
     number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,

From 0b1d8183f27fba189e4b06b148203599f223b5d4 Mon Sep 17 00:00:00 2001
From: Jayaprabhakar <jayaprabhakar@gmail.com>
Date: Mon, 23 Oct 2017 22:06:13 -0700
Subject: [PATCH 3564/4742] Add Codiva.io to realworld usage list

Adding Codiva.io Online Java Compiler and IDE to the existing users list.

This will highlight some of the advanced usage of Codemirror

- Multiple Tabbed editor
- Continuous compilation in the backend
- Autocompletion
- Mobile friendly
- Read-only mode
---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index f0a75abf72..2049bf26fd 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -59,6 +59,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://www.codevolve.com/">Codevolve</a> (programming lessons as-a-service)</li>
       <li><a href="http://www.codezample.com">CodeZample</a> (code snippet sharing)</li>
       <li><a href="http://codio.com">Codio</a> (Web IDE)</li>
+      <li><a href="https://www.codiva.io/">Codiva.io</a> (Online Java Compiler and IDE with auto-completion and error highlighting)</li>
       <li><a href="http://ot.substance.io/demo/">Collaborative CodeMirror demo</a> (CodeMirror + operational transforms)</li>
       <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>
       <li><a href="http://www.compilejava.net/">compilejava.net</a> (online Java sandbox)</li>

From edbc598959b1284f49f55f9f29b9fe6beeb8e920 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 29 Oct 2017 11:10:18 +0100
Subject: [PATCH 3565/4742] [closebrackets addon] Improve start-of-string
 heuristic

To also make sure the last token isn't a string.

Issue codemirror/google-modes#74
---
 addon/edit/closebrackets.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 7b07f7fd8a..7592ef0071 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -203,6 +203,7 @@
 
   function stringStartsAfter(cm, pos) {
     var token = cm.getTokenAt(Pos(pos.line, pos.ch + 1))
-    return /\bstring/.test(token.type) && token.start == pos.ch
+    return /\bstring/.test(token.type) && token.start == pos.ch &&
+      (pos.ch == 0 || !/\bstring/.test(cm.getTokenTypeAt(pos)))
   }
 });

From e26db631d4f34d844b503ecffafc5d9665ac4e6a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 29 Oct 2017 11:28:10 +0100
Subject: [PATCH 3566/4742] [javascript mode] Support TS type parameter
 defaults

Closes #5053
---
 mode/javascript/javascript.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index ca9fe8ba86..c838e31628 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -607,6 +607,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeTypeArgs(_, value) {
     if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
   }
+  function typeparam() {
+    return pass(typeexpr, maybeTypeDefault)
+  }
+  function maybeTypeDefault(_, value) {
+    if (value == "=") return cont(typeexpr)
+  }
   function vardef() {
     return pass(pattern, maybetype, maybeAssign, vardefCont);
   }
@@ -661,7 +667,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
     if (type == "variable") {register(value); return cont(functiondef);}
     if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, maybetype, statement, popcontext);
-    if (isTS && value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, functiondef)
+    if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef)
   }
   function funarg(type, value) {
     if (value == "@") cont(expression, funarg)
@@ -677,7 +683,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
   function classNameAfter(type, value) {
-    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, classNameAfter)
+    if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter)
     if (value == "extends" || value == "implements" || (isTS && type == ","))
       return cont(isTS ? typeexpr : expression, classNameAfter);
     if (type == "{") return cont(pushlex("}"), classBody, poplex);

From f841fb779ea5f89fb22ccd48879ff034807dd10f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 29 Oct 2017 12:03:28 +0100
Subject: [PATCH 3567/4742] [merge addon] Fix issue where collapsed text
 markers could get half-cleared

Issue #5054
---
 addon/merge/merge.js        | 3 +++
 src/display/update_lines.js | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index c94b27a7b8..dc2e77c60e 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -738,6 +738,9 @@
       mark.clear();
       cm.removeLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
     }
+    if (mark.explicitlyCleared) clear();
+    CodeMirror.on(widget, "click", clear);
+    mark.on("clear", clear);
     CodeMirror.on(widget, "click", clear);
     return {mark: mark, clear: clear};
   }
diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index 7583f3c159..bc8a9c60e4 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -33,8 +33,10 @@ export function updateHeightsInViewport(cm) {
 // Read and store the height of line widgets associated with the
 // given line.
 function updateWidgetHeight(line) {
-  if (line.widgets) for (let i = 0; i < line.widgets.length; ++i)
-    line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight
+  if (line.widgets) for (let i = 0; i < line.widgets.length; ++i) {
+    let w = line.widgets[i], parent = w.node.parentNode;
+    if (parent) w.height = parent.offsetHeight
+  }
 }
 
 // Compute the lines that are visible in a given viewport (defaults

From 48d2d264d34a2c366af617842c48c0685b641aad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 29 Oct 2017 12:30:12 +0100
Subject: [PATCH 3568/4742] Fix lint issue

---
 src/display/update_lines.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index bc8a9c60e4..6c59188957 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -34,7 +34,7 @@ export function updateHeightsInViewport(cm) {
 // given line.
 function updateWidgetHeight(line) {
   if (line.widgets) for (let i = 0; i < line.widgets.length; ++i) {
-    let w = line.widgets[i], parent = w.node.parentNode;
+    let w = line.widgets[i], parent = w.node.parentNode
     if (parent) w.height = parent.offsetHeight
   }
 }

From 97290a687e545bdad23794385b585fd9dfff3e2a Mon Sep 17 00:00:00 2001
From: Jonathan Hart <stuajnht@users.noreply.github.com>
Date: Sat, 21 Oct 2017 19:44:19 +0100
Subject: [PATCH 3569/4742] [continuelist addon] Increment numbers when item is
 added to the middle

Per #5030, when adding new items to the middle of a Markdown list, the remaining list numbers should automatically increment
---
 addon/edit/continuelist.js | 39 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 02c8eff9fa..30893965fe 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -44,9 +44,48 @@
           : (parseInt(match[3], 10) + 1) + match[4];
 
         replacements[i] = "\n" + indent + bullet + after;
+
+        incrementRemainingMarkdownListNumbers(cm, pos);
       }
     }
 
     cm.replaceSelections(replacements);
   };
+
+  // Auto-updating Markdown list numbers when a new item is added to the
+  // middle of a list
+  function incrementRemainingMarkdownListNumbers(cm, pos) {
+    var startLine = pos.line, lookAhead = 0, skipCount = 0;
+    var startItem = listRE.exec(cm.getLine(startLine)), startIndent = startItem[1];
+
+    do {
+      lookAhead += 1;
+      var nextLineNumber = startLine + lookAhead;
+      var nextLine = cm.getLine(nextLineNumber), nextItem = listRE.exec(nextLine);
+
+      if (nextItem) {
+        var nextIndent = nextItem[1];
+        var newNumber = (parseInt(startItem[3], 10) + lookAhead - skipCount);
+        var nextNumber = (parseInt(nextItem[3], 10)), itemNumber = nextNumber;
+
+        if (startIndent === nextIndent) {
+          if (newNumber === nextNumber) itemNumber = nextNumber + 1;
+          if (newNumber > nextNumber) itemNumber = newNumber + 1;
+          cm.replaceRange(
+            nextLine.replace(listRE, nextIndent + itemNumber + nextItem[4] + nextItem[5]),
+          {
+            line: nextLineNumber, ch: 0
+          }, {
+            line: nextLineNumber, ch: nextLine.length
+          });
+        } else {
+          if (startIndent.length > nextIndent.length) return;
+          // This doesn't run if the next line immediatley indents, as it is
+          // not clear of the users intention (new indented item or same level)
+          if ((startIndent.length < nextIndent.length) && (lookAhead === 1)) return;
+          skipCount += 1;
+        }
+      }
+    } while (nextItem);
+  }
 });

From 7e9190a646869db885ed73b239dc204d8e58a009 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 1 Nov 2017 11:17:21 +0100
Subject: [PATCH 3570/4742] [comment addon] Don't ignore content on last
 selected line when block-uncommenting

Closes #5059
---
 addon/comment/comment.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 568e639dcd..84c67edf78 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -172,10 +172,6 @@
     if (open == -1) return false
     var endLine = end == start ? startLine : self.getLine(end)
     var close = endLine.indexOf(endString, end == start ? open + startString.length : 0);
-    if (close == -1 && start != end) {
-      endLine = self.getLine(--end);
-      close = endLine.indexOf(endString);
-    }
     var insideStart = Pos(start, open + 1), insideEnd = Pos(end, close + 1)
     if (close == -1 ||
         !/comment/.test(self.getTokenTypeAt(insideStart)) ||

From a7907d37b2dcf1067a478bdc02064305461658ef Mon Sep 17 00:00:00 2001
From: Alexander Shvets <neochief@shvetsgroup.com>
Date: Tue, 31 Oct 2017 18:27:23 +0200
Subject: [PATCH 3571/4742] [searchcursor addon] Fix bug in case folding

---
 addon/search/searchcursor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index eccd81aab6..58bc47c2c3 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -159,7 +159,7 @@
         for (var i = 1; i < lines.length - 1; i++)
           if (fold(doc.getLine(line + i)) != lines[i]) continue search
         var end = doc.getLine(line + lines.length - 1), endString = fold(end), lastLine = lines[lines.length - 1]
-        if (end.slice(0, lastLine.length) != lastLine) continue search
+        if (endString.slice(0, lastLine.length) != lastLine) continue search
         return {from: Pos(line, adjustPos(orig, string, cutFrom, fold) + ch),
                 to: Pos(line + lines.length - 1, adjustPos(end, endString, lastLine.length, fold))}
       }

From 66107010e9e34372c6736e6ca9379cf6ac044abc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 1 Nov 2017 11:52:12 +0100
Subject: [PATCH 3572/4742] Re-dispatch non-matching multi-key-strokes without
 their prefix

Issue #5061
---
 src/edit/key_events.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index 2955e4ae0c..06f37be078 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -44,18 +44,26 @@ function lookupKeyForEditor(cm, name, handle) {
 // for bound mouse clicks.
 
 let stopSeq = new Delayed
+
 export function dispatchKey(cm, name, e, handle) {
   let seq = cm.state.keySeq
   if (seq) {
     if (isModifierKey(name)) return "handled"
-    stopSeq.set(50, () => {
-      if (cm.state.keySeq == seq) {
-        cm.state.keySeq = null
-        cm.display.input.reset()
-      }
-    })
-    name = seq + " " + name
+    if (/\'$/.test(name))
+      cm.state.keySeq = null
+    else
+      stopSeq.set(50, () => {
+        if (cm.state.keySeq == seq) {
+          cm.state.keySeq = null
+          cm.display.input.reset()
+        }
+      })
+    if (dispatchKeyInner(cm, seq + " " + name, e, handle)) return true
   }
+  return dispatchKeyInner(cm, name, e, handle)
+}
+
+function dispatchKeyInner(cm, name, e, handle) {
   let result = lookupKeyForEditor(cm, name, handle)
 
   if (result == "multi")
@@ -68,10 +76,6 @@ export function dispatchKey(cm, name, e, handle) {
     restartBlink(cm)
   }
 
-  if (seq && !result && /\'$/.test(name)) {
-    e_preventDefault(e)
-    return true
-  }
   return !!result
 }
 

From 659cb7f3690a9e2b066faeba73143f291932aa30 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Nov 2017 09:22:28 +0100
Subject: [PATCH 3573/4742] [javascript mode] Make TypeScript module/enum
 contextual keywords

Closes #5064
---
 mode/javascript/javascript.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c838e31628..5c772526f2 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -47,8 +47,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         "interface": kw("class"),
         "implements": C,
         "namespace": C,
-        "module": kw("module"),
-        "enum": kw("module"),
 
         // scope modifiers
         "public": kw("modifier"),
@@ -372,9 +370,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (isTS && value == "type") {
         cx.marked = "keyword"
         return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
-      } if (isTS && value == "declare") {
+      } else if (isTS && value == "declare") {
         cx.marked = "keyword"
         return cont(statement)
+      } else if (isTS && (value == "module" || value == "enum") && cx.stream.match(/^\s*\w/, false)) {
+        cx.marked = "keyword"
+        return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
       } else {
         return cont(pushlex("stat"), maybelabel);
       }
@@ -388,7 +389,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "class") return cont(pushlex("form"), className, poplex);
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
-    if (type == "module") return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
     if (type == "async") return cont(statement)
     if (value == "@") return cont(expression, statement)
     return pass(pushlex("stat"), expression, expect(";"), poplex);

From c83e94a6412b9293362e59980d7ca26f58b4b9da Mon Sep 17 00:00:00 2001
From: Jayaprabhakar <jayaprabhakar@gmail.com>
Date: Sun, 5 Nov 2017 19:02:03 -0800
Subject: [PATCH 3574/4742] Remove broken links in the realworld users page

Removing the broken links in the realworld users list. I checked the backlinks using,

https://www.deadlinkchecker.com/website-dead-link-checker.asp

and manually verified these urls to be invalid.
---
 doc/realworld.html | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index 2049bf26fd..da0f4e4e61 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -28,7 +28,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
       <li><a href="http://alm.tools">ALM Tools</a> (TypeScript powered IDE)</li>
       <li><a href="http://amber-lang.net/">Amber</a> (JavaScript-based Smalltalk system)</li>
-      <li><a href="http://apachegui.ca/">Apache GUI</a></li>
       <li><a href="http://apeye.org/">APEye</a> (tool for testing &amp; documenting APIs)</li>
       <li><a href="https://github.com/google/appengine-codiad">Appengine Codiad</a></li>
       <li><a href="https://chrome.google.com/webstore/detail/better-text-viewer/lcaidopdffhfemoefoaadecppnjdknkc">Better Text Viewer</a> (plain text reader app for Chrome)</li>
@@ -60,7 +59,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.codezample.com">CodeZample</a> (code snippet sharing)</li>
       <li><a href="http://codio.com">Codio</a> (Web IDE)</li>
       <li><a href="https://www.codiva.io/">Codiva.io</a> (Online Java Compiler and IDE with auto-completion and error highlighting)</li>
-      <li><a href="http://ot.substance.io/demo/">Collaborative CodeMirror demo</a> (CodeMirror + operational transforms)</li>
       <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>
       <li><a href="http://www.compilejava.net/">compilejava.net</a> (online Java sandbox)</li>
       <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>
@@ -70,7 +68,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://cssdeck.com/">CSSDeck</a> (CSS showcase)</li>
       <li><a href="http://ireneros.com/deck/deck.js-codemirror/introduction/#textarea-code">Deck.js integration</a> (slides with editors)</li>
       <li><a href="http://www.dbninja.com">DbNinja</a> (MySQL access interface)</li>
-      <li><a href="https://chat.echoplex.us/">Echoplexus</a> (chat and collaborative coding)</li>
       <li><a href="http://www.ecsspert.com/">eCSSpert</a> (CSS demos and experiments)</li>
       <li><a href="http://elm-lang.org/Examples.elm">Elm language examples</a></li>
       <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
@@ -79,7 +76,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.fastfig.com/">Fastfig</a> (online computation/math tool)</li>
       <li><a href="https://metacpan.org/module/Farabi">Farabi</a> (modern Perl IDE)</li>
       <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>
-      <li><a href="https://phantomus.com/">Phantomus</a> (blogging platform)</li>
       <li><a href="http://fiddlesalad.com/">Fiddle Salad</a> (web development environment)</li>
       <li><a href="https://github.com/simogeo/Filemanager">Filemanager</a></li>
       <li><a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox Developer Tools</a></li>
@@ -101,7 +97,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.homegenie.it/docs/automation_getstarted.php">Homegenie</a> (home automation server)</li>
       <li><a href="http://icecoder.net">ICEcoder</a> (web IDE)</li>
       <li><a href="http://ipython.org/">IPython</a> (interactive computing shell)</li>
-      <li><a href="joelpinheiro.github.io/itrading/">iTrading</a> (Algorithmic Trading)</li>
+      <li><a href="https://joelpinheiro.github.io/itrading/">iTrading</a> (Algorithmic Trading)</li>
       <li><a href="http://i-mos.org/imos/">i-MOS</a> (modeling and simulation platform)</li>
       <li><a href="http://www.janvas.com/">Janvas</a> (vector graphics editor)</li>
       <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>
@@ -116,18 +112,14 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.kodhus.com/kodity/">Kodit</a></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>
       <li><a href="https://github.com/TuvaLabs/markdown-delight-editor">Markdown Delight Editor</a> (extensible markdown editor polymer component)</li>
       <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>
       <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
       <li><a href="http://www.iunbug.com/mihtool">MIHTool</a> (iOS web-app debugging tool)</li>
-      <li><a href="http://mongo-mapreduce-webbrowser.opensagres.cloudbees.net/">Mongo MapReduce WebBrowser</a></li>
-      <li><a href="http://montagestudio.com/">Montage Studio</a> (web app creator suite)</li>
       <li><a href="http://mscgen.js.org/index.html">mscgen_js</a> (online sequence chart editor)</li>
       <li><a href="http://mvcplayground.apphb.com/">MVC Playground</a></li>
-      <li><a href="https://www.my2ndgeneration.com/">My2ndGeneration</a> (social coding)</li>
       <li><a href="http://www.navigatecms.com">Navigate CMS</a></li>
       <li><a href="https://github.com/soliton4/nodeMirror">nodeMirror</a> (IDE project)</li>
       <li><a href="https://notex.ch">NoTex</a> (rST authoring)</li>
@@ -143,8 +135,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://pypi.python.org/pypi/PubliForge/">PubliForge</a> (online publishing system)</li>
       <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>
       <li><a href="https://chrome.google.com/webstore/detail/quantum/hmnlklahndgbhdoclhdnoafhafbhmnkm?hl=en-US">Quantum</a> (code editor for Chrome OS)</li>
-      <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>
-      <li><a href="http://qyapp.com">QiYun web app platform</a></li>
       <li><a href="http://ariya.ofilabs.com/2011/09/hybrid-webnative-desktop-codemirror.html">Qt+Webkit integration</a> (building a desktop CodeMirror app)</li>
       <li><a href="http://www.quivive-file-manager.com">Quivive File Manager</a></li>
       <li><a href="http://rascalmicro.com/docs/basic-tutorial-getting-started.html">Rascal</a> (tiny computer)</li>
@@ -172,7 +162,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.mapbox.com/tilemill/">TileMill</a> (map design tool)</li>
       <li><a href="http://doc.tiki.org/Syntax+Highlighter">Tiki</a> (wiki CMS groupware)</li>
       <li><a href="http://www.toolsverse.com/products/data-explorer/">Toolsverse Data Explorer</a> (database management)</li>
-      <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a> (augmented editing)</li>
       <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>
       <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>

From f02225b9ca000ddb098053b21acf3165d1e34beb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 6 Nov 2017 11:33:40 +0100
Subject: [PATCH 3575/4742] Make the default colors for bracket matching more
 constrasting

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

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 255de98606..8f4f22f5d6 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -145,8 +145,8 @@
 
 /* Default styles for common addons */
 
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0b0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 .CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
 .CodeMirror-activeline-background {background: #e8f2ff;}
 

From 36d7c7291fe7ecac442588a3a3c5c25a27e91455 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 Nov 2017 11:47:07 +0100
Subject: [PATCH 3576/4742] [closebrackets addon] Adjust check for when to
 insert two quotes

Stop relying on mode tokens, use simple heuristic of not being after a word char

Issue #5058
Issue #2657
---
 addon/edit/closebrackets.js | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 7592ef0071..460f662f80 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -133,7 +133,8 @@
                  (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != ch)) {
         curType = "addFour";
       } else if (identical) {
-        if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, ch)) curType = "both";
+        var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)
+        if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";
         else return CodeMirror.Pass;
       } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
                              isClosingBracket(next, pairs) ||
@@ -185,22 +186,6 @@
     return str.length == 2 ? str : null;
   }
 
-  // Project the token type that will exists after the given char is
-  // typed, and use it to determine whether it would cause the start
-  // of a string token.
-  function enteringString(cm, pos, ch) {
-    var line = cm.getLine(pos.line);
-    var token = cm.getTokenAt(pos);
-    if (/\bstring2?\b/.test(token.type) || stringStartsAfter(cm, pos)) return false;
-    var stream = new CodeMirror.StringStream(line.slice(0, pos.ch) + ch + line.slice(pos.ch), 4);
-    stream.pos = stream.start = token.start;
-    for (;;) {
-      var type1 = cm.getMode().token(stream, token.state);
-      if (stream.pos >= pos.ch + 1) return /\bstring2?\b/.test(type1);
-      stream.start = stream.pos;
-    }
-  }
-
   function stringStartsAfter(cm, pos) {
     var token = cm.getTokenAt(Pos(pos.line, pos.ch + 1))
     return /\bstring/.test(token.type) && token.start == pos.ch &&

From b6bfb4d09d14fa64d0993280c2761281d52ff958 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Nov 2017 09:49:18 +0100
Subject: [PATCH 3577/4742] [solarized theme] Remove overly low-contrast color
 for cm-strong

Closes #5075
---
 theme/solarized.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index d95f6c1b27..fcd1d70de6 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -87,7 +87,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   text-decoration: underline;
   text-decoration-style: dotted;
 }
-.cm-s-solarized .cm-strong { color: #eee; }
 .cm-s-solarized .cm-error,
 .cm-s-solarized .cm-invalidchar {
   color: #586e75;

From 2c741bd6742678f67e812307b2f78db4f4566d9d Mon Sep 17 00:00:00 2001
From: Casey Klebba <cklebba@netflix.com>
Date: Tue, 7 Nov 2017 17:12:57 -0800
Subject: [PATCH 3578/4742] Fully qualify import paths

---
 src/codemirror.js                       |  2 +-
 src/display/Display.js                  |  6 +--
 src/display/focus.js                    |  8 ++--
 src/display/gutters.js                  |  6 +--
 src/display/highlight_worker.js         | 10 ++---
 src/display/line_numbers.js             |  8 ++--
 src/display/mode_state.js               |  6 +--
 src/display/operations.js               | 26 ++++++-------
 src/display/scroll_events.js            |  8 ++--
 src/display/scrollbars.js               | 16 ++++----
 src/display/scrolling.js                | 18 ++++-----
 src/display/selection.js                | 12 +++---
 src/display/update_display.js           | 30 +++++++--------
 src/display/update_line.js              | 10 ++---
 src/display/update_lines.js             |  8 ++--
 src/display/view_tracking.js            | 10 ++---
 src/edit/CodeMirror.js                  | 50 ++++++++++++-------------
 src/edit/commands.js                    | 22 +++++------
 src/edit/deleteNearSelection.js         | 10 ++---
 src/edit/drop_events.js                 | 26 ++++++-------
 src/edit/fromTextArea.js                |  8 ++--
 src/edit/global_events.js               |  4 +-
 src/edit/key_events.js                  | 22 +++++------
 src/edit/legacy.js                      | 34 ++++++++---------
 src/edit/main.js                        | 24 ++++++------
 src/edit/methods.js                     | 48 ++++++++++++------------
 src/edit/mouse_events.js                | 40 ++++++++++----------
 src/edit/options.js                     | 36 +++++++++---------
 src/edit/utils.js                       |  2 +-
 src/input/ContentEditableInput.js       | 30 +++++++--------
 src/input/TextareaInput.js              | 24 ++++++------
 src/input/indent.js                     | 14 +++----
 src/input/input.js                      | 22 +++++------
 src/input/keymap.js                     |  6 +--
 src/input/movement.js                   |  8 ++--
 src/line/highlight.js                   | 10 ++---
 src/line/line_data.js                   | 18 ++++-----
 src/line/pos.js                         |  2 +-
 src/line/spans.js                       |  8 ++--
 src/line/utils_line.js                  |  2 +-
 src/measurement/position_measurement.js | 26 ++++++-------
 src/measurement/widgets.js              |  4 +-
 src/model/Doc.js                        | 40 ++++++++++----------
 src/model/change_measurement.js         |  6 +--
 src/model/changes.js                    | 36 +++++++++---------
 src/model/chunk.js                      |  6 +--
 src/model/document_data.js              | 20 +++++-----
 src/model/history.js                    | 18 ++++-----
 src/model/line_widget.js                | 18 ++++-----
 src/model/mark_text.js                  | 30 +++++++--------
 src/model/selection.js                  |  4 +-
 src/model/selection_updates.js          | 18 ++++-----
 src/modes.js                            |  2 +-
 src/util/StringStream.js                |  2 +-
 src/util/bidi.js                        |  2 +-
 src/util/dom.js                         |  2 +-
 src/util/event.js                       |  4 +-
 src/util/feature_detection.js           |  4 +-
 src/util/operation_group.js             |  2 +-
 59 files changed, 449 insertions(+), 449 deletions(-)

diff --git a/src/codemirror.js b/src/codemirror.js
index 3c16cc875e..2a2f54e4c9 100644
--- a/src/codemirror.js
+++ b/src/codemirror.js
@@ -1,3 +1,3 @@
-import { CodeMirror } from "./edit/main"
+import { CodeMirror } from "./edit/main.js"
 
 export default CodeMirror
diff --git a/src/display/Display.js b/src/display/Display.js
index ad0256bdfd..54b228a9b3 100644
--- a/src/display/Display.js
+++ b/src/display/Display.js
@@ -1,6 +1,6 @@
-import { gecko, ie, ie_version, mobile, webkit } from "../util/browser"
-import { elt, eltP } from "../util/dom"
-import { scrollerGap } from "../util/misc"
+import { gecko, ie, ie_version, mobile, webkit } from "../util/browser.js"
+import { elt, eltP } from "../util/dom.js"
+import { scrollerGap } from "../util/misc.js"
 
 // The display handles the DOM integration, both for input reading
 // and content drawing. It holds references to DOM nodes and
diff --git a/src/display/focus.js b/src/display/focus.js
index ee52daffac..aa731b4353 100644
--- a/src/display/focus.js
+++ b/src/display/focus.js
@@ -1,7 +1,7 @@
-import { restartBlink } from "./selection"
-import { webkit } from "../util/browser"
-import { addClass, rmClass } from "../util/dom"
-import { signal } from "../util/event"
+import { restartBlink } from "./selection.js"
+import { webkit } from "../util/browser.js"
+import { addClass, rmClass } from "../util/dom.js"
+import { signal } from "../util/event.js"
 
 export function ensureFocus(cm) {
   if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm) }
diff --git a/src/display/gutters.js b/src/display/gutters.js
index 7ccf119e80..37405b6d8c 100644
--- a/src/display/gutters.js
+++ b/src/display/gutters.js
@@ -1,7 +1,7 @@
-import { elt, removeChildren } from "../util/dom"
-import { indexOf } from "../util/misc"
+import { elt, removeChildren } from "../util/dom.js"
+import { indexOf } from "../util/misc.js"
 
-import { updateGutterSpace } from "./update_display"
+import { updateGutterSpace } from "./update_display.js"
 
 // Rebuild the gutter elements, ensure the margin to the left of the
 // code matches their width.
diff --git a/src/display/highlight_worker.js b/src/display/highlight_worker.js
index e868c42f3c..6069815719 100644
--- a/src/display/highlight_worker.js
+++ b/src/display/highlight_worker.js
@@ -1,9 +1,9 @@
-import { getContextBefore, highlightLine, processLine } from "../line/highlight"
-import { copyState } from "../modes"
-import { bind } from "../util/misc"
+import { getContextBefore, highlightLine, processLine } from "../line/highlight.js"
+import { copyState } from "../modes.js"
+import { bind } from "../util/misc.js"
 
-import { runInOp } from "./operations"
-import { regLineChange } from "./view_tracking"
+import { runInOp } from "./operations.js"
+import { regLineChange } from "./view_tracking.js"
 
 // HIGHLIGHT WORKER
 
diff --git a/src/display/line_numbers.js b/src/display/line_numbers.js
index c48f2204d5..3ab957509c 100644
--- a/src/display/line_numbers.js
+++ b/src/display/line_numbers.js
@@ -1,8 +1,8 @@
-import { lineNumberFor } from "../line/utils_line"
-import { compensateForHScroll } from "../measurement/position_measurement"
-import { elt } from "../util/dom"
+import { lineNumberFor } from "../line/utils_line.js"
+import { compensateForHScroll } from "../measurement/position_measurement.js"
+import { elt } from "../util/dom.js"
 
-import { updateGutterSpace } from "./update_display"
+import { updateGutterSpace } from "./update_display.js"
 
 // Re-align line numbers and gutter marks to compensate for
 // horizontal scrolling.
diff --git a/src/display/mode_state.js b/src/display/mode_state.js
index ca0a534ca4..5d8ebf250e 100644
--- a/src/display/mode_state.js
+++ b/src/display/mode_state.js
@@ -1,7 +1,7 @@
-import { getMode } from "../modes"
+import { getMode } from "../modes.js"
 
-import { startWorker } from "./highlight_worker"
-import { regChange } from "./view_tracking"
+import { startWorker } from "./highlight_worker.js"
+import { regChange } from "./view_tracking.js"
 
 // Used to get the editor into a consistent state again when options change.
 
diff --git a/src/display/operations.js b/src/display/operations.js
index c3004508e7..5cc26d265d 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -1,16 +1,16 @@
-import { clipPos } from "../line/pos"
-import { findMaxLine } from "../line/spans"
-import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement"
-import { signal } from "../util/event"
-import { activeElt } from "../util/dom"
-import { finishOperation, pushOperation } from "../util/operation_group"
-
-import { ensureFocus } from "./focus"
-import { measureForScrollbars, updateScrollbars } from "./scrollbars"
-import { restartBlink } from "./selection"
-import { maybeScrollWindow, scrollPosIntoView, setScrollLeft, setScrollTop } from "./scrolling"
-import { DisplayUpdate, maybeClipScrollbars, postUpdateDisplay, setDocumentHeight, updateDisplayIfNeeded } from "./update_display"
-import { updateHeightsInViewport } from "./update_lines"
+import { clipPos } from "../line/pos.js"
+import { findMaxLine } from "../line/spans.js"
+import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement.js"
+import { signal } from "../util/event.js"
+import { activeElt } from "../util/dom.js"
+import { finishOperation, pushOperation } from "../util/operation_group.js"
+
+import { ensureFocus } from "./focus.js"
+import { measureForScrollbars, updateScrollbars } from "./scrollbars.js"
+import { restartBlink } from "./selection.js"
+import { maybeScrollWindow, scrollPosIntoView, setScrollLeft, setScrollTop } from "./scrolling.js"
+import { DisplayUpdate, maybeClipScrollbars, postUpdateDisplay, setDocumentHeight, updateDisplayIfNeeded } from "./update_display.js"
+import { updateHeightsInViewport } from "./update_lines.js"
 
 // Operations are used to wrap a series of changes to the editor
 // state in such a way that each change won't have to update the
diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index d3902809e7..fbed426637 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -1,8 +1,8 @@
-import { chrome, gecko, ie, mac, presto, safari, webkit } from "../util/browser"
-import { e_preventDefault } from "../util/event"
+import { chrome, gecko, ie, mac, presto, safari, webkit } from "../util/browser.js"
+import { e_preventDefault } from "../util/event.js"
 
-import { updateDisplaySimple } from "./update_display"
-import { setScrollLeft, updateScrollTop } from "./scrolling"
+import { updateDisplaySimple } from "./update_display.js"
+import { setScrollLeft, updateScrollTop } from "./scrolling.js"
 
 // Since the delta values reported on mouse wheel events are
 // unstandardized between browsers and even browser versions, and
diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index 27060d18ef..7308c5e272 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -1,11 +1,11 @@
-import { addClass, elt, rmClass } from "../util/dom"
-import { on } from "../util/event"
-import { scrollGap, paddingVert } from "../measurement/position_measurement"
-import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser"
-import { updateHeightsInViewport } from "./update_lines"
-import { Delayed } from "../util/misc"
-
-import { setScrollLeft, updateScrollTop } from "./scrolling"
+import { addClass, elt, rmClass } from "../util/dom.js"
+import { on } from "../util/event.js"
+import { scrollGap, paddingVert } from "../measurement/position_measurement.js"
+import { ie, ie_version, mac, mac_geMountainLion } from "../util/browser.js"
+import { updateHeightsInViewport } from "./update_lines.js"
+import { Delayed } from "../util/misc.js"
+
+import { setScrollLeft, updateScrollTop } from "./scrolling.js"
 
 // SCROLLBARS
 
diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index e16cf9ecac..26ec993b0f 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -1,12 +1,12 @@
-import { Pos } from "../line/pos"
-import { cursorCoords, displayHeight, displayWidth, estimateCoords, paddingTop, paddingVert, scrollGap, textHeight } from "../measurement/position_measurement"
-import { gecko, phantom } from "../util/browser"
-import { elt } from "../util/dom"
-import { signalDOMEvent } from "../util/event"
-
-import { startWorker } from "./highlight_worker"
-import { alignHorizontally } from "./line_numbers"
-import { updateDisplaySimple } from "./update_display"
+import { Pos } from "../line/pos.js"
+import { cursorCoords, displayHeight, displayWidth, estimateCoords, paddingTop, paddingVert, scrollGap, textHeight } from "../measurement/position_measurement.js"
+import { gecko, phantom } from "../util/browser.js"
+import { elt } from "../util/dom.js"
+import { signalDOMEvent } from "../util/event.js"
+
+import { startWorker } from "./highlight_worker.js"
+import { alignHorizontally } from "./line_numbers.js"
+import { updateDisplaySimple } from "./update_display.js"
 
 // SCROLLING THINGS INTO VIEW
 
diff --git a/src/display/selection.js b/src/display/selection.js
index dca96a442b..c658c0a272 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -1,9 +1,9 @@
-import { Pos } from "../line/pos"
-import { visualLine } from "../line/spans"
-import { getLine } from "../line/utils_line"
-import { charCoords, cursorCoords, displayWidth, paddingH, wrappedLineExtentChar } from "../measurement/position_measurement"
-import { getOrder, iterateBidiSections } from "../util/bidi"
-import { elt } from "../util/dom"
+import { Pos } from "../line/pos.js"
+import { visualLine } from "../line/spans.js"
+import { getLine } from "../line/utils_line.js"
+import { charCoords, cursorCoords, displayWidth, paddingH, wrappedLineExtentChar } from "../measurement/position_measurement.js"
+import { getOrder, iterateBidiSections } from "../util/bidi.js"
+import { elt } from "../util/dom.js"
 
 export function updateSelection(cm) {
   cm.display.input.showSelection(cm.display.input.prepareSelection())
diff --git a/src/display/update_display.js b/src/display/update_display.js
index e58db48a51..86c7132131 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -1,19 +1,19 @@
-import { sawCollapsedSpans } from "../line/saw_special_spans"
-import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans"
-import { getLine, lineNumberFor } from "../line/utils_line"
-import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement"
-import { mac, webkit } from "../util/browser"
-import { activeElt, removeChildren, contains } from "../util/dom"
-import { hasHandler, signal } from "../util/event"
-import { indexOf } from "../util/misc"
+import { sawCollapsedSpans } from "../line/saw_special_spans.js"
+import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans.js"
+import { getLine, lineNumberFor } from "../line/utils_line.js"
+import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement.js"
+import { mac, webkit } from "../util/browser.js"
+import { activeElt, removeChildren, contains } from "../util/dom.js"
+import { hasHandler, signal } from "../util/event.js"
+import { indexOf } from "../util/misc.js"
 
-import { buildLineElement, updateLineForChanges } from "./update_line"
-import { startWorker } from "./highlight_worker"
-import { maybeUpdateLineNumberWidth } from "./line_numbers"
-import { measureForScrollbars, updateScrollbars } from "./scrollbars"
-import { updateSelection } from "./selection"
-import { updateHeightsInViewport, visibleLines } from "./update_lines"
-import { adjustView, countDirtyView, resetView } from "./view_tracking"
+import { buildLineElement, updateLineForChanges } from "./update_line.js"
+import { startWorker } from "./highlight_worker.js"
+import { maybeUpdateLineNumberWidth } from "./line_numbers.js"
+import { measureForScrollbars, updateScrollbars } from "./scrollbars.js"
+import { updateSelection } from "./selection.js"
+import { updateHeightsInViewport, visibleLines } from "./update_lines.js"
+import { adjustView, countDirtyView, resetView } from "./view_tracking.js"
 
 // DISPLAY DRAWING
 
diff --git a/src/display/update_line.js b/src/display/update_line.js
index 15a2394257..db9df26d92 100644
--- a/src/display/update_line.js
+++ b/src/display/update_line.js
@@ -1,8 +1,8 @@
-import { buildLineContent } from "../line/line_data"
-import { lineNumberFor } from "../line/utils_line"
-import { ie, ie_version } from "../util/browser"
-import { elt } from "../util/dom"
-import { signalLater } from "../util/operation_group"
+import { buildLineContent } from "../line/line_data.js"
+import { lineNumberFor } from "../line/utils_line.js"
+import { ie, ie_version } from "../util/browser.js"
+import { elt } from "../util/dom.js"
+import { signalLater } from "../util/operation_group.js"
 
 // When an aspect of a line changes, a string is added to
 // lineView.changes. This updates the relevant part of the line's
diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index 6c59188957..7f06018d04 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -1,7 +1,7 @@
-import { heightAtLine } from "../line/spans"
-import { getLine, lineAtHeight, updateLineHeight } from "../line/utils_line"
-import { paddingTop, textHeight } from "../measurement/position_measurement"
-import { ie, ie_version } from "../util/browser"
+import { heightAtLine } from "../line/spans.js"
+import { getLine, lineAtHeight, updateLineHeight } from "../line/utils_line.js"
+import { paddingTop, textHeight } from "../measurement/position_measurement.js"
+import { ie, ie_version } from "../util/browser.js"
 
 // Read the actual heights of the rendered lines, and update their
 // stored heights to match.
diff --git a/src/display/view_tracking.js b/src/display/view_tracking.js
index b9abd2fc40..41464f2350 100644
--- a/src/display/view_tracking.js
+++ b/src/display/view_tracking.js
@@ -1,8 +1,8 @@
-import { buildViewArray } from "../line/line_data"
-import { sawCollapsedSpans } from "../line/saw_special_spans"
-import { visualLineEndNo, visualLineNo } from "../line/spans"
-import { findViewIndex } from "../measurement/position_measurement"
-import { indexOf } from "../util/misc"
+import { buildViewArray } from "../line/line_data.js"
+import { sawCollapsedSpans } from "../line/saw_special_spans.js"
+import { visualLineEndNo, visualLineNo } from "../line/spans.js"
+import { findViewIndex } from "../measurement/position_measurement.js"
+import { indexOf } from "../util/misc.js"
 
 // Updates the display.view data structure for a given change to the
 // document. From and to are in pre-change coordinates. Lendiff is
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 0f0e58900c..4759209cf2 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -1,28 +1,28 @@
-import { Display } from "../display/Display"
-import { onFocus, onBlur } from "../display/focus"
-import { setGuttersForLineNumbers, updateGutters } from "../display/gutters"
-import { maybeUpdateLineNumberWidth } from "../display/line_numbers"
-import { endOperation, operation, startOperation } from "../display/operations"
-import { initScrollbars } from "../display/scrollbars"
-import { onScrollWheel } from "../display/scroll_events"
-import { setScrollLeft, updateScrollTop } from "../display/scrolling"
-import { clipPos, Pos } from "../line/pos"
-import { posFromMouse } from "../measurement/position_measurement"
-import { eventInWidget } from "../measurement/widgets"
-import Doc from "../model/Doc"
-import { attachDoc } from "../model/document_data"
-import { Range } from "../model/selection"
-import { extendSelection } from "../model/selection_updates"
-import { captureRightClick, ie, ie_version, mobile, webkit } from "../util/browser"
-import { e_preventDefault, e_stop, on, signal, signalDOMEvent } from "../util/event"
-import { bind, copyObj, Delayed } from "../util/misc"
-
-import { clearDragCursor, onDragOver, onDragStart, onDrop } from "./drop_events"
-import { ensureGlobalHandlers } from "./global_events"
-import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
-import { clickInGutter, onContextMenu, onMouseDown } from "./mouse_events"
-import { themeChanged } from "./utils"
-import { defaults, optionHandlers, Init } from "./options"
+import { Display } from "../display/Display.js"
+import { onFocus, onBlur } from "../display/focus.js"
+import { setGuttersForLineNumbers, updateGutters } from "../display/gutters.js"
+import { maybeUpdateLineNumberWidth } from "../display/line_numbers.js"
+import { endOperation, operation, startOperation } from "../display/operations.js"
+import { initScrollbars } from "../display/scrollbars.js"
+import { onScrollWheel } from "../display/scroll_events.js"
+import { setScrollLeft, updateScrollTop } from "../display/scrolling.js"
+import { clipPos, Pos } from "../line/pos.js"
+import { posFromMouse } from "../measurement/position_measurement.js"
+import { eventInWidget } from "../measurement/widgets.js"
+import Doc from "../model/Doc.js"
+import { attachDoc } from "../model/document_data.js"
+import { Range } from "../model/selection.js"
+import { extendSelection } from "../model/selection_updates.js"
+import { captureRightClick, ie, ie_version, mobile, webkit } from "../util/browser.js"
+import { e_preventDefault, e_stop, on, signal, signalDOMEvent } from "../util/event.js"
+import { bind, copyObj, Delayed } from "../util/misc.js"
+
+import { clearDragCursor, onDragOver, onDragStart, onDrop } from "./drop_events.js"
+import { ensureGlobalHandlers } from "./global_events.js"
+import { onKeyDown, onKeyPress, onKeyUp } from "./key_events.js"
+import { clickInGutter, onContextMenu, onMouseDown } from "./mouse_events.js"
+import { themeChanged } from "./utils.js"
+import { defaults, optionHandlers, Init } from "./options.js"
 
 // A CodeMirror instance represents an editor. This is the object
 // that user code is usually dealing with.
diff --git a/src/edit/commands.js b/src/edit/commands.js
index e1a4327c8f..3916b129fb 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -1,14 +1,14 @@
-import { deleteNearSelection } from "./deleteNearSelection"
-import { runInOp } from "../display/operations"
-import { ensureCursorVisible } from "../display/scrolling"
-import { endOfLine } from "../input/movement"
-import { clipPos, Pos } from "../line/pos"
-import { visualLine, visualLineEnd } from "../line/spans"
-import { getLine, lineNo } from "../line/utils_line"
-import { Range } from "../model/selection"
-import { selectAll } from "../model/selection_updates"
-import { countColumn, sel_dontScroll, sel_move, spaceStr } from "../util/misc"
-import { getOrder } from "../util/bidi"
+import { deleteNearSelection } from "./deleteNearSelection.js"
+import { runInOp } from "../display/operations.js"
+import { ensureCursorVisible } from "../display/scrolling.js"
+import { endOfLine } from "../input/movement.js"
+import { clipPos, Pos } from "../line/pos.js"
+import { visualLine, visualLineEnd } from "../line/spans.js"
+import { getLine, lineNo } from "../line/utils_line.js"
+import { Range } from "../model/selection.js"
+import { selectAll } from "../model/selection_updates.js"
+import { countColumn, sel_dontScroll, sel_move, spaceStr } from "../util/misc.js"
+import { getOrder } from "../util/bidi.js"
 
 // Commands are parameter-less actions that can be performed on an
 // editor, mostly used for keybindings.
diff --git a/src/edit/deleteNearSelection.js b/src/edit/deleteNearSelection.js
index 5a9bd2cfd5..82e331a5ff 100644
--- a/src/edit/deleteNearSelection.js
+++ b/src/edit/deleteNearSelection.js
@@ -1,8 +1,8 @@
-import { runInOp } from "../display/operations"
-import { ensureCursorVisible } from "../display/scrolling"
-import { cmp } from "../line/pos"
-import { replaceRange } from "../model/changes"
-import { lst } from "../util/misc"
+import { runInOp } from "../display/operations.js"
+import { ensureCursorVisible } from "../display/scrolling.js"
+import { cmp } from "../line/pos.js"
+import { replaceRange } from "../model/changes.js"
+import { lst } from "../util/misc.js"
 
 // Helper for deleting text near the selection(s), used to implement
 // backspace, delete, and similar functionality.
diff --git a/src/edit/drop_events.js b/src/edit/drop_events.js
index 43e996fb68..12c760f0d6 100644
--- a/src/edit/drop_events.js
+++ b/src/edit/drop_events.js
@@ -1,16 +1,16 @@
-import { drawSelectionCursor } from "../display/selection"
-import { operation } from "../display/operations"
-import { clipPos } from "../line/pos"
-import { posFromMouse } from "../measurement/position_measurement"
-import { eventInWidget } from "../measurement/widgets"
-import { makeChange, replaceRange } from "../model/changes"
-import { changeEnd } from "../model/change_measurement"
-import { simpleSelection } from "../model/selection"
-import { setSelectionNoUndo, setSelectionReplaceHistory } from "../model/selection_updates"
-import { ie, presto, safari } from "../util/browser"
-import { elt, removeChildrenAndAdd } from "../util/dom"
-import { e_preventDefault, e_stop, signalDOMEvent } from "../util/event"
-import { indexOf } from "../util/misc"
+import { drawSelectionCursor } from "../display/selection.js"
+import { operation } from "../display/operations.js"
+import { clipPos } from "../line/pos.js"
+import { posFromMouse } from "../measurement/position_measurement.js"
+import { eventInWidget } from "../measurement/widgets.js"
+import { makeChange, replaceRange } from "../model/changes.js"
+import { changeEnd } from "../model/change_measurement.js"
+import { simpleSelection } from "../model/selection.js"
+import { setSelectionNoUndo, setSelectionReplaceHistory } from "../model/selection_updates.js"
+import { ie, presto, safari } from "../util/browser.js"
+import { elt, removeChildrenAndAdd } from "../util/dom.js"
+import { e_preventDefault, e_stop, signalDOMEvent } from "../util/event.js"
+import { indexOf } from "../util/misc.js"
 
 // Kludge to work around strange IE behavior where it'll sometimes
 // re-fire a series of drag-related events right after the drop (#1551)
diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
index 5d920830b3..92498c1045 100644
--- a/src/edit/fromTextArea.js
+++ b/src/edit/fromTextArea.js
@@ -1,7 +1,7 @@
-import { CodeMirror } from "./CodeMirror"
-import { activeElt } from "../util/dom"
-import { off, on } from "../util/event"
-import { copyObj } from "../util/misc"
+import { CodeMirror } from "./CodeMirror.js"
+import { activeElt } from "../util/dom.js"
+import { off, on } from "../util/event.js"
+import { copyObj } from "../util/misc.js"
 
 export function fromTextArea(textarea, options) {
   options = options ? copyObj(options) : {}
diff --git a/src/edit/global_events.js b/src/edit/global_events.js
index b2ab7d57c1..269e870ef1 100644
--- a/src/edit/global_events.js
+++ b/src/edit/global_events.js
@@ -1,5 +1,5 @@
-import { onBlur } from "../display/focus"
-import { on } from "../util/event"
+import { onBlur } from "../display/focus.js"
+import { on } from "../util/event.js"
 
 // These must be handled carefully, because naively registering a
 // handler for each editor will cause the editors to never be
diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index 06f37be078..f0521d070a 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -1,14 +1,14 @@
-import { signalLater } from "../util/operation_group"
-import { restartBlink } from "../display/selection"
-import { isModifierKey, keyName, lookupKey } from "../input/keymap"
-import { eventInWidget } from "../measurement/widgets"
-import { ie, ie_version, mac, presto } from "../util/browser"
-import { activeElt, addClass, rmClass } from "../util/dom"
-import { e_preventDefault, off, on, signalDOMEvent } from "../util/event"
-import { hasCopyEvent } from "../util/feature_detection"
-import { Delayed, Pass } from "../util/misc"
-
-import { commands } from "./commands"
+import { signalLater } from "../util/operation_group.js"
+import { restartBlink } from "../display/selection.js"
+import { isModifierKey, keyName, lookupKey } from "../input/keymap.js"
+import { eventInWidget } from "../measurement/widgets.js"
+import { ie, ie_version, mac, presto } from "../util/browser.js"
+import { activeElt, addClass, rmClass } from "../util/dom.js"
+import { e_preventDefault, off, on, signalDOMEvent } from "../util/event.js"
+import { hasCopyEvent } from "../util/feature_detection.js"
+import { Delayed, Pass } from "../util/misc.js"
+
+import { commands } from "./commands.js"
 
 // Run a handler that was bound to a key.
 function doHandleBinding(cm, bound, dropShift) {
diff --git a/src/edit/legacy.js b/src/edit/legacy.js
index bc3df6c8f1..889badbe59 100644
--- a/src/edit/legacy.js
+++ b/src/edit/legacy.js
@@ -1,21 +1,21 @@
-import { scrollbarModel } from "../display/scrollbars"
-import { wheelEventPixels } from "../display/scroll_events"
-import { keyMap, keyName, isModifierKey, lookupKey, normalizeKeyMap } from "../input/keymap"
-import { keyNames } from "../input/keynames"
-import { Line } from "../line/line_data"
-import { cmp, Pos } from "../line/pos"
-import { changeEnd } from "../model/change_measurement"
-import Doc from "../model/Doc"
-import { LineWidget } from "../model/line_widget"
-import { SharedTextMarker, TextMarker } from "../model/mark_text"
-import { copyState, extendMode, getMode, innerMode, mimeModes, modeExtensions, modes, resolveMode, startState } from "../modes"
-import { addClass, contains, rmClass } from "../util/dom"
-import { e_preventDefault, e_stop, e_stopPropagation, off, on, signal } from "../util/event"
-import { splitLinesAuto } from "../util/feature_detection"
-import { countColumn, findColumn, isWordCharBasic, Pass } from "../util/misc"
-import StringStream from "../util/StringStream"
+import { scrollbarModel } from "../display/scrollbars.js"
+import { wheelEventPixels } from "../display/scroll_events.js"
+import { keyMap, keyName, isModifierKey, lookupKey, normalizeKeyMap } from "../input/keymap.js"
+import { keyNames } from "../input/keynames.js"
+import { Line } from "../line/line_data.js"
+import { cmp, Pos } from "../line/pos.js"
+import { changeEnd } from "../model/change_measurement.js"
+import Doc from "../model/Doc.js"
+import { LineWidget } from "../model/line_widget.js"
+import { SharedTextMarker, TextMarker } from "../model/mark_text.js"
+import { copyState, extendMode, getMode, innerMode, mimeModes, modeExtensions, modes, resolveMode, startState } from "../modes.js"
+import { addClass, contains, rmClass } from "../util/dom.js"
+import { e_preventDefault, e_stop, e_stopPropagation, off, on, signal } from "../util/event.js"
+import { splitLinesAuto } from "../util/feature_detection.js"
+import { countColumn, findColumn, isWordCharBasic, Pass } from "../util/misc.js"
+import StringStream from "../util/StringStream.js"
 
-import { commands } from "./commands"
+import { commands } from "./commands.js"
 
 export function addLegacyProps(CodeMirror) {
   CodeMirror.off = off
diff --git a/src/edit/main.js b/src/edit/main.js
index 6500e08d05..6d9eb8790b 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -1,20 +1,20 @@
 // EDITOR CONSTRUCTOR
 
-import { CodeMirror } from "./CodeMirror"
-export { CodeMirror } from "./CodeMirror"
+import { CodeMirror } from "./CodeMirror.js"
+export { CodeMirror } from "./CodeMirror.js"
 
-import { eventMixin } from "../util/event"
-import { indexOf } from "../util/misc"
+import { eventMixin } from "../util/event.js"
+import { indexOf } from "../util/misc.js"
 
-import { defineOptions } from "./options"
+import { defineOptions } from "./options.js"
 
 defineOptions(CodeMirror)
 
-import addEditorMethods from "./methods"
+import addEditorMethods from "./methods.js"
 
 addEditorMethods(CodeMirror)
 
-import Doc from "../model/Doc"
+import Doc from "../model/Doc.js"
 
 // Set up methods on CodeMirror's prototype to redirect to the editor's document.
 let dontDelegate = "iter insert remove copy getEditor constructor".split(" ")
@@ -27,13 +27,13 @@ eventMixin(Doc)
 
 // INPUT HANDLING
 
-import ContentEditableInput from "../input/ContentEditableInput"
-import TextareaInput from "../input/TextareaInput"
+import ContentEditableInput from "../input/ContentEditableInput.js"
+import TextareaInput from "../input/TextareaInput.js"
 CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput}
 
 // MODE DEFINITION AND QUERYING
 
-import { defineMIME, defineMode } from "../modes"
+import { defineMIME, defineMode } from "../modes.js"
 
 // Extra arguments are stored as the mode's dependencies, which is
 // used by (legacy) mechanisms like loadmode.js to automatically
@@ -58,11 +58,11 @@ CodeMirror.defineDocExtension = (name, func) => {
   Doc.prototype[name] = func
 }
 
-import { fromTextArea } from "./fromTextArea"
+import { fromTextArea } from "./fromTextArea.js"
 
 CodeMirror.fromTextArea = fromTextArea
 
-import { addLegacyProps } from "./legacy"
+import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 8dc692529e..5cefed7c18 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -1,27 +1,27 @@
-import { deleteNearSelection } from "./deleteNearSelection"
-import { commands } from "./commands"
-import { attachDoc } from "../model/document_data"
-import { activeElt, addClass, rmClass } from "../util/dom"
-import { eventMixin, signal } from "../util/event"
-import { getLineStyles, getContextBefore, takeToken } from "../line/highlight"
-import { indentLine } from "../input/indent"
-import { triggerElectric } from "../input/input"
-import { onKeyDown, onKeyPress, onKeyUp } from "./key_events"
-import { onMouseDown } from "./mouse_events"
-import { getKeyMap } from "../input/keymap"
-import { endOfLine, moveLogically, moveVisually } from "../input/movement"
-import { endOperation, methodOp, operation, runInOp, startOperation } from "../display/operations"
-import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos"
-import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement"
-import { Range } from "../model/selection"
-import { replaceOneSelection, skipAtomic } from "../model/selection_updates"
-import { addToScrollTop, ensureCursorVisible, scrollIntoView, scrollToCoords, scrollToCoordsRange, scrollToRange } from "../display/scrolling"
-import { heightAtLine } from "../line/spans"
-import { updateGutterSpace } from "../display/update_display"
-import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc"
-import { signalLater } from "../util/operation_group"
-import { getLine, isLine, lineAtHeight } from "../line/utils_line"
-import { regChange, regLineChange } from "../display/view_tracking"
+import { deleteNearSelection } from "./deleteNearSelection.js"
+import { commands } from "./commands.js"
+import { attachDoc } from "../model/document_data.js"
+import { activeElt, addClass, rmClass } from "../util/dom.js"
+import { eventMixin, signal } from "../util/event.js"
+import { getLineStyles, getContextBefore, takeToken } from "../line/highlight.js"
+import { indentLine } from "../input/indent.js"
+import { triggerElectric } from "../input/input.js"
+import { onKeyDown, onKeyPress, onKeyUp } from "./key_events.js"
+import { onMouseDown } from "./mouse_events.js"
+import { getKeyMap } from "../input/keymap.js"
+import { endOfLine, moveLogically, moveVisually } from "../input/movement.js"
+import { endOperation, methodOp, operation, runInOp, startOperation } from "../display/operations.js"
+import { clipLine, clipPos, equalCursorPos, Pos } from "../line/pos.js"
+import { charCoords, charWidth, clearCaches, clearLineMeasurementCache, coordsChar, cursorCoords, displayHeight, displayWidth, estimateLineHeights, fromCoordSystem, intoCoordSystem, scrollGap, textHeight } from "../measurement/position_measurement.js"
+import { Range } from "../model/selection.js"
+import { replaceOneSelection, skipAtomic } from "../model/selection_updates.js"
+import { addToScrollTop, ensureCursorVisible, scrollIntoView, scrollToCoords, scrollToCoordsRange, scrollToRange } from "../display/scrolling.js"
+import { heightAtLine } from "../line/spans.js"
+import { updateGutterSpace } from "../display/update_display.js"
+import { indexOf, insertSorted, isWordChar, sel_dontScroll, sel_move } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
+import { getLine, isLine, lineAtHeight } from "../line/utils_line.js"
+import { regChange, regLineChange } from "../display/view_tracking.js"
 
 // The publicly visible API. Note that methodOp(f) means
 // 'wrap f in an operation, performed on its `this` parameter'.
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 57159e3a14..696a4bbfa2 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -1,23 +1,23 @@
-import { delayBlurEvent, ensureFocus } from "../display/focus"
-import { operation } from "../display/operations"
-import { visibleLines } from "../display/update_lines"
-import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos"
-import { getLine, lineAtHeight } from "../line/utils_line"
-import { posFromMouse } from "../measurement/position_measurement"
-import { eventInWidget } from "../measurement/widgets"
-import { normalizeSelection, Range, Selection } from "../model/selection"
-import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates"
-import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser"
-import { getOrder, getBidiPartAt } from "../util/bidi"
-import { activeElt } from "../util/dom"
-import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event"
-import { dragAndDrop } from "../util/feature_detection"
-import { bind, countColumn, findColumn, sel_mouse } from "../util/misc"
-import { addModifierNames } from "../input/keymap"
-import { Pass } from "../util/misc"
-
-import { dispatchKey } from "./key_events"
-import { commands } from "./commands"
+import { delayBlurEvent, ensureFocus } from "../display/focus.js"
+import { operation } from "../display/operations.js"
+import { visibleLines } from "../display/update_lines.js"
+import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos.js"
+import { getLine, lineAtHeight } from "../line/utils_line.js"
+import { posFromMouse } from "../measurement/position_measurement.js"
+import { eventInWidget } from "../measurement/widgets.js"
+import { normalizeSelection, Range, Selection } from "../model/selection.js"
+import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates.js"
+import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser.js"
+import { getOrder, getBidiPartAt } from "../util/bidi.js"
+import { activeElt } from "../util/dom.js"
+import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event.js"
+import { dragAndDrop } from "../util/feature_detection.js"
+import { bind, countColumn, findColumn, sel_mouse } from "../util/misc.js"
+import { addModifierNames } from "../input/keymap.js"
+import { Pass } from "../util/misc.js"
+
+import { dispatchKey } from "./key_events.js"
+import { commands } from "./commands.js"
 
 const DOUBLECLICK_DELAY = 400
 
diff --git a/src/edit/options.js b/src/edit/options.js
index 0601a83c3c..28f8bb60c6 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -1,21 +1,21 @@
-import { onBlur } from "../display/focus"
-import { setGuttersForLineNumbers, updateGutters } from "../display/gutters"
-import { alignHorizontally } from "../display/line_numbers"
-import { loadMode, resetModeState } from "../display/mode_state"
-import { initScrollbars, updateScrollbars } from "../display/scrollbars"
-import { updateSelection } from "../display/selection"
-import { regChange } from "../display/view_tracking"
-import { getKeyMap } from "../input/keymap"
-import { defaultSpecialCharPlaceholder } from "../line/line_data"
-import { Pos } from "../line/pos"
-import { findMaxLine } from "../line/spans"
-import { clearCaches, compensateForHScroll, estimateLineHeights } from "../measurement/position_measurement"
-import { replaceRange } from "../model/changes"
-import { mobile, windows } from "../util/browser"
-import { addClass, rmClass } from "../util/dom"
-import { off, on } from "../util/event"
-
-import { themeChanged } from "./utils"
+import { onBlur } from "../display/focus.js"
+import { setGuttersForLineNumbers, updateGutters } from "../display/gutters.js"
+import { alignHorizontally } from "../display/line_numbers.js"
+import { loadMode, resetModeState } from "../display/mode_state.js"
+import { initScrollbars, updateScrollbars } from "../display/scrollbars.js"
+import { updateSelection } from "../display/selection.js"
+import { regChange } from "../display/view_tracking.js"
+import { getKeyMap } from "../input/keymap.js"
+import { defaultSpecialCharPlaceholder } from "../line/line_data.js"
+import { Pos } from "../line/pos.js"
+import { findMaxLine } from "../line/spans.js"
+import { clearCaches, compensateForHScroll, estimateLineHeights } from "../measurement/position_measurement.js"
+import { replaceRange } from "../model/changes.js"
+import { mobile, windows } from "../util/browser.js"
+import { addClass, rmClass } from "../util/dom.js"
+import { off, on } from "../util/event.js"
+
+import { themeChanged } from "./utils.js"
 
 export let Init = {toString: function(){return "CodeMirror.Init"}}
 
diff --git a/src/edit/utils.js b/src/edit/utils.js
index 61f795572d..fda0be7412 100644
--- a/src/edit/utils.js
+++ b/src/edit/utils.js
@@ -1,4 +1,4 @@
-import { clearCaches } from "../measurement/position_measurement"
+import { clearCaches } from "../measurement/position_measurement.js"
 
 export function themeChanged(cm) {
   cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 67de3b1836..e3af520a04 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -1,18 +1,18 @@
-import { operation, runInOp } from "../display/operations"
-import { prepareSelection } from "../display/selection"
-import { regChange } from "../display/view_tracking"
-import { applyTextInput, copyableRanges, disableBrowserMagic, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input"
-import { cmp, maxPos, minPos, Pos } from "../line/pos"
-import { getBetween, getLine, lineNo } from "../line/utils_line"
-import { findViewForLine, findViewIndex, mapFromLineView, nodeAndOffsetInLineMap } from "../measurement/position_measurement"
-import { replaceRange } from "../model/changes"
-import { simpleSelection } from "../model/selection"
-import { setSelection } from "../model/selection_updates"
-import { getBidiPartAt, getOrder } from "../util/bidi"
-import { android, chrome, gecko, ie_version } from "../util/browser"
-import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom"
-import { on, signalDOMEvent } from "../util/event"
-import { Delayed, lst, sel_dontScroll } from "../util/misc"
+import { operation, runInOp } from "../display/operations.js"
+import { prepareSelection } from "../display/selection.js"
+import { regChange } from "../display/view_tracking.js"
+import { applyTextInput, copyableRanges, disableBrowserMagic, handlePaste, hiddenTextarea, lastCopied, setLastCopied } from "./input.js"
+import { cmp, maxPos, minPos, Pos } from "../line/pos.js"
+import { getBetween, getLine, lineNo } from "../line/utils_line.js"
+import { findViewForLine, findViewIndex, mapFromLineView, nodeAndOffsetInLineMap } from "../measurement/position_measurement.js"
+import { replaceRange } from "../model/changes.js"
+import { simpleSelection } from "../model/selection.js"
+import { setSelection } from "../model/selection_updates.js"
+import { getBidiPartAt, getOrder } from "../util/bidi.js"
+import { android, chrome, gecko, ie_version } from "../util/browser.js"
+import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom.js"
+import { on, signalDOMEvent } from "../util/event.js"
+import { Delayed, lst, sel_dontScroll } from "../util/misc.js"
 
 // CONTENTEDITABLE INPUT STYLE
 
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 3262ea1ba6..c0f04aaaf2 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -1,15 +1,15 @@
-import { operation, runInOp } from "../display/operations"
-import { prepareSelection } from "../display/selection"
-import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, setLastCopied } from "./input"
-import { cursorCoords, posFromMouse } from "../measurement/position_measurement"
-import { eventInWidget } from "../measurement/widgets"
-import { simpleSelection } from "../model/selection"
-import { selectAll, setSelection } from "../model/selection_updates"
-import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser"
-import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom"
-import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event"
-import { hasSelection } from "../util/feature_detection"
-import { Delayed, sel_dontScroll } from "../util/misc"
+import { operation, runInOp } from "../display/operations.js"
+import { prepareSelection } from "../display/selection.js"
+import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, setLastCopied } from "./input.js"
+import { cursorCoords, posFromMouse } from "../measurement/position_measurement.js"
+import { eventInWidget } from "../measurement/widgets.js"
+import { simpleSelection } from "../model/selection.js"
+import { selectAll, setSelection } from "../model/selection_updates.js"
+import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser.js"
+import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom.js"
+import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event.js"
+import { hasSelection } from "../util/feature_detection.js"
+import { Delayed, sel_dontScroll } from "../util/misc.js"
 
 // TEXTAREA INPUT STYLE
 
diff --git a/src/input/indent.js b/src/input/indent.js
index 024f5f9254..c88772cb6b 100644
--- a/src/input/indent.js
+++ b/src/input/indent.js
@@ -1,10 +1,10 @@
-import { getContextBefore } from "../line/highlight"
-import { Pos } from "../line/pos"
-import { getLine } from "../line/utils_line"
-import { replaceRange } from "../model/changes"
-import { Range } from "../model/selection"
-import { replaceOneSelection } from "../model/selection_updates"
-import { countColumn, Pass, spaceStr } from "../util/misc"
+import { getContextBefore } from "../line/highlight.js"
+import { Pos } from "../line/pos.js"
+import { getLine } from "../line/utils_line.js"
+import { replaceRange } from "../model/changes.js"
+import { Range } from "../model/selection.js"
+import { replaceOneSelection } from "../model/selection_updates.js"
+import { countColumn, Pass, spaceStr } from "../util/misc.js"
 
 // Indent the given line. The how parameter can be "smart",
 // "add"/null, "subtract", or "prev". When aggressive is false
diff --git a/src/input/input.js b/src/input/input.js
index fa85209ee8..ff86c39d31 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -1,15 +1,15 @@
-import { runInOp } from "../display/operations"
-import { ensureCursorVisible } from "../display/scrolling"
-import { Pos } from "../line/pos"
-import { getLine } from "../line/utils_line"
-import { makeChange } from "../model/changes"
-import { ios, webkit } from "../util/browser"
-import { elt } from "../util/dom"
-import { lst, map } from "../util/misc"
-import { signalLater } from "../util/operation_group"
-import { splitLinesAuto } from "../util/feature_detection"
+import { runInOp } from "../display/operations.js"
+import { ensureCursorVisible } from "../display/scrolling.js"
+import { Pos } from "../line/pos.js"
+import { getLine } from "../line/utils_line.js"
+import { makeChange } from "../model/changes.js"
+import { ios, webkit } from "../util/browser.js"
+import { elt } from "../util/dom.js"
+import { lst, map } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
+import { splitLinesAuto } from "../util/feature_detection.js"
 
-import { indentLine } from "./indent"
+import { indentLine } from "./indent.js"
 
 // This will be set to a {lineWise: bool, text: [string]} object, so
 // that, when pasting, we know what kind of selections the copied
diff --git a/src/input/keymap.js b/src/input/keymap.js
index 36ac3e61b9..1dfcf8aff6 100644
--- a/src/input/keymap.js
+++ b/src/input/keymap.js
@@ -1,7 +1,7 @@
-import { flipCtrlCmd, mac, presto } from "../util/browser"
-import { map } from "../util/misc"
+import { flipCtrlCmd, mac, presto } from "../util/browser.js"
+import { map } from "../util/misc.js"
 
-import { keyNames } from "./keynames"
+import { keyNames } from "./keynames.js"
 
 export let keyMap = {}
 
diff --git a/src/input/movement.js b/src/input/movement.js
index 927ed6e14d..8d50fd2a04 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -1,7 +1,7 @@
-import { Pos } from "../line/pos"
-import { prepareMeasureForLine, measureCharPrepared, wrappedLineExtentChar } from "../measurement/position_measurement"
-import { getBidiPartAt, getOrder } from "../util/bidi"
-import { findFirst, lst, skipExtendingChars } from "../util/misc"
+import { Pos } from "../line/pos.js"
+import { prepareMeasureForLine, measureCharPrepared, wrappedLineExtentChar } from "../measurement/position_measurement.js"
+import { getBidiPartAt, getOrder } from "../util/bidi.js"
+import { findFirst, lst, skipExtendingChars } from "../util/misc.js"
 
 function moveCharLogically(line, ch, dir) {
   let target = skipExtendingChars(line.text, ch + dir, dir)
diff --git a/src/line/highlight.js b/src/line/highlight.js
index c5e6b8aacc..79f0884511 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -1,9 +1,9 @@
-import { countColumn } from "../util/misc"
-import { copyState, innerMode, startState } from "../modes"
-import StringStream from "../util/StringStream"
+import { countColumn } from "../util/misc.js"
+import { copyState, innerMode, startState } from "../modes.js"
+import StringStream from "../util/StringStream.js"
 
-import { getLine, lineNo } from "./utils_line"
-import { clipPos } from "./pos"
+import { getLine, lineNo } from "./utils_line.js"
+import { clipPos } from "./pos.js"
 
 class SavedContext {
   constructor(state, lookAhead) {
diff --git a/src/line/line_data.js b/src/line/line_data.js
index e444184bb0..74acdaffc0 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -1,13 +1,13 @@
-import { getOrder } from "../util/bidi"
-import { ie, ie_version, webkit } from "../util/browser"
-import { elt, eltP, joinClasses } from "../util/dom"
-import { eventMixin, signal } from "../util/event"
-import { hasBadBidiRects, zeroWidthElement } from "../util/feature_detection"
-import { lst, spaceStr } from "../util/misc"
+import { getOrder } from "../util/bidi.js"
+import { ie, ie_version, webkit } from "../util/browser.js"
+import { elt, eltP, joinClasses } from "../util/dom.js"
+import { eventMixin, signal } from "../util/event.js"
+import { hasBadBidiRects, zeroWidthElement } from "../util/feature_detection.js"
+import { lst, spaceStr } from "../util/misc.js"
 
-import { getLineStyles } from "./highlight"
-import { attachMarkedSpans, compareCollapsedMarkers, detachMarkedSpans, lineIsHidden, visualLineContinued } from "./spans"
-import { getLine, lineNo, updateLineHeight } from "./utils_line"
+import { getLineStyles } from "./highlight.js"
+import { attachMarkedSpans, compareCollapsedMarkers, detachMarkedSpans, lineIsHidden, visualLineContinued } from "./spans.js"
+import { getLine, lineNo, updateLineHeight } from "./utils_line.js"
 
 // LINE DATA STRUCTURE
 
diff --git a/src/line/pos.js b/src/line/pos.js
index 4f5e4c5594..2a498f8f3c 100644
--- a/src/line/pos.js
+++ b/src/line/pos.js
@@ -1,4 +1,4 @@
-import { getLine } from "./utils_line"
+import { getLine } from "./utils_line.js"
 
 // A Pos instance represents a position within the text.
 export function Pos(line, ch, sticky = null) {
diff --git a/src/line/spans.js b/src/line/spans.js
index 6c413d2fc2..f7e5f4b6e9 100644
--- a/src/line/spans.js
+++ b/src/line/spans.js
@@ -1,8 +1,8 @@
-import { indexOf, lst } from "../util/misc"
+import { indexOf, lst } from "../util/misc.js"
 
-import { cmp } from "./pos"
-import { sawCollapsedSpans } from "./saw_special_spans"
-import { getLine, isLine, lineNo } from "./utils_line"
+import { cmp } from "./pos.js"
+import { sawCollapsedSpans } from "./saw_special_spans.js"
+import { getLine, isLine, lineNo } from "./utils_line.js"
 
 // TEXTMARKER SPANS
 
diff --git a/src/line/utils_line.js b/src/line/utils_line.js
index e4e6943f55..c886294353 100644
--- a/src/line/utils_line.js
+++ b/src/line/utils_line.js
@@ -1,4 +1,4 @@
-import { indexOf } from "../util/misc"
+import { indexOf } from "../util/misc.js"
 
 // Find the line object corresponding to the given line number.
 export function getLine(doc, n) {
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 78986e03db..aeff0e5b8d 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -1,16 +1,16 @@
-import { buildLineContent, LineView } from "../line/line_data"
-import { clipPos, Pos } from "../line/pos"
-import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans"
-import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line"
-import { bidiOther, getBidiPartAt, getOrder } from "../util/bidi"
-import { chrome, android, ie, ie_version } from "../util/browser"
-import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom"
-import { e_target } from "../util/event"
-import { hasBadZoomedRects } from "../util/feature_detection"
-import { countColumn, findFirst, isExtendingChar, scrollerGap, skipExtendingChars } from "../util/misc"
-import { updateLineForChanges } from "../display/update_line"
-
-import { widgetHeight } from "./widgets"
+import { buildLineContent, LineView } from "../line/line_data.js"
+import { clipPos, Pos } from "../line/pos.js"
+import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans.js"
+import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line.js"
+import { bidiOther, getBidiPartAt, getOrder } from "../util/bidi.js"
+import { chrome, android, ie, ie_version } from "../util/browser.js"
+import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom.js"
+import { e_target } from "../util/event.js"
+import { hasBadZoomedRects } from "../util/feature_detection.js"
+import { countColumn, findFirst, isExtendingChar, scrollerGap, skipExtendingChars } from "../util/misc.js"
+import { updateLineForChanges } from "../display/update_line.js"
+
+import { widgetHeight } from "./widgets.js"
 
 // POSITION MEASUREMENT
 
diff --git a/src/measurement/widgets.js b/src/measurement/widgets.js
index 554cf80977..39d7553d1f 100644
--- a/src/measurement/widgets.js
+++ b/src/measurement/widgets.js
@@ -1,5 +1,5 @@
-import { contains, elt, removeChildrenAndAdd } from "../util/dom"
-import { e_target } from "../util/event"
+import { contains, elt, removeChildrenAndAdd } from "../util/dom.js"
+import { e_target } from "../util/event.js"
 
 export function widgetHeight(widget) {
   if (widget.height != null) return widget.height
diff --git a/src/model/Doc.js b/src/model/Doc.js
index c3da76d74e..b64ac84373 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -1,23 +1,23 @@
-import CodeMirror from "../edit/CodeMirror"
-import { docMethodOp } from "../display/operations"
-import { Line } from "../line/line_data"
-import { clipPos, clipPosArray, Pos } from "../line/pos"
-import { visualLine } from "../line/spans"
-import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_line"
-import { classTest } from "../util/dom"
-import { splitLinesAuto } from "../util/feature_detection"
-import { createObj, map, isEmpty, sel_dontScroll } from "../util/misc"
-import { ensureCursorVisible, scrollToCoords } from "../display/scrolling"
-
-import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes"
-import { computeReplacedSel } from "./change_measurement"
-import { BranchChunk, LeafChunk } from "./chunk"
-import { directionChanged, linkedDocs, updateDoc } from "./document_data"
-import { copyHistoryArray, History } from "./history"
-import { addLineWidget } from "./line_widget"
-import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } from "./mark_text"
-import { normalizeSelection, Range, simpleSelection } from "./selection"
-import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates"
+import CodeMirror from "../edit/CodeMirror.js"
+import { docMethodOp } from "../display/operations.js"
+import { Line } from "../line/line_data.js"
+import { clipPos, clipPosArray, Pos } from "../line/pos.js"
+import { visualLine } from "../line/spans.js"
+import { getBetween, getLine, getLines, isLine, lineNo } from "../line/utils_line.js"
+import { classTest } from "../util/dom.js"
+import { splitLinesAuto } from "../util/feature_detection.js"
+import { createObj, map, isEmpty, sel_dontScroll } from "../util/misc.js"
+import { ensureCursorVisible, scrollToCoords } from "../display/scrolling.js"
+
+import { changeLine, makeChange, makeChangeFromHistory, replaceRange } from "./changes.js"
+import { computeReplacedSel } from "./change_measurement.js"
+import { BranchChunk, LeafChunk } from "./chunk.js"
+import { directionChanged, linkedDocs, updateDoc } from "./document_data.js"
+import { copyHistoryArray, History } from "./history.js"
+import { addLineWidget } from "./line_widget.js"
+import { copySharedMarkers, detachSharedMarkers, findSharedMarkers, markText } from "./mark_text.js"
+import { normalizeSelection, Range, simpleSelection } from "./selection.js"
+import { extendSelection, extendSelections, setSelection, setSelectionReplaceHistory, setSimpleSelection } from "./selection_updates.js"
 
 let nextDocId = 0
 let Doc = function(text, mode, firstLine, lineSep, direction) {
diff --git a/src/model/change_measurement.js b/src/model/change_measurement.js
index 881f39eb46..4d45313dee 100644
--- a/src/model/change_measurement.js
+++ b/src/model/change_measurement.js
@@ -1,7 +1,7 @@
-import { cmp, Pos } from "../line/pos"
-import { lst } from "../util/misc"
+import { cmp, Pos } from "../line/pos.js"
+import { lst } from "../util/misc.js"
 
-import { normalizeSelection, Range, Selection } from "./selection"
+import { normalizeSelection, Range, Selection } from "./selection.js"
 
 // Compute the position of the end of a change (its 'to' property
 // refers to the pre-change end).
diff --git a/src/model/changes.js b/src/model/changes.js
index cfad529c68..b00e29b13d 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -1,21 +1,21 @@
-import { retreatFrontier } from "../line/highlight"
-import { startWorker } from "../display/highlight_worker"
-import { operation } from "../display/operations"
-import { regChange, regLineChange } from "../display/view_tracking"
-import { clipLine, clipPos, cmp, Pos } from "../line/pos"
-import { sawReadOnlySpans } from "../line/saw_special_spans"
-import { lineLength, removeReadOnlyRanges, stretchSpansOverChange, visualLine } from "../line/spans"
-import { getBetween, getLine, lineNo } from "../line/utils_line"
-import { estimateHeight } from "../measurement/position_measurement"
-import { hasHandler, signal, signalCursorActivity } from "../util/event"
-import { indexOf, lst, map, sel_dontScroll } from "../util/misc"
-import { signalLater } from "../util/operation_group"
-
-import { changeEnd, computeSelAfterChange } from "./change_measurement"
-import { isWholeLineUpdate, linkedDocs, updateDoc } from "./document_data"
-import { addChangeToHistory, historyChangeFromChange, mergeOldSpans, pushSelectionToHistory } from "./history"
-import { Range, Selection } from "./selection"
-import { setSelection, setSelectionNoUndo } from "./selection_updates"
+import { retreatFrontier } from "../line/highlight.js"
+import { startWorker } from "../display/highlight_worker.js"
+import { operation } from "../display/operations.js"
+import { regChange, regLineChange } from "../display/view_tracking.js"
+import { clipLine, clipPos, cmp, Pos } from "../line/pos.js"
+import { sawReadOnlySpans } from "../line/saw_special_spans.js"
+import { lineLength, removeReadOnlyRanges, stretchSpansOverChange, visualLine } from "../line/spans.js"
+import { getBetween, getLine, lineNo } from "../line/utils_line.js"
+import { estimateHeight } from "../measurement/position_measurement.js"
+import { hasHandler, signal, signalCursorActivity } from "../util/event.js"
+import { indexOf, lst, map, sel_dontScroll } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
+
+import { changeEnd, computeSelAfterChange } from "./change_measurement.js"
+import { isWholeLineUpdate, linkedDocs, updateDoc } from "./document_data.js"
+import { addChangeToHistory, historyChangeFromChange, mergeOldSpans, pushSelectionToHistory } from "./history.js"
+import { Range, Selection } from "./selection.js"
+import { setSelection, setSelectionNoUndo } from "./selection_updates.js"
 
 // UPDATING
 
diff --git a/src/model/chunk.js b/src/model/chunk.js
index 056ef91bb9..d82716ded4 100644
--- a/src/model/chunk.js
+++ b/src/model/chunk.js
@@ -1,6 +1,6 @@
-import { cleanUpLine } from "../line/line_data"
-import { indexOf } from "../util/misc"
-import { signalLater } from "../util/operation_group"
+import { cleanUpLine } from "../line/line_data.js"
+import { indexOf } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
 
 // The document is represented as a BTree consisting of leaves, with
 // chunk of lines in them, and branches, with up to ten leaves or
diff --git a/src/model/document_data.js b/src/model/document_data.js
index 7f6e3367d1..d946e7af10 100644
--- a/src/model/document_data.js
+++ b/src/model/document_data.js
@@ -1,13 +1,13 @@
-import { loadMode } from "../display/mode_state"
-import { runInOp } from "../display/operations"
-import { regChange } from "../display/view_tracking"
-import { Line, updateLine } from "../line/line_data"
-import { findMaxLine } from "../line/spans"
-import { getLine } from "../line/utils_line"
-import { estimateLineHeights } from "../measurement/position_measurement"
-import { addClass, rmClass } from "../util/dom"
-import { lst } from "../util/misc"
-import { signalLater } from "../util/operation_group"
+import { loadMode } from "../display/mode_state.js"
+import { runInOp } from "../display/operations.js"
+import { regChange } from "../display/view_tracking.js"
+import { Line, updateLine } from "../line/line_data.js"
+import { findMaxLine } from "../line/spans.js"
+import { getLine } from "../line/utils_line.js"
+import { estimateLineHeights } from "../measurement/position_measurement.js"
+import { addClass, rmClass } from "../util/dom.js"
+import { lst } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
 
 // DOCUMENT DATA STRUCTURE
 
diff --git a/src/model/history.js b/src/model/history.js
index 83938cf4c1..753a89da92 100644
--- a/src/model/history.js
+++ b/src/model/history.js
@@ -1,12 +1,12 @@
-import { cmp, copyPos } from "../line/pos"
-import { stretchSpansOverChange } from "../line/spans"
-import { getBetween } from "../line/utils_line"
-import { signal } from "../util/event"
-import { indexOf, lst } from "../util/misc"
-
-import { changeEnd } from "./change_measurement"
-import { linkedDocs } from "./document_data"
-import { Selection } from "./selection"
+import { cmp, copyPos } from "../line/pos.js"
+import { stretchSpansOverChange } from "../line/spans.js"
+import { getBetween } from "../line/utils_line.js"
+import { signal } from "../util/event.js"
+import { indexOf, lst } from "../util/misc.js"
+
+import { changeEnd } from "./change_measurement.js"
+import { linkedDocs } from "./document_data.js"
+import { Selection } from "./selection.js"
 
 export function History(startGen) {
   // Arrays of change events and selections. Doing something adds an
diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index a11f9c2742..4a82d5389e 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -1,12 +1,12 @@
-import { runInOp } from "../display/operations"
-import { addToScrollTop } from "../display/scrolling"
-import { regLineChange } from "../display/view_tracking"
-import { heightAtLine, lineIsHidden } from "../line/spans"
-import { lineNo, updateLineHeight } from "../line/utils_line"
-import { widgetHeight } from "../measurement/widgets"
-import { changeLine } from "./changes"
-import { eventMixin } from "../util/event"
-import { signalLater } from "../util/operation_group"
+import { runInOp } from "../display/operations.js"
+import { addToScrollTop } from "../display/scrolling.js"
+import { regLineChange } from "../display/view_tracking.js"
+import { heightAtLine, lineIsHidden } from "../line/spans.js"
+import { lineNo, updateLineHeight } from "../line/utils_line.js"
+import { widgetHeight } from "../measurement/widgets.js"
+import { changeLine } from "./changes.js"
+import { eventMixin } from "../util/event.js"
+import { signalLater } from "../util/operation_group.js"
 
 // Line widgets are block elements displayed above or below a line.
 
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index ccdcc9d3b8..955c72c4a7 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -1,19 +1,19 @@
-import { eltP } from "../util/dom"
-import { eventMixin, hasHandler, on } from "../util/event"
-import { endOperation, operation, runInOp, startOperation } from "../display/operations"
-import { clipPos, cmp, Pos } from "../line/pos"
-import { lineNo, updateLineHeight } from "../line/utils_line"
-import { clearLineMeasurementCacheFor, findViewForLine, textHeight } from "../measurement/position_measurement"
-import { seeReadOnlySpans, seeCollapsedSpans } from "../line/saw_special_spans"
-import { addMarkedSpan, conflictingCollapsedRange, getMarkedSpanFor, lineIsHidden, lineLength, MarkedSpan, removeMarkedSpan, visualLine } from "../line/spans"
-import { copyObj, indexOf, lst } from "../util/misc"
-import { signalLater } from "../util/operation_group"
-import { widgetHeight } from "../measurement/widgets"
-import { regChange, regLineChange } from "../display/view_tracking"
+import { eltP } from "../util/dom.js"
+import { eventMixin, hasHandler, on } from "../util/event.js"
+import { endOperation, operation, runInOp, startOperation } from "../display/operations.js"
+import { clipPos, cmp, Pos } from "../line/pos.js"
+import { lineNo, updateLineHeight } from "../line/utils_line.js"
+import { clearLineMeasurementCacheFor, findViewForLine, textHeight } from "../measurement/position_measurement.js"
+import { seeReadOnlySpans, seeCollapsedSpans } from "../line/saw_special_spans.js"
+import { addMarkedSpan, conflictingCollapsedRange, getMarkedSpanFor, lineIsHidden, lineLength, MarkedSpan, removeMarkedSpan, visualLine } from "../line/spans.js"
+import { copyObj, indexOf, lst } from "../util/misc.js"
+import { signalLater } from "../util/operation_group.js"
+import { widgetHeight } from "../measurement/widgets.js"
+import { regChange, regLineChange } from "../display/view_tracking.js"
 
-import { linkedDocs } from "./document_data"
-import { addChangeToHistory } from "./history"
-import { reCheckSelection } from "./selection_updates"
+import { linkedDocs } from "./document_data.js"
+import { addChangeToHistory } from "./history.js"
+import { reCheckSelection } from "./selection_updates.js"
 
 // TEXTMARKERS
 
diff --git a/src/model/selection.js b/src/model/selection.js
index 97084fbc15..2e374aa822 100644
--- a/src/model/selection.js
+++ b/src/model/selection.js
@@ -1,5 +1,5 @@
-import { cmp, copyPos, equalCursorPos, maxPos, minPos } from "../line/pos"
-import { indexOf } from "../util/misc"
+import { cmp, copyPos, equalCursorPos, maxPos, minPos } from "../line/pos.js"
+import { indexOf } from "../util/misc.js"
 
 // Selection objects are immutable. A new one is created every time
 // the selection changes. A selection is one or more non-overlapping
diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index bf5ad8c76f..77986a9e9a 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -1,12 +1,12 @@
-import { signalLater } from "../util/operation_group"
-import { ensureCursorVisible } from "../display/scrolling"
-import { clipPos, cmp, Pos } from "../line/pos"
-import { getLine } from "../line/utils_line"
-import { hasHandler, signal, signalCursorActivity } from "../util/event"
-import { lst, sel_dontScroll } from "../util/misc"
-
-import { addSelectionToHistory } from "./history"
-import { normalizeSelection, Range, Selection, simpleSelection } from "./selection"
+import { signalLater } from "../util/operation_group.js"
+import { ensureCursorVisible } from "../display/scrolling.js"
+import { clipPos, cmp, Pos } from "../line/pos.js"
+import { getLine } from "../line/utils_line.js"
+import { hasHandler, signal, signalCursorActivity } from "../util/event.js"
+import { lst, sel_dontScroll } from "../util/misc.js"
+
+import { addSelectionToHistory } from "./history.js"
+import { normalizeSelection, Range, Selection, simpleSelection } from "./selection.js"
 
 // The 'scroll' parameter given to many of these indicated whether
 // the new cursor position should be scrolled into view after
diff --git a/src/modes.js b/src/modes.js
index 065a463b5b..8384517027 100644
--- a/src/modes.js
+++ b/src/modes.js
@@ -1,4 +1,4 @@
-import { copyObj, createObj } from "./util/misc"
+import { copyObj, createObj } from "./util/misc.js"
 
 // Known modes, by name and by MIME
 export let modes = {}, mimeModes = {}
diff --git a/src/util/StringStream.js b/src/util/StringStream.js
index a14b1b6430..022c4bc209 100644
--- a/src/util/StringStream.js
+++ b/src/util/StringStream.js
@@ -1,4 +1,4 @@
-import { countColumn } from "./misc"
+import { countColumn } from "./misc.js"
 
 // STRING STREAM
 
diff --git a/src/util/bidi.js b/src/util/bidi.js
index 3d13dd86d2..33ab854d88 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -1,4 +1,4 @@
-import { lst } from "./misc"
+import { lst } from "./misc.js"
 
 // BIDI HELPERS
 
diff --git a/src/util/dom.js b/src/util/dom.js
index 94823c21b9..04d2569d28 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -1,4 +1,4 @@
-import { ie, ios } from "./browser"
+import { ie, ios } from "./browser.js"
 
 export function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
 
diff --git a/src/util/event.js b/src/util/event.js
index 29fd4c5981..4b6c770578 100644
--- a/src/util/event.js
+++ b/src/util/event.js
@@ -1,5 +1,5 @@
-import { mac } from "./browser"
-import { indexOf } from "./misc"
+import { mac } from "./browser.js"
+import { indexOf } from "./misc.js"
 
 // EVENT HANDLING
 
diff --git a/src/util/feature_detection.js b/src/util/feature_detection.js
index e65881d4ca..c33734ebb9 100644
--- a/src/util/feature_detection.js
+++ b/src/util/feature_detection.js
@@ -1,5 +1,5 @@
-import { elt, range, removeChildren, removeChildrenAndAdd } from "./dom"
-import { ie, ie_version } from "./browser"
+import { elt, range, removeChildren, removeChildrenAndAdd } from "./dom.js"
+import { ie, ie_version } from "./browser.js"
 
 // Detect drag-and-drop
 export let dragAndDrop = function() {
diff --git a/src/util/operation_group.js b/src/util/operation_group.js
index b8fa78ac48..f6815949d8 100644
--- a/src/util/operation_group.js
+++ b/src/util/operation_group.js
@@ -1,4 +1,4 @@
-import { getHandlers } from "./event"
+import { getHandlers } from "./event.js"
 
 let operationGroup = null
 

From 85fb7510976c8e0d443d44b7788c3066541fc470 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Nov 2017 09:49:42 +0100
Subject: [PATCH 3579/4742] [javascript mode] Recognize async when in front of
 single-line block comment

Closes #5078
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 5c772526f2..139e53dfe4 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -153,7 +153,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
           var kw = keywords[word]
           return ret(kw.type, kw.style, word)
         }
-        if (word == "async" && stream.match(/^\s*[\(\w]/, false))
+        if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\(\w]/, false))
           return ret("async", "keyword", word)
       }
       return ret("variable", "variable", word)

From 1ba861a09f01f7205c36fb467660ed970a1c0054 Mon Sep 17 00:00:00 2001
From: Joel Einbinder <einbinder@chromium.org>
Date: Wed, 8 Nov 2017 15:56:23 -0800
Subject: [PATCH 3580/4742] [javascript mode] Test for comments between async
 and function keywords

---
 mode/javascript/test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 213bab06a8..d560fdbacb 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -230,6 +230,9 @@
      "[keyword const] [def async] [operator =] {[property a]: [number 1]};",
      "[keyword const] [def foo] [operator =] [string-2 `bar ${][variable async].[property a][string-2 }`];")
 
+  MT("async_comment",
+     "[keyword async] [comment /**/] [keyword function] [def foo]([def args]) { [keyword return] [atom true]; }");
+
   MT("indent_switch",
      "[keyword switch] ([variable x]) {",
      "  [keyword default]:",

From a29e048d20e5a256dd48bc49e1afae6f9d1a252a Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakubvrana@google.com>
Date: Fri, 10 Nov 2017 14:29:19 +0100
Subject: [PATCH 3581/4742] [soy mode] Support comments in all contexts

---
 mode/soy/soy.js | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 0e24457042..98f308658e 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -137,6 +137,25 @@
             }
             return "comment";
 
+          case "string":
+            var match = stream.match(/^.*?(["']|\\[\s\S])/);
+            if (!match) {
+              stream.skipToEnd();
+            } else if (match[1] == state.quoteKind) {
+              state.quoteKind = null;
+              state.soyState.pop();
+            }
+            return "string";
+        }
+
+        if (stream.match(/^\/\*/)) {
+          state.soyState.push("comment");
+          return "comment";
+        } else if (stream.match(stream.sol() || (state.soyState.length && last(state.soyState) != "literal") ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
+          return "comment";
+        }
+
+        switch (last(state.soyState)) {
           case "templ-def":
             if (match = stream.match(/^\.?([\w]+(?!\.[\w]+)*)/)) {
               state.templates = prepend(state.templates, match[1]);
@@ -242,36 +261,15 @@
               return this.token(stream, state);
             }
             return tokenUntil(stream, state, /\{\/literal}/);
-
-          case "string":
-            var match = stream.match(/^.*?(["']|\\[\s\S])/);
-            if (!match) {
-              stream.skipToEnd();
-            } else if (match[1] == state.quoteKind) {
-              state.quoteKind = null;
-              state.soyState.pop();
-            }
-            return "string";
         }
 
-        if (stream.match(/^\/\*/)) {
-          state.soyState.push("comment");
-          if (!state.scopes) {
-            state.variables = prepend(null, 'ij');
-          }
-          return "comment";
-        } else if (stream.match(stream.sol() ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
-          if (!state.scopes) {
-            state.variables = prepend(null, 'ij');
-          }
-          return "comment";
-        } else if (stream.match(/^\{literal}/)) {
+        if (stream.match(/^\{literal}/)) {
           state.indent += config.indentUnit;
           state.soyState.push("literal");
           return "keyword";
 
-        // A tag-keyword must be followed by whitespace or a closing tag.
-        } else if (match = stream.match(/^\{([\/@\\]?\w+\??)(?=[\s\}])/)) {
+        // A tag-keyword must be followed by whitespace, comment or a closing tag.
+        } else if (match = stream.match(/^\{([\/@\\]?\w+\??)(?=[\s\}]|\/[/*])/)) {
           if (match[1] != "/switch")
             state.indent += (/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
           state.tag = match[1];

From b881f2520461c7fc98ca1673071d0eb74ddd7c39 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 13 Nov 2017 09:40:40 +0100
Subject: [PATCH 3582/4742] [emacs mode] Prevent backspace/delete/etc from
 adding to the kill ring

Closes #5084
---
 keymap/emacs.js    | 42 +++++++++++++++++++++---------------------
 test/emacs_test.js |  2 ++
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 33db0c15a2..3160453283 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -30,16 +30,16 @@
 
   var lastKill = null;
 
-  function kill(cm, from, to, mayGrow, text) {
+  function kill(cm, from, to, ring, text) {
     if (text == null) text = cm.getRange(from, to);
 
-    if (mayGrow && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen))
+    if (ring == "grow" && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen))
       growRingTop(text);
-    else
+    else if (ring !== false)
       addToRing(text);
     cm.replaceRange("", from, to, "+delete");
 
-    if (mayGrow) lastKill = {cm: cm, pos: from, gen: cm.changeGeneration()};
+    if (ring == "grow") lastKill = {cm: cm, pos: from, gen: cm.changeGeneration()};
     else lastKill = null;
   }
 
@@ -151,22 +151,22 @@
     return f;
   }
 
-  function killTo(cm, by, dir) {
+  function killTo(cm, by, dir, ring) {
     var selections = cm.listSelections(), cursor;
     var i = selections.length;
     while (i--) {
       cursor = selections[i].head;
-      kill(cm, cursor, findEnd(cm, cursor, by, dir), true);
+      kill(cm, cursor, findEnd(cm, cursor, by, dir), ring);
     }
   }
 
-  function killRegion(cm) {
+  function killRegion(cm, ring) {
     if (cm.somethingSelected()) {
       var selections = cm.listSelections(), selection;
       var i = selections.length;
       while (i--) {
         selection = selections[i];
-        kill(cm, selection.anchor, selection.head);
+        kill(cm, selection.anchor, selection.head, ring);
       }
       return true;
     }
@@ -276,7 +276,7 @@
   // Actual keymap
 
   var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
-    "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
+    "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"), true);},
     "Ctrl-K": repeated(function(cm) {
       var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
       var text = cm.getRange(start, end);
@@ -284,7 +284,7 @@
         text += "\n";
         end = Pos(start.line + 1, 0);
       }
-      kill(cm, start, end, true, text);
+      kill(cm, start, end, "grow", text);
     }),
     "Alt-W": function(cm) {
       addToRing(cm.getSelection());
@@ -301,14 +301,14 @@
 
     "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
     "Right": move(byChar, 1), "Left": move(byChar, -1),
-    "Ctrl-D": function(cm) { killTo(cm, byChar, 1); },
-    "Delete": function(cm) { killRegion(cm) || killTo(cm, byChar, 1); },
-    "Ctrl-H": function(cm) { killTo(cm, byChar, -1); },
-    "Backspace": function(cm) { killRegion(cm) || killTo(cm, byChar, -1); },
+    "Ctrl-D": function(cm) { killTo(cm, byChar, 1, false); },
+    "Delete": function(cm) { killRegion(cm, false) || killTo(cm, byChar, 1, false); },
+    "Ctrl-H": function(cm) { killTo(cm, byChar, -1, false); },
+    "Backspace": function(cm) { killRegion(cm, false) || killTo(cm, byChar, -1, false); },
 
     "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
-    "Alt-D": function(cm) { killTo(cm, byWord, 1); },
-    "Alt-Backspace": function(cm) { killTo(cm, byWord, -1); },
+    "Alt-D": function(cm) { killTo(cm, byWord, 1, "grow"); },
+    "Alt-Backspace": function(cm) { killTo(cm, byWord, -1, "grow"); },
 
     "Ctrl-N": move(byLine, 1), "Ctrl-P": move(byLine, -1),
     "Down": move(byLine, 1), "Up": move(byLine, -1),
@@ -321,11 +321,11 @@
     "Ctrl-Up": move(byParagraph, -1), "Ctrl-Down": move(byParagraph, 1),
 
     "Alt-A": move(bySentence, -1), "Alt-E": move(bySentence, 1),
-    "Alt-K": function(cm) { killTo(cm, bySentence, 1); },
+    "Alt-K": function(cm) { killTo(cm, bySentence, 1, "grow"); },
 
-    "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1); },
-    "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1); },
-    "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1),
+    "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1, "grow"); },
+    "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1, "grow"); },
+    "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1, "grow"),
 
     "Shift-Ctrl-Alt-2": function(cm) {
       var cursor = cm.getCursor();
@@ -398,7 +398,7 @@
     "Ctrl-X F": "open",
     "Ctrl-X U": repeated("undo"),
     "Ctrl-X K": "close",
-    "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
+    "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), "grow"); },
     "Ctrl-X H": "selectAll",
 
     "Ctrl-Q Tab": repeated("insertTab"),
diff --git a/test/emacs_test.js b/test/emacs_test.js
index b73eedaa6a..412dba4b42 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -131,6 +131,8 @@
   sim("delRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Delete", txt("cde"));
   sim("backspaceRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Backspace", txt("cde"));
 
+  sim("backspaceDoesntAddToRing", "foobar", "Ctrl-F", "Ctrl-F", "Ctrl-F", "Ctrl-K", "Backspace", "Backspace", "Ctrl-Y", txt("fbar"));
+
   testCM("save", function(cm) {
     var saved = false;
     CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };

From 2cb90ecdce8e7814b0b45a10e3bf6aed48d9a2a7 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 17 Nov 2017 20:45:01 +0100
Subject: [PATCH 3583/4742] [javascript mode] Highlight type in generic call

Closes #5048.
---
 mode/javascript/javascript.js | 1 +
 mode/javascript/test.js       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 139e53dfe4..e43543dd3c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -438,6 +438,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
     if (type == "operator") {
       if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
+      if (isTS && value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, maybeoperatorNoComma);
       if (value == "?") return cont(expression, expect(":"), expr);
       return cont(expr);
     }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index d560fdbacb..972a345651 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -371,6 +371,9 @@
   TS("arrow prop",
      "({[property a]: [def p] [operator =>] [variable-2 p]})")
 
+  TS("generic in function call",
+     "[keyword this].[property a][operator <][type Type][operator >]([variable foo]);")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 490653454aa985feb60918eeddde823c550e416e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Nov 2017 10:36:30 +0100
Subject: [PATCH 3584/4742] [javascript mode] Resolve ambiguity for type
 parameters vs less-than

See https://github.com/Microsoft/TypeScript/blob/6c4c10c7cf294dc71f943314e29a7dd1b6e88c6a/doc/spec.md#4.15.3

Issue #5090
Issue #5048
---
 mode/javascript/javascript.js | 3 ++-
 mode/javascript/test.js       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index e43543dd3c..0dcd8af391 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -438,7 +438,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
     if (type == "operator") {
       if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
-      if (isTS && value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, maybeoperatorNoComma);
+      if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))
+        return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me);
       if (value == "?") return cont(expression, expect(":"), expr);
       return cont(expr);
     }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 972a345651..2437edcca5 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -372,7 +372,8 @@
      "({[property a]: [def p] [operator =>] [variable-2 p]})")
 
   TS("generic in function call",
-     "[keyword this].[property a][operator <][type Type][operator >]([variable foo]);")
+     "[keyword this].[property a][operator <][type Type][operator >]([variable foo]);",
+     "[keyword this].[property a][operator <][variable Type][operator >][variable foo];")
 
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},

From e51b94ff4890d01d0ee1b97da575440b65429edf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Nov 2017 12:16:06 +0100
Subject: [PATCH 3585/4742] [show-hint addon] Drop suspicious-looking logic

Issue #4792
---
 addon/hint/show-hint.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index f72a0a9c69..62c683cb8c 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -121,7 +121,6 @@
       var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
       if (this.widget) this.widget.close();
 
-      if (data && this.data && isNewCompletion(this.data, data)) return;
       this.data = data;
 
       if (data && data.list.length) {
@@ -135,11 +134,6 @@
     }
   };
 
-  function isNewCompletion(old, nw) {
-    var moved = CodeMirror.cmpPos(nw.from, old.from)
-    return moved > 0 && old.to.ch - old.from.ch != nw.to.ch - nw.from.ch
-  }
-
   function parseOptions(cm, pos, options) {
     var editor = cm.options.hintOptions;
     var out = {};

From 66414ce35ba441b766117b5f8cf53a1850a7362e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Nov 2017 09:59:21 +0100
Subject: [PATCH 3586/4742] [javascript mode] Recognize TypeScript type guards

Closes #5093
---
 mode/javascript/javascript.js | 14 +++++++++++++-
 mode/javascript/test.js       |  8 ++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 0dcd8af391..4978d8d1e7 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -566,6 +566,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (value == "?") return cont(maybetype);
     }
   }
+  function mayberettype(type, value) {
+    if (isTS && type == ":") {
+      if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
+      else return cont(typeexpr)
+    }
+  }
+  function isKW(_, value) {
+    if (value == "is") {
+      cx.marked = "keyword"
+      return cont()
+    }
+  }
   function typeexpr(type, value) {
     if (type == "variable" || value == "void") {
       if (value == "keyof") {
@@ -668,7 +680,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function functiondef(type, value) {
     if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
     if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, maybetype, statement, popcontext);
+    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, statement, popcontext);
     if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef)
   }
   function funarg(type, value) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 2437edcca5..167e6d0165 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -375,6 +375,14 @@
      "[keyword this].[property a][operator <][type Type][operator >]([variable foo]);",
      "[keyword this].[property a][operator <][variable Type][operator >][variable foo];")
 
+  TS("type guard",
+     "[keyword class] [def Appler] {",
+     "  [keyword static] [property assertApple]([def fruit]: [type Fruit]): [variable-2 fruit] [keyword is] [type Apple] {",
+     "    [keyword if] ([operator !]([variable-2 fruit] [keyword instanceof] [variable Apple]))",
+     "      [keyword throw] [keyword new] [variable Error]();",
+     "  }",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From d98aac7b948ef36d0611e5d50f461e3848b925b2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Nov 2017 10:01:54 +0100
Subject: [PATCH 3587/4742] Please linter, remove unused arg

---
 CHANGELOG.md                  | 4 ++++
 mode/javascript/javascript.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 409c7234bb..1fa5781617 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.32.0 (2017-11-22)
+
+
+
 ## 5.31.0 (2017-10-20)
 
 ### Bug fixes
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 4978d8d1e7..514de1c8da 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -566,7 +566,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (value == "?") return cont(maybetype);
     }
   }
-  function mayberettype(type, value) {
+  function mayberettype(type) {
     if (isTS && type == ":") {
       if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
       else return cont(typeexpr)

From 89595f55b19ea0584e4721128c149f918795a384 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Nov 2017 10:10:50 +0100
Subject: [PATCH 3588/4742] Mark version 5.32.0

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 12 ++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f800b86b7d..65d8480893 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -118,6 +118,7 @@ Caitlin Potter
 Calin Barbat
 callodacity
 Camilo Roca
+Casey Klebba
 Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
@@ -300,6 +301,7 @@ Jason Grout
 Jason Johnston
 Jason San Jose
 Jason Siefken
+Jayaprabhakar
 Jaydeep Solanki
 Jean Boussier
 Jeff Blaisdell
@@ -327,6 +329,7 @@ John Van Der Loo
 Jon Ander Peñalba
 Jonas Döbertin
 Jonas Helfer
+Jonathan Hart
 Jonathan Malmaud
 Jon Gacnik
 jongalloway
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fa5781617..f81fcdd07b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 ## 5.32.0 (2017-11-22)
 
+### Bug fixes
+
+Increase contrast on default bracket-matching colors.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of `enum` and `module` keywords.
+
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Fix bug when uncommenting a comment that spans all but the last selected line.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix bug in case folding.
+
+[emacs bindings](http://codemirror.net/demo/emacs.html): Prevent single-character deletions from resetting the kill ring.
+
+[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Tweak quote matching behavior.
+
+### New features
 
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Increment ordered list numbers when adding one.
 
 ## 5.31.0 (2017-10-20)
 
diff --git a/doc/manual.html b/doc/manual.html
index 7666e0df63..f46e6bd5ab 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.31.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.32.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 23de4c8023..7fb8eebef1 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">22-11-2017: <a href="http://codemirror.net/codemirror-5.32.0.zip">Version 5.32.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Increase contrast on default bracket-matching colors.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of <code>enum</code> and <code>module</code> keywords.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix bug when uncommenting a comment that spans all but the last selected line.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix bug in case folding.</li>
+    <li><a href="http://codemirror.net/demo/emacs.html">emacs bindings</a>: Prevent single-character deletions from resetting the kill ring.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Tweak quote matching behavior.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Increment ordered list numbers when adding one.</li>
+  </ul>
+
   <p class="rel">20-10-2017: <a href="http://codemirror.net/codemirror-5.31.0.zip">Version 5.31.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 555e4804aa..d62ab84a39 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.31.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.32.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 6eda061f17..3e9f20c650 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.31.1",
+  "version": "5.32.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 6d9eb8790b..c89e5d8792 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.31.1"
+CodeMirror.version = "5.32.0"

From 2e857fa36604aebe0a7c1955a9ca5137ee00e3f5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Nov 2017 10:12:55 +0100
Subject: [PATCH 3589/4742] Bump version number post-5.32

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f46e6bd5ab..ea5642cdf9 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.32.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.32.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 3e9f20c650..3ffad1d5d1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.32.0",
+  "version": "5.32.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index c89e5d8792..260f7d0af5 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.32.0"
+CodeMirror.version = "5.32.1"

From 058e8219b2d040b131eb99ca7ad00b53bafe9886 Mon Sep 17 00:00:00 2001
From: satamas <semyon.atamas@jetbrains.com>
Date: Thu, 23 Nov 2017 16:32:43 +0300
Subject: [PATCH 3590/4742] Add new kotlin keywords.

---
 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 02a85319ff..ff00cf5002 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -578,7 +578,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "file import where by get set abstract enum open inner override private public internal " +
       "protected catch finally out final vararg reified dynamic companion constructor init " +
       "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
-      "external annotation crossinline const operator infix suspend"
+      "external annotation crossinline const operator infix suspend actual expect"
     ),
     types: words(
       /* package java.lang */

From d60e0ccaadaaa2f9bc967594909def5f80231a22 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 27 Nov 2017 11:19:46 +0100
Subject: [PATCH 3591/4742] [tern addon] Guard against relatedTarget being null

Closes #5095
---
 addon/tern/tern.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index a80dc7e4b8..70202c6fc5 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -614,7 +614,8 @@
     var mouseOnTip = false, old = false;
     CodeMirror.on(tip, "mousemove", function() { mouseOnTip = true; });
     CodeMirror.on(tip, "mouseout", function(e) {
-      if (!CodeMirror.contains(tip, e.relatedTarget || e.toElement)) {
+      let related = e.relatedTarget || e.toElement
+      if (!related || !CodeMirror.contains(tip, related)) {
         if (old) clear();
         else mouseOnTip = false;
       }

From 95b64d1a1c8004aab0f9e9ea39a0c48689d4e028 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 27 Nov 2017 11:23:17 +0100
Subject: [PATCH 3592/4742] Fix es6-ism in addon

---
 addon/tern/tern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 70202c6fc5..6276b53893 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -614,7 +614,7 @@
     var mouseOnTip = false, old = false;
     CodeMirror.on(tip, "mousemove", function() { mouseOnTip = true; });
     CodeMirror.on(tip, "mouseout", function(e) {
-      let related = e.relatedTarget || e.toElement
+      var related = e.relatedTarget || e.toElement
       if (!related || !CodeMirror.contains(tip, related)) {
         if (old) clear();
         else mouseOnTip = false;

From 8bb35c475f0dfc05c4b2617e778fed1acf3f3a68 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 1 Dec 2017 10:24:21 +0100
Subject: [PATCH 3593/4742] [lint addon] Wrap display updates in an operation

Closes #5106
---
 addon/lint/lint.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index a9eb8fa66b..e00e77a20c 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -132,7 +132,7 @@
       cm.off("change", abort)
       if (state.waitingFor != id) return
       if (arg2 && annotations instanceof CodeMirror) annotations = arg2
-      updateLinting(cm, annotations)
+      cm.operation(function() {updateLinting(cm, annotations)})
     }, passOptions, cm);
   }
 
@@ -151,9 +151,9 @@
       var annotations = getAnnotations(cm.getValue(), passOptions, cm);
       if (!annotations) return;
       if (annotations.then) annotations.then(function(issues) {
-        updateLinting(cm, issues);
+        cm.operation(function() {updateLinting(cm, issues)})
       });
-      else updateLinting(cm, annotations);
+      else cm.operation(function() {updateLinting(cm, annotations)})
     }
   }
 

From b1bf7b3ad53941dc81351de2a28896daf293d739 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Fri, 1 Dec 2017 06:01:55 +0300
Subject: [PATCH 3594/4742] [css mode] Case-insensitive parsing of grammar
 tokens

as per https://www.w3.org/TR/css-syntax-3/#rule-defs
---
 mode/css/css.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 00e9b3df13..f5f3a41ba8 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -77,9 +77,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return ret("qualifier", "qualifier");
     } else if (/[:;{}\[\]\(\)]/.test(ch)) {
       return ret(null, ch);
-    } else if ((ch == "u" && stream.match(/rl(-prefix)?\(/)) ||
-               (ch == "d" && stream.match("omain(")) ||
-               (ch == "r" && stream.match("egexp("))) {
+    } else if (((ch == "u" || ch == "U") && stream.match(/rl(-prefix)?\(/i)) ||
+               ((ch == "d" || ch == "D") && stream.match("omain(", true, true)) ||
+               ((ch == "r" || ch == "R") && stream.match("egexp(", true, true))) {
       stream.backUp(1);
       state.tokenize = tokenParenthesized;
       return ret("property", "word");
@@ -162,16 +162,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return pushContext(state, stream, "block");
     } else if (type == "}" && state.context.prev) {
       return popContext(state);
-    } else if (supportsAtComponent && /@component/.test(type)) {
+    } else if (supportsAtComponent && /@component/i.test(type)) {
       return pushContext(state, stream, "atComponentBlock");
-    } else if (/^@(-moz-)?document$/.test(type)) {
+    } else if (/^@(-moz-)?document$/i.test(type)) {
       return pushContext(state, stream, "documentTypes");
-    } else if (/^@(media|supports|(-moz-)?document|import)$/.test(type)) {
+    } else if (/^@(media|supports|(-moz-)?document|import)$/i.test(type)) {
       return pushContext(state, stream, "atBlock");
-    } else if (/^@(font-face|counter-style)/.test(type)) {
+    } else if (/^@(font-face|counter-style)/i.test(type)) {
       state.stateArg = type;
       return "restricted_atBlock_before";
-    } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
+    } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/i.test(type)) {
       return "keyframes";
     } else if (type && type.charAt(0) == "@") {
       return pushContext(state, stream, "at");
@@ -793,7 +793,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;
+        if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/i, false)) return false;
         stream.eatWhile(/[\w\\\-]/);
         if (stream.match(/^\s*:/, false))
           return ["variable-2", "variable-definition"];

From 74e7447cf72205189e01eefced32fd2f2a7c79b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 1 Dec 2017 10:45:55 +0100
Subject: [PATCH 3595/4742] [css mode] Add a test for an upper-case @-block

Issue #5107
---
 mode/css/test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/css/test.js b/mode/css/test.js
index 6fc6e33ca5..e5c55d3999 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -24,6 +24,9 @@
   MT("atMediaUnknownFeatureValueKeyword",
      "[def @media] ([property orientation]: [error upsidedown]) { }");
 
+  MT("atMediaUppercase",
+     "[def @MEDIA] ([property orienTAtion]: [keyword landScape]) { }");
+
   MT("tagSelector",
      "[tag foo] { }");
 

From c7853a989c77bb9f520c9c530cbe1497856e96fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 3 Dec 2017 12:00:32 +0100
Subject: [PATCH 3596/4742] [continuelist addon] Fix handling of unordered
 lists

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

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 30893965fe..b83dc505ff 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -39,13 +39,11 @@
         replacements[i] = "\n";
       } else {
         var indent = match[1], after = match[5];
-        var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0
-          ? match[2].replace("x", " ")
-          : (parseInt(match[3], 10) + 1) + match[4];
-
+        var numbered = !(unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0);
+        var bullet = numbered ? (parseInt(match[3], 10) + 1) + match[4] : match[2].replace("x", " ");
         replacements[i] = "\n" + indent + bullet + after;
 
-        incrementRemainingMarkdownListNumbers(cm, pos);
+        if (numbered) incrementRemainingMarkdownListNumbers(cm, pos);
       }
     }
 

From 6353583cdf780aaa74d9afd88df404b34a4c31ad Mon Sep 17 00:00:00 2001
From: Stephane Moore <stephane.moore@gmail.com>
Date: Mon, 4 Dec 2017 16:56:18 -0800
Subject: [PATCH 3597/4742] =?UTF-8?q?[languages]=20Fix=20the=20name=20of?=
 =?UTF-8?q?=20Objective-C=20=F0=9F=93=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The language is named "Objective-C" rather than "Objective C".

Reference:
https://en.wikipedia.org/wiki/Objective-C
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index 34da269f33..91a925268e 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -94,7 +94,7 @@
     {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
     {name: "NTriples", mimes: ["application/n-triples", "application/n-quads", "text/n-triples"],
      mode: "ntriples", ext: ["nt", "nq"]},
-    {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
+    {name: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
     {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},

From 04d39f236a541104c3fccdfdf6ea164d6e4c74e7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 5 Dec 2017 10:03:37 +0100
Subject: [PATCH 3598/4742] [htmlembedded mode] Support %-style comments

Closes #5102
---
 mode/htmlembedded/htmlembedded.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index 464dc57f83..8099d370be 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -14,7 +14,16 @@
   "use strict";
 
   CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
+    var closeComment = parserConfig.closeComment || "--%>"
     return CodeMirror.multiplexingMode(CodeMirror.getMode(config, "htmlmixed"), {
+      open: parserConfig.openComment || "<%--",
+      close: closeComment,
+      delimStyle: "comment",
+      mode: {token: function(stream) {
+        stream.skipTo(closeComment) || stream.skipToEnd()
+        return "comment"
+      }}
+    }, {
       open: parserConfig.open || parserConfig.scriptStartRegex || "<%",
       close: parserConfig.close || parserConfig.scriptEndRegex || "%>",
       mode: CodeMirror.getMode(config, parserConfig.scriptingModeSpec)

From 7e480de547d7b87690c654522d603d7aa213e64b Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Tue, 5 Dec 2017 22:43:37 +0100
Subject: [PATCH 3599/4742] [vim] Support more bases for increment and
 decrement

Closes #5110.
---
 keymap/vim.js    |  21 ++--
 test/vim_test.js | 246 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 260 insertions(+), 7 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 7cf5a956e0..b082268183 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2637,25 +2637,32 @@
       incrementNumberToken: function(cm, actionArgs) {
         var cur = cm.getCursor();
         var lineStr = cm.getLine(cur.line);
-        var re = /-?\d+/g;
+        var re = /(-?)(?:(0x)([\da-f]+)|(0b|0|)(\d+))/gi;
         var match;
         var start;
         var end;
         var numberStr;
-        var token;
         while ((match = re.exec(lineStr)) !== null) {
-          token = match[0];
           start = match.index;
-          end = start + token.length;
+          end = start + match[0].length;
           if (cur.ch < end)break;
         }
         if (!actionArgs.backtrack && (end <= cur.ch))return;
-        if (token) {
+        if (match) {
+          var baseStr = match[2] || match[4]
+          var digits = match[3] || match[5]
           var increment = actionArgs.increase ? 1 : -1;
-          var number = parseInt(token) + (increment * actionArgs.repeat);
+          var base = {'0b': 2, '0': 8, '': 10, '0x': 16}[baseStr.toLowerCase()];
+          var number = parseInt(match[1] + digits, base) + (increment * actionArgs.repeat);
+          numberStr = number.toString(base);
+          var zeroPadding = baseStr ? new Array(digits.length - numberStr.length + 1 + match[1].length).join('0') : ''
+          if (numberStr.charAt(0) === '-') {
+            numberStr = '-' + baseStr + zeroPadding + numberStr.substr(1);
+          } else {
+            numberStr = baseStr + zeroPadding + numberStr;
+          }
           var from = Pos(cur.line, start);
           var to = Pos(cur.line, end);
-          numberStr = number.toString();
           cm.replaceRange(numberStr, from, to);
         } else {
           return;
diff --git a/test/vim_test.js b/test/vim_test.js
index 18268ee789..5a42b90fa8 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4235,4 +4235,250 @@ testVim('beforeSelectionChange', function(cm, vim, helpers) {
   eqCursorPos(cm.getCursor('head'), cm.getCursor('anchor'));
 }, { value: 'abc' });
 
+testVim('increment_binary', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('<C-a>');
+  eq('0b001', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0b010', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0b001', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0b000', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-a>');
+  eq('0b001', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0b010', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0b001', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0b000', cm.getValue());
+}, { value: '0b000' });
+
+testVim('increment_octal', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('<C-a>');
+  eq('001', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('002', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('003', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('004', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('005', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('006', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('007', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('010', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('007', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('006', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('005', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('004', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('003', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('002', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('001', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('000', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-a>');
+  eq('001', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('002', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('001', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('000', cm.getValue());
+}, { value: '000' });
+
+testVim('increment_decimal', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('<C-a>');
+  eq('101', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('102', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('103', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('104', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('105', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('106', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('107', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('108', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('109', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('110', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('109', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('108', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('107', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('106', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('105', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('104', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('103', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('102', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('101', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('100', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-a>');
+  eq('101', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('102', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('101', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('100', cm.getValue());
+}, { value: '100' });
+
+testVim('increment_decimal_single_zero', function(cm, vim, helpers) {
+  helpers.doKeys('<C-a>');
+  eq('1', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('2', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('3', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('4', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('5', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('6', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('7', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('8', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('9', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('10', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('9', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('8', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('7', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('6', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('5', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('4', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('3', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('2', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('1', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-a>');
+  eq('1', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('2', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('1', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0', cm.getValue());
+}, { value: '0' });
 
+testVim('increment_hexadecimal', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('<C-a>');
+  eq('0x1', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x2', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x3', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x4', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x5', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x6', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x7', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x8', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x9', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0xa', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0xb', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0xc', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0xd', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0xe', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0xf', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x10', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x0f', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x0e', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x0d', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x0c', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x0b', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x0a', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x09', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x08', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x07', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x06', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x05', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x04', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x03', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x02', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x01', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x00', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('<C-a>');
+  eq('0x01', cm.getValue());
+  helpers.doKeys('<C-a>');
+  eq('0x02', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x01', cm.getValue());
+  helpers.doKeys('<C-x>');
+  eq('0x00', cm.getValue());
+}, { value: '0x0' });

From a4a75b1c7c1ab4733df852eaba303cd47d46ec2e Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 6 Dec 2017 19:47:02 +0100
Subject: [PATCH 3600/4742] Escape all occurences of & and < in mode test
 output

---
 test/mode_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/mode_test.js b/test/mode_test.js
index 9773f80126..f4c4dbfe0c 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -67,7 +67,7 @@
   };
 
   function esc(str) {
-    return str.replace('&', '&amp;').replace('<', '&lt;').replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+    return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
   }
 
   function compare(text, expected, mode) {

From 7cefd7dacb53b71f6cfe14479a4f3fb4fa0c92b3 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Wed, 6 Dec 2017 19:46:20 +0100
Subject: [PATCH 3601/4742] [jsx mode] Add support for JSXFragments

Closes #5101.
---
 mode/jsx/jsx.js  | 2 +-
 mode/jsx/test.js | 3 +++
 mode/xml/xml.js  | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 45c3024aba..039e37bb5e 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -26,7 +26,7 @@
   }
 
   CodeMirror.defineMode("jsx", function(config, modeConfig) {
-    var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true, multilineTagIndentPastTag: false})
+    var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true, multilineTagIndentPastTag: false, allowMissingTagName: true})
     var jsMode = CodeMirror.getMode(config, modeConfig && modeConfig.base || "javascript")
 
     function flatXMLIndent(state) {
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index 61f84ebe82..891f98830d 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -11,6 +11,9 @@
   MT("openclose",
      "([bracket&tag <][tag foo][bracket&tag >]hello [atom &amp;][bracket&tag </][tag foo][bracket&tag >][operator ++])")
 
+  MT("openclosefragment",
+     "([bracket&tag <><][tag foo][bracket&tag >]hello [atom &amp;][bracket&tag </][tag foo][bracket&tag ></>][operator ++])")
+
   MT("attr",
      "([bracket&tag <][tag foo] [attribute abc]=[string 'value'][bracket&tag >]hello [atom &amp;][bracket&tag </][tag foo][bracket&tag >][operator ++])")
 
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index f987a3a3ce..0f1c9b175e 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -52,6 +52,7 @@ var xmlConfig = {
   doNotIndent: {},
   allowUnquoted: false,
   allowMissing: false,
+  allowMissingTagName: false,
   caseFold: false
 }
 
@@ -226,6 +227,9 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
       state.tagName = stream.current();
       setStyle = "tag";
       return attrState;
+    } else if (config.allowMissingTagName && type == "endTag") {
+      setStyle = "tag bracket";
+      return attrState(type, stream, state);
     } else {
       setStyle = "error";
       return tagNameState;
@@ -244,6 +248,9 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
         setStyle = "tag error";
         return closeStateErr;
       }
+    } else if (config.allowMissingTagName && type == "endTag") {
+      setStyle = "tag bracket";
+      return closeState(type, stream, state);
     } else {
       setStyle = "error";
       return closeStateErr;

From 32f63fc31de851699f5189d7701e0c06a2520b00 Mon Sep 17 00:00:00 2001
From: Cristian Prieto <me@cprieto.com>
Date: Wed, 6 Dec 2017 16:14:49 +0100
Subject: [PATCH 3602/4742] [mllike mode] Improve OCaml support

 * Add reserved words for OCaml
 * Add {| |} string literal type
 * Add support for binary numbers
 * Add support for hex number literals
 * Add support for floats
 * Add octal and long integer literals
---
 mode/mllike/index.html | 19 ++++++++++++++++++
 mode/mllike/mllike.js  | 44 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/mode/mllike/index.html b/mode/mllike/index.html
index 5923af8f87..b1ed6c7d78 100644
--- a/mode/mllike/index.html
+++ b/mode/mllike/index.html
@@ -132,6 +132,25 @@ <h2>OCaml mode</h2>
 
 (* A Hundred Lines of Caml - http://caml.inria.fr/about/taste.en.html *)
 (* OCaml page on Wikipedia - http://en.wikipedia.org/wiki/OCaml *)
+
+module type S = sig type t end
+
+let x = {| 
+  this is a long string 
+  with many lines and stuff
+  |}
+
+let b = 0b00110
+let h = 0x123abcd
+let e = 1e-10
+let i = 1.
+let x = 30_000
+let o = 0o1234
+
+[1; 2; 3] (* lists *)
+
+1 @ 2
+1. +. 2.
 </textarea>
 
 <h2>F# mode</h2>
diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 4d0be609c4..90e5b41a63 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -54,6 +54,13 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
       state.tokenize = tokenString;
       return state.tokenize(stream, state);
     }
+    if (ch === '{') {
+      if (stream.eat('|')) {
+        state.longString = true;
+        state.tokenize = tokenLongString;
+        return state.tokenize(stream, state);
+      }
+    }
     if (ch === '(') {
       if (stream.eat('*')) {
         state.commentLevel++;
@@ -74,13 +81,24 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
       return 'comment';
     }
     if (/\d/.test(ch)) {
-      stream.eatWhile(/[\d]/);
-      if (stream.eat('.')) {
-        stream.eatWhile(/[\d]/);
+      if (ch === '0' && stream.eat(/[bB]/)) {
+        stream.eatWhile(/[01]/);
+      } if (ch === '0' && stream.eat(/[xX]/)) {
+        stream.eatWhile(/[0-9a-fA-F]/)
+      } if (ch === '0' && stream.eat(/[oO]/)) {
+        stream.eatWhile(/[0-7]/);
+      } else {
+        stream.eatWhile(/[\d_]/);
+        if (stream.eat('.')) {
+          stream.eatWhile(/[\d]/);
+        }
+        if (stream.eat(/[eE]/)) {
+          stream.eatWhile(/[\d\-+]/);
+        }
       }
       return 'number';
     }
-    if ( /[+\-*&%=<>!?|]/.test(ch)) {
+    if ( /[+\-*&%=<>!?|@]/.test(ch)) {
       return 'operator';
     }
     if (/[\w\xa1-\uffff]/.test(ch)) {
@@ -119,8 +137,20 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
     return 'comment';
   }
 
+  function tokenLongString(stream, state) {
+    var prev, next;
+    while (state.longString && (next = stream.next()) != null) {
+      if (prev === '|' && next === '}') state.longString = false;
+      prev = next;
+    }
+    if (!state.longString) {
+      state.tokenize = tokenBase;
+    }
+    return 'string';
+  }
+
   return {
-    startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
+    startState: function() {return {tokenize: tokenBase, commentLevel: 0, longString: false};},
     token: function(stream, state) {
       if (stream.eatSpace()) return null;
       return state.tokenize(stream, state);
@@ -142,7 +172,9 @@ CodeMirror.defineMIME('text/x-ocaml', {
     'print_endline': 'builtin',
     'true': 'atom',
     'false': 'atom',
-    'raise': 'keyword'
+    'raise': 'keyword',
+    'module': 'keyword',
+    'sig': 'keyword'
   }
 });
 

From ecad7206ef2458bcb22bcaf13263178e2bb3a0dc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 7 Dec 2017 12:03:15 +0100
Subject: [PATCH 3603/4742] Document lineSeparator argument do Doc constructor

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

diff --git a/doc/manual.html b/doc/manual.html
index ea5642cdf9..9d95e39c75 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1523,8 +1523,8 @@ <h3 id="api_doc">Document management methods</h3>
     represents the editor content, plus a selection, an undo history,
     and a <a href="#option_mode">mode</a>. A document can only be
     associated with a single editor at a time. You can create new
-    documents by calling the <code>CodeMirror.Doc(text, mode,
-    firstLineNumber)</code> constructor. The last two arguments are
+    documents by calling the <code>CodeMirror.Doc(text: string, mode: Object,
+    firstLineNumber: ?number, lineSeparator: ?string)</code> constructor. The last two arguments are
     optional and can be used to set a mode for the document and make
     it start at a line number other than 0, respectively.</p>
 

From c05c5956ef5ed327cfdb32d23a92c6786b6ac629 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 8 Dec 2017 09:56:44 +0100
Subject: [PATCH 3604/4742] Fix documentation of Doc constructor

Issue #5112
---
 doc/manual.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 9d95e39c75..5500b9904b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1523,10 +1523,11 @@ <h3 id="api_doc">Document management methods</h3>
     represents the editor content, plus a selection, an undo history,
     and a <a href="#option_mode">mode</a>. A document can only be
     associated with a single editor at a time. You can create new
-    documents by calling the <code>CodeMirror.Doc(text: string, mode: Object,
-    firstLineNumber: ?number, lineSeparator: ?string)</code> constructor. The last two arguments are
-    optional and can be used to set a mode for the document and make
-    it start at a line number other than 0, respectively.</p>
+    documents by calling the <code>CodeMirror.Doc(text: string, mode:
+    Object, firstLineNumber: ?number, lineSeparator: ?string)</code>
+    constructor. The last three arguments are optional and can be used
+    to set a mode for the document, make it start at a line number
+    other than 0, and set a specific line separator respectively.</p>
 
     <dl>
       <dt id="getDoc"><code><strong>cm.getDoc</strong>() → Doc</code></dt>

From a7e29eee89aed63727e46d1e422cfa95b1200859 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sun, 10 Dec 2017 20:57:37 +0100
Subject: [PATCH 3605/4742] [swift mode] Correctly highlight nested comments

---
 mode/swift/swift.js | 13 +++++++++++--
 mode/swift/test.js  |  7 +++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 43ab7c8fb4..1795d86e94 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -138,8 +138,17 @@
   }
 
   function tokenComment(stream, state) {
-    stream.match(/^(?:[^*]|\*(?!\/))*/)
-    if (stream.match("*/")) state.tokenize.pop()
+    var ch
+    while (true) {
+      stream.match(/^[^/*]+/, true)
+      ch = stream.next()
+      if (!ch) break
+      if (ch === "/" && stream.eat("*")) {
+        state.tokenize.push(tokenComment)
+      } else if (ch === "*" && stream.eat("/")) {
+        state.tokenize.pop()
+      }
+    }
     return "comment"
   }
 
diff --git a/mode/swift/test.js b/mode/swift/test.js
index 786b89e299..4091ac6f4c 100644
--- a/mode/swift/test.js
+++ b/mode/swift/test.js
@@ -142,6 +142,13 @@
      "[variable print][punctuation (][variable foo][property ._123][punctuation )]",
      "[variable print][punctuation (]")
 
+  MT("nested_comments",
+     "[comment /*]",
+     "[comment But wait /* this is a nested comment */ for real]",
+     "[comment /**** let * me * show * you ****/]",
+     "[comment ///// let / me / show / you /////]",
+     "[comment */]");
+
   // TODO: correctly identify when multiple variables are being declared
   // by use of a comma-separated list.
   // TODO: correctly identify when variables are being declared in a tuple.

From ff21fec1a71e9c5de3c9faec84c3c61eaef60104 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sun, 10 Dec 2017 21:08:36 +0100
Subject: [PATCH 3606/4742] [scala mode] Correctly highlight nested comments

The implementation is mostly copied from dart as implemented in
d4dbbcef22e3aadf25dad811a9faa988a50a0df4.
---
 mode/clike/clike.js | 27 +++++++++++++++++++++++++++
 mode/clike/test.js  | 10 ++++++++++
 2 files changed, 37 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index ff00cf5002..7706429063 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -489,6 +489,27 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return "string";
   }
 
+  function tokenNestedComment(depth) {
+    return function (stream, state) {
+      var ch
+      while (ch = stream.next()) {
+        if (ch == "*" && stream.eat("/")) {
+          if (depth == 1) {
+            state.tokenize = null
+            break
+          } else {
+            state.tokenize = tokenNestedComment(depth - 1)
+            return state.tokenize(stream, state)
+          }
+        } else if (ch == "/" && stream.eat("*")) {
+          state.tokenize = tokenNestedComment(depth + 1)
+          return state.tokenize(stream, state)
+        }
+      }
+      return "comment"
+    }
+  }
+
   def("text/x-scala", {
     name: "clike",
     keywords: words(
@@ -544,6 +565,12 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         } else {
           return false
         }
+      },
+
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false
+        state.tokenize = tokenNestedComment(1)
+        return state.tokenize(stream, state)
       }
     },
     modeProps: {closeBrackets: {triples: '"'}}
diff --git a/mode/clike/test.js b/mode/clike/test.js
index dad2e246ae..e3bde772a5 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -56,4 +56,14 @@
   MTCPP("ctor_dtor",
      "[def Foo::Foo]() {}",
      "[def Foo::~Foo]() {}");
+
+  var mode_scala = CodeMirror.getMode({indentUnit: 2}, "text/x-scala");
+  function MTSCALA(name) { test.mode("scala_" + name, mode_scala, Array.prototype.slice.call(arguments, 1)); }
+  MTSCALA("nested_comments",
+     "[comment /*]",
+     "[comment But wait /* this is a nested comment */ for real]",
+     "[comment /**** let * me * show * you ****/]",
+     "[comment ///// let / me / show / you /////]",
+     "[comment */]");
+
 })();

From edc74c3ef360132afc69b2f22d51f7c6a711c305 Mon Sep 17 00:00:00 2001
From: Lior Goldberg <liorgol@google.com>
Date: Thu, 7 Dec 2017 14:54:27 +0200
Subject: [PATCH 3607/4742] [sublime keymap] Support expanding brackets
 selection in selectBetweenBrackets

---
 keymap/sublime.js    | 12 +++++++++---
 test/sublime_test.js |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 08c9ebfb3f..37ae6fec27 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -183,9 +183,15 @@
         var closing = cm.scanForBracket(pos, 1);
         if (!closing) return false;
         if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) {
-          newRanges.push({anchor: Pos(opening.pos.line, opening.pos.ch + 1),
-                          head: closing.pos});
-          break;
+          var startPos = Pos(opening.pos.line, opening.pos.ch + 1);
+          if (CodeMirror.cmpPos(startPos, range.from()) == 0 &&
+              CodeMirror.cmpPos(closing.pos, range.to()) == 0) {
+            opening = cm.scanForBracket(opening.pos, -1);
+            if (!opening) return false;
+          } else {
+            newRanges.push({anchor: startPos, head: closing.pos});
+            break;
+          }
         }
         pos = Pos(closing.pos.line, closing.pos.ch + 1);
       }
diff --git a/test/sublime_test.js b/test/sublime_test.js
index e9cd342ff4..27132d16a7 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -152,7 +152,9 @@
          Pos(0, 8), "selectScope", hasSel(0, 8, 2, 0),
          Pos(1, 2), "selectScope", hasSel(0, 8, 2, 0),
          Pos(1, 6), "selectScope", hasSel(1, 6, 1, 10),
-         Pos(1, 9), "selectScope", hasSel(1, 6, 1, 10));
+         Pos(1, 9), "selectScope", hasSel(1, 6, 1, 10),
+         "selectScope", hasSel(0, 8, 2, 0),
+         "selectScope", hasSel(0, 0, 2, 1));
 
   stTest("goToBracket", "foo(a) {\n  bar[1, 2];\n}",
          Pos(0, 0), "goToBracket", at(0, 0),

From b3cdfee46a320e646a298141861b4e80dc6f1bd0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Dec 2017 22:16:41 +0100
Subject: [PATCH 3608/4742] Drop bin/compress

Leave compression up to people's own custom build setups

Closes #5127
---
 bin/compress | 92 ----------------------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100755 bin/compress

diff --git a/bin/compress b/bin/compress
deleted file mode 100755
index d358f9c3a0..0000000000
--- a/bin/compress
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env node
-
-// Compression helper for CodeMirror
-//
-// Example:
-//
-//   bin/compress codemirror runmode javascript xml
-//
-// Will take lib/codemirror.js, addon/runmode/runmode.js,
-// mode/javascript/javascript.js, and mode/xml/xml.js, run them though
-// the online minifier at http://marijnhaverbeke.nl/uglifyjs, and spit
-// out the result.
-//
-//   bin/compress codemirror --local /path/to/bin/UglifyJS
-//
-// Will use a local minifier instead of the online default one.
-//
-// Script files are specified without .js ending. Prefixing them with
-// their full (local) path is optional. So you may say lib/codemirror
-// or mode/xml/xml to be more precise. In fact, even the .js suffix
-// may be specified, if wanted.
-
-"use strict";
-
-var fs = require("fs");
-
-function help(ok) {
-  console.log("usage: " + process.argv[1] + " [--local /path/to/uglifyjs] files...");
-  process.exit(ok ? 0 : 1);
-}
-
-var local = null, args = [], extraArgs = null, files = [], blob = "";
-
-for (var i = 2; i < process.argv.length; ++i) {
-  var arg = process.argv[i];
-  if (arg == "--local" && i + 1 < process.argv.length) {
-    var parts = process.argv[++i].split(/\s+/);
-    local = parts[0];
-    extraArgs = parts.slice(1);
-    if (!extraArgs.length) extraArgs = ["-c", "-m"];
-  } else if (arg == "--help") {
-    help(true);
-  } else if (arg[0] != "-") {
-    files.push({name: arg, re: new RegExp("(?:\\/|^)" + arg + (/\.js$/.test(arg) ? "$" : "\\.js$"))});
-  } else help(false);
-}
-
-function walk(dir) {
-  fs.readdirSync(dir).forEach(function(fname) {
-    if (/^[_\.]/.test(fname)) return;
-    var file = dir + fname;
-    if (fs.statSync(file).isDirectory()) return walk(file + "/");
-    if (files.some(function(spec, i) {
-      var match = spec.re.test(file);
-      if (match) files.splice(i, 1);
-      return match;
-    })) {
-      if (local) args.push(file);
-      else blob += fs.readFileSync(file, "utf8");
-    }
-  });
-}
-
-walk("lib/");
-walk("addon/");
-walk("mode/");
-
-if (!local && !blob) help(false);
-
-if (files.length) {
-  console.log("Some specified files were not found: " +
-              files.map(function(a){return a.name;}).join(", "));
-  process.exit(1);
-}
-  
-if (local) {
-  require("child_process").spawn(local, args.concat(extraArgs), {stdio: ["ignore", process.stdout, process.stderr]});
-} else {
-  var data = new Buffer("js_code=" + require("querystring").escape(blob), "utf8");
-  var req = require("http").request({
-    host: "marijnhaverbeke.nl",
-    port: 80,
-    method: "POST",
-    path: "/uglifyjs",
-    headers: {"content-type": "application/x-www-form-urlencoded",
-              "content-length": data.length}
-  });
-  req.on("response", function(resp) {
-    resp.on("data", function (chunk) { process.stdout.write(chunk); });
-  });
-  req.end(data);
-}

From d9f05c90a1f6e07faf4ec3cf239621f1cce44f32 Mon Sep 17 00:00:00 2001
From: Sorab Bisht <sobisht@adobe.com>
Date: Mon, 11 Dec 2017 19:44:15 +0530
Subject: [PATCH 3609/4742] [closetag addon] Add an option to disable auto
 indenting

---
 addon/edit/closetag.js | 16 +++++++++++-----
 src/edit/options.js    |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index a518da3ec1..83f133a5e7 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -53,13 +53,14 @@
   function autoCloseGT(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
     var ranges = cm.listSelections(), replacements = [];
+    var opt = cm.getOption("autoCloseTags");
     for (var i = 0; i < ranges.length; i++) {
       if (!ranges[i].empty()) return CodeMirror.Pass;
       var pos = ranges[i].head, tok = cm.getTokenAt(pos);
       var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
       if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
 
-      var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
+      var html = inner.mode.configuration == "html";
       var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
       var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
 
@@ -81,13 +82,14 @@
                          newPos: indent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1)};
     }
 
+    var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnAutoClose);
     for (var i = ranges.length - 1; i >= 0; i--) {
       var info = replacements[i];
       cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, "+insert");
       var sel = cm.listSelections().slice(0);
       sel[i] = {head: info.newPos, anchor: info.newPos};
       cm.setSelections(sel);
-      if (info.indent) {
+      if (!dontIndentOnAutoClose && info.indent) {
         cm.indentLine(info.newPos.line, null, true);
         cm.indentLine(info.newPos.line + 1, null, true);
       }
@@ -97,6 +99,8 @@
   function autoCloseCurrent(cm, typingSlash) {
     var ranges = cm.listSelections(), replacements = [];
     var head = typingSlash ? "/" : "</";
+    var opt = cm.getOption("autoCloseTags");
+    var dontIndentOnAutoClose = (typeof opt == "object" && opt.dontIndentOnSlash);
     for (var i = 0; i < ranges.length; i++) {
       if (!ranges[i].empty()) return CodeMirror.Pass;
       var pos = ranges[i].head, tok = cm.getTokenAt(pos);
@@ -127,9 +131,11 @@
     }
     cm.replaceSelections(replacements);
     ranges = cm.listSelections();
-    for (var i = 0; i < ranges.length; i++)
-      if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
-        cm.indentLine(ranges[i].head.line);
+    if (!dontIndentOnAutoClose) {
+        for (var i = 0; i < ranges.length; i++)
+            if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
+                cm.indentLine(ranges[i].head.line);
+    }
   }
 
   function autoCloseSlash(cm) {
diff --git a/src/edit/options.js b/src/edit/options.js
index 28f8bb60c6..49cf10112b 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -52,6 +52,7 @@ export function defineOptions(CodeMirror) {
     clearCaches(cm)
     regChange(cm)
   }, true)
+
   option("lineSeparator", null, (cm, val) => {
     cm.doc.lineSep = val
     if (!val) return

From 56c271ff88efbf3726a4f0fa0a131942ebf804ff Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 16 Dec 2017 18:47:06 +0100
Subject: [PATCH 3610/4742] [javascript mode] Stop treating TS contextual
 keywords as regular keywords

Closes #5133
---
 mode/javascript/javascript.js | 68 +++++++++++++----------------------
 1 file changed, 25 insertions(+), 43 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 514de1c8da..edab99f3d7 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -26,7 +26,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"), D = kw("keyword d");
     var operator = kw("operator"), atom = {type: "atom", style: "atom"};
 
-    var jsKeywords = {
+    return {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
       "return": D, "break": D, "continue": D, "new": kw("new"), "delete": C, "void": C, "throw": C,
       "debugger": kw("debugger"), "var": kw("var"), "const": kw("var"), "let": kw("var"),
@@ -38,33 +38,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
       "await": C
     };
-
-    // Extend the 'normal' keywords with the TypeScript language extensions
-    if (isTS) {
-      var type = {type: "variable", style: "type"};
-      var tsKeywords = {
-        // object-like things
-        "interface": kw("class"),
-        "implements": C,
-        "namespace": C,
-
-        // scope modifiers
-        "public": kw("modifier"),
-        "private": kw("modifier"),
-        "protected": kw("modifier"),
-        "abstract": kw("modifier"),
-        "readonly": kw("modifier"),
-
-        // types
-        "string": type, "number": type, "boolean": type, "any": type
-      };
-
-      for (var attr in tsKeywords) {
-        jsKeywords[attr] = tsKeywords[attr];
-      }
-    }
-
-    return jsKeywords;
   }();
 
   var isOperatorChar = /[+\-*&%=<>!?|~^@]/;
@@ -310,6 +283,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
   }
 
+  function isModifier(name) {
+    return name == "public" || name == "private" || name == "protected" || name == "abstract" || name == "readonly"
+  }
+
   // Combinators
 
   var defaultVars = {name: "this", next: {name: "arguments"}};
@@ -366,6 +343,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     if (type == "function") return cont(functiondef);
     if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
+    if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), className, poplex); }
     if (type == "variable") {
       if (isTS && value == "type") {
         cx.marked = "keyword"
@@ -376,6 +354,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (isTS && (value == "module" || value == "enum") && cx.stream.match(/^\s*\w/, false)) {
         cx.marked = "keyword"
         return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
+      } else if (isTS && value == "namespace") {
+        cx.marked = "keyword"
+        return cont(pushlex("form"), expression, block, poplex)
       } else {
         return cont(pushlex("stat"), maybelabel);
       }
@@ -386,24 +367,23 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "default") return cont(expect(":"));
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
                                      statement, poplex, popcontext);
-    if (type == "class") return cont(pushlex("form"), className, poplex);
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
     if (type == "async") return cont(statement)
     if (value == "@") return cont(expression, statement)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
-  function expression(type) {
-    return expressionInner(type, false);
+  function expression(type, value) {
+    return expressionInner(type, value, false);
   }
-  function expressionNoComma(type) {
-    return expressionInner(type, true);
+  function expressionNoComma(type, value) {
+    return expressionInner(type, value, true);
   }
   function parenExpr(type) {
     if (type != "(") return pass()
     return cont(pushlex(")"), expression, expect(")"), poplex)
   }
-  function expressionInner(type, noComma) {
+  function expressionInner(type, value, noComma) {
     if (cx.state.fatArrowAt == cx.stream.start) {
       var body = noComma ? arrowBodyNoComma : arrowBody;
       if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, expect("=>"), body, popcontext);
@@ -413,7 +393,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
     if (type == "function") return cont(functiondef, maybeop);
-    if (type == "class") return cont(pushlex("form"), classExpression, poplex);
+    if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), classExpression, poplex); }
     if (type == "keyword c" || type == "async") return cont(noComma ? expressionNoComma : expression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
@@ -511,10 +491,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(afterprop);
     } else if (type == "jsonld-keyword") {
       return cont(afterprop);
-    } else if (type == "modifier") {
+    } else if (isTS && isModifier(value)) {
+      cx.marked = "keyword"
       return cont(objprop)
     } else if (type == "[") {
-      return cont(expression, expect("]"), afterprop);
+      return cont(expression, maybetype, expect("]"), afterprop);
     } else if (type == "spread") {
       return cont(expressionNoComma, afterprop);
     } else if (value == "*") {
@@ -616,7 +597,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
     if (value == "|" || type == ".") return cont(typeexpr)
     if (type == "[") return cont(expect("]"), afterType)
-    if (value == "extends") return cont(typeexpr)
+    if (value == "extends" || value == "implements") { cx.marked = "keyword"; return cont(typeexpr) }
   }
   function maybeTypeArgs(_, value) {
     if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
@@ -631,7 +612,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(pattern, maybetype, maybeAssign, vardefCont);
   }
   function pattern(type, value) {
-    if (type == "modifier") return cont(pattern)
+    if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(pattern) }
     if (type == "variable") { register(value); return cont(); }
     if (type == "spread") return cont(pattern);
     if (type == "[") return contCommasep(pattern, "]");
@@ -685,7 +666,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function funarg(type, value) {
     if (value == "@") cont(expression, funarg)
-    if (type == "spread" || type == "modifier") return cont(funarg);
+    if (type == "spread") return cont(funarg);
+    if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(funarg); }
     return pass(pattern, maybetype, maybeAssign);
   }
   function classExpression(type, value) {
@@ -703,9 +685,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "{") return cont(pushlex("}"), classBody, poplex);
   }
   function classBody(type, value) {
-    if (type == "modifier" || type == "async" ||
+    if (type == "async" ||
         (type == "variable" &&
-         (value == "static" || value == "get" || value == "set") &&
+         (value == "static" || value == "get" || value == "set" || (isTS && isModifier(value))) &&
          cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false))) {
       cx.marked = "keyword";
       return cont(classBody);
@@ -715,7 +697,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(isTS ? classfield : functiondef, classBody);
     }
     if (type == "[")
-      return cont(expression, expect("]"), isTS ? classfield : functiondef, classBody)
+      return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
     if (value == "*") {
       cx.marked = "keyword";
       return cont(classBody);

From 9e3665211ac2427b55acf8006bd7f783a640f16b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Dec 2017 10:22:33 +0100
Subject: [PATCH 3611/4742] Use a different way to force line widget margins to
 stay inside container

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

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 8f4f22f5d6..c7a8ae7047 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -270,7 +270,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 .CodeMirror-linewidget {
   position: relative;
   z-index: 2;
-  overflow: auto;
+  padding: 0.1px; /* Force widget margins to stay inside of the container */
 }
 
 .CodeMirror-widget {}

From 40570ddc5ba1410c7bf2c38f1b1e8ac6a502fa2f Mon Sep 17 00:00:00 2001
From: Tobias Bertelsen <tobias.bertelsen@gmail.com>
Date: Wed, 6 Dec 2017 22:52:31 +0100
Subject: [PATCH 3612/4742] [sublime keymap] Fixing hotkeys for
 addCursorTo(Prev|Next)Line

Fix for issue #5109
---
 keymap/sublime.js    | 33 ++++-----------------------------
 test/sublime_test.js | 25 -------------------------
 2 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 37ae6fec27..5925b7c51f 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -514,27 +514,6 @@
     cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
   };
 
-  cmds.selectLinesUpward = function(cm) {
-    cm.operation(function() {
-      var ranges = cm.listSelections();
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (range.head.line > cm.firstLine())
-          cm.addSelection(Pos(range.head.line - 1, range.head.ch));
-      }
-    });
-  };
-  cmds.selectLinesDownward = function(cm) {
-    cm.operation(function() {
-      var ranges = cm.listSelections();
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (range.head.line < cm.lastLine())
-          cm.addSelection(Pos(range.head.line + 1, range.head.ch));
-      }
-    });
-  };
-
   function getTarget(cm) {
     var from = cm.getCursor("from"), to = cm.getCursor("to");
     if (CodeMirror.cmpPos(from, to) == 0) {
@@ -596,8 +575,6 @@
     "Cmd-Enter": "insertLineAfter",
     "Shift-Cmd-Enter": "insertLineBefore",
     "Cmd-D": "selectNextOccurrence",
-    "Shift-Cmd-Up": "addCursorToPrevLine",
-    "Shift-Cmd-Down": "addCursorToNextLine",
     "Shift-Cmd-Space": "selectScope",
     "Shift-Cmd-M": "selectBetweenBrackets",
     "Cmd-M": "goToBracket",
@@ -627,8 +604,8 @@
     "Cmd-K Cmd-Backspace": "delLineLeft",
     "Cmd-K Cmd-0": "unfoldAll",
     "Cmd-K Cmd-J": "unfoldAll",
-    "Ctrl-Shift-Up": "selectLinesUpward",
-    "Ctrl-Shift-Down": "selectLinesDownward",
+    "Ctrl-Shift-Up": "addCursorToPrevLine",
+    "Ctrl-Shift-Down": "addCursorToNextLine",
     "Cmd-F3": "findUnder",
     "Shift-Cmd-F3": "findUnderPrevious",
     "Alt-F3": "findAllUnder",
@@ -658,8 +635,6 @@
     "Ctrl-Enter": "insertLineAfter",
     "Shift-Ctrl-Enter": "insertLineBefore",
     "Ctrl-D": "selectNextOccurrence",
-    "Alt-CtrlUp": "addCursorToPrevLine",
-    "Alt-CtrlDown": "addCursorToNextLine",
     "Shift-Ctrl-Space": "selectScope",
     "Shift-Ctrl-M": "selectBetweenBrackets",
     "Ctrl-M": "goToBracket",
@@ -689,8 +664,8 @@
     "Ctrl-K Ctrl-Backspace": "delLineLeft",
     "Ctrl-K Ctrl-0": "unfoldAll",
     "Ctrl-K Ctrl-J": "unfoldAll",
-    "Ctrl-Alt-Up": "selectLinesUpward",
-    "Ctrl-Alt-Down": "selectLinesDownward",
+    "Ctrl-Alt-Up": "addCursorToPrevLine",
+    "Ctrl-Alt-Down": "addCursorToNextLine",
     "Ctrl-F3": "findUnder",
     "Shift-Ctrl-F3": "findUnderPrevious",
     "Alt-F3": "findAllUnder",
diff --git a/test/sublime_test.js b/test/sublime_test.js
index 27132d16a7..09bb951247 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -221,31 +221,6 @@
                                                    2, 4, 2, 6,
                                                    2, 7, 2, 7));
 
-  stTest("selectLinesUpward", "123\n345\n789\n012",
-         setSel(0, 1, 0, 1,
-                1, 1, 1, 3,
-                2, 0, 2, 0,
-                3, 0, 3, 0),
-         "selectLinesUpward",
-         hasSel(0, 1, 0, 1,
-                0, 3, 0, 3,
-                1, 0, 1, 0,
-                1, 1, 1, 3,
-                2, 0, 2, 0,
-                3, 0, 3, 0));
-
-  stTest("selectLinesDownward", "123\n345\n789\n012",
-         setSel(0, 1, 0, 1,
-                1, 1, 1, 3,
-                2, 0, 2, 0,
-                3, 0, 3, 0),
-         "selectLinesDownward",
-         hasSel(0, 1, 0, 1,
-                1, 1, 1, 3,
-                2, 0, 2, 0,
-                2, 3, 2, 3,
-                3, 0, 3, 0));
-
   stTest("sortLines", "c\nb\na\nC\nB\nA",
          "sortLines", val("A\nB\nC\na\nb\nc"),
          "undo",

From 2f4fb8053021c01d1f246de2e663ac3719877610 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 21 Dec 2017 14:59:33 +0100
Subject: [PATCH 3613/4742] Mark version 5.33.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 22 ++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 13 +++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 65d8480893..47c79d1577 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -144,6 +144,7 @@ CodeBitt
 coderaiser
 Cole R Lawrence
 ComFreek
+Cristian Prieto
 Curtis Gagliardi
 dagsta
 daines
@@ -385,6 +386,7 @@ Leon Sorokin
 Leonya Khachaturov
 Liam Newman
 Libo Cannici
+Lior Goldberg
 LloydMilligan
 LM
 lochel
@@ -611,6 +613,7 @@ sinkuu
 snasa
 soliton4
 sonson
+Sorab Bisht
 spastorelli
 srajanpaliwal
 Stanislav Oaserele
@@ -619,6 +622,7 @@ Stefan Borsje
 Steffen Beyer
 Steffen Bruchmann
 Steffen Kowalski
+Stephane Moore
 Stephen Lavelle
 Steve Champagne
 Steve Hoover
@@ -651,6 +655,7 @@ Tim Baumann
 Timothy Farrell
 Timothy Gu
 Timothy Hatcher
+Tobias Bertelsen
 TobiasBg
 Todd Berman
 Todd Kennedy
@@ -660,6 +665,7 @@ Tom Erik Støwer
 Tom Klancer
 Tom MacWright
 Tony Jian
+tophf
 Travis Heppe
 Triangle717
 Tristan Tarrant
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f81fcdd07b..855e6e4d9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 5.33.0 (2017-12-21)
+
+### Bug fixes
+
+[lint addon](http://codemirror.net/doc/manual.html#addon_lint): Make updates more efficient.
+
+[css mode](http://codemirror.net/mode/css/): The mode is now properly case-insensitive.
+
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Fix broken handling of unordered lists introduced in previous release.
+
+[swift](http://codemirror.net/mode/swift) and [scala](http://codemirror.net/mode/clike/) modes: Support nested block comments.
+
+[mllike mode](http://codemirror.net/mode/mllike/index.html): Improve OCaml support.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Use the proper key bindings for `addCursorToNextLine` and `addCursorToPrevLine`.
+
+### New features
+
+[jsx mode](http://codemirror.net/mode/jsx/index.html): Support JSX fragments.
+
+[closetag addon](http://codemirror.net/demo/closetag.html): Add an option to disable auto-indenting.
+
 ## 5.32.0 (2017-11-22)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 5500b9904b..37275fd9d7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.32.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.33.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 7fb8eebef1..4051a32c55 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-12-2017: <a href="http://codemirror.net/codemirror-5.33.0.zip">Version 5.33.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="http://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Make updates more efficient.</li>
+    <li><a href="http://codemirror.net/mode/css/">css mode</a>: The mode is now properly case-insensitive.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix broken handling of unordered lists introduced in previous release.</li>
+    <li><a href="http://codemirror.net/mode/swift">swift</a> and <a href="http://codemirror.net/mode/clike/">scala</a> modes: Support nested block comments.</li>
+    <li><a href="http://codemirror.net/mode/mllike/index.html">mllike mode</a>: Improve OCaml support.</li>
+    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Use the proper key bindings for <code>addCursorToNextLine</code> and <code>addCursorToPrevLine</code>.</li>
+    <li><a href="http://codemirror.net/mode/jsx/index.html">jsx mode</a>: Support JSX fragments.</li>
+    <li><a href="http://codemirror.net/demo/closetag.html">closetag addon</a>: Add an option to disable auto-indenting.</li>
+  </ul>
+
   <p class="rel">22-11-2017: <a href="http://codemirror.net/codemirror-5.32.0.zip">Version 5.32.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index d62ab84a39..1e4df9328a 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.32.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.33.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 3ffad1d5d1..9894b4f0d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.32.1",
+  "version": "5.33.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 260f7d0af5..a49a7c2f39 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.32.1"
+CodeMirror.version = "5.33.0"

From c727c997264451a11573ec121889bc76b071bfe2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 21 Dec 2017 15:01:04 +0100
Subject: [PATCH 3614/4742] Bump version number post-5.33.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 37275fd9d7..01721009d7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.33.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.33.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 9894b4f0d3..28a2925884 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.33.0",
+  "version": "5.33.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index a49a7c2f39..a12e4e3bb7 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.33.0"
+CodeMirror.version = "5.33.1"

From b36cf986c7288e6019d11338867a5730fee70b95 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Fri, 22 Dec 2017 10:32:36 +0300
Subject: [PATCH 3615/4742] [stylus mode] parse CSS4 hex colors - #RGBA and
 #RRGGBBAA

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

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index b83be16f42..a9f50c05d1 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -76,7 +76,7 @@
       if (ch == "#") {
         stream.next();
         // Hex color
-        if (stream.match(/^[0-9a-f]{6}|[0-9a-f]{3}/i)) {
+        if (stream.match(/^[0-9a-f]{3}([0-9a-f]([0-9a-f]{2}){0,2})?\b/i)) {
           return ["atom", "atom"];
         }
         // ID selector

From 9ed3674fbb8bb35726e73d63732b011cb4facf5f Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sun, 24 Dec 2017 12:10:50 +0300
Subject: [PATCH 3616/4742] Recognize ScrollLock and Pause with Ctrl modifier

---
 src/input/keymap.js   | 3 +++
 src/input/keynames.js | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/input/keymap.js b/src/input/keymap.js
index 1dfcf8aff6..63f18b58a9 100644
--- a/src/input/keymap.js
+++ b/src/input/keymap.js
@@ -137,6 +137,9 @@ export function keyName(event, noShift) {
   if (presto && event.keyCode == 34 && event["char"]) return false
   let name = keyNames[event.keyCode]
   if (name == null || event.altGraphKey) return false
+  // Ctrl-ScrollLock has keyCode 3, same as Ctrl-Pause,
+  // so we'll use event.code when available (Chrome 48+, FF 38+, Safari 10.1+)
+  if (event.keyCode == 3 && event.code) name = event.code
   return addModifierNames(name, event, noShift)
 }
 
diff --git a/src/input/keynames.js b/src/input/keynames.js
index 66bc80010c..9a61d152b8 100644
--- a/src/input/keynames.js
+++ b/src/input/keynames.js
@@ -1,9 +1,9 @@
 export let keyNames = {
-  3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+  3: "Pause", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
   19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
   36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
   46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
-  106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
+  106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete", 145: "ScrollLock",
   173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
   221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
   63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"

From d096403f470630c9019c4bf847aa8bab57ccc8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9lio?= <insign@gmail.com>
Date: Thu, 28 Dec 2017 18:18:16 -0300
Subject: [PATCH 3617/4742] [markdown mode] Support for the official mimetype
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

tl;dr: `text/markdown` since March 2016
---

In March 2016, `text/markdown` was registered as [RFC7763 at IETF](https://tools.ietf.org/html/rfc7763).

Previously, it should have been `text/x-markdown`. The text below describes the situation before March 2016, when RFC7763 was still a draft.

---

There is no official recommendation on [Gruber’s definition](http://daringfireball.net/projects/markdown/), but the topic was discussed quite heavily on the [official mailing-list](http://six.pairlist.net/pipermail/markdown-discuss/2007-June/thread.html#640), and reached the choice of `text/x-markdown`.

This conclusion was [challenged later](http://six.pairlist.net/pipermail/markdown-discuss/2008-February/000960.html), has been confirmed and can be, IMO, considered consensus.

This is the only logical conclusion in the lack of an official mime type: `text/` will provide proper default almost everywhere, `x-` because we're not using an official type, `markdown` and not `gruber.` or whatever because the type is now so common.

There are still [unknowns](http://six.pairlist.net/pipermail/markdown-discuss/2007-June/000652.html) regarding the different “flavors” of Markdown, though. I guess someone should register an official type, which is supposedly [easy](http://tools.ietf.org/html/rfc4288#section-3.4), but I doubt anyone dares do it beyond John Gruber, as he very recently [proved](http://blog.codinghorror.com/standard-markdown-is-now-common-markdown/) his attachment to Markdown.

There is a [draft](https://datatracker.ietf.org/doc/draft-ietf-appsawg-text-markdown/) on the IETF for `text/markdown`, but the contents do not seem to describe Markdown at all, so I wouldn't use it until it gets more complete.
---
 mode/markdown/markdown.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index b2f79fc302..60f1b30026 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -856,6 +856,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   return mode;
 }, "xml");
 
+CodeMirror.defineMIME("text/markdown", "markdown");
+
 CodeMirror.defineMIME("text/x-markdown", "markdown");
 
 });

From 865102a071e79ea2301bcb710f6051f593deddc9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 29 Dec 2017 13:18:43 +0100
Subject: [PATCH 3618/4742] [nginx mode] Fix documented mime type

Issue #5148
---
 mode/nginx/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index 03cf671498..dde54574d5 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html>
 <head>
 <title>CodeMirror: NGINX mode</title>
 <meta charset="utf-8"/>
@@ -176,6 +176,6 @@ <h2>NGINX mode</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
     </script>
 
-    <p><strong>MIME types defined:</strong> <code>text/nginx</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/x-nginx-conf</code>.</p>
 
   </article>

From b045bfa732c2ec44a66dde944dd9be1ef5da99df Mon Sep 17 00:00:00 2001
From: 4oo4 <4oo4@users.noreply.github.com>
Date: Sat, 30 Dec 2017 15:52:33 +0000
Subject: [PATCH 3619/4742] [mode/meta] Add .ino to C

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

diff --git a/mode/meta.js b/mode/meta.js
index 91a925268e..89b2ced87c 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -17,7 +17,7 @@
     {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
     {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
     {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
-    {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
+    {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},

From 8b9d8e337eb7c1d48d42589a5caee0a2215f620c Mon Sep 17 00:00:00 2001
From: Takuya Matsuyama <nora@odoruinu.net>
Date: Mon, 1 Jan 2018 20:51:12 +0900
Subject: [PATCH 3620/4742] [php mode] Fix invalid mime definition

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

diff --git a/mode/meta.js b/mode/meta.js
index 89b2ced87c..4ab3e08e3e 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -101,7 +101,7 @@
     {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
     {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
     {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
-    {name: "PHP", mime: ["application/x-httpd-php", "text/x-php"], mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
+    {name: "PHP", mimes: ["text/x-php", "application/x-httpd-php", "application/x-httpd-php-open"], mode: "php", ext: ["php", "php3", "php4", "php5", "php7", "phtml"]},
     {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},

From cacaa54596272e6ffadf24322123f773bc3c2d80 Mon Sep 17 00:00:00 2001
From: Shane Liesegang <shane@techie.net>
Date: Tue, 2 Jan 2018 18:01:27 -0500
Subject: [PATCH 3621/4742] [makdown mode] Don't let inline styles persist
 across list items

---
 mode/markdown/markdown.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 60f1b30026..7dfddccd39 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -113,6 +113,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   function blankLine(state) {
     // Reset linkTitle state
     state.linkTitle = false;
+    state.linkHref = false;
+    state.linkText = false;
     // Reset EM state
     state.em = false;
     // Reset STRONG state
@@ -151,6 +153,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (state.indentationDiff === null) {
       state.indentationDiff = state.indentation;
       if (prevLineIsList) {
+        // Reset inline styles which shouldn't propagate aross list items
+        state.em = false;
+        state.strong = false;
+        state.code = false;
+        state.strikethrough = false;
+
         state.list = null;
         // While this list item's marker's indentation is less than the deepest
         //  list item's content's indentation,pop the deepest list item

From d2798d22509e33f3aeb79bb7f7437ba0de4605bf Mon Sep 17 00:00:00 2001
From: Neil Anderson <neil@postgrescompare.com>
Date: Sat, 6 Jan 2018 13:16:31 -0500
Subject: [PATCH 3622/4742] [sql mode] Include LC_CTYPE and LC_COLLATE keywords
 in x-pgsql

The CREATE DATABASE command supports LC_CTYPE and LC_COLLATE keywords as
per https://www.postgresql.org/docs/10/static/sql-createdatabase.html.
This commit adds them to the postgres sql mode.
---
 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 da416f2048..63e87733bf 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -400,7 +400,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name: "sql",
     client: set("source"),
     // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
-    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
     // https://www.postgresql.org/docs/10/static/datatype.html
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),

From ce2fb7c8ebd31df403264fda8640bf8a1c22df02 Mon Sep 17 00:00:00 2001
From: Shane Liesegang <shane@techie.net>
Date: Sun, 7 Jan 2018 11:31:49 -0500
Subject: [PATCH 3623/4742] [markdown mode] xlinkHref status should get copied
 along with the rest of the state.

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 7dfddccd39..24e2468026 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -785,6 +785,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         formatting: false,
         linkText: s.linkText,
         linkTitle: s.linkTitle,
+        linkHref: s.linkHref,
         code: s.code,
         em: s.em,
         strong: s.strong,

From ed9f4e3901bdece6d756ef8c167c026665778005 Mon Sep 17 00:00:00 2001
From: Cristian Prieto <me@cprieto.com>
Date: Sun, 7 Jan 2018 20:20:42 +0100
Subject: [PATCH 3624/4742] [mllike mode] Add additional OCaml types, ML
 keywords

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

diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 90e5b41a63..e25e6627af 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -37,7 +37,9 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
     'open': 'builtin',
     'ignore': 'builtin',
     'begin': 'keyword',
-    'end': 'keyword'
+    'end': 'keyword',
+    'when': 'keyword',
+    'as': 'keyword'
   };
 
   var extraWords = parserConfig.extraWords || {};
@@ -174,7 +176,14 @@ CodeMirror.defineMIME('text/x-ocaml', {
     'false': 'atom',
     'raise': 'keyword',
     'module': 'keyword',
-    'sig': 'keyword'
+    'sig': 'keyword',
+    'exception': 'keyword',
+    'int': 'builtin',
+    'float': 'builtin',
+    'char': 'builtin',
+    'string': 'builtin',
+    'bool': 'builtin',
+    'unit': 'builtin'
   }
 });
 

From 45345505a5c16171889aa4f7d3162cee9f806165 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 9 Jan 2018 12:13:24 +0100
Subject: [PATCH 3625/4742] [sublime bindings] Fix toggleBookMark

This had been broken since 5.12 due to a change in the behavior
of findMarksAt.

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 5925b7c51f..7a9aadd330 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -382,7 +382,7 @@
     var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []);
     for (var i = 0; i < ranges.length; i++) {
       var from = ranges[i].from(), to = ranges[i].to();
-      var found = cm.findMarks(from, to);
+      var found = ranges[i].empty() ? cm.findMarksAt(from) : cm.findMarks(from, to);
       for (var j = 0; j < found.length; j++) {
         if (found[j].sublimeBookmark) {
           found[j].clear();

From 774575d6f05f94cab0ec922f11c2e819906f2d11 Mon Sep 17 00:00:00 2001
From: Cristian Prieto <me@cprieto.com>
Date: Tue, 9 Jan 2018 16:50:16 +0100
Subject: [PATCH 3626/4742] [mllike mode[ Refactor, add SML MIME

 * Add common keywords for ML languages
 * Add builtins for OCaml and F#
 * Add Standard ML as ML language
---
 mode/meta.js          |   1 +
 mode/mllike/mllike.js | 202 ++++++++++++++++++++++++++++++++----------
 2 files changed, 154 insertions(+), 49 deletions(-)

diff --git a/mode/meta.js b/mode/meta.js
index 4ab3e08e3e..298074db21 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -128,6 +128,7 @@
     {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
     {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
     {name: "Solr", mime: "text/x-solr", mode: "solr"},
+    {name: "SML", mime: "text/x-sml", mode: "mllike", ext: ["sml", "sig", "fun", "smackspec"]},
     {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
     {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
     {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index e25e6627af..7038a33992 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -13,33 +13,26 @@
 
 CodeMirror.defineMode('mllike', function(_config, parserConfig) {
   var words = {
-    'let': 'keyword',
-    'rec': 'keyword',
+    'as': 'keyword',
+    'do': 'keyword',
+    'else': 'keyword',
+    'end': 'keyword',
+    'exception': 'keyword',
+    'fun': 'keyword',
+    'functor': 'keyword',
+    'if': 'keyword',
     'in': 'keyword',
+    'include': 'keyword',
+    'let': 'keyword',
     'of': 'keyword',
-    'and': 'keyword',
-    'if': 'keyword',
+    'open': 'keyword',
+    'rec': 'keyword',
+    'struct': 'keyword',
     'then': 'keyword',
-    'else': 'keyword',
-    'for': 'keyword',
-    'to': 'keyword',
-    'while': 'keyword',
-    'do': 'keyword',
-    'done': 'keyword',
-    'fun': 'keyword',
-    'function': 'keyword',
-    'val': 'keyword',
     'type': 'keyword',
-    'mutable': 'keyword',
-    'match': 'keyword',
-    'with': 'keyword',
-    'try': 'keyword',
-    'open': 'builtin',
-    'ignore': 'builtin',
-    'begin': 'keyword',
-    'end': 'keyword',
-    'when': 'keyword',
-    'as': 'keyword'
+    'val': 'keyword',
+    'while': 'keyword',
+    'with': 'keyword'
   };
 
   var extraWords = parserConfig.extraWords || {};
@@ -70,7 +63,7 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
         return state.tokenize(stream, state);
       }
     }
-    if (ch === '~') {
+    if (ch === '~' || ch === '?') {
       stream.eatWhile(/\w/);
       return 'variable-2';
     }
@@ -100,7 +93,7 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
       }
       return 'number';
     }
-    if ( /[+\-*&%=<>!?|@]/.test(ch)) {
+    if ( /[+\-*&%=<>!?|@]?\./.test(ch)) {
       return 'operator';
     }
     if (/[\w\xa1-\uffff]/.test(ch)) {
@@ -167,23 +160,61 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
 CodeMirror.defineMIME('text/x-ocaml', {
   name: 'mllike',
   extraWords: {
-    'succ': 'keyword',
+    'and': 'keyword',
+    'assert': 'keyword',
+    'begin': 'keyword',
+    'class': 'keyword',
+    'constraint': 'keyword',
+    'done': 'keyword',
+    'downto': 'keyword',
+    'external': 'keyword',
+    'initializer': 'keyword',
+    'lazy': 'keyword',
+    'match': 'keyword',
+    'method': 'keyword',
+    'module': 'keyword',
+    'mutable': 'keyword',
+    'new': 'keyword',
+    'nonrec': 'keyword',
+    'object': 'keyword',
+    'private': 'keyword',
+    'sig': 'keyword',
+    'to': 'keyword',
+    'try': 'keyword',
+    'value': 'keyword',
+    'virtual': 'keyword',
+    'when': 'keyword',
+
+    // builtins
+    'raise': 'builtin',
+    'failwith': 'builtin',
+    'true': 'builtin',
+    'false': 'builtin',
+
+    // Pervasives builtins
+    'asr': 'builtin',
+    'land': 'builtin',
+    'lor': 'builtin',
+    'lsl': 'builtin',
+    'lsr': 'builtin',
+    'lxor': 'builtin',
+    'mod': 'builtin',
+    'or': 'builtin',
+
+    // More Pervasives
+    'raise_notrace': 'builtin',
     'trace': 'builtin',
     'exit': 'builtin',
     'print_string': 'builtin',
     'print_endline': 'builtin',
-    'true': 'atom',
-    'false': 'atom',
-    'raise': 'keyword',
-    'module': 'keyword',
-    'sig': 'keyword',
-    'exception': 'keyword',
-    'int': 'builtin',
-    'float': 'builtin',
-    'char': 'builtin',
-    'string': 'builtin',
-    'bool': 'builtin',
-    'unit': 'builtin'
+
+    // Types
+    'int': 'atom',
+    'float': 'atom',
+    'bool': 'atom',
+    'char': 'atom',
+    'string': 'atom',
+    'unit': 'atom',
   }
 });
 
@@ -191,18 +222,21 @@ CodeMirror.defineMIME('text/x-fsharp', {
   name: 'mllike',
   extraWords: {
     'abstract': 'keyword',
-    'as': 'keyword',
     'assert': 'keyword',
     'base': 'keyword',
+    'begin': 'keyword',
     'class': 'keyword',
     'default': 'keyword',
     'delegate': 'keyword',
+    'do!': 'keyword',
+    'done': 'keyword',
     'downcast': 'keyword',
     'downto': 'keyword',
     'elif': 'keyword',
-    'exception': 'keyword',
     'extern': 'keyword',
     'finally': 'keyword',
+    'for': 'keyword',
+    'function': 'keyword',
     'global': 'keyword',
     'inherit': 'keyword',
     'inline': 'keyword',
@@ -210,38 +244,108 @@ CodeMirror.defineMIME('text/x-fsharp', {
     'internal': 'keyword',
     'lazy': 'keyword',
     'let!': 'keyword',
-    'member' : 'keyword',
+    'match': 'keyword',
+    'member': 'keyword',
     'module': 'keyword',
+    'mutable': 'keyword',
     'namespace': 'keyword',
     'new': 'keyword',
     'null': 'keyword',
     'override': 'keyword',
     'private': 'keyword',
     'public': 'keyword',
-    'return': 'keyword',
     'return!': 'keyword',
+    'return': 'keyword',
     'select': 'keyword',
     'static': 'keyword',
-    'struct': 'keyword',
+    'to': 'keyword',
+    'try': 'keyword',
     'upcast': 'keyword',
-    'use': 'keyword',
     'use!': 'keyword',
-    'val': 'keyword',
+    'use': 'keyword',
+    'void': 'keyword',
     'when': 'keyword',
-    'yield': 'keyword',
     'yield!': 'keyword',
+    'yield': 'keyword',
+
+    // Reserved words
+    'atomic': 'keyword',
+    'break': 'keyword',
+    'checked': 'keyword',
+    'component': 'keyword',
+    'const': 'keyword',
+    'constraint': 'keyword',
+    'constructor': 'keyword',
+    'continue': 'keyword',
+    'eager': 'keyword',
+    'event': 'keyword',
+    'external': 'keyword',
+    'fixed': 'keyword',
+    'method': 'keyword',
+    'mixin': 'keyword',
+    'object': 'keyword',
+    'parallel': 'keyword',
+    'process': 'keyword',
+    'protected': 'keyword',
+    'pure': 'keyword',
+    'sealed': 'keyword',
+    'tailcall': 'keyword',
+    'trait': 'keyword',
+    'virtual': 'keyword',
+    'volatile': 'keyword',
 
+    // builtins
     'List': 'builtin',
     'Seq': 'builtin',
     'Map': 'builtin',
     'Set': 'builtin',
+    'Option': 'builtin',
     'int': 'builtin',
     'string': 'builtin',
-    'raise': 'builtin',
-    'failwith': 'builtin',
     'not': 'builtin',
     'true': 'builtin',
-    'false': 'builtin'
+    'false': 'builtin',
+
+    'raise': 'builtin',
+    'failwith': 'builtin'
+  },
+  slashComments: true
+});
+
+
+CodeMirror.defineMIME('text/x-sml', {
+  name: 'mllike',
+  extraWords: {
+    'abstype': 'keyword',
+    'and': 'keyword',
+    'andalso': 'keyword',
+    'case': 'keyword',
+    'datatype': 'keyword',
+    'fn': 'keyword',
+    'handle': 'keyword',
+    'infix': 'keyword',
+    'infixr': 'keyword',
+    'local': 'keyword',
+    'nonfix': 'keyword',
+    'op': 'keyword',
+    'orelse': 'keyword',
+    'raise': 'keyword',
+    'withtype': 'keyword',
+    'eqtype': 'keyword',
+    'sharing': 'keyword',
+    'sig': 'keyword',
+    'signature': 'keyword',
+    'structure': 'keyword',
+    'where': 'keyword',
+    'true': 'keyword',
+    'false': 'keyword',
+
+    // types
+    'int': 'builtin',
+    'real': 'builtin',
+    'string': 'builtin',
+    'char': 'builtin',
+    'bool': 'builtin'
   },
   slashComments: true
 });

From e35f5bbc0c147c15460a189e0a8f291020a9ba8c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 10 Jan 2018 09:39:04 +0100
Subject: [PATCH 3627/4742] [placeholder plugin] Use editor direction

Closes #5174
---
 addon/display/placeholder.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 2f8b1f84ae..65753ebf3f 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -38,6 +38,7 @@
     clearPlaceholder(cm);
     var elt = cm.state.placeholder = document.createElement("pre");
     elt.style.cssText = "height: 0; overflow: visible";
+    elt.style.direction = cm.getOption("direction");
     elt.className = "CodeMirror-placeholder";
     var placeHolder = cm.getOption("placeholder")
     if (typeof placeHolder == "string") placeHolder = document.createTextNode(placeHolder)

From 2786ff0a86f32911429351a6aca4cec65e1a5b85 Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Mon, 8 Jan 2018 12:55:04 +0100
Subject: [PATCH 3628/4742] [sql-hint addon] Switch order of hints

Show column hints (if a defaultTable is set) above table hints, since
you are far more often in clauses where you need those.
---
 addon/hint/sql-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index f5ec2cac1f..5600c8390d 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -273,8 +273,8 @@
     if (search.charAt(0) == "." || search.charAt(0) == identifierQuote) {
       start = nameCompletion(cur, token, result, editor);
     } else {
-      addMatches(result, search, tables, function(w) {return w;});
       addMatches(result, search, defaultTable, function(w) {return w;});
+      addMatches(result, search, tables, function(w) {return w;});
       if (!disableKeywords)
         addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
     }

From 350f71b09d166f1a149514503dc86ff00963faa1 Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Mon, 8 Jan 2018 12:50:23 +0100
Subject: [PATCH 3629/4742] [sql-hint addon] Fix nullpointer

If you try to autocomplete at line 0, column 0 after previoulsy having edited for example a WHERE clause, the autocompletion triggers with an invalid position, since prevItem is null.
Maybe my fix isn't the best solution, and you could even avoid to enter findTableByAlias enitrely, I don't know.
---
 addon/hint/sql-hint.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 5600c8390d..5d20eea625 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -222,18 +222,20 @@
       prevItem = separator[i];
     }
 
-    var query = doc.getRange(validRange.start, validRange.end, false);
-
-    for (var i = 0; i < query.length; i++) {
-      var lineText = query[i];
-      eachWord(lineText, function(word) {
-        var wordUpperCase = word.toUpperCase();
-        if (wordUpperCase === aliasUpperCase && getTable(previousWord))
-          table = previousWord;
-        if (wordUpperCase !== CONS.ALIAS_KEYWORD)
-          previousWord = word;
-      });
-      if (table) break;
+    if (validRange.start) {
+      var query = doc.getRange(validRange.start, validRange.end, false);
+
+      for (var i = 0; i < query.length; i++) {
+        var lineText = query[i];
+        eachWord(lineText, function(word) {
+          var wordUpperCase = word.toUpperCase();
+          if (wordUpperCase === aliasUpperCase && getTable(previousWord))
+            table = previousWord;
+          if (wordUpperCase !== CONS.ALIAS_KEYWORD)
+            previousWord = word;
+        });
+        if (table) break;
+      }
     }
     return table;
   }

From dccaafe5200267dc9a2d605c6caee592bfb0408b Mon Sep 17 00:00:00 2001
From: Filype Pereira <pereira.filype@gmail.com>
Date: Sat, 30 Dec 2017 09:52:02 +1300
Subject: [PATCH 3630/4742] [oceanic-next theme] Add

---
 demo/theme.html        |  2 ++
 theme/oceanic-next.css | 44 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 theme/oceanic-next.css

diff --git a/demo/theme.html b/demo/theme.html
index 9194dcea8b..0c52d256d9 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -34,6 +34,7 @@
 <link rel="stylesheet" href="../theme/neat.css">
 <link rel="stylesheet" href="../theme/neo.css">
 <link rel="stylesheet" href="../theme/night.css">
+<link rel="stylesheet" href="../theme/oceanic-next.css">
 <link rel="stylesheet" href="../theme/panda-syntax.css">
 <link rel="stylesheet" href="../theme/paraiso-dark.css">
 <link rel="stylesheet" href="../theme/paraiso-light.css">
@@ -119,6 +120,7 @@ <h2>Theme Demo</h2>
     <option>neat</option>
     <option>neo</option>
     <option>night</option>
+    <option>oceanic-next</option>
     <option>panda-syntax</option>
     <option>paraiso-dark</option>
     <option>paraiso-light</option>
diff --git a/theme/oceanic-next.css b/theme/oceanic-next.css
new file mode 100644
index 0000000000..296277ba04
--- /dev/null
+++ b/theme/oceanic-next.css
@@ -0,0 +1,44 @@
+/*
+
+    Name:       oceanic-next
+    Author:     Filype Pereira (https://github.com/fpereira1)
+
+    Original oceanic-next color scheme by Dmitri Voronianski (https://github.com/voronianski/oceanic-next-color-scheme)
+
+*/
+
+.cm-s-oceanic-next.CodeMirror { background: #304148; color: #f8f8f2; }
+.cm-s-oceanic-next div.CodeMirror-selected { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-line::selection, .cm-s-oceanic-next .CodeMirror-line > span::selection, .cm-s-oceanic-next .CodeMirror-line > span > span::selection { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-line::-moz-selection, .cm-s-oceanic-next .CodeMirror-line > span::-moz-selection, .cm-s-oceanic-next .CodeMirror-line > span > span::-moz-selection { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-gutters { background: #304148; border-right: 10px; }
+.cm-s-oceanic-next .CodeMirror-guttermarker { color: white; }
+.cm-s-oceanic-next .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-oceanic-next .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-oceanic-next .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+
+.cm-s-oceanic-next span.cm-comment { color: #65737E; }
+.cm-s-oceanic-next span.cm-atom { color: #C594C5; }
+.cm-s-oceanic-next span.cm-number { color: #F99157; }
+
+.cm-s-oceanic-next span.cm-property { color: #99C794; }
+.cm-s-oceanic-next span.cm-attribute,
+.cm-s-oceanic-next span.cm-keyword { color: #C594C5; }
+.cm-s-oceanic-next span.cm-builtin { color: #66d9ef; }
+.cm-s-oceanic-next span.cm-string { color: #99C794; }
+
+.cm-s-oceanic-next span.cm-variable,
+.cm-s-oceanic-next span.cm-variable-2,
+.cm-s-oceanic-next span.cm-variable-3 { color: #f8f8f2; }
+.cm-s-oceanic-next span.cm-def { color: #6699CC; }
+.cm-s-oceanic-next span.cm-bracket { color: #5FB3B3; }
+.cm-s-oceanic-next span.cm-tag { color: #C594C5; }
+.cm-s-oceanic-next span.cm-header { color: #C594C5; }
+.cm-s-oceanic-next span.cm-link { color: #C594C5; }
+.cm-s-oceanic-next span.cm-error { background: #C594C5; color: #f8f8f0; }
+
+.cm-s-oceanic-next .CodeMirror-activeline-background { background: rgba(101, 115, 126, 0.33); }
+.cm-s-oceanic-next .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}

From e9e5f23b81ec86f84680d8b13ff422408e1a9428 Mon Sep 17 00:00:00 2001
From: overdodactyl <pjohns33@protonmail.com>
Date: Sat, 6 Jan 2018 21:28:00 -0700
Subject: [PATCH 3631/4742] [shadowfox theme] Add

---
 demo/theme.html     |  2 ++
 theme/shadowfox.css | 52 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 theme/shadowfox.css

diff --git a/demo/theme.html b/demo/theme.html
index 0c52d256d9..e01f79a70f 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -42,6 +42,7 @@
 <link rel="stylesheet" href="../theme/railscasts.css">
 <link rel="stylesheet" href="../theme/rubyblue.css">
 <link rel="stylesheet" href="../theme/seti.css">
+<link rel="stylesheet" href="../theme/shadowfox.css">
 <link rel="stylesheet" href="../theme/solarized.css">
 <link rel="stylesheet" href="../theme/the-matrix.css">
 <link rel="stylesheet" href="../theme/tomorrow-night-bright.css">
@@ -128,6 +129,7 @@ <h2>Theme Demo</h2>
     <option>railscasts</option>
     <option>rubyblue</option>
     <option>seti</option>
+    <option>shadowfox</option>
     <option>solarized dark</option>
     <option>solarized light</option>
     <option>the-matrix</option>
diff --git a/theme/shadowfox.css b/theme/shadowfox.css
new file mode 100644
index 0000000000..32d59b139a
--- /dev/null
+++ b/theme/shadowfox.css
@@ -0,0 +1,52 @@
+/*
+
+    Name:       shadowfox
+    Author:     overdodactyl (http://github.com/overdodactyl)
+
+    Original shadowfox color scheme by Firefox
+
+*/
+
+.cm-s-shadowfox.CodeMirror { background: #2a2a2e; color: #b1b1b3; }
+.cm-s-shadowfox div.CodeMirror-selected { background: #353B48; }
+.cm-s-shadowfox .CodeMirror-line::selection, .cm-s-shadowfox .CodeMirror-line > span::selection, .cm-s-shadowfox .CodeMirror-line > span > span::selection { background: #353B48; }
+.cm-s-shadowfox .CodeMirror-line::-moz-selection, .cm-s-shadowfox .CodeMirror-line > span::-moz-selection, .cm-s-shadowfox .CodeMirror-line > span > span::-moz-selection { background: #353B48; }
+.cm-s-shadowfox .CodeMirror-gutters { background: #0c0c0d ; border-right: 1px solid #0c0c0d; }
+.cm-s-shadowfox .CodeMirror-guttermarker { color: #555; }
+.cm-s-shadowfox .CodeMirror-linenumber { color: #939393; }
+.cm-s-shadowfox .CodeMirror-cursor { border-left: 1px solid #fff; }
+
+.cm-s-shadowfox span.cm-comment { color: #939393; }
+.cm-s-shadowfox span.cm-atom { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-quote { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-builtin { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-attribute { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-keyword { color: #FF7DE9; }
+.cm-s-shadowfox span.cm-error { color: #FF7DE9; }
+
+.cm-s-shadowfox span.cm-number { color: #6B89FF; }
+.cm-s-shadowfox span.cm-string { color: #6B89FF; }
+.cm-s-shadowfox span.cm-string-2 { color: #6B89FF; }
+
+.cm-s-shadowfox span.cm-meta { color: #939393; }
+.cm-s-shadowfox span.cm-hr { color: #939393; }
+
+.cm-s-shadowfox span.cm-header { color: #75BFFF; }
+.cm-s-shadowfox span.cm-qualifier { color: #75BFFF; }
+.cm-s-shadowfox span.cm-variable-2 { color: #75BFFF; }
+
+.cm-s-shadowfox span.cm-property { color: #86DE74; }
+
+.cm-s-shadowfox span.cm-def { color: #75BFFF; }
+.cm-s-shadowfox span.cm-bracket { color: #75BFFF; }
+.cm-s-shadowfox span.cm-tag { color: #75BFFF; }
+.cm-s-shadowfox span.cm-link:visited { color: #75BFFF; }
+
+.cm-s-shadowfox span.cm-variable { color: #B98EFF; }
+.cm-s-shadowfox span.cm-variable-3 { color: #d7d7db; }
+.cm-s-shadowfox span.cm-link { color: #737373; }
+.cm-s-shadowfox span.cm-operator { color: #b1b1b3; }
+.cm-s-shadowfox span.cm-special { color: #d7d7db; }
+
+.cm-s-shadowfox .CodeMirror-activeline-background { background: rgba(185, 215, 253, .15) }
+.cm-s-shadowfox .CodeMirror-matchingbracket { outline: solid 1px rgba(255, 255, 255, .25); color: white !important; }

From e4bf8dff42d80a4bfab366733dfd992b62a66880 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 11 Jan 2018 08:56:15 +0100
Subject: [PATCH 3632/4742] [closebrackets addon] Avoid annoying behavior when
 closing a triple-quoted string

Issue #5177
---
 addon/edit/closebrackets.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 460f662f80..86b2fe1c95 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -129,8 +129,8 @@
         else
           curType = "skip";
       } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
-                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch &&
-                 (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != ch)) {
+                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch) {
+        if (cur.ch > 2 && /\bstring/.test(cm.getTokenTypeAt(Pos(cur.line, cur.ch - 2)))) return CodeMirror.Pass;
         curType = "addFour";
       } else if (identical) {
         var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)

From 2a168994fba2a6c9250edb59b7dc56dc46767053 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 12 Jan 2018 08:26:55 +0100
Subject: [PATCH 3633/4742] [javascript mode] Fix highlighting of TS implements
 keyword

Closes #5178
---
 mode/javascript/javascript.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index edab99f3d7..29085a21c4 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -680,8 +680,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function classNameAfter(type, value) {
     if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter)
-    if (value == "extends" || value == "implements" || (isTS && type == ","))
+    if (value == "extends" || value == "implements" || (isTS && type == ",")) {
+      cx.marked = "keyword";
       return cont(isTS ? typeexpr : expression, classNameAfter);
+    }
     if (type == "{") return cont(pushlex("}"), classBody, poplex);
   }
   function classBody(type, value) {

From d89267681d21f46a78a90002a9b18dc95acac1f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 12 Jan 2018 08:36:22 +0100
Subject: [PATCH 3634/4742] [javascript mode] Fix previous patch

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 29085a21c4..64c910d849 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -681,7 +681,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function classNameAfter(type, value) {
     if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter)
     if (value == "extends" || value == "implements" || (isTS && type == ",")) {
-      cx.marked = "keyword";
+      if (value == "implements") cx.marked = "keyword";
       return cont(isTS ? typeexpr : expression, classNameAfter);
     }
     if (type == "{") return cont(pushlex("}"), classBody, poplex);

From 4fa785ea875aade5beb64ebc317969f3fb653125 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 13 Jan 2018 10:34:10 +0100
Subject: [PATCH 3635/4742] [xml-fold addon] Handle line-broken opening tags
 better

No longer creates a fold spot for both lines of a line-broken
tag.

Closes #5179
---
 addon/fold/xml-fold.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 08e2149553..3acf952d9d 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -138,7 +138,7 @@
     var iter = new Iter(cm, start.line, 0);
     for (;;) {
       var openTag = toNextTag(iter), end;
-      if (!openTag || iter.line != start.line || !(end = toTagEnd(iter))) return;
+      if (!openTag || !(end = toTagEnd(iter)) || iter.line != start.line) return;
       if (!openTag[1] && end != "selfClose") {
         var startPos = Pos(iter.line, iter.ch);
         var endPos = findMatchingClose(iter, openTag[2]);

From e03ef21df390753eb35ff8426dd99b1be4d29d74 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 13 Jan 2018 17:52:27 +0100
Subject: [PATCH 3636/4742] [javascript mode] Further improve handling of TS
 contextual keywords

Closes #5180
Closes #5181
---
 mode/javascript/javascript.js | 20 +++++++++++++-------
 mode/javascript/test.js       | 10 ++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 64c910d849..9eb50ba974 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -345,15 +345,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
     if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), className, poplex); }
     if (type == "variable") {
-      if (isTS && value == "type") {
-        cx.marked = "keyword"
-        return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
-      } else if (isTS && value == "declare") {
+      if (isTS && value == "declare") {
         cx.marked = "keyword"
         return cont(statement)
-      } else if (isTS && (value == "module" || value == "enum") && cx.stream.match(/^\s*\w/, false)) {
+      } else if (isTS && (value == "module" || value == "enum" || value == "type") && cx.stream.match(/^\s*\w/, false)) {
         cx.marked = "keyword"
-        return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
+        if (value == "enum") return cont(enumdef);
+        else if (value == "type") return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
+        else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
       } else if (isTS && value == "namespace") {
         cx.marked = "keyword"
         return cont(pushlex("form"), expression, block, poplex)
@@ -608,7 +607,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeTypeDefault(_, value) {
     if (value == "=") return cont(typeexpr)
   }
-  function vardef() {
+  function vardef(_, value) {
+    if (value == "enum") {cx.marked = "keyword"; return cont(enumdef)}
     return pass(pattern, maybetype, maybeAssign, vardefCont);
   }
   function pattern(type, value) {
@@ -747,6 +747,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "]") return cont();
     return pass(commasep(expressionNoComma, "]"));
   }
+  function enumdef() {
+    return pass(pushlex("form"), pattern, expect("{"), pushlex("}"), commasep(enummember, "}"), poplex, poplex)
+  }
+  function enummember() {
+    return pass(pattern, maybeAssign);
+  }
 
   function isContinuedStatement(state, textAfter) {
     return state.lastType == "operator" || state.lastType == "," ||
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 167e6d0165..14a5183cab 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -383,6 +383,16 @@
      "  }",
      "}")
 
+  TS("type as variable",
+     "[variable type] [operator =] [variable x] [keyword as] [type Bar];");
+
+  TS("enum body",
+     "[keyword export] [keyword const] [keyword enum] [def CodeInspectionResultType] {",
+     "  [def ERROR] [operator =] [string 'problem_type_error'],",
+     "  [def WARNING] [operator =] [string 'problem_type_warning'],",
+     "  [def META],",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 974182466ba8165f15ccc6b5b07b785bcbc39c63 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 17 Jan 2018 09:37:55 +0100
Subject: [PATCH 3637/4742] [shell mode] Improve handling of quotes inside
 parentheses

Closes #5187
---
 mode/shell/shell.js | 23 ++++++++++++++++-------
 mode/shell/test.js  |  3 +++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 9b8b90b305..9fcd671cf5 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -84,29 +84,38 @@ CodeMirror.defineMode('shell', function() {
   function tokenString(quote, style) {
     var close = quote == "(" ? ")" : quote == "{" ? "}" : quote
     return function(stream, state) {
-      var next, end = false, escaped = false;
+      var next, escaped = false;
       while ((next = stream.next()) != null) {
         if (next === close && !escaped) {
-          end = true;
+          state.tokens.shift();
           break;
-        }
-        if (next === '$' && !escaped && quote !== "'") {
+        } else if (next === '$' && !escaped && quote !== "'") {
           escaped = true;
           stream.backUp(1);
           state.tokens.unshift(tokenDollar);
           break;
-        }
-        if (!escaped && next === quote && quote !== close) {
+        } else if (!escaped && quote !== close && next === quote) {
           state.tokens.unshift(tokenString(quote, style))
           return tokenize(stream, state)
+        } else if (!escaped && /['"]/.test(next) && !/['"]/.test(quote)) {
+          state.tokens.unshift(tokenStringStart(next, "string"));
+          stream.backUp(1);
+          break;
         }
         escaped = !escaped && next === '\\';
       }
-      if (end) state.tokens.shift();
       return style;
     };
   };
 
+  function tokenStringStart(quote, style) {
+    return function(stream, state) {
+      state.tokens[0] = tokenString(quote, style)
+      stream.next()
+      return tokenize(stream, state)
+    }
+  }
+
   var tokenDollar = function(stream, state) {
     if (state.tokens.length > 1) stream.eat('$');
     var ch = stream.next()
diff --git a/mode/shell/test.js b/mode/shell/test.js
index 86e344c572..05f07d22b1 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -61,4 +61,7 @@
 
   MT("nested braces",
      "[builtin echo] [def ${A[${B}]]}]")
+
+  MT("strings in parens",
+     "[def FOO][operator =]([quote $(<][string \"][def $MYDIR][string \"][quote /myfile grep ][string 'hello$'][quote )])")
 })();

From d8d68a8a86cce37fd3b19d0c3025e1a38df20ead Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Tue, 16 Jan 2018 14:16:47 +0100
Subject: [PATCH 3638/4742] [javascript-lint addon] Fix incorrect severity

When enabling strict equality checks via `lint: {options: {eqeqeq: true}}`, found problems showed up as errors instead of warnings.
To fix it, the `fixWith()` logic had to be changed since simply adding the phrase to the warnings array would not have worked. This is because both the warnings and errors array matched this exact error and therefore the severity could never be "warning" (errors were checked after warnings).

I didn't include "Missing property name" and "Unmatched " in the new error array since they already are errors with the new logic.
"Stopping, unable to continue" also got removed since it didn't appear anywhere in the current jshint.js.

For now I've implemented everything to not break previous behavior/hinting, except the strict equality hint severity. Although I want to suggest removing the following codes from the new error array (so they can stay warnings):
- W033 (Missing semicolon) - since erroneous missing semicolons have their own code: E058
- W084 (Expected a conditional expression and instead saw an assignment) - since something like `switch (var2 = var1 + 42)` is valid js code, though not recommendable
- maybe W023/24/30/90, since there are many more " and instead saw an" hints that are already errors with their own codes, so I think they should be pretty accurate. Unfortunately I couldn't force these warnings so I couldn't check.
---
 addon/lint/javascript-lint.js | 49 +++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index c58f785025..f73aaa51a0 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -14,12 +14,20 @@
 
   var bogus = [ "Dangerous comment" ];
 
-  var warnings = [ [ "Expected '{'",
+  var replacements = [ [ "Expected '{'",
                      "Statement body should be inside '{ }' braces." ] ];
 
-  var errors = [ "Missing semicolon", "Extra comma", "Missing property name",
-                 "Unmatched ", " and instead saw", " is not defined",
-                 "Unclosed string", "Stopping, unable to continue" ];
+  var forcedErrorCodes = [
+    "W033", // Missing semicolon.
+    "W070", // Extra comma. (it breaks older versions of IE)
+    "W112", // Unclosed string.
+    "W117", // '{a}' is not defined.
+    "W023", // Expected an identifier in an assignment and instead saw a function invocation.
+    "W024", // Expected an identifier and instead saw '{a}' (a reserved word).
+    "W030", // Expected an assignment or function call and instead saw an expression.
+    "W084", // Expected a conditional expression and instead saw an assignment.
+    "W095" // Expected a string and instead saw {a}.
+  ];
 
   function validator(text, options) {
     if (!window.JSHINT) {
@@ -37,29 +45,35 @@
   CodeMirror.registerHelper("lint", "javascript", validator);
 
   function cleanup(error) {
-    // All problems are warnings by default
-    fixWith(error, warnings, "warning", true);
-    fixWith(error, errors, "error");
+    fixWith(error, forcedErrorCodes, replacements);
 
     return isBogus(error) ? null : error;
   }
 
-  function fixWith(error, fixes, severity, force) {
-    var description, fix, find, replace, found;
+  function fixWith(error, forcedErrorCodes, replacements) {
+    var errorCode, description, i, fix, find, replace, found;
 
+    errorCode = error.code;
     description = error.description;
 
-    for ( var i = 0; i < fixes.length; i++) {
-      fix = fixes[i];
-      find = (typeof fix === "string" ? fix : fix[0]);
-      replace = (typeof fix === "string" ? null : fix[1]);
+    if (error.severity !== "error") {
+      for (i = 0; i < forcedErrorCodes.length; i++) {
+        if (errorCode === forcedErrorCodes[i]) {
+          error.severity = "error";
+          break;
+        }
+      }
+    }
+
+    for (i = 0; i < replacements.length; i++) {
+      fix = replacements[i];
+      find = fix[0];
       found = description.indexOf(find) !== -1;
 
-      if (force || found) {
-        error.severity = severity;
-      }
-      if (found && replace) {
+      if (found) {
+        replace = fix[1];
         error.description = replace;
+        break;
       }
     }
   }
@@ -128,6 +142,7 @@
         error.description = error.reason;// + "(jshint)";
         error.start = error.character;
         error.end = end;
+        error.severity = error.code.startsWith('W') ? "warning" : "error";
         error = cleanup(error);
 
         if (error)

From dac3bdec7a5678c9adedfe3d8f2ce86f9823361c Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Tue, 16 Jan 2018 16:08:53 +0100
Subject: [PATCH 3639/4742] [javascript-lint addon] Remove obsolete function

---
 addon/lint/javascript-lint.js | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index f73aaa51a0..a6d31210a2 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -12,8 +12,6 @@
   "use strict";
   // declare global: JSHINT
 
-  var bogus = [ "Dangerous comment" ];
-
   var replacements = [ [ "Expected '{'",
                      "Statement body should be inside '{ }' braces." ] ];
 
@@ -46,8 +44,6 @@
 
   function cleanup(error) {
     fixWith(error, forcedErrorCodes, replacements);
-
-    return isBogus(error) ? null : error;
   }
 
   function fixWith(error, forcedErrorCodes, replacements) {
@@ -78,16 +74,6 @@
     }
   }
 
-  function isBogus(error) {
-    var description = error.description;
-    for ( var i = 0; i < bogus.length; i++) {
-      if (description.indexOf(bogus[i]) !== -1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   function parseErrors(errors, output) {
     for ( var i = 0; i < errors.length; i++) {
       var error = errors[i];
@@ -143,7 +129,7 @@
         error.start = error.character;
         error.end = end;
         error.severity = error.code.startsWith('W') ? "warning" : "error";
-        error = cleanup(error);
+        cleanup(error);
 
         if (error)
           output.push({message: error.description,

From 81391e6ad9b30d1238d10843325ef375e5f91356 Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Wed, 17 Jan 2018 11:37:47 +0100
Subject: [PATCH 3640/4742] [lint demo] Use a more recent version of JSHint

---
 demo/lint.html   | 2 +-
 demo/widget.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/lint.html b/demo/lint.html
index 96009b4e1f..2a1c30b47d 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -9,7 +9,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/css/css.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jshint/2.9.5/jshint.min.js"></script>
 <script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
 <script src="http://csslint.net/js/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
diff --git a/demo/widget.html b/demo/widget.html
index da39a9297a..58ebb4d97a 100644
--- a/demo/widget.html
+++ b/demo/widget.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jshint/r07/jshint.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jshint/2.9.5/jshint.min.js"></script>
 <style type="text/css">
       .CodeMirror {border: 1px solid black;}
       .lint-error {font-family: arial; font-size: 70%; background: #ffa; color: #a00; padding: 2px 5px 3px; }

From 1d5c828f8348b7384cb38568f0d12075fd41917e Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Wed, 17 Jan 2018 12:09:54 +0100
Subject: [PATCH 3641/4742] [javascript-lint addon] Removed error code and
 message overrides

---
 addon/lint/javascript-lint.js | 48 -----------------------------------
 1 file changed, 48 deletions(-)

diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index a6d31210a2..d04328787d 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -12,21 +12,6 @@
   "use strict";
   // declare global: JSHINT
 
-  var replacements = [ [ "Expected '{'",
-                     "Statement body should be inside '{ }' braces." ] ];
-
-  var forcedErrorCodes = [
-    "W033", // Missing semicolon.
-    "W070", // Extra comma. (it breaks older versions of IE)
-    "W112", // Unclosed string.
-    "W117", // '{a}' is not defined.
-    "W023", // Expected an identifier in an assignment and instead saw a function invocation.
-    "W024", // Expected an identifier and instead saw '{a}' (a reserved word).
-    "W030", // Expected an assignment or function call and instead saw an expression.
-    "W084", // Expected a conditional expression and instead saw an assignment.
-    "W095" // Expected a string and instead saw {a}.
-  ];
-
   function validator(text, options) {
     if (!window.JSHINT) {
       if (window.console) {
@@ -42,38 +27,6 @@
 
   CodeMirror.registerHelper("lint", "javascript", validator);
 
-  function cleanup(error) {
-    fixWith(error, forcedErrorCodes, replacements);
-  }
-
-  function fixWith(error, forcedErrorCodes, replacements) {
-    var errorCode, description, i, fix, find, replace, found;
-
-    errorCode = error.code;
-    description = error.description;
-
-    if (error.severity !== "error") {
-      for (i = 0; i < forcedErrorCodes.length; i++) {
-        if (errorCode === forcedErrorCodes[i]) {
-          error.severity = "error";
-          break;
-        }
-      }
-    }
-
-    for (i = 0; i < replacements.length; i++) {
-      fix = replacements[i];
-      find = fix[0];
-      found = description.indexOf(find) !== -1;
-
-      if (found) {
-        replace = fix[1];
-        error.description = replace;
-        break;
-      }
-    }
-  }
-
   function parseErrors(errors, output) {
     for ( var i = 0; i < errors.length; i++) {
       var error = errors[i];
@@ -129,7 +82,6 @@
         error.start = error.character;
         error.end = end;
         error.severity = error.code.startsWith('W') ? "warning" : "error";
-        cleanup(error);
 
         if (error)
           output.push({message: error.description,

From 2ececac02267a1022bc902c3cd4cefa1d1c51814 Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Wed, 17 Jan 2018 12:46:05 +0100
Subject: [PATCH 3642/4742] [lint demo] Added JS error

As of 1d5c828f8348b7384cb38568f0d12075fd41917e the missing js semicolon is a warning and not an error anymore, therefore I added an error elsewhere.
---
 demo/lint.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/lint.html b/demo/lint.html
index 2a1c30b47d..6b3d792855 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -39,7 +39,7 @@ <h2>Linter Demo</h2>
     <p><textarea id="code-js">var widgets = []
 function updateHints() {
   editor.operation(function(){
-    for (var i = 0; i < widgets.length; ++i)
+    for (var i = 0; i < widgets.length.; ++i)
       editor.removeLineWidget(widgets[i]);
     widgets.length = 0;
 

From 81fc4f5a21e6e7f644bbeaf5cf2eae7dc53a3153 Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Wed, 17 Jan 2018 15:57:02 +0100
Subject: [PATCH 3643/4742] [javascript-lint addon] Fix error markers

When using tabs for indentation, the markers would not always align with the actual problem.
The old workaround for JSHint never really worked (only when a line had one tab) and I found a simple option which fixes the issue.
This time I also checked backwards compatibility, which works even fine with the old JSHint version R07.
As a second marker fix, I added an error line check, since JSHint for some reason adds configuration issues in the errors array with line: 0, character: 0. Now, if you pass an invalid option you will get a console error instead of an invisible marker.
---
 addon/lint/javascript-lint.js | 61 +++++++++--------------------------
 1 file changed, 15 insertions(+), 46 deletions(-)

diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index d04328787d..9d2eb7410c 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -19,6 +19,8 @@
       }
       return [];
     }
+    if (!options.indent) // JSHint error.character actually is a column index, this fixes underlining on lines using tabs for indentation
+      options.indent = 1; // JSHint default value is 4
     JSHINT(text, options, options.globals);
     var errors = JSHINT.data().errors, result = [];
     if (errors) parseErrors(errors, result);
@@ -31,63 +33,30 @@
     for ( var i = 0; i < errors.length; i++) {
       var error = errors[i];
       if (error) {
-        var linetabpositions, index;
-
-        linetabpositions = [];
-
-        // This next block is to fix a problem in jshint. Jshint
-        // replaces
-        // all tabs with spaces then performs some checks. The error
-        // positions (character/space) are then reported incorrectly,
-        // not taking the replacement step into account. Here we look
-        // at the evidence line and try to adjust the character position
-        // to the correct value.
-        if (error.evidence) {
-          // Tab positions are computed once per line and cached
-          var tabpositions = linetabpositions[error.line];
-          if (!tabpositions) {
-            var evidence = error.evidence;
-            tabpositions = [];
-            // ugggh phantomjs does not like this
-            // forEachChar(evidence, function(item, index) {
-            Array.prototype.forEach.call(evidence, function(item,
-                                                            index) {
-              if (item === '\t') {
-                // First col is 1 (not 0) to match error
-                // positions
-                tabpositions.push(index + 1);
-              }
-            });
-            linetabpositions[error.line] = tabpositions;
-          }
-          if (tabpositions.length > 0) {
-            var pos = error.character;
-            tabpositions.forEach(function(tabposition) {
-              if (pos > tabposition) pos -= 1;
-            });
-            error.character = pos;
+        if (error.line <= 0) {
+          if (window.console) {
+            window.console.warn("Cannot display JSHint error (invalid line " + error.line + ")", error);
           }
+          continue;
         }
 
         var start = error.character - 1, end = start + 1;
         if (error.evidence) {
-          index = error.evidence.substring(start).search(/.\b/);
+          var index = error.evidence.substring(start).search(/.\b/);
           if (index > -1) {
             end += index;
           }
         }
 
         // Convert to format expected by validation service
-        error.description = error.reason;// + "(jshint)";
-        error.start = error.character;
-        error.end = end;
-        error.severity = error.code.startsWith('W') ? "warning" : "error";
-
-        if (error)
-          output.push({message: error.description,
-                       severity: error.severity,
-                       from: CodeMirror.Pos(error.line - 1, start),
-                       to: CodeMirror.Pos(error.line - 1, end)});
+        var hint = {
+          message: error.reason,
+          severity: error.code.startsWith('W') ? "warning" : "error",
+          from: CodeMirror.Pos(error.line - 1, start),
+          to: CodeMirror.Pos(error.line - 1, end)
+        };
+
+        output.push(hint);
       }
     }
   }

From 7584b13c3f991b4db5bee8dd6e200b388fbad73b Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 17 Jan 2018 22:35:54 +0100
Subject: [PATCH 3644/4742] [mode/meta] Add handlebars extensions to htmlmixed

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

diff --git a/mode/meta.js b/mode/meta.js
index 298074db21..6377e1b9af 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -64,7 +64,7 @@
     {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
     {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
     {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
-    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
+    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm", "handlebars", "hbs"], alias: ["xhtml"]},
     {name: "HTTP", mime: "message/http", mode: "http"},
     {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
     {name: "Pug", mime: "text/x-pug", mode: "pug", ext: ["jade", "pug"], alias: ["jade"]},

From 91496a34d116dde80412e8b1522e44364518f79c Mon Sep 17 00:00:00 2001
From: Qiang Li <qiang@sumologic.com>
Date: Wed, 17 Jan 2018 17:18:47 -0800
Subject: [PATCH 3645/4742] Fix typo in input.js

---
 src/input/input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input.js b/src/input/input.js
index ff86c39d31..0ca53ad89f 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -27,7 +27,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
 
   let paste = cm.state.pasteIncoming || origin == "paste"
   let textLines = splitLinesAuto(inserted), multiPaste = null
-  // When pasing N lines into N selections, insert one line per selection
+  // When pasting N lines into N selections, insert one line per selection
   if (paste && sel.ranges.length > 1) {
     if (lastCopied && lastCopied.text.join("\n") == inserted) {
       if (sel.ranges.length % lastCopied.text.length == 0) {

From 945c9673c80526017182faf696af35b839d11e23 Mon Sep 17 00:00:00 2001
From: Cristian Prieto <me@cprieto.com>
Date: Thu, 18 Jan 2018 15:32:34 +0100
Subject: [PATCH 3646/4742] [mllike mode] Types are not atoms but types

---
 mode/mllike/mllike.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 7038a33992..92b51cbc34 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -93,7 +93,7 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
       }
       return 'number';
     }
-    if ( /[+\-*&%=<>!?|@]?\./.test(ch)) {
+    if ( /[+\-*&%=<>!?|@\.~:]/.test(ch)) {
       return 'operator';
     }
     if (/[\w\xa1-\uffff]/.test(ch)) {
@@ -168,6 +168,7 @@ CodeMirror.defineMIME('text/x-ocaml', {
     'done': 'keyword',
     'downto': 'keyword',
     'external': 'keyword',
+    'function': 'keyword',
     'initializer': 'keyword',
     'lazy': 'keyword',
     'match': 'keyword',
@@ -208,13 +209,15 @@ CodeMirror.defineMIME('text/x-ocaml', {
     'print_string': 'builtin',
     'print_endline': 'builtin',
 
-    // Types
-    'int': 'atom',
-    'float': 'atom',
-    'bool': 'atom',
-    'char': 'atom',
-    'string': 'atom',
-    'unit': 'atom',
+     'int': 'type',
+     'float': 'type',
+     'bool': 'type',
+     'char': 'type',
+     'string': 'type',
+     'unit': 'type',
+
+     // Modules
+     'List': 'builtin'
   }
 });
 

From d0dca6532dd668cf415b2740152b93d1cb454410 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 19 Jan 2018 07:49:57 +0100
Subject: [PATCH 3647/4742] [shell mode] Correctly highlight strings ending in
 dollar sign

Closes #5197
---
 mode/shell/shell.js | 2 +-
 mode/shell/test.js  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 9fcd671cf5..b806c2bcb5 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -89,7 +89,7 @@ CodeMirror.defineMode('shell', function() {
         if (next === close && !escaped) {
           state.tokens.shift();
           break;
-        } else if (next === '$' && !escaped && quote !== "'") {
+        } else if (next === '$' && !escaped && quote !== "'" && stream.peek() != close) {
           escaped = true;
           stream.backUp(1);
           state.tokens.unshift(tokenDollar);
diff --git a/mode/shell/test.js b/mode/shell/test.js
index 05f07d22b1..4be557216f 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -64,4 +64,10 @@
 
   MT("strings in parens",
      "[def FOO][operator =]([quote $(<][string \"][def $MYDIR][string \"][quote /myfile grep ][string 'hello$'][quote )])")
+
+  MT ("string ending in dollar",
+     '[def a][operator =][string "xyz$"]; [def b][operator =][string "y"]')
+
+  MT ("quote ending in dollar",
+     "[quote $(echo a$)]")
 })();

From ef2341373c7a6b88779d0e01188a295154897577 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 26 Jan 2018 13:34:00 +0100
Subject: [PATCH 3648/4742] [clike mode] Disallow trailing dots in numbers in
 Kotlin

---
 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 7706429063..b89ddf0d59 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -617,7 +617,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     intendSwitch: false,
     indentStatements: false,
     multiLineStrings: true,
-    number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+\.?\d*|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
+    number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+(\.\d+)?|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
     blockKeywords: words("catch class do else finally for if where try while enum"),
     defKeywords: words("class val var object interface fun"),
     atoms: words("true false null this"),

From 156e6686774c38f1722a8ec5bfc790f7b47fd0e3 Mon Sep 17 00:00:00 2001
From: Bret Little <bret.little@gmail.com>
Date: Fri, 26 Jan 2018 03:38:13 -0700
Subject: [PATCH 3649/4742] Fix matchBrackets to work with multiple cm
 instances

---
 addon/edit/matchbrackets.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 4d7a230855..c9851bda31 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -102,18 +102,23 @@
     }
   }
 
-  var currentlyHighlighted = null;
   function doMatchBrackets(cm) {
     cm.operation(function() {
-      if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
-      currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
+      if (cm.state.matchBrackets.currentlyHighlighted) {
+        cm.state.matchBrackets.currentlyHighlighted();
+        cm.state.matchBrackets.currentlyHighlighted = null;
+      }
+      cm.state.matchBrackets.currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
     });
   }
 
   CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       cm.off("cursorActivity", doMatchBrackets);
-      if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
+      if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {
+        cm.state.matchBrackets.currentlyHighlighted();
+        cm.state.matchBrackets.currentlyHighlighted = null;
+      }
     }
     if (val) {
       cm.state.matchBrackets = typeof val == "object" ? val : {};

From 77bf40073fbf2b1cfc45d7785497e3d00ad7d3d0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 29 Jan 2018 13:10:29 +0100
Subject: [PATCH 3650/4742] Mark version 5.34.0

---
 AUTHORS           |  8 ++++++++
 CHANGELOG.md      | 22 ++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 13 +++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 47c79d1577..af5dccd192 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 List of CodeMirror contributors. Updated before every release.
 
+4oo4
 4r2r
 Aaron Brooks
 Abdelouahab
@@ -212,6 +213,7 @@ Felix Raab
 ficristo
 Filip Noetzel
 Filip Stollár
+Filype Pereira
 flack
 Florian Felten
 ForbesLindesay
@@ -256,6 +258,7 @@ Hardest
 Harshvardhan Gupta
 Hasan Karahan
 Hector Oswaldo Caballero
+Hélio
 Hendrik Wallbaum
 Henrik Haugbølle
 Herculano Campos
@@ -487,6 +490,8 @@ mzabuawala
 Narciso Jaramillo
 Nathan Williams
 ndr
+Neil Anderson
+neon-dev
 nerbert
 NetworkNode
 nextrevision
@@ -512,6 +517,7 @@ Norman Rzepka
 opl-
 Oreoluwa Onatemowo
 Oskar Segersvärd
+overdodactyl
 pablo
 pabloferz
 Pablo Zubieta
@@ -546,6 +552,7 @@ Pontus Melke
 prasanthj
 Prasanth J
 Prayag Verma
+Qiang Li
 Radek Piórkowski
 Rahul
 Rahul Anand
@@ -597,6 +604,7 @@ Sebastian Zaha
 Sergey Goder
 Sergey Tselovalnikov
 Se-Won Kim
+Shane Liesegang
 shaund
 shaun gilchrist
 Shawn A
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 855e6e4d9a..6bae55a783 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 5.34.0 (2010-01-29)
+
+### Bug fixes
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix a problem where inline styles would persist across list items.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Fix the `toggleBookmark` command.
+
+[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Improve behavior when closing triple quotes.
+
+[xml-fold addon](http://codemirror.net/demo/folding.html): Fix folding of line-broken XML tags.
+
+[shell mode](http://codemirror.net/mode/shell/): Better handling of nested quoting.
+
+[javascript-lint addon](http://codemirror.net/demo/lint.html): Clean up and simplify.
+
+[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Fix support for multiple editors at the same time.
+
+### New features
+
+New themes: [oceanic-next](http://codemirror.net/demo/theme.html#oceanic-next) and [shadowfox](http://codemirror.net/demo/theme.html#shadowfox).
+
 ## 5.33.0 (2017-12-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 01721009d7..b9b6baa1d8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.33.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.34.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 4051a32c55..c6d4022ffd 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">29-01-2018: <a href="http://codemirror.net/codemirror-5.34.0.zip">Version 5.34.0</a>:</p>
+
+  <ul>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix a problem where inline styles would persist across list items.</li>
+    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix the <code>toggleBookmark</code> command.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when closing triple quotes.</li>
+    <li><a href="http://codemirror.net/demo/folding.html">xml-fold addon</a>: Fix folding of line-broken XML tags.</li>
+    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Better handling of nested quoting.</li>
+    <li><a href="http://codemirror.net/demo/lint.html">javascript-lint addon</a>: Clean up and simplify.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix support for multiple editors at the same time.</li>
+    <li>New themes: <a href="http://codemirror.net/demo/theme.html#oceanic-next">oceanic-next</a> and <a href="http://codemirror.net/demo/theme.html#shadowfox">shadowfox</a>.</li>
+  </ul>
+
   <p class="rel">21-12-2017: <a href="http://codemirror.net/codemirror-5.33.0.zip">Version 5.33.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 1e4df9328a..09de02cd83 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.33.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.34.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 28a2925884..f577633907 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.33.1",
+  "version": "5.34.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index a12e4e3bb7..256b33b673 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.33.1"
+CodeMirror.version = "5.34.0"

From d4d4d2787fa8c8fa4215291b251773ac5c028e23 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 29 Jan 2018 13:14:43 +0100
Subject: [PATCH 3651/4742] Bump version post-5.34

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index b9b6baa1d8..4df972ceb2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.34.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.34.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index f577633907..59d1c17c21 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.34.0",
+  "version": "5.34.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 256b33b673..2a4fb32306 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.34.0"
+CodeMirror.version = "5.34.1"

From 750c86b6336b0107b81c4b460cf855ef4257c47a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 30 Jan 2018 09:26:02 +0100
Subject: [PATCH 3652/4742] Prevent selection undo from modifying read-only
 documents

Closes #5217
---
 src/model/changes.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/model/changes.js b/src/model/changes.js
index b00e29b13d..f006ceadb2 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -85,7 +85,8 @@ function makeChangeInner(doc, change) {
 
 // Revert a change stored in a document's history.
 export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
-  if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) return
+  let suppress = doc.cm && doc.cm.state.suppressEdits
+  if (suppress && !allowSelectionOnly) return
 
   let hist = doc.history, event, selAfter = doc.sel
   let source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done
@@ -110,8 +111,10 @@ export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
         return
       }
       selAfter = event
-    }
-    else break
+    } else if (suppress) {
+      source.push(event);
+      return
+    } else break
   }
 
   // Build up a reverse change object to add to the opposite history

From 15d9d4e201bc857af591a14258806bb236da3320 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 30 Jan 2018 09:31:40 +0100
Subject: [PATCH 3653/4742] Fix lint warning

---
 src/model/changes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/changes.js b/src/model/changes.js
index f006ceadb2..0d356f69a4 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -112,7 +112,7 @@ export function makeChangeFromHistory(doc, type, allowSelectionOnly) {
       }
       selAfter = event
     } else if (suppress) {
-      source.push(event);
+      source.push(event)
       return
     } else break
   }

From 9c5776d90001a9d51fa1a434e8d0be9b409cda71 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Tue, 30 Jan 2018 22:02:22 +0100
Subject: [PATCH 3654/4742] [nsis mode] Add support for NSIS 3.03

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index d6c61facf3..bedead5396 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -24,14 +24,14 @@ CodeMirror.defineSimpleMode("nsis",{
     { regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
 
     // Compile Time Commands
-    {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|pragma|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+    {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|pragma|finalize|getdllversion|gettlbversion|system|tempfile|warning|verbose|define|undef|insertmacro|macro|macroend|makensis|searchparse|searchreplace))\b/, token: "keyword"},
 
     // Conditional Compilation
     {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
     {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
 

From 83fde415fe667f0f3f358ed90b3e5383bd3a4072 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 31 Jan 2018 12:01:15 +0100
Subject: [PATCH 3655/4742] [javascript mode] Support TypeScript intersection
 type syntax

Closes #5219
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 9eb50ba974..4fdde198e7 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -594,7 +594,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function afterType(type, value) {
     if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
-    if (value == "|" || type == ".") return cont(typeexpr)
+    if (value == "|" || type == "." || value == "&") return cont(typeexpr)
     if (type == "[") return cont(expect("]"), afterType)
     if (value == "extends" || value == "implements") { cx.marked = "keyword"; return cont(typeexpr) }
   }

From 291fd84fffbe53e3e9677ee959129d9a0cfb1e00 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 31 Jan 2018 16:11:39 +0100
Subject: [PATCH 3656/4742] Make sure signalLater isn't called in addLineWidget
 when there's no editor

Closes #5221
---
 src/model/line_widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index 4a82d5389e..63080767b9 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -73,6 +73,6 @@ export function addLineWidget(doc, handle, node, options) {
     }
     return true
   })
-  signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle))
+  if (cm) signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle))
   return widget
 }

From f3e6d7ea61d0a69b57cad1ff8134fe07e8b28112 Mon Sep 17 00:00:00 2001
From: Prendota <prendota@mail.ru>
Date: Thu, 1 Feb 2018 12:17:49 +0300
Subject: [PATCH 3657/4742] [clike mode] Add kotlin keywords, operators and
 types from kotlin-stdlib

---
 mode/clike/clike.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index b89ddf0d59..f2c1e3d6ff 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -597,22 +597,24 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     name: "clike",
     keywords: words(
       /*keywords*/
-      "package as typealias class interface this super val " +
-      "var fun for is in This throw return " +
+      "package as typealias class interface this super val operator " +
+      "var fun for is in This throw return annotation " +
       "break continue object if else while do try when !in !is as? " +
 
       /*soft keywords*/
       "file import where by get set abstract enum open inner override private public internal " +
       "protected catch finally out final vararg reified dynamic companion constructor init " +
       "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
-      "external annotation crossinline const operator infix suspend actual expect"
+      "external annotation crossinline const operator infix suspend actual expect setparam"
     ),
     types: words(
       /* package java.lang */
       "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
       "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
       "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
-      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
+      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void Annotation Any BooleanArray " +
+      "ByteArray Char CharArray DeprecationLevel DoubleArray Enum FloatArray Function Int IntArray Lazy " +
+      "LazyThreadSafetyMode LongArray Nothing ShortArray Unit"
     ),
     intendSwitch: false,
     indentStatements: false,

From 97b03ae0def7e71ee719307e19bd83bf01f2ae37 Mon Sep 17 00:00:00 2001
From: Lior Goldberg <liorgol@google.com>
Date: Thu, 1 Feb 2018 16:14:45 +0200
Subject: [PATCH 3658/4742] [sublime keymap] Fix addCursorToSelection.

In addCursorToSelection, keep the cursor's position after short lines.
---
 keymap/sublime.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 7a9aadd330..aa9b65e3b1 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -156,8 +156,14 @@
     var ranges = cm.listSelections(), newRanges = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i];
-      var newAnchor = cm.findPosV(range.anchor, dir, "line");
-      var newHead = cm.findPosV(range.head, dir, "line");
+      var newAnchor = cm.findPosV(
+          range.anchor, dir, "line", range.anchor.goalColumn);
+      var newHead = cm.findPosV(
+          range.head, dir, "line", range.head.goalColumn);
+      newAnchor.goalColumn = range.anchor.goalColumn != null ?
+          range.anchor.goalColumn : cm.cursorCoords(range.anchor, "div").left;
+      newHead.goalColumn = range.head.goalColumn != null ?
+          range.head.goalColumn : cm.cursorCoords(range.head, "div").left;
       var newRange = {anchor: newAnchor, head: newHead};
       newRanges.push(range);
       newRanges.push(newRange);

From c04db48dd6613b4a30d71bc593e824aa8d341d6c Mon Sep 17 00:00:00 2001
From: NickKolok <nickkolok@mail.ru>
Date: Thu, 1 Feb 2018 21:27:56 +0300
Subject: [PATCH 3659/4742] [stex mode] LaTeX-style inline math delimiters \(
 \) are parsed correctly

---
 mode/stex/stex.js | 4 ++++
 mode/stex/test.js | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 835ed46d1e..9f3b6f75a8 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -117,6 +117,10 @@
         setState(state, function(source, state){ return inMathMode(source, state, "\\]"); });
         return "keyword";
       }
+      if (source.match("\\(")) {
+        setState(state, function(source, state){ return inMathMode(source, state, "\\)"); });
+        return "keyword";
+      }
       if (source.match("$$")) {
         setState(state, function(source, state){ return inMathMode(source, state, "$$"); });
         return "keyword";
diff --git a/mode/stex/test.js b/mode/stex/test.js
index 22f027ec7b..19575403e2 100644
--- a/mode/stex/test.js
+++ b/mode/stex/test.js
@@ -111,6 +111,9 @@
   MT("inlineMath",
      "[keyword $][number 3][variable-2 x][tag ^][number 2.45]-[tag \\sqrt][bracket {][tag \\$\\alpha][bracket }] = [number 2][keyword $] other text");
 
+  MT("inlineMathLatexStyle",
+     "[keyword \\(][number 3][variable-2 x][tag ^][number 2.45]-[tag \\sqrt][bracket {][tag \\$\\alpha][bracket }] = [number 2][keyword \\)] other text");
+
   MT("displayMath",
      "More [keyword $$]\t[variable-2 S][tag ^][variable-2 n][tag \\sum] [variable-2 i][keyword $$] other text");
 

From 07fdccfc766d8b07dad984b490768db4941df3a1 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Fri, 2 Feb 2018 15:54:55 +1000
Subject: [PATCH 3660/4742] [haskell mode] Add some builtins

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

diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index 4197666a44..5b5e33a5bf 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -197,8 +197,8 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
       "\.\.", ":", "::", "=", "\\", "<-", "->", "@", "~", "=>");
 
     setType("builtin")(
-      "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "=<<",
-      "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*", "**");
+      "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "<$>",
+      "<*>", "=<<", "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*", "**");
 
     setType("builtin")(
       "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum", "Eq",
@@ -223,7 +223,7 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
       "lcm", "length", "lex", "lines", "log", "logBase", "lookup", "map",
       "mapM", "mapM_", "max", "maxBound", "maximum", "maybe", "min", "minBound",
       "minimum", "mod", "negate", "not", "notElem", "null", "odd", "or",
-      "otherwise", "pi", "pred", "print", "product", "properFraction",
+      "otherwise", "pi", "pred", "print", "product", "properFraction", "pure",
       "putChar", "putStr", "putStrLn", "quot", "quotRem", "read", "readFile",
       "readIO", "readList", "readLn", "readParen", "reads", "readsPrec",
       "realToFrac", "recip", "rem", "repeat", "replicate", "return", "reverse",

From 780d762f6541b4a0203469cd884c5396571c4b89 Mon Sep 17 00:00:00 2001
From: NickKolok <nickkolok@mail.ru>
Date: Fri, 2 Feb 2018 17:01:00 +0300
Subject: [PATCH 3661/4742] [stex mode] Added some tags whose arguments are
 atom

---
 mode/stex/stex.js | 8 ++++++++
 mode/stex/test.js | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 9f3b6f75a8..12e5750b19 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -78,6 +78,14 @@
     plugins["begin"] = addPluginPattern("begin", "tag", ["atom"]);
     plugins["end"] = addPluginPattern("end", "tag", ["atom"]);
 
+    plugins["label"    ] = addPluginPattern("label"    , "tag", ["atom"]);
+    plugins["ref"      ] = addPluginPattern("ref"      , "tag", ["atom"]);
+    plugins["eqref"    ] = addPluginPattern("eqref"    , "tag", ["atom"]);
+    plugins["cite"     ] = addPluginPattern("cite"     , "tag", ["atom"]);
+    plugins["bibitem"  ] = addPluginPattern("bibitem"  , "tag", ["atom"]);
+    plugins["Bibitem"  ] = addPluginPattern("Bibitem"  , "tag", ["atom"]);
+    plugins["RBibitem" ] = addPluginPattern("RBibitem" , "tag", ["atom"]);
+
     plugins["DEFAULT"] = function () {
       this.name = "DEFAULT";
       this.style = "tag";
diff --git a/mode/stex/test.js b/mode/stex/test.js
index 19575403e2..634dc49d9e 100644
--- a/mode/stex/test.js
+++ b/mode/stex/test.js
@@ -117,6 +117,12 @@
   MT("displayMath",
      "More [keyword $$]\t[variable-2 S][tag ^][variable-2 n][tag \\sum] [variable-2 i][keyword $$] other text");
 
+  MT("displayMath environment",
+     "[tag \\begin][bracket {][atom equation][bracket }] x [tag \\end][bracket {][atom equation][bracket }] other text");
+
+  MT("displayMath environment with label",
+     "[tag \\begin][bracket {][atom equation][bracket }][tag \\label][bracket {][atom eq1][bracket }] x [tag \\end][bracket {][atom equation][bracket }] other text~[tag \\ref][bracket {][atom eq1][bracket }]");
+
   MT("mathWithComment",
      "[keyword $][variable-2 x] [comment % $]",
      "[variable-2 y][keyword $] other text");

From 0a625b2835dfbcad51091a8f82c58a1429ff3c64 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Sat, 3 Feb 2018 17:53:18 +0800
Subject: [PATCH 3662/4742] [haskell mode] Add "Applicative" and "*>" and "<*"

---
 mode/haskell/haskell.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index 5b5e33a5bf..acc52b5c3b 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -197,13 +197,14 @@ CodeMirror.defineMode("haskell", function(_config, modeConfig) {
       "\.\.", ":", "::", "=", "\\", "<-", "->", "@", "~", "=>");
 
     setType("builtin")(
-      "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "<$>",
-      "<*>", "=<<", "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*", "**");
+      "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<*", "<=",
+      "<$>", "<*>", "=<<", "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*",
+      "*>", "**");
 
     setType("builtin")(
-      "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum", "Eq",
-      "False", "FilePath", "Float", "Floating", "Fractional", "Functor", "GT",
-      "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left",
+      "Applicative", "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum",
+      "Eq", "False", "FilePath", "Float", "Floating", "Fractional", "Functor",
+      "GT", "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left",
       "Maybe", "Monad", "Nothing", "Num", "Ord", "Ordering", "Rational", "Read",
       "ReadS", "Real", "RealFloat", "RealFrac", "Right", "Show", "ShowS",
       "String", "True");

From 32f3d3e95b15e2403684bd75b13a6315a84b4ce9 Mon Sep 17 00:00:00 2001
From: Ian Rose <ian.r.rose@gmail.com>
Date: Mon, 5 Feb 2018 13:14:54 -0800
Subject: [PATCH 3663/4742] Add "tex" to list of extensions for LaTeX mode.

In my experience, `.tex` is a much more common extension for LaTeX documents.
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index 6377e1b9af..615b6a5883 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -138,7 +138,7 @@
     {name: "Stylus", mime: "text/x-styl", mode: "stylus", ext: ["styl"]},
     {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
-    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
+    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx", "tex"], alias: ["tex"]},
     {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v", "sv", "svh"]},
     {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
     {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},

From 4ddf5448539b8073298e90879b729eba68d1120e Mon Sep 17 00:00:00 2001
From: meshuamam <meshuamam@users.noreply.github.com>
Date: Wed, 7 Feb 2018 18:22:16 -0800
Subject: [PATCH 3664/4742] Added Pramp to realworld.html

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

diff --git a/doc/realworld.html b/doc/realworld.html
index da0f4e4e61..1c49d2482a 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -131,6 +131,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
       <li><a href="http://pharaoh.js.org/">Pharaoh</a> (browser &amp; desktop editor for the classroom)</li>
       <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
+      <li><a href="https://www.pramp.com/ref/codemirror">Pramp</a> (free platform to practice mock interviews and coding problems)</li>
       <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
       <li><a href="https://pypi.python.org/pypi/PubliForge/">PubliForge</a> (online publishing system)</li>
       <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>

From b7711f690b0cda5e3e8e9ae991c103b5e449194a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 8 Feb 2018 11:41:21 +0100
Subject: [PATCH 3665/4742] [searchcursor addon] Add multiline flag to regexp
 when searching multiline

Closes #5238
---
 addon/search/searchcursor.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 58bc47c2c3..e606c5e7cf 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -19,8 +19,11 @@
       + (regexp.multiline ? "m" : "")
   }
 
-  function ensureGlobal(regexp) {
-    return regexp.global ? regexp : new RegExp(regexp.source, regexpFlags(regexp) + "g")
+  function ensureFlags(regexp, flags) {
+    var current = regexpFlags(regexp), target = current
+    for (var i = 0; i < flags.length; i++) if (target.indexOf(flags.charAt(i)) == -1)
+      target += flags.charAt(i)
+    return current == target ? regexp : new RegExp(regexp.source, target)
   }
 
   function maybeMultiline(regexp) {
@@ -28,7 +31,7 @@
   }
 
   function searchRegexpForward(doc, regexp, start) {
-    regexp = ensureGlobal(regexp)
+    regexp = ensureFlags(regexp, "g")
     for (var line = start.line, ch = start.ch, last = doc.lastLine(); line <= last; line++, ch = 0) {
       regexp.lastIndex = ch
       var string = doc.getLine(line), match = regexp.exec(string)
@@ -42,7 +45,7 @@
   function searchRegexpForwardMultiline(doc, regexp, start) {
     if (!maybeMultiline(regexp)) return searchRegexpForward(doc, regexp, start)
 
-    regexp = ensureGlobal(regexp)
+    regexp = ensureFlags(regexp, "gm")
     var string, chunk = 1
     for (var line = start.line, last = doc.lastLine(); line <= last;) {
       // This grows the search buffer in exponentially-sized chunks
@@ -51,6 +54,7 @@
       // searching for something that has tons of matches), but at the
       // same time, the amount of retries is limited.
       for (var i = 0; i < chunk; i++) {
+        if (line > last) break
         var curLine = doc.getLine(line++)
         string = string == null ? curLine : string + "\n" + curLine
       }
@@ -81,7 +85,7 @@
   }
 
   function searchRegexpBackward(doc, regexp, start) {
-    regexp = ensureGlobal(regexp)
+    regexp = ensureFlags(regexp, "g")
     for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
       var string = doc.getLine(line)
       if (ch > -1) string = string.slice(0, ch)
@@ -94,7 +98,7 @@
   }
 
   function searchRegexpBackwardMultiline(doc, regexp, start) {
-    regexp = ensureGlobal(regexp)
+    regexp = ensureFlags(regexp, "gm")
     var string, chunk = 1
     for (var line = start.line, first = doc.firstLine(); line >= first;) {
       for (var i = 0; i < chunk; i++) {
@@ -213,7 +217,7 @@
         return (reverse ? searchStringBackward : searchStringForward)(doc, query, pos, caseFold)
       }
     } else {
-      query = ensureGlobal(query)
+      query = ensureFlags(query, "gm")
       if (!options || options.multiline !== false)
         this.matches = function(reverse, pos) {
           return (reverse ? searchRegexpBackwardMultiline : searchRegexpForwardMultiline)(doc, query, pos)

From e4ce372bf2301199a167e24c0e694138c0edb008 Mon Sep 17 00:00:00 2001
From: ficristo <ficristo.work@gmail.com>
Date: Tue, 6 Feb 2018 20:53:47 +0100
Subject: [PATCH 3666/4742] [Dockerfile mode] Some improvements add more
 instructions highlight instructions as 'keyword' highlight 'from ... as' add
 tests

---
 mode/dockerfile/dockerfile.js | 48 +++++++++++++++++++++--
 mode/dockerfile/test.js       | 71 +++++++++++++++++++++++++++++++++++
 test/index.html               |  2 +
 3 files changed, 117 insertions(+), 4 deletions(-)
 create mode 100644 mode/dockerfile/test.js

diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
index 4419009afa..6c8e18aa53 100644
--- a/mode/dockerfile/dockerfile.js
+++ b/mode/dockerfile/dockerfile.js
@@ -12,9 +12,9 @@
   "use strict";
 
   // Collect all Dockerfile directives
-  var instructions = ["from", "maintainer", "run", "cmd", "expose", "env",
+  var instructions = ["arg", "from", "maintainer", "run", "cmd", "label", "expose", "env",
                       "add", "copy", "entrypoint", "volume", "user",
-                      "workdir", "onbuild"],
+                      "workdir", "onbuild", "stopsignal", "healthcheck", "shell"],
       instructionRegex = "(" + instructions.join('|') + ")",
       instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
       instructionWithArguments = new RegExp(instructionRegex + "(\\s+)", "i");
@@ -26,15 +26,20 @@
         regex: /#.*$/,
         token: "comment"
       },
+      {
+        regex: /^(\s*)\b(from)\b/i,
+        token: [null, "keyword"],
+        next: "from"
+      },
       // Highlight an instruction without any arguments (for convenience)
       {
         regex: instructionOnlyLine,
-        token: "variable-2"
+        token: "keyword"
       },
       // Highlight an instruction followed by arguments
       {
         regex: instructionWithArguments,
-        token: ["variable-2", null],
+        token: ["keyword", null],
         next: "arguments"
       },
       {
@@ -42,6 +47,41 @@
         token: null
       }
     ],
+    from: [
+      {
+        regex: /\s*$/,
+        token: null,
+        next: "start"
+      },
+      {
+        // Line comment without instruction arguments is an error
+        regex: /(\s*)(#.*)$/,
+        token: [null, "error"],
+        next: "start"
+      },
+      {
+        // ex: FROM golang:1.9.2-alpine3.6 AS build
+        regex: /(\s*\S+\s+)(as)(\s+)\S+/i,
+        token: [null, "keyword", null],
+        next: "start"
+      },
+      {
+        // ex: FROM node:carbon
+        regex: /\s*[^#]+$/,
+        token: null,
+        next: "start"
+      },
+      {
+        // ex: FROM node:carbon # comment
+        regex: /(\s*[^#]+)\s*(#.*)$/,
+        token: [null, "comment"],
+        next: "start"
+      },
+      {
+        token: null,
+        next: "start"
+      }
+    ],
     arguments: [
       {
         // Line comment without instruction arguments is an error
diff --git a/mode/dockerfile/test.js b/mode/dockerfile/test.js
new file mode 100644
index 0000000000..73f6329d40
--- /dev/null
+++ b/mode/dockerfile/test.js
@@ -0,0 +1,71 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-dockerfile");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("simple_nodejs_dockerfile",
+     "[keyword FROM] node:carbon",
+     "[comment # Create app directory]",
+     "[keyword WORKDIR] /usr/src/app",
+     "[comment # Install app dependencies]",
+     "[comment # A wildcard is used to ensure both package.json AND package-lock.json are copied]",
+     "[comment # where available (npm@5+)]",
+     "[keyword COPY] package*.json ./",
+     "[keyword RUN] npm install",
+     "[keyword COPY] . .",
+     "[keyword EXPOSE] 8080 3000",
+     "[keyword ENV] NODE_ENV development",
+     "[keyword CMD] [[\"npm\", \"start\"]]");
+
+  // Ideally the last space should not be highlighted.
+  MT("instruction_without_args_1",
+     "[keyword CMD ]");
+
+  MT("instruction_without_args_2",
+     "[comment # An instruction without args...]",
+     "[keyword ARG] [error #...is an error]");
+
+  MT("multiline",
+     "[keyword RUN] apt-get update && apt-get install -y \\",
+     "  mercurial \\",
+     "  subversion \\",
+     "  && apt-get clean \\",
+     "  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*");
+
+  MT("from_comment",
+     "  [keyword FROM] debian:stretch [comment # I tend to use stable as that is more stable]",
+     "  [keyword FROM] debian:stretch [keyword AS] stable [comment # I am even more stable]",
+     " [keyword FROM] [error # this is an error]");
+
+  MT("from_as",
+     "[keyword FROM] golang:1.9.2-alpine3.6 [keyword AS] build",
+     "[keyword COPY] --from=build /bin/project /bin/project",
+     "[keyword ENTRYPOINT] [[\"/bin/project\"]]",
+     "[keyword CMD] [[\"--help\"]]");
+
+  MT("arg",
+     "[keyword ARG] VERSION=latest",
+     "[keyword FROM] busybox:$VERSION",
+     "[keyword ARG] VERSION",
+     "[keyword RUN] echo $VERSION > image_version");
+
+  MT("label",
+     "[keyword LABEL] com.example.label-with-value=\"foo\"",
+     "[keyword LABEL] description=\"This text illustrates \"",
+     "  that label-values can span multiple lines.\"");
+
+  MT("maintainer",
+     "[keyword MAINTAINER] Foo Bar \"foo@bar.com\"",
+     "[keyword MAINTAINER] Bar Baz <bar@baz.com>");
+
+  MT("verify_keyword",
+     "[keyword RUN] add-apt-repository ppa:chris-lea/node.js");
+
+  MT("scripts",
+     "[comment # Set an entrypoint, to automatically install node modules]",
+     "[keyword ENTRYPOINT] [[\"/bin/bash\", \"-c\", \"if [[ ! -d node_modules ]]; then npm install; fi; exec \\\"${@:0}\\\";\"]]",
+     "[keyword CMD] npm start",
+     "[keyword RUN] npm run build && npm run test");
+})();
diff --git a/test/index.html b/test/index.html
index 99bee5bb9b..b7922076c7 100644
--- a/test/index.html
+++ b/test/index.html
@@ -22,6 +22,7 @@
 <!-- clike must be after css or vim and sublime tests will fail -->
 <script src="../mode/cypher/cypher.js"></script>
 <script src="../mode/d/d.js"></script>
+<script src="../mode/dockerfile/dockerfile.js"></script>
 <script src="../mode/gfm/gfm.js"></script>
 <script src="../mode/haml/haml.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
@@ -117,6 +118,7 @@ <h2>Test Suite</h2>
     <script src="../mode/css/less_test.js"></script>
     <script src="../mode/cypher/test.js"></script>
     <script src="../mode/d/test.js"></script>
+    <script src="../mode/dockerfile/test.js"></script>
     <script src="../mode/gfm/test.js"></script>
     <script src="../mode/haml/test.js"></script>
     <script src="../mode/javascript/test.js"></script>

From 2ffbf483ca423420903be48c25fc28a30d601403 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 8 Feb 2018 15:31:52 +0100
Subject: [PATCH 3667/4742] [yaml mode] Add lineComment property

Closes #5248
---
 mode/yaml/yaml.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index 59c0ecdbec..f35a40130a 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -108,7 +108,8 @@ CodeMirror.defineMode("yaml", function() {
         literal: false,
         escaped: false
       };
-    }
+    },
+    lineComment: "#"
   };
 });
 

From bde9bfa75bc8850e8c23515beecdcf508e00298e Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Fri, 9 Feb 2018 17:30:39 -0800
Subject: [PATCH 3668/4742] Highlight NULL instead of null in C/C++

CodeMirror C and C++ currently highlight the string "null", which isn't defined in C/C++. Those languages do macro "NULL", though.
---
 mode/clike/clike.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index f2c1e3d6ff..da7a6bf5b6 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -374,7 +374,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     blockKeywords: words("case do else for if switch while struct"),
     defKeywords: words("struct"),
     typeFirstDefinitions: true,
-    atoms: words("null true false"),
+    atoms: words("NULL true false"),
     hooks: {"#": cppHook, "*": pointerHook},
     modeProps: {fold: ["brace", "include"]}
   });
@@ -390,7 +390,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     blockKeywords: words("catch class do else finally for if struct switch try while"),
     defKeywords: words("class namespace struct enum union"),
     typeFirstDefinitions: true,
-    atoms: words("true false null"),
+    atoms: words("true false NULL"),
     dontIndentStatements: /^template$/,
     isIdentifierChar: /[\w\$_~\xa1-\uffff]/,
     hooks: {

From 139c2fe686230fac2825037457ca9aa5df963464 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Sat, 10 Feb 2018 13:01:00 +0100
Subject: [PATCH 3669/4742] Add missing NSIS commands

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index bedead5396..69bc95074f 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -31,7 +31,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEDllCharacteristics|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
     {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
 

From 6bd755a923dc9e395617f20e273826181bf012c5 Mon Sep 17 00:00:00 2001
From: Lior Shub <lior.shub@blazemeter.com>
Date: Mon, 12 Feb 2018 10:34:35 +0200
Subject: [PATCH 3670/4742] Suggest a minor edit in the changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bae55a783..70228f321c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 5.34.0 (2010-01-29)
+## 5.34.0 (2018-01-29)
 
 ### Bug fixes
 

From c287357c58aa7d02a7da9c57514b4f8611fe6367 Mon Sep 17 00:00:00 2001
From: totalamd <totalamd@users.noreply.github.com>
Date: Mon, 12 Feb 2018 16:53:53 +0200
Subject: [PATCH 3671/4742] fix 'mixed content' error

---
 demo/lint.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo/lint.html b/demo/lint.html
index 6b3d792855..fb77ae8c84 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -9,9 +9,9 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/css/css.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jshint/2.9.5/jshint.min.js"></script>
-<script src="https://rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
-<script src="http://csslint.net/js/csslint.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/jshint/2.9.5/jshint.min.js"></script>
+<script src="//rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
+<script src="//csslint.net/js/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
 <script src="../addon/lint/javascript-lint.js"></script>
 <script src="../addon/lint/json-lint.js"></script>

From 5b8e5abc229cd9e6ce707800fc21b3dacd4075a2 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tmcw@users.noreply.github.com>
Date: Mon, 12 Feb 2018 23:24:21 -0800
Subject: [PATCH 3672/4742] Add support for dynamic import operator to
 JavaScript mode (#5259)

---
 mode/javascript/javascript.js | 2 ++
 mode/javascript/test.js       | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 4fdde198e7..dee0be7102 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -400,6 +400,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
     if (type == "quasi") return pass(quasi, maybeop);
     if (type == "new") return cont(maybeTarget(noComma));
+    if (type == "import") return cont(expression);
     return cont();
   }
   function maybeexpression(type) {
@@ -726,6 +727,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function afterImport(type) {
     if (type == "string") return cont();
+    if (type == "(") return pass(expression);
     return pass(importSpec, maybeMoreImports, maybeFrom);
   }
   function importSpec(type, value) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 14a5183cab..f93ee02651 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -63,6 +63,12 @@
   MT("import_trailing_comma",
      "[keyword import] {[def foo], [def bar],} [keyword from] [string 'baz']")
 
+  MT("import_dynamic",
+     "[keyword import]([string 'baz']).[property then]")
+
+  MT("import_dynamic",
+     "[keyword const] [def t] [operator =] [keyword import]([string 'baz']).[property then]")
+
   MT("const",
      "[keyword function] [def f]() {",
      "  [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",

From 95e9edfa1f55dd64d6c16626c2b86a7adbea5677 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 11 Feb 2018 11:45:00 +0100
Subject: [PATCH 3673/4742] [python mode] Handle continued lines better

Closes #5256
---
 mode/python/python.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index c318793207..4de1e75d54 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -41,7 +41,7 @@
   CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = "error";
 
-    var delimiters = parserConf.delimiters || parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
+    var delimiters = parserConf.delimiters || parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.\\]/;
     //               (Backwards-compatiblity with old, cumbersome config system)
     var operators = [parserConf.singleOperators, parserConf.doubleOperators, parserConf.doubleDelimiters, parserConf.tripleDelimiters,
                      parserConf.operators || /^([-+*/%\/&|^]=?|[<>=]+|\/\/=?|\*\*=?|!=|[~!@])/]
@@ -76,9 +76,10 @@
 
     // tokenizers
     function tokenBase(stream, state) {
-      if (stream.sol()) state.indent = stream.indentation()
+      var sol = stream.sol() && state.lastToken != "\\"
+      if (sol) state.indent = stream.indentation()
       // Handle scope changes
-      if (stream.sol() && top(state).type == "py") {
+      if (sol && top(state).type == "py") {
         var scopeOffset = top(state).offset;
         if (stream.eatSpace()) {
           var lineOffset = stream.indentation();
@@ -100,13 +101,8 @@
     function tokenBaseInner(stream, state) {
       if (stream.eatSpace()) return null;
 
-      var ch = stream.peek();
-
       // Handle Comments
-      if (ch == "#") {
-        stream.skipToEnd();
-        return "comment";
-      }
+      if (stream.match(/^#.*/)) return "comment";
 
       // Handle Number Literals
       if (stream.match(/^[0-9\.]/, false)) {

From 236b40fbd444a2e5d7b7cf5cfeb905fd44a5da98 Mon Sep 17 00:00:00 2001
From: Michal Kapiczynski <michal.kapiczynski@sirenia.eu>
Date: Tue, 13 Feb 2018 16:50:30 +0100
Subject: [PATCH 3674/4742] [javascript-lint] JSHINT backward compatibility -
 Setting error severity to error by default when there is no error.code
 property (#5260)

---
 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 9d2eb7410c..8266b7e747 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -51,7 +51,7 @@
         // Convert to format expected by validation service
         var hint = {
           message: error.reason,
-          severity: error.code.startsWith('W') ? "warning" : "error",
+          severity: error.code ? (error.code.startsWith('W') ? "warning" : "error") : "error",
           from: CodeMirror.Pos(error.line - 1, start),
           to: CodeMirror.Pos(error.line - 1, end)
         };

From ab8bf8e5efd210568893824ee7c8f8b08000906c Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Tue, 13 Feb 2018 10:30:17 -0800
Subject: [PATCH 3675/4742] Support for await syntax in JavaScript mode

[asynchronous
iteration](http://2ality.com/2016/10/asynchronous-iteration.html) is a
stage 4 ("finished") feature in ES2018, and its additional syntax - for
await loops - don't require too much change in CodeMirror's JavaScript
mode for support.
---
 mode/javascript/javascript.js | 3 ++-
 mode/javascript/test.js       | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index dee0be7102..52da9e2353 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -638,7 +638,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeelse(type, value) {
     if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
   }
-  function forspec(type) {
+  function forspec(type, value) {
+    if (value == "await") return cont(forspec);
     if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
   }
   function forspec1(type) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index f93ee02651..f770bd77f6 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -77,6 +77,9 @@
   MT("for/of",
      "[keyword for]([keyword let] [def of] [keyword of] [variable something]) {}");
 
+  MT("for await",
+     "[keyword for] [keyword await]([keyword let] [def of] [keyword of] [variable something]) {}");
+
   MT("generator",
      "[keyword function*] [def repeat]([def n]) {",
      "  [keyword for]([keyword var] [def i] [operator =] [number 0]; [variable-2 i] [operator <] [variable-2 n]; [operator ++][variable-2 i])",

From 07044165823afa2d0da0bc6d65b16b63e45bf764 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 14 Feb 2018 23:19:28 +0100
Subject: [PATCH 3676/4742] [sql mode] Add backslashStringEscapes option

Turn it off for mssql

Closes #5229
---
 mode/sql/sql.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 63e87733bf..2010b1c250 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -21,7 +21,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       operatorChars  = parserConfig.operatorChars || /^[*+\-%<>!=&|~^]/,
       support        = parserConfig.support || {},
       hooks          = parserConfig.hooks || {},
-      dateSQL        = parserConfig.dateSQL || {"date" : true, "time" : true, "timestamp" : true};
+      dateSQL        = parserConfig.dateSQL || {"date" : true, "time" : true, "timestamp" : true},
+      backslashStringEscapes = parserConfig.backslashStringEscapes !== false
 
   function tokenBase(stream, state) {
     var ch = stream.next();
@@ -125,7 +126,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
           state.tokenize = tokenBase;
           break;
         }
-        escaped = !escaped && ch == "\\";
+        escaped = backslashStringEscapes && !escaped && ch == "\\";
       }
       return "string";
     };
@@ -292,6 +293,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     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: /^[*+\-%<>!=]/,
+    backslashStringEscapes: false,
     dateSQL: set("date datetimeoffset datetime2 smalldatetime datetime time"),
     hooks: {
       "@":   hookVar

From 251a322bf2bab6fb72759aa20b8a61b1dc1285a3 Mon Sep 17 00:00:00 2001
From: ficristo <ficristo.work@gmail.com>
Date: Tue, 13 Feb 2018 19:26:32 +0100
Subject: [PATCH 3677/4742] [Dockerfile mode] Highlight strings and ports

- highlight strings
- highlight ports as numbers in expose instruction
- highlight comments as such only when they appear at the start of a line
- consider also ` as a line continuation
---
 mode/dockerfile/dockerfile.js | 150 +++++++++++++++++++++++++++-------
 mode/dockerfile/test.js       |  83 ++++++++++++++++---
 2 files changed, 191 insertions(+), 42 deletions(-)

diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
index 6c8e18aa53..769e787e4a 100644
--- a/mode/dockerfile/dockerfile.js
+++ b/mode/dockerfile/dockerfile.js
@@ -11,35 +11,64 @@
 })(function(CodeMirror) {
   "use strict";
 
+  var from = "from";
+  var fromRegex = new RegExp("^(\\s*)\\b(" + from + ")\\b", "i");
+
+  var shells = ["run", "cmd", "entrypoint", "shell"];
+  var shellsAsArrayRegex = new RegExp("^(\\s*)(" + shells.join('|') + ")(\\s+\\[)", "i");
+
+  var expose = "expose";
+  var exposeRegex = new RegExp("^(\\s*)(" + expose + ")(\\s+)", "i");
+
+  var others = [
+    "arg", "from", "maintainer", "label", "env",
+    "add", "copy", "volume", "user",
+    "workdir", "onbuild", "stopsignal", "healthcheck", "shell"
+  ];
+
   // Collect all Dockerfile directives
-  var instructions = ["arg", "from", "maintainer", "run", "cmd", "label", "expose", "env",
-                      "add", "copy", "entrypoint", "volume", "user",
-                      "workdir", "onbuild", "stopsignal", "healthcheck", "shell"],
+  var instructions = [from, expose].concat(shells).concat(others),
       instructionRegex = "(" + instructions.join('|') + ")",
-      instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
-      instructionWithArguments = new RegExp(instructionRegex + "(\\s+)", "i");
+      instructionOnlyLine = new RegExp("^(\\s*)" + instructionRegex + "(\\s*)(#.*)?$", "i"),
+      instructionWithArguments = new RegExp("^(\\s*)" + instructionRegex + "(\\s+)", "i");
 
   CodeMirror.defineSimpleMode("dockerfile", {
     start: [
       // Block comment: This is a line starting with a comment
       {
-        regex: /#.*$/,
+        regex: /^\s*#.*$/,
+        sol: true,
         token: "comment"
       },
       {
-        regex: /^(\s*)\b(from)\b/i,
+        regex: fromRegex,
         token: [null, "keyword"],
+        sol: true,
         next: "from"
       },
       // Highlight an instruction without any arguments (for convenience)
       {
         regex: instructionOnlyLine,
-        token: "keyword"
+        token: [null, "keyword", null, "error"],
+        sol: true
+      },
+      {
+        regex: shellsAsArrayRegex,
+        token: [null, "keyword", null],
+        sol: true,
+        next: "array"
+      },
+      {
+        regex: exposeRegex,
+        token: [null, "keyword", null],
+        sol: true,
+        next: "expose"
       },
       // Highlight an instruction followed by arguments
       {
         regex: instructionWithArguments,
-        token: ["keyword", null],
+        token: [null, "keyword", null],
+        sol: true,
         next: "arguments"
       },
       {
@@ -60,59 +89,122 @@
         next: "start"
       },
       {
-        // ex: FROM golang:1.9.2-alpine3.6 AS build
-        regex: /(\s*\S+\s+)(as)(\s+)\S+/i,
-        token: [null, "keyword", null],
+        regex: /(\s*\S+\s+)(as)/i,
+        token: [null, "keyword"],
         next: "start"
       },
+      // Fail safe return to start
       {
-        // ex: FROM node:carbon
-        regex: /\s*[^#]+$/,
         token: null,
         next: "start"
+      }
+    ],
+    single: [
+      {
+        regex: /(?:[^\\']|\\.)/,
+        token: "string"
       },
       {
-        // ex: FROM node:carbon # comment
-        regex: /(\s*[^#]+)\s*(#.*)$/,
-        token: [null, "comment"],
-        next: "start"
+        regex: /'/,
+        token: "string",
+        pop: true
+      }
+    ],
+    double: [
+      {
+        regex: /(?:[^\\"]|\\.)/,
+        token: "string"
       },
       {
+        regex: /"/,
+        token: "string",
+        pop: true
+      }
+    ],
+    array: [
+      {
+        regex: /\]/,
         token: null,
         next: "start"
+      },
+      {
+        regex: /"(?:[^\\"]|\\.)*"?/,
+        token: "string"
       }
     ],
-    arguments: [
+    expose: [
       {
-        // Line comment without instruction arguments is an error
-        regex: /#.*$/,
-        token: "error",
+        regex: /\d+$/,
+        token: "number",
         next: "start"
       },
       {
-        regex: /[^#]+\\$/,
+        regex: /[^\d]+$/,
+        token: null,
+        next: "start"
+      },
+      {
+        regex: /\d+/,
+        token: "number"
+      },
+      {
+        regex: /[^\d]+/,
         token: null
       },
+      // Fail safe return to start
       {
-        // Match everything except for the inline comment
-        regex: /[^#]+/,
         token: null,
         next: "start"
+      }
+    ],
+    arguments: [
+      {
+        regex: /^\s*#.*$/,
+        sol: true,
+        token: "comment"
+      },
+      {
+        regex: /"(?:[^\\"]|\\.)*"?$/,
+        token: "string",
+        next: "start"
       },
       {
-        regex: /$/,
+        regex: /"/,
+        token: "string",
+        push: "double"
+      },
+      {
+        regex: /'(?:[^\\']|\\.)*'?$/,
+        token: "string",
+        next: "start"
+      },
+      {
+        regex: /'/,
+        token: "string",
+        push: "single"
+      },
+      {
+        regex: /[^#"']+[\\`]$/,
+        token: null
+      },
+      {
+        regex: /[^#"']+$/,
         token: null,
         next: "start"
       },
+      {
+        regex: /[^#"']+/,
+        token: null
+      },
       // Fail safe return to start
       {
         token: null,
         next: "start"
       }
     ],
-      meta: {
-          lineComment: "#"
-      }
+    meta: {
+      lineComment: "#"
+    }
   });
 
   CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");
diff --git a/mode/dockerfile/test.js b/mode/dockerfile/test.js
index 73f6329d40..9a2b89ad21 100644
--- a/mode/dockerfile/test.js
+++ b/mode/dockerfile/test.js
@@ -15,13 +15,13 @@
      "[keyword COPY] package*.json ./",
      "[keyword RUN] npm install",
      "[keyword COPY] . .",
-     "[keyword EXPOSE] 8080 3000",
+     "[keyword EXPOSE] [number 8080] [number 3000]",
      "[keyword ENV] NODE_ENV development",
-     "[keyword CMD] [[\"npm\", \"start\"]]");
+     "[keyword CMD] [[ [string \"npm\"], [string \"start\"] ]]");
 
   // Ideally the last space should not be highlighted.
   MT("instruction_without_args_1",
-     "[keyword CMD ]");
+     "[keyword CMD] ");
 
   MT("instruction_without_args_2",
      "[comment # An instruction without args...]",
@@ -35,15 +35,15 @@
      "  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*");
 
   MT("from_comment",
-     "  [keyword FROM] debian:stretch [comment # I tend to use stable as that is more stable]",
-     "  [keyword FROM] debian:stretch [keyword AS] stable [comment # I am even more stable]",
+     "  [keyword FROM] debian:stretch # I tend to use stable as that is more stable",
+     "  [keyword FROM] debian:stretch [keyword AS] stable # I am even more stable",
      " [keyword FROM] [error # this is an error]");
 
   MT("from_as",
      "[keyword FROM] golang:1.9.2-alpine3.6 [keyword AS] build",
      "[keyword COPY] --from=build /bin/project /bin/project",
-     "[keyword ENTRYPOINT] [[\"/bin/project\"]]",
-     "[keyword CMD] [[\"--help\"]]");
+     "[keyword ENTRYPOINT] [[ [string \"/bin/project\"] ]]",
+     "[keyword CMD] [[ [string \"--help\"] ]]");
 
   MT("arg",
      "[keyword ARG] VERSION=latest",
@@ -52,20 +52,77 @@
      "[keyword RUN] echo $VERSION > image_version");
 
   MT("label",
-     "[keyword LABEL] com.example.label-with-value=\"foo\"",
-     "[keyword LABEL] description=\"This text illustrates \"",
-     "  that label-values can span multiple lines.\"");
+     "[keyword LABEL] com.example.label-with-value=[string \"foo\"]");
+
+  MT("label_multiline",
+     "[keyword LABEL] description=[string \"This text illustrates ]\\",
+     "[string that label-values can span multiple lines.\"]");
 
   MT("maintainer",
-     "[keyword MAINTAINER] Foo Bar \"foo@bar.com\"",
+     "[keyword MAINTAINER] Foo Bar [string \"foo@bar.com\"] ",
      "[keyword MAINTAINER] Bar Baz <bar@baz.com>");
 
+  MT("env",
+     "[keyword ENV] BUNDLE_PATH=[string \"$GEM_HOME\"] \\",
+     "  BUNDLE_APP_CONFIG=[string \"$GEM_HOME\"]");
+
   MT("verify_keyword",
      "[keyword RUN] add-apt-repository ppa:chris-lea/node.js");
 
   MT("scripts",
      "[comment # Set an entrypoint, to automatically install node modules]",
-     "[keyword ENTRYPOINT] [[\"/bin/bash\", \"-c\", \"if [[ ! -d node_modules ]]; then npm install; fi; exec \\\"${@:0}\\\";\"]]",
+     "[keyword ENTRYPOINT] [[ [string \"/bin/bash\"], [string \"-c\"], [string \"if [[ ! -d node_modules ]]; then npm install; fi; exec \\\"${@:0}\\\";\"] ]]",
      "[keyword CMD] npm start",
-     "[keyword RUN] npm run build && npm run test");
+     "[keyword RUN] npm run build && \\",
+     "[comment # a comment between the shell commands]",
+     "  npm run test");
+
+  MT("strings_single",
+     "[keyword FROM] buildpack-deps:stretch",
+     "[keyword RUN] { \\",
+     "        echo [string 'install: --no-document']; \\",
+     "        echo [string 'update: --no-document']; \\",
+     "    } >> /usr/local/etc/gemrc");
+
+  MT("strings_single_multiline",
+     "[keyword RUN] set -ex \\",
+     "    \\",
+     "    && buildDeps=[string ' ]\\",
+     "[string        bison ]\\",
+     "[string        dpkg-dev ]\\",
+     "[string        libgdbm-dev ]\\",
+     "[string        ruby ]\\",
+     "[string    '] \\",
+     "    && apt-get update");
+
+  MT("strings_single_multiline_2",
+     "[keyword RUN] echo [string 'say \\' ]\\",
+     "[string   it works'] ");
+
+  MT("strings_double",
+     "[keyword RUN] apt-get install -y --no-install-recommends $buildDeps \\",
+     " \\",
+     " && wget -O ruby.tar.xz [string \"https://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR%-rc}/ruby-$RUBY_VERSION.tar.xz\"] \\",
+     " && echo [string \"$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz\"] | sha256sum -c - ");
+
+  MT("strings_double_multiline",
+     "[keyword RUN] echo [string \"say \\\" ]\\",
+     "[string   it works\"] ");
+
+  MT("escape",
+     "[comment # escape=`]",
+     "[keyword FROM] microsoft/windowsservercore",
+     "[keyword RUN] powershell.exe -Command `",
+     "    $ErrorActionPreference = [string 'Stop']; `",
+     "    wget https://www.python.org/ftp/python/3.5.1/python-3.5.1.exe -OutFile c:\python-3.5.1.exe ; `",
+     "    Start-Process c:\python-3.5.1.exe -ArgumentList [string '/quiet InstallAllUsers=1 PrependPath=1'] -Wait ; `",
+     "    Remove-Item c:\python-3.5.1.exe -Force)");
+
+  MT("escape_strings",
+     "[comment # escape=`]",
+     "[keyword FROM] python:3.6-windowsservercore [keyword AS] python",
+     "[keyword RUN] $env:PATH = [string 'C:\\Python;C:\\Python\\Scripts;{0}'] -f $env:PATH ; `",
+     // It should not consider \' as escaped.
+     // "  Set-ItemProperty -Path [string 'HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment\\'] -Name Path -Value $env:PATH ;");
+     "  Set-ItemProperty -Path [string 'HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment\\' -Name Path -Value $env:PATH ;]");
 })();

From f0452feb2a24c7706ec9663cc02ead46c302c2c0 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 19 Feb 2018 00:02:52 +0400
Subject: [PATCH 3678/4742] [vim] add support for alternate delimiters for the
 replace command

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

diff --git a/keymap/vim.js b/keymap/vim.js
index b082268183..0e1cae4a5a 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3683,7 +3683,15 @@
       }
     }
     function splitBySlash(argString) {
-      var slashes = findUnescapedSlashes(argString) || [];
+      return splitBySeparator(argString, '/');
+    }
+
+    function findUnescapedSlashes(argString) {
+      return findUnescapedSeparators(argString, '/');
+    }
+
+    function splitBySeparator(argString, separator) {
+      var slashes = findUnescapedSeparators(argString, separator) || [];
       if (!slashes.length) return [];
       var tokens = [];
       // in case of strings like foo/bar
@@ -3695,12 +3703,15 @@
       return tokens;
     }
 
-    function findUnescapedSlashes(str) {
+    function findUnescapedSeparators(str, separator) {
+      if (!separator)
+        separator = '/';
+
       var escapeNextChar = false;
       var slashes = [];
       for (var i = 0; i < str.length; i++) {
         var c = str.charAt(i);
-        if (!escapeNextChar && c == '/') {
+        if (!escapeNextChar && c == separator) {
           slashes.push(i);
         }
         escapeNextChar = !escapeNextChar && (c == '\\');
@@ -4566,7 +4577,7 @@
               'any other getSearchCursor implementation.');
         }
         var argString = params.argString;
-        var tokens = argString ? splitBySlash(argString) : [];
+        var tokens = argString ? splitBySeparator(argString, argString[0]) : [];
         var regexPart, replacePart = '', trailing, flagsPart, count;
         var confirm = false; // Whether to confirm each replace.
         var global = false; // True to replace all instances on a line, false to replace only 1.
@@ -4610,7 +4621,7 @@
               global = true;
               flagsPart.replace('g', '');
             }
-            regexPart = regexPart + '/' + flagsPart;
+            regexPart = regexPart.replace(/\//g, "\\/") + '/' + flagsPart;
           }
         }
         if (regexPart) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 5a42b90fa8..cce84b65cb 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3648,6 +3648,11 @@ testVim('ex_substitute_same_line', function(cm, vim, helpers) {
   helpers.doEx('s/one/two/g');
   eq('one one\n two two', cm.getValue());
 }, { value: 'one one\n one one'});
+testVim('ex_substitute_alternate_separator', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('s#o/e#two#g');
+  eq('o/e o/e\n two two', cm.getValue());
+}, { value: 'o/e o/e\n o/e o/e'});
 testVim('ex_substitute_full_file', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   helpers.doEx('%s/one/two/g');

From 1a10a148777feebd45001d610dd1d1298ca19147 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 19 Feb 2018 00:04:19 +0400
Subject: [PATCH 3679/4742] [vim] do not select range specifier in command
 prompt

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0e1cae4a5a..1bda3d529f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1426,7 +1426,7 @@
         } else {
           if (vim.visualMode) {
             showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>',
-                onKeyDown: onPromptKeyDown});
+                onKeyDown: onPromptKeyDown, selectValueOnOpen: false});
           } else {
             showPrompt(cm, { onClose: onPromptClose, prefix: ':',
                 onKeyDown: onPromptKeyDown});

From ed9278cba6e1f75328df6b257f1043d35a690c59 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 19 Feb 2018 17:15:47 +0400
Subject: [PATCH 3680/4742] [vim] remove unnesseary seimicolons

---
 keymap/vim.js    |  8 ++++----
 test/vim_test.js | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 1bda3d529f..529654a3b5 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -841,7 +841,7 @@
         }
 
         function handleKeyNonInsertMode() {
-          if (handleMacroRecording() || handleEsc()) { return true; };
+          if (handleMacroRecording() || handleEsc()) { return true; }
 
           var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
           if (/^[1-9]\d*$/.test(keys)) { return true; }
@@ -4837,7 +4837,7 @@
       }
       if (!confirm) {
         replaceAll();
-        if (callback) { callback(); };
+        if (callback) { callback(); }
         return;
       }
       showPrompt(cm, {
@@ -4973,7 +4973,7 @@
             exitInsertMode(cm);
           }
         }
-      };
+      }
       macroModeState.isPlaying = false;
     }
 
@@ -5177,7 +5177,7 @@
         exitInsertMode(cm);
       }
       macroModeState.isPlaying = false;
-    };
+    }
 
     function repeatInsertModeChanges(cm, changes, repeat) {
       function keyHandler(binding) {
diff --git a/test/vim_test.js b/test/vim_test.js
index cce84b65cb..6433134c21 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -255,7 +255,7 @@ function testJumplist(name, keys, endPos, startPos, dialog) {
     helpers.doKeys.apply(null, keys);
     helpers.assertCursorAt(endPos);
   }, {value: jumplistScene});
-};
+}
 testJumplist('jumplist_H', ['H', '<C-o>'], [5,2], [5,2]);
 testJumplist('jumplist_M', ['M', '<C-o>'], [2,2], [2,2]);
 testJumplist('jumplist_L', ['L', '<C-o>'], [2,2], [2,2]);
@@ -299,15 +299,15 @@ function testMotion(name, keys, endPos, startPos) {
     helpers.doKeys(keys);
     helpers.assertCursorAt(endPos);
   });
-};
+}
 
 function makeCursor(line, ch) {
   return new Pos(line, ch);
-};
+}
 
 function offsetCursor(cur, offsetLine, offsetCh) {
   return new Pos(cur.line + offsetLine, cur.ch + offsetCh);
-};
+}
 
 // Motion tests
 testMotion('|', '|', makeCursor(0, 0), makeCursor(0,4));
@@ -3909,7 +3909,7 @@ function testSubstituteConfirm(name, command, initialValue, expectedValue, keys,
       cm.openDialog = savedOpenDialog;
     }
   }, { value: initialValue });
-};
+}
 testSubstituteConfirm('ex_substitute_confirm_emptydoc',
     '%s/x/b/c', '', '', '', makeCursor(0, 0));
 testSubstituteConfirm('ex_substitute_confirm_nomatch',

From 749409d45d32c1ad73c3a8c4e6078374df46a650 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Mon, 19 Feb 2018 14:35:22 -0800
Subject: [PATCH 3681/4742] [javascript-hint addon] Add ECMAScript 2015
 keywords

This explicitly adds keywords that are already syntax-highlighted
and correctly parsed by CodeMirror already in the JavaScript mode.
---
 addon/hint/javascript-hint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index d7088c191b..9c39b168e9 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -92,8 +92,8 @@
   var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " +
                     "lastIndexOf every some filter forEach map reduce reduceRight ").split(" ");
   var funcProps = "prototype apply call bind".split(" ");
-  var javascriptKeywords = ("break case catch continue debugger default delete do else false finally for function " +
-                  "if in instanceof new null return switch throw true try typeof var void while with").split(" ");
+  var javascriptKeywords = ("break case catch class const continue debugger default delete do else export extends false finally for function " +
+                  "if in import instanceof new null return super switch this throw true try typeof var void while with yield").split(" ");
   var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
                   "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
 

From ebaccf65e3a131a95644586e38b295c86a783eca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Feb 2018 09:15:09 +0100
Subject: [PATCH 3682/4742] [mathematica mode] Remove some regexps with
 exponential blowup risk

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

diff --git a/mode/mathematica/mathematica.js b/mode/mathematica/mathematica.js
index d6977088ce..07e808b1e9 100644
--- a/mode/mathematica/mathematica.js
+++ b/mode/mathematica/mathematica.js
@@ -71,12 +71,12 @@ CodeMirror.defineMode('mathematica', function(_config, _parserConfig) {
     }
 
     // usage
-    if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::usage)/, true, false)) {
+    if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::usage)/, true, false)) {
       return 'meta';
     }
 
     // message
-    if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/, true, false)) {
+    if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*(?:`[a-zA-Z0-9\$]+)*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/, true, false)) {
       return 'string-2';
     }
 

From aab9d7161620896fea869a48e048997303af3b77 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Feb 2018 09:25:18 +0100
Subject: [PATCH 3683/4742] [match-highlighter addon] Escape special characters
 when creating regexp

Issue #5265
---
 addon/search/match-highlighter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 73ba0e0537..3522171179 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -90,7 +90,7 @@
     var state = cm.state.matchHighlighter;
     cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
     if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
-      var searchFor = hasBoundary ? new RegExp("\\b" + query + "\\b") : query;
+      var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[+*?(){|^$]/g, "\\$&") + "\\b") : query;
       state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
         {className: "CodeMirror-selection-highlight-scrollbar"});
     }

From 33301204f64625256ee2679851e07f71a36827b3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Feb 2018 09:45:51 +0100
Subject: [PATCH 3684/4742] Mark version 5.35.0

---
 AUTHORS           |  9 +++++++++
 CHANGELOG.md      | 28 ++++++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 16 ++++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index af5dccd192..b384b8e8e8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -109,6 +109,7 @@ borawjm
 Brad Metcalf
 Brandon Frohs
 Brandon Wamboldt
+Bret Little
 Brett Zamir
 Brian Grinstead
 Brian Sletten
@@ -269,6 +270,7 @@ Hugues Malphettes
 Ian Beck
 Ian Davies
 Ian Dickinson
+Ian Rose
 Ian Wehrman
 Ian Wetherbee
 Ice White
@@ -390,6 +392,7 @@ Leonya Khachaturov
 Liam Newman
 Libo Cannici
 Lior Goldberg
+Lior Shub
 LloydMilligan
 LM
 lochel
@@ -455,6 +458,7 @@ mbarkhau
 McBrainy
 mce2
 melpon
+meshuamam
 Metatheos
 Micah Dubinko
 Michael
@@ -466,6 +470,7 @@ Michael Walker
 Michael Zhou
 Michal Čihař
 Michal Dorner
+Michal Kapiczynski
 Mighty Guava
 Miguel Castillo
 mihailik
@@ -500,6 +505,7 @@ nguillaumin
 Ng Zhi An
 Nicholas Bollweg
 Nicholas Bollweg (Nick)
+NickKolok
 Nick Kreeger
 Nick Small
 Nicolas Kick
@@ -552,6 +558,7 @@ Pontus Melke
 prasanthj
 Prasanth J
 Prayag Verma
+Prendota
 Qiang Li
 Radek Piórkowski
 Rahul
@@ -674,12 +681,14 @@ Tom Klancer
 Tom MacWright
 Tony Jian
 tophf
+totalamd
 Travis Heppe
 Triangle717
 Tristan Tarrant
 TSUYUSATO Kitsune
 twifkak
 Tyler Long
+Vaibhav Sagar
 VapidWorx
 Vestimir Markov
 vf
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70228f321c..10427a086d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 5.35.0 (2018-02-20)
+
+### Bug fixes
+
+Fix problem where selection undo might change read-only documents.
+
+Fix crash when calling `addLineWidget` on a document that has no attached editor.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix behavior of `^` in multiline regexp mode.
+
+[match-highlighter addon](http://codemirror.net/doc/manual.html#addon_match-highlighter): Fix problem with matching words that have regexp special syntax in them.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Fix `addCursorToSelection` for short lines.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support TypeScript intersection types, dynamic `import`.
+
+[stex mode](http://codemirror.net/mode/stex/): Fix parsing of `\(` `\)` delimiters, recognize more atom arguments.
+
+[haskell mode](http://codemirror.net/mode/haskell/): Highlight more builtins, support `<*` and `*>`.
+
+[sql mode](http://codemirror.net/mode/sql/): Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.
+
+[dockerfile mode](http://codemirror.net/mode/dockerfile/): Highlight strings and ports, recognize more instructions.
+
+### New features
+
+[vim bindings](http://codemirror.net/demo/vim.html): Support alternative delimiters in replace command.
+
 ## 5.34.0 (2018-01-29)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 4df972ceb2..ddb85e3391 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.34.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.35.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 c6d4022ffd..9a027b900e 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,22 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-02-2018: <a href="http://codemirror.net/codemirror-5.35.0.zip">Version 5.35.0</a>:</p>
+
+  <ul>
+    <li>Fix problem where selection undo might change read-only documents.</li>
+    <li>Fix crash when calling <code>addLineWidget</code> on a document that has no attached editor.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix behavior of <code>^</code> in multiline regexp mode.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Fix problem with matching words that have regexp special syntax in them.</li>
+    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix <code>addCursorToSelection</code> for short lines.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Support alternative delimiters in replace command.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support TypeScript intersection types, dynamic <code>import</code>.</li>
+    <li><a href="http://codemirror.net/mode/stex/">stex mode</a>: Fix parsing of <code>\(</code> <code>\)</code> delimiters, recognize more atom arguments.</li>
+    <li><a href="http://codemirror.net/mode/haskell/">haskell mode</a>: Highlight more builtins, support <code>&lt;*</code> and <code>*&gt;</code>.</li>
+    <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.</li>
+    <li><a href="http://codemirror.net/mode/dockerfile/">dockerfile mode</a>: Highlight strings and ports, recognize more instructions.</li>
+  </ul>
+
   <p class="rel">29-01-2018: <a href="http://codemirror.net/codemirror-5.34.0.zip">Version 5.34.0</a>:</p>
 
   <ul>
diff --git a/index.html b/index.html
index 09de02cd83..5f7dced148 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.34.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.35.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 59d1c17c21..30ee385a7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.34.1",
+  "version": "5.35.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 2a4fb32306..796a4c4e5f 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.34.1"
+CodeMirror.version = "5.35.0"

From 404a9257a073a12c16a83086bf6c507dead4b4aa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Feb 2018 09:58:15 +0100
Subject: [PATCH 3685/4742] Bump version post-5.35.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index ddb85e3391..5428fb8259 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.35.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.35.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 30ee385a7c..d0ea485a65 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.35.0",
+  "version": "5.35.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 796a4c4e5f..34c198f403 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.35.0"
+CodeMirror.version = "5.35.1"

From 225363571f775e4245bec9a43d32dee3558268c5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Feb 2018 10:11:43 +0100
Subject: [PATCH 3686/4742] [match-highlighter addon] Add missing special char
 when escaping regexp

---
 addon/search/match-highlighter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 3522171179..260cdeb2aa 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -90,7 +90,7 @@
     var state = cm.state.matchHighlighter;
     cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
     if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
-      var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[+*?(){|^$]/g, "\\$&") + "\\b") : query;
+      var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[.+*?(){|^$]/g, "\\$&") + "\\b") : query;
       state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
         {className: "CodeMirror-selection-highlight-scrollbar"});
     }

From bf3d21a762a67b3a2381bef28b609764e2012cb1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Feb 2018 10:22:23 +0100
Subject: [PATCH 3687/4742] [javascript mode] Recognize TypeScript typeof in
 type position

Closes #5275
---
 mode/javascript/javascript.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 52da9e2353..fe39eb1440 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -560,14 +560,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
   }
   function typeexpr(type, value) {
+    if (value == "keyof" || value == "typeof") {
+      cx.marked = "keyword"
+      return cont(value == "keyof" ? typeexpr : expression)
+    }
     if (type == "variable" || value == "void") {
-      if (value == "keyof") {
-        cx.marked = "keyword"
-        return cont(typeexpr)
-      } else {
-        cx.marked = "type"
-        return cont(afterType)
-      }
+      cx.marked = "type"
+      return cont(afterType)
     }
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
     if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)

From c285a2c889abde00e0c7adc397c3ab69d4c51fdf Mon Sep 17 00:00:00 2001
From: Heanes <heanes@163.com>
Date: Wed, 21 Feb 2018 17:54:07 +0800
Subject: [PATCH 3688/4742] fix doc-manaual.html dom tag

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

diff --git a/doc/manual.html b/doc/manual.html
index 5428fb8259..bd40ebaa06 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -330,7 +330,7 @@ <h2>Configuration</h2>
           <dt><code><strong>moveOnDrag</strong>: bool</code></dt>
           <dd>When the mouse even drags content around inside the
           editor, this controls whether it is copied (false) or moved
-          (true).</dt>
+          (true).</dd>
         </dl>
       </dd>
 

From e8f585ea168256bb0342f3a7fd6efb6056186e6b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Feb 2018 16:27:34 +0100
Subject: [PATCH 3689/4742] [markdown mode] Fix a potentially
 exponential-complexity regexp

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 24e2468026..6493213b5a 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -90,7 +90,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
   ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/
-  ,   linkDefRE = /^\s*\[[^\]]+?\]:\s*\S+(\s*\S*\s*)?$/ // naive link-definition
+  ,   linkDefRE = /^\s*\[[^\]]+?\]:.*$/ // naive link-definition
   ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
   ,   expandedTab = "    " // CommonMark specifies tab as 4 spaces
 

From c1ec14bfe2e36c554ebabbda5cb3f52d9d6cfac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Vr=C3=A1na?= <jakub@vrana.cz>
Date: Thu, 22 Feb 2018 18:15:28 +0100
Subject: [PATCH 3690/4742] [soy mode] Support kind="trusted_resource_uri"
 (#5279)

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

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 98f308658e..de54401500 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -22,6 +22,7 @@
       attributes: textMode,
       text: textMode,
       uri: textMode,
+      trusted_resource_uri: textMode,
       css: CodeMirror.getMode(config, "text/css"),
       js: CodeMirror.getMode(config, {name: "text/javascript", statementIndent: 2 * config.indentUnit})
     };

From 8ff6a40fa45c6ed24f5cdb639c2397c5bede6654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Gonz=C3=A1lez=20=C3=8D=C3=B1iguez?=
 <cmglez10@users.noreply.github.com>
Date: Tue, 6 Mar 2018 11:49:29 +0100
Subject: [PATCH 3691/4742] [velocity mode] Properly highlight variables with
 dash

Issue  #5287
---
 mode/velocity/velocity.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index 12ee221249..2525fda5ca 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -82,7 +82,7 @@ CodeMirror.defineMode("velocity", function() {
         }
         // variable?
         else if (ch == "$") {
-            stream.eatWhile(/[\w\d\$_\.{}]/);
+            stream.eatWhile(/[\w\d\$_\.{}-]/);
             // is it one of the specials?
             if (specials && specials.propertyIsEnumerable(stream.current())) {
                 return "keyword";

From 563e0eff7bf68a808a59a52cc377359ea181405f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 8 Mar 2018 09:40:44 +0100
Subject: [PATCH 3692/4742] [realworld uses] Add BNF Playground

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 1c49d2482a..3a8005371d 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -34,6 +34,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a> (code hosting)</li>
       <li><a href="https://blogger.googleblog.com/2013/04/improvements-to-blogger-template-html.html">Blogger's theme editor</a></li>
       <li><a href="http://bluegriffon.org/">BlueGriffon</a> (HTML editor)</li>
+      <li><a href="https://bnfplayground.pauliankline.com/">BNF Playground</a> (grammar workbench)</li>
       <li><a href="https://github.com/isdampe/BosonEditorExperimental">Boson Editor</a> (code editor)</li>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>

From df4a306481575b730bf0cde185301b752a018ece Mon Sep 17 00:00:00 2001
From: Lemmon <lemmon@users.noreply.github.com>
Date: Thu, 8 Mar 2018 15:06:02 +0100
Subject: [PATCH 3693/4742] [markdown mode] detecting xml mode inside markdown

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 6493213b5a..d252fb8983 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -534,7 +534,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return type + tokenTypes.linkEmail;
     }
 
-    if (modeCfg.xml && ch === '<' && stream.match(/^(!--|[a-z]+(?:\s+[a-z_:.\-]+(?:\s*=\s*[^ >]+)?)*\s*>)/i, false)) {
+    if (modeCfg.xml && ch === '<' && stream.match(/^(!--|[a-z]+(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*>)/i, false)) {
       var end = stream.string.indexOf(">", stream.pos);
       if (end != -1) {
         var atts = stream.string.substring(stream.start, end);

From 708667b226798e6cc903db1e8f9e4b801d10165d Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <pyro777@gmail.com>
Date: Fri, 9 Mar 2018 12:55:33 -0800
Subject: [PATCH 3694/4742] [multiplex addon] Fix bug with indentation

---
 addon/mode/multiplex.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 3d8b34c452..a084f7025a 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -50,7 +50,15 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           if (found == stream.pos) {
             if (!other.parseDelimiters) stream.match(other.open);
             state.innerActive = other;
-            state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
+
+            // Get the outer indent, making sure to handle CodeMirror.Pass
+            var outerIndent = 0;
+            if (outer.indent) {
+              var possibleOuterIndent = outer.indent(state.outer, "");
+              if (possibleOuterIndent !== CodeMirror.Pass) outerIndent = possibleOuterIndent;
+            }
+
+            state.inner = CodeMirror.startState(other.mode, outerIndent);
             return other.delimStyle && (other.delimStyle + " " + other.delimStyle + "-open");
           } else if (found != -1 && found < cutOff) {
             cutOff = found;

From 74a71c4c82c9f7e1cdb2fb4dd892568caddf83e7 Mon Sep 17 00:00:00 2001
From: Chris Reeves <chris@ev-soft.net>
Date: Fri, 9 Mar 2018 18:18:34 -0500
Subject: [PATCH 3695/4742] move field creation in TextareaInput to an
 overridable method

---
 src/input/TextareaInput.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index c0f04aaaf2..adfa36034d 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -32,13 +32,10 @@ export default class TextareaInput {
 
   init(display) {
     let input = this, cm = this.cm
+    this.createField(display)
+    const te = this.textarea
 
-    // Wraps and hides input textarea
-    let div = this.wrapper = hiddenTextarea()
-    // The semihidden textarea that is focused when the editor is
-    // focused, and receives input.
-    let te = this.textarea = div.firstChild
-    display.wrapper.insertBefore(div, display.wrapper.firstChild)
+    display.wrapper.insertBefore(this.wrapper, display.wrapper.firstChild)
 
     // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
     if (ios) te.style.width = "0px"
@@ -105,6 +102,14 @@ export default class TextareaInput {
     })
   }
 
+  createField(_display) {
+    // Wraps and hides input textarea
+    this.wrapper = hiddenTextarea()
+    // The semihidden textarea that is focused when the editor is
+    // focused, and receives input.
+    this.textarea = this.wrapper.firstChild
+  }
+
   prepareSelection() {
     // Redraw the selection and/or cursor
     let cm = this.cm, display = cm.display, doc = cm.doc

From df4cc22a6e8c44a6181c599acbc7f85aeb215363 Mon Sep 17 00:00:00 2001
From: Randy Luecke <randy.luecke@me.com>
Date: Tue, 13 Mar 2018 16:16:41 -0700
Subject: [PATCH 3696/4742] Fix for mouse events that get sent to the wrong
 document when the script is being run in a different frame than the editor.

---
 src/edit/mouse_events.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 696a4bbfa2..63e096b705 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -149,8 +149,8 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
   let dragEnd = operation(cm, e => {
     if (webkit) display.scroller.draggable = false
     cm.state.draggingText = false
-    off(document, "mouseup", dragEnd)
-    off(document, "mousemove", mouseMove)
+    off(display.wrapper.ownerDocument, "mouseup", dragEnd)
+    off(display.wrapper.ownerDocument, "mousemove", mouseMove)
     off(display.scroller, "dragstart", dragStart)
     off(display.scroller, "drop", dragEnd)
     if (!moved) {
@@ -159,7 +159,7 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
         extendSelection(cm.doc, pos, null, null, behavior.extend)
       // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
       if (webkit || ie && ie_version == 9)
-        setTimeout(() => {document.body.focus(); display.input.focus()}, 20)
+        setTimeout(() => {display.wrapper.ownerDocument.body.focus(); display.input.focus()}, 20)
       else
         display.input.focus()
     }
@@ -174,8 +174,8 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
   dragEnd.copy = !behavior.moveOnDrag
   // IE's approach to draggable
   if (display.scroller.dragDrop) display.scroller.dragDrop()
-  on(document, "mouseup", dragEnd)
-  on(document, "mousemove", mouseMove)
+  on(display.wrapper.ownerDocument, "mouseup", dragEnd)
+  on(display.wrapper.ownerDocument, "mousemove", mouseMove)
   on(display.scroller, "dragstart", dragStart)
   on(display.scroller, "drop", dragEnd)
 
@@ -307,8 +307,8 @@ function leftButtonSelect(cm, event, start, behavior) {
     counter = Infinity
     e_preventDefault(e)
     display.input.focus()
-    off(document, "mousemove", move)
-    off(document, "mouseup", up)
+    off(display.wrapper.ownerDocument, "mousemove", move)
+    off(display.wrapper.ownerDocument, "mouseup", up)
     doc.history.lastSelOrigin = null
   }
 
@@ -318,8 +318,8 @@ function leftButtonSelect(cm, event, start, behavior) {
   })
   let up = operation(cm, done)
   cm.state.selectingText = up
-  on(document, "mousemove", move)
-  on(document, "mouseup", up)
+  on(display.wrapper.ownerDocument, "mousemove", move)
+  on(display.wrapper.ownerDocument, "mouseup", up)
 }
 
 // Used when mouse-selecting to adjust the anchor to the proper side

From 261d10b8489eaa132c1b7a80f3103610ed32ffbc Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sat, 17 Mar 2018 08:40:49 -0400
Subject: [PATCH 3697/4742] [merge addon] Use CSS :after to style scroll-lock
 icon

Primary motivation was to remove the use of `innerHTML` because the
Firefox extension validator raises a warning about this.

The obvious solution is to use `textContent` instead of `innerHTML`
but I thought it could be useful to have the ability to pick a
custom visual for the scroll-lock icon.

As per MDN documentation, all the supported browsers as per
CodeMirror documentation support `:after`.
---
 addon/merge/merge.css | 6 ++++++
 addon/merge/merge.js  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/merge/merge.css b/addon/merge/merge.css
index bda3d9f806..dadd7f59c7 100644
--- a/addon/merge/merge.css
+++ b/addon/merge/merge.css
@@ -48,6 +48,12 @@
   color: #555;
   line-height: 1;
 }
+.CodeMirror-merge-scrolllock:after {
+  content: "\21db\00a0\00a0\21da";
+}
+.CodeMirror-merge-scrolllock.CodeMirror-merge-scrolllock-enabled:after {
+  content: "\21db\21da";
+}
 
 .CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
   position: absolute;
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index dc2e77c60e..3a77f7a64c 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -211,7 +211,7 @@
   function setScrollLock(dv, val, action) {
     dv.lockScroll = val;
     if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
-    dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db&nbsp;&nbsp;\u21da";
+    (val ? CodeMirror.addClass : CodeMirror.rmClass)(dv.lockButton, "CodeMirror-merge-scrolllock-enabled");
   }
 
   // Updating the marks for editor content

From 45d5e05a2d6266d4db7bd4fce9ee4049b3bdd574 Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Mon, 19 Mar 2018 14:43:50 +0100
Subject: [PATCH 3698/4742] [javascript-hint addon] Disable completion in json
 mode

When using the editor in "application/json" mode, the standard javascript autocompletion would show up once triggered. Although it's deactivated by default and doesn't make sense to enable autocompletion in JSON mode on its own, this change fixes incorrect completions once you combine the default completion with your own custom logic.
---
 addon/hint/javascript-hint.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 9c39b168e9..f6ab2a2e89 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -32,7 +32,9 @@
     // Find the token at the cursor
     var cur = editor.getCursor(), token = getToken(editor, cur);
     if (/\b(?:string|comment)\b/.test(token.type)) return;
-    token.state = CodeMirror.innerMode(editor.getMode(), token.state).state;
+    var innerMode = CodeMirror.innerMode(editor.getMode(), token.state);
+    if (innerMode.mode.helperType === "json") return;
+    token.state = innerMode.state;
 
     // If it's not a 'word-style' token, ignore the token.
     if (!/^[\w$_]*$/.test(token.string)) {

From 8a1479b53fe3d6280868262c9fd937605287c1d7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Mar 2018 16:18:21 +0100
Subject: [PATCH 3699/4742] Allow editor-less documents to combine +-origin
 history events

Closes #5316
---
 src/model/history.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/history.js b/src/model/history.js
index 753a89da92..2d9359f007 100644
--- a/src/model/history.js
+++ b/src/model/history.js
@@ -67,7 +67,7 @@ export function addChangeToHistory(doc, change, selAfter, opId) {
 
   if ((hist.lastOp == opId ||
        hist.lastOrigin == change.origin && change.origin &&
-       ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
+       ((change.origin.charAt(0) == "+" && hist.lastModTime > time - (doc.cm ? doc.cm.options.historyEventDelay : 500)) ||
         change.origin.charAt(0) == "*")) &&
       (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
     // Merge this change into the last event

From 53d2e8b341c6eb02630a6a995fc8fb0418d5ed46 Mon Sep 17 00:00:00 2001
From: Raphael Amorim <rapha850@gmail.com>
Date: Tue, 6 Mar 2018 12:23:47 -0300
Subject: [PATCH 3700/4742] [lucario theme] Add

---
 demo/theme.html   |  2 ++
 theme/lucario.css | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 theme/lucario.css

diff --git a/demo/theme.html b/demo/theme.html
index e01f79a70f..3da662fcf0 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -26,6 +26,7 @@
 <link rel="stylesheet" href="../theme/isotope.css">
 <link rel="stylesheet" href="../theme/lesser-dark.css">
 <link rel="stylesheet" href="../theme/liquibyte.css">
+<link rel="stylesheet" href="../theme/lucario.css">
 <link rel="stylesheet" href="../theme/material.css">
 <link rel="stylesheet" href="../theme/mbo.css">
 <link rel="stylesheet" href="../theme/mdn-like.css">
@@ -113,6 +114,7 @@ <h2>Theme Demo</h2>
     <option>isotope</option>
     <option>lesser-dark</option>
     <option>liquibyte</option>
+    <option>lucario</option>
     <option>material</option>
     <option>mbo</option>
     <option>mdn-like</option>
diff --git a/theme/lucario.css b/theme/lucario.css
new file mode 100644
index 0000000000..17a1551032
--- /dev/null
+++ b/theme/lucario.css
@@ -0,0 +1,37 @@
+/*
+  Name:       lucario
+  Author:     Raphael Amorim
+
+  Original Lucario color scheme (https://github.com/raphamorim/lucario)
+*/
+
+.cm-s-lucario.CodeMirror, .cm-s-lucario .CodeMirror-gutters {
+  background-color: #2b3e50 !important;
+  color: #f8f8f2 !important;
+  border: none;
+}
+.cm-s-lucario .CodeMirror-gutters { color: #2b3e50; }
+.cm-s-lucario .CodeMirror-cursor { border-left: solid thin #E6C845; }
+.cm-s-lucario .CodeMirror-linenumber { color: #f8f8f2; }
+.cm-s-lucario .CodeMirror-selected { background: #243443; }
+.cm-s-lucario .CodeMirror-line::selection, .cm-s-lucario .CodeMirror-line > span::selection, .cm-s-lucario .CodeMirror-line > span > span::selection { background: #243443; }
+.cm-s-lucario .CodeMirror-line::-moz-selection, .cm-s-lucario .CodeMirror-line > span::-moz-selection, .cm-s-lucario .CodeMirror-line > span > span::-moz-selection { background: #243443; }
+.cm-s-lucario span.cm-comment { color: #5c98cd; }
+.cm-s-lucario span.cm-string, .cm-s-lucario span.cm-string-2 { color: #E6DB74; }
+.cm-s-lucario span.cm-number { color: #ca94ff; }
+.cm-s-lucario span.cm-variable { color: #f8f8f2; }
+.cm-s-lucario span.cm-variable-2 { color: #f8f8f2; }
+.cm-s-lucario span.cm-def { color: #72C05D; }
+.cm-s-lucario span.cm-operator { color: #66D9EF; }
+.cm-s-lucario span.cm-keyword { color: #ff6541; }
+.cm-s-lucario span.cm-atom { color: #bd93f9; }
+.cm-s-lucario span.cm-meta { color: #f8f8f2; }
+.cm-s-lucario span.cm-tag { color: #ff6541; }
+.cm-s-lucario span.cm-attribute { color: #66D9EF; }
+.cm-s-lucario span.cm-qualifier { color: #72C05D; }
+.cm-s-lucario span.cm-property { color: #f8f8f2; }
+.cm-s-lucario span.cm-builtin { color: #72C05D; }
+.cm-s-lucario span.cm-variable-3, .cm-s-lucario span.cm-type { color: #ffb86c; }
+
+.cm-s-lucario .CodeMirror-activeline-background { background: #243443; }
+.cm-s-lucario .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

From dd7f9987f532e66edc1468952f6958644889e49f Mon Sep 17 00:00:00 2001
From: ryu-sato <32702772+ryu-sato@users.noreply.github.com>
Date: Wed, 21 Mar 2018 00:50:06 +0900
Subject: [PATCH 3701/4742] [continuelist addon] Fix list numbering error

Closes #5290
---
 addon/edit/continuelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index b83dc505ff..4e7d392874 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -66,7 +66,7 @@
         var newNumber = (parseInt(startItem[3], 10) + lookAhead - skipCount);
         var nextNumber = (parseInt(nextItem[3], 10)), itemNumber = nextNumber;
 
-        if (startIndent === nextIndent) {
+        if (startIndent === nextIndent && !isNaN(nextNumber)) {
           if (newNumber === nextNumber) itemNumber = nextNumber + 1;
           if (newNumber > nextNumber) itemNumber = newNumber + 1;
           cm.replaceRange(

From e732d0e9fd1137baef74a6241f27c8d58cb1cb21 Mon Sep 17 00:00:00 2001
From: neon-dev <1169307+neon-dev@users.noreply.github.com>
Date: Fri, 16 Mar 2018 09:42:43 +0100
Subject: [PATCH 3702/4742] [show-hint addon] fixed fromList didn't show all
 completions if the cursor was inside the token

The hint logic of the `fromList` command did not respect the cursor position inside the token.
Now it will list all matching completions for the substring up to the cursor, instead of only the ones matching the complete token. The behavior is now the same as for the regular autocompletion.
---
 addon/hint/show-hint.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 62c683cb8c..3f50330c65 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -400,7 +400,8 @@
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
     var to = CodeMirror.Pos(cur.line, token.end);
     if (token.string && /\w/.test(token.string[token.string.length - 1])) {
-      var term = token.string, from = CodeMirror.Pos(cur.line, token.start);
+      var length = token.string.length - (token.end - cur.ch);
+      var term = token.string.substr(0, length), from = CodeMirror.Pos(cur.line, token.start);
     } else {
       var term = "", from = to;
     }

From d49ef29015738055872d149668713c8e2fbdea32 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Mar 2018 17:13:54 +0100
Subject: [PATCH 3703/4742] Adjust hint.fromList to consistenly use the cursor
 as end pos

Issue #5312
---
 addon/hint/show-hint.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 3f50330c65..81a63fc992 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -397,13 +397,13 @@
   });
 
   CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    var to = CodeMirror.Pos(cur.line, token.end);
-    if (token.string && /\w/.test(token.string[token.string.length - 1])) {
-      var length = token.string.length - (token.end - cur.ch);
-      var term = token.string.substr(0, length), from = CodeMirror.Pos(cur.line, token.start);
+    var cur = cm.getCursor(), token = cm.getTokenAt(cur)
+    var term, from = CodeMirror.Pos(cur.line, token.start), to = cur
+    if (token.start < cur.ch && /\w/.test(token.string.charAt(cur.ch - token.start - 1))) {
+      term = token.string.substr(0, cur.ch - token.start)
     } else {
-      var term = "", from = to;
+      term = ""
+      from = cur
     }
     var found = [];
     for (var i = 0; i < options.words.length; i++) {

From 860e9518e605a75c20cd111fab45faf4577c38d3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Mar 2018 17:30:38 +0100
Subject: [PATCH 3704/4742] Mark version 5.36.0

---
 AUTHORS           |  9 +++++++++
 CHANGELOG.md      | 24 ++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 14 ++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b384b8e8e8..03b4141ea5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -121,6 +121,7 @@ Calin Barbat
 callodacity
 Camilo Roca
 Casey Klebba
+César González Íñiguez
 Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
@@ -131,6 +132,7 @@ Chris Granger
 Chris Houseknecht
 Chris Lohfink
 Chris Morgan
+Chris Reeves
 Chris Smith
 Christian Gruen
 Christian Oyarzun
@@ -258,6 +260,7 @@ Hans Engel
 Hardest
 Harshvardhan Gupta
 Hasan Karahan
+Heanes
 Hector Oswaldo Caballero
 Hélio
 Hendrik Wallbaum
@@ -386,6 +389,7 @@ Lanfei
 Lanny
 Laszlo Vidacs
 leaf corcoran
+Lemmon
 Leonid Khachaturov
 Leon Sorokin
 Leonya Khachaturov
@@ -567,8 +571,11 @@ ramwin1
 Randall Mason
 Randy Burden
 Randy Edmunds
+Randy Luecke
+Raphael Amorim
 Rasmus Erik Voel Jensen
 Rasmus Schultz
+Raymond Hill
 ray ratchup
 Ray Ratchup
 Remi Nyborg
@@ -587,6 +594,7 @@ Rrrandom
 Ruslan Osmanov
 Ryan Petrello
 Ryan Prior
+ryu-sato
 sabaca
 Sam Lee
 Sam Rawlins
@@ -679,6 +687,7 @@ Tomas Varaneckas
 Tom Erik Støwer
 Tom Klancer
 Tom MacWright
+Tom McLaughlin
 Tony Jian
 tophf
 totalamd
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10427a086d..a8199fd30b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 5.36.0 (2018-03-20)
+
+### Bug fixes
+
+Make sure all document-level event handlers are registered on the document that the editor is part of.
+
+Fix issue that prevented edits whose origin starts with `+` from being combined in history events for an editor-less document.
+
+[multiplex addon](http://codemirror.net/demo/multiplex.html): Improve handling of indentation.
+
+[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Use CSS `:after` element to style the scroll-lock icon.
+
+[javascript-hint addon](http://codemirror.net/doc/manual.html#addon_javascript-hint): Don't provide completions in JSON mode.
+
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Fix numbering error.
+
+[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Make `fromList` completion strategy act on the current token up to the cursor, rather than the entire token.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix a regexp with potentially exponental complexity.
+
+### New features
+
+New theme: [lucario](http://codemirror.net/demo/theme.html#lucario).
+
 ## 5.35.0 (2018-02-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index bd40ebaa06..4ba66ad5f3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.35.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.36.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 9a027b900e..1cdea6729a 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-03-2018: <a href="http://codemirror.net/codemirror-5.36.0.zip">Version 5.36.0</a>:</p>
+
+  <ul>
+    <li>Make sure all document-level event handlers are registered on the document that the editor is part of.</li>
+    <li>Fix issue that prevented edits whose origin starts with <code>+</code> from being combined in history events for an editor-less document.</li>
+    <li><a href="http://codemirror.net/demo/multiplex.html">multiplex addon</a>: Improve handling of indentation.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Use CSS <code>:after</code> element to style the scroll-lock icon.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Don't provide completions in JSON mode.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix numbering error.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Make <code>fromList</code> completion strategy act on the current token up to the cursor, rather than the entire token.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix a regexp with potentially exponental complexity.</li>
+    <li>New theme: <a href="http://codemirror.net/demo/theme.html#lucario">lucario</a>.</li>
+  </ul>
+
   <p class="rel">20-02-2018: <a href="http://codemirror.net/codemirror-5.35.0.zip">Version 5.35.0</a>:</p>
 
   <ul>
diff --git a/index.html b/index.html
index 5f7dced148..c0e3e9a235 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.35.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.36.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index d0ea485a65..6aa9c4bc2d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.35.1",
+  "version": "5.36.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 34c198f403..ec77374a80 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.35.1"
+CodeMirror.version = "5.36.0"

From 6fca1c7abccede1b75f231be69ed19781c5668fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Mar 2018 17:32:50 +0100
Subject: [PATCH 3705/4742] Bump version number post-5.36

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 4ba66ad5f3..4c95e325a1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.36.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.36.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 6aa9c4bc2d..e6d4a897ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.36.0",
+  "version": "5.36.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index ec77374a80..486354a5c3 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.36.0"
+CodeMirror.version = "5.36.1"

From f56b0d2dc1a19743c4bfdc45b7cefbf010587231 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Tue, 20 Mar 2018 17:11:21 -0400
Subject: [PATCH 3706/4742] [merge addon] Fix edge case arising when diff'ing
 empty strings

The merge view will incorrectly show a "Revert chunk" arrow when
the text on both sides of the view are the empty string.

The getChunks() helper is not prepared to deal with an empty diff
array.

The getDiff() helper returns an empty diff array when both strings
to compare are empty, as the only diff item returned by
diff_match_patch, `[0, ""]`, is removed as a result of the diff
entry containing an empty string.

The chosen (trivial) fix is to simply check for the empty diff
array case at the top of getChunks().
---
 addon/merge/merge.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 3a77f7a64c..5b87b5e62a 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -664,6 +664,7 @@
 
   function getChunks(diff) {
     var chunks = [];
+    if (!diff.length) return chunks;
     var startEdit = 0, startOrig = 0;
     var edit = Pos(0, 0), orig = Pos(0, 0);
     for (var i = 0; i < diff.length; ++i) {

From 8d14d3ec2c682818285478662d71d89ac8f87a70 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 22 Mar 2018 10:23:27 +0100
Subject: [PATCH 3707/4742] [emacs keymap] Add bindings for Alt-Left and
 Alt-Right

Closes #5320
---
 keymap/emacs.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 3160453283..f7c51b8131 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -307,6 +307,7 @@
     "Backspace": function(cm) { killRegion(cm, false) || killTo(cm, byChar, -1, false); },
 
     "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
+    "Alt-Right": move(byWord, 1), "Alt-Left": move(byWord, -1),
     "Alt-D": function(cm) { killTo(cm, byWord, 1, "grow"); },
     "Alt-Backspace": function(cm) { killTo(cm, byWord, -1, "grow"); },
 

From 7a813dd95595b78524a476e315a4b6dcf6a77ca7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 24 Mar 2018 22:37:06 +0100
Subject: [PATCH 3708/4742] [sql mode] Enable backtick closebrackets

Closes #5325
---
 mode/sql/sql.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 2010b1c250..d1ba0ed10b 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -194,7 +194,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
-    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : "--"
+    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : "--",
+    closeBrackets: "()[]{}''\"\"``"
   };
 });
 

From f18e396321696e67a1a663d34fbeec384fe087ca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Mar 2018 16:26:46 +0200
Subject: [PATCH 3709/4742] [javascript mode] Handle parenthesized typescript
 types

Closes #5332
---
 mode/javascript/javascript.js | 8 +++++---
 mode/javascript/test.js       | 6 ++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fe39eb1440..b9dd4dae2e 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -572,6 +572,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)
     if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
+    if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr)
   }
   function maybeReturnType(type) {
     if (type == "=>") return cont(typeexpr)
@@ -588,9 +589,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(expression, maybetype, expect("]"), typeprop)
     }
   }
-  function typearg(type) {
-    if (type == "variable") return cont(typearg)
-    else if (type == ":") return cont(typeexpr)
+  function typearg(type, value) {
+    if (type == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg)
+    if (type == ":") return cont(typeexpr)
+    return pass(typeexpr)
   }
   function afterType(type, value) {
     if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index f770bd77f6..73f33f0af1 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -402,6 +402,12 @@
      "  [def META],",
      "}")
 
+  TS("parenthesized type",
+     "[keyword class] [def Foo] {",
+     "  [property x] [operator =] [keyword new] [variable A][operator <][type B], [type string][operator |](() [operator =>] [type void])[operator >]();",
+     "  [keyword private] [property bar]();",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From d98c2ecbf4c859956a62112961c1c9a8a585e336 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Mar 2018 16:30:59 +0200
Subject: [PATCH 3710/4742] [javascript mode] Handle TypeScript 'abstract'
 keyword

Closes #5333
---
 mode/javascript/javascript.js | 3 +++
 mode/javascript/test.js       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index b9dd4dae2e..07417937c8 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -356,6 +356,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (isTS && value == "namespace") {
         cx.marked = "keyword"
         return cont(pushlex("form"), expression, block, poplex)
+      } else if (isTS && value == "abstract") {
+        cx.marked = "keyword"
+        return cont(statement)
       } else {
         return cont(pushlex("stat"), maybelabel);
       }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 73f33f0af1..1885b79804 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -408,6 +408,9 @@
      "  [keyword private] [property bar]();",
      "}")
 
+  TS("abstract class",
+     "[keyword export] [keyword abstract] [keyword class] [def Foo] {}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 17478d7e9907754ce4e3237aac7fe81f24f05c60 Mon Sep 17 00:00:00 2001
From: hidaiy <hidai.620@gmail.com>
Date: Thu, 29 Mar 2018 23:41:47 +0900
Subject: [PATCH 3711/4742] [vim mode] Fix argument of scanForBracket method
 call

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 529654a3b5..0a3ef88ca7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3552,8 +3552,8 @@
       // cursor is on a matching open bracket.
       var offset = curChar === openSym ? 1 : 0;
 
-      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, null, {'bracketRegex': bracketRegexp});
-      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, null, {'bracketRegex': bracketRegexp});
+      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, undefined, {'bracketRegex': bracketRegexp});
+      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, undefined, {'bracketRegex': bracketRegexp});
 
       if (!start || !end) {
         return { start: cur, end: cur };

From e8fa97200fb347d998e023134afca7387c19e13b Mon Sep 17 00:00:00 2001
From: Prendota <prendota@mail.ru>
Date: Wed, 28 Mar 2018 12:43:40 +0300
Subject: [PATCH 3712/4742] Fix kotlin link

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

diff --git a/mode/index.html b/mode/index.html
index eee26fad0a..ccabf88be4 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -80,7 +80,7 @@ <h2>Language modes</h2>
       <li><a href="javascript/index.html">JavaScript</a> (<a href="jsx/index.html">JSX</a>)</li>
       <li><a href="jinja2/index.html">Jinja2</a></li>
       <li><a href="julia/index.html">Julia</a></li>
-      <li><a href="kotlin/index.html">Kotlin</a></li>
+      <li><a href="clike/index.html">Kotlin</a></li>
       <li><a href="css/less.html">LESS</a></li>
       <li><a href="livescript/index.html">LiveScript</a></li>
       <li><a href="lua/index.html">Lua</a></li>

From e9c52f3dbaf6046ca8fd573c27a77fc86d523eb7 Mon Sep 17 00:00:00 2001
From: Tugrul Elmas <tugrulelmas@gmail.com>
Date: Tue, 20 Mar 2018 11:08:49 +0300
Subject: [PATCH 3713/4742] [sql mode] Add text/x-mssql dialect and ssms theme

---
 mode/sql/sql.js | 27 ++++++++++++++++++---------
 theme/ssms.css  | 16 ++++++++++++++++
 2 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 theme/ssms.css

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index d1ba0ed10b..fddbabae80 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -22,7 +22,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       support        = parserConfig.support || {},
       hooks          = parserConfig.hooks || {},
       dateSQL        = parserConfig.dateSQL || {"date" : true, "time" : true, "timestamp" : true},
-      backslashStringEscapes = parserConfig.backslashStringEscapes !== false
+      backslashStringEscapes = parserConfig.backslashStringEscapes !== false,
+      brackets       = parserConfig.brackets || /^[\{}\(\)\[\]]/,
+      punctuation    = parserConfig.punctuation || /^[;.,:]/
 
   function tokenBase(stream, state) {
     var ch = stream.next();
@@ -65,9 +67,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       // charset casting: _utf8'str', N'str', n'str'
       // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
       return "keyword";
-    } else if (/^[\(\),\;\[\]]/.test(ch)) {
-      // no highlighting
-      return null;
     } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) {
       // 1-line comment
       stream.skipToEnd();
@@ -96,7 +95,15 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (operatorChars.test(ch)) {
       // operators
       stream.eatWhile(operatorChars);
-      return null;
+      return "operator";
+    } else if (brackets.test(ch)) {
+      // brackets
+      stream.eatWhile(brackets);
+      return "bracket";
+    } else if (punctuation.test(ch)) {
+      // punctuation
+      stream.eatWhile(punctuation);
+      return "punctuation";
     } else if (ch == '{' &&
         (stream.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/) || stream.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/))) {
       // dates (weird ODBC syntax)
@@ -289,11 +296,13 @@ 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 declare exec"),
+    client: set("$partition binary_checksum checksum connectionproperty context_info current_request_id error_line error_message error_number error_procedure error_severity error_state formatmessage get_filestream_transaction_context getansinull host_id host_name isnull isnumeric min_active_rowversion newid newsequentialid rowcount_big xact_state object_id"),
+    keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare exec go if use index holdlock nolock nowait paglock readcommitted readcommittedlock readpast readuncommitted repeatableread rowlock serializable snapshot tablock tablockx updlock with"),
     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: /^[*+\-%<>!=]/,
+    atoms: set("is not null like and or in left right between inner outer join all any some cross unpivot pivot exists"),
+    operatorChars: /^[*+\-%<>!=^\&|\/]/,
+    brackets: /^[\{}\(\)]/,
+    punctuation: /^[;.,:/]/,
     backslashStringEscapes: false,
     dateSQL: set("date datetimeoffset datetime2 smalldatetime datetime time"),
     hooks: {
diff --git a/theme/ssms.css b/theme/ssms.css
new file mode 100644
index 0000000000..9494c14c20
--- /dev/null
+++ b/theme/ssms.css
@@ -0,0 +1,16 @@
+.cm-s-ssms span.cm-keyword { color: blue; }
+.cm-s-ssms span.cm-comment { color: darkgreen; }
+.cm-s-ssms span.cm-string { color: red; }
+.cm-s-ssms span.cm-def { color: black; }
+.cm-s-ssms span.cm-variable { color: black; }
+.cm-s-ssms span.cm-variable-2 { color: black; }
+.cm-s-ssms span.cm-atom { color: darkgray; }
+.cm-s-ssms .CodeMirror-linenumber { color: teal; }
+.cm-s-ssms .CodeMirror-activeline-background { background: #ffffff; }
+.cm-s-ssms span.cm-string-2 { color: #FF00FF; }
+.cm-s-ssms span.cm-operator, 
+.cm-s-ssms span.cm-bracket, 
+.cm-s-ssms span.cm-punctuation { color: darkgray; }
+.cm-s-ssms .CodeMirror-gutters { border-right: 3px solid #ffee62; background-color: #ffffff; }
+.cm-s-ssms div.CodeMirror-selected { background: #ADD6FF; }
+

From 281651a56a908edff490e56a1ed6dd4847b97af6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Mar 2018 22:17:21 +0200
Subject: [PATCH 3714/4742] Add a more prominent warning about the repository
 not being the distribution channel

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index a3a351be4d..ed7f30b8de 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,16 @@
 # CodeMirror
+
 [![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 [![Join the chat at https://gitter.im/codemirror/CodeMirror](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/codemirror/CodeMirror)  
 [Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?again)](https://marijnhaverbeke.nl/fund/)
 
+**NOTE**: This is the source repository for the library, and not the
+distribution channel. You need to run a build step if you want to use
+this code. To install the software pre-built, get it from
+[NPM](https://www.npmjs.com/package/codemirror) or [the
+website](https://codemirror.net/codemirror.zip).
+
 CodeMirror is a versatile text editor implemented in JavaScript for
 the browser. It is specialized for editing code, and comes with over
 100 language modes and various addons that implement more advanced

From c824c222a99efac39614ee7a1b919f557f9e3caf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 3 Apr 2018 12:37:43 +0200
Subject: [PATCH 3715/4742] Add installation instructions to readme

---
 README.md | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ed7f30b8de..9a982bc70a 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,6 @@
 [![Join the chat at https://gitter.im/codemirror/CodeMirror](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/codemirror/CodeMirror)  
 [Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?again)](https://marijnhaverbeke.nl/fund/)
 
-**NOTE**: This is the source repository for the library, and not the
-distribution channel. You need to run a build step if you want to use
-this code. To install the software pre-built, get it from
-[NPM](https://www.npmjs.com/package/codemirror) or [the
-website](https://codemirror.net/codemirror.zip).
-
 CodeMirror is a versatile text editor implemented in JavaScript for
 the browser. It is specialized for editing code, and comes with over
 100 language modes and various addons that implement more advanced
@@ -35,6 +29,19 @@ The CodeMirror community aims to be welcoming to everybody. We use the
 (1.1)](http://contributor-covenant.org/version/1/1/0/) as our code of
 conduct.
 
+### Installation
+
+Either get the [zip file](https://codemirror.net/codemirror.zip) with
+the latest version, or make sure you have [Node](https://nodejs.org/)
+installed and run:
+
+    npm install codemirror
+
+**NOTE**: This is the source repository for the library, and not the
+distribution channel. Cloning it is not the recommended way to install
+the library, and will in fact not work unless you also run the build
+step.
+
 ### Quickstart
 
 To build the project, make sure you have Node.js installed (at least version 6)

From 419aa76211cf89d582cac98ddf22dfb310494c43 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 3 Apr 2018 12:43:32 +0200
Subject: [PATCH 3716/4742] [python mode] Fix invalid interpretation of
 punctuation-like comment/string tokens

Closes #5343
---
 mode/python/python.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 4de1e75d54..5b72d4c93b 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -254,14 +254,16 @@
       if (current == ":" && !state.lambda && top(state).type == "py")
         pushPyScope(state);
 
-      var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1;
-      if (delimiter_index != -1)
-        pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
-
-      delimiter_index = "])}".indexOf(current);
-      if (delimiter_index != -1) {
-        if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
-        else return ERRORCLASS;
+      if (current.length == 1 && !/string|comment/.test(style)) {
+        var delimiter_index = "[({".indexOf(current);
+        if (delimiter_index != -1)
+          pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+
+        delimiter_index = "])}".indexOf(current);
+        if (delimiter_index != -1) {
+          if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
+          else return ERRORCLASS;
+        }
       }
       if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
         if (state.scopes.length > 1) state.scopes.pop();

From f2a9eeb12e31a0da6afb8070c6b0d8f813b6c0f1 Mon Sep 17 00:00:00 2001
From: Prendota <Prendota@mail.ru>
Date: Mon, 2 Apr 2018 14:03:18 +0300
Subject: [PATCH 3717/4742] [clike] Support @-identifiers in Kotlin mode

---
 mode/clike/clike.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index da7a6bf5b6..d5c8bf5d4c 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -624,6 +624,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     defKeywords: words("class val var object interface fun"),
     atoms: words("true false null this"),
     hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      },
       '"': function(stream, state) {
         state.tokenize = tokenKotlinString(stream.match('""'));
         return state.tokenize(stream, state);

From 9ec124580735235063c59a8d781ed6e6e498b031 Mon Sep 17 00:00:00 2001
From: Prendota <prendota@mail.ru>
Date: Wed, 4 Apr 2018 09:40:16 +0300
Subject: [PATCH 3718/4742] [idea theme] Add

---
 demo/theme.html |  2 ++
 theme/idea.css  | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 theme/idea.css

diff --git a/demo/theme.html b/demo/theme.html
index 3da662fcf0..b882c75aa2 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -54,6 +54,7 @@
 <link rel="stylesheet" href="../theme/xq-dark.css">
 <link rel="stylesheet" href="../theme/xq-light.css">
 <link rel="stylesheet" href="../theme/yeti.css">
+<link rel="stylesheet" href="../theme/idea.css">
 <link rel="stylesheet" href="../theme/zenburn.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
@@ -111,6 +112,7 @@ <h2>Theme Demo</h2>
     <option>erlang-dark</option>
     <option>hopscotch</option>
     <option>icecoder</option>
+    <option>idea</option>
     <option>isotope</option>
     <option>lesser-dark</option>
     <option>liquibyte</option>
diff --git a/theme/idea.css b/theme/idea.css
new file mode 100644
index 0000000000..28c5c40dea
--- /dev/null
+++ b/theme/idea.css
@@ -0,0 +1,31 @@
+/**
+    Name:       IDEA default theme
+    From IntelliJ IDEA by JetBrains
+ */
+
+.cm-s-idea span.cm-meta { color: #808000; }
+.cm-s-idea span.cm-number { color: #0000FF; }
+.cm-s-idea span.cm-keyword { line-height: 1em; font-weight: bold; color: #000080; }
+.cm-s-idea span.cm-atom { font-weight: bold; color: #000080; }
+.cm-s-idea span.cm-def { color: #000000; }
+.cm-s-idea span.cm-variable { color: black; }
+.cm-s-idea span.cm-variable-2 { color: black; }
+.cm-s-idea span.cm-variable-3, .cm-s-idea span.cm-type { color: black; }
+.cm-s-idea span.cm-property { color: black; }
+.cm-s-idea span.cm-operator { color: black; }
+.cm-s-idea span.cm-comment { color: #808080; }
+.cm-s-idea span.cm-string { color: #008000; }
+.cm-s-idea span.cm-string-2 { color: #008000; }
+.cm-s-idea span.cm-qualifier { color: #555; }
+.cm-s-idea span.cm-error { color: #FF0000; }
+.cm-s-idea span.cm-attribute { color: #0000FF; }
+.cm-s-idea span.cm-tag { color: #000080; }
+.cm-s-idea span.cm-link { color: #0000FF; }
+.cm-s-idea .CodeMirror-activeline-background { background: #FFFAE3; }
+
+.cm-s-idea span.cm-builtin { color: #30a; }
+.cm-s-idea span.cm-bracket { color: #cc7; }
+.cm-s-idea  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
+
+
+.cm-s-idea .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }

From 0e138353929605a927a0e4f86e38457d87ce864a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 11 Apr 2018 09:33:46 +0200
Subject: [PATCH 3719/4742] [javascript mode] Fix parsing of TypeScript typeof
 types

So that they don't consume commas.
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 07417937c8..d6ed5484da 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -565,7 +565,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function typeexpr(type, value) {
     if (value == "keyof" || value == "typeof") {
       cx.marked = "keyword"
-      return cont(value == "keyof" ? typeexpr : expression)
+      return cont(value == "keyof" ? typeexpr : expressionNoComma)
     }
     if (type == "variable" || value == "void") {
       cx.marked = "type"

From 9cb7b7d5e556d5be9340729ea6403dee7fe06d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mu-An=20=E2=9C=8C=EF=B8=8F=20Chiou?= <muan@github.com>
Date: Tue, 27 Mar 2018 22:29:18 -0400
Subject: [PATCH 3720/4742] Return keypress when composing Keypress should not
 happen during composing (as spec) but it does on Windows for Korean IMEs

---
 src/input/ContentEditableInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index e3af520a04..057ed2d469 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -355,7 +355,7 @@ export default class ContentEditableInput {
   }
 
   onKeyPress(e) {
-    if (e.charCode == 0) return
+    if (e.charCode == 0 || this.composing) return
     e.preventDefault()
     if (!this.cm.isReadOnly())
       operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0)

From 1a09978e2139a78a486173ea716d8ff84da71599 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 Apr 2018 10:08:28 +0200
Subject: [PATCH 3721/4742] [xml-fold addon] Improve handling of line-broken
 opening tags

Issue #5179
---
 addon/fold/xml-fold.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 3acf952d9d..867ecb5cb3 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -137,12 +137,14 @@
   CodeMirror.registerHelper("fold", "xml", function(cm, start) {
     var iter = new Iter(cm, start.line, 0);
     for (;;) {
-      var openTag = toNextTag(iter), end;
-      if (!openTag || !(end = toTagEnd(iter)) || iter.line != start.line) return;
+      var openTag = toNextTag(iter)
+      if (!openTag || iter.line != start.line) return
+      var end = toTagEnd(iter)
+      if (!end) return
       if (!openTag[1] && end != "selfClose") {
         var startPos = Pos(iter.line, iter.ch);
         var endPos = findMatchingClose(iter, openTag[2]);
-        return endPos && {from: startPos, to: endPos.from};
+        return endPos && cmp(endPos.from, startPos) > 0 ? {from: startPos, to: endPos.from} : null
       }
     }
   });

From 96099e37aaac2ad98a873ee37a8faace3f5cdf15 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 Apr 2018 10:12:34 +0200
Subject: [PATCH 3722/4742] Use unpkg to get a proper HTTPS link to CSSLint

Issue #5356
---
 demo/lint.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/lint.html b/demo/lint.html
index fb77ae8c84..3abb9224fb 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -11,7 +11,7 @@
 <script src="../mode/css/css.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jshint/2.9.5/jshint.min.js"></script>
 <script src="//rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
-<script src="//csslint.net/js/csslint.js"></script>
+<script src="https://unpkg.com/csslint@1.0.5/dist/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
 <script src="../addon/lint/javascript-lint.js"></script>
 <script src="../addon/lint/json-lint.js"></script>

From 899d6a3461345c427d2b361f17796d510016689b Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 13 Apr 2018 13:47:09 +0200
Subject: [PATCH 3723/4742] [vim] Don't insert chars if key is not bound

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0a3ef88ca7..27c756a029 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -866,7 +866,7 @@
         if (vim.insertMode) { command = handleKeyInsertMode(); }
         else { command = handleKeyNonInsertMode(); }
         if (command === false) {
-          return undefined;
+          return !vim.insertMode && key.length === 1 ? function() { return true; } : undefined;
         } else if (command === true) {
           // TODO: Look into using CodeMirror's multi-key handling.
           // Return no-op since we are caching the key. Counts as handled, but

From 30ae1edf7c2b1086a13d08cfdb35594bea39d030 Mon Sep 17 00:00:00 2001
From: Bo Peng <ben.bog@gmail.com>
Date: Sat, 31 Mar 2018 10:25:39 -0500
Subject: [PATCH 3724/4742] [python mode] Highlight expressions nested inside
 format strings

---
 mode/python/index.html |  9 +++++
 mode/python/python.js  | 87 ++++++++++++++++++++++++++++++++++++++++--
 mode/python/test.js    |  4 +-
 3 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/mode/python/index.html b/mode/python/index.html
index 0ac02a3333..134387ff21 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -126,6 +126,15 @@ <h2>Python mode</h2>
     def __init__(self, mixin = 'Hello'):
         self.mixin = mixin
 
+# Python 3.6 f-strings (https://www.python.org/dev/peps/pep-0498/)
+f'My name is {name}, my age next year is {age+1}, my anniversary is {anniversary:%A, %B %d, %Y}.'
+f'He said his name is {name!r}.'
+f"""He said his name is {name!r}."""
+f'{"quoted string"}'
+f'{{ {4*10} }}'
+f'This is an error }'
+f'This is ok }}'
+fr'x={4*10}\n'
 </textarea></div>
 
 
diff --git a/mode/python/python.js b/mode/python/python.js
index 5b72d4c93b..64590fbc30 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -62,7 +62,7 @@
       var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
       myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
       myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
-      var stringPrefixes = new RegExp("^(([rbuf]|(br))?('{3}|\"{3}|['\"]))", "i");
+      var stringPrefixes = new RegExp("^(([rbuf]|(br)|(fr))?('{3}|\"{3}|['\"]))", "i");
     } else {
       var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
       myKeywords = myKeywords.concat(["exec", "print"]);
@@ -142,8 +142,18 @@
 
       // Handle Strings
       if (stream.match(stringPrefixes)) {
-        state.tokenize = tokenStringFactory(stream.current());
-        return state.tokenize(stream, state);
+        var isFmtString = stream.current().toLowerCase().indexOf('f') !== -1;
+        if (!isFmtString || state.fstr_state !== null) {
+          // if this is a nested format string (e.g. f' {   f"{10*10}" + "a" }' )
+          // we do not format the nested expression and treat the nested format
+          // string as regular string
+          state.tokenize = tokenStringFactory(stream.current());
+          return state.tokenize(stream, state);
+        } else {
+          // need to do something more sophisticated
+          state.tokenize = formatStringFactory(stream.current());
+          return state.tokenize(stream, state);
+        }
       }
 
       for (var i = 0; i < operators.length; i++)
@@ -174,6 +184,76 @@
       return ERRORCLASS;
     }
 
+    function formatStringFactory(delimiter) {
+      while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
+        delimiter = delimiter.substr(1);
+
+      var singleline = delimiter.length == 1;
+      var OUTCLASS = "string";
+
+      function tokenString(stream, state) {
+        if (state.fstr_state) {
+          // inside f-str Expression
+          if (stream.match(delimiter)) {
+            // expression ends pre-maturally, but very common in editing
+            // Could show error to remind users to close brace here
+            state.fstr_state = null;
+            return OUTCLASS;
+          } else if (stream.match('{')) {
+            // starting brace, if not eaten below
+            return "punctuation";
+          } else if (stream.match('}')) {
+            // return to regular inside string state
+            state.fstr_state = null;
+            return "punctuation";
+          } else {
+            // use tokenBaseInner to parse the expression
+            return tokenBaseInner(stream, state.fstr_state);
+          }
+        }
+        while (!stream.eol()) {
+          stream.eatWhile(/[^'"\{\}\\]/);
+          if (stream.eat("\\")) {
+            stream.next();
+            if (singleline && stream.eol())
+              return OUTCLASS;
+          } else if (stream.match(delimiter)) {
+            state.tokenize = tokenBase;
+            return OUTCLASS;
+          } else if (stream.match('{{')) {
+            // ignore {{ in f-str
+            return OUTCLASS;
+          } else if (stream.match('{', false)) {
+            // switch to nested mode
+            state.fstr_state = {};
+            if (stream.current()) {
+              return OUTCLASS;
+            } else {
+              // need to return something, so eat the starting {
+              stream.next();
+              return "punctuation";
+            }
+          } else if (stream.match('}}')) {
+            return OUTCLASS;
+          } else if (stream.match('}')) {
+            // single } in f-string is an error
+            return ERRORCLASS;
+          } else {
+            stream.eat(/['"]/);
+          }
+        }
+        if (singleline) {
+          if (parserConf.singleLineStringErrors)
+            return ERRORCLASS;
+          else
+            state.tokenize = tokenBase;
+        }
+        return OUTCLASS;
+      }
+      tokenString.isString = true;
+      return tokenString;
+    }
+
     function tokenStringFactory(delimiter) {
       while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
         delimiter = delimiter.substr(1);
@@ -278,6 +358,7 @@
         return {
           tokenize: tokenBase,
           scopes: [{offset: basecolumn || 0, type: "py", align: null}],
+          fstr_state: null,
           indent: basecolumn || 0,
           lastToken: null,
           lambda: false,
diff --git a/mode/python/test.js b/mode/python/test.js
index 950eed51e6..f18240ef91 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -30,6 +30,8 @@
     MT("before_equal_sign_" + c, "[variable a] [operator " + c + "=] [variable b]");
   }
 
-  MT("fValidStringPrefix", "[string f'this is a {formatted} string']");
+  MT("fValidStringPrefix", "[string f'this is a]{[variable formatted]}[string string']");
+  MT("fValidExpressioninFString", "[string f'expression ]{[number 100][operator *][number 5]}[string string']");
+  MT("fInvalidFString", "[error f'this is wrong}]");
   MT("uValidStringPrefix", "[string u'this is an unicode string']");
 })();

From d0b1500b84f8eac27f81a040364af8024289a1a6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 15 Apr 2018 13:25:05 +0200
Subject: [PATCH 3725/4742] [python mode] Make format string tokenizing work
 without an extra state field

Issue #5338
---
 mode/python/python.js | 52 +++++++++++++++++++++----------------------
 mode/python/test.js   |  1 +
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 64590fbc30..abbf7e8203 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -143,7 +143,7 @@
       // Handle Strings
       if (stream.match(stringPrefixes)) {
         var isFmtString = stream.current().toLowerCase().indexOf('f') !== -1;
-        if (!isFmtString || state.fstr_state !== null) {
+        if (!isFmtString) {
           // if this is a nested format string (e.g. f' {   f"{10*10}" + "a" }' )
           // we do not format the nested expression and treat the nested format
           // string as regular string
@@ -151,7 +151,7 @@
           return state.tokenize(stream, state);
         } else {
           // need to do something more sophisticated
-          state.tokenize = formatStringFactory(stream.current());
+          state.tokenize = formatStringFactory(stream.current(), state.tokenize);
           return state.tokenize(stream, state);
         }
       }
@@ -184,33 +184,34 @@
       return ERRORCLASS;
     }
 
-    function formatStringFactory(delimiter) {
+    function formatStringFactory(delimiter, tokenOuter) {
       while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
         delimiter = delimiter.substr(1);
 
       var singleline = delimiter.length == 1;
       var OUTCLASS = "string";
 
-      function tokenString(stream, state) {
-        if (state.fstr_state) {
-          // inside f-str Expression
-          if (stream.match(delimiter)) {
-            // expression ends pre-maturally, but very common in editing
-            // Could show error to remind users to close brace here
-            state.fstr_state = null;
-            return OUTCLASS;
-          } else if (stream.match('{')) {
-            // starting brace, if not eaten below
-            return "punctuation";
-          } else if (stream.match('}')) {
-            // return to regular inside string state
-            state.fstr_state = null;
-            return "punctuation";
-          } else {
-            // use tokenBaseInner to parse the expression
-            return tokenBaseInner(stream, state.fstr_state);
-          }
+      function tokenFString(stream, state) {
+        // inside f-str Expression
+        if (stream.match(delimiter)) {
+          // expression ends pre-maturally, but very common in editing
+          // Could show error to remind users to close brace here
+          state.tokenize = tokenString
+          return OUTCLASS;
+        } else if (stream.match('{')) {
+          // starting brace, if not eaten below
+          return "punctuation";
+        } else if (stream.match('}')) {
+          // return to regular inside string state
+          state.tokenize = tokenString
+          return "punctuation";
+        } else {
+          // use tokenBaseInner to parse the expression
+          return tokenBaseInner(stream, state);
         }
+      }
+
+      function tokenString(stream, state) {
         while (!stream.eol()) {
           stream.eatWhile(/[^'"\{\}\\]/);
           if (stream.eat("\\")) {
@@ -218,14 +219,14 @@
             if (singleline && stream.eol())
               return OUTCLASS;
           } else if (stream.match(delimiter)) {
-            state.tokenize = tokenBase;
+            state.tokenize = tokenOuter;
             return OUTCLASS;
           } else if (stream.match('{{')) {
             // ignore {{ in f-str
             return OUTCLASS;
           } else if (stream.match('{', false)) {
             // switch to nested mode
-            state.fstr_state = {};
+            state.tokenize = tokenFString
             if (stream.current()) {
               return OUTCLASS;
             } else {
@@ -246,7 +247,7 @@
           if (parserConf.singleLineStringErrors)
             return ERRORCLASS;
           else
-            state.tokenize = tokenBase;
+            state.tokenize = tokenOuter;
         }
         return OUTCLASS;
       }
@@ -358,7 +359,6 @@
         return {
           tokenize: tokenBase,
           scopes: [{offset: basecolumn || 0, type: "py", align: null}],
-          fstr_state: null,
           indent: basecolumn || 0,
           lastToken: null,
           lambda: false,
diff --git a/mode/python/test.js b/mode/python/test.js
index f18240ef91..40f0a61f43 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -33,5 +33,6 @@
   MT("fValidStringPrefix", "[string f'this is a]{[variable formatted]}[string string']");
   MT("fValidExpressioninFString", "[string f'expression ]{[number 100][operator *][number 5]}[string string']");
   MT("fInvalidFString", "[error f'this is wrong}]");
+  MT("fNestedFString", "[string f'expression ]{[number 100] [operator +] [string f'inner]{[number 5]}[string ']}[string string']");
   MT("uValidStringPrefix", "[string u'this is an unicode string']");
 })();

From 6d68735cccb095345c0eaf468d883080874076ac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 15 Apr 2018 13:35:52 +0200
Subject: [PATCH 3726/4742] [javascript mode] Fix corner case with async
 properties

Closes #5359
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d6ed5484da..c4a709c624 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -126,7 +126,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
           var kw = keywords[word]
           return ret(kw.type, kw.style, word)
         }
-        if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\(\w]/, false))
+        if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))
           return ret("async", "keyword", word)
       }
       return ret("variable", "variable", word)

From 855f2a6e6d5a9ddfe26352a3fed6ad2aebc7433c Mon Sep 17 00:00:00 2001
From: Bo <BoPeng@users.noreply.github.com>
Date: Sun, 15 Apr 2018 14:40:16 -0500
Subject: [PATCH 3727/4742] [javascript mode] Remove incorrect comment on
 nested f-string

---
 mode/python/python.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index abbf7e8203..a13a850921 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -144,13 +144,9 @@
       if (stream.match(stringPrefixes)) {
         var isFmtString = stream.current().toLowerCase().indexOf('f') !== -1;
         if (!isFmtString) {
-          // if this is a nested format string (e.g. f' {   f"{10*10}" + "a" }' )
-          // we do not format the nested expression and treat the nested format
-          // string as regular string
           state.tokenize = tokenStringFactory(stream.current());
           return state.tokenize(stream, state);
         } else {
-          // need to do something more sophisticated
           state.tokenize = formatStringFactory(stream.current(), state.tokenize);
           return state.tokenize(stream, state);
         }

From 4f5f6e42fc22e731dddc709fec75dde36573a1f4 Mon Sep 17 00:00:00 2001
From: Karol <krkkx@protonmail.com>
Date: Thu, 19 Apr 2018 13:41:33 +0200
Subject: [PATCH 3728/4742] [gruvbox-dark] Add

---
 demo/theme.html        |  2 ++
 theme/gruvbox-dark.css | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 theme/gruvbox-dark.css

diff --git a/demo/theme.html b/demo/theme.html
index b882c75aa2..97c384b2f3 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -21,6 +21,7 @@
 <link rel="stylesheet" href="../theme/eclipse.css">
 <link rel="stylesheet" href="../theme/elegant.css">
 <link rel="stylesheet" href="../theme/erlang-dark.css">
+<link rel="stylesheet" href="../theme/gruvbox-dark.css">
 <link rel="stylesheet" href="../theme/hopscotch.css">
 <link rel="stylesheet" href="../theme/icecoder.css">
 <link rel="stylesheet" href="../theme/isotope.css">
@@ -110,6 +111,7 @@ <h2>Theme Demo</h2>
     <option>eclipse</option>
     <option>elegant</option>
     <option>erlang-dark</option>
+    <option>gruvbox-dark</option>
     <option>hopscotch</option>
     <option>icecoder</option>
     <option>idea</option>
diff --git a/theme/gruvbox-dark.css b/theme/gruvbox-dark.css
new file mode 100644
index 0000000000..01ca7bb724
--- /dev/null
+++ b/theme/gruvbox-dark.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       gruvbox-dark
+    Author:     kRkk (https://github.com/krkk)
+
+    Original gruvbox color scheme by Pavel Pertsev (https://github.com/morhetz/gruvbox)
+
+*/
+
+.cm-s-gruvbox-dark.CodeMirror, .cm-s-gruvbox-dark .CodeMirror-gutters { background-color: #282828; color: #bdae93; }
+.cm-s-gruvbox-dark .CodeMirror-gutters {background: #282828; border-right: 0px;}
+.cm-s-gruvbox-dark .CodeMirror-linenumber {color: #7c6f64;}
+.cm-s-gruvbox-dark .CodeMirror-cursor { border-left: 1px solid #ebdbb2; }
+.cm-s-gruvbox-dark div.CodeMirror-selected { background: #928374; }
+.cm-s-gruvbox-dark span.cm-meta { color: #808000; }
+
+.cm-s-gruvbox-dark span.cm-comment { color: #928374; }
+.cm-s-gruvbox-dark span.cm-number, span.cm-atom { color: #d3869b; }
+.cm-s-gruvbox-dark span.cm-keyword { color: #f84934; }
+
+.cm-s-gruvbox-dark span.cm-variable { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-variable-2 { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-variable-3, .cm-s-gruvbox-dark span.cm-type { color: black; }
+.cm-s-gruvbox-dark span.cm-operator { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-def { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-string { color: #b8bb26; }
+.cm-s-gruvbox-dark span.cm-string-2 { color: #8ec07c; }
+.cm-s-gruvbox-dark span.cm-qualifier { color: #555; }
+.cm-s-gruvbox-dark span.cm-attribute { color: #8ec07c; }
+
+.cm-s-gruvbox-dark .CodeMirror-activeline-background { background: #3c3836; }
+.cm-s-gruvbox-dark .CodeMirror-matchingbracket { background: #928374; color:#282828 !important; }
+
+.cm-s-gruvbox-dark span.cm-builtin { color: #fe8019; }

From ffc174b4e9bb4e6d856c3f69237e1710f8ed9691 Mon Sep 17 00:00:00 2001
From: Vadzim Ramanenka <vramanenka@gmail.com>
Date: Mon, 16 Apr 2018 00:23:35 +0300
Subject: [PATCH 3729/4742] [markdown mode] Allow HTML tags with dash and
 digits

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index d252fb8983..72dfd5b8cd 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -534,7 +534,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return type + tokenTypes.linkEmail;
     }
 
-    if (modeCfg.xml && ch === '<' && stream.match(/^(!--|[a-z]+(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*>)/i, false)) {
+    if (modeCfg.xml && ch === '<' && stream.match(/^(!--|[a-z][a-z0-9-]*(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*>)/i, false)) {
       var end = stream.string.indexOf(">", stream.pos);
       if (end != -1) {
         var atts = stream.string.substring(stream.start, end);

From 61623eccff658367a521b3093b38216986f09b39 Mon Sep 17 00:00:00 2001
From: Eric Bogard <ebogard@umich.edu>
Date: Mon, 9 Apr 2018 14:29:41 -0400
Subject: [PATCH 3730/4742] Added vim keybinds for '(' and ')' in order to
 allow movement by sentence. Also added unit tests for the new movement
 operators.

---
 keymap/vim.js    | 182 +++++++++++++++++++++++++++++++++++++++++++++++
 test/vim_test.js |  34 +++++++++
 2 files changed, 216 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 27c756a029..ef79585f7d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -93,6 +93,8 @@
     { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
     { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
     { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
+    { keys: '(', type: 'motion', motion: 'moveBySentence', motionArgs: { forward: false }},
+    { keys: ')', type: 'motion', motion: 'moveBySentence', motionArgs: { forward: true }},
     { keys: '<C-f>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
     { keys: '<C-b>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
     { keys: '<C-d>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
@@ -423,6 +425,9 @@
     function isWhiteSpaceString(k) {
       return (/^\s*$/).test(k);
     }
+    function isEndOfSentenceSymbol(k) {
+      return '.?!'.indexOf(k) != -1;
+    }
     function inArray(val, arr) {
       for (var i = 0; i < arr.length; i++) {
         if (arr[i] == val) {
@@ -1811,6 +1816,10 @@
         var dir = motionArgs.forward ? 1 : -1;
         return findParagraph(cm, head, motionArgs.repeat, dir);
       },
+      moveBySentence: function(cm, head, motionArgs) {
+        var dir = motionArgs.forward ? 1 : -1;
+        return findSentence(cm, head, motionArgs.repeat, dir);
+      },
       moveByScroll: function(cm, head, motionArgs, vim) {
         var scrollbox = cm.getScrollInfo();
         var curEnd = null;
@@ -3534,6 +3543,179 @@
       return { start: start, end: end };
     }
 
+    function findSentence(cm, cur, repeat, dir) {
+
+      /*
+        Takes an index object
+        {
+          line: the line string,
+          ln: line number,
+          pos: index in line,
+          dir: direction of traversal (-1 or 1)
+        }
+        and modifies the line, ln, and pos members to represent the
+        next valid position or sets them to null if there are
+        no more valid positions.
+       */
+      function nextChar(cm, idx) {
+        if (idx.pos + idx.dir < 0 || idx.pos + idx.dir >= idx.line.length) {
+          idx.ln += idx.dir;
+          if (!isLine(cm, idx.ln)) {
+            idx.line = null;
+            idx.ln = null;
+            idx.pos = null;
+            return;
+          }
+          idx.line = cm.getLine(idx.ln);
+          idx.pos = (idx.dir > 0) ? 0 : idx.line.length - 1;
+        }
+        else {
+          idx.pos += idx.dir;
+        }
+      }
+
+      /*
+        Performs one iteration of traversal in forward direction
+        Returns an index object of the new location
+       */
+      function forward(cm, ln, pos, dir) {
+        var line = cm.getLine(ln);
+        var stop = (line === "");
+
+        var curr = {
+          line: line,
+          ln: ln,
+          pos: pos,
+          dir: dir,
+        }
+
+        var last_valid = {
+          ln: curr.ln,
+          pos: curr.pos,
+        }
+
+        var skip_empty_lines = (curr.line === "");
+
+        // Move one step to skip character we start on
+        nextChar(cm, curr);
+
+        while (curr.line !== null) {
+          last_valid.ln = curr.ln;
+          last_valid.pos = curr.pos;
+
+          if (curr.line === "" && !skip_empty_lines) {
+            return { ln: curr.ln, pos: curr.pos, };
+          }
+          else if (stop && curr.line !== "" && !isWhiteSpaceString(curr.line[curr.pos])) {
+            return { ln: curr.ln, pos: curr.pos, };
+          }
+          else if (isEndOfSentenceSymbol(curr.line[curr.pos])
+            && !stop
+            && (curr.pos === curr.line.length - 1
+              || isWhiteSpaceString(curr.line[curr.pos + 1]))) {
+            stop = true;
+          }
+
+          nextChar(cm, curr);
+        }
+
+        /*
+          Set the position to the last non whitespace character on the last
+          valid line in the case that we reach the end of the document.
+        */
+        var line = cm.getLine(last_valid.ln);
+        last_valid.pos = 0;
+        for(var i = line.length - 1; i >= 0; --i) {
+          if (!isWhiteSpaceString(line[i])) {
+            last_valid.pos = i;
+            break;
+          }
+        }
+
+        return last_valid;
+
+      }
+
+      /*
+        Performs one iteration of traversal in reverse direction
+        Returns an index object of the new location
+       */
+      function reverse(cm, ln, pos, dir) {
+        var line = cm.getLine(ln);
+
+        var curr = {
+          line: line,
+          ln: ln,
+          pos: pos,
+          dir: dir,
+        }
+
+        var last_valid = {
+          ln: curr.ln,
+          pos: null,
+        };
+
+        var skip_empty_lines = (curr.line === "");
+
+        // Move one step to skip character we start on
+        nextChar(cm, curr);
+
+        while (curr.line !== null) {
+
+          if (curr.line === "" && !skip_empty_lines) {
+            if (last_valid.pos !== null) {
+              return last_valid;
+            }
+            else {
+              return { ln: curr.ln, pos: curr.pos };
+            }
+          }
+          else if (isEndOfSentenceSymbol(curr.line[curr.pos])
+              && last_valid.pos !== null
+              && !(curr.ln === last_valid.ln && curr.pos + 1 === last_valid.pos)) {
+            return last_valid;
+          }
+          else if (curr.line !== "" && !isWhiteSpaceString(curr.line[curr.pos])) {
+            skip_empty_lines = false;
+            last_valid = { ln: curr.ln, pos: curr.pos }
+          }
+
+          nextChar(cm, curr);
+        }
+
+        /*
+          Set the position to the first non whitespace character on the last
+          valid line in the case that we reach the beginning of the document.
+        */
+        var line = cm.getLine(last_valid.ln);
+        last_valid.pos = 0;
+        for(var i = 0; i < line.length; ++i) {
+          if (!isWhiteSpaceString(line[i])) {
+            last_valid.pos = i;
+            break;
+          }
+        }
+        return last_valid;
+      }
+
+      var curr_index = {
+        ln: cur.line,
+        pos: cur.ch,
+      };
+
+      while (repeat > 0) {
+        if (dir < 0) {
+          curr_index = reverse(cm, curr_index.ln, curr_index.pos, dir);
+        }
+        else {
+          curr_index = forward(cm, curr_index.ln, curr_index.pos, dir);
+        }
+        repeat--;
+      }
+
+      return Pos(curr_index.ln, curr_index.pos);
+    }
+
     // TODO: perhaps this finagling of start and end positions belonds
     // in codemirror/replaceRange?
     function selectCompanionObject(cm, head, symb, inclusive) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 6433134c21..d70a46d7c7 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -509,6 +509,40 @@ testVim('{', function(cm, vim, helpers) {
   helpers.doKeys('6', '{');
   helpers.assertCursorAt(0, 0);
 }, { value: 'a\n\nb\nc\n\nd' });
+testVim('(', function(cm, vim, helpers) {
+  cm.setCursor(6, 23);
+  helpers.doKeys('(');
+  helpers.assertCursorAt(6, 14);
+  helpers.doKeys('2', '(');
+  helpers.assertCursorAt(5, 0);
+  helpers.doKeys('(');
+  helpers.assertCursorAt(4, 0);
+  helpers.doKeys('(');
+  helpers.assertCursorAt(3, 0);
+  helpers.doKeys('(');
+  helpers.assertCursorAt(2, 0);
+  helpers.doKeys('(');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('(');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'sentence1.\n\n\nsentence2\n\nsentence3. sentence4\n   sentence5? sentence6!' });
+testVim(')', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('2', ')');
+  helpers.assertCursorAt(3, 0);
+  helpers.doKeys(')');
+  helpers.assertCursorAt(4, 0);
+  helpers.doKeys(')');
+  helpers.assertCursorAt(5, 0);
+  helpers.doKeys(')');
+  helpers.assertCursorAt(5, 11);
+  helpers.doKeys(')');
+  helpers.assertCursorAt(6, 14);
+  helpers.doKeys(')');
+  helpers.assertCursorAt(6, 23);
+  helpers.doKeys(')');
+  helpers.assertCursorAt(6, 23);
+}, { value: 'sentence1.\n\n\nsentence2\n\nsentence3. sentence4\n   sentence5? sentence6!' });
 testVim('paragraph_motions', function(cm, vim, helpers) {
   cm.setCursor(10, 0);
   helpers.doKeys('{');

From 6041c2280e29e0b62302ca91d657767b23c5a983 Mon Sep 17 00:00:00 2001
From: wonderboyjon <wonderboyjon@users.noreply.github.com>
Date: Fri, 20 Apr 2018 10:03:29 +0100
Subject: [PATCH 3731/4742] [sql-hint addon] Add semantic classes to different
 types of hints

By adding classes that clearly define when a hint is a table or a keyword, it gives developers easy control if they wish to style hints differently. For example, you may wish to style table hints in a different colour to keywords (to make them easier to distinguish).
---
 addon/hint/sql-hint.js | 19 ++++++++++++++++---
 test/sql-hint-test.js  | 15 +++++++++------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 5d20eea625..62b69c948f 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -275,10 +275,23 @@
     if (search.charAt(0) == "." || search.charAt(0) == identifierQuote) {
       start = nameCompletion(cur, token, result, editor);
     } else {
-      addMatches(result, search, defaultTable, function(w) {return w;});
-      addMatches(result, search, tables, function(w) {return w;});
+      addMatches(result, search, defaultTable, function(w) {return {text:w, className: "CodeMirror-hint-table CodeMirror-hint-default-table"};});
+      addMatches(
+          result,
+          search,
+          tables,
+          function(w) {
+              if (typeof w === 'object') {
+                  w.className =  "CodeMirror-hint-table";
+              } else {
+                  w = {text: w, className: "CodeMirror-hint-table"};
+              }
+
+              return w;
+          }
+      );
       if (!disableKeywords)
-        addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
+        addMatches(result, search, keywords, function(w) {return {text: w.toUpperCase(), className: "CodeMirror-hint-keyword"};});
     }
 
     return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index 1094ec03de..884ac7a26c 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -41,7 +41,7 @@
   test("keywords", {
     value: "SEL",
     cursor: Pos(0, 3),
-    list: ["SELECT"],
+    list: [{"text":"SELECT","className":"CodeMirror-hint-keyword"}],
     from: Pos(0, 0),
     to: Pos(0, 3)
   });
@@ -49,7 +49,7 @@
   test("from", {
     value: "SELECT * fr",
     cursor: Pos(0, 11),
-    list: ["FROM"],
+    list: [{"text":"FROM","className":"CodeMirror-hint-keyword"}],
     from: Pos(0, 9),
     to: Pos(0, 11)
   });
@@ -58,7 +58,7 @@
     value: "SELECT xc",
     cursor: Pos(0, 9),
     tables: simpleTables,
-    list: ["xcountries"],
+    list: [{"text":"xcountries","className":"CodeMirror-hint-table"}],
     from: Pos(0, 7),
     to: Pos(0, 9)
   });
@@ -123,8 +123,11 @@
     value: "SELECT schem",
     cursor: Pos(0, 12),
     tables: schemaTables,
-    list: ["schema.users", "schema.countries",
-           "SCHEMA", "SCHEMA_NAME", "SCHEMAS"],
+    list: [{"text":"schema.users","className":"CodeMirror-hint-table"},
+        {"text":"schema.countries","className":"CodeMirror-hint-table"},
+        {"text":"SCHEMA","className":"CodeMirror-hint-keyword"},
+        {"text":"SCHEMA_NAME","className":"CodeMirror-hint-keyword"},
+        {"text":"SCHEMAS","className":"CodeMirror-hint-keyword"}],
     from: Pos(0, 7),
     to: Pos(0, 12)
   });
@@ -186,7 +189,7 @@
     value: "SELECT myt",
     cursor: Pos(0, 10),
     tables: displayTextTables,
-    list: [{text: "mytable", displayText: "mytable | The main table",}],
+    list: [{text: "mytable", displayText: "mytable | The main table", "className":"CodeMirror-hint-table"}],
     from: Pos(0, 7),
     to: Pos(0, 10)
   });

From 00f50fb6ed3f7cff629b1c354f7e244e5b53dbb5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Apr 2018 11:36:56 +0200
Subject: [PATCH 3732/4742] Mark version 5.37.0

---
 AUTHORS           |  9 +++++++++
 CHANGELOG.md      | 18 ++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 17 ++++++++++++++---
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 03b4141ea5..f57c98a145 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -104,7 +104,9 @@ binny
 B Krishna Chaitanya
 Blaine G
 blukat29
+Bo
 boomyjee
+Bo Peng
 borawjm
 Brad Metcalf
 Brandon Frohs
@@ -202,6 +204,7 @@ Elisée
 Emmanuel Schanzer
 Enam Mijbah Noor
 Eric Allam
+Eric Bogard
 Erik Welander
 eustas
 Fabien Dubosson
@@ -266,6 +269,7 @@ Hélio
 Hendrik Wallbaum
 Henrik Haugbølle
 Herculano Campos
+hidaiy
 Hiroyuki Makino
 hitsthings
 Hocdoc
@@ -364,6 +368,7 @@ Justin Hileman
 jwallers@gmail.com
 kaniga
 karevn
+Karol
 Kayur Patel
 Kazuhito Hokamura
 Ken Newman
@@ -495,6 +500,7 @@ mps
 ms
 mtaran-google
 Mu-An Chiou
+Mu-An ✌️ Chiou
 mzabuawala
 Narciso Jaramillo
 Nathan Williams
@@ -695,8 +701,10 @@ Travis Heppe
 Triangle717
 Tristan Tarrant
 TSUYUSATO Kitsune
+Tugrul Elmas
 twifkak
 Tyler Long
+Vadzim Ramanenka
 Vaibhav Sagar
 VapidWorx
 Vestimir Markov
@@ -716,6 +724,7 @@ William Jamieson
 William Stein
 Willy
 Wojtek Ptak
+wonderboyjon
 Wu Cheng-Han
 Xavier Mendez
 Yassin N. Hassan
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8199fd30b..8972e9aecf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 5.37.0 (2018-04-20)
+
+### Bug fixes
+
+Suppress keypress events during composition, for platforms that don't properly do this themselves.
+
+[xml-fold addon](http://codemirror.net/demo/folding.html): Improve handling of line-wrapped opening tags.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve TypeScript support.
+
+[python mode](http://codemirror.net/mode/python/): Highlight expressions inside format strings.
+
+### New features
+
+[vim bindings](http://codemirror.net/demo/vim.html): Add support for '(' and ')' movement.
+
+New themes: [idea](http://codemirror.net/demo/theme.html#idea), [ssms](http://codemirror.net/demo/theme.html#ssms), [gruvbox-dark](http://codemirror.net/demo/theme.html#gruvbox-dark).
+
 ## 5.36.0 (2018-03-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 4c95e325a1..e069dcfe6b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.36.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.37.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 1cdea6729a..7919aa3e55 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,9 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2018: <a href="http://codemirror.net/codemirror-5.37.0.zip">Version 5.37.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Suppress keypress events during composition, for platforms that don't properly do this themselves.</li>
+    <li><a href="http://codemirror.net/demo/folding.html">xml-fold addon</a>: Improve handling of line-wrapped opening tags.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve TypeScript support.</li>
+    <li><a href="http://codemirror.net/mode/python/">python mode</a>: Highlight expressions inside format strings.</li>
+    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Add support for '(' and ')' movement.</li>
+    <li>New themes: <a href="http://codemirror.net/demo/theme.html#idea">idea</a>, <a href="http://codemirror.net/demo/theme.html#ssms">ssms</a>, <a href="http://codemirror.net/demo/theme.html#gruvbox-dark">gruvbox-dark</a>.</li>
+  </ul>
+
   <p class="rel">20-03-2018: <a href="http://codemirror.net/codemirror-5.36.0.zip">Version 5.36.0</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li>Make sure all document-level event handlers are registered on the document that the editor is part of.</li>
     <li>Fix issue that prevented edits whose origin starts with <code>+</code> from being combined in history events for an editor-less document.</li>
     <li><a href="http://codemirror.net/demo/multiplex.html">multiplex addon</a>: Improve handling of indentation.</li>
@@ -46,7 +57,7 @@ <h2>Version 5.x</h2>
 
   <p class="rel">20-02-2018: <a href="http://codemirror.net/codemirror-5.35.0.zip">Version 5.35.0</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li>Fix problem where selection undo might change read-only documents.</li>
     <li>Fix crash when calling <code>addLineWidget</code> on a document that has no attached editor.</li>
     <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix behavior of <code>^</code> in multiline regexp mode.</li>
@@ -62,7 +73,7 @@ <h2>Version 5.x</h2>
 
   <p class="rel">29-01-2018: <a href="http://codemirror.net/codemirror-5.34.0.zip">Version 5.34.0</a>:</p>
 
-  <ul>
+  <ul class="rel-note">
     <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix a problem where inline styles would persist across list items.</li>
     <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix the <code>toggleBookmark</code> command.</li>
     <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when closing triple quotes.</li>
diff --git a/index.html b/index.html
index c0e3e9a235..02ff74f82d 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.36.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.37.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index e6d4a897ed..47db21257d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.36.1",
+  "version": "5.37.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 486354a5c3..0a704cddd5 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.36.1"
+CodeMirror.version = "5.37.0"

From 1af407ca53f043f4898ed993d3c3b60419eab427 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Apr 2018 11:38:31 +0200
Subject: [PATCH 3733/4742] Bump version number post-5.37.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index e069dcfe6b..5919ef6483 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.37.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.37.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 47db21257d..871277263f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.37.0",
+  "version": "5.37.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 0a704cddd5..00f2b78f56 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.37.0"
+CodeMirror.version = "5.37.1"

From b63d798d7c8680dd7fa668363bf44196603c6332 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 24 Apr 2018 08:34:56 +0200
Subject: [PATCH 3734/4742] Use event.buttons to abort drag on mousemove, when
 supported

Issue #5370
---
 src/edit/mouse_events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 63e096b705..4ecb715896 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -313,7 +313,7 @@ function leftButtonSelect(cm, event, start, behavior) {
   }
 
   let move = operation(cm, e => {
-    if (!e_button(e)) done(e)
+    if (e.buttons === 0 || !e_button(e)) done(e)
     else extend(e)
   })
   let up = operation(cm, done)

From ab74425fa99f629999a486240489b6dc750adee6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 25 Apr 2018 09:32:57 +0200
Subject: [PATCH 3735/4742] [javascript mode] Support binding-less catch

Closes #5376
---
 mode/javascript/javascript.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c4a709c624..67bd8fdb0a 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -367,14 +367,16 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
                                       block, poplex, poplex);
     if (type == "case") return cont(expression, expect(":"));
     if (type == "default") return cont(expect(":"));
-    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                     statement, poplex, popcontext);
+    if (type == "catch") return cont(pushlex("form"), pushcontext, maybeCatchBinding, statement, poplex, popcontext);
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
     if (type == "async") return cont(statement)
     if (value == "@") return cont(expression, statement)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
+  function maybeCatchBinding(type) {
+    if (type == "(") return cont(funarg, expect(")"))
+  }
   function expression(type, value) {
     return expressionInner(type, value, false);
   }

From 9ed217d5b46f98581b7b751758686c5a70ad05d1 Mon Sep 17 00:00:00 2001
From: christopherblaser <ctnblaser@gmail.com>
Date: Wed, 25 Apr 2018 00:40:54 -0700
Subject: [PATCH 3736/4742] [json-lint addon] Look at parser property of
 jsonlint

---
 addon/lint/json-lint.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index 849641ee5e..3d964b3077 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -23,6 +23,11 @@ CodeMirror.registerHelper("lint", "json", function(text) {
     }
     return found;
   }
+  // for jsonlint's web dist jsonlint is exported as an object with a single property parser, of which parseError
+  // is a subproperty
+  if (window.jsonlint.parser) {
+    var jsonlint = window.jsonlint.parser;
+  }
   jsonlint.parseError = function(str, hash) {
     var loc = hash.loc;
     found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),

From 4b37981c7bbb1b7f4615bb45ee7074bf386691c0 Mon Sep 17 00:00:00 2001
From: Milan Szekely <szekelymilan1125@gmail.com>
Date: Wed, 25 Apr 2018 15:59:12 +0200
Subject: [PATCH 3737/4742] [real-world uses] Add salvare

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 3a8005371d..98c78540fb 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -144,6 +144,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://refork.com/">Refork</a> (animation demo gallery and sharing)</li>
       <li><a href="http://sagecell.sagemath.org">SageMathCell</a> (interactive mathematical software)</li>
       <li><a href="https://cloud.sagemath.com/">SageMathCloud</a> (interactive mathematical software environment)</li>
+      <li><a href="https://github.com/szekelymilan/salvare">salvare</a> (real-time collaborative code editor)</li>
       <li><a href="https://chrome.google.com/webstore/detail/servephp/mnpikomdchjhkhbhmbboehfdjkobbfpo">ServePHP</a> (PHP code testing in Chrome dev tools)</li>
       <li><a href="http://scala-lang.org/blog/2017/02/20/introducing-scastie.html">Scastie</a> (Scala playground)</li>
       <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>

From 1004275951b0b8e4cc71af440c6eab1d5936fad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mu-An=20=E2=9C=8C=EF=B8=8F=20Chiou?= <muan@github.com>
Date: Wed, 25 Apr 2018 17:26:38 -0400
Subject: [PATCH 3738/4742] Fix non breaking spaces (for space splitting)
 getting added as real spaces

---
 src/input/ContentEditableInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 057ed2d469..3ed9068cca 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -431,7 +431,7 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
         walk(node.childNodes[i])
       if (isBlock) closing = true
     } else if (node.nodeType == 3) {
-      addText(node.nodeValue)
+      addText(node.nodeValue.replace(/\u00a0/g, " "))
     }
   }
   for (;;) {

From 7677433daf7d0b0d3aed70f8a1ffe10618dd9c6e Mon Sep 17 00:00:00 2001
From: stan-z <stan-z@users.noreply.github.com>
Date: Fri, 27 Apr 2018 11:08:24 +0300
Subject: [PATCH 3739/4742] [show-hint addon] Fix select for initially
 unselected

FIxes #5380
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 81a63fc992..dae450db90 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -333,7 +333,7 @@
         i = avoidWrap ? 0  : this.data.list.length - 1;
       if (this.selectedHint == i) return;
       var node = this.hints.childNodes[this.selectedHint];
-      node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
+      if (node) node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
       node = this.hints.childNodes[this.selectedHint = i];
       node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
       if (node.offsetTop < this.hints.scrollTop)

From 04298bbf829a32271ee36d8813030ce400ff6da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mu-An=20=E2=9C=8C=EF=B8=8F=20Chiou?= <muan@github.com>
Date: Thu, 26 Apr 2018 15:45:36 -0400
Subject: [PATCH 3740/4742] Fix IE11 pasting losing line breaks - walk child of
 [cm-text] if [cm-text] is empty in order to find line breaks - treat
 br/li/table as blocks - always addText from on textNode not node.textContent

---
 src/input/ContentEditableInput.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 3ed9068cca..7efeec2b33 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -413,8 +413,8 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
   function walk(node) {
     if (node.nodeType == 1) {
       let cmText = node.getAttribute("cm-text")
-      if (cmText != null) {
-        addText(cmText || node.textContent.replace(/\u200b/g, ""))
+      if (cmText) {
+        addText(cmText)
         return
       }
       let markerID = node.getAttribute("cm-marker"), range
@@ -425,13 +425,15 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
         return
       }
       if (node.getAttribute("contenteditable") == "false") return
-      let isBlock = /^(pre|div|p)$/i.test(node.nodeName)
+      let isBlock = /^(pre|div|p|li|table|br)$/i.test(node.nodeName)
+      if (!/^br$/i.test(node.nodeName) && node.textContent.length == 0) return
+
       if (isBlock) close()
       for (let i = 0; i < node.childNodes.length; i++)
         walk(node.childNodes[i])
       if (isBlock) closing = true
     } else if (node.nodeType == 3) {
-      addText(node.nodeValue.replace(/\u00a0/g, " "))
+      addText(node.nodeValue.replace(/\u00a0/g, " ").replace(/\u200b/g, ""))
     }
   }
   for (;;) {

From 01fe6ca404436e51e54102f20d0233307f529dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mu-An=20=E2=9C=8C=EF=B8=8F=20Chiou?= <muan@github.com>
Date: Thu, 26 Apr 2018 16:02:07 -0400
Subject: [PATCH 3741/4742] Extra line breaks for blocky elements

---
 src/input/ContentEditableInput.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 7efeec2b33..bc9a4d1730 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -396,12 +396,13 @@ function isInGutter(node) {
 function badPos(pos, bad) { if (bad) pos.bad = true; return pos }
 
 function domTextBetween(cm, from, to, fromLine, toLine) {
-  let text = "", closing = false, lineSep = cm.doc.lineSeparator()
+  let text = "", closing = false, lineSep = cm.doc.lineSeparator(), extraLinebreak = false
   function recognizeMarker(id) { return marker => marker.id == id }
   function close() {
     if (closing) {
       text += lineSep
-      closing = false
+      if (extraLinebreak) text += lineSep
+      closing = extraLinebreak = false
     }
   }
   function addText(str) {
@@ -431,9 +432,11 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
       if (isBlock) close()
       for (let i = 0; i < node.childNodes.length; i++)
         walk(node.childNodes[i])
+
+      if (/^(pre|p)$/i.test(node.nodeName)) extraLinebreak = true
       if (isBlock) closing = true
     } else if (node.nodeType == 3) {
-      addText(node.nodeValue.replace(/\u00a0/g, " ").replace(/\u200b/g, ""))
+      addText(node.nodeValue.replace(/\u200b/g, "").replace(/\u00a0/g, " "))
     }
   }
   for (;;) {

From 2893e58ebfe714f2c12496ce227d6bc2efbdb397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mu-An=20=E2=9C=8C=EF=B8=8F=20Chiou?= <muan@github.com>
Date: Thu, 26 Apr 2018 16:23:12 -0400
Subject: [PATCH 3742/4742] Reset extralinebreak between nodes

---
 src/input/ContentEditableInput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index bc9a4d1730..0980f01832 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -443,6 +443,7 @@ function domTextBetween(cm, from, to, fromLine, toLine) {
     walk(from)
     if (from == to) break
     from = from.nextSibling
+    extraLinebreak = false
   }
   return text
 }

From a74803886697b35d28a075a4617a55a4791dbb11 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 2 May 2018 17:43:02 +0200
Subject: [PATCH 3743/4742] Set tabindex=-1 on scrollbar elements

To prevent them from showing up in the tab order on Firefox

Closes #5391
---
 src/display/scrollbars.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index 7308c5e272..18ac121a94 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -32,6 +32,7 @@ class NativeScrollbars {
     this.cm = cm
     let vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar")
     let horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar")
+    vert.tabIndex = horiz.tabIndex = -1
     place(vert); place(horiz)
 
     on(vert, "scroll", () => {

From 3eaa89bfdb980a22e903b0a697cbe41bf8bd446a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 3 May 2018 10:13:58 +0200
Subject: [PATCH 3744/4742] Make sure coordsChar doesn't return positions in
 collapsed spans

Closes #5392
---
 src/line/spans.js                       | 10 ++++++++++
 src/measurement/position_measurement.js | 13 ++++++-------
 test/test.js                            |  9 +++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/line/spans.js b/src/line/spans.js
index f7e5f4b6e9..d81dec4b83 100644
--- a/src/line/spans.js
+++ b/src/line/spans.js
@@ -218,6 +218,16 @@ function collapsedSpanAtSide(line, start) {
 export function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true) }
 export function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false) }
 
+export function collapsedSpanAround(line, ch) {
+  let sps = sawCollapsedSpans && line.markedSpans, found
+  if (sps) for (let i = 0; i < sps.length; ++i) {
+    let sp = sps[i]
+    if (sp.marker.collapsed && (sp.from == null || sp.from < ch) && (sp.to == null || sp.to > ch) &&
+        (!found || compareCollapsedMarkers(found, sp.marker) < 0)) found = sp.marker
+  }
+  return found
+}
+
 // Test whether there exists a collapsed span that partially
 // overlaps (covers the start or end, but not both) of a new span.
 // Such overlap is not allowed.
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index aeff0e5b8d..eb9d18a4cb 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -1,6 +1,6 @@
 import { buildLineContent, LineView } from "../line/line_data.js"
 import { clipPos, Pos } from "../line/pos.js"
-import { collapsedSpanAtEnd, heightAtLine, lineIsHidden, visualLine } from "../line/spans.js"
+import { collapsedSpanAround, heightAtLine, lineIsHidden, visualLine } from "../line/spans.js"
 import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line.js"
 import { bidiOther, getBidiPartAt, getOrder } from "../util/bidi.js"
 import { chrome, android, ie, ie_version } from "../util/browser.js"
@@ -430,12 +430,11 @@ export function coordsChar(cm, x, y) {
   let lineObj = getLine(doc, lineN)
   for (;;) {
     let found = coordsCharInner(cm, lineObj, lineN, x, y)
-    let merged = collapsedSpanAtEnd(lineObj)
-    let mergedPos = merged && merged.find(0, true)
-    if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
-      lineN = lineNo(lineObj = mergedPos.to.line)
-    else
-      return found
+    let collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0))
+    if (!collapsed) return found
+    let rangeEnd = collapsed.find(1)
+    if (rangeEnd.line == lineN) return rangeEnd
+    lineObj = getLine(doc, lineN = rangeEnd.line)
   }
 }
 
diff --git a/test/test.js b/test/test.js
index 415dd9f0bc..a646a0ce19 100644
--- a/test/test.js
+++ b/test/test.js
@@ -889,6 +889,15 @@ testCM("hiddenLinesSelectAll", function(cm) {  // Issue #484
   eqCursorPos(cm.getCursor(false), Pos(10, 4));
 });
 
+testCM("clickFold", function(cm) { // Issue #5392
+  cm.setValue("foo { bar }")
+  var widget = document.createElement("span")
+  widget.textContent = "<>"
+  cm.markText(Pos(0, 5), Pos(0, 10), {replacedWith: widget})
+  var after = cm.charCoords(Pos(0, 10))
+  var foundOn = cm.coordsChar({left: after.left - 1, top: after.top + 4})
+  is(foundOn.ch <= 5 || foundOn.ch >= 10, "Position is not inside the folded range")
+})
 
 testCM("everythingFolded", function(cm) {
   addDoc(cm, 2, 2);

From aa92503a10832feae5d832be6ed5be206c63ff5a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 6 May 2018 21:51:55 +0200
Subject: [PATCH 3745/4742] [javascript mode] Support s regexp flag

Issue #5396
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 67bd8fdb0a..1e9bfa0c14 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -96,7 +96,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         return ret("comment", "comment");
       } else if (expressionAllowed(stream, state, 1)) {
         readRegexp(stream);
-        stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
+        stream.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/);
         return ret("regexp", "string-2");
       } else {
         stream.eat("=");

From efbaa4f0435539d197796df716da17d9f3c13f38 Mon Sep 17 00:00:00 2001
From: Prendota <prendota@mail.ru>
Date: Sat, 5 May 2018 12:26:13 +0300
Subject: [PATCH 3746/4742] [darcula theme] Add

---
 demo/theme.html   |  2 ++
 theme/darcula.css | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 theme/darcula.css

diff --git a/demo/theme.html b/demo/theme.html
index 97c384b2f3..c4e7899f09 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -56,6 +56,7 @@
 <link rel="stylesheet" href="../theme/xq-light.css">
 <link rel="stylesheet" href="../theme/yeti.css">
 <link rel="stylesheet" href="../theme/idea.css">
+<link rel="stylesheet" href="../theme/darcula.css">
 <link rel="stylesheet" href="../theme/zenburn.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
@@ -105,6 +106,7 @@ <h2>Theme Demo</h2>
     <option>blackboard</option>
     <option>cobalt</option>
     <option>colorforth</option>
+    <option>darcula</option>
     <option>dracula</option>
     <option>duotone-dark</option>
     <option>duotone-light</option>
diff --git a/theme/darcula.css b/theme/darcula.css
new file mode 100644
index 0000000000..c789459116
--- /dev/null
+++ b/theme/darcula.css
@@ -0,0 +1,34 @@
+/**
+    Name:       IntelliJ IDEA darcula theme
+    From IntelliJ IDEA by JetBrains
+ */
+
+.cm-s-darcula span.cm-meta { color: #BBB529; }
+.cm-s-darcula span.cm-number { color: #6897BB; }
+.cm-s-darcula span.cm-keyword { line-height: 1em; font-weight: bold; color: #CC7832; }
+.cm-s-darcula span.cm-def { color: #FFC66D; }
+.cm-s-darcula span.cm-variable { color: #A9B7C6; }
+.cm-s-darcula span.cm-variable-2 { color: #A9B7C6; }
+.cm-s-darcula span.cm-variable-3, .cm-s-darcula span.cm-type { color: #A9B7C6; }
+.cm-s-darcula span.cm-property { color: #A9B7C6; }
+.cm-s-darcula span.cm-operator { color: #A9B7C6; }
+.cm-s-darcula span.cm-string { color: #6A8759; }
+.cm-s-darcula span.cm-string-2 { color: #6A8759; }
+.cm-s-darcula span.cm-comment { color: #808080; }
+.cm-s-darcula span.cm-link { color: #287BDE; }
+.cm-s-darcula span.cm-atom { font-weight: bold; color: #CC7832; }
+.cm-s-darcula span.cm-error { color: #BC3F3C; }
+.cm-s-darcula span.cm-tag { color: #CC7832; }
+.cm-s-darcula span.cm-attribute { color: #6A8759; }
+.cm-s-darcula span.cm-qualifier { color: #6A8759; }
+.cm-s-darcula span.cm-bracket { color: #A9B7C6; }
+.cm-s-darcula.CodeMirror { background: #2B2B2B; color: #A9B7C6; }
+
+
+.cm-s-darcula .CodeMirror-activeline-background { background: #3A3A3A; }
+.cm-s-darcula div.CodeMirror-selected { background: #085a9c; }
+.cm-s-darcula .CodeMirror-gutters { background: rgb(72, 72, 72); border-right: 1px solid grey; color: #606366 }
+
+.cm-s-darcula span.cm-builtin { color: #A9B7C6; }
+.cm-s-darcula  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
+.cm-s-darcula .CodeMirror-matchingbracket { outline:1px solid #A9B7C6; color: yellow !important; }
\ No newline at end of file

From a18d9f7d269ec084a541192c2be6fd4fba82a167 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 11 May 2018 14:15:25 +0200
Subject: [PATCH 3747/4742] [json-lint addon] Fix broken use of var declaration

Closes #5400
---
 addon/lint/json-lint.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index 3d964b3077..63e70c4595 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -25,9 +25,7 @@ CodeMirror.registerHelper("lint", "json", function(text) {
   }
   // for jsonlint's web dist jsonlint is exported as an object with a single property parser, of which parseError
   // is a subproperty
-  if (window.jsonlint.parser) {
-    var jsonlint = window.jsonlint.parser;
-  }
+  var jsonlint = window.jsonlint.parser || window.jsonlint
   jsonlint.parseError = function(str, hash) {
     var loc = hash.loc;
     found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),

From 456be0a8c5157fe21ae381bd52c17abbee8a5592 Mon Sep 17 00:00:00 2001
From: goldsmcb <cole.b.goldsmith@gmail.com>
Date: Tue, 15 May 2018 01:28:07 -0500
Subject: [PATCH 3748/4742] [dialog addon] Add class when dialog is open

---
 addon/dialog/dialog.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index f10bb5bf19..f61e447660 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -25,6 +25,7 @@
     } else { // Assuming it's a detached DOM element.
       dialog.appendChild(template);
     }
+    CodeMirror.addClass(wrap, 'dialog-opened');
     return dialog;
   }
 
@@ -47,6 +48,7 @@
       } else {
         if (closed) return;
         closed = true;
+        CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
         dialog.parentNode.removeChild(dialog);
         me.focus();
 
@@ -102,6 +104,7 @@
     function close() {
       if (closed) return;
       closed = true;
+      CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
       dialog.parentNode.removeChild(dialog);
       me.focus();
     }
@@ -141,6 +144,7 @@
       if (closed) return;
       closed = true;
       clearTimeout(doneTimer);
+      CodeMirror.rmClass(dialog.parentNode, 'dialog-opened');
       dialog.parentNode.removeChild(dialog);
     }
 

From 73a4fb5ed05b03e36e07f7fdb8b3441b34c284a6 Mon Sep 17 00:00:00 2001
From: Matt MacPherson <matt@edabit.com>
Date: Tue, 15 May 2018 09:43:23 -0400
Subject: [PATCH 3749/4742] Added link for Edabit

Edabit is a free tool for practicing / learning to code.
---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index 98c78540fb..32e87cd0cf 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -70,6 +70,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://ireneros.com/deck/deck.js-codemirror/introduction/#textarea-code">Deck.js integration</a> (slides with editors)</li>
       <li><a href="http://www.dbninja.com">DbNinja</a> (MySQL access interface)</li>
       <li><a href="http://www.ecsspert.com/">eCSSpert</a> (CSS demos and experiments)</li>
+      <li><a href="https://edabit.com">Edabit</a> (coding challenges)</li>
       <li><a href="http://elm-lang.org/Examples.elm">Elm language examples</a></li>
       <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
       <li><a href="http://emmet.io">Emmet</a> (fast XML editing)</li>

From a5f44b43e27e5960d9e9c3ba45b2a7e27766c1ec Mon Sep 17 00:00:00 2001
From: Randy Luecke <randy.luecke@me.com>
Date: Tue, 15 May 2018 14:55:13 -0700
Subject: [PATCH 3750/4742] Fix for cursor being repositioned incorrectly when
 the script is being run in a different frame.

---
 src/input/ContentEditableInput.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 0980f01832..986690b301 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -111,8 +111,12 @@ export default class ContentEditableInput {
     this.showMultipleSelections(info)
   }
 
+  getSelection() {
+    return this.cm.display.wrapper.ownerDocument.getSelection()
+  }
+
   showPrimarySelection() {
-    let sel = window.getSelection(), cm = this.cm, prim = cm.doc.sel.primary()
+    let sel = this.getSelection(), cm = this.cm, prim = cm.doc.sel.primary()
     let from = prim.from(), to = prim.to()
 
     if (cm.display.viewTo == cm.display.viewFrom || from.line >= cm.display.viewTo || to.line < cm.display.viewFrom) {
@@ -177,13 +181,13 @@ export default class ContentEditableInput {
   }
 
   rememberSelection() {
-    let sel = window.getSelection()
+    let sel = this.getSelection()
     this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset
     this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset
   }
 
   selectionInEditor() {
-    let sel = window.getSelection()
+    let sel = this.getSelection()
     if (!sel.rangeCount) return false
     let node = sel.getRangeAt(0).commonAncestorContainer
     return contains(this.div, node)
@@ -218,14 +222,14 @@ export default class ContentEditableInput {
   }
 
   selectionChanged() {
-    let sel = window.getSelection()
+    let sel = this.getSelection()
     return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
       sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset
   }
 
   pollSelection() {
     if (this.readDOMTimeout != null || this.gracePeriod || !this.selectionChanged()) return
-    let sel = window.getSelection(), cm = this.cm
+    let sel = this.getSelection(), cm = this.cm
     // On Android Chrome (version 56, at least), backspacing into an
     // uneditable block element will put the cursor in that element,
     // and then, because it's not editable, hide the virtual keyboard.

From df0a05c7e88e1b33ecb845bab28388c0bad13660 Mon Sep 17 00:00:00 2001
From: paddya <patrick.bisenius@gmail.com>
Date: Wed, 16 May 2018 16:58:54 +0200
Subject: [PATCH 3751/4742] [markdown mode] Fix inefficient regexp

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 72dfd5b8cd..88ecc57c86 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -619,7 +619,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (ch === ' ') {
-      if (stream.match(/ +$/, false)) {
+      if (stream.match(/^ +$/, false)) {
         state.trailingSpace++;
       } else if (state.trailingSpace) {
         state.trailingSpaceNewLine = true;

From 4d9cb8ac367da85effbfbc92c12c4a6bd8e3fece Mon Sep 17 00:00:00 2001
From: Erik Welander <alurcard2@gmail.com>
Date: Sat, 19 May 2018 02:48:58 -0700
Subject: [PATCH 3752/4742] [monokai theme] Reduce the saturation of colors
 within doccomments

---
 theme/monokai.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/theme/monokai.css b/theme/monokai.css
index b5edd13fe6..cd4cd55720 100644
--- a/theme/monokai.css
+++ b/theme/monokai.css
@@ -14,6 +14,11 @@
 .cm-s-monokai span.cm-atom { color: #ae81ff; }
 .cm-s-monokai span.cm-number { color: #ae81ff; }
 
+.cm-s-monokai span.cm-comment.cm-attribute { color: #97b757; }
+.cm-s-monokai span.cm-comment.cm-def { color: #bc9262; }
+.cm-s-monokai span.cm-comment.cm-tag { color: #bc6283; }
+.cm-s-monokai span.cm-comment.cm-type { color: #5998a6; }
+
 .cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
 .cm-s-monokai span.cm-keyword { color: #f92672; }
 .cm-s-monokai span.cm-builtin { color: #66d9ef; }

From 96e836db6d45690346bb042655a00495f3962b94 Mon Sep 17 00:00:00 2001
From: Erik Welander <erik@welander.us>
Date: Mon, 21 May 2018 12:47:27 -0700
Subject: [PATCH 3753/4742] [lesser-dark theme] Make attributes readable

---
 theme/lesser-dark.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index b2ec418fdb..4b347db081 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -38,7 +38,7 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
 .cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
 .cm-s-lesser-dark span.cm-tag { color: #669199; }
-.cm-s-lesser-dark span.cm-attribute { color: #00c; }
+.cm-s-lesser-dark span.cm-attribute { color: #81a4d5; }
 .cm-s-lesser-dark span.cm-hr { color: #999; }
 .cm-s-lesser-dark span.cm-link { color: #00c; }
 .cm-s-lesser-dark span.cm-error { color: #9d1e15; }

From d232e5075e8b7c6a6e155fb1d10fc477e39721e2 Mon Sep 17 00:00:00 2001
From: "Moritz Schubotz (physikerwelt)" <wiki@physikerwelt.de>
Date: Mon, 30 Apr 2018 15:08:22 +0200
Subject: [PATCH 3754/4742] Add tests for html auto completion

---
 test/html-hint-test.js | 87 ++++++++++++++++++++++++++++++++++++++++++
 test/index.html        |  3 ++
 2 files changed, 90 insertions(+)
 create mode 100644 test/html-hint-test.js

diff --git a/test/html-hint-test.js b/test/html-hint-test.js
new file mode 100644
index 0000000000..c19e8a9d56
--- /dev/null
+++ b/test/html-hint-test.js
@@ -0,0 +1,87 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var Pos = CodeMirror.Pos;
+
+  namespace = "html-hint_";
+
+  testData =[
+    {
+      name: "html-element",
+      value: "<htm",
+      list: ["<html"]
+    },
+    {
+      name: "element-close",
+      value: "<a href='#a'>\n</",
+      list: ["</a>"]
+    },
+    {
+      name: "linkref-attribute",
+      value: "<link hreflang='z",
+      from: Pos(0,"<link hreflang=".length),
+      list: ["'zh'","'za'","'zu'"]
+    },
+    {
+      name: "html-completion",
+      value: "<html>\n",
+      list: ["<head","<body","</html>"]
+    }
+  ];
+
+
+  function escapeHtmlList(o) {
+    return '<code>' +
+      JSON.stringify(o.list,null,2)
+      .replace(/</g, "&lt;")
+      .replace(/>/g, "&gt;") +
+      '</code>'
+      ;
+  }
+
+
+  function test(name, spec) {
+    testCM(name, function(cm) {
+      cm.setValue(spec.value);
+      cm.setCursor(spec.cursor);
+      var completion = CodeMirror.hint.html(cm);
+      if (!deepCompare(completion.list, spec.list))
+        throw new Failure("Wrong completion results. Got" +
+          escapeHtmlList(completion) +" but expected" +
+          escapeHtmlList(spec));
+      eqCharPos(completion.from, spec.from,'from-failed');
+      eqCharPos(completion.to, spec.to, 'to-failed');
+    }, {
+      value: spec.value,
+      mode: spec.mode || "text/html"
+    });
+  }
+
+  testData.forEach(function (value) {
+    // Use sane defaults
+    var lines = value.value.split(/\n/);
+    value.to = value.pos || Pos(lines.length-1, lines[lines.length-1].length);
+    value.from = value.from || Pos(lines.length-1,0);
+    value.cursor = value.cursor || value.to;
+    var name = value.name ||value.value;
+    test(name,value) });
+
+
+
+  function deepCompare(a, b) {
+    if (a === b) return true;
+    if (!(a && typeof a === "object") ||
+        !(b && typeof b === "object")) return false;
+    var array = Array.isArray(a);
+    if (Array.isArray(b) !== array) return false;
+    if (array) {
+      if (a.length !== b.length) return false;
+      for (var i = 0; i < a.length; i++) if (!deepCompare(a[i], b[i])) return false
+    } else {
+      for (var p in a) if (!(p in b) || !deepCompare(a[p], b[p])) return false;
+      for (var p in b) if (!(p in a)) return false
+    }
+    return true
+  }
+})();
diff --git a/test/index.html b/test/index.html
index b7922076c7..d735ac3c4b 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,6 +15,8 @@
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/edit/matchbrackets.js"></script>
 <script src="../addon/hint/sql-hint.js"></script>
+<script src="../addon/hint/xml-hint.js"></script>
+<script src="../addon/hint/html-hint.js"></script>
 <script src="../addon/comment/comment.js"></script>
 <script src="../addon/mode/simple.js"></script>
 <script src="../mode/css/css.js"></script>
@@ -148,6 +150,7 @@ <h2>Test Suite</h2>
     <script src="sql-hint-test.js"></script>
     <script src="sublime_test.js"></script>
     <script src="vim_test.js"></script>
+    <script src="html-hint-test.js"></script>
     <script>
       window.onload = runHarness;
       CodeMirror.on(window, 'hashchange', runHarness);

From 10aa13eac2c9658d8013272f1b04573b5990f9f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 22 May 2018 10:52:33 +0200
Subject: [PATCH 3755/4742] Small cleanups for d232e5075

---
 test/html-hint-test.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/test/html-hint-test.js b/test/html-hint-test.js
index c19e8a9d56..4fd53932ef 100644
--- a/test/html-hint-test.js
+++ b/test/html-hint-test.js
@@ -30,17 +30,14 @@
     }
   ];
 
-
   function escapeHtmlList(o) {
     return '<code>' +
       JSON.stringify(o.list,null,2)
       .replace(/</g, "&lt;")
       .replace(/>/g, "&gt;") +
       '</code>'
-      ;
   }
 
-
   function test(name, spec) {
     testCM(name, function(cm) {
       cm.setValue(spec.value);
@@ -65,16 +62,15 @@
     value.from = value.from || Pos(lines.length-1,0);
     value.cursor = value.cursor || value.to;
     var name = value.name ||value.value;
-    test(name,value) });
-
-
+    test(name,value)
+  });
 
   function deepCompare(a, b) {
     if (a === b) return true;
     if (!(a && typeof a === "object") ||
         !(b && typeof b === "object")) return false;
-    var array = Array.isArray(a);
-    if (Array.isArray(b) !== array) return false;
+    var array = a instanceof Array
+    if ((b instanceof Array) !== array) return false;
     if (array) {
       if (a.length !== b.length) return false;
       for (var i = 0; i < a.length; i++) if (!deepCompare(a[i], b[i])) return false

From 40027e21423bb53362f03cf0e1bda25d2faf61c6 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Tue, 6 Mar 2018 13:19:30 -0800
Subject: [PATCH 3756/4742] Implement binding types for var/let/const
 variables.

---
 mode/javascript/javascript.js | 38 ++++++++++++++++++++++++++---------
 mode/javascript/test.js       | 15 ++++++++++++++
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 1e9bfa0c14..c4d3e8ccbe 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -266,16 +266,17 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return true;
   }
   function register(varname) {
-    function inList(list) {
+    function inList(list, block) {
       for (var v = list; v; v = v.next)
-        if (v.name == varname) return true;
+        if (v.name == varname && (block === undefined || v.block === block)) return true;
       return false;
     }
     var state = cx.state;
     cx.marked = "def";
     if (state.context) {
-      if (inList(state.localVars)) return;
-      state.localVars = {name: varname, next: state.localVars};
+      var block = !(cx.state.lexical.info && cx.state.lexical.info.scope === "var");
+      if (inList(state.localVars, block)) return;
+      state.localVars = {name: varname, block: block, next: state.localVars};
     } else {
       if (inList(state.globalVars)) return;
       if (parserConfig.globalVars)
@@ -294,8 +295,25 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
     cx.state.localVars = defaultVars;
   }
+  function pushblockcontext() {
+    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars, block: true};
+    cx.state.localVars = defaultVars;
+  }
   function popcontext() {
-    cx.state.localVars = cx.state.context.vars;
+    if (cx.state.context.block) {
+      var newVars = {name: "this", next: {name: "arguments"}};
+      // drop block-scoped variables
+      for (var v = cx.state.localVars; v; v = v.next) {
+        if (!v.block) newVars = { name: v.name, scope: v.scope, next: newVars };
+      }
+      // inherit from previous scope
+      for (v = cx.state.context.vars; v; v = v.next) {
+        newVars = { name: v.name, scope: v.scope, next: newVars };
+      }
+      cx.state.localVars = newVars;
+    } else {
+      cx.state.localVars = cx.state.context.vars;
+    }
     cx.state.context = cx.state.context.prev;
   }
   function pushlex(type, info) {
@@ -329,12 +347,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
 
   function statement(type, value) {
-    if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
+    if (type == "var") return cont(pushlex("vardef", { scope: value, length: value.length }), vardef, expect(";"), poplex);
     if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex);
     if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
     if (type == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex);
     if (type == "debugger") return cont(expect(";"));
-    if (type == "{") return cont(pushlex("}"), block, poplex);
+    if (type == "{") return cont(pushlex("}"), pushblockcontext, block, poplex, popcontext);
     if (type == ";") return cont();
     if (type == "if") {
       if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
@@ -363,8 +381,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         return cont(pushlex("stat"), maybelabel);
       }
     }
-    if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"),
-                                      block, poplex, poplex);
+    if (type == "switch") return cont(pushblockcontext, pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"),
+                                      block, poplex, poplex, popcontext);
     if (type == "case") return cont(expression, expect(":"));
     if (type == "default") return cont(expect(":"));
     if (type == "catch") return cont(pushlex("form"), pushcontext, maybeCatchBinding, statement, poplex, popcontext);
@@ -826,7 +844,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         lexical = lexical.prev;
       var type = lexical.type, closing = firstChar == type;
 
-      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
+      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info.length + 1 : 0);
       else if (type == "form" && firstChar == "{") return lexical.indented;
       else if (type == "form") return lexical.indented + indentUnit;
       else if (type == "stat")
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 1885b79804..14731a643c 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -86,6 +86,21 @@
      "    [keyword yield] [variable-2 i];",
      "}");
 
+  MT("let_scoping",
+     "[keyword function] [def scoped]([def n]) {",
+     "  { [keyword var] [def i]; } [variable-2 i];",
+     "  { [keyword let] [def j]; [variable-2 j]; } [variable j];",
+     "  [keyword if] ([atom true]) { [keyword const] [def k]; [variable-2 k]; } [variable k];",
+     "}");
+
+  MT("switch_scoping",
+     "[keyword switch] ([variable x]) {",
+     "  [keyword default]:",
+     "    [keyword let] [def j];",
+     "    [keyword return] [variable-2 j]",
+     "}",
+     "[variable j];")
+
   MT("quotedStringAddition",
      "[keyword let] [def f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
 

From 2e99e1414ac693e35b0ab790ddbbf08a762d94c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 22 May 2018 11:56:14 +0200
Subject: [PATCH 3757/4742] [javascript mode] Simplify handling of block scopes

Issue #5296
---
 mode/javascript/javascript.js | 79 ++++++++++++++++++++---------------
 mode/javascript/test.js       | 14 +++++++
 2 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c4d3e8ccbe..758eaaec4e 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -265,22 +265,42 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     pass.apply(null, arguments);
     return true;
   }
+  function inList(name, list) {
+    for (var v = list; v; v = v.next) if (v.name == name) return true
+    return false;
+  }
   function register(varname) {
-    function inList(list, block) {
-      for (var v = list; v; v = v.next)
-        if (v.name == varname && (block === undefined || v.block === block)) return true;
-      return false;
-    }
     var state = cx.state;
     cx.marked = "def";
     if (state.context) {
-      var block = !(cx.state.lexical.info && cx.state.lexical.info.scope === "var");
-      if (inList(state.localVars, block)) return;
-      state.localVars = {name: varname, block: block, next: state.localVars};
+      if (state.lexical.info == "var" && state.context && state.context.block) {
+        // FIXME function decls are also not block scoped
+        var newContext = registerVarScoped(varname, state.context)
+        if (newContext != null) {
+          state.context = newContext
+          return
+        }
+      } else if (!inList(varname, state.localVars)) {
+        state.localVars = new Var(varname, state.localVars)
+        return
+      }
+    }
+    // Fall through means this is global
+    if (parserConfig.globalVars && !inList(varname, state.globalVars))
+      state.globalVars = new Var(varname, state.globalVars)
+  }
+  function registerVarScoped(varname, context) {
+    if (!context) {
+      return null
+    } else if (context.block) {
+      var inner = registerVarScoped(varname, context.prev)
+      if (!inner) return null
+      if (inner == context.prev) return context
+      return new Context(inner, context.vars, true)
+    } else if (inList(varname, context.vars)) {
+      return context
     } else {
-      if (inList(state.globalVars)) return;
-      if (parserConfig.globalVars)
-        state.globalVars = {name: varname, next: state.globalVars};
+      return new Context(context.prev, new Var(varname, context.vars), false)
     }
   }
 
@@ -290,32 +310,23 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   // Combinators
 
-  var defaultVars = {name: "this", next: {name: "arguments"}};
+  function Context(prev, vars, block) { this.prev = prev; this.vars = vars; this.block = block }
+  function Var(name, next) { this.name = name; this.next = next }
+
+  var defaultVars = new Var("this", new Var("arguments", null))
   function pushcontext() {
-    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
-    cx.state.localVars = defaultVars;
+    cx.state.context = new Context(cx.state.context, cx.state.localVars, false)
+    cx.state.localVars = defaultVars
   }
   function pushblockcontext() {
-    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars, block: true};
-    cx.state.localVars = defaultVars;
+    cx.state.context = new Context(cx.state.context, cx.state.localVars, true)
+    cx.state.localVars = null
   }
   function popcontext() {
-    if (cx.state.context.block) {
-      var newVars = {name: "this", next: {name: "arguments"}};
-      // drop block-scoped variables
-      for (var v = cx.state.localVars; v; v = v.next) {
-        if (!v.block) newVars = { name: v.name, scope: v.scope, next: newVars };
-      }
-      // inherit from previous scope
-      for (v = cx.state.context.vars; v; v = v.next) {
-        newVars = { name: v.name, scope: v.scope, next: newVars };
-      }
-      cx.state.localVars = newVars;
-    } else {
-      cx.state.localVars = cx.state.context.vars;
-    }
-    cx.state.context = cx.state.context.prev;
+    cx.state.localVars = cx.state.context.vars
+    cx.state.context = cx.state.context.prev
   }
+  popcontext.lex = true
   function pushlex(type, info) {
     var result = function() {
       var state = cx.state, indent = state.indented;
@@ -347,7 +358,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
 
   function statement(type, value) {
-    if (type == "var") return cont(pushlex("vardef", { scope: value, length: value.length }), vardef, expect(";"), poplex);
+    if (type == "var") return cont(pushlex("vardef", value), vardef, expect(";"), poplex);
     if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex);
     if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
     if (type == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex);
@@ -381,7 +392,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         return cont(pushlex("stat"), maybelabel);
       }
     }
-    if (type == "switch") return cont(pushblockcontext, pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"),
+    if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"), pushblockcontext,
                                       block, poplex, poplex, popcontext);
     if (type == "case") return cont(expression, expect(":"));
     if (type == "default") return cont(expect(":"));
@@ -803,7 +814,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         cc: [],
         lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,
-        context: parserConfig.localVars && {vars: parserConfig.localVars},
+        context: parserConfig.localVars && new Context(null, null, false),
         indented: basecolumn || 0
       };
       if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 14731a643c..9278855235 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -101,6 +101,20 @@
      "}",
      "[variable j];")
 
+  MT("leaving_scope",
+     "[keyword function] [def a]() {",
+     "  {",
+     "    [keyword const] [def x] [operator =] [number 1]",
+     "    [keyword if] ([atom true]) {",
+     "      [keyword let] [def y] [operator =] [number 2]",
+     "      [keyword var] [def z] [operator =] [number 3]",
+     "      [variable console].[property log]([variable-2 x], [variable-2 y], [variable-2 z])",
+     "    }",
+     "    [variable console].[property log]([variable-2 x], [variable y], [variable-2 z])",
+     "  }",
+     "  [variable console].[property log]([variable x], [variable y], [variable-2 z])",
+     "}")
+
   MT("quotedStringAddition",
      "[keyword let] [def f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
 

From 08a764161cbe65dec1eef2799ae8e267acc07662 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 22 May 2018 12:13:49 +0200
Subject: [PATCH 3758/4742] [javascript mode] Simplify number tokenizing and
 add support for n prefix

Issue #5411
---
 mode/javascript/javascript.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 758eaaec4e..097c0bbe6d 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -75,17 +75,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return ret(ch);
     } else if (ch == "=" && stream.eat(">")) {
       return ret("=>", "operator");
-    } else if (ch == "0" && stream.eat(/x/i)) {
-      stream.eatWhile(/[\da-f]/i);
-      return ret("number", "number");
-    } else if (ch == "0" && stream.eat(/o/i)) {
-      stream.eatWhile(/[0-7]/i);
-      return ret("number", "number");
-    } else if (ch == "0" && stream.eat(/b/i)) {
-      stream.eatWhile(/[01]/i);
+    } else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/i)) {
       return ret("number", "number");
     } else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
+      stream.match(/^\d*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/);
       return ret("number", "number");
     } else if (ch == "/") {
       if (stream.eat("*")) {

From 875913f52d0d50583d26b69e32be974a216a34eb Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Mon, 21 May 2018 10:47:43 -0700
Subject: [PATCH 3759/4742] [javascript mode] Add test for bigint literals

---
 mode/javascript/test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 9278855235..f8c95bf7ca 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -268,6 +268,8 @@
      "[keyword const] [def async] [operator =] {[property a]: [number 1]};",
      "[keyword const] [def foo] [operator =] [string-2 `bar ${][variable async].[property a][string-2 }`];")
 
+  MT("bigint", "[number 1n] [operator +] [number 0x1afn] [operator +] [number 0o064n] [operator +] [number 0b100n];")
+
   MT("async_comment",
      "[keyword async] [comment /**/] [keyword function] [def foo]([def args]) { [keyword return] [atom true]; }");
 

From 05e27d8dff324bfca50502c24b2c557905179b8f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 22 May 2018 12:34:11 +0200
Subject: [PATCH 3760/4742] Mark version 5.38.0

---
 AUTHORS           |  7 +++++++
 CHANGELOG.md      | 26 ++++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 15 +++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f57c98a145..2eec549bfb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -139,6 +139,7 @@ Chris Smith
 Christian Gruen
 Christian Oyarzun
 Christian Petrov
+christopherblaser
 Christopher Brown
 Christopher Kramer
 Christopher Mitchell
@@ -246,6 +247,7 @@ Giovanni Calò
 Glebov Boris
 Glenn Jorde
 Glenn Ruehle
+goldsmcb
 Golevka
 Google Inc.
 Gordon Smith
@@ -454,6 +456,7 @@ matthewhayes
 Matthew Rathbone
 Matthias Bussonnier
 Matthias BUSSONNIER
+Matt MacPherson
 Matt McDonald
 Matt Pass
 Matt Sacks
@@ -489,11 +492,13 @@ Mike Diaz
 Mike Ivanov
 Mike Kadin
 Mike Kobit
+Milan Szekely
 MinRK
 Miraculix87
 misfo
 mkaminsky11
 mloginov
+Moritz Schubotz (physikerwelt)
 Moritz Schwörer
 Moshe Wajnberg
 mps
@@ -537,6 +542,7 @@ overdodactyl
 pablo
 pabloferz
 Pablo Zubieta
+paddya
 Page
 paladox
 Panupong Pasupat
@@ -646,6 +652,7 @@ Sorab Bisht
 spastorelli
 srajanpaliwal
 Stanislav Oaserele
+stan-z
 Stas Kobzar
 Stefan Borsje
 Steffen Beyer
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8972e9aecf..5fb9bc3712 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+## 5.38.0 (2018-05-21)
+
+### Bug fixes
+
+Improve reliability of noticing a missing mouseup event during dragging.
+
+Make sure `getSelection` is always called on the correct document.
+
+Fix interpretation of line breaks and non-breaking spaces inserted by renderer in contentEditable mode.
+
+Work around some browsers inexplicably making the fake scrollbars focusable.
+
+Make sure `coordsChar` doesn't return positions inside collapsed ranges.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support block scopes, bindingless catch, bignum suffix, `s` regexp flag.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Adjust a wasteful regexp.
+
+[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Allow opening the control without any item selected.
+
+### New features
+
+New theme: [darcula](http://codemirror.net/demo/theme.html#darcula).
+
+[dialog addon](http://codemirror.net/doc/manual.html#addon_dialog): Add a CSS class (`dialog-opened`) to the editor when a dialog is open.
+
 ## 5.37.0 (2018-04-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 5919ef6483..c53b5bcf6f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.37.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.38.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 7919aa3e55..e7570d073c 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,21 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-05-2018: <a href="http://codemirror.net/codemirror-5.38.0.zip">Version 5.38.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Improve reliability of noticing a missing mouseup event during dragging.</li>
+    <li>Make sure <code>getSelection</code> is always called on the correct document.</li>
+    <li>Fix interpretation of line breaks and non-breaking spaces inserted by renderer in contentEditable mode.</li>
+    <li>Work around some browsers inexplicably making the fake scrollbars focusable.</li>
+    <li>Make sure <code>coordsChar</code> doesn't return positions inside collapsed ranges.</li>
+    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support block scopes, bindingless catch, bignum suffix, <code>s</code> regexp flag.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Adjust a wasteful regexp.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Allow opening the control without any item selected.</li>
+    <li>New theme: <a href="http://codemirror.net/demo/theme.html#darcula">darcula</a>.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_dialog">dialog addon</a>: Add a CSS class (<code>dialog-opened</code>) to the editor when a dialog is open.</li>
+  </ul>
+
   <p class="rel">20-04-2018: <a href="http://codemirror.net/codemirror-5.37.0.zip">Version 5.37.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 02ff74f82d..5bb0048eca 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.37.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.38.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 871277263f..718e17b847 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.37.1",
+  "version": "5.38.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 00f2b78f56..04541126c1 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.37.1"
+CodeMirror.version = "5.38.0"

From 9c6a5cb229890f92714b9a7f0a5b3d43356d562c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 22 May 2018 12:37:16 +0200
Subject: [PATCH 3761/4742] Bump version number post-5.38.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index c53b5bcf6f..b5a27ea101 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.38.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.38.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 718e17b847..49d2b10320 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.38.0",
+  "version": "5.38.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 04541126c1..5bee6f2f65 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.38.0"
+CodeMirror.version = "5.38.1"

From dc573b5a913951a1eb1db9a04400a3b2765b14a2 Mon Sep 17 00:00:00 2001
From: Bjorn Hansen <blmhansen@gmail.com>
Date: Wed, 23 May 2018 16:02:16 -0700
Subject: [PATCH 3762/4742] [darcula theme] Change cursor color to be visible

---
 theme/darcula.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/theme/darcula.css b/theme/darcula.css
index c789459116..6b1b756460 100644
--- a/theme/darcula.css
+++ b/theme/darcula.css
@@ -25,10 +25,11 @@
 .cm-s-darcula.CodeMirror { background: #2B2B2B; color: #A9B7C6; }
 
 
+.cm-s-darcula .CodeMirror-cursor { border-left: 1px solid #dddddd; }
 .cm-s-darcula .CodeMirror-activeline-background { background: #3A3A3A; }
 .cm-s-darcula div.CodeMirror-selected { background: #085a9c; }
 .cm-s-darcula .CodeMirror-gutters { background: rgb(72, 72, 72); border-right: 1px solid grey; color: #606366 }
 
 .cm-s-darcula span.cm-builtin { color: #A9B7C6; }
 .cm-s-darcula  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
-.cm-s-darcula .CodeMirror-matchingbracket { outline:1px solid #A9B7C6; color: yellow !important; }
\ No newline at end of file
+.cm-s-darcula .CodeMirror-matchingbracket { outline:1px solid #A9B7C6; color: yellow !important; }

From 09ce884449957c65451fbc14b2d4122731520da9 Mon Sep 17 00:00:00 2001
From: Pablo Zubieta <pabloferz@yahoo.com.mx>
Date: Mon, 28 May 2018 13:36:49 -0500
Subject: [PATCH 3763/4742] [julia mode] Fix indentation after comprehensions

---
 mode/julia/julia.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 9a36fd05a0..2d89c497d4 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -54,11 +54,13 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     return inGenerator(state, '[')
   }
 
-  function inGenerator(state, bracket) {
-    var curr = currentScope(state),
-        prev = currentScope(state, 1);
+  function inGenerator(state, bracket, depth) {
     if (typeof(bracket) === "undefined") { bracket = '('; }
-    if (curr === bracket || (prev === bracket && curr === "for")) {
+    if (typeof(depth)   === "undefined") { depth   = 0;   }
+    var scope = currentScope(state, depth);
+    if ((depth == 0 && scope === "if" && inGenerator(state, bracket, depth + 1)) ||
+        (scope === "for" && inGenerator(state, bracket, depth + 1)) ||
+        (scope === bracket)) {
       return true;
     }
     return false;
@@ -119,16 +121,16 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       state.scopes.push('(');
     }
 
-    var scope = currentScope(state);
-
     if (inArray(state) && ch === ']') {
-      if (scope === "for") { state.scopes.pop(); }
+      if (currentScope(state) === "if") { state.scopes.pop(); }
+      while (currentScope(state) === "for") { state.scopes.pop(); }
       state.scopes.pop();
       state.leavingExpr = true;
     }
 
     if (inGenerator(state) && ch === ')') {
-      if (scope === "for") { state.scopes.pop(); }
+      if (currentScope(state) === "if") { state.scopes.pop(); }
+      while (currentScope(state) === "for") { state.scopes.pop(); }
       state.scopes.pop();
       state.leavingExpr = true;
     }
@@ -143,12 +145,14 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     var match;
-    if (match = stream.match(openers, false)) {
+    if (match = stream.match(openers)) {
       state.scopes.push(match[0]);
+      return "keyword";
     }
 
-    if (stream.match(closers, false)) {
+    if (stream.match(closers)) {
       state.scopes.pop();
+      return "keyword";
     }
 
     // Handle type annotations

From a49a77601103ed5739191ec73a9aa59011fc2215 Mon Sep 17 00:00:00 2001
From: AlbertHilb <alberthilbert@gmail.com>
Date: Tue, 29 May 2018 09:25:12 +0200
Subject: [PATCH 3764/4742] [stex mode] Add `inMathMode` config option

When `true` `sTeX` parser starts in math mode.
---
 mode/stex/index.html | 6 ++++++
 mode/stex/stex.js    | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mode/stex/index.html b/mode/stex/index.html
index 14679da4f3..25225e41c4 100644
--- a/mode/stex/index.html
+++ b/mode/stex/index.html
@@ -103,6 +103,12 @@ <h2>sTeX mode</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
     </script>
 
+    <p>sTeX mode supports this option:</p>
+    <d1>
+      <dt><code>inMathMode: boolean</code></dt>
+      <dd>Whether to start parsing in math mode (default: <code>false</code>).</dd>
+    </d1>
+
     <p><strong>MIME types defined:</strong> <code>text/x-stex</code>.</p>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#stex_*">normal</a>,  <a href="../../test/index.html#verbose,stex_*">verbose</a>.</p>
diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 12e5750b19..44908675fd 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -16,7 +16,7 @@
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineMode("stex", function() {
+  CodeMirror.defineMode("stex", function(_config, parserConfig) {
     "use strict";
 
     function pushCommand(state, command) {
@@ -173,7 +173,7 @@
       if (source.eatSpace()) {
         return null;
       }
-      if (source.match(endModeSeq)) {
+      if (endModeSeq && source.match(endModeSeq)) {
         setState(state, normal);
         return "keyword";
       }
@@ -235,9 +235,10 @@
 
     return {
       startState: function() {
+        var f = parserConfig.inMathMode ? function(source, state){ return inMathMode(source, state); } : normal;
         return {
           cmdState: [],
-          f: normal
+          f: f
         };
       },
       copyState: function(s) {

From e7106986e045710766de9b89bf2d6b2a5febddb1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 30 May 2018 08:37:13 +0200
Subject: [PATCH 3765/4742] [javascript mode] Drop expected tokens when running
 into ), }, or ]

Issue #5431
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 097c0bbe6d..ba27c5d0bc 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -344,7 +344,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function expect(wanted) {
     function exp(type) {
       if (type == wanted) return cont();
-      else if (wanted == ";") return pass();
+      else if (wanted == ";" || type == "}" || type == ")" || type == "]") return pass();
       else return cont(exp);
     };
     return exp;

From 4aa7f69af45c37bb03807c4c1f50691b1bfd7d88 Mon Sep 17 00:00:00 2001
From: Reynold Xin <rxin@databricks.com>
Date: Fri, 1 Jun 2018 00:49:23 -0700
Subject: [PATCH 3766/4742] [sql mode] Add optimize keyword for Spark SQL

---
 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 fddbabae80..36206b98a0 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -446,7 +446,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   // Spark SQL
   CodeMirror.defineMIME("text/x-sparksql", {
     name: "sql",
-    keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases datata dbproperties defined delete delimited desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
+    keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases datata dbproperties defined delete delimited desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on optimize option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
     builtin: set("tinyint smallint int bigint boolean float double string binary timestamp decimal array map struct uniontype delimited serde sequencefile textfile rcfile inputformat outputformat"),
     atoms: set("false true null"),
     operatorChars: /^[*+\-%<>!=~&|^]/,

From 9e8a41717df564ae4e6af11f9180f301548b832e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 3 Jun 2018 14:53:34 +0200
Subject: [PATCH 3767/4742] [pascal mode] Add more keywords

Closes #5440
---
 mode/pascal/pascal.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index 2d0c3d4240..3240532f58 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -17,9 +17,21 @@ CodeMirror.defineMode("pascal", function() {
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
-  var keywords = words("and array begin case const div do downto else end file for forward integer " +
-                       "boolean char function goto if in label mod nil not of or packed procedure " +
-                       "program record repeat set string then to type until var while with");
+  var keywords = words(
+    "absolute and array asm begin case const constructor destructor div do " +
+    "downto else end file for function goto if implementation in inherited " +
+    "inline interface label mod nil not object of operator or packed procedure " +
+    "program record reintroduce repeat self set shl shr string then to type " +
+    "unit until uses var while with xor as class dispinterface except exports " +
+    "finalization finally initialization inline is library on out packed " +
+    "property raise resourcestring threadvar try absolute abstract alias " +
+    "assembler bitpacked break cdecl continue cppdecl cvar default deprecated " +
+    "dynamic enumerator experimental export external far far16 forward generic " +
+    "helper implements index interrupt iocheck local message name near " +
+    "nodefault noreturn nostackframe oldfpccall otherwise overload override " +
+    "pascal platform private protected public published read register " +
+    "reintroduce result safecall saveregisters softfloat specialize static " +
+    "stdcall stored strict unaligned unimplemented varargs virtual write");
   var atoms = {"null": true};
 
   var isOperatorChar = /[+\-*&%=<>!?|\/]/;

From bf36d46f618163f7ee269bc8c7722513f5a9640c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 7 Jun 2018 10:07:42 +0200
Subject: [PATCH 3768/4742] Remove fast path in resize handler

It can't reliably determine whether the scrollbar still needs to
be clipped

Closes #5445
---
 src/edit/global_events.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/edit/global_events.js b/src/edit/global_events.js
index 269e870ef1..d34fabef13 100644
--- a/src/edit/global_events.js
+++ b/src/edit/global_events.js
@@ -35,8 +35,6 @@ function registerGlobalHandlers() {
 // Called when the window resizes
 function onResize(cm) {
   let d = cm.display
-  if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
-    return
   // Might be a text scaling operation, clear size caches.
   d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null
   d.scrollbarsClipped = false

From 6287b22fec160f42edf5b48f9a8febe56c8a352d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 7 Jun 2018 11:23:06 +0200
Subject: [PATCH 3769/4742] Add JdBEdit to real-world uses

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 32e87cd0cf..df698cc1ea 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -102,6 +102,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://joelpinheiro.github.io/itrading/">iTrading</a> (Algorithmic Trading)</li>
       <li><a href="http://i-mos.org/imos/">i-MOS</a> (modeling and simulation platform)</li>
       <li><a href="http://www.janvas.com/">Janvas</a> (vector graphics editor)</li>
+      <li><a href="https://code.wetrafa.xyz/">JdBEdit</a> (web IDE)</li>
       <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>
       <li><a href="http://jqfundamentals.com/">jQuery fundamentals</a> (interactive tutorial)</li>
       <li><a href="http://jsbin.com">jsbin.com</a> (JS playground)</li>

From f4cb4d126d003eb382a1adb05d5f84afe3e404bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Vr=C3=A1na?= <jakub@vrana.cz>
Date: Fri, 8 Jun 2018 09:58:42 +0200
Subject: [PATCH 3770/4742] [soy mode] Ignore comments in {literal}

---
 mode/soy/soy.js  | 12 +++++++-----
 mode/soy/test.js |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index de54401500..60bcadf95a 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -149,11 +149,13 @@
             return "string";
         }
 
-        if (stream.match(/^\/\*/)) {
-          state.soyState.push("comment");
-          return "comment";
-        } else if (stream.match(stream.sol() || (state.soyState.length && last(state.soyState) != "literal") ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
-          return "comment";
+        if (!state.soyState.length || last(state.soyState) != "literal") {
+          if (stream.match(/^\/\*/)) {
+            state.soyState.push("comment");
+            return "comment";
+          } else if (stream.match(stream.sol() ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
+            return "comment";
+          }
         }
 
         switch (last(state.soyState)) {
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 7cd111f2f3..2f46cc0ac9 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -111,4 +111,7 @@
   MT('single-quote-strings',
      '[keyword {][string "foo"] [string \'bar\'][keyword }]',
      '');
+
+  MT('literal-comments',
+     '[keyword {literal}]/* comment */ // comment[keyword {/literal}]');
 })();

From 224c83d89d4023a273363a7faef9a2a71337c27a Mon Sep 17 00:00:00 2001
From: Prendota <prendota@mail.ru>
Date: Mon, 11 Jun 2018 09:31:15 +0300
Subject: [PATCH 3771/4742] [idea theme] support hints

---
 theme/idea.css | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/theme/idea.css b/theme/idea.css
index 28c5c40dea..5cdb883e8a 100644
--- a/theme/idea.css
+++ b/theme/idea.css
@@ -29,3 +29,14 @@
 
 
 .cm-s-idea .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
+
+.CodeMirror-hints {
+  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+  color: #616569;
+  background-color: #ebf3fd !important;
+}
+
+.CodeMirror-hint-active {
+  background-color: #a2b8c9 !important;
+  color: #5c6065 !important;
+}
\ No newline at end of file

From e96f3844bec44ee8834ef6881a3c537964e969eb Mon Sep 17 00:00:00 2001
From: Prendota <prendota@mail.ru>
Date: Mon, 11 Jun 2018 09:31:28 +0300
Subject: [PATCH 3772/4742] [darcula theme] support hints

---
 theme/darcula.css | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/theme/darcula.css b/theme/darcula.css
index 6b1b756460..7240d39b69 100644
--- a/theme/darcula.css
+++ b/theme/darcula.css
@@ -33,3 +33,14 @@
 .cm-s-darcula span.cm-builtin { color: #A9B7C6; }
 .cm-s-darcula  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
 .cm-s-darcula .CodeMirror-matchingbracket { outline:1px solid #A9B7C6; color: yellow !important; }
+
+.CodeMirror-hints {
+  font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
+  color: #9c9e9e;
+  background-color: #3b3e3f !important;
+}
+
+.CodeMirror-hint-active {
+  background-color: #494d4e !important;
+  color: #9c9e9e !important;
+}

From 11dfc2f267713c3c3ce3d6cc630d040167de0f10 Mon Sep 17 00:00:00 2001
From: laobubu <laobubu@live.cn>
Date: Fri, 8 Jun 2018 15:46:32 +0800
Subject: [PATCH 3773/4742] [markdown mode] support line-breaks in tags, and
 CDATA/comment blocks

---
 mode/markdown/markdown.js | 11 ++++++++---
 mode/markdown/test.js     | 19 +++++++++++++++++++
 mode/xml/xml.js           |  5 ++++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 88ecc57c86..53f345a2f7 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -126,8 +126,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     // Reset state.indentedCode
     state.indentedCode = false;
     if (state.f == htmlBlock) {
-      state.f = inlineNormal;
-      state.block = blockNormal;
+      var htmlState = state.htmlState;
+      while ('htmlState' in htmlState) htmlState = htmlState.htmlState; // htmlmixed -> xml
+      if (!htmlState || !htmlState.tokenize || !htmlState.tokenize.isInBlock) {
+        state.f = inlineNormal;
+        state.block = blockNormal;
+        state.htmlState = null;
+      }
     }
     // Reset state.trailingSpace
     state.trailingSpace = 0;
@@ -534,7 +539,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return type + tokenTypes.linkEmail;
     }
 
-    if (modeCfg.xml && ch === '<' && stream.match(/^(!--|[a-z][a-z0-9-]*(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*>)/i, false)) {
+    if (modeCfg.xml && ch === '<' && stream.match(/^(!--|\?|!\[CDATA\[|[a-z][a-z0-9-]*(?:\s+[a-z_:.\-]+(?:\s*=\s*[^>]+)?)*\s*(?:>|$))/i, false)) {
       var end = stream.string.indexOf(">", stream.pos);
       if (end != -1) {
         var atts = stream.string.substring(stream.start, end);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index a89fbca608..a6da158d0a 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -1283,6 +1283,25 @@
      "[tag&bracket <][tag div][tag&bracket >]",
      "[tag&bracket </][tag div][tag&bracket >]");
 
+  MT("xmlModeLineBreakInTags",
+     "[tag&bracket <][tag div] [attribute id]=[string \"1\"]",
+     "     [attribute class]=[string \"sth\"][tag&bracket >]xxx",
+     "[tag&bracket </][tag div][tag&bracket >]");
+
+  MT("xmlModeCommentWithBlankLine",
+     "[comment <!-- Hello]",
+     "",
+     "[comment World -->]");
+
+  MT("xmlModeCDATA",
+     "[atom <![CDATA[ Hello]",
+     "",
+     "[atom FooBar]",
+     "[atom Test ]]]]>]");
+
+  MT("xmlModePreprocessor",
+     "[meta <?php] [meta echo '1234'; ?>]");
+
   MT_noXml("xmlHighlightDisabled",
      "<div>foo</div>");
 
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 0f1c9b175e..dcb9e139b8 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -154,7 +154,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
   }
 
   function inBlock(style, terminator) {
-    return function(stream, state) {
+    var closure = function(stream, state) {
       while (!stream.eol()) {
         if (stream.match(terminator)) {
           state.tokenize = inText;
@@ -164,7 +164,10 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
       }
       return style;
     };
+    closure.isInBlock = true;
+    return closure;
   }
+
   function doctype(depth) {
     return function(stream, state) {
       var ch;

From 9ea789b9a8688c2910a269e6031279d5756084ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Jun 2018 08:52:14 +0200
Subject: [PATCH 3774/4742] [markdown mode] Improve exiting html sub-mode on
 blank line

Use same logic as that in htmlBlock

Issue #5451
---
 mode/markdown/markdown.js | 10 +++++++---
 mode/xml/xml.js           |  6 ++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 53f345a2f7..cc390f7623 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -126,9 +126,13 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     // Reset state.indentedCode
     state.indentedCode = false;
     if (state.f == htmlBlock) {
-      var htmlState = state.htmlState;
-      while ('htmlState' in htmlState) htmlState = htmlState.htmlState; // htmlmixed -> xml
-      if (!htmlState || !htmlState.tokenize || !htmlState.tokenize.isInBlock) {
+      var exit = htmlModeMissing
+      if (!exit) {
+        var inner = CodeMirror.innerMode(htmlMode, state.htmlState)
+        exit = inner.mode.name == "xml" && inner.state.tagStart === null &&
+          (!inner.state.context && inner.state.tokenize.isInText)
+      }
+      if (exit) {
         state.f = inlineNormal;
         state.block = blockNormal;
         state.htmlState = null;
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index dcb9e139b8..5927bc917b 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -154,7 +154,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
   }
 
   function inBlock(style, terminator) {
-    var closure = function(stream, state) {
+    return function(stream, state) {
       while (!stream.eol()) {
         if (stream.match(terminator)) {
           state.tokenize = inText;
@@ -163,9 +163,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
         stream.next();
       }
       return style;
-    };
-    closure.isInBlock = true;
-    return closure;
+    }
   }
 
   function doctype(depth) {

From fbc002f2ba234b91417e086ff1cae0407320c158 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 15 Jun 2018 12:35:56 +0200
Subject: [PATCH 3775/4742] [handlebars mode] Add comment start/end metadata

---
 mode/handlebars/handlebars.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/handlebars/handlebars.js b/mode/handlebars/handlebars.js
index 2174e53849..39445ebbfe 100644
--- a/mode/handlebars/handlebars.js
+++ b/mode/handlebars/handlebars.js
@@ -46,7 +46,11 @@
     comment: [
       { regex: /\}\}/, pop: true, token: "comment" },
       { regex: /./, token: "comment" }
-    ]
+    ],
+    meta: {
+      blockCommentStart: "{{--",
+      blockCommentEnd: "--}}"
+    }
   });
 
   CodeMirror.defineMode("handlebars", function(config, parserConfig) {

From d32c5d35a6d0730c21717faaf5d37cfe1f7073ce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Jun 2018 08:37:29 +0200
Subject: [PATCH 3776/4742] Mark version 5.39.0

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2eec549bfb..52f2b9fa5c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,6 +19,7 @@ Ahmad M. Zawawi
 ahoward
 Akeksandr Motsjonov
 Alasdair Smith
+AlbertHilb
 Alberto González Palomo
 Alberto Pose
 Albert Xing
@@ -101,6 +102,7 @@ Bharad
 BigBlueHat
 Billy Moon
 binny
+Bjorn Hansen
 B Krishna Chaitanya
 Blaine G
 blukat29
@@ -394,6 +396,7 @@ Kyle Kelley
 KyleMcNutt
 Lanfei
 Lanny
+laobubu
 Laszlo Vidacs
 leaf corcoran
 Lemmon
@@ -592,6 +595,7 @@ ray ratchup
 Ray Ratchup
 Remi Nyborg
 Renaud Durlin
+Reynold Xin
 Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fb9bc3712..75b0de9645 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.39.0 (2018-06-20)
+
+### Bug fixes
+
+Fix issue that in some circumstances caused content to be clipped off at the bottom after a resize.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Improve handling of blank lines in HTML tags.
+
+### New features
+
+[stex mode](http://codemirror.net/mode/stex/): Add an `inMathMode` option to start the mode in math mode.
+
 ## 5.38.0 (2018-05-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index b5a27ea101..e765e64664 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.38.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.39.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 e7570d073c..41c056cce5 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,14 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-06-2018: <a href="http://codemirror.net/codemirror-5.39.0.zip">Version 5.39.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix issue that in some circumstances caused content to be clipped off at the bottom after a resize.</li>
+    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Improve handling of blank lines in HTML tags.</li>
+    <li><a href="http://codemirror.net/mode/stex/">stex mode</a>: Add an <code>inMathMode</code> option to start the mode in math mode.</li>
+  </ul>
+
   <p class="rel">21-05-2018: <a href="http://codemirror.net/codemirror-5.38.0.zip">Version 5.38.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 5bb0048eca..fcab188699 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.38.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.39.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 49d2b10320..d8ff6d0202 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.38.1",
+  "version": "5.39.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 5bee6f2f65..e0bd6bd7d3 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.38.1"
+CodeMirror.version = "5.39.0"

From 16b495e57db3af67294a18d3d1a07acd883d5243 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Jun 2018 08:39:47 +0200
Subject: [PATCH 3777/4742] Bump version number post-5.39.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index e765e64664..408a02dbf6 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.39.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.39.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index d8ff6d0202..bd35328bee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.39.0",
+  "version": "5.39.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index e0bd6bd7d3..f17e947354 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.39.0"
+CodeMirror.version = "5.39.1"

From d1063d2cb46ae9130faac4daae35bba5a8f9ac3a Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Tue, 19 Jun 2018 17:45:09 +0100
Subject: [PATCH 3778/4742] [show-hint addon] Fix bug where hint at start of
 line didn't close on backspace

If cursor started at the beginning of a line and show hint was
triggered, adding then deleting a character would not close the hint
correctly.
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index dae450db90..e85e18fa93 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -98,7 +98,7 @@
       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)))) {
+          (!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
         this.close();
       } else {
         var self = this;

From ed8dfeb5e2ed25b5dd1f1eccc7b757ca6dbd118d Mon Sep 17 00:00:00 2001
From: Lorenzo Simionato <lorenzo.simionato@gmail.com>
Date: Wed, 20 Jun 2018 12:53:36 -0400
Subject: [PATCH 3779/4742] Put fallthrough in quotes for consistency with
 other keys

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

diff --git a/src/input/keymap.js b/src/input/keymap.js
index 63f18b58a9..046b3505aa 100644
--- a/src/input/keymap.js
+++ b/src/input/keymap.js
@@ -24,7 +24,7 @@ keyMap.pcDefault = {
   "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
   "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
   "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
-  fallthrough: "basic"
+  "fallthrough": "basic"
 }
 // Very basic readline/emacs-style bindings, which are standard on Mac.
 keyMap.emacsy = {
@@ -42,7 +42,7 @@ keyMap.macDefault = {
   "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
   "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
   "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
-  fallthrough: ["basic", "emacsy"]
+  "fallthrough": ["basic", "emacsy"]
 }
 keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault
 

From 70408cede1ac6b5ebf4227aaa1dbffb0dccb47dd Mon Sep 17 00:00:00 2001
From: Prendota <prendota@mail.ru>
Date: Tue, 26 Jun 2018 09:52:55 +0300
Subject: [PATCH 3780/4742] [show-hints] support themes

---
 addon/hint/show-hint.js | 3 ++-
 theme/darcula.css       | 4 ++--
 theme/idea.css          | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index e85e18fa93..26dc0f00c4 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -200,7 +200,8 @@
     var widget = this, cm = completion.cm;
 
     var hints = this.hints = document.createElement("ul");
-    hints.className = "CodeMirror-hints";
+    var theme = completion.cm.options.theme;
+    hints.className = "CodeMirror-hints " + theme;
     this.selectedHint = data.selectedHint || 0;
 
     var completions = data.list;
diff --git a/theme/darcula.css b/theme/darcula.css
index 7240d39b69..d66d2a5f21 100644
--- a/theme/darcula.css
+++ b/theme/darcula.css
@@ -34,13 +34,13 @@
 .cm-s-darcula  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
 .cm-s-darcula .CodeMirror-matchingbracket { outline:1px solid #A9B7C6; color: yellow !important; }
 
-.CodeMirror-hints {
+.CodeMirror-hints.darcula {
   font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
   color: #9c9e9e;
   background-color: #3b3e3f !important;
 }
 
-.CodeMirror-hint-active {
+.CodeMirror-hints.darcula .CodeMirror-hint-active {
   background-color: #494d4e !important;
   color: #9c9e9e !important;
 }
diff --git a/theme/idea.css b/theme/idea.css
index 5cdb883e8a..eab36717ad 100644
--- a/theme/idea.css
+++ b/theme/idea.css
@@ -30,13 +30,13 @@
 
 .cm-s-idea .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
 
-.CodeMirror-hints {
+.CodeMirror-hints.idea {
   font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
   color: #616569;
   background-color: #ebf3fd !important;
 }
 
-.CodeMirror-hint-active {
+.CodeMirror-hints.idea .CodeMirror-hint-active {
   background-color: #a2b8c9 !important;
   color: #5c6065 !important;
 }
\ No newline at end of file

From f9e56e8592dfcc95f50e26e1acf21b4baa0d8bf2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 28 Jun 2018 07:58:31 +0200
Subject: [PATCH 3781/4742] [markdown mode] Better support for nested brackets
 in link text

Closes #5476
---
 mode/markdown/markdown.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index cc390f7623..d523ec8bb3 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -506,6 +506,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (ch === '[' && !state.image) {
+      if (state.linkText && stream.match(/^.*?\]/)) return getType(state)
       state.linkText = true;
       if (modeCfg.highlightFormatting) state.formatting = "link";
       return getType(state);

From 44b554ff3d4812d63a51dd36aef93a5d7ecaaf10 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@redhat.com>
Date: Fri, 29 Jun 2018 17:08:24 +0300
Subject: [PATCH 3782/4742] Document `direction` option

Exists since commit 3c18925bc667a5f0c9580de846ec4deaced6abd5, #4624
---
 doc/manual.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 408a02dbf6..cbc642cb35 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -292,6 +292,17 @@ <h2>Configuration</h2>
       character. By default, a red dot (<span style="color: red">•</span>)
       is shown, with a title tooltip to indicate the character code.</dd>
 
+      <dt id="option_direction"><code><strong>direction</strong>: "ltr" | "rtl"</code></dt>
+      <dd>Flips overall layout and selects base paragraph direction to
+      be left-to-right or right-to-left.  Default is "ltr".
+      CodeMirror applies the Unicode Bidirectional Algorithm to each
+      line, but does not autodetect base direction — it's set to the
+      editor direction for all lines.  The resulting order is
+      sometimes wrong when base direction doesn't match user intent
+      (for example, leading and trailing punctuation jumps to the
+      wrong side of the line).  Therefore, it's helpful for
+      multilingual input to let users toggle this option.
+
       <dt id="option_rtlMoveVisually"><code><strong>rtlMoveVisually</strong>: boolean</code></dt>
       <dd>Determines whether horizontal cursor movement through
       right-to-left (Arabic, Hebrew) text is visual (pressing the left

From ccdb2165299a3d5776665fbc8393c4cad6d50fcf Mon Sep 17 00:00:00 2001
From: Prendota <prendota@mail.ru>
Date: Mon, 2 Jul 2018 10:33:06 +0300
Subject: [PATCH 3783/4742] [themes] update `darcula` matchingbracket

---
 theme/darcula.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/darcula.css b/theme/darcula.css
index d66d2a5f21..66729e9d08 100644
--- a/theme/darcula.css
+++ b/theme/darcula.css
@@ -32,7 +32,7 @@
 
 .cm-s-darcula span.cm-builtin { color: #A9B7C6; }
 .cm-s-darcula  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
-.cm-s-darcula .CodeMirror-matchingbracket { outline:1px solid #A9B7C6; color: yellow !important; }
+.cm-s-darcula .CodeMirror-matchingbracket { background-color: #3b514d; color: yellow !important; }
 
 .CodeMirror-hints.darcula {
   font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;

From f301c1c453958751627816306152928e3d0a9cb0 Mon Sep 17 00:00:00 2001
From: databricks-david-lewis
 <39497924+databricks-david-lewis@users.noreply.github.com>
Date: Mon, 2 Jul 2018 13:28:19 -0700
Subject: [PATCH 3784/4742] [sql mode] Add deny as keyword for spark sql

---
 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 36206b98a0..ab99c5a046 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -446,7 +446,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   // Spark SQL
   CodeMirror.defineMIME("text/x-sparksql", {
     name: "sql",
-    keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases datata dbproperties defined delete delimited desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on optimize option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
+    keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases datata dbproperties defined delete delimited deny desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on optimize option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
     builtin: set("tinyint smallint int bigint boolean float double string binary timestamp decimal array map struct uniontype delimited serde sequencefile textfile rcfile inputformat outputformat"),
     atoms: set("false true null"),
     operatorChars: /^[*+\-%<>!=~&|^]/,

From 91f371167903ef9ea2cd88bca055c46c30413ee8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 4 Jul 2018 10:31:27 +0200
Subject: [PATCH 3785/4742] Make sure mode option is applied even when a
 pre-initialized doc is given

Closes #5483
---
 src/edit/CodeMirror.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 4759209cf2..6d3084ff2e 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -37,6 +37,7 @@ export function CodeMirror(place, options) {
 
   let doc = options.value
   if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction)
+  else if (options.mode) doc.modeOption = options.mode
   this.doc = doc
 
   let input = new CodeMirror.inputStyles[options.inputStyle](this)

From e338ab23b69dd8aebe0a976220387e0ac187d107 Mon Sep 17 00:00:00 2001
From: Prendota <prendota@mail.ru>
Date: Thu, 5 Jul 2018 14:56:45 +0300
Subject: [PATCH 3786/4742] [clike] update kotlin indents

---
 mode/clike/clike.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index d5c8bf5d4c..689a78ab73 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -216,15 +216,15 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     indent: function(state, textAfter) {
       if (state.tokenize != tokenBase && state.tokenize != null || state.typeAtEndOfLine) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
+      var closing = firstChar == ctx.type;
       if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
       if (parserConfig.dontIndentStatements)
         while (ctx.type == "statement" && parserConfig.dontIndentStatements.test(ctx.info))
           ctx = ctx.prev
       if (hooks.indent) {
-        var hook = hooks.indent(state, ctx, textAfter);
+        var hook = hooks.indent(state, ctx, textAfter, indentUnit, closing);
         if (typeof hook == "number") return hook
       }
-      var closing = firstChar == ctx.type;
       var switchBlock = ctx.prev && ctx.prev.info == "switch";
       if (parserConfig.allmanIndentation && /[{(]/.test(firstChar)) {
         while (ctx.type != "top" && ctx.type != "}") ctx = ctx.prev
@@ -631,6 +631,17 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       '"': function(stream, state) {
         state.tokenize = tokenKotlinString(stream.match('""'));
         return state.tokenize(stream, state);
+      },
+      indent: function(state, ctx, textAfter, indentUnit, closing) {
+        var firstChar = textAfter && textAfter.charAt(0);
+        if ((state.prevToken == "}" || state.prevToken == ")") && textAfter == "")
+          return state.indented;
+        if (state.prevToken == "operator" && textAfter != "}" ||
+          state.prevToken == "variable" && firstChar == "." ||
+          (state.prevToken == "}" || state.prevToken == ")") && firstChar == ".")
+          return indentUnit * 2 + ctx.indented;
+        if (ctx.align && ctx.type == "}")
+          return ctx.indented + (closing ? 0 : indentUnit);
       }
     },
     modeProps: {closeBrackets: {triples: '"'}}

From c11f34f756b0677c7adcfdc5cc7323d9e9680ced Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 5 Jul 2018 15:23:12 +0200
Subject: [PATCH 3787/4742] [clike mode] Simplify hooks.indent interface

Issue #5487
---
 mode/clike/clike.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 689a78ab73..dec87a474a 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -222,7 +222,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         while (ctx.type == "statement" && parserConfig.dontIndentStatements.test(ctx.info))
           ctx = ctx.prev
       if (hooks.indent) {
-        var hook = hooks.indent(state, ctx, textAfter, indentUnit, closing);
+        var hook = hooks.indent(state, ctx, textAfter, indentUnit);
         if (typeof hook == "number") return hook
       }
       var switchBlock = ctx.prev && ctx.prev.info == "switch";
@@ -632,7 +632,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         state.tokenize = tokenKotlinString(stream.match('""'));
         return state.tokenize(stream, state);
       },
-      indent: function(state, ctx, textAfter, indentUnit, closing) {
+      indent: function(state, ctx, textAfter, indentUnit) {
         var firstChar = textAfter && textAfter.charAt(0);
         if ((state.prevToken == "}" || state.prevToken == ")") && textAfter == "")
           return state.indented;
@@ -641,7 +641,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
           (state.prevToken == "}" || state.prevToken == ")") && firstChar == ".")
           return indentUnit * 2 + ctx.indented;
         if (ctx.align && ctx.type == "}")
-          return ctx.indented + (closing ? 0 : indentUnit);
+          return ctx.indented + (state.context.type == (textAfter || "").charAt(0) ? 0 : indentUnit);
       }
     },
     modeProps: {closeBrackets: {triples: '"'}}

From 672523fcd3018df9d03c76c8642fbe8c973b9e5a Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 10 Jul 2018 13:47:35 +0200
Subject: [PATCH 3788/4742] [soy mode] Highlight command wrapped right after
 command

---
 mode/soy/soy.js  | 2 +-
 mode/soy/test.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 60bcadf95a..6b9d5125e3 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -272,7 +272,7 @@
           return "keyword";
 
         // A tag-keyword must be followed by whitespace, comment or a closing tag.
-        } else if (match = stream.match(/^\{([\/@\\]?\w+\??)(?=[\s\}]|\/[/*])/)) {
+        } else if (match = stream.match(/^\{([/@\\]?\w+\??)(?=$|[\s}]|\/[/*])/)) {
           if (match[1] != "/switch")
             state.indent += (/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
           state.tag = match[1];
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 2f46cc0ac9..d503d7f83c 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -114,4 +114,8 @@
 
   MT('literal-comments',
      '[keyword {literal}]/* comment */ // comment[keyword {/literal}]');
+
+  MT('highlight-command-at-eol',
+     '[keyword {msg]',
+     '    [keyword }]');
 })();

From 5793df5bc0421fee09509849703ac888cb6356c4 Mon Sep 17 00:00:00 2001
From: laobubu <laobubu@live.cn>
Date: Fri, 13 Jul 2018 16:33:59 +0800
Subject: [PATCH 3789/4742] Adding test lineWidgetIssue5486 for #5486

---
 test/test.js | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/test/test.js b/test/test.js
index a646a0ce19..b1044f1f36 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1658,6 +1658,56 @@ testCM("lineWidgetChanged", function(cm) {
   eq(info0.top + expectedWidgetHeight, info2.top);
 });
 
+testCM("lineWidgetIssue5486", function(cm) {
+  // [prepare]
+  // 2nd line is combined to 1st line due to markText
+  // 2nd line has a lineWidget below
+
+  cm.setValue("Lorem\nIpsue\nDollar")
+
+  var el = document.createElement('div')
+  el.style.height='50px'
+  el.textContent = '[[LINE WIDGET]]'
+  
+  var lineWidget = cm.addLineWidget(1, el, {
+    above: false,
+    coverGutter: false,
+    noHScroll: false,
+    showIfHidden: false,
+  })
+  
+  var marker = document.createElement('span')
+  marker.textContent = '[--]'
+  
+  cm.markText({line:0, ch: 1}, {line:1, ch: 4}, {
+    replacedWith: marker
+  })
+
+  // before resizing the lineWidget, measure 3rd line position
+
+  var measure_1 = Math.round(cm.charCoords({line:2, ch:0}).top)
+  
+  // resize lineWidget, height + 50 px
+
+  el.style.height='100px'
+  el.textContent += "\nlineWidget size changed.\nTry moving cursor to line 3?"
+  
+  lineWidget.changed()
+
+  // re-measure 3rd line position
+  var measure_2 = Math.round(cm.charCoords({line:2, ch:0}).top)
+  eq(measure_2, measure_1 + 50)
+
+  // (extra test)
+  //
+  // add char to the right of the folded marker
+  // and re-measure 3rd line position
+
+  cm.replaceRange('-', {line:1, ch: 5})
+  var measure_3 = Math.round(cm.charCoords({line:2, ch:0}).top)
+  eq(measure_3, measure_2)
+});
+
 testCM("getLineNumber", function(cm) {
   addDoc(cm, 2, 20);
   var h1 = cm.getLineHandle(1);

From 81fdc6ffbc5d5861e6d9af4517157f246f03980f Mon Sep 17 00:00:00 2001
From: laobubu <laobubu@live.cn>
Date: Fri, 13 Jul 2018 17:20:14 +0800
Subject: [PATCH 3790/4742] When lineWidget changed, do not update hidden
 lines' height. Fix #5486

---
 src/model/line_widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index 63080767b9..5444d89df0 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -39,7 +39,7 @@ export class LineWidget {
     this.height = null
     let diff = widgetHeight(this) - oldH
     if (!diff) return
-    updateLineHeight(line, line.height + diff)
+    if (!lineIsHidden(this.doc, line)) updateLineHeight(line, line.height + diff)
     if (cm) {
       runInOp(cm, () => {
         cm.curOp.forceUpdate = true

From 03145301dc1edf59fea53d3023cf358e9a08b643 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Jul 2018 18:00:13 +0200
Subject: [PATCH 3791/4742] Make sure bin/source-highlight is in the
 distribution

---
 .npmignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.npmignore b/.npmignore
index f23ca7195d..84f7a22b53 100644
--- a/.npmignore
+++ b/.npmignore
@@ -8,4 +8,7 @@
 /mode/*/*.html
 /mode/index.html
 .*
-bin
+/bin/authors.sh
+/bin/lint
+/bin/release
+/bin/upload-release.js

From 4334727f0e07acd4541b0a7b8f81a5984cd4aafe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Jul 2018 18:18:52 +0200
Subject: [PATCH 3792/4742] Mark release 5.39.2

---
 AUTHORS           |  2 ++
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 52f2b9fa5c..4e91edfc13 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -173,6 +173,7 @@ Danila Malyutin
 Danny Yoo
 darealshinji
 Darius Roberts
+databricks-david-lewis
 Dave Brondsema
 Dave Myers
 David Barnett
@@ -410,6 +411,7 @@ Lior Shub
 LloydMilligan
 LM
 lochel
+Lorenzo Simionato
 Lorenzo Stoakes
 Louis Mauchet
 Luca Fabbri
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75b0de9645..eada990540 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.39.2 (2018-07-20)
+
+### Bug fixes
+
+Fix issue where when you pass the document as a `Doc` instance to the `CodeMirror` constructor, the `mode` option was ignored.
+
+Fix bug where line height could be computed wrong with a line widget below a collapsed line.
+
+Fix overeager `.npmignore` dropping the `bin/source-highlight` utility from the distribution.
+
+[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Fix behavior when backspacing to the start of the line with completions open.
+
 ## 5.39.0 (2018-06-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index cbc642cb35..edcb38086f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.39.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.39.2</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 41c056cce5..4ad74880cf 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-07-2018: <a href="http://codemirror.net/codemirror-5.39.2.zip">Version 5.39.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix issue where when you pass the document as a <code>Doc</code> instance to the <code>CodeMirror</code> constructor, the <code>mode</code> option was ignored.</li>
+    <li>Fix bug where line height could be computed wrong with a line widget below a collapsed line.</li>
+    <li>Fix overeager <code>.npmignore</code> dropping the <code>bin/source-highlight</code> utility from the distribution.</li>
+    <li><a href="http://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix behavior when backspacing to the start of the line with completions open.</li>
+  </ul>
+
   <p class="rel">20-06-2018: <a href="http://codemirror.net/codemirror-5.39.0.zip">Version 5.39.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index fcab188699..926d636a3c 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.39.0</a>.<br>
+      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.39.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index bd35328bee..db2c75a5be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.39.1",
+  "version": "5.39.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index f17e947354..07edb042c2 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.39.1"
+CodeMirror.version = "5.39.2"

From 27edd0db693acec49bd35755bb93a5288a52dd06 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Jul 2018 18:20:24 +0200
Subject: [PATCH 3793/4742] Bump version number post-5.39.2

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index edcb38086f..d389f1da39 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.39.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.39.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index db2c75a5be..3b793365e0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.39.2",
+  "version": "5.39.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 07edb042c2..9bde1c6109 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.39.2"
+CodeMirror.version = "5.39.3"

From f9c0e370ec4ddace08bb799965b3f46f9536a553 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 24 Jul 2018 11:39:48 +0200
Subject: [PATCH 3794/4742] Make all links to codemirror.net https

---
 CHANGELOG.md                              | 952 +++++++++++-----------
 CONTRIBUTING.md                           |   2 +-
 README.md                                 |   4 +-
 addon/comment/comment.js                  |   2 +-
 addon/comment/continuecomment.js          |   2 +-
 addon/dialog/dialog.js                    |   2 +-
 addon/display/autorefresh.js              |   2 +-
 addon/display/fullscreen.js               |   2 +-
 addon/display/panel.js                    |   2 +-
 addon/display/placeholder.js              |   2 +-
 addon/display/rulers.js                   |   2 +-
 addon/edit/closebrackets.js               |   2 +-
 addon/edit/closetag.js                    |   2 +-
 addon/edit/continuelist.js                |   2 +-
 addon/edit/matchbrackets.js               |   2 +-
 addon/edit/matchtags.js                   |   2 +-
 addon/edit/trailingspace.js               |   2 +-
 addon/fold/brace-fold.js                  |   2 +-
 addon/fold/comment-fold.js                |   2 +-
 addon/fold/foldcode.js                    |   2 +-
 addon/fold/foldgutter.js                  |   2 +-
 addon/fold/indent-fold.js                 |   2 +-
 addon/fold/markdown-fold.js               |   2 +-
 addon/fold/xml-fold.js                    |   2 +-
 addon/hint/anyword-hint.js                |   2 +-
 addon/hint/css-hint.js                    |   2 +-
 addon/hint/html-hint.js                   |   2 +-
 addon/hint/javascript-hint.js             |   2 +-
 addon/hint/show-hint.js                   |   2 +-
 addon/hint/sql-hint.js                    |   2 +-
 addon/hint/xml-hint.js                    |   2 +-
 addon/lint/coffeescript-lint.js           |   2 +-
 addon/lint/css-lint.js                    |   2 +-
 addon/lint/html-lint.js                   |   2 +-
 addon/lint/javascript-lint.js             |   2 +-
 addon/lint/json-lint.js                   |   2 +-
 addon/lint/lint.js                        |   2 +-
 addon/lint/yaml-lint.js                   |   2 +-
 addon/merge/merge.js                      |   2 +-
 addon/mode/loadmode.js                    |   2 +-
 addon/mode/multiplex.js                   |   2 +-
 addon/mode/multiplex_test.js              |   2 +-
 addon/mode/overlay.js                     |   2 +-
 addon/mode/simple.js                      |   2 +-
 addon/runmode/colorize.js                 |   2 +-
 addon/runmode/runmode-standalone.js       |   2 +-
 addon/runmode/runmode.js                  |   2 +-
 addon/runmode/runmode.node.js             |   2 +-
 addon/scroll/annotatescrollbar.js         |   2 +-
 addon/scroll/scrollpastend.js             |   2 +-
 addon/scroll/simplescrollbars.js          |   2 +-
 addon/search/jump-to-line.js              |   2 +-
 addon/search/match-highlighter.js         |   2 +-
 addon/search/matchesonscrollbar.js        |   2 +-
 addon/search/search.js                    |   2 +-
 addon/search/searchcursor.js              |   2 +-
 addon/selection/active-line.js            |   2 +-
 addon/selection/mark-selection.js         |   2 +-
 addon/selection/selection-pointer.js      |   2 +-
 addon/tern/tern.js                        |   2 +-
 addon/tern/worker.js                      |   2 +-
 addon/wrap/hardwrap.js                    |   2 +-
 demo/activeline.html                      |   6 +-
 demo/anywordhint.html                     |   2 +-
 demo/bidi.html                            |   2 +-
 demo/btree.html                           |   2 +-
 demo/buffers.html                         |   2 +-
 demo/changemode.html                      |   2 +-
 demo/closebrackets.html                   |   2 +-
 demo/closetag.html                        |   2 +-
 demo/complete.html                        |   2 +-
 demo/emacs.html                           |   2 +-
 demo/folding.html                         |   2 +-
 demo/fullscreen.html                      |   2 +-
 demo/hardwrap.html                        |   2 +-
 demo/html5complete.html                   |   2 +-
 demo/indentwrap.html                      |   2 +-
 demo/lint.html                            |   2 +-
 demo/loadmode.html                        |   2 +-
 demo/marker.html                          |   2 +-
 demo/markselection.html                   |   2 +-
 demo/matchhighlighter.html                |   2 +-
 demo/matchtags.html                       |   2 +-
 demo/merge.html                           |   2 +-
 demo/multiplex.html                       |   2 +-
 demo/mustache.html                        |   2 +-
 demo/panel.html                           |   2 +-
 demo/placeholder.html                     |   2 +-
 demo/preview.html                         |   2 +-
 demo/requirejs.html                       |   2 +-
 demo/resize.html                          |   2 +-
 demo/rulers.html                          |   2 +-
 demo/runmode.html                         |   2 +-
 demo/search.html                          |   2 +-
 demo/simplemode.html                      |   2 +-
 demo/simplescrollbars.html                |   2 +-
 demo/spanaffectswrapping_shim.html        |   2 +-
 demo/sublime.html                         |   2 +-
 demo/tern.html                            |   2 +-
 demo/theme.html                           |   2 +-
 demo/trailingspace.html                   |   2 +-
 demo/variableheight.html                  |   2 +-
 demo/vim.html                             |   2 +-
 demo/visibletabs.html                     |   2 +-
 demo/widget.html                          |   2 +-
 demo/xmlcomplete.html                     |   2 +-
 doc/internals.html                        |   8 +-
 doc/manual.html                           |   2 +-
 doc/realworld.html                        |   2 +-
 doc/releases.html                         | 676 +++++++--------
 doc/reporting.html                        |   2 +-
 doc/upgrade_v2.2.html                     |   2 +-
 doc/upgrade_v3.html                       |   2 +-
 doc/upgrade_v4.html                       |   2 +-
 index.html                                |   8 +-
 keymap/emacs.js                           |   2 +-
 keymap/sublime.js                         |   2 +-
 keymap/vim.js                             |   2 +-
 mode/apl/apl.js                           |   2 +-
 mode/apl/index.html                       |   2 +-
 mode/asciiarmor/asciiarmor.js             |   2 +-
 mode/asciiarmor/index.html                |   2 +-
 mode/asn.1/asn.1.js                       |   2 +-
 mode/asn.1/index.html                     |   2 +-
 mode/asterisk/asterisk.js                 |   2 +-
 mode/asterisk/index.html                  |   2 +-
 mode/brainfuck/brainfuck.js               |   2 +-
 mode/brainfuck/index.html                 |   2 +-
 mode/clike/clike.js                       |   2 +-
 mode/clike/index.html                     |   2 +-
 mode/clike/scala.html                     |   2 +-
 mode/clike/test.js                        |   2 +-
 mode/clojure/clojure.js                   |   2 +-
 mode/clojure/index.html                   |   2 +-
 mode/cmake/cmake.js                       |   2 +-
 mode/cmake/index.html                     |   2 +-
 mode/cobol/cobol.js                       |   2 +-
 mode/cobol/index.html                     |   2 +-
 mode/coffeescript/coffeescript.js         |   2 +-
 mode/coffeescript/index.html              |   2 +-
 mode/commonlisp/commonlisp.js             |   2 +-
 mode/commonlisp/index.html                |   2 +-
 mode/crystal/crystal.js                   |   2 +-
 mode/crystal/index.html                   |   2 +-
 mode/css/css.js                           |   2 +-
 mode/css/gss.html                         |   2 +-
 mode/css/gss_test.js                      |   2 +-
 mode/css/index.html                       |   2 +-
 mode/css/less.html                        |   2 +-
 mode/css/less_test.js                     |   2 +-
 mode/css/scss.html                        |   2 +-
 mode/css/scss_test.js                     |   2 +-
 mode/css/test.js                          |   2 +-
 mode/cypher/cypher.js                     |   2 +-
 mode/cypher/index.html                    |   2 +-
 mode/cypher/test.js                       |   2 +-
 mode/d/d.js                               |   2 +-
 mode/d/index.html                         |   2 +-
 mode/d/test.js                            |   2 +-
 mode/dart/dart.js                         |   2 +-
 mode/dart/index.html                      |   2 +-
 mode/diff/diff.js                         |   2 +-
 mode/diff/index.html                      |   2 +-
 mode/django/django.js                     |   2 +-
 mode/django/index.html                    |   2 +-
 mode/dockerfile/dockerfile.js             |   2 +-
 mode/dockerfile/index.html                |   2 +-
 mode/dockerfile/test.js                   |   2 +-
 mode/dtd/dtd.js                           |   2 +-
 mode/dtd/index.html                       |   2 +-
 mode/dylan/dylan.js                       |   2 +-
 mode/dylan/index.html                     |   2 +-
 mode/dylan/test.js                        |   2 +-
 mode/ebnf/ebnf.js                         |   2 +-
 mode/ebnf/index.html                      |   2 +-
 mode/ecl/ecl.js                           |   2 +-
 mode/ecl/index.html                       |   2 +-
 mode/eiffel/eiffel.js                     |   2 +-
 mode/eiffel/index.html                    |   2 +-
 mode/elm/elm.js                           |   2 +-
 mode/elm/index.html                       |   2 +-
 mode/erlang/erlang.js                     |   2 +-
 mode/erlang/index.html                    |   2 +-
 mode/factor/factor.js                     |   2 +-
 mode/factor/index.html                    |   2 +-
 mode/fcl/fcl.js                           |   2 +-
 mode/fcl/index.html                       |   2 +-
 mode/forth/forth.js                       |   2 +-
 mode/forth/index.html                     |   2 +-
 mode/fortran/fortran.js                   |   2 +-
 mode/fortran/index.html                   |   2 +-
 mode/gas/gas.js                           |   2 +-
 mode/gas/index.html                       |   2 +-
 mode/gfm/gfm.js                           |   2 +-
 mode/gfm/index.html                       |   2 +-
 mode/gfm/test.js                          |   2 +-
 mode/gherkin/gherkin.js                   |   2 +-
 mode/gherkin/index.html                   |   2 +-
 mode/go/go.js                             |   2 +-
 mode/go/index.html                        |   2 +-
 mode/groovy/groovy.js                     |   2 +-
 mode/groovy/index.html                    |   2 +-
 mode/haml/haml.js                         |   2 +-
 mode/haml/index.html                      |   2 +-
 mode/haml/test.js                         |   2 +-
 mode/handlebars/handlebars.js             |   2 +-
 mode/handlebars/index.html                |   2 +-
 mode/haskell-literate/haskell-literate.js |   2 +-
 mode/haskell-literate/index.html          |   2 +-
 mode/haskell/haskell.js                   |   2 +-
 mode/haskell/index.html                   |   2 +-
 mode/haxe/haxe.js                         |   2 +-
 mode/haxe/index.html                      |   2 +-
 mode/htmlembedded/htmlembedded.js         |   2 +-
 mode/htmlembedded/index.html              |   2 +-
 mode/htmlmixed/htmlmixed.js               |   2 +-
 mode/htmlmixed/index.html                 |   2 +-
 mode/http/http.js                         |   2 +-
 mode/http/index.html                      |   2 +-
 mode/idl/idl.js                           |   2 +-
 mode/idl/index.html                       |   2 +-
 mode/index.html                           |   2 +-
 mode/javascript/index.html                |   2 +-
 mode/javascript/javascript.js             |   2 +-
 mode/javascript/json-ld.html              |   2 +-
 mode/javascript/test.js                   |   2 +-
 mode/javascript/typescript.html           |   2 +-
 mode/jinja2/index.html                    |   2 +-
 mode/jinja2/jinja2.js                     |   2 +-
 mode/jsx/index.html                       |   2 +-
 mode/jsx/jsx.js                           |   2 +-
 mode/jsx/test.js                          |   2 +-
 mode/julia/index.html                     |   2 +-
 mode/julia/julia.js                       |   2 +-
 mode/livescript/index.html                |   2 +-
 mode/livescript/livescript.js             |   2 +-
 mode/lua/index.html                       |   4 +-
 mode/lua/lua.js                           |   2 +-
 mode/markdown/index.html                  |   2 +-
 mode/markdown/markdown.js                 |   2 +-
 mode/markdown/test.js                     |   2 +-
 mode/mathematica/index.html               |   2 +-
 mode/mathematica/mathematica.js           |   2 +-
 mode/mbox/index.html                      |   2 +-
 mode/mbox/mbox.js                         |   2 +-
 mode/meta.js                              |   2 +-
 mode/mirc/index.html                      |   2 +-
 mode/mirc/mirc.js                         |   2 +-
 mode/mllike/index.html                    |   2 +-
 mode/mllike/mllike.js                     |   2 +-
 mode/modelica/index.html                  |   2 +-
 mode/modelica/modelica.js                 |   2 +-
 mode/mscgen/index.html                    |   2 +-
 mode/mscgen/mscgen.js                     |   2 +-
 mode/mscgen/mscgen_test.js                |   2 +-
 mode/mscgen/msgenny_test.js               |   2 +-
 mode/mscgen/xu_test.js                    |   2 +-
 mode/mumps/index.html                     |   2 +-
 mode/mumps/mumps.js                       |   2 +-
 mode/nginx/index.html                     |   2 +-
 mode/nginx/nginx.js                       |   2 +-
 mode/nsis/index.html                      |   2 +-
 mode/nsis/nsis.js                         |   2 +-
 mode/ntriples/index.html                  |   2 +-
 mode/ntriples/ntriples.js                 |   2 +-
 mode/octave/index.html                    |   2 +-
 mode/octave/octave.js                     |   2 +-
 mode/oz/index.html                        |   2 +-
 mode/oz/oz.js                             |   2 +-
 mode/pascal/index.html                    |   2 +-
 mode/pascal/pascal.js                     |   2 +-
 mode/pegjs/index.html                     |   2 +-
 mode/pegjs/pegjs.js                       |   2 +-
 mode/perl/index.html                      |   2 +-
 mode/perl/perl.js                         |   2 +-
 mode/php/index.html                       |   2 +-
 mode/php/php.js                           |   2 +-
 mode/php/test.js                          |   2 +-
 mode/pig/index.html                       |   2 +-
 mode/pig/pig.js                           |   2 +-
 mode/powershell/index.html                |   2 +-
 mode/powershell/powershell.js             |   2 +-
 mode/powershell/test.js                   |   2 +-
 mode/properties/index.html                |   2 +-
 mode/properties/properties.js             |   2 +-
 mode/protobuf/index.html                  |   2 +-
 mode/protobuf/protobuf.js                 |   2 +-
 mode/pug/index.html                       |   2 +-
 mode/pug/pug.js                           |   2 +-
 mode/puppet/index.html                    |   2 +-
 mode/puppet/puppet.js                     |   2 +-
 mode/python/index.html                    |   2 +-
 mode/python/python.js                     |   2 +-
 mode/python/test.js                       |   2 +-
 mode/q/index.html                         |   2 +-
 mode/q/q.js                               |   2 +-
 mode/r/index.html                         |   2 +-
 mode/r/r.js                               |   2 +-
 mode/rpm/changes/index.html               |   2 +-
 mode/rpm/index.html                       |   2 +-
 mode/rpm/rpm.js                           |   2 +-
 mode/rst/index.html                       |   2 +-
 mode/rst/rst.js                           |   2 +-
 mode/ruby/index.html                      |   2 +-
 mode/ruby/ruby.js                         |   2 +-
 mode/ruby/test.js                         |   2 +-
 mode/rust/index.html                      |   2 +-
 mode/rust/rust.js                         |   2 +-
 mode/rust/test.js                         |   2 +-
 mode/sas/index.html                       |   2 +-
 mode/sas/sas.js                           |   2 +-
 mode/sass/index.html                      |   2 +-
 mode/sass/sass.js                         |   2 +-
 mode/sass/test.js                         |   2 +-
 mode/scheme/index.html                    |   2 +-
 mode/scheme/scheme.js                     |   2 +-
 mode/shell/index.html                     |   2 +-
 mode/shell/shell.js                       |   2 +-
 mode/shell/test.js                        |   2 +-
 mode/sieve/index.html                     |   2 +-
 mode/sieve/sieve.js                       |   2 +-
 mode/slim/index.html                      |   2 +-
 mode/slim/slim.js                         |   2 +-
 mode/slim/test.js                         |   2 +-
 mode/smalltalk/index.html                 |   2 +-
 mode/smalltalk/smalltalk.js               |   2 +-
 mode/smarty/index.html                    |   2 +-
 mode/smarty/smarty.js                     |   2 +-
 mode/solr/index.html                      |   2 +-
 mode/solr/solr.js                         |   2 +-
 mode/soy/index.html                       |   2 +-
 mode/soy/soy.js                           |   2 +-
 mode/soy/test.js                          |   2 +-
 mode/sparql/index.html                    |   2 +-
 mode/sparql/sparql.js                     |   2 +-
 mode/spreadsheet/index.html               |   2 +-
 mode/spreadsheet/spreadsheet.js           |   2 +-
 mode/sql/index.html                       |   2 +-
 mode/sql/sql.js                           |   2 +-
 mode/stex/index.html                      |   2 +-
 mode/stex/stex.js                         |   2 +-
 mode/stex/test.js                         |   2 +-
 mode/stylus/index.html                    |   2 +-
 mode/stylus/stylus.js                     |   2 +-
 mode/swift/index.html                     |   2 +-
 mode/swift/swift.js                       |   2 +-
 mode/swift/test.js                        |   2 +-
 mode/tcl/index.html                       |   2 +-
 mode/tcl/tcl.js                           |   2 +-
 mode/textile/index.html                   |   2 +-
 mode/textile/test.js                      |   6 +-
 mode/textile/textile.js                   |   2 +-
 mode/tiddlywiki/index.html                |   2 +-
 mode/tiddlywiki/tiddlywiki.js             |   4 +-
 mode/tiki/index.html                      |   2 +-
 mode/tiki/tiki.js                         |   2 +-
 mode/toml/index.html                      |   2 +-
 mode/toml/toml.js                         |   2 +-
 mode/tornado/index.html                   |   2 +-
 mode/tornado/tornado.js                   |   2 +-
 mode/troff/index.html                     |   2 +-
 mode/troff/troff.js                       |   2 +-
 mode/ttcn-cfg/index.html                  |   2 +-
 mode/ttcn-cfg/ttcn-cfg.js                 |   2 +-
 mode/ttcn/index.html                      |   2 +-
 mode/ttcn/ttcn.js                         |   2 +-
 mode/turtle/index.html                    |   2 +-
 mode/turtle/turtle.js                     |   2 +-
 mode/twig/index.html                      |   2 +-
 mode/twig/twig.js                         |   2 +-
 mode/vb/index.html                        |   2 +-
 mode/vb/vb.js                             |   2 +-
 mode/vbscript/index.html                  |   2 +-
 mode/vbscript/vbscript.js                 |   2 +-
 mode/velocity/index.html                  |   2 +-
 mode/velocity/velocity.js                 |   2 +-
 mode/verilog/index.html                   |   2 +-
 mode/verilog/test.js                      |   2 +-
 mode/verilog/verilog.js                   |   2 +-
 mode/vhdl/index.html                      |   2 +-
 mode/vhdl/vhdl.js                         |   2 +-
 mode/vue/index.html                       |   2 +-
 mode/vue/vue.js                           |   2 +-
 mode/webidl/index.html                    |   2 +-
 mode/webidl/webidl.js                     |   2 +-
 mode/xml/index.html                       |   2 +-
 mode/xml/test.js                          |   2 +-
 mode/xml/xml.js                           |   2 +-
 mode/xquery/index.html                    |   2 +-
 mode/xquery/test.js                       |   2 +-
 mode/xquery/xquery.js                     |   2 +-
 mode/yacas/index.html                     |   2 +-
 mode/yacas/yacas.js                       |   2 +-
 mode/yaml-frontmatter/index.html          |   2 +-
 mode/yaml-frontmatter/yaml-frontmatter.js |   2 +-
 mode/yaml/index.html                      |   2 +-
 mode/yaml/yaml.js                         |   2 +-
 mode/z80/index.html                       |   2 +-
 mode/z80/z80.js                           |   2 +-
 package.json                              |   2 +-
 rollup.config.js                          |   4 +-
 test/html-hint-test.js                    |   2 +-
 test/index.html                           |   2 +-
 test/sql-hint-test.js                     |   2 +-
 404 files changed, 1230 insertions(+), 1230 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eada990540..cb561405c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Fix bug where line height could be computed wrong with a line widget below a col
 
 Fix overeager `.npmignore` dropping the `bin/source-highlight` utility from the distribution.
 
-[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Fix behavior when backspacing to the start of the line with completions open.
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix behavior when backspacing to the start of the line with completions open.
 
 ## 5.39.0 (2018-06-20)
 
@@ -16,11 +16,11 @@ Fix overeager `.npmignore` dropping the `bin/source-highlight` utility from the
 
 Fix issue that in some circumstances caused content to be clipped off at the bottom after a resize.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Improve handling of blank lines in HTML tags.
+[markdown mode](https://codemirror.net/mode/markdown/): Improve handling of blank lines in HTML tags.
 
 ### New features
 
-[stex mode](http://codemirror.net/mode/stex/): Add an `inMathMode` option to start the mode in math mode.
+[stex mode](https://codemirror.net/mode/stex/): Add an `inMathMode` option to start the mode in math mode.
 
 ## 5.38.0 (2018-05-21)
 
@@ -36,17 +36,17 @@ Work around some browsers inexplicably making the fake scrollbars focusable.
 
 Make sure `coordsChar` doesn't return positions inside collapsed ranges.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Support block scopes, bindingless catch, bignum suffix, `s` regexp flag.
+[javascript mode](https://codemirror.net/mode/javascript/): Support block scopes, bindingless catch, bignum suffix, `s` regexp flag.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Adjust a wasteful regexp.
+[markdown mode](https://codemirror.net/mode/markdown/): Adjust a wasteful regexp.
 
-[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Allow opening the control without any item selected.
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Allow opening the control without any item selected.
 
 ### New features
 
-New theme: [darcula](http://codemirror.net/demo/theme.html#darcula).
+New theme: [darcula](https://codemirror.net/demo/theme.html#darcula).
 
-[dialog addon](http://codemirror.net/doc/manual.html#addon_dialog): Add a CSS class (`dialog-opened`) to the editor when a dialog is open.
+[dialog addon](https://codemirror.net/doc/manual.html#addon_dialog): Add a CSS class (`dialog-opened`) to the editor when a dialog is open.
 
 ## 5.37.0 (2018-04-20)
 
@@ -54,17 +54,17 @@ New theme: [darcula](http://codemirror.net/demo/theme.html#darcula).
 
 Suppress keypress events during composition, for platforms that don't properly do this themselves.
 
-[xml-fold addon](http://codemirror.net/demo/folding.html): Improve handling of line-wrapped opening tags.
+[xml-fold addon](https://codemirror.net/demo/folding.html): Improve handling of line-wrapped opening tags.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Improve TypeScript support.
+[javascript mode](https://codemirror.net/mode/javascript/): Improve TypeScript support.
 
-[python mode](http://codemirror.net/mode/python/): Highlight expressions inside format strings.
+[python mode](https://codemirror.net/mode/python/): Highlight expressions inside format strings.
 
 ### New features
 
-[vim bindings](http://codemirror.net/demo/vim.html): Add support for '(' and ')' movement.
+[vim bindings](https://codemirror.net/demo/vim.html): Add support for '(' and ')' movement.
 
-New themes: [idea](http://codemirror.net/demo/theme.html#idea), [ssms](http://codemirror.net/demo/theme.html#ssms), [gruvbox-dark](http://codemirror.net/demo/theme.html#gruvbox-dark).
+New themes: [idea](https://codemirror.net/demo/theme.html#idea), [ssms](https://codemirror.net/demo/theme.html#ssms), [gruvbox-dark](https://codemirror.net/demo/theme.html#gruvbox-dark).
 
 ## 5.36.0 (2018-03-20)
 
@@ -74,21 +74,21 @@ Make sure all document-level event handlers are registered on the document that
 
 Fix issue that prevented edits whose origin starts with `+` from being combined in history events for an editor-less document.
 
-[multiplex addon](http://codemirror.net/demo/multiplex.html): Improve handling of indentation.
+[multiplex addon](https://codemirror.net/demo/multiplex.html): Improve handling of indentation.
 
-[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Use CSS `:after` element to style the scroll-lock icon.
+[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Use CSS `:after` element to style the scroll-lock icon.
 
-[javascript-hint addon](http://codemirror.net/doc/manual.html#addon_javascript-hint): Don't provide completions in JSON mode.
+[javascript-hint addon](https://codemirror.net/doc/manual.html#addon_javascript-hint): Don't provide completions in JSON mode.
 
-[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Fix numbering error.
+[continuelist addon](https://codemirror.net/doc/manual.html#addon_continuelist): Fix numbering error.
 
-[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Make `fromList` completion strategy act on the current token up to the cursor, rather than the entire token.
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Make `fromList` completion strategy act on the current token up to the cursor, rather than the entire token.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Fix a regexp with potentially exponental complexity.
+[markdown mode](https://codemirror.net/mode/markdown/): Fix a regexp with potentially exponental complexity.
 
 ### New features
 
-New theme: [lucario](http://codemirror.net/demo/theme.html#lucario).
+New theme: [lucario](https://codemirror.net/demo/theme.html#lucario).
 
 ## 5.35.0 (2018-02-20)
 
@@ -98,69 +98,69 @@ Fix problem where selection undo might change read-only documents.
 
 Fix crash when calling `addLineWidget` on a document that has no attached editor.
 
-[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix behavior of `^` in multiline regexp mode.
+[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Fix behavior of `^` in multiline regexp mode.
 
-[match-highlighter addon](http://codemirror.net/doc/manual.html#addon_match-highlighter): Fix problem with matching words that have regexp special syntax in them.
+[match-highlighter addon](https://codemirror.net/doc/manual.html#addon_match-highlighter): Fix problem with matching words that have regexp special syntax in them.
 
-[sublime bindings](http://codemirror.net/demo/sublime.html): Fix `addCursorToSelection` for short lines.
+[sublime bindings](https://codemirror.net/demo/sublime.html): Fix `addCursorToSelection` for short lines.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Support TypeScript intersection types, dynamic `import`.
+[javascript mode](https://codemirror.net/mode/javascript/): Support TypeScript intersection types, dynamic `import`.
 
-[stex mode](http://codemirror.net/mode/stex/): Fix parsing of `\(` `\)` delimiters, recognize more atom arguments.
+[stex mode](https://codemirror.net/mode/stex/): Fix parsing of `\(` `\)` delimiters, recognize more atom arguments.
 
-[haskell mode](http://codemirror.net/mode/haskell/): Highlight more builtins, support `<*` and `*>`.
+[haskell mode](https://codemirror.net/mode/haskell/): Highlight more builtins, support `<*` and `*>`.
 
-[sql mode](http://codemirror.net/mode/sql/): Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.
+[sql mode](https://codemirror.net/mode/sql/): Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.
 
-[dockerfile mode](http://codemirror.net/mode/dockerfile/): Highlight strings and ports, recognize more instructions.
+[dockerfile mode](https://codemirror.net/mode/dockerfile/): Highlight strings and ports, recognize more instructions.
 
 ### New features
 
-[vim bindings](http://codemirror.net/demo/vim.html): Support alternative delimiters in replace command.
+[vim bindings](https://codemirror.net/demo/vim.html): Support alternative delimiters in replace command.
 
 ## 5.34.0 (2018-01-29)
 
 ### Bug fixes
 
-[markdown mode](http://codemirror.net/mode/markdown/): Fix a problem where inline styles would persist across list items.
+[markdown mode](https://codemirror.net/mode/markdown/): Fix a problem where inline styles would persist across list items.
 
-[sublime bindings](http://codemirror.net/demo/sublime.html): Fix the `toggleBookmark` command.
+[sublime bindings](https://codemirror.net/demo/sublime.html): Fix the `toggleBookmark` command.
 
-[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Improve behavior when closing triple quotes.
+[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Improve behavior when closing triple quotes.
 
-[xml-fold addon](http://codemirror.net/demo/folding.html): Fix folding of line-broken XML tags.
+[xml-fold addon](https://codemirror.net/demo/folding.html): Fix folding of line-broken XML tags.
 
-[shell mode](http://codemirror.net/mode/shell/): Better handling of nested quoting.
+[shell mode](https://codemirror.net/mode/shell/): Better handling of nested quoting.
 
-[javascript-lint addon](http://codemirror.net/demo/lint.html): Clean up and simplify.
+[javascript-lint addon](https://codemirror.net/demo/lint.html): Clean up and simplify.
 
-[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Fix support for multiple editors at the same time.
+[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Fix support for multiple editors at the same time.
 
 ### New features
 
-New themes: [oceanic-next](http://codemirror.net/demo/theme.html#oceanic-next) and [shadowfox](http://codemirror.net/demo/theme.html#shadowfox).
+New themes: [oceanic-next](https://codemirror.net/demo/theme.html#oceanic-next) and [shadowfox](https://codemirror.net/demo/theme.html#shadowfox).
 
 ## 5.33.0 (2017-12-21)
 
 ### Bug fixes
 
-[lint addon](http://codemirror.net/doc/manual.html#addon_lint): Make updates more efficient.
+[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Make updates more efficient.
 
-[css mode](http://codemirror.net/mode/css/): The mode is now properly case-insensitive.
+[css mode](https://codemirror.net/mode/css/): The mode is now properly case-insensitive.
 
-[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Fix broken handling of unordered lists introduced in previous release.
+[continuelist addon](https://codemirror.net/doc/manual.html#addon_continuelist): Fix broken handling of unordered lists introduced in previous release.
 
-[swift](http://codemirror.net/mode/swift) and [scala](http://codemirror.net/mode/clike/) modes: Support nested block comments.
+[swift](https://codemirror.net/mode/swift) and [scala](https://codemirror.net/mode/clike/) modes: Support nested block comments.
 
-[mllike mode](http://codemirror.net/mode/mllike/index.html): Improve OCaml support.
+[mllike mode](https://codemirror.net/mode/mllike/index.html): Improve OCaml support.
 
-[sublime bindings](http://codemirror.net/demo/sublime.html): Use the proper key bindings for `addCursorToNextLine` and `addCursorToPrevLine`.
+[sublime bindings](https://codemirror.net/demo/sublime.html): Use the proper key bindings for `addCursorToNextLine` and `addCursorToPrevLine`.
 
 ### New features
 
-[jsx mode](http://codemirror.net/mode/jsx/index.html): Support JSX fragments.
+[jsx mode](https://codemirror.net/mode/jsx/index.html): Support JSX fragments.
 
-[closetag addon](http://codemirror.net/demo/closetag.html): Add an option to disable auto-indenting.
+[closetag addon](https://codemirror.net/demo/closetag.html): Add an option to disable auto-indenting.
 
 ## 5.32.0 (2017-11-22)
 
@@ -168,19 +168,19 @@ New themes: [oceanic-next](http://codemirror.net/demo/theme.html#oceanic-next) a
 
 Increase contrast on default bracket-matching colors.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of `enum` and `module` keywords.
+[javascript mode](https://codemirror.net/mode/javascript/): Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of `enum` and `module` keywords.
 
-[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Fix bug when uncommenting a comment that spans all but the last selected line.
+[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Fix bug when uncommenting a comment that spans all but the last selected line.
 
-[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix bug in case folding.
+[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Fix bug in case folding.
 
-[emacs bindings](http://codemirror.net/demo/emacs.html): Prevent single-character deletions from resetting the kill ring.
+[emacs bindings](https://codemirror.net/demo/emacs.html): Prevent single-character deletions from resetting the kill ring.
 
-[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Tweak quote matching behavior.
+[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Tweak quote matching behavior.
 
 ### New features
 
-[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Increment ordered list numbers when adding one.
+[continuelist addon](https://codemirror.net/doc/manual.html#addon_continuelist): Increment ordered list numbers when adding one.
 
 ## 5.31.0 (2017-10-20)
 
@@ -188,17 +188,17 @@ Increase contrast on default bracket-matching colors.
 
 Further improve selection drawing and cursor motion in right-to-left documents.
 
-[vim bindings](http://codemirror.net/demo/vim.html): Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable [input mode](http://codemirror.net/doc/manual.html#option_contentEditable).
+[vim bindings](https://codemirror.net/demo/vim.html): Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable [input mode](https://codemirror.net/doc/manual.html#option_contentEditable).
 
-[continuecomment addon](http://codemirror.net/doc/manual.html#addon_continuecomment): Fix bug when pressing enter after a single-line block comment.
+[continuecomment addon](https://codemirror.net/doc/manual.html#addon_continuecomment): Fix bug when pressing enter after a single-line block comment.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Fix issue with leaving indented fenced code blocks.
+[markdown mode](https://codemirror.net/mode/markdown/): Fix issue with leaving indented fenced code blocks.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.
+[javascript mode](https://codemirror.net/mode/javascript/): Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.
 
 ### New features
 
-Modes added with [`addOverlay`](http://codemirror.net/doc/manual.html#addOverlay) now have access to a [`baseToken`](http://codemirror.net/doc/manual.html#baseToken) method on their input stream, giving access to the tokens of the underlying mode.
+Modes added with [`addOverlay`](https://codemirror.net/doc/manual.html#addOverlay) now have access to a [`baseToken`](https://codemirror.net/doc/manual.html#baseToken) method on their input stream, giving access to the tokens of the underlying mode.
 
 ## 5.30.0 (2017-09-20)
 
@@ -206,23 +206,23 @@ Modes added with [`addOverlay`](http://codemirror.net/doc/manual.html#addOverlay
 
 Fixed a number of issues with drawing right-to-left selections and mouse selection in bidirectional text.
 
-[search addon](http://codemirror.net/demo/search/): Fix crash when restarting search after doing empty search.
+[search addon](https://codemirror.net/demo/search/): Fix crash when restarting search after doing empty search.
 
 [mark-selection addon](http://cm/doc/manual.html#addon_mark-selection): Fix off-by-one bug.
 
-[tern addon](http://codemirror.net/demo/tern.html): Fix bad request made when editing at the bottom of a large document.
+[tern addon](https://codemirror.net/demo/tern.html): Fix bad request made when editing at the bottom of a large document.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Improve parsing in a number of corner cases.
+[javascript mode](https://codemirror.net/mode/javascript/): Improve parsing in a number of corner cases.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.
+[markdown mode](https://codemirror.net/mode/markdown/): Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.
 
-[gfm mode](http://codemirror.net/mode/gfm/): Don't highlight SHA1 'hashes' without numbers to avoid false positives.
+[gfm mode](https://codemirror.net/mode/gfm/): Don't highlight SHA1 'hashes' without numbers to avoid false positives.
 
-[soy mode](http://codemirror.net/mode/soy/): Support injected data and `@param` in comments.
+[soy mode](https://codemirror.net/mode/soy/): Support injected data and `@param` in comments.
 
 ### New features
 
-[simple mode addon](http://codemirror.net/demo/simplemode.html): Allow groups in regexps when `token` isn't an array.
+[simple mode addon](https://codemirror.net/demo/simplemode.html): Allow groups in regexps when `token` isn't an array.
 
 ## 5.29.0 (2017-08-24)
 
@@ -230,21 +230,21 @@ Fixed a number of issues with drawing right-to-left selections and mouse selecti
 
 Fix crash in contentEditable input style when editing near a bookmark.
 
-Make sure change origins are preserved when splitting changes on [read-only marks](http://codemirror.net/doc/manual.html#mark_readOnly).
+Make sure change origins are preserved when splitting changes on [read-only marks](https://codemirror.net/doc/manual.html#mark_readOnly).
 
-[javascript mode](http://codemirror.net/mode/javascript/): More support for TypeScript syntax.
+[javascript mode](https://codemirror.net/mode/javascript/): More support for TypeScript syntax.
 
-[d mode](http://codemirror.net/mode/d/): Support nested comments.
+[d mode](https://codemirror.net/mode/d/): Support nested comments.
 
-[python mode](http://codemirror.net/mode/python/): Improve tokenizing of operators.
+[python mode](https://codemirror.net/mode/python/): Improve tokenizing of operators.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Further improve CommonMark conformance.
+[markdown mode](https://codemirror.net/mode/markdown/): Further improve CommonMark conformance.
 
-[css mode](http://codemirror.net/mode/css/): Don't run comment tokens through the mode's state machine.
+[css mode](https://codemirror.net/mode/css/): Don't run comment tokens through the mode's state machine.
 
-[shell mode](http://codemirror.net/mode/shell/): Allow strings to span lines.
+[shell mode](https://codemirror.net/mode/shell/): Allow strings to span lines.
 
-[search addon](http://codemirror.net/demo/search/): Fix crash in persistent search when `extraKeys` is null.
+[search addon](https://codemirror.net/demo/search/): Fix crash in persistent search when `extraKeys` is null.
 
 ## 5.28.0 (2017-07-21)
 
@@ -252,21 +252,21 @@ Make sure change origins are preserved when splitting changes on [read-only mark
 
 Fix copying of, or replacing editor content with, a single dash character when copying a big selection in some corner cases.
 
-Make [`"goLineLeft"`](http://codemirror.net/doc/manual.html#command_goLineLeft)/`"goLineRight"` behave better on wrapped lines.
+Make [`"goLineLeft"`](https://codemirror.net/doc/manual.html#command_goLineLeft)/`"goLineRight"` behave better on wrapped lines.
 
-[sql mode](http://codemirror.net/mode/sql/): Fix tokenizing of multi-dot operator and allow digits in subfield names.
+[sql mode](https://codemirror.net/mode/sql/): Fix tokenizing of multi-dot operator and allow digits in subfield names.
 
-[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix infinite loop on some composed character inputs.
+[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Fix infinite loop on some composed character inputs.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Make list parsing more CommonMark-compliant.
+[markdown mode](https://codemirror.net/mode/markdown/): Make list parsing more CommonMark-compliant.
 
-[gfm mode](http://codemirror.net/mode/gfm/): Highlight colon syntax for emoji.
+[gfm mode](https://codemirror.net/mode/gfm/): Highlight colon syntax for emoji.
 
 ### New features
 
-Expose [`startOperation`](http://codemirror.net/doc/manual.html#startOperation) and `endOperation` for explicit operation management.
+Expose [`startOperation`](https://codemirror.net/doc/manual.html#startOperation) and `endOperation` for explicit operation management.
 
-[sublime bindings](http://codemirror.net/demo/sublime.html): Add extend-selection (Ctrl-Alt- or Cmd-Shift-Up/Down).
+[sublime bindings](https://codemirror.net/demo/sublime.html): Add extend-selection (Ctrl-Alt- or Cmd-Shift-Up/Down).
 
 ## 5.27.4 (2017-06-29)
 
@@ -274,13 +274,13 @@ Expose [`startOperation`](http://codemirror.net/doc/manual.html#startOperation)
 
 Fix crash when using mode lookahead.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Don't block inner mode's indentation support.
+[markdown mode](https://codemirror.net/mode/markdown/): Don't block inner mode's indentation support.
 
 ## 5.27.2 (2017-06-22)
 
 ### Bug fixes
 
-Fix crash in the [simple mode](http://codemirror.net/demo/simplemode.html)< addon.
+Fix crash in the [simple mode](https://codemirror.net/demo/simplemode.html)< addon.
 
 ## 5.27.0 (2017-06-22)
 
@@ -292,31 +292,31 @@ Properly disable the hidden textarea when `readOnly` is `"nocursor"`.
 
 Calling the `Doc` constructor without `new` works again.
 
-[sql mode](http://codemirror.net/mode/sql/): Handle nested comments.
+[sql mode](https://codemirror.net/mode/sql/): Handle nested comments.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+[javascript mode](https://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Fix bug where markup was ignored on indented paragraph lines.
+[markdown mode](https://codemirror.net/mode/markdown/): Fix bug where markup was ignored on indented paragraph lines.
 
-[vim bindings](http://codemirror.net/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
+[vim bindings](https://codemirror.net/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
 
-[rust mode](http://codemirror.net/mode/rust/): Add the correct MIME type.
+[rust mode](https://codemirror.net/mode/rust/): Add the correct MIME type.
 
-[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Document options.
+[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Document options.
 
 ### New features
 
 Mouse button clicks can now be bound in keymaps by using names like `"LeftClick"` or `"Ctrl-Alt-MiddleTripleClick"`. When bound to a function, that function will be passed the position of the click as second argument.
 
-The behavior of mouse selection and dragging can now be customized with the [`configureMouse`](http://codemirror.net/doc/manual.html#option_configureMouse) option.
+The behavior of mouse selection and dragging can now be customized with the [`configureMouse`](https://codemirror.net/doc/manual.html#option_configureMouse) option.
 
-Modes can now look ahead across line boundaries with the [`StringStream`](http://codemirror.net/doc/manual.html#StringStream)`.lookahead` method.
+Modes can now look ahead across line boundaries with the [`StringStream`](https://codemirror.net/doc/manual.html#StringStream)`.lookahead` method.
 
 Introduces a `"type"` token type, makes modes that recognize types output it, and add styling for it to the themes.
 
-New [`pasteLinesPerSelection`](http://codemirror.net/doc/manual.html#option_pasteLinesPerSelection) option to control the behavior of pasting multiple lines into multiple selections.
+New [`pasteLinesPerSelection`](https://codemirror.net/doc/manual.html#option_pasteLinesPerSelection) option to control the behavior of pasting multiple lines into multiple selections.
 
-[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Support multi-line regular expression matches, and normalize strings when matching.
+[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Support multi-line regular expression matches, and normalize strings when matching.
 
 ## 5.26.0 (2017-05-22)
 
@@ -326,19 +326,19 @@ In textarea-mode, don't reset the input field during composition.
 
 More careful restoration of selections in widgets, during editor redraw.
 
-[javascript mode](http://codemirror.net/mode/javascript/): More TypeScript parsing fixes.
+[javascript mode](https://codemirror.net/mode/javascript/): More TypeScript parsing fixes.
 
-[julia mode](http://codemirror.net/mode/julia/): Fix issue where the mode gets stuck.
+[julia mode](https://codemirror.net/mode/julia/): Fix issue where the mode gets stuck.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Understand cross-line links, parse all bracketed things as links.
+[markdown mode](https://codemirror.net/mode/markdown/): Understand cross-line links, parse all bracketed things as links.
 
-[soy mode](http://codemirror.net/mode/soy/): Support single-quoted strings.
+[soy mode](https://codemirror.net/mode/soy/): Support single-quoted strings.
 
-[go mode](http://codemirror.net/mode/go/): Don't try to indent inside strings or comments.
+[go mode](https://codemirror.net/mode/go/): Don't try to indent inside strings or comments.
 
 ### New features
 
-[vim bindings](http://codemirror.net/demo/vim.html): Parse line offsets in line or range specs.
+[vim bindings](https://codemirror.net/demo/vim.html): Parse line offsets in line or range specs.
 
 ## 5.25.2 (2017-04-20)
 
@@ -354,11 +354,11 @@ Make sure long-clicking a selection sets a cursor and doesn't show the editor lo
 
 Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Recognize annotations and TypeScript-style type parameters.
+[javascript mode](https://codemirror.net/mode/javascript/): Recognize annotations and TypeScript-style type parameters.
 
-[shell mode](http://codemirror.net/mode/shell/): Handle nested braces.
+[shell mode](https://codemirror.net/mode/shell/): Handle nested braces.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Make parsing of strong/em delimiters CommonMark-compliant.
+[markdown mode](https://codemirror.net/mode/markdown/): Make parsing of strong/em delimiters CommonMark-compliant.
 
 ## 5.25.0 (2017-03-20)
 
@@ -376,37 +376,37 @@ Fix handling of shadow DOM roots when finding the active element.
 
 Add `role=presentation` to more DOM elements to improve screen reader support.
 
-[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Make aligning of unchanged chunks more robust.
+[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Make aligning of unchanged chunks more robust.
 
-[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.
+[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+[javascript mode](https://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
 
-[r mode](http://codemirror.net/mode/r/): Fix indentation after semicolon-less statements.
+[r mode](https://codemirror.net/mode/r/): Fix indentation after semicolon-less statements.
 
-[shell mode](http://codemirror.net/mode/shell/): Properly handle escaped parentheses in parenthesized expressions.
+[shell mode](https://codemirror.net/mode/shell/): Properly handle escaped parentheses in parenthesized expressions.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Fix a few bugs around leaving fenced code blocks.
+[markdown mode](https://codemirror.net/mode/markdown/): Fix a few bugs around leaving fenced code blocks.
 
-[soy mode](http://codemirror.net/mode/soy/): Improve indentation.
+[soy mode](https://codemirror.net/mode/soy/): Improve indentation.
 
 ### New features
 
-[lint addon](http://codemirror.net/doc/manual.html#addon_lint): Support asynchronous linters that return promises.
+[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Support asynchronous linters that return promises.
 
-[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Support continuing task lists.
+[continuelist addon](https://codemirror.net/doc/manual.html#addon_continuelist): Support continuing task lists.
 
-[vim bindings](http://codemirror.net/demo/vim.html): Make Y behave like yy.
+[vim bindings](https://codemirror.net/demo/vim.html): Make Y behave like yy.
 
-[sql mode](http://codemirror.net/mode/sql/): Support sqlite dialect.
+[sql mode](https://codemirror.net/mode/sql/): Support sqlite dialect.
 
 ## 5.24.2 (2017-02-22)
 
 ### Bug fixes
 
-[javascript mode](http://codemirror.net/mode/javascript/): Support computed class method names.
+[javascript mode](https://codemirror.net/mode/javascript/): Support computed class method names.
 
-[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Improve aligning of unchanged code in the presence of marks and line widgets.
+[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Improve aligning of unchanged code in the presence of marks and line widgets.
 
 ## 5.24.0 (2017-02-20)
 
@@ -418,37 +418,37 @@ Visual cursor motion in line-wrapped right-to-left text should be much more corr
 
 Fix bug in handling of read-only marked text.
 
-[shell mode](http://codemirror.net/mode/shell/): Properly tokenize nested parentheses.
+[shell mode](https://codemirror.net/mode/shell/): Properly tokenize nested parentheses.
 
-[python mode](http://codemirror.net/mode/python/): Support underscores in number literals.
+[python mode](https://codemirror.net/mode/python/): Support underscores in number literals.
 
-[sass mode](http://codemirror.net/mode/sass/): Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset.
+[sass mode](https://codemirror.net/mode/sass/): Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset.
 
-[css mode](http://codemirror.net/mode/css/): Expose `lineComment` property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.
+[css mode](https://codemirror.net/mode/css/): Expose `lineComment` property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.
 
-[julia mode](http://codemirror.net/mode/julia/): Properly indent `elseif` lines.
+[julia mode](https://codemirror.net/mode/julia/): Properly indent `elseif` lines.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Properly recognize the end of fenced code blocks when inside other markup.
+[markdown mode](https://codemirror.net/mode/markdown/): Properly recognize the end of fenced code blocks when inside other markup.
 
-[scala mode](http://codemirror.net/mode/clike/): Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.
+[scala mode](https://codemirror.net/mode/clike/): Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.
 
-[xml mode](http://codemirror.net/mode/xml/): Allow dashes in HTML tag names.
+[xml mode](https://codemirror.net/mode/xml/): Allow dashes in HTML tag names.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Improve parsing of async methods, TypeScript-style comma-separated superclass lists.
+[javascript mode](https://codemirror.net/mode/javascript/): Improve parsing of async methods, TypeScript-style comma-separated superclass lists.
 
-[indent-fold addon](http://codemirror.net/demo/folding.html): Ignore comment lines.
+[indent-fold addon](https://codemirror.net/demo/folding.html): Ignore comment lines.
 
 ### New features
 
 Positions now support a `sticky` property which determines whether they should be associated with the character before (value `"before"`) or after (value `"after"`) them.
 
-[vim bindings](http://codemirror.net/demo/vim.html): Make it possible to remove built-in bindings through the API.
+[vim bindings](https://codemirror.net/demo/vim.html): Make it possible to remove built-in bindings through the API.
 
-[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.
+[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.
 
 ### Breaking changes
 
-The [sass mode](http://codemirror.net/mode/sass/) now depends on the [css mode](http://codemirror.net/mode/css/).
+The [sass mode](https://codemirror.net/mode/sass/) now depends on the [css mode](https://codemirror.net/mode/css/).
 
 ## 5.23.0 (2017-01-19)
 
@@ -456,15 +456,15 @@ The [sass mode](http://codemirror.net/mode/sass/) now depends on the [css mode](
 
 Presentation-related elements DOM elements are now marked as such to help screen readers.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Be more picky about what HTML tags look like to avoid false positives.
+[markdown mode](https://codemirror.net/mode/markdown/): Be more picky about what HTML tags look like to avoid false positives.
 
 ### New features
 
 `findModeByMIME` now understands `+json` and `+xml` MIME suffixes.
 
-[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Add support for an `override` option to ignore language-specific defaults.
+[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Add support for an `override` option to ignore language-specific defaults.
 
-[panel addon](http://codemirror.net/doc/manual.html#addon_panel): Add a `stable` option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.
+[panel addon](https://codemirror.net/doc/manual.html#addon_panel): Add a `stable` option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.
 
 ## 5.22.2 (2017-01-12)
 
@@ -476,49 +476,49 @@ Include rollup.config.js in NPM package, so that it can be used to build from so
 
 ### Bug fixes
 
-[sublime bindings](http://codemirror.net/demo/sublime.html): Make `selectBetweenBrackets` work with multiple cursors.
+[sublime bindings](https://codemirror.net/demo/sublime.html): Make `selectBetweenBrackets` work with multiple cursors.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Fix issues with parsing complex TypeScript types, imports, and exports.
+[javascript mode](https://codemirror.net/mode/javascript/): Fix issues with parsing complex TypeScript types, imports, and exports.
 
 A contentEditable editor instance with autofocus enabled no longer crashes during initializing.
 
 ### New features
 
-[emacs bindings](http://codemirror.net/demo/emacs.html): Export `CodeMirror.emacs` to allow other addons to hook into Emacs-style functionality.
+[emacs bindings](https://codemirror.net/demo/emacs.html): Export `CodeMirror.emacs` to allow other addons to hook into Emacs-style functionality.
 
-[active-line addon](http://codemirror.net/doc/manual.html#addon_active-line): Add `nonEmpty` option.
+[active-line addon](https://codemirror.net/doc/manual.html#addon_active-line): Add `nonEmpty` option.
 
-New event: [`optionChange`](http://codemirror.net/doc/manual.html#event_optionChange).
+New event: [`optionChange`](https://codemirror.net/doc/manual.html#event_optionChange).
 
 ## 5.21.0 (2016-11-21)
 
 ### Bug fixes
 
-Tapping/clicking the editor in [contentEditable mode](http://codemirror.net/doc/manual.html#option_inputStyle) on Chrome now puts the cursor at the tapped position.
+Tapping/clicking the editor in [contentEditable mode](https://codemirror.net/doc/manual.html#option_inputStyle) on Chrome now puts the cursor at the tapped position.
 
-Fix various crashes and misbehaviors when reading composition events in [contentEditable mode](http://codemirror.net/doc/manual.html#option_inputStyle).
+Fix various crashes and misbehaviors when reading composition events in [contentEditable mode](https://codemirror.net/doc/manual.html#option_inputStyle).
 
 Catches and ignores an IE 'Unspecified Error' when creating an editor in an iframe before there is a `<body>`.
 
-[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Fix several issues in the chunk-aligning feature.
+[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Fix several issues in the chunk-aligning feature.
 
-[verilog mode](http://codemirror.net/mode/verilog): Rewritten to address various issues.
+[verilog mode](https://codemirror.net/mode/verilog): Rewritten to address various issues.
 
-[julia mode](http://codemirror.net/mode/julia): Recognize Julia 0.5 syntax.
+[julia mode](https://codemirror.net/mode/julia): Recognize Julia 0.5 syntax.
 
-[swift mode](http://codemirror.net/mode/swift): Various fixes and adjustments to current syntax.
+[swift mode](https://codemirror.net/mode/swift): Various fixes and adjustments to current syntax.
 
-[markdown mode](http://codemirror.net/mode/markdown): Allow lists without a blank line above them.
+[markdown mode](https://codemirror.net/mode/markdown): Allow lists without a blank line above them.
 
 ### New features
 
-The [`setGutterMarker`](http://codemirror.net/doc/manual.html#setGutterMarker), [`clearGutter`](http://codemirror.net/doc/manual.html#clearGutter), and [`lineInfo`](http://codemirror.net/doc/manual.html#lineInfo) methods are now available on `Doc` objects.
+The [`setGutterMarker`](https://codemirror.net/doc/manual.html#setGutterMarker), [`clearGutter`](https://codemirror.net/doc/manual.html#clearGutter), and [`lineInfo`](https://codemirror.net/doc/manual.html#lineInfo) methods are now available on `Doc` objects.
 
-The [`heightAtLine`](http://codemirror.net/doc/manual.html#heightAtLine) method now takes an extra argument to allow finding the height at the top of the line's line widgets.
+The [`heightAtLine`](https://codemirror.net/doc/manual.html#heightAtLine) method now takes an extra argument to allow finding the height at the top of the line's line widgets.
 
-[ruby mode](http://codemirror.net/mode/ruby): `else` and `elsif` are now immediately indented.
+[ruby mode](https://codemirror.net/mode/ruby): `else` and `elsif` are now immediately indented.
 
-[vim bindings](http://codemirror.net/demo/vim.html): Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.
+[vim bindings](https://codemirror.net/demo/vim.html): Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.
 
 ## 5.20.2 (2016-10-21)
 
@@ -536,27 +536,27 @@ Make sure keypress events for backspace are ignored.
 
 Tokens styled with overlays no longer get a nonsense `cm-cm-overlay` class.
 
-Line endings for pasted content are now normalized to the editor's [preferred ending](http://codemirror.net/doc/manual.html#option_lineSeparator).
+Line endings for pasted content are now normalized to the editor's [preferred ending](https://codemirror.net/doc/manual.html#option_lineSeparator).
 
-[javascript mode](http://codemirror.net/mode/javascript): Improve support for class expressions. Support TypeScript optional class properties, the `abstract` keyword, and return type declarations for arrow functions.
+[javascript mode](https://codemirror.net/mode/javascript): Improve support for class expressions. Support TypeScript optional class properties, the `abstract` keyword, and return type declarations for arrow functions.
 
-[css mode](http://codemirror.net/mode/css): Fix highlighting of mixed-case keywords.
+[css mode](https://codemirror.net/mode/css): Fix highlighting of mixed-case keywords.
 
-[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Improve behavior when typing a quote before a string.
+[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Improve behavior when typing a quote before a string.
 
 ### New features
 
 The core is now maintained as a number of small files, using ES6 syntax and modules, under the `src/` directory. A git checkout no longer contains a working `codemirror.js` until you `npm build` (but when installing from NPM, it is included).
 
-The [`refresh`](http://codemirror.net/doc/manual.html#event_refresh) event is now documented and stable.
+The [`refresh`](https://codemirror.net/doc/manual.html#event_refresh) event is now documented and stable.
 
 ## 5.19.0 (2016-09-20)
 
 ### Bugfixes
 
-[erlang mode](http://codemirror.net/mode/erlang): Fix mode crash when trying to read an empty context.
+[erlang mode](https://codemirror.net/mode/erlang): Fix mode crash when trying to read an empty context.
 
-[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Fix broken behavior when toggling comments inside a comment.
+[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Fix broken behavior when toggling comments inside a comment.
 
 xml-fold addon: Fix a null-dereference bug.
 
@@ -566,43 +566,43 @@ Fix an issue where the cursor position could be off in really long (~8000 charac
 
 ### New features
 
-[javascript mode](http://codemirror.net/mode/javascript): Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the `type` keyword.
+[javascript mode](https://codemirror.net/mode/javascript): Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the `type` keyword.
 
-The [`blur`](http://codemirror.net/doc/manual.html#event_blur) and [`focus`](http://codemirror.net/doc/manual.html#event_focus) events now pass the DOM event to their handlers.
+The [`blur`](https://codemirror.net/doc/manual.html#event_blur) and [`focus`](https://codemirror.net/doc/manual.html#event_focus) events now pass the DOM event to their handlers.
 
 ## 5.18.2 (2016-08-23)
 
 ### Bugfixes
 
-[vue mode](http://codemirror.net/mode/vue): Fix outdated references to renamed Pug mode dependency.
+[vue mode](https://codemirror.net/mode/vue): Fix outdated references to renamed Pug mode dependency.
 
 ## 5.18.0 (2016-08-22)
 
 ### Bugfixes
 
-Make sure [gutter backgrounds](http://codemirror.net/doc/manual.html#addLineClass) stick to the rest of the gutter during horizontal scrolling.
+Make sure [gutter backgrounds](https://codemirror.net/doc/manual.html#addLineClass) stick to the rest of the gutter during horizontal scrolling.
 
-The contenteditable [`inputStyle`](http://codemirror.net/doc/manual.html#option_inputStyle) now properly supports pasting on pre-Edge IE versions.
+The contenteditable [`inputStyle`](https://codemirror.net/doc/manual.html#option_inputStyle) now properly supports pasting on pre-Edge IE versions.
 
-[javascript mode](http://codemirror.net/mode/javascript): Fix some small parsing bugs and improve TypeScript support.
+[javascript mode](https://codemirror.net/mode/javascript): Fix some small parsing bugs and improve TypeScript support.
 
-[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Fix bug where active highlighting was left in editor when the addon was disabled.
+[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Fix bug where active highlighting was left in editor when the addon was disabled.
 
-[match-highlighter addon](http://codemirror.net/doc/manual.html#addon_match-highlighter): Only start highlighting things when the editor gains focus.
+[match-highlighter addon](https://codemirror.net/doc/manual.html#addon_match-highlighter): Only start highlighting things when the editor gains focus.
 
-[javascript-hint addon](http://codemirror.net/doc/manual.html#addon_javascript-hint): Also complete non-enumerable properties.
+[javascript-hint addon](https://codemirror.net/doc/manual.html#addon_javascript-hint): Also complete non-enumerable properties.
 
 ### New features
 
-The [`addOverlay`](http://codemirror.net/doc/manual.html#addOverlay) method now supports a `priority` option to control the order in which overlays are applied.
+The [`addOverlay`](https://codemirror.net/doc/manual.html#addOverlay) method now supports a `priority` option to control the order in which overlays are applied.
 
 MIME types that end in `+json` now default to the JSON mode when the MIME itself is not defined.
 
 ### Breaking changes
 
-The mode formerly known as Jade was renamed to [Pug](http://codemirror.net/mode/pug).
+The mode formerly known as Jade was renamed to [Pug](https://codemirror.net/mode/pug).
 
-The [Python mode](http://codemirror.net/mode/python) now defaults to Python 3 (rather than 2) syntax.
+The [Python mode](https://codemirror.net/mode/python) now defaults to Python 3 (rather than 2) syntax.
 
 ## 5.17.0 (2016-07-19)
 
@@ -614,15 +614,15 @@ Prevent IME dialog from overlapping typed content in Chrome.
 
 Improve measuring of characters near a line wrap.
 
-[javascript mode](http://codemirror.net/mode/javascript): Improve support for `async`, allow trailing commas in `import` lists.
+[javascript mode](https://codemirror.net/mode/javascript): Improve support for `async`, allow trailing commas in `import` lists.
 
-[vim bindings](http://codemirror.net/demo/vim.html): Fix backspace in replace mode.
+[vim bindings](https://codemirror.net/demo/vim.html): Fix backspace in replace mode.
 
-[sublime bindings](http://codemirror.net/demo/sublime.html): Fix some key bindings on OS X to match Sublime Text.
+[sublime bindings](https://codemirror.net/demo/sublime.html): Fix some key bindings on OS X to match Sublime Text.
 
 ### New features
 
-[markdown mode](http://codemirror.net/mode/markdown): Add more classes to image links in highlight-formatting mode.
+[markdown mode](https://codemirror.net/mode/markdown): Add more classes to image links in highlight-formatting mode.
 
 ## 5.16.0 (2016-06-20)
 
@@ -634,15 +634,15 @@ Make Control-drag work on Firefox.
 
 Make clicking or selection-dragging at the end of a wrapped line select the right position.
 
-[show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint): Prevent widget scrollbar from hiding part of the hint text.
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Prevent widget scrollbar from hiding part of the hint text.
 
-[rulers addon](http://codemirror.net/doc/manual.html#addon_rulers): Prevent rulers from forcing a horizontal editor scrollbar.
+[rulers addon](https://codemirror.net/doc/manual.html#addon_rulers): Prevent rulers from forcing a horizontal editor scrollbar.
 
 ### New features
 
-[search addon](http://codemirror.net/doc/manual.html#addon_search): Automatically bind search-related keys in persistent dialog.
+[search addon](https://codemirror.net/doc/manual.html#addon_search): Automatically bind search-related keys in persistent dialog.
 
-[sublime keymap](http://codemirror.net/demo/sublime.html): Add a multi-cursor aware smart backspace binding.
+[sublime keymap](https://codemirror.net/demo/sublime.html): Add a multi-cursor aware smart backspace binding.
 
 ## 5.15.2 (2016-05-20)
 
@@ -664,17 +664,17 @@ Fix issue where the editor would complain about overlapping collapsed ranges whe
 
 Optimize document tree building when loading or pasting huge chunks of content.
 
-[markdown mode](http://codemirror.net/mode/markdown/): Fix several issues in matching link targets.
+[markdown mode](https://codemirror.net/mode/markdown/): Fix several issues in matching link targets.
 
-[clike mode](http://codemirror.net/mode/clike/): Improve indentation of C++ template declarations.
+[clike mode](https://codemirror.net/mode/clike/): Improve indentation of C++ template declarations.
 
 ### New features
 
 Explicitly bind Ctrl-O on OS X to make that binding (“open line”) act as expected.
 
-Pasting [linewise-copied](http://codemirror.net/doc/manual.html#option_lineWiseCopyCut) content when there is no selection now inserts the lines above the current line.
+Pasting [linewise-copied](https://codemirror.net/doc/manual.html#option_lineWiseCopyCut) content when there is no selection now inserts the lines above the current line.
 
-[javascript mode](http://codemirror.net/mode/javascript/): Support `async`/`await` and improve support for TypeScript type syntax.
+[javascript mode](https://codemirror.net/mode/javascript/): Support `async`/`await` and improve support for TypeScript type syntax.
 
 ## 5.14.2 (2016-04-20)
 
@@ -684,37 +684,37 @@ Push a new package to NPM due to an [NPM bug](https://github.com/npm/npm/issues/
 
 Set `dataTransfer.effectAllowed` in `dragstart` handler to help browsers use the right drag icon.
 
-Add the [mbox mode](http://codemirror.net/mode/mbox/index.html) to `mode/meta.js`.
+Add the [mbox mode](https://codemirror.net/mode/mbox/index.html) to `mode/meta.js`.
 
 ## 5.14.0 (2016-04-20)
 
 ### Bugfixes
 
-[`posFromIndex`](http://codemirror.net/doc/manual.html#posFromIndex) and [`indexFromPos`](http://codemirror.net/doc/manual.html#indexFromPos) now take [`lineSeparator`](http://codemirror.net/doc/manual.html#option_lineSeparator) into account.
+[`posFromIndex`](https://codemirror.net/doc/manual.html#posFromIndex) and [`indexFromPos`](https://codemirror.net/doc/manual.html#indexFromPos) now take [`lineSeparator`](https://codemirror.net/doc/manual.html#option_lineSeparator) into account.
 
-[vim bindings](http://codemirror.net/demo/vim.html): Only call `.save()` when it is actually available.
+[vim bindings](https://codemirror.net/demo/vim.html): Only call `.save()` when it is actually available.
 
-[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Be careful not to mangle multi-line strings.
+[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Be careful not to mangle multi-line strings.
 
-[Python mode](http://codemirror.net/mode/python/index.html): Improve distinguishing of decorators from `@` operators.
+[Python mode](https://codemirror.net/mode/python/index.html): Improve distinguishing of decorators from `@` operators.
 
-[`findMarks`](http://codemirror.net/doc/manual.html#findMarks): No longer return marks that touch but don't overlap given range.
+[`findMarks`](https://codemirror.net/doc/manual.html#findMarks): No longer return marks that touch but don't overlap given range.
 
 ### New features
 
-[vim bindings](http://codemirror.net/demo/vim.html): Add yank command.
+[vim bindings](https://codemirror.net/demo/vim.html): Add yank command.
 
-[match-highlighter addon](http://codemirror.net/doc/manual.html#addon_match-highlighter): Add `trim` option to disable ignoring of whitespace.
+[match-highlighter addon](https://codemirror.net/doc/manual.html#addon_match-highlighter): Add `trim` option to disable ignoring of whitespace.
 
-[PowerShell mode](http://codemirror.net/mode/powershell/index.html): Added.
+[PowerShell mode](https://codemirror.net/mode/powershell/index.html): Added.
 
-[Yacas mode](http://codemirror.net/mode/yacas/index.html): Added.
+[Yacas mode](https://codemirror.net/mode/yacas/index.html): Added.
 
-[Web IDL mode](http://codemirror.net/mode/webidl/index.html): Added.
+[Web IDL mode](https://codemirror.net/mode/webidl/index.html): Added.
 
-[SAS mode](http://codemirror.net/mode/sas/index.html): Added.
+[SAS mode](https://codemirror.net/mode/sas/index.html): Added.
 
-[mbox mode](http://codemirror.net/mode/mbox/index.html): Added.
+[mbox mode](https://codemirror.net/mode/mbox/index.html): Added.
 
 ## 5.13.2 (2016-03-23)
 
@@ -726,43 +726,43 @@ Solves a problem where the gutter would sometimes not extend all the way to the
 
 ### New features
 
-New DOM event forwarded: [`"dragleave"`](http://codemirror.net/doc/manual.html#event_dom).
+New DOM event forwarded: [`"dragleave"`](https://codemirror.net/doc/manual.html#event_dom).
 
-[protobuf mode](http://codemirror.net/mode/protobuf/index.html): Newly added.
+[protobuf mode](https://codemirror.net/mode/protobuf/index.html): Newly added.
 
 ### Bugfixes
 
-Fix problem where [`findMarks`](http://codemirror.net/doc/manual.html#findMarks) sometimes failed to find multi-line marks.
+Fix problem where [`findMarks`](https://codemirror.net/doc/manual.html#findMarks) sometimes failed to find multi-line marks.
 
 Fix crash that showed up when atomic ranges and bidi text were combined.
 
-[show-hint addon](http://codemirror.net/demo/complete.html): Completion widgets no longer close when the line indented or dedented.
+[show-hint addon](https://codemirror.net/demo/complete.html): Completion widgets no longer close when the line indented or dedented.
 
-[merge addon](http://codemirror.net/demo/merge.html): Fix bug when merging chunks at the end of the file.
+[merge addon](https://codemirror.net/demo/merge.html): Fix bug when merging chunks at the end of the file.
 
-[placeholder addon](http://codemirror.net/doc/manual.html#addon_placeholder): No longer gets confused by [`swapDoc`](http://codemirror.net/doc/manual.html#swapDoc).
+[placeholder addon](https://codemirror.net/doc/manual.html#addon_placeholder): No longer gets confused by [`swapDoc`](https://codemirror.net/doc/manual.html#swapDoc).
 
-[simplescrollbars addon](http://codemirror.net/doc/manual.html#addon_simplescrollbars): Fix invalid state when deleting at end of document.
+[simplescrollbars addon](https://codemirror.net/doc/manual.html#addon_simplescrollbars): Fix invalid state when deleting at end of document.
 
-[clike mode](http://codemirror.net/mode/clike/index.html): No longer gets confused when a comment starts after an operator.
+[clike mode](https://codemirror.net/mode/clike/index.html): No longer gets confused when a comment starts after an operator.
 
-[markdown mode](http://codemirror.net/mode/markdown/index.html): Now supports CommonMark-style flexible list indentation.
+[markdown mode](https://codemirror.net/mode/markdown/index.html): Now supports CommonMark-style flexible list indentation.
 
-[dylan mode](http://codemirror.net/mode/dylan/index.html): Several improvements and fixes.
+[dylan mode](https://codemirror.net/mode/dylan/index.html): Several improvements and fixes.
 
 ## 5.12.0 (2016-02-19)
 
 ### New features
 
-[Vim bindings](http://codemirror.net/demo/vim.html): Ctrl-Q is now an alias for Ctrl-V.
+[Vim bindings](https://codemirror.net/demo/vim.html): Ctrl-Q is now an alias for Ctrl-V.
 
-[Vim bindings](http://codemirror.net/demo/vim.html): The Vim API now exposes an `unmap` method to unmap bindings.
+[Vim bindings](https://codemirror.net/demo/vim.html): The Vim API now exposes an `unmap` method to unmap bindings.
 
-[active-line addon](http://codemirror.net/demo/activeline.html): This addon can now style the active line's gutter.
+[active-line addon](https://codemirror.net/demo/activeline.html): This addon can now style the active line's gutter.
 
-[FCL mode](http://codemirror.net/mode/fcl/): Newly added.
+[FCL mode](https://codemirror.net/mode/fcl/): Newly added.
 
-[SQL mode](http://codemirror.net/mode/sql/): Now has a Postgresql dialect.
+[SQL mode](https://codemirror.net/mode/sql/): Now has a Postgresql dialect.
 
 ### Bugfixes
 
@@ -774,147 +774,147 @@ Solve a [problem](https://github.com/codemirror/CodeMirror/issues/3821) where th
 
 Fix a [bug](https://github.com/codemirror/CodeMirror/issues/3834) that caused phantom scroll space under the text in some situations.
 
-[Sublime Text bindings](http://codemirror.net/demo/sublime.html): Bind delete-line to Shift-Ctrl-K on OS X.
+[Sublime Text bindings](https://codemirror.net/demo/sublime.html): Bind delete-line to Shift-Ctrl-K on OS X.
 
-[Markdown mode](http://codemirror.net/mode/markdown/): Fix [issue](https://github.com/codemirror/CodeMirror/issues/3787) where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.
+[Markdown mode](https://codemirror.net/mode/markdown/): Fix [issue](https://github.com/codemirror/CodeMirror/issues/3787) where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.
 
-[Markdown mode](http://codemirror.net/mode/markdown/): Ignore backslashes in code fragments.
+[Markdown mode](https://codemirror.net/mode/markdown/): Ignore backslashes in code fragments.
 
-[Markdown mode](http://codemirror.net/mode/markdown/): Use whichever mode is registered as `text/html` to parse HTML.
+[Markdown mode](https://codemirror.net/mode/markdown/): Use whichever mode is registered as `text/html` to parse HTML.
 
-[Clike mode](http://codemirror.net/mode/clike/): Improve indentation of Scala `=>` functions.
+[Clike mode](https://codemirror.net/mode/clike/): Improve indentation of Scala `=>` functions.
 
-[Python mode](http://codemirror.net/mode/python/): Improve indentation of bracketed code.
+[Python mode](https://codemirror.net/mode/python/): Improve indentation of bracketed code.
 
-[HTMLMixed mode](http://codemirror.net/mode/htmlmixed/): Support multi-line opening tags for sub-languages (`<script>`, `<style>`, etc).
+[HTMLMixed mode](https://codemirror.net/mode/htmlmixed/): Support multi-line opening tags for sub-languages (`<script>`, `<style>`, etc).
 
-[Spreadsheet mode](http://codemirror.net/mode/spreadsheet/): Fix bug where the mode did not advance the stream when finding a backslash.
+[Spreadsheet mode](https://codemirror.net/mode/spreadsheet/): Fix bug where the mode did not advance the stream when finding a backslash.
 
-[XML mode](http://codemirror.net/mode/xml/): The mode now takes a `matchClosing` option to configure whether mismatched closing tags should be highlighted as errors.
+[XML mode](https://codemirror.net/mode/xml/): The mode now takes a `matchClosing` option to configure whether mismatched closing tags should be highlighted as errors.
 
 ## 5.11.0 (2016-01-20)
 
-* New modes: [JSX](http://codemirror.net/mode/jsx/index.html), [literate Haskell](http://codemirror.net/mode/haskell-literate/index.html)
-* The editor now forwards more [DOM events](http://codemirror.net/doc/manual.html#event_dom): `cut`, `copy`, `paste`, and `touchstart`. It will also forward `mousedown` for drag events
+* New modes: [JSX](https://codemirror.net/mode/jsx/index.html), [literate Haskell](https://codemirror.net/mode/haskell-literate/index.html)
+* The editor now forwards more [DOM events](https://codemirror.net/doc/manual.html#event_dom): `cut`, `copy`, `paste`, and `touchstart`. It will also forward `mousedown` for drag events
 * Fixes a bug where bookmarks next to collapsed spans were not rendered
-* The [Swift](http://codemirror.net/mode/swift/index.html) mode now supports auto-indentation
-* Frontmatters in the [YAML frontmatter](http://codemirror.net/mode/yaml-frontmatter/index.html) mode are now optional as intended
+* The [Swift](https://codemirror.net/mode/swift/index.html) mode now supports auto-indentation
+* Frontmatters in the [YAML frontmatter](https://codemirror.net/mode/yaml-frontmatter/index.html) mode are now optional as intended
 
 ## 5.10.0 (2015-12-21)
 
-* Modify the way [atomic ranges](http://codemirror.net/doc/manual.html#mark_atomic) are skipped by selection to try and make it less surprising.
-* The [Swift mode](http://codemirror.net/mode/swift/index.html) was rewritten.
-* New addon: [jump-to-line](http://codemirror.net/doc/manual.html#addon_jump-to-line).
-* New method: [`isReadOnly`](http://codemirror.net/doc/manual.html#isReadOnly).
-* The [show-hint addon](http://codemirror.net/doc/manual.html#addon_show-hint) now defaults to picking completions on single click.
-* The object passed to [`"beforeSelectionChange"`](http://codemirror.net/doc/manual.html#event_beforeSelectionChange) events now has an `origin` property.
-* New mode: [Crystal](http://codemirror.net/mode/crystal/index.html).
+* Modify the way [atomic ranges](https://codemirror.net/doc/manual.html#mark_atomic) are skipped by selection to try and make it less surprising.
+* The [Swift mode](https://codemirror.net/mode/swift/index.html) was rewritten.
+* New addon: [jump-to-line](https://codemirror.net/doc/manual.html#addon_jump-to-line).
+* New method: [`isReadOnly`](https://codemirror.net/doc/manual.html#isReadOnly).
+* The [show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint) now defaults to picking completions on single click.
+* The object passed to [`"beforeSelectionChange"`](https://codemirror.net/doc/manual.html#event_beforeSelectionChange) events now has an `origin` property.
+* New mode: [Crystal](https://codemirror.net/mode/crystal/index.html).
 
 ## 5.9.0 (2015-11-23)
 
 * Improve the way overlay (OS X-style) scrollbars are handled
-* Make [annotatescrollbar](http://codemirror.net/doc/manual.html#addon_annotatescrollbar) and scrollpastend addons work properly together
-* Make [show-hint](http://codemirror.net/doc/manual.html#addon_show-hint) addon select options on single click by default, move selection to hovered item
+* Make [annotatescrollbar](https://codemirror.net/doc/manual.html#addon_annotatescrollbar) and scrollpastend addons work properly together
+* Make [show-hint](https://codemirror.net/doc/manual.html#addon_show-hint) addon select options on single click by default, move selection to hovered item
 * Properly fold comments that include block-comment-start markers
 * Many small language mode fixes
 
 ## 5.8.0 (2015-10-20)
 
-* Fixes an infinite loop in the [hardwrap addon](http://codemirror.net/doc/manual.html#addon_hardwrap)
-* New modes: [NSIS](http://codemirror.net/mode/nsis/index.html), [Ceylon](http://codemirror.net/mode/clike/index.html)
-* The Kotlin mode is now a [clike](http://codemirror.net/mode/clike/index.html) dialect, rather than a stand-alone mode
-* New option: [`allowDropFileTypes`](http://codemirror.net/doc/manual.html#option_allowDropFileTypes). Binary files can no longer be dropped into CodeMirror
-* New themes: [bespin](http://codemirror.net/demo/theme.html#bespin), [hopscotch](http://codemirror.net/demo/theme.html#hopscotch), [isotope](http://codemirror.net/demo/theme.html#isotope), [railscasts](http://codemirror.net/demo/theme.html#railscasts)
+* Fixes an infinite loop in the [hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap)
+* New modes: [NSIS](https://codemirror.net/mode/nsis/index.html), [Ceylon](https://codemirror.net/mode/clike/index.html)
+* The Kotlin mode is now a [clike](https://codemirror.net/mode/clike/index.html) dialect, rather than a stand-alone mode
+* New option: [`allowDropFileTypes`](https://codemirror.net/doc/manual.html#option_allowDropFileTypes). Binary files can no longer be dropped into CodeMirror
+* New themes: [bespin](https://codemirror.net/demo/theme.html#bespin), [hopscotch](https://codemirror.net/demo/theme.html#hopscotch), [isotope](https://codemirror.net/demo/theme.html#isotope), [railscasts](https://codemirror.net/demo/theme.html#railscasts)
 
 ## 5.7.0 (2015-09-21)
 
-* New modes: [Vue](http://codemirror.net/mode/vue/index.html), [Oz](http://codemirror.net/mode/oz/index.html), [MscGen](http://codemirror.net/mode/mscgen/index.html) (and dialects), [Closure Stylesheets](http://codemirror.net/mode/css/gss.html)
-* Implement [CommonMark](http://commonmark.org)-style flexible list indent and cross-line code spans in [Markdown](http://codemirror.net/mode/markdown/index.html) mode
-* Add a replace-all button to the [search addon](http://codemirror.net/doc/manual.html#addon_search), and make the persistent search dialog transparent when it obscures the match
-* Handle `acync`/`await` and ocal and binary numbers in [JavaScript mode](http://codemirror.net/mode/javascript/index.html)
-* Fix various issues with the [Haxe mode](http://codemirror.net/mode/haxe/index.html)
-* Make the [closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets) select only the wrapped text when wrapping selection in brackets
-* Tokenize properties as properties in the [CoffeeScript mode](http://codemirror.net/mode/coffeescript/index.html)
-* The [placeholder addon](http://codemirror.net/doc/manual.html#addon_placeholder) now accepts a DOM node as well as a string placeholder
+* New modes: [Vue](https://codemirror.net/mode/vue/index.html), [Oz](https://codemirror.net/mode/oz/index.html), [MscGen](https://codemirror.net/mode/mscgen/index.html) (and dialects), [Closure Stylesheets](https://codemirror.net/mode/css/gss.html)
+* Implement [CommonMark](http://commonmark.org)-style flexible list indent and cross-line code spans in [Markdown](https://codemirror.net/mode/markdown/index.html) mode
+* Add a replace-all button to the [search addon](https://codemirror.net/doc/manual.html#addon_search), and make the persistent search dialog transparent when it obscures the match
+* Handle `acync`/`await` and ocal and binary numbers in [JavaScript mode](https://codemirror.net/mode/javascript/index.html)
+* Fix various issues with the [Haxe mode](https://codemirror.net/mode/haxe/index.html)
+* Make the [closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets) select only the wrapped text when wrapping selection in brackets
+* Tokenize properties as properties in the [CoffeeScript mode](https://codemirror.net/mode/coffeescript/index.html)
+* The [placeholder addon](https://codemirror.net/doc/manual.html#addon_placeholder) now accepts a DOM node as well as a string placeholder
 
 ## 5.6.0 (2015-08-20)
 
 * Fix bug where you could paste into a `readOnly` editor
 * Show a cursor at the drop location when dragging over the editor
-* The [Rust mode](http://codemirror.net/mode/rust/index.html) was rewritten to handle modern Rust
+* The [Rust mode](https://codemirror.net/mode/rust/index.html) was rewritten to handle modern Rust
 * The editor and theme CSS was cleaned up. Some selectors are now less specific than before
-* New theme: [abcdef](http://codemirror.net/demo/theme.html#abcdef)
-* Lines longer than [`maxHighlightLength`](http://codemirror.net/doc/manual.html#option_maxHighlightLength) are now less likely to mess up indentation
-* New addons: [`autorefresh`](http://codemirror.net/doc/manual.html#addon_autorefresh) for refreshing an editor the first time it becomes visible, and `html-lint` for using [HTMLHint](http://htmlhint.com/)
-* The [`search`](http://codemirror.net/doc/manual.html#addon_search) addon now recognizes `\r` and `\n` in pattern and replacement input
+* New theme: [abcdef](https://codemirror.net/demo/theme.html#abcdef)
+* Lines longer than [`maxHighlightLength`](https://codemirror.net/doc/manual.html#option_maxHighlightLength) are now less likely to mess up indentation
+* New addons: [`autorefresh`](https://codemirror.net/doc/manual.html#addon_autorefresh) for refreshing an editor the first time it becomes visible, and `html-lint` for using [HTMLHint](http://htmlhint.com/)
+* The [`search`](https://codemirror.net/doc/manual.html#addon_search) addon now recognizes `\r` and `\n` in pattern and replacement input
 
 ## 5.5.0 (2015-07-20)
 
-*   New option: [`lineSeparator`](http://codemirror.net/doc/manual.html#option_lineSeparator) (with corresponding [method](http://codemirror.net/doc/manual.html#lineSeparator))
-*   New themes: [dracula](http://codemirror.net/demo/theme.html#dracula), [seti](http://codemirror.net/demo/theme.html#seti), [yeti](http://codemirror.net/demo/theme.html#yeti), [material](http://codemirror.net/demo/theme.html#material), and [icecoder](http://codemirror.net/demo/theme.html#icecoder)
-*   New modes: [Brainfuck](http://codemirror.net/mode/brainfuck/index.html), [VHDL](http://codemirror.net/mode/vhdl/index.html), Squirrel ([clike](http://codemirror.net/mode/clike/index.html) dialect)
-*   Define a `findPersistent` command in the [search](http://codemirror.net/demo/search.html) addon, for a dialog that stays open as you cycle through matches
+*   New option: [`lineSeparator`](https://codemirror.net/doc/manual.html#option_lineSeparator) (with corresponding [method](https://codemirror.net/doc/manual.html#lineSeparator))
+*   New themes: [dracula](https://codemirror.net/demo/theme.html#dracula), [seti](https://codemirror.net/demo/theme.html#seti), [yeti](https://codemirror.net/demo/theme.html#yeti), [material](https://codemirror.net/demo/theme.html#material), and [icecoder](https://codemirror.net/demo/theme.html#icecoder)
+*   New modes: [Brainfuck](https://codemirror.net/mode/brainfuck/index.html), [VHDL](https://codemirror.net/mode/vhdl/index.html), Squirrel ([clike](https://codemirror.net/mode/clike/index.html) dialect)
+*   Define a `findPersistent` command in the [search](https://codemirror.net/demo/search.html) addon, for a dialog that stays open as you cycle through matches
 *   From this release on, the NPM module doesn't include documentation and demos
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.4.0...5.5.0)
 
 ## 5.4.0 (2015-06-25)
 
-*   New modes: [Twig](http://codemirror.net/mode/twig/index.html), [Elm](http://codemirror.net/mode/elm/index.html), [Factor](http://codemirror.net/mode/factor/index.html), [Swift](http://codemirror.net/mode/swift/index.html)
+*   New modes: [Twig](https://codemirror.net/mode/twig/index.html), [Elm](https://codemirror.net/mode/elm/index.html), [Factor](https://codemirror.net/mode/factor/index.html), [Swift](https://codemirror.net/mode/swift/index.html)
 *   Prefer clipboard API (if available) when pasting
-*   Refined definition highlighting in [clike](http://codemirror.net/mode/clike/index.html) mode
+*   Refined definition highlighting in [clike](https://codemirror.net/mode/clike/index.html) mode
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.3.0...5.4.0)
 
 ## 5.3.0 (2015-05-20)
 
-*   Fix several regressions in the [`show-hint`](http://codemirror.net/doc/manual.html#addon_show-hint) addon (`completeSingle` option, `"shown"` and `"close"` events)
-*   The [vim mode](http://codemirror.net/demo/vim.html) API was [documented](http://codemirror.net/doc/manual.html#vimapi)
-*   New modes: [ASN.1](http://codemirror.net/mode/asn.1/index.html), [TTCN](http://codemirror.net/mode/ttcn/index.html), and [TTCN-CFG](http://codemirror.net/mode/ttcn-cfg/index.html)
-*   The [clike](http://codemirror.net/mode/clike/index.html) mode can now deep-indent `switch` statements, and roughly recognizes types and defined identifiers
+*   Fix several regressions in the [`show-hint`](https://codemirror.net/doc/manual.html#addon_show-hint) addon (`completeSingle` option, `"shown"` and `"close"` events)
+*   The [vim mode](https://codemirror.net/demo/vim.html) API was [documented](https://codemirror.net/doc/manual.html#vimapi)
+*   New modes: [ASN.1](https://codemirror.net/mode/asn.1/index.html), [TTCN](https://codemirror.net/mode/ttcn/index.html), and [TTCN-CFG](https://codemirror.net/mode/ttcn-cfg/index.html)
+*   The [clike](https://codemirror.net/mode/clike/index.html) mode can now deep-indent `switch` statements, and roughly recognizes types and defined identifiers
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.2.0...5.3.0)
 
 ## 5.2.0 (2015-04-20)
 
-*   Fix several race conditions in [`show-hint`](http://codemirror.net/doc/manual.html#addon_show-hint)'s asynchronous mode
-*   Fix backspace binding in [Sublime bindings](http://codemirror.net/demo/sublime.html)
-*   Change the way IME is handled in the `"textarea"` [input style](http://codemirror.net/doc/manual.html#option_inputStyle)
-*   New modes: [MUMPS](http://codemirror.net/mode/mumps/index.html), [Handlebars](http://codemirror.net/mode/handlebars/index.html)
-*   Rewritten modes: [Django](http://codemirror.net/mode/django/index.html), [Z80](http://codemirror.net/mode/z80/index.html)
-*   New theme: [Liquibyte](http://codemirror.net/demo/theme.html#liquibyte)
-*   New option: [`lineWiseCopyCut`](http://codemirror.net/doc/manual.html#option_lineWiseCopyCut)
-*   The [Vim mode](http://codemirror.net/demo/vim.html) now supports buffer-local options and the `filetype` setting
+*   Fix several race conditions in [`show-hint`](https://codemirror.net/doc/manual.html#addon_show-hint)'s asynchronous mode
+*   Fix backspace binding in [Sublime bindings](https://codemirror.net/demo/sublime.html)
+*   Change the way IME is handled in the `"textarea"` [input style](https://codemirror.net/doc/manual.html#option_inputStyle)
+*   New modes: [MUMPS](https://codemirror.net/mode/mumps/index.html), [Handlebars](https://codemirror.net/mode/handlebars/index.html)
+*   Rewritten modes: [Django](https://codemirror.net/mode/django/index.html), [Z80](https://codemirror.net/mode/z80/index.html)
+*   New theme: [Liquibyte](https://codemirror.net/demo/theme.html#liquibyte)
+*   New option: [`lineWiseCopyCut`](https://codemirror.net/doc/manual.html#option_lineWiseCopyCut)
+*   The [Vim mode](https://codemirror.net/demo/vim.html) now supports buffer-local options and the `filetype` setting
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.1.0...5.2.0)
 
 ## 5.1.0 (2015-03-23)
 
-*   New modes: [ASCII armor](http://codemirror.net/mode/asciiarmor/index.html) (PGP data), [Troff](http://codemirror.net/mode/troff/index.html), and [CMake](http://codemirror.net/mode/cmake/index.html).
-*   Remove SmartyMixed mode, rewrite [Smarty](http://codemirror.net/mode/smarty/index.html) mode to supersede it.
-*   New commands in the [merge addon](http://codemirror.net/doc/manual.html#addon_merge): `goNextDiff` and `goPrevDiff`.
-*   The [closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets) can now be configured per mode.
+*   New modes: [ASCII armor](https://codemirror.net/mode/asciiarmor/index.html) (PGP data), [Troff](https://codemirror.net/mode/troff/index.html), and [CMake](https://codemirror.net/mode/cmake/index.html).
+*   Remove SmartyMixed mode, rewrite [Smarty](https://codemirror.net/mode/smarty/index.html) mode to supersede it.
+*   New commands in the [merge addon](https://codemirror.net/doc/manual.html#addon_merge): `goNextDiff` and `goPrevDiff`.
+*   The [closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets) can now be configured per mode.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.0.0...5.1.0).
 
 ## 5.0.0 (2015-02-20)
 
 *   Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)
-*   New option [`inputStyle`](http://codemirror.net/doc/manual.html#option_inputStyle) to switch between hidden textarea and contenteditable input.
-*   The [`getInputField`](http://codemirror.net/doc/manual.html#getInputField) method is no longer guaranteed to return a textarea.
+*   New option [`inputStyle`](https://codemirror.net/doc/manual.html#option_inputStyle) to switch between hidden textarea and contenteditable input.
+*   The [`getInputField`](https://codemirror.net/doc/manual.html#getInputField) method is no longer guaranteed to return a textarea.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.13.0...5.0.0).
 
 ## 4.13.0 (2015-02-20)
 
-*   Fix the way the [`closetag`](http://codemirror.net/demo/closetag.html) demo handles the slash character.
-*   New modes: [Forth](http://codemirror.net/mode/forth/index.html), [Stylus](http://codemirror.net/mode/stylus/index.html).
-*   Make the [CSS mode](http://codemirror.net/mode/css/index.html) understand some modern CSS extensions.
-*   Have the [Scala mode](http://codemirror.net/mode/clike/index.html) handle symbols and triple-quoted strings.
+*   Fix the way the [`closetag`](https://codemirror.net/demo/closetag.html) demo handles the slash character.
+*   New modes: [Forth](https://codemirror.net/mode/forth/index.html), [Stylus](https://codemirror.net/mode/stylus/index.html).
+*   Make the [CSS mode](https://codemirror.net/mode/css/index.html) understand some modern CSS extensions.
+*   Have the [Scala mode](https://codemirror.net/mode/clike/index.html) handle symbols and triple-quoted strings.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0).
 
 ## 4.12.0 (2015-01-22)
 
-*   The [`closetag`](http://codemirror.net/doc/manual.html#addon_closetag) addon now defines a `"closeTag"` command.
-*   Adds a `findModeByFileName` to the [mode metadata](http://codemirror.net/doc/manual.html#addon_meta) addon.
-*   [Simple mode](http://codemirror.net/demo/simplemode.html) rules can now contain a `sol` property to only match at the start of a line.
-*   New addon: [`selection-pointer`](http://codemirror.net/doc/manual.html#addon_selection-pointer) to style the mouse cursor over the selection.
-*   Improvements to the [Sass mode](http://codemirror.net/mode/sass/index.html)'s indentation.
-*   The [Vim keymap](http://codemirror.net/demo/vim.html)'s search functionality now supports [scrollbar annotation](http://codemirror.net/doc/manual.html#addon_matchesonscrollbar).
+*   The [`closetag`](https://codemirror.net/doc/manual.html#addon_closetag) addon now defines a `"closeTag"` command.
+*   Adds a `findModeByFileName` to the [mode metadata](https://codemirror.net/doc/manual.html#addon_meta) addon.
+*   [Simple mode](https://codemirror.net/demo/simplemode.html) rules can now contain a `sol` property to only match at the start of a line.
+*   New addon: [`selection-pointer`](https://codemirror.net/doc/manual.html#addon_selection-pointer) to style the mouse cursor over the selection.
+*   Improvements to the [Sass mode](https://codemirror.net/mode/sass/index.html)'s indentation.
+*   The [Vim keymap](https://codemirror.net/demo/vim.html)'s search functionality now supports [scrollbar annotation](https://codemirror.net/doc/manual.html#addon_matchesonscrollbar).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.11.0...4.12.0).
 
 ## 4.11.0 (2015-01-09)
@@ -927,65 +927,65 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 
 ## 4.9.0 (2014-12-23)
 
-*   Overhauled scroll bar handling. Add pluggable [scrollbar implementations](http://codemirror.net/demo/simplescrollbars.html).
-*   Tweaked behavior for the [completion addons](http://codemirror.net/doc/manual.html#addon_show-hint) to not take text after cursor into account.
-*   Two new optional features in the [merge addon](http://codemirror.net/doc/manual.html#addon_merge): aligning editors, and folding unchanged text.
-*   New modes: [Dart](http://codemirror.net/mode/dart/index.html), [EBNF](http://codemirror.net/mode/ebnf/index.html), [spreadsheet](http://codemirror.net/mode/spreadsheet/index.html), and [Soy](http://codemirror.net/mode/soy/index.html).
-*   New [addon](http://codemirror.net/demo/panel.html) to show persistent panels below/above an editor.
-*   New themes: [zenburn](http://codemirror.net/demo/theme.html#zenburn) and [tomorrow night bright](http://codemirror.net/demo/theme.html#tomorrow-night-bright).
+*   Overhauled scroll bar handling. Add pluggable [scrollbar implementations](https://codemirror.net/demo/simplescrollbars.html).
+*   Tweaked behavior for the [completion addons](https://codemirror.net/doc/manual.html#addon_show-hint) to not take text after cursor into account.
+*   Two new optional features in the [merge addon](https://codemirror.net/doc/manual.html#addon_merge): aligning editors, and folding unchanged text.
+*   New modes: [Dart](https://codemirror.net/mode/dart/index.html), [EBNF](https://codemirror.net/mode/ebnf/index.html), [spreadsheet](https://codemirror.net/mode/spreadsheet/index.html), and [Soy](https://codemirror.net/mode/soy/index.html).
+*   New [addon](https://codemirror.net/demo/panel.html) to show persistent panels below/above an editor.
+*   New themes: [zenburn](https://codemirror.net/demo/theme.html#zenburn) and [tomorrow night bright](https://codemirror.net/demo/theme.html#tomorrow-night-bright).
 *   Allow ctrl-click to clear existing cursors.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.8.0...4.9.0).
 
 ## 4.8.0 (2014-11-22)
 
-*   Built-in support for [multi-stroke key bindings](http://codemirror.net/doc/manual.html#normalizeKeyMap).
-*   New method: [`getLineTokens`](http://codemirror.net/doc/manual.html#getLineTokens).
-*   New modes: [dockerfile](http://codemirror.net/mode/dockerfile/index.html), [IDL](http://codemirror.net/mode/idl/index.html), [Objective C](http://codemirror.net/mode/clike/index.html) (crude).
-*   Support styling of gutter backgrounds, allow `"gutter"` styles in [`addLineClass`](http://codemirror.net/doc/manual.html#addLineClass).
-*   Many improvements to the [Vim mode](http://codemirror.net/demo/vim.html), rewritten visual mode.
-*   Improvements to modes: [gfm](http://codemirror.net/mode/gfm/index.html) (strikethrough), [SPARQL](http://codemirror.net/mode/sparql/index.html) (version 1.1 support), and [sTeX](http://codemirror.net/mode/stex/index.html) (no more runaway math mode).
+*   Built-in support for [multi-stroke key bindings](https://codemirror.net/doc/manual.html#normalizeKeyMap).
+*   New method: [`getLineTokens`](https://codemirror.net/doc/manual.html#getLineTokens).
+*   New modes: [dockerfile](https://codemirror.net/mode/dockerfile/index.html), [IDL](https://codemirror.net/mode/idl/index.html), [Objective C](https://codemirror.net/mode/clike/index.html) (crude).
+*   Support styling of gutter backgrounds, allow `"gutter"` styles in [`addLineClass`](https://codemirror.net/doc/manual.html#addLineClass).
+*   Many improvements to the [Vim mode](https://codemirror.net/demo/vim.html), rewritten visual mode.
+*   Improvements to modes: [gfm](https://codemirror.net/mode/gfm/index.html) (strikethrough), [SPARQL](https://codemirror.net/mode/sparql/index.html) (version 1.1 support), and [sTeX](https://codemirror.net/mode/stex/index.html) (no more runaway math mode).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.7.0...4.8.0).
 
 ## 4.7.0 (2014-10-20)
 
-*   **Incompatible**: The [lint addon](http://codemirror.net/demo/lint.html) now passes the editor's value as first argument to asynchronous lint functions, for consistency. The editor is still passed, as fourth argument.
+*   **Incompatible**: The [lint addon](https://codemirror.net/demo/lint.html) now passes the editor's value as first argument to asynchronous lint functions, for consistency. The editor is still passed, as fourth argument.
 *   Improved handling of unicode identifiers in modes for languages that support them.
-*   More mode improvements: [CoffeeScript](http://codemirror.net/mode/coffeescript/index.html) (indentation), [Verilog](http://codemirror.net/mode/verilog/index.html) (indentation), [Scala](http://codemirror.net/mode/clike/index.html) (indentation, triple-quoted strings), and [PHP](http://codemirror.net/mode/php/index.html) (interpolated variables in heredoc strings).
-*   New modes: [Textile](http://codemirror.net/mode/textile/index.html) and [Tornado templates](http://codemirror.net/mode/tornado/index.html).
-*   Experimental new [way to define modes](http://codemirror.net/demo/simplemode.html).
-*   Improvements to the [Vim bindings](http://codemirror.net/demo/vim.html): Arbitrary insert mode key mappings are now possible, and text objects are supported in visual mode.
-*   The mode [meta-information file](http://codemirror.net/mode/meta.js) now includes information about file extensions, and [helper functions](http://codemirror.net/doc/manual.html#addon_meta) `findModeByMIME` and `findModeByExtension`.
+*   More mode improvements: [CoffeeScript](https://codemirror.net/mode/coffeescript/index.html) (indentation), [Verilog](https://codemirror.net/mode/verilog/index.html) (indentation), [Scala](https://codemirror.net/mode/clike/index.html) (indentation, triple-quoted strings), and [PHP](https://codemirror.net/mode/php/index.html) (interpolated variables in heredoc strings).
+*   New modes: [Textile](https://codemirror.net/mode/textile/index.html) and [Tornado templates](https://codemirror.net/mode/tornado/index.html).
+*   Experimental new [way to define modes](https://codemirror.net/demo/simplemode.html).
+*   Improvements to the [Vim bindings](https://codemirror.net/demo/vim.html): Arbitrary insert mode key mappings are now possible, and text objects are supported in visual mode.
+*   The mode [meta-information file](https://codemirror.net/mode/meta.js) now includes information about file extensions, and [helper functions](https://codemirror.net/doc/manual.html#addon_meta) `findModeByMIME` and `findModeByExtension`.
 *   New logo!
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.6.0...4.7.0).
 
 ## 4.6.0 (2014-09-19)
 
-*   New mode: [Modelica](http://codemirror.net/mode/modelica/index.html)
-*   New method: [`findWordAt`](http://codemirror.net/doc/manual.html#findWordAt)
-*   Make it easier to [use text background styling](http://codemirror.net/demo/markselection.html)
+*   New mode: [Modelica](https://codemirror.net/mode/modelica/index.html)
+*   New method: [`findWordAt`](https://codemirror.net/doc/manual.html#findWordAt)
+*   Make it easier to [use text background styling](https://codemirror.net/demo/markselection.html)
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.5.0...4.6.0).
 
 ## 4.5.0 (2014-08-21)
 
 *   Fix several serious bugs with horizontal scrolling
-*   New mode: [Slim](http://codemirror.net/mode/slim/index.html)
-*   New command: [`goLineLeftSmart`](http://codemirror.net/doc/manual.html#command_goLineLeftSmart)
-*   More fixes and extensions for the [Vim](http://codemirror.net/demo/vim.html) visual block mode
+*   New mode: [Slim](https://codemirror.net/mode/slim/index.html)
+*   New command: [`goLineLeftSmart`](https://codemirror.net/doc/manual.html#command_goLineLeftSmart)
+*   More fixes and extensions for the [Vim](https://codemirror.net/demo/vim.html) visual block mode
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.4.0...4.5.0).
 
 ## 4.4.0 (2014-07-21)
 
 *   **Note:** Some events might now fire in slightly different order (`"change"` is still guaranteed to fire before `"cursorActivity"`)
 *   Nested operations in multiple editors are now synced (complete at same time, reducing DOM reflows)
-*   Visual block mode for [vim](http://codemirror.net/demo/vim.html) (<C-v>) is nearly complete
-*   New mode: [Kotlin](http://codemirror.net/mode/kotlin/index.html)
+*   Visual block mode for [vim](https://codemirror.net/demo/vim.html) (<C-v>) is nearly complete
+*   New mode: [Kotlin](https://codemirror.net/mode/kotlin/index.html)
 *   Better multi-selection paste for text copied from multiple CodeMirror selections
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.3.0...4.4.0).
 
 ## 4.3.0 (2014-06-23)
 
-*   Several [vim bindings](http://codemirror.net/demo/vim.html) improvements: search and exCommand history, global flag for `:substitute`, `:global` command.
-*   Allow hiding the cursor by setting [`cursorBlinkRate`](http://codemirror.net/doc/manual.html#option_cursorBlinkRate) to a negative value.
+*   Several [vim bindings](https://codemirror.net/demo/vim.html) improvements: search and exCommand history, global flag for `:substitute`, `:global` command.
+*   Allow hiding the cursor by setting [`cursorBlinkRate`](https://codemirror.net/doc/manual.html#option_cursorBlinkRate) to a negative value.
 *   Make gutter markers themeable, use this in foldgutter.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.2.0...4.3.0).
 
@@ -994,22 +994,22 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 *   Fix problem where some modes were broken by the fact that empty tokens were forbidden.
 *   Several fixes to context menu handling.
 *   On undo, scroll _change_, not cursor, into view.
-*   Rewritten [Jade](http://codemirror.net/mode/jade/index.html) mode.
-*   Various improvements to [Shell](http://codemirror.net/mode/shell/index.html) (support for more syntax) and [Python](http://codemirror.net/mode/python/index.html) (better indentation) modes.
-*   New mode: [Cypher](http://codemirror.net/mode/cypher/index.html).
-*   New theme: [Neo](http://codemirror.net/demo/theme.html#neo).
-*   Support direct styling options (color, line style, width) in the [rulers](http://codemirror.net/doc/manual.html#addon_rulers) addon.
-*   Recognize per-editor configuration for the [show-hint](http://codemirror.net/doc/manual.html#addon_show-hint) and [foldcode](http://codemirror.net/doc/manual.html#addon_foldcode) addons.
-*   More intelligent scanning for existing close tags in [closetag](http://codemirror.net/doc/manual.html#addon_closetag) addon.
-*   In the [Vim bindings](http://codemirror.net/demo/vim.html): Fix bracket matching, support case conversion in visual mode, visual paste, append action.
+*   Rewritten [Jade](https://codemirror.net/mode/jade/index.html) mode.
+*   Various improvements to [Shell](https://codemirror.net/mode/shell/index.html) (support for more syntax) and [Python](https://codemirror.net/mode/python/index.html) (better indentation) modes.
+*   New mode: [Cypher](https://codemirror.net/mode/cypher/index.html).
+*   New theme: [Neo](https://codemirror.net/demo/theme.html#neo).
+*   Support direct styling options (color, line style, width) in the [rulers](https://codemirror.net/doc/manual.html#addon_rulers) addon.
+*   Recognize per-editor configuration for the [show-hint](https://codemirror.net/doc/manual.html#addon_show-hint) and [foldcode](https://codemirror.net/doc/manual.html#addon_foldcode) addons.
+*   More intelligent scanning for existing close tags in [closetag](https://codemirror.net/doc/manual.html#addon_closetag) addon.
+*   In the [Vim bindings](https://codemirror.net/demo/vim.html): Fix bracket matching, support case conversion in visual mode, visual paste, append action.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.1.0...4.2.0).
 
 ## 4.1.0 (2014-04-22)
 
-*   _Slightly incompatible_: The [`"cursorActivity"`](http://codemirror.net/doc/manual.html#event_cursorActivity) event now fires after all other events for the operation (and only for handlers that were actually registered at the time the activity happened).
-*   New command: [`insertSoftTab`](http://codemirror.net/doc/manual.html#command_insertSoftTab).
-*   New mode: [Django](http://codemirror.net/mode/django/index.html).
-*   Improved modes: [Verilog](http://codemirror.net/mode/verilog/index.html) (rewritten), [Jinja2](http://codemirror.net/mode/jinja2/index.html), [Haxe](http://codemirror.net/mode/haxe/index.html), [PHP](http://codemirror.net/mode/php/index.html) (string interpolation highlighted), [JavaScript](http://codemirror.net/mode/javascript/index.html) (indentation of trailing else, template strings), [LiveScript](http://codemirror.net/mode/livescript/index.html) (multi-line strings).
+*   _Slightly incompatible_: The [`"cursorActivity"`](https://codemirror.net/doc/manual.html#event_cursorActivity) event now fires after all other events for the operation (and only for handlers that were actually registered at the time the activity happened).
+*   New command: [`insertSoftTab`](https://codemirror.net/doc/manual.html#command_insertSoftTab).
+*   New mode: [Django](https://codemirror.net/mode/django/index.html).
+*   Improved modes: [Verilog](https://codemirror.net/mode/verilog/index.html) (rewritten), [Jinja2](https://codemirror.net/mode/jinja2/index.html), [Haxe](https://codemirror.net/mode/haxe/index.html), [PHP](https://codemirror.net/mode/php/index.html) (string interpolation highlighted), [JavaScript](https://codemirror.net/mode/javascript/index.html) (indentation of trailing else, template strings), [LiveScript](https://codemirror.net/mode/livescript/index.html) (multi-line strings).
 *   Many small issues from the 3.x→4.x transition were found and fixed.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.0.3...4.1.0).
 
@@ -1019,45 +1019,45 @@ Merges the improvements from 4.1 that could easily be applied to the 3.x code. A
 
 ## 3.23.0 (2014-03-20)
 
-*   In the [XML mode](http://codemirror.net/mode/xml/index.html), add `brackets` style to angle brackets, fix case-sensitivity of tags for HTML.
-*   New mode: [Dylan](http://codemirror.net/mode/dylan/index.html).
-*   Many improvements to the [Vim bindings](http://codemirror.net/demo/vim.html).
+*   In the [XML mode](https://codemirror.net/mode/xml/index.html), add `brackets` style to angle brackets, fix case-sensitivity of tags for HTML.
+*   New mode: [Dylan](https://codemirror.net/mode/dylan/index.html).
+*   Many improvements to the [Vim bindings](https://codemirror.net/demo/vim.html).
 
 ## 3.22.0 (2014-02-21)
 
-*   Adds the [`findMarks`](http://codemirror.net/doc/manual.html#findMarks) method.
-*   New addons: [rulers](http://codemirror.net/doc/manual.html#addon_rulers), markdown-fold, yaml-lint.
-*   New theme: [mdn-like](http://codemirror.net/demo/theme.html#mdn-like).
-*   New mode: [Solr](http://codemirror.net/mode/solr/index.html).
+*   Adds the [`findMarks`](https://codemirror.net/doc/manual.html#findMarks) method.
+*   New addons: [rulers](https://codemirror.net/doc/manual.html#addon_rulers), markdown-fold, yaml-lint.
+*   New theme: [mdn-like](https://codemirror.net/demo/theme.html#mdn-like).
+*   New mode: [Solr](https://codemirror.net/mode/solr/index.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.21.0...3.22.0).
 
 ## 3.21.0 (2014-01-16)
 
 *   Auto-indenting a block will no longer add trailing whitespace to blank lines.
-*   Marking text has a new option [`clearWhenEmpty`](http://codemirror.net/doc/manual.html#markText) to control auto-removal.
+*   Marking text has a new option [`clearWhenEmpty`](https://codemirror.net/doc/manual.html#markText) to control auto-removal.
 *   Several bugfixes in the handling of bidirectional text.
-*   The [XML](http://codemirror.net/mode/xml/index.html) and [CSS](http://codemirror.net/mode/css/index.html) modes were largely rewritten. [LESS](http://codemirror.net/mode/css/less.html) support was added to the CSS mode.
-*   The OCaml mode was moved to an [mllike](http://codemirror.net/mode/mllike/index.html) mode, F# support added.
-*   Make it possible to fetch multiple applicable helper values with [`getHelpers`](http://codemirror.net/doc/manual.html#getHelpers), and to register helpers matched on predicates with [`registerGlobalHelper`](http://codemirror.net/doc/manual.html#registerGlobalHelper).
-*   New theme [pastel-on-dark](http://codemirror.net/demo/theme.html#pastel-on-dark).
-*   Better ECMAScript 6 support in [JavaScript](http://codemirror.net/mode/javascript/index.html) mode.
+*   The [XML](https://codemirror.net/mode/xml/index.html) and [CSS](https://codemirror.net/mode/css/index.html) modes were largely rewritten. [LESS](https://codemirror.net/mode/css/less.html) support was added to the CSS mode.
+*   The OCaml mode was moved to an [mllike](https://codemirror.net/mode/mllike/index.html) mode, F# support added.
+*   Make it possible to fetch multiple applicable helper values with [`getHelpers`](https://codemirror.net/doc/manual.html#getHelpers), and to register helpers matched on predicates with [`registerGlobalHelper`](https://codemirror.net/doc/manual.html#registerGlobalHelper).
+*   New theme [pastel-on-dark](https://codemirror.net/demo/theme.html#pastel-on-dark).
+*   Better ECMAScript 6 support in [JavaScript](https://codemirror.net/mode/javascript/index.html) mode.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.20.0...3.21.0).
 
 ## 3.20.0 (2013-11-21)
 
-*   New modes: [Julia](http://codemirror.net/mode/julia/index.html) and [PEG.js](http://codemirror.net/mode/pegjs/index.html).
-*   Support ECMAScript 6 in the [JavaScript mode](http://codemirror.net/mode/javascript/index.html).
-*   Improved indentation for the [CoffeeScript mode](http://codemirror.net/mode/coffeescript/index.html).
-*   Make non-printable-character representation [configurable](http://codemirror.net/doc/manual.html#option_specialChars).
-*   Add ‘notification’ functionality to [dialog](http://codemirror.net/doc/manual.html#addon_dialog) addon.
+*   New modes: [Julia](https://codemirror.net/mode/julia/index.html) and [PEG.js](https://codemirror.net/mode/pegjs/index.html).
+*   Support ECMAScript 6 in the [JavaScript mode](https://codemirror.net/mode/javascript/index.html).
+*   Improved indentation for the [CoffeeScript mode](https://codemirror.net/mode/coffeescript/index.html).
+*   Make non-printable-character representation [configurable](https://codemirror.net/doc/manual.html#option_specialChars).
+*   Add ‘notification’ functionality to [dialog](https://codemirror.net/doc/manual.html#addon_dialog) addon.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.19.0...3.20.0).
 
 ## 3.19.0 (2013-10-21)
 
-*   New modes: [Eiffel](http://codemirror.net/mode/eiffel/index.html), [Gherkin](http://codemirror.net/mode/gherkin/index.html), [MSSQL dialect](http://codemirror.net/mode/sql/?mime=text/x-mssql).
-*   New addons: [hardwrap](http://codemirror.net/doc/manual.html#addon_hardwrap), [sql-hint](http://codemirror.net/doc/manual.html#addon_sql-hint).
-*   New theme: [MBO](http://codemirror.net/demo/theme.html#mbo).
-*   Add [support](http://codemirror.net/doc/manual.html#token_style_line) for line-level styling from mode tokenizers.
+*   New modes: [Eiffel](https://codemirror.net/mode/eiffel/index.html), [Gherkin](https://codemirror.net/mode/gherkin/index.html), [MSSQL dialect](https://codemirror.net/mode/sql/?mime=text/x-mssql).
+*   New addons: [hardwrap](https://codemirror.net/doc/manual.html#addon_hardwrap), [sql-hint](https://codemirror.net/doc/manual.html#addon_sql-hint).
+*   New theme: [MBO](https://codemirror.net/demo/theme.html#mbo).
+*   Add [support](https://codemirror.net/doc/manual.html#token_style_line) for line-level styling from mode tokenizers.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.18.0...3.19.0).
 
 ## 3.18.0 (2013-09-23)
@@ -1066,70 +1066,70 @@ Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", fals
 
 ## 3.17.0 (2013-09-23)
 
-*   New modes: [Fortran](http://codemirror.net/mode/fortran/index.html), [Octave](http://codemirror.net/mode/octave/index.html) (Matlab), [TOML](http://codemirror.net/mode/toml/index.html), and [DTD](http://codemirror.net/mode/dtd/index.html).
-*   New addons: [`css-lint`](http://codemirror.net/addon/lint/css-lint.js), [`css-hint`](http://codemirror.net/doc/manual.html#addon_css-hint).
+*   New modes: [Fortran](https://codemirror.net/mode/fortran/index.html), [Octave](https://codemirror.net/mode/octave/index.html) (Matlab), [TOML](https://codemirror.net/mode/toml/index.html), and [DTD](https://codemirror.net/mode/dtd/index.html).
+*   New addons: [`css-lint`](https://codemirror.net/addon/lint/css-lint.js), [`css-hint`](https://codemirror.net/doc/manual.html#addon_css-hint).
 *   Improve resilience to CSS 'frameworks' that globally mess up `box-sizing`.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.16.0...3.17.0).
 
 ## 3.16.0 (2013-08-21)
 
-*   The whole codebase is now under a single [license](http://codemirror.net/LICENSE) file.
+*   The whole codebase is now under a single [license](https://codemirror.net/LICENSE) file.
 *   The project page was overhauled and redesigned.
-*   New themes: [Paraiso](http://codemirror.net/demo/theme.html#paraiso-dark) ([light](http://codemirror.net/demo/theme.html#paraiso-light)), [The Matrix](http://codemirror.net/demo/theme.html#the-matrix).
-*   Improved interaction between themes and [active-line](http://codemirror.net/doc/manual.html#addon_active-line)/[matchbrackets](http://codemirror.net/doc/manual.html#addon_matchbrackets) addons.
-*   New [folding](http://codemirror.net/doc/manual.html#addon_foldcode) function `CodeMirror.fold.comment`.
-*   Added [fullscreen](http://codemirror.net/doc/manual.html#addon_fullscreen) addon.
+*   New themes: [Paraiso](https://codemirror.net/demo/theme.html#paraiso-dark) ([light](https://codemirror.net/demo/theme.html#paraiso-light)), [The Matrix](https://codemirror.net/demo/theme.html#the-matrix).
+*   Improved interaction between themes and [active-line](https://codemirror.net/doc/manual.html#addon_active-line)/[matchbrackets](https://codemirror.net/doc/manual.html#addon_matchbrackets) addons.
+*   New [folding](https://codemirror.net/doc/manual.html#addon_foldcode) function `CodeMirror.fold.comment`.
+*   Added [fullscreen](https://codemirror.net/doc/manual.html#addon_fullscreen) addon.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.15.0...3.16.0).
 
 ## 3.15.0 (2013-07-29)
 
-*   New modes: [Jade](http://codemirror.net/mode/jade/index.html), [Nginx](http://codemirror.net/mode/nginx/index.html).
-*   New addons: [Tern](http://codemirror.net/demo/tern.html), [matchtags](http://codemirror.net/doc/manual.html#addon_matchtags), and [foldgutter](http://codemirror.net/doc/manual.html#addon_foldgutter).
-*   Introduced [_helper_](http://codemirror.net/doc/manual.html#getHelper) concept ([context](https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ)).
-*   New method: [`getModeAt`](http://codemirror.net/doc/manual.html#getModeAt).
-*   New themes: base16 [dark](http://codemirror.net/demo/theme.html#base16-dark)/[light](http://codemirror.net/demo/theme.html#base16-light), 3024 [dark](http://codemirror.net/demo/theme.html#3024-night)/[light](http://codemirror.net/demo/theme.html#3024-day), [tomorrow-night](http://codemirror.net/demo/theme.html#tomorrow-night-eighties).
+*   New modes: [Jade](https://codemirror.net/mode/jade/index.html), [Nginx](https://codemirror.net/mode/nginx/index.html).
+*   New addons: [Tern](https://codemirror.net/demo/tern.html), [matchtags](https://codemirror.net/doc/manual.html#addon_matchtags), and [foldgutter](https://codemirror.net/doc/manual.html#addon_foldgutter).
+*   Introduced [_helper_](https://codemirror.net/doc/manual.html#getHelper) concept ([context](https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ)).
+*   New method: [`getModeAt`](https://codemirror.net/doc/manual.html#getModeAt).
+*   New themes: base16 [dark](https://codemirror.net/demo/theme.html#base16-dark)/[light](https://codemirror.net/demo/theme.html#base16-light), 3024 [dark](https://codemirror.net/demo/theme.html#3024-night)/[light](https://codemirror.net/demo/theme.html#3024-day), [tomorrow-night](https://codemirror.net/demo/theme.html#tomorrow-night-eighties).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.14.0...3.15.0).
 
 ## 3.14.0 (2013-06-20)
 
-*   New addons: [trailing space highlight](http://codemirror.net/doc/manual.html#addon_trailingspace), [XML completion](http://codemirror.net/doc/manual.html#addon_xml-hint) (rewritten), and [diff merging](http://codemirror.net/doc/manual.html#addon_merge).
-*   [`markText`](http://codemirror.net/doc/manual.html#markText) and [`addLineWidget`](http://codemirror.net/doc/manual.html#addLineWidget) now take a `handleMouseEvents` option.
-*   New methods: [`lineAtHeight`](http://codemirror.net/doc/manual.html#lineAtHeight), [`getTokenTypeAt`](http://codemirror.net/doc/manual.html#getTokenTypeAt).
-*   More precise cleanness-tracking using [`changeGeneration`](http://codemirror.net/doc/manual.html#changeGeneration) and [`isClean`](http://codemirror.net/doc/manual.html#isClean).
-*   Many extensions to [Emacs](http://codemirror.net/demo/emacs.html) mode (prefixes, more navigation units, and more).
-*   New events [`"keyHandled"`](http://codemirror.net/doc/manual.html#event_keyHandled) and [`"inputRead"`](http://codemirror.net/doc/manual.html#event_inputRead).
-*   Various improvements to [Ruby](http://codemirror.net/mode/ruby/index.html), [Smarty](http://codemirror.net/mode/smarty/index.html), [SQL](http://codemirror.net/mode/sql/index.html), and [Vim](http://codemirror.net/demo/vim.html) modes.
+*   New addons: [trailing space highlight](https://codemirror.net/doc/manual.html#addon_trailingspace), [XML completion](https://codemirror.net/doc/manual.html#addon_xml-hint) (rewritten), and [diff merging](https://codemirror.net/doc/manual.html#addon_merge).
+*   [`markText`](https://codemirror.net/doc/manual.html#markText) and [`addLineWidget`](https://codemirror.net/doc/manual.html#addLineWidget) now take a `handleMouseEvents` option.
+*   New methods: [`lineAtHeight`](https://codemirror.net/doc/manual.html#lineAtHeight), [`getTokenTypeAt`](https://codemirror.net/doc/manual.html#getTokenTypeAt).
+*   More precise cleanness-tracking using [`changeGeneration`](https://codemirror.net/doc/manual.html#changeGeneration) and [`isClean`](https://codemirror.net/doc/manual.html#isClean).
+*   Many extensions to [Emacs](https://codemirror.net/demo/emacs.html) mode (prefixes, more navigation units, and more).
+*   New events [`"keyHandled"`](https://codemirror.net/doc/manual.html#event_keyHandled) and [`"inputRead"`](https://codemirror.net/doc/manual.html#event_inputRead).
+*   Various improvements to [Ruby](https://codemirror.net/mode/ruby/index.html), [Smarty](https://codemirror.net/mode/smarty/index.html), [SQL](https://codemirror.net/mode/sql/index.html), and [Vim](https://codemirror.net/demo/vim.html) modes.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.13.0...3.14.0).
 
 ## 3.13.0 (2013-05-20)
 
-*   New modes: [COBOL](http://codemirror.net/mode/cobol/index.html) and [HAML](http://codemirror.net/mode/haml/index.html).
-*   New options: [`cursorScrollMargin`](http://codemirror.net/doc/manual.html#option_cursorScrollMargin) and [`coverGutterNextToScrollbar`](http://codemirror.net/doc/manual.html#option_coverGutterNextToScrollbar).
-*   New addon: [commenting](http://codemirror.net/doc/manual.html#addon_comment).
-*   More features added to the [Vim keymap](http://codemirror.net/demo/vim.html).
+*   New modes: [COBOL](https://codemirror.net/mode/cobol/index.html) and [HAML](https://codemirror.net/mode/haml/index.html).
+*   New options: [`cursorScrollMargin`](https://codemirror.net/doc/manual.html#option_cursorScrollMargin) and [`coverGutterNextToScrollbar`](https://codemirror.net/doc/manual.html#option_coverGutterNextToScrollbar).
+*   New addon: [commenting](https://codemirror.net/doc/manual.html#addon_comment).
+*   More features added to the [Vim keymap](https://codemirror.net/demo/vim.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.12...3.13.0).
 
 ## 3.12.0 (2013-04-19)
 
-*   New mode: [GNU assembler](http://codemirror.net/mode/gas/index.html).
-*   New options: [`maxHighlightLength`](http://codemirror.net/doc/manual.html#option_maxHighlightLength) and [`historyEventDelay`](http://codemirror.net/doc/manual.html#option_historyEventDelay).
-*   Added [`addToHistory`](http://codemirror.net/doc/manual.html#mark_addToHistory) option for `markText`.
+*   New mode: [GNU assembler](https://codemirror.net/mode/gas/index.html).
+*   New options: [`maxHighlightLength`](https://codemirror.net/doc/manual.html#option_maxHighlightLength) and [`historyEventDelay`](https://codemirror.net/doc/manual.html#option_historyEventDelay).
+*   Added [`addToHistory`](https://codemirror.net/doc/manual.html#mark_addToHistory) option for `markText`.
 *   Various fixes to JavaScript tokenization and indentation corner cases.
 *   Further improvements to the vim mode.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.11...v3.12).
 
 ## 3.11.0 (2013-03-20)
 
-*   **Removed code:** `collapserange`, `formatting`, and `simple-hint` addons. `plsql` and `mysql` modes (use [`sql`](http://codemirror.net/mode/sql/index.html) mode).
-*   **Moved code:** the range-finding functions for folding now have [their own files](http://codemirror.net/addon/fold/).
-*   **Changed interface:** the [`continuecomment`](http://codemirror.net/doc/manual.html#addon_continuecomment) addon now exposes an option, rather than a command.
-*   New modes: [SCSS](http://codemirror.net/mode/css/scss.html), [Tcl](http://codemirror.net/mode/tcl/index.html), [LiveScript](http://codemirror.net/mode/livescript/index.html), and [mIRC](http://codemirror.net/mode/mirc/index.html).
-*   New addons: [`placeholder`](http://codemirror.net/demo/placeholder.html), [HTML completion](http://codemirror.net/demo/html5complete.html).
-*   New methods: [`hasFocus`](http://codemirror.net/doc/manual.html#hasFocus), [`defaultCharWidth`](http://codemirror.net/doc/manual.html#defaultCharWidth).
-*   New events: [`beforeCursorEnter`](http://codemirror.net/doc/manual.html#event_beforeCursorEnter), [`renderLine`](http://codemirror.net/doc/manual.html#event_renderLine).
-*   Many improvements to the [`show-hint`](http://codemirror.net/doc/manual.html#addon_show-hint) completion dialog addon.
+*   **Removed code:** `collapserange`, `formatting`, and `simple-hint` addons. `plsql` and `mysql` modes (use [`sql`](https://codemirror.net/mode/sql/index.html) mode).
+*   **Moved code:** the range-finding functions for folding now have [their own files](https://codemirror.net/addon/fold/).
+*   **Changed interface:** the [`continuecomment`](https://codemirror.net/doc/manual.html#addon_continuecomment) addon now exposes an option, rather than a command.
+*   New modes: [SCSS](https://codemirror.net/mode/css/scss.html), [Tcl](https://codemirror.net/mode/tcl/index.html), [LiveScript](https://codemirror.net/mode/livescript/index.html), and [mIRC](https://codemirror.net/mode/mirc/index.html).
+*   New addons: [`placeholder`](https://codemirror.net/demo/placeholder.html), [HTML completion](https://codemirror.net/demo/html5complete.html).
+*   New methods: [`hasFocus`](https://codemirror.net/doc/manual.html#hasFocus), [`defaultCharWidth`](https://codemirror.net/doc/manual.html#defaultCharWidth).
+*   New events: [`beforeCursorEnter`](https://codemirror.net/doc/manual.html#event_beforeCursorEnter), [`renderLine`](https://codemirror.net/doc/manual.html#event_renderLine).
+*   Many improvements to the [`show-hint`](https://codemirror.net/doc/manual.html#addon_show-hint) completion dialog addon.
 *   Tweak behavior of by-word cursor motion.
-*   Further improvements to the [vim mode](http://codemirror.net/demo/vim.html).
+*   Further improvements to the [vim mode](https://codemirror.net/demo/vim.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.1...v3.11).
 
 ## 3.02.0 (2013-01-25)
@@ -1138,36 +1138,36 @@ Single-bugfix release. Fixes a problem that prevents CodeMirror instances from b
 
 ## 3.01.0 (2013-01-21)
 
-*   Move all add-ons into an organized directory structure under [`/addon`](http://codemirror.net/addon/). **You might have to adjust your paths.**
-*   New modes: [D](http://codemirror.net/mode/d/index.html), [Sass](http://codemirror.net/mode/sass/index.html), [APL](http://codemirror.net/mode/apl/index.html), [SQL](http://codemirror.net/mode/sql/index.html) (configurable), and [Asterisk](http://codemirror.net/mode/asterisk/index.html).
+*   Move all add-ons into an organized directory structure under [`/addon`](https://codemirror.net/addon/). **You might have to adjust your paths.**
+*   New modes: [D](https://codemirror.net/mode/d/index.html), [Sass](https://codemirror.net/mode/sass/index.html), [APL](https://codemirror.net/mode/apl/index.html), [SQL](https://codemirror.net/mode/sql/index.html) (configurable), and [Asterisk](https://codemirror.net/mode/asterisk/index.html).
 *   Several bugfixes in right-to-left text support.
-*   Add [`rtlMoveVisually`](http://codemirror.net/doc/manual.html#option_rtlMoveVisually) option.
+*   Add [`rtlMoveVisually`](https://codemirror.net/doc/manual.html#option_rtlMoveVisually) option.
 *   Improvements to vim keymap.
-*   Add built-in (lightweight) [overlay mode](http://codemirror.net/doc/manual.html#addOverlay) support.
-*   Support `showIfHidden` option for [line widgets](http://codemirror.net/doc/manual.html#addLineWidget).
-*   Add simple [Python hinter](http://codemirror.net/doc/manual.html#addon_python-hint).
-*   Bring back the [`fixedGutter`](http://codemirror.net/doc/manual.html#option_fixedGutter) option.
+*   Add built-in (lightweight) [overlay mode](https://codemirror.net/doc/manual.html#addOverlay) support.
+*   Support `showIfHidden` option for [line widgets](https://codemirror.net/doc/manual.html#addLineWidget).
+*   Add simple [Python hinter](https://codemirror.net/doc/manual.html#addon_python-hint).
+*   Bring back the [`fixedGutter`](https://codemirror.net/doc/manual.html#option_fixedGutter) option.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.0...v3.01).
 
 ## 3.1.0 (2013-02-21)
 
 *   **Incompatible:** key handlers may now _return_, rather than _throw_ `CodeMirror.Pass` to signal they didn't handle the key.
-*   Make documents a [first-class construct](http://codemirror.net/doc/manual.html#api_doc), support split views and subviews.
-*   Add a [new module](http://codemirror.net/doc/manual.html#addon_show-hint) for showing completion hints. Deprecate `simple-hint.js`.
-*   Extend [htmlmixed mode](http://codemirror.net/mode/htmlmixed/index.html) to allow custom handling of script types.
-*   Support an `insertLeft` option to [`setBookmark`](http://codemirror.net/doc/manual.html#setBookmark).
-*   Add an [`eachLine`](http://codemirror.net/doc/manual.html#eachLine) method to iterate over a document.
-*   New addon modules: [selection marking](http://codemirror.net/demo/markselection.html), [linting](http://codemirror.net/demo/lint.html), and [automatic bracket closing](http://codemirror.net/demo/closebrackets.html).
-*   Add [`"beforeChange"`](http://codemirror.net/doc/manual.html#event_beforeChange) and [`"beforeSelectionChange"`](http://codemirror.net/doc/manual.html#event_beforeSelectionChange) events.
-*   Add [`"hide"`](http://codemirror.net/doc/manual.html#event_hide) and [`"unhide"`](http://codemirror.net/doc/manual.html#event_unhide) events to marked ranges.
-*   Fix [`coordsChar`](http://codemirror.net/doc/manual.html#coordsChar)'s interpretation of its argument to match the documentation.
-*   New modes: [Turtle](http://codemirror.net/mode/turtle/index.html) and [Q](http://codemirror.net/mode/q/index.html).
-*   Further improvements to the [vim mode](http://codemirror.net/demo/vim.html).
+*   Make documents a [first-class construct](https://codemirror.net/doc/manual.html#api_doc), support split views and subviews.
+*   Add a [new module](https://codemirror.net/doc/manual.html#addon_show-hint) for showing completion hints. Deprecate `simple-hint.js`.
+*   Extend [htmlmixed mode](https://codemirror.net/mode/htmlmixed/index.html) to allow custom handling of script types.
+*   Support an `insertLeft` option to [`setBookmark`](https://codemirror.net/doc/manual.html#setBookmark).
+*   Add an [`eachLine`](https://codemirror.net/doc/manual.html#eachLine) method to iterate over a document.
+*   New addon modules: [selection marking](https://codemirror.net/demo/markselection.html), [linting](https://codemirror.net/demo/lint.html), and [automatic bracket closing](https://codemirror.net/demo/closebrackets.html).
+*   Add [`"beforeChange"`](https://codemirror.net/doc/manual.html#event_beforeChange) and [`"beforeSelectionChange"`](https://codemirror.net/doc/manual.html#event_beforeSelectionChange) events.
+*   Add [`"hide"`](https://codemirror.net/doc/manual.html#event_hide) and [`"unhide"`](https://codemirror.net/doc/manual.html#event_unhide) events to marked ranges.
+*   Fix [`coordsChar`](https://codemirror.net/doc/manual.html#coordsChar)'s interpretation of its argument to match the documentation.
+*   New modes: [Turtle](https://codemirror.net/mode/turtle/index.html) and [Q](https://codemirror.net/mode/q/index.html).
+*   Further improvements to the [vim mode](https://codemirror.net/demo/vim.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.01...v3.1).
 
 ## 3.0.0 (2012-12-10)
 
-**New major version**. Only partially backwards-compatible. See the [upgrading guide](http://codemirror.net/doc/upgrade_v3.html) for more information. Changes since release candidate 2:
+**New major version**. Only partially backwards-compatible. See the [upgrading guide](https://codemirror.net/doc/upgrade_v3.html) for more information. Changes since release candidate 2:
 
 *   Rewritten VIM mode.
 *   Fix a few minor scrolling and sizing issues.
@@ -1176,55 +1176,55 @@ Single-bugfix release. Fixes a problem that prevents CodeMirror instances from b
 
 ## 2.38.0 (2013-01-21)
 
-Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](http://codemirror.net/mode/d/index.html), [Sass](http://codemirror.net/mode/sass/index.html), [APL](http://codemirror.net/mode/apl/index.html)) from the v3 branch.
+Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](https://codemirror.net/mode/d/index.html), [Sass](https://codemirror.net/mode/sass/index.html), [APL](https://codemirror.net/mode/apl/index.html)) from the v3 branch.
 
 ## 2.37.0 (2012-12-20)
 
-*   New mode: [SQL](http://codemirror.net/mode/sql/index.html) (will replace [plsql](http://codemirror.net/mode/plsql/index.html) and [mysql](http://codemirror.net/mode/mysql/index.html) modes).
+*   New mode: [SQL](https://codemirror.net/mode/sql/index.html) (will replace [plsql](https://codemirror.net/mode/plsql/index.html) and [mysql](https://codemirror.net/mode/mysql/index.html) modes).
 *   Further work on the new VIM mode.
 *   Fix Cmd/Ctrl keys on recent Operas on OS X.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.36...v2.37).
 
 ## 2.36.0 (2012-11-20)
 
-*   New mode: [Z80 assembly](http://codemirror.net/mode/z80/index.html).
-*   New theme: [Twilight](http://codemirror.net/demo/theme.html#twilight).
+*   New mode: [Z80 assembly](https://codemirror.net/mode/z80/index.html).
+*   New theme: [Twilight](https://codemirror.net/demo/theme.html#twilight).
 *   Add command-line compression helper.
-*   Make [`scrollIntoView`](http://codemirror.net/doc/manual.html#scrollIntoView) public.
-*   Add [`defaultTextHeight`](http://codemirror.net/doc/manual.html#defaultTextHeight) method.
+*   Make [`scrollIntoView`](https://codemirror.net/doc/manual.html#scrollIntoView) public.
+*   Add [`defaultTextHeight`](https://codemirror.net/doc/manual.html#defaultTextHeight) method.
 *   Various extensions to the vim keymap.
-*   Make [PHP mode](http://codemirror.net/mode/php/index.html) build on [mixed HTML mode](http://codemirror.net/mode/htmlmixed/index.html).
-*   Add [comment-continuing](http://codemirror.net/doc/manual.html#addon_continuecomment) add-on.
-*   Full [list of patches](http://codemirror.net/https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36).
+*   Make [PHP mode](https://codemirror.net/mode/php/index.html) build on [mixed HTML mode](https://codemirror.net/mode/htmlmixed/index.html).
+*   Add [comment-continuing](https://codemirror.net/doc/manual.html#addon_continuecomment) add-on.
+*   Full [list of patches](https://codemirror.net/https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36).
 
 ## 2.35.0 (2012-10-22)
 
-*   New (sub) mode: [TypeScript](http://codemirror.net/mode/javascript/typescript.html).
+*   New (sub) mode: [TypeScript](https://codemirror.net/mode/javascript/typescript.html).
 *   Don't overwrite (insert key) when pasting.
-*   Fix several bugs in [`markText`](http://codemirror.net/doc/manual.html#markText)/undo interaction.
+*   Fix several bugs in [`markText`](https://codemirror.net/doc/manual.html#markText)/undo interaction.
 *   Better indentation of JavaScript code without semicolons.
-*   Add [`defineInitHook`](http://codemirror.net/doc/manual.html#defineInitHook) function.
+*   Add [`defineInitHook`](https://codemirror.net/doc/manual.html#defineInitHook) function.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35).
 
 ## 2.34.0 (2012-09-19)
 
-*   New mode: [Common Lisp](http://codemirror.net/mode/commonlisp/index.html).
+*   New mode: [Common Lisp](https://codemirror.net/mode/commonlisp/index.html).
 *   Fix right-click select-all on most browsers.
 *   Change the way highlighting happens:
       Saves memory and CPU cycles.
       `compareStates` is no longer needed.
       `onHighlightComplete` no longer works.
 *   Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.
-*   Add a [`CodeMirror.version`](http://codemirror.net/doc/manual.html#version) property.
-*   More robust handling of nested modes in [formatting](http://codemirror.net/demo/formatting.html) and [closetag](http://codemirror.net/demo/closetag.html) plug-ins.
-*   Un/redo now preserves [marked text](http://codemirror.net/doc/manual.html#markText) and bookmarks.
+*   Add a [`CodeMirror.version`](https://codemirror.net/doc/manual.html#version) property.
+*   More robust handling of nested modes in [formatting](https://codemirror.net/demo/formatting.html) and [closetag](https://codemirror.net/demo/closetag.html) plug-ins.
+*   Un/redo now preserves [marked text](https://codemirror.net/doc/manual.html#markText) and bookmarks.
 *   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34) of patches.
 
 ## 2.33.0 (2012-08-23)
 
-*   New mode: [Sieve](http://codemirror.net/mode/sieve/index.html).
-*   New [`getViewPort`](http://codemirror.net/doc/manual.html#getViewport) and [`onViewportChange`](http://codemirror.net/doc/manual.html#option_onViewportChange) API.
-*   [Configurable](http://codemirror.net/doc/manual.html#option_cursorBlinkRate) cursor blink rate.
+*   New mode: [Sieve](https://codemirror.net/mode/sieve/index.html).
+*   New [`getViewPort`](https://codemirror.net/doc/manual.html#getViewport) and [`onViewportChange`](https://codemirror.net/doc/manual.html#option_onViewportChange) API.
+*   [Configurable](https://codemirror.net/doc/manual.html#option_cursorBlinkRate) cursor blink rate.
 *   Make binding a key to `false` disabling handling (again).
 *   Show non-printing characters as red dots.
 *   More tweaks to the scrolling model.
@@ -1238,28 +1238,28 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 
 ## 2.31.0 (2012-07-20)
 
-*   New modes: [OCaml](http://codemirror.net/mode/ocaml/index.html), [Haxe](http://codemirror.net/mode/haxe/index.html), and [VB.NET](http://codemirror.net/mode/vb/index.html).
+*   New modes: [OCaml](https://codemirror.net/mode/ocaml/index.html), [Haxe](https://codemirror.net/mode/haxe/index.html), and [VB.NET](https://codemirror.net/mode/vb/index.html).
 *   Several fixes to the new scrolling model.
-*   Add a [`setSize`](http://codemirror.net/doc/manual.html#setSize) method for programmatic resizing.
-*   Add [`getHistory`](http://codemirror.net/doc/manual.html#getHistory) and [`setHistory`](http://codemirror.net/doc/manual.html#setHistory) methods.
-*   Allow custom line separator string in [`getValue`](http://codemirror.net/doc/manual.html#getValue) and [`getRange`](http://codemirror.net/doc/manual.html#getRange).
+*   Add a [`setSize`](https://codemirror.net/doc/manual.html#setSize) method for programmatic resizing.
+*   Add [`getHistory`](https://codemirror.net/doc/manual.html#getHistory) and [`setHistory`](https://codemirror.net/doc/manual.html#setHistory) methods.
+*   Allow custom line separator string in [`getValue`](https://codemirror.net/doc/manual.html#getValue) and [`getRange`](https://codemirror.net/doc/manual.html#getRange).
 *   Support double- and triple-click drag, double-clicking whitespace.
 *   And more... [(all patches)](https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31)
 
 ## 2.30.0 (2012-06-22)
 
 *   **New scrollbar implementation**. Should flicker less. Changes DOM structure of the editor.
-*   New theme: [vibrant-ink](http://codemirror.net/demo/theme.html#vibrant-ink).
+*   New theme: [vibrant-ink](https://codemirror.net/demo/theme.html#vibrant-ink).
 *   Many extensions to the VIM keymap (including text objects).
-*   Add [mode-multiplexing](http://codemirror.net/demo/multiplex.html) utility script.
+*   Add [mode-multiplexing](https://codemirror.net/demo/multiplex.html) utility script.
 *   Fix bug where right-click paste works in read-only mode.
-*   Add a [`getScrollInfo`](http://codemirror.net/doc/manual.html#getScrollInfo) method.
+*   Add a [`getScrollInfo`](https://codemirror.net/doc/manual.html#getScrollInfo) method.
 *   Lots of other [fixes](https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3).
 
 ## 2.25.0 (2012-05-23)
 
-*   New mode: [Erlang](http://codemirror.net/mode/erlang/index.html).
-*   **Remove xmlpure mode** (use [xml.js](http://codemirror.net/mode/xml/index.html)).
+*   New mode: [Erlang](https://codemirror.net/mode/erlang/index.html).
+*   **Remove xmlpure mode** (use [xml.js](https://codemirror.net/mode/xml/index.html)).
 *   Fix line-wrapping in Opera.
 *   Fix X Windows middle-click paste in Chrome.
 *   Fix bug that broke pasting of huge documents.
@@ -1268,11 +1268,11 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 ## 2.24.0 (2012-04-23)
 
 *   **Drop support for Internet Explorer 6**.
-*   New modes: [Shell](http://codemirror.net/mode/shell/index.html), [Tiki wiki](http://codemirror.net/mode/tiki/index.html), [Pig Latin](http://codemirror.net/mode/pig/index.html).
-*   New themes: [Ambiance](http://codemirror.net/demo/theme.html#ambiance), [Blackboard](http://codemirror.net/demo/theme.html#blackboard).
-*   More control over drag/drop with [`dragDrop`](http://codemirror.net/doc/manual.html#option_dragDrop) and [`onDragEvent`](http://codemirror.net/doc/manual.html#option_onDragEvent) options.
+*   New modes: [Shell](https://codemirror.net/mode/shell/index.html), [Tiki wiki](https://codemirror.net/mode/tiki/index.html), [Pig Latin](https://codemirror.net/mode/pig/index.html).
+*   New themes: [Ambiance](https://codemirror.net/demo/theme.html#ambiance), [Blackboard](https://codemirror.net/demo/theme.html#blackboard).
+*   More control over drag/drop with [`dragDrop`](https://codemirror.net/doc/manual.html#option_dragDrop) and [`onDragEvent`](https://codemirror.net/doc/manual.html#option_onDragEvent) options.
 *   Make HTML mode a bit less pedantic.
-*   Add [`compoundChange`](http://codemirror.net/doc/manual.html#compoundChange) API method.
+*   Add [`compoundChange`](https://codemirror.net/doc/manual.html#compoundChange) API method.
 *   Several fixes in undo history and line hiding.
 *   Remove (broken) support for `catchall` in key maps, add `nofallthrough` boolean field instead.
 
@@ -1283,47 +1283,47 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
     *   Shift-tab: Reset line indentation to default
     *   Ctrl/Cmd-[: Reduce line indentation (old tab behaviour)
     *   Ctrl/Cmd-]: Increase line indentation (old shift-tab behaviour)
-*   New modes: [XQuery](http://codemirror.net/mode/xquery/index.html) and [VBScript](http://codemirror.net/mode/vbscript/index.html).
-*   Two new themes: [lesser-dark](http://codemirror.net/mode/less/index.html) and [xq-dark](http://codemirror.net/mode/xquery/index.html).
-*   Differentiate between background and text styles in [`setLineClass`](http://codemirror.net/doc/manual.html#setLineClass).
+*   New modes: [XQuery](https://codemirror.net/mode/xquery/index.html) and [VBScript](https://codemirror.net/mode/vbscript/index.html).
+*   Two new themes: [lesser-dark](https://codemirror.net/mode/less/index.html) and [xq-dark](https://codemirror.net/mode/xquery/index.html).
+*   Differentiate between background and text styles in [`setLineClass`](https://codemirror.net/doc/manual.html#setLineClass).
 *   Fix drag-and-drop in IE9+.
-*   Extend [`charCoords`](http://codemirror.net/doc/manual.html#charCoords) and [`cursorCoords`](http://codemirror.net/doc/manual.html#cursorCoords) with a `mode` argument.
-*   Add [`autofocus`](http://codemirror.net/doc/manual.html#option_autofocus) option.
-*   Add [`findMarksAt`](http://codemirror.net/doc/manual.html#findMarksAt) method.
+*   Extend [`charCoords`](https://codemirror.net/doc/manual.html#charCoords) and [`cursorCoords`](https://codemirror.net/doc/manual.html#cursorCoords) with a `mode` argument.
+*   Add [`autofocus`](https://codemirror.net/doc/manual.html#option_autofocus) option.
+*   Add [`findMarksAt`](https://codemirror.net/doc/manual.html#findMarksAt) method.
 
 ## 2.22.0 (2012-02-27)
 
-*   Allow [key handlers](http://codemirror.net/doc/manual.html#keymaps) to pass up events, allow binding characters.
-*   Add [`autoClearEmptyLines`](http://codemirror.net/doc/manual.html#option_autoClearEmptyLines) option.
+*   Allow [key handlers](https://codemirror.net/doc/manual.html#keymaps) to pass up events, allow binding characters.
+*   Add [`autoClearEmptyLines`](https://codemirror.net/doc/manual.html#option_autoClearEmptyLines) option.
 *   Properly use tab stops when rendering tabs.
 *   Make PHP mode more robust.
-*   Support indentation blocks in [code folder](http://codemirror.net/doc/manual.html#addon_foldcode).
-*   Add a script for [highlighting instances of the selection](http://codemirror.net/doc/manual.html#addon_match-highlighter).
-*   New [.properties](http://codemirror.net/mode/properties/index.html) mode.
+*   Support indentation blocks in [code folder](https://codemirror.net/doc/manual.html#addon_foldcode).
+*   Add a script for [highlighting instances of the selection](https://codemirror.net/doc/manual.html#addon_match-highlighter).
+*   New [.properties](https://codemirror.net/mode/properties/index.html) mode.
 *   Fix many bugs.
 
 ## 2.21.0 (2012-01-27)
 
-*   Added [LESS](http://codemirror.net/mode/less/index.html), [MySQL](http://codemirror.net/mode/mysql/index.html), [Go](http://codemirror.net/mode/go/index.html), and [Verilog](http://codemirror.net/mode/verilog/index.html) modes.
-*   Add [`smartIndent`](http://codemirror.net/doc/manual.html#option_smartIndent) option.
-*   Support a cursor in [`readOnly`](http://codemirror.net/doc/manual.html#option_readOnly)-mode.
+*   Added [LESS](https://codemirror.net/mode/less/index.html), [MySQL](https://codemirror.net/mode/mysql/index.html), [Go](https://codemirror.net/mode/go/index.html), and [Verilog](https://codemirror.net/mode/verilog/index.html) modes.
+*   Add [`smartIndent`](https://codemirror.net/doc/manual.html#option_smartIndent) option.
+*   Support a cursor in [`readOnly`](https://codemirror.net/doc/manual.html#option_readOnly)-mode.
 *   Support assigning multiple styles to a token.
 *   Use a new approach to drawing the selection.
-*   Add [`scrollTo`](http://codemirror.net/doc/manual.html#scrollTo) method.
+*   Add [`scrollTo`](https://codemirror.net/doc/manual.html#scrollTo) method.
 *   Allow undo/redo events to span non-adjacent lines.
 *   Lots and lots of bugfixes.
 
 ## 2.20.0 (2011-12-20)
 
-*   Slightly incompatible API changes. Read [this](http://codemirror.net/doc/upgrade_v2.2.html).
-*   New approach to [binding](http://codemirror.net/doc/manual.html#option_extraKeys) keys, support for [custom bindings](http://codemirror.net/doc/manual.html#option_keyMap).
+*   Slightly incompatible API changes. Read [this](https://codemirror.net/doc/upgrade_v2.2.html).
+*   New approach to [binding](https://codemirror.net/doc/manual.html#option_extraKeys) keys, support for [custom bindings](https://codemirror.net/doc/manual.html#option_keyMap).
 *   Support for overwrite (insert).
-*   [Custom-width](http://codemirror.net/doc/manual.html#option_tabSize) and [stylable](http://codemirror.net/demo/visibletabs.html) tabs.
-*   Moved more code into [add-on scripts](http://codemirror.net/doc/manual.html#addons).
+*   [Custom-width](https://codemirror.net/doc/manual.html#option_tabSize) and [stylable](https://codemirror.net/demo/visibletabs.html) tabs.
+*   Moved more code into [add-on scripts](https://codemirror.net/doc/manual.html#addons).
 *   Support for sane vertical cursor movement in wrapped lines.
-*   More reliable handling of editing [marked text](http://codemirror.net/doc/manual.html#markText).
-*   Add minimal [emacs](http://codemirror.net/demo/emacs.html) and [vim](http://codemirror.net/demo/vim.html) bindings.
-*   Rename `coordsFromIndex` to [`posFromIndex`](http://codemirror.net/doc/manual.html#posFromIndex), add [`indexFromPos`](http://codemirror.net/doc/manual.html#indexFromPos) method.
+*   More reliable handling of editing [marked text](https://codemirror.net/doc/manual.html#markText).
+*   Add minimal [emacs](https://codemirror.net/demo/emacs.html) and [vim](https://codemirror.net/demo/vim.html) bindings.
+*   Rename `coordsFromIndex` to [`posFromIndex`](https://codemirror.net/doc/manual.html#posFromIndex), add [`indexFromPos`](https://codemirror.net/doc/manual.html#indexFromPos) method.
 
 ## 2.18.0 (2011-11-21)
 
@@ -1331,11 +1331,11 @@ Fixes `TextMarker.clear`, which is broken in 2.17.
 
 ## 2.17.0 (2011-11-21)
 
-*   Add support for [line wrapping](http://codemirror.net/doc/manual.html#option_lineWrapping) and [code folding](http://codemirror.net/doc/manual.html#hideLine).
-*   Add [Github-style Markdown](http://codemirror.net/mode/gfm/index.html) mode.
-*   Add [Monokai](http://codemirror.net/theme/monokai.css) and [Rubyblue](http://codemirror.net/theme/rubyblue.css) themes.
-*   Add [`setBookmark`](http://codemirror.net/doc/manual.html#setBookmark) method.
-*   Move some of the demo code into reusable components under [`lib/util`](http://codemirror.net/addon/).
+*   Add support for [line wrapping](https://codemirror.net/doc/manual.html#option_lineWrapping) and [code folding](https://codemirror.net/doc/manual.html#hideLine).
+*   Add [Github-style Markdown](https://codemirror.net/mode/gfm/index.html) mode.
+*   Add [Monokai](https://codemirror.net/theme/monokai.css) and [Rubyblue](https://codemirror.net/theme/rubyblue.css) themes.
+*   Add [`setBookmark`](https://codemirror.net/doc/manual.html#setBookmark) method.
+*   Move some of the demo code into reusable components under [`lib/util`](https://codemirror.net/addon/).
 *   Make screen-coord-finding code faster and more reliable.
 *   Fix drag-and-drop in Firefox.
 *   Improve support for IME.
@@ -1346,11 +1346,11 @@ Fixes `TextMarker.clear`, which is broken in 2.17.
 
 ## 2.16.0 (2011-10-27)
 
-*   Add [Perl](http://codemirror.net/mode/perl/index.html), [Rust](http://codemirror.net/mode/rust/index.html), [TiddlyWiki](http://codemirror.net/mode/tiddlywiki/index.html), and [Groovy](http://codemirror.net/mode/groovy/index.html) modes.
+*   Add [Perl](https://codemirror.net/mode/perl/index.html), [Rust](https://codemirror.net/mode/rust/index.html), [TiddlyWiki](https://codemirror.net/mode/tiddlywiki/index.html), and [Groovy](https://codemirror.net/mode/groovy/index.html) modes.
 *   Dragging text inside the editor now moves, rather than copies.
-*   Add a [`coordsFromIndex`](http://codemirror.net/doc/manual.html#coordsFromIndex) method.
-*   **API change**: `setValue` now no longer clears history. Use [`clearHistory`](http://codemirror.net/doc/manual.html#clearHistory) for that.
-*   **API change**: [`markText`](http://codemirror.net/doc/manual.html#markText) now returns an object with `clear` and `find` methods. Marked text is now more robust when edited.
+*   Add a [`coordsFromIndex`](https://codemirror.net/doc/manual.html#coordsFromIndex) method.
+*   **API change**: `setValue` now no longer clears history. Use [`clearHistory`](https://codemirror.net/doc/manual.html#clearHistory) for that.
+*   **API change**: [`markText`](https://codemirror.net/doc/manual.html#markText) now returns an object with `clear` and `find` methods. Marked text is now more robust when edited.
 *   Fix editing code with tabs in Internet Explorer.
 
 ## 2.15.0 (2011-09-26)
@@ -1359,24 +1359,24 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 
 ## 2.14.0 (2011-09-26)
 
-*   Add [Clojure](http://codemirror.net/mode/clojure/index.html), [Pascal](http://codemirror.net/mode/pascal/index.html), [NTriples](http://codemirror.net/mode/ntriples/index.html), [Jinja2](http://codemirror.net/mode/jinja2/index.html), and [Markdown](http://codemirror.net/mode/markdown/index.html) modes.
-*   Add [Cobalt](http://codemirror.net/theme/cobalt.css) and [Eclipse](http://codemirror.net/theme/eclipse.css) themes.
-*   Add a [`fixedGutter`](http://codemirror.net/doc/manual.html#option_fixedGutter) option.
+*   Add [Clojure](https://codemirror.net/mode/clojure/index.html), [Pascal](https://codemirror.net/mode/pascal/index.html), [NTriples](https://codemirror.net/mode/ntriples/index.html), [Jinja2](https://codemirror.net/mode/jinja2/index.html), and [Markdown](https://codemirror.net/mode/markdown/index.html) modes.
+*   Add [Cobalt](https://codemirror.net/theme/cobalt.css) and [Eclipse](https://codemirror.net/theme/eclipse.css) themes.
+*   Add a [`fixedGutter`](https://codemirror.net/doc/manual.html#option_fixedGutter) option.
 *   Fix bug with `setValue` breaking cursor movement.
 *   Make gutter updates much more efficient.
 *   Allow dragging of text out of the editor (on modern browsers).
 
 ## 2.13.0 (2011-08-23)
 
-*   Add [Ruby](http://codemirror.net/mode/ruby/index.html), [R](http://codemirror.net/mode/r/index.html), [CoffeeScript](http://codemirror.net/mode/coffeescript/index.html), and [Velocity](http://codemirror.net/mode/velocity/index.html) modes.
-*   Add [`getGutterElement`](http://codemirror.net/doc/manual.html#getGutterElement) to API.
+*   Add [Ruby](https://codemirror.net/mode/ruby/index.html), [R](https://codemirror.net/mode/r/index.html), [CoffeeScript](https://codemirror.net/mode/coffeescript/index.html), and [Velocity](https://codemirror.net/mode/velocity/index.html) modes.
+*   Add [`getGutterElement`](https://codemirror.net/doc/manual.html#getGutterElement) to API.
 *   Several fixes to scrolling and positioning.
-*   Add [`smartHome`](http://codemirror.net/doc/manual.html#option_smartHome) option.
-*   Add an experimental [pure XML](http://codemirror.net/mode/xmlpure/index.html) mode.
+*   Add [`smartHome`](https://codemirror.net/doc/manual.html#option_smartHome) option.
+*   Add an experimental [pure XML](https://codemirror.net/mode/xmlpure/index.html) mode.
 
 ## 2.12.0 (2011-07-25)
 
-*   Add a [SPARQL](http://codemirror.net/mode/sparql/index.html) mode.
+*   Add a [SPARQL](https://codemirror.net/mode/sparql/index.html) mode.
 *   Fix bug with cursor jumping around in an unfocused editor in IE.
 *   Allow key and mouse events to bubble out of the editor. Ignore widget clicks.
 *   Solve cursor flakiness after undo/redo.
@@ -1389,37 +1389,37 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 
 ## 2.11.0 (2011-07-04)
 
-*   Add a [Scheme mode](http://codemirror.net/mode/scheme/index.html).
+*   Add a [Scheme mode](https://codemirror.net/mode/scheme/index.html).
 *   Add a `replace` method to search cursors, for cursor-preserving replacements.
-*   Make the [C-like mode](http://codemirror.net/mode/clike/index.html) mode more customizable.
+*   Make the [C-like mode](https://codemirror.net/mode/clike/index.html) mode more customizable.
 *   Update XML mode to spot mismatched tags.
 *   Add `getStateAfter` API and `compareState` mode API methods for finer-grained mode magic.
 *   Add a `getScrollerElement` API method to manipulate the scrolling DIV.
 *   Fix drag-and-drop for Firefox.
-*   Add a C# configuration for the [C-like mode](http://codemirror.net/mode/clike/index.html).
-*   Add [full-screen editing](http://codemirror.net/demo/fullscreen.html) and [mode-changing](http://codemirror.net/demo/changemode.html) demos.
+*   Add a C# configuration for the [C-like mode](https://codemirror.net/mode/clike/index.html).
+*   Add [full-screen editing](https://codemirror.net/demo/fullscreen.html) and [mode-changing](https://codemirror.net/demo/changemode.html) demos.
 
 ## 2.10.0 (2011-06-07)
 
-Add a [theme](http://codemirror.net/doc/manual.html#option_theme) system ([demo](http://codemirror.net/demo/theme.html)). Note that this is not backwards-compatible—you'll have to update your styles and modes!
+Add a [theme](https://codemirror.net/doc/manual.html#option_theme) system ([demo](https://codemirror.net/demo/theme.html)). Note that this is not backwards-compatible—you'll have to update your styles and modes!
 
 ## 2.2.0 (2011-06-07)
 
-*   Add a [Lua mode](http://codemirror.net/mode/lua/index.html).
+*   Add a [Lua mode](https://codemirror.net/mode/lua/index.html).
 *   Fix reverse-searching for a regexp.
 *   Empty lines can no longer break highlighting.
 *   Rework scrolling model (the outer wrapper no longer does the scrolling).
 *   Solve horizontal jittering on long lines.
-*   Add [runmode.js](http://codemirror.net/demo/runmode.html).
+*   Add [runmode.js](https://codemirror.net/demo/runmode.html).
 *   Immediately re-highlight text when typing.
 *   Fix problem with 'sticking' horizontal scrollbar.
 
 ## 2.1.0 (2011-05-26)
 
-*   Add a [Smalltalk mode](http://codemirror.net/mode/smalltalk/index.html).
-*   Add a [reStructuredText mode](http://codemirror.net/mode/rst/index.html).
-*   Add a [Python mode](http://codemirror.net/mode/python/index.html).
-*   Add a [PL/SQL mode](http://codemirror.net/mode/plsql/index.html).
+*   Add a [Smalltalk mode](https://codemirror.net/mode/smalltalk/index.html).
+*   Add a [reStructuredText mode](https://codemirror.net/mode/rst/index.html).
+*   Add a [Python mode](https://codemirror.net/mode/python/index.html).
+*   Add a [PL/SQL mode](https://codemirror.net/mode/plsql/index.html).
 *   `coordsChar` now works
 *   Fix a problem where `onCursorActivity` interfered with `onChange`.
 *   Fix a number of scrolling and mouse-click-position glitches.
@@ -1433,4 +1433,4 @@ Add a [theme](http://codemirror.net/doc/manual.html#option_theme) system ([demo]
 
 ## 2.0.0 (2011-03-28)
 
-CodeMirror 2 is a complete rewrite that's faster, smaller, simpler to use, and less dependent on browser quirks. See [this](http://codemirror.net/doc/internals.html) and [this](http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580) for more information.
+CodeMirror 2 is a complete rewrite that's faster, smaller, simpler to use, and less dependent on browser quirks. See [this](https://codemirror.net/doc/internals.html) and [this](http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580) for more information.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1b0b104d3a..ebbef2f8ac 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -71,7 +71,7 @@ a separate NPM package.
 By contributing code to CodeMirror you
 
  - agree to license the contributed code under CodeMirror's [MIT
-   license](http://codemirror.net/LICENSE).
+   license](https://codemirror.net/LICENSE).
 
  - confirm that you have the right to contribute and license the code
    in question. (Either you hold all rights on the code, or the rights
diff --git a/README.md b/README.md
index 9a982bc70a..8bc6c936b1 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ customizing CodeMirror to fit your application, and extending it with
 new functionality.
 
 You can find more information (and the
-[manual](http://codemirror.net/doc/manual.html)) on the [project
-page](http://codemirror.net). For questions and discussion, use the
+[manual](https://codemirror.net/doc/manual.html)) on the [project
+page](https://codemirror.net). For questions and discussion, use the
 [discussion forum](https://discuss.codemirror.net/).
 
 See
diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 84c67edf78..8394e85a4d 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index d92318b345..a5f957b73b 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index f61e447660..23b06a8323 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Open simple dialogs on top of an editor. Relies on dialog.css.
 
diff --git a/addon/display/autorefresh.js b/addon/display/autorefresh.js
index 1e0e850469..37014dc31d 100644
--- a/addon/display/autorefresh.js
+++ b/addon/display/autorefresh.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
index cd3673b96c..eda7300f12 100644
--- a/addon/display/fullscreen.js
+++ b/addon/display/fullscreen.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/display/panel.js b/addon/display/panel.js
index f88d152b80..f192754dfa 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 65753ebf3f..1a3fa33758 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index 151cc8205f..0bb83bb022 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 86b2fe1c95..ada4b16244 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 83f133a5e7..25e62d540e 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Tag-closer extension for CodeMirror.
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 4e7d392874..86a86d8ae2 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index c9851bda31..c918c3f99f 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index fb1911a8db..2203d9390d 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/trailingspace.js b/addon/edit/trailingspace.js
index fa7b56be51..c39c310a99 100644
--- a/addon/edit/trailingspace.js
+++ b/addon/edit/trailingspace.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 13c0f0cd88..c420c02aed 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index e8d800eb59..836101d8b0 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 826766b69f..e146fb9f3e 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 9d32326566..988c67c450 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index f93edec22c..0cc1126440 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/markdown-fold.js b/addon/fold/markdown-fold.js
index ce84c946ce..6a551786d1 100644
--- a/addon/fold/markdown-fold.js
+++ b/addon/fold/markdown-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 867ecb5cb3..13bc3838b2 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index dae78e2efb..d27a9ec018 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 22642727cf..6cdf728195 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index c6769bcae5..b5aeb47fda 100644
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index f6ab2a2e89..96a7fe01c2 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 26dc0f00c4..5f6664b39f 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 62b69c948f..9759b91e7e 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 9b9baa0c67..e575fc4350 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
index 70621a1bdd..a54c703516 100644
--- a/addon/lint/coffeescript-lint.js
+++ b/addon/lint/coffeescript-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
 
diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index 135d031a35..6058a73eb1 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Depends on csslint.js from https://github.com/stubbornella/csslint
 
diff --git a/addon/lint/html-lint.js b/addon/lint/html-lint.js
index 23de9bb204..dae4764924 100644
--- a/addon/lint/html-lint.js
+++ b/addon/lint/html-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Depends on htmlhint.js from http://htmlhint.com/js/htmlhint.js
 
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index 8266b7e747..cc132d7f82 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index 63e70c4595..ac1d6ec28c 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Depends on jsonlint.js from https://github.com/zaach/jsonlint
 
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index e00e77a20c..aa75ba0e8a 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/lint/yaml-lint.js b/addon/lint/yaml-lint.js
index 3954ed38eb..369c95b5b4 100644
--- a/addon/lint/yaml-lint.js
+++ b/addon/lint/yaml-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 5b87b5e62a..982ac22de5 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
 
diff --git a/addon/mode/loadmode.js b/addon/mode/loadmode.js
index 10117ec22f..4ce716a012 100644
--- a/addon/mode/loadmode.js
+++ b/addon/mode/loadmode.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index a084f7025a..738ea98a0d 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/mode/multiplex_test.js b/addon/mode/multiplex_test.js
index 24e5e670de..c51cad45d5 100644
--- a/addon/mode/multiplex_test.js
+++ b/addon/mode/multiplex_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   CodeMirror.defineMode("markdown_with_stex", function(){
diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index 4a9f99a072..839d9e552e 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Utility function that allows modes to be combined. The mode given
 // as the base argument takes care of most of the normal mode
diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index c0f801088c..655f991475 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/runmode/colorize.js b/addon/runmode/colorize.js
index eb7060d0a2..3be5411506 100644
--- a/addon/runmode/colorize.js
+++ b/addon/runmode/colorize.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 1bd808c787..745eaf8440 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 window.CodeMirror = {};
 
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index a51c6d0d52..eb4cadf5b4 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
index 21c72696c8..53b6994c28 100644
--- a/addon/runmode/runmode.node.js
+++ b/addon/runmode/runmode.node.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /* Just enough of CodeMirror to run runMode under node.js */
 
diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index f2276fc79f..356625811e 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/scroll/scrollpastend.js b/addon/scroll/scrollpastend.js
index a2ed089b48..2ed9d95e84 100644
--- a/addon/scroll/scrollpastend.js
+++ b/addon/scroll/scrollpastend.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/scroll/simplescrollbars.js b/addon/scroll/simplescrollbars.js
index 23f3e03f81..750a2bd399 100644
--- a/addon/scroll/simplescrollbars.js
+++ b/addon/scroll/simplescrollbars.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/search/jump-to-line.js b/addon/search/jump-to-line.js
index 8b599cbc17..e75ac391b8 100644
--- a/addon/search/jump-to-line.js
+++ b/addon/search/jump-to-line.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Defines jumpToLine command. Uses dialog.js if present.
 
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 260cdeb2aa..b344ac79e2 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Highlighting text that matches the selection
 //
diff --git a/addon/search/matchesonscrollbar.js b/addon/search/matchesonscrollbar.js
index 8d19228971..4645f5eb2d 100644
--- a/addon/search/matchesonscrollbar.js
+++ b/addon/search/matchesonscrollbar.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/search/search.js b/addon/search/search.js
index 4059ccdd0e..27b226fa8b 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Define search commands. Depends on dialog.js or another
 // implementation of the openDialog method.
diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index e606c5e7cf..aae36dfe53 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index aa295d0d86..c7b14ce07f 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index 1602acc3de..adfaa62d1a 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Because sometimes you need to mark the selected *text*.
 //
diff --git a/addon/selection/selection-pointer.js b/addon/selection/selection-pointer.js
index ef5e404ad3..f0bd61a33e 100644
--- a/addon/selection/selection-pointer.js
+++ b/addon/selection/selection-pointer.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 6276b53893..253309d678 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Glue code between CodeMirror and Tern.
 //
diff --git a/addon/tern/worker.js b/addon/tern/worker.js
index 887f906a44..e134ad47d6 100644
--- a/addon/tern/worker.js
+++ b/addon/tern/worker.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // declare global: tern, server
 
diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 04851f99ff..0ab7bbbbe7 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/demo/activeline.html b/demo/activeline.html
index 86c8c18e1d..0d6b62ecfc 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -12,7 +12,7 @@
       .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
@@ -52,9 +52,9 @@ <h2>Active Line Demo</h2>
   </item>
   <item>
     <title>codemirror: Posted a description of the CodeMirror 2 internals at
-      http://codemirror.net/2/internals.html</title>
+      https://codemirror.net/2/internals.html</title>
     <description>codemirror: Posted a description of the CodeMirror 2 internals at
-      http://codemirror.net/2/internals.html</description>
+      https://codemirror.net/2/internals.html</description>
     <pubDate>Wed, 02 Mar 2011 12:15:09 +0000</pubDate>
     <guid>http://twitter.com/codemirror/statuses/42920879788789760</guid>
     <link>http://twitter.com/codemirror/statuses/42920879788789760</link>
diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index 0a7caece24..471b5bde7b 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -11,7 +11,7 @@
 <script src="../addon/hint/anyword-hint.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/bidi.html b/demo/bidi.html
index 645e648c86..742cf95f7b 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -12,7 +12,7 @@
   fieldset {border: none}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/btree.html b/demo/btree.html
index ba07bc74f4..985309d11b 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -11,7 +11,7 @@
       .CodeMirror {border: 1px solid #aaa; height: 400px}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/buffers.html b/demo/buffers.html
index 16ffc7dfe9..619c522524 100644
--- a/demo/buffers.html
+++ b/demo/buffers.html
@@ -12,7 +12,7 @@
       .CodeMirror {border: 1px solid black; height: 250px;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/changemode.html b/demo/changemode.html
index 9405932abe..fb189fb965 100644
--- a/demo/changemode.html
+++ b/demo/changemode.html
@@ -12,7 +12,7 @@
       .CodeMirror {border: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index d702f52696..6fe44c74d0 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -12,7 +12,7 @@
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/closetag.html b/demo/closetag.html
index 79959d2c4d..b0f3980611 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -16,7 +16,7 @@
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/complete.html b/demo/complete.html
index 0464389ebf..2fef796401 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -13,7 +13,7 @@
 <script src="../mode/markdown/markdown.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/emacs.html b/demo/emacs.html
index c626b8d408..69d5e600eb 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -18,7 +18,7 @@
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/folding.html b/demo/folding.html
index 1882b7c810..745939b191 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -35,7 +35,7 @@
 
 <body>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/fullscreen.html b/demo/fullscreen.html
index 1fbdc488e1..06bf03e107 100644
--- a/demo/fullscreen.html
+++ b/demo/fullscreen.html
@@ -12,7 +12,7 @@
 <script src="../addon/display/fullscreen.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index 84ba0cc0c2..a4e4cf7dae 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -12,7 +12,7 @@
   .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 411baae3ed..8433a92119 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -22,7 +22,7 @@
 
 <body>
   <div id=nav>
-    <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+    <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
     <ul>
       <li><a href="../index.html">Home</a>
diff --git a/demo/indentwrap.html b/demo/indentwrap.html
index 3d3d0af6ab..660d44eb2b 100644
--- a/demo/indentwrap.html
+++ b/demo/indentwrap.html
@@ -12,7 +12,7 @@
       .CodeMirror pre > * { text-indent: 0px; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/lint.html b/demo/lint.html
index 3abb9224fb..8d9d8f6dd4 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -20,7 +20,7 @@
       .CodeMirror {border: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/loadmode.html b/demo/loadmode.html
index 809cd90225..93b0ed5fd0 100644
--- a/demo/loadmode.html
+++ b/demo/loadmode.html
@@ -12,7 +12,7 @@
       .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/marker.html b/demo/marker.html
index 3a8b850009..5b500b7b24 100644
--- a/demo/marker.html
+++ b/demo/marker.html
@@ -13,7 +13,7 @@
       .CodeMirror {border: 1px solid #aaa;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/markselection.html b/demo/markselection.html
index d4c8a7a0d1..2e0a89be02 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -15,7 +15,7 @@
       .styled-background { background-color: #ff7; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index 893d72134b..2b2f5cb5b8 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -21,7 +21,7 @@
       .CodeMirror-selection-highlight-scrollbar {background-color: green}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/matchtags.html b/demo/matchtags.html
index 175639a396..e90707d176 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -13,7 +13,7 @@
       .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/merge.html b/demo/merge.html
index 9e2d14ea37..6eff813452 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -28,7 +28,7 @@
     }
   </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/multiplex.html b/demo/multiplex.html
index ca8c80aedc..ec3870baa5 100644
--- a/demo/multiplex.html
+++ b/demo/multiplex.html
@@ -13,7 +13,7 @@
       .cm-delimit {color: #fa4;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/mustache.html b/demo/mustache.html
index ae4e6a891b..ca1d7db90e 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -13,7 +13,7 @@
       .cm-mustache {color: #0ca;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/panel.html b/demo/panel.html
index 1ce3d87c79..34d0017e2b 100644
--- a/demo/panel.html
+++ b/demo/panel.html
@@ -40,7 +40,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/placeholder.html b/demo/placeholder.html
index 432331a486..99f709a312 100644
--- a/demo/placeholder.html
+++ b/demo/placeholder.html
@@ -14,7 +14,7 @@
       .CodeMirror pre.CodeMirror-placeholder { color: #999; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/preview.html b/demo/preview.html
index 19e1530b80..660c7921c6 100644
--- a/demo/preview.html
+++ b/demo/preview.html
@@ -25,7 +25,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/requirejs.html b/demo/requirejs.html
index 438ef9fbf6..796031736a 100644
--- a/demo/requirejs.html
+++ b/demo/requirejs.html
@@ -15,7 +15,7 @@
 
 <body>
   <div id=nav>
-    <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+    <a href="https://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>
diff --git a/demo/resize.html b/demo/resize.html
index 1c1ef390ab..6556f50f30 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -14,7 +14,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/rulers.html b/demo/rulers.html
index 2ac4111582..7c3530bd0c 100644
--- a/demo/rulers.html
+++ b/demo/rulers.html
@@ -11,7 +11,7 @@
   .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/runmode.html b/demo/runmode.html
index ab8938d8d3..0284c40567 100644
--- a/demo/runmode.html
+++ b/demo/runmode.html
@@ -9,7 +9,7 @@
 <script src="../addon/runmode/runmode.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/search.html b/demo/search.html
index 4ca81e20f5..502af0c15c 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -20,7 +20,7 @@
       dt {font-family: monospace; color: #666;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/simplemode.html b/demo/simplemode.html
index 04c194a4ba..d547e6f6fb 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -16,7 +16,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/simplescrollbars.html b/demo/simplescrollbars.html
index 9d40932649..1604297894 100644
--- a/demo/simplescrollbars.html
+++ b/demo/simplescrollbars.html
@@ -12,7 +12,7 @@
 <script src="../addon/scroll/simplescrollbars.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/spanaffectswrapping_shim.html b/demo/spanaffectswrapping_shim.html
index 879d99b606..46667ddc69 100644
--- a/demo/spanaffectswrapping_shim.html
+++ b/demo/spanaffectswrapping_shim.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/sublime.html b/demo/sublime.html
index 233dd83a4e..645f926816 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -25,7 +25,7 @@
   .CodeMirror-linenumbers { padding: 0 8px; }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/tern.html b/demo/tern.html
index d0dee8a70e..a7ffe35cda 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -27,7 +27,7 @@
       .CodeMirror {border: 1px solid #ddd;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/theme.html b/demo/theme.html
index c4e7899f09..c81768c46b 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -66,7 +66,7 @@
       .CodeMirror {border: 1px solid black; font-size:13px}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/trailingspace.html b/demo/trailingspace.html
index 1992ba3ff9..fa8afba9e0 100644
--- a/demo/trailingspace.html
+++ b/demo/trailingspace.html
@@ -16,7 +16,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/variableheight.html b/demo/variableheight.html
index d49942864b..d5495255e2 100644
--- a/demo/variableheight.html
+++ b/demo/variableheight.html
@@ -20,7 +20,7 @@
       .cm-strong { font-size: 140%; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/vim.html b/demo/vim.html
index bd704f7583..d51b9a0ed9 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -18,7 +18,7 @@
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/visibletabs.html b/demo/visibletabs.html
index 2eec337ed3..d00ba16f10 100644
--- a/demo/visibletabs.html
+++ b/demo/visibletabs.html
@@ -16,7 +16,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/widget.html b/demo/widget.html
index 58ebb4d97a..c77b35a0b7 100644
--- a/demo/widget.html
+++ b/demo/widget.html
@@ -14,7 +14,7 @@
       .lint-error-icon {color: white; background-color: red; font-weight: bold; border-radius: 50%; padding: 0 3px; margin-right: 7px;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index 043f0c429c..613ca2ec61 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -14,7 +14,7 @@
       .CodeMirror { border: 1px solid #eee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/internals.html b/doc/internals.html
index 079466f630..2137c937f2 100644
--- a/doc/internals.html
+++ b/doc/internals.html
@@ -7,7 +7,7 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
@@ -46,7 +46,7 @@ <h2 id=top>(Re-) Implementing A Syntax-Highlighting Editor in JavaScript</h2>
 on my blog.</p>
 
 <p>This is a followup to
-my <a href="http://codemirror.net/story.html">Brutal Odyssey to the
+my <a href="https://codemirror.net/story.html">Brutal Odyssey to the
 Dark Side of the DOM Tree</a> story. That one describes the
 mind-bending process of implementing (what would become) CodeMirror 1.
 This one describes the internals of CodeMirror 2, a complete rewrite
@@ -108,7 +108,7 @@ <h2 id=top>(Re-) Implementing A Syntax-Highlighting Editor in JavaScript</h2>
 incompatibility and bugginess in these features, I had to paper over
 with my own code. Not only did I have to do some serious stunt-work to
 get it to work on older browsers (as detailed in the
-previous <a href="http://codemirror.net/story.html">story</a>), things
+previous <a href="https://codemirror.net/story.html">story</a>), things
 also kept breaking in newly released versions, requiring me to come up
 with <em>new</em> scary hacks in order to keep up. This was starting
 to lose its appeal.</p>
@@ -293,7 +293,7 @@ <h2>Intelligent Updating</h2>
   <h2>Parsers can be Simple</h2>
 
 <p>When I wrote CodeMirror 1, I
-thought <a href="http://codemirror.net/story.html#parser">interruptable
+thought <a href="https://codemirror.net/story.html#parser">interruptable
 parsers</a> were a hugely scary and complicated thing, and I used a
 bunch of heavyweight abstractions to keep this supposed complexity
 under control: parsers
diff --git a/doc/manual.html b/doc/manual.html
index d389f1da39..7bd16a44d7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -24,7 +24,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="#overview" class=active data-default="true">Manual</a></li>
diff --git a/doc/realworld.html b/doc/realworld.html
index df698cc1ea..b226f0204e 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/releases.html b/doc/releases.html
index 4ad74880cf..1eff6792a0 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -6,7 +6,7 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
@@ -30,24 +30,24 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
-  <p class="rel">20-07-2018: <a href="http://codemirror.net/codemirror-5.39.2.zip">Version 5.39.2</a>:</p>
+  <p class="rel">20-07-2018: <a href="https://codemirror.net/codemirror-5.39.2.zip">Version 5.39.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix issue where when you pass the document as a <code>Doc</code> instance to the <code>CodeMirror</code> constructor, the <code>mode</code> option was ignored.</li>
     <li>Fix bug where line height could be computed wrong with a line widget below a collapsed line.</li>
     <li>Fix overeager <code>.npmignore</code> dropping the <code>bin/source-highlight</code> utility from the distribution.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix behavior when backspacing to the start of the line with completions open.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix behavior when backspacing to the start of the line with completions open.</li>
   </ul>
 
-  <p class="rel">20-06-2018: <a href="http://codemirror.net/codemirror-5.39.0.zip">Version 5.39.0</a>:</p>
+  <p class="rel">20-06-2018: <a href="https://codemirror.net/codemirror-5.39.0.zip">Version 5.39.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix issue that in some circumstances caused content to be clipped off at the bottom after a resize.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Improve handling of blank lines in HTML tags.</li>
-    <li><a href="http://codemirror.net/mode/stex/">stex mode</a>: Add an <code>inMathMode</code> option to start the mode in math mode.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Improve handling of blank lines in HTML tags.</li>
+    <li><a href="https://codemirror.net/mode/stex/">stex mode</a>: Add an <code>inMathMode</code> option to start the mode in math mode.</li>
   </ul>
 
-  <p class="rel">21-05-2018: <a href="http://codemirror.net/codemirror-5.38.0.zip">Version 5.38.0</a>:</p>
+  <p class="rel">21-05-2018: <a href="https://codemirror.net/codemirror-5.38.0.zip">Version 5.38.0</a>:</p>
 
   <ul class="rel-note">
     <li>Improve reliability of noticing a missing mouseup event during dragging.</li>
@@ -55,189 +55,189 @@ <h2>Version 5.x</h2>
     <li>Fix interpretation of line breaks and non-breaking spaces inserted by renderer in contentEditable mode.</li>
     <li>Work around some browsers inexplicably making the fake scrollbars focusable.</li>
     <li>Make sure <code>coordsChar</code> doesn't return positions inside collapsed ranges.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support block scopes, bindingless catch, bignum suffix, <code>s</code> regexp flag.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Adjust a wasteful regexp.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Allow opening the control without any item selected.</li>
-    <li>New theme: <a href="http://codemirror.net/demo/theme.html#darcula">darcula</a>.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_dialog">dialog addon</a>: Add a CSS class (<code>dialog-opened</code>) to the editor when a dialog is open.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support block scopes, bindingless catch, bignum suffix, <code>s</code> regexp flag.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Adjust a wasteful regexp.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Allow opening the control without any item selected.</li>
+    <li>New theme: <a href="https://codemirror.net/demo/theme.html#darcula">darcula</a>.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_dialog">dialog addon</a>: Add a CSS class (<code>dialog-opened</code>) to the editor when a dialog is open.</li>
   </ul>
 
-  <p class="rel">20-04-2018: <a href="http://codemirror.net/codemirror-5.37.0.zip">Version 5.37.0</a>:</p>
+  <p class="rel">20-04-2018: <a href="https://codemirror.net/codemirror-5.37.0.zip">Version 5.37.0</a>:</p>
 
   <ul class="rel-note">
     <li>Suppress keypress events during composition, for platforms that don't properly do this themselves.</li>
-    <li><a href="http://codemirror.net/demo/folding.html">xml-fold addon</a>: Improve handling of line-wrapped opening tags.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve TypeScript support.</li>
-    <li><a href="http://codemirror.net/mode/python/">python mode</a>: Highlight expressions inside format strings.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Add support for '(' and ')' movement.</li>
-    <li>New themes: <a href="http://codemirror.net/demo/theme.html#idea">idea</a>, <a href="http://codemirror.net/demo/theme.html#ssms">ssms</a>, <a href="http://codemirror.net/demo/theme.html#gruvbox-dark">gruvbox-dark</a>.</li>
+    <li><a href="https://codemirror.net/demo/folding.html">xml-fold addon</a>: Improve handling of line-wrapped opening tags.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve TypeScript support.</li>
+    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Highlight expressions inside format strings.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add support for '(' and ')' movement.</li>
+    <li>New themes: <a href="https://codemirror.net/demo/theme.html#idea">idea</a>, <a href="https://codemirror.net/demo/theme.html#ssms">ssms</a>, <a href="https://codemirror.net/demo/theme.html#gruvbox-dark">gruvbox-dark</a>.</li>
   </ul>
 
-  <p class="rel">20-03-2018: <a href="http://codemirror.net/codemirror-5.36.0.zip">Version 5.36.0</a>:</p>
+  <p class="rel">20-03-2018: <a href="https://codemirror.net/codemirror-5.36.0.zip">Version 5.36.0</a>:</p>
 
   <ul class="rel-note">
     <li>Make sure all document-level event handlers are registered on the document that the editor is part of.</li>
     <li>Fix issue that prevented edits whose origin starts with <code>+</code> from being combined in history events for an editor-less document.</li>
-    <li><a href="http://codemirror.net/demo/multiplex.html">multiplex addon</a>: Improve handling of indentation.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Use CSS <code>:after</code> element to style the scroll-lock icon.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Don't provide completions in JSON mode.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix numbering error.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Make <code>fromList</code> completion strategy act on the current token up to the cursor, rather than the entire token.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix a regexp with potentially exponental complexity.</li>
-    <li>New theme: <a href="http://codemirror.net/demo/theme.html#lucario">lucario</a>.</li>
+    <li><a href="https://codemirror.net/demo/multiplex.html">multiplex addon</a>: Improve handling of indentation.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Use CSS <code>:after</code> element to style the scroll-lock icon.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Don't provide completions in JSON mode.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix numbering error.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Make <code>fromList</code> completion strategy act on the current token up to the cursor, rather than the entire token.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix a regexp with potentially exponental complexity.</li>
+    <li>New theme: <a href="https://codemirror.net/demo/theme.html#lucario">lucario</a>.</li>
   </ul>
 
-  <p class="rel">20-02-2018: <a href="http://codemirror.net/codemirror-5.35.0.zip">Version 5.35.0</a>:</p>
+  <p class="rel">20-02-2018: <a href="https://codemirror.net/codemirror-5.35.0.zip">Version 5.35.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix problem where selection undo might change read-only documents.</li>
     <li>Fix crash when calling <code>addLineWidget</code> on a document that has no attached editor.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix behavior of <code>^</code> in multiline regexp mode.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Fix problem with matching words that have regexp special syntax in them.</li>
-    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix <code>addCursorToSelection</code> for short lines.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Support alternative delimiters in replace command.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support TypeScript intersection types, dynamic <code>import</code>.</li>
-    <li><a href="http://codemirror.net/mode/stex/">stex mode</a>: Fix parsing of <code>\(</code> <code>\)</code> delimiters, recognize more atom arguments.</li>
-    <li><a href="http://codemirror.net/mode/haskell/">haskell mode</a>: Highlight more builtins, support <code>&lt;*</code> and <code>*&gt;</code>.</li>
-    <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.</li>
-    <li><a href="http://codemirror.net/mode/dockerfile/">dockerfile mode</a>: Highlight strings and ports, recognize more instructions.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix behavior of <code>^</code> in multiline regexp mode.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Fix problem with matching words that have regexp special syntax in them.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix <code>addCursorToSelection</code> for short lines.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support alternative delimiters in replace command.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support TypeScript intersection types, dynamic <code>import</code>.</li>
+    <li><a href="https://codemirror.net/mode/stex/">stex mode</a>: Fix parsing of <code>\(</code> <code>\)</code> delimiters, recognize more atom arguments.</li>
+    <li><a href="https://codemirror.net/mode/haskell/">haskell mode</a>: Highlight more builtins, support <code>&lt;*</code> and <code>*&gt;</code>.</li>
+    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.</li>
+    <li><a href="https://codemirror.net/mode/dockerfile/">dockerfile mode</a>: Highlight strings and ports, recognize more instructions.</li>
   </ul>
 
-  <p class="rel">29-01-2018: <a href="http://codemirror.net/codemirror-5.34.0.zip">Version 5.34.0</a>:</p>
+  <p class="rel">29-01-2018: <a href="https://codemirror.net/codemirror-5.34.0.zip">Version 5.34.0</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix a problem where inline styles would persist across list items.</li>
-    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix the <code>toggleBookmark</code> command.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when closing triple quotes.</li>
-    <li><a href="http://codemirror.net/demo/folding.html">xml-fold addon</a>: Fix folding of line-broken XML tags.</li>
-    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Better handling of nested quoting.</li>
-    <li><a href="http://codemirror.net/demo/lint.html">javascript-lint addon</a>: Clean up and simplify.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix support for multiple editors at the same time.</li>
-    <li>New themes: <a href="http://codemirror.net/demo/theme.html#oceanic-next">oceanic-next</a> and <a href="http://codemirror.net/demo/theme.html#shadowfox">shadowfox</a>.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix a problem where inline styles would persist across list items.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix the <code>toggleBookmark</code> command.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when closing triple quotes.</li>
+    <li><a href="https://codemirror.net/demo/folding.html">xml-fold addon</a>: Fix folding of line-broken XML tags.</li>
+    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Better handling of nested quoting.</li>
+    <li><a href="https://codemirror.net/demo/lint.html">javascript-lint addon</a>: Clean up and simplify.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix support for multiple editors at the same time.</li>
+    <li>New themes: <a href="https://codemirror.net/demo/theme.html#oceanic-next">oceanic-next</a> and <a href="https://codemirror.net/demo/theme.html#shadowfox">shadowfox</a>.</li>
   </ul>
 
-  <p class="rel">21-12-2017: <a href="http://codemirror.net/codemirror-5.33.0.zip">Version 5.33.0</a>:</p>
+  <p class="rel">21-12-2017: <a href="https://codemirror.net/codemirror-5.33.0.zip">Version 5.33.0</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="http://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Make updates more efficient.</li>
-    <li><a href="http://codemirror.net/mode/css/">css mode</a>: The mode is now properly case-insensitive.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix broken handling of unordered lists introduced in previous release.</li>
-    <li><a href="http://codemirror.net/mode/swift">swift</a> and <a href="http://codemirror.net/mode/clike/">scala</a> modes: Support nested block comments.</li>
-    <li><a href="http://codemirror.net/mode/mllike/index.html">mllike mode</a>: Improve OCaml support.</li>
-    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Use the proper key bindings for <code>addCursorToNextLine</code> and <code>addCursorToPrevLine</code>.</li>
-    <li><a href="http://codemirror.net/mode/jsx/index.html">jsx mode</a>: Support JSX fragments.</li>
-    <li><a href="http://codemirror.net/demo/closetag.html">closetag addon</a>: Add an option to disable auto-indenting.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Make updates more efficient.</li>
+    <li><a href="https://codemirror.net/mode/css/">css mode</a>: The mode is now properly case-insensitive.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix broken handling of unordered lists introduced in previous release.</li>
+    <li><a href="https://codemirror.net/mode/swift">swift</a> and <a href="https://codemirror.net/mode/clike/">scala</a> modes: Support nested block comments.</li>
+    <li><a href="https://codemirror.net/mode/mllike/index.html">mllike mode</a>: Improve OCaml support.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Use the proper key bindings for <code>addCursorToNextLine</code> and <code>addCursorToPrevLine</code>.</li>
+    <li><a href="https://codemirror.net/mode/jsx/index.html">jsx mode</a>: Support JSX fragments.</li>
+    <li><a href="https://codemirror.net/demo/closetag.html">closetag addon</a>: Add an option to disable auto-indenting.</li>
   </ul>
 
-  <p class="rel">22-11-2017: <a href="http://codemirror.net/codemirror-5.32.0.zip">Version 5.32.0</a>:</p>
+  <p class="rel">22-11-2017: <a href="https://codemirror.net/codemirror-5.32.0.zip">Version 5.32.0</a>:</p>
 
   <ul class="rel-note">
     <li>Increase contrast on default bracket-matching colors.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of <code>enum</code> and <code>module</code> keywords.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix bug when uncommenting a comment that spans all but the last selected line.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix bug in case folding.</li>
-    <li><a href="http://codemirror.net/demo/emacs.html">emacs bindings</a>: Prevent single-character deletions from resetting the kill ring.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Tweak quote matching behavior.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Increment ordered list numbers when adding one.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of <code>enum</code> and <code>module</code> keywords.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix bug when uncommenting a comment that spans all but the last selected line.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix bug in case folding.</li>
+    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Prevent single-character deletions from resetting the kill ring.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Tweak quote matching behavior.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Increment ordered list numbers when adding one.</li>
   </ul>
 
-  <p class="rel">20-10-2017: <a href="http://codemirror.net/codemirror-5.31.0.zip">Version 5.31.0</a>:</p>
+  <p class="rel">20-10-2017: <a href="https://codemirror.net/codemirror-5.31.0.zip">Version 5.31.0</a>:</p>
 
   <ul class="rel-note">
-    <li>Modes added with <a href="http://codemirror.net/doc/manual.html#addOverlay"><code>addOverlay</code></a> now have access to a <a href="http://codemirror.net/doc/manual.html#baseToken"><code>baseToken</code></a> method on their input stream, giving access to the tokens of the underlying mode.</li>
+    <li>Modes added with <a href="https://codemirror.net/doc/manual.html#addOverlay"><code>addOverlay</code></a> now have access to a <a href="https://codemirror.net/doc/manual.html#baseToken"><code>baseToken</code></a> method on their input stream, giving access to the tokens of the underlying mode.</li>
     <li>Further improve selection drawing and cursor motion in right-to-left documents.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable <a href="http://codemirror.net/doc/manual.html#option_contentEditable">input mode</a>.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_continuecomment">continuecomment addon</a>: Fix bug when pressing enter after a single-line block comment.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix issue with leaving indented fenced code blocks.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable <a href="https://codemirror.net/doc/manual.html#option_contentEditable">input mode</a>.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_continuecomment">continuecomment addon</a>: Fix bug when pressing enter after a single-line block comment.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix issue with leaving indented fenced code blocks.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.</li>
   </ul>
 
-  <p class="rel">20-09-2017: <a href="http://codemirror.net/codemirror-5.30.0.zip">Version 5.30.0</a>:</p>
+  <p class="rel">20-09-2017: <a href="https://codemirror.net/codemirror-5.30.0.zip">Version 5.30.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fixed a number of issues with drawing right-to-left selections and mouse selection in bidirectional text.</li>
-    <li><a href="http://codemirror.net/demo/search/">search addon</a>: Fix crash when restarting search after doing empty search.</li>
+    <li><a href="https://codemirror.net/demo/search/">search addon</a>: Fix crash when restarting search after doing empty search.</li>
     <li><a href="http://cm/doc/manual.html#addon_mark-selection">mark-selection addon</a>: Fix off-by-one bug.</li>
-    <li><a href="http://codemirror.net/demo/tern.html">tern addon</a>: Fix bad request made when editing at the bottom of a large document.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing in a number of corner cases.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.</li>
-    <li><a href="http://codemirror.net/mode/gfm/">gfm mode</a>: Don't highlight SHA1 'hashes' without numbers to avoid false positives.</li>
-    <li><a href="http://codemirror.net/mode/soy/">soy mode</a>: Support injected data and <code>@param</code> in comments.</li>
-    <li><a href="http://codemirror.net/demo/simplemode.html">simple mode addon</a>: Allow groups in regexps when <code>token</code> isn't an array.</li>
+    <li><a href="https://codemirror.net/demo/tern.html">tern addon</a>: Fix bad request made when editing at the bottom of a large document.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing in a number of corner cases.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.</li>
+    <li><a href="https://codemirror.net/mode/gfm/">gfm mode</a>: Don't highlight SHA1 'hashes' without numbers to avoid false positives.</li>
+    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support injected data and <code>@param</code> in comments.</li>
+    <li><a href="https://codemirror.net/demo/simplemode.html">simple mode addon</a>: Allow groups in regexps when <code>token</code> isn't an array.</li>
   </ul>
 
-  <p class="rel">24-08-2017: <a href="http://codemirror.net/codemirror-5.29.0.zip">Version 5.29.0</a>:</p>
+  <p class="rel">24-08-2017: <a href="https://codemirror.net/codemirror-5.29.0.zip">Version 5.29.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix crash in contentEditable input style when editing near a bookmark.</li>
-    <li>Make sure change origins are preserved when splitting changes on <a href="http://codemirror.net/doc/manual.html#mark_readOnly">read-only marks</a>.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: More support for TypeScript syntax.</li>
-    <li><a href="http://codemirror.net/mode/d/">d mode</a>: Support nested comments.</li>
-    <li><a href="http://codemirror.net/mode/python/">python mode</a>: Improve tokenizing of operators.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Further improve CommonMark conformance.</li>
-    <li><a href="http://codemirror.net/mode/css/">css mode</a>: Don't run comment tokens through the mode's state machine.</li>
-    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Allow strings to span lines.</li>
-    <li><a href="http://codemirror.net/demo/search/">search addon</a>: Fix crash in persistent search when <code>extraKeys</code> is null.</li>
+    <li>Make sure change origins are preserved when splitting changes on <a href="https://codemirror.net/doc/manual.html#mark_readOnly">read-only marks</a>.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: More support for TypeScript syntax.</li>
+    <li><a href="https://codemirror.net/mode/d/">d mode</a>: Support nested comments.</li>
+    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Improve tokenizing of operators.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Further improve CommonMark conformance.</li>
+    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Don't run comment tokens through the mode's state machine.</li>
+    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Allow strings to span lines.</li>
+    <li><a href="https://codemirror.net/demo/search/">search addon</a>: Fix crash in persistent search when <code>extraKeys</code> is null.</li>
   </ul>
 
-  <p class="rel">21-07-2017: <a href="http://codemirror.net/codemirror-5.28.0.zip">Version 5.28.0</a>:</p>
+  <p class="rel">21-07-2017: <a href="https://codemirror.net/codemirror-5.28.0.zip">Version 5.28.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix copying of, or replacing editor content with, a single dash character when copying a big selection in some corner cases.</li>
-    <li>Make <a href="http://codemirror.net/doc/manual.html#command_goLineLeft"><code>&quot;goLineLeft&quot;</code></a>/<code>&quot;goLineRight&quot;</code> behave better on wrapped lines.</li>
-    <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Fix tokenizing of multi-dot operator and allow digits in subfield names.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix infinite loop on some composed character inputs.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Make list parsing more CommonMark-compliant.</li>
-    <li><a href="http://codemirror.net/mode/gfm/">gfm mode</a>: Highlight colon syntax for emoji.</li>
+    <li>Make <a href="https://codemirror.net/doc/manual.html#command_goLineLeft"><code>&quot;goLineLeft&quot;</code></a>/<code>&quot;goLineRight&quot;</code> behave better on wrapped lines.</li>
+    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Fix tokenizing of multi-dot operator and allow digits in subfield names.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix infinite loop on some composed character inputs.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Make list parsing more CommonMark-compliant.</li>
+    <li><a href="https://codemirror.net/mode/gfm/">gfm mode</a>: Highlight colon syntax for emoji.</li>
   </ul>
 
-  <p class="rel">29-06-2017: <a href="http://codemirror.net/codemirror-5.27.4.zip">Version 5.27.4</a>:</p>
+  <p class="rel">29-06-2017: <a href="https://codemirror.net/codemirror-5.27.4.zip">Version 5.27.4</a>:</p>
 
   <ul class="rel-note">
     <li>Fix crash when using mode lookahead.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Don't block inner mode's indentation support.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Don't block inner mode's indentation support.</li>
   </ul>
 
-  <p class="rel">22-06-2017: <a href="http://codemirror.net/codemirror-5.27.2.zip">Version 5.27.2</a>:</p>
+  <p class="rel">22-06-2017: <a href="https://codemirror.net/codemirror-5.27.2.zip">Version 5.27.2</a>:</p>
 
   <ul class="rel-note">
-    <li>Fix crash in the <a href="http://codemirror.net/demo/simplemode.html">simple mode</a> addon.</li>
+    <li>Fix crash in the <a href="https://codemirror.net/demo/simplemode.html">simple mode</a> addon.</li>
   </ul>
 
-  <p class="rel">22-06-2017: <a href="http://codemirror.net/codemirror-5.27.0.zip">Version 5.27.0</a>:</p>
+  <p class="rel">22-06-2017: <a href="https://codemirror.net/codemirror-5.27.0.zip">Version 5.27.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix infinite loop in forced display update.</li>
     <li>Properly disable the hidden textarea when <code>readOnly</code> is <code>&quot;nocursor&quot;</code>.</li>
     <li>Calling the <code>Doc</code> constructor without <code>new</code> works again.</li>
-    <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Handle nested comments.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix bug where markup was ignored on indented paragraph lines.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Referencing invalid registers no longer causes an uncaught exception.</li>
-    <li><a href="http://codemirror.net/mode/rust/">rust mode</a>: Add the correct MIME type.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Document options.</li>
+    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Handle nested comments.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix bug where markup was ignored on indented paragraph lines.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Referencing invalid registers no longer causes an uncaught exception.</li>
+    <li><a href="https://codemirror.net/mode/rust/">rust mode</a>: Add the correct MIME type.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Document options.</li>
     <li>Mouse button clicks can now be bound in keymaps by using names like <code>&quot;LeftClick&quot;</code> or <code>&quot;Ctrl-Alt-MiddleTripleClick&quot;</code>. When bound to a function, that function will be passed the position of the click as second argument.</li>
-    <li>The behavior of mouse selection and dragging can now be customized with the <a href="http://codemirror.net/doc/manual.html#option_configureMouse"><code>configureMouse</code></a> option.</li>
-    <li>Modes can now look ahead across line boundaries with the <a href="http://codemirror.net/doc/manual.html#StringStream"><code>StringStream</code></a><code>.lookahead</code> method.</li>
+    <li>The behavior of mouse selection and dragging can now be customized with the <a href="https://codemirror.net/doc/manual.html#option_configureMouse"><code>configureMouse</code></a> option.</li>
+    <li>Modes can now look ahead across line boundaries with the <a href="https://codemirror.net/doc/manual.html#StringStream"><code>StringStream</code></a><code>.lookahead</code> method.</li>
     <li>Introduces a <code>&quot;type&quot;</code> token type, makes modes that recognize types output it, and add styling for it to the themes.</li>
-    <li>New <a href="http://codemirror.net/doc/manual.html#option_pasteLinesPerSelection"><code>pasteLinesPerSelection</code></a> option to control the behavior of pasting multiple lines into multiple selections.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support multi-line regular expression matches, and normalize strings when matching.</li>
+    <li>New <a href="https://codemirror.net/doc/manual.html#option_pasteLinesPerSelection"><code>pasteLinesPerSelection</code></a> option to control the behavior of pasting multiple lines into multiple selections.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support multi-line regular expression matches, and normalize strings when matching.</li>
   </ul>
 
-  <p class="rel">22-05-2017: <a href="http://codemirror.net/codemirror-5.26.0.zip">Version 5.26.0</a>:</p>
+  <p class="rel">22-05-2017: <a href="https://codemirror.net/codemirror-5.26.0.zip">Version 5.26.0</a>:</p>
 
   <ul class="rel-note">
     <li>In textarea-mode, don't reset the input field during composition.</li>
     <li>More careful restoration of selections in widgets, during editor redraw.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Parse line offsets in line or range specs.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: More TypeScript parsing fixes.</li>
-    <li><a href="http://codemirror.net/mode/julia/">julia mode</a>: Fix issue where the mode gets stuck.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Understand cross-line links, parse all bracketed things as links.</li>
-    <li><a href="http://codemirror.net/mode/soy/">soy mode</a>: Support single-quoted strings.</li>
-    <li><a href="http://codemirror.net/mode/go/">go mode</a>: Don't try to indent inside strings or comments.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Parse line offsets in line or range specs.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: More TypeScript parsing fixes.</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix issue where the mode gets stuck.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Understand cross-line links, parse all bracketed things as links.</li>
+    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support single-quoted strings.</li>
+    <li><a href="https://codemirror.net/mode/go/">go mode</a>: Don't try to indent inside strings or comments.</li>
   </ul>
 
-  <p class="rel">20-04-2017: <a href="http://codemirror.net/codemirror-5.25.2.zip">Version 5.25.2</a>:</p>
+  <p class="rel">20-04-2017: <a href="https://codemirror.net/codemirror-5.25.2.zip">Version 5.25.2</a>:</p>
 
   <ul class="rel-note">
     <li>Better handling of selections that cover the whole viewport in contentEditable-mode.</li>
@@ -245,12 +245,12 @@ <h2>Version 5.x</h2>
     <li>Work around Chrome Android bug when converting screen coordinates to editor positions.</li>
     <li>Make sure long-clicking a selection sets a cursor and doesn't show the editor losing focus.</li>
     <li>Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Recognize annotations and TypeScript-style type parameters.</li>
-    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Handle nested braces.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Make parsing of strong/em delimiters CommonMark-compliant.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Recognize annotations and TypeScript-style type parameters.</li>
+    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Handle nested braces.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Make parsing of strong/em delimiters CommonMark-compliant.</li>
   </ul>
 
-  <p class="rel">20-03-2017: <a href="http://codemirror.net/codemirror-5.25.0.zip">Version 5.25.0</a>:</p>
+  <p class="rel">20-03-2017: <a href="https://codemirror.net/codemirror-5.25.0.zip">Version 5.25.0</a>:</p>
 
   <ul class=rel-note>
     <li>In contentEditable-mode, properly locate changes that repeat a character when inserted with IME.</li>
@@ -259,163 +259,163 @@ <h2>Version 5.x</h2>
     <li>Count Unicode control characters 0x80 to 0x9F as special (non-printing) chars.</li>
     <li>Fix handling of shadow DOM roots when finding the active element.</li>
     <li>Add <code>role=presentation</code> to more DOM elements to improve screen reader support.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Make aligning of unchanged chunks more robust.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
-    <li><a href="http://codemirror.net/mode/r/">r mode</a>: Fix indentation after semicolon-less statements.</li>
-    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Properly handle escaped parentheses in parenthesized expressions.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix a few bugs around leaving fenced code blocks.</li>
-    <li><a href="http://codemirror.net/mode/soy/">soy mode</a>: Improve indentation.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Support asynchronous linters that return promises.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Support continuing task lists.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Make Y behave like yy.</li>
-    <li><a href="http://codemirror.net/mode/sql/">sql mode</a>: Support sqlite dialect.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Make aligning of unchanged chunks more robust.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
+    <li><a href="https://codemirror.net/mode/r/">r mode</a>: Fix indentation after semicolon-less statements.</li>
+    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Properly handle escaped parentheses in parenthesized expressions.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix a few bugs around leaving fenced code blocks.</li>
+    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Improve indentation.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Support asynchronous linters that return promises.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Support continuing task lists.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Make Y behave like yy.</li>
+    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Support sqlite dialect.</li>
   </ul>
 
-  <p class="rel">22-02-2017: <a href="http://codemirror.net/codemirror-5.24.2.zip">Version 5.24.2</a>:</p>
+  <p class="rel">22-02-2017: <a href="https://codemirror.net/codemirror-5.24.2.zip">Version 5.24.2</a>:</p>
 
   <ul class=rel-note>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support computed class method names.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Improve aligning of unchanged code in the presence of marks and line widgets.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support computed class method names.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Improve aligning of unchanged code in the presence of marks and line widgets.</li>
   </ul>
 
-  <p class="rel">20-02-2017: <a href="http://codemirror.net/codemirror-5.24.0.zip">Version 5.24.0</a>:</p>
+  <p class="rel">20-02-2017: <a href="https://codemirror.net/codemirror-5.24.0.zip">Version 5.24.0</a>:</p>
 
   <ul class=rel-note>
     <li>Positions now support a <code>sticky</code> property which determines whether they should be associated with the character before (value <code>"before"</code>) or after (value <code>"after"</code>) them.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Make it possible to remove built-in bindings through the API.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Make it possible to remove built-in bindings through the API.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.</li>
     <li>A cursor directly before a line-wrapping break is now drawn before or after the line break depending on which direction you arrived from.</li>
     <li>Visual cursor motion in line-wrapped right-to-left text should be much more correct.</li>
     <li>Fix bug in handling of read-only marked text.</li>
-    <li><a href="http://codemirror.net/mode/shell/">shell mode</a>: Properly tokenize nested parentheses.</li>
-    <li><a href="http://codemirror.net/mode/python/">python mode</a>: Support underscores in number literals.</li>
-    <li><a href="http://codemirror.net/mode/sass/">sass mode</a>: Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset. Now depends on the css mode.</li>
-    <li><a href="http://codemirror.net/mode/css/">css mode</a>: Expose <code>lineComment</code> property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.</li>
-    <li><a href="http://codemirror.net/mode/julia/">julia mode</a>: Properly indent <code>elseif</code> lines.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Properly recognize the end of fenced code blocks when inside other markup.</li>
-    <li><a href="http://codemirror.net/mode/clike/">scala mode</a>: Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.</li>
-    <li><a href="http://codemirror.net/mode/xml/">xml mode</a>: Allow dashes in HTML tag names.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing of async methods, TypeScript-style comma-separated superclass lists.</li>
-    <li><a href="http://codemirror.net/demo/folding.html">indent-fold addon</a>: Ignore comment lines.</li>
+    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Properly tokenize nested parentheses.</li>
+    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Support underscores in number literals.</li>
+    <li><a href="https://codemirror.net/mode/sass/">sass mode</a>: Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset. Now depends on the css mode.</li>
+    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Expose <code>lineComment</code> property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Properly indent <code>elseif</code> lines.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Properly recognize the end of fenced code blocks when inside other markup.</li>
+    <li><a href="https://codemirror.net/mode/clike/">scala mode</a>: Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.</li>
+    <li><a href="https://codemirror.net/mode/xml/">xml mode</a>: Allow dashes in HTML tag names.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing of async methods, TypeScript-style comma-separated superclass lists.</li>
+    <li><a href="https://codemirror.net/demo/folding.html">indent-fold addon</a>: Ignore comment lines.</li>
   </ul>
 
-  <p class="rel">19-01-2017: <a href="http://codemirror.net/codemirror-5.23.0.zip">Version 5.23.0</a>:</p>
+  <p class="rel">19-01-2017: <a href="https://codemirror.net/codemirror-5.23.0.zip">Version 5.23.0</a>:</p>
 
   <ul class=rel-note>
     <li>Presentation-related elements DOM elements are now marked as such to help screen readers.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Be more picky about what HTML tags look like to avoid false positives.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Be more picky about what HTML tags look like to avoid false positives.</li>
     <li><code>findModeByMIME</code> now understands <code>+json</code> and <code>+xml</code> MIME suffixes.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Add support for an <code>override</code> option to ignore language-specific defaults.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Add a <code>stable</code> option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Add support for an <code>override</code> option to ignore language-specific defaults.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Add a <code>stable</code> option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.</li>
   </ul>
 
-  <p class="rel">20-12-2016: <a href="http://codemirror.net/codemirror-5.22.0.zip">Version 5.22.0</a>:</p>
+  <p class="rel">20-12-2016: <a href="https://codemirror.net/codemirror-5.22.0.zip">Version 5.22.0</a>:</p>
 
   <ul class=rel-note>
-    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Make <code>selectBetweenBrackets</code> work with multiple cursors.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Fix issues with parsing complex TypeScript types, imports, and exports.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Make <code>selectBetweenBrackets</code> work with multiple cursors.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Fix issues with parsing complex TypeScript types, imports, and exports.</li>
     <li>A contentEditable editor instance with autofocus enabled no longer crashes during initializing.</li>
-    <li><a href="http://codemirror.net/demo/emacs.html">emacs bindings</a>: Export <code>CodeMirror.emacs</code> to allow other addons to hook into Emacs-style functionality.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_active-line">active-line addon</a>: Add <code>nonEmpty</code> option.</li>
-    <li>New event: <a href="http://codemirror.net/doc/manual.html#event_optionChange"><code>optionChange</code></a>.</li>
+    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Export <code>CodeMirror.emacs</code> to allow other addons to hook into Emacs-style functionality.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_active-line">active-line addon</a>: Add <code>nonEmpty</code> option.</li>
+    <li>New event: <a href="https://codemirror.net/doc/manual.html#event_optionChange"><code>optionChange</code></a>.</li>
   </ul>
 
-  <p class="rel">21-11-2016: <a href="http://codemirror.net/codemirror-5.21.0.zip">Version 5.21.0</a>:</p>
+  <p class="rel">21-11-2016: <a href="https://codemirror.net/codemirror-5.21.0.zip">Version 5.21.0</a>:</p>
 
   <ul class=rel-note>
-    <li>Tapping/clicking the editor in <a href="http://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a> on Chrome now puts the cursor at the tapped position.</li>
-    <li>Fix various crashes and misbehaviors when reading composition events in <a href="http://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a>.</li>
+    <li>Tapping/clicking the editor in <a href="https://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a> on Chrome now puts the cursor at the tapped position.</li>
+    <li>Fix various crashes and misbehaviors when reading composition events in <a href="https://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a>.</li>
     <li>Catches and ignores an IE 'Unspecified Error' when creating an editor in an iframe before there is a <code>&lt;body&gt;</code>.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Fix several issues in the chunk-aligning feature.</li>
-    <li><a href="http://codemirror.net/mode/verilog">verilog mode</a>: Rewritten to address various issues.</li>
-    <li><a href="http://codemirror.net/mode/julia">julia mode</a>: Recognize Julia 0.5 syntax.</li>
-    <li><a href="http://codemirror.net/mode/swift">swift mode</a>: Various fixes and adjustments to current syntax.</li>
-    <li><a href="http://codemirror.net/mode/markdown">markdown mode</a>: Allow lists without a blank line above them.</li>
-    <li>The <a href="http://codemirror.net/doc/manual.html#setGutterMarker"><code>setGutterMarker</code></a>, <a href="http://codemirror.net/doc/manual.html#clearGutter"><code>clearGutter</code></a>, and <a href="http://codemirror.net/doc/manual.html#lineInfo"><code>lineInfo</code></a> methods are now available on <code>Doc</code> objects.</li>
-    <li>The <a href="http://codemirror.net/doc/manual.html#heightAtLine"><code>heightAtLine</code></a> method now takes an extra argument to allow finding the height at the top of the line's line widgets.</li>
-    <li><a href="http://codemirror.net/mode/ruby">ruby mode</a>: <code>else</code> and <code>elsif</code> are now immediately indented.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Fix several issues in the chunk-aligning feature.</li>
+    <li><a href="https://codemirror.net/mode/verilog">verilog mode</a>: Rewritten to address various issues.</li>
+    <li><a href="https://codemirror.net/mode/julia">julia mode</a>: Recognize Julia 0.5 syntax.</li>
+    <li><a href="https://codemirror.net/mode/swift">swift mode</a>: Various fixes and adjustments to current syntax.</li>
+    <li><a href="https://codemirror.net/mode/markdown">markdown mode</a>: Allow lists without a blank line above them.</li>
+    <li>The <a href="https://codemirror.net/doc/manual.html#setGutterMarker"><code>setGutterMarker</code></a>, <a href="https://codemirror.net/doc/manual.html#clearGutter"><code>clearGutter</code></a>, and <a href="https://codemirror.net/doc/manual.html#lineInfo"><code>lineInfo</code></a> methods are now available on <code>Doc</code> objects.</li>
+    <li>The <a href="https://codemirror.net/doc/manual.html#heightAtLine"><code>heightAtLine</code></a> method now takes an extra argument to allow finding the height at the top of the line's line widgets.</li>
+    <li><a href="https://codemirror.net/mode/ruby">ruby mode</a>: <code>else</code> and <code>elsif</code> are now immediately indented.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.</li>
   </ul>
 
-  <p class="rel">20-10-2016: <a href="http://codemirror.net/codemirror-5.20.0.zip">Version 5.20.0</a>:</p>
+  <p class="rel">20-10-2016: <a href="https://codemirror.net/codemirror-5.20.0.zip">Version 5.20.0</a>:</p>
 
   <ul class=rel-note>
     <li>Make <code>newlineAndIndent</code> command work with multiple cursors on the same line.</li>
     <li>Make sure keypress events for backspace are ignored.</li>
     <li>Tokens styled with overlays no longer get a nonsense <code>cm-cm-overlay</code> class.</li>
-    <li>Line endings for pasted content are now normalized to the editor's <a href="http://codemirror.net/doc/manual.html#option_lineSeparator">preferred ending</a>.</li>
-    <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Improve support for class expressions. Support TypeScript optional class properties, the <code>abstract</code> keyword, and return type declarations for arrow functions.</li>
-    <li><a href="http://codemirror.net/mode/css">css mode</a>: Fix highlighting of mixed-case keywords.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when typing a quote before a string.</li>
+    <li>Line endings for pasted content are now normalized to the editor's <a href="https://codemirror.net/doc/manual.html#option_lineSeparator">preferred ending</a>.</li>
+    <li><a href="https://codemirror.net/mode/javascript">javascript mode</a>: Improve support for class expressions. Support TypeScript optional class properties, the <code>abstract</code> keyword, and return type declarations for arrow functions.</li>
+    <li><a href="https://codemirror.net/mode/css">css mode</a>: Fix highlighting of mixed-case keywords.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when typing a quote before a string.</li>
     <li>The core is now maintained as a number of small files, using ES6 syntax and modules, under the <code>src/</code> directory. A git checkout no longer contains a working <code>codemirror.js</code> until you <code>npm build</code> (but when installing from NPM, it is included).</li>
-    <li>The <a href="http://codemirror.net/doc/manual.html#event_refresh"><code>refresh</code></a> event is now documented and stable.</li>
+    <li>The <a href="https://codemirror.net/doc/manual.html#event_refresh"><code>refresh</code></a> event is now documented and stable.</li>
   </ul>
 
-  <p class="rel">20-09-2016: <a href="http://codemirror.net/codemirror-5.19.0.zip">Version 5.19.0</a>:</p>
+  <p class="rel">20-09-2016: <a href="https://codemirror.net/codemirror-5.19.0.zip">Version 5.19.0</a>:</p>
 
   <ul class=rel-note>
-    <li><a href="http://codemirror.net/mode/erlang">erlang mode</a>: Fix mode crash when trying to read an empty context.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix broken behavior when toggling comments inside a comment.</li>
+    <li><a href="https://codemirror.net/mode/erlang">erlang mode</a>: Fix mode crash when trying to read an empty context.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix broken behavior when toggling comments inside a comment.</li>
     <li>xml-fold addon: Fix a null-dereference bug.</li>
     <li>Page up and page down now do something even in single-line documents.</li>
     <li>Fix an issue where the cursor position could be off in really long (~8000 character) tokens.</li>
-    <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the <code>type</code> keyword.</li>
-    <li>The <a href="http://codemirror.net/doc/manual.html#event_blur"><code>blur</code></a> and <a href="http://codemirror.net/doc/manual.html#event_focus"><code>focus</code></a> events now pass the DOM event to their handlers.</li>
+    <li><a href="https://codemirror.net/mode/javascript">javascript mode</a>: Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the <code>type</code> keyword.</li>
+    <li>The <a href="https://codemirror.net/doc/manual.html#event_blur"><code>blur</code></a> and <a href="https://codemirror.net/doc/manual.html#event_focus"><code>focus</code></a> events now pass the DOM event to their handlers.</li>
   </ul>
 
-  <p class="rel">23-08-2016: <a href="http://codemirror.net/codemirror-5.18.2.zip">Version 5.18.2</a>:</p>
+  <p class="rel">23-08-2016: <a href="https://codemirror.net/codemirror-5.18.2.zip">Version 5.18.2</a>:</p>
 
   <ul class=rel-note>
-    <li><a href="http://codemirror.net/mode/vue">vue mode</a>: Fix outdated references to renamed Pug mode dependency.</li>
+    <li><a href="https://codemirror.net/mode/vue">vue mode</a>: Fix outdated references to renamed Pug mode dependency.</li>
   </ul>
 
-  <p class="rel">22-08-2016: <a href="http://codemirror.net/codemirror-5.18.0.zip">Version 5.18.0</a>:</p>
+  <p class="rel">22-08-2016: <a href="https://codemirror.net/codemirror-5.18.0.zip">Version 5.18.0</a>:</p>
 
   <ul class=rel-note>
-    <li>Make sure <a href="http://codemirror.net/doc/manual.html#addLineClass">gutter backgrounds</a> stick to the rest of the gutter during horizontal scrolling.</li>
-    <li>The contenteditable <a href="http://codemirror.net/doc/manual.html#option_inputStyle"><code>inputStyle</code></a> now properly supports pasting on pre-Edge IE versions.</li>
-    <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Fix some small parsing bugs and improve TypeScript support.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix bug where active highlighting was left in editor when the addon was disabled.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Only start highlighting things when the editor gains focus.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Also complete non-enumerable properties.</li>
-    <li>The <a href="http://codemirror.net/doc/manual.html#addOverlay"><code>addOverlay</code></a> method now supports a <code>priority</code> option to control the order in which overlays are applied.</li>
+    <li>Make sure <a href="https://codemirror.net/doc/manual.html#addLineClass">gutter backgrounds</a> stick to the rest of the gutter during horizontal scrolling.</li>
+    <li>The contenteditable <a href="https://codemirror.net/doc/manual.html#option_inputStyle"><code>inputStyle</code></a> now properly supports pasting on pre-Edge IE versions.</li>
+    <li><a href="https://codemirror.net/mode/javascript">javascript mode</a>: Fix some small parsing bugs and improve TypeScript support.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix bug where active highlighting was left in editor when the addon was disabled.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Only start highlighting things when the editor gains focus.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Also complete non-enumerable properties.</li>
+    <li>The <a href="https://codemirror.net/doc/manual.html#addOverlay"><code>addOverlay</code></a> method now supports a <code>priority</code> option to control the order in which overlays are applied.</li>
     <li>MIME types that end in <code>+json</code> now default to the JSON mode when the MIME itself is not defined.</li>
-    <li>The mode formerly known as Jade was renamed to <a href="http://codemirror.net/mode/pug">Pug</a>.</li>
-    <li>The <a href="http://codemirror.net/mode/python">Python mode</a> now defaults to Python 3 (rather than 2) syntax.</li>
+    <li>The mode formerly known as Jade was renamed to <a href="https://codemirror.net/mode/pug">Pug</a>.</li>
+    <li>The <a href="https://codemirror.net/mode/python">Python mode</a> now defaults to Python 3 (rather than 2) syntax.</li>
   </ul>
 
-  <p class="rel">19-07-2016: <a href="http://codemirror.net/codemirror-5.17.0.zip">Version 5.17.0</a>:</p>
+  <p class="rel">19-07-2016: <a href="https://codemirror.net/codemirror-5.17.0.zip">Version 5.17.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix problem with wrapped trailing whitespace displaying incorrectly.</li>
     <li>Prevent IME dialog from overlapping typed content in Chrome.</li>
     <li>Improve measuring of characters near a line wrap.</li>
-    <li><a href="http://codemirror.net/mode/javascript">javascript mode</a>: Improve support for <code>async</code>, allow trailing commas in <code>import</code> lists.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Fix backspace in replace mode.</li>
-    <li><a href="http://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix some key bindings on OS X to match Sublime Text.</li>
-    <li><a href="http://codemirror.net/mode/markdown">markdown mode</a>: Add more classes to image links in highlight-formatting mode.</li>
+    <li><a href="https://codemirror.net/mode/javascript">javascript mode</a>: Improve support for <code>async</code>, allow trailing commas in <code>import</code> lists.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix backspace in replace mode.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix some key bindings on OS X to match Sublime Text.</li>
+    <li><a href="https://codemirror.net/mode/markdown">markdown mode</a>: Add more classes to image links in highlight-formatting mode.</li>
   </ul>
 
-  <p class="rel">20-06-2016: <a href="http://codemirror.net/codemirror-5.16.0.zip">Version 5.16.0</a>:</p>
+  <p class="rel">20-06-2016: <a href="https://codemirror.net/codemirror-5.16.0.zip">Version 5.16.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix glitches when dragging content caused by the drop indicator receiving mouse events.</li>
     <li>Make Control-drag work on Firefox.</li>
     <li>Make clicking or selection-dragging at the end of a wrapped line select the right position.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Prevent widget scrollbar from hiding part of the hint text.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_rulers">rulers addon</a>: Prevent rulers from forcing a horizontal editor scrollbar.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_search">search addon</a>: Automatically bind search-related keys in persistent dialog.</li>
-    <li><a href="http://codemirror.net/demo/sublime.html">sublime keymap</a>: Add a multi-cursor aware smart backspace binding.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Prevent widget scrollbar from hiding part of the hint text.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_rulers">rulers addon</a>: Prevent rulers from forcing a horizontal editor scrollbar.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_search">search addon</a>: Automatically bind search-related keys in persistent dialog.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime keymap</a>: Add a multi-cursor aware smart backspace binding.</li>
   </ul>
 
-  <p class="rel">20-05-2016: <a href="http://codemirror.net/codemirror-5.15.2.zip">Version 5.15.2</a>:</p>
+  <p class="rel">20-05-2016: <a href="https://codemirror.net/codemirror-5.15.2.zip">Version 5.15.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix a critical document corruption bug that occurs when a document is gradually grown.</li>
   </ul>
 
-  <p class="rel">20-05-2016: <a href="http://codemirror.net/codemirror-5.15.0.zip">Version 5.15.0</a>:</p>
+  <p class="rel">20-05-2016: <a href="https://codemirror.net/codemirror-5.15.0.zip">Version 5.15.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix bug that caused the selection to reset when focusing the editor in contentEditable input mode.</li>
@@ -424,77 +424,77 @@ <h2>Version 5.x</h2>
     <li>Fix issue where the editor would complain about overlapping collapsed ranges when there weren't any.</li>
     <li>Optimize document tree building when loading or pasting huge chunks of content.</li>
     <li>Explicitly bind Ctrl-O on OS X to make that binding (“open line”) act as expected.</li>
-    <li>Pasting <a href="http://codemirror.net/doc/manual.html#option_lineWiseCopyCut">linewise-copied</a> content when there is no selection now inserts the lines above the current line.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">markdown mode</a>: Fix several issues in matching link targets.</li>
-    <li><a href="http://codemirror.net/mode/clike/">clike mode</a>: Improve indentation of C++ template declarations.</li>
-    <li><a href="http://codemirror.net/mode/javascript/">javascript mode</a>: Support <code>async</code>/<code>await</code> and improve support for TypeScript type syntax.</li>
-  </ul>
-
-  <p class="rel">20-04-2016: <a href="http://codemirror.net/codemirror-5.14.0.zip">Version 5.14.0</a>:</p>
-
-  <ul class="rel-note">
-    <li><a href="http://codemirror.net/doc/manual.html#posFromIndex"><code>posFromIndex</code></a> and <a href="http://codemirror.net/doc/manual.html#indexFromPos"><code>indexFromPos</code></a> now take <a href="http://codemirror.net/doc/manual.html#option_lineSeparator"><code>lineSeparator</code></a> into account</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Only call <code>.save()</code> when it is actually available</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Be careful not to mangle multi-line strings</li>
-    <li><a href="http://codemirror.net/mode/python/index.html">Python mode</a>: Improve distinguishing of decorators from <code>@</code> operators</li>
-    <li><a href="http://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a>: No longer return marks that touch but don't overlap given range</li>
-    <li><a href="http://codemirror.net/demo/vim.html">vim bindings</a>: Add yank command</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Add <code>trim</code> option to disable ignoring of whitespace</li>
-    <li><a href="http://codemirror.net/mode/powershell/index.html">PowerShell mode</a>: Added</li>
-    <li><a href="http://codemirror.net/mode/yacas/index.html">Yacas mode</a>: Added</li>
-    <li><a href="http://codemirror.net/mode/webidl/index.html">Web IDL mode</a>: Added</li>
-    <li><a href="http://codemirror.net/mode/sas/index.html">SAS mode</a>: Added</li>
-    <li><a href="http://codemirror.net/mode/mbox/index.html">mbox mode</a>: Added</li>
+    <li>Pasting <a href="https://codemirror.net/doc/manual.html#option_lineWiseCopyCut">linewise-copied</a> content when there is no selection now inserts the lines above the current line.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix several issues in matching link targets.</li>
+    <li><a href="https://codemirror.net/mode/clike/">clike mode</a>: Improve indentation of C++ template declarations.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support <code>async</code>/<code>await</code> and improve support for TypeScript type syntax.</li>
+  </ul>
+
+  <p class="rel">20-04-2016: <a href="https://codemirror.net/codemirror-5.14.0.zip">Version 5.14.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/doc/manual.html#posFromIndex"><code>posFromIndex</code></a> and <a href="https://codemirror.net/doc/manual.html#indexFromPos"><code>indexFromPos</code></a> now take <a href="https://codemirror.net/doc/manual.html#option_lineSeparator"><code>lineSeparator</code></a> into account</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Only call <code>.save()</code> when it is actually available</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Be careful not to mangle multi-line strings</li>
+    <li><a href="https://codemirror.net/mode/python/index.html">Python mode</a>: Improve distinguishing of decorators from <code>@</code> operators</li>
+    <li><a href="https://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a>: No longer return marks that touch but don't overlap given range</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add yank command</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Add <code>trim</code> option to disable ignoring of whitespace</li>
+    <li><a href="https://codemirror.net/mode/powershell/index.html">PowerShell mode</a>: Added</li>
+    <li><a href="https://codemirror.net/mode/yacas/index.html">Yacas mode</a>: Added</li>
+    <li><a href="https://codemirror.net/mode/webidl/index.html">Web IDL mode</a>: Added</li>
+    <li><a href="https://codemirror.net/mode/sas/index.html">SAS mode</a>: Added</li>
+    <li><a href="https://codemirror.net/mode/mbox/index.html">mbox mode</a>: Added</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.13.4...5.14.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">21-03-2016: <a href="http://codemirror.net/codemirror-5.13.2.zip">Version 5.13.2</a>:</p>
+  <p class="rel">21-03-2016: <a href="https://codemirror.net/codemirror-5.13.2.zip">Version 5.13.2</a>:</p>
 
   <ul class="rel-note">
     <li>Solves a problem where the gutter would sometimes not extend all the way to the end of the document.</li>
   </ul>
 
-  <p class="rel">21-03-2016: <a href="http://codemirror.net/codemirror-5.13.zip">Version 5.13</a>:</p>
+  <p class="rel">21-03-2016: <a href="https://codemirror.net/codemirror-5.13.zip">Version 5.13</a>:</p>
 
   <ul class="rel-note">
-    <li>New DOM event forwarded: <a href="http://codemirror.net/doc/manual.html#event_dom"><code>&quot;dragleave&quot;</code></a>.</li>
-    <li><a href="http://codemirror.net/mode/protobuf/index.html">protobuf mode</a>: Newly added.</li>
-    <li>Fix problem where <a href="http://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a> sometimes failed to find multi-line marks.</li>
+    <li>New DOM event forwarded: <a href="https://codemirror.net/doc/manual.html#event_dom"><code>&quot;dragleave&quot;</code></a>.</li>
+    <li><a href="https://codemirror.net/mode/protobuf/index.html">protobuf mode</a>: Newly added.</li>
+    <li>Fix problem where <a href="https://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a> sometimes failed to find multi-line marks.</li>
     <li>Fix crash that showed up when atomic ranges and bidi text were combined.</li>
-    <li><a href="http://codemirror.net/demo/complete.html">show-hint addon</a>: Completion widgets no longer close when the line indented or dedented.</li>
-    <li><a href="http://codemirror.net/demo/merge.html">merge addon</a>: Fix bug when merging chunks at the end of the file.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: No longer gets confused by <a href="http://codemirror.net/doc/manual.html#swapDoc"><code>swapDoc</code></a>.</li>
-    <li><a href="http://codemirror.net/doc/manual.html#addon_simplescrollbars">simplescrollbars addon</a>: Fix invalid state when deleting at end of document.</li>
-    <li><a href="http://codemirror.net/mode/clike/index.html">clike mode</a>: No longer gets confused when a comment starts after an operator.</li>
-    <li><a href="http://codemirror.net/mode/markdown/index.html">markdown mode</a>: Now supports CommonMark-style flexible list indentation.</li>
-    <li><a href="http://codemirror.net/mode/dylan/index.html">dylan mode</a>: Several improvements and fixes.</li>
+    <li><a href="https://codemirror.net/demo/complete.html">show-hint addon</a>: Completion widgets no longer close when the line indented or dedented.</li>
+    <li><a href="https://codemirror.net/demo/merge.html">merge addon</a>: Fix bug when merging chunks at the end of the file.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: No longer gets confused by <a href="https://codemirror.net/doc/manual.html#swapDoc"><code>swapDoc</code></a>.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_simplescrollbars">simplescrollbars addon</a>: Fix invalid state when deleting at end of document.</li>
+    <li><a href="https://codemirror.net/mode/clike/index.html">clike mode</a>: No longer gets confused when a comment starts after an operator.</li>
+    <li><a href="https://codemirror.net/mode/markdown/index.html">markdown mode</a>: Now supports CommonMark-style flexible list indentation.</li>
+    <li><a href="https://codemirror.net/mode/dylan/index.html">dylan mode</a>: Several improvements and fixes.</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.12.0...5.13.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">19-02-2016: <a href="http://codemirror.net/codemirror-5.12.zip">Version 5.12</a>:</p>
+  <p class="rel">19-02-2016: <a href="https://codemirror.net/codemirror-5.12.zip">Version 5.12</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: Ctrl-Q is now an alias for Ctrl-V.</li>
-    <li><a href="http://codemirror.net/demo/vim.html">Vim bindings</a>: The Vim API now exposes an <code>unmap</code> method to unmap bindings.</li>
-    <li><a href="http://codemirror.net/demo/activeline.html">active-line addon</a>: This addon can now style the active line's gutter.</li>
-    <li><a href="http://codemirror.net/mode/fcl/">FCL mode</a>: Newly added.</li>
-    <li><a href="http://codemirror.net/mode/sql/">SQL mode</a>: Now has a Postgresql dialect.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">Vim bindings</a>: Ctrl-Q is now an alias for Ctrl-V.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">Vim bindings</a>: The Vim API now exposes an <code>unmap</code> method to unmap bindings.</li>
+    <li><a href="https://codemirror.net/demo/activeline.html">active-line addon</a>: This addon can now style the active line's gutter.</li>
+    <li><a href="https://codemirror.net/mode/fcl/">FCL mode</a>: Newly added.</li>
+    <li><a href="https://codemirror.net/mode/sql/">SQL mode</a>: Now has a Postgresql dialect.</li>
     <li>Fix <a href="https://github.com/codemirror/CodeMirror/issues/3781">issue</a> where trying to scroll to a horizontal position outside of the document's width could cause the gutter to be positioned incorrectly.</li>
     <li>Use absolute, rather than fixed positioning in the context-menu intercept hack, to work around a <a href="https://github.com/codemirror/CodeMirror/issues/3238">problem</a> when the editor is inside a transformed parent container.</li>
     <li>Solve a <a href="https://github.com/codemirror/CodeMirror/issues/3821">problem</a> where the horizontal scrollbar could hide text in Firefox.</li>
     <li>Fix a <a href="https://github.com/codemirror/CodeMirror/issues/3834">bug</a> that caused phantom scroll space under the text in some situations.</li>
-    <li><a href="http://codemirror.net/demo/sublime.html">Sublime Text bindings</a>: Bind delete-line to Shift-Ctrl-K on OS X.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">Markdown mode</a>: Fix <a href="https://github.com/codemirror/CodeMirror/issues/3787">issue</a> where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">Markdown mode</a>: Ignore backslashes in code fragments.</li>
-    <li><a href="http://codemirror.net/mode/markdown/">Markdown mode</a>: Use whichever mode is registered as <code>text/html</code> to parse HTML.</li>
-    <li><a href="http://codemirror.net/mode/clike/">Clike mode</a>: Improve indentation of Scala <code>=&gt;</code> functions.</li>
-    <li><a href="http://codemirror.net/mode/python/">Python mode</a>: Improve indentation of bracketed code.</li>
-    <li><a href="http://codemirror.net/mode/htmlmixed/">HTMLMixed mode</a>: Support multi-line opening tags for sub-languages (<code>&lt;script&gt;</code>, <code>&lt;style&gt;</code>, etc).</li>
-    <li><a href="http://codemirror.net/mode/spreadsheet/">Spreadsheet mode</a>: Fix bug where the mode did not advance the stream when finding a backslash.</li>
-    <li><a href="http://codemirror.net/mode/xml/">XML mode</a>: The mode now takes a <code>matchClosing</code> option to configure whether mismatched closing tags should be highlighted as errors.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">Sublime Text bindings</a>: Bind delete-line to Shift-Ctrl-K on OS X.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">Markdown mode</a>: Fix <a href="https://github.com/codemirror/CodeMirror/issues/3787">issue</a> where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">Markdown mode</a>: Ignore backslashes in code fragments.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">Markdown mode</a>: Use whichever mode is registered as <code>text/html</code> to parse HTML.</li>
+    <li><a href="https://codemirror.net/mode/clike/">Clike mode</a>: Improve indentation of Scala <code>=&gt;</code> functions.</li>
+    <li><a href="https://codemirror.net/mode/python/">Python mode</a>: Improve indentation of bracketed code.</li>
+    <li><a href="https://codemirror.net/mode/htmlmixed/">HTMLMixed mode</a>: Support multi-line opening tags for sub-languages (<code>&lt;script&gt;</code>, <code>&lt;style&gt;</code>, etc).</li>
+    <li><a href="https://codemirror.net/mode/spreadsheet/">Spreadsheet mode</a>: Fix bug where the mode did not advance the stream when finding a backslash.</li>
+    <li><a href="https://codemirror.net/mode/xml/">XML mode</a>: The mode now takes a <code>matchClosing</code> option to configure whether mismatched closing tags should be highlighted as errors.</li>
   </ul>
 
-  <p class="rel">20-01-2016: <a href="http://codemirror.net/codemirror-5.11.zip">Version 5.11</a>:</p>
+  <p class="rel">20-01-2016: <a href="https://codemirror.net/codemirror-5.11.zip">Version 5.11</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/jsx/index.html">JSX</a>, <a href="../mode/haskell-literate/index.html">literate Haskell</a></li>
@@ -505,7 +505,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.10.0...5.11.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">21-12-2015: <a href="http://codemirror.net/codemirror-5.10.zip">Version 5.10</a>:</p>
+  <p class="rel">21-12-2015: <a href="https://codemirror.net/codemirror-5.10.zip">Version 5.10</a>:</p>
 
   <ul class="rel-note">
     <li>Modify the way <a href="manual.html#mark_atomic">atomic ranges</a> are skipped by selection to try and make it less surprising.</li>
@@ -518,7 +518,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.9.0...5.10.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">23-11-2015: <a href="http://codemirror.net/codemirror-5.9.zip">Version 5.9</a>:</p>
+  <p class="rel">23-11-2015: <a href="https://codemirror.net/codemirror-5.9.zip">Version 5.9</a>:</p>
 
   <ul class="rel-note">
     <li>Improve the way overlay (OS X-style) scrollbars are handled</li>
@@ -529,7 +529,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.8.0...5.9.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-10-2015: <a href="http://codemirror.net/codemirror-5.8.zip">Version 5.8</a>:</p>
+  <p class="rel">20-10-2015: <a href="https://codemirror.net/codemirror-5.8.zip">Version 5.8</a>:</p>
 
   <ul class="rel-note">
     <li>Fixes an infinite loop in
@@ -542,7 +542,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.7.0...5.8.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-09-2015: <a href="http://codemirror.net/codemirror-5.7.zip">Version 5.7</a>:</p>
+  <p class="rel">20-09-2015: <a href="https://codemirror.net/codemirror-5.7.zip">Version 5.7</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/vue/index.html">Vue</a>, <a href="../mode/oz/index.html">Oz</a>, <a href="../mode/mscgen/index.html">MscGen</a> (and dialects), <a href="../mode/css/gss.html">Closure Stylesheets</a></li>
@@ -556,7 +556,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.6.0...5.7.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-08-2015: <a href="http://codemirror.net/codemirror-5.6.zip">Version 5.6</a>:</p>
+  <p class="rel">20-08-2015: <a href="https://codemirror.net/codemirror-5.6.zip">Version 5.6</a>:</p>
 
   <ul class="rel-note">
     <li>Fix bug where you could paste into a <code>readOnly</code> editor</li>
@@ -570,7 +570,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.5.0...5.6.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-07-2015: <a href="http://codemirror.net/codemirror-5.5.zip">Version 5.5</a>:</p>
+  <p class="rel">20-07-2015: <a href="https://codemirror.net/codemirror-5.5.zip">Version 5.5</a>:</p>
 
   <ul class="rel-note">
     <li>New option: <a href="manual.html#option_lineSeparator"><code>lineSeparator</code></a> (with corresponding <a href="manual.html#lineSeparator">method</a>)
@@ -583,7 +583,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.4.0...5.5.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">25-06-2015: <a href="http://codemirror.net/codemirror-5.4.zip">Version 5.4</a>:</p>
+  <p class="rel">25-06-2015: <a href="https://codemirror.net/codemirror-5.4.zip">Version 5.4</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/twig/index.html">Twig</a>, <a href="../mode/elm/index.html">Elm</a>, <a href="../mode/factor/index.html">Factor</a>, <a href="../mode/swift/index.html">Swift</a></li>
@@ -592,7 +592,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.3.0...5.4.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-05-2015: <a href="http://codemirror.net/codemirror-5.3.zip">Version 5.3</a>:</p>
+  <p class="rel">20-05-2015: <a href="https://codemirror.net/codemirror-5.3.zip">Version 5.3</a>:</p>
 
   <ul class="rel-note">
     <li>Fix several regressions in the <a href="manual.html#addon_show-hint"><code>show-hint</code></a> addon (<code>completeSingle</code> option, <code>"shown"</code> and <code>"close"</code> events)</li>
@@ -602,7 +602,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.2.0...5.3.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-04-2015: <a href="http://codemirror.net/codemirror-5.2.zip">Version 5.2</a>:</p>
+  <p class="rel">20-04-2015: <a href="https://codemirror.net/codemirror-5.2.zip">Version 5.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix several race conditions
@@ -619,7 +619,7 @@ <h2>Version 5.x</h2>
     <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>
+  <p class="rel">23-03-2015: <a href="https://codemirror.net/codemirror-5.1.zip">Version 5.1</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/asciiarmor/index.html">ASCII armor</a> (PGP data), <a href="../mode/troff/index.html">Troff</a>, and <a href="../mode/cmake/index.html">CMake</a>.</li>
@@ -630,7 +630,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.0.0...5.1.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-02-2015: <a href="http://codemirror.net/codemirror-5.0.zip">Version 5.0</a>:</p>
+  <p class="rel">20-02-2015: <a href="https://codemirror.net/codemirror-5.0.zip">Version 5.0</a>:</p>
 
   <ul class="rel-note">
     <li>Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)</li>
@@ -646,7 +646,7 @@ <h2>Version 5.x</h2>
 
   <h2>Version 4.x</h2>
 
-  <p class="rel">20-02-2015: <a href="http://codemirror.net/codemirror-4.13.zip">Version 4.13</a>:</p>
+  <p class="rel">20-02-2015: <a href="https://codemirror.net/codemirror-4.13.zip">Version 4.13</a>:</p>
 
   <ul class="rel-note">
     <li>Fix the way the <a href="../demo/closetag.html"><code>closetag</code></a> demo handles the slash character.</li>
@@ -656,7 +656,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-01-2015: <a href="http://codemirror.net/codemirror-4.12.zip">Version 4.12</a>:</p>
+  <p class="rel">22-01-2015: <a href="https://codemirror.net/codemirror-4.12.zip">Version 4.12</a>:</p>
 
   <ul class="rel-note">
     <li>The <a href="manual.html#addon_closetag"><code>closetag</code></a>
@@ -676,19 +676,19 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.11.0...4.12.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">9-01-2015: <a href="http://codemirror.net/codemirror-4.11.zip">Version 4.11</a>:</p>
+  <p class="rel">9-01-2015: <a href="https://codemirror.net/codemirror-4.11.zip">Version 4.11</a>:</p>
 
   <p class="rel-note">Unfortunately, 4.10 did not take care of the
   Firefox scrolling issue entirely. This release adds two more patches
   to address that.</p>
 
-  <p class="rel">29-12-2014: <a href="http://codemirror.net/codemirror-4.10.zip">Version 4.10</a>:</p>
+  <p class="rel">29-12-2014: <a href="https://codemirror.net/codemirror-4.10.zip">Version 4.10</a>:</p>
 
   <p class="rel-note">Emergency single-patch update to 4.9. Fixes
   Firefox-specific problem where the cursor could end up behind the
   horizontal scrollbar.</p>
 
-  <p class="rel">23-12-2014: <a href="http://codemirror.net/codemirror-4.9.zip">Version 4.9</a>:</p>
+  <p class="rel">23-12-2014: <a href="https://codemirror.net/codemirror-4.9.zip">Version 4.9</a>:</p>
 
   <ul class="rel-note">
     <li>Overhauled scroll bar handling.
@@ -711,7 +711,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.8.0...4.9.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-11-2014: <a href="http://codemirror.net/codemirror-4.8.zip">Version 4.8</a>:</p>
+  <p class="rel">22-11-2014: <a href="https://codemirror.net/codemirror-4.8.zip">Version 4.8</a>:</p>
 
   <ul class="rel-note">
     <li>Built-in support for <a href="manual.html#normalizeKeyMap">multi-stroke key bindings</a>.</li>
@@ -723,7 +723,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.7.0...4.8.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-10-2014: <a href="http://codemirror.net/codemirror-4.7.zip">Version 4.7</a>:</p>
+  <p class="rel">20-10-2014: <a href="https://codemirror.net/codemirror-4.7.zip">Version 4.7</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Incompatible</strong>:
@@ -754,7 +754,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.6.0...4.7.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-09-2014: <a href="http://codemirror.net/codemirror-4.6.zip">Version 4.6</a>:</p>
+  <p class="rel">19-09-2014: <a href="https://codemirror.net/codemirror-4.6.zip">Version 4.6</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/modelica/index.html">Modelica</a></li>
@@ -763,7 +763,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.5.0...4.6.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-08-2014: <a href="http://codemirror.net/codemirror-4.5.zip">Version 4.5</a>:</p>
+  <p class="rel">21-08-2014: <a href="https://codemirror.net/codemirror-4.5.zip">Version 4.5</a>:</p>
 
   <ul class="rel-note">
     <li>Fix several serious bugs with horizontal scrolling</li>
@@ -773,7 +773,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.4.0...4.5.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-07-2014: <a href="http://codemirror.net/codemirror-4.4.zip">Version 4.4</a>:</p>
+  <p class="rel">21-07-2014: <a href="https://codemirror.net/codemirror-4.4.zip">Version 4.4</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Note:</strong> Some events might now fire in slightly
@@ -787,7 +787,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.3.0...4.4.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">23-06-2014: <a href="http://codemirror.net/codemirror-4.3.zip">Version 4.3</a>:</p>
+  <p class="rel">23-06-2014: <a href="https://codemirror.net/codemirror-4.3.zip">Version 4.3</a>:</p>
 
   <ul class="rel-note">
     <li>Several <a href="../demo/vim.html">vim bindings</a>
@@ -800,7 +800,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.2.0...4.3.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-05-2014: <a href="http://codemirror.net/codemirror-4.2.zip">Version 4.2</a>:</p>
+  <p class="rel">19-05-2014: <a href="https://codemirror.net/codemirror-4.2.zip">Version 4.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix problem where some modes were broken by the fact that empty tokens were forbidden.</li>
@@ -817,7 +817,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.1.0...4.2.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-04-2014: <a href="http://codemirror.net/codemirror-4.1.zip">Version 4.1</a>:</p>
+  <p class="rel">22-04-2014: <a href="https://codemirror.net/codemirror-4.1.zip">Version 4.1</a>:</p>
 
   <ul class="rel-note">
     <li><em>Slightly incompatible</em>:
@@ -832,7 +832,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.0.3...4.1.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-03-2014: <a href="http://codemirror.net/codemirror-4.0.zip">Version 4.0</a>:</p>
+  <p class="rel">20-03-2014: <a href="https://codemirror.net/codemirror-4.0.zip">Version 4.0</a>:</p>
 
   <p class="rel-note">This is a new major version of CodeMirror. There
   are a few <strong>incompatible</strong> changes in the API. Upgrade
@@ -854,13 +854,13 @@ <h2>Version 4.x</h2>
 
   <h2>Version 3.x</h2>
 
-  <p class="rel">22-04-2014: <a href="http://codemirror.net/codemirror-3.24.zip">Version 3.24</a>:</p>
+  <p class="rel">22-04-2014: <a href="https://codemirror.net/codemirror-3.24.zip">Version 3.24</a>:</p>
 
   <p class="rel-note">Merges the improvements from 4.1 that could
   easily be applied to the 3.x code. Also improves the way the editor
   size is updated when line widgets change.</p>
 
-  <p class="rel">20-03-2014: <a href="http://codemirror.net/codemirror-3.23.zip">Version 3.23</a>:</p>
+  <p class="rel">20-03-2014: <a href="https://codemirror.net/codemirror-3.23.zip">Version 3.23</a>:</p>
 
   <ul class="rel-note">
     <li>In the <a href="../mode/xml/index.html">XML mode</a>,
@@ -870,7 +870,7 @@ <h2>Version 3.x</h2>
     <li>Many improvements to the <a href="../demo/vim.html">Vim bindings</a>.</li>
   </ul>
 
-  <p class="rel">21-02-2014: <a href="http://codemirror.net/codemirror-3.22.zip">Version 3.22</a>:</p>
+  <p class="rel">21-02-2014: <a href="https://codemirror.net/codemirror-3.22.zip">Version 3.22</a>:</p>
 
   <ul class="rel-note">
     <li>Adds the <a href="manual.html#findMarks"><code>findMarks</code></a> method.</li>
@@ -880,7 +880,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">16-01-2014: <a href="http://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
+  <p class="rel">16-01-2014: <a href="https://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
 
   <ul class="rel-note">
     <li>Auto-indenting a block will no longer add trailing whitespace to blank lines.</li>
@@ -894,7 +894,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.20.0...3.21.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-11-2013: <a href="http://codemirror.net/codemirror-3.20.zip">Version 3.20</a>:</p>
+  <p class="rel">21-11-2013: <a href="https://codemirror.net/codemirror-3.20.zip">Version 3.20</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/julia/index.html">Julia</a> and <a href="../mode/pegjs/index.html">PEG.js</a>.</li>
@@ -905,7 +905,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.19.0...3.20.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-10-2013: <a href="http://codemirror.net/codemirror-3.19.zip">Version 3.19</a>:</p>
+  <p class="rel">21-10-2013: <a href="https://codemirror.net/codemirror-3.19.zip">Version 3.19</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/eiffel/index.html">Eiffel</a>, <a href="../mode/gherkin/index.html">Gherkin</a>, <a href="../mode/sql/?mime=text/x-mssql">MSSQL dialect</a>.</li>
@@ -915,13 +915,13 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.18.0...3.19.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">23-09-2013: <a href="http://codemirror.net/codemirror-3.18.zip">Version 3.18</a>:</p>
+  <p class="rel">23-09-2013: <a href="https://codemirror.net/codemirror-3.18.zip">Version 3.18</a>:</p>
 
   <p class="rel-note">Emergency release to fix a problem in 3.17
   where <code>.setOption("lineNumbers", false)</code> would raise an
   error.</p>
 
-  <p class="rel">23-09-2013: <a href="http://codemirror.net/codemirror-3.17.zip">Version 3.17</a>:</p>
+  <p class="rel">23-09-2013: <a href="https://codemirror.net/codemirror-3.17.zip">Version 3.17</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/fortran/index.html">Fortran</a>, <a href="../mode/octave/index.html">Octave</a> (Matlab), <a href="../mode/toml/index.html">TOML</a>, and <a href="../mode/dtd/index.html">DTD</a>.</li>
@@ -930,7 +930,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.16.0...3.17.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-08-2013: <a href="http://codemirror.net/codemirror-3.16.zip">Version 3.16</a>:</p>
+  <p class="rel">21-08-2013: <a href="https://codemirror.net/codemirror-3.16.zip">Version 3.16</a>:</p>
 
   <ul class="rel-note">
     <li>The whole codebase is now under a single <a href="../LICENSE">license</a> file.</li>
@@ -942,7 +942,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.15.0...3.16.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">29-07-2013: <a href="http://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
+  <p class="rel">29-07-2013: <a href="https://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/jade/index.html">Jade</a>, <a href="../mode/nginx/index.html">Nginx</a>.</li>
@@ -953,7 +953,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-06-2013: <a href="http://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
+  <p class="rel">20-06-2013: <a href="https://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
 
   <ul class="rel-note">
     <li>New
@@ -980,7 +980,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.13.0...3.14.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-05-2013: <a href="http://codemirror.net/codemirror-3.13.zip">Version 3.13</a>:</p>
+  <p class="rel">20-05-2013: <a href="https://codemirror.net/codemirror-3.13.zip">Version 3.13</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/cobol/index.html">COBOL</a> and <a href="../mode/haml/index.html">HAML</a>.</li>
@@ -990,7 +990,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.12...3.13.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-04-2013: <a href="http://codemirror.net/codemirror-3.12.zip">Version 3.12</a>:</p>
+  <p class="rel">19-04-2013: <a href="https://codemirror.net/codemirror-3.12.zip">Version 3.12</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/gas/index.html">GNU assembler</a>.</li>
@@ -1004,7 +1004,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.11...v3.12">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-03-2013: <a href="http://codemirror.net/codemirror-3.11.zip">Version 3.11</a>:</p>
+  <p class="rel">20-03-2013: <a href="https://codemirror.net/codemirror-3.11.zip">Version 3.11</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Removed code:</strong> <code>collapserange</code>,
@@ -1029,7 +1029,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.1...v3.11">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-02-2013: <a href="http://codemirror.net/codemirror-3.1.zip">Version 3.1</a>:</p>
+  <p class="rel">21-02-2013: <a href="https://codemirror.net/codemirror-3.1.zip">Version 3.1</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Incompatible:</strong> key handlers may
@@ -1066,13 +1066,13 @@ <h2>Version 3.x</h2>
   </ul>
 
 
-  <p class="rel">25-01-2013: <a href="http://codemirror.net/codemirror-3.02.zip">Version 3.02</a>:</p>
+  <p class="rel">25-01-2013: <a href="https://codemirror.net/codemirror-3.02.zip">Version 3.02</a>:</p>
 
   <p class="rel-note">Single-bugfix release. Fixes a problem that
   prevents CodeMirror instances from being garbage-collected after
   they become unused.</p>
 
-  <p class="rel">21-01-2013: <a href="http://codemirror.net/codemirror-3.01.zip">Version 3.01</a>:</p>
+  <p class="rel">21-01-2013: <a href="https://codemirror.net/codemirror-3.01.zip">Version 3.01</a>:</p>
 
   <ul class="rel-note">
     <li>Move all add-ons into an organized directory structure
@@ -1091,7 +1091,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0...v3.01">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">10-12-2012: <a href="http://codemirror.net/codemirror-3.0.zip">Version 3.0</a>:</p>
+  <p class="rel">10-12-2012: <a href="https://codemirror.net/codemirror-3.0.zip">Version 3.0</a>:</p>
 
   <p class="rel-note"><strong>New major version</strong>. Only
   partially backwards-compatible. See
@@ -1105,7 +1105,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
+  <p class="rel">20-11-2012: <a href="https://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/http/index.html">HTTP</a>.</li>
@@ -1117,7 +1117,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
+  <p class="rel">20-11-2012: <a href="https://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
 
   <ul class="rel-note">
     <li>New theme: <a href="../demo/theme.html#solarized%20light">Solarized</a>.</li>
@@ -1134,7 +1134,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0beta2...v3.0rc1">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-3.0beta2.zip">Version 3.0, beta 2</a>:</p>
+  <p class="rel">22-10-2012: <a href="https://codemirror.net/codemirror-3.0beta2.zip">Version 3.0, beta 2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix page-based coordinate computation.</li>
@@ -1150,7 +1150,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0beta1...v3.0beta2">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
+  <p class="rel">19-09-2012: <a href="https://codemirror.net/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
 
   <ul class="rel-note">
     <li>Bi-directional text support.</li>
@@ -1166,14 +1166,14 @@ <h2>Version 3.x</h2>
 
   <h2>Version 2.x</h2>
 
-  <p class="rel">21-01-2013: <a href="http://codemirror.net/codemirror-2.38.zip">Version 2.38</a>:</p>
+  <p class="rel">21-01-2013: <a href="https://codemirror.net/codemirror-2.38.zip">Version 2.38</a>:</p>
 
   <p class="rel-note">Integrate some bugfixes, enhancements to the vim keymap, and new
   modes
   (<a href="../mode/d/index.html">D</a>, <a href="../mode/sass/index.html">Sass</a>, <a href="../mode/apl/index.html">APL</a>)
   from the v3 branch.</p>
 
-  <p class="rel">20-12-2012: <a href="http://codemirror.net/codemirror-2.37.zip">Version 2.37</a>:</p>
+  <p class="rel">20-12-2012: <a href="https://codemirror.net/codemirror-2.37.zip">Version 2.37</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/sql/index.html">SQL</a> (will replace <a href="../mode/plsql/index.html">plsql</a> and <a href="../mode/mysql/index.html">mysql</a> modes).</li>
@@ -1182,7 +1182,7 @@ <h2>Version 2.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v2.36...v2.37">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-11-2012: <a href="http://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
+  <p class="rel">20-11-2012: <a href="https://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/z80/index.html">Z80 assembly</a>.</li>
@@ -1196,7 +1196,7 @@ <h2>Version 2.x</h2>
     <li>Full <a href="../https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-10-2012: <a href="http://codemirror.net/codemirror-2.35.zip">Version 2.35</a>:</p>
+  <p class="rel">22-10-2012: <a href="https://codemirror.net/codemirror-2.35.zip">Version 2.35</a>:</p>
 
   <ul class="rel-note">
     <li>New (sub) mode: <a href="../mode/javascript/typescript.html">TypeScript</a>.</li>
@@ -1207,7 +1207,7 @@ <h2>Version 2.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-2.34.zip">Version 2.34</a>:</p>
+  <p class="rel">19-09-2012: <a href="https://codemirror.net/codemirror-2.34.zip">Version 2.34</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/commonlisp/index.html">Common Lisp</a>.</li>
@@ -1220,7 +1220,7 @@ <h2>Version 2.x</h2>
     <li><a href="https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34">Full list</a> of patches.</li>
   </ul>
 
-  <p class="rel">23-08-2012: <a href="http://codemirror.net/codemirror-2.33.zip">Version 2.33</a>:</p>
+  <p class="rel">23-08-2012: <a href="https://codemirror.net/codemirror-2.33.zip">Version 2.33</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/sieve/index.html">Sieve</a>.</li>
@@ -1234,13 +1234,13 @@ <h2>Version 2.x</h2>
     <li><a href="https://github.com/codemirror/CodeMirror/compare/v2.32...v2.33">Full list</a> of patches.</li>
   </ul>
 
-  <p class="rel">23-07-2012: <a href="http://codemirror.net/codemirror-2.32.zip">Version 2.32</a>:</p>
+  <p class="rel">23-07-2012: <a href="https://codemirror.net/codemirror-2.32.zip">Version 2.32</a>:</p>
 
   <p class="rel-note">Emergency fix for a bug where an editor with
   line wrapping on IE will break when there is <em>no</em>
   scrollbar.</p>
 
-  <p class="rel">20-07-2012: <a href="http://codemirror.net/codemirror-2.31.zip">Version 2.31</a>:</p>
+  <p class="rel">20-07-2012: <a href="https://codemirror.net/codemirror-2.31.zip">Version 2.31</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/ocaml/index.html">OCaml</a>, <a href="../mode/haxe/index.html">Haxe</a>, and <a href="../mode/vb/index.html">VB.NET</a>.</li>
@@ -1252,7 +1252,7 @@ <h2>Version 2.x</h2>
     <li>And more... <a href="https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31">(all patches)</a></li>
   </ul>
 
-  <p class="rel">22-06-2012: <a href="http://codemirror.net/codemirror-2.3.zip">Version 2.3</a>:</p>
+  <p class="rel">22-06-2012: <a href="https://codemirror.net/codemirror-2.3.zip">Version 2.3</a>:</p>
 
   <ul class="rel-note">
     <li><strong>New scrollbar implementation</strong>. Should flicker less. Changes DOM structure of the editor.</li>
@@ -1264,7 +1264,7 @@ <h2>Version 2.x</h2>
     <li>Lots of other <a href="https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3">fixes</a>.</li>
   </ul>
 
-  <p class="rel">23-05-2012: <a href="http://codemirror.net/codemirror-2.25.zip">Version 2.25</a>:</p>
+  <p class="rel">23-05-2012: <a href="https://codemirror.net/codemirror-2.25.zip">Version 2.25</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/erlang/index.html">Erlang</a>.</li>
@@ -1275,7 +1275,7 @@ <h2>Version 2.x</h2>
     <li>Fix backspace and tab key repeat in Opera.</li>
   </ul>
 
-  <p class="rel">23-04-2012: <a href="http://codemirror.net/codemirror-2.24.zip">Version 2.24</a>:</p>
+  <p class="rel">23-04-2012: <a href="https://codemirror.net/codemirror-2.24.zip">Version 2.24</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Drop support for Internet Explorer 6</strong>.</li>
@@ -1294,7 +1294,7 @@ <h2>Version 2.x</h2>
     add <code>nofallthrough</code> boolean field instead.</li>
   </ul>
 
-  <p class="rel">26-03-2012: <a href="http://codemirror.net/codemirror-2.23.zip">Version 2.23</a>:</p>
+  <p class="rel">26-03-2012: <a href="https://codemirror.net/codemirror-2.23.zip">Version 2.23</a>:</p>
 
   <ul class="rel-note">
     <li>Change <strong>default binding for tab</strong> <a href="javascript:void(document.getElementById('tabbinding').style.display='')">[more]</a>
@@ -1317,7 +1317,7 @@ <h2>Version 2.x</h2>
     <li>Add <a href="manual.html#findMarksAt"><code>findMarksAt</code></a> method.</li>
   </ul>
 
-  <p class="rel">27-02-2012: <a href="http://codemirror.net/codemirror-2.22.zip">Version 2.22</a>:</p>
+  <p class="rel">27-02-2012: <a href="https://codemirror.net/codemirror-2.22.zip">Version 2.22</a>:</p>
 
   <ul class="rel-note">
     <li>Allow <a href="manual.html#keymaps">key handlers</a> to pass up events, allow binding characters.</li>
@@ -1330,7 +1330,7 @@ <h2>Version 2.x</h2>
     <li>Fix many bugs.</li>
   </ul>
 
-  <p class="rel">27-01-2012: <a href="http://codemirror.net/codemirror-2.21.zip">Version 2.21</a>:</p>
+  <p class="rel">27-01-2012: <a href="https://codemirror.net/codemirror-2.21.zip">Version 2.21</a>:</p>
 
   <ul class="rel-note">
     <li>Added <a href="../mode/less/index.html">LESS</a>, <a href="../mode/mysql/index.html">MySQL</a>,
@@ -1345,7 +1345,7 @@ <h2>Version 2.x</h2>
     <li>Lots and lots of bugfixes.</li>
   </ul>
 
-  <p class="rel">20-12-2011: <a href="http://codemirror.net/codemirror-2.2.zip">Version 2.2</a>:</p>
+  <p class="rel">20-12-2011: <a href="https://codemirror.net/codemirror-2.2.zip">Version 2.2</a>:</p>
 
   <ul class="rel-note">
     <li>Slightly incompatible API changes. Read <a href="upgrade_v2.2.html">this</a>.</li>
@@ -1368,10 +1368,10 @@ <h2>Version 2.x</h2>
     method.</li>
   </ul>
 
-  <p class="rel">21-11-2011: <a href="http://codemirror.net/codemirror-2.18.zip">Version 2.18</a>:</p>
+  <p class="rel">21-11-2011: <a href="https://codemirror.net/codemirror-2.18.zip">Version 2.18</a>:</p>
   <p class="rel-note">Fixes <code>TextMarker.clear</code>, which is broken in 2.17.</p>
 
-  <p class="rel">21-11-2011: <a href="http://codemirror.net/codemirror-2.17.zip">Version 2.17</a>:</p>
+  <p class="rel">21-11-2011: <a href="https://codemirror.net/codemirror-2.17.zip">Version 2.17</a>:</p>
   <ul class="rel-note">
     <li>Add support for <a href="manual.html#option_lineWrapping">line
     wrapping</a> and <a href="manual.html#hideLine">code
@@ -1391,7 +1391,7 @@ <h2>Version 2.x</h2>
     <li>Various fixes to modes.</li>
   </ul>
 
-  <p class="rel">27-10-2011: <a href="http://codemirror.net/codemirror-2.16.zip">Version 2.16</a>:</p>
+  <p class="rel">27-10-2011: <a href="https://codemirror.net/codemirror-2.16.zip">Version 2.16</a>:</p>
   <ul class="rel-note">
     <li>Add <a href="../mode/perl/index.html">Perl</a>, <a href="../mode/rust/index.html">Rust</a>, <a href="../mode/tiddlywiki/index.html">TiddlyWiki</a>, and <a href="../mode/groovy/index.html">Groovy</a> modes.</li>
     <li>Dragging text inside the editor now moves, rather than copies.</li>
@@ -1403,12 +1403,12 @@ <h2>Version 2.x</h2>
     <li>Fix editing code with tabs in Internet Explorer.</li>
   </ul>
 
-  <p class="rel">26-09-2011: <a href="http://codemirror.net/codemirror-2.15.zip">Version 2.15</a>:</p>
+  <p class="rel">26-09-2011: <a href="https://codemirror.net/codemirror-2.15.zip">Version 2.15</a>:</p>
   <p class="rel-note">Fix bug that snuck into 2.14: Clicking the
   character that currently has the cursor didn't re-focus the
   editor.</p>
 
-  <p class="rel">26-09-2011: <a href="http://codemirror.net/codemirror-2.14.zip">Version 2.14</a>:</p>
+  <p class="rel">26-09-2011: <a href="https://codemirror.net/codemirror-2.14.zip">Version 2.14</a>:</p>
   <ul class="rel-note">
     <li>Add <a href="../mode/clojure/index.html">Clojure</a>, <a href="../mode/pascal/index.html">Pascal</a>, <a href="../mode/ntriples/index.html">NTriples</a>, <a href="../mode/jinja2/index.html">Jinja2</a>, and <a href="../mode/markdown/index.html">Markdown</a> modes.</li>
     <li>Add <a href="../theme/cobalt.css">Cobalt</a> and <a href="../theme/eclipse.css">Eclipse</a> themes.</li>
@@ -1419,7 +1419,7 @@ <h2>Version 2.x</h2>
   </ul>
 
 
-  <p class="rel">23-08-2011: <a href="http://codemirror.net/codemirror-2.13.zip">Version 2.13</a>:</p>
+  <p class="rel">23-08-2011: <a href="https://codemirror.net/codemirror-2.13.zip">Version 2.13</a>:</p>
   <ul class="rel-note">
     <li>Add <a href="../mode/ruby/index.html">Ruby</a>, <a href="../mode/r/index.html">R</a>, <a href="../mode/coffeescript/index.html">CoffeeScript</a>, and <a href="../mode/velocity/index.html">Velocity</a> modes.</li>
     <li>Add <a href="manual.html#getGutterElement"><code>getGutterElement</code></a> to API.</li>
@@ -1428,7 +1428,7 @@ <h2>Version 2.x</h2>
     <li>Add an experimental <a href="../mode/xmlpure/index.html">pure XML</a> mode.</li>
   </ul>
 
-  <p class="rel">25-07-2011: <a href="http://codemirror.net/codemirror-2.12.zip">Version 2.12</a>:</p>
+  <p class="rel">25-07-2011: <a href="https://codemirror.net/codemirror-2.12.zip">Version 2.12</a>:</p>
   <ul class="rel-note">
     <li>Add a <a href="../mode/sparql/index.html">SPARQL</a> mode.</li>
     <li>Fix bug with cursor jumping around in an unfocused editor in IE.</li>
@@ -1442,7 +1442,7 @@ <h2>Version 2.x</h2>
     <li>Fix width feedback loop bug that caused the width of an inner DIV to shrink.</li>
   </ul>
 
-  <p class="rel">04-07-2011: <a href="http://codemirror.net/codemirror-2.11.zip">Version 2.11</a>:</p>
+  <p class="rel">04-07-2011: <a href="https://codemirror.net/codemirror-2.11.zip">Version 2.11</a>:</p>
   <ul class="rel-note">
     <li>Add a <a href="../mode/scheme/index.html">Scheme mode</a>.</li>
     <li>Add a <code>replace</code> method to search cursors, for cursor-preserving replacements.</li>
@@ -1455,14 +1455,14 @@ <h2>Version 2.x</h2>
     <li>Add <a href="../demo/fullscreen.html">full-screen editing</a> and <a href="../demo/changemode.html">mode-changing</a> demos.</li>
   </ul>
 
-  <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.1.zip">Version 2.1</a>:</p>
+  <p class="rel">07-06-2011: <a href="https://codemirror.net/codemirror-2.1.zip">Version 2.1</a>:</p>
   <p class="rel-note">Add
   a <a href="manual.html#option_theme">theme</a> system
   (<a href="../demo/theme.html">demo</a>). Note that this is not
   backwards-compatible—you'll have to update your styles and
   modes!</p>
 
-  <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.02.zip">Version 2.02</a>:</p>
+  <p class="rel">07-06-2011: <a href="https://codemirror.net/codemirror-2.02.zip">Version 2.02</a>:</p>
   <ul class="rel-note">
     <li>Add a <a href="../mode/lua/index.html">Lua mode</a>.</li>
     <li>Fix reverse-searching for a regexp.</li>
@@ -1474,7 +1474,7 @@ <h2>Version 2.x</h2>
     <li>Fix problem with 'sticking' horizontal scrollbar.</li>
   </ul>
 
-  <p class="rel">26-05-2011: <a href="http://codemirror.net/codemirror-2.01.zip">Version 2.01</a>:</p>
+  <p class="rel">26-05-2011: <a href="https://codemirror.net/codemirror-2.01.zip">Version 2.01</a>:</p>
   <ul class="rel-note">
     <li>Add a <a href="../mode/smalltalk/index.html">Smalltalk mode</a>.</li>
     <li>Add a <a href="../mode/rst/index.html">reStructuredText mode</a>.</li>
@@ -1492,7 +1492,7 @@ <h2>Version 2.x</h2>
     <li>Fix the context menu for Firefox.</li>
   </ul>
 
-  <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-2.0.zip">Version 2.0</a>:</p>
+  <p class="rel">28-03-2011: <a href="https://codemirror.net/codemirror-2.0.zip">Version 2.0</a>:</p>
   <p class="rel-note">CodeMirror 2 is a complete rewrite that's
   faster, smaller, simpler to use, and less dependent on browser
   quirks. See <a href="internals.html">this</a>
@@ -1502,18 +1502,18 @@ <h2>Version 2.x</h2>
   <p class="rel">22-02-2011: <a href="https://github.com/codemirror/codemirror/tree/beta2">Version 2.0 beta 2</a>:</p>
   <p class="rel-note">Somewhat more mature API, lots of bugs shaken out.</p>
 
-  <p class="rel">17-02-2011: <a href="http://codemirror.net/codemirror-0.94.zip">Version 0.94</a>:</p>
+  <p class="rel">17-02-2011: <a href="https://codemirror.net/codemirror-0.94.zip">Version 0.94</a>:</p>
   <ul class="rel-note">
     <li><code>tabMode: "spaces"</code> was modified slightly (now indents when something is selected).</li>
     <li>Fixes a bug that would cause the selection code to break on some IE versions.</li>
     <li>Disabling spell-check on WebKit browsers now works.</li>
   </ul>
 
-  <p class="rel">08-02-2011: <a href="http://codemirror.net/">Version 2.0 beta 1</a>:</p>
+  <p class="rel">08-02-2011: <a href="https://codemirror.net/">Version 2.0 beta 1</a>:</p>
   <p class="rel-note">CodeMirror 2 is a complete rewrite of
   CodeMirror, no longer depending on an editable frame.</p>
 
-  <p class="rel">19-01-2011: <a href="http://codemirror.net/codemirror-0.93.zip">Version 0.93</a>:</p>
+  <p class="rel">19-01-2011: <a href="https://codemirror.net/codemirror-0.93.zip">Version 0.93</a>:</p>
   <ul class="rel-note">
     <li>Added a <a href="contrib/regex/index.html">Regular Expression</a> parser.</li>
     <li>Fixes to the PHP parser.</li>
@@ -1529,14 +1529,14 @@ <h2>Version 2.x</h2>
 
   <h2>Version 0.x</h2>
 
-  <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-1.0.zip">Version 1.0</a>:</p>
+  <p class="rel">28-03-2011: <a href="https://codemirror.net/codemirror-1.0.zip">Version 1.0</a>:</p>
   <ul class="rel-note">
     <li>Fix error when debug history overflows.</li>
     <li>Refine handling of C# verbatim strings.</li>
     <li>Fix some issues with JavaScript indentation.</li>
   </ul>
 
-  <p class="rel">17-12-2010: <a href="http://codemirror.net/codemirror-0.92.zip">Version 0.92</a>:</p>
+  <p class="rel">17-12-2010: <a href="https://codemirror.net/codemirror-0.92.zip">Version 0.92</a>:</p>
   <ul class="rel-note">
     <li>Make CodeMirror work in XHTML documents.</li>
     <li>Fix bug in handling of backslashes in Python strings.</li>
@@ -1550,7 +1550,7 @@ <h2>Version 0.x</h2>
   </ul>
 
   <p class="rel">11-11-2010: <a
-  href="http://codemirror.net/codemirror-0.91.zip">Version 0.91</a>:</p>
+  href="https://codemirror.net/codemirror-0.91.zip">Version 0.91</a>:</p>
   <ul class="rel-note">
     <li>Adds support for <a href="contrib/java">Java</a>.</li>
     <li>Small additions to the <a href="contrib/php">PHP</a> and <a href="contrib/sql">SQL</a> parsers.</li>
@@ -1561,7 +1561,7 @@ <h2>Version 0.x</h2>
   </ul>
 
   <p class="rel">02-10-2010: <a
-  href="http://codemirror.net/codemirror-0.9.zip">Version 0.9</a>:</p>
+  href="https://codemirror.net/codemirror-0.9.zip">Version 0.9</a>:</p>
   <ul class="rel-note">
     <li>Add support for searching backwards.</li>
     <li>There are now parsers for <a href="contrib/scheme/index.html">Scheme</a>, <a href="contrib/xquery/index.html">XQuery</a>, and <a href="contrib/ometa/index.html">OmetaJS</a>.</li>
@@ -1574,7 +1574,7 @@ <h2>Version 0.x</h2>
   </ul>
 
   <p class="rel">22-07-2010: <a
-  href="http://codemirror.net/codemirror-0.8.zip">Version 0.8</a>:</p>
+  href="https://codemirror.net/codemirror-0.8.zip">Version 0.8</a>:</p>
   <ul class="rel-note">
     <li>Add a <code>cursorCoords</code> method to find the screen
     coordinates of the cursor.</li>
@@ -1597,7 +1597,7 @@ <h2>Version 0.x</h2>
   </ul>
 
   <p class="rel">27-04-2010: <a
-  href="http://codemirror.net/codemirror-0.67.zip">Version
+  href="https://codemirror.net/codemirror-0.67.zip">Version
   0.67</a>:</p>
   <p class="rel-note">More consistent page-up/page-down behaviour
   across browsers. Fix some issues with hidden editors looping forever
@@ -1609,7 +1609,7 @@ <h2>Version 0.x</h2>
   running editor.</p>
 
   <p class="rel">01-03-2010: <a
-  href="http://codemirror.net/codemirror-0.66.zip">Version
+  href="https://codemirror.net/codemirror-0.66.zip">Version
   0.66</a>:</p>
   <p class="rel-note">Adds <code>removeLine</code> method to API.
   Introduces the <a href="contrib/plsql/index.html">PLSQL parser</a>.
@@ -1618,7 +1618,7 @@ <h2>Version 0.x</h2>
   selection bugs, and a number of small glitches.</p>
 
   <p class="rel">12-11-2009: <a
-  href="http://codemirror.net/codemirror-0.65.zip">Version
+  href="https://codemirror.net/codemirror-0.65.zip">Version
   0.65</a>:</p>
   <p class="rel-note">Add support for having both line-wrapping and
   line-numbers turned on, make paren-highlighting style customisable
@@ -1627,7 +1627,7 @@ <h2>Version 0.x</h2>
   <em>re</em>introduced in version 10.</p>
 
   <p class="rel">23-10-2009: <a
-  href="http://codemirror.net/codemirror-0.64.zip">Version
+  href="https://codemirror.net/codemirror-0.64.zip">Version
   0.64</a>:</p>
   <p class="rel-note">Solves some issues introduced by the
   paste-handling changes from the previous release. Adds
@@ -1640,12 +1640,12 @@ <h2>Version 0.x</h2>
   parser. And, as usual, add workarounds for various newly discovered
   browser incompatibilities.</p>
 
-  <p class="rel">31-08-2009: <a href="http://codemirror.net/codemirror-0.63.zip">Version 0.63</a>:</p>
+  <p class="rel">31-08-2009: <a href="https://codemirror.net/codemirror-0.63.zip">Version 0.63</a>:</p>
   <p class="rel-note"> Overhaul of paste-handling (less fragile), fixes for several
   serious IE8 issues (cursor jumping, end-of-document bugs) and a number
   of small problems.</p>
 
-  <p class="rel">30-05-2009: <a href="http://codemirror.net/codemirror-0.62.zip">Version 0.62</a>:</p>
+  <p class="rel">30-05-2009: <a href="https://codemirror.net/codemirror-0.62.zip">Version 0.62</a>:</p>
   <p class="rel-note">Introduces <a href="contrib/python/index.html">Python</a>
   and <a href="contrib/lua/index.html">Lua</a> parsers. Add
   <code>setParser</code> (on-the-fly mode changing) and
diff --git a/doc/reporting.html b/doc/reporting.html
index 1657400ce9..32d7986d79 100644
--- a/doc/reporting.html
+++ b/doc/reporting.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
index 3948ce6e56..5709e652bf 100644
--- a/doc/upgrade_v2.2.html
+++ b/doc/upgrade_v2.2.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/upgrade_v3.html b/doc/upgrade_v3.html
index 5f94067aa0..2fec440fe9 100644
--- a/doc/upgrade_v3.html
+++ b/doc/upgrade_v3.html
@@ -14,7 +14,7 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index 09df00ca1b..dc79654f01 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -6,7 +6,7 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/index.html b/index.html
index 926d636a3c..2b3ccceab8 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="doc/logo.png"></a>
 
   <ul>
     <li><a class=active data-default="true" href="#description">Home</a>
@@ -89,14 +89,14 @@ <h2>This is CodeMirror</h2>
     <div class=actionspicture>
       <img src="doc/yinyang.png" class=yinyang>
       <div class="actionlink download">
-        <a href="http://codemirror.net/codemirror.zip">DOWNLOAD</a>
+        <a href="https://codemirror.net/codemirror.zip">DOWNLOAD</a>
       </div>
       <div class="actionlink fund">
         <a href="https://marijnhaverbeke.nl/fund/">FUND</a>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="http://codemirror.net/codemirror.zip">5.39.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.39.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
@@ -153,7 +153,7 @@ <h2>Community</h2>
   on <a href="https://github.com/codemirror/CodeMirror/">github</a>
   (<a href="http://marijnhaverbeke.nl/git/codemirror">alternate git
   repository</a>).
-  Please <a href="http://codemirror.net/doc/reporting.html">read these
+  Please <a href="https://codemirror.net/doc/reporting.html">read these
   pointers</a> before submitting a bug. Use pull requests to submit
   patches. All contributions must be released under the same MIT
   license that CodeMirror uses.</p>
diff --git a/keymap/emacs.js b/keymap/emacs.js
index f7c51b8131..d96a6fbec9 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/keymap/sublime.js b/keymap/sublime.js
index aa9b65e3b1..b4799fd62a 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // A rough approximation of Sublime Text's keybindings
 // Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
diff --git a/keymap/vim.js b/keymap/vim.js
index ef79585f7d..b03c1393cb 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Supported keybindings:
diff --git a/mode/apl/apl.js b/mode/apl/apl.js
index caafe4e913..b1955f6c94 100644
--- a/mode/apl/apl.js
+++ b/mode/apl/apl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/apl/index.html b/mode/apl/index.html
index 53dda6b586..56ab02ffba 100644
--- a/mode/apl/index.html
+++ b/mode/apl/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/asciiarmor/asciiarmor.js b/mode/asciiarmor/asciiarmor.js
index fa1b0f8c61..f560f42423 100644
--- a/mode/asciiarmor/asciiarmor.js
+++ b/mode/asciiarmor/asciiarmor.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/asciiarmor/index.html b/mode/asciiarmor/index.html
index 4d584efbcd..de39a18573 100644
--- a/mode/asciiarmor/index.html
+++ b/mode/asciiarmor/index.html
@@ -9,7 +9,7 @@
 <script src="asciiarmor.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/asn.1/asn.1.js b/mode/asn.1/asn.1.js
index 9600247ea6..d3ecb08781 100644
--- a/mode/asn.1/asn.1.js
+++ b/mode/asn.1/asn.1.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/asn.1/index.html b/mode/asn.1/index.html
index 699fd4473d..5d80523e0a 100644
--- a/mode/asn.1/index.html
+++ b/mode/asn.1/index.html
@@ -14,7 +14,7 @@
     }
 </style>
 <div id=nav>
-    <a href="http://codemirror.net"><h1>CodeMirror</h1>
+    <a href="https://codemirror.net"><h1>CodeMirror</h1>
         <img id=logo src="../../doc/logo.png">
     </a>
 
diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index b7ebfc5ad7..025a8b3ef9 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
  * =====================================================================================
diff --git a/mode/asterisk/index.html b/mode/asterisk/index.html
index 257bd39875..7ede9948b1 100644
--- a/mode/asterisk/index.html
+++ b/mode/asterisk/index.html
@@ -12,7 +12,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/brainfuck/brainfuck.js b/mode/brainfuck/brainfuck.js
index 3becf2a5a3..af6d889aee 100644
--- a/mode/brainfuck/brainfuck.js
+++ b/mode/brainfuck/brainfuck.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Brainfuck mode created by Michael Kaminsky https://github.com/mkaminsky11
 
diff --git a/mode/brainfuck/index.html b/mode/brainfuck/index.html
index 6048fc2412..a04bddb14e 100644
--- a/mode/brainfuck/index.html
+++ b/mode/brainfuck/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index dec87a474a..42033bd0a0 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 45c670ae58..b1cef526b1 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -12,7 +12,7 @@
 <script src="clike.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/clike/scala.html b/mode/clike/scala.html
index aa04cf0f04..ddbd9a0cae 100644
--- a/mode/clike/scala.html
+++ b/mode/clike/scala.html
@@ -10,7 +10,7 @@
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="clike.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/clike/test.js b/mode/clike/test.js
index e3bde772a5..fc1f5d6cf1 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-c");
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index ed6af2c83c..2015edff14 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Author: Hans Engel
diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index 81294bc14a..5399ce876e 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -9,7 +9,7 @@
 <script src="clojure.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/cmake/cmake.js b/mode/cmake/cmake.js
index 9f9eda5417..496c71d1fd 100644
--- a/mode/cmake/cmake.js
+++ b/mode/cmake/cmake.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object")
diff --git a/mode/cmake/index.html b/mode/cmake/index.html
index ed114fece5..6dcfd7b4a8 100644
--- a/mode/cmake/index.html
+++ b/mode/cmake/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/cobol/cobol.js b/mode/cobol/cobol.js
index 897022b18c..275857b4bd 100644
--- a/mode/cobol/cobol.js
+++ b/mode/cobol/cobol.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Author: Gautam Mehta
diff --git a/mode/cobol/index.html b/mode/cobol/index.html
index 4352419a0c..1e08740529 100644
--- a/mode/cobol/index.html
+++ b/mode/cobol/index.html
@@ -39,7 +39,7 @@
         .CodeMirror-activeline-background {background: #555555 !important;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index ae955db344..a54e9d5ed0 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Link to the project's GitHub page:
diff --git a/mode/coffeescript/index.html b/mode/coffeescript/index.html
index 92d161e9dd..650ccf5db8 100644
--- a/mode/coffeescript/index.html
+++ b/mode/coffeescript/index.html
@@ -9,7 +9,7 @@
 <script src="coffeescript.js"></script>
 <style>.CodeMirror {border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 8cd212d3a8..52abbb25c6 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/commonlisp/index.html b/mode/commonlisp/index.html
index f2bf4522d6..a5b907e831 100644
--- a/mode/commonlisp/index.html
+++ b/mode/commonlisp/index.html
@@ -9,7 +9,7 @@
 <script src="commonlisp.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/crystal/crystal.js b/mode/crystal/crystal.js
index dada112da8..5c601c6ab3 100644
--- a/mode/crystal/crystal.js
+++ b/mode/crystal/crystal.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/crystal/index.html b/mode/crystal/index.html
index 95412579f2..ae4218eec5 100644
--- a/mode/crystal/index.html
+++ b/mode/crystal/index.html
@@ -14,7 +14,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/css.js b/mode/css/css.js
index f5f3a41ba8..8b5722905d 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/css/gss.html b/mode/css/gss.html
index 232fe8c12b..3854747c42 100644
--- a/mode/css/gss.html
+++ b/mode/css/gss.html
@@ -12,7 +12,7 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/gss_test.js b/mode/css/gss_test.js
index d56e592803..2401bc4968 100644
--- a/mode/css/gss_test.js
+++ b/mode/css/gss_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   "use strict";
diff --git a/mode/css/index.html b/mode/css/index.html
index 0d85311f1d..b39f126597 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -12,7 +12,7 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/less.html b/mode/css/less.html
index adf7427d30..80e15aeffc 100644
--- a/mode/css/less.html
+++ b/mode/css/less.html
@@ -10,7 +10,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/less_test.js b/mode/css/less_test.js
index dd821558b0..2e33a23c98 100644
--- a/mode/css/less_test.js
+++ b/mode/css/less_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   "use strict";
diff --git a/mode/css/scss.html b/mode/css/scss.html
index f8e4d37368..0a25964955 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -9,7 +9,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 785921b39c..1fc1bbdc28 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");
diff --git a/mode/css/test.js b/mode/css/test.js
index e5c55d3999..6d83df2852 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "css");
diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 9b2490014c..8b22e65db8 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // By the Neo4j Team and contributors.
 // https://github.com/neo4j-contrib/CodeMirror
diff --git a/mode/cypher/index.html b/mode/cypher/index.html
index b8bd75c8b3..1f32a753cd 100644
--- a/mode/cypher/index.html
+++ b/mode/cypher/index.html
@@ -15,7 +15,7 @@
 }
         </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/cypher/test.js b/mode/cypher/test.js
index 76d0d08296..691835596f 100644
--- a/mode/cypher/test.js
+++ b/mode/cypher/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "cypher");
diff --git a/mode/d/d.js b/mode/d/d.js
index 77b09c224e..6f68c3a69b 100644
--- a/mode/d/d.js
+++ b/mode/d/d.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/d/index.html b/mode/d/index.html
index 08cabd8a2e..95437e5e7d 100644
--- a/mode/d/index.html
+++ b/mode/d/index.html
@@ -10,7 +10,7 @@
 <script src="d.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/d/test.js b/mode/d/test.js
index d8de4ad35f..f8ac9de1c8 100644
--- a/mode/d/test.js
+++ b/mode/d/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "d");
diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 4db0d37159..48a427780a 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/dart/index.html b/mode/dart/index.html
index e79da5a8b0..b68a4c5939 100644
--- a/mode/dart/index.html
+++ b/mode/dart/index.html
@@ -9,7 +9,7 @@
 <script src="dart.js"></script>
 <style>.CodeMirror {border: 1px solid #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/diff/diff.js b/mode/diff/diff.js
index fe0305e7b6..a30fd37a50 100644
--- a/mode/diff/diff.js
+++ b/mode/diff/diff.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/diff/index.html b/mode/diff/index.html
index 0af611fa48..5c7ef7dee0 100644
--- a/mode/diff/index.html
+++ b/mode/diff/index.html
@@ -15,7 +15,7 @@
       span.cm-error.cm-tag { background-color: #2b2; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/django/django.js b/mode/django/django.js
index 7b4ef3b566..07be123986 100644
--- a/mode/django/django.js
+++ b/mode/django/django.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/django/index.html b/mode/django/index.html
index 41ea07c91b..2060d7ae97 100644
--- a/mode/django/index.html
+++ b/mode/django/index.html
@@ -13,7 +13,7 @@
 <script src="django.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
index 769e787e4a..983170f519 100644
--- a/mode/dockerfile/dockerfile.js
+++ b/mode/dockerfile/dockerfile.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/dockerfile/index.html b/mode/dockerfile/index.html
index a31759bce1..93df336ec3 100644
--- a/mode/dockerfile/index.html
+++ b/mode/dockerfile/index.html
@@ -10,7 +10,7 @@
 <script src="dockerfile.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dockerfile/test.js b/mode/dockerfile/test.js
index 9a2b89ad21..51add3ce9c 100644
--- a/mode/dockerfile/test.js
+++ b/mode/dockerfile/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-dockerfile");
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index 52d76ee114..74b8c6bded 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
   DTD mode
diff --git a/mode/dtd/index.html b/mode/dtd/index.html
index e6798a748a..a6f50fa37c 100644
--- a/mode/dtd/index.html
+++ b/mode/dtd/index.html
@@ -9,7 +9,7 @@
 <script src="dtd.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index 0acc1a3888..6725edccc0 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/dylan/index.html b/mode/dylan/index.html
index ddf5ad067d..83d734affb 100644
--- a/mode/dylan/index.html
+++ b/mode/dylan/index.html
@@ -12,7 +12,7 @@
 <script src="dylan.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dylan/test.js b/mode/dylan/test.js
index bf25be27e1..8b121b9133 100644
--- a/mode/dylan/test.js
+++ b/mode/dylan/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "dylan");
diff --git a/mode/ebnf/ebnf.js b/mode/ebnf/ebnf.js
index 9618f8e42b..238bbe23bf 100644
--- a/mode/ebnf/ebnf.js
+++ b/mode/ebnf/ebnf.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ebnf/index.html b/mode/ebnf/index.html
index 13845629b3..e92e0f0855 100644
--- a/mode/ebnf/index.html
+++ b/mode/ebnf/index.html
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id=nav>
-      <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/mode/ecl/ecl.js b/mode/ecl/ecl.js
index 8df7ebe4ab..9af8aee180 100644
--- a/mode/ecl/ecl.js
+++ b/mode/ecl/ecl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ecl/index.html b/mode/ecl/index.html
index 2306860dcb..1acaec332f 100644
--- a/mode/ecl/index.html
+++ b/mode/ecl/index.html
@@ -9,7 +9,7 @@
 <script src="ecl.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/eiffel/eiffel.js b/mode/eiffel/eiffel.js
index b8b70e36e5..f6f3f458b6 100644
--- a/mode/eiffel/eiffel.js
+++ b/mode/eiffel/eiffel.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/eiffel/index.html b/mode/eiffel/index.html
index 108a71bec8..568fbb79bb 100644
--- a/mode/eiffel/index.html
+++ b/mode/eiffel/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/elm/elm.js b/mode/elm/elm.js
index 9fcfc88371..fe8dd497f4 100644
--- a/mode/elm/elm.js
+++ b/mode/elm/elm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/elm/index.html b/mode/elm/index.html
index d5cb16abfb..fb64b53f43 100644
--- a/mode/elm/index.html
+++ b/mode/elm/index.html
@@ -9,7 +9,7 @@
 <script src="elm.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index 9528e19f93..f0541bb955 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*jshint unused:true, eqnull:true, curly:true, bitwise:true */
 /*jshint undef:true, latedef:true, trailing:true */
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index 6d06a890a2..eb0a62e8d7 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -11,7 +11,7 @@
 <script src="erlang.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/factor/factor.js b/mode/factor/factor.js
index e238c5ea64..7108278cca 100644
--- a/mode/factor/factor.js
+++ b/mode/factor/factor.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Factor syntax highlight - simple mode
 //
diff --git a/mode/factor/index.html b/mode/factor/index.html
index 9f15489140..13fe429783 100644
--- a/mode/factor/index.html
+++ b/mode/factor/index.html
@@ -16,7 +16,7 @@
 }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/fcl/fcl.js b/mode/fcl/fcl.js
index 518116976a..2d3f2001d3 100644
--- a/mode/fcl/fcl.js
+++ b/mode/fcl/fcl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/fcl/index.html b/mode/fcl/index.html
index 3c18d0b3c7..7ea0fd15f8 100644
--- a/mode/fcl/index.html
+++ b/mode/fcl/index.html
@@ -11,7 +11,7 @@
 <script src="fcl.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/forth/forth.js b/mode/forth/forth.js
index 1f519d8862..f2caa27af8 100644
--- a/mode/forth/forth.js
+++ b/mode/forth/forth.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Author: Aliaksei Chapyzhenka
 
diff --git a/mode/forth/index.html b/mode/forth/index.html
index ae8cd34584..470363f48f 100644
--- a/mode/forth/index.html
+++ b/mode/forth/index.html
@@ -16,7 +16,7 @@
 }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/fortran/fortran.js b/mode/fortran/fortran.js
index 4d88f006aa..85bacc42c1 100644
--- a/mode/fortran/fortran.js
+++ b/mode/fortran/fortran.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/fortran/index.html b/mode/fortran/index.html
index 9aed0efccc..0d2632f4b5 100644
--- a/mode/fortran/index.html
+++ b/mode/fortran/index.html
@@ -9,7 +9,7 @@
 <script src="fortran.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index 0c74bedc57..e34d7a7b61 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/gas/index.html b/mode/gas/index.html
index df75ca2db7..34eea72da4 100644
--- a/mode/gas/index.html
+++ b/mode/gas/index.html
@@ -9,7 +9,7 @@
 <script src="gas.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 471ae906b9..492c9487a6 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index ea4bac15fe..b4bc81d6b4 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -20,7 +20,7 @@
   .cm-s-default .cm-emoji {color: #009688;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index e7135264c3..d933896aa5 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var config = {tabSize: 4, indentUnit: 2}
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index fc2ebee167..1b438b9057 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
 Gherkin mode - http://www.cukes.info/
diff --git a/mode/gherkin/index.html b/mode/gherkin/index.html
index af8184c981..52e9ff67b2 100644
--- a/mode/gherkin/index.html
+++ b/mode/gherkin/index.html
@@ -9,7 +9,7 @@
 <script src="gherkin.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/go/go.js b/mode/go/go.js
index 36131f10fe..c005e42ddc 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/go/index.html b/mode/go/index.html
index 72e3b364c6..4489211043 100644
--- a/mode/go/index.html
+++ b/mode/go/index.html
@@ -11,7 +11,7 @@
 <script src="go.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 0df97dd0b7..b76a03fa12 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/groovy/index.html b/mode/groovy/index.html
index bb0df078c3..3e022fdf09 100644
--- a/mode/groovy/index.html
+++ b/mode/groovy/index.html
@@ -10,7 +10,7 @@
 <script src="groovy.js"></script>
 <style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 20ae1e19ca..3c8f505eb5 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/haml/index.html b/mode/haml/index.html
index 2894a938e8..ba3ea3062c 100644
--- a/mode/haml/index.html
+++ b/mode/haml/index.html
@@ -13,7 +13,7 @@
 <script src="haml.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haml/test.js b/mode/haml/test.js
index 508458a437..e051452738 100644
--- a/mode/haml/test.js
+++ b/mode/haml/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "haml");
diff --git a/mode/handlebars/handlebars.js b/mode/handlebars/handlebars.js
index 39445ebbfe..93865b7a0d 100644
--- a/mode/handlebars/handlebars.js
+++ b/mode/handlebars/handlebars.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
index b1bfad1ca3..71aa6cc4a9 100644
--- a/mode/handlebars/index.html
+++ b/mode/handlebars/index.html
@@ -12,7 +12,7 @@
 <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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haskell-literate/haskell-literate.js b/mode/haskell-literate/haskell-literate.js
index 906415b4c1..4bb9268491 100644
--- a/mode/haskell-literate/haskell-literate.js
+++ b/mode/haskell-literate/haskell-literate.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function (mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/haskell-literate/index.html b/mode/haskell-literate/index.html
index 8c9bc60d15..aa3f3ea5b1 100644
--- a/mode/haskell-literate/index.html
+++ b/mode/haskell-literate/index.html
@@ -13,7 +13,7 @@
   border-bottom : 1px solid #DDDDDD;
 }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo
                                                           src="../../doc/logo.png"></a>
 
   <ul>
diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index acc52b5c3b..2e882dc600 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/haskell/index.html b/mode/haskell/index.html
index 42240b0f2f..afa7a898ee 100644
--- a/mode/haskell/index.html
+++ b/mode/haskell/index.html
@@ -11,7 +11,7 @@
 <script src="haskell.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index d159d082e9..45376852a6 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/haxe/index.html b/mode/haxe/index.html
index d415b5e109..10a241c418 100644
--- a/mode/haxe/index.html
+++ b/mode/haxe/index.html
@@ -9,7 +9,7 @@
 <script src="haxe.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index 8099d370be..439e63a427 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index 9ed33cffef..ad9bfe4122 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -14,7 +14,7 @@
 <script src="htmlembedded.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 33398ec5c0..c992538477 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index e576c0592e..6e3d79fc70 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -14,7 +14,7 @@
 <script src="htmlmixed.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/http/http.js b/mode/http/http.js
index 9a3c5f9fd8..092353259f 100644
--- a/mode/http/http.js
+++ b/mode/http/http.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/http/index.html b/mode/http/index.html
index 0b8d5315da..9335dd79c6 100644
--- a/mode/http/index.html
+++ b/mode/http/index.html
@@ -9,7 +9,7 @@
 <script src="http.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/idl/idl.js b/mode/idl/idl.js
index 07308d71dc..168761cd88 100644
--- a/mode/idl/idl.js
+++ b/mode/idl/idl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/idl/index.html b/mode/idl/index.html
index 4c169e2d69..ad6404b42e 100644
--- a/mode/idl/index.html
+++ b/mode/idl/index.html
@@ -9,7 +9,7 @@
 <script src="idl.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/index.html b/mode/index.html
index ccabf88be4..858ba127f2 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -5,7 +5,7 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 592a133d85..37115d5b14 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -12,7 +12,7 @@
 <script src="javascript.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index ba27c5d0bc..a31ffff8ef 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/javascript/json-ld.html b/mode/javascript/json-ld.html
index 3a37f0bce6..5c31f39f42 100644
--- a/mode/javascript/json-ld.html
+++ b/mode/javascript/json-ld.html
@@ -12,7 +12,7 @@
 <script src="javascript.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"/></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index f8c95bf7ca..ec0a8117c9 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index 1f26d7fe1b..36f223e195 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -9,7 +9,7 @@
 <script src="javascript.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index 5a70e9153b..3314d49d71 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -9,7 +9,7 @@
 <script src="jinja2.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index 5d57d13448..b96a777a22 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/jsx/index.html b/mode/jsx/index.html
index 1054bbcc0a..0fb3f75527 100644
--- a/mode/jsx/index.html
+++ b/mode/jsx/index.html
@@ -11,7 +11,7 @@
 <script src="jsx.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 039e37bb5e..2c91beb955 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index 891f98830d..5ecd5a8b01 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "jsx")
diff --git a/mode/julia/index.html b/mode/julia/index.html
index e1492c210f..379ede3350 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -9,7 +9,7 @@
 <script src="julia.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 2d89c497d4..35b75acda5 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/livescript/index.html b/mode/livescript/index.html
index f415479876..297b1c7bc2 100644
--- a/mode/livescript/index.html
+++ b/mode/livescript/index.html
@@ -10,7 +10,7 @@
 <script src="livescript.js"></script>
 <style>.CodeMirror {font-size: 80%;border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index 1e363f8769..595e067d16 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Link to the project's GitHub page:
diff --git a/mode/lua/index.html b/mode/lua/index.html
index fc98b94468..59f4df3e32 100644
--- a/mode/lua/index.html
+++ b/mode/lua/index.html
@@ -11,7 +11,7 @@
 <script src="lua.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
@@ -75,7 +75,7 @@ <h2>Lua mode</h2>
     </script>
 
     <p>Loosely based on Franciszek
-    Wawrzak's <a href="http://codemirror.net/1/contrib/lua">CodeMirror
+    Wawrzak's <a href="https://codemirror.net/1/contrib/lua">CodeMirror
     1 mode</a>. One configuration parameter is
     supported, <code>specials</code>, to which you can provide an
     array of strings to have those identifiers highlighted with
diff --git a/mode/lua/lua.js b/mode/lua/lua.js
index 0b19abd304..202f373585 100644
--- a/mode/lua/lua.js
+++ b/mode/lua/lua.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's
 // CodeMirror 1 mode.
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index f17ecdc9ac..c571463e58 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -16,7 +16,7 @@
       .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index d523ec8bb3..8f9e747d67 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index a6da158d0a..49604e0dc2 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var config = {tabSize: 4, indentUnit: 2}
diff --git a/mode/mathematica/index.html b/mode/mathematica/index.html
index 57c4298531..2e5a5748fc 100644
--- a/mode/mathematica/index.html
+++ b/mode/mathematica/index.html
@@ -12,7 +12,7 @@
   .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mathematica/mathematica.js b/mode/mathematica/mathematica.js
index 07e808b1e9..72b3492101 100644
--- a/mode/mathematica/mathematica.js
+++ b/mode/mathematica/mathematica.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Mathematica mode copyright (c) 2015 by Calin Barbat
 // Based on code by Patrick Scheibe (halirutan)
diff --git a/mode/mbox/index.html b/mode/mbox/index.html
index 248ea98e18..c70cf36074 100644
--- a/mode/mbox/index.html
+++ b/mode/mbox/index.html
@@ -9,7 +9,7 @@
 <script src="mbox.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mbox/mbox.js b/mode/mbox/mbox.js
index ba2416ac81..640437ed64 100644
--- a/mode/mbox/mbox.js
+++ b/mode/mbox/mbox.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/meta.js b/mode/meta.js
index 615b6a5883..337bd14eab 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/mirc/index.html b/mode/mirc/index.html
index fd2f34e4ba..338df1da62 100644
--- a/mode/mirc/index.html
+++ b/mode/mirc/index.html
@@ -10,7 +10,7 @@
 <script src="mirc.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mirc/mirc.js b/mode/mirc/mirc.js
index 71ac4ddfd4..d27b0152e9 100644
--- a/mode/mirc/mirc.js
+++ b/mode/mirc/mirc.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 //mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
 
diff --git a/mode/mllike/index.html b/mode/mllike/index.html
index b1ed6c7d78..491373171f 100644
--- a/mode/mllike/index.html
+++ b/mode/mllike/index.html
@@ -12,7 +12,7 @@
   .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 92b51cbc34..8ef3a7be6c 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/modelica/index.html b/mode/modelica/index.html
index 408c3b17e3..ed344e712f 100644
--- a/mode/modelica/index.html
+++ b/mode/modelica/index.html
@@ -12,7 +12,7 @@
 <script src="modelica.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/modelica/modelica.js b/mode/modelica/modelica.js
index 77ec7a3c18..a83a4135d0 100644
--- a/mode/modelica/modelica.js
+++ b/mode/modelica/modelica.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Modelica support for CodeMirror, copyright (c) by Lennart Ochel
 
diff --git a/mode/mscgen/index.html b/mode/mscgen/index.html
index b1d7e7c2e6..a35ffd4320 100644
--- a/mode/mscgen/index.html
+++ b/mode/mscgen/index.html
@@ -9,7 +9,7 @@
 <script src="mscgen.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>
+  <a href="https://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>
diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
index 2cd6f42703..01be09b293 100644
--- a/mode/mscgen/mscgen.js
+++ b/mode/mscgen/mscgen.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // mode(s) for the sequence chart dsl's mscgen, xù and msgenny
 // For more information on mscgen, see the site of the original author:
diff --git a/mode/mscgen/mscgen_test.js b/mode/mscgen/mscgen_test.js
index 956c5758e1..286b7ce90e 100644
--- a/mode/mscgen/mscgen_test.js
+++ b/mode/mscgen/mscgen_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "mscgen");
diff --git a/mode/mscgen/msgenny_test.js b/mode/mscgen/msgenny_test.js
index edf9da09af..90ec38ca8a 100644
--- a/mode/mscgen/msgenny_test.js
+++ b/mode/mscgen/msgenny_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-msgenny");
diff --git a/mode/mscgen/xu_test.js b/mode/mscgen/xu_test.js
index 950aeca1f9..76a85d23b4 100644
--- a/mode/mscgen/xu_test.js
+++ b/mode/mscgen/xu_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-xu");
diff --git a/mode/mumps/index.html b/mode/mumps/index.html
index b1f92c213f..8931e7ffc8 100644
--- a/mode/mumps/index.html
+++ b/mode/mumps/index.html
@@ -9,7 +9,7 @@
 <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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mumps/mumps.js b/mode/mumps/mumps.js
index 469f8c3d1c..3671c9cb36 100644
--- a/mode/mumps/mumps.js
+++ b/mode/mumps/mumps.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
   This MUMPS Language script was constructed using vbscript.js as a template.
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index dde54574d5..7d4ad7e630 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -21,7 +21,7 @@
     }
   </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/nginx/nginx.js b/mode/nginx/nginx.js
index 00a3224922..a09f1501fa 100644
--- a/mode/nginx/nginx.js
+++ b/mode/nginx/nginx.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/nsis/index.html b/mode/nsis/index.html
index 2afae87f08..4bd73650af 100644
--- a/mode/nsis/index.html
+++ b/mode/nsis/index.html
@@ -13,7 +13,7 @@
   .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 69bc95074f..94b8eae24d 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Author: Jan T. Sott (http://github.com/idleberg)
 
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index 9c99846396..ea2eeefa5f 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -14,7 +14,7 @@
       }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/ntriples/ntriples.js b/mode/ntriples/ntriples.js
index 148272e1fd..5dd027286a 100644
--- a/mode/ntriples/ntriples.js
+++ b/mode/ntriples/ntriples.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**********************************************************
 * This script provides syntax highlighting support for
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 3490ee6371..5580345843 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -9,7 +9,7 @@
 <script src="octave.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index b77ad682ed..4040b67033 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/oz/index.html b/mode/oz/index.html
index febd82a59a..782a27c964 100644
--- a/mode/oz/index.html
+++ b/mode/oz/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border: 1px solid #aaa;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://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>
diff --git a/mode/oz/oz.js b/mode/oz/oz.js
index 50ffda37a6..a9738495b6 100644
--- a/mode/oz/oz.js
+++ b/mode/oz/oz.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/pascal/index.html b/mode/pascal/index.html
index f8a99ad01e..c3fdf74c91 100644
--- a/mode/pascal/index.html
+++ b/mode/pascal/index.html
@@ -9,7 +9,7 @@
 <script src="pascal.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index 3240532f58..dc3b1a3a3e 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/pegjs/index.html b/mode/pegjs/index.html
index 0c74604881..34fa5e8bd6 100644
--- a/mode/pegjs/index.html
+++ b/mode/pegjs/index.html
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id=nav>
-      <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index 6c72074666..19d5fa4c02 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/perl/index.html b/mode/perl/index.html
index 8c1021c42b..71757b215a 100644
--- a/mode/perl/index.html
+++ b/mode/perl/index.html
@@ -9,7 +9,7 @@
 <script src="perl.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 66e4ed034c..a3101a7c5b 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
 // This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
diff --git a/mode/php/index.html b/mode/php/index.html
index adf6b1be22..3995c84544 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -15,7 +15,7 @@
 <script src="php.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/php/php.js b/mode/php/php.js
index 589c9a6639..80e2f20bf1 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/php/test.js b/mode/php/test.js
index e2ecefc187..ec158145ce 100644
--- a/mode/php/test.js
+++ b/mode/php/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "php");
diff --git a/mode/pig/index.html b/mode/pig/index.html
index ea77f70441..80fed6e1c0 100644
--- a/mode/pig/index.html
+++ b/mode/pig/index.html
@@ -8,7 +8,7 @@
 <script src="pig.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/pig/pig.js b/mode/pig/pig.js
index 5b567272e6..3b9c7746bb 100644
--- a/mode/pig/pig.js
+++ b/mode/pig/pig.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
  *      Pig Latin Mode for CodeMirror 2
diff --git a/mode/powershell/index.html b/mode/powershell/index.html
index 6b235df8f1..789187640c 100644
--- a/mode/powershell/index.html
+++ b/mode/powershell/index.html
@@ -11,7 +11,7 @@
   </head>
   <body>
     <div id=nav>
-      <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/mode/powershell/powershell.js b/mode/powershell/powershell.js
index 2728ef9d9d..85f89b9ec7 100644
--- a/mode/powershell/powershell.js
+++ b/mode/powershell/powershell.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   'use strict';
diff --git a/mode/powershell/test.js b/mode/powershell/test.js
index 9c9aed0d5d..ba1ecf194d 100644
--- a/mode/powershell/test.js
+++ b/mode/powershell/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "powershell");
diff --git a/mode/properties/index.html b/mode/properties/index.html
index f885302de2..eb49f92914 100644
--- a/mode/properties/index.html
+++ b/mode/properties/index.html
@@ -9,7 +9,7 @@
 <script src="properties.js"></script>
 <style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/properties/properties.js b/mode/properties/properties.js
index ef8bf37eea..02fd7fe5eb 100644
--- a/mode/properties/properties.js
+++ b/mode/properties/properties.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/protobuf/index.html b/mode/protobuf/index.html
index 55d4535666..ee58cd9a46 100644
--- a/mode/protobuf/index.html
+++ b/mode/protobuf/index.html
@@ -9,7 +9,7 @@
 <script src="protobuf.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/protobuf/protobuf.js b/mode/protobuf/protobuf.js
index 93cb3b0e05..68b240a40e 100644
--- a/mode/protobuf/protobuf.js
+++ b/mode/protobuf/protobuf.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/pug/index.html b/mode/pug/index.html
index 1765853a1f..321284806a 100644
--- a/mode/pug/index.html
+++ b/mode/pug/index.html
@@ -13,7 +13,7 @@
 <script src="pug.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/pug/pug.js b/mode/pug/pug.js
index 401823365c..8701b02382 100644
--- a/mode/pug/pug.js
+++ b/mode/pug/pug.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/puppet/index.html b/mode/puppet/index.html
index 5614c3695a..757377b1d2 100644
--- a/mode/puppet/index.html
+++ b/mode/puppet/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/puppet/puppet.js b/mode/puppet/puppet.js
index 57041300af..364934209e 100644
--- a/mode/puppet/puppet.js
+++ b/mode/puppet/puppet.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/python/index.html b/mode/python/index.html
index 134387ff21..e52eea680b 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -10,7 +10,7 @@
 <script src="python.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/python/python.js b/mode/python/python.js
index a13a850921..623c03f7f0 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/python/test.js b/mode/python/test.js
index 40f0a61f43..604c2eb9d6 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4},
diff --git a/mode/q/index.html b/mode/q/index.html
index 72785ba3bf..e13ad5b6af 100644
--- a/mode/q/index.html
+++ b/mode/q/index.html
@@ -10,7 +10,7 @@
 <script src="q.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/q/q.js b/mode/q/q.js
index 9aee18ab1e..c016a6aa65 100644
--- a/mode/q/q.js
+++ b/mode/q/q.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/r/index.html b/mode/r/index.html
index 01b6e664b7..28192dabc5 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -15,7 +15,7 @@
       .cm-s-default span.cm-arg-is { color: brown; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/r/r.js b/mode/r/r.js
index be7db46b85..18ce3badeb 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
index 6e5031bd1f..7026cc5287 100644
--- a/mode/rpm/changes/index.html
+++ b/mode/rpm/changes/index.html
@@ -11,7 +11,7 @@
     <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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../../index.html">Home</a>
diff --git a/mode/rpm/index.html b/mode/rpm/index.html
index 9a34e6dfb8..f1f8316840 100644
--- a/mode/rpm/index.html
+++ b/mode/rpm/index.html
@@ -11,7 +11,7 @@
     <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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/rpm/rpm.js b/mode/rpm/rpm.js
index 87cde591a3..2dece2eabd 100644
--- a/mode/rpm/rpm.js
+++ b/mode/rpm/rpm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/rst/index.html b/mode/rst/index.html
index 2902dea231..eec3013132 100644
--- a/mode/rst/index.html
+++ b/mode/rst/index.html
@@ -10,7 +10,7 @@
 <script src="rst.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index bcf110c1a5..f14eb270f9 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 97544babc3..486b1e2454 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 874c1830e7..f954ed2212 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ruby/test.js b/mode/ruby/test.js
index 3133bd63f4..5677e0de8d 100644
--- a/mode/ruby/test.js
+++ b/mode/ruby/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "ruby");
diff --git a/mode/rust/index.html b/mode/rust/index.html
index 1fe0ad1e66..5903fb40a1 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -10,7 +10,7 @@
 <script src="rust.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index b635563ae6..6bcfbc4446 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/rust/test.js b/mode/rust/test.js
index eb256c47e8..36c5cdeba8 100644
--- a/mode/rust/test.js
+++ b/mode/rust/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4}, "rust");
diff --git a/mode/sas/index.html b/mode/sas/index.html
index 636e06594b..7146486786 100644
--- a/mode/sas/index.html
+++ b/mode/sas/index.html
@@ -15,7 +15,7 @@
   .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sas/sas.js b/mode/sas/sas.js
index d85b33534c..c6f528e0a9 100755
--- a/mode/sas/sas.js
+++ b/mode/sas/sas.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 
 // SAS mode copyright (c) 2016 Jared Dean, SAS Institute
diff --git a/mode/sass/index.html b/mode/sass/index.html
index 6305649e5c..0db5eacbcf 100644
--- a/mode/sass/index.html
+++ b/mode/sass/index.html
@@ -11,7 +11,7 @@
 <script src="sass.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 7d8135bfe5..c37ab0b28f 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/sass/test.js b/mode/sass/test.js
index 6b2f593218..63d79193b4 100644
--- a/mode/sass/test.js
+++ b/mode/sass/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "sass");
diff --git a/mode/scheme/index.html b/mode/scheme/index.html
index 04d5c6a2a3..f2eda51d66 100644
--- a/mode/scheme/index.html
+++ b/mode/scheme/index.html
@@ -9,7 +9,7 @@
 <script src="scheme.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 1d8f7d17f0..3191fe8118 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Author: Koh Zi Han, based on implementation by Koh Zi Chun
diff --git a/mode/shell/index.html b/mode/shell/index.html
index e42f4b5f3b..a844c1a40b 100644
--- a/mode/shell/index.html
+++ b/mode/shell/index.html
@@ -12,7 +12,7 @@
   .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index b806c2bcb5..65d352c161 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/shell/test.js b/mode/shell/test.js
index 4be557216f..7571d907de 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({}, "shell");
diff --git a/mode/sieve/index.html b/mode/sieve/index.html
index 6f029b623e..36369acba2 100644
--- a/mode/sieve/index.html
+++ b/mode/sieve/index.html
@@ -9,7 +9,7 @@
 <script src="sieve.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sieve/sieve.js b/mode/sieve/sieve.js
index 0920d0bab3..f02a867e7a 100644
--- a/mode/sieve/sieve.js
+++ b/mode/sieve/sieve.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/slim/index.html b/mode/slim/index.html
index 7fa4e50df3..7aebf0aef1 100644
--- a/mode/slim/index.html
+++ b/mode/slim/index.html
@@ -20,7 +20,7 @@
 <script src="slim.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/slim/slim.js b/mode/slim/slim.js
index 991a97efcd..b8ccb1381f 100644
--- a/mode/slim/slim.js
+++ b/mode/slim/slim.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
 
diff --git a/mode/slim/test.js b/mode/slim/test.js
index be4ddacb62..991797fc88 100644
--- a/mode/slim/test.js
+++ b/mode/slim/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
 
diff --git a/mode/smalltalk/index.html b/mode/smalltalk/index.html
index 2155ebc2a0..2dd45a2060 100644
--- a/mode/smalltalk/index.html
+++ b/mode/smalltalk/index.html
@@ -14,7 +14,7 @@
       .CodeMirror-gutter pre {color: white; font-weight: bold;}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index bb510ba2e1..5039fe2d15 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index b19c8f09b5..8bc1c3d8fd 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -10,7 +10,7 @@
 <script src="smarty.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 6e0fbed422..c0777e0c7a 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /**
  * Smarty 2 and 3 mode.
diff --git a/mode/solr/index.html b/mode/solr/index.html
index 4b18c25b78..8a0fdbed75 100644
--- a/mode/solr/index.html
+++ b/mode/solr/index.html
@@ -18,7 +18,7 @@
   }
 </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/solr/solr.js b/mode/solr/solr.js
index dc8b82501e..eda4a7a17d 100644
--- a/mode/solr/solr.js
+++ b/mode/solr/solr.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/soy/index.html b/mode/soy/index.html
index f0216f097d..f9a1b59910 100644
--- a/mode/soy/index.html
+++ b/mode/soy/index.html
@@ -14,7 +14,7 @@
 <script src="soy.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 6b9d5125e3..4c0a106d6e 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/soy/test.js b/mode/soy/test.js
index d503d7f83c..12515eda0b 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "soy");
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 84ef4d3639..dfd3f9070a 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -10,7 +10,7 @@
 <script src="sparql.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 095dcca653..f246776b12 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/spreadsheet/index.html b/mode/spreadsheet/index.html
index a52f76f050..03422bb94b 100644
--- a/mode/spreadsheet/index.html
+++ b/mode/spreadsheet/index.html
@@ -10,7 +10,7 @@
 <script src="spreadsheet.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/spreadsheet/spreadsheet.js b/mode/spreadsheet/spreadsheet.js
index 222f297668..d87f988d35 100644
--- a/mode/spreadsheet/spreadsheet.js
+++ b/mode/spreadsheet/spreadsheet.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/sql/index.html b/mode/sql/index.html
index b434f0f405..34b314ddba 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -17,7 +17,7 @@
 }
         </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index ab99c5a046..2ab55c3528 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/stex/index.html b/mode/stex/index.html
index 25225e41c4..225f485fe2 100644
--- a/mode/stex/index.html
+++ b/mode/stex/index.html
@@ -9,7 +9,7 @@
 <script src="stex.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 44908675fd..140e5a8af9 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
  * Author: Constantin Jucovschi (c.jucovschi@jacobs-university.de)
diff --git a/mode/stex/test.js b/mode/stex/test.js
index 634dc49d9e..b1dbcf4cd5 100644
--- a/mode/stex/test.js
+++ b/mode/stex/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, "stex");
diff --git a/mode/stylus/index.html b/mode/stylus/index.html
index 862c18f250..491c14d55b 100644
--- a/mode/stylus/index.html
+++ b/mode/stylus/index.html
@@ -11,7 +11,7 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;} form{margin-bottom: .7em;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index a9f50c05d1..dbe241d613 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Stylus mode created by Dmitry Kiselyov http://git.io/AaRB
 
diff --git a/mode/swift/index.html b/mode/swift/index.html
index 109f3fdb07..d33eba4fcd 100644
--- a/mode/swift/index.html
+++ b/mode/swift/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 1795d86e94..b751185197 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Swift mode created by Michael Kaminsky https://github.com/mkaminsky11
 
diff --git a/mode/swift/test.js b/mode/swift/test.js
index 4091ac6f4c..d8a0609b8f 100644
--- a/mode/swift/test.js
+++ b/mode/swift/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "swift");
diff --git a/mode/tcl/index.html b/mode/tcl/index.html
index ce4ad3423e..328c9eaf3a 100644
--- a/mode/tcl/index.html
+++ b/mode/tcl/index.html
@@ -10,7 +10,7 @@
 <script src="tcl.js"></script>
 <script src="../../addon/scroll/scrollpastend.js"></script>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index 8c76d52ca0..a7ec89c9e8 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 //tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
 
diff --git a/mode/textile/index.html b/mode/textile/index.html
index 42b156b1e2..e8d9b99a7c 100644
--- a/mode/textile/index.html
+++ b/mode/textile/index.html
@@ -9,7 +9,7 @@
 <script src="textile.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/textile/test.js b/mode/textile/test.js
index 49cdaf9c91..754c5f6bd7 100644
--- a/mode/textile/test.js
+++ b/mode/textile/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, 'textile');
@@ -39,12 +39,12 @@
       '3 ** 3 = 27');
 
   MT('simpleLink',
-      '[link "CodeMirror":http://codemirror.net]');
+      '[link "CodeMirror":https://codemirror.net]');
 
   MT('referenceLink',
       '[link "CodeMirror":code_mirror]',
       'Normal Text.',
-      '[link [[code_mirror]]http://codemirror.net]');
+      '[link [[code_mirror]]https://codemirror.net]');
 
   MT('footCite',
       'foo bar[qualifier [[1]]]');
diff --git a/mode/textile/textile.js b/mode/textile/textile.js
index bc5a2f3692..b378fb61f5 100644
--- a/mode/textile/textile.js
+++ b/mode/textile/textile.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") { // CommonJS
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index 77dd0457c1..661ddfefa4 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -11,7 +11,7 @@
 <script src="tiddlywiki.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index 1a3b3bc68a..a4fb89f658 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /***
     |''Name''|tiddlywiki.js|
@@ -8,7 +8,7 @@
     |''Version''|0.1.7|
     |''Status''|''stable''|
     |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
-    |''Documentation''|http://codemirror.tiddlyspace.com/|
+    |''Documentation''|https://codemirror.tiddlyspace.com/|
     |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
     |''CoreVersion''|2.5.0|
     |''Requires''|codemirror.js|
diff --git a/mode/tiki/index.html b/mode/tiki/index.html
index 091c5fb2a6..c9dbf8f796 100644
--- a/mode/tiki/index.html
+++ b/mode/tiki/index.html
@@ -10,7 +10,7 @@
 <script src="tiki.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index b4794e4334..092b859532 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/toml/index.html b/mode/toml/index.html
index 90a2a0215b..05038a968c 100644
--- a/mode/toml/index.html
+++ b/mode/toml/index.html
@@ -9,7 +9,7 @@
 <script src="toml.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/toml/toml.js b/mode/toml/toml.js
index baeca15568..891f384b5b 100644
--- a/mode/toml/toml.js
+++ b/mode/toml/toml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/tornado/index.html b/mode/tornado/index.html
index 8ee7ef56cc..d4a3a74a61 100644
--- a/mode/tornado/index.html
+++ b/mode/tornado/index.html
@@ -12,7 +12,7 @@
 <script src="tornado.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tornado/tornado.js b/mode/tornado/tornado.js
index dbfbc34890..aa589a08c3 100644
--- a/mode/tornado/tornado.js
+++ b/mode/tornado/tornado.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/troff/index.html b/mode/troff/index.html
index 7c5a54e54f..1810764214 100644
--- a/mode/troff/index.html
+++ b/mode/troff/index.html
@@ -12,7 +12,7 @@
   .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/troff/troff.js b/mode/troff/troff.js
index 86154b6e14..0c2220d2cc 100644
--- a/mode/troff/troff.js
+++ b/mode/troff/troff.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object")
diff --git a/mode/ttcn-cfg/index.html b/mode/ttcn-cfg/index.html
index 4a4cd4571c..3a3b1e4d80 100644
--- a/mode/ttcn-cfg/index.html
+++ b/mode/ttcn-cfg/index.html
@@ -14,7 +14,7 @@
     }
 </style>
 <div id=nav>
-    <a href="http://codemirror.net"><h1>CodeMirror</h1>
+    <a href="https://codemirror.net"><h1>CodeMirror</h1>
         <img id=logo src="../../doc/logo.png">
     </a>
 
diff --git a/mode/ttcn-cfg/ttcn-cfg.js b/mode/ttcn-cfg/ttcn-cfg.js
index e10805119c..9d4b8405af 100644
--- a/mode/ttcn-cfg/ttcn-cfg.js
+++ b/mode/ttcn-cfg/ttcn-cfg.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ttcn/index.html b/mode/ttcn/index.html
index f1ef811310..502d63268a 100644
--- a/mode/ttcn/index.html
+++ b/mode/ttcn/index.html
@@ -14,7 +14,7 @@
     }
 </style>
 <div id=nav>
-    <a href="http://codemirror.net"><h1>CodeMirror</h1>
+    <a href="https://codemirror.net"><h1>CodeMirror</h1>
         <img id=logo src="../../doc/logo.png">
     </a>
 
diff --git a/mode/ttcn/ttcn.js b/mode/ttcn/ttcn.js
index 3051851779..0304e7c53d 100644
--- a/mode/ttcn/ttcn.js
+++ b/mode/ttcn/ttcn.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/turtle/index.html b/mode/turtle/index.html
index a4962b6174..747a83aa28 100644
--- a/mode/turtle/index.html
+++ b/mode/turtle/index.html
@@ -9,7 +9,7 @@
 <script src="turtle.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/turtle/turtle.js b/mode/turtle/turtle.js
index 0988f0a442..695239661f 100644
--- a/mode/turtle/turtle.js
+++ b/mode/turtle/turtle.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/twig/index.html b/mode/twig/index.html
index 02493a5cb8..1fac45d0c8 100644
--- a/mode/twig/index.html
+++ b/mode/twig/index.html
@@ -9,7 +9,7 @@
 <script src="twig.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/twig/twig.js b/mode/twig/twig.js
index b4e98972bc..a6dd3f1a68 100644
--- a/mode/twig/twig.js
+++ b/mode/twig/twig.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/vb/index.html b/mode/vb/index.html
index 8697248907..bb84221c83 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -15,7 +15,7 @@
       .CodeMirror pre { font-family: Inconsolata; font-size: 14px}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 735eb7f7e8..5892cc04e9 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/vbscript/index.html b/mode/vbscript/index.html
index ad7532d7df..d40da17f38 100644
--- a/mode/vbscript/index.html
+++ b/mode/vbscript/index.html
@@ -9,7 +9,7 @@
 <script src="vbscript.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vbscript/vbscript.js b/mode/vbscript/vbscript.js
index b66df2239a..0670c0ceef 100644
--- a/mode/vbscript/vbscript.js
+++ b/mode/vbscript/vbscript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 /*
 For extra ASP classic objects, initialize CodeMirror instance with this option:
diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index 7eba8f4185..b38c570df7 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -10,7 +10,7 @@
 <script src="velocity.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index 2525fda5ca..56caa671b3 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index 9c52722afb..04122511d5 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -10,7 +10,7 @@
 <script src="verilog.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/verilog/test.js b/mode/verilog/test.js
index 8334fab05b..bafe726db3 100644
--- a/mode/verilog/test.js
+++ b/mode/verilog/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4}, "verilog");
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 3404686097..2b6850659b 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/vhdl/index.html b/mode/vhdl/index.html
index 3051bc37e5..71caf2f0bb 100644
--- a/mode/vhdl/index.html
+++ b/mode/vhdl/index.html
@@ -10,7 +10,7 @@
 <script src="vhdl.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vhdl/vhdl.js b/mode/vhdl/vhdl.js
index 97e086e42b..133e67a268 100644
--- a/mode/vhdl/vhdl.js
+++ b/mode/vhdl/vhdl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Originally written by Alf Nielsen, re-written by Michael Zhou
 (function(mod) {
diff --git a/mode/vue/index.html b/mode/vue/index.html
index e0b45b9452..3888e3deb9 100644
--- a/mode/vue/index.html
+++ b/mode/vue/index.html
@@ -21,7 +21,7 @@
 <script src="vue.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vue/vue.js b/mode/vue/vue.js
index 84cd07c9a4..b6e6cc5137 100644
--- a/mode/vue/vue.js
+++ b/mode/vue/vue.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function (mod) {
   "use strict";
diff --git a/mode/webidl/index.html b/mode/webidl/index.html
index 1d4112e1c3..45b6eeffea 100644
--- a/mode/webidl/index.html
+++ b/mode/webidl/index.html
@@ -10,7 +10,7 @@
 <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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id="logo" src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/webidl/webidl.js b/mode/webidl/webidl.js
index 814333620a..120de6bea7 100644
--- a/mode/webidl/webidl.js
+++ b/mode/webidl/webidl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/xml/index.html b/mode/xml/index.html
index c56b8b6eb7..ba6b0ef5b8 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -9,7 +9,7 @@
 <script src="xml.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/xml/test.js b/mode/xml/test.js
index f48156b517..b586d2b459 100644
--- a/mode/xml/test.js
+++ b/mode/xml/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "xml"), mname = "xml";
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 5927bc917b..b67bf850b1 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/xquery/index.html b/mode/xquery/index.html
index 7ac5aaeff4..def7b9b855 100644
--- a/mode/xquery/index.html
+++ b/mode/xquery/index.html
@@ -15,7 +15,7 @@
 	}
     </style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/xquery/test.js b/mode/xquery/test.js
index 9697f9b0ac..f7ad3ac529 100644
--- a/mode/xquery/test.js
+++ b/mode/xquery/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Don't take these too seriously -- the expected results appear to be
 // based on the results of actual runs without any serious manual
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index f5db831c1c..395b6a7014 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/yacas/index.html b/mode/yacas/index.html
index 8e52cafb10..52236fc97d 100644
--- a/mode/yacas/index.html
+++ b/mode/yacas/index.html
@@ -12,7 +12,7 @@
   .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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/yacas/yacas.js b/mode/yacas/yacas.js
index 34c84fbd08..b7ac96b71d 100644
--- a/mode/yacas/yacas.js
+++ b/mode/yacas/yacas.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // Yacas mode copyright (c) 2015 by Grzegorz Mazur
 // Loosely based on mathematica mode by Calin Barbat
diff --git a/mode/yaml-frontmatter/index.html b/mode/yaml-frontmatter/index.html
index 30cb294e80..e6283fc678 100644
--- a/mode/yaml-frontmatter/index.html
+++ b/mode/yaml-frontmatter/index.html
@@ -13,7 +13,7 @@
 <script src="yaml-frontmatter.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
index 5f49772370..e9faefcf9b 100644
--- a/mode/yaml-frontmatter/yaml-frontmatter.js
+++ b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function (mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/yaml/index.html b/mode/yaml/index.html
index be9b632368..bfea6111da 100644
--- a/mode/yaml/index.html
+++ b/mode/yaml/index.html
@@ -9,7 +9,7 @@
 <script src="yaml.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index f35a40130a..b10e263578 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/z80/index.html b/mode/z80/index.html
index a41b7473e2..39db506fbb 100644
--- a/mode/z80/index.html
+++ b/mode/z80/index.html
@@ -9,7 +9,7 @@
 <script src="z80.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>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/z80/z80.js b/mode/z80/z80.js
index aae70216f8..8cea4ff90c 100644
--- a/mode/z80/z80.js
+++ b/mode/z80/z80.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/package.json b/package.json
index 3b793365e0..d6adbd8b8d 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "CodeMirror",
     "Editor"
   ],
-  "homepage": "http://codemirror.net",
+  "homepage": "https://codemirror.net",
   "maintainers": [
     {
       "name": "Marijn Haverbeke",
diff --git a/rollup.config.js b/rollup.config.js
index 9a17b24ff7..caba5654c5 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -2,9 +2,9 @@ import buble from 'rollup-plugin-buble';
 
 export default {
   banner: `// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
-// This is CodeMirror (http://codemirror.net), a code editor
+// This is CodeMirror (https://codemirror.net), a code editor
 // implemented in JavaScript on top of the browser's DOM.
 //
 // You can find some technical background for some of the code below
diff --git a/test/html-hint-test.js b/test/html-hint-test.js
index 4fd53932ef..a40582e296 100644
--- a/test/html-hint-test.js
+++ b/test/html-hint-test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var Pos = CodeMirror.Pos;
diff --git a/test/index.html b/test/index.html
index d735ac3c4b..0ef52fb2ce 100644
--- a/test/index.html
+++ b/test/index.html
@@ -78,7 +78,7 @@
 </style>
 
 <div id=nav>
-  <a href="http://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index 884ac7a26c..3ed8d121a7 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
 (function() {
   var Pos = CodeMirror.Pos;

From e6785f654eab7ea7543713f96eddcf0ecf864f58 Mon Sep 17 00:00:00 2001
From: John Van Der Loo <jvanderloo@atlassian.com>
Date: Wed, 25 Jul 2018 10:43:14 +1000
Subject: [PATCH 3795/4742] [jinja2 mode] add file extensions for jinja2 mode

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

diff --git a/mode/meta.js b/mode/meta.js
index 337bd14eab..17f5d1abb8 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -75,7 +75,7 @@
     {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
     {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
     {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
-    {name: "Jinja2", mime: "null", mode: "jinja2"},
+    {name: "Jinja2", mime: "null", mode: "jinja2", ext: ["j2", "jinja", "jinja2"]},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
     {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},

From 6c8e44650d92b218228108ef962dc4eb95ae02a2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 26 Jul 2018 07:42:08 +0200
Subject: [PATCH 3796/4742] Put underlines on links in the docs

Closes #5508
---
 doc/docs.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/docs.css b/doc/docs.css
index 881d2aa455..17b9212416 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -35,7 +35,6 @@ article > h2:first-child, section:first-child > h2 { margin-top: 0; }
 
 a, a:visited, a:link, .quasilink {
   color: #A21313;
-  text-decoration: none;
 }
 
 em {
@@ -90,6 +89,10 @@ article {
   margin-bottom: 32px;
 }
 
+#nav a {
+  text-decoration: none;
+}
+
 #nav li {
   display: block;
   margin-bottom: 4px;

From fd2a6284159e5105653d77012ebcebb3396388a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 26 Jul 2018 16:06:03 +0200
Subject: [PATCH 3797/4742] [closebrackets addon] Remove strange restriction on
 when to insert a closing bracket

The comment in the commit that introduced it disagrees with that the
commit actually implements, and the behavior doesn't seem useful,
so this commit removes it. See db6242871.

Issue #5512
---
 addon/edit/closebrackets.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index ada4b16244..ce1a4ac6b1 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -136,9 +136,7 @@
         var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)
         if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";
         else return CodeMirror.Pass;
-      } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
-                             isClosingBracket(next, pairs) ||
-                             /\s/.test(next))) {
+      } else if (opening) {
         curType = "both";
       } else {
         return CodeMirror.Pass;
@@ -175,11 +173,6 @@
     });
   }
 
-  function isClosingBracket(ch, pairs) {
-    var pos = pairs.lastIndexOf(ch);
-    return pos > -1 && pos % 2 == 1;
-  }
-
   function charsAround(cm, pos) {
     var str = cm.getRange(Pos(pos.line, pos.ch - 1),
                           Pos(pos.line, pos.ch + 1));

From ba1b606582a29b431891ca079c03869bc5fef9d6 Mon Sep 17 00:00:00 2001
From: Nikolaj Kappler <Nikolaj-Kappler@web.de>
Date: Tue, 7 Aug 2018 17:40:00 +0200
Subject: [PATCH 3798/4742] Fix for issue 5518

See description of issue here:
https://github.com/codemirror/CodeMirror/issues/5518
---
 addon/display/panel.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addon/display/panel.js b/addon/display/panel.js
index f192754dfa..5faf1d560e 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -17,13 +17,15 @@
     var info = this.state.panels;
     var wrapper = info.wrapper;
     var cmWrapper = this.getWrapperElement();
+    var replace = options.replace instanceof Panel && !options.replace.cleared;
 
     if (options.after instanceof Panel && !options.after.cleared) {
       wrapper.insertBefore(node, options.before.node.nextSibling);
     } else if (options.before instanceof Panel && !options.before.cleared) {
       wrapper.insertBefore(node, options.before.node);
-    } else if (options.replace instanceof Panel && !options.replace.cleared) {
+    } else if (replace) {
       wrapper.insertBefore(node, options.replace.node);
+      info.panels++;
       options.replace.clear();
     } else if (options.position == "bottom") {
       wrapper.appendChild(node);
@@ -37,7 +39,9 @@
 
     var height = (options && options.height) || node.offsetHeight;
     this._setSize(null, info.heightLeft -= height);
-    info.panels++;
+    if (!replace) {
+      info.panels++;
+    }
     if (options.stable && isAtTop(this, node))
       this.scrollTo(null, this.getScrollInfo().top + height)
 

From 31d318fce27db537ff462a2ee39eb70c0ac38453 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 11 Aug 2018 14:17:16 +0200
Subject: [PATCH 3799/4742] [jinja2 mode] Add block comment metadata

Closes #5522
---
 mode/jinja2/jinja2.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index b96a777a22..3ccfe7f18b 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -136,7 +136,9 @@
       },
       token: function (stream, state) {
         return state.tokenize(stream, state);
-      }
+      },
+      blockCommentStart: "{#",
+      blockCommentEnd: "#}"
     };
   });
 });

From c78d6d9cc73395cda55fa247b98d338f34d138a7 Mon Sep 17 00:00:00 2001
From: Mika Andrianarijaona <mikaoelitiana@users.noreply.github.com>
Date: Mon, 13 Aug 2018 21:50:18 +0200
Subject: [PATCH 3800/4742] [shell mode] Add `nl` command builtin highlight

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

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 65d352c161..0e667e6a54 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -31,7 +31,7 @@ CodeMirror.defineMode('shell', function() {
   // Commands
   define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
     'curl cut diff echo find gawk gcc get git grep hg kill killall ln ls make ' +
-    'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
+    'mkdir openssl mv nc nl node npm ping ps restart rm rmdir sed service sh ' +
     'shopt shred source sort sleep ssh start stop su sudo svn tee telnet top ' +
     'touch vi vim wall wc wget who write yes zsh');
 

From c9892c85b02e448370798edd374d6cbc9bb41272 Mon Sep 17 00:00:00 2001
From: Kier Darby <kier@xenforo.com>
Date: Tue, 14 Aug 2018 18:45:41 +0100
Subject: [PATCH 3801/4742] Add a mechanism for translating UI text to the
 library

Defines instance.phrase(text) and a phrases option.
---
 addon/merge/merge.js         |  5 +++--
 addon/search/jump-to-line.js |  7 ++++---
 addon/search/search.js       | 32 +++++++++++++++++++-------------
 src/edit/methods.js          | 15 +++++++++++++++
 src/edit/options.js          |  1 +
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 982ac22de5..1887e499c6 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -500,7 +500,7 @@
       var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
                                                 "CodeMirror-merge-copy"));
       var editOriginals = dv.mv.options.allowEditingOriginals;
-      copy.title = editOriginals ? "Push to left" : "Revert chunk";
+      copy.title = editOriginals ? dv.mv.editor().phrase("Push to left") : dv.mv.editor().phrase("Revert chunk");
       copy.chunk = chunk;
       copy.style.top = (chunk.origTo > chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
 
@@ -594,6 +594,7 @@
 
   function buildGap(dv) {
     var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
+    // TODO: this does not use CodeMirror.phrase() because no editor has been created when this is called, so phrases can not exist
     lock.title = "Toggle locked scrolling";
     var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
     CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
@@ -728,7 +729,7 @@
     cm.addLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
     var widget = document.createElement("span");
     widget.className = "CodeMirror-merge-collapsed-widget";
-    widget.title = "Identical text collapsed. Click to expand.";
+    widget.title = cm.phrase("Identical text collapsed. Click to expand.");
     var mark = cm.markText(Pos(from, 0), Pos(to - 1), {
       inclusiveLeft: true,
       inclusiveRight: true,
diff --git a/addon/search/jump-to-line.js b/addon/search/jump-to-line.js
index e75ac391b8..1f3526d247 100644
--- a/addon/search/jump-to-line.js
+++ b/addon/search/jump-to-line.js
@@ -18,8 +18,9 @@
     else f(prompt(shortText, deflt));
   }
 
-  var jumpDialog =
-      'Jump to line: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use line:column or scroll% syntax)</span>';
+  function getJumpDialog(cm) {
+    return cm.phrase("Jump to line:") + ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">' + cm.phrase("(Use line:column or scroll% syntax)") + '</span>';
+  }
 
   function interpretLine(cm, string) {
     var num = Number(string)
@@ -29,7 +30,7 @@
 
   CodeMirror.commands.jumpToLine = function(cm) {
     var cur = cm.getCursor();
-    dialog(cm, jumpDialog, "Jump to line:", (cur.line + 1) + ":" + cur.ch, function(posStr) {
+    dialog(cm, getJumpDialog(cm), cm.phrase("Jump to line:"), (cur.line + 1) + ":" + cur.ch, function(posStr) {
       if (!posStr) return;
 
       var match;
diff --git a/addon/search/search.js b/addon/search/search.js
index 27b226fa8b..5c2559c739 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -98,9 +98,6 @@
     return query;
   }
 
-  var queryDialog =
-    '<span class="CodeMirror-search-label">Search:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
-
   function startSearch(cm, state, query) {
     state.queryText = query;
     state.query = parseQuery(query);
@@ -136,7 +133,7 @@
             (hiding = dialog).style.opacity = .4
         })
       };
-      persistentDialog(cm, queryDialog, q, searchNext, function(event, query) {
+      persistentDialog(cm, getQueryDialog(cm), q, searchNext, function(event, query) {
         var keyName = CodeMirror.keyName(event)
         var extra = cm.getOption('extraKeys'), cmd = (extra && extra[keyName]) || CodeMirror.keyMap[cm.getOption("keyMap")][keyName]
         if (cmd == "findNext" || cmd == "findPrev" ||
@@ -154,7 +151,7 @@
         findNext(cm, rev);
       }
     } else {
-      dialog(cm, queryDialog, "Search for:", q, function(query) {
+      dialog(cm, getQueryDialog(cm), "Search for:", q, function(query) {
         if (query && !state.query) cm.operation(function() {
           startSearch(cm, state, query);
           state.posFrom = state.posTo = cm.getCursor();
@@ -186,10 +183,19 @@
     if (state.annotate) { state.annotate.clear(); state.annotate = null; }
   });}
 
-  var replaceQueryDialog =
-    ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
-  var replacementQueryDialog = '<span class="CodeMirror-search-label">With:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
-  var doReplaceConfirm = '<span class="CodeMirror-search-label">Replace?</span> <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>';
+
+  function getQueryDialog(cm)  {
+    return '<span class="CodeMirror-search-label">' + cm.phrase("Search:") + '</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">' + cm.phrase("(Use /re/ syntax for regexp search)") + '</span>';
+  }
+  function getReplaceQueryDialog(cm) {
+    return ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">' + cm.phrase("(Use /re/ syntax for regexp search)") + '</span>';
+  }
+  function getReplacementQueryDialog(cm) {
+    return '<span class="CodeMirror-search-label">' + cm.phrase("With:") + '</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
+  }
+  function getDoReplaceConfirm(cm) {
+    return '<span class="CodeMirror-search-label">' + cm.phrase("Replace?") + '</span> <button>' + cm.phrase("Yes") + '</button> <button>' + cm.phrase("No") + '</button> <button>' + cm.phrase("All") + '</button> <button>' + cm.phrase("Stop") + '</button> ';
+  }
 
   function replaceAll(cm, query, text) {
     cm.operation(function() {
@@ -205,11 +211,11 @@
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
     var query = cm.getSelection() || getSearchState(cm).lastQuery;
-    var dialogText = '<span class="CodeMirror-search-label">' + (all ? 'Replace all:' : 'Replace:') + '</span>';
-    dialog(cm, dialogText + replaceQueryDialog, dialogText, query, function(query) {
+    var dialogText = '<span class="CodeMirror-search-label">' + (all ? cm.phrase("Replace all:") : cm.phrase("Replace:")) + '</span>';
+    dialog(cm, dialogText + getReplaceQueryDialog(cm), dialogText, query, function(query) {
       if (!query) return;
       query = parseQuery(query);
-      dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {
+      dialog(cm, getReplacementQueryDialog(cm), cm.phrase("Replace with:"), "", function(text) {
         text = parseString(text)
         if (all) {
           replaceAll(cm, query, text)
@@ -225,7 +231,7 @@
             }
             cm.setSelection(cursor.from(), cursor.to());
             cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
-            confirmDialog(cm, doReplaceConfirm, "Replace?",
+            confirmDialog(cm, getDoReplaceConfirm(cm), cm.phrase("Replace?"),
                           [function() {doReplace(match);}, advance,
                            function() {replaceAll(cm, query, text)}]);
           };
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 5cefed7c18..2e4aa85d74 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -432,6 +432,21 @@ export default function(CodeMirror) {
       return old
     }),
 
+    phrases: {},
+    setPhrases: function(customPhrases) {
+      for (var key in customPhrases) {
+          if (customPhrases.hasOwnProperty(key)) this.phrases[key] = customPhrases[key]
+      }
+    },
+
+    phrase: function(phraseText) {
+      if (this.phrases !== null && this.phrases.hasOwnProperty(phraseText)) {
+          return this.phrases[phraseText]
+      } else {
+          return phraseText
+      }
+    },
+
     getInputField: function(){return this.display.input.getField()},
     getWrapperElement: function(){return this.display.wrapper},
     getScrollerElement: function(){return this.display.scroller},
diff --git a/src/edit/options.js b/src/edit/options.js
index 49cf10112b..72c70817f7 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -154,6 +154,7 @@ export function defineOptions(CodeMirror) {
   option("tabindex", null, (cm, val) => cm.display.input.getField().tabIndex = val || "")
   option("autofocus", null)
   option("direction", "ltr", (cm, val) => cm.doc.setDirection(val), true)
+  option("phrases", null, (cm, val) => cm.setPhrases(val))
 }
 
 function guttersChanged(cm) {

From be4793137cf806616a530b6a67cfd55199676994 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 16 Aug 2018 17:13:54 +0200
Subject: [PATCH 3802/4742] Finish and document phrases option and phrase
 method

Issue #5531
---
 addon/merge/merge.js |  5 ++---
 doc/manual.html      | 14 ++++++++++++++
 src/edit/methods.js  | 14 ++------------
 src/edit/options.js  |  2 +-
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 1887e499c6..63373f75ed 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -43,6 +43,7 @@
         if (!this.edit.state.trackAlignable) this.edit.state.trackAlignable = new TrackAlignable(this.edit)
         this.orig.state.trackAlignable = new TrackAlignable(this.orig)
       }
+      this.lockButton.title = this.edit.phrase("Toggle locked scrolling");
 
       this.orig.state.diffViews = [this];
       var classLocation = options.chunkClassLocation || "background";
@@ -500,7 +501,7 @@
       var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
                                                 "CodeMirror-merge-copy"));
       var editOriginals = dv.mv.options.allowEditingOriginals;
-      copy.title = editOriginals ? dv.mv.editor().phrase("Push to left") : dv.mv.editor().phrase("Revert chunk");
+      copy.title = dv.edit.phrase(editOriginals ? "Push to left" : "Revert chunk");
       copy.chunk = chunk;
       copy.style.top = (chunk.origTo > chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
 
@@ -594,8 +595,6 @@
 
   function buildGap(dv) {
     var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
-    // TODO: this does not use CodeMirror.phrase() because no editor has been created when this is called, so phrases can not exist
-    lock.title = "Toggle locked scrolling";
     var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
     CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
     var gapElts = [lockWrap];
diff --git a/doc/manual.html b/doc/manual.html
index 7bd16a44d7..dabc564e5e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -448,6 +448,15 @@ <h2>Configuration</h2>
       set to true when either the source textarea is focused, or it
       has an <code>autofocus</code> attribute and no other element is
       focused.</dd>
+
+      <dt id="option_phrases"><code><strong>phrases</strong>: ?object</code></dt>
+      <dd>Some addons run user-visible strings (such as labels in the
+      interface) through the <a href="#phrase"><code>phrase</code></a>
+      method to allow for translation. This option determines the
+      return value of that method. When it is null or an object that
+      doesn't have a property named by the input string, that string
+      is returned. Otherwise, the value of the property corresponding
+      to that string is returned.</dd>
     </dl>
 
     <p>Below this a few more specialized, low-level options are
@@ -2120,6 +2129,11 @@ <h3 id="api_misc">Miscellaneous methods</h3>
       <dt id="focus"><code><strong>cm.focus</strong>()</code></dt>
       <dd>Give the editor focus.</dd>
 
+      <dt id="phrase"><code><strong>cm.phrase</strong>(text: string) → string</code></dt>
+      <dd>Allow the given string to be translated with
+      the <a href="#option_phrases"><code>phrases</code>
+      option</a>.</dd>
+
       <dt id="getInputField"><code><strong>cm.getInputField</strong>() → Element</code></dt>
       <dd>Returns the input field for the editor. Will be a textarea
       or an editable div, depending on the value of
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 2e4aa85d74..685b5112a4 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -432,19 +432,9 @@ export default function(CodeMirror) {
       return old
     }),
 
-    phrases: {},
-    setPhrases: function(customPhrases) {
-      for (var key in customPhrases) {
-          if (customPhrases.hasOwnProperty(key)) this.phrases[key] = customPhrases[key]
-      }
-    },
-
     phrase: function(phraseText) {
-      if (this.phrases !== null && this.phrases.hasOwnProperty(phraseText)) {
-          return this.phrases[phraseText]
-      } else {
-          return phraseText
-      }
+      let phrases = this.options.phrases
+      return phrases && Object.prototype.hasOwnProperty.call(phrases, phraseText) ? phrases[phraseText] : phraseText
     },
 
     getInputField: function(){return this.display.input.getField()},
diff --git a/src/edit/options.js b/src/edit/options.js
index 72c70817f7..0ba5d4e3b8 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -154,7 +154,7 @@ export function defineOptions(CodeMirror) {
   option("tabindex", null, (cm, val) => cm.display.input.getField().tabIndex = val || "")
   option("autofocus", null)
   option("direction", "ltr", (cm, val) => cm.doc.setDirection(val), true)
-  option("phrases", null, (cm, val) => cm.setPhrases(val))
+  option("phrases", null)
 }
 
 function guttersChanged(cm) {

From b384a9f92318d6e4f9982aef1478ed3b6986b453 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Aug 2018 08:27:19 +0200
Subject: [PATCH 3803/4742] [hardwrap addon] Fix infinite loop

When the wrapping column was before the leading space, the code
got confused.

Closes #5535
---
 addon/wrap/hardwrap.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 0ab7bbbbe7..29cc15f01f 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -52,6 +52,7 @@
     var lines = cm.getRange(from, to, false);
     if (!lines.length) return null;
     var leadingSpace = lines[0].match(/^[ \t]*/)[0];
+    if (leadingSpace.length >= column) column = leadingSpace.length + 1
 
     for (var i = 0; i < lines.length; ++i) {
       var text = lines[i], oldLen = curLine.length, spaceInserted = 0;

From 046743c55a1a684e17798b06acb3ce8d2b2a26df Mon Sep 17 00:00:00 2001
From: Daniel Hanggi <djhanggi@gmail.com>
Date: Fri, 24 Aug 2018 04:14:34 -0500
Subject: [PATCH 3804/4742] [markdown mode] Add HTML comment support

HTML comments are generally permissible in Markdown, per https://spec.commonmark.org/0.28/.
---
 mode/markdown/markdown.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 8f9e747d67..8154cd68ce 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -869,6 +869,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     getType: getType,
 
+    blockCommentStart: "<!--",
+    blockCommentEnd: "-->",
     closeBrackets: "()[]{}''\"\"``",
     fold: "markdown"
   };

From 563f78fa55e202f5c2ee024f6bb9763a99266b2f Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <finalfantasia@users.noreply.github.com>
Date: Fri, 24 Aug 2018 23:20:21 -0700
Subject: [PATCH 3805/4742] [clojure more] Update built-ins with public symbols
 in `clojure.core`

The public symbols are retrieved with:
  (->> 'clojure.core
       (ns-publics)
       (keys)
       (sort)
       (clojure.string/join " "))
---
 mode/clojure/clojure.js | 58 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 2015edff14..c22ec3a172 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -39,56 +39,54 @@ CodeMirror.defineMode("clojure", function (options) {
 
     var builtins = makeKeywords(
         "* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* " +
-        "*compile-path* *compiler-options* *data-readers* *e *err* *file* *flush-on-newline* *fn-loader* *in* " +
-        "*math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* " +
-        "*source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> " +
-        "->> ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE accessor " +
+        "*compile-path* *compiler-options* *data-readers* *default-data-reader-fn* *e *err* *file* *flush-on-newline* *fn-loader* *in* " +
+        "*math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-namespace-maps* *print-readably* *read-eval* *reader-resolver* " +
+        "*source-path* *suppress-read* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> " +
+        "->> ->ArrayChunk ->Eduction ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE Inst StackTraceElement->vec Throwable->map accessor " +
         "aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! " +
-        "alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double " +
+        "alter-var-root amap ancestors and any? apply areduce array-map as-> aset aset-boolean aset-byte aset-char aset-double " +
         "aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 " +
         "bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set " +
-        "bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast " +
-        "byte byte-array bytes case cat cast char char-array char-escape-string char-name-string char? chars chunk chunk-append " +
+        "bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array boolean? booleans bound-fn bound-fn* bound? bounded-count butlast " +
+        "byte byte-array bytes bytes? case cast cat char char-array char-escape-string char-name-string char? chars chunk chunk-append " +
         "chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors " +
-        "clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement completing concat cond condp " +
+        "clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement completing concat cond cond-> cond->> condp " +
         "conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? " +
         "declare dedupe default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol " +
         "defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc " +
-        "dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last " +
-        "drop-while eduction empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info " +
+        "dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array double? doubles drop drop-last " +
+        "drop-while eduction empty empty? ensure ensure-reduced enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info " +
         "extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword " +
         "find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? " +
         "fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? " +
-        "gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash " +
-        "hash-combine hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc inc' init-proxy instance? " +
-        "int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep " +
+        "gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by halt-when hash " +
+        "hash-combine hash-map hash-ordered-coll hash-set hash-unordered-coll ident? identical? identity if-let if-not if-some ifn? import in-ns inc inc' indexed? init-proxy inst-ms inst-ms* inst? instance? " +
+        "int int-array int? integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep " +
         "keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file " +
         "load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array " +
-        "make-hierarchy map map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods " +
-        "min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty " +
+        "make-hierarchy map map-entry? map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods " +
+        "min min-key mix-collection-hash mod munge name namespace namespace-munge nat-int? neg-int? neg? newline next nfirst nil? nnext not not-any? not-empty " +
         "not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias " +
         "ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all " +
-        "partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers " +
+        "partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos-int? pos? pr pr-str prefer-method prefers " +
         "primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str " +
-        "prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues " +
+        "prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues qualified-ident? qualified-keyword? qualified-symbol? " +
         "quot rand rand-int rand-nth random-sample range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern " +
-        "re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history " +
+        "re-seq read read-line read-string reader-conditional reader-conditional? realized? record? reduce reduce-kv reduced reduced? reductions ref ref-history-count ref-max-history " +
         "ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods " +
-        "remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest " +
-        "restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? " +
-        "seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts " +
-        "shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? " +
-        "special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol " +
-        "symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transduce " +
+        "remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! reset-vals! resolve rest " +
+        "restart-agent resultset-seq reverse reversible? rseq rsubseq run! satisfies? second select-keys send send-off send-via seq seq? seqable? " +
+        "seque sequence sequential? set set-agent-send-executor! set-agent-send-off-executor! set-error-handler! set-error-mode! set-validator! set? short short-array shorts " +
+        "shuffle shutdown-agents simple-ident? simple-keyword? simple-symbol? slurp some some-> some->> some-fn some? sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? " +
+        "special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! swap-vals! symbol " +
+        "symbol? sync tagged-literal tagged-literal? take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transduce " +
         "transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec " +
         "unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int " +
-        "unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int "+
+        "unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int " +
         "unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote " +
-        "unquote-splicing update update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of " +
-        "vector? volatile! volatile? vreset! vswap! when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context " +
-        "with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap " +
-        "*default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! " +
-        "set-agent-send-off-executor! some-> some->>");
+        "unquote-splicing unreduced unsigned-bit-shift-right update update-in update-proxy uri? use uuid? val vals var-get var-set var? vary-meta vec vector vector-of " +
+        "vector? volatile! volatile? vreset! vswap! when when-first when-let when-not when-some while with-bindings with-bindings* with-in-str with-loading-context " +
+        "with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap");
 
     var indentKeys = makeKeywords(
         // Built-ins

From b6d929104d1e3b95fe9b61faa1269b58d6f3cb0a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 25 Aug 2018 08:29:14 +0200
Subject: [PATCH 3806/4742] Mark version 5.40.0

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 4e91edfc13..b7407343fd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -384,6 +384,7 @@ Kevin Kwok
 Kevin Muret
 Kevin Sawicki
 Kevin Ushey
+Kier Darby
 Klaus Silveira
 Koh Zi Han, Cliff
 komakino
@@ -491,6 +492,7 @@ Michal Kapiczynski
 Mighty Guava
 Miguel Castillo
 mihailik
+Mika Andrianarijaona
 Mike
 Mike Brevoort
 Mike Diaz
@@ -534,6 +536,7 @@ Niels van Groningen
 nightwing
 Nikita Beloglazov
 Nikita Vasilyev
+Nikolaj Kappler
 Nikolay Kostov
 nilp0inter
 Nisarg Jhaveri
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb561405c4..0bb3861d41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 5.40.0 (2018-08-25)
+
+### Bug fixes
+
+[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Fix issue where bracket-closing wouldn't work before punctuation.
+
+[panel addon](https://codemirror.net/doc/manual.html#addon_panel): Fix problem where replacing the last remaining panel dropped the newly added panel.
+
+[hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap): Fix an infinite loop when the indention is greater than the target column.
+
+[jinja2](https://codemirror.net/mode/jinja2/) and [markdown](https://codemirror.net/mode/markdown/) modes: Add comment metadata.
+
+### New features
+
+New method [`phrase`](https://codemirror.net/doc/manual.html#phrase) and option [`phrases`](https://codemirror.net/doc/manual.html#option_phrases) to make translating UI text in addons easier.
+
 ## 5.39.2 (2018-07-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index dabc564e5e..bb7b44dcc7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.39.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.40.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 1eff6792a0..257532b922 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">25-08-2018: <a href="https://codemirror.net/codemirror-5.40.0.zip">Version 5.40.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>New method <a href="https://codemirror.net/doc/manual.html#phrase"><code>phrase</code></a> and option <a href="https://codemirror.net/doc/manual.html#option_phrases"><code>phrases</code></a> to make translating UI text in addons easier.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Fix issue where bracket-closing wouldn't work before punctuation.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Fix problem where replacing the last remaining panel dropped the newly added panel.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_hardwrap">hardwrap addon</a>: Fix an infinite loop when the indention is greater than the target column.</li>
+    <li><a href="https://codemirror.net/mode/jinja2/">jinja2</a> and <a href="https://codemirror.net/mode/markdown/">markdown</a> modes: Add comment metadata.</li>
+  </ul>
+
   <p class="rel">20-07-2018: <a href="https://codemirror.net/codemirror-5.39.2.zip">Version 5.39.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 2b3ccceab8..908c9764cb 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.39.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.40.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index d6adbd8b8d..965a85454d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.39.3",
+  "version": "5.40.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 9bde1c6109..283c9295e3 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.39.3"
+CodeMirror.version = "5.40.0"

From 372ff6147f3f60e12509d9264a9c7ce09410c77c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 25 Aug 2018 08:32:22 +0200
Subject: [PATCH 3807/4742] Bump version number post-5.40.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index bb7b44dcc7..e0aad80227 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.40.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.40.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 965a85454d..77e7261abc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.40.0",
+  "version": "5.40.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index 283c9295e3..c9aea75b4d 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.40.0"
+CodeMirror.version = "5.40.1"

From a79defe2c4fc956768110990e8515f1afa317261 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Mon, 27 Aug 2018 09:25:09 +0200
Subject: [PATCH 3808/4742] [markdown mode] `:---:` is not an emoji

---
 mode/markdown/markdown.js | 2 +-
 mode/markdown/test.js     | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 8154cd68ce..df7183669f 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -620,7 +620,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
 
-    if (modeCfg.emoji && ch === ":" && stream.match(/^[a-z_\d+-]+:/)) {
+    if (modeCfg.emoji && ch === ":" && stream.match(/^(?:[a-z_\d+][a-z_\d+-]*|\-[a-z_\d+][a-z_\d+-]*):/)) {
       state.emoji = true;
       if (modeCfg.highlightFormatting) state.formatting = "emoji";
       var retType = getType(state);
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 49604e0dc2..aa1263e118 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -45,6 +45,8 @@
       "formatting" : "override-formatting"
   }});
   function FormatTokenTypeOverrideTest(name) { test.mode(name, modeFormattingOverride, Array.prototype.slice.call(arguments, 1)); }
+  var modeET = CodeMirror.getMode(config, {name: "markdown", emoji: true});
+  function ET(name) { test.mode(name, modeET, Array.prototype.slice.call(arguments, 1)); }
 
 
   FT("formatting_emAsterisk",
@@ -1305,4 +1307,11 @@
   MT_noXml("xmlHighlightDisabled",
      "<div>foo</div>");
 
+  // Tests Emojis
+
+  ET("emojiDefault",
+    "[builtin :foobar:]");
+
+  ET("emojiTable",
+    " :--:");
 })();

From b43113c5af16ec19a0762e28fd18ac0263bf1f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Wed, 29 Aug 2018 10:56:46 +0200
Subject: [PATCH 3809/4742] Prevent collapsing trailing spaces ("split spaces")
 on all browsers

Ref #1362.

Firefox now also collapses spaces at the end of the line (tested on 62.0).
It should be harmless for any other browsers.
---
 src/line/line_data.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/line/line_data.js b/src/line/line_data.js
index 74acdaffc0..7829484c4c 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -68,7 +68,7 @@ export function buildLineContent(cm, lineView) {
   let builder = {pre: eltP("pre", [content], "CodeMirror-line"), content: content,
                  col: 0, pos: 0, cm: cm,
                  trailingSpace: false,
-                 splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")}
+                 splitSpaces: cm.getOption("lineWrapping")}
   lineView.measure = {}
 
   // Iterate over the logical lines that make up this visual line.
@@ -189,6 +189,8 @@ function buildToken(builder, text, style, startStyle, endStyle, title, css) {
   builder.content.appendChild(content)
 }
 
+// Change some spaces to NBSP to prevent the browser from collapsing
+// trailing spaces at the end of a line when rendering text (issue #1362).
 function splitSpaces(text, trailingBefore) {
   if (text.length > 1 && !/  /.test(text)) return text
   let spaceBefore = trailingBefore, result = ""

From 74fca7c1d97fef3cc90a5bff2a2819603c7c0c26 Mon Sep 17 00:00:00 2001
From: Philipp Markovics <philipp@markovics.com>
Date: Wed, 29 Aug 2018 16:04:47 +0200
Subject: [PATCH 3810/4742] [clojure mode] Provide `hintWords`

---
 mode/clojure/clojure.js | 176 +++++++++++++++++++++++-----------------
 1 file changed, 102 insertions(+), 74 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index c22ec3a172..7c21a8b980 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -22,89 +22,117 @@ CodeMirror.defineMode("clojure", function (options) {
     var INDENT_WORD_SKIP = options.indentUnit || 2;
     var NORMAL_INDENT_UNIT = options.indentUnit || 2;
 
-    function makeKeywords(str) {
-        var obj = {}, words = str.split(" ");
+    function makeKeywords(words) {
+        var obj = {};
         for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
         return obj;
     }
 
-    var atoms = makeKeywords("true false nil");
-
-    var keywords = makeKeywords(
-      "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest " +
-      "slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn " +
-      "do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync " +
-      "doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars " +
-      "binding gen-class gen-and-load-class gen-and-save-class handler-case handle");
-
-    var builtins = makeKeywords(
-        "* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* " +
-        "*compile-path* *compiler-options* *data-readers* *default-data-reader-fn* *e *err* *file* *flush-on-newline* *fn-loader* *in* " +
-        "*math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-namespace-maps* *print-readably* *read-eval* *reader-resolver* " +
-        "*source-path* *suppress-read* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> " +
-        "->> ->ArrayChunk ->Eduction ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE Inst StackTraceElement->vec Throwable->map accessor " +
-        "aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! " +
-        "alter-var-root amap ancestors and any? apply areduce array-map as-> aset aset-boolean aset-byte aset-char aset-double " +
-        "aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 " +
-        "bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set " +
-        "bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array boolean? booleans bound-fn bound-fn* bound? bounded-count butlast " +
-        "byte byte-array bytes bytes? case cast cat char char-array char-escape-string char-name-string char? chars chunk chunk-append " +
-        "chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors " +
-        "clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement completing concat cond cond-> cond->> condp " +
-        "conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? " +
-        "declare dedupe default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol " +
-        "defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc " +
-        "dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array double? doubles drop drop-last " +
-        "drop-while eduction empty empty? ensure ensure-reduced enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info " +
-        "extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword " +
-        "find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? " +
-        "fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? " +
-        "gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by halt-when hash " +
-        "hash-combine hash-map hash-ordered-coll hash-set hash-unordered-coll ident? identical? identity if-let if-not if-some ifn? import in-ns inc inc' indexed? init-proxy inst-ms inst-ms* inst? instance? " +
-        "int int-array int? integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep " +
-        "keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file " +
-        "load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array " +
-        "make-hierarchy map map-entry? map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods " +
-        "min min-key mix-collection-hash mod munge name namespace namespace-munge nat-int? neg-int? neg? newline next nfirst nil? nnext not not-any? not-empty " +
-        "not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias " +
-        "ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all " +
-        "partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos-int? pos? pr pr-str prefer-method prefers " +
-        "primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str " +
-        "prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues qualified-ident? qualified-keyword? qualified-symbol? " +
-        "quot rand rand-int rand-nth random-sample range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern " +
-        "re-seq read read-line read-string reader-conditional reader-conditional? realized? record? reduce reduce-kv reduced reduced? reductions ref ref-history-count ref-max-history " +
-        "ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods " +
-        "remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! reset-vals! resolve rest " +
-        "restart-agent resultset-seq reverse reversible? rseq rsubseq run! satisfies? second select-keys send send-off send-via seq seq? seqable? " +
-        "seque sequence sequential? set set-agent-send-executor! set-agent-send-off-executor! set-error-handler! set-error-mode! set-validator! set? short short-array shorts " +
-        "shuffle shutdown-agents simple-ident? simple-keyword? simple-symbol? slurp some some-> some->> some-fn some? sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? " +
-        "special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! swap-vals! symbol " +
-        "symbol? sync tagged-literal tagged-literal? take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transduce " +
-        "transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec " +
-        "unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int " +
-        "unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int " +
-        "unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote " +
-        "unquote-splicing unreduced unsigned-bit-shift-right update update-in update-proxy uri? use uuid? val vals var-get var-set var? vary-meta vec vector vector-of " +
-        "vector? volatile! volatile? vreset! vswap! when when-first when-let when-not when-some while with-bindings with-bindings* with-in-str with-loading-context " +
-        "with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap");
-
-    var indentKeys = makeKeywords(
+    var commonAtoms = ["true", "false", "nil"];
+    var commonKeywords = ["defn", "defn-", "def", "def-", "defonce", "defmulti", "defmethod", "defmacro",
+        "defstruct", "deftype", "defprotocol", "defrecord", "defproject", "deftest", "slice", "defalias",
+        "defhinted", "defmacro-", "defn-memo", "defnk", "defonce-", "defunbound", "defunbound-",
+        "defvar", "defvar-", "let", "letfn", "do", "case", "cond", "condp", "for", "loop", "recur", "when",
+        "when-not", "when-let", "when-first", "if", "if-let", "if-not", ".", "..", "->", "->>", "doto",
+        "and", "or", "dosync", "doseq", "dotimes", "dorun", "doall", "load", "import", "unimport", "ns",
+        "in-ns", "refer", "try", "catch", "finally", "throw", "with-open", "with-local-vars", "binding",
+        "gen-class", "gen-and-load-class", "gen-and-save-class", "handler-case", "handle"];
+    var commonBuiltins = ["*", "*'", "*1", "*2", "*3", "*agent*", "*allow-unresolved-vars*", "*assert*",
+        "*clojure-version*", "*command-line-args*", "*compile-files*", "*compile-path*", "*compiler-options*",
+        "*data-readers*", "*default-data-reader-fn*", "*e", "*err*", "*file*", "*flush-on-newline*", "*fn-loader*",
+        "*in*", "*math-context*", "*ns*", "*out*", "*print-dup*", "*print-length*", "*print-level*", "*print-meta*",
+        "*print-namespace-maps*", "*print-readably*", "*read-eval*", "*reader-resolver*", "*source-path*",
+        "*suppress-read*", "*unchecked-math*", "*use-context-classloader*", "*verbose-defrecords*",
+        "*warn-on-reflection*'", "-", "-'", "->", "->>", "->ArrayChunk", "->Eduction", "->Vec", "->VecNode",
+        "->VecSeq", "-cache-protocol-fn", "-reset-methods", "..", "/", "<", "<=", "=", "==", ">", ">=",
+        "EMPTY-NODE", "Inst", "StackTraceElement->vec", "Throwable->map", "accessor", "aclone", "add-classpath",
+        "add-watch", "agent", "agent-error", "agent-errors", "aget", "alength", "alias", "all-ns", "alter",
+        "alter-meta!", "alter-var-root", "amap", "ancestors", "and", "any?", "apply", "areduce", "array-map",
+        "as->", "aset", "aset-boolean", "aset-byte", "aset-char", "aset-double", "aset-float", "aset-int",
+        "aset-long", "aset-short", "assert", "assoc", "assoc!", "assoc-in", "associative?", "atom", "await",
+        "await-for", "await1", "bases", "bean", "bigdec", "bigint", "biginteger", "binding", "bit-and", "bit-and-not",
+        "bit-clear", "bit-flip", "bit-not", "bit-or", "bit-set", "bit-shift-left", "bit-shift-right", "bit-test",
+        "bit-xor", "boolean", "boolean-array", "boolean?", "booleans", "bound-fn", "bound-fn*", "bound?",
+        "bounded-count", "butlast", "byte", "byte-array", "bytes", "bytes?", "case", "cast", "cat", "char",
+        "char-array", "char-escape-string", "char-name-string", "char?", "chars", "chunk", "chunk-append",
+        "chunk-buffer", "chunk-cons", "chunk-first", "chunk-next", "chunk-rest", "chunked-seq?", "class", "class?",
+        "clear-agent-errors", "clojure-version", "coll?", "comment", "commute", "comp", "comparator", "compare",
+        "compare-and-set!", "compile", "complement", "completing", "concat", "cond", "cond->", "cond->>", "condp",
+        "conj", "conj!", "cons", "constantly", "construct-proxy", "contains?", "count", "counted?", "create-ns",
+        "create-struct", "cycle", "dec", "dec'", "decimal?", "declare", "dedupe", "default-data-readers", "definline",
+        "definterface", "defmacro", "defmethod", "defmulti", "defn", "defn-", "defonce", "defprotocol", "defrecord",
+        "defstruct", "deftype", "delay", "delay?", "deliver", "denominator", "deref", "derive", "descendants",
+        "destructure", "disj", "disj!", "dissoc", "dissoc!", "distinct", "distinct?", "doall", "dorun", "doseq",
+        "dosync", "dotimes", "doto", "double", "double-array", "double?", "doubles", "drop", "drop-last", "drop-while",
+        "eduction", "empty", "empty?", "ensure", "ensure-reduced", "enumeration-seq", "error-handler", "error-mode",
+        "eval", "even?", "every-pred", "every?", "ex-data", "ex-info", "extend", "extend-protocol", "extend-type",
+        "extenders", "extends?", "false?", "ffirst", "file-seq", "filter", "filterv", "find", "find-keyword", "find-ns",
+        "find-protocol-impl", "find-protocol-method", "find-var", "first", "flatten", "float", "float-array", "float?",
+        "floats", "flush", "fn", "fn?", "fnext", "fnil", "for", "force", "format", "frequencies", "future", "future-call",
+        "future-cancel", "future-cancelled?", "future-done?", "future?", "gen-class", "gen-interface", "gensym", "get",
+        "get-in", "get-method", "get-proxy-class", "get-thread-bindings", "get-validator", "group-by", "halt-when", "hash",
+        "hash-combine", "hash-map", "hash-ordered-coll", "hash-set", "hash-unordered-coll", "ident?", "identical?",
+        "identity", "if-let", "if-not", "if-some", "ifn?", "import", "in-ns", "inc", "inc'", "indexed?", "init-proxy",
+        "inst-ms", "inst-ms*", "inst?", "instance?", "int", "int-array", "int?", "integer?", "interleave", "intern",
+        "interpose", "into", "into-array", "ints", "io!", "isa?", "iterate", "iterator-seq", "juxt", "keep", "keep-indexed",
+        "key", "keys", "keyword", "keyword?", "last", "lazy-cat", "lazy-seq", "let", "letfn", "line-seq", "list", "list*",
+        "list?", "load", "load-file", "load-reader", "load-string", "loaded-libs", "locking", "long", "long-array", "longs",
+        "loop", "macroexpand", "macroexpand-1", "make-array", "make-hierarchy", "map", "map-entry?", "map-indexed", "map?",
+        "mapcat", "mapv", "max", "max-key", "memfn", "memoize", "merge", "merge-with", "meta", "method-sig", "methods",
+        "min", "min-key", "mix-collection-hash", "mod", "munge", "name", "namespace", "namespace-munge", "nat-int?",
+        "neg-int?", "neg?", "newline", "next", "nfirst", "nil?", "nnext", "not", "not-any?", "not-empty", "not-every?",
+        "not=", "ns", "ns-aliases", "ns-imports", "ns-interns", "ns-map", "ns-name", "ns-publics", "ns-refers", "ns-resolve",
+        "ns-unalias", "ns-unmap", "nth", "nthnext", "nthrest", "num", "number?", "numerator", "object-array", "odd?", "or",
+        "parents", "partial", "partition", "partition-all", "partition-by", "pcalls", "peek", "persistent!", "pmap", "pop",
+        "pop!", "pop-thread-bindings", "pos-int?", "pos?", "pr", "pr-str", "prefer-method", "prefers",
+        "primitives-classnames", "print", "print-ctor", "print-dup", "print-method", "print-simple", "print-str", "printf",
+        "println", "println-str", "prn", "prn-str", "promise", "proxy", "proxy-call-with-super", "proxy-mappings",
+        "proxy-name", "proxy-super", "push-thread-bindings", "pvalues", "qualified-ident?", "qualified-keyword?",
+        "qualified-symbol?", "quot", "rand", "rand-int", "rand-nth", "random-sample", "range", "ratio?", "rational?",
+        "rationalize", "re-find", "re-groups", "re-matcher", "re-matches", "re-pattern", "re-seq", "read", "read-line",
+        "read-string", "reader-conditional", "reader-conditional?", "realized?", "record?", "reduce", "reduce-kv", "reduced",
+        "reduced?", "reductions", "ref", "ref-history-count", "ref-max-history", "ref-min-history", "ref-set", "refer",
+        "refer-clojure", "reify", "release-pending-sends", "rem", "remove", "remove-all-methods", "remove-method", "remove-ns",
+        "remove-watch", "repeat", "repeatedly", "replace", "replicate", "require", "reset!", "reset-meta!", "reset-vals!",
+        "resolve", "rest", "restart-agent", "resultset-seq", "reverse", "reversible?", "rseq", "rsubseq", "run!", "satisfies?",
+        "second", "select-keys", "send", "send-off", "send-via", "seq", "seq?", "seqable?", "seque", "sequence", "sequential?",
+        "set", "set-agent-send-executor!", "set-agent-send-off-executor!", "set-error-handler!", "set-error-mode!",
+        "set-validator!", "set?", "short", "short-array", "shorts", "shuffle", "shutdown-agents", "simple-ident?",
+        "simple-keyword?", "simple-symbol?", "slurp", "some", "some->", "some->>", "some-fn", "some?", "sort", "sort-by",
+        "sorted-map", "sorted-map-by", "sorted-set", "sorted-set-by", "sorted?", "special-symbol?", "spit", "split-at",
+        "split-with", "str", "string?", "struct", "struct-map", "subs", "subseq", "subvec", "supers", "swap!", "swap-vals!",
+        "symbol", "symbol?", "sync", "tagged-literal", "tagged-literal?", "take", "take-last", "take-nth", "take-while", "test",
+        "the-ns", "thread-bound?", "time", "to-array", "to-array-2d", "trampoline", "transduce", "transient", "tree-seq",
+        "true?", "type", "unchecked-add", "unchecked-add-int", "unchecked-byte", "unchecked-char", "unchecked-dec",
+        "unchecked-dec-int", "unchecked-divide-int", "unchecked-double", "unchecked-float", "unchecked-inc", "unchecked-inc-int",
+        "unchecked-int", "unchecked-long", "unchecked-multiply", "unchecked-multiply-int", "unchecked-negate",
+        "unchecked-negate-int", "unchecked-remainder-int", "unchecked-short", "unchecked-subtract", "unchecked-subtract-int",
+        "underive", "unquote", "unquote-splicing", "unreduced", "unsigned-bit-shift-right", "update", "update-in",
+        "update-proxy", "uri?", "use", "uuid?", "val", "vals", "var-get", "var-set", "var?", "vary-meta", "vec", "vector",
+        "vector-of", "vector?", "volatile!", "volatile?", "vreset!", "vswap!", "when", "when-first", "when-let", "when-not",
+        "when-some", "while", "with-bindings", "with-bindings*", "with-in-str", "with-loading-context", "with-local-vars",
+        "with-meta", "with-open", "with-out-str", "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
+        "zipmap"];
+    var commonIndentKeys = [
         // Built-ins
-        "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto " +
-        "locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type " +
-        "try catch " +
-
+        "ns", "fn", "def", "defn", "defmethod", "bound-fn", "if", "if-not", "case", "condp", "when", "while", "when-not", "when-first", "do", "future", "comment", "doto",
+        "locking", "proxy", "with-open", "with-precision", "reify", "deftype", "defrecord", "defprotocol", "extend", "extend-protocol", "extend-type",
+        "try", "catch",
         // Binding forms
-        "let letfn binding loop for doseq dotimes when-let if-let " +
-
+        "let", "letfn", "binding", "loop", "for", "doseq", "dotimes", "when-let", "if-let",
         // Data structures
-        "defstruct struct-map assoc " +
-
+        "defstruct", "struct-map", "assoc",
         // clojure.test
-        "testing deftest " +
-
+        "testing", "deftest",
         // contrib
-        "handler-case handle dotrace deftrace");
+        "handler-case", "handle", "dotrace", "deftrace"];
+
+    CodeMirror.registerHelper("hintWords", "clojure", commonAtoms.concat(commonBuiltins));
+
+    var atoms = makeKeywords(commonAtoms);
+    var keywords = makeKeywords(commonKeywords);
+    var builtins = makeKeywords(commonBuiltins);
+    var indentKeys = makeKeywords(commonIndentKeys);
 
     var tests = {
         digit: /\d/,

From 829a546f3e8d092f9b4afd83499d5b4c7d398d55 Mon Sep 17 00:00:00 2001
From: Philipp Markovics <philipp@markovics.com>
Date: Wed, 29 Aug 2018 12:01:26 +0200
Subject: [PATCH 3811/4742] [julia mode] Provide `hintWords`

---
 mode/julia/julia.js | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 35b75acda5..3e3560dcc2 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -34,17 +34,28 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       /^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/;
 
   var chars = wordRegexp([octChar, hexChar, sChar, uChar], "'");
-  var openers = wordRegexp(["begin", "function", "type", "struct", "immutable",
+
+  var commonOpeners = ["begin", "function", "type", "struct", "immutable",
       "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try",
-      "finally", "catch", "do"]);
-  var closers = wordRegexp(["end", "else", "elseif", "catch", "finally"]);
-  var keywords = wordRegexp(["if", "else", "elseif", "while", "for", "begin",
-      "let", "end", "do", "try", "catch", "finally", "return", "break",
-      "continue", "global", "local", "const", "export", "import", "importall",
-      "using", "function", "where", "macro", "module", "baremodule", "struct",
-      "type", "mutable", "immutable", "quote", "typealias", "abstract",
-      "primitive", "bitstype"]);
-  var builtins = wordRegexp(["true", "false", "nothing", "NaN", "Inf"]);
+                       "finally", "catch", "do"];
+
+  var commonClosers = ["end", "else", "elseif", "catch", "finally"];
+
+  var commonKeywords = ["if", "else", "elseif", "while", "for", "begin",
+                        "let", "end", "do", "try", "catch", "finally", "return", "break",
+                        "continue", "global", "local", "const", "export", "import", "importall",
+                        "using", "function", "where", "macro", "module", "baremodule", "struct",
+                        "type", "mutable", "immutable", "quote", "typealias", "abstract",
+                        "primitive", "bitstype"];
+
+  var commonBuiltins = ["true", "false", "nothing", "NaN", "Inf"];
+
+  CodeMirror.registerHelper("hintWords", "julia", commonKeywords.concat(commonBuiltins));
+
+  var openers = wordRegexp(commonOpeners);
+  var closers = wordRegexp(commonClosers);
+  var keywords = wordRegexp(commonKeywords);
+  var builtins = wordRegexp(commonBuiltins);
 
   var macro = /^@[_A-Za-z][\w]*/;
   var symbol = /^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;

From 85e0a26aea7c515a324a94b63334fda552aed17f Mon Sep 17 00:00:00 2001
From: Philipp Markovics <philipp@markovics.com>
Date: Wed, 29 Aug 2018 14:50:38 +0200
Subject: [PATCH 3812/4742] [mllike mode] Provide `hintWords`

---
 mode/mllike/mllike.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 8ef3a7be6c..a1538f720d 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -41,6 +41,9 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
       words[prop] = parserConfig.extraWords[prop];
     }
   }
+  var hintWords = [];
+  for (var k in words) { hintWords.push(k); }
+  CodeMirror.registerHelper("hintWords", "mllike", hintWords);
 
   function tokenBase(stream, state) {
     var ch = stream.next();

From 41c533f553f10bc961bc8fcf9094971528830f13 Mon Sep 17 00:00:00 2001
From: Philipp Markovics <philipp@markovics.com>
Date: Wed, 29 Aug 2018 14:30:51 +0200
Subject: [PATCH 3813/4742] [shell mode] Provide `hintWords`

---
 mode/shell/shell.js | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 0e667e6a54..5af12413b0 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -14,26 +14,27 @@
 CodeMirror.defineMode('shell', function() {
 
   var words = {};
-  function define(style, string) {
-    var split = string.split(' ');
-    for(var i = 0; i < split.length; i++) {
-      words[split[i]] = style;
+  function define(style, dict) {
+    for(var i = 0; i < dict.length; i++) {
+      words[dict[i]] = style;
     }
   };
 
-  // Atoms
-  define('atom', 'true false');
-
-  // Keywords
-  define('keyword', 'if then do else elif while until for in esac fi fin ' +
-    'fil done exit set unset export function');
-
-  // Commands
-  define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
-    'curl cut diff echo find gawk gcc get git grep hg kill killall ln ls make ' +
-    'mkdir openssl mv nc nl node npm ping ps restart rm rmdir sed service sh ' +
-    'shopt shred source sort sleep ssh start stop su sudo svn tee telnet top ' +
-    'touch vi vim wall wc wget who write yes zsh');
+  var commonAtoms = ["true", "false"];
+  var commonKeywords = ["if", "then", "do", "else", "elif", "while", "until", "for", "in", "esac", "fi",
+    "fin", "fil", "done", "exit", "set", "unset", "export", "function"];
+  var commonCommands = ["ab", "awk", "bash", "beep", "cat", "cc", "cd", "chown", "chmod", "chroot", "clear",
+    "cp", "curl", "cut", "diff", "echo", "find", "gawk", "gcc", "get", "git", "grep", "hg", "kill", "killall",
+    "ln", "ls", "make", "mkdir", "openssl", "mv", "nc", "nl", "node", "npm", "ping", "ps", "restart", "rm",
+    "rmdir", "sed", "service", "sh", "shopt", "shred", "source", "sort", "sleep", "ssh", "start", "stop",
+    "su", "sudo", "svn", "tee", "telnet", "top", "touch", "vi", "vim", "wall", "wc", "wget", "who", "write",
+    "yes", "zsh"];
+
+  CodeMirror.registerHelper("hintWords", "shell", commonAtoms.concat(commonKeywords, commonCommands));
+
+  define('atom', commonAtoms);
+  define('keyword', commonKeywords);
+  define('builtin', commonCommands);
 
   function tokenBase(stream, state) {
     if (stream.eatSpace()) return null;

From 07200a15505670e7a31c2c69eed660640a06fd80 Mon Sep 17 00:00:00 2001
From: Philipp Markovics <philipp@markovics.com>
Date: Wed, 29 Aug 2018 12:15:43 +0200
Subject: [PATCH 3814/4742] [r mode] Provide `hintWords`

---
 mode/r/r.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/mode/r/r.js b/mode/r/r.js
index 18ce3badeb..df58240035 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -14,15 +14,22 @@
 CodeMirror.registerHelper("wordChars", "r", /[\w.]/);
 
 CodeMirror.defineMode("r", function(config) {
-  function wordObj(str) {
-    var words = str.split(" "), res = {};
+  function wordObj(words) {
+    var res = {};
     for (var i = 0; i < words.length; ++i) res[words[i]] = true;
     return res;
   }
-  var atoms = wordObj("NULL NA Inf NaN NA_integer_ NA_real_ NA_complex_ NA_character_");
-  var builtins = wordObj("list quote bquote eval return call parse deparse");
-  var keywords = wordObj("if else repeat while function for in next break");
-  var blockkeywords = wordObj("if else repeat while function for");
+  var commonAtoms = ["NULL", "NA", "Inf", "NaN", "NA_integer_", "NA_real_", "NA_complex_", "NA_character_"];
+  var commonBuiltins = ["list", "quote", "bquote", "eval", "return", "call", "parse", "deparse"];
+  var commonKeywords = ["if", "else", "repeat", "while", "function", "for", "in", "next", "break"];
+  var commonBlockKeywords = ["if", "else", "repeat", "while", "function", "for"];
+
+  CodeMirror.registerHelper("hintWords", "r", commonAtoms.concat(commonBuiltins, commonKeywords));
+
+  var atoms = wordObj(commonAtoms);
+  var builtins = wordObj(commonBuiltins);
+  var keywords = wordObj(commonKeywords);
+  var blockkeywords = wordObj(commonBlockKeywords);
   var opChars = /[+\-*\/^<>=!&|~$:]/;
   var curPunc;
 

From ec2e1a13984c7b28cb9d63d1a9512b8782a210fd Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Wed, 29 Aug 2018 10:53:19 -0700
Subject: [PATCH 3815/4742] [yaml] enable fold by indentation

---
 mode/yaml/yaml.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index b10e263578..a29d7ea4a7 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -109,7 +109,8 @@ CodeMirror.defineMode("yaml", function() {
         escaped: false
       };
     },
-    lineComment: "#"
+    lineComment: "#",
+    fold: "indent"
   };
 });
 

From b756744a5f888f6d24ee0f6f563646972423539a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 30 Aug 2018 08:20:24 +0200
Subject: [PATCH 3816/4742] Add a banner pointing at the version 6 announcement

---
 index.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/index.html b/index.html
index 908c9764cb..96c6bbb07c 100644
--- a/index.html
+++ b/index.html
@@ -18,8 +18,14 @@
   .CodeMirror { height: auto; border: 1px solid #ddd; }
   .CodeMirror-scroll { max-height: 200px; }
   .CodeMirror pre { padding-left: 7px; line-height: 1.25; }
+  .banner { background: #ffc; padding: 6px; border-bottom: 2px solid silver;  }
+  .banner div { margin: 0 auto; max-width: 700px; text-align: center; }
 </style>
 
+<div class=banner><div>
+  CodeMirror is evolving! Check out our <a href="https://codemirror.net/6/">announcement</a> about the upcoming redesigned, accessible, mobile-friendly version.
+</div></div>
+
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="doc/logo.png"></a>
 

From eaf3a7ecf17eb41d00e56a19355ffd036f2849cd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 30 Aug 2018 08:35:33 +0200
Subject: [PATCH 3817/4742] [javascript mode] Allow default values on array
 pattern elements

Closes #5556
---
 mode/javascript/javascript.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index a31ffff8ef..c37143b952 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -644,7 +644,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(pattern) }
     if (type == "variable") { register(value); return cont(); }
     if (type == "spread") return cont(pattern);
-    if (type == "[") return contCommasep(pattern, "]");
+    if (type == "[") return contCommasep(eltpattern, "]");
     if (type == "{") return contCommasep(proppattern, "}");
   }
   function proppattern(type, value) {
@@ -657,6 +657,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "}") return pass();
     return cont(expect(":"), pattern, maybeAssign);
   }
+  function eltpattern() {
+    return cont(pattern, maybeAssign)
+  }
   function maybeAssign(_type, value) {
     if (value == "=") return cont(expressionNoComma);
   }

From 23695f2ed7335f05b225b6ef1b8bd3ec03b68205 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 30 Aug 2018 08:47:14 +0200
Subject: [PATCH 3818/4742] Fix bug in previous patch

Issue #5556
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c37143b952..b0a27cebd2 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -658,7 +658,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return cont(expect(":"), pattern, maybeAssign);
   }
   function eltpattern() {
-    return cont(pattern, maybeAssign)
+    return pass(pattern, maybeAssign)
   }
   function maybeAssign(_type, value) {
     if (value == "=") return cont(expressionNoComma);

From 38932586b06d3997064a566e20cf9be6ef4cac9a Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <aabdurrahman@cj.com>
Date: Fri, 31 Aug 2018 19:14:56 -0700
Subject: [PATCH 3819/4742] [clojure mode] Add tests.

This PR also fixes a few minor issues revealed by the tests:
  - Keywords or numbers following a single quote (') were being styled
    as `variable` instead of `atom` or `number`, respectively.
  - Single quote (') was missing on the list of valid symbol characters.
    Such symbols include `*'` and `+'`.
  - `new` and `when-some` were missing on the keyword list. There are a
    few other symbols that are also missing on the list that I plan to
    add later (e.g., `as->`, `cond->`, `condp->`, etc.)
  - `tests.keyword_char` and `tests.symbol` had redundant characters in
    them.
  - `+` and `+'` were missing on the core symbols list as a regression
    introduced by commit 74fca7c .

Note that there are some `FIXME`es in the tests. I'm planning to fix
them soon.
---
 mode/clojure/clojure.js |  15 +-
 mode/clojure/test.js    | 605 ++++++++++++++++++++++++++++++++++++++++
 test/index.html         |   2 +
 3 files changed, 614 insertions(+), 8 deletions(-)
 create mode 100644 mode/clojure/test.js

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 7c21a8b980..9d86f985f6 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -33,17 +33,17 @@ CodeMirror.defineMode("clojure", function (options) {
         "defstruct", "deftype", "defprotocol", "defrecord", "defproject", "deftest", "slice", "defalias",
         "defhinted", "defmacro-", "defn-memo", "defnk", "defonce-", "defunbound", "defunbound-",
         "defvar", "defvar-", "let", "letfn", "do", "case", "cond", "condp", "for", "loop", "recur", "when",
-        "when-not", "when-let", "when-first", "if", "if-let", "if-not", ".", "..", "->", "->>", "doto",
+        "when-not", "when-let", "when-first", "when-some", "if", "if-let", "if-not", ".", "..", "->", "->>", "doto",
         "and", "or", "dosync", "doseq", "dotimes", "dorun", "doall", "load", "import", "unimport", "ns",
         "in-ns", "refer", "try", "catch", "finally", "throw", "with-open", "with-local-vars", "binding",
-        "gen-class", "gen-and-load-class", "gen-and-save-class", "handler-case", "handle"];
+        "gen-class", "gen-and-load-class", "gen-and-save-class", "handler-case", "handle", "new"];
     var commonBuiltins = ["*", "*'", "*1", "*2", "*3", "*agent*", "*allow-unresolved-vars*", "*assert*",
         "*clojure-version*", "*command-line-args*", "*compile-files*", "*compile-path*", "*compiler-options*",
         "*data-readers*", "*default-data-reader-fn*", "*e", "*err*", "*file*", "*flush-on-newline*", "*fn-loader*",
         "*in*", "*math-context*", "*ns*", "*out*", "*print-dup*", "*print-length*", "*print-level*", "*print-meta*",
         "*print-namespace-maps*", "*print-readably*", "*read-eval*", "*reader-resolver*", "*source-path*",
         "*suppress-read*", "*unchecked-math*", "*use-context-classloader*", "*verbose-defrecords*",
-        "*warn-on-reflection*'", "-", "-'", "->", "->>", "->ArrayChunk", "->Eduction", "->Vec", "->VecNode",
+        "*warn-on-reflection*", "+", "+'", "-", "-'", "->", "->>", "->ArrayChunk", "->Eduction", "->Vec", "->VecNode",
         "->VecSeq", "-cache-protocol-fn", "-reset-methods", "..", "/", "<", "<=", "=", "==", ">", ">=",
         "EMPTY-NODE", "Inst", "StackTraceElement->vec", "Throwable->map", "accessor", "aclone", "add-classpath",
         "add-watch", "agent", "agent-error", "agent-errors", "aget", "alength", "alias", "all-ns", "alter",
@@ -115,7 +115,7 @@ CodeMirror.defineMode("clojure", function (options) {
         "zipmap"];
     var commonIndentKeys = [
         // Built-ins
-        "ns", "fn", "def", "defn", "defmethod", "bound-fn", "if", "if-not", "case", "condp", "when", "while", "when-not", "when-first", "do", "future", "comment", "doto",
+        "ns", "fn", "def", "defn", "defmethod", "bound-fn", "if", "if-not", "case", "condp", "when", "while", "when-not", "when-first", "when-some", "do", "future", "comment", "doto",
         "locking", "proxy", "with-open", "with-precision", "reify", "deftype", "defrecord", "defprotocol", "extend", "extend-protocol", "extend-type",
         "try", "catch",
         // Binding forms
@@ -136,12 +136,11 @@ CodeMirror.defineMode("clojure", function (options) {
 
     var tests = {
         digit: /\d/,
-        digit_or_colon: /[\d:]/,
         hex: /[0-9a-f]/i,
         sign: /[+-]/,
         exponent: /e/i,
-        keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/,
+        keyword_char: /[^\s;()\[\]{}]/,
+        symbol: /[\w*+!\-._?:<>\/'\xa1-\uffff]/,
         block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
     };
 
@@ -252,7 +251,7 @@ CodeMirror.defineMode("clojure", function (options) {
                     } else if (ch == "\\") {
                         eatCharacter(stream);
                         returnType = CHARACTER;
-                    } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) {
+                    } else if (ch == "'") {
                         returnType = ATOM;
                     } else if (ch == ";") { // comment
                         stream.skipToEnd(); // rest of the line is a comment
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
new file mode 100644
index 0000000000..d93696cad9
--- /dev/null
+++ b/mode/clojure/test.js
@@ -0,0 +1,605 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function () {
+    var mode = CodeMirror.getMode({indentUnit: 2}, "clojure");
+
+    function MT(name) {
+        test.mode(name, mode, Array.prototype.slice.call(arguments, 1));
+    }
+
+    MT("atoms",
+        "[atom nil]",
+        "[atom false]",
+        "[atom true]"
+    );
+
+    MT("keywords",
+        "[atom :foo]",
+        "[atom ::bar]",
+        "[atom :foo/bar]",
+        "[atom :foo.bar/baz]"
+    );
+
+    MT("numbers",
+        "[number 42] [number +42] [number -421]",
+        // FIXME
+        // "[number 42N] [number +42N] [number -42N]",
+        "[number 0.42] [number +0.42] [number -0.42]",
+        // FIXME
+        // "[number 42M] [number +42M] [number -42M]",
+        // "[number 42.42M] [number +42.42M] [number -42.42M]",
+        "[number 1/42] [number +1/42] [number -1/42]",
+        "[number 0x420f]",
+        // FIXME
+        // "[number +0x420f] [number -0x420f]",
+        "[number 1e2] [number 1e+2] [number 1e-2]",
+        "[number +1e2] [number +1e+2] [number +1e-2]",
+        "[number -1e2] [number -1e+2] [number -1e-2]",
+        "[number -1.0e2] [number -0.1e+2] [number -1.01e-2]"
+        // FIXME
+        // "[number 2r101010] [number +2r101010] [number -2r101010]",
+        // "[number 8r52] [number +8r52] [number -8r52]"
+    );
+
+    MT("characters",
+        "[string-2 \\1]",
+        "[string-2 \\a]",
+        "[string-2 \\#]",
+        "[string-2 \\\\]",
+        "[string-2 \\\"]",
+        "[string-2 \\(]",
+        "[string-2 \\A]",
+        "[string-2 \\backspace]",
+        "[string-2 \\formfeed]",
+        "[string-2 \\newline]",
+        "[string-2 \\space]",
+        "[string-2 \\return]",
+        "[string-2 \\tab]",
+        "[string-2 \\u1000]",
+        "[string-2 \\uAaAa]",
+        "[string-2 \\u9F9F]"
+    );
+
+    MT("strings",
+        "[string \"I'm a teapot.\"]",
+        "[string \"I'm a \\\"teapot\\\".\"]",
+        "[string \"I'm]",       // this is
+        "[string a]",           // a multi-line
+        "[string teapot.\"]"    // string
+    );
+
+    MT("comments",
+        "[comment ; this is an in-line comment.]",
+        "[comment ;; this is a line comment.]"
+        // FIXME
+        // "[bracket (][comment comment] [comment (][comment foo] [comment 1] [comment 2] [comment 3][comment )][bracket )]"
+    );
+
+    // FIXME
+    // MT("whitespaces",
+    //     "[null \u0020]", // space
+    //     "[null \u0009]"  // horizontal tab
+    // );
+
+    MT("quotes",
+        "[atom '][number 1]",
+        "[atom ':foo]",
+        "[atom '][string \"foo\"]",
+        "[atom '][variable x]",
+        "[atom '][bracket (][variable a] [variable b] [variable c][bracket )]",
+        "[atom '][bracket [[][variable a] [variable b] [variable c][bracket ]]]",
+        "[atom '][bracket {][variable a] [number 1] [atom :foo] [number 2] [variable c] [number 3][bracket }]",
+        "[atom '][variable #][bracket {][variable a] [number 1] [atom :foo][bracket }]"
+    );
+
+    var coreSymbolsAsKeywords = [
+        "defn", "defn-", "def", "def-", "defonce", "defmulti", "defmethod", "defmacro",
+        "defstruct", "deftype", "defprotocol", "defrecord", "defproject", "deftest", "slice", "defalias",
+        "defhinted", "defmacro-", "defn-memo", "defnk", "defonce-", "defunbound", "defunbound-",
+        "defvar", "defvar-", "let", "letfn", "do", "case", "cond", "condp", "for", "loop", "recur", "when",
+        "when-not", "when-let", "when-first", "when-some", "if", "if-let", "if-not", ".", "..", "->", "->>", "doto",
+        "and", "or", "dosync", "doseq", "dotimes", "dorun", "doall", "load", "import", "unimport", "ns",
+        "in-ns", "refer", "try", "catch", "finally", "throw", "with-open", "with-local-vars", "binding",
+        "gen-class", "gen-and-load-class", "gen-and-save-class", "handler-case", "handle", "new"
+    ];
+    var coreSymbolsAsKeywordsLookupMap = lookupMap(coreSymbolsAsKeywords);
+
+    MT("specials",
+        typeTokenPairs("keyword", coreSymbolsAsKeywords)
+    );
+
+    var coreSymbolsAsBuiltins1 = [
+        "*", "*'", "*1", "*2", "*3", "*agent*", "*allow-unresolved-vars*", "*assert*",
+        "*clojure-version*", "*command-line-args*", "*compile-files*", "*compile-path*", "*compiler-options*",
+        "*data-readers*", "*default-data-reader-fn*", "*e", "*err*", "*file*", "*flush-on-newline*", "*fn-loader*",
+        "*in*", "*math-context*", "*ns*", "*out*", "*print-dup*", "*print-length*", "*print-level*", "*print-meta*",
+        "*print-namespace-maps*", "*print-readably*", "*read-eval*", "*reader-resolver*", "*source-path*",
+        "*suppress-read*", "*unchecked-math*", "*use-context-classloader*", "*verbose-defrecords*",
+        "*warn-on-reflection*", "+", "+'", "-", "-'", "->", "->>", "->ArrayChunk", "->Eduction", "->Vec", "->VecNode",
+        "->VecSeq", "-cache-protocol-fn", "-reset-methods", "..", "/", "<", "<=", "=", "==", ">", ">=",
+        "EMPTY-NODE", "Inst", "StackTraceElement->vec", "Throwable->map", "accessor", "aclone", "add-classpath",
+        "add-watch", "agent", "agent-error", "agent-errors", "aget", "alength", "alias", "all-ns", "alter",
+        "alter-meta!", "alter-var-root", "amap", "ancestors", "and", "any?", "apply", "areduce", "array-map",
+        "as->", "aset", "aset-boolean", "aset-byte", "aset-char", "aset-double", "aset-float", "aset-int",
+        "aset-long", "aset-short", "assert", "assoc", "assoc!", "assoc-in", "associative?", "atom", "await",
+        "await-for", "await1", "bases", "bean", "bigdec", "bigint", "biginteger", "binding", "bit-and", "bit-and-not",
+        "bit-clear", "bit-flip", "bit-not", "bit-or", "bit-set", "bit-shift-left", "bit-shift-right", "bit-test",
+        "bit-xor", "boolean", "boolean-array", "boolean?", "booleans", "bound-fn", "bound-fn*", "bound?",
+        "bounded-count", "butlast", "byte", "byte-array", "bytes", "bytes?", "case", "cast", "cat", "char",
+        "char-array", "char-escape-string", "char-name-string", "char?", "chars", "chunk", "chunk-append",
+        "chunk-buffer", "chunk-cons", "chunk-first", "chunk-next", "chunk-rest", "chunked-seq?", "class", "class?",
+        "clear-agent-errors", "clojure-version", "coll?", "comment", "commute", "comp", "comparator", "compare",
+        "compare-and-set!", "compile", "complement", "completing", "concat", "cond", "cond->", "cond->>", "condp",
+        "conj", "conj!", "cons", "constantly", "construct-proxy", "contains?", "count", "counted?", "create-ns",
+        "create-struct", "cycle", "dec", "dec'", "decimal?", "declare", "dedupe", "default-data-readers", "definline",
+        "definterface", "defmacro", "defmethod", "defmulti", "defn", "defn-", "defonce", "defprotocol", "defrecord",
+        "defstruct", "deftype", "delay", "delay?", "deliver", "denominator", "deref", "derive", "descendants",
+        "destructure", "disj", "disj!", "dissoc", "dissoc!", "distinct", "distinct?", "doall", "dorun", "doseq",
+        "dosync", "dotimes", "doto", "double", "double-array", "double?", "doubles", "drop", "drop-last", "drop-while",
+        "eduction", "empty", "empty?", "ensure", "ensure-reduced", "enumeration-seq", "error-handler", "error-mode",
+        "eval", "even?", "every-pred", "every?", "ex-data", "ex-info", "extend", "extend-protocol", "extend-type",
+        "extenders", "extends?", "false?", "ffirst", "file-seq", "filter", "filterv", "find", "find-keyword", "find-ns",
+        "find-protocol-impl", "find-protocol-method", "find-var", "first", "flatten", "float", "float-array", "float?",
+        "floats", "flush", "fn", "fn?", "fnext", "fnil", "for", "force", "format", "frequencies", "future", "future-call",
+        "future-cancel", "future-cancelled?", "future-done?", "future?", "gen-class", "gen-interface", "gensym", "get",
+        "get-in", "get-method", "get-proxy-class", "get-thread-bindings", "get-validator", "group-by", "halt-when", "hash",
+        "hash-combine", "hash-map", "hash-ordered-coll", "hash-set", "hash-unordered-coll", "ident?", "identical?",
+        "identity", "if-let", "if-not", "if-some", "ifn?", "import", "in-ns", "inc", "inc'", "indexed?", "init-proxy",
+        "inst-ms", "inst-ms*", "inst?", "instance?", "int", "int-array", "int?", "integer?", "interleave", "intern",
+        "interpose", "into", "into-array", "ints", "io!", "isa?", "iterate", "iterator-seq", "juxt", "keep", "keep-indexed",
+        "key", "keys", "keyword", "keyword?", "last", "lazy-cat", "lazy-seq", "let", "letfn", "line-seq", "list", "list*",
+        "list?", "load", "load-file", "load-reader", "load-string", "loaded-libs", "locking", "long", "long-array", "longs",
+        "loop", "macroexpand", "macroexpand-1", "make-array", "make-hierarchy", "map", "map-entry?", "map-indexed", "map?",
+        "mapcat", "mapv", "max", "max-key", "memfn", "memoize", "merge", "merge-with", "meta", "method-sig", "methods"];
+
+    var coreSymbolsAsBuiltins2 = [
+        "min", "min-key", "mix-collection-hash", "mod", "munge", "name", "namespace", "namespace-munge", "nat-int?",
+        "neg-int?", "neg?", "newline", "next", "nfirst", "nil?", "nnext", "not", "not-any?", "not-empty", "not-every?",
+        "not=", "ns", "ns-aliases", "ns-imports", "ns-interns", "ns-map", "ns-name", "ns-publics", "ns-refers", "ns-resolve",
+        "ns-unalias", "ns-unmap", "nth", "nthnext", "nthrest", "num", "number?", "numerator", "object-array", "odd?", "or",
+        "parents", "partial", "partition", "partition-all", "partition-by", "pcalls", "peek", "persistent!", "pmap", "pop",
+        "pop!", "pop-thread-bindings", "pos-int?", "pos?", "pr", "pr-str", "prefer-method", "prefers",
+        "primitives-classnames", "print", "print-ctor", "print-dup", "print-method", "print-simple", "print-str", "printf",
+        "println", "println-str", "prn", "prn-str", "promise", "proxy", "proxy-call-with-super", "proxy-mappings",
+        "proxy-name", "proxy-super", "push-thread-bindings", "pvalues", "qualified-ident?", "qualified-keyword?",
+        "qualified-symbol?", "quot", "rand", "rand-int", "rand-nth", "random-sample", "range", "ratio?", "rational?",
+        "rationalize", "re-find", "re-groups", "re-matcher", "re-matches", "re-pattern", "re-seq", "read", "read-line",
+        "read-string", "reader-conditional", "reader-conditional?", "realized?", "record?", "reduce", "reduce-kv", "reduced",
+        "reduced?", "reductions", "ref", "ref-history-count", "ref-max-history", "ref-min-history", "ref-set", "refer",
+        "refer-clojure", "reify", "release-pending-sends", "rem", "remove", "remove-all-methods", "remove-method", "remove-ns",
+        "remove-watch", "repeat", "repeatedly", "replace", "replicate", "require", "reset!", "reset-meta!", "reset-vals!",
+        "resolve", "rest", "restart-agent", "resultset-seq", "reverse", "reversible?", "rseq", "rsubseq", "run!", "satisfies?",
+        "second", "select-keys", "send", "send-off", "send-via", "seq", "seq?", "seqable?", "seque", "sequence", "sequential?",
+        "set", "set-agent-send-executor!", "set-agent-send-off-executor!", "set-error-handler!", "set-error-mode!",
+        "set-validator!", "set?", "short", "short-array", "shorts", "shuffle", "shutdown-agents", "simple-ident?",
+        "simple-keyword?", "simple-symbol?", "slurp", "some", "some->", "some->>", "some-fn", "some?", "sort", "sort-by",
+        "sorted-map", "sorted-map-by", "sorted-set", "sorted-set-by", "sorted?", "special-symbol?", "spit", "split-at",
+        "split-with", "str", "string?", "struct", "struct-map", "subs", "subseq", "subvec", "supers", "swap!", "swap-vals!",
+        "symbol", "symbol?", "sync", "tagged-literal", "tagged-literal?", "take", "take-last", "take-nth", "take-while", "test",
+        "the-ns", "thread-bound?", "time", "to-array", "to-array-2d", "trampoline", "transduce", "transient", "tree-seq",
+        "true?", "type", "unchecked-add", "unchecked-add-int", "unchecked-byte", "unchecked-char", "unchecked-dec",
+        "unchecked-dec-int", "unchecked-divide-int", "unchecked-double", "unchecked-float", "unchecked-inc", "unchecked-inc-int",
+        "unchecked-int", "unchecked-long", "unchecked-multiply", "unchecked-multiply-int", "unchecked-negate",
+        "unchecked-negate-int", "unchecked-remainder-int", "unchecked-short", "unchecked-subtract", "unchecked-subtract-int",
+        "underive", "unquote", "unquote-splicing", "unreduced", "unsigned-bit-shift-right", "update", "update-in",
+        "update-proxy", "uri?", "use", "uuid?", "val", "vals", "var-get", "var-set", "var?", "vary-meta", "vec", "vector",
+        "vector-of", "vector?", "volatile!", "volatile?", "vreset!", "vswap!", "when", "when-first", "when-let", "when-not",
+        "when-some", "while", "with-bindings", "with-bindings*", "with-in-str", "with-loading-context", "with-local-vars",
+        "with-meta", "with-open", "with-out-str", "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
+        "zipmap"
+    ];
+
+    MT("core symbols (part 1/2)",
+        typeTokenPairs("builtin", coreSymbolsAsBuiltins1)
+    );
+
+    MT("core symbols (part 2/2)",
+        typeTokenPairs("builtin", coreSymbolsAsBuiltins2)
+    );
+
+    MT("should_indent_assoc",
+        "[bracket (][builtin assoc] [variable foo]",
+        "  [atom :1] [string \"three\"]",
+        "  [atom :2] [string \"two\"]",
+        "  [atom :3] [string \"three\"][bracket )]"
+    );
+
+    MT("should_indent_binding",
+        "[bracket (][keyword binding] [bracket [[][variable foo] [number 2]",
+        "          [variable *bar*] [number 3][bracket ]]]",
+        "  [bracket (][builtin +] [variable foo] [variable *bar*][bracket ))]");
+
+    MT("should_indent_bound-fn",
+        "[bracket (][builtin bound-fn] [bracket [[]]]",
+        "  [bracket (][variable f][bracket ))]"
+    );
+
+    MT("should_indent_case",
+        "[bracket (][keyword case] [variable foo]",
+        "  [string \"\"] [number 0]",
+        "  [string \"hello\"] [atom :bar]",
+        "  [bracket [[][number 1] [number 2][bracket ]]] [bracket (][string \"my seq\"][bracket )]",
+        "  [bracket (][variable x] [variable y] [variable z][bracket )] [string \"x, y, or z\"]",
+        "  [atom :default]"
+    );
+
+    MT("should_indent_catch",
+        "[bracket (][keyword catch] [variable Exception] [variable e]",
+        "  [bracket (][builtin println] [string \"Some other exception, won't be caught in this case...\"][bracket )]",
+        "  [number 666][bracket )]"
+    );
+
+    MT("should_indent_comment",
+        "[bracket (][builtin comment] [bracket (][variable foo][bracket )]",
+        "  [bracket (][variable bar] [number 1] [number 2] [number 3][bracket ))]"
+    );
+
+    MT("should_indent_cond",
+        "[bracket (][keyword cond]",
+        "  [bracket (][builtin <] [variable n] [number 0][bracket )] [string \"negative\"]",
+        "  [bracket (][builtin >] [variable n] [number 0][bracket )] [string \"positive\"]",
+        "  [atom :else] [string \"zero\"][bracket ))]"
+    );
+
+    MT("should_indent_condp",
+        "[bracket (][keyword condp] [builtin =] [variable foo]",
+        "  [number 1] [string \"one\"]",
+        "  [number 2] [string \"two\"]",
+        "  [number 3] [string \"three\"]",
+        "  [string \"unexpected value\"][bracket )]"
+    );
+
+    MT("should_indent_def",
+        "[bracket (][keyword def] [variable x]",
+        "  [string \"here is an indented doc-string.\"]",
+        "  [number 1][bracket )]"
+    );
+
+    MT("should_indent_defn",
+        "[bracket (][keyword defn] [variable foo]",
+        "  [bracket [[][variable x][bracket ]]]",
+        "  [bracket (][variable bar] [variable x][bracket ))]",
+        "",
+        "[bracket (][keyword defn] [variable foo] [bracket [[][variable x][bracket ]]]",
+        "  [bracket (][variable bar] [variable x][bracket ))]"
+    );
+
+    MT("should_indent_defmacro",
+        "[bracket (][keyword defmacro] [variable foo]",
+        "  [string \"here is an indented doc-string.\"]",
+        "  [bracket [[][variable x] [variable y][bracket ]]]",
+        "  [variable `][bracket (][builtin println] [variable ~x] [variable ~@y][bracket ))]"
+    );
+
+    MT("should_indent_defmethod",
+        "[bracket (][keyword defmethod] [variable foo] [atom :bar] [bracket [[][variable x][bracket ]]] [bracket (][variable baz] [variable x][bracket ))]",
+        "",
+        "[bracket (][keyword defmethod] [variable foo] [atom :bar]",
+        "  [bracket [[][variable x][bracket ]]]",
+        "  [bracket (][variable baz] [variable x][bracket ))]"
+    );
+
+    MT("should_indent_defstruct",
+        "[bracket (][keyword defstruct] [variable person]",
+        "  [atom :name]",
+        "  [atom :age]",
+        "  [atom :height][bracket )]"
+    );
+
+    MT("should_indent_deftest and testing",
+        "[bracket (][keyword deftest] [variable addition]",
+        "  [bracket (][variable testing] [string \"with positive integers\"]",
+        "    [bracket (][variable is] [bracket (][builtin =] [number 4] [bracket (][builtin +] [number 2] [number 2][bracket )))]",
+        "    [bracket (][variable is] [bracket (][builtin =] [number 7] [bracket (][builtin +] [number 3] [number 4][bracket ))))]"
+    );
+
+    MT("should_indent_doseq",
+        "[bracket (][keyword doseq] [bracket [[][variable x] [bracket [[][number -1] [number 0] [number 1][bracket ]]]",
+        "        [variable y] [bracket [[][number 1] [number 2] [number 3][bracket ]]]]]",
+        "  [bracket (][builtin prn] [bracket (][builtin *] [variable x] [variable y][bracket )))]"
+    );
+
+    MT("should_indent_dotimes",
+        "[bracket (][keyword dotimes] [bracket [[][variable n] [number 5][bracket ]]]",
+        "  [bracket (][builtin println] [string \"n is\"] [variable n][bracket ))]");
+
+    MT("should_indent_for",
+        "[bracket (][keyword for] [bracket [[][variable x] [bracket [[][number 1] [number 2] [number 3][bracket ]]]",
+        "      [atom :let] [bracket [[][variable y] [bracket (][builtin *] [variable x] [number 3][bracket )]]]",
+        "      [atom :when] [bracket (][builtin even?] [variable y][bracket )]]]",
+        "  [variable y][bracket )]"
+    );
+
+    MT("should_indent_if-let",
+        "[bracket (][keyword if-let] [bracket [[][variable x] [variable foo][bracket ]]]",
+        "  [string \"then\"]",
+        "  [string \"else\"][bracket ))]"
+    );
+
+    MT("should_indent_let",
+        "[bracket (][keyword let] [bracket [[][variable foo] [number 2]",
+        "      [variable bar] [number 3][bracket ]]]",
+        "  [bracket (][builtin +] [variable foo] [variable *bar*][bracket ))]"
+    );
+
+    MT("should_indent_letfn",
+        "[bracket (][keyword letfn] [bracket [[(][variable twice] [bracket [[][variable x][bracket ]]]",
+        "               [bracket (][builtin *] [variable x] [number 2][bracket ))]",
+        "        [bracket (][variable six-times] [bracket [[][variable y][bracket ]]]",
+        "                   [bracket (][builtin *] [bracket (][variable twice] [variable y][bracket )] [number 3][bracket ))]]]",
+        "  [bracket (][builtin println] [string \"twice 15 =\"] [bracket (][variable twice] [number 15][bracket ))]]]",
+        "  [bracket (][builtin println] [string \"six times 15 =\"] [bracket (][variable six-times] [number 15][bracket )))]"
+    );
+
+    MT("should_indent_loop",
+        "[bracket (][keyword loop] [bracket [[][variable foo] [number 2]",
+        "       [variable bar] [number 3][bracket ]]]",
+        "  [bracket (][builtin +] [variable foo] [variable *bar*][bracket ))]"
+    );
+
+    MT("should_indent_when-first",
+        "[bracket (][keyword when-first] [bracket [[][variable a] [bracket [[][number 1] [number 2] [number 3][bracket ]]]]]",
+        "  [variable a][bracket )]"
+    );
+
+    MT("should_indent_when-let",
+        "[bracket (][keyword when-let] [bracket [[][variable x] [variable foo][bracket ]]]",
+        "  [string \"foo\"]"
+    );
+
+    MT("should_indent_when-some",
+        "[bracket (][keyword when-some] [bracket [[][variable x] [variable foo][bracket ]]]",
+        "  [string \"foo\"]"
+    );
+
+    MT("should_indent_struct-map",
+        "[bracket (][builtin struct-map] [variable foo]",
+        "  [atom :1] [string \"one\"]",
+        "  [atom :2] [string \"two\"][bracket )]"
+    );
+
+    MT("should_indent_defprotocol",
+        "[bracket (][keyword defprotocol] [variable Protocol]",
+        "  [bracket (][variable foo] [bracket [[][variable this][bracket ]])]",
+        "  [bracket (][variable bar] [bracket [[][variable this][bracket ]]] [bracket [[][variable this] [variable x][bracket ]])]",
+        "  [bracket (][variable baz] [bracket [[][variable this][bracket ]]]",
+        "       [bracket [[][variable this] [variable y][bracket ]]))]"
+    );
+
+    MT("should_indent_defrecord",
+        "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]])]",
+        "",
+        "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]]]",
+        "  [variable Protocol]",
+        "  [bracket (][variable foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
+        "  [bracket (][variable bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
+        "  [bracket (][variable baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][builtin str] [variable first-name] [variable last-name][bracket )))]",
+        "",
+        "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name]",
+        "                   [variable last-name]",
+        "                   [variable address][bracket ]])]",
+        "",
+        "[bracket (][keyword defrecord] [variable Person]",
+        "  [bracket [[][variable first-name]",
+        "   [variable last-name]",
+        "   [variable address][bracket ]])]"
+    );
+
+    MT("should_indent_deftype",
+        "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]])]",
+        "",
+        "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]]]",
+        "  [variable Protocol]",
+        "  [bracket (][variable foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
+        "  [bracket (][variable bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
+        "  [bracket (][variable baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][builtin str] [variable first-name] [variable last-name][bracket )))]",
+        "",
+        "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name]",
+        "                 [variable last-name]",
+        "                 [variable address][bracket ]])]",
+        "",
+        "[bracket (][keyword deftype] [variable Person]",
+        "  [bracket [[][variable first-name]",
+        "   [variable last-name]",
+        "   [variable address][bracket ]])]"
+    );
+
+    MT("should_indent_do",
+        "[bracket (][keyword do] [bracket (][variable foo][bracket )]",
+        "  [bracket (][variable bar][bracket ))]",
+        "",
+        "[bracket (][keyword do]",
+        "  [bracket (][variable foo][bracket )]",
+        "  [bracket (][variable bar][bracket ))]"
+    );
+
+    MT("should_indent_doto",
+        "[bracket (][keyword doto] [bracket (][keyword new] [variable java.util.HashMap][bracket )] [bracket (][variable .put] [string \"a\"] [number 1][bracket )] [bracket (][variable .put] [string \"b\"] [number 2][bracket ))]",
+        "",
+        "[bracket (][keyword doto] [bracket (][variable java.util.HashMap.][bracket )]",
+        "  [bracket (][variable .put] [string \"a\"] [number 1][bracket )]",
+        "  [bracket (][variable .put] [string \"b\"] [number 2][bracket ))]"
+    );
+
+    MT("should_indent_extend",
+        "[bracket (][builtin extend] [variable FooType]",
+        "  [variable FooProtocol]",
+        "  [bracket {][atom :foo] [variable an-existing-fn]",
+        "   [atom :bar] [bracket (][builtin fn] [bracket [[][variable a] [variable b][bracket ]]]",
+        "          [bracket (][variable f] [variable a] [variable b][bracket ))]",
+        "   [atom :baz] [bracket (][builtin fn] [bracket ([[][variable a][bracket ]]] [variable a][bracket )]",
+        "          [bracket ([[][variable a] [variable b][bracket ]]] [bracket [[][variable a] [variable b][bracket ]]))})]"
+    );
+
+    MT("should_indent_extend-protocol",
+        "[bracket (][builtin extend-protocol] [variable Protocol]",
+        "  [variable FooType]",
+        "  [bracket (][variable foo] [bracket [[][variable x][bracket ]]] [bracket (][variable f] [variable x][bracket ))]",
+        "  [bracket (][variable bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][variable g] [variable x] [variable y][bracket ))]"
+    );
+
+    MT("should_indent_extend-type",
+        "[bracket (][builtin extend-type] [variable FooType]",
+        "  [variable Countable]",
+        "  [bracket (][variable cnt] [bracket [][variable c][bracket ]]] [bracket (][builtin count] [variable c][bracket ))]",
+        "  ",
+        "  [variable Foo]",
+        "  [bracket (][variable bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][variable f] [variable x] [variable y][bracket ))]",
+        "  [bracket (][variable baz] [bracket ([][variable x] [variable x][bracket ]])] [bracket ([[][variable x] [variable y] [variable &] [variable zs][bracket ]]] [bracket [[][variable x] [variable y] [bracket (][variable g] [variable zs][bracket )]])))]"
+    );
+
+    MT("should_indent_fn",
+        "[bracket (][builtin fn] [variable foo]",
+        "  [bracket [[][variable x][bracket ]]]",
+        "  [bracket (][variable bar] [variable x][bracket ))]",
+        "",
+        "[bracket (][builtin fn] [variable foo] [bracket [[][variable x][bracket ]]]",
+        "  [bracket (][variable bar] [variable x][bracket ))]"
+    );
+
+    MT("should_indent_future",
+        "[bracket (][builtin future] [bracket (][variable Thread/sleep] [number 10000][bracket )] [bracket (][builtin println] [string \"done\"][bracket )] [number 100][bracket )]",
+        "",
+        "[bracket (][builtin future] [bracket (][variable Thread/sleep] [number 10000][bracket )]",
+        "  [bracket (][builtin println] [string \"done\"][bracket )]",
+        "  [number 100][bracket )]",
+        "",
+        "[bracket (][builtin future]",
+        "  [bracket (][variable Thread/sleep] [number 10000][bracket )]",
+        "  [bracket (][builtin println] [string \"done\"][bracket )]",
+        "  [number 100][bracket )]"
+    );
+
+    MT("should_indent_if",
+        "[bracket (][keyword if] [bracket (][builtin <] [variable foo] [number 100][bracket )] [string \"yes\"] [string \"no\"][bracket )]",
+        "",
+        "[bracket (][keyword if] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "  [string \"yes\"]",
+        "  [string \"no\"][bracket )]",
+        "",
+        "[bracket (][keyword if] [bracket (][keyword and] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "         [bracket (][builtin <] [variable bar] [number 50][bracket ))]",
+        "  [string \"yes\"]",
+        "  [string \"no\"][bracket )]"
+    );
+
+    MT("should_indent_if-not",
+        "[bracket (][keyword if-not] [bracket (][builtin <] [variable foo] [number 100][bracket )] [string \"yes\"] [string \"no\"][bracket )]",
+        "",
+        "[bracket (][keyword if-not] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "  [string \"yes\"]",
+        "  [string \"no\"][bracket )]",
+        "",
+        "[bracket (][keyword if-not] [bracket (][keyword and] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "             [bracket (][builtin <] [variable bar] [number 50][bracket ))]",
+        "  [string \"yes\"]",
+        "  [string \"no\"][bracket )]"
+    );
+
+    MT("should_indent_locking",
+        "[bracket (][builtin locking] [variable foo] [bracket (][variable Thread/sleep] [number 1000][bracket )] [bracket (][builtin println] [string \"done\"][bracket ))]",
+        "",
+        "[bracket (][builtin locking] [variable foo]",
+        "  [bracket (][variable Thread/sleep] [number 1000][bracket )]",
+        "  [bracket (][builtin println] [string \"done\"][bracket ))]"
+    );
+
+    MT("should_indent_ns",
+        "[bracket (][keyword ns] [variable foo.bar]",
+        "  [bracket (][atom :refer-clojure] [atom :exclude] [bracket [][builtin ancestors] [builtin printf][bracket ]])]",
+        "  [bracket (][atom :require] [bracket [][variable clojure.contrib] [variable sql] [variable combinatorics][bracket ]])]",
+        "  [bracket (][atom :use] [bracket [][variable my.lib] [variable this] [variable that][bracket ]])]",
+        "  [bracket (][atom :import] [bracket (][variable java.util] [variable Date] [variable Timer] [variable Random][bracket )]",
+        "           [bracket (][variable java.sql] [variable Connection] [variable Statement][bracket )))]"
+    );
+
+    MT("should_indent_proxy",
+        "[bracket (][builtin proxy] [bracket [][variable MouseAdapter][bracket ]]] [bracket [[]]]",
+        "  [bracket (][variable mousePressed] [bracket [][variable event][bracket ]]]",
+        "                [bracket (][builtin apply] [variable f] [variable event] [variable args][bracket )))]"
+    );
+
+    MT("should_indent_reify",
+        "[bracket (][builtin reify] [variable Foo]",
+        "  [bracket (][variable foo] [bracket [[][variable _] [variable x][bracket ]]] [variable x][bracket )]",
+        "  [bracket (][variable foo] [bracket [[][variable _] [variable x] [variable y][bracket ]]] [variable y][bracket ))]"
+    );
+
+    MT("should_indent_try",
+        "[bracket (][keyword try]",
+        "  [bracket (][builtin /] [number 1] [number 0][bracket )]",
+        "  [bracket (][keyword catch] [variable Exception] [variable e] [bracket (][builtin str] [string \"caught exception: \"] [bracket (][variable .getMessage] [variable e][bracket ))))]"
+    );
+
+    MT("should_indent_with-open",
+        "[bracket (][keyword with-open] [bracket [[][variable out-data] [bracket (][variable io/writer] [variable out-file][bracket )]]]",
+        "  [bracket (][variable csv/write-csv] [variable out-data] [variable out-sos][bracket )))]"
+    );
+
+    MT("should_indent_with-precision",
+        "[bracket (][builtin with-precision] [number 10] [bracket (][builtin /] [number 1][variable M] [number 3][bracket ))]",
+        "",
+        "[bracket (][builtin with-precision] [number 10] [atom :rounding] [variable HALF_DOWN] [bracket (][builtin /] [number 1][variable M] [number 3][bracket ))]",
+        "",
+        "[bracket (][builtin with-precision]",
+        "  [number 10]",
+        "  [atom :rounding]",
+        "  [variable HALF_DOWN]",
+        "  [bracket (][builtin /] [number 1][variable M] [number 3][bracket ))]"
+    );
+
+    MT("should_indent_when",
+        "[bracket (][keyword when] [bracket (][builtin <] [variable foo] [number 100][bracket )] [string \"yes\"][bracket )]",
+        "",
+        "[bracket (][keyword when] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "  [string \"yes\"][bracket )]",
+        "",
+        "[bracket (][keyword when] [bracket (][keyword and] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "           [bracket (][builtin <] [variable bar] [number 50][bracket ))]",
+        "  [string \"yes\"][bracket )]"
+    );
+
+    MT("should_indent_when-not",
+        "[bracket (][keyword when-not] [bracket (][builtin <] [variable foo] [number 100][bracket )] [string \"no\"][bracket )]",
+        "",
+        "[bracket (][keyword when-not] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "  [string \"no\"][bracket )]",
+        "",
+        "[bracket (][keyword when-not] [bracket (][keyword and] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "               [bracket (][builtin <] [variable bar] [number 50][bracket ))]",
+        "  [string \"no\"][bracket )]"
+    );
+
+    MT("should_indent_while",
+        "[bracket (][builtin while] [variable foo] [bracket (][keyword do] [bracket (][builtin println] [variable a][bracket )] [bracket (][builtin println] [variable b][bracket )))]",
+        "",
+        "[bracket (][builtin while] [variable foo]",
+        "  [bracket (][keyword do] [bracket (][builtin println] [variable a][bracket )]",
+        "    [bracket (][builtin println] [variable b][bracket )))]"
+    );
+
+    function lookupMap(words) {
+        var map = {};
+
+        for (var i = 0; i < words.length; ++i) {
+            map[words[i]] = true;
+        }
+
+        return map;
+    }
+
+    function typeTokenPairs(type, tokens) {
+        var pairs = "";
+
+        for (var i = 0; i < tokens.length; i++) {
+            if (coreSymbolsAsKeywordsLookupMap.propertyIsEnumerable(tokens[i])) {
+                pairs = pairs + "[keyword " + tokens[i] + "] ";
+            } else {
+                pairs = pairs + "[" + type + " " + tokens[i] + "] ";
+            }
+        }
+
+        return pairs;
+    }
+})();
diff --git a/test/index.html b/test/index.html
index 0ef52fb2ce..1bd50b1678 100644
--- a/test/index.html
+++ b/test/index.html
@@ -22,6 +22,7 @@
 <script src="../mode/css/css.js"></script>
 <script src="../mode/clike/clike.js"></script>
 <!-- clike must be after css or vim and sublime tests will fail -->
+<script src="../mode/clojure/clojure.js"></script>
 <script src="../mode/cypher/cypher.js"></script>
 <script src="../mode/d/d.js"></script>
 <script src="../mode/dockerfile/dockerfile.js"></script>
@@ -114,6 +115,7 @@ <h2>Test Suite</h2>
     <script src="mode_test.js"></script>
 
     <script src="../mode/clike/test.js"></script>
+    <script src="../mode/clojure/test.js"></script>
     <script src="../mode/css/test.js"></script>
     <script src="../mode/css/gss_test.js"></script>
     <script src="../mode/css/scss_test.js"></script>

From 39f543fca088aa4b3be516942eaefc8828ae5b80 Mon Sep 17 00:00:00 2001
From: finalfantasia <abdusalam@live.com>
Date: Fri, 31 Aug 2018 23:44:07 -0700
Subject: [PATCH 3820/4742] [clojure mode] Enable editor features on demo page.

This PR enables the following editor features on the demo page
for Clojure mode:
- line numbers
- bracket matching
- bracket auto-closing
---
 mode/clojure/index.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index 5399ce876e..3361251157 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -6,6 +6,8 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/closebrackets.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="clojure.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
@@ -83,7 +85,12 @@ <h2>Clojure mode</h2>
 
 </textarea></form>
     <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+          autoCloseBrackets: true,
+          lineNumbers: true,
+          matchBrackets: true,
+          mode: 'text/x-clojure'
+      });
     </script>
 
     <p><strong>MIME types defined:</strong> <code>text/x-clojure</code>.</p>

From f5f7b16fc8a020f0316aca4d9916d1d5bd8dcd40 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <abdusalam@live.com>
Date: Sun, 2 Sep 2018 00:30:36 -0700
Subject: [PATCH 3821/4742] [clojure mode] Highlight special forms and core
 symbols as `keyword`.

The Common Lisp mode uses `keyword` for both special forms and the forms
that assume the body parameter; the Scheme mode uses `builtin` for its
special forms and core symbols. Both of these modes don't distinguish
keyword-ish symbols from built-in symbols as the other modes for the
languages that have real keywords do, such as Ruby. Since Clojure is a
Lisp, the Clojure mode should also follow the same Lisp-y convention
(it's neither idiomatic nor practically useful to distinguish symbols
such as `let` and `map`, for example).
---
 mode/clojure/clojure.js |  43 +++---
 mode/clojure/test.js    | 281 ++++++++++++++++++----------------------
 2 files changed, 149 insertions(+), 175 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 9d86f985f6..a15c82047e 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -17,8 +17,10 @@
 "use strict";
 
 CodeMirror.defineMode("clojure", function (options) {
-    var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword", VAR = "variable";
+    var ATOM = "atom", BRACKET = "bracket", CHARACTER = "string-2",
+        COMMENT = "comment", CORE_SYMBOL = "keyword", KEYWORD="atom",
+        NUMBER = "number", SPECIAL_FORM = "keyword", STRING = "string",
+        VAR = "variable";
     var INDENT_WORD_SKIP = options.indentUnit || 2;
     var NORMAL_INDENT_UNIT = options.indentUnit || 2;
 
@@ -28,16 +30,10 @@ CodeMirror.defineMode("clojure", function (options) {
         return obj;
     }
 
-    var commonAtoms = ["true", "false", "nil"];
-    var commonKeywords = ["defn", "defn-", "def", "def-", "defonce", "defmulti", "defmethod", "defmacro",
-        "defstruct", "deftype", "defprotocol", "defrecord", "defproject", "deftest", "slice", "defalias",
-        "defhinted", "defmacro-", "defn-memo", "defnk", "defonce-", "defunbound", "defunbound-",
-        "defvar", "defvar-", "let", "letfn", "do", "case", "cond", "condp", "for", "loop", "recur", "when",
-        "when-not", "when-let", "when-first", "when-some", "if", "if-let", "if-not", ".", "..", "->", "->>", "doto",
-        "and", "or", "dosync", "doseq", "dotimes", "dorun", "doall", "load", "import", "unimport", "ns",
-        "in-ns", "refer", "try", "catch", "finally", "throw", "with-open", "with-local-vars", "binding",
-        "gen-class", "gen-and-load-class", "gen-and-save-class", "handler-case", "handle", "new"];
-    var commonBuiltins = ["*", "*'", "*1", "*2", "*3", "*agent*", "*allow-unresolved-vars*", "*assert*",
+    var commonAtoms = ["false", "nil", "true"];
+    var commonSpecialForms = [".", "catch", "def", "do", "if", "monitor-enter",
+        "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
+    var commonCoreSymbols = ["*", "*'", "*1", "*2", "*3", "*agent*", "*allow-unresolved-vars*", "*assert*",
         "*clojure-version*", "*command-line-args*", "*compile-files*", "*compile-path*", "*compiler-options*",
         "*data-readers*", "*default-data-reader-fn*", "*e", "*err*", "*file*", "*flush-on-newline*", "*fn-loader*",
         "*in*", "*math-context*", "*ns*", "*out*", "*print-dup*", "*print-length*", "*print-level*", "*print-meta*",
@@ -113,7 +109,7 @@ CodeMirror.defineMode("clojure", function (options) {
         "when-some", "while", "with-bindings", "with-bindings*", "with-in-str", "with-loading-context", "with-local-vars",
         "with-meta", "with-open", "with-out-str", "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
         "zipmap"];
-    var commonIndentKeys = [
+    var commonIndentSymbols = [
         // Built-ins
         "ns", "fn", "def", "defn", "defmethod", "bound-fn", "if", "if-not", "case", "condp", "when", "while", "when-not", "when-first", "when-some", "do", "future", "comment", "doto",
         "locking", "proxy", "with-open", "with-precision", "reify", "deftype", "defrecord", "defprotocol", "extend", "extend-protocol", "extend-type",
@@ -127,12 +123,13 @@ CodeMirror.defineMode("clojure", function (options) {
         // contrib
         "handler-case", "handle", "dotrace", "deftrace"];
 
-    CodeMirror.registerHelper("hintWords", "clojure", commonAtoms.concat(commonBuiltins));
+    CodeMirror.registerHelper("hintWords", "clojure",
+        commonAtoms.concat(commonSpecialForms, commonCoreSymbols));
 
     var atoms = makeKeywords(commonAtoms);
-    var keywords = makeKeywords(commonKeywords);
-    var builtins = makeKeywords(commonBuiltins);
-    var indentKeys = makeKeywords(commonIndentKeys);
+    var specialForms = makeKeywords(commonSpecialForms);
+    var coreSymbols = makeKeywords(commonCoreSymbols);
+    var indentSymbols = makeKeywords(commonIndentSymbols);
 
     var tests = {
         digit: /\d/,
@@ -271,7 +268,7 @@ CodeMirror.defineMode("clojure", function (options) {
                             keyWord += letter;
                         }
 
-                        if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) ||
+                        if (keyWord.length > 0 && (indentSymbols.propertyIsEnumerable(keyWord) ||
                                                    tests.block_indent.test(keyWord))) { // indent-word
                             pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
                         } else { // non-indent word
@@ -295,14 +292,14 @@ CodeMirror.defineMode("clojure", function (options) {
                         }
                     } else if ( ch == ":" ) {
                         stream.eatWhile(tests.symbol);
-                        return ATOM;
+                        return KEYWORD;
                     } else {
                         stream.eatWhile(tests.symbol);
 
-                        if (keywords && keywords.propertyIsEnumerable(stream.current())) {
-                            returnType = KEYWORD;
-                        } else if (builtins && builtins.propertyIsEnumerable(stream.current())) {
-                            returnType = BUILTIN;
+                        if (specialForms && specialForms.propertyIsEnumerable(stream.current())) {
+                            returnType = SPECIAL_FORM;
+                        } else if (coreSymbols && coreSymbols.propertyIsEnumerable(stream.current())) {
+                            returnType = CORE_SYMBOL;
                         } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
                             returnType = ATOM;
                         } else {
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index d93696cad9..0b02aa4ae9 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -93,23 +93,14 @@
         "[atom '][variable #][bracket {][variable a] [number 1] [atom :foo][bracket }]"
     );
 
-    var coreSymbolsAsKeywords = [
-        "defn", "defn-", "def", "def-", "defonce", "defmulti", "defmethod", "defmacro",
-        "defstruct", "deftype", "defprotocol", "defrecord", "defproject", "deftest", "slice", "defalias",
-        "defhinted", "defmacro-", "defn-memo", "defnk", "defonce-", "defunbound", "defunbound-",
-        "defvar", "defvar-", "let", "letfn", "do", "case", "cond", "condp", "for", "loop", "recur", "when",
-        "when-not", "when-let", "when-first", "when-some", "if", "if-let", "if-not", ".", "..", "->", "->>", "doto",
-        "and", "or", "dosync", "doseq", "dotimes", "dorun", "doall", "load", "import", "unimport", "ns",
-        "in-ns", "refer", "try", "catch", "finally", "throw", "with-open", "with-local-vars", "binding",
-        "gen-class", "gen-and-load-class", "gen-and-save-class", "handler-case", "handle", "new"
-    ];
-    var coreSymbolsAsKeywordsLookupMap = lookupMap(coreSymbolsAsKeywords);
+    var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
+        "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
 
-    MT("specials",
-        typeTokenPairs("keyword", coreSymbolsAsKeywords)
+    MT("should highlight special forms as keywords",
+        typeTokenPairs("keyword", specialForms)
     );
 
-    var coreSymbolsAsBuiltins1 = [
+    var coreSymbols1 = [
         "*", "*'", "*1", "*2", "*3", "*agent*", "*allow-unresolved-vars*", "*assert*",
         "*clojure-version*", "*command-line-args*", "*compile-files*", "*compile-path*", "*compiler-options*",
         "*data-readers*", "*default-data-reader-fn*", "*e", "*err*", "*file*", "*flush-on-newline*", "*fn-loader*",
@@ -153,7 +144,7 @@
         "loop", "macroexpand", "macroexpand-1", "make-array", "make-hierarchy", "map", "map-entry?", "map-indexed", "map?",
         "mapcat", "mapv", "max", "max-key", "memfn", "memoize", "merge", "merge-with", "meta", "method-sig", "methods"];
 
-    var coreSymbolsAsBuiltins2 = [
+    var coreSymbols2 = [
         "min", "min-key", "mix-collection-hash", "mod", "munge", "name", "namespace", "namespace-munge", "nat-int?",
         "neg-int?", "neg?", "newline", "next", "nfirst", "nil?", "nnext", "not", "not-any?", "not-empty", "not-every?",
         "not=", "ns", "ns-aliases", "ns-imports", "ns-interns", "ns-map", "ns-name", "ns-publics", "ns-refers", "ns-resolve",
@@ -190,32 +181,32 @@
         "zipmap"
     ];
 
-    MT("core symbols (part 1/2)",
-        typeTokenPairs("builtin", coreSymbolsAsBuiltins1)
+    MT("should syntax highlight core symbols as keywords (part 1/2)",
+        typeTokenPairs("keyword", coreSymbols1)
     );
 
-    MT("core symbols (part 2/2)",
-        typeTokenPairs("builtin", coreSymbolsAsBuiltins2)
+    MT("should syntax highlight core symbols as keywords (part 2/2)",
+        typeTokenPairs("keyword", coreSymbols2)
     );
 
-    MT("should_indent_assoc",
-        "[bracket (][builtin assoc] [variable foo]",
+    MT("should indent assoc",
+        "[bracket (][keyword assoc] [variable foo]",
         "  [atom :1] [string \"three\"]",
         "  [atom :2] [string \"two\"]",
         "  [atom :3] [string \"three\"][bracket )]"
     );
 
-    MT("should_indent_binding",
+    MT("should indent binding",
         "[bracket (][keyword binding] [bracket [[][variable foo] [number 2]",
         "          [variable *bar*] [number 3][bracket ]]]",
-        "  [bracket (][builtin +] [variable foo] [variable *bar*][bracket ))]");
+        "  [bracket (][keyword +] [variable foo] [variable *bar*][bracket ))]");
 
-    MT("should_indent_bound-fn",
-        "[bracket (][builtin bound-fn] [bracket [[]]]",
+    MT("should indent bound-fn",
+        "[bracket (][keyword bound-fn] [bracket [[]]]",
         "  [bracket (][variable f][bracket ))]"
     );
 
-    MT("should_indent_case",
+    MT("should indent case",
         "[bracket (][keyword case] [variable foo]",
         "  [string \"\"] [number 0]",
         "  [string \"hello\"] [atom :bar]",
@@ -224,39 +215,39 @@
         "  [atom :default]"
     );
 
-    MT("should_indent_catch",
+    MT("should indent catch",
         "[bracket (][keyword catch] [variable Exception] [variable e]",
-        "  [bracket (][builtin println] [string \"Some other exception, won't be caught in this case...\"][bracket )]",
+        "  [bracket (][keyword println] [string \"Some other exception, won't be caught in this case...\"][bracket )]",
         "  [number 666][bracket )]"
     );
 
-    MT("should_indent_comment",
-        "[bracket (][builtin comment] [bracket (][variable foo][bracket )]",
+    MT("should indent comment",
+        "[bracket (][keyword comment] [bracket (][variable foo][bracket )]",
         "  [bracket (][variable bar] [number 1] [number 2] [number 3][bracket ))]"
     );
 
-    MT("should_indent_cond",
+    MT("should indent cond",
         "[bracket (][keyword cond]",
-        "  [bracket (][builtin <] [variable n] [number 0][bracket )] [string \"negative\"]",
-        "  [bracket (][builtin >] [variable n] [number 0][bracket )] [string \"positive\"]",
+        "  [bracket (][keyword <] [variable n] [number 0][bracket )] [string \"negative\"]",
+        "  [bracket (][keyword >] [variable n] [number 0][bracket )] [string \"positive\"]",
         "  [atom :else] [string \"zero\"][bracket ))]"
     );
 
-    MT("should_indent_condp",
-        "[bracket (][keyword condp] [builtin =] [variable foo]",
+    MT("should indent condp",
+        "[bracket (][keyword condp] [keyword =] [variable foo]",
         "  [number 1] [string \"one\"]",
         "  [number 2] [string \"two\"]",
         "  [number 3] [string \"three\"]",
         "  [string \"unexpected value\"][bracket )]"
     );
 
-    MT("should_indent_def",
+    MT("should indent def",
         "[bracket (][keyword def] [variable x]",
         "  [string \"here is an indented doc-string.\"]",
         "  [number 1][bracket )]"
     );
 
-    MT("should_indent_defn",
+    MT("should indent defn",
         "[bracket (][keyword defn] [variable foo]",
         "  [bracket [[][variable x][bracket ]]]",
         "  [bracket (][variable bar] [variable x][bracket ))]",
@@ -265,14 +256,14 @@
         "  [bracket (][variable bar] [variable x][bracket ))]"
     );
 
-    MT("should_indent_defmacro",
+    MT("should indent defmacro",
         "[bracket (][keyword defmacro] [variable foo]",
         "  [string \"here is an indented doc-string.\"]",
         "  [bracket [[][variable x] [variable y][bracket ]]]",
-        "  [variable `][bracket (][builtin println] [variable ~x] [variable ~@y][bracket ))]"
+        "  [variable `][bracket (][keyword println] [variable ~x] [variable ~@y][bracket ))]"
     );
 
-    MT("should_indent_defmethod",
+    MT("should indent defmethod",
         "[bracket (][keyword defmethod] [variable foo] [atom :bar] [bracket [[][variable x][bracket ]]] [bracket (][variable baz] [variable x][bracket ))]",
         "",
         "[bracket (][keyword defmethod] [variable foo] [atom :bar]",
@@ -280,86 +271,86 @@
         "  [bracket (][variable baz] [variable x][bracket ))]"
     );
 
-    MT("should_indent_defstruct",
+    MT("should indent defstruct",
         "[bracket (][keyword defstruct] [variable person]",
         "  [atom :name]",
         "  [atom :age]",
         "  [atom :height][bracket )]"
     );
 
-    MT("should_indent_deftest and testing",
-        "[bracket (][keyword deftest] [variable addition]",
+    MT("should indent deftest and testing",
+        "[bracket (][variable deftest] [variable addition]",
         "  [bracket (][variable testing] [string \"with positive integers\"]",
-        "    [bracket (][variable is] [bracket (][builtin =] [number 4] [bracket (][builtin +] [number 2] [number 2][bracket )))]",
-        "    [bracket (][variable is] [bracket (][builtin =] [number 7] [bracket (][builtin +] [number 3] [number 4][bracket ))))]"
+        "    [bracket (][variable is] [bracket (][keyword =] [number 4] [bracket (][keyword +] [number 2] [number 2][bracket )))]",
+        "    [bracket (][variable is] [bracket (][keyword =] [number 7] [bracket (][keyword +] [number 3] [number 4][bracket ))))]"
     );
 
-    MT("should_indent_doseq",
+    MT("should indent doseq",
         "[bracket (][keyword doseq] [bracket [[][variable x] [bracket [[][number -1] [number 0] [number 1][bracket ]]]",
         "        [variable y] [bracket [[][number 1] [number 2] [number 3][bracket ]]]]]",
-        "  [bracket (][builtin prn] [bracket (][builtin *] [variable x] [variable y][bracket )))]"
+        "  [bracket (][keyword prn] [bracket (][keyword *] [variable x] [variable y][bracket )))]"
     );
 
-    MT("should_indent_dotimes",
+    MT("should indent dotimes",
         "[bracket (][keyword dotimes] [bracket [[][variable n] [number 5][bracket ]]]",
-        "  [bracket (][builtin println] [string \"n is\"] [variable n][bracket ))]");
+        "  [bracket (][keyword println] [string \"n is\"] [variable n][bracket ))]");
 
-    MT("should_indent_for",
+    MT("should indent for",
         "[bracket (][keyword for] [bracket [[][variable x] [bracket [[][number 1] [number 2] [number 3][bracket ]]]",
-        "      [atom :let] [bracket [[][variable y] [bracket (][builtin *] [variable x] [number 3][bracket )]]]",
-        "      [atom :when] [bracket (][builtin even?] [variable y][bracket )]]]",
+        "      [atom :let] [bracket [[][variable y] [bracket (][keyword *] [variable x] [number 3][bracket )]]]",
+        "      [atom :when] [bracket (][keyword even?] [variable y][bracket )]]]",
         "  [variable y][bracket )]"
     );
 
-    MT("should_indent_if-let",
+    MT("should indent if-let",
         "[bracket (][keyword if-let] [bracket [[][variable x] [variable foo][bracket ]]]",
         "  [string \"then\"]",
         "  [string \"else\"][bracket ))]"
     );
 
-    MT("should_indent_let",
+    MT("should indent let",
         "[bracket (][keyword let] [bracket [[][variable foo] [number 2]",
         "      [variable bar] [number 3][bracket ]]]",
-        "  [bracket (][builtin +] [variable foo] [variable *bar*][bracket ))]"
+        "  [bracket (][keyword +] [variable foo] [variable *bar*][bracket ))]"
     );
 
-    MT("should_indent_letfn",
+    MT("should indent letfn",
         "[bracket (][keyword letfn] [bracket [[(][variable twice] [bracket [[][variable x][bracket ]]]",
-        "               [bracket (][builtin *] [variable x] [number 2][bracket ))]",
+        "               [bracket (][keyword *] [variable x] [number 2][bracket ))]",
         "        [bracket (][variable six-times] [bracket [[][variable y][bracket ]]]",
-        "                   [bracket (][builtin *] [bracket (][variable twice] [variable y][bracket )] [number 3][bracket ))]]]",
-        "  [bracket (][builtin println] [string \"twice 15 =\"] [bracket (][variable twice] [number 15][bracket ))]]]",
-        "  [bracket (][builtin println] [string \"six times 15 =\"] [bracket (][variable six-times] [number 15][bracket )))]"
+        "                   [bracket (][keyword *] [bracket (][variable twice] [variable y][bracket )] [number 3][bracket ))]]]",
+        "  [bracket (][keyword println] [string \"twice 15 =\"] [bracket (][variable twice] [number 15][bracket ))]]]",
+        "  [bracket (][keyword println] [string \"six times 15 =\"] [bracket (][variable six-times] [number 15][bracket )))]"
     );
 
-    MT("should_indent_loop",
+    MT("should indent loop",
         "[bracket (][keyword loop] [bracket [[][variable foo] [number 2]",
         "       [variable bar] [number 3][bracket ]]]",
-        "  [bracket (][builtin +] [variable foo] [variable *bar*][bracket ))]"
+        "  [bracket (][keyword +] [variable foo] [variable *bar*][bracket ))]"
     );
 
-    MT("should_indent_when-first",
+    MT("should indent when-first",
         "[bracket (][keyword when-first] [bracket [[][variable a] [bracket [[][number 1] [number 2] [number 3][bracket ]]]]]",
         "  [variable a][bracket )]"
     );
 
-    MT("should_indent_when-let",
+    MT("should indent when-let",
         "[bracket (][keyword when-let] [bracket [[][variable x] [variable foo][bracket ]]]",
         "  [string \"foo\"]"
     );
 
-    MT("should_indent_when-some",
+    MT("should indent when-some",
         "[bracket (][keyword when-some] [bracket [[][variable x] [variable foo][bracket ]]]",
         "  [string \"foo\"]"
     );
 
-    MT("should_indent_struct-map",
-        "[bracket (][builtin struct-map] [variable foo]",
+    MT("should indent struct-map",
+        "[bracket (][keyword struct-map] [variable foo]",
         "  [atom :1] [string \"one\"]",
         "  [atom :2] [string \"two\"][bracket )]"
     );
 
-    MT("should_indent_defprotocol",
+    MT("should indent defprotocol",
         "[bracket (][keyword defprotocol] [variable Protocol]",
         "  [bracket (][variable foo] [bracket [[][variable this][bracket ]])]",
         "  [bracket (][variable bar] [bracket [[][variable this][bracket ]]] [bracket [[][variable this] [variable x][bracket ]])]",
@@ -367,14 +358,14 @@
         "       [bracket [[][variable this] [variable y][bracket ]]))]"
     );
 
-    MT("should_indent_defrecord",
+    MT("should indent defrecord",
         "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]])]",
         "",
         "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]]]",
         "  [variable Protocol]",
         "  [bracket (][variable foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
         "  [bracket (][variable bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
-        "  [bracket (][variable baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][builtin str] [variable first-name] [variable last-name][bracket )))]",
+        "  [bracket (][variable baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][keyword str] [variable first-name] [variable last-name][bracket )))]",
         "",
         "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name]",
         "                   [variable last-name]",
@@ -386,14 +377,14 @@
         "   [variable address][bracket ]])]"
     );
 
-    MT("should_indent_deftype",
+    MT("should indent deftype",
         "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]])]",
         "",
         "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]]]",
         "  [variable Protocol]",
         "  [bracket (][variable foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
         "  [bracket (][variable bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
-        "  [bracket (][variable baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][builtin str] [variable first-name] [variable last-name][bracket )))]",
+        "  [bracket (][variable baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][keyword str] [variable first-name] [variable last-name][bracket )))]",
         "",
         "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name]",
         "                 [variable last-name]",
@@ -405,7 +396,7 @@
         "   [variable address][bracket ]])]"
     );
 
-    MT("should_indent_do",
+    MT("should indent do",
         "[bracket (][keyword do] [bracket (][variable foo][bracket )]",
         "  [bracket (][variable bar][bracket ))]",
         "",
@@ -414,7 +405,7 @@
         "  [bracket (][variable bar][bracket ))]"
     );
 
-    MT("should_indent_doto",
+    MT("should indent doto",
         "[bracket (][keyword doto] [bracket (][keyword new] [variable java.util.HashMap][bracket )] [bracket (][variable .put] [string \"a\"] [number 1][bracket )] [bracket (][variable .put] [string \"b\"] [number 2][bracket ))]",
         "",
         "[bracket (][keyword doto] [bracket (][variable java.util.HashMap.][bracket )]",
@@ -422,182 +413,168 @@
         "  [bracket (][variable .put] [string \"b\"] [number 2][bracket ))]"
     );
 
-    MT("should_indent_extend",
-        "[bracket (][builtin extend] [variable FooType]",
+    MT("should indent extend",
+        "[bracket (][keyword extend] [variable FooType]",
         "  [variable FooProtocol]",
         "  [bracket {][atom :foo] [variable an-existing-fn]",
-        "   [atom :bar] [bracket (][builtin fn] [bracket [[][variable a] [variable b][bracket ]]]",
+        "   [atom :bar] [bracket (][keyword fn] [bracket [[][variable a] [variable b][bracket ]]]",
         "          [bracket (][variable f] [variable a] [variable b][bracket ))]",
-        "   [atom :baz] [bracket (][builtin fn] [bracket ([[][variable a][bracket ]]] [variable a][bracket )]",
+        "   [atom :baz] [bracket (][keyword fn] [bracket ([[][variable a][bracket ]]] [variable a][bracket )]",
         "          [bracket ([[][variable a] [variable b][bracket ]]] [bracket [[][variable a] [variable b][bracket ]]))})]"
     );
 
-    MT("should_indent_extend-protocol",
-        "[bracket (][builtin extend-protocol] [variable Protocol]",
+    MT("should indent extend-protocol",
+        "[bracket (][keyword extend-protocol] [variable Protocol]",
         "  [variable FooType]",
         "  [bracket (][variable foo] [bracket [[][variable x][bracket ]]] [bracket (][variable f] [variable x][bracket ))]",
         "  [bracket (][variable bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][variable g] [variable x] [variable y][bracket ))]"
     );
 
-    MT("should_indent_extend-type",
-        "[bracket (][builtin extend-type] [variable FooType]",
+    MT("should indent extend-type",
+        "[bracket (][keyword extend-type] [variable FooType]",
         "  [variable Countable]",
-        "  [bracket (][variable cnt] [bracket [][variable c][bracket ]]] [bracket (][builtin count] [variable c][bracket ))]",
+        "  [bracket (][variable cnt] [bracket [][variable c][bracket ]]] [bracket (][keyword count] [variable c][bracket ))]",
         "  ",
         "  [variable Foo]",
         "  [bracket (][variable bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][variable f] [variable x] [variable y][bracket ))]",
         "  [bracket (][variable baz] [bracket ([][variable x] [variable x][bracket ]])] [bracket ([[][variable x] [variable y] [variable &] [variable zs][bracket ]]] [bracket [[][variable x] [variable y] [bracket (][variable g] [variable zs][bracket )]])))]"
     );
 
-    MT("should_indent_fn",
-        "[bracket (][builtin fn] [variable foo]",
+    MT("should indent fn",
+        "[bracket (][keyword fn] [variable foo]",
         "  [bracket [[][variable x][bracket ]]]",
         "  [bracket (][variable bar] [variable x][bracket ))]",
         "",
-        "[bracket (][builtin fn] [variable foo] [bracket [[][variable x][bracket ]]]",
+        "[bracket (][keyword fn] [variable foo] [bracket [[][variable x][bracket ]]]",
         "  [bracket (][variable bar] [variable x][bracket ))]"
     );
 
-    MT("should_indent_future",
-        "[bracket (][builtin future] [bracket (][variable Thread/sleep] [number 10000][bracket )] [bracket (][builtin println] [string \"done\"][bracket )] [number 100][bracket )]",
+    MT("should indent future",
+        "[bracket (][keyword future] [bracket (][variable Thread/sleep] [number 10000][bracket )] [bracket (][keyword println] [string \"done\"][bracket )] [number 100][bracket )]",
         "",
-        "[bracket (][builtin future] [bracket (][variable Thread/sleep] [number 10000][bracket )]",
-        "  [bracket (][builtin println] [string \"done\"][bracket )]",
+        "[bracket (][keyword future] [bracket (][variable Thread/sleep] [number 10000][bracket )]",
+        "  [bracket (][keyword println] [string \"done\"][bracket )]",
         "  [number 100][bracket )]",
         "",
-        "[bracket (][builtin future]",
+        "[bracket (][keyword future]",
         "  [bracket (][variable Thread/sleep] [number 10000][bracket )]",
-        "  [bracket (][builtin println] [string \"done\"][bracket )]",
+        "  [bracket (][keyword println] [string \"done\"][bracket )]",
         "  [number 100][bracket )]"
     );
 
-    MT("should_indent_if",
-        "[bracket (][keyword if] [bracket (][builtin <] [variable foo] [number 100][bracket )] [string \"yes\"] [string \"no\"][bracket )]",
+    MT("should indent if",
+        "[bracket (][keyword if] [bracket (][keyword <] [variable foo] [number 100][bracket )] [string \"yes\"] [string \"no\"][bracket )]",
         "",
-        "[bracket (][keyword if] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "[bracket (][keyword if] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
         "  [string \"yes\"]",
         "  [string \"no\"][bracket )]",
         "",
-        "[bracket (][keyword if] [bracket (][keyword and] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
-        "         [bracket (][builtin <] [variable bar] [number 50][bracket ))]",
+        "[bracket (][keyword if] [bracket (][keyword and] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
+        "         [bracket (][keyword <] [variable bar] [number 50][bracket ))]",
         "  [string \"yes\"]",
         "  [string \"no\"][bracket )]"
     );
 
-    MT("should_indent_if-not",
-        "[bracket (][keyword if-not] [bracket (][builtin <] [variable foo] [number 100][bracket )] [string \"yes\"] [string \"no\"][bracket )]",
+    MT("should indent if-not",
+        "[bracket (][keyword if-not] [bracket (][keyword <] [variable foo] [number 100][bracket )] [string \"yes\"] [string \"no\"][bracket )]",
         "",
-        "[bracket (][keyword if-not] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "[bracket (][keyword if-not] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
         "  [string \"yes\"]",
         "  [string \"no\"][bracket )]",
         "",
-        "[bracket (][keyword if-not] [bracket (][keyword and] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
-        "             [bracket (][builtin <] [variable bar] [number 50][bracket ))]",
+        "[bracket (][keyword if-not] [bracket (][keyword and] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
+        "             [bracket (][keyword <] [variable bar] [number 50][bracket ))]",
         "  [string \"yes\"]",
         "  [string \"no\"][bracket )]"
     );
 
-    MT("should_indent_locking",
-        "[bracket (][builtin locking] [variable foo] [bracket (][variable Thread/sleep] [number 1000][bracket )] [bracket (][builtin println] [string \"done\"][bracket ))]",
+    MT("should indent locking",
+        "[bracket (][keyword locking] [variable foo] [bracket (][variable Thread/sleep] [number 1000][bracket )] [bracket (][keyword println] [string \"done\"][bracket ))]",
         "",
-        "[bracket (][builtin locking] [variable foo]",
+        "[bracket (][keyword locking] [variable foo]",
         "  [bracket (][variable Thread/sleep] [number 1000][bracket )]",
-        "  [bracket (][builtin println] [string \"done\"][bracket ))]"
+        "  [bracket (][keyword println] [string \"done\"][bracket ))]"
     );
 
-    MT("should_indent_ns",
+    MT("should indent ns",
         "[bracket (][keyword ns] [variable foo.bar]",
-        "  [bracket (][atom :refer-clojure] [atom :exclude] [bracket [][builtin ancestors] [builtin printf][bracket ]])]",
+        "  [bracket (][atom :refer-clojure] [atom :exclude] [bracket [][keyword ancestors] [keyword printf][bracket ]])]",
         "  [bracket (][atom :require] [bracket [][variable clojure.contrib] [variable sql] [variable combinatorics][bracket ]])]",
         "  [bracket (][atom :use] [bracket [][variable my.lib] [variable this] [variable that][bracket ]])]",
         "  [bracket (][atom :import] [bracket (][variable java.util] [variable Date] [variable Timer] [variable Random][bracket )]",
         "           [bracket (][variable java.sql] [variable Connection] [variable Statement][bracket )))]"
     );
 
-    MT("should_indent_proxy",
-        "[bracket (][builtin proxy] [bracket [][variable MouseAdapter][bracket ]]] [bracket [[]]]",
+    MT("should indent proxy",
+        "[bracket (][keyword proxy] [bracket [][variable MouseAdapter][bracket ]]] [bracket [[]]]",
         "  [bracket (][variable mousePressed] [bracket [][variable event][bracket ]]]",
-        "                [bracket (][builtin apply] [variable f] [variable event] [variable args][bracket )))]"
+        "                [bracket (][keyword apply] [variable f] [variable event] [variable args][bracket )))]"
     );
 
-    MT("should_indent_reify",
-        "[bracket (][builtin reify] [variable Foo]",
+    MT("should indent reify",
+        "[bracket (][keyword reify] [variable Foo]",
         "  [bracket (][variable foo] [bracket [[][variable _] [variable x][bracket ]]] [variable x][bracket )]",
         "  [bracket (][variable foo] [bracket [[][variable _] [variable x] [variable y][bracket ]]] [variable y][bracket ))]"
     );
 
-    MT("should_indent_try",
+    MT("should indent try",
         "[bracket (][keyword try]",
-        "  [bracket (][builtin /] [number 1] [number 0][bracket )]",
-        "  [bracket (][keyword catch] [variable Exception] [variable e] [bracket (][builtin str] [string \"caught exception: \"] [bracket (][variable .getMessage] [variable e][bracket ))))]"
+        "  [bracket (][keyword /] [number 1] [number 0][bracket )]",
+        "  [bracket (][keyword catch] [variable Exception] [variable e] [bracket (][keyword str] [string \"caught exception: \"] [bracket (][variable .getMessage] [variable e][bracket ))))]"
     );
 
-    MT("should_indent_with-open",
+    MT("should indent with-open",
         "[bracket (][keyword with-open] [bracket [[][variable out-data] [bracket (][variable io/writer] [variable out-file][bracket )]]]",
         "  [bracket (][variable csv/write-csv] [variable out-data] [variable out-sos][bracket )))]"
     );
 
-    MT("should_indent_with-precision",
-        "[bracket (][builtin with-precision] [number 10] [bracket (][builtin /] [number 1][variable M] [number 3][bracket ))]",
+    MT("should indent with-precision",
+        "[bracket (][keyword with-precision] [number 10] [bracket (][keyword /] [number 1][variable M] [number 3][bracket ))]",
         "",
-        "[bracket (][builtin with-precision] [number 10] [atom :rounding] [variable HALF_DOWN] [bracket (][builtin /] [number 1][variable M] [number 3][bracket ))]",
+        "[bracket (][keyword with-precision] [number 10] [atom :rounding] [variable HALF_DOWN] [bracket (][keyword /] [number 1][variable M] [number 3][bracket ))]",
         "",
-        "[bracket (][builtin with-precision]",
+        "[bracket (][keyword with-precision]",
         "  [number 10]",
         "  [atom :rounding]",
         "  [variable HALF_DOWN]",
-        "  [bracket (][builtin /] [number 1][variable M] [number 3][bracket ))]"
+        "  [bracket (][keyword /] [number 1][variable M] [number 3][bracket ))]"
     );
 
-    MT("should_indent_when",
-        "[bracket (][keyword when] [bracket (][builtin <] [variable foo] [number 100][bracket )] [string \"yes\"][bracket )]",
+    MT("should indent when",
+        "[bracket (][keyword when] [bracket (][keyword <] [variable foo] [number 100][bracket )] [string \"yes\"][bracket )]",
         "",
-        "[bracket (][keyword when] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "[bracket (][keyword when] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
         "  [string \"yes\"][bracket )]",
         "",
-        "[bracket (][keyword when] [bracket (][keyword and] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
-        "           [bracket (][builtin <] [variable bar] [number 50][bracket ))]",
+        "[bracket (][keyword when] [bracket (][keyword and] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
+        "           [bracket (][keyword <] [variable bar] [number 50][bracket ))]",
         "  [string \"yes\"][bracket )]"
     );
 
-    MT("should_indent_when-not",
-        "[bracket (][keyword when-not] [bracket (][builtin <] [variable foo] [number 100][bracket )] [string \"no\"][bracket )]",
+    MT("should indent when-not",
+        "[bracket (][keyword when-not] [bracket (][keyword <] [variable foo] [number 100][bracket )] [string \"no\"][bracket )]",
         "",
-        "[bracket (][keyword when-not] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
+        "[bracket (][keyword when-not] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
         "  [string \"no\"][bracket )]",
         "",
-        "[bracket (][keyword when-not] [bracket (][keyword and] [bracket (][builtin <] [variable foo] [number 100][bracket )]",
-        "               [bracket (][builtin <] [variable bar] [number 50][bracket ))]",
+        "[bracket (][keyword when-not] [bracket (][keyword and] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
+        "               [bracket (][keyword <] [variable bar] [number 50][bracket ))]",
         "  [string \"no\"][bracket )]"
     );
 
-    MT("should_indent_while",
-        "[bracket (][builtin while] [variable foo] [bracket (][keyword do] [bracket (][builtin println] [variable a][bracket )] [bracket (][builtin println] [variable b][bracket )))]",
+    MT("should indent while",
+        "[bracket (][keyword while] [variable foo] [bracket (][keyword do] [bracket (][keyword println] [variable a][bracket )] [bracket (][keyword println] [variable b][bracket )))]",
         "",
-        "[bracket (][builtin while] [variable foo]",
-        "  [bracket (][keyword do] [bracket (][builtin println] [variable a][bracket )]",
-        "    [bracket (][builtin println] [variable b][bracket )))]"
+        "[bracket (][keyword while] [variable foo]",
+        "  [bracket (][keyword do] [bracket (][keyword println] [variable a][bracket )]",
+        "    [bracket (][keyword println] [variable b][bracket )))]"
     );
 
-    function lookupMap(words) {
-        var map = {};
-
-        for (var i = 0; i < words.length; ++i) {
-            map[words[i]] = true;
-        }
-
-        return map;
-    }
-
     function typeTokenPairs(type, tokens) {
         var pairs = "";
 
         for (var i = 0; i < tokens.length; i++) {
-            if (coreSymbolsAsKeywordsLookupMap.propertyIsEnumerable(tokens[i])) {
-                pairs = pairs + "[keyword " + tokens[i] + "] ";
-            } else {
-                pairs = pairs + "[" + type + " " + tokens[i] + "] ";
-            }
+            pairs = pairs + "[" + type + " " + tokens[i] + "] ";
         }
 
         return pairs;

From 5457989d397ca9e0f233750b6df061b9765182c7 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <abdusalam@live.com>
Date: Sun, 2 Sep 2018 00:38:28 -0700
Subject: [PATCH 3822/4742] [clojure mode] Remove indentation rules for
 non-core symbols.

Until some clear criteria for including symbols from non-core namespaces
are created, we should focus on covering more core symbols for indentation.
---
 mode/clojure/clojure.js | 6 +-----
 mode/clojure/test.js    | 7 -------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index a15c82047e..30dc6bdaed 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -117,11 +117,7 @@ CodeMirror.defineMode("clojure", function (options) {
         // Binding forms
         "let", "letfn", "binding", "loop", "for", "doseq", "dotimes", "when-let", "if-let",
         // Data structures
-        "defstruct", "struct-map", "assoc",
-        // clojure.test
-        "testing", "deftest",
-        // contrib
-        "handler-case", "handle", "dotrace", "deftrace"];
+        "defstruct", "struct-map", "assoc"];
 
     CodeMirror.registerHelper("hintWords", "clojure",
         commonAtoms.concat(commonSpecialForms, commonCoreSymbols));
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index 0b02aa4ae9..ff969da1d0 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -278,13 +278,6 @@
         "  [atom :height][bracket )]"
     );
 
-    MT("should indent deftest and testing",
-        "[bracket (][variable deftest] [variable addition]",
-        "  [bracket (][variable testing] [string \"with positive integers\"]",
-        "    [bracket (][variable is] [bracket (][keyword =] [number 4] [bracket (][keyword +] [number 2] [number 2][bracket )))]",
-        "    [bracket (][variable is] [bracket (][keyword =] [number 7] [bracket (][keyword +] [number 3] [number 4][bracket ))))]"
-    );
-
     MT("should indent doseq",
         "[bracket (][keyword doseq] [bracket [[][variable x] [bracket [[][number -1] [number 0] [number 1][bracket ]]]",
         "        [variable y] [bracket [[][number 1] [number 2] [number 3][bracket ]]]]]",

From 0f437b9addb3e4308519d208a606c152d42cf0a2 Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Wed, 5 Sep 2018 12:33:47 -0700
Subject: [PATCH 3823/4742] [dart mode] Add the mixin keyword

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

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 48a427780a..0a66bf168b 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -12,7 +12,7 @@
   "use strict";
 
   var keywords = ("this super static final const abstract class extends external factory " +
-    "implements get native set typedef with enum throw rethrow " +
+    "implements mixin get native set typedef with enum throw rethrow " +
     "assert break case continue default in return new deferred async await covariant " +
     "try catch finally do else for if switch while import library export " +
     "part of show hide is as").split(" ");

From 8b0e32681677c91e05018dfdd3a41b63ce61ac8a Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <aabdurrahman@cj.com>
Date: Tue, 4 Sep 2018 19:17:12 -0700
Subject: [PATCH 3824/4742] [clojure mode] Use a regular expression for
 matching number literals.

Clojure mode is now capable of syntax highlighting all kinds of number
literals in Clojure.
---
 mode/clojure/clojure.js | 47 +++++------------------------------------
 mode/clojure/test.js    | 34 ++++++++++++++++-------------
 2 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 30dc6bdaed..2a37ce0142 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -127,11 +127,8 @@ CodeMirror.defineMode("clojure", function (options) {
     var coreSymbols = makeKeywords(commonCoreSymbols);
     var indentSymbols = makeKeywords(commonIndentSymbols);
 
+    var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
     var tests = {
-        digit: /\d/,
-        hex: /[0-9a-f]/i,
-        sign: /[+-]/,
-        exponent: /e/i,
         keyword_char: /[^\s;()\[\]{}]/,
         symbol: /[\w*+!\-._?:<>\/'\xa1-\uffff]/,
         block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
@@ -151,42 +148,6 @@ CodeMirror.defineMode("clojure", function (options) {
         state.indentStack = state.indentStack.prev;
     }
 
-    function isNumber(ch, stream){
-        // hex
-        if ( ch === '0' && stream.eat(/x/i) ) {
-            stream.eatWhile(tests.hex);
-            return true;
-        }
-
-        // leading sign
-        if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
-          stream.eat(tests.sign);
-          ch = stream.next();
-        }
-
-        if ( tests.digit.test(ch) ) {
-            stream.eat(ch);
-            stream.eatWhile(tests.digit);
-
-            if ( '.' == stream.peek() ) {
-                stream.eat('.');
-                stream.eatWhile(tests.digit);
-            } else if ('/' == stream.peek() ) {
-                stream.eat('/');
-                stream.eatWhile(tests.digit);
-            }
-
-            if ( stream.eat(tests.exponent) ) {
-                stream.eat(tests.sign);
-                stream.eatWhile(tests.digit);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
     // Eat character that starts after backslash \
     function eatCharacter(stream) {
         var first = stream.next();
@@ -236,6 +197,10 @@ CodeMirror.defineMode("clojure", function (options) {
                     returnType = STRING; // continue on in string mode
                     break;
                 default: // default parsing mode
+                    if (stream.match(numberLiteral)) {
+                        return NUMBER;
+                    }
+
                     var ch = stream.next();
 
                     if (ch == "\"") {
@@ -249,8 +214,6 @@ CodeMirror.defineMode("clojure", function (options) {
                     } else if (ch == ";") { // comment
                         stream.skipToEnd(); // rest of the line is a comment
                         returnType = COMMENT;
-                    } else if (isNumber(ch,stream)){
-                        returnType = NUMBER;
                     } else if (ch == "(" || ch == "[" || ch == "{" ) {
                         var keyWord = '', indentTemp = stream.column(), letter;
                         /**
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index ff969da1d0..832f31057f 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -23,23 +23,27 @@
 
     MT("numbers",
         "[number 42] [number +42] [number -421]",
-        // FIXME
-        // "[number 42N] [number +42N] [number -42N]",
+        "[number 42N] [number +42N] [number -42N]",
         "[number 0.42] [number +0.42] [number -0.42]",
-        // FIXME
-        // "[number 42M] [number +42M] [number -42M]",
-        // "[number 42.42M] [number +42.42M] [number -42.42M]",
+        "[number 42M] [number +42M] [number -42M]",
+        "[number 42.42M] [number +42.42M] [number -42.42M]",
         "[number 1/42] [number +1/42] [number -1/42]",
-        "[number 0x420f]",
-        // FIXME
-        // "[number +0x420f] [number -0x420f]",
+        "[number 0x42af] [number +0x42af] [number -0x42af]",
+        "[number 0x42AF] [number +0x42AF] [number -0x42AF]",
         "[number 1e2] [number 1e+2] [number 1e-2]",
         "[number +1e2] [number +1e+2] [number +1e-2]",
         "[number -1e2] [number -1e+2] [number -1e-2]",
-        "[number -1.0e2] [number -0.1e+2] [number -1.01e-2]"
-        // FIXME
-        // "[number 2r101010] [number +2r101010] [number -2r101010]",
-        // "[number 8r52] [number +8r52] [number -8r52]"
+        "[number -1.0e2] [number -0.1e+2] [number -1.01e-2]",
+        "[number 1E2] [number 1E+2] [number 1E-2]",
+        "[number +1E2] [number +1E+2] [number +1E-2]",
+        "[number -1E2] [number -1E+2] [number -1E-2]",
+        "[number -1.0E2] [number -0.1E+2] [number -1.01E-2]",
+        "[number 2r101010] [number +2r101010] [number -2r101010]",
+        "[number 2r101010] [number +2r101010] [number -2r101010]",
+        "[number 8r52] [number +8r52] [number -8r52]",
+        "[number 36rhello] [number +36rhello] [number -36rhello]",
+        "[number 36rz] [number +36rz] [number -36rz]",
+        "[number 36rZ] [number +36rZ] [number -36rZ]"
     );
 
     MT("characters",
@@ -522,15 +526,15 @@
     );
 
     MT("should indent with-precision",
-        "[bracket (][keyword with-precision] [number 10] [bracket (][keyword /] [number 1][variable M] [number 3][bracket ))]",
+        "[bracket (][keyword with-precision] [number 10] [bracket (][keyword /] [number 1M] [number 3][bracket ))]",
         "",
-        "[bracket (][keyword with-precision] [number 10] [atom :rounding] [variable HALF_DOWN] [bracket (][keyword /] [number 1][variable M] [number 3][bracket ))]",
+        "[bracket (][keyword with-precision] [number 10] [atom :rounding] [variable HALF_DOWN] [bracket (][keyword /] [number 1M] [number 3][bracket ))]",
         "",
         "[bracket (][keyword with-precision]",
         "  [number 10]",
         "  [atom :rounding]",
         "  [variable HALF_DOWN]",
-        "  [bracket (][keyword /] [number 1][variable M] [number 3][bracket ))]"
+        "  [bracket (][keyword /] [number 1M] [number 3][bracket ))]"
     );
 
     MT("should indent when",

From 75c14f6ba4ea78c09c133ccd6a04b28e6b81b113 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <abdusalam@live.com>
Date: Mon, 3 Sep 2018 12:19:51 -0700
Subject: [PATCH 3825/4742] [clojure mode] Modernize the style of the example
 code.

[The Clojure Style Guide](https://github.com/bbatsov/clojure-style-guide).
---
 mode/clojure/index.html | 85 ++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 44 deletions(-)

diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index 3361251157..ff9ac3ae62 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -27,63 +27,60 @@
 <article>
 <h2>Clojure mode</h2>
 <form><textarea id="code" name="code">
-; Conway's Game of Life, based on the work of:
-;; Laurent Petit https://gist.github.com/1200343
-;; Christophe Grand http://clj-me.cgrand.net/2011/08/19/conways-game-of-life
+(ns game-of-life
+  "Conway's Game of Life, based on the work of
+  Christophe Grand (http://clj-me.cgrand.net/2011/08/19/conways-game-of-life)
+  and Laurent Petit (https://gist.github.com/1200343).")
 
-(ns ^{:doc "Conway's Game of Life."}
- game-of-life)
+;;; Core game of life's algorithm functions
 
-;; Core game of life's algorithm functions
-
-(defn neighbours
-  "Given a cell's coordinates, returns the coordinates of its neighbours."
+(defn neighbors
+  "Given a cell's coordinates `[x y]`, returns the coordinates of its
+  neighbors."
   [[x y]]
-  (for [dx [-1 0 1] dy (if (zero? dx) [-1 1] [-1 0 1])]
+  (for [dx [-1 0 1]
+        dy (if (zero? dx)
+             [-1 1]
+             [-1 0 1])]
     [(+ dx x) (+ dy y)]))
 
 (defn step
-  "Given a set of living cells, computes the new set of living cells."
+  "Given a set of living `cells`, computes the new set of living cells."
   [cells]
-  (set (for [[cell n] (frequencies (mapcat neighbours cells))
-             :when (or (= n 3) (and (= n 2) (cells cell)))]
+  (set (for [[cell n] (frequencies (mapcat neighbors cells))
+             :when (or (= n 3)
+                       (and (= n 2)
+                            (cells cell)))]
          cell)))
 
-;; Utility methods for displaying game on a text terminal
-
-(defn print-board
-  "Prints a board on *out*, representing a step in the game."
-  [board w h]
-  (doseq [x (range (inc w)) y (range (inc h))]
-    (if (= y 0) (print "\n"))
-    (print (if (board [x y]) "[X]" " . "))))
-
-(defn display-grids
-  "Prints a squence of boards on *out*, representing several steps."
+;;; Utility methods for displaying game on a text terminal
+
+(defn print-grid
+  "Prints a `grid` of `w` columns and `h` rows, on *out*, representing a
+  step in the game."
+  [grid w h]
+  (doseq [x (range (inc w))
+          y (range (inc h))]
+    (when (= y 0) (println))
+    (print (if (grid [x y])
+             "[X]"
+             " . "))))
+
+(defn print-grids
+  "Prints a sequence of `grids` of `w` columns and `h` rows on *out*,
+  representing several steps."
   [grids w h]
-  (doseq [board grids]
-    (print-board board w h)
-    (print "\n")))
-
-;; Launches an example board
-
-(def
-  ^{:doc "board represents the initial set of living cells"}
-   board #{[2 1] [2 2] [2 3]})
-
-(display-grids (take 3 (iterate step board)) 5 5)
+  (doseq [grid grids]
+    (print-grid grid w h)
+    (println)))
 
-;; Let's play with characters
-(println \1 \a \# \\
-         \" \( \newline
-         \} \" \space
-         \tab \return \backspace
-         \u1000 \uAaAa \u9F9F)
+;;; Launches an example grid
 
-;; Let's play with numbers
-(+ 1 -1 1/2 -1/2 -0.5 0.5)
+(def grid
+  "`grid` represents the initial set of living cells"
+  #{[2 1] [2 2] [2 3]})
 
-</textarea></form>
+(print-grids (take 3 (iterate step grid)) 5 5)</textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
           autoCloseBrackets: true,

From 90f484740e6fa692ef2d760fcf68527c900d06d9 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <abdusalam@live.com>
Date: Thu, 6 Sep 2018 01:17:38 -0700
Subject: [PATCH 3826/4742] [clojure mode] The grand refactoring of the Clojure
 mode.

---
 mode/clojure/clojure.js | 504 +++++++++++++++++++---------------------
 mode/clojure/test.js    | 215 +++++++++++------
 2 files changed, 390 insertions(+), 329 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 2a37ce0142..50a55d3bb4 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -1,15 +1,10 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: https://codemirror.net/LICENSE
 
-/**
- * Author: Hans Engel
- * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
- */
-
 (function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
+  if (typeof exports === "object" && typeof module === "object") // CommonJS
     mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
+  else if (typeof define === "function" && define.amd) // AMD
     define(["../../lib/codemirror"], mod);
   else // Plain browser env
     mod(CodeMirror);
@@ -17,267 +12,256 @@
 "use strict";
 
 CodeMirror.defineMode("clojure", function (options) {
-    var ATOM = "atom", BRACKET = "bracket", CHARACTER = "string-2",
-        COMMENT = "comment", CORE_SYMBOL = "keyword", KEYWORD="atom",
-        NUMBER = "number", SPECIAL_FORM = "keyword", STRING = "string",
-        VAR = "variable";
-    var INDENT_WORD_SKIP = options.indentUnit || 2;
-    var NORMAL_INDENT_UNIT = options.indentUnit || 2;
-
-    function makeKeywords(words) {
-        var obj = {};
-        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-        return obj;
-    }
+  var commonAtoms = ["false", "nil", "true"];
+  var commonSpecialForms = [".", "catch", "def", "do", "if", "monitor-enter",
+      "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
+  var commonCoreSymbols = ["*", "*'", "*1", "*2", "*3", "*agent*",
+      "*allow-unresolved-vars*", "*assert*", "*clojure-version*",
+      "*command-line-args*", "*compile-files*", "*compile-path*",
+      "*compiler-options*", "*data-readers*", "*default-data-reader-fn*", "*e",
+      "*err*", "*file*", "*flush-on-newline*", "*fn-loader*", "*in*",
+      "*math-context*", "*ns*", "*out*", "*print-dup*", "*print-length*",
+      "*print-level*", "*print-meta*", "*print-namespace-maps*",
+      "*print-readably*", "*read-eval*", "*reader-resolver*", "*source-path*",
+      "*suppress-read*", "*unchecked-math*", "*use-context-classloader*",
+      "*verbose-defrecords*", "*warn-on-reflection*", "+", "+'", "-", "-'",
+      "->", "->>", "->ArrayChunk", "->Eduction", "->Vec", "->VecNode",
+      "->VecSeq", "-cache-protocol-fn", "-reset-methods", "..", "/", "<", "<=",
+      "=", "==", ">", ">=", "EMPTY-NODE", "Inst", "StackTraceElement->vec",
+      "Throwable->map", "accessor", "aclone", "add-classpath", "add-watch",
+      "agent", "agent-error", "agent-errors", "aget", "alength", "alias",
+      "all-ns", "alter", "alter-meta!", "alter-var-root", "amap", "ancestors",
+      "and", "any?", "apply", "areduce", "array-map", "as->", "aset",
+      "aset-boolean", "aset-byte", "aset-char", "aset-double", "aset-float",
+      "aset-int", "aset-long", "aset-short", "assert", "assoc", "assoc!",
+      "assoc-in", "associative?", "atom", "await", "await-for", "await1",
+      "bases", "bean", "bigdec", "bigint", "biginteger", "binding", "bit-and",
+      "bit-and-not", "bit-clear", "bit-flip", "bit-not", "bit-or", "bit-set",
+      "bit-shift-left", "bit-shift-right", "bit-test", "bit-xor", "boolean",
+      "boolean-array", "boolean?", "booleans", "bound-fn", "bound-fn*",
+      "bound?", "bounded-count", "butlast", "byte", "byte-array", "bytes",
+      "bytes?", "case", "cast", "cat", "char", "char-array",
+      "char-escape-string", "char-name-string", "char?", "chars", "chunk",
+      "chunk-append", "chunk-buffer", "chunk-cons", "chunk-first", "chunk-next",
+      "chunk-rest", "chunked-seq?", "class", "class?", "clear-agent-errors",
+      "clojure-version", "coll?", "comment", "commute", "comp", "comparator",
+      "compare", "compare-and-set!", "compile", "complement", "completing",
+      "concat", "cond", "cond->", "cond->>", "condp", "conj", "conj!", "cons",
+      "constantly", "construct-proxy", "contains?", "count", "counted?",
+      "create-ns", "create-struct", "cycle", "dec", "dec'", "decimal?",
+      "declare", "dedupe", "default-data-readers", "definline", "definterface",
+      "defmacro", "defmethod", "defmulti", "defn", "defn-", "defonce",
+      "defprotocol", "defrecord", "defstruct", "deftype", "delay", "delay?",
+      "deliver", "denominator", "deref", "derive", "descendants", "destructure",
+      "disj", "disj!", "dissoc", "dissoc!", "distinct", "distinct?", "doall",
+      "dorun", "doseq", "dosync", "dotimes", "doto", "double", "double-array",
+      "double?", "doubles", "drop", "drop-last", "drop-while", "eduction",
+      "empty", "empty?", "ensure", "ensure-reduced", "enumeration-seq",
+      "error-handler", "error-mode", "eval", "even?", "every-pred", "every?",
+      "ex-data", "ex-info", "extend", "extend-protocol", "extend-type",
+      "extenders", "extends?", "false?", "ffirst", "file-seq", "filter",
+      "filterv", "find", "find-keyword", "find-ns", "find-protocol-impl",
+      "find-protocol-method", "find-var", "first", "flatten", "float",
+      "float-array", "float?", "floats", "flush", "fn", "fn?", "fnext", "fnil",
+      "for", "force", "format", "frequencies", "future", "future-call",
+      "future-cancel", "future-cancelled?", "future-done?", "future?",
+      "gen-class", "gen-interface", "gensym", "get", "get-in", "get-method",
+      "get-proxy-class", "get-thread-bindings", "get-validator", "group-by",
+      "halt-when", "hash", "hash-combine", "hash-map", "hash-ordered-coll",
+      "hash-set", "hash-unordered-coll", "ident?", "identical?", "identity",
+      "if-let", "if-not", "if-some", "ifn?", "import", "in-ns", "inc", "inc'",
+      "indexed?", "init-proxy", "inst-ms", "inst-ms*", "inst?", "instance?",
+      "int", "int-array", "int?", "integer?", "interleave", "intern",
+      "interpose", "into", "into-array", "ints", "io!", "isa?", "iterate",
+      "iterator-seq", "juxt", "keep", "keep-indexed", "key", "keys", "keyword",
+      "keyword?", "last", "lazy-cat", "lazy-seq", "let", "letfn", "line-seq",
+      "list", "list*", "list?", "load", "load-file", "load-reader",
+      "load-string", "loaded-libs", "locking", "long", "long-array", "longs",
+      "loop", "macroexpand", "macroexpand-1", "make-array", "make-hierarchy",
+      "map", "map-entry?", "map-indexed", "map?", "mapcat", "mapv", "max",
+      "max-key", "memfn", "memoize", "merge", "merge-with", "meta",
+      "method-sig", "methods", "min", "min-key", "mix-collection-hash", "mod",
+      "munge", "name", "namespace", "namespace-munge", "nat-int?", "neg-int?",
+      "neg?", "newline", "next", "nfirst", "nil?", "nnext", "not", "not-any?",
+      "not-empty", "not-every?", "not=", "ns", "ns-aliases", "ns-imports",
+      "ns-interns", "ns-map", "ns-name", "ns-publics", "ns-refers",
+      "ns-resolve", "ns-unalias", "ns-unmap", "nth", "nthnext", "nthrest",
+      "num", "number?", "numerator", "object-array", "odd?", "or", "parents",
+      "partial", "partition", "partition-all", "partition-by", "pcalls", "peek",
+      "persistent!", "pmap", "pop", "pop!", "pop-thread-bindings", "pos-int?",
+      "pos?", "pr", "pr-str", "prefer-method", "prefers",
+      "primitives-classnames", "print", "print-ctor", "print-dup",
+      "print-method", "print-simple", "print-str", "printf", "println",
+      "println-str", "prn", "prn-str", "promise", "proxy",
+      "proxy-call-with-super", "proxy-mappings", "proxy-name", "proxy-super",
+      "push-thread-bindings", "pvalues", "qualified-ident?",
+      "qualified-keyword?", "qualified-symbol?", "quot", "rand", "rand-int",
+      "rand-nth", "random-sample", "range", "ratio?", "rational?",
+      "rationalize", "re-find", "re-groups", "re-matcher", "re-matches",
+      "re-pattern", "re-seq", "read", "read-line", "read-string",
+      "reader-conditional", "reader-conditional?", "realized?", "record?",
+      "reduce", "reduce-kv", "reduced", "reduced?", "reductions", "ref",
+      "ref-history-count", "ref-max-history", "ref-min-history", "ref-set",
+      "refer", "refer-clojure", "reify", "release-pending-sends", "rem",
+      "remove", "remove-all-methods", "remove-method", "remove-ns",
+      "remove-watch", "repeat", "repeatedly", "replace", "replicate", "require",
+      "reset!", "reset-meta!", "reset-vals!", "resolve", "rest",
+      "restart-agent", "resultset-seq", "reverse", "reversible?", "rseq",
+      "rsubseq", "run!", "satisfies?", "second", "select-keys", "send",
+      "send-off", "send-via", "seq", "seq?", "seqable?", "seque", "sequence",
+      "sequential?", "set", "set-agent-send-executor!",
+      "set-agent-send-off-executor!", "set-error-handler!", "set-error-mode!",
+      "set-validator!", "set?", "short", "short-array", "shorts", "shuffle",
+      "shutdown-agents", "simple-ident?", "simple-keyword?", "simple-symbol?",
+      "slurp", "some", "some->", "some->>", "some-fn", "some?", "sort",
+      "sort-by", "sorted-map", "sorted-map-by", "sorted-set", "sorted-set-by",
+      "sorted?", "special-symbol?", "spit", "split-at", "split-with", "str",
+      "string?", "struct", "struct-map", "subs", "subseq", "subvec", "supers",
+      "swap!", "swap-vals!", "symbol", "symbol?", "sync", "tagged-literal",
+      "tagged-literal?", "take", "take-last", "take-nth", "take-while", "test",
+      "the-ns", "thread-bound?", "time", "to-array", "to-array-2d",
+      "trampoline", "transduce", "transient", "tree-seq", "true?", "type",
+      "unchecked-add", "unchecked-add-int", "unchecked-byte", "unchecked-char",
+      "unchecked-dec", "unchecked-dec-int", "unchecked-divide-int",
+      "unchecked-double", "unchecked-float", "unchecked-inc",
+      "unchecked-inc-int", "unchecked-int", "unchecked-long",
+      "unchecked-multiply", "unchecked-multiply-int", "unchecked-negate",
+      "unchecked-negate-int", "unchecked-remainder-int", "unchecked-short",
+      "unchecked-subtract", "unchecked-subtract-int", "underive", "unquote",
+      "unquote-splicing", "unreduced", "unsigned-bit-shift-right", "update",
+      "update-in", "update-proxy", "uri?", "use", "uuid?", "val", "vals",
+      "var-get", "var-set", "var?", "vary-meta", "vec", "vector", "vector-of",
+      "vector?", "volatile!", "volatile?", "vreset!", "vswap!", "when",
+      "when-first", "when-let", "when-not", "when-some", "while",
+      "with-bindings", "with-bindings*", "with-in-str", "with-loading-context",
+      "with-local-vars", "with-meta", "with-open", "with-out-str",
+      "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
+      "zipmap"];
+  var commonIndentSymbols = [
+      "assoc", "binding", "bound-fn", "case", "catch", "comment", "cond",
+      "condp", "def", "defmethod", "defn", "defprotocol", "defrecord",
+      "defstruct", "deftype", "do", "doseq", "dotimes", "doto", "extend",
+      "extend-protocol", "extend-type", "fn", "for", "future", "if", "if-let",
+      "if-not", "let", "letfn", "locking", "loop", "ns", "proxy", "reify",
+      "struct-map", "try", "when", "when-first", "when-let", "when-not",
+      "when-some", "while", "with-open", "with-precision"];
 
-    var commonAtoms = ["false", "nil", "true"];
-    var commonSpecialForms = [".", "catch", "def", "do", "if", "monitor-enter",
-        "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
-    var commonCoreSymbols = ["*", "*'", "*1", "*2", "*3", "*agent*", "*allow-unresolved-vars*", "*assert*",
-        "*clojure-version*", "*command-line-args*", "*compile-files*", "*compile-path*", "*compiler-options*",
-        "*data-readers*", "*default-data-reader-fn*", "*e", "*err*", "*file*", "*flush-on-newline*", "*fn-loader*",
-        "*in*", "*math-context*", "*ns*", "*out*", "*print-dup*", "*print-length*", "*print-level*", "*print-meta*",
-        "*print-namespace-maps*", "*print-readably*", "*read-eval*", "*reader-resolver*", "*source-path*",
-        "*suppress-read*", "*unchecked-math*", "*use-context-classloader*", "*verbose-defrecords*",
-        "*warn-on-reflection*", "+", "+'", "-", "-'", "->", "->>", "->ArrayChunk", "->Eduction", "->Vec", "->VecNode",
-        "->VecSeq", "-cache-protocol-fn", "-reset-methods", "..", "/", "<", "<=", "=", "==", ">", ">=",
-        "EMPTY-NODE", "Inst", "StackTraceElement->vec", "Throwable->map", "accessor", "aclone", "add-classpath",
-        "add-watch", "agent", "agent-error", "agent-errors", "aget", "alength", "alias", "all-ns", "alter",
-        "alter-meta!", "alter-var-root", "amap", "ancestors", "and", "any?", "apply", "areduce", "array-map",
-        "as->", "aset", "aset-boolean", "aset-byte", "aset-char", "aset-double", "aset-float", "aset-int",
-        "aset-long", "aset-short", "assert", "assoc", "assoc!", "assoc-in", "associative?", "atom", "await",
-        "await-for", "await1", "bases", "bean", "bigdec", "bigint", "biginteger", "binding", "bit-and", "bit-and-not",
-        "bit-clear", "bit-flip", "bit-not", "bit-or", "bit-set", "bit-shift-left", "bit-shift-right", "bit-test",
-        "bit-xor", "boolean", "boolean-array", "boolean?", "booleans", "bound-fn", "bound-fn*", "bound?",
-        "bounded-count", "butlast", "byte", "byte-array", "bytes", "bytes?", "case", "cast", "cat", "char",
-        "char-array", "char-escape-string", "char-name-string", "char?", "chars", "chunk", "chunk-append",
-        "chunk-buffer", "chunk-cons", "chunk-first", "chunk-next", "chunk-rest", "chunked-seq?", "class", "class?",
-        "clear-agent-errors", "clojure-version", "coll?", "comment", "commute", "comp", "comparator", "compare",
-        "compare-and-set!", "compile", "complement", "completing", "concat", "cond", "cond->", "cond->>", "condp",
-        "conj", "conj!", "cons", "constantly", "construct-proxy", "contains?", "count", "counted?", "create-ns",
-        "create-struct", "cycle", "dec", "dec'", "decimal?", "declare", "dedupe", "default-data-readers", "definline",
-        "definterface", "defmacro", "defmethod", "defmulti", "defn", "defn-", "defonce", "defprotocol", "defrecord",
-        "defstruct", "deftype", "delay", "delay?", "deliver", "denominator", "deref", "derive", "descendants",
-        "destructure", "disj", "disj!", "dissoc", "dissoc!", "distinct", "distinct?", "doall", "dorun", "doseq",
-        "dosync", "dotimes", "doto", "double", "double-array", "double?", "doubles", "drop", "drop-last", "drop-while",
-        "eduction", "empty", "empty?", "ensure", "ensure-reduced", "enumeration-seq", "error-handler", "error-mode",
-        "eval", "even?", "every-pred", "every?", "ex-data", "ex-info", "extend", "extend-protocol", "extend-type",
-        "extenders", "extends?", "false?", "ffirst", "file-seq", "filter", "filterv", "find", "find-keyword", "find-ns",
-        "find-protocol-impl", "find-protocol-method", "find-var", "first", "flatten", "float", "float-array", "float?",
-        "floats", "flush", "fn", "fn?", "fnext", "fnil", "for", "force", "format", "frequencies", "future", "future-call",
-        "future-cancel", "future-cancelled?", "future-done?", "future?", "gen-class", "gen-interface", "gensym", "get",
-        "get-in", "get-method", "get-proxy-class", "get-thread-bindings", "get-validator", "group-by", "halt-when", "hash",
-        "hash-combine", "hash-map", "hash-ordered-coll", "hash-set", "hash-unordered-coll", "ident?", "identical?",
-        "identity", "if-let", "if-not", "if-some", "ifn?", "import", "in-ns", "inc", "inc'", "indexed?", "init-proxy",
-        "inst-ms", "inst-ms*", "inst?", "instance?", "int", "int-array", "int?", "integer?", "interleave", "intern",
-        "interpose", "into", "into-array", "ints", "io!", "isa?", "iterate", "iterator-seq", "juxt", "keep", "keep-indexed",
-        "key", "keys", "keyword", "keyword?", "last", "lazy-cat", "lazy-seq", "let", "letfn", "line-seq", "list", "list*",
-        "list?", "load", "load-file", "load-reader", "load-string", "loaded-libs", "locking", "long", "long-array", "longs",
-        "loop", "macroexpand", "macroexpand-1", "make-array", "make-hierarchy", "map", "map-entry?", "map-indexed", "map?",
-        "mapcat", "mapv", "max", "max-key", "memfn", "memoize", "merge", "merge-with", "meta", "method-sig", "methods",
-        "min", "min-key", "mix-collection-hash", "mod", "munge", "name", "namespace", "namespace-munge", "nat-int?",
-        "neg-int?", "neg?", "newline", "next", "nfirst", "nil?", "nnext", "not", "not-any?", "not-empty", "not-every?",
-        "not=", "ns", "ns-aliases", "ns-imports", "ns-interns", "ns-map", "ns-name", "ns-publics", "ns-refers", "ns-resolve",
-        "ns-unalias", "ns-unmap", "nth", "nthnext", "nthrest", "num", "number?", "numerator", "object-array", "odd?", "or",
-        "parents", "partial", "partition", "partition-all", "partition-by", "pcalls", "peek", "persistent!", "pmap", "pop",
-        "pop!", "pop-thread-bindings", "pos-int?", "pos?", "pr", "pr-str", "prefer-method", "prefers",
-        "primitives-classnames", "print", "print-ctor", "print-dup", "print-method", "print-simple", "print-str", "printf",
-        "println", "println-str", "prn", "prn-str", "promise", "proxy", "proxy-call-with-super", "proxy-mappings",
-        "proxy-name", "proxy-super", "push-thread-bindings", "pvalues", "qualified-ident?", "qualified-keyword?",
-        "qualified-symbol?", "quot", "rand", "rand-int", "rand-nth", "random-sample", "range", "ratio?", "rational?",
-        "rationalize", "re-find", "re-groups", "re-matcher", "re-matches", "re-pattern", "re-seq", "read", "read-line",
-        "read-string", "reader-conditional", "reader-conditional?", "realized?", "record?", "reduce", "reduce-kv", "reduced",
-        "reduced?", "reductions", "ref", "ref-history-count", "ref-max-history", "ref-min-history", "ref-set", "refer",
-        "refer-clojure", "reify", "release-pending-sends", "rem", "remove", "remove-all-methods", "remove-method", "remove-ns",
-        "remove-watch", "repeat", "repeatedly", "replace", "replicate", "require", "reset!", "reset-meta!", "reset-vals!",
-        "resolve", "rest", "restart-agent", "resultset-seq", "reverse", "reversible?", "rseq", "rsubseq", "run!", "satisfies?",
-        "second", "select-keys", "send", "send-off", "send-via", "seq", "seq?", "seqable?", "seque", "sequence", "sequential?",
-        "set", "set-agent-send-executor!", "set-agent-send-off-executor!", "set-error-handler!", "set-error-mode!",
-        "set-validator!", "set?", "short", "short-array", "shorts", "shuffle", "shutdown-agents", "simple-ident?",
-        "simple-keyword?", "simple-symbol?", "slurp", "some", "some->", "some->>", "some-fn", "some?", "sort", "sort-by",
-        "sorted-map", "sorted-map-by", "sorted-set", "sorted-set-by", "sorted?", "special-symbol?", "spit", "split-at",
-        "split-with", "str", "string?", "struct", "struct-map", "subs", "subseq", "subvec", "supers", "swap!", "swap-vals!",
-        "symbol", "symbol?", "sync", "tagged-literal", "tagged-literal?", "take", "take-last", "take-nth", "take-while", "test",
-        "the-ns", "thread-bound?", "time", "to-array", "to-array-2d", "trampoline", "transduce", "transient", "tree-seq",
-        "true?", "type", "unchecked-add", "unchecked-add-int", "unchecked-byte", "unchecked-char", "unchecked-dec",
-        "unchecked-dec-int", "unchecked-divide-int", "unchecked-double", "unchecked-float", "unchecked-inc", "unchecked-inc-int",
-        "unchecked-int", "unchecked-long", "unchecked-multiply", "unchecked-multiply-int", "unchecked-negate",
-        "unchecked-negate-int", "unchecked-remainder-int", "unchecked-short", "unchecked-subtract", "unchecked-subtract-int",
-        "underive", "unquote", "unquote-splicing", "unreduced", "unsigned-bit-shift-right", "update", "update-in",
-        "update-proxy", "uri?", "use", "uuid?", "val", "vals", "var-get", "var-set", "var?", "vary-meta", "vec", "vector",
-        "vector-of", "vector?", "volatile!", "volatile?", "vreset!", "vswap!", "when", "when-first", "when-let", "when-not",
-        "when-some", "while", "with-bindings", "with-bindings*", "with-in-str", "with-loading-context", "with-local-vars",
-        "with-meta", "with-open", "with-out-str", "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
-        "zipmap"];
-    var commonIndentSymbols = [
-        // Built-ins
-        "ns", "fn", "def", "defn", "defmethod", "bound-fn", "if", "if-not", "case", "condp", "when", "while", "when-not", "when-first", "when-some", "do", "future", "comment", "doto",
-        "locking", "proxy", "with-open", "with-precision", "reify", "deftype", "defrecord", "defprotocol", "extend", "extend-protocol", "extend-type",
-        "try", "catch",
-        // Binding forms
-        "let", "letfn", "binding", "loop", "for", "doseq", "dotimes", "when-let", "if-let",
-        // Data structures
-        "defstruct", "struct-map", "assoc"];
-
-    CodeMirror.registerHelper("hintWords", "clojure",
-        commonAtoms.concat(commonSpecialForms, commonCoreSymbols));
-
-    var atoms = makeKeywords(commonAtoms);
-    var specialForms = makeKeywords(commonSpecialForms);
-    var coreSymbols = makeKeywords(commonCoreSymbols);
-    var indentSymbols = makeKeywords(commonIndentSymbols);
-
-    var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
-    var tests = {
-        keyword_char: /[^\s;()\[\]{}]/,
-        symbol: /[\w*+!\-._?:<>\/'\xa1-\uffff]/,
-        block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
-    };
-
-    function stateStack(indent, type, prev) { // represents a state stack object
-        this.indent = indent;
-        this.type = type;
-        this.prev = prev;
-    }
+  CodeMirror.registerHelper("hintWords", "clojure",
+      commonAtoms.concat(commonSpecialForms, commonCoreSymbols));
+
+  var atom = createLookupMap(commonAtoms);
+  var specialForm = createLookupMap(commonSpecialForms);
+  var coreSymbol = createLookupMap(commonCoreSymbols);
+  var indentSymbol = createLookupMap(commonIndentSymbols);;
+  var assumeBody = /^(?:def|with)[^\/]+$|\/(?:def|with)/;
+  var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
+  var symbol = /[\w*+!\-._?:<>\/'\xa1-\uffff]/;
+
+  var tokenType;
+
+  function base(stream, state) {
+    if (stream.eatSpace()) {tokenType = "space"; return null;}
+    if (stream.match(numberLiteral)) return "number";
+
+    var ch = stream.next();
 
-    function pushStack(state, indent, type) {
-        state.indentStack = new stateStack(indent, type, state.indentStack);
+    if (ch === "\\") {stream.next(); readSymbol(stream); return "string-2";}
+    if (ch === '"') return (state.tokenize = inString)(stream, state);
+    if (ch === "(" || ch === "[" || ch === "{") {tokenType = "open"; return "bracket";}
+    if (ch === ")" || ch === "]" || ch === "}") {tokenType = "close"; return "bracket";}
+    if (ch === ";") {stream.skipToEnd(); tokenType = "space"; return "comment";}
+    if (/['`~@]/.test(ch)) return "atom";
+    if (/[#^]/.test(ch)) return "meta"
+
+    var name = readSymbol(stream);
+    tokenType = "symbol";
+
+    if (atom.propertyIsEnumerable(name) || name.charAt(0) === ":") return "atom";
+    if (specialForm.propertyIsEnumerable(name) ||
+      coreSymbol.propertyIsEnumerable(name)) return "keyword";
+    if (state.lastToken === "(") return "builtin";
+
+    return "variable";
+  }
+
+  function inString(stream, state) {
+    var escaped = false, next;
+
+    while (next = stream.next()) {
+      if (next === '"' && !escaped) { state.tokenize = base; break; }
+      escaped = !escaped && next === "\\";
     }
 
-    function popStack(state) {
-        state.indentStack = state.indentStack.prev;
+    return "string";
+  }
+
+  function readSymbol(stream) {
+    var ch;
+
+    while (ch = stream.next()) {
+      if (ch === "\\") stream.next();
+      else if (!symbol.test(ch)) {stream.backUp(1); break;}
     }
 
-    // Eat character that starts after backslash \
-    function eatCharacter(stream) {
-        var first = stream.next();
-        // Read special literals: backspace, newline, space, return.
-        // Just read all lowercase letters.
-        if (first && first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) {
-            return;
-        }
-        // Read unicode character: \u1000 \uA0a1
-        if (first === "u") {
-            stream.match(/[0-9a-z]{4}/i, true);
+    return stream.current();
+  }
+
+  function createLookupMap(words) {
+    var obj = {};
+
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+
+    return obj;
+  }
+
+  return {
+    startState: function () {
+      return {
+        ctx: {prev: null, start: 0, indentTo: 0},
+        lastToken: null,
+        tokenize: base
+      };
+    },
+
+    token: function (stream, state) {
+      if (stream.sol() && (typeof state.ctx.indentTo !== "number"))
+        state.ctx.indentTo = state.ctx.start + 1;
+
+      tokenType = null;
+      var style = state.tokenize(stream, state);
+
+      if (tokenType != "space") {
+        if (state.lastToken === "(" && state.ctx.indentTo === null) {
+          if (tokenType === "symbol" &&
+              (indentSymbol.propertyIsEnumerable(stream.current()) ||
+               assumeBody.test(stream.current())))
+            state.ctx.indentTo = state.ctx.start + options.indentUnit;
+          else state.ctx.indentTo = "next";
+        } else if (state.ctx.indentTo === "next") {
+          state.ctx.indentTo = stream.column();
         }
-    }
 
-    return {
-        startState: function () {
-            return {
-                indentStack: null,
-                indentation: 0,
-                mode: false
-            };
-        },
-
-        token: function (stream, state) {
-            if (state.indentStack == null && stream.sol()) {
-                // update indentation, but only if indentStack is empty
-                state.indentation = stream.indentation();
-            }
-
-            // skip spaces
-            if (state.mode != "string" && stream.eatSpace()) {
-                return null;
-            }
-            var returnType = null;
-
-            switch(state.mode){
-                case "string": // multi-line string parsing mode
-                    var next, escaped = false;
-                    while ((next = stream.next()) != null) {
-                        if (next == "\"" && !escaped) {
-
-                            state.mode = false;
-                            break;
-                        }
-                        escaped = !escaped && next == "\\";
-                    }
-                    returnType = STRING; // continue on in string mode
-                    break;
-                default: // default parsing mode
-                    if (stream.match(numberLiteral)) {
-                        return NUMBER;
-                    }
-
-                    var ch = stream.next();
-
-                    if (ch == "\"") {
-                        state.mode = "string";
-                        returnType = STRING;
-                    } else if (ch == "\\") {
-                        eatCharacter(stream);
-                        returnType = CHARACTER;
-                    } else if (ch == "'") {
-                        returnType = ATOM;
-                    } else if (ch == ";") { // comment
-                        stream.skipToEnd(); // rest of the line is a comment
-                        returnType = COMMENT;
-                    } else if (ch == "(" || ch == "[" || ch == "{" ) {
-                        var keyWord = '', indentTemp = stream.column(), letter;
-                        /**
-                        Either
-                        (indent-word ..
-                        (non-indent-word ..
-                        (;something else, bracket, etc.
-                        */
-
-                        if (ch == "(") while ((letter = stream.eat(tests.keyword_char)) != null) {
-                            keyWord += letter;
-                        }
-
-                        if (keyWord.length > 0 && (indentSymbols.propertyIsEnumerable(keyWord) ||
-                                                   tests.block_indent.test(keyWord))) { // indent-word
-                            pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
-                        } else { // non-indent word
-                            // we continue eating the spaces
-                            stream.eatSpace();
-                            if (stream.eol() || stream.peek() == ";") {
-                                // nothing significant after
-                                // we restart indentation the user defined spaces after
-                                pushStack(state, indentTemp + NORMAL_INDENT_UNIT, ch);
-                            } else {
-                                pushStack(state, indentTemp + stream.current().length, ch); // else we match
-                            }
-                        }
-                        stream.backUp(stream.current().length - 1); // undo all the eating
-
-                        returnType = BRACKET;
-                    } else if (ch == ")" || ch == "]" || ch == "}") {
-                        returnType = BRACKET;
-                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : (ch == "]" ? "[" :"{"))) {
-                            popStack(state);
-                        }
-                    } else if ( ch == ":" ) {
-                        stream.eatWhile(tests.symbol);
-                        return KEYWORD;
-                    } else {
-                        stream.eatWhile(tests.symbol);
-
-                        if (specialForms && specialForms.propertyIsEnumerable(stream.current())) {
-                            returnType = SPECIAL_FORM;
-                        } else if (coreSymbols && coreSymbols.propertyIsEnumerable(stream.current())) {
-                            returnType = CORE_SYMBOL;
-                        } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
-                            returnType = ATOM;
-                        } else {
-                          returnType = VAR;
-                        }
-                    }
-            }
-
-            return returnType;
-        },
-
-        indent: function (state) {
-            if (state.indentStack == null) return state.indentation;
-            return state.indentStack.indent;
-        },
-
-        closeBrackets: {pairs: "()[]{}\"\""},
-        lineComment: ";;"
-    };
+        state.lastToken = stream.current();
+      }
+
+      if (tokenType === "open")
+        state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
+      else if (tokenType === "close") state.ctx = state.ctx.prev || state.ctx;
+
+      return style;
+    },
+
+    indent: function (state, _textAfter) {
+      var i = state.ctx.indentTo;
+
+      return (typeof i === "number") ?
+        i :
+        state.ctx.start + 1;
+    },
+
+    closeBrackets: {pairs: "()[]{}\"\""},
+    lineComment: ";;"
+  };
 });
 
 CodeMirror.defineMIME("text/x-clojure", "clojure");
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index 832f31057f..ed469ea201 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -80,21 +80,20 @@
         // "[bracket (][comment comment] [comment (][comment foo] [comment 1] [comment 2] [comment 3][comment )][bracket )]"
     );
 
-    // FIXME
-    // MT("whitespaces",
-    //     "[null \u0020]", // space
-    //     "[null \u0009]"  // horizontal tab
-    // );
-
     MT("quotes",
         "[atom '][number 1]",
         "[atom ':foo]",
         "[atom '][string \"foo\"]",
         "[atom '][variable x]",
-        "[atom '][bracket (][variable a] [variable b] [variable c][bracket )]",
+        "[atom '][bracket (][builtin a] [variable b] [variable c][bracket )]",
         "[atom '][bracket [[][variable a] [variable b] [variable c][bracket ]]]",
         "[atom '][bracket {][variable a] [number 1] [atom :foo] [number 2] [variable c] [number 3][bracket }]",
-        "[atom '][variable #][bracket {][variable a] [number 1] [atom :foo][bracket }]"
+        "[atom '][meta #][bracket {][variable a] [number 1] [atom :foo][bracket }]"
+    );
+
+    MT("# and ^",
+        "[meta #]",
+        "[meta ^]"
     );
 
     var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
@@ -185,14 +184,98 @@
         "zipmap"
     ];
 
-    MT("should syntax highlight core symbols as keywords (part 1/2)",
+    MT("should highlight core symbols as keywords (part 1/2)",
         typeTokenPairs("keyword", coreSymbols1)
     );
 
-    MT("should syntax highlight core symbols as keywords (part 2/2)",
+    MT("should highlight core symbols as keywords (part 2/2)",
         typeTokenPairs("keyword", coreSymbols2)
     );
 
+    MT("should indent list literal",
+        "[bracket (][builtin foo] [atom :a] [number 1] [atom true] [atom nil][bracket )]",
+        "",
+        "[bracket (][builtin foo] [atom :a]",
+        "     [number 1]",
+        "     [atom true]",
+        "     [atom nil][bracket )]",
+        "",
+        "[bracket (][builtin foo] [atom :a] [number 1]",
+        "     [atom true]",
+        "     [atom nil][bracket )]",
+        "",
+        "[bracket (]",
+        " [builtin foo]",
+        " [atom :a]",
+        " [number 1]",
+        " [atom true]",
+        " [atom nil][bracket )]",
+        "",
+        "[bracket (][builtin foo] [bracket [[][atom :a][bracket ]]]",
+        "     [number 1]",
+        "     [atom true]",
+        "     [atom nil][bracket )]"
+    );
+
+    MT("should indent vector literal",
+        "[bracket [[][atom :a] [number 1] [atom true] [atom nil][bracket ]]]",
+        "",
+        "[bracket [[][atom :a]",
+        " [number 1]",
+        " [atom true]",
+        " [atom nil][bracket ]]]",
+        "",
+        "[bracket [[][atom :a] [number 1]",
+        " [atom true]",
+        " [atom nil][bracket ]]]",
+        "",
+        "[bracket [[]",
+        " [variable foo]",
+        " [atom :a]",
+        " [number 1]",
+        " [atom true]",
+        " [atom nil][bracket ]]]"
+    );
+
+    MT("should indent map literal",
+        "[bracket {][atom :a] [atom :a] [atom :b] [number 1] [atom :c] [atom true] [atom :d] [atom nil] [bracket }]",
+        "",
+        "[bracket {][atom :a] [atom :a]",
+        " [atom :b] [number 1]",
+        " [atom :c] [atom true]",
+        " [atom :d] [atom nil][bracket }]",
+        "",
+        "[bracket {][atom :a]",
+        " [atom :a]",
+        " [atom :b]",
+        " [number 1]",
+        " [atom :c]",
+        " [atom true]",
+        " [atom :d]",
+        " [atom nil][bracket }]",
+        "",
+        "[bracket {]",
+        " [atom :a] [atom :a]",
+        " [atom :b] [number 1]",
+        " [atom :c] [atom true]",
+        " [atom :d] [atom nil][bracket }]"
+    );
+
+    MT("should indent set literal",
+        "[meta #][bracket {][atom :a] [number 1] [atom true] [atom nil] [bracket }]",
+        "",
+        "[meta #][bracket {][atom :a]",
+        "  [number 1]",
+        "  [atom true]",
+        "  [atom nil][bracket }]",
+        "",
+        "[meta #][bracket {]",
+        "  [atom :a]",
+        "  [number 1]",
+        "  [atom true]",
+        "  [atom nil][bracket }]"
+    );
+
     MT("should indent assoc",
         "[bracket (][keyword assoc] [variable foo]",
         "  [atom :1] [string \"three\"]",
@@ -207,7 +290,7 @@
 
     MT("should indent bound-fn",
         "[bracket (][keyword bound-fn] [bracket [[]]]",
-        "  [bracket (][variable f][bracket ))]"
+        "  [bracket (][builtin f][bracket ))]"
     );
 
     MT("should indent case",
@@ -215,7 +298,7 @@
         "  [string \"\"] [number 0]",
         "  [string \"hello\"] [atom :bar]",
         "  [bracket [[][number 1] [number 2][bracket ]]] [bracket (][string \"my seq\"][bracket )]",
-        "  [bracket (][variable x] [variable y] [variable z][bracket )] [string \"x, y, or z\"]",
+        "  [bracket (][builtin x] [variable y] [variable z][bracket )] [string \"x, y, or z\"]",
         "  [atom :default]"
     );
 
@@ -226,8 +309,8 @@
     );
 
     MT("should indent comment",
-        "[bracket (][keyword comment] [bracket (][variable foo][bracket )]",
-        "  [bracket (][variable bar] [number 1] [number 2] [number 3][bracket ))]"
+        "[bracket (][keyword comment] [bracket (][builtin foo][bracket )]",
+        "  [bracket (][builtin bar] [number 1] [number 2] [number 3][bracket ))]"
     );
 
     MT("should indent cond",
@@ -254,25 +337,25 @@
     MT("should indent defn",
         "[bracket (][keyword defn] [variable foo]",
         "  [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][variable bar] [variable x][bracket ))]",
+        "  [bracket (][builtin bar] [variable x][bracket ))]",
         "",
         "[bracket (][keyword defn] [variable foo] [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][variable bar] [variable x][bracket ))]"
+        "  [bracket (][builtin bar] [variable x][bracket ))]"
     );
 
     MT("should indent defmacro",
         "[bracket (][keyword defmacro] [variable foo]",
         "  [string \"here is an indented doc-string.\"]",
         "  [bracket [[][variable x] [variable y][bracket ]]]",
-        "  [variable `][bracket (][keyword println] [variable ~x] [variable ~@y][bracket ))]"
+        "  [atom `][bracket (][keyword println] [atom ~][variable x] [atom ~@][variable y][bracket ))]"
     );
 
     MT("should indent defmethod",
-        "[bracket (][keyword defmethod] [variable foo] [atom :bar] [bracket [[][variable x][bracket ]]] [bracket (][variable baz] [variable x][bracket ))]",
+        "[bracket (][keyword defmethod] [variable foo] [atom :bar] [bracket [[][variable x][bracket ]]] [bracket (][builtin baz] [variable x][bracket ))]",
         "",
         "[bracket (][keyword defmethod] [variable foo] [atom :bar]",
         "  [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][variable baz] [variable x][bracket ))]"
+        "  [bracket (][builtin baz] [variable x][bracket ))]"
     );
 
     MT("should indent defstruct",
@@ -312,12 +395,12 @@
     );
 
     MT("should indent letfn",
-        "[bracket (][keyword letfn] [bracket [[(][variable twice] [bracket [[][variable x][bracket ]]]",
+        "[bracket (][keyword letfn] [bracket [[(][builtin twice] [bracket [[][variable x][bracket ]]]",
         "               [bracket (][keyword *] [variable x] [number 2][bracket ))]",
-        "        [bracket (][variable six-times] [bracket [[][variable y][bracket ]]]",
-        "                   [bracket (][keyword *] [bracket (][variable twice] [variable y][bracket )] [number 3][bracket ))]]]",
-        "  [bracket (][keyword println] [string \"twice 15 =\"] [bracket (][variable twice] [number 15][bracket ))]]]",
-        "  [bracket (][keyword println] [string \"six times 15 =\"] [bracket (][variable six-times] [number 15][bracket )))]"
+        "        [bracket (][builtin six-times] [bracket [[][variable y][bracket ]]]",
+        "                   [bracket (][keyword *] [bracket (][builtin twice] [variable y][bracket )] [number 3][bracket ))]]]",
+        "  [bracket (][keyword println] [string \"twice 15 =\"] [bracket (][builtin twice] [number 15][bracket ))]",
+        "  [bracket (][keyword println] [string \"six times 15 =\"] [bracket (][builtin six-times] [number 15][bracket )))]"
     );
 
     MT("should indent loop",
@@ -349,9 +432,9 @@
 
     MT("should indent defprotocol",
         "[bracket (][keyword defprotocol] [variable Protocol]",
-        "  [bracket (][variable foo] [bracket [[][variable this][bracket ]])]",
-        "  [bracket (][variable bar] [bracket [[][variable this][bracket ]]] [bracket [[][variable this] [variable x][bracket ]])]",
-        "  [bracket (][variable baz] [bracket [[][variable this][bracket ]]]",
+        "  [bracket (][builtin foo] [bracket [[][variable this][bracket ]])]",
+        "  [bracket (][builtin bar] [bracket [[][variable this][bracket ]]] [bracket [[][variable this] [variable x][bracket ]])]",
+        "  [bracket (][builtin baz] [bracket [[][variable this][bracket ]]]",
         "       [bracket [[][variable this] [variable y][bracket ]]))]"
     );
 
@@ -360,9 +443,9 @@
         "",
         "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]]]",
         "  [variable Protocol]",
-        "  [bracket (][variable foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
-        "  [bracket (][variable bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
-        "  [bracket (][variable baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][keyword str] [variable first-name] [variable last-name][bracket )))]",
+        "  [bracket (][builtin foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
+        "  [bracket (][builtin bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
+        "  [bracket (][builtin baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][keyword str] [variable first-name] [variable last-name][bracket )))]",
         "",
         "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name]",
         "                   [variable last-name]",
@@ -379,9 +462,9 @@
         "",
         "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]]]",
         "  [variable Protocol]",
-        "  [bracket (][variable foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
-        "  [bracket (][variable bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
-        "  [bracket (][variable baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][keyword str] [variable first-name] [variable last-name][bracket )))]",
+        "  [bracket (][builtin foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
+        "  [bracket (][builtin bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
+        "  [bracket (][builtin baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][keyword str] [variable first-name] [variable last-name][bracket )))]",
         "",
         "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name]",
         "                 [variable last-name]",
@@ -394,20 +477,20 @@
     );
 
     MT("should indent do",
-        "[bracket (][keyword do] [bracket (][variable foo][bracket )]",
-        "  [bracket (][variable bar][bracket ))]",
+        "[bracket (][keyword do] [bracket (][builtin foo][bracket )]",
+        "  [bracket (][builtin bar][bracket ))]",
         "",
         "[bracket (][keyword do]",
-        "  [bracket (][variable foo][bracket )]",
-        "  [bracket (][variable bar][bracket ))]"
+        "  [bracket (][builtin foo][bracket )]",
+        "  [bracket (][builtin bar][bracket ))]"
     );
 
     MT("should indent doto",
-        "[bracket (][keyword doto] [bracket (][keyword new] [variable java.util.HashMap][bracket )] [bracket (][variable .put] [string \"a\"] [number 1][bracket )] [bracket (][variable .put] [string \"b\"] [number 2][bracket ))]",
+        "[bracket (][keyword doto] [bracket (][keyword new] [variable java.util.HashMap][bracket )] [bracket (][builtin .put] [string \"a\"] [number 1][bracket )] [bracket (][builtin .put] [string \"b\"] [number 2][bracket ))]",
         "",
-        "[bracket (][keyword doto] [bracket (][variable java.util.HashMap.][bracket )]",
-        "  [bracket (][variable .put] [string \"a\"] [number 1][bracket )]",
-        "  [bracket (][variable .put] [string \"b\"] [number 2][bracket ))]"
+        "[bracket (][keyword doto] [bracket (][builtin java.util.HashMap.][bracket )]",
+        "  [bracket (][builtin .put] [string \"a\"] [number 1][bracket )]",
+        "  [bracket (][builtin .put] [string \"b\"] [number 2][bracket ))]"
     );
 
     MT("should indent extend",
@@ -415,7 +498,7 @@
         "  [variable FooProtocol]",
         "  [bracket {][atom :foo] [variable an-existing-fn]",
         "   [atom :bar] [bracket (][keyword fn] [bracket [[][variable a] [variable b][bracket ]]]",
-        "          [bracket (][variable f] [variable a] [variable b][bracket ))]",
+        "          [bracket (][builtin f] [variable a] [variable b][bracket ))]",
         "   [atom :baz] [bracket (][keyword fn] [bracket ([[][variable a][bracket ]]] [variable a][bracket )]",
         "          [bracket ([[][variable a] [variable b][bracket ]]] [bracket [[][variable a] [variable b][bracket ]]))})]"
     );
@@ -423,38 +506,38 @@
     MT("should indent extend-protocol",
         "[bracket (][keyword extend-protocol] [variable Protocol]",
         "  [variable FooType]",
-        "  [bracket (][variable foo] [bracket [[][variable x][bracket ]]] [bracket (][variable f] [variable x][bracket ))]",
-        "  [bracket (][variable bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][variable g] [variable x] [variable y][bracket ))]"
+        "  [bracket (][builtin foo] [bracket [[][variable x][bracket ]]] [bracket (][builtin f] [variable x][bracket ))]",
+        "  [bracket (][builtin bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][builtin g] [variable x] [variable y][bracket ))]"
     );
 
     MT("should indent extend-type",
         "[bracket (][keyword extend-type] [variable FooType]",
         "  [variable Countable]",
-        "  [bracket (][variable cnt] [bracket [][variable c][bracket ]]] [bracket (][keyword count] [variable c][bracket ))]",
+        "  [bracket (][builtin cnt] [bracket [][variable c][bracket ]]] [bracket (][keyword count] [variable c][bracket ))]",
         "  ",
         "  [variable Foo]",
-        "  [bracket (][variable bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][variable f] [variable x] [variable y][bracket ))]",
-        "  [bracket (][variable baz] [bracket ([][variable x] [variable x][bracket ]])] [bracket ([[][variable x] [variable y] [variable &] [variable zs][bracket ]]] [bracket [[][variable x] [variable y] [bracket (][variable g] [variable zs][bracket )]])))]"
+        "  [bracket (][builtin bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][builtin f] [variable x] [variable y][bracket ))]",
+        "  [bracket (][builtin baz] [bracket ([][variable x] [variable x][bracket ]])] [bracket ([[][variable x] [variable y] [variable &] [variable zs][bracket ]]] [bracket [[][variable x] [variable y] [bracket (][builtin g] [variable zs][bracket )]])))]"
     );
 
     MT("should indent fn",
         "[bracket (][keyword fn] [variable foo]",
         "  [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][variable bar] [variable x][bracket ))]",
+        "  [bracket (][builtin bar] [variable x][bracket ))]",
         "",
         "[bracket (][keyword fn] [variable foo] [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][variable bar] [variable x][bracket ))]"
+        "  [bracket (][builtin bar] [variable x][bracket ))]"
     );
 
     MT("should indent future",
-        "[bracket (][keyword future] [bracket (][variable Thread/sleep] [number 10000][bracket )] [bracket (][keyword println] [string \"done\"][bracket )] [number 100][bracket )]",
+        "[bracket (][keyword future] [bracket (][builtin Thread/sleep] [number 10000][bracket )] [bracket (][keyword println] [string \"done\"][bracket )] [number 100][bracket )]",
         "",
-        "[bracket (][keyword future] [bracket (][variable Thread/sleep] [number 10000][bracket )]",
+        "[bracket (][keyword future] [bracket (][builtin Thread/sleep] [number 10000][bracket )]",
         "  [bracket (][keyword println] [string \"done\"][bracket )]",
         "  [number 100][bracket )]",
         "",
         "[bracket (][keyword future]",
-        "  [bracket (][variable Thread/sleep] [number 10000][bracket )]",
+        "  [bracket (][builtin Thread/sleep] [number 10000][bracket )]",
         "  [bracket (][keyword println] [string \"done\"][bracket )]",
         "  [number 100][bracket )]"
     );
@@ -486,10 +569,10 @@
     );
 
     MT("should indent locking",
-        "[bracket (][keyword locking] [variable foo] [bracket (][variable Thread/sleep] [number 1000][bracket )] [bracket (][keyword println] [string \"done\"][bracket ))]",
+        "[bracket (][keyword locking] [variable foo] [bracket (][builtin Thread/sleep] [number 1000][bracket )] [bracket (][keyword println] [string \"done\"][bracket ))]",
         "",
         "[bracket (][keyword locking] [variable foo]",
-        "  [bracket (][variable Thread/sleep] [number 1000][bracket )]",
+        "  [bracket (][builtin Thread/sleep] [number 1000][bracket )]",
         "  [bracket (][keyword println] [string \"done\"][bracket ))]"
     );
 
@@ -498,31 +581,31 @@
         "  [bracket (][atom :refer-clojure] [atom :exclude] [bracket [][keyword ancestors] [keyword printf][bracket ]])]",
         "  [bracket (][atom :require] [bracket [][variable clojure.contrib] [variable sql] [variable combinatorics][bracket ]])]",
         "  [bracket (][atom :use] [bracket [][variable my.lib] [variable this] [variable that][bracket ]])]",
-        "  [bracket (][atom :import] [bracket (][variable java.util] [variable Date] [variable Timer] [variable Random][bracket )]",
-        "           [bracket (][variable java.sql] [variable Connection] [variable Statement][bracket )))]"
+        "  [bracket (][atom :import] [bracket (][builtin java.util] [variable Date] [variable Timer] [variable Random][bracket )]",
+        "           [bracket (][builtin java.sql] [variable Connection] [variable Statement][bracket )))]"
     );
 
     MT("should indent proxy",
         "[bracket (][keyword proxy] [bracket [][variable MouseAdapter][bracket ]]] [bracket [[]]]",
-        "  [bracket (][variable mousePressed] [bracket [][variable event][bracket ]]]",
+        "  [bracket (][builtin mousePressed] [bracket [][variable event][bracket ]]]",
         "                [bracket (][keyword apply] [variable f] [variable event] [variable args][bracket )))]"
     );
 
     MT("should indent reify",
         "[bracket (][keyword reify] [variable Foo]",
-        "  [bracket (][variable foo] [bracket [[][variable _] [variable x][bracket ]]] [variable x][bracket )]",
-        "  [bracket (][variable foo] [bracket [[][variable _] [variable x] [variable y][bracket ]]] [variable y][bracket ))]"
+        "  [bracket (][builtin foo] [bracket [[][variable _] [variable x][bracket ]]] [variable x][bracket )]",
+        "  [bracket (][builtin foo] [bracket [[][variable _] [variable x] [variable y][bracket ]]] [variable y][bracket ))]"
     );
 
     MT("should indent try",
         "[bracket (][keyword try]",
         "  [bracket (][keyword /] [number 1] [number 0][bracket )]",
-        "  [bracket (][keyword catch] [variable Exception] [variable e] [bracket (][keyword str] [string \"caught exception: \"] [bracket (][variable .getMessage] [variable e][bracket ))))]"
+        "  [bracket (][keyword catch] [variable Exception] [variable e] [bracket (][keyword str] [string \"caught exception: \"] [bracket (][builtin .getMessage] [variable e][bracket ))))]"
     );
 
     MT("should indent with-open",
-        "[bracket (][keyword with-open] [bracket [[][variable out-data] [bracket (][variable io/writer] [variable out-file][bracket )]]]",
-        "  [bracket (][variable csv/write-csv] [variable out-data] [variable out-sos][bracket )))]"
+        "[bracket (][keyword with-open] [bracket [[][variable out-data] [bracket (][builtin io/writer] [variable out-file][bracket )]]]",
+        "  [bracket (][builtin csv/write-csv] [variable out-data] [variable out-sos][bracket )))]"
     );
 
     MT("should indent with-precision",
@@ -568,12 +651,6 @@
     );
 
     function typeTokenPairs(type, tokens) {
-        var pairs = "";
-
-        for (var i = 0; i < tokens.length; i++) {
-            pairs = pairs + "[" + type + " " + tokens[i] + "] ";
-        }
-
-        return pairs;
+        return "[" + type + " " + tokens.join("] [" + type + " ") + "]";
     }
 })();

From 74d420006462d87d36dca73d25a4dd436b2baf5d Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <aabdurrahman@cj.com>
Date: Thu, 6 Sep 2018 10:54:32 -0700
Subject: [PATCH 3827/4742] [clojure mode] Highlight all reader macro
 characters with `meta`.

---
 mode/clojure/clojure.js | 13 ++++++-------
 mode/clojure/test.js    | 30 +++++++++++++++---------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 50a55d3bb4..0abcfafa2c 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -152,10 +152,10 @@ CodeMirror.defineMode("clojure", function (options) {
   var atom = createLookupMap(commonAtoms);
   var specialForm = createLookupMap(commonSpecialForms);
   var coreSymbol = createLookupMap(commonCoreSymbols);
-  var indentSymbol = createLookupMap(commonIndentSymbols);;
+  var indentSymbol = createLookupMap(commonIndentSymbols);
   var assumeBody = /^(?:def|with)[^\/]+$|\/(?:def|with)/;
   var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
-  var symbol = /[\w*+!\-._?:<>\/'\xa1-\uffff]/;
+  var symbol = /[!#'*+\-.\/:<>?_\w\xa1-\uffff]/;
 
   var tokenType;
 
@@ -170,8 +170,7 @@ CodeMirror.defineMode("clojure", function (options) {
     if (ch === "(" || ch === "[" || ch === "{") {tokenType = "open"; return "bracket";}
     if (ch === ")" || ch === "]" || ch === "}") {tokenType = "close"; return "bracket";}
     if (ch === ";") {stream.skipToEnd(); tokenType = "space"; return "comment";}
-    if (/['`~@]/.test(ch)) return "atom";
-    if (/[#^]/.test(ch)) return "meta"
+    if (/[#'@^`~]/.test(ch)) return "meta";
 
     var name = readSymbol(stream);
     tokenType = "symbol";
@@ -179,7 +178,7 @@ CodeMirror.defineMode("clojure", function (options) {
     if (atom.propertyIsEnumerable(name) || name.charAt(0) === ":") return "atom";
     if (specialForm.propertyIsEnumerable(name) ||
       coreSymbol.propertyIsEnumerable(name)) return "keyword";
-    if (state.lastToken === "(") return "builtin";
+    if (state.lastToken === "(") return "builtin";  // head symbol
 
     return "variable";
   }
@@ -230,7 +229,7 @@ CodeMirror.defineMode("clojure", function (options) {
       tokenType = null;
       var style = state.tokenize(stream, state);
 
-      if (tokenType != "space") {
+      if (tokenType !== "space") {
         if (state.lastToken === "(" && state.ctx.indentTo === null) {
           if (tokenType === "symbol" &&
               (indentSymbol.propertyIsEnumerable(stream.current()) ||
@@ -251,7 +250,7 @@ CodeMirror.defineMode("clojure", function (options) {
       return style;
     },
 
-    indent: function (state, _textAfter) {
+    indent: function (state) {
       var i = state.ctx.indentTo;
 
       return (typeof i === "number") ?
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index ed469ea201..843652a13c 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -80,20 +80,20 @@
         // "[bracket (][comment comment] [comment (][comment foo] [comment 1] [comment 2] [comment 3][comment )][bracket )]"
     );
 
-    MT("quotes",
-        "[atom '][number 1]",
-        "[atom ':foo]",
-        "[atom '][string \"foo\"]",
-        "[atom '][variable x]",
-        "[atom '][bracket (][builtin a] [variable b] [variable c][bracket )]",
-        "[atom '][bracket [[][variable a] [variable b] [variable c][bracket ]]]",
-        "[atom '][bracket {][variable a] [number 1] [atom :foo] [number 2] [variable c] [number 3][bracket }]",
-        "[atom '][meta #][bracket {][variable a] [number 1] [atom :foo][bracket }]"
-    );
-
-    MT("# and ^",
-        "[meta #]",
-        "[meta ^]"
+    MT("reader macro characters",
+        "[meta #][variable _]",
+        "[meta @][variable x]",
+        "[meta ^][bracket {][atom :tag] [variable String][bracket }]",
+        "[meta `][bracket (][builtin f] [variable x][bracket )]",
+        "[meta ~][variable foo#]",
+        "[meta '][number 1]",
+        "[meta '][atom :foo]",
+        "[meta '][string \"foo\"]",
+        "[meta '][variable x]",
+        "[meta '][bracket (][builtin a] [variable b] [variable c][bracket )]",
+        "[meta '][bracket [[][variable a] [variable b] [variable c][bracket ]]]",
+        "[meta '][bracket {][variable a] [number 1] [atom :foo] [number 2] [variable c] [number 3][bracket }]",
+        "[meta '#][bracket {][variable a] [number 1] [atom :foo][bracket }]"
     );
 
     var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
@@ -347,7 +347,7 @@
         "[bracket (][keyword defmacro] [variable foo]",
         "  [string \"here is an indented doc-string.\"]",
         "  [bracket [[][variable x] [variable y][bracket ]]]",
-        "  [atom `][bracket (][keyword println] [atom ~][variable x] [atom ~@][variable y][bracket ))]"
+        "  [meta `][bracket (][keyword println] [meta ~][variable x#] [meta ~@][variable y][bracket ))]"
     );
 
     MT("should indent defmethod",

From c6a935cd87463c1ab1377d5bc6efb538f5ab9579 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <aabdurrahman@cj.com>
Date: Thu, 6 Sep 2018 13:48:08 -0700
Subject: [PATCH 3828/4742] [clojure mode] Minor refactoring.

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

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 0abcfafa2c..e51600d64e 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -167,8 +167,8 @@ CodeMirror.defineMode("clojure", function (options) {
 
     if (ch === "\\") {stream.next(); readSymbol(stream); return "string-2";}
     if (ch === '"') return (state.tokenize = inString)(stream, state);
-    if (ch === "(" || ch === "[" || ch === "{") {tokenType = "open"; return "bracket";}
-    if (ch === ")" || ch === "]" || ch === "}") {tokenType = "close"; return "bracket";}
+    if (/[(\[{]/.test(ch)) {tokenType = "open"; return "bracket";}
+    if (/[)\]}]/.test(ch)) {tokenType = "close"; return "bracket";}
     if (ch === ";") {stream.skipToEnd(); tokenType = "space"; return "comment";}
     if (/[#'@^`~]/.test(ch)) return "meta";
 

From 58acfddaf32ee776bf0756c20979dda593a6182c Mon Sep 17 00:00:00 2001
From: Jason Grout <jasongrout@users.noreply.github.com>
Date: Fri, 7 Sep 2018 06:17:18 -0700
Subject: [PATCH 3829/4742] [scala mode] Do not autoclose single quotes

A single quote in scala indicates the start of a symbol literal (like 'x), not a string, so should not be paired with a closing single quote.

See https://www.scala-lang.org/files/archive/spec/2.12/01-lexical-syntax.html#string-literals and https://www.scala-lang.org/files/archive/spec/2.12/01-lexical-syntax.html#symbol-literals for more information.
---
 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 42033bd0a0..480c380419 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -573,7 +573,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         return state.tokenize(stream, state)
       }
     },
-    modeProps: {closeBrackets: {triples: '"'}}
+    modeProps: {closeBrackets: {pairs: '()[]{}""', triples: '"'}}
   });
 
   function tokenKotlinString(tripleString){

From c53b342a06942dad4293c8735f278810fd6ac05b Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <aabdurrahman@cj.com>
Date: Fri, 7 Sep 2018 17:18:45 -0700
Subject: [PATCH 3830/4742] [clojure mode] Unify equality checks for more
 clarity and readability.

---
 mode/clojure/clojure.js | 48 ++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index e51600d64e..75dbe8cc26 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -165,20 +165,19 @@ CodeMirror.defineMode("clojure", function (options) {
 
     var ch = stream.next();
 
-    if (ch === "\\") {stream.next(); readSymbol(stream); return "string-2";}
-    if (ch === '"') return (state.tokenize = inString)(stream, state);
-    if (/[(\[{]/.test(ch)) {tokenType = "open"; return "bracket";}
-    if (/[)\]}]/.test(ch)) {tokenType = "close"; return "bracket";}
-    if (ch === ";") {stream.skipToEnd(); tokenType = "space"; return "comment";}
-    if (/[#'@^`~]/.test(ch)) return "meta";
+    if (is(ch, "\\")) {stream.next(); readSymbol(stream); return "string-2";}
+    if (is(ch, '"')) return (state.tokenize = inString)(stream, state);
+    if (is(ch, /[(\[{]/)) {tokenType = "open"; return "bracket";}
+    if (is(ch, /[)\]}]/)) {tokenType = "close"; return "bracket";}
+    if (is(ch, ";")) {stream.skipToEnd(); tokenType = "space"; return "comment";}
+    if (is(ch, /[#'@^`~]/)) return "meta";
 
     var name = readSymbol(stream);
     tokenType = "symbol";
 
-    if (atom.propertyIsEnumerable(name) || name.charAt(0) === ":") return "atom";
-    if (specialForm.propertyIsEnumerable(name) ||
-      coreSymbol.propertyIsEnumerable(name)) return "keyword";
-    if (state.lastToken === "(") return "builtin";  // head symbol
+    if (is(name, atom) || is(name.charAt(0), ":")) return "atom";
+    if (is(name, specialForm) || is(name, coreSymbol)) return "keyword";
+    if (is(state.lastToken, "(")) return "builtin";  // other head symbol
 
     return "variable";
   }
@@ -187,8 +186,8 @@ CodeMirror.defineMode("clojure", function (options) {
     var escaped = false, next;
 
     while (next = stream.next()) {
-      if (next === '"' && !escaped) { state.tokenize = base; break; }
-      escaped = !escaped && next === "\\";
+      if (is(next, '"') && !escaped) {state.tokenize = base; break;}
+      escaped = !escaped && is(next, "\\");
     }
 
     return "string";
@@ -198,7 +197,7 @@ CodeMirror.defineMode("clojure", function (options) {
     var ch;
 
     while (ch = stream.next()) {
-      if (ch === "\\") stream.next();
+      if (is(ch, "\\")) stream.next();
       else if (!symbol.test(ch)) {stream.backUp(1); break;}
     }
 
@@ -213,6 +212,12 @@ CodeMirror.defineMode("clojure", function (options) {
     return obj;
   }
 
+  function is(name, test) {
+    if (test instanceof RegExp) return test.test(name);
+    if (test instanceof Object) return test.propertyIsEnumerable(name);
+    return name === test;
+  }
+
   return {
     startState: function () {
       return {
@@ -229,23 +234,22 @@ CodeMirror.defineMode("clojure", function (options) {
       tokenType = null;
       var style = state.tokenize(stream, state);
 
-      if (tokenType !== "space") {
-        if (state.lastToken === "(" && state.ctx.indentTo === null) {
-          if (tokenType === "symbol" &&
-              (indentSymbol.propertyIsEnumerable(stream.current()) ||
-               assumeBody.test(stream.current())))
+      if (!is(tokenType, "space")) {
+        if (is(state.lastToken, "(") && is(state.ctx.indentTo, null)) {
+          if (is(tokenType, "symbol") && (is(stream.current(), indentSymbol) ||
+              is(stream.current(), assumeBody)))
             state.ctx.indentTo = state.ctx.start + options.indentUnit;
           else state.ctx.indentTo = "next";
-        } else if (state.ctx.indentTo === "next") {
+        } else if (is(state.ctx.indentTo, "next")) {
           state.ctx.indentTo = stream.column();
         }
 
         state.lastToken = stream.current();
       }
 
-      if (tokenType === "open")
+      if (is(tokenType, "open"))
         state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
-      else if (tokenType === "close") state.ctx = state.ctx.prev || state.ctx;
+      else if (is(tokenType, "close")) state.ctx = state.ctx.prev || state.ctx;
 
       return style;
     },
@@ -253,7 +257,7 @@ CodeMirror.defineMode("clojure", function (options) {
     indent: function (state) {
       var i = state.ctx.indentTo;
 
-      return (typeof i === "number") ?
+      return (is(typeof i, "number")) ?
         i :
         state.ctx.start + 1;
     },

From 3ff38f453d7dc347bc0062f4140720e9bc465250 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <aabdurrahman@cj.com>
Date: Fri, 7 Sep 2018 18:10:17 -0700
Subject: [PATCH 3831/4742] [clojure mode] Highlight forms wrapped by `(comment
 ...)` as `comment`.

This commit partially resolves issues #1896 and #2314 .
---
 mode/clojure/clojure.js | 21 +++++++++++++++++++++
 mode/clojure/test.js    | 10 +++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 75dbe8cc26..a39906edeb 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -175,6 +175,8 @@ CodeMirror.defineMode("clojure", function (options) {
     var name = readSymbol(stream);
     tokenType = "symbol";
 
+    if (is(name, "comment") && is(state.lastToken, "("))
+      return (state.tokenize = inComment)(stream, state);
     if (is(name, atom) || is(name.charAt(0), ":")) return "atom";
     if (is(name, specialForm) || is(name, coreSymbol)) return "keyword";
     if (is(state.lastToken, "(")) return "builtin";  // other head symbol
@@ -193,6 +195,25 @@ CodeMirror.defineMode("clojure", function (options) {
     return "string";
   }
 
+  function inComment(stream, state) {
+    var parenthesisCount = 1;
+    var next;
+
+    while (next = stream.next()) {
+      if (is(next, ")")) parenthesisCount--;
+      if (is(next, "(")) parenthesisCount++;
+      if (is(parenthesisCount, 0)) {
+        stream.backUp(1);
+        state.tokenize = base;
+        break;
+      }
+    }
+
+    tokenType = "ws";
+
+    return "comment";
+  }
+
   function readSymbol(stream) {
     var ch;
 
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index 843652a13c..57ec80d017 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -75,9 +75,9 @@
 
     MT("comments",
         "[comment ; this is an in-line comment.]",
-        "[comment ;; this is a line comment.]"
-        // FIXME
-        // "[bracket (][comment comment] [comment (][comment foo] [comment 1] [comment 2] [comment 3][comment )][bracket )]"
+        "[comment ;; this is a line comment.]",
+        "[keyword comment]",
+        "[bracket (][comment comment (foo 1 2 3)][bracket )]"
     );
 
     MT("reader macro characters",
@@ -309,8 +309,8 @@
     );
 
     MT("should indent comment",
-        "[bracket (][keyword comment] [bracket (][builtin foo][bracket )]",
-        "  [bracket (][builtin bar] [number 1] [number 2] [number 3][bracket ))]"
+        "[bracket (][comment comment (foo)]",
+        "[comment  (bar 1 2 3)][bracket )]"
     );
 
     MT("should indent cond",

From a38047a68b0405710a2c2a37e0fefb4a6fcb6398 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <abdusalam@live.com>
Date: Sat, 8 Sep 2018 11:31:04 -0700
Subject: [PATCH 3832/4742] [clojure mode] Use `===` instead of `is` for
 equality checks.

---
 mode/clojure/clojure.js | 52 ++++++++++++++++++++---------------------
 mode/clojure/test.js    |  6 +++++
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index a39906edeb..54935c1285 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -165,21 +165,21 @@ CodeMirror.defineMode("clojure", function (options) {
 
     var ch = stream.next();
 
-    if (is(ch, "\\")) {stream.next(); readSymbol(stream); return "string-2";}
-    if (is(ch, '"')) return (state.tokenize = inString)(stream, state);
+    if (ch === "\\") {stream.next(); readSymbol(stream); return "string-2";}
+    if (ch === '"') return (state.tokenize = inString)(stream, state);
     if (is(ch, /[(\[{]/)) {tokenType = "open"; return "bracket";}
     if (is(ch, /[)\]}]/)) {tokenType = "close"; return "bracket";}
-    if (is(ch, ";")) {stream.skipToEnd(); tokenType = "space"; return "comment";}
+    if (ch === ";") {stream.skipToEnd(); tokenType = "space"; return "comment";}
     if (is(ch, /[#'@^`~]/)) return "meta";
 
     var name = readSymbol(stream);
     tokenType = "symbol";
 
-    if (is(name, "comment") && is(state.lastToken, "("))
+    if (name === "comment" && state.lastToken === "(")
       return (state.tokenize = inComment)(stream, state);
-    if (is(name, atom) || is(name.charAt(0), ":")) return "atom";
+    if (is(name, atom) || name.charAt(0) === ":") return "atom";
     if (is(name, specialForm) || is(name, coreSymbol)) return "keyword";
-    if (is(state.lastToken, "(")) return "builtin";  // other head symbol
+    if (state.lastToken === "(") return "builtin";  // other head symbol
 
     return "variable";
   }
@@ -188,8 +188,8 @@ CodeMirror.defineMode("clojure", function (options) {
     var escaped = false, next;
 
     while (next = stream.next()) {
-      if (is(next, '"') && !escaped) {state.tokenize = base; break;}
-      escaped = !escaped && is(next, "\\");
+      if (next === '"' && !escaped) {state.tokenize = base; break;}
+      escaped = !escaped && next === "\\";
     }
 
     return "string";
@@ -200,9 +200,9 @@ CodeMirror.defineMode("clojure", function (options) {
     var next;
 
     while (next = stream.next()) {
-      if (is(next, ")")) parenthesisCount--;
-      if (is(next, "(")) parenthesisCount++;
-      if (is(parenthesisCount, 0)) {
+      if (next === ")") parenthesisCount--;
+      if (next === "(") parenthesisCount++;
+      if (parenthesisCount === 0) {
         stream.backUp(1);
         state.tokenize = base;
         break;
@@ -218,8 +218,8 @@ CodeMirror.defineMode("clojure", function (options) {
     var ch;
 
     while (ch = stream.next()) {
-      if (is(ch, "\\")) stream.next();
-      else if (!symbol.test(ch)) {stream.backUp(1); break;}
+      if (ch === "\\") stream.next();
+      else if (!is(ch, symbol)) {stream.backUp(1); break;}
     }
 
     return stream.current();
@@ -233,10 +233,9 @@ CodeMirror.defineMode("clojure", function (options) {
     return obj;
   }
 
-  function is(name, test) {
-    if (test instanceof RegExp) return test.test(name);
-    if (test instanceof Object) return test.propertyIsEnumerable(name);
-    return name === test;
+  function is(value, test) {
+    if (test instanceof RegExp) return test.test(value);
+    if (test instanceof Object) return test.propertyIsEnumerable(value);
   }
 
   return {
@@ -254,23 +253,24 @@ CodeMirror.defineMode("clojure", function (options) {
 
       tokenType = null;
       var style = state.tokenize(stream, state);
+      var currentToken = stream.current();
 
-      if (!is(tokenType, "space")) {
-        if (is(state.lastToken, "(") && is(state.ctx.indentTo, null)) {
-          if (is(tokenType, "symbol") && (is(stream.current(), indentSymbol) ||
-              is(stream.current(), assumeBody)))
+      if (tokenType !== "space") {
+        if (state.lastToken === "(" && state.ctx.indentTo === null) {
+          if (tokenType === "symbol" && (is(currentToken, indentSymbol) ||
+              is(currentToken, assumeBody)))
             state.ctx.indentTo = state.ctx.start + options.indentUnit;
           else state.ctx.indentTo = "next";
-        } else if (is(state.ctx.indentTo, "next")) {
+        } else if (state.ctx.indentTo === "next") {
           state.ctx.indentTo = stream.column();
         }
 
-        state.lastToken = stream.current();
+        state.lastToken = currentToken;
       }
 
-      if (is(tokenType, "open"))
+      if (tokenType === "open")
         state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
-      else if (is(tokenType, "close")) state.ctx = state.ctx.prev || state.ctx;
+      else if (tokenType === "close") state.ctx = state.ctx.prev || state.ctx;
 
       return style;
     },
@@ -278,7 +278,7 @@ CodeMirror.defineMode("clojure", function (options) {
     indent: function (state) {
       var i = state.ctx.indentTo;
 
-      return (is(typeof i, "number")) ?
+      return (typeof i === "number") ?
         i :
         state.ctx.start + 1;
     },
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index 57ec80d017..386cf963d8 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -650,6 +650,12 @@
         "    [bracket (][keyword println] [variable b][bracket )))]"
     );
 
+    MT("should indent deftest and similar forms that assume body parameter",
+        "[bracket (][builtin clojure.test/deftest] [variable foo-test]",
+        "  [bracket (][builtin testing] [string \"that foo should work\"]",
+        "           [bracket (][builtin is] [bracket (][keyword =] [atom :baz] [bracket (][builtin foo] [atom :bar][bracket )))))]"
+    );
+
     function typeTokenPairs(type, tokens) {
         return "[" + type + " " + tokens.join("] [" + type + " ") + "]";
     }

From 2787836372a5e465956d991b8ea8fb1abdb11363 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <abdusalam@live.com>
Date: Sun, 9 Sep 2018 19:27:31 -0700
Subject: [PATCH 3833/4742] [clojure mode] Get rid of a shared, mutable
 variable `tokenType`,

---
 mode/clojure/clojure.js | 50 +++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 54935c1285..2e04f6e7ec 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -157,31 +157,28 @@ CodeMirror.defineMode("clojure", function (options) {
   var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
   var symbol = /[!#'*+\-.\/:<>?_\w\xa1-\uffff]/;
 
-  var tokenType;
-
   function base(stream, state) {
-    if (stream.eatSpace()) {tokenType = "space"; return null;}
-    if (stream.match(numberLiteral)) return "number";
+    if (stream.eatSpace()) return ["space", null];
+    if (stream.match(numberLiteral)) return [null, "number"];
 
     var ch = stream.next();
 
-    if (ch === "\\") {stream.next(); readSymbol(stream); return "string-2";}
+    if (ch === "\\") {stream.next(); readSymbol(stream); return [null, "string-2"];}
     if (ch === '"') return (state.tokenize = inString)(stream, state);
-    if (is(ch, /[(\[{]/)) {tokenType = "open"; return "bracket";}
-    if (is(ch, /[)\]}]/)) {tokenType = "close"; return "bracket";}
-    if (ch === ";") {stream.skipToEnd(); tokenType = "space"; return "comment";}
-    if (is(ch, /[#'@^`~]/)) return "meta";
+    if (is(ch, /[(\[{]/)) return ["open", "bracket"];
+    if (is(ch, /[)\]}]/)) return ["close", "bracket"];
+    if (ch === ";") {stream.skipToEnd(); return ["space", "comment"];}
+    if (is(ch, /[#'@^`~]/)) return [null, "meta"];
 
     var name = readSymbol(stream);
-    tokenType = "symbol";
 
     if (name === "comment" && state.lastToken === "(")
       return (state.tokenize = inComment)(stream, state);
-    if (is(name, atom) || name.charAt(0) === ":") return "atom";
-    if (is(name, specialForm) || is(name, coreSymbol)) return "keyword";
-    if (state.lastToken === "(") return "builtin";  // other head symbol
+    if (is(name, atom) || name.charAt(0) === ":") return ["symbol", "atom"];
+    if (is(name, specialForm) || is(name, coreSymbol)) return ["symbol", "keyword"];
+    if (state.lastToken === "(") return ["symbol", "builtin"]; // other operator
 
-    return "variable";
+    return ["symbol", "variable"];
   }
 
   function inString(stream, state) {
@@ -192,7 +189,7 @@ CodeMirror.defineMode("clojure", function (options) {
       escaped = !escaped && next === "\\";
     }
 
-    return "string";
+    return [null, "string"];
   }
 
   function inComment(stream, state) {
@@ -209,9 +206,7 @@ CodeMirror.defineMode("clojure", function (options) {
       }
     }
 
-    tokenType = "ws";
-
-    return "comment";
+    return ["space", "comment"];
   }
 
   function readSymbol(stream) {
@@ -251,26 +246,27 @@ CodeMirror.defineMode("clojure", function (options) {
       if (stream.sol() && (typeof state.ctx.indentTo !== "number"))
         state.ctx.indentTo = state.ctx.start + 1;
 
-      tokenType = null;
-      var style = state.tokenize(stream, state);
-      var currentToken = stream.current();
+      var typeStylePair = state.tokenize(stream, state);
+      var type = typeStylePair[0];
+      var style = typeStylePair[1];
+      var current = stream.current();
 
-      if (tokenType !== "space") {
+      if (type !== "space") {
         if (state.lastToken === "(" && state.ctx.indentTo === null) {
-          if (tokenType === "symbol" && (is(currentToken, indentSymbol) ||
-              is(currentToken, assumeBody)))
+          if (type === "symbol" &&
+            (is(current, indentSymbol) || is(current, assumeBody)))
             state.ctx.indentTo = state.ctx.start + options.indentUnit;
           else state.ctx.indentTo = "next";
         } else if (state.ctx.indentTo === "next") {
           state.ctx.indentTo = stream.column();
         }
 
-        state.lastToken = currentToken;
+        state.lastToken = current;
       }
 
-      if (tokenType === "open")
+      if (type === "open")
         state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
-      else if (tokenType === "close") state.ctx = state.ctx.prev || state.ctx;
+      else if (type === "close") state.ctx = state.ctx.prev || state.ctx;
 
       return style;
     },

From c3d8336d22f47000a629c1a7c7a0976efa428782 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <abdusalam@live.com>
Date: Sun, 9 Sep 2018 20:04:35 -0700
Subject: [PATCH 3834/4742] [clojure mode] Use whitelist for indenting forms
 with body parameter.

The current regular expression-based heuristics erroneously matches
symbols that don't necessary have body parameter (e.g., `default-for`).
---
 mode/clojure/clojure.js | 34 ++++++++++++++++------------------
 mode/clojure/test.js    |  6 ------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 2e04f6e7ec..5bf91359ac 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -12,10 +12,10 @@
 "use strict";
 
 CodeMirror.defineMode("clojure", function (options) {
-  var commonAtoms = ["false", "nil", "true"];
-  var commonSpecialForms = [".", "catch", "def", "do", "if", "monitor-enter",
+  var atoms = ["false", "nil", "true"];
+  var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
       "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
-  var commonCoreSymbols = ["*", "*'", "*1", "*2", "*3", "*agent*",
+  var coreSymbols = ["*", "*'", "*1", "*2", "*3", "*agent*",
       "*allow-unresolved-vars*", "*assert*", "*clojure-version*",
       "*command-line-args*", "*compile-files*", "*compile-path*",
       "*compiler-options*", "*data-readers*", "*default-data-reader-fn*", "*e",
@@ -137,23 +137,22 @@ CodeMirror.defineMode("clojure", function (options) {
       "with-local-vars", "with-meta", "with-open", "with-out-str",
       "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
       "zipmap"];
-  var commonIndentSymbols = [
+  var formsThatHaveBodyParameter = [
       "assoc", "binding", "bound-fn", "case", "catch", "comment", "cond",
-      "condp", "def", "defmethod", "defn", "defprotocol", "defrecord",
-      "defstruct", "deftype", "do", "doseq", "dotimes", "doto", "extend",
-      "extend-protocol", "extend-type", "fn", "for", "future", "if", "if-let",
-      "if-not", "let", "letfn", "locking", "loop", "ns", "proxy", "reify",
-      "struct-map", "try", "when", "when-first", "when-let", "when-not",
-      "when-some", "while", "with-open", "with-precision"];
+      "condp", "def", "defmethod", "defn", "defmacro", "defprotocol",
+      "defrecord", "defstruct", "deftype", "do", "doseq", "dotimes", "doto",
+      "extend", "extend-protocol", "extend-type", "fn", "for", "future", "if",
+      "if-let", "if-not", "let", "letfn", "locking", "loop", "ns", "proxy",
+      "reify", "struct-map", "try", "when", "when-first", "when-let",
+      "when-not", "when-some", "while", "with-open", "with-precision"];
 
   CodeMirror.registerHelper("hintWords", "clojure",
-      commonAtoms.concat(commonSpecialForms, commonCoreSymbols));
+    [].concat(atoms, specialForms, coreSymbols));
 
-  var atom = createLookupMap(commonAtoms);
-  var specialForm = createLookupMap(commonSpecialForms);
-  var coreSymbol = createLookupMap(commonCoreSymbols);
-  var indentSymbol = createLookupMap(commonIndentSymbols);
-  var assumeBody = /^(?:def|with)[^\/]+$|\/(?:def|with)/;
+  var atom = createLookupMap(atoms);
+  var specialForm = createLookupMap(specialForms);
+  var coreSymbol = createLookupMap(coreSymbols);
+  var hasBodyParameter = createLookupMap(formsThatHaveBodyParameter);
   var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
   var symbol = /[!#'*+\-.\/:<>?_\w\xa1-\uffff]/;
 
@@ -253,8 +252,7 @@ CodeMirror.defineMode("clojure", function (options) {
 
       if (type !== "space") {
         if (state.lastToken === "(" && state.ctx.indentTo === null) {
-          if (type === "symbol" &&
-            (is(current, indentSymbol) || is(current, assumeBody)))
+          if (type === "symbol" && is(current, hasBodyParameter))
             state.ctx.indentTo = state.ctx.start + options.indentUnit;
           else state.ctx.indentTo = "next";
         } else if (state.ctx.indentTo === "next") {
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index 386cf963d8..57ec80d017 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -650,12 +650,6 @@
         "    [bracket (][keyword println] [variable b][bracket )))]"
     );
 
-    MT("should indent deftest and similar forms that assume body parameter",
-        "[bracket (][builtin clojure.test/deftest] [variable foo-test]",
-        "  [bracket (][builtin testing] [string \"that foo should work\"]",
-        "           [bracket (][builtin is] [bracket (][keyword =] [atom :baz] [bracket (][builtin foo] [atom :bar][bracket )))))]"
-    );
-
     function typeTokenPairs(type, tokens) {
         return "[" + type + " " + tokens.join("] [" + type + " ") + "]";
     }

From cf4a4a4d0a31e614c5adce4a6ca7334df4cb1c8f Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <abdusalam@live.com>
Date: Sun, 9 Sep 2018 20:31:06 -0700
Subject: [PATCH 3835/4742] [clojure mode] Add a few other forms that have body
 parameter.

---
 mode/clojure/clojure.js |  15 +-
 mode/clojure/test.js    | 402 +++-------------------------------------
 2 files changed, 36 insertions(+), 381 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 5bf91359ac..cb4b375ece 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -138,13 +138,14 @@ CodeMirror.defineMode("clojure", function (options) {
       "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
       "zipmap"];
   var formsThatHaveBodyParameter = [
-      "assoc", "binding", "bound-fn", "case", "catch", "comment", "cond",
-      "condp", "def", "defmethod", "defn", "defmacro", "defprotocol",
-      "defrecord", "defstruct", "deftype", "do", "doseq", "dotimes", "doto",
-      "extend", "extend-protocol", "extend-type", "fn", "for", "future", "if",
-      "if-let", "if-not", "let", "letfn", "locking", "loop", "ns", "proxy",
-      "reify", "struct-map", "try", "when", "when-first", "when-let",
-      "when-not", "when-some", "while", "with-open", "with-precision"];
+      "binding", "bound-fn", "case", "catch", "comment", "cond", "cond->",
+      "cond->>", "condp", "def", "definterface", "defmethod", "defn",
+      "defmacro", "defprotocol", "defrecord", "defstruct", "deftype", "do",
+      "doseq", "dotimes", "doto", "extend", "extend-protocol", "extend-type",
+      "fn", "for", "future", "if", "if-let", "if-not", "if-some", "let",
+      "letfn", "locking", "loop", "ns", "proxy", "reify", "struct-map", "try",
+      "when", "when-first", "when-let", "when-not", "when-some", "while",
+      "with-open", "with-precision"];
 
   CodeMirror.registerHelper("hintWords", "clojure",
     [].concat(atoms, specialForms, coreSymbols));
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index 57ec80d017..e6954cb095 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -192,7 +192,7 @@
         typeTokenPairs("keyword", coreSymbols2)
     );
 
-    MT("should indent list literal",
+    MT("should properly indent forms in list literals",
         "[bracket (][builtin foo] [atom :a] [number 1] [atom true] [atom nil][bracket )]",
         "",
         "[bracket (][builtin foo] [atom :a]",
@@ -217,7 +217,7 @@
         "     [atom nil][bracket )]"
     );
 
-    MT("should indent vector literal",
+    MT("should properly indent forms in vector literals",
         "[bracket [[][atom :a] [number 1] [atom true] [atom nil][bracket ]]]",
         "",
         "[bracket [[][atom :a]",
@@ -237,7 +237,7 @@
         " [atom nil][bracket ]]]"
     );
 
-    MT("should indent map literal",
+    MT("should properly indent forms in map literals",
         "[bracket {][atom :a] [atom :a] [atom :b] [number 1] [atom :c] [atom true] [atom :d] [atom nil] [bracket }]",
         "",
         "[bracket {][atom :a] [atom :a]",
@@ -261,7 +261,7 @@
         " [atom :d] [atom nil][bracket }]"
     );
 
-    MT("should indent set literal",
+    MT("should properly indent forms in set literals",
         "[meta #][bracket {][atom :a] [number 1] [atom true] [atom nil] [bracket }]",
         "",
         "[meta #][bracket {][atom :a]",
@@ -276,378 +276,32 @@
         "  [atom nil][bracket }]"
     );
 
-    MT("should indent assoc",
-        "[bracket (][keyword assoc] [variable foo]",
-        "  [atom :1] [string \"three\"]",
-        "  [atom :2] [string \"two\"]",
-        "  [atom :3] [string \"three\"][bracket )]"
-    );
-
-    MT("should indent binding",
-        "[bracket (][keyword binding] [bracket [[][variable foo] [number 2]",
-        "          [variable *bar*] [number 3][bracket ]]]",
-        "  [bracket (][keyword +] [variable foo] [variable *bar*][bracket ))]");
-
-    MT("should indent bound-fn",
-        "[bracket (][keyword bound-fn] [bracket [[]]]",
-        "  [bracket (][builtin f][bracket ))]"
-    );
-
-    MT("should indent case",
-        "[bracket (][keyword case] [variable foo]",
-        "  [string \"\"] [number 0]",
-        "  [string \"hello\"] [atom :bar]",
-        "  [bracket [[][number 1] [number 2][bracket ]]] [bracket (][string \"my seq\"][bracket )]",
-        "  [bracket (][builtin x] [variable y] [variable z][bracket )] [string \"x, y, or z\"]",
-        "  [atom :default]"
-    );
-
-    MT("should indent catch",
-        "[bracket (][keyword catch] [variable Exception] [variable e]",
-        "  [bracket (][keyword println] [string \"Some other exception, won't be caught in this case...\"][bracket )]",
-        "  [number 666][bracket )]"
-    );
-
-    MT("should indent comment",
-        "[bracket (][comment comment (foo)]",
-        "[comment  (bar 1 2 3)][bracket )]"
-    );
-
-    MT("should indent cond",
-        "[bracket (][keyword cond]",
-        "  [bracket (][keyword <] [variable n] [number 0][bracket )] [string \"negative\"]",
-        "  [bracket (][keyword >] [variable n] [number 0][bracket )] [string \"positive\"]",
-        "  [atom :else] [string \"zero\"][bracket ))]"
-    );
-
-    MT("should indent condp",
-        "[bracket (][keyword condp] [keyword =] [variable foo]",
-        "  [number 1] [string \"one\"]",
-        "  [number 2] [string \"two\"]",
-        "  [number 3] [string \"three\"]",
-        "  [string \"unexpected value\"][bracket )]"
-    );
-
-    MT("should indent def",
-        "[bracket (][keyword def] [variable x]",
-        "  [string \"here is an indented doc-string.\"]",
-        "  [number 1][bracket )]"
-    );
-
-    MT("should indent defn",
-        "[bracket (][keyword defn] [variable foo]",
-        "  [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][builtin bar] [variable x][bracket ))]",
-        "",
-        "[bracket (][keyword defn] [variable foo] [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][builtin bar] [variable x][bracket ))]"
-    );
-
-    MT("should indent defmacro",
-        "[bracket (][keyword defmacro] [variable foo]",
-        "  [string \"here is an indented doc-string.\"]",
-        "  [bracket [[][variable x] [variable y][bracket ]]]",
-        "  [meta `][bracket (][keyword println] [meta ~][variable x#] [meta ~@][variable y][bracket ))]"
-    );
-
-    MT("should indent defmethod",
-        "[bracket (][keyword defmethod] [variable foo] [atom :bar] [bracket [[][variable x][bracket ]]] [bracket (][builtin baz] [variable x][bracket ))]",
-        "",
-        "[bracket (][keyword defmethod] [variable foo] [atom :bar]",
-        "  [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][builtin baz] [variable x][bracket ))]"
-    );
-
-    MT("should indent defstruct",
-        "[bracket (][keyword defstruct] [variable person]",
-        "  [atom :name]",
-        "  [atom :age]",
-        "  [atom :height][bracket )]"
-    );
-
-    MT("should indent doseq",
-        "[bracket (][keyword doseq] [bracket [[][variable x] [bracket [[][number -1] [number 0] [number 1][bracket ]]]",
-        "        [variable y] [bracket [[][number 1] [number 2] [number 3][bracket ]]]]]",
-        "  [bracket (][keyword prn] [bracket (][keyword *] [variable x] [variable y][bracket )))]"
-    );
-
-    MT("should indent dotimes",
-        "[bracket (][keyword dotimes] [bracket [[][variable n] [number 5][bracket ]]]",
-        "  [bracket (][keyword println] [string \"n is\"] [variable n][bracket ))]");
-
-    MT("should indent for",
-        "[bracket (][keyword for] [bracket [[][variable x] [bracket [[][number 1] [number 2] [number 3][bracket ]]]",
-        "      [atom :let] [bracket [[][variable y] [bracket (][keyword *] [variable x] [number 3][bracket )]]]",
-        "      [atom :when] [bracket (][keyword even?] [variable y][bracket )]]]",
-        "  [variable y][bracket )]"
-    );
-
-    MT("should indent if-let",
-        "[bracket (][keyword if-let] [bracket [[][variable x] [variable foo][bracket ]]]",
-        "  [string \"then\"]",
-        "  [string \"else\"][bracket ))]"
-    );
-
-    MT("should indent let",
-        "[bracket (][keyword let] [bracket [[][variable foo] [number 2]",
-        "      [variable bar] [number 3][bracket ]]]",
-        "  [bracket (][keyword +] [variable foo] [variable *bar*][bracket ))]"
-    );
-
-    MT("should indent letfn",
-        "[bracket (][keyword letfn] [bracket [[(][builtin twice] [bracket [[][variable x][bracket ]]]",
-        "               [bracket (][keyword *] [variable x] [number 2][bracket ))]",
-        "        [bracket (][builtin six-times] [bracket [[][variable y][bracket ]]]",
-        "                   [bracket (][keyword *] [bracket (][builtin twice] [variable y][bracket )] [number 3][bracket ))]]]",
-        "  [bracket (][keyword println] [string \"twice 15 =\"] [bracket (][builtin twice] [number 15][bracket ))]",
-        "  [bracket (][keyword println] [string \"six times 15 =\"] [bracket (][builtin six-times] [number 15][bracket )))]"
-    );
-
-    MT("should indent loop",
-        "[bracket (][keyword loop] [bracket [[][variable foo] [number 2]",
-        "       [variable bar] [number 3][bracket ]]]",
-        "  [bracket (][keyword +] [variable foo] [variable *bar*][bracket ))]"
-    );
-
-    MT("should indent when-first",
-        "[bracket (][keyword when-first] [bracket [[][variable a] [bracket [[][number 1] [number 2] [number 3][bracket ]]]]]",
-        "  [variable a][bracket )]"
-    );
-
-    MT("should indent when-let",
-        "[bracket (][keyword when-let] [bracket [[][variable x] [variable foo][bracket ]]]",
-        "  [string \"foo\"]"
-    );
-
-    MT("should indent when-some",
-        "[bracket (][keyword when-some] [bracket [[][variable x] [variable foo][bracket ]]]",
-        "  [string \"foo\"]"
-    );
-
-    MT("should indent struct-map",
-        "[bracket (][keyword struct-map] [variable foo]",
-        "  [atom :1] [string \"one\"]",
-        "  [atom :2] [string \"two\"][bracket )]"
-    );
-
-    MT("should indent defprotocol",
-        "[bracket (][keyword defprotocol] [variable Protocol]",
-        "  [bracket (][builtin foo] [bracket [[][variable this][bracket ]])]",
-        "  [bracket (][builtin bar] [bracket [[][variable this][bracket ]]] [bracket [[][variable this] [variable x][bracket ]])]",
-        "  [bracket (][builtin baz] [bracket [[][variable this][bracket ]]]",
-        "       [bracket [[][variable this] [variable y][bracket ]]))]"
-    );
-
-    MT("should indent defrecord",
-        "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]])]",
-        "",
-        "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]]]",
-        "  [variable Protocol]",
-        "  [bracket (][builtin foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
-        "  [bracket (][builtin bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
-        "  [bracket (][builtin baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][keyword str] [variable first-name] [variable last-name][bracket )))]",
-        "",
-        "[bracket (][keyword defrecord] [variable Person] [bracket [[][variable first-name]",
-        "                   [variable last-name]",
-        "                   [variable address][bracket ]])]",
-        "",
-        "[bracket (][keyword defrecord] [variable Person]",
-        "  [bracket [[][variable first-name]",
-        "   [variable last-name]",
-        "   [variable address][bracket ]])]"
-    );
-
-    MT("should indent deftype",
-        "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]])]",
-        "",
-        "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name] [variable last-name] [variable address][bracket ]]]",
-        "  [variable Protocol]",
-        "  [bracket (][builtin foo] [bracket [[][variable this][bracket ]]] [variable first-name][bracket )]",
-        "  [bracket (][builtin bar] [bracket [[][variable this][bracket ]]] [variable last-name][bracket )]",
-        "  [bracket (][builtin baz] [bracket [[][variable this] [variable y][bracket ]]] [bracket (][keyword str] [variable first-name] [variable last-name][bracket )))]",
-        "",
-        "[bracket (][keyword deftype] [variable Person] [bracket [[][variable first-name]",
-        "                 [variable last-name]",
-        "                 [variable address][bracket ]])]",
-        "",
-        "[bracket (][keyword deftype] [variable Person]",
-        "  [bracket [[][variable first-name]",
-        "   [variable last-name]",
-        "   [variable address][bracket ]])]"
-    );
-
-    MT("should indent do",
-        "[bracket (][keyword do] [bracket (][builtin foo][bracket )]",
-        "  [bracket (][builtin bar][bracket ))]",
-        "",
-        "[bracket (][keyword do]",
-        "  [bracket (][builtin foo][bracket )]",
-        "  [bracket (][builtin bar][bracket ))]"
-    );
-
-    MT("should indent doto",
-        "[bracket (][keyword doto] [bracket (][keyword new] [variable java.util.HashMap][bracket )] [bracket (][builtin .put] [string \"a\"] [number 1][bracket )] [bracket (][builtin .put] [string \"b\"] [number 2][bracket ))]",
-        "",
-        "[bracket (][keyword doto] [bracket (][builtin java.util.HashMap.][bracket )]",
-        "  [bracket (][builtin .put] [string \"a\"] [number 1][bracket )]",
-        "  [bracket (][builtin .put] [string \"b\"] [number 2][bracket ))]"
-    );
-
-    MT("should indent extend",
-        "[bracket (][keyword extend] [variable FooType]",
-        "  [variable FooProtocol]",
-        "  [bracket {][atom :foo] [variable an-existing-fn]",
-        "   [atom :bar] [bracket (][keyword fn] [bracket [[][variable a] [variable b][bracket ]]]",
-        "          [bracket (][builtin f] [variable a] [variable b][bracket ))]",
-        "   [atom :baz] [bracket (][keyword fn] [bracket ([[][variable a][bracket ]]] [variable a][bracket )]",
-        "          [bracket ([[][variable a] [variable b][bracket ]]] [bracket [[][variable a] [variable b][bracket ]]))})]"
-    );
-
-    MT("should indent extend-protocol",
-        "[bracket (][keyword extend-protocol] [variable Protocol]",
-        "  [variable FooType]",
-        "  [bracket (][builtin foo] [bracket [[][variable x][bracket ]]] [bracket (][builtin f] [variable x][bracket ))]",
-        "  [bracket (][builtin bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][builtin g] [variable x] [variable y][bracket ))]"
-    );
-
-    MT("should indent extend-type",
-        "[bracket (][keyword extend-type] [variable FooType]",
-        "  [variable Countable]",
-        "  [bracket (][builtin cnt] [bracket [][variable c][bracket ]]] [bracket (][keyword count] [variable c][bracket ))]",
-        "  ",
-        "  [variable Foo]",
-        "  [bracket (][builtin bar] [bracket [[][variable x] [variable y][bracket ]]] [bracket (][builtin f] [variable x] [variable y][bracket ))]",
-        "  [bracket (][builtin baz] [bracket ([][variable x] [variable x][bracket ]])] [bracket ([[][variable x] [variable y] [variable &] [variable zs][bracket ]]] [bracket [[][variable x] [variable y] [bracket (][builtin g] [variable zs][bracket )]])))]"
-    );
-
-    MT("should indent fn",
-        "[bracket (][keyword fn] [variable foo]",
-        "  [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][builtin bar] [variable x][bracket ))]",
-        "",
-        "[bracket (][keyword fn] [variable foo] [bracket [[][variable x][bracket ]]]",
-        "  [bracket (][builtin bar] [variable x][bracket ))]"
-    );
-
-    MT("should indent future",
-        "[bracket (][keyword future] [bracket (][builtin Thread/sleep] [number 10000][bracket )] [bracket (][keyword println] [string \"done\"][bracket )] [number 100][bracket )]",
-        "",
-        "[bracket (][keyword future] [bracket (][builtin Thread/sleep] [number 10000][bracket )]",
-        "  [bracket (][keyword println] [string \"done\"][bracket )]",
-        "  [number 100][bracket )]",
-        "",
-        "[bracket (][keyword future]",
-        "  [bracket (][builtin Thread/sleep] [number 10000][bracket )]",
-        "  [bracket (][keyword println] [string \"done\"][bracket )]",
-        "  [number 100][bracket )]"
-    );
-
-    MT("should indent if",
-        "[bracket (][keyword if] [bracket (][keyword <] [variable foo] [number 100][bracket )] [string \"yes\"] [string \"no\"][bracket )]",
-        "",
-        "[bracket (][keyword if] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
-        "  [string \"yes\"]",
-        "  [string \"no\"][bracket )]",
-        "",
-        "[bracket (][keyword if] [bracket (][keyword and] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
-        "         [bracket (][keyword <] [variable bar] [number 50][bracket ))]",
-        "  [string \"yes\"]",
-        "  [string \"no\"][bracket )]"
-    );
-
-    MT("should indent if-not",
-        "[bracket (][keyword if-not] [bracket (][keyword <] [variable foo] [number 100][bracket )] [string \"yes\"] [string \"no\"][bracket )]",
-        "",
-        "[bracket (][keyword if-not] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
-        "  [string \"yes\"]",
-        "  [string \"no\"][bracket )]",
-        "",
-        "[bracket (][keyword if-not] [bracket (][keyword and] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
-        "             [bracket (][keyword <] [variable bar] [number 50][bracket ))]",
-        "  [string \"yes\"]",
-        "  [string \"no\"][bracket )]"
-    );
-
-    MT("should indent locking",
-        "[bracket (][keyword locking] [variable foo] [bracket (][builtin Thread/sleep] [number 1000][bracket )] [bracket (][keyword println] [string \"done\"][bracket ))]",
-        "",
-        "[bracket (][keyword locking] [variable foo]",
-        "  [bracket (][builtin Thread/sleep] [number 1000][bracket )]",
-        "  [bracket (][keyword println] [string \"done\"][bracket ))]"
-    );
-
-    MT("should indent ns",
-        "[bracket (][keyword ns] [variable foo.bar]",
-        "  [bracket (][atom :refer-clojure] [atom :exclude] [bracket [][keyword ancestors] [keyword printf][bracket ]])]",
-        "  [bracket (][atom :require] [bracket [][variable clojure.contrib] [variable sql] [variable combinatorics][bracket ]])]",
-        "  [bracket (][atom :use] [bracket [][variable my.lib] [variable this] [variable that][bracket ]])]",
-        "  [bracket (][atom :import] [bracket (][builtin java.util] [variable Date] [variable Timer] [variable Random][bracket )]",
-        "           [bracket (][builtin java.sql] [variable Connection] [variable Statement][bracket )))]"
-    );
-
-    MT("should indent proxy",
-        "[bracket (][keyword proxy] [bracket [][variable MouseAdapter][bracket ]]] [bracket [[]]]",
-        "  [bracket (][builtin mousePressed] [bracket [][variable event][bracket ]]]",
-        "                [bracket (][keyword apply] [variable f] [variable event] [variable args][bracket )))]"
-    );
-
-    MT("should indent reify",
-        "[bracket (][keyword reify] [variable Foo]",
-        "  [bracket (][builtin foo] [bracket [[][variable _] [variable x][bracket ]]] [variable x][bracket )]",
-        "  [bracket (][builtin foo] [bracket [[][variable _] [variable x] [variable y][bracket ]]] [variable y][bracket ))]"
-    );
-
-    MT("should indent try",
-        "[bracket (][keyword try]",
-        "  [bracket (][keyword /] [number 1] [number 0][bracket )]",
-        "  [bracket (][keyword catch] [variable Exception] [variable e] [bracket (][keyword str] [string \"caught exception: \"] [bracket (][builtin .getMessage] [variable e][bracket ))))]"
-    );
-
-    MT("should indent with-open",
-        "[bracket (][keyword with-open] [bracket [[][variable out-data] [bracket (][builtin io/writer] [variable out-file][bracket )]]]",
-        "  [bracket (][builtin csv/write-csv] [variable out-data] [variable out-sos][bracket )))]"
-    );
-
-    MT("should indent with-precision",
-        "[bracket (][keyword with-precision] [number 10] [bracket (][keyword /] [number 1M] [number 3][bracket ))]",
-        "",
-        "[bracket (][keyword with-precision] [number 10] [atom :rounding] [variable HALF_DOWN] [bracket (][keyword /] [number 1M] [number 3][bracket ))]",
-        "",
-        "[bracket (][keyword with-precision]",
-        "  [number 10]",
-        "  [atom :rounding]",
-        "  [variable HALF_DOWN]",
-        "  [bracket (][keyword /] [number 1M] [number 3][bracket ))]"
-    );
-
-    MT("should indent when",
-        "[bracket (][keyword when] [bracket (][keyword <] [variable foo] [number 100][bracket )] [string \"yes\"][bracket )]",
-        "",
-        "[bracket (][keyword when] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
-        "  [string \"yes\"][bracket )]",
-        "",
-        "[bracket (][keyword when] [bracket (][keyword and] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
-        "           [bracket (][keyword <] [variable bar] [number 50][bracket ))]",
-        "  [string \"yes\"][bracket )]"
-    );
+    var formsThatHaveBodyParameter = [
+        "binding", "bound-fn", "case", "catch", "cond", "cond->",
+        "cond->>", "condp", "def", "definterface", "defmethod", "defn",
+        "defmacro", "defprotocol", "defrecord", "defstruct", "deftype", "do",
+        "doseq", "dotimes", "doto", "extend", "extend-protocol", "extend-type",
+        "fn", "for", "future", "if", "if-let", "if-not", "if-some", "let",
+        "letfn", "locking", "loop", "ns", "proxy", "reify", "struct-map", "try",
+        "when", "when-first", "when-let", "when-not", "when-some", "while",
+        "with-open", "with-precision"];
+
+    function testFormsThatHaveBodyParameter(forms) {
+        for (var i = 0; i < forms.length; i++) {
+            MT("should indent body argument of `" + forms[i] + "` by `options.indentUnit` spaces",
+                "[bracket (][keyword " + forms[i] + "] [variable foo] [variable bar]",
+                "  [variable baz]",
+                "  [variable qux][bracket )]"
+            );
+        }
+    }
 
-    MT("should indent when-not",
-        "[bracket (][keyword when-not] [bracket (][keyword <] [variable foo] [number 100][bracket )] [string \"no\"][bracket )]",
-        "",
-        "[bracket (][keyword when-not] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
-        "  [string \"no\"][bracket )]",
-        "",
-        "[bracket (][keyword when-not] [bracket (][keyword and] [bracket (][keyword <] [variable foo] [number 100][bracket )]",
-        "               [bracket (][keyword <] [variable bar] [number 50][bracket ))]",
-        "  [string \"no\"][bracket )]"
-    );
+    testFormsThatHaveBodyParameter(formsThatHaveBodyParameter);
 
-    MT("should indent while",
-        "[bracket (][keyword while] [variable foo] [bracket (][keyword do] [bracket (][keyword println] [variable a][bracket )] [bracket (][keyword println] [variable b][bracket )))]",
-        "",
-        "[bracket (][keyword while] [variable foo]",
-        "  [bracket (][keyword do] [bracket (][keyword println] [variable a][bracket )]",
-        "    [bracket (][keyword println] [variable b][bracket )))]"
+    MT("should indent body argument of `comment` by `options.indentUnit` spaces",
+        "[bracket (][comment comment foo bar]",
+        "[comment  baz]",
+        "[comment  qux][bracket )]"
     );
 
     function typeTokenPairs(type, tokens) {

From 069fa57869eac183a6ce268b31c2c317e948efdb Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <abdusalam@live.com>
Date: Sun, 9 Sep 2018 22:46:56 -0700
Subject: [PATCH 3836/4742] [clojure mode] Rename variables for clarity.

---
 mode/clojure/clojure.js | 16 ++++++++--------
 mode/clojure/test.js    |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index cb4b375ece..9c05ecbd7a 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -137,7 +137,7 @@ CodeMirror.defineMode("clojure", function (options) {
       "with-local-vars", "with-meta", "with-open", "with-out-str",
       "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
       "zipmap"];
-  var formsThatHaveBodyParameter = [
+  var haveBodyParameter = [
       "binding", "bound-fn", "case", "catch", "comment", "cond", "cond->",
       "cond->>", "condp", "def", "definterface", "defmethod", "defn",
       "defmacro", "defprotocol", "defrecord", "defstruct", "deftype", "do",
@@ -153,9 +153,9 @@ CodeMirror.defineMode("clojure", function (options) {
   var atom = createLookupMap(atoms);
   var specialForm = createLookupMap(specialForms);
   var coreSymbol = createLookupMap(coreSymbols);
-  var hasBodyParameter = createLookupMap(formsThatHaveBodyParameter);
+  var hasBodyParameter = createLookupMap(haveBodyParameter);
   var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
-  var symbol = /[!#'*+\-.\/:<>?_\w\xa1-\uffff]/;
+  var symbolCharacter = /[!#'*+\-.\/:<>?_\w\xa1-\uffff]/;
 
   function base(stream, state) {
     if (stream.eatSpace()) return ["space", null];
@@ -170,12 +170,12 @@ CodeMirror.defineMode("clojure", function (options) {
     if (ch === ";") {stream.skipToEnd(); return ["space", "comment"];}
     if (is(ch, /[#'@^`~]/)) return [null, "meta"];
 
-    var name = readSymbol(stream);
+    var symbol = readSymbol(stream);
 
-    if (name === "comment" && state.lastToken === "(")
+    if (symbol === "comment" && state.lastToken === "(")
       return (state.tokenize = inComment)(stream, state);
-    if (is(name, atom) || name.charAt(0) === ":") return ["symbol", "atom"];
-    if (is(name, specialForm) || is(name, coreSymbol)) return ["symbol", "keyword"];
+    if (is(symbol, atom) || symbol.charAt(0) === ":") return ["symbol", "atom"];
+    if (is(symbol, specialForm) || is(symbol, coreSymbol)) return ["symbol", "keyword"];
     if (state.lastToken === "(") return ["symbol", "builtin"]; // other operator
 
     return ["symbol", "variable"];
@@ -214,7 +214,7 @@ CodeMirror.defineMode("clojure", function (options) {
 
     while (ch = stream.next()) {
       if (ch === "\\") stream.next();
-      else if (!is(ch, symbol)) {stream.backUp(1); break;}
+      else if (!is(ch, symbolCharacter)) {stream.backUp(1); break;}
     }
 
     return stream.current();
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index e6954cb095..c4d7719df0 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -276,7 +276,7 @@
         "  [atom nil][bracket }]"
     );
 
-    var formsThatHaveBodyParameter = [
+    var haveBodyParameter = [
         "binding", "bound-fn", "case", "catch", "cond", "cond->",
         "cond->>", "condp", "def", "definterface", "defmethod", "defn",
         "defmacro", "defprotocol", "defrecord", "defstruct", "deftype", "do",
@@ -296,7 +296,7 @@
         }
     }
 
-    testFormsThatHaveBodyParameter(formsThatHaveBodyParameter);
+    testFormsThatHaveBodyParameter(haveBodyParameter);
 
     MT("should indent body argument of `comment` by `options.indentUnit` spaces",
         "[bracket (][comment comment foo bar]",

From af3bd4315201b8f7aeb9a73daf3a3d1c6bd1818f Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <aabdurrahman@cj.com>
Date: Mon, 10 Sep 2018 10:33:54 -0700
Subject: [PATCH 3837/4742] [clojure mode] Add other friends with body
 parameter to indentation list.

---
 mode/clojure/clojure.js | 18 ++++++++++--------
 mode/clojure/test.js    | 12 +++++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 9c05ecbd7a..c4a5132dc5 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -138,14 +138,16 @@ CodeMirror.defineMode("clojure", function (options) {
       "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
       "zipmap"];
   var haveBodyParameter = [
-      "binding", "bound-fn", "case", "catch", "comment", "cond", "cond->",
-      "cond->>", "condp", "def", "definterface", "defmethod", "defn",
-      "defmacro", "defprotocol", "defrecord", "defstruct", "deftype", "do",
-      "doseq", "dotimes", "doto", "extend", "extend-protocol", "extend-type",
-      "fn", "for", "future", "if", "if-let", "if-not", "if-some", "let",
-      "letfn", "locking", "loop", "ns", "proxy", "reify", "struct-map", "try",
-      "when", "when-first", "when-let", "when-not", "when-some", "while",
-      "with-open", "with-precision"];
+      "->", "->>", "as->", "binding", "bound-fn", "case", "catch", "comment",
+      "cond", "cond->", "cond->>", "condp", "def", "definterface", "defmethod",
+      "defn", "defmacro", "defprotocol", "defrecord", "defstruct", "deftype",
+      "do", "doseq", "dotimes", "doto", "extend", "extend-protocol",
+      "extend-type", "fn", "for", "future", "if", "if-let", "if-not", "if-some",
+      "let", "letfn", "locking", "loop", "ns", "proxy", "reify", "struct-map",
+      "some->", "some->>", "try", "when", "when-first", "when-let", "when-not",
+      "when-some", "while", "with-bindings", "with-bindings*", "with-in-str",
+      "with-loading-context", "with-local-vars", "with-meta", "with-open",
+      "with-out-str", "with-precision", "with-redefs", "with-redefs-fn"];
 
   CodeMirror.registerHelper("hintWords", "clojure",
     [].concat(atoms, specialForms, coreSymbols));
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index c4d7719df0..e9e35a48c2 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -277,14 +277,16 @@
     );
 
     var haveBodyParameter = [
-        "binding", "bound-fn", "case", "catch", "cond", "cond->",
-        "cond->>", "condp", "def", "definterface", "defmethod", "defn",
+        "->", "->>", "as->", "binding", "bound-fn", "case", "catch", "cond",
+        "cond->", "cond->>", "condp", "def", "definterface", "defmethod", "defn",
         "defmacro", "defprotocol", "defrecord", "defstruct", "deftype", "do",
         "doseq", "dotimes", "doto", "extend", "extend-protocol", "extend-type",
         "fn", "for", "future", "if", "if-let", "if-not", "if-some", "let",
-        "letfn", "locking", "loop", "ns", "proxy", "reify", "struct-map", "try",
-        "when", "when-first", "when-let", "when-not", "when-some", "while",
-        "with-open", "with-precision"];
+        "letfn", "locking", "loop", "ns", "proxy", "reify", "some->", "some->>",
+        "struct-map", "try", "when", "when-first", "when-let", "when-not",
+        "when-some", "while", "with-bindings", "with-bindings*", "with-in-str",
+        "with-loading-context", "with-local-vars", "with-meta", "with-open",
+        "with-out-str", "with-precision", "with-redefs", "with-redefs-fn"];
 
     function testFormsThatHaveBodyParameter(forms) {
         for (var i = 0; i < forms.length; i++) {

From ab3e78afb0bc7f0bf56a2038539b2853715e38aa Mon Sep 17 00:00:00 2001
From: David Santana <santanavidda@gmail.com>
Date: Tue, 11 Sep 2018 23:38:30 -0700
Subject: [PATCH 3838/4742] [gruvbox-dark theme] Update colors

The colors were off for certain words in c++ and Java so this is to correct those mistakes.
---
 theme/gruvbox-dark.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/theme/gruvbox-dark.css b/theme/gruvbox-dark.css
index 01ca7bb724..ded215f570 100644
--- a/theme/gruvbox-dark.css
+++ b/theme/gruvbox-dark.css
@@ -12,7 +12,7 @@
 .cm-s-gruvbox-dark .CodeMirror-linenumber {color: #7c6f64;}
 .cm-s-gruvbox-dark .CodeMirror-cursor { border-left: 1px solid #ebdbb2; }
 .cm-s-gruvbox-dark div.CodeMirror-selected { background: #928374; }
-.cm-s-gruvbox-dark span.cm-meta { color: #808000; }
+.cm-s-gruvbox-dark span.cm-meta { color: #83a598; }
 
 .cm-s-gruvbox-dark span.cm-comment { color: #928374; }
 .cm-s-gruvbox-dark span.cm-number, span.cm-atom { color: #d3869b; }
@@ -20,15 +20,18 @@
 
 .cm-s-gruvbox-dark span.cm-variable { color: #ebdbb2; }
 .cm-s-gruvbox-dark span.cm-variable-2 { color: #ebdbb2; }
-.cm-s-gruvbox-dark span.cm-variable-3, .cm-s-gruvbox-dark span.cm-type { color: black; }
+.cm-s-gruvbox-dark span.cm-variable-3, .cm-s-gruvbox-dark span.cm-type { color: #fabd2f; }
 .cm-s-gruvbox-dark span.cm-operator { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-callee { color: #ebdbb2; }
 .cm-s-gruvbox-dark span.cm-def { color: #ebdbb2; }
+.cm-s-gruvbox-dark span.cm-property { color: #ebdbb2; }
 .cm-s-gruvbox-dark span.cm-string { color: #b8bb26; }
 .cm-s-gruvbox-dark span.cm-string-2 { color: #8ec07c; }
-.cm-s-gruvbox-dark span.cm-qualifier { color: #555; }
+.cm-s-gruvbox-dark span.cm-qualifier { color: #8ec07c; }
 .cm-s-gruvbox-dark span.cm-attribute { color: #8ec07c; }
 
 .cm-s-gruvbox-dark .CodeMirror-activeline-background { background: #3c3836; }
 .cm-s-gruvbox-dark .CodeMirror-matchingbracket { background: #928374; color:#282828 !important; }
 
 .cm-s-gruvbox-dark span.cm-builtin { color: #fe8019; }
+.cm-s-gruvbox-dark span.cm-tag { color: #fe8019; }

From 17e60f277b89465a11479f1679509aade5e21e82 Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <finalfantasia@users.noreply.github.com>
Date: Thu, 13 Sep 2018 00:49:11 -0700
Subject: [PATCH 3839/4742] [clojure mode] More accurate symbol tokenizing

---
 mode/clojure/clojure.js |  2 +-
 mode/clojure/test.js    | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index c4a5132dc5..7d9e50fdc4 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -157,7 +157,7 @@ CodeMirror.defineMode("clojure", function (options) {
   var coreSymbol = createLookupMap(coreSymbols);
   var hasBodyParameter = createLookupMap(haveBodyParameter);
   var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
-  var symbolCharacter = /[!#'*+\-.\/:<>?_\w\xa1-\uffff]/;
+  var symbolCharacter = /[!#$&'*+\-.\/:<=>?_|\w\xa1-\uffff]/;
 
   function base(stream, state) {
     if (stream.eatSpace()) return ["space", null];
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index e9e35a48c2..d17856cb6e 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -9,8 +9,8 @@
     }
 
     MT("atoms",
-        "[atom nil]",
         "[atom false]",
+        "[atom nil]",
         "[atom true]"
     );
 
@@ -62,7 +62,8 @@
         "[string-2 \\tab]",
         "[string-2 \\u1000]",
         "[string-2 \\uAaAa]",
-        "[string-2 \\u9F9F]"
+        "[string-2 \\u9F9F]",
+        "[string-2 \\o123]"
     );
 
     MT("strings",
@@ -82,6 +83,9 @@
 
     MT("reader macro characters",
         "[meta #][variable _]",
+        "[meta #][variable -Inf]",
+        "[meta ##][variable Inf]",
+        "[meta ##][variable NaN]",
         "[meta @][variable x]",
         "[meta ^][bracket {][atom :tag] [variable String][bracket }]",
         "[meta `][bracket (][builtin f] [variable x][bracket )]",
@@ -96,6 +100,32 @@
         "[meta '#][bracket {][variable a] [number 1] [atom :foo][bracket }]"
     );
 
+    MT("symbols",
+      "[variable foo!]",
+      "[variable foo#]",
+      "[variable foo$]",
+      "[variable foo&]",
+      "[variable foo']",
+      "[variable foo*]",
+      "[variable foo+]",
+      "[variable foo-]",
+      "[variable foo.]",
+      "[variable foo/bar]",
+      "[variable foo:bar]",
+      "[variable foo<]",
+      "[variable foo=]",
+      "[variable foo>]",
+      "[variable foo?]",
+      "[variable foo_]",
+      "[variable foo|]",
+      "[variable foobarBaz]",
+      "[variable foo¡]",
+      "[variable 符号]",
+      "[variable シンボル]",
+      "[variable ئۇيغۇر]",
+      "[variable 🙂❤🇺🇸]"
+    );
+
     var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
         "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
 

From 72c708df19873c150286382b4f09a1bb01adaf21 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 15 Sep 2018 10:43:30 +0200
Subject: [PATCH 3840/4742] Fix a typo in the manual

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

diff --git a/doc/manual.html b/doc/manual.html
index e0aad80227..fdfb627169 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2321,7 +2321,7 @@ <h2 id="addons">Addons</h2>
       a <code>{line, ch}</code> object, or can be left off to default
       to the start of the document. <code>options</code> is an
       optional object, which can contain the property `caseFold:
-      false` to disable case folding when mathing a string, or the
+      false` to disable case folding when matching a string, or the
       property `multiline: disable` to disable multi-line matching for
       regular expressions (which may help performance). A search
       cursor has the following methods:

From 9f00e4dad788032043feebb82aed0ba140b1f19e Mon Sep 17 00:00:00 2001
From: Abdussalam Abdurrahman <finalfantasia@users.noreply.github.com>
Date: Tue, 18 Sep 2018 09:21:02 -0700
Subject: [PATCH 3841/4742] [clojure mode] Mark invalid tokens

Types of invalid tokens that can be indicated include:
- invalid numbers (e.g., `42a`, `0x0042m`, etc.)
- invalid character literals (e.g., `\ab`, `\a1`, `\newlines`, `\NEWLINE`)
- invalid symbols (e.g., `42foo`, etc.)
---
 mode/clojure/clojure.js | 50 ++++++++++++++++++++---------------------
 mode/clojure/test.js    | 48 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 7d9e50fdc4..9823d812c5 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -156,23 +156,34 @@ CodeMirror.defineMode("clojure", function (options) {
   var specialForm = createLookupMap(specialForms);
   var coreSymbol = createLookupMap(coreSymbols);
   var hasBodyParameter = createLookupMap(haveBodyParameter);
-  var numberLiteral = /^[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?/;
-  var symbolCharacter = /[!#$&'*+\-.\/:<=>?_|\w\xa1-\uffff]/;
+  var delimiter = /^(?:[\\\[\]\s"(),;@^`{}~]|$)/;
+  var numberLiteral = /^(?:[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?(?=[\\\[\]\s"#'(),;@^`{}~]|$))/;
+  var characterLiteral = /^(?:\\(?:backspace|formfeed|newline|return|space|tab|o[0-7]{3}|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{4}|.)?(?=[\\\[\]\s"(),;@^`{}~]|$))/;
+
+  // simple-namespace := /^[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*/
+  // simple-symbol    := /^(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)/
+  // qualified-symbol := (<simple-namespace>(<.><simple-namespace>)*</>)?<simple-symbol>
+  var qualifiedSymbol = /^(?:(?:[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*(?:\.[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*\/)?(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*(?=[\\\[\]\s"(),;@^`{}~]|$))/;
 
   function base(stream, state) {
     if (stream.eatSpace()) return ["space", null];
     if (stream.match(numberLiteral)) return [null, "number"];
-
-    var ch = stream.next();
-
-    if (ch === "\\") {stream.next(); readSymbol(stream); return [null, "string-2"];}
-    if (ch === '"') return (state.tokenize = inString)(stream, state);
-    if (is(ch, /[(\[{]/)) return ["open", "bracket"];
-    if (is(ch, /[)\]}]/)) return ["close", "bracket"];
-    if (ch === ";") {stream.skipToEnd(); return ["space", "comment"];}
-    if (is(ch, /[#'@^`~]/)) return [null, "meta"];
-
-    var symbol = readSymbol(stream);
+    if (stream.match(characterLiteral)) return [null, "string-2"];
+    if (stream.eat(/^"/)) return (state.tokenize = inString)(stream, state);
+    if (stream.eat(/^[(\[{]/)) return ["open", "bracket"];
+    if (stream.eat(/^[)\]}]/)) return ["close", "bracket"];
+    if (stream.eat(/^;/)) {stream.skipToEnd(); return ["space", "comment"];}
+    if (stream.eat(/^[#'@^`~]/)) return [null, "meta"];
+
+    var matches = stream.match(qualifiedSymbol);
+    var symbol = matches && matches[0];
+
+    if (!symbol) {
+      // advance stream by at least one character so we don't get stuck.
+      stream.next();
+      stream.eatWhile(function (c) {return !is(c, delimiter);});
+      return [null, "error"];
+    }
 
     if (symbol === "comment" && state.lastToken === "(")
       return (state.tokenize = inComment)(stream, state);
@@ -187,7 +198,7 @@ CodeMirror.defineMode("clojure", function (options) {
     var escaped = false, next;
 
     while (next = stream.next()) {
-      if (next === '"' && !escaped) {state.tokenize = base; break;}
+      if (next === "\"" && !escaped) {state.tokenize = base; break;}
       escaped = !escaped && next === "\\";
     }
 
@@ -211,17 +222,6 @@ CodeMirror.defineMode("clojure", function (options) {
     return ["space", "comment"];
   }
 
-  function readSymbol(stream) {
-    var ch;
-
-    while (ch = stream.next()) {
-      if (ch === "\\") stream.next();
-      else if (!is(ch, symbolCharacter)) {stream.backUp(1); break;}
-    }
-
-    return stream.current();
-  }
-
   function createLookupMap(words) {
     var obj = {};
 
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index d17856cb6e..642473b283 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -43,12 +43,22 @@
         "[number 8r52] [number +8r52] [number -8r52]",
         "[number 36rhello] [number +36rhello] [number -36rhello]",
         "[number 36rz] [number +36rz] [number -36rz]",
-        "[number 36rZ] [number +36rZ] [number -36rZ]"
+        "[number 36rZ] [number +36rZ] [number -36rZ]",
+
+        // invalid numbers
+        "[error 42foo]",
+        "[error 42Nfoo]",
+        "[error 42Mfoo]",
+        "[error 42.42Mfoo]",
+        "[error 42.42M!]",
+        "[error 42!]",
+        "[error 0x42afm]"
     );
 
     MT("characters",
         "[string-2 \\1]",
         "[string-2 \\a]",
+        "[string-2 \\a\\b\\c]",
         "[string-2 \\#]",
         "[string-2 \\\\]",
         "[string-2 \\\"]",
@@ -63,7 +73,21 @@
         "[string-2 \\u1000]",
         "[string-2 \\uAaAa]",
         "[string-2 \\u9F9F]",
-        "[string-2 \\o123]"
+        "[string-2 \\o123]",
+        "[string-2 \\符]",
+        "[string-2 \\シ]",
+        "[string-2 \\ۇ]",
+        // FIXME
+        // "[string-2 \\🙂]",
+
+        // invalid character literals
+        "[error \\abc]",
+        "[error \\a123]",
+        "[error \\a!]",
+        "[error \\newlines]",
+        "[error \\NEWLINE]",
+        "[error \\u9F9FF]",
+        "[error \\o1234]"
     );
 
     MT("strings",
@@ -72,6 +96,8 @@
         "[string \"I'm]",       // this is
         "[string a]",           // a multi-line
         "[string teapot.\"]"    // string
+
+        // TODO unterminated (multi-line) strings?
     );
 
     MT("comments",
@@ -123,7 +149,23 @@
       "[variable 符号]",
       "[variable シンボル]",
       "[variable ئۇيغۇر]",
-      "[variable 🙂❤🇺🇸]"
+      "[variable 🙂❤🇺🇸]",
+
+      // invalid symbols
+      "[error 3foo]",
+      "[error 3+]",
+      "[error 3|]",
+      "[error 3_]"
+    );
+
+    MT("numbers and other forms",
+      "[number 42][bracket (][builtin foo][bracket )]",
+      "[number 42][bracket [[][variable foo][bracket ]]]",
+      "[number 42][meta #][bracket {][variable foo][bracket }]",
+      "[number 42][bracket {][atom :foo] [variable bar][bracket }]",
+      "[number 42][meta `][variable foo]",
+      "[number 42][meta ~][variable foo]",
+      "[number 42][meta #][variable foo]"
     );
 
     var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",

From df85b9cf0050b765d616315fdb5525d93032b128 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 20 Sep 2018 11:46:59 +0200
Subject: [PATCH 3842/4742] [matchbrackets] Fix config field name

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

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index c918c3f99f..142b510d22 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -75,14 +75,14 @@
 
   function matchBrackets(cm, autoclear, config) {
     // Disable brace matching in long lines, since it'll cause hugely slow updates
-    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
+    var maxScanLen = cm.state.matchBrackets.maxScanLineLength || 1000;
     var marks = [], ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
       var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
-      if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
+      if (match && cm.getLine(match.from.line).length <= maxScanLen) {
         var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
         marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
-        if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)
+        if (match.to && cm.getLine(match.to.line).length <= maxScanLen)
           marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style}));
       }
     }

From deb6dee68d24375a26309b55f416e6a7e629a8c4 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 20 Sep 2018 11:47:35 +0200
Subject: [PATCH 3843/4742] Include matchbrackets in all mode demos that enable
 it

---
 demo/emacs.html                 | 1 +
 mode/asn.1/index.html           | 1 +
 mode/asterisk/index.html        | 1 +
 mode/css/gss.html               | 3 ++-
 mode/css/less.html              | 4 ++--
 mode/css/scss.html              | 1 +
 mode/cypher/index.html          | 3 ++-
 mode/handlebars/index.html      | 1 +
 mode/idl/index.html             | 1 +
 mode/javascript/typescript.html | 1 +
 mode/julia/index.html           | 1 +
 mode/mirc/index.html            | 1 +
 mode/octave/index.html          | 1 +
 mode/powershell/index.html      | 1 +
 mode/sql/index.html             | 1 +
 mode/ttcn-cfg/index.html        | 1 +
 mode/ttcn/index.html            | 1 +
 mode/turtle/index.html          | 1 +
 mode/xquery/index.html          | 1 +
 19 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/demo/emacs.html b/demo/emacs.html
index 69d5e600eb..0a2ec9be27 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -68,6 +68,7 @@ <h2>Emacs bindings demo</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         lineNumbers: true,
         mode: "text/x-csrc",
+        matchBrackets: true,
         keyMap: "emacs"
       });
     </script>
diff --git a/mode/asn.1/index.html b/mode/asn.1/index.html
index 5d80523e0a..43ad0e0318 100644
--- a/mode/asn.1/index.html
+++ b/mode/asn.1/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="asn.1.js"></script>
 <style type="text/css">
     .CodeMirror {
diff --git a/mode/asterisk/index.html b/mode/asterisk/index.html
index 7ede9948b1..956e1e1251 100644
--- a/mode/asterisk/index.html
+++ b/mode/asterisk/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="asterisk.js"></script>
 <style>
       .CodeMirror {border: 1px solid #999;}
diff --git a/mode/css/gss.html b/mode/css/gss.html
index 3854747c42..447929bf21 100644
--- a/mode/css/gss.html
+++ b/mode/css/gss.html
@@ -8,6 +8,7 @@
 <link rel="stylesheet" href="../../addon/hint/show-hint.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="css.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="../../addon/hint/show-hint.js"></script>
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
@@ -90,7 +91,7 @@ <h2>Closure Stylesheets (GSS) mode</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         extraKeys: {"Ctrl-Space": "autocomplete"},
         lineNumbers: true,
-        matchBrackets: "text/x-less",
+        matchBrackets: true,
         mode: "text/x-gss"
       });
     </script>
diff --git a/mode/css/less.html b/mode/css/less.html
index 80e15aeffc..6ceb7a0342 100644
--- a/mode/css/less.html
+++ b/mode/css/less.html
@@ -140,8 +140,8 @@ <h2>LESS mode</h2>
 </textarea></form>
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers : true,
-        matchBrackets : true,
+        lineNumbers: true,
+        matchBrackets: true,
         mode: "text/x-less"
       });
     </script>
diff --git a/mode/css/scss.html b/mode/css/scss.html
index 0a25964955..3e42ea6535 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
diff --git a/mode/cypher/index.html b/mode/cypher/index.html
index 1f32a753cd..0db7a6a7c6 100644
--- a/mode/cypher/index.html
+++ b/mode/cypher/index.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css" />
 <link rel="stylesheet" href="../../theme/neo.css" />
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="cypher.js"></script>
 <style>
 .CodeMirror {
@@ -53,7 +54,7 @@ <h2>Cypher Mode for CodeMirror</h2>
     indentWithTabs: true,
     smartIndent: true,
     lineNumbers: true,
-    matchBrackets : true,
+    matchBrackets: true,
     autofocus: true,
     theme: 'neo'
   });
diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
index 71aa6cc4a9..13cfcf35a3 100644
--- a/mode/handlebars/index.html
+++ b/mode/handlebars/index.html
@@ -8,6 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/mode/simple.js"></script>
 <script src="../../addon/mode/multiplex.js"></script>
+<script src="../../addon/edit/matchbrackets.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>
diff --git a/mode/idl/index.html b/mode/idl/index.html
index ad6404b42e..8a3ca9d6f3 100644
--- a/mode/idl/index.html
+++ b/mode/idl/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="idl.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index 36f223e195..ea82158de5 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="javascript.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
diff --git a/mode/julia/index.html b/mode/julia/index.html
index 379ede3350..57b7d8010c 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="julia.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
diff --git a/mode/mirc/index.html b/mode/mirc/index.html
index 338df1da62..98f81750fa 100644
--- a/mode/mirc/index.html
+++ b/mode/mirc/index.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <link rel="stylesheet" href="../../theme/twilight.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="mirc.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 5580345843..92f942669b 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="octave.js"></script>
 <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
diff --git a/mode/powershell/index.html b/mode/powershell/index.html
index 789187640c..81c050a815 100644
--- a/mode/powershell/index.html
+++ b/mode/powershell/index.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="../../doc/docs.css">
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="powershell.js"></script>
     <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
   </head>
diff --git a/mode/sql/index.html b/mode/sql/index.html
index 34b314ddba..5791c968c8 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css" />
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="sql.js"></script>
 <link rel="stylesheet" href="../../addon/hint/show-hint.css" />
 <script src="../../addon/hint/show-hint.js"></script>
diff --git a/mode/ttcn-cfg/index.html b/mode/ttcn-cfg/index.html
index 3a3b1e4d80..2ab7c2012a 100644
--- a/mode/ttcn-cfg/index.html
+++ b/mode/ttcn-cfg/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="ttcn-cfg.js"></script>
 <style type="text/css">
     .CodeMirror {
diff --git a/mode/ttcn/index.html b/mode/ttcn/index.html
index 502d63268a..597329d871 100644
--- a/mode/ttcn/index.html
+++ b/mode/ttcn/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="ttcn.js"></script>
 <style type="text/css">
     .CodeMirror {
diff --git a/mode/turtle/index.html b/mode/turtle/index.html
index 747a83aa28..79fe6dfdfe 100644
--- a/mode/turtle/index.html
+++ b/mode/turtle/index.html
@@ -6,6 +6,7 @@
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="turtle.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
diff --git a/mode/xquery/index.html b/mode/xquery/index.html
index def7b9b855..d79dbbf060 100644
--- a/mode/xquery/index.html
+++ b/mode/xquery/index.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <link rel="stylesheet" href="../../theme/xq-dark.css">
 <script src="../../lib/codemirror.js"></script>
+<script src="../../addon/edit/matchbrackets.js"></script>
 <script src="xquery.js"></script>
 <style type="text/css">
 	.CodeMirror {

From 58d7c16444eb67ded9e1253b60fe965c6a4a5722 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 20 Sep 2018 11:48:07 +0200
Subject: [PATCH 3844/4742] No need to export readToken

---
 src/line/highlight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/line/highlight.js b/src/line/highlight.js
index 79f0884511..9835d4626a 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -157,7 +157,7 @@ function callBlankLine(mode, state) {
   if (inner.mode.blankLine) return inner.mode.blankLine(inner.state)
 }
 
-export function readToken(mode, stream, state, inner) {
+function readToken(mode, stream, state, inner) {
   for (let i = 0; i < 10; i++) {
     if (inner) inner[0] = innerMode(mode, state).mode
     let style = mode.token(stream, state)

From b10bb86d0e4c05bcce3235f7862036938dd6b1ed Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Thu, 20 Sep 2018 13:07:25 +0200
Subject: [PATCH 3845/4742] [matchbrackets] Re-introduce maxHighlightLineLength

This reverts commit df85b9cf0050b765d616315fdb5525d93032b128.
---
 addon/edit/matchbrackets.js | 6 +++---
 doc/manual.html             | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 142b510d22..c918c3f99f 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -75,14 +75,14 @@
 
   function matchBrackets(cm, autoclear, config) {
     // Disable brace matching in long lines, since it'll cause hugely slow updates
-    var maxScanLen = cm.state.matchBrackets.maxScanLineLength || 1000;
+    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
     var marks = [], ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
       var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
-      if (match && cm.getLine(match.from.line).length <= maxScanLen) {
+      if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
         var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
         marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
-        if (match.to && cm.getLine(match.to.line).length <= maxScanLen)
+        if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)
           marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style}));
       }
     }
diff --git a/doc/manual.html b/doc/manual.html
index fdfb627169..25ca071e53 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2402,6 +2402,8 @@ <h2 id="addons">Addons</h2>
           <dd>Stop after scanning this amount of lines without a successful match. Defaults to 1000.</dd>
           <dt><strong><code>maxScanLineLength</code></strong></dt>
           <dd>Ignore lines longer than this. Defaults to 10000.</dd>
+          <dt><strong><code>maxHighlightLineLength</code></strong></dt>
+          <dd>Don't highlight a bracket in a line longer than this. Defaults to 1000.</dd>
         </dl></dd>
 
       <dt id="addon_closebrackets"><a href="../addon/edit/closebrackets.js"><code>edit/closebrackets.js</code></a></dt>

From 3c2a2a0a6d96bbf06b4763e13aa115a0c1a35992 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Sep 2018 15:16:33 +0200
Subject: [PATCH 3846/4742] Make gutterContextMenu work on Firefox

Closes #5584
---
 src/edit/mouse_events.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 4ecb715896..9c418f6c56 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -71,8 +71,9 @@ export function onMouseDown(e) {
     }
     return
   }
-  if (clickInGutter(cm, e)) return
-  let pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single"
+  let button = e_button(e)
+  if (button == 3 && captureRightClick ? contextMenuInGutter(cm, e) : clickInGutter(cm, e)) return
+  let pos = posFromMouse(cm, e), repeat = pos ? clickRepeat(pos, button) : "single"
   window.focus()
 
   // #3261: make sure, that we're not starting a second selection

From feaf587175e7c5b9a59454e0b8fa6bac1d36d61e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Sep 2018 15:22:31 +0200
Subject: [PATCH 3847/4742] Mark version 5.40.2

---
 AUTHORS           |  7 +++++++
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b7407343fd..0dfead74bd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@ List of CodeMirror contributors. Updated before every release.
 4r2r
 Aaron Brooks
 Abdelouahab
+Abdussalam Abdurrahman
 Abe Fettig
 Adam Ahmed
 Adam King
@@ -84,7 +85,9 @@ AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
 Axel Lewenhaupt
+Baptiste Augrain
 Barret Rennie
+Bartosz Dziewoński
 Basarat Ali Syed
 Bastian Müller
 belhaj
@@ -163,6 +166,7 @@ Dan Heberden
 Daniel, Dao Quang Minh
 Daniele Di Sarli
 Daniel Faust
+Daniel Hanggi
 Daniel Huigens
 Daniel Kesler
 Daniel KJ
@@ -180,6 +184,7 @@ David Barnett
 David H. Bronke
 David Mignot
 David Pathakjee
+David Santana
 David Vázquez
 David Whittington
 deebugger
@@ -224,6 +229,7 @@ ficristo
 Filip Noetzel
 Filip Stollár
 Filype Pereira
+finalfantasia
 flack
 Florian Felten
 ForbesLindesay
@@ -574,6 +580,7 @@ Peter Flynn
 peterkroon
 Peter Kroon
 Philipp A
+Philipp Markovics
 Philip Stadermann
 Pi Delport
 Pierre Gerold
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bb3861d41..715b9fa8ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.40.2 (2018-09-20)
+
+### Bug fixes
+
+Fix firing of `gutterContextMenu` event on Firefox.
+
+Add `hintWords` (basic completion) helper to [clojure](https://codemirror.net/mode/clojure/index.html), [mllike](https://codemirror.net/mode/mllike/index.html), [julia](https://codemirror.net/mode/julia/), [shell](https://codemirror.net/mode/shell/), and [r](https://codemirror.net/mode/r/) modes.
+
+[clojure mode](https://codemirror.net/mode/clojure/index.html): Clean up and improve.
+
 ## 5.40.0 (2018-08-25)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 25ca071e53..8eb899b316 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.40.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.40.2</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 257532b922..29c50bebe4 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,14 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-09-2018: <a href="https://codemirror.net/codemirror-5.40.2.zip">Version 5.40.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix firing of <code>gutterContextMenu</code> event on Firefox.</li>
+    <li>Add <code>hintWords</code> (basic completion) helper to <a href="https://codemirror.net/mode/clojure/index.html">clojure</a>, <a href="https://codemirror.net/mode/mllike/index.html">mllike</a>, <a href="https://codemirror.net/mode/julia/">julia</a>, <a href="https://codemirror.net/mode/shell/">shell</a>, and <a href="https://codemirror.net/mode/r/">r</a> modes.</li>
+    <li><a href="https://codemirror.net/mode/clojure/index.html">clojure mode</a>: Clean up and improve.</li>
+  </ul>
+
   <p class="rel">25-08-2018: <a href="https://codemirror.net/codemirror-5.40.0.zip">Version 5.40.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 96c6bbb07c..4f385707ea 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.40.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.40.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 77e7261abc..6eb99db014 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.40.1",
+  "version": "5.40.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index c9aea75b4d..bf3853c5fc 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.40.1"
+CodeMirror.version = "5.40.2"

From b16b7b0159bb17e63a3c76b0fb756e5d0da6620e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Sep 2018 15:24:02 +0200
Subject: [PATCH 3848/4742] Bump version number post-5.40.2

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8eb899b316..f2de759992 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.40.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.40.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 6eb99db014..4c78f51e2c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.40.2",
+  "version": "5.40.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "description": "Full-featured in-browser code editor",
diff --git a/src/edit/main.js b/src/edit/main.js
index bf3853c5fc..6a4176cbc9 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.40.2"
+CodeMirror.version = "5.40.3"

From bb529041eef8db0a293a1538cb3b729efcb92368 Mon Sep 17 00:00:00 2001
From: Harald Schilly <harald.schilly@gmail.com>
Date: Thu, 20 Sep 2018 17:42:50 +0200
Subject: [PATCH 3849/4742] [r mode] Highlight TRUE/FALSE as atoms

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

diff --git a/mode/r/r.js b/mode/r/r.js
index df58240035..c422af9a4c 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -19,7 +19,7 @@ CodeMirror.defineMode("r", function(config) {
     for (var i = 0; i < words.length; ++i) res[words[i]] = true;
     return res;
   }
-  var commonAtoms = ["NULL", "NA", "Inf", "NaN", "NA_integer_", "NA_real_", "NA_complex_", "NA_character_"];
+  var commonAtoms = ["NULL", "NA", "Inf", "NaN", "NA_integer_", "NA_real_", "NA_complex_", "NA_character_", "TRUE", "FALSE"];
   var commonBuiltins = ["list", "quote", "bquote", "eval", "return", "call", "parse", "deparse"];
   var commonKeywords = ["if", "else", "repeat", "while", "function", "for", "in", "next", "break"];
   var commonBlockKeywords = ["if", "else", "repeat", "while", "function", "for"];

From 15bcf1da467b25e33ffcfd9ff877e8d8c3c3bfea Mon Sep 17 00:00:00 2001
From: Doug Blank <doug.blank@gmail.com>
Date: Thu, 20 Sep 2018 15:15:13 -0400
Subject: [PATCH 3850/4742] [scheme mode] Properly marks 'atoms and '(lists of
 s-exp)

---
 mode/scheme/scheme.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 3191fe8118..56e4e332e9 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -73,7 +73,8 @@ CodeMirror.defineMode("scheme", function () {
                 indentStack: null,
                 indentation: 0,
                 mode: false,
-                sExprComment: false
+                sExprComment: false,
+                sExprQuote: false
             };
         },
 
@@ -121,7 +122,7 @@ CodeMirror.defineMode("scheme", function () {
                         state.sExprComment = 0;
                     }else{
                         // if not we just comment the entire of the next token
-                        stream.eatWhile(/[^/s]/); // eat non spaces
+                        stream.eatWhile(/[^\s\(\)\[\]]/); // eat symbol atom
                         returnType = COMMENT;
                         break;
                     }
@@ -133,7 +134,15 @@ CodeMirror.defineMode("scheme", function () {
                         returnType = STRING;
 
                     } else if (ch == "'") {
-                        returnType = ATOM;
+                        if (stream.peek() == "(" || stream.peek() == "["){
+                            if (typeof state.sExprQuote != "number") {
+                                state.sExprQuote = 0;
+                            } // else already in a quoted expression
+                            returnType = ATOM;
+                        } else {
+                            stream.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/);
+                            returnType = ATOM;
+                        }
                     } else if (ch == '#') {
                         if (stream.eat("|")) {                    // Multi-line comment
                             state.mode = "comment"; // toggle to comment mode
@@ -209,6 +218,7 @@ CodeMirror.defineMode("scheme", function () {
                         stream.backUp(stream.current().length - 1); // undo all the eating
 
                         if(typeof state.sExprComment == "number") state.sExprComment++;
+                        if(typeof state.sExprQuote == "number") state.sExprQuote++;
 
                         returnType = BRACKET;
                     } else if (ch == ")" || ch == "]") {
@@ -222,6 +232,12 @@ CodeMirror.defineMode("scheme", function () {
                                     state.sExprComment = false; // turn off s-expr commenting mode
                                 }
                             }
+                            if(typeof state.sExprQuote == "number"){
+                                if(--state.sExprQuote == 0){
+                                    returnType = ATOM; // final closing bracket
+                                    state.sExprQuote = false; // turn off s-expr quote mode
+                                }
+                            }
                         }
                     } else {
                         stream.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/);
@@ -231,7 +247,7 @@ CodeMirror.defineMode("scheme", function () {
                         } else returnType = "variable";
                     }
             }
-            return (typeof state.sExprComment == "number") ? COMMENT : returnType;
+            return (typeof state.sExprComment == "number") ? COMMENT : ((typeof state.sExprQuote == "number") ? ATOM : returnType);
         },
 
         indent: function (state) {

From 50e5183bb9ca698bc19edc2f00a2a28e9c092906 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Sep 2018 07:52:56 +0200
Subject: [PATCH 3851/4742] [sql mode] Update keyword list for Hive SQL

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

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 2ab55c3528..a573a682d4 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -400,8 +400,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   // Created to support specific hive keywords
   CodeMirror.defineMIME("text/x-hive", {
     name: "sql",
-    keywords: set("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"),
-    builtin: set("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"),
+    keywords: set("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with admin authorization char compact compactions conf cube current current_date current_timestamp day decimal defined dependency directories elem_type exchange file following for grouping hour ignore inner interval jar less logical macro minute month more none noscan over owner partialscan preceding pretty principals protection reload rewrite role roles rollup rows second server sets skewed transactions truncate unbounded unset uri user values window year"),
+    builtin: set("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype key_type utctimestamp value_type varchar"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=]/,
     dateSQL: set("date timestamp"),

From 5b949b2dbe92a0153c2bd32b75341e7fe3cf6ce0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Sep 2018 13:33:14 +0200
Subject: [PATCH 3852/4742] Route context menu events differently

So that gutterContextMenu actually gets the
contextmenu DOM event, since preventDefault on
the mouse event doesn't seem to work on FF.

Issue #5584
---
 src/edit/CodeMirror.js   | 4 ++--
 src/edit/mouse_events.js | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 6d3084ff2e..7e43d98f8e 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -13,7 +13,7 @@ import Doc from "../model/Doc.js"
 import { attachDoc } from "../model/document_data.js"
 import { Range } from "../model/selection.js"
 import { extendSelection } from "../model/selection_updates.js"
-import { captureRightClick, ie, ie_version, mobile, webkit } from "../util/browser.js"
+import { ie, ie_version, mobile, webkit } from "../util/browser.js"
 import { e_preventDefault, e_stop, on, signal, signalDOMEvent } from "../util/event.js"
 import { bind, copyObj, Delayed } from "../util/misc.js"
 
@@ -122,7 +122,7 @@ function registerEventHandlers(cm) {
   // Some browsers fire contextmenu *after* opening the menu, at
   // which point we can't mess with it anymore. Context menu is
   // handled in onMouseDown for these browsers.
-  if (!captureRightClick) on(d.scroller, "contextmenu", e => onContextMenu(cm, e))
+  on(d.scroller, "contextmenu", e => onContextMenu(cm, e))
 
   // Used to suppress mouse event handling when a touch happens
   let touchFinished, prevTouch = {end: 0}
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 9c418f6c56..803f4ced53 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -71,9 +71,8 @@ export function onMouseDown(e) {
     }
     return
   }
-  let button = e_button(e)
-  if (button == 3 && captureRightClick ? contextMenuInGutter(cm, e) : clickInGutter(cm, e)) return
-  let pos = posFromMouse(cm, e), repeat = pos ? clickRepeat(pos, button) : "single"
+  if (clickInGutter(cm, e)) return
+  let pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single"
   window.focus()
 
   // #3261: make sure, that we're not starting a second selection
@@ -89,7 +88,7 @@ export function onMouseDown(e) {
     if (pos) extendSelection(cm.doc, pos)
     setTimeout(() => display.input.focus(), 20)
   } else if (button == 3) {
-    if (captureRightClick) onContextMenu(cm, e)
+    if (captureRightClick) cm.display.input.onContextMenu(e)
     else delayBlurEvent(cm)
   }
 }
@@ -399,7 +398,7 @@ export function clickInGutter(cm, e) {
 export function onContextMenu(cm, e) {
   if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return
   if (signalDOMEvent(cm, e, "contextmenu")) return
-  cm.display.input.onContextMenu(e)
+  if (!captureRightClick) cm.display.input.onContextMenu(e)
 }
 
 function contextMenuInGutter(cm, e) {

From b6816aa15cd5e206769aac1853aec45f12f7fce4 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sun, 23 Sep 2018 15:45:31 +0200
Subject: [PATCH 3853/4742] [soy mode] Support @prop declaration

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

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 4c0a106d6e..15024a267a 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -300,7 +300,7 @@
             if (!state.scopes) {
               state.variables = prepend(null, 'ij');
             }
-          } else if (state.tag.match(/^@(?:param\??|inject)/)) {
+          } else if (state.tag.match(/^@(?:param\??|inject|prop)/)) {
             state.soyState.push("param-def");
           }
           return "keyword";

From 5791b2d7c2e43d8607185c35f9fcd956f4fffca4 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 24 Sep 2018 17:29:59 +0200
Subject: [PATCH 3854/4742] [soy mode] Add $ to wordChars

---
 mode/soy/soy.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 15024a267a..51ec46cafa 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -350,6 +350,8 @@
     };
   }, "htmlmixed");
 
+  CodeMirror.registerHelper("wordChars", "soy", /[\w$]/);
+
   CodeMirror.registerHelper("hintWords", "soy", indentingTags.concat(
       ["delpackage", "namespace", "alias", "print", "css", "debugger"]));
 

From e3b9957f3e46aad5c0c2fd309f65b6fec10d267d Mon Sep 17 00:00:00 2001
From: Brett Zamir <brettz9@yahoo.com>
Date: Tue, 2 Oct 2018 11:08:48 +0800
Subject: [PATCH 3855/4742] - Refactoring: Remove unnecessary type=text/css and
 type=text/javascript

---
 demo/activeline.html            | 2 +-
 demo/bidi.html                  | 2 +-
 demo/btree.html                 | 2 +-
 demo/buffers.html               | 2 +-
 demo/changemode.html            | 2 +-
 demo/closebrackets.html         | 4 ++--
 demo/closetag.html              | 4 ++--
 demo/emacs.html                 | 2 +-
 demo/folding.html               | 2 +-
 demo/hardwrap.html              | 2 +-
 demo/html5complete.html         | 4 ++--
 demo/indentwrap.html            | 2 +-
 demo/lint.html                  | 2 +-
 demo/loadmode.html              | 2 +-
 demo/marker.html                | 2 +-
 demo/markselection.html         | 2 +-
 demo/matchhighlighter.html      | 2 +-
 demo/matchtags.html             | 2 +-
 demo/multiplex.html             | 2 +-
 demo/mustache.html              | 2 +-
 demo/panel.html                 | 2 +-
 demo/placeholder.html           | 2 +-
 demo/requirejs.html             | 4 ++--
 demo/resize.html                | 2 +-
 demo/rulers.html                | 4 ++--
 demo/search.html                | 2 +-
 demo/simplemode.html            | 2 +-
 demo/sublime.html               | 2 +-
 demo/theme.html                 | 2 +-
 demo/trailingspace.html         | 2 +-
 demo/variableheight.html        | 2 +-
 demo/vim.html                   | 2 +-
 demo/visibletabs.html           | 2 +-
 demo/widget.html                | 2 +-
 demo/xmlcomplete.html           | 2 +-
 mode/asn.1/index.html           | 2 +-
 mode/django/index.html          | 2 +-
 mode/dockerfile/index.html      | 2 +-
 mode/dtd/index.html             | 2 +-
 mode/dylan/index.html           | 2 +-
 mode/ebnf/index.html            | 2 +-
 mode/elm/index.html             | 2 +-
 mode/erlang/index.html          | 2 +-
 mode/fortran/index.html         | 2 +-
 mode/gfm/index.html             | 2 +-
 mode/haskell/index.html         | 2 +-
 mode/haxe/index.html            | 2 +-
 mode/htmlembedded/index.html    | 2 +-
 mode/htmlmixed/index.html       | 2 +-
 mode/http/index.html            | 2 +-
 mode/idl/index.html             | 2 +-
 mode/javascript/index.html      | 2 +-
 mode/javascript/json-ld.html    | 2 +-
 mode/javascript/typescript.html | 2 +-
 mode/jinja2/index.html          | 2 +-
 mode/jsx/index.html             | 2 +-
 mode/julia/index.html           | 2 +-
 mode/markdown/index.html        | 2 +-
 mode/mumps/index.html           | 2 +-
 mode/ntriples/index.html        | 2 +-
 mode/octave/index.html          | 2 +-
 mode/oz/index.html              | 4 ++--
 mode/pascal/index.html          | 2 +-
 mode/pegjs/index.html           | 2 +-
 mode/perl/index.html            | 2 +-
 mode/php/index.html             | 2 +-
 mode/pug/index.html             | 2 +-
 mode/python/index.html          | 2 +-
 mode/q/index.html               | 2 +-
 mode/rpm/changes/index.html     | 2 +-
 mode/rpm/index.html             | 2 +-
 mode/rst/index.html             | 2 +-
 mode/rust/index.html            | 2 +-
 mode/sas/index.html             | 2 +-
 mode/smarty/index.html          | 2 +-
 mode/solr/index.html            | 2 +-
 mode/soy/index.html             | 2 +-
 mode/spreadsheet/index.html     | 2 +-
 mode/tiddlywiki/index.html      | 2 +-
 mode/tiki/index.html            | 4 ++--
 mode/toml/index.html            | 2 +-
 mode/tornado/index.html         | 2 +-
 mode/ttcn-cfg/index.html        | 2 +-
 mode/ttcn/index.html            | 2 +-
 mode/twig/index.html            | 2 +-
 mode/vb/index.html              | 4 ++--
 mode/vbscript/index.html        | 2 +-
 mode/verilog/index.html         | 2 +-
 mode/vhdl/index.html            | 2 +-
 mode/webidl/index.html          | 2 +-
 mode/xml/index.html             | 2 +-
 mode/xquery/index.html          | 2 +-
 mode/z80/index.html             | 2 +-
 test/index.html                 | 2 +-
 94 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/demo/activeline.html b/demo/activeline.html
index 0d6b62ecfc..f2228141a2 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <script src="../addon/selection/active-line.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
diff --git a/demo/bidi.html b/demo/bidi.html
index 742cf95f7b..a7d22d6c7a 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<style type="text/css">
+<style>
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
   fieldset {border: none}
 </style>
diff --git a/demo/btree.html b/demo/btree.html
index 985309d11b..318810143c 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -6,7 +6,7 @@
 
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
-<style type="text/css">
+<style>
       .lineblock { display: inline-block; margin: 1px; height: 5px; }
       .CodeMirror {border: 1px solid #aaa; height: 400px}
     </style>
diff --git a/demo/buffers.html b/demo/buffers.html
index 619c522524..b1f4975c67 100644
--- a/demo/buffers.html
+++ b/demo/buffers.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/css/css.js"></script>
-<style type="text/css" id=style>
+<style id=style>
       .CodeMirror {border: 1px solid black; height: 250px;}
     </style>
 <div id=nav>
diff --git a/demo/changemode.html b/demo/changemode.html
index fb189fb965..da9b0243ee 100644
--- a/demo/changemode.html
+++ b/demo/changemode.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/scheme/scheme.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border: 1px solid black;}
     </style>
 <div id=nav>
diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index 6fe44c74d0..d1415abd2b 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/edit/closebrackets.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
 <div id=nav>
@@ -46,7 +46,7 @@ <h2>Closebrackets Demo</h2>
   this.setValueAt(from, undefined);
 };</textarea></form>
 
-    <script type="text/javascript">
+    <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {autoCloseBrackets: true});
     </script>
   </article>
diff --git a/demo/closetag.html b/demo/closetag.html
index b0f3980611..4f857fa4bb 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -12,7 +12,7 @@
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/css/css.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
 <div id=nav>
@@ -32,7 +32,7 @@
 <h2>Close-Tag Demo</h2>
 <form><textarea id="code" name="code"><html</textarea></form>
 
-    <script type="text/javascript">
+    <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: 'text/html',
         autoCloseTags: true
diff --git a/demo/emacs.html b/demo/emacs.html
index 0a2ec9be27..8f436f8b7d 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -14,7 +14,7 @@
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/search/searchcursor.js"></script>
 <script src="../addon/search/search.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
 <div id=nav>
diff --git a/demo/folding.html b/demo/folding.html
index 745939b191..b61ecee122 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -28,7 +28,7 @@
   <script src="../mode/htmlmixed/htmlmixed.js"></script>
   <script src="../mode/python/python.js"></script>
   <script src="../mode/markdown/markdown.js"></script>
-  <style type="text/css">
+  <style>
     .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
   </style>
 </head>
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index a4e4cf7dae..999cf012b9 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/markdown/markdown.js"></script>
 <script src="../addon/wrap/hardwrap.js"></script>
-<style type="text/css">
+<style>
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 8433a92119..6b908a4520 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -15,7 +15,7 @@
   <script src="../mode/javascript/javascript.js"></script>
   <script src="../mode/css/css.js"></script>
   <script src="../mode/htmlmixed/htmlmixed.js"></script>
-  <style type="text/css">
+  <style>
     .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
   </style>
 </head>
@@ -43,7 +43,7 @@ <h2>HTML completion demo</h2>
 
     <div id="code"></div>
 
-    <script type="text/javascript">
+    <script>
       window.onload = function() {
         editor = CodeMirror(document.getElementById("code"), {
           mode: "text/html",
diff --git a/demo/indentwrap.html b/demo/indentwrap.html
index 660d44eb2b..d61f679540 100644
--- a/demo/indentwrap.html
+++ b/demo/indentwrap.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror pre > * { text-indent: 0px; }
     </style>
diff --git a/demo/lint.html b/demo/lint.html
index 8d9d8f6dd4..a5ac3ef219 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -16,7 +16,7 @@
 <script src="../addon/lint/javascript-lint.js"></script>
 <script src="../addon/lint/json-lint.js"></script>
 <script src="../addon/lint/css-lint.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border: 1px solid black;}
     </style>
 <div id=nav>
diff --git a/demo/loadmode.html b/demo/loadmode.html
index 93b0ed5fd0..263d679cae 100644
--- a/demo/loadmode.html
+++ b/demo/loadmode.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/mode/loadmode.js"></script>
 <script src="../mode/meta.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
diff --git a/demo/marker.html b/demo/marker.html
index 5b500b7b24..6744ee3a6e 100644
--- a/demo/marker.html
+++ b/demo/marker.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
-<style type="text/css">
+<style>
       .breakpoints {width: .8em;}
       .breakpoint { color: #822; }
       .CodeMirror {border: 1px solid #aaa;}
diff --git a/demo/markselection.html b/demo/markselection.html
index 2e0a89be02..10734b4106 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/search/searchcursor.js"></script>
 <script src="../addon/selection/mark-selection.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror-selected  { background-color: blue !important; }
       .CodeMirror-selectedtext { color: white; }
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index 2b2f5cb5b8..6aa937782d 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -10,7 +10,7 @@
 <script src="../addon/search/matchesonscrollbar.js"></script>
 <script src="../addon/search/searchcursor.js"></script>
 <script src="../addon/search/match-highlighter.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .CodeMirror-focused .cm-matchhighlight {
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAFklEQVQI12NgYGBgkKzc8x9CMDAwAAAmhwSbidEoSQAAAABJRU5ErkJggg==);
diff --git a/demo/matchtags.html b/demo/matchtags.html
index e90707d176..a5ff6b01b6 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -9,7 +9,7 @@
 <script src="../addon/fold/xml-fold.js"></script>
 <script src="../addon/edit/matchtags.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
diff --git a/demo/multiplex.html b/demo/multiplex.html
index ec3870baa5..1336620433 100644
--- a/demo/multiplex.html
+++ b/demo/multiplex.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/mode/multiplex.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border: 1px solid black;}
       .cm-delimit {color: #fa4;}
     </style>
diff --git a/demo/mustache.html b/demo/mustache.html
index ca1d7db90e..2d193f096e 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/mode/overlay.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border: 1px solid black;}
       .cm-mustache {color: #0ca;}
 </style>
diff --git a/demo/panel.html b/demo/panel.html
index 34d0017e2b..1030615a21 100644
--- a/demo/panel.html
+++ b/demo/panel.html
@@ -10,7 +10,7 @@
 <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">
+<style>
   .border {
     border: 1px solid #f7f7f7;
   }
diff --git a/demo/placeholder.html b/demo/placeholder.html
index 99f709a312..b3bb5fa6f8 100644
--- a/demo/placeholder.html
+++ b/demo/placeholder.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/display/placeholder.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror { border: 1px solid silver; }
       .CodeMirror-empty { outline: 1px solid #c22; }
       .CodeMirror-empty.CodeMirror-focused { outline: none; }
diff --git a/demo/requirejs.html b/demo/requirejs.html
index 796031736a..0503c92197 100644
--- a/demo/requirejs.html
+++ b/demo/requirejs.html
@@ -8,7 +8,7 @@
   <link rel="stylesheet" href="../lib/codemirror.css">
   <link rel="stylesheet" href="../addon/hint/show-hint.css">
   <script src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.14/require.min.js"></script>
-  <style type="text/css">
+  <style>
     .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
   </style>
 </head>
@@ -40,7 +40,7 @@ <h2>RequireJS module loading demo</h2>
 
     <button id="markdown">Dynamically load Markdown mode</button>
 
-    <script type="text/javascript">
+    <script>
       require.config({
         packages: [{
           name: "codemirror",
diff --git a/demo/resize.html b/demo/resize.html
index 6556f50f30..850f560139 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/css/css.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {
         border: 1px solid #eee;
         height: auto;
diff --git a/demo/rulers.html b/demo/rulers.html
index 7c3530bd0c..ef12987edb 100644
--- a/demo/rulers.html
+++ b/demo/rulers.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/display/rulers.js"></script>
-<style type="text/css">
+<style>
   .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
 </style>
 <div id=nav>
@@ -26,7 +26,7 @@
 <article>
 <h2>Ruler Demo</h2>
 
-<script type="text/javascript">
+<script>
   var nums = "0123456789", space = "          ";
   var colors = ["#fcc", "#f5f577", "#cfc", "#aff", "#ccf", "#fcf"];
   var rulers = [], value = "";
diff --git a/demo/search.html b/demo/search.html
index 502af0c15c..3abb0c78e6 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -15,7 +15,7 @@
 <script src="../addon/scroll/annotatescrollbar.js"></script>
 <script src="../addon/search/matchesonscrollbar.js"></script>
 <script src="../addon/search/jump-to-line.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       dt {font-family: monospace; color: #666;}
     </style>
diff --git a/demo/simplemode.html b/demo/simplemode.html
index d547e6f6fb..6b44a78840 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/mode/simple.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<style type="text/css">
+<style>
   .CodeMirror {border: 1px solid silver; margin-bottom: 1em; }
   dt { text-indent: -2em; padding-left: 2em; margin-top: 1em; }
   dd { margin-left: 1.5em; margin-bottom: 1em; }
diff --git a/demo/sublime.html b/demo/sublime.html
index 645f926816..bfe17c5670 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -20,7 +20,7 @@
 <script src="../addon/fold/brace-fold.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../keymap/sublime.js"></script>
-<style type="text/css">
+<style>
   .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee; line-height: 1.3; height: 500px}
   .CodeMirror-linenumbers { padding: 0 8px; }
 </style>
diff --git a/demo/theme.html b/demo/theme.html
index c81768c46b..5ecace9170 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -62,7 +62,7 @@
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../addon/selection/active-line.js"></script>
 <script src="../addon/edit/matchbrackets.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border: 1px solid black; font-size:13px}
     </style>
 <div id=nav>
diff --git a/demo/trailingspace.html b/demo/trailingspace.html
index fa8afba9e0..fb553994b5 100644
--- a/demo/trailingspace.html
+++ b/demo/trailingspace.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/edit/trailingspace.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .cm-trailingspace {
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);
diff --git a/demo/variableheight.html b/demo/variableheight.html
index d5495255e2..a3af5cf4a9 100644
--- a/demo/variableheight.html
+++ b/demo/variableheight.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/markdown/markdown.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border: 1px solid silver; border-width: 1px 2px; }
       .cm-header { font-family: arial; }
       .cm-header-1 { font-size: 150%; }
diff --git a/demo/vim.html b/demo/vim.html
index d51b9a0ed9..c939505d8f 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -14,7 +14,7 @@
 <script src="../mode/clike/clike.js"></script>
 <script src="../addon/edit/matchbrackets.js"></script>
 <script src="../keymap/vim.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
 <div id=nav>
diff --git a/demo/visibletabs.html b/demo/visibletabs.html
index d00ba16f10..f4f5a78329 100644
--- a/demo/visibletabs.html
+++ b/demo/visibletabs.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/clike/clike.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
       .cm-tab {
          background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
diff --git a/demo/widget.html b/demo/widget.html
index c77b35a0b7..6fae2d2f57 100644
--- a/demo/widget.html
+++ b/demo/widget.html
@@ -8,7 +8,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jshint/2.9.5/jshint.min.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border: 1px solid black;}
       .lint-error {font-family: arial; font-size: 70%; background: #ffa; color: #a00; padding: 2px 5px 3px; }
       .lint-error-icon {color: white; background-color: red; font-weight: bold; border-radius: 50%; padding: 0 3px; margin-right: 7px;}
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index 613ca2ec61..dbbc9bacdc 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -10,7 +10,7 @@
 <script src="../addon/hint/show-hint.js"></script>
 <script src="../addon/hint/xml-hint.js"></script>
 <script src="../mode/xml/xml.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror { border: 1px solid #eee; }
     </style>
 <div id=nav>
diff --git a/mode/asn.1/index.html b/mode/asn.1/index.html
index 43ad0e0318..c2bc824a07 100644
--- a/mode/asn.1/index.html
+++ b/mode/asn.1/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="asn.1.js"></script>
-<style type="text/css">
+<style>
     .CodeMirror {
         border-top: 1px solid black;
         border-bottom: 1px solid black;
diff --git a/mode/django/index.html b/mode/django/index.html
index 2060d7ae97..384e0067be 100644
--- a/mode/django/index.html
+++ b/mode/django/index.html
@@ -11,7 +11,7 @@
 <script src="../xml/xml.js"></script>
 <script src="../htmlmixed/htmlmixed.js"></script>
 <script src="django.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/dockerfile/index.html b/mode/dockerfile/index.html
index 93df336ec3..63bb91e6ec 100644
--- a/mode/dockerfile/index.html
+++ b/mode/dockerfile/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/mode/simple.js"></script>
 <script src="dockerfile.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/dtd/index.html b/mode/dtd/index.html
index a6f50fa37c..959c346527 100644
--- a/mode/dtd/index.html
+++ b/mode/dtd/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="dtd.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/dylan/index.html b/mode/dylan/index.html
index 83d734affb..af259528cb 100644
--- a/mode/dylan/index.html
+++ b/mode/dylan/index.html
@@ -10,7 +10,7 @@
 <script src="../../addon/comment/continuecomment.js"></script>
 <script src="../../addon/comment/comment.js"></script>
 <script src="dylan.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/ebnf/index.html b/mode/ebnf/index.html
index e92e0f0855..9bd28a4adf 100644
--- a/mode/ebnf/index.html
+++ b/mode/ebnf/index.html
@@ -9,7 +9,7 @@
     <script src="../../lib/codemirror.js"></script>
     <script src="../javascript/javascript.js"></script>
     <script src="ebnf.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
   </head>
   <body>
     <div id=nav>
diff --git a/mode/elm/index.html b/mode/elm/index.html
index fb64b53f43..9bef08a8e3 100644
--- a/mode/elm/index.html
+++ b/mode/elm/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="elm.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index eb0a62e8d7..5f54c0fe98 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -9,7 +9,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="erlang.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/fortran/index.html b/mode/fortran/index.html
index 0d2632f4b5..a799e937f1 100644
--- a/mode/fortran/index.html
+++ b/mode/fortran/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="fortran.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index b4bc81d6b4..8f6fb8ea80 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -15,7 +15,7 @@
 <script src="../htmlmixed/htmlmixed.js"></script>
 <script src="../clike/clike.js"></script>
 <script src="../meta.js"></script>
-<style type="text/css">
+<style>
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
   .cm-s-default .cm-emoji {color: #009688;}
 </style>
diff --git a/mode/haskell/index.html b/mode/haskell/index.html
index afa7a898ee..4d56682973 100644
--- a/mode/haskell/index.html
+++ b/mode/haskell/index.html
@@ -9,7 +9,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="haskell.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/haxe/index.html b/mode/haxe/index.html
index 10a241c418..89dacdfb59 100644
--- a/mode/haxe/index.html
+++ b/mode/haxe/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="haxe.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index ad9bfe4122..4257237af1 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -12,7 +12,7 @@
 <script src="../htmlmixed/htmlmixed.js"></script>
 <script src="../../addon/mode/multiplex.js"></script>
 <script src="htmlembedded.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index 6e3d79fc70..7de1e03503 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -34,7 +34,7 @@ <h2>HTML mixed mode</h2>
   <!-- this is a comment -->
   <head>
     <title>Mixed HTML Example</title>
-    <style type="text/css">
+    <style>
       h1 {font-family: comic sans; color: #f0f;}
       div {background: yellow !important;}
       body {
diff --git a/mode/http/index.html b/mode/http/index.html
index 9335dd79c6..b631ec5294 100644
--- a/mode/http/index.html
+++ b/mode/http/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="http.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/idl/index.html b/mode/idl/index.html
index 8a3ca9d6f3..6ef17d093e 100644
--- a/mode/idl/index.html
+++ b/mode/idl/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="idl.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 37115d5b14..4eff2e28bc 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -10,7 +10,7 @@
 <script src="../../addon/comment/continuecomment.js"></script>
 <script src="../../addon/comment/comment.js"></script>
 <script src="javascript.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/javascript/json-ld.html b/mode/javascript/json-ld.html
index 5c31f39f42..6a29c14453 100644
--- a/mode/javascript/json-ld.html
+++ b/mode/javascript/json-ld.html
@@ -10,7 +10,7 @@
 <script src="../../addon/comment/continuecomment.js"></script>
 <script src="../../addon/comment/comment.js"></script>
 <script src="javascript.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id="nav">
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"/></a>
 
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index ea82158de5..3b217a44f9 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="javascript.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index 3314d49d71..a942549dac 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="jinja2.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/jsx/index.html b/mode/jsx/index.html
index 0fb3f75527..4df632e1f7 100644
--- a/mode/jsx/index.html
+++ b/mode/jsx/index.html
@@ -9,7 +9,7 @@
 <script src="../javascript/javascript.js"></script>
 <script src="../xml/xml.js"></script>
 <script src="jsx.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/julia/index.html b/mode/julia/index.html
index 57b7d8010c..0261c921f8 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="julia.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index c571463e58..37203ef398 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -9,7 +9,7 @@
 <script src="../../addon/edit/continuelist.js"></script>
 <script src="../xml/xml.js"></script>
 <script src="markdown.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
       .cm-s-default .cm-trailing-space-a:before,
       .cm-s-default .cm-trailing-space-b:before {position: absolute; content: "\00B7"; color: #777;}
diff --git a/mode/mumps/index.html b/mode/mumps/index.html
index 8931e7ffc8..9340867eef 100644
--- a/mode/mumps/index.html
+++ b/mode/mumps/index.html
@@ -7,7 +7,7 @@
 <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>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index ea2eeefa5f..63a695d527 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="ntriples.js"></script>
-<style type="text/css">
+<style>
       .CodeMirror {
         border: 1px solid #eee;
         height: auto;
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 92f942669b..698ae7df92 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="octave.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/oz/index.html b/mode/oz/index.html
index 782a27c964..fb9df83e1a 100644
--- a/mode/oz/index.html
+++ b/mode/oz/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="oz.js"></script>
-<script type="text/javascript" src="../../addon/runmode/runmode.js"></script>
+<script src="../../addon/runmode/runmode.js"></script>
 <style>
   .CodeMirror {border: 1px solid #aaa;}
 </style>
@@ -49,7 +49,7 @@ <h2>Oz mode</h2>
 </textarea>
 <p>MIME type defined: <code>text/x-oz</code>.</p>
 
-<script type="text/javascript">
+<script>
 var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
     lineNumbers: true,
     mode: "text/x-oz",
diff --git a/mode/pascal/index.html b/mode/pascal/index.html
index c3fdf74c91..f0c49f4708 100644
--- a/mode/pascal/index.html
+++ b/mode/pascal/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="pascal.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/pegjs/index.html b/mode/pegjs/index.html
index 34fa5e8bd6..9d452aa9cc 100644
--- a/mode/pegjs/index.html
+++ b/mode/pegjs/index.html
@@ -9,7 +9,7 @@
     <script src="../../lib/codemirror.js"></script>
     <script src="../javascript/javascript.js"></script>
     <script src="pegjs.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
   </head>
   <body>
     <div id=nav>
diff --git a/mode/perl/index.html b/mode/perl/index.html
index 71757b215a..901718a4c5 100644
--- a/mode/perl/index.html
+++ b/mode/perl/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="perl.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/php/index.html b/mode/php/index.html
index 3995c84544..689764146a 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -13,7 +13,7 @@
 <script src="../css/css.js"></script>
 <script src="../clike/clike.js"></script>
 <script src="php.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/pug/index.html b/mode/pug/index.html
index 321284806a..dfc8968dbc 100644
--- a/mode/pug/index.html
+++ b/mode/pug/index.html
@@ -11,7 +11,7 @@
 <script src="../xml/xml.js"></script>
 <script src="../htmlmixed/htmlmixed.js"></script>
 <script src="pug.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/python/index.html b/mode/python/index.html
index e52eea680b..90ee324a21 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="python.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/q/index.html b/mode/q/index.html
index e13ad5b6af..930e133d49 100644
--- a/mode/q/index.html
+++ b/mode/q/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="q.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
index 7026cc5287..9d244ecc85 100644
--- a/mode/rpm/changes/index.html
+++ b/mode/rpm/changes/index.html
@@ -8,7 +8,7 @@
     <script src="../../../lib/codemirror.js"></script>
     <script src="changes.js"></script>
     <link rel="stylesheet" href="../../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../../doc/logo.png"></a>
diff --git a/mode/rpm/index.html b/mode/rpm/index.html
index f1f8316840..e20e53debc 100644
--- a/mode/rpm/index.html
+++ b/mode/rpm/index.html
@@ -8,7 +8,7 @@
     <script src="../../lib/codemirror.js"></script>
     <script src="rpm.js"></script>
     <link rel="stylesheet" href="../../doc/docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
diff --git a/mode/rst/index.html b/mode/rst/index.html
index eec3013132..1ced39ca96 100644
--- a/mode/rst/index.html
+++ b/mode/rst/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/mode/overlay.js"></script>
 <script src="rst.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/rust/index.html b/mode/rust/index.html
index 5903fb40a1..ce9789851f 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/mode/simple.js"></script>
 <script src="rust.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/sas/index.html b/mode/sas/index.html
index 7146486786..b8627484e0 100644
--- a/mode/sas/index.html
+++ b/mode/sas/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../xml/xml.js"></script>
 <script src="sas.js"></script>
-<style type="text/css">
+<style>
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
   .cm-s-default .cm-trailing-space-a:before,
   .cm-s-default .cm-trailing-space-b:before {position: absolute; content: "\00B7"; color: #777;}
diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index 8bc1c3d8fd..2082916d16 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../xml/xml.js"></script>
 <script src="smarty.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/solr/index.html b/mode/solr/index.html
index 8a0fdbed75..52eb87d99c 100644
--- a/mode/solr/index.html
+++ b/mode/solr/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="solr.js"></script>
-<style type="text/css">
+<style>
   .CodeMirror {
     border-top: 1px solid black;
     border-bottom: 1px solid black;
diff --git a/mode/soy/index.html b/mode/soy/index.html
index f9a1b59910..718e955593 100644
--- a/mode/soy/index.html
+++ b/mode/soy/index.html
@@ -12,7 +12,7 @@
 <script src="../javascript/javascript.js"></script>
 <script src="../css/css.js"></script>
 <script src="soy.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/spreadsheet/index.html b/mode/spreadsheet/index.html
index 03422bb94b..6589bcc727 100644
--- a/mode/spreadsheet/index.html
+++ b/mode/spreadsheet/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="spreadsheet.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index 661ddfefa4..8e1e5b1021 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -9,7 +9,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="tiddlywiki.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/tiki/index.html b/mode/tiki/index.html
index c9dbf8f796..40e9855737 100644
--- a/mode/tiki/index.html
+++ b/mode/tiki/index.html
@@ -8,7 +8,7 @@
 <link rel="stylesheet" href="tiki.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="tiki.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
@@ -85,7 +85,7 @@ <h2>Tiki wiki mode</h2>
 {plugin attr="my attr"}
 </textarea></div>
 
-<script type="text/javascript">
+<script>
 	var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: 'tiki',      
         lineNumbers: true
diff --git a/mode/toml/index.html b/mode/toml/index.html
index 05038a968c..5c359c79c0 100644
--- a/mode/toml/index.html
+++ b/mode/toml/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="toml.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/tornado/index.html b/mode/tornado/index.html
index d4a3a74a61..6b261cf073 100644
--- a/mode/tornado/index.html
+++ b/mode/tornado/index.html
@@ -10,7 +10,7 @@
 <script src="../xml/xml.js"></script>
 <script src="../htmlmixed/htmlmixed.js"></script>
 <script src="tornado.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/ttcn-cfg/index.html b/mode/ttcn-cfg/index.html
index 2ab7c2012a..0cc8048b25 100644
--- a/mode/ttcn-cfg/index.html
+++ b/mode/ttcn-cfg/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="ttcn-cfg.js"></script>
-<style type="text/css">
+<style>
     .CodeMirror {
         border-top: 1px solid black;
         border-bottom: 1px solid black;
diff --git a/mode/ttcn/index.html b/mode/ttcn/index.html
index 597329d871..d63043413d 100644
--- a/mode/ttcn/index.html
+++ b/mode/ttcn/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="ttcn.js"></script>
-<style type="text/css">
+<style>
     .CodeMirror {
         border-top: 1px solid black;
         border-bottom: 1px solid black;
diff --git a/mode/twig/index.html b/mode/twig/index.html
index 1fac45d0c8..12c8d6b0e4 100644
--- a/mode/twig/index.html
+++ b/mode/twig/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="twig.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/vb/index.html b/mode/vb/index.html
index bb84221c83..83c7182aad 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -5,10 +5,10 @@
 <link rel=stylesheet href="../../doc/docs.css">
 
 <link rel="stylesheet" href="../../lib/codemirror.css">
-<link href="http://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet" type="text/css">
+<link href="http://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet">
 <script src="../../lib/codemirror.js"></script>
 <script src="vb.js"></script>
-<script type="text/javascript" src="../../addon/runmode/runmode.js"></script>
+<script src="../../addon/runmode/runmode.js"></script>
 <style>
       .CodeMirror {border: 1px solid #aaa; height:210px; height: auto;}
       .CodeMirror-scroll { overflow-x: auto; overflow-y: hidden;}
diff --git a/mode/vbscript/index.html b/mode/vbscript/index.html
index d40da17f38..95a7da52fa 100644
--- a/mode/vbscript/index.html
+++ b/mode/vbscript/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="vbscript.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index 04122511d5..e38cf276b5 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="verilog.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/vhdl/index.html b/mode/vhdl/index.html
index 71caf2f0bb..ed34c25968 100644
--- a/mode/vhdl/index.html
+++ b/mode/vhdl/index.html
@@ -8,7 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="vhdl.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/webidl/index.html b/mode/webidl/index.html
index 45b6eeffea..e9c325ed59 100644
--- a/mode/webidl/index.html
+++ b/mode/webidl/index.html
@@ -7,7 +7,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="webidl.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id="nav">
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id="logo" src="../../doc/logo.png"></a>
diff --git a/mode/xml/index.html b/mode/xml/index.html
index ba6b0ef5b8..42d7d86cdd 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="xml.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/mode/xquery/index.html b/mode/xquery/index.html
index d79dbbf060..49960912ce 100644
--- a/mode/xquery/index.html
+++ b/mode/xquery/index.html
@@ -9,7 +9,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="xquery.js"></script>
-<style type="text/css">
+<style>
 	.CodeMirror {
 	  border-top: 1px solid black; border-bottom: 1px solid black;
 	  height:400px;
diff --git a/mode/z80/index.html b/mode/z80/index.html
index 39db506fbb..8f97cce2b8 100644
--- a/mode/z80/index.html
+++ b/mode/z80/index.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="z80.js"></script>
-<style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+<style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
 
diff --git a/test/index.html b/test/index.html
index 1bd50b1678..8cfb7387f2 100644
--- a/test/index.html
+++ b/test/index.html
@@ -54,7 +54,7 @@
 <script src="../mode/mscgen/mscgen.js"></script>
 <script src="../mode/dylan/dylan.js"></script>
 
-<style type="text/css">
+<style>
   .ok {color: #090;}
   .fail {color: #e00;}
   .error {color: #c90;}

From fcac0fb69bce4d82a1f9631e950ecb1d7f970de4 Mon Sep 17 00:00:00 2001
From: Seren D <sd@andydavies.net>
Date: Sat, 22 Sep 2018 15:03:52 +0100
Subject: [PATCH 3856/4742] Update colour contrast of commented code

The current contrast is 3.49:1, which is below the minimum 4.5 ratio needed to meet the WCAG AA guidelines. The proposed change increases the contrast to 4.52:1
---
 lib/codemirror.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index c7a8ae7047..9e2316877f 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -126,7 +126,7 @@
 .cm-s-default .cm-operator {}
 .cm-s-default .cm-variable-2 {color: #05a;}
 .cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
+.cm-s-default .cm-comment {color: #6b7884;}
 .cm-s-default .cm-string {color: #a11;}
 .cm-s-default .cm-string-2 {color: #f50;}
 .cm-s-default .cm-meta {color: #555;}

From fc60137bcc5737b7fa7146fdebf311a93a2f231a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 3 Oct 2018 13:47:29 +0200
Subject: [PATCH 3857/4742] Add selectionsMayTouch options

---
 doc/manual.html                 |  4 ++++
 src/edit/mouse_events.js        |  8 ++++----
 src/edit/options.js             |  1 +
 src/model/Doc.js                |  4 ++--
 src/model/change_measurement.js |  2 +-
 src/model/selection.js          |  6 ++++--
 src/model/selection_updates.js  |  8 ++++----
 test/multi_test.js              | 10 ++++++++++
 8 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f2de759992..cd30e11ed0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -425,6 +425,10 @@ <h2>Configuration</h2>
       selection. You can set this to <code>false</code> to disable
       that behavior.</dd>
 
+      <dt id="option_selectionsMayTouch"><code><strong>selectionsMayTouch</strong>: boolean</code></dt>
+      <dd>Determines whether multiple selections are joined as soon as
+      they touch (the default) or only when they overlap (true).</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/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 803f4ced53..b62789ee2a 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -226,10 +226,10 @@ function leftButtonSelect(cm, event, start, behavior) {
     startSel = doc.sel
   } else if (ourIndex == -1) {
     ourIndex = ranges.length
-    setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
+    setSelection(doc, normalizeSelection(cm, ranges.concat([ourRange]), ourIndex),
                  {scroll: false, origin: "*mouse"})
   } else if (ranges.length > 1 && ranges[ourIndex].empty() && behavior.unit == "char" && !behavior.extend) {
-    setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
+    setSelection(doc, normalizeSelection(cm, ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
                  {scroll: false, origin: "*mouse"})
     startSel = doc.sel
   } else {
@@ -255,7 +255,7 @@ function leftButtonSelect(cm, event, start, behavior) {
           ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))))
       }
       if (!ranges.length) ranges.push(new Range(start, start))
-      setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
+      setSelection(doc, normalizeSelection(cm, startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
                    {origin: "*mouse", scroll: false})
       cm.scrollIntoView(pos)
     } else {
@@ -271,7 +271,7 @@ function leftButtonSelect(cm, event, start, behavior) {
       }
       let ranges = startSel.ranges.slice(0)
       ranges[ourIndex] = bidiSimplify(cm, new Range(clipPos(doc, anchor), head))
-      setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse)
+      setSelection(doc, normalizeSelection(cm, ranges, ourIndex), sel_mouse)
     }
   }
 
diff --git a/src/edit/options.js b/src/edit/options.js
index 0ba5d4e3b8..a649a4a694 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -122,6 +122,7 @@ export function defineOptions(CodeMirror) {
   option("resetSelectionOnContextMenu", true)
   option("lineWiseCopyCut", true)
   option("pasteLinesPerSelection", true)
+  option("selectionsMayTouch", false)
 
   option("readOnly", false, (cm, val) => {
     if (val == "nocursor") {
diff --git a/src/model/Doc.js b/src/model/Doc.js
index b64ac84373..956f752b9b 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -139,12 +139,12 @@ Doc.prototype = createObj(BranchChunk.prototype, {
       out[i] = new Range(clipPos(this, ranges[i].anchor),
                          clipPos(this, ranges[i].head))
     if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex)
-    setSelection(this, normalizeSelection(out, primary), options)
+    setSelection(this, normalizeSelection(this.cm, out, primary), options)
   }),
   addSelection: docMethodOp(function(anchor, head, options) {
     let ranges = this.sel.ranges.slice(0)
     ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)))
-    setSelection(this, normalizeSelection(ranges, ranges.length - 1), options)
+    setSelection(this, normalizeSelection(this.cm, ranges, ranges.length - 1), options)
   }),
 
   getSelection: function(lineSep) {
diff --git a/src/model/change_measurement.js b/src/model/change_measurement.js
index 4d45313dee..010e7f81e1 100644
--- a/src/model/change_measurement.js
+++ b/src/model/change_measurement.js
@@ -29,7 +29,7 @@ export function computeSelAfterChange(doc, change) {
     out.push(new Range(adjustForChange(range.anchor, change),
                        adjustForChange(range.head, change)))
   }
-  return normalizeSelection(out, doc.sel.primIndex)
+  return normalizeSelection(doc.cm, out, doc.sel.primIndex)
 }
 
 function offsetPos(pos, old, nw) {
diff --git a/src/model/selection.js b/src/model/selection.js
index 2e374aa822..f3aa17032b 100644
--- a/src/model/selection.js
+++ b/src/model/selection.js
@@ -61,13 +61,15 @@ export class Range {
 // Take an unsorted, potentially overlapping set of ranges, and
 // build a selection out of it. 'Consumes' ranges array (modifying
 // it).
-export function normalizeSelection(ranges, primIndex) {
+export function normalizeSelection(cm, ranges, primIndex) {
+  let mayTouch = cm && cm.options.selectionsMayTouch
   let prim = ranges[primIndex]
   ranges.sort((a, b) => cmp(a.from(), b.from()))
   primIndex = indexOf(ranges, prim)
   for (let i = 1; i < ranges.length; i++) {
     let cur = ranges[i], prev = ranges[i - 1]
-    if (cmp(prev.to(), cur.from()) >= 0) {
+    let diff = cmp(prev.to(), cur.from())
+    if (mayTouch ? diff > 0 : diff >= 0) {
       let from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to())
       let inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head
       if (i <= primIndex) --primIndex
diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index 77986a9e9a..c13ce9f3e2 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -47,7 +47,7 @@ export function extendSelections(doc, heads, options) {
   let extend = doc.cm && (doc.cm.display.shift || doc.extend)
   for (let i = 0; i < doc.sel.ranges.length; i++)
     out[i] = extendRange(doc.sel.ranges[i], heads[i], null, extend)
-  let newSel = normalizeSelection(out, doc.sel.primIndex)
+  let newSel = normalizeSelection(doc.cm, out, doc.sel.primIndex)
   setSelection(doc, newSel, options)
 }
 
@@ -55,7 +55,7 @@ export function extendSelections(doc, heads, options) {
 export function replaceOneSelection(doc, i, range, options) {
   let ranges = doc.sel.ranges.slice(0)
   ranges[i] = range
-  setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options)
+  setSelection(doc, normalizeSelection(doc.cm, ranges, doc.sel.primIndex), options)
 }
 
 // Reset the selection to a single range.
@@ -78,7 +78,7 @@ function filterSelectionChange(doc, sel, options) {
   }
   signal(doc, "beforeSelectionChange", doc, obj)
   if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj)
-  if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1)
+  if (obj.ranges != sel.ranges) return normalizeSelection(doc.cm, obj.ranges, obj.ranges.length - 1)
   else return sel
 }
 
@@ -142,7 +142,7 @@ function skipAtomicInSelection(doc, sel, bias, mayClear) {
       out[i] = new Range(newAnchor, newHead)
     }
   }
-  return out ? normalizeSelection(out, sel.primIndex) : sel
+  return out ? normalizeSelection(doc.cm, out, sel.primIndex) : sel
 }
 
 function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
diff --git a/test/multi_test.js b/test/multi_test.js
index 49169b9900..cc042f7399 100644
--- a/test/multi_test.js
+++ b/test/multi_test.js
@@ -282,4 +282,14 @@
     cm.execCommand("redoSelection");
     eq(cm.getSelection(), "1\n2\n3");
   }, {value: "1 2 3"});
+
+  testCM("selectionsMayTouch", function(cm) {
+    select(cm, Pos(0, 0), Pos(0, 2))
+    cm.setExtending(true);
+    cm.extendSelections([Pos(0, 2), Pos(0, 4)])
+    hasSelections(cm, 0, 0, 0, 2,
+                  0, 2, 0, 4)
+    cm.extendSelections([Pos(0, 3), Pos(0, 4)])
+    hasSelections(cm, 0, 0, 0, 4)
+  }, {selectionsMayTouch: true, value: "1234"})
 })();

From 08f965e68526ff6c21f264db10a0f8395281c181 Mon Sep 17 00:00:00 2001
From: sverweij <sverweij@users.noreply.github.com>
Date: Wed, 3 Oct 2018 21:49:38 +0200
Subject: [PATCH 3858/4742] =?UTF-8?q?[mscgen=20mode]=20Add=20new=20keyword?=
 =?UTF-8?q?s=20for=20x=C3=B9=20and=20msgenny?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

options: wordwrapentities

attributes (xù only): title, activate, deactivate, activation
---
 mode/mscgen/mscgen.js       | 6 +++---
 mode/mscgen/mscgen_test.js  | 2 +-
 mode/mscgen/msgenny_test.js | 1 +
 mode/mscgen/xu_test.js      | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
index 01be09b293..6f4f9cd8f0 100644
--- a/mode/mscgen/mscgen.js
+++ b/mode/mscgen/mscgen.js
@@ -33,9 +33,9 @@
     },
     xu: {
       "keywords" : ["msc", "xu"],
-      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "wordwrapentities", "watermark"],
       "constants" : ["true", "false", "on", "off", "auto"],
-      "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
+      "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip", "title", "deactivate", "activate", "activation"],
       "brackets" : ["\\{", "\\}"],  // [ and  ] are brackets too, but these get handled in with lists
       "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
       "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
@@ -44,7 +44,7 @@
     },
     msgenny: {
       "keywords" : null,
-      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
+      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "wordwrapentities", "watermark"],
       "constants" : ["true", "false", "on", "off", "auto"],
       "attributes" : null,
       "brackets" : ["\\{", "\\}"],
diff --git a/mode/mscgen/mscgen_test.js b/mode/mscgen/mscgen_test.js
index 286b7ce90e..99991da6f8 100644
--- a/mode/mscgen/mscgen_test.js
+++ b/mode/mscgen/mscgen_test.js
@@ -25,7 +25,7 @@
   );
 
   MT("xù/ msgenny keywords classify as 'base'",
-    "[base watermark]",
+    "[base watermark wordwrapentities]",
     "[base alt loop opt ref else break par seq assert]"
   );
 
diff --git a/mode/mscgen/msgenny_test.js b/mode/mscgen/msgenny_test.js
index 90ec38ca8a..a3ed577dd2 100644
--- a/mode/mscgen/msgenny_test.js
+++ b/mode/mscgen/msgenny_test.js
@@ -20,6 +20,7 @@
 
   MT("xù/ msgenny keywords classify as 'keyword'",
     "[keyword watermark]",
+    "[keyword wordwrapentities]",
     "[keyword alt]","[keyword loop]","[keyword opt]","[keyword ref]","[keyword else]","[keyword break]","[keyword par]","[keyword seq]","[keyword assert]"
   );
 
diff --git a/mode/mscgen/xu_test.js b/mode/mscgen/xu_test.js
index 76a85d23b4..d65a058712 100644
--- a/mode/mscgen/xu_test.js
+++ b/mode/mscgen/xu_test.js
@@ -60,7 +60,8 @@
     "[attribute id]","[attribute url]","[attribute idurl]",
     "[attribute linecolor]","[attribute linecolour]","[attribute textcolor]","[attribute textcolour]","[attribute textbgcolor]","[attribute textbgcolour]",
     "[attribute arclinecolor]","[attribute arclinecolour]","[attribute arctextcolor]","[attribute arctextcolour]","[attribute arctextbgcolor]","[attribute arctextbgcolour]",
-    "[attribute arcskip][bracket ]]]"
+    "[attribute arcskip]","[attribute title]",
+    "[attribute activate]","[attribute deactivate]","[attribute activation][bracket ]]]"
   );
 
   MT("outside an attribute list, attributes classify as base",
@@ -68,7 +69,7 @@
     "[base id]","[base url]","[base idurl]",
     "[base linecolor]","[base linecolour]","[base textcolor]","[base textcolour]","[base textbgcolor]","[base textbgcolour]",
     "[base arclinecolor]","[base arclinecolour]","[base arctextcolor]","[base arctextcolour]","[base arctextbgcolor]","[base arctextbgcolour]",
-    "[base arcskip]"
+    "[base arcskip]", "[base title]"
   );
 
   MT("a typical program",
@@ -79,7 +80,7 @@
     "[base   b][bracket [[][attribute label][operator =][string \"Entity B\"][bracket ]]][base ,]",
     "[base   c][bracket [[][attribute label][operator =][string \"Entity C\"][bracket ]]][base ;]",
     "[base   a ][keyword =>>][base  b][bracket [[][attribute label][operator =][string \"Hello entity B\"][bracket ]]][base ;]",
-    "[base   a ][keyword <<][base  b][bracket [[][attribute label][operator =][string \"Here's an answer dude!\"][bracket ]]][base ;]",
+    "[base   a ][keyword <<][base  b][bracket [[][attribute label][operator =][string \"Here's an answer dude!\"][base , ][attribute title][operator =][string \"This is a title for this message\"][bracket ]]][base ;]",
     "[base   c ][keyword :>][base  *][bracket [[][attribute label][operator =][string \"What about me?\"][base , ][attribute textcolor][operator =][base red][bracket ]]][base ;]",
     "[bracket }]"
   );

From 49490e55276aeb047a6be4eafd12c4cdcdfa4d31 Mon Sep 17 00:00:00 2001
From: sverweij <sverweij@users.noreply.github.com>
Date: Wed, 3 Oct 2018 21:53:02 +0200
Subject: [PATCH 3859/4742] [mscgen mode] correct a typo in the mscgen
 non-rregression

---
 mode/mscgen/mscgen_test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/mscgen/mscgen_test.js b/mode/mscgen/mscgen_test.js
index 99991da6f8..ff3816d853 100644
--- a/mode/mscgen/mscgen_test.js
+++ b/mode/mscgen/mscgen_test.js
@@ -25,7 +25,8 @@
   );
 
   MT("xù/ msgenny keywords classify as 'base'",
-    "[base watermark wordwrapentities]",
+    "[base watermark]",
+    "[base wordwrapentities]",
     "[base alt loop opt ref else break par seq assert]"
   );
 

From b6800d1ad6cce17ed74edd153f9107a0671d5181 Mon Sep 17 00:00:00 2001
From: Matthew Suozzo <matthew.suozzo@gmail.com>
Date: Sat, 6 Oct 2018 04:47:02 -0400
Subject: [PATCH 3860/4742] [vim] Add a non-recursive map command

This will allow for more powerful mapping capabilities like arbitrary command
remapping, rebinding the home row, etc.

This doesn't quite match Vim's non-recursive behavior because there's no support
for non-recursive keyToKey mappings. Without this support, we'd just be creating
normal, recursive keyToKey mappings which I think would be even more frustrating
and/or surprising (e.g. two inverse non-recursive maps would cause infinite recursion).
Once this support is added for this, though, it will be trivial to create these mappings
at the end of the added function and achieve the most accurate behavior.

One potential paper cut with this implementation is that multiple calls to `unmap` may
be required to fully remove the `noremap`ed values. I think this isn't that severe though
because this looks to be the current behavior with all other `map` operations.
---
 keymap/vim.js    | 41 ++++++++++++++++++++++++++++++++++++++++-
 test/vim_test.js | 25 ++++++++++++++++++++++++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b03c1393cb..f58e99a300 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3,7 +3,7 @@
 
 /**
  * Supported keybindings:
- *   Too many to list. Refer to defaultKeyMap below.
+ *   Too many to list. Refer to defaultKeymap below.
  *
  * Supported Ex commands:
  *   Refer to defaultExCommandMap below.
@@ -207,6 +207,7 @@
     // Ex command
     { keys: ':', type: 'ex' }
   ];
+  var defaultKeymapLength = defaultKeymap.length;
 
   /**
    * Ex commands
@@ -742,6 +743,44 @@
       unmap: function(lhs, ctx) {
         exCommandDispatcher.unmap(lhs, ctx);
       },
+      // Non-recursive map function.
+      // NOTE: This will not create mappings to key maps that aren't present
+      // in the default key map. See TODO at bottom of function.
+      noremap: function(lhs, rhs, ctx) {
+        function toCtxArray(ctx) {
+          return ctx ? [ctx] : ['normal', 'insert', 'visual'];
+        }
+        var ctxsToMap = toCtxArray(ctx);
+        // Look through all actual defaults to find a map candidate.
+        var actualLength = defaultKeymap.length, origLength = defaultKeymapLength;
+        for (var i = actualLength - origLength - 1;
+             i < actualLength && ctxsToMap.length;
+             i++) {
+          var mapping = defaultKeymap[i];
+          // Omit mappings that operate in the wrong context(s) and those of invalid type.
+          if (mapping.keys == rhs &&
+              (!ctx || !mapping.context || mapping.context === ctx) &&
+              mapping.type.substr(0, 2) !== 'ex' &&
+              mapping.type.substr(0, 3) !== 'key') {
+            // Make a shallow copy of the original keymap entry.
+            var newMapping = {};
+            for (var key in mapping) {
+              newMapping[key] = mapping[key];
+            }
+            // Modify it point to the new mapping with the proper context.
+            newMapping.keys = lhs;
+            if (ctx && !newMapping.context) {
+              newMapping.context = ctx;
+            }
+            // Add it to the keymap with a higher priority than the original.
+            this._mapCommand(newMapping);
+            // Record the mapped contexts as complete.
+            var mappedCtxs = toCtxArray(mapping.context);
+            ctxsToMap = ctxsToMap.filter(function(el) { return mappedCtxs.indexOf(el) === -1; });
+          }
+        }
+        // TODO: Create non-recursive keyToKey mappings for the unmapped contexts once those exist.
+      },
       // 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,
diff --git a/test/vim_test.js b/test/vim_test.js
index d70a46d7c7..ea90c1bbee 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4245,7 +4245,6 @@ testVim('ex_unmap_api', function(cm, vim, helpers) {
   CodeMirror.Vim.unmap("<Alt-X>", "normal");
   is(!CodeMirror.Vim.handleKey(cm, "<Alt-X>", "normal"), "Alt-X key is unmapped");
 });
-
 // Testing registration of functions as ex-commands and mapping to <Key>-keys
 testVim('ex_api_test', function(cm, vim, helpers) {
   var res=false;
@@ -4268,6 +4267,30 @@ testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
   eq('bc', cm.getValue());
 }, { value: 'abc' });
 
+testVim('noremap', function(cm, vim, helpers) {
+  CodeMirror.Vim.noremap(';', 'l');
+  cm.setCursor(0, 0);
+  eq('wOrd1', cm.getValue());
+  // Mapping should work in normal mode.
+  helpers.doKeys(';', 'r', '1');
+  eq('w1rd1', cm.getValue());
+  // Mapping will not work in insert mode because of no current fallback
+  // keyToKey mapping support.
+  helpers.doKeys('i', ';', '<Esc>');
+  eq('w;1rd1', cm.getValue());
+}, { value: 'wOrd1' });
+testVim('noremap_swap', function(cm, vim, helpers) {
+  CodeMirror.Vim.noremap('i', 'a', 'normal');
+  CodeMirror.Vim.noremap('a', 'i', 'normal');
+  cm.setCursor(0, 0);
+  // 'a' should act like 'i'.
+  helpers.doKeys('a');
+  eqCursorPos(Pos(0, 0), cm.getCursor());
+  // ...and 'i' should act like 'a'.
+  helpers.doKeys('<Esc>', 'i');
+  eqCursorPos(Pos(0, 1), cm.getCursor());
+}, { value: 'foo' });
+
 // Test event handlers
 testVim('beforeSelectionChange', function(cm, vim, helpers) {
   cm.setCursor(0, 100);

From 7af1022ac2a5ac456e5eccf80f06267a9f28e730 Mon Sep 17 00:00:00 2001
From: Abhishek Gahlot <me@abhishek.it>
Date: Sun, 7 Oct 2018 03:02:55 +0530
Subject: [PATCH 3861/4742] [d mode] Fix line comments

---
 mode/d/d.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mode/d/d.js b/mode/d/d.js
index 6f68c3a69b..efab570633 100644
--- a/mode/d/d.js
+++ b/mode/d/d.js
@@ -182,7 +182,12 @@ CodeMirror.defineMode("d", function(config, parserConfig) {
       else return ctx.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: "{}"
+    electricChars: "{}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    blockCommentContinue: " * ",
+    lineComment: "//",
+    fold: "brace"
   };
 });
 

From 80eeba03634d70e81e1baec5d0942769490e97ea Mon Sep 17 00:00:00 2001
From: Brett Zamir <brettz9@yahoo.com>
Date: Tue, 2 Oct 2018 11:05:25 +0800
Subject: [PATCH 3862/4742] - Refactoring: Update to latest Rollup API - npm:
 Update node-static, Rollup deps; add `package-lock.json` to gitignore and use
 `author` field in `package.json`

---
 .gitignore       |  1 +
 package.json     | 20 +++++++++-----------
 rollup.config.js | 14 ++++++++------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 01019cf150..1767b6d833 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /node_modules
 /npm-debug.log
+/package-lock.json
 /test*.html
 .tern-*
 *~
diff --git a/package.json b/package.json
index 4c78f51e2c..073dccfe0b 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,11 @@
   "version": "5.40.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
+  "author": {
+    "name": "Marijn Haverbeke",
+    "email": "marijnh@gmail.com",
+    "url": "http://marijnhaverbeke.nl"
+  },
   "description": "Full-featured in-browser code editor",
   "license": "MIT",
   "directories": {
@@ -17,11 +22,11 @@
   },
   "devDependencies": {
     "blint": "^1",
-    "node-static": "0.6.0",
+    "node-static": "0.7.11",
     "phantomjs-prebuilt": "^2.1.12",
-    "rollup": "^0.41.0",
-    "rollup-plugin-buble": "^0.15.0",
-    "rollup-watch": "^3.2.0"
+    "rollup": "^0.66.2",
+    "rollup-plugin-buble": "^0.19.2",
+    "rollup-watch": "^4.3.1"
   },
   "bugs": "http://github.com/codemirror/CodeMirror/issues",
   "keywords": [
@@ -30,13 +35,6 @@
     "Editor"
   ],
   "homepage": "https://codemirror.net",
-  "maintainers": [
-    {
-      "name": "Marijn Haverbeke",
-      "email": "marijnh@gmail.com",
-      "web": "http://marijnhaverbeke.nl"
-    }
-  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/codemirror/CodeMirror.git"
diff --git a/rollup.config.js b/rollup.config.js
index caba5654c5..9036179e6d 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,7 +1,9 @@
 import buble from 'rollup-plugin-buble';
 
 export default {
-  banner: `// CodeMirror, copyright (c) by Marijn Haverbeke and others
+  input: "src/codemirror.js",
+  output: {
+    banner: `// CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: https://codemirror.net/LICENSE
 
 // This is CodeMirror (https://codemirror.net), a code editor
@@ -9,10 +11,10 @@ export default {
 //
 // You can find some technical background for some of the code below
 // at http://marijnhaverbeke.nl/blog/#cm-internals .
-`,
-  entry: "src/codemirror.js",
-  format: "umd",
-  dest: "lib/codemirror.js",
-  moduleName: "CodeMirror",
+  `,
+    format: "umd",
+    file: "lib/codemirror.js",
+    name: "CodeMirror"
+  },
   plugins: [ buble({namedFunctionExpressions: false}) ]
 };

From 6ec64f59cfd817ab1e8724c9e4b9a1498963e27d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 6 Oct 2018 23:49:44 +0200
Subject: [PATCH 3863/4742] Fix trailing whitespace in build output

---
 rollup.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollup.config.js b/rollup.config.js
index 9036179e6d..fbb4357175 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -11,7 +11,7 @@ export default {
 //
 // You can find some technical background for some of the code below
 // at http://marijnhaverbeke.nl/blog/#cm-internals .
-  `,
+`,
     format: "umd",
     file: "lib/codemirror.js",
     name: "CodeMirror"

From 57082511d17020897f6abb9cfc8dfee142cc54e0 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 8 Oct 2018 15:27:55 +0400
Subject: [PATCH 3864/4742] [vim] fix insert mode repeat after visualBlock
 edits

---
 keymap/vim.js    | 38 ++++++++++----------------------------
 test/vim_test.js |  4 +++-
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index f58e99a300..9d062e5256 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -5079,32 +5079,7 @@
       var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
       var isPlaying = macroModeState.isPlaying;
       var lastChange = macroModeState.lastInsertModeChanges;
-      // In case of visual block, the insertModeChanges are not saved as a
-      // single word, so we convert them to a single word
-      // so as to update the ". register as expected in real vim.
-      var text = [];
       if (!isPlaying) {
-        var selLength = lastChange.inVisualBlock && vim.lastSelection ?
-            vim.lastSelection.visualBlock.height : 1;
-        var changes = lastChange.changes;
-        var text = [];
-        var i = 0;
-        // In case of multiple selections in blockwise visual,
-        // the inserted text, for example: 'f<Backspace>oo', is stored as
-        // 'f', 'f', InsertModeKey 'o', 'o', 'o', 'o'. (if you have a block with 2 lines).
-        // We push the contents of the changes array as per the following:
-        // 1. In case of InsertModeKey, just increment by 1.
-        // 2. In case of a character, jump by selLength (2 in the example).
-        while (i < changes.length) {
-          // This loop will convert 'ff<bs>oooo' to 'f<bs>oo'.
-          text.push(changes[i]);
-          if (changes[i] instanceof InsertModeKey) {
-             i++;
-          } else {
-             i+= selLength;
-          }
-        }
-        lastChange.changes = text;
         cm.off('change', onChange);
         CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
       }
@@ -5235,17 +5210,24 @@
       if (!macroModeState.isPlaying) {
         while(changeObj) {
           lastChange.expectCursorActivityForChange = true;
-          if (changeObj.origin == '+input' || changeObj.origin == 'paste'
+          if (lastChange.ignoreCount > 1) {
+            lastChange.ignoreCount--;
+          } else if (changeObj.origin == '+input' || changeObj.origin == 'paste'
               || changeObj.origin === undefined /* only in testing */) {
+            var selectionCount = cm.listSelections().length;
+            if (selectionCount > 1)
+              lastChange.ignoreCount = selectionCount;
             var text = changeObj.text.join('\n');
             if (lastChange.maybeReset) {
               lastChange.changes = [];
               lastChange.maybeReset = false;
             }
-            if (cm.state.overwrite && !/\n/.test(text)) {
+            if (text) {
+              if (cm.state.overwrite && !/\n/.test(text)) {
                 lastChange.changes.push([text]);
-            } else {
+              } else {
                 lastChange.changes.push(text);
+              }
             }
           }
           // Change objects may be chained with next.
diff --git a/test/vim_test.js b/test/vim_test.js
index ea90c1bbee..9dca7d5ec0 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4231,7 +4231,9 @@ testVim('ex_imap', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   CodeMirror.Vim.map('jj', '<Esc>', 'insert');
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
-  var replacement = fillArray('fo', 3);
+  var replacement = fillArray('f', 3);
+  cm.replaceSelections(replacement);
+  var replacement = fillArray('o', 3);
   cm.replaceSelections(replacement);
   eq('1fo4\n5fo8\nafodefg', cm.getValue());
   helpers.doKeys('j', 'j');

From c310cb31d94f3235783e939c810deb4b8760add2 Mon Sep 17 00:00:00 2001
From: Matthew Suozzo <msuozzo@google.com>
Date: Mon, 8 Oct 2018 21:09:16 -0400
Subject: [PATCH 3865/4742] [vim] Fix existing and augment Vim noremap tests.

---
 test/vim_test.js | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/test/vim_test.js b/test/vim_test.js
index 9dca7d5ec0..3aa76878ee 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4280,6 +4280,8 @@ testVim('noremap', function(cm, vim, helpers) {
   // keyToKey mapping support.
   helpers.doKeys('i', ';', '<Esc>');
   eq('w;1rd1', cm.getValue());
+  // unmap all mappings
+  CodeMirror.Vim.unmap(';');
 }, { value: 'wOrd1' });
 testVim('noremap_swap', function(cm, vim, helpers) {
   CodeMirror.Vim.noremap('i', 'a', 'normal');
@@ -4291,7 +4293,45 @@ testVim('noremap_swap', function(cm, vim, helpers) {
   // ...and 'i' should act like 'a'.
   helpers.doKeys('<Esc>', 'i');
   eqCursorPos(Pos(0, 1), cm.getCursor());
+  // unmap all mappings
+  CodeMirror.Vim.unmap('a', 'normal');
+  CodeMirror.Vim.unmap('i', 'normal');
 }, { value: 'foo' });
+testVim('noremap_map_interaction', function(cm, vim, helpers) {
+  // noremap should clobber map
+  CodeMirror.Vim.map(';', 'l');
+  CodeMirror.Vim.noremap(';', 'l');
+  CodeMirror.Vim.map('l', 'j');
+  cm.setCursor(0, 0);
+  helpers.doKeys(';');
+  eqCursorPos(Pos(0, 1), cm.getCursor());
+  helpers.doKeys('l');
+  eqCursorPos(Pos(1, 1), cm.getCursor());
+  // map should be able to point to a noremap
+  CodeMirror.Vim.map('m', ';');
+  helpers.doKeys('m');
+  eqCursorPos(Pos(1, 2), cm.getCursor());
+  // unmap all mappings
+  CodeMirror.Vim.unmap('m');
+  CodeMirror.Vim.unmap('l');
+  CodeMirror.Vim.unmap(';');
+  CodeMirror.Vim.unmap(';');
+}, { value: 'wOrd1\nwOrd2' });
+testVim('noremap_map_interaction2', function(cm, vim, helpers) {
+  // map should point to the most recent noremap
+  CodeMirror.Vim.noremap(';', 'l');
+  CodeMirror.Vim.map('m', ';');
+  CodeMirror.Vim.noremap(';', 'h');
+  cm.setCursor(0, 0);
+  helpers.doKeys('l');
+  eqCursorPos(Pos(0, 1), cm.getCursor());
+  helpers.doKeys('m');
+  eqCursorPos(Pos(0, 0), cm.getCursor());
+  // unmap all mappings
+  CodeMirror.Vim.unmap(';');
+  CodeMirror.Vim.unmap('m');
+  CodeMirror.Vim.unmap(';');
+}, { value: 'wOrd1\nwOrd2' });
 
 // Test event handlers
 testVim('beforeSelectionChange', function(cm, vim, helpers) {

From 0f4cf11ac1544afba1b9ac872e79b4c1f73bf2e3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 9 Oct 2018 09:35:30 +0200
Subject: [PATCH 3866/4742] [sql mode] Fix bracket matching

Closes #5611
---
 mode/sql/sql.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index a573a682d4..d9f418b7f1 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -98,7 +98,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       return "operator";
     } else if (brackets.test(ch)) {
       // brackets
-      stream.eatWhile(brackets);
       return "bracket";
     } else if (punctuation.test(ch)) {
       // punctuation

From 46ae703c181f69336782a847043ff13cf6eb2db0 Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Tue, 9 Oct 2018 10:46:09 -0700
Subject: [PATCH 3867/4742] Ignore lastCopied if not paste.

---
 src/input/input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input.js b/src/input/input.js
index 0ca53ad89f..106b4b647a 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -50,7 +50,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
         from = Pos(from.line, from.ch - deleted)
       else if (cm.state.overwrite && !paste) // Handle overwrite
         to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length))
-      else if (lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
+      else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
         from = to = Pos(from.line, 0)
     }
     updateInput = cm.curOp.updateInput

From e4acffd52ea715f189e1bd755abbd5055287cedf Mon Sep 17 00:00:00 2001
From: Matthew Suozzo <msuozzo@google.com>
Date: Tue, 9 Oct 2018 23:08:57 -0400
Subject: [PATCH 3868/4742] [vim] Add an interface to clear user-defined
 mappings.

In Vim, this is the 'mapclear' command so that's what I've elected to
name the function in the API.

I've also updated the Vim test bindings to clear bindings after each
test that adds them.

Notably, this testing change surfaced an off-by-one error in the noremap
feature added recently. A fix for this is included.
---
 keymap/vim.js    | 36 +++++++++++++++++++++++++++++++-
 test/vim_test.js | 54 ++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 78 insertions(+), 12 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 9d062e5256..a734026de6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -753,7 +753,7 @@
         var ctxsToMap = toCtxArray(ctx);
         // Look through all actual defaults to find a map candidate.
         var actualLength = defaultKeymap.length, origLength = defaultKeymapLength;
-        for (var i = actualLength - origLength - 1;
+        for (var i = actualLength - origLength;
              i < actualLength && ctxsToMap.length;
              i++) {
           var mapping = defaultKeymap[i];
@@ -781,6 +781,40 @@
         }
         // TODO: Create non-recursive keyToKey mappings for the unmapped contexts once those exist.
       },
+      // Remove all user-defined mappings for the provided context.
+      mapclear: function(ctx) {
+        // Partition the existing keymap into user-defined and true defaults.
+        var actualLength = defaultKeymap.length,
+            origLength = defaultKeymapLength;
+        var userKeymap = defaultKeymap.slice(0, actualLength - origLength);
+        defaultKeymap = defaultKeymap.slice(actualLength - origLength);
+        if (ctx) {
+          // If a specific context is being cleared, we need to keep mappings
+          // from all other contexts.
+          for (var i = userKeymap.length - 1; i >= 0; i--) {
+            var mapping = userKeymap[i];
+            if (ctx !== mapping.context) {
+              if (mapping.context) {
+                this._mapCommand(mapping);
+              } else {
+                // `mapping` applies to all contexts so create keymap copies
+                // for each context except the one being cleared.
+                var contexts = ['normal', 'insert', 'visual'];
+                for (var j in contexts) {
+                  if (contexts[j] !== ctx) {
+                    var newMapping = {};
+                    for (var key in mapping) {
+                      newMapping[key] = mapping[key];
+                    }
+                    newMapping.context = contexts[j];
+                    this._mapCommand(newMapping);
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
       // 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,
diff --git a/test/vim_test.js b/test/vim_test.js
index 3aa76878ee..0f0492ca68 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4140,17 +4140,45 @@ testVim('ex_set_filetype_null', function(cm, vim, helpers) {
   helpers.doEx('set filetype=');
   eq('null', cm.getMode().name);
 });
-// TODO: Reset key maps after each test.
+
+testVim('mapclear', function(cm, vim, helpers) {
+  CodeMirror.Vim.map('w', 'l');
+  cm.setCursor(0, 0);
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('w');
+  helpers.assertCursorAt(0, 1);
+  CodeMirror.Vim.mapclear('visual');
+  helpers.doKeys('v', 'w', 'v');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('w');
+  helpers.assertCursorAt(0, 5);
+  CodeMirror.Vim.mapclear();
+}, { value: 'abc abc' });
+testVim('mapclear_context', function(cm, vim, helpers) {
+  CodeMirror.Vim.map('w', 'l', 'normal');
+  cm.setCursor(0, 0);
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('w');
+  helpers.assertCursorAt(0, 1);
+  CodeMirror.Vim.mapclear('normal');
+  helpers.doKeys('w');
+  helpers.assertCursorAt(0, 4);
+  CodeMirror.Vim.mapclear();
+}, { value: 'abc abc' });
+
 testVim('ex_map_key2key', function(cm, vim, helpers) {
   helpers.doEx('map a x');
   helpers.doKeys('a');
   helpers.assertCursorAt(0, 0);
   eq('bc', cm.getValue());
+  CodeMirror.Vim.mapclear();
 }, { value: 'abc' });
 testVim('ex_unmap_key2key', function(cm, vim, helpers) {
+  helpers.doEx('map a x');
   helpers.doEx('unmap a');
   helpers.doKeys('a');
   eq('vim-insert', cm.getOption('keyMap'));
+  CodeMirror.Vim.mapclear();
 }, { value: 'abc' });
 testVim('ex_unmap_key2key_does_not_remove_default', function(cm, vim, helpers) {
   try {
@@ -4159,6 +4187,7 @@ testVim('ex_unmap_key2key_does_not_remove_default', function(cm, vim, helpers) {
   } catch (expected) {}
   helpers.doKeys('a');
   eq('vim-insert', cm.getOption('keyMap'));
+  CodeMirror.Vim.mapclear();
 }, { value: 'abc' });
 testVim('ex_map_key2key_to_colon', function(cm, vim, helpers) {
   helpers.doEx('map ; :');
@@ -4168,12 +4197,14 @@ testVim('ex_map_key2key_to_colon', function(cm, vim, helpers) {
   }
   helpers.doKeys(';');
   eq(dialogOpened, true);
+  CodeMirror.Vim.mapclear();
 });
 testVim('ex_map_ex2key:', function(cm, vim, helpers) {
   helpers.doEx('map :del x');
   helpers.doEx('del');
   helpers.assertCursorAt(0, 0);
   eq('bc', cm.getValue());
+  CodeMirror.Vim.mapclear();
 }, { value: 'abc' });
 testVim('ex_map_ex2ex', function(cm, vim, helpers) {
   helpers.doEx('map :del :w');
@@ -4188,6 +4219,7 @@ testVim('ex_map_ex2ex', function(cm, vim, helpers) {
   CodeMirror.commands.save = tmp;
   eq(written, true);
   eq(actualCm, cm);
+  CodeMirror.Vim.mapclear();
 });
 testVim('ex_map_key2ex', function(cm, vim, helpers) {
   helpers.doEx('map a :w');
@@ -4202,6 +4234,7 @@ testVim('ex_map_key2ex', function(cm, vim, helpers) {
   CodeMirror.commands.save = tmp;
   eq(written, true);
   eq(actualCm, cm);
+  CodeMirror.Vim.mapclear();
 });
 testVim('ex_map_key2key_visual_api', function(cm, vim, helpers) {
   CodeMirror.Vim.map('b', ':w', 'visual');
@@ -4221,6 +4254,7 @@ testVim('ex_map_key2key_visual_api', function(cm, vim, helpers) {
   eq(actualCm, cm);
 
   CodeMirror.commands.save = tmp;
+  CodeMirror.Vim.mapclear();
 });
 testVim('ex_imap', function(cm, vim, helpers) {
   CodeMirror.Vim.map('jk', '<Esc>', 'insert');
@@ -4240,12 +4274,14 @@ testVim('ex_imap', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('.');
   eq('foo4\nfoo8\nfoodefg', cm.getValue());
+  CodeMirror.Vim.mapclear();
 }, { value: '1234\n5678\nabcdefg' });
 testVim('ex_unmap_api', function(cm, vim, helpers) {
   CodeMirror.Vim.map('<Alt-X>', 'gg', 'normal');
   is(CodeMirror.Vim.handleKey(cm, "<Alt-X>", "normal"), "Alt-X key is mapped");
   CodeMirror.Vim.unmap("<Alt-X>", "normal");
   is(!CodeMirror.Vim.handleKey(cm, "<Alt-X>", "normal"), "Alt-X key is unmapped");
+  CodeMirror.Vim.mapclear();
 });
 // Testing registration of functions as ex-commands and mapping to <Key>-keys
 testVim('ex_api_test', function(cm, vim, helpers) {
@@ -4260,6 +4296,7 @@ testVim('ex_api_test', function(cm, vim, helpers) {
   CodeMirror.Vim.map('<C-CR><Space>',':ext');
   helpers.doKeys('<C-CR>','<Space>');
   is(res,'Mapping to key failed');
+  CodeMirror.Vim.mapclear();
 });
 // For now, this test needs to be last because it messes up : for future tests.
 testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
@@ -4267,6 +4304,7 @@ testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
   helpers.doKeys(':');
   helpers.assertCursorAt(0, 0);
   eq('bc', cm.getValue());
+  CodeMirror.Vim.mapclear();
 }, { value: 'abc' });
 
 testVim('noremap', function(cm, vim, helpers) {
@@ -4281,7 +4319,7 @@ testVim('noremap', function(cm, vim, helpers) {
   helpers.doKeys('i', ';', '<Esc>');
   eq('w;1rd1', cm.getValue());
   // unmap all mappings
-  CodeMirror.Vim.unmap(';');
+  CodeMirror.Vim.mapclear();
 }, { value: 'wOrd1' });
 testVim('noremap_swap', function(cm, vim, helpers) {
   CodeMirror.Vim.noremap('i', 'a', 'normal');
@@ -4294,8 +4332,7 @@ testVim('noremap_swap', function(cm, vim, helpers) {
   helpers.doKeys('<Esc>', 'i');
   eqCursorPos(Pos(0, 1), cm.getCursor());
   // unmap all mappings
-  CodeMirror.Vim.unmap('a', 'normal');
-  CodeMirror.Vim.unmap('i', 'normal');
+  CodeMirror.Vim.mapclear();
 }, { value: 'foo' });
 testVim('noremap_map_interaction', function(cm, vim, helpers) {
   // noremap should clobber map
@@ -4312,10 +4349,7 @@ testVim('noremap_map_interaction', function(cm, vim, helpers) {
   helpers.doKeys('m');
   eqCursorPos(Pos(1, 2), cm.getCursor());
   // unmap all mappings
-  CodeMirror.Vim.unmap('m');
-  CodeMirror.Vim.unmap('l');
-  CodeMirror.Vim.unmap(';');
-  CodeMirror.Vim.unmap(';');
+  CodeMirror.Vim.mapclear();
 }, { value: 'wOrd1\nwOrd2' });
 testVim('noremap_map_interaction2', function(cm, vim, helpers) {
   // map should point to the most recent noremap
@@ -4328,9 +4362,7 @@ testVim('noremap_map_interaction2', function(cm, vim, helpers) {
   helpers.doKeys('m');
   eqCursorPos(Pos(0, 0), cm.getCursor());
   // unmap all mappings
-  CodeMirror.Vim.unmap(';');
-  CodeMirror.Vim.unmap('m');
-  CodeMirror.Vim.unmap(';');
+  CodeMirror.Vim.mapclear();
 }, { value: 'wOrd1\nwOrd2' });
 
 // Test event handlers

From d4ec1da879c50790cbbc76b484640b5748781e11 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 11 Oct 2018 11:01:00 +0200
Subject: [PATCH 3869/4742] Document default mouse behavior in the manual

Issue #5603
---
 doc/manual.html | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index cd30e11ed0..0840aac874 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -332,16 +332,27 @@ <h2>Configuration</h2>
         <dl>
           <dt><code><strong>unit</strong>: "char" | "word" | "line" | "rectangle" | fn(CodeMirror, Pos) → {from: Pos, to: Pos}</code></dt>
           <dd>The unit by which to select. May be one of the built-in
-          units, or a function that takes a position and returns a
-          range around that, for a custom unit.</dd>
+          units or a function that takes a position and returns a
+          range around that, for a custom unit. The default is to
+          return <code>"word"</code> for double
+          clicks, <code>"line"</code> for triple
+          clicks, <code>"rectangle"</code> for alt-clicks (or, on
+          Chrome OS, meta-shift-clicks), and <code>"single"</code>
+          otherwise.</dd>
           <dt><code><strong>extend</strong>: bool</code></dt>
-          <dd>Whether to extend the existing selection range or start a new one.</dd>
+          <dd>Whether to extend the existing selection range or start
+          a new one. By default, this is enabled when shift
+          clicking.</dd>
           <dt><code><strong>addNew</strong>: bool</code></dt>
-          <dd>When enabled, this adds a new range to the existing selection, rather than replacing it.</dd>
+          <dd>When enabled, this adds a new range to the existing
+          selection, rather than replacing it. The default behavior is
+          to enable this for command-click on Mac OS, and
+          control-click on other platforms.</dd>
           <dt><code><strong>moveOnDrag</strong>: bool</code></dt>
           <dd>When the mouse even drags content around inside the
           editor, this controls whether it is copied (false) or moved
-          (true).</dd>
+          (true). By default, this is enabled by alt-clicking on Mac
+          OS, and ctrl-clicking elsewhere.</dd>
         </dl>
       </dd>
 

From 1cca2b125d052241d61477a1cd35a9b5cb4dc52f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 12 Oct 2018 09:52:53 +0200
Subject: [PATCH 3870/4742] Make endOperation a no-op when no operation is
 active

Issue #5617
---
 src/display/operations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 5cc26d265d..9cc5198106 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -44,7 +44,7 @@ export function startOperation(cm) {
 // Finish an operation, updating the display and signalling delayed events
 export function endOperation(cm) {
   let op = cm.curOp
-  finishOperation(op, group => {
+  if (op) finishOperation(op, group => {
     for (let i = 0; i < group.ops.length; i++)
       group.ops[i].cm.curOp = null
     endOperations(group)

From 636ea4fa2e41704972d7277aa163db1ac083314a Mon Sep 17 00:00:00 2001
From: Dave MacLachlan <dmaclach@gmail.com>
Date: Wed, 17 Oct 2018 20:06:04 -0700
Subject: [PATCH 3871/4742] Add support for _[A-Z].* and __.* types to clike
 languages.

From C++ Standard
Each name that contains a double underscore (__) or begins with an
underscore followed by an uppercase letter (2.11) is reserved to
the implementation for any use.

From C Standard
All identifiers that begin with an underscore and either an
uppercase letter or another underscore are always reserved for any use.

Turns these all into "builtin".
---
 mode/clike/clike.js | 33 +++++++++++++++++++++++++--------
 mode/clike/test.js  | 20 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 480c380419..f6e045f1f9 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -65,7 +65,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       numberStart = parserConfig.numberStart || /[\d\.]/,
       number = parserConfig.number || /^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,
       isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/,
-      isIdentifierChar = parserConfig.isIdentifierChar || /[\w\$_\xa1-\uffff]/;
+      isIdentifierChar = parserConfig.isIdentifierChar || /[\w\$_\xa1-\uffff]/,
+      // An optional function that takes a {string} token and returns true if it
+      // should be treated as a builtin.
+      isReservedIdentifier = parserConfig.isReservedIdentifier || false;
 
   var curPunc, isDefKeyword;
 
@@ -113,7 +116,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       return "keyword";
     }
     if (contains(types, cur)) return "type";
-    if (contains(builtin, cur)) {
+    if (contains(builtin, cur)
+        || (isReservedIdentifier && isReservedIdentifier(cur))) {
       if (contains(blockKeywords, cur)) curPunc = "newstatement";
       return "builtin";
     }
@@ -286,6 +290,14 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return false;
   }
 
+  // For C and C++ (and ObjC): identifiers starting with __
+  // or _ followed by a capital letter are reserved for the compiler.
+  function cIsReservedIdentifier(token) {
+    if (!token || token.length < 2) return false;
+    if (token[0] != '_') return false;
+    return (token[1] == '_') || (token[1] !== token[1].toLowerCase());
+  }
+
   function cpp14Literal(stream) {
     stream.eatWhile(/[\w\.']/);
     return "number";
@@ -368,14 +380,17 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   def(["text/x-csrc", "text/x-c", "text/x-chdr"], {
     name: "clike",
     keywords: words(cKeywords),
-    types: words(cTypes + " bool _Complex _Bool float_t double_t intptr_t intmax_t " +
-                 "int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t " +
-                 "uint32_t uint64_t"),
+    types: words(cTypes + " bool float_t double_t intptr_t intmax_t int8_t int16_t " +
+                 "int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t uint32_t uint64_t"),
     blockKeywords: words("case do else for if switch while struct"),
     defKeywords: words("struct"),
     typeFirstDefinitions: true,
     atoms: words("NULL true false"),
-    hooks: {"#": cppHook, "*": pointerHook},
+    isReservedIdentifier: cIsReservedIdentifier,
+    hooks: {
+      "#": cppHook,
+      "*": pointerHook,
+    },
     modeProps: {fold: ["brace", "include"]}
   });
 
@@ -393,6 +408,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     atoms: words("true false NULL"),
     dontIndentStatements: /^template$/,
     isIdentifierChar: /[\w\$_~\xa1-\uffff]/,
+    isReservedIdentifier: cIsReservedIdentifier,
     hooks: {
       "#": cppHook,
       "*": pointerHook,
@@ -720,10 +736,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-objectivec", {
     name: "clike",
-    keywords: words(cKeywords + "inline restrict _Bool _Complex _Imaginary BOOL Class bycopy byref id IMP in " +
-                    "inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
+    keywords: words(cKeywords + "inline restrict BOOL Class bycopy byref id IMP in inout nil oneway out " +
+                    "Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
     types: words(cTypes),
     atoms: words("YES NO NULL NILL ON OFF true false"),
+    isReservedIdentifier: cIsReservedIdentifier,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$]/);
diff --git a/mode/clike/test.js b/mode/clike/test.js
index fc1f5d6cf1..068f5ce374 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -43,6 +43,11 @@
      "[type unsigned] [type int] [variable bar] [operator =] [number 8];",
      "[meta #include <baz> ][comment // comment]")
 
+  MT("c_underscores",
+     "[builtin __FOO];",
+     "[builtin _Complex];",
+     "[builtin __aName];",
+     "[variable _aName];");
 
   var mode_cpp = CodeMirror.getMode({indentUnit: 2}, "text/x-c++src");
   function MTCPP(name) { test.mode(name, mode_cpp, Array.prototype.slice.call(arguments, 1)); }
@@ -57,6 +62,21 @@
      "[def Foo::Foo]() {}",
      "[def Foo::~Foo]() {}");
 
+  MTCPP("cpp_underscores",
+        "[builtin __FOO];",
+        "[builtin _Complex];",
+        "[builtin __aName];",
+        "[variable _aName];");
+
+  var mode_objc = CodeMirror.getMode({indentUnit: 2}, "text/x-objectivec");
+  function MTOBJC(name) { test.mode(name, mode_objc, Array.prototype.slice.call(arguments, 1)); }
+
+  MTOBJC("objc_underscores",
+         "[builtin __FOO];",
+         "[builtin _Complex];",
+         "[builtin __aName];",
+         "[variable _aName];");
+
   var mode_scala = CodeMirror.getMode({indentUnit: 2}, "text/x-scala");
   function MTSCALA(name) { test.mode("scala_" + name, mode_scala, Array.prototype.slice.call(arguments, 1)); }
   MTSCALA("nested_comments",

From 6a72eda8c5b57d0a3fa499dc3eda9fe31a35e0d3 Mon Sep 17 00:00:00 2001
From: Curran Kelleher <curran.kelleher@gmail.com>
Date: Thu, 18 Oct 2018 18:03:48 +0530
Subject: [PATCH 3872/4742] Add mix-blend-mode CSS property. Closes #5625

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 8b5722905d..22b463c95b 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -501,7 +501,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "margin-bottom", "margin-left", "margin-right", "margin-top",
     "marks", "marquee-direction", "marquee-loop",
     "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
-    "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
+    "max-width", "min-height", "min-width", "mix-blend-mode", "move-to", "nav-down", "nav-index",
     "nav-left", "nav-right", "nav-up", "object-fit", "object-position",
     "opacity", "order", "orphans", "outline",
     "outline-color", "outline-offset", "outline-style", "outline-width",

From 98b395430654342ddbb8e1bc8f8293bcb5247276 Mon Sep 17 00:00:00 2001
From: dmaclach <dmaclach@gmail.com>
Date: Fri, 19 Oct 2018 00:54:08 -0700
Subject: [PATCH 3873/4742] [clike mode] Expand keyword support for ObjC(and
 update C/C++ to include new C99 keywords)

---
 mode/clike/clike.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index f6e045f1f9..51dbf4e854 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -267,7 +267,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     }
   }
   var cKeywords = "auto if break case register continue return default do sizeof " +
-    "static else struct switch extern typedef union for goto while enum const volatile";
+    "static else struct switch extern typedef union for goto while enum const " +
+    "volatile inline restrict asm fortran";
   var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
 
   function cppHook(stream, state) {
@@ -396,9 +397,9 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def(["text/x-c++src", "text/x-c++hdr"], {
     name: "clike",
-    keywords: words(cKeywords + " asm dynamic_cast namespace reinterpret_cast try explicit new " +
+    keywords: words(cKeywords + " dynamic_cast namespace reinterpret_cast try explicit new " +
                     "static_cast typeid catch operator template typename class friend private " +
-                    "this using const_cast inline public throw virtual delete mutable protected " +
+                    "this using const_cast public throw virtual delete mutable protected " +
                     "alignas alignof constexpr decltype nullptr noexcept thread_local final " +
                     "static_assert override"),
     types: words(cTypes + " bool wchar_t"),
@@ -724,7 +725,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-nesc", {
     name: "clike",
-    keywords: words(cKeywords + "as atomic async call command component components configuration event generic " +
+    keywords: words(cKeywords + " as atomic async call command component components configuration event generic " +
                     "implementation includes interface module new norace nx_struct nx_union post provides " +
                     "signal task uses abstract extends"),
     types: words(cTypes),
@@ -736,10 +737,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-objectivec", {
     name: "clike",
-    keywords: words(cKeywords + "inline restrict BOOL Class bycopy byref id IMP in inout nil oneway out " +
-                    "Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
+    keywords: words(cKeywords + " bycopy byref in inout oneway out self " +
+                    "super atomic nonatomic retain copy readwrite readonly " +
+                    "strong weak assign typeof nullable nonnull instancetype"),
     types: words(cTypes),
-    atoms: words("YES NO NULL NILL ON OFF true false"),
+    atoms: words("YES NO NULL Nil nil true false"),
     isReservedIdentifier: cIsReservedIdentifier,
     hooks: {
       "@": function(stream) {

From 3c833a033bb357ed87739033a4f1991824d3e40f Mon Sep 17 00:00:00 2001
From: Dave MacLachlan <dmaclach@gmail.com>
Date: Thu, 18 Oct 2018 09:57:55 -0700
Subject: [PATCH 3874/4742] Change Google Inc. to Google LLC (and added myself)

---
 AUTHORS        | 3 ++-
 bin/authors.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 0dfead74bd..8e9a2aa1b1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -179,6 +179,7 @@ darealshinji
 Darius Roberts
 databricks-david-lewis
 Dave Brondsema
+Dave MacLachlan
 Dave Myers
 David Barnett
 David H. Bronke
@@ -258,7 +259,7 @@ Glenn Jorde
 Glenn Ruehle
 goldsmcb
 Golevka
-Google Inc.
+Google LLC
 Gordon Smith
 Grant Skinner
 greengiant
diff --git a/bin/authors.sh b/bin/authors.sh
index 3f228c1fb0..0f1d09ea7d 100755
--- a/bin/authors.sh
+++ b/bin/authors.sh
@@ -2,5 +2,5 @@
 tail --lines=+3 AUTHORS > AUTHORS.tmp
 git log --format='%aN' | grep -v "Piët Delport" >> AUTHORS.tmp
 echo -e "List of CodeMirror contributors. Updated before every release.\n" > AUTHORS
-sort -u AUTHORS.tmp >> AUTHORS
+sort -u AUTHORS.tmp | sed 's/Google Inc\./Google LLC/' >> AUTHORS
 rm -f AUTHORS.tmp

From e0fae8253871300ecf8158eda3dc5ef8b5b3e9f0 Mon Sep 17 00:00:00 2001
From: guraga <kalimai@ro.ru>
Date: Thu, 13 Sep 2018 12:58:48 +0700
Subject: [PATCH 3875/4742] Make text more clear

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

diff --git a/doc/manual.html b/doc/manual.html
index 0840aac874..3d72a65ff9 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1277,12 +1277,12 @@ <h3 id="api_content">Content manipulation methods</h3>
       <dt id="lineCount"><code><strong>doc.lineCount</strong>() → integer</code></dt>
       <dd>Get the number of lines in the editor.</dd>
       <dt id="firstLine"><code><strong>doc.firstLine</strong>() → integer</code></dt>
-      <dd>Get the first line of the editor. This will
+      <dd>Get the number of first line in the editor. This will
       usually be zero but for <a href="#linkedDoc_from">linked sub-views</a>,
       or <a href="#api_doc">documents</a> instantiated with a non-zero
       first line, it might return other values.</dd>
       <dt id="lastLine"><code><strong>doc.lastLine</strong>() → integer</code></dt>
-      <dd>Get the last line of the editor. This will
+      <dd>Get the number of last line in the editor. This will
       usually be <code>doc.lineCount() - 1</code>,
       but for <a href="#linkedDoc_from">linked sub-views</a>,
       it might return other values.</dd>

From facc5d9198337bfc21fbe53f857d4d74e9c3cfd3 Mon Sep 17 00:00:00 2001
From: Dave MacLachlan <dmaclach@gmail.com>
Date: Fri, 19 Oct 2018 11:00:38 -0700
Subject: [PATCH 3876/4742] [clike mode] Add a better Objective C demo

Shows off some newer Objective C features and makes "visual" testing
new features easier.
---
 mode/clike/index.html | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/mode/clike/index.html b/mode/clike/index.html
index b1cef526b1..ad3a807dd9 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -147,16 +147,36 @@ <h2>Objective-C example</h2>
 That spans two lines
 */
 
-#import <Test/Test.h>
+#import "MyClass.h"
+#import <AFramework/AFrameork.h>
+@import BFrameworkModule;
+
+NS_ENUM(SomeValues) {
+  aValue = 1;
+};
+
+// A Class Extension with some properties
+@interface MyClass ()<AProtocol>
+@property(atomic, readwrite, assign) NSInteger anInt;
+@property(nonatomic, strong, nullable) NSString *aString;
+@end
+
 @implementation YourAppDelegate
 
-// This is a one-line comment
+- (instancetype)initWithString:(NSString *)aStringVar {
+  if ((self = [super init])) {
+    aString = aStringVar;
+  }
+  return self;
+}
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
-  char myString[] = "This is a C character array";
-  int test = 5;
-  return YES;
+- (BOOL)doSomething:(float)progress {
+  NSString *myString = @"This is a ObjC string %f ";
+  myString = [[NSString stringWithFormat:myString, progress] stringByAppendingString:self.aString];
+  return myString.length > 100 ? NO : YES;
 }
+
+@end
 </textarea></div>
 
 <h2>Java example</h2>

From 0874ab1de3a5ca233a50aaf86a6e3952c687f7ec Mon Sep 17 00:00:00 2001
From: Dave MacLachlan <dmaclach@gmail.com>
Date: Fri, 19 Oct 2018 15:42:01 -0700
Subject: [PATCH 3877/4742] [clike mode] Improve Objective C coloring and
 editing

Also cleans up defines and block keywords for C/C++.
---
 mode/clike/clike.js | 40 +++++++++++++++++++++++-----------------
 mode/clike/test.js  | 23 +++++++++++++++++++++++
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 51dbf4e854..0ee0aa5094 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -270,6 +270,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     "static else struct switch extern typedef union for goto while enum const " +
     "volatile inline restrict asm fortran";
   var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
+  var cBlockKeywords = "case do else for if switch while struct enum union";
+  var cDefKeywords = "struct enum union";
 
   function cppHook(stream, state) {
     if (!state.startOfLine) return false
@@ -383,8 +385,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     keywords: words(cKeywords),
     types: words(cTypes + " bool float_t double_t intptr_t intmax_t int8_t int16_t " +
                  "int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t uint32_t uint64_t"),
-    blockKeywords: words("case do else for if switch while struct"),
-    defKeywords: words("struct"),
+    blockKeywords: words(cBlockKeywords),
+    defKeywords: words(cDefKeywords),
     typeFirstDefinitions: true,
     atoms: words("NULL true false"),
     isReservedIdentifier: cIsReservedIdentifier,
@@ -403,8 +405,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "alignas alignof constexpr decltype nullptr noexcept thread_local final " +
                     "static_assert override"),
     types: words(cTypes + " bool wchar_t"),
-    blockKeywords: words("catch class do else finally for if struct switch try while"),
-    defKeywords: words("class namespace struct enum union"),
+    blockKeywords: words(cBlockKeywords +" class try catch finally"),
+    defKeywords: words(cDefKeywords + " class namespace"),
     typeFirstDefinitions: true,
     atoms: words("true false NULL"),
     dontIndentStatements: /^template$/,
@@ -729,7 +731,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "implementation includes interface module new norace nx_struct nx_union post provides " +
                     "signal task uses abstract extends"),
     types: words(cTypes),
-    blockKeywords: words("case do else for if switch while struct"),
+    blockKeywords: words(cBlockKeywords),
     atoms: words("null true false"),
     hooks: {"#": cppHook},
     modeProps: {fold: ["brace", "include"]}
@@ -737,23 +739,27 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-objectivec", {
     name: "clike",
-    keywords: words(cKeywords + " bycopy byref in inout oneway out self " +
-                    "super atomic nonatomic retain copy readwrite readonly " +
-                    "strong weak assign typeof nullable nonnull instancetype"),
-    types: words(cTypes),
+    keywords: words(cKeywords + " bycopy byref in inout oneway out self super atomic nonatomic retain copy " +
+                    "readwrite readonly strong weak assign typeof nullable nonnull null_resettable _cmd " +
+                    "@interface @implementation @end @protocol @encode @property @synthesize @dynamic @class " +
+                    "@public @package @private @protected @required @optional @try @catch @finally @import " +
+                    "@selector @encode @defs @synchronized @autoreleasepool @compatibility_alias @available"),
+    types: words(cTypes + " instancetype SEL id BOOL IMP Class"),
+    builtin: words("FOUNDATION_EXPORT FOUNDATION_EXTERN NS_INLINE NS_FORMAT_FUNCTION NS_RETURNS_RETAINED " +
+                   "NS_ERROR_ENUM NS_RETURNS_NOT_RETAINED NS_RETURNS_INNER_POINTER NS_DESIGNATED_INITIALIZER " +
+                   "NS_ENUM NS_OPTIONS NS_REQUIRES_NIL_TERMINATION NS_ASSUME_NONNULL_BEGIN " +
+                   "NS_ASSUME_NONNULL_END NS_SWIFT_NAME NS_REFINED_FOR_SWIFT"),
+    blockKeywords: words(cBlockKeywords + " @synthesize @try @catch @finally @autoreleasepool @synchronized"),
+    defKeywords: words(cDefKeywords + " @interface @implementation @protocol @class"),
+    dontIndentStatements: /^@.*$/,
+    typeFirstDefinitions: true,
     atoms: words("YES NO NULL Nil nil true false"),
     isReservedIdentifier: cIsReservedIdentifier,
     hooks: {
-      "@": function(stream) {
-        stream.eatWhile(/[\w\$]/);
-        return "keyword";
-      },
       "#": cppHook,
-      indent: function(_state, ctx, textAfter) {
-        if (ctx.type == "statement" && /^@\w/.test(textAfter)) return ctx.indented
-      }
+      "*": pointerHook,
     },
-    modeProps: {fold: "brace"}
+    modeProps: {fold: ["brace", "include"]}
   });
 
   def("text/x-squirrel", {
diff --git a/mode/clike/test.js b/mode/clike/test.js
index 068f5ce374..67aa602c06 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -23,6 +23,8 @@
   MT("def",
      "[type void] [def foo]() {}",
      "[keyword struct] [def bar]{}",
+     "[keyword enum] [def zot]{}",
+     "[keyword union] [def ugh]{}",
      "[type int] [type *][def baz]() {}");
 
   MT("def_new_line",
@@ -77,6 +79,27 @@
          "[builtin __aName];",
          "[variable _aName];");
 
+  MTOBJC("objc_interface",
+         "[keyword @interface] [def foo] {",
+         "  [type int] [variable bar];",
+         "}",
+         "[keyword @property] ([keyword atomic], [keyword nullable]) [variable NSString][operator *] [variable a];",
+         "[keyword @property] ([keyword nonatomic], [keyword assign]) [type int] [variable b];",
+         "[operator -]([type instancetype])[variable initWithFoo]:([type int])[variable a] " +
+           "[builtin NS_DESIGNATED_INITIALIZER];",
+         "[keyword @end]");
+
+  MTOBJC("objc_implementation",
+         "[keyword @implementation] [def foo] {",
+         "  [type int] [variable bar];",
+         "}",
+         "[keyword @property] ([keyword readwrite]) [type SEL] [variable a];",
+         "[operator -]([type instancetype])[variable initWithFoo]:([type int])[variable a] {",
+         "  [keyword if](([keyword self] [operator =] [[[keyword super] [variable init] ]])) {}",
+         "  [keyword return] [keyword self];",
+         "}",
+         "[keyword @end]");
+
   var mode_scala = CodeMirror.getMode({indentUnit: 2}, "text/x-scala");
   function MTSCALA(name) { test.mode("scala_" + name, mode_scala, Array.prototype.slice.call(arguments, 1)); }
   MTSCALA("nested_comments",

From 41e7ff5d04825c94703b2153aa72466546f2d5ab Mon Sep 17 00:00:00 2001
From: Dave MacLachlan <dmaclach@gmail.com>
Date: Fri, 19 Oct 2018 17:12:51 -0700
Subject: [PATCH 3878/4742] [fold brace-fold] Stop indent when open/close on
 same line.

Fix for issue 5632.
---
 addon/fold/brace-fold.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index c420c02aed..654d1fb691 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -54,7 +54,7 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
       ++pos;
     }
   }
-  if (end == null || line == end && endCh == startCh) return;
+  if (end == null || line == end) return;
   return {from: CodeMirror.Pos(line, startCh),
           to: CodeMirror.Pos(end, endCh)};
 });

From ca66e4039233980698a1947a15f71bf415996633 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 Oct 2018 17:58:24 +0200
Subject: [PATCH 3879/4742] Drop touching cursor selections even when
 selectionsMayTouch is true

So that you don't get inscrutable duplicate selections

Closes #5636
---
 src/model/selection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/selection.js b/src/model/selection.js
index f3aa17032b..793cb4ca0e 100644
--- a/src/model/selection.js
+++ b/src/model/selection.js
@@ -69,7 +69,7 @@ export function normalizeSelection(cm, ranges, primIndex) {
   for (let i = 1; i < ranges.length; i++) {
     let cur = ranges[i], prev = ranges[i - 1]
     let diff = cmp(prev.to(), cur.from())
-    if (mayTouch ? diff > 0 : diff >= 0) {
+    if (mayTouch && !cur.empty() ? diff > 0 : diff >= 0) {
       let from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to())
       let inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head
       if (i <= primIndex) --primIndex

From 7200bf7e4845945eb711144f51dc8c9531ec5f7a Mon Sep 17 00:00:00 2001
From: Dave MacLachlan <dmaclach@gmail.com>
Date: Mon, 22 Oct 2018 08:36:34 -0700
Subject: [PATCH 3880/4742] [clike mode] Update default cTypes

Updates the cTypes list to cover newer types (c11) and by
default picks up anything ending in '_t' as a type as defined
by the POSIX standard (and generally adopted by C compiler types
such as int16_t int32_t wchar_t etc).
---
 mode/clike/clike.js | 38 +++++++++++++++++++++++++++++---------
 mode/clike/test.js  | 27 +++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 0ee0aa5094..77032ea5ca 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -269,7 +269,29 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   var cKeywords = "auto if break case register continue return default do sizeof " +
     "static else struct switch extern typedef union for goto while enum const " +
     "volatile inline restrict asm fortran";
-  var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
+
+  // Do not use this. Use the cTypes function below. This is global just to avoid
+  // excessive calls when cTypes is being called multiple times during a parse.
+  var basicCTypes = words("int long char short double float unsigned signed " +
+    "void bool");
+
+  // Do not use this. Use the objCTypes function below. This is global just to avoid
+  // excessive calls when objCTypes is being called multiple times during a parse.
+  var basicObjCTypes = words("SEL instancetype id Class Protocol BOOL");
+
+  // Returns true if identifier is a "C" type.
+  // C type is defined as those that are reserved by the compiler (basicTypes),
+  // and those that end in _t (Reserved by POSIX for types)
+  // http://www.gnu.org/software/libc/manual/html_node/Reserved-Names.html
+  function cTypes(identifier) {
+    return contains(basicCTypes, identifier) || /.+_t/.test(identifier);
+  }
+
+  // Returns true if identifier is a "Objective C" type.
+  function objCTypes(identifier) {
+    return cTypes(identifier) || contains(basicObjCTypes, identifier);
+  }
+
   var cBlockKeywords = "case do else for if switch while struct enum union";
   var cDefKeywords = "struct enum union";
 
@@ -383,8 +405,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   def(["text/x-csrc", "text/x-c", "text/x-chdr"], {
     name: "clike",
     keywords: words(cKeywords),
-    types: words(cTypes + " bool float_t double_t intptr_t intmax_t int8_t int16_t " +
-                 "int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t uint32_t uint64_t"),
+    types: cTypes,
     blockKeywords: words(cBlockKeywords),
     defKeywords: words(cDefKeywords),
     typeFirstDefinitions: true,
@@ -404,7 +425,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "this using const_cast public throw virtual delete mutable protected " +
                     "alignas alignof constexpr decltype nullptr noexcept thread_local final " +
                     "static_assert override"),
-    types: words(cTypes + " bool wchar_t"),
+    types: cTypes,
     blockKeywords: words(cBlockKeywords +" class try catch finally"),
     defKeywords: words(cDefKeywords + " class namespace"),
     typeFirstDefinitions: true,
@@ -532,7 +553,6 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   def("text/x-scala", {
     name: "clike",
     keywords: words(
-
       /* scala */
       "abstract case catch class def do else extends final finally for forSome if " +
       "implicit import lazy match new null object override package private protected return " +
@@ -730,7 +750,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     keywords: words(cKeywords + " as atomic async call command component components configuration event generic " +
                     "implementation includes interface module new norace nx_struct nx_union post provides " +
                     "signal task uses abstract extends"),
-    types: words(cTypes),
+    types: cTypes,
     blockKeywords: words(cBlockKeywords),
     atoms: words("null true false"),
     hooks: {"#": cppHook},
@@ -744,7 +764,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "@interface @implementation @end @protocol @encode @property @synthesize @dynamic @class " +
                     "@public @package @private @protected @required @optional @try @catch @finally @import " +
                     "@selector @encode @defs @synchronized @autoreleasepool @compatibility_alias @available"),
-    types: words(cTypes + " instancetype SEL id BOOL IMP Class"),
+    types: objCTypes,
     builtin: words("FOUNDATION_EXPORT FOUNDATION_EXTERN NS_INLINE NS_FORMAT_FUNCTION NS_RETURNS_RETAINED " +
                    "NS_ERROR_ENUM NS_RETURNS_NOT_RETAINED NS_RETURNS_INNER_POINTER NS_DESIGNATED_INITIALIZER " +
                    "NS_ENUM NS_OPTIONS NS_REQUIRES_NIL_TERMINATION NS_ASSUME_NONNULL_BEGIN " +
@@ -753,7 +773,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     defKeywords: words(cDefKeywords + " @interface @implementation @protocol @class"),
     dontIndentStatements: /^@.*$/,
     typeFirstDefinitions: true,
-    atoms: words("YES NO NULL Nil nil true false"),
+    atoms: words("YES NO NULL Nil nil true false nullptr"),
     isReservedIdentifier: cIsReservedIdentifier,
     hooks: {
       "#": cppHook,
@@ -766,7 +786,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     name: "clike",
     keywords: words("base break clone continue const default delete enum extends function in class" +
                     " foreach local resume return this throw typeof yield constructor instanceof static"),
-    types: words(cTypes),
+    types: cTypes,
     blockKeywords: words("case catch class else for foreach if switch try while"),
     defKeywords: words("function local class"),
     typeFirstDefinitions: true,
diff --git a/mode/clike/test.js b/mode/clike/test.js
index 67aa602c06..6cb7605ef0 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -51,6 +51,21 @@
      "[builtin __aName];",
      "[variable _aName];");
 
+  MT("c_types",
+    "[type int];",
+    "[type long];",
+    "[type char];",
+    "[type short];",
+    "[type double];",
+    "[type float];",
+    "[type unsigned];",
+    "[type signed];",
+    "[type void];",
+    "[type bool];",
+    "[type foo_t];",
+    "[variable foo_T];",
+    "[variable _t];");
+
   var mode_cpp = CodeMirror.getMode({indentUnit: 2}, "text/x-c++src");
   function MTCPP(name) { test.mode(name, mode_cpp, Array.prototype.slice.call(arguments, 1)); }
 
@@ -100,6 +115,18 @@
          "}",
          "[keyword @end]");
 
+  MTOBJC("objc_types",
+         "[type int];",
+         "[type foo_t];",
+         "[variable foo_T];",
+         "[type id];",
+         "[type SEL];",
+         "[type instancetype];",
+         "[type Class];",
+         "[type Protocol];",
+         "[type BOOL];"
+         );
+
   var mode_scala = CodeMirror.getMode({indentUnit: 2}, "text/x-scala");
   function MTSCALA(name) { test.mode("scala_" + name, mode_scala, Array.prototype.slice.call(arguments, 1)); }
   MTSCALA("nested_comments",

From 8b047bda55186bf1da58fcdf51e8e4305ee4dfa8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 Oct 2018 15:05:48 +0200
Subject: [PATCH 3881/4742] Remove CM6 banner, add more subtle link

---
 index.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 4f385707ea..4fa4462026 100644
--- a/index.html
+++ b/index.html
@@ -22,10 +22,6 @@
   .banner div { margin: 0 auto; max-width: 700px; text-align: center; }
 </style>
 
-<div class=banner><div>
-  CodeMirror is evolving! Check out our <a href="https://codemirror.net/6/">announcement</a> about the upcoming redesigned, accessible, mobile-friendly version.
-</div></div>
-
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="doc/logo.png"></a>
 
@@ -33,6 +29,7 @@
     <li><a class=active data-default="true" href="#description">Home</a>
     <li><a href="doc/manual.html">Manual</a>
     <li><a href="https://github.com/codemirror/codemirror">Code</a>
+    <li><a href="https://codemirror.net/6/">Version 6</a>
   </ul>
   <ul>
     <li><a href="#features">Features</a>

From 5c93a0102af99bb743aca247ff72cb8f164704ba Mon Sep 17 00:00:00 2001
From: laobubu <laobubu@gmail.com>
Date: Thu, 25 Oct 2018 17:55:01 +0800
Subject: [PATCH 3882/4742] [markdown mode] Support Unicode Punctuation
 Characters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix: `**LOREM(xxx)**：Fullwidth Colon` in [CodeMirror Markdown Demo](https://codemirror.net/mode/markdown/) results wrong style:
![](https://i.loli.net/2018/10/25/5bd1642fb2e01.png)

CommonMark Demo: https://spec.commonmark.org/dingus/?text=**LOREM(xxx)**%EF%BC%9AFullwidth%20Colon

See: https://spec.commonmark.org/0.28/#punctuation-character
---
 mode/markdown/markdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index df7183669f..7aa3a3e17e 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -91,7 +91,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
   ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/
   ,   linkDefRE = /^\s*\[[^\]]+?\]:.*$/ // naive link-definition
-  ,   punctuation = /[!\"#$%&\'()*+,\-\.\/:;<=>?@\[\\\]^_`{|}~—]/
+  ,   punctuation = /[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E42\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDF3C-\uDF3E]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]/
   ,   expandedTab = "    " // CommonMark specifies tab as 4 spaces
 
   function switchInline(stream, state, f) {

From 113dc3a389882bfee167b7b1ab35eeb6fcb30072 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 25 Oct 2018 12:05:38 +0200
Subject: [PATCH 3883/4742] Revert "Update colour contrast of commented code"

This reverts commit fcac0fb69bce4d82a1f9631e950ecb1d7f970de4.
---
 lib/codemirror.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 9e2316877f..c7a8ae7047 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -126,7 +126,7 @@
 .cm-s-default .cm-operator {}
 .cm-s-default .cm-variable-2 {color: #05a;}
 .cm-s-default .cm-variable-3, .cm-s-default .cm-type {color: #085;}
-.cm-s-default .cm-comment {color: #6b7884;}
+.cm-s-default .cm-comment {color: #a50;}
 .cm-s-default .cm-string {color: #a11;}
 .cm-s-default .cm-string-2 {color: #f50;}
 .cm-s-default .cm-meta {color: #555;}

From 8900d1b7bce09c7101be631d9afa16a74c6e4598 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 25 Oct 2018 12:14:57 +0200
Subject: [PATCH 3884/4742] Mark version 5.41.0

---
 AUTHORS           |  8 ++++++++
 CHANGELOG.md      | 24 ++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 14 ++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 8e9a2aa1b1..a929165bc5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ Aaron Brooks
 Abdelouahab
 Abdussalam Abdurrahman
 Abe Fettig
+Abhishek Gahlot
 Adam Ahmed
 Adam King
 Adam Particka
@@ -157,6 +158,7 @@ coderaiser
 Cole R Lawrence
 ComFreek
 Cristian Prieto
+Curran Kelleher
 Curtis Gagliardi
 dagsta
 daines
@@ -195,10 +197,12 @@ Devon Carew
 Dick Choi
 dignifiedquire
 Dimage Sapelkin
+dmaclach
 Dmitry Kiselyov
 domagoj412
 Dominator008
 Domizio Demichelis
+Doug Blank
 Doug Wikle
 Drew Bratcher
 Drew Hintz
@@ -272,6 +276,7 @@ guraga
 Gustavo Rodrigues
 Hakan Tunc
 Hans Engel
+Harald Schilly
 Hardest
 Harshvardhan Gupta
 Hasan Karahan
@@ -467,6 +472,7 @@ Matthew Bauer
 Matthew Beale
 matthewhayes
 Matthew Rathbone
+Matthew Suozzo
 Matthias Bussonnier
 Matthias BUSSONNIER
 Matt MacPherson
@@ -501,6 +507,7 @@ Miguel Castillo
 mihailik
 Mika Andrianarijaona
 Mike
+Mike Bostock
 Mike Brevoort
 Mike Diaz
 Mike Ivanov
@@ -645,6 +652,7 @@ Scott Aikin
 Scott Goodhew
 Sebastian Wilzbach
 Sebastian Zaha
+Seren D
 Sergey Goder
 Sergey Tselovalnikov
 Se-Won Kim
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 715b9fa8ef..4823d22ff6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 5.41.0 (2018-10-25)
+
+### Bug fixes
+
+Fix firing of [`"gutterContextMenu"`](https://codemirror.net/doc/manual.html#event_gutterContextMenu) event on Firefox.
+
+Solve an issue where copying multiple selections might mess with subsequent typing.
+
+Don't crash when [`endOperation`](https://codemirror.net/doc/manual.html#endOperation) is called with no operation active.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Fix insert mode repeat after visualBlock edits.
+
+[scheme mode](https://codemirror.net/mode/scheme/index.html): Improve highlighting of quoted expressions.
+
+[soy mode](https://codemirror.net/mode/soy/): Support injected data and `@param` in comments.
+
+[objective c mode](https://codemirror.net/mode/clike/): Improve conformance to the actual language.
+
+### New features
+
+A new [`selectionsMayTouch`](https://codemirror.net/doc/manual.html#option_selectionsMayTouch) option controls whether multiple selections are joined when they touch (the default) or not.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Add `noremap` binding command.
+
 ## 5.40.2 (2018-09-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 3d72a65ff9..87532a4bc0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.40.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.41.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 29c50bebe4..401eca48ee 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">25-10-2018: <a href="https://codemirror.net/codemirror-5.41.0.zip">Version 5.41.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>A new <a href="https://codemirror.net/doc/manual.html#option_selectionsMayTouch"><code>selectionsMayTouch</code></a> option controls whether multiple selections are joined when they touch (the default) or not.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add <code>noremap</code> binding command.</li>
+    <li>Fix firing of <a href="https://codemirror.net/doc/manual.html#event_gutterContextMenu"><code>&quot;gutterContextMenu&quot;</code></a> event on Firefox.</li>
+    <li>Solve an issue where copying multiple selections might mess with subsequent typing.</li>
+    <li>Don't crash when <a href="https://codemirror.net/doc/manual.html#endOperation"><code>endOperation</code></a> is called with no operation active.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix insert mode repeat after visualBlock edits.</li>
+    <li><a href="https://codemirror.net/mode/scheme/index.html">scheme mode</a>: Improve highlighting of quoted expressions.</li>
+    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support injected data and <code>@param</code> in comments.</li>
+    <li><a href="https://codemirror.net/mode/clike/">objective c mode</a>: Improve conformance to the actual language.</li>
+  </ul>
+
   <p class="rel">20-09-2018: <a href="https://codemirror.net/codemirror-5.40.2.zip">Version 5.40.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 4fa4462026..4524b90714 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.40.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.41.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 073dccfe0b..70f74de726 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.40.3",
+  "version": "5.41.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 6a4176cbc9..575b548dca 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.40.3"
+CodeMirror.version = "5.41.0"

From 3d3bf0e6321ec845bf342f35a1c4a60a44d5fa7a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 25 Oct 2018 12:17:26 +0200
Subject: [PATCH 3885/4742] Bump version number post-5.41.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 87532a4bc0..42592de69d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.41.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.41.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 70f74de726..6aab74b656 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.41.0",
+  "version": "5.41.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 575b548dca..c1beccac55 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.41.0"
+CodeMirror.version = "5.41.1"

From a07a0c649da40afb2641759b77c90ce3e228c9ec Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 26 Oct 2018 10:02:48 +0200
Subject: [PATCH 3886/4742] Use new 'cache: npm' travis feature

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 52b8b81591..1dfeb819fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,3 +2,4 @@ language: node_js
 node_js:
   - stable
 sudo: false
+cache: npm

From ea298af3827fc1845a3114bbfbb5f481a3aafa9f Mon Sep 17 00:00:00 2001
From: Prendota <Prendota@mail.ru>
Date: Fri, 26 Oct 2018 12:16:16 +0300
Subject: [PATCH 3887/4742] [kotlin mode] update indents

Fix indent after `operator` on top level.
Example 1:
import kotlinx.coroutines.*
import kotlinx.coroutines.*

Should have the same indents.
---
 mode/clike/clike.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 77032ea5ca..5a30ba0a13 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -667,6 +667,9 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         stream.eatWhile(/[\w\$_]/);
         return "meta";
       },
+      '*': function(_stream, state) {
+        return state.prevToken == '.' ? 'variable' : 'operator';
+      },
       '"': function(stream, state) {
         state.tokenize = tokenKotlinString(stream.match('""'));
         return state.tokenize(stream, state);

From 29e338b8c1f27ade4502839877df7afd49584479 Mon Sep 17 00:00:00 2001
From: Dave MacLachlan <dmaclach@gmail.com>
Date: Sat, 27 Oct 2018 13:56:42 -0700
Subject: [PATCH 3888/4742] [clike] Update C++ keywords to C++20

---
 mode/clike/clike.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 5a30ba0a13..924a0fc092 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -420,16 +420,18 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def(["text/x-c++src", "text/x-c++hdr"], {
     name: "clike",
-    keywords: words(cKeywords + " dynamic_cast namespace reinterpret_cast try explicit new " +
-                    "static_cast typeid catch operator template typename class friend private " +
-                    "this using const_cast public throw virtual delete mutable protected " +
-                    "alignas alignof constexpr decltype nullptr noexcept thread_local final " +
-                    "static_assert override"),
+    // Keywords from https://en.cppreference.com/w/cpp/keyword includes C++20.
+    keywords: words(cKeywords + "alignas alignof and and_eq audit axiom bitand bitor catch " +
+                    "class compl concept constexpr const_cast decltype delete dynamic_cast " +
+                    "explicit export final friend import module mutable namespace new noexcept " +
+                    "not not_eq operator or or_eq override private protected public " +
+                    "reinterpret_cast requires static_assert static_cast template this " +
+                    "thread_local throw try typeid typename using virtual xor xor_eq"),
     types: cTypes,
-    blockKeywords: words(cBlockKeywords +" class try catch finally"),
+    blockKeywords: words(cBlockKeywords + " class try catch"),
     defKeywords: words(cDefKeywords + " class namespace"),
     typeFirstDefinitions: true,
-    atoms: words("true false NULL"),
+    atoms: words("true false NULL nullptr"),
     dontIndentStatements: /^template$/,
     isIdentifierChar: /[\w\$_~\xa1-\uffff]/,
     isReservedIdentifier: cIsReservedIdentifier,

From 59a2b03bd5cca17166b0323551ed411fc10d7561 Mon Sep 17 00:00:00 2001
From: Oleksandr Yakovenko <alex.jakovenko@gmail.com>
Date: Mon, 5 Nov 2018 22:17:12 +0100
Subject: [PATCH 3889/4742] Update darcula.css

Adjust colors and font modifiers a little bit to make code more readable.
---
 theme/darcula.css | 51 ++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/theme/darcula.css b/theme/darcula.css
index 66729e9d08..d4a0b53048 100644
--- a/theme/darcula.css
+++ b/theme/darcula.css
@@ -1,46 +1,51 @@
 /**
-    Name:       IntelliJ IDEA darcula theme
+    Name: IntelliJ IDEA darcula theme
     From IntelliJ IDEA by JetBrains
  */
 
+.cm-s-darcula  { font-family: Consolas, Menlo, Monaco, 'Lucida Console', 'Liberation Mono', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace, serif;}
+.cm-s-darcula.CodeMirror { background: #2B2B2B; color: #A9B7C6; } 
+
 .cm-s-darcula span.cm-meta { color: #BBB529; }
 .cm-s-darcula span.cm-number { color: #6897BB; }
-.cm-s-darcula span.cm-keyword { line-height: 1em; font-weight: bold; color: #CC7832; }
-.cm-s-darcula span.cm-def { color: #FFC66D; }
+.cm-s-darcula span.cm-keyword { color: #CC7832; line-height: 1em; font-weight: bold; }  
+.cm-s-darcula span.cm-def { color: #A9B7C6; font-style: italic; }
 .cm-s-darcula span.cm-variable { color: #A9B7C6; }
 .cm-s-darcula span.cm-variable-2 { color: #A9B7C6; }
-.cm-s-darcula span.cm-variable-3, .cm-s-darcula span.cm-type { color: #A9B7C6; }
-.cm-s-darcula span.cm-property { color: #A9B7C6; }
+.cm-s-darcula span.cm-variable-3 { color: #9876AA; }
+.cm-s-darcula span.cm-type { color: #AABBCC; font-weight: bold; }
+.cm-s-darcula span.cm-property { color: #FFC66D; }
 .cm-s-darcula span.cm-operator { color: #A9B7C6; }
 .cm-s-darcula span.cm-string { color: #6A8759; }
 .cm-s-darcula span.cm-string-2 { color: #6A8759; }
-.cm-s-darcula span.cm-comment { color: #808080; }
-.cm-s-darcula span.cm-link { color: #287BDE; }
-.cm-s-darcula span.cm-atom { font-weight: bold; color: #CC7832; }
+.cm-s-darcula span.cm-comment { color: #61A151; font-style: italic; } 
+.cm-s-darcula span.cm-link { color: #CC7832; }
+.cm-s-darcula span.cm-atom { color: #CC7832; }
 .cm-s-darcula span.cm-error { color: #BC3F3C; }
-.cm-s-darcula span.cm-tag { color: #CC7832; }
-.cm-s-darcula span.cm-attribute { color: #6A8759; }
+.cm-s-darcula span.cm-tag { color: #629755; font-weight: bold; font-style: italic; text-decoration: underline; }
+.cm-s-darcula span.cm-attribute { color: #6897bb; }
 .cm-s-darcula span.cm-qualifier { color: #6A8759; }
 .cm-s-darcula span.cm-bracket { color: #A9B7C6; }
-.cm-s-darcula.CodeMirror { background: #2B2B2B; color: #A9B7C6; }
-
+.cm-s-darcula span.cm-builtin { color: #FF9E59; }
+.cm-s-darcula span.cm-special { color: #FF9E59; }
 
-.cm-s-darcula .CodeMirror-cursor { border-left: 1px solid #dddddd; }
-.cm-s-darcula .CodeMirror-activeline-background { background: #3A3A3A; }
-.cm-s-darcula div.CodeMirror-selected { background: #085a9c; }
-.cm-s-darcula .CodeMirror-gutters { background: rgb(72, 72, 72); border-right: 1px solid grey; color: #606366 }
+.cm-s-darcula .CodeMirror-cursor { border-left: 1px solid #A9B7C6; }  
+.cm-s-darcula .CodeMirror-activeline-background { background: #323232; } 
+.cm-s-darcula .CodeMirror-gutters { background: #313335; border-right: 1px solid #313335; } 
+.cm-s-darcula .CodeMirror-guttermarker { color: #FFEE80; }  
+.cm-s-darcula .CodeMirror-guttermarker-subtle { color: #D0D0D0; }  
+.cm-s-darcula .CodeMirrir-linenumber { color: #606366; } 
+.cm-s-darcula .CodeMirror-matchingbracket { background-color: #3B514D; color: #FFEF28 !important; font-weight: bold; } 
 
-.cm-s-darcula span.cm-builtin { color: #A9B7C6; }
-.cm-s-darcula  { font-family: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;}
-.cm-s-darcula .CodeMirror-matchingbracket { background-color: #3b514d; color: yellow !important; }
+.cm-s-darcula div.CodeMirror-selected { background: #214283; }  
 
 .CodeMirror-hints.darcula {
   font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
-  color: #9c9e9e;
-  background-color: #3b3e3f !important;
+  color: #9C9E9E;
+  background-color: #3B3E3F !important;
 }
 
 .CodeMirror-hints.darcula .CodeMirror-hint-active {
-  background-color: #494d4e !important;
-  color: #9c9e9e !important;
+  background-color: #494D4E !important;
+  color: #9C9E9E !important;
 }

From 87702cf2eb53cabd25e4f994354ea9fc9e2c1d97 Mon Sep 17 00:00:00 2001
From: Janice Leung <janicejl@google.com>
Date: Wed, 7 Nov 2018 22:42:59 -0800
Subject: [PATCH 3890/4742] issue 5530

---
 keymap/vim.js    | 5 +++++
 test/vim_test.js | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index a734026de6..aed0957d91 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -132,6 +132,7 @@
     { keys: 'd', type: 'operator', operator: 'delete' },
     { keys: 'y', type: 'operator', operator: 'yank' },
     { keys: 'c', type: 'operator', operator: 'change' },
+    { keys: '=', type: 'operator', operator: 'indentAuto' },
     { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
     { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
     { keys: 'g~', type: 'operator', operator: 'changeCase' },
@@ -2188,6 +2189,10 @@
         }
         return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
       },
+      indentAuto: function(cm, _args, ranges) {
+        cm.execCommand("indentAuto");
+        return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
+      },
       changeCase: function(cm, args, ranges, oldAnchor, newHead) {
         var selections = cm.getSelections();
         var swapped = [];
diff --git a/test/vim_test.js b/test/vim_test.js
index 0f0492ca68..388d86b7b5 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1222,6 +1222,13 @@ testVim('<<', function(cm, vim, helpers) {
   is(!register.linewise);
   helpers.assertCursorAt(0, 1);
 }, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
+testVim('=', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  helpers.doKeys('<C-v>', 'j', 'j');
+  var expectedValue = 'word1\nword2\nword3';
+  helpers.doKeys('=');
+  eq(expectedValue, cm.getValue());
+}, { value: '   word1\n  word2\n  word3', indentUnit: 2 });
 
 // Edit tests
 function testEdit(name, before, pos, edit, after) {

From b99149d9a9d06639859cc9fb90cefe878b7f9f89 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 9 Nov 2018 15:44:47 +0100
Subject: [PATCH 3891/4742] Fix paths to Acorn scripts in Tern demo

Closes #5659
---
 demo/tern.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/tern.html b/demo/tern.html
index a7ffe35cda..c6834e8899 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -14,8 +14,8 @@
 <script src="../addon/hint/show-hint.js"></script>
 <script src="../addon/tern/tern.js"></script>
 <script src="//ternjs.net/node_modules/acorn/dist/acorn.js"></script>
-<script src="//ternjs.net/node_modules/acorn/dist/acorn_loose.js"></script>
-<script src="//ternjs.net/node_modules/acorn/dist/walk.js"></script>
+<script src="//ternjs.net/node_modules/acorn-loose/dist/acorn-loose.js"></script>
+<script src="//ternjs.net/node_modules/acorn-walk/dist/walk.js"></script>
 <script src="//ternjs.net/doc/demo/polyfill.js"></script>
 <script src="//ternjs.net/lib/signal.js"></script>
 <script src="//ternjs.net/lib/tern.js"></script>

From e4ca90988b35b3c6fd59f2aec98f7e6496afec1e Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Sun, 11 Nov 2018 21:36:37 +0100
Subject: [PATCH 3892/4742] Fix toggleComment signature in the manual

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

diff --git a/doc/manual.html b/doc/manual.html
index 42592de69d..7acef0e346 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2478,7 +2478,7 @@ <h2 id="addons">Addons</h2>
       <dd>Addon for commenting and uncommenting code. Adds four
       methods to CodeMirror instances:
       <dl>
-        <dt id="toggleComment"><code><strong>toggleComment</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>
+        <dt id="toggleComment"><code><strong>toggleComment</strong>(?options: object)</code></dt>
         <dd>Tries to uncomment the current selection, and if that
         fails, line-comments it.</dd>
         <dt id="lineComment"><code><strong>lineComment</strong>(from: {line, ch}, to: {line, ch}, ?options: object)</code></dt>

From 5556fcc309350e92e2054f230ff47c3e99495e4a Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Sun, 11 Nov 2018 19:55:49 -0800
Subject: [PATCH 3893/4742] Permit quoted names for object destructuring in
 JavaScript syntax

---
 mode/javascript/javascript.js | 1 +
 mode/javascript/test.js       | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index b0a27cebd2..42b4b191f1 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -655,6 +655,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") cx.marked = "property";
     if (type == "spread") return cont(pattern);
     if (type == "}") return pass();
+    if (type == "[") return cont(expression, expect(']'), expect(':'), proppattern);
     return cont(expect(":"), pattern, maybeAssign);
   }
   function eltpattern() {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index ec0a8117c9..21547e4787 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -226,6 +226,12 @@
      "  [keyword return] [variable-2 x];",
      "}");
 
+  MT(
+    "param_destructuring",
+    "[keyword function] [def foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
+    "  [keyword return] [variable-2 x];",
+    "}");
+
   MT("new_target",
      "[keyword function] [def F]([def target]) {",
      "  [keyword if] ([variable-2 target] [operator &&] [keyword new].[keyword target].[property name]) {",

From b2d7d18803aa86cad02316d8ba3c11a4b92a4ad4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 12 Nov 2018 11:08:47 +0100
Subject: [PATCH 3894/4742] Drop funding-status smiley face

Not really happy with that style anymore, so removing it.
---
 README.md  | 1 -
 index.html | 1 -
 2 files changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 8bc6c936b1..2a7b1f5eba 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
 [![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 [![Join the chat at https://gitter.im/codemirror/CodeMirror](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/codemirror/CodeMirror)  
-[Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?again)](https://marijnhaverbeke.nl/fund/)
 
 CodeMirror is a versatile text editor implemented in JavaScript for
 the browser. It is specialized for editing code, and comes with over
diff --git a/index.html b/index.html
index 4524b90714..3db260969c 100644
--- a/index.html
+++ b/index.html
@@ -107,7 +107,6 @@ <h2>This is CodeMirror</h2>
     <div class=actionsright>
       Software needs maintenance,<br>
       maintainers need to subsist.<br>
-      Current funding status = <img src="https://marijnhaverbeke.nl/fund/status_s.png" title="Current maintainer happiness" style="vertical-align: middle; height: 16px; width: 16px"><br>
       You can help <a href="https://marijnhaverbeke.nl/fund/" title="Set up a monthly contribution">per month</a> or
       <a title="Donate with PayPal" href="https://www.paypal.me/marijnhaverbeke">once</a>.
     </div>

From 737b0884b09e0fbd35b65f3fec8ee74be5d159bd Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Wed, 14 Nov 2018 07:24:11 +1100
Subject: [PATCH 3895/4742] Support cross-window hint rendering

---
 addon/hint/show-hint.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 5f6664b39f..2802577553 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -198,20 +198,22 @@
     this.data = data;
     this.picked = false;
     var widget = this, cm = completion.cm;
+    var ownerDocument = cm.getInputField().ownerDocument;
+    var parentWindow = ownerDocument.defaultView || ownerDocument.parentWindow;
 
-    var hints = this.hints = document.createElement("ul");
+    var hints = this.hints = ownerDocument.createElement("ul");
     var theme = completion.cm.options.theme;
     hints.className = "CodeMirror-hints " + theme;
     this.selectedHint = data.selectedHint || 0;
 
     var completions = data.list;
     for (var i = 0; i < completions.length; ++i) {
-      var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
+      var elt = hints.appendChild(ownerDocument.createElement("li")), cur = completions[i];
       var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
       if (cur.className != null) className = cur.className + " " + className;
       elt.className = className;
       if (cur.render) cur.render(elt, data, cur);
-      else elt.appendChild(document.createTextNode(cur.displayText || getText(cur)));
+      else elt.appendChild(ownerDocument.createTextNode(cur.displayText || getText(cur)));
       elt.hintId = i;
     }
 
@@ -220,9 +222,9 @@
     hints.style.left = left + "px";
     hints.style.top = top + "px";
     // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
-    var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
-    var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
-    (completion.options.container || document.body).appendChild(hints);
+    var winW = parentWindow.innerWidth || Math.max(ownerDocument.body.offsetWidth, ownerDocument.documentElement.offsetWidth);
+    var winH = parentWindow.innerHeight || Math.max(ownerDocument.body.offsetHeight, ownerDocument.documentElement.offsetHeight);
+    (completion.options.container || ownerDocument.body).appendChild(hints);
     var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
     var scrolls = hints.scrollHeight > hints.clientHeight + 1
     var startScroll = cm.getScrollInfo();
@@ -273,7 +275,7 @@
     cm.on("scroll", this.onScroll = function() {
       var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
       var newTop = top + startScroll.top - curScroll.top;
-      var point = newTop - (window.pageYOffset || (document.documentElement || document.body).scrollTop);
+      var point = newTop - (parentWindow.pageYOffset || (ownerDocument.documentElement || ownerDocument.body).scrollTop);
       if (!below) point += hints.offsetHeight;
       if (point <= editor.top || point >= editor.bottom) return completion.close();
       hints.style.top = newTop + "px";

From afa8025d5cdfbc9709c9373d2a4261d1c0b948ac Mon Sep 17 00:00:00 2001
From: Chris Colborne <zorfling@gmail.com>
Date: Wed, 14 Nov 2018 08:29:31 +1000
Subject: [PATCH 3896/4742] Fix lineNumbers param in Asterisk demo

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

diff --git a/mode/asterisk/index.html b/mode/asterisk/index.html
index 956e1e1251..b9fc627dd2 100644
--- a/mode/asterisk/index.html
+++ b/mode/asterisk/index.html
@@ -146,7 +146,7 @@ <h2>Asterisk dialplan mode</h2>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
         mode: "text/x-asterisk",
         matchBrackets: true,
-        lineNumber: true
+        lineNumbers: true
       });
     </script>
 

From b7b9b73f9c57eb7a51c4a5a270f32d6927c7b28e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 16 Nov 2018 10:48:00 +0100
Subject: [PATCH 3897/4742] [python mode] Fix tokenizing of nested strings

Closes #5668
---
 mode/python/python.js | 8 ++++----
 mode/python/test.js   | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 623c03f7f0..1ebe180a97 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -144,7 +144,7 @@
       if (stream.match(stringPrefixes)) {
         var isFmtString = stream.current().toLowerCase().indexOf('f') !== -1;
         if (!isFmtString) {
-          state.tokenize = tokenStringFactory(stream.current());
+          state.tokenize = tokenStringFactory(stream.current(), state.tokenize);
           return state.tokenize(stream, state);
         } else {
           state.tokenize = formatStringFactory(stream.current(), state.tokenize);
@@ -251,7 +251,7 @@
       return tokenString;
     }
 
-    function tokenStringFactory(delimiter) {
+    function tokenStringFactory(delimiter, tokenOuter) {
       while ("rubf".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
         delimiter = delimiter.substr(1);
 
@@ -266,7 +266,7 @@
             if (singleline && stream.eol())
               return OUTCLASS;
           } else if (stream.match(delimiter)) {
-            state.tokenize = tokenBase;
+            state.tokenize = tokenOuter;
             return OUTCLASS;
           } else {
             stream.eat(/['"]/);
@@ -276,7 +276,7 @@
           if (parserConf.singleLineStringErrors)
             return ERRORCLASS;
           else
-            state.tokenize = tokenBase;
+            state.tokenize = tokenOuter;
         }
         return OUTCLASS;
       }
diff --git a/mode/python/test.js b/mode/python/test.js
index 604c2eb9d6..5fd32915f2 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -35,4 +35,6 @@
   MT("fInvalidFString", "[error f'this is wrong}]");
   MT("fNestedFString", "[string f'expression ]{[number 100] [operator +] [string f'inner]{[number 5]}[string ']}[string string']");
   MT("uValidStringPrefix", "[string u'this is an unicode string']");
+
+  MT("nestedString", "[string f']{[variable b][[ [string \"c\"] ]]}[string f'] [comment # oops]")
 })();

From 606498c6ff088e90b22fed5afbde28d94094979b Mon Sep 17 00:00:00 2001
From: wdouglashall <43303510+wdouglashall@users.noreply.github.com>
Date: Sun, 18 Nov 2018 11:01:47 -1000
Subject: [PATCH 3898/4742] Add "f95" to list of extensions for Fortran mode.

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

diff --git a/mode/meta.js b/mode/meta.js
index 17f5d1abb8..591312b55b 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -51,7 +51,7 @@
     {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
     {name: "FCL", mime: "text/x-fcl", mode: "fcl"},
     {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
-    {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
+    {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90", "f95"]},
     {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
     {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
     {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},

From 3619ae2b12807e5b79a5656b7b762c1586abe6af Mon Sep 17 00:00:00 2001
From: Jonathan Dierksen <dierksen@google.com>
Date: Tue, 20 Nov 2018 00:58:31 -0800
Subject: [PATCH 3899/4742] [swift mode] Support multi-line strings

---
 mode/swift/index.html | 11 +++++++++++
 mode/swift/swift.js   | 15 +++++++++------
 mode/swift/test.js    |  7 ++++++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/mode/swift/index.html b/mode/swift/index.html
index d33eba4fcd..53d4134341 100644
--- a/mode/swift/index.html
+++ b/mode/swift/index.html
@@ -71,6 +71,17 @@ <h2>Swift mode</h2>
 
   }
 
+  func funWithStrings() {
+    var numLines = 3
+    print("This is a string!")
+    print("""
+          This is a
+          multi-line
+          string!
+          """)
+    print("The preceding string had \(numLines) lines!")
+  }
+
 }
 </textarea></form>
 
diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index b751185197..b7b3da56c0 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -73,9 +73,8 @@
       stream.match("..")
       return "punctuation"
     }
-    if (ch == '"' || ch == "'") {
-      stream.next()
-      var tokenize = tokenString(ch)
+    if (ch = stream.match(/("{3}|"|')/)) {
+      var tokenize = tokenString(ch[0])
       state.tokenize.push(tokenize)
       return tokenize(stream, state)
     }
@@ -117,6 +116,7 @@
   }
 
   function tokenString(quote) {
+    var singleLine = quote.length == 1
     return function(stream, state) {
       var ch, escaped = false
       while (ch = stream.next()) {
@@ -126,13 +126,16 @@
             return "string"
           }
           escaped = false
-        } else if (ch == quote) {
-          break
+        } else if (stream.match(quote)) {
+          state.tokenize.pop()
+          return "string"
         } else {
           escaped = ch == "\\"
         }
       }
-      state.tokenize.pop()
+      if (singleLine) {
+        state.tokenize.pop()
+      }
       return "string"
     }
   }
diff --git a/mode/swift/test.js b/mode/swift/test.js
index d8a0609b8f..dc0a1f8fdc 100644
--- a/mode/swift/test.js
+++ b/mode/swift/test.js
@@ -35,7 +35,12 @@
   // Strings and string interpolation.
   MT("strings",
      "[keyword var] [def a][punctuation :] [variable-2 String] [operator =] [string \"test\"]",
-     "[keyword var] [def b][punctuation :] [variable-2 String] [operator =] [string \"\\(][variable a][string )\"]");
+     "[keyword var] [def b][punctuation :] [variable-2 String] [operator =] [string \"\\(][variable a][string )\"]",
+     "[keyword var] [def c] [operator =] [string \"\"\"]",
+     "[string multi]",
+     "[string line]",
+     "[string \"test\"]",
+     "[string \"\"\"]");
 
   // Comments.
   MT("comments",

From ce1f0cd6f13d4fb8004cbb1317ba518126d4c630 Mon Sep 17 00:00:00 2001
From: Prendota <Prendota@mail.ru>
Date: Mon, 19 Nov 2018 13:35:40 +0300
Subject: [PATCH 3900/4742] Support adding attributes when marking text

---
 doc/manual.html        |  7 +++----
 src/line/line_data.js  | 28 +++++++++++++++++++---------
 src/model/mark_text.js |  2 +-
 test/test.js           | 13 ++++++++++++-
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 7acef0e346..5062bc0d06 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1716,10 +1716,9 @@ <h3 id="api_marker">Text-marking methods</h3>
         to <code>startStyle</code>, but for the rightmost span.</dd>
         <dt id="mark_css"><code><strong>css</strong>: string</code></dt>
         <dd>A string of CSS to be applied to the covered text. For example <code>"color: #fe3"</code>.</dd>
-        <dt id="mark_title"><code><strong>title</strong>:
-        string</code></dt><dd>When given, will give the nodes created
-        for this span a HTML <code>title</code> attribute with the
-        given value.</dd>
+        <dt id="mark_attributes"><code><strong>attributes</strong>:
+        object</code></dt><dd>When given, will give the nodes created
+        for this span a HTML <code>attributes</code> with the given value.</dd>
         <dt id="mark_shared"><code><strong>shared</strong>: boolean</code></dt><dd>When the
         target document is <a href="#linkedDoc">linked</a> to other
         documents, you can set <code>shared</code> to true to make the
diff --git a/src/line/line_data.js b/src/line/line_data.js
index 7829484c4c..c63edca998 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -127,7 +127,7 @@ export function defaultSpecialCharPlaceholder(ch) {
 
 // Build up the DOM representation for a single token, and add it to
 // the line map. Takes care to render special characters separately.
-function buildToken(builder, text, style, startStyle, endStyle, title, css) {
+function buildToken(builder, text, style, startStyle, endStyle, css, attributes) {
   if (!text) return
   let displayText = builder.splitSpaces ? splitSpaces(text, builder.trailingSpace) : text
   let special = builder.cm.state.specialChars, mustWrap = false
@@ -183,7 +183,13 @@ function buildToken(builder, text, style, startStyle, endStyle, title, css) {
     if (startStyle) fullStyle += startStyle
     if (endStyle) fullStyle += endStyle
     let token = elt("span", [content], fullStyle, css)
-    if (title) token.title = title
+    if (attributes) {
+      for (let attr in attributes){
+        if (attributes.hasOwnProperty(attr) && attr !== "style" && attr !== "class") {
+          token.setAttribute(attr, attributes[attr])
+        }
+      }
+    }
     return builder.content.appendChild(token)
   }
   builder.content.appendChild(content)
@@ -207,7 +213,7 @@ function splitSpaces(text, trailingBefore) {
 // Work around nonsense dimensions being reported for stretches of
 // right-to-left text.
 function buildTokenBadBidi(inner, order) {
-  return (builder, text, style, startStyle, endStyle, title, css) => {
+  return (builder, text, style, startStyle, endStyle, css, attributes) => {
     style = style ? style + " cm-force-border" : "cm-force-border"
     let start = builder.pos, end = start + text.length
     for (;;) {
@@ -217,8 +223,8 @@ function buildTokenBadBidi(inner, order) {
         part = order[i]
         if (part.to > start && part.from <= start) break
       }
-      if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css)
-      inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css)
+      if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, css, attributes)
+      inner(builder, text.slice(0, part.to - start), style, startStyle, null, css, attributes)
       startStyle = null
       text = text.slice(part.to - start)
       start = part.to
@@ -253,10 +259,11 @@ function insertLineContent(line, builder, styles) {
   }
 
   let len = allText.length, pos = 0, i = 1, text = "", style, css
-  let nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed
+  let nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, collapsed, attributes
   for (;;) {
     if (nextChange == pos) { // Update current marker set
-      spanStyle = spanEndStyle = spanStartStyle = title = css = ""
+      spanStyle = spanEndStyle = spanStartStyle = css = ""
+      attributes = {}
       collapsed = null; nextChange = Infinity
       let foundBookmarks = [], endStyles
       for (let j = 0; j < spans.length; ++j) {
@@ -272,7 +279,10 @@ function insertLineContent(line, builder, styles) {
           if (m.css) css = (css ? css + ";" : "") + m.css
           if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle
           if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
-          if (m.title && !title) title = m.title
+          // support for the old title property
+          // https://github.com/codemirror/CodeMirror/pull/5673
+          if (m.title) {attributes.title = m.title}
+          if (m.attributes) { attributes = m.attributes }
           if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
             collapsed = sp
         } else if (sp.from > pos && nextChange > sp.from) {
@@ -300,7 +310,7 @@ function insertLineContent(line, builder, styles) {
         if (!collapsed) {
           let tokenText = end > upto ? text.slice(0, upto - pos) : text
           builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                           spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css)
+                           spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", css, attributes)
         }
         if (end >= upto) {text = text.slice(upto - pos); pos = upto; break}
         pos = end
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index 955c72c4a7..c70acd553c 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -211,7 +211,7 @@ export function markText(doc, from, to, options, type) {
     if (updateMaxLine) cm.curOp.updateMaxLine = true
     if (marker.collapsed)
       regChange(cm, from.line, to.line + 1)
-    else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
+    else if (marker.className || marker.startStyle || marker.endStyle || marker.css || marker.attributes )
       for (let i = from.line; i <= to.line; i++) regLineChange(cm, i, "text")
     if (marker.atomic) reCheckSelection(cm.doc)
     signalLater(cm, "markerAdded", cm, marker)
diff --git a/test/test.js b/test/test.js
index b1044f1f36..c679a466dd 100644
--- a/test/test.js
+++ b/test/test.js
@@ -549,13 +549,24 @@ testCM("markTextCSS", function(cm) {
   function present() {
     var spans = cm.display.lineDiv.getElementsByTagName("span");
     for (var i = 0; i < spans.length; i++)
-      if (spans[i].style.color == "cyan" && span[i].textContent == "cdefg") return true;
+      if (spans[i].style.color == "cyan" && spans[i].textContent == "cdefg") return true;
   }
   var m = cm.markText(Pos(0, 2), Pos(0, 6), {css: "color: cyan"});
   m.clear();
   is(!present());
 }, {value: "abcdefgh"});
 
+testCM("markTextWithAttributes", function(cm) {
+  function present() {
+    var spans = cm.display.lineDiv.getElementsByTagName("span");
+    for (var i = 0; i < spans.length; i++)
+      if (spans[i].getAttribute('label') == "label" && span[i].textContent == "cdefg") return true;
+  }
+  var m = cm.markText(Pos(0, 2), Pos(0, 6), {attributes: {label: "label"}});
+  m.clear();
+  is(!present());
+}, {value: "abcdefgh"});
+
 testCM("bookmark", function(cm) {
   function p(v) { return v && Pos(v[0], v[1]); }
   forEach([{a: [1, 0], b: [1, 1], c: "", d: [1, 4]},

From 01758b19565384414306816b43b5f35d81f039a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Nov 2018 11:06:00 +0100
Subject: [PATCH 3901/4742] Clean up implementation of mark attributes

Issue #5673
---
 doc/manual.html        |  7 ++++---
 src/line/line_data.js  | 16 ++++++++--------
 src/model/mark_text.js |  3 ++-
 test/test.js           |  6 ++++--
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 5062bc0d06..57ecb7f2a2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1716,9 +1716,10 @@ <h3 id="api_marker">Text-marking methods</h3>
         to <code>startStyle</code>, but for the rightmost span.</dd>
         <dt id="mark_css"><code><strong>css</strong>: string</code></dt>
         <dd>A string of CSS to be applied to the covered text. For example <code>"color: #fe3"</code>.</dd>
-        <dt id="mark_attributes"><code><strong>attributes</strong>:
-        object</code></dt><dd>When given, will give the nodes created
-        for this span a HTML <code>attributes</code> with the given value.</dd>
+        <dt id="mark_attributes"><code><strong>attributes</strong>: object</code></dt>
+        <dd>When given, add the attributes in the given object to the
+        elements created for the marked text. Adding <code>class</code> or
+        <code>style</code> attributes this way is not supported.</dd>
         <dt id="mark_shared"><code><strong>shared</strong>: boolean</code></dt><dd>When the
         target document is <a href="#linkedDoc">linked</a> to other
         documents, you can set <code>shared</code> to true to make the
diff --git a/src/line/line_data.js b/src/line/line_data.js
index c63edca998..20dd432831 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -184,11 +184,8 @@ function buildToken(builder, text, style, startStyle, endStyle, css, attributes)
     if (endStyle) fullStyle += endStyle
     let token = elt("span", [content], fullStyle, css)
     if (attributes) {
-      for (let attr in attributes){
-        if (attributes.hasOwnProperty(attr) && attr !== "style" && attr !== "class") {
-          token.setAttribute(attr, attributes[attr])
-        }
-      }
+      for (let attr in attributes) if (attributes.hasOwnProperty(attr) && attr != "style" && attr != "class")
+        token.setAttribute(attr, attributes[attr])
     }
     return builder.content.appendChild(token)
   }
@@ -263,7 +260,7 @@ function insertLineContent(line, builder, styles) {
   for (;;) {
     if (nextChange == pos) { // Update current marker set
       spanStyle = spanEndStyle = spanStartStyle = css = ""
-      attributes = {}
+      attributes = null
       collapsed = null; nextChange = Infinity
       let foundBookmarks = [], endStyles
       for (let j = 0; j < spans.length; ++j) {
@@ -281,8 +278,11 @@ function insertLineContent(line, builder, styles) {
           if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
           // support for the old title property
           // https://github.com/codemirror/CodeMirror/pull/5673
-          if (m.title) {attributes.title = m.title}
-          if (m.attributes) { attributes = m.attributes }
+          if (m.title) (attributes || (attributes = {})).title = m.title
+          if (m.attributes) {
+            for (let attr in m.attributes)
+              (attributes || (attributes = {}))[attr] = m.attributes[attr]
+          }
           if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
             collapsed = sp
         } else if (sp.from > pos && nextChange > sp.from) {
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index c70acd553c..088f9c98ee 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -211,7 +211,8 @@ export function markText(doc, from, to, options, type) {
     if (updateMaxLine) cm.curOp.updateMaxLine = true
     if (marker.collapsed)
       regChange(cm, from.line, to.line + 1)
-    else if (marker.className || marker.startStyle || marker.endStyle || marker.css || marker.attributes )
+    else if (marker.className || marker.startStyle || marker.endStyle || marker.css ||
+             marker.attributes || marker.title)
       for (let i = from.line; i <= to.line; i++) regLineChange(cm, i, "text")
     if (marker.atomic) reCheckSelection(cm.doc)
     signalLater(cm, "markerAdded", cm, marker)
diff --git a/test/test.js b/test/test.js
index c679a466dd..a0e0669251 100644
--- a/test/test.js
+++ b/test/test.js
@@ -549,9 +549,10 @@ testCM("markTextCSS", function(cm) {
   function present() {
     var spans = cm.display.lineDiv.getElementsByTagName("span");
     for (var i = 0; i < spans.length; i++)
-      if (spans[i].style.color == "cyan" && spans[i].textContent == "cdefg") return true;
+      if (spans[i].style.color == "cyan" && spans[i].textContent == "cdef") return true;
   }
   var m = cm.markText(Pos(0, 2), Pos(0, 6), {css: "color: cyan"});
+  is(present());
   m.clear();
   is(!present());
 }, {value: "abcdefgh"});
@@ -560,9 +561,10 @@ testCM("markTextWithAttributes", function(cm) {
   function present() {
     var spans = cm.display.lineDiv.getElementsByTagName("span");
     for (var i = 0; i < spans.length; i++)
-      if (spans[i].getAttribute('label') == "label" && span[i].textContent == "cdefg") return true;
+      if (spans[i].getAttribute("label") == "label" && spans[i].textContent == "cdef") return true;
   }
   var m = cm.markText(Pos(0, 2), Pos(0, 6), {attributes: {label: "label"}});
+  is(present());
   m.clear();
   is(!present());
 }, {value: "abcdefgh"});

From 275447839df63c80ce2873784ea199ee75a03628 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Nov 2018 11:17:20 +0100
Subject: [PATCH 3902/4742] Correct for color normalization in phantomjs in a
 test

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

diff --git a/test/test.js b/test/test.js
index a0e0669251..f26d01aa9c 100644
--- a/test/test.js
+++ b/test/test.js
@@ -549,7 +549,7 @@ testCM("markTextCSS", function(cm) {
   function present() {
     var spans = cm.display.lineDiv.getElementsByTagName("span");
     for (var i = 0; i < spans.length; i++)
-      if (spans[i].style.color == "cyan" && spans[i].textContent == "cdef") return true;
+      if (spans[i].style.color && spans[i].textContent == "cdef") return true;
   }
   var m = cm.markText(Pos(0, 2), Pos(0, 6), {css: "color: cyan"});
   is(present());

From 5c51f54da80787e91d53110adbacee8f7f37f47e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Nov 2018 12:02:01 +0100
Subject: [PATCH 3903/4742] Run global events in an operation

Issue #5653
---
 src/edit/global_events.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/edit/global_events.js b/src/edit/global_events.js
index d34fabef13..d03da2d08f 100644
--- a/src/edit/global_events.js
+++ b/src/edit/global_events.js
@@ -7,11 +7,14 @@ import { on } from "../util/event.js"
 
 function forEachCodeMirror(f) {
   if (!document.getElementsByClassName) return
-  let byClass = document.getElementsByClassName("CodeMirror")
+  let byClass = document.getElementsByClassName("CodeMirror"), editors = []
   for (let i = 0; i < byClass.length; i++) {
     let cm = byClass[i].CodeMirror
-    if (cm) f(cm)
+    if (cm) editors.push(cm)
   }
+  if (editors.length) editors[0].operation(() => {
+    for (let i = 0; i < editors.length; i++) f(editors[i])
+  })
 }
 
 let globalsRegistered = false

From 51a37047c107ab962067ba243aa517c42bc367f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Nov 2018 14:12:48 +0100
Subject: [PATCH 3904/4742] Notice when lines are sticking out of the width of
 the editor

Issue #5639
---
 src/display/update_lines.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index 7f06018d04..475432b711 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -1,6 +1,6 @@
 import { heightAtLine } from "../line/spans.js"
 import { getLine, lineAtHeight, updateLineHeight } from "../line/utils_line.js"
-import { paddingTop, textHeight } from "../measurement/position_measurement.js"
+import { paddingTop, textHeight, charWidth } from "../measurement/position_measurement.js"
 import { ie, ie_version } from "../util/browser.js"
 
 // Read the actual heights of the rendered lines, and update their
@@ -9,7 +9,8 @@ export function updateHeightsInViewport(cm) {
   let display = cm.display
   let prevBottom = display.lineDiv.offsetTop
   for (let i = 0; i < display.view.length; i++) {
-    let cur = display.view[i], height
+    let cur = display.view[i], wrapping = cm.options.lineWrapping
+    let height, width = 0
     if (cur.hidden) continue
     if (ie && ie_version < 8) {
       let bot = cur.node.offsetTop + cur.node.offsetHeight
@@ -18,6 +19,10 @@ export function updateHeightsInViewport(cm) {
     } else {
       let box = cur.node.getBoundingClientRect()
       height = box.bottom - box.top
+      // Check that lines don't extend past the right of the current
+      // editor width
+      if (!wrapping && cur.text.firstChild)
+        width = cur.text.firstChild.getBoundingClientRect().right - box.left - 1
     }
     let diff = cur.line.height - height
     if (height < 2) height = textHeight(display)
@@ -27,6 +32,14 @@ export function updateHeightsInViewport(cm) {
       if (cur.rest) for (let j = 0; j < cur.rest.length; j++)
         updateWidgetHeight(cur.rest[j])
     }
+    if (width > cm.display.sizerWidth) {
+      let chWidth = Math.ceil(width / charWidth(cm.display))
+      if (chWidth > cm.display.maxLineLength) {
+        cm.display.maxLineLength = chWidth
+        cm.display.maxLine = cur.line
+        cm.display.maxLineChanged = true
+      }
+    }
   }
 }
 

From 436081e1cd8be37eea30a65f4a709137d66a47f5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Nov 2018 14:30:29 +0100
Subject: [PATCH 3905/4742] Mark version 5.42.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 20 ++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 13 +++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a929165bc5..83d2a4d9b0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -134,6 +134,7 @@ Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
 Cheah Chu Yeow
+Chris Colborne
 Chris Coyier
 Chris Ford
 Chris Granger
@@ -316,6 +317,7 @@ James Howard
 James Thorne
 Jamie Hill
 Jamie Morris
+Janice Leung
 Jan Jongboom
 jankeromnes
 Jan Keromnes
@@ -359,6 +361,7 @@ John Van Der Loo
 Jon Ander Peñalba
 Jonas Döbertin
 Jonas Helfer
+Jonathan Dierksen
 Jonathan Hart
 Jonathan Malmaud
 Jon Gacnik
@@ -452,6 +455,7 @@ Marijn Haverbeke
 Mário Gonçalves
 Mario Pietsch
 Mark Anderson
+Mark Dalgleish
 Mark Lentczner
 Marko Bonaci
 Mark Peace
@@ -557,6 +561,7 @@ Nisarg Jhaveri
 nlwillia
 noragrossman
 Norman Rzepka
+Oleksandr Yakovenko
 opl-
 Oreoluwa Onatemowo
 Oskar Segersvärd
@@ -745,6 +750,7 @@ Victor Bocharsky
 Vincent Woo
 Volker Mische
 vtripolitakis
+wdouglashall
 Weiyan Shao
 wenli
 Wes Cossick
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4823d22ff6..1e20bf30b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.42.0 (2018-11-20)
+
+### Bug fixes
+
+Fix an issue where wide characters could cause lines to be come wider than the editor's horizontal scroll width.
+
+Optimize handling of window resize events.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Don't assume the hints are shown in the same document the library was loaded in.
+
+[python mode](https://codemirror.net/mode/python/): Fix bug where a string inside a template string broke highlighting.
+
+[swift mode](https://codemirror.net/mode/swift): Support multi-line strings.
+
+### New features
+
+The [`markText` method](https://codemirror.net/doc/manual.html#markText) now takes an [`attributes`](https://codemirror.net/doc/manual.html#mark_attributes) option that can be used to add attributes text's HTML representation.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Add support for the `=` binding.
+
 ## 5.41.0 (2018-10-25)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 57ecb7f2a2..af94ba25b2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.41.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.42.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 401eca48ee..2f1e965c93 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+
+  <p class="rel">20-11-2018: <a href="https://codemirror.net/codemirror-5.42.0.zip">Version 5.42.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>The <a href="https://codemirror.net/doc/manual.html#markText"><code>markText</code> method</a> now takes an <a href="https://codemirror.net/doc/manual.html#mark_attributes"><code>attributes</code></a> option that can be used to add attributes text's HTML representation.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add support for the <code>=</code> binding.</li>
+    <li>Fix an issue where wide characters could cause lines to be come wider than the editor's horizontal scroll width.</li>
+    <li>Optimize handling of window resize events.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Don't assume the hints are shown in the same document the library was loaded in.</li>
+    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Fix bug where a string inside a template string broke highlighting.</li>
+    <li><a href="https://codemirror.net/mode/swift">swift mode</a>: Support multi-line strings.</li>
+  </ul>
+
   <p class="rel">25-10-2018: <a href="https://codemirror.net/codemirror-5.41.0.zip">Version 5.41.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 3db260969c..ce02a28ca4 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.41.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.42.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 6aab74b656..49bfd12f67 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.41.1",
+  "version": "5.42.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index c1beccac55..2f62bd712e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.41.1"
+CodeMirror.version = "5.42.0"

From 74dbe31ee157f53b3c0e0a45e97b819c4afe0ecf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Nov 2018 14:33:58 +0100
Subject: [PATCH 3906/4742] Update version number post-5.42.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index af94ba25b2..ae07f8d377 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.42.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.42.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 49bfd12f67..673f9a2f3f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.42.0",
+  "version": "5.42.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 2f62bd712e..090049e979 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.42.0"
+CodeMirror.version = "5.42.1"

From 75baa0ee2cad579d8d4fec913e0e15cd22a80d32 Mon Sep 17 00:00:00 2001
From: Jason Heeris <jason.heeris@gmail.com>
Date: Wed, 21 Nov 2018 19:22:00 +1100
Subject: [PATCH 3907/4742] [base16-light theme] Changed styling for bracket
 matching

---
 theme/base16-light.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/base16-light.css b/theme/base16-light.css
index 474e0ca9d1..1d5f582f6a 100644
--- a/theme/base16-light.css
+++ b/theme/base16-light.css
@@ -35,4 +35,4 @@
 .cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
 
 .cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
-.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
+.cm-s-base16-light .CodeMirror-matchingbracket { color: #f5f5f5 !important; background-color: #6A9FB5 !important}

From 1c559951743c934c3329080083dc7062aa973f2a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 22 Nov 2018 12:04:17 +0100
Subject: [PATCH 3908/4742] Make sure the hidden textarea is reset when a
 change is cancelled

Closes #5677
---
 src/display/operations.js      | 2 +-
 src/input/input.js             | 5 ++---
 src/model/changes.js           | 5 ++++-
 src/model/selection_updates.js | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 9cc5198106..6f3c9d0866 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -26,7 +26,7 @@ export function startOperation(cm) {
     viewChanged: false,      // Flag that indicates that lines might need to be redrawn
     startHeight: cm.doc.height, // Used to detect need to update scrollbar
     forceUpdate: false,      // Used to force a redraw
-    updateInput: null,       // Whether to reset the input textarea
+    updateInput: 0,       // Whether to reset the input textarea
     typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
     changeObjs: null,        // Accumulated changes, for firing change events
     cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
diff --git a/src/input/input.js b/src/input/input.js
index 106b4b647a..eb9c2cab47 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -40,7 +40,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
     }
   }
 
-  let updateInput
+  let updateInput = cm.curOp.updateInput
   // Normal behavior is to insert the new text into every selection
   for (let i = sel.ranges.length - 1; i >= 0; i--) {
     let range = sel.ranges[i]
@@ -53,7 +53,6 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
       else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
         from = to = Pos(from.line, 0)
     }
-    updateInput = cm.curOp.updateInput
     let changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
                        origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")}
     makeChange(cm.doc, changeEvent)
@@ -63,7 +62,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
     triggerElectric(cm, inserted)
 
   ensureCursorVisible(cm)
-  cm.curOp.updateInput = updateInput
+  if (cm.curOp.updateInput < 2) cm.curOp.updateInput = updateInput
   cm.curOp.typing = true
   cm.state.pasteIncoming = cm.state.cutIncoming = false
 }
diff --git a/src/model/changes.js b/src/model/changes.js
index 0d356f69a4..7a68883705 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -38,7 +38,10 @@ function filterChange(doc, change, update) {
   signal(doc, "beforeChange", doc, obj)
   if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj)
 
-  if (obj.canceled) return null
+  if (obj.canceled) {
+    if (doc.cm) doc.cm.curOp.updateInput = 2
+    return null
+  }
   return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}
 }
 
diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index c13ce9f3e2..c9941b71d3 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -116,7 +116,8 @@ function setSelectionInner(doc, sel) {
   doc.sel = sel
 
   if (doc.cm) {
-    doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true
+    doc.cm.curOp.updateInput = 1
+    doc.cm.curOp.selectionChanged = true
     signalCursorActivity(doc.cm)
   }
   signalLater(doc, "cursorActivity", doc)

From 5740f791c01091a9abac28978f2aa87594e77b13 Mon Sep 17 00:00:00 2001
From: LaKing <LaKing@D250.hu>
Date: Thu, 29 Nov 2018 14:44:25 +0100
Subject: [PATCH 3909/4742] [lint demo] Changed script links to use unpkg

---
 demo/lint.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/lint.html b/demo/lint.html
index a5ac3ef219..1184232d43 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -9,8 +9,8 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/css/css.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/jshint/2.9.5/jshint.min.js"></script>
-<script src="//rawgithub.amrom.workers.dev/zaach/jsonlint/79b553fb65c192add9066da64043458981b3972b/lib/jsonlint.js"></script>
+<script src="https://unpkg.com/jshint@2.9.6/dist/jshint.js"></script>
+<script src="https://unpkg.com/jsonlint@1.6.3/web/jsonlint.js"></script>
 <script src="https://unpkg.com/csslint@1.0.5/dist/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
 <script src="../addon/lint/javascript-lint.js"></script>

From 728291d31bd7381f312c266c9acf8e4f98d13a33 Mon Sep 17 00:00:00 2001
From: Joel Einbinder <joel.einbinder@gmail.com>
Date: Fri, 30 Nov 2018 00:58:28 -0800
Subject: [PATCH 3910/4742] [css] support double dash css variable (#5687)

---
 mode/css/css.js  | 2 +-
 mode/css/test.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 22b463c95b..d82de4045d 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -63,7 +63,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       if (/[\d.]/.test(stream.peek())) {
         stream.eatWhile(/[\w.%]/);
         return ret("number", "unit");
-      } else if (stream.match(/^-[\w\\\-]+/)) {
+      } else if (stream.match(/^-[\w\\\-]*/)) {
         stream.eatWhile(/[\w\\\-]/);
         if (stream.match(/^\s*:/, false))
           return ret("variable-2", "variable-definition");
diff --git a/mode/css/test.js b/mode/css/test.js
index 6d83df2852..5bfc7af91d 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -149,6 +149,14 @@
      "  [property color]: [atom var]([variable-2 --main-color]);",
      "}");
 
+  MT("blank_css_variable",
+     ":[variable-3 root] {",
+     "  [variable-2 --]: [atom #06c];",
+     "}",
+     "[tag h1][builtin #foo] {",
+     "  [property color]: [atom var]([variable-2 --]);",
+     "}");
+
   MT("supports",
      "[def @supports] ([keyword not] (([property text-align-last]: [atom justify]) [keyword or] ([meta -moz-][property text-align-last]: [atom justify])) {",
      "  [property text-align-last]: [atom justify];",

From 9376ad89daee45102e1a0a46a96d70d9ea8e9fd5 Mon Sep 17 00:00:00 2001
From: yoongu <yoongu.kim@gmail.com>
Date: Fri, 30 Nov 2018 04:00:10 -0500
Subject: [PATCH 3911/4742] [vim bindings] Allow selecting text enclosed in
 angled brackets

---
 addon/edit/matchbrackets.js |  4 ++--
 keymap/vim.js               | 12 ++++++------
 test/vim_test.js            |  6 ++++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index c918c3f99f..6ad5a01229 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -14,7 +14,7 @@
 
   var Pos = CodeMirror.Pos;
 
-  var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
+  var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<", "<": ">>", ">": "<<"};
 
   function findMatchingBracket(cm, where, config) {
     var line = cm.getLineHandle(where.line), pos = where.ch - 1;
@@ -51,7 +51,7 @@
     var maxScanLines = (config && config.maxScanLines) || 1000;
 
     var stack = [];
-    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/;
+    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]<>]/;
     var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
                           : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
     for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
diff --git a/keymap/vim.js b/keymap/vim.js
index aed0957d91..da10c1a98a 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1995,12 +1995,10 @@
       textObjectManipulation: function(cm, head, motionArgs, vim) {
         // TODO: lots of possible exceptions that can be thrown here. Try da(
         //     outside of a () block.
-
-        // TODO: adding <> >< to this map doesn't work, presumably because
-        // they're operators
         var mirroredPairs = {'(': ')', ')': '(',
                              '{': '}', '}': '{',
-                             '[': ']', ']': '['};
+                             '[': ']', ']': '[',
+                             '<': '>', '>': '<'};
         var selfPaired = {'\'': true, '"': true};
 
         var character = motionArgs.selectedCharacter;
@@ -3802,11 +3800,13 @@
       var bracketRegexp = ({
         '(': /[()]/, ')': /[()]/,
         '[': /[[\]]/, ']': /[[\]]/,
-        '{': /[{}]/, '}': /[{}]/})[symb];
+        '{': /[{}]/, '}': /[{}]/,
+        '<': /[<>]/, '>': /[<>]/})[symb];
       var openSym = ({
         '(': '(', ')': '(',
         '[': '[', ']': '[',
-        '{': '{', '}': '{'})[symb];
+        '{': '{', '}': '{',
+        '<': '<', '>': '<'})[symb];
       var curChar = cm.getLine(cur.line).charAt(cur.ch);
       // Due to the behavior of scanForBracket, we need to add an offset if the
       // cursor is on a matching open bracket.
diff --git a/test/vim_test.js b/test/vim_test.js
index 388d86b7b5..939aee5f8f 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1327,6 +1327,12 @@ testEdit('di]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di]', 'a\t[]b');
 testEdit('da[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da[', 'a\tb');
 testEdit('da]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da]', 'a\tb');
 
+// open and close on diff lines, open indented more than close
+testEdit('di<_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'di<', 'a\t<>b');
+testEdit('di>_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'di>', 'a\t<>b');
+testEdit('da<_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'da<', 'a\tb');
+testEdit('da>_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'da>', 'a\tb');
+
 function testSelection(name, before, pos, keys, sel) {
   return testVim(name, function(cm, vim, helpers) {
              var ch = before.search(pos)

From e886aa8761a5d359e39f072699a0dc7db7d3b0da Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 4 Dec 2018 09:04:48 +0100
Subject: [PATCH 3912/4742] [python mode] Fix nested braces in FString
 expression

Closes #5691
---
 mode/python/python.js | 41 ++++++++++++++++-------------------------
 mode/python/test.js   |  4 ++++
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 1ebe180a97..46b0294717 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -187,23 +187,19 @@
       var singleline = delimiter.length == 1;
       var OUTCLASS = "string";
 
-      function tokenFString(stream, state) {
-        // inside f-str Expression
-        if (stream.match(delimiter)) {
-          // expression ends pre-maturally, but very common in editing
-          // Could show error to remind users to close brace here
-          state.tokenize = tokenString
-          return OUTCLASS;
-        } else if (stream.match('{')) {
-          // starting brace, if not eaten below
-          return "punctuation";
-        } else if (stream.match('}')) {
-          // return to regular inside string state
-          state.tokenize = tokenString
-          return "punctuation";
-        } else {
-          // use tokenBaseInner to parse the expression
-          return tokenBaseInner(stream, state);
+      function tokenNestedExpr(depth) {
+        return function(stream, state) {
+          let inner = tokenBaseInner(stream, state)
+          console.log(inner, stream.current())
+          if (inner == "punctuation") {
+            if (stream.current() == "{") {
+              state.tokenize = tokenNestedExpr(depth + 1)
+            } else if (stream.current() == "}") {
+              if (depth > 1) state.tokenize = tokenNestedExpr(depth - 1)
+              else state.tokenize = tokenString
+            }
+          }
+          return inner
         }
       }
 
@@ -222,14 +218,9 @@
             return OUTCLASS;
           } else if (stream.match('{', false)) {
             // switch to nested mode
-            state.tokenize = tokenFString
-            if (stream.current()) {
-              return OUTCLASS;
-            } else {
-              // need to return something, so eat the starting {
-              stream.next();
-              return "punctuation";
-            }
+            state.tokenize = tokenNestedExpr(0)
+            if (stream.current()) return OUTCLASS;
+            else return state.tokenize()
           } else if (stream.match('}}')) {
             return OUTCLASS;
           } else if (stream.match('}')) {
diff --git a/mode/python/test.js b/mode/python/test.js
index 5fd32915f2..2b605b8e62 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -37,4 +37,8 @@
   MT("uValidStringPrefix", "[string u'this is an unicode string']");
 
   MT("nestedString", "[string f']{[variable b][[ [string \"c\"] ]]}[string f'] [comment # oops]")
+
+  MT("bracesInFString", "[string f']{[variable x] [operator +] {}}[string !']")
+
+  MT("nestedFString", "[string f']{[variable b][[ [string f\"c\"] ]]}[string f'] [comment # oops]")
 })();

From bebe419e16aa9ddbcd51b4269ddb327472ef026f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 4 Dec 2018 09:08:21 +0100
Subject: [PATCH 3913/4742] Fix use of let in mode

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

diff --git a/mode/python/python.js b/mode/python/python.js
index 46b0294717..a3595dd2f8 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -189,7 +189,7 @@
 
       function tokenNestedExpr(depth) {
         return function(stream, state) {
-          let inner = tokenBaseInner(stream, state)
+          var inner = tokenBaseInner(stream, state)
           console.log(inner, stream.current())
           if (inner == "punctuation") {
             if (stream.current() == "{") {

From 4128be063f92177d91fe8f2b9f5a0293a9f66cc7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 4 Dec 2018 09:17:29 +0100
Subject: [PATCH 3914/4742] Remove debug statement

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

diff --git a/mode/python/python.js b/mode/python/python.js
index a3595dd2f8..49f1ec4d64 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -190,7 +190,6 @@
       function tokenNestedExpr(depth) {
         return function(stream, state) {
           var inner = tokenBaseInner(stream, state)
-          console.log(inner, stream.current())
           if (inner == "punctuation") {
             if (stream.current() == "{") {
               state.tokenize = tokenNestedExpr(depth + 1)

From ea5ef9dc4fd213140f0af871e1a2bc8c84613c47 Mon Sep 17 00:00:00 2001
From: Neil Anderson <neil.t.anderson+sqlmigrate@gmail.com>
Date: Sat, 8 Dec 2018 14:35:49 -0500
Subject: [PATCH 3915/4742] [sql mode] Add GETTOKEN, HEADLINE and LEXTYPES for
 postgresql

see https://www.postgresql.org/docs/10/sql-createtsparser.html
---
 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 d9f418b7f1..0ae54a6433 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -411,7 +411,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name: "sql",
     client: set("source"),
     // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
-    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get global go goto grant granted greatest grouping groups handler header hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get gettoken global go goto grant granted greatest grouping groups handler header headline hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level lextypes library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
     // https://www.postgresql.org/docs/10/static/datatype.html
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),

From b3b45b852e7322af2664b95a643114c4ad1cd339 Mon Sep 17 00:00:00 2001
From: Christopher Wallis <christopher.j.wallis@gmail.com>
Date: Sat, 8 Dec 2018 12:37:24 -0700
Subject: [PATCH 3916/4742] [soy mode] Improve namespace highlighting

- highlighted the namespace itself as a variable. This is
  in line with how Java packages are highlighted.  I believe
  this is a close approximation.
- added 2 tests to verify new highlighting.
---
 mode/soy/soy.js  | 9 +++++++++
 mode/soy/test.js | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 51ec46cafa..752130af22 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -182,6 +182,14 @@
             stream.next();
             return null;
 
+          case "namespace-def":
+            if (match = stream.match(/^\.?([\w\.]+)/)) {
+              state.soyState.pop();
+              return "variable";
+            }
+            stream.next();
+            return null;
+
           case "param-def":
             if (match = stream.match(/^\w+/)) {
               state.variables = prepend(state.variables, match[0]);
@@ -297,6 +305,7 @@
             state.scopes = prepend(state.scopes, state.variables);
             state.soyState.push("var-def");
           } else if (state.tag == "namespace") {
+            state.soyState.push("namespace-def");
             if (!state.scopes) {
               state.variables = prepend(null, 'ij');
             }
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 12515eda0b..bb437a8a24 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -20,6 +20,13 @@
      '[keyword {/template}]',
      '');
 
+  MT('namespace-test',
+     '[keyword {namespace] [variable namespace][keyword }]')
+
+  MT('namespace-with-attribute-test',
+     '[keyword {namespace] [variable my.namespace.templates] ' +
+         '[attribute requirecss]=[string "my.namespace"][keyword }]');
+
   MT('param-type-test',
      '[keyword {@param] [def a]: ' +
          '[variable-3 list]<[[[variable-3 a]: [variable-3 int], ' +

From 7192a89300611014d56f37a348662812791d08e6 Mon Sep 17 00:00:00 2001
From: Neil Anderson <neil.t.anderson+sqlmigrate@gmail.com>
Date: Mon, 10 Dec 2018 03:53:13 -0500
Subject: [PATCH 3917/4742] [sql mode] Add LEXIZE and INIT keywords for
 postgresql

see https://www.postgresql.org/docs/11/sql-createtstemplate.html
---
 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 0ae54a6433..9a046f48d7 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -411,7 +411,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name: "sql",
     client: set("source"),
     // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
-    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get gettoken global go goto grant granted greatest grouping groups handler header headline hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level lextypes library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get gettoken global go goto grant granted greatest grouping groups handler header headline hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits init initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level lexize lextypes library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
     // https://www.postgresql.org/docs/10/static/datatype.html
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),

From 548975334b0c61a73fb6ec70ac87b64a4c9096f2 Mon Sep 17 00:00:00 2001
From: Christopher Wallis <christopher.j.wallis@gmail.com>
Date: Tue, 11 Dec 2018 01:36:16 -0700
Subject: [PATCH 3918/4742] [soy mode] Classify param type as type

- changed classification of param-def-type to "type" instead of using "variable-3"
- updated tests to match this expectation
---
 mode/soy/soy.js  |  2 +-
 mode/soy/test.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 752130af22..647e459902 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -206,7 +206,7 @@
               return null;
             }
             if (stream.eatWhile(/^[\w]+/)) {
-              return "variable-3";
+              return "type";
             }
             stream.next();
             return null;
diff --git a/mode/soy/test.js b/mode/soy/test.js
index bb437a8a24..c670d517a0 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -29,16 +29,16 @@
 
   MT('param-type-test',
      '[keyword {@param] [def a]: ' +
-         '[variable-3 list]<[[[variable-3 a]: [variable-3 int], ' +
-         '[variable-3 b]: [variable-3 map]<[variable-3 string], ' +
-         '[variable-3 bool]>]]>][keyword }]');
+         '[type list]<[[[type a]: [type int], ' +
+         '[type b]: [type map]<[type string], ' +
+         '[type bool]>]]>][keyword }]');
 
   MT('undefined-var',
      '[keyword {][variable-2&error $var]');
 
   MT('param-scope-test',
      '[keyword {template] [def .a][keyword }]',
-     '  [keyword {@param] [def x]: [variable-3 string][keyword }]',
+     '  [keyword {@param] [def x]: [type string][keyword }]',
      '  [keyword {][variable-2 $x][keyword }]',
      '[keyword {/template}]',
      '',
@@ -55,7 +55,7 @@
 
   MT('defined-if-variable-test',
      '[keyword {template] [def .foo][keyword }]',
-     '  [keyword {@param?] [def showThing]: [variable-3 bool][keyword }]',
+     '  [keyword {@param?] [def showThing]: [type bool][keyword }]',
      '  [keyword {if] [variable-2 $showThing][keyword }]',
      '    Yo!',
      '  [keyword {/if}]',
@@ -73,7 +73,7 @@
      '');
 
   MT('foreach-scope-test',
-     '[keyword {@param] [def bar]: [variable-3 string][keyword }]',
+     '[keyword {@param] [def bar]: [type string][keyword }]',
      '[keyword {foreach] [def $foo] [keyword in] [variable-2&error $foos][keyword }]',
      '  [keyword {][variable-2 $foo][keyword }]',
      '[keyword {/foreach}]',
@@ -108,7 +108,7 @@
 
   MT('allow-missing-colon-in-@param',
      '[keyword {template] [def .foo][keyword }]',
-     '  [keyword {@param] [def showThing] [variable-3 bool][keyword }]',
+     '  [keyword {@param] [def showThing] [type bool][keyword }]',
      '  [keyword {if] [variable-2 $showThing][keyword }]',
      '    Yo!',
      '  [keyword {/if}]',

From 1b8c2daa6f1360545cf594012d573727854f3434 Mon Sep 17 00:00:00 2001
From: Christopher Wallis <christopher.j.wallis@gmail.com>
Date: Wed, 12 Dec 2018 02:05:30 -0700
Subject: [PATCH 3919/4742] [soy mode] Updated {call /} and .template token

- updated "templ-ref" to match namespaced templates e.g.
my.namespaced.component.element. The existing regex matches the first
word and nothing after the "."

- updated "templ-ref" to treat all "." templates as variable-2.
Local templates are the only ones capable of starting with a dot and
because a template earlier in the file can reference a local template
later in the file, there are no guarantees of it being in the variable
list. Treating all .templates as local is more consistent and
predictable for syntax highlighting.
---
 mode/soy/soy.js  |  6 +++---
 mode/soy/test.js | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 647e459902..8119361bdc 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -170,11 +170,11 @@
             return null;
 
           case "templ-ref":
-            if (match = stream.match(/^\.?([\w]+)/)) {
+            if (match = stream.match(/(\.?[a-zA-Z_][a-zA-Z_0-9]+)+/)) {
               state.soyState.pop();
-              // If the first character is '.', try to match against a local template name.
+              // If the first character is '.', it can only be a local template.
               if (match[0][0] == '.') {
-                return ref(state.templates, match[1], true);
+                return "variable-2"
               }
               // Otherwise
               return "variable";
diff --git a/mode/soy/test.js b/mode/soy/test.js
index c670d517a0..ac38495ada 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -63,13 +63,11 @@
      '');
 
   MT('template-calls-test',
-     '[keyword {template] [def .foo][keyword }]',
-     '  Yo!',
-     '[keyword {/template}]',
      '[keyword {call] [variable-2 .foo][keyword /}]',
      '[keyword {call] [variable foo][keyword /}]',
-     '[keyword {call] [variable .bar][keyword /}]',
-     '[keyword {call] [variable bar][keyword /}]',
+     '[keyword {call] [variable foo][keyword }] [keyword {/call}]',
+     '[keyword {call] [variable first1.second.third_3][keyword /}]',
+     '[keyword {call] [variable first1.second.third_3] [keyword }] [keyword {/call}]',
      '');
 
   MT('foreach-scope-test',
@@ -91,7 +89,7 @@
   MT('nested-kind-test',
      '[keyword {template] [def .foo] [attribute kind]=[string "html"][keyword }]',
      '  [tag&bracket <][tag div][tag&bracket >]',
-     '    [keyword {call] [variable .bar][keyword }]',
+     '    [keyword {call] [variable-2 .bar][keyword }]',
      '      [keyword {param] [attribute kind]=[string "js"][keyword }]',
      '        [keyword var] [def bar] [operator =] [number 5];',
      '      [keyword {/param}]',

From 1175d7eb0a3c48e6ac186cbf4b39ba0ba3e1d259 Mon Sep 17 00:00:00 2001
From: Christopher Wallis <chriswallis@google.com>
Date: Wed, 12 Dec 2018 09:58:10 -0700
Subject: [PATCH 3920/4742] [soy mode] tokenize soy functions

- added tokenization for soy functions. Assigned to variable & callee
- added tests to verify it works within expressions
---
 mode/soy/soy.js  |  2 ++
 mode/soy/test.js | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 8119361bdc..b400dd32da 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -251,6 +251,8 @@
                 });
               }
               return "attribute";
+            } else if (match = stream.match(/([\w]+)(?=\()/)) {
+              return "variable callee";
             } else if (match = stream.match(/^["']/)) {
               state.soyState.push("string");
               state.quoteKind = match;
diff --git a/mode/soy/test.js b/mode/soy/test.js
index ac38495ada..5c731d51b6 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -20,6 +20,12 @@
      '[keyword {/template}]',
      '');
 
+  MT('function-test',
+     '[keyword {] [callee&variable css]([string "MyClass"])[keyword }]',
+     '[tag&bracket <][tag input] [attribute value]=[string "]' +
+     '[keyword {] [callee&variable index]([variable-2&error $list])[keyword }]' +
+        '[string "][tag&bracket />]');
+
   MT('namespace-test',
      '[keyword {namespace] [variable namespace][keyword }]')
 
@@ -99,9 +105,9 @@
      '');
 
   MT('tag-starting-with-function-call-is-not-a-keyword',
-     '[keyword {]index([variable-2&error $foo])[keyword }]',
+     '[keyword {][callee&variable index]([variable-2&error $foo])[keyword }]',
      '[keyword {css] [string "some-class"][keyword }]',
-     '[keyword {]css([string "some-class"])[keyword }]',
+     '[keyword {][callee&variable css]([string "some-class"])[keyword }]',
      '');
 
   MT('allow-missing-colon-in-@param',

From 797b61055f2f392689e2767da8cf2e4e065a2508 Mon Sep 17 00:00:00 2001
From: Christopher Wallis <chriswallis@google.com>
Date: Thu, 13 Dec 2018 08:45:43 -0700
Subject: [PATCH 3921/4742] [soy mode] tokenize property names in {param}

- added token "property" to `name` in `{param name: '' /}`
- adjusted nested-kind-test for this change.
---
 mode/soy/soy.js  | 10 ++++++++++
 mode/soy/test.js |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index b400dd32da..9e88007a02 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -200,6 +200,14 @@
             stream.next();
             return null;
 
+          case "param-ref":
+            if (match = stream.match(/^\w+/)) {
+              state.soyState.pop();
+              return "property";
+            }
+            stream.next();
+            return null;
+
           case "param-type":
             if (stream.peek() == "}") {
               state.soyState.pop();
@@ -313,6 +321,8 @@
             }
           } else if (state.tag.match(/^@(?:param\??|inject|prop)/)) {
             state.soyState.push("param-def");
+          } else if (state.tag.match(/^(?:param)/)) {
+            state.soyState.push("param-ref");
           }
           return "keyword";
 
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 5c731d51b6..4afaa3d0ce 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -96,7 +96,7 @@
      '[keyword {template] [def .foo] [attribute kind]=[string "html"][keyword }]',
      '  [tag&bracket <][tag div][tag&bracket >]',
      '    [keyword {call] [variable-2 .bar][keyword }]',
-     '      [keyword {param] [attribute kind]=[string "js"][keyword }]',
+     '      [keyword {param] [property propertyName] [attribute kind]=[string "js"][keyword }]',
      '        [keyword var] [def bar] [operator =] [number 5];',
      '      [keyword {/param}]',
      '    [keyword {/call}]',

From 0546da3274f106255161048d1470a72da817dd32 Mon Sep 17 00:00:00 2001
From: Germain Chazot <g.chazot@gmail.com>
Date: Fri, 14 Dec 2018 15:16:13 +0000
Subject: [PATCH 3922/4742] [yaml-lint addon] Allow linting of multi-document
 yaml stream

---
 addon/lint/yaml-lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/yaml-lint.js b/addon/lint/yaml-lint.js
index 369c95b5b4..b4ac5abc4e 100644
--- a/addon/lint/yaml-lint.js
+++ b/addon/lint/yaml-lint.js
@@ -23,7 +23,7 @@ CodeMirror.registerHelper("lint", "yaml", function(text) {
     }
     return found;
   }
-  try { jsyaml.load(text); }
+  try { jsyaml.loadAll(text); }
   catch(e) {
       var loc = e.mark,
           // js-yaml YAMLException doesn't always provide an accurate lineno

From eb174cff533158b16168a96aabb3e164a360b840 Mon Sep 17 00:00:00 2001
From: Neil Anderson <neil.t.anderson+sqlmigrate@gmail.com>
Date: Sat, 15 Dec 2018 03:53:09 -0500
Subject: [PATCH 3923/4742] [sql mode] Add PUBLICATION postgres keyword

see https://www.postgresql.org/docs/10/sql-createpublication.html
---
 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 9a046f48d7..9687ca38b8 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -411,7 +411,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name: "sql",
     client: set("source"),
     // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
-    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get gettoken global go goto grant granted greatest grouping groups handler header headline hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits init initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level lexize lextypes library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get gettoken global go goto grant granted greatest grouping groups handler header headline hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits init initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level lexize lextypes library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public publication quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
     // https://www.postgresql.org/docs/10/static/datatype.html
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),

From 9c1df7b6135de93c652ddcccfa3194a2ee8fd29a Mon Sep 17 00:00:00 2001
From: fraxx001 <alexander.fratzer@gmail.com>
Date: Sat, 15 Dec 2018 18:37:53 +0100
Subject: [PATCH 3924/4742] [vim bindings] Fix/keymap/vim ctrl w idle

---
 keymap/vim.js    |  2 ++
 test/vim_test.js | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index da10c1a98a..6846555931 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -152,6 +152,8 @@
     { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
     { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
     { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
+    //ignore C-w in normal mode
+    { keys: '<C-w>', type: 'idle', context: 'normal' },
     // Actions
     { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
     { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
diff --git a/test/vim_test.js b/test/vim_test.js
index 939aee5f8f..e3f95ccd33 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1446,6 +1446,16 @@ testVim('insert_ctrl_w', function(cm, vim, helpers) {
   eqCursorPos(curEnd, cm.getCursor());
   eq('vim-insert', cm.getOption('keyMap'));
 }, { value: 'word1/word2' });
+testVim('normal_ctrl_w', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 3);
+  cm.setCursor(curStart);
+  helpers.doKeys('<C-w>');
+  eq('word', cm.getValue());
+  var curEnd = makeCursor(0, 3);
+  helpers.assertCursorAt(0,3);
+  eqCursorPos(curEnd, cm.getCursor());
+  eq('vim', cm.getOption('keyMap'));
+}, {value: 'word'});
 testVim('a', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('a');

From 3675309aa9a9950a34c0e5cdc5a79e88d4ef9bc5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Dec 2018 10:09:59 +0100
Subject: [PATCH 3925/4742] Fix issue where bracket matching was
 unintentionally including <> by default

Closes codemirror/google-modes#233
---
 addon/edit/matchbrackets.js | 2 +-
 keymap/vim.js               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 6ad5a01229..5b03201a68 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -51,7 +51,7 @@
     var maxScanLines = (config && config.maxScanLines) || 1000;
 
     var stack = [];
-    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]<>]/;
+    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/;
     var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
                           : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
     for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
diff --git a/keymap/vim.js b/keymap/vim.js
index 6846555931..0af9bcb2ea 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1977,7 +1977,7 @@
           }
         }
         if (ch < lineText.length) {
-          var matched = cm.findMatchingBracket(Pos(line, ch));
+          var matched = cm.findMatchingBracket(Pos(line, ch), {bracketRegex: /[(){}[\]<>]/});
           return matched.to;
         } else {
           return cursor;

From 0327f531fcac31b22cba16ae114cde370a73cd25 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Dec 2018 10:12:25 +0100
Subject: [PATCH 3926/4742] [python mode] Fix bug that could cause crashes with
 some format strings

Closes #5713
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 49f1ec4d64..224eb7d5ec 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -219,7 +219,7 @@
             // switch to nested mode
             state.tokenize = tokenNestedExpr(0)
             if (stream.current()) return OUTCLASS;
-            else return state.tokenize()
+            else return state.tokenize(stream, state)
           } else if (stream.match('}}')) {
             return OUTCLASS;
           } else if (stream.match('}')) {

From 63b591cefb3fc6cf0b82b6d05c1b870ea8c7b085 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Dec 2018 13:02:14 +0100
Subject: [PATCH 3927/4742] [sql mode] Treat / as an operator char

See https://discuss.codemirror.net/t/division-operator-in-text-x-sql-mode/1941
---
 mode/sql/sql.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 9687ca38b8..3864f01f17 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -18,7 +18,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       atoms          = parserConfig.atoms || {"false": true, "true": true, "null": true},
       builtin        = parserConfig.builtin || {},
       keywords       = parserConfig.keywords || {},
-      operatorChars  = parserConfig.operatorChars || /^[*+\-%<>!=&|~^]/,
+      operatorChars  = parserConfig.operatorChars || /^[*+\-%<>!=&|~^\/]/,
       support        = parserConfig.support || {},
       hooks          = parserConfig.hooks || {},
       dateSQL        = parserConfig.dateSQL || {"date" : true, "time" : true, "timestamp" : true},
@@ -391,7 +391,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
     keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
     builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least length lengthb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),
-    operatorChars: /^[*+\-%<>!=~]/,
+    operatorChars: /^[*\/+\-%<>!=~]/,
     dateSQL:    set("date time timestamp"),
     support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")
   });
@@ -415,7 +415,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     // https://www.postgresql.org/docs/10/static/datatype.html
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
+    operatorChars: /^[*\/+\-%<>!=&|^\/#@?~]/,
     dateSQL: set("date time timestamp"),
     support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
   });
@@ -448,7 +448,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases datata dbproperties defined delete delimited deny desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on optimize option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
     builtin: set("tinyint smallint int bigint boolean float double string binary timestamp decimal array map struct uniontype delimited serde sequencefile textfile rcfile inputformat outputformat"),
     atoms: set("false true null"),
-    operatorChars: /^[*+\-%<>!=~&|^]/,
+    operatorChars: /^[*\/+\-%<>!=~&|^]/,
     dateSQL: set("date time timestamp"),
     support: set("ODBCdotTable doubleQuote zerolessFloat")
   });

From 24f99282f8dfc7d014446e9fe13f24413bbcd472 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Dec 2018 14:44:13 +0100
Subject: [PATCH 3928/4742] [sql mode] Don't override operatorChars in base sql
 mime type

---
 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 3864f01f17..681bf66a21 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -25,6 +25,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       backslashStringEscapes = parserConfig.backslashStringEscapes !== false,
       brackets       = parserConfig.brackets || /^[\{}\(\)\[\]]/,
       punctuation    = parserConfig.punctuation || /^[;.,:]/
+                      console.log(operatorChars)
 
   function tokenBase(stream, state) {
     var ch = stream.next();
@@ -288,7 +289,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     keywords: set(sqlKeywords + "begin"),
     builtin: set("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),
     atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=]/,
     dateSQL: set("date time timestamp"),
     support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
   });

From b8198efa62819498353cd1dd2cef1afee25636c1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Dec 2018 14:49:10 +0100
Subject: [PATCH 3929/4742] Remove debug statement

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

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 681bf66a21..de8f58d828 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -25,7 +25,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       backslashStringEscapes = parserConfig.backslashStringEscapes !== false,
       brackets       = parserConfig.brackets || /^[\{}\(\)\[\]]/,
       punctuation    = parserConfig.punctuation || /^[;.,:]/
-                      console.log(operatorChars)
 
   function tokenBase(stream, state) {
     var ch = stream.next();

From 71c4a7f04806982b7fb3114db15a8bc9093d8323 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 19 Dec 2018 09:43:32 +0100
Subject: [PATCH 3930/4742] [matchbrackets addon] More thoroughly disable
 matching of <> by default

Issue codemirror/google-modes#233
---
 addon/edit/matchbrackets.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 5b03201a68..2dd4888800 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -16,18 +16,23 @@
 
   var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<", "<": ">>", ">": "<<"};
 
+  function bracketRegex(config) {
+    return config && config.bracketRegex || /[(){}[\]]/
+  }
+
   function findMatchingBracket(cm, where, config) {
     var line = cm.getLineHandle(where.line), pos = where.ch - 1;
     var afterCursor = config && config.afterCursor
     if (afterCursor == null)
       afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
+    var re = bracketRegex(config)
 
     // A cursor is defined as between two characters, but in in vim command mode
     // (i.e. not insert mode), the cursor is visually represented as a
     // highlighted box on top of the 2nd character. Otherwise, we allow matches
     // from before or after the cursor.
-    var match = (!afterCursor && pos >= 0 && matching[line.text.charAt(pos)]) ||
-        matching[line.text.charAt(++pos)];
+    var match = (!afterCursor && pos >= 0 && re.test(line.text.charAt(pos)) && matching[line.text.charAt(pos)]) ||
+        re.test(line.text.charAt(pos + 1)) && matching[line.text.charAt(++pos)];
     if (!match) return null;
     var dir = match.charAt(1) == ">" ? 1 : -1;
     if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
@@ -51,7 +56,7 @@
     var maxScanLines = (config && config.maxScanLines) || 1000;
 
     var stack = [];
-    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/;
+    var re = bracketRegex(config)
     var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
                           : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
     for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {

From 19e010e370e7d30fc4619d3084f5d06c1fededce Mon Sep 17 00:00:00 2001
From: Christopher Wallis
 <chriswallis@chriswallis-macbookpro.roam.corp.google.com>
Date: Wed, 19 Dec 2018 01:46:24 -0700
Subject: [PATCH 3931/4742] [soy mode] added token for unknown type "?"

- added token "type" for ?
- added test for single type
- added test for ? as a template type parameter
---
 mode/soy/soy.js  | 2 +-
 mode/soy/test.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 9e88007a02..20f665146d 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -213,7 +213,7 @@
               state.soyState.pop();
               return null;
             }
-            if (stream.eatWhile(/^[\w]+/)) {
+            if (stream.eatWhile(/^([\w]+|[?])/)) {
               return "type";
             }
             stream.next();
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 4afaa3d0ce..e95110c2c0 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -37,7 +37,9 @@
      '[keyword {@param] [def a]: ' +
          '[type list]<[[[type a]: [type int], ' +
          '[type b]: [type map]<[type string], ' +
-         '[type bool]>]]>][keyword }]');
+         '[type bool]>]]>][keyword }]',
+      '[keyword {@param] [def unknown]: [type ?][keyword }]',
+      '[keyword {@param] [def list]: [type list]<[type ?]>[keyword }]');
 
   MT('undefined-var',
      '[keyword {][variable-2&error $var]');

From cafe5827767e252852d68adb04102be5be73736a Mon Sep 17 00:00:00 2001
From: Christopher Wallis <christopher.j.wallis@gmail.com>
Date: Wed, 19 Dec 2018 14:17:33 -0700
Subject: [PATCH 3932/4742] [soy mode] Boolean and number tokenization in
 expressions

- added tokenization for decimals
- added tokenization for hexidecimals
- added tokenization for true/false
- added test cases for those new atom tokens
---
 mode/soy/soy.js  |  5 +++++
 mode/soy/test.js | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 20f665146d..356276d00b 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -266,6 +266,11 @@
               state.quoteKind = match;
               return "string";
             }
+            if (stream.match(/(true|false)(?!\w)/) ||
+              stream.match(/0x([0-9a-fA-F]{2,})/) ||
+              stream.match(/-?([0-9]*[.])?[0-9]+/)) {
+              return "atom";
+            }
             if (match = stream.match(/^\$([\w]+)/)) {
               return ref(state.variables, match[1]);
             }
diff --git a/mode/soy/test.js b/mode/soy/test.js
index e95110c2c0..0698b9d650 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -33,6 +33,19 @@
      '[keyword {namespace] [variable my.namespace.templates] ' +
          '[attribute requirecss]=[string "my.namespace"][keyword }]');
 
+  MT('primitive-test',
+     '[keyword {] [atom true] [keyword }]',
+     '[keyword {] [atom false] [keyword }]',
+     '[keyword {] truethy [keyword }]',
+     '[keyword {] falsey [keyword }]',
+     '[keyword {] [atom 42] [keyword }]',
+     '[keyword {] [atom .42] [keyword }]',
+     '[keyword {] [atom 0.42] [keyword }]',
+     '[keyword {] [atom -0.42] [keyword }]',
+     '[keyword {] [atom -.2] [keyword }]',
+     '[keyword {] [atom 0x1F] [keyword }]',
+     '[keyword {] [atom 0x1F00BBEA] [keyword }]');
+
   MT('param-type-test',
      '[keyword {@param] [def a]: ' +
          '[type list]<[[[type a]: [type int], ' +

From 9018db9cac5a8a09a55b69f33fef0fb73c2e090b Mon Sep 17 00:00:00 2001
From: Christopher Wallis
 <chriswallis@chriswallis-macbookpro.roam.corp.google.com>
Date: Thu, 20 Dec 2018 15:04:08 -0700
Subject: [PATCH 3933/4742] [soy mode] tokenize operators in expressions

- tokenize arithmetic and equality operators as "operator"
- added tests to validate this
---
 mode/soy/soy.js  |  4 ++++
 mode/soy/test.js | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 356276d00b..bb61132d75 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -271,6 +271,10 @@
               stream.match(/-?([0-9]*[.])?[0-9]+/)) {
               return "atom";
             }
+            if (stream.match(/(\||[+\-*\/%]|[=!][=]|[<>][=]?)/)) {
+              // Tokenize filter, binary, and equality operators.
+              return "operator";
+            }
             if (match = stream.match(/^\$([\w]+)/)) {
               return ref(state.variables, match[1]);
             }
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 0698b9d650..e57d606f1c 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -8,7 +8,7 @@
   // Test of small keywords and words containing them.
   MT('keywords-test',
      '[keyword {] [keyword as] worrying [keyword and] notorious [keyword as]',
-     '    the Fandor-alias assassin, [keyword or]',
+     '    the Fandor[operator -]alias assassin, [keyword or]',
      '    Corcand cannot fit [keyword in] [keyword }]');
 
   MT('let-test',
@@ -33,6 +33,20 @@
      '[keyword {namespace] [variable my.namespace.templates] ' +
          '[attribute requirecss]=[string "my.namespace"][keyword }]');
 
+  MT('operators-test',
+     '[keyword {] [atom 1] [operator ==] [atom 1] [keyword }]',
+     '[keyword {] [atom 1] [operator !=] [atom 2] [keyword }]',
+     '[keyword {] [atom 2] [operator +] [atom 2] [keyword }]',
+     '[keyword {] [atom 2] [operator -] [atom 2] [keyword }]',
+     '[keyword {] [atom 2] [operator *] [atom 2] [keyword }]',
+     '[keyword {] [atom 2] [operator /] [atom 2] [keyword }]',
+     '[keyword {] [atom 2] [operator %] [atom 2] [keyword }]',
+     '[keyword {] [atom 2] [operator <=] [atom 2] [keyword }]',
+     '[keyword {] [atom 2] [operator >=] [atom 2] [keyword }]',
+     '[keyword {] [atom 3] [operator >] [atom 2] [keyword }]',
+     '[keyword {] [atom 2] [operator >] [atom 3] [keyword }]',
+     '[keyword {] [variable-2&error $variable] [operator |] safeHtml [keyword }]')
+
   MT('primitive-test',
      '[keyword {] [atom true] [keyword }]',
      '[keyword {] [atom false] [keyword }]',

From adb4ad3f7fc45612612df896eaee28948f9e5b2a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Dec 2018 10:55:45 +0100
Subject: [PATCH 3934/4742] Fix issue in IE where the context menu hack might
 stay visible

Because JS seems to be frozen entirely while the context menu is
open, the next open might happen before the timeout was able to
fire. This forces the previous context menu kludge to be cleared
before starting a new one.
---
 src/input/TextareaInput.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index adfa36034d..75fcb18118 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -264,6 +264,7 @@ export default class TextareaInput {
 
   onContextMenu(e) {
     let input = this, cm = input.cm, display = cm.display, te = input.textarea
+    if (input.contextMenuPending) input.contextMenuPending()
     let pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop
     if (!pos || presto) return // Opera is difficult.
 
@@ -287,7 +288,7 @@ export default class TextareaInput {
     display.input.reset()
     // Adds "Select all" to context menu in FF
     if (!cm.somethingSelected()) te.value = input.prevInput = " "
-    input.contextMenuPending = true
+    input.contextMenuPending = rehide
     display.selForContextMenu = cm.doc.sel
     clearTimeout(display.detectingSelectAll)
 
@@ -308,6 +309,7 @@ export default class TextareaInput {
       }
     }
     function rehide() {
+      if (input.contextMenuPending != rehide) return
       input.contextMenuPending = false
       input.wrapper.style.cssText = oldWrapperCSS
       te.style.cssText = oldCSS

From a21ea6f496f09d02254d7af32f33f61ae81a440f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Dec 2018 10:57:56 +0100
Subject: [PATCH 3935/4742] Improve positioning of context menu hack

It sometimes went wrong due to the textarea wrapper being moved
when the cursor was placed under the mouse.
---
 src/input/TextareaInput.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 75fcb18118..ad81d8a93a 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -275,8 +275,8 @@ export default class TextareaInput {
       operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll)
 
     let oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText
-    input.wrapper.style.cssText = "position: absolute"
-    let wrapperBox = input.wrapper.getBoundingClientRect()
+    let wrapperBox = input.wrapper.offsetParent.getBoundingClientRect()
+    input.wrapper.style.cssText = "position: static"
     te.style.cssText = `position: absolute; width: 30px; height: 30px;
       top: ${e.clientY - wrapperBox.top - 5}px; left: ${e.clientX - wrapperBox.left - 5}px;
       z-index: 1000; background: ${ie ? "rgba(255, 255, 255, .05)" : "transparent"};

From 91eec71a6c1ca2a83eb50ecb623c33805c04888b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Dec 2018 11:05:27 +0100
Subject: [PATCH 3936/4742] [show-hint addon] Define a closeHint method

Issue #5682
---
 addon/hint/show-hint.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 2802577553..fc5af15281 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -46,6 +46,10 @@
     completion.update(true);
   });
 
+  CodeMirror.defineExtension("closeHint", function() {
+    if (this.state.completionActive) this.state.completionActive.close()
+  })
+
   function Completion(cm, options) {
     this.cm = cm;
     this.options = options;

From f658d0927ecd4668ae71973ba6ed9cecdcc662a8 Mon Sep 17 00:00:00 2001
From: Neil Anderson <neil.t.anderson+sqlmigrate@gmail.com>
Date: Fri, 21 Dec 2018 05:06:33 -0500
Subject: [PATCH 3937/4742] [sql mode] Add SUBSCRIPTION postgres keyword

See https://www.postgresql.org/docs/10/sql-createsubscription.html
---
 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 de8f58d828..e7442c39a1 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -410,7 +410,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     name: "sql",
     client: set("source"),
     // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
-    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get gettoken global go goto grant granted greatest grouping groups handler header headline hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits init initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level lexize lextypes library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public publication quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get gettoken global go goto grant granted greatest grouping groups handler header headline hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits init initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level lexize lextypes library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public publication quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset subscription substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
     // https://www.postgresql.org/docs/10/static/datatype.html
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),

From 0612ed0d40ac8b893c4f8cec98958129f2f86969 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Dec 2018 11:13:31 +0100
Subject: [PATCH 3938/4742] [panel demo] Prevent editor from losing focus when
 closing a panel

See https://discuss.codemirror.net/t/codemirror-panel-demo-cursor-disappears-on-closing-panel/1946
---
 demo/panel.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/demo/panel.html b/demo/panel.html
index 1030615a21..d4f813d048 100644
--- a/demo/panel.html
+++ b/demo/panel.html
@@ -106,7 +106,8 @@ <h2>Panel Demo</h2>
   close.setAttribute("title", "Remove me!");
   close.setAttribute("class", "remove-panel");
   close.textContent = "✖";
-  CodeMirror.on(close, "click", function() {
+  CodeMirror.on(close, "mousedown", function(e) {
+    e.preventDefault()
     panels[node.id].clear();
   });
   label = node.appendChild(document.createElement("span"));

From 582022b39380dd79d93db97e0b47341bee0a6699 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Dec 2018 11:36:07 +0100
Subject: [PATCH 3939/4742] Mark version 5.42.2

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 83d2a4d9b0..8e53b9b171 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -151,6 +151,7 @@ Christopher Brown
 Christopher Kramer
 Christopher Mitchell
 Christopher Pfohl
+Christopher Wallis
 Chunliang Lyu
 ciaranj
 CodeAnimal
@@ -244,6 +245,7 @@ Ford_Lawnmower
 Forrest Oliphant
 Franco Catena
 Frank Wiegand
+fraxx001
 Fredrik Borg
 Gabriel Gheorghian
 Gabriel Horner
@@ -258,6 +260,7 @@ George Stephanis
 geowarin
 Gerard Braad
 Gergely Hegykozi
+Germain Chazot
 Giovanni Calò
 Glebov Boris
 Glenn Jorde
@@ -330,6 +333,7 @@ Jared Jacobs
 Jason
 Jason Barnabe
 Jason Grout
+Jason Heeris
 Jason Johnston
 Jason San Jose
 Jason Siefken
@@ -411,6 +415,7 @@ kubelsmieci
 KwanEsq
 Kyle Kelley
 KyleMcNutt
+LaKing
 Lanfei
 Lanny
 laobubu
@@ -767,6 +772,7 @@ Wu Cheng-Han
 Xavier Mendez
 Yassin N. Hassan
 YNH Webdev
+yoongu
 Yunchi Luo
 Yuvi Panda
 Yvonnick Esnault
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e20bf30b8..b5c2b9d7d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 5.42.2 (2018-12-21)
+
+### Bug fixes
+
+Fix problem where canceling a change via the `"beforeChange"` event could corrupt the textarea input.
+
+Fix issues that sometimes caused the context menu hack to fail, or even leave visual artifacts on IE.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Make it possible to select text between angle brackets.
+
+[css mode](https://codemirror.net/mode/css/): Fix tokenizing of CSS variables.
+
+[python mode](https://codemirror.net/mode/python/): Fix another bug in tokenizing of format strings.
+
+[soy mode](https://codemirror.net/mode/soy/): More accurate highlighting.
+
 ## 5.42.0 (2018-11-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index ae07f8d377..8f490328e1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.42.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.42.2</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 2f1e965c93..a7a5cce95d 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-12-2018: <a href="https://codemirror.net/codemirror-5.42.2.zip">Version 5.42.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix problem where canceling a change via the <code>&quot;beforeChange&quot;</code> event could corrupt the textarea input.</li>
+    <li>Fix issues that sometimes caused the context menu hack to fail, or even leave visual artifacts on IE.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Make it possible to select text between angle brackets.</li>
+    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Fix tokenizing of CSS variables.</li>
+    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Fix another bug in tokenizing of format strings.</li>
+    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: More accurate highlighting.</li>
+  </ul>
 
   <p class="rel">20-11-2018: <a href="https://codemirror.net/codemirror-5.42.0.zip">Version 5.42.0</a>:</p>
 
diff --git a/index.html b/index.html
index ce02a28ca4..b9dc9b9c92 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.42.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.42.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 673f9a2f3f..8fc42fbf31 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.42.1",
+  "version": "5.42.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 090049e979..adc8b65099 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.42.1"
+CodeMirror.version = "5.42.2"

From d3006a5ed6bab875a7740166b092ec7b1c8f2541 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Dec 2018 11:41:17 +0100
Subject: [PATCH 3940/4742] Bump version number post-5.42.2

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8f490328e1..97f12949f7 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.42.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.42.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 8fc42fbf31..a92d91dccb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.42.2",
+  "version": "5.42.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index adc8b65099..a9edb6870e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.42.2"
+CodeMirror.version = "5.42.3"

From ced4f5e5f7cb782512a56dd24f65e8ff39d3c6ce Mon Sep 17 00:00:00 2001
From: Christopher Wallis
 <chriswallis@chriswallis-macbookpro.roam.corp.google.com>
Date: Fri, 21 Dec 2018 08:53:06 -0700
Subject: [PATCH 3941/4742] [soy mode] added null literal and null propogation
 operator

- added null as atom
- added null propogator as operator
- changed [=] to = in operator regex
- added tests to validate new highlighting
---
 mode/soy/soy.js  | 6 +++---
 mode/soy/test.js | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index bb61132d75..42d581d6c6 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -266,13 +266,13 @@
               state.quoteKind = match;
               return "string";
             }
-            if (stream.match(/(true|false)(?!\w)/) ||
+            if (stream.match(/(null|true|false)(?!\w)/) ||
               stream.match(/0x([0-9a-fA-F]{2,})/) ||
               stream.match(/-?([0-9]*[.])?[0-9]+/)) {
               return "atom";
             }
-            if (stream.match(/(\||[+\-*\/%]|[=!][=]|[<>][=]?)/)) {
-              // Tokenize filter, binary, and equality operators.
+            if (stream.match(/(\||[+\-*\/%]|[=!]=|\?:|[<>]=?)/)) {
+              // Tokenize filter, binary, null propagator, and equality operators.
               return "operator";
             }
             if (match = stream.match(/^\$([\w]+)/)) {
diff --git a/mode/soy/test.js b/mode/soy/test.js
index e57d606f1c..ef03ea99e9 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -45,6 +45,7 @@
      '[keyword {] [atom 2] [operator >=] [atom 2] [keyword }]',
      '[keyword {] [atom 3] [operator >] [atom 2] [keyword }]',
      '[keyword {] [atom 2] [operator >] [atom 3] [keyword }]',
+     '[keyword {] [atom null] [operator ?:] [string ""] [keyword }]',
      '[keyword {] [variable-2&error $variable] [operator |] safeHtml [keyword }]')
 
   MT('primitive-test',

From 76daa5251d0e707411ad118c59c294502774fad8 Mon Sep 17 00:00:00 2001
From: Christopher Wallis
 <chriswallis@chriswallis-macbookpro.roam.corp.google.com>
Date: Fri, 21 Dec 2018 09:08:27 -0700
Subject: [PATCH 3942/4742] [soy mode] add support for scientific notation

- modified the decimal expression to support scientific notation
- added tests to verify new highlighting behavior
---
 mode/soy/soy.js  | 2 +-
 mode/soy/test.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 42d581d6c6..7ebd4b3d89 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -268,7 +268,7 @@
             }
             if (stream.match(/(null|true|false)(?!\w)/) ||
               stream.match(/0x([0-9a-fA-F]{2,})/) ||
-              stream.match(/-?([0-9]*[.])?[0-9]+/)) {
+              stream.match(/-?([0-9]*[.])?[0-9]+(e[0-9]*)?/)) {
               return "atom";
             }
             if (stream.match(/(\||[+\-*\/%]|[=!]=|\?:|[<>]=?)/)) {
diff --git a/mode/soy/test.js b/mode/soy/test.js
index ef03ea99e9..f057f4feff 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -58,6 +58,8 @@
      '[keyword {] [atom 0.42] [keyword }]',
      '[keyword {] [atom -0.42] [keyword }]',
      '[keyword {] [atom -.2] [keyword }]',
+     '[keyword {] [atom 6.03e23] [keyword }]',
+     '[keyword {] [atom -0.03e0] [keyword }]',
      '[keyword {] [atom 0x1F] [keyword }]',
      '[keyword {] [atom 0x1F00BBEA] [keyword }]');
 

From 4330d0681a9cadec4a930e44f0471e807ae73669 Mon Sep 17 00:00:00 2001
From: "FUJI Goro (gfx)" <gfuji@cpan.org>
Date: Tue, 25 Dec 2018 11:48:02 +0900
Subject: [PATCH 3943/4742] [show-hint addon]: bind Ctrl-P/Ctrl-N to up/down on
 macOS

---
 addon/hint/show-hint.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index fc5af15281..f86f954022 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,6 +1,8 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: https://codemirror.net/LICENSE
 
+var mac = /Mac/.test(navigator.platform);
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"));
@@ -167,6 +169,12 @@
       Tab: handle.pick,
       Esc: handle.close
     };
+
+    if (mac) {
+      baseMap["Ctrl-P"] = function() {handle.moveFocus(-1);};
+      baseMap["Ctrl-N"] = function() {handle.moveFocus(1);};
+    }
+
     var custom = completion.options.customKeys;
     var ourMap = custom ? {} : baseMap;
     function addBinding(key, val) {

From 3c79c54a335411fd1aff55246b77131dd98bb81b Mon Sep 17 00:00:00 2001
From: Christopher Wallis <chriswallis@google.com>
Date: Fri, 28 Dec 2018 09:52:16 -0700
Subject: [PATCH 3944/4742] [css mode] more consistent css function tokens

- created a css function regexp with a positive lookahead for (. There
are still a few cases with IE functions that have . and : in it that
this does not catch.
- folded url/domain/regexp into that css function regexp including the
special string tokenization that was in place already
- updated css, less, and scss tests to reflect this new tokenization
---
 mode/css/css.js       | 11 +++++------
 mode/css/less_test.js |  8 ++++----
 mode/css/scss_test.js | 10 +++++-----
 mode/css/test.js      | 44 +++++++++++++++++++++----------------------
 4 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index d82de4045d..05742c5c45 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -77,12 +77,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return ret("qualifier", "qualifier");
     } else if (/[:;{}\[\]\(\)]/.test(ch)) {
       return ret(null, ch);
-    } else if (((ch == "u" || ch == "U") && stream.match(/rl(-prefix)?\(/i)) ||
-               ((ch == "d" || ch == "D") && stream.match("omain(", true, true)) ||
-               ((ch == "r" || ch == "R") && stream.match("egexp(", true, true))) {
-      stream.backUp(1);
-      state.tokenize = tokenParenthesized;
-      return ret("property", "word");
+    } else if (stream.match(/[\w-.]+(?=\()/)) {
+      if (/^(url(-prefix)?|domain|regexp)$/.test(stream.current().toLowerCase())) {
+        state.tokenize = tokenParenthesized;
+      }
+      return ret("variable callee", "variable");
     } else if (/[\w\\\-]/.test(ch)) {
       stream.eatWhile(/[\w\\\-]/);
       return ret("property", "word");
diff --git a/mode/css/less_test.js b/mode/css/less_test.js
index 2e33a23c98..abeb6a2040 100644
--- a/mode/css/less_test.js
+++ b/mode/css/less_test.js
@@ -10,8 +10,8 @@
   MT("variable",
      "[variable-2 @base]: [atom #f04615];",
      "[qualifier .class] {",
-     "  [property width]: [variable percentage]([number 0.5]); [comment // returns `50%`]",
-     "  [property color]: [variable saturate]([variable-2 @base], [number 5%]);",
+     "  [property width]: [variable&callee percentage]([number 0.5]); [comment // returns `50%`]",
+     "  [property color]: [variable&callee saturate]([variable-2 @base], [number 5%]);",
      "}");
 
   MT("amp",
@@ -26,10 +26,10 @@
 
   MT("mixin",
      "[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",
-     "  [property color]: [atom darken]([variable-2 @color], [number 10%]);",
+     "  [property color]: [variable&callee darken]([variable-2 @color], [number 10%]);",
      "}",
      "[qualifier .mixin] ([variable light]; [variable-2 @color]) {",
-     "  [property color]: [atom lighten]([variable-2 @color], [number 10%]);",
+     "  [property color]: [variable&callee lighten]([variable-2 @color], [number 10%]);",
      "}",
      "[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",
      "  [property display]: [atom block];",
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 1fc1bbdc28..68afc664b6 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -6,19 +6,19 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
 
   MT('url_with_quotation',
-    "[tag foo] { [property background]:[atom url]([string test.jpg]) }");
+    "[tag foo] { [property background]:[variable&callee url]([string test.jpg]) }");
 
   MT('url_with_double_quotes',
-    "[tag foo] { [property background]:[atom url]([string \"test.jpg\"]) }");
+    "[tag foo] { [property background]:[variable&callee url]([string \"test.jpg\"]) }");
 
   MT('url_with_single_quotes',
-    "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) }");
+    "[tag foo] { [property background]:[variable&callee url]([string \'test.jpg\']) }");
 
   MT('string',
     "[def @import] [string \"compass/css3\"]");
 
   MT('important_keyword',
-    "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) [keyword !important] }");
+    "[tag foo] { [property background]:[variable&callee url]([string \'test.jpg\']) [keyword !important] }");
 
   MT('variable',
     "[variable-2 $blue]:[atom #333]");
@@ -95,7 +95,7 @@
 
   MT('indent_parentheses',
      "[tag foo] {",
-     "  [property color]: [atom darken]([variable-2 $blue],",
+     "  [property color]: [variable&callee darken]([variable-2 $blue],",
      "    [number 9%]);",
      "}");
 
diff --git a/mode/css/test.js b/mode/css/test.js
index 5bfc7af91d..64352d74fc 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -89,11 +89,11 @@
      "[tag foo] { [property margin]: [number 0]; [property padding]: [number 0]; }");
 
   MT("tagTwoPropertiesURL",
-     "[tag foo] { [property background]: [atom url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
+     "[tag foo] { [property background]: [variable&callee url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
 
   MT("indent_tagSelector",
      "[tag strong], [tag em] {",
-     "  [property background]: [atom rgba](",
+     "  [property background]: [variable&callee rgba](",
      "    [number 255], [number 255], [number 0], [number .2]",
      "  );",
      "}");
@@ -114,7 +114,7 @@
 
   MT("indent_parentheses",
      "[tag foo]:[variable-3 before] {",
-     "  [property background]: [atom url](",
+     "  [property background]: [variable&callee url](",
      "[string     blahblah]",
      "[string     etc]",
      "[string   ]) [keyword !important];",
@@ -124,20 +124,20 @@
      "[def @font-face] {",
      "  [property font-family]: [string 'myfont'];",
      "  [error nonsense]: [string 'abc'];",
-     "  [property src]: [atom url]([string http://blah]),",
-     "    [atom url]([string http://foo]);",
+     "  [property src]: [variable&callee url]([string http://blah]),",
+     "    [variable&callee url]([string http://foo]);",
      "}");
 
   MT("empty_url",
-     "[def @import] [atom url]() [attribute screen];");
+     "[def @import] [variable&callee url]() [attribute screen];");
 
   MT("parens",
      "[qualifier .foo] {",
-     "  [property background-image]: [variable fade]([atom #000], [number 20%]);",
-     "  [property border-image]: [atom linear-gradient](",
+     "  [property background-image]: [variable&callee fade]([atom #000], [number 20%]);",
+     "  [property border-image]: [variable&callee linear-gradient](",
      "    [atom to] [atom bottom],",
-     "    [variable fade]([atom #000], [number 20%]) [number 0%],",
-     "    [variable fade]([atom #000], [number 20%]) [number 100%]",
+     "    [variable&callee fade]([atom #000], [number 20%]) [number 0%],",
+     "    [variable&callee fade]([atom #000], [number 20%]) [number 100%]",
      "  );",
      "}");
 
@@ -146,7 +146,7 @@
      "  [variable-2 --main-color]: [atom #06c];",
      "}",
      "[tag h1][builtin #foo] {",
-     "  [property color]: [atom var]([variable-2 --main-color]);",
+     "  [property color]: [variable&callee var]([variable-2 --main-color]);",
      "}");
 
   MT("blank_css_variable",
@@ -154,7 +154,7 @@
      "  [variable-2 --]: [atom #06c];",
      "}",
      "[tag h1][builtin #foo] {",
-     "  [property color]: [atom var]([variable-2 --]);",
+     "  [property color]: [variable&callee var]([variable-2 --]);",
      "}");
 
   MT("supports",
@@ -163,10 +163,10 @@
      "}");
 
    MT("document",
-      "[def @document] [tag url]([string http://blah]),",
-      "  [tag url-prefix]([string https://]),",
-      "  [tag domain]([string blah.com]),",
-      "  [tag regexp]([string \".*blah.+\"]) {",
+      "[def @document] [variable&callee url]([string http://blah]),",
+      "  [variable&callee url-prefix]([string https://]),",
+      "  [variable&callee domain]([string blah.com]),",
+      "  [variable&callee regexp]([string \".*blah.+\"]) {",
       "    [builtin #id] {",
       "      [property background-color]: [keyword white];",
       "    }",
@@ -176,16 +176,16 @@
       "}");
 
    MT("document_url",
-      "[def @document] [tag url]([string http://blah]) { [qualifier .class] { } }");
+      "[def @document] [variable&callee url]([string http://blah]) { [qualifier .class] { } }");
 
    MT("document_urlPrefix",
-      "[def @document] [tag url-prefix]([string https://]) { [builtin #id] { } }");
+      "[def @document] [variable&callee url-prefix]([string https://]) { [builtin #id] { } }");
 
    MT("document_domain",
-      "[def @document] [tag domain]([string blah.com]) { [tag foo] { } }");
+      "[def @document] [variable&callee domain]([string blah.com]) { [tag foo] { } }");
 
    MT("document_regexp",
-      "[def @document] [tag regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
+      "[def @document] [variable&callee regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
 
    MT("counter-style",
       "[def @counter-style] [variable binary] {",
@@ -207,11 +207,11 @@
       "[tag ol][qualifier .roman] { [property list-style]: [variable simple-roman]; }");
 
    MT("counter-style-symbols",
-      "[tag ol] { [property list-style]: [atom symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
+      "[tag ol] { [property list-style]: [variable&callee symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
 
   MT("comment-does-not-disrupt",
      "[def @font-face] [comment /* foo */] {",
-     "  [property src]: [atom url]([string x]);",
+     "  [property src]: [variable&callee url]([string x]);",
      "  [property font-family]: [variable One];",
      "}")
 })();

From be9d254ecc708563727d1f4198383af660b32080 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 29 Dec 2018 15:42:37 +0100
Subject: [PATCH 3945/4742] [ruby mode] Support indented heredoc end token

Closes #5727
Closes #5728
---
 mode/ruby/ruby.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index f954ed2212..3cb3971284 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -218,6 +218,7 @@ CodeMirror.defineMode("ruby", function(config) {
   }
   function readHereDoc(phrase) {
     return function(stream, state) {
+      stream.eatSpace()
       if (stream.match(phrase)) state.tokenize.pop();
       else stream.skipToEnd();
       return "string";

From 64f7d4ce108468545012d0f6e6584054b7964261 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 2 Jan 2019 11:25:23 +0100
Subject: [PATCH 3946/4742] [ruby mode] Only allow indented heredoc end markers
 when a - was present

Issue #5728
---
 mode/ruby/ruby.js | 10 +++++-----
 mode/ruby/test.js |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 3cb3971284..5d9288666f 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -63,8 +63,8 @@ CodeMirror.defineMode("ruby", function(config) {
     } else if (ch == "#") {
       stream.skipToEnd();
       return "comment";
-    } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
-      return chain(readHereDoc(m[1]), stream, state);
+    } else if (ch == "<" && (m = stream.match(/^<(-)?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
+      return chain(readHereDoc(m[2], m[1]), stream, state);
     } else if (ch == "0") {
       if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
       else if (stream.eat("b")) stream.eatWhile(/[01]/);
@@ -216,9 +216,9 @@ CodeMirror.defineMode("ruby", function(config) {
       return style;
     };
   }
-  function readHereDoc(phrase) {
+  function readHereDoc(phrase, mayIndent) {
     return function(stream, state) {
-      stream.eatSpace()
+      if (mayIndent) stream.eatSpace()
       if (stream.match(phrase)) state.tokenize.pop();
       else stream.skipToEnd();
       return "string";
@@ -277,7 +277,7 @@ CodeMirror.defineMode("ruby", function(config) {
     },
 
     indent: function(state, textAfter) {
-      if (state.tokenize[state.tokenize.length-1] != tokenBase) return 0;
+      if (state.tokenize[state.tokenize.length-1] != tokenBase) return CodeMirror.Pass;
       var firstChar = textAfter && textAfter.charAt(0);
       var ct = state.context;
       var closing = ct.type == matching[firstChar] ||
diff --git a/mode/ruby/test.js b/mode/ruby/test.js
index 5677e0de8d..905c0e4849 100644
--- a/mode/ruby/test.js
+++ b/mode/ruby/test.js
@@ -13,4 +13,11 @@
 
   MT("complex_regexp",
      "[keyword if] [variable cr] [operator =~] [string-2 /(?: \\( #{][tag RE_NOT][string-2 }\\( | #{][tag RE_NOT_PAR_OR][string-2 }* #{][tag RE_OPA_OR][string-2 } )/][variable x]")
+
+  MT("indented_heredoc",
+     "[keyword def] [def x]",
+     "  [variable y] [operator =] [string <<-FOO]",
+     "[string     bar]",
+     "[string   FOO]",
+     "[keyword end]")
 })();

From fe2bdb372b7c1f2978d8b5934a1d16546f032a9a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 3 Jan 2019 11:28:23 +0100
Subject: [PATCH 3947/4742] [javascript mode] Improve support for syntactic
 corner cases in TypeScript

Closes #5734
---
 mode/javascript/javascript.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 42b4b191f1..aa80f29567 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -377,7 +377,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
       } else if (isTS && value == "namespace") {
         cx.marked = "keyword"
-        return cont(pushlex("form"), expression, block, poplex)
+        return cont(pushlex("form"), expression, statement, poplex)
       } else if (isTS && value == "abstract") {
         cx.marked = "keyword"
         return cont(statement)
@@ -552,6 +552,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         }, proceed);
       }
       if (type == end || value == end) return cont();
+      if (sep && sep.indexOf(";") > -1) return pass(what)
       return cont(expect(end));
     }
     return function(type, value) {
@@ -614,6 +615,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(typeexpr)
     } else if (type == "[") {
       return cont(expression, maybetype, expect("]"), typeprop)
+    } else if (type == "(") {
+      return cont(pushlex(")"), commasep(funarg, ")"), poplex, typeprop)
     }
   }
   function typearg(type, value) {

From c608b998c104c91ae01f7effb4cb537479914807 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 4 Jan 2019 08:29:11 +0100
Subject: [PATCH 3948/4742] [javascript] Don't expect function bodies in
 interface declarations

Issue #5734
---
 mode/javascript/javascript.js | 14 ++++++++++++--
 mode/javascript/test.js       |  6 ++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index aa80f29567..93b8cfdcf2 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -365,7 +365,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     if (type == "function") return cont(functiondef);
     if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
-    if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), className, poplex); }
+    if (type == "class" || (isTS && value == "interface")) {
+      cx.marked = "keyword"
+      return cont(pushlex("form", type == "class" ? type : value), className, poplex)
+    }
     if (type == "variable") {
       if (isTS && value == "declare") {
         cx.marked = "keyword"
@@ -701,6 +704,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, statement, popcontext);
     if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef)
   }
+  function functiondecl(type, value) {
+    if (value == "*") {cx.marked = "keyword"; return cont(functiondecl);}
+    if (type == "variable") {register(value); return cont(functiondecl);}
+    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, popcontext);
+    if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondecl)
+  }
   function funarg(type, value) {
     if (value == "@") cont(expression, funarg)
     if (type == "spread") return cont(funarg);
@@ -749,7 +758,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "?") return cont(classfield)
     if (type == ":") return cont(typeexpr, maybeAssign)
     if (value == "=") return cont(expressionNoComma)
-    return pass(functiondef)
+    var context = cx.state.lexical.prev, isInterface = context && context.info == "interface"
+    return pass(isInterface ? functiondecl : functiondef)
   }
   function afterExport(type, value) {
     if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 21547e4787..04faeafa31 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -448,6 +448,12 @@
   TS("abstract class",
      "[keyword export] [keyword abstract] [keyword class] [def Foo] {}")
 
+  TS("interface without semicolons",
+     "[keyword interface] [def Foo] {",
+     "  [property greet]([def x]: [type int]): [type blah]",
+     "  [property bar]: [type void]",
+     "}")
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}

From 05490c8c40584b06f4cd0ba88c9c2a59f32af5d6 Mon Sep 17 00:00:00 2001
From: joewalsh <joewalsh@users.noreply.github.com>
Date: Wed, 9 Jan 2019 02:19:11 -0500
Subject: [PATCH 3949/4742] Add options for autocorrect, autocapitalize

---
 addon/hint/html-hint.js           | 2 ++
 doc/manual.html                   | 9 +++++++++
 src/edit/options.js               | 2 ++
 src/input/ContentEditableInput.js | 2 +-
 src/input/input.js                | 6 +++---
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index b5aeb47fda..d0cca4f6a2 100644
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -322,6 +322,8 @@
     itemtype: null,
     lang: ["en", "es"],
     spellcheck: ["true", "false"],
+    autocorrect: ["true", "false"],
+    autocapitalize: ["true", "false"],
     style: null,
     tabindex: ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
     title: null,
diff --git a/doc/manual.html b/doc/manual.html
index 97f12949f7..0efa107dde 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -557,6 +557,15 @@ <h2>Configuration</h2>
       always rendered, and thus the browser's text search works on it.
       This <em>will</em> have bad effects on performance of big
       documents.</dd>
+      
+      <dt id="option_spellcheck"><code><strong>spellcheck</strong>: boolean</code></dt>
+      <dd>Specifies whether or not spellcheck will be enabled on the input.</dd>
+      
+      <dt id="option_autocorrect"><code><strong>autocorrect</strong>: boolean</code></dt>
+      <dd>Specifies whether or not autocorrect will be enabled on the input.</dd>
+      
+      <dt id="option_autocapitalize"><code><strong>autocapitalize</strong>: boolean</code></dt>
+      <dd>Specifies whether or not autocapitalization will be enabled on the input.</dd>
     </dl>
 </section>
 
diff --git a/src/edit/options.js b/src/edit/options.js
index a649a4a694..27ecac7cff 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -79,6 +79,8 @@ export function defineOptions(CodeMirror) {
     throw new Error("inputStyle can not (yet) be changed in a running editor") // FIXME
   }, true)
   option("spellcheck", false, (cm, val) => cm.getInputField().spellcheck = val, true)
+  option("autocorrect", false, (cm, val) => cm.getInputField().autocorrect = val, true)
+  option("autocapitalize", false, (cm, val) => cm.getInputField().autocapitalize = val, true)
   option("rtlMoveVisually", !windows)
   option("wholeLineUpdateBefore", true)
 
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 986690b301..b8d1aff042 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -29,7 +29,7 @@ export default class ContentEditableInput {
   init(display) {
     let input = this, cm = input.cm
     let div = input.div = display.lineDiv
-    disableBrowserMagic(div, cm.options.spellcheck)
+    disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize)
 
     on(div, "paste", e => {
       if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
diff --git a/src/input/input.js b/src/input/input.js
index eb9c2cab47..90833d19e1 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -112,9 +112,9 @@ export function copyableRanges(cm) {
   return {text: text, ranges: ranges}
 }
 
-export function disableBrowserMagic(field, spellcheck) {
-  field.setAttribute("autocorrect", "off")
-  field.setAttribute("autocapitalize", "off")
+export function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) {
+  field.setAttribute("autocorrect", !!autocorrect)
+  field.setAttribute("autocapitalize", !!autocapitalize)
   field.setAttribute("spellcheck", !!spellcheck)
 }
 

From 12f8159c8b0a6a0d6c347e9add69febf15c1e62c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 9 Jan 2019 08:28:41 +0100
Subject: [PATCH 3950/4742] [sql mode] Fall make sure there are keywords and
 builtins defined when no config is provided

Closes #5740
---
 mode/sql/sql.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index e7442c39a1..69f6b2f321 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -12,12 +12,10 @@
 "use strict";
 
 CodeMirror.defineMode("sql", function(config, parserConfig) {
-  "use strict";
-
   var client         = parserConfig.client || {},
       atoms          = parserConfig.atoms || {"false": true, "true": true, "null": true},
-      builtin        = parserConfig.builtin || {},
-      keywords       = parserConfig.keywords || {},
+      builtin        = parserConfig.builtin || set(defaultBuiltin),
+      keywords       = parserConfig.keywords || set(sqlKeywords),
       operatorChars  = parserConfig.operatorChars || /^[*+\-%<>!=&|~^\/]/,
       support        = parserConfig.support || {},
       hooks          = parserConfig.hooks || {},
@@ -205,9 +203,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   };
 });
 
-(function() {
-  "use strict";
-
   // `identifier`
   function hookIdentifier(stream) {
     // MySQL/MariaDB identifiers
@@ -282,11 +277,13 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     return obj;
   }
 
+  var defaultBuiltin = "bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"
+
   // A generic SQL Mode. It's not a standard, it just try to support what is generally supported
   CodeMirror.defineMIME("text/x-sql", {
     name: "sql",
     keywords: set(sqlKeywords + "begin"),
-    builtin: set("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),
+    builtin: set(defaultBuiltin),
     atoms: set("false true null unknown"),
     dateSQL: set("date time timestamp"),
     support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
@@ -464,8 +461,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     dateSQL: set("time"),
     support: set("decimallessFloat zerolessFloat binaryNumber hexNumber")
   });
-}());
-
 });
 
 /*

From 0e804008fd49da3da2012941b07c78322e0b0925 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 10 Jan 2019 10:04:05 +0100
Subject: [PATCH 3951/4742] Make sure indent is always passed three arguments

Closes codemirror/google-modes#235
---
 addon/mode/multiplex.js     | 8 ++++----
 addon/mode/overlay.js       | 4 ++--
 mode/htmlmixed/htmlmixed.js | 4 ++--
 mode/jsx/jsx.js             | 4 ++--
 mode/php/php.js             | 8 ++++----
 mode/smarty/smarty.js       | 4 ++--
 mode/soy/soy.js             | 8 ++++----
 test/mode_test.js           | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 738ea98a0d..93fd9a5a46 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -54,7 +54,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
             // Get the outer indent, making sure to handle CodeMirror.Pass
             var outerIndent = 0;
             if (outer.indent) {
-              var possibleOuterIndent = outer.indent(state.outer, "");
+              var possibleOuterIndent = outer.indent(state.outer, "", "");
               if (possibleOuterIndent !== CodeMirror.Pass) outerIndent = possibleOuterIndent;
             }
 
@@ -96,10 +96,10 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       }
     },
 
-    indent: function(state, textAfter) {
+    indent: function(state, textAfter, line) {
       var mode = state.innerActive ? state.innerActive.mode : outer;
       if (!mode.indent) return CodeMirror.Pass;
-      return mode.indent(state.innerActive ? state.inner : state.outer, textAfter);
+      return mode.indent(state.innerActive ? state.inner : state.outer, textAfter, line);
     },
 
     blankLine: function(state) {
@@ -112,7 +112,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           var other = others[i];
           if (other.open === "\n") {
             state.innerActive = other;
-            state.inner = CodeMirror.startState(other.mode, mode.indent ? mode.indent(state.outer, "") : 0);
+            state.inner = CodeMirror.startState(other.mode, mode.indent ? mode.indent(state.outer, "", "") : 0);
           }
         }
       } else if (state.innerActive.close === "\n") {
diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index 839d9e552e..016e3c28cc 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -68,8 +68,8 @@ CodeMirror.overlayMode = function(base, overlay, combine) {
       else return state.overlayCur;
     },
 
-    indent: base.indent && function(state, textAfter) {
-      return base.indent(state.base, textAfter);
+    indent: base.indent && function(state, textAfter, line) {
+      return base.indent(state.base, textAfter, line);
     },
     electricChars: base.electricChars,
 
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index c992538477..8341ac8261 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -105,7 +105,7 @@
           return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState));
         };
         state.localMode = mode;
-        state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
+        state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, "", ""));
       } else if (state.inTag) {
         state.inTag += stream.current()
         if (stream.eol()) state.inTag += " "
@@ -135,7 +135,7 @@
 
       indent: function (state, textAfter, line) {
         if (!state.localMode || /^\s*<\//.test(textAfter))
-          return htmlMode.indent(state.htmlState, textAfter);
+          return htmlMode.indent(state.htmlState, textAfter, line);
         else if (state.localMode.indent)
           return state.localMode.indent(state.localState, textAfter, line);
         else
diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 2c91beb955..889d3fe5e7 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -32,7 +32,7 @@
     function flatXMLIndent(state) {
       var tagName = state.tagName
       state.tagName = null
-      var result = xmlMode.indent(state, "")
+      var result = xmlMode.indent(state, "", "")
       state.tagName = tagName
       return result
     }
@@ -105,7 +105,7 @@
     function jsToken(stream, state, cx) {
       if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
         jsMode.skipExpression(cx.state)
-        state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
+        state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "", "")),
                                     xmlMode, 0, state.context)
         return null
       }
diff --git a/mode/php/php.js b/mode/php/php.js
index 80e2f20bf1..5f3a143999 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -160,7 +160,7 @@
       if (!isPHP) {
         if (stream.match(/^<\?\w*/)) {
           state.curMode = phpMode;
-          if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, ""))
+          if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, "", ""))
           state.curState = state.php;
           return "meta";
         }
@@ -213,11 +213,11 @@
 
       token: dispatch,
 
-      indent: function(state, textAfter) {
+      indent: function(state, textAfter, line) {
         if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) ||
             (state.curMode == phpMode && /^\?>/.test(textAfter)))
-          return htmlMode.indent(state.html, textAfter);
-        return state.curMode.indent(state.curState, textAfter);
+          return htmlMode.indent(state.html, textAfter, line);
+        return state.curMode.indent(state.curState, textAfter, line);
       },
 
       blockCommentStart: "/*",
diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index c0777e0c7a..57852feb0e 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -210,9 +210,9 @@
         state.last = last;
         return style;
       },
-      indent: function(state, text) {
+      indent: function(state, text, line) {
         if (state.tokenize == tokenTop && baseMode.indent)
-          return baseMode.indent(state.base, text);
+          return baseMode.indent(state.base, text, line);
         else
           return CodeMirror.Pass;
       },
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 7ebd4b3d89..faf4314be4 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -251,7 +251,7 @@
                 var mode = modes[kind] || modes.html;
                 var localState = last(state.localStates);
                 if (localState.mode.indent) {
-                  state.indent += localState.mode.indent(localState.state, "");
+                  state.indent += localState.mode.indent(localState.state, "", "");
                 }
                 state.localStates.push({
                   mode: mode,
@@ -310,7 +310,7 @@
             state.localStates.pop();
             var localState = last(state.localStates);
             if (localState.mode.indent) {
-              state.indent -= localState.mode.indent(localState.state, "");
+              state.indent -= localState.mode.indent(localState.state, "", "");
             }
           }
           state.soyState.push("tag");
@@ -346,7 +346,7 @@
         return tokenUntil(stream, state, /\{|\s+\/\/|\/\*/);
       },
 
-      indent: function(state, textAfter) {
+      indent: function(state, textAfter, line) {
         var indent = state.indent, top = last(state.soyState);
         if (top == "comment") return CodeMirror.Pass;
 
@@ -360,7 +360,7 @@
         }
         var localState = last(state.localStates);
         if (indent && localState.mode.indent) {
-          indent += localState.mode.indent(localState.state, textAfter);
+          indent += localState.mode.indent(localState.state, textAfter, line);
         }
         return indent;
       },
diff --git a/test/mode_test.js b/test/mode_test.js
index f4c4dbfe0c..e7c0cf92ae 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -123,7 +123,7 @@
       var line = lines[i], newLine = true;
       if (mode.indent) {
         var ws = line.match(/^\s*/)[0];
-        var indent = mode.indent(state, line.slice(ws.length));
+        var indent = mode.indent(state, line.slice(ws.length), line);
         if (indent != CodeMirror.Pass && indent != ws.length)
           (st.indentFailures || (st.indentFailures = [])).push(
             "Indentation of line " + (i + 1) + " is " + indent + " (expected " + ws.length + ")");

From 816430b467bcdec29b136e623f4af43fbdaaf82d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 11 Jan 2019 08:13:52 +0100
Subject: [PATCH 3952/4742] [julia mode] Don't autoclose single quotes in Julia
 code

Closes #5742
---
 mode/julia/julia.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 3e3560dcc2..435e94192a 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -422,6 +422,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     blockCommentStart: "#=",
     blockCommentEnd: "=#",
     lineComment: "#",
+    closeBrackets: "()[]{}\"\"",
     fold: "indent"
   };
   return external;

From 74f31990f24ae03e214cf67c430ee2697abebe8c Mon Sep 17 00:00:00 2001
From: Michael Wadman <8885966+mwadman@users.noreply.github.com>
Date: Mon, 14 Jan 2019 21:52:18 +1300
Subject: [PATCH 3953/4742] [jinja2 mode] Add MIME type

---
 mode/jinja2/jinja2.js | 2 ++
 mode/meta.js          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index 3ccfe7f18b..77c9b22cae 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -141,4 +141,6 @@
       blockCommentEnd: "#}"
     };
   });
+
+  CodeMirror.defineMIME("text/jinja2", "jinja2");
 });
diff --git a/mode/meta.js b/mode/meta.js
index 591312b55b..ef0a26a26b 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -75,7 +75,7 @@
     {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
     {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
     {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
-    {name: "Jinja2", mime: "null", mode: "jinja2", ext: ["j2", "jinja", "jinja2"]},
+    {name: "Jinja2", mime: "text/jinja2", mode: "jinja2", ext: ["j2", "jinja", "jinja2"]},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
     {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},

From e68dd640f858bff1eb289cc25300c9122ac8cad7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Jan 2019 16:20:05 +0100
Subject: [PATCH 3954/4742] [javascript mode] Improve TypeScript support

Add type conditionals, fix parenthesized types, support quoted property
names, fix handling of type parameters in type definitions, and handle
call signatures in interfaces and object types.

Closes #5737
---
 mode/javascript/javascript.js | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 93b8cfdcf2..269cdb4dd9 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -376,7 +376,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (isTS && (value == "module" || value == "enum" || value == "type") && cx.stream.match(/^\s*\w/, false)) {
         cx.marked = "keyword"
         if (value == "enum") return cont(enumdef);
-        else if (value == "type") return cont(typeexpr, expect("operator"), typeexpr, expect(";"));
+        else if (value == "type") return cont(typename, expect("operator"), typeexpr, expect(";"));
         else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
       } else if (isTS && value == "namespace") {
         cx.marked = "keyword"
@@ -574,7 +574,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function maybetype(type, value) {
     if (isTS) {
-      if (type == ":") return cont(typeexpr);
+      if (type == ":" || value == "in") return cont(typeexpr);
       if (value == "?") return cont(maybetype);
     }
   }
@@ -591,9 +591,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
   }
   function typeexpr(type, value) {
-    if (value == "keyof" || value == "typeof") {
+    if (value == "keyof" || value == "typeof" || value == "infer") {
       cx.marked = "keyword"
-      return cont(value == "keyof" ? typeexpr : expressionNoComma)
+      return cont(value == "typeof" ? expressionNoComma : typeexpr)
     }
     if (type == "variable" || value == "void") {
       cx.marked = "type"
@@ -602,7 +602,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
     if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)
     if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
-    if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType)
+    if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType, afterType)
     if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr)
   }
   function maybeReturnType(type) {
@@ -612,26 +612,28 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property"
       return cont(typeprop)
-    } else if (value == "?") {
+    } else if (value == "?" || type == "number" || type == "string") {
       return cont(typeprop)
     } else if (type == ":") {
       return cont(typeexpr)
     } else if (type == "[") {
-      return cont(expression, maybetype, expect("]"), typeprop)
+      return cont(expect("variable"), maybetype, expect("]"), typeprop)
     } else if (type == "(") {
-      return cont(pushlex(")"), commasep(funarg, ")"), poplex, typeprop)
+      return pass(functiondecl, typeprop)
     }
   }
   function typearg(type, value) {
     if (type == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg)
     if (type == ":") return cont(typeexpr)
+    if (type == "spread") return cont(typearg)
     return pass(typeexpr)
   }
   function afterType(type, value) {
     if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
     if (value == "|" || type == "." || value == "&") return cont(typeexpr)
-    if (type == "[") return cont(expect("]"), afterType)
+    if (type == "[") return cont(typeexpr, expect("]"), afterType)
     if (value == "extends" || value == "implements") { cx.marked = "keyword"; return cont(typeexpr) }
+    if (value == "?") return cont(typeexpr, expect(":"), typeexpr)
   }
   function maybeTypeArgs(_, value) {
     if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
@@ -710,6 +712,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, popcontext);
     if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondecl)
   }
+  function typename(type, value) {
+    if (type == "keyword" || type == "variable") {
+      cx.marked = "type"
+      return cont(typename)
+    } else if (value == "<") {
+      return cont(pushlex(">"), commasep(typeparam, ">"), poplex)
+    }
+  }
   function funarg(type, value) {
     if (value == "@") cont(expression, funarg)
     if (type == "spread") return cont(funarg);
@@ -744,12 +754,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       cx.marked = "property";
       return cont(isTS ? classfield : functiondef, classBody);
     }
+    if (type == "number" || type == "string") return cont(isTS ? classfield : functiondef, classBody);
     if (type == "[")
       return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
     if (value == "*") {
       cx.marked = "keyword";
       return cont(classBody);
     }
+    if (isTS && type == "(") return pass(functiondecl, classBody)
     if (type == ";") return cont(classBody);
     if (type == "}") return cont();
     if (value == "@") return cont(expression, classBody)

From 55a1ead02d1d208279a704a59cc9281c0e09a76a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Jan 2019 16:28:39 +0100
Subject: [PATCH 3955/4742] [javascript mode] Accept commas as separators in
 TypeScript interfaces

Issue #5734
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 269cdb4dd9..60d595dadb 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -762,7 +762,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(classBody);
     }
     if (isTS && type == "(") return pass(functiondecl, classBody)
-    if (type == ";") return cont(classBody);
+    if (type == ";" || type == ",") return cont(classBody);
     if (type == "}") return cont();
     if (value == "@") return cont(expression, classBody)
   }

From e8f6d1210255db6b987112e36f484d6aea503f7f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Jan 2019 16:56:54 +0100
Subject: [PATCH 3956/4742] Mark version 5.43.0

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 14 ++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 8e53b9b171..55bff7aead 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -247,6 +247,7 @@ Franco Catena
 Frank Wiegand
 fraxx001
 Fredrik Borg
+FUJI Goro (gfx)
 Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
@@ -355,6 +356,7 @@ jochenberger
 Jochen Berger
 Joel Einbinder
 joelpinheiro
+joewalsh
 Johan Ask
 John Connor
 John-David Dalton
@@ -506,6 +508,7 @@ Michael Goderbauer
 Michael Grey
 Michael Kaminsky
 Michael Lehenbauer
+Michael Wadman
 Michael Walker
 Michael Zhou
 Michal Čihař
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5c2b9d7d0..e07d5c74bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 5.43.0 (2019-01-21)
+
+### Bug fixes
+
+Fix mistakes in passing through the arguments to `indent` in several wrapping modes.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Fix parsing for a number of new and obscure TypeScript features.
+
+[ruby mode](https://codemirror.net/mode/ruby): Support indented end tokens for heredoc strings.
+
+### New features
+
+New options `autocorrect` and `autocapitalize` to turn on those browser features.
+
 ## 5.42.2 (2018-12-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 0efa107dde..4c2e0bf2c3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.42.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.43.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 a7a5cce95d..ba0332ab7d 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-01-2019: <a href="https://codemirror.net/codemirror-5.43.0.zip">Version 5.43.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix mistakes in passing through the arguments to <code>indent</code> in several wrapping modes.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Fix parsing for a number of new and obscure TypeScript features.</li>
+    <li><a href="https://codemirror.net/mode/ruby">ruby mode</a>: Support indented end tokens for heredoc strings.</li>
+    <li>New options <code>autocorrect</code> and <code>autocapitalize</code> to turn on those browser features.</li>
+  </ul>
+
   <p class="rel">21-12-2018: <a href="https://codemirror.net/codemirror-5.42.2.zip">Version 5.42.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index b9dc9b9c92..a63d4d32de 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.42.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.43.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index a92d91dccb..6c2f177e2e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.42.3",
+  "version": "5.43.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index a9edb6870e..58b29cb5cc 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.42.3"
+CodeMirror.version = "5.43.0"

From 85c5018ebb5d36db88c642564f0152d8f7aaf8cb Mon Sep 17 00:00:00 2001
From: Chhekur <820121223505e@gmail.com>
Date: Tue, 15 Jan 2019 17:23:16 +0530
Subject: [PATCH 3957/4742] [real-world uses] Add Colon

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

diff --git a/doc/realworld.html b/doc/realworld.html
index b226f0204e..8d4e07aea1 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -39,6 +39,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
+      <li><a href="https://electronjs.org/apps/colon">Colon</a> (A flexible text editor or IDE)</li>
       <li><a href="http://code.world/">CodeWorld</a> (Haskell playground)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
       <li><a href="https://codeanywhere.com/">Codeanywhere</a> (multi-platform cloud editor)</li>

From 2587b962aa6129fd798138268e0770ab564ed692 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Jan 2019 17:00:19 +0100
Subject: [PATCH 3958/4742] Bump version number post-5.43.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 4c2e0bf2c3..784b408156 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.43.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.43.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 6c2f177e2e..c5cb8dce63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.43.0",
+  "version": "5.43.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 58b29cb5cc..d8ea285fbb 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.43.0"
+CodeMirror.version = "5.43.1"

From 2dab4d527c7a55aabc0a52b28b47ab35b1412ca3 Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <chevobbe.nicolas@gmail.com>
Date: Fri, 18 Jan 2019 15:10:35 +0100
Subject: [PATCH 3959/4742] Fix middle-click paste on Firefox.

The current solution consists in focusing the
input when the scroll container capture a paste
event, which does not work on Firefox.

In order to fix this, creating a new paste event,
copying the clipboardData and dispatching it
on the textarea seems to do the trick.

This works on Firefox 64, with the
config set to true.
---
 src/input/TextareaInput.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index ad81d8a93a..0e1c37d6f0 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -76,8 +76,16 @@ export default class TextareaInput {
 
     on(display.scroller, "paste", e => {
       if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return
-      cm.state.pasteIncoming = true
-      input.focus()
+      if (!te.dispatchEvent) {
+        cm.state.pasteIncoming = true
+        input.focus()
+        return
+      }
+
+      // Pass the `paste` event to the textarea so it's handled by its event listener.
+      const event = new Event("paste")
+      event.clipboardData = e.clipboardData
+      te.dispatchEvent(event)
     })
 
     // Prevent normal selection in the editor (we handle our own)

From c2676685866c571a1c9c82cb25018cc08b4d42b2 Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <pyro777@gmail.com>
Date: Fri, 25 Jan 2019 06:33:50 -0800
Subject: [PATCH 3960/4742] [continuelist addon] Support nested modes

---
 addon/edit/continuelist.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 86a86d8ae2..65096fb513 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -20,7 +20,17 @@
     var ranges = cm.listSelections(), replacements = [];
     for (var i = 0; i < ranges.length; i++) {
       var pos = ranges[i].head;
+
+      // If we're not in Markdown mode, fall back to normal newlineAndIndent
       var eolState = cm.getStateAfter(pos.line);
+      var inner = cm.getMode().innerMode(eolState);
+      if (inner.mode.name !== "markdown") {
+        cm.execCommand("newlineAndIndent");
+        return;
+      } else {
+        eolState = inner.state;
+      }
+
       var inList = eolState.list !== false;
       var inQuote = eolState.quote !== 0;
 

From 863d5e42f00d8d74542de072acfbbc218ef5127d Mon Sep 17 00:00:00 2001
From: Pablo Zubieta <8410335+pabloferz@users.noreply.github.com>
Date: Thu, 31 Jan 2019 04:17:19 -0600
Subject: [PATCH 3961/4742] [julia mode] Fix some indentation issues

---
 mode/julia/julia.js | 89 ++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 435e94192a..91e0ffc096 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -23,58 +23,50 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   var uChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
 
   var operators = parserConf.operators || wordRegexp([
-      "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "->", "\\/\\/",
-      "[\\\\%*+\\-<>!=\\/^|&\\u00F7\\u22BB]=?", "\\?", "\\$", "~", ":",
-      "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2218",
-      "\\u221A", "\\u221B", "\\u2229", "\\u222A", "\\u2260", "\\u2264",
-      "\\u2265", "\\u2286", "\\u2288", "\\u228A", "\\u22C5",
-      "\\b(in|isa)\\b(?!\.?\\()"], "");
+        "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "->", "\\/\\/",
+        "[\\\\%*+\\-<>!=\\/^|&\\u00F7\\u22BB]=?", "\\?", "\\$", "~", ":",
+        "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2218",
+        "\\u221A", "\\u221B", "\\u2229", "\\u222A", "\\u2260", "\\u2264",
+        "\\u2265", "\\u2286", "\\u2288", "\\u228A", "\\u22C5",
+        "\\b(in|isa)\\b(?!\.?\\()"], "");
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
   var identifiers = parserConf.identifiers ||
-      /^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/;
+        /^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/;
 
   var chars = wordRegexp([octChar, hexChar, sChar, uChar], "'");
 
-  var commonOpeners = ["begin", "function", "type", "struct", "immutable",
-      "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try",
-                       "finally", "catch", "do"];
+  var openersList = ["begin", "function", "type", "struct", "immutable", "let",
+        "macro", "for", "while", "quote", "if", "else", "elseif", "try",
+        "finally", "catch", "do"];
 
-  var commonClosers = ["end", "else", "elseif", "catch", "finally"];
+  var closersList = ["end", "else", "elseif", "catch", "finally"];
 
-  var commonKeywords = ["if", "else", "elseif", "while", "for", "begin",
-                        "let", "end", "do", "try", "catch", "finally", "return", "break",
-                        "continue", "global", "local", "const", "export", "import", "importall",
-                        "using", "function", "where", "macro", "module", "baremodule", "struct",
-                        "type", "mutable", "immutable", "quote", "typealias", "abstract",
-                        "primitive", "bitstype"];
+  var keywordsList = ["if", "else", "elseif", "while", "for", "begin", "let",
+        "end", "do", "try", "catch", "finally", "return", "break", "continue",
+        "global", "local", "const", "export", "import", "importall", "using",
+        "function", "where", "macro", "module", "baremodule", "struct", "type",
+        "mutable", "immutable", "quote", "typealias", "abstract", "primitive",
+        "bitstype"];
 
-  var commonBuiltins = ["true", "false", "nothing", "NaN", "Inf"];
+  var builtinsList = ["true", "false", "nothing", "NaN", "Inf"];
 
-  CodeMirror.registerHelper("hintWords", "julia", commonKeywords.concat(commonBuiltins));
+  CodeMirror.registerHelper("hintWords", "julia", keywordsList.concat(builtinsList));
 
-  var openers = wordRegexp(commonOpeners);
-  var closers = wordRegexp(commonClosers);
-  var keywords = wordRegexp(commonKeywords);
-  var builtins = wordRegexp(commonBuiltins);
+  var openers = wordRegexp(openersList);
+  var closers = wordRegexp(closersList);
+  var keywords = wordRegexp(keywordsList);
+  var builtins = wordRegexp(builtinsList);
 
   var macro = /^@[_A-Za-z][\w]*/;
   var symbol = /^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
   var stringPrefixes = /^(`|([_A-Za-z\u00A1-\uFFFF]*"("")?))/;
 
   function inArray(state) {
-    return inGenerator(state, '[')
+    return (state.nestedArrays > 0);
   }
 
-  function inGenerator(state, bracket, depth) {
-    if (typeof(bracket) === "undefined") { bracket = '('; }
-    if (typeof(depth)   === "undefined") { depth   = 0;   }
-    var scope = currentScope(state, depth);
-    if ((depth == 0 && scope === "if" && inGenerator(state, bracket, depth + 1)) ||
-        (scope === "for" && inGenerator(state, bracket, depth + 1)) ||
-        (scope === bracket)) {
-      return true;
-    }
-    return false;
+  function inGenerator(state) {
+    return (state.nestedGenerators > 0);
   }
 
   function currentScope(state, n) {
@@ -126,16 +118,19 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
 
     if (ch === '[') {
       state.scopes.push('[');
+      state.nestedArrays++;
     }
 
     if (ch === '(') {
       state.scopes.push('(');
+      state.nestedGenerators++;
     }
 
     if (inArray(state) && ch === ']') {
       if (currentScope(state) === "if") { state.scopes.pop(); }
       while (currentScope(state) === "for") { state.scopes.pop(); }
       state.scopes.pop();
+      state.nestedArrays--;
       state.leavingExpr = true;
     }
 
@@ -143,6 +138,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       if (currentScope(state) === "if") { state.scopes.pop(); }
       while (currentScope(state) === "for") { state.scopes.pop(); }
       state.scopes.pop();
+      state.nestedGenerators--;
       state.leavingExpr = true;
     }
 
@@ -156,14 +152,12 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     var match;
-    if (match = stream.match(openers)) {
+    if (match = stream.match(openers, false)) {
       state.scopes.push(match[0]);
-      return "keyword";
     }
 
-    if (stream.match(closers)) {
+    if (stream.match(closers, false)) {
       state.scopes.pop();
-      return "keyword";
     }
 
     // Handle type annotations
@@ -307,13 +301,13 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   function tokenAnnotation(stream, state) {
     stream.match(/.*?(?=,|;|{|}|\(|\)|=|$|\s)/);
     if (stream.match(/^{/)) {
-      state.nestedLevels++;
+      state.nestedParameters++;
     } else if (stream.match(/^}/)) {
-      state.nestedLevels--;
+      state.nestedParameters--;
     }
-    if (state.nestedLevels > 0) {
+    if (state.nestedParameters > 0) {
       stream.match(/.*?(?={|})/) || stream.next();
-    } else if (state.nestedLevels == 0) {
+    } else if (state.nestedParameters == 0) {
       state.tokenize = tokenBase;
     }
     return "builtin";
@@ -321,14 +315,14 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
 
   function tokenComment(stream, state) {
     if (stream.match(/^#=/)) {
-      state.nestedLevels++;
+      state.nestedComments++;
     }
     if (!stream.match(/.*?(?=(#=|=#))/)) {
       stream.skipToEnd();
     }
     if (stream.match(/^=#/)) {
-      state.nestedLevels--;
-      if (state.nestedLevels == 0)
+      state.nestedComments--;
+      if (state.nestedComments == 0)
         state.tokenize = tokenBase;
     }
     return "comment";
@@ -391,7 +385,10 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         lastToken: null,
         leavingExpr: false,
         isDefinition: false,
-        nestedLevels: 0,
+        nestedArrays: 0,
+        nestedComments: 0,
+        nestedGenerators: 0,
+        nestedParameters: 0,
         charsAdvanced: 0,
         firstParenPos: -1
       };

From 9c8f813aaf19fa4191d59f8fa62c900f95d99133 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 4 Feb 2019 11:02:15 +0100
Subject: [PATCH 3962/4742] Prevent text-less paste from messing up the origin
 of the next text input

Closes #5764
---
 src/edit/CodeMirror.js     | 2 +-
 src/input/TextareaInput.js | 6 +++---
 src/input/input.js         | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 7e43d98f8e..2888f42205 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -57,7 +57,7 @@ export function CodeMirror(place, options) {
     delayingBlurEvent: false,
     focused: false,
     suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
-    pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
+    pasteIncoming: -1, cutIncoming: -1, // help recognize paste/cut edits in input.poll
     selectingText: false,
     draggingText: false,
     highlight: new Delayed(), // stores highlight worker timeout
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 0e1c37d6f0..ab02230f92 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -48,7 +48,7 @@ export default class TextareaInput {
     on(te, "paste", e => {
       if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
 
-      cm.state.pasteIncoming = true
+      cm.state.pasteIncoming = +new Date
       input.fastPoll()
     })
 
@@ -69,7 +69,7 @@ export default class TextareaInput {
           selectInput(te)
         }
       }
-      if (e.type == "cut") cm.state.cutIncoming = true
+      if (e.type == "cut") cm.state.cutIncoming = +new Date
     }
     on(te, "cut", prepareCopyCut)
     on(te, "copy", prepareCopyCut)
@@ -77,7 +77,7 @@ export default class TextareaInput {
     on(display.scroller, "paste", e => {
       if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return
       if (!te.dispatchEvent) {
-        cm.state.pasteIncoming = true
+        cm.state.pasteIncoming = +new Date
         input.focus()
         return
       }
diff --git a/src/input/input.js b/src/input/input.js
index 90833d19e1..344a2a7b23 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -25,7 +25,8 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
   cm.display.shift = false
   if (!sel) sel = doc.sel
 
-  let paste = cm.state.pasteIncoming || origin == "paste"
+  let recent = +new Date - 200
+  let paste = origin == "paste" || cm.state.pasteIncoming > recent
   let textLines = splitLinesAuto(inserted), multiPaste = null
   // When pasting N lines into N selections, insert one line per selection
   if (paste && sel.ranges.length > 1) {
@@ -54,7 +55,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
         from = to = Pos(from.line, 0)
     }
     let changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
-                       origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")}
+                       origin: origin || (paste ? "paste" : cm.state.cutIncoming > recent ? "cut" : "+input")}
     makeChange(cm.doc, changeEvent)
     signalLater(cm, "inputRead", cm, changeEvent)
   }
@@ -64,7 +65,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
   ensureCursorVisible(cm)
   if (cm.curOp.updateInput < 2) cm.curOp.updateInput = updateInput
   cm.curOp.typing = true
-  cm.state.pasteIncoming = cm.state.cutIncoming = false
+  cm.state.pasteIncoming = cm.state.cutIncoming = -1
 }
 
 export function handlePaste(e, cm) {

From a0e1c6faef5ed565ce1f8c2fe6c3a958f0449263 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 5 Feb 2019 11:24:25 +0100
Subject: [PATCH 3963/4742] [javascript mode] Support TypeScript this parameter
 declarations

Closes #5769
---
 mode/javascript/javascript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 60d595dadb..793d2fa580 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -724,6 +724,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "@") cont(expression, funarg)
     if (type == "spread") return cont(funarg);
     if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(funarg); }
+    if (isTS && type == "this") return cont(maybetype, maybeAssign)
     return pass(pattern, maybetype, maybeAssign);
   }
   function classExpression(type, value) {

From d101acdd4658af2cf5259561fcf495c66b9d3b19 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 6 Feb 2019 09:04:58 +0100
Subject: [PATCH 3964/4742] [javascript mode] Allow TS prefixed | or &
 operators

Closes #5771
---
 mode/javascript/javascript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 793d2fa580..fd0fce44c4 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -599,6 +599,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       cx.marked = "type"
       return cont(afterType)
     }
+    if (value == "|" || value == "&") return cont(typeexpr)
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
     if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)
     if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)

From e80024ce48d11c5cab4c3faed360a673abe2c0d7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 7 Feb 2019 09:35:50 +0100
Subject: [PATCH 3965/4742] [javascript mode] Simplify parsing of for loop
 specs

Closes #5774
---
 mode/javascript/javascript.js | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fd0fce44c4..0f83664712 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -681,25 +681,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function forspec(type, value) {
     if (value == "await") return cont(forspec);
-    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
+    if (type == "(") return cont(pushlex(")"), forspec1, poplex);
   }
   function forspec1(type) {
-    if (type == "var") return cont(vardef, expect(";"), forspec2);
-    if (type == ";") return cont(forspec2);
-    if (type == "variable") return cont(formaybeinof);
-    return pass(expression, expect(";"), forspec2);
-  }
-  function formaybeinof(_type, value) {
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return cont(maybeoperatorComma, forspec2);
+    if (type == "var") return cont(vardef, forspec2);
+    if (type == "variable") return cont(forspec2);
+    return pass(forspec2)
   }
   function forspec2(type, value) {
-    if (type == ";") return cont(forspec3);
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return pass(expression, expect(";"), forspec3);
-  }
-  function forspec3(type) {
-    if (type != ")") cont(expression);
+    if (type == ")") return cont()
+    if (type == ";") return cont(forspec2)
+    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression, forspec2) }
+    return pass(expression, forspec2)
   }
   function functiondef(type, value) {
     if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}

From 7a1bff4814d78659dcda4f71329781eadfcaa527 Mon Sep 17 00:00:00 2001
From: Joy Zhong <joytzhong@gmail.com>
Date: Tue, 12 Feb 2019 00:58:00 -0800
Subject: [PATCH 3966/4742] [soy mode] Update @prop to @state

The name change was made in Soy recently.
---
 mode/soy/soy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index faf4314be4..b2cd8cb738 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -328,7 +328,7 @@
             if (!state.scopes) {
               state.variables = prepend(null, 'ij');
             }
-          } else if (state.tag.match(/^@(?:param\??|inject|prop)/)) {
+          } else if (state.tag.match(/^@(?:param\??|inject|state)/)) {
             state.soyState.push("param-def");
           } else if (state.tag.match(/^(?:param)/)) {
             state.soyState.push("param-ref");

From c6212288adbfedc2092528a4c977994de2a7c2b6 Mon Sep 17 00:00:00 2001
From: Joy Zhong <joytzhong@gmail.com>
Date: Mon, 11 Feb 2019 13:16:01 -0800
Subject: [PATCH 3967/4742] [soy mode] Add {element} as valid indenting tag.

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

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index b2cd8cb738..59105ceee3 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -13,7 +13,7 @@
 
   var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
                        "else", "switch", "case", "default", "foreach", "ifempty", "for",
-                       "call", "param", "deltemplate", "delcall", "log"];
+                       "call", "param", "deltemplate", "delcall", "log", "element"];
 
   CodeMirror.defineMode("soy", function(config) {
     var textMode = CodeMirror.getMode(config, "text/plain");

From 72d514957fd6a01644f649157eeab9d8c2cbcb4e Mon Sep 17 00:00:00 2001
From: Stryder Crown <stryder.c@gmail.com>
Date: Thu, 14 Feb 2019 02:24:42 -0500
Subject: [PATCH 3968/4742] [lesser-dark and vibrant-ink themes] Improve
 contrast

---
 theme/lesser-dark.css | 2 +-
 theme/vibrant-ink.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/lesser-dark.css b/theme/lesser-dark.css
index 4b347db081..f96bf430c2 100644
--- a/theme/lesser-dark.css
+++ b/theme/lesser-dark.css
@@ -40,7 +40,7 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark span.cm-tag { color: #669199; }
 .cm-s-lesser-dark span.cm-attribute { color: #81a4d5; }
 .cm-s-lesser-dark span.cm-hr { color: #999; }
-.cm-s-lesser-dark span.cm-link { color: #00c; }
+.cm-s-lesser-dark span.cm-link { color: #7070E6; }
 .cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 
 .cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
diff --git a/theme/vibrant-ink.css b/theme/vibrant-ink.css
index b13ecf2164..6358ad3655 100644
--- a/theme/vibrant-ink.css
+++ b/theme/vibrant-ink.css
@@ -27,7 +27,7 @@
 .cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
 .cm-s-vibrant-ink .cm-header { color: #FF6400; }
 .cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
-.cm-s-vibrant-ink .cm-link { color: blue; }
+.cm-s-vibrant-ink .cm-link { color: #5656F3; }
 .cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 
 .cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }

From 1f82eed9cb135848f4815852d99939ab10d49a76 Mon Sep 17 00:00:00 2001
From: Kenan Christian Dimas <christian.dimas.94@gmail.com>
Date: Mon, 18 Feb 2019 15:34:18 +0700
Subject: [PATCH 3969/4742] [nord theme] Add

---
 demo/theme.html |  2 ++
 theme/nord.css  | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 theme/nord.css

diff --git a/demo/theme.html b/demo/theme.html
index 5ecace9170..8cf5c0799f 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -36,6 +36,7 @@
 <link rel="stylesheet" href="../theme/neat.css">
 <link rel="stylesheet" href="../theme/neo.css">
 <link rel="stylesheet" href="../theme/night.css">
+<link rel="stylesheet" href="../theme/nord.css">
 <link rel="stylesheet" href="../theme/oceanic-next.css">
 <link rel="stylesheet" href="../theme/panda-syntax.css">
 <link rel="stylesheet" href="../theme/paraiso-dark.css">
@@ -129,6 +130,7 @@ <h2>Theme Demo</h2>
     <option>neat</option>
     <option>neo</option>
     <option>night</option>
+    <option>nord</option>
     <option>oceanic-next</option>
     <option>panda-syntax</option>
     <option>paraiso-dark</option>
diff --git a/theme/nord.css b/theme/nord.css
new file mode 100644
index 0000000000..41a8ad7782
--- /dev/null
+++ b/theme/nord.css
@@ -0,0 +1,42 @@
+/* Based on arcticicestudio's Nord theme */
+/* https://github.com/arcticicestudio/nord */
+
+.cm-s-nord.CodeMirror { background: #2e3440; color: #d8dee9; }
+.cm-s-nord div.CodeMirror-selected { background: #434c5e; }
+.cm-s-nord .CodeMirror-line::selection, .cm-s-nord .CodeMirror-line > span::selection, .cm-s-nord .CodeMirror-line > span > span::selection { background: #3b4252; }
+.cm-s-nord .CodeMirror-line::-moz-selection, .cm-s-nord .CodeMirror-line > span::-moz-selection, .cm-s-nord .CodeMirror-line > span > span::-moz-selection { background: #3b4252; }
+.cm-s-nord .CodeMirror-gutters { background: #2e3440; border-right: 0px; }
+.cm-s-nord .CodeMirror-guttermarker { color: #4c566a; }
+.cm-s-nord .CodeMirror-guttermarker-subtle { color: #4c566a; }
+.cm-s-nord .CodeMirror-linenumber { color: #4c566a; }
+.cm-s-nord .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+
+.cm-s-nord span.cm-comment { color: #4c566a; }
+.cm-s-nord span.cm-atom { color: #b48ead; }
+.cm-s-nord span.cm-number { color: #b48ead; }
+
+.cm-s-nord span.cm-comment.cm-attribute { color: #97b757; }
+.cm-s-nord span.cm-comment.cm-def { color: #bc9262; }
+.cm-s-nord span.cm-comment.cm-tag { color: #bc6283; }
+.cm-s-nord span.cm-comment.cm-type { color: #5998a6; }
+
+.cm-s-nord span.cm-property, .cm-s-nord span.cm-attribute { color: #8FBCBB; }
+.cm-s-nord span.cm-keyword { color: #81A1C1; }
+.cm-s-nord span.cm-builtin { color: #81A1C1; }
+.cm-s-nord span.cm-string { color: #A3BE8C; }
+
+.cm-s-nord span.cm-variable { color: #d8dee9; }
+.cm-s-nord span.cm-variable-2 { color: #d8dee9; }
+.cm-s-nord span.cm-variable-3, .cm-s-nord span.cm-type { color: #d8dee9; }
+.cm-s-nord span.cm-def { color: #8FBCBB; }
+.cm-s-nord span.cm-bracket { color: #81A1C1; }
+.cm-s-nord span.cm-tag { color: #bf616a; }
+.cm-s-nord span.cm-header { color: #b48ead; }
+.cm-s-nord span.cm-link { color: #b48ead; }
+.cm-s-nord span.cm-error { background: #bf616a; color: #f8f8f0; }
+
+.cm-s-nord .CodeMirror-activeline-background { background: #3b4252; }
+.cm-s-nord .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}

From 39b67d6b7511c4de75168ecb25e03a77788ad667 Mon Sep 17 00:00:00 2001
From: Robert Martin <rdmartin3@gmail.com>
Date: Mon, 18 Feb 2019 03:35:13 -0500
Subject: [PATCH 3970/4742] [vim bindings] Add proper emulation for
 forward-delete

In Vim's command mode, forward-delete (Delete on PC or fn-delete on Mac) should
behave the same as 'x': delete the character under the cursor. Due to a bug in
CodeMirror's emulation, this wasn't happening before.

This change adds the proper support, along with tests for forward-delete.
---
 keymap/vim.js    |  1 +
 test/vim_test.js | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0af9bcb2ea..eb9cd17b97 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -53,6 +53,7 @@
     { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
     { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
     { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'},
+    { keys: '<Del>', type: 'keyToKey', toKeys: 'x', context: 'normal'},
     { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
     { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B', context: 'normal' },
     { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
diff --git a/test/vim_test.js b/test/vim_test.js
index e3f95ccd33..f38efd0245 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1523,6 +1523,31 @@ testVim('i_overwrite_backspace', function(cm, vim, helpers) {
   helpers.assertCursorAt(Pos(0, 9, "after"));
   eq('0123456789', cm.getValue());
 }, { value: '0123456789'});
+testVim('i_forward_delete', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  helpers.doKeys('i');
+  helpers.doInsertModeKeys('Delete');
+  helpers.assertCursorAt(0, 3);
+  eq('A124\nBCD', cm.getValue());
+  helpers.doInsertModeKeys('Delete');
+  helpers.assertCursorAt(0, 3);
+  eq('A12\nBCD', cm.getValue());
+  helpers.doInsertModeKeys('Delete');
+  helpers.assertCursorAt(0, 3);
+  eq('A12BCD', cm.getValue());
+}, { value: 'A1234\nBCD'});
+testVim('forward_delete', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  helpers.doInsertModeKeys('Delete');
+  helpers.assertCursorAt(0, 3);
+  eq('A124\nBCD', cm.getValue());
+  helpers.doInsertModeKeys('Delete');
+  helpers.assertCursorAt(0, 2);
+  eq('A12\nBCD', cm.getValue());
+  helpers.doInsertModeKeys('Delete');
+  helpers.assertCursorAt(0, 1);
+  eq('A1\nBCD', cm.getValue());
+}, { value: 'A1234\nBCD'});
 testVim('A', function(cm, vim, helpers) {
   helpers.doKeys('A');
   helpers.assertCursorAt(0, lines[0].length);

From 28fe151c63cf18d4be6a44add3685b7f72714bb0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Feb 2019 13:34:56 +0100
Subject: [PATCH 3971/4742] Remove kludge in line height measuring

Which was introduced in 6ac8c130e, for unclear reasons

Issue #5755
---
 src/display/update_lines.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index 475432b711..592eb30b25 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -25,7 +25,6 @@ export function updateHeightsInViewport(cm) {
         width = cur.text.firstChild.getBoundingClientRect().right - box.left - 1
     }
     let diff = cur.line.height - height
-    if (height < 2) height = textHeight(display)
     if (diff > .005 || diff < -.005) {
       updateLineHeight(cur.line, height)
       updateWidgetHeight(cur.line)

From 627e8bb5539d2858a827337254d422f6a57043a0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Feb 2019 13:55:42 +0100
Subject: [PATCH 3972/4742] Fix lint error

---
 src/display/update_lines.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index 592eb30b25..60c367e4dc 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -1,6 +1,6 @@
 import { heightAtLine } from "../line/spans.js"
 import { getLine, lineAtHeight, updateLineHeight } from "../line/utils_line.js"
-import { paddingTop, textHeight, charWidth } from "../measurement/position_measurement.js"
+import { paddingTop, charWidth } from "../measurement/position_measurement.js"
 import { ie, ie_version } from "../util/browser.js"
 
 // Read the actual heights of the rendered lines, and update their

From 76f5b0378b8c8ae665ec7224ae4d5045fe5ce471 Mon Sep 17 00:00:00 2001
From: Jan Keromnes <jan.keromnes@typefox.io>
Date: Tue, 19 Feb 2019 17:58:33 +0000
Subject: [PATCH 3973/4742] Typo: s/npm build/npm run build/g

---
 CHANGELOG.md      | 2 +-
 doc/releases.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e07d5c74bd..aa11fd2ce1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -646,7 +646,7 @@ Line endings for pasted content are now normalized to the editor's [preferred en
 
 ### New features
 
-The core is now maintained as a number of small files, using ES6 syntax and modules, under the `src/` directory. A git checkout no longer contains a working `codemirror.js` until you `npm build` (but when installing from NPM, it is included).
+The core is now maintained as a number of small files, using ES6 syntax and modules, under the `src/` directory. A git checkout no longer contains a working `codemirror.js` until you `npm run build` (but when installing from NPM, it is included).
 
 The [`refresh`](https://codemirror.net/doc/manual.html#event_refresh) event is now documented and stable.
 
diff --git a/doc/releases.html b/doc/releases.html
index ba0332ab7d..ebf8c06abe 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -412,7 +412,7 @@ <h2>Version 5.x</h2>
     <li><a href="https://codemirror.net/mode/javascript">javascript mode</a>: Improve support for class expressions. Support TypeScript optional class properties, the <code>abstract</code> keyword, and return type declarations for arrow functions.</li>
     <li><a href="https://codemirror.net/mode/css">css mode</a>: Fix highlighting of mixed-case keywords.</li>
     <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when typing a quote before a string.</li>
-    <li>The core is now maintained as a number of small files, using ES6 syntax and modules, under the <code>src/</code> directory. A git checkout no longer contains a working <code>codemirror.js</code> until you <code>npm build</code> (but when installing from NPM, it is included).</li>
+    <li>The core is now maintained as a number of small files, using ES6 syntax and modules, under the <code>src/</code> directory. A git checkout no longer contains a working <code>codemirror.js</code> until you <code>npm run build</code> (but when installing from NPM, it is included).</li>
     <li>The <a href="https://codemirror.net/doc/manual.html#event_refresh"><code>refresh</code></a> event is now documented and stable.</li>
   </ul>
 

From ffb96cfa7202c5d55161108bb4fde2f83a33fd85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Feb 2019 21:36:44 +0100
Subject: [PATCH 3974/4742] [show-hint addon] Move variable into module scope

---
 addon/hint/show-hint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index f86f954022..e3cd209d79 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,8 +1,6 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: https://codemirror.net/LICENSE
 
-var mac = /Mac/.test(navigator.platform);
-
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"));
@@ -170,6 +168,8 @@ var mac = /Mac/.test(navigator.platform);
       Esc: handle.close
     };
 
+    var mac = /Mac/.test(navigator.platform);
+
     if (mac) {
       baseMap["Ctrl-P"] = function() {handle.moveFocus(-1);};
       baseMap["Ctrl-N"] = function() {handle.moveFocus(1);};

From 6454f583167a44016ee452b1787466f442bd9122 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 21 Feb 2019 14:03:30 +0100
Subject: [PATCH 3975/4742] Mark version 5.44.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 20 ++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 12 ++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 55bff7aead..573a1e5f11 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -134,6 +134,7 @@ Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
 Cheah Chu Yeow
+Chhekur
 Chris Colborne
 Chris Coyier
 Chris Ford
@@ -382,6 +383,7 @@ Josh Soref
 Joshua Newman
 Josh Watzman
 jots
+Joy Zhong
 jsoojeon
 ju1ius
 Juan Benavides Romero
@@ -397,6 +399,7 @@ karevn
 Karol
 Kayur Patel
 Kazuhito Hokamura
+Kenan Christian Dimas
 Ken Newman
 ken restivo
 Ken Rockot
@@ -556,6 +559,7 @@ Nicholas Bollweg (Nick)
 NickKolok
 Nick Kreeger
 Nick Small
+Nicolas Chevobbe
 Nicolas Kick
 Nicolò Ribaudo
 Niels van Groningen
@@ -635,6 +639,7 @@ Richard Z.H. Wang
 Rishi Goomar
 Robert Brignull
 Robert Crossfield
+Robert Martin
 Roberto Abdelkader Martínez Pérez
 robertop23
 Robert Plummer
@@ -702,6 +707,7 @@ Steve Champagne
 Steve Hoover
 Steve O'Hara
 stoskov
+Stryder Crown
 Stu Kennedy
 Sungho Kim
 sverweij
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa11fd2ce1..08d6bb34a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.44.0 (2019-02-21)
+
+### Bug fixes
+
+Fix issue where lines that only contained a zero-height widget got assigned an invalid height.
+
+Improve support for middle-click paste on X Windows.
+
+Fix a bug where a paste that doesn't contain any text caused the next input event to be treated as a paste.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix accidental global variable.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Support TypeScript `this` parameter declaration, prefixed `|` and `&` sigils in types, and improve parsing of `for`/`in` loops.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Properly emulate forward-delete.
+
+New theme: [nord](https://codemirror.net/demo/theme.html#nord).
+
 ## 5.43.0 (2019-01-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 784b408156..f676be8c90 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.43.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.44.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 ebf8c06abe..b907c10255 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-02-2019: <a href="https://codemirror.net/codemirror-5.44.0.zip">Version 5.44.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Properly emulate forward-delete.</li>
+    <li>New theme: <a href="https://codemirror.net/demo/theme.html#nord">nord</a>.</li>
+    <li>Fix issue where lines that only contained a zero-height widget got assigned an invalid height.</li>
+    <li>Improve support for middle-click paste on X Windows.</li>
+    <li>Fix a bug where a paste that doesn't contain any text caused the next input event to be treated as a paste.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix accidental global variable.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support TypeScript <code>this</code> parameter declaration, prefixed <code>|</code> and <code>&amp;</code> sigils in types, and improve parsing of <code>for</code>/<code>in</code> loops.</li>
+  </ul>
+
   <p class="rel">21-01-2019: <a href="https://codemirror.net/codemirror-5.43.0.zip">Version 5.43.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index a63d4d32de..d94f5d5312 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.43.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.44.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index c5cb8dce63..1c78f0145c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.43.1",
+  "version": "5.44.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index d8ea285fbb..81b954f346 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.43.1"
+CodeMirror.version = "5.44.0"

From 2a261dfa5225534954c3f0f43575db4f82c7dd73 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 21 Feb 2019 14:08:17 +0100
Subject: [PATCH 3976/4742] Bump version number post-5.44.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f676be8c90..7376debea9 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.44.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.44.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 1c78f0145c..23130cbb28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.44.0",
+  "version": "5.44.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 81b954f346..349803a55e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.44.0"
+CodeMirror.version = "5.44.1"

From 278503bdb57b874067b71dfd55e9c68e0e5ff44b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 27 Feb 2019 09:32:15 +0100
Subject: [PATCH 3977/4742] [swift mode] Drop all-rights-reserved example code

---
 mode/swift/index.html | 69 +++++++++++++------------------------------
 1 file changed, 20 insertions(+), 49 deletions(-)

diff --git a/mode/swift/index.html b/mode/swift/index.html
index 53d4134341..ce2a3a02f9 100644
--- a/mode/swift/index.html
+++ b/mode/swift/index.html
@@ -28,61 +28,32 @@
 <article>
 <h2>Swift mode</h2>
 <form><textarea id="code" name="code">
-//
-//  TipCalculatorModel.swift
-//  TipCalculator
-//
-//  Created by Main Account on 12/18/14.
-//  Copyright (c) 2014 Razeware LLC. All rights reserved.
-//
-
-import Foundation
-
-class TipCalculatorModel {
-
-  var total: Double
-  var taxPct: Double
-  var subtotal: Double {
-    get {
-      return total / (taxPct + 1)
-    }
-  }
-
-  init(total: Double, taxPct: Double) {
-    self.total = total
-    self.taxPct = taxPct
-  }
-
-  func calcTipWithTipPct(tipPct: Double) -> Double {
-    return subtotal * tipPct
-  }
-
-  func returnPossibleTips() -> [Int: Double] {
-
-    let possibleTipsInferred = [0.15, 0.18, 0.20]
-    let possibleTipsExplicit:[Double] = [0.15, 0.18, 0.20]
+protocol HeaderViewProtocol {
+    func setTitle(_ string: String)
+}
 
-    var retval = [Int: Double]()
-    for possibleTip in possibleTipsInferred {
-      let intPct = Int(possibleTip*100)
-      retval[intPct] = calcTipWithTipPct(possibleTip)
+struct AnyHeaderView {
+    let view: UIView
+    let headerView: HeaderViewProtocol
+    init<T: UIView>(view: T) where T: HeaderViewProtocol {
+        self.view = view
+        self.headerView = view
     }
-    return retval
+}
 
-  }
+let header = AnyHeaderView(view: myView)
+header.headerView.setTitle("hi")
 
-  func funWithStrings() {
-    var numLines = 3
-    print("This is a string!")
-    print("""
-          This is a
-          multi-line
-          string!
-          """)
-    print("The preceding string had \(numLines) lines!")
-  }
+struct HeaderView {
+    let view: UIView
+    let setTitle: (String) -> ()
+}
 
+var label = UILabel()
+let header = HeaderView(view: label) { str in
+    label.text = str
 }
+header.setTitle("hello")
 </textarea></form>
 
     <script>

From abfa4576717571a9f8108ee43f84adfcf6af0978 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 6 Mar 2019 09:18:52 +0100
Subject: [PATCH 3978/4742] [julia mode] Fix failure to advance on mismatched
 closing brace

Closes #5797
---
 mode/julia/julia.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 91e0ffc096..5873d8ca95 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -302,7 +302,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     stream.match(/.*?(?=,|;|{|}|\(|\)|=|$|\s)/);
     if (stream.match(/^{/)) {
       state.nestedParameters++;
-    } else if (stream.match(/^}/)) {
+    } else if (stream.match(/^}/) && state.nestedParameters > 0) {
       state.nestedParameters--;
     }
     if (state.nestedParameters > 0) {

From 558c4ac8dc5b88a1b373ecf5ddbab15ee79dd9c7 Mon Sep 17 00:00:00 2001
From: Travis Heppe <heppe@google.com>
Date: Wed, 6 Mar 2019 00:21:09 -0800
Subject: [PATCH 3979/4742] [vim bindings] Only scan for <> when matching angle
 brackets

To avoid treating <> as brackets when they aren't used as such
---
 keymap/vim.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index eb9cd17b97..5758823867 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1978,7 +1978,9 @@
           }
         }
         if (ch < lineText.length) {
-          var matched = cm.findMatchingBracket(Pos(line, ch), {bracketRegex: /[(){}[\]<>]/});
+          // Only include angle brackets in analysis if they are being matched.
+          var re = (ch === '<' || ch === '>') ? /[(){}[\]<>]/ : /[(){}[\]]/;
+          var matched = cm.findMatchingBracket(Pos(line, ch), {bracketRegex: re});
           return matched.to;
         } else {
           return cursor;

From d5d34ae8ca286ed7486a3352cc6e29c3f1426b24 Mon Sep 17 00:00:00 2001
From: Torgeir Thoresen <torgeir.thoresen@gmail.com>
Date: Mon, 11 Mar 2019 08:14:18 +0100
Subject: [PATCH 3980/4742] Handle scanning for user provided brackets, e.g. "

---
 addon/edit/matchbrackets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 2dd4888800..2a147282c4 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -69,7 +69,7 @@
         var ch = line.charAt(pos);
         if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) {
           var match = matching[ch];
-          if ((match.charAt(1) == ">") == (dir > 0)) stack.push(ch);
+          if (match && (match.charAt(1) == ">") == (dir > 0)) stack.push(ch);
           else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch};
           else stack.pop();
         }

From bb13aa5947a9b66831ba98cbe01a2642887a5417 Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@redhat.com>
Date: Mon, 11 Mar 2019 19:02:15 +0200
Subject: [PATCH 3981/4742] [panda-syntax theme] Use monospaced Source Code Pro
 instead of Source Sans Pro

https://adobe-fonts.github.io/source-sans-pro/ is a proportional font
family by Adobe (the "Source" in the name refers to being open source).
https://adobe-fonts.github.io/source-code-pro/ is a matching monospace
font family.
---
 theme/panda-syntax.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/panda-syntax.css b/theme/panda-syntax.css
index 6de58b56f4..de14e91124 100644
--- a/theme/panda-syntax.css
+++ b/theme/panda-syntax.css
@@ -7,7 +7,7 @@
 	background: #292A2B;
 	color: #E6E6E6;
 	line-height: 1.5;
-	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
+	font-family: 'Operator Mono', 'Source Code Pro', Menlo, Monaco, Consolas, Courier New, monospace;
 }
 .cm-s-panda-syntax .CodeMirror-cursor { border-color: #ff2c6d; }
 .cm-s-panda-syntax .CodeMirror-activeline-background {

From 6d94103d6dbd6b95b832a629fd9ce71fb7f2f8d7 Mon Sep 17 00:00:00 2001
From: Kees de Kooter <kees@boplicity.nl>
Date: Tue, 12 Mar 2019 16:42:43 +0100
Subject: [PATCH 3982/4742] [sublime keymap] Bind sortLines to F5 on macOS

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

diff --git a/keymap/sublime.js b/keymap/sublime.js
index b4799fd62a..799641af20 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -589,8 +589,8 @@
     "Cmd-/": "toggleCommentIndented",
     "Cmd-J": "joinLines",
     "Shift-Cmd-D": "duplicateLine",
-    "F9": "sortLines",
-    "Cmd-F9": "sortLinesInsensitive",
+    "F5": "sortLines",
+    "Cmd-F5": "sortLinesInsensitive",
     "F2": "nextBookmark",
     "Shift-F2": "prevBookmark",
     "Cmd-F2": "toggleBookmark",

From 17fa1ea23eda133c4006e18c7c091718d81a874e Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal14@gmail.com>
Date: Mon, 18 Mar 2019 18:54:14 +0530
Subject: [PATCH 3983/4742] [sql mode] Update keywords and builtin symbols for
 x-pgsql

Added pgsql keywords which were missing.
---
 mode/sql/sql.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 69f6b2f321..35902bbab1 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -406,9 +406,10 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-pgsql", {
     name: "sql",
     client: set("source"),
-    // https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
-    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate all allocate also always analyse analyze any are array array_agg array_max_cardinality asensitive assertion assignment asymmetric at atomic attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli binary bit_length blob blocked bom both breadth c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain characteristics characters character_length character_set_catalog character_set_name character_set_schema char_length check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column columns column_name command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constraint constraints constraint_catalog constraint_name constraint_schema constructor contains content continue control conversion convert copy corr corresponding cost covar_pop covar_samp cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datetime_interval_code datetime_interval_precision day db deallocate dec declare default defaults deferrable deferred defined definer degree delimiter delimiters dense_rank depth deref derived describe descriptor deterministic diagnostics dictionary disable discard disconnect dispatch dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain dynamic dynamic_function dynamic_function_code each element else empty enable encoding encrypted end end-exec end_frame end_partition enforced enum equals escape event every except exception exclude excluding exclusive exec execute exists exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreign fortran forward found frame_row free freeze fs full function functions fusion g general generated get gettoken global go goto grant granted greatest grouping groups handler header headline hex hierarchy hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import including increment indent index indexes indicator inherit inherits init initially inline inner inout input insensitive instance instantiable instead integrity intersect intersection invoker isnull isolation k key key_member key_type label lag language large last last_value lateral lc_collate lc_ctype lead leading leakproof least left length level lexize lextypes library like_regex link listen ln load local localtime localtimestamp location locator lock locked logged lower m map mapping match matched materialized max maxvalue max_cardinality member merge message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized nothing notify notnull nowait nth_value ntile null nullable nullif nulls number object occurrences_regex octets octet_length of off offset oids old only open operator option options ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password percent percentile_cont percentile_disc percent_rank period permission placing plans pli policy portion position position_regex power precedes preceding prepare prepared preserve primary prior privileges procedural procedure program public publication quote range rank read reads reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict restricted result return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns revoke right role rollback rollup routine routine_catalog routine_name routine_schema row rows row_count row_number rule savepoint scale schema schema_name scope scope_catalog scope_name scope_schema scroll search second section security selective self sensitive sequence sequences serializable server server_name session session_user setof sets share show similar simple size skip snapshot some source space specific specifictype specific_name sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset subscription substring substring_regex succeeds sum symmetric sysid system system_time system_user t tables tablesample tablespace table_name temp template temporary then ties timezone_hour timezone_minute to token top_level_count trailing transaction transactions_committed transactions_rolled_back transaction_active transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted unique unknown unlink unlisten unlogged unnamed unnest until untyped upper uri usage user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of varbinary variadic var_pop var_samp verbose version versioning view views volatile when whenever whitespace width_bucket window within work wrapper write xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes loop repeat attach path depends detach zone"),
-    // https://www.postgresql.org/docs/10/static/datatype.html
+    // For PostgreSQL - https://www.postgresql.org/docs/11/sql-keywords-appendix.html
+    // For pl/pgsql lang - https://github.com/postgres/postgres/blob/REL_11_2/src/pl/plpgsql/src/pl_scanner.c
+    keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate alias all allocate also alter always analyse analyze and any are array array_agg array_max_cardinality as asc asensitive assert assertion assignment asymmetric at atomic attach attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli between bigint binary bit bit_length blob blocked bom boolean both breadth by c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain char char_length character character_length character_set_catalog character_set_name character_set_schema characteristics characters check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column column_name columns command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constant constraint constraint_catalog constraint_name constraint_schema constraints constructor contains content continue control conversion convert copy corr corresponding cost count covar_pop covar_samp create cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datatype date datetime_interval_code datetime_interval_precision day db deallocate debug dec decimal declare default defaults deferrable deferred defined definer degree delete delimiter delimiters dense_rank depends depth deref derived desc describe descriptor detach detail deterministic diagnostics dictionary disable discard disconnect dispatch distinct dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain double drop dump dynamic dynamic_function dynamic_function_code each element else elseif elsif empty enable encoding encrypted end end_frame end_partition endexec enforced enum equals errcode error escape event every except exception exclude excluding exclusive exec execute exists exit exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreach foreign fortran forward found frame_row free freeze from fs full function functions fusion g general generated get global go goto grant granted greatest group grouping groups handler having header hex hierarchy hint hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import in include including increment indent index indexes indicator info inherit inherits initially inline inner inout input insensitive insert instance instantiable instead int integer integrity intersect intersection interval into invoker is isnull isolation join k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like like_regex limit link listen ln load local localtime localtimestamp location locator lock locked log logged loop lower m map mapping match matched materialized max max_cardinality maxvalue member merge message message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized not nothing notice notify notnull nowait nth_value ntile null nullable nullif nulls number numeric object occurrences_regex octet_length octets of off offset oids old on only open operator option options or order ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password path percent percent_rank percentile_cont percentile_disc perform period permission pg_context pg_datatype_name pg_exception_context pg_exception_detail pg_exception_hint placing plans pli policy portion position position_regex power precedes preceding precision prepare prepared preserve primary print_strict_params prior privileges procedural procedure procedures program public publication query quote raise range rank read reads real reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict result result_oid return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns reverse revoke right role rollback rollup routine routine_catalog routine_name routine_schema routines row row_count row_number rows rowtype rule savepoint scale schema schema_name schemas scope scope_catalog scope_name scope_schema scroll search second section security select selective self sensitive sequence sequences serializable server server_name session session_user set setof sets share show similar simple size skip slice smallint snapshot some source space specific specific_name specifictype sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable stacked standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset subscription substring substring_regex succeeds sum symmetric sysid system system_time system_user t table table_name tables tablesample tablespace temp template temporary text then ties time timestamp timezone_hour timezone_minute to token top_level_count trailing transaction transaction_active transactions_committed transactions_rolled_back transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted union unique unknown unlink unlisten unlogged unnamed unnest until untyped update upper uri usage use_column use_variable user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of values var_pop var_samp varbinary varchar variable_conflict variadic varying verbose version versioning view views volatile warning when whenever where while whitespace width_bucket window with within without work wrapper write xml xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes zone"),
+    // https://www.postgresql.org/docs/11/datatype.html
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*\/+\-%<>!=&|^\/#@?~]/,

From 0c5c59c23d612d8e9a0e7fd74b1efd3643de45de Mon Sep 17 00:00:00 2001
From: Hanzhao Deng <hanzhaodeng@gmail.com>
Date: Tue, 19 Mar 2019 00:40:10 -0700
Subject: [PATCH 3984/4742] [closebrackets addon] More refined check for when
 to close a bracket

Improves the current behavior which auto closes every opening bracket.

- hardcodes a closeBefore list of characters that if the next character is in the list, opening a bracket should be auto-closed.
The list is : ")]}'\":;>"
Basically the closing characters in pairs  ; : and >.

- when opening a bracket, it will be auto-closed if:
1. there is no next character,
2. the next character is a white space character.
3. the next character is in the shouldClose list.
---
 addon/edit/closebrackets.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index ce1a4ac6b1..4415c39381 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -11,6 +11,7 @@
 })(function(CodeMirror) {
   var defaults = {
     pairs: "()[]{}''\"\"",
+    closeBefore: ")]}'\":;>",
     triples: "",
     explode: "[]{}"
   };
@@ -109,6 +110,9 @@
     var pairs = getOption(conf, "pairs");
     var pos = pairs.indexOf(ch);
     if (pos == -1) return CodeMirror.Pass;
+
+    var closeBefore = getOption(conf,"closeBefore");
+
     var triples = getOption(conf, "triples");
 
     var identical = pairs.charAt(pos + 1) == ch;
@@ -136,7 +140,7 @@
         var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)
         if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";
         else return CodeMirror.Pass;
-      } else if (opening) {
+      } else if (opening && (next.length === 0 || /\s/.test(next) || closeBefore.indexOf(next) > -1)) {
         curType = "both";
       } else {
         return CodeMirror.Pass;

From a2e4fdb734a574052fd45302627bde92e7632224 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Tue, 19 Mar 2019 00:44:15 -0700
Subject: [PATCH 3985/4742] [clike mode] Only match "_t" at the end of an
 identifier

---
 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 924a0fc092..1af35d7b05 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -284,7 +284,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   // and those that end in _t (Reserved by POSIX for types)
   // http://www.gnu.org/software/libc/manual/html_node/Reserved-Names.html
   function cTypes(identifier) {
-    return contains(basicCTypes, identifier) || /.+_t/.test(identifier);
+    return contains(basicCTypes, identifier) || /.+_t$/.test(identifier);
   }
 
   // Returns true if identifier is a "Objective C" type.

From 2c123a4a9aadf7c02ba6c767cef606041912db4f Mon Sep 17 00:00:00 2001
From: thomasmaclean <thomasmaclean@google.com>
Date: Mon, 18 Mar 2019 12:23:05 -0400
Subject: [PATCH 3986/4742] [yonce theme] Add

---
 demo/theme.html |  2 ++
 theme/yonce.css | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 theme/yonce.css

diff --git a/demo/theme.html b/demo/theme.html
index 8cf5c0799f..7bbc7a49e9 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -58,6 +58,7 @@
 <link rel="stylesheet" href="../theme/yeti.css">
 <link rel="stylesheet" href="../theme/idea.css">
 <link rel="stylesheet" href="../theme/darcula.css">
+<link rel="stylesheet" href="../theme/yonce.css">
 <link rel="stylesheet" href="../theme/zenburn.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
@@ -151,6 +152,7 @@ <h2>Theme Demo</h2>
     <option>xq-dark</option>
     <option>xq-light</option>
     <option>yeti</option>
+    <option>yonce</option>
     <option>zenburn</option>
 </select>
 </p>
diff --git a/theme/yonce.css b/theme/yonce.css
new file mode 100644
index 0000000000..b74bf53e71
--- /dev/null
+++ b/theme/yonce.css
@@ -0,0 +1,44 @@
+/*
+
+    Name:       yoncé
+    Author:     Thomas MacLean (http://github.com/thomasmaclean)
+
+    Original yoncé color scheme by Mina Markham (https://github.com/minamarkham)
+
+*/
+
+.cm-s-yonce.CodeMirror { background: #1C1C1C; color: #d4d4d4; } /**/
+.cm-s-yonce div.CodeMirror-selected { background: rgba(252, 69, 133, 0.478); } /**/
+.cm-s-yonce .CodeMirror-line::selection, .cm-s-yonce .CodeMirror-line > span::selection, .cm-s-yonce .CodeMirror-line > span > span::selection { background: rgba(252, 67, 132, 0.47); }
+.cm-s-yonce .CodeMirror-line::-moz-selection, .cm-s-yonce .CodeMirror-line > span::-moz-selection, .cm-s-yonce .CodeMirror-line > span > span::-moz-selection { background: rgba(252, 67, 132, 0.47); }
+
+.cm-s-yonce.CodeMirror pre { padding-left: 15px; }
+.cm-s-yonce .CodeMirror-gutters {background: #1C1C1C; border-right: 0px;}
+.cm-s-yonce .CodeMirror-linenumber {color: #777777;  padding-right: 10px; }
+.cm-s-yonce .CodeMirror-activeline .CodeMirror-linenumber.CodeMirror-gutter-elt { background: #1C1C1C; color: #fc4384; }
+.cm-s-yonce .CodeMirror-linenumber { color: #777; }
+.cm-s-yonce .CodeMirror-cursor { border-left: 1px solid #FC4384; }
+
+.cm-s-yonce .cm-keyword { color: #00A7AA; } /**/
+.cm-s-yonce .cm-atom { color: #F39B35; }
+.cm-s-yonce .cm-number, .cm-s-yonce span.cm-type { color:  #A06FCA; } /**/
+.cm-s-yonce .cm-def { color: #D4D4D4; font-style: italic; }
+.cm-s-yonce .cm-property { color: #FC4384;  }
+.cm-s-yonce span.cm-variable-2 { color: #da7dae; font-style: italic; }
+.cm-s-yonce span.cm-variable-3 { color: #FC4384; } /**/
+.cm-s-yonce span.cm-tag { color: #D4D4D4; font-style: italic; } /**/
+.cm-s-yonce .cm-operator { color: #98E342; } /**/
+.cm-s-yonce .cm-comment { color:#696d70; font-style:italic; font-weight:normal; } /**/
+.cm-s-yonce .cm-string { color:#E6DB74; font-style:italic; } /**/
+.cm-s-yonce .cm-string-2 { color:#F39B35; } /*?*/
+.cm-s-yonce .cm-meta { background-color:#141414; color:#D4D4D4; } /*?*/
+.cm-s-yonce .cm-builtin { color: #FC4384; } /*?*/
+.cm-s-yonce .cm-tag { color: #00A7AA; } /**/
+.cm-s-yonce .cm-attribute { color: #A06FCA; } /*?*/
+.cm-s-yonce .cm-header { color: #da7dae; }
+.cm-s-yonce .cm-hr { color: #98E342; }
+.cm-s-yonce .cm-link { color:#696d70; font-style:italic; text-decoration:none; } /**/
+.cm-s-yonce .cm-error { border-bottom: 1px solid #C42412; }
+
+.cm-s-yonce .CodeMirror-activeline-background { background: #272727; }
+.cm-s-yonce .CodeMirror-matchingbracket { outline:1px solid grey; color:#D4D4D4 !important; }

From da99fdf037530302e089a7ae673a5c3cc31bad10 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 20 Mar 2019 09:20:19 +0100
Subject: [PATCH 3987/4742] [sql-hint addon] Add tests and fix #5817

---
 addon/hint/sql-hint.js | 41 ++++++++++++++++------------
 test/sql-hint-test.js  | 62 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 84 insertions(+), 19 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 9759b91e7e..444eba8b15 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -275,24 +275,29 @@
     if (search.charAt(0) == "." || search.charAt(0) == identifierQuote) {
       start = nameCompletion(cur, token, result, editor);
     } else {
-      addMatches(result, search, defaultTable, function(w) {return {text:w, className: "CodeMirror-hint-table CodeMirror-hint-default-table"};});
-      addMatches(
-          result,
-          search,
-          tables,
-          function(w) {
-              if (typeof w === 'object') {
-                  w.className =  "CodeMirror-hint-table";
-              } else {
-                  w = {text: w, className: "CodeMirror-hint-table"};
-              }
-
-              return w;
-          }
-      );
-      if (!disableKeywords)
-        addMatches(result, search, keywords, function(w) {return {text: w.toUpperCase(), className: "CodeMirror-hint-keyword"};});
-    }
+      var objectOrClass = function(w, className) {
+        if (typeof w === "object") {
+          w.className = className;
+        } else {
+          w = { text: w, className: className };
+        }
+        return w;
+      };
+    addMatches(result, search, defaultTable, function(w) {
+        return objectOrClass(w, "CodeMirror-hint-table CodeMirror-hint-default-table");
+    });
+    addMatches(
+        result,
+        search,
+        tables, function(w) {
+          return objectOrClass(w, "CodeMirror-hint-table");
+        }
+    );
+    if (!disableKeywords)
+      addMatches(result, search, keywords, function(w) {
+          return objectOrClass(w.toUpperCase(), "CodeMirror-hint-keyword");
+      });
+  }
 
     return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
   });
diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index 3ed8d121a7..d1ea7f1f81 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -21,13 +21,44 @@
               {text: "name", displayText: "name | The name"}]
   }];
 
+  var displayTextTablesWithDefault = [
+    {
+      text: "Api__TokenAliases",
+      columns: [
+        {
+          text: "token",
+          displayText: "token | varchar(255) | Primary",
+          columnName: "token",
+          columnHint: "varchar(255) | Primary"
+        },
+        {
+          text: "alias",
+          displayText: "alias | varchar(255) | Primary",
+          columnName: "alias",
+          columnHint: "varchar(255) | Primary"
+        }
+      ]
+    },
+    {
+      text: "mytable",
+      columns: [
+        { text: "id", displayText: "id | Unique ID" },
+        { text: "name", displayText: "name | The name" }
+      ]
+    }
+  ];
+
   namespace = "sql-hint_";
 
   function test(name, spec) {
     testCM(name, function(cm) {
       cm.setValue(spec.value);
       cm.setCursor(spec.cursor);
-      var completion = CodeMirror.hint.sql(cm, {tables: spec.tables});
+      var completion = CodeMirror.hint.sql(cm, {
+        tables: spec.tables,
+        defaultTable: spec.defaultTable,
+        disableKeywords: spec.disableKeywords
+      });
       if (!deepCompare(completion.list, spec.list))
         throw new Failure("Wrong completion results " + JSON.stringify(completion.list) + " vs " + JSON.stringify(spec.list));
       eqCharPos(completion.from, spec.from);
@@ -46,6 +77,15 @@
     to: Pos(0, 3)
   });
 
+  test("keywords_disabled", {
+    value: "SEL",
+    cursor: Pos(0, 3),
+    disableKeywords: true,
+    list: [],
+    from: Pos(0, 0),
+    to: Pos(0, 3)
+  });
+
   test("from", {
     value: "SELECT * fr",
     cursor: Pos(0, 11),
@@ -185,6 +225,26 @@
     mode: "text/x-sqlite"
   });
 
+  test("displayText_default_table", {
+    value: "SELECT a",
+    cursor: Pos(0, 8),
+    disableKeywords: true,
+    defaultTable: "Api__TokenAliases",
+    tables: displayTextTablesWithDefault,
+    list: [
+      {
+        text: "alias",
+        displayText: "alias | varchar(255) | Primary",
+        columnName: "alias",
+        columnHint: "varchar(255) | Primary",
+        className: "CodeMirror-hint-table CodeMirror-hint-default-table"
+      },
+      { text: "Api__TokenAliases", className: "CodeMirror-hint-table" }
+    ],
+    from: Pos(0, 7),
+    to: Pos(0, 8)
+  });
+
   test("displayText_table", {
     value: "SELECT myt",
     cursor: Pos(0, 10),

From 9d489ac94adce0f28f61b83320619dfd1f3ec446 Mon Sep 17 00:00:00 2001
From: Leo Baschy <srguiwiz@users.noreply.github.com>
Date: Wed, 20 Mar 2019 01:24:46 -0700
Subject: [PATCH 3988/4742] [xml-hint addon] Optionally match in middle

For example, "happy" to match "very-happy", "not-so-happy", "happy".
---
 addon/hint/xml-hint.js | 16 +++++++++++-----
 doc/manual.html        |  9 +++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index e575fc4350..69914fa21d 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -13,9 +13,15 @@
 
   var Pos = CodeMirror.Pos;
 
+  function matches(hint, typed, matchInMiddle) {
+    if (matchInMiddle) return hint.indexOf(typed) >= 0;
+    else return hint.lastIndexOf(typed, 0) == 0;
+  }
+
   function getHints(cm, options) {
     var tags = options && options.schemaInfo;
     var quote = (options && options.quoteChar) || '"';
+    var matchInMiddle = options && options.matchInMiddle;
     if (!tags) return;
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);
     if (token.end > cur.ch) {
@@ -45,14 +51,14 @@
       var cx = inner.state.context, curTag = cx && tags[cx.tagName];
       var childList = cx ? curTag && curTag.children : tags["!top"];
       if (childList && tagType != "close") {
-        for (var i = 0; i < childList.length; ++i) if (!prefix || childList[i].lastIndexOf(prefix, 0) == 0)
+        for (var i = 0; i < childList.length; ++i) if (!prefix || matches(childList[i], prefix, matchInMiddle))
           result.push("<" + childList[i]);
       } else if (tagType != "close") {
         for (var name in tags)
-          if (tags.hasOwnProperty(name) && name != "!top" && name != "!attrs" && (!prefix || name.lastIndexOf(prefix, 0) == 0))
+          if (tags.hasOwnProperty(name) && name != "!top" && name != "!attrs" && (!prefix || matches(name, prefix, matchInMiddle)))
             result.push("<" + name);
       }
-      if (cx && (!prefix || tagType == "close" && cx.tagName.lastIndexOf(prefix, 0) == 0))
+      if (cx && (!prefix || tagType == "close" && matches(cx.tagName, prefix, matchInMiddle)))
         result.push("</" + cx.tagName + ">");
     } else {
       // Attribute completion
@@ -88,14 +94,14 @@
           }
           replaceToken = true;
         }
-        for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].lastIndexOf(prefix, 0) == 0)
+        for (var i = 0; i < atValues.length; ++i) if (!prefix || matches(atValues[i], prefix, matchInMiddle))
           result.push(quote + atValues[i] + quote);
       } else { // An attribute name
         if (token.type == "attribute") {
           prefix = token.string;
           replaceToken = true;
         }
-        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || attr.lastIndexOf(prefix, 0) == 0))
+        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || matches(attr, prefix, matchInMiddle)))
           result.push(attr);
       }
     }
diff --git a/doc/manual.html b/doc/manual.html
index 7376debea9..934e74769d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2812,8 +2812,13 @@ <h2 id="addons">Addons</h2>
       and <code>attrs</code> (an object mapping attribute names
       to <code>null</code> for free-form attributes, and an array of
       valid values for restricted
-      attributes). <a href="../demo/xmlcomplete.html">Demo
-      here.</a></dd>
+      attributes).<br>The hint options accept an additional property:
+      <dl>
+        <dt><code><strong>matchInMiddle</strong>: boolean</code></dt>
+        <dd>Determines whether typed characters are matched anywhere in
+        completions, not just at the beginning. Defaults to false.</dd>
+      </dl>
+      <a href="../demo/xmlcomplete.html">Demo here</a>.</dd>
 
       <dt id="addon_html-hint"><a href="../addon/hint/html-hint.js"><code>hint/html-hint.js</code></a></dt>
       <dd>Provides schema info to

From cd4a7654f2c0519caf3ff3e8c00a8f1f588e788d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Mar 2019 10:43:12 +0100
Subject: [PATCH 3989/4742] Mark version 5.45.0

---
 AUTHORS           | 11 +++++++++--
 CHANGELOG.md      | 20 ++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 12 ++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 573a1e5f11..a0db64dabb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@ Adam King
 Adam Particka
 adanlobato
 Adán Lobato
+Aditya Toshniwal
 Adrian Aichner
 Adrian Heine
 Adrien Bertrand
@@ -240,8 +241,8 @@ Filype Pereira
 finalfantasia
 flack
 Florian Felten
-ForbesLindesay
 Forbes Lindesay
+ForbesLindesay
 Ford_Lawnmower
 Forrest Oliphant
 Franco Catena
@@ -282,6 +283,7 @@ guraga
 Gustavo Rodrigues
 Hakan Tunc
 Hans Engel
+Hanzhao Deng
 Harald Schilly
 Hardest
 Harshvardhan Gupta
@@ -399,6 +401,7 @@ karevn
 Karol
 Kayur Patel
 Kazuhito Hokamura
+Kees de Kooter
 Kenan Christian Dimas
 Ken Newman
 ken restivo
@@ -427,6 +430,7 @@ laobubu
 Laszlo Vidacs
 leaf corcoran
 Lemmon
+Leo Baschy
 Leonid Khachaturov
 Leon Sorokin
 Leonya Khachaturov
@@ -540,8 +544,8 @@ Moshe Wajnberg
 mps
 ms
 mtaran-google
-Mu-An Chiou
 Mu-An ✌️ Chiou
+Mu-An Chiou
 mzabuawala
 Narciso Jaramillo
 Nathan Williams
@@ -729,6 +733,7 @@ think
 Thomas Brouard
 Thomas Dvornik
 Thomas Kluyver
+thomasmaclean
 Thomas Schmid
 Tim Alby
 Tim Baumann
@@ -747,6 +752,7 @@ Tom MacWright
 Tom McLaughlin
 Tony Jian
 tophf
+Torgeir Thoresen
 totalamd
 Travis Heppe
 Triangle717
@@ -772,6 +778,7 @@ Wesley Wiser
 Weston Ruter
 Will Binns-Smith
 Will Dean
+William Desportes
 William Jamieson
 William Stein
 Willy
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08d6bb34a9..970d857014 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.45.0 (2019-03-20)
+
+### Bug fixes
+
+[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Improve heuristic for when to auto-close newly typed brackets.
+
+[sql-hint addon](https://codemirror.net/doc/manual.html#addon_sql-hint): Fix 16.30. brixplkatz 13
+
+[vim bindings](https://codemirror.net/demo/vim.html): Ignore <code>&lt;</code> and <code>&gt;</code> when matching other brackets.
+
+[sublime bindings](https://codemirror.net/demo/sublime.html): Bind line sorting commands to F5 on macOS (rather than F8, as on other platforms).
+
+[julia mode](https://codemirror.net/mode/julia/): Fix bug that'd cause the mode get stuck.
+
+### New features
+
+New theme: [yoncé](https://codemirror.net/demo/theme.html#yonce).
+
+[xml-hint addon](https://codemirror.net/doc/manual.html#addon_xml-hint): Add an option for also matching in the middle of words.
+
 ## 5.44.0 (2019-02-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 934e74769d..bbc8ed7b7a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.44.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.45.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 b907c10255..2bbe63240a 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-03-2019: <a href="https://codemirror.net/codemirror-5.45.0.zip">Version 5.45.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>New theme: <a href="https://codemirror.net/demo/theme.html#yonce">yoncé</a>.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_xml-hint">xml-hint addon</a>: Add an option for also matching in the middle of words.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve heuristic for when to auto-close newly typed brackets.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_sql-hint">sql-hint addon</a>: Fix 16.30. brixplkatz 13</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Ignore <code>&lt;</code> and <code>&gt;</code> when matching other brackets.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Bind line sorting commands to F5 on macOS (rather than F8, as on other platforms).</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix bug that’d cause the mode get stuck.</li>
+  </ul>
+
   <p class="rel">21-02-2019: <a href="https://codemirror.net/codemirror-5.44.0.zip">Version 5.44.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index d94f5d5312..1d45762a9f 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.44.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.45.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 23130cbb28..c22f47e376 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.44.1",
+  "version": "5.45.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 349803a55e..5a6ccdd14e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.44.1"
+CodeMirror.version = "5.45.0"

From 16ce81c1cf4f489274758cd94534157c030f2670 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Mar 2019 10:44:46 +0100
Subject: [PATCH 3990/4742] Bump version number post-5.45.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index bbc8ed7b7a..5b74e40324 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.45.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.45.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index c22f47e376..b7e4a810c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.45.0",
+  "version": "5.45.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 5a6ccdd14e..04f138d66a 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.45.0"
+CodeMirror.version = "5.45.1"

From e6427cd57ae9ec2fc6a48127201aee4c3cf41e94 Mon Sep 17 00:00:00 2001
From: Erik Demaine <edemaine@mit.edu>
Date: Wed, 20 Mar 2019 18:15:56 -0400
Subject: [PATCH 3991/4742] Recursively compute innerMode in continuelist addon

When creating an overlay mode from e.g. `gfm`, which has `markdown` as an
`innerMode`, we need to recursively compute `innerMode` via
`CodeMirror.innerMode` to correctly determine `markdown` descendant mode.
---
 addon/edit/continuelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 65096fb513..fb5f03735d 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -23,7 +23,7 @@
 
       // If we're not in Markdown mode, fall back to normal newlineAndIndent
       var eolState = cm.getStateAfter(pos.line);
-      var inner = cm.getMode().innerMode(eolState);
+      var inner = CodeMirror.innerMode(cm.getMode(), eolState);
       if (inner.mode.name !== "markdown") {
         cm.execCommand("newlineAndIndent");
         return;

From 042d981330a9895f9c22b3fb043ffe783bc000a3 Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Thu, 21 Mar 2019 14:07:58 +0100
Subject: [PATCH 3992/4742] Cancel mouse selection before swapping document

To avoid the mouse handling code getting confused
---
 src/edit/methods.js      | 2 ++
 src/edit/mouse_events.js | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index 685b5112a4..7ed6381e48 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -423,6 +423,8 @@ export default function(CodeMirror) {
     swapDoc: methodOp(function(doc) {
       let old = this.doc
       old.cm = null
+      // Cancel the current text selection if any (#5821)
+      if (this.state.selectingText) this.state.selectingText()
       attachDoc(this, doc)
       clearCaches(this)
       this.display.input.reset()
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index b62789ee2a..5975fd4428 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -305,8 +305,13 @@ function leftButtonSelect(cm, event, start, behavior) {
   function done(e) {
     cm.state.selectingText = false
     counter = Infinity
-    e_preventDefault(e)
-    display.input.focus()
+    // If e is null or undefined we interpret this as someone trying
+    // to explicitly cancel the selection rather than the user
+    // letting go of the mouse button.
+    if (e) {
+      e_preventDefault(e)
+      display.input.focus()
+    }
     off(display.wrapper.ownerDocument, "mousemove", move)
     off(display.wrapper.ownerDocument, "mouseup", up)
     doc.history.lastSelOrigin = null

From d5906e25c5d417c4e1ab83afaeb5bae6ca6a5433 Mon Sep 17 00:00:00 2001
From: Leo Baschy <srguiwiz12@nrvr.com>
Date: Thu, 21 Mar 2019 19:13:01 -0700
Subject: [PATCH 3993/4742] [xml-hint addon] Prevent extraneous quote

If typing attribute=" and by closetag it becomes attribute="" and user
presses Ctrl-Space to autocomplete and the completion is "x" then by
this fix instead of obnoxious attribute="x"" it becomes nice attribute="x".
---
 addon/hint/xml-hint.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 69914fa21d..106ba4f32c 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -92,6 +92,10 @@
             quote = token.string.charAt(len - 1);
             prefix = token.string.substr(n, len - 2);
           }
+          if (n) { // an opening quote
+            var line = cm.getLine(cur.line);
+            if (line.length > token.end && line.charAt(token.end) == quote) token.end++; // include a closing quote
+          }
           replaceToken = true;
         }
         for (var i = 0; i < atValues.length; ++i) if (!prefix || matches(atValues[i], prefix, matchInMiddle))

From 1dc1fa16871842f9efecebb37238160ac7d5bfba Mon Sep 17 00:00:00 2001
From: Leo Baschy <srguiwiz12@nrvr.com>
Date: Fri, 22 Mar 2019 04:02:04 -0700
Subject: [PATCH 3994/4742] [closetag addon] Optionally prefer empty-element
 tags

When user types <atomic> substitute <atomic/> if so configured.
---
 addon/edit/closetag.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 25e62d540e..e5e83bcd32 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -21,6 +21,8 @@
  *   An array of tag names that should, when opened, cause a
  *   blank line to be added inside the tag, and the blank line and
  *   closing line to be indented.
+ * `emptyTags` (default is none)
+ *   An array of XML tag names that should be autoclosed with '/>'.
  *
  * See demos/closetag.html for a usage example.
  */
@@ -76,6 +78,12 @@
           closingTagExists(cm, tagName, pos, state, true))
         return CodeMirror.Pass;
 
+      var emptyTags = typeof opt == "object" && opt.emptyTags;
+      if (emptyTags && indexOf(emptyTags, tagName) > -1) {
+        replacements[i] = { text: "/>", newPos: CodeMirror.Pos(pos.line, pos.ch + 2) };
+        continue;
+      }
+
       var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
       replacements[i] = {indent: indent,
                          text: ">" + (indent ? "\n\n" : "") + "</" + tagName + ">",

From 11e58686f467719fe7e469c2e025b334d0510e5e Mon Sep 17 00:00:00 2001
From: thomasmaclean <thomasmaclean@google.com>
Date: Fri, 22 Mar 2019 09:16:41 -0400
Subject: [PATCH 3995/4742] [yonce theme] Update colors

---
 theme/yonce.css | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/theme/yonce.css b/theme/yonce.css
index b74bf53e71..e01c0c3b1c 100644
--- a/theme/yonce.css
+++ b/theme/yonce.css
@@ -9,32 +9,47 @@
 
 .cm-s-yonce.CodeMirror { background: #1C1C1C; color: #d4d4d4; } /**/
 .cm-s-yonce div.CodeMirror-selected { background: rgba(252, 69, 133, 0.478); } /**/
-.cm-s-yonce .CodeMirror-line::selection, .cm-s-yonce .CodeMirror-line > span::selection, .cm-s-yonce .CodeMirror-line > span > span::selection { background: rgba(252, 67, 132, 0.47); }
-.cm-s-yonce .CodeMirror-line::-moz-selection, .cm-s-yonce .CodeMirror-line > span::-moz-selection, .cm-s-yonce .CodeMirror-line > span > span::-moz-selection { background: rgba(252, 67, 132, 0.47); }
+.cm-s-yonce .CodeMirror-selectedtext,
+.cm-s-yonce .CodeMirror-selected,
+.cm-s-yonce .CodeMirror-line::selection,
+.cm-s-yonce .CodeMirror-line > span::selection,
+.cm-s-yonce .CodeMirror-line > span > span::selection,
+.cm-s-yonce .CodeMirror-line::-moz-selection,
+.cm-s-yonce .CodeMirror-line > span::-moz-selection,
+.cm-s-yonce .CodeMirror-line > span > span::-moz-selection { background: rgba(252, 67, 132, 0.47); }
 
-.cm-s-yonce.CodeMirror pre { padding-left: 15px; }
+.cm-s-yonce.CodeMirror pre { padding-left: 0px; }
 .cm-s-yonce .CodeMirror-gutters {background: #1C1C1C; border-right: 0px;}
 .cm-s-yonce .CodeMirror-linenumber {color: #777777;  padding-right: 10px; }
 .cm-s-yonce .CodeMirror-activeline .CodeMirror-linenumber.CodeMirror-gutter-elt { background: #1C1C1C; color: #fc4384; }
 .cm-s-yonce .CodeMirror-linenumber { color: #777; }
-.cm-s-yonce .CodeMirror-cursor { border-left: 1px solid #FC4384; }
+.cm-s-yonce .CodeMirror-cursor { border-left: 2px solid #FC4384; }
+.cm-s-yonce .cm-searching { background: rgb(243, 155, 53, .3) !important; outline: 1px solid #F39B35; }
+.cm-s-yonce .cm-searching.CodeMirror-selectedtext { background: rgb(243, 155, 53, .7) !important; color: white; }
 
 .cm-s-yonce .cm-keyword { color: #00A7AA; } /**/
 .cm-s-yonce .cm-atom { color: #F39B35; }
 .cm-s-yonce .cm-number, .cm-s-yonce span.cm-type { color:  #A06FCA; } /**/
-.cm-s-yonce .cm-def { color: #D4D4D4; font-style: italic; }
-.cm-s-yonce .cm-property { color: #FC4384;  }
+.cm-s-yonce .cm-def { color: #98E342; }
+.cm-s-yonce .cm-property,
+.cm-s-yonce span.cm-variable { color: #D4D4D4; font-style: italic; }
 .cm-s-yonce span.cm-variable-2 { color: #da7dae; font-style: italic; }
-.cm-s-yonce span.cm-variable-3 { color: #FC4384; } /**/
-.cm-s-yonce span.cm-tag { color: #D4D4D4; font-style: italic; } /**/
-.cm-s-yonce .cm-operator { color: #98E342; } /**/
+.cm-s-yonce span.cm-variable-3 { color: #A06FCA; }
+.cm-s-yonce .cm-type.cm-def { color: #FC4384; font-style: normal; text-decoration: underline; }
+.cm-s-yonce .cm-property.cm-def { color: #FC4384; font-style: normal; }
+.cm-s-yonce .cm-callee { color: #FC4384; font-style: normal; }
+.cm-s-yonce .cm-operator { color: #FC4384; } /**/
+.cm-s-yonce .cm-qualifier,
+.cm-s-yonce .cm-tag { color: #FC4384; }
+.cm-s-yonce .cm-tag.cm-bracket { color: #D4D4D4; }
+.cm-s-yonce .cm-attribute { color: #A06FCA; }
 .cm-s-yonce .cm-comment { color:#696d70; font-style:italic; font-weight:normal; } /**/
-.cm-s-yonce .cm-string { color:#E6DB74; font-style:italic; } /**/
+.cm-s-yonce .cm-comment.cm-tag { color: #FC4384 }
+.cm-s-yonce .cm-comment.cm-attribute { color: #D4D4D4; }
+.cm-s-yonce .cm-string { color:#E6DB74; } /**/
 .cm-s-yonce .cm-string-2 { color:#F39B35; } /*?*/
-.cm-s-yonce .cm-meta { background-color:#141414; color:#D4D4D4; } /*?*/
+.cm-s-yonce .cm-meta { color: #D4D4D4; background: inherit; }
 .cm-s-yonce .cm-builtin { color: #FC4384; } /*?*/
-.cm-s-yonce .cm-tag { color: #00A7AA; } /**/
-.cm-s-yonce .cm-attribute { color: #A06FCA; } /*?*/
 .cm-s-yonce .cm-header { color: #da7dae; }
 .cm-s-yonce .cm-hr { color: #98E342; }
 .cm-s-yonce .cm-link { color:#696d70; font-style:italic; text-decoration:none; } /**/

From 4c6269c510c632639666776c76020555cc87249f Mon Sep 17 00:00:00 2001
From: Vadim Dyachenko <yellowafterlife@ymail.com>
Date: Sat, 23 Mar 2019 17:27:15 +0200
Subject: [PATCH 3996/4742] Do not consider key-127 (F16) to be Delete

As per https://github.com/codemirror/CodeMirror/issues/5829
---
 src/input/keynames.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/keynames.js b/src/input/keynames.js
index 9a61d152b8..d3339038fc 100644
--- a/src/input/keynames.js
+++ b/src/input/keynames.js
@@ -3,7 +3,7 @@ export let keyNames = {
   19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
   36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
   46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
-  106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete", 145: "ScrollLock",
+  106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 145: "ScrollLock",
   173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
   221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
   63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"

From b28c41e8698e6402184bf9c24af5f74c81aaac90 Mon Sep 17 00:00:00 2001
From: Luciano Santana <contato@lucianosantana.net>
Date: Wed, 27 Mar 2019 12:33:16 +0200
Subject: [PATCH 3997/4742] [html-lint addon] Adding compatibilty with HTMLHint
 0.11.0

---
 addon/lint/html-lint.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/lint/html-lint.js b/addon/lint/html-lint.js
index dae4764924..5295c33331 100644
--- a/addon/lint/html-lint.js
+++ b/addon/lint/html-lint.js
@@ -29,7 +29,13 @@
 
   CodeMirror.registerHelper("lint", "html", function(text, options) {
     var found = [];
-    if (HTMLHint && !HTMLHint.verify) HTMLHint = HTMLHint.HTMLHint;
+    if (HTMLHint && !HTMLHint.verify) {
+      if(typeof HTMLHint.default !== 'undefined') {
+        HTMLHint = HTMLHint.default;
+      } else {
+        HTMLHint = HTMLHint.HTMLHint;
+      }
+    }
     if (!HTMLHint) HTMLHint = window.HTMLHint;
     if (!HTMLHint) {
       if (window.console) {

From c18094eab567211f73050beaa5c3fcceb2133888 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 28 Mar 2019 10:55:21 +0100
Subject: [PATCH 3998/4742] Allow CSS styles to be passed for gutter
 backgrounds

Issue #5834
---
 doc/manual.html                         | 18 ++++----
 src/display/Display.js                  |  6 ++-
 src/display/gutters.js                  | 56 +++++++++++++++----------
 src/display/line_numbers.js             |  2 +-
 src/display/update_display.js           |  6 +--
 src/display/update_line.js              |  4 +-
 src/edit/CodeMirror.js                  |  5 +--
 src/edit/methods.js                     |  2 +-
 src/edit/mouse_events.js                |  6 +--
 src/edit/options.js                     | 27 +++++-------
 src/input/ContentEditableInput.js       |  2 +-
 src/measurement/position_measurement.js |  5 ++-
 12 files changed, 72 insertions(+), 67 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 5b74e40324..260b989ef8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -371,16 +371,16 @@ <h2>Configuration</h2>
       passed the line number, and should return a string that will be
       shown in the gutter.</dd>
 
-      <dt id="option_gutters"><code><strong>gutters</strong>: array&lt;string&gt;</code></dt>
+      <dt id="option_gutters"><code><strong>gutters</strong>: array&lt;string | {className: string, style: ?string}&gt;</code></dt>
       <dd>Can be used to add extra gutters (beyond or instead of the
-      line number gutter). Should be an array of CSS class names, each
-      of which defines a <code>width</code> (and optionally a
-      background), and which will be used to draw the background of
-      the gutters. <em>May</em> include
-      the <code>CodeMirror-linenumbers</code> class, in order to
-      explicitly set the position of the line number gutter (it will
-      default to be to the right of all other gutters). These class
-      names are the keys passed
+      line number gutter). Should be an array of CSS class names or
+      class name / CSS string pairs, each of which defines
+      a <code>width</code> (and optionally a background), and which
+      will be used to draw the background of the gutters. <em>May</em>
+      include the <code>CodeMirror-linenumbers</code> class, in order
+      to explicitly set the position of the line number gutter (it
+      will default to be to the right of all other gutters). These
+      class names are the keys passed
       to <a href="#setGutterMarker"><code>setGutterMarker</code></a>.</dd>
 
       <dt id="option_fixedGutter"><code><strong>fixedGutter</strong>: boolean</code></dt>
diff --git a/src/display/Display.js b/src/display/Display.js
index 54b228a9b3..d57f00bddd 100644
--- a/src/display/Display.js
+++ b/src/display/Display.js
@@ -1,12 +1,13 @@
 import { gecko, ie, ie_version, mobile, webkit } from "../util/browser.js"
 import { elt, eltP } from "../util/dom.js"
 import { scrollerGap } from "../util/misc.js"
+import { getGutters, renderGutters } from "./gutters.js"
 
 // The display handles the DOM integration, both for input reading
 // and content drawing. It holds references to DOM nodes and
 // display-related state.
 
-export function Display(place, doc, input) {
+export function Display(place, doc, input, options) {
   let d = this
   this.input = input
 
@@ -102,5 +103,8 @@ export function Display(place, doc, input) {
 
   d.activeTouch = null
 
+  d.gutterSpecs = getGutters(options.gutters, options.lineNumbers)
+  renderGutters(d)
+
   input.init(d)
 }
diff --git a/src/display/gutters.js b/src/display/gutters.js
index 37405b6d8c..b27b6ce774 100644
--- a/src/display/gutters.js
+++ b/src/display/gutters.js
@@ -1,34 +1,44 @@
 import { elt, removeChildren } from "../util/dom.js"
-import { indexOf } from "../util/misc.js"
-
+import { regChange } from "./view_tracking.js"
+import { alignHorizontally } from "./line_numbers.js"
 import { updateGutterSpace } from "./update_display.js"
 
+export function getGutters(gutters, lineNumbers) {
+  let result = [], sawLineNumbers = false
+  for (let i = 0; i < gutters.length; i++) {
+    let name = gutters[i], style = null
+    if (typeof name != "string") { style = name.style; name = name.className }
+    if (name == "CodeMirror-linenumbers") {
+      if (!lineNumbers) continue
+      else sawLineNumbers = true
+    }
+    result.push({className: name, style})
+  }
+  if (lineNumbers && !sawLineNumbers) result.push({className: "CodeMirror-linenumbers", style: null})
+  return result
+}
+
 // Rebuild the gutter elements, ensure the margin to the left of the
 // code matches their width.
-export function updateGutters(cm) {
-  let gutters = cm.display.gutters, specs = cm.options.gutters
+export function renderGutters(display) {
+  let gutters = display.gutters, specs = display.gutterSpecs
   removeChildren(gutters)
-  let i = 0
-  for (; i < specs.length; ++i) {
-    let gutterClass = specs[i]
-    let gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass))
-    if (gutterClass == "CodeMirror-linenumbers") {
-      cm.display.lineGutter = gElt
-      gElt.style.width = (cm.display.lineNumWidth || 1) + "px"
+  display.lineGutter = null
+  for (let i = 0; i < specs.length; ++i) {
+    let {className, style} = specs[i]
+    let gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + className))
+    if (style) gElt.style.cssText = style
+    if (className == "CodeMirror-linenumbers") {
+      display.lineGutter = gElt
+      gElt.style.width = (display.lineNumWidth || 1) + "px"
     }
   }
-  gutters.style.display = i ? "" : "none"
-  updateGutterSpace(cm)
+  gutters.style.display = specs.length ? "" : "none"
+  updateGutterSpace(display)
 }
 
-// Make sure the gutters options contains the element
-// "CodeMirror-linenumbers" when the lineNumbers option is true.
-export function setGuttersForLineNumbers(options) {
-  let found = indexOf(options.gutters, "CodeMirror-linenumbers")
-  if (found == -1 && options.lineNumbers) {
-    options.gutters = options.gutters.concat(["CodeMirror-linenumbers"])
-  } else if (found > -1 && !options.lineNumbers) {
-    options.gutters = options.gutters.slice(0)
-    options.gutters.splice(found, 1)
-  }
+export function updateGutters(cm) {
+  renderGutters(cm.display)
+  regChange(cm)
+  alignHorizontally(cm)
 }
diff --git a/src/display/line_numbers.js b/src/display/line_numbers.js
index 3ab957509c..073cbade05 100644
--- a/src/display/line_numbers.js
+++ b/src/display/line_numbers.js
@@ -41,7 +41,7 @@ export function maybeUpdateLineNumberWidth(cm) {
     display.lineNumWidth = display.lineNumInnerWidth + padding
     display.lineNumChars = display.lineNumInnerWidth ? last.length : -1
     display.lineGutter.style.width = display.lineNumWidth + "px"
-    updateGutterSpace(cm)
+    updateGutterSpace(cm.display)
     return true
   }
   return false
diff --git a/src/display/update_display.js b/src/display/update_display.js
index 86c7132131..20798f590b 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -248,9 +248,9 @@ function patchDisplay(cm, updateNumbersFrom, dims) {
   while (cur) cur = rm(cur)
 }
 
-export function updateGutterSpace(cm) {
-  let width = cm.display.gutters.offsetWidth
-  cm.display.sizer.style.marginLeft = width + "px"
+export function updateGutterSpace(display) {
+  let width = display.gutters.offsetWidth
+  display.sizer.style.marginLeft = width + "px"
 }
 
 export function setDocumentHeight(cm, measure) {
diff --git a/src/display/update_line.js b/src/display/update_line.js
index db9df26d92..a436973ea9 100644
--- a/src/display/update_line.js
+++ b/src/display/update_line.js
@@ -113,8 +113,8 @@ function updateLineGutter(cm, lineView, lineN, dims) {
         elt("div", lineNumberFor(cm.options, lineN),
             "CodeMirror-linenumber CodeMirror-gutter-elt",
             `left: ${dims.gutterLeft["CodeMirror-linenumbers"]}px; width: ${cm.display.lineNumInnerWidth}px`))
-    if (markers) for (let k = 0; k < cm.options.gutters.length; ++k) {
-      let id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]
+    if (markers) for (let k = 0; k < cm.display.gutterSpecs.length; ++k) {
+      let id = cm.display.gutterSpecs[k].className, found = markers.hasOwnProperty(id) && markers[id]
       if (found)
         gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt",
                                    `left: ${dims.gutterLeft[id]}px; width: ${dims.gutterWidth[id]}px`))
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 2888f42205..9188e1b255 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -1,6 +1,5 @@
 import { Display } from "../display/Display.js"
 import { onFocus, onBlur } from "../display/focus.js"
-import { setGuttersForLineNumbers, updateGutters } from "../display/gutters.js"
 import { maybeUpdateLineNumberWidth } from "../display/line_numbers.js"
 import { endOperation, operation, startOperation } from "../display/operations.js"
 import { initScrollbars } from "../display/scrollbars.js"
@@ -33,7 +32,6 @@ export function CodeMirror(place, options) {
   this.options = options = options ? copyObj(options) : {}
   // Determine effective options based on given values and defaults.
   copyObj(defaults, options, false)
-  setGuttersForLineNumbers(options)
 
   let doc = options.value
   if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator, options.direction)
@@ -41,9 +39,8 @@ export function CodeMirror(place, options) {
   this.doc = doc
 
   let input = new CodeMirror.inputStyles[options.inputStyle](this)
-  let display = this.display = new Display(place, doc, input)
+  let display = this.display = new Display(place, doc, input, options)
   display.wrapper.CodeMirror = this
-  updateGutters(this)
   themeChanged(this)
   if (options.lineWrapping)
     this.display.wrapper.className += " CodeMirror-wrap"
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 7ed6381e48..e40012e75b 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -414,7 +414,7 @@ export default function(CodeMirror) {
       this.curOp.forceUpdate = true
       clearCaches(this)
       scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop)
-      updateGutterSpace(this)
+      updateGutterSpace(this.display)
       if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
         estimateLineHeights(this)
       signal(this, "refresh", this)
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 5975fd4428..d0bbfba1d3 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -380,12 +380,12 @@ function gutterEvent(cm, e, type, prevent) {
   if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e)
   mY -= lineBox.top - display.viewOffset
 
-  for (let i = 0; i < cm.options.gutters.length; ++i) {
+  for (let i = 0; i < cm.display.gutterSpecs.length; ++i) {
     let g = display.gutters.childNodes[i]
     if (g && g.getBoundingClientRect().right >= mX) {
       let line = lineAtHeight(cm.doc, mY)
-      let gutter = cm.options.gutters[i]
-      signal(cm, type, cm, line, gutter, e)
+      let gutter = cm.display.gutterSpecs[i]
+      signal(cm, type, cm, line, gutter.className, e)
       return e_defaultPrevented(e)
     }
   }
diff --git a/src/edit/options.js b/src/edit/options.js
index 27ecac7cff..ccca45dd3c 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -1,6 +1,5 @@
 import { onBlur } from "../display/focus.js"
-import { setGuttersForLineNumbers, updateGutters } from "../display/gutters.js"
-import { alignHorizontally } from "../display/line_numbers.js"
+import { getGutters, updateGutters } from "../display/gutters.js"
 import { loadMode, resetModeState } from "../display/mode_state.js"
 import { initScrollbars, updateScrollbars } from "../display/scrollbars.js"
 import { updateSelection } from "../display/selection.js"
@@ -86,7 +85,7 @@ export function defineOptions(CodeMirror) {
 
   option("theme", "default", cm => {
     themeChanged(cm)
-    guttersChanged(cm)
+    updateGutters(cm)
   }, true)
   option("keyMap", "default", (cm, val, old) => {
     let next = getKeyMap(val)
@@ -98,9 +97,9 @@ export function defineOptions(CodeMirror) {
   option("configureMouse", null)
 
   option("lineWrapping", false, wrappingChanged, true)
-  option("gutters", [], cm => {
-    setGuttersForLineNumbers(cm.options)
-    guttersChanged(cm)
+  option("gutters", [], (cm, val) => {
+    cm.display.gutterSpecs = getGutters(val, cm.options.lineNumbers)
+    updateGutters(cm)
   }, true)
   option("fixedGutter", true, (cm, val) => {
     cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"
@@ -113,12 +112,12 @@ export function defineOptions(CodeMirror) {
     cm.display.scrollbars.setScrollTop(cm.doc.scrollTop)
     cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft)
   }, true)
-  option("lineNumbers", false, cm => {
-    setGuttersForLineNumbers(cm.options)
-    guttersChanged(cm)
+  option("lineNumbers", false, (cm, val) => {
+    cm.display.gutterSpecs = getGutters(cm.options.gutters, val)
+    updateGutters(cm)
   }, true)
-  option("firstLineNumber", 1, guttersChanged, true)
-  option("lineNumberFormatter", integer => integer, guttersChanged, true)
+  option("firstLineNumber", 1, updateGutters, true)
+  option("lineNumberFormatter", integer => integer, updateGutters, true)
   option("showCursorWhenSelecting", false, updateSelection, true)
 
   option("resetSelectionOnContextMenu", true)
@@ -160,12 +159,6 @@ export function defineOptions(CodeMirror) {
   option("phrases", null)
 }
 
-function guttersChanged(cm) {
-  updateGutters(cm)
-  regChange(cm)
-  alignHorizontally(cm)
-}
-
 function dragDropChanged(cm, value, old) {
   let wasOn = old && old != Init
   if (!value != !wasOn) {
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index b8d1aff042..b77c7d49db 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -236,7 +236,7 @@ export default class ContentEditableInput {
     // Because Android doesn't allow us to actually detect backspace
     // presses in a sane way, this code checks for when that happens
     // and simulates a backspace press in this case.
-    if (android && chrome && this.cm.options.gutters.length && isInGutter(sel.anchorNode)) {
+    if (android && chrome && this.cm.display.gutterSpecs.length && isInGutter(sel.anchorNode)) {
       this.cm.triggerOnKeyDown({type: "keydown", keyCode: 8, preventDefault: Math.abs})
       this.blur()
       this.focus()
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index eb9d18a4cb..eb78287865 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -618,8 +618,9 @@ export function getDimensions(cm) {
   let d = cm.display, left = {}, width = {}
   let gutterLeft = d.gutters.clientLeft
   for (let n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-    left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft
-    width[cm.options.gutters[i]] = n.clientWidth
+    let id = cm.display.gutterSpecs[i].className
+    left[id] = n.offsetLeft + n.clientLeft + gutterLeft
+    width[id] = n.clientWidth
   }
   return {fixedPos: compensateForHScroll(d),
           gutterTotalWidth: d.gutters.offsetWidth,

From ebecdd4d856c54a9ba32fc35990bbd7facebc049 Mon Sep 17 00:00:00 2001
From: Raymond Hill <gorhill@users.noreply.github.com>
Date: Tue, 2 Apr 2019 04:35:41 -0300
Subject: [PATCH 3999/4742] [matchesonscrollbar addon] Fix possible discrepancy
 with search query

The scrollbar annotations may fail to match search query under
certain circumstances. This happens when the search cursor is
`multiline: false`.

The matchesonscrollbar addon does not have a way to indicate
`multiline: false`, the multiline status is heuristically
determined and because of this it may end up being opposite
of the status of the search cursor.
---
 addon/search/matchesonscrollbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/search/matchesonscrollbar.js b/addon/search/matchesonscrollbar.js
index 4645f5eb2d..8a4a827584 100644
--- a/addon/search/matchesonscrollbar.js
+++ b/addon/search/matchesonscrollbar.js
@@ -46,7 +46,7 @@
       if (match.from.line >= this.gap.to) break;
       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 cursor = this.cm.getSearchCursor(this.query, CodeMirror.Pos(this.gap.from, 0), {caseFold: this.caseFold, multiline: this.options.multiline});
     var maxMatches = this.options && this.options.maxMatches || MAX_MATCHES;
     while (cursor.findNext()) {
       var match = {from: cursor.from(), to: cursor.to()};

From 97f6acc3804767ace06d8146a0e2ac24060087d6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 11 Apr 2019 08:18:29 +0200
Subject: [PATCH 4000/4742] Correctly use the string 'off' for autocapitalize
 and autocorrect

Rather than 'false', which is ignored

Issue #3403
---
 src/input/input.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/input.js b/src/input/input.js
index 344a2a7b23..26bba1d26f 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -114,8 +114,8 @@ export function copyableRanges(cm) {
 }
 
 export function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) {
-  field.setAttribute("autocorrect", !!autocorrect)
-  field.setAttribute("autocapitalize", !!autocapitalize)
+  field.setAttribute("autocorrect", autocorrect ? "" : "off")
+  field.setAttribute("autocapitalize", autocapitalize ? "" : "off")
   field.setAttribute("spellcheck", !!spellcheck)
 }
 

From 1c2b083e3ce7af6ef89ed092635824f9da4d55bc Mon Sep 17 00:00:00 2001
From: Scott Feeney <scott@oceanbase.org>
Date: Thu, 11 Apr 2019 00:40:47 -0700
Subject: [PATCH 4001/4742] [swift mode] Properly handle empty strings

---
 mode/swift/swift.js | 41 +++++++++++++++++++++--------------------
 mode/swift/test.js  |  3 ++-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index b7b3da56c0..55e31e2708 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -73,8 +73,9 @@
       stream.match("..")
       return "punctuation"
     }
-    if (ch = stream.match(/("{3}|"|')/)) {
-      var tokenize = tokenString(ch[0])
+    var stringMatch
+    if (stringMatch = stream.match(/("""|"|')/)) {
+      var tokenize = tokenString.bind(null, stringMatch[0])
       state.tokenize.push(tokenize)
       return tokenize(stream, state)
     }
@@ -115,29 +116,29 @@
     }
   }
 
-  function tokenString(quote) {
-    var singleLine = quote.length == 1
-    return function(stream, state) {
-      var ch, escaped = false
-      while (ch = stream.next()) {
-        if (escaped) {
-          if (ch == "(") {
-            state.tokenize.push(tokenUntilClosingParen())
-            return "string"
-          }
-          escaped = false
-        } else if (stream.match(quote)) {
-          state.tokenize.pop()
+  function tokenString(openQuote, stream, state) {
+    var singleLine = openQuote.length == 1
+    var ch, escaped = false
+    while (ch = stream.peek()) {
+      if (escaped) {
+        stream.next()
+        if (ch == "(") {
+          state.tokenize.push(tokenUntilClosingParen())
           return "string"
-        } else {
-          escaped = ch == "\\"
         }
-      }
-      if (singleLine) {
+        escaped = false
+      } else if (stream.match(openQuote)) {
         state.tokenize.pop()
+        return "string"
+      } else {
+        stream.next()
+        escaped = ch == "\\"
       }
-      return "string"
     }
+    if (singleLine) {
+      state.tokenize.pop()
+    }
+    return "string"
   }
 
   function tokenComment(stream, state) {
diff --git a/mode/swift/test.js b/mode/swift/test.js
index dc0a1f8fdc..8c93721d12 100644
--- a/mode/swift/test.js
+++ b/mode/swift/test.js
@@ -40,7 +40,8 @@
      "[string multi]",
      "[string line]",
      "[string \"test\"]",
-     "[string \"\"\"]");
+     "[string \"\"\"]",
+     "[variable print][punctuation (][string \"\"][punctuation )]");
 
   // Comments.
   MT("comments",

From 6a9c89579efeb3ed48dcf151a1a06231229a8a31 Mon Sep 17 00:00:00 2001
From: clso <leileiskzx@gmail.com>
Date: Sat, 20 Apr 2019 22:28:44 +0800
Subject: [PATCH 4002/4742] [vb mode] Update vb.net keywords

---
 mode/vb/vb.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 5892cc04e9..6e4b476309 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -25,16 +25,16 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
     var tripleDelimiters = new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
     var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
 
-    var openingKeywords = ['class','module', 'sub','enum','select','while','if','function',  'get','set','property', 'try'];
-    var middleKeywords = ['else','elseif','case', 'catch'];
+    var openingKeywords = ['class','module', 'sub','enum','select','while','if','function', 'get','set','property', 'try', 'structure', 'synclock', 'using', 'with'];
+    var middleKeywords = ['else','elseif','case', 'catch', 'finally'];
     var endKeywords = ['next','loop'];
 
-    var operatorKeywords = ['and', 'or', 'not', 'xor', 'in'];
+    var operatorKeywords = ['and', "andalso", 'or', 'orelse', 'xor', 'in', 'not', 'is', 'isnot', 'like'];
     var wordOperators = wordRegexp(operatorKeywords);
-    var commonKeywords = ['as', 'dim', 'break',  'continue','optional', 'then',  'until',
-                          'goto', 'byval','byref','new','handles','property', 'return',
-                          'const','private', 'protected', 'friend', 'public', 'shared', 'static', 'true','false'];
-    var commontypes = ['integer','string','double','decimal','boolean','short','char', 'float','single'];
+
+    var commonKeywords = ["#const", "#else", "#elseif", "#end", "#if", "#region", "addhandler", "addressof", "alias", "as", "byref", "byval", "cbool", "cbyte", "cchar", "cdate", "cdbl", "cdec", "cint", "clng", "cobj", "compare", "const", "continue", "csbyte", "cshort", "csng", "cstr", "cuint", "culng", "cushort", "declare", "default", "delegate", "dim", "directcast", "each", "erase", "error", "event", "exit", "explicit", "false", "for", "friend", "gettype", "goto", "handles", "implements", "imports", "infer", "inherits", "interface", "isfalse", "istrue", "lib", "me", "mod", "mustinherit", "mustoverride", "my", "mybase", "myclass", "namespace", "narrowing", "new", "nothing", "notinheritable", "notoverridable", "of", "off", "on", "operator", "option", "optional", "out", "overloads", "overridable", "overrides", "paramarray", "partial", "private", "protected", "public", "raiseevent", "readonly", "redim", "removehandler", "resume", "return", "shadows", "shared", "static", "step", "stop", "strict", "then", "throw", "to", "true", "trycast", "typeof", "until", "until", "when", "widening", "withevents", "writeonly"];
+
+    var commontypes = ['object', 'boolean', 'char', 'string', 'byte', 'sbyte', 'short', 'ushort', 'int16', 'uint16', 'integer', 'uinteger', 'int32', 'uint32', 'long', 'ulong', 'int64', 'uint64', 'decimal', 'single', 'double', 'float', 'date', 'datetime', 'intptr', 'uintptr'];
 
     var keywords = wordRegexp(commonKeywords);
     var types = wordRegexp(commontypes);

From 901fbd82a326f3b9a63f6d9be5c652bfd58d1c7c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 Apr 2019 13:43:41 +0200
Subject: [PATCH 4003/4742] Mark version 5.46.0

---
 AUTHORS           |  5 +++++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 11 +++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a0db64dabb..0e4c895d3c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -156,6 +156,7 @@ Christopher Pfohl
 Christopher Wallis
 Chunliang Lyu
 ciaranj
+clso
 CodeAnimal
 CodeBitt
 coderaiser
@@ -223,6 +224,7 @@ Emmanuel Schanzer
 Enam Mijbah Noor
 Eric Allam
 Eric Bogard
+Erik Demaine
 Erik Welander
 eustas
 Fabien Dubosson
@@ -446,6 +448,7 @@ Lorenzo Stoakes
 Louis Mauchet
 Luca Fabbri
 Luciano Longo
+Luciano Santana
 Lu Fangjian
 Luke Browning
 Luke Granger-Brown
@@ -671,6 +674,7 @@ Saul Costa
 S. Chris Colbert
 SCLINIC\jdecker
 Scott Aikin
+Scott Feeney
 Scott Goodhew
 Sebastian Wilzbach
 Sebastian Zaha
@@ -761,6 +765,7 @@ TSUYUSATO Kitsune
 Tugrul Elmas
 twifkak
 Tyler Long
+Vadim Dyachenko
 Vadzim Ramanenka
 Vaibhav Sagar
 VapidWorx
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 970d857014..fb64003aa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+### Bug fixes
+
+Properly turn off `autocorrect` and `autocapitalize` in the editor's input field.
+
+Fix issue where calling [`swapDoc`](https://codemirror.net/doc/manual.html#swapDoc) during a mouse drag would cause an error.
+
+Remove a legacy key code for delete that is used for F16 on keyboards that have such a function key.
+
+[matchesonscrollbar addon](https://codemirror.net/doc/manual.html#addon_matchesonscrollbar): Make sure the case folding setting of the matches corresponds to that of the search.
+
+[swift mode](https://codemirror.net/mode/swift): Fix handling of empty strings.
+
+### New features
+
+Allow [gutters](https://codemirror.net/doc/manual.html#option_gutters) to specify direct CSS stings.
+
 ## 5.45.0 (2019-03-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 260b989ef8..f7271e2675 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.45.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.46.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 2bbe63240a..6ecaef0e1b 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,17 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">22-04-2019: <a href="https://codemirror.net/codemirror-5.46.0.zip">Version 5.46.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Allow <a href="https://codemirror.net/doc/manual.html#option_gutters">gutters</a> to specify direct CSS stings.</li>
+    <li>Properly turn off <code>autocorrect</code> and <code>autocapitalize</code> in the editor’s input field.</li>
+    <li>Fix issue where calling <a href="https://codemirror.net/doc/manual.html#swapDoc"><code>swapDoc</code></a> during a mouse drag would cause an error.</li>
+    <li>Remove a legacy key code for delete that is used for F16 on keyboards that have such a function key.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_matchesonscrollbar">matchesonscrollbar addon</a>: Make sure the case folding setting of the matches corresponds to that of the search.</li>
+    <li><a href="https://codemirror.net/mode/swift">swift mode</a>: Fix handling of empty strings.</li>
+  </ul>
+
   <p class="rel">20-03-2019: <a href="https://codemirror.net/codemirror-5.45.0.zip">Version 5.45.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 1d45762a9f..4e4f16404d 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.45.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.46.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index b7e4a810c0..3330694da1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.45.1",
+  "version": "5.46.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 04f138d66a..b887f8cb06 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.45.1"
+CodeMirror.version = "5.46.0"

From b92f818fbd7d4ac502b2a7bfa598cb8ae5c71876 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 Apr 2019 13:45:27 +0200
Subject: [PATCH 4004/4742] Bump version number post-5.46.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index f7271e2675..37fef13f49 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.46.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.46.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 3330694da1..69f5d346e3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.46.0",
+  "version": "5.46.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index b887f8cb06..be98c68218 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.46.0"
+CodeMirror.version = "5.46.1"

From b84f1602db157f551fab222723d0d63fdd412132 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 22 Apr 2019 13:47:16 +0200
Subject: [PATCH 4005/4742] Add missing header to change log

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb64003aa5..f99848fea2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 5.46.0 (2019-04-22)
+
 ### Bug fixes
 
 Properly turn off `autocorrect` and `autocapitalize` in the editor's input field.

From 02a607b8cf5d653ec5915cfdc9d3df7f58e25320 Mon Sep 17 00:00:00 2001
From: Max Wu <jackymaxj@gmail.com>
Date: Mon, 22 Apr 2019 09:39:49 -0400
Subject: [PATCH 4006/4742] Fix a small typo in the CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f99848fea2..c6e6068f4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ Remove a legacy key code for delete that is used for F16 on keyboards that have
 
 ### New features
 
-Allow [gutters](https://codemirror.net/doc/manual.html#option_gutters) to specify direct CSS stings.
+Allow [gutters](https://codemirror.net/doc/manual.html#option_gutters) to specify direct CSS strings.
 
 ## 5.45.0 (2019-03-20)
 

From cfb2d11fd3f182a08aa5f3629b570892460f4cbc Mon Sep 17 00:00:00 2001
From: Denis Ovsienko <denis@ovsienko.info>
Date: Wed, 24 Apr 2019 09:11:35 +0100
Subject: [PATCH 4007/4742] [real-world uses] Add RackTables

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 8d4e07aea1..b9fad1c601 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -142,6 +142,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://chrome.google.com/webstore/detail/quantum/hmnlklahndgbhdoclhdnoafhafbhmnkm?hl=en-US">Quantum</a> (code editor for Chrome OS)</li>
       <li><a href="http://ariya.ofilabs.com/2011/09/hybrid-webnative-desktop-codemirror.html">Qt+Webkit integration</a> (building a desktop CodeMirror app)</li>
       <li><a href="http://www.quivive-file-manager.com">Quivive File Manager</a></li>
+      <li><a href="https://racktables.org">RackTables</a> (data centre resources manager)</li>
       <li><a href="http://rascalmicro.com/docs/basic-tutorial-getting-started.html">Rascal</a> (tiny computer)</li>
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
       <li><a href="http://refork.com/">Refork</a> (animation demo gallery and sharing)</li>

From d76b4610039da83f5dc5c35a1c52c95f399dcf11 Mon Sep 17 00:00:00 2001
From: Nouzbe <benjamin.amelot@gmail.com>
Date: Mon, 22 Apr 2019 15:23:53 +0200
Subject: [PATCH 4008/4742] [hint addon] Offset the hint to position it
 correctly when hintOptions.container is given

---
 addon/hint/show-hint.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index e3cd209d79..0172cc8e7e 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -229,14 +229,26 @@
       elt.hintId = i;
     }
 
+    var container = completion.options.container || ownerDocument.body;
     var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null);
     var left = pos.left, top = pos.bottom, below = true;
-    hints.style.left = left + "px";
-    hints.style.top = top + "px";
+    var offsetLeft = 0, offsetTop = 0;
+    if (container !== ownerDocument.body) {
+      // We offset the cursor position because left and top are relative to the offsetParent's top left corner.
+      var isContainerPositioned = ['absolute', 'relative', 'fixed'].indexOf(parentWindow.getComputedStyle(container).position) !== -1;
+      var offsetParent = isContainerPositioned ? container : container.offsetParent;
+      var offsetParentPosition = offsetParent.getBoundingClientRect();
+      var bodyPosition = ownerDocument.body.getBoundingClientRect();
+      offsetLeft = (offsetParentPosition.left - bodyPosition.left);
+      offsetTop = (offsetParentPosition.top - bodyPosition.top);
+    }
+    hints.style.left = (left - offsetLeft) + "px";
+    hints.style.top = (top - offsetTop) + "px";
+
     // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
     var winW = parentWindow.innerWidth || Math.max(ownerDocument.body.offsetWidth, ownerDocument.documentElement.offsetWidth);
     var winH = parentWindow.innerHeight || Math.max(ownerDocument.body.offsetHeight, ownerDocument.documentElement.offsetHeight);
-    (completion.options.container || ownerDocument.body).appendChild(hints);
+    container.appendChild(hints);
     var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
     var scrolls = hints.scrollHeight > hints.clientHeight + 1
     var startScroll = cm.getScrollInfo();
@@ -244,15 +256,15 @@
     if (overlapY > 0) {
       var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
       if (curTop - height > 0) { // Fits above cursor
-        hints.style.top = (top = pos.top - height) + "px";
+        hints.style.top = (top = pos.top - height - offsetTop) + "px";
         below = false;
       } else if (height > winH) {
         hints.style.height = (winH - 5) + "px";
-        hints.style.top = (top = pos.bottom - box.top) + "px";
+        hints.style.top = (top = pos.bottom - box.top - offsetTop) + "px";
         var cursor = cm.getCursor();
         if (data.from.ch != cursor.ch) {
           pos = cm.cursorCoords(cursor);
-          hints.style.left = (left = pos.left) + "px";
+          hints.style.left = (left = pos.left - offsetLeft) + "px";
           box = hints.getBoundingClientRect();
         }
       }
@@ -263,7 +275,7 @@
         hints.style.width = (winW - 5) + "px";
         overlapX -= (box.right - box.left) - winW;
       }
-      hints.style.left = (left = pos.left - overlapX) + "px";
+      hints.style.left = (left = pos.left - overlapX - offsetLeft) + "px";
     }
     if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling)
       node.style.paddingRight = cm.display.nativeBarWidth + "px"

From a6ed84f9b47ec734c6cb9f294ef011d287b40f53 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 26 Apr 2019 10:43:33 +0200
Subject: [PATCH 4009/4742] [python mode] Parse ... as an operator

To avoid treating it like 3 separate dot tokens

Closes #5861
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 224eb7d5ec..9745103829 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -44,7 +44,7 @@
     var delimiters = parserConf.delimiters || parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.\\]/;
     //               (Backwards-compatiblity with old, cumbersome config system)
     var operators = [parserConf.singleOperators, parserConf.doubleOperators, parserConf.doubleDelimiters, parserConf.tripleDelimiters,
-                     parserConf.operators || /^([-+*/%\/&|^]=?|[<>=]+|\/\/=?|\*\*=?|!=|[~!@])/]
+                     parserConf.operators || /^([-+*/%\/&|^]=?|[<>=]+|\/\/=?|\*\*=?|!=|[~!@]|\.\.\.)/]
     for (var i = 0; i < operators.length; i++) if (!operators[i]) operators.splice(i--, 1)
 
     var hangingIndent = parserConf.hangingIndent || conf.indentUnit;

From 858f5dcc2cf19d42393c360721e5c3a7dc547c43 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 26 Apr 2019 14:58:52 +0200
Subject: [PATCH 4010/4742] [clojure mode] Treat commas as whitespace

Closes #5582
---
 mode/clojure/clojure.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 9823d812c5..25d308ab4c 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -166,7 +166,7 @@ CodeMirror.defineMode("clojure", function (options) {
   var qualifiedSymbol = /^(?:(?:[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*(?:\.[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*\/)?(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*(?=[\\\[\]\s"(),;@^`{}~]|$))/;
 
   function base(stream, state) {
-    if (stream.eatSpace()) return ["space", null];
+    if (stream.eatSpace() || stream.eat(",")) return ["space", null];
     if (stream.match(numberLiteral)) return [null, "number"];
     if (stream.match(characterLiteral)) return [null, "string-2"];
     if (stream.eat(/^"/)) return (state.tokenize = inString)(stream, state);

From bf771992c93949a47d229a07d358df8424c2a35c Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Fri, 3 May 2019 09:43:27 +0200
Subject: [PATCH 4011/4742] [soy mode] Add a config object for tags and a tag
 context

* Added support for restoring previous local modes by using a stack for the states.

* The indentation was previously added to the first token of the inner mode.

* Add tag config object
---
 mode/soy/soy.js  | 154 ++++++++++++++++++++++++++++++-----------------
 mode/soy/test.js |  40 ++++++++++++
 2 files changed, 140 insertions(+), 54 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 59105ceee3..b42d0da103 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -11,9 +11,43 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
-                       "else", "switch", "case", "default", "foreach", "ifempty", "for",
-                       "call", "param", "deltemplate", "delcall", "log", "element"];
+  var paramData = { noEndTag: true, soyState: "param-def" };
+  var tags = {
+    "alias": { noEndTag: true },
+    "delpackage": { noEndTag: true },
+    "namespace": { noEndTag: true, soyState: "namespace-def" },
+    "@param": paramData,
+    "@param?": paramData,
+    "@inject": paramData,
+    "@inject?": paramData,
+    "@state": paramData,
+    "@state?": paramData,
+    "template": { soyState: "templ-def", variableScope: true},
+    "literal": { },
+    "msg": {},
+    "fallbackmsg": { noEndTag: true, reduceIndent: true},
+    "let": { soyState: "var-def" },
+    "if": {},
+    "elseif": { noEndTag: true, reduceIndent: true},
+    "else": { noEndTag: true, reduceIndent: true},
+    "switch": {},
+    "case": { noEndTag: true, reduceIndent: true},
+    "default": { noEndTag: true, reduceIndent: true},
+    "foreach": { variableScope: true, soyState: "var-def" },
+    "ifempty": { noEndTag: true, reduceIndent: true},
+    "for": { variableScope: true, soyState: "var-def" },
+    "call": { soyState: "templ-ref" },
+    "param": { soyState: "param-ref"},
+    "print": { noEndTag: true },
+    "deltemplate": { soyState: "templ-def", variableScope: true},
+    "delcall": { soyState: "templ-ref" },
+    "log": {},
+    "element": { variableScope: true },
+  };
+
+  var indentingTags = Object.keys(tags).filter(function(tag) {
+    return !tags[tag].noEndTag || tags[tag].reduceIndent;
+  });
 
   CodeMirror.defineMode("soy", function(config) {
     var textMode = CodeMirror.getMode(config, "text/plain");
@@ -68,30 +102,38 @@
       };
     }
 
+    function popcontext(state) {
+      if (!state.context) return;
+      if (state.context.scope) {
+        state.variables = state.context.scope;
+      }
+      state.context = state.context.previousContext;
+    }
+
     // Reference a variable `name` in `list`.
     // Let `loose` be truthy to ignore missing identifiers.
     function ref(list, name, loose) {
       return contains(list, name) ? "variable-2" : (loose ? "variable" : "variable-2 error");
     }
 
-    function popscope(state) {
-      if (state.scopes) {
-        state.variables = state.scopes.element;
-        state.scopes = state.scopes.next;
-      }
+    // Data for an open soy tag.
+    function Context(previousContext, tag, scope) {
+      this.previousContext = previousContext;
+      this.tag = tag;
+      this.kind = null;
+      this.scope = scope;
     }
 
     return {
       startState: function() {
         return {
-          kind: [],
-          kindTag: [],
           soyState: [],
           templates: null,
           variables: prepend(null, 'ij'),
           scopes: null,
           indent: 0,
           quoteKind: null,
+          context: null,
           localStates: [{
             mode: modes.html,
             state: CodeMirror.startState(modes.html)
@@ -102,12 +144,10 @@
       copyState: function(state) {
         return {
           tag: state.tag, // Last seen Soy tag.
-          kind: state.kind.concat([]), // Values of kind="" attributes.
-          kindTag: state.kindTag.concat([]), // Opened tags with kind="" attributes.
           soyState: state.soyState.concat([]),
           templates: state.templates,
           variables: state.variables,
-          scopes: state.scopes,
+          context: state.context,
           indent: state.indent, // Indentation of the following line.
           quoteKind: state.quoteKind,
           localStates: state.localStates.map(function(localState) {
@@ -129,7 +169,7 @@
             } else {
               stream.skipToEnd();
             }
-            if (!state.scopes) {
+            if (!state.context || !state.context.scope) {
               var paramRe = /@param\??\s+(\S+)/g;
               var current = stream.current();
               for (var match; (match = paramRe.exec(current)); ) {
@@ -162,7 +202,6 @@
           case "templ-def":
             if (match = stream.match(/^\.?([\w]+(?!\.[\w]+)*)/)) {
               state.templates = prepend(state.templates, match[1]);
-              state.scopes = prepend(state.scopes, state.variables);
               state.soyState.pop();
               return "def";
             }
@@ -229,25 +268,27 @@
             return null;
 
           case "tag":
+            var endTag = state.tag[0] == "/";
+            var tagName = endTag ? state.tag.substring(1) : state.tag;
+            var tag = tags[tagName];
             if (stream.match(/^\/?}/)) {
+              var selfClosed = stream.current() == "/}";
+              if (selfClosed && !endTag) {
+                popcontext(state);
+              }
               if (state.tag == "/template" || state.tag == "/deltemplate") {
-                popscope(state);
                 state.variables = prepend(null, 'ij');
                 state.indent = 0;
               } else {
-                if (state.tag == "/for" || state.tag == "/foreach") {
-                  popscope(state);
-                }
                 state.indent -= config.indentUnit *
-                    (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1);
+                    (selfClosed || indentingTags.indexOf(state.tag) == -1 ? 2 : 1);
               }
               state.soyState.pop();
               return "keyword";
             } else if (stream.match(/^([\w?]+)(?==)/)) {
               if (stream.current() == "kind" && (match = stream.match(/^="([^"]+)/, false))) {
                 var kind = match[1];
-                state.kind.push(kind);
-                state.kindTag.push(state.tag);
+                state.context.kind = kind;
                 var mode = modes[kind] || modes.html;
                 var localState = last(state.localStates);
                 if (localState.mode.indent) {
@@ -296,44 +337,49 @@
         if (stream.match(/^\{literal}/)) {
           state.indent += config.indentUnit;
           state.soyState.push("literal");
+          state.context = new Context(state.context, "literal", state.variables);
           return "keyword";
 
         // A tag-keyword must be followed by whitespace, comment or a closing tag.
         } else if (match = stream.match(/^\{([/@\\]?\w+\??)(?=$|[\s}]|\/[/*])/)) {
-          if (match[1] != "/switch")
-            state.indent += (/^(\/|(else|elseif|ifempty|case|fallbackmsg|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
+          var prevTag = state.tag;
           state.tag = match[1];
-          if (state.tag == "/" + last(state.kindTag)) {
-            // We found the tag that opened the current kind="".
-            state.kind.pop();
-            state.kindTag.pop();
-            state.localStates.pop();
-            var localState = last(state.localStates);
-            if (localState.mode.indent) {
-              state.indent -= localState.mode.indent(localState.state, "", "");
-            }
-          }
+          var endTag = state.tag[0] == "/";
+          var indentingTag = !!tags[state.tag];
+          var tagName = endTag ? state.tag.substring(1) : state.tag;
+          var tag = tags[tagName];
+          if (state.tag != "/switch")
+            state.indent += ((endTag || tag && tag.reduceIndent) && prevTag != "switch" ? 1 : 2) * config.indentUnit;
+
           state.soyState.push("tag");
-          if (state.tag == "template" || state.tag == "deltemplate") {
-            state.soyState.push("templ-def");
-          } else if (state.tag == "call" || state.tag == "delcall") {
-            state.soyState.push("templ-ref");
-          } else if (state.tag == "let") {
-            state.soyState.push("var-def");
-          } else if (state.tag == "for" || state.tag == "foreach") {
-            state.scopes = prepend(state.scopes, state.variables);
-            state.soyState.push("var-def");
-          } else if (state.tag == "namespace") {
-            state.soyState.push("namespace-def");
-            if (!state.scopes) {
-              state.variables = prepend(null, 'ij');
+          var tagError = false;
+          if (tag) {
+            if (!endTag) {
+              if (tag.soyState) state.soyState.push(tag.soyState);
+            }
+            // If a new tag, open a new context.
+            if (!tag.noEndTag && (indentingTag || !endTag)) {
+              state.context = new Context(state.context, state.tag, tag.variableScope ? state.variables : null);
+            // Otherwise close the current context.
+            } else if (endTag) {
+              if (!state.context || state.context.tag != tagName) {
+                tagError = true;
+              } else if (state.context) {
+                if (state.context.kind) {
+                  state.localStates.pop();
+                  var localState = last(state.localStates);
+                  if (localState.mode.indent) {
+                    state.indent -= localState.mode.indent(localState.state, "", "");
+                  }
+                }
+                popcontext(state);
+              }
             }
-          } else if (state.tag.match(/^@(?:param\??|inject|state)/)) {
-            state.soyState.push("param-def");
-          } else if (state.tag.match(/^(?:param)/)) {
-            state.soyState.push("param-ref");
+          } else if (endTag) {
+            // Assume all tags with a closing tag are defined in the config.
+            tagError = true;
           }
-          return "keyword";
+          return (tagError ? "error " : "") + "keyword";
 
         // Not a tag-keyword; it's an implicit print tag.
         } else if (stream.eat('{')) {
@@ -382,8 +428,8 @@
 
   CodeMirror.registerHelper("wordChars", "soy", /[\w$]/);
 
-  CodeMirror.registerHelper("hintWords", "soy", indentingTags.concat(
-      ["delpackage", "namespace", "alias", "print", "css", "debugger"]));
+  CodeMirror.registerHelper("hintWords", "soy", Object.keys(tags).concat(
+      ["css", "debugger"]));
 
   CodeMirror.defineMIME("text/x-soy", "soy");
 });
diff --git a/mode/soy/test.js b/mode/soy/test.js
index f057f4feff..6c1fd8d630 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -161,4 +161,44 @@
   MT('highlight-command-at-eol',
      '[keyword {msg]',
      '    [keyword }]');
+
+  MT('switch-indent-test',
+     '[keyword {let] [def $marbles]: [atom 5] [keyword /}]',
+     '[keyword {switch] [variable-2 $marbles][keyword }]',
+     '  [keyword {case] [atom 0][keyword }]',
+     '    No marbles',
+     '  [keyword {default}]',
+     '    At least 1 marble',
+     '[keyword {/switch}]',
+     '');
+
+  MT('if-elseif-else-indent',
+     '[keyword {if] [atom true][keyword }]',
+     '  [keyword {let] [def $a]: [atom 5] [keyword /}]',
+     '[keyword {elseif] [atom false][keyword }]',
+     '  [keyword {let] [def $bar]: [atom 5] [keyword /}]',
+     '[keyword {else}]',
+     '  [keyword {let] [def $bar]: [atom 5] [keyword /}]',
+     '[keyword {/if}]');
+
+  MT('msg-fallbackmsg-indent',
+     '[keyword {msg] [attribute desc]=[string "A message"][keyword }]',
+     '  A message',
+     '[keyword {fallbackmsg] [attribute desc]=[string "A message"][keyword }]',
+     '  Old message',
+     '[keyword {/msg}]');
+
+  MT('special-chars',
+     '[keyword {sp}]',
+     '[keyword {nil}]',
+     '[keyword {\\r}]',
+     '[keyword {\\n}]',
+     '[keyword {\\t}]',
+     '[keyword {lb}]',
+     '[keyword {rb}]');
+
+  MT('wrong-closing-tag',
+     '[keyword {if] [atom true][keyword }]',
+     '  Optional',
+     '[keyword&error {/badend][keyword }]');
 })();

From a52f1bb9b9d4273b76e6944e549e214bc6b923db Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 6 May 2019 19:02:30 +0400
Subject: [PATCH 4012/4742] [vim] fix repeat for changes made with C-v I

---
 keymap/vim.js    | 25 ++++++++++---------------
 test/vim_test.js | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 5758823867..57117d14ae 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1714,6 +1714,7 @@
         vim.lastEditActionCommand = actionCommand;
         macroModeState.lastInsertModeChanges.changes = [];
         macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
+        macroModeState.lastInsertModeChanges.visualBlock = vim.visualBlock ? vim.sel.head.line - vim.sel.anchor.line : 0;
       }
     };
 
@@ -2092,7 +2093,6 @@
       change: function(cm, args, ranges) {
         var finalHead, text;
         var vim = cm.state.vim;
-        vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
         if (!vim.visualMode) {
           var anchor = ranges[0].anchor,
               head = ranges[0].head;
@@ -2353,6 +2353,8 @@
         } else if (insertAt == 'firstNonBlank') {
           head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
         } else if (insertAt == 'startOfSelectedArea') {
+          if (!vim.visualMode)
+              return;
           if (!vim.visualBlock) {
             if (sel.head.line < sel.anchor.line) {
               head = sel.head;
@@ -2366,6 +2368,8 @@
             height = Math.abs(sel.head.line - sel.anchor.line) + 1;
           }
         } else if (insertAt == 'endOfSelectedArea') {
+            if (!vim.visualMode)
+              return;
           if (!vim.visualBlock) {
             if (sel.head.line >= sel.anchor.line) {
               head = offsetCursor(sel.head, 0, 1);
@@ -2811,12 +2815,6 @@
       }
       return Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
-    function getOffset(anchor, head) {
-      return {
-        line: head.line - anchor.line,
-        ch: head.line - anchor.line
-      };
-    }
     function commandMatches(keys, keyMap, context, inputState) {
       // Partial matches are not applied. They inform the key handler
       // that the current key sequence is a subsequence of a valid key
@@ -5436,18 +5434,15 @@
         return true;
       }
       var head = cm.getCursor('head');
-      var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
-      if (inVisualBlock) {
+      var visualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.visualBlock;
+      if (visualBlock) {
         // Set up block selection again for repeating the changes.
-        var vim = cm.state.vim;
-        var lastSel = vim.lastSelection;
-        var offset = getOffset(lastSel.anchor, lastSel.head);
-        selectForInsert(cm, head, offset.line + 1);
+        selectForInsert(cm, head, visualBlock + 1);
         repeat = cm.listSelections().length;
         cm.setCursor(head);
       }
       for (var i = 0; i < repeat; i++) {
-        if (inVisualBlock) {
+        if (visualBlock) {
           cm.setCursor(offsetCursor(head, i, 0));
         }
         for (var j = 0; j < changes.length; j++) {
@@ -5464,7 +5459,7 @@
           }
         }
       }
-      if (inVisualBlock) {
+      if (visualBlock) {
         cm.setCursor(offsetCursor(head, 0, 1));
       }
     }
diff --git a/test/vim_test.js b/test/vim_test.js
index f38efd0245..5d8740e10a 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1075,6 +1075,28 @@ testVim('c_visual_block_replay', function(cm, vim, helpers) {
   helpers.doKeys('.');
   eq('foo4\nfoo8\nfoodefg', cm.getValue());
 }, {value: '1234\n5678\nabcdefg'});
+testVim('I_visual_block_replay', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('<C-v>', '2', 'j', 'l', 'I');
+  var replacement = fillArray('+-', 3);
+  cm.replaceSelections(replacement);
+  eq('12+-34\n56+-78\nab+-cdefg\nxyz', cm.getValue());
+  helpers.doKeys('<Esc>');
+  // ensure that repeat location doesn't depend on last selection
+  cm.setCursor(3, 2);
+  helpers.doKeys('g', 'v')
+  eq("+-34\n+-78\n+-cd", cm.getSelection())
+  cm.setCursor(0, 3);
+  helpers.doKeys('<C-v>', '1', 'j', '2', 'l');
+  eq("-34\n-78", cm.getSelection());
+  cm.setCursor(0, 0);
+  eq("", cm.getSelection());
+  helpers.doKeys('g', 'v');
+  eq("-34\n-78", cm.getSelection());
+  cm.setCursor(1, 1);
+  helpers.doKeys('.');
+  eq('12+-34\n5+-6+-78\na+-b+-cdefg\nx+-yz', cm.getValue());
+}, {value: '1234\n5678\nabcdefg\nxyz'});
 
 testVim('d_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);

From 65a782b93b1e2897357bbe216a42473e1d8c19c5 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 6 May 2019 19:07:45 +0400
Subject: [PATCH 4013/4742] [vim] add support for ` text object

---
 keymap/vim.js    | 2 +-
 test/vim_test.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 57117d14ae..4844b123d3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2005,7 +2005,7 @@
                              '{': '}', '}': '{',
                              '[': ']', ']': '[',
                              '<': '>', '>': '<'};
-        var selfPaired = {'\'': true, '"': true};
+        var selfPaired = {'\'': true, '"': true, '`': true};
 
         var character = motionArgs.selectedCharacter;
         // 'b' refers to  '()' block.
diff --git a/test/vim_test.js b/test/vim_test.js
index 5d8740e10a..6361e62f45 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1316,6 +1316,10 @@ testEdit('di)_close_spc', 'foo (bAr) baz', /\)/, 'di)', 'foo () baz');
 testEdit('da(_close_spc', 'foo (bAr) baz', /\)/, 'da(', 'foo  baz');
 testEdit('da)_close_spc', 'foo (bAr) baz', /\)/, 'da)', 'foo  baz');
 
+testEdit('di`', 'foo `bAr` baz', /`/, 'di`', 'foo `` baz');
+testEdit('di>', 'foo <bAr> baz', /</, 'di>', 'foo <> baz');
+testEdit('da<', 'foo <bAr> baz', /</, 'da<', 'foo  baz');
+
 //  delete around and inner b.
 testEdit('dab_on_(_should_delete_around_()block', 'o( in(abc) )', /\(a/, 'dab', 'o( in )');
 

From 6acb26b86bfd370a695a31e8ff5a1adf39b44419 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 6 May 2019 19:23:47 +0400
Subject: [PATCH 4014/4742] [vim] do not reset desired column at eof

---
 keymap/vim.js    | 10 ++++++----
 test/vim_test.js |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 4844b123d3..0416c74725 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1845,7 +1845,7 @@
         if (line < first && cur.line == first){
           return this.moveToStartOfLine(cm, head, motionArgs, vim);
         }else if (line > last && cur.line == last){
-            return this.moveToEol(cm, head, motionArgs, vim);
+            return this.moveToEol(cm, head, motionArgs, vim, true);
         }
         if (motionArgs.toFirstChar){
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
@@ -1947,13 +1947,15 @@
         vim.lastHSPos = cm.charCoords(head,'div').left;
         return moveToColumn(cm, repeat);
       },
-      moveToEol: function(cm, head, motionArgs, vim) {
+      moveToEol: function(cm, head, motionArgs, vim, keepHPos) {
         var cur = head;
-        vim.lastHPos = Infinity;
         var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
         var end=cm.clipPos(retval);
         end.ch--;
-        vim.lastHSPos = cm.charCoords(end,'div').left;
+        if (!keepHPos) {
+          vim.lastHPos = Infinity;
+          vim.lastHSPos = cm.charCoords(end,'div').left;
+        }
         return retval;
       },
       moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
diff --git a/test/vim_test.js b/test/vim_test.js
index 6361e62f45..401f5dcaff 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -323,6 +323,8 @@ testMotion('k', 'k', offsetCursor(word3.end, -1, 0), word3.end);
 testMotion('k_repeat', ['2', 'k'], makeCursor(0, 4), makeCursor(2, 4));
 testMotion('k_repeat_clip', ['1000', 'k'], makeCursor(0, 4), makeCursor(2, 4));
 testMotion('w', 'w', word1.start);
+testMotion('keepHPos', ['5', 'j', 'j', '7', 'k'], makeCursor(8, 12), makeCursor(12, 12));
+testMotion('keepHPosEol', ['$', '2', 'j'], makeCursor(2, 18));
 testMotion('w_multiple_newlines_no_space', 'w', makeCursor(12, 2), makeCursor(11, 2));
 testMotion('w_multiple_newlines_with_space', 'w', makeCursor(14, 0), makeCursor(12, 51));
 testMotion('w_repeat', ['2', 'w'], word2.start);

From 908d8399b893ec6dc89cb33abea7e3f8671d9ef8 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 6 May 2019 19:58:22 +0400
Subject: [PATCH 4015/4742] [vim] cleanup old fatCursorMarks after C-v c Esc

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 0416c74725..e51541ee6d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -286,7 +286,8 @@
         enterVimMode(cm);
     }
 
-    function fatCursorMarks(cm) {
+    function updateFatCursorMark(cm) {
+      clearFatCursorMark(cm);
       var ranges = cm.listSelections(), result = []
       for (var i = 0; i < ranges.length; i++) {
         var range = ranges[i]
@@ -302,25 +303,23 @@
           }
         }
       }
-      return result
+      cm.state.fatCursorMarks = result;
     }
 
-    function updateFatCursorMark(cm) {
-      var marks = cm.state.fatCursorMarks
-      if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear()
-      cm.state.fatCursorMarks = fatCursorMarks(cm)
+    function clearFatCursorMark(cm) {
+      var marks = cm.state.fatCursorMarks;
+      if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
+      cm.state.fatCursorMarks = null;
     }
 
     function enableFatCursorMark(cm) {
-      cm.state.fatCursorMarks = fatCursorMarks(cm)
+      updateFatCursorMark(cm)
       cm.on("cursorActivity", updateFatCursorMark)
     }
 
     function disableFatCursorMark(cm) {
-      var marks = cm.state.fatCursorMarks
-      if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear()
-      cm.state.fatCursorMarks = null
-      cm.off("cursorActivity", updateFatCursorMark)
+      clearFatCursorMark(cm);
+      cm.off("cursorActivity", updateFatCursorMark);
     }
 
     // Deprecated, simply setting the keymap works again.

From 8a32a4db1b096c17a8382917e920ea7941d95784 Mon Sep 17 00:00:00 2001
From: Evan Minsk <evanminsk@google.com>
Date: Mon, 6 May 2019 23:12:16 -0700
Subject: [PATCH 4016/4742] [vim] fix @@ to rerun last run macro (#5868)

`vimGlobalState.macroModeState.latestRegister` was only ever updated when defining a macro. This change updates it when running a macro too so that `@@` actually repeats the last macro as it does in vim
---
 keymap/vim.js    | 2 ++
 test/vim_test.js | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/keymap/vim.js b/keymap/vim.js
index e51541ee6d..8a038805a4 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2316,6 +2316,8 @@
         var macroModeState = vimGlobalState.macroModeState;
         if (registerName == '@') {
           registerName = macroModeState.latestRegister;
+        } else {
+          macroModeState.latestRegister = registerName;
         }
         while(repeat--){
           executeMacroRegister(cm, vim, macroModeState, registerName);
diff --git a/test/vim_test.js b/test/vim_test.js
index 401f5dcaff..727daaedc0 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2672,6 +2672,15 @@ testVim('macro_last_ex_command_register', function (cm, vim, helpers) {
   eq('bbbaa', cm.getValue());
   helpers.assertCursorAt(0, 2);
 }, { value: 'aaaaa'});
+testVim('macro_last_run_macro', function (cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', 'C', 'a', '<Esc>', 'q');
+  helpers.doKeys('q', 'b', 'C', 'b', '<Esc>', 'q');
+  helpers.doKeys('@', 'a');
+  helpers.doKeys('d', 'd');
+  helpers.doKeys('@', '@');
+  eq('a', cm.getValue());
+}, { value: ''});
 testVim('macro_parens', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'z', 'i');

From 83c83d19360b0be82efe1fbe360808528fa16e25 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 May 2019 08:14:58 +0200
Subject: [PATCH 4017/4742] [midnight theme] Fix class name for
 cm-matchhighlight

Issue #5866
---
 theme/midnight.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/midnight.css b/theme/midnight.css
index 17ed39c8bc..1de827eba7 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -1,8 +1,8 @@
 /* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
 
 /*<!--match-->*/
-.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
-.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
+.cm-s-midnight span.cm-matchhighlight { background: #494949; }
+.cm-s-midnight.CodeMirror-focused span.cm-matchhighlight { background: #314D67 !important; }
 
 /*<!--activeline-->*/
 .cm-s-midnight .CodeMirror-activeline-background { background: #253540; }

From ff40991e6bad642233f7e9941cc63c697dde1e46 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 May 2019 10:57:13 +0200
Subject: [PATCH 4018/4742] [ruby mode] Require dash or tilde at start of
 heredoc strings

Closes #5871
---
 mode/ruby/ruby.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 5d9288666f..b84dde29e3 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -63,7 +63,7 @@ CodeMirror.defineMode("ruby", function(config) {
     } else if (ch == "#") {
       stream.skipToEnd();
       return "comment";
-    } else if (ch == "<" && (m = stream.match(/^<(-)?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
+    } else if (ch == "<" && (m = stream.match(/^<([-~])[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
       return chain(readHereDoc(m[2], m[1]), stream, state);
     } else if (ch == "0") {
       if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);

From 42f919f09c1865fe5313a6bd8a1ed928630f31bf Mon Sep 17 00:00:00 2001
From: Sasha Varlamov <sasha@sashavarlamov.com>
Date: Tue, 7 May 2019 10:45:11 -0700
Subject: [PATCH 4019/4742] Add EXLskills Live Coding Interviews as real-world
 use case

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

diff --git a/doc/realworld.html b/doc/realworld.html
index b9fad1c601..ae7ff4dad6 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -76,6 +76,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
       <li><a href="http://emmet.io">Emmet</a> (fast XML editing)</li>
       <li><a href="https://github.com/espruino/EspruinoWebIDE">Espruino Web IDE</a> (Chrome App for writing code on Espruino devices)</li>
+      <li><a href="https://exlskills.com/learn-en/talent/interviews">EXLskills Live Interivews</a></li>
       <li><a href="http://www.fastfig.com/">Fastfig</a> (online computation/math tool)</li>
       <li><a href="https://metacpan.org/module/Farabi">Farabi</a> (modern Perl IDE)</li>
       <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>

From dab6f676107c10ba8d16c654a42f66cae3f27db1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 May 2019 10:59:18 +0200
Subject: [PATCH 4020/4742] [midnight theme] Drop custom matchhighlight styles

Issue #5866
---
 theme/midnight.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/theme/midnight.css b/theme/midnight.css
index 1de827eba7..fc26474a4a 100644
--- a/theme/midnight.css
+++ b/theme/midnight.css
@@ -1,9 +1,5 @@
 /* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
 
-/*<!--match-->*/
-.cm-s-midnight span.cm-matchhighlight { background: #494949; }
-.cm-s-midnight.CodeMirror-focused span.cm-matchhighlight { background: #314D67 !important; }
-
 /*<!--activeline-->*/
 .cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
 

From 09eeedcf1b9a11e2f88d4dd7fc839014cca660ff Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 9 May 2019 03:20:18 +0400
Subject: [PATCH 4021/4742] [vim] remove unnecessary uses of replace from vim
 test

---
 test/vim_test.js | 81 ++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 47 deletions(-)

diff --git a/test/vim_test.js b/test/vim_test.js
index 727daaedc0..15c2c81eb9 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1056,21 +1056,18 @@ function fillArray(val, times) {
 testVim('c_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'c');
-  var replacement = fillArray('hello', 3);
-  cm.replaceSelections(replacement);
+  helpers.doKeys('hello');
   eq('1hello\n5hello\nahellofg', cm.getValue());
   helpers.doKeys('<Esc>');
   cm.setCursor(2, 3);
   helpers.doKeys('<C-v>', '2', 'k', 'h', 'C');
-  replacement = fillArray('world', 3);
-  cm.replaceSelections(replacement);
+  helpers.doKeys('world');
   eq('1hworld\n5hworld\nahworld', cm.getValue());
 }, {value: '1234\n5678\nabcdefg'});
 testVim('c_visual_block_replay', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
-  var replacement = fillArray('fo', 3);
-  cm.replaceSelections(replacement);
+  helpers.doKeys('fo');
   eq('1fo4\n5fo8\nafodefg', cm.getValue());
   helpers.doKeys('<Esc>');
   cm.setCursor(0, 0);
@@ -1080,8 +1077,7 @@ testVim('c_visual_block_replay', function(cm, vim, helpers) {
 testVim('I_visual_block_replay', function(cm, vim, helpers) {
   cm.setCursor(0, 2);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'I');
-  var replacement = fillArray('+-', 3);
-  cm.replaceSelections(replacement);
+  helpers.doKeys('+-')
   eq('12+-34\n56+-78\nab+-cdefg\nxyz', cm.getValue());
   helpers.doKeys('<Esc>');
   // ensure that repeat location doesn't depend on last selection
@@ -1114,14 +1110,12 @@ testVim('D_visual_block', function(cm, vim, helpers) {
 testVim('s_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 's');
-  var replacement = fillArray('hello{', 3);
-  cm.replaceSelections(replacement);
+  helpers.doKeys('hello{');
   eq('1hello{\n5hello{\nahello{fg\n', cm.getValue());
   helpers.doKeys('<Esc>');
   cm.setCursor(2, 3);
   helpers.doKeys('<C-v>', '1', 'k', 'h', 'S');
-  replacement = fillArray('world', 1);
-  cm.replaceSelections(replacement);
+  helpers.doKeys('world');
   eq('1hello{\n  world\n', cm.getValue());
 }, {value: '1234\n5678\nabcdefg\n'});
 
@@ -1511,7 +1505,7 @@ testVim('i', function(cm, vim, helpers) {
 });
 testVim('i_repeat', function(cm, vim, helpers) {
   helpers.doKeys('3', 'i');
-  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('test')
   helpers.doKeys('<Esc>');
   eq('testtesttest', cm.getValue());
   helpers.assertCursorAt(0, 11);
@@ -1519,7 +1513,7 @@ testVim('i_repeat', function(cm, vim, helpers) {
 testVim('i_repeat_delete', function(cm, vim, helpers) {
   cm.setCursor(0, 4);
   helpers.doKeys('2', 'i');
-  cm.replaceRange('z', cm.getCursor());
+  helpers.doKeys('z')
   helpers.doInsertModeKeys('Backspace', 'Backspace');
   helpers.doKeys('<Esc>');
   eq('abe', cm.getValue());
@@ -1584,9 +1578,7 @@ testVim('A', function(cm, vim, helpers) {
 testVim('A_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'A');
-  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
-  replacement.pop();
-  cm.replaceSelections(replacement);
+  helpers.doKeys('hello');
   eq('testhello\nmehello\npleahellose', cm.getValue());
   helpers.doKeys('<Esc>');
   cm.setCursor(0, 0);
@@ -1603,7 +1595,7 @@ testVim('I', function(cm, vim, helpers) {
 testVim('I_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('3', 'I');
-  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('test')
   helpers.doKeys('<Esc>');
   eq('testtesttestblah', cm.getValue());
   helpers.assertCursorAt(0, 11);
@@ -1611,9 +1603,7 @@ testVim('I_repeat', function(cm, vim, helpers) {
 testVim('I_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'I');
-  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
-  replacement.pop();
-  cm.replaceSelections(replacement);
+  helpers.doKeys('hello');
   eq('hellotest\nhellome\nhelloplease', cm.getValue());
 }, {value: 'test\nme\nplease'});
 testVim('o', function(cm, vim, helpers) {
@@ -1626,7 +1616,7 @@ testVim('o', function(cm, vim, helpers) {
 testVim('o_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('3', 'o');
-  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('test')
   helpers.doKeys('<Esc>');
   eq('\ntest\ntest\ntest', cm.getValue());
   helpers.assertCursorAt(3, 3);
@@ -1750,8 +1740,8 @@ testVim('r_visual_block', function(cm, vim, helpers) {
   eq('1  l\n5  l\nalllefg', cm.getValue());
   cm.setCursor(2, 0);
   helpers.doKeys('o');
+  helpers.doKeys('\t\t')
   helpers.doKeys('<Esc>');
-  cm.replaceRange('\t\t', cm.getCursor());
   helpers.doKeys('<C-v>', 'h', 'h', 'r', 'r');
   eq('1  l\n5  l\nalllefg\nrrrrrrrr', cm.getValue());
 }, {value: '1234\n5678\nabcdefg'});
@@ -2591,7 +2581,7 @@ testVim('g#', function(cm, vim, helpers) {
 testVim('macro_insert', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'a', '0', 'i');
-  cm.replaceRange('foo', cm.getCursor());
+  helpers.doKeys('foo')
   helpers.doKeys('<Esc>');
   helpers.doKeys('q', '@', 'a');
   eq('foofoo', cm.getValue());
@@ -2599,14 +2589,14 @@ testVim('macro_insert', function(cm, vim, helpers) {
 testVim('macro_insert_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'a', '$', 'a');
-  cm.replaceRange('larry.', cm.getCursor());
+  helpers.doKeys('larry.')
   helpers.doKeys('<Esc>');
   helpers.doKeys('a');
-  cm.replaceRange('curly.', cm.getCursor());
+  helpers.doKeys('curly.')
   helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('a');
-  cm.replaceRange('moe.', cm.getCursor());
+  helpers.doKeys('moe.')
   helpers.doKeys('<Esc>');
   helpers.doKeys('@', 'a');
   // At this point, the most recent edit should be the 2nd insert change
@@ -2684,10 +2674,10 @@ testVim('macro_last_run_macro', function (cm, vim, helpers) {
 testVim('macro_parens', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'z', 'i');
-  cm.replaceRange('(', cm.getCursor());
+  helpers.doKeys('(')
   helpers.doKeys('<Esc>');
   helpers.doKeys('e', 'a');
-  cm.replaceRange(')', cm.getCursor());
+  helpers.doKeys(')')
   helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('w', '@', 'z');
@@ -2697,13 +2687,13 @@ testVim('macro_parens', function(cm, vim, helpers) {
 testVim('macro_overwrite', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'z', '0', 'i');
-  cm.replaceRange('I ', cm.getCursor());
+  helpers.doKeys('I ')
   helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('e');
   // Now replace the macro with something else.
   helpers.doKeys('q', 'z', 'a');
-  cm.replaceRange('.', cm.getCursor());
+  helpers.doKeys('.')
   helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('e', '@', 'z');
@@ -2802,11 +2792,11 @@ testVim('yank_append_word_to_line_register', function(cm, vim, helpers) {
 testVim('macro_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'a', 'i');
-  cm.replaceRange('gangnam', cm.getCursor());
+  helpers.doKeys('gangnam')
   helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   helpers.doKeys('q', 'b', 'o');
-  cm.replaceRange('style', cm.getCursor());
+  helpers.doKeys('style')
   helpers.doKeys('<Esc>');
   helpers.doKeys('q');
   cm.openDialog = helpers.fakeOpenDialog('registers');
@@ -2819,7 +2809,7 @@ testVim('macro_register', function(cm, vim, helpers) {
 testVim('._register', function(cm,vim,helpers) {
   cm.setCursor(0,0);
   helpers.doKeys('i');
-  cm.replaceRange('foo',cm.getCursor());
+  helpers.doKeys('foo')
   helpers.doKeys('<Esc>');
   cm.openDialog = helpers.fakeOpenDialog('registers');
   cm.openNotification = helpers.fakeOpenNotification(function(text) {
@@ -3008,13 +2998,13 @@ testVim('._repeat', function(cm, vim, helpers) {
 }, { value: '1 2 3 4 5 6'});
 testVim('._insert', function(cm, vim, helpers) {
   helpers.doKeys('i');
-  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('test')
   helpers.doKeys('<Esc>');
   helpers.doKeys('.');
   eq('testestt', cm.getValue());
   helpers.assertCursorAt(0, 6);
   helpers.doKeys('O');
-  cm.replaceRange('xyz', cm.getCursor());
+  helpers.doKeys('xyz')
   helpers.doInsertModeKeys('Backspace');
   helpers.doInsertModeKeys('Down');
   helpers.doKeys('<Esc>');
@@ -3024,7 +3014,7 @@ testVim('._insert', function(cm, vim, helpers) {
 }, { value: ''});
 testVim('._insert_repeat', function(cm, vim, helpers) {
   helpers.doKeys('i');
-  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('test')
   cm.setCursor(0, 4);
   helpers.doKeys('<Esc>');
   helpers.doKeys('2', '.');
@@ -3033,7 +3023,7 @@ testVim('._insert_repeat', function(cm, vim, helpers) {
 }, { value: ''});
 testVim('._repeat_insert', function(cm, vim, helpers) {
   helpers.doKeys('3', 'i');
-  cm.replaceRange('te', cm.getCursor());
+  helpers.doKeys('te')
   cm.setCursor(0, 2);
   helpers.doKeys('<Esc>');
   helpers.doKeys('.');
@@ -3042,7 +3032,7 @@ testVim('._repeat_insert', function(cm, vim, helpers) {
 }, { value: ''});
 testVim('._insert_o', function(cm, vim, helpers) {
   helpers.doKeys('o');
-  cm.replaceRange('z', cm.getCursor());
+  helpers.doKeys('z')
   cm.setCursor(1, 1);
   helpers.doKeys('<Esc>');
   helpers.doKeys('.');
@@ -3051,7 +3041,7 @@ testVim('._insert_o', function(cm, vim, helpers) {
 }, { value: ''});
 testVim('._insert_o_repeat', function(cm, vim, helpers) {
   helpers.doKeys('o');
-  cm.replaceRange('z', cm.getCursor());
+  helpers.doKeys('z')
   helpers.doKeys('<Esc>');
   cm.setCursor(1, 0);
   helpers.doKeys('2', '.');
@@ -3060,7 +3050,7 @@ testVim('._insert_o_repeat', function(cm, vim, helpers) {
 }, { value: ''});
 testVim('._insert_o_indent', function(cm, vim, helpers) {
   helpers.doKeys('o');
-  cm.replaceRange('z', cm.getCursor());
+  helpers.doKeys('z')
   helpers.doKeys('<Esc>');
   cm.setCursor(1, 2);
   helpers.doKeys('.');
@@ -3069,7 +3059,7 @@ testVim('._insert_o_indent', function(cm, vim, helpers) {
 }, { value: '{'});
 testVim('._insert_cw', function(cm, vim, helpers) {
   helpers.doKeys('c', 'w');
-  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('test')
   helpers.doKeys('<Esc>');
   cm.setCursor(0, 3);
   helpers.doKeys('2', 'l');
@@ -3081,7 +3071,7 @@ testVim('._insert_cw_repeat', function(cm, vim, helpers) {
   // For some reason, repeat cw in desktop VIM will does not repeat insert mode
   // changes. Will conform to that behavior.
   helpers.doKeys('c', 'w');
-  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('test');
   helpers.doKeys('<Esc>');
   cm.setCursor(0, 4);
   helpers.doKeys('l');
@@ -4350,10 +4340,7 @@ testVim('ex_imap', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   CodeMirror.Vim.map('jj', '<Esc>', 'insert');
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
-  var replacement = fillArray('f', 3);
-  cm.replaceSelections(replacement);
-  var replacement = fillArray('o', 3);
-  cm.replaceSelections(replacement);
+  helpers.doKeys('f', 'o');
   eq('1fo4\n5fo8\nafodefg', cm.getValue());
   helpers.doKeys('j', 'j');
   cm.setCursor(0, 0);

From 6974e1a4717b261d02e7db5f55f2b736a8112b06 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 9 May 2019 03:22:10 +0400
Subject: [PATCH 4022/4742] [vim] fix broken option tests

---
 test/vim_test.js | 65 ++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/test/vim_test.js b/test/vim_test.js
index 15c2c81eb9..9069bb9e68 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -105,6 +105,15 @@ function forEach(arr, func) {
   }
 }
 
+function expectFail(fn) {
+    try {
+        fn();
+    } catch(expected) {
+        return;
+    };
+    throw new Error("Expected to throw an error");
+}
+
 function testVim(name, run, opts, expectedFail) {
   var vimOpts = {
     lineNumbers: true,
@@ -4068,11 +4077,9 @@ testVim('set_boolean', function(cm, vim, helpers) {
   CodeMirror.Vim.defineOption('testoption', true, 'boolean');
   // Test default value is set.
   is(CodeMirror.Vim.getOption('testoption'));
-  try {
-    // Test fail to set to non-boolean
-    CodeMirror.Vim.setOption('testoption', '5');
-    fail();
-  } catch (expected) {}
+  // Test fail to set to non-boolean
+  var result = CodeMirror.Vim.setOption('testoption', '5');
+  is(result instanceof Error);
   // Test setOption
   CodeMirror.Vim.setOption('testoption', false);
   is(!CodeMirror.Vim.getOption('testoption'));
@@ -4081,11 +4088,10 @@ testVim('ex_set_boolean', function(cm, vim, helpers) {
   CodeMirror.Vim.defineOption('testoption', true, 'boolean');
   // Test default value is set.
   is(CodeMirror.Vim.getOption('testoption'));
-  try {
-    // Test fail to set to non-boolean
-    helpers.doEx('set testoption=22');
-    fail();
-  } catch (expected) {}
+  is(!cm.state.currentNotificationClose);
+  // Test fail to set to non-boolean
+  helpers.doEx('set testoption=22');
+  is(cm.state.currentNotificationClose);
   // Test setOption
   helpers.doEx('set notestoption');
   is(!CodeMirror.Vim.getOption('testoption'));
@@ -4094,16 +4100,12 @@ testVim('set_string', function(cm, vim, helpers) {
   CodeMirror.Vim.defineOption('testoption', 'a', 'string');
   // Test default value is set.
   eq('a', CodeMirror.Vim.getOption('testoption'));
-  try {
-    // Test fail to set non-string.
-    CodeMirror.Vim.setOption('testoption', true);
-    fail();
-  } catch (expected) {}
-  try {
-    // Test fail to set 'notestoption'
-    CodeMirror.Vim.setOption('notestoption', 'b');
-    fail();
-  } catch (expected) {}
+  // Test no fail to set non-string.
+  var result = CodeMirror.Vim.setOption('testoption', true);
+  is(!result);
+  // Test fail to set 'notestoption'
+  result = CodeMirror.Vim.setOption('notestoption', 'b');
+  is(result instanceof Error);
   // Test setOption
   CodeMirror.Vim.setOption('testoption', 'c');
   eq('c', CodeMirror.Vim.getOption('testoption'));
@@ -4112,11 +4114,10 @@ testVim('ex_set_string', function(cm, vim, helpers) {
   CodeMirror.Vim.defineOption('testopt', 'a', 'string');
   // Test default value is set.
   eq('a', CodeMirror.Vim.getOption('testopt'));
-  try {
-    // Test fail to set 'notestopt'
-    helpers.doEx('set notestopt=b');
-    fail();
-  } catch (expected) {}
+  // Test fail to set 'notestopt'
+  is(!cm.state.currentNotificationClose);
+  helpers.doEx('set notestopt=b');
+  is(cm.state.currentNotificationClose);
   // Test setOption
   helpers.doEx('set testopt=c')
   eq('c', CodeMirror.Vim.getOption('testopt'));
@@ -4162,11 +4163,10 @@ testVim('ex_set_callback', function(cm, vim, helpers) {
   CodeMirror.Vim.defineOption('testopt', 'a', 'string', cb);
   // Test default value is set.
   eq('a', CodeMirror.Vim.getOption('testopt'));
-  try {
-    // Test fail to set 'notestopt'
-    helpers.doEx('set notestopt=b');
-    fail();
-  } catch (expected) {}
+  // Test fail to set 'notestopt'
+  is(!cm.state.currentNotificationClose);
+  helpers.doEx('set notestopt=b');
+  is(cm.state.currentNotificationClose);
   // 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
@@ -4256,10 +4256,9 @@ testVim('ex_unmap_key2key', function(cm, vim, helpers) {
   CodeMirror.Vim.mapclear();
 }, { value: 'abc' });
 testVim('ex_unmap_key2key_does_not_remove_default', function(cm, vim, helpers) {
-  try {
+  expectFail(function() {
     helpers.doEx('unmap a');
-    fail();
-  } catch (expected) {}
+  });
   helpers.doKeys('a');
   eq('vim-insert', cm.getOption('keyMap'));
   CodeMirror.Vim.mapclear();

From 1b3c322c434a61bd326d2b25722597138e649521 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 9 May 2019 03:32:49 +0400
Subject: [PATCH 4023/4742] [vim] fix fat cursor staying after O

---
 keymap/vim.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8a038805a4..988c1681e5 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -287,6 +287,7 @@
     }
 
     function updateFatCursorMark(cm) {
+      if (!cm.state.fatCursorMarks) return;
       clearFatCursorMark(cm);
       var ranges = cm.listSelections(), result = []
       for (var i = 0; i < ranges.length; i++) {
@@ -309,10 +310,10 @@
     function clearFatCursorMark(cm) {
       var marks = cm.state.fatCursorMarks;
       if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
-      cm.state.fatCursorMarks = null;
     }
 
     function enableFatCursorMark(cm) {
+      cm.state.fatCursorMarks = [];
       updateFatCursorMark(cm)
       cm.on("cursorActivity", updateFatCursorMark)
     }
@@ -320,6 +321,9 @@
     function disableFatCursorMark(cm) {
       clearFatCursorMark(cm);
       cm.off("cursorActivity", updateFatCursorMark);
+      // explicitly set fatCursorMarks to null because event listener above
+      // can be invoke after removing it, if off is called from operation
+      cm.state.fatCursorMarks = null;
     }
 
     // Deprecated, simply setting the keymap works again.

From a86e85864c7d8da4cc4d103183de6d5c9a2d8707 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 14 May 2019 14:18:39 +0400
Subject: [PATCH 4024/4742] [vim] fix blockwise yank

---
 keymap/vim.js    | 18 +++++++++++-------
 test/vim_test.js | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 988c1681e5..f8ffb88f40 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2570,7 +2570,17 @@
         }
         var linewise = register.linewise;
         var blockwise = register.blockwise;
-        if (linewise) {
+        if (blockwise) {
+          text = text.split('\n');
+          if (linewise) {
+              text.pop();
+          }
+          for (var i = 0; i < text.length; i++) {
+            text[i] = (text[i] == '') ? ' ' : text[i];
+          }
+          cur.ch += actionArgs.after ? 1 : 0;
+          cur.ch = Math.min(lineLength(cm, cur.line), cur.ch);
+        } else if (linewise) {
           if(vim.visualMode) {
             text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
           } else if (actionArgs.after) {
@@ -2582,12 +2592,6 @@
             cur.ch = 0;
           }
         } else {
-          if (blockwise) {
-            text = text.split('\n');
-            for (var i = 0; i < text.length; i++) {
-              text[i] = (text[i] == '') ? ' ' : text[i];
-            }
-          }
           cur.ch += actionArgs.after ? 1 : 0;
         }
         var curPosFinal;
diff --git a/test/vim_test.js b/test/vim_test.js
index 9069bb9e68..e74b2f2cad 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1428,6 +1428,21 @@ testVim('Y', function(cm, vim, helpers) {
   is(register.linewise);
   helpers.assertCursorAt(0, 3);
 }, { value: ' word1\nword2\n word3' });
+testVim('Yy_blockwise', function(cm, vim, helpers) {
+  helpers.doKeys('<C-v>', 'j', '2', 'l', 'Y');
+  helpers.doKeys('G', 'p', 'g', 'g');
+  helpers.doKeys('<C-v>', 'j', '2', 'l', 'y');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('$', 'p');
+  eq('123456123\n123456123\n123456\n123456', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('123\n123', register.toString());
+  is(register.blockwise);
+  helpers.assertCursorAt(0, 6);
+  helpers.doKeys('$', 'j', 'p');
+  helpers.doKeys('$', 'j', 'P');
+  eq("123456123\n123456123123\n123456   121233\n123456     123", cm.getValue());
+}, { value: '123456\n123456\n' });
 testVim('~', function(cm, vim, helpers) {
   helpers.doKeys('3', '~');
   eq('ABCdefg', cm.getValue());

From 17f48fb56b8c444b8943d9e586110a8a037079bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 15 May 2019 14:11:09 +0200
Subject: [PATCH 4025/4742] [ruby mode] Fix matching of closing brackets during
 indentation

Closes #5881
---
 mode/ruby/ruby.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index b84dde29e3..dd0e603e51 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -28,7 +28,8 @@ CodeMirror.defineMode("ruby", function(config) {
   var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
                              "catch", "loop", "proc", "begin"]);
   var dedentWords = wordObj(["end", "until"]);
-  var matching = {"[": "]", "{": "}", "(": ")"};
+  var opening = {"[": "]", "{": "}", "(": ")"};
+  var closing = {"]": "[", "}": "{", ")": "("};
   var curPunc;
 
   function chain(newtok, stream, state) {
@@ -58,7 +59,7 @@ CodeMirror.defineMode("ruby", function(config) {
       else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; }
       var delim = stream.eat(/[^\w\s=]/);
       if (!delim) return "operator";
-      if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
+      if (opening.propertyIsEnumerable(delim)) delim = opening[delim];
       return chain(readQuoted(delim, style, embed, true), stream, state);
     } else if (ch == "#") {
       stream.skipToEnd();
@@ -280,9 +281,9 @@ CodeMirror.defineMode("ruby", function(config) {
       if (state.tokenize[state.tokenize.length-1] != tokenBase) return CodeMirror.Pass;
       var firstChar = textAfter && textAfter.charAt(0);
       var ct = state.context;
-      var closing = ct.type == matching[firstChar] ||
+      var closed = ct.type == closing[firstChar] ||
         ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter);
-      return ct.indented + (closing ? 0 : config.indentUnit) +
+      return ct.indented + (closed ? 0 : config.indentUnit) +
         (state.continuedLine ? config.indentUnit : 0);
     },
 

From 3094f2c86a758eb5ef6570cfaa31ca44a6ff6243 Mon Sep 17 00:00:00 2001
From: Diego Fernandez <aiguo.fernandez@gmail.com>
Date: Wed, 15 May 2019 17:27:37 -0600
Subject: [PATCH 4026/4742] [emacs] Add "redo" keybinding in Emacs keymap

Since "redo" is generally assigned to Ctrl+Y, we lose this binding
when using the Emacs keymap. The Emacs default for "redo" is a bit
complicated, but since we're using Ctrl-Z for "undo", it makes sense
to have Ctrl+Shift-Z for "redo".
---
 keymap/emacs.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index d96a6fbec9..fe62d44fb1 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -369,6 +369,7 @@
 
     "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
     "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
+    "Shift-Ctrl-Z": "redo",
     "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
     "Ctrl-S": "findPersistentNext", "Ctrl-R": "findPersistentPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
     "Alt-/": "autocomplete",

From a7ce80ffc2f1a04b61782473170de776eb68728c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 21 May 2019 10:15:18 +0200
Subject: [PATCH 4027/4742] Mark version 5.47.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 14 ++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 0e4c895d3c..f61c7c5bc0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -197,9 +197,11 @@ David Vázquez
 David Whittington
 deebugger
 Deep Thought
+Denis Ovsienko
 Devin Abbott
 Devon Carew
 Dick Choi
+Diego Fernandez
 dignifiedquire
 Dimage Sapelkin
 dmaclach
@@ -227,6 +229,7 @@ Eric Bogard
 Erik Demaine
 Erik Welander
 eustas
+Evan Minsk
 Fabien Dubosson
 Fabien O'Carroll
 Fabio Zendhi Nagao
@@ -505,6 +508,7 @@ Maximilian Hils
 Maxim Kraev
 Max Kirsch
 Max Schaefer
+Max Wu
 Max Xiantu
 mbarkhau
 McBrainy
@@ -580,6 +584,7 @@ Nisarg Jhaveri
 nlwillia
 noragrossman
 Norman Rzepka
+Nouzbe
 Oleksandr Yakovenko
 opl-
 Oreoluwa Onatemowo
@@ -667,6 +672,7 @@ Sander Verweij
 santec
 Sarah McAlear and Wenlin Zhang
 Sascha Peilicke
+Sasha Varlamov
 satamas
 satchmorun
 sathyamoorthi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6e6068f4e..d8c523c7e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 5.47.0 (2019-05-21)
+
+### Bug fixes
+
+[python mode](https://codemirror.net/mode/python/): Properly handle `...` syntax.
+
+[ruby mode](https://codemirror.net/mode/ruby): Fix indenting before closing brackets.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Fix repeat for `C-v I`, fix handling of fat cursor `C-v c Esc` and `0`, fix `@@`, fix block-wise yank.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Add support for `` ` `` text object.
+
 ## 5.46.0 (2019-04-22)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 37fef13f49..abcb1e29e1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.46.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.47.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 6ecaef0e1b..0066778ecf 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-05-2019: <a href="https://codemirror.net/codemirror-5.47.0.zip">Version 5.47.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Properly handle <code>...</code> syntax.</li>
+    <li><a href="https://codemirror.net/mode/ruby">ruby mode</a>: Fix indenting before closing brackets.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix repeat for <code>C-v I</code>, fix handling of fat cursor <code>C-v c Esc</code> and <code>0</code>, fix <code>@@</code>, fix block-wise yank.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add support for <code>`</code> text object.</li>
+  </ul>
+
   <p class="rel">22-04-2019: <a href="https://codemirror.net/codemirror-5.46.0.zip">Version 5.46.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 4e4f16404d..2c68263882 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.46.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.47.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 69f5d346e3..86aa4861b4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.46.1",
+  "version": "5.47.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index be98c68218..615372b118 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.46.1"
+CodeMirror.version = "5.47.0"

From 5c12351a3a888cf7ea03a268e3cc7f9b76e5627a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 21 May 2019 10:21:12 +0200
Subject: [PATCH 4028/4742] Bump version number post-5.47.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index abcb1e29e1..28030d5b1e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.47.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.47.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 86aa4861b4..11bf115a4c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.47.0",
+  "version": "5.47.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 615372b118..aa1fd89e5b 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.47.0"
+CodeMirror.version = "5.47.1"

From 48561a645790097280a894b8e5bd1ab05a5c30db Mon Sep 17 00:00:00 2001
From: Bruno Logerfo <bclogerfo@hotmail.com>
Date: Mon, 27 May 2019 03:02:56 -0300
Subject: [PATCH 4029/4742] [mode metadata] Add "cs" as alias for C#

Other places like discord, github and gitlab supports this.
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index ef0a26a26b..0810181534 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -20,7 +20,7 @@
     {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
-    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
+    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp", "cs"]},
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
     {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
     {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},

From db1d66c2d2aae8f7c43935a34fe950c9b3e54abd Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Wed, 29 May 2019 06:45:15 -0400
Subject: [PATCH 4030/4742] [merge addon] Fix typo in hasMarker()

This was causing exceptions to be thrown when using custom
markers.
---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 63373f75ed..8296540a05 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -918,7 +918,7 @@
     hasMarker: function(n) {
       var handle = this.cm.getLineHandle(n)
       if (handle.markedSpans) for (var i = 0; i < handle.markedSpans.length; i++)
-        if (handle.markedSpans[i].mark.collapsed && handle.markedSpans[i].to != null)
+        if (handle.markedSpans[i].marker.collapsed && handle.markedSpans[i].to != null)
           return true
       return false
     },

From 8aa23d7bfecfce390b05fd622dab2fb3ca89a1a1 Mon Sep 17 00:00:00 2001
From: Maksym Taran <mtaran@google.com>
Date: Wed, 5 Jun 2019 18:35:54 -0700
Subject: [PATCH 4031/4742] Add U+FFFC as a default replaced special character

---
 doc/manual.html     | 2 +-
 src/edit/options.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 28030d5b1e..a0a8806240 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -284,7 +284,7 @@ <h2>Configuration</h2>
       should be replaced by a
       special <a href="#option_specialCharPlaceholder">placeholder</a>.
       Mostly useful for non-printing special characters. The default
-      is <code>/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/</code>.</dd>
+      is <code>/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufffc]/</code>.</dd>
       <dt id="option_specialCharPlaceholder"><code><strong>specialCharPlaceholder</strong>: function(char) → Element</code></dt>
       <dd>A function that, given a special character identified by
       the <a href="#option_specialChars"><code>specialChars</code></a>
diff --git a/src/edit/options.js b/src/edit/options.js
index ccca45dd3c..9687a36760 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -68,7 +68,7 @@ export function defineOptions(CodeMirror) {
     for (let i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   })
-  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff]/g, (cm, val, old) => {
+  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufffc]/g, (cm, val, old) => {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
     if (old != Init) cm.refresh()
   })

From 58df15001685683f13a5f8cfb069c84c5e1afa0c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 7 Jun 2019 09:24:35 +0200
Subject: [PATCH 4032/4742] Also add u+fff9-u+fffb as special characters

Browser don't display anything for them either

Issue #5900
---
 doc/manual.html     | 2 +-
 src/edit/options.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index a0a8806240..a2e5f40e49 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -284,7 +284,7 @@ <h2>Configuration</h2>
       should be replaced by a
       special <a href="#option_specialCharPlaceholder">placeholder</a>.
       Mostly useful for non-printing special characters. The default
-      is <code>/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufffc]/</code>.</dd>
+      is <code>/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/</code>.</dd>
       <dt id="option_specialCharPlaceholder"><code><strong>specialCharPlaceholder</strong>: function(char) → Element</code></dt>
       <dd>A function that, given a special character identified by
       the <a href="#option_specialChars"><code>specialChars</code></a>
diff --git a/src/edit/options.js b/src/edit/options.js
index 9687a36760..3abd3c3c1e 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -68,7 +68,7 @@ export function defineOptions(CodeMirror) {
     for (let i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   })
-  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufffc]/g, (cm, val, old) => {
+  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, (cm, val, old) => {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
     if (old != Init) cm.refresh()
   })

From e31bc36a02c27d1f92a82aaa73c17bd4e0de55fa Mon Sep 17 00:00:00 2001
From: Duncan Lilley <dklilley95@gmail.com>
Date: Sun, 9 Jun 2019 04:50:33 -0400
Subject: [PATCH 4033/4742] [clike mode] Remove 'float' as Java keyword

---
 mode/clike/clike.js |  2 +-
 mode/clike/test.js  | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 1af35d7b05..4c8b9937d6 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -467,7 +467,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   def("text/x-java", {
     name: "clike",
     keywords: words("abstract assert break case catch class const continue default " +
-                    "do else enum extends final finally float for goto if implements import " +
+                    "do else enum extends final finally for goto if implements import " +
                     "instanceof interface native new package private protected public " +
                     "return static strictfp super switch synchronized this throw throws transient " +
                     "try volatile while @interface"),
diff --git a/mode/clike/test.js b/mode/clike/test.js
index 6cb7605ef0..9441b95956 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -136,4 +136,30 @@
      "[comment ///// let / me / show / you /////]",
      "[comment */]");
 
+  var mode_java = CodeMirror.getMode({indentUnit: 2}, "text/x-java");
+  function MTJAVA(name) { test.mode("java_" + name, mode_java, Array.prototype.slice.call(arguments, 1)); }
+  MTJAVA("types",
+         "[type byte];",
+         "[type short];",
+         "[type int];",
+         "[type long];",
+         "[type float];",
+         "[type double];",
+         "[type boolean];",
+         "[type char];",
+         "[type void];",
+         "[type Boolean];",
+         "[type Byte];",
+         "[type Character];",
+         "[type Double];",
+         "[type Float];",
+         "[type Integer];",
+         "[type Long];",
+         "[type Number];",
+         "[type Object];",
+         "[type Short];",
+         "[type String];",
+         "[type StringBuffer];",
+         "[type StringBuilder];",
+         "[type Void];");
 })();

From 7886f7f306c36b8c9be4692a06587f7d5347acb4 Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Tue, 11 Jun 2019 11:05:07 -0700
Subject: [PATCH 4034/4742] [mode metadata[ Add meta entry for PostgreSQ

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

diff --git a/mode/meta.js b/mode/meta.js
index 0810181534..95d473100d 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -105,6 +105,7 @@
     {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
+    {name: "PostgreSQL", mime: "text/x-pgsql", mode: "sql"},
     {name: "PowerShell", mime: "application/x-powershell", mode: "powershell", ext: ["ps1", "psd1", "psm1"]},
     {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
     {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},

From 7978b40b4bcf6d5f3f331fd220d1eb1627181573 Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <pyro777@gmail.com>
Date: Tue, 11 Jun 2019 11:33:06 -0700
Subject: [PATCH 4035/4742] Add selectLeft/selectRight marker options

---
 doc/manual.html                | 16 ++++++--
 src/model/selection_updates.js | 15 +++++--
 test/test.js                   | 72 ++++++++++++++++++++++++++++++++--
 3 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index a2e5f40e49..9f9fbc5ec0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1674,13 +1674,21 @@ <h3 id="api_marker">Text-marking methods</h3>
         <dt id="mark_inclusiveRight"><code><strong>inclusiveRight</strong>: boolean</code></dt>
         <dd>Like <code>inclusiveLeft</code>,
         but for the right side.</dd>
+        <dt id="mark_selectLeft"><code><strong>selectLeft</strong>: boolean</code></dt>
+        <dd>For atomic ranges, determines whether the cursor is allowed
+        to be placed directly to the left of the range. Has no effect on
+        non-atomic ranges.</dd>
+        <dt id="mark_selectRight"><code><strong>selectRight</strong>: boolean</code></dt>
+        <dd>Like <code>selectLeft</code>,
+        but for the right side.</dd>
         <dt id="mark_atomic"><code><strong>atomic</strong>: boolean</code></dt>
         <dd>Atomic ranges act as a single unit when cursor movement is
         concerned—i.e. it is impossible to place the cursor inside of
-        them. In atomic ranges, <code>inclusiveLeft</code>
-        and <code>inclusiveRight</code> have a different meaning—they
-        will prevent the cursor from being placed respectively
-        directly before and directly after the range.</dd>
+        them. You can control whether the cursor is allowed to be placed
+        directly before or after them using <code>selectLeft</code>
+        or <code>selectRight</code>. If <code>selectLeft</code>
+        (or right) is not provided, then <code>inclusiveLeft</code> (or
+        right) will control this behavior.</dd>
         <dt id="mark_collapsed"><code><strong>collapsed</strong>: boolean</code></dt>
         <dd>Collapsed ranges do not show up in the display. Setting a
         range to be collapsed will automatically make it atomic.</dd>
diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index c9941b71d3..4db2bd7f5b 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -150,8 +150,15 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
   let line = getLine(doc, pos.line)
   if (line.markedSpans) for (let i = 0; i < line.markedSpans.length; ++i) {
     let sp = line.markedSpans[i], m = sp.marker
-    if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
-        (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+
+    // Determine if we should prevent the cursor being placed to the left/right of an atomic marker
+    // Historically this was determined using the inclusiveLeft/Right option, but the new way to control it
+    // is with selectLeft/Right
+    let preventCursorLeft = ("selectLeft" in m) ? !m.selectLeft : m.inclusiveLeft
+    let preventCursorRight = ("selectRight" in m) ? !m.selectRight : m.inclusiveRight
+
+    if ((sp.from == null || (preventCursorLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+        (sp.to == null || (preventCursorRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
       if (mayClear) {
         signal(m, "beforeCursorEnter")
         if (m.explicitlyCleared) {
@@ -163,14 +170,14 @@ function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
 
       if (oldPos) {
         let near = m.find(dir < 0 ? 1 : -1), diff
-        if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+        if (dir < 0 ? preventCursorRight : preventCursorLeft)
           near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null)
         if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
           return skipAtomicInner(doc, near, pos, dir, mayClear)
       }
 
       let far = m.find(dir < 0 ? -1 : 1)
-      if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+      if (dir < 0 ? preventCursorLeft : preventCursorRight)
         far = movePos(doc, far, dir, far.line == pos.line ? line : null)
       return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null
     }
diff --git a/test/test.js b/test/test.js
index f26d01aa9c..846d94e8a9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1808,10 +1808,21 @@ testCM("addLineClass", function(cm) {
 
 testCM("atomicMarker", function(cm) {
   addDoc(cm, 10, 10);
-  function atom(ll, cl, lr, cr, li, ri) {
-    return cm.markText(Pos(ll, cl), Pos(lr, cr),
-                       {atomic: true, inclusiveLeft: li, inclusiveRight: ri});
+
+  function atom(ll, cl, lr, cr, li, ri, ls, rs) {
+    var options = {
+      atomic: true,
+      inclusiveLeft: li,
+      inclusiveRight: ri
+    };
+
+    if (ls === true || ls === false) options["selectLeft"] = ls;
+    if (rs === true || rs === false) options["selectRight"] = rs;
+
+    return cm.markText(Pos(ll, cl), Pos(lr, cr), options);
   }
+
+  // Can cursor to the left and right of a normal marker by jumping across it
   var m = atom(0, 1, 0, 5);
   cm.setCursor(Pos(0, 1));
   cm.execCommand("goCharRight");
@@ -1819,11 +1830,55 @@ testCM("atomicMarker", function(cm) {
   cm.execCommand("goCharLeft");
   eqCursorPos(cm.getCursor(), Pos(0, 1));
   m.clear();
+
+  // Can't cursor to the left of a marker when inclusiveLeft=true
   m = atom(0, 0, 0, 5, true);
   eqCursorPos(cm.getCursor(), Pos(0, 5), "pushed out");
   cm.execCommand("goCharLeft");
   eqCursorPos(cm.getCursor(), Pos(0, 5));
   m.clear();
+
+  // Can't cursor to the left of a marker when inclusiveLeft=false and selectLeft=false
+  m = atom(0, 0, 0, 5, false, false, false);
+  cm.setCursor(Pos(0, 5));
+  eqCursorPos(cm.getCursor(), Pos(0, 5), "pushed out");
+  cm.execCommand("goCharLeft");
+  eqCursorPos(cm.getCursor(), Pos(0, 5));
+  m.clear();
+
+  // Can cursor to the left of a marker when inclusiveLeft=false and selectLeft=True
+  m = atom(0, 0, 0, 5, false, false, true);
+  cm.setCursor(Pos(0, 5));
+  eqCursorPos(cm.getCursor(), Pos(0, 5), "pushed out");
+  cm.execCommand("goCharLeft");
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
+  m.clear();
+
+  // Can't cursor to the right of a marker when inclusiveRight=true
+  m = atom(0, 0, 0, 5, false, true);
+  cm.setCursor(Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goCharRight");
+  eqCursorPos(cm.getCursor(), Pos(0, 6));
+  m.clear();
+
+  // Can't cursor to the right of a marker when inclusiveRight=false and selectRight=false
+  m = atom(0, 0, 0, 5, false, false, true, false);
+  cm.setCursor(Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goCharRight");
+  eqCursorPos(cm.getCursor(), Pos(0, 6));
+  m.clear();
+
+  // Can cursor to the right of a marker when inclusiveRight=false and selectRight=True
+  m = atom(0, 0, 0, 5, false, false, true, true);
+  cm.setCursor(Pos(0, 0));
+  eqCursorPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goCharRight");
+  eqCursorPos(cm.getCursor(), Pos(0, 5));
+  m.clear();
+
+  // Can't cursor to the right of a multiline marker when inclusiveRight=true
   m = atom(8, 4, 9, 10, false, true);
   cm.setCursor(Pos(9, 8));
   eqCursorPos(cm.getCursor(), Pos(8, 4), "set");
@@ -1834,6 +1889,9 @@ testCM("atomicMarker", function(cm) {
   cm.execCommand("goCharLeft");
   eqCursorPos(cm.getCursor(), Pos(8, 3, "after"));
   m.clear();
+
+  // Cursor jumps across a multiline atomic marker,
+  // and backspace deletes the entire marker
   m = atom(1, 1, 3, 8);
   cm.setCursor(Pos(0, 0));
   cm.setCursor(Pos(2, 0));
@@ -1848,10 +1906,16 @@ testCM("atomicMarker", function(cm) {
   eqCursorPos(cm.getCursor(), Pos(3, 8));
   cm.execCommand("delCharBefore");
   eq(cm.getValue().length, 80, "del chunk");
+  m.clear();
+  addDoc(cm, 10, 10);
+
+  // Delete before an atomic marker deletes the entire marker
   m = atom(3, 0, 5, 5);
   cm.setCursor(Pos(3, 0));
   cm.execCommand("delWordAfter");
-  eq(cm.getValue().length, 53, "del chunk");
+  eq(cm.getValue().length, 82, "del chunk");
+  m.clear();
+  addDoc(cm, 10, 10);
 });
 
 testCM("selectionBias", function(cm) {

From a423203c12f8f29e14050635659e124f3280001f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 13 Jun 2019 12:04:05 +0200
Subject: [PATCH 4036/4742] [groovy mode] Add comment metadata

Closes #5906
---
 mode/groovy/groovy.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index b76a03fa12..2b90d01c43 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -221,7 +221,10 @@ CodeMirror.defineMode("groovy", function(config) {
 
     electricChars: "{}",
     closeBrackets: {triples: "'\""},
-    fold: "brace"
+    fold: "brace",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 

From 3446b793c9f25cf3f804795c53ca87023815c9dc Mon Sep 17 00:00:00 2001
From: kcwiakala <konrad.cwiakala@gmail.com>
Date: Sun, 16 Jun 2019 09:33:36 +0200
Subject: [PATCH 4037/4742] [real-world uses] Add LiveUML

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

diff --git a/doc/realworld.html b/doc/realworld.html
index ae7ff4dad6..750cccc487 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -119,6 +119,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://try.kotlinlang.org">Kotlin</a> (web-based mini-IDE for Kotlin)</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>
+      <li><a href="https://liveuml.com/">LiveUML</a> (PlantUML online editor)</li>
       <li><a href="https://github.com/TuvaLabs/markdown-delight-editor">Markdown Delight Editor</a> (extensible markdown editor polymer component)</li>
       <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>
       <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>

From 5294bf13493296078ee7474d53ccb2f7b1a2f54a Mon Sep 17 00:00:00 2001
From: Erik Welander <erik@welander.us>
Date: Fri, 14 Jun 2019 16:32:30 -0700
Subject: [PATCH 4038/4742] [vim] throttle highlightSearchMatches

This should prevent it from falling behind trying to highlight previous queries while you're typing.
---
 keymap/vim.js | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index f8ffb88f40..3be7a3f46b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4229,23 +4229,27 @@
         query: query
       };
     }
+    var highlightTimeout = 0;
     function highlightSearchMatches(cm, query) {
-      var searchState = getSearchState(cm);
-      var overlay = searchState.getOverlay();
-      if (!overlay || query != overlay.query) {
-        if (overlay) {
-          cm.removeOverlay(overlay);
-        }
-        overlay = searchOverlay(query);
-        cm.addOverlay(overlay);
-        if (cm.showMatchesOnScrollbar) {
-          if (searchState.getScrollbarAnnotate()) {
-            searchState.getScrollbarAnnotate().clear();
+      clearTimeout(highlightTimeout);
+      highlightTimeout = setTimeout(function() {
+        var searchState = getSearchState(cm);
+        var overlay = searchState.getOverlay();
+        if (!overlay || query != overlay.query) {
+          if (overlay) {
+            cm.removeOverlay(overlay);
+          }
+          overlay = searchOverlay(query);
+          cm.addOverlay(overlay);
+          if (cm.showMatchesOnScrollbar) {
+            if (searchState.getScrollbarAnnotate()) {
+              searchState.getScrollbarAnnotate().clear();
+            }
+            searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
           }
-          searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
+          searchState.setOverlay(overlay);
         }
-        searchState.setOverlay(overlay);
-      }
+      }, 50);
     }
     function findNext(cm, prev, query, repeat) {
       if (repeat === undefined) { repeat = 1; }

From 11786d27895092a6f4b34c2074635faec32d853b Mon Sep 17 00:00:00 2001
From: Erik Welander <ewelander@google.com>
Date: Mon, 17 Jun 2019 14:59:32 -0700
Subject: [PATCH 4039/4742] [hint addon] Handle scrolling containers

---
 addon/hint/show-hint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 0172cc8e7e..d70b2ab173 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -239,8 +239,8 @@
       var offsetParent = isContainerPositioned ? container : container.offsetParent;
       var offsetParentPosition = offsetParent.getBoundingClientRect();
       var bodyPosition = ownerDocument.body.getBoundingClientRect();
-      offsetLeft = (offsetParentPosition.left - bodyPosition.left);
-      offsetTop = (offsetParentPosition.top - bodyPosition.top);
+      offsetLeft = (offsetParentPosition.left - bodyPosition.left - offsetParent.scrollLeft);
+      offsetTop = (offsetParentPosition.top - bodyPosition.top - offsetParent.scrollTop);
     }
     hints.style.left = (left - offsetLeft) + "px";
     hints.style.top = (top - offsetTop) + "px";

From 306c38eea7000f38d82febcd6162bb6138586f8b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Jun 2019 08:29:45 +0200
Subject: [PATCH 4040/4742] [javascript mode] Remove strange handling of 'in'
 in TypeScript mode

Closes #5909
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 0f83664712..d49d959a72 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -574,7 +574,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function maybetype(type, value) {
     if (isTS) {
-      if (type == ":" || value == "in") return cont(typeexpr);
+      if (type == ":") return cont(typeexpr);
       if (value == "?") return cont(maybetype);
     }
   }

From 82d1245d2108edc0a758435d8d37afb55b2a9527 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 19 Jun 2019 08:27:23 +0200
Subject: [PATCH 4041/4742] [javascript mode] Fix typescript [key in ...]
 syntax (again)

Issue #5737
Issue #5909
---
 mode/javascript/javascript.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d49d959a72..eb67187d23 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -525,7 +525,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       cx.marked = "keyword"
       return cont(objprop)
     } else if (type == "[") {
-      return cont(expression, maybetype, expect("]"), afterprop);
+      return cont(expression, maybetypeOrIn, expect("]"), afterprop);
     } else if (type == "spread") {
       return cont(expressionNoComma, afterprop);
     } else if (value == "*") {
@@ -578,6 +578,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (value == "?") return cont(maybetype);
     }
   }
+  function maybetypeOrIn(type, value) {
+    if (isTS && (type == ":" || value == "in")) return cont(typeexpr)
+  }
   function mayberettype(type) {
     if (isTS && type == ":") {
       if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)

From f249e9ded5a8279ac6fc3d9538b9c4e2b99670ad Mon Sep 17 00:00:00 2001
From: stockiNail <stocki.nail@gmail.com>
Date: Wed, 19 Jun 2019 18:49:15 +0200
Subject: [PATCH 4042/4742] [real-world uses] Added Coderba GWT wrapper

We implemented a wrapper to CodeMirror for GWT (base on JSINTEROP)
---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index 750cccc487..c88c0ebba7 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -52,6 +52,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://code.google.com/p/codemirror2-gwt/">CodeMirror2-GWT</a> (Google Web Toolkit wrapper)</li>
       <li><a href="http://www.crunchzilla.com/code-monster">Code Monster</a> & <a href="http://www.crunchzilla.com/code-maven">Code Maven</a> (learning environment)</li>
       <li><a href="http://codepen.io">Codepen</a> (gallery of animations)</li>
+      <li><a href="https://github.com/pepstock-org/Coderba"Coderba</a> Google Web Toolkit (GWT) wrapper</li>
       <li><a href="https://coderpad.io/">Coderpad</a> (interviewing tool)</li>
       <li><a href="http://sasstwo.codeschool.com/levels/1/challenges/1">Code School</a> (online tech learning environment)</li>
       <li><a href="http://code-snippets.bungeshea.com/">Code Snippets</a> (WordPress snippet management plugin)</li>

From 908e9dab8aac555561b64885076d9de9c45f2cdb Mon Sep 17 00:00:00 2001
From: stockiNail <stocki.nail@gmail.com>
Date: Thu, 20 Jun 2019 08:46:13 +0200
Subject: [PATCH 4043/4742] [real-world uses] Fixed link to GWT wrapper
 extension

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

diff --git a/doc/realworld.html b/doc/realworld.html
index c88c0ebba7..fdb278d444 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -52,7 +52,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://code.google.com/p/codemirror2-gwt/">CodeMirror2-GWT</a> (Google Web Toolkit wrapper)</li>
       <li><a href="http://www.crunchzilla.com/code-monster">Code Monster</a> & <a href="http://www.crunchzilla.com/code-maven">Code Maven</a> (learning environment)</li>
       <li><a href="http://codepen.io">Codepen</a> (gallery of animations)</li>
-      <li><a href="https://github.com/pepstock-org/Coderba"Coderba</a> Google Web Toolkit (GWT) wrapper</li>
+      <li><a href="https://github.com/pepstock-org/Coderba">Coderba</a> Google Web Toolkit (GWT) wrapper</li>
       <li><a href="https://coderpad.io/">Coderpad</a> (interviewing tool)</li>
       <li><a href="http://sasstwo.codeschool.com/levels/1/challenges/1">Code School</a> (online tech learning environment)</li>
       <li><a href="http://code-snippets.bungeshea.com/">Code Snippets</a> (WordPress snippet management plugin)</li>

From b1aeb702f0f718a61723fa82d23b2d08f1478cb1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Jun 2019 09:11:20 +0200
Subject: [PATCH 4044/4742] Mark version 5.48.0

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f61c7c5bc0..c8d5ccd01a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -124,6 +124,7 @@ Brian Grinstead
 Brian Sletten
 brrd
 Bruce Mitchener
+Bruno Logerfo
 Bryan Massoth
 Caitlin Potter
 Calin Barbat
@@ -216,6 +217,7 @@ Drew Hintz
 Drew Khoury
 Drini Cami
 Dror BG
+Duncan Lilley
 duralog
 dwelle
 eborden
@@ -406,6 +408,7 @@ karevn
 Karol
 Kayur Patel
 Kazuhito Hokamura
+kcwiakala
 Kees de Kooter
 Kenan Christian Dimas
 Ken Newman
@@ -720,6 +723,7 @@ Stephen Lavelle
 Steve Champagne
 Steve Hoover
 Steve O'Hara
+stockiNail
 stoskov
 Stryder Crown
 Stu Kennedy
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8c523c7e9..9dc7454fb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.48.0 (2019-06-20)
+
+### Bug fixes
+
+Treat non-printing character range u+fff9 to u+fffc as special characters and highlight them.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix positioning when the dialog is placed in a scrollable container.
+
+### New features
+
+Add [`selectLeft`](https://codemirror.net/doc/manual.html#mark_selectLeft)/[`selectRight`](https://codemirror.net/doc/manual.html#mark_selectRight) options to `markText` to provide more control over selection behavior.
+
 ## 5.47.0 (2019-05-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 9f9fbc5ec0..bb3f27a557 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.47.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.48.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 0066778ecf..10046cac9f 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,14 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-06-2019: <a href="https://codemirror.net/codemirror-5.48.0.zip">Version 5.48.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Treat non-printing character range u+fff9 to u+fffc as special characters and highlight them.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix positioning when the dialog is placed in a scrollable container.</li>
+    <li>Add <a href="https://codemirror.net/doc/manual.html#mark_selectLeft"><code>selectLeft</code></a>/<a href="https://codemirror.net/doc/manual.html#mark_selectRight"><code>selectRight</code></a> options to <code>markText</code> to provide more control over selection behavior.</li>
+  </ul>
+
   <p class="rel">21-05-2019: <a href="https://codemirror.net/codemirror-5.47.0.zip">Version 5.47.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 2c68263882..6a91545a3d 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.47.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.48.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 11bf115a4c..2b81992ec3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.47.1",
+  "version": "5.48.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index aa1fd89e5b..898eaadace 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.47.1"
+CodeMirror.version = "5.48.0"

From 62ef2768cc96327e1402e58d398d6042f8407dd2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Jun 2019 09:12:51 +0200
Subject: [PATCH 4045/4742] Bump version number post-5.48.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index bb3f27a557..c8afbd865f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.48.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.48.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 2b81992ec3..e1e5c54d77 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.48.0",
+  "version": "5.48.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 898eaadace..caf0449120 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.48.0"
+CodeMirror.version = "5.48.1"

From 9353e166203158c5059fcf32de0ee251e13ee4d1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Jun 2019 08:46:45 +0200
Subject: [PATCH 4046/4742] [javascript mode] Fix computed property TS syntax
 for object types

Issue #5909
---
 mode/javascript/javascript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index eb67187d23..7e7b3879ab 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -525,7 +525,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       cx.marked = "keyword"
       return cont(objprop)
     } else if (type == "[") {
-      return cont(expression, maybetypeOrIn, expect("]"), afterprop);
+      return cont(expression, maybetype, expect("]"), afterprop);
     } else if (type == "spread") {
       return cont(expressionNoComma, afterprop);
     } else if (value == "*") {
@@ -621,7 +621,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (type == ":") {
       return cont(typeexpr)
     } else if (type == "[") {
-      return cont(expect("variable"), maybetype, expect("]"), typeprop)
+      return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop)
     } else if (type == "(") {
       return pass(functiondecl, typeprop)
     }

From beab8ed123683416bfec934df73d13401ec086b5 Mon Sep 17 00:00:00 2001
From: Yang Guo <yangguo@chromium.org>
Date: Thu, 4 Jul 2019 14:42:09 +0200
Subject: [PATCH 4047/4742] [javascript mode] Support numeric separators

Note that the new regular expression is more permissive than
the spec proposal, e.g. 0_._1 or 1__2 are not valid numbers.

However, filtering out these cases would make the tokenizer
unnecessarily complex.
---
 mode/javascript/javascript.js | 6 +++---
 mode/javascript/test.js       | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 7e7b3879ab..85cb666a04 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -67,7 +67,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (ch == '"' || ch == "'") {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
-    } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
+    } else if (ch == "." && stream.match(/^[\d_]+(?:[eE][+\-]?[\d_]+)?/)) {
       return ret("number", "number");
     } else if (ch == "." && stream.match("..")) {
       return ret("spread", "meta");
@@ -75,10 +75,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return ret(ch);
     } else if (ch == "=" && stream.eat(">")) {
       return ret("=>", "operator");
-    } else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/i)) {
+    } else if (ch == "0" && stream.match(/^(?:x[\dA-Fa-f_]+|o[0-7_]+|b[01_]+)n?/)) {
       return ret("number", "number");
     } else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/);
+      stream.match(/^[\d_]*(?:n|(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)?/);
       return ret("number", "number");
     } else if (ch == "/") {
       if (stream.eat("*")) {
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 04faeafa31..d21a9a1fcc 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -298,6 +298,15 @@
      "[keyword return]",
      "{} [string-2 /5/]")
 
+  MT("numeric separator",
+     "[number 123_456];",
+     "[number 0xdead_c0de];",
+     "[number 0o123_456];",
+     "[number 0b1101_1101];",
+     "[number .123_456e0_1];",
+     "[number 1E+123_456];",
+     "[number 12_34_56n];")
+
   var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
   function TS(name) {
     test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))

From 1fb5c61b96e8ccf647d3c986f62daf0d085cdec4 Mon Sep 17 00:00:00 2001
From: Ilya Kharlamov <502372+ilyakharlamov@users.noreply.github.com>
Date: Fri, 5 Jul 2019 01:27:04 -0400
Subject: [PATCH 4048/4742] [vim mode] match vim char escape substitution
 behavior

---
 keymap/vim.js    | 9 ++++++++-
 test/vim_test.js | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 3be7a3f46b..0e64338659 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4861,6 +4861,9 @@
         var global = false; // True to replace all instances on a line, false to replace only 1.
         if (tokens.length) {
           regexPart = tokens[0];
+          if (getOption('pcre') && regexPart !== '') {
+              regexPart = new RegExp(regexPart).source; //normalize not escaped characters
+          }
           replacePart = tokens[1];
           if (regexPart && regexPart[regexPart.length - 1] === '$') {
             regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
@@ -4899,7 +4902,11 @@
               global = true;
               flagsPart.replace('g', '');
             }
-            regexPart = regexPart.replace(/\//g, "\\/") + '/' + flagsPart;
+            if (getOption('pcre')) {
+               regexPart = regexPart + '/' + flagsPart;
+            } else {
+               regexPart = regexPart.replace(/\//g, "\\/") + '/' + flagsPart;
+            }
           }
         }
         if (regexPart) {
diff --git a/test/vim_test.js b/test/vim_test.js
index e74b2f2cad..6e3ded4984 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3934,6 +3934,11 @@ testSubstitute('ex_substitute_or_word_regex', {
   expectedValue: 'five|five \n three|four',
   expr: '%s/(one|two)/five/g',
   noPcreExpr: '%s/\\(one\\|two\\)/five/g'});
+testSubstitute('ex_substitute_forward_slash_regex', {
+    value: 'forward slash \/ was here',
+  expectedValue: 'forward slash  was here',
+  expr: '%s#\\/##g',
+  noPcreExpr: '%s#/##g'});
 testSubstitute('ex_substitute_backslashslash_regex', {
   value: 'one\\two \n three\\four',
   expectedValue: 'one,two \n three,four',

From f454d5784bcde812bf2e9ffa8c9189fc6eab9ee6 Mon Sep 17 00:00:00 2001
From: Ilya Kharlamov <502372+ilyakharlamov@users.noreply.github.com>
Date: Fri, 5 Jul 2019 10:20:29 -0400
Subject: [PATCH 4049/4742] [vim mode] #5753 Feature request: Support &/$0 in
 vim substitute replacements

---
 keymap/vim.js    |  4 ++--
 test/vim_test.js | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 0e64338659..95b19b2452 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4073,7 +4073,7 @@
     }
 
     // Unescape \ and / in the replace part, for PCRE mode.
-    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'};
+    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t', '\\&':'&'};
     function unescapeRegexReplace(str) {
       var stream = new CodeMirror.StringStream(str);
       var output = [];
@@ -4871,7 +4871,7 @@
           }
           if (replacePart !== undefined) {
             if (getOption('pcre')) {
-              replacePart = unescapeRegexReplace(replacePart);
+              replacePart = unescapeRegexReplace(replacePart.replace(/([^\\])&/g,"$1$$&"));
             } else {
               replacePart = translateRegexReplace(replacePart);
             }
diff --git a/test/vim_test.js b/test/vim_test.js
index 6e3ded4984..72a9896b59 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3939,6 +3939,24 @@ testSubstitute('ex_substitute_forward_slash_regex', {
   expectedValue: 'forward slash  was here',
   expr: '%s#\\/##g',
   noPcreExpr: '%s#/##g'});
+testVim("ex_substitute_ampersand_pcre", function(cm, vim, helpers) {
+    cm.setCursor(0, 0);
+    CodeMirror.Vim.setOption('pcre', true);
+    helpers.doEx('%s/foo/namespace.&/');
+    eq("namespace.foo", cm.getValue());
+  }, { value: 'foo' });
+testVim("ex_substitute_ampersand_multiple_pcre", function(cm, vim, helpers) {
+    cm.setCursor(0, 0);
+    CodeMirror.Vim.setOption('pcre', true);
+    helpers.doEx('%s/f.o/namespace.&/');
+    eq("namespace.foo\nnamespace.fzo", cm.getValue());
+  }, { value: 'foo\nfzo' });
+testVim("ex_escaped_ampersand_should_not_substitute_pcre", function(cm, vim, helpers) {
+    cm.setCursor(0, 0);
+    CodeMirror.Vim.setOption('pcre', true);
+    helpers.doEx('%s/foo/namespace.\\&/');
+    eq("namespace.&", cm.getValue());
+  }, { value: 'foo' });
 testSubstitute('ex_substitute_backslashslash_regex', {
   value: 'one\\two \n three\\four',
   expectedValue: 'one,two \n three,four',

From ae07cb1776dddaba306ab9dd7f40b16efa4ffa97 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sun, 7 Jul 2019 11:44:10 -0400
Subject: [PATCH 4050/4742] [search addon] Escape sequence only for \n, \r, \t
 and \\

When `\` is followed by any other character, it will not be
interpreted as an escape sequence, i.e. `\3` will be
interpreted as literal `\3`, not as `3`.

Fixes https://github.com/codemirror/CodeMirror/issues/5428
---
 addon/search/search.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 5c2559c739..cecdd52ea1 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -78,10 +78,12 @@
   }
 
   function parseString(string) {
-    return string.replace(/\\(.)/g, function(_, ch) {
+    return string.replace(/\\([nrt\\])/g, function(match, ch) {
       if (ch == "n") return "\n"
       if (ch == "r") return "\r"
-      return ch
+      if (ch == "t") return "\t"
+      if (ch == "\\") return "\\"
+      return match
     })
   }
 

From ac2b82ccaa92e6534bd1f14743d8731231dffc28 Mon Sep 17 00:00:00 2001
From: Seb35 <seb35@seb35.fr>
Date: Thu, 11 Jul 2019 11:46:00 +0200
Subject: [PATCH 4051/4742] [sparql mode] Non-ASCII variable names

This regex is ES3-compliant but it misses non-BMP characters specified in SPARQL standard.

Closes #5935
---
 mode/sparql/sparql.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index f246776b12..bb79abff7f 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -41,7 +41,7 @@ CodeMirror.defineMode("sparql", function(config) {
       if(ch == "?" && stream.match(/\s/, false)){
         return "operator";
       }
-      stream.match(/^[\w\d]*/);
+      stream.match(/^[A-Za-z0-9_\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD][A-Za-z0-9_\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]*/);
       return "variable-2";
     }
     else if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) {

From 4c30e11366e0af0f50f3290ff5f51e6fae4f8466 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 11 Jul 2019 12:47:46 +0200
Subject: [PATCH 4052/4742] [javascript mode] Handle string defaults in arrow
 function param lists

Closes #5934
---
 mode/javascript/javascript.js | 6 +++++-
 mode/javascript/test.js       | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 85cb666a04..5d4c8d1aef 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -196,7 +196,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (wordRE.test(ch)) {
         sawSomething = true;
       } else if (/["'\/]/.test(ch)) {
-        return;
+        for (;; --pos) {
+          if (pos == 0) return
+          let next = stream.string.charAt(pos - 1)
+          if (next == ch && stream.string.charAt(pos - 2) != "\\") { pos--; break }
+        }
       } else if (sawSomething && !depth) {
         ++pos;
         break;
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index d21a9a1fcc..3003391be1 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -127,6 +127,9 @@
      "[keyword let] [def f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
      "[variable c];");
 
+  MT("fatArrow_stringDefault",
+     "([def a], [def b] [operator =] [string 'x\\'y']) [operator =>] [variable-2 a] [operator +] [variable-2 b]")
+
   MT("spread",
      "[keyword function] [def f]([def a], [meta ...][def b]) {",
      "  [variable something]([variable-2 a], [meta ...][variable-2 b]);",

From 632a9433922eddadd06c3b3128413e7985d9f890 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 11 Jul 2019 13:44:56 +0200
Subject: [PATCH 4053/4742] [javascript mode] Fix use of let

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 5d4c8d1aef..1276d8536c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -198,7 +198,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (/["'\/]/.test(ch)) {
         for (;; --pos) {
           if (pos == 0) return
-          let next = stream.string.charAt(pos - 1)
+          var next = stream.string.charAt(pos - 1)
           if (next == ch && stream.string.charAt(pos - 2) != "\\") { pos--; break }
         }
       } else if (sawSomething && !depth) {

From 17457466015551c7bf9292896baaa69e738f0d49 Mon Sep 17 00:00:00 2001
From: Bryan Gin-ge Chen <bryangingechen@gmail.com>
Date: Thu, 11 Jul 2019 10:57:08 -0400
Subject: [PATCH 4054/4742] [javascript mode] don't detect backtick-enclosed
 fatarrows

cf. #2993 and 27fe44c which fixed the analogous issue for single-quotes, double-quotes and regex literals.
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 1276d8536c..76ee9a6fe0 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -195,7 +195,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         ++depth;
       } else if (wordRE.test(ch)) {
         sawSomething = true;
-      } else if (/["'\/]/.test(ch)) {
+      } else if (/["'\/`]/.test(ch)) {
         for (;; --pos) {
           if (pos == 0) return
           var next = stream.string.charAt(pos - 1)

From 463ea2c34ab442c0cae1d9732305219ca9b04dfe Mon Sep 17 00:00:00 2001
From: Yang Guo <yangguo@chromium.org>
Date: Fri, 19 Jul 2019 09:15:34 +0200
Subject: [PATCH 4055/4742] [javascript mode] fix tokenizing of underscore
 properties

The regexp for parsing numbers with numeric separators is too
broad. This way, we mistake properties starting with underscore
to be numbers.
---
 mode/javascript/javascript.js | 2 +-
 mode/javascript/test.js       | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 76ee9a6fe0..8055f1ba2f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -67,7 +67,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (ch == '"' || ch == "'") {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
-    } else if (ch == "." && stream.match(/^[\d_]+(?:[eE][+\-]?[\d_]+)?/)) {
+    } else if (ch == "." && stream.match(/^\d[\d_]*(?:[eE][+\-]?[\d_]+)?/)) {
       return ret("number", "number");
     } else if (ch == "." && stream.match("..")) {
       return ret("spread", "meta");
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 3003391be1..327eac76b9 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -310,6 +310,13 @@
      "[number 1E+123_456];",
      "[number 12_34_56n];")
 
+  MT("underscore property",
+     "[variable something].[property _property];",
+     "[variable something].[property _123];",
+     "[variable something].[property _for];",
+     "[variable _for];",
+     "[variable _123];")
+
   var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
   function TS(name) {
     test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))

From 4122f7308cb89bf11e2a9c43a7e540b60e4915ac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Jul 2019 22:20:30 +0200
Subject: [PATCH 4056/4742] Mark version 5.48.2

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index c8d5ccd01a..ab98a58ce6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -125,6 +125,7 @@ Brian Sletten
 brrd
 Bruce Mitchener
 Bruno Logerfo
+Bryan Gin-ge Chen
 Bryan Massoth
 Caitlin Potter
 Calin Barbat
@@ -316,6 +317,7 @@ Ice White
 ICHIKAWA, Yuji
 idleberg
 ilvalle
+Ilya Kharlamov
 Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
@@ -685,6 +687,7 @@ SCLINIC\jdecker
 Scott Aikin
 Scott Feeney
 Scott Goodhew
+Seb35
 Sebastian Wilzbach
 Sebastian Zaha
 Seren D
@@ -801,6 +804,7 @@ Wojtek Ptak
 wonderboyjon
 Wu Cheng-Han
 Xavier Mendez
+Yang Guo
 Yassin N. Hassan
 YNH Webdev
 yoongu
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dc7454fb4..061c7215a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.48.2 (2019-07-20)
+
+### Bug fixes
+
+[vim bindings](https://codemirror.net/demo/vim.html): Adjust char escape substitution to match vim, support `&/$0`.
+
+[search addon](https://codemirror.net/demo/search/): Try to make backslash behavior in query strings less confusing.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Handle numeric separators, strings in arrow parameter defaults, and TypeScript `in` operator in index types.
+
+[sparql mode](https://codemirror.net/mode/sparql/index.html): Allow non-ASCII identifier characters.
+
 ## 5.48.0 (2019-06-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index c8afbd865f..03e3a15502 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.48.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.48.2</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 10046cac9f..11d943058d 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-07-2019: <a href="https://codemirror.net/codemirror-5.48.2.zip">Version 5.48.2</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Adjust char escape substitution to match vim, support <code>&amp;/$0</code>.</li>
+    <li><a href="https://codemirror.net/demo/search/">search addon</a>: Try to make backslash behavior in query strings less confusing.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Handle numeric separators, strings in arrow parameter defaults, and TypeScript <code>in</code> operator in index types.</li>
+    <li><a href="https://codemirror.net/mode/sparql/index.html">sparql mode</a>: Allow non-ASCII identifier characters.</li>
+  </ul>
+
   <p class="rel">20-06-2019: <a href="https://codemirror.net/codemirror-5.48.0.zip">Version 5.48.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 6a91545a3d..90c429b9dd 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.48.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.48.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index e1e5c54d77..1fb368c950 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.48.1",
+  "version": "5.48.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index caf0449120..1af55932a0 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.48.1"
+CodeMirror.version = "5.48.2"

From 40c3cf2066c92c943fff4746db2b6b35ebb26fbd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 19 Jul 2019 22:22:41 +0200
Subject: [PATCH 4057/4742] Bump version number post-5.48.2

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 03e3a15502..5b2343a6af 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.48.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.48.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 1fb368c950..ac483fee81 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.48.2",
+  "version": "5.48.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 1af55932a0..136fae0112 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.48.2"
+CodeMirror.version = "5.48.3"

From 85482b0377911befe59c90fc7d714f30b59c98e7 Mon Sep 17 00:00:00 2001
From: John Ryan <ryjohn@google.com>
Date: Fri, 19 Jul 2019 13:24:45 -0700
Subject: [PATCH 4058/4742] [clike mode] Style Dart class names as variable-2

---
 mode/dart/dart.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 0a66bf168b..7b154c65c0 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -78,6 +78,15 @@
         if (!stream.eat("*")) return false
         state.tokenize = tokenNestedComment(1)
         return state.tokenize(stream, state)
+      },
+      token: function(stream, _, style) {
+        if (style == "variable") {
+          // Assume uppercase symbols are classes using variable-2
+          var isUpper = RegExp('^[_$]*[A-Z][a-zA-Z0-9_$]*$','g');
+          if (isUpper.test(stream.current())) {
+            return 'variable-2';
+          }
+        }
       }
     }
   });

From b76594d5317f8c0c6988dfee7e922fe0f6dfa574 Mon Sep 17 00:00:00 2001
From: Guang Li <1152164+g5li@users.noreply.github.com>
Date: Fri, 26 Jul 2019 15:24:35 +0800
Subject: [PATCH 4059/4742] [real-world uses] remove unmaintained codev.it

The domain http://codev.it is Inaccessible,  the [latest twitter](https://twitter.com/codevit) was post on Sep 2015.
It's better to remove it.
---
 doc/realworld.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index fdb278d444..ff5f815b00 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -57,7 +57,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://sasstwo.codeschool.com/levels/1/challenges/1">Code School</a> (online tech learning environment)</li>
       <li><a href="http://code-snippets.bungeshea.com/">Code Snippets</a> (WordPress snippet management plugin)</li>
       <li><a href="http://antonmi.github.io/code_together/">Code together</a> (collaborative editing)</li>
-      <li><a href="http://codev.it/">Codev</a> (collaborative IDE)</li>
       <li><a href="https://www.codevolve.com/">Codevolve</a> (programming lessons as-a-service)</li>
       <li><a href="http://www.codezample.com">CodeZample</a> (code snippet sharing)</li>
       <li><a href="http://codio.com">Codio</a> (Web IDE)</li>

From 97dcadaf027ade3c7167aab349c1627043bfc2e6 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 29 Jul 2019 10:44:16 +0200
Subject: [PATCH 4060/4742] [soy mode] Add {select} and {plural}

---
 mode/soy/soy.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index b42d0da103..c33a69cec8 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -26,6 +26,8 @@
     "literal": { },
     "msg": {},
     "fallbackmsg": { noEndTag: true, reduceIndent: true},
+    "select": {},
+    "plural": {},
     "let": { soyState: "var-def" },
     "if": {},
     "elseif": { noEndTag: true, reduceIndent: true},

From 22939a99272539b9fa9288c4961159eff7029d7c Mon Sep 17 00:00:00 2001
From: Tyler Makaro <t-makaro@users.noreply.github.com>
Date: Mon, 22 Jul 2019 10:21:22 -0700
Subject: [PATCH 4061/4742] fix scrolling with rulers

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

diff --git a/lib/codemirror.css b/lib/codemirror.css
index c7a8ae7047..82c686e73f 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -96,7 +96,7 @@
 
 .CodeMirror-rulers {
   position: absolute;
-  left: 0; right: 0; top: -50px; bottom: -20px;
+  left: 0; right: 0; top: -50px; bottom: 0;
   overflow: hidden;
 }
 .CodeMirror-ruler {

From ff978a0ce54208ea9c6b8dc3ae495f5ac492b4be Mon Sep 17 00:00:00 2001
From: edoroshenko <doroshenkoes@gmail.com>
Date: Tue, 30 Jul 2019 08:55:27 +0200
Subject: [PATCH 4062/4742] [foldgutter addon] Pass all options to the
 `foldCode` method

... to enable redefinition of the `widget` prop (#5955)
---
 addon/fold/foldgutter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 988c67c450..63867ab25b 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -100,7 +100,7 @@
     if (gutter != opts.gutter) return;
     var folded = isFolded(cm, line);
     if (folded) folded.clear();
-    else cm.foldCode(Pos(line, 0), opts.rangeFinder);
+    else cm.foldCode(Pos(line, 0), opts);
   }
 
   function onChange(cm) {

From 65fab82fb178266e838d3f2c2cef216687744c34 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 1 Aug 2019 22:00:39 +0200
Subject: [PATCH 4063/4742] [julia mode] Support undescore digit separator

Closes #5958
---
 mode/julia/julia.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 5873d8ca95..547669afbc 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -187,15 +187,13 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       var imMatcher = RegExp(/^im\b/);
       var numberLiteral = false;
       // Floats
-      if (stream.match(/^\d*\.(?!\.)\d*([Eef][\+\-]?\d+)?/i)) { numberLiteral = true; }
-      if (stream.match(/^\d+\.(?!\.)\d*/)) { numberLiteral = true; }
-      if (stream.match(/^\.\d+/)) { numberLiteral = true; }
-      if (stream.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)) { numberLiteral = true; }
+      if (stream.match(/^(?:(?:\d[_\d]*)?\.(?!\.)(?:\d[_\d]*)?|\d[_\d]*\.(?!\.)(?:\d[_\d]*))?([Eef][\+\-]?[_\d]+)?/i)) { numberLiteral = true; }
+      if (stream.match(/^0x\.[0-9a-f_]+p[\+\-]?[_\d]+/i)) { numberLiteral = true; }
       // Integers
-      if (stream.match(/^0x[0-9a-f]+/i)) { numberLiteral = true; } // Hex
-      if (stream.match(/^0b[01]+/i)) { numberLiteral = true; } // Binary
-      if (stream.match(/^0o[0-7]+/i)) { numberLiteral = true; } // Octal
-      if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) { numberLiteral = true; } // Decimal
+      if (stream.match(/^0x[0-9a-f_]+/i)) { numberLiteral = true; } // Hex
+      if (stream.match(/^0b[01_]+/i)) { numberLiteral = true; } // Binary
+      if (stream.match(/^0o[0-7_]+/i)) { numberLiteral = true; } // Octal
+      if (stream.match(/^[1-9][_\d]*(e[\+\-]?\d+)?/)) { numberLiteral = true; } // Decimal
       // Zero by itself with no other piece of number.
       if (stream.match(/^0(?![\dx])/i)) { numberLiteral = true; }
       if (numberLiteral) {

From a6a9696aa61ffd91872679efb12b80773f233056 Mon Sep 17 00:00:00 2001
From: Nils Knappmeier <github@knappi.org>
Date: Thu, 1 Aug 2019 20:02:40 +0200
Subject: [PATCH 4064/4742] [handlebars mode] add support for triple mustache
 tags

---
 mode/handlebars/handlebars.js | 4 ++++
 mode/handlebars/index.html    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/mode/handlebars/handlebars.js b/mode/handlebars/handlebars.js
index 93865b7a0d..fe8b3b44e8 100644
--- a/mode/handlebars/handlebars.js
+++ b/mode/handlebars/handlebars.js
@@ -13,10 +13,14 @@
 
   CodeMirror.defineSimpleMode("handlebars-tags", {
     start: [
+      { regex: /\{\{\{/, push: "handlebars_raw", token: "tag" },
       { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
       { regex: /\{\{!/,   push: "comment", token: "comment" },
       { regex: /\{\{/,    push: "handlebars", token: "tag" }
     ],
+    handlebars_raw: [
+      { regex: /\}\}\}/, pop: true, token: "tag" },
+    ],
     handlebars: [
       { regex: /\}\}/, pop: true, token: "tag" },
 
diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
index 13cfcf35a3..e2da2e766f 100644
--- a/mode/handlebars/index.html
+++ b/mode/handlebars/index.html
@@ -41,6 +41,8 @@ <h1>{{t 'article_list'}}</h1>
 
 {{! one line comment }}
 
+{{{propertyContainingRawHtml}}}
+
 {{#each articles}}
   {{~title}}
   <p>{{excerpt body size=120 ellipsis=true}}</p>

From 80ccce062a4907c3f8789f157550e51d14da5c9e Mon Sep 17 00:00:00 2001
From: Lonnie Abelbeck <lonnie@abelbeck.com>
Date: Mon, 5 Aug 2019 14:27:39 -0500
Subject: [PATCH 4065/4742] [asterisk mode] Add block-comment support

---
 mode/asterisk/asterisk.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index 025a8b3ef9..a9bd4e3a52 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -9,7 +9,7 @@
  *    Description:  CodeMirror mode for Asterisk dialplan
  *
  *        Created:  05/17/2012 09:20:25 PM
- *       Revision:  none
+ *       Revision:  08/05/2019 AstLinux Project: Support block-comments
  *
  *         Author:  Stas Kobzar (stas@modulis.ca),
  *        Company:  Modulis.ca Inc.
@@ -67,7 +67,26 @@ CodeMirror.defineMode("asterisk", function() {
     var cur = '';
     var ch = stream.next();
     // comment
+    if (state.blockComment) {
+      if (ch == "-" && stream.match("-;", true)) {
+        state.blockComment = false;
+      } else if (stream.skipTo("--;")) {
+        stream.next();
+        stream.next();
+        stream.next();
+        state.blockComment = false;
+      } else {
+        stream.skipToEnd();
+      }
+      return "comment";
+    }
     if(ch == ";") {
+      if (stream.match("--", true)) {
+        if (!stream.match("-", false)) {  // Except ;--- is not a block comment
+          state.blockComment = true;
+          return "comment";
+        }
+      }
       stream.skipToEnd();
       return "comment";
     }
@@ -124,6 +143,7 @@ CodeMirror.defineMode("asterisk", function() {
   return {
     startState: function() {
       return {
+        blockComment: false,
         extenStart: false,
         extenSame:  false,
         extenInclude: false,

From 8e200e7e5887d4af4a41a3fe0543711b1e24a98b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 6 Aug 2019 09:36:10 +0200
Subject: [PATCH 4066/4742] [asterisk mode] Add comment syntax metadata

---
 mode/asterisk/asterisk.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index a9bd4e3a52..db67d43ad7 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -207,7 +207,11 @@ CodeMirror.defineMode("asterisk", function() {
       }
 
       return null;
-    }
+    },
+
+    blockCommentStart: jsonMode ? null : ";--",
+    blockCommentEnd: jsonMode ? null : "--;",
+    lineComment: jsonMode ? null : ";"
   };
 });
 

From 52eb590e76f6ad99cd3bc3f060f58ad15d3f02b4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 6 Aug 2019 09:59:57 +0200
Subject: [PATCH 4067/4742] [asterisk mode] Fix bogus patch

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

diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index db67d43ad7..49a727019a 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -209,9 +209,9 @@ CodeMirror.defineMode("asterisk", function() {
       return null;
     },
 
-    blockCommentStart: jsonMode ? null : ";--",
-    blockCommentEnd: jsonMode ? null : "--;",
-    lineComment: jsonMode ? null : ";"
+    blockCommentStart: ";--",
+    blockCommentEnd: "--;",
+    lineComment: ";"
   };
 });
 

From 1580dd1a64f4849dd32830098ec8782e5614dd1d Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <pyro777@gmail.com>
Date: Tue, 6 Aug 2019 02:08:48 -0700
Subject: [PATCH 4068/4742] Make ".CodeMirror pre" selector more specific

---
 lib/codemirror.css                      | 9 ++++++---
 src/measurement/position_measurement.js | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 82c686e73f..5406f23820 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -13,7 +13,8 @@
 .CodeMirror-lines {
   padding: 4px 0; /* Vertical padding around content */
 }
-.CodeMirror pre {
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-measure-elem {
   padding: 0 4px; /* Horizontal padding of content */
 }
 
@@ -236,7 +237,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   cursor: text;
   min-height: 1px; /* prevents collapsing before first draw */
 }
-.CodeMirror pre {
+.CodeMirror pre.CodeMirror-line,
+.CodeMirror pre.CodeMirror-measure-elem {
   /* Reset some styles that the rest of the page might have set */
   -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
   border-width: 0;
@@ -255,7 +257,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   -webkit-font-variant-ligatures: contextual;
   font-variant-ligatures: contextual;
 }
-.CodeMirror-wrap pre {
+.CodeMirror-wrap pre.CodeMirror-line,
+.CodeMirror-wrap pre.CodeMirror-measure-elem {
   word-wrap: break-word;
   white-space: pre-wrap;
   word-break: normal;
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index eb78287865..fa8b4c31c0 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -18,7 +18,7 @@ export function paddingTop(display) {return display.lineSpace.offsetTop}
 export function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
 export function paddingH(display) {
   if (display.cachedPaddingH) return display.cachedPaddingH
-  let e = removeChildrenAndAdd(display.measure, elt("pre", "x"))
+  let e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-measure-elem"))
   let style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle
   let data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}
   if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data
@@ -585,7 +585,7 @@ let measureText
 export function textHeight(display) {
   if (display.cachedTextHeight != null) return display.cachedTextHeight
   if (measureText == null) {
-    measureText = elt("pre")
+    measureText = elt("pre", null, "CodeMirror-measure-elem")
     // Measure a bunch of lines, for browsers that compute
     // fractional heights.
     for (let i = 0; i < 49; ++i) {
@@ -605,7 +605,7 @@ export function textHeight(display) {
 export function charWidth(display) {
   if (display.cachedCharWidth != null) return display.cachedCharWidth
   let anchor = elt("span", "xxxxxxxxxx")
-  let pre = elt("pre", [anchor])
+  let pre = elt("pre", [anchor], "CodeMirror-measure-elem")
   removeChildrenAndAdd(display.measure, pre)
   let rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10
   if (width > 2) display.cachedCharWidth = width

From dbc88322c9b303791ab97812bf4e064ca41f25b7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 8 Aug 2019 07:09:05 +0200
Subject: [PATCH 4069/4742] Fix bug in coordsChar when there's a collapsed
 range at start of line

Issue #5966
---
 src/measurement/position_measurement.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index fa8b4c31c0..73b081ba0e 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -412,7 +412,7 @@ export function estimateCoords(cm, pos) {
 function PosWithInfo(line, ch, sticky, outside, xRel) {
   let pos = Pos(line, ch, sticky)
   pos.xRel = xRel
-  if (outside) pos.outside = true
+  if (outside) pos.outside = outside
   return pos
 }
 
@@ -421,16 +421,16 @@ function PosWithInfo(line, ch, sticky, outside, xRel) {
 export function coordsChar(cm, x, y) {
   let doc = cm.doc
   y += cm.display.viewOffset
-  if (y < 0) return PosWithInfo(doc.first, 0, null, true, -1)
+  if (y < 0) return PosWithInfo(doc.first, 0, null, -1, -1)
   let lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1
   if (lineN > last)
-    return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, true, 1)
+    return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, null, 1, 1)
   if (x < 0) x = 0
 
   let lineObj = getLine(doc, lineN)
   for (;;) {
     let found = coordsCharInner(cm, lineObj, lineN, x, y)
-    let collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 ? 1 : 0))
+    let collapsed = collapsedSpanAround(lineObj, found.ch + (found.xRel > 0 || found.outside > 0 ? 1 : 0))
     if (!collapsed) return found
     let rangeEnd = collapsed.find(1)
     if (rangeEnd.line == lineN) return rangeEnd
@@ -518,7 +518,7 @@ function coordsCharInner(cm, lineObj, lineNo, x, y) {
     // base X position
     let coords = cursorCoords(cm, Pos(lineNo, ch, sticky), "line", lineObj, preparedMeasure)
     baseX = coords.left
-    outside = y < coords.top || y >= coords.bottom
+    outside = y < coords.top ? -1 : y >= coords.bottom ? 1 : 0
   }
 
   ch = skipExtendingChars(lineObj.text, ch, 1)

From 5b341e12497045388ecb3c6053a159f9851f7b8c Mon Sep 17 00:00:00 2001
From: raymondf <raymond.fu@semsci.com>
Date: Wed, 14 Aug 2019 16:38:33 +0930
Subject: [PATCH 4070/4742] significant speed optimisation when large amount of
 lines are folded

---
 addon/fold/foldgutter.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 63867ab25b..fcb5021eb3 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -51,8 +51,13 @@
 
   function isFolded(cm, line) {
     var marks = cm.findMarks(Pos(line, 0), Pos(line + 1, 0));
-    for (var i = 0; i < marks.length; ++i)
-      if (marks[i].__isFold && marks[i].find().from.line == line) return marks[i];
+    for (var i = 0; i < marks.length; ++i) {
+      if (marks[i].__isFold) {
+        var fromPos = marks[i].find(-1);
+        if (fromPos && fromPos.line === line)
+          return marks[i];
+      }
+    }
   }
 
   function marker(spec) {

From 19c620b94f5bba7cdb19b037a2fb4071fce5036d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 17 Aug 2019 10:23:34 +0200
Subject: [PATCH 4071/4742] Make sure the cantEdit flag is reset when setValue
 is called

Closes #5974
---
 src/model/Doc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/model/Doc.js b/src/model/Doc.js
index 956f752b9b..f9ac345326 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -75,6 +75,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     let top = Pos(this.first, 0), last = this.first + this.size - 1
     makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
                       text: this.splitLines(code), origin: "setValue", full: true}, true)
+    this.cantEdit = false
     if (this.cm) scrollToCoords(this.cm, 0, 0)
     setSelection(this, simpleSelection(top), sel_dontScroll)
   }),

From dc931099b52ff7f95668be7cd16402e86a7f8386 Mon Sep 17 00:00:00 2001
From: Tom McLaughlin <pyro777@gmail.com>
Date: Fri, 16 Aug 2019 20:18:45 -0700
Subject: [PATCH 4072/4742] Update PR to use .CodeMirror-line-like class

---
 addon/display/placeholder.js            | 2 +-
 lib/codemirror.css                      | 6 +++---
 src/measurement/position_measurement.js | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 1a3fa33758..4eabe3d901 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -39,7 +39,7 @@
     var elt = cm.state.placeholder = document.createElement("pre");
     elt.style.cssText = "height: 0; overflow: visible";
     elt.style.direction = cm.getOption("direction");
-    elt.className = "CodeMirror-placeholder";
+    elt.className = "CodeMirror-placeholder CodeMirror-line-like";
     var placeHolder = cm.getOption("placeholder")
     if (typeof placeHolder == "string") placeHolder = document.createTextNode(placeHolder)
     elt.appendChild(placeHolder)
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 5406f23820..bc910fb9b4 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -14,7 +14,7 @@
   padding: 4px 0; /* Vertical padding around content */
 }
 .CodeMirror pre.CodeMirror-line,
-.CodeMirror pre.CodeMirror-measure-elem {
+.CodeMirror pre.CodeMirror-line-like {
   padding: 0 4px; /* Horizontal padding of content */
 }
 
@@ -238,7 +238,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   min-height: 1px; /* prevents collapsing before first draw */
 }
 .CodeMirror pre.CodeMirror-line,
-.CodeMirror pre.CodeMirror-measure-elem {
+.CodeMirror pre.CodeMirror-line-like {
   /* Reset some styles that the rest of the page might have set */
   -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
   border-width: 0;
@@ -258,7 +258,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   font-variant-ligatures: contextual;
 }
 .CodeMirror-wrap pre.CodeMirror-line,
-.CodeMirror-wrap pre.CodeMirror-measure-elem {
+.CodeMirror-wrap pre.CodeMirror-line-like {
   word-wrap: break-word;
   white-space: pre-wrap;
   word-break: normal;
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 73b081ba0e..18ec11df86 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -18,7 +18,7 @@ export function paddingTop(display) {return display.lineSpace.offsetTop}
 export function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight}
 export function paddingH(display) {
   if (display.cachedPaddingH) return display.cachedPaddingH
-  let e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-measure-elem"))
+  let e = removeChildrenAndAdd(display.measure, elt("pre", "x", "CodeMirror-line-like"))
   let style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle
   let data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}
   if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data
@@ -585,7 +585,7 @@ let measureText
 export function textHeight(display) {
   if (display.cachedTextHeight != null) return display.cachedTextHeight
   if (measureText == null) {
-    measureText = elt("pre", null, "CodeMirror-measure-elem")
+    measureText = elt("pre", null, "CodeMirror-line-like")
     // Measure a bunch of lines, for browsers that compute
     // fractional heights.
     for (let i = 0; i < 49; ++i) {
@@ -605,7 +605,7 @@ export function textHeight(display) {
 export function charWidth(display) {
   if (display.cachedCharWidth != null) return display.cachedCharWidth
   let anchor = elt("span", "xxxxxxxxxx")
-  let pre = elt("pre", [anchor], "CodeMirror-measure-elem")
+  let pre = elt("pre", [anchor], "CodeMirror-line-like")
   removeChildrenAndAdd(display.measure, pre)
   let rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10
   if (width > 2) display.cachedCharWidth = width

From a5df839fc3e26ab6dfb02061aa3347c5b8532081 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 19 Aug 2019 12:40:50 +0200
Subject: [PATCH 4073/4742] Properly detect changes that should reset cantEdit
 flag

Issue #5974
---
 src/model/Doc.js     | 1 -
 src/model/changes.js | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/model/Doc.js b/src/model/Doc.js
index f9ac345326..956f752b9b 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -75,7 +75,6 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     let top = Pos(this.first, 0), last = this.first + this.size - 1
     makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
                       text: this.splitLines(code), origin: "setValue", full: true}, true)
-    this.cantEdit = false
     if (this.cm) scrollToCoords(this.cm, 0, 0)
     setSelection(this, simpleSelection(top), sel_dontScroll)
   }),
diff --git a/src/model/changes.js b/src/model/changes.js
index 7a68883705..7c600f6f0c 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -202,6 +202,9 @@ function makeChangeSingleDoc(doc, change, selAfter, spans) {
   if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans)
   else updateDoc(doc, change, spans)
   setSelectionNoUndo(doc, selAfter, sel_dontScroll)
+
+  if (doc.cantEdit && skipAtomic(doc, Pos(doc.firstLine(), 0)))
+    doc.cantEdit = false
 }
 
 // Handle the interaction of a change to a document with the editor

From 784d4a8501c4d5774aa0823a52540cfd5269da20 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 19 Aug 2019 14:07:59 +0200
Subject: [PATCH 4074/4742] Fix forgotten import

---
 src/model/changes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/changes.js b/src/model/changes.js
index 7c600f6f0c..48d2f6bb97 100644
--- a/src/model/changes.js
+++ b/src/model/changes.js
@@ -15,7 +15,7 @@ import { changeEnd, computeSelAfterChange } from "./change_measurement.js"
 import { isWholeLineUpdate, linkedDocs, updateDoc } from "./document_data.js"
 import { addChangeToHistory, historyChangeFromChange, mergeOldSpans, pushSelectionToHistory } from "./history.js"
 import { Range, Selection } from "./selection.js"
-import { setSelection, setSelectionNoUndo } from "./selection_updates.js"
+import { setSelection, setSelectionNoUndo, skipAtomic } from "./selection_updates.js"
 
 // UPDATING
 

From 862be946f288023d335d028971f00f8ba84a1812 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 19 Aug 2019 14:09:50 +0200
Subject: [PATCH 4075/4742] [yonce theme] Don't use rgb with four arguments

Closes #5951
---
 theme/yonce.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/yonce.css b/theme/yonce.css
index e01c0c3b1c..975f0788a2 100644
--- a/theme/yonce.css
+++ b/theme/yonce.css
@@ -24,8 +24,8 @@
 .cm-s-yonce .CodeMirror-activeline .CodeMirror-linenumber.CodeMirror-gutter-elt { background: #1C1C1C; color: #fc4384; }
 .cm-s-yonce .CodeMirror-linenumber { color: #777; }
 .cm-s-yonce .CodeMirror-cursor { border-left: 2px solid #FC4384; }
-.cm-s-yonce .cm-searching { background: rgb(243, 155, 53, .3) !important; outline: 1px solid #F39B35; }
-.cm-s-yonce .cm-searching.CodeMirror-selectedtext { background: rgb(243, 155, 53, .7) !important; color: white; }
+.cm-s-yonce .cm-searching { background: rgba(243, 155, 53, .3) !important; outline: 1px solid #F39B35; }
+.cm-s-yonce .cm-searching.CodeMirror-selectedtext { background: rgba(243, 155, 53, .7) !important; color: white; }
 
 .cm-s-yonce .cm-keyword { color: #00A7AA; } /**/
 .cm-s-yonce .cm-atom { color: #F39B35; }

From 7ecf62faa30fb0de99b76609f16c58a7bf032820 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 19 Aug 2019 14:18:23 +0200
Subject: [PATCH 4076/4742] Mark version 5.48.4

---
 AUTHORS           |  7 +++++++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 11 +++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ab98a58ce6..b73067ce79 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -222,6 +222,7 @@ Duncan Lilley
 duralog
 dwelle
 eborden
+edoroshenko
 edsharp
 ekhaled
 Elisée
@@ -284,6 +285,7 @@ Grant Skinner
 greengiant
 Gregory Koberger
 Grzegorz Mazur
+Guang Li
 Guan Gui
 Guillaume Massé
 Guillaume Massé
@@ -374,6 +376,7 @@ John Connor
 John-David Dalton
 John Engler
 John Lees-Miller
+John Ryan
 John Snelson
 John Van Der Loo
 Jon Ander Peñalba
@@ -451,6 +454,7 @@ Lior Shub
 LloydMilligan
 LM
 lochel
+Lonnie Abelbeck
 Lorenzo Simionato
 Lorenzo Stoakes
 Louis Mauchet
@@ -585,6 +589,7 @@ Nikita Vasilyev
 Nikolaj Kappler
 Nikolay Kostov
 nilp0inter
+Nils Knappmeier
 Nisarg Jhaveri
 nlwillia
 noragrossman
@@ -644,6 +649,7 @@ Randy Luecke
 Raphael Amorim
 Rasmus Erik Voel Jensen
 Rasmus Schultz
+raymondf
 Raymond Hill
 ray ratchup
 Ray Ratchup
@@ -778,6 +784,7 @@ TSUYUSATO Kitsune
 Tugrul Elmas
 twifkak
 Tyler Long
+Tyler Makaro
 Vadim Dyachenko
 Vadzim Ramanenka
 Vaibhav Sagar
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 061c7215a2..7256b863dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 5.48.4 (2019-08-20)
+
+### Bug fixes
+
+Make default styles for line elements more specific so that they don't apply to all `<pre>` elements inside the editor.
+
+Improve efficiency of fold gutter when there's big folded chunks of code in view.
+
+Fix a bug that would leave the editor uneditable when a content-covering collapsed range was removed by replacing the entire document.
+
+[julia mode](https://codemirror.net/mode/julia/): Support number separators.
+
+[asterisk mode](https://codemirror.net/mode/asterisk/): Improve comment support.
+
+[handlebars mode](https://codemirror.net/mode/handlebars/): Support triple-brace tags.
+
 ## 5.48.2 (2019-07-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 5b2343a6af..6a96a66ded 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.48.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.48.4</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 11d943058d..73235e8592 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,17 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-08-2019: <a href="https://codemirror.net/codemirror-5.48.4.zip">Version 5.48.4</a>:</p>
+
+  <ul class="rel-note">
+    <li>Make default styles for line elements more specific so that they don’t apply to all <code>&lt;pre&gt;</code> elements inside the editor.</li>
+    <li>Improve efficiency of fold gutter when there’s big folded chunks of code in view.</li>
+    <li>Fix a bug that would leave the editor uneditable when a content-covering collapsed range was removed by replacing the entire document.</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Support number separators.</li>
+    <li><a href="https://codemirror.net/mode/asterisk/">asterisk mode</a>: Improve comment support.</li>
+    <li><a href="https://codemirror.net/mode/handlebars/">handlebars mode</a>: Support triple-brace tags.</li>
+  </ul>
+
   <p class="rel">20-07-2019: <a href="https://codemirror.net/codemirror-5.48.2.zip">Version 5.48.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 90c429b9dd..95b1afb4a7 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.48.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.48.4</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index ac483fee81..7186b02b57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.48.3",
+  "version": "5.48.4",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 136fae0112..92478df3aa 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.48.3"
+CodeMirror.version = "5.48.4"

From ad0daf2f18c67edbf9498a4e72af3f626809d65b Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 20 Aug 2019 10:13:52 +0200
Subject: [PATCH 4077/4742] [soy mode] Fix setting kind on invalid tags

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

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index c33a69cec8..c39516a9ad 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -288,7 +288,7 @@
               state.soyState.pop();
               return "keyword";
             } else if (stream.match(/^([\w?]+)(?==)/)) {
-              if (stream.current() == "kind" && (match = stream.match(/^="([^"]+)/, false))) {
+              if (state.context && state.context.tag == tagName && stream.current() == "kind" && (match = stream.match(/^="([^"]+)/, false))) {
                 var kind = match[1];
                 state.context.kind = kind;
                 var mode = modes[kind] || modes.html;

From 650e975ad2c8bc3ac16257598ec961a004272185 Mon Sep 17 00:00:00 2001
From: prendota <Prendota@mail.ru>
Date: Wed, 21 Aug 2019 09:57:03 +0300
Subject: [PATCH 4078/4742] [clike] support nested comments in kotlin mode

---
 mode/clike/clike.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 4c8b9937d6..0879a0bd6d 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -676,6 +676,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         state.tokenize = tokenKotlinString(stream.match('""'));
         return state.tokenize(stream, state);
       },
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenNestedComment(1);
+        return state.tokenize(stream, state)
+      },
       indent: function(state, ctx, textAfter, indentUnit) {
         var firstChar = textAfter && textAfter.charAt(0);
         if ((state.prevToken == "}" || state.prevToken == ")") && textAfter == "")

From 448dff26b60712dd8f4ceb1d14e26624612e51e9 Mon Sep 17 00:00:00 2001
From: Mattia Astorino <astorino.mattia@gmail.com>
Date: Fri, 23 Aug 2019 15:37:50 +0200
Subject: [PATCH 4079/4742] [material theme] Update to the official version,
 add darker, palenight, ocean variants

---
 demo/theme.html              |   8 +-
 theme/material-darker.css    | 135 ++++++++++++++++++++++++++++++
 theme/material-ocean.css     | 135 ++++++++++++++++++++++++++++++
 theme/material-palenight.css | 135 ++++++++++++++++++++++++++++++
 theme/material.css           | 156 ++++++++++++++++++++++++++---------
 5 files changed, 531 insertions(+), 38 deletions(-)
 create mode 100644 theme/material-darker.css
 create mode 100644 theme/material-ocean.css
 create mode 100644 theme/material-palenight.css

diff --git a/demo/theme.html b/demo/theme.html
index 7bbc7a49e9..723c3efa19 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -29,6 +29,9 @@
 <link rel="stylesheet" href="../theme/liquibyte.css">
 <link rel="stylesheet" href="../theme/lucario.css">
 <link rel="stylesheet" href="../theme/material.css">
+<link rel="stylesheet" href="../theme/material-darker.css">
+<link rel="stylesheet" href="../theme/material-palenight.css">
+<link rel="stylesheet" href="../theme/material-ocean.css">
 <link rel="stylesheet" href="../theme/mbo.css">
 <link rel="stylesheet" href="../theme/mdn-like.css">
 <link rel="stylesheet" href="../theme/midnight.css">
@@ -124,6 +127,9 @@ <h2>Theme Demo</h2>
     <option>liquibyte</option>
     <option>lucario</option>
     <option>material</option>
+    <option>material-darker</option>
+    <option>material-palenight</option>
+    <option>material-ocean</option>
     <option>mbo</option>
     <option>mdn-like</option>
     <option>midnight</option>
@@ -181,4 +187,4 @@ <h2>Theme Demo</h2>
     if (theme) { input.value = theme; selectTheme(); }
   });
 </script>
-  </article>
+</article>
\ No newline at end of file
diff --git a/theme/material-darker.css b/theme/material-darker.css
new file mode 100644
index 0000000000..45b64efb25
--- /dev/null
+++ b/theme/material-darker.css
@@ -0,0 +1,135 @@
+/*
+  Name:       material
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://material-theme.site/
+*/
+
+.cm-s-material-darker.CodeMirror {
+  background-color: #212121;
+  color: #EEFFFF;
+}
+
+.cm-s-material-darker .CodeMirror-gutters {
+  background: #212121;
+  color: #545454;
+  border: none;
+}
+
+.cm-s-material-darker .CodeMirror-guttermarker,
+.cm-s-material-darker .CodeMirror-guttermarker-subtle,
+.cm-s-material-darker .CodeMirror-linenumber {
+  color: #545454;
+}
+
+.cm-s-material-darker .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+
+.cm-s-material-darker div.CodeMirror-selected {
+  background: rgba(97, 97, 97, 0.2);
+}
+
+.cm-s-material-darker.CodeMirror-focused div.CodeMirror-selected {
+  background: rgba(97, 97, 97, 0.2);
+}
+
+.cm-s-material-darker .CodeMirror-line::selection,
+.cm-s-material-darker .CodeMirror-line>span::selection,
+.cm-s-material-darker .CodeMirror-line>span>span::selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-darker .CodeMirror-line::-moz-selection,
+.cm-s-material-darker .CodeMirror-line>span::-moz-selection,
+.cm-s-material-darker .CodeMirror-line>span>span::-moz-selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-darker .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.cm-s-material-darker .cm-keyword {
+  color: #C792EA;
+}
+
+.cm-s-material-darker .cm-operator {
+  color: #89DDFF;
+}
+
+.cm-s-material-darker .cm-variable-2 {
+  color: #EEFFFF;
+}
+
+.cm-s-material-darker .cm-variable-3,
+.cm-s-material-darker .cm-type {
+  color: #f07178;
+}
+
+.cm-s-material-darker .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-material-darker .cm-atom {
+  color: #F78C6C;
+}
+
+.cm-s-material-darker .cm-number {
+  color: #FF5370;
+}
+
+.cm-s-material-darker .cm-def {
+  color: #82AAFF;
+}
+
+.cm-s-material-darker .cm-string {
+  color: #C3E88D;
+}
+
+.cm-s-material-darker .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-material-darker .cm-comment {
+  color: #545454;
+}
+
+.cm-s-material-darker .cm-variable {
+  color: #f07178;
+}
+
+.cm-s-material-darker .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-material-darker .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-material-darker .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-material-darker .cm-property {
+  color: #C792EA;
+}
+
+.cm-s-material-darker .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-material-darker .cm-variable-3,
+.cm-s-material-darker .cm-type {
+  color: #DECB6B;
+}
+
+
+.cm-s-material-darker .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #FF5370;
+}
+
+.cm-s-material-darker .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
\ No newline at end of file
diff --git a/theme/material-ocean.css b/theme/material-ocean.css
new file mode 100644
index 0000000000..86a6f3cd5c
--- /dev/null
+++ b/theme/material-ocean.css
@@ -0,0 +1,135 @@
+/*
+  Name:       material
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://material-theme.site/
+*/
+
+.cm-s-material-ocean.CodeMirror {
+  background-color: #0F111A;
+  color: #8F93A2;
+}
+
+.cm-s-material-ocean .CodeMirror-gutters {
+  background: #0F111A;
+  color: #464B5D;
+  border: none;
+}
+
+.cm-s-material-ocean .CodeMirror-guttermarker,
+.cm-s-material-ocean .CodeMirror-guttermarker-subtle,
+.cm-s-material-ocean .CodeMirror-linenumber {
+  color: #464B5D;
+}
+
+.cm-s-material-ocean .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+
+.cm-s-material-ocean div.CodeMirror-selected {
+  background: rgba(113, 124, 180, 0.2);
+}
+
+.cm-s-material-ocean.CodeMirror-focused div.CodeMirror-selected {
+  background: rgba(113, 124, 180, 0.2);
+}
+
+.cm-s-material-ocean .CodeMirror-line::selection,
+.cm-s-material-ocean .CodeMirror-line>span::selection,
+.cm-s-material-ocean .CodeMirror-line>span>span::selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-ocean .CodeMirror-line::-moz-selection,
+.cm-s-material-ocean .CodeMirror-line>span::-moz-selection,
+.cm-s-material-ocean .CodeMirror-line>span>span::-moz-selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-ocean .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.cm-s-material-ocean .cm-keyword {
+  color: #C792EA;
+}
+
+.cm-s-material-ocean .cm-operator {
+  color: #89DDFF;
+}
+
+.cm-s-material-ocean .cm-variable-2 {
+  color: #EEFFFF;
+}
+
+.cm-s-material-ocean .cm-variable-3,
+.cm-s-material-ocean .cm-type {
+  color: #f07178;
+}
+
+.cm-s-material-ocean .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-material-ocean .cm-atom {
+  color: #F78C6C;
+}
+
+.cm-s-material-ocean .cm-number {
+  color: #FF5370;
+}
+
+.cm-s-material-ocean .cm-def {
+  color: #82AAFF;
+}
+
+.cm-s-material-ocean .cm-string {
+  color: #C3E88D;
+}
+
+.cm-s-material-ocean .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-material-ocean .cm-comment {
+  color: #464B5D;
+}
+
+.cm-s-material-ocean .cm-variable {
+  color: #f07178;
+}
+
+.cm-s-material-ocean .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-material-ocean .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-material-ocean .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-material-ocean .cm-property {
+  color: #C792EA;
+}
+
+.cm-s-material-ocean .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-material-ocean .cm-variable-3,
+.cm-s-material-ocean .cm-type {
+  color: #DECB6B;
+}
+
+
+.cm-s-material-ocean .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #FF5370;
+}
+
+.cm-s-material-ocean .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
\ No newline at end of file
diff --git a/theme/material-palenight.css b/theme/material-palenight.css
new file mode 100644
index 0000000000..66d53dd394
--- /dev/null
+++ b/theme/material-palenight.css
@@ -0,0 +1,135 @@
+/*
+  Name:       material
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://material-theme.site/
+*/
+
+.cm-s-material-palenight.CodeMirror {
+  background-color: #292D3E;
+  color: #A6ACCD;
+}
+
+.cm-s-material-palenight .CodeMirror-gutters {
+  background: #292D3E;
+  color: #676E95;
+  border: none;
+}
+
+.cm-s-material-palenight .CodeMirror-guttermarker,
+.cm-s-material-palenight .CodeMirror-guttermarker-subtle,
+.cm-s-material-palenight .CodeMirror-linenumber {
+  color: #676E95;
+}
+
+.cm-s-material-palenight .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+
+.cm-s-material-palenight div.CodeMirror-selected {
+  background: rgba(113, 124, 180, 0.2);
+}
+
+.cm-s-material-palenight.CodeMirror-focused div.CodeMirror-selected {
+  background: rgba(113, 124, 180, 0.2);
+}
+
+.cm-s-material-palenight .CodeMirror-line::selection,
+.cm-s-material-palenight .CodeMirror-line>span::selection,
+.cm-s-material-palenight .CodeMirror-line>span>span::selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-palenight .CodeMirror-line::-moz-selection,
+.cm-s-material-palenight .CodeMirror-line>span::-moz-selection,
+.cm-s-material-palenight .CodeMirror-line>span>span::-moz-selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material-palenight .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.cm-s-material-palenight .cm-keyword {
+  color: #C792EA;
+}
+
+.cm-s-material-palenight .cm-operator {
+  color: #89DDFF;
+}
+
+.cm-s-material-palenight .cm-variable-2 {
+  color: #EEFFFF;
+}
+
+.cm-s-material-palenight .cm-variable-3,
+.cm-s-material-palenight .cm-type {
+  color: #f07178;
+}
+
+.cm-s-material-palenight .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-material-palenight .cm-atom {
+  color: #F78C6C;
+}
+
+.cm-s-material-palenight .cm-number {
+  color: #FF5370;
+}
+
+.cm-s-material-palenight .cm-def {
+  color: #82AAFF;
+}
+
+.cm-s-material-palenight .cm-string {
+  color: #C3E88D;
+}
+
+.cm-s-material-palenight .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-material-palenight .cm-comment {
+  color: #676E95;
+}
+
+.cm-s-material-palenight .cm-variable {
+  color: #f07178;
+}
+
+.cm-s-material-palenight .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-material-palenight .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-material-palenight .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-material-palenight .cm-property {
+  color: #C792EA;
+}
+
+.cm-s-material-palenight .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-material-palenight .cm-variable-3,
+.cm-s-material-palenight .cm-type {
+  color: #DECB6B;
+}
+
+
+.cm-s-material-palenight .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #FF5370;
+}
+
+.cm-s-material-palenight .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
\ No newline at end of file
diff --git a/theme/material.css b/theme/material.css
index 84962a244b..9ac17a3676 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -1,53 +1,135 @@
 /*
-
-    Name:       material
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme)
-
+  Name:       material
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://material-theme.site/
 */
 
 .cm-s-material.CodeMirror {
   background-color: #263238;
-  color: rgba(233, 237, 237, 1);
+  color: #EEFFFF;
 }
+
 .cm-s-material .CodeMirror-gutters {
   background: #263238;
-  color: rgb(83,127,126);
+  color: #546E7A;
   border: none;
 }
-.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
-.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
-.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
-.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
-.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-variable-2 { color: #80CBC4; }
-.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #82B1FF; }
-.cm-s-material .cm-builtin { color: #DECB6B; }
-.cm-s-material .cm-atom { color: #F77669; }
-.cm-s-material .cm-number { color: #F77669; }
-.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-string { color: #C3E88D; }
-.cm-s-material .cm-string-2 { color: #80CBC4; }
-.cm-s-material .cm-comment { color: #546E7A; }
-.cm-s-material .cm-variable { color: #82B1FF; }
-.cm-s-material .cm-tag { color: #80CBC4; }
-.cm-s-material .cm-meta { color: #80CBC4; }
-.cm-s-material .cm-attribute { color: #FFCB6B; }
-.cm-s-material .cm-property { color: #80CBAE; }
-.cm-s-material .cm-qualifier { color: #DECB6B; }
-.cm-s-material .cm-variable-3, .cm-s-material .cm-type { color: #DECB6B; }
-.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
+
+.cm-s-material .CodeMirror-guttermarker,
+.cm-s-material .CodeMirror-guttermarker-subtle,
+.cm-s-material .CodeMirror-linenumber {
+  color: #546E7A;
+}
+
+.cm-s-material .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+
+.cm-s-material div.CodeMirror-selected {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material.CodeMirror-focused div.CodeMirror-selected {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material .CodeMirror-line::selection,
+.cm-s-material .CodeMirror-line>span::selection,
+.cm-s-material .CodeMirror-line>span>span::selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material .CodeMirror-line::-moz-selection,
+.cm-s-material .CodeMirror-line>span::-moz-selection,
+.cm-s-material .CodeMirror-line>span>span::-moz-selection {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-material .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.cm-s-material .cm-keyword {
+  color: #C792EA;
+}
+
+.cm-s-material .cm-operator {
+  color: #89DDFF;
+}
+
+.cm-s-material .cm-variable-2 {
+  color: #EEFFFF;
+}
+
+.cm-s-material .cm-variable-3,
+.cm-s-material .cm-type {
+  color: #f07178;
+}
+
+.cm-s-material .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-material .cm-atom {
+  color: #F78C6C;
+}
+
+.cm-s-material .cm-number {
+  color: #FF5370;
+}
+
+.cm-s-material .cm-def {
+  color: #82AAFF;
+}
+
+.cm-s-material .cm-string {
+  color: #C3E88D;
+}
+
+.cm-s-material .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-material .cm-comment {
+  color: #546E7A;
+}
+
+.cm-s-material .cm-variable {
+  color: #f07178;
+}
+
+.cm-s-material .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-material .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-material .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-material .cm-property {
+  color: #C792EA;
+}
+
+.cm-s-material .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-material .cm-variable-3,
+.cm-s-material .cm-type {
+  color: #DECB6B;
+}
+
+
 .cm-s-material .cm-error {
   color: rgba(255, 255, 255, 1.0);
-  background-color: #EC5F67;
+  background-color: #FF5370;
 }
+
 .cm-s-material .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
-}
+}
\ No newline at end of file

From a34b8b34160c5fa8c0c6ad65bfdf762c725b3c8d Mon Sep 17 00:00:00 2001
From: Mattia Astorino <astorino.mattia@gmail.com>
Date: Fri, 23 Aug 2019 16:42:20 +0200
Subject: [PATCH 4080/4742] [moxer theme] Add

---
 demo/theme.html |   2 +
 theme/moxer.css | 143 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+)
 create mode 100644 theme/moxer.css

diff --git a/demo/theme.html b/demo/theme.html
index 723c3efa19..8c10eb827c 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -36,6 +36,7 @@
 <link rel="stylesheet" href="../theme/mdn-like.css">
 <link rel="stylesheet" href="../theme/midnight.css">
 <link rel="stylesheet" href="../theme/monokai.css">
+<link rel="stylesheet" href="../theme/moxer.css">
 <link rel="stylesheet" href="../theme/neat.css">
 <link rel="stylesheet" href="../theme/neo.css">
 <link rel="stylesheet" href="../theme/night.css">
@@ -134,6 +135,7 @@ <h2>Theme Demo</h2>
     <option>mdn-like</option>
     <option>midnight</option>
     <option>monokai</option>
+    <option>moxer</option>
     <option>neat</option>
     <option>neo</option>
     <option>night</option>
diff --git a/theme/moxer.css b/theme/moxer.css
new file mode 100644
index 0000000000..b3ca35e385
--- /dev/null
+++ b/theme/moxer.css
@@ -0,0 +1,143 @@
+/*
+  Name:       Moxer Theme
+  Author:     Mattia Astorino (http://github.com/equinusocio)
+  Website:    https://github.com/moxer-theme/moxer-code
+*/
+
+.cm-s-moxer.CodeMirror {
+  background-color: #090A0F;
+  color: #8E95B4;
+  line-height: 1.8;
+}
+
+.cm-s-moxer .CodeMirror-gutters {
+  background: #090A0F;
+  color: #35394B;
+  border: none;
+}
+
+.cm-s-moxer .CodeMirror-guttermarker,
+.cm-s-moxer .CodeMirror-guttermarker-subtle,
+.cm-s-moxer .CodeMirror-linenumber {
+  color: #35394B;
+}
+
+
+.cm-s-moxer .CodeMirror-cursor {
+  border-left: 1px solid #FFCC00;
+}
+
+.cm-s-moxer div.CodeMirror-selected {
+  background: rgba(128, 203, 196, 0.2);
+}
+
+.cm-s-moxer.CodeMirror-focused div.CodeMirror-selected {
+  background: #212431;
+}
+
+.cm-s-moxer .CodeMirror-line::selection,
+.cm-s-moxer .CodeMirror-line>span::selection,
+.cm-s-moxer .CodeMirror-line>span>span::selection {
+  background: #212431;
+}
+
+.cm-s-moxer .CodeMirror-line::-moz-selection,
+.cm-s-moxer .CodeMirror-line>span::-moz-selection,
+.cm-s-moxer .CodeMirror-line>span>span::-moz-selection {
+  background: #212431;
+}
+
+.cm-s-moxer .CodeMirror-activeline-background,
+.cm-s-moxer .CodeMirror-activeline-gutter .CodeMirror-linenumber {
+  background: rgba(33, 36, 49, 0.5);
+}
+
+.cm-s-moxer .cm-keyword {
+  color: #D46C6C;
+}
+
+.cm-s-moxer .cm-operator {
+  color: #D46C6C;
+}
+
+.cm-s-moxer .cm-variable-2 {
+  color: #81C5DA;
+}
+
+
+.cm-s-moxer .cm-variable-3,
+.cm-s-moxer .cm-type {
+  color: #f07178;
+}
+
+.cm-s-moxer .cm-builtin {
+  color: #FFCB6B;
+}
+
+.cm-s-moxer .cm-atom {
+  color: #A99BE2;
+}
+
+.cm-s-moxer .cm-number {
+  color: #7CA4C0;
+}
+
+.cm-s-moxer .cm-def {
+  color: #F5DFA5;
+}
+
+.cm-s-moxer .CodeMirror-line .cm-def ~ .cm-def {
+  color: #81C5DA;
+}
+
+.cm-s-moxer .cm-string {
+  color: #B2E4AE;
+}
+
+.cm-s-moxer .cm-string-2 {
+  color: #f07178;
+}
+
+.cm-s-moxer .cm-comment {
+  color: #3F445A;
+}
+
+.cm-s-moxer .cm-variable {
+  color: #8E95B4;
+}
+
+.cm-s-moxer .cm-tag {
+  color: #FF5370;
+}
+
+.cm-s-moxer .cm-meta {
+  color: #FFCB6B;
+}
+
+.cm-s-moxer .cm-attribute {
+  color: #C792EA;
+}
+
+.cm-s-moxer .cm-property {
+  color: #81C5DA;
+}
+
+.cm-s-moxer .cm-qualifier {
+  color: #DECB6B;
+}
+
+.cm-s-moxer .cm-variable-3,
+.cm-s-moxer .cm-type {
+  color: #DECB6B;
+}
+
+
+.cm-s-moxer .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #FF5370;
+}
+
+.cm-s-moxer .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
\ No newline at end of file

From 399d430ee411e30eb3bc03a51c6e0e00c433e6b5 Mon Sep 17 00:00:00 2001
From: Mark Hamstra <hamstra.mark@gmail.com>
Date: Sun, 25 Aug 2019 15:51:00 +0200
Subject: [PATCH 4081/4742] Prevent removing textarea.form.submit handler with
 opts.leaveSubmitMethodAlone

---
 src/edit/fromTextArea.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
index 92498c1045..35024c5e27 100644
--- a/src/edit/fromTextArea.js
+++ b/src/edit/fromTextArea.js
@@ -48,7 +48,7 @@ export function fromTextArea(textarea, options) {
       textarea.style.display = ""
       if (textarea.form) {
         off(textarea.form, "submit", save)
-        if (typeof textarea.form.submit == "function")
+        if (!options.leaveSubmitMethodAlone && typeof textarea.form.submit == "function")
           textarea.form.submit = realSubmit
       }
     }

From f826bb0be8aac1e586eabc2ba0297c164cebe8ef Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 29 Aug 2019 14:06:34 +0200
Subject: [PATCH 4082/4742] [octave mode] Don't mark period chars as invalid

Closes #5987
---
 mode/octave/octave.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index 4040b67033..33a03368fa 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -17,7 +17,7 @@ CodeMirror.defineMode("octave", function() {
   }
 
   var singleOperators = new RegExp("^[\\+\\-\\*/&|\\^~<>!@'\\\\]");
-  var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;]');
+  var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;\\.]');
   var doubleOperators = new RegExp("^((==)|(~=)|(<=)|(>=)|(<<)|(>>)|(\\.[\\+\\-\\*/\\^\\\\]))");
   var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))");
   var tripleDelimiters = new RegExp("^((>>=)|(<<=))");

From 9b5f1c49fa099825c8f73dbe5efe18633719380e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 30 Aug 2019 17:29:22 +0200
Subject: [PATCH 4083/4742] [javascript mode] Add support for HTML-style
 comments

Closes #5988
---
 mode/javascript/javascript.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 8055f1ba2f..16943a9eb9 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -101,6 +101,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (ch == "#") {
       stream.skipToEnd();
       return ret("error", "error");
+    } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) {
+      stream.skipToEnd()
+      return ret("comment", "comment")
     } else if (isOperatorChar.test(ch)) {
       if (ch != ">" || !state.lexical || state.lexical.type != ">") {
         if (stream.eat("=")) {

From 538c4dc3ad5ead88ac1f53062ddd69ecb8cfee0a Mon Sep 17 00:00:00 2001
From: zoobestik <kb.chernenko@gmail.com>
Date: Wed, 4 Sep 2019 15:29:27 +0300
Subject: [PATCH 4084/4742] [clike] fix kotlin indent for first line in lambda
 with params

---
 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 0879a0bd6d..b3cf54e81b 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -685,7 +685,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         var firstChar = textAfter && textAfter.charAt(0);
         if ((state.prevToken == "}" || state.prevToken == ")") && textAfter == "")
           return state.indented;
-        if (state.prevToken == "operator" && textAfter != "}" ||
+        if ((state.prevToken == "operator" && textAfter != "}" && state.context.type != "}") ||
           state.prevToken == "variable" && firstChar == "." ||
           (state.prevToken == "}" || state.prevToken == ")") && firstChar == ".")
           return indentUnit * 2 + ctx.indented;

From ab766ceff9804ad79fb14abcaa535864a56e3f64 Mon Sep 17 00:00:00 2001
From: Erik Welander <ewelander@google.com>
Date: Thu, 5 Sep 2019 22:16:20 -0700
Subject: [PATCH 4085/4742] [foldgutter and annotatescrollbar addon] Schedule
 update on changes instead of change

The setTimeout/clearTimeout overhead of re-scheduling on every change in a large operation can be significant. This cuts the time of a particularly large operation I was testing from 5s to 2.5s (replacing some text in ~5000 lines). The majority of the rest of the time coming from rescheduling of the highlight worker inside the startWorker call.
---
 addon/fold/foldgutter.js          | 4 ++--
 addon/scroll/annotatescrollbar.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index fcb5021eb3..e57a1df35d 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -16,7 +16,7 @@
       cm.clearGutter(cm.state.foldGutter.options.gutter);
       cm.state.foldGutter = null;
       cm.off("gutterClick", onGutterClick);
-      cm.off("change", onChange);
+      cm.off("changes", onChange);
       cm.off("viewportChange", onViewportChange);
       cm.off("fold", onFold);
       cm.off("unfold", onFold);
@@ -26,7 +26,7 @@
       cm.state.foldGutter = new State(parseOptions(val));
       updateInViewport(cm);
       cm.on("gutterClick", onGutterClick);
-      cm.on("change", onChange);
+      cm.on("changes", onChange);
       cm.on("viewportChange", onViewportChange);
       cm.on("fold", onFold);
       cm.on("unfold", onFold);
diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 356625811e..9fe61ec1ff 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -43,7 +43,7 @@
     cm.on("markerAdded", this.resizeHandler);
     cm.on("markerCleared", this.resizeHandler);
     if (options.listenForChanges !== false)
-      cm.on("change", this.changeHandler = function() {
+      cm.on("changes", this.changeHandler = function() {
         scheduleRedraw(250);
       });
   }
@@ -116,7 +116,7 @@
     this.cm.off("refresh", this.resizeHandler);
     this.cm.off("markerAdded", this.resizeHandler);
     this.cm.off("markerCleared", this.resizeHandler);
-    if (this.changeHandler) this.cm.off("change", this.changeHandler);
+    if (this.changeHandler) this.cm.off("changes", this.changeHandler);
     this.div.parentNode.removeChild(this.div);
   };
 });

From 92b8e511853769e9c8cbe915d1e01f5540c2996f Mon Sep 17 00:00:00 2001
From: Arnoud Buzing <arnoudbuzing@users.noreply.github.com>
Date: Wed, 11 Sep 2019 00:36:12 -0500
Subject: [PATCH 4086/4742] [mode/meta] Add wl and wls file extensions

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

diff --git a/mode/meta.js b/mode/meta.js
index 95d473100d..e9155037a1 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -84,7 +84,7 @@
     {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
     {name: "mIRC", mime: "text/mirc", mode: "mirc"},
     {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
-    {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
+    {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb", "wl", "wls"]},
     {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
     {name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
     {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},

From d19537cb70019857440e5d713b1e832a31ce886d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 11 Sep 2019 08:27:59 +0200
Subject: [PATCH 4087/4742] [xml mode] Add an indirection to XML mode state
 inspection

Issue codemirror/google-modes#266
---
 addon/edit/closetag.js | 37 +++++++++++++++++++------------------
 addon/hint/xml-hint.js | 17 ++++++++++-------
 mode/xml/xml.js        | 11 +++++++++++
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index e5e83bcd32..4f5aae49d9 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -60,22 +60,23 @@
       if (!ranges[i].empty()) return CodeMirror.Pass;
       var pos = ranges[i].head, tok = cm.getTokenAt(pos);
       var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-      if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
+      var tagInfo = inner.mode.xmlCurrentTag && inner.mode.xmlCurrentTag(state)
+      var tagName = tagInfo && tagInfo.name
+      if (!tagName) return CodeMirror.Pass
 
       var html = inner.mode.configuration == "html";
       var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
       var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
 
-      var tagName = state.tagName;
       if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
       var lowerTagName = tagName.toLowerCase();
       // Don't process the '>' at the end of an end-tag or self-closing tag
       if (!tagName ||
           tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
-          tok.type == "tag" && state.type == "closeTag" ||
+          tok.type == "tag" && tagInfo.close ||
           tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
           dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
-          closingTagExists(cm, tagName, pos, state, true))
+          closingTagExists(cm, inner.mode.xmlCurrentContext && inner.mode.xmlCurrentContext(state) || [], tagName, pos, true))
         return CodeMirror.Pass;
 
       var emptyTags = typeof opt == "object" && opt.emptyTags;
@@ -120,19 +121,16 @@
       // when completing in JS/CSS snippet in htmlmixed mode. Does not
       // work for other XML embedded languages (there is no general
       // way to go from a mixed mode to its current XML state).
-      var replacement;
-      if (inner.mode.name != "xml") {
-        if (cm.getMode().name == "htmlmixed" && inner.mode.name == "javascript")
-          replacement = head + "script";
-        else if (cm.getMode().name == "htmlmixed" && inner.mode.name == "css")
-          replacement = head + "style";
-        else
-          return CodeMirror.Pass;
+      var replacement, mixed = inner.mode.name != "xml" && cm.getMode().name == "htmlmixed"
+      if (mixed && inner.mode.name == "javascript") {
+        replacement = head + "script";
+      } else if (mixed && inner.mode.name == "css") {
+        replacement = head + "style";
       } else {
-        if (!state.context || !state.context.tagName ||
-            closingTagExists(cm, state.context.tagName, pos, state))
+        var context = inner.mode.xmlCurrentContext && inner.mode.xmlCurrentContext(state)
+        if (!context || (context.length && closingTagExists(cm, context, context[context.length - 1], pos)))
           return CodeMirror.Pass;
-        replacement = head + state.context.tagName;
+        replacement = head + context[context.length - 1]
       }
       if (cm.getLine(pos.line).charAt(tok.end) != ">") replacement += ">";
       replacements[i] = replacement;
@@ -162,16 +160,19 @@
 
   // If xml-fold is loaded, we use its functionality to try and verify
   // whether a given tag is actually unclosed.
-  function closingTagExists(cm, tagName, pos, state, newTag) {
+  function closingTagExists(cm, context, tagName, pos, newTag) {
     if (!CodeMirror.scanForClosingTag) return false;
     var end = Math.min(cm.lastLine() + 1, pos.line + 500);
     var nextClose = CodeMirror.scanForClosingTag(cm, pos, null, end);
     if (!nextClose || nextClose.tag != tagName) return false;
-    var cx = state.context;
     // If the immediate wrapping context contains onCx instances of
     // the same tag, a closing tag only exists if there are at least
     // that many closing tags of that type following.
-    for (var onCx = newTag ? 1 : 0; cx && cx.tagName == tagName; cx = cx.prev) ++onCx;
+    var onCx = newTag ? 1 : 0
+    for (var i = context.length - 1; i >= 0; i--) {
+      if (context[i] == tagName) ++onCx
+      else break
+    }
     pos = nextClose.to;
     for (var i = 1; i < onCx; i++) {
       var next = CodeMirror.scanForClosingTag(cm, pos, null, end);
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 106ba4f32c..7575b3707e 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -29,7 +29,7 @@
       token.string = token.string.slice(0, cur.ch - token.start);
     }
     var inner = CodeMirror.innerMode(cm.getMode(), token.state);
-    if (inner.mode.name != "xml") return;
+    if (!inner.mode.xmlCurrentTag) return
     var result = [], replaceToken = false, prefix;
     var tag = /\btag\b/.test(token.type) && !/>$/.test(token.string);
     var tagName = tag && /^\w/.test(token.string), tagStart;
@@ -44,12 +44,15 @@
       tagType = "close";
     }
 
-    if (!tag && !inner.state.tagName || tagType) {
+    var tagInfo = inner.mode.xmlCurrentTag(inner.state)
+    if (!tag && !tagInfo || tagType) {
       if (tagName)
         prefix = token.string;
       replaceToken = tagType;
-      var cx = inner.state.context, curTag = cx && tags[cx.tagName];
-      var childList = cx ? curTag && curTag.children : tags["!top"];
+      var context = inner.mode.xmlCurrentContext ? inner.mode.xmlCurrentContext(inner.state) : []
+      var inner = context.length && context[context.length - 1]
+      var curTag = inner && tags[inner]
+      var childList = inner ? curTag && curTag.children : tags["!top"];
       if (childList && tagType != "close") {
         for (var i = 0; i < childList.length; ++i) if (!prefix || matches(childList[i], prefix, matchInMiddle))
           result.push("<" + childList[i]);
@@ -58,11 +61,11 @@
           if (tags.hasOwnProperty(name) && name != "!top" && name != "!attrs" && (!prefix || matches(name, prefix, matchInMiddle)))
             result.push("<" + name);
       }
-      if (cx && (!prefix || tagType == "close" && matches(cx.tagName, prefix, matchInMiddle)))
-        result.push("</" + cx.tagName + ">");
+      if (inner && (!prefix || tagType == "close" && matches(inner, prefix, matchInMiddle)))
+        result.push("</" + inner + ">");
     } else {
       // Attribute completion
-      var curTag = tags[inner.state.tagName], attrs = curTag && curTag.attrs;
+      var curTag = tagInfo && tags[tagInfo.name], attrs = curTag && curTag.attrs;
       var globalAttrs = tags["!attrs"];
       if (!attrs && !globalAttrs) return;
       if (!attrs) {
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index b67bf850b1..73c6e0e0dd 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -390,6 +390,17 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
     skipAttribute: function(state) {
       if (state.state == attrValueState)
         state.state = attrState
+    },
+
+    xmlCurrentTag: function(state) {
+      return state.tagName ? {name: state.tagName, close: state.type == "closeTag"} : null
+    },
+
+    xmlCurrentContext: function(state) {
+      var context = []
+      for (var cx = state.context; cx; cx = cx.prev)
+        if (cx.tagName) context.push(cx.tagName)
+      return context.reverse()
     }
   };
 });

From 0340b0d348249ba85f36e099738e55dd8c03f255 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Sep 2019 09:11:30 +0200
Subject: [PATCH 4088/4742] Mark version 5.49.0

---
 AUTHORS           |  5 +++++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b73067ce79..3afa74b9fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -77,6 +77,7 @@ AQNOUCH Mohammed
 Aram Shatakhtsyan
 areos
 Arnab Bose
+Arnoud Buzing
 Arsène von Wyss
 Arthur Müller
 Arun Narasani
@@ -485,6 +486,7 @@ Mário Gonçalves
 Mario Pietsch
 Mark Anderson
 Mark Dalgleish
+Mark Hamstra
 Mark Lentczner
 Marko Bonaci
 Mark Peace
@@ -508,6 +510,7 @@ Matthew Rathbone
 Matthew Suozzo
 Matthias Bussonnier
 Matthias BUSSONNIER
+Mattia Astorino
 Matt MacPherson
 Matt McDonald
 Matt Pass
@@ -636,6 +639,7 @@ Pontus Melke
 prasanthj
 Prasanth J
 Prayag Verma
+prendota
 Prendota
 Qiang Li
 Radek Piórkowski
@@ -823,5 +827,6 @@ Zachary Dremann
 Zeno Rocha
 Zhang Hao
 Ziv
+zoobestik
 zziuni
 魏鹏刚
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7256b863dd..73adcdc6f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 5.49.0 (2019-09-20)
+
+### Bug fixes
+
+[octave mode](https://codemirror.net/mode/octave/index.html): Don't mark common punctuation as error.
+
+[clike mode](https://codemirror.net/mode/clike/): Support nested comments and properly indent lambdas in Kotlin.
+
+[foldgutter](https://codemirror.net/doc/manual.html#addon_foldgutter) and [annotatescrollbar](https://codemirror.net/doc/manual.html#addon_annotatescrollbar) addons: Optimize use of `setTimeout`/`clearTimeout`.
+
+### New features
+
+New themes: [moxer](https://codemirror.net/demo/theme.html#moxer), [material-darker](https://codemirror.net/demo/theme.html#material-darker), [material-palenight](https://codemirror.net/demo/theme.html#material-palenight), [material-ocean](https://codemirror.net/demo/theme.html#material-ocean).
+
+[xml mode](https://codemirror.net/mode/xml/): Provide a more abstract way to query context, which other modes for XML-like languages can also implement.
+
 ## 5.48.4 (2019-08-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 6a96a66ded..0a16b2e257 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.48.4</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.49.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 73235e8592..4c1ef75b83 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-09-2019: <a href="https://codemirror.net/codemirror-5.49.0.zip">Version 5.49.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>New themes: <a href="https://codemirror.net/demo/theme.html#moxer">moxer</a>, <a href="https://codemirror.net/demo/theme.html#material-darker">material-darker</a>, <a href="https://codemirror.net/demo/theme.html#material-palenight">material-palenight</a>, <a href="https://codemirror.net/demo/theme.html#material-ocean">material-ocean</a>.</li>
+    <li><a href="https://codemirror.net/mode/xml/">xml mode</a>: Provide a more abstract way to query context, which other modes for XML-like languages can also implement.</li>
+    <li><a href="https://codemirror.net/mode/octave/index.html">octave mode</a>: Don’t mark common punctuation as error.</li>
+    <li><a href="https://codemirror.net/mode/clike/">clike mode</a>: Support nested comments and properly indent lambdas in Kotlin.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_foldgutter">foldgutter</a> and <a href="https://codemirror.net/doc/manual.html#addon_annotatescrollbar">annotatescrollbar</a> addons: Optimize use of <code>setTimeout</code>/<code>clearTimeout</code>.</li>
+  </ul>
+
   <p class="rel">20-08-2019: <a href="https://codemirror.net/codemirror-5.48.4.zip">Version 5.48.4</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 95b1afb4a7..cb779743db 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.48.4</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.49.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 7186b02b57..966836807e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.48.4",
+  "version": "5.49.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 92478df3aa..94c41b8922 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.48.4"
+CodeMirror.version = "5.49.0"

From c386446a7c121cc9389e1a18eba3c3e04c4a9945 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Sep 2019 09:25:16 +0200
Subject: [PATCH 4089/4742] Bump version number post-5.49.0

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 0a16b2e257..9a7898b3d4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.49.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.49.1</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 966836807e..8b39b8a774 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.49.0",
+  "version": "5.49.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 94c41b8922..5acfc83777 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.49.0"
+CodeMirror.version = "5.49.1"

From 782b791afc1ab4a511cc38b6112a3d2457ccb39f Mon Sep 17 00:00:00 2001
From: Joo <joo@joostory.net>
Date: Mon, 23 Sep 2019 01:09:32 +0900
Subject: [PATCH 4090/4742] [real world] add Tistory

Tistory is blog service in South Korea.
Tistory uses CodeMirror at post markdown/html editor and skin editor.
---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index ff5f815b00..8460755c81 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -170,6 +170,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
       <li><a href="http://www.mapbox.com/tilemill/">TileMill</a> (map design tool)</li>
       <li><a href="http://doc.tiki.org/Syntax+Highlighter">Tiki</a> (wiki CMS groupware)</li>
+      <li><a href="https://www.tistory.com">Tistory</a> (blog service)</li>
       <li><a href="http://www.toolsverse.com/products/data-explorer/">Toolsverse Data Explorer</a> (database management)</li>
       <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>
       <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>

From db6fd334a8f43317bd9d31e8b7e7e5afc0ba8912 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 24 Sep 2019 08:36:46 +0200
Subject: [PATCH 4091/4742] [markdown demo] Include javascript mode

Closes #6011
---
 mode/markdown/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 37203ef398..80f72be6d1 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -8,6 +8,7 @@
 <script src="../../lib/codemirror.js"></script>
 <script src="../../addon/edit/continuelist.js"></script>
 <script src="../xml/xml.js"></script>
+<script src="../javascript/javascript.js"></script>
 <script src="markdown.js"></script>
 <style>
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}

From 1200b14871c49f1509a1b4aff565f6e4d8b49c43 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 24 Sep 2019 08:50:17 +0200
Subject: [PATCH 4092/4742] [markdown mode] Don't reset inline styles at start
 of continued list item

Closes #6012
---
 mode/markdown/markdown.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 7aa3a3e17e..30f94e0918 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -162,12 +162,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (state.indentationDiff === null) {
       state.indentationDiff = state.indentation;
       if (prevLineIsList) {
-        // Reset inline styles which shouldn't propagate aross list items
-        state.em = false;
-        state.strong = false;
-        state.code = false;
-        state.strikethrough = false;
-
         state.list = null;
         // While this list item's marker's indentation is less than the deepest
         //  list item's content's indentation,pop the deepest list item
@@ -226,6 +220,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
       // Add this list item's content's indentation to the stack
       state.listStack.push(state.indentation);
+      // Reset inline styles which shouldn't propagate aross list items
+      state.em = false;
+      state.strong = false;
+      state.code = false;
+      state.strikethrough = false;
 
       if (modeCfg.taskLists && stream.match(taskListRE, false)) {
         state.taskList = true;

From 6da9363d18825ad507d224259bfe5c64bdc817ac Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Mon, 23 Sep 2019 13:08:36 +0300
Subject: [PATCH 4093/4742] [foldgutter] reuse old markers if
 indicatorOpen/Folded is string

---
 addon/fold/foldgutter.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index e57a1df35d..7d46a609b0 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -71,24 +71,36 @@
   }
 
   function updateFoldInfo(cm, from, to) {
-    var opts = cm.state.foldGutter.options, cur = from;
+    var opts = cm.state.foldGutter.options, cur = from - 1;
     var minSize = cm.foldOption(opts, "minFoldSize");
     var func = cm.foldOption(opts, "rangeFinder");
+    // we can reuse the built-in indicator element if its className matches the new state
+    var clsFolded = typeof opts.indicatorFolded == "string" && classTest(opts.indicatorFolded);
+    var clsOpen = typeof opts.indicatorOpen == "string" && classTest(opts.indicatorOpen);
     cm.eachLine(from, to, function(line) {
+      ++cur;
       var mark = null;
+      var old = line.gutterMarkers;
+      if (old) old = old[opts.gutter];
       if (isFolded(cm, cur)) {
+        if (clsFolded && old && clsFolded.test(old.className)) return;
         mark = marker(opts.indicatorFolded);
       } else {
         var pos = Pos(cur, 0);
         var range = func && func(cm, pos);
-        if (range && range.to.line - range.from.line >= minSize)
+        if (range && range.to.line - range.from.line >= minSize) {
+          if (clsOpen && old && clsOpen.test(old.className)) return;
           mark = marker(opts.indicatorOpen);
+        }
       }
+      if (!mark && !old) return;
       cm.setGutterMarker(line, opts.gutter, mark);
-      ++cur;
     });
   }
 
+  // copied from CodeMirror/src/util/dom.js
+  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*") }
+
   function updateInViewport(cm) {
     var vp = cm.getViewport(), state = cm.state.foldGutter;
     if (!state) return;

From e7a69ae1f6b0e1420e64c6b2a1b7fbb699087ef6 Mon Sep 17 00:00:00 2001
From: Oleksandr Yakovenko <alex.jakovenko@gmail.com>
Date: Wed, 25 Sep 2019 13:36:19 +0200
Subject: [PATCH 4094/4742] [darcula theme] Improve contrast of search/matching
 highlighting

---
 theme/darcula.css | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/theme/darcula.css b/theme/darcula.css
index d4a0b53048..2ec81a3557 100644
--- a/theme/darcula.css
+++ b/theme/darcula.css
@@ -4,11 +4,11 @@
  */
 
 .cm-s-darcula  { font-family: Consolas, Menlo, Monaco, 'Lucida Console', 'Liberation Mono', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace, serif;}
-.cm-s-darcula.CodeMirror { background: #2B2B2B; color: #A9B7C6; } 
+.cm-s-darcula.CodeMirror { background: #2B2B2B; color: #A9B7C6; }
 
 .cm-s-darcula span.cm-meta { color: #BBB529; }
 .cm-s-darcula span.cm-number { color: #6897BB; }
-.cm-s-darcula span.cm-keyword { color: #CC7832; line-height: 1em; font-weight: bold; }  
+.cm-s-darcula span.cm-keyword { color: #CC7832; line-height: 1em; font-weight: bold; }
 .cm-s-darcula span.cm-def { color: #A9B7C6; font-style: italic; }
 .cm-s-darcula span.cm-variable { color: #A9B7C6; }
 .cm-s-darcula span.cm-variable-2 { color: #A9B7C6; }
@@ -18,7 +18,7 @@
 .cm-s-darcula span.cm-operator { color: #A9B7C6; }
 .cm-s-darcula span.cm-string { color: #6A8759; }
 .cm-s-darcula span.cm-string-2 { color: #6A8759; }
-.cm-s-darcula span.cm-comment { color: #61A151; font-style: italic; } 
+.cm-s-darcula span.cm-comment { color: #61A151; font-style: italic; }
 .cm-s-darcula span.cm-link { color: #CC7832; }
 .cm-s-darcula span.cm-atom { color: #CC7832; }
 .cm-s-darcula span.cm-error { color: #BC3F3C; }
@@ -28,16 +28,18 @@
 .cm-s-darcula span.cm-bracket { color: #A9B7C6; }
 .cm-s-darcula span.cm-builtin { color: #FF9E59; }
 .cm-s-darcula span.cm-special { color: #FF9E59; }
+.cm-s-darcula span.cm-matchhighlight { color: #FFFFFF; background-color: rgba(50, 89, 48, .7); font-weight: normal;}
+.cm-s-darcula span.cm-searching { color: #FFFFFF; background-color: rgba(61, 115, 59, .7); font-weight: normal;}
 
-.cm-s-darcula .CodeMirror-cursor { border-left: 1px solid #A9B7C6; }  
-.cm-s-darcula .CodeMirror-activeline-background { background: #323232; } 
-.cm-s-darcula .CodeMirror-gutters { background: #313335; border-right: 1px solid #313335; } 
-.cm-s-darcula .CodeMirror-guttermarker { color: #FFEE80; }  
-.cm-s-darcula .CodeMirror-guttermarker-subtle { color: #D0D0D0; }  
-.cm-s-darcula .CodeMirrir-linenumber { color: #606366; } 
-.cm-s-darcula .CodeMirror-matchingbracket { background-color: #3B514D; color: #FFEF28 !important; font-weight: bold; } 
+.cm-s-darcula .CodeMirror-cursor { border-left: 1px solid #A9B7C6; }
+.cm-s-darcula .CodeMirror-activeline-background { background: #323232; }
+.cm-s-darcula .CodeMirror-gutters { background: #313335; border-right: 1px solid #313335; }
+.cm-s-darcula .CodeMirror-guttermarker { color: #FFEE80; }
+.cm-s-darcula .CodeMirror-guttermarker-subtle { color: #D0D0D0; }
+.cm-s-darcula .CodeMirrir-linenumber { color: #606366; }
+.cm-s-darcula .CodeMirror-matchingbracket { background-color: #3B514D; color: #FFEF28 !important; font-weight: bold; }
 
-.cm-s-darcula div.CodeMirror-selected { background: #214283; }  
+.cm-s-darcula div.CodeMirror-selected { background: #214283; }
 
 .CodeMirror-hints.darcula {
   font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;

From 268de539a8be79b59a518cfc0c00c22ad98739f6 Mon Sep 17 00:00:00 2001
From: "oscar.lofwenhamn" <44643697+oscarlofwenhamn@users.noreply.github.com>
Date: Fri, 4 Oct 2019 15:51:07 +0200
Subject: [PATCH 4095/4742] Add alt attribute to codemirror logo images

---
 mode/apl/index.html              | 2 +-
 mode/asciiarmor/index.html       | 2 +-
 mode/asn.1/index.html            | 2 +-
 mode/asterisk/index.html         | 2 +-
 mode/brainfuck/index.html        | 2 +-
 mode/clike/index.html            | 2 +-
 mode/clike/scala.html            | 2 +-
 mode/clojure/index.html          | 2 +-
 mode/cmake/index.html            | 2 +-
 mode/cobol/index.html            | 2 +-
 mode/coffeescript/index.html     | 2 +-
 mode/commonlisp/index.html       | 2 +-
 mode/crystal/index.html          | 2 +-
 mode/css/gss.html                | 2 +-
 mode/css/index.html              | 2 +-
 mode/css/less.html               | 2 +-
 mode/css/scss.html               | 2 +-
 mode/cypher/index.html           | 2 +-
 mode/d/index.html                | 2 +-
 mode/dart/index.html             | 2 +-
 mode/diff/index.html             | 2 +-
 mode/django/index.html           | 2 +-
 mode/dockerfile/index.html       | 2 +-
 mode/dtd/index.html              | 2 +-
 mode/dylan/index.html            | 2 +-
 mode/ebnf/index.html             | 2 +-
 mode/ecl/index.html              | 2 +-
 mode/eiffel/index.html           | 2 +-
 mode/elm/index.html              | 2 +-
 mode/erlang/index.html           | 2 +-
 mode/factor/index.html           | 2 +-
 mode/fcl/index.html              | 2 +-
 mode/forth/index.html            | 2 +-
 mode/fortran/index.html          | 2 +-
 mode/gas/index.html              | 2 +-
 mode/gfm/index.html              | 2 +-
 mode/gherkin/index.html          | 2 +-
 mode/go/index.html               | 2 +-
 mode/groovy/index.html           | 2 +-
 mode/haml/index.html             | 2 +-
 mode/handlebars/index.html       | 2 +-
 mode/haskell/index.html          | 2 +-
 mode/haxe/index.html             | 2 +-
 mode/htmlembedded/index.html     | 2 +-
 mode/htmlmixed/index.html        | 2 +-
 mode/http/index.html             | 2 +-
 mode/idl/index.html              | 2 +-
 mode/javascript/index.html       | 2 +-
 mode/javascript/typescript.html  | 2 +-
 mode/jinja2/index.html           | 2 +-
 mode/jsx/index.html              | 2 +-
 mode/julia/index.html            | 2 +-
 mode/livescript/index.html       | 2 +-
 mode/lua/index.html              | 2 +-
 mode/markdown/index.html         | 2 +-
 mode/mathematica/index.html      | 2 +-
 mode/mbox/index.html             | 2 +-
 mode/mirc/index.html             | 2 +-
 mode/mllike/index.html           | 2 +-
 mode/modelica/index.html         | 2 +-
 mode/mscgen/index.html           | 2 +-
 mode/mumps/index.html            | 2 +-
 mode/nginx/index.html            | 2 +-
 mode/nsis/index.html             | 2 +-
 mode/ntriples/index.html         | 2 +-
 mode/octave/index.html           | 2 +-
 mode/oz/index.html               | 2 +-
 mode/pascal/index.html           | 2 +-
 mode/pegjs/index.html            | 2 +-
 mode/perl/index.html             | 2 +-
 mode/php/index.html              | 2 +-
 mode/pig/index.html              | 2 +-
 mode/powershell/index.html       | 2 +-
 mode/properties/index.html       | 2 +-
 mode/protobuf/index.html         | 2 +-
 mode/pug/index.html              | 2 +-
 mode/puppet/index.html           | 2 +-
 mode/python/index.html           | 2 +-
 mode/q/index.html                | 2 +-
 mode/r/index.html                | 2 +-
 mode/rpm/index.html              | 2 +-
 mode/rst/index.html              | 2 +-
 mode/ruby/index.html             | 2 +-
 mode/rust/index.html             | 2 +-
 mode/sas/index.html              | 2 +-
 mode/sass/index.html             | 2 +-
 mode/scheme/index.html           | 2 +-
 mode/shell/index.html            | 2 +-
 mode/sieve/index.html            | 2 +-
 mode/slim/index.html             | 2 +-
 mode/smalltalk/index.html        | 2 +-
 mode/smarty/index.html           | 2 +-
 mode/solr/index.html             | 2 +-
 mode/soy/index.html              | 2 +-
 mode/sparql/index.html           | 2 +-
 mode/spreadsheet/index.html      | 2 +-
 mode/sql/index.html              | 2 +-
 mode/stex/index.html             | 2 +-
 mode/stylus/index.html           | 2 +-
 mode/swift/index.html            | 2 +-
 mode/tcl/index.html              | 2 +-
 mode/textile/index.html          | 2 +-
 mode/tiddlywiki/index.html       | 2 +-
 mode/tiki/index.html             | 2 +-
 mode/toml/index.html             | 2 +-
 mode/tornado/index.html          | 2 +-
 mode/troff/index.html            | 2 +-
 mode/ttcn-cfg/index.html         | 2 +-
 mode/ttcn/index.html             | 2 +-
 mode/turtle/index.html           | 2 +-
 mode/twig/index.html             | 2 +-
 mode/vb/index.html               | 2 +-
 mode/vbscript/index.html         | 2 +-
 mode/velocity/index.html         | 2 +-
 mode/verilog/index.html          | 2 +-
 mode/vhdl/index.html             | 2 +-
 mode/vue/index.html              | 2 +-
 mode/xml/index.html              | 2 +-
 mode/xquery/index.html           | 2 +-
 mode/yacas/index.html            | 2 +-
 mode/yaml-frontmatter/index.html | 2 +-
 mode/yaml/index.html             | 2 +-
 mode/z80/index.html              | 2 +-
 123 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/mode/apl/index.html b/mode/apl/index.html
index 56ab02ffba..81cef4915b 100644
--- a/mode/apl/index.html
+++ b/mode/apl/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/asciiarmor/index.html b/mode/asciiarmor/index.html
index de39a18573..2ca76cc963 100644
--- a/mode/asciiarmor/index.html
+++ b/mode/asciiarmor/index.html
@@ -9,7 +9,7 @@
 <script src="asciiarmor.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/asn.1/index.html b/mode/asn.1/index.html
index c2bc824a07..c79f489568 100644
--- a/mode/asn.1/index.html
+++ b/mode/asn.1/index.html
@@ -16,7 +16,7 @@
 </style>
 <div id=nav>
     <a href="https://codemirror.net"><h1>CodeMirror</h1>
-        <img id=logo src="../../doc/logo.png">
+        <img id=logo src="../../doc/logo.png" alt="">
     </a>
 
     <ul>
diff --git a/mode/asterisk/index.html b/mode/asterisk/index.html
index b9fc627dd2..de43e34481 100644
--- a/mode/asterisk/index.html
+++ b/mode/asterisk/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/brainfuck/index.html b/mode/brainfuck/index.html
index a04bddb14e..7849e5968a 100644
--- a/mode/brainfuck/index.html
+++ b/mode/brainfuck/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/clike/index.html b/mode/clike/index.html
index ad3a807dd9..0cfae2149e 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -12,7 +12,7 @@
 <script src="clike.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/clike/scala.html b/mode/clike/scala.html
index ddbd9a0cae..3d2123c010 100644
--- a/mode/clike/scala.html
+++ b/mode/clike/scala.html
@@ -10,7 +10,7 @@
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="clike.js"></script>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index ff9ac3ae62..d0634344a1 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -11,7 +11,7 @@
 <script src="clojure.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/cmake/index.html b/mode/cmake/index.html
index 6dcfd7b4a8..edd6838a0f 100644
--- a/mode/cmake/index.html
+++ b/mode/cmake/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/cobol/index.html b/mode/cobol/index.html
index 1e08740529..40feb0014e 100644
--- a/mode/cobol/index.html
+++ b/mode/cobol/index.html
@@ -39,7 +39,7 @@
         .CodeMirror-activeline-background {background: #555555 !important;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/coffeescript/index.html b/mode/coffeescript/index.html
index 650ccf5db8..6d51aab3d3 100644
--- a/mode/coffeescript/index.html
+++ b/mode/coffeescript/index.html
@@ -9,7 +9,7 @@
 <script src="coffeescript.js"></script>
 <style>.CodeMirror {border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/commonlisp/index.html b/mode/commonlisp/index.html
index a5b907e831..59b446080b 100644
--- a/mode/commonlisp/index.html
+++ b/mode/commonlisp/index.html
@@ -9,7 +9,7 @@
 <script src="commonlisp.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/crystal/index.html b/mode/crystal/index.html
index ae4218eec5..bbd26504f1 100644
--- a/mode/crystal/index.html
+++ b/mode/crystal/index.html
@@ -14,7 +14,7 @@
 </style>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/gss.html b/mode/css/gss.html
index 447929bf21..17d24f8ac9 100644
--- a/mode/css/gss.html
+++ b/mode/css/gss.html
@@ -13,7 +13,7 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/index.html b/mode/css/index.html
index b39f126597..6588c408ac 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -12,7 +12,7 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/less.html b/mode/css/less.html
index 6ceb7a0342..f7611ef087 100644
--- a/mode/css/less.html
+++ b/mode/css/less.html
@@ -10,7 +10,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/css/scss.html b/mode/css/scss.html
index 3e42ea6535..525bab2fec 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -10,7 +10,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/cypher/index.html b/mode/cypher/index.html
index 0db7a6a7c6..43631d84df 100644
--- a/mode/cypher/index.html
+++ b/mode/cypher/index.html
@@ -16,7 +16,7 @@
 }
         </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/d/index.html b/mode/d/index.html
index 95437e5e7d..a4ea6c888e 100644
--- a/mode/d/index.html
+++ b/mode/d/index.html
@@ -10,7 +10,7 @@
 <script src="d.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dart/index.html b/mode/dart/index.html
index b68a4c5939..277fd21984 100644
--- a/mode/dart/index.html
+++ b/mode/dart/index.html
@@ -9,7 +9,7 @@
 <script src="dart.js"></script>
 <style>.CodeMirror {border: 1px solid #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/diff/index.html b/mode/diff/index.html
index 5c7ef7dee0..fa052307f6 100644
--- a/mode/diff/index.html
+++ b/mode/diff/index.html
@@ -15,7 +15,7 @@
       span.cm-error.cm-tag { background-color: #2b2; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/django/index.html b/mode/django/index.html
index 384e0067be..728493efea 100644
--- a/mode/django/index.html
+++ b/mode/django/index.html
@@ -13,7 +13,7 @@
 <script src="django.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dockerfile/index.html b/mode/dockerfile/index.html
index 63bb91e6ec..63ad0e548e 100644
--- a/mode/dockerfile/index.html
+++ b/mode/dockerfile/index.html
@@ -10,7 +10,7 @@
 <script src="dockerfile.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dtd/index.html b/mode/dtd/index.html
index 959c346527..9866942d58 100644
--- a/mode/dtd/index.html
+++ b/mode/dtd/index.html
@@ -9,7 +9,7 @@
 <script src="dtd.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/dylan/index.html b/mode/dylan/index.html
index af259528cb..fbb8fe5161 100644
--- a/mode/dylan/index.html
+++ b/mode/dylan/index.html
@@ -12,7 +12,7 @@
 <script src="dylan.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/ebnf/index.html b/mode/ebnf/index.html
index 9bd28a4adf..70d6873038 100644
--- a/mode/ebnf/index.html
+++ b/mode/ebnf/index.html
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id=nav>
-      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/mode/ecl/index.html b/mode/ecl/index.html
index 1acaec332f..c8b1384258 100644
--- a/mode/ecl/index.html
+++ b/mode/ecl/index.html
@@ -9,7 +9,7 @@
 <script src="ecl.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/eiffel/index.html b/mode/eiffel/index.html
index 568fbb79bb..0a431cce42 100644
--- a/mode/eiffel/index.html
+++ b/mode/eiffel/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/elm/index.html b/mode/elm/index.html
index 9bef08a8e3..004b1d4480 100644
--- a/mode/elm/index.html
+++ b/mode/elm/index.html
@@ -9,7 +9,7 @@
 <script src="elm.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index 5f54c0fe98..0462dd9e45 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -11,7 +11,7 @@
 <script src="erlang.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/factor/index.html b/mode/factor/index.html
index 13fe429783..574d402dda 100644
--- a/mode/factor/index.html
+++ b/mode/factor/index.html
@@ -16,7 +16,7 @@
 }
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/fcl/index.html b/mode/fcl/index.html
index 7ea0fd15f8..e51fa166b9 100644
--- a/mode/fcl/index.html
+++ b/mode/fcl/index.html
@@ -11,7 +11,7 @@
 <script src="fcl.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/forth/index.html b/mode/forth/index.html
index 470363f48f..c6f0b5c5c8 100644
--- a/mode/forth/index.html
+++ b/mode/forth/index.html
@@ -16,7 +16,7 @@
 }
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/fortran/index.html b/mode/fortran/index.html
index a799e937f1..1dd45641ac 100644
--- a/mode/fortran/index.html
+++ b/mode/fortran/index.html
@@ -9,7 +9,7 @@
 <script src="fortran.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/gas/index.html b/mode/gas/index.html
index 34eea72da4..c8a89b27de 100644
--- a/mode/gas/index.html
+++ b/mode/gas/index.html
@@ -9,7 +9,7 @@
 <script src="gas.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index 8f6fb8ea80..7d2f38b6ab 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -20,7 +20,7 @@
   .cm-s-default .cm-emoji {color: #009688;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/gherkin/index.html b/mode/gherkin/index.html
index 52e9ff67b2..e51a00ce48 100644
--- a/mode/gherkin/index.html
+++ b/mode/gherkin/index.html
@@ -9,7 +9,7 @@
 <script src="gherkin.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/go/index.html b/mode/go/index.html
index 4489211043..10ec0249d9 100644
--- a/mode/go/index.html
+++ b/mode/go/index.html
@@ -11,7 +11,7 @@
 <script src="go.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/groovy/index.html b/mode/groovy/index.html
index 3e022fdf09..9d40fb8efb 100644
--- a/mode/groovy/index.html
+++ b/mode/groovy/index.html
@@ -10,7 +10,7 @@
 <script src="groovy.js"></script>
 <style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haml/index.html b/mode/haml/index.html
index ba3ea3062c..ac1348d096 100644
--- a/mode/haml/index.html
+++ b/mode/haml/index.html
@@ -13,7 +13,7 @@
 <script src="haml.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
index e2da2e766f..1b5f628b44 100644
--- a/mode/handlebars/index.html
+++ b/mode/handlebars/index.html
@@ -13,7 +13,7 @@
 <script src="handlebars.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haskell/index.html b/mode/haskell/index.html
index 4d56682973..598cbb55e9 100644
--- a/mode/haskell/index.html
+++ b/mode/haskell/index.html
@@ -11,7 +11,7 @@
 <script src="haskell.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/haxe/index.html b/mode/haxe/index.html
index 89dacdfb59..65e31f44c3 100644
--- a/mode/haxe/index.html
+++ b/mode/haxe/index.html
@@ -9,7 +9,7 @@
 <script src="haxe.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index 4257237af1..b1cafde973 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -14,7 +14,7 @@
 <script src="htmlembedded.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index 7de1e03503..c70bf1653f 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -14,7 +14,7 @@
 <script src="htmlmixed.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/http/index.html b/mode/http/index.html
index b631ec5294..80d585ef4a 100644
--- a/mode/http/index.html
+++ b/mode/http/index.html
@@ -9,7 +9,7 @@
 <script src="http.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/idl/index.html b/mode/idl/index.html
index 6ef17d093e..915b1f27ff 100644
--- a/mode/idl/index.html
+++ b/mode/idl/index.html
@@ -10,7 +10,7 @@
 <script src="idl.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 4eff2e28bc..d1f7f68e8a 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -12,7 +12,7 @@
 <script src="javascript.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index 3b217a44f9..7da84d2add 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -10,7 +10,7 @@
 <script src="javascript.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index a942549dac..2f626d1995 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -9,7 +9,7 @@
 <script src="jinja2.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/jsx/index.html b/mode/jsx/index.html
index 4df632e1f7..ef03834e08 100644
--- a/mode/jsx/index.html
+++ b/mode/jsx/index.html
@@ -11,7 +11,7 @@
 <script src="jsx.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/julia/index.html b/mode/julia/index.html
index 0261c921f8..7a9217bc3e 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -10,7 +10,7 @@
 <script src="julia.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/livescript/index.html b/mode/livescript/index.html
index 297b1c7bc2..05e4b2fdd3 100644
--- a/mode/livescript/index.html
+++ b/mode/livescript/index.html
@@ -10,7 +10,7 @@
 <script src="livescript.js"></script>
 <style>.CodeMirror {font-size: 80%;border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/lua/index.html b/mode/lua/index.html
index 59f4df3e32..05c94462c2 100644
--- a/mode/lua/index.html
+++ b/mode/lua/index.html
@@ -11,7 +11,7 @@
 <script src="lua.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 80f72be6d1..f0a359d600 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -17,7 +17,7 @@
       .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mathematica/index.html b/mode/mathematica/index.html
index 2e5a5748fc..accce207a4 100644
--- a/mode/mathematica/index.html
+++ b/mode/mathematica/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mbox/index.html b/mode/mbox/index.html
index c70cf36074..6dcc4b8fae 100644
--- a/mode/mbox/index.html
+++ b/mode/mbox/index.html
@@ -9,7 +9,7 @@
 <script src="mbox.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mirc/index.html b/mode/mirc/index.html
index 98f81750fa..f81641bf1e 100644
--- a/mode/mirc/index.html
+++ b/mode/mirc/index.html
@@ -11,7 +11,7 @@
 <script src="mirc.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mllike/index.html b/mode/mllike/index.html
index 491373171f..6e8f2640e6 100644
--- a/mode/mllike/index.html
+++ b/mode/mllike/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/modelica/index.html b/mode/modelica/index.html
index ed344e712f..9ab4b48853 100644
--- a/mode/modelica/index.html
+++ b/mode/modelica/index.html
@@ -12,7 +12,7 @@
 <script src="modelica.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/mscgen/index.html b/mode/mscgen/index.html
index a35ffd4320..5f2e826d22 100644
--- a/mode/mscgen/index.html
+++ b/mode/mscgen/index.html
@@ -9,7 +9,7 @@
 <script src="mscgen.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
diff --git a/mode/mumps/index.html b/mode/mumps/index.html
index 9340867eef..4af4e0adec 100644
--- a/mode/mumps/index.html
+++ b/mode/mumps/index.html
@@ -9,7 +9,7 @@
 <script src="mumps.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index 7d4ad7e630..5c2bc6e2cf 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -21,7 +21,7 @@
     }
   </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/nsis/index.html b/mode/nsis/index.html
index 4bd73650af..71a65d7d8e 100644
--- a/mode/nsis/index.html
+++ b/mode/nsis/index.html
@@ -13,7 +13,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index 63a695d527..5473dbffc0 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -14,7 +14,7 @@
       }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 698ae7df92..033e351486 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -10,7 +10,7 @@
 <script src="octave.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/oz/index.html b/mode/oz/index.html
index fb9df83e1a..0b44d7f34d 100644
--- a/mode/oz/index.html
+++ b/mode/oz/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border: 1px solid #aaa;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
   <ul>
     <li><a href="../../index.html">Home</a>
     <li><a href="../../doc/manual.html">Manual</a>
diff --git a/mode/pascal/index.html b/mode/pascal/index.html
index f0c49f4708..414be54c4f 100644
--- a/mode/pascal/index.html
+++ b/mode/pascal/index.html
@@ -9,7 +9,7 @@
 <script src="pascal.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/pegjs/index.html b/mode/pegjs/index.html
index 9d452aa9cc..47129f5540 100644
--- a/mode/pegjs/index.html
+++ b/mode/pegjs/index.html
@@ -13,7 +13,7 @@
   </head>
   <body>
     <div id=nav>
-      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/mode/perl/index.html b/mode/perl/index.html
index 901718a4c5..b879b33553 100644
--- a/mode/perl/index.html
+++ b/mode/perl/index.html
@@ -9,7 +9,7 @@
 <script src="perl.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/php/index.html b/mode/php/index.html
index 689764146a..0de6ae64b7 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -15,7 +15,7 @@
 <script src="php.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/pig/index.html b/mode/pig/index.html
index 80fed6e1c0..109442cf73 100644
--- a/mode/pig/index.html
+++ b/mode/pig/index.html
@@ -8,7 +8,7 @@
 <script src="pig.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/powershell/index.html b/mode/powershell/index.html
index 81c050a815..6bb7babce2 100644
--- a/mode/powershell/index.html
+++ b/mode/powershell/index.html
@@ -12,7 +12,7 @@
   </head>
   <body>
     <div id=nav>
-      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
       <ul>
         <li><a href="../../index.html">Home</a>
diff --git a/mode/properties/index.html b/mode/properties/index.html
index eb49f92914..d121dc9a1e 100644
--- a/mode/properties/index.html
+++ b/mode/properties/index.html
@@ -9,7 +9,7 @@
 <script src="properties.js"></script>
 <style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/protobuf/index.html b/mode/protobuf/index.html
index ee58cd9a46..9af2cff794 100644
--- a/mode/protobuf/index.html
+++ b/mode/protobuf/index.html
@@ -9,7 +9,7 @@
 <script src="protobuf.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/pug/index.html b/mode/pug/index.html
index dfc8968dbc..a36f04784a 100644
--- a/mode/pug/index.html
+++ b/mode/pug/index.html
@@ -13,7 +13,7 @@
 <script src="pug.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/puppet/index.html b/mode/puppet/index.html
index 757377b1d2..fe29237139 100644
--- a/mode/puppet/index.html
+++ b/mode/puppet/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/python/index.html b/mode/python/index.html
index 90ee324a21..bdfc8f574c 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -10,7 +10,7 @@
 <script src="python.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/q/index.html b/mode/q/index.html
index 930e133d49..a34b7b49bb 100644
--- a/mode/q/index.html
+++ b/mode/q/index.html
@@ -10,7 +10,7 @@
 <script src="q.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/r/index.html b/mode/r/index.html
index 28192dabc5..da8745ffa6 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -15,7 +15,7 @@
       .cm-s-default span.cm-arg-is { color: brown; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/rpm/index.html b/mode/rpm/index.html
index e20e53debc..aa1dec990d 100644
--- a/mode/rpm/index.html
+++ b/mode/rpm/index.html
@@ -11,7 +11,7 @@
     <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/rst/index.html b/mode/rst/index.html
index 1ced39ca96..4e001f8e9e 100644
--- a/mode/rst/index.html
+++ b/mode/rst/index.html
@@ -10,7 +10,7 @@
 <script src="rst.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 486b1e2454..55fe6c5892 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -13,7 +13,7 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/rust/index.html b/mode/rust/index.html
index ce9789851f..d543a8d6c6 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -10,7 +10,7 @@
 <script src="rust.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sas/index.html b/mode/sas/index.html
index b8627484e0..7877002d05 100644
--- a/mode/sas/index.html
+++ b/mode/sas/index.html
@@ -15,7 +15,7 @@
   .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sass/index.html b/mode/sass/index.html
index 0db5eacbcf..bf5cdb2030 100644
--- a/mode/sass/index.html
+++ b/mode/sass/index.html
@@ -11,7 +11,7 @@
 <script src="sass.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/scheme/index.html b/mode/scheme/index.html
index f2eda51d66..d0c140e829 100644
--- a/mode/scheme/index.html
+++ b/mode/scheme/index.html
@@ -9,7 +9,7 @@
 <script src="scheme.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/shell/index.html b/mode/shell/index.html
index a844c1a40b..6aed459b8b 100644
--- a/mode/shell/index.html
+++ b/mode/shell/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sieve/index.html b/mode/sieve/index.html
index 36369acba2..ebceba3534 100644
--- a/mode/sieve/index.html
+++ b/mode/sieve/index.html
@@ -9,7 +9,7 @@
 <script src="sieve.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/slim/index.html b/mode/slim/index.html
index 7aebf0aef1..bade96dd21 100644
--- a/mode/slim/index.html
+++ b/mode/slim/index.html
@@ -20,7 +20,7 @@
 <script src="slim.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/smalltalk/index.html b/mode/smalltalk/index.html
index 2dd45a2060..a64b2ffee6 100644
--- a/mode/smalltalk/index.html
+++ b/mode/smalltalk/index.html
@@ -14,7 +14,7 @@
       .CodeMirror-gutter pre {color: white; font-weight: bold;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index 2082916d16..2f7ea88a74 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -10,7 +10,7 @@
 <script src="smarty.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/solr/index.html b/mode/solr/index.html
index 52eb87d99c..f055b5a74e 100644
--- a/mode/solr/index.html
+++ b/mode/solr/index.html
@@ -18,7 +18,7 @@
   }
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/soy/index.html b/mode/soy/index.html
index 718e955593..2979846abe 100644
--- a/mode/soy/index.html
+++ b/mode/soy/index.html
@@ -14,7 +14,7 @@
 <script src="soy.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index dfd3f9070a..59fb877b94 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -10,7 +10,7 @@
 <script src="sparql.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/spreadsheet/index.html b/mode/spreadsheet/index.html
index 6589bcc727..6850eaa879 100644
--- a/mode/spreadsheet/index.html
+++ b/mode/spreadsheet/index.html
@@ -10,7 +10,7 @@
 <script src="spreadsheet.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/sql/index.html b/mode/sql/index.html
index 5791c968c8..05cafbe50d 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -18,7 +18,7 @@
 }
         </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/stex/index.html b/mode/stex/index.html
index 225f485fe2..2c67ab2597 100644
--- a/mode/stex/index.html
+++ b/mode/stex/index.html
@@ -9,7 +9,7 @@
 <script src="stex.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/stylus/index.html b/mode/stylus/index.html
index 491c14d55b..2c043391c4 100644
--- a/mode/stylus/index.html
+++ b/mode/stylus/index.html
@@ -11,7 +11,7 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;} form{margin-bottom: .7em;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/swift/index.html b/mode/swift/index.html
index ce2a3a02f9..e593f7eeab 100644
--- a/mode/swift/index.html
+++ b/mode/swift/index.html
@@ -12,7 +12,7 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tcl/index.html b/mode/tcl/index.html
index 328c9eaf3a..8c183970b3 100644
--- a/mode/tcl/index.html
+++ b/mode/tcl/index.html
@@ -10,7 +10,7 @@
 <script src="tcl.js"></script>
 <script src="../../addon/scroll/scrollpastend.js"></script>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/textile/index.html b/mode/textile/index.html
index e8d9b99a7c..865b9cebcf 100644
--- a/mode/textile/index.html
+++ b/mode/textile/index.html
@@ -9,7 +9,7 @@
 <script src="textile.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index 8e1e5b1021..28dffe1c14 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -11,7 +11,7 @@
 <script src="tiddlywiki.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tiki/index.html b/mode/tiki/index.html
index 40e9855737..1a66d5a46f 100644
--- a/mode/tiki/index.html
+++ b/mode/tiki/index.html
@@ -10,7 +10,7 @@
 <script src="tiki.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/toml/index.html b/mode/toml/index.html
index 5c359c79c0..aa19591941 100644
--- a/mode/toml/index.html
+++ b/mode/toml/index.html
@@ -9,7 +9,7 @@
 <script src="toml.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tornado/index.html b/mode/tornado/index.html
index 6b261cf073..96d0d0b35a 100644
--- a/mode/tornado/index.html
+++ b/mode/tornado/index.html
@@ -12,7 +12,7 @@
 <script src="tornado.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/troff/index.html b/mode/troff/index.html
index 1810764214..ad5bf7af4e 100644
--- a/mode/troff/index.html
+++ b/mode/troff/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/ttcn-cfg/index.html b/mode/ttcn-cfg/index.html
index 0cc8048b25..73833aca94 100644
--- a/mode/ttcn-cfg/index.html
+++ b/mode/ttcn-cfg/index.html
@@ -16,7 +16,7 @@
 </style>
 <div id=nav>
     <a href="https://codemirror.net"><h1>CodeMirror</h1>
-        <img id=logo src="../../doc/logo.png">
+        <img id=logo src="../../doc/logo.png" alt="">
     </a>
 
     <ul>
diff --git a/mode/ttcn/index.html b/mode/ttcn/index.html
index d63043413d..592d2f2af7 100644
--- a/mode/ttcn/index.html
+++ b/mode/ttcn/index.html
@@ -16,7 +16,7 @@
 </style>
 <div id=nav>
     <a href="https://codemirror.net"><h1>CodeMirror</h1>
-        <img id=logo src="../../doc/logo.png">
+        <img id=logo src="../../doc/logo.png" alt="">
     </a>
 
     <ul>
diff --git a/mode/turtle/index.html b/mode/turtle/index.html
index 79fe6dfdfe..6a2b4ba444 100644
--- a/mode/turtle/index.html
+++ b/mode/turtle/index.html
@@ -10,7 +10,7 @@
 <script src="turtle.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/twig/index.html b/mode/twig/index.html
index 12c8d6b0e4..7552eacd73 100644
--- a/mode/twig/index.html
+++ b/mode/twig/index.html
@@ -9,7 +9,7 @@
 <script src="twig.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vb/index.html b/mode/vb/index.html
index 83c7182aad..84922c1908 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -15,7 +15,7 @@
       .CodeMirror pre { font-family: Inconsolata; font-size: 14px}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vbscript/index.html b/mode/vbscript/index.html
index 95a7da52fa..5db9c00b9f 100644
--- a/mode/vbscript/index.html
+++ b/mode/vbscript/index.html
@@ -9,7 +9,7 @@
 <script src="vbscript.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index b38c570df7..59d05c17a4 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -10,7 +10,7 @@
 <script src="velocity.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index e38cf276b5..c159dbe14c 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -10,7 +10,7 @@
 <script src="verilog.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vhdl/index.html b/mode/vhdl/index.html
index ed34c25968..50b6a10e12 100644
--- a/mode/vhdl/index.html
+++ b/mode/vhdl/index.html
@@ -10,7 +10,7 @@
 <script src="vhdl.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/vue/index.html b/mode/vue/index.html
index 3888e3deb9..df519a5cb7 100644
--- a/mode/vue/index.html
+++ b/mode/vue/index.html
@@ -21,7 +21,7 @@
 <script src="vue.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/xml/index.html b/mode/xml/index.html
index 42d7d86cdd..c0dec45904 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -9,7 +9,7 @@
 <script src="xml.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/xquery/index.html b/mode/xquery/index.html
index 49960912ce..bca4d06b5a 100644
--- a/mode/xquery/index.html
+++ b/mode/xquery/index.html
@@ -16,7 +16,7 @@
 	}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/yacas/index.html b/mode/yacas/index.html
index 52236fc97d..398725649a 100644
--- a/mode/yacas/index.html
+++ b/mode/yacas/index.html
@@ -12,7 +12,7 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/yaml-frontmatter/index.html b/mode/yaml-frontmatter/index.html
index e6283fc678..f55b5bd8f7 100644
--- a/mode/yaml-frontmatter/index.html
+++ b/mode/yaml-frontmatter/index.html
@@ -13,7 +13,7 @@
 <script src="yaml-frontmatter.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/yaml/index.html b/mode/yaml/index.html
index bfea6111da..6014d9d375 100644
--- a/mode/yaml/index.html
+++ b/mode/yaml/index.html
@@ -9,7 +9,7 @@
 <script src="yaml.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/z80/index.html b/mode/z80/index.html
index 8f97cce2b8..ca53bffefd 100644
--- a/mode/z80/index.html
+++ b/mode/z80/index.html
@@ -9,7 +9,7 @@
 <script src="z80.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>

From 558eb5a4c9dd5071fed0fa6a9acafde5740eff0b Mon Sep 17 00:00:00 2001
From: "oscar.lofwenhamn" <44643697+oscarlofwenhamn@users.noreply.github.com>
Date: Tue, 8 Oct 2019 09:43:35 +0200
Subject: [PATCH 4096/4742] [pug mode] Remove superfluous function arguments

---
 mode/pug/pug.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mode/pug/pug.js b/mode/pug/pug.js
index 8701b02382..a4c0e16b83 100644
--- a/mode/pug/pug.js
+++ b/mode/pug/pug.js
@@ -545,12 +545,12 @@ CodeMirror.defineMode("pug", function (config) {
       || javaScriptArguments(stream, state)
       || callArguments(stream, state)
 
-      || yieldStatement(stream, state)
-      || doctype(stream, state)
+      || yieldStatement(stream)
+      || doctype(stream)
       || interpolation(stream, state)
       || caseStatement(stream, state)
       || when(stream, state)
-      || defaultStatement(stream, state)
+      || defaultStatement(stream)
       || extendsStatement(stream, state)
       || append(stream, state)
       || prepend(stream, state)
@@ -565,16 +565,16 @@ CodeMirror.defineMode("pug", function (config) {
       || tag(stream, state)
       || filter(stream, state)
       || code(stream, state)
-      || id(stream, state)
-      || className(stream, state)
+      || id(stream)
+      || className(stream)
       || attrs(stream, state)
       || attributesBlock(stream, state)
-      || indent(stream, state)
+      || indent(stream)
       || text(stream, state)
       || comment(stream, state)
-      || colon(stream, state)
+      || colon(stream)
       || dot(stream, state)
-      || fail(stream, state);
+      || fail(stream);
 
     return tok === true ? null : tok;
   }

From f5d3554f3c5ed56f02c63e12779341e96ad16a13 Mon Sep 17 00:00:00 2001
From: Frank Seifferth <frankseifferth@posteo.net>
Date: Sun, 6 Oct 2019 17:01:26 +0100
Subject: [PATCH 4097/4742] [yaml-frontmatter mode] Allow pandoc-style closing
 with `...`

This allows to end yaml-frontmatters with either `---` or `...`, as
suggested [on the discussion board][1]. The old behaviour was to just
accept `---`.

[1]: https://discuss.codemirror.net/t/pandoc-markdown-style-yaml-frontmatter/2182
---
 mode/yaml-frontmatter/yaml-frontmatter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
index e9faefcf9b..87fdf80d07 100644
--- a/mode/yaml-frontmatter/yaml-frontmatter.js
+++ b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -45,7 +45,7 @@
             return innerMode.token(stream, state.inner)
           }
         } else if (state.state == FRONTMATTER) {
-          var end = stream.sol() && stream.match(/---/, false)
+          var end = stream.sol() && stream.match(/(---|\.\.\.)/, false)
           var style = yamlMode.token(stream, state.inner)
           if (end) {
             state.state = BODY

From 86a87a2bc749c92fd9fd909183552d50d75f5abf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 8 Oct 2019 10:35:27 +0200
Subject: [PATCH 4098/4742] [sublime bindings] Fix selectNextOccurrence to do
 nothing when all instances are selected

Closes #6024
---
 keymap/sublime.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 799641af20..99b497519e 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -144,8 +144,7 @@
         cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0));
         found = cur.findNext();
       }
-      if (!found || isSelectedRange(cm.listSelections(), cur.from(), cur.to()))
-        return CodeMirror.Pass
+      if (!found || isSelectedRange(cm.listSelections(), cur.from(), cur.to())) return
       cm.addSelection(cur.from(), cur.to());
     }
     if (fullWord)
@@ -175,7 +174,8 @@
 
   function isSelectedRange(ranges, from, to) {
     for (var i = 0; i < ranges.length; i++)
-      if (ranges[i].from() == from && ranges[i].to() == to) return true
+      if (CodeMirror.cmpPos(ranges[i].from(), from) == 0 &&
+          CodeMirror.cmpPos(ranges[i].to(), to) == 0) return true
     return false
   }
 

From b5e77b4498ba925e0d0601e13ebf7f2d16b5da5b Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Mon, 7 Oct 2019 11:31:04 +0300
Subject: [PATCH 4099/4742] [continuecomment] skip some edge cases, respect
 indentWithTabs

* line comment:
  - if both cursor and line comment are at pos 0
  - if cursor is at EOL or in trailing space at EOL, but always continue if the next line is a line comment
* block comment:
  - if it's inside a line comment e.g. // /*
---
 addon/comment/continuecomment.js | 73 +++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 19 deletions(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index a5f957b73b..68928769da 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -9,6 +9,8 @@
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
+  var nonspace = /\S/g;
+  var repeat = String.prototype.repeat || function (n) { return Array(n + 1).join(this); };
   function continueComment(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
     var ranges = cm.listSelections(), mode, inserts = [];
@@ -19,29 +21,56 @@
       if (!mode) mode = modeHere;
       else if (mode != modeHere) return CodeMirror.Pass;
 
-      var insert = null;
-      if (mode.blockCommentStart && mode.blockCommentContinue) {
-        var line = cm.getLine(pos.line).slice(0, pos.ch)
-        var end = line.lastIndexOf(mode.blockCommentEnd), found
-        if (end != -1 && end == pos.ch - mode.blockCommentEnd.length) {
-          // Comment ended, don't continue it
-        } else if ((found = line.lastIndexOf(mode.blockCommentStart)) > -1 && found > end) {
-          insert = line.slice(0, found)
-          if (/\S/.test(insert)) {
-            insert = ""
-            for (var j = 0; j < found; ++j) insert += " "
+      var insert = null, line, found;
+      var blockStart = mode.blockCommentStart, lineCmt = mode.lineComment;
+      if (blockStart && mode.blockCommentContinue) {
+        line = cm.getLine(pos.line);
+        var end = line.lastIndexOf(mode.blockCommentEnd, pos.ch - mode.blockCommentEnd.length);
+        // 1. if this block comment ended
+        // 2. if this is actually inside a line comment
+        if (end != -1 && end == pos.ch - mode.blockCommentEnd.length ||
+            lineCmt && (found = line.lastIndexOf(lineCmt, pos.ch - 1)) > -1 &&
+            /\bcomment\b/.test(cm.getTokenTypeAt({line: pos.line, ch: found + 1}))) {
+          // ...then don't continue it
+        } else if ((found = line.lastIndexOf(blockStart, pos.ch - blockStart.length)) > -1 &&
+                   found > end) {
+          // reuse the existing leading spaces/tabs/mixed
+          // or build the correct indent using CM's tab/indent options
+          if (nonspaceAfter(0, line) >= found) {
+            insert = line.slice(0, found);
+          } else {
+            var tabSize = cm.options.tabSize, numTabs;
+            found = CodeMirror.countColumn(line, found, tabSize);
+            insert = !cm.options.indentWithTabs ? repeat.call(" ", found) :
+              repeat.call("\t", (numTabs = Math.floor(found / tabSize))) +
+              repeat.call(" ", found - tabSize * numTabs);
           }
-        } else if ((found = line.indexOf(mode.blockCommentContinue)) > -1 && !/\S/.test(line.slice(0, found))) {
-          insert = line.slice(0, found)
+        } else if ((found = line.indexOf(mode.blockCommentContinue)) > -1 &&
+                   found <= pos.ch &&
+                   found <= nonspaceAfter(0, line)) {
+          insert = line.slice(0, found);
         }
         if (insert != null) insert += mode.blockCommentContinue
       }
-      if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
-        var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
-        if (found > -1) {
-          insert = line.slice(0, found);
-          if (/\S/.test(insert)) insert = null;
-          else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
+      if (insert == null && lineCmt && continueLineCommentEnabled(cm)) {
+        if (line == null) line = cm.getLine(pos.line);
+        found = line.indexOf(lineCmt);
+        // cursor at pos 0, line comment also at pos 0 => shift it down, don't continue
+        if (!pos.ch && !found) insert = "";
+        // continue only if the line starts with an optional space + line comment
+        else if (found > -1 && nonspaceAfter(0, line) >= found) {
+          // don't continue if there's only space(s) after cursor or the end of the line
+          insert = nonspaceAfter(pos.ch, line) > -1;
+          // but always continue if the next line starts with a line comment too
+          if (!insert) {
+            var next = cm.getLine(pos.line + 1) || '',
+                nextFound = next.indexOf(lineCmt);
+            insert = nextFound > -1 && nonspaceAfter(0, next) >= nextFound || null;
+          }
+          if (insert) {
+            insert = line.slice(0, found) + lineCmt +
+                     line.slice(found + lineCmt.length).match(/^\s*/)[0];
+          }
         }
       }
       if (insert == null) return CodeMirror.Pass;
@@ -54,6 +83,12 @@
     });
   }
 
+  function nonspaceAfter(ch, str) {
+    nonspace.lastIndex = ch;
+    var m = nonspace.exec(str);
+    return m ? m.index : -1;
+  }
+
   function continueLineCommentEnabled(cm) {
     var opt = cm.getOption("continueComments");
     if (opt && typeof opt == "object")

From 5dade133b8f412db3aee070e5660cc5e11f86a3f Mon Sep 17 00:00:00 2001
From: Erik Welander <ewelander@google.com>
Date: Thu, 5 Sep 2019 19:01:16 -0700
Subject: [PATCH 4100/4742] Reduce setTimeout/clearTimeout calls from Delayed

This reduces the time the operation I mentioned in https://github.com/codemirror/CodeMirror/pull/5992 takes to ~450ms.
---
 src/util/misc.js | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/util/misc.js b/src/util/misc.js
index 39661eb448..adb4809fec 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -29,10 +29,27 @@ export function countColumn(string, end, tabSize, startIndex, startValue) {
 }
 
 export class Delayed {
-  constructor() {this.id = null}
+  constructor() {
+    this.id = null
+    this.f = null
+    this.time = 0
+    this.handler = bind(this.onTimeout, this)
+  }
+  onTimeout(self) {
+    self.id = 0
+    if (self.time < Date.now()) {
+      self.f()
+    } else {
+      setTimeout(self.handler, self.time - Date.now())
+    }
+  }
   set(ms, f) {
-    clearTimeout(this.id)
-    this.id = setTimeout(f, ms)
+    this.f = f
+    const time = Date.now() + ms
+    if (!this.id || time < this.time) {
+      clearTimeout(this.id)
+      this.id = setTimeout(this.handler, ms)
+    }
   }
 }
 

From c46d61df8f884bbaff43ada55ec352d65d1c1759 Mon Sep 17 00:00:00 2001
From: Erik Welander <erik@welander.us>
Date: Tue, 8 Oct 2019 07:04:45 -0700
Subject: [PATCH 4101/4742] Switch to +new Date

---
 src/util/misc.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/util/misc.js b/src/util/misc.js
index adb4809fec..bcde9b9412 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -37,18 +37,19 @@ export class Delayed {
   }
   onTimeout(self) {
     self.id = 0
-    if (self.time < Date.now()) {
+    if (self.time < +new Date) {
       self.f()
     } else {
-      setTimeout(self.handler, self.time - Date.now())
+      setTimeout(self.handler, self.time - +new Date)
     }
   }
   set(ms, f) {
     this.f = f
-    const time = Date.now() + ms
+    const time = +new Date + ms
     if (!this.id || time < this.time) {
       clearTimeout(this.id)
       this.id = setTimeout(this.handler, ms)
+      this.time = time
     }
   }
 }

From 632bca3d72128ebf359ce5bd5e1b9b23ddf1d7da Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 9 Oct 2019 11:27:32 +0200
Subject: [PATCH 4102/4742] Reduce chance of needlessly rescheduled Delayed
 calls

Issue #5993
---
 src/util/misc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/misc.js b/src/util/misc.js
index bcde9b9412..3337989bda 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -37,7 +37,7 @@ export class Delayed {
   }
   onTimeout(self) {
     self.id = 0
-    if (self.time < +new Date) {
+    if (self.time <= +new Date) {
       self.f()
     } else {
       setTimeout(self.handler, self.time - +new Date)

From b2c7891435bafa07b94c3d7a95dbd4274cb07ccc Mon Sep 17 00:00:00 2001
From: Ryan Pangrle <RPangrle@users.noreply.github.com>
Date: Sat, 12 Oct 2019 03:02:38 -0700
Subject: [PATCH 4103/4742] [clike mode] Add text/x-objectivec++ type (#6027)

Pull out some of the ObjC and C++ info into vars so they can easily be reused and add a text/x-obejctivec++ type that's effectively the union of the C++ and ObjC definitions.
---
 mode/clike/clike.js | 78 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 62 insertions(+), 16 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index b3cf54e81b..37da2ec964 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -270,6 +270,25 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     "static else struct switch extern typedef union for goto while enum const " +
     "volatile inline restrict asm fortran";
 
+  // Keywords from https://en.cppreference.com/w/cpp/keyword includes C++20.
+  var cppKeywords = "alignas alignof and and_eq audit axiom bitand bitor catch " +
+  "class compl concept constexpr const_cast decltype delete dynamic_cast " +
+  "explicit export final friend import module mutable namespace new noexcept " +
+  "not not_eq operator or or_eq override private protected public " +
+  "reinterpret_cast requires static_assert static_cast template this " +
+  "thread_local throw try typeid typename using virtual xor xor_eq";
+
+  var objCKeywords = "bycopy byref in inout oneway out self super atomic nonatomic retain copy " +
+  "readwrite readonly strong weak assign typeof nullable nonnull null_resettable _cmd " +
+  "@interface @implementation @end @protocol @encode @property @synthesize @dynamic @class " +
+  "@public @package @private @protected @required @optional @try @catch @finally @import " +
+  "@selector @encode @defs @synchronized @autoreleasepool @compatibility_alias @available";
+
+  var objCBuiltins = "FOUNDATION_EXPORT FOUNDATION_EXTERN NS_INLINE NS_FORMAT_FUNCTION " +
+  " NS_RETURNS_RETAINEDNS_ERROR_ENUM NS_RETURNS_NOT_RETAINED NS_RETURNS_INNER_POINTER " +
+  "NS_DESIGNATED_INITIALIZER NS_ENUM NS_OPTIONS NS_REQUIRES_NIL_TERMINATION " +
+  "NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_SWIFT_NAME NS_REFINED_FOR_SWIFT"
+
   // Do not use this. Use the cTypes function below. This is global just to avoid
   // excessive calls when cTypes is being called multiple times during a parse.
   var basicCTypes = words("int long char short double float unsigned signed " +
@@ -420,13 +439,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def(["text/x-c++src", "text/x-c++hdr"], {
     name: "clike",
-    // Keywords from https://en.cppreference.com/w/cpp/keyword includes C++20.
-    keywords: words(cKeywords + "alignas alignof and and_eq audit axiom bitand bitor catch " +
-                    "class compl concept constexpr const_cast decltype delete dynamic_cast " +
-                    "explicit export final friend import module mutable namespace new noexcept " +
-                    "not not_eq operator or or_eq override private protected public " +
-                    "reinterpret_cast requires static_assert static_cast template this " +
-                    "thread_local throw try typeid typename using virtual xor xor_eq"),
+    keywords: words(cKeywords + " " + cppKeywords),
     types: cTypes,
     blockKeywords: words(cBlockKeywords + " class try catch"),
     defKeywords: words(cDefKeywords + " class namespace"),
@@ -769,16 +782,9 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-objectivec", {
     name: "clike",
-    keywords: words(cKeywords + " bycopy byref in inout oneway out self super atomic nonatomic retain copy " +
-                    "readwrite readonly strong weak assign typeof nullable nonnull null_resettable _cmd " +
-                    "@interface @implementation @end @protocol @encode @property @synthesize @dynamic @class " +
-                    "@public @package @private @protected @required @optional @try @catch @finally @import " +
-                    "@selector @encode @defs @synchronized @autoreleasepool @compatibility_alias @available"),
+    keywords: words(cKeywords + " " + objCKeywords),
     types: objCTypes,
-    builtin: words("FOUNDATION_EXPORT FOUNDATION_EXTERN NS_INLINE NS_FORMAT_FUNCTION NS_RETURNS_RETAINED " +
-                   "NS_ERROR_ENUM NS_RETURNS_NOT_RETAINED NS_RETURNS_INNER_POINTER NS_DESIGNATED_INITIALIZER " +
-                   "NS_ENUM NS_OPTIONS NS_REQUIRES_NIL_TERMINATION NS_ASSUME_NONNULL_BEGIN " +
-                   "NS_ASSUME_NONNULL_END NS_SWIFT_NAME NS_REFINED_FOR_SWIFT"),
+    builtin: words(objCBuiltins),
     blockKeywords: words(cBlockKeywords + " @synthesize @try @catch @finally @autoreleasepool @synchronized"),
     defKeywords: words(cDefKeywords + " @interface @implementation @protocol @class"),
     dontIndentStatements: /^@.*$/,
@@ -792,6 +798,46 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 
+  def("text/x-objectivec++", {
+    name: "clike",
+    keywords: words(cKeywords + " " + objCKeywords + " " + cppKeywords),
+    types: objCTypes,
+    builtin: words(objCBuiltins),
+    blockKeywords: words(cBlockKeywords + " @synthesize @try @catch @finally @autoreleasepool @synchronized class try catch"),
+    defKeywords: words(cDefKeywords + " @interface @implementation @protocol @class class namespace"),
+    dontIndentStatements: /^@.*$|^template$/,
+    typeFirstDefinitions: true,
+    atoms: words("YES NO NULL Nil nil true false nullptr"),
+    isReservedIdentifier: cIsReservedIdentifier,
+    hooks: {
+      "#": cppHook,
+      "*": pointerHook,
+      "u": cpp11StringHook,
+      "U": cpp11StringHook,
+      "L": cpp11StringHook,
+      "R": cpp11StringHook,
+      "0": cpp14Literal,
+      "1": cpp14Literal,
+      "2": cpp14Literal,
+      "3": cpp14Literal,
+      "4": cpp14Literal,
+      "5": cpp14Literal,
+      "6": cpp14Literal,
+      "7": cpp14Literal,
+      "8": cpp14Literal,
+      "9": cpp14Literal,
+      token: function(stream, state, style) {
+        if (style == "variable" && stream.peek() == "(" &&
+            (state.prevToken == ";" || state.prevToken == null ||
+             state.prevToken == "}") &&
+            cppLooksLikeConstructor(stream.current()))
+          return "def";
+      }
+    },
+    namespaceSeparator: "::",
+    modeProps: {fold: ["brace", "include"]}
+  });
+
   def("text/x-squirrel", {
     name: "clike",
     keywords: words("base break clone continue const default delete enum extends function in class" +

From 1aadc718a0534a0d77ba96a5b85b1c27bdc64b41 Mon Sep 17 00:00:00 2001
From: Ryan Pangrle <RPangrle@users.noreply.github.com>
Date: Wed, 16 Oct 2019 00:42:26 -0700
Subject: [PATCH 4104/4742] [mode/meta] Add Objective-C++

---
 mode/meta.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index e9155037a1..e445a59d3c 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -94,7 +94,8 @@
     {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
     {name: "NTriples", mimes: ["application/n-triples", "application/n-quads", "text/n-triples"],
      mode: "ntriples", ext: ["nt", "nq"]},
-    {name: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"], alias: ["objective-c", "objc"]},
+    {name: "Objective-C", mime: "text/x-objectivec", mode: "clike", ext: ["m"], alias: ["objective-c", "objc"]},
+    {name: "Objective-C++", mime: "text/x-objectivec++", mode: "clike", ext: ["mm"], alias: ["objective-c++", "objc++"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
     {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
     {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},

From 56258ce299f9bca3af7605f38206e37e19a33c16 Mon Sep 17 00:00:00 2001
From: John Ryan <ryjohn@google.com>
Date: Thu, 17 Oct 2019 23:54:21 -0700
Subject: [PATCH 4105/4742] [dart mode] Add "extension" and "on" keywords

This is for Dart 2.6 extension method syntax
---
 mode/dart/dart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 7b154c65c0..f6a4939e77 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -15,7 +15,7 @@
     "implements mixin get native set typedef with enum throw rethrow " +
     "assert break case continue default in return new deferred async await covariant " +
     "try catch finally do else for if switch while import library export " +
-    "part of show hide is as").split(" ");
+    "part of show hide is as extension on").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
   var atoms = "true false null".split(" ");
   var builtins = "void bool num int double dynamic var String".split(" ");

From b74c8539f5885c8b93216520ec11887bbcb0c0d9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Oct 2019 08:13:15 +0200
Subject: [PATCH 4106/4742] Mention null mode in docs for mode option

Closes #6034
---
 doc/manual.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 9a7898b3d4..4a30a57f34 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -223,9 +223,10 @@ <h2>Configuration</h2>
       first mode that was loaded. It may be a string, which either
       simply names the mode or is
       a <a href="http://en.wikipedia.org/wiki/MIME">MIME</a> type
-      associated with the mode. Alternatively, it may be an object
-      containing configuration options for the mode, with
-      a <code>name</code> property that names the mode (for
+      associated with the mode. The value <code>"null"</code>
+      indicates no highlighting should be applied. Alternatively, it
+      may be an object containing configuration options for the mode,
+      with a <code>name</code> property that names the mode (for
       example <code>{name: "javascript", json: true}</code>). The demo
       pages for each mode contain information about what configuration
       parameters the mode supports. You can ask CodeMirror which modes

From 00d4135ddc9998ddb87e444413139ba1c7404095 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Oct 2019 08:20:47 +0200
Subject: [PATCH 4107/4742] Mark version 5.49.2

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 14 ++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 3afa74b9fc..59e0cbbf64 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -256,6 +256,7 @@ ForbesLindesay
 Ford_Lawnmower
 Forrest Oliphant
 Franco Catena
+Frank Seifferth
 Frank Wiegand
 fraxx001
 Fredrik Borg
@@ -390,6 +391,7 @@ Jon Gacnik
 jongalloway
 Jon Malmaud
 Jon Sangster
+Joo
 Joost-Wim Boekesteijn
 Joseph Pecoraro
 Josh Barnes
@@ -601,6 +603,7 @@ Nouzbe
 Oleksandr Yakovenko
 opl-
 Oreoluwa Onatemowo
+oscar.lofwenhamn
 Oskar Segersvärd
 overdodactyl
 pablo
@@ -673,6 +676,7 @@ Robert Plummer
 Rrandom
 Rrrandom
 Ruslan Osmanov
+Ryan Pangrle
 Ryan Petrello
 Ryan Prior
 ryu-sato
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73adcdc6f8..6de8dab5c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 5.49.2 (2019-10-21)
+
+### Bug fixes
+
+[sublime bindings](https://codemirror.net/demo/sublime.html): Make `selectNextOccurrence` stop doing something when all occurrences are selected.
+
+[continuecomment addon](https://codemirror.net/doc/manual.html#addon_continuecomment): Respect `indentWithTabs` option.
+
+[foldgutter addon](https://codemirror.net/doc/manual.html#addon_foldgutter): Optimize by reusing DOM when possible.
+
+[markdown mode](https://codemirror.net/mode/markdown/): Don't reset inline styles at the start of a continued list item line.
+
+[clike mode](https://codemirror.net/mode/clike/): Add a configuration for Objective-C++.
+
 ## 5.49.0 (2019-09-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 4a30a57f34..ab740c13e4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.49.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.49.2</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 4c1ef75b83..6d653194f9 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-10-2019: <a href="https://codemirror.net/codemirror-5.49.2.zip">Version 5.49.2</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Make <code>selectNextOccurrence</code> stop doing something when all occurrences are selected.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_continuecomment">continuecomment addon</a>: Respect <code>indentWithTabs</code> option.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_foldgutter">foldgutter addon</a>: Optimize by reusing DOM when possible.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Don’t reset inline styles at the start of a continued list item line.</li>
+    <li><a href="https://codemirror.net/mode/clike/">clike mode</a>: Add a configuration for Objective-C++.</li>
+  </ul>
+
   <p class="rel">20-09-2019: <a href="https://codemirror.net/codemirror-5.49.0.zip">Version 5.49.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index cb779743db..4f771f4f8c 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.49.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.49.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 8b39b8a774..8cacad8d91 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.49.1",
+  "version": "5.49.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 5acfc83777..9b491152cc 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.49.1"
+CodeMirror.version = "5.49.2"

From ba80e30c81653f3fee39cdf14fd7c4b85d22b899 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Oct 2019 08:22:29 +0200
Subject: [PATCH 4108/4742] Bump version number post-5.49.2

---
 doc/manual.html  | 2 +-
 package.json     | 2 +-
 src/edit/main.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index ab740c13e4..ecd501f414 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.49.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.49.3</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/package.json b/package.json
index 8cacad8d91..86a102c008 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.49.2",
+  "version": "5.49.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 9b491152cc..ff0760b624 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.49.2"
+CodeMirror.version = "5.49.3"

From 9e917beec874829c28bc1918a9afd0d71a7d7957 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 25 Oct 2019 08:29:59 +0200
Subject: [PATCH 4109/4742] [closetag addon] Fix behavior when typing > after /

Closes #6038
---
 addon/edit/closetag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 4f5aae49d9..b8cbf95089 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -74,7 +74,7 @@
       if (!tagName ||
           tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
           tok.type == "tag" && tagInfo.close ||
-          tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
+          tok.string.indexOf("/") == (pos.ch - tok.start - 1) || // match something like <someTagName />
           dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
           closingTagExists(cm, inner.mode.xmlCurrentContext && inner.mode.xmlCurrentContext(state) || [], tagName, pos, true))
         return CodeMirror.Pass;

From 75b12befaadff25de537f4117f13c38fce0c6895 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 28 Oct 2019 10:59:50 +0100
Subject: [PATCH 4110/4742] [sublime keymap] Pass local token type to
 scanForBracket when appropriate

Closes #6042
---
 keymap/sublime.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 99b497519e..99c8beea08 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -213,11 +213,15 @@
     if (!selectBetweenBrackets(cm)) return CodeMirror.Pass;
   };
 
+  function puncType(type) {
+    return !type ? null : /\bpunctuation\b/.test(type) ? type : undefined
+  }
+
   cmds.goToBracket = function(cm) {
     cm.extendSelectionsBy(function(range) {
-      var next = cm.scanForBracket(range.head, 1);
+      var next = cm.scanForBracket(range.head, 1, puncType(cm.getTokenTypeAt(range.head)));
       if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos;
-      var prev = cm.scanForBracket(range.head, -1);
+      var prev = cm.scanForBracket(range.head, -1, puncType(cm.getTokenTypeAt(Pos(range.head.line, range.head.ch + 1))));
       return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head;
     });
   };

From 91f431a7677bcb3eb4f1e7f6120a1edada50deaf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 4 Nov 2019 15:49:58 +0100
Subject: [PATCH 4111/4742] [handlebars mode] Fix support for triple braces

Closes #6052
---
 mode/handlebars/handlebars.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/handlebars/handlebars.js b/mode/handlebars/handlebars.js
index fe8b3b44e8..359871a20d 100644
--- a/mode/handlebars/handlebars.js
+++ b/mode/handlebars/handlebars.js
@@ -62,7 +62,7 @@
     if (!parserConfig || !parserConfig.base) return handlebars;
     return CodeMirror.multiplexingMode(
       CodeMirror.getMode(config, parserConfig.base),
-      {open: "{{", close: "}}", mode: handlebars, parseDelimiters: true}
+      {open: "{{", close: /\}\}\}?/, mode: handlebars, parseDelimiters: true}
     );
   });
 

From 7b2121b432e5d0e24f96ea142990f0b49ef031be Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 5 Nov 2019 08:15:07 +0100
Subject: [PATCH 4112/4742] Upgrade some dev dependencies

---
 package.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 86a102c008..8ad7b31324 100644
--- a/package.json
+++ b/package.json
@@ -21,12 +21,11 @@
     "lint": "bin/lint"
   },
   "devDependencies": {
-    "blint": "^1",
+    "blint": "^1.1.0",
     "node-static": "0.7.11",
     "phantomjs-prebuilt": "^2.1.12",
-    "rollup": "^0.66.2",
-    "rollup-plugin-buble": "^0.19.2",
-    "rollup-watch": "^4.3.1"
+    "rollup": "^1.26.3",
+    "rollup-plugin-buble": "^0.19.8"
   },
   "bugs": "http://github.com/codemirror/CodeMirror/issues",
   "keywords": [

From 94b08d6fc95fe320d2f4975e3b704bdd20d44cb0 Mon Sep 17 00:00:00 2001
From: ossdev <ossdev@puresoftware.com>
Date: Mon, 4 Nov 2019 15:39:58 +0530
Subject: [PATCH 4113/4742] Codemirror: Replaced PhantomJS Dependency with
 Puppeteer

Signed-off-by: ossdev <ossdev@puresoftware.com>
---
 package.json           |  2 +-
 test/phantom_driver.js | 31 -------------------------------
 test/run.js            | 41 ++++++++++++++++++++++++++++-------------
 test/test.js           |  1 +
 4 files changed, 30 insertions(+), 45 deletions(-)
 delete mode 100644 test/phantom_driver.js

diff --git a/package.json b/package.json
index 8ad7b31324..da4bea1ac5 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "devDependencies": {
     "blint": "^1.1.0",
     "node-static": "0.7.11",
-    "phantomjs-prebuilt": "^2.1.12",
+    "puppeteer": "^1.20.0",
     "rollup": "^1.26.3",
     "rollup-plugin-buble": "^0.19.8"
   },
diff --git a/test/phantom_driver.js b/test/phantom_driver.js
deleted file mode 100644
index dbad08db63..0000000000
--- a/test/phantom_driver.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var page = require('webpage').create();
-
-page.open("http://localhost:3000/test/index.html", function (status) {
-  if (status != "success") {
-    console.log("page couldn't be loaded successfully");
-    phantom.exit(1);
-  }
-  waitFor(function () {
-    return page.evaluate(function () {
-      var output = document.getElementById('status');
-      if (!output) { return false; }
-      return (/^(\d+ failures?|all passed)/i).test(output.innerText);
-    });
-  }, function () {
-    var failed = page.evaluate(function () { return window.failed; });
-    var output = page.evaluate(function () {
-      return document.getElementById('output').innerText + "\n" +
-        document.getElementById('status').innerText;
-    });
-    console.log(output);
-    phantom.exit(failed > 0 ? 1 : 0);
-  });
-});
-
-function waitFor (test, cb) {
-  if (test()) {
-    cb();
-  } else {
-    setTimeout(function () { waitFor(test, cb); }, 250);
-  }
-}
diff --git a/test/run.js b/test/run.js
index 54984e73a5..5b3c903a26 100755
--- a/test/run.js
+++ b/test/run.js
@@ -15,17 +15,32 @@ var server = require('http').createServer(function (req, res) {
   }).resume();
 }).addListener('error', function (err) {
   throw err;
-}).listen(3000, function () {
-  var childProcess = require('child_process');
-  var phantomjs = require("phantomjs-prebuilt");
-  var childArgs = [
-    require("path").join(__dirname, 'phantom_driver.js')
-  ];
-  childProcess.execFile(phantomjs.path, childArgs, function (err, stdout, stderr) {
-    server.close();
-    console.log(stdout);
-    if (err) console.error(err);
-    if (stderr) console.error(stderr);
-    process.exit(err || stderr || !ok ? 1 : 0);
+}).listen(3000,(async () => {
+  const puppeteer = require('puppeteer');
+  const browser = await puppeteer.launch()
+  const page = await browser.newPage()
+  await page.goto('http://localhost:3000/test/index.html')
+  page.on('dialog', async dialog => {
+    console.log(dialog.message())
+    await dialog.dismiss()
+  })
+  var ret1 = false;
+  while(1){
+    ret1 = await page.evaluate(() => {
+      var output = document.getElementById('status');
+      if (!output) {
+        return false;
+      }
+	return (/^(\d+ failures?|all passed)/i).test(output.innerText);
+    })
+  if(ret1 === true) { break}
+  }
+  var failed = await page.evaluate(function () { return window.failed; });
+  var output = await page.evaluate(function () {
+    return document.getElementById('output').innerText + "\n" +
+    document.getElementById('status').innerText;
   });
-});
+  console.log(output);
+  process.exit(failed > 0 ? 1 : 0);
+  await browser.close()
+})());
diff --git a/test/test.js b/test/test.js
index 846d94e8a9..377f176112 100644
--- a/test/test.js
+++ b/test/test.js
@@ -30,6 +30,7 @@ var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
 var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
 var mac = /Mac/.test(navigator.platform);
 var phantom = /PhantomJS/.test(navigator.userAgent);
+var chrome = !edge && /Chrome\//.test(navigator.userAgent);
 var opera = /Opera\/\./.test(navigator.userAgent);
 var opera_version = opera && navigator.userAgent.match(/Version\/(\d+\.\d+)/);
 if (opera_version) opera_version = Number(opera_version);

From dde0e5cb51b243c61de9c43405b60c69a86dfb24 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 5 Nov 2019 10:21:04 +0100
Subject: [PATCH 4114/4742] Make puppeteer-based test runner work

Issue #6051
---
 test/index.html  | 11 +++++++++--
 test/run.js      | 35 +++++++++++++++-------------------
 test/test.js     | 49 ++++++++++++++++++------------------------------
 test/vim_test.js |  1 -
 4 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/test/index.html b/test/index.html
index 8cfb7387f2..0d153096aa 100644
--- a/test/index.html
+++ b/test/index.html
@@ -6,6 +6,10 @@
 
 <link rel="stylesheet" href="../lib/codemirror.css">
 <link rel="stylesheet" href="mode_test.css">
+<script>
+  var errored = []
+  window.onerror = function(e) { errored.push(e) }
+</script>
 <script src="../doc/activebookmark.js"></script>
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/meta.js"></script>
@@ -171,7 +175,8 @@ <h2>Test Suite</h2>
           bad = "",
           running = false, // Flag that states tests are running
           quit = false, // Flag to quit tests ASAP
-          verbose = false; // Adds message for *every* test to output
+          verbose = false, // Adds message for *every* test to output
+          done = false
 
       function runHarness(){
         if (running) {
@@ -197,6 +202,7 @@ <h2>Test Suite</h2>
         setStatus("Loading tests...");
         count = 0;
         failed = 0;
+        done = false;
         skipped = 0;
         bad = "";
         totalTests = countTests();
@@ -257,11 +263,12 @@ <h2>Test Suite</h2>
             message = failed + " failure" + (failed > 1 ? "s" : "");
           } else {
             type += " ok";
-            message = "All passed";
+            message = "All passed"
             if (skipped) {
               message += " (" + skipped + " skipped)";
             }
           }
+          done = true
           progressTotal.nodeValue = '';
           customMessage = true; // Hack to avoid adding to output
         }
diff --git a/test/run.js b/test/run.js
index 5b3c903a26..7e4b38978e 100755
--- a/test/run.js
+++ b/test/run.js
@@ -17,30 +17,25 @@ var server = require('http').createServer(function (req, res) {
   throw err;
 }).listen(3000,(async () => {
   const puppeteer = require('puppeteer');
-  const browser = await puppeteer.launch()
+  const browser = await puppeteer.launch({args: ["--no-sandbox", "--disable-setuid-sandbox"]})
   const page = await browser.newPage()
-  await page.goto('http://localhost:3000/test/index.html')
+  page.on('console', msg => console.log("console:", msg.text()))
   page.on('dialog', async dialog => {
     console.log(dialog.message())
     await dialog.dismiss()
   })
-  var ret1 = false;
-  while(1){
-    ret1 = await page.evaluate(() => {
-      var output = document.getElementById('status');
-      if (!output) {
-        return false;
-      }
-	return (/^(\d+ failures?|all passed)/i).test(output.innerText);
-    })
-  if(ret1 === true) { break}
+  page.evaluateOnNewDocument(() => window.automatedTests = true)
+  await page.goto('http://localhost:3000/test/index.html#' + (process.argv[2] || ""))
+  while(1) {
+    if (await page.evaluate(() => window.done)) break
+    await sleep(200)
   }
-  var failed = await page.evaluate(function () { return window.failed; });
-  var output = await page.evaluate(function () {
-    return document.getElementById('output').innerText + "\n" +
-    document.getElementById('status').innerText;
-  });
-  console.log(output);
-  process.exit(failed > 0 ? 1 : 0);
+  let [failed, errors] = await page.evaluate(() => [window.failed, window.errored])
+  for (let error of errors) console.log(error)
+  console.log(await page.evaluate(() => document.getElementById('output').innerText + "\n" +
+                                          document.getElementById('status').innerText))
+  process.exit(failed > 0 || errors.length ? 1 : 0)
   await browser.close()
-})());
+})())
+
+function sleep(n) { return new Promise(acc => setTimeout(acc, n)) }
diff --git a/test/test.js b/test/test.js
index 377f176112..2a5101f4e1 100644
--- a/test/test.js
+++ b/test/test.js
@@ -29,8 +29,6 @@ function byClassName(elt, cls) {
 var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
 var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
 var mac = /Mac/.test(navigator.platform);
-var phantom = /PhantomJS/.test(navigator.userAgent);
-var chrome = !edge && /Chrome\//.test(navigator.userAgent);
 var opera = /Opera\/\./.test(navigator.userAgent);
 var opera_version = opera && navigator.userAgent.match(/Version\/(\d+\.\d+)/);
 if (opera_version) opera_version = Number(opera_version);
@@ -256,6 +254,7 @@ testCM("coordsCharBidi", function(cm) {
 }, {lineNumbers: true});
 
 testCM("badBidiOptimization", function(cm) {
+  if (window.automatedTests) return
   var coords = cm.charCoords(Pos(0, 34))
   eqCharPos(cm.coordsChar({left: coords.right, top: coords.top + 2}), Pos(0, 34))
 }, {value: "----------<p class=\"title\">هل يمكنك اختيار مستوى قسط التأمين الذي ترغب بدفعه؟</p>"})
@@ -625,7 +624,6 @@ testCM("bookmarkCursor", function(cm) {
 }, {value: "foo\nbar\n\n\nx\ny"});
 
 testCM("multiBookmarkCursor", function(cm) {
-  if (phantom) return;
   var ms = [], m;
   function add(insertLeft) {
     for (var i = 0; i < 3; ++i) {
@@ -685,7 +683,6 @@ testCM("scrollSnap", function(cm) {
 });
 
 testCM("scrollIntoView", function(cm) {
-  if (phantom) return;
   function test(line, ch, msg) {
     var pos = Pos(line, ch);
     cm.scrollIntoView(pos);
@@ -724,7 +721,7 @@ testCM("selectAllNoScroll", function(cm) {
 });
 
 testCM("selectionPos", function(cm) {
-  if (phantom || cm.getOption("inputStyle") != "textarea") return;
+  if (cm.getOption("inputStyle") != "textarea") return;
   cm.setSize(100, 100);
   addDoc(cm, 200, 100);
   cm.setSelection(Pos(1, 100), Pos(98, 100));
@@ -929,7 +926,6 @@ testCM("everythingFolded", function(cm) {
 });
 
 testCM("structuredFold", function(cm) {
-  if (phantom) return;
   addDoc(cm, 4, 8);
   var range = cm.markText(Pos(1, 2), Pos(6, 2), {
     replacedWith: document.createTextNode("Q")
@@ -1051,7 +1047,6 @@ testCM("wrappingInlineWidget", function(cm) {
   eq(curR.bottom, cur1.bottom);
   cm.replaceRange("", Pos(0, 9), Pos(0));
   curR = cm.cursorCoords(Pos(0, 9));
-  if (phantom) return;
   eq(curR.top, cur1.top);
   eq(curR.bottom, cur1.bottom);
 }, {value: "1 2 3 xxx 4", lineWrapping: true});
@@ -1134,7 +1129,6 @@ testCM("wrappingAndResizing", function(cm) {
 }, null, ie_lt8);
 
 testCM("measureEndOfLine", function(cm) {
-  if (phantom) return;
   cm.setSize(null, "auto");
   var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
   var lh = inner.offsetHeight;
@@ -1158,7 +1152,6 @@ testCM("measureEndOfLine", function(cm) {
 }, {mode: "text/html", value: "<!-- foo barrr -->", lineWrapping: true}, ie_lt8 || opera_lt10);
 
 testCM("measureWrappedEndOfLine", function(cm) {
-  if (phantom) return;
   cm.setSize(null, "auto");
   var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
   var lh = inner.offsetHeight;
@@ -1195,7 +1188,6 @@ testCM("measureWrappedBidiLevel2", function(cm) {
 }, {value: "foobar إإ إإ إإ إإ 555 بببببب", lineWrapping: true})
 
 testCM("measureWrappedBeginOfLine", function(cm) {
-  if (phantom) return;
   cm.setSize(null, "auto");
   var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
   var lh = inner.offsetHeight;
@@ -1277,7 +1269,7 @@ testCM("verticalScroll", function(cm) {
   cm.replaceRange("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah", Pos(0, 0), Pos(0));
   is(sc.scrollWidth > baseWidth, "scrollbar present");
   cm.replaceRange("foo", Pos(0, 0), Pos(0));
-  if (!phantom) eq(sc.scrollWidth, baseWidth, "scrollbar gone");
+  eq(sc.scrollWidth, baseWidth, "scrollbar gone");
   cm.replaceRange("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah", Pos(0, 0), Pos(0));
   cm.replaceRange("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbh", Pos(1, 0), Pos(1));
   is(sc.scrollWidth > baseWidth, "present again");
@@ -1414,8 +1406,7 @@ testCM("verticalMovementCommands", function(cm) {
   cm.execCommand("goLineUp");
   eqCharPos(cm.getCursor(), Pos(0, 0));
   cm.execCommand("goLineDown");
-  if (!phantom) // This fails in PhantomJS, though not in a real Webkit
-    eqCharPos(cm.getCursor(), Pos(1, 0));
+  eqCharPos(cm.getCursor(), Pos(1, 0));
   cm.setCursor(Pos(1, 12));
   cm.execCommand("goLineDown");
   eqCharPos(cm.getCursor(), Pos(2, 5));
@@ -1550,7 +1541,7 @@ testCM("lineChangeEvents", function(cm) {
 });
 
 testCM("scrollEntirelyToRight", function(cm) {
-  if (phantom || cm.getOption("inputStyle") != "textarea") return;
+  if (cm.getOption("inputStyle") != "textarea") return;
   addDoc(cm, 500, 2);
   cm.setCursor(Pos(0, 500));
   var wrap = cm.getWrapperElement(), cur = byClassName(wrap, "CodeMirror-cursor")[0];
@@ -1733,7 +1724,6 @@ testCM("getLineNumber", function(cm) {
 });
 
 testCM("jumpTheGap", function(cm) {
-  if (phantom) return;
   var longLine = "abcdef ghiklmnop qrstuvw xyz ";
   longLine += longLine; longLine += longLine; longLine += longLine;
   cm.replaceRange(longLine, Pos(2, 0), Pos(2));
@@ -2570,20 +2560,18 @@ bidiTests.push("Say ا ب جabj\nS");
 bidiTests.push("Sayyy ا ا ب ج");
 */
 
-if (!phantom) {
-  bidiTests.push("Όȝǝڪȉۥ״ۺ׆ɀҩۏ\nҳ");
-  bidiTests.push("ŌӰтقȤ؁ƥ؅٣ĎȺ١\nϚ");
-  bidiTests.push("ٻоҤѕѽΩ־؉ïίքdz\nٵ");
-  bidiTests.push("؅؁ĆՕƿɁǞϮؠȩóć\nď");
-  bidiTests.push("RŨďңŪzϢŎƏԖڇڦ\nӈ");
-  bidiTests.push("ό׊۷٢ԜһОצЉيčǟ\nѩ");
-  bidiTests.push("ۑÚҳҕڬġڹհяųKV\nr");
-  bidiTests.push("źڻғúہ4ם1Ƞc1a\nԁ");
-  bidiTests.push("ҒȨҟփƞ٦ԓȦڰғâƥ\nڤ");
-  bidiTests.push("ϖسՉȏŧΔԛdžĎӟیڡ\nέ");
-  bidiTests.push("۹ؼL۵ĺȧКԙػא7״\nم");
-  bidiTests.push("ن (ي)\u2009أقواس"); // thin space to throw off Firefox 51's broken white-space compressing behavior
-}
+bidiTests.push("Όȝǝڪȉۥ״ۺ׆ɀҩۏ\nҳ");
+if (!window.automatedTests) bidiTests.push("ŌӰтقȤ؁ƥ؅٣ĎȺ١\nϚ");
+bidiTests.push("ٻоҤѕѽΩ־؉ïίքdz\nٵ");
+bidiTests.push("؅؁ĆՕƿɁǞϮؠȩóć\nď");
+bidiTests.push("RŨďңŪzϢŎƏԖڇڦ\nӈ");
+bidiTests.push("ό׊۷٢ԜһОצЉيčǟ\nѩ");
+bidiTests.push("ۑÚҳҕڬġڹհяųKV\nr");
+bidiTests.push("źڻғúہ4ם1Ƞc1a\nԁ");
+bidiTests.push("ҒȨҟփƞ٦ԓȦڰғâƥ\nڤ");
+bidiTests.push("ϖسՉȏŧΔԛdžĎӟیڡ\nέ");
+bidiTests.push("۹ؼL۵ĺȧКԙػא7״\nم");
+bidiTests.push("ن (ي)\u2009أقواس"); // thin space to throw off Firefox 51's broken white-space compressing behavior
 
 bidiTests.push("քմѧǮßپüŢҍҞўڳ\nӧ");
 
@@ -2641,7 +2629,6 @@ testCM("rtl_wrapped_selection", function(cm) {
 }, {value: new Array(10).join(" فتي تم تضمينها فتي تم"), lineWrapping: true})
 
 testCM("bidi_wrapped_selection", function(cm) {
-  if (phantom) return
   cm.setSize(cm.charCoords(Pos(0, 10), "editor").left)
   cm.setSelection(Pos(0, 37), Pos(0, 80))
   var blocks = byClassName(cm.getWrapperElement(), "CodeMirror-selected")
@@ -2660,7 +2647,7 @@ testCM("delete_wrapped", function(cm) {
 }, {value: "12345", lineWrapping: true})
 
 testCM("issue_4878", function(cm) {
-  if (phantom) return
+  if (window.automatedTests) return
   cm.setCursor(Pos(1, 12, "after"));
   cm.moveH(-1, "char");
   eqCursorPos(cm.getCursor(), Pos(0, 113, "before"));
diff --git a/test/vim_test.js b/test/vim_test.js
index 72a9896b59..630f54b77f 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -471,7 +471,6 @@ testVim('j_k_and_gj_gk', function(cm,vim,helpers){
   helpers.assertCursorAt(0, 176);
 },{ lineWrapping:true, value: 'This line is intentially long to test movement of gj and gk over wrapped lines. I will start on the end of this line, then make a step up and back to set the origin for j and k.\nThis line is supposed to be even longer than the previous. I will jump here and make another wiggle with gj and gk, before I jump back to the line above. Both wiggles should not change my cursor\'s target character but both j/k and gj/gk change each other\'s reference position.'});
 testVim('gj_gk', function(cm, vim, helpers) {
-  if (phantom) return;
   cm.setSize(120);
   // Test top of document edge case.
   cm.setCursor(0, 4);

From 5f5c7e1bbebd2124732d90783f107b4beb9062e0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 8 Nov 2019 09:53:01 +0100
Subject: [PATCH 4115/4742] [searchcursor addon] Properly match $ in reverse
 regexp search

Closes #6056
---
 addon/search/searchcursor.js | 17 ++++++++---------
 test/search_test.js          |  6 ++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index aae36dfe53..0621cc9462 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -72,12 +72,12 @@
     }
   }
 
-  function lastMatchIn(string, regexp) {
+  function lastMatchIn(string, regexp, endMargin) {
     var cutOff = 0, match
     for (;;) {
       regexp.lastIndex = cutOff
       var newMatch = regexp.exec(string)
-      if (!newMatch) return match
+      if (!newMatch || newMatch.index + newMatch[0].length > string.length - endMargin) return match
       match = newMatch
       cutOff = match.index + (match[0].length || 1)
       if (cutOff == string.length) return match
@@ -88,8 +88,7 @@
     regexp = ensureFlags(regexp, "g")
     for (var line = start.line, ch = start.ch, first = doc.firstLine(); line >= first; line--, ch = -1) {
       var string = doc.getLine(line)
-      if (ch > -1) string = string.slice(0, ch)
-      var match = lastMatchIn(string, regexp)
+      var match = lastMatchIn(string, regexp, ch < 0 ? 0 : string.length - ch)
       if (match)
         return {from: Pos(line, match.index),
                 to: Pos(line, match.index + match[0].length),
@@ -99,15 +98,15 @@
 
   function searchRegexpBackwardMultiline(doc, regexp, start) {
     regexp = ensureFlags(regexp, "gm")
-    var string, chunk = 1
+    var string, chunkSize = 1, endMargin = doc.getLine(start.line).length - start.ch
     for (var line = start.line, first = doc.firstLine(); line >= first;) {
-      for (var i = 0; i < chunk; i++) {
+      for (var i = 0; i < chunkSize && line >= first; i++) {
         var curLine = doc.getLine(line--)
-        string = string == null ? curLine.slice(0, start.ch) : curLine + "\n" + string
+        string = string == null ? curLine : curLine + "\n" + string
       }
-      chunk *= 2
+      chunkSize *= 2
 
-      var match = lastMatchIn(string, regexp)
+      var match = lastMatchIn(string, regexp, endMargin)
       if (match) {
         var before = string.slice(0, match.index).split("\n"), inside = match[0].split("\n")
         var startLine = line + before.length, startCh = before[before.length - 1].length
diff --git a/test/search_test.js b/test/search_test.js
index e3188de529..5df7b6470a 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -82,4 +82,10 @@
     run(doc, "이", false, 1, 2, 1, 3)
     run(doc, "a", false, 0, 4, 0, 5, 2, 4, 2, 5, 2, 19, 2, 20)
   })
+
+  test("endOfLine", function() {
+    var doc = new CodeMirror.Doc("bbcdb\nabcd\nbbcdb\nabcd")
+    run(doc, /[^b]$/, false, 1, 3, 1, 4, 3, 3, 3, 4)
+    run(doc, /b$/, false, 0, 4, 0, 5, 2, 4, 2, 5)
+  })
 })();

From e341541db84f12775cc076d4a239f1967d17699e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 8 Nov 2019 10:46:14 +0100
Subject: [PATCH 4116/4742] [searchcursor addon] Fix behavior in overlapping
 reverse regexp searches

---
 addon/search/searchcursor.js | 18 +++++++++++-------
 test/search_test.js          |  4 ++--
 test/vim_test.js             |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 0621cc9462..816bf77473 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -73,15 +73,18 @@
   }
 
   function lastMatchIn(string, regexp, endMargin) {
-    var cutOff = 0, match
-    for (;;) {
-      regexp.lastIndex = cutOff
+    var match, from = 0
+    while (from <= string.length) {
+      regexp.lastIndex = from
       var newMatch = regexp.exec(string)
-      if (!newMatch || newMatch.index + newMatch[0].length > string.length - endMargin) return match
-      match = newMatch
-      cutOff = match.index + (match[0].length || 1)
-      if (cutOff == string.length) return match
+      if (!newMatch) break
+      var end = newMatch.index + newMatch[0].length
+      if (end > string.length - endMargin) break
+      if (!match || end > match.index + match[0].length)
+        match = newMatch
+      from = newMatch.index + 1
     }
+    return match
   }
 
   function searchRegexpBackward(doc, regexp, start) {
@@ -97,6 +100,7 @@
   }
 
   function searchRegexpBackwardMultiline(doc, regexp, start) {
+    if (!maybeMultiline(regexp)) return searchRegexpBackward(doc, regexp, start)
     regexp = ensureFlags(regexp, "gm")
     var string, chunkSize = 1, endMargin = doc.getLine(start.line).length - start.ch
     for (var line = start.line, first = doc.firstLine(); line >= first;) {
diff --git a/test/search_test.js b/test/search_test.js
index 5df7b6470a..0e468c049a 100644
--- a/test/search_test.js
+++ b/test/search_test.js
@@ -41,7 +41,7 @@
   });
 
   test("regexpMultiline", function() {
-    var doc = new CodeMirror.Doc("foo foo\nbar\nbaz")
+    var doc = new CodeMirror.Doc("fom fom\nbar\nbaz")
     run(doc, /fo[^]*az/, {multiline: true}, 0, 0, 2, 3)
     run(doc, /[oa][^u]/, {multiline: true}, 0, 1, 0, 3, 0, 5, 0, 7, 1, 1, 1, 3, 2, 1, 2, 3)
     run(doc, /[a][^u]{2}/, {multiline: true}, 1, 1, 2, 0)
@@ -85,7 +85,7 @@
 
   test("endOfLine", function() {
     var doc = new CodeMirror.Doc("bbcdb\nabcd\nbbcdb\nabcd")
-    run(doc, /[^b]$/, false, 1, 3, 1, 4, 3, 3, 3, 4)
+    run(doc, /[^b]$/, {multiline: true}, 1, 3, 1, 4, 3, 3, 3, 4)
     run(doc, /b$/, false, 0, 4, 0, 5, 2, 4, 2, 5)
   })
 })();
diff --git a/test/vim_test.js b/test/vim_test.js
index 630f54b77f..2485f1e437 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2482,7 +2482,7 @@ testVim('?_nongreedy', function(cm, vim, helpers) {
   helpers.doKeys('n');
   helpers.assertCursorAt(0, 4);
   helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
+  helpers.assertCursorAt(0, 1);
 }, { value: 'aaa aa \n a aa'});
 testVim('/_greedy', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('a+');

From 978d6e2a9dba3c4f5bdb17ed30bf3b970752c536 Mon Sep 17 00:00:00 2001
From: Johannes <jh@maschinensehen.de>
Date: Fri, 8 Nov 2019 22:23:28 +0100
Subject: [PATCH 4117/4742] [mode meta] Make findModeByExtension case
 insensitive

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

diff --git a/mode/meta.js b/mode/meta.js
index e445a59d3c..d44590f61f 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -190,6 +190,7 @@
   };
 
   CodeMirror.findModeByExtension = function(ext) {
+    ext = ext.toLowerCase();
     for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
       var info = CodeMirror.modeInfo[i];
       if (info.ext) for (var j = 0; j < info.ext.length; j++)

From 6cffb4ec7f1618ccc2f63677f24a117ca64ac9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hasan=20Deliba=C5=9F?= <hasan.delibas94@gmail.com>
Date: Sun, 10 Nov 2019 22:40:34 +0300
Subject: [PATCH 4118/4742] [css mode] Add more pseudo-class names

Added new CSS Pseudo Selector from https://www.w3schools.com/cssref/css_selectors.asp
---
 addon/hint/css-hint.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 6cdf728195..980d1197e5 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -11,9 +11,15 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var pseudoClasses = {link: 1, visited: 1, active: 1, hover: 1, focus: 1,
-                       "first-letter": 1, "first-line": 1, "first-child": 1,
-                       before: 1, after: 1, lang: 1};
+  var pseudoClasses = {"active":1, "after":1, "before":1, "checked":1, "default":1,
+    "disabled":1, "empty":1, "enabled":1, "first-child":1, "first-letter":1,
+    "first-line":1, "first-of-type":1, "focus":1, "hover":1, "in-range":1,
+    "indeterminate":1, "invalid":1, "lang":1, "last-child":1, "last-of-type":1,
+    "link":1, "not":1, "nth-child":1, "nth-last-child":1, "nth-last-of-type":1,
+    "nth-of-type":1, "only-of-type":1, "only-child":1, "optional":1, "out-of-range":1,
+    "placeholder":1, "read-only":1, "read-write":1, "required":1, "root":1,
+    "selection":1, "target":1, "valid":1, "visited":1
+  };
 
   CodeMirror.registerHelper("hint", "css", function(cm) {
     var cur = cm.getCursor(), token = cm.getTokenAt(cur);

From cf5cadedd791fb2c6bd0b767397e4d244865786f Mon Sep 17 00:00:00 2001
From: Nikolaj Kappler <nikolaj.kappler@sap.com>
Date: Wed, 13 Nov 2019 11:58:49 +0100
Subject: [PATCH 4119/4742] [panel addon] Support dynamic size changes

Closes issue #5995
---
 addon/display/panel.js | 52 ++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/addon/display/panel.js b/addon/display/panel.js
index 5faf1d560e..4c9f2c0fca 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -1,15 +1,15 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: https://codemirror.net/LICENSE
 
-(function(mod) {
+(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) {
-  CodeMirror.defineExtension("addPanel", function(node, options) {
+})(function (CodeMirror) {
+  CodeMirror.defineExtension("addPanel", function (node, options) {
     options = options || {};
 
     if (!this.state.panels) initPanels(this);
@@ -25,8 +25,7 @@
       wrapper.insertBefore(node, options.before.node);
     } else if (replace) {
       wrapper.insertBefore(node, options.replace.node);
-      info.panels++;
-      options.replace.clear();
+      options.replace.clear(true);
     } else if (options.position == "bottom") {
       wrapper.appendChild(node);
     } else if (options.position == "before-bottom") {
@@ -38,14 +37,15 @@
     }
 
     var height = (options && options.height) || node.offsetHeight;
-    this._setSize(null, info.heightLeft -= height);
-    if (!replace) {
-      info.panels++;
-    }
+
+    var panel = new Panel(this, node, options, height);
+    info.panels.push(panel);
+
+    this.setSize();
     if (options.stable && isAtTop(this, node))
-      this.scrollTo(null, this.getScrollInfo().top + height)
+      this.scrollTo(null, this.getScrollInfo().top + height);
 
-    return new Panel(this, node, options, height);
+    return panel;
   });
 
   function Panel(cm, node, options, height) {
@@ -56,22 +56,23 @@
     this.cleared = false;
   }
 
-  Panel.prototype.clear = function() {
+  /* when skipRemove is true, clear() was called from addPanel().
+   * Thus removePanels() should not be called (issue 5518) */
+  Panel.prototype.clear = function (skipRemove) {
     if (this.cleared) return;
     this.cleared = true;
     var info = this.cm.state.panels;
-    this.cm._setSize(null, info.heightLeft += this.height);
+    info.panels.splice(info.panels.indexOf(this), 1);
+    this.cm.setSize();
     if (this.options.stable && isAtTop(this.cm, this.node))
       this.cm.scrollTo(null, this.cm.getScrollInfo().top - this.height)
     info.wrapper.removeChild(this.node);
-    if (--info.panels == 0) removePanels(this.cm);
+    if (info.panels.length == 0 && !skipRemove) removePanels(this.cm);
   };
 
-  Panel.prototype.changed = function(height) {
-    var newHeight = height == null ? this.node.offsetHeight : height;
-    var info = this.cm.state.panels;
-    this.cm._setSize(null, info.heightLeft -= (newHeight - this.height));
-    this.height = newHeight;
+  Panel.prototype.changed = function () {
+    this.height = this.node.getBoundingClientRect().height;
+    this.cm.setSize();
   };
 
   function initPanels(cm) {
@@ -80,8 +81,7 @@
     var height = parseInt(style.height);
     var info = cm.state.panels = {
       setHeight: wrap.style.height,
-      heightLeft: height,
-      panels: 0,
+      panels: [],
       wrapper: document.createElement("div")
     };
     wrap.parentNode.insertBefore(info.wrapper, wrap);
@@ -90,8 +90,8 @@
     if (hasFocus) cm.focus();
 
     cm._setSize = cm.setSize;
-    if (height != null) cm.setSize = function(width, newHeight) {
-      if (newHeight == null) return this._setSize(width, newHeight);
+    if (height != null) cm.setSize = function (width, newHeight) {
+      if (!newHeight) newHeight = info.wrapper.offsetHeight;
       info.setHeight = newHeight;
       if (typeof newHeight != "number") {
         var px = /^(\d+\.?\d*)px$/.exec(newHeight);
@@ -100,10 +100,12 @@
         } else {
           info.wrapper.style.height = newHeight;
           newHeight = info.wrapper.offsetHeight;
-          info.wrapper.style.height = "";
         }
       }
-      cm._setSize(width, info.heightLeft += (newHeight - height));
+      var editorheight = newHeight - info.panels
+        .map(function (p) { return p.node.getBoundingClientRect().height; })
+        .reduce(function (a, b) { return a + b; }, 0);
+      cm._setSize(width, editorheight);
       height = newHeight;
     };
   }

From e4e78c26c325c2d3a67a2cb7e78e11165531575c Mon Sep 17 00:00:00 2001
From: Igor Petruk <ipetruk@google.com>
Date: Thu, 14 Nov 2019 08:36:31 +0000
Subject: [PATCH 4120/4742] [ayu-dark and ayu-mirage themes] Add

---
 demo/theme.html      |  6 +++++-
 theme/ayu-dark.css   | 42 ++++++++++++++++++++++++++++++++++++++++++
 theme/ayu-mirage.css | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 theme/ayu-dark.css
 create mode 100644 theme/ayu-mirage.css

diff --git a/demo/theme.html b/demo/theme.html
index 8c10eb827c..95d0f391fb 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -9,6 +9,8 @@
 <link rel="stylesheet" href="../theme/3024-night.css">
 <link rel="stylesheet" href="../theme/abcdef.css">
 <link rel="stylesheet" href="../theme/ambiance.css">
+<link rel="stylesheet" href="../theme/ayu-dark.css">
+<link rel="stylesheet" href="../theme/ayu-mirage.css">
 <link rel="stylesheet" href="../theme/base16-dark.css">
 <link rel="stylesheet" href="../theme/bespin.css">
 <link rel="stylesheet" href="../theme/base16-light.css">
@@ -106,6 +108,8 @@ <h2>Theme Demo</h2>
     <option>3024-night</option>
     <option>abcdef</option>
     <option>ambiance</option>
+    <option>ayu-dark</option>
+    <option>ayu-mirage</option>
     <option>base16-dark</option>
     <option>base16-light</option>
     <option>bespin</option>
@@ -189,4 +193,4 @@ <h2>Theme Demo</h2>
     if (theme) { input.value = theme; selectTheme(); }
   });
 </script>
-</article>
\ No newline at end of file
+</article>
diff --git a/theme/ayu-dark.css b/theme/ayu-dark.css
new file mode 100644
index 0000000000..fd41ba3e10
--- /dev/null
+++ b/theme/ayu-dark.css
@@ -0,0 +1,42 @@
+/* Based on https://github.com/dempfi/ayu */
+
+.cm-s-ayu-dark.CodeMirror { background: #0a0e14; color: #b3b1ad; }
+.cm-s-ayu-dark div.CodeMirror-selected { background: #273747; }
+.cm-s-ayu-dark .CodeMirror-line::selection, .cm-s-ayu-dark .CodeMirror-line > span::selection, .cm-s-ayu-dark .CodeMirror-line > span > span::selection { background: rgba(39, 55, 71, 99); }
+.cm-s-ayu-dark .CodeMirror-line::-moz-selection, .cm-s-ayu-dark .CodeMirror-line > span::-moz-selection, .cm-s-ayu-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 55, 71, 99); }
+.cm-s-ayu-dark .CodeMirror-gutters { background: #0a0e14; border-right: 0px; }
+.cm-s-ayu-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-ayu-dark .CodeMirror-guttermarker-subtle { color: #3d424d; }
+.cm-s-ayu-dark .CodeMirror-linenumber { color: #3d424d; }
+.cm-s-ayu-dark .CodeMirror-cursor { border-left: 1px solid #e6b450; }
+
+.cm-s-ayu-dark span.cm-comment { color: #626a73; }
+.cm-s-ayu-dark span.cm-atom { color: #ae81ff; }
+.cm-s-ayu-dark span.cm-number { color: #e6b450; }
+
+.cm-s-ayu-dark span.cm-comment.cm-attribute { color: #ffb454; }
+.cm-s-ayu-dark span.cm-comment.cm-def { color: rgba(57, 186, 230, 80); }
+.cm-s-ayu-dark span.cm-comment.cm-tag { color: #39bae6; }
+.cm-s-ayu-dark span.cm-comment.cm-type { color: #5998a6; }
+
+.cm-s-ayu-dark span.cm-property, .cm-s-ayu-dark span.cm-attribute { color: #ffb454; }  
+.cm-s-ayu-dark span.cm-keyword { color: #ff8f40; } 
+.cm-s-ayu-dark span.cm-builtin { color: #e6b450; }
+.cm-s-ayu-dark span.cm-string { color: #c2d94c; }
+
+.cm-s-ayu-dark span.cm-variable { color: #b3b1ad; }
+.cm-s-ayu-dark span.cm-variable-2 { color: #f07178; }
+.cm-s-ayu-dark span.cm-variable-3 { color: #39bae6; }
+.cm-s-ayu-dark span.cm-type { color: #ff8f40; }
+.cm-s-ayu-dark span.cm-def { color: #ffee99; }
+.cm-s-ayu-dark span.cm-bracket { color: #f8f8f2; }
+.cm-s-ayu-dark span.cm-tag { color: rgba(57, 186, 230, 80); }
+.cm-s-ayu-dark span.cm-header { color: #c2d94c; }
+.cm-s-ayu-dark span.cm-link { color: #39bae6; }
+.cm-s-ayu-dark span.cm-error { color: #ff3333; } 
+
+.cm-s-ayu-dark .CodeMirror-activeline-background { background: #01060e; }
+.cm-s-ayu-dark .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/theme/ayu-mirage.css b/theme/ayu-mirage.css
new file mode 100644
index 0000000000..7a5b50ceb4
--- /dev/null
+++ b/theme/ayu-mirage.css
@@ -0,0 +1,43 @@
+/* Based on https://github.com/dempfi/ayu */
+
+.cm-s-ayu-mirage.CodeMirror { background: #1f2430; color: #cbccc6; }
+.cm-s-ayu-mirage div.CodeMirror-selected { background: #34455a; }
+.cm-s-ayu-mirage .CodeMirror-line::selection, .cm-s-ayu-mirage .CodeMirror-line > span::selection, .cm-s-ayu-mirage .CodeMirror-line > span > span::selection { background: #34455a; }
+.cm-s-ayu-mirage .CodeMirror-line::-moz-selection, .cm-s-ayu-mirage .CodeMirror-line > span::-moz-selection, .cm-s-ayu-mirage .CodeMirror-line > span > span::-moz-selection { background: rgba(25, 30, 42, 99); }
+.cm-s-ayu-mirage .CodeMirror-gutters { background: #1f2430; border-right: 0px; }
+.cm-s-ayu-mirage .CodeMirror-guttermarker { color: white; }
+.cm-s-ayu-mirage .CodeMirror-guttermarker-subtle { color:  rgba(112, 122, 140, 66); }
+.cm-s-ayu-mirage .CodeMirror-linenumber { color: rgba(61, 66, 77, 99); }
+.cm-s-ayu-mirage .CodeMirror-cursor { border-left: 1px solid #ffcc66; }
+
+.cm-s-ayu-mirage span.cm-comment { color: #5c6773; font-style:italic; }
+.cm-s-ayu-mirage span.cm-atom { color: #ae81ff; }
+.cm-s-ayu-mirage span.cm-number { color: #ffcc66; }
+
+.cm-s-ayu-mirage span.cm-comment.cm-attribute { color: #ffd580; }
+.cm-s-ayu-mirage span.cm-comment.cm-def { color: #d4bfff; }
+.cm-s-ayu-mirage span.cm-comment.cm-tag { color: #5ccfe6; }
+.cm-s-ayu-mirage span.cm-comment.cm-type { color: #5998a6; }
+
+.cm-s-ayu-mirage span.cm-property { color: #f29e74; }
+.cm-s-ayu-mirage span.cm-attribute { color: #ffd580; }  
+.cm-s-ayu-mirage span.cm-keyword { color: #ffa759; } 
+.cm-s-ayu-mirage span.cm-builtin { color: #ffcc66; }
+.cm-s-ayu-mirage span.cm-string { color: #bae67e; }
+
+.cm-s-ayu-mirage span.cm-variable { color: #cbccc6; }
+.cm-s-ayu-mirage span.cm-variable-2 { color: #f28779; }
+.cm-s-ayu-mirage span.cm-variable-3 { color: #5ccfe6; }
+.cm-s-ayu-mirage span.cm-type { color: #ffa759; }
+.cm-s-ayu-mirage span.cm-def { color: #ffd580; }
+.cm-s-ayu-mirage span.cm-bracket { color: rgba(92, 207, 230, 80); }
+.cm-s-ayu-mirage span.cm-tag { color: #5ccfe6; }
+.cm-s-ayu-mirage span.cm-header { color: #bae67e; }
+.cm-s-ayu-mirage span.cm-link { color: #5ccfe6; }
+.cm-s-ayu-mirage span.cm-error { color: #ff3333; } 
+
+.cm-s-ayu-mirage .CodeMirror-activeline-background { background: #191e2a; }
+.cm-s-ayu-mirage .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}

From a9789c7f7c818692e293ef0925568cb9b5f63892 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 14 Nov 2019 10:10:42 +0100
Subject: [PATCH 4121/4742] Wire up shift-delete to fire a cut event on Gecko

Issue #6061
---
 src/edit/key_events.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index f0521d070a..1e7c27bb49 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -2,7 +2,7 @@ import { signalLater } from "../util/operation_group.js"
 import { restartBlink } from "../display/selection.js"
 import { isModifierKey, keyName, lookupKey } from "../input/keymap.js"
 import { eventInWidget } from "../measurement/widgets.js"
-import { ie, ie_version, mac, presto } from "../util/browser.js"
+import { ie, ie_version, mac, presto, gecko } from "../util/browser.js"
 import { activeElt, addClass, rmClass } from "../util/dom.js"
 import { e_preventDefault, off, on, signalDOMEvent } from "../util/event.js"
 import { hasCopyEvent } from "../util/feature_detection.js"
@@ -119,6 +119,8 @@ export function onKeyDown(e) {
     if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
       cm.replaceSelection("", null, "cut")
   }
+  if (gecko && !mac && !handled && code == 46 && e.shiftKey && !e.ctrlKey && document.execCommand)
+    document.execCommand("cut")
 
   // Turn mouse into crosshair when Alt is held on Mac.
   if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))

From 74de67598c8e3721cc5ecb24d1c4eb2b411ae740 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 15 Nov 2019 09:22:03 +0100
Subject: [PATCH 4122/4742] [julia mode] Fix getting stuck on integers with
 leading zeroes

Closes #6064
---
 mode/julia/julia.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 547669afbc..15121f4d33 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -186,16 +186,14 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     if (stream.match(/^\.?\d/, false)) {
       var imMatcher = RegExp(/^im\b/);
       var numberLiteral = false;
-      // Floats
-      if (stream.match(/^(?:(?:\d[_\d]*)?\.(?!\.)(?:\d[_\d]*)?|\d[_\d]*\.(?!\.)(?:\d[_\d]*))?([Eef][\+\-]?[_\d]+)?/i)) { numberLiteral = true; }
       if (stream.match(/^0x\.[0-9a-f_]+p[\+\-]?[_\d]+/i)) { numberLiteral = true; }
       // Integers
       if (stream.match(/^0x[0-9a-f_]+/i)) { numberLiteral = true; } // Hex
       if (stream.match(/^0b[01_]+/i)) { numberLiteral = true; } // Binary
       if (stream.match(/^0o[0-7_]+/i)) { numberLiteral = true; } // Octal
-      if (stream.match(/^[1-9][_\d]*(e[\+\-]?\d+)?/)) { numberLiteral = true; } // Decimal
-      // Zero by itself with no other piece of number.
-      if (stream.match(/^0(?![\dx])/i)) { numberLiteral = true; }
+      // Floats
+      if (stream.match(/^(?:(?:\d[_\d]*)?\.(?!\.)(?:\d[_\d]*)?|\d[_\d]*\.(?!\.)(?:\d[_\d]*))?([Eef][\+\-]?[_\d]+)?/i)) { numberLiteral = true; }
+      if (stream.match(/^\d[_\d]*(e[\+\-]?\d+)?/i)) { numberLiteral = true; } // Decimal
       if (numberLiteral) {
           // Integer literals may be "long"
           stream.match(imMatcher);

From 0f191d54eec4ffe3d69b5b71e5b999848209261d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 17 Nov 2019 14:44:17 +0100
Subject: [PATCH 4123/4742] [continuecomment addon] Continue comments when a
 newline is inserted before them

Fix issue where lastIndexOff was accidentally passed a negative
start position, which causes it to search from the end of the string.

Closes #6065
---
 addon/comment/continuecomment.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 68928769da..7ca1b4a9cc 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -32,7 +32,8 @@
             lineCmt && (found = line.lastIndexOf(lineCmt, pos.ch - 1)) > -1 &&
             /\bcomment\b/.test(cm.getTokenTypeAt({line: pos.line, ch: found + 1}))) {
           // ...then don't continue it
-        } else if ((found = line.lastIndexOf(blockStart, pos.ch - blockStart.length)) > -1 &&
+        } else if (pos.ch >= blockStart.length &&
+                   (found = line.lastIndexOf(blockStart, pos.ch - blockStart.length)) > -1 &&
                    found > end) {
           // reuse the existing leading spaces/tabs/mixed
           // or build the correct indent using CM's tab/indent options

From 18a8ae2f282e0c4e0a569ae1883a6b7e9aecb391 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Nov 2019 10:25:13 +0100
Subject: [PATCH 4124/4742] Adjust posFromMouse to handle arbitrary xRel field
 values

Closes #6067
---
 src/measurement/position_measurement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 18ec11df86..bb0ad50d67 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -679,7 +679,7 @@ export function posFromMouse(cm, e, liberal, forRect) {
   try { x = e.clientX - space.left; y = e.clientY - space.top }
   catch (e) { return null }
   let coords = coordsChar(cm, x, y), line
-  if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
+  if (forRect && coords.xRel > 0 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
     let colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length
     coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff))
   }

From ab25dd7582f4954fc05892c3a85f592fad509925 Mon Sep 17 00:00:00 2001
From: leaf <node_github@163.com>
Date: Tue, 19 Nov 2019 19:03:29 +0800
Subject: [PATCH 4125/4742] [vim bindings] Skip folded code when moving with
 j/k

---
 keymap/vim.js    |  6 ++++++
 test/index.html  | 13 ++++++++-----
 test/vim_test.js | 25 +++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 95b19b2452..9779628598 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1843,6 +1843,12 @@
         var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
         var first = cm.firstLine();
         var last = cm.lastLine();
+        var posV = cm.findPosV(cur, (motionArgs.forward ? repeat : -repeat), 'line', vim.lastHSPos);
+        var hasMarkedText = motionArgs.forward ? posV.line > line : posV.line < line;
+        if (hasMarkedText) {
+          line = posV.line;
+          endCh = posV.ch;
+        }
         // Vim go to line begin or line end when cursor at first/last line and
         // move to previous/next line is triggered.
         if (line < first && cur.line == first){
diff --git a/test/index.html b/test/index.html
index 0d153096aa..13f2b6dc92 100644
--- a/test/index.html
+++ b/test/index.html
@@ -59,10 +59,10 @@
 <script src="../mode/dylan/dylan.js"></script>
 
 <style>
-  .ok {color: #090;}
-  .fail {color: #e00;}
-  .error {color: #c90;}
-  .done {font-weight: bold;}
+  .ok { color: #090; }
+  .fail { color: #e00; }
+  .error { color: #c90; }
+  .done { font-weight: bold; }
   #progress {
   background: #45d;
   color: white;
@@ -152,6 +152,9 @@ <h2>Test Suite</h2>
     <script src="../mode/mscgen/msgenny_test.js"></script>
     <script src="../mode/dylan/test.js"></script>
     <script src="../addon/mode/multiplex_test.js"></script>
+    <script src="../addon/fold/foldcode.js"></script>
+    <script src="../addon/fold/brace-fold.js"></script>
+
     <script src="emacs_test.js"></script>
     <script src="sql-hint-test.js"></script>
     <script src="sublime_test.js"></script>
@@ -182,7 +185,7 @@ <h2>Test Suite</h2>
         if (running) {
           quit = true;
           setStatus("Restarting tests...", '', true);
-          setTimeout(function(){runHarness();}, 500);
+          setTimeout(function(){ runHarness(); }, 500);
           return;
         }
         filters = [];
diff --git a/test/vim_test.js b/test/vim_test.js
index 2485f1e437..20192d931a 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -38,6 +38,8 @@ var bigWordLine = lines[1];
 var charLine = lines[2];
 var bracesLine = lines[3];
 var seekBraceLine = lines[4];
+var foldingStart = lines[7];
+var foldingEnd = lines[11];
 
 var word1 = {
   start: new Pos(wordLine.line, 1),
@@ -94,6 +96,14 @@ var seekInside = {
   start: new Pos(seekBraceLine.line, 14),
   end: new Pos(seekBraceLine.line, 11)
 };
+var foldingRangeDown = {
+  start: new Pos(foldingStart.line, 3),
+  end: new Pos(foldingEnd.line, 0)
+};
+var foldingRangeUp = {
+  start: new Pos(foldingEnd.line, 0),
+  end: new Pos(foldingStart.line, 0)
+};
 
 function copyCursor(cur) {
   return new Pos(cur.line, cur.ch);
@@ -310,6 +320,16 @@ function testMotion(name, keys, endPos, startPos) {
   });
 }
 
+function testMotionWithFolding(name, keys, endPos, startPos) {
+  testVim(name, function (cm, vim, helpers) {
+    cm.foldCode(startPos);
+    cm.foldCode(endPos);
+    cm.setCursor(startPos);
+    helpers.doKeys(keys);
+    helpers.assertCursorAt(endPos)
+  })
+}
+
 function makeCursor(line, ch) {
   return new Pos(line, ch);
 }
@@ -392,6 +412,11 @@ testMotion('%_squares', ['%'], squares1.end, squares1.start);
 testMotion('%_braces', ['%'], curlys1.end, curlys1.start);
 testMotion('%_seek_outside', ['%'], seekOutside.end, seekOutside.start);
 testMotion('%_seek_inside', ['%'], seekInside.end, seekInside.start);
+
+// Motion with folding tests
+testMotionWithFolding('j_with_folding', 'j', foldingRangeDown.end, foldingRangeDown.start);
+testMotionWithFolding('k_with_folding', 'k', foldingRangeUp.end, foldingRangeUp.start);
+
 testVim('%_seek_skip', function(cm, vim, helpers) {
   cm.setCursor(0,0);
   helpers.doKeys(['%']);

From 908a806c1f0fc28e0d0f7cbd6ed64fa9e62a08bf Mon Sep 17 00:00:00 2001
From: "T. Brandon Ashley" <tbash@users.noreply.github.com>
Date: Mon, 2 Dec 2019 03:36:26 -0500
Subject: [PATCH 4126/4742] [elm mode] Sync with upstream implementation

Modifies this module to reflect changes made to this mode found in https://github.com/elm/elm-lang.org/blob/master/editor/cm/mode/elm.js
---
 mode/elm/elm.js | 280 +++++++++++++++++++++++++++---------------------
 1 file changed, 159 insertions(+), 121 deletions(-)

diff --git a/mode/elm/elm.js b/mode/elm/elm.js
index fe8dd497f4..9fb6a4db9a 100644
--- a/mode/elm/elm.js
+++ b/mode/elm/elm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: http://codemirror.net/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
@@ -13,189 +13,227 @@
 
   CodeMirror.defineMode("elm", function() {
 
-    function switchState(source, setState, f) {
+    function switchState(source, setState, f)
+    {
       setState(f);
       return f(source, setState);
     }
 
-    // These should all be Unicode extended, as per the Haskell 2010 report
-    var smallRE = /[a-z_]/;
-    var largeRE = /[A-Z]/;
+    var lowerRE = /[a-z]/;
+    var upperRE = /[A-Z]/;
+    var innerRE = /[a-zA-Z0-9_]/;
+
     var digitRE = /[0-9]/;
-    var hexitRE = /[0-9A-Fa-f]/;
-    var octitRE = /[0-7]/;
-    var idRE = /[a-z_A-Z0-9\']/;
-    var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:\u03BB\u2192]/;
-    var specialRE = /[(),;[\]`{}]/;
-    var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer
-
-    function normal() {
-      return function (source, setState) {
-        if (source.eatWhile(whiteCharRE)) {
+    var hexRE = /[0-9A-Fa-f]/;
+    var symbolRE = /[-&*+.\\/<>=?^|:]/;
+    var specialRE = /[(),[\]{}]/;
+    var spacesRE = /[ \v\f]/; // newlines are handled in tokenizer
+
+    function normal()
+    {
+      return function(source, setState)
+      {
+        if (source.eatWhile(spacesRE))
+        {
           return null;
         }
 
-        var ch = source.next();
-        if (specialRE.test(ch)) {
-          if (ch == '{' && source.eat('-')) {
-            var t = "comment";
-            if (source.eat('#')) t = "meta";
-            return switchState(source, setState, ncomment(t, 1));
-          }
-          return null;
-        }
+        var char = source.next();
 
-        if (ch == '\'') {
-          if (source.eat('\\'))
-            source.next();  // should handle other escapes here
-          else
-            source.next();
+        if (specialRE.test(char))
+        {
+          return (char === '{' && source.eat('-'))
+            ? switchState(source, setState, chompMultiComment(1))
+            : (char === '[' && source.match('glsl|'))
+                ? switchState(source, setState, chompGlsl)
+                : 'builtin';
+        }
 
-          if (source.eat('\''))
-            return "string";
-          return "error";
+        if (char === '\'')
+        {
+          return switchState(source, setState, chompChar);
         }
 
-        if (ch == '"') {
-          return switchState(source, setState, stringLiteral);
+        if (char === '"')
+        {
+          return source.eat('"')
+            ? source.eat('"')
+                ? switchState(source, setState, chompMultiString)
+                : 'string'
+            : switchState(source, setState, chompSingleString);
         }
 
-        if (largeRE.test(ch)) {
-          source.eatWhile(idRE);
-          if (source.eat('.'))
-            return "qualifier";
-          return "variable-2";
+        if (upperRE.test(char))
+        {
+          source.eatWhile(innerRE);
+          return 'variable-2';
         }
 
-        if (smallRE.test(ch)) {
+        if (lowerRE.test(char))
+        {
           var isDef = source.pos === 1;
-          source.eatWhile(idRE);
-          return isDef ? "type" : "variable";
+          source.eatWhile(innerRE);
+          return isDef ? "def" : "variable";
         }
 
-        if (digitRE.test(ch)) {
-          if (ch == '0') {
-            if (source.eat(/[xX]/)) {
-              source.eatWhile(hexitRE); // should require at least 1
-              return "integer";
-            }
-            if (source.eat(/[oO]/)) {
-              source.eatWhile(octitRE); // should require at least 1
+        if (digitRE.test(char))
+        {
+          if (char === '0')
+          {
+            if (source.eat(/[xX]/))
+            {
+              source.eatWhile(hexRE); // should require at least 1
               return "number";
             }
           }
-          source.eatWhile(digitRE);
-          var t = "number";
-          if (source.eat('.')) {
-            t = "number";
+          else
+          {
+            source.eatWhile(digitRE);
+          }
+          if (source.eat('.'))
+          {
             source.eatWhile(digitRE); // should require at least 1
           }
-          if (source.eat(/[eE]/)) {
-            t = "number";
+          if (source.eat(/[eE]/))
+          {
             source.eat(/[-+]/);
             source.eatWhile(digitRE); // should require at least 1
           }
-          return t;
+          return "number";
         }
 
-        if (symbolRE.test(ch)) {
-          if (ch == '-' && source.eat(/-/)) {
-            source.eatWhile(/-/);
-            if (!source.eat(symbolRE)) {
-              source.skipToEnd();
-              return "comment";
-            }
+        if (symbolRE.test(char))
+        {
+          if (char === '-' && source.eat('-'))
+          {
+            source.skipToEnd();
+            return "comment";
           }
           source.eatWhile(symbolRE);
-          return "builtin";
+          return "keyword";
+        }
+
+        if (char === '_')
+        {
+          return "keyword";
         }
 
         return "error";
       }
     }
 
-    function ncomment(type, nest) {
-      if (nest == 0) {
+    function chompMultiComment(nest)
+    {
+      if (nest == 0)
+      {
         return normal();
       }
-      return function(source, setState) {
-        var currNest = nest;
-        while (!source.eol()) {
-          var ch = source.next();
-          if (ch == '{' && source.eat('-')) {
-            ++currNest;
-          } else if (ch == '-' && source.eat('}')) {
-            --currNest;
-            if (currNest == 0) {
+      return function(source, setState)
+      {
+        while (!source.eol())
+        {
+          var char = source.next();
+          if (char == '{' && source.eat('-'))
+          {
+            ++nest;
+          }
+          else if (char == '-' && source.eat('}'))
+          {
+            --nest;
+            if (nest === 0)
+            {
               setState(normal());
-              return type;
+              return 'comment';
             }
           }
         }
-        setState(ncomment(type, currNest));
-        return type;
+        setState(chompMultiComment(nest));
+        return 'comment';
       }
     }
 
-    function stringLiteral(source, setState) {
-      while (!source.eol()) {
-        var ch = source.next();
-        if (ch == '"') {
+    function chompMultiString(source, setState)
+    {
+      while (!source.eol())
+      {
+        var char = source.next();
+        if (char === '"' && source.eat('"') && source.eat('"'))
+        {
           setState(normal());
-          return "string";
-        }
-        if (ch == '\\') {
-          if (source.eol() || source.eat(whiteCharRE)) {
-            setState(stringGap);
-            return "string";
-          }
-          if (!source.eat('&')) source.next(); // should handle other escapes here
+          return 'string';
         }
       }
-      setState(normal());
-      return "error";
+      return 'string';
     }
 
-    function stringGap(source, setState) {
-      if (source.eat('\\')) {
-        return switchState(source, setState, stringLiteral);
+    function chompSingleString(source, setState)
+    {
+      while (source.skipTo('\\"')) { source.next(); source.next(); }
+      if (source.skipTo('"'))
+      {
+      	source.next();
+        setState(normal());
+        return 'string';
       }
-      source.next();
+      source.skipToEnd();
       setState(normal());
-      return "error";
+      return 'error';
     }
 
+    function chompChar(source, setState)
+    {
+      while (source.skipTo("\\'")) { source.next(); source.next(); }
+      if (source.skipTo("'"))
+      {
+        source.next();
+        setState(normal());
+        return 'string';
+      }
+      source.skipToEnd();
+      setState(normal());
+      return 'error';
+    }
 
-    var wellKnownWords = (function() {
-      var wkw = {};
-
-      var keywords = [
-        "case", "of", "as",
-        "if", "then", "else",
-        "let", "in",
-        "infix", "infixl", "infixr",
-        "type", "alias",
-        "input", "output", "foreign", "loopback",
-        "module", "where", "import", "exposing",
-        "_", "..", "|", ":", "=", "\\", "\"", "->", "<-"
-      ];
-
-      for (var i = keywords.length; i--;)
-        wkw[keywords[i]] = "keyword";
-
-      return wkw;
-    })();
-
+    function chompGlsl(source, setState)
+    {
+      while (!source.eol())
+      {
+        var char = source.next();
+        if (char === '|' && source.eat(']'))
+        {
+          setState(normal());
+          return 'string';
+        }
+      }
+      return 'string';
+    }
 
+    var wellKnownWords = {
+      case: 1,
+      of: 1,
+      as: 1,
+      if: 1,
+      then: 1,
+      else: 1,
+      let: 1,
+      in: 1,
+      type: 1,
+      alias: 1,
+      module: 1,
+      where: 1,
+      import: 1,
+      exposing: 1,
+      port: 1
+    };
 
     return {
       startState: function ()  { return { f: normal() }; },
       copyState:  function (s) { return { f: s.f }; },
 
       token: function(stream, state) {
-        var t = state.f(stream, function(s) { state.f = s; });
-        var w = stream.current();
-        return (wellKnownWords.hasOwnProperty(w)) ? wellKnownWords[w] : t;
+        var type = state.f(stream, function(s) { state.f = s; });
+        var word = stream.current();
+        return (wellKnownWords.hasOwnProperty(word)) ? 'keyword' : type;
       }
     };
 

From 00281786f0ca656cb37c9b03dd72307fe6537b42 Mon Sep 17 00:00:00 2001
From: Olivia Ytterbrink <olivia@ytterbrink.com>
Date: Thu, 5 Dec 2019 14:06:06 +0100
Subject: [PATCH 4127/4742] [cypher mode] Added keywords for system commands

Includes multi database and privilege management commands
---
 mode/cypher/cypher.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 8b22e65db8..aa76eb9e34 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -46,7 +46,7 @@
         var word = stream.current();
         if (funcs.test(word)) return "builtin";
         if (preds.test(word)) return "def";
-        if (keywords.test(word)) return "keyword";
+        if (keywords.test(word) || systemKeywords.test(word)) return "keyword";
         return "variable";
       }
     };
@@ -67,6 +67,7 @@
     var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "reverse", "right", "round", "rtrim", "shortestPath", "sign", "sin", "size", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "toString", "trim", "type", "upper"]);
     var preds = wordRegexp(["all", "and", "any", "contains", "exists", "has", "in", "none", "not", "or", "single", "xor"]);
     var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with", "call", "yield"]);
+    var systemKeywords = wordRegexp(["access", "active", "assign", "all", "alter", "as", "catalog", "change", "copy", "create", "constraint", "constraints", "current", "database", "databases", "dbms", "default", "deny", "drop", "element", "elements", "exists", "from", "grant", "graph", "graphs", "if", "index", "indexes", "label", "labels", "management", "match", "name", "names", "new", "node", "nodes", "not", "of", "on", "or", "password", "populated", "privileges", "property", "read", "relationship", "relationships", "remove", "replace", "required", "revoke", "role", "roles", "set", "show", "start", "status", "stop", "suspended", "to", "traverse", "type", "types", "user", "users", "with", "write"]);
     var operatorChars = /[*+\-<>=&|~%^]/;
 
     return {

From 3ace5da283db612d0d43211fd0df97499287aeb8 Mon Sep 17 00:00:00 2001
From: Opender Singh <opender94@gmail.com>
Date: Sun, 24 Nov 2019 15:49:19 +1300
Subject: [PATCH 4128/4742] Support functions as fold widget argument

So that the widgets can be dynamic with regards to their content.

Expand the fold demo with a JSON editor that shows the number of
elements in folded regions.
---
 addon/fold/foldcode.js |  9 +++++--
 demo/folding.html      | 53 +++++++++++++++++++++++++++++++++++++++++-
 doc/manual.html        |  8 +++++--
 3 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index e146fb9f3e..887df3fe04 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -42,7 +42,7 @@
     }
     if (!range || range.cleared || force === "unfold") return;
 
-    var myWidget = makeWidget(cm, options);
+    var myWidget = makeWidget(cm, options, range);
     CodeMirror.on(myWidget, "mousedown", function(e) {
       myRange.clear();
       CodeMirror.e_preventDefault(e);
@@ -58,8 +58,13 @@
     CodeMirror.signal(cm, "fold", cm, range.from, range.to);
   }
 
-  function makeWidget(cm, options) {
+  function makeWidget(cm, options, range) {
     var widget = getOption(cm, options, "widget");
+
+    if (typeof widget == "function") {
+      widget = widget(range.from, range.to);
+    }
+
     if (typeof widget == "string") {
       var text = document.createTextNode(widget);
       widget = document.createElement("span");
diff --git a/demo/folding.html b/demo/folding.html
index b61ecee122..166aa98cf9 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -53,7 +53,23 @@ <h2>Code Folding Demo</h2>
     <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br>
     <textarea id="code" name="code"></textarea></div>
     <div style="max-width: 50em; margin-bottom: 1em">HTML:<br>
-    <textarea id="code-html" name="code-html"></textarea></div>
+    <textarea id="code-html" name="code-html"></textarea></div>    
+    <div style="max-width: 50em; margin-bottom: 1em">JSON with custom widget:<br>
+    <textarea id="code-json" name="code-json">
+{
+  "menu": {
+    "id": "file",
+    "value": "File",
+    "popup": {
+      "menuitem": [
+        {"value": "New", "onclick": "CreateNewDoc()"},
+        {"value": "Open", "onclick": "OpenDoc()"},
+        {"value": "Close", "onclick": "CloseDoc()"}
+      ]
+    }
+  }
+}
+    </textarea></div>
     <div style="max-width: 50em">Python:<br>
     <textarea id="code-python" name="code">
 def foo():
@@ -89,6 +105,7 @@ <h2>Code Folding Demo</h2>
   var te_python = document.getElementById("code-python");
   var te_markdown = document.getElementById("code-markdown");
   te_markdown.value = "# Foo\n## Bar\n\nblah blah\n\n## Baz\n\nblah blah\n\n# Quux\n\nblah blah\n"
+  var te_json = document.getElementById("code-json");
 
   window.editor = CodeMirror.fromTextArea(te, {
     mode: "javascript",
@@ -100,6 +117,40 @@ <h2>Code Folding Demo</h2>
   });
   editor.foldCode(CodeMirror.Pos(13, 0));
 
+  window.editor_json = CodeMirror.fromTextArea(te_json, {
+    mode: {name: "javascript", json: true},
+    lineNumbers: true,
+    lineWrapping: true,
+    extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
+    foldGutter: true,
+    gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
+    foldOptions: {
+      widget: (from, to) => {
+        var count = undefined;
+
+        // Get open / close token
+        var startToken = '{', endToken = '}';        
+        var prevLine = window.editor_json.getLine(from.line);
+        if (prevLine.lastIndexOf('[') > prevLine.lastIndexOf('{')) {
+          startToken = '[', endToken = ']';
+        }
+
+        // Get json content
+        var internal = window.editor_json.getRange(from, to);
+        var toParse = startToken + internal + endToken;
+
+        // Get key count
+        try {
+          var parsed = JSON.parse(toParse);
+          count = Object.keys(parsed).length;
+        } catch(e) { }        
+
+        return count ? `\u21A4${count}\u21A6` : '\u2194';
+      }
+    }
+  });
+  editor_json.foldCode(CodeMirror.Pos(5, 0));
+
   window.editor_html = CodeMirror.fromTextArea(te_html, {
     mode: "text/html",
     lineNumbers: true,
diff --git a/doc/manual.html b/doc/manual.html
index ecd501f414..8b0b20c8d4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2564,10 +2564,14 @@ <h2 id="addons">Addons</h2>
         and <code>CodeMirror.fold.xml</code>, for XML-style languages,
         and <code>CodeMirror.fold.comment</code>, for folding comment
         blocks.</dd>
-        <dt><code><strong>widget</strong>: string|Element</code></dt>
+        <dt><code><strong>widget</strong>: string | Element | fn(from: Pos, to: Pos) → string|Element</code></dt>
         <dd>The widget to show for folded ranges. Can be either a
         string, in which case it'll become a span with
-        class <code>CodeMirror-foldmarker</code>, or a DOM node.</dd>
+        class <code>CodeMirror-foldmarker</code>, or a DOM node.
+        To dynamically generate the widget, this can be a function 
+        that returns a string or DOM node, which will then render
+        as described. The function will be invoked with parameters
+        identifying the range to be folded.</dd>
         <dt><code><strong>scanUp</strong>: boolean</code></dt>
         <dd>When true (default is false), the addon will try to find
         foldable ranges on the lines above the current one if there

From 3e6aafd236ffe1ea76c252e1b264a9fb7b15a8e7 Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Mon, 9 Dec 2019 19:25:42 +0530
Subject: [PATCH 4129/4742] [sql mode] Support  backslash and escape constants
 in pgsql

Add support for escape constant as mentioned here:
https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS-ESCAPE
---
 mode/sql/sql.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 35902bbab1..6f3e328593 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -65,6 +65,12 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       // charset casting: _utf8'str', N'str', n'str'
       // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
       return "keyword";
+    } else if (support.escapeConstant && (ch == "e" || ch == "E")
+        && (stream.peek() == "'" || (stream.peek() == '"' && support.doubleQuote))) {
+      // escape constant: E'str', e'str'
+      // ref: https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS-ESCAPE
+      state.tokenize = tokenLiteral(stream.peek(), true);
+      return "keyword";
     } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) {
       // 1-line comment
       stream.skipToEnd();
@@ -122,15 +128,19 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   }
 
   // 'string', with char specified in quote escaped by '\'
-  function tokenLiteral(quote) {
+  function tokenLiteral(quote, withEscapeConst) {
     return function(stream, state) {
       var escaped = false, ch;
+      /* eat the first quote in case of escape constant */
+      if(withEscapeConst) {
+        ch = stream.eat(quote)
+      }
       while ((ch = stream.next()) != null) {
         if (ch == quote && !escaped) {
           state.tokenize = tokenBase;
           break;
         }
-        escaped = backslashStringEscapes && !escaped && ch == "\\";
+        escaped = (backslashStringEscapes || withEscapeConst) && !escaped && ch == "\\";
       }
       return "string";
     };
@@ -413,8 +423,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*\/+\-%<>!=&|^\/#@?~]/,
+    backslashStringEscapes: false,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
+    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast escapeConstant")
   });
 
   // Google's SQL-like query language, GQL

From 1c4b92213e1e03fefce252f395ca33f676ee9abf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 9 Dec 2019 14:59:34 +0100
Subject: [PATCH 4130/4742] [sql mode] Simplify patch 3e6aafd236ffe1ea

Issue #6081
---
 mode/sql/sql.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 6f3e328593..e43495d271 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -69,7 +69,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
         && (stream.peek() == "'" || (stream.peek() == '"' && support.doubleQuote))) {
       // escape constant: E'str', e'str'
       // ref: https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS-ESCAPE
-      state.tokenize = tokenLiteral(stream.peek(), true);
+      state.tokenize = function(stream, state) {
+        return (state.tokenize = tokenLiteral(stream.next(), true))(stream, state);
+      }
       return "keyword";
     } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) {
       // 1-line comment
@@ -128,19 +130,15 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   }
 
   // 'string', with char specified in quote escaped by '\'
-  function tokenLiteral(quote, withEscapeConst) {
+  function tokenLiteral(quote, backslashEscapes) {
     return function(stream, state) {
       var escaped = false, ch;
-      /* eat the first quote in case of escape constant */
-      if(withEscapeConst) {
-        ch = stream.eat(quote)
-      }
       while ((ch = stream.next()) != null) {
         if (ch == quote && !escaped) {
           state.tokenize = tokenBase;
           break;
         }
-        escaped = (backslashStringEscapes || withEscapeConst) && !escaped && ch == "\\";
+        escaped = (backslashStringEscapes || backslashEscapes) && !escaped && ch == "\\";
       }
       return "string";
     };

From ddafba743612718d2ecbff7edd554ff30e57d390 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 16 Dec 2019 13:32:54 +0100
Subject: [PATCH 4131/4742] Add a className option to addLineWidget

Issue #5952
---
 doc/manual.html            | 3 +++
 src/display/update_line.js | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8b0b20c8d4..d693b784e4 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1881,6 +1881,9 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
           position (zero for the top, N to put it after the Nth other
           widget). Note that this only has effect once, when the
           widget is created.
+          <dt><code><strong>className</strong>: string</code></dt>
+          <dd>Add an extra CSS class name to the wrapper element
+          created for the widget.</dd>
         </dl>
       Note that the widget node will become a descendant of nodes with
       CodeMirror-specific CSS classes, and those classes might in some
diff --git a/src/display/update_line.js b/src/display/update_line.js
index a436973ea9..4eda4f56fc 100644
--- a/src/display/update_line.js
+++ b/src/display/update_line.js
@@ -1,7 +1,7 @@
 import { buildLineContent } from "../line/line_data.js"
 import { lineNumberFor } from "../line/utils_line.js"
 import { ie, ie_version } from "../util/browser.js"
-import { elt } from "../util/dom.js"
+import { elt, classTest } from "../util/dom.js"
 import { signalLater } from "../util/operation_group.js"
 
 // When an aspect of a line changes, a string is added to
@@ -124,10 +124,10 @@ function updateLineGutter(cm, lineView, lineN, dims) {
 
 function updateLineWidgets(cm, lineView, dims) {
   if (lineView.alignable) lineView.alignable = null
+  let isWidget = classTest("CodeMirror-linewidget")
   for (let node = lineView.node.firstChild, next; node; node = next) {
     next = node.nextSibling
-    if (node.className == "CodeMirror-linewidget")
-      lineView.node.removeChild(node)
+    if (isWidget.test(node)) lineView.node.removeChild(node)
   }
   insertLineWidgets(cm, lineView, dims)
 }
@@ -157,7 +157,7 @@ function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
   if (!line.widgets) return
   let wrap = ensureLineWrapped(lineView)
   for (let i = 0, ws = line.widgets; i < ws.length; ++i) {
-    let widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget")
+    let widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget" + (widget.className ? " " + widget.className : ""))
     if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true")
     positionLineWidget(widget, node, lineView, dims)
     cm.display.input.setUneditable(node)

From 3f901c599eaf2187662484e4044200d1b481da65 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 17 Dec 2019 10:02:14 +0100
Subject: [PATCH 4132/4742] [javascript-hint addon] Properly iterate over local
 scopes

See https://discuss.codemirror.net/t/function-parameter-autocomplete/2240/1
---
 addon/hint/javascript-hint.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 96a7fe01c2..182224d5de 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -147,6 +147,8 @@
       // If not, just look in the global object and any local scope
       // (reading into JS mode internals to get at the local and global variables)
       for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
+      for (var c = token.state.context; c; c = c.prev)
+        for (var v = c.vars; v; v = v.next) maybeAdd(v.name)
       for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
       if (!options || options.useGlobalScope !== false)
         gatherCompletions(global);

From 27ec4460553aa8f471850dd66b489f618978b344 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Dec 2019 09:46:00 +0100
Subject: [PATCH 4133/4742] [sublime bindings] Make by-sub-word motion more
 conformant to Sublime

Closes #6091
---
 keymap/sublime.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 99c8beea08..5aeab9c99d 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -32,7 +32,10 @@
       } else if (state == "in") {
         if (type != cat) {
           if (type == "w" && cat == "W" && dir < 0) pos--;
-          if (type == "W" && cat == "w" && dir > 0) { type = "w"; continue; }
+          if (type == "W" && cat == "w" && dir > 0) { // From uppercase to lowercase
+            if (pos == start.ch + 1) { type = "w"; continue; }
+            else pos--;
+          }
           break;
         }
       }

From 0a2b8761640cf672d4907c918f672b663fdddf5b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Dec 2019 10:04:21 +0100
Subject: [PATCH 4134/4742] [sublime bindings] Fix sub-word motion at start of
 word

---
 keymap/sublime.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 5aeab9c99d..ffbdfe48ee 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -22,18 +22,19 @@
     if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1));
     var line = doc.getLine(start.line);
     if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0));
-    var state = "start", type;
-    for (var pos = start.ch, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) {
+    var state = "start", type, startPos = start.ch;
+    for (var pos = startPos, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) {
       var next = line.charAt(dir < 0 ? pos - 1 : pos);
       var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o";
       if (cat == "w" && next.toUpperCase() == next) cat = "W";
       if (state == "start") {
         if (cat != "o") { state = "in"; type = cat; }
+        else startPos = pos + dir
       } else if (state == "in") {
         if (type != cat) {
           if (type == "w" && cat == "W" && dir < 0) pos--;
           if (type == "W" && cat == "w" && dir > 0) { // From uppercase to lowercase
-            if (pos == start.ch + 1) { type = "w"; continue; }
+            if (pos == startPos + 1) { type = "w"; continue; }
             else pos--;
           }
           break;

From 4f0c03c31ba03588abf563d83e3ec6df5b6306c5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Dec 2019 10:12:57 +0100
Subject: [PATCH 4135/4742] Mark version 5.50.0

---
 AUTHORS              |  8 ++++++++
 CHANGELOG.md         | 32 ++++++++++++++++++++++++++++++++
 doc/manual.html      |  2 +-
 doc/releases.html    | 18 ++++++++++++++++++
 index.html           |  2 +-
 package.json         |  2 +-
 src/edit/main.js     |  2 +-
 test/sublime_test.js |  7 +++++--
 8 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 59e0cbbf64..ad6873d9b2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -299,6 +299,7 @@ Hanzhao Deng
 Harald Schilly
 Hardest
 Harshvardhan Gupta
+Hasan Delibaş
 Hasan Karahan
 Heanes
 Hector Oswaldo Caballero
@@ -320,6 +321,7 @@ Ian Wetherbee
 Ice White
 ICHIKAWA, Yuji
 idleberg
+Igor Petruk
 ilvalle
 Ilya Kharlamov
 Ingo Richter
@@ -374,6 +376,7 @@ Joel Einbinder
 joelpinheiro
 joewalsh
 Johan Ask
+Johannes
 John Connor
 John-David Dalton
 John Engler
@@ -444,6 +447,7 @@ Lanfei
 Lanny
 laobubu
 Laszlo Vidacs
+leaf
 leaf corcoran
 Lemmon
 Leo Baschy
@@ -601,10 +605,13 @@ noragrossman
 Norman Rzepka
 Nouzbe
 Oleksandr Yakovenko
+Olivia Ytterbrink
+Opender Singh
 opl-
 Oreoluwa Onatemowo
 oscar.lofwenhamn
 Oskar Segersvärd
+ossdev
 overdodactyl
 pablo
 pabloferz
@@ -752,6 +759,7 @@ Tako Schotanus
 Takuji Shimokawa
 Takuya Matsuyama
 Tarmil
+T. Brandon Ashley
 TDaglis
 tel
 Tentone
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6de8dab5c0..934eec6a38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+## 5.50.0 (2019-12-20)
+
+### Bug fixes
+
+Make Shift-Delete to cut work on Firefox.
+
+[closetag addon](https://codemirror.net/demo/closetag.html): Properly handle self-closing tags.
+
+[handlebars mode](https://codemirror.net/mode/handlebars/): Fix triple-brace support.
+
+[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Support mathing `$` in reverse regexp search.
+
+[panel addon](https://codemirror.net/doc/manual.html#addon_panel): Don't get confused by changing panel sizes.
+
+[javascript-hint addon](https://codemirror.net/doc/manual.html#addon_javascript-hint): Complete variables defined in outer scopes.
+
+[sublime bindings](https://codemirror.net/demo/sublime.html): Make by-subword motion more consistent with Sublime Text.
+
+[julia mode](https://codemirror.net/mode/julia/): Don't break on zero-prefixed integers.
+
+[elm mode](https://codemirror.net/mode/elm/): Sync with upstream version.
+
+[sql mode](https://codemirror.net/mode/sql/): Support Postgres-style backslash-escaped string literals.
+
+### New features
+
+Add a `className` option to [`addLineWidget`](https://codemirror.net/doc/manual.html#addLineWidget).
+
+[foldcode addon](https://codemirror.net/doc/manual.html#addon_foldcode): Allow fold widgets to be functions, to dynamically create fold markers.
+
+New themes: [ayu-dark](https://codemirror.net/demo/theme.html#ayu-dark) and [ayu-mirage](https://codemirror.net/demo/theme.html#ayu-mirage).
+
 ## 5.49.2 (2019-10-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index d693b784e4..b3a547124d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.49.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.50.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 6d653194f9..7ed42c85d6 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,24 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-12-2019: <a href="https://codemirror.net/codemirror-5.50.0.zip">Version 5.50.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Add a <code>className</code> option to <a href="https://codemirror.net/doc/manual.html#addLineWidget"><code>addLineWidget</code></a>.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_foldcode">foldcode addon</a>: Allow fold widgets to be functions, to dynamically create fold markers.</li>
+    <li>New themes: <a href="https://codemirror.net/demo/theme.html#ayu-dark">ayu-dark</a> and <a href="https://codemirror.net/demo/theme.html#ayu-mirage">ayu-mirage</a>.</li>
+    <li>Make Shift-Delete to cut work on Firefox.</li>
+    <li><a href="https://codemirror.net/demo/closetag.html">closetag addon</a>: Properly handle self-closing tags.</li>
+    <li><a href="https://codemirror.net/mode/handlebars/">handlebars mode</a>: Fix triple-brace support.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support mathing <code>$</code> in reverse regexp search.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Don’t get confused by changing panel sizes.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Complete variables defined in outer scopes.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Make by-subword motion more consistent with Sublime Text.</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Don’t break on zero-prefixed integers.</li>
+    <li><a href="https://codemirror.net/mode/elm/">elm mode</a>: Sync with upstream version.</li>
+    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Support Postgres-style backslash-escaped string literals.</li>
+  </ul>
+
   <p class="rel">21-10-2019: <a href="https://codemirror.net/codemirror-5.49.2.zip">Version 5.49.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 4f771f4f8c..c955ecd308 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.49.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.50.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index da4bea1ac5..b0a9e21ee6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.49.3",
+  "version": "5.50.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index ff0760b624..c69f684ee0 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.49.3"
+CodeMirror.version = "5.50.0"
diff --git a/test/sublime_test.js b/test/sublime_test.js
index 09bb951247..b227bed8ce 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -60,7 +60,7 @@
     };
   }
 
-  stTest("bySubword", "the foo_bar DooDahBah \n a",
+  stTest("bySubword", "the foo_bar DooDahBah \n a FOOBar",
          "goSubwordLeft", at(0, 0),
          "goSubwordRight", at(0, 3),
          "goSubwordRight", at(0, 7),
@@ -71,7 +71,10 @@
          "goSubwordRight", at(0, 22),
          "goSubwordRight", at(1, 0),
          "goSubwordRight", at(1, 2),
-         "goSubwordRight", at(1, 2),
+         "goSubwordRight", at(1, 6),
+         "goSubwordRight", at(1, 9),
+         "goSubwordLeft", at(1, 6),
+         "goSubwordLeft", at(1, 3),
          "goSubwordLeft", at(1, 1),
          "goSubwordLeft", at(1, 0),
          "goSubwordLeft", at(0, 22),

From 11272b24fc9eeac2d4fd66b844d5ee4b9e203229 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Mon, 23 Dec 2019 13:53:03 +0100
Subject: [PATCH 4136/4742] [sublime bindings] Add shortcut Ctrl-K Ctrl-D:
 find_under_expand_skip

---
 keymap/sublime.js    | 13 +++++++++++++
 test/sublime_test.js | 12 ++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index ffbdfe48ee..cfdf71ed40 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -155,6 +155,17 @@
       cm.state.sublimeFindFullWord = cm.doc.sel;
   };
 
+  cmds.skipAndSelectNextOccurrence = function(cm) {
+    var prevAnchor = cm.getCursor("anchor"), prevHead = cm.getCursor("head");
+    cmds.selectNextOccurrence(cm);
+    if (CodeMirror.cmpPos(prevAnchor, prevHead) != 0) {
+      cm.doc.setSelections(cm.doc.listSelections()
+          .filter(function (sel) {
+            return sel.anchor != prevAnchor || sel.head != prevHead;
+          }));
+    }
+  }
+
   function addCursorToSelection(cm, dir) {
     var ranges = cm.listSelections(), newRanges = [];
     for (var i = 0; i < ranges.length; i++) {
@@ -605,6 +616,7 @@
     "Shift-Cmd-F2": "clearBookmarks",
     "Alt-F2": "selectBookmarks",
     "Backspace": "smartBackspace",
+    "Cmd-K Cmd-D": "skipAndSelectNextOccurrence",
     "Cmd-K Cmd-K": "delLineRight",
     "Cmd-K Cmd-U": "upcaseAtCursor",
     "Cmd-K Cmd-L": "downcaseAtCursor",
@@ -665,6 +677,7 @@
     "Shift-Ctrl-F2": "clearBookmarks",
     "Alt-F2": "selectBookmarks",
     "Backspace": "smartBackspace",
+    "Ctrl-K Ctrl-D": "skipAndSelectNextOccurrence",
     "Ctrl-K Ctrl-K": "delLineRight",
     "Ctrl-K Ctrl-U": "upcaseAtCursor",
     "Ctrl-K Ctrl-L": "downcaseAtCursor",
diff --git a/test/sublime_test.js b/test/sublime_test.js
index b227bed8ce..57fd385ec2 100644
--- a/test/sublime_test.js
+++ b/test/sublime_test.js
@@ -130,6 +130,14 @@
          hasSel(0, 0, 0, 0,
                 2, 0, 2, 0), val("\nabcde\n\nfghijkl\nmn"));
 
+  stTest("skipAndSelectNextOccurrence", "a foo bar\nfoobar foo",
+         setSel(0, 2, 0, 5), "skipAndSelectNextOccurrence", hasSel(1, 0, 1, 3),
+         "skipAndSelectNextOccurrence",  hasSel(1, 7, 1, 10),
+         "skipAndSelectNextOccurrence",  hasSel(0, 2, 0, 5),
+         Pos(0, 3), "skipAndSelectNextOccurrence", hasSel(0, 2, 0, 5),
+         "skipAndSelectNextOccurrence", hasSel(1, 7, 1, 10),
+         setSel(0, 6, 0, 9), "skipAndSelectNextOccurrence", hasSel(1, 3, 1, 6));
+
   stTest("selectNextOccurrence", "a foo bar\nfoobar foo",
          setSel(0, 2, 0, 5),
          "selectNextOccurrence", hasSel(0, 2, 0, 5,
@@ -141,8 +149,8 @@
                                         1, 0, 1, 3,
                                         1, 7, 1, 10),
          Pos(0, 3), "selectNextOccurrence", hasSel(0, 2, 0, 5),
-        "selectNextOccurrence", hasSel(0, 2, 0, 5,
-                                       1, 7, 1, 10),
+         "selectNextOccurrence", hasSel(0, 2, 0, 5,
+                                        1, 7, 1, 10),
          setSel(0, 6, 0, 9),
          "selectNextOccurrence", hasSel(0, 6, 0, 9,
                                         1, 3, 1, 6));

From a4715802ddd97d6f7d7b16a84124ce14b55f0331 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Mon, 23 Dec 2019 13:55:31 +0100
Subject: [PATCH 4137/4742] [soy mode] Add support for default param value

---
 mode/soy/soy.js  |  4 ++--
 mode/soy/test.js | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index c39516a9ad..c199b766d9 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -21,7 +21,6 @@
     "@inject": paramData,
     "@inject?": paramData,
     "@state": paramData,
-    "@state?": paramData,
     "template": { soyState: "templ-def", variableScope: true},
     "literal": { },
     "msg": {},
@@ -250,7 +249,8 @@
             return null;
 
           case "param-type":
-            if (stream.peek() == "}") {
+            var peekChar = stream.peek();
+            if (peekChar == "}" || peekChar == "=") {
               state.soyState.pop();
               return null;
             }
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 6c1fd8d630..7811384714 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -151,6 +151,19 @@
      '[keyword {/template}]',
      '');
 
+  MT('param-type-and-default-value',
+     '[keyword {template] [def .foo][keyword }]',
+     '  [keyword {@param] [def bar]: [type bool] = [atom true][keyword }]',
+     '[keyword {/template}]',
+     '');
+
+   MT('state-variable-reference',
+     '[keyword {template] [def .foo][keyword }]',
+     '  [keyword {@param] [def bar]:= [atom true][keyword }]',
+     '  [keyword {@state] [def foobar]:= [variable-2 $bar][keyword }]',
+     '[keyword {/template}]',
+     '');
+
   MT('single-quote-strings',
      '[keyword {][string "foo"] [string \'bar\'][keyword }]',
      '');

From 45ed413e52892362f1f4a30265578637b605db2a Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <lewenhaupt@lewenhaupt-macbookpro2.roam.corp.google.com>
Date: Wed, 25 Dec 2019 22:47:11 +0100
Subject: [PATCH 4138/4742] Fix indentation after a {literal{/literal} block.

---
 mode/soy/soy.js  | 1 -
 mode/soy/test.js | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index c199b766d9..fc280c77db 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -329,7 +329,6 @@
 
           case "literal":
             if (stream.match(/^(?=\{\/literal})/)) {
-              state.indent -= config.indentUnit;
               state.soyState.pop();
               return this.token(stream, state);
             }
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 7811384714..8234813f03 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -201,6 +201,14 @@
      '  Old message',
      '[keyword {/msg}]');
 
+  MT('literal-indent',
+     '[keyword {template] [def .name][keyword }]',
+     '  [keyword {literal}]',
+     '    Lerum',
+     '  [keyword {/literal}]',
+     '  Ipsum',
+     '[keyword {/template}]');
+
   MT('special-chars',
      '[keyword {sp}]',
      '[keyword {nil}]',

From e193f34844a1b194cfdf6ab1c812eb9eb21d139b Mon Sep 17 00:00:00 2001
From: Hanno Fellmann <fellmann@users.noreply.github.com>
Date: Mon, 30 Dec 2019 18:33:41 +0100
Subject: [PATCH 4139/4742] Fix: Broken line widget removal

Removal of line widgets is broken in 5.50.0 due to invalid classname check
---
 src/display/update_line.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/update_line.js b/src/display/update_line.js
index 4eda4f56fc..50d781ee84 100644
--- a/src/display/update_line.js
+++ b/src/display/update_line.js
@@ -127,7 +127,7 @@ function updateLineWidgets(cm, lineView, dims) {
   let isWidget = classTest("CodeMirror-linewidget")
   for (let node = lineView.node.firstChild, next; node; node = next) {
     next = node.nextSibling
-    if (isWidget.test(node)) lineView.node.removeChild(node)
+    if (isWidget.test(node.className)) lineView.node.removeChild(node)
   }
   insertLineWidgets(cm, lineView, dims)
 }

From 3080ea67839df6eb27f7f23f7939d4e40aa9edbd Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Mon, 30 Dec 2019 22:43:43 +0100
Subject: [PATCH 4140/4742] [nsis mode] Add commands up to NSIS v3.05

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 94b8eae24d..10816608c1 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -31,7 +31,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEDllCharacteristics|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
     {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
 

From adbf7bb8ee9d75527dd0d1955c232618b596583b Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <lewenhaupt@lewenhaupt-macbookpro2.roam.corp.google.com>
Date: Tue, 31 Dec 2019 21:30:40 +0100
Subject: [PATCH 4141/4742] Restore indentation when closing an array or
 generator.

---
 mode/julia/julia.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 15121f4d33..0cc9bc0721 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -127,16 +127,14 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     if (inArray(state) && ch === ']') {
-      if (currentScope(state) === "if") { state.scopes.pop(); }
-      while (currentScope(state) === "for") { state.scopes.pop(); }
+      while (currentScope(state) !== "[") { state.scopes.pop(); }
       state.scopes.pop();
       state.nestedArrays--;
       state.leavingExpr = true;
     }
 
     if (inGenerator(state) && ch === ')') {
-      if (currentScope(state) === "if") { state.scopes.pop(); }
-      while (currentScope(state) === "for") { state.scopes.pop(); }
+      while (currentScope(state) !== "(") { state.scopes.pop(); }
       state.scopes.pop();
       state.nestedGenerators--;
       state.leavingExpr = true;

From 91b1c88c1b18f1cb886ba63a79ab9d28594f509e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 1 Jan 2020 14:01:58 +0100
Subject: [PATCH 4142/4742] Mark version 5.50.2

---
 AUTHORS           | 1 +
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index ad6873d9b2..cc2abcc5d0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -294,6 +294,7 @@ Guillaume Massé
 guraga
 Gustavo Rodrigues
 Hakan Tunc
+Hanno Fellmann
 Hans Engel
 Hanzhao Deng
 Harald Schilly
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 934eec6a38..e9b6c80213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.50.2 (2020-01-01)
+
+### Bug fixes
+
+Fix bug that broke removal of line widgets.
+
 ## 5.50.0 (2019-12-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index b3a547124d..2cc5d90fb2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.50.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.50.2</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 7ed42c85d6..57fb65f81d 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">01-01-2020: <a href="https://codemirror.net/codemirror-5.50.2.zip">Version 5.50.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix bug that broke removal of line widgets.</li>
+  </ul>
+
   <p class="rel">20-12-2019: <a href="https://codemirror.net/codemirror-5.50.0.zip">Version 5.50.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index c955ecd308..2c82f4af35 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.50.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.50.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index b0a9e21ee6..12f5498b85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.50.0",
+  "version": "5.50.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index c69f684ee0..7ed58066d3 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.50.0"
+CodeMirror.version = "5.50.2"

From 6c4087cc882c199cd1fd4f553982a80b5b231b3f Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Fri, 3 Jan 2020 08:55:57 +0100
Subject: [PATCH 4143/4742] If valid and invalid files are drag n dropped,
 paste all valid files

---
 src/edit/drop_events.js | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/edit/drop_events.js b/src/edit/drop_events.js
index 12c760f0d6..c6fbbbc186 100644
--- a/src/edit/drop_events.js
+++ b/src/edit/drop_events.js
@@ -29,28 +29,39 @@ export function onDrop(e) {
   // and insert it.
   if (files && files.length && window.FileReader && window.File) {
     let n = files.length, text = Array(n), read = 0
-    let loadFile = (file, i) => {
-      if (cm.options.allowDropFileTypes &&
-          indexOf(cm.options.allowDropFileTypes, file.type) == -1)
-        return
-
-      let reader = new FileReader
-      reader.onload = operation(cm, () => {
-        let content = reader.result
-        if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = ""
-        text[i] = content
-        if (++read == n) {
+    const markAsReadAndPasteIfAllFilesAreRead = () => {
+      if (++read == n) {
+        operation(cm, () => {
           pos = clipPos(cm.doc, pos)
           let change = {from: pos, to: pos,
-                        text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+                        text: cm.doc.splitLines(
+                            text.filter(t => t != null).join(cm.doc.lineSeparator())),
                         origin: "paste"}
           makeChange(cm.doc, change)
           setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)))
+        })()
+      }
+    }
+    const readTextFromFile = (file, i) => {
+      if (cm.options.allowDropFileTypes &&
+          indexOf(cm.options.allowDropFileTypes, file.type) == -1) {
+        markAsReadAndPasteIfAllFilesAreRead()
+        return
+      }
+      let reader = new FileReader
+      reader.onerror = () => markAsReadAndPasteIfAllFilesAreRead()
+      reader.onload = () => {
+        let content = reader.result
+        if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) {
+          markAsReadAndPasteIfAllFilesAreRead()
+          return
         }
-      })
+        text[i] = content;
+        markAsReadAndPasteIfAllFilesAreRead()
+      }
       reader.readAsText(file)
     }
-    for (let i = 0; i < n; ++i) loadFile(files[i], i)
+    for (let i = 0; i < files.length; i++) readTextFromFile(files[i], i)
   } else { // Normal drop
     // Don't do a replace if the drop happened inside of the selected text.
     if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {

From 0c46c041cdce14091d0fb0f14b69baa559aab0ec Mon Sep 17 00:00:00 2001
From: elpnt <39664774+elpnt@users.noreply.github.com>
Date: Mon, 6 Jan 2020 19:27:58 +0900
Subject: [PATCH 4144/4742] [rust mode] Fixed type names in demo code

---
 mode/rust/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/rust/index.html b/mode/rust/index.html
index d543a8d6c6..071ba0251d 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -30,13 +30,13 @@ <h2>Rust mode</h2>
 <div><textarea id="code" name="code">
 // Demo code.
 
-type foo<T> = int;
+type foo<T> = i32;
 enum bar {
-    some(int, foo<float>),
-    none
+    Some(i32, foo<f32>),
+    None
 }
 
-fn check_crate(x: int) {
+fn check_crate(x: i32) {
     let v = 10;
     match foo {
         1 ... 3 {

From 47dddf19774764e4800001755456e2f9da534117 Mon Sep 17 00:00:00 2001
From: James Cockshull <james.cockshull@gmail.com>
Date: Mon, 6 Jan 2020 20:00:09 +0700
Subject: [PATCH 4145/4742] Fix broken link in manual

The external link to the ternjs.net demo page returns a 404 error; this PR corrects it.
---
 doc/manual.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 2cc5d90fb2..23c8a4df1a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3178,14 +3178,14 @@ <h2 id="addons">Addons</h2>
 
       <dt id="addon_tern"><a href="../addon/tern/tern.js"><code>tern/tern.js</code></a></dt>
       <dd>Provides integration with
-      the <a href="http://ternjs.net">Tern</a> JavaScript analysis
+      the <a href="https://ternjs.net">Tern</a> JavaScript analysis
       engine, for completion, definition finding, and minor
       refactoring help. See the <a href="../demo/tern.html">demo</a>
       for a very simple integration. For more involved scenarios, see
       the comments at the top of
       the <a href="../addon/tern/tern.js">addon</a> and the
       implementation of the
-      (multi-file) <a href="http://ternjs.net/doc/demo.html">demonstration
+      (multi-file) <a href="https://ternjs.net/doc/demo/index.html">demonstration
       on the Tern website</a>.</dd>
     </dl>
 </section>

From 00363e34ab1574d85525d84318e596319f76346f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 Jan 2020 07:53:40 +0100
Subject: [PATCH 4146/4742] [elm mode] Remove tab character

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

diff --git a/mode/elm/elm.js b/mode/elm/elm.js
index 9fb6a4db9a..6ce940fe82 100644
--- a/mode/elm/elm.js
+++ b/mode/elm/elm.js
@@ -171,7 +171,7 @@
       while (source.skipTo('\\"')) { source.next(); source.next(); }
       if (source.skipTo('"'))
       {
-      	source.next();
+        source.next();
         setState(normal());
         return 'string';
       }

From 5d740b99a4cca996b2cdc9fee3b1e1b8ac999617 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 7 Jan 2020 07:55:12 +0100
Subject: [PATCH 4147/4742] [show-hint addon] Scroll initially selected hint
 into view

See https://discuss.codemirror.net/t/show-selectedhint-in-very-long-list-of-hints/2255
---
 addon/hint/show-hint.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index d70b2ab173..374cddfe98 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -322,6 +322,7 @@
     CodeMirror.on(hints, "mousedown", function() {
       setTimeout(function(){cm.focus();}, 20);
     });
+    this.scrollToActive()
 
     CodeMirror.signal(data, "select", completions[this.selectedHint], hints.childNodes[this.selectedHint]);
     return true;
@@ -363,11 +364,16 @@
       if (node) node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
       node = this.hints.childNodes[this.selectedHint = i];
       node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
+      this.scrollToActive()
+      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
+    },
+
+    scrollToActive: function() {
+      var node = this.hints.childNodes[this.selectedHint]
       if (node.offsetTop < this.hints.scrollTop)
         this.hints.scrollTop = node.offsetTop - 3;
       else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
         this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;
-      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
     },
 
     screenAmount: function() {

From a41ea1b7dfffed8400f58f3f366fa298ee44a4b3 Mon Sep 17 00:00:00 2001
From: antosarho <tsarhanis@gmail.com>
Date: Tue, 7 Jan 2020 17:56:59 +1100
Subject: [PATCH 4148/4742] [real-world uses] Add Adnuntius

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 8460755c81..0b03a15da5 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -26,6 +26,7 @@ <h2>CodeMirror real-world uses</h2>
 
     <ul>
       <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
+      <li><a href="http://adnuntius.com">Adnuntius</a> (used for in-browser code editing and version history)</li>
       <li><a href="http://alm.tools">ALM Tools</a> (TypeScript powered IDE)</li>
       <li><a href="http://amber-lang.net/">Amber</a> (JavaScript-based Smalltalk system)</li>
       <li><a href="http://apeye.org/">APEye</a> (tool for testing &amp; documenting APIs)</li>

From 4d0e99d1a05f9e17933a52a5b486bf9463cc890c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Jan 2020 08:07:26 +0100
Subject: [PATCH 4149/4742] Make sure clearHistory clears all linked histories

Closes #6108
---
 src/model/Doc.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/model/Doc.js b/src/model/Doc.js
index 956f752b9b..c305eee25b 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -197,7 +197,10 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     for (let i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone
     return {undo: done, redo: undone}
   },
-  clearHistory: function() {this.history = new History(this.history.maxGeneration)},
+  clearHistory: function() {
+    this.history = new History(this.history.maxGeneration)
+    linkedDocs(this, doc => doc.history = this.history, true)
+  },
 
   markClean: function() {
     this.cleanGeneration = this.changeGeneration(true)

From 32da49cfe4389c49d964e9f548cbf592d589f3a6 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 11 Jan 2020 17:29:44 +0400
Subject: [PATCH 4150/4742] [vim] fix R key in visual mode

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 9779628598..c4db5f5cc3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -180,7 +180,8 @@
     { keys: '@<character>', type: 'action', action: 'replayMacro' },
     { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' },
     // Handle Replace-mode as a special case of insert mode.
-    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
+    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }, context: 'normal'},
+    { keys: 'R', type: 'operator', operator: 'change', operatorArgs: { linewise: true, fullLine: true }, context: 'visual', exitVisualBlock: true},
     { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
     { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
     { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
@@ -1293,6 +1294,10 @@
         }
         inputState.operator = command.operator;
         inputState.operatorArgs = copyArgs(command.operatorArgs);
+        if (command.exitVisualBlock) {
+            vim.visualBlock = false;
+            updateCmSelection(cm);
+        }
         if (vim.visualMode) {
           // Operating on a selection in visual mode. We don't need a motion.
           this.evalInput(cm, vim);
@@ -2104,9 +2109,9 @@
       change: function(cm, args, ranges) {
         var finalHead, text;
         var vim = cm.state.vim;
+        var anchor = ranges[0].anchor,
+            head = ranges[0].head;
         if (!vim.visualMode) {
-          var anchor = ranges[0].anchor,
-              head = ranges[0].head;
           text = cm.getRange(anchor, head);
           var lastState = vim.lastEditInputState || {};
           if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) {
@@ -2134,6 +2139,13 @@
             anchor.ch = Number.MAX_VALUE;
           }
           finalHead = anchor;
+        } else if (args.fullLine) {
+            head.ch = Number.MAX_VALUE;
+            head.line--;
+            cm.setSelection(anchor, head)
+            text = cm.getSelection();
+            cm.replaceSelection("");
+            finalHead = anchor;
         } else {
           text = cm.getSelection();
           var replacement = fillArray('', ranges.length);
diff --git a/test/driver.js b/test/driver.js
index 8789f73be9..22de01e33a 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -11,6 +11,8 @@ function indexOf(collection, elt) {
 }
 
 function test(name, run, expectedFail) {
+  if (!/^vim/.test(name)) return
+  console.log(name)
   // Force unique names
   var originalName = name;
   var i = 2; // Second function would be NAME_2
diff --git a/test/vim_test.js b/test/vim_test.js
index 20192d931a..c673b7fdea 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1800,6 +1800,18 @@ testVim('R', function(cm, vim, helpers) {
   eq('vim-replace', cm.getOption('keyMap'));
   is(cm.state.overwrite, 'Setting overwrite state failed');
 });
+testVim('R_visual', function(cm, vim, helpers) {
+  helpers.doKeys('<C-v>', 'j', 'R', '0', '<Esc>');
+  eq('0\nb33\nc44\nc55', cm.getValue());
+  helpers.doKeys('2', 'j', '.');
+  eq('0\nb33\n0', cm.getValue());
+  helpers.doKeys('k', 'v', 'R', '1', '<Esc>');
+  eq('0\n1\n0', cm.getValue());
+  helpers.doKeys('k', '.');
+  eq('1\n1\n0', cm.getValue());
+  helpers.doKeys('p');
+  eq('1\n0\n1\n0', cm.getValue());
+}, {value: 'a11\na22\nb33\nc44\nc55'});
 testVim('mark', function(cm, vim, helpers) {
   cm.setCursor(2, 2);
   helpers.doKeys('m', 't');

From 93659d990f595e2c3c4e9a3a3bdda3baf660fa49 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 11 Jan 2020 17:33:57 +0400
Subject: [PATCH 4151/4742] [vim] fix behavior of ' and ` marks

---
 keymap/vim.js    | 31 +++++++++++++++++++------------
 test/vim_test.js | 26 +++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c4db5f5cc3..578d6906a7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -595,9 +595,16 @@
         }
         return mark;
       }
+      function find(cm, offset) {
+        var oldPointer = pointer;
+        var mark = move(cm, offset);
+        pointer = oldPointer;
+        return mark && mark.find();
+      }
       return {
         cachedCursor: undefined, //used for # and * jumps
         add: add,
+        find: find,
         move: move
       };
     };
@@ -4336,25 +4343,25 @@
     }
 
     function getMarkPos(cm, vim, markName) {
-      if (markName == '\'') {
-        var history = cm.doc.history.done;
-        var event = history[history.length - 2];
-        return event && event.ranges && event.ranges[0].head;
+      if (markName == '\'' || markName == '`') {
+        return vimGlobalState.jumpList.find(cm, -1) || Pos(0, 0);
       } else if (markName == '.') {
-        if (cm.doc.history.lastModTime == 0) {
-          return  // If no changes, bail out; don't bother to copy or reverse history array.
-        } else {
-          var changeHistory = cm.doc.history.done.filter(function(el){ if (el.changes !== undefined) { return el } });
-          changeHistory.reverse();
-          var lastEditPos = changeHistory[0].changes[0].to;
-        }
-        return lastEditPos;
+        return getLastEditPos(cm);
       }
 
       var mark = vim.marks[markName];
       return mark && mark.find();
     }
 
+    function getLastEditPos(cm) {
+      var done = cm.doc.history.done;
+      for (var i = done.length; i--;) {
+        if (done[i].changes) {
+          return copyCursor(done[i].changes[0].to);
+        }
+      }
+    }
+
     var ExCommandDispatcher = function() {
       this.buildCommandMap_();
     };
diff --git a/test/vim_test.js b/test/vim_test.js
index c673b7fdea..6a3450851a 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1825,15 +1825,31 @@ testVim('mark', function(cm, vim, helpers) {
   helpers.assertCursorAt(2, 3);
 });
 testVim('mark\'', function(cm, vim, helpers) {
+  // motions that do not update jumplist
   cm.setCursor(2, 2);
-  cm.setCursor(0, 0);
   helpers.doKeys('`', '\'');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('j', '3', 'l');
+  helpers.doKeys('`', '`');
   helpers.assertCursorAt(2, 2);
-  cm.setCursor(2, 0);
-  cm.replaceRange('   h', cm.getCursor());
-  cm.setCursor(0, 0);
+  helpers.doKeys('`', '`');
+  helpers.assertCursorAt(1, 3);
+  // motions that update jumplist
+  cm.openDialog = helpers.fakeOpenDialog('=');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(6, 20);
+  helpers.doKeys('`', '`');
+  helpers.assertCursorAt(1, 3);
   helpers.doKeys('\'', '\'');
-  helpers.assertCursorAt(2, 3);
+  helpers.assertCursorAt(6, 2);
+  helpers.doKeys('\'', '`');
+  helpers.assertCursorAt(1, 1);
+  // edits
+  helpers.doKeys('g', 'I', '\n', '<Esc>', 'l');
+  helpers.doKeys('`', '`');
+  helpers.assertCursorAt(7, 2);
+  helpers.doKeys('`', '`');
+  helpers.assertCursorAt(2, 1);
 });
 testVim('mark.', function(cm, vim, helpers) {
   cm.setCursor(0, 0);

From a173882ef0264d5d7b99d70acf42ec855eb4fba2 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sun, 12 Jan 2020 00:52:24 +0400
Subject: [PATCH 4152/4742] [vim] implement gi gI gJ

---
 keymap/vim.js    | 11 ++++++++++-
 test/vim_test.js | 25 ++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 578d6906a7..ce5983d824 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -164,7 +164,9 @@
     { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
     { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
     { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
+    { keys: 'gi', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'lastEdit' }, context: 'normal' },
     { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
+    { keys: 'gI', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'bol'}, context: 'normal' },
     { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
     { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
     { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
@@ -174,6 +176,7 @@
     { keys: '<C-q>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
     { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
     { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
+    { keys: 'gJ', type: 'action', action: 'joinLines', actionArgs: { keepSpaces: true }, isEdit: true },
     { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
     { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
     { keys: 'r<character>', type: 'action', action: 'replace', isEdit: true },
@@ -2380,6 +2383,8 @@
         var height = cm.listSelections().length;
         if (insertAt == 'eol') {
           head = Pos(head.line, lineLength(cm, head.line));
+        } else if (insertAt == 'bol') {
+          head = Pos(head.line, 0);
         } else if (insertAt == 'charAfter') {
           head = offsetCursor(head, 0, 1);
         } else if (insertAt == 'firstNonBlank') {
@@ -2418,6 +2423,8 @@
           if (vim.visualMode){
             return;
           }
+        } else if (insertAt == 'lastEdit') {
+          head = getLastEditPos(cm) || head;
         }
         cm.setOption('disableInput', false);
         if (actionArgs && actionArgs.replace) {
@@ -2526,7 +2533,9 @@
           var tmp = Pos(curStart.line + 1,
                         lineLength(cm, curStart.line + 1));
           var text = cm.getRange(curStart, tmp);
-          text = text.replace(/\n\s*/g, ' ');
+          text = actionArgs.keepSpaces
+            ? text.replace(/\n\r?/g, '')
+            : text.replace(/\n\s*/g, ' ');
           cm.replaceRange(text, curStart, tmp);
         }
         var curFinalPos = Pos(curStart.line, finalCh);
diff --git a/test/vim_test.js b/test/vim_test.js
index 6a3450851a..577a80b1f9 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1608,13 +1608,13 @@ testVim('i_forward_delete', function(cm, vim, helpers) {
 }, { value: 'A1234\nBCD'});
 testVim('forward_delete', function(cm, vim, helpers) {
   cm.setCursor(0, 3);
-  helpers.doInsertModeKeys('Delete');
+  helpers.doKeys('<Del>');
   helpers.assertCursorAt(0, 3);
   eq('A124\nBCD', cm.getValue());
-  helpers.doInsertModeKeys('Delete');
+  helpers.doKeys('<Del>');
   helpers.assertCursorAt(0, 2);
   eq('A12\nBCD', cm.getValue());
-  helpers.doInsertModeKeys('Delete');
+  helpers.doKeys('<Del>');
   helpers.assertCursorAt(0, 1);
   eq('A1\nBCD', cm.getValue());
 }, { value: 'A1234\nBCD'});
@@ -1690,6 +1690,25 @@ testVim('J_repeat', function(cm, vim, helpers) {
   eq(expectedValue, cm.getValue());
   helpers.assertCursorAt(0, expectedValue.indexOf('word3') - 1);
 }, { value: 'word1 \n    word2\nword3\n word4' });
+testVim('gJ', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('g', 'J');
+  eq('word1word2 \n word3', cm.getValue());
+  helpers.assertCursorAt(0, 5);
+  helpers.doKeys('g', 'J');
+  eq('word1word2  word3', cm.getValue());
+  helpers.assertCursorAt(0, 11);
+}, { value: 'word1\nword2 \n word3' });
+testVim('gi', function(cm, vim, helpers) {
+  cm.setCursor(1, 5);
+  helpers.doKeys('g', 'I');
+  helpers.doKeys('a', 'a', '<Esc>', 'k');
+  eq('12\naa  xxxx', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+  helpers.doKeys('g', 'i');
+  helpers.assertCursorAt(1, 2);
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: '12\n  xxxx' });
 testVim('p', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);

From f41c636db4cd04f0c1bb2f53e3e1f811ba376134 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 17 Jan 2020 13:59:14 +0100
Subject: [PATCH 4153/4742] Make sure contextmenu event is also forwarded when
 fired on the input field

Since Firefox, as of patch a21ea6f496f09d0, seems to fire it on the
textarea.

Closes #6116
---
 src/edit/CodeMirror.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 9188e1b255..3429da1efc 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -120,6 +120,9 @@ function registerEventHandlers(cm) {
   // which point we can't mess with it anymore. Context menu is
   // handled in onMouseDown for these browsers.
   on(d.scroller, "contextmenu", e => onContextMenu(cm, e))
+  on(d.input.getField(), "contextmenu", e => {
+    if (!d.scroller.contains(e.target)) onContextMenu(cm, e)
+  })
 
   // Used to suppress mouse event handling when a touch happens
   let touchFinished, prevTouch = {end: 0}

From 995f39476a153df6cf5b2b38884fa196c7af6698 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jan 2020 14:22:36 +0100
Subject: [PATCH 4154/4742] When direction=rtl, fix home/end and arrow motion
 across line boundaries

Closes #6117
---
 src/edit/methods.js   | 5 +++--
 src/input/movement.js | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index e40012e75b..6b24f2bb72 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -469,8 +469,9 @@ function findPosH(doc, pos, dir, unit, visually) {
   let oldPos = pos
   let origDir = dir
   let lineObj = getLine(doc, pos.line)
+  let lineDir = visually && doc.cm && doc.cm.getOption("direction") == "rtl" ? -dir : dir
   function findNextLine() {
-    let l = pos.line + dir
+    let l = pos.line + lineDir
     if (l < doc.first || l >= doc.first + doc.size) return false
     pos = new Pos(l, pos.ch, pos.sticky)
     return lineObj = getLine(doc, l)
@@ -484,7 +485,7 @@ function findPosH(doc, pos, dir, unit, visually) {
     }
     if (next == null) {
       if (!boundToLine && findNextLine())
-        pos = endOfLine(visually, doc.cm, lineObj, pos.line, dir)
+        pos = endOfLine(visually, doc.cm, lineObj, pos.line, lineDir)
       else
         return false
     } else {
diff --git a/src/input/movement.js b/src/input/movement.js
index 8d50fd2a04..946bce6892 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -15,6 +15,7 @@ export function moveLogically(line, start, dir) {
 
 export function endOfLine(visually, cm, lineObj, lineNo, dir) {
   if (visually) {
+    if (cm.getOption("direction") == "rtl") dir = -dir
     let order = getOrder(lineObj, cm.doc.direction)
     if (order) {
       let part = dir < 0 ? lst(order) : order[0]

From 19b75cbf7d7f4aa2965de3f0de05a11ff24f6ffb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jan 2020 14:46:31 +0100
Subject: [PATCH 4155/4742] Mark version 5.51.0

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index cc2abcc5d0..77952afc2b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -72,6 +72,7 @@ anthonygego
 Anthony Gégo
 Anthony Grimes
 Anton Kovalyov
+antosarho
 Apollo Zhu
 AQNOUCH Mohammed
 Aram Shatakhtsyan
@@ -227,6 +228,7 @@ edoroshenko
 edsharp
 ekhaled
 Elisée
+elpnt
 Emmanuel Schanzer
 Enam Mijbah Noor
 Eric Allam
@@ -336,6 +338,7 @@ Jakob Miland
 Jakub Vrana
 Jakub Vrána
 James Campos
+James Cockshull
 James Howard
 James Thorne
 Jamie Hill
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9b6c80213..5c58f8cfb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 5.51.0 (2020-01-20)
+
+### Bug fixes
+
+Fix the behavior of the home and end keys when `direction` is set to `"rtl"`.
+
+When dropping multiple files, don't abort the drop of the valid files when there's an invalid or binary file among them.
+
+Make sure `clearHistory` clears the history in all linked docs with a shared history.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Fix behavior of `'` and `` ` `` marks, fix `R` in visual mode.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Support `gi`, gI`, and `gJ`.
+
 ## 5.50.2 (2020-01-01)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 23c8a4df1a..e943ce63b2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.50.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.51.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 57fb65f81d..1c396e6549 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-01-2020: <a href="https://codemirror.net/codemirror-5.51.0.zip">Version 5.51.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix the behavior of the home and end keys when <code>direction</code> is set to <code>"rtl"</code>.</li>
+    <li>When dropping multiple files, don’t abort the drop of the valid files when there’s an invalid or binary file among them.</li>
+    <li>Make sure <code>clearHistory</code> clears the history in all linked docs with a shared history.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix behavior of <code>'</code> and <code>`</code> marks, fix <code>R</code> in visual mode.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support <code>gi</code>, gI<code>, and</code>gJ`.</li>
+  </ul>
+
   <p class="rel">01-01-2020: <a href="https://codemirror.net/codemirror-5.50.2.zip">Version 5.50.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 2c82f4af35..bebe38fead 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.50.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.51.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 12f5498b85..29d0732bc0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.50.2",
+  "version": "5.51.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 7ed58066d3..934206c823 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.50.2"
+CodeMirror.version = "5.51.0"

From 16e8dd2d15e46cc480657b6bd3f61c4064d0c59c Mon Sep 17 00:00:00 2001
From: David Rodrigues <david.proweb@gmail.com>
Date: Mon, 20 Jan 2020 12:35:24 -0300
Subject: [PATCH 4156/4742] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c58f8cfb4..e8086926f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ Make sure `clearHistory` clears the history in all linked docs with a shared his
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Support `gi`, gI`, and `gJ`.
+[vim bindings](https://codemirror.net/demo/vim.html): Support `gi`, `gI`, and `gJ`.
 
 ## 5.50.2 (2020-01-01)
 

From 3f72fdda1f7221fc23e90aee2c00cb26726d8e13 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jan 2020 16:40:37 +0100
Subject: [PATCH 4157/4742] Fix confused markup in releases.html

---
 doc/releases.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/releases.html b/doc/releases.html
index 1c396e6549..dd0f483756 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -37,7 +37,7 @@ <h2>Version 5.x</h2>
     <li>When dropping multiple files, don’t abort the drop of the valid files when there’s an invalid or binary file among them.</li>
     <li>Make sure <code>clearHistory</code> clears the history in all linked docs with a shared history.</li>
     <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix behavior of <code>'</code> and <code>`</code> marks, fix <code>R</code> in visual mode.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support <code>gi</code>, gI<code>, and</code>gJ`.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support <code>gi</code>, <code>gI<code>, and <code>gJ</code>.</li>
   </ul>
 
   <p class="rel">01-01-2020: <a href="https://codemirror.net/codemirror-5.50.2.zip">Version 5.50.2</a>:</p>

From f0fe1f779f28a6615405a1c5b5172263968185b7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 21 Jan 2020 10:37:47 +0100
Subject: [PATCH 4158/4742] [javascript mode] Don't get confused by trailing
 commas in parentheses

Closes #6120
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 16943a9eb9..04d01fc506 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -446,7 +446,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
 
   function maybeoperatorComma(type, value) {
-    if (type == ",") return cont(expression);
+    if (type == ",") return cont(maybeexpression);
     return maybeoperatorNoComma(type, value, false);
   }
   function maybeoperatorNoComma(type, value, noComma) {

From f22df8e88be92b9193905bc030b01cedc1578122 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Jan 2020 10:28:52 +0100
Subject: [PATCH 4159/4742] Fix bug in bidi algorithm

Arabic numerals were ordered incorrectly in an rtl context.

Issue #6117
---
 src/util/bidi.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/util/bidi.js b/src/util/bidi.js
index 33ab854d88..92c4191dca 100644
--- a/src/util/bidi.js
+++ b/src/util/bidi.js
@@ -175,14 +175,15 @@ let bidiOrdering = (function() {
         for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
         order.push(new BidiSpan(0, start, i))
       } else {
-        let pos = i, at = order.length
+        let pos = i, at = order.length, isRTL = direction == "rtl" ? 1 : 0
         for (++i; i < len && types[i] != "L"; ++i) {}
         for (let j = pos; j < i;) {
           if (countsAsNum.test(types[j])) {
-            if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j))
+            if (pos < j) { order.splice(at, 0, new BidiSpan(1, pos, j)); at += isRTL }
             let nstart = j
             for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
             order.splice(at, 0, new BidiSpan(2, nstart, j))
+            at += isRTL
             pos = j
           } else ++j
         }

From f28ed4df39d0c977833504ba0413cdf6f09ef0bd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 22 Jan 2020 10:42:14 +0100
Subject: [PATCH 4160/4742] Make goLineStartSmart behave better in
 direction=rtl docs

---
 src/edit/commands.js  | 2 +-
 src/edit/methods.js   | 2 +-
 src/input/movement.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/edit/commands.js b/src/edit/commands.js
index 3916b129fb..079379fce8 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -170,7 +170,7 @@ function lineStartSmart(cm, pos) {
   let line = getLine(cm.doc, start.line)
   let order = getOrder(line, cm.doc.direction)
   if (!order || order[0].level == 0) {
-    let firstNonWS = Math.max(0, line.text.search(/\S/))
+    let firstNonWS = Math.max(start.ch, line.text.search(/\S/))
     let inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch
     return Pos(start.line, inWS ? 0 : firstNonWS, start.sticky)
   }
diff --git a/src/edit/methods.js b/src/edit/methods.js
index 6b24f2bb72..2703f54c93 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -469,7 +469,7 @@ function findPosH(doc, pos, dir, unit, visually) {
   let oldPos = pos
   let origDir = dir
   let lineObj = getLine(doc, pos.line)
-  let lineDir = visually && doc.cm && doc.cm.getOption("direction") == "rtl" ? -dir : dir
+  let lineDir = visually && doc.direction == "rtl" ? -dir : dir
   function findNextLine() {
     let l = pos.line + lineDir
     if (l < doc.first || l >= doc.first + doc.size) return false
diff --git a/src/input/movement.js b/src/input/movement.js
index 946bce6892..479f221f95 100644
--- a/src/input/movement.js
+++ b/src/input/movement.js
@@ -15,7 +15,7 @@ export function moveLogically(line, start, dir) {
 
 export function endOfLine(visually, cm, lineObj, lineNo, dir) {
   if (visually) {
-    if (cm.getOption("direction") == "rtl") dir = -dir
+    if (cm.doc.direction == "rtl") dir = -dir
     let order = getOrder(lineObj, cm.doc.direction)
     if (order) {
       let part = dir < 0 ? lst(order) : order[0]

From 011c18f0aae7cec8ab57971b09da9e327cde96fb Mon Sep 17 00:00:00 2001
From: kvncp <kevincpeterson@gmail.com>
Date: Wed, 22 Jan 2020 23:11:28 -0800
Subject: [PATCH 4161/4742] [dart mode] Add "yield" keyword

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

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index f6a4939e77..6c601ae9ae 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -15,7 +15,7 @@
     "implements mixin get native set typedef with enum throw rethrow " +
     "assert break case continue default in return new deferred async await covariant " +
     "try catch finally do else for if switch while import library export " +
-    "part of show hide is as extension on").split(" ");
+    "part of show hide is as extension on yield").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
   var atoms = "true false null".split(" ");
   var builtins = "void bool num int double dynamic var String".split(" ");

From 96d8d5129859b9aafdffd9888ffe39c893a4c1c3 Mon Sep 17 00:00:00 2001
From: Roman Janusz <romeqjanoosh@gmail.com>
Date: Fri, 24 Jan 2020 22:04:34 +0100
Subject: [PATCH 4162/4742] [lint addon] Add theme class name to tooltips

---
 addon/lint/lint.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index aa75ba0e8a..0eac8d12a1 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -12,9 +12,9 @@
   "use strict";
   var GUTTER_ID = "CodeMirror-lint-markers";
 
-  function showTooltip(e, content) {
+  function showTooltip(cm, e, content) {
     var tt = document.createElement("div");
-    tt.className = "CodeMirror-lint-tooltip";
+    tt.className = "CodeMirror-lint-tooltip cm-s-" + cm.options.theme;
     tt.appendChild(content.cloneNode(true));
     document.body.appendChild(tt);
 
@@ -38,8 +38,8 @@
     setTimeout(function() { rm(tt); }, 600);
   }
 
-  function showTooltipFor(e, content, node) {
-    var tooltip = showTooltip(e, content);
+  function showTooltipFor(cm, e, content, node) {
+    var tooltip = showTooltip(cm, e, content);
     function hide() {
       CodeMirror.off(node, "mouseout", hide);
       if (tooltip) { hideTooltip(tooltip); tooltip = null; }
@@ -78,7 +78,7 @@
     state.marked.length = 0;
   }
 
-  function makeMarker(labels, severity, multiple, tooltips) {
+  function makeMarker(cm, labels, severity, multiple, tooltips) {
     var marker = document.createElement("div"), inner = marker;
     marker.className = "CodeMirror-lint-marker-" + severity;
     if (multiple) {
@@ -87,7 +87,7 @@
     }
 
     if (tooltips != false) CodeMirror.on(inner, "mouseover", function(e) {
-      showTooltipFor(e, labels, inner);
+      showTooltipFor(cm, e, labels, inner);
     });
 
     return marker;
@@ -113,9 +113,9 @@
     var tip = document.createElement("div");
     tip.className = "CodeMirror-lint-message-" + severity;
     if (typeof ann.messageHTML != 'undefined') {
-        tip.innerHTML = ann.messageHTML;
+      tip.innerHTML = ann.messageHTML;
     } else {
-        tip.appendChild(document.createTextNode(ann.message));
+      tip.appendChild(document.createTextNode(ann.message));
     }
     return tip;
   }
@@ -186,7 +186,7 @@
       }
 
       if (state.hasGutter)
-        cm.setGutterMarker(line, GUTTER_ID, makeMarker(tipLabel, maxSeverity, anns.length > 1,
+        cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, anns.length > 1,
                                                        state.options.tooltips));
     }
     if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
@@ -199,14 +199,14 @@
     state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
   }
 
-  function popupTooltips(annotations, e) {
+  function popupTooltips(cm, annotations, e) {
     var target = e.target || e.srcElement;
     var tooltip = document.createDocumentFragment();
     for (var i = 0; i < annotations.length; i++) {
       var ann = annotations[i];
       tooltip.appendChild(annotationTooltip(ann));
     }
-    showTooltipFor(e, tooltip, target);
+    showTooltipFor(cm, e, tooltip, target);
   }
 
   function onMouseOver(cm, e) {
@@ -220,7 +220,7 @@
       var ann = spans[i].__annotation;
       if (ann) annotations.push(ann);
     }
-    if (annotations.length) popupTooltips(annotations, e);
+    if (annotations.length) popupTooltips(cm, annotations, e);
   }
 
   CodeMirror.defineOption("lint", false, function(cm, val, old) {

From 89d21ec155cef514904bf3a1ead7abfb4d654b16 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 3 Feb 2020 10:56:30 +0100
Subject: [PATCH 4163/4742] [stylus mode] Don't match #-rgb colors before a
 dash character

Closes #6132
---
 mode/stylus/stylus.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index dbe241d613..653958e83b 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -76,7 +76,7 @@
       if (ch == "#") {
         stream.next();
         // Hex color
-        if (stream.match(/^[0-9a-f]{3}([0-9a-f]([0-9a-f]{2}){0,2})?\b/i)) {
+        if (stream.match(/^[0-9a-f]{3}([0-9a-f]([0-9a-f]{2}){0,2})?\b(?!-)/i)) {
           return ["atom", "atom"];
         }
         // ID selector

From ba5452fd668c97da00a3201c98e9cc4ca811c1cd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 3 Feb 2020 11:07:49 +0100
Subject: [PATCH 4164/4742] Fix missing clipPos calls in file drop code

Closes #6127
---
 src/edit/drop_events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/drop_events.js b/src/edit/drop_events.js
index c6fbbbc186..8073c50751 100644
--- a/src/edit/drop_events.js
+++ b/src/edit/drop_events.js
@@ -38,7 +38,7 @@ export function onDrop(e) {
                             text.filter(t => t != null).join(cm.doc.lineSeparator())),
                         origin: "paste"}
           makeChange(cm.doc, change)
-          setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)))
+          setSelectionReplaceHistory(cm.doc, simpleSelection(clipPos(cm.doc, pos), clipPos(cm.doc, changeEnd(change))))
         })()
       }
     }

From 1fed46d79957d9249527d878b7b705c36ba5dfb7 Mon Sep 17 00:00:00 2001
From: Teja <tejasrivastav@gmail.com>
Date: Tue, 4 Feb 2020 21:20:19 +0530
Subject: [PATCH 4165/4742] [lint addon] Allow appending the tooltip to the
 wrapper element

The tooltip in the existing way append to the body.

When applied the codemirror context inside a shadow root (custom
element) this calls append the tooltip out of the root components.

Thus, the user has to monkey patch the appendchild method to override
the behavior.

This change would allow the tooltip to render in its own context with
the `selfContain` option.
---
 addon/lint/lint.js | 5 ++++-
 doc/manual.html    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 0eac8d12a1..f36a232978 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -16,7 +16,10 @@
     var tt = document.createElement("div");
     tt.className = "CodeMirror-lint-tooltip cm-s-" + cm.options.theme;
     tt.appendChild(content.cloneNode(true));
-    document.body.appendChild(tt);
+    if(cm.options.lint.selfContain)
+      cm.getWrapperElement().appendChild(tt);
+    else
+      document.body.appendChild(tt);
 
     function position(e) {
       if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
diff --git a/doc/manual.html b/doc/manual.html
index e943ce63b2..7030b7914d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2911,6 +2911,7 @@ <h2 id="addons">Addons</h2>
       will only be executed when the promise resolves.
       By default, the linter will run (debounced) whenever the document is changed.
       You can pass a <code>lintOnChange: false</code> option to disable that.
+      You can pass a <code>selfContain: true</code> option to render the tooltip inside the editor instance.
       Depends on <code>addon/lint/lint.css</code>. A demo can be
       found <a href="../demo/lint.html">here</a>.</dd>
 

From 83978294fb8926aa923e77b696bf9ed5a03b5df4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 4 Feb 2020 23:11:58 +0100
Subject: [PATCH 4166/4742] Fix previous patch to get option from the parsed
 option object

Issue #6135
---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index f36a232978..5bc1af18ae 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -16,7 +16,7 @@
     var tt = document.createElement("div");
     tt.className = "CodeMirror-lint-tooltip cm-s-" + cm.options.theme;
     tt.appendChild(content.cloneNode(true));
-    if(cm.options.lint.selfContain)
+    if (cm.state.lint.options.selfContain)
       cm.getWrapperElement().appendChild(tt);
     else
       document.body.appendChild(tt);

From 0f94af71bbcc8ef2d4318b71127f4cf4beaa2179 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Wed, 5 Feb 2020 21:45:33 +0100
Subject: [PATCH 4167/4742] [soy mode] Remove templates property from state

---
 mode/soy/soy.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index fc280c77db..f7f85783c3 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -129,7 +129,6 @@
       startState: function() {
         return {
           soyState: [],
-          templates: null,
           variables: prepend(null, 'ij'),
           scopes: null,
           indent: 0,
@@ -146,7 +145,6 @@
         return {
           tag: state.tag, // Last seen Soy tag.
           soyState: state.soyState.concat([]),
-          templates: state.templates,
           variables: state.variables,
           context: state.context,
           indent: state.indent, // Indentation of the following line.
@@ -202,7 +200,6 @@
         switch (last(state.soyState)) {
           case "templ-def":
             if (match = stream.match(/^\.?([\w]+(?!\.[\w]+)*)/)) {
-              state.templates = prepend(state.templates, match[1]);
               state.soyState.pop();
               return "def";
             }

From e1a3c397516947748fb662720305bf314e8d4c4c Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <lewenhaupt@lewenhaupt-macbookpro2.roam.corp.google.com>
Date: Thu, 6 Feb 2020 07:22:11 +0100
Subject: [PATCH 4168/4742] Fix driver from only running vim tests.

---
 test/driver.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index 22de01e33a..8789f73be9 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -11,8 +11,6 @@ function indexOf(collection, elt) {
 }
 
 function test(name, run, expectedFail) {
-  if (!/^vim/.test(name)) return
-  console.log(name)
   // Force unique names
   var originalName = name;
   var i = 2; // Second function would be NAME_2

From 5f722737883bbeadb2a629857d3961490e4134ca Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <lewenhaupt@lewenhaupt-macbookpro2.roam.corp.google.com>
Date: Thu, 6 Feb 2020 07:40:08 +0100
Subject: [PATCH 4169/4742] Improve time complexity.

---
 test/driver.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index 8789f73be9..bc1634eaae 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -1,4 +1,4 @@
-var tests = [], filters = [], allNames = [];
+var tests = [], filters = [], nameCounts = {};
 
 function Failure(why) {this.message = why;}
 Failure.prototype.toString = function() { return this.message; };
@@ -12,13 +12,12 @@ function indexOf(collection, elt) {
 
 function test(name, run, expectedFail) {
   // Force unique names
-  var originalName = name;
-  var i = 2; // Second function would be NAME_2
-  while (indexOf(allNames, name) !== -1){
-    name = originalName + "_" + i;
-    i++;
+  if (nameCounts[name] == undefined){
+    nameCounts[name] = 2;
+  } else { 
+    // Append number if not first test with this name.
+    name = name + '_' + (nameCounts[name]++);
   }
-  allNames.push(name);
   // Add test
   tests.push({name: name, func: run, expectedFail: expectedFail});
   return name;

From 72988bf3fc4682165b149f691d3465bf140af750 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 7 Feb 2020 20:15:25 +0100
Subject: [PATCH 4170/4742] Clip negative scroll-to coordinates

Closes #6139
---
 src/display/scrolling.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 26ec993b0f..6d97247d92 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -165,7 +165,7 @@ export function updateScrollTop(cm, val) {
 }
 
 export function setScrollTop(cm, val, forceScroll) {
-  val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)
+  val = Math.max(0, Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val))
   if (cm.display.scroller.scrollTop == val && !forceScroll) return
   cm.doc.scrollTop = val
   cm.display.scrollbars.setScrollTop(val)
@@ -175,7 +175,7 @@ export function setScrollTop(cm, val, forceScroll) {
 // Sync scroller and scrollbar, ensure the gutter elements are
 // aligned.
 export function setScrollLeft(cm, val, isScroller, forceScroll) {
-  val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth)
+  val = Math.max(0, Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth))
   if ((isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) && !forceScroll) return
   cm.doc.scrollLeft = val
   alignHorizontally(cm)

From dbd0782326ebea9e7d9b9796ff3643b5767becee Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Sun, 9 Feb 2020 21:50:50 +0100
Subject: [PATCH 4171/4742] [Soy] Improve map, list, record and list
 comprehension highlighting

* Add support for map, list and record types.

* Add support for list, record and map literals.

* Add support for list comprehension.

* Better variable matching in list comprehension.
---
 mode/soy/soy.js  | 167 +++++++++++++++++++++++++++++++++++++++--------
 mode/soy/test.js |  42 ++++++++++--
 2 files changed, 177 insertions(+), 32 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index f7f85783c3..fdd70375c5 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -125,6 +125,44 @@
       this.scope = scope;
     }
 
+    function expression(stream, state) {
+      let match;
+      if (stream.match(/[[]/)) {
+        state.soyState.push("list-literal");
+        state.lookupVariables = false;
+        return null;
+      } else if (stream.match(/map\b/)) {
+        state.soyState.push("map-literal");
+        return "keyword";
+      } else if (stream.match(/record\b/)) {
+        state.soyState.push("record-literal");
+        return "keyword";
+      } else if (stream.match(/([\w]+)(?=\()/)) {
+        return "variable callee";
+      } else if (match = stream.match(/^["']/)) {
+        state.soyState.push("string");
+        state.quoteKind = match[0];
+        return "string";
+      } else if (stream.match(/^[(]/)) {
+        state.soyState.push("open-parentheses");
+        return null;
+      } else if (stream.match(/(null|true|false)(?!\w)/) ||
+          stream.match(/0x([0-9a-fA-F]{2,})/) ||
+          stream.match(/-?([0-9]*[.])?[0-9]+(e[0-9]*)?/)) {
+        return "atom";
+      } else if (stream.match(/(\||[+\-*\/%]|[=!]=|\?:|[<>]=?)/)) {
+        // Tokenize filter, binary, null propagator, and equality operators.
+        return "operator";
+      } else if (match = stream.match(/^\$([\w]+)/)) {
+        return ref(state.variables, match[1], !state.lookupVariables);
+      } else if (match = stream.match(/^\w+/)) {
+        return /^(?:as|and|or|not|in|if)$/.test(match[0]) ? "keyword" : null;
+      }
+
+      stream.next();
+      return null;
+    }
+
     return {
       startState: function() {
         return {
@@ -134,6 +172,7 @@
           indent: 0,
           quoteKind: null,
           context: null,
+          lookupVariables: true, // Is unknown variables considered an error
           localStates: [{
             mode: modes.html,
             state: CodeMirror.startState(modes.html)
@@ -149,6 +188,7 @@
           context: state.context,
           indent: state.indent, // Indentation of the following line.
           quoteKind: state.quoteKind,
+          lookupVariables: state.lookupVariables,
           localStates: state.localStates.map(function(localState) {
             return {
               mode: localState.mode,
@@ -245,18 +285,56 @@
             stream.next();
             return null;
 
+          case "open-parentheses":
+            if (stream.match(/[)]/)) {
+              state.soyState.pop();
+              return null;
+            }
+            return expression(stream, state);
+
           case "param-type":
             var peekChar = stream.peek();
-            if (peekChar == "}" || peekChar == "=") {
+            if ("}]=>,".indexOf(peekChar) != -1) {
               state.soyState.pop();
               return null;
-            }
-            if (stream.eatWhile(/^([\w]+|[?])/)) {
+            } else if (peekChar == "[") {
+              state.soyState.push('param-type-record');
+              return null;
+            } else if (match = stream.match(/^([\w]+|[?])/)) {
+              if (match[0] == "map" || match[0] == "list") {
+                state.soyState.push('param-type-map-list');
+              }
               return "type";
             }
             stream.next();
             return null;
 
+          case "param-type-record":
+            var peekChar = stream.peek();
+            if (peekChar == "]") {
+              state.soyState.pop();
+              return null;
+            }
+            if (stream.match(/^\w+/)) {
+              state.soyState.push('param-type');
+              return "property";
+            }
+            stream.next();
+            return null;
+
+          case "param-type-map-list":
+            var peekChar = stream.peek();
+            if (stream.match(/^[>]/)) {
+              state.soyState.pop();
+              return null;
+            }
+            if (stream.match(/^[<,]/)) {
+              state.soyState.push('param-type');
+              return null;
+            }
+            stream.next();
+            return null;
+
           case "var-def":
             if (match = stream.match(/^\$([\w]+)/)) {
               state.variables = prepend(state.variables, match[1]);
@@ -266,6 +344,65 @@
             stream.next();
             return null;
 
+          case "record-literal":
+            if (stream.match(/^[)]/)) {
+              state.soyState.pop();
+              return null;
+            }
+            if (stream.match(/[(,]/)) {
+              state.soyState.push("map-value")
+              state.soyState.push("record-key")
+              return null;
+            }
+            stream.next()
+            return null;
+
+          case "map-literal":
+            if (stream.match(/^[)]/)) {
+              state.soyState.pop();
+              return null;
+            }
+            if (stream.match(/[(,]/)) {
+              state.soyState.push("map-value")
+              state.soyState.push("map-value")
+              return null;
+            }
+            stream.next()
+            return null;
+
+          case "list-literal":
+            if (stream.match(/\]/)) {
+              state.soyState.pop();
+              state.lookupVariables = true;
+              return null;
+            }
+            if (stream.match(/for\b/)) {
+              state.soyState.push("var-def")
+              return "keyword";
+            } else if (stream.match(/in\b/)) {
+              state.lookupVariables = true;
+              return "keyword";
+            }
+            return expression(stream, state);
+
+          case "record-key":
+            if (stream.match(/[\w]+/)) {
+              return "property";
+            }
+            if (stream.match(/^[:]/)) {
+              state.soyState.pop();
+              return null;
+            }
+            stream.next();
+            return null;
+            
+          case "map-value":
+            if (stream.peek() == ")" || stream.peek() == "," || stream.match(/^[:)]/)) {
+              state.soyState.pop();
+              return null;
+            }
+            return expression(stream, state);
+
           case "tag":
             var endTag = state.tag[0] == "/";
             var tagName = endTag ? state.tag.substring(1) : state.tag;
@@ -299,30 +436,8 @@
                 });
               }
               return "attribute";
-            } else if (match = stream.match(/([\w]+)(?=\()/)) {
-              return "variable callee";
-            } else if (match = stream.match(/^["']/)) {
-              state.soyState.push("string");
-              state.quoteKind = match;
-              return "string";
             }
-            if (stream.match(/(null|true|false)(?!\w)/) ||
-              stream.match(/0x([0-9a-fA-F]{2,})/) ||
-              stream.match(/-?([0-9]*[.])?[0-9]+(e[0-9]*)?/)) {
-              return "atom";
-            }
-            if (stream.match(/(\||[+\-*\/%]|[=!]=|\?:|[<>]=?)/)) {
-              // Tokenize filter, binary, null propagator, and equality operators.
-              return "operator";
-            }
-            if (match = stream.match(/^\$([\w]+)/)) {
-              return ref(state.variables, match[1]);
-            }
-            if (match = stream.match(/^\w+/)) {
-              return /^(?:as|and|or|not|in)$/.test(match[0]) ? "keyword" : null;
-            }
-            stream.next();
-            return null;
+            return expression(stream, state);
 
           case "literal":
             if (stream.match(/^(?=\{\/literal})/)) {
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 8234813f03..0326913ffe 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -63,13 +63,27 @@
      '[keyword {] [atom 0x1F] [keyword }]',
      '[keyword {] [atom 0x1F00BBEA] [keyword }]');
 
-  MT('param-type-test',
+  MT('param-type-record',
+     '[keyword {@param] [def record]: [[[property foo]: [type bool], [property bar]: [type int] ]][keyword }]',
+  );
+
+  MT('param-type-map',
+     '[keyword {@param] [def unknown]: [type map]<[type string], [type bool]>[keyword }]',
+  );
+
+  MT('param-type-list',
+     '[keyword {@param] [def list]: [type list]<[type ?]>[keyword }]'
+  );
+
+  MT('param-type-any',
+     '[keyword {@param] [def unknown]: [type ?][keyword }]',
+  );
+
+  MT('param-type-nested',
      '[keyword {@param] [def a]: ' +
-         '[type list]<[[[type a]: [type int], ' +
-         '[type b]: [type map]<[type string], ' +
-         '[type bool]>]]>][keyword }]',
-      '[keyword {@param] [def unknown]: [type ?][keyword }]',
-      '[keyword {@param] [def list]: [type list]<[type ?]>[keyword }]');
+         '[type list]<[[[property a]: [type int], ' +
+         '[property b]: [type map]<[type string], ' +
+         '[type bool]>]]>][keyword }]',);
 
   MT('undefined-var',
      '[keyword {][variable-2&error $var]');
@@ -218,8 +232,24 @@
      '[keyword {lb}]',
      '[keyword {rb}]');
 
+  MT('let-list-literal',
+     '[keyword {let] [def $test]: [[[[[string \'a\'] ], [[[string \'b\'] ] ] [keyword /}]');
+
+  MT('let-record-literal',
+     '[keyword {let] [def $test]: [keyword record]([property test]: [callee&variable bidiGlobalDir](), ' +
+         '[property foo]: [atom 5]) [keyword /}]');
+
+  MT('let-map-literal',
+     '[keyword {let] [def $test]: [keyword map]([string \'outer\']: [keyword map]([atom 5]: [atom false]), ' +
+         '[string \'foo\']: [string \'bar\']) [keyword /}]');
+
   MT('wrong-closing-tag',
      '[keyword {if] [atom true][keyword }]',
      '  Optional',
      '[keyword&error {/badend][keyword }]');
+
+  MT('list-comprehension',
+     '[keyword {let] [def $myList]: [[[[[string \'a\'] ] ] [keyword /}] ' +
+     '[keyword {let] [def $test]: [[[variable $a] [operator +] [atom 1] [keyword for] ' +
+         '[def $a] [keyword in] [variable-2 $myList] [keyword if] [variable-2 $a] [operator >=] [atom 3] ] [keyword /}]');
 })();

From aa05cca0c5ece7a3ee171ed389a46c79d00fdb88 Mon Sep 17 00:00:00 2001
From: "vamshi.revu" <vamshi.revu@servicenow.com>
Date: Tue, 11 Feb 2020 18:09:25 +0530
Subject: [PATCH 4172/4742] [tern addon] Allow appending the tooltip to the
 codemirror hint options container if exists

The current implementation of tern.js is appending the tooltip to the body.

When applied the codemirror context inside a shadow root, tooltips are falling out of the root component.
This change would append the tooltip to the container of codemirror hint options if it has else it will default to document.body
---
 addon/tern/tern.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 253309d678..7be368188b 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -231,7 +231,7 @@
         var content = ts.options.completionTip ? ts.options.completionTip(cur.data) : cur.data.doc;
         if (content) {
           tooltip = makeTooltip(node.parentNode.getBoundingClientRect().right + window.pageXOffset,
-                                node.getBoundingClientRect().top + window.pageYOffset, content);
+                                node.getBoundingClientRect().top + window.pageYOffset, content, cm);
           tooltip.className += " " + cls + "hint-doc";
         }
       });
@@ -334,7 +334,7 @@
     tip.appendChild(document.createTextNode(tp.rettype ? ") ->\u00a0" : ")"));
     if (tp.rettype) tip.appendChild(elt("span", cls + "type", tp.rettype));
     var place = cm.cursorCoords(null, "page");
-    var tooltip = ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip)
+    var tooltip = ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip, cm)
     setTimeout(function() {
       tooltip.clear = onEditorActivity(cm, function() {
         if (ts.activeArgHints == tooltip) closeArgHints(ts) })
@@ -601,7 +601,7 @@
   function tempTooltip(cm, content, ts) {
     if (cm.state.ternTooltip) remove(cm.state.ternTooltip);
     var where = cm.cursorCoords();
-    var tip = cm.state.ternTooltip = makeTooltip(where.right + 1, where.bottom, content);
+    var tip = cm.state.ternTooltip = makeTooltip(where.right + 1, where.bottom, content, cm);
     function maybeClear() {
       old = true;
       if (!mouseOnTip) clear();
@@ -637,11 +637,12 @@
     }
   }
 
-  function makeTooltip(x, y, content) {
+  function makeTooltip(x, y, content, cm) {
     var node = elt("div", cls + "tooltip", content);
     node.style.left = x + "px";
     node.style.top = y + "px";
-    document.body.appendChild(node);
+    var container = ((cm.options || {}).hintOptions || {}).container || document.body;
+    container.appendChild(node);
     return node;
   }
 

From 2f51b60003c17d55af03390b4ce49ee8600ddfc6 Mon Sep 17 00:00:00 2001
From: Jay Contonio <jay@conton.io>
Date: Tue, 11 Feb 2020 08:09:59 -0800
Subject: [PATCH 4173/4742] Fixing blockquote end check

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

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index fb5f03735d..2e5625adc4 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -41,7 +41,9 @@
         return;
       }
       if (emptyListRE.test(line)) {
-        if (!/>\s*$/.test(line)) cm.replaceRange("", {
+        var endOfQuote = inQuote && />\s*$/.test(line)
+        var endOfList = !/>\s*$/.test(line)
+        if (endOfQuote || endOfList) cm.replaceRange("", {
           line: pos.line, ch: 0
         }, {
           line: pos.line, ch: pos.ch + 1

From 36f13482c58c81dc1669583696c10cebf5c53a2d Mon Sep 17 00:00:00 2001
From: rvalavicius <rytis.valavicius@gmail.com>
Date: Tue, 18 Feb 2020 18:01:33 +0200
Subject: [PATCH 4174/4742] [sTeX mode] Ensured that tag does not clash with
 object prototype properties

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

diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 140e5a8af9..20c3bc7a18 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -103,7 +103,7 @@
       // Do we look like '\command' ?  If so, attempt to apply the plugin 'command'
       if (source.match(/^\\[a-zA-Z@]+/)) {
         var cmdName = source.current().slice(1);
-        plug = plugins[cmdName] || plugins["DEFAULT"];
+        plug = plugins.hasOwnProperty(cmdName) ? plugins[cmdName] : plugins["DEFAULT"];
         plug = new plug();
         pushCommand(state, plug);
         setState(state, beginParams);

From 1010810a581b1dd57fde947cc0b62495d7594c48 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Tue, 18 Feb 2020 11:39:51 -0800
Subject: [PATCH 4175/4742] [verilog] Support folding by indentation

---
 mode/verilog/verilog.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 2b6850659b..43990452d3 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -369,7 +369,8 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
 
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
-    lineComment: "//"
+    lineComment: "//",
+    fold: "indent"
   };
 });
 

From 563061792af93d35b770a8680339126aa00235aa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Feb 2020 11:12:29 +0100
Subject: [PATCH 4176/4742] Mark version 5.52.0

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 14 ++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 77952afc2b..3fdc7869c7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -196,6 +196,7 @@ David Barnett
 David H. Bronke
 David Mignot
 David Pathakjee
+David Rodrigues
 David Santana
 David Vázquez
 David Whittington
@@ -443,6 +444,7 @@ koops
 Kris Ciccarello
 ks-ifware
 kubelsmieci
+kvncp
 KwanEsq
 Kyle Kelley
 KyleMcNutt
@@ -684,6 +686,7 @@ Robert Martin
 Roberto Abdelkader Martínez Pérez
 robertop23
 Robert Plummer
+Roman Janusz
 Rrandom
 Rrrandom
 Ruslan Osmanov
@@ -765,6 +768,7 @@ Takuya Matsuyama
 Tarmil
 T. Brandon Ashley
 TDaglis
+Teja
 tel
 Tentone
 tfjgeorge
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8086926f8..33bca5cd27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 5.52.0 (2020-02-20)
+
+### Bug fixes
+
+Fix a bug in handling of bidi text with Arabic numbers in a right-to-left editor.
+
+Fix a crash when combining file drop with a `"beforeChange"` filter.
+
+Prevent issue when passing negative coordinates to `scrollTo`.
+
+### New features
+
+[lint](https://codemirror.net/doc/manual.html#addon_lint) and [tern](https://codemirror.net/demo/tern.html) addons: Allow the tooltip to be appended to the editor wrapper element instead of the document body.
+
 ## 5.51.0 (2020-01-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 7030b7914d..7aab576141 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.51.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.52.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 dd0f483756..0768d49a9f 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-02-2020: <a href="https://codemirror.net/codemirror-5.52.0.zip">Version 5.52.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix a bug in handling of bidi text with Arabic numbers in a right-to-left editor.</li>
+    <li>Fix a crash when combining file drop with a <code>"beforeChange"</code> filter.</li>
+    <li>Prevent issue when passing negative coordinates to <code>scrollTo</code>.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint</a> and <a href="https://codemirror.net/demo/tern.html">tern</a> addons: Allow the tooltip to be appended to the editor wrapper element instead of the document body.</li>
+  </ul>
+
   <p class="rel">20-01-2020: <a href="https://codemirror.net/codemirror-5.51.0.zip">Version 5.51.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index bebe38fead..49b637f2d9 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.51.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.52.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 29d0732bc0..84ef216a90 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.51.0",
+  "version": "5.52.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 934206c823..3f16593b9f 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.51.0"
+CodeMirror.version = "5.52.0"

From d0d3d303c3cf79d3daa835b8423aa0c60a06e0d2 Mon Sep 17 00:00:00 2001
From: Hein Htat <heinthuhtat@gmail.com>
Date: Fri, 21 Feb 2020 01:22:06 -0600
Subject: [PATCH 4177/4742] [protobuf mode] Enable brace folding

---
 mode/protobuf/protobuf.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mode/protobuf/protobuf.js b/mode/protobuf/protobuf.js
index 68b240a40e..40b0842d47 100644
--- a/mode/protobuf/protobuf.js
+++ b/mode/protobuf/protobuf.js
@@ -62,7 +62,10 @@
   };
 
   CodeMirror.defineMode("protobuf", function() {
-    return {token: tokenBase};
+    return {
+      token: tokenBase,
+      fold: "brace"
+    };
   });
 
   CodeMirror.defineMIME("text/x-protobuf", "protobuf");

From 592008812ade98fd8bdea6aade1b6f1925402f3f Mon Sep 17 00:00:00 2001
From: Ilya Zverev <ilya@zverev.info>
Date: Sat, 22 Feb 2020 16:02:04 +0300
Subject: [PATCH 4178/4742] [markdown mode] DIsallow single dash for a setext
 header

Closes #6129
---
 mode/markdown/markdown.js |  2 +-
 mode/markdown/test.js     | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 30f94e0918..6d1468cdc0 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -87,7 +87,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   listRE = /^(?:[*\-+]|^[0-9]+([.)]))\s+/
   ,   taskListRE = /^\[(x| )\](?=\s)/i // Must follow listRE
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
-  ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
+  ,   setextHeaderRE = /^ {0,3}(?:\={1,}|-{2,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
   ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/
   ,   linkDefRE = /^\s*\[[^\]]+?\]:.*$/ // naive link-definition
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index aa1263e118..929e7bba19 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -286,10 +286,12 @@
      "[header&header-1 foo]",
      "[header&header-1 ===]");
 
-  // Check if single underlining - works
-  MT("setextH2",
-     "[header&header-2 foo]",
-     "[header&header-2 -]");
+  // Check if single underlining - should not be interpreted
+  // as it might lead to an empty list:
+  // https://spec.commonmark.org/0.28/#setext-heading-underline
+  MT("setextH2Single",
+     "foo",
+     "-");
 
   // Check if 3+ -'s work
   MT("setextH2",
@@ -380,10 +382,10 @@
      "[header&header-1 bar]",
      "[header&header-1 =]");
 
-  // ensure we don't regard space after dash as a list
+  // ensure we regard space after a single dash as a list
   MT("setext_emptyList",
-     "[header&header-2 foo]",
-     "[header&header-2 - ]",
+     "foo",
+     "[variable-2 - ]",
      "foo");
 
   // Single-line blockquote with trailing space

From d212129f7c2c487c972c63c02b210b58992a8ba2 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Sat, 22 Feb 2020 13:12:27 +0300
Subject: [PATCH 4179/4742] Fix lint warnings

---
 mode/soy/soy.js         | 4 ++--
 mode/soy/test.js        | 8 ++++----
 src/edit/drop_events.js | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index fdd70375c5..4de0f37638 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -126,7 +126,7 @@
     }
 
     function expression(stream, state) {
-      let match;
+      var match;
       if (stream.match(/[[]/)) {
         state.soyState.push("list-literal");
         state.lookupVariables = false;
@@ -395,7 +395,7 @@
             }
             stream.next();
             return null;
-            
+
           case "map-value":
             if (stream.peek() == ")" || stream.peek() == "," || stream.match(/^[:)]/)) {
               state.soyState.pop();
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 0326913ffe..2fb450e32e 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -64,11 +64,11 @@
      '[keyword {] [atom 0x1F00BBEA] [keyword }]');
 
   MT('param-type-record',
-     '[keyword {@param] [def record]: [[[property foo]: [type bool], [property bar]: [type int] ]][keyword }]',
+     '[keyword {@param] [def record]: [[[property foo]: [type bool], [property bar]: [type int] ]][keyword }]'
   );
 
   MT('param-type-map',
-     '[keyword {@param] [def unknown]: [type map]<[type string], [type bool]>[keyword }]',
+     '[keyword {@param] [def unknown]: [type map]<[type string], [type bool]>[keyword }]'
   );
 
   MT('param-type-list',
@@ -76,14 +76,14 @@
   );
 
   MT('param-type-any',
-     '[keyword {@param] [def unknown]: [type ?][keyword }]',
+     '[keyword {@param] [def unknown]: [type ?][keyword }]'
   );
 
   MT('param-type-nested',
      '[keyword {@param] [def a]: ' +
          '[type list]<[[[property a]: [type int], ' +
          '[property b]: [type map]<[type string], ' +
-         '[type bool]>]]>][keyword }]',);
+         '[type bool]>]]>][keyword }]');
 
   MT('undefined-var',
      '[keyword {][variable-2&error $var]');
diff --git a/src/edit/drop_events.js b/src/edit/drop_events.js
index 8073c50751..f309b2df23 100644
--- a/src/edit/drop_events.js
+++ b/src/edit/drop_events.js
@@ -56,7 +56,7 @@ export function onDrop(e) {
           markAsReadAndPasteIfAllFilesAreRead()
           return
         }
-        text[i] = content;
+        text[i] = content
         markAsReadAndPasteIfAllFilesAreRead()
       }
       reader.readAsText(file)

From eef22823dfc4c5772d260ba5cb1c35c03b103fed Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 22 Feb 2020 14:09:03 +0100
Subject: [PATCH 4180/4742] Fix failing the test when the linter finds an issue

Issue #6156
---
 test/run.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/run.js b/test/run.js
index 7e4b38978e..914cb9762e 100755
--- a/test/run.js
+++ b/test/run.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var ok = require("./lint").ok;
+var lint = require("./lint");
 
 var files = new (require('node-static').Server)();
 
@@ -34,7 +34,7 @@ var server = require('http').createServer(function (req, res) {
   for (let error of errors) console.log(error)
   console.log(await page.evaluate(() => document.getElementById('output').innerText + "\n" +
                                           document.getElementById('status').innerText))
-  process.exit(failed > 0 || errors.length ? 1 : 0)
+  process.exit(failed > 0 || errors.length || !lint.ok ? 1 : 0)
   await browser.close()
 })())
 

From 8de432e1d9cb644894e09e3f4a59d85d417c9627 Mon Sep 17 00:00:00 2001
From: clone-it <61330489+clone-it@users.noreply.github.com>
Date: Wed, 26 Feb 2020 15:02:11 +0100
Subject: [PATCH 4181/4742] [real world uses] Add clone-it.github.io

Using CodeMirror as HTML & CSS editors.
---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index 0b03a15da5..27616e4fc4 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -40,6 +40,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
+      <li><a href="https://clone-it.github.io/">Clone-It</a> (HTML & CSS learning game)</li>
       <li><a href="https://electronjs.org/apps/colon">Colon</a> (A flexible text editor or IDE)</li>
       <li><a href="http://code.world/">CodeWorld</a> (Haskell playground)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>

From 5d9f59403ab88f49da0cbf2f91a2641dcb2590a8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 3 Mar 2020 10:16:11 +0100
Subject: [PATCH 4182/4742] [twig mode] Replace confusing/broken code in demo

---
 mode/twig/index.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/twig/index.html b/mode/twig/index.html
index 7552eacd73..3107d50030 100644
--- a/mode/twig/index.html
+++ b/mode/twig/index.html
@@ -7,6 +7,8 @@
 <link rel="stylesheet" href="../../lib/codemirror.css">
 <script src="../../lib/codemirror.js"></script>
 <script src="twig.js"></script>
+<script src="../xml/xml.js"></script>
+<script src="../../addon/mode/multiplex.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
@@ -40,6 +42,6 @@ <h2>Twig mode</h2>
     <script>
       var editor =
       CodeMirror.fromTextArea(document.getElementById("code"), {mode:
-        {name: "twig", htmlMode: true}});
+        {name: "twig", base: "text/html"}});
     </script>
   </article>

From 28568ba037146b2d13857849650db94b8ec09385 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 4 Mar 2020 09:57:59 +0100
Subject: [PATCH 4183/4742] [javascript mode] Don't get confused by missing
 expression in statement conditions

Issue #4386
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 04d01fc506..43848260bf 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -417,7 +417,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function parenExpr(type) {
     if (type != "(") return pass()
-    return cont(pushlex(")"), expression, expect(")"), poplex)
+    return cont(pushlex(")"), maybeexpression, expect(")"), poplex)
   }
   function expressionInner(type, value, noComma) {
     if (cx.state.fatArrowAt == cx.stream.start) {

From 856c3a25dab35a90eff930035c14f908fe57fa58 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 9 Mar 2020 10:19:41 +0100
Subject: [PATCH 4184/4742] Fix DOM selection update in contenteditable mode
 when another window has focus

Refine the check for whether the editor has focus to look at
document.activeElement instead of state.focused.

Issue #6167
---
 src/input/ContentEditableInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index b77c7d49db..aa21076b84 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -101,7 +101,7 @@ export default class ContentEditableInput {
 
   prepareSelection() {
     let result = prepareSelection(this.cm, false)
-    result.focus = this.cm.state.focused
+    result.focus = document.activeElement == this.div
     return result
   }
 

From f0a30d505bc746a799c34a1884924a08e633b875 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 13 Mar 2020 07:30:00 +0100
Subject: [PATCH 4185/4742] Make sure to set the DOM selection on
 ContentEditableInput.focus

Issue #6167
---
 src/input/ContentEditableInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index aa21076b84..a79d3fc88b 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -195,7 +195,7 @@ export default class ContentEditableInput {
 
   focus() {
     if (this.cm.options.readOnly != "nocursor") {
-      if (!this.selectionInEditor())
+      if (!this.selectionInEditor() || document.activeElement != this.div)
         this.showSelection(this.prepareSelection(), true)
       this.div.focus()
     }

From 5b538d53f683c1203a847a1fc434b97542014156 Mon Sep 17 00:00:00 2001
From: Patrick Kettner <patrickkettner@gmail.com>
Date: Sun, 15 Mar 2020 01:13:25 -0400
Subject: [PATCH 4186/4742] add missing CSS properties

---
 mode/css/css.js | 181 ++++++++++++++++++++++++++++--------------------
 1 file changed, 105 insertions(+), 76 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 05742c5c45..441ba4abfd 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -455,81 +455,98 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "alignment-baseline", "anchor-point", "animation", "animation-delay",
     "animation-direction", "animation-duration", "animation-fill-mode",
     "animation-iteration-count", "animation-name", "animation-play-state",
-    "animation-timing-function", "appearance", "azimuth", "backface-visibility",
-    "background", "background-attachment", "background-blend-mode", "background-clip",
-    "background-color", "background-image", "background-origin", "background-position",
-    "background-repeat", "background-size", "baseline-shift", "binding",
-    "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
-    "bookmark-target", "border", "border-bottom", "border-bottom-color",
-    "border-bottom-left-radius", "border-bottom-right-radius",
-    "border-bottom-style", "border-bottom-width", "border-collapse",
-    "border-color", "border-image", "border-image-outset",
+    "animation-timing-function", "appearance", "azimuth", "backdrop-filter",
+    "backface-visibility", "background", "background-attachment",
+    "background-blend-mode", "background-clip", "background-color",
+    "background-image", "background-origin", "background-position",
+    "background-position-x", "background-position-y", "background-repeat",
+    "background-size", "baseline-shift", "binding", "bleed", "block-size",
+    "bookmark-label", "bookmark-level", "bookmark-state", "bookmark-target",
+    "border", "border-bottom", "border-bottom-color", "border-bottom-left-radius",
+    "border-bottom-right-radius", "border-bottom-style", "border-bottom-width",
+    "border-collapse", "border-color", "border-image", "border-image-outset",
     "border-image-repeat", "border-image-slice", "border-image-source",
-    "border-image-width", "border-left", "border-left-color",
-    "border-left-style", "border-left-width", "border-radius", "border-right",
-    "border-right-color", "border-right-style", "border-right-width",
-    "border-spacing", "border-style", "border-top", "border-top-color",
-    "border-top-left-radius", "border-top-right-radius", "border-top-style",
-    "border-top-width", "border-width", "bottom", "box-decoration-break",
-    "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
-    "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count",
-    "column-fill", "column-gap", "column-rule", "column-rule-color",
-    "column-rule-style", "column-rule-width", "column-span", "column-width",
-    "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
-    "cue-after", "cue-before", "cursor", "direction", "display",
-    "dominant-baseline", "drop-initial-after-adjust",
-    "drop-initial-after-align", "drop-initial-before-adjust",
-    "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
-    "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
-    "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-    "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
-    "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust",
-    "font-stretch", "font-style", "font-synthesis", "font-variant",
-    "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
-    "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
-    "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow",
-    "grid-auto-rows", "grid-column", "grid-column-end", "grid-column-gap",
-    "grid-column-start", "grid-gap", "grid-row", "grid-row-end", "grid-row-gap",
-    "grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
-    "grid-template-rows", "hanging-punctuation", "height", "hyphens",
-    "icon", "image-orientation", "image-rendering", "image-resolution",
-    "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing",
-    "line-break", "line-height", "line-stacking", "line-stacking-ruby",
+    "border-image-width", "border-left", "border-left-color", "border-left-style",
+    "border-left-width", "border-radius", "border-right", "border-right-color",
+    "border-right-style", "border-right-width", "border-spacing", "border-style",
+    "border-top", "border-top-color", "border-top-left-radius",
+    "border-top-right-radius", "border-top-style", "border-top-width",
+    "border-width", "bottom", "box-decoration-break", "box-shadow", "box-sizing",
+    "break-after", "break-before", "break-inside", "caption-side", "caret-color",
+    "clear", "clip", "color", "color-profile", "column-count", "column-fill",
+    "column-gap", "column-rule", "column-rule-color", "column-rule-style",
+    "column-rule-width", "column-span", "column-width", "columns", "contain",
+    "content", "counter-increment", "counter-reset", "crop", "cue", "cue-after",
+    "cue-before", "cursor", "direction", "display", "dominant-baseline",
+    "drop-initial-after-adjust", "drop-initial-after-align",
+    "drop-initial-before-adjust", "drop-initial-before-align", "drop-initial-size",
+    "drop-initial-value", "elevation", "empty-cells", "fit", "fit-position",
+    "flex", "flex-basis", "flex-direction", "flex-flow", "flex-grow",
+    "flex-shrink", "flex-wrap", "float", "float-offset", "flow-from", "flow-into",
+    "font", "font-family", "font-feature-settings", "font-kerning",
+    "font-language-override", "font-optical-sizing", "font-size",
+    "font-size-adjust", "font-stretch", "font-style", "font-synthesis",
+    "font-variant", "font-variant-alternates", "font-variant-caps",
+    "font-variant-east-asian", "font-variant-ligatures", "font-variant-numeric",
+    "font-variant-position", "font-variation-settings", "font-weight", "gap",
+    "grid", "grid-area", "grid-auto-columns", "grid-auto-flow", "grid-auto-rows",
+    "grid-column", "grid-column-end", "grid-column-gap", "grid-column-start",
+    "grid-gap", "grid-row", "grid-row-end", "grid-row-gap", "grid-row-start",
+    "grid-template", "grid-template-areas", "grid-template-columns",
+    "grid-template-rows", "hanging-punctuation", "height", "hyphens", "icon",
+    "image-orientation", "image-rendering", "image-resolution", "inline-box-align",
+    "inset", "inset-block", "inset-block-end", "inset-block-start", "inset-inline",
+    "inset-inline-end", "inset-inline-start", "isolation", "justify-content",
+    "justify-items", "justify-self", "left", "letter-spacing", "line-break",
+    "line-height", "line-height-step", "line-stacking", "line-stacking-ruby",
     "line-stacking-shift", "line-stacking-strategy", "list-style",
     "list-style-image", "list-style-position", "list-style-type", "margin",
-    "margin-bottom", "margin-left", "margin-right", "margin-top",
-    "marks", "marquee-direction", "marquee-loop",
-    "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
-    "max-width", "min-height", "min-width", "mix-blend-mode", "move-to", "nav-down", "nav-index",
-    "nav-left", "nav-right", "nav-up", "object-fit", "object-position",
-    "opacity", "order", "orphans", "outline",
-    "outline-color", "outline-offset", "outline-style", "outline-width",
-    "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
-    "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
-    "page", "page-break-after", "page-break-before", "page-break-inside",
-    "page-policy", "pause", "pause-after", "pause-before", "perspective",
-    "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position",
-    "presentation-level", "punctuation-trim", "quotes", "region-break-after",
-    "region-break-before", "region-break-inside", "region-fragment",
-    "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
-    "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
-    "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin",
-    "shape-outside", "size", "speak", "speak-as", "speak-header",
-    "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
-    "tab-size", "table-layout", "target", "target-name", "target-new",
-    "target-position", "text-align", "text-align-last", "text-decoration",
+    "margin-bottom", "margin-left", "margin-right", "margin-top", "marks",
+    "marquee-direction", "marquee-loop", "marquee-play-count", "marquee-speed",
+    "marquee-style", "max-block-size", "max-height", "max-inline-size",
+    "max-width", "min-block-size", "min-height", "min-inline-size", "min-width",
+    "mix-blend-mode", "move-to", "nav-down", "nav-index", "nav-left", "nav-right",
+    "nav-up", "object-fit", "object-position", "offset", "offset-anchor",
+    "offset-distance", "offset-path", "offset-position", "offset-rotate",
+    "opacity", "order", "orphans", "outline", "outline-color", "outline-offset",
+    "outline-style", "outline-width", "overflow", "overflow-style",
+    "overflow-wrap", "overflow-x", "overflow-y", "padding", "padding-bottom",
+    "padding-left", "padding-right", "padding-top", "page", "page-break-after",
+    "page-break-before", "page-break-inside", "page-policy", "pause",
+    "pause-after", "pause-before", "perspective", "perspective-origin", "pitch",
+    "pitch-range", "place-content", "place-items", "place-self", "play-during",
+    "position", "presentation-level", "punctuation-trim", "quotes",
+    "region-break-after", "region-break-before", "region-break-inside",
+    "region-fragment", "rendering-intent", "resize", "rest", "rest-after",
+    "rest-before", "richness", "right", "rotate", "rotation", "rotation-point",
+    "row-gap", "ruby-align", "ruby-overhang", "ruby-position", "ruby-span",
+    "scale", "scroll-behavior", "scroll-margin", "scroll-margin-block",
+    "scroll-margin-block-end", "scroll-margin-block-start", "scroll-margin-bottom",
+    "scroll-margin-inline", "scroll-margin-inline-end",
+    "scroll-margin-inline-start", "scroll-margin-left", "scroll-margin-right",
+    "scroll-margin-top", "scroll-padding", "scroll-padding-block",
+    "scroll-padding-block-end", "scroll-padding-block-start",
+    "scroll-padding-bottom", "scroll-padding-inline", "scroll-padding-inline-end",
+    "scroll-padding-inline-start", "scroll-padding-left", "scroll-padding-right",
+    "scroll-padding-top", "scroll-snap-align", "scroll-snap-type",
+    "shape-image-threshold", "shape-inside", "shape-margin", "shape-outside",
+    "size", "speak", "speak-as", "speak-header", "speak-numeral",
+    "speak-punctuation", "speech-rate", "stress", "string-set", "tab-size",
+    "table-layout", "target", "target-name", "target-new", "target-position",
+    "text-align", "text-align-last", "text-combine-upright", "text-decoration",
     "text-decoration-color", "text-decoration-line", "text-decoration-skip",
-    "text-decoration-style", "text-emphasis", "text-emphasis-color",
-    "text-emphasis-position", "text-emphasis-style", "text-height",
-    "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
-    "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
-    "text-wrap", "top", "transform", "transform-origin", "transform-style",
-    "transition", "transition-delay", "transition-duration",
-    "transition-property", "transition-timing-function", "unicode-bidi",
-    "user-select", "vertical-align", "visibility", "voice-balance", "voice-duration",
-    "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
-    "voice-volume", "volume", "white-space", "widows", "width", "will-change", "word-break",
-    "word-spacing", "word-wrap", "z-index",
+    "text-decoration-skip-ink", "text-decoration-style", "text-emphasis",
+    "text-emphasis-color", "text-emphasis-position", "text-emphasis-style",
+    "text-height", "text-indent", "text-justify", "text-orientation",
+    "text-outline", "text-overflow", "text-rendering", "text-shadow",
+    "text-size-adjust", "text-space-collapse", "text-transform",
+    "text-underline-position", "text-wrap", "top", "transform", "transform-origin",
+    "transform-style", "transition", "transition-delay", "transition-duration",
+    "transition-property", "transition-timing-function", "translate",
+    "unicode-bidi", "user-select", "vertical-align", "visibility", "voice-balance",
+    "voice-duration", "voice-family", "voice-pitch", "voice-range", "voice-rate",
+    "voice-stress", "voice-volume", "volume", "white-space", "widows", "width",
+    "will-change", "word-break", "word-spacing", "word-wrap", "writing-mode", "z-index",
     // SVG-specific
     "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
     "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
@@ -543,16 +560,28 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   ], propertyKeywords = keySet(propertyKeywords_);
 
   var nonStandardPropertyKeywords_ = [
+    "border-block", "border-block-color", "border-block-end",
+    "border-block-end-color", "border-block-end-style", "border-block-end-width",
+    "border-block-start", "border-block-start-color", "border-block-start-style",
+    "border-block-start-width", "border-block-style", "border-block-width",
+    "border-inline", "border-inline-color", "border-inline-end",
+    "border-inline-end-color", "border-inline-end-style",
+    "border-inline-end-width", "border-inline-start", "border-inline-start-color",
+    "border-inline-start-style", "border-inline-start-width",
+    "border-inline-style", "border-inline-width", "margin-block",
+    "margin-block-end", "margin-block-start", "margin-inline", "margin-inline-end",
+    "margin-inline-start", "padding-block", "padding-block-end",
+    "padding-block-start", "padding-inline", "padding-inline-end",
+    "padding-inline-start", "scroll-snap-stop", "scrollbar-3d-light-color",
     "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
     "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
-    "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
-    "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
-    "searchfield-results-decoration", "zoom"
+    "scrollbar-track-color", "searchfield-cancel-button", "searchfield-decoration",
+    "searchfield-results-button", "searchfield-results-decoration", "shape-inside", "zoom"
   ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
 
   var fontProperties_ = [
-    "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
-    "font-stretch", "font-weight", "font-style"
+    "font-display", "font-family", "src", "unicode-range", "font-variant",
+     "font-feature-settings", "font-stretch", "font-weight", "font-style"
   ], fontProperties = keySet(fontProperties_);
 
   var counterDescriptors_ = [

From 519c520989c7a2cfc1e4e721bedee24e867ef6c2 Mon Sep 17 00:00:00 2001
From: Erik Welander <ewelander@google.com>
Date: Wed, 18 Mar 2020 00:07:04 -0700
Subject: [PATCH 4187/4742] [vim bindings] Disable autocorrect for prompt

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

diff --git a/keymap/vim.js b/keymap/vim.js
index ce5983d824..accc7d3c02 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4186,7 +4186,8 @@
     }
     function makePrompt(prefix, desc) {
       var raw = '<span style="font-family: monospace; white-space: pre">' +
-          (prefix || "") + '<input type="text"></span>';
+          (prefix || "") + '<input type="text" autocorrect="off" ' +
+          'autocapitalize="off" spellcheck="false"></span>';
       if (desc)
         raw += ' <span style="color: #888">' + desc + '</span>';
       return raw;

From e7b2c6466446e4ff1455a726b06e36fd1d7f5cca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 18 Mar 2020 08:08:52 +0100
Subject: [PATCH 4188/4742] [zenburn theme] Improve specificity of background
 selector

Closes #6180
---
 theme/zenburn.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/zenburn.css b/theme/zenburn.css
index 781c40acac..4eb4247c92 100644
--- a/theme/zenburn.css
+++ b/theme/zenburn.css
@@ -11,7 +11,7 @@
 .cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
 .cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
 .cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-zenburn { background-color: #3f3f3f; color: #dcdccc; }
+.cm-s-zenburn.CodeMirror { background-color: #3f3f3f; color: #dcdccc; }
 .cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
 .cm-s-zenburn span.cm-comment { color: #7f9f7f; }
 .cm-s-zenburn span.cm-keyword { color: #f0dfaf; font-weight: bold; }

From 9a970e7895103660c1ad51f853c228858b74e2ca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 18 Mar 2020 10:54:37 +0100
Subject: [PATCH 4189/4742] Fix bug in viewport updating for content-sized
 editors

Closes #6181
---
 src/display/update_display.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/display/update_display.js b/src/display/update_display.js
index 20798f590b..50228d1779 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -172,6 +172,8 @@ export function postUpdateDisplay(cm, update) {
       update.visible = visibleLines(cm.display, cm.doc, viewport)
       if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
         break
+    } else if (first) {
+      update.visible = visibleLines(cm.display, cm.doc, viewport)
     }
     if (!updateDisplayIfNeeded(cm, update)) break
     updateHeightsInViewport(cm)

From ac9e655bc02f10c6af511f923895a27ffe1957b6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Mar 2020 09:05:17 +0100
Subject: [PATCH 4190/4742] Mark version 5.52.2

---
 AUTHORS           |  7 +++++++
 CHANGELOG.md      | 14 ++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 3fdc7869c7..bf6d245134 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -160,6 +160,7 @@ Christopher Pfohl
 Christopher Wallis
 Chunliang Lyu
 ciaranj
+clone-it
 clso
 CodeAnimal
 CodeBitt
@@ -307,6 +308,7 @@ Hasan Delibaş
 Hasan Karahan
 Heanes
 Hector Oswaldo Caballero
+Hein Htat
 Hélio
 Hendrik Wallbaum
 Henrik Haugbølle
@@ -328,6 +330,7 @@ idleberg
 Igor Petruk
 ilvalle
 Ilya Kharlamov
+Ilya Zverev
 Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
@@ -362,6 +365,7 @@ Jason Johnston
 Jason San Jose
 Jason Siefken
 Jayaprabhakar
+Jay Contonio
 Jaydeep Solanki
 Jean Boussier
 Jeff Blaisdell
@@ -630,6 +634,7 @@ paris
 Paris
 Paris Kasidiaris
 Patil Arpith
+Patrick Kettner
 Patrick Stoica
 Patrick Strawderman
 Paul Garvin
@@ -690,6 +695,7 @@ Roman Janusz
 Rrandom
 Rrrandom
 Ruslan Osmanov
+rvalavicius
 Ryan Pangrle
 Ryan Petrello
 Ryan Prior
@@ -812,6 +818,7 @@ Tyler Makaro
 Vadim Dyachenko
 Vadzim Ramanenka
 Vaibhav Sagar
+vamshi.revu
 VapidWorx
 Vestimir Markov
 vf
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33bca5cd27..f1be7b8aad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 5.52.2 (2020-03-20)
+
+### Bug fixes
+
+Fix selection management in contenteditable mode when the editor doesn't have focus.
+
+Fix a bug that would cause the editor to get confused about the visible viewport in some situations in line-wrapping mode.
+
+[markdown mode](https://codemirror.net/mode/markdown/): Don't treat single dashes as setext header markers.
+
+[zenburn theme](https://codemirror.net/demo/theme.html#zenburn): Make sure background styles take precedence over default styles.
+
+[css mode](https://codemirror.net/mode/css/): Recognize a number of new properties.
+
 ## 5.52.0 (2020-02-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 7aab576141..49c9290b30 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.52.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.52.2</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 0768d49a9f..cde1015d39 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-03-2020: <a href="https://codemirror.net/codemirror-5.52.2.zip">Version 5.52.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix selection management in contenteditable mode when the editor doesn’t have focus.</li>
+    <li>Fix a bug that would cause the editor to get confused about the visible viewport in some situations in line-wrapping mode.</li>
+    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Don’t treat single dashes as setext header markers.</li>
+    <li><a href="https://codemirror.net/demo/theme.html#zenburn">zenburn theme</a>: Make sure background styles take precedence over default styles.</li>
+    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Recognize a number of new properties.</li>
+  </ul>
+
   <p class="rel">20-02-2020: <a href="https://codemirror.net/codemirror-5.52.0.zip">Version 5.52.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 49b637f2d9..454234e9ab 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.52.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.52.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 84ef216a90..1317b0272c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.52.0",
+  "version": "5.52.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 3f16593b9f..2f3eb97f94 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.52.0"
+CodeMirror.version = "5.52.2"

From 115ff0a36056201028e5520f8409aee114e1a274 Mon Sep 17 00:00:00 2001
From: Matthew Casperson <matthewcasperson@gmail.com>
Date: Tue, 24 Mar 2020 15:38:33 +1000
Subject: [PATCH 4191/4742] [powershell mode] Don't highlight backslashes as
 errors

---
 mode/powershell/index.html    | 4 ++++
 mode/powershell/powershell.js | 2 +-
 mode/powershell/test.js       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mode/powershell/index.html b/mode/powershell/index.html
index 6bb7babce2..fae029826f 100644
--- a/mode/powershell/index.html
+++ b/mode/powershell/index.html
@@ -28,6 +28,10 @@
       <h2>PowerShell mode</h2>
 
       <div><textarea id="code" name="code">
+# Paths
+cd c:\
+c:\windows\calc.exe
+
 # Number Literals
 0 12345
 12kb 12mb 12gB 12Tb 12PB 12L 12D 12lkb 12dtb
diff --git a/mode/powershell/powershell.js b/mode/powershell/powershell.js
index 85f89b9ec7..4869ae7370 100644
--- a/mode/powershell/powershell.js
+++ b/mode/powershell/powershell.js
@@ -38,7 +38,7 @@ CodeMirror.defineMode('powershell', function() {
     /param|process|return|switch|throw|trap|try|until|where|while/
   ], { suffix: notCharacterOrDash });
 
-  var punctuation = /[\[\]{},;`\.]|@[({]/;
+  var punctuation = /[\[\]{},;`\\\.]|@[({]/;
   var wordOperators = buildRegexp([
     'f',
     /b?not/,
diff --git a/mode/powershell/test.js b/mode/powershell/test.js
index ba1ecf194d..261406dfa0 100644
--- a/mode/powershell/test.js
+++ b/mode/powershell/test.js
@@ -63,7 +63,7 @@
   MT('operator_long', "[operator -match]");
 
   forEach([
-    '(', ')', '[[', ']]', '{', '}', ',', '`', ';', '.'
+    '(', ')', '[[', ']]', '{', '}', ',', '`', ';', '.', '\\'
   ], function(punctuation) {
     MT("punctuation_" + punctuation.replace(/^[\[\]]/,''), "[punctuation " + punctuation + "]");
   });

From db453cdc778801c27deda6cb6c33a315c49d0901 Mon Sep 17 00:00:00 2001
From: benhormann <benhormann@users.noreply.github.com>
Date: Tue, 24 Mar 2020 06:04:50 +0000
Subject: [PATCH 4192/4742] [dialog addon] Don't close dialogs when tab loses
 focus

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

diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 23b06a8323..5f1f4aa4cc 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -82,7 +82,9 @@
         if (e.keyCode == 13) callback(inp.value, e);
       });
 
-      if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);
+      if (options.closeOnBlur !== false) CodeMirror.on(dialog, "focusout", function (evt) {
+        if (evt.relatedTarget !== null) close();
+      });
     } else if (button = dialog.getElementsByTagName("button")[0]) {
       CodeMirror.on(button, "click", function() {
         close();

From 369b00f29bc34270596f8971938d27ac1de3a213 Mon Sep 17 00:00:00 2001
From: Alex Churchill <al.churchill@gmail.com>
Date: Tue, 24 Mar 2020 18:01:39 -0700
Subject: [PATCH 4193/4742] [vim keymap] Fix EOL handling in visual mode.

Vim's visual mode allows the cursor to be positioned over EOL.
This change fixes a bug where that EOL behavior only worked when
in visual block mode.
---
 keymap/vim.js    | 43 ++++++++++++++++++++++++++++++-------------
 test/vim_test.js |  1 +
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index accc7d3c02..6dd90e704f 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1603,10 +1603,10 @@
           }
           if (vim.visualMode) {
             if (!(vim.visualBlock && newHead.ch === Infinity)) {
-              newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
+              newHead = clipCursorToContent(cm, newHead);
             }
             if (newAnchor) {
-              newAnchor = clipCursorToContent(cm, newAnchor, true);
+              newAnchor = clipCursorToContent(cm, newAnchor);
             }
             newAnchor = newAnchor || oldAnchor;
             sel.anchor = newAnchor;
@@ -2200,8 +2200,7 @@
         vimGlobalState.registerController.pushText(
             args.registerName, 'delete', text,
             args.linewise, vim.visualBlock);
-        var includeLineBreak = vim.insertMode
-        return clipCursorToContent(cm, finalHead, includeLineBreak);
+        return clipCursorToContent(cm, finalHead);
       },
       indent: function(cm, args, ranges) {
         var vim = cm.state.vim;
@@ -2460,8 +2459,7 @@
           vim.visualLine = !!actionArgs.linewise;
           vim.visualBlock = !!actionArgs.blockwise;
           head = clipCursorToContent(
-              cm, Pos(anchor.line, anchor.ch + repeat - 1),
-              true /** includeLineBreak */);
+              cm, Pos(anchor.line, anchor.ch + repeat - 1));
           vim.sel = {
             anchor: anchor,
             head: head
@@ -2837,10 +2835,11 @@
      * Clips cursor to ensure that line is within the buffer's range
      * If includeLineBreak is true, then allow cur.ch == lineLength.
      */
-    function clipCursorToContent(cm, cur, includeLineBreak) {
+    function clipCursorToContent(cm, cur) {
+      var vim = cm.state.vim;
+      var includeLineBreak = vim.insertMode || vim.visualMode;
       var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
-      var maxCh = lineLength(cm, line) - 1;
-      maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
+      var maxCh = lineLength(cm, line) - 1 + !!includeLineBreak;
       var ch = Math.min(Math.max(0, cur.ch), maxCh);
       return Pos(line, ch);
     }
@@ -3206,9 +3205,7 @@
       vim.visualLine = false;
       vim.visualBlock = false;
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-      if (vim.fakeCursor) {
-        vim.fakeCursor.clear();
-      }
+      clearFakeCursor(vim);
     }
 
     // Remove any trailing newlines from the selection. For
@@ -5358,14 +5355,34 @@
         updateFakeCursor(cm);
       }
     }
+    /**
+     * Keeps track of a fake cursor to support visual mode cursor behavior.
+     */
     function updateFakeCursor(cm) {
+      var className = 'cm-animate-fat-cursor';
       var vim = cm.state.vim;
       var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
       var to = offsetCursor(from, 0, 1);
+      clearFakeCursor(vim);
+      // In visual mode, the cursor may be positioned over EOL.
+      if (from.ch == cm.getLine(from.line).length) {
+        var widget = document.createElement("span");
+        widget.textContent = "\u00a0";
+        widget.className = className;
+        vim.fakeCursorBookmark = cm.setBookmark(from, {widget: widget});
+      } else {
+        vim.fakeCursor = cm.markText(from, to, {className: className});
+      }
+    }
+    function clearFakeCursor(vim) {
       if (vim.fakeCursor) {
         vim.fakeCursor.clear();
+        vim.fakeCursor = null;
+      }
+      if (vim.fakeCursorBookmark) {
+        vim.fakeCursorBookmark.clear();
+        vim.fakeCursorBookmark = null;
       }
-      vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
     }
     function handleExternalSelection(cm, vim) {
       var anchor = cm.getCursor('anchor');
diff --git a/test/vim_test.js b/test/vim_test.js
index 577a80b1f9..7e06434cfc 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -396,6 +396,7 @@ testMotion('_', ['6','_'], makeCursor(5, lines[5].textStart), makeCursor(0, 8));
 testMotion('$', '$', makeCursor(0, lines[0].length - 1), makeCursor(0, 1));
 testMotion('$_repeat', ['2', '$'], makeCursor(1, lines[1].length - 1),
     makeCursor(0, 3));
+testMotion('$', ['v', '$'], makeCursor(0, lines[0].length), makeCursor(0, 1));
 testMotion('f', ['f', 'p'], pChars[0], makeCursor(charLine.line, 0));
 testMotion('f_repeat', ['2', 'f', 'p'], pChars[2], pChars[0]);
 testMotion('f_num', ['f', '2'], numChars[2], makeCursor(charLine.line, 0));

From 87aaaed6649bad36218faded697dd69ee18c4850 Mon Sep 17 00:00:00 2001
From: Alex Churchill <al.churchill@gmail.com>
Date: Wed, 25 Mar 2020 10:07:54 -0700
Subject: [PATCH 4194/4742] [vim keymap] Don't mark fat cursor over EOL.

This fixes a bug where a mouse click to the right of a line
results in the cursor apparently over EOL, even though it is actually
positioned over line.length-1. Cursor position should display over
EOL only in visual or insert modes. Insert mode is handled by default
cursor behavior and visual mode is handled by the fake cursor, so
we should remove the special cursor EOL handling here and just clip
to show the cursor in the right place.
---
 keymap/vim.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 6dd90e704f..cda835b6f5 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -295,16 +295,16 @@
       clearFatCursorMark(cm);
       var ranges = cm.listSelections(), result = []
       for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i]
+        var range = ranges[i];
         if (range.empty()) {
-          if (range.anchor.ch < cm.getLine(range.anchor.line).length) {
+          var lineLength = cm.getLine(range.anchor.line).length;
+          if (range.anchor.ch < lineLength) {
             result.push(cm.markText(range.anchor, Pos(range.anchor.line, range.anchor.ch + 1),
-                                    {className: "cm-fat-cursor-mark"}))
+                                    {className: "cm-fat-cursor-mark"}));
           } else {
-            var widget = document.createElement("span")
-            widget.textContent = "\u00a0"
-            widget.className = "cm-fat-cursor-mark"
-            result.push(cm.setBookmark(range.anchor, {widget: widget}))
+            result.push(cm.markText(Pos(range.anchor.line, lineLength - 1),
+                                    Pos(range.anchor.line, lineLength),
+                                    {className: "cm-fat-cursor-mark"}));
           }
         }
       }

From 629f42d0d52a05b8d493f045857a7d6c052c4f0e Mon Sep 17 00:00:00 2001
From: BrianHung <brianhung@berkeley.edu>
Date: Sun, 29 Mar 2020 01:48:08 -0700
Subject: [PATCH 4195/4742] [runmode-stanadlone addon] Update with changes from
 runmode.js

This PR updates the `runMode` function in runmode-standalone.js with 3 commits from [runmode.js](https://github.com/codemirror/CodeMirror/blob/master/addon/runmode/runmode.js):
- https://github.com/codemirror/CodeMirror/commit/7e35f03ad1639d92735c8dee1e1b5c86a727c873
- https://github.com/codemirror/CodeMirror/commit/53bc4b1f54670c827662d5210a37b35e63a07c39
- https://github.com/codemirror/CodeMirror/commit/64113ec97bb73c2a740d42d56021acb01ce05a92

The first commit from runmode.js allows the `callback` in runMode to be a function, as mentioned in https://codemirror.net/demo/runmode.html and https://discuss.codemirror.net/t/runmode-standalone-callback/2357. The last two commits fixes a copy-and-paste bug from IE.
---
 addon/runmode/runmode-standalone.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index 745eaf8440..b086181dde 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -104,14 +104,18 @@ CodeMirror.defineMIME("text/plain", "null");
 
 CodeMirror.runMode = function (string, modespec, callback, options) {
   var mode = CodeMirror.getMode({ indentUnit: 2 }, modespec);
+  var ie = /MSIE \d/.test(navigator.userAgent);
+  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
 
-  if (callback.nodeType == 1) {
+  if (callback.appendChild) {
     var tabSize = (options && options.tabSize) || 4;
     var node = callback, col = 0;
     node.innerHTML = "";
     callback = function (text, style) {
       if (text == "\n") {
-        node.appendChild(document.createElement("br"));
+        // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.
+        // Emitting a carriage return makes everything ok.
+        node.appendChild(document.createTextNode(ie_lt9 ? '\r' : text));
         col = 0;
         return;
       }

From 6d38fc2148e9f97ffbb55c78629dcecd9902ac29 Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal14@gmail.com>
Date: Tue, 31 Mar 2020 17:25:45 +0530
Subject: [PATCH 4196/4742] Add a screenReaderLabel option to set an aria-label
 on the editor

---
 doc/manual.html                   |  4 ++++
 src/edit/options.js               |  6 ++++++
 src/input/ContentEditableInput.js |  9 +++++++++
 src/input/TextareaInput.js        | 11 ++++++++++-
 src/input/input.js                |  2 +-
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 49c9290b30..ed5bff03cd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -421,6 +421,10 @@ <h2>Configuration</h2>
       simply <code>true</code>), focusing of the editor is also
       disallowed.</dd>
 
+      <dt id="option_screenReaderLabel"><code><strong>screenReaderLabel</strong>: string</code></dt>
+      <dd>This label is read by the screenreaders when CodeMirror text area is focused. This
+      is helpful for accessibility.</dd>
+
       <dt id="option_showCursorWhenSelecting"><code><strong>showCursorWhenSelecting</strong>: boolean</code></dt>
       <dd>Whether the cursor should be drawn when a selection is
       active. Defaults to false.</dd>
diff --git a/src/edit/options.js b/src/edit/options.js
index 3abd3c3c1e..225f5499c5 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -132,6 +132,12 @@ export function defineOptions(CodeMirror) {
     }
     cm.display.input.readOnlyChanged(val)
   })
+
+  option("screenReaderLabel", null, (cm, val) => {
+    val = (val === '') ? null : val
+    cm.display.input.screenReaderLabelChanged(val)
+  })
+
   option("disableInput", false, (cm, val) => {if (!val) cm.display.input.reset()}, true)
   option("dragDrop", true, dragDropChanged)
   option("allowDropFileTypes", null)
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index a79d3fc88b..bff285166c 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -99,6 +99,15 @@ export default class ContentEditableInput {
     on(div, "cut", onCopyCut)
   }
 
+  screenReaderLabelChanged(label) {
+    // Label for screenreaders, accessibility
+    if(label) {
+      this.div.setAttribute('aria-label', label)
+    } else {
+      this.div.removeAttribute('aria-label')
+    }
+  }
+
   prepareSelection() {
     let result = prepareSelection(this.cm, false)
     result.focus = document.activeElement == this.div
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index ab02230f92..e538107cd9 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -112,12 +112,21 @@ export default class TextareaInput {
 
   createField(_display) {
     // Wraps and hides input textarea
-    this.wrapper = hiddenTextarea()
+    this.wrapper = hiddenTextarea(this.cm.options.screenReaderLabel)
     // The semihidden textarea that is focused when the editor is
     // focused, and receives input.
     this.textarea = this.wrapper.firstChild
   }
 
+  screenReaderLabelChanged(label) {
+    // Label for screenreaders, accessibility
+    if(label) {
+      this.textarea.setAttribute('aria-label', label)
+    } else {
+      this.textarea.removeAttribute('aria-label')
+    }
+  }
+
   prepareSelection() {
     // Redraw the selection and/or cursor
     let cm = this.cm, display = cm.display, doc = cm.doc
diff --git a/src/input/input.js b/src/input/input.js
index 26bba1d26f..8519ecfb7c 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -132,4 +132,4 @@ export function hiddenTextarea() {
   if (ios) te.style.border = "1px solid black"
   disableBrowserMagic(te)
   return div
-}
+}
\ No newline at end of file

From e1d58e231f62d14e359636bba488f49df6cbe402 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 31 Mar 2020 16:17:30 +0200
Subject: [PATCH 4197/4742] Remove leftover argument

Issue #6197
---
 src/input/TextareaInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index e538107cd9..8fe14bb413 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -112,7 +112,7 @@ export default class TextareaInput {
 
   createField(_display) {
     // Wraps and hides input textarea
-    this.wrapper = hiddenTextarea(this.cm.options.screenReaderLabel)
+    this.wrapper = hiddenTextarea()
     // The semihidden textarea that is focused when the editor is
     // focused, and receives input.
     this.textarea = this.wrapper.firstChild

From caca4ffcac09a6c87b3c2805f26d08ce380ce3c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Apr 2020 09:27:09 +0200
Subject: [PATCH 4198/4742] [merge addon] Compensate for editor top offset when
 aligning lines

Closes #6202
---
 addon/merge/merge.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 8296540a05..827edb7133 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -443,22 +443,26 @@
       aligners[i].clear();
     aligners.length = 0;
 
-    var cm = [dv.edit, dv.orig], scroll = [];
+    var cm = [dv.edit, dv.orig], scroll = [], offset = []
     if (other) cm.push(other.orig);
-    for (var i = 0; i < cm.length; i++)
+    for (var i = 0; i < cm.length; i++) {
       scroll.push(cm[i].getScrollInfo().top);
+      offset.push(-cm[i].getScrollerElement().getBoundingClientRect().top)
+    }
 
+    if (offset[0] != offset[1] || cm.length == 3 && offset[1] != offset[2])
+      alignLines(cm, offset, [0, 0, 0], aligners)
     for (var ln = 0; ln < linesToAlign.length; ln++)
-      alignLines(cm, linesToAlign[ln], aligners);
+      alignLines(cm, offset, linesToAlign[ln], aligners);
 
     for (var i = 0; i < cm.length; i++)
       cm[i].scrollTo(null, scroll[i]);
   }
 
-  function alignLines(cm, lines, aligners) {
-    var maxOffset = 0, offset = [];
+  function alignLines(cm, cmOffset, lines, aligners) {
+    var maxOffset = -1e8, offset = [];
     for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
-      var off = cm[i].heightAtLine(lines[i], "local");
+      var off = cm[i].heightAtLine(lines[i], "local") - cmOffset[i];
       offset[i] = off;
       maxOffset = Math.max(maxOffset, off);
     }

From 7afb2d7e0c0759817c2eaa61345ca2ece5152fcc Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 4 Apr 2020 14:48:06 +0200
Subject: [PATCH 4199/4742] [hint] Nicer scrolling with non-standard padding

The `scrollToActive` function used to have a `3px` offset hardcoded, which matches the default style (`padding: 2px; border-width: 1px;`). Custom values for these these style attributes would lead to a small visual bug.
---
 addon/hint/show-hint.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 374cddfe98..7b6dbd433a 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -370,10 +370,11 @@
 
     scrollToActive: function() {
       var node = this.hints.childNodes[this.selectedHint]
+      var firstNode = this.hints.firstChild;
       if (node.offsetTop < this.hints.scrollTop)
-        this.hints.scrollTop = node.offsetTop - 3;
+        this.hints.scrollTop = node.offsetTop - firstNode.offsetTop;
       else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
-        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;
+        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + firstNode.offsetTop;
     },
 
     screenAmount: function() {

From b2d26b4ccb1d0994ae84d18ad8b84018de176da9 Mon Sep 17 00:00:00 2001
From: Roman Janusz <romeqjanoosh@gmail.com>
Date: Mon, 6 Apr 2020 14:51:08 +0200
Subject: [PATCH 4200/4742] [show-hint addon] don't close hints on backspace
 prematurely

Currently, when a completion is triggered with part of the identifier already typed and backspace is hit, hints are immediately
closed (when cursor is moved before the original position that completion was triggered for).
After this change, they will be closed only when the entire identifier is erased (cursor is moved before the identifier start).
---
 addon/hint/show-hint.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 7b6dbd433a..41537bfc3e 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -98,10 +98,15 @@
         cancelAnimationFrame(this.debounce);
         this.debounce = 0;
       }
+      
+      var identStart = this.startPos;
+      if(this.data) {
+        identStart = this.data.from;
+      }
 
       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 < identStart.ch || this.cm.somethingSelected() ||
           (!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
         this.close();
       } else {

From b10cdd56caa4e51e4fcc59e520673a5083d4c4e6 Mon Sep 17 00:00:00 2001
From: ianhi <ianhuntisaak@gmail.com>
Date: Fri, 10 Apr 2020 19:42:37 -0400
Subject: [PATCH 4201/4742] Add functions to vimAPI documentation

---
 doc/manual.html | 97 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 92 insertions(+), 5 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index ed5bff03cd..477bda3e2f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -562,13 +562,13 @@ <h2>Configuration</h2>
       always rendered, and thus the browser's text search works on it.
       This <em>will</em> have bad effects on performance of big
       documents.</dd>
-      
+
       <dt id="option_spellcheck"><code><strong>spellcheck</strong>: boolean</code></dt>
       <dd>Specifies whether or not spellcheck will be enabled on the input.</dd>
-      
+
       <dt id="option_autocorrect"><code><strong>autocorrect</strong>: boolean</code></dt>
       <dd>Specifies whether or not autocorrect will be enabled on the input.</dd>
-      
+
       <dt id="option_autocapitalize"><code><strong>autocapitalize</strong>: boolean</code></dt>
       <dd>Specifies whether or not autocapitalization will be enabled on the input.</dd>
     </dl>
@@ -2575,7 +2575,7 @@ <h2 id="addons">Addons</h2>
         <dd>The widget to show for folded ranges. Can be either a
         string, in which case it'll become a span with
         class <code>CodeMirror-foldmarker</code>, or a DOM node.
-        To dynamically generate the widget, this can be a function 
+        To dynamically generate the widget, this can be a function
         that returns a string or DOM node, which will then render
         as described. The function will be invoked with parameters
         identifying the range to be folded.</dd>
@@ -3530,6 +3530,26 @@ <h3 id="vimapi_configuration">Configuration</h3>
       <code>extras.isEdit</code> is applicable only to actions,
       determining whether it is recorded for replay for the
       <code>.</code> single-repeat command.
+
+      <dt id="vimapi_unmap"><strong><code>unmap(lhs: string, ctx: string)</code></strong></dt>
+      <dd>
+      Remove the command <code>lhs</code> if it is a user defined command.
+      If the command is an Ex to Ex or Ex to key mapping then the context
+      must be <code>undefined</code> or <code>false</code>.
+      </dd>
+
+      <dt id="vimapi_mapclear"><strong><code>mapclear(ctx: string)</code></strong></dt>
+      <dd>
+      Remove all user-defined mappings for the provided context.
+      </dd>
+
+      <dt id="vimapi_noremap"><strong><code>noremap(lhs: string, rhs: string, ctx: {string, array&lt;string&gt;})</code></strong></dt>
+      <dd>
+      Non-recursive map function. This will not create mappings to key maps
+      that aren't present in the default key map.
+      If no context is provided then the  mapping will be applied to each of
+      normal, insert, and visual mode.
+      </dd>
     </dl>
 
     <h3 id="vimapi_extending">Extending VIM</h3>
@@ -3595,7 +3615,74 @@ <h3 id="vimapi_extending">Extending VIM</h3>
       command was prefixed with a
       <code><strong><a href="http://vimdoc.sourceforge.net/htmldoc/cmdline.html#cmdline-ranges">line range</a></strong></code>,
       <code>params.line</code> and <code>params.lineEnd</code> will
-      be set.
+      be set.</dd>
+
+      <dt id="vimapi_getRegisterController"><strong><code>getRegisterController()</code></strong></dt>
+      <dd>Returns the RegisterController that manages the state of registers
+      used by vim mode. For the RegisterController api see its
+      defintion <a href="https://github.com/CodeMirror/CodeMirror/blob/b2d26b4ccb1d0994ae84d18ad8b84018de176da9/keymap/vim.js#L1123">here</a>.
+      </dd>
+
+      <dt id='vimapi_buildkeymap'><strong><code>buildKeyMap()</code></strong></dt>
+      <dd>
+      Not currently implemented. If you would like to contribute this please open
+      a pull request on <a href="https://github.com/codemirror/CodeMirror">Github</a>.
+      </dd>
+
+      <dt id="vimapi_defineRegister"><strong><code>defineRegister()</code></strong></dt>
+      <dd> Defines an external register. The name should be a single character
+      that will be used to reference the register. The register should support
+      <code>setText</code>, <code>pushText</code>, <code>clear</code>, and <code>toString</code>.
+      See <a href="https://github.com/CodeMirror/CodeMirror/blob/b2d26b4ccb1d0994ae84d18ad8b84018de176da9/keymap/vim.js#L1055">Register</a> for a reference implementation.
+      </dd>
+
+      <dt id="vimapi_getVimGlobalState_"><strong><code>getVimGlobalState_()</code></strong></dt>
+      <dd>
+      Return a reference to the VimGlobalState.
+      </dd>
+
+      <dt id="vimapi_resetVimGlobalState_"><strong><code>resetVimGlobalState_()</code></strong></dt>
+      <dd>
+      Reset the default values of the VimGlobalState to fresh values. Any options
+      set with <code>setOption</code> will also be applied to the reset global state.
+      </dd>
+
+      <dt id="vimapi_maybeInitVimState_"><strong><code>maybeInitVimState_(cm: CodeMirror)</code></strong></dt>
+      <dd>
+      Initialize <code>cm.state.vim</code> if it does not exist. Returns <code>cm.state.vim</code>.
+      </dd>
+
+      <dt id="vimapi_handleKey"><strong><code>handleKey(cm: CodeMirror, key: string, origin: string)</code></strong></dt>
+      <dd>
+      Convenience function to pass the arguments to <code>findKey</code> and
+      call returned function if it is defined.
+      </dd>
+
+      <dt id="vimapi_findKey"><strong><code>findKey(cm: CodeMirror, key: string, origin: string)</code></strong></dt>
+      <dd>
+      This is the outermost function called by CodeMirror, after keys have
+      been mapped to their Vim equivalents. Finds a command based on the key
+      (and cached keys if there is a multi-key sequence). Returns <code>undefined</code>
+      if no key is matched, a noop function if a partial match is found (multi-key),
+      and a function to execute the bound command if a a key is matched. The
+      function always returns true.
+      </dd>
+
+      <dt id="vimapi_option_suppressErrorLogging"><code><strong>suppressErrorLogging</strong>: boolean</code></dt>
+      <dd>Whether to use suppress the use of <code>console.log</code> when catching an
+      error in the function returned by <code>findKey</code>.
+      Defaults to false.</dd>
+
+      <dt id="vimapi_exitVisualMode"><strong><code>exitVisualMode(cm: CodeMirror, ?moveHead: boolean)</code></strong></dt>
+      <dd> Exit visual mode. If moveHead is set to false, the CodeMirror selection
+      will not be touched. The caller assumes the responsibility of putting
+      the cursor in the right place.
+      </dd>
+
+      <dt id="vimapi_exitInsertMode"><strong><code>exitInsertMode(cm: CodeMirror)</code></strong></dt>
+      <dd>
+      Exit insert mode.
+      </dd>
     </dl>
 
 </section>

From 1c88b71b38100b38c1fd8f3efe47b46cc8f7cbcd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 11 Apr 2020 19:49:56 +0200
Subject: [PATCH 4202/4742] [julia mode] Fix infinite loop for mismatched
 brackets

Closes #6213
---
 mode/julia/julia.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 0cc9bc0721..eaef97ebd3 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -127,14 +127,14 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     if (inArray(state) && ch === ']') {
-      while (currentScope(state) !== "[") { state.scopes.pop(); }
+      while (state.scopes.length && currentScope(state) !== "[") { state.scopes.pop(); }
       state.scopes.pop();
       state.nestedArrays--;
       state.leavingExpr = true;
     }
 
     if (inGenerator(state) && ch === ')') {
-      while (currentScope(state) !== "(") { state.scopes.pop(); }
+      while (state.scopes.length && currentScope(state) !== "(") { state.scopes.pop(); }
       state.scopes.pop();
       state.nestedGenerators--;
       state.leavingExpr = true;

From 9983e8ebf5d31044036c9c3ac24d4b98ca90ab6a Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Mon, 13 Apr 2020 08:20:53 +1000
Subject: [PATCH 4203/4742] docs: Fix simple typo, compatiblity ->
 compatibility

There is a small typo in addon/search/searchcursor.js, mode/python/python.js.

Should read `compatibility` rather than `compatiblity`.
---
 addon/search/searchcursor.js | 2 +-
 mode/python/python.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 816bf77473..d586957887 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -240,7 +240,7 @@
       var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
 
       // Implements weird auto-growing behavior on null-matches for
-      // backwards-compatiblity with the vim code (unfortunately)
+      // backwards-compatibility with the vim code (unfortunately)
       while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
         if (reverse) {
           if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1)
diff --git a/mode/python/python.js b/mode/python/python.js
index 9745103829..6a5cd0d4db 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -42,7 +42,7 @@
     var ERRORCLASS = "error";
 
     var delimiters = parserConf.delimiters || parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.\\]/;
-    //               (Backwards-compatiblity with old, cumbersome config system)
+    //               (Backwards-compatibility with old, cumbersome config system)
     var operators = [parserConf.singleOperators, parserConf.doubleOperators, parserConf.doubleDelimiters, parserConf.tripleDelimiters,
                      parserConf.operators || /^([-+*/%\/&|^]=?|[<>=]+|\/\/=?|\*\*=?|!=|[~!@]|\.\.\.)/]
     for (var i = 0; i < operators.length; i++) if (!operators[i]) operators.splice(i--, 1)

From 0c6cfae096357a3b9ed694b29c9b910818707a65 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Mon, 13 Apr 2020 17:53:49 +0200
Subject: [PATCH 4204/4742] [show-hint] Scroll cursor into view after picking

**Fixes a minor visual bug:**
The picked hint might push the cursor out of the screen - this scrolls the cursor back into view. (Would normally happen after the next keypress.)
---
 addon/hint/show-hint.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 41537bfc3e..d1aa169760 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -86,10 +86,15 @@
 
     pick: function(data, i) {
       var completion = data.list[i];
-      if (completion.hint) completion.hint(this.cm, data, completion);
-      else this.cm.replaceRange(getText(completion), completion.from || data.from,
-                                completion.to || data.to, "complete");
-      CodeMirror.signal(data, "pick", completion);
+      this.cm.operation(function(){
+        if (completion.hint)
+          completion.hint(this.cm, data, completion);
+        else
+          this.cm.replaceRange(getText(completion), completion.from || data.from,
+                               completion.to || data.to, "complete");
+        CodeMirror.signal(data, "pick", completion);
+        this.cm.scrollIntoView();
+      })
       this.close();
     },
 

From c2c8e0dfc246c62569de050aedc06a4144bca612 Mon Sep 17 00:00:00 2001
From: cBiscuit87 <36653704+cBiscuit87@users.noreply.github.com>
Date: Mon, 13 Apr 2020 12:23:43 -0500
Subject: [PATCH 4205/4742] [JavaScript-Hint] Add options.additionalContext
 property names as hints

... if not hinting within 'context'
---
 addon/hint/javascript-hint.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 182224d5de..6d09e6b44e 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -144,12 +144,15 @@
         base = base[context.pop().string];
       if (base != null) gatherCompletions(base);
     } else {
-      // If not, just look in the global object and any local scope
+      // If not, just look in the global object, any local scope, and optional additional-context
       // (reading into JS mode internals to get at the local and global variables)
       for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
       for (var c = token.state.context; c; c = c.prev)
         for (var v = c.vars; v; v = v.next) maybeAdd(v.name)
       for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
+      if (options && options.additionalContext != null)
+        for (var key in options.additionalContext)
+          maybeAdd(key);
       if (!options || options.useGlobalScope !== false)
         gatherCompletions(global);
       forEach(keywords, maybeAdd);

From 1c592545c8263baf47a25276c7e06619e95d3e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lanie=20Chauvel?= <perso@hack-libre.org>
Date: Tue, 14 Apr 2020 10:13:19 +0200
Subject: [PATCH 4206/4742] [sublime keymap] Add Ctrl-K Ctrl+1 fold all
 shortcut

---
 keymap/sublime.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index cfdf71ed40..7edf172eb5 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -628,6 +628,7 @@
     "Cmd-K Cmd-C": "showInCenter",
     "Cmd-K Cmd-G": "clearBookmarks",
     "Cmd-K Cmd-Backspace": "delLineLeft",
+    "Cmd-K Cmd-1": "foldAll",
     "Cmd-K Cmd-0": "unfoldAll",
     "Cmd-K Cmd-J": "unfoldAll",
     "Ctrl-Shift-Up": "addCursorToPrevLine",
@@ -689,6 +690,7 @@
     "Ctrl-K Ctrl-C": "showInCenter",
     "Ctrl-K Ctrl-G": "clearBookmarks",
     "Ctrl-K Ctrl-Backspace": "delLineLeft",
+    "Ctrl-K Ctrl-1": "foldAll",
     "Ctrl-K Ctrl-0": "unfoldAll",
     "Ctrl-K Ctrl-J": "unfoldAll",
     "Ctrl-Alt-Up": "addCursorToPrevLine",

From e43adbb5cb5f7a9fcffac5a7aa91dbc6886699a4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 17 Apr 2020 10:31:14 +0200
Subject: [PATCH 4207/4742] Make refresh always re-estimate line heights when
 wrapping is on

Closes #6228
---
 src/edit/methods.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index 2703f54c93..acf90d1c56 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -415,7 +415,7 @@ export default function(CodeMirror) {
       clearCaches(this)
       scrollToCoords(this, this.doc.scrollLeft, this.doc.scrollTop)
       updateGutterSpace(this.display)
-      if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
+      if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5 || this.options.lineWrapping)
         estimateLineHeights(this)
       signal(this, "refresh", this)
     }),

From 99522244a9d3a7e790874d479216f9408b9c46c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 17 Apr 2020 15:47:56 +0200
Subject: [PATCH 4208/4742] [emacs keymap] Allow fallthrough to the default
 keymap

Closes #6231
---
 keymap/emacs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index fe62d44fb1..fe4882eb44 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -404,7 +404,8 @@
     "Ctrl-X H": "selectAll",
 
     "Ctrl-Q Tab": repeated("insertTab"),
-    "Ctrl-U": addPrefixMap
+    "Ctrl-U": addPrefixMap,
+    "fallthrough": "default"
   });
 
   var prefixMap = {"Ctrl-G": clearPrefix};

From 59366a100fe3da1c324c546a5c84edcd5908202b Mon Sep 17 00:00:00 2001
From: Roberto Vidal <vidal.roberto.j@gmail.com>
Date: Fri, 17 Apr 2020 18:07:15 +0200
Subject: [PATCH 4209/4742] [rust] Add some keywords

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

diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index 6bcfbc4446..f95f320d08 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -25,8 +25,8 @@ CodeMirror.defineSimpleMode("rust",{
 
     {regex: /(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,
      token: "number"},
-    {regex: /(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/, token: ["keyword", null, "def"]},
-    {regex: /(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/, token: "keyword"},
+    {regex: /(let(?:\s+mut)?|fn|enum|mod|struct|type|union)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/, token: ["keyword", null, "def"]},
+    {regex: /(?:abstract|alignof|as|async|await|box|break|continue|const|crate|do|dyn|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|union|unsafe|unsized|use|virtual|where|while|yield)\b/, token: "keyword"},
     {regex: /\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/, token: "atom"},
     {regex: /\b(?:true|false|Some|None|Ok|Err)\b/, token: "builtin"},
     {regex: /\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,

From ebfae44ef52a24229be9d5927081d16ff555c728 Mon Sep 17 00:00:00 2001
From: d8888 <smallt@gmail.com>
Date: Mon, 20 Apr 2020 19:15:15 +0800
Subject: [PATCH 4210/4742] doc update to clarify that negative lookbehind
 assertion for regex is not supported

---
 demo/simplemode.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/demo/simplemode.html b/demo/simplemode.html
index 6b44a78840..d7b0cface4 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -67,7 +67,8 @@ <h2>Simple Mode Demo</h2>
   will be taken into account when matching the token. This regex
   has to capture groups when the <code>token</code> property is
   an array. If it captures groups, it must capture <em>all</em> of the string
-  (since JS provides no way to find out where a group matched).</dd>
+  (since JS provides no way to find out where a group matched).
+  Currently negative lookbehind assertion for regex is not supported, regardless of browser support.</dd>
   <dt><code><strong>token</strong></code>: string | array&lt;string&gt; | null</dt>
   <dd>An optional token style. Multiple styles can be specified by
   separating them with dots or spaces. When this property holds an array of token styles,

From 08eee7cecbca3d4221f16d61c076cbcab3f8544d Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <bmeurer@google.com>
Date: Mon, 20 Apr 2020 18:57:14 +0200
Subject: [PATCH 4211/4742] [show-hint] Make linter happy

---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index d1aa169760..6cac813cb6 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -103,7 +103,7 @@
         cancelAnimationFrame(this.debounce);
         this.debounce = 0;
       }
-      
+
       var identStart = this.startPos;
       if(this.data) {
         identStart = this.data.from;

From 4cb51d544af1f9a06453045bd0245e682a1df66f Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <bmeurer@google.com>
Date: Mon, 20 Apr 2020 17:32:52 +0200
Subject: [PATCH 4212/4742] [wast] Add new wast mode (for WebAssembly
 disassembly)

This adds support for WebAssembly text format, as used in the
browser DevTools (Firefox, Edge and Chrome DevTools all the like).
---
 AUTHORS              |  1 +
 mode/wast/index.html | 73 ++++++++++++++++++++++++++++++++++++++++++++
 mode/wast/test.js    | 35 +++++++++++++++++++++
 mode/wast/wast.js    | 41 +++++++++++++++++++++++++
 test/index.html      |  2 ++
 5 files changed, 152 insertions(+)
 create mode 100644 mode/wast/index.html
 create mode 100644 mode/wast/test.js
 create mode 100644 mode/wast/wast.js

diff --git a/AUTHORS b/AUTHORS
index bf6d245134..2633de6af4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -97,6 +97,7 @@ Bastian Müller
 belhaj
 Bem Jones-Bey
 benbro
+Benedikt Meurer
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Benjamin Young
diff --git a/mode/wast/index.html b/mode/wast/index.html
new file mode 100644
index 0000000000..470e5c813d
--- /dev/null
+++ b/mode/wast/index.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+
+<title>CodeMirror: Rust 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="wast.js"></script>
+<style>
+  .CodeMirror {
+    border-top: 1px solid black;
+    border-bottom: 1px solid black;
+  }
+</style>
+<div id=nav>
+  <a href="https://codemirror.net">
+    <h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt="">
+  </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="#">WebAssembly</a>
+  </ul>
+</div>
+
+<article>
+  <h2>WebAssembly mode</h2>
+
+
+  <div><textarea id="code" name="code">
+/* Example WebAssembly */
+(module $foo
+ (export "fac" (func $fac))
+ (export "plus" (func $plus))
+
+ (func $fac (type $t0) (param $p0 i64) (result i64)
+    (if $I0 (result i64)
+      (i64.lt_s
+        (local.get $p0)
+        (i64.const 1))
+      (then
+        (i64.const 1))
+      (else
+        (i64.mul
+          (local.get $p0)
+          (call $fac
+            (i64.sub
+              (local.get $p0)
+              (i64.const 1)))))))
+
+ (func $plus (param $x i32) (param $y i32) (result i32)
+  (i32.add
+   (local.get $x)
+   (local.get $y))))</textarea></div>
+
+  <script>
+    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+      lineNumbers: true,
+      lineWrapping: true,
+      indentUnit: 4,
+      mode: "wast"
+    });
+  </script>
+
+  <p><strong>MIME types defined:</strong> <code>text/webassembly</code>.</p>
+</article>
\ No newline at end of file
diff --git a/mode/wast/test.js b/mode/wast/test.js
new file mode 100644
index 0000000000..4de7e0b267
--- /dev/null
+++ b/mode/wast/test.js
@@ -0,0 +1,35 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 4}, "wast");
+  function MT(name) {test.mode(name, mode, Array.prototype.slice.call(arguments, 1));}
+
+  MT('number-test',
+     '[number 0]',
+     '[number 123]',
+     '[number nan]',
+     '[number inf]',
+     '[number infinity]',
+     '[number 0.1]',
+     '[number 123.0]',
+     '[number 12E+99]');
+
+  MT('string-literals-test',
+     '[string "foo"]',
+     '[string "\\"foo\\""]',
+     '[string "foo #\\"# bar"]');
+
+  MT('atom-test',
+     '[atom i32]',
+     '[atom i64]',
+     '[atom f32]',
+     '[atom f64]');
+
+  MT('keyword-test',
+     '[keyword br]',
+     '[keyword if]',
+     '[keyword loop]',
+     '[keyword i32.add]',
+     '[keyword local.get]')
+})();
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
new file mode 100644
index 0000000000..24ec27a6f7
--- /dev/null
+++ b/mode/wast/wast.js
@@ -0,0 +1,41 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://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('wast', {
+  start: [
+    {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
+    {regex: /anyfunc|mut|nop|block|if|then|else|loop|br|br_if|br_table|call|call_indirect|drop|end|return|local\.get|local\.set|tee_local|global\.get|global\.set|i32\.load|i64\.load|f32\.load|f64\.load|i32\.store|i64\.store|f32\.store|f64\.store|i32\.load8_s|i64\.load8_s|i32\.load8_u|i64\.load8_u|i32\.load16_s|i64\.load16_s|i32\.load16_u|i64\.load16_u|i64\.load32_s|i64\.load32_u|i32\.store8|i64\.store8|i32\.store16|i64\.store16|i32\.const|i64\.const|f32\.const|f64\.const|i32\.eqz|i64\.eqz|i32\.clz|i64\.clz|i32\.ctz|i64\.ctz|i32\.popcnt|i64\.popcnt|f32\.neg|f64\.neg|f32\.abs|f64\.abs|f32\.sqrt|f64\.sqrt|f32\.ceil|f64\.ceil|f32\.floor|f64\.floor|f32\.trunc|f64\.trunc|f32\.nearest|f64\.nearest|i32\.add|i64\.add|i32\.sub|i64\.sub|i32\.mul|i64\.mul|i32\.div_s|i64\.div_s|i32\.div_u|i64\.div_u|i32\.rem_s|i64\.rem_s|i32\.rem_u|i64\.rem_u|i32\.and|i64\.and|i32\.or|i64\.or|i32\.xor|i64\.xor|i32\.shl|i64\.shl|i32\.shr_s|i64\.shr_s|i32\.shr_u|i64\.shr_u|i32\.rotl|i64\.rotl|i32\.rotr|i64\.rotr|f32\.add|f64\.add|f32\.sub|f64\.sub|f32\.mul|f64\.mul|f32\.div|f64\.div|f32\.min|f64\.min|f32\.max|f64\.max|f32\.copysign|f64\.copysign|i32\.eq|i64\.eq|i32\.ne|i64\.ne|i32\.lt_s|i64\.lt_s|i32\.lt_u|i64\.lt_u|i32\.le_s|i64\.le_s|i32\.le_u|i64\.le_u|i32\.gt_s|i64\.gt_s|i32\.gt_u|i64\.gt_u|i32\.ge_s|i64\.ge_s|i32\.ge_u|i64\.ge_u|f32\.eq|f64\.eq|f32\.ne|f64\.ne|f32\.lt|f64\.lt|f32\.le|f64\.le|f32\.gt|f64\.gt|f32\.ge|f64\.ge|i64\.extend_s\/i32|i64\.extend_u\/i32|i32\.wrap\/i64|i32\.trunc_s\/f32|i64\.trunc_s\/f32|i32\.trunc_s\/f64|i64\.trunc_s\/f64|i32\.trunc_u\/f32|i64\.trunc_u\/f32|i32\.trunc_u\/f64|i64\.trunc_u\/f64|f32\.convert_s\/i32|f64\.convert_s\/i32|f32\.convert_s\/i64|f64\.convert_s\/i64|f32\.convert_u\/i32|f64\.convert_u\/i32|f32\.convert_u\/i64|f64\.convert_u\/i64|f64\.promote\/f32|f32\.demote\/f64|f32\.reinterpret\/i32|i32\.reinterpret\/f32|f64\.reinterpret\/i64|i64\.reinterpret\/f64|select|unreachable|current_memory|memory.size|grow_memory|memory.grow|type|func|param|result|local|global|module|table|memory|start|elem|data|offset|import|export/, token: "keyword"},
+    {regex: /\b(i32|i64|f32|f64)\b/, token: "atom"},
+    {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
+    {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},
+    {regex: /\(;.*?/, token: "comment", next: "comment"},
+    {regex: /;;.*$/, token: "comment"},
+    {regex: /\(/, indent: true},
+    {regex: /\)/, dedent: true},
+  ],
+
+  comment: [
+    {regex: /.*?;\)/, token: "comment", next: "start"},
+    {regex: /.*/, token: "comment"},
+  ],
+
+  meta: {
+    dontIndentStates: ['comment'],
+  },
+});
+
+// https://github.com/WebAssembly/design/issues/981 mentions text/webassembly,
+// which seems like a reasonable choice, although it's not standard right now.
+CodeMirror.defineMIME("text/webassembly", "wast");
+
+});
\ No newline at end of file
diff --git a/test/index.html b/test/index.html
index 13f2b6dc92..b68ce18964 100644
--- a/test/index.html
+++ b/test/index.html
@@ -57,6 +57,7 @@
 <script src="../mode/rust/rust.js"></script>
 <script src="../mode/mscgen/mscgen.js"></script>
 <script src="../mode/dylan/dylan.js"></script>
+<script src="../mode/wast/wast.js"></script>
 
 <style>
   .ok { color: #090; }
@@ -147,6 +148,7 @@ <h2>Test Suite</h2>
     <script src="../mode/xquery/test.js"></script>
     <script src="../mode/python/test.js"></script>
     <script src="../mode/rust/test.js"></script>
+    <script src="../mode/wast/test.js"></script>
     <script src="../mode/mscgen/mscgen_test.js"></script>
     <script src="../mode/mscgen/xu_test.js"></script>
     <script src="../mode/mscgen/msgenny_test.js"></script>

From bfe88aa1743c32c2ee1682d124c9966923df47de Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 21 Apr 2020 08:37:49 +0200
Subject: [PATCH 4213/4742] Mark version 5.53.0

---
 AUTHORS           | 11 +++++++++++
 CHANGELOG.md      | 24 ++++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 14 ++++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2633de6af4..91d5b50e4c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -31,6 +31,7 @@ Alexander Schepanovski
 Alexander Shvets
 Alexander Solovyov
 Alexandre Bique
+Alex Churchill
 alexey-k
 Alex Piggott
 Aliaksei Chapyzhenka
@@ -98,6 +99,7 @@ belhaj
 Bem Jones-Bey
 benbro
 Benedikt Meurer
+benhormann
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Benjamin Young
@@ -124,6 +126,7 @@ Brandon Wamboldt
 Bret Little
 Brett Zamir
 Brian Grinstead
+BrianHung
 Brian Sletten
 brrd
 Bruce Mitchener
@@ -135,6 +138,7 @@ Calin Barbat
 callodacity
 Camilo Roca
 Casey Klebba
+cBiscuit87
 César González Íñiguez
 Chad Jolly
 Chandra Sekhar Pydi
@@ -171,6 +175,7 @@ ComFreek
 Cristian Prieto
 Curran Kelleher
 Curtis Gagliardi
+d8888
 dagsta
 daines
 Dale Jung
@@ -256,6 +261,7 @@ Filype Pereira
 finalfantasia
 flack
 Florian Felten
+Fons van der Plas
 Forbes Lindesay
 ForbesLindesay
 Ford_Lawnmower
@@ -322,6 +328,7 @@ Hugues Malphettes
 Ian Beck
 Ian Davies
 Ian Dickinson
+ianhi
 Ian Rose
 Ian Wehrman
 Ian Wetherbee
@@ -522,6 +529,7 @@ mats cronqvist
 Matt Gaide
 Matthew Bauer
 Matthew Beale
+Matthew Casperson
 matthewhayes
 Matthew Rathbone
 Matthew Suozzo
@@ -542,6 +550,7 @@ Max Xiantu
 mbarkhau
 McBrainy
 mce2
+Mélanie Chauvel
 melpon
 meshuamam
 Metatheos
@@ -691,6 +700,7 @@ Robert Crossfield
 Robert Martin
 Roberto Abdelkader Martínez Pérez
 robertop23
+Roberto Vidal
 Robert Plummer
 Roman Janusz
 Rrandom
@@ -791,6 +801,7 @@ thomasmaclean
 Thomas Schmid
 Tim Alby
 Tim Baumann
+Tim Gates
 Timothy Farrell
 Timothy Gu
 Timothy Hatcher
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1be7b8aad..a717ae8119 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,27 @@
+## 5.53.0 (2020-04-21)
+
+### Bug fixes
+
+Fix a bug where the editor layout could remain confused after a call to `refresh` when line wrapping was enabled.
+
+[dialog addon](https://codemirror.net/doc/manual.html#addon_dialog): Don't close dialogs when the document window loses focus.
+
+[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Compensate for editor top position when aligning lines.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Improve EOL handling.
+
+[emacs bindings](https://codemirror.net/demo/emacs.html): Include default keymap as a fallback.
+
+[julia mode](https://codemirror.net/mode/julia/): Fix an infinite loop bug.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Scroll cursor into view when picking a completion.
+
+### New features
+
+New option: [`screenReaderLabel`](https://codemirror.net/doc/manual.html#option_screenReaderLabel) to add a label to the editor.
+
+New mode: [wast](https://codemirror.net/mode/wast/).
+
 ## 5.52.2 (2020-03-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 477bda3e2f..9557609e8c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.52.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.53.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 cde1015d39..ef3085f0d2 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,20 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-04-2020: <a href="https://codemirror.net/codemirror-5.53.0.zip">Version 5.53.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>New option: <a href="https://codemirror.net/doc/manual.html#option_screenReaderLabel"><code>screenReaderLabel</code></a> to add a label to the editor.</li>
+    <li>New mode: <a href="https://codemirror.net/mode/wast/">wast</a>.</li>
+    <li>Fix a bug where the editor layout could remain confused after a call to <code>refresh</code> when line wrapping was enabled.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_dialog">dialog addon</a>: Don’t close dialogs when the document window loses focus.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Compensate for editor top position when aligning lines.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Improve EOL handling.</li>
+    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Include default keymap as a fallback.</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix an infinite loop bug.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Scroll cursor into view when picking a completion.</li>
+  </ul>
+
   <p class="rel">20-03-2020: <a href="https://codemirror.net/codemirror-5.52.2.zip">Version 5.52.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 454234e9ab..8a9ea9c6e7 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.52.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.53.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 1317b0272c..e9f1cb14ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.52.2",
+  "version": "5.53.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 2f3eb97f94..3e3815b4df 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.52.2"
+CodeMirror.version = "5.53.0"

From cbf340da4e1f63f3edaf5bcdee58ca5014f324d4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 21 Apr 2020 12:45:45 +0200
Subject: [PATCH 4214/4742] [show-hint addon] Fix broken completion picking

Closes #6239
---
 addon/hint/show-hint.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 6cac813cb6..c55deab3a6 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -85,15 +85,15 @@
     },
 
     pick: function(data, i) {
-      var completion = data.list[i];
-      this.cm.operation(function(){
+      var completion = data.list[i], self = this;
+      this.cm.operation(function() {
         if (completion.hint)
-          completion.hint(this.cm, data, completion);
+          completion.hint(self.cm, data, completion);
         else
-          this.cm.replaceRange(getText(completion), completion.from || data.from,
+          self.cm.replaceRange(getText(completion), completion.from || data.from,
                                completion.to || data.to, "complete");
         CodeMirror.signal(data, "pick", completion);
-        this.cm.scrollIntoView();
+        self.cm.scrollIntoView();
       })
       this.close();
     },

From 757764d1af92ca93a7ab0f561af790f1b4765944 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 21 Apr 2020 12:47:20 +0200
Subject: [PATCH 4215/4742] Mark version 5.53.2

---
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a717ae8119..f448c65cb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.53.2 (2020-04-21)
+
+### Bug fixes
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix a regression that broke completion picking.
+
 ## 5.53.0 (2020-04-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 9557609e8c..acf9f4a393 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.53.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.53.2</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 ef3085f0d2..d2f1d75ccc 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-04-2020: <a href="https://codemirror.net/codemirror-5.53.2.zip">Version 5.53.2</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix a regression that broke completion picking.
+  </ul>
+
   <p class="rel">21-04-2020: <a href="https://codemirror.net/codemirror-5.53.0.zip">Version 5.53.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 8a9ea9c6e7..2a62dc02c2 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.53.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.53.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index e9f1cb14ad..cf5a462507 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.53.0",
+  "version": "5.53.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 3e3815b4df..f8a7cf8db1 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.53.0"
+CodeMirror.version = "5.53.2"

From 8aff90e6bd564900fbef8167e427bcbb1b0c6110 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 24 Apr 2020 10:30:29 +0200
Subject: [PATCH 4216/4742] Don't handle key events for the wrong target

Closes #6242
---
 src/edit/key_events.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index 1e7c27bb49..8f72182ab2 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -106,6 +106,7 @@ function handleCharBinding(cm, e, ch) {
 let lastStoppedKey = null
 export function onKeyDown(e) {
   let cm = this
+  if (e.target && e.target != cm.display.input.getField()) return
   cm.curOp.focus = activeElt()
   if (signalDOMEvent(cm, e)) return
   // IE does strange things with escape.
@@ -149,6 +150,7 @@ export function onKeyUp(e) {
 
 export function onKeyPress(e) {
   let cm = this
+  if (e.target && e.target != cm.display.input.getField()) return
   if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return
   let keyCode = e.keyCode, charCode = e.charCode
   if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return}

From 790b872f688ae5afca21ef01f5134ae30ab65c6b Mon Sep 17 00:00:00 2001
From: "Dinindu D. Wanniarachchi"
 <12568779+DininduWanniarachchi@users.noreply.github.com>
Date: Sat, 25 Apr 2020 21:54:42 +0530
Subject: [PATCH 4217/4742] Add SASS2CSS https://www.sass2css.online/

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 27616e4fc4..152b557668 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -151,6 +151,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
       <li><a href="http://refork.com/">Refork</a> (animation demo gallery and sharing)</li>
       <li><a href="http://sagecell.sagemath.org">SageMathCell</a> (interactive mathematical software)</li>
+      <li><a href="https://www.sass2css.online/">SASS2CSS</a> (SASS, SCSS or LESS to CSS converter and CSS beautifier)</li>
       <li><a href="https://cloud.sagemath.com/">SageMathCloud</a> (interactive mathematical software environment)</li>
       <li><a href="https://github.com/szekelymilan/salvare">salvare</a> (real-time collaborative code editor)</li>
       <li><a href="https://chrome.google.com/webstore/detail/servephp/mnpikomdchjhkhbhmbboehfdjkobbfpo">ServePHP</a> (PHP code testing in Chrome dev tools)</li>

From 64e4504865a8924be00aa9af1ee70a3856421f4f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 25 Apr 2020 22:51:57 +0200
Subject: [PATCH 4218/4742] [python mode] Somewhat improve handling of format
 specs in format strings

Issue #6244
---
 mode/python/python.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 6a5cd0d4db..de5fd38a1a 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -98,11 +98,11 @@
       return tokenBaseInner(stream, state);
     }
 
-    function tokenBaseInner(stream, state) {
+    function tokenBaseInner(stream, state, inFormat) {
       if (stream.eatSpace()) return null;
 
       // Handle Comments
-      if (stream.match(/^#.*/)) return "comment";
+      if (!inFormat && stream.match(/^#.*/)) return "comment";
 
       // Handle Number Literals
       if (stream.match(/^[0-9\.]/, false)) {
@@ -177,7 +177,7 @@
 
       // Handle non-detected items
       stream.next();
-      return ERRORCLASS;
+      return inFormat ? null :ERRORCLASS;
     }
 
     function formatStringFactory(delimiter, tokenOuter) {
@@ -189,7 +189,7 @@
 
       function tokenNestedExpr(depth) {
         return function(stream, state) {
-          var inner = tokenBaseInner(stream, state)
+          var inner = tokenBaseInner(stream, state, true)
           if (inner == "punctuation") {
             if (stream.current() == "{") {
               state.tokenize = tokenNestedExpr(depth + 1)

From e8c0a779b23c4b19023b0f25883bfb96ca67d1b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 26 Apr 2020 16:45:12 +0200
Subject: [PATCH 4219/4742] Disable scroll-on-focus in drag focus kludge

Since it causes jumps in the scroll position on Chrome.

Closes #6246
---
 src/edit/mouse_events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index d0bbfba1d3..5d2899dd82 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -159,7 +159,7 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
         extendSelection(cm.doc, pos, null, null, behavior.extend)
       // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
       if (webkit || ie && ie_version == 9)
-        setTimeout(() => {display.wrapper.ownerDocument.body.focus(); display.input.focus()}, 20)
+        setTimeout(() => {display.wrapper.ownerDocument.body.focus({preventScroll: true}); display.input.focus()}, 20)
       else
         display.input.focus()
     }

From ad54953871a4d2369c65ca37b661133b942f3152 Mon Sep 17 00:00:00 2001
From: John Chen <johnchen902@gmail.com>
Date: Mon, 27 Apr 2020 15:36:59 +0800
Subject: [PATCH 4220/4742] [vim bindings] Remove a duplicate entry in
 defaultExCommandMap

---
 keymap/vim.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index cda835b6f5..213602b6df 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -234,7 +234,6 @@
     { name: 'undo', shortName: 'u' },
     { name: 'redo', shortName: 'red' },
     { name: 'set', shortName: 'se' },
-    { name: 'set', shortName: 'se' },
     { name: 'setlocal', shortName: 'setl' },
     { name: 'setglobal', shortName: 'setg' },
     { name: 'sort', shortName: 'sor' },

From 0b64369b54503150f054abda50359c76f00f484f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 27 Apr 2020 13:45:54 +0200
Subject: [PATCH 4221/4742] Disable scroll workaround in start-drag handler for
 Safari

Issue #6246
---
 src/edit/mouse_events.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 5d2899dd82..5fcc437021 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -7,7 +7,7 @@ import { posFromMouse } from "../measurement/position_measurement.js"
 import { eventInWidget } from "../measurement/widgets.js"
 import { normalizeSelection, Range, Selection } from "../model/selection.js"
 import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates.js"
-import { captureRightClick, chromeOS, ie, ie_version, mac, webkit } from "../util/browser.js"
+import { captureRightClick, chromeOS, ie, ie_version, mac, webkit, safari } from "../util/browser.js"
 import { getOrder, getBidiPartAt } from "../util/bidi.js"
 import { activeElt } from "../util/dom.js"
 import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event.js"
@@ -158,7 +158,7 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
       if (!behavior.addNew)
         extendSelection(cm.doc, pos, null, null, behavior.extend)
       // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
-      if (webkit || ie && ie_version == 9)
+      if ((webkit && !safari) || ie && ie_version == 9)
         setTimeout(() => {display.wrapper.ownerDocument.body.focus({preventScroll: true}); display.input.focus()}, 20)
       else
         display.input.focus()

From 46f272361c45d108277be6fc0c6b0fd1cfc84e81 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 28 Apr 2020 11:04:17 +0200
Subject: [PATCH 4222/4742] [javascript mode] Add support for private
 properties

Issue #6249
---
 mode/javascript/javascript.js | 6 ++++--
 mode/javascript/test.js       | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 43848260bf..f0a65b36cb 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -98,9 +98,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (ch == "`") {
       state.tokenize = tokenQuasi;
       return tokenQuasi(stream, state);
-    } else if (ch == "#") {
+    } else if (ch == "#" && stream.peek() == "!") {
       stream.skipToEnd();
-      return ret("error", "error");
+      return ret("meta", "meta");
+    } else if (ch == "#" && stream.eatWhile(wordRE)) {
+      return ret("variable", "property")
     } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) {
       stream.skipToEnd()
       return ret("comment", "comment")
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 327eac76b9..ffff05f513 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -317,6 +317,14 @@
      "[variable _for];",
      "[variable _123];")
 
+  MT("private properties",
+     "[keyword class] [def C] {",
+     "  [property #x] [operator =] [number 2];",
+     "  [property #read]() {",
+     "    [keyword return] [keyword this].[property #x]",
+     "  }",
+     "}")
+
   var ts_mode = CodeMirror.getMode({indentUnit: 2}, "application/typescript")
   function TS(name) {
     test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1))

From a67ed9a4ab810b1630e7d698362a3a33c96ca024 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 28 Apr 2020 11:08:30 +0200
Subject: [PATCH 4223/4742] [javascript mode] Allow class fields in non-TS mode

Closes #6249
---
 mode/javascript/javascript.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index f0a65b36cb..d2988eb349 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -465,7 +465,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "quasi") { return pass(quasi, me); }
     if (type == ";") return;
     if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
-    if (type == ".") return cont(property, me);
+    if (type == ".") return cont(maybeQuestion, property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
     if (isTS && value == "as") { cx.marked = "keyword"; return cont(typeexpr, me) }
     if (type == "regexp") {
@@ -474,6 +474,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(expr)
     }
   }
+  function maybeQuestion(_type, value) {
+    return value == "?" ? cont() : pass()
+  }
   function quasi(type, value) {
     if (type != "quasi") return pass();
     if (value.slice(value.length - 2) != "${") return cont(quasi);
@@ -759,11 +762,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
     if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
-      return cont(isTS ? classfield : functiondef, classBody);
+      return cont(classfield, classBody);
     }
-    if (type == "number" || type == "string") return cont(isTS ? classfield : functiondef, classBody);
+    if (type == "number" || type == "string") return cont(classfield, classBody);
     if (type == "[")
-      return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
+      return cont(expression, maybetype, expect("]"), classfield, classBody)
     if (value == "*") {
       cx.marked = "keyword";
       return cont(classBody);

From 6890f98b90b6df14912fe7ee7c04b89f33eb236d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 29 Apr 2020 11:15:32 +0200
Subject: [PATCH 4224/4742] Don't mess with the selection when refocusing a
 text field

Issue #6242
---
 src/display/update_display.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/display/update_display.js b/src/display/update_display.js
index 50228d1779..e6c21a0ad7 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -74,7 +74,8 @@ function selectionSnapshot(cm) {
 function restoreSelection(snapshot) {
   if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) return
   snapshot.activeElt.focus()
-  if (snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
+  if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
+      snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
     let sel = window.getSelection(), range = document.createRange()
     range.setEnd(snapshot.anchorNode, snapshot.anchorOffset)
     range.collapse(false)

From dfa4bdaa513698fa9baaae9e048f006ba1e317bd Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <TimvdLippe@users.noreply.github.com>
Date: Thu, 30 Apr 2020 15:29:31 +0100
Subject: [PATCH 4225/4742] [runmode standalone] Add support for globalThis

We use the standalone mode in DevTools in a worker, where `window`
does not exist. Instead, we can use `globalThis` which should be
the corresponding global scope in all scenarios. For older browsers
that do not support `globalThis`, we fallback to `window`.

Relevant DevTools change:
https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2174418/1/front_end/third_party/codemirror/package/addon/runmode/runmode-standalone.js
---
 addon/runmode/runmode-standalone.js | 3 ++-
 test/lint.js                        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index b086181dde..e2137df9c9 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -1,7 +1,8 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: https://codemirror.net/LICENSE
 
-window.CodeMirror = {};
+var root = typeof globalThis !== 'undefined' ? globalThis : window;
+root.CodeMirror = {};
 
 (function() {
 "use strict";
diff --git a/test/lint.js b/test/lint.js
index e7c114cd91..bdbed1a8eb 100644
--- a/test/lint.js
+++ b/test/lint.js
@@ -3,7 +3,7 @@ var blint = require("blint");
 ["mode", "lib", "addon", "keymap"].forEach(function(dir) {
   blint.checkDir(dir, {
     browser: true,
-    allowedGlobals: ["CodeMirror", "define", "test", "requirejs"],
+    allowedGlobals: ["CodeMirror", "define", "test", "requirejs", "globalThis"],
     ecmaVersion: 5,
     tabs: dir == "lib"
   });

From c41dec13675da74fb575006a502d7daee6abdafe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 30 Apr 2020 17:28:32 +0200
Subject: [PATCH 4226/4742] Also ignore clipboard events inside widgets in
 contenteditable input mode

Issue #6242
---
 src/input/ContentEditableInput.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index bff285166c..b50073ecff 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -31,8 +31,16 @@ export default class ContentEditableInput {
     let div = input.div = display.lineDiv
     disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize)
 
+    function belongsToInput(e) {
+      for (let t = e.target; t; t = t.parentNode) {
+        if (t == div) return true
+        if (/\bCodeMirror-(?:line)?widget\b/.test(t.className)) break
+      }
+      return false
+    }
+
     on(div, "paste", e => {
-      if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
+      if (!belongsToInput(e) || signalDOMEvent(cm, e) || handlePaste(e, cm)) return
       // IE doesn't fire input events, so we schedule a read for the pasted content in this way
       if (ie_version <= 11) setTimeout(operation(cm, () => this.updateFromDOM()), 20)
     })
@@ -57,7 +65,7 @@ export default class ContentEditableInput {
     })
 
     function onCopyCut(e) {
-      if (signalDOMEvent(cm, e)) return
+      if (!belongsToInput(e) || signalDOMEvent(cm, e)) return
       if (cm.somethingSelected()) {
         setLastCopied({lineWise: false, text: cm.getSelections()})
         if (e.type == "cut") cm.replaceSelection("", null, "cut")

From b6a75e55bfe3508c21d9864cd662492ba32c26fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 1 May 2020 12:50:20 +0200
Subject: [PATCH 4227/4742] [matchbrackets addon] Disable highlighting when the
 editor isn't focused

Closes #6252
---
 addon/edit/matchbrackets.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 2a147282c4..2c47e07033 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -118,16 +118,24 @@
   }
 
   CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.off("cursorActivity", doMatchBrackets);
+    function clear(cm) {
       if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {
         cm.state.matchBrackets.currentlyHighlighted();
         cm.state.matchBrackets.currentlyHighlighted = null;
       }
     }
+
+    if (old && old != CodeMirror.Init) {
+      cm.off("cursorActivity", doMatchBrackets);
+      cm.off("focus", doMatchBrackets)
+      cm.off("blur", clear)
+      clear(cm);
+    }
     if (val) {
       cm.state.matchBrackets = typeof val == "object" ? val : {};
       cm.on("cursorActivity", doMatchBrackets);
+      cm.on("focus", doMatchBrackets)
+      cm.on("blur", clear)
     }
   });
 

From a9774d951c5b7d06c63153635ad4cedfbbb2b89e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 1 May 2020 12:55:29 +0200
Subject: [PATCH 4228/4742] [javascript operator] Properly implement optional
 chaining operator

Closes #6255
---
 mode/javascript/javascript.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index d2988eb349..c724b23726 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -115,6 +115,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
           if (ch == ">") stream.eat(ch)
         }
       }
+      if (ch == "?" && stream.eat(".")) return ret(".")
       return ret("operator", "operator", stream.current());
     } else if (wordRE.test(ch)) {
       stream.eatWhile(wordRE);
@@ -465,7 +466,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "quasi") { return pass(quasi, me); }
     if (type == ";") return;
     if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
-    if (type == ".") return cont(maybeQuestion, property, me);
+    if (type == ".") return cont(property, me);
     if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
     if (isTS && value == "as") { cx.marked = "keyword"; return cont(typeexpr, me) }
     if (type == "regexp") {
@@ -474,9 +475,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(expr)
     }
   }
-  function maybeQuestion(_type, value) {
-    return value == "?" ? cont() : pass()
-  }
   function quasi(type, value) {
     if (type != "quasi") return pass();
     if (value.slice(value.length - 2) != "${") return cont(quasi);

From 632f30be88392aa8e86a5e28697df78f759cc913 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 4 May 2020 10:21:04 +0200
Subject: [PATCH 4229/4742] Increase size of scrollbar-hack gap

Issue #6258
---
 lib/codemirror.css | 10 +++++-----
 src/util/misc.js   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index bc910fb9b4..56896500e7 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -164,17 +164,17 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 
 .CodeMirror-scroll {
   overflow: scroll !important; /* Things will break if this is overridden */
-  /* 30px is the magic margin used to hide the element's real scrollbars */
+  /* 50px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
+  margin-bottom: -50px; margin-right: -50px;
+  padding-bottom: 50px;
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
 }
 .CodeMirror-sizer {
   position: relative;
-  border-right: 30px solid transparent;
+  border-right: 50px solid transparent;
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
@@ -212,7 +212,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   height: 100%;
   display: inline-block;
   vertical-align: top;
-  margin-bottom: -30px;
+  margin-bottom: -50px;
 }
 .CodeMirror-gutter-wrapper {
   position: absolute;
diff --git a/src/util/misc.js b/src/util/misc.js
index 3337989bda..6dc8d8615c 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -61,7 +61,7 @@ export function indexOf(array, elt) {
 }
 
 // Number of pixels added to scroller and sizer to hide scrollbar
-export let scrollerGap = 30
+export let scrollerGap = 50
 
 // Returned or thrown by various protocols to signal 'I'm not
 // handling this'.

From 2e841f6edff9eb2995b31b1ed98fada87014f470 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 8 May 2020 12:05:40 +0200
Subject: [PATCH 4230/4742] Add a sponsors section to the website

---
 index.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/index.html b/index.html
index 2a62dc02c2..cbbe9081a0 100644
--- a/index.html
+++ b/index.html
@@ -195,4 +195,19 @@ <h2>Browser support</h2>
   pretty well.</p>
 </section>
 
+<section id=sponsors>
+  <style>
+    ul.sponsor-list { padding-left: 10px }
+    ul.sponsor-list li { list-style: none; margin-bottom: 1em }
+    ul.sponsor-list img { max-width: 80%; max-height: 10em; width: 20em }
+  </style>
+
+  <h2>Sponsors</h2>
+  <p>These companies support development of this project:</p>
+  <ul class=sponsor-list>
+    <li><a href="https://codepen.io/"><img src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>' alt="CodePen"></a></li>
+    <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>
+  </ul>
+</section>
+
 </article>

From 0de283c59c2e1295114e73bba25b04ce0a3eec31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20L=C3=A1szl=C3=B3?= <ptrlaszlo@gmail.com>
Date: Sat, 9 May 2020 09:10:18 +0200
Subject: [PATCH 4231/4742] [tcl mode] Add # as a lineComment

---
 mode/tcl/tcl.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index a7ec89c9e8..dec0662a60 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -131,7 +131,8 @@ CodeMirror.defineMode("tcl", function() {
       token: function(stream, state) {
         if (stream.eatSpace()) return null;
         return state.tokenize(stream, state);
-      }
+      },
+      lineComment: "#"
     };
 });
 CodeMirror.defineMIME("text/x-tcl", "tcl");

From 8e260c23bcf3f222430f9fae0d22bd0b9fe272e0 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 12 May 2020 15:17:46 -0700
Subject: [PATCH 4232/4742] [dart mode] Add `late` and `required` keywords,
 `Null` and `Never` types

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

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 6c601ae9ae..fe64517a5e 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -15,10 +15,10 @@
     "implements mixin get native set typedef with enum throw rethrow " +
     "assert break case continue default in return new deferred async await covariant " +
     "try catch finally do else for if switch while import library export " +
-    "part of show hide is as extension on yield").split(" ");
+    "part of show hide is as extension on yield late required").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
   var atoms = "true false null".split(" ");
-  var builtins = "void bool num int double dynamic var String".split(" ");
+  var builtins = "void bool num int double dynamic var String Null Never".split(" ");
 
   function set(words) {
     var obj = {};

From a810aee8fc68cf99731b6377a15d2914f7863429 Mon Sep 17 00:00:00 2001
From: Boris K <kubiakboris@gmail.com>
Date: Wed, 13 May 2020 18:42:55 +0200
Subject: [PATCH 4233/4742] [mode/meta] Remove unwanted space in TiddlyWiki
 mode name

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

diff --git a/mode/meta.js b/mode/meta.js
index d44590f61f..9f64f41048 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -144,7 +144,7 @@
     {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v", "sv", "svh"]},
     {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
     {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
-    {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
+    {name: "TiddlyWiki", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
     {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
     {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
     {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},

From 0884405eb7f0903af0b0b074a07343f8ed680ac7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 14 May 2020 08:40:59 +0200
Subject: [PATCH 4234/4742] [runmode addon] Add support for lookahead

Closes codemirror/google-modes#300
---
 addon/runmode/runmode-standalone.js | 10 ++++++----
 addon/runmode/runmode.js            |  5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index e2137df9c9..f47af3f2f1 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -9,9 +9,11 @@ root.CodeMirror = {};
 
 function splitLines(string){ return string.split(/\r?\n|\r/); };
 
-function StringStream(string) {
+function StringStream(strings, i) {
   this.pos = this.start = 0;
-  this.string = string;
+  this.string = strings[i];
+  this.strings = strings
+  this.i = i
   this.lineStart = 0;
 }
 StringStream.prototype = {
@@ -67,7 +69,7 @@ StringStream.prototype = {
     try { return inner(); }
     finally { this.lineStart -= n; }
   },
-  lookAhead: function() { return null }
+  lookAhead: function(n) { return this.strings[this.i + n] }
 };
 CodeMirror.StringStream = StringStream;
 
@@ -151,7 +153,7 @@ CodeMirror.runMode = function (string, modespec, callback, options) {
   var lines = splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines[i]);
+    var stream = new CodeMirror.StringStream(lines, i);
     if (!stream.string && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index eb4cadf5b4..ca8d9a9c79 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -59,7 +59,10 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
   var lines = CodeMirror.splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines[i]);
+    var stream = new CodeMirror.StringStream(lines[i], null, {
+      lookAhead: function(n) { return lines[i + n] },
+      baseToken: function() {}
+    });
     if (!stream.string && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
       var style = mode.token(stream, state);

From 890cb6bea3e73118d69f4e279da1dff57d7e4627 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 14 May 2020 14:43:50 +0200
Subject: [PATCH 4235/4742] [javascript mode] Fix a runaway regexp

Issue #6273
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c724b23726..c6577630fd 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -458,7 +458,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
     if (type == "operator") {
       if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
-      if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))
+      if (isTS && value == "<" && cx.stream.match(/^([^<>]|<[^<>]*>)*>\s*\(/, false))
         return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me);
       if (value == "?") return cont(expression, expect(":"), expr);
       return cont(expr);

From b6ac63e3c361834d1470ac386e98d13f40fc07f6 Mon Sep 17 00:00:00 2001
From: Ajin Abraham <ajin25@gmail.com>
Date: Fri, 15 May 2020 00:03:40 +0530
Subject: [PATCH 4236/4742] Proper escaping of \s

See: https://lgtm.com/rules/1510624619946/
---
 src/line/highlight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/line/highlight.js b/src/line/highlight.js
index 9835d4626a..7b4ca0b391 100644
--- a/src/line/highlight.js
+++ b/src/line/highlight.js
@@ -198,7 +198,7 @@ function extractLineClasses(type, output) {
     let prop = lineClass[1] ? "bgClass" : "textClass"
     if (output[prop] == null)
       output[prop] = lineClass[2]
-    else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
+    else if (!(new RegExp("(?:^|\\s)" + lineClass[2] + "(?:$|\\s)")).test(output[prop]))
       output[prop] += " " + lineClass[2]
   }
   return type

From 25e7a32daa108026736ddbb9a71c5ebb0e9c375a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 15 May 2020 17:10:20 +0200
Subject: [PATCH 4237/4742] [match-highlighter] Fix issue in highlighting
 non-alphanumeric tokens

Closes #6279
---
 addon/search/match-highlighter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index b344ac79e2..3a4a7dedc1 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -90,7 +90,9 @@
     var state = cm.state.matchHighlighter;
     cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
     if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
-      var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[.+*?(){|^$]/g, "\\$&") + "\\b") : query;
+      var searchFor = hasBoundary ? new RegExp((/\w/.test(query.charAt(0)) ? "\\b" : "") +
+                                               query.replace(/[\\\[.+*?(){|^$]/g, "\\$&") +
+                                               (/\w/.test(query.charAt(query.length - 1)) ? "\\b" : "")) : query;
       state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
         {className: "CodeMirror-selection-highlight-scrollbar"});
     }

From 8facd9030bfa385eaad0d937ee4b8155aa91d76c Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Thu, 14 May 2020 19:03:06 +0100
Subject: [PATCH 4238/4742] [vim] Allow Ex-Commands with non-word names

---
 keymap/vim.js    |  2 +-
 test/vim_test.js | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 213602b6df..b5be59cc4b 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4456,7 +4456,7 @@
         }
 
         // Parse command name.
-        var commandMatch = inputStream.match(/^(\w+)/);
+        var commandMatch = inputStream.match(/^(\w+|!!|@@|[!#&*<=>@~])/);
         if (commandMatch) {
           result.commandName = commandMatch[1];
         } else {
diff --git a/test/vim_test.js b/test/vim_test.js
index 7e06434cfc..7adace8e45 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4479,6 +4479,37 @@ testVim('ex_api_test', function(cm, vim, helpers) {
   is(res,'Mapping to key failed');
   CodeMirror.Vim.mapclear();
 });
+// Testing ex-commands with non-alpha names.
+testVim('ex_special_names', function(cm, vim, helpers) {
+  var ran,val;
+  var cmds = ['!','!!','#','&','*','<','=','>','@','@@','~','regtest1','RT2'];
+  cmds.forEach(function(name){
+    CodeMirror.Vim.defineEx(name,'',function(cm,params){
+      ran=params.commandName;
+      val=params.argString;
+    });
+    helpers.doEx(':'+name);
+    eq(ran,name,'Running ex-command failed');
+    helpers.doEx(':'+name+' x');
+    eq(val,' x','Running ex-command with param failed: '+name);
+    if(/^\W+$/.test(name)){
+      helpers.doEx(':'+name+'y');
+      eq(val,'y','Running ex-command with param failed: '+name);
+    }
+    else{
+      helpers.doEx(':'+name+'-y');
+      eq(val,'-y','Running ex-command with param failed: '+name);
+    }
+    if(name!=='!'){
+      helpers.doEx(':'+name+'!');
+      eq(ran,name,'Running ex-command with bang failed');
+      eq(val,'!','Running ex-command with bang failed: '+name);
+      helpers.doEx(':'+name+'!z');
+      eq(ran,name,'Running ex-command with bang & param failed');
+      eq(val,'!z','Running ex-command with bang & param failed: '+name);
+    }
+  });
+});
 // For now, this test needs to be last because it messes up : for future tests.
 testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
   helpers.doEx('map : x');

From e56014c9caf63fec9173da7a8591057475883b32 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Sun, 17 May 2020 22:05:19 +0200
Subject: [PATCH 4239/4742] [soy mode] Fix bug with "map" in type name

Co-authored-by: Axel Lewenhaupt <lewenhaupt@lewenhaupt-macbookpro2.roam.corp.google.com>
---
 mode/soy/soy.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 4de0f37638..1b19923da5 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -300,10 +300,10 @@
             } else if (peekChar == "[") {
               state.soyState.push('param-type-record');
               return null;
+            } else if (peekChar == "<") {
+              state.soyState.push('param-type-parameter');
+              return null;
             } else if (match = stream.match(/^([\w]+|[?])/)) {
-              if (match[0] == "map" || match[0] == "list") {
-                state.soyState.push('param-type-map-list');
-              }
               return "type";
             }
             stream.next();
@@ -322,8 +322,7 @@
             stream.next();
             return null;
 
-          case "param-type-map-list":
-            var peekChar = stream.peek();
+          case "param-type-parameter":
             if (stream.match(/^[>]/)) {
               state.soyState.pop();
               return null;

From 4377c08dddb11faea627d2c27ef62ab4381e9493 Mon Sep 17 00:00:00 2001
From: Jack Douglas <jack@douglastechnology.co.uk>
Date: Mon, 18 May 2020 14:34:00 +0100
Subject: [PATCH 4240/4742] [gfm mode] add fencedCodeBlockDefaultMode option

---
 mode/markdown/index.html  | 10 ++++++++--
 mode/markdown/markdown.js |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index f0a359d600..da3fe61b98 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -388,13 +388,19 @@ <h2>Markdown mode</h2>
       <li>
         <d1>
           <dt><code>fencedCodeBlockHighlighting: boolean</code></dt>
-          <dd>Whether to syntax-highlight fenced code blocks, if given mode is included (default: <code>true</code>).</dd>
+          <dd>Whether to syntax-highlight fenced code blocks, if given mode is included, or fencedCodeBlockDefaultMode is set (default: <code>true</code>).</dd>
+        </d1>
+      </li>
+      <li>
+        <d1>
+          <dt><code>fencedCodeBlockDefaultMode: string</code></dt>
+          <dd>Mode to use for fencedCodeBlockHighlighting, if given mode is not included.</dd>
         </d1>
       </li>
       <li>
         <d1>
           <dt><code>tokenTypeOverrides: Object</code></dt>
-          <dd>When you want ot override default token type names (e.g. <code>{code: "code"}</code>).</dd>
+          <dd>When you want to override default token type names (e.g. <code>{code: "code"}</code>).</dd>
         </d1>
       </li>
       <li>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 6d1468cdc0..dcb048c5e3 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -47,6 +47,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   if (modeCfg.fencedCodeBlockHighlighting === undefined)
     modeCfg.fencedCodeBlockHighlighting = true;
+  
+  if (modeCfg.fencedCodeBlockDefaultMode === undefined)
+    modeCfg.fencedCodeBlockDefaultMode = '';
 
   if (modeCfg.xml === undefined)
     modeCfg.xml = true;
@@ -236,7 +239,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.quote = 0;
       state.fencedEndRE = new RegExp(match[1] + "+ *$");
       // try switching mode
-      state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2]);
+      state.localMode = modeCfg.fencedCodeBlockHighlighting && getMode(match[2] || modeCfg.fencedCodeBlockDefaultMode );
       if (state.localMode) state.localState = CodeMirror.startState(state.localMode);
       state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";

From a5497d1c13f5742b6df963319e9abf30d510387a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 May 2020 10:19:11 +0200
Subject: [PATCH 4241/4742] Mark version 5.54.0

---
 AUTHORS           |  7 +++++++
 CHANGELOG.md      | 22 ++++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 13 +++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 91d5b50e4c..f5b5d7a6b6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -20,6 +20,7 @@ aeroson
 Ahmad Amireh
 Ahmad M. Zawawi
 ahoward
+Ajin Abraham
 Akeksandr Motsjonov
 Alasdair Smith
 AlbertHilb
@@ -100,6 +101,7 @@ Bem Jones-Bey
 benbro
 Benedikt Meurer
 benhormann
+Ben Hormann
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Benjamin Young
@@ -120,6 +122,7 @@ Bo
 boomyjee
 Bo Peng
 borawjm
+Boris K
 Brad Metcalf
 Brandon Frohs
 Brandon Wamboldt
@@ -216,6 +219,7 @@ Dick Choi
 Diego Fernandez
 dignifiedquire
 Dimage Sapelkin
+Dinindu D. Wanniarachchi
 dmaclach
 Dmitry Kiselyov
 domagoj412
@@ -394,6 +398,7 @@ joelpinheiro
 joewalsh
 Johan Ask
 Johannes
+John Chen
 John Connor
 John-David Dalton
 John Engler
@@ -660,6 +665,7 @@ peter
 Peter Flynn
 peterkroon
 Peter Kroon
+Peter László
 Philipp A
 Philipp Markovics
 Philip Stadermann
@@ -805,6 +811,7 @@ Tim Gates
 Timothy Farrell
 Timothy Gu
 Timothy Hatcher
+Tim van der Lippe
 Tobias Bertelsen
 TobiasBg
 Todd Berman
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f448c65cb1..a445dd913a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 5.54.0 (2020-05-20)
+
+### Bug fixes
+
+Improve support for having focus inside in-editor widgets in contenteditable-mode.
+
+Fix issue where the scroll position could jump when clicking on a selection in Chrome.
+
+[python mode](https://codemirror.net/mode/python/): Better format string support.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Improve parsing of private properties and class fields.
+
+[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Disable highlighting when the editor doesn't have focus.
+
+### New features
+
+[runmode addon](https://codemirror.net/doc/manual.html#addon_runmode): Properly support for cross-line lookahead.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Allow Ex-Commands with non-word names.
+
+[gfm mode](https://codemirror.net/mode/gfm/): Add a `fencedCodeBlockDefaultMode` option.
+
 ## 5.53.2 (2020-04-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index acf9f4a393..e8acb01f92 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.53.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.54.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 d2f1d75ccc..75384de760 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-05-2020: <a href="https://codemirror.net/codemirror-5.54.0.zip">Version 5.54.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/doc/manual.html#addon_runmode">runmode addon</a>: Properly support for cross-line lookahead.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Allow Ex-Commands with non-word names.</li>
+    <li><a href="https://codemirror.net/mode/gfm/">gfm mode</a>: Add a <code>fencedCodeBlockDefaultMode</code> option.</li>
+    <li>Improve support for having focus inside in-editor widgets in contenteditable-mode.</li>
+    <li>Fix issue where the scroll position could jump when clicking on a selection in Chrome.</li>
+    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Better format string support.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing of private properties and class fields.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Disable highlighting when the editor doesn’t have focus.</li>
+  </ul>
+
   <p class="rel">21-04-2020: <a href="https://codemirror.net/codemirror-5.53.2.zip">Version 5.53.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index cbbe9081a0..59cac746fd 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.53.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.54.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index cf5a462507..7956d37b97 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.53.2",
+  "version": "5.54.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index f8a7cf8db1..e15243a415 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.53.2"
+CodeMirror.version = "5.54.0"

From 2571b4ad08e007c246d73bdd973892bf5dd7b02e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 26 May 2020 10:12:54 +0200
Subject: [PATCH 4242/4742] Don't render zero-width joiners as a special
 character

Since it'll often mess up emoji rendering

Issue #4488
---
 src/edit/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/options.js b/src/edit/options.js
index 225f5499c5..400e000327 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -68,7 +68,7 @@ export function defineOptions(CodeMirror) {
     for (let i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   })
-  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, (cm, val, old) => {
+  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200c\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, (cm, val, old) => {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
     if (old != Init) cm.refresh()
   })

From a66f466e33fd274785b043ce308e745a9c6d08dc Mon Sep 17 00:00:00 2001
From: Siddhartha Gunti <siddhartha.gunti191@gmail.com>
Date: Wed, 27 May 2020 01:28:10 +0530
Subject: [PATCH 4243/4742] [real-world uses] Add Adaface PairPro

Adding Adaface PairPro (remote pair programming tool with code editor, compiler and video conference) for interviews.
Added in alphabetical order.
---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index 152b557668..b308b39adf 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -25,6 +25,7 @@ <h2>CodeMirror real-world uses</h2>
     request</a> if you'd like your project to be added to this list.</p>
 
     <ul>
+      <li><a href="https://www.adaface.com/pair-pro">Adaface PairPro</a> (Shared code editor with compiler and video conferencing)</li>
       <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
       <li><a href="http://adnuntius.com">Adnuntius</a> (used for in-browser code editing and version history)</li>
       <li><a href="http://alm.tools">ALM Tools</a> (TypeScript powered IDE)</li>

From b42ee0965e7ab931c775af886286a3a34a34705d Mon Sep 17 00:00:00 2001
From: benhormann <benhormann@users.noreply.github.com>
Date: Fri, 29 May 2020 08:07:16 +0100
Subject: [PATCH 4244/4742] [vim] Fix vim-mode-change event being signalled
 twice

---
 keymap/vim.js    |  2 +-
 test/vim_test.js | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b5be59cc4b..bca6d46d72 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3203,7 +3203,7 @@
       vim.visualMode = false;
       vim.visualLine = false;
       vim.visualBlock = false;
-      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      if (!vim.insertMode) CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       clearFakeCursor(vim);
     }
 
diff --git a/test/vim_test.js b/test/vim_test.js
index 7adace8e45..71284bdf59 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1153,6 +1153,41 @@ testVim('s_visual_block', function(cm, vim, helpers) {
   eq('1hello{\n  world\n', cm.getValue());
 }, {value: '1234\n5678\nabcdefg\n'});
 
+// Test mode change event. It should only fire once per mode transition.
+testVim('on_mode_change', function(cm, vim, helpers) {
+  var modeHist = [];
+  function callback(arg) {
+    var subMode = arg.subMode ? ':' + arg.subMode : '';
+    modeHist.push(arg.mode + subMode);
+  }
+  helpers.doKeys('<Esc>', '<Esc>');
+  cm.on('vim-mode-change', callback);
+  function test(key, mode) {
+    modeHist.length = 0;
+    helpers.doKeys(key);
+    eq(modeHist.join(';'), mode);
+  }
+  test('v', 'visual');
+  test('c', 'insert');
+  test('<Esc>', 'normal');
+  test('<C-v>', 'visual:blockwise');
+  test('I', 'insert');
+  test('<Esc>', 'normal');
+  test('R', 'replace');
+  test('x', '');
+  test('<C-[>', 'normal');
+  test('v', 'visual');
+  test('V', 'visual:linewise');
+  test('<C-v>', 'visual:blockwise');
+  test('v', 'visual');
+  test('<C-c>', 'normal');
+  test('a', 'insert');
+  test('<Esc>', 'normal');
+  test('v', 'visual');
+  test(':', ''); // Event for Command-line mode not implemented.
+  test('y', 'normal');
+});
+
 // Swapcase commands edit in place and do not modify registers.
 testVim('g~w_repeat', function(cm, vim, helpers) {
   // Assert that dw does delete newline if it should go to the next line, and

From cc92ea5fdb5d156bfefa745fe784ac0146f6353b Mon Sep 17 00:00:00 2001
From: Jack Douglas <jack@douglastechnology.co.uk>
Date: Fri, 29 May 2020 15:40:22 +0100
Subject: [PATCH 4245/4742] [gfm mode] Allow forward slash in fenced code
 language

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index dcb048c5e3..508176e2b2 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -92,7 +92,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
   ,   setextHeaderRE = /^ {0,3}(?:\={1,}|-{2,})\s*$/
   ,   textRE = /^[^#!\[\]*_\\<>` "'(~:]+/
-  ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w+#-]*)[^\n`]*$/
+  ,   fencedCodeRE = /^(~~~+|```+)[ \t]*([\w\/+#-]*)[^\n`]*$/
   ,   linkDefRE = /^\s*\[[^\]]+?\]:.*$/ // naive link-definition
   ,   punctuation = /[!"#$%&'()*+,\-.\/:;<=>?@\[\\\]^_`{|}~\xA1\xA7\xAB\xB6\xB7\xBB\xBF\u037E\u0387\u055A-\u055F\u0589\u058A\u05BE\u05C0\u05C3\u05C6\u05F3\u05F4\u0609\u060A\u060C\u060D\u061B\u061E\u061F\u066A-\u066D\u06D4\u0700-\u070D\u07F7-\u07F9\u0830-\u083E\u085E\u0964\u0965\u0970\u0AF0\u0DF4\u0E4F\u0E5A\u0E5B\u0F04-\u0F12\u0F14\u0F3A-\u0F3D\u0F85\u0FD0-\u0FD4\u0FD9\u0FDA\u104A-\u104F\u10FB\u1360-\u1368\u1400\u166D\u166E\u169B\u169C\u16EB-\u16ED\u1735\u1736\u17D4-\u17D6\u17D8-\u17DA\u1800-\u180A\u1944\u1945\u1A1E\u1A1F\u1AA0-\u1AA6\u1AA8-\u1AAD\u1B5A-\u1B60\u1BFC-\u1BFF\u1C3B-\u1C3F\u1C7E\u1C7F\u1CC0-\u1CC7\u1CD3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205E\u207D\u207E\u208D\u208E\u2308-\u230B\u2329\u232A\u2768-\u2775\u27C5\u27C6\u27E6-\u27EF\u2983-\u2998\u29D8-\u29DB\u29FC\u29FD\u2CF9-\u2CFC\u2CFE\u2CFF\u2D70\u2E00-\u2E2E\u2E30-\u2E42\u3001-\u3003\u3008-\u3011\u3014-\u301F\u3030\u303D\u30A0\u30FB\uA4FE\uA4FF\uA60D-\uA60F\uA673\uA67E\uA6F2-\uA6F7\uA874-\uA877\uA8CE\uA8CF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA95F\uA9C1-\uA9CD\uA9DE\uA9DF\uAA5C-\uAA5F\uAADE\uAADF\uAAF0\uAAF1\uABEB\uFD3E\uFD3F\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF5F-\uFF65]|\uD800[\uDD00-\uDD02\uDF9F\uDFD0]|\uD801\uDD6F|\uD802[\uDC57\uDD1F\uDD3F\uDE50-\uDE58\uDE7F\uDEF0-\uDEF6\uDF39-\uDF3F\uDF99-\uDF9C]|\uD804[\uDC47-\uDC4D\uDCBB\uDCBC\uDCBE-\uDCC1\uDD40-\uDD43\uDD74\uDD75\uDDC5-\uDDC9\uDDCD\uDDDB\uDDDD-\uDDDF\uDE38-\uDE3D\uDEA9]|\uD805[\uDCC6\uDDC1-\uDDD7\uDE41-\uDE43\uDF3C-\uDF3E]|\uD809[\uDC70-\uDC74]|\uD81A[\uDE6E\uDE6F\uDEF5\uDF37-\uDF3B\uDF44]|\uD82F\uDC9F|\uD836[\uDE87-\uDE8B]/
   ,   expandedTab = "    " // CommonMark specifies tab as 4 spaces

From d331b896470d287a90df888b77e51671fc140bf5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 3 Jun 2020 08:54:29 +0200
Subject: [PATCH 4246/4742] [loadmode addon] Support overriding script loading
 and filename computation

Issue #6295
Issue #6294
---
 addon/mode/loadmode.js | 22 ++++++++++++----------
 doc/manual.html        | 21 ++++++++++++++-------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/addon/mode/loadmode.js b/addon/mode/loadmode.js
index 4ce716a012..fc695d0c37 100644
--- a/addon/mode/loadmode.js
+++ b/addon/mode/loadmode.js
@@ -16,8 +16,8 @@
     var countDown = n;
     return function() { if (--countDown == 0) cont(); };
   }
-  function ensureDeps(mode, cont) {
-    var deps = CodeMirror.modes[mode].dependencies;
+  function ensureDeps(mode, cont, options) {
+    var modeObj = CodeMirror.modes[mode], deps = modeObj && modeObj.dependencies;
     if (!deps) return cont();
     var missing = [];
     for (var i = 0; i < deps.length; ++i) {
@@ -27,16 +27,18 @@
     if (!missing.length) return cont();
     var split = splitCallback(cont, missing.length);
     for (var i = 0; i < missing.length; ++i)
-      CodeMirror.requireMode(missing[i], split);
+      CodeMirror.requireMode(missing[i], split, options);
   }
 
-  CodeMirror.requireMode = function(mode, cont) {
+  CodeMirror.requireMode = function(mode, cont, options) {
     if (typeof mode != "string") mode = mode.name;
-    if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
+    if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont, options);
     if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
 
-    var file = CodeMirror.modeURL.replace(/%N/g, mode);
-    if (env == "plain") {
+    var file = options && options.path ? options.path(mode) : CodeMirror.modeURL.replace(/%N/g, mode);
+    if (options && options.loadMode) {
+      options.loadMode(file, function() { ensureDeps(mode, cont, options) })
+    } else if (env == "plain") {
       var script = document.createElement("script");
       script.src = file;
       var others = document.getElementsByTagName("script")[0];
@@ -44,7 +46,7 @@
       CodeMirror.on(script, "load", function() {
         ensureDeps(mode, function() {
           for (var i = 0; i < list.length; ++i) list[i]();
-        });
+        }, options);
       });
       others.parentNode.insertBefore(script, others);
     } else if (env == "cjs") {
@@ -55,10 +57,10 @@
     }
   };
 
-  CodeMirror.autoLoadMode = function(instance, mode) {
+  CodeMirror.autoLoadMode = function(instance, mode, options) {
     if (!CodeMirror.modes.hasOwnProperty(mode))
       CodeMirror.requireMode(mode, function() {
         instance.setOption("mode", instance.getOption("mode"));
-      });
+      }, options);
   };
 });
diff --git a/doc/manual.html b/doc/manual.html
index e8acb01f92..e85ec25b66 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2950,13 +2950,20 @@ <h2 id="addons">Addons</h2>
       see a demo <a href="../mode/htmlmixed/index.html">here</a>.</dd>
 
       <dt id="addon_loadmode"><a href="../addon/mode/loadmode.js"><code>mode/loadmode.js</code></a></dt>
-      <dd>Defines a <code>CodeMirror.requireMode(modename,
-      callback)</code> function that will try to load a given mode and
-      call the callback when it succeeded. You'll have to
-      set <code>CodeMirror.modeURL</code> to a string that mode paths
-      can be constructed from, for
-      example <code>"mode/%N/%N.js"</code>—the <code>%N</code>'s will
-      be replaced with the mode name. Also
+      <dd>Defines a <code>CodeMirror.requireMode(modename, callback,
+      options)</code> function that will try to load a given mode and
+      call the callback when it succeeded. <code>options</code> is an
+      optional object that may contain:
+        <dl>
+          <dt><code><strong>path</strong>: fn(modeName: string) → string</code></dt>
+          <dd>Defines the way mode names are mapped to paths.</dd>
+          <dt><code><strong>loadMode</strong>: fn(path: string, cont: fn())</code></dt>
+          <dd>Override the way the mode script is loaded. By default,
+          this will use the CommonJS or AMD module loader if one is
+          present, and fall back to creating
+          a <code>&lt;script></code> tag otherwise.</dd>
+        </dl>
+      This addon also
       defines <code>CodeMirror.autoLoadMode(instance, mode)</code>,
       which will ensure the given mode is loaded and cause the given
       editor instance to refresh its mode when the loading

From b9f846f20b21e8972192b7f3df2ed08ef7a4da03 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 3 Jun 2020 08:56:15 +0200
Subject: [PATCH 4247/4742] Remove trailing whitespace

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 508176e2b2..d416cfce6d 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -47,7 +47,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   if (modeCfg.fencedCodeBlockHighlighting === undefined)
     modeCfg.fencedCodeBlockHighlighting = true;
-  
+
   if (modeCfg.fencedCodeBlockDefaultMode === undefined)
     modeCfg.fencedCodeBlockDefaultMode = '';
 

From 91cb2943208f7fa34ba125ea2ef30582ea601f32 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 3 Jun 2020 22:38:35 +0200
Subject: [PATCH 4248/4742] [runmode-standalone addon] Fix interface mismatch
 in StringStream constructor

Closes codemirror/google-modes#300
---
 addon/runmode/runmode-standalone.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
index f47af3f2f1..c339aa2bd3 100644
--- a/addon/runmode/runmode-standalone.js
+++ b/addon/runmode/runmode-standalone.js
@@ -9,12 +9,10 @@ root.CodeMirror = {};
 
 function splitLines(string){ return string.split(/\r?\n|\r/); };
 
-function StringStream(strings, i) {
+function StringStream(string, _tabSize, oracle) {
   this.pos = this.start = 0;
-  this.string = strings[i];
-  this.strings = strings
-  this.i = i
-  this.lineStart = 0;
+  this.string = string
+  this.oracle = oracle
 }
 StringStream.prototype = {
   eol: function() {return this.pos >= this.string.length;},
@@ -69,7 +67,7 @@ StringStream.prototype = {
     try { return inner(); }
     finally { this.lineStart -= n; }
   },
-  lookAhead: function(n) { return this.strings[this.i + n] }
+  lookAhead: function(n) { return this.oracle && this.oracle.lookAhead(n) }
 };
 CodeMirror.StringStream = StringStream;
 
@@ -151,9 +149,10 @@ CodeMirror.runMode = function (string, modespec, callback, options) {
   }
 
   var lines = splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
+  var oracle = {lookAhead: function(n) { return lines[i + n] }}
   for (var i = 0, e = lines.length; i < e; ++i) {
     if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines, i);
+    var stream = new CodeMirror.StringStream(lines[i], tabSize, oracle);
     if (!stream.string && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
       var style = mode.token(stream, state);

From b074875ead6013b4b2af8dc995f68b1602044918 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 5 Jun 2020 23:28:35 +0200
Subject: [PATCH 4249/4742] [javascript mode] Only allow HTML-style comments at
 the start of line

Closes #6305
---
 mode/javascript/javascript.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c6577630fd..38468d83d5 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -103,7 +103,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return ret("meta", "meta");
     } else if (ch == "#" && stream.eatWhile(wordRE)) {
       return ret("variable", "property")
-    } else if (ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) {
+    } else if ((ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) &&
+               !/\S/.test(stream.string.slice(0, stream.start))) {
       stream.skipToEnd()
       return ret("comment", "comment")
     } else if (isOperatorChar.test(ch)) {

From 84a02bcec14a66f6ae6ca102078cb2dc6afd6349 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 5 Jun 2020 23:30:52 +0200
Subject: [PATCH 4250/4742] [javascript mode] Reduce start-of-line restriction
 to HTML close comment tokens

Issue #6305
---
 mode/javascript/javascript.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 38468d83d5..9c751d23f3 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -103,8 +103,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return ret("meta", "meta");
     } else if (ch == "#" && stream.eatWhile(wordRE)) {
       return ret("variable", "property")
-    } else if ((ch == "<" && stream.match("!--") || ch == "-" && stream.match("->")) &&
-               !/\S/.test(stream.string.slice(0, stream.start))) {
+    } else if (ch == "<" && stream.match("!--") ||
+               (ch == "-" && stream.match("->") && !/\S/.test(stream.string.slice(0, stream.start)))) {
       stream.skipToEnd()
       return ret("comment", "comment")
     } else if (isOperatorChar.test(ch)) {

From 840464b337695d3c4fd2807bdd69e462e2f7d118 Mon Sep 17 00:00:00 2001
From: BrianHung <brianhung@berkeley.edu>
Date: Sat, 6 Jun 2020 02:19:38 -0700
Subject: [PATCH 4251/4742] [pascal mode] Add highlighting for comments with
 curly brackets

See #5523
---
 mode/pascal/pascal.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index dc3b1a3a3e..862ba5871c 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -50,7 +50,11 @@ CodeMirror.defineMode("pascal", function() {
       state.tokenize = tokenComment;
       return tokenComment(stream, state);
     }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+    if (ch == "{") {
+      state.tokenize = tokenCommentBraces;
+      return tokenCommentBraces(stream, state);
+    }
+    if (/[\[\]\(\),;\:\.]/.test(ch)) {
       return null;
     }
     if (/\d/.test(ch)) {
@@ -98,6 +102,17 @@ CodeMirror.defineMode("pascal", function() {
     return "comment";
   }
 
+  function tokenCommentBraces(stream, state) {
+    var ch;
+    while (ch = stream.next()) {
+      if (ch == "}") {
+        state.tokenize = null;
+        break;
+      }
+    }
+    return "comment";    
+  }
+
   // Interface
 
   return {

From bce03ed67520a999a07e3b2fcd33f911aa4883bc Mon Sep 17 00:00:00 2001
From: BrianHung <brianhung@berkeley.edu>
Date: Tue, 9 Jun 2020 22:41:51 -0700
Subject: [PATCH 4252/4742] [markdown mode] Change fencedCodeBlockDefaultMode
 to 'text/plain' instead of ''

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index d416cfce6d..287f39b55d 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -49,7 +49,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     modeCfg.fencedCodeBlockHighlighting = true;
 
   if (modeCfg.fencedCodeBlockDefaultMode === undefined)
-    modeCfg.fencedCodeBlockDefaultMode = '';
+    modeCfg.fencedCodeBlockDefaultMode = 'text/plain';
 
   if (modeCfg.xml === undefined)
     modeCfg.xml = true;

From 01a9446d015638c03d0618d3fb7368c90a2350e4 Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Wed, 10 Jun 2020 20:33:35 +0200
Subject: [PATCH 4253/4742] [julia mode] Tweak indent method

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

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index eaef97ebd3..2aadf36724 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -401,9 +401,9 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
 
     indent: function(state, textAfter) {
       var delta = 0;
-      if ( textAfter === ']' || textAfter === ')' || textAfter === "end" ||
-           textAfter === "else" || textAfter === "catch" || textAfter === "elseif" ||
-           textAfter === "finally" ) {
+      if ( textAfter === ']' || textAfter === ')' || /^end/.test(textAfter) ||
+           /^else/.test(textAfter) || /^catch/.test(textAfter) || /^elseif/.test(textAfter) ||
+           /^finally/.test(textAfter) ) {
         delta = -1;
       }
       return (state.scopes.length + delta) * config.indentUnit;

From 5be27709ecd36d834d4784a27194a53c8374749c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 11 Jun 2020 11:36:39 +0200
Subject: [PATCH 4254/4742] Fix lint error

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

diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index 862ba5871c..c48698bd70 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -110,7 +110,7 @@ CodeMirror.defineMode("pascal", function() {
         break;
       }
     }
-    return "comment";    
+    return "comment";
   }
 
   // Interface

From 1191965ead00abbecfb6b79b60d0ad65926c472d Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <bmeurer@google.com>
Date: Sat, 13 Jun 2020 18:38:11 +0200
Subject: [PATCH 4255/4742] [wast mode] update to match latest WebAssembly
 specification

Also shorten the regex for the keyword tokens a bit.
---
 mode/wast/wast.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 24ec27a6f7..cb64b26697 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,8 +14,8 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /anyfunc|mut|nop|block|if|then|else|loop|br|br_if|br_table|call|call_indirect|drop|end|return|local\.get|local\.set|tee_local|global\.get|global\.set|i32\.load|i64\.load|f32\.load|f64\.load|i32\.store|i64\.store|f32\.store|f64\.store|i32\.load8_s|i64\.load8_s|i32\.load8_u|i64\.load8_u|i32\.load16_s|i64\.load16_s|i32\.load16_u|i64\.load16_u|i64\.load32_s|i64\.load32_u|i32\.store8|i64\.store8|i32\.store16|i64\.store16|i32\.const|i64\.const|f32\.const|f64\.const|i32\.eqz|i64\.eqz|i32\.clz|i64\.clz|i32\.ctz|i64\.ctz|i32\.popcnt|i64\.popcnt|f32\.neg|f64\.neg|f32\.abs|f64\.abs|f32\.sqrt|f64\.sqrt|f32\.ceil|f64\.ceil|f32\.floor|f64\.floor|f32\.trunc|f64\.trunc|f32\.nearest|f64\.nearest|i32\.add|i64\.add|i32\.sub|i64\.sub|i32\.mul|i64\.mul|i32\.div_s|i64\.div_s|i32\.div_u|i64\.div_u|i32\.rem_s|i64\.rem_s|i32\.rem_u|i64\.rem_u|i32\.and|i64\.and|i32\.or|i64\.or|i32\.xor|i64\.xor|i32\.shl|i64\.shl|i32\.shr_s|i64\.shr_s|i32\.shr_u|i64\.shr_u|i32\.rotl|i64\.rotl|i32\.rotr|i64\.rotr|f32\.add|f64\.add|f32\.sub|f64\.sub|f32\.mul|f64\.mul|f32\.div|f64\.div|f32\.min|f64\.min|f32\.max|f64\.max|f32\.copysign|f64\.copysign|i32\.eq|i64\.eq|i32\.ne|i64\.ne|i32\.lt_s|i64\.lt_s|i32\.lt_u|i64\.lt_u|i32\.le_s|i64\.le_s|i32\.le_u|i64\.le_u|i32\.gt_s|i64\.gt_s|i32\.gt_u|i64\.gt_u|i32\.ge_s|i64\.ge_s|i32\.ge_u|i64\.ge_u|f32\.eq|f64\.eq|f32\.ne|f64\.ne|f32\.lt|f64\.lt|f32\.le|f64\.le|f32\.gt|f64\.gt|f32\.ge|f64\.ge|i64\.extend_s\/i32|i64\.extend_u\/i32|i32\.wrap\/i64|i32\.trunc_s\/f32|i64\.trunc_s\/f32|i32\.trunc_s\/f64|i64\.trunc_s\/f64|i32\.trunc_u\/f32|i64\.trunc_u\/f32|i32\.trunc_u\/f64|i64\.trunc_u\/f64|f32\.convert_s\/i32|f64\.convert_s\/i32|f32\.convert_s\/i64|f64\.convert_s\/i64|f32\.convert_u\/i32|f64\.convert_u\/i32|f32\.convert_u\/i64|f64\.convert_u\/i64|f64\.promote\/f32|f32\.demote\/f64|f32\.reinterpret\/i32|i32\.reinterpret\/f32|f64\.reinterpret\/i64|i64\.reinterpret\/f64|select|unreachable|current_memory|memory.size|grow_memory|memory.grow|type|func|param|result|local|global|module|table|memory|start|elem|data|offset|import|export/, token: "keyword"},
-    {regex: /\b(i32|i64|f32|f64)\b/, token: "atom"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call_indirect|call|drop|end|return|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_(s|u)))|i64\.(load32_(s|u)|store16)|(i32|i64|f32|f64)\.(load|store)|(i32|i64|f32|f64)\.const|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|(g|l)(t|e)|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(add|and|clz|ctz|(div|rem)_(s|u)|eqz?|(g|l)(e|t)_(s|u)|mul|ne|popcnt|or|rot(l|r)|sh(l|r_(s|u))|sub|xor)|i64\.extend_(s|u)_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_(s|u)|f(32|64)\.convert_i(32|64)_(s|u)|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory\.(size|grow)|type|func|param|result|local|global|module|table|memory|start|elem|data|align|offset|import|export/, token: "keyword"},
+    {regex: /\b(anyfunc|i32|i64|f32|f64)\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},
     {regex: /\(;.*?/, token: "comment", next: "comment"},
@@ -38,4 +38,4 @@ CodeMirror.defineSimpleMode('wast', {
 // which seems like a reasonable choice, although it's not standard right now.
 CodeMirror.defineMIME("text/webassembly", "wast");
 
-});
\ No newline at end of file
+});

From a45f69980de5b33fcfe9b55a1f9772aad4af9f6c Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <bmeurer@google.com>
Date: Sun, 14 Jun 2020 08:35:09 +0200
Subject: [PATCH 4256/4742] [wast mode] Support atomics from the Wasm Threads
 proposal

This also adds more test coverage for not only the atomic memory
instructions, but also the regular memory instructions. It also
shortens the regex's for keyword and atom a bit.
---
 mode/wast/test.js | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
 mode/wast/wast.js |  4 +-
 2 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index 4de7e0b267..435cf6670b 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -21,6 +21,7 @@
      '[string "foo #\\"# bar"]');
 
   MT('atom-test',
+     '[atom anyfunc]',
      '[atom i32]',
      '[atom i64]',
      '[atom f32]',
@@ -31,5 +32,98 @@
      '[keyword if]',
      '[keyword loop]',
      '[keyword i32.add]',
-     '[keyword local.get]')
+     '[keyword local.get]');
+
+  MT('memory-instructions',
+     '[keyword i32.load] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i32.load8_s] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i32.load8_u] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i32.load16_s] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i32.load16_u] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i32.store] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i32.store8] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i32.store16] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.store] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.load] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.load8_s] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.load8_u] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.load16_s] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.load16_u] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.load32_s] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.load32_u] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.store8] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.store16] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword i64.store32] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword f32.load] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword f32.store] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword f64.load] [keyword offset]=[number 4] [keyword align]=[number 4]',
+     '[keyword f64.store] [keyword offset]=[number 4] [keyword align]=[number 4]');
+
+  MT('atomic-memory-instructions',
+     '[keyword atomic.notify] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.wait] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.wait] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.load] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.load8_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.load16_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.store] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.store8] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.store16] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.load] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.load8_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.load16_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.load32_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.store] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.store8] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.store16] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.store32] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw.add] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw8.add_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw16.add_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw.add] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw8.add_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw16.add_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw32.add_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw.sub] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw8.sub_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw16.sub_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw.sub] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw8.sub_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw16.sub_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw32.sub_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw.and] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw8.and_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw16.and_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw.and] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw8.and_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw16.and_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw32.and_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw.or] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw8.or_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw16.or_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw.or] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw8.or_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw16.or_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw32.or_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw.xor] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw8.xor_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw16.xor_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw.xor] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw8.xor_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw16.xor_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw32.xor_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw.xchg] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw8.xchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw16.xchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw.xchg] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw8.xchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw16.xchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw32.xchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw.cmpxchg] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw8.cmpxchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i32.atomic.rmw16.cmpxchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw.cmpxchg] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw8.cmpxchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw16.cmpxchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i64.atomic.rmw32.cmpxchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]');
 })();
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index cb64b26697..9bda3d56fc 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,8 +14,8 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call_indirect|call|drop|end|return|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_(s|u)))|i64\.(load32_(s|u)|store16)|(i32|i64|f32|f64)\.(load|store)|(i32|i64|f32|f64)\.const|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|(g|l)(t|e)|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(add|and|clz|ctz|(div|rem)_(s|u)|eqz?|(g|l)(e|t)_(s|u)|mul|ne|popcnt|or|rot(l|r)|sh(l|r_(s|u))|sub|xor)|i64\.extend_(s|u)_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_(s|u)|f(32|64)\.convert_i(32|64)_(s|u)|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory\.(size|grow)|type|func|param|result|local|global|module|table|memory|start|elem|data|align|offset|import|export/, token: "keyword"},
-    {regex: /\b(anyfunc|i32|i64|f32|f64)\b/, token: "atom"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call_indirect|call|drop|end|return|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory\.(size|grow)|type|func|param|result|local|global|module|table|memory|start|elem|data|align|offset|import|export|atomic\.notify|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(wait|load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))/, token: "keyword"},
+    {regex: /\b(anyfunc|[fi](32|64))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},
     {regex: /\(;.*?/, token: "comment", next: "comment"},

From 3bf49684d4c62965c1257421c2fe8593f7660d59 Mon Sep 17 00:00:00 2001
From: ZeeshanNoor <zyshan.noor@gmail.com>
Date: Mon, 15 Jun 2020 17:02:22 +0200
Subject: [PATCH 4257/4742] [sql-hint addon] Autocomplete suggestion on _ $ and
 # for ODBC

---
 addon/hint/sql-hint.js | 2 +-
 mode/sql/sql.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 444eba8b15..0b89b79fab 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -264,7 +264,7 @@
       token.string = token.string.slice(0, cur.ch - token.start);
     }
 
-    if (token.string.match(/^[.`"\w@]\w*$/)) {
+    if (token.string.match(/^[.`"\w@][\w$#]*$/g)) {
       search = token.string;
       start = token.start;
       end = token.end;
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index e43495d271..4127cd9a05 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -96,7 +96,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
         return null
       // .table_name (ODBC)
       // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-      if (support.ODBCdotTable && stream.match(/^[\w\d_]+/))
+      if (support.ODBCdotTable && stream.match(/^[\w\d_$#]+/))
         return "variable-2";
     } else if (operatorChars.test(ch)) {
       // operators

From b937e09ce05d5d569e61383bb4a185c70e6e3972 Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <bmeurer@google.com>
Date: Mon, 15 Jun 2020 19:38:06 +0200
Subject: [PATCH 4258/4742] [wast mode] Support WebAssembly tail-calls proposal

This also adds more test coverage for all other control instructions,
not just the new ones from the tail-calls proposal.
---
 mode/wast/test.js | 12 ++++++++++++
 mode/wast/wast.js |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index 435cf6670b..a8097768a7 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -34,6 +34,18 @@
      '[keyword i32.add]',
      '[keyword local.get]');
 
+  MT('control-instructions',
+     '[keyword unreachable]',
+     '[keyword nop]',
+     '[keyword br] [variable-2 $label0]',
+     '[keyword br_if] [variable-2 $label0]',
+     '[keyword br_table] [variable-2 $label0] [variable-2 $label1] [variable-2 $label3]',
+     '[keyword return]',
+     '[keyword call] [variable-2 $func0]',
+     '[keyword call_indirect] ([keyword param] [atom f32] [atom f64]) ([keyword result] [atom i32] [atom i64])',
+     '[keyword return_call] [variable-2 $func0]',
+     '[keyword return_call_indirect] ([keyword param] [atom f32] [atom f64]) ([keyword result] [atom i32] [atom i64])');
+
   MT('memory-instructions',
      '[keyword i32.load] [keyword offset]=[number 4] [keyword align]=[number 4]',
      '[keyword i32.load8_s] [keyword offset]=[number 4] [keyword align]=[number 4]',
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 9bda3d56fc..8c517a4985 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,7 +14,7 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call_indirect|call|drop|end|return|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory\.(size|grow)|type|func|param|result|local|global|module|table|memory|start|elem|data|align|offset|import|export|atomic\.notify|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(wait|load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))/, token: "keyword"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory\.(size|grow)|type|func|param|result|local|global|module|table|memory|start|elem|data|align|offset|import|export|atomic\.notify|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(wait|load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))/, token: "keyword"},
     {regex: /\b(anyfunc|[fi](32|64))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},

From 215c1dc644873190e3ad6aed77641017b10823e1 Mon Sep 17 00:00:00 2001
From: Ealton <longjdai@gmail.com>
Date: Tue, 16 Jun 2020 13:11:38 +0800
Subject: [PATCH 4259/4742] [real-world uses] Add Innovay Web Tools

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

diff --git a/doc/realworld.html b/doc/realworld.html
index b308b39adf..a08d754550 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -103,6 +103,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://megafonweblab.github.com/histone-javascript/">Histone template engine playground</a></li>
       <li><a href="http://www.homegenie.it/docs/automation_getstarted.php">Homegenie</a> (home automation server)</li>
       <li><a href="http://icecoder.net">ICEcoder</a> (web IDE)</li>
+      <li><a href="https://innovay.app/formatter/html">Innovay Web Tools</a> (HTML, JS, CSS code beautifier)</li>
       <li><a href="http://ipython.org/">IPython</a> (interactive computing shell)</li>
       <li><a href="https://joelpinheiro.github.io/itrading/">iTrading</a> (Algorithmic Trading)</li>
       <li><a href="http://i-mos.org/imos/">i-MOS</a> (modeling and simulation platform)</li>

From 001e07fcf8b2cbd7191906c5f963e0760d7cfcc9 Mon Sep 17 00:00:00 2001
From: BrianHung <brianhung@berkeley.edu>
Date: Thu, 18 Jun 2020 06:08:48 -0700
Subject: [PATCH 4260/4742] [runmode addon] Reuse existing support code for
 standalone/node versions of runmode

---
 .gitignore                                 |   3 +
 addon/runmode/runmode-standalone.js        | 164 -----------------
 addon/runmode/runmode.js                   |   9 +-
 addon/runmode/runmode.node.js              | 197 ---------------------
 demo/runmode-standalone.html               |  61 +++++++
 package.json                               |   7 +-
 rollup.config.js                           |  56 ++++--
 src/addon/runmode/codemirror-standalone.js |  20 +++
 src/addon/runmode/codemirror.node.js       |  19 ++
 src/addon/runmode/runmode-standalone.js    |   2 +
 src/addon/runmode/runmode.node.js          |   2 +
 11 files changed, 155 insertions(+), 385 deletions(-)
 delete mode 100644 addon/runmode/runmode-standalone.js
 delete mode 100644 addon/runmode/runmode.node.js
 create mode 100644 demo/runmode-standalone.html
 create mode 100644 src/addon/runmode/codemirror-standalone.js
 create mode 100644 src/addon/runmode/codemirror.node.js
 create mode 100644 src/addon/runmode/runmode-standalone.js
 create mode 100644 src/addon/runmode/runmode.node.js

diff --git a/.gitignore b/.gitignore
index 1767b6d833..f552109d20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
 .idea
 *.iml
 /lib/codemirror.js
+/addon/runmode/runmode-standalone.js 
+/addon/runmode/runmode.node.js
+**/.DS_Store
\ No newline at end of file
diff --git a/addon/runmode/runmode-standalone.js b/addon/runmode/runmode-standalone.js
deleted file mode 100644
index c339aa2bd3..0000000000
--- a/addon/runmode/runmode-standalone.js
+++ /dev/null
@@ -1,164 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
-
-var root = typeof globalThis !== 'undefined' ? globalThis : window;
-root.CodeMirror = {};
-
-(function() {
-"use strict";
-
-function splitLines(string){ return string.split(/\r?\n|\r/); };
-
-function StringStream(string, _tabSize, oracle) {
-  this.pos = this.start = 0;
-  this.string = string
-  this.oracle = oracle
-}
-StringStream.prototype = {
-  eol: function() {return this.pos >= this.string.length;},
-  sol: function() {return this.pos == 0;},
-  peek: function() {return this.string.charAt(this.pos) || null;},
-  next: function() {
-    if (this.pos < this.string.length)
-      return this.string.charAt(this.pos++);
-  },
-  eat: function(match) {
-    var ch = this.string.charAt(this.pos);
-    if (typeof match == "string") var ok = ch == match;
-    else var ok = ch && (match.test ? match.test(ch) : match(ch));
-    if (ok) {++this.pos; return ch;}
-  },
-  eatWhile: function(match) {
-    var start = this.pos;
-    while (this.eat(match)){}
-    return this.pos > start;
-  },
-  eatSpace: function() {
-    var start = this.pos;
-    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-    return this.pos > start;
-  },
-  skipToEnd: function() {this.pos = this.string.length;},
-  skipTo: function(ch) {
-    var found = this.string.indexOf(ch, this.pos);
-    if (found > -1) {this.pos = found; return true;}
-  },
-  backUp: function(n) {this.pos -= n;},
-  column: function() {return this.start - this.lineStart;},
-  indentation: function() {return 0;},
-  match: function(pattern, consume, caseInsensitive) {
-    if (typeof pattern == "string") {
-      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-      var substr = this.string.substr(this.pos, pattern.length);
-      if (cased(substr) == cased(pattern)) {
-        if (consume !== false) this.pos += pattern.length;
-        return true;
-      }
-    } else {
-      var match = this.string.slice(this.pos).match(pattern);
-      if (match && match.index > 0) return null;
-      if (match && consume !== false) this.pos += match[0].length;
-      return match;
-    }
-  },
-  current: function(){return this.string.slice(this.start, this.pos);},
-  hideFirstChars: function(n, inner) {
-    this.lineStart += n;
-    try { return inner(); }
-    finally { this.lineStart -= n; }
-  },
-  lookAhead: function(n) { return this.oracle && this.oracle.lookAhead(n) }
-};
-CodeMirror.StringStream = StringStream;
-
-CodeMirror.startState = function (mode, a1, a2) {
-  return mode.startState ? mode.startState(a1, a2) : true;
-};
-
-var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-CodeMirror.defineMode = function (name, mode) {
-  if (arguments.length > 2)
-    mode.dependencies = Array.prototype.slice.call(arguments, 2);
-  modes[name] = mode;
-};
-CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
-CodeMirror.resolveMode = function(spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-    spec = mimeModes[spec];
-  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-    spec = mimeModes[spec.name];
-  }
-  if (typeof spec == "string") return {name: spec};
-  else return spec || {name: "null"};
-};
-CodeMirror.getMode = function (options, spec) {
-  spec = CodeMirror.resolveMode(spec);
-  var mfactory = modes[spec.name];
-  if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, spec);
-};
-CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min;
-CodeMirror.defineMode("null", function() {
-  return {token: function(stream) {stream.skipToEnd();}};
-});
-CodeMirror.defineMIME("text/plain", "null");
-
-CodeMirror.runMode = function (string, modespec, callback, options) {
-  var mode = CodeMirror.getMode({ indentUnit: 2 }, modespec);
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
-
-  if (callback.appendChild) {
-    var tabSize = (options && options.tabSize) || 4;
-    var node = callback, col = 0;
-    node.innerHTML = "";
-    callback = function (text, style) {
-      if (text == "\n") {
-        // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.
-        // Emitting a carriage return makes everything ok.
-        node.appendChild(document.createTextNode(ie_lt9 ? '\r' : text));
-        col = 0;
-        return;
-      }
-      var content = "";
-      // replace tabs
-      for (var pos = 0; ;) {
-        var idx = text.indexOf("\t", pos);
-        if (idx == -1) {
-          content += text.slice(pos);
-          col += text.length - pos;
-          break;
-        } else {
-          col += idx - pos;
-          content += text.slice(pos, idx);
-          var size = tabSize - col % tabSize;
-          col += size;
-          for (var i = 0; i < size; ++i) content += " ";
-          pos = idx + 1;
-        }
-      }
-
-      if (style) {
-        var sp = node.appendChild(document.createElement("span"));
-        sp.className = "cm-" + style.replace(/ +/g, " cm-");
-        sp.appendChild(document.createTextNode(content));
-      } else {
-        node.appendChild(document.createTextNode(content));
-      }
-    };
-  }
-
-  var lines = splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
-  var oracle = {lookAhead: function(n) { return lines[i + n] }}
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines[i], tabSize, oracle);
-    if (!stream.string && mode.blankLine) mode.blankLine(state);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
-})();
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index ca8d9a9c79..2cae68635d 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -13,11 +13,12 @@
 
 CodeMirror.runMode = function(string, modespec, callback, options) {
   var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
+  var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
 
+  // Create a tokenizing callback function if passed-in callback is a DOM element.
   if (callback.appendChild) {
-    var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
+    var ie = /MSIE \d/.test(navigator.userAgent);
+    var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
     var node = callback, col = 0;
     node.innerHTML = "";
     callback = function(text, style) {
@@ -45,7 +46,7 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
           pos = idx + 1;
         }
       }
-
+      // Create a node with token style and append it to the callback DOM element.
       if (style) {
         var sp = node.appendChild(document.createElement("span"));
         sp.className = "cm-" + style.replace(/ +/g, " cm-");
diff --git a/addon/runmode/runmode.node.js b/addon/runmode/runmode.node.js
deleted file mode 100644
index 53b6994c28..0000000000
--- a/addon/runmode/runmode.node.js
+++ /dev/null
@@ -1,197 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
-
-/* Just enough of CodeMirror to run runMode under node.js */
-
-function splitLines(string){return string.split(/\r\n?|\n/);};
-
-// Counts the column offset in a string, taking tabs into account.
-// Used mostly to find indentation.
-var countColumn = exports.countColumn = function(string, end, tabSize, startIndex, startValue) {
-  if (end == null) {
-    end = string.search(/[^\s\u00a0]/);
-    if (end == -1) end = string.length;
-  }
-  for (var i = startIndex || 0, n = startValue || 0;;) {
-    var nextTab = string.indexOf("\t", i);
-    if (nextTab < 0 || nextTab >= end)
-      return n + (end - i);
-    n += nextTab - i;
-    n += tabSize - (n % tabSize);
-    i = nextTab + 1;
-  }
-};
-
-function StringStream(string, tabSize, context) {
-  this.pos = this.start = 0;
-  this.string = string;
-  this.tabSize = tabSize || 8;
-  this.lastColumnPos = this.lastColumnValue = 0;
-  this.lineStart = 0;
-  this.context = context
-};
-
-StringStream.prototype = {
-  eol: function() {return this.pos >= this.string.length;},
-  sol: function() {return this.pos == this.lineStart;},
-  peek: function() {return this.string.charAt(this.pos) || undefined;},
-  next: function() {
-    if (this.pos < this.string.length)
-      return this.string.charAt(this.pos++);
-  },
-  eat: function(match) {
-    var ch = this.string.charAt(this.pos);
-    if (typeof match == "string") var ok = ch == match;
-    else var ok = ch && (match.test ? match.test(ch) : match(ch));
-    if (ok) {++this.pos; return ch;}
-  },
-  eatWhile: function(match) {
-    var start = this.pos;
-    while (this.eat(match)){}
-    return this.pos > start;
-  },
-  eatSpace: function() {
-    var start = this.pos;
-    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-    return this.pos > start;
-  },
-  skipToEnd: function() {this.pos = this.string.length;},
-  skipTo: function(ch) {
-    var found = this.string.indexOf(ch, this.pos);
-    if (found > -1) {this.pos = found; return true;}
-  },
-  backUp: function(n) {this.pos -= n;},
-  column: function() {
-    if (this.lastColumnPos < this.start) {
-      this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
-      this.lastColumnPos = this.start;
-    }
-    return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-  },
-  indentation: function() {
-    return countColumn(this.string, null, this.tabSize) -
-      (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-  },
-  match: function(pattern, consume, caseInsensitive) {
-    if (typeof pattern == "string") {
-      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-      var substr = this.string.substr(this.pos, pattern.length);
-      if (cased(substr) == cased(pattern)) {
-        if (consume !== false) this.pos += pattern.length;
-        return true;
-      }
-    } else {
-      var match = this.string.slice(this.pos).match(pattern);
-      if (match && match.index > 0) return null;
-      if (match && consume !== false) this.pos += match[0].length;
-      return match;
-    }
-  },
-  current: function(){return this.string.slice(this.start, this.pos);},
-  hideFirstChars: function(n, inner) {
-    this.lineStart += n;
-    try { return inner(); }
-    finally { this.lineStart -= n; }
-  },
-  lookAhead: function(n) {
-    var line = this.context.line + n
-    return line >= this.context.lines.length ? null : this.context.lines[line]
-  }
-};
-exports.StringStream = StringStream;
-
-exports.startState = function(mode, a1, a2) {
-  return mode.startState ? mode.startState(a1, a2) : true;
-};
-
-var modes = exports.modes = {}, mimeModes = exports.mimeModes = {};
-exports.defineMode = function(name, mode) {
-  if (arguments.length > 2)
-    mode.dependencies = Array.prototype.slice.call(arguments, 2);
-  modes[name] = mode;
-};
-exports.defineMIME = function(mime, spec) { mimeModes[mime] = spec; };
-
-exports.defineMode("null", function() {
-  return {token: function(stream) {stream.skipToEnd();}};
-});
-exports.defineMIME("text/plain", "null");
-
-exports.resolveMode = function(spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-    spec = mimeModes[spec];
-  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-    spec = mimeModes[spec.name];
-  }
-  if (typeof spec == "string") return {name: spec};
-  else return spec || {name: "null"};
-};
-
-function copyObj(obj, target, overwrite) {
-  if (!target) target = {};
-  for (var prop in obj)
-    if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
-      target[prop] = obj[prop];
-  return target;
-}
-
-// This can be used to attach properties to mode objects from
-// outside the actual mode definition.
-var modeExtensions = exports.modeExtensions = {};
-exports.extendMode = function(mode, properties) {
-  var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-  copyObj(properties, exts);
-};
-
-exports.getMode = function(options, spec) {
-  var spec = exports.resolveMode(spec);
-  var mfactory = modes[spec.name];
-  if (!mfactory) return exports.getMode(options, "text/plain");
-  var modeObj = mfactory(options, spec);
-  if (modeExtensions.hasOwnProperty(spec.name)) {
-    var exts = modeExtensions[spec.name];
-    for (var prop in exts) {
-      if (!exts.hasOwnProperty(prop)) continue;
-      if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
-      modeObj[prop] = exts[prop];
-    }
-  }
-  modeObj.name = spec.name;
-  if (spec.helperType) modeObj.helperType = spec.helperType;
-  if (spec.modeProps) for (var prop in spec.modeProps)
-    modeObj[prop] = spec.modeProps[prop];
-
-  return modeObj;
-};
-
-exports.innerMode = function(mode, state) {
-  var info;
-  while (mode.innerMode) {
-    info = mode.innerMode(state);
-    if (!info || info.mode == mode) break;
-    state = info.state;
-    mode = info.mode;
-  }
-  return info || {mode: mode, state: state};
-}
-
-exports.registerHelper = exports.registerGlobalHelper = Math.min;
-
-exports.runMode = function(string, modespec, callback, options) {
-  var mode = exports.getMode({indentUnit: 2}, modespec);
-  var lines = splitLines(string), state = (options && options.state) || exports.startState(mode);
-  var context = {lines: lines, line: 0}
-  for (var i = 0, e = lines.length; i < e; ++i, ++context.line) {
-    if (i) callback("\n");
-    var stream = new exports.StringStream(lines[i], 4, context);
-    if (!stream.string && mode.blankLine) mode.blankLine(state);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
-
-require.cache[require.resolve("../../lib/codemirror")] = require.cache[require.resolve("./runmode.node")];
-require.cache[require.resolve("../../addon/runmode/runmode")] = require.cache[require.resolve("./runmode.node")];
diff --git a/demo/runmode-standalone.html b/demo/runmode-standalone.html
new file mode 100644
index 0000000000..f3503b98d8
--- /dev/null
+++ b/demo/runmode-standalone.html
@@ -0,0 +1,61 @@
+<!doctype html>
+
+<title>CodeMirror: Mode Runner Demo</title>
+<meta charset="utf-8"/>
+<link rel=stylesheet href="../doc/docs.css">
+
+<link rel="stylesheet" href="../lib/codemirror.css">
+<script src="../addon/runmode/runmode-standalone.js"></script>
+<script src="../mode/xml/xml.js"></script>
+<div id=nav>
+  <a href="https://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 class=active href="#">Mode Runner</a>
+  </ul>
+</div>
+
+<article>
+<h2>Mode Runner Demo</h2>
+
+
+    <textarea id="code" style="width: 90%; height: 7em; border: 1px solid black; padding: .2em .4em;">
+<foobar>
+  <blah>Enter your xml here and press the button below to display
+    it as highlighted by the CodeMirror XML mode</blah>
+  <tag2 foo="2" bar="&amp;quot;bar&amp;quot;"/>
+</foobar></textarea><br>
+    <button onclick="doHighlight();">Highlight!</button>
+    <pre id="output" class="cm-s-default"></pre>
+
+    <script>
+function doHighlight() {
+  CodeMirror.runMode(document.getElementById("code").value, "application/xml",
+                     document.getElementById("output"));
+}
+</script>
+
+    <p>Running a CodeMirror mode outside of the editor.
+    The <code>CodeMirror.runMode</code> function, defined
+    in <code><a href="../addon/runmode/runmode.js">addon/runmode/runmode.js</a></code> takes the following arguments:</p>
+
+    <dl>
+      <dt><code>text (string)</code></dt>
+      <dd>The document to run through the highlighter.</dd>
+      <dt><code>mode (<a href="../doc/manual.html#option_mode">mode spec</a>)</code></dt>
+      <dd>The mode to use (must be loaded as normal).</dd>
+      <dt><code>output (function or DOM node)</code></dt>
+      <dd>If this is a function, it will be called for each token with
+      two arguments, the token's text and the token's style class (may
+      be <code>null</code> for unstyled tokens). If it is a DOM node,
+      the tokens will be converted to <code>span</code> elements as in
+      an editor, and inserted into the node
+      (through <code>innerHTML</code>).</dd>
+    </dl>
+
+  </article>
diff --git a/package.json b/package.json
index 7956d37b97..f784cea808 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,11 @@
     "lint": "bin/lint"
   },
   "devDependencies": {
+    "@rollup/plugin-buble": "^0.21.3",
     "blint": "^1.1.0",
     "node-static": "0.7.11",
     "puppeteer": "^1.20.0",
-    "rollup": "^1.26.3",
-    "rollup-plugin-buble": "^0.19.8"
+    "rollup": "^1.26.3"
   },
   "bugs": "http://github.com/codemirror/CodeMirror/issues",
   "keywords": [
@@ -42,5 +42,6 @@
     "directories": {},
     "dependencies": {},
     "devDependencies": {}
-  }
+  },
+  "dependencies": {}
 }
diff --git a/rollup.config.js b/rollup.config.js
index fbb4357175..88c94411f8 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,20 +1,42 @@
-import buble from 'rollup-plugin-buble';
+import buble from '@rollup/plugin-buble';
 
-export default {
-  input: "src/codemirror.js",
-  output: {
-    banner: `// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+export default [
+  {
+    input: "src/codemirror.js",
+    output: {
+      banner: `// CodeMirror, copyright (c) by Marijn Haverbeke and others
+  // Distributed under an MIT license: https://codemirror.net/LICENSE
 
-// This is CodeMirror (https://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-`,
-    format: "umd",
-    file: "lib/codemirror.js",
-    name: "CodeMirror"
+  // This is CodeMirror (https://codemirror.net), a code editor
+  // implemented in JavaScript on top of the browser's DOM.
+  //
+  // You can find some technical background for some of the code below
+  // at http://marijnhaverbeke.nl/blog/#cm-internals .
+  `,
+      format: "umd",
+      file: "lib/codemirror.js",
+      name: "CodeMirror"
+    },
+    plugins: [ buble({namedFunctionExpressions: false}) ]
   },
-  plugins: [ buble({namedFunctionExpressions: false}) ]
-};
+  {
+    input: ["src/addon/runmode/runmode-standalone.js"],
+    output: {
+      format: "iife",
+      file: "addon/runmode/runmode-standalone.js",
+      name: "CodeMirror",
+      freeze: false, // IE8 doesn't support Object.freeze.
+    },
+    plugins: [ buble({namedFunctionExpressions: false}) ]
+  },
+  {
+    input: ["src/addon/runmode/runmode.node.js"],
+    output: {
+      format: "cjs",
+      file: "addon/runmode/runmode.node.js",
+      name: "CodeMirror",
+      freeze: false, // IE8 doesn't support Object.freeze.
+    },
+    plugins: [ buble({namedFunctionExpressions: false}) ]
+  },
+];
diff --git a/src/addon/runmode/codemirror-standalone.js b/src/addon/runmode/codemirror-standalone.js
new file mode 100644
index 0000000000..bb246c9b9f
--- /dev/null
+++ b/src/addon/runmode/codemirror-standalone.js
@@ -0,0 +1,20 @@
+import StringStream from "../../util/StringStream.js"
+import * as modeMethods from "../../modes.js"
+
+// Create a minimal CodeMirror needed to use runMode, and assign to root.
+var root = typeof globalThis !== 'undefined' ? globalThis : window
+root.CodeMirror = {}
+
+// Copy StringStream and mode methods into CodeMirror object.
+CodeMirror.StringStream = StringStream
+for (var exported in modeMethods) CodeMirror[exported] = modeMethods[exported]
+
+// Minimal default mode.
+CodeMirror.defineMode("null", () => ({token: stream => stream.skipToEnd()}))
+CodeMirror.defineMIME("text/plain", "null")
+
+CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min
+CodeMirror.splitLines = function(string) { return string.split(/\r?\n|\r/); }
+
+CodeMirror.defaults = { indentUnit: 2 }
+export default CodeMirror;
\ No newline at end of file
diff --git a/src/addon/runmode/codemirror.node.js b/src/addon/runmode/codemirror.node.js
new file mode 100644
index 0000000000..11a142eee0
--- /dev/null
+++ b/src/addon/runmode/codemirror.node.js
@@ -0,0 +1,19 @@
+import StringStream from "../../util/StringStream.js"
+import * as modeMethods from "../../modes.js"
+
+// Copy StringStream and mode methods into exports (CodeMirror) object.
+exports.StringStream = StringStream
+for (var exported in modeMethods) exports[exported] = modeMethods[exported]
+
+// Shim library CodeMirror with the minimal CodeMirror defined above. 
+require.cache[require.resolve("../../lib/codemirror")] = require.cache[require.resolve("./runmode.node")]
+require.cache[require.resolve("../../addon/runmode/runmode")] = require.cache[require.resolve("./runmode.node")]
+
+// Minimal default mode.
+exports.defineMode("null", () => ({token: stream => stream.skipToEnd()}))
+exports.defineMIME("text/plain", "null")
+
+exports.registerHelper = exports.registerGlobalHelper = Math.min
+exports.splitLines = function(string) { return string.split(/\r?\n|\r/); }
+
+exports.defaults = { indentUnit: 2 }
\ No newline at end of file
diff --git a/src/addon/runmode/runmode-standalone.js b/src/addon/runmode/runmode-standalone.js
new file mode 100644
index 0000000000..0d7aa6bb2c
--- /dev/null
+++ b/src/addon/runmode/runmode-standalone.js
@@ -0,0 +1,2 @@
+import "./codemirror-standalone.js"
+import "../../../addon/runmode/runmode.js"
\ No newline at end of file
diff --git a/src/addon/runmode/runmode.node.js b/src/addon/runmode/runmode.node.js
new file mode 100644
index 0000000000..4f2ed817f8
--- /dev/null
+++ b/src/addon/runmode/runmode.node.js
@@ -0,0 +1,2 @@
+import "./codemirror.node.js"
+import "../../../addon/runmode/runmode.js"
\ No newline at end of file

From f87e1181c092bd01dc9acb9e91745fa97c9360e6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 18 Jun 2020 15:07:36 +0200
Subject: [PATCH 4261/4742] [runmode.node addon] Export countColumn again

---
 src/addon/runmode/codemirror.node.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/addon/runmode/codemirror.node.js b/src/addon/runmode/codemirror.node.js
index 11a142eee0..f3b5fa6e0e 100644
--- a/src/addon/runmode/codemirror.node.js
+++ b/src/addon/runmode/codemirror.node.js
@@ -1,8 +1,10 @@
 import StringStream from "../../util/StringStream.js"
 import * as modeMethods from "../../modes.js"
+import {countColumn} from "../../util/misc.js"
 
 // Copy StringStream and mode methods into exports (CodeMirror) object.
 exports.StringStream = StringStream
+exports.countColumn = countColumn
 for (var exported in modeMethods) exports[exported] = modeMethods[exported]
 
 // Shim library CodeMirror with the minimal CodeMirror defined above. 
@@ -16,4 +18,4 @@ exports.defineMIME("text/plain", "null")
 exports.registerHelper = exports.registerGlobalHelper = Math.min
 exports.splitLines = function(string) { return string.split(/\r?\n|\r/); }
 
-exports.defaults = { indentUnit: 2 }
\ No newline at end of file
+exports.defaults = { indentUnit: 2 }

From 6bb912b3e2b518806c28a00082df0a60c062c1bb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 18 Jun 2020 15:13:27 +0200
Subject: [PATCH 4262/4742] [runmode addon] Fix lint issues

---
 rollup.config.js                           | 14 +++++++-------
 src/addon/runmode/codemirror-standalone.js |  6 ++++--
 src/addon/runmode/codemirror.node.js       |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/rollup.config.js b/rollup.config.js
index 88c94411f8..f50f62fae2 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -5,14 +5,14 @@ export default [
     input: "src/codemirror.js",
     output: {
       banner: `// CodeMirror, copyright (c) by Marijn Haverbeke and others
-  // Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/LICENSE
 
-  // This is CodeMirror (https://codemirror.net), a code editor
-  // implemented in JavaScript on top of the browser's DOM.
-  //
-  // You can find some technical background for some of the code below
-  // at http://marijnhaverbeke.nl/blog/#cm-internals .
-  `,
+// This is CodeMirror (https://codemirror.net), a code editor
+// implemented in JavaScript on top of the browser's DOM.
+//
+// You can find some technical background for some of the code below
+// at http://marijnhaverbeke.nl/blog/#cm-internals .
+`,
       format: "umd",
       file: "lib/codemirror.js",
       name: "CodeMirror"
diff --git a/src/addon/runmode/codemirror-standalone.js b/src/addon/runmode/codemirror-standalone.js
index bb246c9b9f..b463a5cf59 100644
--- a/src/addon/runmode/codemirror-standalone.js
+++ b/src/addon/runmode/codemirror-standalone.js
@@ -1,6 +1,8 @@
 import StringStream from "../../util/StringStream.js"
 import * as modeMethods from "../../modes.js"
 
+// declare global: globalThis, CodeMirror
+
 // Create a minimal CodeMirror needed to use runMode, and assign to root.
 var root = typeof globalThis !== 'undefined' ? globalThis : window
 root.CodeMirror = {}
@@ -14,7 +16,7 @@ CodeMirror.defineMode("null", () => ({token: stream => stream.skipToEnd()}))
 CodeMirror.defineMIME("text/plain", "null")
 
 CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min
-CodeMirror.splitLines = function(string) { return string.split(/\r?\n|\r/); }
+CodeMirror.splitLines = function(string) { return string.split(/\r?\n|\r/) }
 
 CodeMirror.defaults = { indentUnit: 2 }
-export default CodeMirror;
\ No newline at end of file
+export default CodeMirror
diff --git a/src/addon/runmode/codemirror.node.js b/src/addon/runmode/codemirror.node.js
index f3b5fa6e0e..58efc5286b 100644
--- a/src/addon/runmode/codemirror.node.js
+++ b/src/addon/runmode/codemirror.node.js
@@ -7,7 +7,7 @@ exports.StringStream = StringStream
 exports.countColumn = countColumn
 for (var exported in modeMethods) exports[exported] = modeMethods[exported]
 
-// Shim library CodeMirror with the minimal CodeMirror defined above. 
+// Shim library CodeMirror with the minimal CodeMirror defined above.
 require.cache[require.resolve("../../lib/codemirror")] = require.cache[require.resolve("./runmode.node")]
 require.cache[require.resolve("../../addon/runmode/runmode")] = require.cache[require.resolve("./runmode.node")]
 
@@ -16,6 +16,6 @@ exports.defineMode("null", () => ({token: stream => stream.skipToEnd()}))
 exports.defineMIME("text/plain", "null")
 
 exports.registerHelper = exports.registerGlobalHelper = Math.min
-exports.splitLines = function(string) { return string.split(/\r?\n|\r/); }
+exports.splitLines = function(string) { return string.split(/\r?\n|\r/) }
 
 exports.defaults = { indentUnit: 2 }

From ddb3334726d8e265f4dec3d6b59baf8d9c9d0d75 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 21 Jun 2020 15:17:59 +0200
Subject: [PATCH 4263/4742] [closetag addon] Make whenClosing/whenOpening
 properly default to true

Closes #6322
---
 addon/edit/closetag.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index b8cbf95089..8689765eec 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -40,9 +40,9 @@
       cm.removeKeyMap("autoCloseTags");
     if (!val) return;
     var map = {name: "autoCloseTags"};
-    if (typeof val != "object" || val.whenClosing)
+    if (typeof val != "object" || val.whenClosing !== false)
       map["'/'"] = function(cm) { return autoCloseSlash(cm); };
-    if (typeof val != "object" || val.whenOpening)
+    if (typeof val != "object" || val.whenOpening !== false)
       map["'>'"] = function(cm) { return autoCloseGT(cm); };
     cm.addKeyMap(map);
   });

From 41077c866c65c9c905f662306a67d54a7cf56d85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 21 Jun 2020 15:40:04 +0200
Subject: [PATCH 4264/4742] Mark version 5.55.0

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 20 ++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 13 +++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f5b5d7a6b6..f041a0572a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -235,6 +235,7 @@ Dror BG
 Duncan Lilley
 duralog
 dwelle
+Ealton
 eborden
 edoroshenko
 edsharp
@@ -347,6 +348,7 @@ Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
 Ivoah
+Jack Douglas
 Jacob Lee
 Jaimin
 Jake Peyser
@@ -756,6 +758,7 @@ Shiv Deepak
 Shmuel Englard
 Shubham Jain
 Siamak Mokhtari
+Siddhartha Gunti
 silverwind
 Simon Edwards
 sinkuu
@@ -870,6 +873,7 @@ Yuvi Panda
 Yvonnick Esnault
 Zac Anger
 Zachary Dremann
+ZeeshanNoor
 Zeno Rocha
 Zhang Hao
 Ziv
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a445dd913a..b87340b524 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.55.0 (2020-05-20)
+
+### Bug fixes
+
+The editor no longer overrides the rendering of zero-width joiners (allowing combined emoji to be shown).
+
+[vim bindings](https://codemirror.net/demo/vim.html): Fix an issue where the `vim-mode-change` event was fired twice.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Only allow `-->`-style comments at the start of a line.
+
+[julia mode](https://codemirror.net/mode/julia/): Improve indentation.
+
+[pascal mode](https://codemirror.net/mode/pascal/index.html): Recognize curly bracket comments.
+
+[runmode addon](https://codemirror.net/doc/manual.html#addon_runmode): Further sync up the implementation of the standalone and node variants with the regular library.
+
+### New features
+
+[loadmode addon](https://codemirror.net/doc/manual.html#addon_loadmode): Allow overriding the way the addon constructs filenames and loads modules.
+
 ## 5.54.0 (2020-05-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index e85ec25b66..8f42eeff60 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -69,7 +69,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.54.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.55.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 75384de760..fd02a7fbd9 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,19 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-06-2020: <a href="https://codemirror.net/codemirror-5.55.0.zip">Version 5.55.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>The editor no longer overrides the rendering of zero-width joiners (allowing combined emoji to be shown).</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix an issue where the <code>vim-mode-change</code> event was fired twice.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Only allow <code>--&gt;</code>-style comments at the start of a line.</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Improve indentation.</li>
+    <li><a href="https://codemirror.net/mode/pascal/index.html">pascal mode</a>: Recognize curly bracket comments.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_runmode">runmode addon</a>: Further sync up the implementation of the standalone and node variants with the regular library.</li>
+    <li><h3 id="new-features">New features</h3></li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_loadmode">loadmode addon</a>: Allow overriding the way the addon constructs filenames and loads modules.</li>
+  </ul>
+
   <p class="rel">20-05-2020: <a href="https://codemirror.net/codemirror-5.54.0.zip">Version 5.54.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 59cac746fd..520fce4ec2 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.54.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.55.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index f784cea808..dcffa6d998 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.54.0",
+  "version": "5.55.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index e15243a415..04efb81564 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.54.0"
+CodeMirror.version = "5.55.0"

From dfb497cb797667850f1908bcc57cfe6a2c8c1e39 Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <bmeurer@google.com>
Date: Mon, 22 Jun 2020 21:08:44 +0200
Subject: [PATCH 4265/4742] [wast mode] Rename atomic.notify and *.atomic.wait

Refs: WebAssembly/threads#149
---
 mode/wast/test.js | 6 +++---
 mode/wast/wast.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index a8097768a7..f167087f63 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -72,9 +72,9 @@
      '[keyword f64.store] [keyword offset]=[number 4] [keyword align]=[number 4]');
 
   MT('atomic-memory-instructions',
-     '[keyword atomic.notify] [keyword offset]=[number 32] [keyword align]=[number 4]',
-     '[keyword i32.atomic.wait] [keyword offset]=[number 32] [keyword align]=[number 4]',
-     '[keyword i64.atomic.wait] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword memory.atomic.notify] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword memory.atomic.wait32] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword memory.atomic.wait64] [keyword offset]=[number 32] [keyword align]=[number 4]',
      '[keyword i32.atomic.load] [keyword offset]=[number 32] [keyword align]=[number 4]',
      '[keyword i32.atomic.load8_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
      '[keyword i32.atomic.load16_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 8c517a4985..a0112a5176 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,7 +14,7 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory\.(size|grow)|type|func|param|result|local|global|module|table|memory|start|elem|data|align|offset|import|export|atomic\.notify|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(wait|load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))/, token: "keyword"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))/, token: "keyword"},
     {regex: /\b(anyfunc|[fi](32|64))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},

From c0120793f1e9986b631411b6112e207866d3db81 Mon Sep 17 00:00:00 2001
From: Ng Zhi An <zhin@google.com>
Date: Fri, 26 Jun 2020 11:57:14 -0700
Subject: [PATCH 4266/4742] [wast mode] Support some Wasm SIMD instructions

These keywords can be found at
https://github.com/WebAssembly/simd/blob/master/proposals/simd/BinarySIMD.md.
---
 mode/wast/test.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++
 mode/wast/wast.js |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index f167087f63..b6ee52a60e 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -138,4 +138,59 @@
      '[keyword i64.atomic.rmw8.cmpxchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
      '[keyword i64.atomic.rmw16.cmpxchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]',
      '[keyword i64.atomic.rmw32.cmpxchg_u] [keyword offset]=[number 32] [keyword align]=[number 4]');
+
+  MT('simd-instructions',
+     '[keyword v128.load] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword v128.store] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword v128.const] [number 0] [number 1] [number 2] [number 3] [number 4] [number 5] [number 6] [number 7] [number 8] [number 9] [number 10] [number 11] [number 12] [number 13] [number 14] [number 15]',
+     '[keyword i8x16.splat]',
+     '[keyword i16x8.splat]',
+     '[keyword i32x4.splat]',
+     '[keyword i64x2.splat]',
+     '[keyword f32x4.splat]',
+     '[keyword f64x2.splat]',
+     '[keyword i8x16.extract_lane_s] [number 1]',
+     '[keyword i8x16.extract_lane_u] [number 1]',
+     '[keyword i8x16.replace_lane] [number 1]',
+     '[keyword i16x8.extract_lane_s] [number 1]',
+     '[keyword i16x8.extract_lane_u] [number 1]',
+     '[keyword i16x8.replace_lane] [number 1]',
+     '[keyword i32x4.extract_lane] [number 1]',
+     '[keyword i32x4.replace_lane] [number 1]',
+     '[keyword i64x2.extract_lane] [number 1]',
+     '[keyword i64x2.replace_lane] [number 1]',
+     '[keyword f32x4.extract_lane] [number 1]',
+     '[keyword f32x4.replace_lane] [number 1]',
+     '[keyword f64x2.extract_lane] [number 1]',
+     '[keyword f64x2.replace_lane] [number 1]',
+     '[keyword v128.not]',
+     '[keyword v128.andnot]',
+     '[keyword v128.and]',
+     '[keyword v128.or]',
+     '[keyword v128.xor]',
+     '[keyword v128.bitselect]',
+     '[keyword i8x16.neg]',
+     '[keyword i8x16.shl]',
+     '[keyword i8x16.shr_s]',
+     '[keyword i8x16.shr_u]',
+     '[keyword i8x16.add]',
+     '[keyword i8x16.sub]',
+     '[keyword i16x8.add]',
+     '[keyword i16x8.neg]',
+     '[keyword i16x8.shl]',
+     '[keyword i16x8.shr_s]',
+     '[keyword i16x8.shr_u]',
+     '[keyword i16x8.sub]',
+     '[keyword i32x4.add]',
+     '[keyword i32x4.neg]',
+     '[keyword i32x4.shl]',
+     '[keyword i32x4.shr_s]',
+     '[keyword i32x4.shr_u]',
+     '[keyword i32x4.sub]',
+     '[keyword i64x2.add]',
+     '[keyword i64x2.neg]',
+     '[keyword i64x2.shl]',
+     '[keyword i64x2.shr_s]',
+     '[keyword i64x2.shr_u]',
+     '[keyword i64x2.sub]');
 })();
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index a0112a5176..7d3d111f5f 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,7 +14,7 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))/, token: "keyword"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8)\.extract_lane_[su]|[fi](32x4|64x2)\.extract_lane/, token: "keyword"},
     {regex: /\b(anyfunc|[fi](32|64))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},

From 4a36584eacad26521adddc468cd0f741cf2d0aa2 Mon Sep 17 00:00:00 2001
From: Ng Zhi An <zhin@google.com>
Date: Fri, 26 Jun 2020 14:07:27 -0700
Subject: [PATCH 4267/4742] [wast mode] Add more SIMD instructions

This adds all comparison (eq, ne, lt, gt, le, ge), and v8x16.shuffle and
v8x16.swizzle.

Full list of instructions found at:
https://github.com/WebAssembly/simd/blob/master/proposals/simd/BinarySIMD.md

The ordering in the test file follows this the ordering in the binary
form. The regex ordering is more arbitrary due to grouping.
---
 mode/wast/test.js | 44 ++++++++++++++++++++++++++++++++++++++++++++
 mode/wast/wast.js |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index b6ee52a60e..1812b115ec 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -143,6 +143,8 @@
      '[keyword v128.load] [keyword offset]=[number 32] [keyword align]=[number 4]',
      '[keyword v128.store] [keyword offset]=[number 32] [keyword align]=[number 4]',
      '[keyword v128.const] [number 0] [number 1] [number 2] [number 3] [number 4] [number 5] [number 6] [number 7] [number 8] [number 9] [number 10] [number 11] [number 12] [number 13] [number 14] [number 15]',
+     '[keyword v8x16.shuffle] [number 0] [number 1] [number 2] [number 3] [number 4] [number 5] [number 6] [number 7] [number 8] [number 9] [number 10] [number 11] [number 12] [number 13] [number 14] [number 15]',
+     '[keyword v8x16.swizzle]',
      '[keyword i8x16.splat]',
      '[keyword i16x8.splat]',
      '[keyword i32x4.splat]',
@@ -163,6 +165,48 @@
      '[keyword f32x4.replace_lane] [number 1]',
      '[keyword f64x2.extract_lane] [number 1]',
      '[keyword f64x2.replace_lane] [number 1]',
+     '[keyword i8x16.eq]',
+     '[keyword i8x16.ne]',
+     '[keyword i8x16.lt_s]',
+     '[keyword i8x16.lt_u]',
+     '[keyword i8x16.gt_s]',
+     '[keyword i8x16.gt_u]',
+     '[keyword i8x16.le_s]',
+     '[keyword i8x16.le_u]',
+     '[keyword i8x16.ge_s]',
+     '[keyword i8x16.ge_u]',
+     '[keyword i16x8.eq]',
+     '[keyword i16x8.ne]',
+     '[keyword i16x8.lt_s]',
+     '[keyword i16x8.lt_u]',
+     '[keyword i16x8.gt_s]',
+     '[keyword i16x8.gt_u]',
+     '[keyword i16x8.le_s]',
+     '[keyword i16x8.le_u]',
+     '[keyword i16x8.ge_s]',
+     '[keyword i16x8.ge_u]',
+     '[keyword i32x4.eq]',
+     '[keyword i32x4.ne]',
+     '[keyword i32x4.lt_s]',
+     '[keyword i32x4.lt_u]',
+     '[keyword i32x4.gt_s]',
+     '[keyword i32x4.gt_u]',
+     '[keyword i32x4.le_s]',
+     '[keyword i32x4.le_u]',
+     '[keyword i32x4.ge_s]',
+     '[keyword i32x4.ge_u]',
+     '[keyword f32x4.eq]',
+     '[keyword f32x4.ne]',
+     '[keyword f32x4.lt]',
+     '[keyword f32x4.gt]',
+     '[keyword f32x4.le]',
+     '[keyword f32x4.ge]',
+     '[keyword f64x2.eq]',
+     '[keyword f64x2.ne]',
+     '[keyword f64x2.lt]',
+     '[keyword f64x2.gt]',
+     '[keyword f64x2.le]',
+     '[keyword f64x2.ge]',
      '[keyword v128.not]',
      '[keyword v128.andnot]',
      '[keyword v128.and]',
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 7d3d111f5f..90bf57fc46 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,7 +14,7 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8)\.extract_lane_[su]|[fi](32x4|64x2)\.extract_lane/, token: "keyword"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8)\.extract_lane_[su]|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te])|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)/, token: "keyword"},
     {regex: /\b(anyfunc|[fi](32|64))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},

From cab432b243cd0c505bf384ee93b8350de778aa75 Mon Sep 17 00:00:00 2001
From: Ng Zhi An <zhin@google.com>
Date: Fri, 26 Jun 2020 15:00:42 -0700
Subject: [PATCH 4268/4742] [wast mode] Add more SIMD instructions

Some arithmetic instructions, had to shuffle the regex a bit so that we
will attempt to match i8x16.add_saturate_s first before i8x16.add.

Full list available at:
https://github.com/WebAssembly/simd/blob/master/proposals/simd/BinarySIMD.md
---
 mode/wast/test.js | 40 +++++++++++++++++++++++++++++++++++++++-
 mode/wast/wast.js |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index 1812b115ec..5cc12e29c2 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -201,36 +201,74 @@
      '[keyword f32x4.gt]',
      '[keyword f32x4.le]',
      '[keyword f32x4.ge]',
+     '[keyword f32x4.abs]',
+     '[keyword f32x4.neg]',
      '[keyword f64x2.eq]',
      '[keyword f64x2.ne]',
      '[keyword f64x2.lt]',
      '[keyword f64x2.gt]',
      '[keyword f64x2.le]',
      '[keyword f64x2.ge]',
+     '[keyword f64x2.abs]',
+     '[keyword f64x2.neg]',
      '[keyword v128.not]',
      '[keyword v128.andnot]',
      '[keyword v128.and]',
      '[keyword v128.or]',
      '[keyword v128.xor]',
      '[keyword v128.bitselect]',
+     '[keyword i8x16.abs]',
      '[keyword i8x16.neg]',
+     '[keyword i8x16.any_true]',
+     '[keyword i8x16.all_true]',
+     '[keyword i8x16.bitmask]',
      '[keyword i8x16.shl]',
      '[keyword i8x16.shr_s]',
      '[keyword i8x16.shr_u]',
      '[keyword i8x16.add]',
+     '[keyword i8x16.add_saturate_s]',
+     '[keyword i8x16.add_saturate_u]',
      '[keyword i8x16.sub]',
-     '[keyword i16x8.add]',
+     '[keyword i8x16.sub_saturate_s]',
+     '[keyword i8x16.sub_saturate_u]',
+     '[keyword i8x16.min_s]',
+     '[keyword i8x16.min_u]',
+     '[keyword i8x16.max_s]',
+     '[keyword i8x16.max_u]',
+     '[keyword i8x16.avgr_u]',
+     '[keyword i16x8.abs]',
      '[keyword i16x8.neg]',
+     '[keyword i16x8.any_true]',
+     '[keyword i16x8.all_true]',
+     '[keyword i16x8.bitmask]',
      '[keyword i16x8.shl]',
      '[keyword i16x8.shr_s]',
      '[keyword i16x8.shr_u]',
+     '[keyword i16x8.add]',
+     '[keyword i16x8.add_saturate_s]',
+     '[keyword i16x8.add_saturate_u]',
      '[keyword i16x8.sub]',
+     '[keyword i16x8.sub_saturate_s]',
+     '[keyword i16x8.sub_saturate_u]',
+     '[keyword i16x8.min_s]',
+     '[keyword i16x8.min_u]',
+     '[keyword i16x8.max_s]',
+     '[keyword i16x8.max_u]',
+     '[keyword i16x8.avgr_u]',
      '[keyword i32x4.add]',
+     '[keyword i32x4.abs]',
      '[keyword i32x4.neg]',
+     '[keyword i32x4.any_true]',
+     '[keyword i32x4.all_true]',
+     '[keyword i32x4.bitmask]',
      '[keyword i32x4.shl]',
      '[keyword i32x4.shr_s]',
      '[keyword i32x4.shr_u]',
      '[keyword i32x4.sub]',
+     '[keyword i32x4.min_s]',
+     '[keyword i32x4.min_u]',
+     '[keyword i32x4.max_s]',
+     '[keyword i32x4.max_u]',
      '[keyword i64x2.add]',
      '[keyword i64x2.neg]',
      '[keyword i64x2.shl]',
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 90bf57fc46..15b384d6f8 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,7 +14,7 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8)\.extract_lane_[su]|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te])|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)/, token: "keyword"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|i(8x16|16x8)\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te]|abs)|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)/, token: "keyword"},
     {regex: /\b(anyfunc|[fi](32|64))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},

From ae507dc0c4c39ebed999cde806889fac1ded2076 Mon Sep 17 00:00:00 2001
From: Ng Zhi An <zhin@google.com>
Date: Fri, 26 Jun 2020 15:07:25 -0700
Subject: [PATCH 4269/4742] [wast mode] More SIMD instructions

f32x4 and f64x2 arithmetic instructions.

Sorted test cases to match the order in
https://github.com/WebAssembly/simd/blob/master/proposals/simd/BinarySIMD.md
to make it easier to spot missing instructions.
---
 mode/wast/test.js | 24 +++++++++++++++++++-----
 mode/wast/wast.js |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index 5cc12e29c2..ca6de4640c 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -201,16 +201,12 @@
      '[keyword f32x4.gt]',
      '[keyword f32x4.le]',
      '[keyword f32x4.ge]',
-     '[keyword f32x4.abs]',
-     '[keyword f32x4.neg]',
      '[keyword f64x2.eq]',
      '[keyword f64x2.ne]',
      '[keyword f64x2.lt]',
      '[keyword f64x2.gt]',
      '[keyword f64x2.le]',
      '[keyword f64x2.ge]',
-     '[keyword f64x2.abs]',
-     '[keyword f64x2.neg]',
      '[keyword v128.not]',
      '[keyword v128.andnot]',
      '[keyword v128.and]',
@@ -274,5 +270,23 @@
      '[keyword i64x2.shl]',
      '[keyword i64x2.shr_s]',
      '[keyword i64x2.shr_u]',
-     '[keyword i64x2.sub]');
+     '[keyword i64x2.sub]',
+     '[keyword f32x4.abs]',
+     '[keyword f32x4.neg]',
+     '[keyword f32x4.sqrt]',
+     '[keyword f32x4.add]',
+     '[keyword f32x4.sub]',
+     '[keyword f32x4.mul]',
+     '[keyword f32x4.div]',
+     '[keyword f32x4.min]',
+     '[keyword f32x4.max]',
+     '[keyword f64x2.abs]',
+     '[keyword f64x2.neg]',
+     '[keyword f64x2.sqrt]',
+     '[keyword f64x2.add]',
+     '[keyword f64x2.sub]',
+     '[keyword f64x2.mul]',
+     '[keyword f64x2.div]',
+     '[keyword f64x2.min]',
+     '[keyword f64x2.max]');
 })();
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 15b384d6f8..4b1c910e63 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,7 +14,7 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|i(8x16|16x8)\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te]|abs)|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)/, token: "keyword"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|i(8x16|16x8)\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te]|abs|sqrt|mul|div|min|max)|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)/, token: "keyword"},
     {regex: /\b(anyfunc|[fi](32|64))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},

From c8ef5e8e9a52e94e6199021155b9097ab57803c6 Mon Sep 17 00:00:00 2001
From: Ng Zhi An <zhin@google.com>
Date: Fri, 26 Jun 2020 15:30:19 -0700
Subject: [PATCH 4270/4742] [wast mode] Complete SIMD instructions

This finished the set of SIMD instructions 178 of them in total, also
sorted tests by their ordering in
https://github.com/WebAssembly/simd/blob/master/proposals/simd/BinarySIMD.md.
---
 mode/wast/test.js | 37 +++++++++++++++++++++++++++++++++----
 mode/wast/wast.js |  2 +-
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index ca6de4640c..9998cfd965 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -141,6 +141,16 @@
 
   MT('simd-instructions',
      '[keyword v128.load] [keyword offset]=[number 32] [keyword align]=[number 4]',
+     '[keyword i16x8.load8x8_s] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword i16x8.load8x8_u] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword i32x4.load16x4_s] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword i32x4.load16x4_u] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword i64x2.load32x2_s] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword i64x2.load32x2_u] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v8x16.load_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v16x8.load_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v32x4.load_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v64x2.load_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
      '[keyword v128.store] [keyword offset]=[number 32] [keyword align]=[number 4]',
      '[keyword v128.const] [number 0] [number 1] [number 2] [number 3] [number 4] [number 5] [number 6] [number 7] [number 8] [number 9] [number 10] [number 11] [number 12] [number 13] [number 14] [number 15]',
      '[keyword v8x16.shuffle] [number 0] [number 1] [number 2] [number 3] [number 4] [number 5] [number 6] [number 7] [number 8] [number 9] [number 10] [number 11] [number 12] [number 13] [number 14] [number 15]',
@@ -208,8 +218,8 @@
      '[keyword f64x2.le]',
      '[keyword f64x2.ge]',
      '[keyword v128.not]',
-     '[keyword v128.andnot]',
      '[keyword v128.and]',
+     '[keyword v128.andnot]',
      '[keyword v128.or]',
      '[keyword v128.xor]',
      '[keyword v128.bitselect]',
@@ -218,6 +228,8 @@
      '[keyword i8x16.any_true]',
      '[keyword i8x16.all_true]',
      '[keyword i8x16.bitmask]',
+     '[keyword i8x16.narrow_i16x8_s]',
+     '[keyword i8x16.narrow_i16x8_u]',
      '[keyword i8x16.shl]',
      '[keyword i8x16.shr_s]',
      '[keyword i8x16.shr_u]',
@@ -237,6 +249,12 @@
      '[keyword i16x8.any_true]',
      '[keyword i16x8.all_true]',
      '[keyword i16x8.bitmask]',
+     '[keyword i16x8.narrow_i32x4_s]',
+     '[keyword i16x8.narrow_i32x4_u]',
+     '[keyword i16x8.widen_low_i8x16_s]',
+     '[keyword i16x8.widen_high_i8x16_s]',
+     '[keyword i16x8.widen_low_i8x16_u]',
+     '[keyword i16x8.widen_high_i8x16_u]',
      '[keyword i16x8.shl]',
      '[keyword i16x8.shr_s]',
      '[keyword i16x8.shr_u]',
@@ -246,31 +264,38 @@
      '[keyword i16x8.sub]',
      '[keyword i16x8.sub_saturate_s]',
      '[keyword i16x8.sub_saturate_u]',
+     '[keyword i16x8.mul]',
      '[keyword i16x8.min_s]',
      '[keyword i16x8.min_u]',
      '[keyword i16x8.max_s]',
      '[keyword i16x8.max_u]',
      '[keyword i16x8.avgr_u]',
-     '[keyword i32x4.add]',
      '[keyword i32x4.abs]',
      '[keyword i32x4.neg]',
      '[keyword i32x4.any_true]',
      '[keyword i32x4.all_true]',
      '[keyword i32x4.bitmask]',
+     '[keyword i32x4.widen_low_i16x8_s]',
+     '[keyword i32x4.widen_high_i16x8_s]',
+     '[keyword i32x4.widen_low_i16x8_u]',
+     '[keyword i32x4.widen_high_i16x8_u]',
      '[keyword i32x4.shl]',
      '[keyword i32x4.shr_s]',
      '[keyword i32x4.shr_u]',
+     '[keyword i32x4.add]',
      '[keyword i32x4.sub]',
+     '[keyword i32x4.mul]',
      '[keyword i32x4.min_s]',
      '[keyword i32x4.min_u]',
      '[keyword i32x4.max_s]',
      '[keyword i32x4.max_u]',
-     '[keyword i64x2.add]',
      '[keyword i64x2.neg]',
      '[keyword i64x2.shl]',
      '[keyword i64x2.shr_s]',
      '[keyword i64x2.shr_u]',
+     '[keyword i64x2.add]',
      '[keyword i64x2.sub]',
+     '[keyword i64x2.mul]',
      '[keyword f32x4.abs]',
      '[keyword f32x4.neg]',
      '[keyword f32x4.sqrt]',
@@ -288,5 +313,9 @@
      '[keyword f64x2.mul]',
      '[keyword f64x2.div]',
      '[keyword f64x2.min]',
-     '[keyword f64x2.max]');
+     '[keyword f64x2.max]',
+     '[keyword i32x4.trunc_sat_f32x4_s]',
+     '[keyword i32x4.trunc_sat_f32x4_u]',
+     '[keyword f32x4.convert_i32x4_s]',
+     '[keyword f32x4.convert_i32x4_u]');
 })();
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 4b1c910e63..9348ad3e0a 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,7 +14,7 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|i(8x16|16x8)\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te]|abs|sqrt|mul|div|min|max)|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)/, token: "keyword"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|i(8x16|16x8)\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te]|abs|sqrt|mul|div|min|max)|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)|i16x8\.(load8x8_[su]|narrow_i32x4_[su]|widen_(low|high)_i8x16_[su]|mul)|i32x4\.(load16x4_[su]|widen_(low|high)_i16x8_[su]|mul|trunc_sat_f32x4_[su])|i64x2\.(load32x2_[su]|mul)|(v(8x16|16x8|32x4|64x2)\.load_splat)|i8x16\.narrow_i16x8_[su]|f32x4\.convert_i32x4_[su]/, token: "keyword"},
     {regex: /\b(anyfunc|[fi](32|64))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},

From 3008203e8fd69195a47d39556ebe78cbf528fb84 Mon Sep 17 00:00:00 2001
From: Paul Schmidt <schmidtpaul@hotmail.de>
Date: Tue, 30 Jun 2020 00:07:27 +0200
Subject: [PATCH 4271/4742] [sas mode] Add missing keywords

I've noticed these few are missing. All from PROC MIXED
---
 mode/sas/sas.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/sas/sas.js b/mode/sas/sas.js
index c6f528e0a9..49b96b66de 100755
--- a/mode/sas/sas.js
+++ b/mode/sas/sas.js
@@ -88,7 +88,7 @@
     define('def', 'source2 nosource2 page pageno pagesize', ['ALL']);
 
     //proc and datastep
-    define('def', '_all_ _character_ _cmd_ _freq_ _i_ _infile_ _last_ _msg_ _null_ _numeric_ _temporary_ _type_ abort abs addr adjrsq airy alpha alter altlog altprint and arcos array arsin as atan attrc attrib attrn authserver autoexec awscontrol awsdef awsmenu awsmenumerge awstitle backward band base betainv between blocksize blshift bnot bor brshift bufno bufsize bxor by byerr byline byte calculated call cards cards4 catcache cbufno cdf ceil center cexist change chisq cinv class cleanup close cnonct cntllev coalesce codegen col collate collin column comamid comaux1 comaux2 comdef compbl compound compress config continue convert cos cosh cpuid create cross crosstab css curobs cv daccdb daccdbsl daccsl daccsyd dacctab dairy datalines datalines4 datejul datepart datetime day dbcslang dbcstype dclose ddm delete delimiter depdb depdbsl depsl depsyd deptab dequote descending descript design= device dflang dhms dif digamma dim dinfo display distinct dkricond dkrocond dlm dnum do dopen doptname doptnum dread drop dropnote dsname dsnferr echo else emaildlg emailid emailpw emailserver emailsys encrypt end endsas engine eof eov erf erfc error errorcheck errors exist exp fappend fclose fcol fdelete feedback fetch fetchobs fexist fget file fileclose fileexist filefmt filename fileref  fmterr fmtsearch fnonct fnote font fontalias  fopen foptname foptnum force formatted formchar formdelim formdlim forward fpoint fpos fput fread frewind frlen from fsep fuzz fwrite gaminv gamma getoption getvarc getvarn go goto group gwindow hbar hbound helpenv helploc hms honorappearance hosthelp hostprint hour hpct html hvar ibessel ibr id if index indexc indexw initcmd initstmt inner input inputc inputn inr insert int intck intnx into intrr invaliddata irr is jbessel join juldate keep kentb kurtosis label lag last lbound leave left length levels lgamma lib  library libref line linesize link list log log10 log2 logpdf logpmf logsdf lostcard lowcase lrecl ls macro macrogen maps mautosource max maxdec maxr mdy mean measures median memtype merge merror min minute missing missover mlogic mod mode model modify month mopen mort mprint mrecall msglevel msymtabmax mvarsize myy n nest netpv new news nmiss no nobatch nobs nocaps nocardimage nocenter nocharcode nocmdmac nocol nocum nodate nodbcs nodetails nodmr nodms nodmsbatch nodup nodupkey noduplicates noechoauto noequals noerrorabend noexitwindows nofullstimer noicon noimplmac noint nolist noloadlist nomiss nomlogic nomprint nomrecall nomsgcase nomstored nomultenvappl nonotes nonumber noobs noovp nopad nopercent noprint noprintinit normal norow norsasuser nosetinit  nosplash nosymbolgen note notes notitle notitles notsorted noverbose noxsync noxwait npv null number numkeys nummousekeys nway obs  on open     order ordinal otherwise out outer outp= output over ovp p(1 5 10 25 50 75 90 95 99) pad pad2  paired parm parmcards path pathdll pathname pdf peek peekc pfkey pmf point poisson poke position printer probbeta probbnml probchi probf probgam probhypr probit probnegb probnorm probsig probt procleave prt ps  pw pwreq qtr quote r ranbin rancau ranexp rangam range ranks rannor ranpoi rantbl rantri ranuni read recfm register regr remote remove rename repeat replace resolve retain return reuse reverse rewind right round rsquare rtf rtrace rtraceloc s s2 samploc sasautos sascontrol sasfrscr sasmsg sasmstore sasscript sasuser saving scan sdf second select selection separated seq serror set setcomm setot sign simple sin sinh siteinfo skewness skip sle sls sortedby sortpgm sortseq sortsize soundex  spedis splashlocation split spool sqrt start std stderr stdin stfips stimer stname stnamel stop stopover subgroup subpopn substr sum sumwgt symbol symbolgen symget symput sysget sysin sysleave sysmsg sysparm sysprint sysprintfont sysprod sysrc system t table tables tan tanh tapeclose tbufsize terminal test then timepart tinv  tnonct to today tol tooldef totper transformout translate trantab tranwrd trigamma trim trimn trunc truncover type unformatted uniform union until upcase update user usericon uss validate value var  weight when where while wincharset window work workinit workterm write wsum xsync xwait yearcutoff yes yyq  min max', ['inDataStep', 'inProc']);
+    define('def', '_all_ _character_ _cmd_ _freq_ _i_ _infile_ _last_ _msg_ _null_ _numeric_ _temporary_ _type_ abort abs addr adjrsq airy alpha alter altlog altprint and arcos array arsin as atan attrc attrib attrn authserver autoexec awscontrol awsdef awsmenu awsmenumerge awstitle backward band base betainv between blocksize blshift bnot bor brshift bufno bufsize bxor by byerr byline byte calculated call cards cards4 catcache cbufno cdf ceil center cexist change chisq cinv class cleanup close cnonct cntllev coalesce codegen col collate collin column comamid comaux1 comaux2 comdef compbl compound compress config continue convert cos cosh cpuid create cross crosstab css curobs cv daccdb daccdbsl daccsl daccsyd dacctab dairy datalines datalines4 datejul datepart datetime day dbcslang dbcstype dclose ddfm ddm delete delimiter depdb depdbsl depsl depsyd deptab dequote descending descript design= device dflang dhms dif digamma dim dinfo display distinct dkricond dkrocond dlm dnum do dopen doptname doptnum dread drop dropnote dsname dsnferr echo else emaildlg emailid emailpw emailserver emailsys encrypt end endsas engine eof eov erf erfc error errorcheck errors exist exp fappend fclose fcol fdelete feedback fetch fetchobs fexist fget file fileclose fileexist filefmt filename fileref  fmterr fmtsearch fnonct fnote font fontalias  fopen foptname foptnum force formatted formchar formdelim formdlim forward fpoint fpos fput fread frewind frlen from fsep fuzz fwrite gaminv gamma getoption getvarc getvarn go goto group gwindow hbar hbound helpenv helploc hms honorappearance hosthelp hostprint hour hpct html hvar ibessel ibr id if index indexc indexw initcmd initstmt inner input inputc inputn inr insert int intck intnx into intrr invaliddata irr is jbessel join juldate keep kentb kurtosis label lag last lbound leave left length levels lgamma lib  library libref line linesize link list log log10 log2 logpdf logpmf logsdf lostcard lowcase lrecl ls macro macrogen maps mautosource max maxdec maxr mdy mean measures median memtype merge merror min minute missing missover mlogic mod mode model modify month mopen mort mprint mrecall msglevel msymtabmax mvarsize myy n nest netpv new news nmiss no nobatch nobs nocaps nocardimage nocenter nocharcode nocmdmac nocol nocum nodate nodbcs nodetails nodmr nodms nodmsbatch nodup nodupkey noduplicates noechoauto noequals noerrorabend noexitwindows nofullstimer noicon noimplmac noint nolist noloadlist nomiss nomlogic nomprint nomrecall nomsgcase nomstored nomultenvappl nonotes nonumber noobs noovp nopad nopercent noprint noprintinit normal norow norsasuser nosetinit  nosplash nosymbolgen note notes notitle notitles notsorted noverbose noxsync noxwait npv null number numkeys nummousekeys nway obs  on open     order ordinal otherwise out outer outp= output over ovp p(1 5 10 25 50 75 90 95 99) pad pad2  paired parm parmcards path pathdll pathname pdf peek peekc pfkey pmf point poisson poke position printer probbeta probbnml probchi probf probgam probhypr probit probnegb probnorm probsig probt procleave prt ps  pw pwreq qtr quote r ranbin rancau random ranexp rangam range ranks rannor ranpoi rantbl rantri ranuni rcorr read recfm register regr remote remove rename repeat repeated replace resolve retain return reuse reverse rewind right round rsquare rtf rtrace rtraceloc s s2 samploc sasautos sascontrol sasfrscr sasmsg sasmstore sasscript sasuser saving scan sdf second select selection separated seq serror set setcomm setot sign simple sin sinh siteinfo skewness skip sle sls sortedby sortpgm sortseq sortsize soundex  spedis splashlocation split spool sqrt start std stderr stdin stfips stimer stname stnamel stop stopover sub subgroup subpopn substr sum sumwgt symbol symbolgen symget symput sysget sysin sysleave sysmsg sysparm sysprint sysprintfont sysprod sysrc system t table tables tan tanh tapeclose tbufsize terminal test then timepart tinv  tnonct to today tol tooldef totper transformout translate trantab tranwrd trigamma trim trimn trunc truncover type unformatted uniform union until upcase update user usericon uss validate value var  weight when where while wincharset window work workinit workterm write wsum xsync xwait yearcutoff yes yyq  min max', ['inDataStep', 'inProc']);
     define('operator', 'and not ', ['inDataStep', 'inProc']);
 
     // Main function

From e2d786c7583371dedc432cf70755f01df0299a49 Mon Sep 17 00:00:00 2001
From: benhormann <benhormann@users.noreply.github.com>
Date: Wed, 8 Jul 2020 07:15:31 +0100
Subject: [PATCH 4272/4742] [vim bindings] Document events fired by vim mode

---
 doc/manual.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 8f42eeff60..e779008384 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -58,6 +58,7 @@
     <li><a href="#vimapi">Vim Mode API</a>
       <ul>
         <li><a href="#vimapi_configuration">Configuration</a></li>
+        <li><a href="#vimapi_events">Events</a></li>
         <li><a href="#vimapi_extending">Extending VIM</a></li>
       </ul>
     </li>
@@ -3559,6 +3560,21 @@ <h3 id="vimapi_configuration">Configuration</h3>
       </dd>
     </dl>
 
+    <h3 id="vimapi_events">Events</h3>
+
+    <p>VIM mode signals a few events on the editor instance. For an example usage, see <a href="https://github.com/codemirror/CodeMirror/blob/5.55.0/demo/vim.html#L101-L110">demo/vim.html#L101</a>.</p>
+
+    <dl>
+      <dt id="vimapi_commanddone"><code><strong>"vim-command-done"</strong> (reason: undefined)</code></dt>
+      <dd>Fired on keypress and mousedown where command has completed or no command found.</dd>
+
+      <dt id="vimapi_keypress"><code><strong>"vim-keypress"</strong> (vimKey: string)</code></dt>
+      <dd>Fired on keypress, <code>vimKey</code> is in Vim's key notation.</dd>
+
+      <dt id="vimapi_modechange"><code><strong>"vim-mode-change"</strong> (modeObj: object)</code></dt>
+      <dd>Fired after mode change, <code>modeObj</code> parameter is a <code>{mode: string, ?subMode: string}</code> object. Modes: <code>"insert", "normal", "replace", "visual"</code>. Visual sub-modes: <code>"linewise", "blockwise"</code>.</dd>
+    </dl>
+
     <h3 id="vimapi_extending">Extending VIM</h3>
 
     <p>CodeMirror's VIM mode implements a large subset of VIM's core

From b5ce22f1e350431adaefbad40cbfc54dbfdb1c77 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Jul 2020 08:35:24 +0200
Subject: [PATCH 4273/4742] Fix line-wise pasting on Chrome Windows

Closes #6337
---
 src/input/input.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/input.js b/src/input/input.js
index 8519ecfb7c..32adbf9b2a 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -51,7 +51,7 @@ export function applyTextInput(cm, inserted, deleted, sel, origin) {
         from = Pos(from.line, from.ch - deleted)
       else if (cm.state.overwrite && !paste) // Handle overwrite
         to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length))
-      else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == inserted)
+      else if (paste && lastCopied && lastCopied.lineWise && lastCopied.text.join("\n") == textLines.join("\n"))
         from = to = Pos(from.line, 0)
     }
     let changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
@@ -132,4 +132,4 @@ export function hiddenTextarea() {
   if (ios) te.style.border = "1px solid black"
   disableBrowserMagic(te)
   return div
-}
\ No newline at end of file
+}

From 0682bcc8d5d5f03cebfbb9d14c3ffa7dcc3e0e6d Mon Sep 17 00:00:00 2001
From: Kaushik Kulkarni <kaushikcfd@gmail.com>
Date: Thu, 2 Jul 2020 00:54:59 -0500
Subject: [PATCH 4274/4742] [hardwrap addon] introduce forceBreak

---
 addon/wrap/hardwrap.js | 30 ++++++++++++++++++++++--------
 doc/manual.html        |  5 +++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 29cc15f01f..2259e0e11e 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -29,11 +29,20 @@
     return {from: start, to: end};
   }
 
-  function findBreakPoint(text, column, wrapOn, killTrailingSpace) {
+  function findBreakPoint(text, column, wrapOn, killTrailingSpace, forceBreak) {
     var at = column
     while (at < text.length && text.charAt(at) == " ") at++
     for (; at > 0; --at)
       if (wrapOn.test(text.slice(at - 1, at + 1))) break;
+
+    if ((at == 0) && (!forceBreak)) {
+      // didn't find a break point before column, in non-forceBreak mode try to
+      // find one after 'column'.
+      for (at = column+1; at < text.length-1; ++at) {
+        if (wrapOn.test(text.slice(at - 1, at + 1))) break;
+      }
+    }
+
     for (var first = true;; first = false) {
       var endOfText = at;
       if (killTrailingSpace)
@@ -47,6 +56,7 @@
     from = cm.clipPos(from); to = cm.clipPos(to);
     var column = options.column || 80;
     var wrapOn = options.wrapOn || /\s\S|-[^\.\d]/;
+    var forceBreak =  options.forceBreak !== false;
     var killTrailing = options.killTrailingSpace !== false;
     var changes = [], curLine = "", curNo = from.line;
     var lines = cm.getRange(from, to, false);
@@ -68,7 +78,7 @@
       curLine += text;
       if (i) {
         var firstBreak = curLine.length > column && leadingSpace == spaceTrimmed &&
-          findBreakPoint(curLine, column, wrapOn, killTrailing);
+          findBreakPoint(curLine, column, wrapOn, killTrailing, forceBreak);
         // If this isn't broken, or is broken at a different point, remove old break
         if (!firstBreak || firstBreak.from != oldLen || firstBreak.to != oldLen + spaceInserted) {
           changes.push({text: [spaceInserted ? " " : ""],
@@ -80,12 +90,16 @@
         }
       }
       while (curLine.length > column) {
-        var bp = findBreakPoint(curLine, column, wrapOn, killTrailing);
-        changes.push({text: ["", leadingSpace],
-                      from: Pos(curNo, bp.from),
-                      to: Pos(curNo, bp.to)});
-        curLine = leadingSpace + curLine.slice(bp.to);
-        ++curNo;
+        var bp = findBreakPoint(curLine, column, wrapOn, killTrailing, forceBreak);
+        if ((bp.from != bp.to) || (forceBreak)) {
+          changes.push({text: ["", leadingSpace],
+                        from: Pos(curNo, bp.from),
+                        to: Pos(curNo, bp.to)});
+          curLine = leadingSpace + curLine.slice(bp.to);
+          ++curNo;
+        } else {
+          break;
+        }
       }
     }
     if (changes.length) cm.operation(function() {
diff --git a/doc/manual.html b/doc/manual.html
index e779008384..8008002a40 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3135,6 +3135,11 @@ <h2 id="addons">Addons</h2>
           <dt><code><strong>killTrailingSpace</strong>: boolean</code></dt>
           <dd>Whether trailing space caused by wrapping should be
           preserved, or deleted. Defaults to true.</dd>
+          <dt><code><strong>forceBreak</strong>: boolean</code></dt>
+          <dd>If set to true forces a break at <code>column</code> in the case
+          when no <code>wrapOn</code> pattern is found in the range. If set to
+          false allows line to overflow the <code>column</code> limit if no
+          <code>wrapOn</code> pattern found. Defaults to true.</dd>
         </dl>
         A demo of the addon is available <a href="../demo/hardwrap.html">here</a>.
       </dd>

From 09943f9eafe7997747821946c67c4fd97c9700d9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Jul 2020 09:30:29 +0200
Subject: [PATCH 4275/4742] [hardbreak addon] Adjust formatting

Issue #6338
---
 addon/wrap/hardwrap.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 2259e0e11e..f194946c5d 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -35,10 +35,10 @@
     for (; at > 0; --at)
       if (wrapOn.test(text.slice(at - 1, at + 1))) break;
 
-    if ((at == 0) && (!forceBreak)) {
+    if (at == 0 && !forceBreak) {
       // didn't find a break point before column, in non-forceBreak mode try to
       // find one after 'column'.
-      for (at = column+1; at < text.length-1; ++at) {
+      for (at = column + 1; at < text.length - 1; ++at) {
         if (wrapOn.test(text.slice(at - 1, at + 1))) break;
       }
     }
@@ -56,7 +56,7 @@
     from = cm.clipPos(from); to = cm.clipPos(to);
     var column = options.column || 80;
     var wrapOn = options.wrapOn || /\s\S|-[^\.\d]/;
-    var forceBreak =  options.forceBreak !== false;
+    var forceBreak = options.forceBreak !== false;
     var killTrailing = options.killTrailingSpace !== false;
     var changes = [], curLine = "", curNo = from.line;
     var lines = cm.getRange(from, to, false);
@@ -91,7 +91,7 @@
       }
       while (curLine.length > column) {
         var bp = findBreakPoint(curLine, column, wrapOn, killTrailing, forceBreak);
-        if ((bp.from != bp.to) || (forceBreak)) {
+        if (bp.from != bp.to || forceBreak) {
           changes.push({text: ["", leadingSpace],
                         from: Pos(curNo, bp.from),
                         to: Pos(curNo, bp.to)});

From a0179ed7e0f935d309b1874759a15ee37cc36b60 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Fri, 3 Jul 2020 18:29:15 +0200
Subject: [PATCH 4276/4742] Add support for import expressions.

Committer: Axel Lewenhaupt <axel@x2d.org>
---
 mode/soy/soy.js  | 24 ++++++++++++++++++++++++
 mode/soy/test.js |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 1b19923da5..c97109b27d 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -402,6 +402,26 @@
             }
             return expression(stream, state);
 
+          case "import":
+            if (stream.eat(";")) {
+              state.soyState.pop();
+              state.indent -= 2 * config.indentUnit;
+              return null;
+            }
+            if (stream.match(/\w+(?=\s+as)/)) {
+              return "variable";
+            }
+            if (match = stream.match(/\w+/)) {
+              return /(from|as)/.test(match[0]) ? "keyword" : "def";
+            }
+            if (match = stream.match(/^["']/)) {
+              state.soyState.push("string");
+              state.quoteKind = match[0];
+              return "string";
+            }
+            stream.next();
+            return null;
+
           case "tag":
             var endTag = state.tag[0] == "/";
             var tagName = endTag ? state.tag.substring(1) : state.tag;
@@ -499,6 +519,10 @@
           state.indent += 2 * config.indentUnit;
           state.soyState.push("tag");
           return "keyword";
+        } else if (!state.context && stream.match(/\bimport\b/)) {
+          state.soyState.push("import");
+          state.indent += 2 * config.indentUnit;
+          return "keyword";
         }
 
         return tokenUntil(stream, state, /\{|\s+\/\/|\/\*/);
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 2fb450e32e..11b49bccaa 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -252,4 +252,7 @@
      '[keyword {let] [def $myList]: [[[[[string \'a\'] ] ] [keyword /}] ' +
      '[keyword {let] [def $test]: [[[variable $a] [operator +] [atom 1] [keyword for] ' +
          '[def $a] [keyword in] [variable-2 $myList] [keyword if] [variable-2 $a] [operator >=] [atom 3] ] [keyword /}]');
+
+  MT('import',
+   '[keyword import] {[def Name], [variable Person] [keyword as] [def P]} [keyword from] [string \'examples/proto/example.proto\'];');
 })();

From 82d0f4aacf307763cfae1ac6d60dbeefc221a230 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Thu, 9 Jul 2020 15:58:34 +0200
Subject: [PATCH 4277/4742] [soy mode] Support template type

Co-authored-by: Axel Lewenhaupt <lewenhaupt@google.com>
---
 mode/soy/soy.js  | 21 +++++++++++++++++++++
 mode/soy/test.js |  7 +++++++
 2 files changed, 28 insertions(+)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index c97109b27d..3539f313fc 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -256,6 +256,11 @@
               // Otherwise
               return "variable";
             }
+            if (match = stream.match(/^\$([\w]+)/)) {
+              state.soyState.pop();
+              return ref(state.variables, match[1], !state.lookupVariables);
+            }
+
             stream.next();
             return null;
 
@@ -300,6 +305,9 @@
             } else if (peekChar == "[") {
               state.soyState.push('param-type-record');
               return null;
+            } else if (peekChar == "(") {
+              state.soyState.push('param-type-template');
+              return null;
             } else if (peekChar == "<") {
               state.soyState.push('param-type-parameter');
               return null;
@@ -334,6 +342,19 @@
             stream.next();
             return null;
 
+          case "param-type-template":
+            if (stream.match(/[>]/)) {
+              state.soyState.pop();
+              state.soyState.push('param-type');
+              return null;
+            }
+            if (stream.match(/^\w+/)) {
+              state.soyState.push('param-type');
+              return "def";
+            }
+            stream.next();
+            return null;
+
           case "var-def":
             if (match = stream.match(/^\$([\w]+)/)) {
               state.variables = prepend(state.variables, match[1]);
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 11b49bccaa..8253b47357 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -178,6 +178,13 @@
      '[keyword {/template}]',
      '');
 
+   MT('param-type-template',
+     '[keyword {template] [def .foo][keyword }]',
+     '  [keyword {@param] [def renderer]: ([def s]:[type string])=>[type html][keyword }]',
+     '  [keyword {call] [variable-2 $renderer] [keyword /}]',
+     '[keyword {/template}]',
+     '');
+
   MT('single-quote-strings',
      '[keyword {][string "foo"] [string \'bar\'][keyword }]',
      '');

From 0ec092019c98ce39584f3cc814732e348b69d570 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Thu, 9 Jul 2020 22:28:01 +0200
Subject: [PATCH 4278/4742] [soy mode] Add support for index in for loops

- Fix variable scrope issue with list comprehensions.

Co-authored-by: Axel Lewenhaupt <lewenhaupt@google.com>
---
 mode/soy/soy.js  | 24 ++++++++++++++++++------
 mode/soy/test.js | 19 +++++++++++++++++++
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 3539f313fc..d31c947eed 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -34,9 +34,9 @@
     "switch": {},
     "case": { noEndTag: true, reduceIndent: true},
     "default": { noEndTag: true, reduceIndent: true},
-    "foreach": { variableScope: true, soyState: "var-def" },
+    "foreach": { variableScope: true, soyState: "for-loop" },
     "ifempty": { noEndTag: true, reduceIndent: true},
-    "for": { variableScope: true, soyState: "var-def" },
+    "for": { variableScope: true, soyState: "for-loop" },
     "call": { soyState: "templ-ref" },
     "param": { soyState: "param-ref"},
     "print": { noEndTag: true },
@@ -129,6 +129,7 @@
       var match;
       if (stream.match(/[[]/)) {
         state.soyState.push("list-literal");
+        state.context = new Context(state.context, "list-literal", state.variables);
         state.lookupVariables = false;
         return null;
       } else if (stream.match(/map\b/)) {
@@ -364,6 +365,18 @@
             stream.next();
             return null;
 
+          case "for-loop":
+            if (stream.match(/\bin\b/)) {
+              state.soyState.pop();
+              return "keyword";
+            }
+            if (stream.peek() == "$") {
+              state.soyState.push('var-def');
+              return null;
+            }
+            stream.next();
+            return null;
+
           case "record-literal":
             if (stream.match(/^[)]/)) {
               state.soyState.pop();
@@ -394,13 +407,12 @@
             if (stream.match(/\]/)) {
               state.soyState.pop();
               state.lookupVariables = true;
+              popcontext(state);
               return null;
             }
-            if (stream.match(/for\b/)) {
-              state.soyState.push("var-def")
-              return "keyword";
-            } else if (stream.match(/in\b/)) {
+            if (stream.match(/\bfor\b/)) {
               state.lookupVariables = true;
+              state.soyState.push('for-loop');
               return "keyword";
             }
             return expression(stream, state);
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 8253b47357..57cd4be477 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -138,6 +138,11 @@
      '[keyword {/foreach}]',
      '');
 
+   MT('foreach-index',
+      '[keyword {foreach] [def $foo],[def $index] [keyword in] [[]] [keyword }]',
+      '  [keyword {][variable-2 $foo][keyword }] [keyword {][variable-2 $index][keyword }]',
+      '[keyword {/foreach}]');
+
   MT('nested-kind-test',
      '[keyword {template] [def .foo] [attribute kind]=[string "html"][keyword }]',
      '  [tag&bracket <][tag div][tag&bracket >]',
@@ -260,6 +265,20 @@
      '[keyword {let] [def $test]: [[[variable $a] [operator +] [atom 1] [keyword for] ' +
          '[def $a] [keyword in] [variable-2 $myList] [keyword if] [variable-2 $a] [operator >=] [atom 3] ] [keyword /}]');
 
+  MT('list-comprehension-index',
+     '[keyword {let] [def $test]: [[[variable $a] [operator +] [variable $index] [keyword for] ' +
+         '[def $a],[def $index] [keyword in] [[]] [keyword if] [variable-2 $a] [operator >=] [variable-2 $index] ] [keyword /}]');
+
+
+  MT('list-comprehension-variable-scope',
+     '[keyword {let] [def $name]: [string "world"][keyword /}]',
+     '[keyword {let] [def $test]: [[[variable $a] [operator +] [variable $index] [keyword for] ' +
+         '[def $a],[def $index] [keyword in] [[]] [keyword if] [variable-2 $a] [operator >=] [variable-2 $index] ] [keyword /}]',
+     '[keyword {][variable-2&error $a][keyword }]',
+     '[keyword {][variable-2&error $index][keyword }]',
+     '[keyword {][variable-2 $test][keyword }]',
+     '[keyword {][variable-2 $name][keyword }]');
+
   MT('import',
    '[keyword import] {[def Name], [variable Person] [keyword as] [def P]} [keyword from] [string \'examples/proto/example.proto\'];');
 })();

From f5bf57b39816f0e6524a1b7d0212e9f26135ba08 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 12 Jul 2020 13:26:09 +0200
Subject: [PATCH 4279/4742] [sql-hint addon] Treat single quotes like double
 quotes when looking at tokens

See https://discuss.codemirror.net/t/codemirror-ignore-show-hints-if-the-class-is-cm-string/2513
---
 addon/hint/sql-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 0b89b79fab..de84707db3 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -264,7 +264,7 @@
       token.string = token.string.slice(0, cur.ch - token.start);
     }
 
-    if (token.string.match(/^[.`"\w@][\w$#]*$/g)) {
+    if (token.string.match(/^[.`"'\w@][\w$#]*$/g)) {
       search = token.string;
       start = token.start;
       end = token.end;

From feed5d5325e97f7414bef999347db338aa93f340 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jul 2020 22:07:20 +0200
Subject: [PATCH 4280/4742] Stop linking to the github wiki

---
 doc/manual.html | 6 +++---
 index.html      | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 8008002a40..a76378470d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -79,9 +79,9 @@ <h2 style="position: relative">
     functionality. It does provide a rich API on top of which such
     functionality can be straightforwardly implemented. See
     the <a href="#addons">addons</a> included in the distribution,
-    and the <a href="https://github.com/codemirror/CodeMirror/wiki/CodeMirror-addons">list
-    of externally hosted addons</a>, for reusable
-    implementations of extra features.</p>
+    and <a href="https://npms.io/search?q=codemirror">3rd party
+    packages on npm</a>, for reusable implementations of extra
+    features.</p>
 
     <p>CodeMirror works with language-specific modes. Modes are
     JavaScript programs that help color (and optionally indent) text
diff --git a/index.html b/index.html
index 520fce4ec2..27cf8fc7fe 100644
--- a/index.html
+++ b/index.html
@@ -171,11 +171,6 @@ <h2>Community</h2>
   that explicit, we have
   a <a href="http://contributor-covenant.org/version/1/1/0/">code of
   conduct</a> that applies to communication around the project.</p>
-
-  <p>A list of CodeMirror-related software that is not part of the
-  main distribution is maintained
-  on <a href="https://github.com/codemirror/CodeMirror/wiki/CodeMirror-addons">our
-  wiki</a>. Feel free to add your project.</p>
 </section>
 
 <section id=browsersupport>

From c8c4565d09f240afc33a31561e42943dfeee4784 Mon Sep 17 00:00:00 2001
From: Bin Ni <nibin@quantil.com>
Date: Mon, 20 Jul 2020 13:09:25 -0700
Subject: [PATCH 4281/4742] [show-hint addon] Introduced option 'scrollMargin'

---
 addon/hint/show-hint.js | 12 +++++++-----
 doc/manual.html         |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index c55deab3a6..cd0d6a7bd5 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -379,12 +379,14 @@
     },
 
     scrollToActive: function() {
-      var node = this.hints.childNodes[this.selectedHint]
+      var margin = this.completion.options.scrollMargin || 0;
+      var node1 = this.hints.childNodes[Math.max(0, this.selectedHint - margin)];
+      var node2 = this.hints.childNodes[Math.min(this.data.list.length - 1, this.selectedHint + margin)];
       var firstNode = this.hints.firstChild;
-      if (node.offsetTop < this.hints.scrollTop)
-        this.hints.scrollTop = node.offsetTop - firstNode.offsetTop;
-      else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
-        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + firstNode.offsetTop;
+      if (node1.offsetTop < this.hints.scrollTop)
+        this.hints.scrollTop = node1.offsetTop - firstNode.offsetTop;
+      else if (node2.offsetTop + node2.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
+        this.hints.scrollTop = node2.offsetTop + node2.offsetHeight - this.hints.clientHeight + firstNode.offsetTop;
     },
 
     screenAmount: function() {
diff --git a/doc/manual.html b/doc/manual.html
index a76378470d..1bcd395e63 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2790,6 +2790,9 @@ <h2 id="addons">Addons</h2>
         <dd>Like <code>customKeys</code> above, but the bindings will
         be added to the set of default bindings, instead of replacing
         them.</dd>
+        <dt><code><strong>scrollMargin</strong>: integer</code></dt>
+        <dd>Show this many lines before and after the selected item.
+        Default is 0.</dd>
       </dl>
       The following events will be fired on the completions object
       during completion:

From 772d09e697612889ec5dbed2cc058e754232c29d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jul 2020 22:28:58 +0200
Subject: [PATCH 4282/4742] Mark version 5.56.0

---
 AUTHORS           |  2 ++
 CHANGELOG.md      | 20 +++++++++++++++++++-
 doc/manual.html   |  2 +-
 doc/releases.html | 12 ++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f041a0572a..a9e79126b6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -441,6 +441,7 @@ jwallers@gmail.com
 kaniga
 karevn
 Karol
+Kaushik Kulkarni
 Kayur Patel
 Kazuhito Hokamura
 kcwiakala
@@ -657,6 +658,7 @@ Patrick Strawderman
 Paul Garvin
 Paul Ivanov
 Paul Masson
+Paul Schmidt
 Pavel
 Pavel Feldman
 Pavel Petržela
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b87340b524..13039b9701 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,22 @@
-## 5.55.0 (2020-05-20)
+## 5.56.0 (2020-07-20)
+
+### Bug fixes
+
+Line-wise pasting was fixed on Chrome Windows.
+
+[wast mode](https://codemirror.net/mode/wast/): Follow standard changes.
+
+[soy mode](https://codemirror.net/mode/soy/): Support import expressions, template type, and loop indices.
+
+[sql-hint addon](https://codemirror.net/doc/manual.html#addon_sql-hint): Improve handling of double quotes.
+
+### New features
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): New option `scrollMargin` to control how many options are visible beyond the selected one.
+
+[hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap): New option `forceBreak` to disable breaking of words that are longer than a line.
+
+## 5.55.0 (2020-06-21)
 
 ### Bug fixes
 
diff --git a/doc/manual.html b/doc/manual.html
index 1bcd395e63..ba46c099f0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.55.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.56.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 fd02a7fbd9..6ab175a7b3 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-07-2020: <a href="https://codemirror.net/codemirror-5.56.0.zip">Version 5.56.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Line-wise pasting was fixed on Chrome Windows.</li>
+    <li><a href="https://codemirror.net/mode/wast/">wast mode</a>: Follow standard changes.</li>
+    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support import expressions, template type, and loop indices.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_sql-hint">sql-hint addon</a>: Improve handling of double quotes.</li>
+    <li><h3 id="new-features">New features</h3></li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: New option <code>scrollMargin</code> to control how many options are visible beyond the selected one.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_hardwrap">hardwrap addon</a>: New option <code>forceBreak</code> to disable breaking of words that are longer than a line.</li>
+  </ul>
+
   <p class="rel">21-06-2020: <a href="https://codemirror.net/codemirror-5.55.0.zip">Version 5.55.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 27cf8fc7fe..8ee9b384b2 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.55.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.56.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index dcffa6d998..374bd877d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.55.0",
+  "version": "5.56.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 04efb81564..3b378e8f33 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.55.0"
+CodeMirror.version = "5.56.0"

From fdbc04a94a3b0064b896effa6da6544f1c2bb39a Mon Sep 17 00:00:00 2001
From: Howard <howard.jing@gmail.com>
Date: Thu, 23 Jul 2020 14:45:56 -0400
Subject: [PATCH 4283/4742] [vim bindings] Support tag text objects in xml /
 htmlmixed mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

User can use `t` to operate on tag text objects. For example, given the
following html:

```
<div>
  <span>hello world!</span>
</div>
```

If the user's cursor (denoted by █) is inside "hello world!":

```
<div>
  <span>hello█world!</span>
</div>
```

And they enter `dit` (delete inner tag), then the text inside the
enclosing tag is deleted -- the following is the expected result:

```
<div>
  <span></span>
</div>
```

If they enter `dat` (delete around tag), then the surrounding tags are
deleted as well:

```
<div>
</div>
```

This logic depends on the following:

- mode/xml/xml.js
- addon/fold/xml-fold.js
- editor is in htmlmixedmode / xml mode

Caveats

This is _NOT_ a 100% accurate implementation of vim tag text objects.
For example, the following cases noop / are inconsistent with vim
behavior:

- Does not work inside comments:
  ```
  <!-- <div>broken</div> -->
  ```
- Does not work when tags have different cases:
  ```
  <div>broken</DIV>
  ```
- Does not work when inside a broken tag:
  ```
  <div><brok><en></div>
  ```

This addresses #3828.
---
 keymap/vim.js    | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 test/index.html  |  1 +
 test/vim_test.js | 30 ++++++++++++++++++++++++++++--
 3 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index bca6d46d72..5a4860c65a 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2069,6 +2069,8 @@
             if (operatorArgs) { operatorArgs.linewise = true; }
             tmp.end.line--;
           }
+        } else if (character === 't') {
+          tmp = expandTagUnderCursor(cm, head, inclusive);
         } else {
           // No text object defined for this, don't move.
           return null;
@@ -3295,6 +3297,49 @@
       return { start: Pos(cur.line, start), end: Pos(cur.line, end) };
     }
 
+    /**
+     * Depends on the following:
+     *
+     * - editor mode should be htmlmixedmode / xml
+     * - mode/xml/xml.js should be loaded
+     * - addon/fold/xml-fold.js should be loaded
+     *
+     * If any of the above requirements are not true, this function noops.
+     *
+     * This is _NOT_ a 100% accurate implementation of vim tag text objects.
+     * The following caveats apply (based off cursory testing, I'm sure there
+     * are other discrepancies):
+     *
+     * - Does not work inside comments:
+     *   ```
+     *   <!-- <div>broken</div> -->
+     *   ```
+     * - Does not work when tags have different cases:
+     *   ```
+     *   <div>broken</DIV>
+     *   ```
+     * - Does not work when cursor is inside a broken tag:
+     *   ```
+     *   <div><brok><en></div>
+     *   ```
+     */
+    function expandTagUnderCursor(cm, head, inclusive) {
+      var cur = head;
+      if (!CodeMirror.findMatchingTag || !CodeMirror.findEnclosingTag) {
+        return { start: cur, end: cur };
+      }
+
+      var tags = CodeMirror.findMatchingTag(cm, head) || CodeMirror.findEnclosingTag(cm, head);
+      if (!tags || !tags.open || !tags.close) {
+        return { start: cur, end: cur };
+      }
+
+      if (inclusive) {
+        return { start: tags.open.from, end: tags.close.to };
+      }
+      return { start: tags.open.to, end: tags.close.from };
+    }
+
     function recordJumpPosition(cm, oldCur, newCur) {
       if (!cursorEqual(oldCur, newCur)) {
         vimGlobalState.jumpList.add(cm, oldCur, newCur);
@@ -3836,7 +3881,7 @@
       return Pos(curr_index.ln, curr_index.pos);
     }
 
-    // TODO: perhaps this finagling of start and end positions belonds
+    // TODO: perhaps this finagling of start and end positions belongs
     // in codemirror/replaceRange?
     function selectCompanionObject(cm, head, symb, inclusive) {
       var cur = head, start, end;
diff --git a/test/index.html b/test/index.html
index b68ce18964..6566fc436e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -156,6 +156,7 @@ <h2>Test Suite</h2>
     <script src="../addon/mode/multiplex_test.js"></script>
     <script src="../addon/fold/foldcode.js"></script>
     <script src="../addon/fold/brace-fold.js"></script>
+    <script src="../addon/fold/xml-fold.js"></script>
 
     <script src="emacs_test.js"></script>
     <script src="sql-hint-test.js"></script>
diff --git a/test/vim_test.js b/test/vim_test.js
index 71284bdf59..57d276e871 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1317,9 +1317,13 @@ testVim('=', function(cm, vim, helpers) {
   eq(expectedValue, cm.getValue());
 }, { value: '   word1\n  word2\n  word3', indentUnit: 2 });
 
-// Edit tests
-function testEdit(name, before, pos, edit, after) {
+// Edit tests - configureCm is an optional argument that gives caller
+// access to the cm object.
+function testEdit(name, before, pos, edit, after, configureCm) {
   return testVim(name, function(cm, vim, helpers) {
+             if (configureCm) {
+               configureCm(cm);
+             }
              var ch = before.search(pos)
              var line = before.substring(0, ch).split('\n').length - 1;
              if (line) {
@@ -1424,6 +1428,28 @@ testEdit('di>_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'di>', 'a\t<>b');
 testEdit('da<_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'da<', 'a\tb');
 testEdit('da>_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'da>', 'a\tb');
 
+// deleting tag objects
+testEdit('dat_noop', '<outer><inner>hello</inner></outer>', /n/, 'dat', '<outer><inner>hello</inner></outer>');
+testEdit('dat_open_tag', '<outer><inner>hello</inner></outer>', /n/, 'dat', '<outer></outer>', function(cm) {
+  cm.setOption('mode', 'xml');
+});
+testEdit('dat_inside_tag', '<outer><inner>hello</inner></outer>', /l/, 'dat', '<outer></outer>', function(cm) {
+  cm.setOption('mode', 'xml');
+});
+testEdit('dat_close_tag', '<outer><inner>hello</inner></outer>', /\//, 'dat', '<outer></outer>', function(cm) {
+  cm.setOption('mode', 'xml');
+});
+
+testEdit('dit_open_tag', '<outer><inner>hello</inner></outer>', /n/, 'dit', '<outer><inner></inner></outer>', function(cm) {
+  cm.setOption('mode', 'xml');
+});
+testEdit('dit_inside_tag', '<outer><inner>hello</inner></outer>', /l/, 'dit', '<outer><inner></inner></outer>', function(cm) {
+  cm.setOption('mode', 'xml');
+});
+testEdit('dit_close_tag', '<outer><inner>hello</inner></outer>', /\//, 'dit', '<outer><inner></inner></outer>', function(cm) {
+  cm.setOption('mode', 'xml');
+});
+
 function testSelection(name, before, pos, keys, sel) {
   return testVim(name, function(cm, vim, helpers) {
              var ch = before.search(pos)

From 3e3c21cbe5d10ac14ab69c16da5a0fa035a22b33 Mon Sep 17 00:00:00 2001
From: Haoran Yu <haoran_yu@hotmail.com>
Date: Thu, 30 Jul 2020 15:42:44 +0800
Subject: [PATCH 4284/4742] [real-world uses] Add CodeMirror-Record (#6360)

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

diff --git a/doc/realworld.html b/doc/realworld.html
index a08d754550..1cde8ace62 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -52,6 +52,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://codefights.com/">CodeFights</a> (practice programming)</li>
       <li><a href="https://github.com/angelozerr/CodeMirror-Eclipse">CodeMirror Eclipse</a> (embed CM in Eclipse)</li>
       <li><a href="http://emmet.io/blog/codemirror-movie/">CodeMirror movie</a> (scripted editing demos)</li>
+      <li><a href="https://github.com/haoranyu/codemirror-record/">CodeMirror Record</a> (codemirror activity recording and playback)</li>
       <li><a href="http://code.google.com/p/codemirror2-gwt/">CodeMirror2-GWT</a> (Google Web Toolkit wrapper)</li>
       <li><a href="http://www.crunchzilla.com/code-monster">Code Monster</a> & <a href="http://www.crunchzilla.com/code-maven">Code Maven</a> (learning environment)</li>
       <li><a href="http://codepen.io">Codepen</a> (gallery of animations)</li>

From 68d4da261d1e24b744773467b4d06c62c965b34a Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Thu, 30 Jul 2020 21:32:35 -0700
Subject: [PATCH 4285/4742] [real-world uses] Add Violentmonkey

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 1cde8ace62..bb2dc7f8b3 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -182,6 +182,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>
       <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
       <li><a href="https://upsource.jetbrains.com/idea-ce/file/idea-ce-7706e7832aa9e2fd0c2decdb5cbef2225692c696/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorFactoryImpl.java">Upsource</a> (code browser and review tool)</li>
+      <li><a href="https://violentmonkey.github.io/">Violentmonkey</a> (userscript manager / editor)</li>
       <li><a href="https://github.com/mgaitan/waliki">Waliki</a> (wiki engine)</li>
       <li><a href="http://wamer.net/">Wamer</a> (web application builder)</li>
       <li><a href="https://github.com/brettz9/webappfind">webappfind</a> (windows file bindings for webapps)</li>

From 5bff5502c813ef773c0a6a47a7c761d017f0361d Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Thu, 30 Jul 2020 20:52:29 -0700
Subject: [PATCH 4286/4742] [css] add missing 1) property all, 2) media feature
 prefers-color-scheme

---
 mode/css/css.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 441ba4abfd..85f1bdc767 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -442,17 +442,18 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "monochrome", "min-monochrome", "max-monochrome", "resolution",
     "min-resolution", "max-resolution", "scan", "grid", "orientation",
     "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
-    "pointer", "any-pointer", "hover", "any-hover"
+    "pointer", "any-pointer", "hover", "any-hover", "prefers-color-scheme"
   ], mediaFeatures = keySet(mediaFeatures_);
 
   var mediaValueKeywords_ = [
     "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
-    "interlace", "progressive"
+    "interlace", "progressive",
+    "dark", "light"
   ], mediaValueKeywords = keySet(mediaValueKeywords_);
 
   var propertyKeywords_ = [
     "align-content", "align-items", "align-self", "alignment-adjust",
-    "alignment-baseline", "anchor-point", "animation", "animation-delay",
+    "alignment-baseline", "all", "anchor-point", "animation", "animation-delay",
     "animation-direction", "animation-duration", "animation-fill-mode",
     "animation-iteration-count", "animation-name", "animation-play-state",
     "animation-timing-function", "appearance", "azimuth", "backdrop-filter",

From fd3e439fd07121b58e2efd4b7c92ee1201d9be64 Mon Sep 17 00:00:00 2001
From: Lucas Buchala <lucasbuchala@gmail.com>
Date: Thu, 6 Aug 2020 03:38:54 -0300
Subject: [PATCH 4287/4742] [mode meta] Escape dot in mode's filename regex

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

diff --git a/mode/meta.js b/mode/meta.js
index 9f64f41048..d3efdc172f 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -24,7 +24,7 @@
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
     {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
     {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
-    {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
+    {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists\.txt$/},
     {name: "CoffeeScript", mimes: ["application/vnd.coffeescript", "text/coffeescript", "text/x-coffeescript"], mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
     {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
     {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
@@ -55,7 +55,7 @@
     {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
     {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
     {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
-    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
+    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history)\.md$/i},
     {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
     {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"], file: /^Jenkinsfile$/},
     {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},

From 26b739ffef2187ce942474cef4a636e9c65f9294 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 7 Aug 2020 17:44:41 +0200
Subject: [PATCH 4288/4742] [comment addon] Keep selection in front of closing
 marker when block-commenting

... with fullLines==false when the end of the selection is directly on the closing
marker.

Closes #6375
---
 addon/comment/comment.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index 8394e85a4d..dac48d0387 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -13,7 +13,7 @@
 
   var noOptions = {};
   var nonWS = /[^\s\u00a0]/;
-  var Pos = CodeMirror.Pos;
+  var Pos = CodeMirror.Pos, cmp = CodeMirror.cmpPos;
 
   function firstNonWS(str) {
     var found = str.search(nonWS);
@@ -126,7 +126,9 @@
           if (i != end || lastLineHasText)
             self.replaceRange(lead + pad, Pos(i, 0));
       } else {
+        var atCursor = cmp(self.getCursor("to"), to) == 0, empty = !self.somethingSelected()
         self.replaceRange(endString, to);
+        if (atCursor) self.setSelection(empty ? to : self.getCursor("from"), to)
         self.replaceRange(startString, from);
       }
     });

From def6f5b125a77607085ce17c371e0995be96832a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 8 Aug 2020 10:15:34 +0200
Subject: [PATCH 4289/4742] [julia mode] Make sure dedent tokens end in a word
 boundary

Closes #6376
---
 mode/julia/julia.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 2aadf36724..f1d2cd5c4b 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -401,8 +401,8 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
 
     indent: function(state, textAfter) {
       var delta = 0;
-      if ( textAfter === ']' || textAfter === ')' || /^end/.test(textAfter) ||
-           /^else/.test(textAfter) || /^catch/.test(textAfter) || /^elseif/.test(textAfter) ||
+      if ( textAfter === ']' || textAfter === ')' || /^end\b/.test(textAfter) ||
+           /^else/.test(textAfter) || /^catch\b/.test(textAfter) || /^elseif\b/.test(textAfter) ||
            /^finally/.test(textAfter) ) {
         delta = -1;
       }

From a2e86b6211518abd2bd1820e4810edf461fdee9a Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Sat, 1 Aug 2020 13:14:49 -0700
Subject: [PATCH 4290/4742] [css mode] Add missing standard property names per
 MDN

---
 mode/css/css.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 85f1bdc767..e7e5dca837 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -504,7 +504,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "list-style-image", "list-style-position", "list-style-type", "margin",
     "margin-bottom", "margin-left", "margin-right", "margin-top", "marks",
     "marquee-direction", "marquee-loop", "marquee-play-count", "marquee-speed",
-    "marquee-style", "max-block-size", "max-height", "max-inline-size",
+    "marquee-style", "mask-clip", "mask-composite", "mask-image", "mask-mode",
+    "mask-origin", "mask-position", "mask-repeat", "mask-size","mask-type",
+    "max-block-size", "max-height", "max-inline-size",
     "max-width", "min-block-size", "min-height", "min-inline-size", "min-width",
     "mix-blend-mode", "move-to", "nav-down", "nav-index", "nav-left", "nav-right",
     "nav-up", "object-fit", "object-position", "offset", "offset-anchor",
@@ -541,7 +543,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "text-height", "text-indent", "text-justify", "text-orientation",
     "text-outline", "text-overflow", "text-rendering", "text-shadow",
     "text-size-adjust", "text-space-collapse", "text-transform",
-    "text-underline-position", "text-wrap", "top", "transform", "transform-origin",
+    "text-underline-position", "text-wrap", "top", "touch-action", "transform", "transform-origin",
     "transform-style", "transition", "transition-delay", "transition-duration",
     "transition-property", "transition-timing-function", "translate",
     "unicode-bidi", "user-select", "vertical-align", "visibility", "voice-balance",
@@ -553,11 +555,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
     "color-interpolation", "color-interpolation-filters",
     "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",
-    "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke",
+    "marker", "marker-end", "marker-mid", "marker-start", "paint-order", "shape-rendering", "stroke",
     "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin",
     "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
     "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
-    "glyph-orientation-vertical", "text-anchor", "writing-mode"
+    "glyph-orientation-vertical", "text-anchor", "writing-mode",
   ], propertyKeywords = keySet(propertyKeywords_);
 
   var nonStandardPropertyKeywords_ = [
@@ -725,8 +727,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     var maybeEnd = false, ch;
     while ((ch = stream.next()) != null) {
       if (maybeEnd && ch == "/") {
-        state.tokenize = null;
-        break;
+        state.tokenize = null;       break;
       }
       maybeEnd = (ch == "*");
     }

From 1ac4e320224eb00643129e29f4800edbe77d9f49 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Sat, 1 Aug 2020 14:00:07 -0700
Subject: [PATCH 4291/4742] [css] missing CSS property values - for mask-image,
 mask-origin, touch-action just added

---
 mode/css/css.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index e7e5dca837..77ca0c10e2 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -626,7 +626,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
     "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",
-    "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
+    "avoid-region", "axis-pan", "background", "backwards", "baseline", "below", "bidi-override", "binary",
     "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
     "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
     "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
@@ -650,7 +650,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
     "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
     "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
-    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
+    "extra-expanded", "fantasy", "fast", "fill", "fill-box", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
     "forwards", "from", "geometricPrecision", "georgian", "graytext", "grid", "groove",
     "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
     "help", "hidden", "hide", "higher", "highlight", "highlighttext",
@@ -665,7 +665,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
     "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
-    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d",
+    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "manipulation", "match", "matrix", "matrix3d",
     "media-controls-background", "media-current-time-display",
     "media-fullscreen-button", "media-mute-button", "media-play-button",
     "media-return-to-realtime-button", "media-rewind-button",
@@ -674,13 +674,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "media-volume-slider-container", "media-volume-sliderthumb", "medium",
     "menu", "menulist", "menulist-button", "menulist-text",
     "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
-    "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
+    "mix", "mongolian", "monospace", "move", "multiple", "multiple_mask_images", "multiply", "myanmar", "n-resize",
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
     "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "opacity", "open-quote",
     "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
     "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
-    "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
+    "painted", "page", "paused", "persian", "perspective", "pinch-zoom", "plus-darker", "plus-lighter",
     "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
     "progress", "push-button", "radial-gradient", "radio", "read-only",
     "read-write", "read-write-plaintext-only", "rectangle", "region",
@@ -698,8 +698,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
     "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
     "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",
-    "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
-    "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
+    "square-button", "start", "static", "status-bar", "stretch", "stroke", "stroke-box", "sub",
+    "subpixel-antialiased", "svg_masks", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",
     "table-footer-group", "table-header-group", "table-row", "table-row-group",
     "tamil",
@@ -709,10 +709,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
     "trad-chinese-formal", "trad-chinese-informal", "transform",
     "translate", "translate3d", "translateX", "translateY", "translateZ",
-    "transparent", "ultra-condensed", "ultra-expanded", "underline", "unset", "up",
+    "transparent", "ultra-condensed", "ultra-expanded", "underline", "unidirectional-pan", "unset", "up",
     "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
-    "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
+    "var", "vertical", "vertical-text", "view-box", "visible", "visibleFill", "visiblePainted",
     "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
     "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor",
     "xx-large", "xx-small"
@@ -727,7 +727,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     var maybeEnd = false, ch;
     while ((ch = stream.next()) != null) {
       if (maybeEnd && ch == "/") {
-        state.tokenize = null;       break;
+        state.tokenize = null;
+        break;
       }
       maybeEnd = (ch == "*");
     }

From 43822831dc670ab1ee18eeb54f4d57ac44b080fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 13 Aug 2020 08:33:21 +0200
Subject: [PATCH 4292/4742] Document the scrollpastend addon

Closes #6381
---
 doc/manual.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index ba46c099f0..9c04d7fadf 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3147,6 +3147,11 @@ <h2 id="addons">Addons</h2>
         A demo of the addon is available <a href="../demo/hardwrap.html">here</a>.
       </dd>
 
+      <dt id="addon_scrollpastend"><a href="../addon/scroll/scrollpastend.js"><code>scroll/scrollpastend.js</code></a></dt>
+      <dd>Defines an option `"scrollPastEnd"` that, when set to a
+      truthy value, allows the user to scroll one editor height of
+      empty space into view at the bottom of the editor.</dd>
+
       <dt id="addon_merge"><a href="../addon/merge/merge.js"><code>merge/merge.js</code></a></dt>
       <dd>Implements an interface for merging changes, using either a
       2-way or a 3-way view. The <code>CodeMirror.MergeView</code>

From 50cd959fe7939eba01d4647d9081976f48df9bb7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 13 Aug 2020 09:10:52 +0200
Subject: [PATCH 4293/4742] Add issue and pr templates that warn about common
 problems

---
 .github/ISSUE_TEMPLATE.md        | 5 +++++
 .github/PULL_REQUEST_TEMPLATE.md | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..49e2dcb09d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,5 @@
+<!--
+Do not use this bug tracker for questions. We have a forum (https://discuss.codemirror.net) for those.
+
+In order to get us to look at something, you need to make it easy for us to understand what you are doing and what went wrong. When possible, a code example that demonstrates the problem helps a lot. If there's any chance at all that a problem is related to the browser, include information about which browser(s) you tested with.
+-->
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000000..ea7cbc75db
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+<!--
+NOTE: We are not accepting pull requests for new modes or addons. Please put such code in a separate repository, and release them as stand-alone npm packages. See for example the [Elixir mode](https://github.com/ianwalter/codemirror-mode-elixir).
+
+Also pull requests that rewrite big chunks of code or adjust code style to your own taste are generally not welcome. Make your changes in focused steps that fix or improve a specific thing.
+-->

From 83b9f82f411274407755f80f403a48448faf81d0 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <jan@idleberg.com>
Date: Fri, 14 Aug 2020 10:12:06 +0200
Subject: [PATCH 4294/4742] [nsis mode] Add NSIS 3.06 commands

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 10816608c1..636940f502 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -31,7 +31,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetKnownFolderPath|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfRtlLanguage|IfShellVarContextAll|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
     {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
 

From 55d04842e2abeeb305d722859cfb8ba18eadd47a Mon Sep 17 00:00:00 2001
From: tokafew420 <tokafew420@gmail.com>
Date: Tue, 18 Aug 2020 23:05:37 -0400
Subject: [PATCH 4295/4742] Annotate scrollbar when matches are folded

---
 addon/scroll/annotatescrollbar.js | 12 ++++++-
 test/annotatescrollbar.js         | 55 +++++++++++++++++++++++++++++++
 test/index.html                   |  2 ++
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 test/annotatescrollbar.js

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 9fe61ec1ff..0eb9e84fa2 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -72,10 +72,20 @@
     var wrapping = cm.getOption("lineWrapping");
     var singleLineH = wrapping && cm.defaultTextHeight() * 1.5;
     var curLine = null, curLineObj = null;
+
+    function getFoldLineHandle(pos) {
+      var marks = cm.findMarksAt(pos);
+      for (var i = 0; i < marks.length; ++i) {
+        if (marks[i].collapsed)
+          return marks[i].lines[0];
+      }
+    }
+
     function getY(pos, top) {
       if (curLine != pos.line) {
         curLine = pos.line;
-        curLineObj = cm.getLineHandle(curLine);
+        if(!(curLineObj = getFoldLineHandle(pos)))
+          curLineObj = cm.getLineHandle(curLine);
       }
       if ((curLineObj.widgets && curLineObj.widgets.length) ||
           (wrapping && curLineObj.height > singleLineH))
diff --git a/test/annotatescrollbar.js b/test/annotatescrollbar.js
new file mode 100644
index 0000000000..4a4d05333c
--- /dev/null
+++ b/test/annotatescrollbar.js
@@ -0,0 +1,55 @@
+namespace = "annotatescrollbar_";
+
+(function () {
+  function test(name, run, content, query, expected) {
+    return testCM(name, function (cm) {
+      var annotation = cm.annotateScrollbar({
+        listenForChanges: false,
+        className: "CodeMirror-search-match"
+      });
+      var matches = [];
+      var cursor = cm.getSearchCursor(query, CodeMirror.Pos(0, 0));
+      while (cursor.findNext()) {
+        var match = {
+          from: cursor.from(),
+          to: cursor.to()
+        };
+        matches.push(match)
+      }
+
+      if (run) run(cm);
+
+      cm.display.barWidth = 5;
+      annotation.update(matches);
+
+      var annotations = cm.getWrapperElement().getElementsByClassName(annotation.options.className);
+      eq(annotations.length, expected, "Expected " + expected + " annotations on the scrollbar.")
+    }, {
+      value: content,
+      mode: "javascript",
+      foldOptions: {
+        rangeFinder: CodeMirror.fold.brace
+      }
+    });
+  }
+
+  function doFold(cm) {
+    cm.foldCode(cm.getCursor());
+  }
+  var simpleProg = "function foo() {\n\n  return \"foo\";\n\n}\n\nfoo();\n";
+  var consecutiveLineMatches = "function foo() {\n  return \"foo\";\n}\nfoo();\n";
+  var singleLineMatches = "function foo() { return \"foo\"; }foo();\n";
+
+  // Base case - expect 3 matches and 3 annotations
+  test("simple", null, simpleProg, "foo", 3);
+  // Consecutive line matches are combines into a single annotation - expect 3 matches and 2 annotations
+  test("combineConsecutiveLine", null, consecutiveLineMatches, "foo", 2);
+  // Matches on a single line get a single annotation - expect 3 matches and 1 annotation
+  test("combineSingleLine", null, singleLineMatches, "foo", 1);
+  // Matches within a fold are annotated on the folded line - expect 3 matches and 2 annotations
+  test("simpleFold", doFold, simpleProg, "foo", 2);
+  // Combination of combineConsecutiveLine and simpleFold cases - expect 3 matches and 1 annotation
+  test("foldedMatch", doFold, consecutiveLineMatches, "foo", 1);
+  // Hidden matches within a fold are annotated on the folded line - expect 1 match and 1 annotation
+  test("hiddenMatch", doFold, simpleProg, "return", 1);
+})();
\ No newline at end of file
diff --git a/test/index.html b/test/index.html
index 6566fc436e..3369beac1f 100644
--- a/test/index.html
+++ b/test/index.html
@@ -157,12 +157,14 @@ <h2>Test Suite</h2>
     <script src="../addon/fold/foldcode.js"></script>
     <script src="../addon/fold/brace-fold.js"></script>
     <script src="../addon/fold/xml-fold.js"></script>
+    <script src="../addon/scroll/annotatescrollbar.js"></script>
 
     <script src="emacs_test.js"></script>
     <script src="sql-hint-test.js"></script>
     <script src="sublime_test.js"></script>
     <script src="vim_test.js"></script>
     <script src="html-hint-test.js"></script>
+    <script src="annotatescrollbar.js"></script>
     <script>
       window.onload = runHarness;
       CodeMirror.on(window, 'hashchange', runHarness);

From ac4aaa08e271766d0dbe3ad81603a559d4956da5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 19 Aug 2020 09:23:19 +0200
Subject: [PATCH 4296/4742] [annotatescrollbar addon] Simplify visual-line
 finding

Issue #6388
---
 addon/scroll/annotatescrollbar.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index 0eb9e84fa2..c12e44cda5 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -73,19 +73,15 @@
     var singleLineH = wrapping && cm.defaultTextHeight() * 1.5;
     var curLine = null, curLineObj = null;
 
-    function getFoldLineHandle(pos) {
-      var marks = cm.findMarksAt(pos);
-      for (var i = 0; i < marks.length; ++i) {
-        if (marks[i].collapsed)
-          return marks[i].lines[0];
-      }
-    }
-
     function getY(pos, top) {
       if (curLine != pos.line) {
-        curLine = pos.line;
-        if(!(curLineObj = getFoldLineHandle(pos)))
-          curLineObj = cm.getLineHandle(curLine);
+        curLine = pos.line
+        curLineObj = cm.getLineHandle(pos.line)
+        var visual = cm.getLineHandleVisualStart(curLineObj)
+        if (visual != curLineObj) {
+          curLine = cm.getLineNumber(visual)
+          curLineObj = visual
+        }
       }
       if ((curLineObj.widgets && curLineObj.widgets.length) ||
           (wrapping && curLineObj.height > singleLineH))

From 7d848769f3d2690293a46b996203bf070ba2a702 Mon Sep 17 00:00:00 2001
From: Leo Baschy <srguiwiz12@nrvnr.com>
Date: Tue, 18 Aug 2020 19:28:51 -0700
Subject: [PATCH 4297/4742] [xml-hint addon] Allow attribute values function to
 return a Promise

---
 addon/hint/xml-hint.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 7575b3707e..543d19b61c 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -101,8 +101,14 @@
           }
           replaceToken = true;
         }
-        for (var i = 0; i < atValues.length; ++i) if (!prefix || matches(atValues[i], prefix, matchInMiddle))
-          result.push(quote + atValues[i] + quote);
+        function returnHintsFromAtValues(atValues) {
+          if (atValues)
+            for (var i = 0; i < atValues.length; ++i) if (!prefix || matches(atValues[i], prefix, matchInMiddle))
+              result.push(quote + atValues[i] + quote);
+          return returnHints();
+        }
+        if (atValues && atValues.then) return atValues.then(returnHintsFromAtValues);
+        return returnHintsFromAtValues(atValues);
       } else { // An attribute name
         if (token.type == "attribute") {
           prefix = token.string;
@@ -112,11 +118,14 @@
           result.push(attr);
       }
     }
-    return {
-      list: result,
-      from: replaceToken ? Pos(cur.line, tagStart == null ? token.start : tagStart) : cur,
-      to: replaceToken ? Pos(cur.line, token.end) : cur
-    };
+    function returnHints() {
+      return {
+        list: result,
+        from: replaceToken ? Pos(cur.line, tagStart == null ? token.start : tagStart) : cur,
+        to: replaceToken ? Pos(cur.line, token.end) : cur
+      };
+    }
+    return returnHints();
   }
 
   CodeMirror.registerHelper("hint", "xml", getHints);

From 79a6f26f998917403821f8e2c06661ccd9e6b7ef Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Wed, 19 Aug 2020 13:11:15 +0100
Subject: [PATCH 4298/4742] Recognise Cmd key in Firefox

---
 src/input/keynames.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/keynames.js b/src/input/keynames.js
index d3339038fc..eb09ca170f 100644
--- a/src/input/keynames.js
+++ b/src/input/keynames.js
@@ -5,7 +5,7 @@ export let keyNames = {
   46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
   106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 145: "ScrollLock",
   173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-  221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
+  221: "]", 222: "'", 224: "Mod", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
   63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
 }
 

From 4cfb3a038929d0b5f00d3741551cacd97081fc48 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Wed, 19 Aug 2020 15:18:49 +0100
Subject: [PATCH 4299/4742] Fix keyName function for Cmd key

Corrects return value, expected "Mod" instead of "Cmd-Mod".
---
 src/input/keymap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/keymap.js b/src/input/keymap.js
index 046b3505aa..f29f2bb17f 100644
--- a/src/input/keymap.js
+++ b/src/input/keymap.js
@@ -127,7 +127,7 @@ export function addModifierNames(name, event, noShift) {
   let base = name
   if (event.altKey && base != "Alt") name = "Alt-" + name
   if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name
-  if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name
+  if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Mod") name = "Cmd-" + name
   if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name
   return name
 }

From 7f525bb74e547b92c7f21af2ad13a4769bb944f6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Aug 2020 10:29:36 +0200
Subject: [PATCH 4300/4742] Mark version 5.57.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 16 ++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a9e79126b6..3fa6199e41 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -113,6 +113,7 @@ Bert Chang
 Bharad
 BigBlueHat
 Billy Moon
+Bin Ni
 binny
 Bjorn Hansen
 B Krishna Chaitanya
@@ -313,6 +314,7 @@ Hakan Tunc
 Hanno Fellmann
 Hans Engel
 Hanzhao Deng
+Haoran Yu
 Harald Schilly
 Hardest
 Harshvardhan Gupta
@@ -329,6 +331,7 @@ hidaiy
 Hiroyuki Makino
 hitsthings
 Hocdoc
+Howard
 Hugues Malphettes
 Ian Beck
 Ian Davies
@@ -492,6 +495,7 @@ Lorenzo Simionato
 Lorenzo Stoakes
 Louis Mauchet
 Luca Fabbri
+Lucas Buchala
 Luciano Longo
 Luciano Santana
 Lu Fangjian
@@ -637,6 +641,7 @@ Olivia Ytterbrink
 Opender Singh
 opl-
 Oreoluwa Onatemowo
+orionlee
 oscar.lofwenhamn
 Oskar Segersvärd
 ossdev
@@ -821,6 +826,7 @@ Tobias Bertelsen
 TobiasBg
 Todd Berman
 Todd Kennedy
+tokafew420
 Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13039b9701..8e651ec7ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 5.57.0 (2020-08-20)
+
+### Bug fixes
+
+Fix issue that broke binding the macOS Command key.
+
+[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Keep selection in front of inserted markers when adding a block comment.
+
+[css mode](https://codemirror.net/mode/css/): Recognize more properties and value names.
+
+[annotatescrollbar addon](https://codemirror.net/doc/manual.html#addon_annotatescrollbar): Don't hide matches in collapsed content.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Support tag text objects in xml and html modes.
+
 ## 5.56.0 (2020-07-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 9c04d7fadf..8635a1e060 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.56.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.57.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 6ab175a7b3..334a0184c6 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-08-2020: <a href="https://codemirror.net/codemirror-5.57.0.zip">Version 5.57.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix issue that broke binding the macOS Command key.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Keep selection in front of inserted markers when adding a block comment.</li>
+    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Recognize more properties and value names.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_annotatescrollbar">annotatescrollbar addon</a>: Don’t hide matches in collapsed content.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support tag text objects in xml and html modes.</li>
+  </ul>
+
   <p class="rel">20-07-2020: <a href="https://codemirror.net/codemirror-5.56.0.zip">Version 5.56.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 8ee9b384b2..f4ac53c0b9 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.56.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.57.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 374bd877d2..faf0ca08b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.56.0",
+  "version": "5.57.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 3b378e8f33..64e94929dd 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.56.0"
+CodeMirror.version = "5.57.0"

From 4105e3657c76558f457fb1692cfbf8fdfbda2bf5 Mon Sep 17 00:00:00 2001
From: Intervue <62877278+Intervue@users.noreply.github.com>
Date: Thu, 20 Aug 2020 19:04:46 +0530
Subject: [PATCH 4301/4742] [real-world uses] Add Intervue

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

diff --git a/doc/realworld.html b/doc/realworld.html
index bb2dc7f8b3..da6182515e 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -105,6 +105,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.homegenie.it/docs/automation_getstarted.php">Homegenie</a> (home automation server)</li>
       <li><a href="http://icecoder.net">ICEcoder</a> (web IDE)</li>
       <li><a href="https://innovay.app/formatter/html">Innovay Web Tools</a> (HTML, JS, CSS code beautifier)</li>
+      <li><a href="https://www.intervue.io">Intervue</a> (Pair programming for interviews)</li>
       <li><a href="http://ipython.org/">IPython</a> (interactive computing shell)</li>
       <li><a href="https://joelpinheiro.github.io/itrading/">iTrading</a> (Algorithmic Trading)</li>
       <li><a href="http://i-mos.org/imos/">i-MOS</a> (modeling and simulation platform)</li>

From 75f20016cf3c89257638b8e3fae43c7b4cb06aa8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 21 Aug 2020 19:18:30 +0200
Subject: [PATCH 4302/4742] [ruby mode] Add keyword lists as a hintWords helper

---
 mode/ruby/ruby.js | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index dd0e603e51..85bbfc657f 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -11,25 +11,28 @@
 })(function(CodeMirror) {
 "use strict";
 
+function wordObj(words) {
+  var o = {};
+  for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
+  return o;
+}
+
+var keywordList = [
+  "alias", "and", "BEGIN", "begin", "break", "case", "class", "def", "defined?", "do", "else",
+  "elsif", "END", "end", "ensure", "false", "for", "if", "in", "module", "next", "not", "or",
+  "redo", "rescue", "retry", "return", "self", "super", "then", "true", "undef", "unless",
+  "until", "when", "while", "yield", "nil", "raise", "throw", "catch", "fail", "loop", "callcc",
+  "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
+  "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
+], keywords = wordObj(keywordList);
+
+var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
+                           "catch", "loop", "proc", "begin"]);
+var dedentWords = wordObj(["end", "until"]);
+var opening = {"[": "]", "{": "}", "(": ")"};
+var closing = {"]": "[", "}": "{", ")": "("};
+
 CodeMirror.defineMode("ruby", function(config) {
-  function wordObj(words) {
-    var o = {};
-    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
-    return o;
-  }
-  var keywords = wordObj([
-    "alias", "and", "BEGIN", "begin", "break", "case", "class", "def", "defined?", "do", "else",
-    "elsif", "END", "end", "ensure", "false", "for", "if", "in", "module", "next", "not", "or",
-    "redo", "rescue", "retry", "return", "self", "super", "then", "true", "undef", "unless",
-    "until", "when", "while", "yield", "nil", "raise", "throw", "catch", "fail", "loop", "callcc",
-    "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
-    "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
-  ]);
-  var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
-                             "catch", "loop", "proc", "begin"]);
-  var dedentWords = wordObj(["end", "until"]);
-  var opening = {"[": "]", "{": "}", "(": ")"};
-  var closing = {"]": "[", "}": "{", ")": "("};
   var curPunc;
 
   function chain(newtok, stream, state) {
@@ -295,4 +298,6 @@ CodeMirror.defineMode("ruby", function(config) {
 
 CodeMirror.defineMIME("text/x-ruby", "ruby");
 
+CodeMirror.registerHelper("hintWords", "ruby", keywordList);
+
 });

From 62d84abb72a7ab131f50ffd2789e984074f16500 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 22 Aug 2020 17:24:50 +0200
Subject: [PATCH 4303/4742] [javascript mode] Improve handling of &&, ||, and
 ?? operators

Closes #6394
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 9c751d23f3..66e5a308d4 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -111,7 +111,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (ch != ">" || !state.lexical || state.lexical.type != ">") {
         if (stream.eat("=")) {
           if (ch == "!" || ch == "=") stream.eat("=")
-        } else if (/[<>*+\-]/.test(ch)) {
+        } else if (/[<>*+\-|&?]/.test(ch)) {
           stream.eat(ch)
           if (ch == ">") stream.eat(ch)
         }

From 6fcc49d5321261b525e50f111f3b28a602f01f71 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 22 Aug 2020 17:29:11 +0200
Subject: [PATCH 4304/4742] Don't default vim demo to contenteditable

That option was apparently left over from a debugging session
---
 demo/vim.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index c939505d8f..2e874cdfa4 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -95,8 +95,7 @@ <h2>Vim bindings demo</h2>
         mode: "text/x-csrc",
         keyMap: "vim",
         matchBrackets: true,
-        showCursorWhenSelecting: true,
-        inputStyle: "contenteditable"
+        showCursorWhenSelecting: true
       });
       var commandDisplay = document.getElementById('command-display');
       var keys = '';

From 63ab616f742922cd7649178b1fdaa55a9b78d652 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Tue, 1 Sep 2020 09:20:34 +0100
Subject: [PATCH 4305/4742] [vim] Add black hole register

---
 keymap/vim.js    |  6 ++++--
 test/vim_test.js | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 5a4860c65a..aca99cfbbe 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -8,7 +8,7 @@
  * Supported Ex commands:
  *   Refer to defaultExCommandMap below.
  *
- * Registers: unnamed, -, a-z, A-Z, 0-9
+ * Registers: unnamed, -, ., :, /, _, a-z, A-Z, 0-9
  *   (Does not respect the special case for number registers when delete
  *    operator is made with these commands: %, (, ),  , /, ?, n, N, {, } )
  *   TODO: Implement the remaining registers.
@@ -416,7 +416,7 @@
     var lowerCaseAlphabet = makeKeyRange(97, 26);
     var numbers = makeKeyRange(48, 10);
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
-    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
+    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '_', '/']);
 
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
@@ -1128,6 +1128,8 @@
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise, blockwise) {
+        // The black hole register, "_, means delete/yank to nowhere.
+        if (registerName === '_') return;
         if (linewise && text.charAt(text.length - 1) !== '\n'){
           text += '\n';
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index 57d276e871..9743041404 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2946,6 +2946,23 @@ testVim('yank_append_word_to_line_register', function(cm, vim, helpers) {
   });
   helpers.doKeys(':');
 }, { value: 'foo\nbar'});
+testVim('black_hole_register', function(cm,vim,helpers) {
+  helpers.doKeys('g', 'g', 'y', 'G');
+  var registersText;
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    registersText = text;
+  });
+  helpers.doKeys(':');
+  helpers.doKeys('"', '_', 'd', 'G');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    eq(registersText, text, 'One or more registers were modified');
+  });
+  helpers.doKeys(':');
+  helpers.doKeys('"', '_', 'p');
+  eq('', cm.getValue());
+}, { value: 'foo\nbar'});
 testVim('macro_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'a', 'i');

From b584546092b282e696ef23bc6a3e19bf896be04a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 4 Sep 2020 22:29:25 +0200
Subject: [PATCH 4306/4742] Add desmos sponsor link

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

diff --git a/index.html b/index.html
index f4ac53c0b9..21fe3ef0eb 100644
--- a/index.html
+++ b/index.html
@@ -202,6 +202,8 @@ <h2>Sponsors</h2>
   <ul class=sponsor-list>
     <li><a href="https://codepen.io/"><img src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>' alt="CodePen"></a></li>
     <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>
+    <li><a href="https://www.desmos.com/"><img src='data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="%23187a3d"%3E%3Cpath d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/%3E%3Cpath d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/%3E%3C/svg%3E%0A' alt=desmos></a></li>
+
   </ul>
 </section>
 

From 147a2f916c9c40902ab126fff284e0f87f4258e1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 11 Sep 2020 11:17:17 +0200
Subject: [PATCH 4307/4742] Make backspace delete by codepoint

Closes #6408
---
 src/edit/commands.js |  2 +-
 src/edit/methods.js  | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/edit/commands.js b/src/edit/commands.js
index 079379fce8..4c4cc4cd28 100644
--- a/src/edit/commands.js
+++ b/src/edit/commands.js
@@ -84,7 +84,7 @@ export let commands = {
   goGroupRight: cm => cm.moveH(1, "group"),
   goGroupLeft: cm => cm.moveH(-1, "group"),
   goWordRight: cm => cm.moveH(1, "word"),
-  delCharBefore: cm => cm.deleteH(-1, "char"),
+  delCharBefore: cm => cm.deleteH(-1, "codepoint"),
   delCharAfter: cm => cm.deleteH(1, "char"),
   delWordBefore: cm => cm.deleteH(-1, "word"),
   delWordAfter: cm => cm.deleteH(1, "word"),
diff --git a/src/edit/methods.js b/src/edit/methods.js
index acf90d1c56..a5e2afc39f 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -457,14 +457,14 @@ export default function(CodeMirror) {
 }
 
 // Used for horizontal relative motion. Dir is -1 or 1 (left or
-// right), unit can be "char", "column" (like char, but doesn't
-// cross line boundaries), "word" (across next word), or "group" (to
-// the start of next group of word or non-word-non-whitespace
-// chars). The visually param controls whether, in right-to-left
-// text, direction 1 means to move towards the next index in the
-// string, or towards the character to the right of the current
-// position. The resulting position will have a hitSide=true
-// property if it reached the end of the document.
+// right), unit can be "codepoint", "char", "column" (like char, but
+// doesn't cross line boundaries), "word" (across next word), or
+// "group" (to the start of next group of word or
+// non-word-non-whitespace chars). The visually param controls
+// whether, in right-to-left text, direction 1 means to move towards
+// the next index in the string, or towards the character to the right
+// of the current position. The resulting position will have a
+// hitSide=true property if it reached the end of the document.
 function findPosH(doc, pos, dir, unit, visually) {
   let oldPos = pos
   let origDir = dir
@@ -478,7 +478,12 @@ function findPosH(doc, pos, dir, unit, visually) {
   }
   function moveOnce(boundToLine) {
     let next
-    if (visually) {
+    if (unit == "codepoint") {
+      let ch = lineObj.text.charCodeAt(pos.ch + (unit > 0 ? 0 : -1))
+      if (isNaN(ch)) next = null
+      else next = new Pos(pos.line, Math.max(0, Math.min(lineObj.text.length, pos.ch + dir * (ch >= 0xD800 && ch < 0xDC00 ? 2 : 1))),
+                          -dir)
+    } else if (visually) {
       next = moveVisually(doc.cm, lineObj, pos, dir)
     } else {
       next = moveLogically(lineObj, pos, dir)
@@ -494,7 +499,7 @@ function findPosH(doc, pos, dir, unit, visually) {
     return true
   }
 
-  if (unit == "char") {
+  if (unit == "char" || unit == "codepoint") {
     moveOnce()
   } else if (unit == "column") {
     moveOnce(true)

From 2250b4a848974c3b2b0a9b1aec1ed8dea83d6d9d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 11 Sep 2020 12:44:08 +0200
Subject: [PATCH 4308/4742] Fix bug causing a deleted editor to continue
 believing it had focus

Which kept the cursor blink and input poll intervals alive, leaking
memory.

Closes #6410
---
 src/display/selection.js | 7 +++++--
 src/edit/CodeMirror.js   | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/display/selection.js b/src/display/selection.js
index c658c0a272..d377a9f4c8 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -4,6 +4,7 @@ import { getLine } from "../line/utils_line.js"
 import { charCoords, cursorCoords, displayWidth, paddingH, wrappedLineExtentChar } from "../measurement/position_measurement.js"
 import { getOrder, iterateBidiSections } from "../util/bidi.js"
 import { elt } from "../util/dom.js"
+import { onBlur } from "./focus.js"
 
 export function updateSelection(cm) {
   cm.display.input.showSelection(cm.display.input.prepareSelection())
@@ -151,8 +152,10 @@ export function restartBlink(cm) {
   let on = true
   display.cursorDiv.style.visibility = ""
   if (cm.options.cursorBlinkRate > 0)
-    display.blinker = setInterval(() => display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden",
-      cm.options.cursorBlinkRate)
+    display.blinker = setInterval(() => {
+      if (!cm.hasFocus()) onBlur(cm)
+      display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"
+    }, cm.options.cursorBlinkRate)
   else if (cm.options.cursorBlinkRate < 0)
     display.cursorDiv.style.visibility = "hidden"
 }
diff --git a/src/edit/CodeMirror.js b/src/edit/CodeMirror.js
index 3429da1efc..dc01611390 100644
--- a/src/edit/CodeMirror.js
+++ b/src/edit/CodeMirror.js
@@ -14,7 +14,7 @@ import { Range } from "../model/selection.js"
 import { extendSelection } from "../model/selection_updates.js"
 import { ie, ie_version, mobile, webkit } from "../util/browser.js"
 import { e_preventDefault, e_stop, on, signal, signalDOMEvent } from "../util/event.js"
-import { bind, copyObj, Delayed } from "../util/misc.js"
+import { copyObj, Delayed } from "../util/misc.js"
 
 import { clearDragCursor, onDragOver, onDragStart, onDrop } from "./drop_events.js"
 import { ensureGlobalHandlers } from "./global_events.js"
@@ -76,7 +76,9 @@ export function CodeMirror(place, options) {
   attachDoc(this, doc)
 
   if ((options.autofocus && !mobile) || this.hasFocus())
-    setTimeout(bind(onFocus, this), 20)
+    setTimeout(() => {
+      if (this.hasFocus() && !this.state.focused) onFocus(this)
+    }, 20)
   else
     onBlur(this)
 

From fd2e32250e4c9f3232634110bb2a2389da97e783 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 13 Sep 2020 11:35:26 +0200
Subject: [PATCH 4309/4742] Suppress focus outline for scrollbar elements

Issue #6412
---
 lib/codemirror.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 56896500e7..a64f97c777 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -184,6 +184,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   position: absolute;
   z-index: 6;
   display: none;
+  outline: none;
 }
 .CodeMirror-vscrollbar {
   right: 0; top: 0;

From b6da8bf16b55bff0734b14f9eeb636f35b03e124 Mon Sep 17 00:00:00 2001
From: Howard Jing <howardjing@google.com>
Date: Mon, 7 Sep 2020 17:21:50 -0400
Subject: [PATCH 4310/4742] Add vim emulation support for `gn` and `gN`.

If we are given the following snippet of text:

```
A green green sky.
  _
```

We can search for the word "green" with `/green`, and then use `gn` to
select the next occurrence of "green" in visual mode.

```
A green green sky.
  -----
```

Alternatively, we can use `cgn` and then enter the word "blue" to change the
word "green" to "blue".

```
A blue green sky.
```

Then we can use the `.` operator to repeat the change:

```
A blue blue sky.
```

Addresses #3851.
---
 demo/vim.html    |   7 +-
 keymap/vim.js    | 149 +++++++++++++++++++++++++++++++++++++----
 test/vim_test.js | 169 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 311 insertions(+), 14 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index 2e874cdfa4..172ab6f04f 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -56,6 +56,7 @@ <h2>Vim bindings demo</h2>
 }
 </textarea></form>
 <div style="font-size: 13px; width: 300px; height: 30px;">Key buffer: <span id="command-display"></span></div>
+<div style="font-size: 13px; width: 300px; height: 30px;">Vim mode: <span id="vim-mode"></span></div>
 
 <p>The vim keybindings are enabled by including <code><a
 href="../keymap/vim.js">keymap/vim.js</a></code> and setting the
@@ -101,12 +102,16 @@ <h2>Vim bindings demo</h2>
       var keys = '';
       CodeMirror.on(editor, 'vim-keypress', function(key) {
         keys = keys + key;
-        commandDisplay.innerHTML = keys;
+        commandDisplay.innerText = keys;
       });
       CodeMirror.on(editor, 'vim-command-done', function(e) {
         keys = '';
         commandDisplay.innerHTML = keys;
       });
+      var vimMode = document.getElementById('vim-mode');
+      CodeMirror.on(editor, 'vim-mode-change', function(e) {
+        vimMode.innerText = JSON.stringify(e);
+      });
     </script>
 
   </article>
diff --git a/keymap/vim.js b/keymap/vim.js
index aca99cfbbe..789e1e55b3 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -141,6 +141,8 @@
     { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
     { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
     { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
+    { keys: 'gn', type: 'motion', motion: 'findAndSelectNextInclusive', motionArgs: { forward: true }},
+    { keys: 'gN', type: 'motion', motion: 'findAndSelectNextInclusive', motionArgs: { forward: false }},
     // Operator-Motion dual commands
     { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
     { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
@@ -1576,7 +1578,7 @@
         motionArgs.repeat = repeat;
         clearInputState(cm);
         if (motion) {
-          var motionResult = motions[motion](cm, origHead, motionArgs, vim);
+          var motionResult = motions[motion](cm, origHead, motionArgs, vim, inputState);
           vim.lastMotion = motions[motion];
           if (!motionResult) {
             return;
@@ -1774,6 +1776,87 @@
         highlightSearchMatches(cm, query);
         return findNext(cm, prev/** prev */, query, motionArgs.repeat);
       },
+      /**
+       * Find and select the next occurrence of the search query. If the cursor is currently
+       * within a match, then find and select the current match. Otherwise, find the next occurrence in the
+       * appropriate direction.
+       *
+       * This differs from `findNext` in the following ways:
+       *
+       * 1. Instead of only returning the "from", this returns a "from", "to" range.
+       * 2. If the cursor is currently inside a search match, this selects the current match
+       *    instead of the next match.
+       * 3. If there is no associated operator, this will turn on visual mode.
+       */
+      findAndSelectNextInclusive: function(cm, _head, motionArgs, vim, prevInputState) {
+        var state = getSearchState(cm);
+        var query = state.getQuery();
+
+        if (!query) {
+          return;
+        }
+
+        var prev = !motionArgs.forward;
+        prev = (state.isReversed()) ? !prev : prev;
+
+        // next: [from, to] | null
+        var next = findNextFromAndToInclusive(cm, prev, query, motionArgs.repeat, vim);
+
+        // No matches.
+        if (!next) {
+          return;
+        }
+
+        // If there's an operator that will be executed, return the selection.
+        if (prevInputState.operator) {
+          return next;
+        }
+
+        // At this point, we know that there is no accompanying operator -- let's
+        // deal with visual mode in order to select an appropriate match.
+
+        var from = next[0];
+        // For whatever reason, when we use the "to" as returned by searchcursor.js directly,
+        // the resulting selection is extended by 1 char. Let's shrink it so that only the
+        // match is selected.
+        var to = Pos(next[1].line, next[1].ch - 1);
+
+        if (vim.visualMode) {
+          // If we were in visualLine or visualBlock mode, get out of it.
+          if (vim.visualLine || vim.visualBlock) {
+            vim.visualLine = false;
+            vim.visualBlock = false;
+            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: ""});
+          }
+
+          // If we're currently in visual mode, we should extend the selection to include
+          // the search result.
+          var anchor = vim.sel.anchor;
+          if (anchor) {
+            if (state.isReversed()) {
+              if (motionArgs.forward) {
+                return [anchor, from];
+              }
+
+              return [anchor, to];
+            } else {
+              if (motionArgs.forward) {
+                return [anchor, to];
+              }
+
+              return [anchor, from];
+            }
+          }
+        } else {
+          // Let's turn visual mode on.
+          vim.visualMode = true;
+          vim.visualLine = false;
+          vim.visualBlock = false;
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: ""});
+        }
+
+        return prev ? [to, from] : [from, to];
+      },
       goToMark: function(cm, _head, motionArgs, vim) {
         var pos = getMarkPos(cm, vim, motionArgs.selectedCharacter);
         if (pos) {
@@ -1869,8 +1952,8 @@
         // move to previous/next line is triggered.
         if (line < first && cur.line == first){
           return this.moveToStartOfLine(cm, head, motionArgs, vim);
-        }else if (line > last && cur.line == last){
-            return this.moveToEol(cm, head, motionArgs, vim, true);
+        } else if (line > last && cur.line == last){
+            return moveToEol(cm, head, motionArgs, vim, true);
         }
         if (motionArgs.toFirstChar){
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
@@ -1972,16 +2055,8 @@
         vim.lastHSPos = cm.charCoords(head,'div').left;
         return moveToColumn(cm, repeat);
       },
-      moveToEol: function(cm, head, motionArgs, vim, keepHPos) {
-        var cur = head;
-        var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
-        var end=cm.clipPos(retval);
-        end.ch--;
-        if (!keepHPos) {
-          vim.lastHPos = Infinity;
-          vim.lastHSPos = cm.charCoords(end,'div').left;
-        }
-        return retval;
+      moveToEol: function(cm, head, motionArgs, vim) {
+        return moveToEol(cm, head, motionArgs, vim, false);
       },
       moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
         // Go to the start of the line where the text begins, or the end for
@@ -3609,6 +3684,18 @@
       }
     }
 
+    function moveToEol(cm, head, motionArgs, vim, keepHPos) {
+      var cur = head;
+      var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
+      var end=cm.clipPos(retval);
+      end.ch--;
+      if (!keepHPos) {
+        vim.lastHPos = Infinity;
+        vim.lastHSPos = cm.charCoords(end,'div').left;
+      }
+      return retval;
+    }
+
     function moveToCharacter(cm, repeat, forward, character) {
       var cur = cm.getCursor();
       var start = cur.ch;
@@ -4350,6 +4437,42 @@
         return cursor.from();
       });
     }
+    /**
+     * Pretty much the same as `findNext`, except for the following differences:
+     *
+     * 1. Before starting the search, move to the previous search. This way if our cursor is
+     * already inside a match, we should return the current match.
+     * 2. Rather than only returning the cursor's from, we return the cursor's from and to as a tuple.
+     */
+    function findNextFromAndToInclusive(cm, prev, query, repeat, vim) {
+      if (repeat === undefined) { repeat = 1; }
+      return cm.operation(function() {
+        var pos = cm.getCursor();
+        var cursor = cm.getSearchCursor(query, pos);
+
+        // Go back one result to ensure that if the cursor is currently a match, we keep it.
+        var found = cursor.find(!prev);
+
+        // If we haven't moved, go back one more (similar to if i==0 logic in findNext).
+        if (!vim.visualMode && found && cursorEqual(cursor.from(), pos)) {
+          cursor.find(!prev);
+        }
+
+        for (var i = 0; i < repeat; i++) {
+          found = cursor.find(prev);
+          if (!found) {
+            // SearchCursor may have returned null because it hit EOF, wrap
+            // around and try again.
+            cursor = cm.getSearchCursor(query,
+                (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
+            if (!cursor.find(prev)) {
+              return;
+            }
+          }
+        }
+        return [cursor.from(), cursor.to()];
+      });
+    }
     function clearSearchHighlight(cm) {
       var state = getSearchState(cm);
       cm.removeOverlay(getSearchState(cm).getOverlay());
diff --git a/test/vim_test.js b/test/vim_test.js
index 9743041404..c75a1646cf 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -2579,6 +2579,91 @@ testVim('/ and n/N', function(cm, vim, helpers) {
   helpers.doKeys('2', '/');
   helpers.assertCursorAt(1, 6);
 }, { value: 'match nope match \n nope Match' });
+testVim('/ and gn selects the appropriate word', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 11);
+
+  // gn should highlight the the current word while it is within a match.
+
+  // gn when cursor is in beginning of match
+  helpers.doKeys('gn', '<Esc>');
+  helpers.assertCursorAt(0, 15);
+
+  // gn when cursor is at end of match
+  helpers.doKeys('gn', '<Esc>');
+  helpers.doKeys('<Esc>');
+  helpers.assertCursorAt(0, 15);
+
+  // consecutive gns should extend the selection
+  helpers.doKeys('gn');
+  helpers.assertCursorAt(0, 16);
+  helpers.doKeys('gn');
+  helpers.assertCursorAt(1, 11);
+
+  // we should have selected the second and third "match"
+  helpers.doKeys('d');
+  eq('match nope ', cm.getValue());
+}, { value: 'match nope match \n nope Match' });
+testVim('/ and gN selects the appropriate word', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 11);
+
+  // gN when cursor is at beginning of match
+  helpers.doKeys('gN', '<Esc>');
+  helpers.assertCursorAt(0, 11);
+
+  // gN when cursor is at end of match
+  helpers.doKeys('e', 'gN', '<Esc>');
+  helpers.assertCursorAt(0, 11);
+
+  // consecutive gNs should extend the selection
+  helpers.doKeys('gN');
+  helpers.assertCursorAt(0, 11);
+  helpers.doKeys('gN');
+  helpers.assertCursorAt(0, 0);
+
+  // we should have selected the first and second "match"
+  helpers.doKeys('d');
+  eq(' \n nope Match', cm.getValue());
+}, { value: 'match nope match \n nope Match' })
+testVim('/ and gn with an associated operator', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 11);
+
+  helpers.doKeys('c', 'gn', 'changed', '<Esc>');
+
+  // change the current match.
+  eq('match nope changed \n nope Match', cm.getValue());
+
+  // change the next match.
+  helpers.doKeys('.');
+  eq('match nope changed \n nope changed', cm.getValue());
+
+  // change the final match.
+  helpers.doKeys('.');
+  eq('changed nope changed \n nope changed', cm.getValue());
+}, { value: 'match nope match \n nope Match' });
+testVim('/ and gN with an associated operator', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 11);
+
+  helpers.doKeys('c', 'gN', 'changed', '<Esc>');
+
+  // change the current match.
+  eq('match nope changed \n nope Match', cm.getValue());
+
+  // change the next match.
+  helpers.doKeys('.');
+  eq('changed nope changed \n nope Match', cm.getValue());
+
+  // change the final match.
+  helpers.doKeys('.');
+  eq('changed nope changed \n nope changed', cm.getValue());
+}, { value: 'match nope match \n nope Match' });
 testVim('/_case', function(cm, vim, helpers) {
   cm.openDialog = helpers.fakeOpenDialog('Match');
   helpers.doKeys('/');
@@ -2679,6 +2764,90 @@ testVim('? and n/N', function(cm, vim, helpers) {
   helpers.doKeys('2', '?');
   helpers.assertCursorAt(0, 11);
 }, { value: 'match nope match \n nope Match' });
+testVim('? and gn selects the appropriate word', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('?', 'n');
+  helpers.assertCursorAt(0, 11);
+
+  // gn should highlight the the current word while it is within a match.
+
+  // gn when cursor is in beginning of match
+  helpers.doKeys('gn', '<Esc>');
+  helpers.assertCursorAt(0, 11);
+
+  // gn when cursor is at end of match
+  helpers.doKeys('e', 'gn', '<Esc>');
+  helpers.assertCursorAt(0, 11);
+
+  // consecutive gns should extend the selection
+  helpers.doKeys('gn');
+  helpers.assertCursorAt(0, 11);
+  helpers.doKeys('gn');
+  helpers.assertCursorAt(0, 0);
+
+  // we should have selected the first and second "match"
+  helpers.doKeys('d');
+  eq(' \n nope Match', cm.getValue());
+}, { value: 'match nope match \n nope Match' });
+testVim('? and gN selects the appropriate word', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('?', 'n');
+  helpers.assertCursorAt(0, 11);
+
+  // gN when cursor is at beginning of match
+  helpers.doKeys('gN', '<Esc>');
+  helpers.assertCursorAt(0, 15);
+
+  // gN when cursor is at end of match
+  helpers.doKeys('gN', '<Esc>');
+  helpers.assertCursorAt(0, 15);
+
+  // consecutive gNs should extend the selection
+  helpers.doKeys('gN');
+  helpers.assertCursorAt(0, 16);
+  helpers.doKeys('gN');
+  helpers.assertCursorAt(1, 11);
+
+  // we should have selected the second and third "match"
+  helpers.doKeys('d');
+  eq('match nope ', cm.getValue());
+}, { value: 'match nope match \n nope Match' })
+testVim('? and gn with an associated operator', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('?', 'n');
+  helpers.assertCursorAt(0, 11);
+
+  helpers.doKeys('c', 'gn', 'changed', '<Esc>');
+
+  // change the current match.
+  eq('match nope changed \n nope Match', cm.getValue());
+
+  // change the next match.
+  helpers.doKeys('.');
+  eq('changed nope changed \n nope Match', cm.getValue());
+
+  // change the final match.
+  helpers.doKeys('.');
+  eq('changed nope changed \n nope changed', cm.getValue());
+}, { value: 'match nope match \n nope Match' });
+testVim('? and gN with an associated operator', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('?', 'n');
+  helpers.assertCursorAt(0, 11);
+
+  helpers.doKeys('c', 'gN', 'changed', '<Esc>');
+
+  // change the current match.
+  eq('match nope changed \n nope Match', cm.getValue());
+
+  // change the next match.
+  helpers.doKeys('.');
+  eq('match nope changed \n nope changed', cm.getValue());
+
+  // change the final match.
+  helpers.doKeys('.');
+  eq('changed nope changed \n nope changed', cm.getValue());
+}, { value: 'match nope match \n nope Match' });
 testVim('*', function(cm, vim, helpers) {
   cm.setCursor(0, 9);
   helpers.doKeys('*');

From db719a2e37f802e79d5e0abeed58721ed95fbaa9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Sep 2020 09:09:24 +0200
Subject: [PATCH 4311/4742] Fix drawing of marked text with only attributes

Closes #6414
---
 src/line/line_data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/line/line_data.js b/src/line/line_data.js
index 20dd432831..e650b3e306 100644
--- a/src/line/line_data.js
+++ b/src/line/line_data.js
@@ -178,7 +178,7 @@ function buildToken(builder, text, style, startStyle, endStyle, css, attributes)
     }
   }
   builder.trailingSpace = displayText.charCodeAt(text.length - 1) == 32
-  if (style || startStyle || endStyle || mustWrap || css) {
+  if (style || startStyle || endStyle || mustWrap || css || attributes) {
     let fullStyle = style || ""
     if (startStyle) fullStyle += startStyle
     if (endStyle) fullStyle += endStyle

From 18aa69e17cc7703f106fbe03992456b8e59e8cdc Mon Sep 17 00:00:00 2001
From: Adrian Kunz <clashsoft@hotmail.com>
Date: Thu, 17 Sep 2020 11:32:20 +0200
Subject: [PATCH 4312/4742] [lint addon] Use separate CSS classes for common
 lint styles

This changes lint.css to be less reliant on the predefined severities
(error and warning), in turn making it easier to define custom ones.
Now all that needs to be done in order to define a new severity, e.g.
`note`, is to add the following CSS:

```css
/* underline */
.CodeMirror-lint-mark-note {
  background-image: ...;
}

/* icon */
.CodeMirror-lint-marker-note, .CodeMirror-lint-message-note {
  background-image: ...;
}
```

Previously, it was necessary to copy many styles that were only
available under the `CodeMirror-lint-*-error` and
`CodeMirror-lint-*-warning` classes.
---
 addon/lint/lint.css | 6 +++---
 addon/lint/lint.js  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index f097cfe345..fef620a492 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -25,7 +25,7 @@
   -ms-transition: opacity .4s;
 }
 
-.CodeMirror-lint-mark-error, .CodeMirror-lint-mark-warning {
+.CodeMirror-lint-mark {
   background-position: left bottom;
   background-repeat: repeat-x;
 }
@@ -40,7 +40,7 @@
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
 }
 
-.CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
+.CodeMirror-lint-marker {
   background-position: center center;
   background-repeat: no-repeat;
   cursor: pointer;
@@ -51,7 +51,7 @@
   position: relative;
 }
 
-.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
+.CodeMirror-lint-message {
   padding-left: 18px;
   background-position: top left;
   background-repeat: no-repeat;
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 5bc1af18ae..963f2cf227 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -83,10 +83,10 @@
 
   function makeMarker(cm, labels, severity, multiple, tooltips) {
     var marker = document.createElement("div"), inner = marker;
-    marker.className = "CodeMirror-lint-marker-" + severity;
+    marker.className = "CodeMirror-lint-marker CodeMirror-lint-marker-" + severity;
     if (multiple) {
       inner = marker.appendChild(document.createElement("div"));
-      inner.className = "CodeMirror-lint-marker-multiple";
+      inner.className = "CodeMirror-lint-marker CodeMirror-lint-marker-multiple";
     }
 
     if (tooltips != false) CodeMirror.on(inner, "mouseover", function(e) {
@@ -114,7 +114,7 @@
     var severity = ann.severity;
     if (!severity) severity = "error";
     var tip = document.createElement("div");
-    tip.className = "CodeMirror-lint-message-" + severity;
+    tip.className = "CodeMirror-lint-message CodeMirror-lint-message-" + severity;
     if (typeof ann.messageHTML != 'undefined') {
       tip.innerHTML = ann.messageHTML;
     } else {
@@ -183,7 +183,7 @@
         if (state.hasGutter) tipLabel.appendChild(annotationTooltip(ann));
 
         if (ann.to) state.marked.push(cm.markText(ann.from, ann.to, {
-          className: "CodeMirror-lint-mark-" + severity,
+          className: "CodeMirror-lint-mark CodeMirror-lint-mark-" + severity,
           __annotation: ann
         }));
       }

From 376c0d9a9e67f42fa2c77e3529b1740097ea68b3 Mon Sep 17 00:00:00 2001
From: Adrian Kunz <clashsoft@hotmail.com>
Date: Sun, 20 Sep 2020 14:36:24 +0200
Subject: [PATCH 4313/4742] [lint addon] Put error CSS after warning

By swapping the CSS rules, the error rules take priority in case there
are markers with both severities on the same token. That token is now
underlined red instead of yellow, making it consistent with how errors
take priority in the gutter.
---
 addon/lint/lint.css | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index fef620a492..0871865959 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -30,16 +30,14 @@
   background-repeat: repeat-x;
 }
 
-.CodeMirror-lint-mark-error {
-  background-image:
-  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==")
-  ;
-}
-
 .CodeMirror-lint-mark-warning {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
 }
 
+.CodeMirror-lint-mark-error {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==");
+}
+
 .CodeMirror-lint-marker {
   background-position: center center;
   background-repeat: no-repeat;
@@ -57,14 +55,14 @@
   background-repeat: no-repeat;
 }
 
-.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
-}
-
 .CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
 }
 
+.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
+}
+
 .CodeMirror-lint-marker-multiple {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
   background-repeat: no-repeat;

From 66a96a567b7b1e3da6319bd933c94b284811f161 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 20 Sep 2020 19:37:00 +0200
Subject: [PATCH 4314/4742] Set the readonly attribute on the hidden textarea
 when the editor is read-only

This prevents cut/paste from showing up in the context menu on Chrome
(but doesn't help on Firefox).

Closes #6418
---
 src/input/TextareaInput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 8fe14bb413..977eb22723 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -366,6 +366,7 @@ export default class TextareaInput {
   readOnlyChanged(val) {
     if (!val) this.reset()
     this.textarea.disabled = val == "nocursor"
+    this.textarea.readOnly = !!val
   }
 
   setUneditable() {}

From 7b63084691b9c56baf02e5f2c2a9d5aebd435dc1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Sep 2020 09:46:57 +0200
Subject: [PATCH 4315/4742] Update placeholder visibility during composition

Closes #6420:
---
 addon/display/placeholder.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 4eabe3d901..19e9a3418c 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -15,11 +15,13 @@
       cm.on("blur", onBlur);
       cm.on("change", onChange);
       cm.on("swapDoc", onChange);
+      CodeMirror.on(cm.getInputField(), "compositionupdate", cm.state.placeholderCompose = () => onComposition(cm))
       onChange(cm);
     } else if (!val && prev) {
       cm.off("blur", onBlur);
       cm.off("change", onChange);
       cm.off("swapDoc", onChange);
+      CodeMirror.off(cm.getInputField(), "compositionupdate", cm.state.placeholderCompose)
       clearPlaceholder(cm);
       var wrapper = cm.getWrapperElement();
       wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");
@@ -46,6 +48,16 @@
     cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
   }
 
+  function onComposition(cm) {
+    var empty = true, input = cm.getInputField()
+    if (input.nodeName == "TEXTAREA")
+      empty = !input.value
+    else if (cm.lineCount() == 1)
+      empty = !/[^\u200b]/.test(input.querySelector(".CodeMirror-line").textContent)
+    if (empty) clearPlaceholder(cm)
+    else setPlaceholder(cm)
+  }
+
   function onBlur(cm) {
     if (isEmpty(cm)) setPlaceholder(cm);
   }

From 76590dcb0683c0ef94c19133d64afe8bb43373ba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Sep 2020 09:52:29 +0200
Subject: [PATCH 4316/4742] Mark version 5.58.0

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 20 ++++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 12 ++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 3fa6199e41..bb017e9574 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,7 @@ Adán Lobato
 Aditya Toshniwal
 Adrian Aichner
 Adrian Heine
+Adrian Kunz
 Adrien Bertrand
 aeroson
 Ahmad Amireh
@@ -332,6 +333,7 @@ Hiroyuki Makino
 hitsthings
 Hocdoc
 Howard
+Howard Jing
 Hugues Malphettes
 Ian Beck
 Ian Davies
@@ -348,6 +350,7 @@ ilvalle
 Ilya Kharlamov
 Ilya Zverev
 Ingo Richter
+Intervue
 Irakli Gozalishvili
 Ivan Kurnosov
 Ivoah
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e651ec7ec..782f493af6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 5.58.0 (2020-09-21)
+
+### Bug fixes
+
+Make backspace delete by code point, not glyph.
+
+Suppress flickering focus outline when clicking on scrollbars in Chrome.
+
+Fix a bug that prevented attributes added via `markText` from showing up unless the span also had some other styling.
+
+Suppress cut and paste context menu entries in readonly editors in Chrome.
+
+[placeholder addon](https://codemirror.net/doc/manual.html#addon_placeholder): Update placeholder visibility during composition.
+
+### New features
+
+Make it less cumbersome to style new lint message types.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Support black hole register, `gn` and `gN`
+
 ## 5.57.0 (2020-08-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 8635a1e060..e193f9929b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.57.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.58.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 334a0184c6..3e0adcda6e 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,18 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-09-2020: <a href="https://codemirror.net/codemirror-5.58.0.zip">Version 5.58.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Make backspace delete by code point, not glyph.</li>
+    <li>Suppress flickering focus outline when clicking on scrollbars in Chrome.</li>
+    <li>Fix a bug that prevented attributes added via <code>markText</code> from showing up unless the span also had some other styling.</li>
+    <li>Suppress cut and paste context menu entries in readonly editors in Chrome.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: Update placeholder visibility during composition.</li>
+    <li>Make it less cumbersome to style new lint message types.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support black hole register, <code>gn</code> and <code>gN</code></li>
+  </ul>
+
   <p class="rel">20-08-2020: <a href="https://codemirror.net/codemirror-5.57.0.zip">Version 5.57.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 21fe3ef0eb..b6b595b9c4 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.57.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.58.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index faf0ca08b6..4472c6be3d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.57.0",
+  "version": "5.58.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 64e94929dd..00990e1601 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.57.0"
+CodeMirror.version = "5.58.0"

From c74a1cafc01a7e34af1b19dd4c82ff821c2e1442 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Sep 2020 09:55:45 +0200
Subject: [PATCH 4317/4742] Fix use of ES6 in addon

---
 addon/display/placeholder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 19e9a3418c..eb8332ac4b 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -15,7 +15,7 @@
       cm.on("blur", onBlur);
       cm.on("change", onChange);
       cm.on("swapDoc", onChange);
-      CodeMirror.on(cm.getInputField(), "compositionupdate", cm.state.placeholderCompose = () => onComposition(cm))
+      CodeMirror.on(cm.getInputField(), "compositionupdate", cm.state.placeholderCompose = function() { onComposition(cm) })
       onChange(cm);
     } else if (!val && prev) {
       cm.off("blur", onBlur);

From ca046d7d2fe737a0f09b90e2ae455093ca60faa5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 22 Sep 2020 21:19:03 +0200
Subject: [PATCH 4318/4742] [placeholder addon] Fix composition handling

Issue #6422
---
 addon/display/placeholder.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index eb8332ac4b..89bb93f378 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -49,13 +49,15 @@
   }
 
   function onComposition(cm) {
-    var empty = true, input = cm.getInputField()
-    if (input.nodeName == "TEXTAREA")
-      empty = !input.value
-    else if (cm.lineCount() == 1)
-      empty = !/[^\u200b]/.test(input.querySelector(".CodeMirror-line").textContent)
-    if (empty) clearPlaceholder(cm)
-    else setPlaceholder(cm)
+    setTimeout(function() {
+      var empty = false, input = cm.getInputField()
+      if (input.nodeName == "TEXTAREA")
+        empty = !input.value
+      else if (cm.lineCount() == 1)
+        empty = !/[^\u200b]/.test(input.querySelector(".CodeMirror-line").textContent)
+      if (empty) setPlaceholder(cm)
+      else clearPlaceholder(cm)
+    }, 20)
   }
 
   function onBlur(cm) {

From 1c60749b6882bd67b2a11a3f2e21cffa5eb4c5d3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 23 Sep 2020 10:11:42 +0200
Subject: [PATCH 4319/4742] Mark version 5.58.1

---
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 8 ++++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 782f493af6..d3e3fe4223 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.58.1 (2020-09-23)
+
+### Bug fixes
+
+[placeholder addon](https://codemirror.net/doc/manual.html#addon_placeholder): Remove arrow function that ended up in the code.
+
 ## 5.58.0 (2020-09-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index e193f9929b..42ab5491ed 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.58.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.58.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 3e0adcda6e..3b4378f3f1 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -32,6 +32,14 @@ <h2>Version 5.x</h2>
 
   <p class="rel">21-09-2020: <a href="https://codemirror.net/codemirror-5.58.0.zip">Version 5.58.0</a>:</p>
 
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: Remove arrow function that ended up in the code.</li>
+  </ul>
+
+  <h2>Version 5.x</h2>
+
+  <p class="rel">21-09-2020: <a href="https://codemirror.net/codemirror-5.58.0.zip">Version 5.58.0</a>:</p>
+
   <ul class="rel-note">
     <li>Make backspace delete by code point, not glyph.</li>
     <li>Suppress flickering focus outline when clicking on scrollbars in Chrome.</li>
diff --git a/index.html b/index.html
index b6b595b9c4..ff27b925b7 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.58.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.58.1</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 4472c6be3d..ba8e7fc79d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.58.0",
+  "version": "5.58.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 00990e1601..4f9152d892 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.58.0"
+CodeMirror.version = "5.58.1"

From f3dde7c60552daea3de7d4141ba9553197f20543 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 26 Sep 2020 21:56:10 +0200
Subject: [PATCH 4320/4742] [julia mode] Fix infinite recursion

I couldn't figure out what the original code was intended to do, but
I've tried to fix the problem without changing it more than necessary.

Closes #6428
---
 mode/julia/julia.js | 63 +++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index f1d2cd5c4b..3942492042 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -255,41 +255,43 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   }
 
   function tokenCallOrDef(stream, state) {
-    var match = stream.match(/^(\(\s*)/);
-    if (match) {
-      if (state.firstParenPos < 0)
-        state.firstParenPos = state.scopes.length;
-      state.scopes.push('(');
-      state.charsAdvanced += match[1].length;
-    }
-    if (currentScope(state) == '(' && stream.match(/^\)/)) {
-      state.scopes.pop();
-      state.charsAdvanced += 1;
-      if (state.scopes.length <= state.firstParenPos) {
-        var isDefinition = stream.match(/^(\s*where\s+[^\s=]+)*\s*?=(?!=)/, false);
-        stream.backUp(state.charsAdvanced);
+    for (;;) {
+      var match = stream.match(/^(\(\s*)/), charsAdvanced = 0;
+      if (match) {
+        if (state.firstParenPos < 0)
+          state.firstParenPos = state.scopes.length;
+        state.scopes.push('(');
+        charsAdvanced += match[1].length;
+      }
+      if (currentScope(state) == '(' && stream.match(/^\)/)) {
+        state.scopes.pop();
+        charsAdvanced += 1;
+        if (state.scopes.length <= state.firstParenPos) {
+          var isDefinition = stream.match(/^(\s*where\s+[^\s=]+)*\s*?=(?!=)/, false);
+          stream.backUp(charsAdvanced);
+          state.firstParenPos = -1;
+          state.tokenize = tokenBase;
+          if (isDefinition)
+            return "def";
+          return "builtin";
+        }
+      }
+      // Unfortunately javascript does not support multiline strings, so we have
+      // to undo anything done upto here if a function call or definition splits
+      // over two or more lines.
+      if (stream.match(/^$/g, false)) {
+        stream.backUp(charsAdvanced);
+        while (state.scopes.length > state.firstParenPos)
+          state.scopes.pop();
         state.firstParenPos = -1;
-        state.charsAdvanced = 0;
         state.tokenize = tokenBase;
-        if (isDefinition)
-          return "def";
         return "builtin";
       }
+      if (!stream.match(/^[^()]+/)) {
+        stream.next()
+        return null
+      }
     }
-    // Unfortunately javascript does not support multiline strings, so we have
-    // to undo anything done upto here if a function call or definition splits
-    // over two or more lines.
-    if (stream.match(/^$/g, false)) {
-      stream.backUp(state.charsAdvanced);
-      while (state.scopes.length > state.firstParenPos)
-        state.scopes.pop();
-      state.firstParenPos = -1;
-      state.charsAdvanced = 0;
-      state.tokenize = tokenBase;
-      return "builtin";
-    }
-    state.charsAdvanced += stream.match(/^([^()]*)/)[1].length;
-    return state.tokenize(stream, state);
   }
 
   function tokenAnnotation(stream, state) {
@@ -383,7 +385,6 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         nestedComments: 0,
         nestedGenerators: 0,
         nestedParameters: 0,
-        charsAdvanced: 0,
         firstParenPos: -1
       };
     },

From 58c553470fe6d65d494d4dbaf471f6ec97f9ab9d Mon Sep 17 00:00:00 2001
From: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
Date: Mon, 28 Sep 2020 12:11:52 +1000
Subject: [PATCH 4321/4742] Fixes #6331. Backticks are stripped from SQL query
 words before comparison

---
 addon/hint/sql-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index de84707db3..5b65e29105 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -187,7 +187,7 @@
   function eachWord(lineText, f) {
     var words = lineText.split(/\s+/)
     for (var i = 0; i < words.length; i++)
-      if (words[i]) f(words[i].replace(/[,;]/g, ''))
+      if (words[i]) f(words[i].replace(/[`,;]/g, ''))
   }
 
   function findTableByAlias(alias, editor) {

From fdc2de3856f928d04fdac222294870edb9ce639b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 28 Sep 2020 14:45:21 +0200
Subject: [PATCH 4322/4742] [tern demo] Use unpkg, now that the URL structure
 of ternjs.net changed

---
 demo/tern.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/demo/tern.html b/demo/tern.html
index c6834e8899..e331fd5cf8 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -13,16 +13,16 @@
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/hint/show-hint.js"></script>
 <script src="../addon/tern/tern.js"></script>
-<script src="//ternjs.net/node_modules/acorn/dist/acorn.js"></script>
-<script src="//ternjs.net/node_modules/acorn-loose/dist/acorn-loose.js"></script>
-<script src="//ternjs.net/node_modules/acorn-walk/dist/walk.js"></script>
+<script src="https://unpkg.com/acorn/dist/acorn.js"></script>
+<script src="https://unpkg.com/acorn-loose/dist/acorn-loose.js"></script>
+<script src="https://unpkg.com/acorn-walk/dist/walk.js"></script>
 <script src="//ternjs.net/doc/demo/polyfill.js"></script>
-<script src="//ternjs.net/lib/signal.js"></script>
-<script src="//ternjs.net/lib/tern.js"></script>
-<script src="//ternjs.net/lib/def.js"></script>
-<script src="//ternjs.net/lib/comment.js"></script>
-<script src="//ternjs.net/lib/infer.js"></script>
-<script src="//ternjs.net/plugin/doc_comment.js"></script>
+<script src="https://unpkg.com/tern/lib/signal.js"></script>
+<script src="https://unpkg.com/tern/lib/tern.js"></script>
+<script src="https://unpkg.com/tern/lib/def.js"></script>
+<script src="https://unpkg.com/tern/lib/comment.js"></script>
+<script src="https://unpkg.com/tern/lib/infer.js"></script>
+<script src="https://unpkg.com/tern/plugin/doc_comment.js"></script>
 <style>
       .CodeMirror {border: 1px solid #ddd;}
     </style>
@@ -109,7 +109,7 @@ <h2>Tern Demo</h2>
   }
 
   var server;
-  getURL("//ternjs.net/defs/ecmascript.json", function(err, code) {
+  getURL("https://unpkg.com/tern/defs/ecmascript.json", function(err, code) {
     if (err) throw new Error("Request for ecmascript.json: " + err);
     server = new CodeMirror.TernServer({defs: [JSON.parse(code)]});
     editor.setOption("extraKeys", {

From 8bc57f76383e62e1a03c7d97c9eac74493fdbedc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 2 Oct 2020 23:40:06 +0200
Subject: [PATCH 4323/4742] Remove link to gitter room

It never took off, and I very much prefer communicating through the forum
and bug tracker.
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 2a7b1f5eba..92debf4488 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 
 [![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
-[![Join the chat at https://gitter.im/codemirror/CodeMirror](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/codemirror/CodeMirror)  
 
 CodeMirror is a versatile text editor implemented in JavaScript for
 the browser. It is specialized for editing code, and comes with over

From 719a91275352a5b551b7b450726b056f11d22685 Mon Sep 17 00:00:00 2001
From: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
Date: Mon, 5 Oct 2020 19:15:49 +1100
Subject: [PATCH 4324/4742] Fixes #6402. Adds option to turn off highlighting
 of non-standard CSS properties

---
 mode/css/css.js     | 7 ++++---
 mode/css/index.html | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 77ca0c10e2..240c270a90 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -29,7 +29,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       valueKeywords = parserConfig.valueKeywords || {},
       allowNested = parserConfig.allowNested,
       lineComment = parserConfig.lineComment,
-      supportsAtComponent = parserConfig.supportsAtComponent === true;
+      supportsAtComponent = parserConfig.supportsAtComponent === true,
+      highlightNonStandardPropertyKeywords = config.highlightNonStandardPropertyKeywords !== false;
 
   var type, override;
   function ret(style, tp) { type = tp; return style; }
@@ -197,7 +198,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         override = "property";
         return "maybeprop";
       } else if (nonStandardPropertyKeywords.hasOwnProperty(word)) {
-        override = "string-2";
+        override = highlightNonStandardPropertyKeywords ? "string-2" : "property";
         return "maybeprop";
       } else if (allowNested) {
         override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag";
@@ -291,7 +292,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       else if (propertyKeywords.hasOwnProperty(word))
         override = "property";
       else if (nonStandardPropertyKeywords.hasOwnProperty(word))
-        override = "string-2";
+        override = highlightNonStandardPropertyKeywords ? "string-2" : "property";
       else if (valueKeywords.hasOwnProperty(word))
         override = "atom";
       else if (colorKeywords.hasOwnProperty(word))
diff --git a/mode/css/index.html b/mode/css/index.html
index 6588c408ac..42b327ca66 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -68,6 +68,12 @@ <h2>CSS mode</h2>
       });
     </script>
 
+  <p>CSS mode supports this option:</p>
+  <d1>
+    <dt><code><strong>highlightNonStandardPropertyKeywords</strong>: boolean</code></dt>
+    <dd>Whether to highlight non-standard CSS property keywords such as <code>margin-inline</code> or <code>zoom</code> (default: <code>true</code>).</dd>
+  </d1>
+
     <p><strong>MIME types defined:</strong> <code>text/css</code>, <code>text/x-scss</code> (<a href="scss.html">demo</a>), <code>text/x-less</code> (<a href="less.html">demo</a>).</p>
 
     <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#css_*">normal</a>,  <a href="../../test/index.html#verbose,css_*">verbose</a>.</p>

From 1cb6de23c7e2b965201972ac5c6dcd2317e9eacf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 5 Oct 2020 14:05:36 +0200
Subject: [PATCH 4325/4742] Fix doc/releases.html copy-paste mistake

---
 doc/releases.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/releases.html b/doc/releases.html
index 3b4378f3f1..0b466970fc 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,14 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
-  <p class="rel">21-09-2020: <a href="https://codemirror.net/codemirror-5.58.0.zip">Version 5.58.0</a>:</p>
+  <p class="rel">21-09-2020: <a href="https://codemirror.net/codemirror-5.58.1.zip">Version 5.58.1</a>:</p>
 
   <ul class="rel-note">
     <li><a href="https://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: Remove arrow function that ended up in the code.</li>
   </ul>
 
-  <h2>Version 5.x</h2>
-
   <p class="rel">21-09-2020: <a href="https://codemirror.net/codemirror-5.58.0.zip">Version 5.58.0</a>:</p>
 
   <ul class="rel-note">

From cdb228ac736369c685865b122b736cd0d397836c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 9 Oct 2020 10:00:16 +0200
Subject: [PATCH 4326/4742] Fix horizontal scrolling-into-view with non-fixed
 gutters

Closes #6436
---
 src/display/scrolling.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 6d97247d92..75d6fc7ee4 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -91,14 +91,15 @@ function calculateScrollPos(cm, rect) {
     if (newTop != screentop) result.scrollTop = newTop
   }
 
-  let screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft
-  let screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0)
+  let gutterSpace = cm.options.fixedGutter ? 0 : display.gutters.offsetWidth
+  let screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft - gutterSpace
+  let screenw = displayWidth(cm) - display.gutters.offsetWidth
   let tooWide = rect.right - rect.left > screenw
   if (tooWide) rect.right = rect.left + screenw
   if (rect.left < 10)
     result.scrollLeft = 0
   else if (rect.left < screenleft)
-    result.scrollLeft = Math.max(0, rect.left - (tooWide ? 0 : 10))
+    result.scrollLeft = Math.max(0, rect.left + gutterSpace - (tooWide ? 0 : 10))
   else if (rect.right > screenw + screenleft - 3)
     result.scrollLeft = rect.right + (tooWide ? 0 : 10) - screenw
   return result

From 55d0333907117c9231ffdf555ae8824705993bbb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 9 Oct 2020 15:38:39 +0200
Subject: [PATCH 4327/4742] [javascript mode] Fix potentially-exponential
 regexp

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 66e5a308d4..3139fd00d2 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -126,7 +126,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
           var kw = keywords[word]
           return ret(kw.type, kw.style, word)
         }
-        if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))
+        if (word == "async" && stream.match(/^(\s|\/\*([^*]|\*(?!\/))*?\*\/)*[\[\(\w]/, false))
           return ret("async", "keyword", word)
       }
       return ret("variable", "variable", word)

From 9caacec1900d71a971561147ba1e8acb2f08609c Mon Sep 17 00:00:00 2001
From: Mark Boyes <mark.boyes@oxfordsemantic.tech>
Date: Thu, 15 Oct 2020 21:06:38 +0100
Subject: [PATCH 4328/4742] [sparql mode] Improve parsing of IRI atoms

* Do not treat the opening '<' of an expanded IRI atom as an operator

The existing code would not highlight the IRI atom "<foo#bar>" in the following line as an atom.
FILTER( ?x = "42"^^<foo#bar> )
for example everything after the # would be highlighted as a comment. This is because the sequence "^^<" while all "operator characters", are not all SPARQL operators in this case: the "<" introduces the IRI atom. I special-case the "^^".

* Improve PN_LOCAL parsing to SPARQL 1.1

The following legal sequences of characters from SPARQL 1.1 are additionally parsed as being the right-hand-side of a prefixed IRI.
1) Colons
2) PERCENT escaping
3) PN_LOCAL_ESCAPE escaping
---
 mode/sparql/sparql.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index bb79abff7f..73997c667f 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -60,12 +60,18 @@ CodeMirror.defineMode("sparql", function(config) {
       stream.skipToEnd();
       return "comment";
     }
+    else if (ch === "^") {
+      ch = stream.peek();
+      if (ch === "^") stream.eat("^");
+      else stream.eatWhile(operatorChars);
+      return "operator";
+    }
     else if (operatorChars.test(ch)) {
       stream.eatWhile(operatorChars);
       return "operator";
     }
     else if (ch == ":") {
-      stream.eatWhile(/[\w\d\._\-]/);
+      eatPnLocal(stream);
       return "atom";
     }
     else if (ch == "@") {
@@ -75,7 +81,7 @@ CodeMirror.defineMode("sparql", function(config) {
     else {
       stream.eatWhile(/[_\w\d]/);
       if (stream.eat(":")) {
-        stream.eatWhile(/[\w\d_\-]/);
+        eatPnLocal(stream);
         return "atom";
       }
       var word = stream.current();
@@ -88,6 +94,10 @@ CodeMirror.defineMode("sparql", function(config) {
     }
   }
 
+  function eatPnLocal(stream) {
+    while (stream.match(/([:\w\d._-]|\\[-\\_~.!$&'()*+,;=/?#@%]|%[a-fA-F0-9][a-fA-F0-9])/));
+  }
+
   function tokenLiteral(quote) {
     return function(stream, state) {
       var escaped = false, ch;

From 9885241fe9dee2415f988d3a3619421f45ce8c6b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 16 Oct 2020 09:53:55 +0200
Subject: [PATCH 4329/4742] [javascript mode] Don't indent in template strings

Closes #6442
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 3139fd00d2..63eaa241b7 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -868,7 +868,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     },
 
     indent: function(state, textAfter) {
-      if (state.tokenize == tokenComment) return CodeMirror.Pass;
+      if (state.tokenize == tokenComment || state.tokenize == tokenQuasi) return CodeMirror.Pass;
       if (state.tokenize != tokenBase) return 0;
       var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, top
       // Kludge to prevent 'maybelse' from blocking lexical scope pops

From 212bafa8ab7837abebc1d326ed943540a9a47200 Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Thu, 22 Oct 2020 14:42:10 +0300
Subject: [PATCH 4330/4742] [stylus mode] Recognize "url-prefix" token properly

---
 mode/stylus/stylus.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 653958e83b..281118efee 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -731,7 +731,8 @@
   var tagKeywords_ = ["a","abbr","address","area","article","aside","audio", "b", "base","bdi", "bdo","bgsound","blockquote","body","br","button","canvas","caption","cite", "code","col","colgroup","data","datalist","dd","del","details","dfn","div", "dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1", "h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe", "img","input","ins","kbd","keygen","label","legend","li","link","main","map", "mark","marquee","menu","menuitem","meta","meter","nav","nobr","noframes", "noscript","object","ol","optgroup","option","output","p","param","pre", "progress","q","rp","rt","ruby","s","samp","script","section","select", "small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","track", "u","ul","var","video"];
 
   // github.com/codemirror/CodeMirror/blob/master/mode/css/css.js
-  var documentTypes_ = ["domain", "regexp", "url", "url-prefix"];
+  // Note, "url-prefix" should precede "url" in order to match correctly in documentTypesRegexp
+  var documentTypes_ = ["domain", "regexp", "url-prefix", "url"];
   var mediaTypes_ = ["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"];
   var mediaFeatures_ = ["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"];
   var propertyKeywords_ = ["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"];

From 23b7a9924b5f9460a091e97392dd00d3834e8cc6 Mon Sep 17 00:00:00 2001
From: "David R. Myers" <davidrmyersii@gmail.com>
Date: Fri, 23 Oct 2020 15:12:03 -0400
Subject: [PATCH 4331/4742] Add WebAssembly to meta

---
 mode/meta.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index d3efdc172f..c7738a514c 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -169,7 +169,8 @@
     {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
     {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
     {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
-    {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
+    {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]},
+    {name: "WebAssembly", mime: "text/webassembly", mode: "wast", ext: ["wat", "wast"]},
   ];
   // Ensure all modes have a mime property for backwards compatibility
   for (var i = 0; i < CodeMirror.modeInfo.length; i++) {

From 264022ee4af4abca1c158944dc299a8faf8696d6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 26 Oct 2020 09:08:51 +0100
Subject: [PATCH 4332/4742] Mark version 5.58.2

---
 AUTHORS           | 3 +++
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bb017e9574..b8087133a8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -208,6 +208,7 @@ David Barnett
 David H. Bronke
 David Mignot
 David Pathakjee
+David R. Myers
 David Rodrigues
 David Santana
 David Vázquez
@@ -524,6 +525,7 @@ Marijn Haverbeke
 Mário Gonçalves
 Mario Pietsch
 Mark Anderson
+Mark Boyes
 Mark Dalgleish
 Mark Hamstra
 Mark Lentczner
@@ -634,6 +636,7 @@ Nikolaj Kappler
 Nikolay Kostov
 nilp0inter
 Nils Knappmeier
+Nina Pypchenko
 Nisarg Jhaveri
 nlwillia
 noragrossman
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3e3fe4223..80200fc784 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.58.2 (2020-10-23)
+
+### Bug fixes
+
+Fix a bug where horizontally scrolling the cursor into view sometimes failed with a non-fixed gutter.
+
+[julia mode](https://codemirror.net/mode/julia/): Fix an infinite recursion bug.
+
 ## 5.58.1 (2020-09-23)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 42ab5491ed..1da41d3ccb 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.58.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.58.2</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 0b466970fc..bdf24ed2f7 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,13 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">23-10-2020: <a href="https://codemirror.net/codemirror-5.58.2.zip">Version 5.58.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix a bug where horizontally scrolling the cursor into view sometimes failed with a non-fixed gutter.</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix an infinite recursion bug.</li>
+  </ul>
+
   <p class="rel">21-09-2020: <a href="https://codemirror.net/codemirror-5.58.1.zip">Version 5.58.1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index ff27b925b7..6d41dcc79e 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.58.1</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.58.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index ba8e7fc79d..2103e1c325 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.58.1",
+  "version": "5.58.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 4f9152d892..800ee766f2 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.58.1"
+CodeMirror.version = "5.58.2"

From 138d1b75791f8bb0b9a07fd19cbc2bb81e13dd8f Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Wed, 28 Oct 2020 21:30:38 +0300
Subject: [PATCH 4333/4742] [stylus mode] allow block comments

---
 mode/stylus/stylus.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 281118efee..eecc554bc0 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -722,6 +722,9 @@
         return indent;
       },
       electricChars: "}",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      blockCommentContinue: " * ",
       lineComment: "//",
       fold: "indent"
     };

From 4fddb355dead97ca7fc3e096ea5eb0ade62b306d Mon Sep 17 00:00:00 2001
From: Phil DeJarnett <phil@overzealous.com>
Date: Thu, 29 Oct 2020 15:27:22 -0400
Subject: [PATCH 4334/4742] [xml-hint addon] Replace nested function with
 function expression

---
 addon/hint/xml-hint.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 543d19b61c..2b3153124e 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -101,12 +101,12 @@
           }
           replaceToken = true;
         }
-        function returnHintsFromAtValues(atValues) {
+        var returnHintsFromAtValues = function(atValues) {
           if (atValues)
             for (var i = 0; i < atValues.length; ++i) if (!prefix || matches(atValues[i], prefix, matchInMiddle))
               result.push(quote + atValues[i] + quote);
           return returnHints();
-        }
+        };
         if (atValues && atValues.then) return atValues.then(returnHintsFromAtValues);
         return returnHintsFromAtValues(atValues);
       } else { // An attribute name

From 230cc2e3f70d3e4fc55617437fd4f4995e6817a5 Mon Sep 17 00:00:00 2001
From: iteriani <tomnguyen@google.com>
Date: Fri, 30 Oct 2020 00:39:51 -0700
Subject: [PATCH 4335/4742] [soy mode] Add support for Element Composition

Add support for Soy Element Composition. It has the syntax in the form of

<{foo()}></>

This adds support to pass through allowEmptyTag and to support this mode in closetag.
---
 mode/htmlmixed/htmlmixed.js |  3 ++-
 mode/soy/soy.js             |  4 +++-
 mode/soy/test.js            | 16 ++++++++++++++++
 mode/xml/xml.js             |  4 ++--
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 8341ac8261..66a158274c 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -74,7 +74,8 @@
       name: "xml",
       htmlMode: true,
       multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
-      multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag
+      multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag,
+      allowMissingTagName: parserConfig.allowMissingTagName,
     });
 
     var tags = {};
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index d31c947eed..bd3d947145 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -16,6 +16,8 @@
     "alias": { noEndTag: true },
     "delpackage": { noEndTag: true },
     "namespace": { noEndTag: true, soyState: "namespace-def" },
+    "@attribute": paramData,
+    "@attribute?": paramData,
     "@param": paramData,
     "@param?": paramData,
     "@inject": paramData,
@@ -53,7 +55,7 @@
   CodeMirror.defineMode("soy", function(config) {
     var textMode = CodeMirror.getMode(config, "text/plain");
     var modes = {
-      html: CodeMirror.getMode(config, {name: "text/html", multilineTagIndentFactor: 2, multilineTagIndentPastTag: false}),
+      html: CodeMirror.getMode(config, {name: "text/html", multilineTagIndentFactor: 2, multilineTagIndentPastTag: false, allowMissingTagName: true}),
       attributes: textMode,
       text: textMode,
       uri: textMode,
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 57cd4be477..78faddb9aa 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -26,6 +26,10 @@
      '[keyword {] [callee&variable index]([variable-2&error $list])[keyword }]' +
         '[string "][tag&bracket />]');
 
+  MT('soy-element-composition-test',
+     '[tag&bracket <][keyword {][callee&variable foo]()[keyword }]',
+     '[tag&bracket ></>]');
+
   MT('namespace-test',
      '[keyword {namespace] [variable namespace][keyword }]')
 
@@ -176,6 +180,18 @@
      '[keyword {/template}]',
      '');
 
+  MT('attribute-type',
+     '[keyword {template] [def .foo][keyword }]',
+     '  [keyword {@attribute] [def bar]: [type string][keyword }]',
+     '[keyword {/template}]',
+     '');
+
+  MT('attribute-type-optional',
+     '[keyword {template] [def .foo][keyword }]',
+     '  [keyword {@attribute] [def bar]: [type string][keyword }]',
+     '[keyword {/template}]',
+     '');
+
    MT('state-variable-reference',
      '[keyword {template] [def .foo][keyword }]',
      '  [keyword {@param] [def bar]:= [atom true][keyword }]',
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 73c6e0e0dd..46806ac425 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -189,7 +189,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
 
   function Context(state, tagName, startOfLine) {
     this.prev = state.context;
-    this.tagName = tagName;
+    this.tagName = tagName || "";
     this.indent = state.indented;
     this.startOfLine = startOfLine;
     if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
@@ -399,7 +399,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
     xmlCurrentContext: function(state) {
       var context = []
       for (var cx = state.context; cx; cx = cx.prev)
-        if (cx.tagName) context.push(cx.tagName)
+        context.push(cx.tagName)
       return context.reverse()
     }
   };

From 8e7f6728bf1d36963fafdf997b12858f25d7711a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 26 Oct 2020 09:08:36 +0100
Subject: [PATCH 4336/4742] Delay blur events during dragging and clicking

Issue #6427
---
 src/display/focus.js     |  9 ++++++---
 src/edit/mouse_events.js | 10 ++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/display/focus.js b/src/display/focus.js
index aa731b4353..0337327e12 100644
--- a/src/display/focus.js
+++ b/src/display/focus.js
@@ -4,19 +4,22 @@ import { addClass, rmClass } from "../util/dom.js"
 import { signal } from "../util/event.js"
 
 export function ensureFocus(cm) {
-  if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm) }
+  if (!cm.hasFocus()) {
+    cm.display.input.focus()
+    if (!cm.state.focused) onFocus(cm)
+  }
 }
 
 export function delayBlurEvent(cm) {
   cm.state.delayingBlurEvent = true
   setTimeout(() => { if (cm.state.delayingBlurEvent) {
     cm.state.delayingBlurEvent = false
-    onBlur(cm)
+    if (cm.state.focused) onBlur(cm)
   } }, 100)
 }
 
 export function onFocus(cm, e) {
-  if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false
+  if (cm.state.delayingBlurEvent && !cm.state.draggingText) cm.state.delayingBlurEvent = false
 
   if (cm.options.readOnly == "nocursor") return
   if (!cm.state.focused) {
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 5fcc437021..1c820fdb6e 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -1,4 +1,4 @@
-import { delayBlurEvent, ensureFocus } from "../display/focus.js"
+import { delayBlurEvent, ensureFocus, onBlur } from "../display/focus.js"
 import { operation } from "../display/operations.js"
 import { visibleLines } from "../display/update_lines.js"
 import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos.js"
@@ -149,6 +149,7 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
   let dragEnd = operation(cm, e => {
     if (webkit) display.scroller.draggable = false
     cm.state.draggingText = false
+    if (cm.state.delayingBlurEvent) delayBlurEvent(cm)
     off(display.wrapper.ownerDocument, "mouseup", dragEnd)
     off(display.wrapper.ownerDocument, "mousemove", mouseMove)
     off(display.scroller, "dragstart", dragStart)
@@ -172,15 +173,15 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
   if (webkit) display.scroller.draggable = true
   cm.state.draggingText = dragEnd
   dragEnd.copy = !behavior.moveOnDrag
-  // IE's approach to draggable
-  if (display.scroller.dragDrop) display.scroller.dragDrop()
   on(display.wrapper.ownerDocument, "mouseup", dragEnd)
   on(display.wrapper.ownerDocument, "mousemove", mouseMove)
   on(display.scroller, "dragstart", dragStart)
   on(display.scroller, "drop", dragEnd)
 
-  delayBlurEvent(cm)
+  cm.state.delayingBlurEvent = true
   setTimeout(() => display.input.focus(), 20)
+  // IE's approach to draggable
+  if (display.scroller.dragDrop) display.scroller.dragDrop()
 }
 
 function rangeForUnit(cm, pos, unit) {
@@ -193,6 +194,7 @@ function rangeForUnit(cm, pos, unit) {
 
 // Normal selection, as opposed to text dragging.
 function leftButtonSelect(cm, event, start, behavior) {
+  if (ie) delayBlurEvent(cm)
   let display = cm.display, doc = cm.doc
   e_preventDefault(event)
 

From f006f3d867c62813309a6f16f5fc242092a73b7b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 4 Nov 2020 16:30:32 +0100
Subject: [PATCH 4337/4742] Remove unused import

---
 src/edit/mouse_events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 1c820fdb6e..401eadf431 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -1,4 +1,4 @@
-import { delayBlurEvent, ensureFocus, onBlur } from "../display/focus.js"
+import { delayBlurEvent, ensureFocus } from "../display/focus.js"
 import { operation } from "../display/operations.js"
 import { visibleLines } from "../display/update_lines.js"
 import { clipPos, cmp, maxPos, minPos, Pos } from "../line/pos.js"

From 57ba96eb392401d209b63dd187f2f2c087f1885b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 5 Nov 2020 09:03:33 +0100
Subject: [PATCH 4338/4742] Fix handling of insertAt option to addLineWidget

Issue #6460
---
 src/model/line_widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/line_widget.js b/src/model/line_widget.js
index 5444d89df0..f94727e5f8 100644
--- a/src/model/line_widget.js
+++ b/src/model/line_widget.js
@@ -63,7 +63,7 @@ export function addLineWidget(doc, handle, node, options) {
   changeLine(doc, handle, "widget", line => {
     let widgets = line.widgets || (line.widgets = [])
     if (widget.insertAt == null) widgets.push(widget)
-    else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget)
+    else widgets.splice(Math.min(widgets.length, Math.max(0, widget.insertAt)), 0, widget)
     widget.line = line
     if (cm && !lineIsHidden(doc, line)) {
       let aboveVisible = heightAtLine(line) < doc.scrollTop

From 6ba05b288eb2fb948653b597f6f7f11770bb9aef Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 12 Nov 2020 09:28:39 +0100
Subject: [PATCH 4339/4742] [shell mode] Add support for Bash-style heredoc
 quoting

Closes #6468
---
 mode/shell/shell.js | 15 +++++++++++++++
 mode/shell/test.js  | 15 +++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 5af12413b0..2bc1eaf948 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -70,6 +70,13 @@ CodeMirror.defineMode('shell', function() {
       stream.eatWhile(/\w/);
       return 'attribute';
     }
+    if (ch == "<") {
+      let heredoc = stream.match(/^<-?\s+(.*)/)
+      if (heredoc) {
+        state.tokens.unshift(tokenHeredoc(heredoc[1]))
+        return 'string-2'
+      }
+    }
     if (/\d/.test(ch)) {
       stream.eatWhile(/\d/);
       if(stream.eol() || !/\w/.test(stream.peek())) {
@@ -129,6 +136,14 @@ CodeMirror.defineMode('shell', function() {
     return 'def';
   };
 
+  function tokenHeredoc(delim) {
+    return function(stream, state) {
+      if (stream.sol() && stream.string == delim) state.tokens.shift()
+      stream.skipToEnd()
+      return "string-2"
+    }
+  }
+
   function tokenize(stream, state) {
     return (state.tokens[0] || tokenBase) (stream, state);
   };
diff --git a/mode/shell/test.js b/mode/shell/test.js
index 7571d907de..237375d451 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -65,9 +65,16 @@
   MT("strings in parens",
      "[def FOO][operator =]([quote $(<][string \"][def $MYDIR][string \"][quote /myfile grep ][string 'hello$'][quote )])")
 
-  MT ("string ending in dollar",
-     '[def a][operator =][string "xyz$"]; [def b][operator =][string "y"]')
+  MT("string ending in dollar",
+    '[def a][operator =][string "xyz$"]; [def b][operator =][string "y"]')
 
-  MT ("quote ending in dollar",
-     "[quote $(echo a$)]")
+  MT("quote ending in dollar",
+    "[quote $(echo a$)]")
+
+  MT("heredoc",
+     "[builtin cat] [string-2 <<- end]",
+     "[string-2 content one]",
+     "[string-2 content two end]",
+     "[string-2 end]",
+     "[builtin echo]")
 })();

From ffc17920ed39779f3a18b3f6333bbf6a2bc3a537 Mon Sep 17 00:00:00 2001
From: Christopher Wallis <christopher.j.wallis@gmail.com>
Date: Thu, 12 Nov 2020 01:43:36 -0700
Subject: [PATCH 4340/4742] [soy mode] Add support for {@attribute *}

- forks the state at param-def to detect * as a type
---
 mode/soy/soy.js  | 5 +++++
 mode/soy/test.js | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index bd3d947145..cac59bb3df 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -276,6 +276,11 @@
             return null;
 
           case "param-def":
+            if (match = stream.match(/^\*/)) {
+              state.soyState.pop();
+              state.soyState.push("param-type");
+              return "type";
+            }
             if (match = stream.match(/^\w+/)) {
               state.variables = prepend(state.variables, match[0]);
               state.soyState.pop();
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 78faddb9aa..8c764c7a2b 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -192,6 +192,12 @@
      '[keyword {/template}]',
      '');
 
+  MT('attribute-type-all',
+     '[keyword {template] [def .foo][keyword }]',
+     '  [keyword {@attribute] [type *][keyword }]',
+     '[keyword {/template}]',
+     '');
+
    MT('state-variable-reference',
      '[keyword {template] [def .foo][keyword }]',
      '  [keyword {@param] [def bar]:= [atom true][keyword }]',

From eb345ef70e75805bf7d7d02b9d87c30ec1db2937 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 13 Nov 2020 10:06:33 +0100
Subject: [PATCH 4341/4742] Fix lint error

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

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 2bc1eaf948..2b0d8a91bc 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -71,7 +71,7 @@ CodeMirror.defineMode('shell', function() {
       return 'attribute';
     }
     if (ch == "<") {
-      let heredoc = stream.match(/^<-?\s+(.*)/)
+      var heredoc = stream.match(/^<-?\s+(.*)/)
       if (heredoc) {
         state.tokens.unshift(tokenHeredoc(heredoc[1]))
         return 'string-2'

From dda3f9d6b8d2450b87b619ed5db761cb20b892b8 Mon Sep 17 00:00:00 2001
From: iteriani <tomnguyen@google.com>
Date: Fri, 13 Nov 2020 01:08:19 -0800
Subject: [PATCH 4342/4742] [soy mode] Natively support Soy Element Composition

* Add support for Soy Element Composition.

Add support for Soy Element Composition. It has the syntax in the form of

<{foo()}></>

This adds support to pass through allowEmptyTag and to support this mode in closetag.

* Disable allowMissingTagName and handle Soy Element Composition directly.

Disable allowMissingTagName and handle Soy Element Composition directly. This also adds a case in closetag.js to handle autocompletes for soy element composition.

Right now, if you were to do something like

<{foo()}>

it would autocomplet with </undefined>. This change makes it autocomplete with </>
---
 addon/edit/closetag.js |  5 +++--
 mode/soy/soy.js        | 20 ++++++++++++++++++++
 mode/soy/test.js       |  9 +++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 8689765eec..7c22a50ecf 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -128,9 +128,10 @@
         replacement = head + "style";
       } else {
         var context = inner.mode.xmlCurrentContext && inner.mode.xmlCurrentContext(state)
-        if (!context || (context.length && closingTagExists(cm, context, context[context.length - 1], pos)))
+        var top = context.length ? context[context.length - 1] : ""
+        if (!context || (context.length && closingTagExists(cm, context, top, pos)))
           return CodeMirror.Pass;
-        replacement = head + context[context.length - 1]
+        replacement = head + top
       }
       if (cm.getLine(pos.line).charAt(tok.end) != ">") replacement += ">";
       replacements[i] = replacement;
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index cac59bb3df..17bafcd932 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -498,6 +498,17 @@
             }
             return expression(stream, state);
 
+          case "template-call-expression":
+            if (stream.match(/^([\w-?]+)(?==)/)) {
+              return "attribute";
+            } else if (stream.eat('>')) {
+              state.soyState.pop();
+              return "keyword";
+            } else if (stream.eat('/>')) {
+              state.soyState.pop();
+              return "keyword";
+            }
+            return expression(stream, state);
           case "literal":
             if (stream.match(/^(?=\{\/literal})/)) {
               state.soyState.pop();
@@ -563,6 +574,15 @@
           state.soyState.push("import");
           state.indent += 2 * config.indentUnit;
           return "keyword";
+        } else if (match = stream.match(/^<\{/)) {
+          state.soyState.push("template-call-expression");
+          state.tag = "print";
+          state.indent += 2 * config.indentUnit;
+          state.soyState.push("tag");
+          return "keyword";
+        } else if (match = stream.match(/^<\/>/)) {
+          state.indent -= 2 * config.indentUnit;
+          return "keyword";
         }
 
         return tokenUntil(stream, state, /\{|\s+\/\/|\/\*/);
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 8c764c7a2b..ae13158720 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -27,8 +27,13 @@
         '[string "][tag&bracket />]');
 
   MT('soy-element-composition-test',
-     '[tag&bracket <][keyword {][callee&variable foo]()[keyword }]',
-     '[tag&bracket ></>]');
+     '[keyword <{][callee&variable foo]()[keyword }]',
+     '[keyword ></>]');
+
+  MT('soy-element-composition-attribute-test',
+     '[keyword <{][callee&variable foo]()[keyword }]',
+     '[attribute class]=[string "Foo"]',
+     '[keyword ></>]');
 
   MT('namespace-test',
      '[keyword {namespace] [variable namespace][keyword }]')

From 37f7d7b00b674c4ebf380855d77f822829a8b76b Mon Sep 17 00:00:00 2001
From: Hendrik Erz <hendrik@zettlr.com>
Date: Sat, 14 Nov 2020 20:23:25 +0100
Subject: [PATCH 4343/4742] [show-hint addon] Document all options

---
 doc/manual.html | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 1da41d3ccb..2ba7c732f2 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2700,8 +2700,8 @@ <h2 id="addons">Addons</h2>
       Defines <code>editor.showHint</code>, which takes an optional
       options object, and pops up a widget that allows the user to
       select a completion. Finding hints is done with a hinting
-      functions (the <code>hint</code> option), which is a function
-      that take an editor instance and options object, and return
+      function (the <code>hint</code> option). This function
+      takes an editor instance and an options object, and returns
       a <code>{list, from, to}</code> object, where <code>list</code>
       is an array of strings or objects (the completions),
       and <code>from</code> and <code>to</code> give the start and end
@@ -2771,9 +2771,22 @@ <h2 id="addons">Addons</h2>
         <dt><code><strong>alignWithWord</strong>: boolean</code></dt>
         <dd>Whether the pop-up should be horizontally aligned with the
         start of the word (true, default), or with the cursor (false).</dd>
+        <dt><code><strong>closeCharacters</strong>: RegExp</code></dt>
+        <dd>A regular expression object used to match characters which
+        cause the pop up to be closed (default: <code>/[\s()\[\]{};:>,]/</code>).
+        If the user types one of these characters, the pop up will close, and
+        the <code>endCompletion</code> event is fired on the editor instance.</dd>
         <dt><code><strong>closeOnUnfocus</strong>: boolean</code></dt>
         <dd>When enabled (which is the default), the pop-up will close
         when the editor is unfocused.</dd>
+        <dt><code><strong>completeOnSingleClick</strong>: boolean</code></dt>
+        <dd>Whether a single click on a list item suffices to trigger the
+        completion (which is the default), or if the user has to use a
+        doubleclick.</dd>
+        <dt><code><strong>container</strong>: Element|null</code></dt>
+        <dd>Can be used to define a custom container for the widget. The default
+        is <code>null</code>, in which case the <code>body</code>-element will
+        be used.</dd>
         <dt><code><strong>customKeys</strong>: keymap</code></dt>
         <dd>Allows you to provide a custom key map of keys to be active
         when the pop-up is active. The handlers will be called with an
@@ -2809,6 +2822,14 @@ <h2 id="addons">Addons</h2>
         <dt><code><strong>"close"</strong> ()</code></dt>
         <dd>Fired when the completion is finished.</dd>
       </dl>
+      The following events will be fired on the editor instance during
+      completion:
+      <dl>
+        <dt><code><strong>"endCompletion"</strong> ()</code></dt>
+        <dd>Fired when the pop-up is being closed programmatically, e.g., when
+        the user types a character which matches the
+        <code>closeCharacters</code> option.</dd>
+      </dl>
       This addon depends on styles
       from <code>addon/hint/show-hint.css</code>. Check
       out <a href="../demo/complete.html">the demo</a> for an

From 097d7c957c7d4988a942d11c0ac681f004ba0e8a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 16 Nov 2020 21:58:04 +0100
Subject: [PATCH 4344/4742] [html-hint addon] Add dialog tag

Closes #6474
---
 addon/hint/html-hint.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index d0cca4f6a2..9878eca6ef 100644
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -98,6 +98,7 @@
     dfn: s,
     dir: s,
     div: s,
+    dialog: { attrs: { open: null } },
     dl: s,
     dt: s,
     em: s,

From 12512d3ed0014696a64fe5d6bee2e0e5259a4861 Mon Sep 17 00:00:00 2001
From: erosman <erosman@users.noreply.github.com>
Date: Tue, 17 Nov 2020 14:23:54 +0330
Subject: [PATCH 4345/4742] [javascript-lint addon] Add comment noting
 dependency

Added note on dependency on jshint.js
---
 addon/lint/javascript-lint.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index cc132d7f82..e5bc752308 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -1,6 +1,8 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: https://codemirror.net/LICENSE
 
+// Depends on jshint.js from https://github.com/jshint/jshint
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"));

From 0e6548686356d58504638c2bea95d403a9e53cde Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 18 Nov 2020 07:55:38 +0100
Subject: [PATCH 4346/4742] Fix focus state confusion in drag handler

Issue #6480
---
 mode/clike/clike.js      | 8 ++++----
 src/edit/mouse_events.js | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 37da2ec964..2154f1d2df 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -82,15 +82,15 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
     }
-    if (isPunctuationChar.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
     if (numberStart.test(ch)) {
       stream.backUp(1)
       if (stream.match(number)) return "number"
       stream.next()
     }
+    if (isPunctuationChar.test(ch)) {
+      curPunc = ch;
+      return null;
+    }
     if (ch == "/") {
       if (stream.eat("*")) {
         state.tokenize = tokenComment;
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index 401eadf431..b5d0b5a64e 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -149,7 +149,10 @@ function leftButtonStartDrag(cm, event, pos, behavior) {
   let dragEnd = operation(cm, e => {
     if (webkit) display.scroller.draggable = false
     cm.state.draggingText = false
-    if (cm.state.delayingBlurEvent) delayBlurEvent(cm)
+    if (cm.state.delayingBlurEvent) {
+      if (cm.hasFocus()) cm.state.delayingBlurEvent = false
+      else delayBlurEvent(cm)
+    }
     off(display.wrapper.ownerDocument, "mouseup", dragEnd)
     off(display.wrapper.ownerDocument, "mousemove", mouseMove)
     off(display.scroller, "dragstart", dragStart)

From 5d2feacfc89aab7e9b973ec59627b9def1f63d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Esp=C3=ADn?= <mespinsanz@gmail.com>
Date: Wed, 18 Nov 2020 13:27:20 +0100
Subject: [PATCH 4347/4742] [real-world uses] Add Graviton Editor

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

diff --git a/doc/realworld.html b/doc/realworld.html
index da6182515e..5da12e2c48 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -96,6 +96,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://tour.golang.org">Go language tour</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
       <li><a href="http://web.uvic.ca/~siefkenj/graphit/graphit.html">Graphit</a> (function graphing)</li>
+      <li><a href="https://graviton.netlify.app/">Graviton Editor</a> (Cross-platform and modern-looking code editor)</li>
       <li><a href="https://hackmd.io">HackMD</a> (Realtime collaborative markdown notes on all platforms)</li>
       <li><a href="http://www.handcraft.com/">Handcraft</a> (HTML prototyping)</li>
       <li><a href="http://hawkee.com/">Hawkee</a></li>

From 0630b63d94ba1b1f79ae89577ec1985f5e277025 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 19 Nov 2020 09:29:46 +0100
Subject: [PATCH 4348/4742] [placeholder addon] Further fix composition
 handling

Closes #6479
---
 addon/display/placeholder.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index 89bb93f378..cfb8341db2 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -50,11 +50,12 @@
 
   function onComposition(cm) {
     setTimeout(function() {
-      var empty = false, input = cm.getInputField()
-      if (input.nodeName == "TEXTAREA")
-        empty = !input.value
-      else if (cm.lineCount() == 1)
-        empty = !/[^\u200b]/.test(input.querySelector(".CodeMirror-line").textContent)
+      var empty = false
+      if (cm.lineCount() == 1) {
+        var input = cm.getInputField()
+        empty = input.nodeName == "TEXTAREA" ? !cm.getLine(0).length
+          : !/[^\u200b]/.test(input.querySelector(".CodeMirror-line").textContent)
+      }
       if (empty) setPlaceholder(cm)
       else clearPlaceholder(cm)
     }, 20)

From a53e86069bc06410ff477a8a5849a5abd26f983a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 19 Nov 2020 09:38:15 +0100
Subject: [PATCH 4349/4742] Mark version 5.58.3

---
 AUTHORS           |  5 +++++
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b8087133a8..33d819ed24 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -251,6 +251,7 @@ Eric Allam
 Eric Bogard
 Erik Demaine
 Erik Welander
+erosman
 eustas
 Evan Minsk
 Fabien Dubosson
@@ -326,6 +327,7 @@ Heanes
 Hector Oswaldo Caballero
 Hein Htat
 Hélio
+Hendrik Erz
 Hendrik Wallbaum
 Henrik Haugbølle
 Herculano Campos
@@ -353,6 +355,7 @@ Ilya Zverev
 Ingo Richter
 Intervue
 Irakli Gozalishvili
+iteriani
 Ivan Kurnosov
 Ivoah
 Jack Douglas
@@ -517,6 +520,7 @@ Manuel Rego Casasnovas
 Marat Dreizin
 Marcel Gerber
 Marcelo Camargo
+Marc Espín
 Marco Aurélio
 Marco Munizaga
 Marcus Bointon
@@ -681,6 +685,7 @@ Peter Flynn
 peterkroon
 Peter Kroon
 Peter László
+Phil DeJarnett
 Philipp A
 Philipp Markovics
 Philip Stadermann
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80200fc784..2b00dbd80e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.58.3 (2020-11-19)
+
+### Bug fixes
+
+Suppress quick-firing of blur-focus events when dragging and clicking on Internet Explorer.
+
+Fix the `insertAt` option to `addLineWidget` to actually allow the widget to be placed after all widgets for the line.
+
+[soy mode](https://codemirror.net/mode/soy/): Support `@Attribute` and element composition.
+
+[shell mode](https://codemirror.net/mode/shell/): Support heredoc quoting.
+
 ## 5.58.2 (2020-10-23)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 2ba7c732f2..89a6328e6d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.58.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.58.3</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 bdf24ed2f7..1b4f9a7976 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">19-11-2020: <a href="https://codemirror.net/codemirror-5.58.3.zip">Version 5.58.3</a>:</p>
+
+  <ul class="rel-note">
+    <li>Suppress quick-firing of blur-focus events when dragging and clicking on Internet Explorer.</li>
+    <li>Fix the <code>insertAt</code> option to <code>addLineWidget</code> to actually allow the widget to be placed after all widgets for the line.</li>
+    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support <code>@Attribute</code> and element composition.</li>
+    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Support heredoc quoting.</li>
+  </ul>
+
   <p class="rel">23-10-2020: <a href="https://codemirror.net/codemirror-5.58.2.zip">Version 5.58.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 6d41dcc79e..7ea8c48961 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.58.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.58.3</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 2103e1c325..a768858ec8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.58.2",
+  "version": "5.58.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 800ee766f2..d51192c6e5 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.58.2"
+CodeMirror.version = "5.58.3"

From 5bef47a743e8569af3f11fac628501bb3bc10108 Mon Sep 17 00:00:00 2001
From: erosman <erosman@users.noreply.github.com>
Date: Thu, 19 Nov 2020 16:19:58 +0330
Subject: [PATCH 4350/4742] Fix white CodeMirror-scrollbar-filler on dark
 themes

background-color: white; remains white on dark themes which doesn't suit dark background pages. Changing it to transparent to match the theme.
---
 lib/codemirror.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index a64f97c777..5ea2d2be2a 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -19,7 +19,7 @@
 }
 
 .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: white; /* The little square between H and V scrollbars */
+  background-color: transparent; /* The little square between H and V scrollbars */
 }
 
 /* GUTTER */

From a82516d0fab6ce877f2aa699fd0a435e2274c7fd Mon Sep 17 00:00:00 2001
From: Lonnie Abelbeck <lonnie@abelbeck.com>
Date: Fri, 20 Nov 2020 02:23:52 -0600
Subject: [PATCH 4351/4742] [shell mode] Fix Heredoc to allow quotes and not
 require a space

(a space is not required and the DELIMITER may be quoted for special meaning)

cat <<EOF
EOF

cat <<'EOF'
EOF

cat <<"EOF"
EOF

cat << 'EOF'
EOF

cat << "EOF"
EOF
---
 mode/shell/shell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 2b0d8a91bc..2219e62e19 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -71,7 +71,7 @@ CodeMirror.defineMode('shell', function() {
       return 'attribute';
     }
     if (ch == "<") {
-      var heredoc = stream.match(/^<-?\s+(.*)/)
+      var heredoc = stream.match(/^<-?\s*['"]?([^'"]*)['"]?/)
       if (heredoc) {
         state.tokens.unshift(tokenHeredoc(heredoc[1]))
         return 'string-2'

From 115a379855b63c3ed69773f5020f307827bb29d9 Mon Sep 17 00:00:00 2001
From: erosman <erosman@users.noreply.github.com>
Date: Sat, 21 Nov 2020 01:34:52 +0330
Subject: [PATCH 4352/4742] [lint addon] Filter out duplicate messages on a
 single line

---
 addon/lint/lint.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 963f2cf227..e970a25ade 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -170,6 +170,10 @@
       var anns = annotations[line];
       if (!anns) continue;
 
+      // filter out duplicate messages
+      var message = [];
+      anns = anns.filter(item => message.indexOf(item.message) > -1 ? false : message.push(item.message));
+
       var maxSeverity = null;
       var tipLabel = state.hasGutter && document.createDocumentFragment();
 
@@ -187,9 +191,9 @@
           __annotation: ann
         }));
       }
-
+      // use original annotations[line] to show multiple messages
       if (state.hasGutter)
-        cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, anns.length > 1,
+        cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, annotations[line].length > 1,
                                                        state.options.tooltips));
     }
     if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);

From 4f37b1e9ca592461473a64bf3ba43543eecdf550 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 21 Nov 2020 11:34:06 +0100
Subject: [PATCH 4353/4742] [lint addon] Remove arrow function

Issue #6492
---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index e970a25ade..395f0d9314 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -172,7 +172,7 @@
 
       // filter out duplicate messages
       var message = [];
-      anns = anns.filter(item => message.indexOf(item.message) > -1 ? false : message.push(item.message));
+      anns = anns.filter(function(item) { return message.indexOf(item.message) > -1 ? false : message.push(item.message) });
 
       var maxSeverity = null;
       var tipLabel = state.hasGutter && document.createDocumentFragment();

From f65b46d154af2ba7e83fb78b449bea41e1c23c43 Mon Sep 17 00:00:00 2001
From: erosman <erosman@users.noreply.github.com>
Date: Sun, 22 Nov 2020 19:42:08 +0330
Subject: [PATCH 4354/4742] [seach addon] Add option to configure search,
 bottom option to put dialog at bottom

Closes #6489
---
 addon/search/jump-to-line.js | 5 ++++-
 addon/search/search.js       | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/addon/search/jump-to-line.js b/addon/search/jump-to-line.js
index 1f3526d247..990c235ef1 100644
--- a/addon/search/jump-to-line.js
+++ b/addon/search/jump-to-line.js
@@ -13,8 +13,11 @@
 })(function(CodeMirror) {
   "use strict";
 
+  // default search panel location
+  CodeMirror.defineOption("search", {bottom: false});
+
   function dialog(cm, text, shortText, deflt, f) {
-    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
+    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true, bottom: cm.options.search.bottom});
     else f(prompt(shortText, deflt));
   }
 
diff --git a/addon/search/search.js b/addon/search/search.js
index cecdd52ea1..118f1112f1 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -19,6 +19,9 @@
 })(function(CodeMirror) {
   "use strict";
 
+  // default search panel location
+  CodeMirror.defineOption("search", {bottom: false});
+
   function searchOverlay(query, caseInsensitive) {
     if (typeof query == "string")
       query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), caseInsensitive ? "gi" : "g");
@@ -63,12 +66,13 @@
       selectValueOnOpen: true,
       closeOnEnter: false,
       onClose: function() { clearSearch(cm); },
-      onKeyDown: onKeyDown
+      onKeyDown: onKeyDown,
+      bottom: cm.options.search.bottom
     });
   }
 
   function dialog(cm, text, shortText, deflt, f) {
-    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
+    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true, bottom: cm.options.search.bottom});
     else f(prompt(shortText, deflt));
   }
 

From 464a66067b8d984c81b8e61ce048b34d7a1054bb Mon Sep 17 00:00:00 2001
From: quiddity-wp <quiddity-wp@users.noreply.github.com>
Date: Sun, 22 Nov 2020 13:02:36 -0800
Subject: [PATCH 4355/4742] [real-world uses] Add MediaWiki

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 5da12e2c48..c6e6c80323 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -129,6 +129,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://liveuml.com/">LiveUML</a> (PlantUML online editor)</li>
       <li><a href="https://github.com/TuvaLabs/markdown-delight-editor">Markdown Delight Editor</a> (extensible markdown editor polymer component)</li>
       <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>
+      <li><a href="https://www.mediawiki.org/wiki/Extension:CodeMirror">MediaWiki extension</a> (wiki engine)</li>
       <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
       <li><a href="http://www.iunbug.com/mihtool">MIHTool</a> (iOS web-app debugging tool)</li>
       <li><a href="http://mscgen.js.org/index.html">mscgen_js</a> (online sequence chart editor)</li>

From f4b04da36d5c88762382db44651b0b5389077bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20=C5=9Alepowro=C5=84ski?=
 <45392875+slepowronski@users.noreply.github.com>
Date: Wed, 25 Nov 2020 09:23:24 +0100
Subject: [PATCH 4356/4742] [show-hint addon] Add additional customizing
 options

Introduces four new options for the show-hint addon:

- closeOnCursorActivity
- closeOnPick
- paddingForScrollbar
- moveOnOverlap
---
 addon/hint/show-hint.js | 50 ++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index cd0d6a7bd5..5ef1bba645 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,6 +1,8 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
 // Distributed under an MIT license: https://codemirror.net/LICENSE
 
+// declare global: DOMRect
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"));
@@ -94,8 +96,10 @@
                                completion.to || data.to, "complete");
         CodeMirror.signal(data, "pick", completion);
         self.cm.scrollIntoView();
-      })
-      this.close();
+      });
+      if (this.options.closeOnPick) {
+        this.close();
+      }
     },
 
     cursorActivity: function() {
@@ -113,7 +117,9 @@
       if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
           pos.ch < identStart.ch || this.cm.somethingSelected() ||
           (!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
-        this.close();
+        if (this.options.closeOnCursorActivity) {
+          this.close();
+        }
       } else {
         var self = this;
         this.debounce = requestAnimationFrame(function() {self.update();});
@@ -259,10 +265,15 @@
     var winW = parentWindow.innerWidth || Math.max(ownerDocument.body.offsetWidth, ownerDocument.documentElement.offsetWidth);
     var winH = parentWindow.innerHeight || Math.max(ownerDocument.body.offsetHeight, ownerDocument.documentElement.offsetHeight);
     container.appendChild(hints);
-    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
-    var scrolls = hints.scrollHeight > hints.clientHeight + 1
-    var startScroll = cm.getScrollInfo();
 
+    var box = completion.options.moveOnOverlap ? hints.getBoundingClientRect() : new DOMRect();
+    var scrolls = completion.options.paddingForScrollbar ? hints.scrollHeight > hints.clientHeight + 1 : false;
+
+    // Compute in the timeout to avoid reflow on init
+    var startScroll;
+    setTimeout(function() { startScroll = cm.getScrollInfo(); });
+
+    var overlapY = box.bottom - winH;
     if (overlapY > 0) {
       var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
       if (curTop - height > 0) { // Fits above cursor
@@ -332,7 +343,12 @@
     CodeMirror.on(hints, "mousedown", function() {
       setTimeout(function(){cm.focus();}, 20);
     });
-    this.scrollToActive()
+
+    // The first hint doesn't need to be scrolled to on init
+    var selectedHintRange = this.getSelectedHintRange();
+    if (selectedHintRange.from !== 0 || selectedHintRange.to !== 0) {
+      this.scrollToActive();
+    }
 
     CodeMirror.signal(data, "select", completions[this.selectedHint], hints.childNodes[this.selectedHint]);
     return true;
@@ -379,9 +395,9 @@
     },
 
     scrollToActive: function() {
-      var margin = this.completion.options.scrollMargin || 0;
-      var node1 = this.hints.childNodes[Math.max(0, this.selectedHint - margin)];
-      var node2 = this.hints.childNodes[Math.min(this.data.list.length - 1, this.selectedHint + margin)];
+      var selectedHintRange = this.getSelectedHintRange();
+      var node1 = this.hints.childNodes[selectedHintRange.from];
+      var node2 = this.hints.childNodes[selectedHintRange.to];
       var firstNode = this.hints.firstChild;
       if (node1.offsetTop < this.hints.scrollTop)
         this.hints.scrollTop = node1.offsetTop - firstNode.offsetTop;
@@ -391,6 +407,14 @@
 
     screenAmount: function() {
       return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
+    },
+
+    getSelectedHintRange: function() {
+      var margin = this.completion.options.scrollMargin || 0;
+      return {
+        from: Math.max(0, this.selectedHint - margin),
+        to: Math.min(this.data.list.length - 1, this.selectedHint + margin),
+      };
     }
   };
 
@@ -468,11 +492,15 @@
     completeSingle: true,
     alignWithWord: true,
     closeCharacters: /[\s()\[\]{};:>,]/,
+    closeOnCursorActivity: true,
+    closeOnPick: true,
     closeOnUnfocus: true,
     completeOnSingleClick: true,
     container: null,
     customKeys: null,
-    extraKeys: null
+    extraKeys: null,
+    paddingForScrollbar: true,
+    moveOnOverlap: true,
   };
 
   CodeMirror.defineOption("hintOptions", null);

From 5e11705588c69925dcd8531bc605854bb379150b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 1 Dec 2020 08:48:39 +0100
Subject: [PATCH 4357/4742] [clojure mode] Fix exponential-complexity regexp

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

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 25d308ab4c..0b9d6acc3e 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -160,10 +160,10 @@ CodeMirror.defineMode("clojure", function (options) {
   var numberLiteral = /^(?:[+\-]?\d+(?:(?:N|(?:[eE][+\-]?\d+))|(?:\.?\d*(?:M|(?:[eE][+\-]?\d+))?)|\/\d+|[xX][0-9a-fA-F]+|r[0-9a-zA-Z]+)?(?=[\\\[\]\s"#'(),;@^`{}~]|$))/;
   var characterLiteral = /^(?:\\(?:backspace|formfeed|newline|return|space|tab|o[0-7]{3}|u[0-9A-Fa-f]{4}|x[0-9A-Fa-f]{4}|.)?(?=[\\\[\]\s"(),;@^`{}~]|$))/;
 
-  // simple-namespace := /^[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*/
+  // simple-namespace := /^[^\\\/\[\]\d\s"#'(),;@^`{}~.][^\\\[\]\s"(),;@^`{}~.\/]*/
   // simple-symbol    := /^(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)/
   // qualified-symbol := (<simple-namespace>(<.><simple-namespace>)*</>)?<simple-symbol>
-  var qualifiedSymbol = /^(?:(?:[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*(?:\.[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*\/)?(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*(?=[\\\[\]\s"(),;@^`{}~]|$))/;
+  var qualifiedSymbol = /^(?:(?:[^\\\/\[\]\d\s"#'(),;@^`{}~.][^\\\[\]\s"(),;@^`{}~.\/]*(?:\.[^\\\/\[\]\d\s"#'(),;@^`{}~.][^\\\[\]\s"(),;@^`{}~.\/]*)*\/)?(?:\/|[^\\\/\[\]\d\s"#'(),;@^`{}~][^\\\[\]\s"(),;@^`{}~]*)*(?=[\\\[\]\s"(),;@^`{}~]|$))/;
 
   function base(stream, state) {
     if (stream.eatSpace() || stream.eat(",")) return ["space", null];

From 1cec2af7be8a2158ff5bf71ab76c8c62fe669791 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Wed, 2 Dec 2020 10:14:35 +0000
Subject: [PATCH 4358/4742] [wast mode] Add link

---
 mode/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/index.html b/mode/index.html
index 858ba127f2..51205ddce9 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -153,6 +153,7 @@ <h2>Language modes</h2>
       <li><a href="vhdl/index.html">VHDL</a></li>
       <li><a href="vue/index.html">Vue.js app</a></li>
       <li><a href="webidl/index.html">Web IDL</a></li>
+      <li><a href="wast/index.html">WebAssembly Text Format</a></li>
       <li><a href="xml/index.html">XML/HTML</a></li>
       <li><a href="xquery/index.html">XQuery</a></li>
       <li><a href="yacas/index.html">Yacas</a></li>

From f4fd159353930680dbe617d440e5a4867d8b13a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 2 Dec 2020 17:20:39 +0100
Subject: [PATCH 4359/4742] [hardwrap addon] Improve start-of-line condition
 for overlong words

Issue #6494
---
 addon/wrap/hardwrap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index f194946c5d..bccdc8d14c 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -35,7 +35,7 @@
     for (; at > 0; --at)
       if (wrapOn.test(text.slice(at - 1, at + 1))) break;
 
-    if (at == 0 && !forceBreak) {
+    if (!forceBreak && at <= text.match(/^[ \t]*/)[0].length) {
       // didn't find a break point before column, in non-forceBreak mode try to
       // find one after 'column'.
       for (at = column + 1; at < text.length - 1; ++at) {

From c04867c786c5625f5f221c4162cb54d798dc9a8e Mon Sep 17 00:00:00 2001
From: "Jakub T. Jankiewicz" <jcubic@onet.pl>
Date: Thu, 3 Dec 2020 19:15:50 +0100
Subject: [PATCH 4360/4742] [scheme mode] Add more special indentation words
 and keywords

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

diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 56e4e332e9..0bbb8c8a41 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -26,8 +26,8 @@ CodeMirror.defineMode("scheme", function () {
         return obj;
     }
 
-    var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
-    var indentKeys = makeKeywords("define let letrec let* lambda");
+    var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax define-macro defmacro delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
+    var indentKeys = makeKeywords("define let letrec let* lambda define-macro defmacro let-syntax letrec-syntax define-syntax syntax-rules");
 
     function stateStack(indent, type, prev) { // represents a state stack object
         this.indent = indent;

From e410e5c17866308e1aba41f56383a6a2d31f02a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 3 Dec 2020 19:30:28 +0100
Subject: [PATCH 4361/4742] Add a funding.yml file

---
 .github/FUNDING.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..d87b38eee6
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+patreon: marijn
+custom: ['https://www.paypal.com/paypalme/marijnhaverbeke', 'https://marijnhaverbeke.nl/fund/']

From a966b5d115af09983d37f7c9aa034b78ac954ca4 Mon Sep 17 00:00:00 2001
From: Piyush <piyush@codeitout.com>
Date: Fri, 4 Dec 2020 09:50:24 +0530
Subject: [PATCH 4362/4742] fix memory leak with matchbrackets

---
 addon/edit/matchbrackets.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 2c47e07033..0377408802 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -117,25 +117,25 @@
     });
   }
 
-  CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
-    function clear(cm) {
-      if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {
-        cm.state.matchBrackets.currentlyHighlighted();
-        cm.state.matchBrackets.currentlyHighlighted = null;
-      }
+  function clearHighlighted(cm) {
+    if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {
+      cm.state.matchBrackets.currentlyHighlighted();
+      cm.state.matchBrackets.currentlyHighlighted = null;
     }
+  }
 
+  CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
       cm.off("cursorActivity", doMatchBrackets);
       cm.off("focus", doMatchBrackets)
-      cm.off("blur", clear)
-      clear(cm);
+      cm.off("blur", clearHighlighted)
+      clearHighlighted(cm);
     }
     if (val) {
       cm.state.matchBrackets = typeof val == "object" ? val : {};
       cm.on("cursorActivity", doMatchBrackets);
       cm.on("focus", doMatchBrackets)
-      cm.on("blur", clear)
+      cm.on("blur", clearHighlighted)
     }
   });
 

From e3fc417882517edaffda6f445c62f8697a0cd495 Mon Sep 17 00:00:00 2001
From: Simon Huber <huber.simon@protonmail.com>
Date: Mon, 7 Dec 2020 10:16:23 +0100
Subject: [PATCH 4363/4742] [solaized theme] Fix typos

---
 theme/solarized.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index fcd1d70de6..9c6b1265c1 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -99,7 +99,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 .cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
 .cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
-.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-light .CodeMirror-line > span::-moz-selection, .cm-s-light .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
 
 /* Editor styling */
 

From 622fcb9b8740ceade71c1f579eaa76c8b82a0c0b Mon Sep 17 00:00:00 2001
From: "Jakub T. Jankiewicz" <jcubic@onet.pl>
Date: Mon, 7 Dec 2020 10:19:14 +0100
Subject: [PATCH 4364/4742] [scheme mode] More indent fixes

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

diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 0bbb8c8a41..efac89078b 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -26,8 +26,8 @@ CodeMirror.defineMode("scheme", function () {
         return obj;
     }
 
-    var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax define-macro defmacro delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
-    var indentKeys = makeKeywords("define let letrec let* lambda define-macro defmacro let-syntax letrec-syntax define-syntax syntax-rules");
+    var keywords = makeKeywords("λ case-lambda call/cc class cond-expand define-class define-values exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax define-macro defmacro delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
+    var indentKeys = makeKeywords("define let letrec let* lambda define-macro defmacro let-syntax letrec-syntax let-values let*-values define-syntax syntax-rules define-values when unless");
 
     function stateStack(indent, type, prev) { // represents a state stack object
         this.indent = indent;

From ae4e671eb2d931ce88cf91d6d1f39cdaf7f0654e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 7 Dec 2020 21:45:51 +0100
Subject: [PATCH 4365/4742] [shell mode] Treat <<< as here string operator

Issue #6512
---
 mode/shell/shell.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 2219e62e19..8271485f5f 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -71,6 +71,7 @@ CodeMirror.defineMode('shell', function() {
       return 'attribute';
     }
     if (ch == "<") {
+      if (stream.match("<<")) return "operator"
       var heredoc = stream.match(/^<-?\s*['"]?([^'"]*)['"]?/)
       if (heredoc) {
         state.tokens.unshift(tokenHeredoc(heredoc[1]))

From fb4ec129858dc916de86e8dd802e9668ae0049a0 Mon Sep 17 00:00:00 2001
From: mlsad3 <github@gooddiehl.net>
Date: Tue, 8 Dec 2020 01:35:04 -0700
Subject: [PATCH 4366/4742] [verilog mode] Improve

* Handle `uvm_*_begin/end macros as well as macros in case/switch.

* Prevent extern functions and typedef classes from indenting.

* Indent lines after assignments, handle corner-case inside parenthesis.

* Handle 'disable fork' and 'wait fork'.

* Add '<' and '>' to operators.

* Add tests for mode/verilog changes.

* Verilog mode handles compiler directives and differentiates assignment vs comparison.

* Cleanup lint errors.

* Add verilog mode support for '@'.

Co-authored-by: Matt Diehl <mattd@cadence.com>
---
 mode/verilog/test.js    | 170 ++++++++++++++++++++++++++++++++++++++++
 mode/verilog/verilog.js | 138 ++++++++++++++++++++++++++++----
 2 files changed, 292 insertions(+), 16 deletions(-)

diff --git a/mode/verilog/test.js b/mode/verilog/test.js
index bafe726db3..38c1cbe457 100644
--- a/mode/verilog/test.js
+++ b/mode/verilog/test.js
@@ -139,6 +139,32 @@
      ""
   );
 
+  MT("align_assignments",
+     /**
+      * always @(posedge clk) begin
+      *    if (rst)
+      *       data_out <= 8'b0 +
+      *                   8'b1;
+      *    else
+      *       data_out = 8'b0 +
+      *                  8'b1;
+      *    data_out =
+      *       8'b0 + 8'b1;
+      * end
+      */
+     "[keyword always] [def @][bracket (][keyword posedge] [variable clk][bracket )] [keyword begin]",
+     "    [keyword if] [bracket (][variable rst][bracket )]",
+     "        [variable data_out] [meta <=] [number 8'b0] [meta +]",
+     "                    [number 8'b1];",
+     "    [keyword else]",
+     "        [variable data_out] [meta =] [number 8'b0] [meta +]",
+     "                   [number 8'b1];",
+     "    [variable data_out] [meta =] [number 8'b0] [meta +]",
+     "               [number 8'b1];",
+     "[keyword end]",
+     ""
+  );
+
   // Indentation tests
   MT("indent_single_statement_if",
       "[keyword if] [bracket (][variable foo][bracket )]",
@@ -270,4 +296,148 @@
     ""
   );
 
+  MT("indent_uvm_macros",
+     /**
+      *  `uvm_object_utils_begin(foo)
+      *    `uvm_field_event(foo, UVM_ALL_ON)
+      *  `uvm_object_utils_end
+      */
+     "[def `uvm_object_utils_begin][bracket (][variable foo][bracket )]",
+     "    [def `uvm_field_event][bracket (][variable foo], [variable UVM_ALL_ON][bracket )]",
+     "[def `uvm_object_utils_end]",
+     ""
+  );
+
+  MT("indent_uvm_macros2",
+     /**
+      * `uvm_do_with(mem_read,{
+      *    bar_nb == 0;
+      * })
+      */
+     "[def `uvm_do_with][bracket (][variable mem_read],[bracket {]",
+     "    [variable bar_nb] [meta ==] [number 0];",
+     "[bracket })]",
+     ""
+  );
+
+  MT("indent_wait_disable_fork",
+     /**
+      * virtual task body();
+      *    repeat (20) begin
+      *       fork
+      *          `uvm_create_on(t,p_seq)
+      *       join_none
+      *    end
+      *    wait fork;
+      *    disable fork;
+      * endtask : body
+      */
+     "[keyword virtual] [keyword task] [variable body][bracket ()];",
+     "    [keyword repeat] [bracket (][number 20][bracket )] [keyword begin]",
+     "        [keyword fork]",
+     "            [def `uvm_create_on][bracket (][variable t],[variable p_seq][bracket )]",
+     "        [keyword join_none]",
+     "    [keyword end]",
+     "    [keyword wait] [keyword fork];",
+     "    [keyword disable] [keyword fork];",
+     "[keyword endtask] : [variable body]",
+     ""
+  );
+
+  MT("indent_typedef_class",
+     /**
+      * typedef class asdf;
+      * typedef p p_t[];
+      * typedef enum {
+      *    ASDF
+      * } t;
+      */
+     "[keyword typedef] [keyword class] [variable asdf];",
+     "[keyword typedef] [variable p] [variable p_t][bracket [[]]];",
+     "[keyword typedef] [keyword enum] [bracket {]",
+     "    [variable ASDF]",
+     "[bracket }] [variable t];",
+     ""
+  );
+
+  MT("indent_case_with_macro",
+     /**
+      * // It should be assumed that Macros can have ';' inside, or 'begin'/'end' blocks.
+      * // As such, 'case' statement should indent correctly with macros inside.
+      * case(foo)
+      *    ASDF : this.foo = seqNum;
+      *    ABCD : `update(f)
+      *    EFGH : `update(g)
+      * endcase
+      */
+     "[keyword case][bracket (][variable foo][bracket )]",
+     "    [variable ASDF] : [keyword this].[variable foo] [meta =] [variable seqNum];",
+     "    [variable ABCD] : [def `update][bracket (][variable f][bracket )]",
+     "    [variable EFGH] : [def `update][bracket (][variable g][bracket )]",
+     "[keyword endcase]",
+     ""
+  );
+
+  MT("indent_extern_function",
+     /**
+      * extern virtual function void do(ref packet trans);
+      * extern virtual function void do2(ref packet trans);
+      */
+     "[keyword extern] [keyword virtual] [keyword function] [keyword void] [variable do1][bracket (][keyword ref] [variable packet] [variable trans][bracket )];",
+     "[keyword extern] [keyword virtual] [keyword function] [keyword void] [variable do2][bracket (][keyword ref] [variable packet] [variable trans][bracket )];",
+     ""
+  );
+
+  MT("indent_assignment",
+     /**
+      * for (int i=1;i < fun;i++) begin
+      *    foo = 2 << asdf || 11'h35 >> abcd
+      *          && 8'h6 | 1'b1;
+      * end
+      */
+     "[keyword for] [bracket (][keyword int] [variable i][meta =][number 1];[variable i] [meta <] [variable fun];[variable i][meta ++][bracket )] [keyword begin]",
+     "    [variable foo] [meta =] [number 2] [meta <<] [variable asdf] [meta ||] [number 11'h35] [meta >>] [variable abcd]",
+     "          [meta &&] [number 8'h6] [meta |] [number 1'b1];",
+     "[keyword end]",
+     ""
+  );
+
+  MT("indent_foreach_constraint",
+     /**
+      * `uvm_rand_send_with(wrTlp, {
+      *    length ==1;
+      *    foreach (Data[i]) {
+      *       payload[i] == Data[i];
+      *    }
+      * })
+      */
+     "[def `uvm_rand_send_with][bracket (][variable wrTlp], [bracket {]",
+     "    [variable length] [meta ==][number 1];",
+     "    [keyword foreach] [bracket (][variable Data][bracket [[][variable i][bracket ]])] [bracket {]",
+     "        [variable payload][bracket [[][variable i][bracket ]]] [meta ==] [variable Data][bracket [[][variable i][bracket ]]];",
+     "    [bracket }]",
+     "[bracket })]",
+     ""
+  );
+
+  MT("indent_compiler_directives",
+     /**
+      * `ifdef DUT
+      * `else
+      *     `ifndef FOO
+      *         `define FOO
+      *     `endif
+      * `endif
+      * `timescale 1ns/1ns
+      */
+     "[def `ifdef] [variable DUT]",
+     "[def `else]",
+     "    [def `ifndef] [variable FOO]",
+     "        [def `define] [variable FOO]",
+     "    [def `endif]",
+     "[def `endif]",
+     "[def `timescale] [number 1][variable ns][meta /][number 1][variable ns]",
+     ""
+  );
+
 })();
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 43990452d3..544045b867 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -16,6 +16,12 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
       dontAlignCalls = parserConfig.dontAlignCalls,
+      // compilerDirectivesUseRegularIndentation - If set, Compiler directive
+      // indentation follows the same rules as everything else. Otherwise if
+      // false, compiler directives will track their own indentation.
+      // For example, `ifdef nested inside another `ifndef will be indented,
+      // but a `ifdef inside a function block may not be indented.
+      compilerDirectivesUseRegularIndentation = parserConfig.compilerDirectivesUseRegularIndentation,
       noIndentKeywords = parserConfig.noIndentKeywords || [],
       multiLineStrings = parserConfig.multiLineStrings,
       hooks = parserConfig.hooks || {};
@@ -62,7 +68,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
      binary_module_path_operator ::=
        == | != | && | || | & | | | ^ | ^~ | ~^
   */
-  var isOperatorChar = /[\+\-\*\/!~&|^%=?:]/;
+  var isOperatorChar = /[\+\-\*\/!~&|^%=?:<>]/;
   var isBracketChar = /[\[\]{}()]/;
 
   var unsignedNumber = /\d[0-9_]*/;
@@ -72,8 +78,13 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   var hexLiteral = /\d*\s*'s?h\s*[0-9a-fxz?][0-9a-fxz?_]*/i;
   var realLiteral = /(\d[\d_]*(\.\d[\d_]*)?E-?[\d_]+)|(\d[\d_]*\.\d[\d_]*)/i;
 
-  var closingBracketOrWord = /^((\w+)|[)}\]])/;
+  var closingBracketOrWord = /^((`?\w+)|[)}\]])/;
   var closingBracket = /[)}\]]/;
+  var compilerDirectiveRegex      = new RegExp(
+    "^(`(?:ifdef|ifndef|elsif|else|endif|undef|undefineall|define|include|begin_keywords|celldefine|default|" +
+    "nettype|end_keywords|endcelldefine|line|nounconnected_drive|pragma|resetall|timescale|unconnected_drive))\\b");
+  var compilerDirectiveBeginRegex = /^(`(?:ifdef|ifndef|elsif|else))\b/;
+  var compilerDirectiveEndRegex   = /^(`(?:elsif|else|endif))\b/;
 
   var curPunc;
   var curKeyword;
@@ -96,6 +107,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   openClose["do"   ] = "while";
   openClose["fork" ] = "join;join_any;join_none";
   openClose["covergroup"] = "endgroup";
+  openClose["macro_begin"] = "macro_end";
 
   for (var i in noIndentKeywords) {
     var keyword = noIndentKeywords[i];
@@ -105,7 +117,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   }
 
   // Keywords which open statements that are ended with a semi-colon
-  var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while");
+  var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while extern typedef");
 
   function tokenBase(stream, state) {
     var ch = stream.peek(), style;
@@ -125,6 +137,24 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     if (ch == '`') {
       stream.next();
       if (stream.eatWhile(/[\w\$_]/)) {
+        var cur = stream.current();
+        curKeyword = cur;
+        // Macros that end in _begin, are start of block and end with _end
+        if (cur.startsWith("`uvm_") && cur.endsWith("_begin")) {
+          var keywordClose = curKeyword.substr(0,curKeyword.length - 5) + "end";
+          openClose[cur] = keywordClose;
+          curPunc = "newblock";
+        } else if (cur.startsWith("`uvm_") && cur.endsWith("_end")) {
+        } else {
+          stream.eatSpace();
+          if (stream.peek() == '(') {
+            // Check if this is a block
+            curPunc = "newmacro";
+          }
+          var withSpace = stream.current();
+          // Move the stream back before the spaces
+          stream.backUp(withSpace.length - cur.length);
+        }
         return "def";
       } else {
         return null;
@@ -145,6 +175,12 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       stream.eatWhile(/[\d_.]/);
       return "def";
     }
+    // Event
+    if (ch == '@') {
+      stream.next();
+      stream.eatWhile(/[@]/);
+      return "def";
+    }
     // Strings
     if (ch == '"') {
       stream.next();
@@ -178,6 +214,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
 
     // Operators
     if (stream.eatWhile(isOperatorChar)) {
+      curPunc = stream.current();
       return "meta";
     }
 
@@ -187,6 +224,15 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       if (keywords[cur]) {
         if (openClose[cur]) {
           curPunc = "newblock";
+          if (cur === "fork") {
+            // Fork can be a statement instead of block in cases of:
+            // "disable fork;" and "wait fork;" (trailing semicolon)
+            stream.eatSpace()
+            if (stream.peek() == ';') {
+              curPunc = "newstatement";
+            }
+            stream.backUp(stream.current().length - cur.length);
+          }
         }
         if (statementKeywords[cur]) {
           curPunc = "newstatement";
@@ -226,16 +272,17 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     return "comment";
   }
 
-  function Context(indented, column, type, align, prev) {
+  function Context(indented, column, type, scopekind, align, prev) {
     this.indented = indented;
     this.column = column;
     this.type = type;
+    this.scopekind = scopekind;
     this.align = align;
     this.prev = prev;
   }
-  function pushContext(state, col, type) {
+  function pushContext(state, col, type, scopekind) {
     var indent = state.indented;
-    var c = new Context(indent, col, type, null, state.context);
+    var c = new Context(indent, col, type, scopekind ? scopekind : "", null, state.context);
     return state.context = c;
   }
   function popContext(state) {
@@ -261,6 +308,16 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     }
   }
 
+  function isInsideScopeKind(ctx, scopekind) {
+    if (ctx == null) {
+      return false;
+    }
+    if (ctx.scopekind === scopekind) {
+      return true;
+    }
+    return isInsideScopeKind(ctx.prev, scopekind);
+  }
+
   function buildElectricInputRegEx() {
     // Reindentation should occur on any bracket char: {}()[]
     // or on a match of any of the block closing keywords, at
@@ -287,8 +344,9 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
     startState: function(basecolumn) {
       var state = {
         tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", "top", false),
         indented: 0,
+        compilerDirectiveIndented: 0,
         startOfLine: true
       };
       if (hooks.startState) hooks.startState(state);
@@ -313,15 +371,42 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       curPunc = null;
       curKeyword = null;
       var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta" || style == "variable") return style;
+      if (style == "comment" || style == "meta" || style == "variable") {
+        if (((curPunc === "=") || (curPunc === "<=")) && !isInsideScopeKind(ctx, "assignment")) {
+          // '<=' could be nonblocking assignment or lessthan-equals (which shouldn't cause indent)
+          //      Search through the context to see if we are already in an assignment.
+          // '=' could be inside port declaration with comma or ')' afterward, or inside for(;;) block.
+          pushContext(state, stream.column() + curPunc.length, "assignment", "assignment");
+          if (ctx.align == null) ctx.align = true;
+        }
+        return style;
+      }
       if (ctx.align == null) ctx.align = true;
 
-      if (curPunc == ctx.type) {
-        popContext(state);
-      } else if ((curPunc == ";" && ctx.type == "statement") ||
+      var isClosingAssignment = ctx.type == "assignment" &&
+        closingBracket.test(curPunc) && ctx.prev && ctx.prev.type === curPunc;
+      if (curPunc == ctx.type || isClosingAssignment) {
+        if (isClosingAssignment) {
+          ctx = popContext(state);
+        }
+        ctx = popContext(state);
+        if (curPunc == ")") {
+          // Handle closing macros, assuming they could have a semicolon or begin/end block inside.
+          if (ctx && (ctx.type === "macro")) {
+            ctx = popContext(state);
+            while (ctx && (ctx.type == "statement" || ctx.type == "assignment")) ctx = popContext(state);
+          }
+        } else if (curPunc == "}") {
+          // Handle closing statements like constraint block: "foreach () {}" which
+          // do not have semicolon at end.
+          if (ctx && (ctx.type === "statement")) {
+            while (ctx && (ctx.type == "statement")) ctx = popContext(state);
+          }
+        }
+      } else if (((curPunc == ";" || curPunc == ",") && (ctx.type == "statement" || ctx.type == "assignment")) ||
                (ctx.type && isClosing(curKeyword, ctx.type))) {
         ctx = popContext(state);
-        while (ctx && ctx.type == "statement") ctx = popContext(state);
+        while (ctx && (ctx.type == "statement" || ctx.type == "assignment")) ctx = popContext(state);
       } else if (curPunc == "{") {
         pushContext(state, stream.column(), "}");
       } else if (curPunc == "[") {
@@ -329,9 +414,9 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       } else if (curPunc == "(") {
         pushContext(state, stream.column(), ")");
       } else if (ctx && ctx.type == "endcase" && curPunc == ":") {
-        pushContext(state, stream.column(), "statement");
+        pushContext(state, stream.column(), "statement", "case");
       } else if (curPunc == "newstatement") {
-        pushContext(state, stream.column(), "statement");
+        pushContext(state, stream.column(), "statement", curKeyword);
       } else if (curPunc == "newblock") {
         if (curKeyword == "function" && ctx && (ctx.type == "statement" || ctx.type == "endgroup")) {
           // The 'function' keyword can appear in some other contexts where it actually does not
@@ -339,9 +424,23 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
           // Do nothing in this case
         } else if (curKeyword == "task" && ctx && ctx.type == "statement") {
           // Same thing for task
+        } else if (curKeyword == "class" && ctx && ctx.type == "statement") {
+          // Same thing for class (e.g. typedef)
         } else {
           var close = openClose[curKeyword];
-          pushContext(state, stream.column(), close);
+          pushContext(state, stream.column(), close, curKeyword);
+        }
+      } else if (curPunc == "newmacro" || (curKeyword && curKeyword.match(compilerDirectiveRegex))) {
+        if (curPunc == "newmacro") {
+          // Macros (especially if they have parenthesis) potentially have a semicolon
+          // or complete statement/block inside, and should be treated as such.
+          pushContext(state, stream.column(), "macro", "macro");
+        }
+        if (curKeyword.match(compilerDirectiveEndRegex)) {
+          state.compilerDirectiveIndented -= statementIndentUnit;
+        }
+        if (curKeyword.match(compilerDirectiveBeginRegex)) {
+          state.compilerDirectiveIndented += statementIndentUnit;
         }
       }
 
@@ -361,8 +460,15 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
       var possibleClosing = textAfter.match(closingBracketOrWord);
       if (possibleClosing)
         closing = isClosing(possibleClosing[0], ctx.type);
+      if (!compilerDirectivesUseRegularIndentation && textAfter.match(compilerDirectiveRegex)) {
+        if (textAfter.match(compilerDirectiveEndRegex)) {
+          return state.compilerDirectiveIndented - statementIndentUnit;
+        }
+        return state.compilerDirectiveIndented;
+      }
       if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
-      else if (closingBracket.test(ctx.type) && ctx.align && !dontAlignCalls) return ctx.column + (closing ? 0 : 1);
+      else if ((closingBracket.test(ctx.type) || ctx.type == "assignment")
+        && ctx.align && !dontAlignCalls) return ctx.column + (closing ? 0 : 1);
       else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
       else return ctx.indented + (closing ? 0 : indentUnit);
     },

From 348ab5603405d1e396f32a9acfdf81055c91a16f Mon Sep 17 00:00:00 2001
From: iteriani <tomnguyen@google.com>
Date: Tue, 8 Dec 2020 00:41:03 -0800
Subject: [PATCH 4367/4742] [soy mode] Update indentation rules for Element
 Composition

* Add support for Soy Element Composition.

Add support for Soy Element Composition. It has the syntax in the form of

<{foo()}></>

This adds support to pass through allowEmptyTag and to support this mode in closetag.

* Disable allowMissingTagName and handle Soy Element Composition directly.

Disable allowMissingTagName and handle Soy Element Composition directly. This also adds a case in closetag.js to handle autocompletes for soy element composition.

Right now, if you were to do something like

<{foo()}>

it would autocomplet with </undefined>. This change makes it autocomplete with </>

* Update indentation rules for Soy Element Composition

Update indentation rules for Soy Element Composition

* Update soy.js

* Update soy.js
---
 mode/soy/soy.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 17bafcd932..e3427ebe3c 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -463,8 +463,15 @@
             return null;
 
           case "tag":
-            var endTag = state.tag[0] == "/";
-            var tagName = endTag ? state.tag.substring(1) : state.tag;
+            var endTag;
+            var tagName;
+            if (state.tag === undefined) {
+              endTag = true;
+              tagName = '';
+            } else {
+              endTag = state.tag[0] == "/";
+              tagName = endTag ? state.tag.substring(1) : state.tag;
+            }
             var tag = tags[tagName];
             if (stream.match(/^\/?}/)) {
               var selfClosed = stream.current() == "/}";
@@ -576,12 +583,11 @@
           return "keyword";
         } else if (match = stream.match(/^<\{/)) {
           state.soyState.push("template-call-expression");
-          state.tag = "print";
           state.indent += 2 * config.indentUnit;
           state.soyState.push("tag");
           return "keyword";
         } else if (match = stream.match(/^<\/>/)) {
-          state.indent -= 2 * config.indentUnit;
+          state.indent -= 1 * config.indentUnit;
           return "keyword";
         }
 

From e20f9118534ebbb1249a2316639de5ce675523a8 Mon Sep 17 00:00:00 2001
From: Matt Diehl <mattd@cadence.com>
Date: Tue, 8 Dec 2020 09:50:20 -0700
Subject: [PATCH 4368/4742] Remove unnecessary line.

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

diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 544045b867..89fe9c1ac8 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -144,7 +144,6 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
           var keywordClose = curKeyword.substr(0,curKeyword.length - 5) + "end";
           openClose[cur] = keywordClose;
           curPunc = "newblock";
-        } else if (cur.startsWith("`uvm_") && cur.endsWith("_end")) {
         } else {
           stream.eatSpace();
           if (stream.peek() == '(') {

From d096a604db350e678c53bce0b2081e0817b84056 Mon Sep 17 00:00:00 2001
From: Elmar Peise <elmar-peise@users.noreply.github.com>
Date: Thu, 10 Dec 2020 13:44:26 +0100
Subject: [PATCH 4369/4742] [hardwrap addon] Break an inifite loop

This breaks an infinite loop triggered by wrapping a text containing a word longer than the targed width (e.g., a long URL).
---
 addon/wrap/hardwrap.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index bccdc8d14c..516368c80d 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -91,7 +91,8 @@
       }
       while (curLine.length > column) {
         var bp = findBreakPoint(curLine, column, wrapOn, killTrailing, forceBreak);
-        if (bp.from != bp.to || forceBreak) {
+        if (bp.from != bp.to ||
+            forceBreak && leadingSpace !== curLine.slice(0, bp.to)) {
           changes.push({text: ["", leadingSpace],
                         from: Pos(curNo, bp.from),
                         to: Pos(curNo, bp.to)});

From 7f3c36619f964d20e20c0ff5bec9cee99dae1549 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 11 Dec 2020 07:48:40 +0100
Subject: [PATCH 4370/4742] Fix platform detection for iPadOS Safari

See https://github.com/ProseMirror/prosemirror/issues/1111
---
 src/util/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/browser.js b/src/util/browser.js
index 9fc4602c68..6e3022e765 100644
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -17,7 +17,7 @@ export let safari = /Apple Computer/.test(navigator.vendor)
 export let mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
 export let phantom = /PhantomJS/.test(userAgent)
 
-export let ios = !edge && /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent)
+export let ios = !edge && /AppleWebKit/.test(userAgent) && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2)
 export let android = /Android/.test(userAgent)
 // This is woefully incomplete. Suggestions for alternative methods welcome.
 export let mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)

From e4784f6e9c34f4642791ecf622640c81b91f37fa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Dec 2020 08:28:52 +0100
Subject: [PATCH 4371/4742] [javascript mode] Allow separator-less object types

Issue #6520
---
 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 63eaa241b7..188dbf217c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -616,13 +616,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "|" || value == "&") return cont(typeexpr)
     if (type == "string" || type == "number" || type == "atom") return cont(afterType);
     if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)
-    if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
+    if (type == "{") return cont(pushlex("}"), typeprops, poplex, afterType)
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType, afterType)
     if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr)
   }
   function maybeReturnType(type) {
     if (type == "=>") return cont(typeexpr)
   }
+  function typeprops(type) {
+    if (type == "}") return cont()
+    if (type == "," || type == ";") return cont(typeprops)
+    return pass(typeprop, typeprops)
+  }
   function typeprop(type, value) {
     if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property"

From 7faab336a4b644eb4d8ff34d2eb1d96d912f7fa7 Mon Sep 17 00:00:00 2001
From: Kim-Anh Tran <kimanh@chromium.org>
Date: Fri, 18 Dec 2020 05:27:35 +0100
Subject: [PATCH 4372/4742] [wast mode] Update to reflect latest
 reference-types spec

---
 mode/wast/test.js | 25 ++++++++++++++++++++++---
 mode/wast/wast.js |  4 ++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index 9998cfd965..3e5137c072 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -21,7 +21,8 @@
      '[string "foo #\\"# bar"]');
 
   MT('atom-test',
-     '[atom anyfunc]',
+     '[atom funcref]',
+     '[atom externref]',
      '[atom i32]',
      '[atom i64]',
      '[atom f32]',
@@ -42,9 +43,11 @@
      '[keyword br_table] [variable-2 $label0] [variable-2 $label1] [variable-2 $label3]',
      '[keyword return]',
      '[keyword call] [variable-2 $func0]',
-     '[keyword call_indirect] ([keyword param] [atom f32] [atom f64]) ([keyword result] [atom i32] [atom i64])',
+     '[keyword call_indirect] [variable-2 $table] ([keyword param] [atom f32] [atom f64]) ([keyword result] [atom i32] [atom i64])',
      '[keyword return_call] [variable-2 $func0]',
-     '[keyword return_call_indirect] ([keyword param] [atom f32] [atom f64]) ([keyword result] [atom i32] [atom i64])');
+     '[keyword return_call_indirect] ([keyword param] [atom f32] [atom f64]) ([keyword result] [atom i32] [atom i64])',
+     '[keyword select] ([keyword local.get] [number 1]) ([keyword local.get] [number 2]) ([keyword local.get] [number 3])');
+
 
   MT('memory-instructions',
      '[keyword i32.load] [keyword offset]=[number 4] [keyword align]=[number 4]',
@@ -318,4 +321,20 @@
      '[keyword i32x4.trunc_sat_f32x4_u]',
      '[keyword f32x4.convert_i32x4_s]',
      '[keyword f32x4.convert_i32x4_u]');
+
+     MT('reference-type-instructions',
+     '[keyword ref.null] [keyword extern]',
+     '[keyword ref.null] [keyword func]',
+     '[keyword ref.is_null] ([keyword ref.func] [variable-2 $f])',
+     '[keyword ref.func] [variable-2 $f]');
+
+     MT('table-instructions',
+     '[keyword table.get] [variable-2 $t] ([keyword i32.const] [number 5])',
+     '[keyword table.set] [variable-2 $t] ([keyword i32.const] [number 5]) ([keyword ref.func] [variable-2 $f])',
+     '[keyword table.size] [variable-2 $t]',
+     '[keyword table.grow] [variable-2 $t] ([keyword ref.null] [keyword extern]) ([keyword i32.const] [number 5])',
+     '[keyword table.fill] [variable-2 $t] ([keyword i32.const] [number 5]) ([keyword param] [variable-2 $r] [atom externref]) ([keyword i32.const] [number 5])',
+     '[keyword table.init] [variable-2 $t] [number 1] ([keyword i32.const] [number 5]) ([keyword i32.const] [number 10]) ([keyword i32.const] [number 15])',
+     '[keyword table.copy] [variable-2 $t] [variable-2 $t2] ([keyword i32.const] [number 5]) ([keyword i32.const] [number 10]) ([keyword i32.const] [number 15])'
+     );
 })();
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 9348ad3e0a..a730d39efc 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -14,8 +14,8 @@
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|func|param|result|local|global|module|table|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|i(8x16|16x8)\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te]|abs|sqrt|mul|div|min|max)|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)|i16x8\.(load8x8_[su]|narrow_i32x4_[su]|widen_(low|high)_i8x16_[su]|mul)|i32x4\.(load16x4_[su]|widen_(low|high)_i16x8_[su]|mul|trunc_sat_f32x4_[su])|i64x2\.(load32x2_[su]|mul)|(v(8x16|16x8|32x4|64x2)\.load_splat)|i8x16\.narrow_i16x8_[su]|f32x4\.convert_i32x4_[su]/, token: "keyword"},
-    {regex: /\b(anyfunc|[fi](32|64))\b/, token: "atom"},
+    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|\bfunc\b|param|result|local|global|module|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|i(8x16|16x8)\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te]|abs|sqrt|mul|div|min|max)|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)|i16x8\.(load8x8_[su]|narrow_i32x4_[su]|widen_(low|high)_i8x16_[su]|mul)|i32x4\.(load16x4_[su]|widen_(low|high)_i16x8_[su]|mul|trunc_sat_f32x4_[su])|i64x2\.(load32x2_[su]|mul)|(v(8x16|16x8|32x4|64x2)\.load_splat)|i8x16\.narrow_i16x8_[su]|f32x4\.convert_i32x4_[su]|ref\.(func|(is_)?null)|\bextern\b|table(\.(size|get|set|size|grow|fill|init|copy))?/, token: "keyword"},
+    {regex: /\b(funcref|externref|[fi](32|64))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},
     {regex: /\(;.*?/, token: "comment", next: "comment"},

From abc65fe746384652c36c027ff73b95f17d262378 Mon Sep 17 00:00:00 2001
From: nathanlesage <nathan.lesage@mailbox.org>
Date: Thu, 17 Dec 2020 09:15:10 +0100
Subject: [PATCH 4373/4742] Document singleCursorHeightPerLine option

---
 doc/manual.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index 89a6328e6d..ad5c275d50 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -512,6 +512,15 @@ <h2>Configuration</h2>
       which causes the cursor to not reach all the way to the bottom
       of the line, looks better</dd>
 
+      <dt id="option_singleCursorHeightPerLine"><code><strong>singleCursorHeightPerLine</strong>: boolean</code></dt>
+      <dd>Determines if CodeMirror can expect all lines to be of the
+      same height (<code>true</code>, the default) and the cursor-size
+      can therefore be lazily evaluated. In case your editor contains
+      multiple line-sizes, for instance, if <a href="#addLineClass"><code>addLineClass</code></a>
+      sets classes which contain <code>line-height</code>-rules, you
+      should consider setting this to <code>false</code> to prevent
+      visual artefacts.
+
       <dt id="option_resetSelectionOnContextMenu"><code><strong>resetSelectionOnContextMenu</strong>: boolean</code></dt>
       <dd>Controls whether, when the context menu is opened with a
       click outside of the current selection, the cursor is moved to

From ee414661b9099e9c122f40b8408b841801f37ed9 Mon Sep 17 00:00:00 2001
From: Hendrik Erz <hendrik@zettlr.com>
Date: Sat, 19 Dec 2020 21:05:56 +0100
Subject: [PATCH 4374/4742] Update description of singleCursorHeightPerLine

---
 doc/manual.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index ad5c275d50..06ee3dbf18 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -513,13 +513,13 @@ <h2>Configuration</h2>
       of the line, looks better</dd>
 
       <dt id="option_singleCursorHeightPerLine"><code><strong>singleCursorHeightPerLine</strong>: boolean</code></dt>
-      <dd>Determines if CodeMirror can expect all lines to be of the
-      same height (<code>true</code>, the default) and the cursor-size
-      can therefore be lazily evaluated. In case your editor contains
-      multiple line-sizes, for instance, if <a href="#addLineClass"><code>addLineClass</code></a>
-      sets classes which contain <code>line-height</code>-rules, you
-      should consider setting this to <code>false</code> to prevent
-      visual artefacts.
+      <dd>If set to <code>true</code> (the default), CodeMirror will
+      calculate the cursor height from the adjacent characters or
+      text markers. If set to <code>false</code>, the cursor height
+      will be calculated based off the height of all bounding boxes
+      on the current (wrapped) line, keeping the height consistent.
+      This is visible especially if you use text markers that are
+      bigger than the font-size of the characters on the line.
 
       <dt id="option_resetSelectionOnContextMenu"><code><strong>resetSelectionOnContextMenu</strong>: boolean</code></dt>
       <dd>Controls whether, when the context menu is opened with a

From a90d0f8e992b6fa9232c8982a970305096a28164 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 20 Dec 2020 11:17:22 +0100
Subject: [PATCH 4375/4742] [manual] Correct documentation for
 singleCursorHeightPerLine

Issue #6524
---
 doc/manual.html | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 06ee3dbf18..1086507a91 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -513,13 +513,10 @@ <h2>Configuration</h2>
       of the line, looks better</dd>
 
       <dt id="option_singleCursorHeightPerLine"><code><strong>singleCursorHeightPerLine</strong>: boolean</code></dt>
-      <dd>If set to <code>true</code> (the default), CodeMirror will
-      calculate the cursor height from the adjacent characters or
-      text markers. If set to <code>false</code>, the cursor height
-      will be calculated based off the height of all bounding boxes
-      on the current (wrapped) line, keeping the height consistent.
-      This is visible especially if you use text markers that are
-      bigger than the font-size of the characters on the line.
+      <dd>If set to <code>true</code> (the default), will keep the
+      cursor height constant for an entire line (or wrapped part of a
+      line). When <code>false</code>, the cursor's height is based on
+      the height of the adjacent reference character.</dd>
 
       <dt id="option_resetSelectionOnContextMenu"><code><strong>resetSelectionOnContextMenu</strong>: boolean</code></dt>
       <dd>Controls whether, when the context menu is opened with a

From e49f2950e9ca59f437db26a2b43e3cc478fc4761 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 20 Dec 2020 11:48:25 +0100
Subject: [PATCH 4376/4742] Mark release 5.59.0

---
 AUTHORS           | 10 ++++++++++
 CHANGELOG.md      | 18 ++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 11 +++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 33d819ed24..95134fa2d5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -244,6 +244,7 @@ edoroshenko
 edsharp
 ekhaled
 Elisée
+Elmar Peise
 elpnt
 Emmanuel Schanzer
 Enam Mijbah Noor
@@ -363,6 +364,7 @@ Jacob Lee
 Jaimin
 Jake Peyser
 Jakob Miland
+Jakub T. Jankiewicz
 Jakub Vrana
 Jakub Vrána
 James Campos
@@ -466,6 +468,7 @@ Kevin Muret
 Kevin Sawicki
 Kevin Ushey
 Kier Darby
+Kim-Anh Tran
 Klaus Silveira
 Koh Zi Han, Cliff
 komakino
@@ -547,6 +550,7 @@ Mason Malone
 Mateusz Paprocki
 Mathias Bynens
 mats cronqvist
+Matt Diehl
 Matt Gaide
 Matthew Bauer
 Matthew Beale
@@ -604,6 +608,7 @@ Miraculix87
 misfo
 mkaminsky11
 mloginov
+mlsad3
 Moritz Schubotz (physikerwelt)
 Moritz Schwörer
 Moshe Wajnberg
@@ -614,6 +619,7 @@ Mu-An ✌️ Chiou
 Mu-An Chiou
 mzabuawala
 Narciso Jaramillo
+nathanlesage
 Nathan Williams
 ndr
 Neil Anderson
@@ -692,6 +698,7 @@ Philip Stadermann
 Pi Delport
 Pierre Gerold
 Pieter Ouwerkerk
+Piyush
 Pontus Melke
 prasanthj
 Prasanth J
@@ -699,6 +706,7 @@ Prayag Verma
 prendota
 Prendota
 Qiang Li
+quiddity-wp
 Radek Piórkowski
 Rahul
 Rahul Anand
@@ -759,6 +767,7 @@ Scott Aikin
 Scott Feeney
 Scott Goodhew
 Seb35
+Sebastian Ślepowroński
 Sebastian Wilzbach
 Sebastian Zaha
 Seren D
@@ -779,6 +788,7 @@ Siamak Mokhtari
 Siddhartha Gunti
 silverwind
 Simon Edwards
+Simon Huber
 sinkuu
 snasa
 soliton4
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b00dbd80e..9276146f78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 5.59.0 (2020-12-20)
+
+### Bug fixes
+
+Fix platform detection on recent iPadOS.
+
+[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Don't show duplicate messages for a given line.
+
+[clojure mode](https://codemirror.net/mode/clojure/index.html): Fix regexp that matched in exponential time for some inputs.
+
+[hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap): Improve handling of words that are longer than the line length.
+
+[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Fix leaked event handler on disabling the addon.
+
+### New features
+
+[search addon](https://codemirror.net/demo/search/): Make it possible to configure the search addon to show the dialog at the bottom of the editor.
+
 ## 5.58.3 (2020-11-19)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 1086507a91..b7ca9a6972 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.58.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.59.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 1b4f9a7976..18987f5ea2 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,17 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-12-2020: <a href="https://codemirror.net/codemirror-5.59.0.zip">Version 5.59.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix platform detection on recent iPadOS.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Don't show duplicate messages for a given line.</li>
+    <li><a href="https://codemirror.net/mode/clojure/index.html">clojure mode</a>: Fix regexp that matched in exponential time for some inputs.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_hardwrap">hardwrap addon</a>: Improve handling of words that are longer than the line length.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix leaked event handler on disabling the addon.</li>
+    <li><a href="https://codemirror.net/demo/search/">search addon</a>: Make it possible to configure the search addon to show the dialog at the bottom of the editor.</li>
+  </ul>
+
   <p class="rel">19-11-2020: <a href="https://codemirror.net/codemirror-5.58.3.zip">Version 5.58.3</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 7ea8c48961..849447a578 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.58.3</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index a768858ec8..321a46c1d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.58.3",
+  "version": "5.59.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index d51192c6e5..6550214906 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.58.3"
+CodeMirror.version = "5.59.0"

From ffa872e4d5a7b01cc148099322ef376bd6ada5a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Dec 2020 08:57:43 +0100
Subject: [PATCH 4377/4742] [closebrackets addon] Fix left-to-right assumption

Closes #6527
---
 addon/edit/closebrackets.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 4415c39381..f2239fdd12 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -87,7 +87,7 @@
     cm.operation(function() {
       var linesep = cm.lineSeparator() || "\n";
       cm.replaceSelection(linesep + linesep, null);
-      cm.execCommand("goCharLeft");
+      moveSel(cm, -1)
       ranges = cm.listSelections();
       for (var i = 0; i < ranges.length; i++) {
         var line = ranges[i].head.line;
@@ -97,6 +97,17 @@
     });
   }
 
+  function moveSel(cm, dir) {
+    let newRanges = [], ranges = cm.listSelections(), primary = 0
+    for (let i = 0; i < ranges.length; i++) {
+      let range = ranges[i]
+      if (range.head == cm.getCursor()) primary = i
+      let pos = {line: range.head.line, ch: range.head.ch + dir}
+      newRanges.push({anchor: pos, head: pos})
+    }
+    cm.setSelections(newRanges, primary)
+  }
+
   function contractSelection(sel) {
     var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;
     return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),
@@ -153,10 +164,9 @@
     var right = pos % 2 ? ch : pairs.charAt(pos + 1);
     cm.operation(function() {
       if (type == "skip") {
-        cm.execCommand("goCharRight");
+        moveSel(cm, 1)
       } else if (type == "skipThree") {
-        for (var i = 0; i < 3; i++)
-          cm.execCommand("goCharRight");
+        moveSel(cm, 3)
       } else if (type == "surround") {
         var sels = cm.getSelections();
         for (var i = 0; i < sels.length; i++)
@@ -169,10 +179,10 @@
       } else if (type == "both") {
         cm.replaceSelection(left + right, null);
         cm.triggerElectric(left + right);
-        cm.execCommand("goCharLeft");
+        moveSel(cm, -1)
       } else if (type == "addFour") {
         cm.replaceSelection(left + left + left + left, "before");
-        cm.execCommand("goCharRight");
+        moveSel(cm, 1)
       }
     });
   }

From ff70b4e2d1139b052064ec73e4d1ad86cf56d36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20dBruxelles?=
 <18559798+jdbruxelles@users.noreply.github.com>
Date: Mon, 21 Dec 2020 08:58:32 +0100
Subject: [PATCH 4378/4742] [release notes] Fix the search addon page link

Simply add the .html extension to the link.
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9276146f78..c1ffa87816 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ Fix platform detection on recent iPadOS.
 
 ### New features
 
-[search addon](https://codemirror.net/demo/search/): Make it possible to configure the search addon to show the dialog at the bottom of the editor.
+[search addon](https://codemirror.net/demo/search.html): Make it possible to configure the search addon to show the dialog at the bottom of the editor.
 
 ## 5.58.3 (2020-11-19)
 

From 885daa14aad5dd35a537cdadea7e01300374aeea Mon Sep 17 00:00:00 2001
From: Yash Singh <saiansh2525@gmail.com>
Date: Mon, 21 Dec 2020 00:04:40 -0800
Subject: [PATCH 4379/4742] Defined the webmanifest MIME (#6529)

---
 mode/javascript/javascript.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 188dbf217c..cfcd6cb6ed 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -930,9 +930,10 @@ CodeMirror.defineMIME("text/ecmascript", "javascript");
 CodeMirror.defineMIME("application/javascript", "javascript");
 CodeMirror.defineMIME("application/x-javascript", "javascript");
 CodeMirror.defineMIME("application/ecmascript", "javascript");
-CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true});
+CodeMirror.defineMIME("application/json", { name: "javascript", json: true });
+CodeMirror.defineMIME("application/x-json", { name: "javascript", json: true });
+CodeMirror.defineMIME("application/manifest+json", { name: "javascript", json: true })
+CodeMirror.defineMIME("application/ld+json", { name: "javascript", jsonld: true });
 CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
 CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
 

From c58ccada2ddfb064149237cb7f59ce73176b376a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Dec 2020 09:07:47 +0100
Subject: [PATCH 4380/4742] Fix ES6 use in addon

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

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index f2239fdd12..19a3c53c1f 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -98,11 +98,11 @@
   }
 
   function moveSel(cm, dir) {
-    let newRanges = [], ranges = cm.listSelections(), primary = 0
+    var newRanges = [], ranges = cm.listSelections(), primary = 0
     for (let i = 0; i < ranges.length; i++) {
-      let range = ranges[i]
+      var range = ranges[i]
       if (range.head == cm.getCursor()) primary = i
-      let pos = {line: range.head.line, ch: range.head.ch + dir}
+      var pos = {line: range.head.line, ch: range.head.ch + dir}
       newRanges.push({anchor: pos, head: pos})
     }
     cm.setSelections(newRanges, primary)

From f18854ef817b831419b5b3353197b403b7a9b8b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Dec 2020 12:44:06 +0100
Subject: [PATCH 4381/4742] Remove another let in an addon

---
 addon/edit/closebrackets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 19a3c53c1f..5c1aeab3c5 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -99,7 +99,7 @@
 
   function moveSel(cm, dir) {
     var newRanges = [], ranges = cm.listSelections(), primary = 0
-    for (let i = 0; i < ranges.length; i++) {
+    for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i]
       if (range.head == cm.getCursor()) primary = i
       var pos = {line: range.head.line, ch: range.head.ch + dir}

From c88d09d0ca8b6c2f88b4432094d72e4be757b4a3 Mon Sep 17 00:00:00 2001
From: Masahiro MATAYOSHI <mata@ie.u-ryukyu.ac.jp>
Date: Tue, 22 Dec 2020 16:52:16 +0900
Subject: [PATCH 4382/4742] [perl mode] Don't treat <<1 as here document start

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

diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index a3101a7c5b..f620b41e27 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -516,7 +516,7 @@ CodeMirror.defineMode("perl",function(){
                 if(stream.match(/^\-?[\d\.]/,false))
                         if(stream.match(/^(\-?(\d*\.\d+(e[+-]?\d+)?|\d+\.\d*)|0x[\da-fA-F]+|0b[01]+|\d+(e[+-]?\d+)?)/))
                                 return 'number';
-                if(stream.match(/^<<(?=\w)/)){                  // NOTE: <<SOMETHING\n...\nSOMETHING\n
+                if(stream.match(/^<<(?=[_a-zA-Z])/)){                  // NOTE: <<SOMETHING\n...\nSOMETHING\n
                         stream.eatWhile(/\w/);
                         return tokenSOMETHING(stream,state,stream.current().substr(2));}
                 if(stream.sol()&&stream.match(/^\=item(?!\w)/)){// NOTE: \n=item...\n=cut\n

From e5b87f61732ac9d9d04ea9c3cb2daa42fd195329 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 23 Dec 2020 08:22:14 +0100
Subject: [PATCH 4383/4742] Try to refine iPadOS/iOS detection

Issue #6532
---
 src/util/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/browser.js b/src/util/browser.js
index 6e3022e765..ae9d6af706 100644
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -17,7 +17,7 @@ export let safari = /Apple Computer/.test(navigator.vendor)
 export let mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)
 export let phantom = /PhantomJS/.test(userAgent)
 
-export let ios = !edge && /AppleWebKit/.test(userAgent) && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2)
+export let ios = safari && (/Mobile\/\w+/.test(userAgent) || navigator.maxTouchPoints > 2)
 export let android = /Android/.test(userAgent)
 // This is woefully incomplete. Suggestions for alternative methods welcome.
 export let mobile = ios || android || /webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent)

From d8d78f5e7aa07e682bf51ad94a75ba6bb2484794 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 23 Dec 2020 08:29:43 +0100
Subject: [PATCH 4384/4742] [panel addon] Preserve scroll post when
 initializing/removing panel wrapper

Closes #6533
---
 addon/display/panel.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addon/display/panel.js b/addon/display/panel.js
index 4c9f2c0fca..29f7e0bebb 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -76,7 +76,7 @@
   };
 
   function initPanels(cm) {
-    var wrap = cm.getWrapperElement();
+    var wrap = cm.getWrapperElement()
     var style = window.getComputedStyle ? window.getComputedStyle(wrap) : wrap.currentStyle;
     var height = parseInt(style.height);
     var info = cm.state.panels = {
@@ -84,9 +84,10 @@
       panels: [],
       wrapper: document.createElement("div")
     };
+    var hasFocus = cm.hasFocus(), scrollPos = cm.getScrollInfo()
     wrap.parentNode.insertBefore(info.wrapper, wrap);
-    var hasFocus = cm.hasFocus();
     info.wrapper.appendChild(wrap);
+    cm.scrollTo(scrollPos.left, scrollPos.top)
     if (hasFocus) cm.focus();
 
     cm._setSize = cm.setSize;
@@ -114,8 +115,11 @@
     var info = cm.state.panels;
     cm.state.panels = null;
 
-    var wrap = cm.getWrapperElement();
+    var wrap = cm.getWrapperElement()
+    var hasFocus = cm.hasFocus(), scrollPos = cm.getScrollInfo()
     info.wrapper.parentNode.replaceChild(wrap, info.wrapper);
+    cm.scrollTo(scrollPos.left, scrollPos.top)
+    if (hasFocus) cm.focus();
     wrap.style.height = info.setHeight;
     cm.setSize = cm._setSize;
     cm.setSize();

From 3ce2ef56989085002e6ac4078b0f580ab5fcc4ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 23 Dec 2020 16:46:53 +0100
Subject: [PATCH 4385/4742] [perl mode] Don't include brackets in variable
 names

Closes #6534
---
 mode/perl/perl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index f620b41e27..220b0a6994 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -697,7 +697,7 @@ CodeMirror.defineMode("perl",function(){
                                         return "variable-2";}
                         stream.pos=p;}
                 if(/[$@%&]/.test(ch)){
-                        if(stream.eatWhile(/[\w$\[\]]/)||stream.eat("{")&&stream.eatWhile(/[\w$\[\]]/)&&stream.eat("}")){
+                        if(stream.eatWhile(/[\w$]/)||stream.eat("{")&&stream.eatWhile(/[\w$]/)&&stream.eat("}")){
                                 var c=stream.current();
                                 if(PERL[c])
                                         return "variable-2";

From d4a1a1a5d8648508c314ffb20fc700333f9ab5de Mon Sep 17 00:00:00 2001
From: "Dinindu D. Wanniarachchi" <dinindudiyanuwan@gmail.com>
Date: Sat, 26 Dec 2020 19:15:17 +0530
Subject: [PATCH 4386/4742] [real-world uses] Changed SASS2CSS url

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

diff --git a/doc/realworld.html b/doc/realworld.html
index c6e6c80323..487208b286 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -157,7 +157,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
       <li><a href="http://refork.com/">Refork</a> (animation demo gallery and sharing)</li>
       <li><a href="http://sagecell.sagemath.org">SageMathCell</a> (interactive mathematical software)</li>
-      <li><a href="https://www.sass2css.online/">SASS2CSS</a> (SASS, SCSS or LESS to CSS converter and CSS beautifier)</li>
+      <li><a href="https://sass2css.herokuapp.com/">SASS2CSS</a> (SASS, SCSS or LESS to CSS converter and CSS beautifier)</li>
       <li><a href="https://cloud.sagemath.com/">SageMathCloud</a> (interactive mathematical software environment)</li>
       <li><a href="https://github.com/szekelymilan/salvare">salvare</a> (real-time collaborative code editor)</li>
       <li><a href="https://chrome.google.com/webstore/detail/servephp/mnpikomdchjhkhbhmbboehfdjkobbfpo">ServePHP</a> (PHP code testing in Chrome dev tools)</li>

From 90e1c26104b2b98aa803b2b98d917b19a32c8720 Mon Sep 17 00:00:00 2001
From: Yash Singh <saiansh2525@gmail.com>
Date: Tue, 29 Dec 2020 00:05:24 -0800
Subject: [PATCH 4387/4742] [javascript mode] Mention more MIME types in demo
 page

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

diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index d1f7f68e8a..3023835727 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -110,5 +110,5 @@ <h2>JavaScript mode</h2>
       </ul>
     </p>
 
-    <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>, <code>application/ld+json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/javascript</code>, <code>application/x-javascript</code>, <code>text/ecmascript</code>, <code>application/ecmascript</code>, <code>application/json</code>, <code>application/x-json</code>, <code>application/manifest+json</code>, <code>application/ld+json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>
   </article>

From d2728850abe64849ddd2730dc22536ef1361a90a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 29 Dec 2020 09:04:32 +0100
Subject: [PATCH 4388/4742] [javascript mode] Fix infinite loop on some invalid
 syntax

Closes #6542
---
 mode/javascript/javascript.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index cfcd6cb6ed..8191c4d925 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -640,6 +640,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop)
     } else if (type == "(") {
       return pass(functiondecl, typeprop)
+    } else {
+      return cont()
     }
   }
   function typearg(type, value) {

From 4d5da83c1493cf5dec219ecb637adc69e468ea5d Mon Sep 17 00:00:00 2001
From: Yash-Singh1 <saiansh2525@gmail.com>
Date: Mon, 28 Dec 2020 11:28:36 -0800
Subject: [PATCH 4389/4742] Prefer dot syntax in test

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

diff --git a/test/test.js b/test/test.js
index 2a5101f4e1..07fa67858f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1807,8 +1807,8 @@ testCM("atomicMarker", function(cm) {
       inclusiveRight: ri
     };
 
-    if (ls === true || ls === false) options["selectLeft"] = ls;
-    if (rs === true || rs === false) options["selectRight"] = rs;
+    if (ls === true || ls === false) options.selectLeft = ls;
+    if (rs === true || rs === false) options.selectRight = rs;
 
     return cm.markText(Pos(ll, cl), Pos(lr, cr), options);
   }

From 863c18904febf364876494ee650ced49c3b08bd9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 29 Dec 2020 09:27:13 +0100
Subject: [PATCH 4390/4742] [javascript mode] Make sure type props don't
 consume closing braces

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 8191c4d925..966ffef063 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -640,7 +640,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(expect("variable"), maybetypeOrIn, expect("]"), typeprop)
     } else if (type == "(") {
       return pass(functiondecl, typeprop)
-    } else {
+    } else if (!type.match(/[;\}\)\],]/)) {
       return cont()
     }
   }

From 37d7b2efceb192c94811a13b2b7b3eec4b786608 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 29 Dec 2020 18:10:02 +0100
Subject: [PATCH 4391/4742] Fix moving backwards across astral chars

Closes #6544
---
 src/edit/methods.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index a5e2afc39f..eb8f8d28dc 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -480,9 +480,12 @@ function findPosH(doc, pos, dir, unit, visually) {
     let next
     if (unit == "codepoint") {
       let ch = lineObj.text.charCodeAt(pos.ch + (unit > 0 ? 0 : -1))
-      if (isNaN(ch)) next = null
-      else next = new Pos(pos.line, Math.max(0, Math.min(lineObj.text.length, pos.ch + dir * (ch >= 0xD800 && ch < 0xDC00 ? 2 : 1))),
-                          -dir)
+      if (isNaN(ch)) {
+        next = null
+      } else {
+        let astral = dir > 0 ? ch >= 0xD800 && ch < 0xDC00 : ch >= 0xDC00 && ch < 0xDFFF
+        next = new Pos(pos.line, Math.max(0, Math.min(lineObj.text.length, pos.ch + dir * (astral ? 2 : 1))), -dir)
+      }
     } else if (visually) {
       next = moveVisually(doc.cm, lineObj, pos, dir)
     } else {

From 5e25c3ce3026d7be3e98b8653f1aa171333d43ca Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 30 Dec 2020 09:21:06 +0100
Subject: [PATCH 4392/4742] [sponsors] Add Execute Program logo

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

diff --git a/index.html b/index.html
index 849447a578..9631b88366 100644
--- a/index.html
+++ b/index.html
@@ -203,6 +203,7 @@ <h2>Sponsors</h2>
     <li><a href="https://codepen.io/"><img src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>' alt="CodePen"></a></li>
     <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>
     <li><a href="https://www.desmos.com/"><img src='data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="%23187a3d"%3E%3Cpath d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/%3E%3Cpath d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/%3E%3C/svg%3E%0A' alt=desmos></a></li>
+    <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='data:image/svg+xml,%3Csvg%20width%3D%22397%22%20height%3D%22109%22%20viewBox%3D%220%200%20397%20109%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20fill-rule%3D%22nonzero%22%20fill%3D%22none%22%3E%3Cpath%20d%3D%22M169.495%2063.68c2.8%200%205.254.671%207.36%202.015%202.105%201.344%203.688%203.162%204.751%205.453%201.063%202.292%201.594%204.878%201.594%207.76%200%204.408-1.241%208.054-3.724%2010.935-2.483%202.881-5.81%204.322-9.98%204.322-3.953%200-7.18-1.402-9.683-4.206v12.62c0%20.271-.085.489-.254.653a.88.88%200%200%201-.64.247h-4.767a.966.966%200%200%201-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932%200%200%201%20.656-.247h4.767a.88.88%200%200%201%20.64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268%205.006-4.902%209.057-4.902zm-.84%2024.874c2.752%200%204.865-.86%206.34-2.578%201.473-1.719%202.21-4.034%202.21-6.947%200-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576%200-4.625.855-6.148%202.563-1.524%201.71-2.285%203.986-2.285%206.831s.761%205.141%202.285%206.89c1.523%201.747%203.572%202.62%206.148%202.62zm39.147-24.875c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm31.331%2030.845c-4.25%200-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05%204.298-10.999c2.866-2.948%206.423-4.423%2010.673-4.423%202.788%200%205.332.674%207.632%202.021%202.3%201.348%204.103%203.203%205.41%205.566%201.306%202.363%201.959%204.975%201.959%207.835%200%202.861-.653%205.468-1.96%207.821-1.306%202.353-3.109%204.209-5.41%205.566-2.3%201.357-4.843%202.036-7.63%202.036zm-6.43-8.608c1.7%201.759%203.847%202.638%206.445%202.638%202.597%200%204.745-.88%206.444-2.638%201.698-1.759%202.547-4.03%202.547-6.814%200-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598%200-4.746.88-6.444%202.638-1.699%201.758-2.548%204.03-2.548%206.815%200%202.784.85%205.055%202.548%206.814zm55.522-21.623c.272%200%20.487.082.642.248.156.165.234.384.234.657v27.976c0%201.772-.302%203.373-.906%204.804-.603%201.431-1.402%202.6-2.395%203.504-.993.906-2.157%201.67-3.49%202.293a16.713%2016.713%200%200%201-4.076%201.314c-1.383.253-2.814.38-4.294.38-2.337%200-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652%201.198-.38%202.707%201.46%205.735%202.19%209.085%202.19%201.169%200%202.293-.116%203.374-.35%201.074-.23%202.107-.62%203.068-1.153a6.016%206.016%200%200%200%202.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513%203.154-5.726%204.731-9.64%204.731-2.688%200-5.132-.676-7.333-2.03a13.905%2013.905%200%200%201-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534%200-2.726.604-5.237%201.811-7.534%201.208-2.298%202.907-4.123%205.098-5.476%202.19-1.353%204.64-2.03%207.347-2.03%203.856%200%207.03%201.548%209.523%204.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596%2023.266c2.408%200%204.424-.894%206.045-2.68%201.622-1.788%202.433-3.898%202.433-6.332%200-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428%200-4.452.86-6.074%202.581-1.622%201.72-2.433%203.826-2.433%206.317%200%202.529.811%204.663%202.433%206.402%201.621%201.74%203.646%202.61%206.074%202.61zm40.073-23.88c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm46.24%2024.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0%20.626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493%201.682-3.399%203.008-5.717%203.976-2.318.968-4.577%201.453-6.778%201.453-3.241%200-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149%200-2.621.835-4.656%202.504-6.104%201.67-1.448%204.214-2.416%207.633-2.906l6.984-1.085c1.355-.196%202.347-.401%202.976-.617.629-.215%201.041-.479%201.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302%200-6.65%201.36-7.043%204.079-.059.45-.353.665-.884.646h-4.48c-.647%200-.942-.304-.883-.91.334-3.326%201.66-5.713%203.978-7.161%202.318-1.448%205.452-2.172%209.4-2.172%204.224%200%207.392.959%209.504%202.876%202.112%201.918%203.168%204.706%203.168%208.364v11.035c-.02%201.35.707%202.172%202.18%202.466zm-19.06.135c4.132%200%207.518-1.307%2010.16-3.922v-6.028c-.258.566-1.53%201.024-3.814%201.375l-6.375.995c-1.728.274-2.96.742-3.695%201.405-.735.663-1.102%201.512-1.102%202.546%200%201.132.397%202.02%201.192%202.663.794.644%202.006.966%203.635.966zm48.252-24.875c2.377%200%204.116.796%205.216%202.386%201.1%201.59%201.65%204.248%201.65%207.971v18.59c0%20.272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948%200%200%201-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042%200-1.886.403-2.535%201.207a5.452%205.452%200%200%200-1.178%202.75v19.463c0%20.271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275%200-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04%200-1.88.398-2.52%201.193a5.675%205.675%200%200%200-1.193%202.764v19.463c0%20.271-.083.49-.25.654a.864.864%200%200%201-.634.248h-4.273c-.275%200-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57%200%20.874.3.914.902l.147%202.386h.442c.943-2.619%202.898-3.928%205.864-3.928%202.849%200%204.745%201.31%205.688%203.928h.353c1.061-2.619%202.986-3.928%205.776-3.928zM162.091%2016.126c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.694-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123%2022.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47%200-.824-.162-1.06-.488l-8.592-10.002-8.592%2010.002c-.255.326-.618.488-1.089.488h-5.532c-.373%200-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47%200%20.833.172%201.088.517l7.798%209.082%207.798-9.082c.255-.325.618-.498%201.089-.517h5.473c.373%200%20.618.105.736.316.117.21.059.46-.177.747l-11.152%2012.933%2011.976%2013.795zm14.101-26.59c1.86-.801%203.86-1.201%206-1.201%202.142%200%204.113.395%205.915%201.186%201.801.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.122%202.04-.364%202.549-.242.507-.76.761-1.554.761H230.41c.329%202.285%201.385%204.106%203.167%205.463%201.782%201.357%204.01%202.036%206.684%202.036%202.693%200%205.134-.84%207.323-2.52.465-.35.882-.341%201.25.03l1.947%201.992c.465.469.465.918%200%201.347-2.984%203.008-6.713%204.511-11.189%204.511-4.572%200-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.118-6.048.746-1.885%201.764-3.516%203.052-4.892%201.288-1.377%202.852-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.203.718-5.767%202.154-1.566%201.437-2.503%203.372-2.812%205.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83%2019.894c3.133%200%205.619-1.191%207.457-3.574.348-.45.745-.527%201.19-.234l3.394%201.962c.542.332.639.733.29%201.201-1.315%202.012-3.06%203.618-5.237%204.819-2.176%201.2-4.58%201.801-7.21%201.801-4.392%200-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05%204.367-11c2.912-2.948%206.563-4.422%2010.954-4.422%202.631%200%205.04.595%207.225%201.787%202.186%201.19%203.927%202.792%205.224%204.803.328.47.232.87-.29%201.202l-3.396%201.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67%200-4.88.884-6.63%202.651-1.75%201.768-2.626%204.033-2.626%206.796s.875%205.028%202.626%206.796c1.75%201.767%203.96%202.65%206.63%202.65zm46.585-24.87c.276%200%20.499.083.666.248.168.165.252.383.252.654v27.379c0%20.271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573%200-.88-.3-.919-.901l-.237-3.953h-.652c-1.007%201.608-2.35%202.93-4.03%203.968-1.68%201.036-3.674%201.554-5.986%201.554-3.26%200-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276%200%20.499.082.666.247.168.165.252.383.252.654v15.956c0%202.403.583%204.18%201.749%205.334%201.165%201.153%202.785%201.73%204.86%201.73%201.343%200%202.573-.258%203.689-.771s1.99-1.129%202.623-1.846c.632-.717%201.116-1.4%201.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595%2024.474c.353.446.382.852.088%201.22-.882%201.047-2.172%202.001-3.868%202.863-1.697.862-3.731%201.293-6.104%201.293-8.002%200-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885%200%200%201-.647-.261.864.864%200%200%201-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255%200%20.466.078.633.233.166.154.25.368.25.639l-.02%209.285h11.943c.255%200%20.466.082.632.247.167.164.25.382.25.654v3.603a.89.89%200%200%201-.25.64.837.837%200%200%201-.632.261H345.36v11.741c0%201.337.18%202.465.544%203.386.363.92.873%201.613%201.53%202.077a6.487%206.487%200%200%200%202.059.989c.716.193%201.534.29%202.456.29%201.98%200%203.824-.668%205.53-2.005.452-.426.873-.407%201.265.058l2%202.325zm15.146-23.272c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z%22%20fill%3D%22%23FFF%22%2F%3E%3Cpath%20d%3D%22M102.022%2037.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87%201.87%200%200%201-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87%201.87%200%200%201%2082.511%200h26.297c1.171%200%202.312.1%203.423.303%201.11.201%202.282.615%203.514%201.24a11.807%2011.807%200%200%201%203.212%202.36c.909.949%201.646%202.23%202.211%203.844.566%201.613.849%203.47.849%205.568v23.421c.04%201.09.262%201.877.666%202.36l12.18%2014.102c.645.767.605%201.594-.122%202.481l-12.058%2013.799c-.444.484-.666%201.271-.666%202.36V95.14c0%202.622-.414%204.852-1.243%206.688-.828%201.835-1.938%203.207-3.332%204.115-1.394.908-2.787%201.553-4.18%201.937-1.394.383-2.879.575-4.454.575H82.51c-.525%200-.97-.162-1.333-.485a1.716%201.716%200%200%201-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87%201.87%200%200%201%201.333-.515H97.66c2.908%200%204.363-1.25%204.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217%200%200%200%200-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083%2053.15a1.523%201.523%200%200%201%200%202.154l-23.85%2023.849a1.523%201.523%200%200%201-2.153%200l-23.85-23.85a1.523%201.523%200%200%201%200-2.153L67.08%2029.3a1.523%201.523%200%200%201%202.154%200zm-35.937%208.585c0%201.009-.243%201.735-.728%202.18L19.26%2054.258a.217.217%200%200%200%200%20.298L32.57%2068.51c.485.484.728%201.23.728%202.24v18.337c0%202.501%201.454%203.752%204.362%203.752h15.148c.525%200%20.97.172%201.333.515.364.343.584.797.584%201.361v11.923c0%20.565-.22%201.009-.584%201.331-.363.323-.808.485-1.333.485H26.511c-1.576%200-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577%2055.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614%201.303-2.895%202.211-3.843a11.807%2011.807%200%200%201%203.212-2.36C20.805.917%2021.976.503%2023.087.302A19.123%2019.123%200%200%201%2026.511%200h26.296c.525%200%20.97.171%201.333.515.364.342.584.796.584%201.361v11.862c0%20.525-.22.959-.584%201.301a1.87%201.87%200%200%201-1.333.515H37.66c-2.908%200-4.362%201.291-4.362%203.873v18.459z%22%20fill%3D%22%234547E0%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E' alt="Execute Program"></a></li>
 
   </ul>
 </section>

From 1698f003a5cfabfbabad106c69cd214ec4ed996a Mon Sep 17 00:00:00 2001
From: Yash Singh <saiansh2525@gmail.com>
Date: Thu, 31 Dec 2020 02:09:33 -0800
Subject: [PATCH 4393/4742] [manual] Add link to demo for jump-to-line

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

diff --git a/doc/manual.html b/doc/manual.html
index b7ca9a6972..00472c5236 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2405,7 +2405,7 @@ <h2 id="addons">Addons</h2>
       Accepts <code>linenumber</code>, <code>+/-linenumber</code>, <code>line:char</code>,
       <code>scroll%</code> and <code>:linenumber</code> formats.
       This will make use of <a href="#addon_dialog"><code>openDialog</code></a>
-      when available to make prompting for line number neater.</dd>
+      when available to make prompting for line number neater.</dd> Demo avaliable <a href="https://codemirror.net/demo/search.html">here</a>.
 
       <dt id="addon_matchesonscrollbar"><a href="../addon/search/matchesonscrollbar.js"><code>search/matchesonscrollbar.js</code></a></dt>
       <dd>Adds a <code>showMatchesOnScrollbar</code> method to editor

From bd37a96d362b8d92895d3960d569168ec39e4165 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 31 Dec 2020 13:02:29 +0100
Subject: [PATCH 4394/4742] Mark version 5.59.1

---
 AUTHORS           | 4 ++++
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 95134fa2d5..4ea87576d3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -432,6 +432,7 @@ Jon Malmaud
 Jon Sangster
 Joo
 Joost-Wim Boekesteijn
+José dBruxelles
 Joseph Pecoraro
 Josh Barnes
 Josh Cohen
@@ -546,6 +547,7 @@ Martin Hasoň
 Martin Hunt
 Martin Laine
 Martin Zagora
+Masahiro MATAYOSHI
 Mason Malone
 Mateusz Paprocki
 Mathias Bynens
@@ -894,6 +896,8 @@ wonderboyjon
 Wu Cheng-Han
 Xavier Mendez
 Yang Guo
+Yash Singh
+Yash-Singh1
 Yassin N. Hassan
 YNH Webdev
 yoongu
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1ffa87816..5a9baf4df1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.59.1 (2020-12-31)
+
+### Bug fixes
+
+Fix an issue where some Chrome browsers were detected as iOS.
+
 ## 5.59.0 (2020-12-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 00472c5236..285d420d9a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.59.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.59.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 18987f5ea2..f6628b6548 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">31-12-2020: <a href="https://codemirror.net/codemirror-5.59.1.zip">Version 5.59.1</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix an issue where some Chrome browsers were detected as iOS.</li>
+  </ul>
+
   <p class="rel">20-12-2020: <a href="https://codemirror.net/codemirror-5.59.0.zip">Version 5.59.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 9631b88366..a89b1de5d3 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.1</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 321a46c1d6..7ab19be203 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.59.0",
+  "version": "5.59.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 6550214906..cb8c8cac5b 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.59.0"
+CodeMirror.version = "5.59.1"

From 9749ba3ce08154510e631217e21532987415d9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Wielgus?=
 <61328879+encap@users.noreply.github.com>
Date: Sun, 3 Jan 2021 19:58:51 +0100
Subject: [PATCH 4395/4742] [real world uses] Add coderush.xyz (typing speed
 test)

Uses CodeMirror with dynamic mode switching
---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index 487208b286..698b0c3a80 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -58,6 +58,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://codepen.io">Codepen</a> (gallery of animations)</li>
       <li><a href="https://github.com/pepstock-org/Coderba">Coderba</a> Google Web Toolkit (GWT) wrapper</li>
       <li><a href="https://coderpad.io/">Coderpad</a> (interviewing tool)</li>
+      <li><a href="https:/coderush.xyz/">CodeRush</a> typing speed test for programmers</li>
       <li><a href="http://sasstwo.codeschool.com/levels/1/challenges/1">Code School</a> (online tech learning environment)</li>
       <li><a href="http://code-snippets.bungeshea.com/">Code Snippets</a> (WordPress snippet management plugin)</li>
       <li><a href="http://antonmi.github.io/code_together/">Code together</a> (collaborative editing)</li>

From c8059735fc9ef79a1b8176d776cb81a03771a28c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Wielgus?=
 <61328879+encap@users.noreply.github.com>
Date: Sun, 3 Jan 2021 20:11:00 +0100
Subject: [PATCH 4396/4742] [real world uses] Update "clone-it" url

Previous url (clone-it.github.io) returns 404 because I changed github account.
---
 doc/realworld.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index 698b0c3a80..a7402551f7 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -41,7 +41,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
-      <li><a href="https://clone-it.github.io/">Clone-It</a> (HTML & CSS learning game)</li>
+      <li><a href="https://encap.github.io/clone-it/">Clone-It</a> (HTML & CSS learning game)</li>
       <li><a href="https://electronjs.org/apps/colon">Colon</a> (A flexible text editor or IDE)</li>
       <li><a href="http://code.world/">CodeWorld</a> (Haskell playground)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>

From a46e33049de2c6f4550b77cad743d293039f2e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20=C5=9Alepowro=C5=84ski?=
 <45392875+slepowronski@users.noreply.github.com>
Date: Mon, 4 Jan 2021 13:28:25 +0100
Subject: [PATCH 4397/4742] [show-hint addon] Changed closeOnCursorActivity to
 updateOnCursorActivity

---
 addon/hint/show-hint.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 5ef1bba645..a9f2ded18c 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -61,8 +61,10 @@
     this.startPos = this.cm.getCursor("start");
     this.startLen = this.cm.getLine(this.startPos.line).length - this.cm.getSelection().length;
 
-    var self = this;
-    cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
+    if (this.options.updateOnCursorActivity) {
+      var self = this;
+      cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
+    }
   }
 
   var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
@@ -75,7 +77,9 @@
       if (!this.active()) return;
       this.cm.state.completionActive = null;
       this.tick = null;
-      this.cm.off("cursorActivity", this.activityFunc);
+      if (this.options.updateOnCursorActivity) {
+        this.cm.off("cursorActivity", this.activityFunc);
+      }
 
       if (this.widget && this.data) CodeMirror.signal(this.data, "close");
       if (this.widget) this.widget.close();
@@ -117,9 +121,7 @@
       if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
           pos.ch < identStart.ch || this.cm.somethingSelected() ||
           (!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
-        if (this.options.closeOnCursorActivity) {
-          this.close();
-        }
+        this.close();
       } else {
         var self = this;
         this.debounce = requestAnimationFrame(function() {self.update();});
@@ -492,9 +494,9 @@
     completeSingle: true,
     alignWithWord: true,
     closeCharacters: /[\s()\[\]{};:>,]/,
-    closeOnCursorActivity: true,
     closeOnPick: true,
     closeOnUnfocus: true,
+    updateOnCursorActivity: true,
     completeOnSingleClick: true,
     container: null,
     customKeys: null,

From 36c786bcca35c0650e78ab65ac8afb9d71abb89c Mon Sep 17 00:00:00 2001
From: Yash Singh <saiansh2525@gmail.com>
Date: Tue, 5 Jan 2021 02:42:31 -0800
Subject: [PATCH 4398/4742] [closetag demo] Add description

---
 demo/closetag.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/closetag.html b/demo/closetag.html
index 4f857fa4bb..1f86114a9f 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -38,4 +38,5 @@ <h2>Close-Tag Demo</h2>
         autoCloseTags: true
       });
     </script>
+  <p>Uses the <a href="https://codemirror.net/doc/manual.html#addon_closetag">closetag</a> addon to auto-close tags.</p>
   </article>

From d19a746e51e041dd9aa1c9b79386b29cb1bcb3f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 6 Jan 2021 18:23:19 +0100
Subject: [PATCH 4399/4742] Fix bug in findPosH

Closes #6554
---
 src/edit/methods.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/methods.js b/src/edit/methods.js
index eb8f8d28dc..c33a859865 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -479,7 +479,7 @@ function findPosH(doc, pos, dir, unit, visually) {
   function moveOnce(boundToLine) {
     let next
     if (unit == "codepoint") {
-      let ch = lineObj.text.charCodeAt(pos.ch + (unit > 0 ? 0 : -1))
+      let ch = lineObj.text.charCodeAt(pos.ch + (dir > 0 ? 0 : -1))
       if (isNaN(ch)) {
         next = null
       } else {

From 498e7c0c0a762c2ad5b8bc8b455ef1f12db1e5bd Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Fri, 8 Jan 2021 08:32:22 -0500
Subject: [PATCH 4400/4742] Fix various spelling mistakes

* spelling: across

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: advise

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: aframework

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: after

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: alphanumeric

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: anyway

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: async

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: available

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: backticks

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: behavior

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: bracket

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: cacheable

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: characters

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: completeable

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: data

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: definition

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: different

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: do not

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: duplicate

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: e.g.

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: entities

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: expression-in

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: extract

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: feedback

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: filesystem

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: function

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: github

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: height

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: highlighted

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: i'm

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: identifier

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: immediately

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: in case

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: indentation

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: independent

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: initial

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: interchangeable

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: interruptible

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: interviews

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: intrinsic

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: javascript

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: label

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: matching

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: misbehavior

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: number

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: numbered

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: occurrences

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: repeatedly

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: separator

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: string

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: styleable

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: textarea

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: texture

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: useful

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: whenever

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>

* spelling: wikipedia

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
---
 CHANGELOG.md                      | 14 +++++++-------
 addon/edit/continuelist.js        |  2 +-
 addon/edit/matchbrackets.js       |  2 +-
 addon/hint/javascript-hint.js     |  2 +-
 addon/hint/sql-hint.js            |  4 ++--
 addon/search/match-highlighter.js |  2 +-
 demo/complete.html                |  4 ++--
 demo/matchhighlighter.html        |  2 +-
 demo/simplemode.html              |  2 +-
 doc/internals.html                |  2 +-
 doc/manual.html                   |  8 ++++----
 doc/realworld.html                |  4 ++--
 doc/releases.html                 | 14 +++++++-------
 doc/upgrade_v2.2.html             |  2 +-
 index.html                        |  2 +-
 keymap/vim.js                     |  6 +++---
 mode/asn.1/asn.1.js               |  2 +-
 mode/clike/clike.js               |  2 +-
 mode/clike/index.html             |  2 +-
 mode/dtd/dtd.js                   |  2 +-
 mode/factor/factor.js             |  2 +-
 mode/factor/index.html            |  2 +-
 mode/fcl/index.html               | 10 +++++-----
 mode/forth/index.html             |  2 +-
 mode/gas/gas.js                   |  4 ++--
 mode/gfm/test.js                  |  2 +-
 mode/haml/haml.js                 |  2 +-
 mode/htmlembedded/index.html      |  2 +-
 mode/idl/idl.js                   |  2 +-
 mode/javascript/test.js           |  2 +-
 mode/markdown/index.html          | 10 +++++-----
 mode/markdown/markdown.js         |  2 +-
 mode/markdown/test.js             |  4 ++--
 mode/meta.js                      |  2 +-
 mode/modelica/modelica.js         |  6 +++---
 mode/mumps/mumps.js               |  2 +-
 mode/nginx/index.html             |  4 ++--
 mode/ntriples/index.html          |  2 +-
 mode/oz/oz.js                     |  2 +-
 mode/perl/perl.js                 |  4 ++--
 mode/python/index.html            |  2 +-
 mode/python/test.js               |  2 +-
 mode/rpm/rpm.js                   |  4 ++--
 mode/ruby/index.html              |  2 +-
 mode/scheme/scheme.js             |  2 +-
 mode/sieve/sieve.js               |  2 +-
 mode/sql/sql.js                   |  4 ++--
 mode/vbscript/vbscript.js         |  4 ++--
 mode/velocity/velocity.js         |  2 +-
 mode/verilog/verilog.js           |  4 ++--
 mode/vue/index.html               |  2 +-
 mode/yaml/yaml.js                 |  4 ++--
 52 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a9baf4df1..3a3ee68cef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -234,7 +234,7 @@ Make Shift-Delete to cut work on Firefox.
 
 [handlebars mode](https://codemirror.net/mode/handlebars/): Fix triple-brace support.
 
-[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Support mathing `$` in reverse regexp search.
+[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Support matching `$` in reverse regexp search.
 
 [panel addon](https://codemirror.net/doc/manual.html#addon_panel): Don't get confused by changing panel sizes.
 
@@ -490,7 +490,7 @@ Add `hintWords` (basic completion) helper to [clojure](https://codemirror.net/mo
 
 [panel addon](https://codemirror.net/doc/manual.html#addon_panel): Fix problem where replacing the last remaining panel dropped the newly added panel.
 
-[hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap): Fix an infinite loop when the indention is greater than the target column.
+[hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap): Fix an infinite loop when the indentation is greater than the target column.
 
 [jinja2](https://codemirror.net/mode/jinja2/) and [markdown](https://codemirror.net/mode/markdown/) modes: Add comment metadata.
 
@@ -878,7 +878,7 @@ Add `role=presentation` to more DOM elements to improve screen reader support.
 
 [merge addon](https://codemirror.net/doc/manual.html#addon_merge): Make aligning of unchanged chunks more robust.
 
-[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.
+[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Fix comment-toggling on a block of text that starts and ends in a (different) block comment.
 
 [javascript mode](https://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
 
@@ -996,7 +996,7 @@ New event: [`optionChange`](https://codemirror.net/doc/manual.html#event_optionC
 
 Tapping/clicking the editor in [contentEditable mode](https://codemirror.net/doc/manual.html#option_inputStyle) on Chrome now puts the cursor at the tapped position.
 
-Fix various crashes and misbehaviors when reading composition events in [contentEditable mode](https://codemirror.net/doc/manual.html#option_inputStyle).
+Fix various crashes and misbehavior when reading composition events in [contentEditable mode](https://codemirror.net/doc/manual.html#option_inputStyle).
 
 Catches and ignores an IE 'Unspecified Error' when creating an editor in an iframe before there is a `<body>`.
 
@@ -1331,7 +1331,7 @@ Fix a [bug](https://github.com/codemirror/CodeMirror/issues/3834) that caused ph
 * New modes: [Vue](https://codemirror.net/mode/vue/index.html), [Oz](https://codemirror.net/mode/oz/index.html), [MscGen](https://codemirror.net/mode/mscgen/index.html) (and dialects), [Closure Stylesheets](https://codemirror.net/mode/css/gss.html)
 * Implement [CommonMark](http://commonmark.org)-style flexible list indent and cross-line code spans in [Markdown](https://codemirror.net/mode/markdown/index.html) mode
 * Add a replace-all button to the [search addon](https://codemirror.net/doc/manual.html#addon_search), and make the persistent search dialog transparent when it obscures the match
-* Handle `acync`/`await` and ocal and binary numbers in [JavaScript mode](https://codemirror.net/mode/javascript/index.html)
+* Handle `async`/`await` and ocal and binary numbers in [JavaScript mode](https://codemirror.net/mode/javascript/index.html)
 * Fix various issues with the [Haxe mode](https://codemirror.net/mode/haxe/index.html)
 * Make the [closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets) select only the wrapped text when wrapping selection in brackets
 * Tokenize properties as properties in the [CoffeeScript mode](https://codemirror.net/mode/coffeescript/index.html)
@@ -1818,7 +1818,7 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 *   Slightly incompatible API changes. Read [this](https://codemirror.net/doc/upgrade_v2.2.html).
 *   New approach to [binding](https://codemirror.net/doc/manual.html#option_extraKeys) keys, support for [custom bindings](https://codemirror.net/doc/manual.html#option_keyMap).
 *   Support for overwrite (insert).
-*   [Custom-width](https://codemirror.net/doc/manual.html#option_tabSize) and [stylable](https://codemirror.net/demo/visibletabs.html) tabs.
+*   [Custom-width](https://codemirror.net/doc/manual.html#option_tabSize) and [styleable](https://codemirror.net/demo/visibletabs.html) tabs.
 *   Moved more code into [add-on scripts](https://codemirror.net/doc/manual.html#addons).
 *   Support for sane vertical cursor movement in wrapped lines.
 *   More reliable handling of editing [marked text](https://codemirror.net/doc/manual.html#markText).
@@ -1832,7 +1832,7 @@ Fixes `TextMarker.clear`, which is broken in 2.17.
 ## 2.17.0 (2011-11-21)
 
 *   Add support for [line wrapping](https://codemirror.net/doc/manual.html#option_lineWrapping) and [code folding](https://codemirror.net/doc/manual.html#hideLine).
-*   Add [Github-style Markdown](https://codemirror.net/mode/gfm/index.html) mode.
+*   Add [GitHub-style Markdown](https://codemirror.net/mode/gfm/index.html) mode.
 *   Add [Monokai](https://codemirror.net/theme/monokai.css) and [Rubyblue](https://codemirror.net/theme/rubyblue.css) themes.
 *   Add [`setBookmark`](https://codemirror.net/doc/manual.html#setBookmark) method.
 *   Move some of the demo code into reusable components under [`lib/util`](https://codemirror.net/addon/).
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 2e5625adc4..6ec65010d2 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -90,7 +90,7 @@
           });
         } else {
           if (startIndent.length > nextIndent.length) return;
-          // This doesn't run if the next line immediatley indents, as it is
+          // This doesn't run if the next line immediately indents, as it is
           // not clear of the users intention (new indented item or same level)
           if ((startIndent.length < nextIndent.length) && (lookAhead === 1)) return;
           skipCount += 1;
diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 0377408802..692e09e0cc 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -94,7 +94,7 @@
 
     if (marks.length) {
       // Kludge to work around the IE bug from issue #1193, where text
-      // input stops going to the textare whever this fires.
+      // input stops going to the textarea whenever this fires.
       if (ie_lt8 && cm.state.focused) cm.focus();
 
       var clear = function() {
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 6d09e6b44e..9f06b1b546 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -69,7 +69,7 @@
   function getCoffeeScriptToken(editor, cur) {
   // This getToken, it is for coffeescript, imitates the behavior of
   // getTokenAt method in javascript.js, that is, returning "property"
-  // type and treat "." as indepenent token.
+  // type and treat "." as independent token.
     var token = editor.getTokenAt(cur);
     if (cur.ch == token.start + 1 && token.string.charAt(0) == '.') {
       token.end = token.start;
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 5b65e29105..efdce813cf 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -97,7 +97,7 @@
     if (name.charAt(0) == ".") {
       name = name.substr(1);
     }
-    // replace doublicated identifierQuotes with single identifierQuotes
+    // replace duplicated identifierQuotes with single identifierQuotes
     // and remove single identifierQuotes
     var nameParts = name.split(identifierQuote+identifierQuote);
     for (var i = 0; i < nameParts.length; i++)
@@ -109,7 +109,7 @@
     var nameParts = getText(name).split(".");
     for (var i = 0; i < nameParts.length; i++)
       nameParts[i] = identifierQuote +
-        // doublicate identifierQuotes
+        // duplicate identifierQuotes
         nameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +
         identifierQuote;
     var escaped = nameParts.join(".");
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 3a4a7dedc1..9b181ebc01 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -16,7 +16,7 @@
 // highlighted only if the selected text is a word. showToken, when enabled,
 // will cause the current token to be highlighted when nothing is selected.
 // delay is used to specify how much time to wait, in milliseconds, before
-// highlighting the matches. If annotateScrollbar is enabled, the occurences
+// highlighting the matches. If annotateScrollbar is enabled, the occurrences
 // will be highlighted on the scrollbar via the matchesonscrollbar addon.
 
 (function(mod) {
diff --git a/demo/complete.html b/demo/complete.html
index 2fef796401..3e7bd5ff56 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -71,7 +71,7 @@ <h2>Autocomplete Demo</h2>
 addons.</p>
 
 <form><textarea style="display: none" id="synonyms" name="synonyms">
-Here, the completion use an asynchronous hinting functions to provide
+Here, the completion use an asynchronous hinting function to provide
 synonyms for each words. If your browser support `Promises`, the
 hinting function can also return one.
 </textarea></form>
@@ -88,7 +88,7 @@ <h2>Autocomplete Demo</h2>
     ["here", "hither"],
     ["asynchronous", "nonsynchronous"],
     ["completion", "achievement", "conclusion", "culmination", "expirations"],
-    ["hinting", "advive", "broach", "imply"],
+    ["hinting", "advise", "broach", "imply"],
     ["function","action"],
     ["provide", "add", "bring", "give"],
     ["synonyms", "equivalents"],
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index 6aa937782d..8e0ff25b89 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -98,6 +98,6 @@ <h2>Match Highlighter Demo</h2>
 });
 </script>
 
-    <p>Search and highlight occurences of the selected text.</p>
+    <p>Search and highlight occurrences of the selected text.</p>
 
   </article>
diff --git a/demo/simplemode.html b/demo/simplemode.html
index d7b0cface4..b03335fb87 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -129,7 +129,7 @@ <h2>Simple Mode Demo</h2>
  */
 
 CodeMirror.defineSimpleMode("simplemode", {
-  // The start state contains the rules that are intially used
+  // The start state contains the rules that are initially used
   start: [
     // The regex matches the token, the token property contains the type
     {regex: /"(?:[^\\]|\\.)*?(?:"|$)/, token: "string"},
diff --git a/doc/internals.html b/doc/internals.html
index 2137c937f2..893604e936 100644
--- a/doc/internals.html
+++ b/doc/internals.html
@@ -293,7 +293,7 @@ <h2>Intelligent Updating</h2>
   <h2>Parsers can be Simple</h2>
 
 <p>When I wrote CodeMirror 1, I
-thought <a href="https://codemirror.net/story.html#parser">interruptable
+thought <a href="https://codemirror.net/story.html#parser">interruptible
 parsers</a> were a hugely scary and complicated thing, and I used a
 bunch of heavyweight abstractions to keep this supposed complexity
 under control: parsers
diff --git a/doc/manual.html b/doc/manual.html
index 285d420d9a..7aade3df15 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2405,7 +2405,7 @@ <h2 id="addons">Addons</h2>
       Accepts <code>linenumber</code>, <code>+/-linenumber</code>, <code>line:char</code>,
       <code>scroll%</code> and <code>:linenumber</code> formats.
       This will make use of <a href="#addon_dialog"><code>openDialog</code></a>
-      when available to make prompting for line number neater.</dd> Demo avaliable <a href="https://codemirror.net/demo/search.html">here</a>.
+      when available to make prompting for line number neater.</dd> Demo available <a href="https://codemirror.net/demo/search.html">here</a>.
 
       <dt id="addon_matchesonscrollbar"><a href="../addon/search/matchesonscrollbar.js"><code>search/matchesonscrollbar.js</code></a></dt>
       <dd>Adds a <code>showMatchesOnScrollbar</code> method to editor
@@ -2721,7 +2721,7 @@ <h2 id="addons">Addons</h2>
       the <code>"hint"</code> type to find applicable hinting
       functions, and tries them one by one. If that fails, it looks
       for a <code>"hintWords"</code> helper to fetch a list of
-      completable words for the mode, and
+      completeable words for the mode, and
       uses <code>CodeMirror.hint.fromList</code> to complete from
       those.</dd>
       <dd>When completions aren't simple strings, they should be
@@ -3683,13 +3683,13 @@ <h3 id="vimapi_extending">Extending VIM</h3>
       <dt id="vimapi_getRegisterController"><strong><code>getRegisterController()</code></strong></dt>
       <dd>Returns the RegisterController that manages the state of registers
       used by vim mode. For the RegisterController api see its
-      defintion <a href="https://github.com/CodeMirror/CodeMirror/blob/b2d26b4ccb1d0994ae84d18ad8b84018de176da9/keymap/vim.js#L1123">here</a>.
+      definition <a href="https://github.com/CodeMirror/CodeMirror/blob/b2d26b4ccb1d0994ae84d18ad8b84018de176da9/keymap/vim.js#L1123">here</a>.
       </dd>
 
       <dt id='vimapi_buildkeymap'><strong><code>buildKeyMap()</code></strong></dt>
       <dd>
       Not currently implemented. If you would like to contribute this please open
-      a pull request on <a href="https://github.com/codemirror/CodeMirror">Github</a>.
+      a pull request on <a href="https://github.com/codemirror/CodeMirror">GitHub</a>.
       </dd>
 
       <dt id="vimapi_defineRegister"><strong><code>defineRegister()</code></strong></dt>
diff --git a/doc/realworld.html b/doc/realworld.html
index a7402551f7..e5f8aef6f9 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -81,7 +81,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
       <li><a href="http://emmet.io">Emmet</a> (fast XML editing)</li>
       <li><a href="https://github.com/espruino/EspruinoWebIDE">Espruino Web IDE</a> (Chrome App for writing code on Espruino devices)</li>
-      <li><a href="https://exlskills.com/learn-en/talent/interviews">EXLskills Live Interivews</a></li>
+      <li><a href="https://exlskills.com/learn-en/talent/interviews">EXLskills Live Interviews</a></li>
       <li><a href="http://www.fastfig.com/">Fastfig</a> (online computation/math tool)</li>
       <li><a href="https://metacpan.org/module/Farabi">Farabi</a> (modern Perl IDE)</li>
       <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>
@@ -92,7 +92,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://gerritcodereview.com/">Gerrit</a>'s diff view and inline editor</li>
       <li><a href="https://github.com/maks/git-crx">Git Crx</a> (Chrome App for browsing local git repos)</li>
       <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
-      <li><a href="https://github.com/">Github</a>'s in-browser edit feature</li>
+      <li><a href="https://github.com/">GitHub</a>'s in-browser edit feature</li>
       <li><a href="https://glitch.com/">Glitch</a> (community-driven app building)</li>
       <li><a href="http://tour.golang.org">Go language tour</a></li>
       <li><a href="https://script.google.com/">Google Apps Script</a></li>
diff --git a/doc/releases.html b/doc/releases.html
index f6628b6548..feeb8088d5 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -193,7 +193,7 @@ <h2>Version 5.x</h2>
     <li>Make Shift-Delete to cut work on Firefox.</li>
     <li><a href="https://codemirror.net/demo/closetag.html">closetag addon</a>: Properly handle self-closing tags.</li>
     <li><a href="https://codemirror.net/mode/handlebars/">handlebars mode</a>: Fix triple-brace support.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support mathing <code>$</code> in reverse regexp search.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support matching <code>$</code> in reverse regexp search.</li>
     <li><a href="https://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Don’t get confused by changing panel sizes.</li>
     <li><a href="https://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Complete variables defined in outer scopes.</li>
     <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Make by-subword motion more consistent with Sublime Text.</li>
@@ -354,7 +354,7 @@ <h2>Version 5.x</h2>
     <li>New method <a href="https://codemirror.net/doc/manual.html#phrase"><code>phrase</code></a> and option <a href="https://codemirror.net/doc/manual.html#option_phrases"><code>phrases</code></a> to make translating UI text in addons easier.</li>
     <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Fix issue where bracket-closing wouldn't work before punctuation.</li>
     <li><a href="https://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Fix problem where replacing the last remaining panel dropped the newly added panel.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_hardwrap">hardwrap addon</a>: Fix an infinite loop when the indention is greater than the target column.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_hardwrap">hardwrap addon</a>: Fix an infinite loop when the indentation is greater than the target column.</li>
     <li><a href="https://codemirror.net/mode/jinja2/">jinja2</a> and <a href="https://codemirror.net/mode/markdown/">markdown</a> modes: Add comment metadata.</li>
   </ul>
 
@@ -588,7 +588,7 @@ <h2>Version 5.x</h2>
     <li>Fix handling of shadow DOM roots when finding the active element.</li>
     <li>Add <code>role=presentation</code> to more DOM elements to improve screen reader support.</li>
     <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Make aligning of unchanged chunks more robust.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix comment-toggling on a block of text that starts and ends in a (different) block comment.</li>
     <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
     <li><a href="https://codemirror.net/mode/r/">r mode</a>: Fix indentation after semicolon-less statements.</li>
     <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Properly handle escaped parentheses in parenthesized expressions.</li>
@@ -653,7 +653,7 @@ <h2>Version 5.x</h2>
 
   <ul class=rel-note>
     <li>Tapping/clicking the editor in <a href="https://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a> on Chrome now puts the cursor at the tapped position.</li>
-    <li>Fix various crashes and misbehaviors when reading composition events in <a href="https://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a>.</li>
+    <li>Fix various crashes and misbehavior when reading composition events in <a href="https://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a>.</li>
     <li>Catches and ignores an IE 'Unspecified Error' when creating an editor in an iframe before there is a <code>&lt;body&gt;</code>.</li>
     <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Fix several issues in the chunk-aligning feature.</li>
     <li><a href="https://codemirror.net/mode/verilog">verilog mode</a>: Rewritten to address various issues.</li>
@@ -876,7 +876,7 @@ <h2>Version 5.x</h2>
     <li>New modes: <a href="../mode/vue/index.html">Vue</a>, <a href="../mode/oz/index.html">Oz</a>, <a href="../mode/mscgen/index.html">MscGen</a> (and dialects), <a href="../mode/css/gss.html">Closure Stylesheets</a></li>
     <li>Implement <a href="http://commonmark.org">CommonMark</a>-style flexible list indent and cross-line code spans in <a href="../mode/markdown/index.html">Markdown</a> mode</li>
     <li>Add a replace-all button to the <a href="manual.html#addon_search">search addon</a>, and make the persistent search dialog transparent when it obscures the match</li>
-    <li>Handle <code>acync</code>/<code>await</code> and ocal and binary numbers in <a href="../mode/javascript/index.html">JavaScript mode</a></li>
+    <li>Handle <code>async</code>/<code>await</code> and ocal and binary numbers in <a href="../mode/javascript/index.html">JavaScript mode</a></li>
     <li>Fix various issues with the <a href="../mode/haxe/index.html">Haxe mode</a></li>
     <li>Make the <a href="manual.html#addon_closebrackets">closebrackets addon</a> select only the wrapped text when wrapping selection in brackets</li>
     <li>Tokenize properties as properties in the <a href="../mode/coffeescript/index.html">CoffeeScript mode</a></li>
@@ -1683,7 +1683,7 @@ <h2>Version 2.x</h2>
     bindings</a>.</li>
     <li>Support for overwrite (insert).</li>
     <li><a href="manual.html#option_tabSize">Custom-width</a>
-    and <a href="../demo/visibletabs.html">stylable</a> tabs.</li>
+    and <a href="../demo/visibletabs.html">styleable</a> tabs.</li>
     <li>Moved more code into <a href="manual.html#addons">add-on scripts</a>.</li>
     <li>Support for sane vertical cursor movement in wrapped lines.</li>
     <li>More reliable handling of
@@ -1704,7 +1704,7 @@ <h2>Version 2.x</h2>
     <li>Add support for <a href="manual.html#option_lineWrapping">line
     wrapping</a> and <a href="manual.html#hideLine">code
     folding</a>.</li>
-    <li>Add <a href="../mode/gfm/index.html">Github-style Markdown</a> mode.</li>
+    <li>Add <a href="../mode/gfm/index.html">GitHub-style Markdown</a> mode.</li>
     <li>Add <a href="../theme/monokai.css">Monokai</a>
     and <a href="../theme/rubyblue.css">Rubyblue</a> themes.</li>
     <li>Add <a href="manual.html#setBookmark"><code>setBookmark</code></a> method.</li>
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
index 5709e652bf..dabe974cfa 100644
--- a/doc/upgrade_v2.2.html
+++ b/doc/upgrade_v2.2.html
@@ -79,7 +79,7 @@ <h3>Different key customization</h3>
 and indent it less when shift is held (<code>"indentLess"</code>).
 There are also <code>"indentAuto"</code> (smart indent)
 and <code>"insertTab"</code> commands provided for alternate
-behaviors. Or you can write your own handler function to do something
+behavior. Or you can write your own handler function to do something
 different altogether.</p>
 
 <h3>Tabs</h3>
diff --git a/index.html b/index.html
index a89b1de5d3..3934c309d9 100644
--- a/index.html
+++ b/index.html
@@ -100,7 +100,7 @@ <h2>This is CodeMirror</h2>
     </div>
     <div class=actionsleft>
       Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.1</a>.<br>
-      You can see the <a href="https://github.com/codemirror/codemirror" title="Github repository">code</a>,<br>
+      You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
     </div>
diff --git a/keymap/vim.js b/keymap/vim.js
index 789e1e55b3..dba9d7c1e0 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -737,7 +737,7 @@
         // TODO: Convert keymap into dictionary format for fast lookup.
       },
       // Testing hook, though it might be useful to expose the register
-      // controller anyways.
+      // controller anyway.
       getRegisterController: function() {
         return vimGlobalState.registerController;
       },
@@ -4322,7 +4322,7 @@
         raw += ' <span style="color: #888">' + desc + '</span>';
       return raw;
     }
-    var searchPromptDesc = '(Javascript regexp)';
+    var searchPromptDesc = '(JavaScript regexp)';
     function showPrompt(cm, options) {
       var shortText = (options.prefix || '') + ' ' + (options.desc || '');
       var prompt = makePrompt(options.prefix, options.desc);
@@ -5234,7 +5234,7 @@
     * @param {Cursor} lineEnd Line to stop replacing at.
     * @param {RegExp} query Query for performing matches with.
     * @param {string} replaceWith Text to replace matches with. May contain $1,
-    *     $2, etc for replacing captured groups using Javascript replace.
+    *     $2, etc for replacing captured groups using JavaScript replace.
     * @param {function()} callback A callback for when the replace is done.
     */
     function doReplace(cm, confirm, global, lineStart, lineEnd, searchCursor, query,
diff --git a/mode/asn.1/asn.1.js b/mode/asn.1/asn.1.js
index d3ecb08781..df1330b686 100644
--- a/mode/asn.1/asn.1.js
+++ b/mode/asn.1/asn.1.js
@@ -190,7 +190,7 @@
     " NetworkAddress BITS BMPString TimeStamp TimeTicks" +
     " TruthValue RowStatus DisplayString GeneralString" +
     " GraphicString IA5String NumericString" +
-    " PrintableString SnmpAdminAtring TeletexString" +
+    " PrintableString SnmpAdminString TeletexString" +
     " UTF8String VideotexString VisibleString StringStore" +
     " ISO646String T61String UniversalString Unsigned32" +
     " Integer32 Gauge Gauge32 Counter Counter32 Counter64"),
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 2154f1d2df..5d01e1cd4c 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -749,7 +749,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                 "gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix " +
                 "gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse " +
                 "gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse " +
-                "gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose " +
+                "gl_TextureMatrixTranspose gl_ModelViewMatrixInverseTranspose " +
                 "gl_ProjectionMatrixInverseTranspose " +
                 "gl_ModelViewProjectionMatrixInverseTranspose " +
                 "gl_TextureMatrixInverseTranspose " +
diff --git a/mode/clike/index.html b/mode/clike/index.html
index 0cfae2149e..b1c881904f 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -148,7 +148,7 @@ <h2>Objective-C example</h2>
 */
 
 #import "MyClass.h"
-#import <AFramework/AFrameork.h>
+#import <AFramework/AFramework.h>
 @import BFrameworkModule;
 
 NS_ENUM(SomeValues) {
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index 74b8c6bded..40370a393d 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -34,7 +34,7 @@ CodeMirror.defineMode("dtd", function(config) {
       state.tokenize = inBlock("meta", "?>");
       return ret("meta", ch);
     } else if (ch == "#" && stream.eatWhile(/[\w]/)) return ret("atom", "tag");
-    else if (ch == "|") return ret("keyword", "seperator");
+    else if (ch == "|") return ret("keyword", "separator");
     else if (ch.match(/[\(\)\[\]\-\.,\+\?>]/)) return ret(null, ch);//if(ch === ">") return ret(null, "endtag"); else
     else if (ch.match(/[\[\]]/)) return ret("rule", ch);
     else if (ch == "\"" || ch == "'") {
diff --git a/mode/factor/factor.js b/mode/factor/factor.js
index 7108278cca..4c876d4d29 100644
--- a/mode/factor/factor.js
+++ b/mode/factor/factor.js
@@ -16,7 +16,7 @@
   "use strict";
 
   CodeMirror.defineSimpleMode("factor", {
-    // The start state contains the rules that are intially used
+    // The start state contains the rules that are initially used
     start: [
       // comments
       {regex: /#?!.*/, token: "comment"},
diff --git a/mode/factor/index.html b/mode/factor/index.html
index 574d402dda..6a77230d40 100644
--- a/mode/factor/index.html
+++ b/mode/factor/index.html
@@ -70,7 +70,7 @@ <h2>Factor mode</h2>
   });
 </script>
 <p/>
-<p>Simple mode that handles Factor Syntax (<a href="http://en.wikipedia.org/wiki/Factor_(programming_language)">Factor on WikiPedia</a>).</p>
+<p>Simple mode that handles Factor Syntax (<a href="http://en.wikipedia.org/wiki/Factor_(programming_language)">Factor on Wikipedia</a>).</p>
 
 <p><strong>MIME types defined:</strong> <code>text/x-factor</code>.</p>
 
diff --git a/mode/fcl/index.html b/mode/fcl/index.html
index e51fa166b9..9194dfddaf 100644
--- a/mode/fcl/index.html
+++ b/mode/fcl/index.html
@@ -61,7 +61,7 @@ <h2>FCL mode</h2>
       END_FUZZIFY
 
       DEFUZZIFY ProbabilityAccess
-          TERM hight := 1;
+          TERM height := 1;
           TERM medium := 0.5;
           TERM low := 0;
           ACCU: MAX;
@@ -70,7 +70,7 @@ <h2>FCL mode</h2>
       END_DEFUZZIFY
 
       DEFUZZIFY ProbabilityDistribution
-          TERM hight := 1;
+          TERM height := 1;
           TERM medium := 0.5;
           TERM low := 0;
           ACCU: MAX;
@@ -80,14 +80,14 @@ <h2>FCL mode</h2>
 
       RULEBLOCK No1
           AND : MIN;
-          RULE 1 : IF TimeDay IS outside AND ApplicateHost IS few THEN ProbabilityAccess IS hight;
-          RULE 2 : IF ApplicateHost IS many THEN ProbabilityAccess IS hight;
+          RULE 1 : IF TimeDay IS outside AND ApplicateHost IS few THEN ProbabilityAccess IS height;
+          RULE 2 : IF ApplicateHost IS many THEN ProbabilityAccess IS height;
           RULE 3 : IF TimeDay IS inside AND ApplicateHost IS few THEN ProbabilityAccess IS low;
       END_RULEBLOCK
 
       RULEBLOCK No2
           AND : MIN;
-          RULE 1 : IF ApplicateHost IS many THEN ProbabilityDistribution IS hight;
+          RULE 1 : IF ApplicateHost IS many THEN ProbabilityDistribution IS height;
       END_RULEBLOCK
 
   END_FUNCTION_BLOCK
diff --git a/mode/forth/index.html b/mode/forth/index.html
index c6f0b5c5c8..6b6477cae7 100644
--- a/mode/forth/index.html
+++ b/mode/forth/index.html
@@ -68,7 +68,7 @@ <h2>Forth mode</h2>
   });
 </script>
 
-<p>Simple mode that handle Forth-Syntax (<a href="http://en.wikipedia.org/wiki/Forth_%28programming_language%29">Forth on WikiPedia</a>).</p>
+<p>Simple mode that handle Forth-Syntax (<a href="http://en.wikipedia.org/wiki/Forth_%28programming_language%29">Forth on Wikipedia</a>).</p>
 
 <p><strong>MIME types defined:</strong> <code>text/x-forth</code>.</p>
 
diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index e34d7a7b61..b3515abe77 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -302,11 +302,11 @@ CodeMirror.defineMode("gas", function(_config, parserConfig) {
       }
 
       if (ch === '{') {
-        return "braket";
+        return "bracket";
       }
 
       if (ch === '}') {
-        return "braket";
+        return "bracket";
       }
 
       if (/\d/.test(ch)) {
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index d933896aa5..e2002879cb 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -92,7 +92,7 @@
      "[em *foo ][em&link bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2][em *]");
 
   MT("wordSHA",
-     "ask for feedbac")
+     "ask for feedback")
 
   MT("num",
      "foo [link #1] bar");
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index 3c8f505eb5..d941d97433 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -72,7 +72,7 @@
         }
       }
 
-      // donot handle --> as valid ruby, make it HTML close comment instead
+      // do not handle --> as valid ruby, make it HTML close comment instead
       if (state.startOfLine && !stream.match("-->", false) && (ch == "=" || ch == "-" )) {
         state.tokenize = ruby;
         return state.tokenize(stream, state);
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index b1cafde973..d17afec8b1 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -55,6 +55,6 @@ <h2>Html Embedded Scripts mode</h2>
     JavaScript, CSS and XML.<br />Other dependencies include those of the scripting language chosen.</p>
 
     <p><strong>MIME types defined:</strong> <code>application/x-aspx</code> (ASP.NET),
-    <code>application/x-ejs</code> (Embedded Javascript), <code>application/x-jsp</code> (JavaServer Pages)
+    <code>application/x-ejs</code> (Embedded JavaScript), <code>application/x-jsp</code> (JavaServer Pages)
     and <code>application/x-erb</code></p>
   </article>
diff --git a/mode/idl/idl.js b/mode/idl/idl.js
index 168761cd88..37302bb90f 100644
--- a/mode/idl/idl.js
+++ b/mode/idl/idl.js
@@ -62,7 +62,7 @@
     'empty', 'enable_sysrtn', 'eof', 'eos', 'erase',
     'erf', 'erfc', 'erfcx', 'erode', 'errorplot',
     'errplot', 'estimator_filter', 'execute', 'exit', 'exp',
-    'expand', 'expand_path', 'expint', 'extrac', 'extract_slice',
+    'expand', 'expand_path', 'expint', 'extract', 'extract_slice',
     'f_cvf', 'f_pdf', 'factorial', 'fft', 'file_basename',
     'file_chmod', 'file_copy', 'file_delete', 'file_dirname',
     'file_expand_path', 'file_gunzip', 'file_gzip', 'file_info',
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index ffff05f513..26a81ffc8d 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -252,7 +252,7 @@
   MT("async_object",
      "[keyword let] [def obj] [operator =] { [property async]: [atom false] };");
 
-  // async be highlighet as keyword and foo as def, but it requires potentially expensive look-ahead. See #4173
+  // async be highlighted as keyword and foo as def, but it requires potentially expensive look-ahead. See #4173
   MT("async_object_function",
      "[keyword let] [def obj] [operator =] { [property async] [property foo]([def args]) { [keyword return] [atom true]; } };");
 
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index da3fe61b98..4984c04b2c 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -159,7 +159,7 @@ <h2>Markdown mode</h2>
 
 Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
 `+`, and `-`) as list markers. These three markers are
-interchangable; this:
+interchangeable; this:
 
     *   Candy.
     *   Gum.
@@ -306,7 +306,7 @@ <h2>Markdown mode</h2>
     I strongly recommend against using any `&lt;blink&gt;` tags.
 
     I wish SmartyPants used named entities like `&amp;mdash;`
-    instead of decimal-encoded entites like `&amp;#8212;`.
+    instead of decimal-encoded entities like `&amp;#8212;`.
 
 Output:
 
@@ -315,7 +315,7 @@ <h2>Markdown mode</h2>
 
     &lt;p&gt;I wish SmartyPants used named entities like
     &lt;code&gt;&amp;amp;mdash;&lt;/code&gt; instead of decimal-encoded
-    entites like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
+    entities like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
 
 
 To specify an entire block of pre-formatted code, indent every line of
@@ -360,7 +360,7 @@ <h2>Markdown mode</h2>
       });
     </script>
 
-    <p>If you also want support <code>strikethrough</code>, <code>emoji</code> and few other goodies, check out <a href="../gfm/index.html">Github-Flavored Markdown mode</a>.</p>
+    <p>If you also want support <code>strikethrough</code>, <code>emoji</code> and few other goodies, check out <a href="../gfm/index.html">GitHub-Flavored Markdown mode</a>.</p>
 
     <p>Optionally depends on other modes for properly highlighted code blocks,
       and XML mode for properly highlighted inline XML blocks.</p>
@@ -370,7 +370,7 @@ <h2>Markdown mode</h2>
       <li>
         <d1>
           <dt><code>highlightFormatting: boolean</code></dt>
-          <dd>Whether to separately highlight markdown meta characterts (<code>*[]()</code>etc.) (default: <code>false</code>).</dd>
+          <dd>Whether to separately highlight markdown meta characters (<code>*[]()</code>etc.) (default: <code>false</code>).</dd>
         </d1>
       </li>
       <li>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 287f39b55d..aee76c43ac 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -223,7 +223,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
       // Add this list item's content's indentation to the stack
       state.listStack.push(state.indentation);
-      // Reset inline styles which shouldn't propagate aross list items
+      // Reset inline styles which shouldn't propagate across list items
       state.em = false;
       state.strong = false;
       state.code = false;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 929e7bba19..fd5a1fb4d5 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -315,7 +315,7 @@
      "[header&header-2 bar]",
      "[header&header-2 ---]");
 
-  MT("setextAferATX",
+  MT("setextAfterATX",
      "[header&header-1 # foo]",
      "[header&header-2 bar]",
      "[header&header-2 ---]");
@@ -659,7 +659,7 @@
      "  [variable-2 text after fenced code]");
 
   // should correctly parse numbered list content indentation
-  MT("listCommonMark_NumeberedListIndent",
+  MT("listCommonMark_NumberedListIndent",
      "[variable-2 1000. list with base indent of 6]",
      "",
      "      [variable-2 text must be indented 6 spaces at minimum]",
diff --git a/mode/meta.js b/mode/meta.js
index c7738a514c..92b68074ca 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -44,7 +44,7 @@
     {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
     {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
     {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
-    {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
+    {name: "Embedded JavaScript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
     {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
     {name: "Esper", mime: "text/x-esper", mode: "sql"},
diff --git a/mode/modelica/modelica.js b/mode/modelica/modelica.js
index a83a4135d0..2e9622f03f 100644
--- a/mode/modelica/modelica.js
+++ b/mode/modelica/modelica.js
@@ -90,7 +90,7 @@
         return "error";
     }
 
-    function tokenUnsignedNuber(stream, state) {
+    function tokenUnsignedNumber(stream, state) {
       stream.eatWhile(isDigit);
       if (stream.eat('.')) {
         stream.eatWhile(isDigit);
@@ -164,9 +164,9 @@
         else if(ch == '"') {
           state.tokenize = tokenString;
         }
-        // UNSIGNED_NUBER
+        // UNSIGNED_NUMBER
         else if(isDigit.test(ch)) {
-          state.tokenize = tokenUnsignedNuber;
+          state.tokenize = tokenUnsignedNumber;
         }
         // ERROR
         else {
diff --git a/mode/mumps/mumps.js b/mode/mumps/mumps.js
index 3671c9cb36..c53b4bf3a2 100644
--- a/mode/mumps/mumps.js
+++ b/mode/mumps/mumps.js
@@ -26,7 +26,7 @@
     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
+    // The following list includes intrinsic 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 command = wordRegexp(commandKeywords);
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index 5c2bc6e2cf..1aa690a6d4 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -62,7 +62,7 @@ <h2>NGINX mode</h2>
   location / {
     index index.html index.php;     ## Allow a static html file to be shown first
     try_files $uri $uri/ @handler;  ## If missing pass the URI to Magento's front handler
-    expires 30d;                    ## Assume all files are cachable
+    expires 30d;                    ## Assume all files are cacheable
   }
 
   ## These locations would be hidden by .htaccess normally
@@ -128,7 +128,7 @@ <h2>NGINX mode</h2>
   location / {
     index index.html index.php; ## Allow a static html file to be shown first
     try_files $uri $uri/ @handler; ## If missing pass the URI to Magento's front handler
-    expires 30d; ## Assume all files are cachable
+    expires 30d; ## Assume all files are cacheable
   }
 
   ## These locations would be hidden by .htaccess normally
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index 5473dbffc0..275cf08b49 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -58,7 +58,7 @@ <h2><a href="https://www.w3.org/TR/n-triples/">N-Triples</a> mode</h2>
     <http://Sub2>     <http://pred2#an2> "literal 1"    <http://graph2> .
     <http://Sub3#an3> <http://pred3>     _:bnode3     <http://graph2> .
     _:bnode4          <http://pred4>     "literal 2"@lang     <http://graph2> .
-    # if a graph labe
+    # if a graph label
     _:bnode5          <http://pred5>     "literal 3"^^<http://type> .
     </textarea>
     </form>
diff --git a/mode/oz/oz.js b/mode/oz/oz.js
index a9738495b6..63ad806abc 100644
--- a/mode/oz/oz.js
+++ b/mode/oz/oz.js
@@ -130,7 +130,7 @@ CodeMirror.defineMode("oz", function (conf) {
       return "operator";
     }
 
-    // If nothing match, we skip the entire alphanumerical block
+    // If nothing match, we skip the entire alphanumeric block
     stream.eatWhile(/\w/);
 
     return "variable";
diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 220b0a6994..ffe7877af1 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -347,7 +347,7 @@ CodeMirror.defineMode("perl",function(){
                 lc                              :1,     // - return lower-case version of a string
                 lcfirst                         :1,     // - return a string with just the next letter in lower case
                 length                          :1,     // - return the number of bytes in a string
-                'link'                          :1,     // - create a hard link in the filesytem
+                'link'                          :1,     // - create a hard link in the filesystem
                 listen                          :1,     // - register your socket as a server
                 local                           : 2,    // - create a temporary value for a global variable (dynamic scoping)
                 localtime                       :1,     // - convert UNIX time into record or string using local time
@@ -441,7 +441,7 @@ CodeMirror.defineMode("perl",function(){
                 state                           :1,     // - declare and assign a state variable (persistent lexical scoping)
                 study                           :1,     // - optimize input data for repeated searches
                 'sub'                           :1,     // - declare a subroutine, possibly anonymously
-                'substr'                        :1,     // - get or alter a portion of a stirng
+                'substr'                        :1,     // - get or alter a portion of a string
                 symlink                         :1,     // - create a symbolic link to a file
                 syscall                         :1,     // - execute an arbitrary system call
                 sysopen                         :1,     // - open a file, pipe, or descriptor
diff --git a/mode/python/index.html b/mode/python/index.html
index bdfc8f574c..78a3a14641 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -190,7 +190,7 @@ <h2>Configuration Options for Python mode:</h2>
       <li>hangingIndent - int - If you want to write long arguments to a function starting on a new line, how much that line should be indented. Defaults to one normal indentation unit.</li>
     </ul>
     <h2>Advanced Configuration Options:</h2>
-    <p>Usefull for superset of python syntax like Enthought enaml, IPython magics and  questionmark help</p>
+    <p>Useful for superset of python syntax like Enthought enaml, IPython magics and  questionmark help</p>
     <ul>
       <li>singleOperators - RegEx - Regular Expression for single operator matching,  default : <pre>^[\\+\\-\\*/%&amp;|\\^~&lt;&gt;!]</pre> including <pre>@</pre> on Python 3</li>
       <li>singleDelimiters - RegEx - Regular Expression for single delimiter matching, default :  <pre>^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]</pre></li>
diff --git a/mode/python/test.js b/mode/python/test.js
index 2b605b8e62..39b80cf70a 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -31,7 +31,7 @@
   }
 
   MT("fValidStringPrefix", "[string f'this is a]{[variable formatted]}[string string']");
-  MT("fValidExpressioninFString", "[string f'expression ]{[number 100][operator *][number 5]}[string string']");
+  MT("fValidExpressionInFString", "[string f'expression ]{[number 100][operator *][number 5]}[string string']");
   MT("fInvalidFString", "[error f'this is wrong}]");
   MT("fNestedFString", "[string f'expression ]{[number 100] [operator +] [string f'inner]{[number 5]}[string ']}[string string']");
   MT("uValidStringPrefix", "[string u'this is an unicode string']");
diff --git a/mode/rpm/rpm.js b/mode/rpm/rpm.js
index 2dece2eabd..88a7e889ed 100644
--- a/mode/rpm/rpm.js
+++ b/mode/rpm/rpm.js
@@ -12,14 +12,14 @@
 "use strict";
 
 CodeMirror.defineMode("rpm-changes", function() {
-  var headerSeperator = /^-+$/;
+  var headerSeparator = /^-+$/;
   var headerLine = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)  ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /;
   var simpleEmail = /^[\w+.-]+@[\w.-]+/;
 
   return {
     token: function(stream) {
       if (stream.sol()) {
-        if (stream.match(headerSeperator)) { return 'tag'; }
+        if (stream.match(headerSeparator)) { return 'tag'; }
         if (stream.match(headerLine)) { return 'tag'; }
       }
       if (stream.match(simpleEmail)) { return 'string'; }
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index 55fe6c5892..daebdca291 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -34,7 +34,7 @@ <h2>Ruby mode</h2>
 # This program evaluates polynomials.  It first asks for the coefficients
 # of a polynomial, which must be entered on one line, highest-order first.
 # It then requests values of x and will compute the value of the poly for
-# each x.  It will repeatly ask for x values, unless you the user enters
+# each x.  It will repeatedly ask for x values, unless you the user enters
 # a blank line.  It that case, it will ask for another polynomial.  If the
 # user types quit for either input, the program immediately exits.
 #
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index efac89078b..370250d856 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -170,7 +170,7 @@ CodeMirror.defineMode("scheme", function () {
                             } else if (stream.match(/^[-+0-9.]/, false)) {
                                 hasRadix = false;
                                 numTest = isDecimalNumber;
-                            // re-consume the intial # if all matches failed
+                            // re-consume the initial # if all matches failed
                             } else if (!hasExactness) {
                                 stream.eat('#');
                             }
diff --git a/mode/sieve/sieve.js b/mode/sieve/sieve.js
index f02a867e7a..b7236401a7 100644
--- a/mode/sieve/sieve.js
+++ b/mode/sieve/sieve.js
@@ -43,7 +43,7 @@ CodeMirror.defineMode("sieve", function(config) {
     if (ch == "(") {
       state._indent.push("(");
       // add virtual angel wings so that editor behaves...
-      // ...more sane incase of broken brackets
+      // ...more sane in case of broken brackets
       state._indent.push("{");
       return null;
     }
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 4127cd9a05..dcde1a771c 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -370,7 +370,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       "$":   hookVar,
       // The preferred way to escape Identifiers is using double quotes, ref: http://sqlite.org/lang_keywords.html
       "\"":   hookIdentifierDoublequote,
-      // there is also support for backtics, ref: http://sqlite.org/lang_keywords.html
+      // there is also support for backticks, ref: http://sqlite.org/lang_keywords.html
       "`":   hookIdentifier
     }
   });
@@ -451,7 +451,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   // Spark SQL
   CodeMirror.defineMIME("text/x-sparksql", {
     name: "sql",
-    keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases datata dbproperties defined delete delimited deny desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on optimize option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
+    keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases data dbproperties defined delete delimited deny desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on optimize option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
     builtin: set("tinyint smallint int bigint boolean float double string binary timestamp decimal array map struct uniontype delimited serde sequencefile textfile rcfile inputformat outputformat"),
     atoms: set("false true null"),
     operatorChars: /^[*\/+\-%<>!=~&|^]/,
diff --git a/mode/vbscript/vbscript.js b/mode/vbscript/vbscript.js
index 0670c0ceef..4033948133 100644
--- a/mode/vbscript/vbscript.js
+++ b/mode/vbscript/vbscript.js
@@ -32,7 +32,7 @@ CodeMirror.defineMode("vbscript", function(conf, parserConf) {
     var singleOperators = new RegExp("^[\\+\\-\\*/&\\\\\\^<>=]");
     var doubleOperators = new RegExp("^((<>)|(<=)|(>=))");
     var singleDelimiters = new RegExp('^[\\.,]');
-    var brakets = new RegExp('^[\\(\\)]');
+    var brackets = new RegExp('^[\\(\\)]');
     var identifiers = new RegExp("^[A-Za-z][_A-Za-z0-9]*");
 
     var openingKeywords = ['class','sub','select','while','if','function', 'property', 'with', 'for'];
@@ -183,7 +183,7 @@ CodeMirror.defineMode("vbscript", function(conf, parserConf) {
             return null;
         }
 
-        if (stream.match(brakets)) {
+        if (stream.match(brackets)) {
             return "bracket";
         }
 
diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index 56caa671b3..1d17c84ebe 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -48,7 +48,7 @@ CodeMirror.defineMode("velocity", function() {
             else if (state.inParams)
                 return chain(stream, state, tokenString(ch));
         }
-        // is it one of the special signs []{}().,;? Seperator?
+        // is it one of the special signs []{}().,;? Separator?
         else if (/[\[\]{}\(\),;\.]/.test(ch)) {
             if (ch == "(" && beforeParams)
                 state.inParams = true;
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 89fe9c1ac8..6c799f298b 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -542,7 +542,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
   };
   var tlvIndentUnit = 3;
   var tlvTrackStatements = false;
-  var tlvIdentMatch = /^([~!@#\$%\^&\*-\+=\?\/\\\|'"<>]+)([\d\w_]*)/;  // Matches an identifiere.
+  var tlvIdentMatch = /^([~!@#\$%\^&\*-\+=\?\/\\\|'"<>]+)([\d\w_]*)/;  // Matches an identifier.
   // Note that ':' is excluded, because of it's use in [:].
   var tlvFirstLevelIndentMatch = /^[! ]  /;
   var tlvLineIndentationMatch = /^[! ] */;
@@ -719,7 +719,7 @@ CodeMirror.defineMode("verilog", function(config, parserConfig) {
             } else {
               // Just swallow one character and try again.
               // This enables subsequent identifier match with preceding symbol character, which
-              //   is legal within a statement.  (Eg, !$reset).  It also enables detection of
+              //   is legal within a statement.  (E.g., !$reset).  It also enables detection of
               //   comment start with preceding symbols.
               stream.backUp(stream.current().length - 1);
               style = "tlv-default";
diff --git a/mode/vue/index.html b/mode/vue/index.html
index df519a5cb7..78b4784840 100644
--- a/mode/vue/index.html
+++ b/mode/vue/index.html
@@ -38,7 +38,7 @@
 <h2>Vue.js mode</h2>
 <form><textarea id="code" name="code">
 <template>
-  <div class="sass">Im am a {{mustache-like}} template</div>
+  <div class="sass">I'm am a {{mustache-like}} template</div>
 </template>
 
 <script lang="coffee">
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index a29d7ea4a7..928050eb3c 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -57,12 +57,12 @@ CodeMirror.defineMode("yaml", function() {
         return 'meta';
       }
 
-      /* list seperator */
+      /* list separator */
       if (state.inlineList > 0 && !esc && ch == ',') {
         stream.next();
         return 'meta';
       }
-      /* pairs seperator */
+      /* pairs separator */
       if (state.inlinePairs > 0 && !esc && ch == ',') {
         state.keyCol = 0;
         state.pair = false;

From 1b178d37f7cbdbf95542f72575c644f0d799be71 Mon Sep 17 00:00:00 2001
From: Josh Soref <jsoref@users.noreply.github.com>
Date: Fri, 8 Jan 2021 10:19:24 -0500
Subject: [PATCH 4401/4742] Fix spelling in vim test

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
---
 test/vim_test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/vim_test.js b/test/vim_test.js
index c75a1646cf..ec8dd21d91 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -495,7 +495,7 @@ testVim('j_k_and_gj_gk', function(cm,vim,helpers){
   //should return to the same character-index
   helpers.doKeys('k');
   helpers.assertCursorAt(0, 176);
-},{ lineWrapping:true, value: 'This line is intentially long to test movement of gj and gk over wrapped lines. I will start on the end of this line, then make a step up and back to set the origin for j and k.\nThis line is supposed to be even longer than the previous. I will jump here and make another wiggle with gj and gk, before I jump back to the line above. Both wiggles should not change my cursor\'s target character but both j/k and gj/gk change each other\'s reference position.'});
+},{ lineWrapping:true, value: 'This line is intentionally long. It tests movements of gj and gk over wrapped lines. Starts on the end of this line, then makes a step up and back to set the origin for j and k.\nThis line is supposed to be even longer than the previous. I will jump here and make another wiggle with gj and gk, before I jump back to the line above. Both wiggles should not change my cursor\'s target character but both j/k and gj/gk change each other\'s reference position.'});
 testVim('gj_gk', function(cm, vim, helpers) {
   cm.setSize(120);
   // Test top of document edge case.

From 79d2f88a5f652acf433bbe3b7d087c2391befe43 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 9 Jan 2021 13:30:36 +0100
Subject: [PATCH 4402/4742] [vue demo] Fix further spelling mistake

Issue #6555
---
 mode/vue/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/vue/index.html b/mode/vue/index.html
index 78b4784840..6ea54b7562 100644
--- a/mode/vue/index.html
+++ b/mode/vue/index.html
@@ -38,7 +38,7 @@
 <h2>Vue.js mode</h2>
 <form><textarea id="code" name="code">
 <template>
-  <div class="sass">I'm am a {{mustache-like}} template</div>
+  <div class="sass">I'm a {{mustache-like}} template</div>
 </template>
 
 <script lang="coffee">

From 760f416c17a15fdfb95e3bb00ee0cbb903e57e23 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 9 Jan 2021 13:36:56 +0100
Subject: [PATCH 4403/4742] [closebrackets] Fix regression in exploding
 brackets

Closes #6558
---
 addon/edit/closebrackets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 5c1aeab3c5..593d4439fb 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -102,7 +102,7 @@
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i]
       if (range.head == cm.getCursor()) primary = i
-      var pos = {line: range.head.line, ch: range.head.ch + dir}
+      var pos = range.head.ch || dir > 0 ? {line: range.head.line, ch: range.head.ch + dir} : {line: range.head.line - 1}
       newRanges.push({anchor: pos, head: pos})
     }
     cm.setSelections(newRanges, primary)

From 6aa4fefafadfa786d3d2ac7d7ad5757968cdf494 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Jan 2021 09:55:29 +0100
Subject: [PATCH 4404/4742] [brace-fold addon] Pick first opening token on a
 given line

Closes #6560
---
 addon/fold/brace-fold.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 654d1fb691..79a331cf68 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -31,13 +31,16 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
     }
   }
 
-  var startToken = "{", endToken = "}", startCh = findOpening("{");
-  if (startCh == null) {
-    startToken = "[", endToken = "]";
-    startCh = findOpening("[");
+  var startBrace = findOpening("{"), startBracket = findOpening("[")
+  var startToken, endToken, startCh
+  if (startBrace != null && (startBracket == null || startBracket > startBrace)) {
+    startCh = startBrace; startToken = "{"; endToken = "}"
+  } else if (startBracket != null) {
+    startCh = startBracket; startToken = "["; endToken = "]"
+  } else {
+    return
   }
 
-  if (startCh == null) return;
   var count = 1, lastLine = cm.lastLine(), end, endCh;
   outer: for (var i = line; i <= lastLine; ++i) {
     var text = cm.getLine(i), pos = i == line ? startCh : 0;

From 14dec2b6e79899914bd94a679d6561915d34d3ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Jan 2021 10:38:25 +0100
Subject: [PATCH 4405/4742] Don't scroll the selection into view in nocursor
 mode

Closes #6561
---
 src/model/selection_updates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index 4db2bd7f5b..3f399e5f0e 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -106,7 +106,7 @@ export function setSelectionNoUndo(doc, sel, options) {
     (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1)
   setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true))
 
-  if (!(options && options.scroll === false) && doc.cm)
+  if (!(options && options.scroll === false) && doc.cm && doc.cm.getOption("readOnly") != "nocursor")
     ensureCursorVisible(doc.cm)
 }
 

From 8d13f242bff45ef05f2c6183070071d09d2dc556 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Jan 2021 12:01:15 +0100
Subject: [PATCH 4406/4742] Add CodeMirror 6 banner to front page

---
 index.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 3934c309d9..733dcdab9c 100644
--- a/index.html
+++ b/index.html
@@ -18,10 +18,13 @@
   .CodeMirror { height: auto; border: 1px solid #ddd; }
   .CodeMirror-scroll { max-height: 200px; }
   .CodeMirror pre { padding-left: 7px; line-height: 1.25; }
-  .banner { background: #ffc; padding: 6px; border-bottom: 2px solid silver;  }
-  .banner div { margin: 0 auto; max-width: 700px; text-align: center; }
+  .banner { background: #ffc; padding: 6px; border-bottom: 2px solid silver; text-align: center }
 </style>
 
+<div class=banner>
+  ‼️ Check out the upcoming <a href="https://codemirror.net/6/">CodeMirror 6</a>, a much-improved rewrite! ✨
+</div>
+
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="doc/logo.png"></a>
 

From 4823ade863d0306371858394bc1b117aed3043bf Mon Sep 17 00:00:00 2001
From: Thiemo Kreuz <thiemowmde@users.noreply.github.com>
Date: Thu, 14 Jan 2021 12:49:27 +0100
Subject: [PATCH 4407/4742] [matchbrackets addon] Add highlightNonMatching
 option

It's not uncommon to have non-matching brackets in MediaWiki
wikitext source code. This is not always an error. Another
reason why we want to disable this feature is that it's rather
distracting while typing. We temporarily patched our copy of
the addon, but think it's worth having a proper config flag.

https://gerrit.wikimedia.org/r/656119
---
 addon/edit/matchbrackets.js | 5 +++--
 doc/manual.html             | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 692e09e0cc..6d1fa29fe9 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -80,11 +80,12 @@
 
   function matchBrackets(cm, autoclear, config) {
     // Disable brace matching in long lines, since it'll cause hugely slow updates
-    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
+    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000,
+      highlightNonMatching = config && config.highlightNonMatching;
     var marks = [], ranges = cm.listSelections();
     for (var i = 0; i < ranges.length; i++) {
       var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, config);
-      if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
+      if (match && (match.match || highlightNonMatching !== false) && cm.getLine(match.from.line).length <= maxHighlightLen) {
         var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
         marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
         if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)
diff --git a/doc/manual.html b/doc/manual.html
index 7aade3df15..f6bd82be1f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2443,6 +2443,8 @@ <h2 id="addons">Addons</h2>
         <dl>
           <dt><strong><code>afterCursor</code></strong></dt>
           <dd>Only use the character after the start position, never the one before it.</dd>
+          <dt><strong><code>highlightNonMatching</code></strong></dt>
+          <dd>Also highlight pairs of non-matching as well as stray brackets. Enabled by default.</dd>
           <dt><strong><code>strict</code></strong></dt>
           <dd>Causes only matches where both brackets are at the same side of the start position to be considered.</dd>
           <dt><strong><code>maxScanLines</code></strong></dt>

From 281f132d501f499f6e7f792f0e3e1efc6c9c4943 Mon Sep 17 00:00:00 2001
From: Thiemo Kreuz <thiemowmde@users.noreply.github.com>
Date: Fri, 15 Jan 2021 15:10:13 +0100
Subject: [PATCH 4408/4742] [various modes[ Replace regexp stream.match with
 string matches

Warning: This works only when the match() call is a
StringStream.match(), not if it is a native String.match().
Please carefully review this and make sure this doesn't
break anything.
---
 mode/dtd/dtd.js                           |  2 +-
 mode/ebnf/ebnf.js                         | 14 +++++++-------
 mode/julia/julia.js                       | 22 +++++++++++-----------
 mode/markdown/markdown.js                 |  4 ++--
 mode/mscgen/mscgen.js                     |  4 ++--
 mode/oz/oz.js                             |  2 +-
 mode/pegjs/pegjs.js                       |  6 +++---
 mode/pug/pug.js                           |  2 +-
 mode/rpm/rpm.js                           |  4 ++--
 mode/sass/sass.js                         |  2 +-
 mode/soy/soy.js                           | 10 +++++-----
 mode/sql/sql.js                           |  6 +++---
 mode/stylus/stylus.js                     |  2 +-
 mode/tiddlywiki/tiddlywiki.js             |  2 +-
 mode/yaml-frontmatter/yaml-frontmatter.js |  2 +-
 mode/yaml/yaml.js                         |  4 ++--
 16 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index 40370a393d..1bff91cbab 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -112,7 +112,7 @@ CodeMirror.defineMode("dtd", function(config) {
     indent: function(state, textAfter) {
       var n = state.stack.length;
 
-      if( textAfter.match(/\]\s+|\]/) )n=n-1;
+      if( textAfter.charAt(0) === ']' )n--;
       else if(textAfter.substr(textAfter.length-1, textAfter.length) === ">"){
         if(textAfter.substr(0,1) === "<") {}
         else if( type == "doindent" && textAfter.length > 1 ) {}
diff --git a/mode/ebnf/ebnf.js b/mode/ebnf/ebnf.js
index 238bbe23bf..d8fb3f3a2f 100644
--- a/mode/ebnf/ebnf.js
+++ b/mode/ebnf/ebnf.js
@@ -41,10 +41,10 @@
             state.stringType = stream.peek();
             stream.next(); // Skip quote
             state.stack.unshift(stateType._string);
-          } else if (stream.match(/^\/\*/)) { //comments starting with /*
+          } else if (stream.match('/*')) { //comments starting with /*
             state.stack.unshift(stateType.comment);
             state.commentType = commentType.slash;
-          } else if (stream.match(/^\(\*/)) { //comments starting with (*
+          } else if (stream.match('(*')) { //comments starting with (*
             state.stack.unshift(stateType.comment);
             state.commentType = commentType.parenthesis;
           }
@@ -69,10 +69,10 @@
 
         case stateType.comment:
           while (state.stack[0] === stateType.comment && !stream.eol()) {
-            if (state.commentType === commentType.slash && stream.match(/\*\//)) {
+            if (state.commentType === commentType.slash && stream.match('*/')) {
               state.stack.shift(); // Clear flag
               state.commentType = null;
-            } else if (state.commentType === commentType.parenthesis && stream.match(/\*\)/)) {
+            } else if (state.commentType === commentType.parenthesis && stream.match('*)')) {
               state.stack.shift(); // Clear flag
               state.commentType = null;
             } else {
@@ -83,7 +83,7 @@
 
         case stateType.characterClass:
           while (state.stack[0] === stateType.characterClass && !stream.eol()) {
-            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
+            if (!(stream.match(/^[^\]\\]+/) || stream.match('.'))) {
               state.stack.shift();
             }
           }
@@ -168,10 +168,10 @@
           }
         }
 
-        if (stream.match(/^\/\//)) {
+        if (stream.match('//')) {
           stream.skipToEnd();
           return "comment";
-        } else if (stream.match(/return/)) {
+        } else if (stream.match('return')) {
           return "operator";
         } else if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
           if (stream.match(/(?=[\(.])/)) {
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 3942492042..bff5413b85 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -80,7 +80,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   // tokenizers
   function tokenBase(stream, state) {
     // Handle multiline comments
-    if (stream.match(/^#=/, false)) {
+    if (stream.match('#=', false)) {
       state.tokenize = tokenComment;
       return state.tokenize(stream, state);
     }
@@ -141,10 +141,10 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     if (inArray(state)) {
-      if (state.lastToken == "end" && stream.match(/^:/)) {
+      if (state.lastToken == "end" && stream.match(':')) {
         return "operator";
       }
-      if (stream.match(/^end/)) {
+      if (stream.match('end')) {
         return "number";
       }
     }
@@ -201,7 +201,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     // Handle Chars
-    if (stream.match(/^'/)) {
+    if (stream.match('\'')) {
       state.tokenize = tokenChar;
       return state.tokenize(stream, state);
     }
@@ -263,7 +263,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         state.scopes.push('(');
         charsAdvanced += match[1].length;
       }
-      if (currentScope(state) == '(' && stream.match(/^\)/)) {
+      if (currentScope(state) == '(' && stream.match(')')) {
         state.scopes.pop();
         charsAdvanced += 1;
         if (state.scopes.length <= state.firstParenPos) {
@@ -295,10 +295,10 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   }
 
   function tokenAnnotation(stream, state) {
-    stream.match(/.*?(?=,|;|{|}|\(|\)|=|$|\s)/);
-    if (stream.match(/^{/)) {
+    stream.match(/.*?(?=[,;{}()=\s]|$)/);
+    if (stream.match('{')) {
       state.nestedParameters++;
-    } else if (stream.match(/^}/) && state.nestedParameters > 0) {
+    } else if (stream.match('}') && state.nestedParameters > 0) {
       state.nestedParameters--;
     }
     if (state.nestedParameters > 0) {
@@ -310,13 +310,13 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   }
 
   function tokenComment(stream, state) {
-    if (stream.match(/^#=/)) {
+    if (stream.match('#=')) {
       state.nestedComments++;
     }
     if (!stream.match(/.*?(?=(#=|=#))/)) {
       stream.skipToEnd();
     }
-    if (stream.match(/^=#/)) {
+    if (stream.match('=#')) {
       state.nestedComments--;
       if (state.nestedComments == 0)
         state.tokenize = tokenBase;
@@ -347,7 +347,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       return "string";
     }
     if (!stream.match(/^[^']+(?=')/)) { stream.skipToEnd(); }
-    if (stream.match(/^'/)) { state.tokenize = tokenBase; }
+    if (stream.match('\'')) { state.tokenize = tokenBase; }
     return "error";
   }
 
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index aee76c43ac..e730fc1ae2 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -612,7 +612,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
           return getType(state);
         }
       } else if (ch === ' ') {
-        if (stream.match(/^~~/, true)) { // Probably surrounded by space
+        if (stream.match('~~', true)) { // Probably surrounded by space
           if (stream.peek() === ' ') { // Surrounded by spaces, ignore
             return getType(state);
           } else { // Not surrounded by spaces, back up pointer
@@ -711,7 +711,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function footnoteLinkInside(stream, state) {
-    if (stream.match(/^\]:/, true)) {
+    if (stream.match(']:', true)) {
       state.f = state.inline = footnoteUrl;
       if (modeCfg.highlightFormatting) state.formatting = "link";
       var returnType = getType(state);
diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
index 6f4f9cd8f0..a5677fb116 100644
--- a/mode/mscgen/mscgen.js
+++ b/mode/mscgen/mscgen.js
@@ -153,7 +153,7 @@
         return "variable";
 
       /* attribute lists */
-      if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match(/\[/, true, true)) {
+      if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match('[', true, true)) {
         pConfig.inAttributeList = true;
         return "bracket";
       }
@@ -161,7 +161,7 @@
         if (pConfig.attributes !== null && pStream.match(wordRegexpBoundary(pConfig.attributes), true, true)) {
           return "attribute";
         }
-        if (pStream.match(/]/, true, true)) {
+        if (pStream.match(']', true, true)) {
           pConfig.inAttributeList = false;
           return "bracket";
         }
diff --git a/mode/oz/oz.js b/mode/oz/oz.js
index 63ad806abc..73857e4c7e 100644
--- a/mode/oz/oz.js
+++ b/mode/oz/oz.js
@@ -45,7 +45,7 @@ CodeMirror.defineMode("oz", function (conf) {
     }
 
     // Special [] keyword
-    if (stream.match(/(\[])/)) {
+    if (stream.match('[]')) {
         return "keyword"
     }
 
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index 19d5fa4c02..ac011d3c8f 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -39,7 +39,7 @@ CodeMirror.defineMode("pegjs", function (config) {
         stream.next(); // Skip quote
         state.inString = true; // Update state
       }
-      if (!state.inString && !state.inComment && stream.match(/^\/\*/)) {
+      if (!state.inString && !state.inComment && stream.match('/*')) {
         state.inComment = true;
       }
 
@@ -59,7 +59,7 @@ CodeMirror.defineMode("pegjs", function (config) {
         return state.lhs ? "property string" : "string"; // Token style
       } else if (state.inComment) {
         while (state.inComment && !stream.eol()) {
-          if (stream.match(/\*\//)) {
+          if (stream.match('*/')) {
             state.inComment = false; // Clear flag
           } else {
             stream.match(/^.[^\*]*/);
@@ -76,7 +76,7 @@ CodeMirror.defineMode("pegjs", function (config) {
         stream.next();
         state.inCharacterClass = true;
         return 'bracket';
-      } else if (stream.match(/^\/\//)) {
+      } else if (stream.match('//')) {
         stream.skipToEnd();
         return "comment";
       } else if (state.braced || stream.peek() === '{') {
diff --git a/mode/pug/pug.js b/mode/pug/pug.js
index a4c0e16b83..73e9ae2fc8 100644
--- a/mode/pug/pug.js
+++ b/mode/pug/pug.js
@@ -261,7 +261,7 @@ CodeMirror.defineMode("pug", function (config) {
       }
       return 'variable';
     }
-    if (stream.match(/^\+#{/, false)) {
+    if (stream.match('+#{', false)) {
       stream.next();
       state.mixinCallAfter = true;
       return interpolation(stream, state);
diff --git a/mode/rpm/rpm.js b/mode/rpm/rpm.js
index 88a7e889ed..bb9ec9ffad 100644
--- a/mode/rpm/rpm.js
+++ b/mode/rpm/rpm.js
@@ -80,12 +80,12 @@ CodeMirror.defineMode("rpm-spec", function() {
 
       // Macros like '%make_install' or '%attr(0775,root,root)'
       if (stream.match(/^%[\w]+/)) {
-        if (stream.match(/^\(/)) { state.macroParameters = true; }
+        if (stream.match('(')) { state.macroParameters = true; }
         return "keyword";
       }
       if (state.macroParameters) {
         if (stream.match(/^\d+/)) { return "number";}
-        if (stream.match(/^\)/)) {
+        if (stream.match(')')) {
           state.macroParameters = false;
           return "keyword";
         }
diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index c37ab0b28f..1258e142c3 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -231,7 +231,7 @@ CodeMirror.defineMode("sass", function(config) {
       }
 
       if(ch === "@"){
-        if(stream.match(/@extend/)){
+        if(stream.match('@extend')){
           if(!stream.match(/\s*[\w]/))
             dedent(state);
         }
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index e3427ebe3c..1f8a13c47d 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -411,7 +411,7 @@
             return null;
 
           case "list-literal":
-            if (stream.match(/\]/)) {
+            if (stream.match(']')) {
               state.soyState.pop();
               state.lookupVariables = true;
               popcontext(state);
@@ -517,14 +517,14 @@
             }
             return expression(stream, state);
           case "literal":
-            if (stream.match(/^(?=\{\/literal})/)) {
+            if (stream.match('{/literal}', false)) {
               state.soyState.pop();
               return this.token(stream, state);
             }
             return tokenUntil(stream, state, /\{\/literal}/);
         }
 
-        if (stream.match(/^\{literal}/)) {
+        if (stream.match('{literal}')) {
           state.indent += config.indentUnit;
           state.soyState.push("literal");
           state.context = new Context(state.context, "literal", state.variables);
@@ -581,12 +581,12 @@
           state.soyState.push("import");
           state.indent += 2 * config.indentUnit;
           return "keyword";
-        } else if (match = stream.match(/^<\{/)) {
+        } else if (match = stream.match('<{')) {
           state.soyState.push("template-call-expression");
           state.indent += 2 * config.indentUnit;
           state.soyState.push("tag");
           return "keyword";
-        } else if (match = stream.match(/^<\/>/)) {
+        } else if (match = stream.match('</>')) {
           state.indent -= 1 * config.indentUnit;
           return "keyword";
         }
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index dcde1a771c..ead4d6db23 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -243,9 +243,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     // varName can be quoted with ` or ' or "
     // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
     if (stream.eat("@")) {
-      stream.match(/^session\./);
-      stream.match(/^local\./);
-      stream.match(/^global\./);
+      stream.match('session.');
+      stream.match('local.');
+      stream.match('global.');
     }
 
     if (stream.eat("'")) {
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index eecc554bc0..5cddff0320 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -138,7 +138,7 @@
         // Variable
         if (stream.match(/^(\.|\[)[\w-\'\"\]]+/i, false)) {
           if (!wordIsTag(stream.current())) {
-            stream.match(/\./);
+            stream.match('.');
             return ["variable-2", "variable-name"];
           }
         }
diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index a4fb89f658..6a9ce447ba 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -114,7 +114,7 @@ CodeMirror.defineMode("tiddlywiki", function () {
         return 'header';
     }
 
-    if (ch == '{' && stream.match(/\{\{/))
+    if (ch == '{' && stream.match('{{'))
       return chain(stream, state, twTokenCode);
 
     // rudimentary html:// file:// link matching. TW knows much more ...
diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
index 87fdf80d07..f9050ad6a8 100644
--- a/mode/yaml-frontmatter/yaml-frontmatter.js
+++ b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -36,7 +36,7 @@
       },
       token: function (stream, state) {
         if (state.state == START) {
-          if (stream.match(/---/, false)) {
+          if (stream.match('---', false)) {
             state.state = FRONTMATTER
             return yamlMode.token(stream, state.inner)
           } else {
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index 928050eb3c..d464941026 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -38,9 +38,9 @@ CodeMirror.defineMode("yaml", function() {
         state.pair = false;
         state.pairStart = false;
         /* document start */
-        if(stream.match(/---/)) { return "def"; }
+        if(stream.match('---')) { return "def"; }
         /* document end */
-        if (stream.match(/\.\.\./)) { return "def"; }
+        if (stream.match('...')) { return "def"; }
         /* array list item */
         if (stream.match(/\s*-\s+/)) { return 'meta'; }
       }

From 126a266a74b0afe6600fac23230432b68441d2bd Mon Sep 17 00:00:00 2001
From: Thiemo Kreuz <thiemowmde@users.noreply.github.com>
Date: Fri, 15 Jan 2021 15:21:10 +0100
Subject: [PATCH 4409/4742] [various modes] Add missing ^ anchors to
 StringStream.match() as optimization

The method fails anyway (i.e. it acts as if there was no match)
when the match is not at the start of the string. Adding the
anchor does not change any behavior, but increases performance.
---
 keymap/vim.js         | 2 +-
 mode/clike/clike.js   | 8 ++++----
 mode/css/css.js       | 8 ++++----
 mode/cypher/cypher.js | 4 ++--
 mode/mscgen/mscgen.js | 4 ++--
 mode/php/php.js       | 4 ++--
 mode/puppet/puppet.js | 2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index dba9d7c1e0..92715e6030 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -3483,7 +3483,7 @@
         },
         isComplete: function(state) {
           if (state.nextCh === '#') {
-            var token = state.lineText.match(/#(\w+)/)[1];
+            var token = state.lineText.match(/^#(\w+)/)[1];
             if (token === 'endif') {
               if (state.forward && state.depth === 0) {
                 return true;
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 5d01e1cd4c..05b8f77f1d 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -350,8 +350,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
   function cpp11StringHook(stream, state) {
     stream.backUp(1);
     // Raw strings.
-    if (stream.match(/(R|u8R|uR|UR|LR)/)) {
-      var match = stream.match(/"([^\s\\()]{0,16})\(/);
+    if (stream.match(/^(?:R|u8R|uR|UR|LR)/)) {
+      var match = stream.match(/^"([^\s\\()]{0,16})\(/);
       if (!match) {
         return false;
       }
@@ -360,8 +360,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       return tokenRawString(stream, state);
     }
     // Unicode strings/chars.
-    if (stream.match(/(u8|u|U|L)/)) {
-      if (stream.match(/["']/, /* eat */ false)) {
+    if (stream.match(/^(?:u8|u|U|L)/)) {
+      if (stream.match(/^["']/, /* eat */ false)) {
         return "string";
       }
       return false;
diff --git a/mode/css/css.js b/mode/css/css.js
index 240c270a90..88a869bfea 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -78,8 +78,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       return ret("qualifier", "qualifier");
     } else if (/[:;{}\[\]\(\)]/.test(ch)) {
       return ret(null, ch);
-    } else if (stream.match(/[\w-.]+(?=\()/)) {
-      if (/^(url(-prefix)?|domain|regexp)$/.test(stream.current().toLowerCase())) {
+    } else if (stream.match(/^[\w-.]+(?=\()/)) {
+      if (/^(url(-prefix)?|domain|regexp)$/i.test(stream.current())) {
         state.tokenize = tokenParenthesized;
       }
       return ret("variable callee", "variable");
@@ -108,7 +108,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   function tokenParenthesized(stream, state) {
     stream.next(); // Must be '('
-    if (!stream.match(/\s*[\"\')]/, false))
+    if (!stream.match(/^\s*[\"\')]/, false))
       state.tokenize = tokenString(")");
     else
       state.tokenize = null;
@@ -781,7 +781,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
       },
       ":": function(stream) {
-        if (stream.match(/\s*\{/, false))
+        if (stream.match(/^\s*\{/, false))
           return [null, null]
         return false;
       },
diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index aa76eb9e34..6d88fa0eda 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -21,11 +21,11 @@
     var tokenBase = function(stream/*, state*/) {
       var ch = stream.next();
       if (ch ==='"') {
-        stream.match(/.*?"/);
+        stream.match(/^[^"]*"/);
         return "string";
       }
       if (ch === "'") {
-        stream.match(/.*?'/);
+        stream.match(/^[^']*'/);
         return "string";
       }
       if (/[{}\(\),\.;\[\]]/.test(ch)) {
diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
index a5677fb116..8d39341cf9 100644
--- a/mode/mscgen/mscgen.js
+++ b/mode/mscgen/mscgen.js
@@ -72,11 +72,11 @@
   CodeMirror.defineMIME("text/x-msgenny", {name: "mscgen", language: "msgenny"});
 
   function wordRegexpBoundary(pWords) {
-    return new RegExp("\\b(" + pWords.join("|") + ")\\b", "i");
+    return new RegExp("^\\b(?:" + pWords.join("|") + ")\\b", "i");
   }
 
   function wordRegexp(pWords) {
-    return new RegExp("(" + pWords.join("|") + ")", "i");
+    return new RegExp("^(?:" + pWords.join("|") + ")", "i");
   }
 
   function startStateFn() {
diff --git a/mode/php/php.js b/mode/php/php.js
index 5f3a143999..3202f50724 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -53,7 +53,7 @@
           [["]", null]]
         ], closing, escapes);
       }
-      if (stream.match(/\-\>\w/, false)) {
+      if (stream.match(/^->\w/, false)) {
         // Match object operator
         state.tokenize = matchSequence([
           [["->", null]],
@@ -106,7 +106,7 @@
       },
       "<": function(stream, state) {
         var before;
-        if (before = stream.match(/<<\s*/)) {
+        if (before = stream.match(/^<<\s*/)) {
           var quoted = stream.eat(/['"]/);
           stream.eatWhile(/[\w\.]/);
           var delim = stream.current().slice(before[0].length + (quoted ? 2 : 1));
diff --git a/mode/puppet/puppet.js b/mode/puppet/puppet.js
index 364934209e..a92ca1107b 100644
--- a/mode/puppet/puppet.js
+++ b/mode/puppet/puppet.js
@@ -176,7 +176,7 @@ CodeMirror.defineMode("puppet", function () {
     // Match characters that we are going to assume
     // are trying to be regex
     if (ch == '/') {
-      stream.match(/.*?\//);
+      stream.match(/^[^\/]*\//);
       return 'variable-3';
     }
     // Match all the numbers

From 5c4f7a6289ec10a064cfa7e329b4789a03e23a7b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 18 Jan 2021 11:41:01 +0100
Subject: [PATCH 4410/4742] [javascript mode] Fix another hang in TS object
 type parsing

Closes #6571
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 966ffef063..047395622e 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -624,7 +624,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "=>") return cont(typeexpr)
   }
   function typeprops(type) {
-    if (type == "}") return cont()
+    if (type.match(/[\}\)\]]/)) return cont()
     if (type == "," || type == ";") return cont(typeprops)
     return pass(typeprop, typeprops)
   }

From b29c728413e19ea1eab2b60918e114ab619efe0c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jan 2021 18:15:59 +0100
Subject: [PATCH 4411/4742] [matchbrackets addon] Treat  and null tokes as
 interchangeable

Closes #6572
---
 addon/edit/matchbrackets.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 6d1fa29fe9..43dc8840f5 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -38,7 +38,7 @@
     if (config && config.strict && (dir > 0) != (pos == where.ch)) return null;
     var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
 
-    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
+    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style, config);
     if (found == null) return null;
     return {from: Pos(where.line, pos), to: found && found.pos,
             match: found && found.ch == match.charAt(0), forward: dir > 0};
@@ -67,7 +67,8 @@
       if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0);
       for (; pos != end; pos += dir) {
         var ch = line.charAt(pos);
-        if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) {
+        if (re.test(ch) && (style === undefined ||
+                            (cm.getTokenTypeAt(Pos(lineNo, pos + 1)) || "") == (style || ""))) {
           var match = matching[ch];
           if (match && (match.charAt(1) == ">") == (dir > 0)) stack.push(ch);
           else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch};

From 8852916a2a74778278962d40594ea8369311dafe Mon Sep 17 00:00:00 2001
From: Alf Eaton <hubgit@users.noreply.github.com>
Date: Tue, 19 Jan 2021 21:16:04 +0000
Subject: [PATCH 4412/4742] [real-world uses] Rename writeLaTeX to Overleaf

Rename writeLaTeX to Overleaf in the list of real-world uses.

https://www.overleaf.com/blog/190-writelatex-is-continued-overleaf
---
 doc/realworld.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/realworld.html b/doc/realworld.html
index e5f8aef6f9..5120167bf0 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -143,6 +143,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.greycampus.com/opencampus">OpenCampus</a></li>
       <li><a href="http://clrhome.org/asm/">ORG</a> (z80 assembly IDE)</li>
       <li><a href="https://github.com/mamacdon/orion-codemirror">Orion-CodeMirror integration</a> (running CodeMirror modes in Orion)</li>
+      <li><a href="https://www.overleaf.com/">Overleaf</a> (Collaborative LaTeX Editor)</li>
       <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
       <li><a href="http://pharaoh.js.org/">Pharaoh</a> (browser &amp; desktop editor for the classroom)</li>
       <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
@@ -196,7 +197,6 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
       <li><a href="https://github.com/b3log/wide">Wide</a> (golang web IDE)</li>
       <li><a href="http://wordpress.org/extend/plugins/codemirror-for-codeeditor/">WordPress plugin</a></li>
-      <li><a href="https://www.writelatex.com">writeLaTeX</a> (Collaborative LaTeX Editor)</li>
       <li><a href="http://www.xosystem.org/home/applications_websites/xosystem_website/xoside_EN.php">XOSide</a> (online editor)</li>
       <li><a href="http://videlibri.sourceforge.net/cgi-bin/xidelcgi">XQuery tester</a></li>
       <li><a href="http://q42jaap.github.io/xsd2codemirror/">xsd2codemirror</a> (convert XSD to CM XML completion info)</li>

From 48487ee80b9209ffb816ed25a4a305ee491e4967 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Jan 2021 12:51:40 +0100
Subject: [PATCH 4413/4742] Mark version 5.59.2

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 4ea87576d3..bba9e1fade 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,6 +36,7 @@ Alexandre Bique
 Alex Churchill
 alexey-k
 Alex Piggott
+Alf Eaton
 Aliaksei Chapyzhenka
 Allen Sarkisyan
 Ami Fischman
@@ -510,6 +511,7 @@ Lucas Buchala
 Luciano Longo
 Luciano Santana
 Lu Fangjian
+Łukasz Wielgus
 Luke Browning
 Luke Granger-Brown
 Luke Stagner
@@ -832,6 +834,7 @@ Thaddee Tyl
 thanasis
 TheHowl
 themrmax
+Thiemo Kreuz
 think
 Thomas Brouard
 Thomas Dvornik
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a3ee68cef..68f7d4016b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.59.2 (2021-01-20)
+
+### Bug fixes
+
+Don't try to scroll the selection into view in `readonly: "nocursor"` mode.
+
+[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Fix a regression in the behavior of pressing enter between brackets.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Fix an infinite loop on specific syntax errors in object types.
+
+various modes: Fix inefficient RegExp matching.
+
 ## 5.59.1 (2020-12-31)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index f6bd82be1f..62cc95cb7c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.59.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.59.2</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 feeb8088d5..9658a7ba24 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-01-2021: <a href="https://codemirror.net/codemirror-5.59.2.zip">Version 5.59.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Don’t try to scroll the selection into view in <code>readonly: "nocursor"</code> mode.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Fix a regression in the behavior of pressing enter between brackets.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Fix an infinite loop on specific syntax errors in object types.</li>
+    <li>various modes: Fix inefficient RegExp matching.</li>
+  </ul>
+
   <p class="rel">31-12-2020: <a href="https://codemirror.net/codemirror-5.59.1.zip">Version 5.59.1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 733dcdab9c..03e44fe5e1 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.1</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 7ab19be203..915e51305a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.59.1",
+  "version": "5.59.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index cb8c8cac5b..d1898a6d56 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.59.1"
+CodeMirror.version = "5.59.2"

From 2f401f876379fdbfbf97422816e3f21cf347cbc3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 22 Jan 2021 09:15:11 +0100
Subject: [PATCH 4414/4742] [markdown mode] Remove another exponential regular
 expression

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

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index e730fc1ae2..038a776bdc 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -735,7 +735,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (stream.peek() === undefined) { // End of line, set flag to check next line
       state.linkTitle = true;
     } else { // More content on line, check if link title
-      stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
+      stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\.)+\)))?/, true);
     }
     state.f = state.inline = inlineNormal;
     return tokenTypes.linkHref + " url";

From d3bda967fa500bb3a3d28adf0ef7ddccdcb345b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 1 Feb 2021 16:41:59 +0100
Subject: [PATCH 4415/4742] Don't override the way zero-width non-joiners are
 rendered

Issue #6303
---
 src/edit/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/edit/options.js b/src/edit/options.js
index 400e000327..8cb9cee065 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -68,7 +68,7 @@ export function defineOptions(CodeMirror) {
     for (let i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   })
-  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200c\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, (cm, val, old) => {
+  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, (cm, val, old) => {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
     if (old != Init) cm.refresh()
   })

From 916e08cb2e2a802a5c5143f1f9338f98fb48cd90 Mon Sep 17 00:00:00 2001
From: benhormann <benhormann@users.noreply.github.com>
Date: Fri, 5 Feb 2021 15:23:37 +0000
Subject: [PATCH 4416/4742] [vim] Avoid using innerHTML in dialogs/prompts
 (#6581)

To work around a limitiation present when running in Firefox Developer Tools.
---
 keymap/vim.js    | 90 ++++++++++++++++++++++++++++++------------------
 test/vim_test.js | 13 +++++--
 2 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 92715e6030..c1bc3e80d8 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1450,7 +1450,7 @@
               showPrompt(cm, {
                   onClose: onPromptClose,
                   prefix: promptPrefix,
-                  desc: searchPromptDesc,
+                  desc: '(JavaScript regexp)',
                   onKeyUp: onPromptKeyUp,
                   onKeyDown: onPromptKeyDown
               });
@@ -4110,16 +4110,6 @@
       var vim = cm.state.vim;
       return vim.searchState_ || (vim.searchState_ = new SearchState());
     }
-    function dialog(cm, template, shortText, onClose, options) {
-      if (cm.openDialog) {
-        cm.openDialog(template, onClose, { bottom: true, value: options.value,
-            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
-            selectValueOnOpen: false});
-      }
-      else {
-        onClose(prompt(shortText, ''));
-      }
-    }
     function splitBySlash(argString) {
       return splitBySeparator(argString, '/');
     }
@@ -4306,28 +4296,64 @@
           (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
       return regexp;
     }
-    function showConfirm(cm, text) {
+
+    /**
+     * dom - Document Object Manipulator
+     * Usage:
+     *   dom('<tag>'|<node>[, ...{<attributes>|<$styles>}|<child-node>|'<text>'])
+     * Examples:
+     *   dom('div', {id:'xyz'}, dom('p', 'CM rocks!', {$color:'red'}))
+     *   dom(document.head, dom('script', 'alert("hello!")'))
+     * Not supported:
+     *   dom('p', ['arrays are objects'], Error('objects specify attributes'))
+     */
+    function dom(n) {
+      if (typeof n === 'string') n = document.createElement(n);
+      for (var a, i = 1; i < arguments.length; i++) {
+        if (!(a = arguments[i])) continue;
+        if (typeof a !== 'object') a = document.createTextNode(a);
+        if (a.nodeType) n.appendChild(a);
+        else for (var key in a) {
+          if (!Object.prototype.hasOwnProperty.call(a, key)) continue;
+          if (key[0] === '$') n.style[key.slice(1)] = a[key];
+          else n.setAttribute(key, a[key]);
+        }
+      }
+      return n;
+    }
+
+    function showConfirm(cm, template) {
+      var pre = dom('pre', {$color: 'red'}, template);
       if (cm.openNotification) {
-        cm.openNotification('<span style="color: red">' + text + '</span>',
-                            {bottom: true, duration: 5000});
+        cm.openNotification(pre, {bottom: true, duration: 5000});
       } else {
-        alert(text);
+        alert(pre.innerText);
       }
     }
+
     function makePrompt(prefix, desc) {
-      var raw = '<span style="font-family: monospace; white-space: pre">' +
-          (prefix || "") + '<input type="text" autocorrect="off" ' +
-          'autocapitalize="off" spellcheck="false"></span>';
-      if (desc)
-        raw += ' <span style="color: #888">' + desc + '</span>';
-      return raw;
+      return dom(document.createDocumentFragment(),
+               dom('span', {$fontFamily: 'monospace', $whiteSpace: 'pre'},
+                 prefix,
+                 dom('input', {type: 'text', autocorrect: 'off',
+                               autocapitalize: 'off', spellcheck: 'false'})),
+               desc && dom('span', {$color: '#888'}, desc));
     }
-    var searchPromptDesc = '(JavaScript regexp)';
+
     function showPrompt(cm, options) {
       var shortText = (options.prefix || '') + ' ' + (options.desc || '');
-      var prompt = makePrompt(options.prefix, options.desc);
-      dialog(cm, prompt, shortText, options.onClose, options);
+      var template = makePrompt(options.prefix, options.desc);
+      if (cm.openDialog) {
+        cm.openDialog(template, options.onClose, {
+          onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
+          bottom: true, selectValueOnOpen: false, value: options.value
+        });
+      }
+      else {
+        options.onClose(prompt(shortText, ''));
+      }
     }
+
     function regexEqual(r1, r2) {
       if (r1 instanceof RegExp && r2 instanceof RegExp) {
           var props = ['global', 'multiline', 'ignoreCase', 'source'];
@@ -4564,7 +4590,7 @@
         try {
           this.parseInput_(cm, inputStream, params);
         } catch(e) {
-          showConfirm(cm, e);
+          showConfirm(cm, e.toString());
           throw e;
         }
         var command;
@@ -4608,7 +4634,7 @@
             params.callback();
           }
         } catch(e) {
-          showConfirm(cm, e);
+          showConfirm(cm, e.toString());
           throw e;
         }
       },
@@ -4880,12 +4906,12 @@
       registers: function(cm, params) {
         var regArgs = params.args;
         var registers = vimGlobalState.registerController.registers;
-        var regInfo = '----------Registers----------<br><br>';
+        var regInfo = '----------Registers----------\n\n';
         if (!regArgs) {
           for (var registerName in registers) {
             var text = registers[registerName].toString();
             if (text.length) {
-              regInfo += '"' + registerName + '    ' + text + '<br>';
+              regInfo += '"' + registerName + '    ' + text + '\n'
             }
           }
         } else {
@@ -4897,7 +4923,7 @@
               continue;
             }
             var register = registers[registerName] || new Register();
-            regInfo += '"' + registerName + '    ' + register.toString() + '<br>';
+            regInfo += '"' + registerName + '    ' + register.toString() + '\n'
           }
         }
         showConfirm(cm, regInfo);
@@ -5030,7 +5056,7 @@
           var matched = query.test(cm.getLine(i));
           if (matched) {
             matchedLines.push(i+1);
-            content+= cm.getLine(i) + '<br>';
+            content+= cm.getLine(i) + '\n';
           }
         }
         // if there is no [cmd], just display the list of matched lines
@@ -5535,9 +5561,7 @@
       clearFakeCursor(vim);
       // In visual mode, the cursor may be positioned over EOL.
       if (from.ch == cm.getLine(from.line).length) {
-        var widget = document.createElement("span");
-        widget.textContent = "\u00a0";
-        widget.className = className;
+        var widget = dom('span', { 'class': className }, '\u00a0');
         vim.fakeCursorBookmark = cm.setBookmark(from, {widget: widget});
       } else {
         vim.fakeCursor = cm.markText(from, to, {className: className});
diff --git a/test/vim_test.js b/test/vim_test.js
index ec8dd21d91..aa3530f96c 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -197,13 +197,13 @@ function testVim(name, run, opts, expectedFail) {
       }
     }
     function fakeOpenDialog(result) {
-      return function(text, callback) {
+      return function(template, callback) {
         return callback(result);
       }
     }
     function fakeOpenNotification(matcher) {
-      return function(text) {
-        matcher(text);
+      return function(template) {
+        matcher(template.innerHTML);
       }
     }
     var helpers = {
@@ -3168,6 +3168,13 @@ testVim(':_register', function(cm,vim,helpers) {
   });
   helpers.doKeys(':');
 }, {value: ''});
+testVim('registers_html_encoding', function(cm,vim,helpers) {
+  helpers.doKeys('y', 'y');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/"\s+&lt;script&gt;throw "&amp;amp;"&lt;\/script&gt;/.test(text));
+  });
+  helpers.doEx('registers');
+}, {value: '<script>throw "&amp;"</script>'});
 testVim('search_register_escape', function(cm, vim, helpers) {
   // Check that the register is restored if the user escapes rather than confirms.
   cm.openDialog = helpers.fakeOpenDialog('waldo');

From e80f196b01b1ef2e87cc0bed0b5ded0fb5742b9a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 9 Feb 2021 10:34:58 +0100
Subject: [PATCH 4417/4742] Add two new sponsor logos

---
 index.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 03e44fe5e1..46a2bcffe1 100644
--- a/index.html
+++ b/index.html
@@ -195,19 +195,22 @@ <h2>Browser support</h2>
 
 <section id=sponsors>
   <style>
-    ul.sponsor-list { padding-left: 10px }
-    ul.sponsor-list li { list-style: none; margin-bottom: 1em }
-    ul.sponsor-list img { max-width: 80%; max-height: 10em; width: 20em }
+    ul.sponsor-list { padding-left: 10px; font-size: 200%; }
+    ul.sponsor-list a { color: black; text-decoration: none }
+    ul.sponsor-list li { list-style: none; margin-bottom: 16px }
+    ul.sponsor-list img { max-width: 80%; max-height: 160px; width: 320px }
+    ul.sponsor-list img.captioned { vertical-align: middle; width: 80px; max-width: 40%; height: auto; margin-right: 16px }
   </style>
 
   <h2>Sponsors</h2>
   <p>These companies support development of this project:</p>
   <ul class=sponsor-list>
-    <li><a href="https://codepen.io/"><img src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>' alt="CodePen"></a></li>
+    <li><a href=""><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 28" height="120" fill="currentColor" color="black"><path d="M12.5 22.667c-1.154 0-2.154-.252-3-.754a5.091 5.091 0 01-1.945-2.048 10.801 10.801 0 01-.991-2.741A14.747 14.747 0 016.25 14c0-.83.054-1.624.164-2.382.108-.758.309-1.529.602-2.31a7.37 7.37 0 011.129-2.035 5.118 5.118 0 011.807-1.401c.746-.36 1.594-.539 2.548-.539 1.154 0 2.154.252 3 .754.843.501 1.517 1.21 1.945 2.048.452.861.782 1.775.991 2.741.209.965.314 2.007.314 3.124a16.7 16.7 0 01-.163 2.382 10.63 10.63 0 01-.615 2.31c-.302.782-.677 1.46-1.13 2.035-.451.575-1.05 1.042-1.794 1.401-.745.36-1.594.539-2.548.539zm2.206-6.373c.598-.6.93-1.43.919-2.294 0-.893-.299-1.658-.896-2.294-.598-.637-1.34-.956-2.229-.956s-1.631.319-2.23.956A3.236 3.236 0 009.376 14c0 .893.299 1.658.896 2.294.598.637 1.34.956 2.229.956s1.624-.319 2.206-.956zM12.5 27C19.403 27 25 21.18 25 14S19.403 1 12.5 1 0 6.82 0 14s5.597 13 12.5 13z"/></svg>'>Observable</a></li>
+    <li><a href="https://holmusk.com"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" style="background: %231649BF"><g transform="translate(-780, -40)" fill="%23FFFFFF"><path d="M780,4 L840,4 L840,1 L780,1 L780,4 Z M794,55 L794,84.65 L796.806,84.65 L796.806,72.739 C796.806,69.633 799.325,67.104 802.420,67.104 C805.516,67.104 808.031,69.633 808.031,72.739 L808.031,84.65 L810.838,84.65 L810.838,72.739 C810.838,68.077 807.062,64.288 802.420,64.288 C800.271,64.288 798.311,65.106 796.819,66.447 L796.819,55 L794,55 Z M817.582,63.931 C815.372,63.931 813.367,64.798 811.862,66.199 L812.163,66.653 C812.613,67.33 812.972,68.051 813.248,68.805 C814.281,67.549 815.840,66.746 817.582,66.746 C820.674,66.746 823.193,69.276 823.193,72.382 L823.193,72.385 L823.193,84.293 L826,84.293 L826,72.385 L826,72.379 C826,70.658 825.483,69.057 824.598,67.72 L824.598,67.723 C824.537,67.629 824.473,67.543 824.409,67.452 C824.345,67.365 824.280,67.278 824.213,67.191 C824.139,67.098 824.068,67.008 823.995,66.917 C823.870,66.776 823.744,66.634 823.616,66.502 C823.542,66.424 823.465,66.35 823.385,66.276 C823.289,66.183 823.190,66.093 823.090,66.002 C823.004,65.932 822.917,65.854 822.830,65.787 C822.689,65.671 822.542,65.561 822.394,65.458 C822.320,65.406 822.243,65.354 822.169,65.307 C821.999,65.194 821.829,65.087 821.650,64.991 C821.592,64.955 821.531,64.923 821.473,64.894 C821.307,64.807 821.142,64.726 820.976,64.653 C820.909,64.623 820.845,64.594 820.774,64.566 C820.569,64.478 820.357,64.401 820.138,64.33 C820.084,64.314 820.026,64.298 819.969,64.282 C819.773,64.224 819.577,64.172 819.382,64.131 C819.330,64.118 819.285,64.104 819.234,64.095 C819,64.05 818.766,64.015 818.525,63.985 C818.461,63.979 818.400,63.976 818.339,63.969 C818.095,63.947 817.855,63.931 817.611,63.931 L817.582,63.931 Z"></path></g></svg>'>Holmusk</a></li>
+    <li><a href="https://codepen.io/"><img style="margin: 16px 0" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>' alt="CodePen"></a></li>
     <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>
     <li><a href="https://www.desmos.com/"><img src='data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="%23187a3d"%3E%3Cpath d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/%3E%3Cpath d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/%3E%3C/svg%3E%0A' alt=desmos></a></li>
     <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='data:image/svg+xml,%3Csvg%20width%3D%22397%22%20height%3D%22109%22%20viewBox%3D%220%200%20397%20109%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20fill-rule%3D%22nonzero%22%20fill%3D%22none%22%3E%3Cpath%20d%3D%22M169.495%2063.68c2.8%200%205.254.671%207.36%202.015%202.105%201.344%203.688%203.162%204.751%205.453%201.063%202.292%201.594%204.878%201.594%207.76%200%204.408-1.241%208.054-3.724%2010.935-2.483%202.881-5.81%204.322-9.98%204.322-3.953%200-7.18-1.402-9.683-4.206v12.62c0%20.271-.085.489-.254.653a.88.88%200%200%201-.64.247h-4.767a.966.966%200%200%201-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932%200%200%201%20.656-.247h4.767a.88.88%200%200%201%20.64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268%205.006-4.902%209.057-4.902zm-.84%2024.874c2.752%200%204.865-.86%206.34-2.578%201.473-1.719%202.21-4.034%202.21-6.947%200-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576%200-4.625.855-6.148%202.563-1.524%201.71-2.285%203.986-2.285%206.831s.761%205.141%202.285%206.89c1.523%201.747%203.572%202.62%206.148%202.62zm39.147-24.875c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm31.331%2030.845c-4.25%200-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05%204.298-10.999c2.866-2.948%206.423-4.423%2010.673-4.423%202.788%200%205.332.674%207.632%202.021%202.3%201.348%204.103%203.203%205.41%205.566%201.306%202.363%201.959%204.975%201.959%207.835%200%202.861-.653%205.468-1.96%207.821-1.306%202.353-3.109%204.209-5.41%205.566-2.3%201.357-4.843%202.036-7.63%202.036zm-6.43-8.608c1.7%201.759%203.847%202.638%206.445%202.638%202.597%200%204.745-.88%206.444-2.638%201.698-1.759%202.547-4.03%202.547-6.814%200-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598%200-4.746.88-6.444%202.638-1.699%201.758-2.548%204.03-2.548%206.815%200%202.784.85%205.055%202.548%206.814zm55.522-21.623c.272%200%20.487.082.642.248.156.165.234.384.234.657v27.976c0%201.772-.302%203.373-.906%204.804-.603%201.431-1.402%202.6-2.395%203.504-.993.906-2.157%201.67-3.49%202.293a16.713%2016.713%200%200%201-4.076%201.314c-1.383.253-2.814.38-4.294.38-2.337%200-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652%201.198-.38%202.707%201.46%205.735%202.19%209.085%202.19%201.169%200%202.293-.116%203.374-.35%201.074-.23%202.107-.62%203.068-1.153a6.016%206.016%200%200%200%202.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513%203.154-5.726%204.731-9.64%204.731-2.688%200-5.132-.676-7.333-2.03a13.905%2013.905%200%200%201-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534%200-2.726.604-5.237%201.811-7.534%201.208-2.298%202.907-4.123%205.098-5.476%202.19-1.353%204.64-2.03%207.347-2.03%203.856%200%207.03%201.548%209.523%204.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596%2023.266c2.408%200%204.424-.894%206.045-2.68%201.622-1.788%202.433-3.898%202.433-6.332%200-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428%200-4.452.86-6.074%202.581-1.622%201.72-2.433%203.826-2.433%206.317%200%202.529.811%204.663%202.433%206.402%201.621%201.74%203.646%202.61%206.074%202.61zm40.073-23.88c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm46.24%2024.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0%20.626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493%201.682-3.399%203.008-5.717%203.976-2.318.968-4.577%201.453-6.778%201.453-3.241%200-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149%200-2.621.835-4.656%202.504-6.104%201.67-1.448%204.214-2.416%207.633-2.906l6.984-1.085c1.355-.196%202.347-.401%202.976-.617.629-.215%201.041-.479%201.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302%200-6.65%201.36-7.043%204.079-.059.45-.353.665-.884.646h-4.48c-.647%200-.942-.304-.883-.91.334-3.326%201.66-5.713%203.978-7.161%202.318-1.448%205.452-2.172%209.4-2.172%204.224%200%207.392.959%209.504%202.876%202.112%201.918%203.168%204.706%203.168%208.364v11.035c-.02%201.35.707%202.172%202.18%202.466zm-19.06.135c4.132%200%207.518-1.307%2010.16-3.922v-6.028c-.258.566-1.53%201.024-3.814%201.375l-6.375.995c-1.728.274-2.96.742-3.695%201.405-.735.663-1.102%201.512-1.102%202.546%200%201.132.397%202.02%201.192%202.663.794.644%202.006.966%203.635.966zm48.252-24.875c2.377%200%204.116.796%205.216%202.386%201.1%201.59%201.65%204.248%201.65%207.971v18.59c0%20.272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948%200%200%201-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042%200-1.886.403-2.535%201.207a5.452%205.452%200%200%200-1.178%202.75v19.463c0%20.271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275%200-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04%200-1.88.398-2.52%201.193a5.675%205.675%200%200%200-1.193%202.764v19.463c0%20.271-.083.49-.25.654a.864.864%200%200%201-.634.248h-4.273c-.275%200-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57%200%20.874.3.914.902l.147%202.386h.442c.943-2.619%202.898-3.928%205.864-3.928%202.849%200%204.745%201.31%205.688%203.928h.353c1.061-2.619%202.986-3.928%205.776-3.928zM162.091%2016.126c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.694-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123%2022.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47%200-.824-.162-1.06-.488l-8.592-10.002-8.592%2010.002c-.255.326-.618.488-1.089.488h-5.532c-.373%200-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47%200%20.833.172%201.088.517l7.798%209.082%207.798-9.082c.255-.325.618-.498%201.089-.517h5.473c.373%200%20.618.105.736.316.117.21.059.46-.177.747l-11.152%2012.933%2011.976%2013.795zm14.101-26.59c1.86-.801%203.86-1.201%206-1.201%202.142%200%204.113.395%205.915%201.186%201.801.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.122%202.04-.364%202.549-.242.507-.76.761-1.554.761H230.41c.329%202.285%201.385%204.106%203.167%205.463%201.782%201.357%204.01%202.036%206.684%202.036%202.693%200%205.134-.84%207.323-2.52.465-.35.882-.341%201.25.03l1.947%201.992c.465.469.465.918%200%201.347-2.984%203.008-6.713%204.511-11.189%204.511-4.572%200-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.118-6.048.746-1.885%201.764-3.516%203.052-4.892%201.288-1.377%202.852-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.203.718-5.767%202.154-1.566%201.437-2.503%203.372-2.812%205.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83%2019.894c3.133%200%205.619-1.191%207.457-3.574.348-.45.745-.527%201.19-.234l3.394%201.962c.542.332.639.733.29%201.201-1.315%202.012-3.06%203.618-5.237%204.819-2.176%201.2-4.58%201.801-7.21%201.801-4.392%200-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05%204.367-11c2.912-2.948%206.563-4.422%2010.954-4.422%202.631%200%205.04.595%207.225%201.787%202.186%201.19%203.927%202.792%205.224%204.803.328.47.232.87-.29%201.202l-3.396%201.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67%200-4.88.884-6.63%202.651-1.75%201.768-2.626%204.033-2.626%206.796s.875%205.028%202.626%206.796c1.75%201.767%203.96%202.65%206.63%202.65zm46.585-24.87c.276%200%20.499.083.666.248.168.165.252.383.252.654v27.379c0%20.271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573%200-.88-.3-.919-.901l-.237-3.953h-.652c-1.007%201.608-2.35%202.93-4.03%203.968-1.68%201.036-3.674%201.554-5.986%201.554-3.26%200-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276%200%20.499.082.666.247.168.165.252.383.252.654v15.956c0%202.403.583%204.18%201.749%205.334%201.165%201.153%202.785%201.73%204.86%201.73%201.343%200%202.573-.258%203.689-.771s1.99-1.129%202.623-1.846c.632-.717%201.116-1.4%201.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595%2024.474c.353.446.382.852.088%201.22-.882%201.047-2.172%202.001-3.868%202.863-1.697.862-3.731%201.293-6.104%201.293-8.002%200-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885%200%200%201-.647-.261.864.864%200%200%201-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255%200%20.466.078.633.233.166.154.25.368.25.639l-.02%209.285h11.943c.255%200%20.466.082.632.247.167.164.25.382.25.654v3.603a.89.89%200%200%201-.25.64.837.837%200%200%201-.632.261H345.36v11.741c0%201.337.18%202.465.544%203.386.363.92.873%201.613%201.53%202.077a6.487%206.487%200%200%200%202.059.989c.716.193%201.534.29%202.456.29%201.98%200%203.824-.668%205.53-2.005.452-.426.873-.407%201.265.058l2%202.325zm15.146-23.272c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z%22%20fill%3D%22%23FFF%22%2F%3E%3Cpath%20d%3D%22M102.022%2037.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87%201.87%200%200%201-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87%201.87%200%200%201%2082.511%200h26.297c1.171%200%202.312.1%203.423.303%201.11.201%202.282.615%203.514%201.24a11.807%2011.807%200%200%201%203.212%202.36c.909.949%201.646%202.23%202.211%203.844.566%201.613.849%203.47.849%205.568v23.421c.04%201.09.262%201.877.666%202.36l12.18%2014.102c.645.767.605%201.594-.122%202.481l-12.058%2013.799c-.444.484-.666%201.271-.666%202.36V95.14c0%202.622-.414%204.852-1.243%206.688-.828%201.835-1.938%203.207-3.332%204.115-1.394.908-2.787%201.553-4.18%201.937-1.394.383-2.879.575-4.454.575H82.51c-.525%200-.97-.162-1.333-.485a1.716%201.716%200%200%201-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87%201.87%200%200%201%201.333-.515H97.66c2.908%200%204.363-1.25%204.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217%200%200%200%200-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083%2053.15a1.523%201.523%200%200%201%200%202.154l-23.85%2023.849a1.523%201.523%200%200%201-2.153%200l-23.85-23.85a1.523%201.523%200%200%201%200-2.153L67.08%2029.3a1.523%201.523%200%200%201%202.154%200zm-35.937%208.585c0%201.009-.243%201.735-.728%202.18L19.26%2054.258a.217.217%200%200%200%200%20.298L32.57%2068.51c.485.484.728%201.23.728%202.24v18.337c0%202.501%201.454%203.752%204.362%203.752h15.148c.525%200%20.97.172%201.333.515.364.343.584.797.584%201.361v11.923c0%20.565-.22%201.009-.584%201.331-.363.323-.808.485-1.333.485H26.511c-1.576%200-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577%2055.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614%201.303-2.895%202.211-3.843a11.807%2011.807%200%200%201%203.212-2.36C20.805.917%2021.976.503%2023.087.302A19.123%2019.123%200%200%201%2026.511%200h26.296c.525%200%20.97.171%201.333.515.364.342.584.796.584%201.361v11.862c0%20.525-.22.959-.584%201.301a1.87%201.87%200%200%201-1.333.515H37.66c-2.908%200-4.362%201.291-4.362%203.873v18.459z%22%20fill%3D%22%234547E0%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E' alt="Execute Program"></a></li>
-
   </ul>
 </section>
 

From 411eb9d593a9e08cd68b9b5015cac2ec494a6ba4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 9 Feb 2021 10:37:21 +0100
Subject: [PATCH 4418/4742] Fix missing sponsor link

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

diff --git a/index.html b/index.html
index 46a2bcffe1..8b8c79bfb4 100644
--- a/index.html
+++ b/index.html
@@ -205,7 +205,7 @@ <h2>Browser support</h2>
   <h2>Sponsors</h2>
   <p>These companies support development of this project:</p>
   <ul class=sponsor-list>
-    <li><a href=""><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 28" height="120" fill="currentColor" color="black"><path d="M12.5 22.667c-1.154 0-2.154-.252-3-.754a5.091 5.091 0 01-1.945-2.048 10.801 10.801 0 01-.991-2.741A14.747 14.747 0 016.25 14c0-.83.054-1.624.164-2.382.108-.758.309-1.529.602-2.31a7.37 7.37 0 011.129-2.035 5.118 5.118 0 011.807-1.401c.746-.36 1.594-.539 2.548-.539 1.154 0 2.154.252 3 .754.843.501 1.517 1.21 1.945 2.048.452.861.782 1.775.991 2.741.209.965.314 2.007.314 3.124a16.7 16.7 0 01-.163 2.382 10.63 10.63 0 01-.615 2.31c-.302.782-.677 1.46-1.13 2.035-.451.575-1.05 1.042-1.794 1.401-.745.36-1.594.539-2.548.539zm2.206-6.373c.598-.6.93-1.43.919-2.294 0-.893-.299-1.658-.896-2.294-.598-.637-1.34-.956-2.229-.956s-1.631.319-2.23.956A3.236 3.236 0 009.376 14c0 .893.299 1.658.896 2.294.598.637 1.34.956 2.229.956s1.624-.319 2.206-.956zM12.5 27C19.403 27 25 21.18 25 14S19.403 1 12.5 1 0 6.82 0 14s5.597 13 12.5 13z"/></svg>'>Observable</a></li>
+    <li><a href="http://observablehq.com/"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 28" height="120" fill="currentColor" color="black"><path d="M12.5 22.667c-1.154 0-2.154-.252-3-.754a5.091 5.091 0 01-1.945-2.048 10.801 10.801 0 01-.991-2.741A14.747 14.747 0 016.25 14c0-.83.054-1.624.164-2.382.108-.758.309-1.529.602-2.31a7.37 7.37 0 011.129-2.035 5.118 5.118 0 011.807-1.401c.746-.36 1.594-.539 2.548-.539 1.154 0 2.154.252 3 .754.843.501 1.517 1.21 1.945 2.048.452.861.782 1.775.991 2.741.209.965.314 2.007.314 3.124a16.7 16.7 0 01-.163 2.382 10.63 10.63 0 01-.615 2.31c-.302.782-.677 1.46-1.13 2.035-.451.575-1.05 1.042-1.794 1.401-.745.36-1.594.539-2.548.539zm2.206-6.373c.598-.6.93-1.43.919-2.294 0-.893-.299-1.658-.896-2.294-.598-.637-1.34-.956-2.229-.956s-1.631.319-2.23.956A3.236 3.236 0 009.376 14c0 .893.299 1.658.896 2.294.598.637 1.34.956 2.229.956s1.624-.319 2.206-.956zM12.5 27C19.403 27 25 21.18 25 14S19.403 1 12.5 1 0 6.82 0 14s5.597 13 12.5 13z"/></svg>'>Observable</a></li>
     <li><a href="https://holmusk.com"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" style="background: %231649BF"><g transform="translate(-780, -40)" fill="%23FFFFFF"><path d="M780,4 L840,4 L840,1 L780,1 L780,4 Z M794,55 L794,84.65 L796.806,84.65 L796.806,72.739 C796.806,69.633 799.325,67.104 802.420,67.104 C805.516,67.104 808.031,69.633 808.031,72.739 L808.031,84.65 L810.838,84.65 L810.838,72.739 C810.838,68.077 807.062,64.288 802.420,64.288 C800.271,64.288 798.311,65.106 796.819,66.447 L796.819,55 L794,55 Z M817.582,63.931 C815.372,63.931 813.367,64.798 811.862,66.199 L812.163,66.653 C812.613,67.33 812.972,68.051 813.248,68.805 C814.281,67.549 815.840,66.746 817.582,66.746 C820.674,66.746 823.193,69.276 823.193,72.382 L823.193,72.385 L823.193,84.293 L826,84.293 L826,72.385 L826,72.379 C826,70.658 825.483,69.057 824.598,67.72 L824.598,67.723 C824.537,67.629 824.473,67.543 824.409,67.452 C824.345,67.365 824.280,67.278 824.213,67.191 C824.139,67.098 824.068,67.008 823.995,66.917 C823.870,66.776 823.744,66.634 823.616,66.502 C823.542,66.424 823.465,66.35 823.385,66.276 C823.289,66.183 823.190,66.093 823.090,66.002 C823.004,65.932 822.917,65.854 822.830,65.787 C822.689,65.671 822.542,65.561 822.394,65.458 C822.320,65.406 822.243,65.354 822.169,65.307 C821.999,65.194 821.829,65.087 821.650,64.991 C821.592,64.955 821.531,64.923 821.473,64.894 C821.307,64.807 821.142,64.726 820.976,64.653 C820.909,64.623 820.845,64.594 820.774,64.566 C820.569,64.478 820.357,64.401 820.138,64.33 C820.084,64.314 820.026,64.298 819.969,64.282 C819.773,64.224 819.577,64.172 819.382,64.131 C819.330,64.118 819.285,64.104 819.234,64.095 C819,64.05 818.766,64.015 818.525,63.985 C818.461,63.979 818.400,63.976 818.339,63.969 C818.095,63.947 817.855,63.931 817.611,63.931 L817.582,63.931 Z"></path></g></svg>'>Holmusk</a></li>
     <li><a href="https://codepen.io/"><img style="margin: 16px 0" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>' alt="CodePen"></a></li>
     <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>

From 0025875177264c067dc13b7386118c4a3be63f13 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Wed, 10 Feb 2021 14:13:39 +0000
Subject: [PATCH 4419/4742] [emacs] goto line in firefox devtools

Related to #6581
Firefox Developer Tools flattens input elements when using innerHTML.
---
 keymap/emacs.js    | 12 +++++++++++-
 test/emacs_test.js | 21 +++++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index fe4882eb44..91d8abbbc4 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -233,9 +233,19 @@
     cm.setCursor(cm.getCursor());
   }
 
+  function makePrompt(msg) {
+    var fragment = document.createDocumentFragment();
+    var input = document.createElement("input");
+    input.setAttribute("type", "text");
+    input.style.width = "10em";
+    fragment.appendChild(document.createTextNode(msg + ": "));
+    fragment.appendChild(input);
+    return fragment;
+  }
+
   function getInput(cm, msg, f) {
     if (cm.openDialog)
-      cm.openDialog(msg + ": <input type=\"text\" style=\"width: 10em\"/>", f, {bottom: true});
+      cm.openDialog(makePrompt(msg), f, {bottom: true});
     else
       f(prompt(msg, ""));
   }
diff --git a/test/emacs_test.js b/test/emacs_test.js
index 412dba4b42..4d2fde68a4 100644
--- a/test/emacs_test.js
+++ b/test/emacs_test.js
@@ -39,6 +39,8 @@
     }, {keyMap: "emacs", value: start, mode: "javascript"});
   }
 
+  function dialog(answer) { return function(cm) { cm.openDialog = function(_, cb) { cb(answer); }; }; }
+
   function at(line, ch, sticky) { return function(cm) { eqCursorPos(cm.getCursor(), Pos(line, ch, sticky)); }; }
   function txt(str) { return function(cm) { eq(cm.getValue(), str); }; }
 
@@ -133,6 +135,19 @@
 
   sim("backspaceDoesntAddToRing", "foobar", "Ctrl-F", "Ctrl-F", "Ctrl-F", "Ctrl-K", "Backspace", "Backspace", "Ctrl-Y", txt("fbar"));
 
+  sim("gotoLine", "0\n1\n2\n3", dialog("3"), "Alt-G", "G", at(2, 0));
+  sim("gotoInvalidLineFloat", "0\n1\n2\n3", dialog("2.2"), "Alt-G", "G", at(0, 0));
+
+  testCM("gotoDialogTemplate", function(cm) {
+    cm.openDialog = function(template, cb) {
+      var input = template.querySelector("input");
+      eq(template.textContent, "Goto line: ");
+      eq(input.tagName, "INPUT");
+    };
+    cm.triggerOnKeyDown(fakeEvent("Alt-G"));
+    cm.triggerOnKeyDown(fakeEvent("G"));
+  }, {value: "", keyMap: "emacs"});
+
   testCM("save", function(cm) {
     var saved = false;
     CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };
@@ -140,10 +155,4 @@
     cm.triggerOnKeyDown(fakeEvent("Ctrl-S"));
     is(saved, "hi");
   }, {value: "hi", keyMap: "emacs"});
-
-  testCM("gotoInvalidLineFloat", function(cm) {
-    cm.openDialog = function(_, cb) { cb("2.2"); };
-    cm.triggerOnKeyDown(fakeEvent("Alt-G"));
-    cm.triggerOnKeyDown(fakeEvent("G"));
-  }, {value: "1\n2\n3\n4", keyMap: "emacs"});
 })();

From 2a4235593f1a30ebef9bc23ae5e61d43cc6c5d21 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Wed, 10 Feb 2021 20:07:22 +0000
Subject: [PATCH 4420/4742] [vim] fix html in ex substitute confirm

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c1bc3e80d8..fceac4cc18 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -5353,7 +5353,7 @@
         return;
       }
       showPrompt(cm, {
-        prefix: 'replace with <strong>' + replaceWith + '</strong> (y/n/a/q/l)',
+        prefix: dom('span', 'replace with ', dom('strong', replaceWith), ' (y/n/a/q/l)'),
         onKeyDown: onPromptKeyDown
       });
     }

From 9d0f9d19de70abe817e8b8e161034fbd3f907030 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 12 Feb 2021 13:07:47 +0100
Subject: [PATCH 4421/4742] Make history reset preserve undoDepth option

Closes #6589
---
 src/model/Doc.js     | 4 ++--
 src/model/history.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/model/Doc.js b/src/model/Doc.js
index c305eee25b..4a0c51573e 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -198,7 +198,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     return {undo: done, redo: undone}
   },
   clearHistory: function() {
-    this.history = new History(this.history.maxGeneration)
+    this.history = new History(this.history)
     linkedDocs(this, doc => doc.history = this.history, true)
   },
 
@@ -219,7 +219,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
             undone: copyHistoryArray(this.history.undone)}
   },
   setHistory: function(histData) {
-    let hist = this.history = new History(this.history.maxGeneration)
+    let hist = this.history = new History(this.history)
     hist.done = copyHistoryArray(histData.done.slice(0), null, true)
     hist.undone = copyHistoryArray(histData.undone.slice(0), null, true)
   },
diff --git a/src/model/history.js b/src/model/history.js
index 2d9359f007..a5bfbb38b0 100644
--- a/src/model/history.js
+++ b/src/model/history.js
@@ -8,19 +8,19 @@ import { changeEnd } from "./change_measurement.js"
 import { linkedDocs } from "./document_data.js"
 import { Selection } from "./selection.js"
 
-export function History(startGen) {
+export function History(prev) {
   // Arrays of change events and selections. Doing something adds an
   // event to done and clears undo. Undoing moves events from done
   // to undone, redoing moves them in the other direction.
   this.done = []; this.undone = []
-  this.undoDepth = Infinity
+  this.undoDepth = prev ? prev.undoDepth : Infinity
   // Used to track when changes can be merged into a single undo
   // event
   this.lastModTime = this.lastSelTime = 0
   this.lastOp = this.lastSelOp = null
   this.lastOrigin = this.lastSelOrigin = null
   // Used by the isClean() method
-  this.generation = this.maxGeneration = startGen || 1
+  this.generation = this.maxGeneration = prev ? prev.maxGeneration : 1
 }
 
 // Create a history change event from an updateDoc-style change

From 17709012643edb67ad0e15bbf822a13170669731 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Sat, 13 Feb 2021 14:21:11 +0000
Subject: [PATCH 4422/4742] [vim] fix substitute command when splitting or
 joining lines

---
 keymap/vim.js    |  9 ++++++---
 test/vim_test.js | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index fceac4cc18..e20c9ac978 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4527,7 +4527,7 @@
       if (start instanceof Array) {
         return inArray(pos, start);
       } else {
-        if (end) {
+        if (typeof end == 'number') {
           return (pos >= start && pos <= end);
         } else {
           return pos == start;
@@ -5268,7 +5268,7 @@
       // Set up all the functions.
       cm.state.vim.exMode = true;
       var done = false;
-      var lastPos = searchCursor.from();
+      var lastPos, modifiedLineNumber;
       function replaceAll() {
         cm.operation(function() {
           while (!done) {
@@ -5281,14 +5281,17 @@
       function replace() {
         var text = cm.getRange(searchCursor.from(), searchCursor.to());
         var newText = text.replace(query, replaceWith);
+        var unmodifiedLineNumber = searchCursor.to().line;
         searchCursor.replace(newText);
+        modifiedLineNumber = searchCursor.to().line;
+        lineEnd += modifiedLineNumber - unmodifiedLineNumber;
       }
       function next() {
         // The below only loops to skip over multiple occurrences on the same
         // line when 'global' is not true.
         while(searchCursor.findNext() &&
               isInRange(searchCursor.from(), lineStart, lineEnd)) {
-          if (!global && lastPos && searchCursor.from().line == lastPos.line) {
+          if (!global && searchCursor.from().line == modifiedLineNumber) {
             continue;
           }
           cm.scrollIntoView(searchCursor.from(), 30);
diff --git a/test/vim_test.js b/test/vim_test.js
index aa3530f96c..b35032ea3d 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4307,10 +4307,22 @@ testSubstitute('ex_substitute_newline_match', {
   value: 'one,two \n three,four',
   expectedValue: 'one,two , three,four',
   expr: '%s/\\n/,/g'});
+testSubstitute('ex_substitute_newline_join_global', {
+  value: 'one,two \n three,four \n five \n six',
+  expectedValue: 'one,two \n three,four , five \n six',
+  expr: '2s/\\n/,/g'});
 testSubstitute('ex_substitute_newline_replacement', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one\ntwo \n three\nfour',
+  value: 'one,two, \n three,four,',
+  expectedValue: 'one\ntwo\n \n three\nfour\n',
   expr: '%s/,/\\n/g'});
+testSubstitute('ex_substitute_newline_multiple_splits', {
+  value: 'one,two, \n three,four,five,six, \n seven,',
+  expectedValue: 'one,two, \n three\nfour\nfive\nsix\n \n seven,',
+  expr: '2s/,/\\n/g'});
+testSubstitute('ex_substitute_newline_first_occurrences', {
+  value: 'one,two, \n three,four,five,six, \n seven,',
+  expectedValue: 'one\ntwo, \n three\nfour,five,six, \n seven\n',
+  expr: '%s/,/\\n/'});
 testSubstitute('ex_substitute_braces_word', {
   value: 'ababab abb ab{2}',
   expectedValue: 'ab abb ab{2}',

From d7337664795862eb6f74673068ac0384d1737c60 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Sat, 13 Feb 2021 16:17:06 +0000
Subject: [PATCH 4423/4742] [vim] fix substitute command when joining multiple
 lines

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

diff --git a/keymap/vim.js b/keymap/vim.js
index e20c9ac978..c2eb3f9b34 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -5268,7 +5268,7 @@
       // Set up all the functions.
       cm.state.vim.exMode = true;
       var done = false;
-      var lastPos, modifiedLineNumber;
+      var lastPos, modifiedLineNumber, joined;
       function replaceAll() {
         cm.operation(function() {
           while (!done) {
@@ -5285,13 +5285,14 @@
         searchCursor.replace(newText);
         modifiedLineNumber = searchCursor.to().line;
         lineEnd += modifiedLineNumber - unmodifiedLineNumber;
+        joined = modifiedLineNumber < unmodifiedLineNumber;
       }
       function next() {
         // The below only loops to skip over multiple occurrences on the same
         // line when 'global' is not true.
         while(searchCursor.findNext() &&
               isInRange(searchCursor.from(), lineStart, lineEnd)) {
-          if (!global && searchCursor.from().line == modifiedLineNumber) {
+          if (!global && searchCursor.from().line == modifiedLineNumber && !joined) {
             continue;
           }
           cm.scrollIntoView(searchCursor.from(), 30);
diff --git a/test/vim_test.js b/test/vim_test.js
index b35032ea3d..144b1eaab9 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4311,6 +4311,10 @@ testSubstitute('ex_substitute_newline_join_global', {
   value: 'one,two \n three,four \n five \n six',
   expectedValue: 'one,two \n three,four , five \n six',
   expr: '2s/\\n/,/g'});
+testSubstitute('ex_substitute_newline_join_noglobal', {
+  value: 'one,two \n three,four \n five \n six\n',
+  expectedValue: 'one,two \n three,four , five , six\n',
+  expr: '2,3s/\\n/,/'});
 testSubstitute('ex_substitute_newline_replacement', {
   value: 'one,two, \n three,four,',
   expectedValue: 'one\ntwo\n \n three\nfour\n',

From c58a7b736bae3c068526de4e7db133f4d4f9fe84 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Thu, 18 Feb 2021 14:15:38 +0000
Subject: [PATCH 4424/4742] [vim] fix global command when line numbers change

---
 keymap/vim.js    | 19 ++++++++++++-------
 test/vim_test.js | 16 ++++++++++++++--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c2eb3f9b34..b649ba9e7e 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -5051,28 +5051,33 @@
         // now that we have the regexPart, search for regex matches in the
         // specified range of lines
         var query = getSearchState(cm).getQuery();
-        var matchedLines = [], content = '';
+        var matchedLines = [];
         for (var i = lineStart; i <= lineEnd; i++) {
-          var matched = query.test(cm.getLine(i));
+          var line = cm.getLineHandle(i);
+          var matched = query.test(line.text);
           if (matched) {
-            matchedLines.push(i+1);
-            content+= cm.getLine(i) + '\n';
+            matchedLines.push(cmd ? line : line.text);
           }
         }
         // if there is no [cmd], just display the list of matched lines
         if (!cmd) {
-          showConfirm(cm, content);
+          showConfirm(cm, matchedLines.join('\n'));
           return;
         }
         var index = 0;
         var nextCommand = function() {
           if (index < matchedLines.length) {
-            var command = matchedLines[index] + cmd;
+            var line = matchedLines[index++];
+            var lineNum = cm.getLineNumber(line);
+            if (lineNum == null) {
+              nextCommand();
+              return;
+            }
+            var command = (lineNum + 1) + cmd;
             exCommandDispatcher.processCommand(cm, command, {
               callback: nextCommand
             });
           }
-          index++;
         };
         nextCommand();
       },
diff --git a/test/vim_test.js b/test/vim_test.js
index 144b1eaab9..c4b1af3964 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4070,10 +4070,22 @@ testVim('ex_sort_pattern_alpha_num', function(cm, vim, helpers) {
 testVim('ex_global', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doEx('g/one/s//two');
-  eq('two two\n two two\n two two', cm.getValue());
+  eq('two one\n two one\n two one', cm.getValue());
   helpers.doEx('1,2g/two/s//one');
-  eq('one one\n one one\n two two', cm.getValue());
+  eq('one one\n one one\n two one', cm.getValue());
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    eq(' one one\n two one', text);
+  });
+  helpers.doEx('g/^ /');
 }, {value: 'one one\n one one\n one one'});
+testVim('ex_global_substitute_join', function(cm, vim, helpers) {
+  helpers.doEx('g/o/s/\\n/;');
+  eq('one;two\nthree\nfour;five\n', cm.getValue());
+}, {value: 'one\ntwo\nthree\nfour\nfive\n'});
+testVim('ex_global_substitute_split', function(cm, vim, helpers) {
+  helpers.doEx('g/e/s/[or]/\\n');
+  eq('\nne\ntwo\nth\nee\nfour\nfive\n', cm.getValue());
+}, {value: 'one\ntwo\nthree\nfour\nfive\n'});
 testVim('ex_global_confirm', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   var onKeyDown;

From 65234395178670e1a86e8665b00e3cdb70841ce9 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Sat, 20 Feb 2021 13:22:53 +0000
Subject: [PATCH 4425/4742] [vim] substitute pattern ending in dollar

---
 keymap/vim.js    | 10 +++++-----
 test/vim_test.js |  8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b649ba9e7e..03be39a530 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -5097,9 +5097,11 @@
               regexPart = new RegExp(regexPart).source; //normalize not escaped characters
           }
           replacePart = tokens[1];
-          if (regexPart && regexPart[regexPart.length - 1] === '$') {
-            regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
-            replacePart = replacePart ? replacePart + '\n' : '\n';
+          // If the pattern ends with $ (line boundary assertion), change $ to \n.
+          // Caveat: this workaround cannot match on the last line of the document.
+          if (/(^|[^\\])(\\\\)*\$$/.test(regexPart)) {
+            regexPart = regexPart.slice(0, -1) + '\\n';
+            replacePart = (replacePart || '') + '\n';
           }
           if (replacePart !== undefined) {
             if (getOption('pcre')) {
@@ -5128,11 +5130,9 @@
           if (flagsPart) {
             if (flagsPart.indexOf('c') != -1) {
               confirm = true;
-              flagsPart.replace('c', '');
             }
             if (flagsPart.indexOf('g') != -1) {
               global = true;
-              flagsPart.replace('g', '');
             }
             if (getOption('pcre')) {
                regexPart = regexPart + '/' + flagsPart;
diff --git a/test/vim_test.js b/test/vim_test.js
index c4b1af3964..099816e661 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4311,10 +4311,14 @@ testSubstitute('ex_substitute_multibackslash_replacement', {
   value: 'one,two \n three,four',
   expectedValue: 'one\\\\\\\\two \n three\\\\\\\\four', // 2*8 backslashes.
   expr: '%s/,/\\\\\\\\\\\\\\\\/g'}); // 16 backslashes.
-testSubstitute('ex_substitute_dollar_match', {
+testSubstitute('ex_substitute_dollar_assertion', {
   value: 'one,two \n three,four',
-  expectedValue: 'one,two ,\n three,four',
+  expectedValue: 'one,two ,\n three,four', // TODO: should match at end of doc.
   expr: '%s/$/,/g'});
+testSubstitute('ex_substitute_dollar_literal', {
+  value: 'one$two\n$three\nfour$\n$',
+  expectedValue: 'one,two\n,three\nfour,\n,',
+  expr: '%s/\\$/,/g'});
 testSubstitute('ex_substitute_newline_match', {
   value: 'one,two \n three,four',
   expectedValue: 'one,two , three,four',

From 795f1378a71edac3f3b09127fdb68603a62184c4 Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Thu, 18 Feb 2021 18:02:40 +0000
Subject: [PATCH 4426/4742] [vim] add :vglobal ex command

---
 keymap/vim.js    | 8 +++++++-
 test/vim_test.js | 9 +++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 03be39a530..bd497978d6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -244,6 +244,7 @@
     { name: 'yank', shortName: 'y' },
     { name: 'delmarks', shortName: 'delm' },
     { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
+    { name: 'vglobal', shortName: 'v' },
     { name: 'global', shortName: 'g' }
   ];
 
@@ -5018,6 +5019,10 @@
         }
         cm.replaceRange(text.join('\n'), curStart, curEnd);
       },
+      vglobal: function(cm, params) {
+        // global inspects params.commandName
+        this.global(cm, params);
+      },
       global: function(cm, params) {
         // a global command is of the form
         // :[range]g/pattern/[cmd]
@@ -5027,6 +5032,7 @@
           showConfirm(cm, 'Regular Expression missing from global');
           return;
         }
+        var inverted = params.commandName[0] === 'v';
         // range is specified here
         var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
         var lineEnd = params.lineEnd || params.line || cm.lastLine();
@@ -5055,7 +5061,7 @@
         for (var i = lineStart; i <= lineEnd; i++) {
           var line = cm.getLineHandle(i);
           var matched = query.test(line.text);
-          if (matched) {
+          if (matched !== inverted) {
             matchedLines.push(cmd ? line : line.text);
           }
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index 099816e661..20eabf5c94 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4113,6 +4113,15 @@ testVim('ex_global_confirm', function(cm, vim, helpers) {
   onKeyDown({keyCode: KEYCODES.y}, '', close);
   eq('one two\n two two\n one one\n two one\n one one', cm.getValue());
 }, {value: 'one one\n one one\n one one\n one one\n one one'});
+// test for :vglobal command
+testVim('ex_vglobal', function(cm, vim, helpers) {
+  helpers.doEx('v/e/s/o/e');
+  eq('one\n twe\n three\n feur\n five\n', cm.getValue());
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    eq('one\n three\n feur\n', text);
+  });
+  helpers.doEx('v/[vw]');
+}, {value: 'one\n two\n three\n four\n five\n'});
 // Basic substitute tests.
 testVim('ex_substitute_same_line', function(cm, vim, helpers) {
   cm.setCursor(1, 0);

From 58bb622cfc210af2c1adcd50a55971fd0d631bfb Mon Sep 17 00:00:00 2001
From: Ben Hormann <benhormann@users.noreply.github.com>
Date: Sat, 20 Feb 2021 12:50:28 +0000
Subject: [PATCH 4427/4742] [vim] ignore CapsLock key events

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index bd497978d6..6630b6f61a 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -354,7 +354,7 @@
       return cmd;
     }
 
-    var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
+    var modifiers = {Shift:'S',Ctrl:'C',Alt:'A',Cmd:'D',Mod:'A',CapsLock:''};
     var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del',Insert:'Ins'};
     function cmKeyToVimKey(key) {
       if (key.charAt(0) == '\'') {

From 77f7eaf8dc7c536b5961bad3cc426db4b02ba7cf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 20 Feb 2021 22:24:02 +0100
Subject: [PATCH 4428/4742] Mark version 5.59.3

---
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68f7d4016b..f2edbffec3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.59.3 (2021-02-20)
+
+### Bug fixes
+
+Don't override the way zero-with non-joiners are rendered.
+
+Fix an issue where resetting the history cleared the `undoDepth` option's value.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Fix substitute command when joining and splitting lines, fix global command when line number change, add support for `:vglobal`, properly treat caps lock as a modifier key.
+
 ## 5.59.2 (2021-01-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 62cc95cb7c..7ed2269dd5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.59.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.59.3</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 9658a7ba24..ef10a4c184 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,14 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-02-2021: <a href="https://codemirror.net/codemirror-5.59.3.zip">Version 5.59.3</a>:</p>
+
+  <ul class="rel-note">
+    <li>Don’t override the way zero-with non-joiners are rendered.</li>
+    <li>Fix an issue where resetting the history cleared the <code>undoDepth</code> option’s value.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix substitute command when joining and splitting lines, fix global command when line number change, add support for <code>:vglobal</code>, properly treat caps lock as a modifier key.</li>
+  </ul>
+
   <p class="rel">20-01-2021: <a href="https://codemirror.net/codemirror-5.59.2.zip">Version 5.59.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 8b8c79bfb4..95b7896410 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.3</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 915e51305a..48172cc2d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.59.2",
+  "version": "5.59.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index d1898a6d56..e2e16fb6e4 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.59.2"
+CodeMirror.version = "5.59.3"

From 19cbf235547eeca858ef14427de9be8974cc3beb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 24 Feb 2021 11:16:29 +0100
Subject: [PATCH 4429/4742] Revert "Fix white CodeMirror-scrollbar-filler on
 dark themes"

This reverts commit 5bef47a743e8569af3f11fac628501bb3bc10108.

Issue #6485
Issue #6599
---
 lib/codemirror.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 5ea2d2be2a..a64f97c777 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -19,7 +19,7 @@
 }
 
 .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: transparent; /* The little square between H and V scrollbars */
+  background-color: white; /* The little square between H and V scrollbars */
 }
 
 /* GUTTER */

From 96c0e3463d40ee2f4d446ded593afbf010aa4c44 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 24 Feb 2021 11:23:15 +0100
Subject: [PATCH 4430/4742] Mark version 5.59.4

---
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2edbffec3..c1c26f300c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.59.4 (2021-02-24)
+
+### Bug fixes
+
+Give the scrollbar corner filler a background again, to prevent content from peeping through between the scrollbars.
+
 ## 5.59.3 (2021-02-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 7ed2269dd5..6e670549b0 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.59.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.59.4</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 ef10a4c184..b5168b0a94 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">24-02-2021: <a href="https://codemirror.net/codemirror-5.59.4.zip">Version 5.59.4</a>:</p>
+
+  <ul class="rel-note">
+    <li>Give the scrollbar corner filler a background again, to prevent content from peeping through between the scrollbars.
+  </ul>
+
   <p class="rel">20-02-2021: <a href="https://codemirror.net/codemirror-5.59.3.zip">Version 5.59.3</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 95b7896410..37933a30ff 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.3</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.4</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 48172cc2d2..32df807768 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.59.3",
+  "version": "5.59.4",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index e2e16fb6e4..71e283c2da 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.59.3"
+CodeMirror.version = "5.59.4"

From 710949d765c8fb06ed6403fc98e7c7e457cbcf1b Mon Sep 17 00:00:00 2001
From: lishid <lishid@gmail.com>
Date: Wed, 24 Feb 2021 15:35:13 -0500
Subject: [PATCH 4431/4742] Allow the omission of head in setSelections to stay
 consistent with setSelection.

---
 doc/manual.html  | 5 +++--
 src/model/Doc.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 6e670549b0..91ec333309 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1432,14 +1432,15 @@ <h3 id="api_selection">Cursor and selection methods</h3>
         stuck.</dd>
       </dl></dd>
 
-      <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, head}&gt;, ?primary: integer, ?options: object)</code></dt>
+      <dt id="setSelections"><code><strong>doc.setSelections</strong>(ranges: array&lt;{anchor, ?head}&gt;, ?primary: integer, ?options: object)</code></dt>
       <dd>Sets a new set of selections. There must be at least one
       selection in the given array. When <code>primary</code> is a
       number, it determines which selection is the primary one. When
       it is not given, the primary index is taken from the previous
       selection, or set to the last range if the previous selection
       had less ranges than the new one. Supports the same options
-      as <a href="#setSelection"><code>setSelection</code></a>.</dd>
+      as <a href="#setSelection"><code>setSelection</code></a>.
+      <code>head</code> defaults to <code>anchor</code> when not given.</dd>
       <dt id="addSelection"><code><strong>doc.addSelection</strong>(anchor: {line, ch}, ?head: {line, ch})</code></dt>
       <dd>Adds a new selection to the existing set of selections, and
       makes it the primary selection.</dd>
diff --git a/src/model/Doc.js b/src/model/Doc.js
index 4a0c51573e..8a2082aa41 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -137,7 +137,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
     let out = []
     for (let i = 0; i < ranges.length; i++)
       out[i] = new Range(clipPos(this, ranges[i].anchor),
-                         clipPos(this, ranges[i].head))
+                         clipPos(this, ranges[i].head || ranges[i].anchor))
     if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex)
     setSelection(this, normalizeSelection(this.cm, out, primary), options)
   }),

From bc1624da5827f2eb0a87f7742a23e631d98aa986 Mon Sep 17 00:00:00 2001
From: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Date: Thu, 25 Feb 2021 14:16:11 +0100
Subject: [PATCH 4432/4742] [sublime bindings] Add command to sort lines in
 reverse order

---
 keymap/sublime.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/keymap/sublime.js b/keymap/sublime.js
index 7edf172eb5..0c9a63e01e 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -339,7 +339,7 @@
   };
 
 
-  function sortLines(cm, caseSensitive) {
+  function sortLines(cm, caseSensitive, direction) {
     if (cm.isReadOnly()) return CodeMirror.Pass
     var ranges = cm.listSelections(), toSort = [], selected;
     for (var i = 0; i < ranges.length; i++) {
@@ -361,12 +361,12 @@
         var start = Pos(from, 0), end = Pos(to);
         var lines = cm.getRange(start, end, false);
         if (caseSensitive)
-          lines.sort();
+          lines.sort(function(a, b) { return a < b ? -direction : a == b ? 0 : direction; });
         else
           lines.sort(function(a, b) {
             var au = a.toUpperCase(), bu = b.toUpperCase();
             if (au != bu) { a = au; b = bu; }
-            return a < b ? -1 : a == b ? 0 : 1;
+            return a < b ? -direction : a == b ? 0 : direction;
           });
         cm.replaceRange(lines, start, end);
         if (selected) ranges.push({anchor: start, head: Pos(to + 1, 0)});
@@ -375,8 +375,10 @@
     });
   }
 
-  cmds.sortLines = function(cm) { sortLines(cm, true); };
-  cmds.sortLinesInsensitive = function(cm) { sortLines(cm, false); };
+  cmds.sortLines = function(cm) { sortLines(cm, true, 1); };
+  cmds.reverseSortLines = function(cm) { sortLines(cm, true, -1); };
+  cmds.sortLinesInsensitive = function(cm) { sortLines(cm, false, 1); };
+  cmds.reverseSortLinesInsensitive = function(cm) { sortLines(cm, false, -1); };
 
   cmds.nextBookmark = function(cm) {
     var marks = cm.state.sublimeBookmarks;
@@ -609,7 +611,9 @@
     "Cmd-J": "joinLines",
     "Shift-Cmd-D": "duplicateLine",
     "F5": "sortLines",
+    "Shift-F5": "reverseSortLines",
     "Cmd-F5": "sortLinesInsensitive",
+    "Shift-Cmd-F5": "reverseSortLinesInsensitive",
     "F2": "nextBookmark",
     "Shift-F2": "prevBookmark",
     "Cmd-F2": "toggleBookmark",
@@ -671,7 +675,9 @@
     "Ctrl-J": "joinLines",
     "Shift-Ctrl-D": "duplicateLine",
     "F9": "sortLines",
+    "Shift-F9": "reverseSortLines",
     "Ctrl-F9": "sortLinesInsensitive",
+    "Shift-Ctrl-F9": "reverseSortLinesInsensitive",
     "F2": "nextBookmark",
     "Shift-F2": "prevBookmark",
     "Ctrl-F2": "toggleBookmark",

From b3fd4ed6d1e5f58494cddc6316c20f52c8b9c348 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 25 Feb 2021 17:58:04 +0100
Subject: [PATCH 4433/4742] [javascript mode] Fix parsing of import.meta

Closes #6603
---
 mode/javascript/javascript.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 047395622e..6a057b5da1 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -218,7 +218,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   // Parser
 
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true};
+  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true,
+                     "regexp": true, "this": true, "import": true, "jsonld-keyword": true};
 
   function JSLexical(indented, column, type, align, prev, info) {
     this.indented = indented;
@@ -441,7 +442,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
     if (type == "quasi") return pass(quasi, maybeop);
     if (type == "new") return cont(maybeTarget(noComma));
-    if (type == "import") return cont(expression);
     return cont();
   }
   function maybeexpression(type) {
@@ -802,6 +802,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function afterImport(type) {
     if (type == "string") return cont();
     if (type == "(") return pass(expression);
+    if (type == ".") return pass(maybeOperatorComma);
     return pass(importSpec, maybeMoreImports, maybeFrom);
   }
   function importSpec(type, value) {

From 3f7c8b61e784f95e5a9cc74f4a734dc722a1811d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 25 Feb 2021 19:00:57 +0100
Subject: [PATCH 4434/4742] [javascript mode] Fix variable name

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 6a057b5da1..fbbeaa5a7a 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -802,7 +802,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function afterImport(type) {
     if (type == "string") return cont();
     if (type == "(") return pass(expression);
-    if (type == ".") return pass(maybeOperatorComma);
+    if (type == ".") return pass(maybeoperatorComma);
     return pass(importSpec, maybeMoreImports, maybeFrom);
   }
   function importSpec(type, value) {

From 5fbd5384c4c26afa54fe8a05f5651c0d4d1529c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 25 Feb 2021 21:43:41 +0100
Subject: [PATCH 4435/4742] [show-hint addon] Add check around removeChild call

Closes #6174
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index a9f2ded18c..bfe7d3a353 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -360,7 +360,7 @@
     close: function() {
       if (this.completion.widget != this) return;
       this.completion.widget = null;
-      this.hints.parentNode.removeChild(this.hints);
+      if (this.hints.parentNode) this.hints.parentNode.removeChild(this.hints);
       this.completion.cm.removeKeyMap(this.keyMap);
 
       var cm = this.completion.cm;

From 6e7aa65a8bfb64837ae9d082b674b2f5ee056d2c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 26 Feb 2021 18:09:58 +0100
Subject: [PATCH 4436/4742] [sass mode] Add fold and comment metadata

---
 mode/sass/sass.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index 1258e142c3..d8427bff57 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -445,7 +445,12 @@ CodeMirror.defineMode("sass", function(config) {
 
     indent: function(state) {
       return state.scopes[0].offset;
-    }
+    },
+
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//",
+    fold: "indent"
   };
 }, "css");
 

From 250e4e959f022a864c5855cd87cf8b435bb38f6b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 2 Mar 2021 07:42:07 +0100
Subject: [PATCH 4437/4742] [julia mode] Remove some very confused code

Closes #6609
---
 mode/julia/julia.js | 44 --------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index bff5413b85..de9f987d8e 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -241,10 +241,6 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
         state.isDefinition = false;
         return "def";
       }
-      if (stream.match(/^({[^}]*})*\(/, false)) {
-        state.tokenize = tokenCallOrDef;
-        return state.tokenize(stream, state);
-      }
       state.leavingExpr = true;
       return "variable";
     }
@@ -254,46 +250,6 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     return "error";
   }
 
-  function tokenCallOrDef(stream, state) {
-    for (;;) {
-      var match = stream.match(/^(\(\s*)/), charsAdvanced = 0;
-      if (match) {
-        if (state.firstParenPos < 0)
-          state.firstParenPos = state.scopes.length;
-        state.scopes.push('(');
-        charsAdvanced += match[1].length;
-      }
-      if (currentScope(state) == '(' && stream.match(')')) {
-        state.scopes.pop();
-        charsAdvanced += 1;
-        if (state.scopes.length <= state.firstParenPos) {
-          var isDefinition = stream.match(/^(\s*where\s+[^\s=]+)*\s*?=(?!=)/, false);
-          stream.backUp(charsAdvanced);
-          state.firstParenPos = -1;
-          state.tokenize = tokenBase;
-          if (isDefinition)
-            return "def";
-          return "builtin";
-        }
-      }
-      // Unfortunately javascript does not support multiline strings, so we have
-      // to undo anything done upto here if a function call or definition splits
-      // over two or more lines.
-      if (stream.match(/^$/g, false)) {
-        stream.backUp(charsAdvanced);
-        while (state.scopes.length > state.firstParenPos)
-          state.scopes.pop();
-        state.firstParenPos = -1;
-        state.tokenize = tokenBase;
-        return "builtin";
-      }
-      if (!stream.match(/^[^()]+/)) {
-        stream.next()
-        return null
-      }
-    }
-  }
-
   function tokenAnnotation(stream, state) {
     stream.match(/.*?(?=[,;{}()=\s]|$)/);
     if (stream.match('{')) {

From f7213788ba23f79e8b71daf5ad7ac5fcc5e19233 Mon Sep 17 00:00:00 2001
From: Ian Henderson <ian@ianhenderson.org>
Date: Tue, 2 Mar 2021 08:15:40 -0800
Subject: [PATCH 4438/4742] [lua mode] use electricInput to automatically
 dedent

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

diff --git a/mode/lua/lua.js b/mode/lua/lua.js
index 202f373585..2fad0180ff 100644
--- a/mode/lua/lua.js
+++ b/mode/lua/lua.js
@@ -148,6 +148,7 @@ CodeMirror.defineMode("lua", function(config, parserConfig) {
       return state.basecol + indentUnit * (state.indentDepth - (closing ? 1 : 0));
     },
 
+    electricInput: /^\s*(?:end|until|else|\)|\})$/,
     lineComment: "--",
     blockCommentStart: "--[[",
     blockCommentEnd: "]]"

From 941004ff9d7438a1a68044a40c1385addd56e4ff Mon Sep 17 00:00:00 2001
From: Jakob Kummerow <jakob.kummerow@gmail.com>
Date: Wed, 3 Mar 2021 17:47:20 +0100
Subject: [PATCH 4439/4742] [wast mode] Add support for GC proposal

---
 mode/wast/index.html |  4 +--
 mode/wast/test.js    | 23 ++++++++++++
 mode/wast/wast.js    | 84 ++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/mode/wast/index.html b/mode/wast/index.html
index 470e5c813d..e589d90e09 100644
--- a/mode/wast/index.html
+++ b/mode/wast/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 
-<title>CodeMirror: Rust mode</title>
+<title>CodeMirror: WebAssembly mode</title>
 <meta charset="utf-8" />
 <link rel=stylesheet href="../../doc/docs.css">
 
@@ -70,4 +70,4 @@ <h2>WebAssembly mode</h2>
   </script>
 
   <p><strong>MIME types defined:</strong> <code>text/webassembly</code>.</p>
-</article>
\ No newline at end of file
+</article>
diff --git a/mode/wast/test.js b/mode/wast/test.js
index 3e5137c072..093b782c94 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -337,4 +337,27 @@
      '[keyword table.init] [variable-2 $t] [number 1] ([keyword i32.const] [number 5]) ([keyword i32.const] [number 10]) ([keyword i32.const] [number 15])',
      '[keyword table.copy] [variable-2 $t] [variable-2 $t2] ([keyword i32.const] [number 5]) ([keyword i32.const] [number 10]) ([keyword i32.const] [number 15])'
      );
+     MT('gc-proposal',
+     '[keyword call_ref] [keyword return_call_ref]',
+     '[keyword ref.as_non_null] [keyword br_on_null] [keyword ref.eq]');
+     MT('gc-proposal-structs',
+     '[keyword struct.new_with_rtt] [keyword struct.new_default_with_rtt]',
+     '[keyword struct.get] [keyword struct.get_s] [keyword struct.get_u]',
+     '[keyword struct.set]');
+     MT('gc-proposal-arrays',
+     '[keyword array.new_with_rtt] [keyword array.new_default_with_rtt]',
+     '[keyword array.get] [keyword array.get_s] [keyword array.get_u]',
+     '[keyword array.len] [keyword array.set]');
+     MT('gc-proposal-i31',
+     '[keyword i31.new] [keyword i31.get_s] [keyword i31.get_u]');
+     MT('gc-proposal-rtt',
+     '[keyword rtt.canon] [keyword rtt.sub]');
+     MT('gc-proposal-typechecks',
+     '[keyword ref.test] [keyword ref.cast] [keyword br_on_cast]',
+     '[keyword ref.is_func] [keyword ref.is_data] [keyword ref.is_i31]',
+     '[keyword ref.as_func] [keyword ref.as_data] [keyword ref.as_i31]',
+     '[keyword br_on_func] [keyword br_on_data] [keyword br_on_i31]');
+     MT('gc-proposal-types',
+     '[atom i8] [atom i16]',
+     '[atom anyref] [atom dataref] [atom eqref] [atom i31ref]');
 })();
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index a730d39efc..4a349ba91e 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -11,11 +11,91 @@
 })(function(CodeMirror) {
 "use strict";
 
+var kKeywords = [
+    "align",
+    "block",
+    "br(_if|_table|_on_(cast|data|func|i31|null))?",
+    "call(_indirect|_ref)?",
+    "current_memory",
+    "\\bdata\\b",
+    "drop",
+    "elem",
+    "else",
+    "end",
+    "export",
+    "\\bextern\\b",
+    "\\bfunc\\b",
+    "global(\\.(get|set))?",
+    "if",
+    "import",
+    "local(\\.(get|set|tee))?",
+    "loop",
+    "module",
+    "mut",
+    "nop",
+    "offset",
+    "param",
+    "result",
+    "return(_call(_indirect|_ref)?)?",
+    "select",
+    "start",
+    "table(\\.(size|get|set|size|grow|fill|init|copy))?",
+    "then",
+    "type",
+    "unreachable",
+
+    // Numeric opcodes.
+    "i(32|64)\\.(store(8|16)|(load(8|16)_[su]))",
+    "i64\\.(load32_[su]|store32)",
+    "[fi](32|64)\\.(const|load|store)",
+    "f(32|64)\\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)",
+    "i(32|64)\\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)",
+    "i64\\.extend_[su]_i32",
+    "i32\\.wrap_i64",
+    "i(32|64)\\.trunc_f(32|64)_[su]",
+    "f(32|64)\\.convert_i(32|64)_[su]",
+    "f64\\.promote_f32",
+    "f32\\.demote_f64",
+    "f32\\.reinterpret_i32",
+    "i32\\.reinterpret_f32",
+    "f64\\.reinterpret_i64",
+    "i64\\.reinterpret_f64",
+    // Atomics.
+    "memory(\\.((atomic\\.(notify|wait(32|64)))|grow|size))?",
+    "i64\.atomic\\.(load32_u|store32|rmw32\\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)",
+    "i(32|64)\\.atomic\\.(load((8|16)_u)?|store(8|16)?|rmw(\\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))",
+    // SIMD.
+    "v128\.(load|store|const|not|andnot|and|or|xor|bitselect)",
+    "i(8x16|16x8|32x4|64x2)\\.(shl|shr_[su])",
+    "i(8x16|16x8)\\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)",
+    "(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)",
+    "i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))",
+    "f(32x4|64x2)\\.(eq|ne|[lg][te]|abs|sqrt|mul|div|min|max)",
+    "[fi](32x4|64x2)\\.extract_lane",
+    "v8x16\\.(shuffle|swizzle)",
+    "i16x8\\.(load8x8_[su]|narrow_i32x4_[su]|widen_(low|high)_i8x16_[su]|mul)",
+    "i32x4\\.(load16x4_[su]|widen_(low|high)_i16x8_[su]|mul|trunc_sat_f32x4_[su])",
+    "i64x2\\.(load32x2_[su]|mul)",
+    "(v(8x16|16x8|32x4|64x2)\.load_splat)",
+    "i8x16\\.narrow_i16x8_[su]",
+    "f32x4\\.convert_i32x4_[su]",
+    // Reference types, function references, and GC.
+    "\\bany\\b",
+    "array\\.len",
+    "(array|struct)(\\.(new_(default_)?with_rtt|get(_[su])?|set))?",
+    "\\beq\\b",
+    "field",
+    "i31\\.(new|get_[su])",
+    "\\bnull\\b",
+    "ref(\\.(([ai]s_(data|func|i31))|cast|eq|func|(is_|as_non_)?null|test))?",
+    "rtt(\\.(canon|sub))?",
+];
+
 CodeMirror.defineSimpleMode('wast', {
   start: [
     {regex: /[+\-]?(?:nan(?::0x[0-9a-fA-F]+)?|infinity|inf|0x[0-9a-fA-F]+\.?[0-9a-fA-F]*p[+\/-]?\d+|\d+(?:\.\d*)?[eE][+\-]?\d*|\d+\.\d*|0x[0-9a-fA-F]+|\d+)/, token: "number"},
-    {regex: /mut|nop|block|if|then|else|loop|br_if|br_table|br|call(_indirect)?|drop|end|return(_call(_indirect)?)?|local\.(get|set|tee)|global\.(get|set)|i(32|64)\.(store(8|16)|(load(8|16)_[su]))|i64\.(load32_[su]|store32)|[fi](32|64)\.(const|load|store)|f(32|64)\.(abs|add|ceil|copysign|div|eq|floor|[gl][et]|max|min|mul|nearest|neg?|sqrt|sub|trunc)|i(32|64)\.(a[dn]d|c[lt]z|(div|rem)_[su]|eqz?|[gl][te]_[su]|mul|ne|popcnt|rot[lr]|sh(l|r_[su])|sub|x?or)|i64\.extend_[su]_i32|i32\.wrap_i64|i(32|64)\.trunc_f(32|64)_[su]|f(32|64)\.convert_i(32|64)_[su]|f64\.promote_f32|f32\.demote_f64|f32\.reinterpret_i32|i32\.reinterpret_f32|f64\.reinterpret_i64|i64\.reinterpret_f64|select|unreachable|current_memory|memory(\.((atomic\.(notify|wait(32|64)))|grow|size))?|type|\bfunc\b|param|result|local|global|module|start|elem|data|align|offset|import|export|i64\.atomic\.(load32_u|store32|rmw32\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)|i(32|64)\.atomic\.(load((8|16)_u)?|store(8|16)?|rmw(\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))|v128\.(load|store|const|not|andnot|and|or|xor|bitselect)|i(8x16|16x8|32x4|64x2)\.(shl|shr_[su])|i(8x16|16x8)\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)|(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)|i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))|f(32x4|64x2)\.(eq|ne|[lg][te]|abs|sqrt|mul|div|min|max)|[fi](32x4|64x2)\.extract_lane|v8x16\.(shuffle|swizzle)|i16x8\.(load8x8_[su]|narrow_i32x4_[su]|widen_(low|high)_i8x16_[su]|mul)|i32x4\.(load16x4_[su]|widen_(low|high)_i16x8_[su]|mul|trunc_sat_f32x4_[su])|i64x2\.(load32x2_[su]|mul)|(v(8x16|16x8|32x4|64x2)\.load_splat)|i8x16\.narrow_i16x8_[su]|f32x4\.convert_i32x4_[su]|ref\.(func|(is_)?null)|\bextern\b|table(\.(size|get|set|size|grow|fill|init|copy))?/, token: "keyword"},
-    {regex: /\b(funcref|externref|[fi](32|64))\b/, token: "atom"},
+    {regex: new RegExp(kKeywords.join('|')), token: "keyword"},
+    {regex: /\b((any|data|eq|extern|i31|func)ref|[fi](32|64)|i(8|16))\b/, token: "atom"},
     {regex: /\$([a-zA-Z0-9_`\+\-\*\/\\\^~=<>!\?@#$%&|:\.]+)/, token: "variable-2"},
     {regex: /"(?:[^"\\\x00-\x1f\x7f]|\\[nt\\'"]|\\[0-9a-fA-F][0-9a-fA-F])*"/, token: "string"},
     {regex: /\(;.*?/, token: "comment", next: "comment"},

From 37345aafb1bcbe2bf3324f0131ee09c946a782e5 Mon Sep 17 00:00:00 2001
From: Ng Zhi An <zhin@google.com>
Date: Fri, 5 Mar 2021 00:11:08 -0800
Subject: [PATCH 4440/4742] [wasm mode] Update SIMD instructions and opcodes

This follows the final opcodes in
https://github.com/WebAssembly/simd/blob/master/proposals/simd/NewOpcodes.md
---
 mode/wast/test.js | 118 +++++++++++++++++++++++++++++++++-------------
 mode/wast/wast.js |  31 +++++++-----
 2 files changed, 104 insertions(+), 45 deletions(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index 093b782c94..babb4f629d 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -144,20 +144,20 @@
 
   MT('simd-instructions',
      '[keyword v128.load] [keyword offset]=[number 32] [keyword align]=[number 4]',
-     '[keyword i16x8.load8x8_s] [keyword offset]=[number 64] [keyword align]=[number 0]',
-     '[keyword i16x8.load8x8_u] [keyword offset]=[number 64] [keyword align]=[number 0]',
-     '[keyword i32x4.load16x4_s] [keyword offset]=[number 64] [keyword align]=[number 0]',
-     '[keyword i32x4.load16x4_u] [keyword offset]=[number 64] [keyword align]=[number 0]',
-     '[keyword i64x2.load32x2_s] [keyword offset]=[number 64] [keyword align]=[number 0]',
-     '[keyword i64x2.load32x2_u] [keyword offset]=[number 64] [keyword align]=[number 0]',
-     '[keyword v8x16.load_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
-     '[keyword v16x8.load_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
-     '[keyword v32x4.load_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
-     '[keyword v64x2.load_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load8x8_s] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load8x8_u] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load16x4_s] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load16x4_u] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load32x2_s] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load32x2_u] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load8_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load16_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load32_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load64_splat] [keyword offset]=[number 64] [keyword align]=[number 0]',
      '[keyword v128.store] [keyword offset]=[number 32] [keyword align]=[number 4]',
      '[keyword v128.const] [number 0] [number 1] [number 2] [number 3] [number 4] [number 5] [number 6] [number 7] [number 8] [number 9] [number 10] [number 11] [number 12] [number 13] [number 14] [number 15]',
-     '[keyword v8x16.shuffle] [number 0] [number 1] [number 2] [number 3] [number 4] [number 5] [number 6] [number 7] [number 8] [number 9] [number 10] [number 11] [number 12] [number 13] [number 14] [number 15]',
-     '[keyword v8x16.swizzle]',
+     '[keyword i8x16.shuffle] [number 0] [number 1] [number 2] [number 3] [number 4] [number 5] [number 6] [number 7] [number 8] [number 9] [number 10] [number 11] [number 12] [number 13] [number 14] [number 15]',
+     '[keyword i8x16.swizzle]',
      '[keyword i8x16.splat]',
      '[keyword i16x8.splat]',
      '[keyword i32x4.splat]',
@@ -226,62 +226,90 @@
      '[keyword v128.or]',
      '[keyword v128.xor]',
      '[keyword v128.bitselect]',
+     '[keyword v128.any_true]',
+     '[keyword v128.load8_lane] [keyword offset]=[number 64] [keyword align]=[number 0] [number 1]',
+     '[keyword v128.load16_lane] [keyword offset]=[number 64] [keyword align]=[number 0] [number 1]',
+     '[keyword v128.load32_lane] [keyword offset]=[number 64] [keyword align]=[number 0] [number 1]',
+     '[keyword v128.load64_lane] [keyword offset]=[number 64] [keyword align]=[number 0] [number 1]',
+     '[keyword v128.store8_lane] [keyword offset]=[number 64] [keyword align]=[number 0] [number 1]',
+     '[keyword v128.store16_lane] [keyword offset]=[number 64] [keyword align]=[number 0] [number 1]',
+     '[keyword v128.store32_lane] [keyword offset]=[number 64] [keyword align]=[number 0] [number 1]',
+     '[keyword v128.store64_lane] [keyword offset]=[number 64] [keyword align]=[number 0] [number 1]',
+     '[keyword v128.load32_zero] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword v128.load64_zero] [keyword offset]=[number 64] [keyword align]=[number 0]',
+     '[keyword f32x4.demote_f64x2_zero]',
+     '[keyword f64x2.promote_low_f32x4]',
      '[keyword i8x16.abs]',
      '[keyword i8x16.neg]',
-     '[keyword i8x16.any_true]',
+     '[keyword i8x16.popcnt]',
      '[keyword i8x16.all_true]',
      '[keyword i8x16.bitmask]',
      '[keyword i8x16.narrow_i16x8_s]',
      '[keyword i8x16.narrow_i16x8_u]',
+     '[keyword f32x4.ceil]',
+     '[keyword f32x4.floor]',
+     '[keyword f32x4.trunc]',
+     '[keyword f32x4.nearest]',
      '[keyword i8x16.shl]',
      '[keyword i8x16.shr_s]',
      '[keyword i8x16.shr_u]',
      '[keyword i8x16.add]',
-     '[keyword i8x16.add_saturate_s]',
-     '[keyword i8x16.add_saturate_u]',
+     '[keyword i8x16.add_sat_s]',
+     '[keyword i8x16.add_sat_u]',
      '[keyword i8x16.sub]',
-     '[keyword i8x16.sub_saturate_s]',
-     '[keyword i8x16.sub_saturate_u]',
+     '[keyword i8x16.sub_sat_s]',
+     '[keyword i8x16.sub_sat_u]',
+     '[keyword f64x2.ceil]',
+     '[keyword f64x2.floor]',
      '[keyword i8x16.min_s]',
      '[keyword i8x16.min_u]',
      '[keyword i8x16.max_s]',
      '[keyword i8x16.max_u]',
+     '[keyword f64x2.trunc]',
      '[keyword i8x16.avgr_u]',
+     '[keyword i16x8.extadd_pairwise_i8x16_s]',
+     '[keyword i16x8.extadd_pairwise_i8x16_u]',
+     '[keyword i32x4.extadd_pairwise_i16x8_s]',
+     '[keyword i32x4.extadd_pairwise_i16x8_u]',
      '[keyword i16x8.abs]',
      '[keyword i16x8.neg]',
-     '[keyword i16x8.any_true]',
+     '[keyword i16x8.q15mulr_sat_s]',
      '[keyword i16x8.all_true]',
      '[keyword i16x8.bitmask]',
      '[keyword i16x8.narrow_i32x4_s]',
      '[keyword i16x8.narrow_i32x4_u]',
-     '[keyword i16x8.widen_low_i8x16_s]',
-     '[keyword i16x8.widen_high_i8x16_s]',
-     '[keyword i16x8.widen_low_i8x16_u]',
-     '[keyword i16x8.widen_high_i8x16_u]',
+     '[keyword i16x8.extend_low_i8x16_s]',
+     '[keyword i16x8.extend_high_i8x16_s]',
+     '[keyword i16x8.extend_low_i8x16_u]',
+     '[keyword i16x8.extend_high_i8x16_u]',
      '[keyword i16x8.shl]',
      '[keyword i16x8.shr_s]',
      '[keyword i16x8.shr_u]',
      '[keyword i16x8.add]',
-     '[keyword i16x8.add_saturate_s]',
-     '[keyword i16x8.add_saturate_u]',
+     '[keyword i16x8.add_sat_s]',
+     '[keyword i16x8.add_sat_u]',
      '[keyword i16x8.sub]',
-     '[keyword i16x8.sub_saturate_s]',
-     '[keyword i16x8.sub_saturate_u]',
+     '[keyword i16x8.sub_sat_s]',
+     '[keyword i16x8.sub_sat_u]',
+     '[keyword f64x2.nearest]',
      '[keyword i16x8.mul]',
      '[keyword i16x8.min_s]',
      '[keyword i16x8.min_u]',
      '[keyword i16x8.max_s]',
      '[keyword i16x8.max_u]',
      '[keyword i16x8.avgr_u]',
+     '[keyword i16x8.extmul_low_i8x16_s]',
+     '[keyword i16x8.extmul_high_i8x16_s]',
+     '[keyword i16x8.extmul_low_i8x16_u]',
+     '[keyword i16x8.extmul_high_i8x16_u]',
      '[keyword i32x4.abs]',
      '[keyword i32x4.neg]',
-     '[keyword i32x4.any_true]',
      '[keyword i32x4.all_true]',
      '[keyword i32x4.bitmask]',
-     '[keyword i32x4.widen_low_i16x8_s]',
-     '[keyword i32x4.widen_high_i16x8_s]',
-     '[keyword i32x4.widen_low_i16x8_u]',
-     '[keyword i32x4.widen_high_i16x8_u]',
+     '[keyword i32x4.extend_low_i16x8_s]',
+     '[keyword i32x4.extend_high_i16x8_s]',
+     '[keyword i32x4.extend_low_i16x8_u]',
+     '[keyword i32x4.extend_high_i16x8_u]',
      '[keyword i32x4.shl]',
      '[keyword i32x4.shr_s]',
      '[keyword i32x4.shr_u]',
@@ -292,13 +320,35 @@
      '[keyword i32x4.min_u]',
      '[keyword i32x4.max_s]',
      '[keyword i32x4.max_u]',
+     '[keyword i32x4.dot_i16x8_s]',
+     '[keyword i32x4.extmul_low_i16x8_s]',
+     '[keyword i32x4.extmul_high_i16x8_s]',
+     '[keyword i32x4.extmul_low_i16x8_u]',
+     '[keyword i32x4.extmul_high_i16x8_u]',
+     '[keyword i64x2.abs]',
      '[keyword i64x2.neg]',
+     '[keyword i64x2.all_true]',
+     '[keyword i64x2.bitmask]',
+     '[keyword i64x2.extend_low_i32x4_s]',
+     '[keyword i64x2.extend_high_i32x4_s]',
+     '[keyword i64x2.extend_low_i32x4_u]',
+     '[keyword i64x2.extend_high_i32x4_u]',
      '[keyword i64x2.shl]',
      '[keyword i64x2.shr_s]',
      '[keyword i64x2.shr_u]',
      '[keyword i64x2.add]',
      '[keyword i64x2.sub]',
      '[keyword i64x2.mul]',
+     '[keyword i64x2.eq]',
+     '[keyword i64x2.ne]',
+     '[keyword i64x2.lt_s]',
+     '[keyword i64x2.gt_s]',
+     '[keyword i64x2.le_s]',
+     '[keyword i64x2.ge_s]',
+     '[keyword i64x2.extmul_low_i32x4_s]',
+     '[keyword i64x2.extmul_high_i32x4_s]',
+     '[keyword i64x2.extmul_low_i32x4_u]',
+     '[keyword i64x2.extmul_high_i32x4_u]',
      '[keyword f32x4.abs]',
      '[keyword f32x4.neg]',
      '[keyword f32x4.sqrt]',
@@ -320,7 +370,11 @@
      '[keyword i32x4.trunc_sat_f32x4_s]',
      '[keyword i32x4.trunc_sat_f32x4_u]',
      '[keyword f32x4.convert_i32x4_s]',
-     '[keyword f32x4.convert_i32x4_u]');
+     '[keyword f32x4.convert_i32x4_u]',
+     '[keyword i32x4.trunc_sat_f64x2_s_zero]',
+     '[keyword i32x4.trunc_sat_f64x2_u_zero]',
+     '[keyword f64x2.convert_low_i32x4_s]',
+     '[keyword f64x2.convert_low_i32x4_u]');
 
      MT('reference-type-instructions',
      '[keyword ref.null] [keyword extern]',
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 4a349ba91e..9bddc88787 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -65,20 +65,25 @@ var kKeywords = [
     "i64\.atomic\\.(load32_u|store32|rmw32\\.(a[dn]d|sub|x?or|(cmp)?xchg)_u)",
     "i(32|64)\\.atomic\\.(load((8|16)_u)?|store(8|16)?|rmw(\\.(a[dn]d|sub|x?or|(cmp)?xchg)|(8|16)\\.(a[dn]d|sub|x?or|(cmp)?xchg)_u))",
     // SIMD.
-    "v128\.(load|store|const|not|andnot|and|or|xor|bitselect)",
-    "i(8x16|16x8|32x4|64x2)\\.(shl|shr_[su])",
-    "i(8x16|16x8)\\.(extract_lane_[su]|((add|sub)_saturate_[su])|avgr_u)",
-    "(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane|neg|add|sub)",
-    "i(8x16|16x8|32x4)\.(eq|ne|([lg][te]_[su])|abs|any_true|all_true|bitmask|((min|max)_[su]))",
-    "f(32x4|64x2)\\.(eq|ne|[lg][te]|abs|sqrt|mul|div|min|max)",
+    "v128\\.load(8x8|16x4|32x2)_[su]",
+    "v128\\.load(8|16|32|64)_splat",
+    "v128\\.(load|store)(8|16|32|64)_lane",
+    "v128\\.load(32|64)_zero",
+    "v128\.(load|store|const|not|andnot|and|or|xor|bitselect|any_true)",
+    "i(8x16|16x8)\\.(extract_lane_[su]|(add|sub)_sat_[su]|avgr_u)",
+    "i(8x16|16x8|32x4|64x2)\\.(neg|add|sub|abs|shl|shr_[su]|all_true|bitmask|eq|ne|[lg][te]_s)",
+    "(i(8x16|16x8|32x4|64x2)|f(32x4|64x2))\.(splat|replace_lane)",
+    "i(8x16|16x8|32x4)\\.(([lg][te]_u)|((min|max)_[su]))",
+    "f(32x4|64x2)\\.(neg|add|sub|abs|nearest|eq|ne|[lg][te]|sqrt|mul|div|min|max|ceil|floor|trunc)",
     "[fi](32x4|64x2)\\.extract_lane",
-    "v8x16\\.(shuffle|swizzle)",
-    "i16x8\\.(load8x8_[su]|narrow_i32x4_[su]|widen_(low|high)_i8x16_[su]|mul)",
-    "i32x4\\.(load16x4_[su]|widen_(low|high)_i16x8_[su]|mul|trunc_sat_f32x4_[su])",
-    "i64x2\\.(load32x2_[su]|mul)",
-    "(v(8x16|16x8|32x4|64x2)\.load_splat)",
-    "i8x16\\.narrow_i16x8_[su]",
-    "f32x4\\.convert_i32x4_[su]",
+    "i8x16\\.(shuffle|swizzle|popcnt|narrow_i16x8_[su])",
+    "i16x8\\.(narrow_i32x4_[su]|mul|extadd_pairwise_i8x16_[su]|q15mulr_sat_s)",
+    "i16x8\\.(extend|extmul)_(low|high)_i8x16_[su]",
+    "i32x4\\.(mul|dot_i16x8_s|trunc_sat_f64x2_[su]_zero)",
+    "i32x4\\.((extend|extmul)_(low|high)_i16x8_|trunc_sat_f32x4_|extadd_pairwise_i16x8_)[su]",
+    "i64x2\\.(mul|(extend|extmul)_(low|high)_i32x4_[su])",
+    "f32x4\\.(convert_i32x4_[su]|demote_f64x2_zero)",
+    "f64x2\\.(promote_low_f32x4|convert_low_i32x4_[su])",
     // Reference types, function references, and GC.
     "\\bany\\b",
     "array\\.len",

From ae2114a90b0d7a55c12f9031eb6c9ad3a637884c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 7 Mar 2021 12:46:26 +0100
Subject: [PATCH 4441/4742] [crystal mode] Allow underscore separators in
 numbers

Closes #6616
---
 mode/crystal/crystal.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/crystal/crystal.js b/mode/crystal/crystal.js
index 5c601c6ab3..14dea98e2d 100644
--- a/mode/crystal/crystal.js
+++ b/mode/crystal/crystal.js
@@ -194,17 +194,17 @@
       // Numbers
       if (stream.eat("0")) {
         if (stream.eat("x")) {
-          stream.match(/^[0-9a-fA-F]+/);
+          stream.match(/^[0-9a-fA-F_]+/);
         } else if (stream.eat("o")) {
-          stream.match(/^[0-7]+/);
+          stream.match(/^[0-7_]+/);
         } else if (stream.eat("b")) {
-          stream.match(/^[01]+/);
+          stream.match(/^[01_]+/);
         }
         return "number";
       }
 
       if (stream.eat(/^\d/)) {
-        stream.match(/^\d*(?:\.\d+)?(?:[eE][+-]?\d+)?/);
+        stream.match(/^[\d_]*(?:\.[\d_]+)?(?:[eE][+-]?\d+)?/);
         return "number";
       }
 

From 769daa520d9a54f8df260c8d839dd7b6c457d5a4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 9 Mar 2021 14:42:12 +0100
Subject: [PATCH 4442/4742] [mode/simple addon] Fix null dereference error on
 empty sub-matches

Closes #6618
---
 addon/mode/simple.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index 655f991475..a1c626417a 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -137,10 +137,9 @@
           var token = rule.token
           if (token && token.apply) token = token(matches)
           if (matches.length > 2 && rule.token && typeof rule.token != "string") {
-            state.pending = [];
             for (var j = 2; j < matches.length; j++)
               if (matches[j])
-                state.pending.push({text: matches[j], token: rule.token[j - 1]});
+                (state.pending || (state.pending = [])).push({text: matches[j], token: rule.token[j - 1]});
             stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
             return token[0];
           } else if (token && token.join) {

From aad4fc3f2a30e025d8f767fe65b03c8beb6f8bce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 12 Mar 2021 17:48:11 +0100
Subject: [PATCH 4443/4742] [javascript mode] Improve handling of readonly type
 modifier in TS

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index fbbeaa5a7a..a42f23d07f 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -605,7 +605,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     }
   }
   function typeexpr(type, value) {
-    if (value == "keyof" || value == "typeof" || value == "infer") {
+    if (value == "keyof" || value == "typeof" || value == "infer" || value == "readonly") {
       cx.marked = "keyword"
       return cont(value == "typeof" ? expressionNoComma : typeexpr)
     }

From a85e9267cc3091fe6cb594abf4fe87c47f9d8b39 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 13 Mar 2021 14:21:45 +0100
Subject: [PATCH 4444/4742] Add Cargo sponsor logo

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

diff --git a/index.html b/index.html
index 37933a30ff..a4a78eaabd 100644
--- a/index.html
+++ b/index.html
@@ -211,6 +211,7 @@ <h2>Sponsors</h2>
     <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>
     <li><a href="https://www.desmos.com/"><img src='data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="%23187a3d"%3E%3Cpath d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/%3E%3Cpath d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/%3E%3C/svg%3E%0A' alt=desmos></a></li>
     <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='data:image/svg+xml,%3Csvg%20width%3D%22397%22%20height%3D%22109%22%20viewBox%3D%220%200%20397%20109%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20fill-rule%3D%22nonzero%22%20fill%3D%22none%22%3E%3Cpath%20d%3D%22M169.495%2063.68c2.8%200%205.254.671%207.36%202.015%202.105%201.344%203.688%203.162%204.751%205.453%201.063%202.292%201.594%204.878%201.594%207.76%200%204.408-1.241%208.054-3.724%2010.935-2.483%202.881-5.81%204.322-9.98%204.322-3.953%200-7.18-1.402-9.683-4.206v12.62c0%20.271-.085.489-.254.653a.88.88%200%200%201-.64.247h-4.767a.966.966%200%200%201-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932%200%200%201%20.656-.247h4.767a.88.88%200%200%201%20.64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268%205.006-4.902%209.057-4.902zm-.84%2024.874c2.752%200%204.865-.86%206.34-2.578%201.473-1.719%202.21-4.034%202.21-6.947%200-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576%200-4.625.855-6.148%202.563-1.524%201.71-2.285%203.986-2.285%206.831s.761%205.141%202.285%206.89c1.523%201.747%203.572%202.62%206.148%202.62zm39.147-24.875c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm31.331%2030.845c-4.25%200-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05%204.298-10.999c2.866-2.948%206.423-4.423%2010.673-4.423%202.788%200%205.332.674%207.632%202.021%202.3%201.348%204.103%203.203%205.41%205.566%201.306%202.363%201.959%204.975%201.959%207.835%200%202.861-.653%205.468-1.96%207.821-1.306%202.353-3.109%204.209-5.41%205.566-2.3%201.357-4.843%202.036-7.63%202.036zm-6.43-8.608c1.7%201.759%203.847%202.638%206.445%202.638%202.597%200%204.745-.88%206.444-2.638%201.698-1.759%202.547-4.03%202.547-6.814%200-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598%200-4.746.88-6.444%202.638-1.699%201.758-2.548%204.03-2.548%206.815%200%202.784.85%205.055%202.548%206.814zm55.522-21.623c.272%200%20.487.082.642.248.156.165.234.384.234.657v27.976c0%201.772-.302%203.373-.906%204.804-.603%201.431-1.402%202.6-2.395%203.504-.993.906-2.157%201.67-3.49%202.293a16.713%2016.713%200%200%201-4.076%201.314c-1.383.253-2.814.38-4.294.38-2.337%200-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652%201.198-.38%202.707%201.46%205.735%202.19%209.085%202.19%201.169%200%202.293-.116%203.374-.35%201.074-.23%202.107-.62%203.068-1.153a6.016%206.016%200%200%200%202.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513%203.154-5.726%204.731-9.64%204.731-2.688%200-5.132-.676-7.333-2.03a13.905%2013.905%200%200%201-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534%200-2.726.604-5.237%201.811-7.534%201.208-2.298%202.907-4.123%205.098-5.476%202.19-1.353%204.64-2.03%207.347-2.03%203.856%200%207.03%201.548%209.523%204.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596%2023.266c2.408%200%204.424-.894%206.045-2.68%201.622-1.788%202.433-3.898%202.433-6.332%200-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428%200-4.452.86-6.074%202.581-1.622%201.72-2.433%203.826-2.433%206.317%200%202.529.811%204.663%202.433%206.402%201.621%201.74%203.646%202.61%206.074%202.61zm40.073-23.88c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm46.24%2024.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0%20.626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493%201.682-3.399%203.008-5.717%203.976-2.318.968-4.577%201.453-6.778%201.453-3.241%200-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149%200-2.621.835-4.656%202.504-6.104%201.67-1.448%204.214-2.416%207.633-2.906l6.984-1.085c1.355-.196%202.347-.401%202.976-.617.629-.215%201.041-.479%201.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302%200-6.65%201.36-7.043%204.079-.059.45-.353.665-.884.646h-4.48c-.647%200-.942-.304-.883-.91.334-3.326%201.66-5.713%203.978-7.161%202.318-1.448%205.452-2.172%209.4-2.172%204.224%200%207.392.959%209.504%202.876%202.112%201.918%203.168%204.706%203.168%208.364v11.035c-.02%201.35.707%202.172%202.18%202.466zm-19.06.135c4.132%200%207.518-1.307%2010.16-3.922v-6.028c-.258.566-1.53%201.024-3.814%201.375l-6.375.995c-1.728.274-2.96.742-3.695%201.405-.735.663-1.102%201.512-1.102%202.546%200%201.132.397%202.02%201.192%202.663.794.644%202.006.966%203.635.966zm48.252-24.875c2.377%200%204.116.796%205.216%202.386%201.1%201.59%201.65%204.248%201.65%207.971v18.59c0%20.272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948%200%200%201-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042%200-1.886.403-2.535%201.207a5.452%205.452%200%200%200-1.178%202.75v19.463c0%20.271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275%200-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04%200-1.88.398-2.52%201.193a5.675%205.675%200%200%200-1.193%202.764v19.463c0%20.271-.083.49-.25.654a.864.864%200%200%201-.634.248h-4.273c-.275%200-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57%200%20.874.3.914.902l.147%202.386h.442c.943-2.619%202.898-3.928%205.864-3.928%202.849%200%204.745%201.31%205.688%203.928h.353c1.061-2.619%202.986-3.928%205.776-3.928zM162.091%2016.126c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.694-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123%2022.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47%200-.824-.162-1.06-.488l-8.592-10.002-8.592%2010.002c-.255.326-.618.488-1.089.488h-5.532c-.373%200-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47%200%20.833.172%201.088.517l7.798%209.082%207.798-9.082c.255-.325.618-.498%201.089-.517h5.473c.373%200%20.618.105.736.316.117.21.059.46-.177.747l-11.152%2012.933%2011.976%2013.795zm14.101-26.59c1.86-.801%203.86-1.201%206-1.201%202.142%200%204.113.395%205.915%201.186%201.801.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.122%202.04-.364%202.549-.242.507-.76.761-1.554.761H230.41c.329%202.285%201.385%204.106%203.167%205.463%201.782%201.357%204.01%202.036%206.684%202.036%202.693%200%205.134-.84%207.323-2.52.465-.35.882-.341%201.25.03l1.947%201.992c.465.469.465.918%200%201.347-2.984%203.008-6.713%204.511-11.189%204.511-4.572%200-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.118-6.048.746-1.885%201.764-3.516%203.052-4.892%201.288-1.377%202.852-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.203.718-5.767%202.154-1.566%201.437-2.503%203.372-2.812%205.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83%2019.894c3.133%200%205.619-1.191%207.457-3.574.348-.45.745-.527%201.19-.234l3.394%201.962c.542.332.639.733.29%201.201-1.315%202.012-3.06%203.618-5.237%204.819-2.176%201.2-4.58%201.801-7.21%201.801-4.392%200-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05%204.367-11c2.912-2.948%206.563-4.422%2010.954-4.422%202.631%200%205.04.595%207.225%201.787%202.186%201.19%203.927%202.792%205.224%204.803.328.47.232.87-.29%201.202l-3.396%201.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67%200-4.88.884-6.63%202.651-1.75%201.768-2.626%204.033-2.626%206.796s.875%205.028%202.626%206.796c1.75%201.767%203.96%202.65%206.63%202.65zm46.585-24.87c.276%200%20.499.083.666.248.168.165.252.383.252.654v27.379c0%20.271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573%200-.88-.3-.919-.901l-.237-3.953h-.652c-1.007%201.608-2.35%202.93-4.03%203.968-1.68%201.036-3.674%201.554-5.986%201.554-3.26%200-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276%200%20.499.082.666.247.168.165.252.383.252.654v15.956c0%202.403.583%204.18%201.749%205.334%201.165%201.153%202.785%201.73%204.86%201.73%201.343%200%202.573-.258%203.689-.771s1.99-1.129%202.623-1.846c.632-.717%201.116-1.4%201.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595%2024.474c.353.446.382.852.088%201.22-.882%201.047-2.172%202.001-3.868%202.863-1.697.862-3.731%201.293-6.104%201.293-8.002%200-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885%200%200%201-.647-.261.864.864%200%200%201-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255%200%20.466.078.633.233.166.154.25.368.25.639l-.02%209.285h11.943c.255%200%20.466.082.632.247.167.164.25.382.25.654v3.603a.89.89%200%200%201-.25.64.837.837%200%200%201-.632.261H345.36v11.741c0%201.337.18%202.465.544%203.386.363.92.873%201.613%201.53%202.077a6.487%206.487%200%200%200%202.059.989c.716.193%201.534.29%202.456.29%201.98%200%203.824-.668%205.53-2.005.452-.426.873-.407%201.265.058l2%202.325zm15.146-23.272c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z%22%20fill%3D%22%23FFF%22%2F%3E%3Cpath%20d%3D%22M102.022%2037.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87%201.87%200%200%201-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87%201.87%200%200%201%2082.511%200h26.297c1.171%200%202.312.1%203.423.303%201.11.201%202.282.615%203.514%201.24a11.807%2011.807%200%200%201%203.212%202.36c.909.949%201.646%202.23%202.211%203.844.566%201.613.849%203.47.849%205.568v23.421c.04%201.09.262%201.877.666%202.36l12.18%2014.102c.645.767.605%201.594-.122%202.481l-12.058%2013.799c-.444.484-.666%201.271-.666%202.36V95.14c0%202.622-.414%204.852-1.243%206.688-.828%201.835-1.938%203.207-3.332%204.115-1.394.908-2.787%201.553-4.18%201.937-1.394.383-2.879.575-4.454.575H82.51c-.525%200-.97-.162-1.333-.485a1.716%201.716%200%200%201-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87%201.87%200%200%201%201.333-.515H97.66c2.908%200%204.363-1.25%204.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217%200%200%200%200-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083%2053.15a1.523%201.523%200%200%201%200%202.154l-23.85%2023.849a1.523%201.523%200%200%201-2.153%200l-23.85-23.85a1.523%201.523%200%200%201%200-2.153L67.08%2029.3a1.523%201.523%200%200%201%202.154%200zm-35.937%208.585c0%201.009-.243%201.735-.728%202.18L19.26%2054.258a.217.217%200%200%200%200%20.298L32.57%2068.51c.485.484.728%201.23.728%202.24v18.337c0%202.501%201.454%203.752%204.362%203.752h15.148c.525%200%20.97.172%201.333.515.364.343.584.797.584%201.361v11.923c0%20.565-.22%201.009-.584%201.331-.363.323-.808.485-1.333.485H26.511c-1.576%200-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577%2055.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614%201.303-2.895%202.211-3.843a11.807%2011.807%200%200%201%203.212-2.36C20.805.917%2021.976.503%2023.087.302A19.123%2019.123%200%200%201%2026.511%200h26.296c.525%200%20.97.171%201.333.515.364.342.584.796.584%201.361v11.862c0%20.525-.22.959-.584%201.301a1.87%201.87%200%200%201-1.333.515H37.66c-2.908%200-4.362%201.291-4.362%203.873v18.459z%22%20fill%3D%22%234547E0%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E' alt="Execute Program"></a></li>
+    <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='data:image/svg+xml;utf8,<svg width="3311" height="1605" viewBox="400 0 3311 1605" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1133 1602C1182 1602 1191 1602 1189 1579C1153 1301 1125 1076 1098 855L1098 855C1067 601 1037 354 995 41C991 2 973 0 916 0C865 0 854 2 849 34C824 242 798 437 772 636L772 636L772 636L772 636L772 636C734 928 695 1227 653 1581C651 1602 681 1602 715 1602C721 1602 726 1602 732 1602C791 1602 809 1602 811 1579C822 1446 833 1334 847 1206C849 1185 868 1185 905 1186C908 1186 912 1186 916 1186C919 1186 922 1186 925 1186C957 1185 984 1185 986 1206C996 1272 1004 1335 1013 1399L1013 1399C1020 1456 1028 1514 1036 1574C1040 1602 1050 1602 1097 1602C1103 1602 1110 1602 1118 1602C1124 1602 1128 1602 1133 1602ZM264 1602C451 1602 528 1478 528 1334V1195C528 1175 509 1176 470 1176L470 1176C463 1176 455 1177 446 1177C405 1177 376 1177 376 1195V1330C376 1391 342 1448 264 1448C180 1448 148 1387 148 1323V265C148 212 193 143 264 143C332 143 376 217 376 267V374C376 400 403 400 443 399H443H443H443H443H443C447 399 450 399 453 399C494 399 528 397 528 374V271C528 173 453 2 264 2C86 2 0 148 0 271V1336C0 1458 86 1602 264 1602ZM968 1042C959 928 953 837 946 746C942 681 937 615 931 539C931 530 929 514 916 514C904 514 902 530 902 537C896 625 890 707 885 784L885 784C879 874 874 958 868 1039C865 1055 886 1060 918 1060C945 1060 970 1060 968 1042ZM1784 1602C1845 1602 1861 1602 1861 1565V996C1861 992 1861 988 1861 984C1861 936 1861 903 1836 852C1812 804 1767 783 1743 771C1733 766 1727 763 1727 761C1727 758 1734 754 1744 748C1768 736 1810 713 1834 669C1859 623 1859 586 1859 537V537C1859 533 1859 529 1859 525V319C1859 239 1843 146 1775 82C1706 20 1608 2 1535 2H1405C1401 2 1397 1 1393 1C1379 0 1367 -0 1353 11C1339 25 1337 50 1337 73V1570C1337 1602 1353 1602 1405 1602C1474 1602 1483 1602 1483 1565V873C1483 838 1495 838 1586 838H1586H1586L1586 838C1591 838 1597 838 1604 838C1654 838 1715 895 1715 989V1570C1715 1602 1729 1602 1774 1602C1777 1602 1780 1602 1784 1602ZM1711 537V319C1711 267 1702 228 1663 187C1638 164 1624 153 1542 153C1521 153 1501 153 1492 169C1485 182 1485 194 1485 207V635C1485 639 1485 643 1485 648V648V648V648C1484 668 1483 687 1499 699C1510 709 1524 708 1535 708C1536 708 1538 708 1540 708C1565 708 1624 701 1665 658C1711 607 1711 569 1711 537ZM2588 1557L2588 1557C2588 1555 2588 1553 2588 1551V790C2588 788 2589 784 2589 781C2591 773 2592 764 2586 763C2569 760 2496 762 2429 763C2393 764 2359 765 2337 765C2321 765 2319 786 2319 836C2319 884 2321 902 2339 902C2345 902 2352 902 2360 901C2384 900 2414 898 2426 907C2436 915 2436 926 2435 936L2435 936C2435 937 2435 938 2435 938C2435 939 2435 940 2435 941V1334C2435 1382 2412 1453 2323 1453C2232 1453 2207 1384 2207 1327V265C2207 217 2253 143 2323 143C2392 143 2435 217 2435 267C2435 283 2436 303 2436 323C2437 343 2437 363 2437 379C2437 399 2451 402 2508 402C2570 402 2588 395 2588 374V271C2588 189 2524 2 2323 2C2118 2 2059 182 2059 271V1336C2059 1442 2130 1602 2323 1602C2393 1602 2429 1567 2452 1545C2466 1531 2476 1522 2485 1528C2503 1540 2508 1560 2512 1576C2516 1589 2518 1599 2526 1599C2534 1599 2541 1601 2547 1602C2559 1605 2569 1607 2577 1599C2589 1587 2588 1572 2588 1557ZM3310 1316C3310 1464 3249 1602 3046 1602C2856 1602 2781 1464 2781 1316V281C2781 109 2897 2 3046 2C3196 2 3310 121 3310 281V1316ZM3160 281V1309C3160 1373 3137 1448 3046 1448C2943 1448 2929 1375 2929 1309V281C2929 217 2977 143 3046 143C3112 143 3160 217 3160 281Z" fill="black"/></svg>'
   </ul>
 </section>
 

From f9478b23fdb82564d1fe7df3a37ad22d46476330 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Mar 2021 22:00:28 +0100
Subject: [PATCH 4445/4742] Update Observable logo in sponsor list

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

diff --git a/index.html b/index.html
index a4a78eaabd..a26965d700 100644
--- a/index.html
+++ b/index.html
@@ -205,7 +205,7 @@ <h2>Browser support</h2>
   <h2>Sponsors</h2>
   <p>These companies support development of this project:</p>
   <ul class=sponsor-list>
-    <li><a href="http://observablehq.com/"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 28" height="120" fill="currentColor" color="black"><path d="M12.5 22.667c-1.154 0-2.154-.252-3-.754a5.091 5.091 0 01-1.945-2.048 10.801 10.801 0 01-.991-2.741A14.747 14.747 0 016.25 14c0-.83.054-1.624.164-2.382.108-.758.309-1.529.602-2.31a7.37 7.37 0 011.129-2.035 5.118 5.118 0 011.807-1.401c.746-.36 1.594-.539 2.548-.539 1.154 0 2.154.252 3 .754.843.501 1.517 1.21 1.945 2.048.452.861.782 1.775.991 2.741.209.965.314 2.007.314 3.124a16.7 16.7 0 01-.163 2.382 10.63 10.63 0 01-.615 2.31c-.302.782-.677 1.46-1.13 2.035-.451.575-1.05 1.042-1.794 1.401-.745.36-1.594.539-2.548.539zm2.206-6.373c.598-.6.93-1.43.919-2.294 0-.893-.299-1.658-.896-2.294-.598-.637-1.34-.956-2.229-.956s-1.631.319-2.23.956A3.236 3.236 0 009.376 14c0 .893.299 1.658.896 2.294.598.637 1.34.956 2.229.956s1.624-.319 2.206-.956zM12.5 27C19.403 27 25 21.18 25 14S19.403 1 12.5 1 0 6.82 0 14s5.597 13 12.5 13z"/></svg>'>Observable</a></li>
+    <li><a href="http://observablehq.com/"><img alt="Observable" src='data:image/svg+xml;utf8,<svg viewBox="-3 0 171 28" width="350" height="57" fill="black" xmlns="http://www.w3.org/2000/svg"><path d="M12.5 22.66c-1.15 0-2.15-.25-3-.75a5.09 5.09 0 01-1.94-2.04 10.80 10.80 0 01-.99-2.74A14.74 14.74 0 016.25 14c0-.83.05-1.62.16-2.38.10-.75.30-1.52.60-2.31a7.37 7.37 0 011.12-2.03 5.11 5.11 0 011.80-1.40c.74-.36 1.59-.53 2.54-.53 1.15 0 2.15.25 3 .75.84.50 1.51 1.21 1.94 2.04.45.86.78 1.77.99 2.74.20.96.31 2.00.31 3.12a16.7 16.7 0 01-.16 2.38 10.63 10.63 0 01-.61 2.31c-.30.78-.67 1.46-1.13 2.03-.45.57-1.05 1.04-1.79 1.40-.74.36-1.59.53-2.54.53zm2.20-6.37c.59-.6.93-1.43.91-2.29 0-.89-.29-1.65-.89-2.29-.59-.63-1.34-.95-2.22-.95s-1.63.31-2.23.95A3.23 3.23 0 009.37 14c0 .89.29 1.65.89 2.29.59.63 1.34.95 2.22.95s1.62-.31 2.20-.95zM12.5 27C19.40 27 25 21.18 25 14S19.40 1 12.5 1 0 6.82 0 14s5.59 13 12.5 13z"/><g transform="translate(30, -3.5)"><path d="M6.41 17.75c0 1.09.05 2.09.15 2.98.11.87.29 1.62.53 2.25.23.62.54 1.11.91 1.46.37.33.82.50 1.36.50.54 0 .99-.17 1.36-.50.37-.35.67-.84.91-1.46.23-.62.40-1.37.50-2.25.11-.89.17-1.89.17-2.98 0-1.08-.06-2.06-.17-2.96-.10-.89-.27-1.65-.50-2.27-.23-.64-.54-1.13-.91-1.46-.37-.35-.82-.53-1.36-.53s-.99.17-1.36.53c-.37.33-.67.82-.91 1.46-.23.62-.41 1.38-.53 2.27-.10.89-.15 1.88-.15 2.96zm2.96-8.75c1.06 0 2.08.17 3.06.53a7.36 7.36 0 012.60 1.62c.76.72 1.35 1.63 1.79 2.73.45 1.09.68 2.38.68 3.87 0 1.48-.22 2.77-.68 3.87-.43 1.09-1.03 2.00-1.79 2.73a7.07 7.07 0 01-2.60 1.62 8.92 8.92 0 01-3.06.53 9.14 9.14 0 01-3.08-.53 7.36 7.36 0 01-2.60-1.62c-.74-.72-1.34-1.63-1.79-2.73-.43-1.09-.65-2.38-.65-3.87 0-1.48.21-2.77.65-3.87.45-1.09 1.06-2.00 1.82-2.73a7.36 7.36 0 012.60-1.62 8.92 8.92 0 013.06-.53zm9.32 17.03v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40.60.27 1.13.67 1.59 1.21.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.05.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.62-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.62-.91-.40 0-.8.12-1.18.38v7.46c.33.23.73.35 1.19.35zm13.10 2.42c-1.75 0-3.30-.41-4.65-1.24l.12-3.23h2.30l.40 2.63c.28.11.57.21.86.27.30.05.62.07.96.07.64 0 1.13-.09 1.49-.27.35-.20.53-.54.53-1.03 0-.33-.13-.63-.40-.88-.25-.27-.80-.52-1.64-.76l-1.44-.37c-1.01-.27-1.78-.74-2.30-1.41-.50-.67-.75-1.51-.75-2.50 0-.62.11-1.20.35-1.74a3.95 3.95 0 011.08-1.39c.48-.38 1.08-.69 1.77-.91.71-.22 1.51-.33 2.43-.33.77 0 1.49.08 2.15.25.65.16 1.34.42 2.05.75l-.20 2.85H41.75l-.55-2.25a4.91 4.91 0 00-.55-.07 3.89 3.89 0 00-.68-.05c-.48 0-.89.11-1.21.32-.32.20-.48.52-.48.96 0 .13.02.27.07.40.05.11.14.24.27.38a4.3 4.3 0 00.60.37c.27.11.62.23 1.06.35l1.41.38c1.18.32 2.02.81 2.53 1.49.52.65.78 1.49.78 2.50 0 .74-.14 1.39-.43 1.94a3.84 3.84 0 01-1.21 1.39c-.52.37-1.15.64-1.89.83-.74.18-1.57.27-2.50.27zM52.83 13.27c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.85 4.85 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63H51.11c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.07 5.07 0 001.24-.86l.98.96c-.54 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.29.70a7.82 7.82 0 01-2.63-.43 6.19 6.19 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.57-2.05a6.61 6.61 0 012.2-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.17.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.19c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53zM59.31 26v-1.29l1.21-.27c.01-.60.02-1.24.02-1.92V19.09v-.88c0-.23-.00-.45-.02-.65 0-.20-.00-.39-.02-.58 0-.20-.00-.43-.02-.68l-1.36-.22v-1.03l5.59-1.74.45.27.20 2.91c.33-1.08.81-1.88 1.44-2.40.64-.52 1.26-.78 1.87-.78.62 0 1.14.18 1.56.55.43.35.7.92.78 1.69-.03.69-.23 1.22-.60 1.59-.37.37-.81.55-1.31.55-.42 0-.80-.11-1.13-.32-.32-.21-.64-.57-.98-1.06l-.12-.17c-.30.33-.60.77-.91 1.31a5.62 5.62 0 00-.58 1.67V22.40c0 .65.00 1.28.02 1.87l1.97.43V26h-8.04zm19.93 0h-2.27l-4.50-10.88-1.21-.25v-1.19h7.61v1.19l-1.34.30 2.1 5.79 1.94-5.82-1.39-.27v-1.19h4.75v1.19l-1.51.25L79.25 26zm11.35-1.79c.32 0 .67-.14 1.06-.43v-4.2c-.25.06-.49.16-.73.27a2.55 2.55 0 00-.55.35 2.97 2.97 0 00-.53.50 2.36 2.36 0 00-.40.73c-.1.27-.15.57-.15.91 0 .62.12 1.08.38 1.39.25.30.56.45.93.45zm4.17 2.20c-.81 0-1.45-.15-1.92-.45-.47-.30-.81-.75-1.03-1.34-.25.27-.49.51-.73.73-.22.22-.47.41-.75.58-.27.15-.57.27-.91.35a4.94 4.94 0 01-1.19.12c-1.01 0-1.81-.27-2.40-.83-.59-.57-.88-1.38-.88-2.43 0-.48.07-.93.22-1.34.15-.42.42-.81.81-1.16.40-.35.93-.68 1.59-.98.67-.30 1.52-.59 2.55-.86l.70-.17c.27-.06.54-.14.83-.22v-.91c0-.54-.02-.98-.07-1.34-.05-.37-.15-.66-.30-.88a1.05 1.05 0 00-.58-.45c-.23-.10-.55-.15-.96-.15h-.38v.86c0 1.03-.21 1.76-.63 2.20-.42.42-.90.63-1.44.63-1.03 0-1.67-.45-1.92-1.36 0-1.09.51-1.98 1.54-2.65 1.04-.69 2.59-1.03 4.63-1.03.87 0 1.62.09 2.22.27.60.18 1.09.48 1.46.88.38.38.66.89.83 1.51.16.62.25 1.36.25 2.22v5.79c0 .28.14.43.43.43a.54.54 0 00.30-.10c.1-.06.22-.22.38-.45l.73.40c-.30.77-.71 1.33-1.24 1.67-.52.32-1.24.48-2.15.48zm3.89-.38v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40a4.42 4.42 0 011.59 1.21c.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.04.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.61-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.61-.91-.40 0-.80.12-1.19.38v7.46c.33.23.73.35 1.19.35zm8.40-15.08l5.84-1.13.43.27-.10 3.51v11.03l.05 1.89 1.13.22V26h-7.18v-1.29l1.13-.25a70.7 70.7 0 00.02-1.87c.01-.62.02-1.25.02-1.89v-10.4l-1.36-.25V8.89zm15.30 4.37c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.84 4.84 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63h-7.03c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.09 5.09 0 001.24-.86l.98.96c-.53 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.28.70a7.83 7.83 0 01-2.63-.43 6.18 6.18 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.56-2.05a6.61 6.61 0 012.20-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.16.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.18c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53z"/></g></svg>'></a></li>
     <li><a href="https://holmusk.com"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" style="background: %231649BF"><g transform="translate(-780, -40)" fill="%23FFFFFF"><path d="M780,4 L840,4 L840,1 L780,1 L780,4 Z M794,55 L794,84.65 L796.806,84.65 L796.806,72.739 C796.806,69.633 799.325,67.104 802.420,67.104 C805.516,67.104 808.031,69.633 808.031,72.739 L808.031,84.65 L810.838,84.65 L810.838,72.739 C810.838,68.077 807.062,64.288 802.420,64.288 C800.271,64.288 798.311,65.106 796.819,66.447 L796.819,55 L794,55 Z M817.582,63.931 C815.372,63.931 813.367,64.798 811.862,66.199 L812.163,66.653 C812.613,67.33 812.972,68.051 813.248,68.805 C814.281,67.549 815.840,66.746 817.582,66.746 C820.674,66.746 823.193,69.276 823.193,72.382 L823.193,72.385 L823.193,84.293 L826,84.293 L826,72.385 L826,72.379 C826,70.658 825.483,69.057 824.598,67.72 L824.598,67.723 C824.537,67.629 824.473,67.543 824.409,67.452 C824.345,67.365 824.280,67.278 824.213,67.191 C824.139,67.098 824.068,67.008 823.995,66.917 C823.870,66.776 823.744,66.634 823.616,66.502 C823.542,66.424 823.465,66.35 823.385,66.276 C823.289,66.183 823.190,66.093 823.090,66.002 C823.004,65.932 822.917,65.854 822.830,65.787 C822.689,65.671 822.542,65.561 822.394,65.458 C822.320,65.406 822.243,65.354 822.169,65.307 C821.999,65.194 821.829,65.087 821.650,64.991 C821.592,64.955 821.531,64.923 821.473,64.894 C821.307,64.807 821.142,64.726 820.976,64.653 C820.909,64.623 820.845,64.594 820.774,64.566 C820.569,64.478 820.357,64.401 820.138,64.33 C820.084,64.314 820.026,64.298 819.969,64.282 C819.773,64.224 819.577,64.172 819.382,64.131 C819.330,64.118 819.285,64.104 819.234,64.095 C819,64.05 818.766,64.015 818.525,63.985 C818.461,63.979 818.400,63.976 818.339,63.969 C818.095,63.947 817.855,63.931 817.611,63.931 L817.582,63.931 Z"></path></g></svg>'>Holmusk</a></li>
     <li><a href="https://codepen.io/"><img style="margin: 16px 0" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>' alt="CodePen"></a></li>
     <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>

From b7160fe8aaf4717211b16dc7e9b60c6714ea96c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Mar 2021 22:15:49 +0100
Subject: [PATCH 4446/4742] Restore broken markup on index page

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

diff --git a/index.html b/index.html
index a26965d700..cab509b2d0 100644
--- a/index.html
+++ b/index.html
@@ -211,7 +211,7 @@ <h2>Sponsors</h2>
     <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>
     <li><a href="https://www.desmos.com/"><img src='data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="%23187a3d"%3E%3Cpath d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/%3E%3Cpath d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/%3E%3C/svg%3E%0A' alt=desmos></a></li>
     <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='data:image/svg+xml,%3Csvg%20width%3D%22397%22%20height%3D%22109%22%20viewBox%3D%220%200%20397%20109%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20fill-rule%3D%22nonzero%22%20fill%3D%22none%22%3E%3Cpath%20d%3D%22M169.495%2063.68c2.8%200%205.254.671%207.36%202.015%202.105%201.344%203.688%203.162%204.751%205.453%201.063%202.292%201.594%204.878%201.594%207.76%200%204.408-1.241%208.054-3.724%2010.935-2.483%202.881-5.81%204.322-9.98%204.322-3.953%200-7.18-1.402-9.683-4.206v12.62c0%20.271-.085.489-.254.653a.88.88%200%200%201-.64.247h-4.767a.966.966%200%200%201-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932%200%200%201%20.656-.247h4.767a.88.88%200%200%201%20.64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268%205.006-4.902%209.057-4.902zm-.84%2024.874c2.752%200%204.865-.86%206.34-2.578%201.473-1.719%202.21-4.034%202.21-6.947%200-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576%200-4.625.855-6.148%202.563-1.524%201.71-2.285%203.986-2.285%206.831s.761%205.141%202.285%206.89c1.523%201.747%203.572%202.62%206.148%202.62zm39.147-24.875c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm31.331%2030.845c-4.25%200-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05%204.298-10.999c2.866-2.948%206.423-4.423%2010.673-4.423%202.788%200%205.332.674%207.632%202.021%202.3%201.348%204.103%203.203%205.41%205.566%201.306%202.363%201.959%204.975%201.959%207.835%200%202.861-.653%205.468-1.96%207.821-1.306%202.353-3.109%204.209-5.41%205.566-2.3%201.357-4.843%202.036-7.63%202.036zm-6.43-8.608c1.7%201.759%203.847%202.638%206.445%202.638%202.597%200%204.745-.88%206.444-2.638%201.698-1.759%202.547-4.03%202.547-6.814%200-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598%200-4.746.88-6.444%202.638-1.699%201.758-2.548%204.03-2.548%206.815%200%202.784.85%205.055%202.548%206.814zm55.522-21.623c.272%200%20.487.082.642.248.156.165.234.384.234.657v27.976c0%201.772-.302%203.373-.906%204.804-.603%201.431-1.402%202.6-2.395%203.504-.993.906-2.157%201.67-3.49%202.293a16.713%2016.713%200%200%201-4.076%201.314c-1.383.253-2.814.38-4.294.38-2.337%200-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652%201.198-.38%202.707%201.46%205.735%202.19%209.085%202.19%201.169%200%202.293-.116%203.374-.35%201.074-.23%202.107-.62%203.068-1.153a6.016%206.016%200%200%200%202.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513%203.154-5.726%204.731-9.64%204.731-2.688%200-5.132-.676-7.333-2.03a13.905%2013.905%200%200%201-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534%200-2.726.604-5.237%201.811-7.534%201.208-2.298%202.907-4.123%205.098-5.476%202.19-1.353%204.64-2.03%207.347-2.03%203.856%200%207.03%201.548%209.523%204.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596%2023.266c2.408%200%204.424-.894%206.045-2.68%201.622-1.788%202.433-3.898%202.433-6.332%200-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428%200-4.452.86-6.074%202.581-1.622%201.72-2.433%203.826-2.433%206.317%200%202.529.811%204.663%202.433%206.402%201.621%201.74%203.646%202.61%206.074%202.61zm40.073-23.88c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm46.24%2024.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0%20.626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493%201.682-3.399%203.008-5.717%203.976-2.318.968-4.577%201.453-6.778%201.453-3.241%200-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149%200-2.621.835-4.656%202.504-6.104%201.67-1.448%204.214-2.416%207.633-2.906l6.984-1.085c1.355-.196%202.347-.401%202.976-.617.629-.215%201.041-.479%201.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302%200-6.65%201.36-7.043%204.079-.059.45-.353.665-.884.646h-4.48c-.647%200-.942-.304-.883-.91.334-3.326%201.66-5.713%203.978-7.161%202.318-1.448%205.452-2.172%209.4-2.172%204.224%200%207.392.959%209.504%202.876%202.112%201.918%203.168%204.706%203.168%208.364v11.035c-.02%201.35.707%202.172%202.18%202.466zm-19.06.135c4.132%200%207.518-1.307%2010.16-3.922v-6.028c-.258.566-1.53%201.024-3.814%201.375l-6.375.995c-1.728.274-2.96.742-3.695%201.405-.735.663-1.102%201.512-1.102%202.546%200%201.132.397%202.02%201.192%202.663.794.644%202.006.966%203.635.966zm48.252-24.875c2.377%200%204.116.796%205.216%202.386%201.1%201.59%201.65%204.248%201.65%207.971v18.59c0%20.272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948%200%200%201-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042%200-1.886.403-2.535%201.207a5.452%205.452%200%200%200-1.178%202.75v19.463c0%20.271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275%200-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04%200-1.88.398-2.52%201.193a5.675%205.675%200%200%200-1.193%202.764v19.463c0%20.271-.083.49-.25.654a.864.864%200%200%201-.634.248h-4.273c-.275%200-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57%200%20.874.3.914.902l.147%202.386h.442c.943-2.619%202.898-3.928%205.864-3.928%202.849%200%204.745%201.31%205.688%203.928h.353c1.061-2.619%202.986-3.928%205.776-3.928zM162.091%2016.126c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.694-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123%2022.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47%200-.824-.162-1.06-.488l-8.592-10.002-8.592%2010.002c-.255.326-.618.488-1.089.488h-5.532c-.373%200-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47%200%20.833.172%201.088.517l7.798%209.082%207.798-9.082c.255-.325.618-.498%201.089-.517h5.473c.373%200%20.618.105.736.316.117.21.059.46-.177.747l-11.152%2012.933%2011.976%2013.795zm14.101-26.59c1.86-.801%203.86-1.201%206-1.201%202.142%200%204.113.395%205.915%201.186%201.801.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.122%202.04-.364%202.549-.242.507-.76.761-1.554.761H230.41c.329%202.285%201.385%204.106%203.167%205.463%201.782%201.357%204.01%202.036%206.684%202.036%202.693%200%205.134-.84%207.323-2.52.465-.35.882-.341%201.25.03l1.947%201.992c.465.469.465.918%200%201.347-2.984%203.008-6.713%204.511-11.189%204.511-4.572%200-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.118-6.048.746-1.885%201.764-3.516%203.052-4.892%201.288-1.377%202.852-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.203.718-5.767%202.154-1.566%201.437-2.503%203.372-2.812%205.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83%2019.894c3.133%200%205.619-1.191%207.457-3.574.348-.45.745-.527%201.19-.234l3.394%201.962c.542.332.639.733.29%201.201-1.315%202.012-3.06%203.618-5.237%204.819-2.176%201.2-4.58%201.801-7.21%201.801-4.392%200-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05%204.367-11c2.912-2.948%206.563-4.422%2010.954-4.422%202.631%200%205.04.595%207.225%201.787%202.186%201.19%203.927%202.792%205.224%204.803.328.47.232.87-.29%201.202l-3.396%201.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67%200-4.88.884-6.63%202.651-1.75%201.768-2.626%204.033-2.626%206.796s.875%205.028%202.626%206.796c1.75%201.767%203.96%202.65%206.63%202.65zm46.585-24.87c.276%200%20.499.083.666.248.168.165.252.383.252.654v27.379c0%20.271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573%200-.88-.3-.919-.901l-.237-3.953h-.652c-1.007%201.608-2.35%202.93-4.03%203.968-1.68%201.036-3.674%201.554-5.986%201.554-3.26%200-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276%200%20.499.082.666.247.168.165.252.383.252.654v15.956c0%202.403.583%204.18%201.749%205.334%201.165%201.153%202.785%201.73%204.86%201.73%201.343%200%202.573-.258%203.689-.771s1.99-1.129%202.623-1.846c.632-.717%201.116-1.4%201.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595%2024.474c.353.446.382.852.088%201.22-.882%201.047-2.172%202.001-3.868%202.863-1.697.862-3.731%201.293-6.104%201.293-8.002%200-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885%200%200%201-.647-.261.864.864%200%200%201-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255%200%20.466.078.633.233.166.154.25.368.25.639l-.02%209.285h11.943c.255%200%20.466.082.632.247.167.164.25.382.25.654v3.603a.89.89%200%200%201-.25.64.837.837%200%200%201-.632.261H345.36v11.741c0%201.337.18%202.465.544%203.386.363.92.873%201.613%201.53%202.077a6.487%206.487%200%200%200%202.059.989c.716.193%201.534.29%202.456.29%201.98%200%203.824-.668%205.53-2.005.452-.426.873-.407%201.265.058l2%202.325zm15.146-23.272c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z%22%20fill%3D%22%23FFF%22%2F%3E%3Cpath%20d%3D%22M102.022%2037.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87%201.87%200%200%201-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87%201.87%200%200%201%2082.511%200h26.297c1.171%200%202.312.1%203.423.303%201.11.201%202.282.615%203.514%201.24a11.807%2011.807%200%200%201%203.212%202.36c.909.949%201.646%202.23%202.211%203.844.566%201.613.849%203.47.849%205.568v23.421c.04%201.09.262%201.877.666%202.36l12.18%2014.102c.645.767.605%201.594-.122%202.481l-12.058%2013.799c-.444.484-.666%201.271-.666%202.36V95.14c0%202.622-.414%204.852-1.243%206.688-.828%201.835-1.938%203.207-3.332%204.115-1.394.908-2.787%201.553-4.18%201.937-1.394.383-2.879.575-4.454.575H82.51c-.525%200-.97-.162-1.333-.485a1.716%201.716%200%200%201-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87%201.87%200%200%201%201.333-.515H97.66c2.908%200%204.363-1.25%204.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217%200%200%200%200-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083%2053.15a1.523%201.523%200%200%201%200%202.154l-23.85%2023.849a1.523%201.523%200%200%201-2.153%200l-23.85-23.85a1.523%201.523%200%200%201%200-2.153L67.08%2029.3a1.523%201.523%200%200%201%202.154%200zm-35.937%208.585c0%201.009-.243%201.735-.728%202.18L19.26%2054.258a.217.217%200%200%200%200%20.298L32.57%2068.51c.485.484.728%201.23.728%202.24v18.337c0%202.501%201.454%203.752%204.362%203.752h15.148c.525%200%20.97.172%201.333.515.364.343.584.797.584%201.361v11.923c0%20.565-.22%201.009-.584%201.331-.363.323-.808.485-1.333.485H26.511c-1.576%200-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577%2055.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614%201.303-2.895%202.211-3.843a11.807%2011.807%200%200%201%203.212-2.36C20.805.917%2021.976.503%2023.087.302A19.123%2019.123%200%200%201%2026.511%200h26.296c.525%200%20.97.171%201.333.515.364.342.584.796.584%201.361v11.862c0%20.525-.22.959-.584%201.301a1.87%201.87%200%200%201-1.333.515H37.66c-2.908%200-4.362%201.291-4.362%203.873v18.459z%22%20fill%3D%22%234547E0%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E' alt="Execute Program"></a></li>
-    <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='data:image/svg+xml;utf8,<svg width="3311" height="1605" viewBox="400 0 3311 1605" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1133 1602C1182 1602 1191 1602 1189 1579C1153 1301 1125 1076 1098 855L1098 855C1067 601 1037 354 995 41C991 2 973 0 916 0C865 0 854 2 849 34C824 242 798 437 772 636L772 636L772 636L772 636L772 636C734 928 695 1227 653 1581C651 1602 681 1602 715 1602C721 1602 726 1602 732 1602C791 1602 809 1602 811 1579C822 1446 833 1334 847 1206C849 1185 868 1185 905 1186C908 1186 912 1186 916 1186C919 1186 922 1186 925 1186C957 1185 984 1185 986 1206C996 1272 1004 1335 1013 1399L1013 1399C1020 1456 1028 1514 1036 1574C1040 1602 1050 1602 1097 1602C1103 1602 1110 1602 1118 1602C1124 1602 1128 1602 1133 1602ZM264 1602C451 1602 528 1478 528 1334V1195C528 1175 509 1176 470 1176L470 1176C463 1176 455 1177 446 1177C405 1177 376 1177 376 1195V1330C376 1391 342 1448 264 1448C180 1448 148 1387 148 1323V265C148 212 193 143 264 143C332 143 376 217 376 267V374C376 400 403 400 443 399H443H443H443H443H443C447 399 450 399 453 399C494 399 528 397 528 374V271C528 173 453 2 264 2C86 2 0 148 0 271V1336C0 1458 86 1602 264 1602ZM968 1042C959 928 953 837 946 746C942 681 937 615 931 539C931 530 929 514 916 514C904 514 902 530 902 537C896 625 890 707 885 784L885 784C879 874 874 958 868 1039C865 1055 886 1060 918 1060C945 1060 970 1060 968 1042ZM1784 1602C1845 1602 1861 1602 1861 1565V996C1861 992 1861 988 1861 984C1861 936 1861 903 1836 852C1812 804 1767 783 1743 771C1733 766 1727 763 1727 761C1727 758 1734 754 1744 748C1768 736 1810 713 1834 669C1859 623 1859 586 1859 537V537C1859 533 1859 529 1859 525V319C1859 239 1843 146 1775 82C1706 20 1608 2 1535 2H1405C1401 2 1397 1 1393 1C1379 0 1367 -0 1353 11C1339 25 1337 50 1337 73V1570C1337 1602 1353 1602 1405 1602C1474 1602 1483 1602 1483 1565V873C1483 838 1495 838 1586 838H1586H1586L1586 838C1591 838 1597 838 1604 838C1654 838 1715 895 1715 989V1570C1715 1602 1729 1602 1774 1602C1777 1602 1780 1602 1784 1602ZM1711 537V319C1711 267 1702 228 1663 187C1638 164 1624 153 1542 153C1521 153 1501 153 1492 169C1485 182 1485 194 1485 207V635C1485 639 1485 643 1485 648V648V648V648C1484 668 1483 687 1499 699C1510 709 1524 708 1535 708C1536 708 1538 708 1540 708C1565 708 1624 701 1665 658C1711 607 1711 569 1711 537ZM2588 1557L2588 1557C2588 1555 2588 1553 2588 1551V790C2588 788 2589 784 2589 781C2591 773 2592 764 2586 763C2569 760 2496 762 2429 763C2393 764 2359 765 2337 765C2321 765 2319 786 2319 836C2319 884 2321 902 2339 902C2345 902 2352 902 2360 901C2384 900 2414 898 2426 907C2436 915 2436 926 2435 936L2435 936C2435 937 2435 938 2435 938C2435 939 2435 940 2435 941V1334C2435 1382 2412 1453 2323 1453C2232 1453 2207 1384 2207 1327V265C2207 217 2253 143 2323 143C2392 143 2435 217 2435 267C2435 283 2436 303 2436 323C2437 343 2437 363 2437 379C2437 399 2451 402 2508 402C2570 402 2588 395 2588 374V271C2588 189 2524 2 2323 2C2118 2 2059 182 2059 271V1336C2059 1442 2130 1602 2323 1602C2393 1602 2429 1567 2452 1545C2466 1531 2476 1522 2485 1528C2503 1540 2508 1560 2512 1576C2516 1589 2518 1599 2526 1599C2534 1599 2541 1601 2547 1602C2559 1605 2569 1607 2577 1599C2589 1587 2588 1572 2588 1557ZM3310 1316C3310 1464 3249 1602 3046 1602C2856 1602 2781 1464 2781 1316V281C2781 109 2897 2 3046 2C3196 2 3310 121 3310 281V1316ZM3160 281V1309C3160 1373 3137 1448 3046 1448C2943 1448 2929 1375 2929 1309V281C2929 217 2977 143 3046 143C3112 143 3160 217 3160 281Z" fill="black"/></svg>'
+    <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='data:image/svg+xml;utf8,<svg width="3311" height="1605" viewBox="400 0 3311 1605" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1133 1602C1182 1602 1191 1602 1189 1579C1153 1301 1125 1076 1098 855L1098 855C1067 601 1037 354 995 41C991 2 973 0 916 0C865 0 854 2 849 34C824 242 798 437 772 636L772 636L772 636L772 636L772 636C734 928 695 1227 653 1581C651 1602 681 1602 715 1602C721 1602 726 1602 732 1602C791 1602 809 1602 811 1579C822 1446 833 1334 847 1206C849 1185 868 1185 905 1186C908 1186 912 1186 916 1186C919 1186 922 1186 925 1186C957 1185 984 1185 986 1206C996 1272 1004 1335 1013 1399L1013 1399C1020 1456 1028 1514 1036 1574C1040 1602 1050 1602 1097 1602C1103 1602 1110 1602 1118 1602C1124 1602 1128 1602 1133 1602ZM264 1602C451 1602 528 1478 528 1334V1195C528 1175 509 1176 470 1176L470 1176C463 1176 455 1177 446 1177C405 1177 376 1177 376 1195V1330C376 1391 342 1448 264 1448C180 1448 148 1387 148 1323V265C148 212 193 143 264 143C332 143 376 217 376 267V374C376 400 403 400 443 399H443H443H443H443H443C447 399 450 399 453 399C494 399 528 397 528 374V271C528 173 453 2 264 2C86 2 0 148 0 271V1336C0 1458 86 1602 264 1602ZM968 1042C959 928 953 837 946 746C942 681 937 615 931 539C931 530 929 514 916 514C904 514 902 530 902 537C896 625 890 707 885 784L885 784C879 874 874 958 868 1039C865 1055 886 1060 918 1060C945 1060 970 1060 968 1042ZM1784 1602C1845 1602 1861 1602 1861 1565V996C1861 992 1861 988 1861 984C1861 936 1861 903 1836 852C1812 804 1767 783 1743 771C1733 766 1727 763 1727 761C1727 758 1734 754 1744 748C1768 736 1810 713 1834 669C1859 623 1859 586 1859 537V537C1859 533 1859 529 1859 525V319C1859 239 1843 146 1775 82C1706 20 1608 2 1535 2H1405C1401 2 1397 1 1393 1C1379 0 1367 -0 1353 11C1339 25 1337 50 1337 73V1570C1337 1602 1353 1602 1405 1602C1474 1602 1483 1602 1483 1565V873C1483 838 1495 838 1586 838H1586H1586L1586 838C1591 838 1597 838 1604 838C1654 838 1715 895 1715 989V1570C1715 1602 1729 1602 1774 1602C1777 1602 1780 1602 1784 1602ZM1711 537V319C1711 267 1702 228 1663 187C1638 164 1624 153 1542 153C1521 153 1501 153 1492 169C1485 182 1485 194 1485 207V635C1485 639 1485 643 1485 648V648V648V648C1484 668 1483 687 1499 699C1510 709 1524 708 1535 708C1536 708 1538 708 1540 708C1565 708 1624 701 1665 658C1711 607 1711 569 1711 537ZM2588 1557L2588 1557C2588 1555 2588 1553 2588 1551V790C2588 788 2589 784 2589 781C2591 773 2592 764 2586 763C2569 760 2496 762 2429 763C2393 764 2359 765 2337 765C2321 765 2319 786 2319 836C2319 884 2321 902 2339 902C2345 902 2352 902 2360 901C2384 900 2414 898 2426 907C2436 915 2436 926 2435 936L2435 936C2435 937 2435 938 2435 938C2435 939 2435 940 2435 941V1334C2435 1382 2412 1453 2323 1453C2232 1453 2207 1384 2207 1327V265C2207 217 2253 143 2323 143C2392 143 2435 217 2435 267C2435 283 2436 303 2436 323C2437 343 2437 363 2437 379C2437 399 2451 402 2508 402C2570 402 2588 395 2588 374V271C2588 189 2524 2 2323 2C2118 2 2059 182 2059 271V1336C2059 1442 2130 1602 2323 1602C2393 1602 2429 1567 2452 1545C2466 1531 2476 1522 2485 1528C2503 1540 2508 1560 2512 1576C2516 1589 2518 1599 2526 1599C2534 1599 2541 1601 2547 1602C2559 1605 2569 1607 2577 1599C2589 1587 2588 1572 2588 1557ZM3310 1316C3310 1464 3249 1602 3046 1602C2856 1602 2781 1464 2781 1316V281C2781 109 2897 2 3046 2C3196 2 3310 121 3310 281V1316ZM3160 281V1309C3160 1373 3137 1448 3046 1448C2943 1448 2929 1375 2929 1309V281C2929 217 2977 143 3046 143C3112 143 3160 217 3160 281Z" fill="black"/></svg>'></a></li>
   </ul>
 </section>
 

From 4c81051bd7ddda857ad90a0237887dcf0701c781 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 17 Mar 2021 08:08:15 +0100
Subject: [PATCH 4447/4742] Initialize contenteditable input as editable

So that autofocus works.

Closes #6624
---
 src/input/ContentEditableInput.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index b50073ecff..a76df648ce 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -29,6 +29,7 @@ export default class ContentEditableInput {
   init(display) {
     let input = this, cm = input.cm
     let div = input.div = display.lineDiv
+    div.contentEditable = true
     disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize)
 
     function belongsToInput(e) {

From 74832f9ccf151f64c1eea53c305f60575cc41d76 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 17 Mar 2021 09:11:15 +0100
Subject: [PATCH 4448/4742] Fix more exponential regular expressions

---
 mode/erlang/erlang.js     | 3 +--
 mode/markdown/markdown.js | 2 +-
 mode/python/python.js     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index f0541bb955..740f8faa6d 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -339,8 +339,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
   }
 
   function lookahead(stream) {
-    var m = stream.match(/([\n\s]+|%[^\n]*\n)*(.)/,false);
-    return m ? m.pop() : "";
+    return !stream.eol() ? m.pop() : "";
   }
 
   function is_member(element,list) {
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 038a776bdc..a9e272ea81 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -735,7 +735,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (stream.peek() === undefined) { // End of line, set flag to check next line
       state.linkTitle = true;
     } else { // More content on line, check if link title
-      stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\.)+\)))?/, true);
+      stream.match(/^(?:\s+(?:"(?:[^"\\]|\\.)+"|'(?:[^'\\]|\\.)+'|\((?:[^)\\]|\\.)+\)))?/, true);
     }
     state.f = state.inline = inlineNormal;
     return tokenTypes.linkHref + " url";
diff --git a/mode/python/python.js b/mode/python/python.js
index de5fd38a1a..1befb40450 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -282,7 +282,7 @@
     }
 
     function pushBracketScope(stream, state, type) {
-      var align = stream.match(/^([\s\[\{\(]|#.*)*$/, false) ? null : stream.column() + 1
+      var align = stream.match(/^[\s\[\{\(]*(?:#|$)/, false) ? null : stream.column() + 1
       state.scopes.push({offset: state.indent + hangingIndent,
                          type: type,
                          align: align})

From 69774706b3051e2f572641de680d5082ef66573e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 17 Mar 2021 09:16:33 +0100
Subject: [PATCH 4449/4742] [erlang mode] Fix bug introduced by previous patch

---
 mode/erlang/erlang.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index 740f8faa6d..59c2a68e20 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -339,7 +339,8 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
   }
 
   function lookahead(stream) {
-    return !stream.eol() ? m.pop() : "";
+    let m = stream.match(/^\s*([^\s%])/, false)
+    return m ? m[1] : "";
   }
 
   function is_member(element,list) {

From 562f077c556238ba7e9f8de98fae89e53270564d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 17 Mar 2021 09:33:34 +0100
Subject: [PATCH 4450/4742] Don't use let in mode script

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

diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index 59c2a68e20..d827296f3b 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -339,7 +339,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
   }
 
   function lookahead(stream) {
-    let m = stream.match(/^\s*([^\s%])/, false)
+    var m = stream.match(/^\s*([^\s%])/, false)
     return m ? m[1] : "";
   }
 

From f0154057fed3e32020dbafed0a0bcd4f375b879e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 18 Mar 2021 12:36:44 +0100
Subject: [PATCH 4451/4742] [multiplex addon] Fix handling of sub-modes with
 parseDelimiters and identical delimiters

Closes #5369
Closes #5368
---
 addon/mode/multiplex.js      | 13 +++++++++----
 addon/mode/multiplex_test.js | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 93fd9a5a46..6140bc4f96 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -12,7 +12,7 @@
 "use strict";
 
 CodeMirror.multiplexingMode = function(outer /*, others */) {
-  // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
+  // Others should be {open, close, mode [, delimStyle] [, innerStyle] [, parseDelimiters]} objects
   var others = Array.prototype.slice.call(arguments, 1);
 
   function indexOf(string, pattern, from, returnEnd) {
@@ -29,7 +29,8 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       return {
         outer: CodeMirror.startState(outer),
         innerActive: null,
-        inner: null
+        inner: null,
+        startingInner: false
       };
     },
 
@@ -37,7 +38,8 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       return {
         outer: CodeMirror.copyState(outer, state.outer),
         innerActive: state.innerActive,
-        inner: state.innerActive && CodeMirror.copyState(state.innerActive.mode, state.inner)
+        inner: state.innerActive && CodeMirror.copyState(state.innerActive.mode, state.inner),
+        startingInner: state.startingInner
       };
     },
 
@@ -49,6 +51,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           var found = indexOf(oldContent, other.open, stream.pos);
           if (found == stream.pos) {
             if (!other.parseDelimiters) stream.match(other.open);
+            state.startingInner = !!other.parseDelimiters
             state.innerActive = other;
 
             // Get the outer indent, making sure to handle CodeMirror.Pass
@@ -74,7 +77,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, curInner.parseDelimiters) : -1;
+        var found = curInner.close && !state.startingInner ?
+            indexOf(oldContent, curInner.close, stream.pos, curInner.parseDelimiters) : -1;
         if (found == stream.pos && !curInner.parseDelimiters) {
           stream.match(curInner.close);
           state.innerActive = state.inner = null;
@@ -83,6 +87,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         if (found > -1) stream.string = oldContent.slice(0, found);
         var innerToken = curInner.mode.token(stream, state.inner);
         if (found > -1) stream.string = oldContent;
+        else if (stream.pos > stream.start) state.startingInner = false
 
         if (found == stream.pos && curInner.parseDelimiters)
           state.innerActive = state.inner = null;
diff --git a/addon/mode/multiplex_test.js b/addon/mode/multiplex_test.js
index c51cad45d5..8503988672 100644
--- a/addon/mode/multiplex_test.js
+++ b/addon/mode/multiplex_test.js
@@ -30,4 +30,20 @@
   MT(
     "stexInsideMarkdown",
     "[strong **Equation:**] [delim&delim-open $][inner&tag \\pi][delim&delim-close $]");
+
+  CodeMirror.defineMode("identical_delim_multiplex", function() {
+    return CodeMirror.multiplexingMode(CodeMirror.getMode({indentUnit: 2}, "javascript"), {
+      open: "#",
+      close: "#",
+      mode: CodeMirror.getMode({}, "markdown"),
+      parseDelimiters: true,
+      innerStyle: "q"
+    });
+  });
+
+  var mode2 = CodeMirror.getMode({}, "identical_delim_multiplex");
+
+  test.mode("identical_delimiters_with_parseDelimiters", mode2, [
+    "[keyword let] [def x] [operator =] [q #foo][q&em *bar*][q #];"
+  ], "multiplexing")
 })();

From 51fdbcc2699c278db1e802663725f56df9ebfce9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 20 Mar 2021 12:11:48 +0100
Subject: [PATCH 4452/4742] Mark version 5.60.0

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 18 ++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 11 +++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bba9e1fade..2d6d422fcf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -178,6 +178,7 @@ CodeBitt
 coderaiser
 Cole R Lawrence
 ComFreek
+Cornelius Weig
 Cristian Prieto
 Curran Kelleher
 Curtis Gagliardi
@@ -343,6 +344,7 @@ Hugues Malphettes
 Ian Beck
 Ian Davies
 Ian Dickinson
+Ian Henderson
 ianhi
 Ian Rose
 Ian Wehrman
@@ -364,6 +366,7 @@ Jack Douglas
 Jacob Lee
 Jaimin
 Jake Peyser
+Jakob Kummerow
 Jakob Miland
 Jakub T. Jankiewicz
 Jakub Vrana
@@ -499,6 +502,7 @@ Liam Newman
 Libo Cannici
 Lior Goldberg
 Lior Shub
+lishid
 LloydMilligan
 LM
 lochel
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1c26f300c..1772b5aa98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 5.60.0 (2021-03-20)
+
+### Bug fixes
+
+Fix autofocus feature in contenteditable mode.
+
+[simple mode addon](https://codemirror.net/demo/simplemode.html): Fix a null-dereference crash.
+
+[multiplex addon](https://codemirror.net/demo/multiplex.html): Make it possible to use `parseDelimiters` when both delimiters are the same.
+
+[julia mode](https://codemirror.net/mode/julia/): Fix a lockup bug.
+
+### New features
+
+`setSelections` now allows ranges to omit the `head` property when it is equal to `anchor`.
+
+[sublime bindings](https://codemirror.net/demo/sublime.html): Add support for reverse line sorting.
+
 ## 5.59.4 (2021-02-24)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 91ec333309..d27e37f58b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.59.4</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.60.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 b5168b0a94..ae2622fa1c 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,17 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-03-2021: <a href="https://codemirror.net/codemirror-5.60.0.zip">Version 5.60.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><code>setSelections</code> now allows ranges to omit the <code>head</code> property when it is equal to <code>anchor</code>.</li>
+    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Add support for reverse line sorting.</li>
+    <li>Fix autofocus feature in contenteditable mode.</li>
+    <li><a href="https://codemirror.net/demo/simplemode.html">simple mode addon</a>: Fix a null-dereference crash.</li>
+    <li><a href="https://codemirror.net/demo/multiplex.html">multiplex addon</a>: Make it possible to use <code>parseDelimiters</code> when both delimiters are the same.</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix a lockup bug.</li>
+  </ul>
+
   <p class="rel">24-02-2021: <a href="https://codemirror.net/codemirror-5.59.4.zip">Version 5.59.4</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index cab509b2d0..09ee9d3ac5 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.59.4</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.60.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 32df807768..6bcff708af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.59.4",
+  "version": "5.60.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 71e283c2da..2d63991b5c 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.59.4"
+CodeMirror.version = "5.60.0"

From 49d8186db83bba4ab5b86e3589b3f1f567dd12f3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 Mar 2021 10:44:39 +0100
Subject: [PATCH 4453/4742] [javascript mode] Create a new scope for 'for'
 statements

Issue #6627
---
 mode/javascript/javascript.js | 4 ++--
 mode/javascript/test.js       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index a42f23d07f..9f5870df28 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -376,7 +376,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse);
     }
     if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
+    if (type == "for") return cont(pushlex("form"), pushblockcontext, forspec, statement, popcontext, poplex);
     if (type == "class" || (isTS && value == "interface")) {
       cx.marked = "keyword"
       return cont(pushlex("form", type == "class" ? type : value), className, poplex)
@@ -883,7 +883,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
         var c = state.cc[i];
         if (c == poplex) lexical = lexical.prev;
-        else if (c != maybeelse) break;
+        else if (c != maybeelse && c != popcontext) break;
       }
       while ((lexical.type == "stat" || lexical.type == "form") &&
              (firstChar == "}" || ((top = state.cc[state.cc.length - 1]) &&
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index 26a81ffc8d..e730302024 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -164,9 +164,9 @@
 
   MT("indent_for",
      "[keyword for] ([keyword var] [def i] [operator =] [number 0];",
-     "     [variable i] [operator <] [number 100];",
-     "     [variable i][operator ++])",
-     "  [variable doSomething]([variable i]);",
+     "     [variable-2 i] [operator <] [number 100];",
+     "     [variable-2 i][operator ++])",
+     "  [variable doSomething]([variable-2 i]);",
      "[keyword debugger];");
 
   MT("indent_c_style",

From d9e78b029129df17c0f317a16ac97d844107fab5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 23 Mar 2021 10:49:32 +0100
Subject: [PATCH 4454/4742] [javascript mode] Add an option to turn off scope
 tracking

Issue #6627
---
 mode/javascript/index.html    | 4 ++++
 mode/javascript/javascript.js | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 3023835727..2b6cede8a8 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -99,6 +99,10 @@ <h2>JavaScript mode</h2>
         <li><code>typescript</code> which will activate additional
         syntax highlighting and some other things for TypeScript code
         (<a href="typescript.html">demo</a>).</li>
+        <li><code>trackScope</code> can be set to false to turn off
+        tracking of local variables. This will prevent locals from
+        getting the <code>"variable-2"</code> token type, and will
+        break completion of locals with javascript-hint.</li>
         <li><code>statementIndent</code> which (given a number) will
         determine the amount of indentation to use for statements
         continued on a new line.</li>
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 9f5870df28..f9fb4ec1f7 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -16,6 +16,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var statementIndent = parserConfig.statementIndent;
   var jsonldMode = parserConfig.jsonld;
   var jsonMode = parserConfig.json || jsonldMode;
+  var trackScope = parserConfig.trackScope !== false
   var isTS = parserConfig.typescript;
   var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
 
@@ -231,6 +232,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
 
   function inScope(state, varname) {
+    if (!trackScope) return false
     for (var v = state.localVars; v; v = v.next)
       if (v.name == varname) return true;
     for (var cx = state.context; cx; cx = cx.prev) {
@@ -277,6 +279,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function register(varname) {
     var state = cx.state;
     cx.marked = "def";
+    if (!trackScope) return
     if (state.context) {
       if (state.lexical.info == "var" && state.context && state.context.block) {
         // FIXME function decls are also not block scoped

From 0762bf2e0b0b25b6520467d52644d1e92fb30a0a Mon Sep 17 00:00:00 2001
From: lishid <lishid@gmail.com>
Date: Fri, 26 Mar 2021 03:44:57 -0400
Subject: [PATCH 4455/4742] Remove option-based emacsy key bindings

---
 src/input/keymap.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/input/keymap.js b/src/input/keymap.js
index f29f2bb17f..2df588dea1 100644
--- a/src/input/keymap.js
+++ b/src/input/keymap.js
@@ -29,10 +29,9 @@ keyMap.pcDefault = {
 // Very basic readline/emacs-style bindings, which are standard on Mac.
 keyMap.emacsy = {
   "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
-  "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-  "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
-  "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars",
-  "Ctrl-O": "openLine"
+  "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd", "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp",
+  "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine",
+  "Ctrl-T": "transposeChars", "Ctrl-O": "openLine"
 }
 keyMap.macDefault = {
   "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",

From ee150b80a4c6c514bf9f247a376d2fda39cb657b Mon Sep 17 00:00:00 2001
From: Nikolaj Kappler <Nikolaj-Kappler@web.de>
Date: Fri, 26 Mar 2021 11:37:08 +0100
Subject: [PATCH 4456/4742] [tern addon] Move tooltips that would be off screen

---
 addon/hint/show-hint.js |  1 +
 addon/tern/tern.js      | 39 +++++++++++++++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index bfe7d3a353..9ba6465316 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -293,6 +293,7 @@
       }
     }
     var overlapX = box.right - winW;
+    if (scrolls) overlapX += cm.display.nativeBarWidth;
     if (overlapX > 0) {
       if (box.right - box.left > winW) {
         hints.style.width = (winW - 5) + "px";
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index 7be368188b..a88371747c 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -231,8 +231,7 @@
         var content = ts.options.completionTip ? ts.options.completionTip(cur.data) : cur.data.doc;
         if (content) {
           tooltip = makeTooltip(node.parentNode.getBoundingClientRect().right + window.pageXOffset,
-                                node.getBoundingClientRect().top + window.pageYOffset, content, cm);
-          tooltip.className += " " + cls + "hint-doc";
+                                node.getBoundingClientRect().top + window.pageYOffset, content, cm, cls + "hint-doc");
         }
       });
       c(obj);
@@ -637,12 +636,44 @@
     }
   }
 
-  function makeTooltip(x, y, content, cm) {
-    var node = elt("div", cls + "tooltip", content);
+  function makeTooltip(x, y, content, cm, className) {
+    var node = elt("div", cls + "tooltip" + " " + (className || ""), content);
     node.style.left = x + "px";
     node.style.top = y + "px";
     var container = ((cm.options || {}).hintOptions || {}).container || document.body;
     container.appendChild(node);
+
+    var pos = cm.cursorCoords();
+    var winW = window.innerWidth;
+    var winH = window.innerHeight;
+    var box = node.getBoundingClientRect();
+    var hints = document.querySelector(".CodeMirror-hints");
+    var overlapY = box.bottom - winH;
+    var overlapX = box.right - winW;
+
+    if (hints && overlapX > 0) {
+      node.style.left = 0;
+      var box = node.getBoundingClientRect();
+      node.style.left = (x = x - hints.offsetWidth - box.width) + "px";
+      overlapX = box.right - winW;
+    }
+    if (overlapY > 0) {
+      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
+      if (curTop - height > 0) { // Fits above cursor
+        node.style.top = (pos.top - height) + "px";
+      } else if (height > winH) {
+        node.style.height = (winH - 5) + "px";
+        node.style.top = (pos.bottom - box.top) + "px";
+      }
+    }
+    if (overlapX > 0) {
+      if (box.right - box.left > winW) {
+        node.style.width = (winW - 5) + "px";
+        overlapX -= (box.right - box.left) - winW;
+      }
+      node.style.left = (x - overlapX) + "px";
+    }
+
     return node;
   }
 

From 5895973d86f60b8e5d8fd1aebb4cca70b8930621 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 28 Mar 2021 13:11:30 +0200
Subject: [PATCH 4457/4742] Only add an indentation level for colons at end of
 line

Closes #6634
---
 mode/python/python.js | 2 +-
 mode/python/test.js   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 1befb40450..7dff2d1e31 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -318,7 +318,7 @@
         state.dedent += 1;
 
       if (current == "lambda") state.lambda = true;
-      if (current == ":" && !state.lambda && top(state).type == "py")
+      if (current == ":" && !state.lambda && top(state).type == "py" && stream.match(/^\s*(?:#|$)/, false))
         pushPyScope(state);
 
       if (current.length == 1 && !/string|comment/.test(style)) {
diff --git a/mode/python/test.js b/mode/python/test.js
index 39b80cf70a..5fff328bc9 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -41,4 +41,8 @@
   MT("bracesInFString", "[string f']{[variable x] [operator +] {}}[string !']")
 
   MT("nestedFString", "[string f']{[variable b][[ [string f\"c\"] ]]}[string f'] [comment # oops]")
+
+  MT("dontIndentTypeDecl",
+     "[variable i]: [builtin int] [operator =] [number 32]",
+     "[builtin print]([variable i])")
 })();

From 0a6e33032c3f0e20450b6716c78b0d84ccc0852b Mon Sep 17 00:00:00 2001
From: Konstantin Chernenko <kb.chernenko@gmail.com>
Date: Tue, 30 Mar 2021 16:50:06 +0300
Subject: [PATCH 4458/4742] [kotlin mode] add value keyword for inline class
 (#6638)

---
 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 05b8f77f1d..15c0fd1196 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -659,7 +659,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "file import where by get set abstract enum open inner override private public internal " +
       "protected catch finally out final vararg reified dynamic companion constructor init " +
       "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
-      "external annotation crossinline const operator infix suspend actual expect setparam"
+      "external annotation crossinline const operator infix suspend actual expect setparam value"
     ),
     types: words(
       /* package java.lang */

From 667e843c82d6015898ea2b3541b1bb4aca60213d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 30 Mar 2021 15:55:09 +0200
Subject: [PATCH 4459/4742] [kotlin mode] Fix issue in tokenizing prefixed URIs

Closes #6637
---
 mode/sparql/sparql.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 73997c667f..6d1d24464b 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -95,7 +95,7 @@ CodeMirror.defineMode("sparql", function(config) {
   }
 
   function eatPnLocal(stream) {
-    while (stream.match(/([:\w\d._-]|\\[-\\_~.!$&'()*+,;=/?#@%]|%[a-fA-F0-9][a-fA-F0-9])/));
+    stream.match(/(\.(?=[\w_\-\\%])|[:\w_-]|\\[-\\_~.!$&'()*+,;=/?#@%]|%[a-f\d][a-f\d])+/i);
   }
 
   function tokenLiteral(quote) {

From 7e2466f1653faf3832302fdee508ad886d5431e7 Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Tue, 6 Apr 2021 15:15:57 -0700
Subject: [PATCH 4460/4742] [runmode] Pass the mode object to the callback

Without the mode object, it's not possible to call the mode's `indent` method to compute how much a given line should be indented (which we now have a need to do in a standalone way).
---
 addon/runmode/runmode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 2cae68635d..f5d58e2428 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -67,7 +67,7 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
     if (!stream.string && mode.blankLine) mode.blankLine(state);
     while (!stream.eol()) {
       var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
+      callback(stream.current(), style, i, stream.start, state, mode);
       stream.start = stream.pos;
     }
   }

From bd1b7d2976d768ae4e3b8cf209ec59ad73c0305a Mon Sep 17 00:00:00 2001
From: "Felipe S. S. Schneider"
 <37125+schneiderfelipe@users.noreply.github.com>
Date: Wed, 7 Apr 2021 09:06:36 -0300
Subject: [PATCH 4461/4742] [mode/meta] Add "jl" alias for Julia

Closes #6642
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index 92b68074ca..477d6ae23e 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -76,7 +76,7 @@
     {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
     {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
     {name: "Jinja2", mime: "text/jinja2", mode: "jinja2", ext: ["j2", "jinja", "jinja2"]},
-    {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
+    {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"], alias: ["jl"]},
     {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
     {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},

From 8fed31eb72707fd362a0eacfb2ece19919dd9b9b Mon Sep 17 00:00:00 2001
From: Slava Rozhnev <rozhnev@msn.com>
Date: Sat, 10 Apr 2021 14:59:37 +0300
Subject: [PATCH 4462/4742] [php mode] Add memory_get_peak_usage buitlin

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

diff --git a/mode/php/php.js b/mode/php/php.js
index 3202f50724..b2cae96064 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -86,7 +86,7 @@
     "die echo empty exit eval include include_once isset list require require_once return " +
     "print unset __halt_compiler self static parent yield insteadof finally";
   var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
-  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
+  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage memory_get_peak_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
   CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
   CodeMirror.registerHelper("wordChars", "php", /[\w$]/);
 

From 7b9f8a678d6b3327421b7b0e15fb2a5b61e0ebcf Mon Sep 17 00:00:00 2001
From: Michael Chirico <michaelchirico4@gmail.com>
Date: Sat, 10 Apr 2021 05:00:42 -0700
Subject: [PATCH 4463/4742] [r mode] Remove extra test with more appropriate
 regexp

The rule for starting a variable name is:

> A syntactically valid name consists of letters, numbers and the dot or underline characters and **starts with a letter or the dot not followed by a number**.

Per https://stat.ethz.ch/R-manual/R-devel/library/base/html/make.names.html

"dot not followed by a number" is handled by parsing numerics earlier
---
 mode/r/r.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/r/r.js b/mode/r/r.js
index c422af9a4c..6feeb11f83 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -56,7 +56,7 @@ CodeMirror.defineMode("r", function(config) {
       return "variable-3";
     } else if (ch == "." && stream.match(/.[.\d]+/)) {
       return "keyword";
-    } else if (/[\w\.]/.test(ch) && ch != "_") {
+    } else if (/[a-zA-Z\.]/.test(ch)) {
       stream.eatWhile(/[\w\.]/);
       var word = stream.current();
       if (atoms.propertyIsEnumerable(word)) return "atom";

From 8abe4684291880507204085f0e560574d171d31b Mon Sep 17 00:00:00 2001
From: Michael Chirico <michaelchirico4@gmail.com>
Date: Sat, 10 Apr 2021 05:01:49 -0700
Subject: [PATCH 4464/4742] [r mode] Tweak regex for dots

See https://stat.ethz.ch/R-manual/R-devel/library/base/html/dots.html and https://stat.ethz.ch/R-manual/R-devel/library/base/html/Reserved.html

Currently CodeMirror treats things like `..1.` and `...1` identically to `...`, `..1`, `..2`, etc.

The former two parse, but they parse as regular R objects per the naming rules seen e.g. here https://stat.ethz.ch/R-manual/R-devel/library/base/html/make.names.html

> A syntactically valid name consists of letters, numbers and the dot or underline characters and starts with a letter or the dot not followed by a number. Names such as ".2way" are not valid, and neither are the reserved words.

Please LMK if this should be tested, with the caveat that this is my first ever contribution to JS code so some hand-holding would be nice
---
 mode/r/r.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/r/r.js b/mode/r/r.js
index 6feeb11f83..de34c201bd 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -54,7 +54,7 @@ CodeMirror.defineMode("r", function(config) {
     } else if (ch == "`") {
       stream.match(/[^`]+`/);
       return "variable-3";
-    } else if (ch == "." && stream.match(/.[.\d]+/)) {
+    } else if (ch == "." && stream.match(/.(?:[.]|\d+)/)) {
       return "keyword";
     } else if (/[a-zA-Z\.]/.test(ch)) {
       stream.eatWhile(/[\w\.]/);

From 770433e79286f42eab1aab81d2e44d05636ccc80 Mon Sep 17 00:00:00 2001
From: Alexander Marks <aomarks@google.com>
Date: Sat, 10 Apr 2021 14:18:01 -0700
Subject: [PATCH 4465/4742] Use shadow DOM aware activeElement in
 contenteditable mode

Fixes cursor position reset bug when using contenteditable mode where the
CodeMirror element is within a shadow root.
---
 src/input/ContentEditableInput.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index a76df648ce..f5df0ebc3f 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -10,7 +10,7 @@ import { simpleSelection } from "../model/selection.js"
 import { setSelection } from "../model/selection_updates.js"
 import { getBidiPartAt, getOrder } from "../util/bidi.js"
 import { android, chrome, gecko, ie_version } from "../util/browser.js"
-import { contains, range, removeChildrenAndAdd, selectInput } from "../util/dom.js"
+import { activeElt, contains, range, removeChildrenAndAdd, selectInput } from "../util/dom.js"
 import { on, signalDOMEvent } from "../util/event.js"
 import { Delayed, lst, sel_dontScroll } from "../util/misc.js"
 
@@ -96,7 +96,7 @@ export default class ContentEditableInput {
       let kludge = hiddenTextarea(), te = kludge.firstChild
       cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild)
       te.value = lastCopied.text.join("\n")
-      let hadFocus = document.activeElement
+      let hadFocus = activeElt()
       selectInput(te)
       setTimeout(() => {
         cm.display.lineSpace.removeChild(kludge)
@@ -119,7 +119,7 @@ export default class ContentEditableInput {
 
   prepareSelection() {
     let result = prepareSelection(this.cm, false)
-    result.focus = document.activeElement == this.div
+    result.focus = activeElt() == this.div
     return result
   }
 
@@ -213,7 +213,7 @@ export default class ContentEditableInput {
 
   focus() {
     if (this.cm.options.readOnly != "nocursor") {
-      if (!this.selectionInEditor() || document.activeElement != this.div)
+      if (!this.selectionInEditor() || activeElt() != this.div)
         this.showSelection(this.prepareSelection(), true)
       this.div.focus()
     }

From 2997167571787db3da8a15e5ac65c8ddaf316f0a Mon Sep 17 00:00:00 2001
From: Alexander Marks <aomarks@google.com>
Date: Sun, 11 Apr 2021 10:48:17 -0700
Subject: [PATCH 4466/4742] Prevent line numbers from being voiced by screen
 readers

Sets aria-hidden=true on .CodeMirror-gutter-wrapper elements

Fixes #6578
---
 src/display/update_line.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/display/update_line.js b/src/display/update_line.js
index 50d781ee84..dd1aac8b03 100644
--- a/src/display/update_line.js
+++ b/src/display/update_line.js
@@ -104,6 +104,7 @@ function updateLineGutter(cm, lineView, lineN, dims) {
   if (cm.options.lineNumbers || markers) {
     let wrap = ensureLineWrapped(lineView)
     let gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", `left: ${cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth}px`)
+    gutterWrap.setAttribute("aria-hidden", "true")
     cm.display.input.setUneditable(gutterWrap)
     wrap.insertBefore(gutterWrap, lineView.text)
     if (lineView.line.gutterClass)

From 123c6709b85d7e87b8d69e482edf003e8aa68aba Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 12 Apr 2021 17:20:08 +0200
Subject: [PATCH 4467/4742] [anywordhint demo] Update to show current code

Issue #6653
---
 demo/anywordhint.html | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index 471b5bde7b..57df9a36a7 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -8,7 +8,7 @@
 <link rel="stylesheet" href="../addon/hint/show-hint.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/hint/show-hint.js"></script>
-<script src="../addon/hint/anyword-hint.js"></script>
+<script src="../addon/hint/anyword-hint.js" id=anyword></script>
 <script src="../mode/javascript/javascript.js"></script>
 <div id=nav>
   <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
@@ -29,33 +29,31 @@ <h2>Any Word Completion Demo</h2>
 (function() {
   "use strict";
 
-  var WORD = /[\w$]+/g, RANGE = 500;
+  var WORD = /[\w$]+/, RANGE = 500;
 
   CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
     var word = options && options.word || WORD;
     var range = options && options.range || RANGE;
     var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
-    var start = cur.ch, end = start;
-    while (end < curLine.length && word.test(curLine.charAt(end))) ++end;
+    var end = cur.ch, start = end;
     while (start && word.test(curLine.charAt(start - 1))) --start;
     var curWord = start != end && curLine.slice(start, end);
 
-    var list = [], seen = {};
-    function scan(dir) {
-      var line = cur.line, end = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
-      for (; line != end; line += dir) {
+    var list = options && options.list || [], seen = {};
+    var re = new RegExp(word.source, "g");
+    for (var dir = -1; dir <= 1; dir += 2) {
+      var line = cur.line, endLine = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
+      for (; line != endLine; line += dir) {
         var text = editor.getLine(line), m;
-        word.lastIndex = 0;
-        while (m = word.exec(text)) {
-          if ((!curWord || m[0].indexOf(curWord) == 0) && !seen.hasOwnProperty(m[0])) {
+        while (m = re.exec(text)) {
+          if (line == cur.line && m[0] === curWord) continue;
+          if ((!curWord || m[0].lastIndexOf(curWord, 0) == 0) && !Object.prototype.hasOwnProperty.call(seen, m[0])) {
             seen[m[0]] = true;
             list.push(m[0]);
           }
         }
       }
     }
-    scan(-1);
-    scan(1);
     return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
   });
 })();

From a8f52866c2fe3e9d741c12d92e65858794bccb7d Mon Sep 17 00:00:00 2001
From: mtaran-google <mtaran@google.com>
Date: Mon, 12 Apr 2021 09:57:56 -0700
Subject: [PATCH 4468/4742] [runmode] Export countColumn on the minimal
 CodeMirror

This is needed e.g. for the google-modes to produce correct indentation.
---
 src/addon/runmode/codemirror-standalone.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/addon/runmode/codemirror-standalone.js b/src/addon/runmode/codemirror-standalone.js
index b463a5cf59..f13f32b2f1 100644
--- a/src/addon/runmode/codemirror-standalone.js
+++ b/src/addon/runmode/codemirror-standalone.js
@@ -1,4 +1,5 @@
 import StringStream from "../../util/StringStream.js"
+import { countColumn } from "../../util/misc.js"
 import * as modeMethods from "../../modes.js"
 
 // declare global: globalThis, CodeMirror
@@ -17,6 +18,7 @@ CodeMirror.defineMIME("text/plain", "null")
 
 CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min
 CodeMirror.splitLines = function(string) { return string.split(/\r?\n|\r/) }
+CodeMirror.countColumn = countColumn
 
 CodeMirror.defaults = { indentUnit: 2 }
 export default CodeMirror

From f3033a229971ab0cc59ded104f48303e58923530 Mon Sep 17 00:00:00 2001
From: Adam Wight <adam.wight@wikimedia.de>
Date: Thu, 8 Apr 2021 10:07:01 +0200
Subject: [PATCH 4469/4742] Send new "updateGutter" signal on gutter resize

Some consumers need to know when the gutter width changes.  For
example, the MediaWiki Visual Editor maintains a transparent overlay
that must always line up with the CodeMirror text area.  The gutters
can be resized, for example when line numbering is toggled and
content grows beyond 1,000 lines.  This shifts the text area, and
some styles may need to recalculate based on the new value of
`display.gutters.offsetWidth`.
---
 src/display/update_display.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/display/update_display.js b/src/display/update_display.js
index e6c21a0ad7..83c2540705 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -5,6 +5,7 @@ import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } fr
 import { mac, webkit } from "../util/browser.js"
 import { activeElt, removeChildren, contains } from "../util/dom.js"
 import { hasHandler, signal } from "../util/event.js"
+import { signalLater } from "../util/operation_group.js"
 import { indexOf } from "../util/misc.js"
 
 import { buildLineElement, updateLineForChanges } from "./update_line.js"
@@ -254,6 +255,8 @@ function patchDisplay(cm, updateNumbersFrom, dims) {
 export function updateGutterSpace(display) {
   let width = display.gutters.offsetWidth
   display.sizer.style.marginLeft = width + "px"
+  // Send an event to consumers responding to changes in gutter width.
+  signalLater(display, "gutterChanged", display)
 }
 
 export function setDocumentHeight(cm, measure) {

From 86af2dc6e2fc9082756d7be08d7606d09af2e85c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 14 Apr 2021 17:22:18 +0200
Subject: [PATCH 4470/4742] [show-hint addon] Fix race condition in scroll
 measurement

Issue #6656
Issue #6467
---
 addon/hint/show-hint.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 9ba6465316..8f236562b7 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -322,6 +322,7 @@
 
     cm.on("scroll", this.onScroll = function() {
       var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
+      if (!startScroll) startScroll = cm.getScrollInfo();
       var newTop = top + startScroll.top - curScroll.top;
       var point = newTop - (parentWindow.pageYOffset || (ownerDocument.documentElement || ownerDocument.body).scrollTop);
       if (!below) point += hints.offsetHeight;

From 97ee57515599e95972567c41ed9176ddfb1f4fb9 Mon Sep 17 00:00:00 2001
From: Joe Predham <joseph@predham.com>
Date: Mon, 19 Apr 2021 03:32:45 -0700
Subject: [PATCH 4471/4742] [emacs bindings] Define named commands for the key
 bindings

---
 keymap/emacs.js | 382 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 249 insertions(+), 133 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 91d8abbbc4..84744e40a9 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -11,6 +11,7 @@
 })(function(CodeMirror) {
   "use strict";
 
+  var cmds = CodeMirror.commands;
   var Pos = CodeMirror.Pos;
   function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
 
@@ -30,7 +31,8 @@
 
   var lastKill = null;
 
-  function kill(cm, from, to, ring, text) {
+  // Internal generic kill function, used by several mapped kill "family" functions.
+  function _kill(cm, from, to, ring, text) {
     if (text == null) text = cm.getRange(from, to);
 
     if (ring == "grow" && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen))
@@ -156,17 +158,17 @@
     var i = selections.length;
     while (i--) {
       cursor = selections[i].head;
-      kill(cm, cursor, findEnd(cm, cursor, by, dir), ring);
+      _kill(cm, cursor, findEnd(cm, cursor, by, dir), ring);
     }
   }
 
-  function killRegion(cm, ring) {
+  function _killRegion(cm, ring) {
     if (cm.somethingSelected()) {
       var selections = cm.listSelections(), selection;
       var i = selections.length;
       while (i--) {
         selection = selections[i];
-        kill(cm, selection.anchor, selection.head, ring);
+        _kill(cm, selection.anchor, selection.head, ring);
       }
       return true;
     }
@@ -205,13 +207,6 @@
     }
   }
 
-  function addPrefixMap(cm) {
-    cm.state.emacsPrefixMap = true;
-    cm.addKeyMap(prefixMap);
-    cm.on("keyHandled", maybeRemovePrefixMap);
-    cm.on("inputRead", maybeRemovePrefixMap);
-  }
-
   function maybeRemovePrefixMap(cm, arg) {
     if (typeof arg == "string" && (/^\d$/.test(arg) || arg == "Ctrl-U")) return;
     cm.removeKeyMap(prefixMap);
@@ -222,7 +217,7 @@
 
   // Utilities
 
-  function setMark(cm) {
+  cmds.setMark = function (cm) {
     cm.setCursor(cm.getCursor());
     cm.setExtending(!cm.getExtending());
     cm.on("change", function() { cm.setExtending(false); });
@@ -276,145 +271,266 @@
     }
   }
 
-  function quit(cm) {
+  // Commands. Names should match emacs function names (albeit in camelCase)
+  // except where emacs function names collide with code mirror core commands.
+
+  cmds.killRegion = function(cm) {
+    _kill(cm, cm.getCursor("start"), cm.getCursor("end"), true);
+  };
+
+  // Maps to emacs kill-line
+  cmds.killLineEmacs = repeated(function(cm) {
+    var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
+    var text = cm.getRange(start, end);
+    if (!/\S/.test(text)) {
+      text += "\n";
+      end = Pos(start.line + 1, 0);
+    }
+    _kill(cm, start, end, "grow", text);
+  });
+
+  cmds.killRingSave = function(cm) {
+    addToRing(cm.getSelection());
+    clearMark(cm);
+  };
+
+  cmds.yank = function(cm) {
+    var start = cm.getCursor();
+    cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
+    cm.setSelection(start, cm.getCursor());
+  };
+
+  cmds.yankPop = function(cm) {
+    cm.replaceSelection(popFromRing(), "around", "paste");
+  };
+
+  cmds.forwardChar = move(byChar, 1);
+
+  cmds.backwardChar = move(byChar, -1)
+
+  cmds.deleteChar = function(cm) { killTo(cm, byChar, 1, false); };
+
+  cmds.deleteForwardChar = function(cm) {
+    _killRegion(cm, false) || killTo(cm, byChar, 1, false);
+  };
+
+  cmds.deleteBackwardChar = function(cm) {
+    _killRegion(cm, false) || killTo(cm, byChar, -1, false);
+  };
+
+  cmds.forwardWord = move(byWord, 1);
+
+  cmds.backwardWord = move(byWord, -1);
+
+  cmds.killWord = function(cm) { killTo(cm, byWord, 1, "grow"); };
+
+  cmds.backwardKillWord = function(cm) { killTo(cm, byWord, -1, "grow"); };
+
+  cmds.nextLine = move(byLine, 1);
+
+  cmds.previousLine = move(byLine, -1);
+
+  cmds.scrollDownCommand = move(byPage, 1);
+
+  cmds.scrollUpCommand = move(byPage, -1);
+
+  cmds.backwardParagraph = move(byParagraph, -1);
+
+  cmds.forwardParagraph = move(byParagraph, 1);
+
+  cmds.backwardSentence = move(bySentence, -1);
+
+  cmds.forwardSentence = move(bySentence, 1);
+
+  cmds.killSentence = function(cm) { killTo(cm, bySentence, 1, "grow"); };
+
+  cmds.backwardKillSentence = function(cm) {
+    _kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), "grow");
+  };
+
+  cmds.killSexp = function(cm) { killTo(cm, byExpr, 1, "grow"); };
+
+  cmds.backwardKillSexp = function(cm) { killTo(cm, byExpr, -1, "grow"); };
+
+  cmds.forwardSexp = move(byExpr, 1);
+
+  cmds.backwardSexp = move(byExpr, -1);
+
+  cmds.markSexp = function(cm) {
+    var cursor = cm.getCursor();
+    cm.setSelection(findEnd(cm, cursor, byExpr, 1), cursor);
+  };
+
+  cmds.transposeSexps = function(cm) {
+    var leftStart = byExpr(cm, cm.getCursor(), -1);
+    var leftEnd = byExpr(cm, leftStart, 1);
+    var rightEnd = byExpr(cm, leftEnd, 1);
+    var rightStart = byExpr(cm, rightEnd, -1);
+    cm.replaceRange(cm.getRange(rightStart, rightEnd) +
+                    cm.getRange(leftEnd, rightStart) +
+                    cm.getRange(leftStart, leftEnd), leftStart, rightEnd);
+  };
+
+  cmds.backwardUpList = repeated(toEnclosingExpr);
+
+  cmds.justOneSpace = function(cm) {
+    var pos = cm.getCursor(), from = pos.ch;
+    var to = pos.ch, text = cm.getLine(pos.line);
+    while (from && /\s/.test(text.charAt(from - 1))) --from;
+    while (to < text.length && /\s/.test(text.charAt(to))) ++to;
+    cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
+  };
+
+  cmds.openLine = repeated(function(cm) {
+    cm.replaceSelection("\n", "start");
+  });
+
+  // maps to emacs 'transpose-chars'
+  cmds.transposeCharsRepeatable = repeated(function(cm) {
+    cm.execCommand("transposeChars");
+  });
+
+  cmds.capitalizeWord = repeated(function(cm) {
+    operateOnWord(cm, function(w) {
+      var letter = w.search(/\w/);
+      if (letter == -1) return w;
+      return w.slice(0, letter) + w.charAt(letter).toUpperCase() +
+          w.slice(letter + 1).toLowerCase();
+    });
+  });
+
+  cmds.upcaseWord = repeated(function(cm) {
+    operateOnWord(cm, function(w) { return w.toUpperCase(); });
+  });
+
+  cmds.downcaseWord = repeated(function(cm) {
+    operateOnWord(cm, function(w) { return w.toLowerCase(); });
+  });
+
+  // maps to emacs 'undo'
+  cmds.undoRepeatable = repeated("undo");
+
+  cmds.keyboardQuit = function(cm) {
     cm.execCommand("clearSearch");
     clearMark(cm);
   }
 
-  CodeMirror.emacs = {kill: kill, killRegion: killRegion, repeated: repeated};
+  cmds.newline = repeated(function(cm) { cm.replaceSelection("\n", "end"); });
 
-  // Actual keymap
+  cmds.gotoLine = function(cm) {
+    var prefix = getPrefix(cm, true);
+    if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
 
-  var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
-    "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"), true);},
-    "Ctrl-K": repeated(function(cm) {
-      var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
-      var text = cm.getRange(start, end);
-      if (!/\S/.test(text)) {
-        text += "\n";
-        end = Pos(start.line + 1, 0);
-      }
-      kill(cm, start, end, "grow", text);
-    }),
-    "Alt-W": function(cm) {
-      addToRing(cm.getSelection());
-      clearMark(cm);
-    },
-    "Ctrl-Y": function(cm) {
-      var start = cm.getCursor();
-      cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
-      cm.setSelection(start, cm.getCursor());
-    },
-    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around", "paste");},
-
-    "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
-
-    "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
-    "Right": move(byChar, 1), "Left": move(byChar, -1),
-    "Ctrl-D": function(cm) { killTo(cm, byChar, 1, false); },
-    "Delete": function(cm) { killRegion(cm, false) || killTo(cm, byChar, 1, false); },
-    "Ctrl-H": function(cm) { killTo(cm, byChar, -1, false); },
-    "Backspace": function(cm) { killRegion(cm, false) || killTo(cm, byChar, -1, false); },
-
-    "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
-    "Alt-Right": move(byWord, 1), "Alt-Left": move(byWord, -1),
-    "Alt-D": function(cm) { killTo(cm, byWord, 1, "grow"); },
-    "Alt-Backspace": function(cm) { killTo(cm, byWord, -1, "grow"); },
-
-    "Ctrl-N": move(byLine, 1), "Ctrl-P": move(byLine, -1),
-    "Down": move(byLine, 1), "Up": move(byLine, -1),
-    "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "End": "goLineEnd", "Home": "goLineStart",
-
-    "Alt-V": move(byPage, -1), "Ctrl-V": move(byPage, 1),
-    "PageUp": move(byPage, -1), "PageDown": move(byPage, 1),
-
-    "Ctrl-Up": move(byParagraph, -1), "Ctrl-Down": move(byParagraph, 1),
-
-    "Alt-A": move(bySentence, -1), "Alt-E": move(bySentence, 1),
-    "Alt-K": function(cm) { killTo(cm, bySentence, 1, "grow"); },
-
-    "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1, "grow"); },
-    "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1, "grow"); },
-    "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1, "grow"),
-
-    "Shift-Ctrl-Alt-2": function(cm) {
-      var cursor = cm.getCursor();
-      cm.setSelection(findEnd(cm, cursor, byExpr, 1), cursor);
-    },
-    "Ctrl-Alt-T": function(cm) {
-      var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1);
-      var rightEnd = byExpr(cm, leftEnd, 1), rightStart = byExpr(cm, rightEnd, -1);
-      cm.replaceRange(cm.getRange(rightStart, rightEnd) + cm.getRange(leftEnd, rightStart) +
-                      cm.getRange(leftStart, leftEnd), leftStart, rightEnd);
-    },
-    "Ctrl-Alt-U": repeated(toEnclosingExpr),
-
-    "Alt-Space": function(cm) {
-      var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
-      while (from && /\s/.test(text.charAt(from - 1))) --from;
-      while (to < text.length && /\s/.test(text.charAt(to))) ++to;
-      cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
-    },
-    "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }),
-    "Ctrl-T": repeated(function(cm) {
-      cm.execCommand("transposeChars");
-    }),
-
-    "Alt-C": repeated(function(cm) {
-      operateOnWord(cm, function(w) {
-        var letter = w.search(/\w/);
-        if (letter == -1) return w;
-        return w.slice(0, letter) + w.charAt(letter).toUpperCase() + w.slice(letter + 1).toLowerCase();
-      });
-    }),
-    "Alt-U": repeated(function(cm) {
-      operateOnWord(cm, function(w) { return w.toUpperCase(); });
-    }),
-    "Alt-L": repeated(function(cm) {
-      operateOnWord(cm, function(w) { return w.toLowerCase(); });
-    }),
+    getInput(cm, "Goto line", function(str) {
+      var num;
+      if (str && !isNaN(num = Number(str)) && num == (num|0) && num > 0)
+      cm.setCursor(num - 1);
+    });
+  };
 
-    "Alt-;": "toggleComment",
+  cmds.indentRigidly = function(cm) {
+    cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
+  };
+
+  cmds.exchangePointAndMark = function(cm) {
+    cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
+  };
 
-    "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
-    "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
+  cmds.quotedInsertTab = repeated("insertTab");
+
+  cmds.universalArgument = function addPrefixMap(cm) {
+    cm.state.emacsPrefixMap = true;
+    cm.addKeyMap(prefixMap);
+    cm.on("keyHandled", maybeRemovePrefixMap);
+    cm.on("inputRead", maybeRemovePrefixMap);
+  };
+
+  CodeMirror.emacs = {kill: _kill, killRegion: _killRegion, repeated: repeated};
+
+  // Actual keymap
+  var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
+    "Ctrl-W": "killRegion",
+    "Ctrl-K": "killLineEmacs",
+    "Alt-W": "killRingSave",
+    "Ctrl-Y": "yank",
+    "Alt-Y": "yankPop",
+    "Ctrl-Space": "setMark",
+    "Ctrl-Shift-2": "setMark",
+    "Ctrl-F": "forwardChar",
+    "Ctrl-B": "backwardChar",
+    "Right": "forwardChar",
+    "Left": "backwardChar",
+    "Ctrl-D": "deleteChar",
+    "Delete": "deleteForwardChar",
+    "Ctrl-H": "deleteBackwardChar",
+    "Backspace": "deleteBackwardChar",
+    "Alt-F": "forwardWord",
+    "Alt-B": "backwardWord",
+    "Alt-Right": "forwardWord",
+    "Alt-Left": "backwardWord",
+    "Alt-D": "killWord",
+    "Alt-Backspace": "backwardKillWord",
+    "Ctrl-N": "nextLine",
+    "Ctrl-P": "previousLine",
+    "Down": "nextLine",
+    "Up": "previousLine",
+    "Ctrl-A": "goLineStart",
+    "Ctrl-E": "goLineEnd",
+    "End": "goLineEnd",
+    "Home": "goLineStart",
+    "Alt-V": "scrollDownCommand",
+    "Ctrl-V": "scrollUpCommand",
+    "PageUp": "scrollUpCommand",
+    "PageDown": "scrollDownCommand",
+    "Ctrl-Up": "backwardParagraph",
+    "Ctrl-Down": "forwardParagraph",
+    "Alt-{": "backwardParagraph",
+    "Alt-}": "forwardParagraph",
+    "Alt-A": "backwardSentence",
+    "Alt-E": "forwardSentence",
+    "Alt-K": "killSentence",
+    "Ctrl-X Delete": "backwardKillSentence",
+    "Ctrl-Alt-K": "killSexp",
+    "Ctrl-Alt-Backspace": "backwardKillSexp",
+    "Ctrl-Alt-F": "forwardSexp",
+    "Ctrl-Alt-B": "backwardSexp",
+    "Shift-Ctrl-Alt-2": "markSexp",
+    "Ctrl-Alt-T": "transposeSexps",
+    "Ctrl-Alt-U": "backwardUpList",
+    "Alt-Space": "justOneSpace",
+    "Ctrl-O": "openLine",
+    "Ctrl-T": "transposeCharsRepeatable",
+    "Alt-C": "capitalizeWord",
+    "Alt-U": "upcaseWord",
+    "Alt-L": "downcaseWord",
+    "Alt-;": "toggleComment",
+    "Ctrl-/": "undoRepeatable",
+    "Shift-Ctrl--": "undoRepeatable",
+    "Ctrl-Z": "undoRepeatable",
+    "Cmd-Z": "undoRepeatable",
+    "Ctrl-X U": "undoRepeatable",
     "Shift-Ctrl-Z": "redo",
-    "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
-    "Ctrl-S": "findPersistentNext", "Ctrl-R": "findPersistentPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
+    "Shift-Alt-,": "goDocStart",
+    "Shift-Alt-.": "goDocEnd",
+    "Ctrl-S": "findPersistentNext",
+    "Ctrl-R": "findPersistentPrev",
+    "Ctrl-G": "keyboardQuit",
+    "Shift-Alt-5": "replace",
     "Alt-/": "autocomplete",
     "Enter": "newlineAndIndent",
-    "Ctrl-J": repeated(function(cm) { cm.replaceSelection("\n", "end"); }),
+    "Ctrl-J": "newline",
     "Tab": "indentAuto",
-
-    "Alt-G G": function(cm) {
-      var prefix = getPrefix(cm, true);
-      if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
-
-      getInput(cm, "Goto line", function(str) {
-        var num;
-        if (str && !isNaN(num = Number(str)) && num == (num|0) && num > 0)
-          cm.setCursor(num - 1);
-      });
-    },
-
-    "Ctrl-X Tab": function(cm) {
-      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
-    },
-    "Ctrl-X Ctrl-X": function(cm) {
-      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
-    },
+    "Alt-G G": "gotoLine",
+    "Ctrl-X Tab": "indentRigidly",
+    "Ctrl-X Ctrl-X": "exchangePointAndMark",
     "Ctrl-X Ctrl-S": "save",
     "Ctrl-X Ctrl-W": "save",
     "Ctrl-X S": "saveAll",
     "Ctrl-X F": "open",
-    "Ctrl-X U": repeated("undo"),
     "Ctrl-X K": "close",
-    "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), "grow"); },
     "Ctrl-X H": "selectAll",
-
-    "Ctrl-Q Tab": repeated("insertTab"),
-    "Ctrl-U": addPrefixMap,
+    "Ctrl-Q Tab": "quotedInsertTab",
+    "Ctrl-U": "universalArgument",
     "fallthrough": "default"
   });
 

From eac70bb1a31a08201e5705c788cd72e6283958f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Apr 2021 10:18:32 +0200
Subject: [PATCH 4472/4742] Mark version 5.61.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 18 ++++++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 11 +++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2d6d422fcf..125abd4f26 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,7 @@ Abhishek Gahlot
 Adam Ahmed
 Adam King
 Adam Particka
+Adam Wight
 adanlobato
 Adán Lobato
 Aditya Toshniwal
@@ -28,6 +29,7 @@ AlbertHilb
 Alberto González Palomo
 Alberto Pose
 Albert Xing
+Alexander Marks
 Alexander Pavlov
 Alexander Schepanovski
 Alexander Shvets
@@ -265,6 +267,7 @@ Fauntleroy
 fbuchinger
 feizhang365
 Felipe Lalanne
+Felipe S. S. Schneider
 Felix Raab
 ficristo
 Filip Noetzel
@@ -477,6 +480,7 @@ Kim-Anh Tran
 Klaus Silveira
 Koh Zi Han, Cliff
 komakino
+Konstantin Chernenko
 Konstantin Lopuhin
 koops
 Kris Ciccarello
@@ -589,6 +593,7 @@ meshuamam
 Metatheos
 Micah Dubinko
 Michael
+Michael Chirico
 Michael Goderbauer
 Michael Grey
 Michael Kaminsky
@@ -798,6 +803,7 @@ silverwind
 Simon Edwards
 Simon Huber
 sinkuu
+Slava Rozhnev
 snasa
 soliton4
 sonson
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1772b5aa98..fbf4abcd85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 5.61.0 (2021-04-20)
+
+### Bug fixes
+
+Improve support for being in a shadow DOM in contenteditable mode.
+
+Prevent line number from being read by screen readers.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix a crash caused by a race condition.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Improve scope tracking.
+
+### New features
+
+The library now emits an `"updateGutter"` event when the gutter width changes.
+
+[emacs bindings](https://codemirror.net/demo/emacs.html): Provide named commands for all bindings.
+
 ## 5.60.0 (2021-03-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index d27e37f58b..565c506494 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.60.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.61.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 ae2622fa1c..da16abfe7b 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,17 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2021: <a href="https://codemirror.net/codemirror-5.61.0.zip">Version 5.61.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>The library now emits an <code>"updateGutter"</code> event when the gutter width changes.</li>
+    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Provide named commands for all bindings.</li>
+    <li>Improve support for being in a shadow DOM in contenteditable mode.</li>
+    <li>Prevent line number from being read by screen readers.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix a crash caused by a race condition.</li>
+    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve scope tracking.</li>
+  </ul>
+
   <p class="rel">20-03-2021: <a href="https://codemirror.net/codemirror-5.60.0.zip">Version 5.60.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 09ee9d3ac5..9180f4c09b 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.60.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.61.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 6bcff708af..66e0d9fb32 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.60.0",
+  "version": "5.61.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 2d63991b5c..b7972279de 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.60.0"
+CodeMirror.version = "5.61.0"

From dc3952a60b6cf8ea7b2cb66521ae5165a04d444e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Apr 2021 10:24:13 +0200
Subject: [PATCH 4473/4742] [simple-mode addon] Don't drop regexp unicode flags

See https://discuss.codemirror.net/t/some-of-my-simple-mode-unicode-patterns-dont-work-why/3101
---
 addon/mode/simple.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index a1c626417a..0d8cbdebd8 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -68,6 +68,7 @@
     var flags = "";
     if (val instanceof RegExp) {
       if (val.ignoreCase) flags = "i";
+      if (val.unicode) flags += "u"
       val = val.source;
     } else {
       val = String(val);

From 88f32d57c5d17bf142b10f96d29a0d28cb800c5b Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <bmeurer@google.com>
Date: Tue, 20 Apr 2021 15:27:04 +0200
Subject: [PATCH 4474/4742] [wast mode] Add support for Wasm EH control
 instructions.

Bug: https://crbug.com/1199329
Refs: WebAssembly/exception-handling#23
---
 mode/wast/test.js | 9 ++++++++-
 mode/wast/wast.js | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mode/wast/test.js b/mode/wast/test.js
index babb4f629d..0ebb388c3c 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -46,7 +46,14 @@
      '[keyword call_indirect] [variable-2 $table] ([keyword param] [atom f32] [atom f64]) ([keyword result] [atom i32] [atom i64])',
      '[keyword return_call] [variable-2 $func0]',
      '[keyword return_call_indirect] ([keyword param] [atom f32] [atom f64]) ([keyword result] [atom i32] [atom i64])',
-     '[keyword select] ([keyword local.get] [number 1]) ([keyword local.get] [number 2]) ([keyword local.get] [number 3])');
+     '[keyword select] ([keyword local.get] [number 1]) ([keyword local.get] [number 2]) ([keyword local.get] [number 3])',
+     '[keyword try] ([keyword result] [atom i32])',
+     '[keyword throw] [number 0]',
+     '[keyword rethrow] [number 0]',
+     '[keyword catch] [number 0]',
+     '[keyword catch_all]',
+     '[keyword delegate] [number 0]',
+     '[keyword unwind]');
 
 
   MT('memory-instructions',
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 9bddc88787..471ace5be7 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -18,6 +18,8 @@ var kKeywords = [
     "call(_indirect|_ref)?",
     "current_memory",
     "\\bdata\\b",
+    "catch(_all)?",
+    "delegate",
     "drop",
     "elem",
     "else",
@@ -36,13 +38,17 @@ var kKeywords = [
     "offset",
     "param",
     "result",
+    "rethrow",
     "return(_call(_indirect|_ref)?)?",
     "select",
     "start",
     "table(\\.(size|get|set|size|grow|fill|init|copy))?",
     "then",
+    "throw",
+    "try",
     "type",
     "unreachable",
+    "unwind",
 
     // Numeric opcodes.
     "i(32|64)\\.(store(8|16)|(load(8|16)_[su]))",

From 804968bfbb23ef72b3e13a6c36ff7e9e343def46 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 23 Apr 2021 11:03:27 +0200
Subject: [PATCH 4475/4742] [jsx mode] Improve the way expressions are skipped
 in the outer JS mode

Closes #6662
---
 mode/javascript/javascript.js | 3 +--
 mode/jsx/jsx.js               | 2 +-
 mode/jsx/test.js              | 7 +++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index f9fb4ec1f7..122c1845f1 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -923,8 +923,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     expressionAllowed: expressionAllowed,
 
     skipExpression: function(state) {
-      var top = state.cc[state.cc.length - 1]
-      if (top == expression || top == expressionNoComma) state.cc.pop()
+      parseJS(state, "atom", "atom", "true", new CodeMirror.StringStream("", 2, null))
     }
   };
 });
diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 889d3fe5e7..beea3b9139 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -104,9 +104,9 @@
 
     function jsToken(stream, state, cx) {
       if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
-        jsMode.skipExpression(cx.state)
         state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "", "")),
                                     xmlMode, 0, state.context)
+        jsMode.skipExpression(cx.state)
         return null
       }
 
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index 5ecd5a8b01..b47a3521ec 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -73,6 +73,13 @@
   MT("tag_attribute",
      "([bracket&tag <][tag foo] [attribute bar]=[bracket&tag <][tag foo][bracket&tag />/>][operator ++])")
 
+  MT("in_array",
+     "[[",
+     "  [bracket&tag <][tag Something][bracket&tag />],",
+     "  [string-2 `${][variable x][string-2 }`],",
+     "  [variable y]",
+     "]]")
+
   var ts_mode = CodeMirror.getMode({indentUnit: 2}, "text/typescript-jsx")
   function TS(name) { test.mode(name, ts_mode, Array.prototype.slice.call(arguments, 1)) }
 

From 555ed623aa99f98034770e70daa74b840f6354e8 Mon Sep 17 00:00:00 2001
From: Torben Bundt <bundt@directbox.com>
Date: Sun, 25 Apr 2021 11:28:46 +0200
Subject: [PATCH 4476/4742] [velocity mode] Allow an exclamation point at start
 of variable

The exclamation point at the start of a variable makes it 'silent' (it's wont be printed in case it is null)
---
 mode/velocity/velocity.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index 1d17c84ebe..79a621a5b0 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -82,6 +82,7 @@ CodeMirror.defineMode("velocity", function() {
         }
         // variable?
         else if (ch == "$") {
+            stream.eat("!");
             stream.eatWhile(/[\w\d\$_\.{}-]/);
             // is it one of the specials?
             if (specials && specials.propertyIsEnumerable(stream.current())) {

From dc2070aac8b8dff80d86d7c27998a151ad4c52e0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 28 Apr 2021 10:48:49 +0200
Subject: [PATCH 4477/4742] Make sure options.direction and doc.direction stay
 in sync

Closes #6667
---
 src/model/document_data.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/model/document_data.js b/src/model/document_data.js
index d946e7af10..c42048286f 100644
--- a/src/model/document_data.js
+++ b/src/model/document_data.js
@@ -94,6 +94,7 @@ export function attachDoc(cm, doc) {
   estimateLineHeights(cm)
   loadMode(cm)
   setDirectionClass(cm)
+  cm.options.direction = doc.direction
   if (!cm.options.lineWrapping) findMaxLine(cm)
   cm.options.mode = doc.modeOption
   regChange(cm)

From ca15ef723bd4933a42d34d36fda8ce2a593a9e60 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 2 May 2021 14:33:42 +0200
Subject: [PATCH 4478/4742] [yaml-frontmatter mode] Pass through indentation
 queries to inner modes

Closes #6673
---
 mode/yaml-frontmatter/yaml-frontmatter.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
index f9050ad6a8..88c845e222 100644
--- a/mode/yaml-frontmatter/yaml-frontmatter.js
+++ b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -59,6 +59,10 @@
       innerMode: function (state) {
         return {mode: curMode(state), state: state.inner}
       },
+      indent: function(state, a, b) {
+        var mode = curMode(state)
+        return mode.indent ? mode.indent(state.inner, a, b) : CodeMirror.Pass
+      },
       blankLine: function (state) {
         var mode = curMode(state)
         if (mode.blankLine) return mode.blankLine(state.inner)

From 484dde3c7de99a9d14da5c8669280239e487ea09 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 4 May 2021 14:11:00 +0200
Subject: [PATCH 4479/4742] Add 4me sponsor logo

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

diff --git a/index.html b/index.html
index 9180f4c09b..f5902c11b6 100644
--- a/index.html
+++ b/index.html
@@ -208,6 +208,7 @@ <h2>Sponsors</h2>
     <li><a href="http://observablehq.com/"><img alt="Observable" src='data:image/svg+xml;utf8,<svg viewBox="-3 0 171 28" width="350" height="57" fill="black" xmlns="http://www.w3.org/2000/svg"><path d="M12.5 22.66c-1.15 0-2.15-.25-3-.75a5.09 5.09 0 01-1.94-2.04 10.80 10.80 0 01-.99-2.74A14.74 14.74 0 016.25 14c0-.83.05-1.62.16-2.38.10-.75.30-1.52.60-2.31a7.37 7.37 0 011.12-2.03 5.11 5.11 0 011.80-1.40c.74-.36 1.59-.53 2.54-.53 1.15 0 2.15.25 3 .75.84.50 1.51 1.21 1.94 2.04.45.86.78 1.77.99 2.74.20.96.31 2.00.31 3.12a16.7 16.7 0 01-.16 2.38 10.63 10.63 0 01-.61 2.31c-.30.78-.67 1.46-1.13 2.03-.45.57-1.05 1.04-1.79 1.40-.74.36-1.59.53-2.54.53zm2.20-6.37c.59-.6.93-1.43.91-2.29 0-.89-.29-1.65-.89-2.29-.59-.63-1.34-.95-2.22-.95s-1.63.31-2.23.95A3.23 3.23 0 009.37 14c0 .89.29 1.65.89 2.29.59.63 1.34.95 2.22.95s1.62-.31 2.20-.95zM12.5 27C19.40 27 25 21.18 25 14S19.40 1 12.5 1 0 6.82 0 14s5.59 13 12.5 13z"/><g transform="translate(30, -3.5)"><path d="M6.41 17.75c0 1.09.05 2.09.15 2.98.11.87.29 1.62.53 2.25.23.62.54 1.11.91 1.46.37.33.82.50 1.36.50.54 0 .99-.17 1.36-.50.37-.35.67-.84.91-1.46.23-.62.40-1.37.50-2.25.11-.89.17-1.89.17-2.98 0-1.08-.06-2.06-.17-2.96-.10-.89-.27-1.65-.50-2.27-.23-.64-.54-1.13-.91-1.46-.37-.35-.82-.53-1.36-.53s-.99.17-1.36.53c-.37.33-.67.82-.91 1.46-.23.62-.41 1.38-.53 2.27-.10.89-.15 1.88-.15 2.96zm2.96-8.75c1.06 0 2.08.17 3.06.53a7.36 7.36 0 012.60 1.62c.76.72 1.35 1.63 1.79 2.73.45 1.09.68 2.38.68 3.87 0 1.48-.22 2.77-.68 3.87-.43 1.09-1.03 2.00-1.79 2.73a7.07 7.07 0 01-2.60 1.62 8.92 8.92 0 01-3.06.53 9.14 9.14 0 01-3.08-.53 7.36 7.36 0 01-2.60-1.62c-.74-.72-1.34-1.63-1.79-2.73-.43-1.09-.65-2.38-.65-3.87 0-1.48.21-2.77.65-3.87.45-1.09 1.06-2.00 1.82-2.73a7.36 7.36 0 012.60-1.62 8.92 8.92 0 013.06-.53zm9.32 17.03v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40.60.27 1.13.67 1.59 1.21.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.05.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.62-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.62-.91-.40 0-.8.12-1.18.38v7.46c.33.23.73.35 1.19.35zm13.10 2.42c-1.75 0-3.30-.41-4.65-1.24l.12-3.23h2.30l.40 2.63c.28.11.57.21.86.27.30.05.62.07.96.07.64 0 1.13-.09 1.49-.27.35-.20.53-.54.53-1.03 0-.33-.13-.63-.40-.88-.25-.27-.80-.52-1.64-.76l-1.44-.37c-1.01-.27-1.78-.74-2.30-1.41-.50-.67-.75-1.51-.75-2.50 0-.62.11-1.20.35-1.74a3.95 3.95 0 011.08-1.39c.48-.38 1.08-.69 1.77-.91.71-.22 1.51-.33 2.43-.33.77 0 1.49.08 2.15.25.65.16 1.34.42 2.05.75l-.20 2.85H41.75l-.55-2.25a4.91 4.91 0 00-.55-.07 3.89 3.89 0 00-.68-.05c-.48 0-.89.11-1.21.32-.32.20-.48.52-.48.96 0 .13.02.27.07.40.05.11.14.24.27.38a4.3 4.3 0 00.60.37c.27.11.62.23 1.06.35l1.41.38c1.18.32 2.02.81 2.53 1.49.52.65.78 1.49.78 2.50 0 .74-.14 1.39-.43 1.94a3.84 3.84 0 01-1.21 1.39c-.52.37-1.15.64-1.89.83-.74.18-1.57.27-2.50.27zM52.83 13.27c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.85 4.85 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63H51.11c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.07 5.07 0 001.24-.86l.98.96c-.54 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.29.70a7.82 7.82 0 01-2.63-.43 6.19 6.19 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.57-2.05a6.61 6.61 0 012.2-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.17.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.19c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53zM59.31 26v-1.29l1.21-.27c.01-.60.02-1.24.02-1.92V19.09v-.88c0-.23-.00-.45-.02-.65 0-.20-.00-.39-.02-.58 0-.20-.00-.43-.02-.68l-1.36-.22v-1.03l5.59-1.74.45.27.20 2.91c.33-1.08.81-1.88 1.44-2.40.64-.52 1.26-.78 1.87-.78.62 0 1.14.18 1.56.55.43.35.7.92.78 1.69-.03.69-.23 1.22-.60 1.59-.37.37-.81.55-1.31.55-.42 0-.80-.11-1.13-.32-.32-.21-.64-.57-.98-1.06l-.12-.17c-.30.33-.60.77-.91 1.31a5.62 5.62 0 00-.58 1.67V22.40c0 .65.00 1.28.02 1.87l1.97.43V26h-8.04zm19.93 0h-2.27l-4.50-10.88-1.21-.25v-1.19h7.61v1.19l-1.34.30 2.1 5.79 1.94-5.82-1.39-.27v-1.19h4.75v1.19l-1.51.25L79.25 26zm11.35-1.79c.32 0 .67-.14 1.06-.43v-4.2c-.25.06-.49.16-.73.27a2.55 2.55 0 00-.55.35 2.97 2.97 0 00-.53.50 2.36 2.36 0 00-.40.73c-.1.27-.15.57-.15.91 0 .62.12 1.08.38 1.39.25.30.56.45.93.45zm4.17 2.20c-.81 0-1.45-.15-1.92-.45-.47-.30-.81-.75-1.03-1.34-.25.27-.49.51-.73.73-.22.22-.47.41-.75.58-.27.15-.57.27-.91.35a4.94 4.94 0 01-1.19.12c-1.01 0-1.81-.27-2.40-.83-.59-.57-.88-1.38-.88-2.43 0-.48.07-.93.22-1.34.15-.42.42-.81.81-1.16.40-.35.93-.68 1.59-.98.67-.30 1.52-.59 2.55-.86l.70-.17c.27-.06.54-.14.83-.22v-.91c0-.54-.02-.98-.07-1.34-.05-.37-.15-.66-.30-.88a1.05 1.05 0 00-.58-.45c-.23-.10-.55-.15-.96-.15h-.38v.86c0 1.03-.21 1.76-.63 2.20-.42.42-.90.63-1.44.63-1.03 0-1.67-.45-1.92-1.36 0-1.09.51-1.98 1.54-2.65 1.04-.69 2.59-1.03 4.63-1.03.87 0 1.62.09 2.22.27.60.18 1.09.48 1.46.88.38.38.66.89.83 1.51.16.62.25 1.36.25 2.22v5.79c0 .28.14.43.43.43a.54.54 0 00.30-.10c.1-.06.22-.22.38-.45l.73.40c-.30.77-.71 1.33-1.24 1.67-.52.32-1.24.48-2.15.48zm3.89-.38v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40a4.42 4.42 0 011.59 1.21c.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.04.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.61-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.61-.91-.40 0-.80.12-1.19.38v7.46c.33.23.73.35 1.19.35zm8.40-15.08l5.84-1.13.43.27-.10 3.51v11.03l.05 1.89 1.13.22V26h-7.18v-1.29l1.13-.25a70.7 70.7 0 00.02-1.87c.01-.62.02-1.25.02-1.89v-10.4l-1.36-.25V8.89zm15.30 4.37c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.84 4.84 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63h-7.03c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.09 5.09 0 001.24-.86l.98.96c-.53 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.28.70a7.83 7.83 0 01-2.63-.43 6.18 6.18 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.56-2.05a6.61 6.61 0 012.20-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.16.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.18c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53z"/></g></svg>'></a></li>
     <li><a href="https://holmusk.com"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" style="background: %231649BF"><g transform="translate(-780, -40)" fill="%23FFFFFF"><path d="M780,4 L840,4 L840,1 L780,1 L780,4 Z M794,55 L794,84.65 L796.806,84.65 L796.806,72.739 C796.806,69.633 799.325,67.104 802.420,67.104 C805.516,67.104 808.031,69.633 808.031,72.739 L808.031,84.65 L810.838,84.65 L810.838,72.739 C810.838,68.077 807.062,64.288 802.420,64.288 C800.271,64.288 798.311,65.106 796.819,66.447 L796.819,55 L794,55 Z M817.582,63.931 C815.372,63.931 813.367,64.798 811.862,66.199 L812.163,66.653 C812.613,67.33 812.972,68.051 813.248,68.805 C814.281,67.549 815.840,66.746 817.582,66.746 C820.674,66.746 823.193,69.276 823.193,72.382 L823.193,72.385 L823.193,84.293 L826,84.293 L826,72.385 L826,72.379 C826,70.658 825.483,69.057 824.598,67.72 L824.598,67.723 C824.537,67.629 824.473,67.543 824.409,67.452 C824.345,67.365 824.280,67.278 824.213,67.191 C824.139,67.098 824.068,67.008 823.995,66.917 C823.870,66.776 823.744,66.634 823.616,66.502 C823.542,66.424 823.465,66.35 823.385,66.276 C823.289,66.183 823.190,66.093 823.090,66.002 C823.004,65.932 822.917,65.854 822.830,65.787 C822.689,65.671 822.542,65.561 822.394,65.458 C822.320,65.406 822.243,65.354 822.169,65.307 C821.999,65.194 821.829,65.087 821.650,64.991 C821.592,64.955 821.531,64.923 821.473,64.894 C821.307,64.807 821.142,64.726 820.976,64.653 C820.909,64.623 820.845,64.594 820.774,64.566 C820.569,64.478 820.357,64.401 820.138,64.33 C820.084,64.314 820.026,64.298 819.969,64.282 C819.773,64.224 819.577,64.172 819.382,64.131 C819.330,64.118 819.285,64.104 819.234,64.095 C819,64.05 818.766,64.015 818.525,63.985 C818.461,63.979 818.400,63.976 818.339,63.969 C818.095,63.947 817.855,63.931 817.611,63.931 L817.582,63.931 Z"></path></g></svg>'>Holmusk</a></li>
     <li><a href="https://codepen.io/"><img style="margin: 16px 0" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>' alt="CodePen"></a></li>
+    <li><a href="https://4me.com"><img style="width: auto" src='data:image/svg+xml;utf8,<svg fill-rule="evenodd" viewBox="10538 7547.8 6693 4459" xmlns="http://www.w3.org/2000/svg"><rect fill="%23062341" x="10538" y="7547.8" width="6693.4" height="4459.4"/><path fill="%23fefefe" d="m15757 9524c-11.38-73.68-40.63-133.26-87.74-178.76-47.13-45.5-109.68-68.26-187.68-68.26s-140.98 22.39-188.91 67.18c-47.94 44.78-79.21 104.72-93.86 179.84h558.19zm-2797.1-489.69h369.08v166.12c21.04-24.93 44.1-48.39 69.19-71.15 25.08-22.38 53.02-42.25 83.76-59.94 30.77-17.35 65.16-31.06 103.19-41.53 38.04-10.12 80.54-15.17 127.47-15.17 85.8 0 159.84 15.88 222.16 48.02 62.33 32.15 110.49 77.64 144.49 137.6 56.64-61.38 119.77-107.26 189.37-138.68 69.59-31.42 148.93-46.94 237.95-46.94 137.58 0 245.22 36.12 322.93 108.33 48.42 45.04 81.78 103.28 100 174.71 24.57-38.29 53.4-73.42 86.51-105.37 56.87-54.89 124.72-98.22 203.53-130 78.8-31.79 166.14-47.67 262.02-47.67 108.86 0 203.12 17.34 282.73 52 79.64 34.66 145.85 81.26 198.66 139.76 52.81 58.51 91.79 125.67 117 201.52 25.19 75.84 37.77 154.92 37.77 237.27 0 12.99-0.4 26.71-1.21 41.17-0.81 14.43-2.04 29.6-3.68 45.49h-909.14c17.86 75.11 54.83 131.82 110.9 170.09 56.06 38.29 125.53 57.43 208.39 57.43 61.76 0 117.01-9.4 165.77-28.18 48.74-18.78 99.11-49.11 151.1-91l212.06 166.84c-61.76 67.89-136.5 120.98-224.26 159.26-87.72 38.27-190.92 57.41-309.53 57.41-97.51 0-188.1-14.44-271.78-43.33-83.69-28.89-156-70.06-216.93-123.5-31.34-27.5-59.13-57.55-83.39-90.2v231.03h-369.04v-646.42c0-77.65-18.61-136.51-55.83-175.87-37.24-39.72-90.65-59.58-160.27-59.58-69.6 0-124.23 19.86-163.88 59.58-39.68 39.36-59.48 98.22-59.48 175.87v646.42h-369.06v-646.42c0-77.65-18.62-136.51-55.86-175.87-37.22-39.72-90.63-59.58-160.23-59.58s-124.24 19.86-163.9 59.58c-39.66 39.36-59.48 98.22-59.48 175.87v646.42h-563.64v325.09h-318.66v-325.09h-795.02l-0.53-238.52 827.03-922.87h287.18v888.19h194.56v-888.19zm-513.22 888.19v-472.57l-403.19 472.57h403.19z"/><path fill="%23fefefe" d="m16236 9012.7c66.1 0 119.69 53.6 119.69 119.7 0 66.11-53.59 119.7-119.69 119.7-66.11 0-119.7-53.59-119.7-119.7 0-66.1 53.59-119.7 119.7-119.7zm0 24.2c52.74 0 95.51 42.77 95.51 95.5 0 52.74-42.77 95.52-95.51 95.52s-95.52-42.78-95.52-95.52c0-52.73 42.78-95.5 95.52-95.5z"/><path fill="%23fefefe" d="m16297 9193.9h-32.6l-19.55-32.41c-1.49-2.45-2.88-4.63-4.24-6.59-1.35-1.93-2.71-3.57-4.07-4.95-1.39-1.37-2.83-2.42-4.32-3.18-1.5-0.71-3.11-1.06-4.85-1.06h-7.65v48.19h-28.38v-125.91h44.96c30.57 0 45.86 11.41 45.86 34.23 0 4.39-0.69 8.44-2.05 12.16-1.34 3.71-3.24 7.08-5.69 10.07-2.45 2.97-5.42 5.55-8.9 7.71-3.5 2.18-7.37 3.86-11.67 5.08v0.36c1.9 0.6 3.7 1.54 5.46 2.86 1.78 1.31 3.46 2.85 5.09 4.62 1.66 1.77 3.22 3.65 4.72 5.66 1.49 2.01 2.85 3.98 4.08 5.93l23.8 37.23zm-77.28-104.66v35.03h12.28c6.1 0 11-1.77 14.67-5.28 3.75-3.56 5.62-8 5.62-13.25 0-11.03-6.59-16.5-19.77-16.5h-12.8z"/></svg>' alt="4me"></a></li>
     <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>
     <li><a href="https://www.desmos.com/"><img src='data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="%23187a3d"%3E%3Cpath d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/%3E%3Cpath d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/%3E%3C/svg%3E%0A' alt=desmos></a></li>
     <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='data:image/svg+xml,%3Csvg%20width%3D%22397%22%20height%3D%22109%22%20viewBox%3D%220%200%20397%20109%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20fill-rule%3D%22nonzero%22%20fill%3D%22none%22%3E%3Cpath%20d%3D%22M169.495%2063.68c2.8%200%205.254.671%207.36%202.015%202.105%201.344%203.688%203.162%204.751%205.453%201.063%202.292%201.594%204.878%201.594%207.76%200%204.408-1.241%208.054-3.724%2010.935-2.483%202.881-5.81%204.322-9.98%204.322-3.953%200-7.18-1.402-9.683-4.206v12.62c0%20.271-.085.489-.254.653a.88.88%200%200%201-.64.247h-4.767a.966.966%200%200%201-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932%200%200%201%20.656-.247h4.767a.88.88%200%200%201%20.64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268%205.006-4.902%209.057-4.902zm-.84%2024.874c2.752%200%204.865-.86%206.34-2.578%201.473-1.719%202.21-4.034%202.21-6.947%200-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576%200-4.625.855-6.148%202.563-1.524%201.71-2.285%203.986-2.285%206.831s.761%205.141%202.285%206.89c1.523%201.747%203.572%202.62%206.148%202.62zm39.147-24.875c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm31.331%2030.845c-4.25%200-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05%204.298-10.999c2.866-2.948%206.423-4.423%2010.673-4.423%202.788%200%205.332.674%207.632%202.021%202.3%201.348%204.103%203.203%205.41%205.566%201.306%202.363%201.959%204.975%201.959%207.835%200%202.861-.653%205.468-1.96%207.821-1.306%202.353-3.109%204.209-5.41%205.566-2.3%201.357-4.843%202.036-7.63%202.036zm-6.43-8.608c1.7%201.759%203.847%202.638%206.445%202.638%202.597%200%204.745-.88%206.444-2.638%201.698-1.759%202.547-4.03%202.547-6.814%200-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598%200-4.746.88-6.444%202.638-1.699%201.758-2.548%204.03-2.548%206.815%200%202.784.85%205.055%202.548%206.814zm55.522-21.623c.272%200%20.487.082.642.248.156.165.234.384.234.657v27.976c0%201.772-.302%203.373-.906%204.804-.603%201.431-1.402%202.6-2.395%203.504-.993.906-2.157%201.67-3.49%202.293a16.713%2016.713%200%200%201-4.076%201.314c-1.383.253-2.814.38-4.294.38-2.337%200-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652%201.198-.38%202.707%201.46%205.735%202.19%209.085%202.19%201.169%200%202.293-.116%203.374-.35%201.074-.23%202.107-.62%203.068-1.153a6.016%206.016%200%200%200%202.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513%203.154-5.726%204.731-9.64%204.731-2.688%200-5.132-.676-7.333-2.03a13.905%2013.905%200%200%201-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534%200-2.726.604-5.237%201.811-7.534%201.208-2.298%202.907-4.123%205.098-5.476%202.19-1.353%204.64-2.03%207.347-2.03%203.856%200%207.03%201.548%209.523%204.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596%2023.266c2.408%200%204.424-.894%206.045-2.68%201.622-1.788%202.433-3.898%202.433-6.332%200-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428%200-4.452.86-6.074%202.581-1.622%201.72-2.433%203.826-2.433%206.317%200%202.529.811%204.663%202.433%206.402%201.621%201.74%203.646%202.61%206.074%202.61zm40.073-23.88c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm46.24%2024.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0%20.626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493%201.682-3.399%203.008-5.717%203.976-2.318.968-4.577%201.453-6.778%201.453-3.241%200-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149%200-2.621.835-4.656%202.504-6.104%201.67-1.448%204.214-2.416%207.633-2.906l6.984-1.085c1.355-.196%202.347-.401%202.976-.617.629-.215%201.041-.479%201.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302%200-6.65%201.36-7.043%204.079-.059.45-.353.665-.884.646h-4.48c-.647%200-.942-.304-.883-.91.334-3.326%201.66-5.713%203.978-7.161%202.318-1.448%205.452-2.172%209.4-2.172%204.224%200%207.392.959%209.504%202.876%202.112%201.918%203.168%204.706%203.168%208.364v11.035c-.02%201.35.707%202.172%202.18%202.466zm-19.06.135c4.132%200%207.518-1.307%2010.16-3.922v-6.028c-.258.566-1.53%201.024-3.814%201.375l-6.375.995c-1.728.274-2.96.742-3.695%201.405-.735.663-1.102%201.512-1.102%202.546%200%201.132.397%202.02%201.192%202.663.794.644%202.006.966%203.635.966zm48.252-24.875c2.377%200%204.116.796%205.216%202.386%201.1%201.59%201.65%204.248%201.65%207.971v18.59c0%20.272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948%200%200%201-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042%200-1.886.403-2.535%201.207a5.452%205.452%200%200%200-1.178%202.75v19.463c0%20.271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275%200-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04%200-1.88.398-2.52%201.193a5.675%205.675%200%200%200-1.193%202.764v19.463c0%20.271-.083.49-.25.654a.864.864%200%200%201-.634.248h-4.273c-.275%200-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57%200%20.874.3.914.902l.147%202.386h.442c.943-2.619%202.898-3.928%205.864-3.928%202.849%200%204.745%201.31%205.688%203.928h.353c1.061-2.619%202.986-3.928%205.776-3.928zM162.091%2016.126c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.694-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123%2022.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47%200-.824-.162-1.06-.488l-8.592-10.002-8.592%2010.002c-.255.326-.618.488-1.089.488h-5.532c-.373%200-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47%200%20.833.172%201.088.517l7.798%209.082%207.798-9.082c.255-.325.618-.498%201.089-.517h5.473c.373%200%20.618.105.736.316.117.21.059.46-.177.747l-11.152%2012.933%2011.976%2013.795zm14.101-26.59c1.86-.801%203.86-1.201%206-1.201%202.142%200%204.113.395%205.915%201.186%201.801.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.122%202.04-.364%202.549-.242.507-.76.761-1.554.761H230.41c.329%202.285%201.385%204.106%203.167%205.463%201.782%201.357%204.01%202.036%206.684%202.036%202.693%200%205.134-.84%207.323-2.52.465-.35.882-.341%201.25.03l1.947%201.992c.465.469.465.918%200%201.347-2.984%203.008-6.713%204.511-11.189%204.511-4.572%200-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.118-6.048.746-1.885%201.764-3.516%203.052-4.892%201.288-1.377%202.852-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.203.718-5.767%202.154-1.566%201.437-2.503%203.372-2.812%205.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83%2019.894c3.133%200%205.619-1.191%207.457-3.574.348-.45.745-.527%201.19-.234l3.394%201.962c.542.332.639.733.29%201.201-1.315%202.012-3.06%203.618-5.237%204.819-2.176%201.2-4.58%201.801-7.21%201.801-4.392%200-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05%204.367-11c2.912-2.948%206.563-4.422%2010.954-4.422%202.631%200%205.04.595%207.225%201.787%202.186%201.19%203.927%202.792%205.224%204.803.328.47.232.87-.29%201.202l-3.396%201.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67%200-4.88.884-6.63%202.651-1.75%201.768-2.626%204.033-2.626%206.796s.875%205.028%202.626%206.796c1.75%201.767%203.96%202.65%206.63%202.65zm46.585-24.87c.276%200%20.499.083.666.248.168.165.252.383.252.654v27.379c0%20.271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573%200-.88-.3-.919-.901l-.237-3.953h-.652c-1.007%201.608-2.35%202.93-4.03%203.968-1.68%201.036-3.674%201.554-5.986%201.554-3.26%200-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276%200%20.499.082.666.247.168.165.252.383.252.654v15.956c0%202.403.583%204.18%201.749%205.334%201.165%201.153%202.785%201.73%204.86%201.73%201.343%200%202.573-.258%203.689-.771s1.99-1.129%202.623-1.846c.632-.717%201.116-1.4%201.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595%2024.474c.353.446.382.852.088%201.22-.882%201.047-2.172%202.001-3.868%202.863-1.697.862-3.731%201.293-6.104%201.293-8.002%200-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885%200%200%201-.647-.261.864.864%200%200%201-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255%200%20.466.078.633.233.166.154.25.368.25.639l-.02%209.285h11.943c.255%200%20.466.082.632.247.167.164.25.382.25.654v3.603a.89.89%200%200%201-.25.64.837.837%200%200%201-.632.261H345.36v11.741c0%201.337.18%202.465.544%203.386.363.92.873%201.613%201.53%202.077a6.487%206.487%200%200%200%202.059.989c.716.193%201.534.29%202.456.29%201.98%200%203.824-.668%205.53-2.005.452-.426.873-.407%201.265.058l2%202.325zm15.146-23.272c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z%22%20fill%3D%22%23FFF%22%2F%3E%3Cpath%20d%3D%22M102.022%2037.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87%201.87%200%200%201-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87%201.87%200%200%201%2082.511%200h26.297c1.171%200%202.312.1%203.423.303%201.11.201%202.282.615%203.514%201.24a11.807%2011.807%200%200%201%203.212%202.36c.909.949%201.646%202.23%202.211%203.844.566%201.613.849%203.47.849%205.568v23.421c.04%201.09.262%201.877.666%202.36l12.18%2014.102c.645.767.605%201.594-.122%202.481l-12.058%2013.799c-.444.484-.666%201.271-.666%202.36V95.14c0%202.622-.414%204.852-1.243%206.688-.828%201.835-1.938%203.207-3.332%204.115-1.394.908-2.787%201.553-4.18%201.937-1.394.383-2.879.575-4.454.575H82.51c-.525%200-.97-.162-1.333-.485a1.716%201.716%200%200%201-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87%201.87%200%200%201%201.333-.515H97.66c2.908%200%204.363-1.25%204.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217%200%200%200%200-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083%2053.15a1.523%201.523%200%200%201%200%202.154l-23.85%2023.849a1.523%201.523%200%200%201-2.153%200l-23.85-23.85a1.523%201.523%200%200%201%200-2.153L67.08%2029.3a1.523%201.523%200%200%201%202.154%200zm-35.937%208.585c0%201.009-.243%201.735-.728%202.18L19.26%2054.258a.217.217%200%200%200%200%20.298L32.57%2068.51c.485.484.728%201.23.728%202.24v18.337c0%202.501%201.454%203.752%204.362%203.752h15.148c.525%200%20.97.172%201.333.515.364.343.584.797.584%201.361v11.923c0%20.565-.22%201.009-.584%201.331-.363.323-.808.485-1.333.485H26.511c-1.576%200-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577%2055.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614%201.303-2.895%202.211-3.843a11.807%2011.807%200%200%201%203.212-2.36C20.805.917%2021.976.503%2023.087.302A19.123%2019.123%200%200%201%2026.511%200h26.296c.525%200%20.97.171%201.333.515.364.342.584.796.584%201.361v11.862c0%20.525-.22.959-.584%201.301a1.87%201.87%200%200%201-1.333.515H37.66c-2.908%200-4.362%201.291-4.362%203.873v18.459z%22%20fill%3D%22%234547E0%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E' alt="Execute Program"></a></li>

From 3694fe2f489000fa2cec5c0637fbff3f37dec44e Mon Sep 17 00:00:00 2001
From: Jonathan Rascher <jon@bcat.name>
Date: Fri, 7 May 2021 03:31:53 -0500
Subject: [PATCH 4480/4742] [abbott.vim theme] Add

---
 demo/theme.html  |   2 +
 theme/abbott.css | 268 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 270 insertions(+)
 create mode 100644 theme/abbott.css

diff --git a/demo/theme.html b/demo/theme.html
index 95d0f391fb..a4ca59cf1d 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -7,6 +7,7 @@
 <link rel="stylesheet" href="../lib/codemirror.css">
 <link rel="stylesheet" href="../theme/3024-day.css">
 <link rel="stylesheet" href="../theme/3024-night.css">
+<link rel="stylesheet" href="../theme/abbott.css">
 <link rel="stylesheet" href="../theme/abcdef.css">
 <link rel="stylesheet" href="../theme/ambiance.css">
 <link rel="stylesheet" href="../theme/ayu-dark.css">
@@ -106,6 +107,7 @@ <h2>Theme Demo</h2>
     <option selected>default</option>
     <option>3024-day</option>
     <option>3024-night</option>
+    <option>abbott</option>
     <option>abcdef</option>
     <option>ambiance</option>
     <option>ayu-dark</option>
diff --git a/theme/abbott.css b/theme/abbott.css
new file mode 100644
index 0000000000..211cdedcd3
--- /dev/null
+++ b/theme/abbott.css
@@ -0,0 +1,268 @@
+/*
+ * abbott.css
+ * A warm, dark theme for prose and code, with pastels and pretty greens.
+ *
+ * Ported from abbott.vim (https://github.com/bcat/abbott.vim) version 2.1.
+ * Original design and CodeMirror port by Jonathan Rascher.
+ *
+ * This theme shares the following color palette with the Vim color scheme.
+ *
+ * Brown shades:
+ *   bistre: #231c14
+ *   chocolate: #3c3022
+ *   cocoa: #745d42
+ *   vanilla_cream: #fef3b4
+ *
+ * Red shades:
+ *   crimson: #d80450
+ *   cinnabar: #f63f05
+ *
+ * Green shades:
+ *   dark_olive: #273900
+ *   forest_green: #24a507
+ *   chartreuse: #a0ea00
+ *   pastel_chartreuse: #d8ff84
+ *
+ * Yellow shades:
+ *   marigold: #fbb32f
+ *   lemon_meringue: #fbec5d
+ *
+ * Blue shades:
+ *   cornflower_blue: #3f91f1
+ *   periwinkle_blue: #8ccdf0
+ *
+ * Magenta shades:
+ *   french_pink: #ec6c99
+ *   lavender: #e6a2f3
+ *
+ * Cyan shades:
+ *   zomp: #39a78d
+ *   seafoam_green: #00ff7f
+ */
+
+/* Style the UI: */
+
+/* Equivalent to Vim's Normal group. */
+.cm-s-abbott.CodeMirror {
+  background: #231c14 /* bistre */;
+  color: #d8ff84 /* pastel_chartreuse */;
+}
+
+/* Roughly equivalent to Vim's LineNr group. */
+.cm-s-abbott .CodeMirror-gutters {
+  background: #231c14 /* bistre */;
+  border: none;
+}
+.cm-s-abbott .CodeMirror-linenumber { color: #fbec5d /* lemon_meringue */; }
+
+.cm-s-abbott .CodeMirror-guttermarker { color: #f63f05 /* cinnabar */; }
+
+/* Roughly equivalent to Vim's FoldColumn group. */
+.cm-s-abbott .CodeMirror-guttermarker-subtle { color: #fbb32f /* marigold */; }
+
+/*
+ * Roughly equivalent to Vim's CursorColumn group. (We use a brighter color
+ * since Vim's cursorcolumn option highlights a whole column, whereas
+ * CodeMirror's rule just highlights a thin line.)
+ */
+.cm-s-abbott .CodeMirror-ruler { border-color: #745d42 /* cocoa */; }
+
+/* Equivalent to Vim's Cursor group in insert mode. */
+.cm-s-abbott .CodeMirror-cursor { border-color: #a0ea00 /* chartreuse */; }
+
+/* Equivalent to Vim's Cursor group in normal mode. */
+.cm-s-abbott.cm-fat-cursor .CodeMirror-cursor,
+.cm-s-abbott .cm-animate-fat-cursor {
+  /*
+   * CodeMirror doesn't allow changing the foreground color of the character
+   * under the cursor, so we can't use a reverse video effect for the cursor.
+   * Instead, make it semitransparent.
+   */
+  background: rgba(160, 234, 0, 0.5) /* chartreuse */;
+}
+.cm-s-abbott.cm-fat-cursor .CodeMirror-cursors {
+  /*
+   * Boost the z-index so the fat cursor shows up on top of text and
+   * matchingbracket/matchingtag highlights.
+   */
+  z-index: 3;
+}
+
+/* Equivalent to Vim's Cursor group in replace mode. */
+.cm-s-abbott .CodeMirror-overwrite .CodeMirror-cursor {
+  border-bottom: 1px solid #a0ea00 /* chartreuse */;
+  border-left: none;
+  width: auto;
+}
+
+/* Roughly equivalent to Vim's CursorIM group. */
+.cm-s-abbott .CodeMirror-secondarycursor {
+  border-color: #00ff7f /* seafoam_green */;
+}
+
+/* Roughly equivalent to Vim's Visual group. */
+.cm-s-abbott .CodeMirror-selected,
+.cm-s-abbott.CodeMirror-focused .CodeMirror-selected {
+  background: #273900 /* dark_olive */;
+}
+.cm-s-abbott .CodeMirror-line::selection,
+.cm-s-abbott .CodeMirror-line > span::selection,
+.cm-s-abbott .CodeMirror-line > span > span::selection {
+  background: #273900 /* dark_olive */;
+}
+.cm-s-abbott .CodeMirror-line::-moz-selection,
+.cm-s-abbott .CodeMirror-line > span::-moz-selection,
+.cm-s-abbott .CodeMirror-line > span > span::-moz-selection*/ {
+  background: #273900 /* dark_olive */;
+}
+
+/* Roughly equivalent to Vim's SpecialKey group. */
+.cm-s-abbott .cm-tab { color: #00ff7f /* seafoam_green */; }
+
+/* Equivalent to Vim's Search group. */
+.cm-s-abbott .cm-searching {
+  background: #fef3b4 /* vanilla_cream */ !important;
+  color: #231c14 /* bistre */ !important;
+}
+
+/* Style syntax highlighting modes: */
+
+/* Equivalent to Vim's Comment group. */
+.cm-s-abbott span.cm-comment {
+  color: #fbb32f /* marigold */;
+  font-style: italic;
+}
+
+/* Equivalent to Vim's String group. */
+.cm-s-abbott span.cm-string,
+.cm-s-abbott span.cm-string-2 {
+  color: #e6a2f3 /* lavender */;
+}
+
+/* Equivalent to Vim's Constant group. */
+.cm-s-abbott span.cm-number,
+.cm-s-abbott span.cm-string.cm-url { color: #f63f05 /* cinnabar */; }
+
+/* Roughly equivalent to Vim's SpecialKey group. */
+.cm-s-abbott span.cm-invalidchar { color: #00ff7f /* seafoam_green */; }
+
+/* Equivalent to Vim's Special group. */
+.cm-s-abbott span.cm-atom { color: #fef3b4 /* vanilla_cream */; }
+
+/* Equivalent to Vim's Delimiter group. */
+.cm-s-abbott span.cm-bracket,
+.cm-s-abbott span.cm-punctuation {
+  color: #fef3b4 /* vanilla_cream */;
+}
+
+/* Equivalent Vim's Operator group. */
+.cm-s-abbott span.cm-operator { font-weight: bold; }
+
+/* Roughly equivalent to Vim's Identifier group. */
+.cm-s-abbott span.cm-def,
+.cm-s-abbott span.cm-variable,
+.cm-s-abbott span.cm-variable-2,
+.cm-s-abbott span.cm-variable-3 {
+  color: #8ccdf0 /* periwinkle_blue */;
+}
+
+/* Roughly equivalent to Vim's Function group. */
+.cm-s-abbott span.cm-builtin,
+.cm-s-abbott span.cm-property,
+.cm-s-abbott span.cm-qualifier {
+  color: #3f91f1 /* cornflower_blue */;
+}
+
+/* Equivalent to Vim's Type group. */
+.cm-s-abbott span.cm-type { color: #24a507 /* forest_green */; }
+
+/* Equivalent to Vim's Keyword group. */
+.cm-s-abbott span.cm-keyword {
+  color: #d80450 /* crimson */;
+  font-weight: bold;
+}
+
+/* Equivalent to Vim's PreProc group. */
+.cm-s-abbott span.cm-meta { color: #ec6c99 /* french_pink */; }
+
+/* Equivalent to Vim's htmlTagName group (linked to Statement). */
+.cm-s-abbott span.cm-tag {
+  color: #d80450 /* crimson */;
+  font-weight: bold;
+}
+
+/* Equivalent to Vim's htmlArg group (linked to Type). */
+.cm-s-abbott span.cm-attribute { color: #24a507 /* forest_green */; }
+
+/* Equivalent to Vim's htmlH1, markdownH1, etc. groups (linked to Title). */
+.cm-s-abbott span.cm-header {
+  color: #d80450 /* crimson */;
+  font-weight: bold;
+}
+
+/* Equivalent to Vim's markdownRule group (linked to PreProc). */
+.cm-s-abbott span.cm-hr { color: #ec6c99 /* french_pink */; }
+
+/* Roughly equivalent to Vim's Underlined group. */
+.cm-s-abbott span.cm-link { color: #e6a2f3 /* lavender */; }
+
+/* Equivalent to Vim's diffRemoved group. */
+.cm-s-abbott span.cm-negative {
+  background: #d80450 /* crimson */;
+  color: #231c14 /* bistre */;
+}
+
+/* Equivalent to Vim's diffAdded group. */
+.cm-s-abbott span.cm-positive {
+  background: #a0ea00 /* chartreuse */;
+  color: #231c14 /* bistre */;
+  font-weight: bold;
+}
+
+/* Equivalent to Vim's Error group. */
+.cm-s-abbott span.cm-error {
+  background: #d80450 /* crimson */;
+  color: #231c14 /* bistre */;
+}
+
+/* Style addons: */
+
+/* Equivalent to Vim's MatchParen group. */
+.cm-s-abbott span.CodeMirror-matchingbracket {
+  background: #745d42 /* cocoa */ !important;
+  color: #231c14 /* bistre */ !important;
+  font-weight: bold;
+}
+
+/*
+ * Roughly equivalent to Vim's Error group. (Vim doesn't seem to have a direct
+ * equivalent in its own matchparen plugin, but many syntax highlighting plugins
+ * mark mismatched brackets as Error.)
+ */
+.cm-s-abbott span.CodeMirror-nonmatchingbracket {
+  background: #d80450 /* crimson */ !important;
+  color: #231c14 /* bistre */ !important;
+}
+
+.cm-s-abbott .CodeMirror-matchingtag,
+.cm-s-abbott .cm-matchhighlight {
+  outline: 1px solid #39a78d /* zomp */;
+}
+
+/* Equivalent to Vim's CursorLine group. */
+.cm-s-abbott .CodeMirror-activeline-background,
+.cm-s-abbott .CodeMirror-activeline-gutter {
+  background: #3c3022 /* chocolate */;
+}
+
+/* Equivalent to Vim's CursorLineNr group. */
+.cm-s-abbott .CodeMirror-activeline-gutter .CodeMirror-linenumber {
+  color: #d8ff84 /* pastel_chartreuse */;
+  font-weight: bold;
+}
+
+/* Roughly equivalent to Vim's Folded group. */
+.cm-s-abbott .CodeMirror-foldmarker {
+  color: #f63f05 /* cinnabar */;
+  text-shadow: none;
+}

From 90ee74fa35c367c739655b0a148e903187726b59 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 7 May 2021 10:46:58 +0200
Subject: [PATCH 4481/4742] Add primo sponsor link

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

diff --git a/index.html b/index.html
index f5902c11b6..cb99d5851b 100644
--- a/index.html
+++ b/index.html
@@ -213,6 +213,7 @@ <h2>Sponsors</h2>
     <li><a href="https://www.desmos.com/"><img src='data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="%23187a3d"%3E%3Cpath d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/%3E%3Cpath d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/%3E%3C/svg%3E%0A' alt=desmos></a></li>
     <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='data:image/svg+xml,%3Csvg%20width%3D%22397%22%20height%3D%22109%22%20viewBox%3D%220%200%20397%20109%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20fill-rule%3D%22nonzero%22%20fill%3D%22none%22%3E%3Cpath%20d%3D%22M169.495%2063.68c2.8%200%205.254.671%207.36%202.015%202.105%201.344%203.688%203.162%204.751%205.453%201.063%202.292%201.594%204.878%201.594%207.76%200%204.408-1.241%208.054-3.724%2010.935-2.483%202.881-5.81%204.322-9.98%204.322-3.953%200-7.18-1.402-9.683-4.206v12.62c0%20.271-.085.489-.254.653a.88.88%200%200%201-.64.247h-4.767a.966.966%200%200%201-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932%200%200%201%20.656-.247h4.767a.88.88%200%200%201%20.64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268%205.006-4.902%209.057-4.902zm-.84%2024.874c2.752%200%204.865-.86%206.34-2.578%201.473-1.719%202.21-4.034%202.21-6.947%200-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576%200-4.625.855-6.148%202.563-1.524%201.71-2.285%203.986-2.285%206.831s.761%205.141%202.285%206.89c1.523%201.747%203.572%202.62%206.148%202.62zm39.147-24.875c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm31.331%2030.845c-4.25%200-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05%204.298-10.999c2.866-2.948%206.423-4.423%2010.673-4.423%202.788%200%205.332.674%207.632%202.021%202.3%201.348%204.103%203.203%205.41%205.566%201.306%202.363%201.959%204.975%201.959%207.835%200%202.861-.653%205.468-1.96%207.821-1.306%202.353-3.109%204.209-5.41%205.566-2.3%201.357-4.843%202.036-7.63%202.036zm-6.43-8.608c1.7%201.759%203.847%202.638%206.445%202.638%202.597%200%204.745-.88%206.444-2.638%201.698-1.759%202.547-4.03%202.547-6.814%200-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598%200-4.746.88-6.444%202.638-1.699%201.758-2.548%204.03-2.548%206.815%200%202.784.85%205.055%202.548%206.814zm55.522-21.623c.272%200%20.487.082.642.248.156.165.234.384.234.657v27.976c0%201.772-.302%203.373-.906%204.804-.603%201.431-1.402%202.6-2.395%203.504-.993.906-2.157%201.67-3.49%202.293a16.713%2016.713%200%200%201-4.076%201.314c-1.383.253-2.814.38-4.294.38-2.337%200-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652%201.198-.38%202.707%201.46%205.735%202.19%209.085%202.19%201.169%200%202.293-.116%203.374-.35%201.074-.23%202.107-.62%203.068-1.153a6.016%206.016%200%200%200%202.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513%203.154-5.726%204.731-9.64%204.731-2.688%200-5.132-.676-7.333-2.03a13.905%2013.905%200%200%201-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534%200-2.726.604-5.237%201.811-7.534%201.208-2.298%202.907-4.123%205.098-5.476%202.19-1.353%204.64-2.03%207.347-2.03%203.856%200%207.03%201.548%209.523%204.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596%2023.266c2.408%200%204.424-.894%206.045-2.68%201.622-1.788%202.433-3.898%202.433-6.332%200-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428%200-4.452.86-6.074%202.581-1.622%201.72-2.433%203.826-2.433%206.317%200%202.529.811%204.663%202.433%206.402%201.621%201.74%203.646%202.61%206.074%202.61zm40.073-23.88c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm46.24%2024.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0%20.626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493%201.682-3.399%203.008-5.717%203.976-2.318.968-4.577%201.453-6.778%201.453-3.241%200-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149%200-2.621.835-4.656%202.504-6.104%201.67-1.448%204.214-2.416%207.633-2.906l6.984-1.085c1.355-.196%202.347-.401%202.976-.617.629-.215%201.041-.479%201.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302%200-6.65%201.36-7.043%204.079-.059.45-.353.665-.884.646h-4.48c-.647%200-.942-.304-.883-.91.334-3.326%201.66-5.713%203.978-7.161%202.318-1.448%205.452-2.172%209.4-2.172%204.224%200%207.392.959%209.504%202.876%202.112%201.918%203.168%204.706%203.168%208.364v11.035c-.02%201.35.707%202.172%202.18%202.466zm-19.06.135c4.132%200%207.518-1.307%2010.16-3.922v-6.028c-.258.566-1.53%201.024-3.814%201.375l-6.375.995c-1.728.274-2.96.742-3.695%201.405-.735.663-1.102%201.512-1.102%202.546%200%201.132.397%202.02%201.192%202.663.794.644%202.006.966%203.635.966zm48.252-24.875c2.377%200%204.116.796%205.216%202.386%201.1%201.59%201.65%204.248%201.65%207.971v18.59c0%20.272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948%200%200%201-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042%200-1.886.403-2.535%201.207a5.452%205.452%200%200%200-1.178%202.75v19.463c0%20.271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275%200-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04%200-1.88.398-2.52%201.193a5.675%205.675%200%200%200-1.193%202.764v19.463c0%20.271-.083.49-.25.654a.864.864%200%200%201-.634.248h-4.273c-.275%200-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57%200%20.874.3.914.902l.147%202.386h.442c.943-2.619%202.898-3.928%205.864-3.928%202.849%200%204.745%201.31%205.688%203.928h.353c1.061-2.619%202.986-3.928%205.776-3.928zM162.091%2016.126c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.694-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123%2022.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47%200-.824-.162-1.06-.488l-8.592-10.002-8.592%2010.002c-.255.326-.618.488-1.089.488h-5.532c-.373%200-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47%200%20.833.172%201.088.517l7.798%209.082%207.798-9.082c.255-.325.618-.498%201.089-.517h5.473c.373%200%20.618.105.736.316.117.21.059.46-.177.747l-11.152%2012.933%2011.976%2013.795zm14.101-26.59c1.86-.801%203.86-1.201%206-1.201%202.142%200%204.113.395%205.915%201.186%201.801.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.122%202.04-.364%202.549-.242.507-.76.761-1.554.761H230.41c.329%202.285%201.385%204.106%203.167%205.463%201.782%201.357%204.01%202.036%206.684%202.036%202.693%200%205.134-.84%207.323-2.52.465-.35.882-.341%201.25.03l1.947%201.992c.465.469.465.918%200%201.347-2.984%203.008-6.713%204.511-11.189%204.511-4.572%200-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.118-6.048.746-1.885%201.764-3.516%203.052-4.892%201.288-1.377%202.852-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.203.718-5.767%202.154-1.566%201.437-2.503%203.372-2.812%205.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83%2019.894c3.133%200%205.619-1.191%207.457-3.574.348-.45.745-.527%201.19-.234l3.394%201.962c.542.332.639.733.29%201.201-1.315%202.012-3.06%203.618-5.237%204.819-2.176%201.2-4.58%201.801-7.21%201.801-4.392%200-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05%204.367-11c2.912-2.948%206.563-4.422%2010.954-4.422%202.631%200%205.04.595%207.225%201.787%202.186%201.19%203.927%202.792%205.224%204.803.328.47.232.87-.29%201.202l-3.396%201.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67%200-4.88.884-6.63%202.651-1.75%201.768-2.626%204.033-2.626%206.796s.875%205.028%202.626%206.796c1.75%201.767%203.96%202.65%206.63%202.65zm46.585-24.87c.276%200%20.499.083.666.248.168.165.252.383.252.654v27.379c0%20.271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573%200-.88-.3-.919-.901l-.237-3.953h-.652c-1.007%201.608-2.35%202.93-4.03%203.968-1.68%201.036-3.674%201.554-5.986%201.554-3.26%200-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276%200%20.499.082.666.247.168.165.252.383.252.654v15.956c0%202.403.583%204.18%201.749%205.334%201.165%201.153%202.785%201.73%204.86%201.73%201.343%200%202.573-.258%203.689-.771s1.99-1.129%202.623-1.846c.632-.717%201.116-1.4%201.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595%2024.474c.353.446.382.852.088%201.22-.882%201.047-2.172%202.001-3.868%202.863-1.697.862-3.731%201.293-6.104%201.293-8.002%200-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885%200%200%201-.647-.261.864.864%200%200%201-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255%200%20.466.078.633.233.166.154.25.368.25.639l-.02%209.285h11.943c.255%200%20.466.082.632.247.167.164.25.382.25.654v3.603a.89.89%200%200%201-.25.64.837.837%200%200%201-.632.261H345.36v11.741c0%201.337.18%202.465.544%203.386.363.92.873%201.613%201.53%202.077a6.487%206.487%200%200%200%202.059.989c.716.193%201.534.29%202.456.29%201.98%200%203.824-.668%205.53-2.005.452-.426.873-.407%201.265.058l2%202.325zm15.146-23.272c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z%22%20fill%3D%22%23FFF%22%2F%3E%3Cpath%20d%3D%22M102.022%2037.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87%201.87%200%200%201-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87%201.87%200%200%201%2082.511%200h26.297c1.171%200%202.312.1%203.423.303%201.11.201%202.282.615%203.514%201.24a11.807%2011.807%200%200%201%203.212%202.36c.909.949%201.646%202.23%202.211%203.844.566%201.613.849%203.47.849%205.568v23.421c.04%201.09.262%201.877.666%202.36l12.18%2014.102c.645.767.605%201.594-.122%202.481l-12.058%2013.799c-.444.484-.666%201.271-.666%202.36V95.14c0%202.622-.414%204.852-1.243%206.688-.828%201.835-1.938%203.207-3.332%204.115-1.394.908-2.787%201.553-4.18%201.937-1.394.383-2.879.575-4.454.575H82.51c-.525%200-.97-.162-1.333-.485a1.716%201.716%200%200%201-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87%201.87%200%200%201%201.333-.515H97.66c2.908%200%204.363-1.25%204.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217%200%200%200%200-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083%2053.15a1.523%201.523%200%200%201%200%202.154l-23.85%2023.849a1.523%201.523%200%200%201-2.153%200l-23.85-23.85a1.523%201.523%200%200%201%200-2.153L67.08%2029.3a1.523%201.523%200%200%201%202.154%200zm-35.937%208.585c0%201.009-.243%201.735-.728%202.18L19.26%2054.258a.217.217%200%200%200%200%20.298L32.57%2068.51c.485.484.728%201.23.728%202.24v18.337c0%202.501%201.454%203.752%204.362%203.752h15.148c.525%200%20.97.172%201.333.515.364.343.584.797.584%201.361v11.923c0%20.565-.22%201.009-.584%201.331-.363.323-.808.485-1.333.485H26.511c-1.576%200-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577%2055.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614%201.303-2.895%202.211-3.843a11.807%2011.807%200%200%201%203.212-2.36C20.805.917%2021.976.503%2023.087.302A19.123%2019.123%200%200%201%2026.511%200h26.296c.525%200%20.97.171%201.333.515.364.342.584.796.584%201.361v11.862c0%20.525-.22.959-.584%201.301a1.87%201.87%200%200%201-1.333.515H37.66c-2.908%200-4.362%201.291-4.362%203.873v18.459z%22%20fill%3D%22%234547E0%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E' alt="Execute Program"></a></li>
     <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='data:image/svg+xml;utf8,<svg width="3311" height="1605" viewBox="400 0 3311 1605" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1133 1602C1182 1602 1191 1602 1189 1579C1153 1301 1125 1076 1098 855L1098 855C1067 601 1037 354 995 41C991 2 973 0 916 0C865 0 854 2 849 34C824 242 798 437 772 636L772 636L772 636L772 636L772 636C734 928 695 1227 653 1581C651 1602 681 1602 715 1602C721 1602 726 1602 732 1602C791 1602 809 1602 811 1579C822 1446 833 1334 847 1206C849 1185 868 1185 905 1186C908 1186 912 1186 916 1186C919 1186 922 1186 925 1186C957 1185 984 1185 986 1206C996 1272 1004 1335 1013 1399L1013 1399C1020 1456 1028 1514 1036 1574C1040 1602 1050 1602 1097 1602C1103 1602 1110 1602 1118 1602C1124 1602 1128 1602 1133 1602ZM264 1602C451 1602 528 1478 528 1334V1195C528 1175 509 1176 470 1176L470 1176C463 1176 455 1177 446 1177C405 1177 376 1177 376 1195V1330C376 1391 342 1448 264 1448C180 1448 148 1387 148 1323V265C148 212 193 143 264 143C332 143 376 217 376 267V374C376 400 403 400 443 399H443H443H443H443H443C447 399 450 399 453 399C494 399 528 397 528 374V271C528 173 453 2 264 2C86 2 0 148 0 271V1336C0 1458 86 1602 264 1602ZM968 1042C959 928 953 837 946 746C942 681 937 615 931 539C931 530 929 514 916 514C904 514 902 530 902 537C896 625 890 707 885 784L885 784C879 874 874 958 868 1039C865 1055 886 1060 918 1060C945 1060 970 1060 968 1042ZM1784 1602C1845 1602 1861 1602 1861 1565V996C1861 992 1861 988 1861 984C1861 936 1861 903 1836 852C1812 804 1767 783 1743 771C1733 766 1727 763 1727 761C1727 758 1734 754 1744 748C1768 736 1810 713 1834 669C1859 623 1859 586 1859 537V537C1859 533 1859 529 1859 525V319C1859 239 1843 146 1775 82C1706 20 1608 2 1535 2H1405C1401 2 1397 1 1393 1C1379 0 1367 -0 1353 11C1339 25 1337 50 1337 73V1570C1337 1602 1353 1602 1405 1602C1474 1602 1483 1602 1483 1565V873C1483 838 1495 838 1586 838H1586H1586L1586 838C1591 838 1597 838 1604 838C1654 838 1715 895 1715 989V1570C1715 1602 1729 1602 1774 1602C1777 1602 1780 1602 1784 1602ZM1711 537V319C1711 267 1702 228 1663 187C1638 164 1624 153 1542 153C1521 153 1501 153 1492 169C1485 182 1485 194 1485 207V635C1485 639 1485 643 1485 648V648V648V648C1484 668 1483 687 1499 699C1510 709 1524 708 1535 708C1536 708 1538 708 1540 708C1565 708 1624 701 1665 658C1711 607 1711 569 1711 537ZM2588 1557L2588 1557C2588 1555 2588 1553 2588 1551V790C2588 788 2589 784 2589 781C2591 773 2592 764 2586 763C2569 760 2496 762 2429 763C2393 764 2359 765 2337 765C2321 765 2319 786 2319 836C2319 884 2321 902 2339 902C2345 902 2352 902 2360 901C2384 900 2414 898 2426 907C2436 915 2436 926 2435 936L2435 936C2435 937 2435 938 2435 938C2435 939 2435 940 2435 941V1334C2435 1382 2412 1453 2323 1453C2232 1453 2207 1384 2207 1327V265C2207 217 2253 143 2323 143C2392 143 2435 217 2435 267C2435 283 2436 303 2436 323C2437 343 2437 363 2437 379C2437 399 2451 402 2508 402C2570 402 2588 395 2588 374V271C2588 189 2524 2 2323 2C2118 2 2059 182 2059 271V1336C2059 1442 2130 1602 2323 1602C2393 1602 2429 1567 2452 1545C2466 1531 2476 1522 2485 1528C2503 1540 2508 1560 2512 1576C2516 1589 2518 1599 2526 1599C2534 1599 2541 1601 2547 1602C2559 1605 2569 1607 2577 1599C2589 1587 2588 1572 2588 1557ZM3310 1316C3310 1464 3249 1602 3046 1602C2856 1602 2781 1464 2781 1316V281C2781 109 2897 2 3046 2C3196 2 3310 121 3310 281V1316ZM3160 281V1309C3160 1373 3137 1448 3046 1448C2943 1448 2929 1375 2929 1309V281C2929 217 2977 143 3046 143C3112 143 3160 217 3160 281Z" fill="black"/></svg>'></a></li>
+    <li><a href="https://primo.af"><img alt=primo src='data:image/svg+xml;utf8,<svg viewBox="0 0 258 66" xmlns="http://www.w3.org/2000/svg"><path d="M17.6 13.8C19.5 11.9 22.7 11.9 24.6 13.8C26.5 15.7 26.6 18.7 24.8 20.7L24.6 20.9L12.0 33.5L35.4 56.8C37.3 58.6 37.4 61.7 35.6 63.6L35.4 63.8C33.6 65.7 30.5 65.8 28.6 64.0L28.4 63.8L1.4 37.1C-0.4 35.2 -0.4 32.1 1.2 30.2L1.4 30.0L17.6 13.8Z" fill="url(%23paint0_linear)"></path><path d="M50.0 11C62.4 11 72.5 21.0 72.5 33.5C72.5 46.0 62.4 56.1 50.0 56.1C47.2 56.1 45.0 53.8 45.0 51.1C45.0 48.3 47.2 46.1 50.0 46.1C56.9 46.1 62.5 40.4 62.5 33.5C62.5 26.6 56.9 21 50.0 21C43.2 21 37.6 26.4 37.4 33.3L37.4 33.6L36.9 60.4C36.8 63.2 34.6 65.4 31.8 65.3C29.1 65.2 27.0 63.1 26.9 60.4V60.2L27.4 33.5C27.4 21.0 37.5 11 50.0 11Z" fill="%23EE4645"></path><path d="M75.3 13.8C77.2 11.9 80.3 11.9 82.2 13.6L82.4 13.8L98.6 30.0C100.4 31.9 100.5 34.9 98.7 36.9L98.6 37.0L82.4 53.2C80.4 55.1 77.3 55.1 75.3 53.2C73.4 51.3 73.4 48.3 75.2 46.3L75.3 46.1L87.9 33.5L75.3 20.9C73.4 19.0 73.4 16.0 75.2 14.0L75.3 13.8Z" fill="%23EE4645"></path><path d="M134.5 19.4C136.8 19.4 138.8 19.9 140.6 21.0C142.5 22.0 143.9 23.4 145.0 25.3C146.0 27.2 146.6 29.4 146.6 31.8C146.6 34.3 146.0 36.5 145.0 38.4C143.9 40.3 142.5 41.7 140.6 42.8C138.8 43.8 136.8 44.3 134.5 44.3C131.4 44.3 129.0 43.3 127.2 41.4V52.7H120.2V19.7H126.9V22.5C128.6 20.4 131.2 19.4 134.5 19.4ZM133.3 38.6C135.1 38.6 136.6 38 137.7 36.8C138.9 35.5 139.5 33.9 139.5 31.8C139.5 29.8 138.9 28.2 137.7 27.0C136.6 25.8 135.1 25.1 133.3 25.1C131.5 25.1 130.0 25.8 128.8 27.0C127.7 28.2 127.1 29.8 127.1 31.8C127.1 33.9 127.7 35.5 128.8 36.8C130.0 38 131.5 38.6 133.3 38.6ZM158.0 22.9C158.8 21.8 159.9 20.9 161.3 20.3C162.8 19.7 164.4 19.4 166.3 19.4V25.9C165.5 25.8 165.0 25.8 164.7 25.8C162.7 25.8 161.1 26.3 160.0 27.5C158.8 28.6 158.3 30.3 158.3 32.5V44H151.3V19.7H158.0V22.9ZM170.5 19.7H177.5V44H170.5V19.7ZM174.0 16.4C172.7 16.4 171.6 16.0 170.8 15.2C170.0 14.5 169.6 13.6 169.6 12.5C169.6 11.3 170.0 10.4 170.8 9.7C171.6 8.9 172.7 8.5 174.0 8.5C175.3 8.5 176.3 8.9 177.1 9.6C177.9 10.3 178.3 11.2 178.3 12.3C178.3 13.5 177.9 14.5 177.1 15.2C176.3 16.0 175.3 16.4 174.0 16.4ZM215.0 19.4C218.0 19.4 220.4 20.3 222.2 22.1C224.0 23.9 224.9 26.5 224.9 30.1V44H217.9V31.2C217.9 29.3 217.5 27.8 216.7 26.9C215.9 25.9 214.8 25.5 213.3 25.5C211.6 25.5 210.3 26.0 209.4 27.1C208.4 28.1 207.9 29.7 207.9 31.8V44H200.9V31.2C200.9 27.4 199.4 25.5 196.3 25.5C194.7 25.5 193.4 26.0 192.5 27.1C191.5 28.1 191.0 29.7 191.0 31.8V44H184.0V19.7H190.7V22.5C191.6 21.5 192.7 20.7 194.0 20.2C195.3 19.7 196.7 19.4 198.3 19.4C200.0 19.4 201.6 19.7 202.9 20.4C204.3 21.1 205.4 22.1 206.3 23.3C207.3 22.1 208.5 21.1 210.0 20.4C211.5 19.7 213.2 19.4 215.0 19.4ZM243.0 44.3C240.4 44.3 238.1 43.8 236.1 42.7C234.1 41.7 232.5 40.2 231.4 38.3C230.2 36.4 229.7 34.2 229.7 31.8C229.7 29.4 230.2 27.3 231.4 25.4C232.5 23.5 234.1 22.1 236.1 21.0C238.1 19.9 240.4 19.4 243.0 19.4C245.5 19.4 247.8 19.9 249.8 21.0C251.8 22.1 253.4 23.5 254.5 25.4C255.7 27.3 256.3 29.4 256.3 31.8C256.3 34.2 255.7 36.4 254.5 38.3C253.4 40.2 251.8 41.7 249.8 42.7C247.8 43.8 245.5 44.3 243.0 44.3ZM243.0 38.6C244.8 38.6 246.3 38 247.4 36.8C248.6 35.5 249.1 33.9 249.1 31.8C249.1 29.8 248.6 28.2 247.4 27.0C246.3 25.8 244.8 25.1 243.0 25.1C241.2 25.1 239.7 25.8 238.5 27.0C237.4 28.2 236.8 29.8 236.8 31.8C236.8 33.9 237.4 35.5 238.5 36.8C239.7 38 241.2 38.6 243.0 38.6Z" fill="%23343434"></path><path d="M140.6 21.0L140.4 21.4L140.4 21.4L140.6 21.0ZM145.0 25.3L144.5 25.6L144.6 25.6L145.0 25.3ZM145.0 38.4L145.4 38.7L145.4 38.7L145.0 38.4ZM140.6 42.8L140.9 43.2L140.9 43.2L140.6 42.8ZM127.2 41.4L127.6 41.0L126.7 40.1V41.4H127.2ZM127.2 52.7V53.2H127.7V52.7H127.2ZM120.2 52.7H119.7V53.2H120.2V52.7ZM120.2 19.7V19.2H119.7V19.7H120.2ZM126.9 19.7H127.4V19.2H126.9V19.7ZM126.9 22.5H126.4V23.9L127.3 22.8L126.9 22.5ZM137.7 36.8L137.3 36.4L137.3 36.4L137.7 36.8ZM137.7 27.0L137.3 27.3L137.3 27.3L137.7 27.0ZM128.8 27.0L128.5 26.6L128.5 26.6L128.8 27.0ZM128.8 36.8L128.5 37.1L128.5 37.1L128.8 36.8ZM134.5 19.9C136.7 19.9 138.6 20.4 140.4 21.4L140.9 20.5C139.0 19.4 136.8 18.9 134.5 18.9V19.9ZM140.4 21.4C142.2 22.4 143.5 23.8 144.5 25.6L145.4 25.1C144.3 23.1 142.8 21.6 140.9 20.5L140.4 21.4ZM144.6 25.6C145.6 27.3 146.1 29.4 146.1 31.8H147.1C147.1 29.3 146.5 27.0 145.4 25.1L144.6 25.6ZM146.1 31.8C146.1 34.3 145.6 36.4 144.5 38.2L145.4 38.7C146.5 36.7 147.1 34.4 147.1 31.8H146.1ZM144.6 38.2C143.5 39.9 142.2 41.3 140.4 42.3L140.9 43.2C142.8 42.1 144.3 40.6 145.4 38.7L144.6 38.2ZM140.4 42.3C138.6 43.3 136.7 43.8 134.5 43.8V44.8C136.8 44.8 139.0 44.3 140.9 43.2L140.4 42.3ZM134.5 43.8C131.5 43.8 129.2 42.9 127.6 41.0L126.8 41.7C128.7 43.8 131.3 44.8 134.5 44.8V43.8ZM126.7 41.4V52.7H127.7V41.4H126.7ZM127.2 52.2H120.2V53.2H127.2V52.2ZM120.7 52.7V19.7H119.7V52.7H120.7ZM120.2 20.2H126.9V19.2H120.2V20.2ZM126.4 19.7V22.5H127.4V19.7H126.4ZM127.3 22.8C128.9 20.9 131.3 19.9 134.5 19.9V18.9C131.1 18.9 128.4 20.0 126.5 22.2L127.3 22.8ZM133.3 39.1C135.2 39.1 136.8 38.4 138.1 37.1L137.3 36.4C136.3 37.5 135.0 38.1 133.3 38.1V39.1ZM138.1 37.1C139.3 35.8 140 34.0 140 31.8H139C139 33.8 138.4 35.3 137.3 36.4L138.1 37.1ZM140 31.8C140 29.7 139.3 27.9 138.1 26.6L137.3 27.3C138.4 28.4 139 29.9 139 31.8H140ZM138.1 26.6C136.8 25.3 135.2 24.6 133.3 24.6V25.6C135.0 25.6 136.3 26.2 137.3 27.3L138.1 26.6ZM133.3 24.6C131.4 24.6 129.7 25.3 128.5 26.6L129.2 27.3C130.3 26.2 131.6 25.6 133.3 25.6V24.6ZM128.5 26.6C127.2 28.0 126.6 29.7 126.6 31.8H127.6C127.6 29.9 128.2 28.4 129.2 27.3L128.5 26.6ZM126.6 31.8C126.6 34.0 127.2 35.7 128.5 37.1L129.2 36.4C128.2 35.3 127.6 33.8 127.6 31.8H126.6ZM128.5 37.1C129.7 38.4 131.4 39.1 133.3 39.1V38.1C131.6 38.1 130.3 37.5 129.2 36.4L128.5 37.1ZM158.0 22.9H157.5V24.5L158.4 23.2L158.0 22.9ZM161.3 20.3L161.1 19.8L161.1 19.8L161.3 20.3ZM166.3 19.4H166.8V18.9H166.3V19.4ZM166.3 25.9L166.3 26.4L166.8 26.4V25.9H166.3ZM160.0 27.5L160.3 27.8L160.3 27.8L160.0 27.5ZM158.3 44V44.5H158.8V44H158.3ZM151.3 44H150.8V44.5H151.3V44ZM151.3 19.7V19.2H150.8V19.7H151.3ZM158.0 19.7H158.5V19.2H158.0V19.7ZM158.4 23.2C159.2 22.1 160.2 21.3 161.5 20.7L161.1 19.8C159.7 20.5 158.5 21.4 157.6 22.6L158.4 23.2ZM161.5 20.7C162.9 20.2 164.5 19.9 166.3 19.9V18.9C164.4 18.9 162.7 19.2 161.1 19.8L161.5 20.7ZM165.8 19.4V25.9H166.8V19.4H165.8ZM166.3 25.4C165.6 25.3 165.0 25.3 164.7 25.3V26.3C165.0 26.3 165.5 26.3 166.3 26.4L166.3 25.4ZM164.7 25.3C162.6 25.3 160.9 25.9 159.6 27.1L160.3 27.8C161.4 26.8 162.8 26.3 164.7 26.3V25.3ZM159.6 27.1C158.4 28.4 157.8 30.2 157.8 32.5H158.8C158.8 30.3 159.3 28.8 160.3 27.8L159.6 27.1ZM157.8 32.5V44H158.8V32.5H157.8ZM158.3 43.5H151.3V44.5H158.3V43.5ZM151.8 44V19.7H150.8V44H151.8ZM151.3 20.2H158.0V19.2H151.3V20.2ZM157.5 19.7V22.9H158.5V19.7H157.5ZM170.5 19.7V19.2H170.0V19.7H170.5ZM177.5 19.7H178.0V19.2H177.5V19.7ZM177.5 44V44.5H178.0V44H177.5ZM170.5 44H170.0V44.5H170.5V44ZM170.8 15.2L170.5 15.6V15.6L170.8 15.2ZM170.8 9.7L171.2 10.0V10.0L170.8 9.7ZM177.1 9.6L176.8 10.0L177.1 9.6ZM177.1 15.2L177.5 15.6L177.5 15.6L177.1 15.2ZM170.5 20.2H177.5V19.2H170.5V20.2ZM177.0 19.7V44H178.0V19.7H177.0ZM177.5 43.5H170.5V44.5H177.5V43.5ZM171.0 44V19.7H170.0V44H171.0ZM174.0 15.9C172.8 15.9 171.9 15.5 171.2 14.9L170.5 15.6C171.4 16.5 172.6 16.9 174.0 16.9V15.9ZM171.2 14.9C170.5 14.2 170.1 13.4 170.1 12.5H169.1C169.1 13.7 169.6 14.8 170.5 15.6L171.2 14.9ZM170.1 12.5C170.1 11.5 170.5 10.7 171.2 10.0L170.5 9.3C169.6 10.1 169.1 11.2 169.1 12.5H170.1ZM171.2 10.0C171.9 9.4 172.8 9.0 174.0 9.0V8.0C172.6 8.0 171.4 8.4 170.5 9.3L171.2 10.0ZM174.0 9.0C175.2 9.0 176.1 9.4 176.8 10.0L177.5 9.2C176.5 8.4 175.4 8.0 174.0 8.0V9.0ZM176.8 10.0C177.5 10.6 177.8 11.4 177.8 12.3H178.8C178.8 11.1 178.4 10.1 177.5 9.2L176.8 10.0ZM177.8 12.3C177.8 13.4 177.5 14.2 176.8 14.9L177.5 15.6C178.4 14.7 178.8 13.6 178.8 12.3H177.8ZM176.8 14.9C176.1 15.5 175.2 15.9 174.0 15.9V16.9C175.4 16.9 176.5 16.5 177.5 15.6L176.8 14.9ZM222.2 22.1L221.8 22.4L221.9 22.4L222.2 22.1ZM224.9 44V44.5H225.4V44H224.9ZM217.9 44H217.4V44.5H217.9V44ZM216.7 26.9L216.3 27.2L216.3 27.2L216.3 27.2L216.7 26.9ZM209.4 27.1L209.7 27.4L209.8 27.4L209.4 27.1ZM207.9 44V44.5H208.4V44H207.9ZM200.9 44H200.4V44.5H200.9V44ZM192.5 27.1L192.8 27.4L192.8 27.4L192.5 27.1ZM191.0 44V44.5H191.5V44H191.0ZM184.0 44H183.5V44.5H184.0V44ZM184.0 19.7V19.2H183.5V19.7H184.0ZM190.7 19.7H191.2V19.2H190.7V19.7ZM190.7 22.5H190.2V23.9L191.1 22.9L190.7 22.5ZM194.0 20.2L193.8 19.7L193.8 19.7L194.0 20.2ZM202.9 20.4L202.7 20.9L202.7 20.9L202.9 20.4ZM206.3 23.3L205.9 23.6L206.2 24.2L206.7 23.6L206.3 23.3ZM210.0 20.4L209.8 20.0L209.8 20.0L210.0 20.4ZM215.0 19.9C217.9 19.9 220.2 20.7 221.8 22.4L222.6 21.7C220.7 19.8 218.1 18.9 215.0 18.9V19.9ZM221.9 22.4C223.5 24.1 224.4 26.6 224.4 30.1H225.4C225.4 26.4 224.5 23.6 222.6 21.7L221.9 22.4ZM224.4 30.1V44H225.4V30.1H224.4ZM224.9 43.5H217.9V44.5H224.9V43.5ZM218.4 44V31.2H217.4V44H218.4ZM218.4 31.2C218.4 29.2 218.0 27.6 217.0 26.6L216.3 27.2C217.0 28.0 217.4 29.3 217.4 31.2H218.4ZM217.1 26.6C216.2 25.5 214.9 25.0 213.3 25.0V26.0C214.6 26.0 215.6 26.4 216.3 27.2L217.1 26.6ZM213.3 25.0C211.5 25.0 210.1 25.5 209.0 26.7L209.8 27.4C210.6 26.4 211.8 26.0 213.3 26.0V25.0ZM209.0 26.7C207.9 27.9 207.4 29.6 207.4 31.8H208.4C208.4 29.8 208.9 28.3 209.7 27.4L209.0 26.7ZM207.4 31.8V44H208.4V31.8H207.4ZM207.9 43.5H200.9V44.5H207.9V43.5ZM201.4 44V31.2H200.4V44H201.4ZM201.4 31.2C201.4 29.2 201.0 27.6 200.2 26.6C199.3 25.5 198.0 25.0 196.3 25.0V26.0C197.7 26.0 198.7 26.4 199.4 27.2C200.0 28.0 200.4 29.3 200.4 31.2H201.4ZM196.3 25.0C194.6 25.0 193.2 25.5 192.1 26.7L192.8 27.4C193.7 26.4 194.8 26.0 196.3 26.0V25.0ZM192.1 26.7C191.0 27.9 190.5 29.6 190.5 31.8H191.5C191.5 29.8 192.0 28.3 192.8 27.4L192.1 26.7ZM190.5 31.8V44H191.5V31.8H190.5ZM191.0 43.5H184.0V44.5H191.0V43.5ZM184.5 44V19.7H183.5V44H184.5ZM184.0 20.2H190.7V19.2H184.0V20.2ZM190.2 19.7V22.5H191.2V19.7H190.2ZM191.1 22.9C191.9 21.9 193.0 21.2 194.2 20.7L193.8 19.7C192.4 20.3 191.3 21.1 190.3 22.2L191.1 22.9ZM194.2 20.7C195.4 20.1 196.8 19.9 198.3 19.9V18.9C196.7 18.9 195.2 19.2 193.8 19.7L194.2 20.7ZM198.3 19.9C199.9 19.9 201.4 20.2 202.7 20.9L203.2 20.0C201.7 19.2 200.1 18.9 198.3 18.9V19.9ZM202.7 20.9C204.0 21.5 205.1 22.4 205.9 23.6L206.7 23.1C205.8 21.7 204.6 20.7 203.2 20.0L202.7 20.9ZM206.7 23.6C207.6 22.5 208.8 21.5 210.2 20.9L209.8 20.0C208.2 20.7 206.9 21.7 205.9 23.0L206.7 23.6ZM210.2 20.9C211.7 20.2 213.3 19.9 215.0 19.9V18.9C213.1 18.9 211.4 19.2 209.8 20.0L210.2 20.9ZM236.1 42.7L235.9 43.2L235.9 43.2L236.1 42.7ZM231.4 38.3L230.9 38.5L231.4 38.3ZM231.4 25.4L230.9 25.2L231.4 25.4ZM236.1 21.0L236.3 21.4L236.3 21.4L236.1 21.0ZM249.8 21.0L249.6 21.4L249.6 21.4L249.8 21.0ZM254.5 25.4L255.0 25.2L254.5 25.4ZM254.5 38.3L255.0 38.5L254.5 38.3ZM249.8 42.7L250.1 43.2L250.1 43.2L249.8 42.7ZM247.4 36.8L247.0 36.4L247.0 36.4L247.4 36.8ZM247.4 27.0L247.0 27.3L247.0 27.3L247.4 27.0ZM238.5 27.0L238.9 27.3L238.9 27.3L238.5 27.0ZM238.5 36.8L238.2 37.1L238.2 37.1L238.5 36.8ZM243.0 43.8C240.5 43.8 238.3 43.3 236.3 42.3L235.9 43.2C238.0 44.3 240.4 44.8 243.0 44.8V43.8ZM236.3 42.3C234.4 41.3 232.9 39.8 231.8 38.0L230.9 38.5C232.1 40.5 233.8 42.1 235.9 43.2L236.3 42.3ZM231.8 38.0C230.7 36.2 230.2 34.2 230.2 31.8H229.2C229.2 34.3 229.8 36.6 230.9 38.5L231.8 38.0ZM230.2 31.8C230.2 29.5 230.7 27.5 231.8 25.7L230.9 25.2C229.8 27.1 229.2 29.4 229.2 31.8H230.2ZM231.8 25.7C232.9 23.9 234.4 22.5 236.3 21.4L235.9 20.6C233.8 21.6 232.1 23.2 230.9 25.2L231.8 25.7ZM236.3 21.4C238.3 20.4 240.5 19.9 243.0 19.9V18.9C240.4 18.9 238.0 19.4 235.9 20.6L236.3 21.4ZM243.0 19.9C245.5 19.9 247.7 20.4 249.6 21.4L250.1 20.6C248.0 19.4 245.6 18.9 243.0 18.9V19.9ZM249.6 21.4C251.5 22.5 253.0 23.9 254.1 25.7L255.0 25.2C253.8 23.2 252.1 21.6 250.1 20.6L249.6 21.4ZM254.1 25.7C255.2 27.5 255.8 29.5 255.8 31.8H256.8C256.8 29.4 256.2 27.1 255.0 25.2L254.1 25.7ZM255.8 31.8C255.8 34.2 255.2 36.2 254.1 38.0L255.0 38.5C256.2 36.6 256.8 34.3 256.8 31.8H255.8ZM254.1 38.0C253.0 39.8 251.5 41.3 249.6 42.3L250.1 43.2C252.1 42.1 253.8 40.5 255.0 38.5L254.1 38.0ZM249.6 42.3C247.7 43.3 245.5 43.8 243.0 43.8V44.8C245.6 44.8 248.0 44.3 250.1 43.2L249.6 42.3ZM243.0 39.1C244.9 39.1 246.5 38.4 247.8 37.1L247.0 36.4C246.0 37.5 244.7 38.1 243.0 38.1V39.1ZM247.8 37.1C249.0 35.8 249.6 34.0 249.6 31.8H248.6C248.6 33.8 248.1 35.3 247.0 36.4L247.8 37.1ZM249.6 31.8C249.6 29.7 249.0 27.9 247.7 26.6L247.0 27.3C248.1 28.4 248.6 29.9 248.6 31.8H249.6ZM247.8 26.6C246.5 25.3 244.9 24.6 243.0 24.6V25.6C244.7 25.6 246.0 26.2 247.0 27.3L247.8 26.6ZM243.0 24.6C241.1 24.6 239.4 25.3 238.2 26.6L238.9 27.3C240.0 26.2 241.3 25.6 243.0 25.6V24.6ZM238.2 26.6C236.9 27.9 236.3 29.7 236.3 31.8H237.3C237.3 29.9 237.8 28.4 238.9 27.3L238.2 26.6ZM236.3 31.8C236.3 34.0 236.9 35.8 238.2 37.1L238.9 36.4C237.8 35.3 237.3 33.8 237.3 31.8H236.3ZM238.2 37.1C239.4 38.4 241.1 39.1 243.0 39.1V38.1C241.3 38.1 240.0 37.5 238.9 36.4L238.2 37.1Z" fill="%23343434"></path><defs><linearGradient id="paint0_linear" x1="14.5" y1="41.1" x2="33.6" y2="58.5" gradientUnits="userSpaceOnUse"><stop stop-color="%23EE4645"></stop><stop offset="1" stop-color="%23810707"></stop></linearGradient></defs></svg>'></a></li>
   </ul>
 </section>
 

From 3207e3c1dbe4b1f0dcd42fa871a0cdfa6bd431a8 Mon Sep 17 00:00:00 2001
From: Jonathan Rascher <jon@bcat.name>
Date: Fri, 7 May 2021 17:12:27 -0500
Subject: [PATCH 4482/4742] [abbott.vim theme] Fix -moz-selection syntax error

---
 theme/abbott.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/abbott.css b/theme/abbott.css
index 211cdedcd3..3e516a67f9 100644
--- a/theme/abbott.css
+++ b/theme/abbott.css
@@ -112,7 +112,7 @@
 }
 .cm-s-abbott .CodeMirror-line::-moz-selection,
 .cm-s-abbott .CodeMirror-line > span::-moz-selection,
-.cm-s-abbott .CodeMirror-line > span > span::-moz-selection*/ {
+.cm-s-abbott .CodeMirror-line > span > span::-moz-selection {
   background: #273900 /* dark_olive */;
 }
 

From e2d0b28b9a24b43c5e8626c44ec29bc788a100e1 Mon Sep 17 00:00:00 2001
From: TSUYUSATO Kitsune <make.just.on@gmail.com>
Date: Sun, 9 May 2021 19:08:56 +0900
Subject: [PATCH 4483/4742] [crystal mode] Fix `%` highlight

Fixed #6675
---
 mode/crystal/crystal.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/crystal/crystal.js b/mode/crystal/crystal.js
index 14dea98e2d..5dae5032b4 100644
--- a/mode/crystal/crystal.js
+++ b/mode/crystal/crystal.js
@@ -164,10 +164,10 @@
         } else {
           if(delim = stream.match(/^%([^\w\s=])/)) {
             delim = delim[1];
-          } else if (stream.match(/^%[a-zA-Z0-9_\u009F-\uFFFF]*/)) {
+          } else if (stream.match(/^%[a-zA-Z_\u009F-\uFFFF][\w\u009F-\uFFFF]*/)) {
             // Macro variables
             return "meta";
-          } else {
+          } else if (stream.eat('%')) {
             // '%' operator
             return "operator";
           }

From 472b458a31c2236a7088e4fb5d4bf3b04e8c91fa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 12 May 2021 08:08:03 +0200
Subject: [PATCH 4484/4742] [javascript mode] Add support for template string
 types

Issue #5774
---
 mode/javascript/javascript.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 122c1845f1..46ac459d5b 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -622,6 +622,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "{") return cont(pushlex("}"), typeprops, poplex, afterType)
     if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType, afterType)
     if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr)
+    if (type == "quasi") { return pass(quasiType, afterType); }
   }
   function maybeReturnType(type) {
     if (type == "=>") return cont(typeexpr)
@@ -647,6 +648,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont()
     }
   }
+  function quasiType(type, value) {
+    if (type != "quasi") return pass();
+    if (value.slice(value.length - 2) != "${") return cont(quasiType);
+    return cont(typeexpr, continueQuasiType);
+  }
+  function continueQuasiType(type) {
+    if (type == "}") {
+      cx.marked = "string-2";
+      cx.state.tokenize = tokenQuasi;
+      return cont(quasiType);
+    }
+  }
   function typearg(type, value) {
     if (type == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg)
     if (type == ":") return cont(typeexpr)

From c7aeed9d6984a23225490b07235c5635295f21e0 Mon Sep 17 00:00:00 2001
From: Roman Frolov <justcallmefrolov@gmail.com>
Date: Wed, 12 May 2021 17:27:20 +0300
Subject: [PATCH 4485/4742] [javascript mode] Properly handle exclamation marks
 in class fields

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

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 46ac459d5b..2b508c4829 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -799,6 +799,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (value == "@") return cont(expression, classBody)
   }
   function classfield(type, value) {
+    if (value == "!") return cont(classfield)
     if (value == "?") return cont(classfield)
     if (type == ":") return cont(typeexpr, maybeAssign)
     if (value == "=") return cont(expressionNoComma)

From 687b6ddd87df483d10a12b9d29196732d5275b91 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 14 May 2021 16:45:57 +0200
Subject: [PATCH 4486/4742] Fix bug in scrolling the cursor into view

Closes #6686
---
 src/display/scrolling.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 75d6fc7ee4..27d6f70cda 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -39,8 +39,8 @@ export function scrollPosIntoView(cm, pos, end, margin) {
     // Set pos and end to the cursor positions around the character pos sticks to
     // If pos.sticky == "before", that is around pos.ch - 1, otherwise around pos.ch
     // If pos == Pos(_, 0, "before"), pos and end are unchanged
-    pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos
     end = pos.sticky == "before" ? Pos(pos.line, pos.ch + 1, "before") : pos
+    pos = pos.ch ? Pos(pos.line, pos.sticky == "before" ? pos.ch - 1 : pos.ch, "after") : pos
   }
   for (let limit = 0; limit < 5; limit++) {
     let changed = false

From 72579dd091bfca38b30e4fe9c591c0716fc428a9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 17 May 2021 12:18:33 +0200
Subject: [PATCH 4487/4742] Remove quadratic complexity of adding lots of marks
 to a single line

(As long as this is done in an operation.)

Closes #6682
---
 src/display/operations.js |  3 ++-
 src/line/spans.js         | 12 ++++++++++--
 src/model/mark_text.js    |  2 +-
 test/lint.js              |  3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 6f3c9d0866..79396e9bd7 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -36,7 +36,8 @@ export function startOperation(cm) {
     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
+    id: ++nextOpId,          // Unique ID
+    markArrays: null         // Used by addMarkedSpan
   }
   pushOperation(cm.curOp)
 }
diff --git a/src/line/spans.js b/src/line/spans.js
index d81dec4b83..ac17bf6b4e 100644
--- a/src/line/spans.js
+++ b/src/line/spans.js
@@ -18,6 +18,7 @@ export function getMarkedSpanFor(spans, marker) {
     if (span.marker == marker) return span
   }
 }
+
 // Remove a span from an array, returning undefined if no spans are
 // left (we don't store arrays for lines without spans).
 export function removeMarkedSpan(spans, span) {
@@ -26,9 +27,16 @@ export function removeMarkedSpan(spans, span) {
     if (spans[i] != span) (r || (r = [])).push(spans[i])
   return r
 }
+
 // Add a span to a line.
-export function addMarkedSpan(line, span) {
-  line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]
+export function addMarkedSpan(line, span, op) {
+  let inThisOp = op && window.WeakSet && (op.markedSpans || (op.markedSpans = new WeakSet))
+  if (inThisOp && inThisOp.has(line.markedSpans)) {
+    line.markedSpans.push(span)
+  } else {
+    line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]
+    if (inThisOp) inThisOp.add(line.markedSpans)
+  }
   span.marker.attachLine(line)
 }
 
diff --git a/src/model/mark_text.js b/src/model/mark_text.js
index 088f9c98ee..64d40d29f5 100644
--- a/src/model/mark_text.js
+++ b/src/model/mark_text.js
@@ -187,7 +187,7 @@ export function markText(doc, from, to, options, type) {
     if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0)
     addMarkedSpan(line, new MarkedSpan(marker,
                                        curLine == from.line ? from.ch : null,
-                                       curLine == to.line ? to.ch : null))
+                                       curLine == to.line ? to.ch : null), doc.cm && doc.cm.curOp)
     ++curLine
   })
   // lineIsHidden depends on the presence of the spans, so needs a second pass
diff --git a/test/lint.js b/test/lint.js
index bdbed1a8eb..561f1462c7 100644
--- a/test/lint.js
+++ b/test/lint.js
@@ -3,7 +3,7 @@ var blint = require("blint");
 ["mode", "lib", "addon", "keymap"].forEach(function(dir) {
   blint.checkDir(dir, {
     browser: true,
-    allowedGlobals: ["CodeMirror", "define", "test", "requirejs", "globalThis"],
+    allowedGlobals: ["CodeMirror", "define", "test", "requirejs", "globalThis", "WeakSet"],
     ecmaVersion: 5,
     tabs: dir == "lib"
   });
@@ -12,6 +12,7 @@ var blint = require("blint");
 ["src"].forEach(function(dir) {
   blint.checkDir(dir, {
     browser: true,
+    allowedGlobals: ["WeakSet"],
     ecmaVersion: 6,
     semicolons: false
   });

From 4cc111c241906f6600f4e4f0f356e8131f7fdd8b Mon Sep 17 00:00:00 2001
From: Steven Yung <stevenyung@fastmail.com>
Date: Wed, 19 May 2021 12:17:35 +0200
Subject: [PATCH 4488/4742] [mustache demo] Fix link to mustache documentation
 url

---
 demo/mustache.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/mustache.html b/demo/mustache.html
index 2d193f096e..f37f01b537 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -61,7 +61,7 @@ <h1>{{title}}</h1>
 </script>
 
     <p>Demonstration of a mode that parses HTML, highlighting
-    the <a href="http://mustache.github.com/">Mustache</a> templating
+    the <a href="http://mustache.github.io/">Mustache</a> templating
     directives inside of it by using the code
     in <a href="../addon/mode/overlay.js"><code>overlay.js</code></a>. View
     source to see the 15 lines of code needed to accomplish this.</p>

From 9b57f4b1fba8b37bd534d066956b88b17f30ba40 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 May 2021 10:58:33 +0200
Subject: [PATCH 4489/4742] Mark version 5.61.1

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 14 ++++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 125abd4f26..a8ded264ec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -416,6 +416,7 @@ jochenberger
 Jochen Berger
 Joel Einbinder
 joelpinheiro
+Joe Predham
 joewalsh
 Johan Ask
 Johannes
@@ -433,6 +434,7 @@ Jonas Helfer
 Jonathan Dierksen
 Jonathan Hart
 Jonathan Malmaud
+Jonathan Rascher
 Jon Gacnik
 jongalloway
 Jon Malmaud
@@ -749,6 +751,7 @@ Roberto Abdelkader Martínez Pérez
 robertop23
 Roberto Vidal
 Robert Plummer
+Roman Frolov
 Roman Janusz
 Rrandom
 Rrrandom
@@ -871,6 +874,7 @@ Tom MacWright
 Tom McLaughlin
 Tony Jian
 tophf
+Torben Bundt
 Torgeir Thoresen
 totalamd
 Travis Heppe
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbf4abcd85..4145ff47f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 5.61.1 (2021-05-20)
+
+### Bug fixes
+
+Fix a bug where changing the editor's document could confuse text-direction management.
+
+Fix a bug in horizontally scrolling the cursor into view.
+
+Optimize adding lots of marks in a single transaction.
+
+[simple mode addon](https://codemirror.net/demo/simplemode.html): Support regexps with a unicode flag.
+
+[javascript mode](https://codemirror.net/mode/javascript/index.html): Add support for TypeScript template string types, improve integration with JSX mode.
+
 ## 5.61.0 (2021-04-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 565c506494..4aa44202b8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.61.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.61.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 da16abfe7b..7ae3f3a611 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-05-2021: <a href="https://codemirror.net/codemirror-5.61.1.zip">Version 5.61.1</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix a bug where changing the editor’s document could confuse text-direction management.</li>
+    <li>Fix a bug in horizontally scrolling the cursor into view.</li>
+    <li>Optimize adding lots of marks in a single transaction.</li>
+    <li><a href="https://codemirror.net/demo/simplemode.html">simple mode addon</a>: Support regexps with a unicode flag.</li>
+    <li><a href="https://codemirror.net/mode/javascript/index.html">javascript mode</a>: Add support for TypeScript template string types, improve integration with JSX mode.</li>
+  </ul>
+
   <p class="rel">20-04-2021: <a href="https://codemirror.net/codemirror-5.61.0.zip">Version 5.61.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index cb99d5851b..1bf64b18df 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.61.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.61.1</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 66e0d9fb32..250a75b333 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.61.0",
+  "version": "5.61.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index b7972279de..929a2bdc7e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.61.0"
+CodeMirror.version = "5.61.1"

From f15619c492f58f7bcf0dcaa5cb82ae3100d1d5a1 Mon Sep 17 00:00:00 2001
From: Dimitri Mitropoulos <dimitrimitropoulos@gmail.com>
Date: Thu, 20 May 2021 11:18:05 -0400
Subject: [PATCH 4490/4742] [lint] Exit early if lint state is not present

---
 addon/lint/lint.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 395f0d9314..33f88dc6c8 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -140,7 +140,9 @@
   }
 
   function startLinting(cm) {
-    var state = cm.state.lint, options = state.options;
+    var state = cm.state.lint;
+    if (!state) return;
+    var options = state.options;
     /*
      * Passing rules in `options` property prevents JSHint (and other linters) from complaining
      * about unrecognized rules like `onUpdateLinting`, `delay`, `lintOnChange`, etc.
@@ -161,8 +163,10 @@
   }
 
   function updateLinting(cm, annotationsNotSorted) {
+    var state = cm.state.lint;
+    if (!state) return;
+    var options = state.options;
     clearMarks(cm);
-    var state = cm.state.lint, options = state.options;
 
     var annotations = groupByLine(annotationsNotSorted);
 
@@ -254,6 +258,6 @@
   });
 
   CodeMirror.defineExtension("performLint", function() {
-    if (this.state.lint) startLinting(this);
+    startLinting(this);
   });
 });

From bffc46ade331f9d1ce395e4a1f1e88bbc79a466f Mon Sep 17 00:00:00 2001
From: Rongjian Zhang <pd4d10@gmail.com>
Date: Tue, 25 May 2021 15:59:41 +0800
Subject: [PATCH 4491/4742] [juejin theme] Add

---
 demo/theme.html  |  2 ++
 theme/juejin.css | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 theme/juejin.css

diff --git a/demo/theme.html b/demo/theme.html
index a4ca59cf1d..1ccac88c4b 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -28,6 +28,7 @@
 <link rel="stylesheet" href="../theme/hopscotch.css">
 <link rel="stylesheet" href="../theme/icecoder.css">
 <link rel="stylesheet" href="../theme/isotope.css">
+<link rel="stylesheet" href="../theme/juejin.css">
 <link rel="stylesheet" href="../theme/lesser-dark.css">
 <link rel="stylesheet" href="../theme/liquibyte.css">
 <link rel="stylesheet" href="../theme/lucario.css">
@@ -130,6 +131,7 @@ <h2>Theme Demo</h2>
     <option>icecoder</option>
     <option>idea</option>
     <option>isotope</option>
+    <option>juejin</option>
     <option>lesser-dark</option>
     <option>liquibyte</option>
     <option>lucario</option>
diff --git a/theme/juejin.css b/theme/juejin.css
new file mode 100644
index 0000000000..38cf7fe373
--- /dev/null
+++ b/theme/juejin.css
@@ -0,0 +1,30 @@
+.cm-s-juejin.CodeMirror {
+  background: #f8f9fa;
+}
+.cm-s-juejin .cm-header,
+.cm-s-juejin .cm-def {
+  color: #1ba2f0;
+}
+.cm-s-juejin .cm-comment {
+  color: #009e9d;
+}
+.cm-s-juejin .cm-quote,
+.cm-s-juejin .cm-link,
+.cm-s-juejin .cm-strong,
+.cm-s-juejin .cm-attribute {
+  color: #fd7741;
+}
+.cm-s-juejin .cm-url,
+.cm-s-juejin .cm-keyword,
+.cm-s-juejin .cm-builtin {
+  color: #bb51b8;
+}
+.cm-s-juejin .cm-hr {
+  color: #909090;
+}
+.cm-s-juejin .cm-tag {
+  color: #107000;
+}
+.cm-s-juejin .cm-variable-2 {
+  color: #0050a0;
+}

From 6fbe464029ca4f8dc7d63b14de3ff0b16135b059 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 25 May 2021 14:18:43 +0200
Subject: [PATCH 4492/4742] [javascript mode] Be more robust about missing
 expressions

Issue https://github.com/codemirror/CodeMirror/issues/6693
---
 mode/javascript/javascript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 2b508c4829..1c0d18574c 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -445,6 +445,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
     if (type == "quasi") return pass(quasi, maybeop);
     if (type == "new") return cont(maybeTarget(noComma));
+    if (type.match(/[;\}\)\]]/)) return pass();
     return cont();
   }
   function maybeexpression(type) {

From c15537b2d3a754057aed548d9987ad5fc6807559 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 31 May 2021 08:51:38 +0200
Subject: [PATCH 4493/4742] [javascript mode] Avoid infinite loop in parsing
 mismatched closing brackets

Closes #6697
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 1c0d18574c..c6f6adedc7 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -445,7 +445,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
     if (type == "quasi") return pass(quasi, maybeop);
     if (type == "new") return cont(maybeTarget(noComma));
-    if (type.match(/[;\}\)\]]/)) return pass();
+    if (type.match(/[;\}\)\]]/) && cx.cc.length > 3) return pass();
     return cont();
   }
   function maybeexpression(type) {

From ecb60898b44ba7a6c799354d068287df3f2bb3b0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 2 Jun 2021 11:54:56 +0200
Subject: [PATCH 4494/4742] [javascript mode] Remove short-circuit in
 expression parsing again

It is too much of an infinite-loop liability.

Issue #6697
---
 mode/javascript/javascript.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index c6f6adedc7..95cbbd8533 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -445,7 +445,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
     if (type == "quasi") return pass(quasi, maybeop);
     if (type == "new") return cont(maybeTarget(noComma));
-    if (type.match(/[;\}\)\]]/) && cx.cc.length > 3) return pass();
     return cont();
   }
   function maybeexpression(type) {
@@ -483,7 +482,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function quasi(type, value) {
     if (type != "quasi") return pass();
     if (value.slice(value.length - 2) != "${") return cont(quasi);
-    return cont(expression, continueQuasi);
+    return cont(maybeexpression, continueQuasi);
   }
   function continueQuasi(type) {
     if (type == "}") {

From 7a1c1e78620b19daa42a1197f458c3379150f482 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 3 Jun 2021 10:39:27 +0200
Subject: [PATCH 4495/4742] [python mode] Improve indentation of
 else/elif/except/finally

Closes #6699
---
 mode/python/python.js | 19 +++++++++++--------
 mode/python/test.js   | 26 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 7dff2d1e31..63ee04963e 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -298,7 +298,10 @@
     }
 
     function tokenLexer(stream, state) {
-      if (stream.sol()) state.beginningOfLine = true;
+      if (stream.sol()) {
+        state.beginningOfLine = true;
+        state.dedent = false;
+      }
 
       var style = state.tokenize(stream, state);
       var current = stream.current();
@@ -315,7 +318,7 @@
 
       // Handle scope changes.
       if (current == "pass" || current == "return")
-        state.dedent += 1;
+        state.dedent = true;
 
       if (current == "lambda") state.lambda = true;
       if (current == ":" && !state.lambda && top(state).type == "py" && stream.match(/^\s*(?:#|$)/, false))
@@ -332,10 +335,8 @@
           else return ERRORCLASS;
         }
       }
-      if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
-        if (state.scopes.length > 1) state.scopes.pop();
-        state.dedent -= 1;
-      }
+      if (state.dedent && stream.eol() && top(state).type == "py" && state.scopes.length > 1)
+        state.scopes.pop();
 
       return style;
     }
@@ -370,14 +371,16 @@
         if (state.tokenize != tokenBase)
           return state.tokenize.isString ? CodeMirror.Pass : 0;
 
-        var scope = top(state), closing = scope.type == textAfter.charAt(0)
+        var scope = top(state)
+        let closing = scope.type == textAfter.charAt(0) ||
+            scope.type == "py" && !state.dedent && /^(else:|elif |except |finally:)/.test(textAfter)
         if (scope.align != null)
           return scope.align - (closing ? 1 : 0)
         else
           return scope.offset - (closing ? hangingIndent : 0)
       },
 
-      electricInput: /^\s*[\}\]\)]$/,
+      electricInput: /^\s*([\}\]\)]|else:|elif |except |finally:)$/,
       closeBrackets: {triples: "'\""},
       lineComment: "#",
       fold: "indent"
diff --git a/mode/python/test.js b/mode/python/test.js
index 5fff328bc9..1adf95320e 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -45,4 +45,30 @@
   MT("dontIndentTypeDecl",
      "[variable i]: [builtin int] [operator =] [number 32]",
      "[builtin print]([variable i])")
+
+  MT("dedentElse",
+     "[keyword if] [variable x]:",
+     "    [variable foo]()",
+     "[keyword elif] [variable y]:",
+     "    [variable bar]()",
+     "[keyword else]:",
+     "    [variable baz]()")
+
+  MT("dedentElsePass",
+     "[keyword if] [variable x]:",
+     "    [keyword pass]",
+     "[keyword elif] [variable y]:",
+     "    [keyword pass]",
+     "[keyword else]:",
+     "    [keyword pass]")
+
+  MT("dedentElseInFunction",
+     "[keyword def] [def foo]():",
+     "    [keyword if] [variable x]:",
+     "        [variable foo]()",
+     "    [keyword elif] [variable y]:",
+     "        [variable bar]()",
+     "        [keyword pass]",
+     "    [keyword else]:",
+     "        [variable baz]()")
 })();

From c8dac6858f267e73071e4834800ec84d97bf7c85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 3 Jun 2021 10:45:01 +0200
Subject: [PATCH 4496/4742] Fix use of let in mode file

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

diff --git a/mode/python/python.js b/mode/python/python.js
index 63ee04963e..a11c43f069 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -372,7 +372,7 @@
           return state.tokenize.isString ? CodeMirror.Pass : 0;
 
         var scope = top(state)
-        let closing = scope.type == textAfter.charAt(0) ||
+        var closing = scope.type == textAfter.charAt(0) ||
             scope.type == "py" && !state.dedent && /^(else:|elif |except |finally:)/.test(textAfter)
         if (scope.align != null)
           return scope.align - (closing ? 1 : 0)

From bcd36cb3f545a679a868519c7152e1378a573d87 Mon Sep 17 00:00:00 2001
From: stasoid <x@x.x>
Date: Mon, 7 Jun 2021 08:22:41 +0600
Subject: [PATCH 4497/4742] make getRange(a,b,'') work as expected

---
 src/model/Doc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/model/Doc.js b/src/model/Doc.js
index 8a2082aa41..3d2f7d2302 100644
--- a/src/model/Doc.js
+++ b/src/model/Doc.js
@@ -86,6 +86,7 @@ Doc.prototype = createObj(BranchChunk.prototype, {
   getRange: function(from, to, lineSep) {
     let lines = getBetween(this, clipPos(this, from), clipPos(this, to))
     if (lineSep === false) return lines
+    if (lineSep === '') return lines.join('')
     return lines.join(lineSep || this.lineSeparator())
   },
 

From b6bc7bdd470a73b8cb1ce0ba0072c43a8d478e13 Mon Sep 17 00:00:00 2001
From: lexer2086 <lexer@inbox.ru>
Date: Wed, 9 Jun 2021 09:53:51 +0400
Subject: [PATCH 4498/4742] [lint addon] Support highlighting lines with errors

Co-authored-by: anton.perov <anton.perov@tinypass.com>
---
 addon/lint/lint.css |  4 ++++
 addon/lint/lint.js  | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index 0871865959..9cd80afb9a 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -69,3 +69,7 @@
   background-position: right bottom;
   width: 100%; height: 100%;
 }
+
+.CodeMirror-lint-line-error {
+  background-color: rgba(183, 76, 81, 0.08);
+}
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 33f88dc6c8..89b5fc8ed2 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -11,6 +11,7 @@
 })(function(CodeMirror) {
   "use strict";
   var GUTTER_ID = "CodeMirror-lint-markers";
+  var LINT_ROW_ID = "CodeMirror-lint-line-error";
 
   function showTooltip(cm, e, content) {
     var tt = document.createElement("div");
@@ -75,12 +76,35 @@
 
   function clearMarks(cm) {
     var state = cm.state.lint;
-    if (state.hasGutter) cm.clearGutter(GUTTER_ID);
+    if (state.hasGutter) {
+      cm.clearGutter(GUTTER_ID);
+    }
+    if (isHighlightErrorLinesEnabled(state)) {
+      clearErrorLines(cm);
+    }
     for (var i = 0; i < state.marked.length; ++i)
       state.marked[i].clear();
     state.marked.length = 0;
   }
 
+  function clearErrorLines(cm) {
+    for (var i = cm.firstLine(), j = cm.lastLine(); i < j; i++) {
+      removeErrorLine(i, cm);
+    }
+  }
+
+  function isHighlightErrorLinesEnabled(state) {
+    return state.options.highlightErrorLines;
+  }
+
+  function removeErrorLine(index, cm) {
+    cm.removeLineClass(index, 'wrap', LINT_ROW_ID);
+  }
+
+  function addErrorLine(index, cm) {
+    cm.addLineClass(index, 'wrap', LINT_ROW_ID);
+  }
+
   function makeMarker(cm, labels, severity, multiple, tooltips) {
     var marker = document.createElement("div"), inner = marker;
     marker.className = "CodeMirror-lint-marker CodeMirror-lint-marker-" + severity;
@@ -196,9 +220,14 @@
         }));
       }
       // use original annotations[line] to show multiple messages
-      if (state.hasGutter)
+      if (state.hasGutter) {
         cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, annotations[line].length > 1,
                                                        state.options.tooltips));
+      }
+
+      if (isHighlightErrorLinesEnabled(state)) {
+        addErrorLine(line, cm);
+      }
     }
     if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
   }

From d31bec5da9b9277688a2f6357376f93db21b4750 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 9 Jun 2021 07:59:11 +0200
Subject: [PATCH 4499/4742] [lint addon] Tweaks to highlightLines option

Issue #6704
---
 addon/lint/lint.css |  2 +-
 addon/lint/lint.js  | 33 +++++++++------------------------
 doc/manual.html     |  1 +
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index 9cd80afb9a..20e5d6021e 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -70,6 +70,6 @@
   width: 100%; height: 100%;
 }
 
-.CodeMirror-lint-line-error {
+.CodeMirror-lint-line {
   background-color: rgba(183, 76, 81, 0.08);
 }
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 89b5fc8ed2..35c1d3b2cd 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -11,7 +11,7 @@
 })(function(CodeMirror) {
   "use strict";
   var GUTTER_ID = "CodeMirror-lint-markers";
-  var LINT_ROW_ID = "CodeMirror-lint-line-error";
+  var LINT_ROW_ID = "CodeMirror-lint-line";
 
   function showTooltip(cm, e, content) {
     var tt = document.createElement("div");
@@ -76,33 +76,20 @@
 
   function clearMarks(cm) {
     var state = cm.state.lint;
-    if (state.hasGutter) {
-      cm.clearGutter(GUTTER_ID);
-    }
-    if (isHighlightErrorLinesEnabled(state)) {
-      clearErrorLines(cm);
-    }
+    if (state.hasGutter) cm.clearGutter(GUTTER_ID);
+    if (isHighlightErrorLinesEnabled(state)) clearErrorLines(cm);
     for (var i = 0; i < state.marked.length; ++i)
       state.marked[i].clear();
     state.marked.length = 0;
   }
 
   function clearErrorLines(cm) {
-    for (var i = cm.firstLine(), j = cm.lastLine(); i < j; i++) {
-      removeErrorLine(i, cm);
-    }
+    for (var i = cm.firstLine(), j = cm.lastLine(); i <= j; i++)
+      cm.removeLineClass(i, "wrap", LINT_ROW_ID);
   }
 
   function isHighlightErrorLinesEnabled(state) {
-    return state.options.highlightErrorLines;
-  }
-
-  function removeErrorLine(index, cm) {
-    cm.removeLineClass(index, 'wrap', LINT_ROW_ID);
-  }
-
-  function addErrorLine(index, cm) {
-    cm.addLineClass(index, 'wrap', LINT_ROW_ID);
+    return state.options.highlightLines;
   }
 
   function makeMarker(cm, labels, severity, multiple, tooltips) {
@@ -220,14 +207,12 @@
         }));
       }
       // use original annotations[line] to show multiple messages
-      if (state.hasGutter) {
+      if (state.hasGutter)
         cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, annotations[line].length > 1,
                                                        state.options.tooltips));
-      }
 
-      if (isHighlightErrorLinesEnabled(state)) {
-        addErrorLine(line, cm);
-      }
+      if (isHighlightErrorLinesEnabled(state))
+        cm.addLineClass(line, "wrap", LINT_ROW_ID);
     }
     if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
   }
diff --git a/doc/manual.html b/doc/manual.html
index 4aa44202b8..ee9e8503e1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -2950,6 +2950,7 @@ <h2 id="addons">Addons</h2>
       By default, the linter will run (debounced) whenever the document is changed.
       You can pass a <code>lintOnChange: false</code> option to disable that.
       You can pass a <code>selfContain: true</code> option to render the tooltip inside the editor instance.
+      And a <code>highlightLines</code> option to add a style to lines that contain problems.
       Depends on <code>addon/lint/lint.css</code>. A demo can be
       found <a href="../demo/lint.html">here</a>.</dd>
 

From 3f098300d0b89c85b39076d856de6554867cee0e Mon Sep 17 00:00:00 2001
From: lexer2086 <lexer@inbox.ru>
Date: Mon, 14 Jun 2021 11:16:12 +0400
Subject: [PATCH 4500/4742] [lint addon] Highlight lines with warnings
 differently

---
 addon/lint/lint.css |  6 +++++-
 addon/lint/lint.js  | 36 ++++++++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/addon/lint/lint.css b/addon/lint/lint.css
index 20e5d6021e..e1560db981 100644
--- a/addon/lint/lint.css
+++ b/addon/lint/lint.css
@@ -70,6 +70,10 @@
   width: 100%; height: 100%;
 }
 
-.CodeMirror-lint-line {
+.CodeMirror-lint-line-error {
   background-color: rgba(183, 76, 81, 0.08);
 }
+
+.CodeMirror-lint-line-warning {
+  background-color: rgba(255, 211, 0, 0.1);
+}
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 35c1d3b2cd..89c45084e7 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -11,7 +11,7 @@
 })(function(CodeMirror) {
   "use strict";
   var GUTTER_ID = "CodeMirror-lint-markers";
-  var LINT_ROW_ID = "CodeMirror-lint-line";
+  var LINT_LINE_ID = "CodeMirror-lint-line-";
 
   function showTooltip(cm, e, content) {
     var tt = document.createElement("div");
@@ -84,14 +84,42 @@
   }
 
   function clearErrorLines(cm) {
-    for (var i = cm.firstLine(), j = cm.lastLine(); i <= j; i++)
-      cm.removeLineClass(i, "wrap", LINT_ROW_ID);
+    for (var i = cm.firstLine(), j = cm.lastLine(); i < j; i++) {
+      var wrapClass = cm.lineInfo(i).wrapClass;
+
+      if (wrapClass) {
+        removeErrorLine(i, cm, wrapClass);
+      }
+    }
   }
 
   function isHighlightErrorLinesEnabled(state) {
     return state.options.highlightLines;
   }
 
+  function findLintLineCssClass(wrapClass) {
+    var lintLineClass = '';
+    var classes = wrapClass.split(' ');
+    for (var i = 0, clsLength = classes.length; i < clsLength; i++) {
+      var cssClass = classes[i];
+      if (cssClass.indexOf(LINT_LINE_ID) > -1) {
+        lintLineClass = cssClass;
+      }
+    }
+
+    return lintLineClass;
+  }
+
+  function removeErrorLine(index, cm, wrapClass) {
+    var lintLineClass = findLintLineCssClass(wrapClass);
+
+    if (!lintLineClass) {
+      return;
+    }
+
+    cm.removeLineClass(index, 'wrap', lintLineClass);
+  }
+
   function makeMarker(cm, labels, severity, multiple, tooltips) {
     var marker = document.createElement("div"), inner = marker;
     marker.className = "CodeMirror-lint-marker CodeMirror-lint-marker-" + severity;
@@ -212,7 +240,7 @@
                                                        state.options.tooltips));
 
       if (isHighlightErrorLinesEnabled(state))
-        cm.addLineClass(line, "wrap", LINT_ROW_ID);
+        cm.addLineClass(line, "wrap", LINT_LINE_ID + maxSeverity);
     }
     if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
   }

From 7058f968653ecd517d63f615ed3f643a2b44328a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 14 Jun 2021 09:20:41 +0200
Subject: [PATCH 4501/4742] [lint addon] Simplify and optimize removal of line
 classes

Issue #6708
---
 addon/lint/lint.js | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 89c45084e7..76e61065be 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -84,42 +84,16 @@
   }
 
   function clearErrorLines(cm) {
-    for (var i = cm.firstLine(), j = cm.lastLine(); i < j; i++) {
-      var wrapClass = cm.lineInfo(i).wrapClass;
-
-      if (wrapClass) {
-        removeErrorLine(i, cm, wrapClass);
-      }
-    }
+    cm.eachLine(line => {
+      let has = line.wrapClass && /\bCodeMirror-lint-line-\w+\b/.exec(line.wrapClass);
+      if (has) cm.removeLineClass(line, "wrap", has[0]);
+    })
   }
 
   function isHighlightErrorLinesEnabled(state) {
     return state.options.highlightLines;
   }
 
-  function findLintLineCssClass(wrapClass) {
-    var lintLineClass = '';
-    var classes = wrapClass.split(' ');
-    for (var i = 0, clsLength = classes.length; i < clsLength; i++) {
-      var cssClass = classes[i];
-      if (cssClass.indexOf(LINT_LINE_ID) > -1) {
-        lintLineClass = cssClass;
-      }
-    }
-
-    return lintLineClass;
-  }
-
-  function removeErrorLine(index, cm, wrapClass) {
-    var lintLineClass = findLintLineCssClass(wrapClass);
-
-    if (!lintLineClass) {
-      return;
-    }
-
-    cm.removeLineClass(index, 'wrap', lintLineClass);
-  }
-
   function makeMarker(cm, labels, severity, multiple, tooltips) {
     var marker = document.createElement("div"), inner = marker;
     marker.className = "CodeMirror-lint-marker CodeMirror-lint-marker-" + severity;

From e23009989b83aaae93d52d20f236513b869cd68e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 14 Jun 2021 09:25:49 +0200
Subject: [PATCH 4502/4742] [lint addon] Fix use of let

---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 76e61065be..3ebf64f8c6 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -85,7 +85,7 @@
 
   function clearErrorLines(cm) {
     cm.eachLine(line => {
-      let has = line.wrapClass && /\bCodeMirror-lint-line-\w+\b/.exec(line.wrapClass);
+      var has = line.wrapClass && /\bCodeMirror-lint-line-\w+\b/.exec(line.wrapClass);
       if (has) cm.removeLineClass(line, "wrap", has[0]);
     })
   }

From b69f9d9bd58af60bc4aa19e1e74e533c9b6db80f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 14 Jun 2021 09:29:17 +0200
Subject: [PATCH 4503/4742] [lint addon] And an arrow function

---
 addon/lint/lint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 3ebf64f8c6..54d84318ed 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -84,7 +84,7 @@
   }
 
   function clearErrorLines(cm) {
-    cm.eachLine(line => {
+    cm.eachLine(function(line) {
       var has = line.wrapClass && /\bCodeMirror-lint-line-\w+\b/.exec(line.wrapClass);
       if (has) cm.removeLineClass(line, "wrap", has[0]);
     })

From 6b290a4b2c61685b463b05b82808eb2e5f7da21f Mon Sep 17 00:00:00 2001
From: stasoid <stasoid@yahoo.com>
Date: Tue, 15 Jun 2021 11:48:14 +0600
Subject: [PATCH 4504/4742] [manual] Augment eachLine doc

---
 doc/manual.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index ee9e8503e1..385035b406 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1320,6 +1320,8 @@ <h3 id="api_content">Content manipulation methods</h3>
       and <code>end</code> line numbers are given, the range
       from <code>start</code> up to (not including) <code>end</code>,
       and call <code>f</code> for each line, passing the line handle.
+      <code>eachLine</code> stops iterating if <code>f</code> returns
+      truthy value.
       This is a faster way to visit a range of line handlers than
       calling <a href="#getLineHandle"><code>getLineHandle</code></a>
       for each of them. Note that line handles have

From 8581f7037d43af733b4a4d06e3e1ef8fed06fe9c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Jun 2021 08:05:38 +0200
Subject: [PATCH 4505/4742] Add github actions CI script

---
 .github/workflows/ci.yml | 17 +++++++++++++++++
 .travis.yml              |  5 -----
 README.md                |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..b387c93326
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,17 @@
+name: main
+on: [push]
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    name: Build and test
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: actions/cache@v2
+        with:
+          path: '/home/runner/work/codemirror/codemirror/node_modules'
+          key: ${{ runner.os }}-modules
+
+      - run: npm prepare
+
+      - run: npm test
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1dfeb819fd..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: node_js
-node_js:
-  - stable
-sudo: false
-cache: npm
diff --git a/README.md b/README.md
index 92debf4488..39c24686b5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # CodeMirror
 
-[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
+[![Build Status](https://github.com/codemirror/codemirror/workflows/main/badge.svg)](https://github.com/codemirror/codemirror/actions)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a versatile text editor implemented in JavaScript for

From f347fb3cd14e9e0a5b39d321a672757526a95013 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Jun 2021 08:06:49 +0200
Subject: [PATCH 4506/4742] Adjust ci script

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b387c93326..f6e8536817 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,6 @@ jobs:
           path: '/home/runner/work/codemirror/codemirror/node_modules'
           key: ${{ runner.os }}-modules
 
-      - run: npm prepare
+      - run: npm install
 
       - run: npm test

From 676b510f4cbd9c75fc98a1cb58ee4e12ae241104 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Thu, 17 Jun 2021 09:08:47 +0200
Subject: [PATCH 4507/4742] [soy mode] Add velog tag

---
 mode/soy/soy.js  | 1 +
 mode/soy/test.js | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 1f8a13c47d..9361b0590e 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -46,6 +46,7 @@
     "delcall": { soyState: "templ-ref" },
     "log": {},
     "element": { variableScope: true },
+    "velog": {},
   };
 
   var indentingTags = Object.keys(tags).filter(function(tag) {
diff --git a/mode/soy/test.js b/mode/soy/test.js
index ae13158720..f44263171e 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -308,4 +308,7 @@
 
   MT('import',
    '[keyword import] {[def Name], [variable Person] [keyword as] [def P]} [keyword from] [string \'examples/proto/example.proto\'];');
+
+  MT('velog',
+    '[keyword {velog] [variable-2&error $data][keyword }] Logged [keyword {/velog}]');
 })();

From 81ff51fa9ac665057ea70ad32bbc73df67cb4f3a Mon Sep 17 00:00:00 2001
From: iteriani <tomnguyen@google.com>
Date: Fri, 18 Jun 2021 00:01:31 -0700
Subject: [PATCH 4508/4742] [soy mode] Add support for {extern and {export
 extern

---
 mode/soy/soy.js  | 8 +++++++-
 mode/soy/test.js | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 9361b0590e..614c3f2316 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -24,6 +24,8 @@
     "@inject?": paramData,
     "@state": paramData,
     "template": { soyState: "templ-def", variableScope: true},
+    "extern": {soyState: "param-def"},
+    "export": {soyState: "param-def"},
     "literal": { },
     "msg": {},
     "fallbackmsg": { noEndTag: true, reduceIndent: true},
@@ -283,6 +285,9 @@
               return "type";
             }
             if (match = stream.match(/^\w+/)) {
+              if (match[0] == 'extern') {
+                return 'keyword';
+              }
               state.variables = prepend(state.variables, match[0]);
               state.soyState.pop();
               state.soyState.push("param-type");
@@ -553,7 +558,8 @@
               state.context = new Context(state.context, state.tag, tag.variableScope ? state.variables : null);
             // Otherwise close the current context.
             } else if (endTag) {
-              if (!state.context || state.context.tag != tagName) {
+              var isBalancedForExtern = tagName == 'extern' && (state.context && state.context.tag == 'export');
+              if (!state.context || ((state.context.tag != tagName) && !isBalancedForExtern)) {
                 tagError = true;
               } else if (state.context) {
                 if (state.context.kind) {
diff --git a/mode/soy/test.js b/mode/soy/test.js
index f44263171e..37f252530b 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -311,4 +311,8 @@
 
   MT('velog',
     '[keyword {velog] [variable-2&error $data][keyword }] Logged [keyword {/velog}]');
+
+  MT('extern', '[keyword {extern] [def renderer]: ([def s]:[type string])=>[type string][keyword }] [keyword {/extern}]');
+ 
+  MT('export extern', '[keyword {export] [keyword extern] [def renderer]: ([def s]:[type string])=>[type string][keyword }] [keyword {/extern}]');
 })();

From 9b81d0fd9f64972e922bb3f27ec721a9ad6a771a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 18 Jun 2021 09:06:24 +0200
Subject: [PATCH 4509/4742] Delete trailing whitespace

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

diff --git a/mode/soy/test.js b/mode/soy/test.js
index 37f252530b..6f47a5eb1c 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -313,6 +313,6 @@
     '[keyword {velog] [variable-2&error $data][keyword }] Logged [keyword {/velog}]');
 
   MT('extern', '[keyword {extern] [def renderer]: ([def s]:[type string])=>[type string][keyword }] [keyword {/extern}]');
- 
+
   MT('export extern', '[keyword {export] [keyword extern] [def renderer]: ([def s]:[type string])=>[type string][keyword }] [keyword {/extern}]');
 })();

From bac5a2d37f56c05404d8785326d6181ca4f14761 Mon Sep 17 00:00:00 2001
From: ps173 <prathamsharma173@gmail.com>
Date: Sat, 19 Jun 2021 17:27:33 +0530
Subject: [PATCH 4510/4742] [themes] Add styling for vim-style cursors to more
 themes

Issue #6714
---
 theme/ayu-dark.css           | 4 ++++
 theme/ayu-mirage.css         | 6 +++++-
 theme/base16-dark.css        | 5 +++++
 theme/gruvbox-dark.css       | 5 +++++
 theme/material-ocean.css     | 7 ++++++-
 theme/material-palenight.css | 6 +++++-
 theme/material.css           | 7 ++++++-
 theme/oceanic-next.css       | 5 +++++
 8 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/theme/ayu-dark.css b/theme/ayu-dark.css
index fd41ba3e10..a241b38cc4 100644
--- a/theme/ayu-dark.css
+++ b/theme/ayu-dark.css
@@ -40,3 +40,7 @@
   text-decoration: underline;
   color: white !important;
 }
+
+/* changing cursor color in vim mode */
+.cm-s-ayu-dark .CodeMirror-cursor { background-color: #a2a8a175 !important; }
+.cm-s-ayu-dark .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
diff --git a/theme/ayu-mirage.css b/theme/ayu-mirage.css
index 7a5b50ceb4..64cbd67be0 100644
--- a/theme/ayu-mirage.css
+++ b/theme/ayu-mirage.css
@@ -8,7 +8,7 @@
 .cm-s-ayu-mirage .CodeMirror-guttermarker { color: white; }
 .cm-s-ayu-mirage .CodeMirror-guttermarker-subtle { color:  rgba(112, 122, 140, 66); }
 .cm-s-ayu-mirage .CodeMirror-linenumber { color: rgba(61, 66, 77, 99); }
-.cm-s-ayu-mirage .CodeMirror-cursor { border-left: 1px solid #ffcc66; }
+.cm-s-ayu-mirage .CodeMirror-cursor { border-left: 1px solid #ffcc66;  }
 
 .cm-s-ayu-mirage span.cm-comment { color: #5c6773; font-style:italic; }
 .cm-s-ayu-mirage span.cm-atom { color: #ae81ff; }
@@ -41,3 +41,7 @@
   text-decoration: underline;
   color: white !important;
 }
+
+ /* changing cursor color in vim mode */
+.cm-s-ayu-mirage .CodeMirror-cursor {background-color: #a2a8a175 !important;}
+.cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 026a816890..3b43a8a21b 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -36,3 +36,8 @@
 
 .cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
+
+/* changing cursor color in vim */
+.cm-s-base16-dark .CodeMirror-cursor { background-color: #8e8d8875 !important; }
+.cm-s-base16-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
+
diff --git a/theme/gruvbox-dark.css b/theme/gruvbox-dark.css
index ded215f570..cc98e0dd4e 100644
--- a/theme/gruvbox-dark.css
+++ b/theme/gruvbox-dark.css
@@ -35,3 +35,8 @@
 
 .cm-s-gruvbox-dark span.cm-builtin { color: #fe8019; }
 .cm-s-gruvbox-dark span.cm-tag { color: #fe8019; }
+
+/* changing cursor color in vim mode */
+.cm-s-gruvbox-dark .CodeMirror-cursor { background-color: #8e8d8875 !important; }
+.cm-s-gruvbox-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
+
diff --git a/theme/material-ocean.css b/theme/material-ocean.css
index 86a6f3cd5c..f34752eea9 100644
--- a/theme/material-ocean.css
+++ b/theme/material-ocean.css
@@ -132,4 +132,9 @@
 .cm-s-material-ocean .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
-}
\ No newline at end of file
+}
+
+/* changing cursor color in vim mode */
+.cm-s-material-ocean .CodeMirror-cursor { background-color: #a2a8a175 !important; }
+.cm-s-material-ocean .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
+
diff --git a/theme/material-palenight.css b/theme/material-palenight.css
index 66d53dd394..8f5a16da95 100644
--- a/theme/material-palenight.css
+++ b/theme/material-palenight.css
@@ -132,4 +132,8 @@
 .cm-s-material-palenight .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
-}
\ No newline at end of file
+}
+
+/* changing cursor colors in vim mode */
+.cm-s-material-palenight .CodeMirror-cursor { background-color: #607c8b80 !important; }
+.cm-s-material-palenight .cm-animate-fat-cursor { background-color: #607c8b80 !important; }
diff --git a/theme/material.css b/theme/material.css
index 9ac17a3676..3b13f43257 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -132,4 +132,9 @@
 .cm-s-material .CodeMirror-matchingbracket {
   text-decoration: underline;
   color: white !important;
-}
\ No newline at end of file
+}
+
+/* changing cursor color in vim mode */
+.cm-s-material .CodeMirror-cursor { background-color: #5d6d5c80 !important; }
+.cm-s-material .cm-animate-fat-cursor { background-color: #5d6d5c80 !important; }
+
diff --git a/theme/oceanic-next.css b/theme/oceanic-next.css
index 296277ba04..e5336faa38 100644
--- a/theme/oceanic-next.css
+++ b/theme/oceanic-next.css
@@ -42,3 +42,8 @@
   text-decoration: underline;
   color: white !important;
 }
+
+/* changing cursor color in vim */
+.cm-s-oceanic-next .CodeMirror-cursor { background-color: #a2a8a175 !important; }
+.cm-s-oceanic-next .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
+

From 4c6759e15f5db2c11b921866a7069962c3e389eb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Jun 2021 07:58:30 +0200
Subject: [PATCH 4511/4742] [themes] Make sure fat cursor backgrounds are
 specialized for .cm-fat-cursor

Issue #6714
---
 demo/vim.html                |  2 --
 theme/ayu-dark.css           |  6 ++----
 theme/ayu-mirage.css         |  6 ++----
 theme/base16-dark.css        |  7 ++-----
 theme/gruvbox-dark.css       |  7 ++-----
 theme/material-ocean.css     | 11 ++++++-----
 theme/material-palenight.css | 10 ++++++----
 theme/material.css           | 11 ++++++-----
 theme/oceanic-next.css       |  7 ++-----
 9 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index 172ab6f04f..41406b4a6e 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -6,8 +6,6 @@
 
 <link rel="stylesheet" href="../lib/codemirror.css">
 <link rel="stylesheet" href="../addon/dialog/dialog.css">
-<link rel="stylesheet" href="../theme/midnight.css">
-<link rel="stylesheet" href="../theme/solarized.css">
 <script src="../lib/codemirror.js"></script>
 <script src="../addon/dialog/dialog.js"></script>
 <script src="../addon/search/searchcursor.js"></script>
diff --git a/theme/ayu-dark.css b/theme/ayu-dark.css
index a241b38cc4..13656b94bb 100644
--- a/theme/ayu-dark.css
+++ b/theme/ayu-dark.css
@@ -9,6 +9,8 @@
 .cm-s-ayu-dark .CodeMirror-guttermarker-subtle { color: #3d424d; }
 .cm-s-ayu-dark .CodeMirror-linenumber { color: #3d424d; }
 .cm-s-ayu-dark .CodeMirror-cursor { border-left: 1px solid #e6b450; }
+.cm-s-ayu-dark.cm-fat-cursor .CodeMirror-cursor { background-color: #a2a8a175 !important; }
+.cm-s-ayu-dark .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
 
 .cm-s-ayu-dark span.cm-comment { color: #626a73; }
 .cm-s-ayu-dark span.cm-atom { color: #ae81ff; }
@@ -40,7 +42,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor color in vim mode */
-.cm-s-ayu-dark .CodeMirror-cursor { background-color: #a2a8a175 !important; }
-.cm-s-ayu-dark .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
diff --git a/theme/ayu-mirage.css b/theme/ayu-mirage.css
index 64cbd67be0..19403cefb5 100644
--- a/theme/ayu-mirage.css
+++ b/theme/ayu-mirage.css
@@ -9,6 +9,8 @@
 .cm-s-ayu-mirage .CodeMirror-guttermarker-subtle { color:  rgba(112, 122, 140, 66); }
 .cm-s-ayu-mirage .CodeMirror-linenumber { color: rgba(61, 66, 77, 99); }
 .cm-s-ayu-mirage .CodeMirror-cursor { border-left: 1px solid #ffcc66;  }
+.cm-s-ayu-mirage.cm-fat-cursor .CodeMirror-cursor {background-color: #a2a8a175 !important;}
+.cm-s-ayu-mirage .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
 
 .cm-s-ayu-mirage span.cm-comment { color: #5c6773; font-style:italic; }
 .cm-s-ayu-mirage span.cm-atom { color: #ae81ff; }
@@ -41,7 +43,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
- /* changing cursor color in vim mode */
-.cm-s-ayu-mirage .CodeMirror-cursor {background-color: #a2a8a175 !important;}
-.cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
diff --git a/theme/base16-dark.css b/theme/base16-dark.css
index 3b43a8a21b..b3c31aba20 100644
--- a/theme/base16-dark.css
+++ b/theme/base16-dark.css
@@ -17,6 +17,8 @@
 .cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
 .cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
 .cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
+.cm-s-base16-dark.cm-fat-cursor .CodeMirror-cursor { background-color: #8e8d8875 !important; }
+.cm-s-base16-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
 
 .cm-s-base16-dark span.cm-comment { color: #8f5536; }
 .cm-s-base16-dark span.cm-atom { color: #aa759f; }
@@ -36,8 +38,3 @@
 
 .cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
-
-/* changing cursor color in vim */
-.cm-s-base16-dark .CodeMirror-cursor { background-color: #8e8d8875 !important; }
-.cm-s-base16-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
-
diff --git a/theme/gruvbox-dark.css b/theme/gruvbox-dark.css
index cc98e0dd4e..d712dda08d 100644
--- a/theme/gruvbox-dark.css
+++ b/theme/gruvbox-dark.css
@@ -11,6 +11,8 @@
 .cm-s-gruvbox-dark .CodeMirror-gutters {background: #282828; border-right: 0px;}
 .cm-s-gruvbox-dark .CodeMirror-linenumber {color: #7c6f64;}
 .cm-s-gruvbox-dark .CodeMirror-cursor { border-left: 1px solid #ebdbb2; }
+.cm-s-gruvbox-dark.cm-fat-cursor .CodeMirror-cursor { background-color: #8e8d8875 !important; }
+.cm-s-gruvbox-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
 .cm-s-gruvbox-dark div.CodeMirror-selected { background: #928374; }
 .cm-s-gruvbox-dark span.cm-meta { color: #83a598; }
 
@@ -35,8 +37,3 @@
 
 .cm-s-gruvbox-dark span.cm-builtin { color: #fe8019; }
 .cm-s-gruvbox-dark span.cm-tag { color: #fe8019; }
-
-/* changing cursor color in vim mode */
-.cm-s-gruvbox-dark .CodeMirror-cursor { background-color: #8e8d8875 !important; }
-.cm-s-gruvbox-dark .cm-animate-fat-cursor { background-color: #8e8d8875 !important; }
-
diff --git a/theme/material-ocean.css b/theme/material-ocean.css
index f34752eea9..404178de22 100644
--- a/theme/material-ocean.css
+++ b/theme/material-ocean.css
@@ -24,6 +24,12 @@
 .cm-s-material-ocean .CodeMirror-cursor {
   border-left: 1px solid #FFCC00;
 }
+.cm-s-material-ocean.cm-fat-cursor .CodeMirror-cursor {
+  background-color: #a2a8a175 !important;
+}
+.cm-s-material-ocean .cm-animate-fat-cursor {
+  background-color: #a2a8a175 !important;
+}
 
 .cm-s-material-ocean div.CodeMirror-selected {
   background: rgba(113, 124, 180, 0.2);
@@ -133,8 +139,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor color in vim mode */
-.cm-s-material-ocean .CodeMirror-cursor { background-color: #a2a8a175 !important; }
-.cm-s-material-ocean .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
-
diff --git a/theme/material-palenight.css b/theme/material-palenight.css
index 8f5a16da95..6712c43a0e 100644
--- a/theme/material-palenight.css
+++ b/theme/material-palenight.css
@@ -24,6 +24,12 @@
 .cm-s-material-palenight .CodeMirror-cursor {
   border-left: 1px solid #FFCC00;
 }
+.cm-s-material-palenight.cm-fat-cursor .CodeMirror-cursor {
+  background-color: #607c8b80 !important;
+}
+.cm-s-material-palenight .cm-animate-fat-cursor {
+  background-color: #607c8b80 !important;
+}
 
 .cm-s-material-palenight div.CodeMirror-selected {
   background: rgba(113, 124, 180, 0.2);
@@ -133,7 +139,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor colors in vim mode */
-.cm-s-material-palenight .CodeMirror-cursor { background-color: #607c8b80 !important; }
-.cm-s-material-palenight .cm-animate-fat-cursor { background-color: #607c8b80 !important; }
diff --git a/theme/material.css b/theme/material.css
index 3b13f43257..a7848499a7 100644
--- a/theme/material.css
+++ b/theme/material.css
@@ -24,6 +24,12 @@
 .cm-s-material .CodeMirror-cursor {
   border-left: 1px solid #FFCC00;
 }
+.cm-s-material.cm-fat-cursor .CodeMirror-cursor {
+  background-color: #5d6d5c80 !important;
+}
+.cm-s-material .cm-animate-fat-cursor {
+  background-color: #5d6d5c80 !important;
+}
 
 .cm-s-material div.CodeMirror-selected {
   background: rgba(128, 203, 196, 0.2);
@@ -133,8 +139,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor color in vim mode */
-.cm-s-material .CodeMirror-cursor { background-color: #5d6d5c80 !important; }
-.cm-s-material .cm-animate-fat-cursor { background-color: #5d6d5c80 !important; }
-
diff --git a/theme/oceanic-next.css b/theme/oceanic-next.css
index e5336faa38..f3d0d08acb 100644
--- a/theme/oceanic-next.css
+++ b/theme/oceanic-next.css
@@ -16,6 +16,8 @@
 .cm-s-oceanic-next .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-oceanic-next .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-oceanic-next .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+.cm-s-oceanic-next.cm-fat-cursor .CodeMirror-cursor { background-color: #a2a8a175 !important; }
+.cm-s-oceanic-next .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
 
 .cm-s-oceanic-next span.cm-comment { color: #65737E; }
 .cm-s-oceanic-next span.cm-atom { color: #C594C5; }
@@ -42,8 +44,3 @@
   text-decoration: underline;
   color: white !important;
 }
-
-/* changing cursor color in vim */
-.cm-s-oceanic-next .CodeMirror-cursor { background-color: #a2a8a175 !important; }
-.cm-s-oceanic-next .cm-animate-fat-cursor { background-color: #a2a8a175 !important; }
-

From 434d3e8afd670f6fe0d5023cdabfcf2d6ff26e7b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Jun 2021 09:13:20 +0200
Subject: [PATCH 4512/4742] Mark release 5.62.0

---
 AUTHORS           |  6 ++++++
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  7 +++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a8ded264ec..015ce199d2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -226,6 +226,7 @@ Dick Choi
 Diego Fernandez
 dignifiedquire
 Dimage Sapelkin
+Dimitri Mitropoulos
 Dinindu D. Wanniarachchi
 dmaclach
 Dmitry Kiselyov
@@ -504,6 +505,7 @@ Leo Baschy
 Leonid Khachaturov
 Leon Sorokin
 Leonya Khachaturov
+lexer2086
 Liam Newman
 Libo Cannici
 Lior Goldberg
@@ -720,6 +722,7 @@ Prasanth J
 Prayag Verma
 prendota
 Prendota
+ps173
 Qiang Li
 quiddity-wp
 Radek Piórkowski
@@ -753,6 +756,7 @@ Roberto Vidal
 Robert Plummer
 Roman Frolov
 Roman Janusz
+Rongjian Zhang
 Rrandom
 Rrrandom
 Ruslan Osmanov
@@ -816,6 +820,7 @@ srajanpaliwal
 Stanislav Oaserele
 stan-z
 Stas Kobzar
+stasoid
 Stefan Borsje
 Steffen Beyer
 Steffen Bruchmann
@@ -824,6 +829,7 @@ Stephane Moore
 Stephen Lavelle
 Steve Champagne
 Steve Hoover
+Steven Yung
 Steve O'Hara
 stockiNail
 stoskov
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4145ff47f2..dba3c2505a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.62.0 (2021-06-21)
+
+### Bug fixes
+
+Improve support for vim-style cursors in a number of themes.
+
+### New features
+
+[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Add support for highlighting lines with errors or warnings.
+
 ## 5.61.1 (2021-05-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 385035b406..91e213c69b 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.61.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.62.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 7ae3f3a611..75c29947fc 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,13 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-06-2021: <a href="https://codemirror.net/codemirror-5.62.0.zip">Version 5.62.0</a>:</p>
+
+  <ul class="rel-note">
+    <a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Add support for highlighting lines with errors or warnings.</li>
+    <li>Improve support for vim-style cursors in a number of themes.</li>
+  </ul>
+
   <p class="rel">20-05-2021: <a href="https://codemirror.net/codemirror-5.61.1.zip">Version 5.61.1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 1bf64b18df..e7be5c11c5 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.61.1</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.62.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 250a75b333..a73a749c5c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.61.1",
+  "version": "5.62.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 929a2bdc7e..162c24c6ce 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.61.1"
+CodeMirror.version = "5.62.0"

From 76bd2ca6d745dcf45fddfb67bec15e136c95be55 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Mon, 21 Jun 2021 10:20:17 +0200
Subject: [PATCH 4513/4742] Add support for const and export const.

---
 mode/soy/soy.js  | 27 +++++++++++++++++++++++----
 mode/soy/test.js |  4 ++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 614c3f2316..ae93b22636 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -25,7 +25,7 @@
     "@state": paramData,
     "template": { soyState: "templ-def", variableScope: true},
     "extern": {soyState: "param-def"},
-    "export": {soyState: "param-def"},
+    "export": {soyState: "export"},
     "literal": { },
     "msg": {},
     "fallbackmsg": { noEndTag: true, reduceIndent: true},
@@ -49,6 +49,7 @@
     "log": {},
     "element": { variableScope: true },
     "velog": {},
+    "const": { soyState: "const-def"},
   };
 
   var indentingTags = Object.keys(tags).filter(function(tag) {
@@ -285,9 +286,6 @@
               return "type";
             }
             if (match = stream.match(/^\w+/)) {
-              if (match[0] == 'extern') {
-                return 'keyword';
-              }
               state.variables = prepend(state.variables, match[0]);
               state.soyState.pop();
               state.soyState.push("param-type");
@@ -528,6 +526,27 @@
               return this.token(stream, state);
             }
             return tokenUntil(stream, state, /\{\/literal}/);
+          case "export":
+            if (match = stream.match(/\w+/)) {
+              state.soyState.pop();
+              if (match == "const") {
+                state.soyState.push("const-def")
+                return "keyword";
+              } else if (match == "extern") {
+                state.soyState.push("param-def")
+                return "keyword";
+              }
+            } else {
+              stream.next();
+            }
+            return null;
+          case "const-def":
+            if (stream.match(/^\w+/)) {
+              state.soyState.pop();
+              return "def";
+            }
+            stream.next();
+            return null;
         }
 
         if (stream.match('{literal}')) {
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 6f47a5eb1c..44e7c4c2e2 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -315,4 +315,8 @@
   MT('extern', '[keyword {extern] [def renderer]: ([def s]:[type string])=>[type string][keyword }] [keyword {/extern}]');
 
   MT('export extern', '[keyword {export] [keyword extern] [def renderer]: ([def s]:[type string])=>[type string][keyword }] [keyword {/extern}]');
+
+  MT('const',
+    '[keyword {const] [def FOO] = [atom 5] [keyword /}]',
+    '[keyword {export] [keyword const] [def FOO] = [atom 5] [keyword /}]');
 })();

From 129ac80d9c7d790ea69f151c9ec637c0d51ab850 Mon Sep 17 00:00:00 2001
From: Mykola Martynovets <nikkar98@gmail.com>
Date: Wed, 23 Jun 2021 15:53:25 +0300
Subject: [PATCH 4514/4742] [cobol mode] Highlight single or double quote
 inside single quotes as closed string

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

diff --git a/mode/cobol/cobol.js b/mode/cobol/cobol.js
index 275857b4bd..a7aeafa03a 100644
--- a/mode/cobol/cobol.js
+++ b/mode/cobol/cobol.js
@@ -195,7 +195,7 @@ CodeMirror.defineMode("cobol", function () {
       case "string": // multi-line string parsing mode
         var next = false;
         while ((next = stream.next()) != null) {
-          if (next == "\"" || next == "\'") {
+          if ((next == "\"" || next == "\'") && !stream.match(/['"]/, false)) {
             state.mode = false;
             break;
           }

From 397f8af9e01bc9e0aa66384de09a402be08fa7be Mon Sep 17 00:00:00 2001
From: Will Hernandez <w.hernandez.code@gmail.com>
Date: Fri, 25 Jun 2021 09:38:14 -0400
Subject: [PATCH 4515/4742] [vim bindings] More robust matching of upper-case
 characters

Co-authored-by: Axel Lewenhaupt <axel@x2d.org>
---
 AUTHORS       | 1 +
 keymap/vim.js | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 015ce199d2..11fac5f262 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -910,6 +910,7 @@ Wesley Wiser
 Weston Ruter
 Will Binns-Smith
 Will Dean
+Will Hernandez
 William Desportes
 William Jamieson
 William Stein
diff --git a/keymap/vim.js b/keymap/vim.js
index 6630b6f61a..6cb182d476 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -420,6 +420,7 @@
     var numbers = makeKeyRange(48, 10);
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
     var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '_', '/']);
+    var upperCaseChars;
 
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
@@ -434,7 +435,12 @@
       return numberRegex.test(k);
     }
     function isUpperCase(k) {
-      return (/^[A-Z]$/).test(k);
+      try {
+        upperCaseChars = new RegExp("^[\\p{Lu}]$", "u");
+      } catch (_) {
+        upperCaseChars = /^[A-Z]$/;
+      }
+      return upperCaseChars.test(k);
     }
     function isWhiteSpaceString(k) {
       return (/^\s*$/).test(k);

From 02fbce02975b635716c601ed5069c8807c22a9f9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 25 Jun 2021 15:40:11 +0200
Subject: [PATCH 4516/4742] [vim bindings] Lift creation of upperCaseChars out
 of function

Issue #6722
---
 keymap/vim.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 6cb182d476..1af86fbff2 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -421,6 +421,8 @@
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
     var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '_', '/']);
     var upperCaseChars;
+    try { upperCaseChars = new RegExp("^[\\p{Lu}]$", "u"); }
+    catch (_) { upperCaseChars = /^[A-Z]$/; }
 
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
@@ -435,11 +437,6 @@
       return numberRegex.test(k);
     }
     function isUpperCase(k) {
-      try {
-        upperCaseChars = new RegExp("^[\\p{Lu}]$", "u");
-      } catch (_) {
-        upperCaseChars = /^[A-Z]$/;
-      }
       return upperCaseChars.test(k);
     }
     function isWhiteSpaceString(k) {

From a67c752d521b0084088353b2f01130519edcc1a5 Mon Sep 17 00:00:00 2001
From: Will Hernandez <w.hernandez.code@gmail.com>
Date: Mon, 28 Jun 2021 12:52:30 -0400
Subject: [PATCH 4517/4742] [java mode] Highlighted 'var' keyword

---
 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 15c0fd1196..916aee6192 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -484,7 +484,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                     "instanceof interface native new package private protected public " +
                     "return static strictfp super switch synchronized this throw throws transient " +
                     "try volatile while @interface"),
-    types: words("byte short int long float double boolean char void Boolean Byte Character Double Float " +
+    types: words("var byte short int long float double boolean char void Boolean Byte Character Double Float " +
                  "Integer Long Number Object Short String StringBuffer StringBuilder Void"),
     blockKeywords: words("catch class do else finally for if switch try while"),
     defKeywords: words("class interface enum @interface"),

From ddbdce039ddb389772d3f90a7635f8515e51b0f8 Mon Sep 17 00:00:00 2001
From: MinJune Kim <qria@qria.net>
Date: Tue, 29 Jun 2021 16:32:09 +0900
Subject: [PATCH 4518/4742] [python mode] Add python 3 string prefix `rb` and
 `rf'

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

diff --git a/mode/python/python.js b/mode/python/python.js
index a11c43f069..9e532ea1b3 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -62,7 +62,7 @@
       var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
       myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
       myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
-      var stringPrefixes = new RegExp("^(([rbuf]|(br)|(fr))?('{3}|\"{3}|['\"]))", "i");
+      var stringPrefixes = new RegExp("^(([rbuf]|(br)|(rb)|(fr)|(rf))?('{3}|\"{3}|['\"]))", "i");
     } else {
       var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
       myKeywords = myKeywords.concat(["exec", "print"]);

From 70c615c5ff7d25e91dd50190945ef295b9ce7f09 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 30 Jun 2021 12:46:06 +0200
Subject: [PATCH 4519/4742] [lint addon] Make sure options meant for the lint
 addon aren't passed to the inner linter

Since JSHint apparently complains about such unknown options.

Closes #6724
Closes #6729
---
 addon/lint/lint.js | 47 ++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 54d84318ed..8d214433b2 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -59,25 +59,37 @@
     CodeMirror.on(node, "mouseout", hide);
   }
 
-  function LintState(cm, options, hasGutter) {
+  function LintState(cm, conf, hasGutter) {
     this.marked = [];
-    this.options = options;
+    if (conf instanceof Function) conf = {getAnnotations: conf};
+    if (!conf || conf === true) conf = {};
+    this.options = {};
+    this.linterOptions = conf.options || {};
+    for (var prop in defaults) this.options[prop] = defaults[prop];
+    for (var prop in conf) {
+      if (defaults.hasOwnProperty(prop)) {
+        if (conf[prop] != null) this.options[prop] = conf[prop];
+      } else if (!conf.options) {
+        this.linterOptions[prop] = conf[prop];
+      }
+    }
     this.timeout = null;
     this.hasGutter = hasGutter;
     this.onMouseOver = function(e) { onMouseOver(cm, e); };
     this.waitingFor = 0
   }
 
-  function parseOptions(_cm, options) {
-    if (options instanceof Function) return {getAnnotations: options};
-    if (!options || options === true) options = {};
-    return options;
+  var defaults = {
+    highlightLines: false,
+    tooltips: true,
+    delay: 500,
+    lintOnChange: true
   }
 
   function clearMarks(cm) {
     var state = cm.state.lint;
     if (state.hasGutter) cm.clearGutter(GUTTER_ID);
-    if (isHighlightErrorLinesEnabled(state)) clearErrorLines(cm);
+    if (state.options.highlightLines) clearErrorLines(cm);
     for (var i = 0; i < state.marked.length; ++i)
       state.marked[i].clear();
     state.marked.length = 0;
@@ -90,10 +102,6 @@
     })
   }
 
-  function isHighlightErrorLinesEnabled(state) {
-    return state.options.highlightLines;
-  }
-
   function makeMarker(cm, labels, severity, multiple, tooltips) {
     var marker = document.createElement("div"), inner = marker;
     marker.className = "CodeMirror-lint-marker CodeMirror-lint-marker-" + severity;
@@ -136,7 +144,7 @@
     return tip;
   }
 
-  function lintAsync(cm, getAnnotations, passOptions) {
+  function lintAsync(cm, getAnnotations) {
     var state = cm.state.lint
     var id = ++state.waitingFor
     function abort() {
@@ -149,7 +157,7 @@
       if (state.waitingFor != id) return
       if (arg2 && annotations instanceof CodeMirror) annotations = arg2
       cm.operation(function() {updateLinting(cm, annotations)})
-    }, passOptions, cm);
+    }, state.linterOptions, cm);
   }
 
   function startLinting(cm) {
@@ -160,13 +168,12 @@
      * Passing rules in `options` property prevents JSHint (and other linters) from complaining
      * about unrecognized rules like `onUpdateLinting`, `delay`, `lintOnChange`, etc.
      */
-    var passOptions = options.options || options;
     var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
     if (!getAnnotations) return;
     if (options.async || getAnnotations.async) {
-      lintAsync(cm, getAnnotations, passOptions)
+      lintAsync(cm, getAnnotations)
     } else {
-      var annotations = getAnnotations(cm.getValue(), passOptions, cm);
+      var annotations = getAnnotations(cm.getValue(), state.linterOptions, cm);
       if (!annotations) return;
       if (annotations.then) annotations.then(function(issues) {
         cm.operation(function() {updateLinting(cm, issues)})
@@ -213,7 +220,7 @@
         cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, annotations[line].length > 1,
                                                        state.options.tooltips));
 
-      if (isHighlightErrorLinesEnabled(state))
+      if (state.options.highlightLines)
         cm.addLineClass(line, "wrap", LINT_LINE_ID + maxSeverity);
     }
     if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
@@ -223,7 +230,7 @@
     var state = cm.state.lint;
     if (!state) return;
     clearTimeout(state.timeout);
-    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
+    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay);
   }
 
   function popupTooltips(cm, annotations, e) {
@@ -263,8 +270,8 @@
     if (val) {
       var gutters = cm.getOption("gutters"), hasLintGutter = false;
       for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
-      var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
-      if (state.options.lintOnChange !== false)
+      var state = cm.state.lint = new LintState(cm, val, hasLintGutter);
+      if (state.options.lintOnChange)
         cm.on("change", onChange);
       if (state.options.tooltips != false && state.options.tooltips != "gutter")
         CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);

From bf786a0bd2aa52bafdbfce64c62002c6be3e2c60 Mon Sep 17 00:00:00 2001
From: iteriani <tomnguyen@google.com>
Date: Mon, 5 Jul 2021 01:02:21 -0700
Subject: [PATCH 4520/4742] [soy mode] Add javaimpl and jsimpl

---
 mode/soy/soy.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index ae93b22636..4cb4aa2b29 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -33,6 +33,8 @@
     "plural": {},
     "let": { soyState: "var-def" },
     "if": {},
+    "javaimpl": {},
+    "jsimpl": {},
     "elseif": { noEndTag: true, reduceIndent: true},
     "else": { noEndTag: true, reduceIndent: true},
     "switch": {},

From 579e120843ff71bb4fbcd31e1b97fe54103674c8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 5 Jul 2021 14:26:19 +0200
Subject: [PATCH 4521/4742] [show-hint addon] Set ARIA-related attributes for
 better screen reader support

---
 addon/hint/show-hint.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 8f236562b7..2be2c716e0 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -224,6 +224,7 @@
   }
 
   function Widget(completion, data) {
+    this.id = "cm-complete-" + Math.floor(Math.random(1e6))
     this.completion = completion;
     this.data = data;
     this.picked = false;
@@ -232,6 +233,9 @@
     var parentWindow = ownerDocument.defaultView || ownerDocument.parentWindow;
 
     var hints = this.hints = ownerDocument.createElement("ul");
+    hints.setAttribute("role", "listbox")
+    hints.setAttribute("aria-expanded", "true")
+    hints.id = this.id
     var theme = completion.cm.options.theme;
     hints.className = "CodeMirror-hints " + theme;
     this.selectedHint = data.selectedHint || 0;
@@ -242,6 +246,9 @@
       var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
       if (cur.className != null) className = cur.className + " " + className;
       elt.className = className;
+      if (i == this.selectedHint) elt.setAttribute("aria-selected", "true")
+      elt.id = this.id + "-" + i
+      elt.setAttribute("role", "option")
       if (cur.render) cur.render(elt, data, cur);
       else elt.appendChild(ownerDocument.createTextNode(cur.displayText || getText(cur)));
       elt.hintId = i;
@@ -267,6 +274,9 @@
     var winW = parentWindow.innerWidth || Math.max(ownerDocument.body.offsetWidth, ownerDocument.documentElement.offsetWidth);
     var winH = parentWindow.innerHeight || Math.max(ownerDocument.body.offsetHeight, ownerDocument.documentElement.offsetHeight);
     container.appendChild(hints);
+    cm.getInputField().setAttribute("aria-autocomplete", "list")
+    cm.getInputField().setAttribute("aria-owns", this.id)
+    cm.getInputField().setAttribute("aria-activedescendant", this.id + "-" + this.selectedHint)
 
     var box = completion.options.moveOnOverlap ? hints.getBoundingClientRect() : new DOMRect();
     var scrolls = completion.options.paddingForScrollbar ? hints.scrollHeight > hints.clientHeight + 1 : false;
@@ -364,6 +374,9 @@
       this.completion.widget = null;
       if (this.hints.parentNode) this.hints.parentNode.removeChild(this.hints);
       this.completion.cm.removeKeyMap(this.keyMap);
+      var input = this.completion.cm.getInputField()
+      input.removeAttribute("aria-activedescendant")
+      input.removeAttribute("aria-owns")
 
       var cm = this.completion.cm;
       if (this.completion.options.closeOnUnfocus) {
@@ -391,9 +404,14 @@
         i = avoidWrap ? 0  : this.data.list.length - 1;
       if (this.selectedHint == i) return;
       var node = this.hints.childNodes[this.selectedHint];
-      if (node) node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
+      if (node) {
+        node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
+        node.removeAttribute("aria-selected")
+      }
       node = this.hints.childNodes[this.selectedHint = i];
       node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
+      node.setAttribute("aria-selected", "true")
+      this.completion.cm.getInputField().setAttribute("aria-activedescendant", node.id)
       this.scrollToActive()
       CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
     },

From f6934dae78a3212ad04a2a489fe0d80772b3326e Mon Sep 17 00:00:00 2001
From: Billiam <Billiam@users.noreply.github.com>
Date: Tue, 20 Jul 2021 07:13:50 -0500
Subject: [PATCH 4522/4742] Improve folding addon performance

* Exit method early of mode is 'fold' instead of iterating

* Don't scanUp when iterating over every line of document

* Don't scanUp for forced unfolds (has no effect)
---
 addon/fold/foldcode.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 887df3fe04..721bc087e2 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -24,9 +24,11 @@
     function getRange(allowFolded) {
       var range = finder(cm, pos);
       if (!range || range.to.line - range.from.line < minSize) return null;
+      if (force === "fold") return range;
+
       var marks = cm.findMarksAt(range.from);
       for (var i = 0; i < marks.length; ++i) {
-        if (marks[i].__isFold && force !== "fold") {
+        if (marks[i].__isFold) {
           if (!allowFolded) return null;
           range.cleared = true;
           marks[i].clear();
@@ -99,18 +101,18 @@
     cm.foldCode(cm.getCursor(), null, "fold");
   };
   CodeMirror.commands.unfold = function(cm) {
-    cm.foldCode(cm.getCursor(), null, "unfold");
+    cm.foldCode(cm.getCursor(), { scanUp: false }, "unfold");
   };
   CodeMirror.commands.foldAll = function(cm) {
     cm.operation(function() {
       for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
-        cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
+        cm.foldCode(CodeMirror.Pos(i, 0), { scanUp: false }, "fold");
     });
   };
   CodeMirror.commands.unfoldAll = function(cm) {
     cm.operation(function() {
       for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
-        cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
+        cm.foldCode(CodeMirror.Pos(i, 0), { scanUp: false }, "unfold");
     });
   };
 

From 1354f82d0e6dea3949bd5f396f16026738246a85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 19 Jul 2021 22:03:47 +0200
Subject: [PATCH 4523/4742] Add artcompiler sponsor link

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

diff --git a/index.html b/index.html
index e7be5c11c5..7e868bd32f 100644
--- a/index.html
+++ b/index.html
@@ -214,6 +214,7 @@ <h2>Sponsors</h2>
     <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='data:image/svg+xml,%3Csvg%20width%3D%22397%22%20height%3D%22109%22%20viewBox%3D%220%200%20397%20109%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20fill-rule%3D%22nonzero%22%20fill%3D%22none%22%3E%3Cpath%20d%3D%22M169.495%2063.68c2.8%200%205.254.671%207.36%202.015%202.105%201.344%203.688%203.162%204.751%205.453%201.063%202.292%201.594%204.878%201.594%207.76%200%204.408-1.241%208.054-3.724%2010.935-2.483%202.881-5.81%204.322-9.98%204.322-3.953%200-7.18-1.402-9.683-4.206v12.62c0%20.271-.085.489-.254.653a.88.88%200%200%201-.64.247h-4.767a.966.966%200%200%201-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932%200%200%201%20.656-.247h4.767a.88.88%200%200%201%20.64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268%205.006-4.902%209.057-4.902zm-.84%2024.874c2.752%200%204.865-.86%206.34-2.578%201.473-1.719%202.21-4.034%202.21-6.947%200-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576%200-4.625.855-6.148%202.563-1.524%201.71-2.285%203.986-2.285%206.831s.761%205.141%202.285%206.89c1.523%201.747%203.572%202.62%206.148%202.62zm39.147-24.875c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm31.331%2030.845c-4.25%200-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05%204.298-10.999c2.866-2.948%206.423-4.423%2010.673-4.423%202.788%200%205.332.674%207.632%202.021%202.3%201.348%204.103%203.203%205.41%205.566%201.306%202.363%201.959%204.975%201.959%207.835%200%202.861-.653%205.468-1.96%207.821-1.306%202.353-3.109%204.209-5.41%205.566-2.3%201.357-4.843%202.036-7.63%202.036zm-6.43-8.608c1.7%201.759%203.847%202.638%206.445%202.638%202.597%200%204.745-.88%206.444-2.638%201.698-1.759%202.547-4.03%202.547-6.814%200-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598%200-4.746.88-6.444%202.638-1.699%201.758-2.548%204.03-2.548%206.815%200%202.784.85%205.055%202.548%206.814zm55.522-21.623c.272%200%20.487.082.642.248.156.165.234.384.234.657v27.976c0%201.772-.302%203.373-.906%204.804-.603%201.431-1.402%202.6-2.395%203.504-.993.906-2.157%201.67-3.49%202.293a16.713%2016.713%200%200%201-4.076%201.314c-1.383.253-2.814.38-4.294.38-2.337%200-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652%201.198-.38%202.707%201.46%205.735%202.19%209.085%202.19%201.169%200%202.293-.116%203.374-.35%201.074-.23%202.107-.62%203.068-1.153a6.016%206.016%200%200%200%202.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513%203.154-5.726%204.731-9.64%204.731-2.688%200-5.132-.676-7.333-2.03a13.905%2013.905%200%200%201-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534%200-2.726.604-5.237%201.811-7.534%201.208-2.298%202.907-4.123%205.098-5.476%202.19-1.353%204.64-2.03%207.347-2.03%203.856%200%207.03%201.548%209.523%204.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596%2023.266c2.408%200%204.424-.894%206.045-2.68%201.622-1.788%202.433-3.898%202.433-6.332%200-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428%200-4.452.86-6.074%202.581-1.622%201.72-2.433%203.826-2.433%206.317%200%202.529.811%204.663%202.433%206.402%201.621%201.74%203.646%202.61%206.074%202.61zm40.073-23.88c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm46.24%2024.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0%20.626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493%201.682-3.399%203.008-5.717%203.976-2.318.968-4.577%201.453-6.778%201.453-3.241%200-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149%200-2.621.835-4.656%202.504-6.104%201.67-1.448%204.214-2.416%207.633-2.906l6.984-1.085c1.355-.196%202.347-.401%202.976-.617.629-.215%201.041-.479%201.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302%200-6.65%201.36-7.043%204.079-.059.45-.353.665-.884.646h-4.48c-.647%200-.942-.304-.883-.91.334-3.326%201.66-5.713%203.978-7.161%202.318-1.448%205.452-2.172%209.4-2.172%204.224%200%207.392.959%209.504%202.876%202.112%201.918%203.168%204.706%203.168%208.364v11.035c-.02%201.35.707%202.172%202.18%202.466zm-19.06.135c4.132%200%207.518-1.307%2010.16-3.922v-6.028c-.258.566-1.53%201.024-3.814%201.375l-6.375.995c-1.728.274-2.96.742-3.695%201.405-.735.663-1.102%201.512-1.102%202.546%200%201.132.397%202.02%201.192%202.663.794.644%202.006.966%203.635.966zm48.252-24.875c2.377%200%204.116.796%205.216%202.386%201.1%201.59%201.65%204.248%201.65%207.971v18.59c0%20.272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948%200%200%201-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042%200-1.886.403-2.535%201.207a5.452%205.452%200%200%200-1.178%202.75v19.463c0%20.271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275%200-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04%200-1.88.398-2.52%201.193a5.675%205.675%200%200%200-1.193%202.764v19.463c0%20.271-.083.49-.25.654a.864.864%200%200%201-.634.248h-4.273c-.275%200-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57%200%20.874.3.914.902l.147%202.386h.442c.943-2.619%202.898-3.928%205.864-3.928%202.849%200%204.745%201.31%205.688%203.928h.353c1.061-2.619%202.986-3.928%205.776-3.928zM162.091%2016.126c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.694-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123%2022.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47%200-.824-.162-1.06-.488l-8.592-10.002-8.592%2010.002c-.255.326-.618.488-1.089.488h-5.532c-.373%200-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47%200%20.833.172%201.088.517l7.798%209.082%207.798-9.082c.255-.325.618-.498%201.089-.517h5.473c.373%200%20.618.105.736.316.117.21.059.46-.177.747l-11.152%2012.933%2011.976%2013.795zm14.101-26.59c1.86-.801%203.86-1.201%206-1.201%202.142%200%204.113.395%205.915%201.186%201.801.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.122%202.04-.364%202.549-.242.507-.76.761-1.554.761H230.41c.329%202.285%201.385%204.106%203.167%205.463%201.782%201.357%204.01%202.036%206.684%202.036%202.693%200%205.134-.84%207.323-2.52.465-.35.882-.341%201.25.03l1.947%201.992c.465.469.465.918%200%201.347-2.984%203.008-6.713%204.511-11.189%204.511-4.572%200-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.118-6.048.746-1.885%201.764-3.516%203.052-4.892%201.288-1.377%202.852-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.203.718-5.767%202.154-1.566%201.437-2.503%203.372-2.812%205.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83%2019.894c3.133%200%205.619-1.191%207.457-3.574.348-.45.745-.527%201.19-.234l3.394%201.962c.542.332.639.733.29%201.201-1.315%202.012-3.06%203.618-5.237%204.819-2.176%201.2-4.58%201.801-7.21%201.801-4.392%200-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05%204.367-11c2.912-2.948%206.563-4.422%2010.954-4.422%202.631%200%205.04.595%207.225%201.787%202.186%201.19%203.927%202.792%205.224%204.803.328.47.232.87-.29%201.202l-3.396%201.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67%200-4.88.884-6.63%202.651-1.75%201.768-2.626%204.033-2.626%206.796s.875%205.028%202.626%206.796c1.75%201.767%203.96%202.65%206.63%202.65zm46.585-24.87c.276%200%20.499.083.666.248.168.165.252.383.252.654v27.379c0%20.271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573%200-.88-.3-.919-.901l-.237-3.953h-.652c-1.007%201.608-2.35%202.93-4.03%203.968-1.68%201.036-3.674%201.554-5.986%201.554-3.26%200-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276%200%20.499.082.666.247.168.165.252.383.252.654v15.956c0%202.403.583%204.18%201.749%205.334%201.165%201.153%202.785%201.73%204.86%201.73%201.343%200%202.573-.258%203.689-.771s1.99-1.129%202.623-1.846c.632-.717%201.116-1.4%201.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595%2024.474c.353.446.382.852.088%201.22-.882%201.047-2.172%202.001-3.868%202.863-1.697.862-3.731%201.293-6.104%201.293-8.002%200-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885%200%200%201-.647-.261.864.864%200%200%201-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255%200%20.466.078.633.233.166.154.25.368.25.639l-.02%209.285h11.943c.255%200%20.466.082.632.247.167.164.25.382.25.654v3.603a.89.89%200%200%201-.25.64.837.837%200%200%201-.632.261H345.36v11.741c0%201.337.18%202.465.544%203.386.363.92.873%201.613%201.53%202.077a6.487%206.487%200%200%200%202.059.989c.716.193%201.534.29%202.456.29%201.98%200%203.824-.668%205.53-2.005.452-.426.873-.407%201.265.058l2%202.325zm15.146-23.272c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z%22%20fill%3D%22%23FFF%22%2F%3E%3Cpath%20d%3D%22M102.022%2037.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87%201.87%200%200%201-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87%201.87%200%200%201%2082.511%200h26.297c1.171%200%202.312.1%203.423.303%201.11.201%202.282.615%203.514%201.24a11.807%2011.807%200%200%201%203.212%202.36c.909.949%201.646%202.23%202.211%203.844.566%201.613.849%203.47.849%205.568v23.421c.04%201.09.262%201.877.666%202.36l12.18%2014.102c.645.767.605%201.594-.122%202.481l-12.058%2013.799c-.444.484-.666%201.271-.666%202.36V95.14c0%202.622-.414%204.852-1.243%206.688-.828%201.835-1.938%203.207-3.332%204.115-1.394.908-2.787%201.553-4.18%201.937-1.394.383-2.879.575-4.454.575H82.51c-.525%200-.97-.162-1.333-.485a1.716%201.716%200%200%201-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87%201.87%200%200%201%201.333-.515H97.66c2.908%200%204.363-1.25%204.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217%200%200%200%200-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083%2053.15a1.523%201.523%200%200%201%200%202.154l-23.85%2023.849a1.523%201.523%200%200%201-2.153%200l-23.85-23.85a1.523%201.523%200%200%201%200-2.153L67.08%2029.3a1.523%201.523%200%200%201%202.154%200zm-35.937%208.585c0%201.009-.243%201.735-.728%202.18L19.26%2054.258a.217.217%200%200%200%200%20.298L32.57%2068.51c.485.484.728%201.23.728%202.24v18.337c0%202.501%201.454%203.752%204.362%203.752h15.148c.525%200%20.97.172%201.333.515.364.343.584.797.584%201.361v11.923c0%20.565-.22%201.009-.584%201.331-.363.323-.808.485-1.333.485H26.511c-1.576%200-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577%2055.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614%201.303-2.895%202.211-3.843a11.807%2011.807%200%200%201%203.212-2.36C20.805.917%2021.976.503%2023.087.302A19.123%2019.123%200%200%201%2026.511%200h26.296c.525%200%20.97.171%201.333.515.364.342.584.796.584%201.361v11.862c0%20.525-.22.959-.584%201.301a1.87%201.87%200%200%201-1.333.515H37.66c-2.908%200-4.362%201.291-4.362%203.873v18.459z%22%20fill%3D%22%234547E0%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E' alt="Execute Program"></a></li>
     <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='data:image/svg+xml;utf8,<svg width="3311" height="1605" viewBox="400 0 3311 1605" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1133 1602C1182 1602 1191 1602 1189 1579C1153 1301 1125 1076 1098 855L1098 855C1067 601 1037 354 995 41C991 2 973 0 916 0C865 0 854 2 849 34C824 242 798 437 772 636L772 636L772 636L772 636L772 636C734 928 695 1227 653 1581C651 1602 681 1602 715 1602C721 1602 726 1602 732 1602C791 1602 809 1602 811 1579C822 1446 833 1334 847 1206C849 1185 868 1185 905 1186C908 1186 912 1186 916 1186C919 1186 922 1186 925 1186C957 1185 984 1185 986 1206C996 1272 1004 1335 1013 1399L1013 1399C1020 1456 1028 1514 1036 1574C1040 1602 1050 1602 1097 1602C1103 1602 1110 1602 1118 1602C1124 1602 1128 1602 1133 1602ZM264 1602C451 1602 528 1478 528 1334V1195C528 1175 509 1176 470 1176L470 1176C463 1176 455 1177 446 1177C405 1177 376 1177 376 1195V1330C376 1391 342 1448 264 1448C180 1448 148 1387 148 1323V265C148 212 193 143 264 143C332 143 376 217 376 267V374C376 400 403 400 443 399H443H443H443H443H443C447 399 450 399 453 399C494 399 528 397 528 374V271C528 173 453 2 264 2C86 2 0 148 0 271V1336C0 1458 86 1602 264 1602ZM968 1042C959 928 953 837 946 746C942 681 937 615 931 539C931 530 929 514 916 514C904 514 902 530 902 537C896 625 890 707 885 784L885 784C879 874 874 958 868 1039C865 1055 886 1060 918 1060C945 1060 970 1060 968 1042ZM1784 1602C1845 1602 1861 1602 1861 1565V996C1861 992 1861 988 1861 984C1861 936 1861 903 1836 852C1812 804 1767 783 1743 771C1733 766 1727 763 1727 761C1727 758 1734 754 1744 748C1768 736 1810 713 1834 669C1859 623 1859 586 1859 537V537C1859 533 1859 529 1859 525V319C1859 239 1843 146 1775 82C1706 20 1608 2 1535 2H1405C1401 2 1397 1 1393 1C1379 0 1367 -0 1353 11C1339 25 1337 50 1337 73V1570C1337 1602 1353 1602 1405 1602C1474 1602 1483 1602 1483 1565V873C1483 838 1495 838 1586 838H1586H1586L1586 838C1591 838 1597 838 1604 838C1654 838 1715 895 1715 989V1570C1715 1602 1729 1602 1774 1602C1777 1602 1780 1602 1784 1602ZM1711 537V319C1711 267 1702 228 1663 187C1638 164 1624 153 1542 153C1521 153 1501 153 1492 169C1485 182 1485 194 1485 207V635C1485 639 1485 643 1485 648V648V648V648C1484 668 1483 687 1499 699C1510 709 1524 708 1535 708C1536 708 1538 708 1540 708C1565 708 1624 701 1665 658C1711 607 1711 569 1711 537ZM2588 1557L2588 1557C2588 1555 2588 1553 2588 1551V790C2588 788 2589 784 2589 781C2591 773 2592 764 2586 763C2569 760 2496 762 2429 763C2393 764 2359 765 2337 765C2321 765 2319 786 2319 836C2319 884 2321 902 2339 902C2345 902 2352 902 2360 901C2384 900 2414 898 2426 907C2436 915 2436 926 2435 936L2435 936C2435 937 2435 938 2435 938C2435 939 2435 940 2435 941V1334C2435 1382 2412 1453 2323 1453C2232 1453 2207 1384 2207 1327V265C2207 217 2253 143 2323 143C2392 143 2435 217 2435 267C2435 283 2436 303 2436 323C2437 343 2437 363 2437 379C2437 399 2451 402 2508 402C2570 402 2588 395 2588 374V271C2588 189 2524 2 2323 2C2118 2 2059 182 2059 271V1336C2059 1442 2130 1602 2323 1602C2393 1602 2429 1567 2452 1545C2466 1531 2476 1522 2485 1528C2503 1540 2508 1560 2512 1576C2516 1589 2518 1599 2526 1599C2534 1599 2541 1601 2547 1602C2559 1605 2569 1607 2577 1599C2589 1587 2588 1572 2588 1557ZM3310 1316C3310 1464 3249 1602 3046 1602C2856 1602 2781 1464 2781 1316V281C2781 109 2897 2 3046 2C3196 2 3310 121 3310 281V1316ZM3160 281V1309C3160 1373 3137 1448 3046 1448C2943 1448 2929 1375 2929 1309V281C2929 217 2977 143 3046 143C3112 143 3160 217 3160 281Z" fill="black"/></svg>'></a></li>
     <li><a href="https://primo.af"><img alt=primo src='data:image/svg+xml;utf8,<svg viewBox="0 0 258 66" xmlns="http://www.w3.org/2000/svg"><path d="M17.6 13.8C19.5 11.9 22.7 11.9 24.6 13.8C26.5 15.7 26.6 18.7 24.8 20.7L24.6 20.9L12.0 33.5L35.4 56.8C37.3 58.6 37.4 61.7 35.6 63.6L35.4 63.8C33.6 65.7 30.5 65.8 28.6 64.0L28.4 63.8L1.4 37.1C-0.4 35.2 -0.4 32.1 1.2 30.2L1.4 30.0L17.6 13.8Z" fill="url(%23paint0_linear)"></path><path d="M50.0 11C62.4 11 72.5 21.0 72.5 33.5C72.5 46.0 62.4 56.1 50.0 56.1C47.2 56.1 45.0 53.8 45.0 51.1C45.0 48.3 47.2 46.1 50.0 46.1C56.9 46.1 62.5 40.4 62.5 33.5C62.5 26.6 56.9 21 50.0 21C43.2 21 37.6 26.4 37.4 33.3L37.4 33.6L36.9 60.4C36.8 63.2 34.6 65.4 31.8 65.3C29.1 65.2 27.0 63.1 26.9 60.4V60.2L27.4 33.5C27.4 21.0 37.5 11 50.0 11Z" fill="%23EE4645"></path><path d="M75.3 13.8C77.2 11.9 80.3 11.9 82.2 13.6L82.4 13.8L98.6 30.0C100.4 31.9 100.5 34.9 98.7 36.9L98.6 37.0L82.4 53.2C80.4 55.1 77.3 55.1 75.3 53.2C73.4 51.3 73.4 48.3 75.2 46.3L75.3 46.1L87.9 33.5L75.3 20.9C73.4 19.0 73.4 16.0 75.2 14.0L75.3 13.8Z" fill="%23EE4645"></path><path d="M134.5 19.4C136.8 19.4 138.8 19.9 140.6 21.0C142.5 22.0 143.9 23.4 145.0 25.3C146.0 27.2 146.6 29.4 146.6 31.8C146.6 34.3 146.0 36.5 145.0 38.4C143.9 40.3 142.5 41.7 140.6 42.8C138.8 43.8 136.8 44.3 134.5 44.3C131.4 44.3 129.0 43.3 127.2 41.4V52.7H120.2V19.7H126.9V22.5C128.6 20.4 131.2 19.4 134.5 19.4ZM133.3 38.6C135.1 38.6 136.6 38 137.7 36.8C138.9 35.5 139.5 33.9 139.5 31.8C139.5 29.8 138.9 28.2 137.7 27.0C136.6 25.8 135.1 25.1 133.3 25.1C131.5 25.1 130.0 25.8 128.8 27.0C127.7 28.2 127.1 29.8 127.1 31.8C127.1 33.9 127.7 35.5 128.8 36.8C130.0 38 131.5 38.6 133.3 38.6ZM158.0 22.9C158.8 21.8 159.9 20.9 161.3 20.3C162.8 19.7 164.4 19.4 166.3 19.4V25.9C165.5 25.8 165.0 25.8 164.7 25.8C162.7 25.8 161.1 26.3 160.0 27.5C158.8 28.6 158.3 30.3 158.3 32.5V44H151.3V19.7H158.0V22.9ZM170.5 19.7H177.5V44H170.5V19.7ZM174.0 16.4C172.7 16.4 171.6 16.0 170.8 15.2C170.0 14.5 169.6 13.6 169.6 12.5C169.6 11.3 170.0 10.4 170.8 9.7C171.6 8.9 172.7 8.5 174.0 8.5C175.3 8.5 176.3 8.9 177.1 9.6C177.9 10.3 178.3 11.2 178.3 12.3C178.3 13.5 177.9 14.5 177.1 15.2C176.3 16.0 175.3 16.4 174.0 16.4ZM215.0 19.4C218.0 19.4 220.4 20.3 222.2 22.1C224.0 23.9 224.9 26.5 224.9 30.1V44H217.9V31.2C217.9 29.3 217.5 27.8 216.7 26.9C215.9 25.9 214.8 25.5 213.3 25.5C211.6 25.5 210.3 26.0 209.4 27.1C208.4 28.1 207.9 29.7 207.9 31.8V44H200.9V31.2C200.9 27.4 199.4 25.5 196.3 25.5C194.7 25.5 193.4 26.0 192.5 27.1C191.5 28.1 191.0 29.7 191.0 31.8V44H184.0V19.7H190.7V22.5C191.6 21.5 192.7 20.7 194.0 20.2C195.3 19.7 196.7 19.4 198.3 19.4C200.0 19.4 201.6 19.7 202.9 20.4C204.3 21.1 205.4 22.1 206.3 23.3C207.3 22.1 208.5 21.1 210.0 20.4C211.5 19.7 213.2 19.4 215.0 19.4ZM243.0 44.3C240.4 44.3 238.1 43.8 236.1 42.7C234.1 41.7 232.5 40.2 231.4 38.3C230.2 36.4 229.7 34.2 229.7 31.8C229.7 29.4 230.2 27.3 231.4 25.4C232.5 23.5 234.1 22.1 236.1 21.0C238.1 19.9 240.4 19.4 243.0 19.4C245.5 19.4 247.8 19.9 249.8 21.0C251.8 22.1 253.4 23.5 254.5 25.4C255.7 27.3 256.3 29.4 256.3 31.8C256.3 34.2 255.7 36.4 254.5 38.3C253.4 40.2 251.8 41.7 249.8 42.7C247.8 43.8 245.5 44.3 243.0 44.3ZM243.0 38.6C244.8 38.6 246.3 38 247.4 36.8C248.6 35.5 249.1 33.9 249.1 31.8C249.1 29.8 248.6 28.2 247.4 27.0C246.3 25.8 244.8 25.1 243.0 25.1C241.2 25.1 239.7 25.8 238.5 27.0C237.4 28.2 236.8 29.8 236.8 31.8C236.8 33.9 237.4 35.5 238.5 36.8C239.7 38 241.2 38.6 243.0 38.6Z" fill="%23343434"></path><path d="M140.6 21.0L140.4 21.4L140.4 21.4L140.6 21.0ZM145.0 25.3L144.5 25.6L144.6 25.6L145.0 25.3ZM145.0 38.4L145.4 38.7L145.4 38.7L145.0 38.4ZM140.6 42.8L140.9 43.2L140.9 43.2L140.6 42.8ZM127.2 41.4L127.6 41.0L126.7 40.1V41.4H127.2ZM127.2 52.7V53.2H127.7V52.7H127.2ZM120.2 52.7H119.7V53.2H120.2V52.7ZM120.2 19.7V19.2H119.7V19.7H120.2ZM126.9 19.7H127.4V19.2H126.9V19.7ZM126.9 22.5H126.4V23.9L127.3 22.8L126.9 22.5ZM137.7 36.8L137.3 36.4L137.3 36.4L137.7 36.8ZM137.7 27.0L137.3 27.3L137.3 27.3L137.7 27.0ZM128.8 27.0L128.5 26.6L128.5 26.6L128.8 27.0ZM128.8 36.8L128.5 37.1L128.5 37.1L128.8 36.8ZM134.5 19.9C136.7 19.9 138.6 20.4 140.4 21.4L140.9 20.5C139.0 19.4 136.8 18.9 134.5 18.9V19.9ZM140.4 21.4C142.2 22.4 143.5 23.8 144.5 25.6L145.4 25.1C144.3 23.1 142.8 21.6 140.9 20.5L140.4 21.4ZM144.6 25.6C145.6 27.3 146.1 29.4 146.1 31.8H147.1C147.1 29.3 146.5 27.0 145.4 25.1L144.6 25.6ZM146.1 31.8C146.1 34.3 145.6 36.4 144.5 38.2L145.4 38.7C146.5 36.7 147.1 34.4 147.1 31.8H146.1ZM144.6 38.2C143.5 39.9 142.2 41.3 140.4 42.3L140.9 43.2C142.8 42.1 144.3 40.6 145.4 38.7L144.6 38.2ZM140.4 42.3C138.6 43.3 136.7 43.8 134.5 43.8V44.8C136.8 44.8 139.0 44.3 140.9 43.2L140.4 42.3ZM134.5 43.8C131.5 43.8 129.2 42.9 127.6 41.0L126.8 41.7C128.7 43.8 131.3 44.8 134.5 44.8V43.8ZM126.7 41.4V52.7H127.7V41.4H126.7ZM127.2 52.2H120.2V53.2H127.2V52.2ZM120.7 52.7V19.7H119.7V52.7H120.7ZM120.2 20.2H126.9V19.2H120.2V20.2ZM126.4 19.7V22.5H127.4V19.7H126.4ZM127.3 22.8C128.9 20.9 131.3 19.9 134.5 19.9V18.9C131.1 18.9 128.4 20.0 126.5 22.2L127.3 22.8ZM133.3 39.1C135.2 39.1 136.8 38.4 138.1 37.1L137.3 36.4C136.3 37.5 135.0 38.1 133.3 38.1V39.1ZM138.1 37.1C139.3 35.8 140 34.0 140 31.8H139C139 33.8 138.4 35.3 137.3 36.4L138.1 37.1ZM140 31.8C140 29.7 139.3 27.9 138.1 26.6L137.3 27.3C138.4 28.4 139 29.9 139 31.8H140ZM138.1 26.6C136.8 25.3 135.2 24.6 133.3 24.6V25.6C135.0 25.6 136.3 26.2 137.3 27.3L138.1 26.6ZM133.3 24.6C131.4 24.6 129.7 25.3 128.5 26.6L129.2 27.3C130.3 26.2 131.6 25.6 133.3 25.6V24.6ZM128.5 26.6C127.2 28.0 126.6 29.7 126.6 31.8H127.6C127.6 29.9 128.2 28.4 129.2 27.3L128.5 26.6ZM126.6 31.8C126.6 34.0 127.2 35.7 128.5 37.1L129.2 36.4C128.2 35.3 127.6 33.8 127.6 31.8H126.6ZM128.5 37.1C129.7 38.4 131.4 39.1 133.3 39.1V38.1C131.6 38.1 130.3 37.5 129.2 36.4L128.5 37.1ZM158.0 22.9H157.5V24.5L158.4 23.2L158.0 22.9ZM161.3 20.3L161.1 19.8L161.1 19.8L161.3 20.3ZM166.3 19.4H166.8V18.9H166.3V19.4ZM166.3 25.9L166.3 26.4L166.8 26.4V25.9H166.3ZM160.0 27.5L160.3 27.8L160.3 27.8L160.0 27.5ZM158.3 44V44.5H158.8V44H158.3ZM151.3 44H150.8V44.5H151.3V44ZM151.3 19.7V19.2H150.8V19.7H151.3ZM158.0 19.7H158.5V19.2H158.0V19.7ZM158.4 23.2C159.2 22.1 160.2 21.3 161.5 20.7L161.1 19.8C159.7 20.5 158.5 21.4 157.6 22.6L158.4 23.2ZM161.5 20.7C162.9 20.2 164.5 19.9 166.3 19.9V18.9C164.4 18.9 162.7 19.2 161.1 19.8L161.5 20.7ZM165.8 19.4V25.9H166.8V19.4H165.8ZM166.3 25.4C165.6 25.3 165.0 25.3 164.7 25.3V26.3C165.0 26.3 165.5 26.3 166.3 26.4L166.3 25.4ZM164.7 25.3C162.6 25.3 160.9 25.9 159.6 27.1L160.3 27.8C161.4 26.8 162.8 26.3 164.7 26.3V25.3ZM159.6 27.1C158.4 28.4 157.8 30.2 157.8 32.5H158.8C158.8 30.3 159.3 28.8 160.3 27.8L159.6 27.1ZM157.8 32.5V44H158.8V32.5H157.8ZM158.3 43.5H151.3V44.5H158.3V43.5ZM151.8 44V19.7H150.8V44H151.8ZM151.3 20.2H158.0V19.2H151.3V20.2ZM157.5 19.7V22.9H158.5V19.7H157.5ZM170.5 19.7V19.2H170.0V19.7H170.5ZM177.5 19.7H178.0V19.2H177.5V19.7ZM177.5 44V44.5H178.0V44H177.5ZM170.5 44H170.0V44.5H170.5V44ZM170.8 15.2L170.5 15.6V15.6L170.8 15.2ZM170.8 9.7L171.2 10.0V10.0L170.8 9.7ZM177.1 9.6L176.8 10.0L177.1 9.6ZM177.1 15.2L177.5 15.6L177.5 15.6L177.1 15.2ZM170.5 20.2H177.5V19.2H170.5V20.2ZM177.0 19.7V44H178.0V19.7H177.0ZM177.5 43.5H170.5V44.5H177.5V43.5ZM171.0 44V19.7H170.0V44H171.0ZM174.0 15.9C172.8 15.9 171.9 15.5 171.2 14.9L170.5 15.6C171.4 16.5 172.6 16.9 174.0 16.9V15.9ZM171.2 14.9C170.5 14.2 170.1 13.4 170.1 12.5H169.1C169.1 13.7 169.6 14.8 170.5 15.6L171.2 14.9ZM170.1 12.5C170.1 11.5 170.5 10.7 171.2 10.0L170.5 9.3C169.6 10.1 169.1 11.2 169.1 12.5H170.1ZM171.2 10.0C171.9 9.4 172.8 9.0 174.0 9.0V8.0C172.6 8.0 171.4 8.4 170.5 9.3L171.2 10.0ZM174.0 9.0C175.2 9.0 176.1 9.4 176.8 10.0L177.5 9.2C176.5 8.4 175.4 8.0 174.0 8.0V9.0ZM176.8 10.0C177.5 10.6 177.8 11.4 177.8 12.3H178.8C178.8 11.1 178.4 10.1 177.5 9.2L176.8 10.0ZM177.8 12.3C177.8 13.4 177.5 14.2 176.8 14.9L177.5 15.6C178.4 14.7 178.8 13.6 178.8 12.3H177.8ZM176.8 14.9C176.1 15.5 175.2 15.9 174.0 15.9V16.9C175.4 16.9 176.5 16.5 177.5 15.6L176.8 14.9ZM222.2 22.1L221.8 22.4L221.9 22.4L222.2 22.1ZM224.9 44V44.5H225.4V44H224.9ZM217.9 44H217.4V44.5H217.9V44ZM216.7 26.9L216.3 27.2L216.3 27.2L216.3 27.2L216.7 26.9ZM209.4 27.1L209.7 27.4L209.8 27.4L209.4 27.1ZM207.9 44V44.5H208.4V44H207.9ZM200.9 44H200.4V44.5H200.9V44ZM192.5 27.1L192.8 27.4L192.8 27.4L192.5 27.1ZM191.0 44V44.5H191.5V44H191.0ZM184.0 44H183.5V44.5H184.0V44ZM184.0 19.7V19.2H183.5V19.7H184.0ZM190.7 19.7H191.2V19.2H190.7V19.7ZM190.7 22.5H190.2V23.9L191.1 22.9L190.7 22.5ZM194.0 20.2L193.8 19.7L193.8 19.7L194.0 20.2ZM202.9 20.4L202.7 20.9L202.7 20.9L202.9 20.4ZM206.3 23.3L205.9 23.6L206.2 24.2L206.7 23.6L206.3 23.3ZM210.0 20.4L209.8 20.0L209.8 20.0L210.0 20.4ZM215.0 19.9C217.9 19.9 220.2 20.7 221.8 22.4L222.6 21.7C220.7 19.8 218.1 18.9 215.0 18.9V19.9ZM221.9 22.4C223.5 24.1 224.4 26.6 224.4 30.1H225.4C225.4 26.4 224.5 23.6 222.6 21.7L221.9 22.4ZM224.4 30.1V44H225.4V30.1H224.4ZM224.9 43.5H217.9V44.5H224.9V43.5ZM218.4 44V31.2H217.4V44H218.4ZM218.4 31.2C218.4 29.2 218.0 27.6 217.0 26.6L216.3 27.2C217.0 28.0 217.4 29.3 217.4 31.2H218.4ZM217.1 26.6C216.2 25.5 214.9 25.0 213.3 25.0V26.0C214.6 26.0 215.6 26.4 216.3 27.2L217.1 26.6ZM213.3 25.0C211.5 25.0 210.1 25.5 209.0 26.7L209.8 27.4C210.6 26.4 211.8 26.0 213.3 26.0V25.0ZM209.0 26.7C207.9 27.9 207.4 29.6 207.4 31.8H208.4C208.4 29.8 208.9 28.3 209.7 27.4L209.0 26.7ZM207.4 31.8V44H208.4V31.8H207.4ZM207.9 43.5H200.9V44.5H207.9V43.5ZM201.4 44V31.2H200.4V44H201.4ZM201.4 31.2C201.4 29.2 201.0 27.6 200.2 26.6C199.3 25.5 198.0 25.0 196.3 25.0V26.0C197.7 26.0 198.7 26.4 199.4 27.2C200.0 28.0 200.4 29.3 200.4 31.2H201.4ZM196.3 25.0C194.6 25.0 193.2 25.5 192.1 26.7L192.8 27.4C193.7 26.4 194.8 26.0 196.3 26.0V25.0ZM192.1 26.7C191.0 27.9 190.5 29.6 190.5 31.8H191.5C191.5 29.8 192.0 28.3 192.8 27.4L192.1 26.7ZM190.5 31.8V44H191.5V31.8H190.5ZM191.0 43.5H184.0V44.5H191.0V43.5ZM184.5 44V19.7H183.5V44H184.5ZM184.0 20.2H190.7V19.2H184.0V20.2ZM190.2 19.7V22.5H191.2V19.7H190.2ZM191.1 22.9C191.9 21.9 193.0 21.2 194.2 20.7L193.8 19.7C192.4 20.3 191.3 21.1 190.3 22.2L191.1 22.9ZM194.2 20.7C195.4 20.1 196.8 19.9 198.3 19.9V18.9C196.7 18.9 195.2 19.2 193.8 19.7L194.2 20.7ZM198.3 19.9C199.9 19.9 201.4 20.2 202.7 20.9L203.2 20.0C201.7 19.2 200.1 18.9 198.3 18.9V19.9ZM202.7 20.9C204.0 21.5 205.1 22.4 205.9 23.6L206.7 23.1C205.8 21.7 204.6 20.7 203.2 20.0L202.7 20.9ZM206.7 23.6C207.6 22.5 208.8 21.5 210.2 20.9L209.8 20.0C208.2 20.7 206.9 21.7 205.9 23.0L206.7 23.6ZM210.2 20.9C211.7 20.2 213.3 19.9 215.0 19.9V18.9C213.1 18.9 211.4 19.2 209.8 20.0L210.2 20.9ZM236.1 42.7L235.9 43.2L235.9 43.2L236.1 42.7ZM231.4 38.3L230.9 38.5L231.4 38.3ZM231.4 25.4L230.9 25.2L231.4 25.4ZM236.1 21.0L236.3 21.4L236.3 21.4L236.1 21.0ZM249.8 21.0L249.6 21.4L249.6 21.4L249.8 21.0ZM254.5 25.4L255.0 25.2L254.5 25.4ZM254.5 38.3L255.0 38.5L254.5 38.3ZM249.8 42.7L250.1 43.2L250.1 43.2L249.8 42.7ZM247.4 36.8L247.0 36.4L247.0 36.4L247.4 36.8ZM247.4 27.0L247.0 27.3L247.0 27.3L247.4 27.0ZM238.5 27.0L238.9 27.3L238.9 27.3L238.5 27.0ZM238.5 36.8L238.2 37.1L238.2 37.1L238.5 36.8ZM243.0 43.8C240.5 43.8 238.3 43.3 236.3 42.3L235.9 43.2C238.0 44.3 240.4 44.8 243.0 44.8V43.8ZM236.3 42.3C234.4 41.3 232.9 39.8 231.8 38.0L230.9 38.5C232.1 40.5 233.8 42.1 235.9 43.2L236.3 42.3ZM231.8 38.0C230.7 36.2 230.2 34.2 230.2 31.8H229.2C229.2 34.3 229.8 36.6 230.9 38.5L231.8 38.0ZM230.2 31.8C230.2 29.5 230.7 27.5 231.8 25.7L230.9 25.2C229.8 27.1 229.2 29.4 229.2 31.8H230.2ZM231.8 25.7C232.9 23.9 234.4 22.5 236.3 21.4L235.9 20.6C233.8 21.6 232.1 23.2 230.9 25.2L231.8 25.7ZM236.3 21.4C238.3 20.4 240.5 19.9 243.0 19.9V18.9C240.4 18.9 238.0 19.4 235.9 20.6L236.3 21.4ZM243.0 19.9C245.5 19.9 247.7 20.4 249.6 21.4L250.1 20.6C248.0 19.4 245.6 18.9 243.0 18.9V19.9ZM249.6 21.4C251.5 22.5 253.0 23.9 254.1 25.7L255.0 25.2C253.8 23.2 252.1 21.6 250.1 20.6L249.6 21.4ZM254.1 25.7C255.2 27.5 255.8 29.5 255.8 31.8H256.8C256.8 29.4 256.2 27.1 255.0 25.2L254.1 25.7ZM255.8 31.8C255.8 34.2 255.2 36.2 254.1 38.0L255.0 38.5C256.2 36.6 256.8 34.3 256.8 31.8H255.8ZM254.1 38.0C253.0 39.8 251.5 41.3 249.6 42.3L250.1 43.2C252.1 42.1 253.8 40.5 255.0 38.5L254.1 38.0ZM249.6 42.3C247.7 43.3 245.5 43.8 243.0 43.8V44.8C245.6 44.8 248.0 44.3 250.1 43.2L249.6 42.3ZM243.0 39.1C244.9 39.1 246.5 38.4 247.8 37.1L247.0 36.4C246.0 37.5 244.7 38.1 243.0 38.1V39.1ZM247.8 37.1C249.0 35.8 249.6 34.0 249.6 31.8H248.6C248.6 33.8 248.1 35.3 247.0 36.4L247.8 37.1ZM249.6 31.8C249.6 29.7 249.0 27.9 247.7 26.6L247.0 27.3C248.1 28.4 248.6 29.9 248.6 31.8H249.6ZM247.8 26.6C246.5 25.3 244.9 24.6 243.0 24.6V25.6C244.7 25.6 246.0 26.2 247.0 27.3L247.8 26.6ZM243.0 24.6C241.1 24.6 239.4 25.3 238.2 26.6L238.9 27.3C240.0 26.2 241.3 25.6 243.0 25.6V24.6ZM238.2 26.6C236.9 27.9 236.3 29.7 236.3 31.8H237.3C237.3 29.9 237.8 28.4 238.9 27.3L238.2 26.6ZM236.3 31.8C236.3 34.0 236.9 35.8 238.2 37.1L238.9 36.4C237.8 35.3 237.3 33.8 237.3 31.8H236.3ZM238.2 37.1C239.4 38.4 241.1 39.1 243.0 39.1V38.1C241.3 38.1 240.0 37.5 238.9 36.4L238.2 37.1Z" fill="%23343434"></path><defs><linearGradient id="paint0_linear" x1="14.5" y1="41.1" x2="33.6" y2="58.5" gradientUnits="userSpaceOnUse"><stop stop-color="%23EE4645"></stop><stop offset="1" stop-color="%23810707"></stop></linearGradient></defs></svg>'></a></li>
+    <li><a href="https://www.artcompiler.com"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70.5 70.5"><path fill="%23fefefe" d="M64.4 114.7V79.5h70.5V150H64.4zm37.6 34.6-1.7-24.2v-.3h-1a9 9 0 0 1-1.7-.3 1079.2 1079.2 0 0 0-7.8 23.2l.8.3a35.6 35.6 0 0 0 11.4 1.3zm-18.5-7.7 3.4-1.9 1 .5a29 29 0 0 0 2.7 1.1l1.5-4.6-.7-.3a23.3 23.3 0 0 1 6.1-44.8v-2.4l-.3-2.4c0-.1-.3-.1-2 .1a27 27 0 0 0-7.2 2.3l-.9.4-3.4-1.9-3.5-1.9a38.4 38.4 0 0 0-9.1 9l-.3.5 2 3.4 2 3.4-.4 1a34 34 0 0 0-.8 1.8l-.3 1-3.9 1.2-3.8 1.1s-.3 1.2-.4 2.6a55.7 55.7 0 0 0 .4 10.7s1 .4 3.9 1.1l3.8 1 .3.8.7 1.7.3 1a432.5 432.5 0 0 1-3.9 6.7c0 .2.8 1.4 2 3a47.7 47.7 0 0 0 7.3 6.6l3.5-1.9zm21.6.3a25.8 25.8 0 0 0 6.8-2.2 1286.7 1286.7 0 0 0-7.8-15.6l-.7.1-1.3.4-.7.1v.4a1616.2 1616.2 0 0 0 1.3 17h.6l1.7-.2zm-10.5-12.4 1.8-5.5-.6-.3a10 10 0 0 1 2.3-18.9c.4 0 .6-.1.6-.2l-1-11.5h-1A21.8 21.8 0 0 0 79.7 122a22.3 22.3 0 0 0 13 13c.1 0 1-2.4 2-5.4zm17.4 4.7 2.6-1.8c1-.8 2.4-2.2 2.4-2.4l-3.6-3.2-4.8-4-1.2-1-.6.4a14.3 14.3 0 0 1-1.6 1.3 391 391 0 0 0 5.8 11.3l1-.6zm12.5-.7a31.1 31.1 0 0 0 4.7-8.8 337.7 337.7 0 0 0-19.6-6.3l-.4.6-.7 1.2-.4.6.3.2a2416.5 2416.5 0 0 1 15.5 13l.5-.5zm-22.7-10a8.6 8.6 0 0 0 4.6-2.5 8.6 8.6 0 0 0 2.6-6.3c0-1.2 0-1.5-.2-2.2-.4-1.6-1.1-2.9-2.2-4a8.9 8.9 0 0 0-8.7-2.6 9 9 0 0 0 4 17.6zm24.9-1.3a29.8 29.8 0 0 0 1-9c-.1-.1-2.5 0-8.6.5l-8.6.8h-.3v.8l-.2 1.4-.1.5 1 .3 15.6 5 .2-.4zm-4.7-9.8 12.1-1h.4v-.6a36.7 36.7 0 0 0-3.4-11.3l-21.6 11.1.2.8.3 1.4.2.6 11.8-1zm-6.5-6.2 4.6-2.4-1.2-2c-.8-1.1-1.8-2.4-2.8-3.3l-.8-.8-4 4.7-4 4.8c-.1.1-.1.2.4.8l.9 1.1.3.5 1-.5 5.6-2.9zm-3-7.1 6.7-7.8.3-.4-.8-.7a31 31 0 0 0-8.6-4.5l-6.3 19.5.8.4a11.1 11.1 0 0 1 1.6 1l6.4-7.5zm-6.1-5.8 3.6-11.6-1.4-.4a40.4 40.4 0 0 0-10.7-1l2 24.2h.7l1.2.2.7.1c.2 0 .6-1.2 3.9-11.5z" transform="translate(-64.4 -79.5)"/><path fill="%23efd1cf" d="M102.7 141.2v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm0-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm14.4-.5.6-.5-.5.5-.6.6.5-.6zm-14.4-.6v-.1.2zm-.1-1.1v-.1.2zm-.1-1.1v-.1.2zm0-1.1v-.1.2zm-.2-1.1v-.1.2zm-.4-2.2h.1-.1zm4.7-1.9v-.1c.2-.1.2-.1.1 0l-.2.1zm-12.1-.6-.4-.5.4.4.4.5-.4-.4zm33.9-3.8s0-.1 0 0v.1-.1zm0-1.2c0-.1.1-.1.1 0v.2-.2zm-49.2-.3s0-.1 0 0v.2-.1zm12.6-1.1v-.2.4-.2zm20.2-.3h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-42-.3c0-.1 0-.2.1-.1v.2-.1zm43 .1h.2-.1c-.1 0-.1 0 0 0zm6.3-.1v-.1.2-.1zm-5.3 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm-12.7-.1h.1-.1zm13.8 0h.1-.1zm-12.8 0c0-.1.1-.1.2 0h-.2v-.1zm13.8 0c0-.1.1-.1.2 0h-.2v-.1zm-12.8-.2h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.8 0h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.7-.1h.1-.1s-.1 0 0 0zm1-.1h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-23-4.6.4-.4-.4.4-.4.4s0-.2.3-.4zm14-.2c-.1-.2-.1-.2 0 0h.2c0 .1 0 .1-.2 0zm-2-.4.2.2-.1-.1zm2.1-1.2.1-.1c.2-.1.2-.1 0 0l-.1.1zm-6.8-.8h.2-.1c-.1 0-.1 0 0 0zm7.7-.3.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zm-8.6-.8h.4-.4zm9.6-.3.1-.1c.1-.1.1-.1 0 0 0 .2-.1.2-.1.1zm-11.1-.1v-.1.2-.1zm1-.6c0-.1.1-.1.1 0zm11-.4.1-.1c.2-.1.2-.1 0 0 0 .2-.1.2-.1.1zm-11-.6v-.1.2-.1zm12-.4v-.2h.1l-.2.2zm-12-.7v.2-.2zm12.9-.4.1-.2c.1 0 .1 0 0 0l-.1.2zm-13-.6v.1zm-1.2-.5v.1zm15.1 0 .1-.2c.2 0 .2 0 0 0l-.1.2zm-28.7-.6.3-.3-.2.3a2 2 0 0 1-.4.3l.3-.3zm32.3.2-.2-.2.2.1.2.2-.2-.2zm-18.8-.8c0-.1 0-.1 0 0v.1-.1zm-15.3 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm31.4-.2.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zM98.1 98c0-.1 0-.1 0 0zm-14-.1.2-.2-.2.2-.1.1v-.1zm13.9-1v.2-.1zm0-1v.2-.1zm1-.5c0-.1 0-.1 0 0zm0-1c0-.1 0-.2 0 0zm-.1-1v-.1.2-.2zm-1.3-.2h.1-.1zm1.2-.9v.2-.2zM74 91h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm2-1.9V89c.2-.1.2-.1.1 0l-.2.1zm22.2-2v.2-.1zm0-1v.2-.2zm-.1-1v.1zm-.1-1v.1zm4.5-3.7h.2-.1c-.1 0-.1 0 0 0zm-3.7 0h.5-.4zm1.9 0c.1-.1.3-.1.4 0h-.4z" transform="translate(-64.4 -79.5)"/><path fill="%23eac1b8" d="M98.3 149.3h.2-.2zm3.4 0h.2-.2zm-4.7-.1h.2-.1c-.1 0-.1 0 0 0zm4.9-.4c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.1v-.1.2-.1zm-.1-1.2c0-.1 0-.1 0 0zm1.3-.9v.1zm-1.4-.3s0-.1 0 0v.1-.1zm1.3-.8v.2-.2zm-1.4-.4v.1zm1.3-.6v-.1.2-.1zm-1.4-.5v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.6c0-.1 0-.1 0 0zm-1.3-.6c0-.1 0-.1 0 0zm1.2-.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm-1.3-.7s0-.1 0 0v.1-.1zm1.3-.4c0-.1 0-.1 0 0zm-1.4-.8v.1zm1.3-.3c0-.1 0-.1 0 0v.1-.1zm-1.4-.8v-.1.2-.1zm1.3-.3s0-.1 0 0v.1-.1zm-1.4-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.3 0v-.1.1zm-1.3-1.2s0-.1 0 0v.1zm1.2 0s0-.1 0 0c.1 0 .1 0 0 .1zm0-1v-.1.1zm-1.3-.2v.1zm-15.3-.3c0-.1 0-.1 0 0l.2.1-.2-.1zm16.5-.7v.1zm-1.3-.1c0-.1 0-.1 0 0zm-16.5-.6c-.1 0-.1 0 0 0l.2.2-.2-.2zm17.7-.4v.2-.2zm-1.3-.2c0-.1 0-.1 0 0v.1-.1zm1.2-.8v-.1.2-.1zm-1.3-.4c.1 0 .1.1 0 .1zm1.2-.7c0-.1 0-.1 0 0zm-1.3-.5c.1 0 .1.1 0 .2v-.2zm1.2-.6c0-.1 0-.1 0 0zm-1.2-.5-.4-.2h-.3.3l.4.1v.2-.1zm-1-1.4c.1 0 0 0 0 0-.1 0-.1 0 0 0zm-6.3-2a2 2 0 0 1-.3-.3l.4.4.3.4-.4-.4zm-28-4v.2-.1zm62.5-.8c.1 0 .1.1 0 .1zm-62.6-.4s0-.1 0 0v.2-.1zm11.8-.3s0-.1 0 0c.1 0 .1 0 0 .1zm51-.8v-.2.5-.3zm-18.7-.3v-.1.2-.1zm1.2-.3v-.2.4-.2zm.2-.4h.2-.2zm1 0h.2-.1c-.1 0-.2 0 0 0zm-2.4-.3v-.1.3-.2zm3.4.1h.2-.1c-.1 0-.1 0 0 0zm15.2-.3v-.1.4-.3zm-14.2.3h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm-46.8-.2s0-.1 0 0v.1-.1zm47.9 0h.1l-.1.1s-.1 0 0 0zm1 0h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-61.8-.4s0-.1 0 0v.1zm0-1.1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm32.5-23.1v-.1.2-.1zm0-1v-.1.2-.2z" transform="translate(-64.4 -79.5)"/><path fill="%23e0a39d" d="M98.7 149.3h.4-.4zm2.5 0h.3H101.2zm-4-.1h.3-.2zm4.7-.1v-.1.2-.1zm0-1.2v-.1.2-.1zm-.2-1.2c0-.1 0-.2 0 0v.1zm0-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm-.1-1.2v.1zm-.1-1.2v.1zm1.4-.1c0-.1 0-.1 0 0zm-1.5-1c0-.1 0-.1 0 0zm1.4-.1c0-.1 0-.1 0 0v.1-.1zm-1.5-1.1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.4 0c0-.1 0-.1 0 0v.1-.1zm0-1.1c0-.1 0-.1 0 0v.1-.1zm-1.4 0v-.1.1zm1.2-1.1s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-1.3-.2v.1zm1.2-.9s0-.1.1 0v.1zm-1.3-.2c0-.1 0-.2 0 0zm1.3-.9v.1zm-1.4-.3c0-.1 0-.1 0 0v.1-.1zm1.3-.8v.1zm-1.4-.4v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.7v.1zm-1.3-.5v-.1.2zm1.2-.6c.1 0 .1.1 0 .2v-.2zm-18.5-.6-.2-.3.2.3.3.2-.3-.2zm17.2 0s0-.1 0 0v.1zm1.2-.4c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm-17.2-.9-.5-.6.6.6.5.5-.5-.5zm15.9 0v.2-.1zm1.3-.2c0-.1 0-.2 0 0zm-1.4-.9v.1zm1.3-.2c0-.1 0-.1 0 0zm-1.4-1c.1 0 .1.1 0 .1zm1.3-.1c0-.1 0-.1 0 0zm-1.4-1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm1.3-.1c0-.1 0-.1 0 0v.1-.1zm-1.3-1.1c0-.1 0-.1 0 0v.1-.1zm1.2 0c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-2.2-.4h.2-.2zm.2-1.2h.2-.2zm1 0h.3-.2zm6.7-1.7.1-.1c.2-.1.2-.1 0 0l-.1.1zm-.8-.9.5-.4-.4.4-.4.4zm-41.3-2.5c.1 0 .1.1 0 .1zm0-1v.2-.1zm62.5-.8v.2-.2zm-50.8-.1c0-.1 0-.1 0 0v.1-.1zm-11.8-.3v-.1.2-.1zm26.1-.8s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-12.6-.3v-.2.4-.2zm31.8.1v.1zm-20.3-.7v-.3.6-.3zm37.7.1v-.1.4-.3zm-18.6 0v-.2.3-.1zm1.6-.2h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm-33.3-.4v-.2.4-.2zm34.4.3h.1-.1zm1 0h.1-.1zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.2 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-25.7-.2v.1zm26.7.1h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.2h.2-.1zm1 0h.2-.1zm1-.1h.2-.1zm-56.9-.3v-.1.3-.2zm58 .2h.2-.2zm1 0c0-.1.1-.1.2 0h-.1c-.1 0-.1 0 0 0zm-13.5-.2h.1-.1zm14.5 0h.2-.1c-.1 0-.1 0 0 0zm-13.5 0h.2-.2zm14.6 0h.1-.1s-.1 0 0 0zm-13.6-.1h.2-.1c-.1 0-.1 0 0 0zm14.6 0h.1-.1zm-50.2-.2v.1zm36.6 0h.2l-.1.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1s-.1 0 0 0zm1 0h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-27.3-3a2 2 0 0 1-.3-.4l.4.4.3.3-.4-.3zm1-.8c-.3-.2-.3-.2-.1-.4.1 0 .1 0 0 0l.1.4.2.3-.2-.3zm.3-.8v-.2h.1c0 .2-.2.2-.2.2zm-8.3-1h.2-.2zm1.1 0h.2-.2zm8-.1.2-.2c.2 0 .2 0 0 0l-.1.2zm-7.8-1.2h.2-.2zm8.8 0h.2c0-.2 0-.2 0 0-.1.1-.2.1-.2 0zm-10.9-.1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0zm12 0c.2-.2.2-.2.1 0-.1.1-.2.1-.2 0zm-10.8-.1s0-.1 0 0v.1-.1zm-1.3-1c.1 0 .1.1 0 .2v-.1zm1.2 0c0-.1 0-.1 0 0v.1-.1zm11.8 0h.1c.1-.2.1-.2 0 0 0 .1-.1.2-.1 0zm-13-1v.2-.1zm13.9 0 .1-.1c.2-.1.2-.1 0 0l-.1.1zm-14-1.3c0-.1 0-.2.1-.1v.2-.2zm1.2-.2c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm13.8 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm-13.9-1c0-.1 0-.1.1 0zm16.8-.6-.7-.7.7.7zm-2 .5.2-.2c.1 0 .1 0 0 0l-.1.2zm-14.8-1v.2-.2zm-15-.4.1-.2c.1 0 .1 0 0 0l-.1.2zM98 97v.1zm1.2 0V97v.2-.2zm-1.3-1s0-.1 0 0v.1zm1.2 0V96v.1zm-1.3-1s0-.1 0 0v.1-.1zm1.2 0V95v.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0V94v.1zm-1.4-3.2v.1zm1.2 0v-.1.2-.1zm-24.2-.4.3-.2-.2.2-.2.2.1-.2zm22.9-.6v.1zm1.2 0v-.1.2-.2zm-22.9-.6.3-.2-.2.2-.2.2.1-.2zm21.6-.4s0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm0-1.1s0-.1 0 0v.1-.1zm-.2-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-.2-3.1c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zm4.5-.4h.2-.2zm-2.5 0h.6-.6z" transform="translate(-64.4 -79.5)"/><path fill="%23d6836c" d="m102.8 142.2-1.3-17v-.4l.4-.1 1.2-.3.9-.3a174 174 0 0 1 7.9 15.6 29.9 29.9 0 0 1-9.1 2.5zM76 140.4l-.1-.2.1.2.2.2-.2-.2zm-1.7-1.7c-.1-.1-.1-.1 0 0 .2 0 .2.1.1.1l-.1-.1zm9.6-7-.2-.3.3.2.2.3-.3-.2zm31.7-.2.1-.2v.2l-.3.1.2-.1zm-32.6-.7-.1-.2.2.2.1.2-.2-.2zm33.8-.5.1-.2c.1 0 .1 0 0 0l-.1.2zM99 123.6a9 9 0 0 1-7.8-6.9 9 9 0 0 1 4.9-10.1 9 9 0 0 1 11.3 13.1 9.3 9.3 0 0 1-8.4 3.9zm19-3.8-8.1-2.5v-.6a13 13 0 0 0 .3-2.1l16.8-1.4h.5v1.5a26.9 26.9 0 0 1-1.2 7.7l-8.3-2.5zm-11.2 2.4.2-.2-.1.2-.2.1.1-.1zm-28.5-5.7c0-.1 0-.1 0 0 .1 0 .1 0 0 0zm11.6-1.2c0-.1 0-.1 0 0zm-11.6-.6v-.2.3-.1zM90 114v-.1.2-.1zm20.1-.7v-.1h.1v.1zm1 0h.2-.2zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-35.7-.2c0-.1 0-.1 0 0zm36.7 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm-19.7-2.7-.9-1.1c-.4-.6-.5-.6-.4-.8.1 0 2-2.2 4-4.8l4-4.6 1 1a22.8 22.8 0 0 1 3.7 5l-11 5.7c-.1 0-.3-.1-.4-.4zm-16-1.3.3-.3.3-.2-.2.2-.3.3zm7.2-3.8v.1zm-1.3-.4s0-.1 0 0v.1zm1.2-.6v.1zm-1.3-.4s0-.1 0 0v.1-.1zm1.2-.6s0-.1 0 0v.1zm0-1s0-.1 0 0v.1-.1zM84 99.9l.2-.2v.2l-.3.1.1-.1zm14-.5s0-.1.1 0v.1-.1zm-12.9-.6.2-.2v.2l-.3.1.1-.1zm12.9-.4c0-.1 0-.1 0 0v.1-.1zm1.1-.6s0-.1.1 0v.1-.1zm-1.2-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0v.1-.1zm-1.3-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.4c0-.1 0-.2 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.5v.2-.2zm1.2-.5c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zM75.1 90l.4-.4-.3.4-.4.3zm23.5-.4c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm0-1v-.1.2-.2zm-.1-1v-.1.1zm-.1-1v-.1.1zm-.2-3.2h.2c.2-.1.2 0 0 0H98c0 .1 0 .1 0 0zm5.3 0h.1-.1zm-1.2 0c0-.1.1-.1.2 0h-.2z" transform="translate(-64.4 -79.5)"/><path fill="%23c85d4b" d="M99.6 149.3zm-2-.1h.1-.1s-.1 0 0 0zm4.2-1c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm0-1.2v.1zm7.2-6-2.9-5.5.5-.4 1-.8.6-.5.2.2a1242.5 1242.5 0 0 0 9.2 7.7l.3.3-.9.8a24.8 24.8 0 0 1-5.2 3.9l-2.8-5.6zm-7.4 4.8c.1 0 .1.1 0 .1zm0-1.1c0-.1 0-.2 0 0zm-.1-1.2c0-.1 0-.1 0 0zm-15-.8c-.1-.1-.1-.1 0 0l.1.1h-.1zm14.9-.4s0-.1 0 0v.1zm-.1-1.2v.1zm-16.6-.2c-.1 0-.1 0 0 0 .2.1.2.2.1.2l-.1-.1zm16.5-1v.2-.2zm0-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zM65 117.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm0-2v-.3.6-.3zm11.7-.6v-.5a15.7 15.7 0 0 1 0 .5zm-11.7-.6v-.3.6-.3zm0-2c.1 0 .1.1 0 .1zm28.2-5h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm-8.5-8 .4-.3-.4.4-.4.3zm12.8-8.1c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0z" transform="translate(-64.4 -79.5)"/><path fill="%23c5523e" d="m75.2 139.6-.7-.7.7.6.7.8-.7-.7zm16.6-5A22 22 0 0 1 79 119.9c-.6-2.2-.8-5.2-.6-7.4.5-4.9 2.6-9.3 6-12.9a21.3 21.3 0 0 1 13.1-6.4l1 11.1c0 .3 0 .3-.7.5a10 10 0 0 0-2.2 18.9l.6.3-3.6 11-1-.5zm-7.5-2.6c-.1-.1-.1-.1 0 0l.1.1-.1-.1zm-1.6-1.5c0-.2 0-.2 0 0h.2c0 .1 0 .1-.2 0zm27.4-17.4c-.1-.9-.3-1.5-.5-2l-.2-.4 10.8-5.6 10.9-5.5a30.3 30.3 0 0 1 2.8 8.3l.5 3.2v.2l-12 1-12.2 1v-.2zm-8-8.4-1.3-.2h-1v-.5L98 80.4h2.3a29 29 0 0 1 9.6 1.3l-3.4 11-3.7 11.5-.2.6zm-18.6-6.5.4-.3-.4.4-.4.3z" transform="translate(-64.4 -79.5)"/><path fill="%23b4111a" d="M97 149.1a39 39 0 0 1-7.2-1.4l3.8-11.6 3.9-11.6.5.2 1.3.1c.7 0 .9.1.9.2a5523.8 5523.8 0 0 0 1.7 24c0 .2-.2.2-2 .2H97zM79 143a37.9 37.9 0 0 1-7.7-8c-.5-.7-.6-.8-.5-1a155.3 155.3 0 0 1 3.8-6.8l-.4-1a38.9 38.9 0 0 1-1-2.4l-3.6-1-3.7-1h-.3l-.2-1.2a32.9 32.9 0 0 1 0-10.9l.1-1.2.6-.2a395.4 395.4 0 0 1 7-2l.5-1 .8-2 .4-1-2-3.4-2-3.4.5-.7A35.8 35.8 0 0 1 80 86l3.6 1.9 3.5 2 .8-.5a28.5 28.5 0 0 1 9.2-2.5 33.8 33.8 0 0 1 .4 4.4c0 .4 0 .4-.3.4l-3 .5a23.4 23.4 0 0 0-2.2 44.6l-1.5 4.5-2.8-1.1-.8-.4-3.5 1.9c-1.9 1-3.4 1.9-3.4 2l-1-.7zm37.2-15.3-7.8-6.6-.2-.2.4-.5.6-1.2.3-.6 19.6 6.2a27 27 0 0 1-5.1 9.3l-7.8-6.4zm-10.5-21.4-1.9-1a1150.6 1150.6 0 0 1 6.4-19.4 28.3 28.3 0 0 1 9 4.8l.2.3-6.6 7.7a866 866 0 0 1-6.6 7.9l-.5-.3z" transform="translate(-64.4 -79.5)"/></svg>'> ARTCOMPILER</a></li>
   </ul>
 </section>
 

From cf6cc381f8764d7988d2df048743ba0d84fe286c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Jul 2021 15:56:37 +0200
Subject: [PATCH 4524/4742] [yaml-frontmatter mode] Treat the start of the
 document as being in the base mode

For purposes of indentation and such.

Issue https://github.com/codemirror/CodeMirror/issues/6737
---
 mode/yaml-frontmatter/yaml-frontmatter.js | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
index 88c845e222..5c6175e4ec 100644
--- a/mode/yaml-frontmatter/yaml-frontmatter.js
+++ b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -17,55 +17,55 @@
     var yamlMode = CodeMirror.getMode(config, "yaml")
     var innerMode = CodeMirror.getMode(config, parserConfig && parserConfig.base || "gfm")
 
-    function curMode(state) {
-      return state.state == BODY ? innerMode : yamlMode
+    function localMode(state) {
+      return state.state == FRONTMATTER ? {mode: yamlMode, state: state.yaml} : {mode: innerMode, state: state.inner}
     }
 
     return {
       startState: function () {
         return {
           state: START,
-          inner: CodeMirror.startState(yamlMode)
+          yaml: null,
+          inner: CodeMirror.startState(innerMode)
         }
       },
       copyState: function (state) {
         return {
           state: state.state,
-          inner: CodeMirror.copyState(curMode(state), state.inner)
+          yaml: state.yaml && CodeMirror.copyState(yamlMode, state.yaml),
+          inner: CodeMirror.copyState(innerMode, state.inner)
         }
       },
       token: function (stream, state) {
         if (state.state == START) {
           if (stream.match('---', false)) {
             state.state = FRONTMATTER
-            return yamlMode.token(stream, state.inner)
+            state.yaml = CodeMirror.startState(yamlMode)
+            return yamlMode.token(stream, state.yaml)
           } else {
             state.state = BODY
-            state.inner = CodeMirror.startState(innerMode)
             return innerMode.token(stream, state.inner)
           }
         } else if (state.state == FRONTMATTER) {
           var end = stream.sol() && stream.match(/(---|\.\.\.)/, false)
-          var style = yamlMode.token(stream, state.inner)
+          var style = yamlMode.token(stream, state.yaml)
           if (end) {
             state.state = BODY
-            state.inner = CodeMirror.startState(innerMode)
+            state.yaml = null
           }
           return style
         } else {
           return innerMode.token(stream, state.inner)
         }
       },
-      innerMode: function (state) {
-        return {mode: curMode(state), state: state.inner}
-      },
+      innerMode: localMode,
       indent: function(state, a, b) {
-        var mode = curMode(state)
-        return mode.indent ? mode.indent(state.inner, a, b) : CodeMirror.Pass
+        var m = localMode(state)
+        return m.mode.indent ? m.mode.indent(m.state, a, b) : CodeMirror.Pass
       },
       blankLine: function (state) {
-        var mode = curMode(state)
-        if (mode.blankLine) return mode.blankLine(state.inner)
+        var m = localMode(state)
+        if (m.mode.blankLine) return m.mode.blankLine(m.state)
       }
     }
   })

From 68d3399294abd37a3e8dba68118ee66578347ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Vr=C3=A1na?= <jakubvrana@google.com>
Date: Tue, 20 Jul 2021 15:10:40 +0200
Subject: [PATCH 4525/4742] [search addon] Make compatible with Trusted Types

https://web.dev/trusted-types/ doesn't allow string innerHTML assignments. This change avoids it by using DOM instead.
---
 addon/search/search.js | 50 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 118f1112f1..4f94599136 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -189,18 +189,54 @@
     if (state.annotate) { state.annotate.clear(); state.annotate = null; }
   });}
 
+  function el(tag, attrs, content) {
+    var element = document.createElement(tag);
+    for (var key in attrs) {
+      element[key] = attrs[key];
+    }
+    for (var i = 2; i < arguments.length; i++) {
+      var child = arguments[i]
+      element.appendChild(typeof child == "string" ? document.createTextNode(child) : child);
+    }
+    return element;
+  }
 
   function getQueryDialog(cm)  {
-    return '<span class="CodeMirror-search-label">' + cm.phrase("Search:") + '</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">' + cm.phrase("(Use /re/ syntax for regexp search)") + '</span>';
+    var fragment = document.createDocumentFragment();
+    fragment.appendChild(el('span', {className: 'CodeMirror-search-label'}, cm.phrase("Search:")));
+    fragment.appendChild(document.createTextNode(' '));
+    fragment.appendChild(el('input', {type: 'text', 'style': 'width: 10em', className: 'CodeMirror-search-field'}));
+    fragment.appendChild(document.createTextNode(' '));
+    fragment.appendChild(el('span', {style: 'color: #888', className: 'CodeMirror-search-hint'}, cm.phrase("(Use /re/ syntax for regexp search)")));
+    return fragment;
   }
   function getReplaceQueryDialog(cm) {
-    return ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">' + cm.phrase("(Use /re/ syntax for regexp search)") + '</span>';
+    var fragment = document.createDocumentFragment();
+    fragment.appendChild(document.createTextNode(' '));
+    fragment.appendChild(el('input', {type: 'text', 'style': 'width: 10em', className: 'CodeMirror-search-field'}));
+    fragment.appendChild(document.createTextNode(' '));
+    fragment.appendChild(el('span', {style: 'color: #888', className: 'CodeMirror-search-hint'}, cm.phrase("(Use /re/ syntax for regexp search)")));
+    return fragment;
   }
   function getReplacementQueryDialog(cm) {
-    return '<span class="CodeMirror-search-label">' + cm.phrase("With:") + '</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
+    var fragment = document.createDocumentFragment();
+    fragment.appendChild(el('span', {className: 'CodeMirror-search-label'}, cm.phrase("With:")));
+    fragment.appendChild(document.createTextNode(' '));
+    fragment.appendChild(el('input', {type: 'text', 'style': 'width: 10em', className: 'CodeMirror-search-field'}));
+    return fragment;
   }
   function getDoReplaceConfirm(cm) {
-    return '<span class="CodeMirror-search-label">' + cm.phrase("Replace?") + '</span> <button>' + cm.phrase("Yes") + '</button> <button>' + cm.phrase("No") + '</button> <button>' + cm.phrase("All") + '</button> <button>' + cm.phrase("Stop") + '</button> ';
+    var fragment = document.createDocumentFragment();
+    fragment.appendChild(el('span', {className: 'CodeMirror-search-label'}, cm.phrase("Replace?")));
+    fragment.appendChild(document.createTextNode(' '));
+    fragment.appendChild(el('button', {}, cm.phrase("Yes")));
+    fragment.appendChild(document.createTextNode(' '));
+    fragment.appendChild(el('button', {}, cm.phrase("No")));
+    fragment.appendChild(document.createTextNode(' '));
+    fragment.appendChild(el('button', {}, cm.phrase("All")));
+    fragment.appendChild(document.createTextNode(' '));
+    fragment.appendChild(el('button', {}, cm.phrase("Stop")));
+    return fragment;
   }
 
   function replaceAll(cm, query, text) {
@@ -217,8 +253,10 @@
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
     var query = cm.getSelection() || getSearchState(cm).lastQuery;
-    var dialogText = '<span class="CodeMirror-search-label">' + (all ? cm.phrase("Replace all:") : cm.phrase("Replace:")) + '</span>';
-    dialog(cm, dialogText + getReplaceQueryDialog(cm), dialogText, query, function(query) {
+    var fragment = document.createDocumentFragment();
+    fragment.appendChild(el('span', {className: 'CodeMirror-search-label'}, (all ? cm.phrase("Replace all:") : cm.phrase("Replace:"))));
+    fragment.appendChild(getReplaceQueryDialog(cm));
+    dialog(cm, fragment, dialogText, query, function(query) {
       if (!query) return;
       query = parseQuery(query);
       dialog(cm, getReplacementQueryDialog(cm), cm.phrase("Replace with:"), "", function(text) {

From 336217837414a81e0634d204f4f79e45a3a4de9f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Jul 2021 20:13:32 +0200
Subject: [PATCH 4526/4742] [search addon] Further simplify dialog building,
 fix bug in replace dialog

Issue #6746
---
 addon/search/search.js | 58 +++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 4f94599136..24a0855e9e 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -189,8 +189,8 @@
     if (state.annotate) { state.annotate.clear(); state.annotate = null; }
   });}
 
-  function el(tag, attrs, content) {
-    var element = document.createElement(tag);
+  function el(tag, attrs) {
+    var element = tag ? document.createElement(tag) : document.createDocumentFragment();
     for (var key in attrs) {
       element[key] = attrs[key];
     }
@@ -202,41 +202,30 @@
   }
 
   function getQueryDialog(cm)  {
-    var fragment = document.createDocumentFragment();
-    fragment.appendChild(el('span', {className: 'CodeMirror-search-label'}, cm.phrase("Search:")));
-    fragment.appendChild(document.createTextNode(' '));
-    fragment.appendChild(el('input', {type: 'text', 'style': 'width: 10em', className: 'CodeMirror-search-field'}));
-    fragment.appendChild(document.createTextNode(' '));
-    fragment.appendChild(el('span', {style: 'color: #888', className: 'CodeMirror-search-hint'}, cm.phrase("(Use /re/ syntax for regexp search)")));
-    return fragment;
+    return el("", null,
+              el("span", {className: "CodeMirror-search-label"}, cm.phrase("Search:")), " ",
+              el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field"}), " ",
+              el("span", {style: "color: #888", className: "CodeMirror-search-hint"},
+                 cm.phrase("(Use /re/ syntax for regexp search)")));
   }
   function getReplaceQueryDialog(cm) {
-    var fragment = document.createDocumentFragment();
-    fragment.appendChild(document.createTextNode(' '));
-    fragment.appendChild(el('input', {type: 'text', 'style': 'width: 10em', className: 'CodeMirror-search-field'}));
-    fragment.appendChild(document.createTextNode(' '));
-    fragment.appendChild(el('span', {style: 'color: #888', className: 'CodeMirror-search-hint'}, cm.phrase("(Use /re/ syntax for regexp search)")));
-    return fragment;
+    return el("", null, " ",
+              el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field"}), " ",
+              el("span", {style: "color: #888", className: "CodeMirror-search-hint"},
+                 cm.phrase("(Use /re/ syntax for regexp search)")));
   }
   function getReplacementQueryDialog(cm) {
-    var fragment = document.createDocumentFragment();
-    fragment.appendChild(el('span', {className: 'CodeMirror-search-label'}, cm.phrase("With:")));
-    fragment.appendChild(document.createTextNode(' '));
-    fragment.appendChild(el('input', {type: 'text', 'style': 'width: 10em', className: 'CodeMirror-search-field'}));
-    return fragment;
+    return el("", null,
+              el("span", {className: "CodeMirror-search-label"}, cm.phrase("With:")), " ",
+              el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field"}));
   }
   function getDoReplaceConfirm(cm) {
-    var fragment = document.createDocumentFragment();
-    fragment.appendChild(el('span', {className: 'CodeMirror-search-label'}, cm.phrase("Replace?")));
-    fragment.appendChild(document.createTextNode(' '));
-    fragment.appendChild(el('button', {}, cm.phrase("Yes")));
-    fragment.appendChild(document.createTextNode(' '));
-    fragment.appendChild(el('button', {}, cm.phrase("No")));
-    fragment.appendChild(document.createTextNode(' '));
-    fragment.appendChild(el('button', {}, cm.phrase("All")));
-    fragment.appendChild(document.createTextNode(' '));
-    fragment.appendChild(el('button', {}, cm.phrase("Stop")));
-    return fragment;
+    return el("", null,
+              el("span", {className: "CodeMirror-search-label"}, cm.phrase("Replace?")), " ",
+              el("button", {}, cm.phrase("Yes")), " ",
+              el("button", {}, cm.phrase("No")), " ",
+              el("button", {}, cm.phrase("All")), " ",
+              el("button", {}, cm.phrase("Stop")));
   }
 
   function replaceAll(cm, query, text) {
@@ -253,9 +242,10 @@
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
     var query = cm.getSelection() || getSearchState(cm).lastQuery;
-    var fragment = document.createDocumentFragment();
-    fragment.appendChild(el('span', {className: 'CodeMirror-search-label'}, (all ? cm.phrase("Replace all:") : cm.phrase("Replace:"))));
-    fragment.appendChild(getReplaceQueryDialog(cm));
+    var dialogText = all ? cm.phrase("Replace all:") : cm.phrase("Replace:")
+    var fragment = el("", null,
+                      el("span", {className: "CodeMirror-search-label"}, dialogText),
+                      getReplaceQueryDialog(cm))
     dialog(cm, fragment, dialogText, query, function(query) {
       if (!query) return;
       query = parseQuery(query);

From 10510ba29e20ed42474237a68fbae0e27896b9d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Vr=C3=A1na?= <jakubvrana@google.com>
Date: Tue, 20 Jul 2021 19:33:29 +0200
Subject: [PATCH 4527/4742] [vim bindings] Make compatible with Trusted Types

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 1af86fbff2..c5210c9c9c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -661,7 +661,7 @@
           this.latestRegister = registerName;
           if (cm.openDialog) {
             this.onRecordingDone = cm.openDialog(
-                '(recording)['+registerName+']', null, {bottom:true});
+                document.createTextNode('(recording)['+registerName+']'), null, {bottom:true});
           }
           this.isRecording = true;
         }

From 50aa8c0a7721cc45eb524a01357beda7c0a26dce Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Jul 2021 21:20:30 +0200
Subject: [PATCH 4528/4742] Mark version 5.62.1

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 11fac5f262..fa2289cbcc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -116,6 +116,7 @@ Bernhard Sirlinger
 Bert Chang
 Bharad
 BigBlueHat
+Billiam
 Billy Moon
 Bin Ni
 binny
@@ -620,6 +621,7 @@ Mike Ivanov
 Mike Kadin
 Mike Kobit
 Milan Szekely
+MinJune Kim
 MinRK
 Miraculix87
 misfo
@@ -634,6 +636,7 @@ ms
 mtaran-google
 Mu-An ✌️ Chiou
 Mu-An Chiou
+Mykola Martynovets
 mzabuawala
 Narciso Jaramillo
 nathanlesage
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dba3c2505a..48103fcaa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.62.1 (2021-07-20)
+
+### Bug fixes
+
+[vim bindings](https://codemirror.net/demo/vim.html): Make matching of upper-case characters more Unicode-aware.
+
+[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Prevent options passed to the addon itself from being given to the linter.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Improve screen reader support.
+
+[search addon](https://codemirror.net/demo/search.html): Avoid using `innerHTML`.
+
 ## 5.62.0 (2021-06-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 91e213c69b..1c3f8f7316 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.62.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.62.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 75c29947fc..2a32ccb460 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-07-2021: <a href="https://codemirror.net/codemirror-5.62.1.zip">Version 5.62.1</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Make matching of upper-case characters more Unicode-aware.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Prevent options passed to the addon itself from being given to the linter.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Improve screen reader support.</li>
+    <li><a href="https://codemirror.net/demo/search.html">search addon</a>: Avoid using <code>innerHTML</code>.</li>
+  </ul>
+
   <p class="rel">21-06-2021: <a href="https://codemirror.net/codemirror-5.62.0.zip">Version 5.62.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 7e868bd32f..21ecde7e66 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.62.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.62.1</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index a73a749c5c..73ad8743aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.62.0",
+  "version": "5.62.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 162c24c6ce..24e2aca12e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.62.0"
+CodeMirror.version = "5.62.1"

From 5180d1e0edc9933169031ad9b6906f3c67af5b86 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Jul 2021 13:38:36 +0200
Subject: [PATCH 4529/4742] [lint addon] Fix a regression that broke the
 getAnnotations option

Introduced in 70c615c5ff7d25e91dd50190945ef295b9
---
 addon/lint/lint.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 8d214433b2..1613deb9dd 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -83,7 +83,12 @@
     highlightLines: false,
     tooltips: true,
     delay: 500,
-    lintOnChange: true
+    lintOnChange: true,
+    getAnnotations: null,
+    async: false,
+    selfContain: null,
+    formatAnnotation: null,
+    onUpdateLinting: null
   }
 
   function clearMarks(cm) {
@@ -218,9 +223,9 @@
       // use original annotations[line] to show multiple messages
       if (state.hasGutter)
         cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, annotations[line].length > 1,
-                                                       state.options.tooltips));
+                                                       options.tooltips));
 
-      if (state.options.highlightLines)
+      if (options.highlightLines)
         cm.addLineClass(line, "wrap", LINT_LINE_ID + maxSeverity);
     }
     if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);

From d27055249bb051900f4c59489c45e81a2b0e8c46 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 21 Jul 2021 13:43:10 +0200
Subject: [PATCH 4530/4742] Mark version 5.62.2

---
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48103fcaa9..5a8c05604e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.62.2 (2021-07-21)
+
+### Bug fixes
+
+[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Fix a regression that broke several addon options.
+
 ## 5.62.1 (2021-07-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 1c3f8f7316..aa6ab63a10 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.62.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.62.2</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 2a32ccb460..2fc772296d 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-07-2021: <a href="https://codemirror.net/codemirror-5.62.2.zip">Version 5.62.2</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Fix a regression that broke several addon options.</li>
+  </ul>
+
   <p class="rel">20-07-2021: <a href="https://codemirror.net/codemirror-5.62.1.zip">Version 5.62.1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 21ecde7e66..e5b6244d65 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.62.1</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.62.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 73ad8743aa..6d1d873873 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.62.1",
+  "version": "5.62.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 24e2aca12e..b6e784d7e5 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.62.1"
+CodeMirror.version = "5.62.2"

From 32851811122bc2541ff62c6230dca86dc8197abb Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Tue, 3 Aug 2021 19:29:52 +0300
Subject: [PATCH 4531/4742] [css] add 'grey' colors and missing keywords

---
 mode/css/css.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 88a869bfea..2407b328be 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -482,7 +482,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "cue-before", "cursor", "direction", "display", "dominant-baseline",
     "drop-initial-after-adjust", "drop-initial-after-align",
     "drop-initial-before-adjust", "drop-initial-before-align", "drop-initial-size",
-    "drop-initial-value", "elevation", "empty-cells", "fit", "fit-position",
+    "drop-initial-value", "elevation", "empty-cells", "fit", "fit-content", "fit-position",
     "flex", "flex-basis", "flex-direction", "flex-flow", "flex-grow",
     "flex-shrink", "flex-wrap", "float", "float-offset", "flow-from", "flow-into",
     "font", "font-family", "font-feature-settings", "font-kerning",
@@ -564,7 +564,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   ], propertyKeywords = keySet(propertyKeywords_);
 
   var nonStandardPropertyKeywords_ = [
-    "border-block", "border-block-color", "border-block-end",
+    "accent-color", "aspect-ratio", "border-block", "border-block-color", "border-block-end",
     "border-block-end-color", "border-block-end-style", "border-block-end-width",
     "border-block-start", "border-block-start-color", "border-block-start-style",
     "border-block-start-width", "border-block-style", "border-block-width",
@@ -572,9 +572,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "border-inline-end-color", "border-inline-end-style",
     "border-inline-end-width", "border-inline-start", "border-inline-start-color",
     "border-inline-start-style", "border-inline-start-width",
-    "border-inline-style", "border-inline-width", "margin-block",
+    "border-inline-style", "border-inline-width", "content-visibility", "margin-block",
     "margin-block-end", "margin-block-start", "margin-inline", "margin-inline-end",
-    "margin-inline-start", "padding-block", "padding-block-end",
+    "margin-inline-start", "overflow-anchor", "overscroll-behavior", "padding-block", "padding-block-end",
     "padding-block-start", "padding-inline", "padding-inline-end",
     "padding-inline-start", "scroll-snap-stop", "scrollbar-3d-light-color",
     "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
@@ -598,16 +598,16 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
     "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue",
     "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod",
-    "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen",
+    "darkgray", "darkgreen", "darkgrey", "darkkhaki", "darkmagenta", "darkolivegreen",
     "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen",
-    "darkslateblue", "darkslategray", "darkturquoise", "darkviolet",
-    "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick",
+    "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise", "darkviolet",
+    "deeppink", "deepskyblue", "dimgray", "dimgrey", "dodgerblue", "firebrick",
     "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite",
     "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew",
     "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender",
     "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",
-    "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink",
-    "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray",
+    "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightgrey", "lightpink",
+    "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightslategrey",
     "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta",
     "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple",
     "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise",
@@ -617,7 +617,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue",
     "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown",
     "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
-    "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",
+    "slateblue", "slategray", "slategrey", "snow", "springgreen", "steelblue", "tan",
     "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
     "whitesmoke", "yellow", "yellowgreen"
   ], colorKeywords = keySet(colorKeywords_);
@@ -628,21 +628,21 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
     "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",
     "avoid-region", "axis-pan", "background", "backwards", "baseline", "below", "bidi-override", "binary",
-    "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
-    "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
+    "bengali", "blink", "block", "block-axis", "blur", "bold", "bolder", "border", "border-box",
+    "both", "bottom", "break", "break-all", "break-word", "brightness", "bullets", "button", "button-bevel",
     "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
     "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
     "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
     "compact", "condensed", "contain", "content", "contents",
-    "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
-    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
+    "content-box", "context-menu", "continuous", "contrast", "copy", "counter", "counters", "cover", "crop",
+    "cross", "crosshair", "cubic-bezier", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "dense", "destination-atop",
     "destination-in", "destination-out", "destination-over", "devanagari", "difference",
     "disc", "discard", "disclosure-closed", "disclosure-open", "document",
     "dot-dash", "dot-dot-dash",
-    "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
+    "dotted", "double", "down", "drop-shadow", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
     "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
     "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
     "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
@@ -652,10 +652,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
     "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
     "extra-expanded", "fantasy", "fast", "fill", "fill-box", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
-    "forwards", "from", "geometricPrecision", "georgian", "graytext", "grid", "groove",
+    "forwards", "from", "geometricPrecision", "georgian", "grayscale", "graytext", "grid", "groove",
     "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
     "help", "hidden", "hide", "higher", "highlight", "highlighttext",
-    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore",
+    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "hue-rotate", "icon", "ignore",
     "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
     "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
     "inline-block", "inline-flex", "inline-grid", "inline-table", "inset", "inside", "intrinsic", "invert",
@@ -689,11 +689,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
     "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
     "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
-    "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
+    "s-resize", "sans-serif", "saturate", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
     "scroll", "scrollbar", "scroll-position", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",
     "searchfield-results-button", "searchfield-results-decoration", "self-start", "self-end",
-    "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
+    "semi-condensed", "semi-expanded", "separate", "sepia", "serif", "show", "sidama",
     "simp-chinese-formal", "simp-chinese-informal", "single",
     "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",

From 49a7fc497c85e5b51801b3f439f4bb126e3f226b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 9 Aug 2021 12:32:07 +0200
Subject: [PATCH 4532/4742] [mode/meta] Add cbl extension for Cobol

Closes https://github.com/codemirror/CodeMirror/issues/6762
---
 mode/meta.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/meta.js b/mode/meta.js
index 477d6ae23e..38d5e0131d 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -19,7 +19,7 @@
     {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
     {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h", "ino"]},
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
-    {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
+    {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy", "cbl"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp", "cs"]},
     {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
     {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},

From 9692aa1bd973fc7ba9f03190814135ca76c7513d Mon Sep 17 00:00:00 2001
From: Pablo Zubieta <8410335+pabloferz@users.noreply.github.com>
Date: Wed, 11 Aug 2021 03:00:09 -0500
Subject: [PATCH 4533/4742] [julia mode] Improve macros and symbols matching

---
 mode/julia/julia.js | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index de9f987d8e..cb0d69c8e2 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -12,9 +12,10 @@
 "use strict";
 
 CodeMirror.defineMode("julia", function(config, parserConf) {
-  function wordRegexp(words, end) {
+  function wordRegexp(words, end, pre) {
+    if (typeof pre === "undefined") { pre = ""; }
     if (typeof end === "undefined") { end = "\\b"; }
-    return new RegExp("^((" + words.join(")|(") + "))" + end);
+    return new RegExp("^" + pre + "((" + words.join(")|(") + "))" + end);
   }
 
   var octChar = "\\\\[0-7]{1,3}";
@@ -22,13 +23,18 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   var sChar = "\\\\[abefnrtv0%?'\"\\\\]";
   var uChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
 
+  var asciiOperatorsList = [
+    "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "--?>", "<--[->]?", "\\/\\/",
+    "\\.{2,3}", "[\\.\\\\%*+\\-<>!\\/^|&]=?", "\\?", "\\$", "~", ":"
+  ];
   var operators = parserConf.operators || wordRegexp([
-        "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "->", "\\/\\/",
-        "[\\\\%*+\\-<>!=\\/^|&\\u00F7\\u22BB]=?", "\\?", "\\$", "~", ":",
-        "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2218",
-        "\\u221A", "\\u221B", "\\u2229", "\\u222A", "\\u2260", "\\u2264",
-        "\\u2265", "\\u2286", "\\u2288", "\\u228A", "\\u22C5",
-        "\\b(in|isa)\\b(?!\.?\\()"], "");
+    "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "--?>", "<--[->]?", "\\/\\/",
+    "[\\\\%*+\\-<>!\\/^|&\\u00F7\\u22BB]=?", "\\?", "\\$", "~", ":",
+    "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2218",
+    "\\u221A", "\\u221B", "\\u2229", "\\u222A", "\\u2260", "\\u2264",
+    "\\u2265", "\\u2286", "\\u2288", "\\u228A", "\\u22C5",
+    "\\b(in|isa)\\b(?!\.?\\()"
+  ], "");
   var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
   var identifiers = parserConf.identifiers ||
         /^[_A-Za-z\u00A1-\u2217\u2219-\uFFFF][\w\u00A1-\u2217\u2219-\uFFFF]*!*/;
@@ -57,10 +63,13 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   var keywords = wordRegexp(keywordsList);
   var builtins = wordRegexp(builtinsList);
 
-  var macro = /^@[_A-Za-z][\w]*/;
+  var macro = /^@[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
   var symbol = /^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
   var stringPrefixes = /^(`|([_A-Za-z\u00A1-\uFFFF]*"("")?))/;
 
+  var macroOperators = wordRegexp(asciiOperatorsList, "", "@");
+  var symbolOperators = wordRegexp(asciiOperatorsList, "", ":");
+
   function inArray(state) {
     return (state.nestedArrays > 0);
   }
@@ -165,8 +174,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
     }
 
     // Handle symbols
-    if (!leavingExpr && stream.match(symbol) ||
-        stream.match(/:([<>]:|<<=?|>>>?=?|->|\/\/|\.{2,3}|[\.\\%*+\-<>!\/^|&]=?|[~\?\$])/)) {
+    if (!leavingExpr && (stream.match(symbol) || stream.match(symbolOperators))) {
       return "builtin";
     }
 
@@ -212,7 +220,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
       return state.tokenize(stream, state);
     }
 
-    if (stream.match(macro)) {
+    if (stream.match(macro) || stream.match(macroOperators)) {
       return "meta";
     }
 

From fab011019fdbcb77174e555d07278608ea4e2b4c Mon Sep 17 00:00:00 2001
From: aoki ken <ken.b.a.worst+github@gmail.com>
Date: Sat, 14 Aug 2021 19:34:39 +0900
Subject: [PATCH 4534/4742] Set attribute translate="no" to avoid automatic
 translation

---
 src/display/Display.js | 4 ++++
 test/test.js           | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/display/Display.js b/src/display/Display.js
index d57f00bddd..9d4c0360d6 100644
--- a/src/display/Display.js
+++ b/src/display/Display.js
@@ -49,6 +49,10 @@ export function Display(place, doc, input, options) {
   // The element in which the editor lives.
   d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror")
 
+  // This attribute is respected by automatic translation systems such as Google Translate,
+  // and may also be respected by tools used by human translators.
+  d.wrapper.setAttribute('translate', 'no')
+
   // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
   if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0 }
   if (!webkit && !(gecko && mobile)) d.scroller.draggable = true
diff --git a/test/test.js b/test/test.js
index 07fa67858f..cdf7beb269 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2672,3 +2672,7 @@ testCM("mode_lookahead", function(cm) {
   eq(cm.getTokenAt(Pos(0, 1)).type, null)
   eq(cm.getTokenAt(Pos(1, 1)).type, "atom")
 }, {value: "foo\na\nx\nx\n", mode: "lookahead_mode"})
+
+testCM("should has [translate=no]", function (cm) {
+  eq(cm.getWrapperElement().getAttribute("translate"), "no")
+}, {})

From 12c5ae134596ebff99977789d2e72b741254a340 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 14 Aug 2021 12:36:00 +0200
Subject: [PATCH 4535/4742] Fix typo in test

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

diff --git a/test/test.js b/test/test.js
index cdf7beb269..357c2b9ecc 100644
--- a/test/test.js
+++ b/test/test.js
@@ -2673,6 +2673,6 @@ testCM("mode_lookahead", function(cm) {
   eq(cm.getTokenAt(Pos(1, 1)).type, "atom")
 }, {value: "foo\na\nx\nx\n", mode: "lookahead_mode"})
 
-testCM("should has [translate=no]", function (cm) {
+testCM("should have translate=no attribute", function(cm) {
   eq(cm.getWrapperElement().getAttribute("translate"), "no")
 }, {})

From d3f33a2a0007aebdeeb1ade3a84e3cf98c8f352a Mon Sep 17 00:00:00 2001
From: Sachin Gupta <7534506+SachinGupta21@users.noreply.github.com>
Date: Tue, 17 Aug 2021 21:20:11 +0530
Subject: [PATCH 4536/4742] [merge addon] Allow merge editor buttons to be used
 with keyboard

Co-authored-by: sach.gupta <sach.gupta@servicenow.com>
---
 addon/merge/merge.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 827edb7133..7fd963f70d 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -508,6 +508,7 @@
       copy.title = dv.edit.phrase(editOriginals ? "Push to left" : "Revert chunk");
       copy.chunk = chunk;
       copy.style.top = (chunk.origTo > chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
+      copy.setAttribute("role", "button");
 
       if (editOriginals) {
         var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
@@ -518,6 +519,7 @@
                              origFrom: chunk.editFrom, origTo: chunk.editTo};
         copyReverse.style.top = topReverse + "px";
         dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
+        copyReverse.setAttribute("role", "button");
       }
     }
   }
@@ -599,6 +601,7 @@
 
   function buildGap(dv) {
     var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
+    lock.setAttribute("role", "button");
     var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
     CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
     var gapElts = [lockWrap];

From 2b9b0898bf15e7a7a2fabc8277781c4dbf94ec29 Mon Sep 17 00:00:00 2001
From: Ruslan Bekenev <furyinbox@gmail.com>
Date: Wed, 18 Aug 2021 13:35:59 +0300
Subject: [PATCH 4537/4742] Give fat cursors the width of the character after
 them

---
 src/display/selection.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/display/selection.js b/src/display/selection.js
index d377a9f4c8..3d56b4dc8f 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -37,6 +37,11 @@ export function drawSelectionCursor(cm, head, output) {
   cursor.style.top = pos.top + "px"
   cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"
 
+  if (/cm-fat-cursor/.test(cm.getWrapperElement().className)) {
+    let charPos = charCoords(cm, head, "div", null, null);
+    cursor.style.width = Math.max(0, charPos.right - charPos.left) + "px";
+  }
+
   if (pos.other) {
     // Secondary cursor, shown when on a 'jump' in bi-directional text
     let otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"))

From b10878860b0a3fda3e3cd34d23984099291facbc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 18 Aug 2021 12:37:02 +0200
Subject: [PATCH 4538/4742] Add word break tests to regexp in previous patch

---
 lib/codemirror.css       | 1 -
 src/display/selection.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index a64f97c777..86061bb04f 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -68,7 +68,6 @@
 }
 .cm-animate-fat-cursor {
   width: auto;
-  border: 0;
   -webkit-animation: blink 1.06s steps(1) infinite;
   -moz-animation: blink 1.06s steps(1) infinite;
   animation: blink 1.06s steps(1) infinite;
diff --git a/src/display/selection.js b/src/display/selection.js
index 3d56b4dc8f..b2db5a1389 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -37,7 +37,7 @@ export function drawSelectionCursor(cm, head, output) {
   cursor.style.top = pos.top + "px"
   cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"
 
-  if (/cm-fat-cursor/.test(cm.getWrapperElement().className)) {
+  if (/\bcm-fat-cursor\b/.test(cm.getWrapperElement().className)) {
     let charPos = charCoords(cm, head, "div", null, null);
     cursor.style.width = Math.max(0, charPos.right - charPos.left) + "px";
   }

From de5caed12d4499f99d3142498e5e6f3a606c42fb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 18 Aug 2021 12:41:44 +0200
Subject: [PATCH 4539/4742] Remove semicolons

---
 src/display/selection.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/display/selection.js b/src/display/selection.js
index b2db5a1389..8ce109b240 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -38,8 +38,8 @@ export function drawSelectionCursor(cm, head, output) {
   cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"
 
   if (/\bcm-fat-cursor\b/.test(cm.getWrapperElement().className)) {
-    let charPos = charCoords(cm, head, "div", null, null);
-    cursor.style.width = Math.max(0, charPos.right - charPos.left) + "px";
+    let charPos = charCoords(cm, head, "div", null, null)
+    cursor.style.width = Math.max(0, charPos.right - charPos.left) + "px"
   }
 
   if (pos.other) {

From d79470253473b2200d4c12a24033651c481061f5 Mon Sep 17 00:00:00 2001
From: Anthony Stewart <150152+a-stewart@users.noreply.github.com>
Date: Thu, 19 Aug 2021 18:12:12 +0200
Subject: [PATCH 4540/4742] [emacs bindings] Fix by-page scrolling bindings

Co-authored-by: Anthony Stewart <anthonystewart@google.com>
---
 keymap/emacs.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keymap/emacs.js b/keymap/emacs.js
index 84744e40a9..9e7ae60f6b 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -330,9 +330,9 @@
 
   cmds.previousLine = move(byLine, -1);
 
-  cmds.scrollDownCommand = move(byPage, 1);
+  cmds.scrollDownCommand = move(byPage, -1);
 
-  cmds.scrollUpCommand = move(byPage, -1);
+  cmds.scrollUpCommand = move(byPage, 1);
 
   cmds.backwardParagraph = move(byParagraph, -1);
 
@@ -480,8 +480,8 @@
     "Home": "goLineStart",
     "Alt-V": "scrollDownCommand",
     "Ctrl-V": "scrollUpCommand",
-    "PageUp": "scrollUpCommand",
-    "PageDown": "scrollDownCommand",
+    "PageUp": "scrollDownCommand",
+    "PageDown": "scrollUpCommand",
     "Ctrl-Up": "backwardParagraph",
     "Ctrl-Down": "forwardParagraph",
     "Alt-{": "backwardParagraph",

From 070b1ba543ad78b34be4bedf710e7bea284fa3c0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 Aug 2021 11:05:08 +0200
Subject: [PATCH 4541/4742] Mark version 5.62.3

---
 AUTHORS           |  4 ++++
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 10 ++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index fa2289cbcc..7ff59c6f78 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -77,8 +77,10 @@ Anthony Dugois
 anthonygego
 Anthony Gégo
 Anthony Grimes
+Anthony Stewart
 Anton Kovalyov
 antosarho
+aoki ken
 Apollo Zhu
 AQNOUCH Mohammed
 Aram Shatakhtsyan
@@ -762,6 +764,7 @@ Roman Janusz
 Rongjian Zhang
 Rrandom
 Rrrandom
+Ruslan Bekenev
 Ruslan Osmanov
 rvalavicius
 Ryan Pangrle
@@ -769,6 +772,7 @@ Ryan Petrello
 Ryan Prior
 ryu-sato
 sabaca
+Sachin Gupta
 Sam Lee
 Sam Rawlins
 Samuel Ainsworth
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a8c05604e..6b0b4c114e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.62.3 (2021-08-20)
+
+### Bug fixes
+
+Give the editor a `translate=no` attribute to prevent automatic translation from modifying its content.
+
+Give vim-style cursors a width that matches the character after them.
+
+[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Make buttons keyboard-accessible.
+
+[emacs bindings](https://codemirror.net/demo/emacs.html): Fix by-page scrolling keybindings, which were accidentally inverted.
+
 ## 5.62.2 (2021-07-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index aa6ab63a10..ab335fbcaa 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.62.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.62.3</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 2fc772296d..57da64bbfc 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,16 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+
+  <p class="rel">20-08-2021: <a href="https://codemirror.net/codemirror-5.62.3.zip">Version 5.62.3</a>:</p>
+
+  <ul class="rel-note">
+    <li>Give the editor a <code>translate=no</code> attribute to prevent automatic translation from modifying its content.</li>
+    <li>Give vim-style cursors a width that matches the character after them.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Make buttons keyboard-accessible.</li>
+    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Fix by-page scrolling keybindings, which were accidentally inverted.</li>
+  </ul>
+
   <p class="rel">21-07-2021: <a href="https://codemirror.net/codemirror-5.62.2.zip">Version 5.62.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index e5b6244d65..d54fc2adc5 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.62.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.62.3</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 6d1d873873..ae293acd9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.62.2",
+  "version": "5.62.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index b6e784d7e5..aae3d6b4e4 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.62.2"
+CodeMirror.version = "5.62.3"

From 7f35cf7552749e154121360f80ef184d97d4ec7c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 26 Aug 2021 08:49:56 +0200
Subject: [PATCH 4542/4742] Smooth out scroll artifacts produced by line height
 changes

See https://discuss.codemirror.net/t/cm5-any-workarounds-for-variable-line-height-scrolling-calculation-jumps/3469
---
 src/display/update_lines.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index 60c367e4dc..f09524b605 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -8,10 +8,14 @@ import { ie, ie_version } from "../util/browser.js"
 export function updateHeightsInViewport(cm) {
   let display = cm.display
   let prevBottom = display.lineDiv.offsetTop
+  let viewTop = Math.max(0, display.scroller.getBoundingClientRect().top)
+  let oldHeight = display.lineDiv.getBoundingClientRect().top
+  let mustScroll = 0
   for (let i = 0; i < display.view.length; i++) {
     let cur = display.view[i], wrapping = cm.options.lineWrapping
     let height, width = 0
     if (cur.hidden) continue
+    oldHeight += cur.line.height
     if (ie && ie_version < 8) {
       let bot = cur.node.offsetTop + cur.node.offsetHeight
       height = bot - prevBottom
@@ -26,6 +30,7 @@ export function updateHeightsInViewport(cm) {
     }
     let diff = cur.line.height - height
     if (diff > .005 || diff < -.005) {
+      if (oldHeight < viewTop) mustScroll -= diff
       updateLineHeight(cur.line, height)
       updateWidgetHeight(cur.line)
       if (cur.rest) for (let j = 0; j < cur.rest.length; j++)
@@ -40,6 +45,7 @@ export function updateHeightsInViewport(cm) {
       }
     }
   }
+  if (Math.abs(mustScroll) > 2) display.scroller.scrollTop += mustScroll
 }
 
 // Read and store the height of line widgets associated with the

From 22e9d4f6ce451196803898be1bad859567df6107 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 30 Aug 2021 14:44:18 +0200
Subject: [PATCH 4543/4742] Fix reentrancy issue in contenteditable selection
 updates

Fixes #6773
---
 src/input/ContentEditableInput.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index f5df0ebc3f..4845a4ebbb 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -226,7 +226,7 @@ export default class ContentEditableInput {
   receivedFocus() {
     let input = this
     if (this.selectionInEditor())
-      this.pollSelection()
+      setTimeout(() => this.pollSelection(), 20)
     else
       runInOp(this.cm, () => input.cm.curOp.selectionChanged = true)
 

From 8cc5d958dfb431b0817b6f9e28628f9183364069 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 9 Sep 2021 11:25:22 +0200
Subject: [PATCH 4544/4742] Add prisma sponsor link

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

diff --git a/index.html b/index.html
index d54fc2adc5..28bb43c4f5 100644
--- a/index.html
+++ b/index.html
@@ -215,6 +215,7 @@ <h2>Sponsors</h2>
     <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='data:image/svg+xml;utf8,<svg width="3311" height="1605" viewBox="400 0 3311 1605" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1133 1602C1182 1602 1191 1602 1189 1579C1153 1301 1125 1076 1098 855L1098 855C1067 601 1037 354 995 41C991 2 973 0 916 0C865 0 854 2 849 34C824 242 798 437 772 636L772 636L772 636L772 636L772 636C734 928 695 1227 653 1581C651 1602 681 1602 715 1602C721 1602 726 1602 732 1602C791 1602 809 1602 811 1579C822 1446 833 1334 847 1206C849 1185 868 1185 905 1186C908 1186 912 1186 916 1186C919 1186 922 1186 925 1186C957 1185 984 1185 986 1206C996 1272 1004 1335 1013 1399L1013 1399C1020 1456 1028 1514 1036 1574C1040 1602 1050 1602 1097 1602C1103 1602 1110 1602 1118 1602C1124 1602 1128 1602 1133 1602ZM264 1602C451 1602 528 1478 528 1334V1195C528 1175 509 1176 470 1176L470 1176C463 1176 455 1177 446 1177C405 1177 376 1177 376 1195V1330C376 1391 342 1448 264 1448C180 1448 148 1387 148 1323V265C148 212 193 143 264 143C332 143 376 217 376 267V374C376 400 403 400 443 399H443H443H443H443H443C447 399 450 399 453 399C494 399 528 397 528 374V271C528 173 453 2 264 2C86 2 0 148 0 271V1336C0 1458 86 1602 264 1602ZM968 1042C959 928 953 837 946 746C942 681 937 615 931 539C931 530 929 514 916 514C904 514 902 530 902 537C896 625 890 707 885 784L885 784C879 874 874 958 868 1039C865 1055 886 1060 918 1060C945 1060 970 1060 968 1042ZM1784 1602C1845 1602 1861 1602 1861 1565V996C1861 992 1861 988 1861 984C1861 936 1861 903 1836 852C1812 804 1767 783 1743 771C1733 766 1727 763 1727 761C1727 758 1734 754 1744 748C1768 736 1810 713 1834 669C1859 623 1859 586 1859 537V537C1859 533 1859 529 1859 525V319C1859 239 1843 146 1775 82C1706 20 1608 2 1535 2H1405C1401 2 1397 1 1393 1C1379 0 1367 -0 1353 11C1339 25 1337 50 1337 73V1570C1337 1602 1353 1602 1405 1602C1474 1602 1483 1602 1483 1565V873C1483 838 1495 838 1586 838H1586H1586L1586 838C1591 838 1597 838 1604 838C1654 838 1715 895 1715 989V1570C1715 1602 1729 1602 1774 1602C1777 1602 1780 1602 1784 1602ZM1711 537V319C1711 267 1702 228 1663 187C1638 164 1624 153 1542 153C1521 153 1501 153 1492 169C1485 182 1485 194 1485 207V635C1485 639 1485 643 1485 648V648V648V648C1484 668 1483 687 1499 699C1510 709 1524 708 1535 708C1536 708 1538 708 1540 708C1565 708 1624 701 1665 658C1711 607 1711 569 1711 537ZM2588 1557L2588 1557C2588 1555 2588 1553 2588 1551V790C2588 788 2589 784 2589 781C2591 773 2592 764 2586 763C2569 760 2496 762 2429 763C2393 764 2359 765 2337 765C2321 765 2319 786 2319 836C2319 884 2321 902 2339 902C2345 902 2352 902 2360 901C2384 900 2414 898 2426 907C2436 915 2436 926 2435 936L2435 936C2435 937 2435 938 2435 938C2435 939 2435 940 2435 941V1334C2435 1382 2412 1453 2323 1453C2232 1453 2207 1384 2207 1327V265C2207 217 2253 143 2323 143C2392 143 2435 217 2435 267C2435 283 2436 303 2436 323C2437 343 2437 363 2437 379C2437 399 2451 402 2508 402C2570 402 2588 395 2588 374V271C2588 189 2524 2 2323 2C2118 2 2059 182 2059 271V1336C2059 1442 2130 1602 2323 1602C2393 1602 2429 1567 2452 1545C2466 1531 2476 1522 2485 1528C2503 1540 2508 1560 2512 1576C2516 1589 2518 1599 2526 1599C2534 1599 2541 1601 2547 1602C2559 1605 2569 1607 2577 1599C2589 1587 2588 1572 2588 1557ZM3310 1316C3310 1464 3249 1602 3046 1602C2856 1602 2781 1464 2781 1316V281C2781 109 2897 2 3046 2C3196 2 3310 121 3310 281V1316ZM3160 281V1309C3160 1373 3137 1448 3046 1448C2943 1448 2929 1375 2929 1309V281C2929 217 2977 143 3046 143C3112 143 3160 217 3160 281Z" fill="black"/></svg>'></a></li>
     <li><a href="https://primo.af"><img alt=primo src='data:image/svg+xml;utf8,<svg viewBox="0 0 258 66" xmlns="http://www.w3.org/2000/svg"><path d="M17.6 13.8C19.5 11.9 22.7 11.9 24.6 13.8C26.5 15.7 26.6 18.7 24.8 20.7L24.6 20.9L12.0 33.5L35.4 56.8C37.3 58.6 37.4 61.7 35.6 63.6L35.4 63.8C33.6 65.7 30.5 65.8 28.6 64.0L28.4 63.8L1.4 37.1C-0.4 35.2 -0.4 32.1 1.2 30.2L1.4 30.0L17.6 13.8Z" fill="url(%23paint0_linear)"></path><path d="M50.0 11C62.4 11 72.5 21.0 72.5 33.5C72.5 46.0 62.4 56.1 50.0 56.1C47.2 56.1 45.0 53.8 45.0 51.1C45.0 48.3 47.2 46.1 50.0 46.1C56.9 46.1 62.5 40.4 62.5 33.5C62.5 26.6 56.9 21 50.0 21C43.2 21 37.6 26.4 37.4 33.3L37.4 33.6L36.9 60.4C36.8 63.2 34.6 65.4 31.8 65.3C29.1 65.2 27.0 63.1 26.9 60.4V60.2L27.4 33.5C27.4 21.0 37.5 11 50.0 11Z" fill="%23EE4645"></path><path d="M75.3 13.8C77.2 11.9 80.3 11.9 82.2 13.6L82.4 13.8L98.6 30.0C100.4 31.9 100.5 34.9 98.7 36.9L98.6 37.0L82.4 53.2C80.4 55.1 77.3 55.1 75.3 53.2C73.4 51.3 73.4 48.3 75.2 46.3L75.3 46.1L87.9 33.5L75.3 20.9C73.4 19.0 73.4 16.0 75.2 14.0L75.3 13.8Z" fill="%23EE4645"></path><path d="M134.5 19.4C136.8 19.4 138.8 19.9 140.6 21.0C142.5 22.0 143.9 23.4 145.0 25.3C146.0 27.2 146.6 29.4 146.6 31.8C146.6 34.3 146.0 36.5 145.0 38.4C143.9 40.3 142.5 41.7 140.6 42.8C138.8 43.8 136.8 44.3 134.5 44.3C131.4 44.3 129.0 43.3 127.2 41.4V52.7H120.2V19.7H126.9V22.5C128.6 20.4 131.2 19.4 134.5 19.4ZM133.3 38.6C135.1 38.6 136.6 38 137.7 36.8C138.9 35.5 139.5 33.9 139.5 31.8C139.5 29.8 138.9 28.2 137.7 27.0C136.6 25.8 135.1 25.1 133.3 25.1C131.5 25.1 130.0 25.8 128.8 27.0C127.7 28.2 127.1 29.8 127.1 31.8C127.1 33.9 127.7 35.5 128.8 36.8C130.0 38 131.5 38.6 133.3 38.6ZM158.0 22.9C158.8 21.8 159.9 20.9 161.3 20.3C162.8 19.7 164.4 19.4 166.3 19.4V25.9C165.5 25.8 165.0 25.8 164.7 25.8C162.7 25.8 161.1 26.3 160.0 27.5C158.8 28.6 158.3 30.3 158.3 32.5V44H151.3V19.7H158.0V22.9ZM170.5 19.7H177.5V44H170.5V19.7ZM174.0 16.4C172.7 16.4 171.6 16.0 170.8 15.2C170.0 14.5 169.6 13.6 169.6 12.5C169.6 11.3 170.0 10.4 170.8 9.7C171.6 8.9 172.7 8.5 174.0 8.5C175.3 8.5 176.3 8.9 177.1 9.6C177.9 10.3 178.3 11.2 178.3 12.3C178.3 13.5 177.9 14.5 177.1 15.2C176.3 16.0 175.3 16.4 174.0 16.4ZM215.0 19.4C218.0 19.4 220.4 20.3 222.2 22.1C224.0 23.9 224.9 26.5 224.9 30.1V44H217.9V31.2C217.9 29.3 217.5 27.8 216.7 26.9C215.9 25.9 214.8 25.5 213.3 25.5C211.6 25.5 210.3 26.0 209.4 27.1C208.4 28.1 207.9 29.7 207.9 31.8V44H200.9V31.2C200.9 27.4 199.4 25.5 196.3 25.5C194.7 25.5 193.4 26.0 192.5 27.1C191.5 28.1 191.0 29.7 191.0 31.8V44H184.0V19.7H190.7V22.5C191.6 21.5 192.7 20.7 194.0 20.2C195.3 19.7 196.7 19.4 198.3 19.4C200.0 19.4 201.6 19.7 202.9 20.4C204.3 21.1 205.4 22.1 206.3 23.3C207.3 22.1 208.5 21.1 210.0 20.4C211.5 19.7 213.2 19.4 215.0 19.4ZM243.0 44.3C240.4 44.3 238.1 43.8 236.1 42.7C234.1 41.7 232.5 40.2 231.4 38.3C230.2 36.4 229.7 34.2 229.7 31.8C229.7 29.4 230.2 27.3 231.4 25.4C232.5 23.5 234.1 22.1 236.1 21.0C238.1 19.9 240.4 19.4 243.0 19.4C245.5 19.4 247.8 19.9 249.8 21.0C251.8 22.1 253.4 23.5 254.5 25.4C255.7 27.3 256.3 29.4 256.3 31.8C256.3 34.2 255.7 36.4 254.5 38.3C253.4 40.2 251.8 41.7 249.8 42.7C247.8 43.8 245.5 44.3 243.0 44.3ZM243.0 38.6C244.8 38.6 246.3 38 247.4 36.8C248.6 35.5 249.1 33.9 249.1 31.8C249.1 29.8 248.6 28.2 247.4 27.0C246.3 25.8 244.8 25.1 243.0 25.1C241.2 25.1 239.7 25.8 238.5 27.0C237.4 28.2 236.8 29.8 236.8 31.8C236.8 33.9 237.4 35.5 238.5 36.8C239.7 38 241.2 38.6 243.0 38.6Z" fill="%23343434"></path><path d="M140.6 21.0L140.4 21.4L140.4 21.4L140.6 21.0ZM145.0 25.3L144.5 25.6L144.6 25.6L145.0 25.3ZM145.0 38.4L145.4 38.7L145.4 38.7L145.0 38.4ZM140.6 42.8L140.9 43.2L140.9 43.2L140.6 42.8ZM127.2 41.4L127.6 41.0L126.7 40.1V41.4H127.2ZM127.2 52.7V53.2H127.7V52.7H127.2ZM120.2 52.7H119.7V53.2H120.2V52.7ZM120.2 19.7V19.2H119.7V19.7H120.2ZM126.9 19.7H127.4V19.2H126.9V19.7ZM126.9 22.5H126.4V23.9L127.3 22.8L126.9 22.5ZM137.7 36.8L137.3 36.4L137.3 36.4L137.7 36.8ZM137.7 27.0L137.3 27.3L137.3 27.3L137.7 27.0ZM128.8 27.0L128.5 26.6L128.5 26.6L128.8 27.0ZM128.8 36.8L128.5 37.1L128.5 37.1L128.8 36.8ZM134.5 19.9C136.7 19.9 138.6 20.4 140.4 21.4L140.9 20.5C139.0 19.4 136.8 18.9 134.5 18.9V19.9ZM140.4 21.4C142.2 22.4 143.5 23.8 144.5 25.6L145.4 25.1C144.3 23.1 142.8 21.6 140.9 20.5L140.4 21.4ZM144.6 25.6C145.6 27.3 146.1 29.4 146.1 31.8H147.1C147.1 29.3 146.5 27.0 145.4 25.1L144.6 25.6ZM146.1 31.8C146.1 34.3 145.6 36.4 144.5 38.2L145.4 38.7C146.5 36.7 147.1 34.4 147.1 31.8H146.1ZM144.6 38.2C143.5 39.9 142.2 41.3 140.4 42.3L140.9 43.2C142.8 42.1 144.3 40.6 145.4 38.7L144.6 38.2ZM140.4 42.3C138.6 43.3 136.7 43.8 134.5 43.8V44.8C136.8 44.8 139.0 44.3 140.9 43.2L140.4 42.3ZM134.5 43.8C131.5 43.8 129.2 42.9 127.6 41.0L126.8 41.7C128.7 43.8 131.3 44.8 134.5 44.8V43.8ZM126.7 41.4V52.7H127.7V41.4H126.7ZM127.2 52.2H120.2V53.2H127.2V52.2ZM120.7 52.7V19.7H119.7V52.7H120.7ZM120.2 20.2H126.9V19.2H120.2V20.2ZM126.4 19.7V22.5H127.4V19.7H126.4ZM127.3 22.8C128.9 20.9 131.3 19.9 134.5 19.9V18.9C131.1 18.9 128.4 20.0 126.5 22.2L127.3 22.8ZM133.3 39.1C135.2 39.1 136.8 38.4 138.1 37.1L137.3 36.4C136.3 37.5 135.0 38.1 133.3 38.1V39.1ZM138.1 37.1C139.3 35.8 140 34.0 140 31.8H139C139 33.8 138.4 35.3 137.3 36.4L138.1 37.1ZM140 31.8C140 29.7 139.3 27.9 138.1 26.6L137.3 27.3C138.4 28.4 139 29.9 139 31.8H140ZM138.1 26.6C136.8 25.3 135.2 24.6 133.3 24.6V25.6C135.0 25.6 136.3 26.2 137.3 27.3L138.1 26.6ZM133.3 24.6C131.4 24.6 129.7 25.3 128.5 26.6L129.2 27.3C130.3 26.2 131.6 25.6 133.3 25.6V24.6ZM128.5 26.6C127.2 28.0 126.6 29.7 126.6 31.8H127.6C127.6 29.9 128.2 28.4 129.2 27.3L128.5 26.6ZM126.6 31.8C126.6 34.0 127.2 35.7 128.5 37.1L129.2 36.4C128.2 35.3 127.6 33.8 127.6 31.8H126.6ZM128.5 37.1C129.7 38.4 131.4 39.1 133.3 39.1V38.1C131.6 38.1 130.3 37.5 129.2 36.4L128.5 37.1ZM158.0 22.9H157.5V24.5L158.4 23.2L158.0 22.9ZM161.3 20.3L161.1 19.8L161.1 19.8L161.3 20.3ZM166.3 19.4H166.8V18.9H166.3V19.4ZM166.3 25.9L166.3 26.4L166.8 26.4V25.9H166.3ZM160.0 27.5L160.3 27.8L160.3 27.8L160.0 27.5ZM158.3 44V44.5H158.8V44H158.3ZM151.3 44H150.8V44.5H151.3V44ZM151.3 19.7V19.2H150.8V19.7H151.3ZM158.0 19.7H158.5V19.2H158.0V19.7ZM158.4 23.2C159.2 22.1 160.2 21.3 161.5 20.7L161.1 19.8C159.7 20.5 158.5 21.4 157.6 22.6L158.4 23.2ZM161.5 20.7C162.9 20.2 164.5 19.9 166.3 19.9V18.9C164.4 18.9 162.7 19.2 161.1 19.8L161.5 20.7ZM165.8 19.4V25.9H166.8V19.4H165.8ZM166.3 25.4C165.6 25.3 165.0 25.3 164.7 25.3V26.3C165.0 26.3 165.5 26.3 166.3 26.4L166.3 25.4ZM164.7 25.3C162.6 25.3 160.9 25.9 159.6 27.1L160.3 27.8C161.4 26.8 162.8 26.3 164.7 26.3V25.3ZM159.6 27.1C158.4 28.4 157.8 30.2 157.8 32.5H158.8C158.8 30.3 159.3 28.8 160.3 27.8L159.6 27.1ZM157.8 32.5V44H158.8V32.5H157.8ZM158.3 43.5H151.3V44.5H158.3V43.5ZM151.8 44V19.7H150.8V44H151.8ZM151.3 20.2H158.0V19.2H151.3V20.2ZM157.5 19.7V22.9H158.5V19.7H157.5ZM170.5 19.7V19.2H170.0V19.7H170.5ZM177.5 19.7H178.0V19.2H177.5V19.7ZM177.5 44V44.5H178.0V44H177.5ZM170.5 44H170.0V44.5H170.5V44ZM170.8 15.2L170.5 15.6V15.6L170.8 15.2ZM170.8 9.7L171.2 10.0V10.0L170.8 9.7ZM177.1 9.6L176.8 10.0L177.1 9.6ZM177.1 15.2L177.5 15.6L177.5 15.6L177.1 15.2ZM170.5 20.2H177.5V19.2H170.5V20.2ZM177.0 19.7V44H178.0V19.7H177.0ZM177.5 43.5H170.5V44.5H177.5V43.5ZM171.0 44V19.7H170.0V44H171.0ZM174.0 15.9C172.8 15.9 171.9 15.5 171.2 14.9L170.5 15.6C171.4 16.5 172.6 16.9 174.0 16.9V15.9ZM171.2 14.9C170.5 14.2 170.1 13.4 170.1 12.5H169.1C169.1 13.7 169.6 14.8 170.5 15.6L171.2 14.9ZM170.1 12.5C170.1 11.5 170.5 10.7 171.2 10.0L170.5 9.3C169.6 10.1 169.1 11.2 169.1 12.5H170.1ZM171.2 10.0C171.9 9.4 172.8 9.0 174.0 9.0V8.0C172.6 8.0 171.4 8.4 170.5 9.3L171.2 10.0ZM174.0 9.0C175.2 9.0 176.1 9.4 176.8 10.0L177.5 9.2C176.5 8.4 175.4 8.0 174.0 8.0V9.0ZM176.8 10.0C177.5 10.6 177.8 11.4 177.8 12.3H178.8C178.8 11.1 178.4 10.1 177.5 9.2L176.8 10.0ZM177.8 12.3C177.8 13.4 177.5 14.2 176.8 14.9L177.5 15.6C178.4 14.7 178.8 13.6 178.8 12.3H177.8ZM176.8 14.9C176.1 15.5 175.2 15.9 174.0 15.9V16.9C175.4 16.9 176.5 16.5 177.5 15.6L176.8 14.9ZM222.2 22.1L221.8 22.4L221.9 22.4L222.2 22.1ZM224.9 44V44.5H225.4V44H224.9ZM217.9 44H217.4V44.5H217.9V44ZM216.7 26.9L216.3 27.2L216.3 27.2L216.3 27.2L216.7 26.9ZM209.4 27.1L209.7 27.4L209.8 27.4L209.4 27.1ZM207.9 44V44.5H208.4V44H207.9ZM200.9 44H200.4V44.5H200.9V44ZM192.5 27.1L192.8 27.4L192.8 27.4L192.5 27.1ZM191.0 44V44.5H191.5V44H191.0ZM184.0 44H183.5V44.5H184.0V44ZM184.0 19.7V19.2H183.5V19.7H184.0ZM190.7 19.7H191.2V19.2H190.7V19.7ZM190.7 22.5H190.2V23.9L191.1 22.9L190.7 22.5ZM194.0 20.2L193.8 19.7L193.8 19.7L194.0 20.2ZM202.9 20.4L202.7 20.9L202.7 20.9L202.9 20.4ZM206.3 23.3L205.9 23.6L206.2 24.2L206.7 23.6L206.3 23.3ZM210.0 20.4L209.8 20.0L209.8 20.0L210.0 20.4ZM215.0 19.9C217.9 19.9 220.2 20.7 221.8 22.4L222.6 21.7C220.7 19.8 218.1 18.9 215.0 18.9V19.9ZM221.9 22.4C223.5 24.1 224.4 26.6 224.4 30.1H225.4C225.4 26.4 224.5 23.6 222.6 21.7L221.9 22.4ZM224.4 30.1V44H225.4V30.1H224.4ZM224.9 43.5H217.9V44.5H224.9V43.5ZM218.4 44V31.2H217.4V44H218.4ZM218.4 31.2C218.4 29.2 218.0 27.6 217.0 26.6L216.3 27.2C217.0 28.0 217.4 29.3 217.4 31.2H218.4ZM217.1 26.6C216.2 25.5 214.9 25.0 213.3 25.0V26.0C214.6 26.0 215.6 26.4 216.3 27.2L217.1 26.6ZM213.3 25.0C211.5 25.0 210.1 25.5 209.0 26.7L209.8 27.4C210.6 26.4 211.8 26.0 213.3 26.0V25.0ZM209.0 26.7C207.9 27.9 207.4 29.6 207.4 31.8H208.4C208.4 29.8 208.9 28.3 209.7 27.4L209.0 26.7ZM207.4 31.8V44H208.4V31.8H207.4ZM207.9 43.5H200.9V44.5H207.9V43.5ZM201.4 44V31.2H200.4V44H201.4ZM201.4 31.2C201.4 29.2 201.0 27.6 200.2 26.6C199.3 25.5 198.0 25.0 196.3 25.0V26.0C197.7 26.0 198.7 26.4 199.4 27.2C200.0 28.0 200.4 29.3 200.4 31.2H201.4ZM196.3 25.0C194.6 25.0 193.2 25.5 192.1 26.7L192.8 27.4C193.7 26.4 194.8 26.0 196.3 26.0V25.0ZM192.1 26.7C191.0 27.9 190.5 29.6 190.5 31.8H191.5C191.5 29.8 192.0 28.3 192.8 27.4L192.1 26.7ZM190.5 31.8V44H191.5V31.8H190.5ZM191.0 43.5H184.0V44.5H191.0V43.5ZM184.5 44V19.7H183.5V44H184.5ZM184.0 20.2H190.7V19.2H184.0V20.2ZM190.2 19.7V22.5H191.2V19.7H190.2ZM191.1 22.9C191.9 21.9 193.0 21.2 194.2 20.7L193.8 19.7C192.4 20.3 191.3 21.1 190.3 22.2L191.1 22.9ZM194.2 20.7C195.4 20.1 196.8 19.9 198.3 19.9V18.9C196.7 18.9 195.2 19.2 193.8 19.7L194.2 20.7ZM198.3 19.9C199.9 19.9 201.4 20.2 202.7 20.9L203.2 20.0C201.7 19.2 200.1 18.9 198.3 18.9V19.9ZM202.7 20.9C204.0 21.5 205.1 22.4 205.9 23.6L206.7 23.1C205.8 21.7 204.6 20.7 203.2 20.0L202.7 20.9ZM206.7 23.6C207.6 22.5 208.8 21.5 210.2 20.9L209.8 20.0C208.2 20.7 206.9 21.7 205.9 23.0L206.7 23.6ZM210.2 20.9C211.7 20.2 213.3 19.9 215.0 19.9V18.9C213.1 18.9 211.4 19.2 209.8 20.0L210.2 20.9ZM236.1 42.7L235.9 43.2L235.9 43.2L236.1 42.7ZM231.4 38.3L230.9 38.5L231.4 38.3ZM231.4 25.4L230.9 25.2L231.4 25.4ZM236.1 21.0L236.3 21.4L236.3 21.4L236.1 21.0ZM249.8 21.0L249.6 21.4L249.6 21.4L249.8 21.0ZM254.5 25.4L255.0 25.2L254.5 25.4ZM254.5 38.3L255.0 38.5L254.5 38.3ZM249.8 42.7L250.1 43.2L250.1 43.2L249.8 42.7ZM247.4 36.8L247.0 36.4L247.0 36.4L247.4 36.8ZM247.4 27.0L247.0 27.3L247.0 27.3L247.4 27.0ZM238.5 27.0L238.9 27.3L238.9 27.3L238.5 27.0ZM238.5 36.8L238.2 37.1L238.2 37.1L238.5 36.8ZM243.0 43.8C240.5 43.8 238.3 43.3 236.3 42.3L235.9 43.2C238.0 44.3 240.4 44.8 243.0 44.8V43.8ZM236.3 42.3C234.4 41.3 232.9 39.8 231.8 38.0L230.9 38.5C232.1 40.5 233.8 42.1 235.9 43.2L236.3 42.3ZM231.8 38.0C230.7 36.2 230.2 34.2 230.2 31.8H229.2C229.2 34.3 229.8 36.6 230.9 38.5L231.8 38.0ZM230.2 31.8C230.2 29.5 230.7 27.5 231.8 25.7L230.9 25.2C229.8 27.1 229.2 29.4 229.2 31.8H230.2ZM231.8 25.7C232.9 23.9 234.4 22.5 236.3 21.4L235.9 20.6C233.8 21.6 232.1 23.2 230.9 25.2L231.8 25.7ZM236.3 21.4C238.3 20.4 240.5 19.9 243.0 19.9V18.9C240.4 18.9 238.0 19.4 235.9 20.6L236.3 21.4ZM243.0 19.9C245.5 19.9 247.7 20.4 249.6 21.4L250.1 20.6C248.0 19.4 245.6 18.9 243.0 18.9V19.9ZM249.6 21.4C251.5 22.5 253.0 23.9 254.1 25.7L255.0 25.2C253.8 23.2 252.1 21.6 250.1 20.6L249.6 21.4ZM254.1 25.7C255.2 27.5 255.8 29.5 255.8 31.8H256.8C256.8 29.4 256.2 27.1 255.0 25.2L254.1 25.7ZM255.8 31.8C255.8 34.2 255.2 36.2 254.1 38.0L255.0 38.5C256.2 36.6 256.8 34.3 256.8 31.8H255.8ZM254.1 38.0C253.0 39.8 251.5 41.3 249.6 42.3L250.1 43.2C252.1 42.1 253.8 40.5 255.0 38.5L254.1 38.0ZM249.6 42.3C247.7 43.3 245.5 43.8 243.0 43.8V44.8C245.6 44.8 248.0 44.3 250.1 43.2L249.6 42.3ZM243.0 39.1C244.9 39.1 246.5 38.4 247.8 37.1L247.0 36.4C246.0 37.5 244.7 38.1 243.0 38.1V39.1ZM247.8 37.1C249.0 35.8 249.6 34.0 249.6 31.8H248.6C248.6 33.8 248.1 35.3 247.0 36.4L247.8 37.1ZM249.6 31.8C249.6 29.7 249.0 27.9 247.7 26.6L247.0 27.3C248.1 28.4 248.6 29.9 248.6 31.8H249.6ZM247.8 26.6C246.5 25.3 244.9 24.6 243.0 24.6V25.6C244.7 25.6 246.0 26.2 247.0 27.3L247.8 26.6ZM243.0 24.6C241.1 24.6 239.4 25.3 238.2 26.6L238.9 27.3C240.0 26.2 241.3 25.6 243.0 25.6V24.6ZM238.2 26.6C236.9 27.9 236.3 29.7 236.3 31.8H237.3C237.3 29.9 237.8 28.4 238.9 27.3L238.2 26.6ZM236.3 31.8C236.3 34.0 236.9 35.8 238.2 37.1L238.9 36.4C237.8 35.3 237.3 33.8 237.3 31.8H236.3ZM238.2 37.1C239.4 38.4 241.1 39.1 243.0 39.1V38.1C241.3 38.1 240.0 37.5 238.9 36.4L238.2 37.1Z" fill="%23343434"></path><defs><linearGradient id="paint0_linear" x1="14.5" y1="41.1" x2="33.6" y2="58.5" gradientUnits="userSpaceOnUse"><stop stop-color="%23EE4645"></stop><stop offset="1" stop-color="%23810707"></stop></linearGradient></defs></svg>'></a></li>
     <li><a href="https://www.artcompiler.com"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70.5 70.5"><path fill="%23fefefe" d="M64.4 114.7V79.5h70.5V150H64.4zm37.6 34.6-1.7-24.2v-.3h-1a9 9 0 0 1-1.7-.3 1079.2 1079.2 0 0 0-7.8 23.2l.8.3a35.6 35.6 0 0 0 11.4 1.3zm-18.5-7.7 3.4-1.9 1 .5a29 29 0 0 0 2.7 1.1l1.5-4.6-.7-.3a23.3 23.3 0 0 1 6.1-44.8v-2.4l-.3-2.4c0-.1-.3-.1-2 .1a27 27 0 0 0-7.2 2.3l-.9.4-3.4-1.9-3.5-1.9a38.4 38.4 0 0 0-9.1 9l-.3.5 2 3.4 2 3.4-.4 1a34 34 0 0 0-.8 1.8l-.3 1-3.9 1.2-3.8 1.1s-.3 1.2-.4 2.6a55.7 55.7 0 0 0 .4 10.7s1 .4 3.9 1.1l3.8 1 .3.8.7 1.7.3 1a432.5 432.5 0 0 1-3.9 6.7c0 .2.8 1.4 2 3a47.7 47.7 0 0 0 7.3 6.6l3.5-1.9zm21.6.3a25.8 25.8 0 0 0 6.8-2.2 1286.7 1286.7 0 0 0-7.8-15.6l-.7.1-1.3.4-.7.1v.4a1616.2 1616.2 0 0 0 1.3 17h.6l1.7-.2zm-10.5-12.4 1.8-5.5-.6-.3a10 10 0 0 1 2.3-18.9c.4 0 .6-.1.6-.2l-1-11.5h-1A21.8 21.8 0 0 0 79.7 122a22.3 22.3 0 0 0 13 13c.1 0 1-2.4 2-5.4zm17.4 4.7 2.6-1.8c1-.8 2.4-2.2 2.4-2.4l-3.6-3.2-4.8-4-1.2-1-.6.4a14.3 14.3 0 0 1-1.6 1.3 391 391 0 0 0 5.8 11.3l1-.6zm12.5-.7a31.1 31.1 0 0 0 4.7-8.8 337.7 337.7 0 0 0-19.6-6.3l-.4.6-.7 1.2-.4.6.3.2a2416.5 2416.5 0 0 1 15.5 13l.5-.5zm-22.7-10a8.6 8.6 0 0 0 4.6-2.5 8.6 8.6 0 0 0 2.6-6.3c0-1.2 0-1.5-.2-2.2-.4-1.6-1.1-2.9-2.2-4a8.9 8.9 0 0 0-8.7-2.6 9 9 0 0 0 4 17.6zm24.9-1.3a29.8 29.8 0 0 0 1-9c-.1-.1-2.5 0-8.6.5l-8.6.8h-.3v.8l-.2 1.4-.1.5 1 .3 15.6 5 .2-.4zm-4.7-9.8 12.1-1h.4v-.6a36.7 36.7 0 0 0-3.4-11.3l-21.6 11.1.2.8.3 1.4.2.6 11.8-1zm-6.5-6.2 4.6-2.4-1.2-2c-.8-1.1-1.8-2.4-2.8-3.3l-.8-.8-4 4.7-4 4.8c-.1.1-.1.2.4.8l.9 1.1.3.5 1-.5 5.6-2.9zm-3-7.1 6.7-7.8.3-.4-.8-.7a31 31 0 0 0-8.6-4.5l-6.3 19.5.8.4a11.1 11.1 0 0 1 1.6 1l6.4-7.5zm-6.1-5.8 3.6-11.6-1.4-.4a40.4 40.4 0 0 0-10.7-1l2 24.2h.7l1.2.2.7.1c.2 0 .6-1.2 3.9-11.5z" transform="translate(-64.4 -79.5)"/><path fill="%23efd1cf" d="M102.7 141.2v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm0-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm14.4-.5.6-.5-.5.5-.6.6.5-.6zm-14.4-.6v-.1.2zm-.1-1.1v-.1.2zm-.1-1.1v-.1.2zm0-1.1v-.1.2zm-.2-1.1v-.1.2zm-.4-2.2h.1-.1zm4.7-1.9v-.1c.2-.1.2-.1.1 0l-.2.1zm-12.1-.6-.4-.5.4.4.4.5-.4-.4zm33.9-3.8s0-.1 0 0v.1-.1zm0-1.2c0-.1.1-.1.1 0v.2-.2zm-49.2-.3s0-.1 0 0v.2-.1zm12.6-1.1v-.2.4-.2zm20.2-.3h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-42-.3c0-.1 0-.2.1-.1v.2-.1zm43 .1h.2-.1c-.1 0-.1 0 0 0zm6.3-.1v-.1.2-.1zm-5.3 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm-12.7-.1h.1-.1zm13.8 0h.1-.1zm-12.8 0c0-.1.1-.1.2 0h-.2v-.1zm13.8 0c0-.1.1-.1.2 0h-.2v-.1zm-12.8-.2h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.8 0h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.7-.1h.1-.1s-.1 0 0 0zm1-.1h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-23-4.6.4-.4-.4.4-.4.4s0-.2.3-.4zm14-.2c-.1-.2-.1-.2 0 0h.2c0 .1 0 .1-.2 0zm-2-.4.2.2-.1-.1zm2.1-1.2.1-.1c.2-.1.2-.1 0 0l-.1.1zm-6.8-.8h.2-.1c-.1 0-.1 0 0 0zm7.7-.3.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zm-8.6-.8h.4-.4zm9.6-.3.1-.1c.1-.1.1-.1 0 0 0 .2-.1.2-.1.1zm-11.1-.1v-.1.2-.1zm1-.6c0-.1.1-.1.1 0zm11-.4.1-.1c.2-.1.2-.1 0 0 0 .2-.1.2-.1.1zm-11-.6v-.1.2-.1zm12-.4v-.2h.1l-.2.2zm-12-.7v.2-.2zm12.9-.4.1-.2c.1 0 .1 0 0 0l-.1.2zm-13-.6v.1zm-1.2-.5v.1zm15.1 0 .1-.2c.2 0 .2 0 0 0l-.1.2zm-28.7-.6.3-.3-.2.3a2 2 0 0 1-.4.3l.3-.3zm32.3.2-.2-.2.2.1.2.2-.2-.2zm-18.8-.8c0-.1 0-.1 0 0v.1-.1zm-15.3 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm31.4-.2.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zM98.1 98c0-.1 0-.1 0 0zm-14-.1.2-.2-.2.2-.1.1v-.1zm13.9-1v.2-.1zm0-1v.2-.1zm1-.5c0-.1 0-.1 0 0zm0-1c0-.1 0-.2 0 0zm-.1-1v-.1.2-.2zm-1.3-.2h.1-.1zm1.2-.9v.2-.2zM74 91h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm2-1.9V89c.2-.1.2-.1.1 0l-.2.1zm22.2-2v.2-.1zm0-1v.2-.2zm-.1-1v.1zm-.1-1v.1zm4.5-3.7h.2-.1c-.1 0-.1 0 0 0zm-3.7 0h.5-.4zm1.9 0c.1-.1.3-.1.4 0h-.4z" transform="translate(-64.4 -79.5)"/><path fill="%23eac1b8" d="M98.3 149.3h.2-.2zm3.4 0h.2-.2zm-4.7-.1h.2-.1c-.1 0-.1 0 0 0zm4.9-.4c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.1v-.1.2-.1zm-.1-1.2c0-.1 0-.1 0 0zm1.3-.9v.1zm-1.4-.3s0-.1 0 0v.1-.1zm1.3-.8v.2-.2zm-1.4-.4v.1zm1.3-.6v-.1.2-.1zm-1.4-.5v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.6c0-.1 0-.1 0 0zm-1.3-.6c0-.1 0-.1 0 0zm1.2-.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm-1.3-.7s0-.1 0 0v.1-.1zm1.3-.4c0-.1 0-.1 0 0zm-1.4-.8v.1zm1.3-.3c0-.1 0-.1 0 0v.1-.1zm-1.4-.8v-.1.2-.1zm1.3-.3s0-.1 0 0v.1-.1zm-1.4-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.3 0v-.1.1zm-1.3-1.2s0-.1 0 0v.1zm1.2 0s0-.1 0 0c.1 0 .1 0 0 .1zm0-1v-.1.1zm-1.3-.2v.1zm-15.3-.3c0-.1 0-.1 0 0l.2.1-.2-.1zm16.5-.7v.1zm-1.3-.1c0-.1 0-.1 0 0zm-16.5-.6c-.1 0-.1 0 0 0l.2.2-.2-.2zm17.7-.4v.2-.2zm-1.3-.2c0-.1 0-.1 0 0v.1-.1zm1.2-.8v-.1.2-.1zm-1.3-.4c.1 0 .1.1 0 .1zm1.2-.7c0-.1 0-.1 0 0zm-1.3-.5c.1 0 .1.1 0 .2v-.2zm1.2-.6c0-.1 0-.1 0 0zm-1.2-.5-.4-.2h-.3.3l.4.1v.2-.1zm-1-1.4c.1 0 0 0 0 0-.1 0-.1 0 0 0zm-6.3-2a2 2 0 0 1-.3-.3l.4.4.3.4-.4-.4zm-28-4v.2-.1zm62.5-.8c.1 0 .1.1 0 .1zm-62.6-.4s0-.1 0 0v.2-.1zm11.8-.3s0-.1 0 0c.1 0 .1 0 0 .1zm51-.8v-.2.5-.3zm-18.7-.3v-.1.2-.1zm1.2-.3v-.2.4-.2zm.2-.4h.2-.2zm1 0h.2-.1c-.1 0-.2 0 0 0zm-2.4-.3v-.1.3-.2zm3.4.1h.2-.1c-.1 0-.1 0 0 0zm15.2-.3v-.1.4-.3zm-14.2.3h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm-46.8-.2s0-.1 0 0v.1-.1zm47.9 0h.1l-.1.1s-.1 0 0 0zm1 0h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-61.8-.4s0-.1 0 0v.1zm0-1.1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm32.5-23.1v-.1.2-.1zm0-1v-.1.2-.2z" transform="translate(-64.4 -79.5)"/><path fill="%23e0a39d" d="M98.7 149.3h.4-.4zm2.5 0h.3H101.2zm-4-.1h.3-.2zm4.7-.1v-.1.2-.1zm0-1.2v-.1.2-.1zm-.2-1.2c0-.1 0-.2 0 0v.1zm0-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm-.1-1.2v.1zm-.1-1.2v.1zm1.4-.1c0-.1 0-.1 0 0zm-1.5-1c0-.1 0-.1 0 0zm1.4-.1c0-.1 0-.1 0 0v.1-.1zm-1.5-1.1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.4 0c0-.1 0-.1 0 0v.1-.1zm0-1.1c0-.1 0-.1 0 0v.1-.1zm-1.4 0v-.1.1zm1.2-1.1s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-1.3-.2v.1zm1.2-.9s0-.1.1 0v.1zm-1.3-.2c0-.1 0-.2 0 0zm1.3-.9v.1zm-1.4-.3c0-.1 0-.1 0 0v.1-.1zm1.3-.8v.1zm-1.4-.4v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.7v.1zm-1.3-.5v-.1.2zm1.2-.6c.1 0 .1.1 0 .2v-.2zm-18.5-.6-.2-.3.2.3.3.2-.3-.2zm17.2 0s0-.1 0 0v.1zm1.2-.4c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm-17.2-.9-.5-.6.6.6.5.5-.5-.5zm15.9 0v.2-.1zm1.3-.2c0-.1 0-.2 0 0zm-1.4-.9v.1zm1.3-.2c0-.1 0-.1 0 0zm-1.4-1c.1 0 .1.1 0 .1zm1.3-.1c0-.1 0-.1 0 0zm-1.4-1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm1.3-.1c0-.1 0-.1 0 0v.1-.1zm-1.3-1.1c0-.1 0-.1 0 0v.1-.1zm1.2 0c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-2.2-.4h.2-.2zm.2-1.2h.2-.2zm1 0h.3-.2zm6.7-1.7.1-.1c.2-.1.2-.1 0 0l-.1.1zm-.8-.9.5-.4-.4.4-.4.4zm-41.3-2.5c.1 0 .1.1 0 .1zm0-1v.2-.1zm62.5-.8v.2-.2zm-50.8-.1c0-.1 0-.1 0 0v.1-.1zm-11.8-.3v-.1.2-.1zm26.1-.8s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-12.6-.3v-.2.4-.2zm31.8.1v.1zm-20.3-.7v-.3.6-.3zm37.7.1v-.1.4-.3zm-18.6 0v-.2.3-.1zm1.6-.2h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm-33.3-.4v-.2.4-.2zm34.4.3h.1-.1zm1 0h.1-.1zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.2 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-25.7-.2v.1zm26.7.1h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.2h.2-.1zm1 0h.2-.1zm1-.1h.2-.1zm-56.9-.3v-.1.3-.2zm58 .2h.2-.2zm1 0c0-.1.1-.1.2 0h-.1c-.1 0-.1 0 0 0zm-13.5-.2h.1-.1zm14.5 0h.2-.1c-.1 0-.1 0 0 0zm-13.5 0h.2-.2zm14.6 0h.1-.1s-.1 0 0 0zm-13.6-.1h.2-.1c-.1 0-.1 0 0 0zm14.6 0h.1-.1zm-50.2-.2v.1zm36.6 0h.2l-.1.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1s-.1 0 0 0zm1 0h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-27.3-3a2 2 0 0 1-.3-.4l.4.4.3.3-.4-.3zm1-.8c-.3-.2-.3-.2-.1-.4.1 0 .1 0 0 0l.1.4.2.3-.2-.3zm.3-.8v-.2h.1c0 .2-.2.2-.2.2zm-8.3-1h.2-.2zm1.1 0h.2-.2zm8-.1.2-.2c.2 0 .2 0 0 0l-.1.2zm-7.8-1.2h.2-.2zm8.8 0h.2c0-.2 0-.2 0 0-.1.1-.2.1-.2 0zm-10.9-.1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0zm12 0c.2-.2.2-.2.1 0-.1.1-.2.1-.2 0zm-10.8-.1s0-.1 0 0v.1-.1zm-1.3-1c.1 0 .1.1 0 .2v-.1zm1.2 0c0-.1 0-.1 0 0v.1-.1zm11.8 0h.1c.1-.2.1-.2 0 0 0 .1-.1.2-.1 0zm-13-1v.2-.1zm13.9 0 .1-.1c.2-.1.2-.1 0 0l-.1.1zm-14-1.3c0-.1 0-.2.1-.1v.2-.2zm1.2-.2c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm13.8 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm-13.9-1c0-.1 0-.1.1 0zm16.8-.6-.7-.7.7.7zm-2 .5.2-.2c.1 0 .1 0 0 0l-.1.2zm-14.8-1v.2-.2zm-15-.4.1-.2c.1 0 .1 0 0 0l-.1.2zM98 97v.1zm1.2 0V97v.2-.2zm-1.3-1s0-.1 0 0v.1zm1.2 0V96v.1zm-1.3-1s0-.1 0 0v.1-.1zm1.2 0V95v.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0V94v.1zm-1.4-3.2v.1zm1.2 0v-.1.2-.1zm-24.2-.4.3-.2-.2.2-.2.2.1-.2zm22.9-.6v.1zm1.2 0v-.1.2-.2zm-22.9-.6.3-.2-.2.2-.2.2.1-.2zm21.6-.4s0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm0-1.1s0-.1 0 0v.1-.1zm-.2-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-.2-3.1c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zm4.5-.4h.2-.2zm-2.5 0h.6-.6z" transform="translate(-64.4 -79.5)"/><path fill="%23d6836c" d="m102.8 142.2-1.3-17v-.4l.4-.1 1.2-.3.9-.3a174 174 0 0 1 7.9 15.6 29.9 29.9 0 0 1-9.1 2.5zM76 140.4l-.1-.2.1.2.2.2-.2-.2zm-1.7-1.7c-.1-.1-.1-.1 0 0 .2 0 .2.1.1.1l-.1-.1zm9.6-7-.2-.3.3.2.2.3-.3-.2zm31.7-.2.1-.2v.2l-.3.1.2-.1zm-32.6-.7-.1-.2.2.2.1.2-.2-.2zm33.8-.5.1-.2c.1 0 .1 0 0 0l-.1.2zM99 123.6a9 9 0 0 1-7.8-6.9 9 9 0 0 1 4.9-10.1 9 9 0 0 1 11.3 13.1 9.3 9.3 0 0 1-8.4 3.9zm19-3.8-8.1-2.5v-.6a13 13 0 0 0 .3-2.1l16.8-1.4h.5v1.5a26.9 26.9 0 0 1-1.2 7.7l-8.3-2.5zm-11.2 2.4.2-.2-.1.2-.2.1.1-.1zm-28.5-5.7c0-.1 0-.1 0 0 .1 0 .1 0 0 0zm11.6-1.2c0-.1 0-.1 0 0zm-11.6-.6v-.2.3-.1zM90 114v-.1.2-.1zm20.1-.7v-.1h.1v.1zm1 0h.2-.2zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-35.7-.2c0-.1 0-.1 0 0zm36.7 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm-19.7-2.7-.9-1.1c-.4-.6-.5-.6-.4-.8.1 0 2-2.2 4-4.8l4-4.6 1 1a22.8 22.8 0 0 1 3.7 5l-11 5.7c-.1 0-.3-.1-.4-.4zm-16-1.3.3-.3.3-.2-.2.2-.3.3zm7.2-3.8v.1zm-1.3-.4s0-.1 0 0v.1zm1.2-.6v.1zm-1.3-.4s0-.1 0 0v.1-.1zm1.2-.6s0-.1 0 0v.1zm0-1s0-.1 0 0v.1-.1zM84 99.9l.2-.2v.2l-.3.1.1-.1zm14-.5s0-.1.1 0v.1-.1zm-12.9-.6.2-.2v.2l-.3.1.1-.1zm12.9-.4c0-.1 0-.1 0 0v.1-.1zm1.1-.6s0-.1.1 0v.1-.1zm-1.2-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0v.1-.1zm-1.3-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.4c0-.1 0-.2 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.5v.2-.2zm1.2-.5c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zM75.1 90l.4-.4-.3.4-.4.3zm23.5-.4c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm0-1v-.1.2-.2zm-.1-1v-.1.1zm-.1-1v-.1.1zm-.2-3.2h.2c.2-.1.2 0 0 0H98c0 .1 0 .1 0 0zm5.3 0h.1-.1zm-1.2 0c0-.1.1-.1.2 0h-.2z" transform="translate(-64.4 -79.5)"/><path fill="%23c85d4b" d="M99.6 149.3zm-2-.1h.1-.1s-.1 0 0 0zm4.2-1c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm0-1.2v.1zm7.2-6-2.9-5.5.5-.4 1-.8.6-.5.2.2a1242.5 1242.5 0 0 0 9.2 7.7l.3.3-.9.8a24.8 24.8 0 0 1-5.2 3.9l-2.8-5.6zm-7.4 4.8c.1 0 .1.1 0 .1zm0-1.1c0-.1 0-.2 0 0zm-.1-1.2c0-.1 0-.1 0 0zm-15-.8c-.1-.1-.1-.1 0 0l.1.1h-.1zm14.9-.4s0-.1 0 0v.1zm-.1-1.2v.1zm-16.6-.2c-.1 0-.1 0 0 0 .2.1.2.2.1.2l-.1-.1zm16.5-1v.2-.2zm0-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zM65 117.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm0-2v-.3.6-.3zm11.7-.6v-.5a15.7 15.7 0 0 1 0 .5zm-11.7-.6v-.3.6-.3zm0-2c.1 0 .1.1 0 .1zm28.2-5h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm-8.5-8 .4-.3-.4.4-.4.3zm12.8-8.1c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0z" transform="translate(-64.4 -79.5)"/><path fill="%23c5523e" d="m75.2 139.6-.7-.7.7.6.7.8-.7-.7zm16.6-5A22 22 0 0 1 79 119.9c-.6-2.2-.8-5.2-.6-7.4.5-4.9 2.6-9.3 6-12.9a21.3 21.3 0 0 1 13.1-6.4l1 11.1c0 .3 0 .3-.7.5a10 10 0 0 0-2.2 18.9l.6.3-3.6 11-1-.5zm-7.5-2.6c-.1-.1-.1-.1 0 0l.1.1-.1-.1zm-1.6-1.5c0-.2 0-.2 0 0h.2c0 .1 0 .1-.2 0zm27.4-17.4c-.1-.9-.3-1.5-.5-2l-.2-.4 10.8-5.6 10.9-5.5a30.3 30.3 0 0 1 2.8 8.3l.5 3.2v.2l-12 1-12.2 1v-.2zm-8-8.4-1.3-.2h-1v-.5L98 80.4h2.3a29 29 0 0 1 9.6 1.3l-3.4 11-3.7 11.5-.2.6zm-18.6-6.5.4-.3-.4.4-.4.3z" transform="translate(-64.4 -79.5)"/><path fill="%23b4111a" d="M97 149.1a39 39 0 0 1-7.2-1.4l3.8-11.6 3.9-11.6.5.2 1.3.1c.7 0 .9.1.9.2a5523.8 5523.8 0 0 0 1.7 24c0 .2-.2.2-2 .2H97zM79 143a37.9 37.9 0 0 1-7.7-8c-.5-.7-.6-.8-.5-1a155.3 155.3 0 0 1 3.8-6.8l-.4-1a38.9 38.9 0 0 1-1-2.4l-3.6-1-3.7-1h-.3l-.2-1.2a32.9 32.9 0 0 1 0-10.9l.1-1.2.6-.2a395.4 395.4 0 0 1 7-2l.5-1 .8-2 .4-1-2-3.4-2-3.4.5-.7A35.8 35.8 0 0 1 80 86l3.6 1.9 3.5 2 .8-.5a28.5 28.5 0 0 1 9.2-2.5 33.8 33.8 0 0 1 .4 4.4c0 .4 0 .4-.3.4l-3 .5a23.4 23.4 0 0 0-2.2 44.6l-1.5 4.5-2.8-1.1-.8-.4-3.5 1.9c-1.9 1-3.4 1.9-3.4 2l-1-.7zm37.2-15.3-7.8-6.6-.2-.2.4-.5.6-1.2.3-.6 19.6 6.2a27 27 0 0 1-5.1 9.3l-7.8-6.4zm-10.5-21.4-1.9-1a1150.6 1150.6 0 0 1 6.4-19.4 28.3 28.3 0 0 1 9 4.8l.2.3-6.6 7.7a866 866 0 0 1-6.6 7.9l-.5-.3z" transform="translate(-64.4 -79.5)"/></svg>'> ARTCOMPILER</a></li>
+    <li><a href="https://www.prisma.io"><img alt="Prisma" src='data:image/svg+xml;utf8,<svg width="90" height="29" viewBox="0 0 90 29" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M0.2 19.5C-0.0 19.0 -0.0 18.5 0.1 18.0L10.3 1.5C10.8 0.6 12.2 0.7 12.7 1.6L21.9 21.7C22.3 22.5 21.9 23.3 21.1 23.6L6.7 27.9C6.1 28.1 5.5 27.8 5.1 27.3L0.2 19.5ZM11.4 6.3C11.5 5.9 12.2 5.8 12.4 6.2L18.8 21.0C18.9 21.3 18.8 21.6 18.5 21.7L8.5 24.7C8.2 24.8 7.8 24.5 7.9 24.1L11.4 6.3ZM48.4 21.6H51.3V11.2H48.4V21.6ZM48.3 8.5C48.3 7.6 48.8 7.2 49.9 7.2C50.9 7.2 51.4 7.6 51.4 8.5C51.4 9.0 51.3 9.3 51.0 9.6C50.8 9.8 50.4 9.9 49.9 9.9C48.8 9.9 48.3 9.5 48.3 8.5ZM87.1 16.8L86.0 16.8C85.2 16.8 84.6 17.0 84.2 17.3C83.8 17.5 83.6 18.0 83.6 18.5C83.6 19.3 84.0 19.7 85.0 19.7C85.6 19.7 86.1 19.5 86.5 19.1C86.9 18.8 87.1 18.3 87.1 17.6V16.8ZM88.0 21.6L87.4 20.2H87.3C86.9 20.8 86.4 21.2 85.9 21.4C85.4 21.7 84.7 21.8 83.9 21.8C82.9 21.8 82.1 21.5 81.5 20.9C81.0 20.4 80.7 19.5 80.7 18.5C80.7 17.4 81.1 16.6 81.8 16.1C82.6 15.5 83.8 15.2 85.3 15.2L87.1 15.1V14.7C87.1 13.6 86.6 13.1 85.5 13.1C84.7 13.1 83.7 13.4 82.6 13.9L81.7 11.9C82.8 11.3 84.2 11.0 85.6 11.0C87.0 11.0 88.1 11.3 88.8 11.9C89.6 12.5 89.9 13.4 89.9 14.7V21.6H88.0ZM72.4 21.6H69.6V15.5C69.6 14.8 69.5 14.2 69.2 13.9C69.0 13.5 68.6 13.3 68.0 13.3C67.3 13.3 66.8 13.6 66.5 14.1C66.1 14.6 66.0 15.5 66.0 16.7V21.6H63.1V11.2H65.3L65.7 12.5H65.8C66.1 12.1 66.5 11.7 67.1 11.4C67.6 11.2 68.2 11.0 68.9 11.0C70.4 11.0 71.5 11.5 72.0 12.5H72.3C72.5 12.1 73.0 11.7 73.5 11.4C74.0 11.2 74.6 11.0 75.3 11.0C76.5 11.0 77.4 11.3 78.0 11.9C78.6 12.5 78.9 13.5 78.9 14.8V21.6H76.1V15.5C76.1 14.8 75.9 14.2 75.7 13.9C75.4 13.5 75.0 13.3 74.5 13.3C73.8 13.3 73.3 13.5 72.9 14.0C72.6 14.5 72.4 15.3 72.4 16.4V21.6ZM60.1 20.9C60.9 20.4 61.2 19.6 61.2 18.5C61.2 18.0 61.1 17.6 61.0 17.2C60.8 16.8 60.5 16.5 60.1 16.2C59.7 15.9 59.2 15.6 58.3 15.3C57.4 14.9 56.8 14.6 56.6 14.5C56.3 14.3 56.2 14.1 56.2 13.8C56.2 13.3 56.6 13.1 57.4 13.1C57.9 13.1 58.4 13.2 58.8 13.3C59.3 13.5 59.7 13.7 60.3 13.9L61.1 11.8C59.9 11.3 58.7 11.0 57.5 11.0C56.2 11.0 55.2 11.3 54.4 11.8C53.7 12.3 53.4 13.0 53.4 13.9C53.4 14.5 53.5 14.9 53.6 15.3C53.8 15.6 54.1 16.0 54.4 16.3C54.8 16.5 55.4 16.9 56.2 17.2C56.8 17.4 57.2 17.6 57.5 17.8C57.9 18.0 58.1 18.1 58.2 18.3C58.4 18.4 58.4 18.6 58.4 18.8C58.4 19.4 57.9 19.7 56.9 19.7C56.4 19.7 55.8 19.6 55.2 19.5C54.5 19.3 53.9 19.1 53.4 18.8V21.2C53.8 21.4 54.3 21.5 54.9 21.6C55.4 21.7 56.1 21.8 56.8 21.8C58.3 21.8 59.4 21.5 60.1 20.9ZM46.9 11.1C46.7 11.1 46.4 11.0 46.0 11.0C45.3 11.0 44.8 11.2 44.2 11.6C43.7 11.9 43.2 12.4 42.9 13.0H42.8L42.3 11.2H40.2V21.6H43.0V16.3C43.0 15.5 43.3 14.8 43.8 14.4C44.3 13.9 45.0 13.7 45.9 13.7C46.2 13.7 46.5 13.7 46.7 13.8L46.9 11.1ZM31.9 14.4H32.8C33.7 14.4 34.4 14.2 34.8 13.9C35.3 13.5 35.5 13.0 35.5 12.4C35.5 11.7 35.3 11.2 34.9 10.9C34.6 10.5 34.0 10.4 33.2 10.4H31.9V14.4ZM38.4 12.3C38.4 13.7 37.9 14.8 37.0 15.6C36.1 16.4 34.8 16.8 33.1 16.8H31.9V21.6H29.0V8.0H33.3C35.0 8.0 36.2 8.4 37.1 9.1C37.9 9.8 38.4 10.9 38.4 12.3Z" fill="black"></path></svg>'></a>
   </ul>
 </section>
 

From 8a25b2379a5f826981cfcb5daf4825c2bc611f52 Mon Sep 17 00:00:00 2001
From: Erik Welander <ewelander@google.com>
Date: Fri, 10 Sep 2021 15:16:22 -0700
Subject: [PATCH 4545/4742] Fix 0-width fat cursor at EOL

In particular the fat cursor would be invisible on empty lines.
---
 src/display/selection.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/display/selection.js b/src/display/selection.js
index 8ce109b240..78cea58eef 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -39,7 +39,9 @@ export function drawSelectionCursor(cm, head, output) {
 
   if (/\bcm-fat-cursor\b/.test(cm.getWrapperElement().className)) {
     let charPos = charCoords(cm, head, "div", null, null)
-    cursor.style.width = Math.max(0, charPos.right - charPos.left) + "px"
+    if (charPos.right - charPos.left > 0) {
+      cursor.style.width = (charPos.right - charPos.left) + "px"
+    }
   }
 
   if (pos.other) {

From ad1de629c9460e05a184a7e0eca8ac276d8ce3d4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 14 Sep 2021 21:10:42 +0200
Subject: [PATCH 4546/4742] [xml mode] Lookup HTML tag properties in a
 cast-insensitive way

Closes #6779
---
 mode/xml/xml.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 46806ac425..0bdfe7b50f 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -205,8 +205,8 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
         return;
       }
       parentTagName = state.context.tagName;
-      if (!config.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
+      if (!config.contextGrabbers.hasOwnProperty(parentTagName.toLowerCase()) ||
+          !config.contextGrabbers[parentTagName.toLowerCase()].hasOwnProperty(nextTagName.toLowerCase())) {
         return;
       }
       popContext(state);
@@ -240,7 +240,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
     if (type == "word") {
       var tagName = stream.current();
       if (state.context && state.context.tagName != tagName &&
-          config.implicitlyClosed.hasOwnProperty(state.context.tagName))
+          config.implicitlyClosed.hasOwnProperty(state.context.tagName.toLowerCase()))
         popContext(state);
       if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) {
         setStyle = "tag";
@@ -279,7 +279,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
       var tagName = state.tagName, tagStart = state.tagStart;
       state.tagName = state.tagStart = null;
       if (type == "selfcloseTag" ||
-          config.autoSelfClosers.hasOwnProperty(tagName)) {
+          config.autoSelfClosers.hasOwnProperty(tagName.toLowerCase())) {
         maybePopContext(state, tagName);
       } else {
         maybePopContext(state, tagName);
@@ -359,7 +359,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
           if (context.tagName == tagAfter[2]) {
             context = context.prev;
             break;
-          } else if (config.implicitlyClosed.hasOwnProperty(context.tagName)) {
+          } else if (config.implicitlyClosed.hasOwnProperty(context.tagName.toLowerCase())) {
             context = context.prev;
           } else {
             break;
@@ -367,8 +367,8 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
         }
       } else if (tagAfter) { // Opening tag spotted
         while (context) {
-          var grabbers = config.contextGrabbers[context.tagName];
-          if (grabbers && grabbers.hasOwnProperty(tagAfter[2]))
+          var grabbers = config.contextGrabbers[context.tagName.toLowerCase()];
+          if (grabbers && grabbers.hasOwnProperty(tagAfter[2].toLowerCase()))
             context = context.prev;
           else
             break;

From eff5c9e7e7ed2f195416717c3f31e3f0b0c457cd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 15 Sep 2021 08:14:15 +0200
Subject: [PATCH 4547/4742] [xml mode] Fix crash when tagName is null

---
 mode/xml/xml.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 0bdfe7b50f..4e36106b49 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -187,6 +187,10 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
     };
   }
 
+  function lower(tagName) {
+    return tagName && tagName.toLowerCase();
+  }
+
   function Context(state, tagName, startOfLine) {
     this.prev = state.context;
     this.tagName = tagName || "";
@@ -205,8 +209,8 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
         return;
       }
       parentTagName = state.context.tagName;
-      if (!config.contextGrabbers.hasOwnProperty(parentTagName.toLowerCase()) ||
-          !config.contextGrabbers[parentTagName.toLowerCase()].hasOwnProperty(nextTagName.toLowerCase())) {
+      if (!config.contextGrabbers.hasOwnProperty(lower(parentTagName)) ||
+          !config.contextGrabbers[lower(parentTagName)].hasOwnProperty(lower(nextTagName))) {
         return;
       }
       popContext(state);
@@ -240,7 +244,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
     if (type == "word") {
       var tagName = stream.current();
       if (state.context && state.context.tagName != tagName &&
-          config.implicitlyClosed.hasOwnProperty(state.context.tagName.toLowerCase()))
+          config.implicitlyClosed.hasOwnProperty(lower(state.context.tagName)))
         popContext(state);
       if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) {
         setStyle = "tag";
@@ -279,7 +283,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
       var tagName = state.tagName, tagStart = state.tagStart;
       state.tagName = state.tagStart = null;
       if (type == "selfcloseTag" ||
-          config.autoSelfClosers.hasOwnProperty(tagName.toLowerCase())) {
+          config.autoSelfClosers.hasOwnProperty(lower(tagName))) {
         maybePopContext(state, tagName);
       } else {
         maybePopContext(state, tagName);
@@ -359,7 +363,7 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
           if (context.tagName == tagAfter[2]) {
             context = context.prev;
             break;
-          } else if (config.implicitlyClosed.hasOwnProperty(context.tagName.toLowerCase())) {
+          } else if (config.implicitlyClosed.hasOwnProperty(lower(context.tagName))) {
             context = context.prev;
           } else {
             break;
@@ -367,8 +371,8 @@ CodeMirror.defineMode("xml", function(editorConf, config_) {
         }
       } else if (tagAfter) { // Opening tag spotted
         while (context) {
-          var grabbers = config.contextGrabbers[context.tagName.toLowerCase()];
-          if (grabbers && grabbers.hasOwnProperty(tagAfter[2].toLowerCase()))
+          var grabbers = config.contextGrabbers[lower(context.tagName)];
+          if (grabbers && grabbers.hasOwnProperty(lower(tagAfter[2])))
             context = context.prev;
           else
             break;

From ceb65a69f910feda36a67b35c217bbee9050f4d8 Mon Sep 17 00:00:00 2001
From: johnspiegel <johnbspiegel@gmail.com>
Date: Thu, 16 Sep 2021 23:10:55 -0700
Subject: [PATCH 4548/4742] [solarized theme] Remove text-shadow

The text drop shadow unnecessarily makes text slightly blurry.
---
 theme/solarized.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/theme/solarized.css b/theme/solarized.css
index 9c6b1265c1..e978fec9b0 100644
--- a/theme/solarized.css
+++ b/theme/solarized.css
@@ -35,12 +35,10 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized.cm-s-dark {
   color: #839496;
   background-color: #002b36;
-  text-shadow: #002b36 0 1px;
 }
 .cm-s-solarized.cm-s-light {
   background-color: #fdf6e3;
   color: #657b83;
-  text-shadow: #eee8d5 0 1px;
 }
 
 .cm-s-solarized .CodeMirror-widget {
@@ -126,7 +124,6 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 
 .cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
   color: #586e75;
-  text-shadow: #021014 0 -1px;
 }
 
 /* Light */

From c3d3d47bf9f820f1adcab0a60d84afcad6afb23a Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 16 Sep 2021 18:41:40 +0400
Subject: [PATCH 4549/4742] [vim] add support for guu

---
 keymap/vim.js    | 10 +++++++++-
 test/vim_test.js | 13 ++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index c5210c9c9c..ee69954943 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -951,7 +951,12 @@
           if (!keysMatcher) { clearInputState(cm); return false; }
           var context = vim.visualMode ? 'visual' :
                                          'normal';
-          var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
+          var mainKey = keysMatcher[2] || keysMatcher[1];
+          if (vim.inputState.operatorShortcut && vim.inputState.operatorShortcut.slice(-1) == mainKey) {
+            // multikey operators act linewise by repeating only the last character
+            mainKey = vim.inputState.operatorShortcut;
+          }
+          var match = commandDispatcher.matchCommand(mainKey, defaultKeymap, vim.inputState, context);
           if (match.type == 'none') { clearInputState(cm); return false; }
           else if (match.type == 'partial') { return true; }
 
@@ -1311,6 +1316,9 @@
         }
         inputState.operator = command.operator;
         inputState.operatorArgs = copyArgs(command.operatorArgs);
+        if (command.keys.length > 1) {
+          inputState.operatorShortcut = command.keys;
+        }
         if (command.exitVisualBlock) {
             vim.visualBlock = false;
             updateCmSelection(cm);
diff --git a/test/vim_test.js b/test/vim_test.js
index 20eabf5c94..a5609f5b2e 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1232,12 +1232,19 @@ testVim('gu_and_gU', function(cm, vim, helpers) {
   eq(cm.getValue(), 'wa wb Xx wc wd');
   eqCursorPos(makeCursor(0, 3), cm.getCursor());
 
-  // TODO: support gUgU guu
-  // eqCursorPos(makeCursor(0, 0), cm.getCursor());
-
   var register = helpers.getRegisterController().getRegister();
   eq('', register.toString());
   is(!register.linewise);
+  
+  cm.setCursor(curStart);
+  cm.setValue('abc efg\nxyz');
+  helpers.doKeys('g', 'U', 'g', 'U');
+  eq(cm.getValue(), 'ABC EFG\nxyz');
+  helpers.doKeys('g', 'u', 'u');
+  eq(cm.getValue(), 'abc efg\nxyz');
+  eqCursorPos(makeCursor(0, 0), cm.getCursor());
+  helpers.doKeys('g', 'U', '2', 'U');
+  eq(cm.getValue(), 'ABC EFG\nXYZ');
 }, { value: 'wa wb xx wc wd' });
 testVim('visual_block_~', function(cm, vim, helpers) {
   cm.setCursor(1, 1);

From 73a5c219afb76f4bb813cce794d29a7b6a1ad500 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Sep 2021 13:57:34 +0200
Subject: [PATCH 4550/4742] Mark version 5.63.0

---
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  7 +++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b0b4c114e..e7bbedc45f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.63.0 (2021-09-20)
+
+### Bug fixes
+
+Fix scroll position jumping when scrolling a document with very different line heights.
+
+[xml mode](https://codemirror.net/mode/xml/): Look up HTML element behavior in a case-insensitive way.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Support guu for case-changing.
+
 ## 5.62.3 (2021-08-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index ab335fbcaa..b3f6242161 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.62.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.63.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 57da64bbfc..2db2871bf7 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,13 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-09-2021: <a href="https://codemirror.net/codemirror-5.63.0.zip">Version 5.63.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix scroll position jumping when scrolling a document with very different line heights.</li>
+    <li><a href="https://codemirror.net/mode/xml/">xml mode</a>: Look up HTML element behavior in a case-insensitive way.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support guu for case-changing.</li>
+  </ul>
 
   <p class="rel">20-08-2021: <a href="https://codemirror.net/codemirror-5.62.3.zip">Version 5.62.3</a>:</p>
 
diff --git a/index.html b/index.html
index 28bb43c4f5..f9052daac9 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.62.3</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.63.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index ae293acd9c..424d72287b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.62.3",
+  "version": "5.63.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index aae3d6b4e4..5fe6dc9b1c 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.62.3"
+CodeMirror.version = "5.63.0"

From 3ddd828e6e0009f1ae8d2333d98d2af15a107475 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 29 Sep 2021 17:51:08 +0200
Subject: [PATCH 4551/4742] Use WheelEvent.deltaMode when available and 0

Works around a regression on Chrome 94, where non-linear scrolling greatly
confused the wheel unit estimation code.

See https://discuss.codemirror.net/t/scrolling-is-badly-impacted-by-chrome-94-0-4606-61/3567/3
---
 src/display/scroll_events.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index fbed426637..1984e699c5 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -41,6 +41,12 @@ export function wheelEventPixels(e) {
 
 export function onScrollWheel(cm, e) {
   let delta = wheelEventDelta(e), dx = delta.x, dy = delta.y
+  let pixelsPerUnit = wheelPixelsPerUnit
+  if (event.deltaMode === 0) {
+    dx = e.deltaX
+    dy = e.deltaY
+    pixelsPerUnit = 1
+  }
 
   let display = cm.display, scroll = display.scroller
   // Quit if there's nothing to scroll here
@@ -69,10 +75,10 @@ export function onScrollWheel(cm, e) {
   // estimated pixels/delta value, we just handle horizontal
   // scrolling entirely here. It'll be slightly off from native, but
   // better than glitching out.
-  if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
+  if (dx && !gecko && !presto && pixelsPerUnit != null) {
     if (dy && canScrollY)
-      updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * wheelPixelsPerUnit))
-    setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * wheelPixelsPerUnit))
+      updateScrollTop(cm, Math.max(0, scroll.scrollTop + dy * pixelsPerUnit))
+    setScrollLeft(cm, Math.max(0, scroll.scrollLeft + dx * pixelsPerUnit))
     // Only prevent default scrolling if vertical scrolling is
     // actually possible. Otherwise, it causes vertical scroll
     // jitter on OSX trackpads when deltaX is small and deltaY
@@ -85,15 +91,15 @@ export function onScrollWheel(cm, e) {
 
   // 'Project' the visible viewport to cover the area that is being
   // scrolled into view (if we know enough to estimate it).
-  if (dy && wheelPixelsPerUnit != null) {
-    let pixels = dy * wheelPixelsPerUnit
+  if (dy && pixelsPerUnit != null) {
+    let pixels = dy * pixelsPerUnit
     let top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight
     if (pixels < 0) top = Math.max(0, top + pixels - 50)
     else bot = Math.min(cm.doc.height, bot + pixels + 50)
     updateDisplaySimple(cm, {top: top, bottom: bot})
   }
 
-  if (wheelSamples < 20) {
+  if (wheelSamples < 20 && e.deltaMode !== 0) {
     if (display.wheelStartX == null) {
       display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop
       display.wheelDX = dx; display.wheelDY = dy

From ccdcd15d203a931bbbeb4ca723e379bd5cf2331b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 29 Sep 2021 17:55:48 +0200
Subject: [PATCH 4552/4742] Mark version 5.63.1

---
 AUTHORS           | 1 +
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7ff59c6f78..6c953de73f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -431,6 +431,7 @@ John Engler
 John Lees-Miller
 John Ryan
 John Snelson
+johnspiegel
 John Van Der Loo
 Jon Ander Peñalba
 Jonas Döbertin
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7bbedc45f..7ced85d692 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.63.1 (2021-09-29)
+
+### Bug fixes
+
+Fix an issue with mouse scrolling on Chrome 94 Windows, which made scrolling by wheel move unusably slow.
+
 ## 5.63.0 (2021-09-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index b3f6242161..203bc16440 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.63.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.63.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 2db2871bf7..10c4f84608 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">29-09-2021: <a href="https://codemirror.net/codemirror-5.63.1.zip">Version 5.63.1</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix an issue with mouse scrolling on Chrome 94 Windows, which made scrolling by wheel move unusably slow.</li>
+  </ul>
+
   <p class="rel">20-09-2021: <a href="https://codemirror.net/codemirror-5.63.0.zip">Version 5.63.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index f9052daac9..b3ea486c25 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.63.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.63.1</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 424d72287b..e727b4bf49 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.63.0",
+  "version": "5.63.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 5fe6dc9b1c..93adf96205 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.63.0"
+CodeMirror.version = "5.63.1"

From 47e850575ea314f768ca8539de54ab7a6d8f3779 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 29 Sep 2021 17:59:29 +0200
Subject: [PATCH 4553/4742] Fix invalid variable reference

---
 src/display/scroll_events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index 1984e699c5..5c6173ac47 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -42,7 +42,7 @@ export function wheelEventPixels(e) {
 export function onScrollWheel(cm, e) {
   let delta = wheelEventDelta(e), dx = delta.x, dy = delta.y
   let pixelsPerUnit = wheelPixelsPerUnit
-  if (event.deltaMode === 0) {
+  if (e.deltaMode === 0) {
     dx = e.deltaX
     dy = e.deltaY
     pixelsPerUnit = 1

From e22cfa7fd31d936ee2581756db86aa6582c330c0 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Thu, 7 Oct 2021 08:01:18 +0200
Subject: [PATCH 4554/4742] [nsis mode] Add NSIS 3.08 commands (#6791)

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 636940f502..2b1c5fb987 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -24,14 +24,14 @@ CodeMirror.defineSimpleMode("nsis",{
     { regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
 
     // Compile Time Commands
-    {regex: /^\s*(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|pragma|finalize|getdllversion|gettlbversion|system|tempfile|warning|verbose|define|undef|insertmacro|macro|macroend|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+    {regex: /^\s*(?:\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|error|execute|finalize|getdllversion|gettlbversion|include|insertmacro|macro|macroend|makensis|packhdr|pragma|searchparse|searchreplace|system|tempfile|undef|uninstfinalize|verbose|warning))\b/, token: "keyword"},
 
     // Conditional Compilation
     {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetKnownFolderPath|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfRtlLanguage|IfShellVarContextAll|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetKnownFolderPath|GetLabelAddress|GetTempFileName|GetWinVer|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfRtlLanguage|IfShellVarContextAll|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
     {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
     {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
 

From 5f8d6c45436fd9050015611eb8fbe4bee88596ee Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 21 Sep 2021 22:55:24 +0400
Subject: [PATCH 4555/4742] [vim] remove hack for handling $ in substitute
 pattern

---
 addon/search/searchcursor.js | 31 ++++++++++++++++++++-----------
 keymap/vim.js                | 27 ++++++++++++++++++---------
 test/vim_test.js             | 31 +++++++++++++++++++++++++++++--
 3 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index d586957887..230017b781 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -202,6 +202,7 @@
 
   function SearchCursor(doc, query, pos, options) {
     this.atOccurrence = false
+    this.afterEmptyMatch = false
     this.doc = doc
     pos = pos ? doc.clipPos(pos) : Pos(0, 0)
     this.pos = {from: pos, to: pos}
@@ -237,21 +238,29 @@
     findPrevious: function() {return this.find(true)},
 
     find: function(reverse) {
-      var result = this.matches(reverse, this.doc.clipPos(reverse ? this.pos.from : this.pos.to))
-
-      // Implements weird auto-growing behavior on null-matches for
-      // backwards-compatibility with the vim code (unfortunately)
-      while (result && CodeMirror.cmpPos(result.from, result.to) == 0) {
+      var head = this.doc.clipPos(reverse ? this.pos.from : this.pos.to);
+      if (this.afterEmptyMatch && this.atOccurrence) {
+        // do not return the same 0 width match twice
+        head = Pos(head.line, head.ch)
         if (reverse) {
-          if (result.from.ch) result.from = Pos(result.from.line, result.from.ch - 1)
-          else if (result.from.line == this.doc.firstLine()) result = null
-          else result = this.matches(reverse, this.doc.clipPos(Pos(result.from.line - 1)))
+          head.ch--;
+          if (head.ch < 0) {
+            head.line--;
+            head.ch = (this.doc.getLine(head.line) || "").length;
+          }
         } else {
-          if (result.to.ch < this.doc.getLine(result.to.line).length) result.to = Pos(result.to.line, result.to.ch + 1)
-          else if (result.to.line == this.doc.lastLine()) result = null
-          else result = this.matches(reverse, Pos(result.to.line + 1, 0))
+          head.ch++;
+          if (head.ch > (this.doc.getLine(head.line) || "").length) {
+            head.ch = 0;
+            head.line++;
+          }
+        }
+        if (CodeMirror.cmpPos(head, this.doc.clipPos(head)) != 0) {
+           return this.atOccurrence = false
         }
       }
+      var result = this.matches(reverse, head)
+      this.afterEmptyMatch = result && CodeMirror.cmpPos(result.from, result.to) == 0
 
       if (result) {
         this.pos = result
diff --git a/keymap/vim.js b/keymap/vim.js
index ee69954943..289d8d15bf 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -4305,7 +4305,7 @@
         ignoreCase = (/^[^A-Z]*$/).test(regexPart);
       }
       var regexp = new RegExp(regexPart,
-          (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
+          (ignoreCase || forceIgnoreCase) ? 'im' : 'm');
       return regexp;
     }
 
@@ -4461,7 +4461,14 @@
         var cursor = cm.getSearchCursor(query, pos);
         for (var i = 0; i < repeat; i++) {
           var found = cursor.find(prev);
-          if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); }
+          if (i == 0 && found && cursorEqual(cursor.from(), pos)) {
+            var lastEndPos = prev ? cursor.from() : cursor.to();
+            found = cursor.find(prev);
+            if (found && !found[0] && cursorEqual(cursor.from(), lastEndPos)) {
+              if (cm.getLine(lastEndPos.line).length == lastEndPos.ch)
+                found = cursor.find(prev);
+            }
+          }
           if (!found) {
             // SearchCursor may have returned null because it hit EOF, wrap
             // around and try again.
@@ -5114,12 +5121,6 @@
               regexPart = new RegExp(regexPart).source; //normalize not escaped characters
           }
           replacePart = tokens[1];
-          // If the pattern ends with $ (line boundary assertion), change $ to \n.
-          // Caveat: this workaround cannot match on the last line of the document.
-          if (/(^|[^\\])(\\\\)*\$$/.test(regexPart)) {
-            regexPart = regexPart.slice(0, -1) + '\\n';
-            replacePart = (replacePart || '') + '\n';
-          }
           if (replacePart !== undefined) {
             if (getOption('pcre')) {
               replacePart = unescapeRegexReplace(replacePart.replace(/([^\\])&/g,"$1$$&"));
@@ -5309,10 +5310,18 @@
         lineEnd += modifiedLineNumber - unmodifiedLineNumber;
         joined = modifiedLineNumber < unmodifiedLineNumber;
       }
+      function findNextValidMatch() {
+        var lastMatchTo = lastPos && copyCursor(searchCursor.to());
+        var match = searchCursor.findNext();
+        if (match && !match[0] && lastMatchTo && cursorEqual(searchCursor.from(), lastMatchTo)) {
+          match = searchCursor.findNext();
+        }
+        return match;
+      }
       function next() {
         // The below only loops to skip over multiple occurrences on the same
         // line when 'global' is not true.
-        while(searchCursor.findNext() &&
+        while(findNextValidMatch() &&
               isInRange(searchCursor.from(), lineStart, lineEnd)) {
           if (!global && searchCursor.from().line == modifiedLineNumber && !joined) {
             continue;
diff --git a/test/vim_test.js b/test/vim_test.js
index a5609f5b2e..33d94416d9 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -998,6 +998,12 @@ testVim('dd_only_line', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq(expectedRegister, register.toString());
 }, { value: "thisistheonlyline" });
+testVim('cG', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('c', 'G', 'inserted');
+  eq('inserted\n', cm.getValue());
+  helpers.assertCursorAt(0, 8);
+}, { value: 'line1\nline2'});
 // Yank commands should behave the exact same as d commands, expect that nothing
 // gets deleted.
 testVim('yw_repeat', function(cm, vim, helpers) {
@@ -2752,9 +2758,11 @@ testVim('?_greedy_0_or_more', function(cm, vim, helpers) {
   helpers.doKeys('?');
   helpers.assertCursorAt(1, 1);
   helpers.doKeys('n');
+  helpers.assertCursorAt(1, 0);
+  helpers.doKeys('n');
   helpers.assertCursorAt(0, 5);
   helpers.doKeys('n');
-  helpers.assertCursorAt(0, 3);
+  helpers.assertCursorAt(0, 4);
   helpers.doKeys('n');
   helpers.assertCursorAt(0, 0);
 }, { value: 'aaa  aa\n aa'});
@@ -4329,8 +4337,12 @@ testSubstitute('ex_substitute_multibackslash_replacement', {
   expr: '%s/,/\\\\\\\\\\\\\\\\/g'}); // 16 backslashes.
 testSubstitute('ex_substitute_dollar_assertion', {
   value: 'one,two \n three,four',
-  expectedValue: 'one,two ,\n three,four', // TODO: should match at end of doc.
+  expectedValue: 'one,two ,\n three,four,',
   expr: '%s/$/,/g'});
+testSubstitute('ex_substitute_dollar_assertion_empty_lines', {
+  value: '\n\n\n\n\n\n',
+  expectedValue: ';\n;\n;\n;\n;\n;\n;',
+  expr: '%s/$/;/g'});
 testSubstitute('ex_substitute_dollar_literal', {
   value: 'one$two\n$three\nfour$\n$',
   expectedValue: 'one,two\n,three\nfour,\n,',
@@ -4396,6 +4408,21 @@ testSubstitute('ex_substitute_not_global', {
   value: 'aaa\nbaa\ncaa',
   expectedValue: 'xaa\nbxa\ncxa',
   expr: '%s/a/x/'});
+testSubstitute('ex_substitute_optional', {
+  value: 'aaa  aa\n aa',
+  expectedValue: '<aaa> <> <aa>\n<> <aa>',
+  expr: '%s/(a*)/<$1>/g',
+  noPcreExpr: '%s/\\(a*\\)/<\\1>/g'});
+testSubstitute('ex_substitute_empty_match', {
+  value: 'aaa  aa\n aa\nbb\n',
+  expectedValue: '<aaa>  <aa>\n <aa>\nbb<>\n<>',
+  expr: '%s/(a+|$)/<$1>/g',
+  noPcreExpr: '%s/\\(a+\\|$\\)/<\\1>/g'});
+testSubstitute('ex_substitute_empty_or_match', {
+  value: '1234\n567\n89\n0\n',
+  expectedValue: '<12><34>\n<56>7<>\n<89>\n0<>\n<>',
+  expr: '%s/(..|$)/<$1>/g',
+  noPcreExpr: '%s/\\(..\\|$\\)/<\\1>/g'});
 function testSubstituteConfirm(name, command, initialValue, expectedValue, keys, finalPos) {
   testVim(name, function(cm, vim, helpers) {
     var savedOpenDialog = cm.openDialog;

From 145c3e23e2bcd1a6643c706c74129b2c3ec5f3fd Mon Sep 17 00:00:00 2001
From: Kazuhisa Ishizaka <iszk1215@gmail.com>
Date: Fri, 8 Oct 2021 22:09:11 +0900
Subject: [PATCH 4556/4742] Add "min-height: 1em" to hiddenTextarea

---
 src/input/input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input.js b/src/input/input.js
index 32adbf9b2a..288937be12 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -120,7 +120,7 @@ export function disableBrowserMagic(field, spellcheck, autocorrect, autocapitali
 }
 
 export function hiddenTextarea() {
-  let te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; outline: none")
+  let te = elt("textarea", null, null, "position: absolute; bottom: -1em; padding: 0; width: 1px; height: 1em; min-height: 1em; outline: none")
   let div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;")
   // The textarea is kept positioned near the cursor to prevent the
   // fact that it'll be scrolled into view on input from scrolling

From 7ca2502e929e7c587cb803c65e7dd34f11337106 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 11 Oct 2021 13:54:21 +0200
Subject: [PATCH 4557/4742] Mark version 5.63.2

---
 AUTHORS           | 1 +
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6c953de73f..54f3efc617 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -470,6 +470,7 @@ karevn
 Karol
 Kaushik Kulkarni
 Kayur Patel
+Kazuhisa Ishizaka
 Kazuhito Hokamura
 kcwiakala
 Kees de Kooter
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ced85d692..2b97fdc4de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.63.2 (2021-10-11)
+
+### Bug fixes
+
+Prevent external styles from giving the hidden textarea a min-height.
+
+Remove a stray autosave file that was part of the previous release.
+
 ## 5.63.1 (2021-09-29)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 203bc16440..5d6131601e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.63.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.63.2</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 10c4f84608..d8a2c4e5ec 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,13 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">11-10-2021: <a href="https://codemirror.net/codemirror-5.63.2.zip">Version 5.63.2</a>:</p>
+
+  <ul class="rel-note">
+    <li>Prevent external styles from giving the hidden textarea a min-height.</li>
+    <li>Remove a stray autosave file that was part of the previous release.</li>
+  </ul>
+
   <p class="rel">29-09-2021: <a href="https://codemirror.net/codemirror-5.63.1.zip">Version 5.63.1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index b3ea486c25..5d408a2a10 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.63.1</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.63.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index e727b4bf49..fdd0d0092c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.63.1",
+  "version": "5.63.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 93adf96205..1bede22eba 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.63.1"
+CodeMirror.version = "5.63.2"

From 0e49600f6c2a549240efd69eacdd9e3e9d9d6833 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 12 Oct 2021 14:54:22 +0200
Subject: [PATCH 4558/4742] Mark version 5.63.3

---
 CHANGELOG.md      | 2 +-
 doc/manual.html   | 2 +-
 doc/releases.html | 2 +-
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b97fdc4de..0224d96833 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 5.63.2 (2021-10-11)
+## 5.63.3 (2021-10-11)
 
 ### Bug fixes
 
diff --git a/doc/manual.html b/doc/manual.html
index 5d6131601e..788ec6b77e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.63.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.63.3</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 d8a2c4e5ec..dfcf8b88bf 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,7 +30,7 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
-  <p class="rel">11-10-2021: <a href="https://codemirror.net/codemirror-5.63.2.zip">Version 5.63.2</a>:</p>
+  <p class="rel">11-10-2021: <a href="https://codemirror.net/codemirror-5.63.3.zip">Version 5.63.3</a>:</p>
 
   <ul class="rel-note">
     <li>Prevent external styles from giving the hidden textarea a min-height.</li>
diff --git a/index.html b/index.html
index 5d408a2a10..e6d94ecbd7 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.63.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.63.3</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index fdd0d0092c..03238c2d88 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.63.2",
+  "version": "5.63.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 1bede22eba..3285c5e349 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.63.2"
+CodeMirror.version = "5.63.3"

From 5ab9f71e730dc7da6bddafc5079b06c14e0b5809 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 13 Oct 2021 01:57:49 +0400
Subject: [PATCH 4559/4742] consistent way to emulate events in vim test

---
 keymap/vim.js    |  17 +-
 test/vim_test.js | 780 ++++++++++++++++++++++-------------------------
 2 files changed, 370 insertions(+), 427 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 289d8d15bf..8f534c55ca 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -764,7 +764,7 @@
         exCommandDispatcher.map(lhs, rhs, ctx);
       },
       unmap: function(lhs, ctx) {
-        exCommandDispatcher.unmap(lhs, ctx);
+        return exCommandDispatcher.unmap(lhs, ctx);
       },
       // Non-recursive map function.
       // NOTE: This will not create mappings to key maps that aren't present
@@ -4335,7 +4335,7 @@
     }
 
     function showConfirm(cm, template) {
-      var pre = dom('pre', {$color: 'red'}, template);
+      var pre = dom('pre', {$color: 'red', class: 'cm-vim-message'}, template);
       if (cm.openNotification) {
         cm.openNotification(pre, {bottom: true, duration: 5000});
       } else {
@@ -4353,7 +4353,6 @@
     }
 
     function showPrompt(cm, options) {
-      var shortText = (options.prefix || '') + ' ' + (options.desc || '');
       var template = makePrompt(options.prefix, options.desc);
       if (cm.openDialog) {
         cm.openDialog(template, options.onClose, {
@@ -4362,6 +4361,9 @@
         });
       }
       else {
+        var shortText = '';
+        if (typeof options.prefix != "string" && options.prefix) shortText += options.prefix.textContent;
+        if (options.desc) shortText += " " + options.desc;
         options.onClose(prompt(shortText, ''));
       }
     }
@@ -4805,7 +4807,7 @@
           var commandName = lhs.substring(1);
           if (this.commandMap_[commandName] && this.commandMap_[commandName].user) {
             delete this.commandMap_[commandName];
-            return;
+            return true;
           }
         } else {
           // Key to Ex or key to key mapping
@@ -4814,11 +4816,10 @@
             if (keys == defaultKeymap[i].keys
                 && defaultKeymap[i].context === ctx) {
               defaultKeymap.splice(i, 1);
-              return;
+              return true;
             }
           }
         }
-        throw Error('No such mapping.');
       }
     };
 
@@ -4845,13 +4846,11 @@
       vmap: function(cm, params) { this.map(cm, params, 'visual'); },
       unmap: function(cm, params, ctx) {
         var mapArgs = params.args;
-        if (!mapArgs || mapArgs.length < 1) {
+        if (!mapArgs || mapArgs.length < 1 || !exCommandDispatcher.unmap(mapArgs[0], ctx)) {
           if (cm) {
             showConfirm(cm, 'No such mapping: ' + params.input);
           }
-          return;
         }
-        exCommandDispatcher.unmap(mapArgs[0], ctx);
       },
       move: function(cm, params) {
         commandDispatcher.processCommand(cm, cm.state.vim, {
diff --git a/test/vim_test.js b/test/vim_test.js
index 33d94416d9..a4e3c204fe 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -19,7 +19,7 @@ var code = '' +
 '}\n';
 
 var lines = (function() {
-  lineText = code.split('\n');
+  var lineText = code.split('\n');
   var ret = [];
   for (var i = 0; i < lineText.length; i++) {
     ret[i] = {
@@ -124,6 +124,12 @@ function expectFail(fn) {
     throw new Error("Expected to throw an error");
 }
 
+function vimKeyToKeyName(key) {
+  return key.replace(/[CS]-|CR|BS/g, function(part) {
+    return {"C-": "Ctrl-", "S-": "Shift", CR: "Return", BS: "Backspace"}[part];
+  });
+}
+
 function testVim(name, run, opts, expectedFail) {
   var vimOpts = {
     lineNumbers: true,
@@ -138,51 +144,35 @@ function testVim(name, run, opts, expectedFail) {
   }
   return test('vim_' + name, function() {
     var place = document.getElementById("testground");
+    place.style.visibility = "visible";
     var cm = CodeMirror(place, vimOpts);
     var vim = CodeMirror.Vim.maybeInitVimState_(cm);
 
-    function doKeysFn(cm) {
-      return function(args) {
-        if (args instanceof Array) {
-          arguments = args;
-        }
-        for (var i = 0; i < arguments.length; i++) {
-          var result = CodeMirror.Vim.handleKey(cm, arguments[i]);
-          if (!result && cm.state.vim.insertMode) {
-            cm.replaceSelections(fillArray(arguments[i], cm.listSelections().length));
-          }
+    cm.focus();
+    // workaround for cm5 slow polling in blurred window
+    Object.defineProperty(cm.state, "focused", {
+        set: function(e) {}, 
+        get: function() {
+            return document.activeElement == cm.getInputField();
         }
-      }
-    }
-    function doInsertModeKeysFn(cm) {
-      return function(args) {
-        if (args instanceof Array) { arguments = args; }
-        function executeHandler(handler) {
-          if (typeof handler == 'string') {
-            CodeMirror.commands[handler](cm);
-          } else {
-            handler(cm);
-          }
-          return true;
-        }
-        for (var i = 0; i < arguments.length; i++) {
-          var key = arguments[i];
-          // Find key in keymap and handle.
-          var handled = CodeMirror.lookupKey(key, cm.getOption('keyMap'), executeHandler, cm);
-          // Record for insert mode.
-          if (handled == "handled" && cm.state.vim.insertMode && arguments[i] != 'Esc') {
-            var lastChange = CodeMirror.Vim.getVimGlobalState_().macroModeState.lastInsertModeChanges;
-            if (lastChange && (key.indexOf('Delete') != -1 || key.indexOf('Backspace') != -1)) {
-              lastChange.changes.push(new CodeMirror.Vim.InsertModeKey(key));
-            }
+    });
+
+    function doKeysFn(cm) {
+      return function() {
+        var args = arguments[0]
+        if (!Array.isArray(args)) { args = arguments; }
+        for (var i = 0; i < args.length; i++) {
+          var key = args[i];
+          if (key.length > 1 && key[0] == "<" && key.slice(-1) == ">") {
+              key = vimKeyToKeyName(key.slice(1, -1));
           }
+          typeKey(key);
         }
       }
     }
     function doExFn(cm) {
       return function(command) {
-        cm.openDialog = helpers.fakeOpenDialog(command);
-        helpers.doKeys(':');
+        helpers.doKeys(':', command, '\n');
       }
     }
     function assertCursorAtFn(cm) {
@@ -196,44 +186,25 @@ function testVim(name, run, opts, expectedFail) {
         eqCursorPos(cm.getCursor(), pos);
       }
     }
-    function fakeOpenDialog(result) {
-      return function(template, callback) {
-        return callback(result);
-      }
-    }
-    function fakeOpenNotification(matcher) {
-      return function(template) {
-        matcher(template.innerHTML);
-      }
-    }
     var helpers = {
       doKeys: doKeysFn(cm),
-      // Warning: Only emulates keymap events, not character insertions. Use
-      // replaceRange to simulate character insertions.
-      // Keys are in CodeMirror format, NOT vim format.
-      doInsertModeKeys: doInsertModeKeysFn(cm),
       doEx: doExFn(cm),
       assertCursorAt: assertCursorAtFn(cm),
-      fakeOpenDialog: fakeOpenDialog,
-      fakeOpenNotification: fakeOpenNotification,
       getRegisterController: function() {
         return CodeMirror.Vim.getRegisterController();
+      },
+      getNotificationText: function() {
+        return cm.getWrapperElement().querySelector(".cm-vim-message").textContent;
       }
     }
     CodeMirror.Vim.resetVimGlobalState_();
     var successful = false;
-    var savedOpenNotification = cm.openNotification;
-    var savedOpenDialog = cm.openDialog;
     try {
       run(cm, vim, helpers);
       successful = true;
     } finally {
-      cm.openNotification = savedOpenNotification;
-      cm.openDialog = savedOpenDialog;
-      if (!successful || verbose) {
-        place.style.visibility = "visible";
-      } else {
-        place.removeChild(cm.getWrapperElement());
+      if (successful && !verbose) {
+        cm.getWrapperElement().remove();
       }
     }
   }, expectedFail);
@@ -264,12 +235,11 @@ var jumplistScene = ''+
   '}word\n'+
   'word\n'+
   'word\n';
-function testJumplist(name, keys, endPos, startPos, dialog) {
+function testJumplist(name, keys, endPos, startPos) {
   endPos = makeCursor(endPos[0], endPos[1]);
   startPos = makeCursor(startPos[0], startPos[1]);
   testVim(name, function(cm, vim, helpers) {
     CodeMirror.Vim.resetVimGlobalState_();
-    if(dialog)cm.openDialog = helpers.fakeOpenDialog('word');
     cm.setCursor(startPos);
     helpers.doKeys.apply(null, keys);
     helpers.assertCursorAt(endPos);
@@ -294,8 +264,8 @@ testJumplist('jumplist_N', ['#', 'N', '<C-o>'], [1,1], [2,3]);
 testJumplist('jumplist_repeat_<c-o>', ['*', '*', '*', '3', '<C-o>'], [2,3], [2,3]);
 testJumplist('jumplist_repeat_<c-i>', ['*', '*', '*', '3', '<C-o>', '2', '<C-i>'], [5,0], [2,3]);
 testJumplist('jumplist_repeated_motion', ['3', '*', '<C-o>'], [2,3], [2,3]);
-testJumplist('jumplist_/', ['/', '<C-o>'], [2,3], [2,3], 'dialog');
-testJumplist('jumplist_?', ['?', '<C-o>'], [2,3], [2,3], 'dialog');
+testJumplist('jumplist_/', ['/', 'dialog\n', '<C-o>'], [2,3], [2,3]);
+testJumplist('jumplist_?', ['?', 'dialog\n', '<C-o>'], [2,3], [2,3]);
 testJumplist('jumplist_skip_deleted_mark<c-o>',
              ['*', 'n', 'n', 'k', 'd', 'k', '<C-o>', '<C-o>', '<C-o>'],
              [0,2], [0,2]);
@@ -1191,7 +1161,7 @@ testVim('on_mode_change', function(cm, vim, helpers) {
   test('<Esc>', 'normal');
   test('v', 'visual');
   test(':', ''); // Event for Command-line mode not implemented.
-  test('y', 'normal');
+  test('y\n', 'normal');
 });
 
 // Swapcase commands edit in place and do not modify registers.
@@ -1637,7 +1607,7 @@ testVim('i_repeat_delete', function(cm, vim, helpers) {
   cm.setCursor(0, 4);
   helpers.doKeys('2', 'i');
   helpers.doKeys('z')
-  helpers.doInsertModeKeys('Backspace', 'Backspace');
+  helpers.doKeys('Backspace', 'Backspace');
   helpers.doKeys('<Esc>');
   eq('abe', cm.getValue());
   helpers.assertCursorAt(0, 1);
@@ -1656,7 +1626,7 @@ testVim('insert', function(cm, vim, helpers) {
 testVim('i_backspace', function(cm, vim, helpers) {
   cm.setCursor(0, 10);
   helpers.doKeys('i');
-  helpers.doInsertModeKeys('Backspace');
+  helpers.doKeys('Backspace');
   helpers.assertCursorAt(0, 9);
   eq('012345678', cm.getValue());
 }, { value: '0123456789'});
@@ -1664,20 +1634,20 @@ testVim('i_overwrite_backspace', function(cm, vim, helpers) {
   cm.setCursor(0, 10);
   helpers.doKeys('i');
   helpers.doKeys('<Ins>');
-  helpers.doInsertModeKeys('Backspace');
+  helpers.doKeys('Backspace');
   helpers.assertCursorAt(Pos(0, 9, "after"));
   eq('0123456789', cm.getValue());
 }, { value: '0123456789'});
 testVim('i_forward_delete', function(cm, vim, helpers) {
   cm.setCursor(0, 3);
   helpers.doKeys('i');
-  helpers.doInsertModeKeys('Delete');
+  helpers.doKeys('Delete');
   helpers.assertCursorAt(0, 3);
   eq('A124\nBCD', cm.getValue());
-  helpers.doInsertModeKeys('Delete');
+  helpers.doKeys('Delete');
   helpers.assertCursorAt(0, 3);
   eq('A12\nBCD', cm.getValue());
-  helpers.doInsertModeKeys('Delete');
+  helpers.doKeys('Delete');
   helpers.assertCursorAt(0, 3);
   eq('A12BCD', cm.getValue());
 }, { value: 'A1234\nBCD'});
@@ -1929,8 +1899,7 @@ testVim('mark\'', function(cm, vim, helpers) {
   helpers.doKeys('`', '`');
   helpers.assertCursorAt(1, 3);
   // motions that update jumplist
-  cm.openDialog = helpers.fakeOpenDialog('=');
-  helpers.doKeys('/');
+  helpers.doKeys('/', '=', '\n');
   helpers.assertCursorAt(6, 20);
   helpers.doKeys('`', '`');
   helpers.assertCursorAt(1, 3);
@@ -2498,10 +2467,8 @@ testVim('v_paste_from_register', function(cm, vim, helpers) {
   helpers.doKeys('"', 'a', 'y', 'w');
   cm.setCursor(1, 0);
   helpers.doKeys('v', 'p');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+register/.test(text));
-  });
+  helpers.doEx('registers');
+  is(/a\s+register/.test(helpers.getNotificationText()));
 }, { value: 'register contents\nare not erased'});
 testVim('S_normal', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
@@ -2571,17 +2538,14 @@ testVim('S_visual', function(cm, vim, helpers) {
 }, { value: 'aa\nbb\ncc'});
 
 testVim('d_/', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('2', 'd', '/');
+  helpers.doKeys('2', 'd', '/', 'match', '\n');
   helpers.assertCursorAt(0, 0);
   eq('match \n next', cm.getValue());
-  cm.openDialog = helpers.fakeOpenDialog('2');
-  helpers.doKeys('d', ':');
+  helpers.doKeys('d', ':', '2', '\n');
   // TODO eq(' next', cm.getValue());
 }, { value: 'text match match \n next' });
 testVim('/ and n/N', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'match', '\n');
   helpers.assertCursorAt(0, 11);
   helpers.doKeys('n');
   helpers.assertCursorAt(1, 6);
@@ -2589,12 +2553,11 @@ testVim('/ and n/N', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 11);
 
   cm.setCursor(0, 0);
-  helpers.doKeys('2', '/');
+  helpers.doKeys('2', '/', 'match', '\n');
   helpers.assertCursorAt(1, 6);
 }, { value: 'match nope match \n nope Match' });
 testVim('/ and gn selects the appropriate word', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'match', '\n');
   helpers.assertCursorAt(0, 11);
 
   // gn should highlight the the current word while it is within a match.
@@ -2619,8 +2582,7 @@ testVim('/ and gn selects the appropriate word', function(cm, vim, helpers) {
   eq('match nope ', cm.getValue());
 }, { value: 'match nope match \n nope Match' });
 testVim('/ and gN selects the appropriate word', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'match', '\n');
   helpers.assertCursorAt(0, 11);
 
   // gN when cursor is at beginning of match
@@ -2642,8 +2604,7 @@ testVim('/ and gN selects the appropriate word', function(cm, vim, helpers) {
   eq(' \n nope Match', cm.getValue());
 }, { value: 'match nope match \n nope Match' })
 testVim('/ and gn with an associated operator', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'match', '\n');
   helpers.assertCursorAt(0, 11);
 
   helpers.doKeys('c', 'gn', 'changed', '<Esc>');
@@ -2660,8 +2621,7 @@ testVim('/ and gn with an associated operator', function(cm, vim, helpers) {
   eq('changed nope changed \n nope changed', cm.getValue());
 }, { value: 'match nope match \n nope Match' });
 testVim('/ and gN with an associated operator', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'match', '\n');
   helpers.assertCursorAt(0, 11);
 
   helpers.doKeys('c', 'gN', 'changed', '<Esc>');
@@ -2678,29 +2638,25 @@ testVim('/ and gN with an associated operator', function(cm, vim, helpers) {
   eq('changed nope changed \n nope changed', cm.getValue());
 }, { value: 'match nope match \n nope Match' });
 testVim('/_case', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('Match');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'Match', '\n');
   helpers.assertCursorAt(1, 6);
 }, { value: 'match nope match \n nope Match' });
 testVim('/_2_pcre', function(cm, vim, helpers) {
   CodeMirror.Vim.setOption('pcre', true);
-  cm.openDialog = helpers.fakeOpenDialog('(word){2}');
-  helpers.doKeys('/');
+  helpers.doKeys('/', '(word){2}', '\n');
   helpers.assertCursorAt(1, 9);
   helpers.doKeys('n');
   helpers.assertCursorAt(2, 1);
 }, { value: 'word\n another wordword\n wordwordword\n' });
 testVim('/_2_nopcre', function(cm, vim, helpers) {
   CodeMirror.Vim.setOption('pcre', false);
-  cm.openDialog = helpers.fakeOpenDialog('\\(word\\)\\{2}');
-  helpers.doKeys('/');
+  helpers.doKeys('/', '\\(word\\)\\{2}', '\n');
   helpers.assertCursorAt(1, 9);
   helpers.doKeys('n');
   helpers.assertCursorAt(2, 1);
 }, { value: 'word\n another wordword\n wordwordword\n' });
 testVim('/_nongreedy', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('aa');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'aa', '\n');
   helpers.assertCursorAt(0, 4);
   helpers.doKeys('n');
   helpers.assertCursorAt(1, 3);
@@ -2708,8 +2664,7 @@ testVim('/_nongreedy', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
 }, { value: 'aaa aa \n a aa'});
 testVim('?_nongreedy', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('aa');
-  helpers.doKeys('?');
+  helpers.doKeys('?', 'aa', '\n');
   helpers.assertCursorAt(1, 3);
   helpers.doKeys('n');
   helpers.assertCursorAt(0, 4);
@@ -2717,8 +2672,7 @@ testVim('?_nongreedy', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 1);
 }, { value: 'aaa aa \n a aa'});
 testVim('/_greedy', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('a+');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'a+', '\n');
   helpers.assertCursorAt(0, 4);
   helpers.doKeys('n');
   helpers.assertCursorAt(1, 1);
@@ -2728,8 +2682,7 @@ testVim('/_greedy', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
 }, { value: 'aaa aa \n a aa'});
 testVim('?_greedy', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('a+');
-  helpers.doKeys('?');
+  helpers.doKeys('?', 'a+', '\n');
   helpers.assertCursorAt(1, 3);
   helpers.doKeys('n');
   helpers.assertCursorAt(1, 1);
@@ -2739,8 +2692,7 @@ testVim('?_greedy', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
 }, { value: 'aaa aa \n a aa'});
 testVim('/_greedy_0_or_more', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('a*');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'a*', '\n');
   helpers.assertCursorAt(0, 3);
   helpers.doKeys('n');
   helpers.assertCursorAt(0, 4);
@@ -2754,8 +2706,7 @@ testVim('/_greedy_0_or_more', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
 }, { value: 'aaa  aa\n aa'});
 testVim('?_greedy_0_or_more', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('a*');
-  helpers.doKeys('?');
+  helpers.doKeys('?', 'a*', '\n');
   helpers.assertCursorAt(1, 1);
   helpers.doKeys('n');
   helpers.assertCursorAt(1, 0);
@@ -2767,8 +2718,7 @@ testVim('?_greedy_0_or_more', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 0);
 }, { value: 'aaa  aa\n aa'});
 testVim('? and n/N', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('?');
+  helpers.doKeys('?', 'match', '\n');
   helpers.assertCursorAt(1, 6);
   helpers.doKeys('n');
   helpers.assertCursorAt(0, 11);
@@ -2776,12 +2726,11 @@ testVim('? and n/N', function(cm, vim, helpers) {
   helpers.assertCursorAt(1, 6);
 
   cm.setCursor(0, 0);
-  helpers.doKeys('2', '?');
+  helpers.doKeys('2', '?', 'match', '\n');
   helpers.assertCursorAt(0, 11);
 }, { value: 'match nope match \n nope Match' });
 testVim('? and gn selects the appropriate word', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('?', 'n');
+  helpers.doKeys('?', 'match', '\n', 'n');
   helpers.assertCursorAt(0, 11);
 
   // gn should highlight the the current word while it is within a match.
@@ -2805,8 +2754,7 @@ testVim('? and gn selects the appropriate word', function(cm, vim, helpers) {
   eq(' \n nope Match', cm.getValue());
 }, { value: 'match nope match \n nope Match' });
 testVim('? and gN selects the appropriate word', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('?', 'n');
+  helpers.doKeys('?', 'match', '\n', 'n');
   helpers.assertCursorAt(0, 11);
 
   // gN when cursor is at beginning of match
@@ -2828,8 +2776,7 @@ testVim('? and gN selects the appropriate word', function(cm, vim, helpers) {
   eq('match nope ', cm.getValue());
 }, { value: 'match nope match \n nope Match' })
 testVim('? and gn with an associated operator', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('?', 'n');
+  helpers.doKeys('?', 'match', '\n', 'n');
   helpers.assertCursorAt(0, 11);
 
   helpers.doKeys('c', 'gn', 'changed', '<Esc>');
@@ -2846,8 +2793,7 @@ testVim('? and gn with an associated operator', function(cm, vim, helpers) {
   eq('changed nope changed \n nope changed', cm.getValue());
 }, { value: 'match nope match \n nope Match' });
 testVim('? and gN with an associated operator', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('?', 'n');
+  helpers.doKeys('?', 'match', '\n', 'n');
   helpers.assertCursorAt(0, 11);
 
   helpers.doKeys('c', 'gN', 'changed', '<Esc>');
@@ -2977,8 +2923,7 @@ testVim('macro_f_search', function(cm, vim, helpers) {
 testVim('macro_slash_search', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'c');
-  cm.openDialog = helpers.fakeOpenDialog('e');
-  helpers.doKeys('/', 'q');
+  helpers.doKeys('/', 'e', '\n', 'q');
   helpers.assertCursorAt(0, 2);
   helpers.doKeys('@', 'c');
   helpers.assertCursorAt(0, 7);
@@ -2988,10 +2933,8 @@ testVim('macro_slash_search', function(cm, vim, helpers) {
 testVim('macro_multislash_search', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('q', 'd');
-  cm.openDialog = helpers.fakeOpenDialog('e');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('t');
-  helpers.doKeys('/', 'q');
+  helpers.doKeys('/', 'e', '\n');
+  helpers.doKeys('/', 't', '\n', 'q');
   helpers.assertCursorAt(0, 12);
   helpers.doKeys('@', 'd');
   helpers.assertCursorAt(0, 15);
@@ -3071,79 +3014,60 @@ testVim('yank_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('"', 'a', 'y', 'y');
   helpers.doKeys('j', '"', 'b', 'y', 'y');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foo/.test(text));
-    is(/b\s+bar/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  var text = helpers.getNotificationText();
+  is(/a\s+foo/.test(text));
+  is(/b\s+bar/.test(text));
 }, { value: 'foo\nbar'});
 testVim('yank_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', 'l', 'j', '"', 'a', 'y');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+oo\nar/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  is(/a\s+oo\nar/.test(helpers.getNotificationText()));
 }, { value: 'foo\nbar'});
 testVim('yank_append_line_to_line_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('"', 'a', 'y', 'y');
   helpers.doKeys('j', '"', 'A', 'y', 'y');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foo\nbar/.test(text));
-    is(/"\s+foo\nbar/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  var text = helpers.getNotificationText();
+  is(/a\s+foo\nbar/.test(text));
+  is(/"\s+foo\nbar/.test(text));
 }, { value: 'foo\nbar'});
 testVim('yank_append_word_to_word_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('"', 'a', 'y', 'w');
   helpers.doKeys('j', '"', 'A', 'y', 'w');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foobar/.test(text));
-    is(/"\s+foobar/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  var text = helpers.getNotificationText();
+  is(/a\s+foobar/.test(text));
+  is(/"\s+foobar/.test(text));
 }, { value: 'foo\nbar'});
 testVim('yank_append_line_to_word_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('"', 'a', 'y', 'w');
   helpers.doKeys('j', '"', 'A', 'y', 'y');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foo\nbar/.test(text));
-    is(/"\s+foo\nbar/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  var text = helpers.getNotificationText();
+  is(/a\s+foo\nbar/.test(text));
+  is(/"\s+foo\nbar/.test(text));
 }, { value: 'foo\nbar'});
 testVim('yank_append_word_to_line_register', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('"', 'a', 'y', 'y');
   helpers.doKeys('j', '"', 'A', 'y', 'w');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foo\nbar/.test(text));
-    is(/"\s+foo\nbar/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  var text = helpers.getNotificationText();
+  is(/a\s+foo\nbar/.test(text));
+  is(/"\s+foo\nbar/.test(text));
 }, { value: 'foo\nbar'});
 testVim('black_hole_register', function(cm,vim,helpers) {
   helpers.doKeys('g', 'g', 'y', 'G');
-  var registersText;
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    registersText = text;
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  var registersText = helpers.getNotificationText();
   helpers.doKeys('"', '_', 'd', 'G');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    eq(registersText, text, 'One or more registers were modified');
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  eq(registersText, helpers.getNotificationText(), 'One or more registers were modified');
   helpers.doKeys('"', '_', 'p');
   eq('', cm.getValue());
 }, { value: 'foo\nbar'});
@@ -3157,197 +3081,92 @@ testVim('macro_register', function(cm, vim, helpers) {
   helpers.doKeys('style')
   helpers.doKeys('<Esc>');
   helpers.doKeys('q');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+i/.test(text));
-    is(/b\s+o/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  var text = helpers.getNotificationText();
+  is(/a\s+i/.test(text));
+  is(/b\s+o/.test(text));
 }, { value: ''});
 testVim('._register', function(cm,vim,helpers) {
   cm.setCursor(0,0);
   helpers.doKeys('i');
   helpers.doKeys('foo')
   helpers.doKeys('<Esc>');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/\.\s+foo/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  is(/\.\s+foo/.test(helpers.getNotificationText()));
 }, {value: ''});
 testVim(':_register', function(cm,vim,helpers) {
   helpers.doEx('bar');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/:\s+bar/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doEx('registers');
+  is(/:\s+bar/.test(helpers.getNotificationText()));
 }, {value: ''});
 testVim('registers_html_encoding', function(cm,vim,helpers) {
   helpers.doKeys('y', 'y');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/"\s+&lt;script&gt;throw "&amp;amp;"&lt;\/script&gt;/.test(text));
-  });
   helpers.doEx('registers');
+  is(/"\s+<script>throw "&amp;"<\/script>/.test(helpers.getNotificationText()));
 }, {value: '<script>throw "&amp;"</script>'});
 testVim('search_register_escape', function(cm, vim, helpers) {
   // Check that the register is restored if the user escapes rather than confirms.
-  cm.openDialog = helpers.fakeOpenDialog('waldo');
-  helpers.doKeys('/');
-  var onKeyDown;
-  var onKeyUp;
-  var KEYCODES = {
-    f: 70,
-    o: 79,
-    Esc: 27
-  };
-  cm.openDialog = function(template, callback, options) {
-    onKeyDown = options.onKeyDown;
-    onKeyUp = options.onKeyUp;
-  };
-  var close = function() {};
-  helpers.doKeys('/');
-  // Fake some keyboard events coming in.
-  onKeyDown({keyCode: KEYCODES.f}, '', close);
-  onKeyUp({keyCode: KEYCODES.f}, '', close);
-  onKeyDown({keyCode: KEYCODES.o}, 'f', close);
-  onKeyUp({keyCode: KEYCODES.o}, 'f', close);
-  onKeyDown({keyCode: KEYCODES.o}, 'fo', close);
-  onKeyUp({keyCode: KEYCODES.o}, 'fo', close);
-  onKeyDown({keyCode: KEYCODES.Esc}, 'foo', close);
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/waldo/.test(text));
-    is(!/foo/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doKeys('/', 'waldo', '\n');
+  helpers.doKeys('/', 'foo', '<Esc>');
+  helpers.doEx('registers');
+  var text = helpers.getNotificationText();
+  is(/waldo/.test(text));
+  is(!/foo/.test(text));
 }, {value: ''});
 testVim('search_register', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('foo');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/\/\s+foo/.test(text));
-  });
-  helpers.doKeys(':');
+  helpers.doKeys('/', 'foo', '\n');
+  helpers.doEx('registers');
+  is(/\/\s+foo/.test(helpers.getNotificationText()));
 }, {value: ''});
 testVim('search_history', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('this');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('checks');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('search');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('history');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('checks');
+  helpers.doKeys('/', 'this', '\n');
+  helpers.doKeys('/', 'checks', '\n');
+  helpers.doKeys('/', 'search', '\n');
+  helpers.doKeys('/', 'history', '\n');
+  helpers.doKeys('/', 'checks', '\n');
   helpers.doKeys('/');
-  var onKeyDown;
-  var onKeyUp;
-  var query = '';
-  var keyCodes = {
-    Up: 38,
-    Down: 40
-  };
-  cm.openDialog = function(template, callback, options) {
-    onKeyUp = options.onKeyUp;
-    onKeyDown = options.onKeyDown;
-  };
-  var close = function(newVal) {
-    if (typeof newVal == 'string') query = newVal;
-  }
-  helpers.doKeys('/');
-  onKeyDown({keyCode: keyCodes.Up}, query, close);
-  onKeyUp({keyCode: keyCodes.Up}, query, close);
-  eq(query, 'checks');
-  onKeyDown({keyCode: keyCodes.Up}, query, close);
-  onKeyUp({keyCode: keyCodes.Up}, query, close);
-  eq(query, 'history');
-  onKeyDown({keyCode: keyCodes.Up}, query, close);
-  onKeyUp({keyCode: keyCodes.Up}, query, close);
-  eq(query, 'search');
-  onKeyDown({keyCode: keyCodes.Up}, query, close);
-  onKeyUp({keyCode: keyCodes.Up}, query, close);
-  eq(query, 'this');
-  onKeyDown({keyCode: keyCodes.Down}, query, close);
-  onKeyUp({keyCode: keyCodes.Down}, query, close);
-  eq(query, 'search');
+  helpers.doKeys('Up');
+  eq(document.activeElement.value, 'checks');
+  helpers.doKeys('Up');
+  eq(document.activeElement.value, 'history');
+  helpers.doKeys('Up');
+  eq(document.activeElement.value, 'search');
+  helpers.doKeys('Up');
+  eq(document.activeElement.value, 'this');
+  helpers.doKeys('Down');
+  eq(document.activeElement.value, 'search');
 }, {value: ''});
 testVim('exCommand_history', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  helpers.doKeys(':');
-  cm.openDialog = helpers.fakeOpenDialog('sort');
-  helpers.doKeys(':');
-  cm.openDialog = helpers.fakeOpenDialog('map');
-  helpers.doKeys(':');
-  cm.openDialog = helpers.fakeOpenDialog('invalid');
-  helpers.doKeys(':');
-  var onKeyDown;
-  var onKeyUp;
-  var input = '';
-  var keyCodes = {
-    Up: 38,
-    Down: 40,
-    s: 115
-  };
-  cm.openDialog = function(template, callback, options) {
-    onKeyUp = options.onKeyUp;
-    onKeyDown = options.onKeyDown;
-  };
-  var close = function(newVal) {
-    if (typeof newVal == 'string') input = newVal;
-  }
+  helpers.doEx('registers');
+  helpers.doEx('sort');
+  helpers.doEx('map');
+  helpers.doEx('invalid');
   helpers.doKeys(':');
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'invalid');
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'map');
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'sort');
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'registers');
-  onKeyDown({keyCode: keyCodes.s}, '', close);
-  input = 's';
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'sort');
+  helpers.doKeys('Up');
+  eq(document.activeElement.value, 'invalid');
+  helpers.doKeys('Up');
+  eq(document.activeElement.value, 'map');
+  helpers.doKeys('Up');
+  eq(document.activeElement.value, 'sort');
+  helpers.doKeys('Up');
+  eq(document.activeElement.value, 'registers');
+  helpers.doKeys('<Esc>', ':');
+  helpers.doKeys('s');
+  eq(document.activeElement.value, 's');
+  helpers.doKeys('Up');
+  eq(document.activeElement.value, '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, '');
+  helpers.doKeys('/', 'foo');
+  eq(document.activeElement.value, 'foo');
+  helpers.doKeys('<C-u>');
+  eq(document.activeElement.value, '');
 });
 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, '');
+  helpers.doKeys(':', 'foo');
+  eq(document.activeElement.value, 'foo');
+  helpers.doKeys('<C-u>');
+  eq(document.activeElement.value, '');
 });
 testVim('.', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -3370,8 +3189,8 @@ testVim('._insert', function(cm, vim, helpers) {
   helpers.assertCursorAt(0, 6);
   helpers.doKeys('O');
   helpers.doKeys('xyz')
-  helpers.doInsertModeKeys('Backspace');
-  helpers.doInsertModeKeys('Down');
+  helpers.doKeys('Backspace');
+  helpers.doKeys('Down');
   helpers.doKeys('<Esc>');
   helpers.doKeys('.');
   eq('xy\nxy\ntestestt', cm.getValue());
@@ -3447,7 +3266,7 @@ testVim('._insert_cw_repeat', function(cm, vim, helpers) {
 testVim('._delete', function(cm, vim, helpers) {
   cm.setCursor(0, 5);
   helpers.doKeys('i');
-  helpers.doInsertModeKeys('Backspace');
+  helpers.doKeys('Backspace');
   helpers.doKeys('<Esc>');
   helpers.doKeys('.');
   eq('zace', cm.getValue());
@@ -3456,7 +3275,7 @@ testVim('._delete', function(cm, vim, helpers) {
 testVim('._delete_repeat', function(cm, vim, helpers) {
   cm.setCursor(0, 6);
   helpers.doKeys('i');
-  helpers.doInsertModeKeys('Backspace');
+  helpers.doKeys('Backspace');
   helpers.doKeys('<Esc>');
   helpers.doKeys('2', '.');
   eq('zzce', cm.getValue());
@@ -3748,8 +3567,7 @@ var moveTillCharacterSandbox =
 testVim('moveTillCharacter', function(cm, vim, helpers){
   cm.setCursor(0, 0);
   // Search for the 'q'.
-  cm.openDialog = helpers.fakeOpenDialog('q');
-  helpers.doKeys('/');
+  helpers.doKeys('/', 'q', '\n');
   eq(4, cm.getCursor().ch);
   // Jump to just before the first o in the list.
   helpers.doKeys('t');
@@ -3784,8 +3602,7 @@ testVim('searchForPipe', function(cm, vim, helpers){
   CodeMirror.Vim.setOption('pcre', false);
   cm.setCursor(0, 0);
   // Search for the '|'.
-  cm.openDialog = helpers.fakeOpenDialog('|');
-  helpers.doKeys('/');
+  helpers.doKeys('/', '|', '\n');
   eq(4, cm.getCursor().ch);
 }, { value: 'this|that'});
 
@@ -4088,10 +3905,8 @@ testVim('ex_global', function(cm, vim, helpers) {
   eq('two one\n two one\n two one', cm.getValue());
   helpers.doEx('1,2g/two/s//one');
   eq('one one\n one one\n two one', cm.getValue());
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    eq(' one one\n two one', text);
-  });
   helpers.doEx('g/^ /');
+  eq(' one one\n two one', helpers.getNotificationText());
 }, {value: 'one one\n one one\n one one'});
 testVim('ex_global_substitute_join', function(cm, vim, helpers) {
   helpers.doEx('g/o/s/\\n/;');
@@ -4103,39 +3918,20 @@ testVim('ex_global_substitute_split', function(cm, vim, helpers) {
 }, {value: 'one\ntwo\nthree\nfour\nfive\n'});
 testVim('ex_global_confirm', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
-  var onKeyDown;
-  var openDialogSave = cm.openDialog;
-  var KEYCODES = {
-    a: 65,
-    n: 78,
-    q: 81,
-    y: 89
-  };
-  // Intercept the ex command, 'global'
-  cm.openDialog = function(template, callback, options) {
-    // Intercept the prompt for the embedded ex command, 'substitute'
-    cm.openDialog = function(template, callback, options) {
-      onKeyDown = options.onKeyDown;
-    };
-    callback('g/one/s//two/gc');
-  };
-  helpers.doKeys(':');
-  var close = function() {};
-  onKeyDown({keyCode: KEYCODES.n}, '', close);
-  onKeyDown({keyCode: KEYCODES.y}, '', close);
-  onKeyDown({keyCode: KEYCODES.a}, '', close);
-  onKeyDown({keyCode: KEYCODES.q}, '', close);
-  onKeyDown({keyCode: KEYCODES.y}, '', close);
+  helpers.doEx('g/one/s//two/gc');
+  helpers.doKeys('n');
+  helpers.doKeys('y');
+  helpers.doKeys('a');
+  helpers.doKeys('q');
+  helpers.doKeys('y');
   eq('one two\n two two\n one one\n two one\n one one', cm.getValue());
 }, {value: 'one one\n one one\n one one\n one one\n one one'});
 // test for :vglobal command
 testVim('ex_vglobal', function(cm, vim, helpers) {
   helpers.doEx('v/e/s/o/e');
   eq('one\n twe\n three\n feur\n five\n', cm.getValue());
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    eq('one\n three\n feur\n', text);
-  });
   helpers.doEx('v/[vw]');
+  eq('one\n three\n feur\n', helpers.getNotificationText());
 }, {value: 'one\n two\n three\n four\n five\n'});
 // Basic substitute tests.
 testVim('ex_substitute_same_line', function(cm, vim, helpers) {
@@ -4206,14 +4002,15 @@ testVim('ex_substitute_visual_range', function(cm, vim, helpers) {
   cm.setCursor(1, 0);
   // Set last visual mode selection marks '< and '> at lines 2 and 4
   helpers.doKeys('V', '2', 'j', 'v');
-  helpers.doEx('\'<,\'>s/\\d/0/g');
+  helpers.doKeys(':');
+  eq(document.activeElement.value, "'<,'>");
+  helpers.doKeys('s/\\d/0/g', '\n');
   eq('1\n0\n0\n0\n5', cm.getValue());
 }, { value: '1\n2\n3\n4\n5' });
 testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
   // If the query is empty, use last query.
   cm.setCursor(1, 0);
-  cm.openDialog = helpers.fakeOpenDialog('1');
-  helpers.doKeys('/');
+  helpers.doKeys('/', '1\n');
   helpers.doEx('s//b/g');
   eq('abb ab2 ab3', cm.getValue());
 }, { value: 'a11 a12 a13' });
@@ -4425,46 +4222,12 @@ testSubstitute('ex_substitute_empty_or_match', {
   noPcreExpr: '%s/\\(..\\|$\\)/<\\1>/g'});
 function testSubstituteConfirm(name, command, initialValue, expectedValue, keys, finalPos) {
   testVim(name, function(cm, vim, helpers) {
-    var savedOpenDialog = cm.openDialog;
-    var savedKeyName = CodeMirror.keyName;
-    var onKeyDown;
-    var recordedCallback;
-    var closed = true; // Start out closed, set false on second openDialog.
-    function close() {
-      closed = true;
-    }
-    // First openDialog should save callback.
-    cm.openDialog = function(template, callback, options) {
-      recordedCallback = callback;
-    }
-    // Do first openDialog.
-    helpers.doKeys(':');
-    // Second openDialog should save keyDown handler.
-    cm.openDialog = function(template, callback, options) {
-      onKeyDown = options.onKeyDown;
-      closed = false;
-    };
-    // Return the command to Vim and trigger second openDialog.
-    recordedCallback(command);
-    // The event should really use keyCode, but here just mock it out and use
-    // key and replace keyName to just return key.
-    CodeMirror.keyName = function (e) { return e.key; }
-    keys = keys.toUpperCase();
+    helpers.doEx(command);
     for (var i = 0; i < keys.length; i++) {
-      is(!closed);
-      onKeyDown({ key: keys.charAt(i) }, '', close);
-    }
-    try {
-      eq(expectedValue, cm.getValue());
-      helpers.assertCursorAt(finalPos);
-      is(closed);
-    } catch(e) {
-      throw e
-    } finally {
-      // Restore overridden functions.
-      CodeMirror.keyName = savedKeyName;
-      cm.openDialog = savedOpenDialog;
+      helpers.doKeys(keys.charAt(i))
     }
+    eq(expectedValue, cm.getValue());
+    helpers.assertCursorAt(finalPos);
   }, { value: initialValue });
 }
 testSubstituteConfirm('ex_substitute_confirm_emptydoc',
@@ -4497,8 +4260,7 @@ testSubstituteConfirm('ex_substitute_confirm_range_last',
     '1,3s/a/b/cg', 'aa\na \na\na', 'bb\nb \na\na', 'yyl', makeCursor(1, 0));
 //:noh should clear highlighting of search-results but allow to resume search through n
 testVim('ex_noh_clearSearchHighlight', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('?');
+  helpers.doKeys('?', 'match', '\n');
   helpers.doEx('noh');
   eq(vim.searchState_.getOverlay(),null,'match-highlighting wasn\'t cleared');
   helpers.doKeys('n');
@@ -4695,9 +4457,8 @@ testVim('ex_unmap_key2key', function(cm, vim, helpers) {
   CodeMirror.Vim.mapclear();
 }, { value: 'abc' });
 testVim('ex_unmap_key2key_does_not_remove_default', function(cm, vim, helpers) {
-  expectFail(function() {
-    helpers.doEx('unmap a');
-  });
+  helpers.doEx('unmap a');
+  is(/No such mapping: unmap a/.test(helpers.getNotificationText()));
   helpers.doKeys('a');
   eq('vim-insert', cm.getOption('keyMap'));
   CodeMirror.Vim.mapclear();
@@ -5159,3 +4920,186 @@ testVim('increment_hexadecimal', function(cm, vim, helpers) {
   helpers.doKeys('<C-x>');
   eq('0x00', cm.getValue());
 }, { value: '0x0' });
+
+var typeKey = function() {
+  var keyCodeToKey = {};
+  var keyCodeToCode = {};
+
+  var alias = {};
+  alias.Ctrl = "Control";
+  alias.Option = "Alt";
+  alias.Cmd = alias.Super = alias.Meta = "Command";
+
+  var controlKeys = {
+    Shift: 16, Control: 17, Alt: 18, Meta: 224, Command: 224,
+    Backspace:8, Tab:9, Return: 13, Enter: 13,
+    Pause: 19, Escape: 27, PageUp: 33, PageDown: 34, End: 35, Home: 36,
+    Left: 37, Up: 38, Right: 39, Down: 40, Insert: 45, Delete: 46,
+    ArrowLeft: 37, ArrowUp: 38, ArrowRight: 39, ArrowDown: 40,
+  };
+  var shiftedKeys = {};
+  var printableKeys = {};
+  var specialKeys = {
+    Backquote: [192, "`", "~"], Minus: [189, "-", "_"], Equal: [187, "=", "+"],
+    BracketLeft: [219, "[", "{"], Backslash: [220, "\\", "|"], BracketRight: [221, "]", "}"],
+    Semicolon: [186, ";", ":"], Quote: [222, "'", '"'], Comma: [188, ",", "<"],
+    Period: [190, ".", ">"], Slash: [191, "/", "?"], Space: [32, " "], NumpadAdd: [107, "+"],
+    NumpadDecimal: [110, "."], NumpadSubtract: [109, "-"], NumpadDivide: [111, "/"], NumpadMultiply: [106, "*"]
+  };
+  for (var i in specialKeys) {
+    var key = specialKeys[i];
+    printableKeys[i] = printableKeys[key[1]] = shiftedKeys[key[2]] = key[0];
+    keyCodeToCode[key[0]] = i;
+  }
+  for (var i = 0; i < 10; i++) {
+    printableKeys[i] = shiftedKeys["!@#$%^&*()"[i]] = 48 + i;
+    keyCodeToCode[48 + i] = "Digit" + i;
+  }
+  for (var i = 65; i < 90; i++) {
+    var chr = String.fromCharCode(i + 32);
+    printableKeys[chr] = shiftedKeys[chr.toUpperCase()] = i;
+    keyCodeToCode[i] = "Key" + chr.toUpperCase();
+  }
+  for (var i = 1; i < 13; i++) {
+    controlKeys["F" + i] = 111 + i;
+  }
+
+  for (var i in controlKeys) {
+    keyCodeToKey[controlKeys[i]] = i;
+    keyCodeToCode[controlKeys[i]] = i;
+  }
+  controlKeys["\n"] = controlKeys.Return;
+  controlKeys.Del = controlKeys.Delete;
+  controlKeys.Esc = controlKeys.Escape;
+  controlKeys.Ins = controlKeys.Insert;
+
+  var shift = false;
+  var ctrl = false;
+  var meta = false;
+  var alt = false;
+  function reset() {
+    shift = ctrl = meta = alt = false;
+  }
+  function updateModifierStates(keyCode) {
+    if (keyCode == controlKeys.Shift)
+      return shift = true;
+    if (keyCode == controlKeys.Control)
+      return ctrl = true;
+    if (keyCode == controlKeys.Meta)
+      return meta = true;
+    if (keyCode == controlKeys.Alt)
+      return alt = true;
+  }
+
+  function sendKey(letter, timeout) {
+    var keyCode = controlKeys[letter] || printableKeys[letter] || shiftedKeys[letter];
+    var isModifier = updateModifierStates(keyCode);
+
+    var text = letter;
+    var isTextInput = true;
+    if (ctrl || alt || meta || controlKeys[letter]) {
+      isTextInput = false;
+    } else if (shift) {
+      text = text.toUpperCase();
+    }
+
+    var target = document.activeElement;
+    var prevented = emit("keydown", true);
+    if (isModifier) return;
+    if (!prevented && isTextInput) prevented = emit("keypress", true);
+    if (!prevented && ctrl && !alt && !meta && letter == "c") emitClipboard("copy");
+    if (!prevented) updateTextInput();
+    emit("keyup", true);
+    
+    function emitClipboard(type) {
+      var data = {bubbles: true, cancelable:true};
+      var event = new KeyboardEvent(type, data);
+      event.clipboardData = {
+        setData: function() {},
+        getData: function() {},
+      };
+      target.dispatchEvent(event);
+    }
+    function emit(type, bubbles) {
+      var el = document.activeElement;
+      var data = {bubbles: bubbles, cancelable:true};
+      data.charCode = text.charCodeAt(0);
+      data.keyCode = type == "keypress" ? data.charCode : keyCode;
+      data.which = data.keyCode;
+      data.shiftKey = shift || shiftedKeys[text];
+      data.ctrlKey = ctrl;
+      data.altKey = alt;
+      data.metaKey = meta;
+      data.key = text || keyCodeToKey[keyCode];
+      data.code = keyCodeToCode[keyCode];
+      var event = new KeyboardEvent(type, data);
+      
+      var el = document.activeElement;
+      el.dispatchEvent(event);
+      return event.defaultPrevented;
+    }
+    function updateTextInput() {
+      if (!isTextInput && keyCode == controlKeys.Return) {
+        text = "\n";
+      }
+      if (target._handleInputEventForTest) {
+        return target._handleInputEventForTest(text);
+      }
+      var isTextarea = "selectionStart" in target && typeof target.value == "string";
+      if (!isTextarea) return;
+
+      var start = target.selectionStart;
+      var end = target.selectionEnd;
+      var value = target.value;
+
+      if (!isTextInput) {
+        if (keyCode == controlKeys.Backspace) {
+          if (start != end) start = Math.max(start - 1, 0);
+        } else if (keyCode == controlKeys.Delete) {
+          if (start != end) end = Math.min(end + 1, value.length);
+        } else {
+          return;
+        }
+      }
+      var newValue = value.slice(0, start) + text + value.slice(end);
+      var newStart = start + text.length;
+      var newEnd = newStart;
+      if (newValue != value || newStart != start || newEnd != end) {
+        target.value = newValue;
+        target.setSelectionRange(newStart, newEnd);
+        emit("input", false);
+      }
+    }
+  }
+
+  function type() {
+    var keys = Array.prototype.slice.call(arguments);
+    for (var i = 0; i < keys.length; i++) {
+      var key = keys[i];
+      if (Array.isArray(key)) {
+        type.apply(null, key);
+        continue;
+      }
+      reset();
+      if (key.length > 1) {
+        var isKeyName = controlKeys[key] || printableKeys[key] || shiftedKeys[key];
+        if (!isKeyName) {
+          var parts = key.split("-");
+          var modifier = alias[parts[0]] || parts[0];
+          if (!updateModifierStates(controlKeys[modifier])) {
+            type.apply(null, key.split(""));
+            continue;
+          }
+          key = parts.pop();
+          parts.forEach(function(part) {
+            var keyCode = controlKeys[part];
+            updateModifierStates(keyCode);
+          });
+        }
+      }
+      sendKey(key);
+    }
+  }
+
+  return type;
+}();

From 5ac7b8a8f4f79684681f811d24e19c8cd642ead8 Mon Sep 17 00:00:00 2001
From: Jake Zimmerman <zimmerman.jake@gmail.com>
Date: Wed, 13 Oct 2021 15:51:39 -0700
Subject: [PATCH 4560/4742] Add <C-u> to delete back a line

Adds a new operatorMotion to vim.js

`:help i_CTRL-U`

                                                    *i_CTRL-U*
    CTRL-U          Delete all entered characters before the cursor in the current
                    line.  If there are no newly entered characters and
                    'backspace' is not empty, delete all characters before the
                    cursor in the current line.
                    See |i_backspacing| about joining lines.
                                                    *i_CTRL-U-default*
                    By default, sets a new undo point before deleting.
                    |default-mappings|
---
 keymap/vim.js    |  1 +
 test/vim_test.js | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8f534c55ca..8ab94c78eb 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -154,6 +154,7 @@
     { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
     { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
     { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
+    { keys: '<C-u>', type: 'operatorMotion', operator: 'delete', motion: 'moveToStartOfLine', context: 'insert' },
     { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
     //ignore C-w in normal mode
     { keys: '<C-w>', type: 'idle', context: 'normal' },
diff --git a/test/vim_test.js b/test/vim_test.js
index a4e3c204fe..f5b15d5f67 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -151,7 +151,7 @@ function testVim(name, run, opts, expectedFail) {
     cm.focus();
     // workaround for cm5 slow polling in blurred window
     Object.defineProperty(cm.state, "focused", {
-        set: function(e) {}, 
+        set: function(e) {},
         get: function() {
             return document.activeElement == cm.getInputField();
         }
@@ -1211,7 +1211,7 @@ testVim('gu_and_gU', function(cm, vim, helpers) {
   var register = helpers.getRegisterController().getRegister();
   eq('', register.toString());
   is(!register.linewise);
-  
+
   cm.setCursor(curStart);
   cm.setValue('abc efg\nxyz');
   helpers.doKeys('g', 'U', 'g', 'U');
@@ -1548,6 +1548,19 @@ testVim('<C-x>/<C-a> search forward', function(cm, vim, helpers) {
     helpers.assertCursorAt(0, 11);
   });
 }, {value: '__jmp1 jmp2 jmp'});
+testVim('insert_ctrl_u', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 10);
+  cm.setCursor(curStart);
+  helpers.doKeys('a');
+  helpers.doKeys('<C-u>');
+  eq('', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1/word2', register.toString());
+  is(!register.linewise);
+  var curEnd = makeCursor(0, 0);
+  eqCursorPos(curEnd, cm.getCursor());
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: 'word1/word2' });
 testVim('insert_ctrl_w', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 10);
   cm.setCursor(curStart);
@@ -5010,7 +5023,7 @@ var typeKey = function() {
     if (!prevented && ctrl && !alt && !meta && letter == "c") emitClipboard("copy");
     if (!prevented) updateTextInput();
     emit("keyup", true);
-    
+
     function emitClipboard(type) {
       var data = {bubbles: true, cancelable:true};
       var event = new KeyboardEvent(type, data);
@@ -5033,7 +5046,7 @@ var typeKey = function() {
       data.key = text || keyCodeToKey[keyCode];
       data.code = keyCodeToCode[keyCode];
       var event = new KeyboardEvent(type, data);
-      
+
       var el = document.activeElement;
       el.dispatchEvent(event);
       return event.defaultPrevented;

From 67bb88e0afa62bd3c427d1c2c521e2456e48cb86 Mon Sep 17 00:00:00 2001
From: Will Cassella <will@willcassella.com>
Date: Thu, 21 Oct 2021 08:20:23 -0700
Subject: [PATCH 4561/4742] [css mode] Add [video-]dynamic-range media-query
 support

---
 mode/css/css.js       | 6 ++++--
 mode/stylus/stylus.js | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 2407b328be..880b58ef7a 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -443,13 +443,15 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "monochrome", "min-monochrome", "max-monochrome", "resolution",
     "min-resolution", "max-resolution", "scan", "grid", "orientation",
     "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
-    "pointer", "any-pointer", "hover", "any-hover", "prefers-color-scheme"
+    "pointer", "any-pointer", "hover", "any-hover", "prefers-color-scheme",
+    "dynamic-range", "video-dynamic-range"
   ], mediaFeatures = keySet(mediaFeatures_);
 
   var mediaValueKeywords_ = [
     "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
     "interlace", "progressive",
-    "dark", "light"
+    "dark", "light",
+    "standard", "high"
   ], mediaValueKeywords = keySet(mediaValueKeywords_);
 
   var propertyKeywords_ = [
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 5cddff0320..730a8c51ca 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -737,12 +737,12 @@
   // Note, "url-prefix" should precede "url" in order to match correctly in documentTypesRegexp
   var documentTypes_ = ["domain", "regexp", "url-prefix", "url"];
   var mediaTypes_ = ["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"];
-  var mediaFeatures_ = ["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"];
+  var mediaFeatures_ = ["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid","dynamic-range","video-dynamic-range"];
   var propertyKeywords_ = ["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","will-change","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"];
   var nonStandardPropertyKeywords_ = ["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"];
   var fontProperties_ = ["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"];
   var colorKeywords_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
-  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around", "unset"];
+  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","high","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","standard","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around", "unset"];
 
   var wordOperatorKeywords_ = ["in","and","or","not","is not","is a","is","isnt","defined","if unless"],
       blockKeywords_ = ["for","if","else","unless", "from", "to"],

From 367b5e7bdc990683bd11567af9b746107e54ae61 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 22 Oct 2021 23:06:22 +0200
Subject: [PATCH 4562/4742] Avoid reading lineView.rest when it is null in
 mapFromLineView

---
 src/measurement/position_measurement.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index bb0ad50d67..2748aca935 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -61,12 +61,14 @@ function ensureLineHeights(cm, lineView, rect) {
 export function mapFromLineView(lineView, line, lineN) {
   if (lineView.line == line)
     return {map: lineView.measure.map, cache: lineView.measure.cache}
-  for (let i = 0; i < lineView.rest.length; i++)
-    if (lineView.rest[i] == line)
-      return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]}
-  for (let i = 0; i < lineView.rest.length; i++)
-    if (lineNo(lineView.rest[i]) > lineN)
-      return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true}
+  if (lineView.rest) {
+    for (let i = 0; i < lineView.rest.length; i++)
+      if (lineView.rest[i] == line)
+        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]}
+    for (let i = 0; i < lineView.rest.length; i++)
+      if (lineNo(lineView.rest[i]) > lineN)
+        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true}
+  }
 }
 
 // Render a line into the hidden node display.externalMeasured. Used

From eec2c6fa28a6a0670381c443b89fe54b861e94dd Mon Sep 17 00:00:00 2001
From: Christian Sonne <FreakCERS@gmail.com>
Date: Mon, 25 Oct 2021 13:52:16 +0200
Subject: [PATCH 4563/4742] [sql mode] Add SparkSQL builtins from current spec

---
 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 ead4d6db23..23cc9de18a 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -452,7 +452,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-sparksql", {
     name: "sql",
     keywords: set("add after all alter analyze and anti archive array as asc at between bucket buckets by cache cascade case cast change clear cluster clustered codegen collection column columns comment commit compact compactions compute concatenate cost create cross cube current current_date current_timestamp database databases data dbproperties defined delete delimited deny desc describe dfs directories distinct distribute drop else end escaped except exchange exists explain export extended external false fields fileformat first following for format formatted from full function functions global grant group grouping having if ignore import in index indexes inner inpath inputformat insert intersect interval into is items join keys last lateral lazy left like limit lines list load local location lock locks logical macro map minus msck natural no not null nulls of on optimize option options or order out outer outputformat over overwrite partition partitioned partitions percent preceding principals purge range recordreader recordwriter recover reduce refresh regexp rename repair replace reset restrict revoke right rlike role roles rollback rollup row rows schema schemas select semi separated serde serdeproperties set sets show skewed sort sorted start statistics stored stratify struct table tables tablesample tblproperties temp temporary terminated then to touch transaction transactions transform true truncate unarchive unbounded uncache union unlock unset use using values view when where window with"),
-    builtin: set("tinyint smallint int bigint boolean float double string binary timestamp decimal array map struct uniontype delimited serde sequencefile textfile rcfile inputformat outputformat"),
+    builtin: set("abs acos acosh add_months aggregate and any approx_count_distinct approx_percentile array array_contains array_distinct array_except array_intersect array_join array_max array_min array_position array_remove array_repeat array_sort array_union arrays_overlap arrays_zip ascii asin asinh assert_true atan atan2 atanh avg base64 between bigint bin binary bit_and bit_count bit_get bit_length bit_or bit_xor bool_and bool_or boolean bround btrim cardinality case cast cbrt ceil ceiling char char_length character_length chr coalesce collect_list collect_set concat concat_ws conv corr cos cosh cot count count_if count_min_sketch covar_pop covar_samp crc32 cume_dist current_catalog current_database current_date current_timestamp current_timezone current_user date date_add date_format date_from_unix_date date_part date_sub date_trunc datediff day dayofmonth dayofweek dayofyear decimal decode degrees delimited dense_rank div double e element_at elt encode every exists exp explode explode_outer expm1 extract factorial filter find_in_set first first_value flatten float floor forall format_number format_string from_csv from_json from_unixtime from_utc_timestamp get_json_object getbit greatest grouping grouping_id hash hex hour hypot if ifnull in initcap inline inline_outer input_file_block_length input_file_block_start input_file_name inputformat instr int isnan isnotnull isnull java_method json_array_length json_object_keys json_tuple kurtosis lag last last_day last_value lcase lead least left length levenshtein like ln locate log log10 log1p log2 lower lpad ltrim make_date make_dt_interval make_interval make_timestamp make_ym_interval map map_concat map_entries map_filter map_from_arrays map_from_entries map_keys map_values map_zip_with max max_by md5 mean min min_by minute mod monotonically_increasing_id month months_between named_struct nanvl negative next_day not now nth_value ntile nullif nvl nvl2 octet_length or outputformat overlay parse_url percent_rank percentile percentile_approx pi pmod posexplode posexplode_outer position positive pow power printf quarter radians raise_error rand randn random rank rcfile reflect regexp regexp_extract regexp_extract_all regexp_like regexp_replace repeat replace reverse right rint rlike round row_number rpad rtrim schema_of_csv schema_of_json second sentences sequence sequencefile serde session_window sha sha1 sha2 shiftleft shiftright shiftrightunsigned shuffle sign signum sin sinh size skewness slice smallint some sort_array soundex space spark_partition_id split sqrt stack std stddev stddev_pop stddev_samp str_to_map string struct substr substring substring_index sum tan tanh textfile timestamp timestamp_micros timestamp_millis timestamp_seconds tinyint to_csv to_date to_json to_timestamp to_unix_timestamp to_utc_timestamp transform transform_keys transform_values translate trim trunc try_add try_divide typeof ucase unbase64 unhex uniontype unix_date unix_micros unix_millis unix_seconds unix_timestamp upper uuid var_pop var_samp variance version weekday weekofyear when width_bucket window xpath xpath_boolean xpath_double xpath_float xpath_int xpath_long xpath_number xpath_short xpath_string xxhash64 year zip_with"),
     atoms: set("false true null"),
     operatorChars: /^[*\/+\-%<>!=~&|^]/,
     dateSQL: set("date time timestamp"),

From e67ca325dc623b80679580688a5f6a354674e764 Mon Sep 17 00:00:00 2001
From: AHOHNMYC <24810600+AHOHNMYC@users.noreply.github.com>
Date: Mon, 25 Oct 2021 23:32:23 +0300
Subject: [PATCH 4564/4742] [assembly] Added 8-bit registers

8-bit registers are listed here: https://sourceware.org/binutils/docs-2.37/as/i386_002dRegs.html
---
 mode/gas/gas.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index b3515abe77..016dc29d60 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -144,18 +144,26 @@ CodeMirror.defineMode("gas", function(_config, parserConfig) {
   function x86(_parserConfig) {
     lineCommentStartSymbol = "#";
 
+    registers.al  = "variable";
+    registers.ah  = "variable";
     registers.ax  = "variable";
     registers.eax = "variable-2";
     registers.rax = "variable-3";
 
+    registers.bl  = "variable";
+    registers.bh  = "variable";
     registers.bx  = "variable";
     registers.ebx = "variable-2";
     registers.rbx = "variable-3";
 
+    registers.cl  = "variable";
+    registers.ch  = "variable";
     registers.cx  = "variable";
     registers.ecx = "variable-2";
     registers.rcx = "variable-3";
 
+    registers.dl  = "variable";
+    registers.dh  = "variable";
     registers.dx  = "variable";
     registers.edx = "variable-2";
     registers.rdx = "variable-3";

From 27be898e9450dedc2cbc1bb3d87f64c4596bd132 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 21 Sep 2021 23:49:18 +0400
Subject: [PATCH 4565/4742] [vim] simpler way of drawing cursor

---
 keymap/vim.js            | 118 ++++++++++-----------------------------
 lib/codemirror.css       |  20 +++----
 src/display/selection.js |  13 +++--
 test/vim_test.js         |  17 ++++++
 4 files changed, 63 insertions(+), 105 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8ab94c78eb..2331a0af19 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -44,6 +44,25 @@
 })(function(CodeMirror) {
   'use strict';
 
+  function transformCursor(cm, range) {
+    var vim = cm.state.vim
+    if (!vim || vim.insertMode) return range.head;
+    var head = vim.sel.head;
+    if (!head)  return range.head;
+
+    if (vim.visualBlock) {
+      if (range.head.line != head.line) {
+        return;
+      }
+    }
+    if (range.from() == range.anchor && !range.empty()) {
+      if (range.head.line == head.line && range.head.ch != head.ch)
+        return new CodeMirror.Pos(range.head.line, range.head.ch - 1);
+    }
+
+    return range.head;
+  }
+
   var defaultKeymap = [
     // Key to key mapping. This goes first to make it possible to override
     // existing mappings.
@@ -270,11 +289,8 @@
 
     function detachVimMap(cm, next) {
       if (this == CodeMirror.keyMap.vim) {
+        cm.options.$customCursor = null;
         CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
-        if (cm.getOption("inputStyle") == "contenteditable" && document.body.style.caretColor != null) {
-          disableFatCursorMark(cm);
-          cm.getInputField().style.caretColor = "";
-        }
       }
 
       if (!next || next.attach != attachVimMap)
@@ -282,57 +298,15 @@
     }
     function attachVimMap(cm, prev) {
       if (this == CodeMirror.keyMap.vim) {
+        if (cm.curOp) cm.curOp.selectionChanged = true;
+        cm.options.$customCursor = transformCursor;
         CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
-        if (cm.getOption("inputStyle") == "contenteditable" && document.body.style.caretColor != null) {
-          enableFatCursorMark(cm);
-          cm.getInputField().style.caretColor = "transparent";
-        }
       }
 
       if (!prev || prev.attach != attachVimMap)
         enterVimMode(cm);
     }
 
-    function updateFatCursorMark(cm) {
-      if (!cm.state.fatCursorMarks) return;
-      clearFatCursorMark(cm);
-      var ranges = cm.listSelections(), result = []
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (range.empty()) {
-          var lineLength = cm.getLine(range.anchor.line).length;
-          if (range.anchor.ch < lineLength) {
-            result.push(cm.markText(range.anchor, Pos(range.anchor.line, range.anchor.ch + 1),
-                                    {className: "cm-fat-cursor-mark"}));
-          } else {
-            result.push(cm.markText(Pos(range.anchor.line, lineLength - 1),
-                                    Pos(range.anchor.line, lineLength),
-                                    {className: "cm-fat-cursor-mark"}));
-          }
-        }
-      }
-      cm.state.fatCursorMarks = result;
-    }
-
-    function clearFatCursorMark(cm) {
-      var marks = cm.state.fatCursorMarks;
-      if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
-    }
-
-    function enableFatCursorMark(cm) {
-      cm.state.fatCursorMarks = [];
-      updateFatCursorMark(cm)
-      cm.on("cursorActivity", updateFatCursorMark)
-    }
-
-    function disableFatCursorMark(cm) {
-      clearFatCursorMark(cm);
-      cm.off("cursorActivity", updateFatCursorMark);
-      // explicitly set fatCursorMarks to null because event listener above
-      // can be invoke after removing it, if off is called from operation
-      cm.state.fatCursorMarks = null;
-    }
-
     // Deprecated, simply setting the keymap works again.
     CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
       if (val && cm.getOption("keyMap") != "vim")
@@ -692,8 +666,6 @@
           // executed in between.
           lastMotion: null,
           marks: {},
-          // Mark for rendering fake cursor for visual mode.
-          fakeCursor: null,
           insertMode: false,
           // Repeat count for changes made in insert mode, triggered by key
           // sequences like 3,i. Only exists when insertMode is true.
@@ -2286,7 +2258,7 @@
           text = cm.getSelection();
           var replacement = fillArray('', ranges.length);
           cm.replaceSelections(replacement);
-          finalHead = ranges[0].anchor;
+          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
         }
         vimGlobalState.registerController.pushText(
             args.registerName, 'delete', text,
@@ -2506,7 +2478,7 @@
           } else {
             head = Pos(
                 Math.min(sel.head.line, sel.anchor.line),
-                Math.max(sel.head.ch + 1, sel.anchor.ch));
+                Math.max(sel.head.ch, sel.anchor.ch) + 1);
             height = Math.abs(sel.head.line - sel.anchor.line) + 1;
           }
         } else if (insertAt == 'inplace') {
@@ -3220,7 +3192,6 @@
         vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
       var cmSel = makeCmSelection(cm, sel, mode);
       cm.setSelections(cmSel.ranges, cmSel.primary);
-      updateFakeCursor(cm);
     }
     function makeCmSelection(cm, sel, mode, exclusive) {
       var head = copyCursor(sel.head);
@@ -3253,16 +3224,18 @@
         };
       } else if (mode == 'block') {
         var top = Math.min(anchor.line, head.line),
-            left = Math.min(anchor.ch, head.ch),
+            fromCh = anchor.ch,
             bottom = Math.max(anchor.line, head.line),
-            right = Math.max(anchor.ch, head.ch) + 1;
+            toCh = head.ch;
+        if (fromCh < toCh) { toCh += 1 }
+        else { fromCh += 1 };
         var height = bottom - top + 1;
         var primary = head.line == top ? 0 : height - 1;
         var ranges = [];
         for (var i = 0; i < height; i++) {
           ranges.push({
-            anchor: Pos(top + i, left),
-            head: Pos(top + i, right)
+            anchor: Pos(top + i, fromCh),
+            head: Pos(top + i, toCh)
           });
         }
         return {
@@ -3296,7 +3269,6 @@
       vim.visualLine = false;
       vim.visualBlock = false;
       if (!vim.insertMode) CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-      clearFakeCursor(vim);
     }
 
     // Remove any trailing newlines from the selection. For
@@ -5581,36 +5553,6 @@
       } else if (!cm.curOp.isVimOp) {
         handleExternalSelection(cm, vim);
       }
-      if (vim.visualMode) {
-        updateFakeCursor(cm);
-      }
-    }
-    /**
-     * Keeps track of a fake cursor to support visual mode cursor behavior.
-     */
-    function updateFakeCursor(cm) {
-      var className = 'cm-animate-fat-cursor';
-      var vim = cm.state.vim;
-      var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
-      var to = offsetCursor(from, 0, 1);
-      clearFakeCursor(vim);
-      // In visual mode, the cursor may be positioned over EOL.
-      if (from.ch == cm.getLine(from.line).length) {
-        var widget = dom('span', { 'class': className }, '\u00a0');
-        vim.fakeCursorBookmark = cm.setBookmark(from, {widget: widget});
-      } else {
-        vim.fakeCursor = cm.markText(from, to, {className: className});
-      }
-    }
-    function clearFakeCursor(vim) {
-      if (vim.fakeCursor) {
-        vim.fakeCursor.clear();
-        vim.fakeCursor = null;
-      }
-      if (vim.fakeCursorBookmark) {
-        vim.fakeCursorBookmark.clear();
-        vim.fakeCursorBookmark = null;
-      }
     }
     function handleExternalSelection(cm, vim) {
       var anchor = cm.getCursor('anchor');
diff --git a/lib/codemirror.css b/lib/codemirror.css
index 86061bb04f..d85fbc930b 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -60,19 +60,13 @@
 .cm-fat-cursor div.CodeMirror-cursors {
   z-index: 1;
 }
-.cm-fat-cursor-mark {
-  background-color: rgba(20, 255, 20, 0.5);
-  -webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
-}
-.cm-animate-fat-cursor {
-  width: auto;
-  -webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
-  background-color: #7e7;
-}
+.cm-fat-cursor .CodeMirror-line::selection,
+.cm-fat-cursor .CodeMirror-line > span::selection, 
+.cm-fat-cursor .CodeMirror-line > span > span::selection { background: transparent; }
+.cm-fat-cursor .CodeMirror-line::-moz-selection,
+.cm-fat-cursor .CodeMirror-line > span::-moz-selection,
+.cm-fat-cursor .CodeMirror-line > span > span::-moz-selection { background: transparent; }
+.cm-fat-cursor { caret-color: transparent; }
 @-moz-keyframes blink {
   0% {}
   50% { background-color: transparent; }
diff --git a/src/display/selection.js b/src/display/selection.js
index 78cea58eef..f53c790725 100644
--- a/src/display/selection.js
+++ b/src/display/selection.js
@@ -15,13 +15,19 @@ export function prepareSelection(cm, primary = true) {
   let curFragment = result.cursors = document.createDocumentFragment()
   let selFragment = result.selection = document.createDocumentFragment()
 
+  let customCursor = cm.options.$customCursor
+  if (customCursor) primary = true
   for (let i = 0; i < doc.sel.ranges.length; i++) {
     if (!primary && i == doc.sel.primIndex) continue
     let range = doc.sel.ranges[i]
     if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue
     let collapsed = range.empty()
-    if (collapsed || cm.options.showCursorWhenSelecting)
+    if (customCursor) {
+      let head = customCursor(cm, range)
+      if (head) drawSelectionCursor(cm, head, curFragment)
+    } else if (collapsed || cm.options.showCursorWhenSelecting) {
       drawSelectionCursor(cm, range.head, curFragment)
+    }
     if (!collapsed)
       drawSelectionRange(cm, range, selFragment)
   }
@@ -39,9 +45,8 @@ export function drawSelectionCursor(cm, head, output) {
 
   if (/\bcm-fat-cursor\b/.test(cm.getWrapperElement().className)) {
     let charPos = charCoords(cm, head, "div", null, null)
-    if (charPos.right - charPos.left > 0) {
-      cursor.style.width = (charPos.right - charPos.left) + "px"
-    }
+    let width = charPos.right - charPos.left
+    cursor.style.width = (width > 0 ? width : cm.defaultCharWidth()) + "px"
   }
 
   if (pos.other) {
diff --git a/test/vim_test.js b/test/vim_test.js
index f5b15d5f67..3506b8818d 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -1106,6 +1106,23 @@ testVim('I_visual_block_replay', function(cm, vim, helpers) {
   eq('12+-34\n5+-6+-78\na+-b+-cdefg\nx+-yz', cm.getValue());
 }, {value: '1234\n5678\nabcdefg\nxyz'});
 
+testVim('visual_block_backwards', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('3', 'l');
+  helpers.doKeys('<C-v>', '2', 'j', '2', '<Left>');
+  eq('123\n678\nbcd', cm.getSelection());
+  helpers.doKeys('A');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('A', '<Esc>');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('g', 'v');
+  eq('123\n678\nbcd', cm.getSelection());
+  helpers.doKeys('x');
+  helpers.assertCursorAt(0, 1);
+  helpers.doKeys('g', 'v');
+  eq('A4 \nA9 \nAef', cm.getSelection());
+}, {value: '01234 line 1\n56789 line 2\nabcdefg line 3\nline 4'});
+
 testVim('d_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'd');

From 98d2974b76e3d03caa8def8e3026b9c8020aec14 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 29 Oct 2021 02:13:18 +0400
Subject: [PATCH 4566/4742] [vim] always use 'new Pos' to allow converting it
 into a class

---
 keymap/vim.js    | 162 +++++++++++++++++++++++------------------------
 test/vim_test.js |  92 +++++++++++++--------------
 2 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 2331a0af19..8491a49314 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -44,8 +44,10 @@
 })(function(CodeMirror) {
   'use strict';
 
+  var Pos = CodeMirror.Pos;
+
   function transformCursor(cm, range) {
-    var vim = cm.state.vim
+    var vim = cm.state.vim;
     if (!vim || vim.insertMode) return range.head;
     var head = vim.sel.head;
     if (!head)  return range.head;
@@ -57,7 +59,7 @@
     }
     if (range.from() == range.anchor && !range.empty()) {
       if (range.head.line == head.line && range.head.ch != head.ch)
-        return new CodeMirror.Pos(range.head.line, range.head.ch - 1);
+        return new Pos(range.head.line, range.head.ch - 1);
     }
 
     return range.head;
@@ -268,8 +270,6 @@
     { name: 'global', shortName: 'g' }
   ];
 
-  var Pos = CodeMirror.Pos;
-
   var Vim = function() {
     function enterVimMode(cm) {
       cm.setOption('disableInput', true);
@@ -1620,17 +1620,17 @@
             var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
             if (lastSel.visualLine) {
               // Linewise Visual mode: The same number of lines.
-              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+              newHead = new Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
             } else if (lastSel.visualBlock) {
               // Blockwise Visual mode: The same number of lines and columns.
-              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
+              newHead = new Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
             } else if (lastSel.head.line == lastSel.anchor.line) {
               // Normal Visual mode within one line: The same number of characters.
-              newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
+              newHead = new Pos(oldAnchor.line, oldAnchor.ch + chOffset);
             } else {
               // Normal Visual mode with several lines: The same number of lines, in the
               // last line the same number of characters as in the last line the last time.
-              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+              newHead = new Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
             }
             vim.visualMode = true;
             vim.visualLine = lastSel.visualLine;
@@ -1670,7 +1670,7 @@
                   ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
                 }
               } else if (mode == 'line') {
-                ranges[0].head = Pos(ranges[0].head.line + 1, 0);
+                ranges[0].head = new Pos(ranges[0].head.line + 1, 0);
               }
             }
           } else {
@@ -1732,22 +1732,22 @@
     var motions = {
       moveToTopLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
-        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+        return new Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
       moveToMiddleLine: function(cm) {
         var range = getUserVisibleLines(cm);
         var line = Math.floor((range.top + range.bottom) * 0.5);
-        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+        return new Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
       moveToBottomLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
-        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+        return new Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
       expandToLine: function(_cm, head, motionArgs) {
         // Expands forward to end of line, and then to next line if repeat is
         // >1. Does not handle backward motion!
         var cur = head;
-        return Pos(cur.line + motionArgs.repeat - 1, Infinity);
+        return new Pos(cur.line + motionArgs.repeat - 1, Infinity);
       },
       findNext: function(cm, _head, motionArgs) {
         var state = getSearchState(cm);
@@ -1804,7 +1804,7 @@
         // For whatever reason, when we use the "to" as returned by searchcursor.js directly,
         // the resulting selection is extended by 1 char. Let's shrink it so that only the
         // match is selected.
-        var to = Pos(next[1].line, next[1].ch - 1);
+        var to = new Pos(next[1].line, next[1].ch - 1);
 
         if (vim.visualMode) {
           // If we were in visualLine or visualBlock mode, get out of it.
@@ -1853,8 +1853,8 @@
         if (vim.visualBlock && motionArgs.sameLine) {
           var sel = vim.sel;
           return [
-            clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
-            clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
+            clipCursorToContent(cm, new Pos(sel.anchor.line, sel.head.ch)),
+            clipCursorToContent(cm, new Pos(sel.head.line, sel.anchor.ch))
           ];
         } else {
           return ([vim.sel.head, vim.sel.anchor]);
@@ -1894,7 +1894,7 @@
           // Vim places the cursor on the first non-whitespace character of
           // the line if there is one, else it places the cursor at the end
           // of the line, regardless of whether a mark was found.
-          best = Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
+          best = new Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
         }
         return best;
       },
@@ -1902,7 +1902,7 @@
         var cur = head;
         var repeat = motionArgs.repeat;
         var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
-        return Pos(cur.line, ch);
+        return new Pos(cur.line, ch);
       },
       moveByLines: function(cm, head, motionArgs, vim) {
         var cur = head;
@@ -1944,8 +1944,8 @@
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
           vim.lastHPos = endCh;
         }
-        vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
-        return Pos(line, endCh);
+        vim.lastHSPos = cm.charCoords(new Pos(line, endCh),'div').left;
+        return new Pos(line, endCh);
       },
       moveByDisplayLines: function(cm, head, motionArgs, vim) {
         var cur = head;
@@ -1967,7 +1967,7 @@
             var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
             var res = cm.coordsChar(goalCoords, 'div');
           } else {
-            var resCoords = cm.charCoords(Pos(cm.firstLine(), 0), 'div');
+            var resCoords = cm.charCoords(new Pos(cm.firstLine(), 0), 'div');
             resCoords.left = vim.lastHSPos;
             res = cm.coordsChar(resCoords, 'div');
           }
@@ -2047,7 +2047,7 @@
         // Go to the start of the line where the text begins, or the end for
         // whitespace-only lines
         var cursor = head;
-        return Pos(cursor.line,
+        return new Pos(cursor.line,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
       },
       moveToMatchedSymbol: function(cm, head) {
@@ -2059,7 +2059,7 @@
         for (; ch < lineText.length; ch++) {
           symbol = lineText.charAt(ch);
           if (symbol && isMatchableSymbol(symbol)) {
-            var style = cm.getTokenTypeAt(Pos(line, ch + 1));
+            var style = cm.getTokenTypeAt(new Pos(line, ch + 1));
             if (style !== "string" && style !== "comment") {
               break;
             }
@@ -2068,21 +2068,21 @@
         if (ch < lineText.length) {
           // Only include angle brackets in analysis if they are being matched.
           var re = (ch === '<' || ch === '>') ? /[(){}[\]<>]/ : /[(){}[\]]/;
-          var matched = cm.findMatchingBracket(Pos(line, ch), {bracketRegex: re});
+          var matched = cm.findMatchingBracket(new Pos(line, ch), {bracketRegex: re});
           return matched.to;
         } else {
           return cursor;
         }
       },
       moveToStartOfLine: function(_cm, head) {
-        return Pos(head.line, 0);
+        return new Pos(head.line, 0);
       },
       moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
         var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
         if (motionArgs.repeatIsExplicit) {
           lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
         }
-        return Pos(lineNum,
+        return new Pos(lineNum,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
       },
       textObjectManipulation: function(cm, head, motionArgs, vim) {
@@ -2245,7 +2245,7 @@
             if (anchor.line == cm.firstLine()) {
               anchor.ch = 0;
             } else {
-              anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
+              anchor = new Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
             }
           }
           text = cm.getRange(anchor, head);
@@ -2392,7 +2392,7 @@
       },
       scrollToCursor: function(cm, actionArgs) {
         var lineNum = cm.getCursor().line;
-        var charCoords = cm.charCoords(Pos(lineNum, 0), 'local');
+        var charCoords = cm.charCoords(new Pos(lineNum, 0), 'local');
         var height = cm.getScrollInfo().clientHeight;
         var y = charCoords.top;
         var lineHeight = charCoords.bottom - y;
@@ -2444,9 +2444,9 @@
         var head = actionArgs.head || cm.getCursor('head');
         var height = cm.listSelections().length;
         if (insertAt == 'eol') {
-          head = Pos(head.line, lineLength(cm, head.line));
+          head = new Pos(head.line, lineLength(cm, head.line));
         } else if (insertAt == 'bol') {
-          head = Pos(head.line, 0);
+          head = new Pos(head.line, 0);
         } else if (insertAt == 'charAfter') {
           head = offsetCursor(head, 0, 1);
         } else if (insertAt == 'firstNonBlank') {
@@ -2458,10 +2458,10 @@
             if (sel.head.line < sel.anchor.line) {
               head = sel.head;
             } else {
-              head = Pos(sel.anchor.line, 0);
+              head = new Pos(sel.anchor.line, 0);
             }
           } else {
-            head = Pos(
+            head = new Pos(
                 Math.min(sel.head.line, sel.anchor.line),
                 Math.min(sel.head.ch, sel.anchor.ch));
             height = Math.abs(sel.head.line - sel.anchor.line) + 1;
@@ -2473,10 +2473,10 @@
             if (sel.head.line >= sel.anchor.line) {
               head = offsetCursor(sel.head, 0, 1);
             } else {
-              head = Pos(sel.anchor.line, 0);
+              head = new Pos(sel.anchor.line, 0);
             }
           } else {
-            head = Pos(
+            head = new Pos(
                 Math.min(sel.head.line, sel.anchor.line),
                 Math.max(sel.head.ch, sel.anchor.ch) + 1);
             height = Math.abs(sel.head.line - sel.anchor.line) + 1;
@@ -2522,7 +2522,7 @@
           vim.visualLine = !!actionArgs.linewise;
           vim.visualBlock = !!actionArgs.blockwise;
           head = clipCursorToContent(
-              cm, Pos(anchor.line, anchor.ch + repeat - 1));
+              cm, new Pos(anchor.line, anchor.ch + repeat - 1));
           vim.sel = {
             anchor: anchor,
             head: head
@@ -2585,13 +2585,13 @@
           // Repeat is the number of lines to join. Minimum 2 lines.
           var repeat = Math.max(actionArgs.repeat, 2);
           curStart = cm.getCursor();
-          curEnd = clipCursorToContent(cm, Pos(curStart.line + repeat - 1,
+          curEnd = clipCursorToContent(cm, new Pos(curStart.line + repeat - 1,
                                                Infinity));
         }
         var finalCh = 0;
         for (var i = curStart.line; i < curEnd.line; i++) {
           finalCh = lineLength(cm, curStart.line);
-          var tmp = Pos(curStart.line + 1,
+          var tmp = new Pos(curStart.line + 1,
                         lineLength(cm, curStart.line + 1));
           var text = cm.getRange(curStart, tmp);
           text = actionArgs.keepSpaces
@@ -2599,7 +2599,7 @@
             : text.replace(/\n\s*/g, ' ');
           cm.replaceRange(text, curStart, tmp);
         }
-        var curFinalPos = Pos(curStart.line, finalCh);
+        var curFinalPos = new Pos(curStart.line, finalCh);
         if (vim.visualMode) {
           exitVisualMode(cm, false);
         }
@@ -2610,7 +2610,7 @@
         var insertAt = copyCursor(cm.getCursor());
         if (insertAt.line === cm.firstLine() && !actionArgs.after) {
           // Special case for inserting newline before start of document.
-          cm.replaceRange('\n', Pos(cm.firstLine(), 0));
+          cm.replaceRange('\n', new Pos(cm.firstLine(), 0));
           cm.setCursor(cm.firstLine(), 0);
         } else {
           insertAt.line = (actionArgs.after) ? insertAt.line :
@@ -2711,7 +2711,7 @@
             // first delete the selected text
             cm.replaceSelections(emptyStrings);
             // Set new selections as per the block length of the yanked text
-            selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch);
+            selectionEnd = new Pos(selectionStart.line + text.length-1, selectionStart.ch);
             cm.setCursor(selectionStart);
             selectBlock(cm, selectionEnd);
             cm.replaceSelections(text);
@@ -2738,7 +2738,7 @@
             for (var i = 0; i < text.length; i++) {
               var line = cur.line+i;
               if (line > cm.lastLine()) {
-                cm.replaceRange('\n',  Pos(line, 0));
+                cm.replaceRange('\n',  new Pos(line, 0));
               }
               var lastCh = lineLength(cm, line);
               if (lastCh < cur.ch) {
@@ -2746,18 +2746,18 @@
               }
             }
             cm.setCursor(cur);
-            selectBlock(cm, Pos(cur.line + text.length-1, cur.ch));
+            selectBlock(cm, new Pos(cur.line + text.length-1, cur.ch));
             cm.replaceSelections(text);
             curPosFinal = cur;
           } else {
             cm.replaceRange(text, cur);
             // Now fine tune the cursor to where we want it.
             if (linewise && actionArgs.after) {
-              curPosFinal = Pos(
+              curPosFinal = new Pos(
               cur.line + 1,
               findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
             } else if (linewise && !actionArgs.after) {
-              curPosFinal = Pos(
+              curPosFinal = new Pos(
                 cur.line,
                 findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
             } else if (!linewise && actionArgs.after) {
@@ -2805,7 +2805,7 @@
           if (replaceTo > line.length) {
             replaceTo=line.length;
           }
-          curEnd = Pos(curStart.line, replaceTo);
+          curEnd = new Pos(curStart.line, replaceTo);
         }
         if (replaceWith=='\n') {
           if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
@@ -2861,13 +2861,13 @@
           } else {
             numberStr = baseStr + zeroPadding + numberStr;
           }
-          var from = Pos(cur.line, start);
-          var to = Pos(cur.line, end);
+          var from = new Pos(cur.line, start);
+          var to = new Pos(cur.line, end);
           cm.replaceRange(numberStr, from, to);
         } else {
           return;
         }
-        cm.setCursor(Pos(cur.line, start + numberStr.length - 1));
+        cm.setCursor(new Pos(cur.line, start + numberStr.length - 1));
       },
       repeatLastEdit: function(cm, actionArgs, vim) {
         var lastEditInputState = vim.lastEditInputState;
@@ -2904,7 +2904,7 @@
       var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
       var maxCh = lineLength(cm, line) - 1 + !!includeLineBreak;
       var ch = Math.min(Math.max(0, cur.ch), maxCh);
-      return Pos(line, ch);
+      return new Pos(line, ch);
     }
     function copyArgs(args) {
       var ret = {};
@@ -2920,7 +2920,7 @@
         offsetCh = offsetLine.ch;
         offsetLine = offsetLine.line;
       }
-      return Pos(cur.line + offsetLine, cur.ch + offsetCh);
+      return new Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
     function commandMatches(keys, keyMap, context, inputState) {
       // Partial matches are not applied. They inform the key handler
@@ -2980,7 +2980,7 @@
       };
     }
     function copyCursor(cur) {
-      return Pos(cur.line, cur.ch);
+      return new Pos(cur.line, cur.ch);
     }
     function cursorEqual(cur1, cur2) {
       return cur1.ch == cur2.ch && cur1.line == cur2.line;
@@ -3027,7 +3027,7 @@
     function extendLineToColumn(cm, lineNum, column) {
       var endCh = lineLength(cm, lineNum);
       var spaces = new Array(column-endCh+1).join(' ');
-      cm.setCursor(Pos(lineNum, endCh));
+      cm.setCursor(new Pos(lineNum, endCh));
       cm.replaceRange(spaces, cm.getCursor());
     }
     // This functions selects a rectangular block
@@ -3108,13 +3108,13 @@
         if (block) {
           var width = block.width;
           var height = block.height;
-          selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
+          selectionEnd = new Pos(selectionStart.line + height, selectionStart.ch + width);
           var selections = [];
           // selectBlock creates a 'proper' rectangular block.
           // We do not want that in all cases, so we manually set selections.
           for (var i = selectionStart.line; i < selectionEnd.line; i++) {
-            var anchor = Pos(i, selectionStart.ch);
-            var head = Pos(i, selectionEnd.ch);
+            var anchor = new Pos(i, selectionStart.ch);
+            var head = new Pos(i, selectionEnd.ch);
             var range = {anchor: anchor, head: head};
             selections.push(range);
           }
@@ -3126,8 +3126,8 @@
           var ch = end.ch - start.ch;
           selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
           if (lastSelection.visualLine) {
-            selectionStart = Pos(selectionStart.line, 0);
-            selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
+            selectionStart = new Pos(selectionStart.line, 0);
+            selectionEnd = new Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
           }
           cm.setSelection(selectionStart, selectionEnd);
         }
@@ -3176,7 +3176,7 @@
         head = cursorMax(head, end);
         head = offsetCursor(head, 0, -1);
         if (head.ch == -1 && head.line != cm.firstLine()) {
-          head = Pos(head.line - 1, lineLength(cm, head.line - 1));
+          head = new Pos(head.line - 1, lineLength(cm, head.line - 1));
         }
       }
       return [anchor, head];
@@ -3234,8 +3234,8 @@
         var ranges = [];
         for (var i = 0; i < height; i++) {
           ranges.push({
-            anchor: Pos(top + i, fromCh),
-            head: Pos(top + i, toCh)
+            anchor: new Pos(top + i, fromCh),
+            head: new Pos(top + i, toCh)
           });
         }
         return {
@@ -3356,7 +3356,7 @@
           if (!start) { start = wordStart; }
         }
       }
-      return { start: Pos(cur.line, start), end: Pos(cur.line, end) };
+      return { start: new Pos(cur.line, start), end: new Pos(cur.line, end) };
     }
 
     /**
@@ -3530,7 +3530,7 @@
         }
       }
       if (state.nextCh || state.curMoveThrough) {
-        return Pos(line, state.index);
+        return new Pos(line, state.index);
       }
       return cur;
     }
@@ -3642,7 +3642,7 @@
           break;
         }
         words.push(word);
-        cur = Pos(word.line, forward ? (word.to - 1) : word.from);
+        cur = new Pos(word.line, forward ? (word.to - 1) : word.from);
       }
       var shortCircuit = words.length != repeat;
       var firstWord = words[0];
@@ -3653,25 +3653,25 @@
           // We did not start in the middle of a word. Discard the extra word at the end.
           lastWord = words.pop();
         }
-        return Pos(lastWord.line, lastWord.from);
+        return new Pos(lastWord.line, lastWord.from);
       } else if (forward && wordEnd) {
-        return Pos(lastWord.line, lastWord.to - 1);
+        return new Pos(lastWord.line, lastWord.to - 1);
       } else if (!forward && wordEnd) {
         // ge
         if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
           // We did not start in the middle of a word. Discard the extra word at the end.
           lastWord = words.pop();
         }
-        return Pos(lastWord.line, lastWord.to);
+        return new Pos(lastWord.line, lastWord.to);
       } else {
         // b
-        return Pos(lastWord.line, lastWord.from);
+        return new Pos(lastWord.line, lastWord.from);
       }
     }
 
     function moveToEol(cm, head, motionArgs, vim, keepHPos) {
       var cur = head;
-      var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
+      var retval= new Pos(cur.line + motionArgs.repeat - 1, Infinity);
       var end=cm.clipPos(retval);
       end.ch--;
       if (!keepHPos) {
@@ -3693,14 +3693,14 @@
         }
         start = idx;
       }
-      return Pos(cm.getCursor().line, idx);
+      return new Pos(cm.getCursor().line, idx);
     }
 
     function moveToColumn(cm, repeat) {
       // repeat is always >= 1, so repeat - 1 always corresponds
       // to the column we want to go to.
       var line = cm.getCursor().line;
-      return clipCursorToContent(cm, Pos(line, repeat - 1));
+      return clipCursorToContent(cm, new Pos(line, repeat - 1));
     }
 
     function updateMark(cm, vim, markName, pos) {
@@ -3952,7 +3952,7 @@
         repeat--;
       }
 
-      return Pos(curr_index.ln, curr_index.pos);
+      return new Pos(curr_index.ln, curr_index.pos);
     }
 
     // TODO: perhaps this finagling of start and end positions belongs
@@ -3975,8 +3975,8 @@
       // cursor is on a matching open bracket.
       var offset = curChar === openSym ? 1 : 0;
 
-      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, undefined, {'bracketRegex': bracketRegexp});
-      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, undefined, {'bracketRegex': bracketRegexp});
+      start = cm.scanForBracket(new Pos(cur.line, cur.ch + offset), -1, undefined, {'bracketRegex': bracketRegexp});
+      end = cm.scanForBracket(new Pos(cur.line, cur.ch + offset), 1, undefined, {'bracketRegex': bracketRegexp});
 
       if (!start || !end) {
         return { start: cur, end: cur };
@@ -4057,8 +4057,8 @@
       }
 
       return {
-        start: Pos(cur.line, start),
-        end: Pos(cur.line, end)
+        start: new Pos(cur.line, start),
+        end: new Pos(cur.line, end)
       };
     }
 
@@ -4448,7 +4448,7 @@
             // SearchCursor may have returned null because it hit EOF, wrap
             // around and try again.
             cursor = cm.getSearchCursor(query,
-                (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
+                (prev) ? new Pos(cm.lastLine()) : new Pos(cm.firstLine(), 0) );
             if (!cursor.find(prev)) {
               return;
             }
@@ -4484,7 +4484,7 @@
             // SearchCursor may have returned null because it hit EOF, wrap
             // around and try again.
             cursor = cm.getSearchCursor(query,
-                (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
+                (prev) ? new Pos(cm.lastLine()) : new Pos(cm.firstLine(), 0) );
             if (!cursor.find(prev)) {
               return;
             }
@@ -4540,7 +4540,7 @@
 
     function getMarkPos(cm, vim, markName) {
       if (markName == '\'' || markName == '`') {
-        return vimGlobalState.jumpList.find(cm, -1) || Pos(0, 0);
+        return vimGlobalState.jumpList.find(cm, -1) || new Pos(0, 0);
       } else if (markName == '.') {
         return getLastEditPos(cm);
       }
@@ -4951,8 +4951,8 @@
         var lineStart = params.line || cm.firstLine();
         var lineEnd = params.lineEnd || params.line || cm.lastLine();
         if (lineStart == lineEnd) { return; }
-        var curStart = Pos(lineStart, 0);
-        var curEnd = Pos(lineEnd, lineLength(cm, lineEnd));
+        var curStart = new Pos(lineStart, 0);
+        var curEnd = new Pos(lineEnd, lineLength(cm, lineEnd));
         var text = cm.getRange(curStart, curEnd).split('\n');
         var numberRegex = pattern ? pattern :
            (number == 'decimal') ? /(-?)([\d]+)/ :
@@ -5158,7 +5158,7 @@
           lineStart = lineEnd;
           lineEnd = lineStart + count - 1;
         }
-        var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
+        var startPos = clipCursorToContent(cm, new Pos(lineStart, 0));
         var cursor = cm.getSearchCursor(query, startPos);
         doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback);
       },
diff --git a/test/vim_test.js b/test/vim_test.js
index 3506b8818d..b6bb4cf366 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -571,14 +571,14 @@ testVim('paragraph_motions', function(cm, vim, helpers) {
   // ip inside empty space
   cm.setCursor(10, 0);
   helpers.doKeys('v', 'i', 'p');
-  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(Pos(12, 0), cm.getCursor('head'));
+  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(12, 0), cm.getCursor('head'));
   helpers.doKeys('i', 'p');
-  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(Pos(13, 1), cm.getCursor('head'));
+  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(13, 1), cm.getCursor('head'));
   helpers.doKeys('2', 'i', 'p');
-  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(Pos(16, 1), cm.getCursor('head'));
+  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(16, 1), cm.getCursor('head'));
 
   // should switch to visualLine mode
   cm.setCursor(14, 0);
@@ -587,31 +587,31 @@ testVim('paragraph_motions', function(cm, vim, helpers) {
 
   cm.setCursor(14, 0);
   helpers.doKeys('<Esc>', 'V', 'i', 'p');
-  eqCursorPos(Pos(16, 1), cm.getCursor('head'));
+  eqCursorPos(new Pos(16, 1), cm.getCursor('head'));
 
   // ap inside empty space
   cm.setCursor(10, 0);
   helpers.doKeys('<Esc>', 'v', 'a', 'p');
-  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(Pos(13, 1), cm.getCursor('head'));
+  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(13, 1), cm.getCursor('head'));
   helpers.doKeys('a', 'p');
-  eqCursorPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(Pos(16, 1), cm.getCursor('head'));
+  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(16, 1), cm.getCursor('head'));
 
   cm.setCursor(13, 0);
   helpers.doKeys('v', 'a', 'p');
-  eqCursorPos(Pos(13, 0), cm.getCursor('anchor'));
-  eqCursorPos(Pos(14, 0), cm.getCursor('head'));
+  eqCursorPos(new Pos(13, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(14, 0), cm.getCursor('head'));
 
   cm.setCursor(16, 0);
   helpers.doKeys('v', 'a', 'p');
-  eqCursorPos(Pos(14, 0), cm.getCursor('anchor'));
-  eqCursorPos(Pos(16, 1), cm.getCursor('head'));
+  eqCursorPos(new Pos(14, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(16, 1), cm.getCursor('head'));
 
   cm.setCursor(0, 0);
   helpers.doKeys('v', 'a', 'p');
-  eqCursorPos(Pos(0, 0), cm.getCursor('anchor'));
-  eqCursorPos(Pos(4, 0), cm.getCursor('head'));
+  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(4, 0), cm.getCursor('head'));
 
   cm.setCursor(0, 0);
   helpers.doKeys('d', 'i', 'p');
@@ -1473,7 +1473,7 @@ testSelection('vi{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'vi{', '\n\tbar\n\t');
 testSelection('va{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'va{', '{\n\tbar\n\t}');
 
 testVim('mouse_select', function(cm, vim, helpers) {
-  cm.setSelection(Pos(0, 2), Pos(0, 4), {origin: '*mouse'});
+  cm.setSelection(new Pos(0, 2), new Pos(0, 4), {origin: '*mouse'});
   is(cm.state.vim.visualMode);
   is(!cm.state.vim.visualLine);
   is(!cm.state.vim.visualBlock);
@@ -1665,7 +1665,7 @@ testVim('i_overwrite_backspace', function(cm, vim, helpers) {
   helpers.doKeys('i');
   helpers.doKeys('<Ins>');
   helpers.doKeys('Backspace');
-  helpers.assertCursorAt(Pos(0, 9, "after"));
+  helpers.assertCursorAt(new Pos(0, 9, "after"));
   eq('0123456789', cm.getValue());
 }, { value: '0123456789'});
 testVim('i_forward_delete', function(cm, vim, helpers) {
@@ -2225,20 +2225,20 @@ testVim('visual_crossover_left', function(cm, vim, helpers) {
 testVim('visual_crossover_up', function(cm, vim, helpers) {
   cm.setCursor(3, 2);
   helpers.doKeys('v', 'j', 'k', 'k');
-  eqCursorPos(Pos(2, 2), cm.getCursor('head'));
-  eqCursorPos(Pos(3, 3), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(2, 2), cm.getCursor('head'));
+  eqCursorPos(new Pos(3, 3), cm.getCursor('anchor'));
   helpers.doKeys('k');
-  eqCursorPos(Pos(1, 2), cm.getCursor('head'));
-  eqCursorPos(Pos(3, 3), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(1, 2), cm.getCursor('head'));
+  eqCursorPos(new Pos(3, 3), cm.getCursor('anchor'));
 }, { value: 'cross\ncross\ncross\ncross\ncross\n'});
 testVim('visual_crossover_down', function(cm, vim, helpers) {
   cm.setCursor(1, 2);
   helpers.doKeys('v', 'k', 'j', 'j');
-  eqCursorPos(Pos(2, 3), cm.getCursor('head'));
-  eqCursorPos(Pos(1, 2), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(2, 3), cm.getCursor('head'));
+  eqCursorPos(new Pos(1, 2), cm.getCursor('anchor'));
   helpers.doKeys('j');
-  eqCursorPos(Pos(3, 3), cm.getCursor('head'));
-  eqCursorPos(Pos(1, 2), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(3, 3), cm.getCursor('head'));
+  eqCursorPos(new Pos(1, 2), cm.getCursor('anchor'));
 }, { value: 'cross\ncross\ncross\ncross\ncross\n'});
 testVim('visual_exit', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'l', 'j', 'j', '<Esc>');
@@ -2393,14 +2393,14 @@ testVim('reselect_visual_block', function(cm, vim, helpers) {
   helpers.doKeys('<C-v>', 'k', 'h', '<C-v>');
   cm.setCursor(2, 1);
   helpers.doKeys('v', 'l', 'g', 'v');
-  eqCursorPos(Pos(1, 2), vim.sel.anchor);
-  eqCursorPos(Pos(0, 1), vim.sel.head);
+  eqCursorPos(new Pos(1, 2), vim.sel.anchor);
+  eqCursorPos(new Pos(0, 1), vim.sel.head);
   // Ensure selection is done with visual block mode rather than one
   // continuous range.
   eq(cm.getSelections().join(''), '23oo')
   helpers.doKeys('g', 'v');
-  eqCursorPos(Pos(2, 1), vim.sel.anchor);
-  eqCursorPos(Pos(2, 2), vim.sel.head);
+  eqCursorPos(new Pos(2, 1), vim.sel.anchor);
+  eqCursorPos(new Pos(2, 2), vim.sel.head);
   helpers.doKeys('<Esc>');
   // Ensure selection of deleted range
   cm.setCursor(1, 1);
@@ -2435,14 +2435,14 @@ testVim('o_visual', function(cm, vim, helpers) {
 testVim('o_visual_block', function(cm, vim, helpers) {
   cm.setCursor(0, 1);
   helpers.doKeys('<C-v>','3','j','l','l', 'o');
-  eqCursorPos(Pos(3, 3), vim.sel.anchor);
-  eqCursorPos(Pos(0, 1), vim.sel.head);
+  eqCursorPos(new Pos(3, 3), vim.sel.anchor);
+  eqCursorPos(new Pos(0, 1), vim.sel.head);
   helpers.doKeys('O');
-  eqCursorPos(Pos(3, 1), vim.sel.anchor);
-  eqCursorPos(Pos(0, 3), vim.sel.head);
+  eqCursorPos(new Pos(3, 1), vim.sel.anchor);
+  eqCursorPos(new Pos(0, 3), vim.sel.head);
   helpers.doKeys('o');
-  eqCursorPos(Pos(0, 3), vim.sel.anchor);
-  eqCursorPos(Pos(3, 1), vim.sel.head);
+  eqCursorPos(new Pos(0, 3), vim.sel.anchor);
+  eqCursorPos(new Pos(3, 1), vim.sel.head);
 }, { value: 'abcd\nefgh\nijkl\nmnop'});
 testVim('changeCase_visual', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
@@ -3563,7 +3563,7 @@ testVim('zb_to_bottom', function(cm, vim, helpers){
   cm.setCursor(lineNum, 0);
   helpers.doKeys('z', 'b');
   var scrollInfo = cm.getScrollInfo();
-  eq(scrollInfo.top + scrollInfo.clientHeight, cm.charCoords(Pos(lineNum, 0), 'local').bottom);
+  eq(scrollInfo.top + scrollInfo.clientHeight, cm.charCoords(new Pos(lineNum, 0), 'local').bottom);
 }, { value: (function(){
   return new Array(500).join('\n');
 })()});
@@ -3572,7 +3572,7 @@ testVim('zt_to_top', function(cm, vim, helpers){
   cm.setSize(600, 35*cm.defaultTextHeight());
   cm.setCursor(lineNum, 0);
   helpers.doKeys('z', 't');
-  eq(cm.getScrollInfo().top, cm.charCoords(Pos(lineNum, 0), 'local').top);
+  eq(cm.getScrollInfo().top, cm.charCoords(new Pos(lineNum, 0), 'local').top);
 }, { value: (function(){
   return new Array(500).join('\n');
 })()});
@@ -4659,10 +4659,10 @@ testVim('noremap_swap', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   // 'a' should act like 'i'.
   helpers.doKeys('a');
-  eqCursorPos(Pos(0, 0), cm.getCursor());
+  eqCursorPos(new Pos(0, 0), cm.getCursor());
   // ...and 'i' should act like 'a'.
   helpers.doKeys('<Esc>', 'i');
-  eqCursorPos(Pos(0, 1), cm.getCursor());
+  eqCursorPos(new Pos(0, 1), cm.getCursor());
   // unmap all mappings
   CodeMirror.Vim.mapclear();
 }, { value: 'foo' });
@@ -4673,13 +4673,13 @@ testVim('noremap_map_interaction', function(cm, vim, helpers) {
   CodeMirror.Vim.map('l', 'j');
   cm.setCursor(0, 0);
   helpers.doKeys(';');
-  eqCursorPos(Pos(0, 1), cm.getCursor());
+  eqCursorPos(new Pos(0, 1), cm.getCursor());
   helpers.doKeys('l');
-  eqCursorPos(Pos(1, 1), cm.getCursor());
+  eqCursorPos(new Pos(1, 1), cm.getCursor());
   // map should be able to point to a noremap
   CodeMirror.Vim.map('m', ';');
   helpers.doKeys('m');
-  eqCursorPos(Pos(1, 2), cm.getCursor());
+  eqCursorPos(new Pos(1, 2), cm.getCursor());
   // unmap all mappings
   CodeMirror.Vim.mapclear();
 }, { value: 'wOrd1\nwOrd2' });
@@ -4690,9 +4690,9 @@ testVim('noremap_map_interaction2', function(cm, vim, helpers) {
   CodeMirror.Vim.noremap(';', 'h');
   cm.setCursor(0, 0);
   helpers.doKeys('l');
-  eqCursorPos(Pos(0, 1), cm.getCursor());
+  eqCursorPos(new Pos(0, 1), cm.getCursor());
   helpers.doKeys('m');
-  eqCursorPos(Pos(0, 0), cm.getCursor());
+  eqCursorPos(new Pos(0, 0), cm.getCursor());
   // unmap all mappings
   CodeMirror.Vim.mapclear();
 }, { value: 'wOrd1\nwOrd2' });

From c91fc40c206113ca45717ad11e7479d13ce3641d Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 29 Oct 2021 02:18:48 +0400
Subject: [PATCH 4567/4742] [vim] call refresh in scroll tests for
 implementations with delayed dom updates

---
 test/vim_test.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/vim_test.js b/test/vim_test.js
index b6bb4cf366..468d4f07b0 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3522,6 +3522,7 @@ testVim('Ty,;', function(cm, vim, helpers) {
   eq('01230123456789', cm.getValue());
 }, { value: '0123456789'});
 testVim('HML', function(cm, vim, helpers) {
+  cm.refresh();
   var lines = 35;
   var textHeight = cm.defaultTextHeight();
   cm.setSize(600, lines*textHeight);
@@ -3546,6 +3547,7 @@ forEach(['zb','zz','zt','z-','z.','z<CR>'], function(e, idx){
   var lineNum = 250;
   var lines = 35;
   testVim(e, function(cm, vim, helpers) {
+    cm.refresh();
     var k1 = e[0];
     var k2 = e.substring(1);
     var textHeight = cm.defaultTextHeight();
@@ -3558,6 +3560,7 @@ forEach(['zb','zz','zt','z-','z.','z<CR>'], function(e, idx){
   })()});
 });
 testVim('zb_to_bottom', function(cm, vim, helpers){
+  cm.refresh();
   var lineNum = 250;
   cm.setSize(600, 35*cm.defaultTextHeight());
   cm.setCursor(lineNum, 0);
@@ -3568,6 +3571,7 @@ testVim('zb_to_bottom', function(cm, vim, helpers){
   return new Array(500).join('\n');
 })()});
 testVim('zt_to_top', function(cm, vim, helpers){
+  cm.refresh();
   var lineNum = 250;
   cm.setSize(600, 35*cm.defaultTextHeight());
   cm.setCursor(lineNum, 0);
@@ -5047,6 +5051,7 @@ var typeKey = function() {
       event.clipboardData = {
         setData: function() {},
         getData: function() {},
+        clearData: function() {},
       };
       target.dispatchEvent(event);
     }

From eb6784c4d30e50e38fb390d10557e7928f8ebe4c Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 29 Oct 2021 02:23:14 +0400
Subject: [PATCH 4568/4742] [vim] clear highlight timeout when exiting vim mode

---
 keymap/vim.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 8491a49314..461cfc1b5c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -285,6 +285,7 @@
       cm.off('cursorActivity', onCursorActivity);
       CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
       cm.state.vim = null;
+      if (highlightTimeout) clearTimeout(highlightTimeout);
     }
 
     function detachVimMap(cm, next) {
@@ -322,7 +323,7 @@
       if (!vimKey) {
         return false;
       }
-      var cmd = CodeMirror.Vim.findKey(cm, vimKey);
+      var cmd = vimApi.findKey(cm, vimKey);
       if (typeof cmd == 'function') {
         CodeMirror.signal(cm, 'vim-keypress', vimKey);
       }
@@ -877,7 +878,7 @@
             match = (/<\w+-.+?>|<\w+>|./).exec(keys);
             key = match[0];
             keys = keys.substring(match.index + key.length);
-            CodeMirror.Vim.handleKey(cm, key, 'mapping');
+            vimApi.handleKey(cm, key, 'mapping');
           }
         }
 
@@ -965,7 +966,7 @@
                 // clear VIM state in case it's in a bad state.
                 cm.state.vim = undefined;
                 maybeInitVimState(cm);
-                if (!CodeMirror.Vim.suppressErrorLogging) {
+                if (!vimApi.suppressErrorLogging) {
                   console['log'](e);
                 }
                 throw e;
@@ -4411,6 +4412,7 @@
     function highlightSearchMatches(cm, query) {
       clearTimeout(highlightTimeout);
       highlightTimeout = setTimeout(function() {
+        if (!cm.state.vim) return;
         var searchState = getSearchState(cm);
         var overlay = searchState.getOverlay();
         if (!overlay || query != overlay.query) {
@@ -4605,7 +4607,7 @@
             if (command.type == 'exToKey') {
               // Handle Ex to Key mapping.
               for (var i = 0; i < command.toKeys.length; i++) {
-                CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
+                vimApi.handleKey(cm, command.toKeys[i], 'mapping');
               }
               return;
             } else if (command.type == 'exToEx') {
@@ -5458,7 +5460,7 @@
           match = (/<\w+-.+?>|<\w+>|./).exec(text);
           key = match[0];
           text = text.substring(match.index + key.length);
-          CodeMirror.Vim.handleKey(cm, key, 'macro');
+          vimApi.handleKey(cm, key, 'macro');
           if (vim.insertMode) {
             var changes = register.insertModeChanges[imc++].changes;
             vimGlobalState.macroModeState.lastInsertModeChanges.changes =

From 475069f8f7fbe6bb21f54eed51e52ff6741335ce Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 29 Oct 2021 02:24:52 +0400
Subject: [PATCH 4569/4742] [vim] workaround for cm6 not moving cursor after
 insertions

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

diff --git a/keymap/vim.js b/keymap/vim.js
index 461cfc1b5c..b7c8884852 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -5696,12 +5696,12 @@
           if (change instanceof InsertModeKey) {
             CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
           } else if (typeof change == "string") {
-            var cur = cm.getCursor();
-            cm.replaceRange(change, cur, cur);
+            cm.replaceSelection(change);
           } else {
             var start = cm.getCursor();
             var end = offsetCursor(start, 0, change[0].length);
             cm.replaceRange(change[0], start, end);
+            cm.setCursor(end);
           }
         }
       }

From 91a12722aafbf7398d93e906e1ced8d750b5cef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Mirtes?= <ondrej@mirtes.cz>
Date: Mon, 8 Nov 2021 11:18:04 +0100
Subject: [PATCH 4570/4742] [php mode] Add keywords

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

diff --git a/mode/php/php.js b/mode/php/php.js
index b2cae96064..127b4a2382 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -80,11 +80,11 @@
   }
 
   var phpKeywords = "abstract and array as break case catch class clone const continue declare default " +
-    "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " +
+    "do else elseif enddeclare endfor endforeach endif endswitch endwhile enum extends final " +
     "for foreach function global goto if implements interface instanceof namespace " +
     "new or private protected public static switch throw trait try use var while xor " +
     "die echo empty exit eval include include_once isset list require require_once return " +
-    "print unset __halt_compiler self static parent yield insteadof finally";
+    "print unset __halt_compiler self static parent yield insteadof finally readonly match";
   var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
   var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage memory_get_peak_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists array_intersect_key array_combine array_column pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
   CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
@@ -95,7 +95,7 @@
     helperType: "php",
     keywords: keywords(phpKeywords),
     blockKeywords: keywords("catch do else elseif for foreach if switch try while finally"),
-    defKeywords: keywords("class function interface namespace trait"),
+    defKeywords: keywords("class enum function interface namespace trait"),
     atoms: keywords(phpAtoms),
     builtin: keywords(phpBuiltin),
     multiLineStrings: true,

From f9826b4924425c155d5d476e0d002a1e18d8b4d0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 9 Nov 2021 15:12:43 +0100
Subject: [PATCH 4571/4742] [sql mode] Correct groupby_concat to group_concat
 in MariaDB dialect

Closes https://github.com/codemirror/CodeMirror/issues/6818
---
 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 23cc9de18a..7b9014b7d9 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -332,7 +332,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   CodeMirror.defineMIME("text/x-mariadb", {
     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 + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
+    keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group group_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
     builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,

From aabc6dd67019d34e4273d5ec5c95c600253f868b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 10 Nov 2021 09:52:53 +0100
Subject: [PATCH 4572/4742] Reset native scrollbar when hiding it

To avoid it reinitializing in a scrolled position on Chrome

Issue https://github.com/codemirror/CodeMirror/issues/6819
---
 src/display/scrollbars.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index 18ac121a94..f77ffc19f0 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -60,6 +60,7 @@ class NativeScrollbars {
       this.vert.firstChild.style.height =
         Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px"
     } else {
+      this.vert.scrollTop = 0
       this.vert.style.display = ""
       this.vert.firstChild.style.height = "0"
     }

From c1941628cdda92c32977b3a26b0a0b70c9a8f9b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 15 Nov 2021 08:05:30 +0100
Subject: [PATCH 4573/4742] Fix duplicated word in manual

Closes https://github.com/codemirror/CodeMirror/issues/6823
---
 doc/manual.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 788ec6b77e..81a0ec2cfc 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1828,7 +1828,7 @@ <h3 id="api_decoration">Widget, gutter, and decoration methods</h3>
       <dt id="addLineClass"><code><strong>doc.addLineClass</strong>(line: integer|LineHandle, where: string, class: string) → LineHandle</code></dt>
       <dd>Set a CSS class name for the given line. <code>line</code>
       can be a number or a line handle. <code>where</code> determines
-      to which element this class should be applied, can can be one
+      to which element this class should be applied, can be one
       of <code>"text"</code> (the text element, which lies in front of
       the selection), <code>"background"</code> (a background element
       that will be behind the selection), <code>"gutter"</code> (the

From 8780835f88aa1560c0e5955cc1ce0e76f48bd675 Mon Sep 17 00:00:00 2001
From: Axel Lewenhaupt <axel@x2d.org>
Date: Wed, 17 Nov 2021 09:24:30 +0100
Subject: [PATCH 4574/4742] [soy mode] Fix bad matches of map, record, from,
 as, import

---
 mode/soy/soy.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index 4cb4aa2b29..debe7268f4 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -140,10 +140,10 @@
         state.context = new Context(state.context, "list-literal", state.variables);
         state.lookupVariables = false;
         return null;
-      } else if (stream.match(/map\b/)) {
+      } else if (stream.match(/\bmap(?=\()/)) {
         state.soyState.push("map-literal");
         return "keyword";
-      } else if (stream.match(/record\b/)) {
+      } else if (stream.match(/\brecord(?=\()/)) {
         state.soyState.push("record-literal");
         return "keyword";
       } else if (stream.match(/([\w]+)(?=\()/)) {
@@ -454,11 +454,11 @@
               state.indent -= 2 * config.indentUnit;
               return null;
             }
-            if (stream.match(/\w+(?=\s+as)/)) {
+            if (stream.match(/\w+(?=\s+as\b)/)) {
               return "variable";
             }
             if (match = stream.match(/\w+/)) {
-              return /(from|as)/.test(match[0]) ? "keyword" : "def";
+              return /\b(from|as)\b/.test(match[0]) ? "keyword" : "def";
             }
             if (match = stream.match(/^["']/)) {
               state.soyState.push("string");
@@ -605,7 +605,7 @@
           state.indent += 2 * config.indentUnit;
           state.soyState.push("tag");
           return "keyword";
-        } else if (!state.context && stream.match(/\bimport\b/)) {
+        } else if (!state.context && stream.sol() && stream.match(/import\b/)) {
           state.soyState.push("import");
           state.indent += 2 * config.indentUnit;
           return "keyword";

From d237000ecc4a8d57ad2880250d915b0dccfaf96a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 20 Nov 2021 15:51:29 +0100
Subject: [PATCH 4575/4742] Mark release 5.64.0

---
 AUTHORS           |  5 +++++
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 54f3efc617..3da7e5adbb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ Adrien Bertrand
 aeroson
 Ahmad Amireh
 Ahmad M. Zawawi
+AHOHNMYC
 ahoward
 Ajin Abraham
 Akeksandr Motsjonov
@@ -168,6 +169,7 @@ Chris Smith
 Christian Gruen
 Christian Oyarzun
 Christian Petrov
+Christian Sonne
 christopherblaser
 Christopher Brown
 Christopher Kramer
@@ -373,6 +375,7 @@ Jack Douglas
 Jacob Lee
 Jaimin
 Jake Peyser
+Jake Zimmerman
 Jakob Kummerow
 Jakob Miland
 Jakub T. Jankiewicz
@@ -678,6 +681,7 @@ Norman Rzepka
 Nouzbe
 Oleksandr Yakovenko
 Olivia Ytterbrink
+Ondřej Mirtes
 Opender Singh
 opl-
 Oreoluwa Onatemowo
@@ -918,6 +922,7 @@ Wes Cossick
 Wesley Wiser
 Weston Ruter
 Will Binns-Smith
+Will Cassella
 Will Dean
 Will Hernandez
 William Desportes
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0224d96833..619a859801 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.64.0 (2021-11-20)
+
+### Bug fixes
+
+Fix a crash that occurred in some situations with replacing marks across line breaks.
+
+Make sure native scrollbars reset their position when hidden and re-shown.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Support C-u to delete back a line.
+
 ## 5.63.3 (2021-10-11)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 81a0ec2cfc..e89543e438 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.63.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.64.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 dfcf8b88bf..55d6d73a33 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,14 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-11-2021: <a href="https://codemirror.net/codemirror-5.64.0.zip">Version 5.64.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix a crash that occurred in some situations with replacing marks across line breaks.</li>
+    <li>Make sure native scrollbars reset their position when hidden and re-shown.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support C-u to delete back a line.</li>
+  </ul>
+
   <p class="rel">11-10-2021: <a href="https://codemirror.net/codemirror-5.63.3.zip">Version 5.63.3</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index e6d94ecbd7..983af5ac22 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.63.3</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.64.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 03238c2d88..7c38a7fc7f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.63.3",
+  "version": "5.64.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 3285c5e349..85ef103211 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.63.3"
+CodeMirror.version = "5.64.0"

From e308fb7c3bc0f72b5a7f5cf1feaccfbc1f216348 Mon Sep 17 00:00:00 2001
From: "Jakub T. Jankiewicz" <jcubic@onet.pl>
Date: Mon, 22 Nov 2021 15:11:32 +0100
Subject: [PATCH 4576/4742] [scheme mode] Fix handling of escaped symbols

---
 mode/scheme/scheme.js | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 370250d856..39627e2877 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -3,6 +3,7 @@
 
 /**
  * Author: Koh Zi Han, based on implementation by Koh Zi Chun
+ * Improved by: Jakub T. Jankiewicz
  */
 
 (function(mod) {
@@ -17,7 +18,7 @@
 
 CodeMirror.defineMode("scheme", function () {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket";
+        SYMBOL = "symbol", ATOM = "atom", NUMBER = "number", BRACKET = "bracket";
     var INDENT_WORD_SKIP = 2;
 
     function makeKeywords(str) {
@@ -67,6 +68,18 @@ CodeMirror.defineMode("scheme", function () {
         return stream.match(hexMatcher);
     }
 
+    function processEscapedSequence(stream, options) {
+        var next, escaped = false;
+        while ((next = stream.next()) != null) {
+            if (next == options.token && !escaped) {
+
+                options.state.mode = false;
+                break;
+            }
+            escaped = !escaped && next == "\\";
+        }
+    }
+
     return {
         startState: function () {
             return {
@@ -92,17 +105,19 @@ CodeMirror.defineMode("scheme", function () {
 
             switch(state.mode){
                 case "string": // multi-line string parsing mode
-                    var next, escaped = false;
-                    while ((next = stream.next()) != null) {
-                        if (next == "\"" && !escaped) {
-
-                            state.mode = false;
-                            break;
-                        }
-                        escaped = !escaped && next == "\\";
-                    }
+                    processEscapedSequence(stream, {
+                        token: "\"",
+                        state: state
+                    });
                     returnType = STRING; // continue on in scheme-string mode
                     break;
+                case "symbol": // escape symbol
+                    processEscapedSequence(stream, {
+                        token: "|",
+                        state: state
+                    });
+                    returnType = SYMBOL; // continue on in scheme-symbol mode
+                    break;
                 case "comment": // comment parsing mode
                     var next, maybeEnd = false;
                     while ((next = stream.next()) != null) {
@@ -143,6 +158,9 @@ CodeMirror.defineMode("scheme", function () {
                             stream.eatWhile(/[\w_\-!$%&*+\.\/:<=>?@\^~]/);
                             returnType = ATOM;
                         }
+                    } else if (ch == '|') {
+                        state.mode = "symbol";
+                        returnType = SYMBOL;
                     } else if (ch == '#') {
                         if (stream.eat("|")) {                    // Multi-line comment
                             state.mode = "comment"; // toggle to comment mode

From 6c439cd1560b3ec1296db0b2df3e25c74542c395 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Sat, 4 Dec 2021 11:54:06 +0100
Subject: [PATCH 4577/4742] [nsis mode] fix variable pattern

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 2b1c5fb987..8c530f8488 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -71,7 +71,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /[-+\/*=<>!]+/, token: "operator"},
 
     // Variable
-    {regex: /\$\w+/, token: "variable"},
+    {regex: /\$\w[\w\.]+/, token: "variable"},
 
     // Constant
     {regex: /\${[\w\.:-]+}/, token: "variable-2"},

From c462dce7b598d6577536c331e6429f5645e24cfe Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Sat, 4 Dec 2021 01:58:21 +0100
Subject: [PATCH 4578/4742] [nsis mode] fix defines pattern

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 8c530f8488..b21bcf1af0 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -74,7 +74,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /\$\w[\w\.]+/, token: "variable"},
 
     // Constant
-    {regex: /\${[\w\.:-]+}/, token: "variable-2"},
+    {regex: /\${[\!\w\.:-]+}/, token: "variable-2"},
 
     // Language String
     {regex: /\$\([\w\.:-]+\)/, token: "variable-3"}

From ec5939f4f220e22d2643dddb43ea67095550ebd3 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Sat, 4 Dec 2021 03:19:22 +0100
Subject: [PATCH 4579/4742] [nsis mode] fix language strings pattern

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index b21bcf1af0..9d3272665c 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -77,7 +77,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /\${[\!\w\.:-]+}/, token: "variable-2"},
 
     // Language String
-    {regex: /\$\([\w\.:-]+\)/, token: "variable-3"}
+    {regex: /\$\([\!\w\.:-]+\)/, token: "variable-3"}
   ],
   comment: [
     {regex: /.*?\*\//, token: "comment", next: "start"},

From a477931864776e7210207ec19f50c86626118875 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 4 Dec 2021 18:14:57 +0400
Subject: [PATCH 4580/4742] [vim] implement g0 g$ g<Arrow>

---
 keymap/vim.js    | 16 ++++++++++++++++
 test/vim_test.js | 26 +++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b7c8884852..d6e870856a 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -72,6 +72,8 @@
     { keys: '<Right>', type: 'keyToKey', toKeys: 'l' },
     { keys: '<Up>', type: 'keyToKey', toKeys: 'k' },
     { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
+    { keys: 'g<Up>', type: 'keyToKey', toKeys: 'gk' },
+    { keys: 'g<Down>', type: 'keyToKey', toKeys: 'gj' },
     { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
     { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'},
     { keys: '<Del>', type: 'keyToKey', toKeys: 'x', context: 'normal'},
@@ -94,6 +96,7 @@
     { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
     { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
     { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
+    { keys: '<Ins>', type: 'keyToKey', toKeys: 'i', context: 'normal'},
     { keys: '<Ins>', type: 'action', action: 'toggleOverwrite', context: 'insert' },
     // Motions
     { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
@@ -123,6 +126,9 @@
     { keys: '<C-u>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
     { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
     { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
+    {keys: "g$", type: "motion", motion: "moveToEndOfDisplayLine"},
+    {keys: "g^", type: "motion", motion: "moveToStartOfDisplayLine"},
+    {keys: "g0", type: "motion", motion: "moveToStartOfDisplayLine"},
     { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
     { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
     { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
@@ -2086,6 +2092,16 @@
         return new Pos(lineNum,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
       },
+      moveToStartOfDisplayLine: function(cm) {
+        cm.execCommand("goLineLeft");
+        return cm.getCursor();
+      },
+      moveToEndOfDisplayLine: function(cm) {
+        cm.execCommand("goLineRight");
+        let head = cm.getCursor();
+        if (head.sticky == "before") head.ch--;
+        return head;
+      },
       textObjectManipulation: function(cm, head, motionArgs, vim) {
         // TODO: lots of possible exceptions that can be thrown here. Try da(
         //     outside of a () block.
diff --git a/test/vim_test.js b/test/vim_test.js
index 468d4f07b0..7822d62788 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -488,11 +488,35 @@ testVim('gj_gk', function(cm, vim, helpers) {
   // Test bottom of document edge case.
   helpers.doKeys('100', 'g', 'j');
   var endingPos = cm.getCursor();
-  is(endingPos != 0, 'gj should not be on wrapped line 0');
+  is(endingPos.ch != 0, 'gj should not be on wrapped line 0');
   var topLeftCharCoords = cm.charCoords(makeCursor(0, 0));
   var endingCharCoords = cm.charCoords(endingPos);
   is(topLeftCharCoords.left == endingCharCoords.left, 'gj should end up on column 0');
 },{ lineNumbers: false, lineWrapping:true, value: 'Thislineisintentionallylongtotestmovementofgjandgkoverwrappedlines.' });
+testVim('g0_g$', function(cm, vim, helpers) {
+  var topLeftCharCoords = cm.charCoords(makeCursor(0, 0));
+  cm.setCursor(0, 4);
+  cm.setSize(120);
+  helpers.doKeys('g', 'Down');
+  var secondLineCoords = cm.charCoords(cm.getCursor());
+  is(secondLineCoords.top > topLeftCharCoords.top);
+  is(secondLineCoords.left > topLeftCharCoords.left);
+
+  helpers.doKeys('g', '0');
+  var start = cm.getCursor();
+  var startCoords = cm.charCoords(start);
+  is(start.ch != 0);
+  is(startCoords.left == topLeftCharCoords.left);
+  is(secondLineCoords.top === startCoords.top);
+  is(secondLineCoords.left > startCoords.left);
+
+  helpers.doKeys('g', '$');
+  var end = cm.getCursor();
+  var endCoords = cm.charCoords(end);
+  is(startCoords.left < endCoords.left);
+  is(startCoords.top == endCoords.top);
+  is(start.ch < end.ch && end.ch < cm.getValue().length / 2);
+},{ lineNumbers: false, lineWrapping:true, value: 'This line is intentionally long to test movement of g$ and g0 over wrapped lines.' });
 testVim('}', function(cm, vim, helpers) {
   cm.setCursor(0, 0);
   helpers.doKeys('}');

From 514c684023abf41917b814b09daa661de65198e7 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Sat, 4 Dec 2021 16:41:07 +0100
Subject: [PATCH 4581/4742] [nsis mode] improve variable pattern

Follow-up to #6837 to support single letter variable names
---
 mode/nsis/nsis.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 9d3272665c..7e419f03fc 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -71,7 +71,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /[-+\/*=<>!]+/, token: "operator"},
 
     // Variable
-    {regex: /\$\w[\w\.]+/, token: "variable"},
+    {regex: /\$\w[\w\.]*/, token: "variable"},
 
     // Constant
     {regex: /\${[\!\w\.:-]+}/, token: "variable-2"},

From 793c9e65e09ec7fba3f4f5aaf366b3d36e1a709e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 4 Dec 2021 20:11:34 +0100
Subject: [PATCH 4582/4742] [vim bindings] let->var

---
 keymap/vim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index d6e870856a..1cf9636fd6 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2098,7 +2098,7 @@
       },
       moveToEndOfDisplayLine: function(cm) {
         cm.execCommand("goLineRight");
-        let head = cm.getCursor();
+        var head = cm.getCursor();
         if (head.sticky == "before") head.ch--;
         return head;
       },

From b7bae958a75f0bc43a9743028ee4bf11d71f1b49 Mon Sep 17 00:00:00 2001
From: Keldan Chapman <43819332+Kacarott@users.noreply.github.com>
Date: Thu, 9 Dec 2021 11:14:17 +0100
Subject: [PATCH 4583/4742] [factor mode] Fix incorrect lineComment value

Co-authored-by: kec <keldan.chapman@hydrogenious.net>
---
 mode/factor/factor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/factor/factor.js b/mode/factor/factor.js
index 4c876d4d29..d3f7d499cb 100644
--- a/mode/factor/factor.js
+++ b/mode/factor/factor.js
@@ -77,7 +77,7 @@
     // specific to simple modes.
     meta: {
       dontIndentStates: ["start", "vocabulary", "string", "string3", "stack"],
-      lineComment: [ "!", "#!" ]
+      lineComment: "!"
     }
   });
 

From aaba815f0ca70de1664bc8dedbd4d9539d80ff3d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 13 Dec 2021 11:54:00 +0100
Subject: [PATCH 4584/4742] [brace-fold addon] Fix confusion when there are
 both braces and brackets on a line

Closes https://github.com/codemirror/CodeMirror/issues/6847
---
 addon/fold/brace-fold.js | 58 +++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 79a331cf68..256c7460ef 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -13,9 +13,9 @@
 
 CodeMirror.registerHelper("fold", "brace", function(cm, start) {
   var line = start.line, lineText = cm.getLine(line);
-  var tokenType;
 
   function findOpening(openCh) {
+    var tokenType;
     for (var at = start.ch, pass = 0;;) {
       var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
       if (found == -1) {
@@ -26,40 +26,42 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
       }
       if (pass == 1 && found < start.ch) break;
       tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
-      if (!/^(comment|string)/.test(tokenType)) return found + 1;
+      if (!/^(comment|string)/.test(tokenType)) return {ch: found + 1, tokenType: tokenType};
       at = found - 1;
     }
   }
 
-  var startBrace = findOpening("{"), startBracket = findOpening("[")
-  var startToken, endToken, startCh
-  if (startBrace != null && (startBracket == null || startBracket > startBrace)) {
-    startCh = startBrace; startToken = "{"; endToken = "}"
-  } else if (startBracket != null) {
-    startCh = startBracket; startToken = "["; endToken = "]"
-  } else {
-    return
-  }
-
-  var count = 1, lastLine = cm.lastLine(), end, endCh;
-  outer: for (var i = line; i <= lastLine; ++i) {
-    var text = cm.getLine(i), pos = i == line ? startCh : 0;
-    for (;;) {
-      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
-      if (nextOpen < 0) nextOpen = text.length;
-      if (nextClose < 0) nextClose = text.length;
-      pos = Math.min(nextOpen, nextClose);
-      if (pos == text.length) break;
-      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
-        if (pos == nextOpen) ++count;
-        else if (!--count) { end = i; endCh = pos; break outer; }
+  function findRange(startToken, endToken, found) {
+    var count = 1, lastLine = cm.lastLine(), end, startCh = found.ch, endCh
+    outer: for (var i = line; i <= lastLine; ++i) {
+      var text = cm.getLine(i), pos = i == line ? startCh : 0;
+      for (;;) {
+        var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+        if (nextOpen < 0) nextOpen = text.length;
+        if (nextClose < 0) nextClose = text.length;
+        pos = Math.min(nextOpen, nextClose);
+        if (pos == text.length) break;
+        if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == found.tokenType) {
+          if (pos == nextOpen) ++count;
+          else if (!--count) { end = i; endCh = pos; break outer; }
+        }
+        ++pos;
       }
-      ++pos;
     }
+
+    if (end == null || line == end) return null
+    return {from: CodeMirror.Pos(line, startCh),
+            to: CodeMirror.Pos(end, endCh)};
+  }
+
+  var startBrace = findOpening("{"), startBracket = findOpening("[")
+  if (startBrace && (!startBracket || startBracket.ch > startBrace.ch)) {
+    return findRange("{", "}", startBrace) || (startBracket && findRange("[", "]", startBracket))
+  } else if (startBracket) {
+    return findRange("[", "]", startBracket) || (startBrace && findRange("{", "}", startBrace))
+  } else {
+    return null
   }
-  if (end == null || line == end) return;
-  return {from: CodeMirror.Pos(line, startCh),
-          to: CodeMirror.Pos(end, endCh)};
 });
 
 CodeMirror.registerHelper("fold", "import", function(cm, start) {

From 812eef0339f83152143a0db2db4fea5a38978b9b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 15 Dec 2021 17:18:09 +0100
Subject: [PATCH 4585/4742] Remove inline logo data from the front page HTML

And add Anvil sponsor link
---
 doc/logos/4me.svg            |   1 +
 doc/logos/anvil.png          | Bin 0 -> 9512 bytes
 doc/logos/artcompiler.svg    |   1 +
 doc/logos/cargo.svg          |   1 +
 doc/logos/codepen.svg        |   1 +
 doc/logos/desmos.svg         |   1 +
 doc/logos/executeprogram.svg |   1 +
 doc/logos/holmusk.svg        |   1 +
 doc/logos/jetbrains.svg      |   1 +
 doc/logos/observable.svg     |   1 +
 doc/logos/primo.svg          |   1 +
 doc/logos/prisma.svg         |   1 +
 index.html                   |  23 ++++++++++++-----------
 13 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 doc/logos/4me.svg
 create mode 100644 doc/logos/anvil.png
 create mode 100644 doc/logos/artcompiler.svg
 create mode 100644 doc/logos/cargo.svg
 create mode 100644 doc/logos/codepen.svg
 create mode 100644 doc/logos/desmos.svg
 create mode 100644 doc/logos/executeprogram.svg
 create mode 100644 doc/logos/holmusk.svg
 create mode 100644 doc/logos/jetbrains.svg
 create mode 100644 doc/logos/observable.svg
 create mode 100644 doc/logos/primo.svg
 create mode 100644 doc/logos/prisma.svg

diff --git a/doc/logos/4me.svg b/doc/logos/4me.svg
new file mode 100644
index 0000000000..8e894ee1a5
--- /dev/null
+++ b/doc/logos/4me.svg
@@ -0,0 +1 @@
+<svg fill-rule="evenodd" viewBox="10538 7547.8 6693 4459" xmlns="http://www.w3.org/2000/svg"><rect fill="#062341" x="10538" y="7547.8" width="6693.4" height="4459.4"/><path fill="#fefefe" d="m15757 9524c-11.38-73.68-40.63-133.26-87.74-178.76-47.13-45.5-109.68-68.26-187.68-68.26s-140.98 22.39-188.91 67.18c-47.94 44.78-79.21 104.72-93.86 179.84h558.19zm-2797.1-489.69h369.08v166.12c21.04-24.93 44.1-48.39 69.19-71.15 25.08-22.38 53.02-42.25 83.76-59.94 30.77-17.35 65.16-31.06 103.19-41.53 38.04-10.12 80.54-15.17 127.47-15.17 85.8 0 159.84 15.88 222.16 48.02 62.33 32.15 110.49 77.64 144.49 137.6 56.64-61.38 119.77-107.26 189.37-138.68 69.59-31.42 148.93-46.94 237.95-46.94 137.58 0 245.22 36.12 322.93 108.33 48.42 45.04 81.78 103.28 100 174.71 24.57-38.29 53.4-73.42 86.51-105.37 56.87-54.89 124.72-98.22 203.53-130 78.8-31.79 166.14-47.67 262.02-47.67 108.86 0 203.12 17.34 282.73 52 79.64 34.66 145.85 81.26 198.66 139.76 52.81 58.51 91.79 125.67 117 201.52 25.19 75.84 37.77 154.92 37.77 237.27 0 12.99-0.4 26.71-1.21 41.17-0.81 14.43-2.04 29.6-3.68 45.49h-909.14c17.86 75.11 54.83 131.82 110.9 170.09 56.06 38.29 125.53 57.43 208.39 57.43 61.76 0 117.01-9.4 165.77-28.18 48.74-18.78 99.11-49.11 151.1-91l212.06 166.84c-61.76 67.89-136.5 120.98-224.26 159.26-87.72 38.27-190.92 57.41-309.53 57.41-97.51 0-188.1-14.44-271.78-43.33-83.69-28.89-156-70.06-216.93-123.5-31.34-27.5-59.13-57.55-83.39-90.2v231.03h-369.04v-646.42c0-77.65-18.61-136.51-55.83-175.87-37.24-39.72-90.65-59.58-160.27-59.58-69.6 0-124.23 19.86-163.88 59.58-39.68 39.36-59.48 98.22-59.48 175.87v646.42h-369.06v-646.42c0-77.65-18.62-136.51-55.86-175.87-37.22-39.72-90.63-59.58-160.23-59.58s-124.24 19.86-163.9 59.58c-39.66 39.36-59.48 98.22-59.48 175.87v646.42h-563.64v325.09h-318.66v-325.09h-795.02l-0.53-238.52 827.03-922.87h287.18v888.19h194.56v-888.19zm-513.22 888.19v-472.57l-403.19 472.57h403.19z"/><path fill="#fefefe" d="m16236 9012.7c66.1 0 119.69 53.6 119.69 119.7 0 66.11-53.59 119.7-119.69 119.7-66.11 0-119.7-53.59-119.7-119.7 0-66.1 53.59-119.7 119.7-119.7zm0 24.2c52.74 0 95.51 42.77 95.51 95.5 0 52.74-42.77 95.52-95.51 95.52s-95.52-42.78-95.52-95.52c0-52.73 42.78-95.5 95.52-95.5z"/><path fill="#fefefe" d="m16297 9193.9h-32.6l-19.55-32.41c-1.49-2.45-2.88-4.63-4.24-6.59-1.35-1.93-2.71-3.57-4.07-4.95-1.39-1.37-2.83-2.42-4.32-3.18-1.5-0.71-3.11-1.06-4.85-1.06h-7.65v48.19h-28.38v-125.91h44.96c30.57 0 45.86 11.41 45.86 34.23 0 4.39-0.69 8.44-2.05 12.16-1.34 3.71-3.24 7.08-5.69 10.07-2.45 2.97-5.42 5.55-8.9 7.71-3.5 2.18-7.37 3.86-11.67 5.08v0.36c1.9 0.6 3.7 1.54 5.46 2.86 1.78 1.31 3.46 2.85 5.09 4.62 1.66 1.77 3.22 3.65 4.72 5.66 1.49 2.01 2.85 3.98 4.08 5.93l23.8 37.23zm-77.28-104.66v35.03h12.28c6.1 0 11-1.77 14.67-5.28 3.75-3.56 5.62-8 5.62-13.25 0-11.03-6.59-16.5-19.77-16.5h-12.8z"/></svg>
diff --git a/doc/logos/anvil.png b/doc/logos/anvil.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cb2ab1d3423b40a2b50ffd74c75f02d03dff95f
GIT binary patch
literal 9512
zcmV+@CD+=CP)<h;3K|Lk000e1NJLTq00CbB003kN1^@s6A%8Pl00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv0RI600RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru<qQuH0UMZ>
zh8q9?Bo|3UK~#9!?VWj?9Cexh-%nL{PtTEL!sNaQBqWmr5l}$zK=48!q6jFi=z=b*
zxU$RYPhDAmyPm5k-p7i%`a={HAt2s>;EKp45E61g5^_zFnM@|hTzynMzdxStoLxOv
zUz2>_uUBP~bWioSs;fTre4pzp)Hn-%-i{ZuzpH=<pt(&Tt3qEgL37YWm~KM7EQ%lq
zN@#CXK|LS8FUE>X$5s1~91e#AsrCR4<-~j1$Yy<11rbH+1p290WsG_>iO__SM2R89
zK$9r-iiC*v38WRt3X)O6KG1HI?!ZfQdx@TY>90csL<GcV#RcQ5eaH@n<0zyy#P^?-
z)>rKWlrR*0KWqv^nI@vMRb`IAOkgI$3}6P(f>MvrsJUa1yeW)^iu4HdD%uWgM%jYM
zMp3pXw281$JlPNiK{w*<v#6iFU}Ck;gu~%DN~o&%F1fpdAXH+BfNVN85%d($R$!j0
z%oEXtAk*@)iVk+<nv-H-zb2bZt4fCmtAS?}Rszqc#}i&im!f1P%i0U4Rr9ns9FC)a
zs)+CLw|5ecWl8vcA`^s5R5?e4Gl9jb%m#dseUe*Z6wQmckOo-~JR|T|Mek30>8Fxm
zB7>)_xL|TMPLIRkI0~qk_%67!gZU?Q@Z8^8yo`EHF+X^nz{MboL1(MdC{ocO8T&Q9
zN6{Aq9vAqj3J(xU-_*x;hg(k>$FmnXmxRONC>>>2x_Qgmi2<tOhXG?^zP>`?y@<XP
zWdevuwLQ=KEn!eXM0WsxMdgQ~&wXTNuXq~zevD_%cL6$w!!dHoDtn8T?I58-zc3Ev
zT;P2Iryz_$@oFU8cMzKULm&j*qsX6tZ>sQ+2AMs+mtf_aCRBTv4u@luQx^GKw5%Nk
ze8NOly~PMuigKC4c#&F^+#)Ed=q^NV5%@l#zXF1EEaUO?B`wt+ox|Z6rIc0(Rhf71
zF5<l*gy9T?H>=8(BAi(511-@3K7-1)QGTW|-Qk78ilxpM>~J`SPD#c0_<PzIvt3EI
z#LrN;R^cLnc(o6*lqlLGDz^!ILqmPsPlhZ%Z%Va?<#0Gg86^|n#dmC@CmGZw(}_z3
zt^r<B?Sm^H3MvnQekI-z{GzX)?3xRwR(ntmhhr2mV)1QV)`2IX5QLLM&%0KUD^R8&
zwNgG;dK3_g%xzTRyMY8>i>bFKB&MsDIzO<(;TV_^>EnWB+wq8t5X@5a<0zLS)E~LB
zdoY%vrh9>#fd9%;zavhsu3YMhGaL>_afYpu3zl^d(l0)B^98O4y+o1t(ILBsqA5jg
z2KiKmz88|z>oZGTI-0}bh{hYvFSRb~AdN3Rb&Eki2fU4=R(JuV4tSRke!7mj<0mIt
zWZ@m#t34=(!%@QwSuYpg)s8O#>A*h$;Rb>8t9=l)fK@3gqVoR~{kV^848xEWZ+0#S
zhr@9=L$-XwFd!THvqkuKfj3tB0BQxROcoS<JMhs!byBveq1wZ8I2<*~ki>WKvTcYk
zMbYa)FXd>7tPK(YRKy4V9^u1YIx}{{kJnXuSPqAy1{t*Ywk~T2C8>DVqFk<sU+uxy
zBG#Bq5{SG<gW#ID@5L6~)n4skIUJ4}V^HEd|E_ja@dNy~0q;U2=}g|@D2x@=tD2Mb
z=L6nJzusEyAvqjJ10Ik7>T+8G7>=PRK<t41#3=DhKQ@>*Wj!ROybR?UMJ7Ap9hlrX
znuEx{sOtI^Yo|U{?J+qVM>ykw6M-{;X_ydq0#5^f1-1ggAoddjjsso=%){d8&ja`8
zer8KC*a3C4by+(h%<$lgC~sAv>g{(&6RLzFdXsp36xGfZ7rN{RhocNk1^yGb6iBjv
zR<D>?t^hs`{0;~Q*w^X6jljtV>?Z`C1g-`CQi=f=bvv})-36*iflGil;e>a{h~S}e
ziH0ma(wYo895uvyfwuu;u=~u<Z81!YPXRs+OdnuBG2k_r04H+)j^+OT65!1Yvp(Wb
zitZ#9)(avh3cM%x;f`UT&<wmMQ0BKTbHO)<qr}94mjjIhyl)NzH~ebEtmr~W?zLno
z1|2EB3-0J3727jL;YySR<v3$U3nHM(=^$@cXj<X~*x@K8abPe>^&T*8fcNBsY{m9b
zl1#5+mT%0<@LJ%lE}M7ch=_>Fy9G|AMAH_B!vR1FXk-6sj8UY44b>iOo`NE<==L2F
zh>QXLQ53ggWQkB=sw!7yRGa4CzQaAz9FEcu0Jj3$io7QU+y^{f?ZM_Lm}-`76k`3s
z>wr^Th^^$D2XeBAK2Ys}I2=b1cVq5{Yp^u2d|qw<>;jenUj_D5d!Ts==lN!24CuSW
zB8QF=VbyPpMY&RZ?-8K4+GBEzY8tWNPcP6{?ZK3oe1<`q!R6KVVb<?2fn%}2m<Q|x
z)&pI+ebo$yiSOduI|u@OJ;=$3I<vRrs4pVt0H-ec>GlU#TvnC5-zK01ySU5w9V?K*
zZk|kT>jnC&anMDmXMb9f&&Yl9VeXiN+|N=UZxTy|IvXn{SP%Rfc#45@SVsdV0I$RZ
zv>jN5xeIm=@OxRzvVAJI9mqib;EHpY_==JgxL8G7T;H5BV7(_NfWF=9%Kk5vy;&N8
zSLe3lun2KEzvK`To)l)8^kEf8TQL9JHeg-u-<2TAeyeDFZkvFm0>*Q%=W{zpa<c}x
zV@~IOc3~FSuH5mr0WUB-Yqbuz3@aEo?tuS45BLC92vBoEGX#zYzR1BH6So830=|x&
z$6}0{V?RuMgLrr%umly)X>S=20W^-vX~C4l987#FK^?FZ_$)B1+NS{%q^-bnm|*-7
zcnA}#QZgRP?R*htQ5^@&0FKFRl|nJ$?F2SsWvZ(&3+>U|`4|WRW^=gk0-On454;}}
z_t8i*@L}L}hy4F!;5y6-{yw!ga~c*0iEr!O9cUPyD=@p3bXRrMJj@P53I;3%MP~x%
zoOD~~x+gEGhz5)Y-cD@@FW8ON476fa&ZWSEz;}SZG4dI~1mI1;1-Z|dN%8#6awC|l
zrv>X5a5na!*$Aw}e3f@l+_DqQ%`h|K^*3S<vwvsw36u|9g<S`QVo_tTUJJJlaBOkx
z`)<W%GCMJs#a3#}Dn9feCxe`hYJIh=UR6az@DKR><~omyW+oXkiWVx`ol$<ap`SgO
zFhYPiM&N7}y_w1cOX3WiU|ubJ%ql$|^JRVs_zA<af@8p0z`p=5!^Eyusl$YLUT(}6
z0ykj212P5PubB0>2Ya|2N&>h7SPOiQ(c}O1uoZFs5f~fs9>rz~#e}yGxDvDeTd?aY
zh2{2Mk3HN6(^#h>>=WM;?%4)eeX+ozs5e)_0u6!bNsseq)KMQ3RAFpFc>T0Gnqs3z
zd^h(7{Bm=OJ(-9%hzLq+HXbek9;v{Pb_0LH#BEUB?5cndECD`+SvucgXc6i<%-a1F
zFqhF)%+i7hP%GwExP!wVJ_>9CZpKoo3Vn~0FyHTUm@B8Iti1vV_MLwa^T$W=B=B>h
zGlcRpi|erO{y?S!{|Y?8z(Ko;vG2<Z6QOunzg3i(g>rjU74Hy>v>ap=rZsrHV{Sdo
ziTxiIlc*_t?b4lzzV0pUOlPUel0|oKe`Li4WzTxpi&;ZcfOD{n2cPmsRW<h+K4zH>
zrn%5`tb5cZEI)HF0^(r}QEtF|x`QRetW2f!R*{$6;tcLVAeb-r^O%KK=-BsSfu{w)
z>m&BF7!#XKm<ZQ06EKVSl|)~Q+pt*0a*AIIvnf0y0IMvmrrYT-_K9z-H#P=z0V0t%
zhcEEb3328$m2VM?P+?Z1Ph(7od!tKi^Qgk#Iy0m~E&9MvWxNOr@rYA+npx6eVZpr*
zV3x*WEc>An;+yX*H3@5OG84N|iaERIVhx=h$3&zUlH2F?4BWLUmD}GA%pbS|3xZ`R
zz56GhJuw~&8coQZgIN@R2+aik5AY0!i)a3O%m+?eBhJU`fPcdLzg;Chu2NA4yd$?o
zJ)HIeUjgo+xEn<<mqpa|Tt|(~g!YNAATxmlc{8QZv1L>l7Z?8i_<E++yH$h^BpWJw
zGD=rEWbNL7Th{jz3}~+jp!3Pf6b2TUQlLN&@NjOc27>u_Uxl^jdj-)J$;*J(VitQb
zJm6xik#^M0m&JUkzX$$|^>^J~;bWhQJ@j6lJFb@yEeK1nl(J71culd)kk4UO@{|Ja
z@i9?*7We_R7l89~=ir}-?naiv0&M@o5m=Cv6W?~Qr|3c=)Ym$53BTQ%ramToU_m33
zk~Q@psTiut_WqDfJt3QV1KRomI#VXRohfBqcb4}4Fn8Xf4a?k$$Me;EU6l~uT0pU+
z`BhkB>+67bVs4N_X$DTie0{}yb@?>9C=t(K0{(SObgM;MZu>oOCl(ZZ8-)e95eve#
zP&fl3i@7D{WB$@Y)u`h!aa)7=e`_V!B$(Ue--yoKQ0yW3MT+-q7`4Q}rpc|#m<dcM
z=2jJfK$W{Ur3ga!z`};3!U9%RI#S9rU0GJ`$?`&X!1lh7j+AX(>5xnap4e5D|2aq>
z^=t;7Dj%t=!z{ZASi}B8<kQ58iSJCzc!)aT4`S2wjnzKj19$@X0+!)%TEu&%Vd5IK
za>5?0_~3ZV@-GyCn}@j`Hep#1)egW3_E7k@BF9Z`te?al(nlmQfF-}6UVLT@u9#Rz
zhsr%$QuJh%_npwdys<vsC<}%aLsiKtbfuNQw5NHvBg5J~S$3wB-I<V{j1pqzisXd0
zZa9%hv5G<!o!olIc3FAR<VxHaa=-?aD`Qm5XLsl^wqcg-nG}8q%^*66l4m;6&Hh8o
zLafEYgEg2H93?_y2XX9Mu?N^3ER&@WXJKOZL8|ZnjbU+zrA6Me3-}C{opZzz0|<S_
z5N-Y+MBe?736*=drP<yea`pUr&X|}Oo&ePls!DGFYxiXN)s_^0X;0IUQo6HBCe(e3
z<q7zudf1rnVY*tWZ%-KxOW41PYZ91<Sybb&scIADUEV0)S*i_7soTuq!Nn)AT+Bk^
z+e~4X#DO#t-QZet`>vHK_kr|NytF!j^_>`ql~}OxdlW9B@qmkR@4J!eHJI^%w_?Q<
zQO(c$fv*9#Q=8ve$*^gP(8M6c7jhM{2%##=yE1&@sep@TCwbG%B-0wa(g{-q>B}n5
z?9TG@4gEaSo@RGO$%gxlG_Sl1*i8o+OKHV7feG#LSb*m=EZB1l`%|C}wSvn<-s*h;
zn@Zl!!2-}mv_)3Ozz>Ik#$T&9@j&Tq!r&tGin&(4fLXzXifP7Rxxs5Oe{(eoFiysN
z&{3&?A=Vo5TR?Xe##d4DKB6XI`cUsc5!vSt{qMDXJlc`r;@L?~X^Atv-ea`%0^Z&i
zaL1+;w{7TWdoECB1tpbOF;oGWjxd(eOpQG(SM(grk9rzr@m4})2Vx;64v%xN|FMtg
zXm<V~;V4c9_z~tKzM8@htQo*ZFkkzV6&~L-EVz1Vk@q};J)A3@g;EtP;AS^x%W$sn
zd{8L};jx_=mUm@2V`7}MC)crLe2h6wKFJz(M{Mc|_}1!P?%tdt(EWM2l`QBG;TVv?
zOfLtb5$k2}516%Ei_y>-SgP6c?6>;zDR7SAqgVj$2F(9^LB#t`#&U?S!~DgSU@Ue`
zUQpyc>oDP6LG^=z6(I&7_Ol^6$9G^vKoL@ba&KFjKkvxU+8krixEPC?ZJX2Nlc<rx
z300*lqkMC9FL!V5C)Day(5d<LMq2XQj0IG#rf}Y8t&jpbC|tRfk7GK9&n9e%^l8{~
z>4)NDWz4Iv9vXYgJf1k#?(#iE`+0X@DP{LFdiqg}nAib7M{IeSD_DpLWJ2YMof)3k
znPGgL$DBr=X$>AT8+_(8`OIkam{{l2QYVawSN?ue;Pw~#`R&$JRfQJ>RO>;98}t%v
z=JFw|qG_PuR5j@XZo;gaLvOM)PJBy&Vgbw>fd8U!0ImtML|0+{_ra_bF&qRq33GKs
zEyvym+=4YyI?`6-C`vBRSL+ZdsZA<55mr@pr$hdh3VEUvlD;rDE{ur_Nnfb<g@gwU
zF`>ct7?%*H)O#G)<g>UrMoZGmrF4~69M|j#xNB32zCf$)P!woDN0f2!HsHMsEW82x
zBkXOM)e}(OX`W#I$gNmV=m82_Tjd_d(L@FdTpfo!lnVvmrUD<u+&_;~`g1S2&$u4z
zrCf**xEIU7*j4S5R%!BXhlX-p^&+w_JxkTfaCfGZjufE#zj05%%L#VeGm)N9=W))|
z1aFz0WNOkYnE<Q8{o7J(=?jKZ3{e);tnMT-Y`4R)n5&^!K4>4-wEJh60JdW{Xr%;C
zG0QgZS}24Q-_p{9Wev;&E~l_t>qM*o<9*lzxs>O>0juD9ZISmZ2mXWFDt@ULxqzD&
z3L)hVD(6$w_I*n3FV?A2QB^VunGkxiN@pr$LwCUPt}Gv0+{En0(g<)WRG!?Gr8}c#
z@6t9%l;L0a7h|QGQEbCjZT$h(K&GY^5iHR;a1^E!tL&SL6<Qp6wdWh~T!Z<EOXdId
zfwutfCc5N%3-F&<<NTu%4?xh~YF_q|YZrOoW)*W*P4{qnh95rPOR7Y!`0afGyVIKc
z?CPp-?&JFyp5JXO)`~A`mFZ4w+V>SKeWzB1*HJ#!U|9suN4%cE{J(FZbbX#r$6Ojw
zUF-G&U&cC>)oKoQ*|Fe;Xd01ht=S!UQ4SOy+@4`?MoZGreQ!qTuK{20K9pW`SS=+N
zP`o(iC%`YT9NHTDb{!Q$f%~umjLwMnG-Kt*XO-adj>R7MCq%p+V%OzOlzzRwQAIAY
zELothcGT!#RF$5r(w!}h>6`F{m{%ieWchu4$gsqB7SYzlF5p*0-*AqjhX7ms;=4rm
zjh+j946BG7E-hFS{8td|!~89lh0#^*lTvL=d{wik)@+iy2-L@*F;<!^q+=2u4ZhTd
z_!_;#6yNbg=T5HY2yMmZ7#6*l@Bil!uX|Ww&b170Rp&Ssf4H3JwAH_14RbbB`()Gt
zdCRvKq`gLL!NU-Q7mttA6qAzpXvfzHbH~J}^Q2Z*Ms8<#&7$jw_S1D!dkwT5)ujz9
ztcYq+nPmUU5{bd?6ti;A!umEuEm*oa_t}qd6cthw!vj#2ZncwBbEqoK3E|>7Ns=Wh
zmi0wAcS?du^`3>;tEj(fUCp)-vS%2-UaVh3h`Y!g2cuX|hc93=qe6_sDkaZh@axXa
z!(0|oe%>D7`&j(J1$}dv_?neeb1Nx?s?^7XD~_w@r19~R_6&aM#5m_nN#y!YXw__f
z`*gMhLD|bZ9S*RpnqOi$z){!STx<c(RtC;L9gp?rJv-v{09%Rq>l}eg0gZ%Qsu|q^
zn`>eMj#;}wsEmyZSIn*F;#o;by<kRM;L79cdFA8;@v6EX6oj@=k9rruU|0BcjGX+k
zO1BVgiJpyFz!Qt?CysT_dpCufIOUfD`YhJZ!*Kw4@wF9QwfZ@Cs<ukRv<9DlnBTw^
z$JH~wu5{IHc|?RsNskXLYUIM1b&N}RWW&;=vJLHkWsfM^)?PfZR-S#;qM7nGb$1+0
zC)Uj70SddP1oQp=9nt>ZS7Q0RQ43%`hvgWrq*en;Rm1~WdC>$^*d!ubt96Q0l~5H=
zgwrP^_{ic$-f?U_;}YdFhD3zv4L;YkHuC-x8fYCC%lUvSc@lITs^xO|)M)bHVKib(
zsu!Zr(nF5YuolZcSRL_t5-SmYV}aLNvC`zIJo8<cZ~4AzA7rg^K%`tZDy$NbL9b|0
zDpbwqI-|j7>C8G_H?59&V@p+RGce5wkGCJ2WN~whTQ~Ichqe^mSuIOLpF<8D6<Lc!
z20sQOOLT=$BhjUuwMHw}gSHSU7*-mdV{klxHMsvOg)<eVVFef)*k1}f0r)Uh$yVqF
z$znd`TW~?&NcJh5m&tC@SnOGZ*Hr4mHP^hnrOx9u)9N^HdL4_##i)-BPVn*;YN4h8
z2d@q}@QM_^2roV+&Wr}1GbYBlZ9_lLbY;nw-{x8!CX+jd`MbNZbh1KStB%9gM0<+b
zwj6z|zrg&6*LP9=p0h_YiUq{x0H2_+i{T_Jo8beP@AgWp968EObSv;pMsI`sirg>z
z#J6MIxc-)&-qk3*D%v0wn6U;5XH1B5_56Akj*AW2#Sp5J4xytzWJOn&mAkXF_lI<4
zYzg;<n6<4uw$W$F_&D>&`ZUIb*dUr_PE2~7KfR7qTjD&lBg2o@^|7wI^saCPL}Z7+
zvl0Zu{eUf)I883_+A-K-g-=p^k;ZD`V_mQQj_AbvO}Jo9x#`0iFD<}|Bo4h1^9|Tn
z15abUAfnorK8X2}E44~SsYz2jKR%h;Mr;u56W?>6e3B>T&07wv7i3W-jxq%1j`2Bh
ze4K_sTD!ejWyS6+cW&(G;STHfkO`GQA=G@euC=I)i<J`3ZuD6?tB!M~B$!a=4Vbd#
zd*%y%?KI)xj&xbXSIp(G9(ZcidCkM!&9hj3c2rlh%P{NX%b1AOQbxr%ETaAiEKf9w
z71UrF<Ppd=Of=^LXBK!p3A`V>h9*bsV;$DS{b_1@wpEONY(^QyoZLBTAL$3}6W<?y
z=u8&fvGYlla5-perB=TjN;qv(Prz*(`uWACes-rVKvxLGgg6WI1<LY_vU*RJ2ezfT
zdVT|on`48rg8fo15r4?|1OicgN;>t~5$viRvoy}6u;o~XHCaCsYi9Dlx!>u*e5qL~
zca!+o4LlZ@4ZInfx*kJxV6ZbcX6JS&KZ^C&{S3Br``iNWX)f~nyD`7<Zy4R3%CeZ%
zo}sW?<wPvKZVe-B0DovyYp)7_26=-h<0=&^AI!(B*^}k#t9rR_TROMw&(MNlsQ@0>
zo~ARUd}vW4r?kWdRkTqaWm2r1n|sIJyn7@83B~+t=V8H*Ld39@1YU#{)2zmtSMS6`
zxDo-8{8C2~F)Md|?%&18uX1odqt}WWZG^xdurlCJVg(d~A%(4+{6j{6a8$9>xb+l{
zL-@c|x%b_S%|3_Ko$Vm;U2#zh3zzM<7q|+M7Y%2JLnW)wA1Yo@_zn}Gy+7out9rSA
zTY6uRZm3AEl<cWp8E#tJ%Q1D0%xv@tBW`N}QXvFoNIT07Wxe7(@R$4MjdXWwuw_`j
zh^-7<j3#VR#Zv~_X$`Ovi<pmA-{EK_jb$m!#}>UDXl=&;_#Ji)c2#@uCE{tU|HbhX
zo}7=xQt)05{1JEzyAL-pgf4=I<#RRmr`Gh=B_CC2714M(Q$=F}k91`C^wZtMyyz}t
zyHX*KbYzAtym>?fALZeW44+xv!=$8F)a=WK%JN;MUt3U-e&CM{iOlvA?eY#xSg$8K
zWotCC3iAa&Fv$0hmVD;X!Y(XMFc)|Og{#-{tiV#$hMO)~i|oX#+B1o6u_?eyb6Y#s
ztbR*wTaStHUvv8^$YJ7}iNykiAB&yz>E%2^PlR>dS=R2&7M)m%m{6A@=T=0>gvy_G
zqz7)OlmA>wnD48A=+@BVCr@mgJmTHu$Y2-CR;(oSTuQepK_$sz{a$YX{>0#2A_J}e
zR!QIXPzeWkty+1q>#=2iW?_ELLTm^AFYsuU#&{@cqQB>2uNC4?Sdqvli7o)jGm(SK
zu)8rqeirke|BeFR<6$@GQ*W8d!eu-Ds>p*Nmq_ua-iYx<D!z`Ih!C%yt&~BzQ@wCC
zSC@1UX-v4D1zrPOf#qlB+fLT1b(qB-9#3PPuYSYO7gTH`+V9p!ZKta3%8jwm^nNcT
zh^mi($FT)2zs=!29{PaK0l%g;9&Czb{zUnlH!?JTbP6+Q1j})r$>8syrrdTc7EoSE
zfor;;u(n+Ou>f?Zz=aastlKdR6y2`yAqo7pj$1!pj*r-lMXm3|gzSaf|Hm<b&aYY=
za<IjyW!geaVDlo|k68v?SndCvScLsX%+EHQl{dP8Mc5Saz#@S@;P%{Bs|o)Z>?S>y
zgN>nHY$cNap?b^hC|22)242Gc2gF{?qWd<rlZhhOd76&}b@Q1D3hV*?8?$DI;z!J2
zZk0!{c*+C@4iq0s49nPgzR(MYp%UVS`k1Kx0pZfxHJU~js%q<3i9XjEFRQVT!K}Sb
z?85mHw#epe>?WUur41#qGUR&7)6_<DW9i1kuMf*7eGbbB-NAlQ9?A5&ANUBC$#DjD
zlk5Q=!Xoh1v>pdy9ag@(5;zqL=Iq3}f!$2?#jPI`t}ZNZT!5bew^3UGHpQ;7k6}W0
zI(9DGv1$KL7~Vsy9}~|@v8<xYvAp`p49+mkMxCcfRb6sNn-_|ImWuoYtM7J<5QSBW
zUb+dE_bi=M>8V<+K0!-$9*P}bEli6?^Vp-tR|{hs>{v%S-u!+WFn8Xob3dnIE}3Jn
z!l6UG3BSRF`>@3liUnoDP`t-by$ST=BI0_jjs(>d$T#q0O{zM*+iUSgamP10#$M~=
ztHfCI`|ZJIC4a_*b{6LDnuQsulQE0C9-G1Zn26a+QERAmSqCU5AmR5=&a6<;+YyPX
z{*qAMuQ4{Rx^Uvicj$09YL&bzujo38MXlMDODEv@;W}0Mj*4`St_NUkkV|KKK}2p!
zCv}SxUWem|rw5C<6z!!lpesRDGOGSvqWU97cg=QH5Yc|nABpgLKP&G1IUEjP5aPSy
z!in_xeY-{YCh&W-imOeIGIH4s_aOQmpm&Y4dL0f&jzI;{#%IRji9C<WR}t2zIQ1=t
z=Kc`t{Qr3`mfgC-39rN9IDkQk?~`vCgF@(UPy9xOZvY+6`i;iIlDY}F5%f_Fe0R1S
z4#z<ZDShE3mnog^Y)jT<V%LFugy?SeM=us(+lk13^o{BH*7{e^DSc-ihr==I8B*@<
zqdye_rQh?yuc_+SRJB@VkF`t>aHA*wO<^YEgxBG46lBPS6JyjP=EwGc-Y6p9#brPo
zNWUUqM!jzYlI?2_U16ZZ;V8_I#drDnQ|L{l=<43t4)R$=zXIA<?E|SQs;IJ8l^ZnF
z8{-MOlIbK*y`iz%BXc+$HOjC{))w8>K|I?_%5P`^y;fBJ36ZfnlAVrLRCg+TDHQJ;
zi5R>4_A1X^=CT_c4o5U2(#ZvP?LzyuL85uAFa9+MA5>)$Qi+A<t4lt8LEr^cZ|F~Z
zH;p6c?^alQX~~+TI~<N9lo2({S#{xf{QAiRL3(d0k^Pdw^&;~0kuJQbE&VR=m<k{1
z9ozlwbzf{rb&gFq;dMA1gQ8?QdF*etFmZ#@J+1C6lz+u~UzVdsY}GixrP2r7CGe%d
zlSg(<+Q#<N7FT<C4u@kDQBosy;;J5|tnMR2INO7(Rpnj46lC=Kfo<tEP;@=Q_wfAh
z``JvJdOj<bI{&W2;TRev*TfU<Y6lf!8jMl#&IPVQd5u<e*|d?Ps(m8zD@AWgXS07y
zBoh7V#aQ*m=4ubk;c$#X%A$v-EPH`I>RI``uxPH%3gIFVd7q-k0sbfp#|4V6Lisu(
zcPG+&w)DjsS#!~pYLCm|aExNgs)CE}YDdK*2!f<1EKplf_hLaNaqvQiHH3L~RW&8Z
z7DR6e(I1D(dSAShipQ!8TdF-shr=<-sfY=>@Xj41$Vf`!NfGaOQGF+>OBH5_NIkWX
z9GuG?Q=tdgi0U#z?+2cz8=F$&`*+uMvg%Efsys-C!*QfgG0AIPwgU}Ah$n<}5JU6?
zgiA#@6PSz2Oi-`VOBI>sYACQ7SgXi=3b(0->%B}olw?}78nWg>S1RmqI7&xV?9GL@
zcA)VP@c?1Gz!|FYT7;8<xdPJ<Dq|=C`3~@6{{WEy*o^W#@Fb#t#OKc%NT&kZ=%#Dw
zvDG*|4u|6?pxTpt7B1U?04t|Xlm%@a^95Q#PXJi}ED&_A!o*y2au86J1OA>nklc|R
z*f>`>ps~6AqfOy?glB=(g04noMVM?~@1-Vy4=c}it_6p~QGTi}zIjeq*1oUYE(WBL
zV?1=0pi@zqfG|~ICdzaXouEhqO1%gTK!YlZ&?{&UN*~axLVM1guvt~w1nE%N8u)BX
zWWzn72dE&~MhNR!aY@ab4u`{Wgj17hGk@6*Jj}WklrR=hPcqgQ24f`9MiH%7B!&_b
zAqK>A;+qvTBT7~wtD=1Z-Su^u?sPUD1X&*i)Pt<Ra~Djg_Mti)j-!;C6yHO6@%J-i
zChWGx!J#5zO1saUK+gRjCe~Jo1}cgGo<Q5?CU(BhwRm(m9JRs!2ljyD4)RhYbpQYW
zC3HntbYx+4WjbSWWnpw>05UK#F)cANEipAzF*Z6dFgi6bD=;uRFff9W86N-u03~!q
zSaf7zbY(hiZ)9m^c>ppnGB7PLGc7YQR53C-FgZFiG%GMLIxsL;<IeQ}0000<MNUMn
GLSTXuMjyuj

literal 0
HcmV?d00001

diff --git a/doc/logos/artcompiler.svg b/doc/logos/artcompiler.svg
new file mode 100644
index 0000000000..d8349a1657
--- /dev/null
+++ b/doc/logos/artcompiler.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70.5 70.5"><path fill="#fefefe" d="M64.4 114.7V79.5h70.5V150H64.4zm37.6 34.6-1.7-24.2v-.3h-1a9 9 0 0 1-1.7-.3 1079.2 1079.2 0 0 0-7.8 23.2l.8.3a35.6 35.6 0 0 0 11.4 1.3zm-18.5-7.7 3.4-1.9 1 .5a29 29 0 0 0 2.7 1.1l1.5-4.6-.7-.3a23.3 23.3 0 0 1 6.1-44.8v-2.4l-.3-2.4c0-.1-.3-.1-2 .1a27 27 0 0 0-7.2 2.3l-.9.4-3.4-1.9-3.5-1.9a38.4 38.4 0 0 0-9.1 9l-.3.5 2 3.4 2 3.4-.4 1a34 34 0 0 0-.8 1.8l-.3 1-3.9 1.2-3.8 1.1s-.3 1.2-.4 2.6a55.7 55.7 0 0 0 .4 10.7s1 .4 3.9 1.1l3.8 1 .3.8.7 1.7.3 1a432.5 432.5 0 0 1-3.9 6.7c0 .2.8 1.4 2 3a47.7 47.7 0 0 0 7.3 6.6l3.5-1.9zm21.6.3a25.8 25.8 0 0 0 6.8-2.2 1286.7 1286.7 0 0 0-7.8-15.6l-.7.1-1.3.4-.7.1v.4a1616.2 1616.2 0 0 0 1.3 17h.6l1.7-.2zm-10.5-12.4 1.8-5.5-.6-.3a10 10 0 0 1 2.3-18.9c.4 0 .6-.1.6-.2l-1-11.5h-1A21.8 21.8 0 0 0 79.7 122a22.3 22.3 0 0 0 13 13c.1 0 1-2.4 2-5.4zm17.4 4.7 2.6-1.8c1-.8 2.4-2.2 2.4-2.4l-3.6-3.2-4.8-4-1.2-1-.6.4a14.3 14.3 0 0 1-1.6 1.3 391 391 0 0 0 5.8 11.3l1-.6zm12.5-.7a31.1 31.1 0 0 0 4.7-8.8 337.7 337.7 0 0 0-19.6-6.3l-.4.6-.7 1.2-.4.6.3.2a2416.5 2416.5 0 0 1 15.5 13l.5-.5zm-22.7-10a8.6 8.6 0 0 0 4.6-2.5 8.6 8.6 0 0 0 2.6-6.3c0-1.2 0-1.5-.2-2.2-.4-1.6-1.1-2.9-2.2-4a8.9 8.9 0 0 0-8.7-2.6 9 9 0 0 0 4 17.6zm24.9-1.3a29.8 29.8 0 0 0 1-9c-.1-.1-2.5 0-8.6.5l-8.6.8h-.3v.8l-.2 1.4-.1.5 1 .3 15.6 5 .2-.4zm-4.7-9.8 12.1-1h.4v-.6a36.7 36.7 0 0 0-3.4-11.3l-21.6 11.1.2.8.3 1.4.2.6 11.8-1zm-6.5-6.2 4.6-2.4-1.2-2c-.8-1.1-1.8-2.4-2.8-3.3l-.8-.8-4 4.7-4 4.8c-.1.1-.1.2.4.8l.9 1.1.3.5 1-.5 5.6-2.9zm-3-7.1 6.7-7.8.3-.4-.8-.7a31 31 0 0 0-8.6-4.5l-6.3 19.5.8.4a11.1 11.1 0 0 1 1.6 1l6.4-7.5zm-6.1-5.8 3.6-11.6-1.4-.4a40.4 40.4 0 0 0-10.7-1l2 24.2h.7l1.2.2.7.1c.2 0 .6-1.2 3.9-11.5z" transform="translate(-64.4 -79.5)"/><path fill="#efd1cf" d="M102.7 141.2v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm0-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm14.4-.5.6-.5-.5.5-.6.6.5-.6zm-14.4-.6v-.1.2zm-.1-1.1v-.1.2zm-.1-1.1v-.1.2zm0-1.1v-.1.2zm-.2-1.1v-.1.2zm-.4-2.2h.1-.1zm4.7-1.9v-.1c.2-.1.2-.1.1 0l-.2.1zm-12.1-.6-.4-.5.4.4.4.5-.4-.4zm33.9-3.8s0-.1 0 0v.1-.1zm0-1.2c0-.1.1-.1.1 0v.2-.2zm-49.2-.3s0-.1 0 0v.2-.1zm12.6-1.1v-.2.4-.2zm20.2-.3h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-42-.3c0-.1 0-.2.1-.1v.2-.1zm43 .1h.2-.1c-.1 0-.1 0 0 0zm6.3-.1v-.1.2-.1zm-5.3 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm-12.7-.1h.1-.1zm13.8 0h.1-.1zm-12.8 0c0-.1.1-.1.2 0h-.2v-.1zm13.8 0c0-.1.1-.1.2 0h-.2v-.1zm-12.8-.2h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.8 0h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.7-.1h.1-.1s-.1 0 0 0zm1-.1h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-23-4.6.4-.4-.4.4-.4.4s0-.2.3-.4zm14-.2c-.1-.2-.1-.2 0 0h.2c0 .1 0 .1-.2 0zm-2-.4.2.2-.1-.1zm2.1-1.2.1-.1c.2-.1.2-.1 0 0l-.1.1zm-6.8-.8h.2-.1c-.1 0-.1 0 0 0zm7.7-.3.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zm-8.6-.8h.4-.4zm9.6-.3.1-.1c.1-.1.1-.1 0 0 0 .2-.1.2-.1.1zm-11.1-.1v-.1.2-.1zm1-.6c0-.1.1-.1.1 0zm11-.4.1-.1c.2-.1.2-.1 0 0 0 .2-.1.2-.1.1zm-11-.6v-.1.2-.1zm12-.4v-.2h.1l-.2.2zm-12-.7v.2-.2zm12.9-.4.1-.2c.1 0 .1 0 0 0l-.1.2zm-13-.6v.1zm-1.2-.5v.1zm15.1 0 .1-.2c.2 0 .2 0 0 0l-.1.2zm-28.7-.6.3-.3-.2.3a2 2 0 0 1-.4.3l.3-.3zm32.3.2-.2-.2.2.1.2.2-.2-.2zm-18.8-.8c0-.1 0-.1 0 0v.1-.1zm-15.3 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm31.4-.2.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zM98.1 98c0-.1 0-.1 0 0zm-14-.1.2-.2-.2.2-.1.1v-.1zm13.9-1v.2-.1zm0-1v.2-.1zm1-.5c0-.1 0-.1 0 0zm0-1c0-.1 0-.2 0 0zm-.1-1v-.1.2-.2zm-1.3-.2h.1-.1zm1.2-.9v.2-.2zM74 91h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm2-1.9V89c.2-.1.2-.1.1 0l-.2.1zm22.2-2v.2-.1zm0-1v.2-.2zm-.1-1v.1zm-.1-1v.1zm4.5-3.7h.2-.1c-.1 0-.1 0 0 0zm-3.7 0h.5-.4zm1.9 0c.1-.1.3-.1.4 0h-.4z" transform="translate(-64.4 -79.5)"/><path fill="#eac1b8" d="M98.3 149.3h.2-.2zm3.4 0h.2-.2zm-4.7-.1h.2-.1c-.1 0-.1 0 0 0zm4.9-.4c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.1v-.1.2-.1zm-.1-1.2c0-.1 0-.1 0 0zm1.3-.9v.1zm-1.4-.3s0-.1 0 0v.1-.1zm1.3-.8v.2-.2zm-1.4-.4v.1zm1.3-.6v-.1.2-.1zm-1.4-.5v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.6c0-.1 0-.1 0 0zm-1.3-.6c0-.1 0-.1 0 0zm1.2-.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm-1.3-.7s0-.1 0 0v.1-.1zm1.3-.4c0-.1 0-.1 0 0zm-1.4-.8v.1zm1.3-.3c0-.1 0-.1 0 0v.1-.1zm-1.4-.8v-.1.2-.1zm1.3-.3s0-.1 0 0v.1-.1zm-1.4-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.3 0v-.1.1zm-1.3-1.2s0-.1 0 0v.1zm1.2 0s0-.1 0 0c.1 0 .1 0 0 .1zm0-1v-.1.1zm-1.3-.2v.1zm-15.3-.3c0-.1 0-.1 0 0l.2.1-.2-.1zm16.5-.7v.1zm-1.3-.1c0-.1 0-.1 0 0zm-16.5-.6c-.1 0-.1 0 0 0l.2.2-.2-.2zm17.7-.4v.2-.2zm-1.3-.2c0-.1 0-.1 0 0v.1-.1zm1.2-.8v-.1.2-.1zm-1.3-.4c.1 0 .1.1 0 .1zm1.2-.7c0-.1 0-.1 0 0zm-1.3-.5c.1 0 .1.1 0 .2v-.2zm1.2-.6c0-.1 0-.1 0 0zm-1.2-.5-.4-.2h-.3.3l.4.1v.2-.1zm-1-1.4c.1 0 0 0 0 0-.1 0-.1 0 0 0zm-6.3-2a2 2 0 0 1-.3-.3l.4.4.3.4-.4-.4zm-28-4v.2-.1zm62.5-.8c.1 0 .1.1 0 .1zm-62.6-.4s0-.1 0 0v.2-.1zm11.8-.3s0-.1 0 0c.1 0 .1 0 0 .1zm51-.8v-.2.5-.3zm-18.7-.3v-.1.2-.1zm1.2-.3v-.2.4-.2zm.2-.4h.2-.2zm1 0h.2-.1c-.1 0-.2 0 0 0zm-2.4-.3v-.1.3-.2zm3.4.1h.2-.1c-.1 0-.1 0 0 0zm15.2-.3v-.1.4-.3zm-14.2.3h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm-46.8-.2s0-.1 0 0v.1-.1zm47.9 0h.1l-.1.1s-.1 0 0 0zm1 0h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-61.8-.4s0-.1 0 0v.1zm0-1.1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm32.5-23.1v-.1.2-.1zm0-1v-.1.2-.2z" transform="translate(-64.4 -79.5)"/><path fill="#e0a39d" d="M98.7 149.3h.4-.4zm2.5 0h.3H101.2zm-4-.1h.3-.2zm4.7-.1v-.1.2-.1zm0-1.2v-.1.2-.1zm-.2-1.2c0-.1 0-.2 0 0v.1zm0-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm-.1-1.2v.1zm-.1-1.2v.1zm1.4-.1c0-.1 0-.1 0 0zm-1.5-1c0-.1 0-.1 0 0zm1.4-.1c0-.1 0-.1 0 0v.1-.1zm-1.5-1.1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.4 0c0-.1 0-.1 0 0v.1-.1zm0-1.1c0-.1 0-.1 0 0v.1-.1zm-1.4 0v-.1.1zm1.2-1.1s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-1.3-.2v.1zm1.2-.9s0-.1.1 0v.1zm-1.3-.2c0-.1 0-.2 0 0zm1.3-.9v.1zm-1.4-.3c0-.1 0-.1 0 0v.1-.1zm1.3-.8v.1zm-1.4-.4v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.7v.1zm-1.3-.5v-.1.2zm1.2-.6c.1 0 .1.1 0 .2v-.2zm-18.5-.6-.2-.3.2.3.3.2-.3-.2zm17.2 0s0-.1 0 0v.1zm1.2-.4c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm-17.2-.9-.5-.6.6.6.5.5-.5-.5zm15.9 0v.2-.1zm1.3-.2c0-.1 0-.2 0 0zm-1.4-.9v.1zm1.3-.2c0-.1 0-.1 0 0zm-1.4-1c.1 0 .1.1 0 .1zm1.3-.1c0-.1 0-.1 0 0zm-1.4-1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm1.3-.1c0-.1 0-.1 0 0v.1-.1zm-1.3-1.1c0-.1 0-.1 0 0v.1-.1zm1.2 0c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-2.2-.4h.2-.2zm.2-1.2h.2-.2zm1 0h.3-.2zm6.7-1.7.1-.1c.2-.1.2-.1 0 0l-.1.1zm-.8-.9.5-.4-.4.4-.4.4zm-41.3-2.5c.1 0 .1.1 0 .1zm0-1v.2-.1zm62.5-.8v.2-.2zm-50.8-.1c0-.1 0-.1 0 0v.1-.1zm-11.8-.3v-.1.2-.1zm26.1-.8s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-12.6-.3v-.2.4-.2zm31.8.1v.1zm-20.3-.7v-.3.6-.3zm37.7.1v-.1.4-.3zm-18.6 0v-.2.3-.1zm1.6-.2h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm-33.3-.4v-.2.4-.2zm34.4.3h.1-.1zm1 0h.1-.1zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.2 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-25.7-.2v.1zm26.7.1h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.2h.2-.1zm1 0h.2-.1zm1-.1h.2-.1zm-56.9-.3v-.1.3-.2zm58 .2h.2-.2zm1 0c0-.1.1-.1.2 0h-.1c-.1 0-.1 0 0 0zm-13.5-.2h.1-.1zm14.5 0h.2-.1c-.1 0-.1 0 0 0zm-13.5 0h.2-.2zm14.6 0h.1-.1s-.1 0 0 0zm-13.6-.1h.2-.1c-.1 0-.1 0 0 0zm14.6 0h.1-.1zm-50.2-.2v.1zm36.6 0h.2l-.1.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1s-.1 0 0 0zm1 0h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-27.3-3a2 2 0 0 1-.3-.4l.4.4.3.3-.4-.3zm1-.8c-.3-.2-.3-.2-.1-.4.1 0 .1 0 0 0l.1.4.2.3-.2-.3zm.3-.8v-.2h.1c0 .2-.2.2-.2.2zm-8.3-1h.2-.2zm1.1 0h.2-.2zm8-.1.2-.2c.2 0 .2 0 0 0l-.1.2zm-7.8-1.2h.2-.2zm8.8 0h.2c0-.2 0-.2 0 0-.1.1-.2.1-.2 0zm-10.9-.1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0zm12 0c.2-.2.2-.2.1 0-.1.1-.2.1-.2 0zm-10.8-.1s0-.1 0 0v.1-.1zm-1.3-1c.1 0 .1.1 0 .2v-.1zm1.2 0c0-.1 0-.1 0 0v.1-.1zm11.8 0h.1c.1-.2.1-.2 0 0 0 .1-.1.2-.1 0zm-13-1v.2-.1zm13.9 0 .1-.1c.2-.1.2-.1 0 0l-.1.1zm-14-1.3c0-.1 0-.2.1-.1v.2-.2zm1.2-.2c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm13.8 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm-13.9-1c0-.1 0-.1.1 0zm16.8-.6-.7-.7.7.7zm-2 .5.2-.2c.1 0 .1 0 0 0l-.1.2zm-14.8-1v.2-.2zm-15-.4.1-.2c.1 0 .1 0 0 0l-.1.2zM98 97v.1zm1.2 0V97v.2-.2zm-1.3-1s0-.1 0 0v.1zm1.2 0V96v.1zm-1.3-1s0-.1 0 0v.1-.1zm1.2 0V95v.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0V94v.1zm-1.4-3.2v.1zm1.2 0v-.1.2-.1zm-24.2-.4.3-.2-.2.2-.2.2.1-.2zm22.9-.6v.1zm1.2 0v-.1.2-.2zm-22.9-.6.3-.2-.2.2-.2.2.1-.2zm21.6-.4s0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm0-1.1s0-.1 0 0v.1-.1zm-.2-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-.2-3.1c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zm4.5-.4h.2-.2zm-2.5 0h.6-.6z" transform="translate(-64.4 -79.5)"/><path fill="#d6836c" d="m102.8 142.2-1.3-17v-.4l.4-.1 1.2-.3.9-.3a174 174 0 0 1 7.9 15.6 29.9 29.9 0 0 1-9.1 2.5zM76 140.4l-.1-.2.1.2.2.2-.2-.2zm-1.7-1.7c-.1-.1-.1-.1 0 0 .2 0 .2.1.1.1l-.1-.1zm9.6-7-.2-.3.3.2.2.3-.3-.2zm31.7-.2.1-.2v.2l-.3.1.2-.1zm-32.6-.7-.1-.2.2.2.1.2-.2-.2zm33.8-.5.1-.2c.1 0 .1 0 0 0l-.1.2zM99 123.6a9 9 0 0 1-7.8-6.9 9 9 0 0 1 4.9-10.1 9 9 0 0 1 11.3 13.1 9.3 9.3 0 0 1-8.4 3.9zm19-3.8-8.1-2.5v-.6a13 13 0 0 0 .3-2.1l16.8-1.4h.5v1.5a26.9 26.9 0 0 1-1.2 7.7l-8.3-2.5zm-11.2 2.4.2-.2-.1.2-.2.1.1-.1zm-28.5-5.7c0-.1 0-.1 0 0 .1 0 .1 0 0 0zm11.6-1.2c0-.1 0-.1 0 0zm-11.6-.6v-.2.3-.1zM90 114v-.1.2-.1zm20.1-.7v-.1h.1v.1zm1 0h.2-.2zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-35.7-.2c0-.1 0-.1 0 0zm36.7 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm-19.7-2.7-.9-1.1c-.4-.6-.5-.6-.4-.8.1 0 2-2.2 4-4.8l4-4.6 1 1a22.8 22.8 0 0 1 3.7 5l-11 5.7c-.1 0-.3-.1-.4-.4zm-16-1.3.3-.3.3-.2-.2.2-.3.3zm7.2-3.8v.1zm-1.3-.4s0-.1 0 0v.1zm1.2-.6v.1zm-1.3-.4s0-.1 0 0v.1-.1zm1.2-.6s0-.1 0 0v.1zm0-1s0-.1 0 0v.1-.1zM84 99.9l.2-.2v.2l-.3.1.1-.1zm14-.5s0-.1.1 0v.1-.1zm-12.9-.6.2-.2v.2l-.3.1.1-.1zm12.9-.4c0-.1 0-.1 0 0v.1-.1zm1.1-.6s0-.1.1 0v.1-.1zm-1.2-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0v.1-.1zm-1.3-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.4c0-.1 0-.2 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.5v.2-.2zm1.2-.5c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zM75.1 90l.4-.4-.3.4-.4.3zm23.5-.4c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm0-1v-.1.2-.2zm-.1-1v-.1.1zm-.1-1v-.1.1zm-.2-3.2h.2c.2-.1.2 0 0 0H98c0 .1 0 .1 0 0zm5.3 0h.1-.1zm-1.2 0c0-.1.1-.1.2 0h-.2z" transform="translate(-64.4 -79.5)"/><path fill="#c85d4b" d="M99.6 149.3zm-2-.1h.1-.1s-.1 0 0 0zm4.2-1c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm0-1.2v.1zm7.2-6-2.9-5.5.5-.4 1-.8.6-.5.2.2a1242.5 1242.5 0 0 0 9.2 7.7l.3.3-.9.8a24.8 24.8 0 0 1-5.2 3.9l-2.8-5.6zm-7.4 4.8c.1 0 .1.1 0 .1zm0-1.1c0-.1 0-.2 0 0zm-.1-1.2c0-.1 0-.1 0 0zm-15-.8c-.1-.1-.1-.1 0 0l.1.1h-.1zm14.9-.4s0-.1 0 0v.1zm-.1-1.2v.1zm-16.6-.2c-.1 0-.1 0 0 0 .2.1.2.2.1.2l-.1-.1zm16.5-1v.2-.2zm0-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zM65 117.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm0-2v-.3.6-.3zm11.7-.6v-.5a15.7 15.7 0 0 1 0 .5zm-11.7-.6v-.3.6-.3zm0-2c.1 0 .1.1 0 .1zm28.2-5h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm-8.5-8 .4-.3-.4.4-.4.3zm12.8-8.1c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0z" transform="translate(-64.4 -79.5)"/><path fill="#c5523e" d="m75.2 139.6-.7-.7.7.6.7.8-.7-.7zm16.6-5A22 22 0 0 1 79 119.9c-.6-2.2-.8-5.2-.6-7.4.5-4.9 2.6-9.3 6-12.9a21.3 21.3 0 0 1 13.1-6.4l1 11.1c0 .3 0 .3-.7.5a10 10 0 0 0-2.2 18.9l.6.3-3.6 11-1-.5zm-7.5-2.6c-.1-.1-.1-.1 0 0l.1.1-.1-.1zm-1.6-1.5c0-.2 0-.2 0 0h.2c0 .1 0 .1-.2 0zm27.4-17.4c-.1-.9-.3-1.5-.5-2l-.2-.4 10.8-5.6 10.9-5.5a30.3 30.3 0 0 1 2.8 8.3l.5 3.2v.2l-12 1-12.2 1v-.2zm-8-8.4-1.3-.2h-1v-.5L98 80.4h2.3a29 29 0 0 1 9.6 1.3l-3.4 11-3.7 11.5-.2.6zm-18.6-6.5.4-.3-.4.4-.4.3z" transform="translate(-64.4 -79.5)"/><path fill="#b4111a" d="M97 149.1a39 39 0 0 1-7.2-1.4l3.8-11.6 3.9-11.6.5.2 1.3.1c.7 0 .9.1.9.2a5523.8 5523.8 0 0 0 1.7 24c0 .2-.2.2-2 .2H97zM79 143a37.9 37.9 0 0 1-7.7-8c-.5-.7-.6-.8-.5-1a155.3 155.3 0 0 1 3.8-6.8l-.4-1a38.9 38.9 0 0 1-1-2.4l-3.6-1-3.7-1h-.3l-.2-1.2a32.9 32.9 0 0 1 0-10.9l.1-1.2.6-.2a395.4 395.4 0 0 1 7-2l.5-1 .8-2 .4-1-2-3.4-2-3.4.5-.7A35.8 35.8 0 0 1 80 86l3.6 1.9 3.5 2 .8-.5a28.5 28.5 0 0 1 9.2-2.5 33.8 33.8 0 0 1 .4 4.4c0 .4 0 .4-.3.4l-3 .5a23.4 23.4 0 0 0-2.2 44.6l-1.5 4.5-2.8-1.1-.8-.4-3.5 1.9c-1.9 1-3.4 1.9-3.4 2l-1-.7zm37.2-15.3-7.8-6.6-.2-.2.4-.5.6-1.2.3-.6 19.6 6.2a27 27 0 0 1-5.1 9.3l-7.8-6.4zm-10.5-21.4-1.9-1a1150.6 1150.6 0 0 1 6.4-19.4 28.3 28.3 0 0 1 9 4.8l.2.3-6.6 7.7a866 866 0 0 1-6.6 7.9l-.5-.3z" transform="translate(-64.4 -79.5)"/></svg>
diff --git a/doc/logos/cargo.svg b/doc/logos/cargo.svg
new file mode 100644
index 0000000000..0690183353
--- /dev/null
+++ b/doc/logos/cargo.svg
@@ -0,0 +1 @@
+<svg width="3311" height="1605" viewBox="400 0 3311 1605" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1133 1602C1182 1602 1191 1602 1189 1579C1153 1301 1125 1076 1098 855L1098 855C1067 601 1037 354 995 41C991 2 973 0 916 0C865 0 854 2 849 34C824 242 798 437 772 636L772 636L772 636L772 636L772 636C734 928 695 1227 653 1581C651 1602 681 1602 715 1602C721 1602 726 1602 732 1602C791 1602 809 1602 811 1579C822 1446 833 1334 847 1206C849 1185 868 1185 905 1186C908 1186 912 1186 916 1186C919 1186 922 1186 925 1186C957 1185 984 1185 986 1206C996 1272 1004 1335 1013 1399L1013 1399C1020 1456 1028 1514 1036 1574C1040 1602 1050 1602 1097 1602C1103 1602 1110 1602 1118 1602C1124 1602 1128 1602 1133 1602ZM264 1602C451 1602 528 1478 528 1334V1195C528 1175 509 1176 470 1176L470 1176C463 1176 455 1177 446 1177C405 1177 376 1177 376 1195V1330C376 1391 342 1448 264 1448C180 1448 148 1387 148 1323V265C148 212 193 143 264 143C332 143 376 217 376 267V374C376 400 403 400 443 399H443H443H443H443H443C447 399 450 399 453 399C494 399 528 397 528 374V271C528 173 453 2 264 2C86 2 0 148 0 271V1336C0 1458 86 1602 264 1602ZM968 1042C959 928 953 837 946 746C942 681 937 615 931 539C931 530 929 514 916 514C904 514 902 530 902 537C896 625 890 707 885 784L885 784C879 874 874 958 868 1039C865 1055 886 1060 918 1060C945 1060 970 1060 968 1042ZM1784 1602C1845 1602 1861 1602 1861 1565V996C1861 992 1861 988 1861 984C1861 936 1861 903 1836 852C1812 804 1767 783 1743 771C1733 766 1727 763 1727 761C1727 758 1734 754 1744 748C1768 736 1810 713 1834 669C1859 623 1859 586 1859 537V537C1859 533 1859 529 1859 525V319C1859 239 1843 146 1775 82C1706 20 1608 2 1535 2H1405C1401 2 1397 1 1393 1C1379 0 1367 -0 1353 11C1339 25 1337 50 1337 73V1570C1337 1602 1353 1602 1405 1602C1474 1602 1483 1602 1483 1565V873C1483 838 1495 838 1586 838H1586H1586L1586 838C1591 838 1597 838 1604 838C1654 838 1715 895 1715 989V1570C1715 1602 1729 1602 1774 1602C1777 1602 1780 1602 1784 1602ZM1711 537V319C1711 267 1702 228 1663 187C1638 164 1624 153 1542 153C1521 153 1501 153 1492 169C1485 182 1485 194 1485 207V635C1485 639 1485 643 1485 648V648V648V648C1484 668 1483 687 1499 699C1510 709 1524 708 1535 708C1536 708 1538 708 1540 708C1565 708 1624 701 1665 658C1711 607 1711 569 1711 537ZM2588 1557L2588 1557C2588 1555 2588 1553 2588 1551V790C2588 788 2589 784 2589 781C2591 773 2592 764 2586 763C2569 760 2496 762 2429 763C2393 764 2359 765 2337 765C2321 765 2319 786 2319 836C2319 884 2321 902 2339 902C2345 902 2352 902 2360 901C2384 900 2414 898 2426 907C2436 915 2436 926 2435 936L2435 936C2435 937 2435 938 2435 938C2435 939 2435 940 2435 941V1334C2435 1382 2412 1453 2323 1453C2232 1453 2207 1384 2207 1327V265C2207 217 2253 143 2323 143C2392 143 2435 217 2435 267C2435 283 2436 303 2436 323C2437 343 2437 363 2437 379C2437 399 2451 402 2508 402C2570 402 2588 395 2588 374V271C2588 189 2524 2 2323 2C2118 2 2059 182 2059 271V1336C2059 1442 2130 1602 2323 1602C2393 1602 2429 1567 2452 1545C2466 1531 2476 1522 2485 1528C2503 1540 2508 1560 2512 1576C2516 1589 2518 1599 2526 1599C2534 1599 2541 1601 2547 1602C2559 1605 2569 1607 2577 1599C2589 1587 2588 1572 2588 1557ZM3310 1316C3310 1464 3249 1602 3046 1602C2856 1602 2781 1464 2781 1316V281C2781 109 2897 2 3046 2C3196 2 3310 121 3310 281V1316ZM3160 281V1309C3160 1373 3137 1448 3046 1448C2943 1448 2929 1375 2929 1309V281C2929 217 2977 143 3046 143C3112 143 3160 217 3160 281Z" fill="black"/></svg>
diff --git a/doc/logos/codepen.svg b/doc/logos/codepen.svg
new file mode 100644
index 0000000000..cc3d12737f
--- /dev/null
+++ b/doc/logos/codepen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>
diff --git a/doc/logos/desmos.svg b/doc/logos/desmos.svg
new file mode 100644
index 0000000000..b47e4d90ec
--- /dev/null
+++ b/doc/logos/desmos.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="#187a3d"><path d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/><path d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/></svg>
diff --git a/doc/logos/executeprogram.svg b/doc/logos/executeprogram.svg
new file mode 100644
index 0000000000..0f75b69ec2
--- /dev/null
+++ b/doc/logos/executeprogram.svg
@@ -0,0 +1 @@
+<svg width="397" height="109" viewBox="0 0 397 109" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero" fill="none"><path d="M169.495 63.68c2.8 0 5.254.671 7.36 2.015 2.105 1.344 3.688 3.162 4.751 5.453 1.063 2.292 1.594 4.878 1.594 7.76 0 4.408-1.241 8.054-3.724 10.935-2.483 2.881-5.81 4.322-9.98 4.322-3.953 0-7.18-1.402-9.683-4.206v12.62c0 .271-.085.489-.254.653a.88.88 0 0 1-.64.247h-4.767a.966.966 0 0 1-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932 0 0 1 .656-.247h4.767a.88.88 0 0 1 .64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268 5.006-4.902 9.057-4.902zm-.84 24.874c2.752 0 4.865-.86 6.34-2.578 1.473-1.719 2.21-4.034 2.21-6.947 0-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576 0-4.625.855-6.148 2.563-1.524 1.71-2.285 3.986-2.285 6.831s.761 5.141 2.285 6.89c1.523 1.747 3.572 2.62 6.148 2.62zm39.147-24.875c3.374 0 6.111.99 8.213 2.968 2.1 1.978 3.151 4.771 3.151 8.379 0 .582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44 0-2.757.266-3.95.8-1.194.533-2.142 1.183-2.842 1.949-.7.766-1.238 1.513-1.613 2.24-.375.727-.562 1.333-.562 1.818v16.147c0 .271-.084.49-.252.654a.87.87 0 0 1-.636.248h-4.735a.954.954 0 0 1-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922 0 0 1 .65-.248h4.47c.552 0 .858.3.917.902l.237 3.928h.68c1.086-1.571 2.52-2.876 4.306-3.913 1.786-1.038 3.813-1.557 6.082-1.557zm31.331 30.845c-4.25 0-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05 4.298-10.999c2.866-2.948 6.423-4.423 10.673-4.423 2.788 0 5.332.674 7.632 2.021 2.3 1.348 4.103 3.203 5.41 5.566 1.306 2.363 1.959 4.975 1.959 7.835 0 2.861-.653 5.468-1.96 7.821-1.306 2.353-3.109 4.209-5.41 5.566-2.3 1.357-4.843 2.036-7.63 2.036zm-6.43-8.608c1.7 1.759 3.847 2.638 6.445 2.638 2.597 0 4.745-.88 6.444-2.638 1.698-1.759 2.547-4.03 2.547-6.814 0-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598 0-4.746.88-6.444 2.638-1.699 1.758-2.548 4.03-2.548 6.815 0 2.784.85 5.055 2.548 6.814zm55.522-21.623c.272 0 .487.082.642.248.156.165.234.384.234.657v27.976c0 1.772-.302 3.373-.906 4.804-.603 1.431-1.402 2.6-2.395 3.504-.993.906-2.157 1.67-3.49 2.293a16.713 16.713 0 0 1-4.076 1.314c-1.383.253-2.814.38-4.294.38-2.337 0-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652 1.198-.38 2.707 1.46 5.735 2.19 9.085 2.19 1.169 0 2.293-.116 3.374-.35 1.074-.23 2.107-.62 3.068-1.153a6.016 6.016 0 0 0 2.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513 3.154-5.726 4.731-9.64 4.731-2.688 0-5.132-.676-7.333-2.03a13.905 13.905 0 0 1-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534 0-2.726.604-5.237 1.811-7.534 1.208-2.298 2.907-4.123 5.098-5.476 2.19-1.353 4.64-2.03 7.347-2.03 3.856 0 7.03 1.548 9.523 4.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596 23.266c2.408 0 4.424-.894 6.045-2.68 1.622-1.788 2.433-3.898 2.433-6.332 0-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428 0-4.452.86-6.074 2.581-1.622 1.72-2.433 3.826-2.433 6.317 0 2.529.811 4.663 2.433 6.402 1.621 1.74 3.646 2.61 6.074 2.61zm40.073-23.88c3.374 0 6.111.99 8.213 2.968 2.1 1.978 3.151 4.771 3.151 8.379 0 .582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44 0-2.757.266-3.95.8-1.194.533-2.142 1.183-2.842 1.949-.7.766-1.238 1.513-1.613 2.24-.375.727-.562 1.333-.562 1.818v16.147c0 .271-.084.49-.252.654a.87.87 0 0 1-.636.248h-4.735a.954.954 0 0 1-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922 0 0 1 .65-.248h4.47c.552 0 .858.3.917.902l.237 3.928h.68c1.086-1.571 2.52-2.876 4.306-3.913 1.786-1.038 3.813-1.557 6.082-1.557zm46.24 24.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0 .626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493 1.682-3.399 3.008-5.717 3.976-2.318.968-4.577 1.453-6.778 1.453-3.241 0-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149 0-2.621.835-4.656 2.504-6.104 1.67-1.448 4.214-2.416 7.633-2.906l6.984-1.085c1.355-.196 2.347-.401 2.976-.617.629-.215 1.041-.479 1.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302 0-6.65 1.36-7.043 4.079-.059.45-.353.665-.884.646h-4.48c-.647 0-.942-.304-.883-.91.334-3.326 1.66-5.713 3.978-7.161 2.318-1.448 5.452-2.172 9.4-2.172 4.224 0 7.392.959 9.504 2.876 2.112 1.918 3.168 4.706 3.168 8.364v11.035c-.02 1.35.707 2.172 2.18 2.466zm-19.06.135c4.132 0 7.518-1.307 10.16-3.922v-6.028c-.258.566-1.53 1.024-3.814 1.375l-6.375.995c-1.728.274-2.96.742-3.695 1.405-.735.663-1.102 1.512-1.102 2.546 0 1.132.397 2.02 1.192 2.663.794.644 2.006.966 3.635.966zm48.252-24.875c2.377 0 4.116.796 5.216 2.386 1.1 1.59 1.65 4.248 1.65 7.971v18.59c0 .272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948 0 0 1-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042 0-1.886.403-2.535 1.207a5.452 5.452 0 0 0-1.178 2.75v19.463c0 .271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275 0-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04 0-1.88.398-2.52 1.193a5.675 5.675 0 0 0-1.193 2.764v19.463c0 .271-.083.49-.25.654a.864.864 0 0 1-.634.248h-4.273c-.275 0-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57 0 .874.3.914.902l.147 2.386h.442c.943-2.619 2.898-3.928 5.864-3.928 2.849 0 4.745 1.31 5.688 3.928h.353c1.061-2.619 2.986-3.928 5.776-3.928zM162.091 16.126c1.86-.801 3.86-1.201 6.001-1.201 2.141 0 4.112.395 5.914 1.186 1.802.791 3.293 1.86 4.475 3.208 1.182 1.347 2.097 2.905 2.746 4.672.65 1.767.974 3.637.974 5.609 0 1.191-.121 2.04-.363 2.549-.243.507-.76.761-1.555.761h-20.807c.33 2.285 1.385 4.106 3.168 5.463 1.782 1.357 4.01 2.036 6.683 2.036 2.693 0 5.134-.84 7.324-2.52.464-.35.881-.341 1.249.03l1.947 1.992c.465.469.465.918 0 1.347-2.983 3.008-6.713 4.511-11.188 4.511-4.572 0-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029 0-2.148.373-4.164 1.119-6.048.746-1.885 1.763-3.516 3.051-4.892 1.288-1.377 2.853-2.466 4.694-3.266zm5.71 3.774c-2.28 0-4.202.718-5.767 2.154-1.565 1.437-2.502 3.372-2.812 5.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123 22.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47 0-.824-.162-1.06-.488l-8.592-10.002-8.592 10.002c-.255.326-.618.488-1.089.488h-5.532c-.373 0-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47 0 .833.172 1.088.517l7.798 9.082 7.798-9.082c.255-.325.618-.498 1.089-.517h5.473c.373 0 .618.105.736.316.117.21.059.46-.177.747l-11.152 12.933 11.976 13.795zm14.101-26.59c1.86-.801 3.86-1.201 6-1.201 2.142 0 4.113.395 5.915 1.186 1.801.791 3.293 1.86 4.475 3.208 1.182 1.347 2.097 2.905 2.746 4.672.65 1.767.974 3.637.974 5.609 0 1.191-.122 2.04-.364 2.549-.242.507-.76.761-1.554.761H230.41c.329 2.285 1.385 4.106 3.167 5.463 1.782 1.357 4.01 2.036 6.684 2.036 2.693 0 5.134-.84 7.323-2.52.465-.35.882-.341 1.25.03l1.947 1.992c.465.469.465.918 0 1.347-2.984 3.008-6.713 4.511-11.189 4.511-4.572 0-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029 0-2.148.373-4.164 1.118-6.048.746-1.885 1.764-3.516 3.052-4.892 1.288-1.377 2.852-2.466 4.693-3.266zm5.71 3.774c-2.28 0-4.203.718-5.767 2.154-1.566 1.437-2.503 3.372-2.812 5.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83 19.894c3.133 0 5.619-1.191 7.457-3.574.348-.45.745-.527 1.19-.234l3.394 1.962c.542.332.639.733.29 1.201-1.315 2.012-3.06 3.618-5.237 4.819-2.176 1.2-4.58 1.801-7.21 1.801-4.392 0-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05 4.367-11c2.912-2.948 6.563-4.422 10.954-4.422 2.631 0 5.04.595 7.225 1.787 2.186 1.19 3.927 2.792 5.224 4.803.328.47.232.87-.29 1.202l-3.396 1.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67 0-4.88.884-6.63 2.651-1.75 1.768-2.626 4.033-2.626 6.796s.875 5.028 2.626 6.796c1.75 1.767 3.96 2.65 6.63 2.65zm46.585-24.87c.276 0 .499.083.666.248.168.165.252.383.252.654v27.379c0 .271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573 0-.88-.3-.919-.901l-.237-3.953h-.652c-1.007 1.608-2.35 2.93-4.03 3.968-1.68 1.036-3.674 1.554-5.986 1.554-3.26 0-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276 0 .499.082.666.247.168.165.252.383.252.654v15.956c0 2.403.583 4.18 1.749 5.334 1.165 1.153 2.785 1.73 4.86 1.73 1.343 0 2.573-.258 3.689-.771s1.99-1.129 2.623-1.846c.632-.717 1.116-1.4 1.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595 24.474c.353.446.382.852.088 1.22-.882 1.047-2.172 2.001-3.868 2.863-1.697.862-3.731 1.293-6.104 1.293-8.002 0-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885 0 0 1-.647-.261.864.864 0 0 1-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255 0 .466.078.633.233.166.154.25.368.25.639l-.02 9.285h11.943c.255 0 .466.082.632.247.167.164.25.382.25.654v3.603a.89.89 0 0 1-.25.64.837.837 0 0 1-.632.261H345.36v11.741c0 1.337.18 2.465.544 3.386.363.92.873 1.613 1.53 2.077a6.487 6.487 0 0 0 2.059.989c.716.193 1.534.29 2.456.29 1.98 0 3.824-.668 5.53-2.005.452-.426.873-.407 1.265.058l2 2.325zm15.146-23.272c1.86-.801 3.86-1.201 6.001-1.201 2.141 0 4.112.395 5.914 1.186 1.802.791 3.293 1.86 4.475 3.208 1.182 1.347 2.097 2.905 2.746 4.672.65 1.767.974 3.637.974 5.609 0 1.191-.121 2.04-.363 2.549-.243.507-.76.761-1.555.761h-20.807c.33 2.285 1.385 4.106 3.168 5.463 1.782 1.357 4.01 2.036 6.683 2.036 2.693 0 5.134-.84 7.324-2.52.464-.35.881-.341 1.249.03l1.947 1.992c.465.469.465.918 0 1.347-2.983 3.008-6.713 4.511-11.188 4.511-4.572 0-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029 0-2.148.373-4.164 1.119-6.048.746-1.885 1.763-3.516 3.051-4.892 1.288-1.377 2.853-2.466 4.693-3.266zm5.71 3.774c-2.28 0-4.202.718-5.767 2.154-1.565 1.437-2.502 3.372-2.812 5.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z" fill="#FFF"/><path d="M102.022 37.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87 1.87 0 0 1-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87 1.87 0 0 1 82.511 0h26.297c1.171 0 2.312.1 3.423.303 1.11.201 2.282.615 3.514 1.24a11.807 11.807 0 0 1 3.212 2.36c.909.949 1.646 2.23 2.211 3.844.566 1.613.849 3.47.849 5.568v23.421c.04 1.09.262 1.877.666 2.36l12.18 14.102c.645.767.605 1.594-.122 2.481l-12.058 13.799c-.444.484-.666 1.271-.666 2.36V95.14c0 2.622-.414 4.852-1.243 6.688-.828 1.835-1.938 3.207-3.332 4.115-1.394.908-2.787 1.553-4.18 1.937-1.394.383-2.879.575-4.454.575H82.51c-.525 0-.97-.162-1.333-.485a1.716 1.716 0 0 1-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87 1.87 0 0 1 1.333-.515H97.66c2.908 0 4.363-1.25 4.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217 0 0 0 0-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083 53.15a1.523 1.523 0 0 1 0 2.154l-23.85 23.849a1.523 1.523 0 0 1-2.153 0l-23.85-23.85a1.523 1.523 0 0 1 0-2.153L67.08 29.3a1.523 1.523 0 0 1 2.154 0zm-35.937 8.585c0 1.009-.243 1.735-.728 2.18L19.26 54.258a.217.217 0 0 0 0 .298L32.57 68.51c.485.484.728 1.23.728 2.24v18.337c0 2.501 1.454 3.752 4.362 3.752h15.148c.525 0 .97.172 1.333.515.364.343.584.797.584 1.361v11.923c0 .565-.22 1.009-.584 1.331-.363.323-.808.485-1.333.485H26.511c-1.576 0-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577 55.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614 1.303-2.895 2.211-3.843a11.807 11.807 0 0 1 3.212-2.36C20.805.917 21.976.503 23.087.302A19.123 19.123 0 0 1 26.511 0h26.296c.525 0 .97.171 1.333.515.364.342.584.796.584 1.361v11.862c0 .525-.22.959-.584 1.301a1.87 1.87 0 0 1-1.333.515H37.66c-2.908 0-4.362 1.291-4.362 3.873v18.459z" fill="#4547E0"/></g></svg>
diff --git a/doc/logos/holmusk.svg b/doc/logos/holmusk.svg
new file mode 100644
index 0000000000..80d18829d4
--- /dev/null
+++ b/doc/logos/holmusk.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" style="background: #1649BF"><g transform="translate(-780, -40)" fill="#FFFFFF"><path d="M780,4 L840,4 L840,1 L780,1 L780,4 Z M794,55 L794,84.65 L796.806,84.65 L796.806,72.739 C796.806,69.633 799.325,67.104 802.420,67.104 C805.516,67.104 808.031,69.633 808.031,72.739 L808.031,84.65 L810.838,84.65 L810.838,72.739 C810.838,68.077 807.062,64.288 802.420,64.288 C800.271,64.288 798.311,65.106 796.819,66.447 L796.819,55 L794,55 Z M817.582,63.931 C815.372,63.931 813.367,64.798 811.862,66.199 L812.163,66.653 C812.613,67.33 812.972,68.051 813.248,68.805 C814.281,67.549 815.840,66.746 817.582,66.746 C820.674,66.746 823.193,69.276 823.193,72.382 L823.193,72.385 L823.193,84.293 L826,84.293 L826,72.385 L826,72.379 C826,70.658 825.483,69.057 824.598,67.72 L824.598,67.723 C824.537,67.629 824.473,67.543 824.409,67.452 C824.345,67.365 824.280,67.278 824.213,67.191 C824.139,67.098 824.068,67.008 823.995,66.917 C823.870,66.776 823.744,66.634 823.616,66.502 C823.542,66.424 823.465,66.35 823.385,66.276 C823.289,66.183 823.190,66.093 823.090,66.002 C823.004,65.932 822.917,65.854 822.830,65.787 C822.689,65.671 822.542,65.561 822.394,65.458 C822.320,65.406 822.243,65.354 822.169,65.307 C821.999,65.194 821.829,65.087 821.650,64.991 C821.592,64.955 821.531,64.923 821.473,64.894 C821.307,64.807 821.142,64.726 820.976,64.653 C820.909,64.623 820.845,64.594 820.774,64.566 C820.569,64.478 820.357,64.401 820.138,64.33 C820.084,64.314 820.026,64.298 819.969,64.282 C819.773,64.224 819.577,64.172 819.382,64.131 C819.330,64.118 819.285,64.104 819.234,64.095 C819,64.05 818.766,64.015 818.525,63.985 C818.461,63.979 818.400,63.976 818.339,63.969 C818.095,63.947 817.855,63.931 817.611,63.931 L817.582,63.931 Z"></path></g></svg>
diff --git a/doc/logos/jetbrains.svg b/doc/logos/jetbrains.svg
new file mode 100644
index 0000000000..b379536602
--- /dev/null
+++ b/doc/logos/jetbrains.svg
@@ -0,0 +1 @@
+<svg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'><linearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'><stop offset='0' stop-color='#AA4A9B'/><stop offset='1' stop-color='#F05922'/></linearGradient><path fill='url(#SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/><linearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'><stop offset='0' stop-color='#FFE42E'/><stop offset='1' stop-color='#ED417C'/></linearGradient><path fill='url(#SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/><linearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'><stop offset='0' stop-color='#FFE42E'/><stop offset='1' stop-color='#F05922'/></linearGradient><path fill='url(#SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/><rect x='45.5' y='35.7' width='51' height='51'/><rect x='49.9' y='77.1' fill='#fff' width='19.1' height='3.2'/><path fill='#fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/><path fill='#fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/><path fill='#fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/><path fill='#fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/><path fill='#fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/><path fill='#fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/><path fill='#fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/><path fill='#fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/><path fill='#fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/></svg>
diff --git a/doc/logos/observable.svg b/doc/logos/observable.svg
new file mode 100644
index 0000000000..49c3a82f70
--- /dev/null
+++ b/doc/logos/observable.svg
@@ -0,0 +1 @@
+<svg viewBox="-3 0 171 28" width="350" height="57" fill="black" xmlns="http://www.w3.org/2000/svg"><path d="M12.5 22.66c-1.15 0-2.15-.25-3-.75a5.09 5.09 0 01-1.94-2.04 10.80 10.80 0 01-.99-2.74A14.74 14.74 0 016.25 14c0-.83.05-1.62.16-2.38.10-.75.30-1.52.60-2.31a7.37 7.37 0 011.12-2.03 5.11 5.11 0 011.80-1.40c.74-.36 1.59-.53 2.54-.53 1.15 0 2.15.25 3 .75.84.50 1.51 1.21 1.94 2.04.45.86.78 1.77.99 2.74.20.96.31 2.00.31 3.12a16.7 16.7 0 01-.16 2.38 10.63 10.63 0 01-.61 2.31c-.30.78-.67 1.46-1.13 2.03-.45.57-1.05 1.04-1.79 1.40-.74.36-1.59.53-2.54.53zm2.20-6.37c.59-.6.93-1.43.91-2.29 0-.89-.29-1.65-.89-2.29-.59-.63-1.34-.95-2.22-.95s-1.63.31-2.23.95A3.23 3.23 0 009.37 14c0 .89.29 1.65.89 2.29.59.63 1.34.95 2.22.95s1.62-.31 2.20-.95zM12.5 27C19.40 27 25 21.18 25 14S19.40 1 12.5 1 0 6.82 0 14s5.59 13 12.5 13z"/><g transform="translate(30, -3.5)"><path d="M6.41 17.75c0 1.09.05 2.09.15 2.98.11.87.29 1.62.53 2.25.23.62.54 1.11.91 1.46.37.33.82.50 1.36.50.54 0 .99-.17 1.36-.50.37-.35.67-.84.91-1.46.23-.62.40-1.37.50-2.25.11-.89.17-1.89.17-2.98 0-1.08-.06-2.06-.17-2.96-.10-.89-.27-1.65-.50-2.27-.23-.64-.54-1.13-.91-1.46-.37-.35-.82-.53-1.36-.53s-.99.17-1.36.53c-.37.33-.67.82-.91 1.46-.23.62-.41 1.38-.53 2.27-.10.89-.15 1.88-.15 2.96zm2.96-8.75c1.06 0 2.08.17 3.06.53a7.36 7.36 0 012.60 1.62c.76.72 1.35 1.63 1.79 2.73.45 1.09.68 2.38.68 3.87 0 1.48-.22 2.77-.68 3.87-.43 1.09-1.03 2.00-1.79 2.73a7.07 7.07 0 01-2.60 1.62 8.92 8.92 0 01-3.06.53 9.14 9.14 0 01-3.08-.53 7.36 7.36 0 01-2.60-1.62c-.74-.72-1.34-1.63-1.79-2.73-.43-1.09-.65-2.38-.65-3.87 0-1.48.21-2.77.65-3.87.45-1.09 1.06-2.00 1.82-2.73a7.36 7.36 0 012.60-1.62 8.92 8.92 0 013.06-.53zm9.32 17.03v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40.60.27 1.13.67 1.59 1.21.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.05.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.62-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.62-.91-.40 0-.8.12-1.18.38v7.46c.33.23.73.35 1.19.35zm13.10 2.42c-1.75 0-3.30-.41-4.65-1.24l.12-3.23h2.30l.40 2.63c.28.11.57.21.86.27.30.05.62.07.96.07.64 0 1.13-.09 1.49-.27.35-.20.53-.54.53-1.03 0-.33-.13-.63-.40-.88-.25-.27-.80-.52-1.64-.76l-1.44-.37c-1.01-.27-1.78-.74-2.30-1.41-.50-.67-.75-1.51-.75-2.50 0-.62.11-1.20.35-1.74a3.95 3.95 0 011.08-1.39c.48-.38 1.08-.69 1.77-.91.71-.22 1.51-.33 2.43-.33.77 0 1.49.08 2.15.25.65.16 1.34.42 2.05.75l-.20 2.85H41.75l-.55-2.25a4.91 4.91 0 00-.55-.07 3.89 3.89 0 00-.68-.05c-.48 0-.89.11-1.21.32-.32.20-.48.52-.48.96 0 .13.02.27.07.40.05.11.14.24.27.38a4.3 4.3 0 00.60.37c.27.11.62.23 1.06.35l1.41.38c1.18.32 2.02.81 2.53 1.49.52.65.78 1.49.78 2.50 0 .74-.14 1.39-.43 1.94a3.84 3.84 0 01-1.21 1.39c-.52.37-1.15.64-1.89.83-.74.18-1.57.27-2.50.27zM52.83 13.27c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.85 4.85 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63H51.11c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.07 5.07 0 001.24-.86l.98.96c-.54 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.29.70a7.82 7.82 0 01-2.63-.43 6.19 6.19 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.57-2.05a6.61 6.61 0 012.2-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.17.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.19c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53zM59.31 26v-1.29l1.21-.27c.01-.60.02-1.24.02-1.92V19.09v-.88c0-.23-.00-.45-.02-.65 0-.20-.00-.39-.02-.58 0-.20-.00-.43-.02-.68l-1.36-.22v-1.03l5.59-1.74.45.27.20 2.91c.33-1.08.81-1.88 1.44-2.40.64-.52 1.26-.78 1.87-.78.62 0 1.14.18 1.56.55.43.35.7.92.78 1.69-.03.69-.23 1.22-.60 1.59-.37.37-.81.55-1.31.55-.42 0-.80-.11-1.13-.32-.32-.21-.64-.57-.98-1.06l-.12-.17c-.30.33-.60.77-.91 1.31a5.62 5.62 0 00-.58 1.67V22.40c0 .65.00 1.28.02 1.87l1.97.43V26h-8.04zm19.93 0h-2.27l-4.50-10.88-1.21-.25v-1.19h7.61v1.19l-1.34.30 2.1 5.79 1.94-5.82-1.39-.27v-1.19h4.75v1.19l-1.51.25L79.25 26zm11.35-1.79c.32 0 .67-.14 1.06-.43v-4.2c-.25.06-.49.16-.73.27a2.55 2.55 0 00-.55.35 2.97 2.97 0 00-.53.50 2.36 2.36 0 00-.40.73c-.1.27-.15.57-.15.91 0 .62.12 1.08.38 1.39.25.30.56.45.93.45zm4.17 2.20c-.81 0-1.45-.15-1.92-.45-.47-.30-.81-.75-1.03-1.34-.25.27-.49.51-.73.73-.22.22-.47.41-.75.58-.27.15-.57.27-.91.35a4.94 4.94 0 01-1.19.12c-1.01 0-1.81-.27-2.40-.83-.59-.57-.88-1.38-.88-2.43 0-.48.07-.93.22-1.34.15-.42.42-.81.81-1.16.40-.35.93-.68 1.59-.98.67-.30 1.52-.59 2.55-.86l.70-.17c.27-.06.54-.14.83-.22v-.91c0-.54-.02-.98-.07-1.34-.05-.37-.15-.66-.30-.88a1.05 1.05 0 00-.58-.45c-.23-.10-.55-.15-.96-.15h-.38v.86c0 1.03-.21 1.76-.63 2.20-.42.42-.90.63-1.44.63-1.03 0-1.67-.45-1.92-1.36 0-1.09.51-1.98 1.54-2.65 1.04-.69 2.59-1.03 4.63-1.03.87 0 1.62.09 2.22.27.60.18 1.09.48 1.46.88.38.38.66.89.83 1.51.16.62.25 1.36.25 2.22v5.79c0 .28.14.43.43.43a.54.54 0 00.30-.10c.1-.06.22-.22.38-.45l.73.40c-.30.77-.71 1.33-1.24 1.67-.52.32-1.24.48-2.15.48zm3.89-.38v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40a4.42 4.42 0 011.59 1.21c.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.04.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.61-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.61-.91-.40 0-.80.12-1.19.38v7.46c.33.23.73.35 1.19.35zm8.40-15.08l5.84-1.13.43.27-.10 3.51v11.03l.05 1.89 1.13.22V26h-7.18v-1.29l1.13-.25a70.7 70.7 0 00.02-1.87c.01-.62.02-1.25.02-1.89v-10.4l-1.36-.25V8.89zm15.30 4.37c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.84 4.84 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63h-7.03c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.09 5.09 0 001.24-.86l.98.96c-.53 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.28.70a7.83 7.83 0 01-2.63-.43 6.18 6.18 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.56-2.05a6.61 6.61 0 012.20-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.16.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.18c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53z"/></g></svg>
diff --git a/doc/logos/primo.svg b/doc/logos/primo.svg
new file mode 100644
index 0000000000..ec2f3de729
--- /dev/null
+++ b/doc/logos/primo.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 258 66" xmlns="http://www.w3.org/2000/svg"><path d="M17.6 13.8C19.5 11.9 22.7 11.9 24.6 13.8C26.5 15.7 26.6 18.7 24.8 20.7L24.6 20.9L12.0 33.5L35.4 56.8C37.3 58.6 37.4 61.7 35.6 63.6L35.4 63.8C33.6 65.7 30.5 65.8 28.6 64.0L28.4 63.8L1.4 37.1C-0.4 35.2 -0.4 32.1 1.2 30.2L1.4 30.0L17.6 13.8Z" fill="url(#paint0_linear)"></path><path d="M50.0 11C62.4 11 72.5 21.0 72.5 33.5C72.5 46.0 62.4 56.1 50.0 56.1C47.2 56.1 45.0 53.8 45.0 51.1C45.0 48.3 47.2 46.1 50.0 46.1C56.9 46.1 62.5 40.4 62.5 33.5C62.5 26.6 56.9 21 50.0 21C43.2 21 37.6 26.4 37.4 33.3L37.4 33.6L36.9 60.4C36.8 63.2 34.6 65.4 31.8 65.3C29.1 65.2 27.0 63.1 26.9 60.4V60.2L27.4 33.5C27.4 21.0 37.5 11 50.0 11Z" fill="#EE4645"></path><path d="M75.3 13.8C77.2 11.9 80.3 11.9 82.2 13.6L82.4 13.8L98.6 30.0C100.4 31.9 100.5 34.9 98.7 36.9L98.6 37.0L82.4 53.2C80.4 55.1 77.3 55.1 75.3 53.2C73.4 51.3 73.4 48.3 75.2 46.3L75.3 46.1L87.9 33.5L75.3 20.9C73.4 19.0 73.4 16.0 75.2 14.0L75.3 13.8Z" fill="#EE4645"></path><path d="M134.5 19.4C136.8 19.4 138.8 19.9 140.6 21.0C142.5 22.0 143.9 23.4 145.0 25.3C146.0 27.2 146.6 29.4 146.6 31.8C146.6 34.3 146.0 36.5 145.0 38.4C143.9 40.3 142.5 41.7 140.6 42.8C138.8 43.8 136.8 44.3 134.5 44.3C131.4 44.3 129.0 43.3 127.2 41.4V52.7H120.2V19.7H126.9V22.5C128.6 20.4 131.2 19.4 134.5 19.4ZM133.3 38.6C135.1 38.6 136.6 38 137.7 36.8C138.9 35.5 139.5 33.9 139.5 31.8C139.5 29.8 138.9 28.2 137.7 27.0C136.6 25.8 135.1 25.1 133.3 25.1C131.5 25.1 130.0 25.8 128.8 27.0C127.7 28.2 127.1 29.8 127.1 31.8C127.1 33.9 127.7 35.5 128.8 36.8C130.0 38 131.5 38.6 133.3 38.6ZM158.0 22.9C158.8 21.8 159.9 20.9 161.3 20.3C162.8 19.7 164.4 19.4 166.3 19.4V25.9C165.5 25.8 165.0 25.8 164.7 25.8C162.7 25.8 161.1 26.3 160.0 27.5C158.8 28.6 158.3 30.3 158.3 32.5V44H151.3V19.7H158.0V22.9ZM170.5 19.7H177.5V44H170.5V19.7ZM174.0 16.4C172.7 16.4 171.6 16.0 170.8 15.2C170.0 14.5 169.6 13.6 169.6 12.5C169.6 11.3 170.0 10.4 170.8 9.7C171.6 8.9 172.7 8.5 174.0 8.5C175.3 8.5 176.3 8.9 177.1 9.6C177.9 10.3 178.3 11.2 178.3 12.3C178.3 13.5 177.9 14.5 177.1 15.2C176.3 16.0 175.3 16.4 174.0 16.4ZM215.0 19.4C218.0 19.4 220.4 20.3 222.2 22.1C224.0 23.9 224.9 26.5 224.9 30.1V44H217.9V31.2C217.9 29.3 217.5 27.8 216.7 26.9C215.9 25.9 214.8 25.5 213.3 25.5C211.6 25.5 210.3 26.0 209.4 27.1C208.4 28.1 207.9 29.7 207.9 31.8V44H200.9V31.2C200.9 27.4 199.4 25.5 196.3 25.5C194.7 25.5 193.4 26.0 192.5 27.1C191.5 28.1 191.0 29.7 191.0 31.8V44H184.0V19.7H190.7V22.5C191.6 21.5 192.7 20.7 194.0 20.2C195.3 19.7 196.7 19.4 198.3 19.4C200.0 19.4 201.6 19.7 202.9 20.4C204.3 21.1 205.4 22.1 206.3 23.3C207.3 22.1 208.5 21.1 210.0 20.4C211.5 19.7 213.2 19.4 215.0 19.4ZM243.0 44.3C240.4 44.3 238.1 43.8 236.1 42.7C234.1 41.7 232.5 40.2 231.4 38.3C230.2 36.4 229.7 34.2 229.7 31.8C229.7 29.4 230.2 27.3 231.4 25.4C232.5 23.5 234.1 22.1 236.1 21.0C238.1 19.9 240.4 19.4 243.0 19.4C245.5 19.4 247.8 19.9 249.8 21.0C251.8 22.1 253.4 23.5 254.5 25.4C255.7 27.3 256.3 29.4 256.3 31.8C256.3 34.2 255.7 36.4 254.5 38.3C253.4 40.2 251.8 41.7 249.8 42.7C247.8 43.8 245.5 44.3 243.0 44.3ZM243.0 38.6C244.8 38.6 246.3 38 247.4 36.8C248.6 35.5 249.1 33.9 249.1 31.8C249.1 29.8 248.6 28.2 247.4 27.0C246.3 25.8 244.8 25.1 243.0 25.1C241.2 25.1 239.7 25.8 238.5 27.0C237.4 28.2 236.8 29.8 236.8 31.8C236.8 33.9 237.4 35.5 238.5 36.8C239.7 38 241.2 38.6 243.0 38.6Z" fill="#343434"></path><path d="M140.6 21.0L140.4 21.4L140.4 21.4L140.6 21.0ZM145.0 25.3L144.5 25.6L144.6 25.6L145.0 25.3ZM145.0 38.4L145.4 38.7L145.4 38.7L145.0 38.4ZM140.6 42.8L140.9 43.2L140.9 43.2L140.6 42.8ZM127.2 41.4L127.6 41.0L126.7 40.1V41.4H127.2ZM127.2 52.7V53.2H127.7V52.7H127.2ZM120.2 52.7H119.7V53.2H120.2V52.7ZM120.2 19.7V19.2H119.7V19.7H120.2ZM126.9 19.7H127.4V19.2H126.9V19.7ZM126.9 22.5H126.4V23.9L127.3 22.8L126.9 22.5ZM137.7 36.8L137.3 36.4L137.3 36.4L137.7 36.8ZM137.7 27.0L137.3 27.3L137.3 27.3L137.7 27.0ZM128.8 27.0L128.5 26.6L128.5 26.6L128.8 27.0ZM128.8 36.8L128.5 37.1L128.5 37.1L128.8 36.8ZM134.5 19.9C136.7 19.9 138.6 20.4 140.4 21.4L140.9 20.5C139.0 19.4 136.8 18.9 134.5 18.9V19.9ZM140.4 21.4C142.2 22.4 143.5 23.8 144.5 25.6L145.4 25.1C144.3 23.1 142.8 21.6 140.9 20.5L140.4 21.4ZM144.6 25.6C145.6 27.3 146.1 29.4 146.1 31.8H147.1C147.1 29.3 146.5 27.0 145.4 25.1L144.6 25.6ZM146.1 31.8C146.1 34.3 145.6 36.4 144.5 38.2L145.4 38.7C146.5 36.7 147.1 34.4 147.1 31.8H146.1ZM144.6 38.2C143.5 39.9 142.2 41.3 140.4 42.3L140.9 43.2C142.8 42.1 144.3 40.6 145.4 38.7L144.6 38.2ZM140.4 42.3C138.6 43.3 136.7 43.8 134.5 43.8V44.8C136.8 44.8 139.0 44.3 140.9 43.2L140.4 42.3ZM134.5 43.8C131.5 43.8 129.2 42.9 127.6 41.0L126.8 41.7C128.7 43.8 131.3 44.8 134.5 44.8V43.8ZM126.7 41.4V52.7H127.7V41.4H126.7ZM127.2 52.2H120.2V53.2H127.2V52.2ZM120.7 52.7V19.7H119.7V52.7H120.7ZM120.2 20.2H126.9V19.2H120.2V20.2ZM126.4 19.7V22.5H127.4V19.7H126.4ZM127.3 22.8C128.9 20.9 131.3 19.9 134.5 19.9V18.9C131.1 18.9 128.4 20.0 126.5 22.2L127.3 22.8ZM133.3 39.1C135.2 39.1 136.8 38.4 138.1 37.1L137.3 36.4C136.3 37.5 135.0 38.1 133.3 38.1V39.1ZM138.1 37.1C139.3 35.8 140 34.0 140 31.8H139C139 33.8 138.4 35.3 137.3 36.4L138.1 37.1ZM140 31.8C140 29.7 139.3 27.9 138.1 26.6L137.3 27.3C138.4 28.4 139 29.9 139 31.8H140ZM138.1 26.6C136.8 25.3 135.2 24.6 133.3 24.6V25.6C135.0 25.6 136.3 26.2 137.3 27.3L138.1 26.6ZM133.3 24.6C131.4 24.6 129.7 25.3 128.5 26.6L129.2 27.3C130.3 26.2 131.6 25.6 133.3 25.6V24.6ZM128.5 26.6C127.2 28.0 126.6 29.7 126.6 31.8H127.6C127.6 29.9 128.2 28.4 129.2 27.3L128.5 26.6ZM126.6 31.8C126.6 34.0 127.2 35.7 128.5 37.1L129.2 36.4C128.2 35.3 127.6 33.8 127.6 31.8H126.6ZM128.5 37.1C129.7 38.4 131.4 39.1 133.3 39.1V38.1C131.6 38.1 130.3 37.5 129.2 36.4L128.5 37.1ZM158.0 22.9H157.5V24.5L158.4 23.2L158.0 22.9ZM161.3 20.3L161.1 19.8L161.1 19.8L161.3 20.3ZM166.3 19.4H166.8V18.9H166.3V19.4ZM166.3 25.9L166.3 26.4L166.8 26.4V25.9H166.3ZM160.0 27.5L160.3 27.8L160.3 27.8L160.0 27.5ZM158.3 44V44.5H158.8V44H158.3ZM151.3 44H150.8V44.5H151.3V44ZM151.3 19.7V19.2H150.8V19.7H151.3ZM158.0 19.7H158.5V19.2H158.0V19.7ZM158.4 23.2C159.2 22.1 160.2 21.3 161.5 20.7L161.1 19.8C159.7 20.5 158.5 21.4 157.6 22.6L158.4 23.2ZM161.5 20.7C162.9 20.2 164.5 19.9 166.3 19.9V18.9C164.4 18.9 162.7 19.2 161.1 19.8L161.5 20.7ZM165.8 19.4V25.9H166.8V19.4H165.8ZM166.3 25.4C165.6 25.3 165.0 25.3 164.7 25.3V26.3C165.0 26.3 165.5 26.3 166.3 26.4L166.3 25.4ZM164.7 25.3C162.6 25.3 160.9 25.9 159.6 27.1L160.3 27.8C161.4 26.8 162.8 26.3 164.7 26.3V25.3ZM159.6 27.1C158.4 28.4 157.8 30.2 157.8 32.5H158.8C158.8 30.3 159.3 28.8 160.3 27.8L159.6 27.1ZM157.8 32.5V44H158.8V32.5H157.8ZM158.3 43.5H151.3V44.5H158.3V43.5ZM151.8 44V19.7H150.8V44H151.8ZM151.3 20.2H158.0V19.2H151.3V20.2ZM157.5 19.7V22.9H158.5V19.7H157.5ZM170.5 19.7V19.2H170.0V19.7H170.5ZM177.5 19.7H178.0V19.2H177.5V19.7ZM177.5 44V44.5H178.0V44H177.5ZM170.5 44H170.0V44.5H170.5V44ZM170.8 15.2L170.5 15.6V15.6L170.8 15.2ZM170.8 9.7L171.2 10.0V10.0L170.8 9.7ZM177.1 9.6L176.8 10.0L177.1 9.6ZM177.1 15.2L177.5 15.6L177.5 15.6L177.1 15.2ZM170.5 20.2H177.5V19.2H170.5V20.2ZM177.0 19.7V44H178.0V19.7H177.0ZM177.5 43.5H170.5V44.5H177.5V43.5ZM171.0 44V19.7H170.0V44H171.0ZM174.0 15.9C172.8 15.9 171.9 15.5 171.2 14.9L170.5 15.6C171.4 16.5 172.6 16.9 174.0 16.9V15.9ZM171.2 14.9C170.5 14.2 170.1 13.4 170.1 12.5H169.1C169.1 13.7 169.6 14.8 170.5 15.6L171.2 14.9ZM170.1 12.5C170.1 11.5 170.5 10.7 171.2 10.0L170.5 9.3C169.6 10.1 169.1 11.2 169.1 12.5H170.1ZM171.2 10.0C171.9 9.4 172.8 9.0 174.0 9.0V8.0C172.6 8.0 171.4 8.4 170.5 9.3L171.2 10.0ZM174.0 9.0C175.2 9.0 176.1 9.4 176.8 10.0L177.5 9.2C176.5 8.4 175.4 8.0 174.0 8.0V9.0ZM176.8 10.0C177.5 10.6 177.8 11.4 177.8 12.3H178.8C178.8 11.1 178.4 10.1 177.5 9.2L176.8 10.0ZM177.8 12.3C177.8 13.4 177.5 14.2 176.8 14.9L177.5 15.6C178.4 14.7 178.8 13.6 178.8 12.3H177.8ZM176.8 14.9C176.1 15.5 175.2 15.9 174.0 15.9V16.9C175.4 16.9 176.5 16.5 177.5 15.6L176.8 14.9ZM222.2 22.1L221.8 22.4L221.9 22.4L222.2 22.1ZM224.9 44V44.5H225.4V44H224.9ZM217.9 44H217.4V44.5H217.9V44ZM216.7 26.9L216.3 27.2L216.3 27.2L216.3 27.2L216.7 26.9ZM209.4 27.1L209.7 27.4L209.8 27.4L209.4 27.1ZM207.9 44V44.5H208.4V44H207.9ZM200.9 44H200.4V44.5H200.9V44ZM192.5 27.1L192.8 27.4L192.8 27.4L192.5 27.1ZM191.0 44V44.5H191.5V44H191.0ZM184.0 44H183.5V44.5H184.0V44ZM184.0 19.7V19.2H183.5V19.7H184.0ZM190.7 19.7H191.2V19.2H190.7V19.7ZM190.7 22.5H190.2V23.9L191.1 22.9L190.7 22.5ZM194.0 20.2L193.8 19.7L193.8 19.7L194.0 20.2ZM202.9 20.4L202.7 20.9L202.7 20.9L202.9 20.4ZM206.3 23.3L205.9 23.6L206.2 24.2L206.7 23.6L206.3 23.3ZM210.0 20.4L209.8 20.0L209.8 20.0L210.0 20.4ZM215.0 19.9C217.9 19.9 220.2 20.7 221.8 22.4L222.6 21.7C220.7 19.8 218.1 18.9 215.0 18.9V19.9ZM221.9 22.4C223.5 24.1 224.4 26.6 224.4 30.1H225.4C225.4 26.4 224.5 23.6 222.6 21.7L221.9 22.4ZM224.4 30.1V44H225.4V30.1H224.4ZM224.9 43.5H217.9V44.5H224.9V43.5ZM218.4 44V31.2H217.4V44H218.4ZM218.4 31.2C218.4 29.2 218.0 27.6 217.0 26.6L216.3 27.2C217.0 28.0 217.4 29.3 217.4 31.2H218.4ZM217.1 26.6C216.2 25.5 214.9 25.0 213.3 25.0V26.0C214.6 26.0 215.6 26.4 216.3 27.2L217.1 26.6ZM213.3 25.0C211.5 25.0 210.1 25.5 209.0 26.7L209.8 27.4C210.6 26.4 211.8 26.0 213.3 26.0V25.0ZM209.0 26.7C207.9 27.9 207.4 29.6 207.4 31.8H208.4C208.4 29.8 208.9 28.3 209.7 27.4L209.0 26.7ZM207.4 31.8V44H208.4V31.8H207.4ZM207.9 43.5H200.9V44.5H207.9V43.5ZM201.4 44V31.2H200.4V44H201.4ZM201.4 31.2C201.4 29.2 201.0 27.6 200.2 26.6C199.3 25.5 198.0 25.0 196.3 25.0V26.0C197.7 26.0 198.7 26.4 199.4 27.2C200.0 28.0 200.4 29.3 200.4 31.2H201.4ZM196.3 25.0C194.6 25.0 193.2 25.5 192.1 26.7L192.8 27.4C193.7 26.4 194.8 26.0 196.3 26.0V25.0ZM192.1 26.7C191.0 27.9 190.5 29.6 190.5 31.8H191.5C191.5 29.8 192.0 28.3 192.8 27.4L192.1 26.7ZM190.5 31.8V44H191.5V31.8H190.5ZM191.0 43.5H184.0V44.5H191.0V43.5ZM184.5 44V19.7H183.5V44H184.5ZM184.0 20.2H190.7V19.2H184.0V20.2ZM190.2 19.7V22.5H191.2V19.7H190.2ZM191.1 22.9C191.9 21.9 193.0 21.2 194.2 20.7L193.8 19.7C192.4 20.3 191.3 21.1 190.3 22.2L191.1 22.9ZM194.2 20.7C195.4 20.1 196.8 19.9 198.3 19.9V18.9C196.7 18.9 195.2 19.2 193.8 19.7L194.2 20.7ZM198.3 19.9C199.9 19.9 201.4 20.2 202.7 20.9L203.2 20.0C201.7 19.2 200.1 18.9 198.3 18.9V19.9ZM202.7 20.9C204.0 21.5 205.1 22.4 205.9 23.6L206.7 23.1C205.8 21.7 204.6 20.7 203.2 20.0L202.7 20.9ZM206.7 23.6C207.6 22.5 208.8 21.5 210.2 20.9L209.8 20.0C208.2 20.7 206.9 21.7 205.9 23.0L206.7 23.6ZM210.2 20.9C211.7 20.2 213.3 19.9 215.0 19.9V18.9C213.1 18.9 211.4 19.2 209.8 20.0L210.2 20.9ZM236.1 42.7L235.9 43.2L235.9 43.2L236.1 42.7ZM231.4 38.3L230.9 38.5L231.4 38.3ZM231.4 25.4L230.9 25.2L231.4 25.4ZM236.1 21.0L236.3 21.4L236.3 21.4L236.1 21.0ZM249.8 21.0L249.6 21.4L249.6 21.4L249.8 21.0ZM254.5 25.4L255.0 25.2L254.5 25.4ZM254.5 38.3L255.0 38.5L254.5 38.3ZM249.8 42.7L250.1 43.2L250.1 43.2L249.8 42.7ZM247.4 36.8L247.0 36.4L247.0 36.4L247.4 36.8ZM247.4 27.0L247.0 27.3L247.0 27.3L247.4 27.0ZM238.5 27.0L238.9 27.3L238.9 27.3L238.5 27.0ZM238.5 36.8L238.2 37.1L238.2 37.1L238.5 36.8ZM243.0 43.8C240.5 43.8 238.3 43.3 236.3 42.3L235.9 43.2C238.0 44.3 240.4 44.8 243.0 44.8V43.8ZM236.3 42.3C234.4 41.3 232.9 39.8 231.8 38.0L230.9 38.5C232.1 40.5 233.8 42.1 235.9 43.2L236.3 42.3ZM231.8 38.0C230.7 36.2 230.2 34.2 230.2 31.8H229.2C229.2 34.3 229.8 36.6 230.9 38.5L231.8 38.0ZM230.2 31.8C230.2 29.5 230.7 27.5 231.8 25.7L230.9 25.2C229.8 27.1 229.2 29.4 229.2 31.8H230.2ZM231.8 25.7C232.9 23.9 234.4 22.5 236.3 21.4L235.9 20.6C233.8 21.6 232.1 23.2 230.9 25.2L231.8 25.7ZM236.3 21.4C238.3 20.4 240.5 19.9 243.0 19.9V18.9C240.4 18.9 238.0 19.4 235.9 20.6L236.3 21.4ZM243.0 19.9C245.5 19.9 247.7 20.4 249.6 21.4L250.1 20.6C248.0 19.4 245.6 18.9 243.0 18.9V19.9ZM249.6 21.4C251.5 22.5 253.0 23.9 254.1 25.7L255.0 25.2C253.8 23.2 252.1 21.6 250.1 20.6L249.6 21.4ZM254.1 25.7C255.2 27.5 255.8 29.5 255.8 31.8H256.8C256.8 29.4 256.2 27.1 255.0 25.2L254.1 25.7ZM255.8 31.8C255.8 34.2 255.2 36.2 254.1 38.0L255.0 38.5C256.2 36.6 256.8 34.3 256.8 31.8H255.8ZM254.1 38.0C253.0 39.8 251.5 41.3 249.6 42.3L250.1 43.2C252.1 42.1 253.8 40.5 255.0 38.5L254.1 38.0ZM249.6 42.3C247.7 43.3 245.5 43.8 243.0 43.8V44.8C245.6 44.8 248.0 44.3 250.1 43.2L249.6 42.3ZM243.0 39.1C244.9 39.1 246.5 38.4 247.8 37.1L247.0 36.4C246.0 37.5 244.7 38.1 243.0 38.1V39.1ZM247.8 37.1C249.0 35.8 249.6 34.0 249.6 31.8H248.6C248.6 33.8 248.1 35.3 247.0 36.4L247.8 37.1ZM249.6 31.8C249.6 29.7 249.0 27.9 247.7 26.6L247.0 27.3C248.1 28.4 248.6 29.9 248.6 31.8H249.6ZM247.8 26.6C246.5 25.3 244.9 24.6 243.0 24.6V25.6C244.7 25.6 246.0 26.2 247.0 27.3L247.8 26.6ZM243.0 24.6C241.1 24.6 239.4 25.3 238.2 26.6L238.9 27.3C240.0 26.2 241.3 25.6 243.0 25.6V24.6ZM238.2 26.6C236.9 27.9 236.3 29.7 236.3 31.8H237.3C237.3 29.9 237.8 28.4 238.9 27.3L238.2 26.6ZM236.3 31.8C236.3 34.0 236.9 35.8 238.2 37.1L238.9 36.4C237.8 35.3 237.3 33.8 237.3 31.8H236.3ZM238.2 37.1C239.4 38.4 241.1 39.1 243.0 39.1V38.1C241.3 38.1 240.0 37.5 238.9 36.4L238.2 37.1Z" fill="#343434"></path><defs><linearGradient id="paint0_linear" x1="14.5" y1="41.1" x2="33.6" y2="58.5" gradientUnits="userSpaceOnUse"><stop stop-color="#EE4645"></stop><stop offset="1" stop-color="#810707"></stop></linearGradient></defs></svg>
diff --git a/doc/logos/prisma.svg b/doc/logos/prisma.svg
new file mode 100644
index 0000000000..6249376fb5
--- /dev/null
+++ b/doc/logos/prisma.svg
@@ -0,0 +1 @@
+<svg width="90" height="29" viewBox="0 0 90 29" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M0.2 19.5C-0.0 19.0 -0.0 18.5 0.1 18.0L10.3 1.5C10.8 0.6 12.2 0.7 12.7 1.6L21.9 21.7C22.3 22.5 21.9 23.3 21.1 23.6L6.7 27.9C6.1 28.1 5.5 27.8 5.1 27.3L0.2 19.5ZM11.4 6.3C11.5 5.9 12.2 5.8 12.4 6.2L18.8 21.0C18.9 21.3 18.8 21.6 18.5 21.7L8.5 24.7C8.2 24.8 7.8 24.5 7.9 24.1L11.4 6.3ZM48.4 21.6H51.3V11.2H48.4V21.6ZM48.3 8.5C48.3 7.6 48.8 7.2 49.9 7.2C50.9 7.2 51.4 7.6 51.4 8.5C51.4 9.0 51.3 9.3 51.0 9.6C50.8 9.8 50.4 9.9 49.9 9.9C48.8 9.9 48.3 9.5 48.3 8.5ZM87.1 16.8L86.0 16.8C85.2 16.8 84.6 17.0 84.2 17.3C83.8 17.5 83.6 18.0 83.6 18.5C83.6 19.3 84.0 19.7 85.0 19.7C85.6 19.7 86.1 19.5 86.5 19.1C86.9 18.8 87.1 18.3 87.1 17.6V16.8ZM88.0 21.6L87.4 20.2H87.3C86.9 20.8 86.4 21.2 85.9 21.4C85.4 21.7 84.7 21.8 83.9 21.8C82.9 21.8 82.1 21.5 81.5 20.9C81.0 20.4 80.7 19.5 80.7 18.5C80.7 17.4 81.1 16.6 81.8 16.1C82.6 15.5 83.8 15.2 85.3 15.2L87.1 15.1V14.7C87.1 13.6 86.6 13.1 85.5 13.1C84.7 13.1 83.7 13.4 82.6 13.9L81.7 11.9C82.8 11.3 84.2 11.0 85.6 11.0C87.0 11.0 88.1 11.3 88.8 11.9C89.6 12.5 89.9 13.4 89.9 14.7V21.6H88.0ZM72.4 21.6H69.6V15.5C69.6 14.8 69.5 14.2 69.2 13.9C69.0 13.5 68.6 13.3 68.0 13.3C67.3 13.3 66.8 13.6 66.5 14.1C66.1 14.6 66.0 15.5 66.0 16.7V21.6H63.1V11.2H65.3L65.7 12.5H65.8C66.1 12.1 66.5 11.7 67.1 11.4C67.6 11.2 68.2 11.0 68.9 11.0C70.4 11.0 71.5 11.5 72.0 12.5H72.3C72.5 12.1 73.0 11.7 73.5 11.4C74.0 11.2 74.6 11.0 75.3 11.0C76.5 11.0 77.4 11.3 78.0 11.9C78.6 12.5 78.9 13.5 78.9 14.8V21.6H76.1V15.5C76.1 14.8 75.9 14.2 75.7 13.9C75.4 13.5 75.0 13.3 74.5 13.3C73.8 13.3 73.3 13.5 72.9 14.0C72.6 14.5 72.4 15.3 72.4 16.4V21.6ZM60.1 20.9C60.9 20.4 61.2 19.6 61.2 18.5C61.2 18.0 61.1 17.6 61.0 17.2C60.8 16.8 60.5 16.5 60.1 16.2C59.7 15.9 59.2 15.6 58.3 15.3C57.4 14.9 56.8 14.6 56.6 14.5C56.3 14.3 56.2 14.1 56.2 13.8C56.2 13.3 56.6 13.1 57.4 13.1C57.9 13.1 58.4 13.2 58.8 13.3C59.3 13.5 59.7 13.7 60.3 13.9L61.1 11.8C59.9 11.3 58.7 11.0 57.5 11.0C56.2 11.0 55.2 11.3 54.4 11.8C53.7 12.3 53.4 13.0 53.4 13.9C53.4 14.5 53.5 14.9 53.6 15.3C53.8 15.6 54.1 16.0 54.4 16.3C54.8 16.5 55.4 16.9 56.2 17.2C56.8 17.4 57.2 17.6 57.5 17.8C57.9 18.0 58.1 18.1 58.2 18.3C58.4 18.4 58.4 18.6 58.4 18.8C58.4 19.4 57.9 19.7 56.9 19.7C56.4 19.7 55.8 19.6 55.2 19.5C54.5 19.3 53.9 19.1 53.4 18.8V21.2C53.8 21.4 54.3 21.5 54.9 21.6C55.4 21.7 56.1 21.8 56.8 21.8C58.3 21.8 59.4 21.5 60.1 20.9ZM46.9 11.1C46.7 11.1 46.4 11.0 46.0 11.0C45.3 11.0 44.8 11.2 44.2 11.6C43.7 11.9 43.2 12.4 42.9 13.0H42.8L42.3 11.2H40.2V21.6H43.0V16.3C43.0 15.5 43.3 14.8 43.8 14.4C44.3 13.9 45.0 13.7 45.9 13.7C46.2 13.7 46.5 13.7 46.7 13.8L46.9 11.1ZM31.9 14.4H32.8C33.7 14.4 34.4 14.2 34.8 13.9C35.3 13.5 35.5 13.0 35.5 12.4C35.5 11.7 35.3 11.2 34.9 10.9C34.6 10.5 34.0 10.4 33.2 10.4H31.9V14.4ZM38.4 12.3C38.4 13.7 37.9 14.8 37.0 15.6C36.1 16.4 34.8 16.8 33.1 16.8H31.9V21.6H29.0V8.0H33.3C35.0 8.0 36.2 8.4 37.1 9.1C37.9 9.8 38.4 10.9 38.4 12.3Z" fill="black"></path></svg>
diff --git a/index.html b/index.html
index 983af5ac22..9edd007cbc 100644
--- a/index.html
+++ b/index.html
@@ -205,17 +205,18 @@ <h2>Browser support</h2>
   <h2>Sponsors</h2>
   <p>These companies support development of this project:</p>
   <ul class=sponsor-list>
-    <li><a href="http://observablehq.com/"><img alt="Observable" src='data:image/svg+xml;utf8,<svg viewBox="-3 0 171 28" width="350" height="57" fill="black" xmlns="http://www.w3.org/2000/svg"><path d="M12.5 22.66c-1.15 0-2.15-.25-3-.75a5.09 5.09 0 01-1.94-2.04 10.80 10.80 0 01-.99-2.74A14.74 14.74 0 016.25 14c0-.83.05-1.62.16-2.38.10-.75.30-1.52.60-2.31a7.37 7.37 0 011.12-2.03 5.11 5.11 0 011.80-1.40c.74-.36 1.59-.53 2.54-.53 1.15 0 2.15.25 3 .75.84.50 1.51 1.21 1.94 2.04.45.86.78 1.77.99 2.74.20.96.31 2.00.31 3.12a16.7 16.7 0 01-.16 2.38 10.63 10.63 0 01-.61 2.31c-.30.78-.67 1.46-1.13 2.03-.45.57-1.05 1.04-1.79 1.40-.74.36-1.59.53-2.54.53zm2.20-6.37c.59-.6.93-1.43.91-2.29 0-.89-.29-1.65-.89-2.29-.59-.63-1.34-.95-2.22-.95s-1.63.31-2.23.95A3.23 3.23 0 009.37 14c0 .89.29 1.65.89 2.29.59.63 1.34.95 2.22.95s1.62-.31 2.20-.95zM12.5 27C19.40 27 25 21.18 25 14S19.40 1 12.5 1 0 6.82 0 14s5.59 13 12.5 13z"/><g transform="translate(30, -3.5)"><path d="M6.41 17.75c0 1.09.05 2.09.15 2.98.11.87.29 1.62.53 2.25.23.62.54 1.11.91 1.46.37.33.82.50 1.36.50.54 0 .99-.17 1.36-.50.37-.35.67-.84.91-1.46.23-.62.40-1.37.50-2.25.11-.89.17-1.89.17-2.98 0-1.08-.06-2.06-.17-2.96-.10-.89-.27-1.65-.50-2.27-.23-.64-.54-1.13-.91-1.46-.37-.35-.82-.53-1.36-.53s-.99.17-1.36.53c-.37.33-.67.82-.91 1.46-.23.62-.41 1.38-.53 2.27-.10.89-.15 1.88-.15 2.96zm2.96-8.75c1.06 0 2.08.17 3.06.53a7.36 7.36 0 012.60 1.62c.76.72 1.35 1.63 1.79 2.73.45 1.09.68 2.38.68 3.87 0 1.48-.22 2.77-.68 3.87-.43 1.09-1.03 2.00-1.79 2.73a7.07 7.07 0 01-2.60 1.62 8.92 8.92 0 01-3.06.53 9.14 9.14 0 01-3.08-.53 7.36 7.36 0 01-2.60-1.62c-.74-.72-1.34-1.63-1.79-2.73-.43-1.09-.65-2.38-.65-3.87 0-1.48.21-2.77.65-3.87.45-1.09 1.06-2.00 1.82-2.73a7.36 7.36 0 012.60-1.62 8.92 8.92 0 013.06-.53zm9.32 17.03v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40.60.27 1.13.67 1.59 1.21.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.05.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.62-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.62-.91-.40 0-.8.12-1.18.38v7.46c.33.23.73.35 1.19.35zm13.10 2.42c-1.75 0-3.30-.41-4.65-1.24l.12-3.23h2.30l.40 2.63c.28.11.57.21.86.27.30.05.62.07.96.07.64 0 1.13-.09 1.49-.27.35-.20.53-.54.53-1.03 0-.33-.13-.63-.40-.88-.25-.27-.80-.52-1.64-.76l-1.44-.37c-1.01-.27-1.78-.74-2.30-1.41-.50-.67-.75-1.51-.75-2.50 0-.62.11-1.20.35-1.74a3.95 3.95 0 011.08-1.39c.48-.38 1.08-.69 1.77-.91.71-.22 1.51-.33 2.43-.33.77 0 1.49.08 2.15.25.65.16 1.34.42 2.05.75l-.20 2.85H41.75l-.55-2.25a4.91 4.91 0 00-.55-.07 3.89 3.89 0 00-.68-.05c-.48 0-.89.11-1.21.32-.32.20-.48.52-.48.96 0 .13.02.27.07.40.05.11.14.24.27.38a4.3 4.3 0 00.60.37c.27.11.62.23 1.06.35l1.41.38c1.18.32 2.02.81 2.53 1.49.52.65.78 1.49.78 2.50 0 .74-.14 1.39-.43 1.94a3.84 3.84 0 01-1.21 1.39c-.52.37-1.15.64-1.89.83-.74.18-1.57.27-2.50.27zM52.83 13.27c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.85 4.85 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63H51.11c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.07 5.07 0 001.24-.86l.98.96c-.54 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.29.70a7.82 7.82 0 01-2.63-.43 6.19 6.19 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.57-2.05a6.61 6.61 0 012.2-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.17.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.19c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53zM59.31 26v-1.29l1.21-.27c.01-.60.02-1.24.02-1.92V19.09v-.88c0-.23-.00-.45-.02-.65 0-.20-.00-.39-.02-.58 0-.20-.00-.43-.02-.68l-1.36-.22v-1.03l5.59-1.74.45.27.20 2.91c.33-1.08.81-1.88 1.44-2.40.64-.52 1.26-.78 1.87-.78.62 0 1.14.18 1.56.55.43.35.7.92.78 1.69-.03.69-.23 1.22-.60 1.59-.37.37-.81.55-1.31.55-.42 0-.80-.11-1.13-.32-.32-.21-.64-.57-.98-1.06l-.12-.17c-.30.33-.60.77-.91 1.31a5.62 5.62 0 00-.58 1.67V22.40c0 .65.00 1.28.02 1.87l1.97.43V26h-8.04zm19.93 0h-2.27l-4.50-10.88-1.21-.25v-1.19h7.61v1.19l-1.34.30 2.1 5.79 1.94-5.82-1.39-.27v-1.19h4.75v1.19l-1.51.25L79.25 26zm11.35-1.79c.32 0 .67-.14 1.06-.43v-4.2c-.25.06-.49.16-.73.27a2.55 2.55 0 00-.55.35 2.97 2.97 0 00-.53.50 2.36 2.36 0 00-.40.73c-.1.27-.15.57-.15.91 0 .62.12 1.08.38 1.39.25.30.56.45.93.45zm4.17 2.20c-.81 0-1.45-.15-1.92-.45-.47-.30-.81-.75-1.03-1.34-.25.27-.49.51-.73.73-.22.22-.47.41-.75.58-.27.15-.57.27-.91.35a4.94 4.94 0 01-1.19.12c-1.01 0-1.81-.27-2.40-.83-.59-.57-.88-1.38-.88-2.43 0-.48.07-.93.22-1.34.15-.42.42-.81.81-1.16.40-.35.93-.68 1.59-.98.67-.30 1.52-.59 2.55-.86l.70-.17c.27-.06.54-.14.83-.22v-.91c0-.54-.02-.98-.07-1.34-.05-.37-.15-.66-.30-.88a1.05 1.05 0 00-.58-.45c-.23-.10-.55-.15-.96-.15h-.38v.86c0 1.03-.21 1.76-.63 2.20-.42.42-.90.63-1.44.63-1.03 0-1.67-.45-1.92-1.36 0-1.09.51-1.98 1.54-2.65 1.04-.69 2.59-1.03 4.63-1.03.87 0 1.62.09 2.22.27.60.18 1.09.48 1.46.88.38.38.66.89.83 1.51.16.62.25 1.36.25 2.22v5.79c0 .28.14.43.43.43a.54.54 0 00.30-.10c.1-.06.22-.22.38-.45l.73.40c-.30.77-.71 1.33-1.24 1.67-.52.32-1.24.48-2.15.48zm3.89-.38v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40a4.42 4.42 0 011.59 1.21c.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.04.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.61-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.61-.91-.40 0-.80.12-1.19.38v7.46c.33.23.73.35 1.19.35zm8.40-15.08l5.84-1.13.43.27-.10 3.51v11.03l.05 1.89 1.13.22V26h-7.18v-1.29l1.13-.25a70.7 70.7 0 00.02-1.87c.01-.62.02-1.25.02-1.89v-10.4l-1.36-.25V8.89zm15.30 4.37c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.84 4.84 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63h-7.03c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.09 5.09 0 001.24-.86l.98.96c-.53 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.28.70a7.83 7.83 0 01-2.63-.43 6.18 6.18 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.56-2.05a6.61 6.61 0 012.20-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.16.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.18c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53z"/></g></svg>'></a></li>
-    <li><a href="https://holmusk.com"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" style="background: %231649BF"><g transform="translate(-780, -40)" fill="%23FFFFFF"><path d="M780,4 L840,4 L840,1 L780,1 L780,4 Z M794,55 L794,84.65 L796.806,84.65 L796.806,72.739 C796.806,69.633 799.325,67.104 802.420,67.104 C805.516,67.104 808.031,69.633 808.031,72.739 L808.031,84.65 L810.838,84.65 L810.838,72.739 C810.838,68.077 807.062,64.288 802.420,64.288 C800.271,64.288 798.311,65.106 796.819,66.447 L796.819,55 L794,55 Z M817.582,63.931 C815.372,63.931 813.367,64.798 811.862,66.199 L812.163,66.653 C812.613,67.33 812.972,68.051 813.248,68.805 C814.281,67.549 815.840,66.746 817.582,66.746 C820.674,66.746 823.193,69.276 823.193,72.382 L823.193,72.385 L823.193,84.293 L826,84.293 L826,72.385 L826,72.379 C826,70.658 825.483,69.057 824.598,67.72 L824.598,67.723 C824.537,67.629 824.473,67.543 824.409,67.452 C824.345,67.365 824.280,67.278 824.213,67.191 C824.139,67.098 824.068,67.008 823.995,66.917 C823.870,66.776 823.744,66.634 823.616,66.502 C823.542,66.424 823.465,66.35 823.385,66.276 C823.289,66.183 823.190,66.093 823.090,66.002 C823.004,65.932 822.917,65.854 822.830,65.787 C822.689,65.671 822.542,65.561 822.394,65.458 C822.320,65.406 822.243,65.354 822.169,65.307 C821.999,65.194 821.829,65.087 821.650,64.991 C821.592,64.955 821.531,64.923 821.473,64.894 C821.307,64.807 821.142,64.726 820.976,64.653 C820.909,64.623 820.845,64.594 820.774,64.566 C820.569,64.478 820.357,64.401 820.138,64.33 C820.084,64.314 820.026,64.298 819.969,64.282 C819.773,64.224 819.577,64.172 819.382,64.131 C819.330,64.118 819.285,64.104 819.234,64.095 C819,64.05 818.766,64.015 818.525,63.985 C818.461,63.979 818.400,63.976 818.339,63.969 C818.095,63.947 817.855,63.931 817.611,63.931 L817.582,63.931 Z"></path></g></svg>'>Holmusk</a></li>
-    <li><a href="https://codepen.io/"><img style="margin: 16px 0" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>' alt="CodePen"></a></li>
-    <li><a href="https://4me.com"><img style="width: auto" src='data:image/svg+xml;utf8,<svg fill-rule="evenodd" viewBox="10538 7547.8 6693 4459" xmlns="http://www.w3.org/2000/svg"><rect fill="%23062341" x="10538" y="7547.8" width="6693.4" height="4459.4"/><path fill="%23fefefe" d="m15757 9524c-11.38-73.68-40.63-133.26-87.74-178.76-47.13-45.5-109.68-68.26-187.68-68.26s-140.98 22.39-188.91 67.18c-47.94 44.78-79.21 104.72-93.86 179.84h558.19zm-2797.1-489.69h369.08v166.12c21.04-24.93 44.1-48.39 69.19-71.15 25.08-22.38 53.02-42.25 83.76-59.94 30.77-17.35 65.16-31.06 103.19-41.53 38.04-10.12 80.54-15.17 127.47-15.17 85.8 0 159.84 15.88 222.16 48.02 62.33 32.15 110.49 77.64 144.49 137.6 56.64-61.38 119.77-107.26 189.37-138.68 69.59-31.42 148.93-46.94 237.95-46.94 137.58 0 245.22 36.12 322.93 108.33 48.42 45.04 81.78 103.28 100 174.71 24.57-38.29 53.4-73.42 86.51-105.37 56.87-54.89 124.72-98.22 203.53-130 78.8-31.79 166.14-47.67 262.02-47.67 108.86 0 203.12 17.34 282.73 52 79.64 34.66 145.85 81.26 198.66 139.76 52.81 58.51 91.79 125.67 117 201.52 25.19 75.84 37.77 154.92 37.77 237.27 0 12.99-0.4 26.71-1.21 41.17-0.81 14.43-2.04 29.6-3.68 45.49h-909.14c17.86 75.11 54.83 131.82 110.9 170.09 56.06 38.29 125.53 57.43 208.39 57.43 61.76 0 117.01-9.4 165.77-28.18 48.74-18.78 99.11-49.11 151.1-91l212.06 166.84c-61.76 67.89-136.5 120.98-224.26 159.26-87.72 38.27-190.92 57.41-309.53 57.41-97.51 0-188.1-14.44-271.78-43.33-83.69-28.89-156-70.06-216.93-123.5-31.34-27.5-59.13-57.55-83.39-90.2v231.03h-369.04v-646.42c0-77.65-18.61-136.51-55.83-175.87-37.24-39.72-90.65-59.58-160.27-59.58-69.6 0-124.23 19.86-163.88 59.58-39.68 39.36-59.48 98.22-59.48 175.87v646.42h-369.06v-646.42c0-77.65-18.62-136.51-55.86-175.87-37.22-39.72-90.63-59.58-160.23-59.58s-124.24 19.86-163.9 59.58c-39.66 39.36-59.48 98.22-59.48 175.87v646.42h-563.64v325.09h-318.66v-325.09h-795.02l-0.53-238.52 827.03-922.87h287.18v888.19h194.56v-888.19zm-513.22 888.19v-472.57l-403.19 472.57h403.19z"/><path fill="%23fefefe" d="m16236 9012.7c66.1 0 119.69 53.6 119.69 119.7 0 66.11-53.59 119.7-119.69 119.7-66.11 0-119.7-53.59-119.7-119.7 0-66.1 53.59-119.7 119.7-119.7zm0 24.2c52.74 0 95.51 42.77 95.51 95.5 0 52.74-42.77 95.52-95.51 95.52s-95.52-42.78-95.52-95.52c0-52.73 42.78-95.5 95.52-95.5z"/><path fill="%23fefefe" d="m16297 9193.9h-32.6l-19.55-32.41c-1.49-2.45-2.88-4.63-4.24-6.59-1.35-1.93-2.71-3.57-4.07-4.95-1.39-1.37-2.83-2.42-4.32-3.18-1.5-0.71-3.11-1.06-4.85-1.06h-7.65v48.19h-28.38v-125.91h44.96c30.57 0 45.86 11.41 45.86 34.23 0 4.39-0.69 8.44-2.05 12.16-1.34 3.71-3.24 7.08-5.69 10.07-2.45 2.97-5.42 5.55-8.9 7.71-3.5 2.18-7.37 3.86-11.67 5.08v0.36c1.9 0.6 3.7 1.54 5.46 2.86 1.78 1.31 3.46 2.85 5.09 4.62 1.66 1.77 3.22 3.65 4.72 5.66 1.49 2.01 2.85 3.98 4.08 5.93l23.8 37.23zm-77.28-104.66v35.03h12.28c6.1 0 11-1.77 14.67-5.28 3.75-3.56 5.62-8 5.62-13.25 0-11.03-6.59-16.5-19.77-16.5h-12.8z"/></svg>' alt="4me"></a></li>
-    <li><a href="https://www.jetbrains.com/"><img src="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'%3E%3Cstop offset='0' stop-color='%23AA4A9B'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23ED417C'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/%3E%3ClinearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'%3E%3Cstop offset='0' stop-color='%23FFE42E'/%3E%3Cstop offset='1' stop-color='%23F05922'/%3E%3C/linearGradient%3E%3Cpath fill='url(%23SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/%3E%3Crect x='45.5' y='35.7' width='51' height='51'/%3E%3Crect x='49.9' y='77.1' fill='%23fff' width='19.1' height='3.2'/%3E%3Cpath fill='%23fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/%3E%3Cpath fill='%23fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/%3E%3Cpath fill='%23fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/%3E%3Cpath fill='%23fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/%3E%3Cpath fill='%23fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/%3E%3Cpath fill='%23fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/%3E%3Cpath fill='%23fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/%3E%3Cpath fill='%23fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/%3E%3C/svg%3E%0A" alt="JetBrains"></a>
-    <li><a href="https://www.desmos.com/"><img src='data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="%23187a3d"%3E%3Cpath d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/%3E%3Cpath d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/%3E%3C/svg%3E%0A' alt=desmos></a></li>
-    <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='data:image/svg+xml,%3Csvg%20width%3D%22397%22%20height%3D%22109%22%20viewBox%3D%220%200%20397%20109%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20fill-rule%3D%22nonzero%22%20fill%3D%22none%22%3E%3Cpath%20d%3D%22M169.495%2063.68c2.8%200%205.254.671%207.36%202.015%202.105%201.344%203.688%203.162%204.751%205.453%201.063%202.292%201.594%204.878%201.594%207.76%200%204.408-1.241%208.054-3.724%2010.935-2.483%202.881-5.81%204.322-9.98%204.322-3.953%200-7.18-1.402-9.683-4.206v12.62c0%20.271-.085.489-.254.653a.88.88%200%200%201-.64.247h-4.767a.966.966%200%200%201-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932%200%200%201%20.656-.247h4.767a.88.88%200%200%201%20.64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268%205.006-4.902%209.057-4.902zm-.84%2024.874c2.752%200%204.865-.86%206.34-2.578%201.473-1.719%202.21-4.034%202.21-6.947%200-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576%200-4.625.855-6.148%202.563-1.524%201.71-2.285%203.986-2.285%206.831s.761%205.141%202.285%206.89c1.523%201.747%203.572%202.62%206.148%202.62zm39.147-24.875c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm31.331%2030.845c-4.25%200-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05%204.298-10.999c2.866-2.948%206.423-4.423%2010.673-4.423%202.788%200%205.332.674%207.632%202.021%202.3%201.348%204.103%203.203%205.41%205.566%201.306%202.363%201.959%204.975%201.959%207.835%200%202.861-.653%205.468-1.96%207.821-1.306%202.353-3.109%204.209-5.41%205.566-2.3%201.357-4.843%202.036-7.63%202.036zm-6.43-8.608c1.7%201.759%203.847%202.638%206.445%202.638%202.597%200%204.745-.88%206.444-2.638%201.698-1.759%202.547-4.03%202.547-6.814%200-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598%200-4.746.88-6.444%202.638-1.699%201.758-2.548%204.03-2.548%206.815%200%202.784.85%205.055%202.548%206.814zm55.522-21.623c.272%200%20.487.082.642.248.156.165.234.384.234.657v27.976c0%201.772-.302%203.373-.906%204.804-.603%201.431-1.402%202.6-2.395%203.504-.993.906-2.157%201.67-3.49%202.293a16.713%2016.713%200%200%201-4.076%201.314c-1.383.253-2.814.38-4.294.38-2.337%200-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652%201.198-.38%202.707%201.46%205.735%202.19%209.085%202.19%201.169%200%202.293-.116%203.374-.35%201.074-.23%202.107-.62%203.068-1.153a6.016%206.016%200%200%200%202.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513%203.154-5.726%204.731-9.64%204.731-2.688%200-5.132-.676-7.333-2.03a13.905%2013.905%200%200%201-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534%200-2.726.604-5.237%201.811-7.534%201.208-2.298%202.907-4.123%205.098-5.476%202.19-1.353%204.64-2.03%207.347-2.03%203.856%200%207.03%201.548%209.523%204.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596%2023.266c2.408%200%204.424-.894%206.045-2.68%201.622-1.788%202.433-3.898%202.433-6.332%200-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428%200-4.452.86-6.074%202.581-1.622%201.72-2.433%203.826-2.433%206.317%200%202.529.811%204.663%202.433%206.402%201.621%201.74%203.646%202.61%206.074%202.61zm40.073-23.88c3.374%200%206.111.99%208.213%202.968%202.1%201.978%203.151%204.771%203.151%208.379%200%20.582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44%200-2.757.266-3.95.8-1.194.533-2.142%201.183-2.842%201.949-.7.766-1.238%201.513-1.613%202.24-.375.727-.562%201.333-.562%201.818v16.147c0%20.271-.084.49-.252.654a.87.87%200%200%201-.636.248h-4.735a.954.954%200%200%201-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922%200%200%201%20.65-.248h4.47c.552%200%20.858.3.917.902l.237%203.928h.68c1.086-1.571%202.52-2.876%204.306-3.913%201.786-1.038%203.813-1.557%206.082-1.557zm46.24%2024.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0%20.626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493%201.682-3.399%203.008-5.717%203.976-2.318.968-4.577%201.453-6.778%201.453-3.241%200-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149%200-2.621.835-4.656%202.504-6.104%201.67-1.448%204.214-2.416%207.633-2.906l6.984-1.085c1.355-.196%202.347-.401%202.976-.617.629-.215%201.041-.479%201.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302%200-6.65%201.36-7.043%204.079-.059.45-.353.665-.884.646h-4.48c-.647%200-.942-.304-.883-.91.334-3.326%201.66-5.713%203.978-7.161%202.318-1.448%205.452-2.172%209.4-2.172%204.224%200%207.392.959%209.504%202.876%202.112%201.918%203.168%204.706%203.168%208.364v11.035c-.02%201.35.707%202.172%202.18%202.466zm-19.06.135c4.132%200%207.518-1.307%2010.16-3.922v-6.028c-.258.566-1.53%201.024-3.814%201.375l-6.375.995c-1.728.274-2.96.742-3.695%201.405-.735.663-1.102%201.512-1.102%202.546%200%201.132.397%202.02%201.192%202.663.794.644%202.006.966%203.635.966zm48.252-24.875c2.377%200%204.116.796%205.216%202.386%201.1%201.59%201.65%204.248%201.65%207.971v18.59c0%20.272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948%200%200%201-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042%200-1.886.403-2.535%201.207a5.452%205.452%200%200%200-1.178%202.75v19.463c0%20.271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275%200-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04%200-1.88.398-2.52%201.193a5.675%205.675%200%200%200-1.193%202.764v19.463c0%20.271-.083.49-.25.654a.864.864%200%200%201-.634.248h-4.273c-.275%200-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57%200%20.874.3.914.902l.147%202.386h.442c.943-2.619%202.898-3.928%205.864-3.928%202.849%200%204.745%201.31%205.688%203.928h.353c1.061-2.619%202.986-3.928%205.776-3.928zM162.091%2016.126c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.694-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123%2022.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47%200-.824-.162-1.06-.488l-8.592-10.002-8.592%2010.002c-.255.326-.618.488-1.089.488h-5.532c-.373%200-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47%200%20.833.172%201.088.517l7.798%209.082%207.798-9.082c.255-.325.618-.498%201.089-.517h5.473c.373%200%20.618.105.736.316.117.21.059.46-.177.747l-11.152%2012.933%2011.976%2013.795zm14.101-26.59c1.86-.801%203.86-1.201%206-1.201%202.142%200%204.113.395%205.915%201.186%201.801.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.122%202.04-.364%202.549-.242.507-.76.761-1.554.761H230.41c.329%202.285%201.385%204.106%203.167%205.463%201.782%201.357%204.01%202.036%206.684%202.036%202.693%200%205.134-.84%207.323-2.52.465-.35.882-.341%201.25.03l1.947%201.992c.465.469.465.918%200%201.347-2.984%203.008-6.713%204.511-11.189%204.511-4.572%200-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.118-6.048.746-1.885%201.764-3.516%203.052-4.892%201.288-1.377%202.852-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.203.718-5.767%202.154-1.566%201.437-2.503%203.372-2.812%205.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83%2019.894c3.133%200%205.619-1.191%207.457-3.574.348-.45.745-.527%201.19-.234l3.394%201.962c.542.332.639.733.29%201.201-1.315%202.012-3.06%203.618-5.237%204.819-2.176%201.2-4.58%201.801-7.21%201.801-4.392%200-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05%204.367-11c2.912-2.948%206.563-4.422%2010.954-4.422%202.631%200%205.04.595%207.225%201.787%202.186%201.19%203.927%202.792%205.224%204.803.328.47.232.87-.29%201.202l-3.396%201.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67%200-4.88.884-6.63%202.651-1.75%201.768-2.626%204.033-2.626%206.796s.875%205.028%202.626%206.796c1.75%201.767%203.96%202.65%206.63%202.65zm46.585-24.87c.276%200%20.499.083.666.248.168.165.252.383.252.654v27.379c0%20.271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573%200-.88-.3-.919-.901l-.237-3.953h-.652c-1.007%201.608-2.35%202.93-4.03%203.968-1.68%201.036-3.674%201.554-5.986%201.554-3.26%200-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276%200%20.499.082.666.247.168.165.252.383.252.654v15.956c0%202.403.583%204.18%201.749%205.334%201.165%201.153%202.785%201.73%204.86%201.73%201.343%200%202.573-.258%203.689-.771s1.99-1.129%202.623-1.846c.632-.717%201.116-1.4%201.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595%2024.474c.353.446.382.852.088%201.22-.882%201.047-2.172%202.001-3.868%202.863-1.697.862-3.731%201.293-6.104%201.293-8.002%200-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885%200%200%201-.647-.261.864.864%200%200%201-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255%200%20.466.078.633.233.166.154.25.368.25.639l-.02%209.285h11.943c.255%200%20.466.082.632.247.167.164.25.382.25.654v3.603a.89.89%200%200%201-.25.64.837.837%200%200%201-.632.261H345.36v11.741c0%201.337.18%202.465.544%203.386.363.92.873%201.613%201.53%202.077a6.487%206.487%200%200%200%202.059.989c.716.193%201.534.29%202.456.29%201.98%200%203.824-.668%205.53-2.005.452-.426.873-.407%201.265.058l2%202.325zm15.146-23.272c1.86-.801%203.86-1.201%206.001-1.201%202.141%200%204.112.395%205.914%201.186%201.802.791%203.293%201.86%204.475%203.208%201.182%201.347%202.097%202.905%202.746%204.672.65%201.767.974%203.637.974%205.609%200%201.191-.121%202.04-.363%202.549-.243.507-.76.761-1.555.761h-20.807c.33%202.285%201.385%204.106%203.168%205.463%201.782%201.357%204.01%202.036%206.683%202.036%202.693%200%205.134-.84%207.324-2.52.464-.35.881-.341%201.249.03l1.947%201.992c.465.469.465.918%200%201.347-2.983%203.008-6.713%204.511-11.188%204.511-4.572%200-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029%200-2.148.373-4.164%201.119-6.048.746-1.885%201.763-3.516%203.051-4.892%201.288-1.377%202.853-2.466%204.693-3.266zm5.71%203.774c-2.28%200-4.202.718-5.767%202.154-1.565%201.437-2.502%203.372-2.812%205.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z%22%20fill%3D%22%23FFF%22%2F%3E%3Cpath%20d%3D%22M102.022%2037.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87%201.87%200%200%201-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87%201.87%200%200%201%2082.511%200h26.297c1.171%200%202.312.1%203.423.303%201.11.201%202.282.615%203.514%201.24a11.807%2011.807%200%200%201%203.212%202.36c.909.949%201.646%202.23%202.211%203.844.566%201.613.849%203.47.849%205.568v23.421c.04%201.09.262%201.877.666%202.36l12.18%2014.102c.645.767.605%201.594-.122%202.481l-12.058%2013.799c-.444.484-.666%201.271-.666%202.36V95.14c0%202.622-.414%204.852-1.243%206.688-.828%201.835-1.938%203.207-3.332%204.115-1.394.908-2.787%201.553-4.18%201.937-1.394.383-2.879.575-4.454.575H82.51c-.525%200-.97-.162-1.333-.485a1.716%201.716%200%200%201-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87%201.87%200%200%201%201.333-.515H97.66c2.908%200%204.363-1.25%204.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217%200%200%200%200-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083%2053.15a1.523%201.523%200%200%201%200%202.154l-23.85%2023.849a1.523%201.523%200%200%201-2.153%200l-23.85-23.85a1.523%201.523%200%200%201%200-2.153L67.08%2029.3a1.523%201.523%200%200%201%202.154%200zm-35.937%208.585c0%201.009-.243%201.735-.728%202.18L19.26%2054.258a.217.217%200%200%200%200%20.298L32.57%2068.51c.485.484.728%201.23.728%202.24v18.337c0%202.501%201.454%203.752%204.362%203.752h15.148c.525%200%20.97.172%201.333.515.364.343.584.797.584%201.361v11.923c0%20.565-.22%201.009-.584%201.331-.363.323-.808.485-1.333.485H26.511c-1.576%200-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577%2055.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614%201.303-2.895%202.211-3.843a11.807%2011.807%200%200%201%203.212-2.36C20.805.917%2021.976.503%2023.087.302A19.123%2019.123%200%200%201%2026.511%200h26.296c.525%200%20.97.171%201.333.515.364.342.584.796.584%201.361v11.862c0%20.525-.22.959-.584%201.301a1.87%201.87%200%200%201-1.333.515H37.66c-2.908%200-4.362%201.291-4.362%203.873v18.459z%22%20fill%3D%22%234547E0%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E' alt="Execute Program"></a></li>
-    <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='data:image/svg+xml;utf8,<svg width="3311" height="1605" viewBox="400 0 3311 1605" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1133 1602C1182 1602 1191 1602 1189 1579C1153 1301 1125 1076 1098 855L1098 855C1067 601 1037 354 995 41C991 2 973 0 916 0C865 0 854 2 849 34C824 242 798 437 772 636L772 636L772 636L772 636L772 636C734 928 695 1227 653 1581C651 1602 681 1602 715 1602C721 1602 726 1602 732 1602C791 1602 809 1602 811 1579C822 1446 833 1334 847 1206C849 1185 868 1185 905 1186C908 1186 912 1186 916 1186C919 1186 922 1186 925 1186C957 1185 984 1185 986 1206C996 1272 1004 1335 1013 1399L1013 1399C1020 1456 1028 1514 1036 1574C1040 1602 1050 1602 1097 1602C1103 1602 1110 1602 1118 1602C1124 1602 1128 1602 1133 1602ZM264 1602C451 1602 528 1478 528 1334V1195C528 1175 509 1176 470 1176L470 1176C463 1176 455 1177 446 1177C405 1177 376 1177 376 1195V1330C376 1391 342 1448 264 1448C180 1448 148 1387 148 1323V265C148 212 193 143 264 143C332 143 376 217 376 267V374C376 400 403 400 443 399H443H443H443H443H443C447 399 450 399 453 399C494 399 528 397 528 374V271C528 173 453 2 264 2C86 2 0 148 0 271V1336C0 1458 86 1602 264 1602ZM968 1042C959 928 953 837 946 746C942 681 937 615 931 539C931 530 929 514 916 514C904 514 902 530 902 537C896 625 890 707 885 784L885 784C879 874 874 958 868 1039C865 1055 886 1060 918 1060C945 1060 970 1060 968 1042ZM1784 1602C1845 1602 1861 1602 1861 1565V996C1861 992 1861 988 1861 984C1861 936 1861 903 1836 852C1812 804 1767 783 1743 771C1733 766 1727 763 1727 761C1727 758 1734 754 1744 748C1768 736 1810 713 1834 669C1859 623 1859 586 1859 537V537C1859 533 1859 529 1859 525V319C1859 239 1843 146 1775 82C1706 20 1608 2 1535 2H1405C1401 2 1397 1 1393 1C1379 0 1367 -0 1353 11C1339 25 1337 50 1337 73V1570C1337 1602 1353 1602 1405 1602C1474 1602 1483 1602 1483 1565V873C1483 838 1495 838 1586 838H1586H1586L1586 838C1591 838 1597 838 1604 838C1654 838 1715 895 1715 989V1570C1715 1602 1729 1602 1774 1602C1777 1602 1780 1602 1784 1602ZM1711 537V319C1711 267 1702 228 1663 187C1638 164 1624 153 1542 153C1521 153 1501 153 1492 169C1485 182 1485 194 1485 207V635C1485 639 1485 643 1485 648V648V648V648C1484 668 1483 687 1499 699C1510 709 1524 708 1535 708C1536 708 1538 708 1540 708C1565 708 1624 701 1665 658C1711 607 1711 569 1711 537ZM2588 1557L2588 1557C2588 1555 2588 1553 2588 1551V790C2588 788 2589 784 2589 781C2591 773 2592 764 2586 763C2569 760 2496 762 2429 763C2393 764 2359 765 2337 765C2321 765 2319 786 2319 836C2319 884 2321 902 2339 902C2345 902 2352 902 2360 901C2384 900 2414 898 2426 907C2436 915 2436 926 2435 936L2435 936C2435 937 2435 938 2435 938C2435 939 2435 940 2435 941V1334C2435 1382 2412 1453 2323 1453C2232 1453 2207 1384 2207 1327V265C2207 217 2253 143 2323 143C2392 143 2435 217 2435 267C2435 283 2436 303 2436 323C2437 343 2437 363 2437 379C2437 399 2451 402 2508 402C2570 402 2588 395 2588 374V271C2588 189 2524 2 2323 2C2118 2 2059 182 2059 271V1336C2059 1442 2130 1602 2323 1602C2393 1602 2429 1567 2452 1545C2466 1531 2476 1522 2485 1528C2503 1540 2508 1560 2512 1576C2516 1589 2518 1599 2526 1599C2534 1599 2541 1601 2547 1602C2559 1605 2569 1607 2577 1599C2589 1587 2588 1572 2588 1557ZM3310 1316C3310 1464 3249 1602 3046 1602C2856 1602 2781 1464 2781 1316V281C2781 109 2897 2 3046 2C3196 2 3310 121 3310 281V1316ZM3160 281V1309C3160 1373 3137 1448 3046 1448C2943 1448 2929 1375 2929 1309V281C2929 217 2977 143 3046 143C3112 143 3160 217 3160 281Z" fill="black"/></svg>'></a></li>
-    <li><a href="https://primo.af"><img alt=primo src='data:image/svg+xml;utf8,<svg viewBox="0 0 258 66" xmlns="http://www.w3.org/2000/svg"><path d="M17.6 13.8C19.5 11.9 22.7 11.9 24.6 13.8C26.5 15.7 26.6 18.7 24.8 20.7L24.6 20.9L12.0 33.5L35.4 56.8C37.3 58.6 37.4 61.7 35.6 63.6L35.4 63.8C33.6 65.7 30.5 65.8 28.6 64.0L28.4 63.8L1.4 37.1C-0.4 35.2 -0.4 32.1 1.2 30.2L1.4 30.0L17.6 13.8Z" fill="url(%23paint0_linear)"></path><path d="M50.0 11C62.4 11 72.5 21.0 72.5 33.5C72.5 46.0 62.4 56.1 50.0 56.1C47.2 56.1 45.0 53.8 45.0 51.1C45.0 48.3 47.2 46.1 50.0 46.1C56.9 46.1 62.5 40.4 62.5 33.5C62.5 26.6 56.9 21 50.0 21C43.2 21 37.6 26.4 37.4 33.3L37.4 33.6L36.9 60.4C36.8 63.2 34.6 65.4 31.8 65.3C29.1 65.2 27.0 63.1 26.9 60.4V60.2L27.4 33.5C27.4 21.0 37.5 11 50.0 11Z" fill="%23EE4645"></path><path d="M75.3 13.8C77.2 11.9 80.3 11.9 82.2 13.6L82.4 13.8L98.6 30.0C100.4 31.9 100.5 34.9 98.7 36.9L98.6 37.0L82.4 53.2C80.4 55.1 77.3 55.1 75.3 53.2C73.4 51.3 73.4 48.3 75.2 46.3L75.3 46.1L87.9 33.5L75.3 20.9C73.4 19.0 73.4 16.0 75.2 14.0L75.3 13.8Z" fill="%23EE4645"></path><path d="M134.5 19.4C136.8 19.4 138.8 19.9 140.6 21.0C142.5 22.0 143.9 23.4 145.0 25.3C146.0 27.2 146.6 29.4 146.6 31.8C146.6 34.3 146.0 36.5 145.0 38.4C143.9 40.3 142.5 41.7 140.6 42.8C138.8 43.8 136.8 44.3 134.5 44.3C131.4 44.3 129.0 43.3 127.2 41.4V52.7H120.2V19.7H126.9V22.5C128.6 20.4 131.2 19.4 134.5 19.4ZM133.3 38.6C135.1 38.6 136.6 38 137.7 36.8C138.9 35.5 139.5 33.9 139.5 31.8C139.5 29.8 138.9 28.2 137.7 27.0C136.6 25.8 135.1 25.1 133.3 25.1C131.5 25.1 130.0 25.8 128.8 27.0C127.7 28.2 127.1 29.8 127.1 31.8C127.1 33.9 127.7 35.5 128.8 36.8C130.0 38 131.5 38.6 133.3 38.6ZM158.0 22.9C158.8 21.8 159.9 20.9 161.3 20.3C162.8 19.7 164.4 19.4 166.3 19.4V25.9C165.5 25.8 165.0 25.8 164.7 25.8C162.7 25.8 161.1 26.3 160.0 27.5C158.8 28.6 158.3 30.3 158.3 32.5V44H151.3V19.7H158.0V22.9ZM170.5 19.7H177.5V44H170.5V19.7ZM174.0 16.4C172.7 16.4 171.6 16.0 170.8 15.2C170.0 14.5 169.6 13.6 169.6 12.5C169.6 11.3 170.0 10.4 170.8 9.7C171.6 8.9 172.7 8.5 174.0 8.5C175.3 8.5 176.3 8.9 177.1 9.6C177.9 10.3 178.3 11.2 178.3 12.3C178.3 13.5 177.9 14.5 177.1 15.2C176.3 16.0 175.3 16.4 174.0 16.4ZM215.0 19.4C218.0 19.4 220.4 20.3 222.2 22.1C224.0 23.9 224.9 26.5 224.9 30.1V44H217.9V31.2C217.9 29.3 217.5 27.8 216.7 26.9C215.9 25.9 214.8 25.5 213.3 25.5C211.6 25.5 210.3 26.0 209.4 27.1C208.4 28.1 207.9 29.7 207.9 31.8V44H200.9V31.2C200.9 27.4 199.4 25.5 196.3 25.5C194.7 25.5 193.4 26.0 192.5 27.1C191.5 28.1 191.0 29.7 191.0 31.8V44H184.0V19.7H190.7V22.5C191.6 21.5 192.7 20.7 194.0 20.2C195.3 19.7 196.7 19.4 198.3 19.4C200.0 19.4 201.6 19.7 202.9 20.4C204.3 21.1 205.4 22.1 206.3 23.3C207.3 22.1 208.5 21.1 210.0 20.4C211.5 19.7 213.2 19.4 215.0 19.4ZM243.0 44.3C240.4 44.3 238.1 43.8 236.1 42.7C234.1 41.7 232.5 40.2 231.4 38.3C230.2 36.4 229.7 34.2 229.7 31.8C229.7 29.4 230.2 27.3 231.4 25.4C232.5 23.5 234.1 22.1 236.1 21.0C238.1 19.9 240.4 19.4 243.0 19.4C245.5 19.4 247.8 19.9 249.8 21.0C251.8 22.1 253.4 23.5 254.5 25.4C255.7 27.3 256.3 29.4 256.3 31.8C256.3 34.2 255.7 36.4 254.5 38.3C253.4 40.2 251.8 41.7 249.8 42.7C247.8 43.8 245.5 44.3 243.0 44.3ZM243.0 38.6C244.8 38.6 246.3 38 247.4 36.8C248.6 35.5 249.1 33.9 249.1 31.8C249.1 29.8 248.6 28.2 247.4 27.0C246.3 25.8 244.8 25.1 243.0 25.1C241.2 25.1 239.7 25.8 238.5 27.0C237.4 28.2 236.8 29.8 236.8 31.8C236.8 33.9 237.4 35.5 238.5 36.8C239.7 38 241.2 38.6 243.0 38.6Z" fill="%23343434"></path><path d="M140.6 21.0L140.4 21.4L140.4 21.4L140.6 21.0ZM145.0 25.3L144.5 25.6L144.6 25.6L145.0 25.3ZM145.0 38.4L145.4 38.7L145.4 38.7L145.0 38.4ZM140.6 42.8L140.9 43.2L140.9 43.2L140.6 42.8ZM127.2 41.4L127.6 41.0L126.7 40.1V41.4H127.2ZM127.2 52.7V53.2H127.7V52.7H127.2ZM120.2 52.7H119.7V53.2H120.2V52.7ZM120.2 19.7V19.2H119.7V19.7H120.2ZM126.9 19.7H127.4V19.2H126.9V19.7ZM126.9 22.5H126.4V23.9L127.3 22.8L126.9 22.5ZM137.7 36.8L137.3 36.4L137.3 36.4L137.7 36.8ZM137.7 27.0L137.3 27.3L137.3 27.3L137.7 27.0ZM128.8 27.0L128.5 26.6L128.5 26.6L128.8 27.0ZM128.8 36.8L128.5 37.1L128.5 37.1L128.8 36.8ZM134.5 19.9C136.7 19.9 138.6 20.4 140.4 21.4L140.9 20.5C139.0 19.4 136.8 18.9 134.5 18.9V19.9ZM140.4 21.4C142.2 22.4 143.5 23.8 144.5 25.6L145.4 25.1C144.3 23.1 142.8 21.6 140.9 20.5L140.4 21.4ZM144.6 25.6C145.6 27.3 146.1 29.4 146.1 31.8H147.1C147.1 29.3 146.5 27.0 145.4 25.1L144.6 25.6ZM146.1 31.8C146.1 34.3 145.6 36.4 144.5 38.2L145.4 38.7C146.5 36.7 147.1 34.4 147.1 31.8H146.1ZM144.6 38.2C143.5 39.9 142.2 41.3 140.4 42.3L140.9 43.2C142.8 42.1 144.3 40.6 145.4 38.7L144.6 38.2ZM140.4 42.3C138.6 43.3 136.7 43.8 134.5 43.8V44.8C136.8 44.8 139.0 44.3 140.9 43.2L140.4 42.3ZM134.5 43.8C131.5 43.8 129.2 42.9 127.6 41.0L126.8 41.7C128.7 43.8 131.3 44.8 134.5 44.8V43.8ZM126.7 41.4V52.7H127.7V41.4H126.7ZM127.2 52.2H120.2V53.2H127.2V52.2ZM120.7 52.7V19.7H119.7V52.7H120.7ZM120.2 20.2H126.9V19.2H120.2V20.2ZM126.4 19.7V22.5H127.4V19.7H126.4ZM127.3 22.8C128.9 20.9 131.3 19.9 134.5 19.9V18.9C131.1 18.9 128.4 20.0 126.5 22.2L127.3 22.8ZM133.3 39.1C135.2 39.1 136.8 38.4 138.1 37.1L137.3 36.4C136.3 37.5 135.0 38.1 133.3 38.1V39.1ZM138.1 37.1C139.3 35.8 140 34.0 140 31.8H139C139 33.8 138.4 35.3 137.3 36.4L138.1 37.1ZM140 31.8C140 29.7 139.3 27.9 138.1 26.6L137.3 27.3C138.4 28.4 139 29.9 139 31.8H140ZM138.1 26.6C136.8 25.3 135.2 24.6 133.3 24.6V25.6C135.0 25.6 136.3 26.2 137.3 27.3L138.1 26.6ZM133.3 24.6C131.4 24.6 129.7 25.3 128.5 26.6L129.2 27.3C130.3 26.2 131.6 25.6 133.3 25.6V24.6ZM128.5 26.6C127.2 28.0 126.6 29.7 126.6 31.8H127.6C127.6 29.9 128.2 28.4 129.2 27.3L128.5 26.6ZM126.6 31.8C126.6 34.0 127.2 35.7 128.5 37.1L129.2 36.4C128.2 35.3 127.6 33.8 127.6 31.8H126.6ZM128.5 37.1C129.7 38.4 131.4 39.1 133.3 39.1V38.1C131.6 38.1 130.3 37.5 129.2 36.4L128.5 37.1ZM158.0 22.9H157.5V24.5L158.4 23.2L158.0 22.9ZM161.3 20.3L161.1 19.8L161.1 19.8L161.3 20.3ZM166.3 19.4H166.8V18.9H166.3V19.4ZM166.3 25.9L166.3 26.4L166.8 26.4V25.9H166.3ZM160.0 27.5L160.3 27.8L160.3 27.8L160.0 27.5ZM158.3 44V44.5H158.8V44H158.3ZM151.3 44H150.8V44.5H151.3V44ZM151.3 19.7V19.2H150.8V19.7H151.3ZM158.0 19.7H158.5V19.2H158.0V19.7ZM158.4 23.2C159.2 22.1 160.2 21.3 161.5 20.7L161.1 19.8C159.7 20.5 158.5 21.4 157.6 22.6L158.4 23.2ZM161.5 20.7C162.9 20.2 164.5 19.9 166.3 19.9V18.9C164.4 18.9 162.7 19.2 161.1 19.8L161.5 20.7ZM165.8 19.4V25.9H166.8V19.4H165.8ZM166.3 25.4C165.6 25.3 165.0 25.3 164.7 25.3V26.3C165.0 26.3 165.5 26.3 166.3 26.4L166.3 25.4ZM164.7 25.3C162.6 25.3 160.9 25.9 159.6 27.1L160.3 27.8C161.4 26.8 162.8 26.3 164.7 26.3V25.3ZM159.6 27.1C158.4 28.4 157.8 30.2 157.8 32.5H158.8C158.8 30.3 159.3 28.8 160.3 27.8L159.6 27.1ZM157.8 32.5V44H158.8V32.5H157.8ZM158.3 43.5H151.3V44.5H158.3V43.5ZM151.8 44V19.7H150.8V44H151.8ZM151.3 20.2H158.0V19.2H151.3V20.2ZM157.5 19.7V22.9H158.5V19.7H157.5ZM170.5 19.7V19.2H170.0V19.7H170.5ZM177.5 19.7H178.0V19.2H177.5V19.7ZM177.5 44V44.5H178.0V44H177.5ZM170.5 44H170.0V44.5H170.5V44ZM170.8 15.2L170.5 15.6V15.6L170.8 15.2ZM170.8 9.7L171.2 10.0V10.0L170.8 9.7ZM177.1 9.6L176.8 10.0L177.1 9.6ZM177.1 15.2L177.5 15.6L177.5 15.6L177.1 15.2ZM170.5 20.2H177.5V19.2H170.5V20.2ZM177.0 19.7V44H178.0V19.7H177.0ZM177.5 43.5H170.5V44.5H177.5V43.5ZM171.0 44V19.7H170.0V44H171.0ZM174.0 15.9C172.8 15.9 171.9 15.5 171.2 14.9L170.5 15.6C171.4 16.5 172.6 16.9 174.0 16.9V15.9ZM171.2 14.9C170.5 14.2 170.1 13.4 170.1 12.5H169.1C169.1 13.7 169.6 14.8 170.5 15.6L171.2 14.9ZM170.1 12.5C170.1 11.5 170.5 10.7 171.2 10.0L170.5 9.3C169.6 10.1 169.1 11.2 169.1 12.5H170.1ZM171.2 10.0C171.9 9.4 172.8 9.0 174.0 9.0V8.0C172.6 8.0 171.4 8.4 170.5 9.3L171.2 10.0ZM174.0 9.0C175.2 9.0 176.1 9.4 176.8 10.0L177.5 9.2C176.5 8.4 175.4 8.0 174.0 8.0V9.0ZM176.8 10.0C177.5 10.6 177.8 11.4 177.8 12.3H178.8C178.8 11.1 178.4 10.1 177.5 9.2L176.8 10.0ZM177.8 12.3C177.8 13.4 177.5 14.2 176.8 14.9L177.5 15.6C178.4 14.7 178.8 13.6 178.8 12.3H177.8ZM176.8 14.9C176.1 15.5 175.2 15.9 174.0 15.9V16.9C175.4 16.9 176.5 16.5 177.5 15.6L176.8 14.9ZM222.2 22.1L221.8 22.4L221.9 22.4L222.2 22.1ZM224.9 44V44.5H225.4V44H224.9ZM217.9 44H217.4V44.5H217.9V44ZM216.7 26.9L216.3 27.2L216.3 27.2L216.3 27.2L216.7 26.9ZM209.4 27.1L209.7 27.4L209.8 27.4L209.4 27.1ZM207.9 44V44.5H208.4V44H207.9ZM200.9 44H200.4V44.5H200.9V44ZM192.5 27.1L192.8 27.4L192.8 27.4L192.5 27.1ZM191.0 44V44.5H191.5V44H191.0ZM184.0 44H183.5V44.5H184.0V44ZM184.0 19.7V19.2H183.5V19.7H184.0ZM190.7 19.7H191.2V19.2H190.7V19.7ZM190.7 22.5H190.2V23.9L191.1 22.9L190.7 22.5ZM194.0 20.2L193.8 19.7L193.8 19.7L194.0 20.2ZM202.9 20.4L202.7 20.9L202.7 20.9L202.9 20.4ZM206.3 23.3L205.9 23.6L206.2 24.2L206.7 23.6L206.3 23.3ZM210.0 20.4L209.8 20.0L209.8 20.0L210.0 20.4ZM215.0 19.9C217.9 19.9 220.2 20.7 221.8 22.4L222.6 21.7C220.7 19.8 218.1 18.9 215.0 18.9V19.9ZM221.9 22.4C223.5 24.1 224.4 26.6 224.4 30.1H225.4C225.4 26.4 224.5 23.6 222.6 21.7L221.9 22.4ZM224.4 30.1V44H225.4V30.1H224.4ZM224.9 43.5H217.9V44.5H224.9V43.5ZM218.4 44V31.2H217.4V44H218.4ZM218.4 31.2C218.4 29.2 218.0 27.6 217.0 26.6L216.3 27.2C217.0 28.0 217.4 29.3 217.4 31.2H218.4ZM217.1 26.6C216.2 25.5 214.9 25.0 213.3 25.0V26.0C214.6 26.0 215.6 26.4 216.3 27.2L217.1 26.6ZM213.3 25.0C211.5 25.0 210.1 25.5 209.0 26.7L209.8 27.4C210.6 26.4 211.8 26.0 213.3 26.0V25.0ZM209.0 26.7C207.9 27.9 207.4 29.6 207.4 31.8H208.4C208.4 29.8 208.9 28.3 209.7 27.4L209.0 26.7ZM207.4 31.8V44H208.4V31.8H207.4ZM207.9 43.5H200.9V44.5H207.9V43.5ZM201.4 44V31.2H200.4V44H201.4ZM201.4 31.2C201.4 29.2 201.0 27.6 200.2 26.6C199.3 25.5 198.0 25.0 196.3 25.0V26.0C197.7 26.0 198.7 26.4 199.4 27.2C200.0 28.0 200.4 29.3 200.4 31.2H201.4ZM196.3 25.0C194.6 25.0 193.2 25.5 192.1 26.7L192.8 27.4C193.7 26.4 194.8 26.0 196.3 26.0V25.0ZM192.1 26.7C191.0 27.9 190.5 29.6 190.5 31.8H191.5C191.5 29.8 192.0 28.3 192.8 27.4L192.1 26.7ZM190.5 31.8V44H191.5V31.8H190.5ZM191.0 43.5H184.0V44.5H191.0V43.5ZM184.5 44V19.7H183.5V44H184.5ZM184.0 20.2H190.7V19.2H184.0V20.2ZM190.2 19.7V22.5H191.2V19.7H190.2ZM191.1 22.9C191.9 21.9 193.0 21.2 194.2 20.7L193.8 19.7C192.4 20.3 191.3 21.1 190.3 22.2L191.1 22.9ZM194.2 20.7C195.4 20.1 196.8 19.9 198.3 19.9V18.9C196.7 18.9 195.2 19.2 193.8 19.7L194.2 20.7ZM198.3 19.9C199.9 19.9 201.4 20.2 202.7 20.9L203.2 20.0C201.7 19.2 200.1 18.9 198.3 18.9V19.9ZM202.7 20.9C204.0 21.5 205.1 22.4 205.9 23.6L206.7 23.1C205.8 21.7 204.6 20.7 203.2 20.0L202.7 20.9ZM206.7 23.6C207.6 22.5 208.8 21.5 210.2 20.9L209.8 20.0C208.2 20.7 206.9 21.7 205.9 23.0L206.7 23.6ZM210.2 20.9C211.7 20.2 213.3 19.9 215.0 19.9V18.9C213.1 18.9 211.4 19.2 209.8 20.0L210.2 20.9ZM236.1 42.7L235.9 43.2L235.9 43.2L236.1 42.7ZM231.4 38.3L230.9 38.5L231.4 38.3ZM231.4 25.4L230.9 25.2L231.4 25.4ZM236.1 21.0L236.3 21.4L236.3 21.4L236.1 21.0ZM249.8 21.0L249.6 21.4L249.6 21.4L249.8 21.0ZM254.5 25.4L255.0 25.2L254.5 25.4ZM254.5 38.3L255.0 38.5L254.5 38.3ZM249.8 42.7L250.1 43.2L250.1 43.2L249.8 42.7ZM247.4 36.8L247.0 36.4L247.0 36.4L247.4 36.8ZM247.4 27.0L247.0 27.3L247.0 27.3L247.4 27.0ZM238.5 27.0L238.9 27.3L238.9 27.3L238.5 27.0ZM238.5 36.8L238.2 37.1L238.2 37.1L238.5 36.8ZM243.0 43.8C240.5 43.8 238.3 43.3 236.3 42.3L235.9 43.2C238.0 44.3 240.4 44.8 243.0 44.8V43.8ZM236.3 42.3C234.4 41.3 232.9 39.8 231.8 38.0L230.9 38.5C232.1 40.5 233.8 42.1 235.9 43.2L236.3 42.3ZM231.8 38.0C230.7 36.2 230.2 34.2 230.2 31.8H229.2C229.2 34.3 229.8 36.6 230.9 38.5L231.8 38.0ZM230.2 31.8C230.2 29.5 230.7 27.5 231.8 25.7L230.9 25.2C229.8 27.1 229.2 29.4 229.2 31.8H230.2ZM231.8 25.7C232.9 23.9 234.4 22.5 236.3 21.4L235.9 20.6C233.8 21.6 232.1 23.2 230.9 25.2L231.8 25.7ZM236.3 21.4C238.3 20.4 240.5 19.9 243.0 19.9V18.9C240.4 18.9 238.0 19.4 235.9 20.6L236.3 21.4ZM243.0 19.9C245.5 19.9 247.7 20.4 249.6 21.4L250.1 20.6C248.0 19.4 245.6 18.9 243.0 18.9V19.9ZM249.6 21.4C251.5 22.5 253.0 23.9 254.1 25.7L255.0 25.2C253.8 23.2 252.1 21.6 250.1 20.6L249.6 21.4ZM254.1 25.7C255.2 27.5 255.8 29.5 255.8 31.8H256.8C256.8 29.4 256.2 27.1 255.0 25.2L254.1 25.7ZM255.8 31.8C255.8 34.2 255.2 36.2 254.1 38.0L255.0 38.5C256.2 36.6 256.8 34.3 256.8 31.8H255.8ZM254.1 38.0C253.0 39.8 251.5 41.3 249.6 42.3L250.1 43.2C252.1 42.1 253.8 40.5 255.0 38.5L254.1 38.0ZM249.6 42.3C247.7 43.3 245.5 43.8 243.0 43.8V44.8C245.6 44.8 248.0 44.3 250.1 43.2L249.6 42.3ZM243.0 39.1C244.9 39.1 246.5 38.4 247.8 37.1L247.0 36.4C246.0 37.5 244.7 38.1 243.0 38.1V39.1ZM247.8 37.1C249.0 35.8 249.6 34.0 249.6 31.8H248.6C248.6 33.8 248.1 35.3 247.0 36.4L247.8 37.1ZM249.6 31.8C249.6 29.7 249.0 27.9 247.7 26.6L247.0 27.3C248.1 28.4 248.6 29.9 248.6 31.8H249.6ZM247.8 26.6C246.5 25.3 244.9 24.6 243.0 24.6V25.6C244.7 25.6 246.0 26.2 247.0 27.3L247.8 26.6ZM243.0 24.6C241.1 24.6 239.4 25.3 238.2 26.6L238.9 27.3C240.0 26.2 241.3 25.6 243.0 25.6V24.6ZM238.2 26.6C236.9 27.9 236.3 29.7 236.3 31.8H237.3C237.3 29.9 237.8 28.4 238.9 27.3L238.2 26.6ZM236.3 31.8C236.3 34.0 236.9 35.8 238.2 37.1L238.9 36.4C237.8 35.3 237.3 33.8 237.3 31.8H236.3ZM238.2 37.1C239.4 38.4 241.1 39.1 243.0 39.1V38.1C241.3 38.1 240.0 37.5 238.9 36.4L238.2 37.1Z" fill="%23343434"></path><defs><linearGradient id="paint0_linear" x1="14.5" y1="41.1" x2="33.6" y2="58.5" gradientUnits="userSpaceOnUse"><stop stop-color="%23EE4645"></stop><stop offset="1" stop-color="%23810707"></stop></linearGradient></defs></svg>'></a></li>
-    <li><a href="https://www.artcompiler.com"><img class=captioned alt="" src='data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70.5 70.5"><path fill="%23fefefe" d="M64.4 114.7V79.5h70.5V150H64.4zm37.6 34.6-1.7-24.2v-.3h-1a9 9 0 0 1-1.7-.3 1079.2 1079.2 0 0 0-7.8 23.2l.8.3a35.6 35.6 0 0 0 11.4 1.3zm-18.5-7.7 3.4-1.9 1 .5a29 29 0 0 0 2.7 1.1l1.5-4.6-.7-.3a23.3 23.3 0 0 1 6.1-44.8v-2.4l-.3-2.4c0-.1-.3-.1-2 .1a27 27 0 0 0-7.2 2.3l-.9.4-3.4-1.9-3.5-1.9a38.4 38.4 0 0 0-9.1 9l-.3.5 2 3.4 2 3.4-.4 1a34 34 0 0 0-.8 1.8l-.3 1-3.9 1.2-3.8 1.1s-.3 1.2-.4 2.6a55.7 55.7 0 0 0 .4 10.7s1 .4 3.9 1.1l3.8 1 .3.8.7 1.7.3 1a432.5 432.5 0 0 1-3.9 6.7c0 .2.8 1.4 2 3a47.7 47.7 0 0 0 7.3 6.6l3.5-1.9zm21.6.3a25.8 25.8 0 0 0 6.8-2.2 1286.7 1286.7 0 0 0-7.8-15.6l-.7.1-1.3.4-.7.1v.4a1616.2 1616.2 0 0 0 1.3 17h.6l1.7-.2zm-10.5-12.4 1.8-5.5-.6-.3a10 10 0 0 1 2.3-18.9c.4 0 .6-.1.6-.2l-1-11.5h-1A21.8 21.8 0 0 0 79.7 122a22.3 22.3 0 0 0 13 13c.1 0 1-2.4 2-5.4zm17.4 4.7 2.6-1.8c1-.8 2.4-2.2 2.4-2.4l-3.6-3.2-4.8-4-1.2-1-.6.4a14.3 14.3 0 0 1-1.6 1.3 391 391 0 0 0 5.8 11.3l1-.6zm12.5-.7a31.1 31.1 0 0 0 4.7-8.8 337.7 337.7 0 0 0-19.6-6.3l-.4.6-.7 1.2-.4.6.3.2a2416.5 2416.5 0 0 1 15.5 13l.5-.5zm-22.7-10a8.6 8.6 0 0 0 4.6-2.5 8.6 8.6 0 0 0 2.6-6.3c0-1.2 0-1.5-.2-2.2-.4-1.6-1.1-2.9-2.2-4a8.9 8.9 0 0 0-8.7-2.6 9 9 0 0 0 4 17.6zm24.9-1.3a29.8 29.8 0 0 0 1-9c-.1-.1-2.5 0-8.6.5l-8.6.8h-.3v.8l-.2 1.4-.1.5 1 .3 15.6 5 .2-.4zm-4.7-9.8 12.1-1h.4v-.6a36.7 36.7 0 0 0-3.4-11.3l-21.6 11.1.2.8.3 1.4.2.6 11.8-1zm-6.5-6.2 4.6-2.4-1.2-2c-.8-1.1-1.8-2.4-2.8-3.3l-.8-.8-4 4.7-4 4.8c-.1.1-.1.2.4.8l.9 1.1.3.5 1-.5 5.6-2.9zm-3-7.1 6.7-7.8.3-.4-.8-.7a31 31 0 0 0-8.6-4.5l-6.3 19.5.8.4a11.1 11.1 0 0 1 1.6 1l6.4-7.5zm-6.1-5.8 3.6-11.6-1.4-.4a40.4 40.4 0 0 0-10.7-1l2 24.2h.7l1.2.2.7.1c.2 0 .6-1.2 3.9-11.5z" transform="translate(-64.4 -79.5)"/><path fill="%23efd1cf" d="M102.7 141.2v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm0-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm14.4-.5.6-.5-.5.5-.6.6.5-.6zm-14.4-.6v-.1.2zm-.1-1.1v-.1.2zm-.1-1.1v-.1.2zm0-1.1v-.1.2zm-.2-1.1v-.1.2zm-.4-2.2h.1-.1zm4.7-1.9v-.1c.2-.1.2-.1.1 0l-.2.1zm-12.1-.6-.4-.5.4.4.4.5-.4-.4zm33.9-3.8s0-.1 0 0v.1-.1zm0-1.2c0-.1.1-.1.1 0v.2-.2zm-49.2-.3s0-.1 0 0v.2-.1zm12.6-1.1v-.2.4-.2zm20.2-.3h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-42-.3c0-.1 0-.2.1-.1v.2-.1zm43 .1h.2-.1c-.1 0-.1 0 0 0zm6.3-.1v-.1.2-.1zm-5.3 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm-12.7-.1h.1-.1zm13.8 0h.1-.1zm-12.8 0c0-.1.1-.1.2 0h-.2v-.1zm13.8 0c0-.1.1-.1.2 0h-.2v-.1zm-12.8-.2h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.8 0h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.7-.1h.1-.1s-.1 0 0 0zm1-.1h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-23-4.6.4-.4-.4.4-.4.4s0-.2.3-.4zm14-.2c-.1-.2-.1-.2 0 0h.2c0 .1 0 .1-.2 0zm-2-.4.2.2-.1-.1zm2.1-1.2.1-.1c.2-.1.2-.1 0 0l-.1.1zm-6.8-.8h.2-.1c-.1 0-.1 0 0 0zm7.7-.3.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zm-8.6-.8h.4-.4zm9.6-.3.1-.1c.1-.1.1-.1 0 0 0 .2-.1.2-.1.1zm-11.1-.1v-.1.2-.1zm1-.6c0-.1.1-.1.1 0zm11-.4.1-.1c.2-.1.2-.1 0 0 0 .2-.1.2-.1.1zm-11-.6v-.1.2-.1zm12-.4v-.2h.1l-.2.2zm-12-.7v.2-.2zm12.9-.4.1-.2c.1 0 .1 0 0 0l-.1.2zm-13-.6v.1zm-1.2-.5v.1zm15.1 0 .1-.2c.2 0 .2 0 0 0l-.1.2zm-28.7-.6.3-.3-.2.3a2 2 0 0 1-.4.3l.3-.3zm32.3.2-.2-.2.2.1.2.2-.2-.2zm-18.8-.8c0-.1 0-.1 0 0v.1-.1zm-15.3 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm31.4-.2.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zM98.1 98c0-.1 0-.1 0 0zm-14-.1.2-.2-.2.2-.1.1v-.1zm13.9-1v.2-.1zm0-1v.2-.1zm1-.5c0-.1 0-.1 0 0zm0-1c0-.1 0-.2 0 0zm-.1-1v-.1.2-.2zm-1.3-.2h.1-.1zm1.2-.9v.2-.2zM74 91h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm2-1.9V89c.2-.1.2-.1.1 0l-.2.1zm22.2-2v.2-.1zm0-1v.2-.2zm-.1-1v.1zm-.1-1v.1zm4.5-3.7h.2-.1c-.1 0-.1 0 0 0zm-3.7 0h.5-.4zm1.9 0c.1-.1.3-.1.4 0h-.4z" transform="translate(-64.4 -79.5)"/><path fill="%23eac1b8" d="M98.3 149.3h.2-.2zm3.4 0h.2-.2zm-4.7-.1h.2-.1c-.1 0-.1 0 0 0zm4.9-.4c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.1v-.1.2-.1zm-.1-1.2c0-.1 0-.1 0 0zm1.3-.9v.1zm-1.4-.3s0-.1 0 0v.1-.1zm1.3-.8v.2-.2zm-1.4-.4v.1zm1.3-.6v-.1.2-.1zm-1.4-.5v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.6c0-.1 0-.1 0 0zm-1.3-.6c0-.1 0-.1 0 0zm1.2-.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm-1.3-.7s0-.1 0 0v.1-.1zm1.3-.4c0-.1 0-.1 0 0zm-1.4-.8v.1zm1.3-.3c0-.1 0-.1 0 0v.1-.1zm-1.4-.8v-.1.2-.1zm1.3-.3s0-.1 0 0v.1-.1zm-1.4-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.3 0v-.1.1zm-1.3-1.2s0-.1 0 0v.1zm1.2 0s0-.1 0 0c.1 0 .1 0 0 .1zm0-1v-.1.1zm-1.3-.2v.1zm-15.3-.3c0-.1 0-.1 0 0l.2.1-.2-.1zm16.5-.7v.1zm-1.3-.1c0-.1 0-.1 0 0zm-16.5-.6c-.1 0-.1 0 0 0l.2.2-.2-.2zm17.7-.4v.2-.2zm-1.3-.2c0-.1 0-.1 0 0v.1-.1zm1.2-.8v-.1.2-.1zm-1.3-.4c.1 0 .1.1 0 .1zm1.2-.7c0-.1 0-.1 0 0zm-1.3-.5c.1 0 .1.1 0 .2v-.2zm1.2-.6c0-.1 0-.1 0 0zm-1.2-.5-.4-.2h-.3.3l.4.1v.2-.1zm-1-1.4c.1 0 0 0 0 0-.1 0-.1 0 0 0zm-6.3-2a2 2 0 0 1-.3-.3l.4.4.3.4-.4-.4zm-28-4v.2-.1zm62.5-.8c.1 0 .1.1 0 .1zm-62.6-.4s0-.1 0 0v.2-.1zm11.8-.3s0-.1 0 0c.1 0 .1 0 0 .1zm51-.8v-.2.5-.3zm-18.7-.3v-.1.2-.1zm1.2-.3v-.2.4-.2zm.2-.4h.2-.2zm1 0h.2-.1c-.1 0-.2 0 0 0zm-2.4-.3v-.1.3-.2zm3.4.1h.2-.1c-.1 0-.1 0 0 0zm15.2-.3v-.1.4-.3zm-14.2.3h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm-46.8-.2s0-.1 0 0v.1-.1zm47.9 0h.1l-.1.1s-.1 0 0 0zm1 0h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-61.8-.4s0-.1 0 0v.1zm0-1.1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm32.5-23.1v-.1.2-.1zm0-1v-.1.2-.2z" transform="translate(-64.4 -79.5)"/><path fill="%23e0a39d" d="M98.7 149.3h.4-.4zm2.5 0h.3H101.2zm-4-.1h.3-.2zm4.7-.1v-.1.2-.1zm0-1.2v-.1.2-.1zm-.2-1.2c0-.1 0-.2 0 0v.1zm0-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm-.1-1.2v.1zm-.1-1.2v.1zm1.4-.1c0-.1 0-.1 0 0zm-1.5-1c0-.1 0-.1 0 0zm1.4-.1c0-.1 0-.1 0 0v.1-.1zm-1.5-1.1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.4 0c0-.1 0-.1 0 0v.1-.1zm0-1.1c0-.1 0-.1 0 0v.1-.1zm-1.4 0v-.1.1zm1.2-1.1s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-1.3-.2v.1zm1.2-.9s0-.1.1 0v.1zm-1.3-.2c0-.1 0-.2 0 0zm1.3-.9v.1zm-1.4-.3c0-.1 0-.1 0 0v.1-.1zm1.3-.8v.1zm-1.4-.4v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.7v.1zm-1.3-.5v-.1.2zm1.2-.6c.1 0 .1.1 0 .2v-.2zm-18.5-.6-.2-.3.2.3.3.2-.3-.2zm17.2 0s0-.1 0 0v.1zm1.2-.4c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm-17.2-.9-.5-.6.6.6.5.5-.5-.5zm15.9 0v.2-.1zm1.3-.2c0-.1 0-.2 0 0zm-1.4-.9v.1zm1.3-.2c0-.1 0-.1 0 0zm-1.4-1c.1 0 .1.1 0 .1zm1.3-.1c0-.1 0-.1 0 0zm-1.4-1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm1.3-.1c0-.1 0-.1 0 0v.1-.1zm-1.3-1.1c0-.1 0-.1 0 0v.1-.1zm1.2 0c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-2.2-.4h.2-.2zm.2-1.2h.2-.2zm1 0h.3-.2zm6.7-1.7.1-.1c.2-.1.2-.1 0 0l-.1.1zm-.8-.9.5-.4-.4.4-.4.4zm-41.3-2.5c.1 0 .1.1 0 .1zm0-1v.2-.1zm62.5-.8v.2-.2zm-50.8-.1c0-.1 0-.1 0 0v.1-.1zm-11.8-.3v-.1.2-.1zm26.1-.8s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-12.6-.3v-.2.4-.2zm31.8.1v.1zm-20.3-.7v-.3.6-.3zm37.7.1v-.1.4-.3zm-18.6 0v-.2.3-.1zm1.6-.2h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm-33.3-.4v-.2.4-.2zm34.4.3h.1-.1zm1 0h.1-.1zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.2 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-25.7-.2v.1zm26.7.1h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.2h.2-.1zm1 0h.2-.1zm1-.1h.2-.1zm-56.9-.3v-.1.3-.2zm58 .2h.2-.2zm1 0c0-.1.1-.1.2 0h-.1c-.1 0-.1 0 0 0zm-13.5-.2h.1-.1zm14.5 0h.2-.1c-.1 0-.1 0 0 0zm-13.5 0h.2-.2zm14.6 0h.1-.1s-.1 0 0 0zm-13.6-.1h.2-.1c-.1 0-.1 0 0 0zm14.6 0h.1-.1zm-50.2-.2v.1zm36.6 0h.2l-.1.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1s-.1 0 0 0zm1 0h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-27.3-3a2 2 0 0 1-.3-.4l.4.4.3.3-.4-.3zm1-.8c-.3-.2-.3-.2-.1-.4.1 0 .1 0 0 0l.1.4.2.3-.2-.3zm.3-.8v-.2h.1c0 .2-.2.2-.2.2zm-8.3-1h.2-.2zm1.1 0h.2-.2zm8-.1.2-.2c.2 0 .2 0 0 0l-.1.2zm-7.8-1.2h.2-.2zm8.8 0h.2c0-.2 0-.2 0 0-.1.1-.2.1-.2 0zm-10.9-.1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0zm12 0c.2-.2.2-.2.1 0-.1.1-.2.1-.2 0zm-10.8-.1s0-.1 0 0v.1-.1zm-1.3-1c.1 0 .1.1 0 .2v-.1zm1.2 0c0-.1 0-.1 0 0v.1-.1zm11.8 0h.1c.1-.2.1-.2 0 0 0 .1-.1.2-.1 0zm-13-1v.2-.1zm13.9 0 .1-.1c.2-.1.2-.1 0 0l-.1.1zm-14-1.3c0-.1 0-.2.1-.1v.2-.2zm1.2-.2c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm13.8 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm-13.9-1c0-.1 0-.1.1 0zm16.8-.6-.7-.7.7.7zm-2 .5.2-.2c.1 0 .1 0 0 0l-.1.2zm-14.8-1v.2-.2zm-15-.4.1-.2c.1 0 .1 0 0 0l-.1.2zM98 97v.1zm1.2 0V97v.2-.2zm-1.3-1s0-.1 0 0v.1zm1.2 0V96v.1zm-1.3-1s0-.1 0 0v.1-.1zm1.2 0V95v.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0V94v.1zm-1.4-3.2v.1zm1.2 0v-.1.2-.1zm-24.2-.4.3-.2-.2.2-.2.2.1-.2zm22.9-.6v.1zm1.2 0v-.1.2-.2zm-22.9-.6.3-.2-.2.2-.2.2.1-.2zm21.6-.4s0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm0-1.1s0-.1 0 0v.1-.1zm-.2-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-.2-3.1c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zm4.5-.4h.2-.2zm-2.5 0h.6-.6z" transform="translate(-64.4 -79.5)"/><path fill="%23d6836c" d="m102.8 142.2-1.3-17v-.4l.4-.1 1.2-.3.9-.3a174 174 0 0 1 7.9 15.6 29.9 29.9 0 0 1-9.1 2.5zM76 140.4l-.1-.2.1.2.2.2-.2-.2zm-1.7-1.7c-.1-.1-.1-.1 0 0 .2 0 .2.1.1.1l-.1-.1zm9.6-7-.2-.3.3.2.2.3-.3-.2zm31.7-.2.1-.2v.2l-.3.1.2-.1zm-32.6-.7-.1-.2.2.2.1.2-.2-.2zm33.8-.5.1-.2c.1 0 .1 0 0 0l-.1.2zM99 123.6a9 9 0 0 1-7.8-6.9 9 9 0 0 1 4.9-10.1 9 9 0 0 1 11.3 13.1 9.3 9.3 0 0 1-8.4 3.9zm19-3.8-8.1-2.5v-.6a13 13 0 0 0 .3-2.1l16.8-1.4h.5v1.5a26.9 26.9 0 0 1-1.2 7.7l-8.3-2.5zm-11.2 2.4.2-.2-.1.2-.2.1.1-.1zm-28.5-5.7c0-.1 0-.1 0 0 .1 0 .1 0 0 0zm11.6-1.2c0-.1 0-.1 0 0zm-11.6-.6v-.2.3-.1zM90 114v-.1.2-.1zm20.1-.7v-.1h.1v.1zm1 0h.2-.2zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-35.7-.2c0-.1 0-.1 0 0zm36.7 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm-19.7-2.7-.9-1.1c-.4-.6-.5-.6-.4-.8.1 0 2-2.2 4-4.8l4-4.6 1 1a22.8 22.8 0 0 1 3.7 5l-11 5.7c-.1 0-.3-.1-.4-.4zm-16-1.3.3-.3.3-.2-.2.2-.3.3zm7.2-3.8v.1zm-1.3-.4s0-.1 0 0v.1zm1.2-.6v.1zm-1.3-.4s0-.1 0 0v.1-.1zm1.2-.6s0-.1 0 0v.1zm0-1s0-.1 0 0v.1-.1zM84 99.9l.2-.2v.2l-.3.1.1-.1zm14-.5s0-.1.1 0v.1-.1zm-12.9-.6.2-.2v.2l-.3.1.1-.1zm12.9-.4c0-.1 0-.1 0 0v.1-.1zm1.1-.6s0-.1.1 0v.1-.1zm-1.2-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0v.1-.1zm-1.3-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.4c0-.1 0-.2 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.5v.2-.2zm1.2-.5c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zM75.1 90l.4-.4-.3.4-.4.3zm23.5-.4c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm0-1v-.1.2-.2zm-.1-1v-.1.1zm-.1-1v-.1.1zm-.2-3.2h.2c.2-.1.2 0 0 0H98c0 .1 0 .1 0 0zm5.3 0h.1-.1zm-1.2 0c0-.1.1-.1.2 0h-.2z" transform="translate(-64.4 -79.5)"/><path fill="%23c85d4b" d="M99.6 149.3zm-2-.1h.1-.1s-.1 0 0 0zm4.2-1c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm0-1.2v.1zm7.2-6-2.9-5.5.5-.4 1-.8.6-.5.2.2a1242.5 1242.5 0 0 0 9.2 7.7l.3.3-.9.8a24.8 24.8 0 0 1-5.2 3.9l-2.8-5.6zm-7.4 4.8c.1 0 .1.1 0 .1zm0-1.1c0-.1 0-.2 0 0zm-.1-1.2c0-.1 0-.1 0 0zm-15-.8c-.1-.1-.1-.1 0 0l.1.1h-.1zm14.9-.4s0-.1 0 0v.1zm-.1-1.2v.1zm-16.6-.2c-.1 0-.1 0 0 0 .2.1.2.2.1.2l-.1-.1zm16.5-1v.2-.2zm0-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zM65 117.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm0-2v-.3.6-.3zm11.7-.6v-.5a15.7 15.7 0 0 1 0 .5zm-11.7-.6v-.3.6-.3zm0-2c.1 0 .1.1 0 .1zm28.2-5h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm-8.5-8 .4-.3-.4.4-.4.3zm12.8-8.1c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0z" transform="translate(-64.4 -79.5)"/><path fill="%23c5523e" d="m75.2 139.6-.7-.7.7.6.7.8-.7-.7zm16.6-5A22 22 0 0 1 79 119.9c-.6-2.2-.8-5.2-.6-7.4.5-4.9 2.6-9.3 6-12.9a21.3 21.3 0 0 1 13.1-6.4l1 11.1c0 .3 0 .3-.7.5a10 10 0 0 0-2.2 18.9l.6.3-3.6 11-1-.5zm-7.5-2.6c-.1-.1-.1-.1 0 0l.1.1-.1-.1zm-1.6-1.5c0-.2 0-.2 0 0h.2c0 .1 0 .1-.2 0zm27.4-17.4c-.1-.9-.3-1.5-.5-2l-.2-.4 10.8-5.6 10.9-5.5a30.3 30.3 0 0 1 2.8 8.3l.5 3.2v.2l-12 1-12.2 1v-.2zm-8-8.4-1.3-.2h-1v-.5L98 80.4h2.3a29 29 0 0 1 9.6 1.3l-3.4 11-3.7 11.5-.2.6zm-18.6-6.5.4-.3-.4.4-.4.3z" transform="translate(-64.4 -79.5)"/><path fill="%23b4111a" d="M97 149.1a39 39 0 0 1-7.2-1.4l3.8-11.6 3.9-11.6.5.2 1.3.1c.7 0 .9.1.9.2a5523.8 5523.8 0 0 0 1.7 24c0 .2-.2.2-2 .2H97zM79 143a37.9 37.9 0 0 1-7.7-8c-.5-.7-.6-.8-.5-1a155.3 155.3 0 0 1 3.8-6.8l-.4-1a38.9 38.9 0 0 1-1-2.4l-3.6-1-3.7-1h-.3l-.2-1.2a32.9 32.9 0 0 1 0-10.9l.1-1.2.6-.2a395.4 395.4 0 0 1 7-2l.5-1 .8-2 .4-1-2-3.4-2-3.4.5-.7A35.8 35.8 0 0 1 80 86l3.6 1.9 3.5 2 .8-.5a28.5 28.5 0 0 1 9.2-2.5 33.8 33.8 0 0 1 .4 4.4c0 .4 0 .4-.3.4l-3 .5a23.4 23.4 0 0 0-2.2 44.6l-1.5 4.5-2.8-1.1-.8-.4-3.5 1.9c-1.9 1-3.4 1.9-3.4 2l-1-.7zm37.2-15.3-7.8-6.6-.2-.2.4-.5.6-1.2.3-.6 19.6 6.2a27 27 0 0 1-5.1 9.3l-7.8-6.4zm-10.5-21.4-1.9-1a1150.6 1150.6 0 0 1 6.4-19.4 28.3 28.3 0 0 1 9 4.8l.2.3-6.6 7.7a866 866 0 0 1-6.6 7.9l-.5-.3z" transform="translate(-64.4 -79.5)"/></svg>'> ARTCOMPILER</a></li>
-    <li><a href="https://www.prisma.io"><img alt="Prisma" src='data:image/svg+xml;utf8,<svg width="90" height="29" viewBox="0 0 90 29" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M0.2 19.5C-0.0 19.0 -0.0 18.5 0.1 18.0L10.3 1.5C10.8 0.6 12.2 0.7 12.7 1.6L21.9 21.7C22.3 22.5 21.9 23.3 21.1 23.6L6.7 27.9C6.1 28.1 5.5 27.8 5.1 27.3L0.2 19.5ZM11.4 6.3C11.5 5.9 12.2 5.8 12.4 6.2L18.8 21.0C18.9 21.3 18.8 21.6 18.5 21.7L8.5 24.7C8.2 24.8 7.8 24.5 7.9 24.1L11.4 6.3ZM48.4 21.6H51.3V11.2H48.4V21.6ZM48.3 8.5C48.3 7.6 48.8 7.2 49.9 7.2C50.9 7.2 51.4 7.6 51.4 8.5C51.4 9.0 51.3 9.3 51.0 9.6C50.8 9.8 50.4 9.9 49.9 9.9C48.8 9.9 48.3 9.5 48.3 8.5ZM87.1 16.8L86.0 16.8C85.2 16.8 84.6 17.0 84.2 17.3C83.8 17.5 83.6 18.0 83.6 18.5C83.6 19.3 84.0 19.7 85.0 19.7C85.6 19.7 86.1 19.5 86.5 19.1C86.9 18.8 87.1 18.3 87.1 17.6V16.8ZM88.0 21.6L87.4 20.2H87.3C86.9 20.8 86.4 21.2 85.9 21.4C85.4 21.7 84.7 21.8 83.9 21.8C82.9 21.8 82.1 21.5 81.5 20.9C81.0 20.4 80.7 19.5 80.7 18.5C80.7 17.4 81.1 16.6 81.8 16.1C82.6 15.5 83.8 15.2 85.3 15.2L87.1 15.1V14.7C87.1 13.6 86.6 13.1 85.5 13.1C84.7 13.1 83.7 13.4 82.6 13.9L81.7 11.9C82.8 11.3 84.2 11.0 85.6 11.0C87.0 11.0 88.1 11.3 88.8 11.9C89.6 12.5 89.9 13.4 89.9 14.7V21.6H88.0ZM72.4 21.6H69.6V15.5C69.6 14.8 69.5 14.2 69.2 13.9C69.0 13.5 68.6 13.3 68.0 13.3C67.3 13.3 66.8 13.6 66.5 14.1C66.1 14.6 66.0 15.5 66.0 16.7V21.6H63.1V11.2H65.3L65.7 12.5H65.8C66.1 12.1 66.5 11.7 67.1 11.4C67.6 11.2 68.2 11.0 68.9 11.0C70.4 11.0 71.5 11.5 72.0 12.5H72.3C72.5 12.1 73.0 11.7 73.5 11.4C74.0 11.2 74.6 11.0 75.3 11.0C76.5 11.0 77.4 11.3 78.0 11.9C78.6 12.5 78.9 13.5 78.9 14.8V21.6H76.1V15.5C76.1 14.8 75.9 14.2 75.7 13.9C75.4 13.5 75.0 13.3 74.5 13.3C73.8 13.3 73.3 13.5 72.9 14.0C72.6 14.5 72.4 15.3 72.4 16.4V21.6ZM60.1 20.9C60.9 20.4 61.2 19.6 61.2 18.5C61.2 18.0 61.1 17.6 61.0 17.2C60.8 16.8 60.5 16.5 60.1 16.2C59.7 15.9 59.2 15.6 58.3 15.3C57.4 14.9 56.8 14.6 56.6 14.5C56.3 14.3 56.2 14.1 56.2 13.8C56.2 13.3 56.6 13.1 57.4 13.1C57.9 13.1 58.4 13.2 58.8 13.3C59.3 13.5 59.7 13.7 60.3 13.9L61.1 11.8C59.9 11.3 58.7 11.0 57.5 11.0C56.2 11.0 55.2 11.3 54.4 11.8C53.7 12.3 53.4 13.0 53.4 13.9C53.4 14.5 53.5 14.9 53.6 15.3C53.8 15.6 54.1 16.0 54.4 16.3C54.8 16.5 55.4 16.9 56.2 17.2C56.8 17.4 57.2 17.6 57.5 17.8C57.9 18.0 58.1 18.1 58.2 18.3C58.4 18.4 58.4 18.6 58.4 18.8C58.4 19.4 57.9 19.7 56.9 19.7C56.4 19.7 55.8 19.6 55.2 19.5C54.5 19.3 53.9 19.1 53.4 18.8V21.2C53.8 21.4 54.3 21.5 54.9 21.6C55.4 21.7 56.1 21.8 56.8 21.8C58.3 21.8 59.4 21.5 60.1 20.9ZM46.9 11.1C46.7 11.1 46.4 11.0 46.0 11.0C45.3 11.0 44.8 11.2 44.2 11.6C43.7 11.9 43.2 12.4 42.9 13.0H42.8L42.3 11.2H40.2V21.6H43.0V16.3C43.0 15.5 43.3 14.8 43.8 14.4C44.3 13.9 45.0 13.7 45.9 13.7C46.2 13.7 46.5 13.7 46.7 13.8L46.9 11.1ZM31.9 14.4H32.8C33.7 14.4 34.4 14.2 34.8 13.9C35.3 13.5 35.5 13.0 35.5 12.4C35.5 11.7 35.3 11.2 34.9 10.9C34.6 10.5 34.0 10.4 33.2 10.4H31.9V14.4ZM38.4 12.3C38.4 13.7 37.9 14.8 37.0 15.6C36.1 16.4 34.8 16.8 33.1 16.8H31.9V21.6H29.0V8.0H33.3C35.0 8.0 36.2 8.4 37.1 9.1C37.9 9.8 38.4 10.9 38.4 12.3Z" fill="black"></path></svg>'></a>
+    <li><a href="http://observablehq.com/"><img alt="Observable" src='doc/logos/observable.svg' loading=lazy></a></li>
+    <li><a href="https://holmusk.com"><img class=captioned alt="" src='doc/logos/holmusk.svg' loading=lazy>Holmusk</a></li>
+    <li><a href="https://codepen.io/"><img style="margin: 16px 0" src='doc/logos/codepen.svg' loading=lazy alt="CodePen"></a></li>
+    <li><a href="https://4me.com"><img style="width: auto" src='doc/logos/4me.svg' loading=lazy alt="4me"></a></li>
+    <li><a href="https://www.jetbrains.com/"><img src="doc/logos/jetbrains.svg" loading=lazy alt="JetBrains"></a>
+    <li><a href="https://www.desmos.com/"><img src='doc/logos/desmos.svg' loading=lazy alt=desmos></a></li>
+    <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='doc/logos/executeprogram.svg' loading=lazy alt="Execute Program"></a></li>
+    <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='doc/logos/cargo.svg' loading=lazy></a></li>
+    <li><a href="https://primo.af"><img alt=primo src='doc/logos/primo.svg' loading=lazy></a></li>
+    <li><a href="https://www.artcompiler.com"><img class=captioned alt="" src='doc/logos/artcompiler.svg' loading=lazy> ARTCOMPILER</a></li>
+    <li><a href="https://www.prisma.io"><img alt="Prisma" src='doc/logos/prisma.svg' loading=lazy></a>
+    <li><a href="https://anvil.works/"><img alt="Anvil" src='doc/logos/anvil.png' loading=lazy></a>
   </ul>
 </section>
 

From d60fff6750cd4963ebfd83d446d5bd3ad6b083a3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Dec 2021 11:11:56 +0100
Subject: [PATCH 4586/4742] Mark release 5.65.0

---
 AUTHORS           |  1 +
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  7 +++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 3da7e5adbb..c03dcb6793 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -477,6 +477,7 @@ Kazuhisa Ishizaka
 Kazuhito Hokamura
 kcwiakala
 Kees de Kooter
+Keldan Chapman
 Kenan Christian Dimas
 Ken Newman
 ken restivo
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 619a859801..53149bc99a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.65.0 (2021-12-20)
+
+### Bug fixes
+
+brace-folding addon: Fix broken folding on lines with both braces and square brackets.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Support g0, g$, g<Arrow>.
+
 ## 5.64.0 (2021-11-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index e89543e438..d5490951d8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.64.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.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 55d6d73a33..c154f8f3da 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,13 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-12-2021: <a href="https://codemirror.net/codemirror-5.65.0.zip">Version 5.65.0</a>:</p>
+
+  <ul class="rel-note">
+    <li>brace-folding addon: Fix broken folding on lines with both braces and square brackets.</li>
+    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support g0, g$, g&lt;Arrow&gt;.</li>
+  </ul>
+
   <p class="rel">20-11-2021: <a href="https://codemirror.net/codemirror-5.64.0.zip">Version 5.64.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 9edd007cbc..cdbae000d9 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.64.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.0</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 7c38a7fc7f..8c659564a1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.64.0",
+  "version": "5.65.0",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 85ef103211..5682abede6 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.64.0"
+CodeMirror.version = "5.65.0"

From 7b2f2ce869f71481c758013a3aa54aa5520d53e2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 21 Dec 2021 08:41:08 +0100
Subject: [PATCH 4587/4742] [sql mode] Highlight types as types, client
 commands as builtins

Closes https://github.com/codemirror/CodeMirror/issues/6852
---
 mode/sql/sql.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 7b9014b7d9..cd8b757bb6 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -122,9 +122,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       if (dateSQL.hasOwnProperty(word) && (stream.match(/^( )+'[^']*'/) || stream.match(/^( )+"[^"]*"/)))
         return "number";
       if (atoms.hasOwnProperty(word)) return "atom";
-      if (builtin.hasOwnProperty(word)) return "builtin";
+      if (builtin.hasOwnProperty(word)) return "type";
       if (keywords.hasOwnProperty(word)) return "keyword";
-      if (client.hasOwnProperty(word)) return "string-2";
+      if (client.hasOwnProperty(word)) return "builtin";
       return null;
     }
   }

From 0d48b56e73a5865ac3c6953e7f12fbd00b2d0ab2 Mon Sep 17 00:00:00 2001
From: Tim Nguyen <nt1m@users.noreply.github.com>
Date: Fri, 24 Dec 2021 09:35:07 +0100
Subject: [PATCH 4588/4742] [css and stylus modes] Add conic-gradient keywords

---
 mode/css/css.js       | 6 +++---
 mode/stylus/stylus.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 880b58ef7a..503c48c261 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -637,7 +637,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
     "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
-    "compact", "condensed", "contain", "content", "contents",
+    "compact", "condensed", "conic-gradient", "contain", "content", "contents",
     "content-box", "context-menu", "continuous", "contrast", "copy", "counter", "counters", "cover", "crop",
     "cross", "crosshair", "cubic-bezier", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "dense", "destination-atop",
@@ -687,8 +687,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
     "progress", "push-button", "radial-gradient", "radio", "read-only",
     "read-write", "read-write-plaintext-only", "rectangle", "region",
-    "relative", "repeat", "repeating-linear-gradient",
-    "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
+    "relative", "repeat", "repeating-linear-gradient", "repeating-radial-gradient",
+    "repeating-conic-gradient", "repeat-x", "repeat-y", "reset", "reverse",
     "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
     "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
     "s-resize", "sans-serif", "saturate", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 730a8c51ca..978696bddd 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -742,7 +742,7 @@
   var nonStandardPropertyKeywords_ = ["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"];
   var fontProperties_ = ["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"];
   var colorKeywords_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
-  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","high","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","standard","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around", "unset"];
+  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","conic-gradient","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","high","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeating-conic-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","standard","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around", "unset"];
 
   var wordOperatorKeywords_ = ["in","and","or","not","is not","is a","is","isnt","defined","if unless"],
       blockKeywords_ = ["for","if","else","unless", "from", "to"],

From 3e5b5e90cbe9f1ab83af0ccd9ae6826cd554a76b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 27 Dec 2021 15:06:22 +0100
Subject: [PATCH 4589/4742] [javascript mode] Fix bad context tracking for
 brackets at end of line

Closes https://github.com/codemirror/CodeMirror/issues/6853
---
 mode/javascript/javascript.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 95cbbd8533..7cfee313a3 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -330,6 +330,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     cx.state.context = new Context(cx.state.context, cx.state.localVars, true)
     cx.state.localVars = null
   }
+  pushcontext.lex = pushblockcontext.lex = true
   function popcontext() {
     cx.state.localVars = cx.state.context.vars
     cx.state.context = cx.state.context.prev

From 8d3bac4de3914eeca1c8cbe86fac36e62e53048a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 30 Dec 2021 18:38:38 +0100
Subject: [PATCH 4590/4742] [lint demo] Upgrade jshint

Issue https://github.com/codemirror/CodeMirror/issues/6857
---
 demo/lint.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/lint.html b/demo/lint.html
index 1184232d43..a479cdd30a 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -9,7 +9,7 @@
 <script src="../lib/codemirror.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/css/css.js"></script>
-<script src="https://unpkg.com/jshint@2.9.6/dist/jshint.js"></script>
+<script src="https://unpkg.com/jshint@2.13.2/dist/jshint.js"></script>
 <script src="https://unpkg.com/jsonlint@1.6.3/web/jsonlint.js"></script>
 <script src="https://unpkg.com/csslint@1.0.5/dist/csslint.js"></script>
 <script src="../addon/lint/lint.js"></script>
@@ -150,7 +150,7 @@ <h2>Linter Demo</h2>
     lineNumbers: true,
     mode: "javascript",
     gutters: ["CodeMirror-lint-markers"],
-    lint: true
+    lint: {options: {esversion: 2021}},
   });
 
   var editor_json = CodeMirror.fromTextArea(document.getElementById("code-json"), {

From ec9a1081785bd6b0d0e6f25514b1f07bd44d7880 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 1 Jan 2022 18:52:36 +0100
Subject: [PATCH 4591/4742] Add a z-index to CodeMirror-scroll to optimize
 drawing

Issue https://github.com/codemirror/CodeMirror/issues/6859
---
 lib/codemirror.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index d85fbc930b..f4d5718a78 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -164,6 +164,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
+  z-index: 0;
 }
 .CodeMirror-sizer {
   position: relative;

From 621325d900e73ec49361434c4f36f083eb41f009 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Thu, 6 Jan 2022 01:26:28 +0100
Subject: [PATCH 4592/4742] [nsis] allow case-insensitive syntax

---
 mode/nsis/nsis.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 7e419f03fc..ebd3c8bf5c 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -24,42 +24,42 @@ CodeMirror.defineSimpleMode("nsis",{
     { regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
 
     // Compile Time Commands
-    {regex: /^\s*(?:\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|error|execute|finalize|getdllversion|gettlbversion|include|insertmacro|macro|macroend|makensis|packhdr|pragma|searchparse|searchreplace|system|tempfile|undef|uninstfinalize|verbose|warning))\b/, token: "keyword"},
+    {regex: /^\s*(?:\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|error|execute|finalize|getdllversion|gettlbversion|include|insertmacro|macro|macroend|makensis|packhdr|pragma|searchparse|searchreplace|system|tempfile|undef|uninstfinalize|verbose|warning))\b/i, token: "keyword"},
 
     // Conditional Compilation
-    {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
-    {regex: /^\s*(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
+    {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/i, token: "keyword", indent: true},
+    {regex: /^\s*(?:\!(else|endif|macroend))\b/i, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetKnownFolderPath|GetLabelAddress|GetTempFileName|GetWinVer|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfRtlLanguage|IfShellVarContextAll|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
-    {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
-    {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetKnownFolderPath|GetLabelAddress|GetTempFileName|GetWinVer|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfRtlLanguage|IfShellVarContextAll|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/i, token: "keyword"},
+    {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/i, token: "keyword", indent: true},
+    {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/i, token: "keyword", dedent: true},
 
     // Command Options
-    {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR(32|64)?|HKCU(32|64)?|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM(32|64)?|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
-    {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
+    {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR(32|64)?|HKCU(32|64)?|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM(32|64)?|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/i, token: "atom"},
+    {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/i, token: "builtin"},
 
     // LogicLib.nsh
-    {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/, token: "variable-2", indent: true},
+    {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/i, token: "variable-2", indent: true},
 
     // FileFunc.nsh
-    {regex: /\$\{(?:BannerTrimPath|DirState|DriveSpace|Get(BaseName|Drives|ExeName|ExePath|FileAttributes|FileExt|FileName|FileVersion|Options|OptionsS|Parameters|Parent|Root|Size|Time)|Locate|RefreshShellIcons)\}/, token: "variable-2", dedent: true},
+    {regex: /\$\{(?:BannerTrimPath|DirState|DriveSpace|Get(BaseName|Drives|ExeName|ExePath|FileAttributes|FileExt|FileName|FileVersion|Options|OptionsS|Parameters|Parent|Root|Size|Time)|Locate|RefreshShellIcons)\}/i, token: "variable-2", dedent: true},
 
     // Memento.nsh
-    {regex: /\$\{(?:Memento(?:Section(?:Done|End|Restore|Save)?|UnselectedSection))\}/, token: "variable-2", dedent: true},
+    {regex: /\$\{(?:Memento(?:Section(?:Done|End|Restore|Save)?|UnselectedSection))\}/i, token: "variable-2", dedent: true},
 
     // TextFunc.nsh
-    {regex: /\$\{(?:Config(?:Read|ReadS|Write|WriteS)|File(?:Join|ReadFromEnd|Recode)|Line(?:Find|Read|Sum)|Text(?:Compare|CompareS)|TrimNewLines)\}/, token: "variable-2", dedent: true},
+    {regex: /\$\{(?:Config(?:Read|ReadS|Write|WriteS)|File(?:Join|ReadFromEnd|Recode)|Line(?:Find|Read|Sum)|Text(?:Compare|CompareS)|TrimNewLines)\}/i, token: "variable-2", dedent: true},
 
     // WinVer.nsh
-    {regex: /\$\{(?:(?:At(?:Least|Most)|Is)(?:ServicePack|Win(?:7|8|10|95|98|200(?:0|3|8(?:R2)?)|ME|NT4|Vista|XP))|Is(?:NT|Server))\}/, token: "variable", dedent: true},
+    {regex: /\$\{(?:(?:At(?:Least|Most)|Is)(?:ServicePack|Win(?:7|8|10|95|98|200(?:0|3|8(?:R2)?)|ME|NT4|Vista|XP))|Is(?:NT|Server))\}/i, token: "variable", dedent: true},
 
     // WordFunc.nsh
-    {regex: /\$\{(?:StrFilterS?|Version(?:Compare|Convert)|Word(?:AddS?|Find(?:(?:2|3)X)?S?|InsertS?|ReplaceS?))\}/, token: "variable-2", dedent: true},
+    {regex: /\$\{(?:StrFilterS?|Version(?:Compare|Convert)|Word(?:AddS?|Find(?:(?:2|3)X)?S?|InsertS?|ReplaceS?))\}/i, token: "variable-2", dedent: true},
 
     // x64.nsh
-    {regex: /\$\{(?:RunningX64)\}/, token: "variable", dedent: true},
-    {regex: /\$\{(?:Disable|Enable)X64FSRedirection\}/, token: "variable-2", dedent: true},
+    {regex: /\$\{(?:RunningX64)\}/i, token: "variable", dedent: true},
+    {regex: /\$\{(?:Disable|Enable)X64FSRedirection\}/i, token: "variable-2", dedent: true},
 
     // Line Comment
     {regex: /(#|;).*/, token: "comment"},
@@ -84,7 +84,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /.*/, token: "comment"}
   ],
   meta: {
-    electricInput: /^\s*((Function|PageEx|Section|Section(Group)?)End|(\!(endif|macroend))|\$\{(End(If|Unless|While)|Loop(Until)|Next)\})$/,
+    electricInput: /^\s*((Function|PageEx|Section|Section(Group)?)End|(\!(endif|macroend))|\$\{(End(If|Unless|While)|Loop(Until)|Next)\})$/i,
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
     lineComment: ["#", ";"]

From 7e0cd1db2445fa7dc90f5e6f16190952dfa1d830 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 6 Jan 2022 13:53:06 +0100
Subject: [PATCH 4593/4742] Properly access line widgets when computing
 coordinates in continued lines

Closes https://github.com/codemirror/CodeMirror/issues/6862
---
 src/measurement/position_measurement.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 2748aca935..2766fb796b 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -295,9 +295,9 @@ function pageScrollY() {
 }
 
 function widgetTopHeight(lineObj) {
-  let height = 0
-  if (lineObj.widgets) for (let i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above)
-    height += widgetHeight(lineObj.widgets[i])
+  let {widgets} = visualLine(lineObj), height = 0
+  if (widgets) for (let i = 0; i < widgets.length; ++i) if (widgets[i].above)
+    height += widgetHeight(widgets[i])
   return height
 }
 

From 42917b33894b88415a7d2ba7d7535e6070988c0c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 12 Jan 2022 09:31:47 +0100
Subject: [PATCH 4594/4742] [perl mode] Allow underscore separators in numbers

Closes https://github.com/codemirror/CodeMirror/pull/6866
---
 mode/perl/perl.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index ffe7877af1..41e7bc731c 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -513,9 +513,8 @@ CodeMirror.defineMode("perl",function(){
                         return null;
                 if(state.chain)
                         return tokenChain(stream,state,state.chain,state.style,state.tail);
-                if(stream.match(/^\-?[\d\.]/,false))
-                        if(stream.match(/^(\-?(\d*\.\d+(e[+-]?\d+)?|\d+\.\d*)|0x[\da-fA-F]+|0b[01]+|\d+(e[+-]?\d+)?)/))
-                                return 'number';
+                if(stream.match(/^(\-?((\d[\d_]*)?\.\d+(e[+-]?\d+)?|\d+\.\d*)|0x[\da-fA-F_]+|0b[01_]+|\d[\d_]*(e[+-]?\d+)?)/))
+                        return 'number';
                 if(stream.match(/^<<(?=[_a-zA-Z])/)){                  // NOTE: <<SOMETHING\n...\nSOMETHING\n
                         stream.eatWhile(/\w/);
                         return tokenSOMETHING(stream,state,stream.current().substr(2));}

From 04323d0cc1d3b056121ce919767829e8eca5b9b8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 18 Jan 2022 12:41:03 +0100
Subject: [PATCH 4595/4742] [brace-fold addon] Add a brace-paren folding helper

Closes https://github.com/codemirror/CodeMirror/issues/6868
---
 addon/fold/brace-fold.js      | 93 +++++++++++++++++++----------------
 mode/commonlisp/commonlisp.js |  1 +
 mode/scheme/scheme.js         |  1 +
 3 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 256c7460ef..28cb093f2f 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -11,58 +11,67 @@
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.registerHelper("fold", "brace", function(cm, start) {
-  var line = start.line, lineText = cm.getLine(line);
+function bracketFolding(pairs) {
+  return function(cm, start) {
+    var line = start.line, lineText = cm.getLine(line);
 
-  function findOpening(openCh) {
-    var tokenType;
-    for (var at = start.ch, pass = 0;;) {
-      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
-      if (found == -1) {
-        if (pass == 1) break;
-        pass = 1;
-        at = lineText.length;
-        continue;
+    function findOpening(pair) {
+      var tokenType;
+      for (var at = start.ch, pass = 0;;) {
+        var found = at <= 0 ? -1 : lineText.lastIndexOf(pair[0], at - 1);
+        if (found == -1) {
+          if (pass == 1) break;
+          pass = 1;
+          at = lineText.length;
+          continue;
+        }
+        if (pass == 1 && found < start.ch) break;
+        tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
+        if (!/^(comment|string)/.test(tokenType)) return {ch: found + 1, tokenType: tokenType, pair: pair};
+        at = found - 1;
       }
-      if (pass == 1 && found < start.ch) break;
-      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
-      if (!/^(comment|string)/.test(tokenType)) return {ch: found + 1, tokenType: tokenType};
-      at = found - 1;
     }
-  }
 
-  function findRange(startToken, endToken, found) {
-    var count = 1, lastLine = cm.lastLine(), end, startCh = found.ch, endCh
-    outer: for (var i = line; i <= lastLine; ++i) {
-      var text = cm.getLine(i), pos = i == line ? startCh : 0;
-      for (;;) {
-        var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
-        if (nextOpen < 0) nextOpen = text.length;
-        if (nextClose < 0) nextClose = text.length;
-        pos = Math.min(nextOpen, nextClose);
-        if (pos == text.length) break;
-        if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == found.tokenType) {
-          if (pos == nextOpen) ++count;
-          else if (!--count) { end = i; endCh = pos; break outer; }
+    function findRange(found) {
+      var count = 1, lastLine = cm.lastLine(), end, startCh = found.ch, endCh
+      outer: for (var i = line; i <= lastLine; ++i) {
+        var text = cm.getLine(i), pos = i == line ? startCh : 0;
+        for (;;) {
+          var nextOpen = text.indexOf(found.pair[0], pos), nextClose = text.indexOf(found.pair[1], pos);
+          if (nextOpen < 0) nextOpen = text.length;
+          if (nextClose < 0) nextClose = text.length;
+          pos = Math.min(nextOpen, nextClose);
+          if (pos == text.length) break;
+          if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == found.tokenType) {
+            if (pos == nextOpen) ++count;
+            else if (!--count) { end = i; endCh = pos; break outer; }
+          }
+          ++pos;
         }
-        ++pos;
       }
-    }
 
-    if (end == null || line == end) return null
-    return {from: CodeMirror.Pos(line, startCh),
-            to: CodeMirror.Pos(end, endCh)};
-  }
+      if (end == null || line == end) return null
+      return {from: CodeMirror.Pos(line, startCh),
+              to: CodeMirror.Pos(end, endCh)};
+    }
 
-  var startBrace = findOpening("{"), startBracket = findOpening("[")
-  if (startBrace && (!startBracket || startBracket.ch > startBrace.ch)) {
-    return findRange("{", "}", startBrace) || (startBracket && findRange("[", "]", startBracket))
-  } else if (startBracket) {
-    return findRange("[", "]", startBracket) || (startBrace && findRange("{", "}", startBrace))
-  } else {
+    var found = []
+    for (var i = 0; i < pairs.length; i++) {
+      var open = findOpening(pairs[i])
+      if (open) found.push(open)
+    }
+    found.sort(function(a, b) { return a.ch - b.ch })
+    for (var i = 0; i < found.length; i++) {
+      var range = findRange(found[i])
+      if (range) return range
+    }
     return null
   }
-});
+}
+
+CodeMirror.registerHelper("fold", "brace", bracketFolding([["{", "}"], ["[", "]"]]));
+
+CodeMirror.registerHelper("fold", "brace-paren", bracketFolding([["{", "}"], ["[", "]"], ["(", ")"]]));
 
 CodeMirror.registerHelper("fold", "import", function(cm, start) {
   function hasImport(line) {
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 52abbb25c6..e8528a9cf5 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -114,6 +114,7 @@ CodeMirror.defineMode("commonlisp", function (config) {
 
     closeBrackets: {pairs: "()[]{}\"\""},
     lineComment: ";;",
+    fold: "brace-paren",
     blockCommentStart: "#|",
     blockCommentEnd: "|#"
   };
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index 39627e2877..d11a132df3 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -273,6 +273,7 @@ CodeMirror.defineMode("scheme", function () {
             return state.indentStack.indent;
         },
 
+        fold: "brace-paren",
         closeBrackets: {pairs: "()[]{}\"\""},
         lineComment: ";;"
     };

From 191ae470666f877d6598dce020e8bff2823a216f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 19 Jan 2022 08:12:16 +0100
Subject: [PATCH 4596/4742] [fortran mode] Fix named operator regexp

Closes https://github.com/codemirror/CodeMirror/issues/6869
---
 mode/fortran/fortran.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/fortran/fortran.js b/mode/fortran/fortran.js
index 85bacc42c1..c33cf63edd 100644
--- a/mode/fortran/fortran.js
+++ b/mode/fortran/fortran.js
@@ -112,7 +112,7 @@ CodeMirror.defineMode("fortran", function() {
                      "c_short", "c_signed_char", "c_size_t", "character",
                      "complex", "double", "integer", "logical", "real"]);
   var isOperatorChar = /[+\-*&=<>\/\:]/;
-  var litOperator = new RegExp("(\.and\.|\.or\.|\.eq\.|\.lt\.|\.le\.|\.gt\.|\.ge\.|\.ne\.|\.not\.|\.eqv\.|\.neqv\.)", "i");
+  var litOperator = /^\.(and|or|eq|lt|le|gt|ge|ne|not|eqv|neqv)\./i;
 
   function tokenBase(stream, state) {
 

From b4a40b37252c34af921512633da44b18fd479548 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Jan 2022 12:49:32 +0100
Subject: [PATCH 4597/4742] [mllike mode] Don't treat (*) as a comment

Closes https://github.com/codemirror/CodeMirror/issues/6870
---
 mode/mllike/mllike.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index a1538f720d..8f92372782 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -60,7 +60,7 @@ CodeMirror.defineMode('mllike', function(_config, parserConfig) {
       }
     }
     if (ch === '(') {
-      if (stream.eat('*')) {
+      if (stream.match(/^\*(?!\))/)) {
         state.commentLevel++;
         state.tokenize = tokenComment;
         return state.tokenize(stream, state);

From b9e6190b3edf16fe959055c45807e06f833f9d1f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 20 Jan 2022 13:05:40 +0100
Subject: [PATCH 4598/4742] Mark version 5.65.1

---
 AUTHORS           | 1 +
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index c03dcb6793..bacc2b8424 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -877,6 +877,7 @@ Thomas Schmid
 Tim Alby
 Tim Baumann
 Tim Gates
+Tim Nguyen
 Timothy Farrell
 Timothy Gu
 Timothy Hatcher
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53149bc99a..165c71a5af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.65.1 (2022-01-20)
+
+### Bug fixes
+
+Fix miscalculation of vertical positions in lines that have both line widgets and replaced newlines.
+
 ## 5.65.0 (2021-12-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index d5490951d8..07d68beb31 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.0</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.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 c154f8f3da..2a013b35f6 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,12 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-01-2022: <a href="https://codemirror.net/codemirror-5.65.1.zip">Version 5.65.1</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix miscalculation of vertical positions in lines that have both line widgets and replaced newlines.</li>
+  </ul>
+
   <p class="rel">20-12-2021: <a href="https://codemirror.net/codemirror-5.65.0.zip">Version 5.65.0</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index cdbae000d9..e3d2ba6dd7 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.0</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.1</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 8c659564a1..1794a3860d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.0",
+  "version": "5.65.1",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 5682abede6..49dad2c493 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.0"
+CodeMirror.version = "5.65.1"

From c65a95dc6b4acd0866f89c97f7b68be242aeb348 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 27 Jan 2022 16:05:08 +0100
Subject: [PATCH 4599/4742] [cypher mode] Fix broken handling of punctuation

Closes https://github.com/codemirror/CodeMirror/issues/6872
---
 mode/cypher/cypher.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 6d88fa0eda..6203d59984 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -19,6 +19,7 @@
 
   CodeMirror.defineMode("cypher", function(config) {
     var tokenBase = function(stream/*, state*/) {
+      curPunc = null
       var ch = stream.next();
       if (ch ==='"') {
         stream.match(/^[^"]*"/);

From 1a511c3c22460e727d2c7a48e0bebf71f1354eb3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 28 Jan 2022 15:50:08 +0100
Subject: [PATCH 4600/4742] Add github sponsor link to FUNDING.yml

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index d87b38eee6..cf29cde2d7 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,3 @@
 patreon: marijn
 custom: ['https://www.paypal.com/paypalme/marijnhaverbeke', 'https://marijnhaverbeke.nl/fund/']
+github: marijnh
\ No newline at end of file

From 64b0dae4657764daa85076609b54dd2c307aaf97 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 30 Jan 2022 13:41:39 +0100
Subject: [PATCH 4601/4742] [clike mode] Support triple-quoted string in Java
 mode

Closes https://github.com/codemirror/CodeMirror/issues/6873
---
 mode/clike/clike.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 916aee6192..863992d852 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -498,6 +498,11 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
         stream.eatWhile(/[\w\$_]/);
         return "meta";
+      },
+      '"': function(stream, state) {
+        if (!stream.match('""\n')) return false;
+        state.tokenize = tokenTripleString;
+        return state.tokenize(stream, state);
       }
     },
     modeProps: {fold: ["brace", "import"]}

From 8f42af2d6fc38aadee2d096e2a3194aa657d63e5 Mon Sep 17 00:00:00 2001
From: James Baicoianu <james_github@baicoianu.com>
Date: Mon, 31 Jan 2022 15:58:10 -0800
Subject: [PATCH 4602/4742] Fixed escaping in double-quote regex string

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

diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 66a158274c..af3138179a 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -50,7 +50,7 @@
   }
 
   function getTagRegexp(tagName, anchored) {
-    return new RegExp((anchored ? "^" : "") + "<\/\s*" + tagName + "\s*>", "i");
+    return new RegExp((anchored ? "^" : "") + "<\/\\s*" + tagName + "\\s*>", "i");
   }
 
   function addTags(from, to) {

From 18c12c99b7ab8446eba7759889d8bda6b55bde4b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 3 Feb 2022 17:41:44 +0100
Subject: [PATCH 4603/4742] Move way from Google Fonts

---
 doc/docs.css         |   2 +-
 doc/source_sans.woff | Bin 0 -> 29448 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 doc/source_sans.woff

diff --git a/doc/docs.css b/doc/docs.css
index 17b9212416..4a199879ed 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -2,7 +2,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(//themes.googleusercontent.com/static/fonts/sourcesanspro/v5/ODelI1aHBYDBqgeIAH2zlBM0YzuT7MdOe03otPbuUS0.woff) format('woff');
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(source_sans.woff) format('woff');
 }
 
 body, html { margin: 0; padding: 0; height: 100%; }
diff --git a/doc/source_sans.woff b/doc/source_sans.woff
new file mode 100644
index 0000000000000000000000000000000000000000..39033e43bc986bbdd2ea85818cedc999f598b139
GIT binary patch
literal 29448
zcmb??Rd6Of)1BE~v)9bb%nWO0W@ct)_L^bM%*@Qp%wDton3<X5_x<zzNvd*@i%iWK
zjZUdYEvdUTRg&D~L`8vsfxa&%C?Ldt(r2je{J+dUx&QqV6;+l20s^-F=5YRj$%p`<
zoDx0LHy8GuSNn#(W@k&Bk&S`<HwXAe8W0c&h;mTrgORH<0T2+V_jehJe*l*T^lEBv
zX7kMzewPFJh7*KFCcBw|)3+>G>312ZfAIAM1ZrmOVfxM00s%2J00C){T-If6n41_F
z0|Bvq1Bm4tY;QQ3>E_?$H<$XI$NvTigbFCGxs9{?H`n^D2i<pFjrql7K~^S?wm?Aa
z$3Q^D!$3fahv4=wY}R&0-?CcYbpY@F14<C&FdGB+Z(Vc}zrRKB4?rP-*=-GMOuo5B
zAfTV$^4tR8G#3W;c23SfK=zs6b>My1K?!YmFKO>+@-6Gw`7I~)50b%N&%V=t`*qT$
zPUZU@Xfp2z;@`BTWXL_!NZ-_ZkRu=<DIlOMk}@zLpbuM+d6*G{kqStpO(QK$BQ-5m
z-5<v_mxmY>g`=ILjfsQdnkt;B>uqMZx7RyJK|UbBfk`~(26F+70DK<=2r>yq1?Zpe
z>g${O>tjNQLLfea?lT6y(7+=2H~t6$i6aFuzF}Hqd^ck;hBf6Hc8)xOXNF;hWJYgj
zuWYc63k(ZP49pCS4@?S-6b$djA|)i9`}*oTya9Qj2RelgJT(-UC#@vNBLH1A3D1vw
z`Fi@2`@(<WfAPEFAMUyO?EdgNy}Icc`K<Qb_-eiB>w|p5JNKzQ>x+kMz~AR#=yKcH
z;w+tzfQYh2tO;6`76=5_0R{!7#^#13M`uT%$M5majjIhSO>GS>Ol*v*%<K%zkFSp?
zPjCNSoZK8!o!uRf_optrEUhi1D5)vBDyu7~AfX|$BBLX;B&8*`CdW@eU*2BaT-{yR
zSlL<HTH9ODP?1SU%*^d-Q3EEKPNUiIWqiqMxl*ggVW4<QtHo};&g!VU>kWY+v9QQ&
zyG&C%aYFvjz$|NMUSa@Y!_V{fPOjf7Ug=6O0_X3ZzY~)m)5KzR+C1<6Hl1}~!ZUC9
zxj*5_7rzeM{BG|4`<We{Kqi;U7i6&3`Qj9d!>=*fYo8B60SB~=75C$xfky!n22uo4
z{eFY}Vg`Z*J_LdVf%pdBH+;Vl_l;2?SochwI9}O72E>pN4w`)kakO|^Y82|4<1$5#
zKl14U6g+VJ^VPzS@ZuKc+V;tL%sO<x_2Z+PSB9CdrjG9#ko~QG?%O=0?ZPBHzexjX
z{0JalZaXCiGXJVvNp#k8I9XT1xy_%X8!PZbL~@<F_e8h<y|U99k7&EqN54@;cFsGx
zqr{+6z+K1P#dWF=PngOKlU|_@{*c!1rKiv85KZW`7!b<sqo(4eGIAC%!ZyDjC%FB4
znwoef=GSE04VbK8Wlw>WL@!ka!`S<!AtV$<b<2&GrO(3%mWg#>cr7O_tf4Fcd%=TM
zsgPh0&6<hKyPefh41-F}+WG=Xa%#2zPiFxEf5!q4_sk;iAO1K?F8Uv**(aD&(%YL$
zYA$LnE^ZG#D)>&WGrYu8d2=}Fn7G7*KVUTc`!K?QgK!58xQ8)}1fytc4UkQKVeEkg
zH)2QiVFUqjx=KfZZ^eNj!;ct9)Hf^4bbnQ}w;zG9QKwd)E~`9j`#pJmedL>4+P?6f
zviKxg=1M0<a{W>ef+4368vnpB$!#ne8Ywk}?n;?f7nUeNa&8MuY+A334&-+Z%g)o{
z@(x@egn};-c%q|KvF*%41^Y`2g(5;rucUO$Z64sef|0LDIbIqx6AFM#56qd9JE51i
z9T(eF!EN{vyDEGl6$zb-3aWVq<O*ABREgpb1FDT-A2BZvm0cB`mG5j{9MXWCIPD&|
z<}Av0x>FibfE0tpk-j6|H&>2>3%yaGJ(4Y979prh<QE_Fz6y3rj<PcYf}bKYm2u?C
z=y3=kwp9n0!+jS+Jl#KWNPM_}+v3It{l#T>#o_bHV%hrPDuBQ+LA(9?Gu<~sQof^t
z8U2Q3usvLpp_fQbnT7B7(c_jxIg&vB*amP9^<6E-&HarX&4wLePx!SKioKWw$uqW%
zY7N>-QNxcHlAn>fBqlH~+KL%7s1Y7xha#};!wIn@Fn{I`6^%_Bxx0d39FWHziGZyy
zu4EBfPgGmj(Gf_%`B;@PHk(e~Kj0Xf2Z)<X`aS0G>CGU}wBXO}!s=6x`ft6kxIf?u
z#6OUw-H>toLg+|0zR2&5q(M^QTHf(^W&DCHL4T}Be@G<3bMjo^m?)nBMu7Zq2Y4|6
zef|l`n89M8(vP4>SWrmmK#CAVnT48wY8*l_sZ%f$E|{6$6`A|x9PgGyYAzLK1LIk}
zjuj~oSf~M-p2l@+Y4Kz^Fu<fp0Z^YLSu;uI&$#$uOve_uvvt7{@pwB8Qk8<^7xZ-}
zBEQ6CQtuzbW+rd@IND_~5JFwu$k>iFv<MCwnI7#sddy}~r#jkR64^~sYnvlK<KMV1
z!OU(s3LtN@@e=LbJmL8G%*~8KocOm;?w^S-?*&rnNko*4iF#Yaa0{}u2~q1Lr3{Vj
z#I{j6e_O?yz}?4kiSonlTja?GZdnBA3n#&er_RxsM`?JzRqOcus?O5Q7M!}*kd&*o
z8T1ac!sM9|{4+<4JuCQhH-Bv}ae97yoQTJDefo#ECi80LZDNA%?LZgOL)6?O!c)ZO
zH~h0ywnCs;aP75$1d7nU>uoM~QpSwm!RQ|~gwdH};io*9V>1Be-*Rmh{c3jk!+9bC
zJ(Ngk1;dD_n7QzFAKW8MzQ36keC8ZAIyjiW<Y+<?reP4c<9A41-(25$_+5ZK{|rl;
zm8B=expXPaeUQzf!yI#(gB`cXJim$IodkU;RNn6=6p@=~7ALnT$tmT4QJ<)Xpd-yB
zH{1%>nM|rx71E)~SUJNJ0`>z3c-1r{kp?|Cy0!D|YGC-81wVdb#=+EDf^HzbL-O?F
zfY1=t^u%bJc%1Xq&XMb%C$Ftcxu2VQSi?o>R5ncdsAOcSR59kW(O!wHAD0-=JYb^u
zLWG=n2IlWziVK3&yQqD3W%#~+)PU0696Ze;^vN2n9aOln?sj0ERVLkH?9yod8Up+z
zZeCciVQ^VQY#^P@BB6bLU=d%qn(nynzkAem-_ex|WY2gB9!c1r5~@P*KGPbB@j25%
zxPN<{#>eB6fApMy{Qb4hB^X+DeM8|x8^t6)BpM32T=jqjhAmt>2h66);RS0N+(Qg-
zXKucXml!o_VwGU?J+sM)cxoFLqjH1K&pFD#*lR0+97_d$c850aRphPcEbzr`AX(o-
zMhPN?`GgfcUtl1OP!Y;UmMXPmmn?-@eZD>>-P^g$zRo2_-BQqfPvvMV8CbgXu5=_|
zel7c8Hgw?VE82YtathBn!adDzBF3Oczdp1Bq7P3m+dUXIZ#}z~G!#%AmU<+lz4lUM
zj8d^}0~VuxVFijqTZL8S1*hHrv2K~_Ww9&YiNynIjWG1fHNU_ql9qRs5N>EvN73Cs
z8WNp5e;~eueZ*9Vt=otPkLrkMn0U*$4IuF{Wx|Z^RtycyMox16$F|NXQl-L44BFe7
z;edsMlQ|q&nqjU7)R!I9_ijle{iblzrNMf@pN$iGw&K+Wg3fAY{B;vHb9SH(JZ385
zYS11={1@Un`!58~6`=H-qdTa5;3C$>=B1)9tafwX`dft2Myt=w5p7~Rvgyu^uUR2*
zXR`w(hInN6YcK$MzG(RhCL_}@*SR|^;LM}9_ljo+IHCVHs4dejCK6?zbIsg(zfh|J
zX}jPB-;6Lfb;!Avq<2L0y8H{jjC6c-6q<LyWw?1MjYw1usC#MelU<!Ak2uy#PL-#a
zDNRZSRXs%Lj4;w#G4K<9(0gNmf9V>^!07Pbp-&Xo9D<3|=1wGPp5!cy%rvOOKCCre
z<L_UtKXxMX6~4&bOr=XmkLg?;UBuc8qfb>L^xIkY1Xqb14ci&mC`w8?pVt6yF80G|
zt)QQ3c&NxyM|o<PEhSF?cZOy=KgUV{oQyVG-BU5Af-!If2f-aNAPBh8fVe}xL9t%M
zoZ#7rn;?lrgl}g39xLlwr;3;@uKXQnbBXb1llhVBhQmVB2l4#zpP8>!TTa(-pv`RH
zcFbNP*rh_I7<~L1>>32nSL5!99SLmjXyopeB4f-bYS*6x1koUWf{~SXDzSd+g9n!u
zi1U=<OwV!Q`0iKSgwkL<oVuscrkbpW@|@K3lYF3(J0Buv#fX36TYE<#L1#PnU|h&?
z%E;#Qp*?DJhTIq%=8tY(#oQe#{zX69^jw~Wv#yD|w34esntn;7$KTUxnnt2r!FA$5
zKFDRpJk)Hg;$xfumy}4MUV^zrfoS*kYvQ5YRVs)e(ihIIMRh8_U2K)irXhh+@(z(z
zjU<Ba6?{Mrt=ZM$LoA%bBLfj+{js~BGDOMKFhdO&qPX7fP9r-X41+qjKd)=Wa6}!;
zH{#CYgDxGsOFcv>Y^c6#H%C8(s011x8pUxtZ2uFq(m#WObGQ}H5Egrd5_^zWU5ceH
zq1UDMeK1`!kPWo{C64x3Y{buVFPgt<GB+|NTH3T}b?lFkWA%PXwg7#8PMXl7)uMs>
zt<@s#84q@LDG#<N;fyHU3)6Usd^d2HdRiZX*oZ>q=MKxD$yJ`*!WXV}k9bH$=MO_w
zFcZ~Odw&6SBru3)V<i+S3pFnqTBRJ|tp)Sj2w$><!;VxGcAeCX3q;|q%FPQmF7UpS
zdw$yFyD{N;+{^1WqkzQ?3_bCZdR#$TsX|JN7w_oMZX{<5G{ILTW%L*~aXj+=w17;T
z-^|>cce|y@nFi3tfO8Ug^N8DVU8^KxD3@D9GkfS|iYh3<ef1oRK~LnywH+zUF+p-T
z?Z=Xay_{?*2yU_WKQRz%s}oW}m*?UesDBq|MdrBA#KYkYo&);=te#v*i|I~fWZy2F
zLYuu^<&aoIx|)L{m%OUBQ0zP}dwp`KN{(vQ=6n2l@uBN>kLBG>3C1}FX0$KI<c!-9
zY{StIHtK6%5)zO~Scys9wm5QPJiXnR(dgFUSmuH9)L&KOfRW`Tc5?9U<n&T#mx%De
z_4|PmGHF=>(wbw@`^=nRaSdK1g04cD1VKt#V??=9KBm*9toEkc6JMIyUM?p~B8!f>
z?h0ZfB152{GqWw(9m36_+(0cr0Mh^<3h@hVR4uIKF$=lfcfB#ykVOeZo`CvzyF{cB
z`W1L6Q5^Xl=FB|^lSuhUUc^ItSdH2c*r7NX-qjmp*WyUKE1WFo`zxx?{hC8IIqA%=
zv9=<eyPQHh)=*Ewv?>UjiG6)fmJ0#DMGcxlUtN!8p4o*Pzx|DO-ZeN6N;#Lxh#RXr
zeMbMJvJL&pVfjj|8%-381(oO&A|uDk)JQozI=3r*rD{hOR^99RwmN0cV5#u8@ggB)
zMwa%6wGids6JF1N+3xK5&mDR3xSy;0?=I?U3{_47XEFk#@4pkbf`K!PXBGr&3oKPt
zZblfDmBmfh9JaH>1`={M9M6wUuI-|_A6D4OYqF(aeRr61I2|v)5V67b^3@DB&@2rH
z6toy}MgH(LndSvqX+qh#l$FoeC>R++*}2C%^f^Gbm)}Nif54kiEzh>V_b}XMAW7oB
znF&8avf*^_VQO-^-bK_|5vPMOZC&~Cg9deRX?vuV-|~aKBm6yV`~B4vR+|0Q+3%+v
zZXut~%|<G9_nYZYXyQWQsEFbE&_@vWYGMO@MwaDM-H?q(p7qDB)JEQCHw^h+y}tNX
zr&KBQ?<wyu`2!n1QRAT5@adm;HlI*DTtD{99g8_hm84_Bo6HzO{Y^Q@lchU<)RR1;
zxK8Fyo?9P?5U3yE8gsh+7+1?q7%7SwXvNB16Wz095C|F}oe4IZqJRKX;JcQ|34M!3
zM5~P2w0xp2mW|F^dIyUmF4o<!utUFX)6lY}@Nqek$)9Ea?W;T{JhIj%1Z^|UAbJM5
zLQV@|&Oe$-1uiMbi*;#3dWbS8dozfZ$sx`anLD?tAAx18>G_$pDW?-b`AD(${x&``
zw*hBX&g6r2ZBaVq0ms+08<^QLz5&FW_N#lGR-ju<to-$tA4K*+Az$52Lt<hVguS7E
zgRLzq9M=yNTM|#FpW?c_%zaDI`;*Xeu2gqT{&GX_EITNYB}gp!K*gBP9ars*Y#tZg
zRa{kUem1A=nW_scz{;&h!`O4WahXClu_JaB@1*HHaI#c><<rE!-baUd6gg_Ml{Ccq
zo9yQcCxsr_p{EhKjmlK(Hb1AsR14PIKiG*it8A$O9)QF19h`Jv=^hWINB!#ClwM$K
z>}kk#{eV{Crml!G*6IY4QBGEEkmNq8=jGf(0mopXYG{#J_Y**}xbZ}v;t4>VgvqrQ
z1^*8Zo&`xYj@Cltvd!je+KaK}Cv$>Ujh3_>eDpc}!#OrA1Z15I#t%xqehBA9q3pK0
zp-PKI3GECukifqv)mF;9zq_{13{wn#(v&YeI~a&*AbO(1s7>;8`<S|33cjjZ8A=hd
zXS=9wi52(^5D$&xQwX-`+?xd3a#~hK$N?eXmkyM4$L9cB=!-L)D&95v*F~hkSS$Tp
zCo>ebLJ=nUi=2>->Vd?FJVd{U^ap3I2c!Ocx?-hYa8-|#W4nQOWD@PX6E8Yx1|Kd&
zbcUX~k@qPUF5?i=B_xDetYRO(&AWRACzj2!!Z!^xon0a3E9JSe*xB($E~fV(!fP-D
z#Glfz0uj%m*CnkyAnxFK2zg-v8J&22j@m4HX8Pf|1mY8iHreaV@u)l0I;rJYi}uFA
z!Z4-m7VB>v#mbr=xUM)WeqLqSVy(21fTzjSsBBTV_ewO!eP1nswxOO1rDPt}4XT{j
zyb6AKaWSDoO0C!_Hfx=MX}ClvPWP^Q{+WN=wXG}~B#riH`+5T0ig(sRTOPHc9z0q5
zylkI^O}O=KaAbhK-FOldin^{OhkHp8<;H0w3g~X`;NeeqTfAp?eD~anB_MMi)OK6j
z2qQwA+$Aj0AnlI>2j%Ovg=0TnUMV|FJieze9KXq+E%I=mi!J$#L}+C={UM+VX<?lu
zcQx?l)5cz`$r%o!3!Lg5Iq>oIhSe9Q;Q6E(XPF|K=6hxI_HM_`zc7&Mt^h&pSCSBH
zIKaH<gRlC13j`-AOl~P#KU;$F4Us4nAp-!*;3jU>W-gt#Sjfq28Wc9h75Dg@XEx-~
zfIPbCPre_*-t8hPzK?bY#F>~ZSg$^i(m)jX@EQ<1<NhS5n%Y6nZyVk%EKVEX<pFDa
z%Vst!EgV|z5w~V8&8DeC86hQh{FQBM^Le(k^yzhkh4u>jUwQTvvC}mhNpG#*5Nw~3
zc~gYXJ&v3^Ex>$Rr0=R9i2d&QO%98Y&kJiHRJu~X292`8u+8O9E6}0`NAD<zC5(_3
z-=*Alc61_bqJCAhG)>ccU)|_<t#61{Z7sE%0Z-*-8%al*7){oV?<HONE)#lm#qV_p
z%ci94?4kCq%O^x5jCir8LueGK5tt!ozwYd2&RNZ;zyDr+!Jk&0wTT7)9n`neYm^j8
zoocEM{1rWTY#FWn<K^$OZT?Tks!$^8>Ln`Pzx_o0E*xMAvLLjo*`nLk@0@EoC)4vW
zJCkkf`|f5IFCfPGIUr4j6m8J6;-|pWYI4%oE%#j$^j~-%%BMJ4f!p^JUUTP=HGb+O
zB*z`{Qs^3=1a&9ii*k!~421zvMWh8gbr{GoJ0b6C{14Xyp~sS^A8*&{o1;OW>3q=l
z_Ek&htf&Dr+#z84FEec0oNFm_rf;Gr1xZ%;?K{6i0hm=2eo<TMzS0`l`HM){*4}ts
z3O}MyA`5Mu5jKO0kIkaFPBn~k_t$L6S6;;CItsT6EGzrZilalCO`Gfy%?Sh}IW@F~
zIV4sAAfN%<Ns@Cv#!Uw+8lPbsl;S|0p?-v$saA-Q{VE$lk;p4bUAE%td5<<F+mE&}
z_4w+p9xD5VOKUBa*laTa7F<8eOubr@mCnrQ&=cL@x<ZV8QTg7P5FHgG3d-ZAl(0$N
zuU%qL?U$PajE|aMtry$yfMjoTE1A{J_M+(&fCG$;8qFHts#Yz;U>q-M<dOtg;{?7K
z9*WYurmB1{L}ZImn*6{h;=HiH!jCBtZJPNxeN*bkTr&3{=VTJ92EBIQ9o1tM?0X0a
zLu1Uyy)N|z0gj*1Jv-3KTo7*WH@-ywRzx!SMhLiB(-g6Z$5*YO@YSy(!aU8ADhka+
z@`^ZEABfViJ_>>NirYq$n|Xw~dOSaQf|1_ZwKogRpX-atXhKu(>9Irj(}x0hf&oOL
zg6+P-F)DY8Mk|b;#<=P{ErIp0P$2n$nvi)j4p`$D>v}eME*7fBVp$$Yn^Y71T~>*w
zkmDx>V$Ua)<z_Bjs5Pq7L7#$qdhO`yhNsuH^JuY>^XolJ=X9y=8bIcBeCX%f((ALv
zB)J=UcTYan_Frq>@jlbhrGD?HaA1Eo9K2PJW$s0NDX+0Ub>}QrNkth%)r4|R=*u26
zcXS#qD$6ua#Yb!3pkYs&noI&UZ{FCE49Q$`>v+0{(SEX?w%KZ*Fr`xO65O8mFw(Ly
z6q8S;r1wrd$q9(J+qQ>*4w^g@u47_0cljyf*meZ_`5W7Q9usV|K5S91*BtGj$N++L
zBfBpMvgGY8l#Lk)*+=MXeo(-Ky}f0Tfw8$uL+msv+yuT0?w<A6dAqnyV|j$mfE^U*
z@6ut-_cgd41SBrEl5*5K0s<7^K_Z~=pW^HSB>v(+tNGe@7_784hDMx(6IzU5&~U(F
z)dci?D3;WWt`LW$YGmM!f2J(21e*@%BijXjKb+sz`Q{N@&lH<Ibj}@Mz}=XZZ0{nj
zo(s%U9e>^Whu;*w1s=wgP2r5vO-;Rcxw(=w@2}#o2UgZ`qn)wU_gOGnI6~6+rWE)6
zJn+7VY8El}8Dpz*A;7zo;c$jCQJN-CHi|hcMr%pBLGya&m1r5u5ls-ao76czrD`?O
zB|iD`k4*{drjy6UoMJU~DH<_X9&b(Ei?-}9RzPR3C`Nh%N$9NC|5;qZ+TY5;$b>5w
z$`!Pr{{nwq)+Lp+K*6+#46S+z9DwEj>nr_}8juBS7@c&Y4A=3R*}T?cSavlGG}JTP
zcL)D`28rD{G{K?%x6d6xS$oiq?(3soe3;Q64PEUeevKnSl4aL{z==pkT;+@k^3~m;
zaLrmJwr|q;$&_r?)Y7#P97iDvdf@K(!Rf2jB(E&5&|;MAct+(<`R%?7Ktg9zl2XYB
zNRH2OGorjgOT&Isa&a~I#3mixZR>3%M$6T<Ag9b7>B0CQiJkvbL-GX4GxpW1ccix1
zwrT6SNnix*bs^k10d-tX?kuB;OGheUGZA`WCbMJHvQSFX#w$SaQ2Gn|#>&k%73VLI
zm0~1ooy><ORMjEY)Hr6cn!v}Tk^bvweeLNvc2c66EQZf`u)TE@t8WO)ndOMZHNl2@
zXO}gU49PH?+z4S`R!j*1w2P0Xkm;sW8TF=aoOe7RUzs=fMXT(N|MlI<vsD%sR&Kdm
zy1qQoIZKf$K_f5GzlT9#K{D_Gx=7h)%MN%Mm9>r)ub?|^v5X7SAW1JF+Soxwg&dQ{
zMvA04DR5~IN4NXoAn@<$pJ2kzPhQ?luUGr)xoBb}`|-JB`M+>~eux+f|M&pDZUoJ?
zq{)A-!pfE$R|KVa2pV=-uEhfA!XOcG`=>9xLKReNwkaz>mo}i8_yr=Pq@6c0IEX~8
zly)H8`EO%MMHe41IP}Whk+O>3CxQNXJHBf2>PIAXO`OI?>8#$;j5|Ks$B-86A*d&j
zU$z;=7g0@D4b_f512f@(NFb)qES;EBXZ>XIE_{|EvQZm?+pE#dwmr?6t2df^*riXF
z$<E;D-lVOL=rQinAiC+h7hBF)QteZ205>xsWvrC{SyWwQ9_B<c&NQrA(Z>z|L)8#R
zV~e(IT2(y2)Q$z&Y{k1CTeP%c<4LcweSUath);|rFi<iN>!`ObG^^<TOIEFBX=Ity
zOlV7xEvw~YP(h9Ez*rZbnt2^I4U!U-)|Ee%6x*IQC_vLfqJ6%*n>l2}%*M*>y)hE#
z?I1n98|Eo38<}U3kR|ul)y9BqX!5r2?*TW59z=#<BYx!R6l^2gkbY$}ZwWAGHT*$b
zh<a-x{7NTN&q5Jk<9l`dT%31Sb5vlnrCPuW9>85QLbx-<j-b3HW87<Ss);jaJ4<T`
zYwro%rEAB$T<aO#zU<x;v&VvIrNccnXtaxm>$0h+XwSOj82-K@4Qow`1pAfB!WpPr
z)5)?(JUnYS#EK_-r4xU$9O0D&wA{qn$*M7j6|Jo@prrw0m9@Uq-)OFNPTSGUTZ=C0
z$IU<mRRC-pat-ke0kMOG;bsGO1v;#P@d6y<Y62Gvi5f2hDx?ixy`zBggk<F&vpPrC
zCA)5HjhBIC$Hr=raW6xh;ODL1x;hIxD--0d+Jn}+f$;oCiSG;@Fd2ds+^26ZUfL;V
zUKtu2s$Xqo<&Llaz*qQtS#TWB{R4*bOi!e)TDsWi)Y5&Vr+sC4*L<M!c<pnkAd=XI
zuB&-!Zmp;5cG$pb5c&)Mv&FAx5wB&{aIz>uo2Dd8yLR!q92d#Tv4)jnnUvecJ}3%L
zC`ts=;<T)48Bs04qMl9c?sqcz(PIn8FVo75!xB83z1@pn2_;MJ#GA88P`P?)pX}_r
zM`E0du9uqvlslH@#|aJ(eIqHr%S{j6SeE!zTjUfEeE9jFKceZCO3NIraCA5kYrK60
z@Fr>&-<S}c{+{ZW)Y=Rd!ErEC`3RDiG2lcS-@>sK-IR2PpzdDN850lBS3mv%(Ens2
zZRcXel1Ui43TCM+Yipq1iD|{=#W}KY7K1NZBi~3fp0}`Hf8gwzDo8<#K)xt5C*!0x
zDKxclqNAN6V~&$h>`2Bg<38R7qSX|q$DlnT)TeNDah>n+*d|;?RluH<P&`T`WUd=X
z3(34Gyn~ssK*sS%%QJ=(pW-|K&+Dv53tqpok%SY|t(tHX-hi`>35pG)zKm{oJrwvm
zrj?<e?TH2y3iWz|lZ%khdt9>C8LzG#w}LW$a$y_9oHp4iGPa%^?|~!$#T(lVJx&X<
zB?G-#cLb^A(7Yxx>nQr0!Cglr#^Lmw%QXksjsHkSM3BvEG_jIf4ELlo(y1<!AD2)J
z`brL~NHz#x$Ieet$;K}p;RnICh*j0sXK+3LSb*0YPJc`hsdLhryQmWHM311{f*!~!
ztYEbpG&;i=$Oa`&ivhCO>ra!i2Wl^Hw!XTHs7{D*vrzH)t02%-eIf1o`YMRddUKF0
zq3EG4#gV5~1;)?@H$4L>7W6BV{=dPI6B={WHZUKcFg8<kJ%<2rxW3C(Z`*e6mFJtF
z#_eq8^^<YNH5;<VnE}Ylp;)EJirpU{r~XODI7P$oEH}CViJj<Fxr19wIoFS=mW6+&
z!EC&Bw<>{=(v_*Lm4#rN27%jyeAU~OsVrF`Atp1VIkxDc+UAoRdu9#HyWiL}2Ry_?
z>$7=rJzMxn4m?|r_194M6r)<`M_e2(JX;9)&lko$f+M-Ybn}q~9=xmg6&yw~u1`zF
zBa~7}TS<}$M|Wj;D`5@)5ULas6(lGaIU5(mlxk&3w|dH;MV7JirP4KIP3m{f7&oQA
z?gmMduV-MLH`_ae5)W(8Xix6=ryf7@6)PdOr+yCF&l=*%-ZSe2&W_!a{-#NuoweGM
z?lt^j+&QkGK`unUupFqvrI;0>7`RjuBXoZTCe>;Zpz>a<#5us$t=Z~AwR@!8T)~;h
zW*AzR-jY5&>f%v!QEH0{>8A0gi?;Oy>dS&IouyW^Dx6h%ddqF1>uHPo<HFAGP3mcW
zd20p%svpSD@8GSh`+lzAq#LFGql>kpScyg}$Z{1!9JjCC;7xT*PI>+~YI1q-_GwP(
z9yGU%*ccqVCOSAg297Ej-WVPR=frWic%t5LS+gp=+3`qIhDm|`48|??S)Fc!ndy?^
zdQQKPMKPjK(6fN}FDVL|w}zP+M`qZ4)T8h`VbB;+bLc$sIr1ywRqP#J1LOIg5l$q$
zmd>vfZotE^XZ#6WhlI071F%+@90!lVU*y~RxoqRkWmDJ=?K1zV89-A?#)*S7<VUW8
zSXXIfmwD;rZO=k%piUp>4Wjz9l5)w~TzW6Bsc;l>;daN`<}BoPrrDD5o{*!VX_M+-
zjb&-uorv!433R8np^3NGYW2~gT_Z>?F8HXSijmlt!T^EB2|{(^>Rkc70IBt^Y(=8Q
zoQK?in~G-gg!LM%oK{c1r1T!o{I6?a7A}X@o~vtj5+>hPdbUiL8~8a(?6cDxd(C|K
zEn1u8x0IkTQ3cPx8{!|dFWI@Tb4kZYMq!>I=bv67T#{vPb+d%29xgKps=7^kgtYq~
z$L@XyR>$%tFB0y*>-nLx!)<bt4FwYIiu@`Uu|36~eCR?dTHS+k&V%+@KcKwtvWNO;
zngca*J%cHf&=Si8^eH(^f52|1^)>0sXVRsC;?I{AC_qOb-UW!FHaK3L$PNAKB;clq
z5PIeyd5tjm{R7=c`<F3B9U|UQys8otr7#gFBlF%b6E=3N*x19BQ^rx@4iG`~RD8ru
z0ky<mGS<E4R+*T1pQ+pWc)iYDS-Qe{xptrt-MQ6IBC`%8vm*g?eEDXoF7)SQol4@x
zSLvLn<xA#oIo!yBOH?G8OT_rmx7VRD880YjGA~o6e&Z9x?#%l5(qut`@lj`xh7(?A
zu*z@c-6^OUj%s!-3Fuau6+d#@Z)73!a_e6%k(@i3g64~QUNYw0-X!azLgs!fR;(KS
zRj3&lC5Mt0K*(hZ_|OdL5_rnB8cRQRf{wPosK@<)HB^Q0-c5(CO+VMzu@Y*cXeS#&
z#>`-drZ&Xom?&7yqsU-km97!L9}FIA+M`Y-pFqfCE~KA-2G07^L`K;8F->BQLgzw=
z+-~aX+Fk2KfO4!gI&`8n<3MpXDd*;FlW?A7!8F5Hm?xV%)3<Ts3kDkC<A;d|?08n1
zLx4@XV1svj+guE`{LvsuOn-bvGPj%)e+53fJoD4XC+YaCLR}AdtK%K-1AcYpZD!&t
z|NLlEqS_tQN6CY)`_QeT8k20fGX_to8VQj8G{)Ma`ULK$>M;!(fm4#wAu(m#<pV9F
zo?Xk4p?aYt;M&!^1+`nNNBvhUu(Yi&jGd~G*_%9}+Ey7bxmILpAI4FyM0fz*;<d?0
z*flK+&I36gS~Hd|q#UOINe?}xHn6<`^!XRMwXlC%7g(<J+D)|=q2hWQv8<R7q=W^o
zFm_Q?N2zEz-Lw!v1JPUw9c(R8P^@9Ce6!GY(n877KwWHYv>!M|yIjQB_$L+|R0|mt
z7qCi4`<z<iiy*?3%IAK_2aGxJri#a1G`qn0Famz}?&9cP?1ax2L(hgI?9=AJd%v;o
zSH$61r^GgAo}O}Ei<!=I26peZ=D+%&aC|;NweeB%=d|nk+5u~Ct3&!J{igo{2GF`(
zx1c<~sppT~nLKl2z!x6u7{Q!yyDsOunxvRU^EXWgl|MOB8;`8!WZbXrtVuV;G)w&W
zx|S6s-|AD}eD}AoEqi?0BdYjuA|dy++}$j5a<ko@bpMbelT|Qsz~{G!zCaXHJ|8ZN
z*p`UWhC^mQ|0a2urS#0uP4_+p2e7O1m!f*VK)nuz_JbVwwbZcKbnLJO@d+-L*}D6^
zuZ5{!tM}kzd$r>-V*BBN!`t_x`t6D@z4h&KaIORSX@hvgaP?sMc;G(Bz9m{xiM?{I
zLT%3<9kjDvP~QG0xyps52%D@c`p$#ri}Y4YiQ1aM_u?a!zyp_V2>4<{;jPsN{0s{8
z7%+H{Wk9v8a)DOr9;TTc)Kf)zl&=L3AC<@Zajf^}=t^JqM!vi(ywh{1bDucp3nhAF
zM!<rScC&v+z!Q8v{U9CokWN1jJMs!<Phewpa?6hud_cBne~xTO&PRQYI=G(`=(83z
z;0Nkw3~Y+m+~@<Th@Y>J%A2uG;qtb|nWn}bvQ-u5ZMG6`xUsq7fbwgHCGQx=d-)^D
zjCNf!<%^+}qZ1+fAD4|A$E#6sV05T4E;8C#KNyd%0F{S|H7-*m(1<fS%3Z3Agn2~5
zoiGfjaW@>*aWls<>I$&?5UPGh(+0K@1uanN{`-;S!R*p0V)vC+6tj!DYJKO~kq#0z
zEK)@Ft8if$orOlz6GgJjr{A|XVH16vIst;I)WMkO3l=R!oNW6Jjz9WxV#wR%O%3bk
zCEZ0m2ae4G*y}@m(VD7Y{A@v=Pf)M-sNP>tuOU^QBdG!OW!KCY@F<WRA860syh|_|
z`LArLtVObr5FDpK8nB~(8O0T>Kt{_u{MUA{+LTIpRi+@luL(TJtLaItoZ{3~H@fGA
zrtKwp#izaP*@$ZN$9{?a4EN{~Rnh`dZFgj8f)ZBVMQj4E{-vw_VMqqZ+09_fo3{D6
zaIvjL@xAhDvpOh0o>%sc$T<L>Gkf{yxVM^ZA@}&MY_U%3#>Pl!=bl(pRPAcfa4F70
z072ssi|p1z7|N?CT@tDNq&;l}pR@}<ylC)%1{%I^-m}Kxrf+R&s@!}f5eA1Zcm;wW
z`UAl?Fbeve_nv0w22F%4eK~}`1^E3Q`Z<W|T?9PF4dWfb@k0s7t}wexa~QG`;=vU6
zofEVB-HW4B50byCcN_Ge=pW~cRGV-x!W;fDdo_WQS+nw0?cXI>vT&}#mZhU;ihH%h
zVp7@Y>nr~NaIm)o_{r?W<Tl*a*^6%O(EUw6pi$}2S>J%42PVs;U|+E_zBc<H3x4+H
z&w)`tH+-~zYOOJ{BI8=c1w<I#%+^Zj!TO9j=u~r~U>w>yG&ZzNIdqlKUb+l+yys=7
z2Ejk#bkuu&g^fN;q8Fyo#oVR1hOmjf_G?dLx!J{xHYUEg)$&bKykf|E+-eC<XoR%<
zcG;P+0pjlh@zoCD?*aMDg-)R+#2STr611fNPQnZ`a37T<^ak?_xA7=Q&*3_|UC_*l
zDz;6igPPmF!iX`#$gzv}W`cD?kbuv*;lij%ad4-m9~HaOB4u*@Ss%BZ@8lkW$5Ye(
ziPZ;!SjJ5FP=lNgAQ6=2suI>k8W*w_7M4+ol*C@)%I?^5*wfq}Fzib~w}E%7-AqAP
z#YC~MZw)oDawAiZlM^biW~<e5HiIArrDQyxh82N`A03)Px2F~=&bZh+gl_HVJ2^M_
zQ8mUzzB2_Mk}~|CmVLL$Paz<ImBR5O{vGF3NAe<vfVbK3A{x?4wIuP>NoFUJwdLUz
zs(cek#xj&R$g5e+Wt!<_i5F=h3>%?@-AqC%cy^{Bi56+bs{1hrQ>}LG=Z?daw~dHg
zFxLp=5@)ygq4+Cg>D%nt*}0K6vycn^-aU)#r%tdaVw+_r;(F?@wIjCkz#3GseW1R)
z$`AvO1&WSZ`@-!)*T(S=k}9)(hJ4!rnljk64uaVy_QRMD%=QdpHEk2q^V^e^$BJs{
zlA2EFXrDWbRjG{B4$s@QnFSd!ln-~gfrRcXTTB1;L`}?{#l!U&;EN`ZaBXe2(jjwv
z^)c6Zc8{M-O8BHm??M12QexL3m9JH)X+e9oT=)4TRGF-NHf;9=(Wbd3g{P6f0)Nk@
zAS##ktaH7nwz~IkY0!QSSd<jsf;oyt@Z}-D9~(CtjV(B+cw4myZ0lL3G#_v2Ea9RI
zy{epE9%~&4d2#byT&*{tcgV)2X&vJ^Q<srvC7($Ed8Iz)!<?julPHDY=0VObpX{le
zg&kPFP&*?miScXoTnYS%P?a`wX3LrrkGc-O;2ytk(2KwFz`1-G9QQ)eu&%mPnS~Mw
zr@LB_eWG~MhJ5mdznoj*LQm?B`n!ZHTji(+0W>py0TxZd+-D9jb@>8hUjknUu;(^7
zk$XHI+ygy`ymB1-ZF@d1O1V-$R-?TqN1$e`?t|#Vh}RXj6NTxekkLb(2Gd&({DL`h
zZS+h}cwYQY`zU$iju|zh;@>G}?jSt>w5NARSJsSYARGT&3$FOu<3C>Kvd2FvIdM28
zi+^Hl;!@-tjvkK;&`e53VHT~N29|I+TEDPu**v^?r+i-pWa2%oTw7cqoPFJPHKwe|
z^au|(%HLK?z8Ax5cMNM(SPW&<S~e|<)1mkIsm6{#`!%XXh&HU6D?@wg$kr^M+>YOM
z`*A`bm3=RVm+ZL_@07IYcL2+wlbY0lT{ZXqiXgpmhKjM@T0oihXFJH?$jNGGu^@tr
zTC%i?-y<tBMc}$BX=li~4pfwUoT1stsr%biAS{yjI{gbGdnZ1!$g!6CNpx(TS6#Tg
z*swX3JhG6T9NLRcfUZxak!hN+t|N8HqH2|mk!@~I#F;Lc-gY;?xw&+XcjHZY_I&#H
zQMwRbN)VuIkxIg6UB&<=+@WgQ;A}0|R<GcWxZ7}XCk)MJ$%rK_N>qtbn7Pi8Lpz3X
zsbDdM{{9i|)+g~jrdcmf?2pj}_gXKQ*eq?59FbV4Bko5IwvJejJza(NasXbg>>Rnj
zpUwDZ5!wqEffDU$-#!m2v;|gGXUffO2+jwpnHOwZCLJ5*m2R9#AXUMYyxeR_qFEEg
zTf%7hTRHk%lF%=ipy)fM%AQmqza#5d;*@~{nW2uOuKEiqdObnjUphvA73dWf+sL6{
z?L|UQkcSZ;oOY@GVz#%#YecqxrOcNAef|vSQ4XQk3#2QmW{kLH-q*Ws7;WE9Q9ypB
zxkg-eWK(eTb9F!+xis$QYgk1$y_Q0r>K;vz(cZX_1>6O%;~wolU67Reo}wQk%_jx9
z<SF>7W}}4sWQVM7CAyY8p}S&_@igW_1-vewR;Q@Z-Hg}Ckn`DxT))h~T=@-nsh!Zh
zydH>*vV02o8R5QFRIOR##?R{I#<r+knis`pX~kJ!h>*{slr{7aF0bCCGYo3l&FSUd
zHu1tl<Sf-RPkg(HRj@?9m&C!8$&Ult;%5vV>Yg^1Qr9HSL{dFjo92{A_+P8-yGifz
zblcGp_KNe1f8ku>qwN~kc*J!VMlR91hGx)^kvIPwZqWs|du9|Iq)8jjC)Js>ecDtd
zNrLC4d{x`zqtLWB4>5aRO;@KjuWoD@TSu@vUtHdiKPN_Rv**m6WUy(ZFF1LD26i5X
z8X8a8@orux$bZWJIC6vDoQhto3EP4Z==kBBVL5`WWYwzhHU6s&ZOU5TTn^TDosENm
zmlsj8M97e9({m@_BNX9^-#)L=#nI8w(9w~)&jpWfTa-O;`F1&0y&`SGNMWgo`WEEZ
zP5>vL?bJiQcH^93skX>|mSC5E2h1+PMs0m@gfiR(U%wSdfJ)n-{X7y{rh-x!CX`$B
z%24N3kIEK|=qog(7sWI;m|tVd{@B5K8&Mi$u@2^NtRktT?*a~{p2sqcga_N7K+6l%
zh9(*DR^j=|^RBAoGC{#^$*EU#;J=b735S)jQjf0UB7Yh}W%4V?ccq`J2<hoph2qJ(
zLO5qGV4gn&NzNahH&ywmk2mv`#7{Dq^0^P0hur}lC~-L;uk1iXdnhr~s%)~QHSiS|
z$t5a~OSvp3$BDdRRpSu_JFtuhAih0F76BBJY$uhf85b`j)6=0>*cY8f&-pfQ@#xyU
zId8PbUuMVn^6_L9kM<T}UA;GR4^l8f>F1>OQ+M`L52vh+hBGvX$!Vcz$;bErt52xv
zHq7e2H?ae_=F|-iz--o#Pwn+&K92Kdr<>&!5SWhrHfd1M3WQJKC(;9IG?*JS%CxM^
zxL1$n7<2hVY1Ka5aQ)Fh6q4nKDx$877H5l8O^a0m+>O8{=Ld1Y(y?QaCjj6|CgnJJ
zkK>X+mbZVlgv;`UZ!qt)udmj<CXp(<Td1^XJGJwrn29odG=LU661Z2WR3^@m1uv!u
z+>&tPj#1*(#W5!QdR1H6@~*a5_yq$+wA}XZ864y9Q#kt@MGN)pl-b*d)ImIVFu70z
zX%`c*{l{N_zE)FF(;5P_;UUQ4D1cJi;8FiMxAQI2eRIVd=Y7L}>&MbS1S$^(-U$L!
z5d-P^{Y{&M9xEjUl#!mJjXa_yF<k4#I6eB`g==JgS=P)g3dKXIXb~D4CHo|B3KR4p
zUFwbr0s#OD(>VF|XUNh5DA$wRAR+RTLI}x^AIn!ASD1npfPuEB4X;byr#BzQ414}I
z43W;*I2t+$80Puka^;6C-d(?8eHqn61)y(1T&fRJsV68CF=oa<9+})Sr4x8KrC&!0
z6~mV$3o$O;ns^F?V8EH96Ve0bU{aTvOHW-y5$<l2ZXk|gIW7sY#m~U@&=2|JA@?zt
zu^o73+z~<31r$>lD<BvkXKO&@__Qj-7)IS_YL7mmEVleqn`bL1dDL>NN1mtMFbruX
z++Zc}C||;VJ)-GjBR?DPkFm$lf-wIU@QHVP1EsA!gg(m<m-Gj-DmKnCt05$;@xUMP
zwn~3GoE=_z{`3}mV;de7uhi>VUpU;P<XM!-jN`;fQhCI;6umeg-A?LPN^@L0G)5BH
zWo{YP1*sDLwEs+g(P$fMsmwQh%rl4}k;u_1<=AxVTdW=N*b&iv59RZp6p#H7`aIP!
z=H@&1_km-E=caGB*Ojg>?&A~sE_r{WRe(MnN_Q+oUuLxaNv4%PBt8;~8{FQ?*mXSo
z^3${HavJ*iLuIP4!b4j3&zrxG;8vX1KAHxZRH1}wCVpNqHbq+0f@fk>sQj`5(`D%_
zdTh5x=}vuC0Xk@2&!r#Al+TgexnAq^-PH=hW3x`9RI`QJC-5ND01ME!y^wBbS?j3z
zZr>oY$fPSX2O&Mo?&mSXX={LXBt_3R8gDZB#92fjW3y3){}cfShd5D!J0YZ})6eBo
z!$CO?>cw_n$JCv1VXE?gmn(yjINMhxu@RIc#HKu9k;yV<Y9X^=a&dUw&f%MMOMY5C
zyM6mu*7dsR`cfuKc&U><+_W?EJ$LH)kR-c%^0Vc?LryE{;)liq_hY&n+UkLO+!@=l
z1Eas^gVDY6Ay0K73H6}SN0RC@(&Q)(`M*D&wGW*$U)m<u)7+T!Cf|+iDBWRuX5S6~
zt6Rp`(HuvSX--|P*WOni*M@eS94l`b04<K-Z!Oq3^1V?<JpFJwSG~}1u0AyE1+DH{
z{Uck0!;>pc|JKI9S?`iH*G6lt^x168t>L-iddydV=R6h%g^r6U@Zn*7nO$pN$psz_
zbnWdJXm+o7A$FqB;>6yRjMzQ+Vo2}0<JY{pFO5|2=|0?)$Ex{sp6;pq|D|LHao#=v
zCtK`6DPB1ckX~Q3&uH*F_E$AQJ#jB-fOU@DXBC`@cjar*dl#ZZvo%flJM~_oWP1&I
z>edLW));K{zVb&a^$`fRn+(z0if7vQCkNClD8G3<t(9Tga{${G`x@jkBEA8;?}wuB
zms=pZ(X=<^{ii!a_-zXASN)!z>-$7Z4`TJF$2EmJlj)ovG~NLHy)WsrV5Sq36BQ3n
zng`~a1JKNGa&n`X4+3{O)4j3D5c3z~`}kyfk#kwo?$b=_X?&-5(JQgOjPX6j1i9f(
z$q6^&7;<L(U@vlJlOwrZ6xlu4>0O-ZGaq1dhabo`Tg%I!-eIx!BQ;*n>fCakn}7xN
z5ZPfIsR=O!Uq<g|*K6miw?1Zv?@djw3xGEBBN4UZNYys<GG9jJl7l+)I}t2B*l3Fv
zG+B<@UxQ~N#NKn_x-9WZX?r`5W%h49kb1)l3TMjh*~yUC()Yep!`GVtY|E@jJUPrU
zN@7k_;+J&*sY_@<jZ!8*>U4>iEmbVF97Rv8+r2OQ-3tJc5mHtJWgd^*0lLHi!ps5w
zsHyf}tNOF?AH_Mp^xljv&anr8`6Bo9ethLX%2DJ*Y3luu^W}GEbM_%^ED@U)qv`&+
z)`Q-8{7l-3+vP`!@*&J{Hi>gs=PyEI@UuxbqC=f~C6wIri_yLQNiXO`<vP9sP=ql+
z5BZh^c^%b$Wcb;W$Qg@Hq)0y`-i_OdL!}$BbQ0RvVh<IXbywYfwG*~iFs_zVL#a2y
z=(8EN`m8v}$jemiO^xG4nV*(ycXs2`vlZ>KQxs;pCYv1bKWo-_OW+7u;0S8q2%SKw
z0#H@&aM|jES9sPK;9{=~+70oZ7pZ^fLit)xX2i7om-lqao%}mskWbghRlIC#)tWQA
zqZ5n;pB(N?)rl!n`6*R8^c{h^@FSnP3>BFJJZQCHMSzo3@*Ie_@3CaKldR0y{_$;D
zfSa%(>bi(e8-}c|nn9Y^2EfEhENE&qZOx#2H@>&fi}n?L(9u%+@pG>0RzIQldJXZo
zngfk#KQ*J!Jen=mKx=!8egB_zUmv|qZqesoS8hQXVveaJAZT^LCIwl8l$pbrnM0hJ
z%M&1UyFbZ96<OE5w=4$8Yz(3`JHT+aMn5$@0^#oxZ{#^3;A2ZHzq}>l0TR^t^}?6<
z4hX-`dCfjs4m!~O8-G&z_PVxVyAj{^)%K>Z-2zMckJN}`DF5*W;n*5coX9?QLm4mD
z-Dmv3Bd;F3&eHd#)`c#tx%Y{G;**-;d(CkAwTAuRp9&5%P2DEX9xTR>Ab`8JMvW-T
z!tL9*Thz7fd7o~ydGREc*?;+Ut@Y%8kIh{p4S<NwKu}?c<6j4NK>m+Qms|q#4T`l2
z?cwpU#aG`wo$&UOciDmG?EcdL`{Hff!hdeol`Hu9tF<dP$dmue?Q-A2^{RvWQ61x}
zCe~9?u#LOlq>lNibM1b<uNV11NSkx)gTu4>cJUpYdcK!Z?(`Z`+^4d3n~vFe9VtaW
zH8<$t1A}6ELWDSQ8lIX`u`OPxbk(SR(A;T7Gaf(rw&vb8C;4H05xMJ@4c{%UI46yO
zBh~wbttLG6`c$+BTsC^4RipEMyIAWZv)6^#Z1lt18lgW$KLRbNcnT~+2;2O>KXha9
zzPQ{w-B5VSyt)1cFIP?0oISa?MJyML+%HFtrzFzv5p;hm8b$1mYFFlhy&Y@bjrT{=
zOZrKtMyzn&iSOP@mGi%*sZ<Up4G(ZN2e@SiP-^v||I>DKHrNkAy+w!aFvilZuRHn{
z#?2TWE~0Qx(q^Cc`kdLa>zH}4)y9pl-77=Q_9P`H$PJfx&&DpTE9-I~zC%)%AM&{x
zUN5u53@>)wvn)gO&}!I_9R&T8W?!E>9Upd`IOn(7Sep?Oozz?ne_UFhw<^XwyC}bu
z-?AQ@b&d2fHraAGHavy)IbZN%J4k!w*zdb)Z<-OOf04R}COdDtuqE<A`-)4UIsH$M
zXeawm2t)QvvC#PMjz1~?*Vkjq)|G7yuv=<_*4?+$5UvUN`f>TrcgSOS*ruyB-*`BC
z&9pu7Jh#J+{rJBF)$Ykdbl96)P|02<du5zm>-@I;P#592ov=4Q3_Q1^&Wq|~5qtkm
zqwRkgGs9eez2<+WsUO*qNPMt(S05s^axcPB7ur#Gp?&w^fK2j0C&ok7T0IY-nc!-t
zI!N(}ltz2bM~EXs(@%nbCqo{eoQZeAt1pNJvjC@T@adsRX+K<*?s9LL7tamgnW4;g
z*K5-&Kgf}rWGAvjyAe%Kx<li&TimYg=%xql$*~@2-(&Irj()4p|0}FJ{4*V;l<EF=
zzeM-^Ymhx@FDHN+#}lm+Cp#Y2_XfZS&#JR5%zA4G?#A#Nj+Z~e4br8(H3I+Kni26;
zdDBb<sQ2*9kpdsS)1Jq*`((l$Bm4Yq_zF^1tj0|NV8Wg2aPlP;)#AI20Mbqz=6!GB
zFF$ZQvDl-Fu^F+>dA6(KtM4d(!uh{VmUP^H|FOg8m6x|yu3j@wKfE5@Fy3pkKBLqv
zO#0yYFC=NV9(2LIr$G9>ldZ2GkJJeI?YDZhw|Wd;^sW55*YA#fcN5?<^yr4)XJ@ef
zM=f6g7FUvm3j_)74vo{$I0V<AAvg){9w4|oBm@f*JOm5w4#8c61_%y~Yvb-bNHViC
zvpf5}xBC`OpZlM`P8Iilx9Zd>?(I@)3NZ?wwY`;FwJVylH@**};SCWkp&&1ddJKoF
zv$tdxK+B|G1GRiu{x8#Zyxni-qt2QC=Yernb@U^sE`Gg_NYnQbiPynbfy6B&(A9s)
z^<1DA-$<wgHljPki*3z8Q)sxJ>{_{y8lOY23qL8L*c;ynEz^@w;cV^AP4E3w@WWnp
zMAHuCy#u!PO_OX3qCSk?*(>UEYw>-<LT`F060)E7zwYp3oK1(5%P?`#do~3jRPc|h
zDpS=9bvq<(<#(JLxX#eOtn^@8`??2LG1zYaKvwU-inGJYu_ZFI#ap*c8G+O8pwZ5D
z|NYvsihpzg;kA}*``_-kr|XY9POuK}POs|j)u}qIb@Wx>5XKc~GZXLxgzJP59tya!
zt47GMAv9s%UrYDgopQflrGT%Qp;IIEWqbomqj9(QSFh`+<Rco(g{+V0J^)YT!2J-s
zfMnjK9u*RY70Eq?x7=f--H4v^le_wL2=zE+x6~iUY<^7)h27FgZRSa>8cFSLRC+BE
z+HD<^abd>)IPKg&h0<j&A%T{_^T#fg&4CeNwUBGCK@$B-$Lph}nwtg|YrQan8&y^>
zOGn=E>xU_hKddiBnWejA9zEOUE3*{rC>5fR(>2|>X(5FVsQ^Gh*QSdoDsB`H9E#`7
z<jTC8XyYz*V_JD110Uu%(|$iPcpE;U@M=R+4-UgmaW+zp;Qra+wK;VkaH#iaU7yA8
zX@*N>Mc~ymZwt`d%L3&g4F`l0-X<?-$flmdZ<0FV6F*Ty7#Mr%;Pg$`@f#!Q6Bz^!
z?u?t(ejad$$Ed!k=tVf!Xaes>(Kb0c!kiTRKg&SEQwP&;NrX?#;Qs~e-zNBazYdt<
z&VRe`VSSeZlcanaJ%K_DY=fSFC}!IBfje5Pi4IkQWK?gI2hGl?$B7R|=z4B}2Rt(E
zf4Jj{MS?Y&w!c`RpPp<|rD}^iVN1$g`i6gcs@-dcWZ^|48C*$+kB`uKbeUR16mLMP
z!hCrr<IT>(!K?M>{Uep0q8IP_hv0`yZ_Qbq4_c3U@t2D2XvUi>ugA{s7!rJnll#&x
zLvn5zQZ7qex0(&d>XzoVaffcz1g`WBD(z{;i^*VZOoi|pR(q`0?~tv)N=?Lf^-KK2
zv9js&CabvGot)a;sD=6}dYpwuj}mKwnO-mBIolHN5idUEZ>5k4FDii+U_vUgP^Xvx
z5?bI;DtfkqInUZ9Lo2?!4~77-65z`%dSKut@8+fOc3)2^3srklC`xz8am3sEOpHy3
zET9OzT{Xa<2{q8hoZp4btD5ySDc}nlx>jIdQG5INq5)*T)X8;{PhcClvy=s=y-5+}
zN|f!v*u!jZl0vxxux)#E{4%r*0*YAMn>angPD^UvG_B=dd;(6DxJBP_?zPMZJ9yKL
zE*{-yVK@4z_I0LB*j2ZTu52k2;IhL8Y-TU+huNWY*=9M2O3hBTkDE2wXwMaRDnCnh
zN9`)5=R$hX5{Vv*?Zsqi_4_axQ$vMJw$NG|{x-BF&mSV!_NCK25Bh$d9bl0|)}?6g
z@IptZxo_R&;+i>ie)Y&>&~1o!k9S>gy<t7+EQw=jkkfFE*lwK&^Bty3@t=eN9F)Lo
zXc}JQ5cV;ZYFC>|wHDJl;@(nUl`OP>unJ~_RIEEd+=j8lY$cNY1;2=7OMl>le-dGq
zVN8e;NHUM$zXeMc9gtCd_q)ceTMtgjs~vr;20S7kCRc&MT0ElB!{DI3s>#S(iG9cI
zmnBnLy6>wl9a{SiR_q5rUcaQufvGr|3{EPhWXY+4aAK*d#vzMImTulzz^mSysrYl{
zS^Xx5wD!|^bkmcRA6Y+*HdoZ&c0-p?H}v}OZQ>*7Y{)6+(A$Z^nF#@O-J{)`I_*dZ
z+k0=mbJ0S?2_4P{X*6#J98uhGDuLC6T5<-3k-{~mx{NtP@AZ=IheMfj6VKL?O@}4*
z%4>~%d+jTuB~Du1pNf)`R@sPMx{H!>^TMUlfx9xa)+W4ja%4R2rtVEaO#r0E54X^w
z;x7?%+3g|9JKxmV_#>P%x;Gf4%(D*Jd|c=5KO$bc7&t$%d84;2hzy9>=m>o&gt<N+
zI(4hodYsrJ$21#*U_Y98npm!AJ)Js>0vtWOUjc01ESd5o#FZ@V5PTijXD#yJK2mt2
zv9rz^0mo>Fh`r7NG5Onm$-E0WBj*{+I<Va|FGW}2iSnK&L-%PSl{MSr@#!);xiVmF
zEC{bJ2tP7Q5?;P0TpzlpFE{|Vo-D511L{%4tjyf{+SV;Kv%Yq<(98CZy5^+2|E2J9
z3?|qOhB}xgaV#ehuJ`kpb^S)Isn#64)vv2)T-`ZlvdOV=WAW<q*wiYERu~c>R)AEu
zMK`1B+FqyE#m6Fu?G^1)uVRERs3d*6y;|I2x*F3;s$H$C$Mpz~G1-y*Et#Ob)KUFI
zzV+t?z;Za--lCC}GwHm`3RJ4nnLwp%4LnfW3p)jeR@();xE}GyqD{xCZH#-dE|Il_
zw!h$kX!!IKPR#i;ShtNmS+w|M%PCj$iB?+<yEq$BZPdTOye%n#)r_`30nx$qU&1x#
z{<uAa(c}v&hW#CayHxm5-19F##JRBLzU$HHbrQS2C_-$=sH#s$Ma-^0m>FN3Nn@~b
z_{S|Y{Yz;15m{#0q6D}3%55qUTJ?^TuHJ+FJp~OfrCN{dt|5!}Ny&V;SxZS^+<f1)
z@*0^xdUMRh)WVfL`FzAtGrqw6(m#B!;KX}7qX}EqaxQYpL&|iI)JAEyXS<QA;w+qH
z!iC4Jn|q0$-9tFYX?t{mP+-ObM^@`xWDY&un%gzc1xNPkl3X?C_#gju5US+z-XNU|
z96sEGA3C`e_$V~t^D6n8b^0!BA*)8qi(toxNOq}5iY<R`A#XCl2Zuqn*PG;i(URqf
zV`U9H|JX+;B(DBp>T*|jgYRM4+BYaWpX<32)++_h^^B=azo}lPzoyz#5jxae%}|U7
z4E;*F!VG@Ty1=e@wwUqvUtcjX()vg4UG(SiXtXRn-(_sFX!=ujBFo2*3Qq(q1&1_;
zDopiN@vO(0DH)KtA@uzB`lmpqSS|NrPSyl0hf=HZ&3@J_TGX&~9Vbeu3NZT(#=cAZ
zT~4S|s#tob@lAH#m!C>#Ky1hPlB&>t)&0@JnrqaubU2VVW#xYhQh;tLD{fKi(*Ik4
z<Ep$M?FWQQ`5%KwphOCeoAQeE{}#l!DlbU~18GwJ$6(6AeM*lk=H}$-9}YWWy|<U2
z8D(l;pJ{zbrJs2ezvI^jZh7!ZAU5&nWaoY;?++{AJ2x5HGqJJjyEnH>&>z@;KCp-N
z{VvYmP3l|A=k%wnOJ8%VugNBGnD}@pp8D%Ph{<&dci`Ff#okxM2D5dap~1V9Gm10M
z(FP#$L5d62+4kzL+p@a?-jZOg=h@2PTy&p{0`vSY<A~WrIU?FU>HBgf0C>Wa*DWn5
zzh(FLR16^Jm?x{7UQmA1?s>!u_oR{Kzo*Ov<so*O5u@%&<I9zRoD-g+?!Tuv+>?fv
zLjh*TJQ>}Df`c1&k`e!gI^ikk)({-rvQv$ya8DXrE(DnUJ+)~kAK~DhG`gGwSU={;
z>E;z2{Cg_CnVZGOM)wxnaNX#3;c;|$wsyk5huYpSX8%A|yB#$J4P3GF{MBi7Z$JyO
zcCY*96aUf%vSf|E|9`1o`M;N}`R|mBWR0=^f2Th7Xg@b*reTlAN{|We&k|o#UV<o4
zI?zYf#{9XYgLqSX_xZmnxv%pV+NJ%W9qV6h?*{*D_%BYs{k?xfk4E*FORrQ?+iU)Q
zcK^ovuV?(1^V*#VzH<88>YHkY?`Ba`f&_<3CX2kNPW{f_cJIFny5jc4ypr5r5<(8=
zwZ|T1?65Jm?nJskt(BY)(wVJT2tNb}ZQiUejDkxL&|@Rg8yMqFr{Zf&_R`}`6d7kY
znfjPC;t<O3Sq<ia5KRV)qTH(V@jrk9i=zCh{PBFvKZ3lf?D0>UmKH^S0L9~Vnh=Yk
zf~r4&08L^GtK6!z@jn1um+BCfMBEAc&a1kRhL{j%&~%=wk4j{`^1U2*RTwhm*Ia@Q
zl^<k0>%rq*Y?5)^=pSUBkD<v))e};9KCW?4RI#LG)>%FH52yR$A2si{?8x8kQ&GTH
z$u9smsx_h(xD%_Ma1~mtsO+`ogWsyG;{OZb)i`l(+}d#;n>op^hN##~6o8A>8g)wC
z<5f<W3$}Dr$Lb67T{Kko%Jab{Dvf>lzZa-@E8WW&aZ&zt`n`PO8Sf~g4d=8g3^tM@
zv0PHe?*5Ik{{D9*|HAoqDkn=`COM9e$w_mo^1FH7sPcbEyp4lrLe(UyeDcct+sNmv
zr!xN`A*cDN@`<_m$Vg_Ev`lmyEz^HUc*^#5zw~^)LN;UR#ptqXRLhW9F2uDt7jsf(
z?)0GPAx5JW7ukgoa%VMi&$+$qCXbyBUyOHW@9{i%=FR-{iLR5|x;HYde}UsFlhKK|
zAKXuehbn~;c(_a;&6kzAuat(<(<LO{hx|u`6=?cpW!|e7!`bO_5{V&Pxc?FHC3iC2
z@O=mq=)VRVio<E?ViJKNXt<;xzL$=<{}E9p*U5!D^YZnJ{~mbNGN0|Z?amy{#zXA&
ziu)cl3++RGQ^ydoW}#n-s#)j|@=NWWJ2x-S+=RPO@q<IQd3?HO`bc+oTy1I}NSibM
zrn$Xe9)B{p!~U-1Pi}u}6xWtnT5o?Mu3zi=36-n=Z2zI?{|$N=Rstpepk8hV52q09
z{C`nihTh(yeZaN#A7VCf)5!2f$K|59@%e;q79@PWN^Ntxz;Q>V?i8eBxBWZxi2dnd
zSu%n<`V%r_>#*&Fn5)Uw8&2PIADw?zdf@JxvMecQX*baGZfnY^_0mAPVkbFmG@s>$
zoSN`#_u29&LPUxlRiS<7`vZ{fPjD|qAN8@^4Q_Z3On86r{jQ@qb)VX_hYWtcjY9VB
zT^MjtT@%n+aDD=|ffL^H!sxeP`t|&4!{m>z7U)_$yjt-4lSk*b3SuYCX!oyp=+-El
zytr%n_QE}N<SGW7bK7)C->9(Z^?Yx%{{*}TTcO$WbJ@pi`H#nGWA=YuA-`Ns>j8vp
z->VT<y7E9uk7t_{S%ES4)Q^L*`w#N}LOna77z=z!rtJ04fVy0Y(&JveBn#fgY?L|%
z3_n;82l2hg9zgK+zgL)HQcnQGuHwu83^??ZQoqK!)2eL|h7GMe7mRK`mM#A7P%AyO
zN-G$jc&u$b;$XS(C;R9L_vRfm$YJOHJ)Xb(FhlV{)j-oh^Fi;zz{1eNJcF@?iGgW?
z8G$)|g!V}F(T7K~u=21eu-9;ga3A5R;X~l#;M3td;J?8iB8VW2JSKk}@OT^%3sDg<
z0C5G097zPp9;ps#0a+Y526+R86(t?z6xA5@1L`;$7FrP63OXgaI=UlzIC?&MKl%dt
z7KT2?EG8pnCKf!_OKezdW$Xa#K^#1sXE;5$09<?AT|8sFLVN;zL;M>2V*(3;4niVA
zMZ#RdIwCwG#rt1RqVL3_#MvY`B+Mi!B)O#2q>Q9Ir1GSyq?4pe002N0pbxMBI06a*
zV89085O7TfONK#4N%n+Hk}QraovfIwj;xDpgbYkBN-j^XNp4DRPwq_~LLNt+PF_p_
zPk}`Npa4;DQHWB=Q&>}6Qo>VWQ35DIlw6eVl;>2iR2WnwRCH8Ns6?nvsbQ$msEMd)
zsoAN8sGn1-QX5jQQ14S;(>$iZp&_SXq_LnGr&*%erMaYqr^TXmrS+%Hq`d@20h55)
zz*1l@aD@(wPMywzE|cy%-7UQ`{RjF?`WkvL2o{6}A_CEZo`5t#_Mi|@HmH<=ok5a8
zo*{^#kYStg8Dj`z5@RuAKNBny57R5AsE3`7??3xcnozJ%B2aKY_Y8+Zy5C(K3Mvum
z5frp*(wvr7G_ka*{7eNuzpenWcnkdYqeue7F52(*GaO)z8BFmQtugD)T$-@VFB3K|
z<CT?*AYYs!3)KK_{>?393vjv@m;xA2TZnxgoezHPuY0!T9KjujS~@qEm){?~?zzq%
zUuc0$;q44z>10Z~o5dC8T-I6wwy`bGEWKDvI3PWEcMjyZg>|^?3-uvS((<wF62|dy
z)%tjlvs7YzS3r38?0Q??uq!oqzW(UU^xEj4+vRpNbnoW2*~@&@hxzt;s@bSpE7ddL
zep8kD(et=-?1LOrPvVLuj%9vBa+n`Yx8FB?dpW*tdM$Q<UwzvdDvW#Qd6i>&O?7aR
zY-W0$aGt^MW7H*#r?7kdmT>;6!l&VA-t@Yb$K%w+5QG#7ohZWCiDX1CN|7zG2G^%T
zVa|wkzX2@^j<q}+Cmye)k+zI2KRt)u*F5}n`=rG-*rPagOheOv2n&q>0DOdm8p->T
z4weq&nk=9$5`IRuBZHQV&~#*`T9|9H>#X4I7CuW7Smx}Vs_$v{sgx=IEK#FlbMs*d
z8%ujAl#5ZnB}lN#-K`Vl@(SjhM&#Q%KV(Z+&9mKwYWo(gz<dx!O{}K|M}gJ7S8qr?
z#I>kg;F)2b9EpO-a@)bddllt#>4t2DIh$}jaWH=@&U<SDZJ|w}9U(7gPsS#M+$D1N
z`Wm><gg};oSl(jEhFj8Nno`L&UWZU-)IqI6I#;}+ZLvq9G}!b$XXoG~nr=p?P6+cp
zeeNzM$BAsCM`%HWYojrW+BV|XD4AKBIhd5WA_3x+k!bQGZ3*2|d0OPn{%9Fj&qRDs
zuZi$!G@~4QiJ}8xN4Yw^8z#cBx#j|8T=$WbG%fb**UZ!yyGS@tHyW8yX^p!JG`ib1
zKH?{rgPVSJnl4?!UR|{m1Bce9nj*Unz6Z}<pWDPIr&nzr4r1=&egk#lmVrW!FEXSO
z2eKiNFgn7)0NfdzYI#=f&W6HBs1)CTh=Z}bE(M|KR`jO8CUm!M)ED~ihW(SJ<#mb8
zb4WBZmocy?$5;FCG@6Y!NLmQWVJ%g>MRentE}G?zJ?LDIIolbFyuyZKIGKIvG!$o~
zf&;h12vJ8quLzznt9H{D5-zL<@#0idqibUEsbzL{Bb-?7Svwsj1o{mJenYi0X)oub
zta1^(mUXRMYm>;^#+p}oF9@*Q{#^N7@{HH}OYKJ^HBojGZ%2(Q3}M6zn%#&}Z$%B;
zWBv;n{)rTVj8oL9VodMBNo=nUR-NRfD;4h#AH>V99drwPRpC>y8NSeVMJQ!@SF4Up
z5U_2vnXTs@J_==Y=&6uV&-AjP8fHIfN68Y%Y`pj|^*JL=A5ZBTK1fdo3%Q+gN#yZ3
zX6l+}SW^iq%ZoulcVH3n0rwNx%1E+(&)_T7f|&RFCAMQ`gHA-6F*OAhlEbA%x{!)-
z&EnIdwz+p2N*PNA*#p}CPf3L-%qT#&er40#pQK(l4@&b@JXw~v%yrUJb9F5w-OMC%
zi0;Klmh`h7dDT=<z7XKxH>6~-Lv=$xYAtt+P06sF=f;2_9!opW|LJfR#%SOUx7&$>
z?0bSEw~Yl_vVExAwnVRhTRZX<VMShbmz1T>{RZvrg;>j<>#z)Hy>wqD3{Ge5eE0rZ
z!^T)}sjq}aNIGOZ?C)hRY$;cb>fHUhY(<;!Q(;|^sbry958awJq8WeaD9PiR^mkoo
z^+x?sj-8KrkSAVOgU2CWDOSU^Phx2cF(~AiFGd^coJsL^w$x|F`>!<XJxeaD2nD#+
zT|=XEVs}nR$_(thp=QdL+E>Fcctafq-iSds!x`2x2Sqd<X%qx^aT}$A);hdRs=2s4
zkY=c+w}(yLU+6{MSPqgBdJL>JzdPvk7B|lJ7{RQYF(TQ8&#fL&*Xk1(e4n;xJ+h?t
zrpiPto=-{>auiZkPpD$nU$>0t>N)wysc9n(l$^eXcEH&_5yZeUSL-9U?lk|ojP;^h
z)6j`>2BKNMAS9kqx;Jc!)A#n~Dj^tY8Uj5o*uZuf7uYn#!BH~<nC#MLcI-?ivF639
zw0GsOp~DVyO4ZStWYeHvwVU1j`YCew)JX@ya(=dXICv4Hr>@GmEVw?o@51gp>VDav
z-^A%*cIT^hnBP~;^=kgf30VRzwB=LaM`z(P3cwVz_!<5eg>Qv*yV{>Ud}GXVB~^O~
zFWM8%ja(-yPdrQT!2RQp0tI7tvVzp^*sMWlL=J1~^n6wqJ{4y2X5CM_x%!qn(^R`@
zGjjntDrcO*yn!22PF+@~1%boh9rF@1(VX&c>qK~owS6EesZg2Z)#KMQ2D_%6kVyl(
z_`*HOXXEYzgwd)RLfnlIR%ZtA4sA;R)O1b0b$<CXl?lfi-A_&I`NjDCXSio2O;0V`
z&!=i;g=KOi<1-g|%>i>e4vnNHYDQyLNygg784fRl=u_t<J*}_aP`&GFY`kPM4WkVI
za(SIykw30UNM-?Rn4u%}<jU5AXt?o6Ik$_jeQEAXa*7E~_VWo+-Q;%X1h=Y_6M2&p
z?UvIPt<j2C33d3YsHhO3(m9|_$<E`%9GtnKfTcR-dgCv<;G$H)?e4{s@vYYeLk{%<
z8XsRL*}CLMj-ezbMys~Pp1E~?>eem@oDF;8QHkFD>NO8|kjL*Ul;6~gv!<-zNHMpb
z)9XO?58y>HH-2uw>(te0GmIkq3(Mi41mNqN?mZ8O`JJt5ALfglq^Dbq&gVGk=f_PJ
z5~%~ye4>dt$~T1uUMAgX{2MLD+9&3>wr6T*m$i|T0<~3FwY-q&mE4^Wq>3TTD|rqX
zvyHR0%5U4(s<XqxAylKaL&QUes%s%dL<5>yMjwd8UwoMpY7It-s(V8c1+crBm_Ryu
zLZvT1=*A6^t52<JQGGF>a06R3Ri@`9q<~Vs<2B6#kr!t5I{Rd1jpnSKwdn{szvwlN
zSb-ltWGho9y4m@Z=r}WQ6evk&#xQ@Bz`Ovi!*FV3_Gc#@9~&#xxpTG~9-2Sl6)Gw(
zI_(Us`+lk++4t>Wem7@%OGDOTTM?noZlEW(73+Ptppm+B=9oj^bp97c$j+L^v8CjA
z%Fr@t$INZxCU2P=Wn2;SZs{z<H6wLl^V6)iypk}txsX<<Yk2-;Gw)tvVw0p<LaiH&
za%seC-5Id&0cksbud8{6=8F{9?n^7#TfHypP4n0mZq0;)1Ft<fM>GoZpQOI<)P^0K
zb(>xqJkc5S?#|@o|1LLn(;hhZOw;}=rm35qO6Qmz=EocgExU?!!hzjVaNa;if%Ek@
zhl;zqp|95Vy$LEgNfZRHhd3sh_o!x_*3C~?<ibmvG?%T(k1KB8)okH3&fIJ}k6kHP
zI(6Cz^<|7s1rvyz2^ErSRqmQyGZ%UHajl*`;y8fk0D6`THKT~`6-f4QczH8Vw&U_$
z$Pe6H^|x?)j_|iPAjf5y$nGZ_H{)K;y<HhP-qez;=(f~3kU5fn-K#7`AT#dNZ*!~7
z5uy5l6#w<8VnbV1ylFFq>J<08^}_e#jscL9VymLdhKw;;DhC+iV;zL@E5?Z9Jyzu>
z09E%CB018oAnKuW!BsdT!NmgnbKWk28}NuhV$~P1FN-*5RZPs5p9Rx6`4(N$Y}~pS
zHaLx#y853AR<z^EpSuLS65P3D(i{5}78-A^Ewf3)SOxIEgIKK7&j>G6i^ox1xj#ES
z_H{`v#n*n@XaqLr8XlgUK%u^IzrGzcsLw$-sT!FU;^}~{Z)f<@W+DJD;L)o<C$B#8
zSyO=l=;<~7A#bWkQ23R;t6_?6%@Y6i7SS3{sNxI~DMF@?)w`}Kwt0p8?cw8tZ|D1&
zhZ{k)l@Yzf;XLtXyxS4x@7n04Hfx8k(_5(^-N@~2N?97jdc;i5U^#aGIFmDLkJ4_N
zS_H{<^LJf=t6SSN@==b72R0jmyxyL(X?qIAS7X@-2tIHd22$2<3~7KMwJD-e`RJMt
zVl2vsGB?OC^_;V?1MEe$R>vBOudVLf#~SO;b_Z24hVC~_k|;Z12eY7f;;v&Tb~!Lo
z1drZ|ge&7hzCIF68$EBV?XD82NTR-wCK4IULW-6P#4&Ja6Nm&)Ba7~_za#=Er0~s4
zm$)*chSa9QnMb-Dk#EyZ9S(0eiV%}{U8j1uOa+zk$K+%z%A#EYcWt-0tUgE`ejQrP
ztLuNxGSjx)J%1gb1+M2$sTsWJ^OISitCiIk<c$=Wd-PJsHvyfdHtm_QF02w^+dKPc
z<3&&G{@A1f&Qe*bcM>0#fD|Is>j;)K_|%|*C_Vb-9)8Aj*{5M|T$by-vsv-S^E+X<
z)p3V__HaU1K$ImDLVZiJwv1fZXc4>}{>T2uoSTbZC9-k!<a$CR;3dTdT*O-kK>KP9
zddyTd$Y*_?a2ac#pfM4LjpZ5(gZ%D5&p6RPX2vCoY&b&I`3mqRDq_Cq3lPH4SrSFi
zk3I5*S7JxU^P58UXp3X4VWbB<TeW2nRD2Q~e~c|!jpCAo!>%Bz=p=)mq5aOXBPfY*
z!B+(1isJP1y92!No;Oti$^Bhk^Y5jTWnkr=h2(B153E12urz3kbQzruteFi+g(lE1
zX?SB}!sXE6%TrQGQz1R0BSFN+0ej-LQS+ROT(PS+3S%QNPtnb(bTpjr#WxlfEJ2hF
zP3vrL9ry&pTR)L1D%*j#Vpd(RGX30Oip)7!<otxz*u8`G%5hAotx~ZoC9*u)f`L7s
z;8|JRcg=k!Q%|JYH}5-()>nwocXeOkN<`^iT&b^=kJCg=a-GWxkFE%{)5;Mp+Qqi8
z1B6sfza_J?y0J>>UoePLe?ys=Z3*BrI|?9Gr0|W9qa7V&Rdqlq=R7+@78^x+^ZZIs
zA=W0Ss5%~;&N?+!BKwtobrh{svX5+062l{Hz@eT%3F&Fm=On1y=_)8fayi4!m%S#@
z9co6oE`rrcuKE+n`@tW)o~3ZFFMy)Zb_4QT0@2FISy&>&L!y{_GN=-{Ht^Oz!E(aJ
zC)6MtDQA5dsN^Sid?n_y+9`vDL@AY$O~U-5t@7pT_NR4y>Q<Q{6Hnth{42O7=-;bE
z?GPs*^nGlT8<q@_4BDfyHxXYJy(r+>PaCI2?ul24m8YOFSk{--PP5h?9|^%FsE<Cn
zbqx9VL9ZuzxYTUfsIZ)_r?$y2AEQX00w)OhxolE<UMM*~i%R#Fm9qjfvi}pHfayoL
ziYh@CP#*qgl!l#sS!07v7+!==Nexy&Q61$EX6??s%*$I;F6bAyGjH%-t~1iU_wR+J
zM{ZezKH&9{|0du~7YO=BXf>2!7p1WTOD^IY+tWlNpzILD?juLeIJwGYItelZJvPp>
zZB21I+`p_sD5^Nj*E|#iJu}Pkr$f(sGbbhcM$Cy`VxrWV7LEE9wSdkV@n%GYQ2A$i
zYucfKtfw)`N`9PD01ya9ypiSgp;l}pJ{d*rP;H-<fk;|fMjYp}v{#?tzAuO?VnHh_
zM7;D<^5ddXTof?lFekMVF+dU+{=C@%&R>@<-X_Z6i1PNGZAAN?Ew8Qry6g4=>G;{{
ztbLVQ>4&}T94j5+&x*`rS2*WzaNSORr*u~D(t?ExkS|@npU1pHW^jIypU3_Y`Yus`
z^acJ~i|4}z=jh~A0si09LY~@Ye&_E9>wjtr0bQPm6|a{m%}#pc(r$?|I)zyFTN%BD
zM~{5%j<hT1SWQ5Kvjs{45`M_AP0WC%hbb<c5nNz9X)IAjvmEll2NLi5<e|vZVjF@H
z9LJwn(<g5#4hwd2q8U1-SU5T>%g25sFO+|gEQX61-IrAM3ZB{1Zw+y9W{<;>Z$$#W
zW36otyzSEnoMGYR0P%_iZuJk=?kQ8aMO|Zsk{66i`&#=9GY)gzOup2qs(S1>w|bHT
ze3av}D^GsYKPL5MbHnkpE1{-bIClB#hEwzU>57+G$j}-8p`4F1SKUYH{*OHEQ(8%Y
z`yGE6ns?AWNH=e>fMuI6!)eQXgaF4n+7NUFc>KoO{aDXnr*=$Iq@gR0$H`%?d6;7^
zIn*e<NlA+tN9DpBLty6>b0041gdB{mo-&Sv69s1YLGf@F+GWhaxWQ6{vi943$2U5&
z4)~HH-@d-Ob{_F@;)3W8qu}$~bJ@A?)^c2Y5hDuMKNLTVVXpK?*=)-09OW=${Q&!n
zMl2-^Ua;SLQ`7?iC|875X$Hk#zMjNiGHcEhpG}Bt0sE?z!DT}}>8X@__pWp*yl=6v
zor0+Vwr%@4v}F*j(U!N1AM!`DYG3q0Z7>WU|GA6k@i#nl1B$N+VYC&`W4UkgW+DeO
zg=ui*fmFFN%pFMO2QU~>%>j~n_Q*OjKv>gZ3nTp@CwL4V8qU+TH@aj;!VQ1};#ity
zE6Cwx&@J(L?A;zjDK}1cQU_Ow?iNAYhIsD&JFXwpWTTY`0#Zw2<WIqUjTTq<u+=6!
zn7EydAe^UJ!g!z%e(Nwvqow37r;K2&?*!fNh|WT0#7pMf)4(9ByAIuR8sJd0!=MY8
z1%b5na@4QwZcAz%%P~FrG37VxU}!4Ze)Uo;i6?9wSW*Ir)KTK>^qEnTe1yhP5?s71
zQBp#1j%f^Y8}jJxBk#e-X)HIT!({y7gPy>5IBdR#&k1_S;W_-%P>gt}Y?Yo9uD)cA
zQVKOiF(Q<rS<W+r!A=n8j7|_meUZ@RXv!L`(Qk_8kkIWpo4)>-c&bC?^uTXm+YsT3
zw@WG5nBQiqMVBooGTG3Of!meE6wNkC?|OwhkhfLG+93+=dwC+??(!nqnQQ+ez+q6t
z_oGmtz$y+h|D6>&i`yVF(Rshxm$D#9ywMJ<1`=@-`hoLTtqKf%ua>d<%+25!GzLJ-
zc0pBz2BeUSHg4vlkkO<?&OKKuyt3yp;xeHf&yzZ2-cZ}eIcP6Xa`P%6R8O{X7CT5p
zQ77z0QRYR_ZbnfgMA1w|QPoBPFO)x*<mVNBk5wVQ0ZZ1;nM|l#TUfoYV!B<!ld*g|
zw2Wx6QCQiN>E6zj<XkTqC@GQg!YHi^E36nJ*6=O=c_>AUak1J>)8|cwYavcsX(bYg
zHRlM0sxh~*Y<+7*n07dEV&>0jyS^G#d9SN>O$SH~iv4Rj`eoW?PljTbeDB~Cd27+2
zph}?_pvs}4VHlvxVPNicHH<hHhyn-dF+=qukzWX^8d^#02{ryb2~`gJ7=fV_id@3W
XoIqTrR9{)W6q>jcN~07y9P0l79TCB^

literal 0
HcmV?d00001


From 3bfc1aea113c26d67cf4489e0feb913d4b4d6473 Mon Sep 17 00:00:00 2001
From: Jakub Nowak <jakub.jakub.nowak@gmail.com>
Date: Mon, 7 Feb 2022 19:50:44 +0100
Subject: [PATCH 4604/4742] Allow mapping <Esc> in vim normal mode

---
 keymap/vim.js    | 8 ++++++--
 test/vim_test.js | 9 +++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 1cf9636fd6..b2da1c132d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -865,13 +865,17 @@
         }
         function handleEsc() {
           if (key == '<Esc>') {
-            // Clear input state and get back to normal mode.
-            clearInputState(cm);
             if (vim.visualMode) {
+              // Get back to normal mode.
               exitVisualMode(cm);
             } else if (vim.insertMode) {
+              // Get back to normal mode.
               exitInsertMode(cm);
+            } else {
+              // We're already in normal mode. Let '<Esc>' be handled normally.
+              return;
             }
+            clearInputState(cm);
             return true;
           }
         }
diff --git a/test/vim_test.js b/test/vim_test.js
index 7822d62788..0085633daa 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -4667,6 +4667,15 @@ testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
   CodeMirror.Vim.mapclear();
 }, { value: 'abc' });
 
+testVim('map <Esc> in normal mode', function(cm, vim, helpers) {
+  CodeMirror.Vim.noremap('<Esc>', 'i', 'normal');
+  helpers.doKeys('<Esc>');
+  is(vim.insertMode, "Didn't switch to insert mode.");
+  helpers.doKeys('<Esc>');
+  is(!vim.insertMode, "Didn't switch to normal mode.");
+  CodeMirror.Vim.mapclear();
+});
+
 testVim('noremap', function(cm, vim, helpers) {
   CodeMirror.Vim.noremap(';', 'l');
   cm.setCursor(0, 0);

From 17634c2205d987366dedbb763fbf7b4d4ecf1326 Mon Sep 17 00:00:00 2001
From: Geist-zz <749062+Geist-zz@users.noreply.github.com>
Date: Sat, 12 Feb 2022 00:46:54 +0100
Subject: [PATCH 4605/4742] [addon/edit/continuelist] Check mode.name AND
 helperType for "markdown"

---
 addon/edit/continuelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index 6ec65010d2..d8b2e0e1fe 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -24,7 +24,7 @@
       // If we're not in Markdown mode, fall back to normal newlineAndIndent
       var eolState = cm.getStateAfter(pos.line);
       var inner = CodeMirror.innerMode(cm.getMode(), eolState);
-      if (inner.mode.name !== "markdown") {
+      if (inner.mode.name !== "markdown" && inner.mode.helperType !== "markdown") {
         cm.execCommand("newlineAndIndent");
         return;
       } else {

From 7f702332fe32efa177063a54c2d5e5e2a4b7d84f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 21 Feb 2022 09:05:22 +0100
Subject: [PATCH 4606/4742] Mark version 5.65.2

---
 AUTHORS           | 3 +++
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bacc2b8424..5ab9613abb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -300,6 +300,7 @@ galambalazs
 Gary Sheng
 Gautam Mehta
 Gavin Douglas
+Geist-zz
 gekkoe
 Geordie Hall
 George Stephanis
@@ -378,9 +379,11 @@ Jake Peyser
 Jake Zimmerman
 Jakob Kummerow
 Jakob Miland
+Jakub Nowak
 Jakub T. Jankiewicz
 Jakub Vrana
 Jakub Vrána
+James Baicoianu
 James Campos
 James Cockshull
 James Howard
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 165c71a5af..2ccf2926d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.65.2 (2022-02-21)
+
+### Bug fixes
+
+[clike mode](https://codemirror.net/mode/clike/): Recognize triple quoted string in Java.
+
+[cypher mode](https://codemirror.net/mode/cypher/index.html): Fix handling of punctuation.
+
 ## 5.65.1 (2022-01-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 07d68beb31..a1ac26394a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.1</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.2</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 2a013b35f6..b63e17371f 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,13 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">21-02-2022: <a href="https://codemirror.net/codemirror-5.65.2.zip">Version 5.65.2</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/mode/clike/">clike mode</a>: Recognize triple quoted string in Java.</li>
+    <li><a href="https://codemirror.net/mode/cypher/index.html">cypher mode</a>: Fix handling of punctuation.</li>
+  </ul>
+
   <p class="rel">20-01-2022: <a href="https://codemirror.net/codemirror-5.65.1.zip">Version 5.65.1</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index e3d2ba6dd7..f54818e7fb 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.1</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.2</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 1794a3860d..43295d37c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.1",
+  "version": "5.65.2",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 49dad2c493..677fe67cff 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.1"
+CodeMirror.version = "5.65.2"

From a3e9c5379b435bd9083e9299a5933c310fbfb8e9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 25 Mar 2022 08:01:25 +0100
Subject: [PATCH 4607/4742] [groovy mode] Highlight interpolated variables
 without braces

Closes https://github.com/codemirror/CodeMirror/issues/6899
---
 mode/groovy/groovy.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 2b90d01c43..848a07719f 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -91,9 +91,14 @@ CodeMirror.defineMode("groovy", function(config) {
           if (!tripleQuoted) { break; }
           if (stream.match(quote + quote)) { end = true; break; }
         }
-        if (quote == '"' && next == "$" && !escaped && stream.eat("{")) {
-          state.tokenize.push(tokenBaseUntilBrace());
-          return "string";
+        if (quote == '"' && next == "$" && !escaped) {
+          if (stream.eat("{")) {
+            state.tokenize.push(tokenBaseUntilBrace());
+            return "string";
+          } else if (stream.match(/^\w/, false)) {
+            state.tokenize.push(tokenVariableDeref);
+            return "string";
+          }
         }
         escaped = !escaped && next == "\\";
       }
@@ -122,6 +127,15 @@ CodeMirror.defineMode("groovy", function(config) {
     return t;
   }
 
+  function tokenVariableDeref(stream, state) {
+    var next = stream.match(/^(\.|[\w\$_]+)/)
+    if (!next) {
+      state.tokenize.pop()
+      return state.tokenize[state.tokenize.length-1](stream, state)
+    }
+    return next[0] == "." ? null : "variable"
+  }
+
   function tokenComment(stream, state) {
     var maybeEnd = false, ch;
     while (ch = stream.next()) {

From 9545666fb41e00156641884e058373d21c9a2476 Mon Sep 17 00:00:00 2001
From: Simone Di Nuovo <48733786+dinuovos@users.noreply.github.com>
Date: Fri, 1 Apr 2022 19:47:20 +0200
Subject: [PATCH 4608/4742] added tilepieces

Tilepieces is an open source project to visually editing HTML documents and Web applications projects
---
 doc/realworld.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/realworld.html b/doc/realworld.html
index 5120167bf0..af07e73116 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -180,6 +180,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://textbox.io/">Textbox.io</a> (WYSIWYG rich text editor)</a></li>
       <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
       <li><a href="http://www.mapbox.com/tilemill/">TileMill</a> (map design tool)</li>
+      <li><a href="https://tilepieces.net">Tilepieces</a> (visually editing HTML documents and Web applications projects)</li>
       <li><a href="http://doc.tiki.org/Syntax+Highlighter">Tiki</a> (wiki CMS groupware)</li>
       <li><a href="https://www.tistory.com">Tistory</a> (blog service)</li>
       <li><a href="http://www.toolsverse.com/products/data-explorer/">Toolsverse Data Explorer</a> (database management)</li>

From 08ec7c24acb77f0550a9963b59d0d0930fe80c15 Mon Sep 17 00:00:00 2001
From: "sach.gupta" <sach.gupta@servicenow.com>
Date: Thu, 7 Apr 2022 16:20:30 +0530
Subject: [PATCH 4609/4742] [merge addon] Add aria-label for merge editor
 buttons and make them tabbable & keyboard interactive

---
 addon/merge/merge.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 7fd963f70d..35292c0218 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -44,6 +44,7 @@
         this.orig.state.trackAlignable = new TrackAlignable(this.orig)
       }
       this.lockButton.title = this.edit.phrase("Toggle locked scrolling");
+      this.lockButton.setAttribute("aria-label", this.lockButton.title);
 
       this.orig.state.diffViews = [this];
       var classLocation = options.chunkClassLocation || "background";
@@ -509,6 +510,8 @@
       copy.chunk = chunk;
       copy.style.top = (chunk.origTo > chunk.origFrom ? top : dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit) + "px";
       copy.setAttribute("role", "button");
+      copy.setAttribute("tabindex", "0");
+      copy.setAttribute("aria-label", copy.title);
 
       if (editOriginals) {
         var topReverse = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
@@ -520,6 +523,8 @@
         copyReverse.style.top = topReverse + "px";
         dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
         copyReverse.setAttribute("role", "button");
+        copyReverse.setAttribute("tabindex", "0");
+        copyReverse.setAttribute("aria-label", copyReverse.title);
       }
     }
   }
@@ -602,12 +607,14 @@
   function buildGap(dv) {
     var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
     lock.setAttribute("role", "button");
+    lock.setAttribute("tabindex", "0");
     var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
     CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
+    CodeMirror.on(lock, "keyup", function(e) { e.key === "Enter" && setScrollLock(dv, !dv.lockScroll); });
     var gapElts = [lockWrap];
     if (dv.mv.options.revertButtons !== false) {
       dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
-      CodeMirror.on(dv.copyButtons, "click", function(e) {
+      function copyButtons(e) {
         var node = e.target || e.srcElement;
         if (!node.chunk) return;
         if (node.className == "CodeMirror-merge-copy-reverse") {
@@ -615,7 +622,9 @@
           return;
         }
         copyChunk(dv, dv.edit, dv.orig, node.chunk);
-      });
+      }
+      CodeMirror.on(dv.copyButtons, "click", copyButtons);
+      CodeMirror.on(dv.copyButtons, "keyup", function(e) { e.key === "Enter" && copyButtons(e); });
       gapElts.unshift(dv.copyButtons);
     }
     if (dv.mv.options.connect != "align") {

From b4112c6bb26652fb886478fa68127ece9a59f254 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 11 Apr 2022 10:49:42 +0200
Subject: [PATCH 4610/4742] Make sure WeakSet.add isn't called with null

See https://discuss.codemirror.net/t/addmarkedspan-error/4256
---
 src/line/spans.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/line/spans.js b/src/line/spans.js
index ac17bf6b4e..3ca9a954ea 100644
--- a/src/line/spans.js
+++ b/src/line/spans.js
@@ -31,7 +31,7 @@ export function removeMarkedSpan(spans, span) {
 // Add a span to a line.
 export function addMarkedSpan(line, span, op) {
   let inThisOp = op && window.WeakSet && (op.markedSpans || (op.markedSpans = new WeakSet))
-  if (inThisOp && inThisOp.has(line.markedSpans)) {
+  if (inThisOp && line.markedSpans && inThisOp.has(line.markedSpans)) {
     line.markedSpans.push(span)
   } else {
     line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]

From 16438e1406daeea98a6cc53f1fb21708aa7fb209 Mon Sep 17 00:00:00 2001
From: kazk <kazk.dev@gmail.com>
Date: Wed, 13 Apr 2022 00:14:30 -0700
Subject: [PATCH 4611/4742] Fix Java textblock syntax

---
 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 863992d852..afb7b3be88 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -500,7 +500,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         return "meta";
       },
       '"': function(stream, state) {
-        if (!stream.match('""\n')) return false;
+        if (!stream.match(/""$/)) return false;
         state.tokenize = tokenTripleString;
         return state.tokenize(stream, state);
       }

From 97dd773045d373e65582b1458c4a6732c4f7a743 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Apr 2022 11:48:43 +0200
Subject: [PATCH 4612/4742] Mark version 5.65.3

---
 AUTHORS           |  2 ++
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5ab9613abb..13643874ee 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -782,6 +782,7 @@ Ryan Petrello
 Ryan Prior
 ryu-sato
 sabaca
+sach.gupta
 Sachin Gupta
 Sam Lee
 Sam Rawlins
@@ -824,6 +825,7 @@ Shubham Jain
 Siamak Mokhtari
 Siddhartha Gunti
 silverwind
+Simone Di Nuovo
 Simon Edwards
 Simon Huber
 sinkuu
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ccf2926d4..6ae12ef4b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.65.3 (2022-04-20)
+
+### Bug fixes
+
+Fix a crash that could occur when when marking text.
+
+[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Add aria label to buttons.
+
+[groovy mode](https://codemirror.net/mode/groovy/index.html): Properly highlight interpolated variables.
+
 ## 5.65.2 (2022-02-21)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index a1ac26394a..72393b9b9f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.2</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.3</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 b63e17371f..4015c3d671 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,14 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-04-2022: <a href="https://codemirror.net/codemirror-5.65.3.zip">Version 5.65.3</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix a crash that could occur when when marking text.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Add aria label to buttons.</li>
+    <li><a href="https://codemirror.net/mode/groovy/index.html">groovy mode</a>: Properly highlight interpolated variables.</li>
+  </ul>
+
   <p class="rel">21-02-2022: <a href="https://codemirror.net/codemirror-5.65.2.zip">Version 5.65.2</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index f54818e7fb..87fc5ffa54 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.2</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.3</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 43295d37c0..a0cd5ff44f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.2",
+  "version": "5.65.3",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 677fe67cff..8942a3fa99 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.2"
+CodeMirror.version = "5.65.3"

From d053a590d5adcb535c440a72fe0ccf9ee63c1409 Mon Sep 17 00:00:00 2001
From: Ziran Sun <zsun@igalia.com>
Date: Tue, 26 Apr 2022 10:53:31 +0100
Subject: [PATCH 4613/4742] Remove some unimplement/used appearance keywords.

These keywords are not implemented in WebKit/Chromium/FireFox. Suggest to remove them.
Ref:
[1] https://chromium-review.googlesource.com/c/chromium/src/+/1529972
[2] https://bugs.webkit.org/show_bug.cgi?id=238501
[3] https://wpt.fyi/results/css/css-ui/appearance-cssom-001.html?sha=117f23cf77&label=master&max-count=1
---
 mode/css/css.js       | 14 +++++---------
 mode/stylus/stylus.js |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 503c48c261..0841f9cb30 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -631,7 +631,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",
     "avoid-region", "axis-pan", "background", "backwards", "baseline", "below", "bidi-override", "binary",
     "bengali", "blink", "block", "block-axis", "blur", "bold", "bolder", "border", "border-box",
-    "both", "bottom", "break", "break-all", "break-word", "brightness", "bullets", "button", "button-bevel",
+    "both", "bottom", "break", "break-all", "break-word", "brightness", "bullets", "button",
     "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
     "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
@@ -669,14 +669,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
     "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
     "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "manipulation", "match", "matrix", "matrix3d",
-    "media-controls-background", "media-current-time-display",
-    "media-fullscreen-button", "media-mute-button", "media-play-button",
-    "media-return-to-realtime-button", "media-rewind-button",
-    "media-seek-back-button", "media-seek-forward-button", "media-slider",
-    "media-sliderthumb", "media-time-remaining-display", "media-volume-slider",
-    "media-volume-slider-container", "media-volume-sliderthumb", "medium",
-    "menu", "menulist", "menulist-button", "menulist-text",
-    "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
+    "media-play-button", "media-slider", "media-sliderthumb",
+    "media-volume-slider", "media-volume-sliderthumb", "medium",
+    "menu", "menulist", "menulist-button",
+    "menutext", "message-box", "middle", "min-intrinsic",
     "mix", "mongolian", "monospace", "move", "multiple", "multiple_mask_images", "multiply", "myanmar", "n-resize",
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 978696bddd..0759dcbdf7 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -742,7 +742,7 @@
   var nonStandardPropertyKeywords_ = ["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"];
   var fontProperties_ = ["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"];
   var colorKeywords_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
-  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","conic-gradient","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","high","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeating-conic-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","standard","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around", "unset"];
+  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","conic-gradient","contain","content","contents","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","high","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-play-button","media-slider","media-sliderthumb","media-volume-slider","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeating-conic-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","scroll-position","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","standard","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around", "unset"];
 
   var wordOperatorKeywords_ = ["in","and","or","not","is not","is a","is","isnt","defined","if unless"],
       blockKeywords_ = ["for","if","else","unless", "from", "to"],

From 3c4877adf34559106c948ff9b1d3381069ad073e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 28 Apr 2022 18:21:24 +0200
Subject: [PATCH 4614/4742] [julia mode] Recognize === and !== operators

Closes https://github.com/codemirror/CodeMirror/issues/6913
---
 mode/julia/julia.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index cb0d69c8e2..a75e8e52f9 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -24,7 +24,7 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   var uChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
 
   var asciiOperatorsList = [
-    "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "--?>", "<--[->]?", "\\/\\/",
+    "[<>]:", "[<>=]=", "<<=?", "[!=]==", ">>>?=?", "=>", "--?>", "<--[->]?", "\\/\\/",
     "\\.{2,3}", "[\\.\\\\%*+\\-<>!\\/^|&]=?", "\\?", "\\$", "~", ":"
   ];
   var operators = parserConf.operators || wordRegexp([

From 6597cc2bb28a190e0aeb6a9565ab4937c5eaa2b5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 30 Apr 2022 09:25:07 +0200
Subject: [PATCH 4615/4742] Add Rockset sponsor logo

---
 doc/logos/rockset.svg | 1 +
 index.html            | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 doc/logos/rockset.svg

diff --git a/doc/logos/rockset.svg b/doc/logos/rockset.svg
new file mode 100644
index 0000000000..a412f8f81b
--- /dev/null
+++ b/doc/logos/rockset.svg
@@ -0,0 +1 @@
+<svg width="718" height="198" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero" fill="none"><path d="M127.55 81.75c0-18-12.32-31.16-32.46-31.16H49.87v96.67h20.58v-34.64h15.07l19 34.64h23.62l-21.74-36.81c10.43-2.45 21.15-11.59 21.15-28.7zM185.39 49C156.26 49 135 69.87 135 99s21.3 50 50.43 50c29.28 0 50.58-20.87 50.58-50s-21.34-50-50.62-50zm0 81.74c-17.83 0-29.27-13.77-29.27-31.74 0-18.12 11.44-31.74 29.27-31.74S214.81 80.88 214.81 99c0 18-11.59 31.74-29.42 31.74zM294.28 67.26a26.45 26.45 0 0 1 23.47 14.06l17.69-8.7c-6.82-12-19.13-23.62-41.16-23.62-28.27 0-50.73 20.29-50.73 50s22.46 50 50.73 50c22 0 34.2-11.74 41.16-23.77l-17.69-8.55a26.19 26.19 0 0 1-23.47 14.06c-16.82 0-29.57-13.48-29.57-31.74 0-18.26 12.75-31.74 29.57-31.74zM425.84 50.59h-25.36l-34.2 43.19V50.59H345.7v96.67h20.58v-29.71l7.53-8.99 29.28 38.7h25.36l-41.01-51.3z" fill="#609"/><path d="M471.45 88.13c-11.16-2.61-19.28-4.64-19.28-11.16 0-5.8 4.93-9.85 14.21-9.85a41.23 41.23 0 0 1 27.68 10.58l11.45-15.08c-9.57-8.84-22.32-13.48-37.68-13.48-22.76 0-36.67 13.05-36.67 29.14 0 21.59 20.29 25.94 36.09 29.56 11.16 2.61 19.56 5.07 19.56 12.32 0 5.51-5.51 10.87-16.81 10.87a42.38 42.38 0 0 1-30.72-13L428 133.64c9.13 9.13 22.47 15.36 41 15.36 26.08 0 38.69-13.33 38.69-31-.01-21.46-20.3-26.25-36.24-29.87zM520.07 147.26h68.41v-17.82h-47.83v-22.47h46.82V89.29h-46.82V68.28h47.83V50.59h-68.41zM596.03 50.59v18.12h28.26v78.55h20.73V68.71h28.11V50.59z" fill="#609"/><path fill="#63C0DD" d="M60 20V0H0v198h60v-20H20V20zM658 20V0h60v198h-60v-20h40V20z"/></g></svg>
\ No newline at end of file
diff --git a/index.html b/index.html
index 87fc5ffa54..5eaa5d71d9 100644
--- a/index.html
+++ b/index.html
@@ -213,6 +213,7 @@ <h2>Sponsors</h2>
     <li><a href="https://www.desmos.com/"><img src='doc/logos/desmos.svg' loading=lazy alt=desmos></a></li>
     <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='doc/logos/executeprogram.svg' loading=lazy alt="Execute Program"></a></li>
     <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='doc/logos/cargo.svg' loading=lazy></a></li>
+    <li><a href="https://rockset.com"><img alt=Rockset style="max-height: 120px" src='doc/logos/rockset.svg' loading=lazy></a></li>
     <li><a href="https://primo.af"><img alt=primo src='doc/logos/primo.svg' loading=lazy></a></li>
     <li><a href="https://www.artcompiler.com"><img class=captioned alt="" src='doc/logos/artcompiler.svg' loading=lazy> ARTCOMPILER</a></li>
     <li><a href="https://www.prisma.io"><img alt="Prisma" src='doc/logos/prisma.svg' loading=lazy></a>

From c955a0fb02d9a09cf98b775cb94589e4980303c1 Mon Sep 17 00:00:00 2001
From: Mark Boyes <mark.boyes@oxfordsemantic.tech>
Date: Fri, 6 May 2022 15:47:16 +0100
Subject: [PATCH 4616/4742] [spaqrl mode] Fix parsing of veriables after
 operators

Question-mark characters should only be styled as operators within triple patterns. For example the command

SELECT * WHERE { BIND(?A+?B AS ?C) }

should not have the "+?" sequence styled as "operator".  NB the problem does not occur if there is a space between these two characters.
With the fix "?A" and "?B" will both be styled as variable-2 (and "+" as operator).

By processing operators characters (mostly) one at a time,  the existing code on line 40 to zealously interpret anything beginning with '?' as a variable can run in this case.

NB Line 40 actually causes a false positive in the case where the '?' appears in a triple pattern as a property path operator: this fix does not address this existing bug: it is quite complicated as '?' can appear in both variables and property paths while the parser is in the "pattern" state.
---
 mode/sparql/sparql.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 6d1d24464b..c325bc1acb 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -60,14 +60,7 @@ CodeMirror.defineMode("sparql", function(config) {
       stream.skipToEnd();
       return "comment";
     }
-    else if (ch === "^") {
-      ch = stream.peek();
-      if (ch === "^") stream.eat("^");
-      else stream.eatWhile(operatorChars);
-      return "operator";
-    }
     else if (operatorChars.test(ch)) {
-      stream.eatWhile(operatorChars);
       return "operator";
     }
     else if (ch == ":") {

From d81a3169a5d30d8cfb693c63e29262a1cbd65e2c Mon Sep 17 00:00:00 2001
From: Richard Fung <richard.fung@databricks.com>
Date: Fri, 13 May 2022 14:40:42 -0700
Subject: [PATCH 4617/4742] fix the paste operation when the cell is unfocused

---
 src/input/input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input.js b/src/input/input.js
index 288937be12..e740106298 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -72,7 +72,7 @@ export function handlePaste(e, cm) {
   let pasted = e.clipboardData && e.clipboardData.getData("Text")
   if (pasted) {
     e.preventDefault()
-    if (!cm.isReadOnly() && !cm.options.disableInput)
+    if (!cm.isReadOnly() && !cm.options.disableInput && cm.hasFocus())
       runInOp(cm, () => applyTextInput(cm, pasted, 0, null, "paste"))
     return true
   }

From 326dfc13aedc8be19542260dbc3fd92e1b54f9e9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 20 May 2022 11:03:32 +0200
Subject: [PATCH 4618/4742] Mark version 5.65.4

---
 AUTHORS           |  3 +++
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 13643874ee..7507f2c9fe 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -476,6 +476,7 @@ karevn
 Karol
 Kaushik Kulkarni
 Kayur Patel
+kazk
 Kazuhisa Ishizaka
 Kazuhito Hokamura
 kcwiakala
@@ -759,6 +760,7 @@ Remi Nyborg
 Renaud Durlin
 Reynold Xin
 Richard Denton
+Richard Fung
 Richard van der Meer
 Richard Z.H. Wang
 Rishi Goomar
@@ -954,6 +956,7 @@ Zachary Dremann
 ZeeshanNoor
 Zeno Rocha
 Zhang Hao
+Ziran Sun
 Ziv
 zoobestik
 zziuni
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ae12ef4b6..220709fd9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.65.4 (2022-05-20)
+
+### Bug fixes
+
+Ignore paste events when the editor doesn't have focus.
+
+[sparql mode](https://codemirror.net/mode/sparql/index.html): Fix parsing of variables after operators.
+
+[julia mode](https://codemirror.net/mode/julia/): Properly tokenize `!==` and `===` operators.
+
 ## 5.65.3 (2022-04-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 72393b9b9f..5377257131 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.3</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.4</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 4015c3d671..f3f549091d 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,14 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-05-2022: <a href="https://codemirror.net/codemirror-5.65.4.zip">Version 5.65.4</a>:</p>
+
+  <ul class="rel-note">
+    <li>Ignore paste events when the editor doesn’t have focus.</li>
+    <li><a href="https://codemirror.net/mode/sparql/index.html">sparql mode</a>: Fix parsing of variables after operators.</li>
+    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Properly tokenize <code>!==</code> and <code>===</code> operators.</li>
+  </ul>
+
   <p class="rel">20-04-2022: <a href="https://codemirror.net/codemirror-5.65.3.zip">Version 5.65.3</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 5eaa5d71d9..90978648eb 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.3</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.4</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index a0cd5ff44f..91b4b0191b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.3",
+  "version": "5.65.4",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 8942a3fa99..36a5373715 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.3"
+CodeMirror.version = "5.65.4"

From e71f6843ad67603350c545b8fdf41917e631a533 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 21 May 2022 10:12:26 +0200
Subject: [PATCH 4619/4742] [julia mode] Properly tokenize \!==, ===, and =
 operators

Issue https://github.com/codemirror/CodeMirror/issues/6913
---
 mode/julia/julia.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index a75e8e52f9..62272fd6ec 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -24,11 +24,11 @@ CodeMirror.defineMode("julia", function(config, parserConf) {
   var uChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
 
   var asciiOperatorsList = [
-    "[<>]:", "[<>=]=", "<<=?", "[!=]==", ">>>?=?", "=>", "--?>", "<--[->]?", "\\/\\/",
+    "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "--?>", "<--[->]?", "\\/\\/",
     "\\.{2,3}", "[\\.\\\\%*+\\-<>!\\/^|&]=?", "\\?", "\\$", "~", ":"
   ];
   var operators = parserConf.operators || wordRegexp([
-    "[<>]:", "[<>=]=", "<<=?", ">>>?=?", "=>", "--?>", "<--[->]?", "\\/\\/",
+    "[<>]:", "[<>=]=", "[!=]==", "<<=?", ">>>?=?", "=>?", "--?>", "<--[->]?", "\\/\\/",
     "[\\\\%*+\\-<>!\\/^|&\\u00F7\\u22BB]=?", "\\?", "\\$", "~", ":",
     "\\u00D7", "\\u2208", "\\u2209", "\\u220B", "\\u220C", "\\u2218",
     "\\u221A", "\\u221B", "\\u2229", "\\u222A", "\\u2260", "\\u2264",

From 52b26e84c339202bb14989ac86988384b67fdffb Mon Sep 17 00:00:00 2001
From: Luke Haas <lukehaas7@gmail.com>
Date: Thu, 26 May 2022 15:15:42 +0100
Subject: [PATCH 4620/4742] [comment addon] Make sure whitespace on empty lines
 is preserved

---
 addon/comment/comment.js | 2 +-
 test/comment_test.js     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index dac48d0387..dd0ff11b1e 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -78,7 +78,7 @@
         var baseString = null;
         for (var i = from.line; i < end; ++i) {
           var line = self.getLine(i);
-          var whitespace = line.slice(0, firstNonWS(line));
+          var whitespace = line.search(nonWS) === -1 ? line : line.slice(0, firstNonWS(line));
           if (baseString == null || baseString.length > whitespace.length) {
             baseString = whitespace;
           }
diff --git a/test/comment_test.js b/test/comment_test.js
index c6b9fe8109..7deda79138 100644
--- a/test/comment_test.js
+++ b/test/comment_test.js
@@ -81,6 +81,10 @@ namespace = "comment_";
     cm.lineComment(Pos(1, 0), Pos(2), {indent: true});
   }, simpleProg, "function foo() {\n//   return bar;\n// }");
 
+  test("emptyIndentedLine", "javascript", function(cm) {
+    cm.lineComment(Pos(1, 2), Pos(1, 2), {indent: true});
+  }, "function foo() {\n  \n}", "function foo() {\n  // \n}");
+
   test("singleEmptyLine", "javascript", function(cm) {
     cm.setCursor(1);
     cm.execCommand("toggleComment");

From e024ab43a0b6ef2c5c66f51adfd8157a8752ebf6 Mon Sep 17 00:00:00 2001
From: Konrad Zapotoczny <30635536+kudelek@users.noreply.github.com>
Date: Sat, 28 May 2022 11:57:47 +0200
Subject: [PATCH 4621/4742] [search addon] Add a proper label to the search
 field

And improve contrast on dialog text.

Issue https://github.com/codemirror/CodeMirror/pull/6920
---
 addon/search/search.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 24a0855e9e..60b7a808ab 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -202,16 +202,19 @@
   }
 
   function getQueryDialog(cm)  {
+    const label = el("label", {className: "CodeMirror-search-label"}, 
+                     cm.phrase("Search:"),
+                     el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field", id: "CodeMirror-search-field"}));
+    label.setAttribute("for","CodeMirror-search-field");
     return el("", null,
-              el("span", {className: "CodeMirror-search-label"}, cm.phrase("Search:")), " ",
-              el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field"}), " ",
-              el("span", {style: "color: #888", className: "CodeMirror-search-hint"},
+              label, " ", " ",
+              el("span", {style: "color: #666", className: "CodeMirror-search-hint"},
                  cm.phrase("(Use /re/ syntax for regexp search)")));
   }
   function getReplaceQueryDialog(cm) {
     return el("", null, " ",
               el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field"}), " ",
-              el("span", {style: "color: #888", className: "CodeMirror-search-hint"},
+              el("span", {style: "color: #666", className: "CodeMirror-search-hint"},
                  cm.phrase("(Use /re/ syntax for regexp search)")));
   }
   function getReplacementQueryDialog(cm) {

From 17897eaa5e2b4144b508cb7cab67306e3302fc21 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 28 May 2022 12:00:09 +0200
Subject: [PATCH 4622/4742] Fix code style for #6920

---
 addon/search/search.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addon/search/search.js b/addon/search/search.js
index 60b7a808ab..23ed894cdc 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -202,12 +202,12 @@
   }
 
   function getQueryDialog(cm)  {
-    const label = el("label", {className: "CodeMirror-search-label"}, 
-                     cm.phrase("Search:"),
-                     el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field", id: "CodeMirror-search-field"}));
+    var label = el("label", {className: "CodeMirror-search-label"},
+                   cm.phrase("Search:"),
+                   el("input", {type: "text", "style": "width: 10em", className: "CodeMirror-search-field",
+                                id: "CodeMirror-search-field"}));
     label.setAttribute("for","CodeMirror-search-field");
-    return el("", null,
-              label, " ", " ",
+    return el("", null, label, " ",
               el("span", {style: "color: #666", className: "CodeMirror-search-hint"},
                  cm.phrase("(Use /re/ syntax for regexp search)")));
   }

From 1c5868673faa3802faf261c7ed0241180b7f59ac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 30 May 2022 11:33:19 +0200
Subject: [PATCH 4623/4742] Work around Chrome 102 wheel scrolling bug

Closes https://github.com/codemirror/CodeMirror/issues/6923
See https://discuss.codemirror.net/t/scrolling-issues-on-latest-google-chrome/4444
---
 src/display/scroll_events.js | 13 ++++++++++++-
 src/util/browser.js          |  3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index 5c6173ac47..809e78b087 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -1,4 +1,4 @@
-import { chrome, gecko, ie, mac, presto, safari, webkit } from "../util/browser.js"
+import { chrome, chrome_version, gecko, ie, mac, presto, safari, webkit } from "../util/browser.js"
 import { e_preventDefault } from "../util/event.js"
 
 import { updateDisplaySimple } from "./update_display.js"
@@ -40,6 +40,17 @@ export function wheelEventPixels(e) {
 }
 
 export function onScrollWheel(cm, e) {
+  // On Chrome 102, viewport updates somehow stop wheel-based
+  // scrolling. Turning off pointer events during the scroll seems
+  // to avoid the issue.
+  if (chrome && chrome_version >= 102) {
+    if (cm.display.chromeScrollHack == null) cm.display.sizer.style.pointerEvents = "none"
+    else clearTimeout(cm.display.chromeScrollHack)
+    cm.display.chromeScrollHack = setTimeout(() => {
+      cm.display.chromeScrollHack = null
+      cm.display.sizer.style.pointerEvents = ""
+    }, 100)
+  }
   let delta = wheelEventDelta(e), dx = delta.x, dy = delta.y
   let pixelsPerUnit = wheelPixelsPerUnit
   if (e.deltaMode === 0) {
diff --git a/src/util/browser.js b/src/util/browser.js
index ae9d6af706..751a06cd8b 100644
--- a/src/util/browser.js
+++ b/src/util/browser.js
@@ -11,7 +11,8 @@ export let ie = ie_upto10 || ie_11up || edge
 export let ie_version = ie && (ie_upto10 ? document.documentMode || 6 : +(edge || ie_11up)[1])
 export let webkit = !edge && /WebKit\//.test(userAgent)
 let qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent)
-export let chrome = !edge && /Chrome\//.test(userAgent)
+export let chrome = !edge && /Chrome\/(\d+)/.exec(userAgent)
+export let chrome_version = chrome && +chrome[1]
 export let presto = /Opera\//.test(userAgent)
 export let safari = /Apple Computer/.test(navigator.vendor)
 export let mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent)

From b6798cc3e264eff0898ff8bc74341fd8595b486d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 30 May 2022 11:58:15 +0200
Subject: [PATCH 4624/4742] Mark version 5.65.5

---
 AUTHORS           |  2 ++
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7507f2c9fe..4edf4c1697 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -496,6 +496,7 @@ Kim-Anh Tran
 Klaus Silveira
 Koh Zi Han, Cliff
 komakino
+Konrad Zapotoczny
 Konstantin Chernenko
 Konstantin Lopuhin
 koops
@@ -539,6 +540,7 @@ Lu Fangjian
 Łukasz Wielgus
 Luke Browning
 Luke Granger-Brown
+Luke Haas
 Luke Stagner
 lynschinzer
 M1cha
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220709fd9d..5cf8c14310 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.65.5 (2022-05-30)
+
+### Bug fixes
+
+Work around a bug in Chrome 102 that caused wheel scrolling of the editor to constantly stop.
+
+[search addon](https://codemirror.net/demo/search.html): Make sure the search field has an accessible label.
+
+[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Preserve indentation on otherwise empty lines when indenting.
+
 ## 5.65.4 (2022-05-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 5377257131..9479d3d665 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.4</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.5</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 f3f549091d..1209318259 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,14 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">30-05-2022: <a href="https://codemirror.net/codemirror-5.65.5.zip">Version 5.65.5</a>:</p>
+
+  <ul class="rel-note">
+    <li>Work around a bug in Chrome 102 that caused wheel scrolling of the editor to constantly stop.</li>
+    <li><a href="https://codemirror.net/demo/search.html">search addon</a>: Make sure the search field has an accessible label.</li>
+    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Preserve indentation on otherwise empty lines when indenting.</li>
+  </ul>
+
   <p class="rel">20-05-2022: <a href="https://codemirror.net/codemirror-5.65.4.zip">Version 5.65.4</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 90978648eb..47f9ec00e8 100644
--- a/index.html
+++ b/index.html
@@ -102,7 +102,7 @@ <h2>This is CodeMirror</h2>
       </div>
     </div>
     <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.4</a>.<br>
+      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.5</a>.<br>
       You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
       read the <a href="doc/releases.html">release notes</a>,<br>
       or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 91b4b0191b..3f88289156 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.4",
+  "version": "5.65.5",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 36a5373715..84c331056b 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.4"
+CodeMirror.version = "5.65.5"

From e6f456f450bfb1ab9669c08ad66ab7bf4e142f64 Mon Sep 17 00:00:00 2001
From: benjaminr-ps <benjamin.roehl@pure-systems.com>
Date: Tue, 31 May 2022 12:14:06 +0200
Subject: [PATCH 4625/4742] [show-hint addon] Make sure the tooltip is placed
 to the left of the viewport

We have to prevent to render the hint tooltip popup to far to the left, which exceeds the viewport.

If it exceeds the viewport too much to the left, we fallback to zero position.
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 2be2c716e0..0af9bc7848 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -309,7 +309,7 @@
         hints.style.width = (winW - 5) + "px";
         overlapX -= (box.right - box.left) - winW;
       }
-      hints.style.left = (left = pos.left - overlapX - offsetLeft) + "px";
+      hints.style.left = (left = Math.max(pos.left - overlapX - offsetLeft, 0)) + "px";
     }
     if (scrolls) for (var node = hints.firstChild; node; node = node.nextSibling)
       node.style.paddingRight = cm.display.nativeBarWidth + "px"

From 898004f73748b757ebbc3f4515c527a608ccc24f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 2 Jun 2022 10:49:26 +0200
Subject: [PATCH 4626/4742] Use style.visibility to hide zero-width scrollbar

Since touching pointer-events triggers some kind of Chrome bug that prevents
the scrollbar from hiding itself.

See https://discuss.codemirror.net/t/cant-grab-vertical-scrollbar/4467
---
 src/display/scrollbars.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/display/scrollbars.js b/src/display/scrollbars.js
index f77ffc19f0..7f9f6cbb4f 100644
--- a/src/display/scrollbars.js
+++ b/src/display/scrollbars.js
@@ -98,13 +98,13 @@ class NativeScrollbars {
   zeroWidthHack() {
     let w = mac && !mac_geMountainLion ? "12px" : "18px"
     this.horiz.style.height = this.vert.style.width = w
-    this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none"
+    this.horiz.style.visibility = this.vert.style.visibility = "hidden"
     this.disableHoriz = new Delayed
     this.disableVert = new Delayed
   }
 
   enableZeroWidthBar(bar, delay, type) {
-    bar.style.pointerEvents = "auto"
+    bar.style.visibility = ""
     function maybeDisable() {
       // To find out whether the scrollbar is still visible, we
       // check whether the element under the pixel in the bottom
@@ -115,7 +115,7 @@ class NativeScrollbars {
       let box = bar.getBoundingClientRect()
       let elt = type == "vert" ? document.elementFromPoint(box.right - 1, (box.top + box.bottom) / 2)
           : document.elementFromPoint((box.right + box.left) / 2, box.bottom - 1)
-      if (elt != bar) bar.style.pointerEvents = "none"
+      if (elt != bar) bar.style.visibility = "hidden"
       else delay.set(1000, maybeDisable)
     }
     delay.set(1000, maybeDisable)

From 70572f115bf8fa58b5c19936a6b0a9f725a8c192 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 3 Jun 2022 08:29:22 +0200
Subject: [PATCH 4627/4742] [ruby mode] Don't add extra indentation on 'then'

Closes https://github.com/codemirror/CodeMirror/issues/6927
---
 mode/ruby/ruby.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 85bbfc657f..67ae0e3f51 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -26,7 +26,7 @@ var keywordList = [
   "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
 ], keywords = wordObj(keywordList);
 
-var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
+var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module",
                            "catch", "loop", "proc", "begin"]);
 var dedentWords = wordObj(["end", "until"]);
 var opening = {"[": "]", "{": "}", "(": ")"};

From ff35dd5492473469c3f7cca72d05ebf4a1789f32 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 6 Jun 2022 15:24:10 +0200
Subject: [PATCH 4628/4742] Avoid firing beforeCursorEnter twice for cursor
 selection

See https://discuss.codemirror.net/t/how-to-capture-or-emit-beforecursorenter/4478
---
 src/model/selection_updates.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/selection_updates.js b/src/model/selection_updates.js
index 3f399e5f0e..8213949fd3 100644
--- a/src/model/selection_updates.js
+++ b/src/model/selection_updates.js
@@ -137,7 +137,7 @@ function skipAtomicInSelection(doc, sel, bias, mayClear) {
     let range = sel.ranges[i]
     let old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i]
     let newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear)
-    let newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear)
+    let newHead = range.head == range.anchor ? newAnchor : skipAtomic(doc, range.head, old && old.head, bias, mayClear)
     if (out || newAnchor != range.anchor || newHead != range.head) {
       if (!out) out = sel.ranges.slice(0, i)
       out[i] = new Range(newAnchor, newHead)

From ad1a89a13a9c373aa5248de0c467cdd0a6d2d6d6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Jun 2022 09:28:08 +0200
Subject: [PATCH 4629/4742] Update version banner, remove sponsor links

---
 doc/docs.css                 |  49 -------------------------------
 doc/logos/4me.svg            |   1 -
 doc/logos/anvil.png          | Bin 9512 -> 0 bytes
 doc/logos/artcompiler.svg    |   1 -
 doc/logos/cargo.svg          |   1 -
 doc/logos/codepen.svg        |   1 -
 doc/logos/desmos.svg         |   1 -
 doc/logos/executeprogram.svg |   1 -
 doc/logos/holmusk.svg        |   1 -
 doc/logos/jetbrains.svg      |   1 -
 doc/logos/observable.svg     |   1 -
 doc/logos/primo.svg          |   1 -
 doc/logos/prisma.svg         |   1 -
 doc/logos/rockset.svg        |   1 -
 index.html                   |  55 ++++-------------------------------
 15 files changed, 5 insertions(+), 111 deletions(-)
 delete mode 100644 doc/logos/4me.svg
 delete mode 100644 doc/logos/anvil.png
 delete mode 100644 doc/logos/artcompiler.svg
 delete mode 100644 doc/logos/cargo.svg
 delete mode 100644 doc/logos/codepen.svg
 delete mode 100644 doc/logos/desmos.svg
 delete mode 100644 doc/logos/executeprogram.svg
 delete mode 100644 doc/logos/holmusk.svg
 delete mode 100644 doc/logos/jetbrains.svg
 delete mode 100644 doc/logos/observable.svg
 delete mode 100644 doc/logos/primo.svg
 delete mode 100644 doc/logos/prisma.svg
 delete mode 100644 doc/logos/rockset.svg

diff --git a/doc/docs.css b/doc/docs.css
index 4a199879ed..f687521920 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -166,55 +166,6 @@ section.first {
   position: relative;
 }
 
-.actionspicture {
-  pointer-events: none;
-  position: absolute;
-  height: 100px;
-  top: 0; left: 0; right: 0;
-}
-
-.actionlink {
-  pointer-events: auto;
-  font-family: arial;
-  font-size: 80%;
-  font-weight: bold;
-  position: absolute;
-  top: 0; bottom: 0;
-  line-height: 1;
-  height: 1em;
-  margin: auto;
-}
-
-.actionlink.download {
-  color: white;
-  right: 50%;
-  margin-right: 13px;
-  text-shadow: -1px 1px 3px #b00, -1px -1px 3px #b00, 1px 0px 3px #b00;
-}
-
-.actionlink.fund {
-  color: #b00;
-  left: 50%;
-  margin-left: 15px;
-}
-
-.actionlink:hover {
-  text-decoration: underline;
-}
-
-.actionlink a {
-  color: inherit;
-}
-
-.actionsleft {
-  float: left;
-}
-
-.actionsright {
-  float: right;
-  text-align: right;
-}
-
 @media screen and (max-width: 800px) {
   .actions {
     padding-top: 120px;
diff --git a/doc/logos/4me.svg b/doc/logos/4me.svg
deleted file mode 100644
index 8e894ee1a5..0000000000
--- a/doc/logos/4me.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill-rule="evenodd" viewBox="10538 7547.8 6693 4459" xmlns="http://www.w3.org/2000/svg"><rect fill="#062341" x="10538" y="7547.8" width="6693.4" height="4459.4"/><path fill="#fefefe" d="m15757 9524c-11.38-73.68-40.63-133.26-87.74-178.76-47.13-45.5-109.68-68.26-187.68-68.26s-140.98 22.39-188.91 67.18c-47.94 44.78-79.21 104.72-93.86 179.84h558.19zm-2797.1-489.69h369.08v166.12c21.04-24.93 44.1-48.39 69.19-71.15 25.08-22.38 53.02-42.25 83.76-59.94 30.77-17.35 65.16-31.06 103.19-41.53 38.04-10.12 80.54-15.17 127.47-15.17 85.8 0 159.84 15.88 222.16 48.02 62.33 32.15 110.49 77.64 144.49 137.6 56.64-61.38 119.77-107.26 189.37-138.68 69.59-31.42 148.93-46.94 237.95-46.94 137.58 0 245.22 36.12 322.93 108.33 48.42 45.04 81.78 103.28 100 174.71 24.57-38.29 53.4-73.42 86.51-105.37 56.87-54.89 124.72-98.22 203.53-130 78.8-31.79 166.14-47.67 262.02-47.67 108.86 0 203.12 17.34 282.73 52 79.64 34.66 145.85 81.26 198.66 139.76 52.81 58.51 91.79 125.67 117 201.52 25.19 75.84 37.77 154.92 37.77 237.27 0 12.99-0.4 26.71-1.21 41.17-0.81 14.43-2.04 29.6-3.68 45.49h-909.14c17.86 75.11 54.83 131.82 110.9 170.09 56.06 38.29 125.53 57.43 208.39 57.43 61.76 0 117.01-9.4 165.77-28.18 48.74-18.78 99.11-49.11 151.1-91l212.06 166.84c-61.76 67.89-136.5 120.98-224.26 159.26-87.72 38.27-190.92 57.41-309.53 57.41-97.51 0-188.1-14.44-271.78-43.33-83.69-28.89-156-70.06-216.93-123.5-31.34-27.5-59.13-57.55-83.39-90.2v231.03h-369.04v-646.42c0-77.65-18.61-136.51-55.83-175.87-37.24-39.72-90.65-59.58-160.27-59.58-69.6 0-124.23 19.86-163.88 59.58-39.68 39.36-59.48 98.22-59.48 175.87v646.42h-369.06v-646.42c0-77.65-18.62-136.51-55.86-175.87-37.22-39.72-90.63-59.58-160.23-59.58s-124.24 19.86-163.9 59.58c-39.66 39.36-59.48 98.22-59.48 175.87v646.42h-563.64v325.09h-318.66v-325.09h-795.02l-0.53-238.52 827.03-922.87h287.18v888.19h194.56v-888.19zm-513.22 888.19v-472.57l-403.19 472.57h403.19z"/><path fill="#fefefe" d="m16236 9012.7c66.1 0 119.69 53.6 119.69 119.7 0 66.11-53.59 119.7-119.69 119.7-66.11 0-119.7-53.59-119.7-119.7 0-66.1 53.59-119.7 119.7-119.7zm0 24.2c52.74 0 95.51 42.77 95.51 95.5 0 52.74-42.77 95.52-95.51 95.52s-95.52-42.78-95.52-95.52c0-52.73 42.78-95.5 95.52-95.5z"/><path fill="#fefefe" d="m16297 9193.9h-32.6l-19.55-32.41c-1.49-2.45-2.88-4.63-4.24-6.59-1.35-1.93-2.71-3.57-4.07-4.95-1.39-1.37-2.83-2.42-4.32-3.18-1.5-0.71-3.11-1.06-4.85-1.06h-7.65v48.19h-28.38v-125.91h44.96c30.57 0 45.86 11.41 45.86 34.23 0 4.39-0.69 8.44-2.05 12.16-1.34 3.71-3.24 7.08-5.69 10.07-2.45 2.97-5.42 5.55-8.9 7.71-3.5 2.18-7.37 3.86-11.67 5.08v0.36c1.9 0.6 3.7 1.54 5.46 2.86 1.78 1.31 3.46 2.85 5.09 4.62 1.66 1.77 3.22 3.65 4.72 5.66 1.49 2.01 2.85 3.98 4.08 5.93l23.8 37.23zm-77.28-104.66v35.03h12.28c6.1 0 11-1.77 14.67-5.28 3.75-3.56 5.62-8 5.62-13.25 0-11.03-6.59-16.5-19.77-16.5h-12.8z"/></svg>
diff --git a/doc/logos/anvil.png b/doc/logos/anvil.png
deleted file mode 100644
index 7cb2ab1d3423b40a2b50ffd74c75f02d03dff95f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9512
zcmV+@CD+=CP)<h;3K|Lk000e1NJLTq00CbB003kN1^@s6A%8Pl00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv0RI600RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru<qQuH0UMZ>
zh8q9?Bo|3UK~#9!?VWj?9Cexh-%nL{PtTEL!sNaQBqWmr5l}$zK=48!q6jFi=z=b*
zxU$RYPhDAmyPm5k-p7i%`a={HAt2s>;EKp45E61g5^_zFnM@|hTzynMzdxStoLxOv
zUz2>_uUBP~bWioSs;fTre4pzp)Hn-%-i{ZuzpH=<pt(&Tt3qEgL37YWm~KM7EQ%lq
zN@#CXK|LS8FUE>X$5s1~91e#AsrCR4<-~j1$Yy<11rbH+1p290WsG_>iO__SM2R89
zK$9r-iiC*v38WRt3X)O6KG1HI?!ZfQdx@TY>90csL<GcV#RcQ5eaH@n<0zyy#P^?-
z)>rKWlrR*0KWqv^nI@vMRb`IAOkgI$3}6P(f>MvrsJUa1yeW)^iu4HdD%uWgM%jYM
zMp3pXw281$JlPNiK{w*<v#6iFU}Ck;gu~%DN~o&%F1fpdAXH+BfNVN85%d($R$!j0
z%oEXtAk*@)iVk+<nv-H-zb2bZt4fCmtAS?}Rszqc#}i&im!f1P%i0U4Rr9ns9FC)a
zs)+CLw|5ecWl8vcA`^s5R5?e4Gl9jb%m#dseUe*Z6wQmckOo-~JR|T|Mek30>8Fxm
zB7>)_xL|TMPLIRkI0~qk_%67!gZU?Q@Z8^8yo`EHF+X^nz{MboL1(MdC{ocO8T&Q9
zN6{Aq9vAqj3J(xU-_*x;hg(k>$FmnXmxRONC>>>2x_Qgmi2<tOhXG?^zP>`?y@<XP
zWdevuwLQ=KEn!eXM0WsxMdgQ~&wXTNuXq~zevD_%cL6$w!!dHoDtn8T?I58-zc3Ev
zT;P2Iryz_$@oFU8cMzKULm&j*qsX6tZ>sQ+2AMs+mtf_aCRBTv4u@luQx^GKw5%Nk
ze8NOly~PMuigKC4c#&F^+#)Ed=q^NV5%@l#zXF1EEaUO?B`wt+ox|Z6rIc0(Rhf71
zF5<l*gy9T?H>=8(BAi(511-@3K7-1)QGTW|-Qk78ilxpM>~J`SPD#c0_<PzIvt3EI
z#LrN;R^cLnc(o6*lqlLGDz^!ILqmPsPlhZ%Z%Va?<#0Gg86^|n#dmC@CmGZw(}_z3
zt^r<B?Sm^H3MvnQekI-z{GzX)?3xRwR(ntmhhr2mV)1QV)`2IX5QLLM&%0KUD^R8&
zwNgG;dK3_g%xzTRyMY8>i>bFKB&MsDIzO<(;TV_^>EnWB+wq8t5X@5a<0zLS)E~LB
zdoY%vrh9>#fd9%;zavhsu3YMhGaL>_afYpu3zl^d(l0)B^98O4y+o1t(ILBsqA5jg
z2KiKmz88|z>oZGTI-0}bh{hYvFSRb~AdN3Rb&Eki2fU4=R(JuV4tSRke!7mj<0mIt
zWZ@m#t34=(!%@QwSuYpg)s8O#>A*h$;Rb>8t9=l)fK@3gqVoR~{kV^848xEWZ+0#S
zhr@9=L$-XwFd!THvqkuKfj3tB0BQxROcoS<JMhs!byBveq1wZ8I2<*~ki>WKvTcYk
zMbYa)FXd>7tPK(YRKy4V9^u1YIx}{{kJnXuSPqAy1{t*Ywk~T2C8>DVqFk<sU+uxy
zBG#Bq5{SG<gW#ID@5L6~)n4skIUJ4}V^HEd|E_ja@dNy~0q;U2=}g|@D2x@=tD2Mb
z=L6nJzusEyAvqjJ10Ik7>T+8G7>=PRK<t41#3=DhKQ@>*Wj!ROybR?UMJ7Ap9hlrX
znuEx{sOtI^Yo|U{?J+qVM>ykw6M-{;X_ydq0#5^f1-1ggAoddjjsso=%){d8&ja`8
zer8KC*a3C4by+(h%<$lgC~sAv>g{(&6RLzFdXsp36xGfZ7rN{RhocNk1^yGb6iBjv
zR<D>?t^hs`{0;~Q*w^X6jljtV>?Z`C1g-`CQi=f=bvv})-36*iflGil;e>a{h~S}e
ziH0ma(wYo895uvyfwuu;u=~u<Z81!YPXRs+OdnuBG2k_r04H+)j^+OT65!1Yvp(Wb
zitZ#9)(avh3cM%x;f`UT&<wmMQ0BKTbHO)<qr}94mjjIhyl)NzH~ebEtmr~W?zLno
z1|2EB3-0J3727jL;YySR<v3$U3nHM(=^$@cXj<X~*x@K8abPe>^&T*8fcNBsY{m9b
zl1#5+mT%0<@LJ%lE}M7ch=_>Fy9G|AMAH_B!vR1FXk-6sj8UY44b>iOo`NE<==L2F
zh>QXLQ53ggWQkB=sw!7yRGa4CzQaAz9FEcu0Jj3$io7QU+y^{f?ZM_Lm}-`76k`3s
z>wr^Th^^$D2XeBAK2Ys}I2=b1cVq5{Yp^u2d|qw<>;jenUj_D5d!Ts==lN!24CuSW
zB8QF=VbyPpMY&RZ?-8K4+GBEzY8tWNPcP6{?ZK3oe1<`q!R6KVVb<?2fn%}2m<Q|x
z)&pI+ebo$yiSOduI|u@OJ;=$3I<vRrs4pVt0H-ec>GlU#TvnC5-zK01ySU5w9V?K*
zZk|kT>jnC&anMDmXMb9f&&Yl9VeXiN+|N=UZxTy|IvXn{SP%Rfc#45@SVsdV0I$RZ
zv>jN5xeIm=@OxRzvVAJI9mqib;EHpY_==JgxL8G7T;H5BV7(_NfWF=9%Kk5vy;&N8
zSLe3lun2KEzvK`To)l)8^kEf8TQL9JHeg-u-<2TAeyeDFZkvFm0>*Q%=W{zpa<c}x
zV@~IOc3~FSuH5mr0WUB-Yqbuz3@aEo?tuS45BLC92vBoEGX#zYzR1BH6So830=|x&
z$6}0{V?RuMgLrr%umly)X>S=20W^-vX~C4l987#FK^?FZ_$)B1+NS{%q^-bnm|*-7
zcnA}#QZgRP?R*htQ5^@&0FKFRl|nJ$?F2SsWvZ(&3+>U|`4|WRW^=gk0-On454;}}
z_t8i*@L}L}hy4F!;5y6-{yw!ga~c*0iEr!O9cUPyD=@p3bXRrMJj@P53I;3%MP~x%
zoOD~~x+gEGhz5)Y-cD@@FW8ON476fa&ZWSEz;}SZG4dI~1mI1;1-Z|dN%8#6awC|l
zrv>X5a5na!*$Aw}e3f@l+_DqQ%`h|K^*3S<vwvsw36u|9g<S`QVo_tTUJJJlaBOkx
z`)<W%GCMJs#a3#}Dn9feCxe`hYJIh=UR6az@DKR><~omyW+oXkiWVx`ol$<ap`SgO
zFhYPiM&N7}y_w1cOX3WiU|ubJ%ql$|^JRVs_zA<af@8p0z`p=5!^Eyusl$YLUT(}6
z0ykj212P5PubB0>2Ya|2N&>h7SPOiQ(c}O1uoZFs5f~fs9>rz~#e}yGxDvDeTd?aY
zh2{2Mk3HN6(^#h>>=WM;?%4)eeX+ozs5e)_0u6!bNsseq)KMQ3RAFpFc>T0Gnqs3z
zd^h(7{Bm=OJ(-9%hzLq+HXbek9;v{Pb_0LH#BEUB?5cndECD`+SvucgXc6i<%-a1F
zFqhF)%+i7hP%GwExP!wVJ_>9CZpKoo3Vn~0FyHTUm@B8Iti1vV_MLwa^T$W=B=B>h
zGlcRpi|erO{y?S!{|Y?8z(Ko;vG2<Z6QOunzg3i(g>rjU74Hy>v>ap=rZsrHV{Sdo
ziTxiIlc*_t?b4lzzV0pUOlPUel0|oKe`Li4WzTxpi&;ZcfOD{n2cPmsRW<h+K4zH>
zrn%5`tb5cZEI)HF0^(r}QEtF|x`QRetW2f!R*{$6;tcLVAeb-r^O%KK=-BsSfu{w)
z>m&BF7!#XKm<ZQ06EKVSl|)~Q+pt*0a*AIIvnf0y0IMvmrrYT-_K9z-H#P=z0V0t%
zhcEEb3328$m2VM?P+?Z1Ph(7od!tKi^Qgk#Iy0m~E&9MvWxNOr@rYA+npx6eVZpr*
zV3x*WEc>An;+yX*H3@5OG84N|iaERIVhx=h$3&zUlH2F?4BWLUmD}GA%pbS|3xZ`R
zz56GhJuw~&8coQZgIN@R2+aik5AY0!i)a3O%m+?eBhJU`fPcdLzg;Chu2NA4yd$?o
zJ)HIeUjgo+xEn<<mqpa|Tt|(~g!YNAATxmlc{8QZv1L>l7Z?8i_<E++yH$h^BpWJw
zGD=rEWbNL7Th{jz3}~+jp!3Pf6b2TUQlLN&@NjOc27>u_Uxl^jdj-)J$;*J(VitQb
zJm6xik#^M0m&JUkzX$$|^>^J~;bWhQJ@j6lJFb@yEeK1nl(J71culd)kk4UO@{|Ja
z@i9?*7We_R7l89~=ir}-?naiv0&M@o5m=Cv6W?~Qr|3c=)Ym$53BTQ%ramToU_m33
zk~Q@psTiut_WqDfJt3QV1KRomI#VXRohfBqcb4}4Fn8Xf4a?k$$Me;EU6l~uT0pU+
z`BhkB>+67bVs4N_X$DTie0{}yb@?>9C=t(K0{(SObgM;MZu>oOCl(ZZ8-)e95eve#
zP&fl3i@7D{WB$@Y)u`h!aa)7=e`_V!B$(Ue--yoKQ0yW3MT+-q7`4Q}rpc|#m<dcM
z=2jJfK$W{Ur3ga!z`};3!U9%RI#S9rU0GJ`$?`&X!1lh7j+AX(>5xnap4e5D|2aq>
z^=t;7Dj%t=!z{ZASi}B8<kQ58iSJCzc!)aT4`S2wjnzKj19$@X0+!)%TEu&%Vd5IK
za>5?0_~3ZV@-GyCn}@j`Hep#1)egW3_E7k@BF9Z`te?al(nlmQfF-}6UVLT@u9#Rz
zhsr%$QuJh%_npwdys<vsC<}%aLsiKtbfuNQw5NHvBg5J~S$3wB-I<V{j1pqzisXd0
zZa9%hv5G<!o!olIc3FAR<VxHaa=-?aD`Qm5XLsl^wqcg-nG}8q%^*66l4m;6&Hh8o
zLafEYgEg2H93?_y2XX9Mu?N^3ER&@WXJKOZL8|ZnjbU+zrA6Me3-}C{opZzz0|<S_
z5N-Y+MBe?736*=drP<yea`pUr&X|}Oo&ePls!DGFYxiXN)s_^0X;0IUQo6HBCe(e3
z<q7zudf1rnVY*tWZ%-KxOW41PYZ91<Sybb&scIADUEV0)S*i_7soTuq!Nn)AT+Bk^
z+e~4X#DO#t-QZet`>vHK_kr|NytF!j^_>`ql~}OxdlW9B@qmkR@4J!eHJI^%w_?Q<
zQO(c$fv*9#Q=8ve$*^gP(8M6c7jhM{2%##=yE1&@sep@TCwbG%B-0wa(g{-q>B}n5
z?9TG@4gEaSo@RGO$%gxlG_Sl1*i8o+OKHV7feG#LSb*m=EZB1l`%|C}wSvn<-s*h;
zn@Zl!!2-}mv_)3Ozz>Ik#$T&9@j&Tq!r&tGin&(4fLXzXifP7Rxxs5Oe{(eoFiysN
z&{3&?A=Vo5TR?Xe##d4DKB6XI`cUsc5!vSt{qMDXJlc`r;@L?~X^Atv-ea`%0^Z&i
zaL1+;w{7TWdoECB1tpbOF;oGWjxd(eOpQG(SM(grk9rzr@m4})2Vx;64v%xN|FMtg
zXm<V~;V4c9_z~tKzM8@htQo*ZFkkzV6&~L-EVz1Vk@q};J)A3@g;EtP;AS^x%W$sn
zd{8L};jx_=mUm@2V`7}MC)crLe2h6wKFJz(M{Mc|_}1!P?%tdt(EWM2l`QBG;TVv?
zOfLtb5$k2}516%Ei_y>-SgP6c?6>;zDR7SAqgVj$2F(9^LB#t`#&U?S!~DgSU@Ue`
zUQpyc>oDP6LG^=z6(I&7_Ol^6$9G^vKoL@ba&KFjKkvxU+8krixEPC?ZJX2Nlc<rx
z300*lqkMC9FL!V5C)Day(5d<LMq2XQj0IG#rf}Y8t&jpbC|tRfk7GK9&n9e%^l8{~
z>4)NDWz4Iv9vXYgJf1k#?(#iE`+0X@DP{LFdiqg}nAib7M{IeSD_DpLWJ2YMof)3k
znPGgL$DBr=X$>AT8+_(8`OIkam{{l2QYVawSN?ue;Pw~#`R&$JRfQJ>RO>;98}t%v
z=JFw|qG_PuR5j@XZo;gaLvOM)PJBy&Vgbw>fd8U!0ImtML|0+{_ra_bF&qRq33GKs
zEyvym+=4YyI?`6-C`vBRSL+ZdsZA<55mr@pr$hdh3VEUvlD;rDE{ur_Nnfb<g@gwU
zF`>ct7?%*H)O#G)<g>UrMoZGmrF4~69M|j#xNB32zCf$)P!woDN0f2!HsHMsEW82x
zBkXOM)e}(OX`W#I$gNmV=m82_Tjd_d(L@FdTpfo!lnVvmrUD<u+&_;~`g1S2&$u4z
zrCf**xEIU7*j4S5R%!BXhlX-p^&+w_JxkTfaCfGZjufE#zj05%%L#VeGm)N9=W))|
z1aFz0WNOkYnE<Q8{o7J(=?jKZ3{e);tnMT-Y`4R)n5&^!K4>4-wEJh60JdW{Xr%;C
zG0QgZS}24Q-_p{9Wev;&E~l_t>qM*o<9*lzxs>O>0juD9ZISmZ2mXWFDt@ULxqzD&
z3L)hVD(6$w_I*n3FV?A2QB^VunGkxiN@pr$LwCUPt}Gv0+{En0(g<)WRG!?Gr8}c#
z@6t9%l;L0a7h|QGQEbCjZT$h(K&GY^5iHR;a1^E!tL&SL6<Qp6wdWh~T!Z<EOXdId
zfwutfCc5N%3-F&<<NTu%4?xh~YF_q|YZrOoW)*W*P4{qnh95rPOR7Y!`0afGyVIKc
z?CPp-?&JFyp5JXO)`~A`mFZ4w+V>SKeWzB1*HJ#!U|9suN4%cE{J(FZbbX#r$6Ojw
zUF-G&U&cC>)oKoQ*|Fe;Xd01ht=S!UQ4SOy+@4`?MoZGreQ!qTuK{20K9pW`SS=+N
zP`o(iC%`YT9NHTDb{!Q$f%~umjLwMnG-Kt*XO-adj>R7MCq%p+V%OzOlzzRwQAIAY
zELothcGT!#RF$5r(w!}h>6`F{m{%ieWchu4$gsqB7SYzlF5p*0-*AqjhX7ms;=4rm
zjh+j946BG7E-hFS{8td|!~89lh0#^*lTvL=d{wik)@+iy2-L@*F;<!^q+=2u4ZhTd
z_!_;#6yNbg=T5HY2yMmZ7#6*l@Bil!uX|Ww&b170Rp&Ssf4H3JwAH_14RbbB`()Gt
zdCRvKq`gLL!NU-Q7mttA6qAzpXvfzHbH~J}^Q2Z*Ms8<#&7$jw_S1D!dkwT5)ujz9
ztcYq+nPmUU5{bd?6ti;A!umEuEm*oa_t}qd6cthw!vj#2ZncwBbEqoK3E|>7Ns=Wh
zmi0wAcS?du^`3>;tEj(fUCp)-vS%2-UaVh3h`Y!g2cuX|hc93=qe6_sDkaZh@axXa
z!(0|oe%>D7`&j(J1$}dv_?neeb1Nx?s?^7XD~_w@r19~R_6&aM#5m_nN#y!YXw__f
z`*gMhLD|bZ9S*RpnqOi$z){!STx<c(RtC;L9gp?rJv-v{09%Rq>l}eg0gZ%Qsu|q^
zn`>eMj#;}wsEmyZSIn*F;#o;by<kRM;L79cdFA8;@v6EX6oj@=k9rruU|0BcjGX+k
zO1BVgiJpyFz!Qt?CysT_dpCufIOUfD`YhJZ!*Kw4@wF9QwfZ@Cs<ukRv<9DlnBTw^
z$JH~wu5{IHc|?RsNskXLYUIM1b&N}RWW&;=vJLHkWsfM^)?PfZR-S#;qM7nGb$1+0
zC)Uj70SddP1oQp=9nt>ZS7Q0RQ43%`hvgWrq*en;Rm1~WdC>$^*d!ubt96Q0l~5H=
zgwrP^_{ic$-f?U_;}YdFhD3zv4L;YkHuC-x8fYCC%lUvSc@lITs^xO|)M)bHVKib(
zsu!Zr(nF5YuolZcSRL_t5-SmYV}aLNvC`zIJo8<cZ~4AzA7rg^K%`tZDy$NbL9b|0
zDpbwqI-|j7>C8G_H?59&V@p+RGce5wkGCJ2WN~whTQ~Ichqe^mSuIOLpF<8D6<Lc!
z20sQOOLT=$BhjUuwMHw}gSHSU7*-mdV{klxHMsvOg)<eVVFef)*k1}f0r)Uh$yVqF
z$znd`TW~?&NcJh5m&tC@SnOGZ*Hr4mHP^hnrOx9u)9N^HdL4_##i)-BPVn*;YN4h8
z2d@q}@QM_^2roV+&Wr}1GbYBlZ9_lLbY;nw-{x8!CX+jd`MbNZbh1KStB%9gM0<+b
zwj6z|zrg&6*LP9=p0h_YiUq{x0H2_+i{T_Jo8beP@AgWp968EObSv;pMsI`sirg>z
z#J6MIxc-)&-qk3*D%v0wn6U;5XH1B5_56Akj*AW2#Sp5J4xytzWJOn&mAkXF_lI<4
zYzg;<n6<4uw$W$F_&D>&`ZUIb*dUr_PE2~7KfR7qTjD&lBg2o@^|7wI^saCPL}Z7+
zvl0Zu{eUf)I883_+A-K-g-=p^k;ZD`V_mQQj_AbvO}Jo9x#`0iFD<}|Bo4h1^9|Tn
z15abUAfnorK8X2}E44~SsYz2jKR%h;Mr;u56W?>6e3B>T&07wv7i3W-jxq%1j`2Bh
ze4K_sTD!ejWyS6+cW&(G;STHfkO`GQA=G@euC=I)i<J`3ZuD6?tB!M~B$!a=4Vbd#
zd*%y%?KI)xj&xbXSIp(G9(ZcidCkM!&9hj3c2rlh%P{NX%b1AOQbxr%ETaAiEKf9w
z71UrF<Ppd=Of=^LXBK!p3A`V>h9*bsV;$DS{b_1@wpEONY(^QyoZLBTAL$3}6W<?y
z=u8&fvGYlla5-perB=TjN;qv(Prz*(`uWACes-rVKvxLGgg6WI1<LY_vU*RJ2ezfT
zdVT|on`48rg8fo15r4?|1OicgN;>t~5$viRvoy}6u;o~XHCaCsYi9Dlx!>u*e5qL~
zca!+o4LlZ@4ZInfx*kJxV6ZbcX6JS&KZ^C&{S3Br``iNWX)f~nyD`7<Zy4R3%CeZ%
zo}sW?<wPvKZVe-B0DovyYp)7_26=-h<0=&^AI!(B*^}k#t9rR_TROMw&(MNlsQ@0>
zo~ARUd}vW4r?kWdRkTqaWm2r1n|sIJyn7@83B~+t=V8H*Ld39@1YU#{)2zmtSMS6`
zxDo-8{8C2~F)Md|?%&18uX1odqt}WWZG^xdurlCJVg(d~A%(4+{6j{6a8$9>xb+l{
zL-@c|x%b_S%|3_Ko$Vm;U2#zh3zzM<7q|+M7Y%2JLnW)wA1Yo@_zn}Gy+7out9rSA
zTY6uRZm3AEl<cWp8E#tJ%Q1D0%xv@tBW`N}QXvFoNIT07Wxe7(@R$4MjdXWwuw_`j
zh^-7<j3#VR#Zv~_X$`Ovi<pmA-{EK_jb$m!#}>UDXl=&;_#Ji)c2#@uCE{tU|HbhX
zo}7=xQt)05{1JEzyAL-pgf4=I<#RRmr`Gh=B_CC2714M(Q$=F}k91`C^wZtMyyz}t
zyHX*KbYzAtym>?fALZeW44+xv!=$8F)a=WK%JN;MUt3U-e&CM{iOlvA?eY#xSg$8K
zWotCC3iAa&Fv$0hmVD;X!Y(XMFc)|Og{#-{tiV#$hMO)~i|oX#+B1o6u_?eyb6Y#s
ztbR*wTaStHUvv8^$YJ7}iNykiAB&yz>E%2^PlR>dS=R2&7M)m%m{6A@=T=0>gvy_G
zqz7)OlmA>wnD48A=+@BVCr@mgJmTHu$Y2-CR;(oSTuQepK_$sz{a$YX{>0#2A_J}e
zR!QIXPzeWkty+1q>#=2iW?_ELLTm^AFYsuU#&{@cqQB>2uNC4?Sdqvli7o)jGm(SK
zu)8rqeirke|BeFR<6$@GQ*W8d!eu-Ds>p*Nmq_ua-iYx<D!z`Ih!C%yt&~BzQ@wCC
zSC@1UX-v4D1zrPOf#qlB+fLT1b(qB-9#3PPuYSYO7gTH`+V9p!ZKta3%8jwm^nNcT
zh^mi($FT)2zs=!29{PaK0l%g;9&Czb{zUnlH!?JTbP6+Q1j})r$>8syrrdTc7EoSE
zfor;;u(n+Ou>f?Zz=aastlKdR6y2`yAqo7pj$1!pj*r-lMXm3|gzSaf|Hm<b&aYY=
za<IjyW!geaVDlo|k68v?SndCvScLsX%+EHQl{dP8Mc5Saz#@S@;P%{Bs|o)Z>?S>y
zgN>nHY$cNap?b^hC|22)242Gc2gF{?qWd<rlZhhOd76&}b@Q1D3hV*?8?$DI;z!J2
zZk0!{c*+C@4iq0s49nPgzR(MYp%UVS`k1Kx0pZfxHJU~js%q<3i9XjEFRQVT!K}Sb
z?85mHw#epe>?WUur41#qGUR&7)6_<DW9i1kuMf*7eGbbB-NAlQ9?A5&ANUBC$#DjD
zlk5Q=!Xoh1v>pdy9ag@(5;zqL=Iq3}f!$2?#jPI`t}ZNZT!5bew^3UGHpQ;7k6}W0
zI(9DGv1$KL7~Vsy9}~|@v8<xYvAp`p49+mkMxCcfRb6sNn-_|ImWuoYtM7J<5QSBW
zUb+dE_bi=M>8V<+K0!-$9*P}bEli6?^Vp-tR|{hs>{v%S-u!+WFn8Xob3dnIE}3Jn
z!l6UG3BSRF`>@3liUnoDP`t-by$ST=BI0_jjs(>d$T#q0O{zM*+iUSgamP10#$M~=
ztHfCI`|ZJIC4a_*b{6LDnuQsulQE0C9-G1Zn26a+QERAmSqCU5AmR5=&a6<;+YyPX
z{*qAMuQ4{Rx^Uvicj$09YL&bzujo38MXlMDODEv@;W}0Mj*4`St_NUkkV|KKK}2p!
zCv}SxUWem|rw5C<6z!!lpesRDGOGSvqWU97cg=QH5Yc|nABpgLKP&G1IUEjP5aPSy
z!in_xeY-{YCh&W-imOeIGIH4s_aOQmpm&Y4dL0f&jzI;{#%IRji9C<WR}t2zIQ1=t
z=Kc`t{Qr3`mfgC-39rN9IDkQk?~`vCgF@(UPy9xOZvY+6`i;iIlDY}F5%f_Fe0R1S
z4#z<ZDShE3mnog^Y)jT<V%LFugy?SeM=us(+lk13^o{BH*7{e^DSc-ihr==I8B*@<
zqdye_rQh?yuc_+SRJB@VkF`t>aHA*wO<^YEgxBG46lBPS6JyjP=EwGc-Y6p9#brPo
zNWUUqM!jzYlI?2_U16ZZ;V8_I#drDnQ|L{l=<43t4)R$=zXIA<?E|SQs;IJ8l^ZnF
z8{-MOlIbK*y`iz%BXc+$HOjC{))w8>K|I?_%5P`^y;fBJ36ZfnlAVrLRCg+TDHQJ;
zi5R>4_A1X^=CT_c4o5U2(#ZvP?LzyuL85uAFa9+MA5>)$Qi+A<t4lt8LEr^cZ|F~Z
zH;p6c?^alQX~~+TI~<N9lo2({S#{xf{QAiRL3(d0k^Pdw^&;~0kuJQbE&VR=m<k{1
z9ozlwbzf{rb&gFq;dMA1gQ8?QdF*etFmZ#@J+1C6lz+u~UzVdsY}GixrP2r7CGe%d
zlSg(<+Q#<N7FT<C4u@kDQBosy;;J5|tnMR2INO7(Rpnj46lC=Kfo<tEP;@=Q_wfAh
z``JvJdOj<bI{&W2;TRev*TfU<Y6lf!8jMl#&IPVQd5u<e*|d?Ps(m8zD@AWgXS07y
zBoh7V#aQ*m=4ubk;c$#X%A$v-EPH`I>RI``uxPH%3gIFVd7q-k0sbfp#|4V6Lisu(
zcPG+&w)DjsS#!~pYLCm|aExNgs)CE}YDdK*2!f<1EKplf_hLaNaqvQiHH3L~RW&8Z
z7DR6e(I1D(dSAShipQ!8TdF-shr=<-sfY=>@Xj41$Vf`!NfGaOQGF+>OBH5_NIkWX
z9GuG?Q=tdgi0U#z?+2cz8=F$&`*+uMvg%Efsys-C!*QfgG0AIPwgU}Ah$n<}5JU6?
zgiA#@6PSz2Oi-`VOBI>sYACQ7SgXi=3b(0->%B}olw?}78nWg>S1RmqI7&xV?9GL@
zcA)VP@c?1Gz!|FYT7;8<xdPJ<Dq|=C`3~@6{{WEy*o^W#@Fb#t#OKc%NT&kZ=%#Dw
zvDG*|4u|6?pxTpt7B1U?04t|Xlm%@a^95Q#PXJi}ED&_A!o*y2au86J1OA>nklc|R
z*f>`>ps~6AqfOy?glB=(g04noMVM?~@1-Vy4=c}it_6p~QGTi}zIjeq*1oUYE(WBL
zV?1=0pi@zqfG|~ICdzaXouEhqO1%gTK!YlZ&?{&UN*~axLVM1guvt~w1nE%N8u)BX
zWWzn72dE&~MhNR!aY@ab4u`{Wgj17hGk@6*Jj}WklrR=hPcqgQ24f`9MiH%7B!&_b
zAqK>A;+qvTBT7~wtD=1Z-Su^u?sPUD1X&*i)Pt<Ra~Djg_Mti)j-!;C6yHO6@%J-i
zChWGx!J#5zO1saUK+gRjCe~Jo1}cgGo<Q5?CU(BhwRm(m9JRs!2ljyD4)RhYbpQYW
zC3HntbYx+4WjbSWWnpw>05UK#F)cANEipAzF*Z6dFgi6bD=;uRFff9W86N-u03~!q
zSaf7zbY(hiZ)9m^c>ppnGB7PLGc7YQR53C-FgZFiG%GMLIxsL;<IeQ}0000<MNUMn
GLSTXuMjyuj

diff --git a/doc/logos/artcompiler.svg b/doc/logos/artcompiler.svg
deleted file mode 100644
index d8349a1657..0000000000
--- a/doc/logos/artcompiler.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70.5 70.5"><path fill="#fefefe" d="M64.4 114.7V79.5h70.5V150H64.4zm37.6 34.6-1.7-24.2v-.3h-1a9 9 0 0 1-1.7-.3 1079.2 1079.2 0 0 0-7.8 23.2l.8.3a35.6 35.6 0 0 0 11.4 1.3zm-18.5-7.7 3.4-1.9 1 .5a29 29 0 0 0 2.7 1.1l1.5-4.6-.7-.3a23.3 23.3 0 0 1 6.1-44.8v-2.4l-.3-2.4c0-.1-.3-.1-2 .1a27 27 0 0 0-7.2 2.3l-.9.4-3.4-1.9-3.5-1.9a38.4 38.4 0 0 0-9.1 9l-.3.5 2 3.4 2 3.4-.4 1a34 34 0 0 0-.8 1.8l-.3 1-3.9 1.2-3.8 1.1s-.3 1.2-.4 2.6a55.7 55.7 0 0 0 .4 10.7s1 .4 3.9 1.1l3.8 1 .3.8.7 1.7.3 1a432.5 432.5 0 0 1-3.9 6.7c0 .2.8 1.4 2 3a47.7 47.7 0 0 0 7.3 6.6l3.5-1.9zm21.6.3a25.8 25.8 0 0 0 6.8-2.2 1286.7 1286.7 0 0 0-7.8-15.6l-.7.1-1.3.4-.7.1v.4a1616.2 1616.2 0 0 0 1.3 17h.6l1.7-.2zm-10.5-12.4 1.8-5.5-.6-.3a10 10 0 0 1 2.3-18.9c.4 0 .6-.1.6-.2l-1-11.5h-1A21.8 21.8 0 0 0 79.7 122a22.3 22.3 0 0 0 13 13c.1 0 1-2.4 2-5.4zm17.4 4.7 2.6-1.8c1-.8 2.4-2.2 2.4-2.4l-3.6-3.2-4.8-4-1.2-1-.6.4a14.3 14.3 0 0 1-1.6 1.3 391 391 0 0 0 5.8 11.3l1-.6zm12.5-.7a31.1 31.1 0 0 0 4.7-8.8 337.7 337.7 0 0 0-19.6-6.3l-.4.6-.7 1.2-.4.6.3.2a2416.5 2416.5 0 0 1 15.5 13l.5-.5zm-22.7-10a8.6 8.6 0 0 0 4.6-2.5 8.6 8.6 0 0 0 2.6-6.3c0-1.2 0-1.5-.2-2.2-.4-1.6-1.1-2.9-2.2-4a8.9 8.9 0 0 0-8.7-2.6 9 9 0 0 0 4 17.6zm24.9-1.3a29.8 29.8 0 0 0 1-9c-.1-.1-2.5 0-8.6.5l-8.6.8h-.3v.8l-.2 1.4-.1.5 1 .3 15.6 5 .2-.4zm-4.7-9.8 12.1-1h.4v-.6a36.7 36.7 0 0 0-3.4-11.3l-21.6 11.1.2.8.3 1.4.2.6 11.8-1zm-6.5-6.2 4.6-2.4-1.2-2c-.8-1.1-1.8-2.4-2.8-3.3l-.8-.8-4 4.7-4 4.8c-.1.1-.1.2.4.8l.9 1.1.3.5 1-.5 5.6-2.9zm-3-7.1 6.7-7.8.3-.4-.8-.7a31 31 0 0 0-8.6-4.5l-6.3 19.5.8.4a11.1 11.1 0 0 1 1.6 1l6.4-7.5zm-6.1-5.8 3.6-11.6-1.4-.4a40.4 40.4 0 0 0-10.7-1l2 24.2h.7l1.2.2.7.1c.2 0 .6-1.2 3.9-11.5z" transform="translate(-64.4 -79.5)"/><path fill="#efd1cf" d="M102.7 141.2v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm0-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm-.1-1.1v-.1.2-.1zm0-1.1v-.1.2-.1zm-.2-1.1v-.1c.1 0 .1.1 0 .2v-.1zm14.4-.5.6-.5-.5.5-.6.6.5-.6zm-14.4-.6v-.1.2zm-.1-1.1v-.1.2zm-.1-1.1v-.1.2zm0-1.1v-.1.2zm-.2-1.1v-.1.2zm-.4-2.2h.1-.1zm4.7-1.9v-.1c.2-.1.2-.1.1 0l-.2.1zm-12.1-.6-.4-.5.4.4.4.5-.4-.4zm33.9-3.8s0-.1 0 0v.1-.1zm0-1.2c0-.1.1-.1.1 0v.2-.2zm-49.2-.3s0-.1 0 0v.2-.1zm12.6-1.1v-.2.4-.2zm20.2-.3h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-42-.3c0-.1 0-.2.1-.1v.2-.1zm43 .1h.2-.1c-.1 0-.1 0 0 0zm6.3-.1v-.1.2-.1zm-5.3 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm-12.7-.1h.1-.1zm13.8 0h.1-.1zm-12.8 0c0-.1.1-.1.2 0h-.2v-.1zm13.8 0c0-.1.1-.1.2 0h-.2v-.1zm-12.8-.2h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.8 0h.2-.1c-.1 0-.1 0 0 0zm13.8 0h.2-.1c-.1 0-.1 0 0 0zm-12.7-.1h.1-.1s-.1 0 0 0zm1-.1h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-23-4.6.4-.4-.4.4-.4.4s0-.2.3-.4zm14-.2c-.1-.2-.1-.2 0 0h.2c0 .1 0 .1-.2 0zm-2-.4.2.2-.1-.1zm2.1-1.2.1-.1c.2-.1.2-.1 0 0l-.1.1zm-6.8-.8h.2-.1c-.1 0-.1 0 0 0zm7.7-.3.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zm-8.6-.8h.4-.4zm9.6-.3.1-.1c.1-.1.1-.1 0 0 0 .2-.1.2-.1.1zm-11.1-.1v-.1.2-.1zm1-.6c0-.1.1-.1.1 0zm11-.4.1-.1c.2-.1.2-.1 0 0 0 .2-.1.2-.1.1zm-11-.6v-.1.2-.1zm12-.4v-.2h.1l-.2.2zm-12-.7v.2-.2zm12.9-.4.1-.2c.1 0 .1 0 0 0l-.1.2zm-13-.6v.1zm-1.2-.5v.1zm15.1 0 .1-.2c.2 0 .2 0 0 0l-.1.2zm-28.7-.6.3-.3-.2.3a2 2 0 0 1-.4.3l.3-.3zm32.3.2-.2-.2.2.1.2.2-.2-.2zm-18.8-.8c0-.1 0-.1 0 0v.1-.1zm-15.3 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm31.4-.2.2-.1c.1-.1.1-.1 0 0-.1.2-.2.2-.2.1zM98.1 98c0-.1 0-.1 0 0zm-14-.1.2-.2-.2.2-.1.1v-.1zm13.9-1v.2-.1zm0-1v.2-.1zm1-.5c0-.1 0-.1 0 0zm0-1c0-.1 0-.2 0 0zm-.1-1v-.1.2-.2zm-1.3-.2h.1-.1zm1.2-.9v.2-.2zM74 91h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm2-1.9V89c.2-.1.2-.1.1 0l-.2.1zm22.2-2v.2-.1zm0-1v.2-.2zm-.1-1v.1zm-.1-1v.1zm4.5-3.7h.2-.1c-.1 0-.1 0 0 0zm-3.7 0h.5-.4zm1.9 0c.1-.1.3-.1.4 0h-.4z" transform="translate(-64.4 -79.5)"/><path fill="#eac1b8" d="M98.3 149.3h.2-.2zm3.4 0h.2-.2zm-4.7-.1h.2-.1c-.1 0-.1 0 0 0zm4.9-.4c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.1v-.1.2-.1zm-.1-1.2c0-.1 0-.1 0 0zm1.3-.9v.1zm-1.4-.3s0-.1 0 0v.1-.1zm1.3-.8v.2-.2zm-1.4-.4v.1zm1.3-.6v-.1.2-.1zm-1.4-.5v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.6c0-.1 0-.1 0 0zm-1.3-.6c0-.1 0-.1 0 0zm1.2-.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm-1.3-.7s0-.1 0 0v.1-.1zm1.3-.4c0-.1 0-.1 0 0zm-1.4-.8v.1zm1.3-.3c0-.1 0-.1 0 0v.1-.1zm-1.4-.8v-.1.2-.1zm1.3-.3s0-.1 0 0v.1-.1zm-1.4-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.3 0v-.1.1zm-1.3-1.2s0-.1 0 0v.1zm1.2 0s0-.1 0 0c.1 0 .1 0 0 .1zm0-1v-.1.1zm-1.3-.2v.1zm-15.3-.3c0-.1 0-.1 0 0l.2.1-.2-.1zm16.5-.7v.1zm-1.3-.1c0-.1 0-.1 0 0zm-16.5-.6c-.1 0-.1 0 0 0l.2.2-.2-.2zm17.7-.4v.2-.2zm-1.3-.2c0-.1 0-.1 0 0v.1-.1zm1.2-.8v-.1.2-.1zm-1.3-.4c.1 0 .1.1 0 .1zm1.2-.7c0-.1 0-.1 0 0zm-1.3-.5c.1 0 .1.1 0 .2v-.2zm1.2-.6c0-.1 0-.1 0 0zm-1.2-.5-.4-.2h-.3.3l.4.1v.2-.1zm-1-1.4c.1 0 0 0 0 0-.1 0-.1 0 0 0zm-6.3-2a2 2 0 0 1-.3-.3l.4.4.3.4-.4-.4zm-28-4v.2-.1zm62.5-.8c.1 0 .1.1 0 .1zm-62.6-.4s0-.1 0 0v.2-.1zm11.8-.3s0-.1 0 0c.1 0 .1 0 0 .1zm51-.8v-.2.5-.3zm-18.7-.3v-.1.2-.1zm1.2-.3v-.2.4-.2zm.2-.4h.2-.2zm1 0h.2-.1c-.1 0-.2 0 0 0zm-2.4-.3v-.1.3-.2zm3.4.1h.2-.1c-.1 0-.1 0 0 0zm15.2-.3v-.1.4-.3zm-14.2.3h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0h-.1zm1-.2h.2-.1zm1 0h.3-.2zm1.1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm-46.8-.2s0-.1 0 0v.1-.1zm47.9 0h.1l-.1.1s-.1 0 0 0zm1 0h.1-.1zm1 0c0-.1.1-.1.1 0-.2 0-.2 0-.1-.1zm-61.8-.4s0-.1 0 0v.1zm0-1.1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm32.5-23.1v-.1.2-.1zm0-1v-.1.2-.2z" transform="translate(-64.4 -79.5)"/><path fill="#e0a39d" d="M98.7 149.3h.4-.4zm2.5 0h.3H101.2zm-4-.1h.3-.2zm4.7-.1v-.1.2-.1zm0-1.2v-.1.2-.1zm-.2-1.2c0-.1 0-.2 0 0v.1zm0-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm-.1-1.2v.1zm-.1-1.2v.1zm1.4-.1c0-.1 0-.1 0 0zm-1.5-1c0-.1 0-.1 0 0zm1.4-.1c0-.1 0-.1 0 0v.1-.1zm-1.5-1.1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm1.4 0c0-.1 0-.1 0 0v.1-.1zm0-1.1c0-.1 0-.1 0 0v.1-.1zm-1.4 0v-.1.1zm1.2-1.1s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-1.3-.2v.1zm1.2-.9s0-.1.1 0v.1zm-1.3-.2c0-.1 0-.2 0 0zm1.3-.9v.1zm-1.4-.3c0-.1 0-.1 0 0v.1-.1zm1.3-.8v.1zm-1.4-.4v-.1c.1 0 .1.1 0 .2v-.1zm1.3-.7v.1zm-1.3-.5v-.1.2zm1.2-.6c.1 0 .1.1 0 .2v-.2zm-18.5-.6-.2-.3.2.3.3.2-.3-.2zm17.2 0s0-.1 0 0v.1zm1.2-.4c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm-17.2-.9-.5-.6.6.6.5.5-.5-.5zm15.9 0v.2-.1zm1.3-.2c0-.1 0-.2 0 0zm-1.4-.9v.1zm1.3-.2c0-.1 0-.1 0 0zm-1.4-1c.1 0 .1.1 0 .1zm1.3-.1c0-.1 0-.1 0 0zm-1.4-1c0-.1 0-.1.1 0 0 .1 0 0 0 0zm1.3-.1c0-.1 0-.1 0 0v.1-.1zm-1.3-1.1c0-.1 0-.1 0 0v.1-.1zm1.2 0c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-2.2-.4h.2-.2zm.2-1.2h.2-.2zm1 0h.3-.2zm6.7-1.7.1-.1c.2-.1.2-.1 0 0l-.1.1zm-.8-.9.5-.4-.4.4-.4.4zm-41.3-2.5c.1 0 .1.1 0 .1zm0-1v.2-.1zm62.5-.8v.2-.2zm-50.8-.1c0-.1 0-.1 0 0v.1-.1zm-11.8-.3v-.1.2-.1zm26.1-.8s0-.1 0 0c.1 0 .1 0 0 .1v-.1zm-12.6-.3v-.2.4-.2zm31.8.1v.1zm-20.3-.7v-.3.6-.3zm37.7.1v-.1.4-.3zm-18.6 0v-.2.3-.1zm1.6-.2h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm-33.3-.4v-.2.4-.2zm34.4.3h.1-.1zm1 0h.1-.1zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.2 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-25.7-.2v.1zm26.7.1h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.2h.2-.1zm1 0h.2-.1zm1-.1h.2-.1zm-56.9-.3v-.1.3-.2zm58 .2h.2-.2zm1 0c0-.1.1-.1.2 0h-.1c-.1 0-.1 0 0 0zm-13.5-.2h.1-.1zm14.5 0h.2-.1c-.1 0-.1 0 0 0zm-13.5 0h.2-.2zm14.6 0h.1-.1s-.1 0 0 0zm-13.6-.1h.2-.1c-.1 0-.1 0 0 0zm14.6 0h.1-.1zm-50.2-.2v.1zm36.6 0h.2l-.1.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1c-.1 0-.1 0 0 0zm1-.2h.2-.1s-.1 0 0 0zm1 0h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm-27.3-3a2 2 0 0 1-.3-.4l.4.4.3.3-.4-.3zm1-.8c-.3-.2-.3-.2-.1-.4.1 0 .1 0 0 0l.1.4.2.3-.2-.3zm.3-.8v-.2h.1c0 .2-.2.2-.2.2zm-8.3-1h.2-.2zm1.1 0h.2-.2zm8-.1.2-.2c.2 0 .2 0 0 0l-.1.2zm-7.8-1.2h.2-.2zm8.8 0h.2c0-.2 0-.2 0 0-.1.1-.2.1-.2 0zm-10.9-.1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0zm12 0c.2-.2.2-.2.1 0-.1.1-.2.1-.2 0zm-10.8-.1s0-.1 0 0v.1-.1zm-1.3-1c.1 0 .1.1 0 .2v-.1zm1.2 0c0-.1 0-.1 0 0v.1-.1zm11.8 0h.1c.1-.2.1-.2 0 0 0 .1-.1.2-.1 0zm-13-1v.2-.1zm13.9 0 .1-.1c.2-.1.2-.1 0 0l-.1.1zm-14-1.3c0-.1 0-.2.1-.1v.2-.2zm1.2-.2c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm13.8 0 .2-.1c0-.1 0-.1 0 0l-.2.1zm-13.9-1c0-.1 0-.1.1 0zm16.8-.6-.7-.7.7.7zm-2 .5.2-.2c.1 0 .1 0 0 0l-.1.2zm-14.8-1v.2-.2zm-15-.4.1-.2c.1 0 .1 0 0 0l-.1.2zM98 97v.1zm1.2 0V97v.2-.2zm-1.3-1s0-.1 0 0v.1zm1.2 0V96v.1zm-1.3-1s0-.1 0 0v.1-.1zm1.2 0V95v.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0V94v.1zm-1.4-3.2v.1zm1.2 0v-.1.2-.1zm-24.2-.4.3-.2-.2.2-.2.2.1-.2zm22.9-.6v.1zm1.2 0v-.1.2-.2zm-22.9-.6.3-.2-.2.2-.2.2.1-.2zm21.6-.4s0-.1 0 0v.1-.1zm1.2 0v-.1.1zm-1.3-1c0-.1 0-.1 0 0v.1-.1zm1.2 0v-.1.1zm0-1.1s0-.1 0 0v.1-.1zm-.2-1c0-.1 0-.1 0 0 .1 0 .1 0 0 .1v-.1zm-.2-3.1c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zm4.5-.4h.2-.2zm-2.5 0h.6-.6z" transform="translate(-64.4 -79.5)"/><path fill="#d6836c" d="m102.8 142.2-1.3-17v-.4l.4-.1 1.2-.3.9-.3a174 174 0 0 1 7.9 15.6 29.9 29.9 0 0 1-9.1 2.5zM76 140.4l-.1-.2.1.2.2.2-.2-.2zm-1.7-1.7c-.1-.1-.1-.1 0 0 .2 0 .2.1.1.1l-.1-.1zm9.6-7-.2-.3.3.2.2.3-.3-.2zm31.7-.2.1-.2v.2l-.3.1.2-.1zm-32.6-.7-.1-.2.2.2.1.2-.2-.2zm33.8-.5.1-.2c.1 0 .1 0 0 0l-.1.2zM99 123.6a9 9 0 0 1-7.8-6.9 9 9 0 0 1 4.9-10.1 9 9 0 0 1 11.3 13.1 9.3 9.3 0 0 1-8.4 3.9zm19-3.8-8.1-2.5v-.6a13 13 0 0 0 .3-2.1l16.8-1.4h.5v1.5a26.9 26.9 0 0 1-1.2 7.7l-8.3-2.5zm-11.2 2.4.2-.2-.1.2-.2.1.1-.1zm-28.5-5.7c0-.1 0-.1 0 0 .1 0 .1 0 0 0zm11.6-1.2c0-.1 0-.1 0 0zm-11.6-.6v-.2.3-.1zM90 114v-.1.2-.1zm20.1-.7v-.1h.1v.1zm1 0h.2-.2zm1-.1h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0 0zm-35.7-.2c0-.1 0-.1 0 0zm36.7 0h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm1 0c.1-.1.2-.1.2 0-.2 0-.2 0-.1-.1zm1-.2h.3-.2zm1.1 0h.2-.2zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1-.1h.2-.1c-.1 0-.1 0 0 0zm1 0c0-.1.2-.1.2 0h-.1c-.1 0-.1 0 0-.1zm1-.2h.2-.1c-.1 0-.1 0 0 0zm1 0h.2-.1s-.1 0 0 0zm1-.1h.2-.1zm1-.1h.2-.1zm-19.7-2.7-.9-1.1c-.4-.6-.5-.6-.4-.8.1 0 2-2.2 4-4.8l4-4.6 1 1a22.8 22.8 0 0 1 3.7 5l-11 5.7c-.1 0-.3-.1-.4-.4zm-16-1.3.3-.3.3-.2-.2.2-.3.3zm7.2-3.8v.1zm-1.3-.4s0-.1 0 0v.1zm1.2-.6v.1zm-1.3-.4s0-.1 0 0v.1-.1zm1.2-.6s0-.1 0 0v.1zm0-1s0-.1 0 0v.1-.1zM84 99.9l.2-.2v.2l-.3.1.1-.1zm14-.5s0-.1.1 0v.1-.1zm-12.9-.6.2-.2v.2l-.3.1.1-.1zm12.9-.4c0-.1 0-.1 0 0v.1-.1zm1.1-.6s0-.1.1 0v.1-.1zm-1.2-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0v.1-.1zm-1.3-.4c0-.1 0-.1 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.4c0-.1 0-.2 0 0zm1.2-.6c0-.1 0-.1 0 0zm-1.3-.5v.2-.2zm1.2-.5c0-.1 0-.2 0 0zm0-1v-.1.2-.2zm-.2-1v-.1c.1 0 .1.1 0 .1zM75.1 90l.4-.4-.3.4-.4.3zm23.5-.4c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0zm0-1v-.1.2-.2zm-.1-1v-.1.1zm-.1-1v-.1.1zm-.2-3.2h.2c.2-.1.2 0 0 0H98c0 .1 0 .1 0 0zm5.3 0h.1-.1zm-1.2 0c0-.1.1-.1.2 0h-.2z" transform="translate(-64.4 -79.5)"/><path fill="#c85d4b" d="M99.6 149.3zm-2-.1h.1-.1s-.1 0 0 0zm4.2-1c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zm0-1.2s0-.1 0 0v.1zm-.2-1.2c.1 0 .1.1 0 .1zm0-1.2v.2-.2zm-.1-1.2c0-.1 0-.1 0 0zm-.1-1.2s0-.1 0 0v.1-.1zm0-1.2v.1zm7.2-6-2.9-5.5.5-.4 1-.8.6-.5.2.2a1242.5 1242.5 0 0 0 9.2 7.7l.3.3-.9.8a24.8 24.8 0 0 1-5.2 3.9l-2.8-5.6zm-7.4 4.8c.1 0 .1.1 0 .1zm0-1.1c0-.1 0-.2 0 0zm-.1-1.2c0-.1 0-.1 0 0zm-15-.8c-.1-.1-.1-.1 0 0l.1.1h-.1zm14.9-.4s0-.1 0 0v.1zm-.1-1.2v.1zm-16.6-.2c-.1 0-.1 0 0 0 .2.1.2.2.1.2l-.1-.1zm16.5-1v.2-.2zm0-1.1c0-.1 0-.1 0 0zm-.1-1.2c0-.1 0-.1 0 0v.1-.1zM65 117.5c0-.1 0-.1 0 0 .1 0 .1 0 0 0 0 .1 0 0 0 0zm0-2v-.3.6-.3zm11.7-.6v-.5a15.7 15.7 0 0 1 0 .5zm-11.7-.6v-.3.6-.3zm0-2c.1 0 .1.1 0 .1zm28.2-5h.2c0-.2 0-.2 0 0-.1 0-.2.1-.2 0zm-8.5-8 .4-.3-.4.4-.4.3zm12.8-8.1c0-.1 0-.1 0 0v.1-.1zm-.1-1c0-.1 0-.1 0 0zm0-1c0-.1 0-.1 0 0zm-.2-1c0-.1 0-.2 0 0 .1 0 .1 0 0 0z" transform="translate(-64.4 -79.5)"/><path fill="#c5523e" d="m75.2 139.6-.7-.7.7.6.7.8-.7-.7zm16.6-5A22 22 0 0 1 79 119.9c-.6-2.2-.8-5.2-.6-7.4.5-4.9 2.6-9.3 6-12.9a21.3 21.3 0 0 1 13.1-6.4l1 11.1c0 .3 0 .3-.7.5a10 10 0 0 0-2.2 18.9l.6.3-3.6 11-1-.5zm-7.5-2.6c-.1-.1-.1-.1 0 0l.1.1-.1-.1zm-1.6-1.5c0-.2 0-.2 0 0h.2c0 .1 0 .1-.2 0zm27.4-17.4c-.1-.9-.3-1.5-.5-2l-.2-.4 10.8-5.6 10.9-5.5a30.3 30.3 0 0 1 2.8 8.3l.5 3.2v.2l-12 1-12.2 1v-.2zm-8-8.4-1.3-.2h-1v-.5L98 80.4h2.3a29 29 0 0 1 9.6 1.3l-3.4 11-3.7 11.5-.2.6zm-18.6-6.5.4-.3-.4.4-.4.3z" transform="translate(-64.4 -79.5)"/><path fill="#b4111a" d="M97 149.1a39 39 0 0 1-7.2-1.4l3.8-11.6 3.9-11.6.5.2 1.3.1c.7 0 .9.1.9.2a5523.8 5523.8 0 0 0 1.7 24c0 .2-.2.2-2 .2H97zM79 143a37.9 37.9 0 0 1-7.7-8c-.5-.7-.6-.8-.5-1a155.3 155.3 0 0 1 3.8-6.8l-.4-1a38.9 38.9 0 0 1-1-2.4l-3.6-1-3.7-1h-.3l-.2-1.2a32.9 32.9 0 0 1 0-10.9l.1-1.2.6-.2a395.4 395.4 0 0 1 7-2l.5-1 .8-2 .4-1-2-3.4-2-3.4.5-.7A35.8 35.8 0 0 1 80 86l3.6 1.9 3.5 2 .8-.5a28.5 28.5 0 0 1 9.2-2.5 33.8 33.8 0 0 1 .4 4.4c0 .4 0 .4-.3.4l-3 .5a23.4 23.4 0 0 0-2.2 44.6l-1.5 4.5-2.8-1.1-.8-.4-3.5 1.9c-1.9 1-3.4 1.9-3.4 2l-1-.7zm37.2-15.3-7.8-6.6-.2-.2.4-.5.6-1.2.3-.6 19.6 6.2a27 27 0 0 1-5.1 9.3l-7.8-6.4zm-10.5-21.4-1.9-1a1150.6 1150.6 0 0 1 6.4-19.4 28.3 28.3 0 0 1 9 4.8l.2.3-6.6 7.7a866 866 0 0 1-6.6 7.9l-.5-.3z" transform="translate(-64.4 -79.5)"/></svg>
diff --git a/doc/logos/cargo.svg b/doc/logos/cargo.svg
deleted file mode 100644
index 0690183353..0000000000
--- a/doc/logos/cargo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="3311" height="1605" viewBox="400 0 3311 1605" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M1133 1602C1182 1602 1191 1602 1189 1579C1153 1301 1125 1076 1098 855L1098 855C1067 601 1037 354 995 41C991 2 973 0 916 0C865 0 854 2 849 34C824 242 798 437 772 636L772 636L772 636L772 636L772 636C734 928 695 1227 653 1581C651 1602 681 1602 715 1602C721 1602 726 1602 732 1602C791 1602 809 1602 811 1579C822 1446 833 1334 847 1206C849 1185 868 1185 905 1186C908 1186 912 1186 916 1186C919 1186 922 1186 925 1186C957 1185 984 1185 986 1206C996 1272 1004 1335 1013 1399L1013 1399C1020 1456 1028 1514 1036 1574C1040 1602 1050 1602 1097 1602C1103 1602 1110 1602 1118 1602C1124 1602 1128 1602 1133 1602ZM264 1602C451 1602 528 1478 528 1334V1195C528 1175 509 1176 470 1176L470 1176C463 1176 455 1177 446 1177C405 1177 376 1177 376 1195V1330C376 1391 342 1448 264 1448C180 1448 148 1387 148 1323V265C148 212 193 143 264 143C332 143 376 217 376 267V374C376 400 403 400 443 399H443H443H443H443H443C447 399 450 399 453 399C494 399 528 397 528 374V271C528 173 453 2 264 2C86 2 0 148 0 271V1336C0 1458 86 1602 264 1602ZM968 1042C959 928 953 837 946 746C942 681 937 615 931 539C931 530 929 514 916 514C904 514 902 530 902 537C896 625 890 707 885 784L885 784C879 874 874 958 868 1039C865 1055 886 1060 918 1060C945 1060 970 1060 968 1042ZM1784 1602C1845 1602 1861 1602 1861 1565V996C1861 992 1861 988 1861 984C1861 936 1861 903 1836 852C1812 804 1767 783 1743 771C1733 766 1727 763 1727 761C1727 758 1734 754 1744 748C1768 736 1810 713 1834 669C1859 623 1859 586 1859 537V537C1859 533 1859 529 1859 525V319C1859 239 1843 146 1775 82C1706 20 1608 2 1535 2H1405C1401 2 1397 1 1393 1C1379 0 1367 -0 1353 11C1339 25 1337 50 1337 73V1570C1337 1602 1353 1602 1405 1602C1474 1602 1483 1602 1483 1565V873C1483 838 1495 838 1586 838H1586H1586L1586 838C1591 838 1597 838 1604 838C1654 838 1715 895 1715 989V1570C1715 1602 1729 1602 1774 1602C1777 1602 1780 1602 1784 1602ZM1711 537V319C1711 267 1702 228 1663 187C1638 164 1624 153 1542 153C1521 153 1501 153 1492 169C1485 182 1485 194 1485 207V635C1485 639 1485 643 1485 648V648V648V648C1484 668 1483 687 1499 699C1510 709 1524 708 1535 708C1536 708 1538 708 1540 708C1565 708 1624 701 1665 658C1711 607 1711 569 1711 537ZM2588 1557L2588 1557C2588 1555 2588 1553 2588 1551V790C2588 788 2589 784 2589 781C2591 773 2592 764 2586 763C2569 760 2496 762 2429 763C2393 764 2359 765 2337 765C2321 765 2319 786 2319 836C2319 884 2321 902 2339 902C2345 902 2352 902 2360 901C2384 900 2414 898 2426 907C2436 915 2436 926 2435 936L2435 936C2435 937 2435 938 2435 938C2435 939 2435 940 2435 941V1334C2435 1382 2412 1453 2323 1453C2232 1453 2207 1384 2207 1327V265C2207 217 2253 143 2323 143C2392 143 2435 217 2435 267C2435 283 2436 303 2436 323C2437 343 2437 363 2437 379C2437 399 2451 402 2508 402C2570 402 2588 395 2588 374V271C2588 189 2524 2 2323 2C2118 2 2059 182 2059 271V1336C2059 1442 2130 1602 2323 1602C2393 1602 2429 1567 2452 1545C2466 1531 2476 1522 2485 1528C2503 1540 2508 1560 2512 1576C2516 1589 2518 1599 2526 1599C2534 1599 2541 1601 2547 1602C2559 1605 2569 1607 2577 1599C2589 1587 2588 1572 2588 1557ZM3310 1316C3310 1464 3249 1602 3046 1602C2856 1602 2781 1464 2781 1316V281C2781 109 2897 2 3046 2C3196 2 3310 121 3310 281V1316ZM3160 281V1309C3160 1373 3137 1448 3046 1448C2943 1448 2929 1375 2929 1309V281C2929 217 2977 143 3046 143C3112 143 3160 217 3160 281Z" fill="black"/></svg>
diff --git a/doc/logos/codepen.svg b/doc/logos/codepen.svg
deleted file mode 100644
index cc3d12737f..0000000000
--- a/doc/logos/codepen.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 138 26"><path fill="none" stroke="black" stroke-width="2.3" stroke-linecap="round" stroke-linejoin="round" d="M15 8a7 7 0 100 10m7-8.7L33 2l11 7.3v7.4L33 24l-11-7.3zm0 0l11 7.4 11-7.4m0 7.4L33 9.3l-11 7.4M33 2v7.3m0 7.4V24M52 6h5a7 7 0 010 14h-5zm28 0h-9v14h9m-9-7h6m11 1h6a4 4 0 000-8h-6v14m26-14h-9v14h9m-9-7h6m11 7V6l11 14V6"/></svg>
diff --git a/doc/logos/desmos.svg b/doc/logos/desmos.svg
deleted file mode 100644
index b47e4d90ec..0000000000
--- a/doc/logos/desmos.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 107.05 22.17" fill="#187a3d"><path d="M89.91 7.50c-1.62-1.67-3.64-2.53-5.98-2.53-2.34 0-4.36.85-5.99 2.53s-2.45 3.73-2.45 6.1a8.4 8.4 0 0 0 2.43 6.02 8.13 8.13 0 0 0 6.02 2.51c2.37 0 4.4-.85 6-2.51 1.6-1.68 2.43-3.7 2.43-6.05a8.41 8.41 0 0 0-2.46-6.07m-5.98.41c1.47 0 2.72.56 3.81 1.68a5.6 5.6 0 0 1 1.61 4.01c0 1.58-.52 2.88-1.6 3.98-1.06 1.1-2.32 1.63-3.87 1.63-1.53 0-2.8-.53-3.82-1.61-1.05-1.1-1.56-2.4-1.56-3.97 0-1.58.53-2.90 1.61-4.05 1.07-1.13 2.32-1.68 3.80-1.68M15.25 0a1.47 1.47 0 0 0-1.44 1.25l-.00 5.78c-1.27-1.12-2.75-1.8-4.42-1.97h-.04c-.10-.01-.22-.01-.32-.03l-.33-.03a10.1 10.1 0 0 0-.76.01l-.06.01c-.11 0-.23.01-.34.02l-.43.04-.09.02-.28.04c-.14.01-.26.06-.41.08a7.94 7.94 0 0 0-3.55 1.98l-.04.02-.37.4-.18.21a7.34 7.34 0 0 0-.52.65 1.78 1.78 0 0 0-.15.21l-.04.06C.46 10.17 0 11.79 0 13.55l.00.44.07.78.05.33.07.33.05.26c.36 1.41 1.08 2.7 2.15 3.80a8.59 8.59 0 0 0 1.38 1.17l.23.15c.03.02.06.03.09.05l.03.01c.19.12.4.22.57.32l.38.17c.99.41 2.09.62 3.26.62h.04l.39-.01a1.36 1.36 0 0 0 .19-.01h.05l.18-.01c.04-.01.09-.01.12-.01a7.86 7.86 0 0 0 4.42-1.93v.67l.00.07a1.47 1.47 0 0 0 1.26 1.24h.38c.73-.1 1.27-.73 1.27-1.46V1.47c0-.8-.65-1.47-1.46-1.47M13.74 13.59c0 1.57-.51 2.85-1.57 3.94s-2.30 1.62-3.82 1.62a5.39 5.39 0 0 1-1.87-.32c-.02-.00-.04-.00-.05-.01l-.07-.03c-.64-.25-1.26-.67-1.79-1.23a5.46 5.46 0 0 1-1.38-2.58c-.1-.43-.14-.88-.14-1.34 0-1.57.51-2.87 1.58-4.01C5.66 8.48 6.9 7.94 8.36 7.94c1.47 0 2.69.54 3.77 1.67 1.1 1.13 1.60 2.43 1.60 3.97m21.89-.36c0-.2-.02-.43-.03-.65-.13-1.25-.52-2.41-1.15-3.45-.34-.57-.75-1.11-1.25-1.62-1.2-1.24-2.64-2.05-4.26-2.37l-.13-.01c-.11-.03-.24-.04-.35-.06l-.52-.05-.33-.02a11.34 11.34 0 0 0-.82 0c-1.50.07-2.88.50-4.08 1.30a7.49 7.49 0 0 0-.50.36l-.63.54-.32.31a8.49 8.49 0 0 0-2.45 6.10c0 1.1.19 2.17.57 3.14.39 1.03 1.02 2 1.86 2.86l.62.59a9.28 9.28 0 0 0 1.00.74l.72.39a8.75 8.75 0 0 0 1.96.64l.43.07.42.04c.13.01.26.02.40.02l.06.00a4.88 4.88 0 0 0 .37.01h.04l.39-.01.28-.01.12-.01a7.97 7.97 0 0 0 5.15-2.47c.32-.33.61-.68.86-1.04a4.51 4.51 0 0 0 .27-.40l.04-.08a1.45 1.45 0 0 0 .10-.53 1.5 1.5 0 0 0-1.50-1.49c-.5 0-.95.24-1.24.65a5.5 5.5 0 0 1-.71.89c-1.05 1.1-2.32 1.63-3.87 1.63-1.53 0-2.78-.53-3.83-1.61a7.25 7.25 0 0 1-.50-.6l-.05-.09c-.12-.18-.24-.36-.36-.60a5.01 5.01 0 0 1-.50-1.49h12.45l.11-.02c.62-.13 1.1-.65 1.16-1.30v-.04l-.01-.24m-13.64-1.11a5.36 5.36 0 0 1 .68-1.57l.04-.07c.2-.30.43-.58.7-.87 1.07-1.13 2.31-1.68 3.79-1.68s2.73.56 3.81 1.68c.50.53.89 1.11 1.17 1.74a5.44 5.44 0 0 1 .25.76zm51.46-1.14v9.57a1.48 1.48 0 0 1-1.48 1.47c-.75 0-1.39-.55-1.47-1.32v-9.68a3.2 3.2 0 0 0-.91-2.30c-.56-.57-1.19-.9-1.93-.94-.06-.01-.14-.01-.22-.01-.84 0-1.53.31-2.13.95a3.19 3.19 0 0 0-.91 2.14v.13l.00.09-.00.02v9.45a1.47 1.47 0 0 1-1.47 1.47 1.47 1.47 0 0 1-1.48-1.32l-.00-.05.01-9.64c-.01-.07-.01-.12-.01-.17-.02-.46-.41-1.37-.41-1.37s-.30-.53-.50-.74c-.60-.63-1.31-.95-2.15-.95-.83 0-1.52.31-2.13.95a3.2 3.2 0 0 0-.92 2.3v9.73a1.48 1.48 0 0 1-1.47 1.28 1.48 1.48 0 0 1-1.47-1.47V6.33c0-.82.66-1.48 1.47-1.48.60 0 1.14.38 1.37.91l.32-.21a5.89 5.89 0 0 1 2.83-.7c1.5 0 2.82.5 3.92 1.46a3.73 3.73 0 0 1 .34.34l.27.28.26-.28.35-.34a5.76 5.76 0 0 1 3.90-1.46l.50.02c1.3.1 2.45.58 3.42 1.46l.34.33a5.99 5.99 0 0 1 1.74 4.32"/><path d="M50.32 17.13c0 2.74-2.21 4.98-4.94 5.03h-5.98a1.45 1.45 0 0 1-1.44-1.45c0-.8.64-1.44 1.45-1.44h5.91a2.13 2.13 0 0 0 2.1-2.13 2.13 2.13 0 0 0-2.12-2.12h-2.86c-2.77 0-5.03-2.24-5.03-5.02a5.04 5.04 0 0 1 5.03-5.03h5.91a1.46 1.46 0 0 1 1.45 1.46 1.46 1.46 0 0 1-1.45 1.44h-5.91c-1.17 0-2.12.95-2.12 2.12 0 1.15.94 2.1 2.1 2.12h.05c.01 0 .04 0 .09-.00h2.73c.70 0 1.39.14 2.03.43a5.04 5.04 0 0 1 3 4.59m56.74-.00c0 2.74-2.22 5-4.95 5.03h-5.98a1.46 1.46 0 0 1-1.45-1.45 1.45 1.45 0 0 1 1.45-1.44h5.9c1.15-.01 2.10-.96 2.10-2.13a2.13 2.13 0 0 0-2.12-2.12h-2.63c-.07.01-.14.01-.22.01-2.77 0-5.03-2.24-5.03-5.03a5.04 5.04 0 0 1 5.03-5.03h5.90a1.47 1.47 0 0 1 1.45 1.46c0 .79-.65 1.45-1.45 1.45h-5.90a2.13 2.13 0 0 0-2.13 2.12 2.14 2.14 0 0 0 2.10 2.12h.05c.01 0 .05 0 .08-.00h2.74a4.87 4.87 0 0 1 2.03.43c1.82.8 3 2.61 3 4.59"/></svg>
diff --git a/doc/logos/executeprogram.svg b/doc/logos/executeprogram.svg
deleted file mode 100644
index 0f75b69ec2..0000000000
--- a/doc/logos/executeprogram.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="397" height="109" viewBox="0 0 397 109" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero" fill="none"><path d="M169.495 63.68c2.8 0 5.254.671 7.36 2.015 2.105 1.344 3.688 3.162 4.751 5.453 1.063 2.292 1.594 4.878 1.594 7.76 0 4.408-1.241 8.054-3.724 10.935-2.483 2.881-5.81 4.322-9.98 4.322-3.953 0-7.18-1.402-9.683-4.206v12.62c0 .271-.085.489-.254.653a.88.88 0 0 1-.64.247h-4.767a.966.966 0 0 1-.656-.232c-.178-.155-.268-.377-.268-.668V65.188c0-.271.09-.489.268-.653a.932.932 0 0 1 .656-.247h4.767a.88.88 0 0 1 .64.247c.17.164.254.382.254.653v3.393h.625c1.986-3.268 5.006-4.902 9.057-4.902zm-.84 24.874c2.752 0 4.865-.86 6.34-2.578 1.473-1.719 2.21-4.034 2.21-6.947 0-2.874-.737-5.156-2.21-6.846-1.475-1.69-3.588-2.534-6.34-2.534-2.576 0-4.625.855-6.148 2.563-1.524 1.71-2.285 3.986-2.285 6.831s.761 5.141 2.285 6.89c1.523 1.747 3.572 2.62 6.148 2.62zm39.147-24.875c3.374 0 6.111.99 8.213 2.968 2.1 1.978 3.151 4.771 3.151 8.379 0 .582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44 0-2.757.266-3.95.8-1.194.533-2.142 1.183-2.842 1.949-.7.766-1.238 1.513-1.613 2.24-.375.727-.562 1.333-.562 1.818v16.147c0 .271-.084.49-.252.654a.87.87 0 0 1-.636.248h-4.735a.954.954 0 0 1-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922 0 0 1 .65-.248h4.47c.552 0 .858.3.917.902l.237 3.928h.68c1.086-1.571 2.52-2.876 4.306-3.913 1.786-1.038 3.813-1.557 6.082-1.557zm31.331 30.845c-4.25 0-7.807-1.475-10.673-4.423-2.866-2.95-4.298-6.616-4.298-11s1.432-8.05 4.298-10.999c2.866-2.948 6.423-4.423 10.673-4.423 2.788 0 5.332.674 7.632 2.021 2.3 1.348 4.103 3.203 5.41 5.566 1.306 2.363 1.959 4.975 1.959 7.835 0 2.861-.653 5.468-1.96 7.821-1.306 2.353-3.109 4.209-5.41 5.566-2.3 1.357-4.843 2.036-7.63 2.036zm-6.43-8.608c1.7 1.759 3.847 2.638 6.445 2.638 2.597 0 4.745-.88 6.444-2.638 1.698-1.759 2.547-4.03 2.547-6.814 0-2.785-.849-5.057-2.547-6.815-1.699-1.759-3.847-2.638-6.444-2.638-2.598 0-4.746.88-6.444 2.638-1.699 1.758-2.548 4.03-2.548 6.815 0 2.784.85 5.055 2.548 6.814zm55.522-21.623c.272 0 .487.082.642.248.156.165.234.384.234.657v27.976c0 1.772-.302 3.373-.906 4.804-.603 1.431-1.402 2.6-2.395 3.504-.993.906-2.157 1.67-3.49 2.293a16.713 16.713 0 0 1-4.076 1.314c-1.383.253-2.814.38-4.294.38-2.337 0-4.543-.297-6.617-.891-2.074-.594-3.86-1.397-5.36-2.41-.448-.291-.546-.7-.293-1.226l1.49-2.774c.273-.526.672-.652 1.198-.38 2.707 1.46 5.735 2.19 9.085 2.19 1.169 0 2.293-.116 3.374-.35 1.074-.23 2.107-.62 3.068-1.153a6.016 6.016 0 0 0 2.293-2.235c.564-.953.847-2.073.847-3.358v-3.855c-2.513 3.154-5.726 4.731-9.64 4.731-2.688 0-5.132-.676-7.333-2.03a13.905 13.905 0 0 1-5.112-5.475c-1.207-2.297-1.811-4.809-1.811-7.534 0-2.726.604-5.237 1.811-7.534 1.208-2.298 2.907-4.123 5.098-5.476 2.19-1.353 4.64-2.03 7.347-2.03 3.856 0 7.03 1.548 9.523 4.644l.175-3.125c.059-.604.36-.905.906-.905h4.236zm-13.596 23.266c2.408 0 4.424-.894 6.045-2.68 1.622-1.788 2.433-3.898 2.433-6.332 0-2.396-.811-4.477-2.433-6.246-1.621-1.768-3.637-2.652-6.045-2.652-2.428 0-4.452.86-6.074 2.581-1.622 1.72-2.433 3.826-2.433 6.317 0 2.529.811 4.663 2.433 6.402 1.621 1.74 3.646 2.61 6.074 2.61zm40.073-23.88c3.374 0 6.111.99 8.213 2.968 2.1 1.978 3.151 4.771 3.151 8.379 0 .582-.296.902-.888.96l-4.705.64c-.592.097-.917-.165-.977-.786-.138-2.114-.813-3.67-2.027-4.67-1.213-.998-2.836-1.497-4.868-1.497-1.44 0-2.757.266-3.95.8-1.194.533-2.142 1.183-2.842 1.949-.7.766-1.238 1.513-1.613 2.24-.375.727-.562 1.333-.562 1.818v16.147c0 .271-.084.49-.252.654a.87.87 0 0 1-.636.248h-4.735a.954.954 0 0 1-.651-.233c-.178-.155-.267-.378-.267-.669V65.221c0-.271.09-.49.267-.654a.922.922 0 0 1 .65-.248h4.47c.552 0 .858.3.917.902l.237 3.928h.68c1.086-1.571 2.52-2.876 4.306-3.913 1.786-1.038 3.813-1.557 6.082-1.557zm46.24 24.74c.393.098.673.22.84.367.167.147.25.377.25.69v3.551c0 .626-.569.959-1.708.998-2.2.039-3.826-.343-4.877-1.145-1.051-.802-1.577-2.064-1.577-3.785h-.265c-1.493 1.682-3.399 3.008-5.717 3.976-2.318.968-4.577 1.453-6.778 1.453-3.241 0-5.726-.749-7.455-2.245-1.729-1.497-2.593-3.547-2.593-6.149 0-2.621.835-4.656 2.504-6.104 1.67-1.448 4.214-2.416 7.633-2.906l6.984-1.085c1.355-.196 2.347-.401 2.976-.617.629-.215 1.041-.479 1.238-.792-.079-1.957-.649-3.35-1.71-4.182-1.06-.832-2.622-1.247-4.685-1.247-4.302 0-6.65 1.36-7.043 4.079-.059.45-.353.665-.884.646h-4.48c-.647 0-.942-.304-.883-.91.334-3.326 1.66-5.713 3.978-7.161 2.318-1.448 5.452-2.172 9.4-2.172 4.224 0 7.392.959 9.504 2.876 2.112 1.918 3.168 4.706 3.168 8.364v11.035c-.02 1.35.707 2.172 2.18 2.466zm-19.06.135c4.132 0 7.518-1.307 10.16-3.922v-6.028c-.258.566-1.53 1.024-3.814 1.375l-6.375.995c-1.728.274-2.96.742-3.695 1.405-.735.663-1.102 1.512-1.102 2.546 0 1.132.397 2.02 1.192 2.663.794.644 2.006.966 3.635.966zm48.252-24.875c2.377 0 4.116.796 5.216 2.386 1.1 1.59 1.65 4.248 1.65 7.971v18.59c0 .272-.079.49-.236.655-.157.165-.383.248-.677.248h-4.244a.948.948 0 0 1-.648-.233c-.177-.155-.265-.378-.265-.669v-18.59c0-1.785-.207-3.036-.62-3.754-.412-.717-1.11-1.076-2.091-1.076-1.042 0-1.886.403-2.535 1.207a5.452 5.452 0 0 0-1.178 2.75v19.463c0 .271-.079.49-.236.654-.157.165-.383.248-.678.248h-4.155c-.275 0-.496-.078-.663-.233-.167-.155-.25-.378-.25-.669v-18.59c0-1.804-.207-3.06-.62-3.768-.412-.708-1.11-1.062-2.092-1.062-1.04 0-1.88.398-2.52 1.193a5.675 5.675 0 0 0-1.193 2.764v19.463c0 .271-.083.49-.25.654a.864.864 0 0 1-.634.248h-4.273c-.275 0-.496-.078-.662-.233-.168-.155-.251-.378-.251-.669V65.221c0-.271.083-.49.25-.654.167-.165.388-.248.663-.248h4.008c.57 0 .874.3.914.902l.147 2.386h.442c.943-2.619 2.898-3.928 5.864-3.928 2.849 0 4.745 1.31 5.688 3.928h.353c1.061-2.619 2.986-3.928 5.776-3.928zM162.091 16.126c1.86-.801 3.86-1.201 6.001-1.201 2.141 0 4.112.395 5.914 1.186 1.802.791 3.293 1.86 4.475 3.208 1.182 1.347 2.097 2.905 2.746 4.672.65 1.767.974 3.637.974 5.609 0 1.191-.121 2.04-.363 2.549-.243.507-.76.761-1.555.761h-20.807c.33 2.285 1.385 4.106 3.168 5.463 1.782 1.357 4.01 2.036 6.683 2.036 2.693 0 5.134-.84 7.324-2.52.464-.35.881-.341 1.249.03l1.947 1.992c.465.469.465.918 0 1.347-2.983 3.008-6.713 4.511-11.188 4.511-4.572 0-8.287-1.47-11.144-4.408-2.858-2.94-4.287-6.615-4.287-11.029 0-2.148.373-4.164 1.119-6.048.746-1.885 1.763-3.516 3.051-4.892 1.288-1.377 2.853-2.466 4.694-3.266zm5.71 3.774c-2.28 0-4.202.718-5.767 2.154-1.565 1.437-2.502 3.372-2.812 5.806h16.985c-.232-2.414-1.111-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.767-2.17zm51.123 22.816c.236.268.3.513.191.733-.107.22-.348.33-.72.33h-5.562c-.47 0-.824-.162-1.06-.488l-8.592-10.002-8.592 10.002c-.255.326-.618.488-1.089.488h-5.532c-.373 0-.613-.11-.72-.33-.109-.22-.045-.465.19-.733l12.036-13.795-11.212-12.933c-.235-.268-.299-.512-.191-.733.108-.22.348-.33.72-.33h5.504c.47 0 .833.172 1.088.517l7.798 9.082 7.798-9.082c.255-.325.618-.498 1.089-.517h5.473c.373 0 .618.105.736.316.117.21.059.46-.177.747l-11.152 12.933 11.976 13.795zm14.101-26.59c1.86-.801 3.86-1.201 6-1.201 2.142 0 4.113.395 5.915 1.186 1.801.791 3.293 1.86 4.475 3.208 1.182 1.347 2.097 2.905 2.746 4.672.65 1.767.974 3.637.974 5.609 0 1.191-.122 2.04-.364 2.549-.242.507-.76.761-1.554.761H230.41c.329 2.285 1.385 4.106 3.167 5.463 1.782 1.357 4.01 2.036 6.684 2.036 2.693 0 5.134-.84 7.323-2.52.465-.35.882-.341 1.25.03l1.947 1.992c.465.469.465.918 0 1.347-2.984 3.008-6.713 4.511-11.189 4.511-4.572 0-8.286-1.47-11.144-4.408-2.858-2.94-4.286-6.615-4.286-11.029 0-2.148.373-4.164 1.118-6.048.746-1.885 1.764-3.516 3.052-4.892 1.288-1.377 2.852-2.466 4.693-3.266zm5.71 3.774c-2.28 0-4.203.718-5.767 2.154-1.566 1.437-2.503 3.372-2.812 5.806h16.984c-.232-2.414-1.11-4.344-2.637-5.79-1.527-1.447-3.45-2.17-5.768-2.17zm37.83 19.894c3.133 0 5.619-1.191 7.457-3.574.348-.45.745-.527 1.19-.234l3.394 1.962c.542.332.639.733.29 1.201-1.315 2.012-3.06 3.618-5.237 4.819-2.176 1.2-4.58 1.801-7.21 1.801-4.392 0-8.043-1.474-10.955-4.423-2.911-2.949-4.367-6.615-4.367-10.999s1.456-8.05 4.367-11c2.912-2.948 6.563-4.422 10.954-4.422 2.631 0 5.04.595 7.225 1.787 2.186 1.19 3.927 2.792 5.224 4.803.328.47.232.87-.29 1.202l-3.396 1.991c-.444.274-.841.196-1.19-.234-1.837-2.382-4.323-3.574-7.457-3.574-2.67 0-4.88.884-6.63 2.651-1.75 1.768-2.626 4.033-2.626 6.796s.875 5.028 2.626 6.796c1.75 1.767 3.96 2.65 6.63 2.65zm46.585-24.87c.276 0 .499.083.666.248.168.165.252.383.252.654v27.379c0 .271-.084.49-.252.654-.167.165-.39.247-.666.247h-4.475c-.573 0-.88-.3-.919-.901l-.237-3.953h-.652c-1.007 1.608-2.35 2.93-4.03 3.968-1.68 1.036-3.674 1.554-5.986 1.554-3.26 0-5.867-1.056-7.823-3.168-1.956-2.112-2.934-5.067-2.934-8.864V15.826c0-.271.08-.49.237-.654.159-.165.376-.247.652-.247h4.742c.276 0 .499.082.666.247.168.165.252.383.252.654v15.956c0 2.403.583 4.18 1.749 5.334 1.165 1.153 2.785 1.73 4.86 1.73 1.343 0 2.573-.258 3.689-.771s1.99-1.129 2.623-1.846c.632-.717 1.116-1.4 1.452-2.049.335-.649.503-1.157.503-1.526V15.826c0-.271.08-.49.237-.654.158-.165.376-.247.652-.247h4.742zm37.595 24.474c.353.446.382.852.088 1.22-.882 1.047-2.172 2.001-3.868 2.863-1.697.862-3.731 1.293-6.104 1.293-8.002 0-12.003-3.932-12.003-11.799V20.537h-7.884a.885.885 0 0 1-.647-.261.864.864 0 0 1-.264-.64v-3.603c0-.272.083-.49.25-.654.166-.165.387-.247.661-.247h7.884l.02-9.285c0-.271.084-.485.25-.64.167-.155.388-.232.662-.232h4.707c.255 0 .466.078.633.233.166.154.25.368.25.639l-.02 9.285h11.943c.255 0 .466.082.632.247.167.164.25.382.25.654v3.603a.89.89 0 0 1-.25.64.837.837 0 0 1-.632.261H345.36v11.741c0 1.337.18 2.465.544 3.386.363.92.873 1.613 1.53 2.077a6.487 6.487 0 0 0 2.059.989c.716.193 1.534.29 2.456.29 1.98 0 3.824-.668 5.53-2.005.452-.426.873-.407 1.265.058l2 2.325zm15.146-23.272c1.86-.801 3.86-1.201 6.001-1.201 2.141 0 4.112.395 5.914 1.186 1.802.791 3.293 1.86 4.475 3.208 1.182 1.347 2.097 2.905 2.746 4.672.65 1.767.974 3.637.974 5.609 0 1.191-.121 2.04-.363 2.549-.243.507-.76.761-1.555.761h-20.807c.33 2.285 1.385 4.106 3.168 5.463 1.782 1.357 4.01 2.036 6.683 2.036 2.693 0 5.134-.84 7.324-2.52.464-.35.881-.341 1.249.03l1.947 1.992c.465.469.465.918 0 1.347-2.983 3.008-6.713 4.511-11.188 4.511-4.572 0-8.287-1.47-11.145-4.408-2.857-2.94-4.286-6.615-4.286-11.029 0-2.148.373-4.164 1.119-6.048.746-1.885 1.763-3.516 3.051-4.892 1.288-1.377 2.853-2.466 4.693-3.266zm5.71 3.774c-2.28 0-4.202.718-5.767 2.154-1.565 1.437-2.502 3.372-2.812 5.806h16.985c-.232-2.414-1.112-4.344-2.638-5.79-1.526-1.447-3.449-2.17-5.768-2.17z" fill="#FFF"/><path d="M102.022 37.886V19.427c0-2.582-1.455-3.873-4.363-3.873H82.51a1.87 1.87 0 0 1-1.333-.515c-.364-.342-.584-.776-.584-1.3V1.875c0-.565.22-1.019.584-1.361A1.87 1.87 0 0 1 82.511 0h26.297c1.171 0 2.312.1 3.423.303 1.11.201 2.282.615 3.514 1.24a11.807 11.807 0 0 1 3.212 2.36c.909.949 1.646 2.23 2.211 3.844.566 1.613.849 3.47.849 5.568v23.421c.04 1.09.262 1.877.666 2.36l12.18 14.102c.645.767.605 1.594-.122 2.481l-12.058 13.799c-.444.484-.666 1.271-.666 2.36V95.14c0 2.622-.414 4.852-1.243 6.688-.828 1.835-1.938 3.207-3.332 4.115-1.394.908-2.787 1.553-4.18 1.937-1.394.383-2.879.575-4.454.575H82.51c-.525 0-.97-.162-1.333-.485a1.716 1.716 0 0 1-.584-1.331V94.715c0-.564.22-1.018.584-1.361a1.87 1.87 0 0 1 1.333-.515H97.66c2.908 0 4.363-1.25 4.363-3.752V70.749c0-1.009.242-1.755.727-2.24l13.31-13.952a.217.217 0 0 0 0-.298l-13.31-14.194c-.485-.444-.728-1.17-.728-2.179zm-32.788-8.585L93.083 53.15a1.523 1.523 0 0 1 0 2.154l-23.85 23.849a1.523 1.523 0 0 1-2.153 0l-23.85-23.85a1.523 1.523 0 0 1 0-2.153L67.08 29.3a1.523 1.523 0 0 1 2.154 0zm-35.937 8.585c0 1.009-.243 1.735-.728 2.18L19.26 54.258a.217.217 0 0 0 0 .298L32.57 68.51c.485.484.728 1.23.728 2.24v18.337c0 2.501 1.454 3.752 4.362 3.752h15.148c.525 0 .97.172 1.333.515.364.343.584.797.584 1.361v11.923c0 .565-.22 1.009-.584 1.331-.363.323-.808.485-1.333.485H26.511c-1.576 0-3.06-.192-4.454-.575-1.394-.384-2.787-1.03-4.18-1.937-1.394-.908-2.505-2.28-3.333-4.115-.828-1.836-1.242-4.065-1.242-6.688v-23.3c0-1.09-.223-1.877-.667-2.36L.577 55.678c-.727-.887-.767-1.715-.12-2.481l12.178-14.101c.404-.485.626-1.271.667-2.36V13.314c0-2.099.282-3.955.848-5.568.565-1.614 1.303-2.895 2.211-3.843a11.807 11.807 0 0 1 3.212-2.36C20.805.917 21.976.503 23.087.302A19.123 19.123 0 0 1 26.511 0h26.296c.525 0 .97.171 1.333.515.364.342.584.796.584 1.361v11.862c0 .525-.22.959-.584 1.301a1.87 1.87 0 0 1-1.333.515H37.66c-2.908 0-4.362 1.291-4.362 3.873v18.459z" fill="#4547E0"/></g></svg>
diff --git a/doc/logos/holmusk.svg b/doc/logos/holmusk.svg
deleted file mode 100644
index 80d18829d4..0000000000
--- a/doc/logos/holmusk.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" style="background: #1649BF"><g transform="translate(-780, -40)" fill="#FFFFFF"><path d="M780,4 L840,4 L840,1 L780,1 L780,4 Z M794,55 L794,84.65 L796.806,84.65 L796.806,72.739 C796.806,69.633 799.325,67.104 802.420,67.104 C805.516,67.104 808.031,69.633 808.031,72.739 L808.031,84.65 L810.838,84.65 L810.838,72.739 C810.838,68.077 807.062,64.288 802.420,64.288 C800.271,64.288 798.311,65.106 796.819,66.447 L796.819,55 L794,55 Z M817.582,63.931 C815.372,63.931 813.367,64.798 811.862,66.199 L812.163,66.653 C812.613,67.33 812.972,68.051 813.248,68.805 C814.281,67.549 815.840,66.746 817.582,66.746 C820.674,66.746 823.193,69.276 823.193,72.382 L823.193,72.385 L823.193,84.293 L826,84.293 L826,72.385 L826,72.379 C826,70.658 825.483,69.057 824.598,67.72 L824.598,67.723 C824.537,67.629 824.473,67.543 824.409,67.452 C824.345,67.365 824.280,67.278 824.213,67.191 C824.139,67.098 824.068,67.008 823.995,66.917 C823.870,66.776 823.744,66.634 823.616,66.502 C823.542,66.424 823.465,66.35 823.385,66.276 C823.289,66.183 823.190,66.093 823.090,66.002 C823.004,65.932 822.917,65.854 822.830,65.787 C822.689,65.671 822.542,65.561 822.394,65.458 C822.320,65.406 822.243,65.354 822.169,65.307 C821.999,65.194 821.829,65.087 821.650,64.991 C821.592,64.955 821.531,64.923 821.473,64.894 C821.307,64.807 821.142,64.726 820.976,64.653 C820.909,64.623 820.845,64.594 820.774,64.566 C820.569,64.478 820.357,64.401 820.138,64.33 C820.084,64.314 820.026,64.298 819.969,64.282 C819.773,64.224 819.577,64.172 819.382,64.131 C819.330,64.118 819.285,64.104 819.234,64.095 C819,64.05 818.766,64.015 818.525,63.985 C818.461,63.979 818.400,63.976 818.339,63.969 C818.095,63.947 817.855,63.931 817.611,63.931 L817.582,63.931 Z"></path></g></svg>
diff --git a/doc/logos/jetbrains.svg b/doc/logos/jetbrains.svg
deleted file mode 100644
index b379536602..0000000000
--- a/doc/logos/jetbrains.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' viewBox='39 0 142.7 119'><linearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='4.7875' y1='6.8451' x2='75.7999' y2='54.4038'><stop offset='0' stop-color='#AA4A9B'/><stop offset='1' stop-color='#F05922'/></linearGradient><path fill='url(#SVGID_1_)' d='M81.3,57.6L18.7,3.1c-1.9-1.8-4.5-3-7.3-3.1C5.2-0.2,0.2,4.6,0,10.7c-0.1,4.3,2.3,8.1,5.8,10l70.4,43.7c0.1,0.1,0.2,0.1,0.3,0.2c2.1,1.1,4.6,0.4,5.8-1.6C83.4,61.2,82.9,58.9,81.3,57.6z'/><linearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='28.3538' y1='119.6551' x2='139.5938' y2='60.2551'><stop offset='0' stop-color='#FFE42E'/><stop offset='1' stop-color='#ED417C'/></linearGradient><path fill='url(#SVGID_2_)' d='M142.7,66.3c-0.3-8.6-7.6-15.3-16.2-14.9c-2.7,0.1-5.3,0.9-7.5,2.2l-88,50.1c0,0-0.1,0-0.1,0.1c-3,1.2-5,4.2-4.9,7.6c0.2,4.4,3.8,7.8,8.2,7.6c1,0,2-0.3,2.9-0.7l95.9-37c0,0,0.1,0,0.2-0.1C138.9,78.8,142.9,73,142.7,66.3z'/><linearGradient id='SVGID_3_' gradientUnits='userSpaceOnUse' x1='31.6974' y1='114.3816' x2='72.0174' y2='55.3416'><stop offset='0' stop-color='#FFE42E'/><stop offset='1' stop-color='#F05922'/></linearGradient><path fill='url(#SVGID_3_)' d='M71.8,64c1.1-2.1,0.3-4.7-1.8-5.7c-1.9-1-4.2-0.4-5.4,1.3l-37.1,47.1c0,0,0,0.1-0.1,0.2c-1.8,2.7-1.8,6.3,0.3,9c2.6,3.5,7.5,4.2,11,1.7c1-0.8,1.8-1.8,2.4-2.8l30.5-50.2C71.6,64.3,71.7,64.1,71.8,64z'/><rect x='45.5' y='35.7' width='51' height='51'/><rect x='49.9' y='77.1' fill='#fff' width='19.1' height='3.2'/><path fill='#fff' d='M49.7,49.1l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2V42h2.3v5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C51.2,50.5,50.3,49.9,49.7,49.1z'/><path fill='#fff' d='M56.3,42h6.7V44h-4.4v1.3h4v1.8h-4v1.3H63v2h-6.7V42z'/><path fill='#fff' d='M66,44.1h-2.5v-2h7.3v2h-2.5v6.3H66V44.1z'/><path fill='#fff' d='M49.9,52.3h4.3c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0c0,1-0.5,1.5-1.3,1.9c1,0.3,1.7,0.9,1.7,2v0c0,1.4-1.2,2.3-3.1,2.3h-4.3V52.3z M54.7,54.9c0-0.5-0.4-0.7-1-0.7h-1.5v1.5h1.4C54.3,55.6,54.7,55.4,54.7,54.9L54.7,54.9z M53.9,57.2h-1.8v1.5h1.8c0.7,0,1.1-0.3,1.1-0.8v0C55,57.5,54.7,57.2,53.9,57.2z'/><path fill='#fff' d='M57.7,52.3h3.9c1.3,0,2.2,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0c0,1.3-0.7,2.1-1.7,2.6l2,2.9h-2.6L61,58.1h-1v2.5h-2.3V52.3z M61.5,56.3c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1H60v2H61.5z'/><path fill='#fff' d='M67.8,52.2H70l3.5,8.4h-2.5l-0.6-1.5h-3.2l-0.6,1.5h-2.4L67.8,52.2z M69.8,57.3L68.9,55l-0.9,2.4H69.8z'/><path fill='#fff' d='M73.8,52.3h2.3v8.3h-2.3V52.3z'/><path fill='#fff' d='M76.7,52.3h2.2l3.4,4.4v-4.4h2.3v8.3h-2L79,56.1v4.6h-2.3V52.3z'/><path fill='#fff' d='M84.7,59.4l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7C87.1,60.8,85.7,60.3,84.7,59.4z'/></svg>
diff --git a/doc/logos/observable.svg b/doc/logos/observable.svg
deleted file mode 100644
index 49c3a82f70..0000000000
--- a/doc/logos/observable.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="-3 0 171 28" width="350" height="57" fill="black" xmlns="http://www.w3.org/2000/svg"><path d="M12.5 22.66c-1.15 0-2.15-.25-3-.75a5.09 5.09 0 01-1.94-2.04 10.80 10.80 0 01-.99-2.74A14.74 14.74 0 016.25 14c0-.83.05-1.62.16-2.38.10-.75.30-1.52.60-2.31a7.37 7.37 0 011.12-2.03 5.11 5.11 0 011.80-1.40c.74-.36 1.59-.53 2.54-.53 1.15 0 2.15.25 3 .75.84.50 1.51 1.21 1.94 2.04.45.86.78 1.77.99 2.74.20.96.31 2.00.31 3.12a16.7 16.7 0 01-.16 2.38 10.63 10.63 0 01-.61 2.31c-.30.78-.67 1.46-1.13 2.03-.45.57-1.05 1.04-1.79 1.40-.74.36-1.59.53-2.54.53zm2.20-6.37c.59-.6.93-1.43.91-2.29 0-.89-.29-1.65-.89-2.29-.59-.63-1.34-.95-2.22-.95s-1.63.31-2.23.95A3.23 3.23 0 009.37 14c0 .89.29 1.65.89 2.29.59.63 1.34.95 2.22.95s1.62-.31 2.20-.95zM12.5 27C19.40 27 25 21.18 25 14S19.40 1 12.5 1 0 6.82 0 14s5.59 13 12.5 13z"/><g transform="translate(30, -3.5)"><path d="M6.41 17.75c0 1.09.05 2.09.15 2.98.11.87.29 1.62.53 2.25.23.62.54 1.11.91 1.46.37.33.82.50 1.36.50.54 0 .99-.17 1.36-.50.37-.35.67-.84.91-1.46.23-.62.40-1.37.50-2.25.11-.89.17-1.89.17-2.98 0-1.08-.06-2.06-.17-2.96-.10-.89-.27-1.65-.50-2.27-.23-.64-.54-1.13-.91-1.46-.37-.35-.82-.53-1.36-.53s-.99.17-1.36.53c-.37.33-.67.82-.91 1.46-.23.62-.41 1.38-.53 2.27-.10.89-.15 1.88-.15 2.96zm2.96-8.75c1.06 0 2.08.17 3.06.53a7.36 7.36 0 012.60 1.62c.76.72 1.35 1.63 1.79 2.73.45 1.09.68 2.38.68 3.87 0 1.48-.22 2.77-.68 3.87-.43 1.09-1.03 2.00-1.79 2.73a7.07 7.07 0 01-2.60 1.62 8.92 8.92 0 01-3.06.53 9.14 9.14 0 01-3.08-.53 7.36 7.36 0 01-2.60-1.62c-.74-.72-1.34-1.63-1.79-2.73-.43-1.09-.65-2.38-.65-3.87 0-1.48.21-2.77.65-3.87.45-1.09 1.06-2.00 1.82-2.73a7.36 7.36 0 012.60-1.62 8.92 8.92 0 013.06-.53zm9.32 17.03v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40.60.27 1.13.67 1.59 1.21.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.05.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.62-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.62-.91-.40 0-.8.12-1.18.38v7.46c.33.23.73.35 1.19.35zm13.10 2.42c-1.75 0-3.30-.41-4.65-1.24l.12-3.23h2.30l.40 2.63c.28.11.57.21.86.27.30.05.62.07.96.07.64 0 1.13-.09 1.49-.27.35-.20.53-.54.53-1.03 0-.33-.13-.63-.40-.88-.25-.27-.80-.52-1.64-.76l-1.44-.37c-1.01-.27-1.78-.74-2.30-1.41-.50-.67-.75-1.51-.75-2.50 0-.62.11-1.20.35-1.74a3.95 3.95 0 011.08-1.39c.48-.38 1.08-.69 1.77-.91.71-.22 1.51-.33 2.43-.33.77 0 1.49.08 2.15.25.65.16 1.34.42 2.05.75l-.20 2.85H41.75l-.55-2.25a4.91 4.91 0 00-.55-.07 3.89 3.89 0 00-.68-.05c-.48 0-.89.11-1.21.32-.32.20-.48.52-.48.96 0 .13.02.27.07.40.05.11.14.24.27.38a4.3 4.3 0 00.60.37c.27.11.62.23 1.06.35l1.41.38c1.18.32 2.02.81 2.53 1.49.52.65.78 1.49.78 2.50 0 .74-.14 1.39-.43 1.94a3.84 3.84 0 01-1.21 1.39c-.52.37-1.15.64-1.89.83-.74.18-1.57.27-2.50.27zM52.83 13.27c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.85 4.85 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63H51.11c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.07 5.07 0 001.24-.86l.98.96c-.54 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.29.70a7.82 7.82 0 01-2.63-.43 6.19 6.19 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.57-2.05a6.61 6.61 0 012.2-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.17.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.19c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53zM59.31 26v-1.29l1.21-.27c.01-.60.02-1.24.02-1.92V19.09v-.88c0-.23-.00-.45-.02-.65 0-.20-.00-.39-.02-.58 0-.20-.00-.43-.02-.68l-1.36-.22v-1.03l5.59-1.74.45.27.20 2.91c.33-1.08.81-1.88 1.44-2.40.64-.52 1.26-.78 1.87-.78.62 0 1.14.18 1.56.55.43.35.7.92.78 1.69-.03.69-.23 1.22-.60 1.59-.37.37-.81.55-1.31.55-.42 0-.80-.11-1.13-.32-.32-.21-.64-.57-.98-1.06l-.12-.17c-.30.33-.60.77-.91 1.31a5.62 5.62 0 00-.58 1.67V22.40c0 .65.00 1.28.02 1.87l1.97.43V26h-8.04zm19.93 0h-2.27l-4.50-10.88-1.21-.25v-1.19h7.61v1.19l-1.34.30 2.1 5.79 1.94-5.82-1.39-.27v-1.19h4.75v1.19l-1.51.25L79.25 26zm11.35-1.79c.32 0 .67-.14 1.06-.43v-4.2c-.25.06-.49.16-.73.27a2.55 2.55 0 00-.55.35 2.97 2.97 0 00-.53.50 2.36 2.36 0 00-.40.73c-.1.27-.15.57-.15.91 0 .62.12 1.08.38 1.39.25.30.56.45.93.45zm4.17 2.20c-.81 0-1.45-.15-1.92-.45-.47-.30-.81-.75-1.03-1.34-.25.27-.49.51-.73.73-.22.22-.47.41-.75.58-.27.15-.57.27-.91.35a4.94 4.94 0 01-1.19.12c-1.01 0-1.81-.27-2.40-.83-.59-.57-.88-1.38-.88-2.43 0-.48.07-.93.22-1.34.15-.42.42-.81.81-1.16.40-.35.93-.68 1.59-.98.67-.30 1.52-.59 2.55-.86l.70-.17c.27-.06.54-.14.83-.22v-.91c0-.54-.02-.98-.07-1.34-.05-.37-.15-.66-.30-.88a1.05 1.05 0 00-.58-.45c-.23-.10-.55-.15-.96-.15h-.38v.86c0 1.03-.21 1.76-.63 2.20-.42.42-.90.63-1.44.63-1.03 0-1.67-.45-1.92-1.36 0-1.09.51-1.98 1.54-2.65 1.04-.69 2.59-1.03 4.63-1.03.87 0 1.62.09 2.22.27.60.18 1.09.48 1.46.88.38.38.66.89.83 1.51.16.62.25 1.36.25 2.22v5.79c0 .28.14.43.43.43a.54.54 0 00.30-.10c.1-.06.22-.22.38-.45l.73.40c-.30.77-.71 1.33-1.24 1.67-.52.32-1.24.48-2.15.48zm3.89-.38v-1.29l1.13-.25c.01-.60.02-1.25.02-1.94V10.21l-1.36-.17V8.89l5.77-1.13.43.27-.10 3.51v3.18c.99-.97 2.19-1.46 3.59-1.46.69 0 1.34.13 1.94.40a4.42 4.42 0 011.59 1.21c.45.54.81 1.21 1.06 2.02.27.81.40 1.75.40 2.83 0 1.04-.16 1.98-.48 2.80-.30.81-.70 1.50-1.21 2.07a5.24 5.24 0 01-1.74 1.31 4.83 4.83 0 01-2.04.45c-.74 0-1.38-.12-1.92-.38a4.12 4.12 0 01-1.39-1.03l-.50 1.41-5.18-.38zm7.16-2.05c.67 0 1.21-.33 1.61-1.01.40-.69.60-1.76.60-3.21 0-1.45-.20-2.47-.60-3.06-.40-.60-.94-.91-1.61-.91-.40 0-.80.12-1.19.38v7.46c.33.23.73.35 1.19.35zm8.40-15.08l5.84-1.13.43.27-.10 3.51v11.03l.05 1.89 1.13.22V26h-7.18v-1.29l1.13-.25a70.7 70.7 0 00.02-1.87c.01-.62.02-1.25.02-1.89v-10.4l-1.36-.25V8.89zm15.30 4.37c.91 0 1.70.14 2.37.43.67.28 1.24.68 1.69 1.18a4.84 4.84 0 011.01 1.77c.23.67.35 1.39.35 2.15 0 .27-.00.50-.02.71-.01.18-.05.39-.10.63h-7.03c.13 1.24.49 2.15 1.08 2.70.59.54 1.26.81 2.02.81.64 0 1.18-.11 1.64-.32a5.09 5.09 0 001.24-.86l.98.96c-.53 1.03-1.27 1.78-2.20 2.25-.92.47-2.02.70-3.28.70a7.83 7.83 0 01-2.63-.43 6.18 6.18 0 01-2.1-1.29 6.34 6.34 0 01-1.36-2.07c-.32-.82-.48-1.76-.48-2.80 0-1.08.19-2.02.58-2.83.40-.82.92-1.51 1.56-2.05a6.61 6.61 0 012.20-1.24 7.71 7.71 0 012.45-.40zm-.30 1.36a.87.87 0 00-.55.20c-.16.11-.32.33-.45.65-.11.32-.22.74-.30 1.26-.06.52-.11 1.17-.12 1.94h1.18c.60 0 1.01-.11 1.21-.35.22-.25.32-.7.32-1.34 0-.87-.13-1.49-.40-1.84-.25-.35-.54-.53-.88-.53z"/></g></svg>
diff --git a/doc/logos/primo.svg b/doc/logos/primo.svg
deleted file mode 100644
index ec2f3de729..0000000000
--- a/doc/logos/primo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 258 66" xmlns="http://www.w3.org/2000/svg"><path d="M17.6 13.8C19.5 11.9 22.7 11.9 24.6 13.8C26.5 15.7 26.6 18.7 24.8 20.7L24.6 20.9L12.0 33.5L35.4 56.8C37.3 58.6 37.4 61.7 35.6 63.6L35.4 63.8C33.6 65.7 30.5 65.8 28.6 64.0L28.4 63.8L1.4 37.1C-0.4 35.2 -0.4 32.1 1.2 30.2L1.4 30.0L17.6 13.8Z" fill="url(#paint0_linear)"></path><path d="M50.0 11C62.4 11 72.5 21.0 72.5 33.5C72.5 46.0 62.4 56.1 50.0 56.1C47.2 56.1 45.0 53.8 45.0 51.1C45.0 48.3 47.2 46.1 50.0 46.1C56.9 46.1 62.5 40.4 62.5 33.5C62.5 26.6 56.9 21 50.0 21C43.2 21 37.6 26.4 37.4 33.3L37.4 33.6L36.9 60.4C36.8 63.2 34.6 65.4 31.8 65.3C29.1 65.2 27.0 63.1 26.9 60.4V60.2L27.4 33.5C27.4 21.0 37.5 11 50.0 11Z" fill="#EE4645"></path><path d="M75.3 13.8C77.2 11.9 80.3 11.9 82.2 13.6L82.4 13.8L98.6 30.0C100.4 31.9 100.5 34.9 98.7 36.9L98.6 37.0L82.4 53.2C80.4 55.1 77.3 55.1 75.3 53.2C73.4 51.3 73.4 48.3 75.2 46.3L75.3 46.1L87.9 33.5L75.3 20.9C73.4 19.0 73.4 16.0 75.2 14.0L75.3 13.8Z" fill="#EE4645"></path><path d="M134.5 19.4C136.8 19.4 138.8 19.9 140.6 21.0C142.5 22.0 143.9 23.4 145.0 25.3C146.0 27.2 146.6 29.4 146.6 31.8C146.6 34.3 146.0 36.5 145.0 38.4C143.9 40.3 142.5 41.7 140.6 42.8C138.8 43.8 136.8 44.3 134.5 44.3C131.4 44.3 129.0 43.3 127.2 41.4V52.7H120.2V19.7H126.9V22.5C128.6 20.4 131.2 19.4 134.5 19.4ZM133.3 38.6C135.1 38.6 136.6 38 137.7 36.8C138.9 35.5 139.5 33.9 139.5 31.8C139.5 29.8 138.9 28.2 137.7 27.0C136.6 25.8 135.1 25.1 133.3 25.1C131.5 25.1 130.0 25.8 128.8 27.0C127.7 28.2 127.1 29.8 127.1 31.8C127.1 33.9 127.7 35.5 128.8 36.8C130.0 38 131.5 38.6 133.3 38.6ZM158.0 22.9C158.8 21.8 159.9 20.9 161.3 20.3C162.8 19.7 164.4 19.4 166.3 19.4V25.9C165.5 25.8 165.0 25.8 164.7 25.8C162.7 25.8 161.1 26.3 160.0 27.5C158.8 28.6 158.3 30.3 158.3 32.5V44H151.3V19.7H158.0V22.9ZM170.5 19.7H177.5V44H170.5V19.7ZM174.0 16.4C172.7 16.4 171.6 16.0 170.8 15.2C170.0 14.5 169.6 13.6 169.6 12.5C169.6 11.3 170.0 10.4 170.8 9.7C171.6 8.9 172.7 8.5 174.0 8.5C175.3 8.5 176.3 8.9 177.1 9.6C177.9 10.3 178.3 11.2 178.3 12.3C178.3 13.5 177.9 14.5 177.1 15.2C176.3 16.0 175.3 16.4 174.0 16.4ZM215.0 19.4C218.0 19.4 220.4 20.3 222.2 22.1C224.0 23.9 224.9 26.5 224.9 30.1V44H217.9V31.2C217.9 29.3 217.5 27.8 216.7 26.9C215.9 25.9 214.8 25.5 213.3 25.5C211.6 25.5 210.3 26.0 209.4 27.1C208.4 28.1 207.9 29.7 207.9 31.8V44H200.9V31.2C200.9 27.4 199.4 25.5 196.3 25.5C194.7 25.5 193.4 26.0 192.5 27.1C191.5 28.1 191.0 29.7 191.0 31.8V44H184.0V19.7H190.7V22.5C191.6 21.5 192.7 20.7 194.0 20.2C195.3 19.7 196.7 19.4 198.3 19.4C200.0 19.4 201.6 19.7 202.9 20.4C204.3 21.1 205.4 22.1 206.3 23.3C207.3 22.1 208.5 21.1 210.0 20.4C211.5 19.7 213.2 19.4 215.0 19.4ZM243.0 44.3C240.4 44.3 238.1 43.8 236.1 42.7C234.1 41.7 232.5 40.2 231.4 38.3C230.2 36.4 229.7 34.2 229.7 31.8C229.7 29.4 230.2 27.3 231.4 25.4C232.5 23.5 234.1 22.1 236.1 21.0C238.1 19.9 240.4 19.4 243.0 19.4C245.5 19.4 247.8 19.9 249.8 21.0C251.8 22.1 253.4 23.5 254.5 25.4C255.7 27.3 256.3 29.4 256.3 31.8C256.3 34.2 255.7 36.4 254.5 38.3C253.4 40.2 251.8 41.7 249.8 42.7C247.8 43.8 245.5 44.3 243.0 44.3ZM243.0 38.6C244.8 38.6 246.3 38 247.4 36.8C248.6 35.5 249.1 33.9 249.1 31.8C249.1 29.8 248.6 28.2 247.4 27.0C246.3 25.8 244.8 25.1 243.0 25.1C241.2 25.1 239.7 25.8 238.5 27.0C237.4 28.2 236.8 29.8 236.8 31.8C236.8 33.9 237.4 35.5 238.5 36.8C239.7 38 241.2 38.6 243.0 38.6Z" fill="#343434"></path><path d="M140.6 21.0L140.4 21.4L140.4 21.4L140.6 21.0ZM145.0 25.3L144.5 25.6L144.6 25.6L145.0 25.3ZM145.0 38.4L145.4 38.7L145.4 38.7L145.0 38.4ZM140.6 42.8L140.9 43.2L140.9 43.2L140.6 42.8ZM127.2 41.4L127.6 41.0L126.7 40.1V41.4H127.2ZM127.2 52.7V53.2H127.7V52.7H127.2ZM120.2 52.7H119.7V53.2H120.2V52.7ZM120.2 19.7V19.2H119.7V19.7H120.2ZM126.9 19.7H127.4V19.2H126.9V19.7ZM126.9 22.5H126.4V23.9L127.3 22.8L126.9 22.5ZM137.7 36.8L137.3 36.4L137.3 36.4L137.7 36.8ZM137.7 27.0L137.3 27.3L137.3 27.3L137.7 27.0ZM128.8 27.0L128.5 26.6L128.5 26.6L128.8 27.0ZM128.8 36.8L128.5 37.1L128.5 37.1L128.8 36.8ZM134.5 19.9C136.7 19.9 138.6 20.4 140.4 21.4L140.9 20.5C139.0 19.4 136.8 18.9 134.5 18.9V19.9ZM140.4 21.4C142.2 22.4 143.5 23.8 144.5 25.6L145.4 25.1C144.3 23.1 142.8 21.6 140.9 20.5L140.4 21.4ZM144.6 25.6C145.6 27.3 146.1 29.4 146.1 31.8H147.1C147.1 29.3 146.5 27.0 145.4 25.1L144.6 25.6ZM146.1 31.8C146.1 34.3 145.6 36.4 144.5 38.2L145.4 38.7C146.5 36.7 147.1 34.4 147.1 31.8H146.1ZM144.6 38.2C143.5 39.9 142.2 41.3 140.4 42.3L140.9 43.2C142.8 42.1 144.3 40.6 145.4 38.7L144.6 38.2ZM140.4 42.3C138.6 43.3 136.7 43.8 134.5 43.8V44.8C136.8 44.8 139.0 44.3 140.9 43.2L140.4 42.3ZM134.5 43.8C131.5 43.8 129.2 42.9 127.6 41.0L126.8 41.7C128.7 43.8 131.3 44.8 134.5 44.8V43.8ZM126.7 41.4V52.7H127.7V41.4H126.7ZM127.2 52.2H120.2V53.2H127.2V52.2ZM120.7 52.7V19.7H119.7V52.7H120.7ZM120.2 20.2H126.9V19.2H120.2V20.2ZM126.4 19.7V22.5H127.4V19.7H126.4ZM127.3 22.8C128.9 20.9 131.3 19.9 134.5 19.9V18.9C131.1 18.9 128.4 20.0 126.5 22.2L127.3 22.8ZM133.3 39.1C135.2 39.1 136.8 38.4 138.1 37.1L137.3 36.4C136.3 37.5 135.0 38.1 133.3 38.1V39.1ZM138.1 37.1C139.3 35.8 140 34.0 140 31.8H139C139 33.8 138.4 35.3 137.3 36.4L138.1 37.1ZM140 31.8C140 29.7 139.3 27.9 138.1 26.6L137.3 27.3C138.4 28.4 139 29.9 139 31.8H140ZM138.1 26.6C136.8 25.3 135.2 24.6 133.3 24.6V25.6C135.0 25.6 136.3 26.2 137.3 27.3L138.1 26.6ZM133.3 24.6C131.4 24.6 129.7 25.3 128.5 26.6L129.2 27.3C130.3 26.2 131.6 25.6 133.3 25.6V24.6ZM128.5 26.6C127.2 28.0 126.6 29.7 126.6 31.8H127.6C127.6 29.9 128.2 28.4 129.2 27.3L128.5 26.6ZM126.6 31.8C126.6 34.0 127.2 35.7 128.5 37.1L129.2 36.4C128.2 35.3 127.6 33.8 127.6 31.8H126.6ZM128.5 37.1C129.7 38.4 131.4 39.1 133.3 39.1V38.1C131.6 38.1 130.3 37.5 129.2 36.4L128.5 37.1ZM158.0 22.9H157.5V24.5L158.4 23.2L158.0 22.9ZM161.3 20.3L161.1 19.8L161.1 19.8L161.3 20.3ZM166.3 19.4H166.8V18.9H166.3V19.4ZM166.3 25.9L166.3 26.4L166.8 26.4V25.9H166.3ZM160.0 27.5L160.3 27.8L160.3 27.8L160.0 27.5ZM158.3 44V44.5H158.8V44H158.3ZM151.3 44H150.8V44.5H151.3V44ZM151.3 19.7V19.2H150.8V19.7H151.3ZM158.0 19.7H158.5V19.2H158.0V19.7ZM158.4 23.2C159.2 22.1 160.2 21.3 161.5 20.7L161.1 19.8C159.7 20.5 158.5 21.4 157.6 22.6L158.4 23.2ZM161.5 20.7C162.9 20.2 164.5 19.9 166.3 19.9V18.9C164.4 18.9 162.7 19.2 161.1 19.8L161.5 20.7ZM165.8 19.4V25.9H166.8V19.4H165.8ZM166.3 25.4C165.6 25.3 165.0 25.3 164.7 25.3V26.3C165.0 26.3 165.5 26.3 166.3 26.4L166.3 25.4ZM164.7 25.3C162.6 25.3 160.9 25.9 159.6 27.1L160.3 27.8C161.4 26.8 162.8 26.3 164.7 26.3V25.3ZM159.6 27.1C158.4 28.4 157.8 30.2 157.8 32.5H158.8C158.8 30.3 159.3 28.8 160.3 27.8L159.6 27.1ZM157.8 32.5V44H158.8V32.5H157.8ZM158.3 43.5H151.3V44.5H158.3V43.5ZM151.8 44V19.7H150.8V44H151.8ZM151.3 20.2H158.0V19.2H151.3V20.2ZM157.5 19.7V22.9H158.5V19.7H157.5ZM170.5 19.7V19.2H170.0V19.7H170.5ZM177.5 19.7H178.0V19.2H177.5V19.7ZM177.5 44V44.5H178.0V44H177.5ZM170.5 44H170.0V44.5H170.5V44ZM170.8 15.2L170.5 15.6V15.6L170.8 15.2ZM170.8 9.7L171.2 10.0V10.0L170.8 9.7ZM177.1 9.6L176.8 10.0L177.1 9.6ZM177.1 15.2L177.5 15.6L177.5 15.6L177.1 15.2ZM170.5 20.2H177.5V19.2H170.5V20.2ZM177.0 19.7V44H178.0V19.7H177.0ZM177.5 43.5H170.5V44.5H177.5V43.5ZM171.0 44V19.7H170.0V44H171.0ZM174.0 15.9C172.8 15.9 171.9 15.5 171.2 14.9L170.5 15.6C171.4 16.5 172.6 16.9 174.0 16.9V15.9ZM171.2 14.9C170.5 14.2 170.1 13.4 170.1 12.5H169.1C169.1 13.7 169.6 14.8 170.5 15.6L171.2 14.9ZM170.1 12.5C170.1 11.5 170.5 10.7 171.2 10.0L170.5 9.3C169.6 10.1 169.1 11.2 169.1 12.5H170.1ZM171.2 10.0C171.9 9.4 172.8 9.0 174.0 9.0V8.0C172.6 8.0 171.4 8.4 170.5 9.3L171.2 10.0ZM174.0 9.0C175.2 9.0 176.1 9.4 176.8 10.0L177.5 9.2C176.5 8.4 175.4 8.0 174.0 8.0V9.0ZM176.8 10.0C177.5 10.6 177.8 11.4 177.8 12.3H178.8C178.8 11.1 178.4 10.1 177.5 9.2L176.8 10.0ZM177.8 12.3C177.8 13.4 177.5 14.2 176.8 14.9L177.5 15.6C178.4 14.7 178.8 13.6 178.8 12.3H177.8ZM176.8 14.9C176.1 15.5 175.2 15.9 174.0 15.9V16.9C175.4 16.9 176.5 16.5 177.5 15.6L176.8 14.9ZM222.2 22.1L221.8 22.4L221.9 22.4L222.2 22.1ZM224.9 44V44.5H225.4V44H224.9ZM217.9 44H217.4V44.5H217.9V44ZM216.7 26.9L216.3 27.2L216.3 27.2L216.3 27.2L216.7 26.9ZM209.4 27.1L209.7 27.4L209.8 27.4L209.4 27.1ZM207.9 44V44.5H208.4V44H207.9ZM200.9 44H200.4V44.5H200.9V44ZM192.5 27.1L192.8 27.4L192.8 27.4L192.5 27.1ZM191.0 44V44.5H191.5V44H191.0ZM184.0 44H183.5V44.5H184.0V44ZM184.0 19.7V19.2H183.5V19.7H184.0ZM190.7 19.7H191.2V19.2H190.7V19.7ZM190.7 22.5H190.2V23.9L191.1 22.9L190.7 22.5ZM194.0 20.2L193.8 19.7L193.8 19.7L194.0 20.2ZM202.9 20.4L202.7 20.9L202.7 20.9L202.9 20.4ZM206.3 23.3L205.9 23.6L206.2 24.2L206.7 23.6L206.3 23.3ZM210.0 20.4L209.8 20.0L209.8 20.0L210.0 20.4ZM215.0 19.9C217.9 19.9 220.2 20.7 221.8 22.4L222.6 21.7C220.7 19.8 218.1 18.9 215.0 18.9V19.9ZM221.9 22.4C223.5 24.1 224.4 26.6 224.4 30.1H225.4C225.4 26.4 224.5 23.6 222.6 21.7L221.9 22.4ZM224.4 30.1V44H225.4V30.1H224.4ZM224.9 43.5H217.9V44.5H224.9V43.5ZM218.4 44V31.2H217.4V44H218.4ZM218.4 31.2C218.4 29.2 218.0 27.6 217.0 26.6L216.3 27.2C217.0 28.0 217.4 29.3 217.4 31.2H218.4ZM217.1 26.6C216.2 25.5 214.9 25.0 213.3 25.0V26.0C214.6 26.0 215.6 26.4 216.3 27.2L217.1 26.6ZM213.3 25.0C211.5 25.0 210.1 25.5 209.0 26.7L209.8 27.4C210.6 26.4 211.8 26.0 213.3 26.0V25.0ZM209.0 26.7C207.9 27.9 207.4 29.6 207.4 31.8H208.4C208.4 29.8 208.9 28.3 209.7 27.4L209.0 26.7ZM207.4 31.8V44H208.4V31.8H207.4ZM207.9 43.5H200.9V44.5H207.9V43.5ZM201.4 44V31.2H200.4V44H201.4ZM201.4 31.2C201.4 29.2 201.0 27.6 200.2 26.6C199.3 25.5 198.0 25.0 196.3 25.0V26.0C197.7 26.0 198.7 26.4 199.4 27.2C200.0 28.0 200.4 29.3 200.4 31.2H201.4ZM196.3 25.0C194.6 25.0 193.2 25.5 192.1 26.7L192.8 27.4C193.7 26.4 194.8 26.0 196.3 26.0V25.0ZM192.1 26.7C191.0 27.9 190.5 29.6 190.5 31.8H191.5C191.5 29.8 192.0 28.3 192.8 27.4L192.1 26.7ZM190.5 31.8V44H191.5V31.8H190.5ZM191.0 43.5H184.0V44.5H191.0V43.5ZM184.5 44V19.7H183.5V44H184.5ZM184.0 20.2H190.7V19.2H184.0V20.2ZM190.2 19.7V22.5H191.2V19.7H190.2ZM191.1 22.9C191.9 21.9 193.0 21.2 194.2 20.7L193.8 19.7C192.4 20.3 191.3 21.1 190.3 22.2L191.1 22.9ZM194.2 20.7C195.4 20.1 196.8 19.9 198.3 19.9V18.9C196.7 18.9 195.2 19.2 193.8 19.7L194.2 20.7ZM198.3 19.9C199.9 19.9 201.4 20.2 202.7 20.9L203.2 20.0C201.7 19.2 200.1 18.9 198.3 18.9V19.9ZM202.7 20.9C204.0 21.5 205.1 22.4 205.9 23.6L206.7 23.1C205.8 21.7 204.6 20.7 203.2 20.0L202.7 20.9ZM206.7 23.6C207.6 22.5 208.8 21.5 210.2 20.9L209.8 20.0C208.2 20.7 206.9 21.7 205.9 23.0L206.7 23.6ZM210.2 20.9C211.7 20.2 213.3 19.9 215.0 19.9V18.9C213.1 18.9 211.4 19.2 209.8 20.0L210.2 20.9ZM236.1 42.7L235.9 43.2L235.9 43.2L236.1 42.7ZM231.4 38.3L230.9 38.5L231.4 38.3ZM231.4 25.4L230.9 25.2L231.4 25.4ZM236.1 21.0L236.3 21.4L236.3 21.4L236.1 21.0ZM249.8 21.0L249.6 21.4L249.6 21.4L249.8 21.0ZM254.5 25.4L255.0 25.2L254.5 25.4ZM254.5 38.3L255.0 38.5L254.5 38.3ZM249.8 42.7L250.1 43.2L250.1 43.2L249.8 42.7ZM247.4 36.8L247.0 36.4L247.0 36.4L247.4 36.8ZM247.4 27.0L247.0 27.3L247.0 27.3L247.4 27.0ZM238.5 27.0L238.9 27.3L238.9 27.3L238.5 27.0ZM238.5 36.8L238.2 37.1L238.2 37.1L238.5 36.8ZM243.0 43.8C240.5 43.8 238.3 43.3 236.3 42.3L235.9 43.2C238.0 44.3 240.4 44.8 243.0 44.8V43.8ZM236.3 42.3C234.4 41.3 232.9 39.8 231.8 38.0L230.9 38.5C232.1 40.5 233.8 42.1 235.9 43.2L236.3 42.3ZM231.8 38.0C230.7 36.2 230.2 34.2 230.2 31.8H229.2C229.2 34.3 229.8 36.6 230.9 38.5L231.8 38.0ZM230.2 31.8C230.2 29.5 230.7 27.5 231.8 25.7L230.9 25.2C229.8 27.1 229.2 29.4 229.2 31.8H230.2ZM231.8 25.7C232.9 23.9 234.4 22.5 236.3 21.4L235.9 20.6C233.8 21.6 232.1 23.2 230.9 25.2L231.8 25.7ZM236.3 21.4C238.3 20.4 240.5 19.9 243.0 19.9V18.9C240.4 18.9 238.0 19.4 235.9 20.6L236.3 21.4ZM243.0 19.9C245.5 19.9 247.7 20.4 249.6 21.4L250.1 20.6C248.0 19.4 245.6 18.9 243.0 18.9V19.9ZM249.6 21.4C251.5 22.5 253.0 23.9 254.1 25.7L255.0 25.2C253.8 23.2 252.1 21.6 250.1 20.6L249.6 21.4ZM254.1 25.7C255.2 27.5 255.8 29.5 255.8 31.8H256.8C256.8 29.4 256.2 27.1 255.0 25.2L254.1 25.7ZM255.8 31.8C255.8 34.2 255.2 36.2 254.1 38.0L255.0 38.5C256.2 36.6 256.8 34.3 256.8 31.8H255.8ZM254.1 38.0C253.0 39.8 251.5 41.3 249.6 42.3L250.1 43.2C252.1 42.1 253.8 40.5 255.0 38.5L254.1 38.0ZM249.6 42.3C247.7 43.3 245.5 43.8 243.0 43.8V44.8C245.6 44.8 248.0 44.3 250.1 43.2L249.6 42.3ZM243.0 39.1C244.9 39.1 246.5 38.4 247.8 37.1L247.0 36.4C246.0 37.5 244.7 38.1 243.0 38.1V39.1ZM247.8 37.1C249.0 35.8 249.6 34.0 249.6 31.8H248.6C248.6 33.8 248.1 35.3 247.0 36.4L247.8 37.1ZM249.6 31.8C249.6 29.7 249.0 27.9 247.7 26.6L247.0 27.3C248.1 28.4 248.6 29.9 248.6 31.8H249.6ZM247.8 26.6C246.5 25.3 244.9 24.6 243.0 24.6V25.6C244.7 25.6 246.0 26.2 247.0 27.3L247.8 26.6ZM243.0 24.6C241.1 24.6 239.4 25.3 238.2 26.6L238.9 27.3C240.0 26.2 241.3 25.6 243.0 25.6V24.6ZM238.2 26.6C236.9 27.9 236.3 29.7 236.3 31.8H237.3C237.3 29.9 237.8 28.4 238.9 27.3L238.2 26.6ZM236.3 31.8C236.3 34.0 236.9 35.8 238.2 37.1L238.9 36.4C237.8 35.3 237.3 33.8 237.3 31.8H236.3ZM238.2 37.1C239.4 38.4 241.1 39.1 243.0 39.1V38.1C241.3 38.1 240.0 37.5 238.9 36.4L238.2 37.1Z" fill="#343434"></path><defs><linearGradient id="paint0_linear" x1="14.5" y1="41.1" x2="33.6" y2="58.5" gradientUnits="userSpaceOnUse"><stop stop-color="#EE4645"></stop><stop offset="1" stop-color="#810707"></stop></linearGradient></defs></svg>
diff --git a/doc/logos/prisma.svg b/doc/logos/prisma.svg
deleted file mode 100644
index 6249376fb5..0000000000
--- a/doc/logos/prisma.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="90" height="29" viewBox="0 0 90 29" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M0.2 19.5C-0.0 19.0 -0.0 18.5 0.1 18.0L10.3 1.5C10.8 0.6 12.2 0.7 12.7 1.6L21.9 21.7C22.3 22.5 21.9 23.3 21.1 23.6L6.7 27.9C6.1 28.1 5.5 27.8 5.1 27.3L0.2 19.5ZM11.4 6.3C11.5 5.9 12.2 5.8 12.4 6.2L18.8 21.0C18.9 21.3 18.8 21.6 18.5 21.7L8.5 24.7C8.2 24.8 7.8 24.5 7.9 24.1L11.4 6.3ZM48.4 21.6H51.3V11.2H48.4V21.6ZM48.3 8.5C48.3 7.6 48.8 7.2 49.9 7.2C50.9 7.2 51.4 7.6 51.4 8.5C51.4 9.0 51.3 9.3 51.0 9.6C50.8 9.8 50.4 9.9 49.9 9.9C48.8 9.9 48.3 9.5 48.3 8.5ZM87.1 16.8L86.0 16.8C85.2 16.8 84.6 17.0 84.2 17.3C83.8 17.5 83.6 18.0 83.6 18.5C83.6 19.3 84.0 19.7 85.0 19.7C85.6 19.7 86.1 19.5 86.5 19.1C86.9 18.8 87.1 18.3 87.1 17.6V16.8ZM88.0 21.6L87.4 20.2H87.3C86.9 20.8 86.4 21.2 85.9 21.4C85.4 21.7 84.7 21.8 83.9 21.8C82.9 21.8 82.1 21.5 81.5 20.9C81.0 20.4 80.7 19.5 80.7 18.5C80.7 17.4 81.1 16.6 81.8 16.1C82.6 15.5 83.8 15.2 85.3 15.2L87.1 15.1V14.7C87.1 13.6 86.6 13.1 85.5 13.1C84.7 13.1 83.7 13.4 82.6 13.9L81.7 11.9C82.8 11.3 84.2 11.0 85.6 11.0C87.0 11.0 88.1 11.3 88.8 11.9C89.6 12.5 89.9 13.4 89.9 14.7V21.6H88.0ZM72.4 21.6H69.6V15.5C69.6 14.8 69.5 14.2 69.2 13.9C69.0 13.5 68.6 13.3 68.0 13.3C67.3 13.3 66.8 13.6 66.5 14.1C66.1 14.6 66.0 15.5 66.0 16.7V21.6H63.1V11.2H65.3L65.7 12.5H65.8C66.1 12.1 66.5 11.7 67.1 11.4C67.6 11.2 68.2 11.0 68.9 11.0C70.4 11.0 71.5 11.5 72.0 12.5H72.3C72.5 12.1 73.0 11.7 73.5 11.4C74.0 11.2 74.6 11.0 75.3 11.0C76.5 11.0 77.4 11.3 78.0 11.9C78.6 12.5 78.9 13.5 78.9 14.8V21.6H76.1V15.5C76.1 14.8 75.9 14.2 75.7 13.9C75.4 13.5 75.0 13.3 74.5 13.3C73.8 13.3 73.3 13.5 72.9 14.0C72.6 14.5 72.4 15.3 72.4 16.4V21.6ZM60.1 20.9C60.9 20.4 61.2 19.6 61.2 18.5C61.2 18.0 61.1 17.6 61.0 17.2C60.8 16.8 60.5 16.5 60.1 16.2C59.7 15.9 59.2 15.6 58.3 15.3C57.4 14.9 56.8 14.6 56.6 14.5C56.3 14.3 56.2 14.1 56.2 13.8C56.2 13.3 56.6 13.1 57.4 13.1C57.9 13.1 58.4 13.2 58.8 13.3C59.3 13.5 59.7 13.7 60.3 13.9L61.1 11.8C59.9 11.3 58.7 11.0 57.5 11.0C56.2 11.0 55.2 11.3 54.4 11.8C53.7 12.3 53.4 13.0 53.4 13.9C53.4 14.5 53.5 14.9 53.6 15.3C53.8 15.6 54.1 16.0 54.4 16.3C54.8 16.5 55.4 16.9 56.2 17.2C56.8 17.4 57.2 17.6 57.5 17.8C57.9 18.0 58.1 18.1 58.2 18.3C58.4 18.4 58.4 18.6 58.4 18.8C58.4 19.4 57.9 19.7 56.9 19.7C56.4 19.7 55.8 19.6 55.2 19.5C54.5 19.3 53.9 19.1 53.4 18.8V21.2C53.8 21.4 54.3 21.5 54.9 21.6C55.4 21.7 56.1 21.8 56.8 21.8C58.3 21.8 59.4 21.5 60.1 20.9ZM46.9 11.1C46.7 11.1 46.4 11.0 46.0 11.0C45.3 11.0 44.8 11.2 44.2 11.6C43.7 11.9 43.2 12.4 42.9 13.0H42.8L42.3 11.2H40.2V21.6H43.0V16.3C43.0 15.5 43.3 14.8 43.8 14.4C44.3 13.9 45.0 13.7 45.9 13.7C46.2 13.7 46.5 13.7 46.7 13.8L46.9 11.1ZM31.9 14.4H32.8C33.7 14.4 34.4 14.2 34.8 13.9C35.3 13.5 35.5 13.0 35.5 12.4C35.5 11.7 35.3 11.2 34.9 10.9C34.6 10.5 34.0 10.4 33.2 10.4H31.9V14.4ZM38.4 12.3C38.4 13.7 37.9 14.8 37.0 15.6C36.1 16.4 34.8 16.8 33.1 16.8H31.9V21.6H29.0V8.0H33.3C35.0 8.0 36.2 8.4 37.1 9.1C37.9 9.8 38.4 10.9 38.4 12.3Z" fill="black"></path></svg>
diff --git a/doc/logos/rockset.svg b/doc/logos/rockset.svg
deleted file mode 100644
index a412f8f81b..0000000000
--- a/doc/logos/rockset.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="718" height="198" xmlns="http://www.w3.org/2000/svg"><g fill-rule="nonzero" fill="none"><path d="M127.55 81.75c0-18-12.32-31.16-32.46-31.16H49.87v96.67h20.58v-34.64h15.07l19 34.64h23.62l-21.74-36.81c10.43-2.45 21.15-11.59 21.15-28.7zM185.39 49C156.26 49 135 69.87 135 99s21.3 50 50.43 50c29.28 0 50.58-20.87 50.58-50s-21.34-50-50.62-50zm0 81.74c-17.83 0-29.27-13.77-29.27-31.74 0-18.12 11.44-31.74 29.27-31.74S214.81 80.88 214.81 99c0 18-11.59 31.74-29.42 31.74zM294.28 67.26a26.45 26.45 0 0 1 23.47 14.06l17.69-8.7c-6.82-12-19.13-23.62-41.16-23.62-28.27 0-50.73 20.29-50.73 50s22.46 50 50.73 50c22 0 34.2-11.74 41.16-23.77l-17.69-8.55a26.19 26.19 0 0 1-23.47 14.06c-16.82 0-29.57-13.48-29.57-31.74 0-18.26 12.75-31.74 29.57-31.74zM425.84 50.59h-25.36l-34.2 43.19V50.59H345.7v96.67h20.58v-29.71l7.53-8.99 29.28 38.7h25.36l-41.01-51.3z" fill="#609"/><path d="M471.45 88.13c-11.16-2.61-19.28-4.64-19.28-11.16 0-5.8 4.93-9.85 14.21-9.85a41.23 41.23 0 0 1 27.68 10.58l11.45-15.08c-9.57-8.84-22.32-13.48-37.68-13.48-22.76 0-36.67 13.05-36.67 29.14 0 21.59 20.29 25.94 36.09 29.56 11.16 2.61 19.56 5.07 19.56 12.32 0 5.51-5.51 10.87-16.81 10.87a42.38 42.38 0 0 1-30.72-13L428 133.64c9.13 9.13 22.47 15.36 41 15.36 26.08 0 38.69-13.33 38.69-31-.01-21.46-20.3-26.25-36.24-29.87zM520.07 147.26h68.41v-17.82h-47.83v-22.47h46.82V89.29h-46.82V68.28h47.83V50.59h-68.41zM596.03 50.59v18.12h28.26v78.55h20.73V68.71h28.11V50.59z" fill="#609"/><path fill="#63C0DD" d="M60 20V0H0v198h60v-20H20V20zM658 20V0h60v198h-60v-20h40V20z"/></g></svg>
\ No newline at end of file
diff --git a/index.html b/index.html
index 47f9ec00e8..63426417ea 100644
--- a/index.html
+++ b/index.html
@@ -22,7 +22,7 @@
 </style>
 
 <div class=banner>
-  ‼️ Check out the upcoming <a href="https://codemirror.net/6/">CodeMirror 6</a>, a much-improved rewrite! ✨
+  Note that this is the website for CodeMirror 5. <a href="https://codemirror.net/">Version 6</a> is the current version.
 </div>
 
 <div id=nav>
@@ -92,27 +92,10 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    <div class=actionspicture>
-      <img src="doc/yinyang.png" class=yinyang>
-      <div class="actionlink download">
-        <a href="https://codemirror.net/codemirror.zip">DOWNLOAD</a>
-      </div>
-      <div class="actionlink fund">
-        <a href="https://marijnhaverbeke.nl/fund/">FUND</a>
-      </div>
-    </div>
-    <div class=actionsleft>
-      Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.5</a>.<br>
-      You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
-      read the <a href="doc/releases.html">release notes</a>,<br>
-      or study the <a href="doc/manual.html">user manual</a>.
-    </div>
-    <div class=actionsright>
-      Software needs maintenance,<br>
-      maintainers need to subsist.<br>
-      You can help <a href="https://marijnhaverbeke.nl/fund/" title="Set up a monthly contribution">per month</a> or
-      <a title="Donate with PayPal" href="https://www.paypal.me/marijnhaverbeke">once</a>.
-    </div>
+    Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.5</a>.<br>
+    You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
+    read the <a href="doc/releases.html">release notes</a>,<br>
+    or study the <a href="doc/manual.html">user manual</a>.
   </div>
 
 </section>
@@ -193,32 +176,4 @@ <h2>Browser support</h2>
   pretty well.</p>
 </section>
 
-<section id=sponsors>
-  <style>
-    ul.sponsor-list { padding-left: 10px; font-size: 200%; }
-    ul.sponsor-list a { color: black; text-decoration: none }
-    ul.sponsor-list li { list-style: none; margin-bottom: 16px }
-    ul.sponsor-list img { max-width: 80%; max-height: 160px; width: 320px }
-    ul.sponsor-list img.captioned { vertical-align: middle; width: 80px; max-width: 40%; height: auto; margin-right: 16px }
-  </style>
-
-  <h2>Sponsors</h2>
-  <p>These companies support development of this project:</p>
-  <ul class=sponsor-list>
-    <li><a href="http://observablehq.com/"><img alt="Observable" src='doc/logos/observable.svg' loading=lazy></a></li>
-    <li><a href="https://holmusk.com"><img class=captioned alt="" src='doc/logos/holmusk.svg' loading=lazy>Holmusk</a></li>
-    <li><a href="https://codepen.io/"><img style="margin: 16px 0" src='doc/logos/codepen.svg' loading=lazy alt="CodePen"></a></li>
-    <li><a href="https://4me.com"><img style="width: auto" src='doc/logos/4me.svg' loading=lazy alt="4me"></a></li>
-    <li><a href="https://www.jetbrains.com/"><img src="doc/logos/jetbrains.svg" loading=lazy alt="JetBrains"></a>
-    <li><a href="https://www.desmos.com/"><img src='doc/logos/desmos.svg' loading=lazy alt=desmos></a></li>
-    <li><a href="https://www.executeprogram.com"><img style="background: #003; margin: 10px 0; padding: 10px 30px 10px 20px" src='doc/logos/executeprogram.svg' loading=lazy alt="Execute Program"></a></li>
-    <li><a href="https://cargo.site"><img alt=Cargo style="max-height: 120px" src='doc/logos/cargo.svg' loading=lazy></a></li>
-    <li><a href="https://rockset.com"><img alt=Rockset style="max-height: 120px" src='doc/logos/rockset.svg' loading=lazy></a></li>
-    <li><a href="https://primo.af"><img alt=primo src='doc/logos/primo.svg' loading=lazy></a></li>
-    <li><a href="https://www.artcompiler.com"><img class=captioned alt="" src='doc/logos/artcompiler.svg' loading=lazy> ARTCOMPILER</a></li>
-    <li><a href="https://www.prisma.io"><img alt="Prisma" src='doc/logos/prisma.svg' loading=lazy></a>
-    <li><a href="https://anvil.works/"><img alt="Anvil" src='doc/logos/anvil.png' loading=lazy></a>
-  </ul>
-</section>
-
 </article>

From 7f488eb5c12d71ea7ea75e286b7b9c029453a298 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 8 Jun 2022 09:58:57 +0200
Subject: [PATCH 4630/4742] Adjust website and github links to include '5'

---
 CHANGELOG.md                              | 1262 ++++++++++-----------
 CONTRIBUTING.md                           |    2 +-
 README.md                                 |    8 +-
 addon/comment/comment.js                  |    2 +-
 addon/comment/continuecomment.js          |    2 +-
 addon/dialog/dialog.js                    |    2 +-
 addon/display/autorefresh.js              |    2 +-
 addon/display/fullscreen.js               |    2 +-
 addon/display/panel.js                    |    2 +-
 addon/display/placeholder.js              |    2 +-
 addon/display/rulers.js                   |    2 +-
 addon/edit/closebrackets.js               |    2 +-
 addon/edit/closetag.js                    |    2 +-
 addon/edit/continuelist.js                |    2 +-
 addon/edit/matchbrackets.js               |    2 +-
 addon/edit/matchtags.js                   |    2 +-
 addon/edit/trailingspace.js               |    2 +-
 addon/fold/brace-fold.js                  |    2 +-
 addon/fold/comment-fold.js                |    2 +-
 addon/fold/foldcode.js                    |    2 +-
 addon/fold/foldgutter.js                  |    2 +-
 addon/fold/indent-fold.js                 |    2 +-
 addon/fold/markdown-fold.js               |    2 +-
 addon/fold/xml-fold.js                    |    2 +-
 addon/hint/anyword-hint.js                |    2 +-
 addon/hint/css-hint.js                    |    2 +-
 addon/hint/html-hint.js                   |    2 +-
 addon/hint/javascript-hint.js             |    2 +-
 addon/hint/show-hint.js                   |    2 +-
 addon/hint/sql-hint.js                    |    2 +-
 addon/hint/xml-hint.js                    |    2 +-
 addon/lint/coffeescript-lint.js           |    2 +-
 addon/lint/css-lint.js                    |    2 +-
 addon/lint/html-lint.js                   |    2 +-
 addon/lint/javascript-lint.js             |    2 +-
 addon/lint/json-lint.js                   |    2 +-
 addon/lint/lint.js                        |    2 +-
 addon/lint/yaml-lint.js                   |    2 +-
 addon/merge/merge.js                      |    2 +-
 addon/mode/loadmode.js                    |    2 +-
 addon/mode/multiplex.js                   |    2 +-
 addon/mode/multiplex_test.js              |    2 +-
 addon/mode/overlay.js                     |    2 +-
 addon/mode/simple.js                      |    2 +-
 addon/runmode/colorize.js                 |    2 +-
 addon/runmode/runmode.js                  |    2 +-
 addon/scroll/annotatescrollbar.js         |    2 +-
 addon/scroll/scrollpastend.js             |    2 +-
 addon/scroll/simplescrollbars.js          |    2 +-
 addon/search/jump-to-line.js              |    2 +-
 addon/search/match-highlighter.js         |    2 +-
 addon/search/matchesonscrollbar.js        |    2 +-
 addon/search/search.js                    |    2 +-
 addon/search/searchcursor.js              |    2 +-
 addon/selection/active-line.js            |    2 +-
 addon/selection/mark-selection.js         |    2 +-
 addon/selection/selection-pointer.js      |    2 +-
 addon/tern/tern.js                        |    2 +-
 addon/tern/worker.js                      |    2 +-
 addon/wrap/hardwrap.js                    |    2 +-
 demo/activeline.html                      |    4 +-
 demo/anywordhint.html                     |    4 +-
 demo/bidi.html                            |    4 +-
 demo/btree.html                           |    4 +-
 demo/buffers.html                         |    4 +-
 demo/changemode.html                      |    4 +-
 demo/closebrackets.html                   |    4 +-
 demo/closetag.html                        |    6 +-
 demo/complete.html                        |    4 +-
 demo/emacs.html                           |    4 +-
 demo/folding.html                         |    4 +-
 demo/fullscreen.html                      |    4 +-
 demo/hardwrap.html                        |    4 +-
 demo/html5complete.html                   |    4 +-
 demo/indentwrap.html                      |    4 +-
 demo/lint.html                            |    4 +-
 demo/loadmode.html                        |    4 +-
 demo/marker.html                          |    4 +-
 demo/markselection.html                   |    4 +-
 demo/matchhighlighter.html                |    4 +-
 demo/matchtags.html                       |    4 +-
 demo/merge.html                           |    4 +-
 demo/multiplex.html                       |    4 +-
 demo/mustache.html                        |    4 +-
 demo/panel.html                           |    4 +-
 demo/placeholder.html                     |    4 +-
 demo/preview.html                         |    4 +-
 demo/requirejs.html                       |    4 +-
 demo/resize.html                          |    4 +-
 demo/rulers.html                          |    4 +-
 demo/runmode-standalone.html              |    4 +-
 demo/runmode.html                         |    4 +-
 demo/search.html                          |    4 +-
 demo/simplemode.html                      |    4 +-
 demo/simplescrollbars.html                |    4 +-
 demo/spanaffectswrapping_shim.html        |    4 +-
 demo/sublime.html                         |    4 +-
 demo/tern.html                            |    4 +-
 demo/theme.html                           |    4 +-
 demo/trailingspace.html                   |    4 +-
 demo/variableheight.html                  |    4 +-
 demo/vim.html                             |    6 +-
 demo/visibletabs.html                     |    4 +-
 demo/widget.html                          |    4 +-
 demo/xmlcomplete.html                     |    4 +-
 doc/internals.html                        |   10 +-
 doc/manual.html                           |    6 +-
 doc/realworld.html                        |    6 +-
 doc/releases.html                         | 1094 +++++++++---------
 doc/reporting.html                        |    4 +-
 doc/upgrade_v2.2.html                     |    4 +-
 doc/upgrade_v3.html                       |    4 +-
 doc/upgrade_v4.html                       |    4 +-
 index.html                                |   12 +-
 keymap/emacs.js                           |    2 +-
 keymap/sublime.js                         |    2 +-
 keymap/vim.js                             |    2 +-
 mode/apl/apl.js                           |    2 +-
 mode/apl/index.html                       |    4 +-
 mode/asciiarmor/asciiarmor.js             |    2 +-
 mode/asciiarmor/index.html                |    4 +-
 mode/asn.1/asn.1.js                       |    2 +-
 mode/asn.1/index.html                     |    4 +-
 mode/asterisk/asterisk.js                 |    2 +-
 mode/asterisk/index.html                  |    4 +-
 mode/brainfuck/brainfuck.js               |    2 +-
 mode/brainfuck/index.html                 |    4 +-
 mode/clike/clike.js                       |    2 +-
 mode/clike/index.html                     |    4 +-
 mode/clike/scala.html                     |    4 +-
 mode/clike/test.js                        |    2 +-
 mode/clojure/clojure.js                   |    2 +-
 mode/clojure/index.html                   |    4 +-
 mode/clojure/test.js                      |    2 +-
 mode/cmake/cmake.js                       |    2 +-
 mode/cmake/index.html                     |    4 +-
 mode/cobol/cobol.js                       |    2 +-
 mode/cobol/index.html                     |    4 +-
 mode/coffeescript/coffeescript.js         |    2 +-
 mode/coffeescript/index.html              |    4 +-
 mode/commonlisp/commonlisp.js             |    2 +-
 mode/commonlisp/index.html                |    4 +-
 mode/crystal/crystal.js                   |    2 +-
 mode/crystal/index.html                   |    4 +-
 mode/css/css.js                           |    2 +-
 mode/css/gss.html                         |    4 +-
 mode/css/gss_test.js                      |    2 +-
 mode/css/index.html                       |    4 +-
 mode/css/less.html                        |    4 +-
 mode/css/less_test.js                     |    2 +-
 mode/css/scss.html                        |    4 +-
 mode/css/scss_test.js                     |    2 +-
 mode/css/test.js                          |    2 +-
 mode/cypher/cypher.js                     |    2 +-
 mode/cypher/index.html                    |    4 +-
 mode/cypher/test.js                       |    2 +-
 mode/d/d.js                               |    2 +-
 mode/d/index.html                         |    4 +-
 mode/d/test.js                            |    2 +-
 mode/dart/dart.js                         |    2 +-
 mode/dart/index.html                      |    4 +-
 mode/diff/diff.js                         |    2 +-
 mode/diff/index.html                      |    4 +-
 mode/django/django.js                     |    2 +-
 mode/django/index.html                    |    4 +-
 mode/dockerfile/dockerfile.js             |    2 +-
 mode/dockerfile/index.html                |    4 +-
 mode/dockerfile/test.js                   |    2 +-
 mode/dtd/dtd.js                           |    2 +-
 mode/dtd/index.html                       |    4 +-
 mode/dylan/dylan.js                       |    2 +-
 mode/dylan/index.html                     |    4 +-
 mode/dylan/test.js                        |    2 +-
 mode/ebnf/ebnf.js                         |    2 +-
 mode/ebnf/index.html                      |    4 +-
 mode/ecl/ecl.js                           |    2 +-
 mode/ecl/index.html                       |    4 +-
 mode/eiffel/eiffel.js                     |    2 +-
 mode/eiffel/index.html                    |    4 +-
 mode/elm/elm.js                           |    2 +-
 mode/elm/index.html                       |    4 +-
 mode/erlang/erlang.js                     |    2 +-
 mode/erlang/index.html                    |    4 +-
 mode/factor/factor.js                     |    2 +-
 mode/factor/index.html                    |    4 +-
 mode/fcl/fcl.js                           |    2 +-
 mode/fcl/index.html                       |    4 +-
 mode/forth/forth.js                       |    2 +-
 mode/forth/index.html                     |    4 +-
 mode/fortran/fortran.js                   |    2 +-
 mode/fortran/index.html                   |    4 +-
 mode/gas/gas.js                           |    2 +-
 mode/gas/index.html                       |    4 +-
 mode/gfm/gfm.js                           |    2 +-
 mode/gfm/index.html                       |    4 +-
 mode/gfm/test.js                          |    2 +-
 mode/gherkin/gherkin.js                   |    2 +-
 mode/gherkin/index.html                   |    4 +-
 mode/go/go.js                             |    2 +-
 mode/go/index.html                        |    4 +-
 mode/groovy/groovy.js                     |    2 +-
 mode/groovy/index.html                    |    4 +-
 mode/haml/haml.js                         |    2 +-
 mode/haml/index.html                      |    4 +-
 mode/haml/test.js                         |    2 +-
 mode/handlebars/handlebars.js             |    2 +-
 mode/handlebars/index.html                |    4 +-
 mode/haskell-literate/haskell-literate.js |    2 +-
 mode/haskell-literate/index.html          |    4 +-
 mode/haskell/haskell.js                   |    2 +-
 mode/haskell/index.html                   |    4 +-
 mode/haxe/haxe.js                         |    2 +-
 mode/haxe/index.html                      |    4 +-
 mode/htmlembedded/htmlembedded.js         |    2 +-
 mode/htmlembedded/index.html              |    4 +-
 mode/htmlmixed/htmlmixed.js               |    2 +-
 mode/htmlmixed/index.html                 |    4 +-
 mode/http/http.js                         |    2 +-
 mode/http/index.html                      |    4 +-
 mode/idl/idl.js                           |    2 +-
 mode/idl/index.html                       |    4 +-
 mode/index.html                           |    4 +-
 mode/javascript/index.html                |    4 +-
 mode/javascript/javascript.js             |    2 +-
 mode/javascript/json-ld.html              |    4 +-
 mode/javascript/test.js                   |    2 +-
 mode/javascript/typescript.html           |    4 +-
 mode/jinja2/index.html                    |    4 +-
 mode/jinja2/jinja2.js                     |    2 +-
 mode/jsx/index.html                       |    4 +-
 mode/jsx/jsx.js                           |    2 +-
 mode/jsx/test.js                          |    2 +-
 mode/julia/index.html                     |    4 +-
 mode/julia/julia.js                       |    2 +-
 mode/livescript/index.html                |    4 +-
 mode/livescript/livescript.js             |    2 +-
 mode/lua/index.html                       |    6 +-
 mode/lua/lua.js                           |    2 +-
 mode/markdown/index.html                  |    4 +-
 mode/markdown/markdown.js                 |    2 +-
 mode/markdown/test.js                     |    2 +-
 mode/mathematica/index.html               |    4 +-
 mode/mathematica/mathematica.js           |    2 +-
 mode/mbox/index.html                      |    4 +-
 mode/mbox/mbox.js                         |    2 +-
 mode/meta.js                              |    2 +-
 mode/mirc/index.html                      |    4 +-
 mode/mirc/mirc.js                         |    2 +-
 mode/mllike/index.html                    |    4 +-
 mode/mllike/mllike.js                     |    2 +-
 mode/modelica/index.html                  |    4 +-
 mode/modelica/modelica.js                 |    2 +-
 mode/mscgen/index.html                    |    4 +-
 mode/mscgen/mscgen.js                     |    2 +-
 mode/mscgen/mscgen_test.js                |    2 +-
 mode/mscgen/msgenny_test.js               |    2 +-
 mode/mscgen/xu_test.js                    |    2 +-
 mode/mumps/index.html                     |    4 +-
 mode/mumps/mumps.js                       |    2 +-
 mode/nginx/index.html                     |    4 +-
 mode/nginx/nginx.js                       |    2 +-
 mode/nsis/index.html                      |    4 +-
 mode/nsis/nsis.js                         |    2 +-
 mode/ntriples/index.html                  |    4 +-
 mode/ntriples/ntriples.js                 |    2 +-
 mode/octave/index.html                    |    4 +-
 mode/octave/octave.js                     |    2 +-
 mode/oz/index.html                        |    4 +-
 mode/oz/oz.js                             |    2 +-
 mode/pascal/index.html                    |    4 +-
 mode/pascal/pascal.js                     |    2 +-
 mode/pegjs/index.html                     |    4 +-
 mode/pegjs/pegjs.js                       |    2 +-
 mode/perl/index.html                      |    4 +-
 mode/perl/perl.js                         |    2 +-
 mode/php/index.html                       |    4 +-
 mode/php/php.js                           |    2 +-
 mode/php/test.js                          |    2 +-
 mode/pig/index.html                       |    4 +-
 mode/pig/pig.js                           |    2 +-
 mode/powershell/index.html                |    4 +-
 mode/powershell/powershell.js             |    2 +-
 mode/powershell/test.js                   |    2 +-
 mode/properties/index.html                |    4 +-
 mode/properties/properties.js             |    2 +-
 mode/protobuf/index.html                  |    4 +-
 mode/protobuf/protobuf.js                 |    2 +-
 mode/pug/index.html                       |    4 +-
 mode/pug/pug.js                           |    2 +-
 mode/puppet/index.html                    |    4 +-
 mode/puppet/puppet.js                     |    2 +-
 mode/python/index.html                    |    4 +-
 mode/python/python.js                     |    2 +-
 mode/python/test.js                       |    2 +-
 mode/q/index.html                         |    4 +-
 mode/q/q.js                               |    2 +-
 mode/r/index.html                         |    4 +-
 mode/r/r.js                               |    2 +-
 mode/rpm/changes/index.html               |    4 +-
 mode/rpm/index.html                       |    4 +-
 mode/rpm/rpm.js                           |    2 +-
 mode/rst/index.html                       |    4 +-
 mode/rst/rst.js                           |    2 +-
 mode/ruby/index.html                      |    4 +-
 mode/ruby/ruby.js                         |    2 +-
 mode/ruby/test.js                         |    2 +-
 mode/rust/index.html                      |    4 +-
 mode/rust/rust.js                         |    2 +-
 mode/rust/test.js                         |    2 +-
 mode/sas/index.html                       |    4 +-
 mode/sas/sas.js                           |    2 +-
 mode/sass/index.html                      |    4 +-
 mode/sass/sass.js                         |    2 +-
 mode/sass/test.js                         |    2 +-
 mode/scheme/index.html                    |    4 +-
 mode/scheme/scheme.js                     |    2 +-
 mode/shell/index.html                     |    4 +-
 mode/shell/shell.js                       |    2 +-
 mode/shell/test.js                        |    2 +-
 mode/sieve/index.html                     |    4 +-
 mode/sieve/sieve.js                       |    2 +-
 mode/slim/index.html                      |    4 +-
 mode/slim/slim.js                         |    2 +-
 mode/slim/test.js                         |    2 +-
 mode/smalltalk/index.html                 |    4 +-
 mode/smalltalk/smalltalk.js               |    2 +-
 mode/smarty/index.html                    |    4 +-
 mode/smarty/smarty.js                     |    2 +-
 mode/solr/index.html                      |    4 +-
 mode/solr/solr.js                         |    2 +-
 mode/soy/index.html                       |    4 +-
 mode/soy/soy.js                           |    2 +-
 mode/soy/test.js                          |    2 +-
 mode/sparql/index.html                    |    4 +-
 mode/sparql/sparql.js                     |    2 +-
 mode/spreadsheet/index.html               |    4 +-
 mode/spreadsheet/spreadsheet.js           |    2 +-
 mode/sql/index.html                       |    4 +-
 mode/sql/sql.js                           |    2 +-
 mode/stex/index.html                      |    4 +-
 mode/stex/stex.js                         |    2 +-
 mode/stex/test.js                         |    2 +-
 mode/stylus/index.html                    |    4 +-
 mode/stylus/stylus.js                     |    2 +-
 mode/swift/index.html                     |    4 +-
 mode/swift/swift.js                       |    2 +-
 mode/swift/test.js                        |    2 +-
 mode/tcl/index.html                       |    4 +-
 mode/tcl/tcl.js                           |    2 +-
 mode/textile/index.html                   |    2 +-
 mode/textile/test.js                      |    2 +-
 mode/textile/textile.js                   |    2 +-
 mode/tiddlywiki/index.html                |    4 +-
 mode/tiddlywiki/tiddlywiki.js             |    2 +-
 mode/tiki/index.html                      |    4 +-
 mode/tiki/tiki.js                         |    2 +-
 mode/toml/index.html                      |    4 +-
 mode/toml/toml.js                         |    2 +-
 mode/tornado/index.html                   |    2 +-
 mode/tornado/tornado.js                   |    2 +-
 mode/troff/index.html                     |    4 +-
 mode/troff/troff.js                       |    2 +-
 mode/ttcn-cfg/index.html                  |    4 +-
 mode/ttcn-cfg/ttcn-cfg.js                 |    2 +-
 mode/ttcn/index.html                      |    4 +-
 mode/ttcn/ttcn.js                         |    2 +-
 mode/turtle/index.html                    |    4 +-
 mode/turtle/turtle.js                     |    2 +-
 mode/twig/index.html                      |    4 +-
 mode/twig/twig.js                         |    2 +-
 mode/vb/index.html                        |    4 +-
 mode/vb/vb.js                             |    2 +-
 mode/vbscript/index.html                  |    4 +-
 mode/vbscript/vbscript.js                 |    2 +-
 mode/velocity/index.html                  |    4 +-
 mode/velocity/velocity.js                 |    2 +-
 mode/verilog/index.html                   |    4 +-
 mode/verilog/test.js                      |    2 +-
 mode/verilog/verilog.js                   |    2 +-
 mode/vhdl/index.html                      |    4 +-
 mode/vhdl/vhdl.js                         |    2 +-
 mode/vue/index.html                       |    4 +-
 mode/vue/vue.js                           |    2 +-
 mode/wast/index.html                      |    4 +-
 mode/wast/test.js                         |    2 +-
 mode/wast/wast.js                         |    2 +-
 mode/webidl/index.html                    |    4 +-
 mode/webidl/webidl.js                     |    2 +-
 mode/xml/index.html                       |    4 +-
 mode/xml/test.js                          |    2 +-
 mode/xml/xml.js                           |    2 +-
 mode/xquery/index.html                    |    4 +-
 mode/xquery/test.js                       |    2 +-
 mode/xquery/xquery.js                     |    2 +-
 mode/yacas/index.html                     |    4 +-
 mode/yacas/yacas.js                       |    2 +-
 mode/yaml-frontmatter/index.html          |    4 +-
 mode/yaml-frontmatter/yaml-frontmatter.js |    2 +-
 mode/yaml/index.html                      |    4 +-
 mode/yaml/yaml.js                         |    2 +-
 mode/z80/index.html                       |    4 +-
 mode/z80/z80.js                           |    2 +-
 package.json                              |    2 +-
 rollup.config.js                          |    4 +-
 test/html-hint-test.js                    |    2 +-
 test/index.html                           |    4 +-
 test/sql-hint-test.js                     |    2 +-
 407 files changed, 1780 insertions(+), 1780 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cf8c14310..dea0a3f20f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,9 @@
 
 Work around a bug in Chrome 102 that caused wheel scrolling of the editor to constantly stop.
 
-[search addon](https://codemirror.net/demo/search.html): Make sure the search field has an accessible label.
+[search addon](https://codemirror.net/5/demo/search.html): Make sure the search field has an accessible label.
 
-[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Preserve indentation on otherwise empty lines when indenting.
+[comment addon](https://codemirror.net/5/doc/manual.html#addon_comment): Preserve indentation on otherwise empty lines when indenting.
 
 ## 5.65.4 (2022-05-20)
 
@@ -14,9 +14,9 @@ Work around a bug in Chrome 102 that caused wheel scrolling of the editor to con
 
 Ignore paste events when the editor doesn't have focus.
 
-[sparql mode](https://codemirror.net/mode/sparql/index.html): Fix parsing of variables after operators.
+[sparql mode](https://codemirror.net/5/mode/sparql/index.html): Fix parsing of variables after operators.
 
-[julia mode](https://codemirror.net/mode/julia/): Properly tokenize `!==` and `===` operators.
+[julia mode](https://codemirror.net/5/mode/julia/): Properly tokenize `!==` and `===` operators.
 
 ## 5.65.3 (2022-04-20)
 
@@ -24,17 +24,17 @@ Ignore paste events when the editor doesn't have focus.
 
 Fix a crash that could occur when when marking text.
 
-[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Add aria label to buttons.
+[merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): Add aria label to buttons.
 
-[groovy mode](https://codemirror.net/mode/groovy/index.html): Properly highlight interpolated variables.
+[groovy mode](https://codemirror.net/5/mode/groovy/index.html): Properly highlight interpolated variables.
 
 ## 5.65.2 (2022-02-21)
 
 ### Bug fixes
 
-[clike mode](https://codemirror.net/mode/clike/): Recognize triple quoted string in Java.
+[clike mode](https://codemirror.net/5/mode/clike/): Recognize triple quoted string in Java.
 
-[cypher mode](https://codemirror.net/mode/cypher/index.html): Fix handling of punctuation.
+[cypher mode](https://codemirror.net/5/mode/cypher/index.html): Fix handling of punctuation.
 
 ## 5.65.1 (2022-01-20)
 
@@ -50,7 +50,7 @@ brace-folding addon: Fix broken folding on lines with both braces and square bra
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Support g0, g$, g<Arrow>.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Support g0, g$, g<Arrow>.
 
 ## 5.64.0 (2021-11-20)
 
@@ -62,7 +62,7 @@ Make sure native scrollbars reset their position when hidden and re-shown.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Support C-u to delete back a line.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Support C-u to delete back a line.
 
 ## 5.63.3 (2021-10-11)
 
@@ -84,11 +84,11 @@ Fix an issue with mouse scrolling on Chrome 94 Windows, which made scrolling by
 
 Fix scroll position jumping when scrolling a document with very different line heights.
 
-[xml mode](https://codemirror.net/mode/xml/): Look up HTML element behavior in a case-insensitive way.
+[xml mode](https://codemirror.net/5/mode/xml/): Look up HTML element behavior in a case-insensitive way.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Support guu for case-changing.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Support guu for case-changing.
 
 ## 5.62.3 (2021-08-20)
 
@@ -98,27 +98,27 @@ Give the editor a `translate=no` attribute to prevent automatic translation from
 
 Give vim-style cursors a width that matches the character after them.
 
-[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Make buttons keyboard-accessible.
+[merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): Make buttons keyboard-accessible.
 
-[emacs bindings](https://codemirror.net/demo/emacs.html): Fix by-page scrolling keybindings, which were accidentally inverted.
+[emacs bindings](https://codemirror.net/5/demo/emacs.html): Fix by-page scrolling keybindings, which were accidentally inverted.
 
 ## 5.62.2 (2021-07-21)
 
 ### Bug fixes
 
-[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Fix a regression that broke several addon options.
+[lint addon](https://codemirror.net/5/doc/manual.html#addon_lint): Fix a regression that broke several addon options.
 
 ## 5.62.1 (2021-07-20)
 
 ### Bug fixes
 
-[vim bindings](https://codemirror.net/demo/vim.html): Make matching of upper-case characters more Unicode-aware.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Make matching of upper-case characters more Unicode-aware.
 
-[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Prevent options passed to the addon itself from being given to the linter.
+[lint addon](https://codemirror.net/5/doc/manual.html#addon_lint): Prevent options passed to the addon itself from being given to the linter.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Improve screen reader support.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Improve screen reader support.
 
-[search addon](https://codemirror.net/demo/search.html): Avoid using `innerHTML`.
+[search addon](https://codemirror.net/5/demo/search.html): Avoid using `innerHTML`.
 
 ## 5.62.0 (2021-06-21)
 
@@ -128,7 +128,7 @@ Improve support for vim-style cursors in a number of themes.
 
 ### New features
 
-[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Add support for highlighting lines with errors or warnings.
+[lint addon](https://codemirror.net/5/doc/manual.html#addon_lint): Add support for highlighting lines with errors or warnings.
 
 ## 5.61.1 (2021-05-20)
 
@@ -140,9 +140,9 @@ Fix a bug in horizontally scrolling the cursor into view.
 
 Optimize adding lots of marks in a single transaction.
 
-[simple mode addon](https://codemirror.net/demo/simplemode.html): Support regexps with a unicode flag.
+[simple mode addon](https://codemirror.net/5/demo/simplemode.html): Support regexps with a unicode flag.
 
-[javascript mode](https://codemirror.net/mode/javascript/index.html): Add support for TypeScript template string types, improve integration with JSX mode.
+[javascript mode](https://codemirror.net/5/mode/javascript/index.html): Add support for TypeScript template string types, improve integration with JSX mode.
 
 ## 5.61.0 (2021-04-20)
 
@@ -152,15 +152,15 @@ Improve support for being in a shadow DOM in contenteditable mode.
 
 Prevent line number from being read by screen readers.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix a crash caused by a race condition.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Fix a crash caused by a race condition.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Improve scope tracking.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Improve scope tracking.
 
 ### New features
 
 The library now emits an `"updateGutter"` event when the gutter width changes.
 
-[emacs bindings](https://codemirror.net/demo/emacs.html): Provide named commands for all bindings.
+[emacs bindings](https://codemirror.net/5/demo/emacs.html): Provide named commands for all bindings.
 
 ## 5.60.0 (2021-03-20)
 
@@ -168,17 +168,17 @@ The library now emits an `"updateGutter"` event when the gutter width changes.
 
 Fix autofocus feature in contenteditable mode.
 
-[simple mode addon](https://codemirror.net/demo/simplemode.html): Fix a null-dereference crash.
+[simple mode addon](https://codemirror.net/5/demo/simplemode.html): Fix a null-dereference crash.
 
-[multiplex addon](https://codemirror.net/demo/multiplex.html): Make it possible to use `parseDelimiters` when both delimiters are the same.
+[multiplex addon](https://codemirror.net/5/demo/multiplex.html): Make it possible to use `parseDelimiters` when both delimiters are the same.
 
-[julia mode](https://codemirror.net/mode/julia/): Fix a lockup bug.
+[julia mode](https://codemirror.net/5/mode/julia/): Fix a lockup bug.
 
 ### New features
 
 `setSelections` now allows ranges to omit the `head` property when it is equal to `anchor`.
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Add support for reverse line sorting.
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Add support for reverse line sorting.
 
 ## 5.59.4 (2021-02-24)
 
@@ -194,7 +194,7 @@ Don't override the way zero-with non-joiners are rendered.
 
 Fix an issue where resetting the history cleared the `undoDepth` option's value.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Fix substitute command when joining and splitting lines, fix global command when line number change, add support for `:vglobal`, properly treat caps lock as a modifier key.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Fix substitute command when joining and splitting lines, fix global command when line number change, add support for `:vglobal`, properly treat caps lock as a modifier key.
 
 ## 5.59.2 (2021-01-20)
 
@@ -202,9 +202,9 @@ Fix an issue where resetting the history cleared the `undoDepth` option's value.
 
 Don't try to scroll the selection into view in `readonly: "nocursor"` mode.
 
-[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Fix a regression in the behavior of pressing enter between brackets.
+[closebrackets addon](https://codemirror.net/5/doc/manual.html#addon_closebrackets): Fix a regression in the behavior of pressing enter between brackets.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Fix an infinite loop on specific syntax errors in object types.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Fix an infinite loop on specific syntax errors in object types.
 
 various modes: Fix inefficient RegExp matching.
 
@@ -220,17 +220,17 @@ Fix an issue where some Chrome browsers were detected as iOS.
 
 Fix platform detection on recent iPadOS.
 
-[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Don't show duplicate messages for a given line.
+[lint addon](https://codemirror.net/5/doc/manual.html#addon_lint): Don't show duplicate messages for a given line.
 
-[clojure mode](https://codemirror.net/mode/clojure/index.html): Fix regexp that matched in exponential time for some inputs.
+[clojure mode](https://codemirror.net/5/mode/clojure/index.html): Fix regexp that matched in exponential time for some inputs.
 
-[hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap): Improve handling of words that are longer than the line length.
+[hardwrap addon](https://codemirror.net/5/doc/manual.html#addon_hardwrap): Improve handling of words that are longer than the line length.
 
-[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Fix leaked event handler on disabling the addon.
+[matchbrackets addon](https://codemirror.net/5/doc/manual.html#addon_matchbrackets): Fix leaked event handler on disabling the addon.
 
 ### New features
 
-[search addon](https://codemirror.net/demo/search.html): Make it possible to configure the search addon to show the dialog at the bottom of the editor.
+[search addon](https://codemirror.net/5/demo/search.html): Make it possible to configure the search addon to show the dialog at the bottom of the editor.
 
 ## 5.58.3 (2020-11-19)
 
@@ -240,9 +240,9 @@ Suppress quick-firing of blur-focus events when dragging and clicking on Interne
 
 Fix the `insertAt` option to `addLineWidget` to actually allow the widget to be placed after all widgets for the line.
 
-[soy mode](https://codemirror.net/mode/soy/): Support `@Attribute` and element composition.
+[soy mode](https://codemirror.net/5/mode/soy/): Support `@Attribute` and element composition.
 
-[shell mode](https://codemirror.net/mode/shell/): Support heredoc quoting.
+[shell mode](https://codemirror.net/5/mode/shell/): Support heredoc quoting.
 
 ## 5.58.2 (2020-10-23)
 
@@ -250,13 +250,13 @@ Fix the `insertAt` option to `addLineWidget` to actually allow the widget to be
 
 Fix a bug where horizontally scrolling the cursor into view sometimes failed with a non-fixed gutter.
 
-[julia mode](https://codemirror.net/mode/julia/): Fix an infinite recursion bug.
+[julia mode](https://codemirror.net/5/mode/julia/): Fix an infinite recursion bug.
 
 ## 5.58.1 (2020-09-23)
 
 ### Bug fixes
 
-[placeholder addon](https://codemirror.net/doc/manual.html#addon_placeholder): Remove arrow function that ended up in the code.
+[placeholder addon](https://codemirror.net/5/doc/manual.html#addon_placeholder): Remove arrow function that ended up in the code.
 
 ## 5.58.0 (2020-09-21)
 
@@ -270,13 +270,13 @@ Fix a bug that prevented attributes added via `markText` from showing up unless
 
 Suppress cut and paste context menu entries in readonly editors in Chrome.
 
-[placeholder addon](https://codemirror.net/doc/manual.html#addon_placeholder): Update placeholder visibility during composition.
+[placeholder addon](https://codemirror.net/5/doc/manual.html#addon_placeholder): Update placeholder visibility during composition.
 
 ### New features
 
 Make it less cumbersome to style new lint message types.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Support black hole register, `gn` and `gN`
+[vim bindings](https://codemirror.net/5/demo/vim.html): Support black hole register, `gn` and `gN`
 
 ## 5.57.0 (2020-08-20)
 
@@ -284,15 +284,15 @@ Make it less cumbersome to style new lint message types.
 
 Fix issue that broke binding the macOS Command key.
 
-[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Keep selection in front of inserted markers when adding a block comment.
+[comment addon](https://codemirror.net/5/doc/manual.html#addon_comment): Keep selection in front of inserted markers when adding a block comment.
 
-[css mode](https://codemirror.net/mode/css/): Recognize more properties and value names.
+[css mode](https://codemirror.net/5/mode/css/): Recognize more properties and value names.
 
-[annotatescrollbar addon](https://codemirror.net/doc/manual.html#addon_annotatescrollbar): Don't hide matches in collapsed content.
+[annotatescrollbar addon](https://codemirror.net/5/doc/manual.html#addon_annotatescrollbar): Don't hide matches in collapsed content.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Support tag text objects in xml and html modes.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Support tag text objects in xml and html modes.
 
 ## 5.56.0 (2020-07-20)
 
@@ -300,17 +300,17 @@ Fix issue that broke binding the macOS Command key.
 
 Line-wise pasting was fixed on Chrome Windows.
 
-[wast mode](https://codemirror.net/mode/wast/): Follow standard changes.
+[wast mode](https://codemirror.net/5/mode/wast/): Follow standard changes.
 
-[soy mode](https://codemirror.net/mode/soy/): Support import expressions, template type, and loop indices.
+[soy mode](https://codemirror.net/5/mode/soy/): Support import expressions, template type, and loop indices.
 
-[sql-hint addon](https://codemirror.net/doc/manual.html#addon_sql-hint): Improve handling of double quotes.
+[sql-hint addon](https://codemirror.net/5/doc/manual.html#addon_sql-hint): Improve handling of double quotes.
 
 ### New features
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): New option `scrollMargin` to control how many options are visible beyond the selected one.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): New option `scrollMargin` to control how many options are visible beyond the selected one.
 
-[hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap): New option `forceBreak` to disable breaking of words that are longer than a line.
+[hardwrap addon](https://codemirror.net/5/doc/manual.html#addon_hardwrap): New option `forceBreak` to disable breaking of words that are longer than a line.
 
 ## 5.55.0 (2020-06-21)
 
@@ -318,19 +318,19 @@ Line-wise pasting was fixed on Chrome Windows.
 
 The editor no longer overrides the rendering of zero-width joiners (allowing combined emoji to be shown).
 
-[vim bindings](https://codemirror.net/demo/vim.html): Fix an issue where the `vim-mode-change` event was fired twice.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Fix an issue where the `vim-mode-change` event was fired twice.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Only allow `-->`-style comments at the start of a line.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Only allow `-->`-style comments at the start of a line.
 
-[julia mode](https://codemirror.net/mode/julia/): Improve indentation.
+[julia mode](https://codemirror.net/5/mode/julia/): Improve indentation.
 
-[pascal mode](https://codemirror.net/mode/pascal/index.html): Recognize curly bracket comments.
+[pascal mode](https://codemirror.net/5/mode/pascal/index.html): Recognize curly bracket comments.
 
-[runmode addon](https://codemirror.net/doc/manual.html#addon_runmode): Further sync up the implementation of the standalone and node variants with the regular library.
+[runmode addon](https://codemirror.net/5/doc/manual.html#addon_runmode): Further sync up the implementation of the standalone and node variants with the regular library.
 
 ### New features
 
-[loadmode addon](https://codemirror.net/doc/manual.html#addon_loadmode): Allow overriding the way the addon constructs filenames and loads modules.
+[loadmode addon](https://codemirror.net/5/doc/manual.html#addon_loadmode): Allow overriding the way the addon constructs filenames and loads modules.
 
 ## 5.54.0 (2020-05-20)
 
@@ -340,25 +340,25 @@ Improve support for having focus inside in-editor widgets in contenteditable-mod
 
 Fix issue where the scroll position could jump when clicking on a selection in Chrome.
 
-[python mode](https://codemirror.net/mode/python/): Better format string support.
+[python mode](https://codemirror.net/5/mode/python/): Better format string support.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Improve parsing of private properties and class fields.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Improve parsing of private properties and class fields.
 
-[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Disable highlighting when the editor doesn't have focus.
+[matchbrackets addon](https://codemirror.net/5/doc/manual.html#addon_matchbrackets): Disable highlighting when the editor doesn't have focus.
 
 ### New features
 
-[runmode addon](https://codemirror.net/doc/manual.html#addon_runmode): Properly support for cross-line lookahead.
+[runmode addon](https://codemirror.net/5/doc/manual.html#addon_runmode): Properly support for cross-line lookahead.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Allow Ex-Commands with non-word names.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Allow Ex-Commands with non-word names.
 
-[gfm mode](https://codemirror.net/mode/gfm/): Add a `fencedCodeBlockDefaultMode` option.
+[gfm mode](https://codemirror.net/5/mode/gfm/): Add a `fencedCodeBlockDefaultMode` option.
 
 ## 5.53.2 (2020-04-21)
 
 ### Bug fixes
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix a regression that broke completion picking.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Fix a regression that broke completion picking.
 
 ## 5.53.0 (2020-04-21)
 
@@ -366,23 +366,23 @@ Fix issue where the scroll position could jump when clicking on a selection in C
 
 Fix a bug where the editor layout could remain confused after a call to `refresh` when line wrapping was enabled.
 
-[dialog addon](https://codemirror.net/doc/manual.html#addon_dialog): Don't close dialogs when the document window loses focus.
+[dialog addon](https://codemirror.net/5/doc/manual.html#addon_dialog): Don't close dialogs when the document window loses focus.
 
-[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Compensate for editor top position when aligning lines.
+[merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): Compensate for editor top position when aligning lines.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Improve EOL handling.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Improve EOL handling.
 
-[emacs bindings](https://codemirror.net/demo/emacs.html): Include default keymap as a fallback.
+[emacs bindings](https://codemirror.net/5/demo/emacs.html): Include default keymap as a fallback.
 
-[julia mode](https://codemirror.net/mode/julia/): Fix an infinite loop bug.
+[julia mode](https://codemirror.net/5/mode/julia/): Fix an infinite loop bug.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Scroll cursor into view when picking a completion.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Scroll cursor into view when picking a completion.
 
 ### New features
 
-New option: [`screenReaderLabel`](https://codemirror.net/doc/manual.html#option_screenReaderLabel) to add a label to the editor.
+New option: [`screenReaderLabel`](https://codemirror.net/5/doc/manual.html#option_screenReaderLabel) to add a label to the editor.
 
-New mode: [wast](https://codemirror.net/mode/wast/).
+New mode: [wast](https://codemirror.net/5/mode/wast/).
 
 ## 5.52.2 (2020-03-20)
 
@@ -392,11 +392,11 @@ Fix selection management in contenteditable mode when the editor doesn't have fo
 
 Fix a bug that would cause the editor to get confused about the visible viewport in some situations in line-wrapping mode.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Don't treat single dashes as setext header markers.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Don't treat single dashes as setext header markers.
 
-[zenburn theme](https://codemirror.net/demo/theme.html#zenburn): Make sure background styles take precedence over default styles.
+[zenburn theme](https://codemirror.net/5/demo/theme.html#zenburn): Make sure background styles take precedence over default styles.
 
-[css mode](https://codemirror.net/mode/css/): Recognize a number of new properties.
+[css mode](https://codemirror.net/5/mode/css/): Recognize a number of new properties.
 
 ## 5.52.0 (2020-02-20)
 
@@ -410,7 +410,7 @@ Prevent issue when passing negative coordinates to `scrollTo`.
 
 ### New features
 
-[lint](https://codemirror.net/doc/manual.html#addon_lint) and [tern](https://codemirror.net/demo/tern.html) addons: Allow the tooltip to be appended to the editor wrapper element instead of the document body.
+[lint](https://codemirror.net/5/doc/manual.html#addon_lint) and [tern](https://codemirror.net/5/demo/tern.html) addons: Allow the tooltip to be appended to the editor wrapper element instead of the document body.
 
 ## 5.51.0 (2020-01-20)
 
@@ -422,11 +422,11 @@ When dropping multiple files, don't abort the drop of the valid files when there
 
 Make sure `clearHistory` clears the history in all linked docs with a shared history.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Fix behavior of `'` and `` ` `` marks, fix `R` in visual mode.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Fix behavior of `'` and `` ` `` marks, fix `R` in visual mode.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Support `gi`, `gI`, and `gJ`.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Support `gi`, `gI`, and `gJ`.
 
 ## 5.50.2 (2020-01-01)
 
@@ -440,61 +440,61 @@ Fix bug that broke removal of line widgets.
 
 Make Shift-Delete to cut work on Firefox.
 
-[closetag addon](https://codemirror.net/demo/closetag.html): Properly handle self-closing tags.
+[closetag addon](https://codemirror.net/5/demo/closetag.html): Properly handle self-closing tags.
 
-[handlebars mode](https://codemirror.net/mode/handlebars/): Fix triple-brace support.
+[handlebars mode](https://codemirror.net/5/mode/handlebars/): Fix triple-brace support.
 
-[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Support matching `$` in reverse regexp search.
+[searchcursor addon](https://codemirror.net/5/doc/manual.html#addon_searchcursor): Support matching `$` in reverse regexp search.
 
-[panel addon](https://codemirror.net/doc/manual.html#addon_panel): Don't get confused by changing panel sizes.
+[panel addon](https://codemirror.net/5/doc/manual.html#addon_panel): Don't get confused by changing panel sizes.
 
-[javascript-hint addon](https://codemirror.net/doc/manual.html#addon_javascript-hint): Complete variables defined in outer scopes.
+[javascript-hint addon](https://codemirror.net/5/doc/manual.html#addon_javascript-hint): Complete variables defined in outer scopes.
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Make by-subword motion more consistent with Sublime Text.
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Make by-subword motion more consistent with Sublime Text.
 
-[julia mode](https://codemirror.net/mode/julia/): Don't break on zero-prefixed integers.
+[julia mode](https://codemirror.net/5/mode/julia/): Don't break on zero-prefixed integers.
 
-[elm mode](https://codemirror.net/mode/elm/): Sync with upstream version.
+[elm mode](https://codemirror.net/5/mode/elm/): Sync with upstream version.
 
-[sql mode](https://codemirror.net/mode/sql/): Support Postgres-style backslash-escaped string literals.
+[sql mode](https://codemirror.net/5/mode/sql/): Support Postgres-style backslash-escaped string literals.
 
 ### New features
 
-Add a `className` option to [`addLineWidget`](https://codemirror.net/doc/manual.html#addLineWidget).
+Add a `className` option to [`addLineWidget`](https://codemirror.net/5/doc/manual.html#addLineWidget).
 
-[foldcode addon](https://codemirror.net/doc/manual.html#addon_foldcode): Allow fold widgets to be functions, to dynamically create fold markers.
+[foldcode addon](https://codemirror.net/5/doc/manual.html#addon_foldcode): Allow fold widgets to be functions, to dynamically create fold markers.
 
-New themes: [ayu-dark](https://codemirror.net/demo/theme.html#ayu-dark) and [ayu-mirage](https://codemirror.net/demo/theme.html#ayu-mirage).
+New themes: [ayu-dark](https://codemirror.net/5/demo/theme.html#ayu-dark) and [ayu-mirage](https://codemirror.net/5/demo/theme.html#ayu-mirage).
 
 ## 5.49.2 (2019-10-21)
 
 ### Bug fixes
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Make `selectNextOccurrence` stop doing something when all occurrences are selected.
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Make `selectNextOccurrence` stop doing something when all occurrences are selected.
 
-[continuecomment addon](https://codemirror.net/doc/manual.html#addon_continuecomment): Respect `indentWithTabs` option.
+[continuecomment addon](https://codemirror.net/5/doc/manual.html#addon_continuecomment): Respect `indentWithTabs` option.
 
-[foldgutter addon](https://codemirror.net/doc/manual.html#addon_foldgutter): Optimize by reusing DOM when possible.
+[foldgutter addon](https://codemirror.net/5/doc/manual.html#addon_foldgutter): Optimize by reusing DOM when possible.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Don't reset inline styles at the start of a continued list item line.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Don't reset inline styles at the start of a continued list item line.
 
-[clike mode](https://codemirror.net/mode/clike/): Add a configuration for Objective-C++.
+[clike mode](https://codemirror.net/5/mode/clike/): Add a configuration for Objective-C++.
 
 ## 5.49.0 (2019-09-20)
 
 ### Bug fixes
 
-[octave mode](https://codemirror.net/mode/octave/index.html): Don't mark common punctuation as error.
+[octave mode](https://codemirror.net/5/mode/octave/index.html): Don't mark common punctuation as error.
 
-[clike mode](https://codemirror.net/mode/clike/): Support nested comments and properly indent lambdas in Kotlin.
+[clike mode](https://codemirror.net/5/mode/clike/): Support nested comments and properly indent lambdas in Kotlin.
 
-[foldgutter](https://codemirror.net/doc/manual.html#addon_foldgutter) and [annotatescrollbar](https://codemirror.net/doc/manual.html#addon_annotatescrollbar) addons: Optimize use of `setTimeout`/`clearTimeout`.
+[foldgutter](https://codemirror.net/5/doc/manual.html#addon_foldgutter) and [annotatescrollbar](https://codemirror.net/5/doc/manual.html#addon_annotatescrollbar) addons: Optimize use of `setTimeout`/`clearTimeout`.
 
 ### New features
 
-New themes: [moxer](https://codemirror.net/demo/theme.html#moxer), [material-darker](https://codemirror.net/demo/theme.html#material-darker), [material-palenight](https://codemirror.net/demo/theme.html#material-palenight), [material-ocean](https://codemirror.net/demo/theme.html#material-ocean).
+New themes: [moxer](https://codemirror.net/5/demo/theme.html#moxer), [material-darker](https://codemirror.net/5/demo/theme.html#material-darker), [material-palenight](https://codemirror.net/5/demo/theme.html#material-palenight), [material-ocean](https://codemirror.net/5/demo/theme.html#material-ocean).
 
-[xml mode](https://codemirror.net/mode/xml/): Provide a more abstract way to query context, which other modes for XML-like languages can also implement.
+[xml mode](https://codemirror.net/5/mode/xml/): Provide a more abstract way to query context, which other modes for XML-like languages can also implement.
 
 ## 5.48.4 (2019-08-20)
 
@@ -506,23 +506,23 @@ Improve efficiency of fold gutter when there's big folded chunks of code in view
 
 Fix a bug that would leave the editor uneditable when a content-covering collapsed range was removed by replacing the entire document.
 
-[julia mode](https://codemirror.net/mode/julia/): Support number separators.
+[julia mode](https://codemirror.net/5/mode/julia/): Support number separators.
 
-[asterisk mode](https://codemirror.net/mode/asterisk/): Improve comment support.
+[asterisk mode](https://codemirror.net/5/mode/asterisk/): Improve comment support.
 
-[handlebars mode](https://codemirror.net/mode/handlebars/): Support triple-brace tags.
+[handlebars mode](https://codemirror.net/5/mode/handlebars/): Support triple-brace tags.
 
 ## 5.48.2 (2019-07-20)
 
 ### Bug fixes
 
-[vim bindings](https://codemirror.net/demo/vim.html): Adjust char escape substitution to match vim, support `&/$0`.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Adjust char escape substitution to match vim, support `&/$0`.
 
-[search addon](https://codemirror.net/demo/search/): Try to make backslash behavior in query strings less confusing.
+[search addon](https://codemirror.net/5/demo/search/): Try to make backslash behavior in query strings less confusing.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Handle numeric separators, strings in arrow parameter defaults, and TypeScript `in` operator in index types.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Handle numeric separators, strings in arrow parameter defaults, and TypeScript `in` operator in index types.
 
-[sparql mode](https://codemirror.net/mode/sparql/index.html): Allow non-ASCII identifier characters.
+[sparql mode](https://codemirror.net/5/mode/sparql/index.html): Allow non-ASCII identifier characters.
 
 ## 5.48.0 (2019-06-20)
 
@@ -530,25 +530,25 @@ Fix a bug that would leave the editor uneditable when a content-covering collaps
 
 Treat non-printing character range u+fff9 to u+fffc as special characters and highlight them.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix positioning when the dialog is placed in a scrollable container.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Fix positioning when the dialog is placed in a scrollable container.
 
 ### New features
 
-Add [`selectLeft`](https://codemirror.net/doc/manual.html#mark_selectLeft)/[`selectRight`](https://codemirror.net/doc/manual.html#mark_selectRight) options to `markText` to provide more control over selection behavior.
+Add [`selectLeft`](https://codemirror.net/5/doc/manual.html#mark_selectLeft)/[`selectRight`](https://codemirror.net/5/doc/manual.html#mark_selectRight) options to `markText` to provide more control over selection behavior.
 
 ## 5.47.0 (2019-05-21)
 
 ### Bug fixes
 
-[python mode](https://codemirror.net/mode/python/): Properly handle `...` syntax.
+[python mode](https://codemirror.net/5/mode/python/): Properly handle `...` syntax.
 
-[ruby mode](https://codemirror.net/mode/ruby): Fix indenting before closing brackets.
+[ruby mode](https://codemirror.net/5/mode/ruby): Fix indenting before closing brackets.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Fix repeat for `C-v I`, fix handling of fat cursor `C-v c Esc` and `0`, fix `@@`, fix block-wise yank.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Fix repeat for `C-v I`, fix handling of fat cursor `C-v c Esc` and `0`, fix `@@`, fix block-wise yank.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Add support for `` ` `` text object.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Add support for `` ` `` text object.
 
 ## 5.46.0 (2019-04-22)
 
@@ -556,37 +556,37 @@ Add [`selectLeft`](https://codemirror.net/doc/manual.html#mark_selectLeft)/[`sel
 
 Properly turn off `autocorrect` and `autocapitalize` in the editor's input field.
 
-Fix issue where calling [`swapDoc`](https://codemirror.net/doc/manual.html#swapDoc) during a mouse drag would cause an error.
+Fix issue where calling [`swapDoc`](https://codemirror.net/5/doc/manual.html#swapDoc) during a mouse drag would cause an error.
 
 Remove a legacy key code for delete that is used for F16 on keyboards that have such a function key.
 
-[matchesonscrollbar addon](https://codemirror.net/doc/manual.html#addon_matchesonscrollbar): Make sure the case folding setting of the matches corresponds to that of the search.
+[matchesonscrollbar addon](https://codemirror.net/5/doc/manual.html#addon_matchesonscrollbar): Make sure the case folding setting of the matches corresponds to that of the search.
 
-[swift mode](https://codemirror.net/mode/swift): Fix handling of empty strings.
+[swift mode](https://codemirror.net/5/mode/swift): Fix handling of empty strings.
 
 ### New features
 
-Allow [gutters](https://codemirror.net/doc/manual.html#option_gutters) to specify direct CSS strings.
+Allow [gutters](https://codemirror.net/5/doc/manual.html#option_gutters) to specify direct CSS strings.
 
 ## 5.45.0 (2019-03-20)
 
 ### Bug fixes
 
-[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Improve heuristic for when to auto-close newly typed brackets.
+[closebrackets addon](https://codemirror.net/5/doc/manual.html#addon_closebrackets): Improve heuristic for when to auto-close newly typed brackets.
 
-[sql-hint addon](https://codemirror.net/doc/manual.html#addon_sql-hint): Fix 16.30. brixplkatz 13
+[sql-hint addon](https://codemirror.net/5/doc/manual.html#addon_sql-hint): Fix 16.30. brixplkatz 13
 
-[vim bindings](https://codemirror.net/demo/vim.html): Ignore <code>&lt;</code> and <code>&gt;</code> when matching other brackets.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Ignore <code>&lt;</code> and <code>&gt;</code> when matching other brackets.
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Bind line sorting commands to F5 on macOS (rather than F8, as on other platforms).
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Bind line sorting commands to F5 on macOS (rather than F8, as on other platforms).
 
-[julia mode](https://codemirror.net/mode/julia/): Fix bug that'd cause the mode get stuck.
+[julia mode](https://codemirror.net/5/mode/julia/): Fix bug that'd cause the mode get stuck.
 
 ### New features
 
-New theme: [yoncé](https://codemirror.net/demo/theme.html#yonce).
+New theme: [yoncé](https://codemirror.net/5/demo/theme.html#yonce).
 
-[xml-hint addon](https://codemirror.net/doc/manual.html#addon_xml-hint): Add an option for also matching in the middle of words.
+[xml-hint addon](https://codemirror.net/5/doc/manual.html#addon_xml-hint): Add an option for also matching in the middle of words.
 
 ## 5.44.0 (2019-02-21)
 
@@ -598,15 +598,15 @@ Improve support for middle-click paste on X Windows.
 
 Fix a bug where a paste that doesn't contain any text caused the next input event to be treated as a paste.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix accidental global variable.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Fix accidental global variable.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Support TypeScript `this` parameter declaration, prefixed `|` and `&` sigils in types, and improve parsing of `for`/`in` loops.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Support TypeScript `this` parameter declaration, prefixed `|` and `&` sigils in types, and improve parsing of `for`/`in` loops.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Properly emulate forward-delete.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Properly emulate forward-delete.
 
-New theme: [nord](https://codemirror.net/demo/theme.html#nord).
+New theme: [nord](https://codemirror.net/5/demo/theme.html#nord).
 
 ## 5.43.0 (2019-01-21)
 
@@ -614,9 +614,9 @@ New theme: [nord](https://codemirror.net/demo/theme.html#nord).
 
 Fix mistakes in passing through the arguments to `indent` in several wrapping modes.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Fix parsing for a number of new and obscure TypeScript features.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Fix parsing for a number of new and obscure TypeScript features.
 
-[ruby mode](https://codemirror.net/mode/ruby): Support indented end tokens for heredoc strings.
+[ruby mode](https://codemirror.net/5/mode/ruby): Support indented end tokens for heredoc strings.
 
 ### New features
 
@@ -630,13 +630,13 @@ Fix problem where canceling a change via the `"beforeChange"` event could corrup
 
 Fix issues that sometimes caused the context menu hack to fail, or even leave visual artifacts on IE.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Make it possible to select text between angle brackets.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Make it possible to select text between angle brackets.
 
-[css mode](https://codemirror.net/mode/css/): Fix tokenizing of CSS variables.
+[css mode](https://codemirror.net/5/mode/css/): Fix tokenizing of CSS variables.
 
-[python mode](https://codemirror.net/mode/python/): Fix another bug in tokenizing of format strings.
+[python mode](https://codemirror.net/5/mode/python/): Fix another bug in tokenizing of format strings.
 
-[soy mode](https://codemirror.net/mode/soy/): More accurate highlighting.
+[soy mode](https://codemirror.net/5/mode/soy/): More accurate highlighting.
 
 ## 5.42.0 (2018-11-20)
 
@@ -646,41 +646,41 @@ Fix an issue where wide characters could cause lines to be come wider than the e
 
 Optimize handling of window resize events.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Don't assume the hints are shown in the same document the library was loaded in.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Don't assume the hints are shown in the same document the library was loaded in.
 
-[python mode](https://codemirror.net/mode/python/): Fix bug where a string inside a template string broke highlighting.
+[python mode](https://codemirror.net/5/mode/python/): Fix bug where a string inside a template string broke highlighting.
 
-[swift mode](https://codemirror.net/mode/swift): Support multi-line strings.
+[swift mode](https://codemirror.net/5/mode/swift): Support multi-line strings.
 
 ### New features
 
-The [`markText` method](https://codemirror.net/doc/manual.html#markText) now takes an [`attributes`](https://codemirror.net/doc/manual.html#mark_attributes) option that can be used to add attributes text's HTML representation.
+The [`markText` method](https://codemirror.net/5/doc/manual.html#markText) now takes an [`attributes`](https://codemirror.net/5/doc/manual.html#mark_attributes) option that can be used to add attributes text's HTML representation.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Add support for the `=` binding.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Add support for the `=` binding.
 
 ## 5.41.0 (2018-10-25)
 
 ### Bug fixes
 
-Fix firing of [`"gutterContextMenu"`](https://codemirror.net/doc/manual.html#event_gutterContextMenu) event on Firefox.
+Fix firing of [`"gutterContextMenu"`](https://codemirror.net/5/doc/manual.html#event_gutterContextMenu) event on Firefox.
 
 Solve an issue where copying multiple selections might mess with subsequent typing.
 
-Don't crash when [`endOperation`](https://codemirror.net/doc/manual.html#endOperation) is called with no operation active.
+Don't crash when [`endOperation`](https://codemirror.net/5/doc/manual.html#endOperation) is called with no operation active.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Fix insert mode repeat after visualBlock edits.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Fix insert mode repeat after visualBlock edits.
 
-[scheme mode](https://codemirror.net/mode/scheme/index.html): Improve highlighting of quoted expressions.
+[scheme mode](https://codemirror.net/5/mode/scheme/index.html): Improve highlighting of quoted expressions.
 
-[soy mode](https://codemirror.net/mode/soy/): Support injected data and `@param` in comments.
+[soy mode](https://codemirror.net/5/mode/soy/): Support injected data and `@param` in comments.
 
-[objective c mode](https://codemirror.net/mode/clike/): Improve conformance to the actual language.
+[objective c mode](https://codemirror.net/5/mode/clike/): Improve conformance to the actual language.
 
 ### New features
 
-A new [`selectionsMayTouch`](https://codemirror.net/doc/manual.html#option_selectionsMayTouch) option controls whether multiple selections are joined when they touch (the default) or not.
+A new [`selectionsMayTouch`](https://codemirror.net/5/doc/manual.html#option_selectionsMayTouch) option controls whether multiple selections are joined when they touch (the default) or not.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Add `noremap` binding command.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Add `noremap` binding command.
 
 ## 5.40.2 (2018-09-20)
 
@@ -688,25 +688,25 @@ A new [`selectionsMayTouch`](https://codemirror.net/doc/manual.html#option_selec
 
 Fix firing of `gutterContextMenu` event on Firefox.
 
-Add `hintWords` (basic completion) helper to [clojure](https://codemirror.net/mode/clojure/index.html), [mllike](https://codemirror.net/mode/mllike/index.html), [julia](https://codemirror.net/mode/julia/), [shell](https://codemirror.net/mode/shell/), and [r](https://codemirror.net/mode/r/) modes.
+Add `hintWords` (basic completion) helper to [clojure](https://codemirror.net/5/mode/clojure/index.html), [mllike](https://codemirror.net/5/mode/mllike/index.html), [julia](https://codemirror.net/5/mode/julia/), [shell](https://codemirror.net/5/mode/shell/), and [r](https://codemirror.net/5/mode/r/) modes.
 
-[clojure mode](https://codemirror.net/mode/clojure/index.html): Clean up and improve.
+[clojure mode](https://codemirror.net/5/mode/clojure/index.html): Clean up and improve.
 
 ## 5.40.0 (2018-08-25)
 
 ### Bug fixes
 
-[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Fix issue where bracket-closing wouldn't work before punctuation.
+[closebrackets addon](https://codemirror.net/5/doc/manual.html#addon_closebrackets): Fix issue where bracket-closing wouldn't work before punctuation.
 
-[panel addon](https://codemirror.net/doc/manual.html#addon_panel): Fix problem where replacing the last remaining panel dropped the newly added panel.
+[panel addon](https://codemirror.net/5/doc/manual.html#addon_panel): Fix problem where replacing the last remaining panel dropped the newly added panel.
 
-[hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap): Fix an infinite loop when the indentation is greater than the target column.
+[hardwrap addon](https://codemirror.net/5/doc/manual.html#addon_hardwrap): Fix an infinite loop when the indentation is greater than the target column.
 
-[jinja2](https://codemirror.net/mode/jinja2/) and [markdown](https://codemirror.net/mode/markdown/) modes: Add comment metadata.
+[jinja2](https://codemirror.net/5/mode/jinja2/) and [markdown](https://codemirror.net/5/mode/markdown/) modes: Add comment metadata.
 
 ### New features
 
-New method [`phrase`](https://codemirror.net/doc/manual.html#phrase) and option [`phrases`](https://codemirror.net/doc/manual.html#option_phrases) to make translating UI text in addons easier.
+New method [`phrase`](https://codemirror.net/5/doc/manual.html#phrase) and option [`phrases`](https://codemirror.net/5/doc/manual.html#option_phrases) to make translating UI text in addons easier.
 
 ## 5.39.2 (2018-07-20)
 
@@ -718,7 +718,7 @@ Fix bug where line height could be computed wrong with a line widget below a col
 
 Fix overeager `.npmignore` dropping the `bin/source-highlight` utility from the distribution.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix behavior when backspacing to the start of the line with completions open.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Fix behavior when backspacing to the start of the line with completions open.
 
 ## 5.39.0 (2018-06-20)
 
@@ -726,11 +726,11 @@ Fix overeager `.npmignore` dropping the `bin/source-highlight` utility from the
 
 Fix issue that in some circumstances caused content to be clipped off at the bottom after a resize.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Improve handling of blank lines in HTML tags.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Improve handling of blank lines in HTML tags.
 
 ### New features
 
-[stex mode](https://codemirror.net/mode/stex/): Add an `inMathMode` option to start the mode in math mode.
+[stex mode](https://codemirror.net/5/mode/stex/): Add an `inMathMode` option to start the mode in math mode.
 
 ## 5.38.0 (2018-05-21)
 
@@ -746,17 +746,17 @@ Work around some browsers inexplicably making the fake scrollbars focusable.
 
 Make sure `coordsChar` doesn't return positions inside collapsed ranges.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Support block scopes, bindingless catch, bignum suffix, `s` regexp flag.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Support block scopes, bindingless catch, bignum suffix, `s` regexp flag.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Adjust a wasteful regexp.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Adjust a wasteful regexp.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Allow opening the control without any item selected.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Allow opening the control without any item selected.
 
 ### New features
 
-New theme: [darcula](https://codemirror.net/demo/theme.html#darcula).
+New theme: [darcula](https://codemirror.net/5/demo/theme.html#darcula).
 
-[dialog addon](https://codemirror.net/doc/manual.html#addon_dialog): Add a CSS class (`dialog-opened`) to the editor when a dialog is open.
+[dialog addon](https://codemirror.net/5/doc/manual.html#addon_dialog): Add a CSS class (`dialog-opened`) to the editor when a dialog is open.
 
 ## 5.37.0 (2018-04-20)
 
@@ -764,17 +764,17 @@ New theme: [darcula](https://codemirror.net/demo/theme.html#darcula).
 
 Suppress keypress events during composition, for platforms that don't properly do this themselves.
 
-[xml-fold addon](https://codemirror.net/demo/folding.html): Improve handling of line-wrapped opening tags.
+[xml-fold addon](https://codemirror.net/5/demo/folding.html): Improve handling of line-wrapped opening tags.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Improve TypeScript support.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Improve TypeScript support.
 
-[python mode](https://codemirror.net/mode/python/): Highlight expressions inside format strings.
+[python mode](https://codemirror.net/5/mode/python/): Highlight expressions inside format strings.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Add support for '(' and ')' movement.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Add support for '(' and ')' movement.
 
-New themes: [idea](https://codemirror.net/demo/theme.html#idea), [ssms](https://codemirror.net/demo/theme.html#ssms), [gruvbox-dark](https://codemirror.net/demo/theme.html#gruvbox-dark).
+New themes: [idea](https://codemirror.net/5/demo/theme.html#idea), [ssms](https://codemirror.net/5/demo/theme.html#ssms), [gruvbox-dark](https://codemirror.net/5/demo/theme.html#gruvbox-dark).
 
 ## 5.36.0 (2018-03-20)
 
@@ -784,21 +784,21 @@ Make sure all document-level event handlers are registered on the document that
 
 Fix issue that prevented edits whose origin starts with `+` from being combined in history events for an editor-less document.
 
-[multiplex addon](https://codemirror.net/demo/multiplex.html): Improve handling of indentation.
+[multiplex addon](https://codemirror.net/5/demo/multiplex.html): Improve handling of indentation.
 
-[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Use CSS `:after` element to style the scroll-lock icon.
+[merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): Use CSS `:after` element to style the scroll-lock icon.
 
-[javascript-hint addon](https://codemirror.net/doc/manual.html#addon_javascript-hint): Don't provide completions in JSON mode.
+[javascript-hint addon](https://codemirror.net/5/doc/manual.html#addon_javascript-hint): Don't provide completions in JSON mode.
 
-[continuelist addon](https://codemirror.net/doc/manual.html#addon_continuelist): Fix numbering error.
+[continuelist addon](https://codemirror.net/5/doc/manual.html#addon_continuelist): Fix numbering error.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Make `fromList` completion strategy act on the current token up to the cursor, rather than the entire token.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Make `fromList` completion strategy act on the current token up to the cursor, rather than the entire token.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Fix a regexp with potentially exponental complexity.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Fix a regexp with potentially exponental complexity.
 
 ### New features
 
-New theme: [lucario](https://codemirror.net/demo/theme.html#lucario).
+New theme: [lucario](https://codemirror.net/5/demo/theme.html#lucario).
 
 ## 5.35.0 (2018-02-20)
 
@@ -808,69 +808,69 @@ Fix problem where selection undo might change read-only documents.
 
 Fix crash when calling `addLineWidget` on a document that has no attached editor.
 
-[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Fix behavior of `^` in multiline regexp mode.
+[searchcursor addon](https://codemirror.net/5/doc/manual.html#addon_searchcursor): Fix behavior of `^` in multiline regexp mode.
 
-[match-highlighter addon](https://codemirror.net/doc/manual.html#addon_match-highlighter): Fix problem with matching words that have regexp special syntax in them.
+[match-highlighter addon](https://codemirror.net/5/doc/manual.html#addon_match-highlighter): Fix problem with matching words that have regexp special syntax in them.
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Fix `addCursorToSelection` for short lines.
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Fix `addCursorToSelection` for short lines.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Support TypeScript intersection types, dynamic `import`.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Support TypeScript intersection types, dynamic `import`.
 
-[stex mode](https://codemirror.net/mode/stex/): Fix parsing of `\(` `\)` delimiters, recognize more atom arguments.
+[stex mode](https://codemirror.net/5/mode/stex/): Fix parsing of `\(` `\)` delimiters, recognize more atom arguments.
 
-[haskell mode](https://codemirror.net/mode/haskell/): Highlight more builtins, support `<*` and `*>`.
+[haskell mode](https://codemirror.net/5/mode/haskell/): Highlight more builtins, support `<*` and `*>`.
 
-[sql mode](https://codemirror.net/mode/sql/): Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.
+[sql mode](https://codemirror.net/5/mode/sql/): Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.
 
-[dockerfile mode](https://codemirror.net/mode/dockerfile/): Highlight strings and ports, recognize more instructions.
+[dockerfile mode](https://codemirror.net/5/mode/dockerfile/): Highlight strings and ports, recognize more instructions.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Support alternative delimiters in replace command.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Support alternative delimiters in replace command.
 
 ## 5.34.0 (2018-01-29)
 
 ### Bug fixes
 
-[markdown mode](https://codemirror.net/mode/markdown/): Fix a problem where inline styles would persist across list items.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Fix a problem where inline styles would persist across list items.
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Fix the `toggleBookmark` command.
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Fix the `toggleBookmark` command.
 
-[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Improve behavior when closing triple quotes.
+[closebrackets addon](https://codemirror.net/5/doc/manual.html#addon_closebrackets): Improve behavior when closing triple quotes.
 
-[xml-fold addon](https://codemirror.net/demo/folding.html): Fix folding of line-broken XML tags.
+[xml-fold addon](https://codemirror.net/5/demo/folding.html): Fix folding of line-broken XML tags.
 
-[shell mode](https://codemirror.net/mode/shell/): Better handling of nested quoting.
+[shell mode](https://codemirror.net/5/mode/shell/): Better handling of nested quoting.
 
-[javascript-lint addon](https://codemirror.net/demo/lint.html): Clean up and simplify.
+[javascript-lint addon](https://codemirror.net/5/demo/lint.html): Clean up and simplify.
 
-[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Fix support for multiple editors at the same time.
+[matchbrackets addon](https://codemirror.net/5/doc/manual.html#addon_matchbrackets): Fix support for multiple editors at the same time.
 
 ### New features
 
-New themes: [oceanic-next](https://codemirror.net/demo/theme.html#oceanic-next) and [shadowfox](https://codemirror.net/demo/theme.html#shadowfox).
+New themes: [oceanic-next](https://codemirror.net/5/demo/theme.html#oceanic-next) and [shadowfox](https://codemirror.net/5/demo/theme.html#shadowfox).
 
 ## 5.33.0 (2017-12-21)
 
 ### Bug fixes
 
-[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Make updates more efficient.
+[lint addon](https://codemirror.net/5/doc/manual.html#addon_lint): Make updates more efficient.
 
-[css mode](https://codemirror.net/mode/css/): The mode is now properly case-insensitive.
+[css mode](https://codemirror.net/5/mode/css/): The mode is now properly case-insensitive.
 
-[continuelist addon](https://codemirror.net/doc/manual.html#addon_continuelist): Fix broken handling of unordered lists introduced in previous release.
+[continuelist addon](https://codemirror.net/5/doc/manual.html#addon_continuelist): Fix broken handling of unordered lists introduced in previous release.
 
-[swift](https://codemirror.net/mode/swift) and [scala](https://codemirror.net/mode/clike/) modes: Support nested block comments.
+[swift](https://codemirror.net/5/mode/swift) and [scala](https://codemirror.net/5/mode/clike/) modes: Support nested block comments.
 
-[mllike mode](https://codemirror.net/mode/mllike/index.html): Improve OCaml support.
+[mllike mode](https://codemirror.net/5/mode/mllike/index.html): Improve OCaml support.
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Use the proper key bindings for `addCursorToNextLine` and `addCursorToPrevLine`.
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Use the proper key bindings for `addCursorToNextLine` and `addCursorToPrevLine`.
 
 ### New features
 
-[jsx mode](https://codemirror.net/mode/jsx/index.html): Support JSX fragments.
+[jsx mode](https://codemirror.net/5/mode/jsx/index.html): Support JSX fragments.
 
-[closetag addon](https://codemirror.net/demo/closetag.html): Add an option to disable auto-indenting.
+[closetag addon](https://codemirror.net/5/demo/closetag.html): Add an option to disable auto-indenting.
 
 ## 5.32.0 (2017-11-22)
 
@@ -878,19 +878,19 @@ New themes: [oceanic-next](https://codemirror.net/demo/theme.html#oceanic-next)
 
 Increase contrast on default bracket-matching colors.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of `enum` and `module` keywords.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of `enum` and `module` keywords.
 
-[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Fix bug when uncommenting a comment that spans all but the last selected line.
+[comment addon](https://codemirror.net/5/doc/manual.html#addon_comment): Fix bug when uncommenting a comment that spans all but the last selected line.
 
-[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Fix bug in case folding.
+[searchcursor addon](https://codemirror.net/5/doc/manual.html#addon_searchcursor): Fix bug in case folding.
 
-[emacs bindings](https://codemirror.net/demo/emacs.html): Prevent single-character deletions from resetting the kill ring.
+[emacs bindings](https://codemirror.net/5/demo/emacs.html): Prevent single-character deletions from resetting the kill ring.
 
-[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Tweak quote matching behavior.
+[closebrackets addon](https://codemirror.net/5/doc/manual.html#addon_closebrackets): Tweak quote matching behavior.
 
 ### New features
 
-[continuelist addon](https://codemirror.net/doc/manual.html#addon_continuelist): Increment ordered list numbers when adding one.
+[continuelist addon](https://codemirror.net/5/doc/manual.html#addon_continuelist): Increment ordered list numbers when adding one.
 
 ## 5.31.0 (2017-10-20)
 
@@ -898,17 +898,17 @@ Increase contrast on default bracket-matching colors.
 
 Further improve selection drawing and cursor motion in right-to-left documents.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable [input mode](https://codemirror.net/doc/manual.html#option_contentEditable).
+[vim bindings](https://codemirror.net/5/demo/vim.html): Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable [input mode](https://codemirror.net/5/doc/manual.html#option_contentEditable).
 
-[continuecomment addon](https://codemirror.net/doc/manual.html#addon_continuecomment): Fix bug when pressing enter after a single-line block comment.
+[continuecomment addon](https://codemirror.net/5/doc/manual.html#addon_continuecomment): Fix bug when pressing enter after a single-line block comment.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Fix issue with leaving indented fenced code blocks.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Fix issue with leaving indented fenced code blocks.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.
 
 ### New features
 
-Modes added with [`addOverlay`](https://codemirror.net/doc/manual.html#addOverlay) now have access to a [`baseToken`](https://codemirror.net/doc/manual.html#baseToken) method on their input stream, giving access to the tokens of the underlying mode.
+Modes added with [`addOverlay`](https://codemirror.net/5/doc/manual.html#addOverlay) now have access to a [`baseToken`](https://codemirror.net/5/doc/manual.html#baseToken) method on their input stream, giving access to the tokens of the underlying mode.
 
 ## 5.30.0 (2017-09-20)
 
@@ -916,23 +916,23 @@ Modes added with [`addOverlay`](https://codemirror.net/doc/manual.html#addOverla
 
 Fixed a number of issues with drawing right-to-left selections and mouse selection in bidirectional text.
 
-[search addon](https://codemirror.net/demo/search/): Fix crash when restarting search after doing empty search.
+[search addon](https://codemirror.net/5/demo/search/): Fix crash when restarting search after doing empty search.
 
 [mark-selection addon](http://cm/doc/manual.html#addon_mark-selection): Fix off-by-one bug.
 
-[tern addon](https://codemirror.net/demo/tern.html): Fix bad request made when editing at the bottom of a large document.
+[tern addon](https://codemirror.net/5/demo/tern.html): Fix bad request made when editing at the bottom of a large document.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Improve parsing in a number of corner cases.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Improve parsing in a number of corner cases.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.
 
-[gfm mode](https://codemirror.net/mode/gfm/): Don't highlight SHA1 'hashes' without numbers to avoid false positives.
+[gfm mode](https://codemirror.net/5/mode/gfm/): Don't highlight SHA1 'hashes' without numbers to avoid false positives.
 
-[soy mode](https://codemirror.net/mode/soy/): Support injected data and `@param` in comments.
+[soy mode](https://codemirror.net/5/mode/soy/): Support injected data and `@param` in comments.
 
 ### New features
 
-[simple mode addon](https://codemirror.net/demo/simplemode.html): Allow groups in regexps when `token` isn't an array.
+[simple mode addon](https://codemirror.net/5/demo/simplemode.html): Allow groups in regexps when `token` isn't an array.
 
 ## 5.29.0 (2017-08-24)
 
@@ -940,21 +940,21 @@ Fixed a number of issues with drawing right-to-left selections and mouse selecti
 
 Fix crash in contentEditable input style when editing near a bookmark.
 
-Make sure change origins are preserved when splitting changes on [read-only marks](https://codemirror.net/doc/manual.html#mark_readOnly).
+Make sure change origins are preserved when splitting changes on [read-only marks](https://codemirror.net/5/doc/manual.html#mark_readOnly).
 
-[javascript mode](https://codemirror.net/mode/javascript/): More support for TypeScript syntax.
+[javascript mode](https://codemirror.net/5/mode/javascript/): More support for TypeScript syntax.
 
-[d mode](https://codemirror.net/mode/d/): Support nested comments.
+[d mode](https://codemirror.net/5/mode/d/): Support nested comments.
 
-[python mode](https://codemirror.net/mode/python/): Improve tokenizing of operators.
+[python mode](https://codemirror.net/5/mode/python/): Improve tokenizing of operators.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Further improve CommonMark conformance.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Further improve CommonMark conformance.
 
-[css mode](https://codemirror.net/mode/css/): Don't run comment tokens through the mode's state machine.
+[css mode](https://codemirror.net/5/mode/css/): Don't run comment tokens through the mode's state machine.
 
-[shell mode](https://codemirror.net/mode/shell/): Allow strings to span lines.
+[shell mode](https://codemirror.net/5/mode/shell/): Allow strings to span lines.
 
-[search addon](https://codemirror.net/demo/search/): Fix crash in persistent search when `extraKeys` is null.
+[search addon](https://codemirror.net/5/demo/search/): Fix crash in persistent search when `extraKeys` is null.
 
 ## 5.28.0 (2017-07-21)
 
@@ -962,21 +962,21 @@ Make sure change origins are preserved when splitting changes on [read-only mark
 
 Fix copying of, or replacing editor content with, a single dash character when copying a big selection in some corner cases.
 
-Make [`"goLineLeft"`](https://codemirror.net/doc/manual.html#command_goLineLeft)/`"goLineRight"` behave better on wrapped lines.
+Make [`"goLineLeft"`](https://codemirror.net/5/doc/manual.html#command_goLineLeft)/`"goLineRight"` behave better on wrapped lines.
 
-[sql mode](https://codemirror.net/mode/sql/): Fix tokenizing of multi-dot operator and allow digits in subfield names.
+[sql mode](https://codemirror.net/5/mode/sql/): Fix tokenizing of multi-dot operator and allow digits in subfield names.
 
-[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Fix infinite loop on some composed character inputs.
+[searchcursor addon](https://codemirror.net/5/doc/manual.html#addon_searchcursor): Fix infinite loop on some composed character inputs.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Make list parsing more CommonMark-compliant.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Make list parsing more CommonMark-compliant.
 
-[gfm mode](https://codemirror.net/mode/gfm/): Highlight colon syntax for emoji.
+[gfm mode](https://codemirror.net/5/mode/gfm/): Highlight colon syntax for emoji.
 
 ### New features
 
-Expose [`startOperation`](https://codemirror.net/doc/manual.html#startOperation) and `endOperation` for explicit operation management.
+Expose [`startOperation`](https://codemirror.net/5/doc/manual.html#startOperation) and `endOperation` for explicit operation management.
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Add extend-selection (Ctrl-Alt- or Cmd-Shift-Up/Down).
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Add extend-selection (Ctrl-Alt- or Cmd-Shift-Up/Down).
 
 ## 5.27.4 (2017-06-29)
 
@@ -984,13 +984,13 @@ Expose [`startOperation`](https://codemirror.net/doc/manual.html#startOperation)
 
 Fix crash when using mode lookahead.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Don't block inner mode's indentation support.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Don't block inner mode's indentation support.
 
 ## 5.27.2 (2017-06-22)
 
 ### Bug fixes
 
-Fix crash in the [simple mode](https://codemirror.net/demo/simplemode.html)< addon.
+Fix crash in the [simple mode](https://codemirror.net/5/demo/simplemode.html)< addon.
 
 ## 5.27.0 (2017-06-22)
 
@@ -1002,31 +1002,31 @@ Properly disable the hidden textarea when `readOnly` is `"nocursor"`.
 
 Calling the `Doc` constructor without `new` works again.
 
-[sql mode](https://codemirror.net/mode/sql/): Handle nested comments.
+[sql mode](https://codemirror.net/5/mode/sql/): Handle nested comments.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Improve support for TypeScript syntax.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Fix bug where markup was ignored on indented paragraph lines.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Fix bug where markup was ignored on indented paragraph lines.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
 
-[rust mode](https://codemirror.net/mode/rust/): Add the correct MIME type.
+[rust mode](https://codemirror.net/5/mode/rust/): Add the correct MIME type.
 
-[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Document options.
+[matchbrackets addon](https://codemirror.net/5/doc/manual.html#addon_matchbrackets): Document options.
 
 ### New features
 
 Mouse button clicks can now be bound in keymaps by using names like `"LeftClick"` or `"Ctrl-Alt-MiddleTripleClick"`. When bound to a function, that function will be passed the position of the click as second argument.
 
-The behavior of mouse selection and dragging can now be customized with the [`configureMouse`](https://codemirror.net/doc/manual.html#option_configureMouse) option.
+The behavior of mouse selection and dragging can now be customized with the [`configureMouse`](https://codemirror.net/5/doc/manual.html#option_configureMouse) option.
 
-Modes can now look ahead across line boundaries with the [`StringStream`](https://codemirror.net/doc/manual.html#StringStream)`.lookahead` method.
+Modes can now look ahead across line boundaries with the [`StringStream`](https://codemirror.net/5/doc/manual.html#StringStream)`.lookahead` method.
 
 Introduces a `"type"` token type, makes modes that recognize types output it, and add styling for it to the themes.
 
-New [`pasteLinesPerSelection`](https://codemirror.net/doc/manual.html#option_pasteLinesPerSelection) option to control the behavior of pasting multiple lines into multiple selections.
+New [`pasteLinesPerSelection`](https://codemirror.net/5/doc/manual.html#option_pasteLinesPerSelection) option to control the behavior of pasting multiple lines into multiple selections.
 
-[searchcursor addon](https://codemirror.net/doc/manual.html#addon_searchcursor): Support multi-line regular expression matches, and normalize strings when matching.
+[searchcursor addon](https://codemirror.net/5/doc/manual.html#addon_searchcursor): Support multi-line regular expression matches, and normalize strings when matching.
 
 ## 5.26.0 (2017-05-22)
 
@@ -1036,19 +1036,19 @@ In textarea-mode, don't reset the input field during composition.
 
 More careful restoration of selections in widgets, during editor redraw.
 
-[javascript mode](https://codemirror.net/mode/javascript/): More TypeScript parsing fixes.
+[javascript mode](https://codemirror.net/5/mode/javascript/): More TypeScript parsing fixes.
 
-[julia mode](https://codemirror.net/mode/julia/): Fix issue where the mode gets stuck.
+[julia mode](https://codemirror.net/5/mode/julia/): Fix issue where the mode gets stuck.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Understand cross-line links, parse all bracketed things as links.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Understand cross-line links, parse all bracketed things as links.
 
-[soy mode](https://codemirror.net/mode/soy/): Support single-quoted strings.
+[soy mode](https://codemirror.net/5/mode/soy/): Support single-quoted strings.
 
-[go mode](https://codemirror.net/mode/go/): Don't try to indent inside strings or comments.
+[go mode](https://codemirror.net/5/mode/go/): Don't try to indent inside strings or comments.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Parse line offsets in line or range specs.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Parse line offsets in line or range specs.
 
 ## 5.25.2 (2017-04-20)
 
@@ -1064,11 +1064,11 @@ Make sure long-clicking a selection sets a cursor and doesn't show the editor lo
 
 Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Recognize annotations and TypeScript-style type parameters.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Recognize annotations and TypeScript-style type parameters.
 
-[shell mode](https://codemirror.net/mode/shell/): Handle nested braces.
+[shell mode](https://codemirror.net/5/mode/shell/): Handle nested braces.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Make parsing of strong/em delimiters CommonMark-compliant.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Make parsing of strong/em delimiters CommonMark-compliant.
 
 ## 5.25.0 (2017-03-20)
 
@@ -1086,37 +1086,37 @@ Fix handling of shadow DOM roots when finding the active element.
 
 Add `role=presentation` to more DOM elements to improve screen reader support.
 
-[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Make aligning of unchanged chunks more robust.
+[merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): Make aligning of unchanged chunks more robust.
 
-[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Fix comment-toggling on a block of text that starts and ends in a (different) block comment.
+[comment addon](https://codemirror.net/5/doc/manual.html#addon_comment): Fix comment-toggling on a block of text that starts and ends in a (different) block comment.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Improve support for TypeScript syntax.
 
-[r mode](https://codemirror.net/mode/r/): Fix indentation after semicolon-less statements.
+[r mode](https://codemirror.net/5/mode/r/): Fix indentation after semicolon-less statements.
 
-[shell mode](https://codemirror.net/mode/shell/): Properly handle escaped parentheses in parenthesized expressions.
+[shell mode](https://codemirror.net/5/mode/shell/): Properly handle escaped parentheses in parenthesized expressions.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Fix a few bugs around leaving fenced code blocks.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Fix a few bugs around leaving fenced code blocks.
 
-[soy mode](https://codemirror.net/mode/soy/): Improve indentation.
+[soy mode](https://codemirror.net/5/mode/soy/): Improve indentation.
 
 ### New features
 
-[lint addon](https://codemirror.net/doc/manual.html#addon_lint): Support asynchronous linters that return promises.
+[lint addon](https://codemirror.net/5/doc/manual.html#addon_lint): Support asynchronous linters that return promises.
 
-[continuelist addon](https://codemirror.net/doc/manual.html#addon_continuelist): Support continuing task lists.
+[continuelist addon](https://codemirror.net/5/doc/manual.html#addon_continuelist): Support continuing task lists.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Make Y behave like yy.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Make Y behave like yy.
 
-[sql mode](https://codemirror.net/mode/sql/): Support sqlite dialect.
+[sql mode](https://codemirror.net/5/mode/sql/): Support sqlite dialect.
 
 ## 5.24.2 (2017-02-22)
 
 ### Bug fixes
 
-[javascript mode](https://codemirror.net/mode/javascript/): Support computed class method names.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Support computed class method names.
 
-[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Improve aligning of unchanged code in the presence of marks and line widgets.
+[merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): Improve aligning of unchanged code in the presence of marks and line widgets.
 
 ## 5.24.0 (2017-02-20)
 
@@ -1128,37 +1128,37 @@ Visual cursor motion in line-wrapped right-to-left text should be much more corr
 
 Fix bug in handling of read-only marked text.
 
-[shell mode](https://codemirror.net/mode/shell/): Properly tokenize nested parentheses.
+[shell mode](https://codemirror.net/5/mode/shell/): Properly tokenize nested parentheses.
 
-[python mode](https://codemirror.net/mode/python/): Support underscores in number literals.
+[python mode](https://codemirror.net/5/mode/python/): Support underscores in number literals.
 
-[sass mode](https://codemirror.net/mode/sass/): Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset.
+[sass mode](https://codemirror.net/5/mode/sass/): Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset.
 
-[css mode](https://codemirror.net/mode/css/): Expose `lineComment` property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.
+[css mode](https://codemirror.net/5/mode/css/): Expose `lineComment` property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.
 
-[julia mode](https://codemirror.net/mode/julia/): Properly indent `elseif` lines.
+[julia mode](https://codemirror.net/5/mode/julia/): Properly indent `elseif` lines.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Properly recognize the end of fenced code blocks when inside other markup.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Properly recognize the end of fenced code blocks when inside other markup.
 
-[scala mode](https://codemirror.net/mode/clike/): Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.
+[scala mode](https://codemirror.net/5/mode/clike/): Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.
 
-[xml mode](https://codemirror.net/mode/xml/): Allow dashes in HTML tag names.
+[xml mode](https://codemirror.net/5/mode/xml/): Allow dashes in HTML tag names.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Improve parsing of async methods, TypeScript-style comma-separated superclass lists.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Improve parsing of async methods, TypeScript-style comma-separated superclass lists.
 
-[indent-fold addon](https://codemirror.net/demo/folding.html): Ignore comment lines.
+[indent-fold addon](https://codemirror.net/5/demo/folding.html): Ignore comment lines.
 
 ### New features
 
 Positions now support a `sticky` property which determines whether they should be associated with the character before (value `"before"`) or after (value `"after"`) them.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Make it possible to remove built-in bindings through the API.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Make it possible to remove built-in bindings through the API.
 
-[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.
+[comment addon](https://codemirror.net/5/doc/manual.html#addon_comment): Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.
 
 ### Breaking changes
 
-The [sass mode](https://codemirror.net/mode/sass/) now depends on the [css mode](https://codemirror.net/mode/css/).
+The [sass mode](https://codemirror.net/5/mode/sass/) now depends on the [css mode](https://codemirror.net/5/mode/css/).
 
 ## 5.23.0 (2017-01-19)
 
@@ -1166,15 +1166,15 @@ The [sass mode](https://codemirror.net/mode/sass/) now depends on the [css mode]
 
 Presentation-related elements DOM elements are now marked as such to help screen readers.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Be more picky about what HTML tags look like to avoid false positives.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Be more picky about what HTML tags look like to avoid false positives.
 
 ### New features
 
 `findModeByMIME` now understands `+json` and `+xml` MIME suffixes.
 
-[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Add support for an `override` option to ignore language-specific defaults.
+[closebrackets addon](https://codemirror.net/5/doc/manual.html#addon_closebrackets): Add support for an `override` option to ignore language-specific defaults.
 
-[panel addon](https://codemirror.net/doc/manual.html#addon_panel): Add a `stable` option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.
+[panel addon](https://codemirror.net/5/doc/manual.html#addon_panel): Add a `stable` option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.
 
 ## 5.22.2 (2017-01-12)
 
@@ -1186,49 +1186,49 @@ Include rollup.config.js in NPM package, so that it can be used to build from so
 
 ### Bug fixes
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Make `selectBetweenBrackets` work with multiple cursors.
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Make `selectBetweenBrackets` work with multiple cursors.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Fix issues with parsing complex TypeScript types, imports, and exports.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Fix issues with parsing complex TypeScript types, imports, and exports.
 
 A contentEditable editor instance with autofocus enabled no longer crashes during initializing.
 
 ### New features
 
-[emacs bindings](https://codemirror.net/demo/emacs.html): Export `CodeMirror.emacs` to allow other addons to hook into Emacs-style functionality.
+[emacs bindings](https://codemirror.net/5/demo/emacs.html): Export `CodeMirror.emacs` to allow other addons to hook into Emacs-style functionality.
 
-[active-line addon](https://codemirror.net/doc/manual.html#addon_active-line): Add `nonEmpty` option.
+[active-line addon](https://codemirror.net/5/doc/manual.html#addon_active-line): Add `nonEmpty` option.
 
-New event: [`optionChange`](https://codemirror.net/doc/manual.html#event_optionChange).
+New event: [`optionChange`](https://codemirror.net/5/doc/manual.html#event_optionChange).
 
 ## 5.21.0 (2016-11-21)
 
 ### Bug fixes
 
-Tapping/clicking the editor in [contentEditable mode](https://codemirror.net/doc/manual.html#option_inputStyle) on Chrome now puts the cursor at the tapped position.
+Tapping/clicking the editor in [contentEditable mode](https://codemirror.net/5/doc/manual.html#option_inputStyle) on Chrome now puts the cursor at the tapped position.
 
-Fix various crashes and misbehavior when reading composition events in [contentEditable mode](https://codemirror.net/doc/manual.html#option_inputStyle).
+Fix various crashes and misbehavior when reading composition events in [contentEditable mode](https://codemirror.net/5/doc/manual.html#option_inputStyle).
 
 Catches and ignores an IE 'Unspecified Error' when creating an editor in an iframe before there is a `<body>`.
 
-[merge addon](https://codemirror.net/doc/manual.html#addon_merge): Fix several issues in the chunk-aligning feature.
+[merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): Fix several issues in the chunk-aligning feature.
 
-[verilog mode](https://codemirror.net/mode/verilog): Rewritten to address various issues.
+[verilog mode](https://codemirror.net/5/mode/verilog): Rewritten to address various issues.
 
-[julia mode](https://codemirror.net/mode/julia): Recognize Julia 0.5 syntax.
+[julia mode](https://codemirror.net/5/mode/julia): Recognize Julia 0.5 syntax.
 
-[swift mode](https://codemirror.net/mode/swift): Various fixes and adjustments to current syntax.
+[swift mode](https://codemirror.net/5/mode/swift): Various fixes and adjustments to current syntax.
 
-[markdown mode](https://codemirror.net/mode/markdown): Allow lists without a blank line above them.
+[markdown mode](https://codemirror.net/5/mode/markdown): Allow lists without a blank line above them.
 
 ### New features
 
-The [`setGutterMarker`](https://codemirror.net/doc/manual.html#setGutterMarker), [`clearGutter`](https://codemirror.net/doc/manual.html#clearGutter), and [`lineInfo`](https://codemirror.net/doc/manual.html#lineInfo) methods are now available on `Doc` objects.
+The [`setGutterMarker`](https://codemirror.net/5/doc/manual.html#setGutterMarker), [`clearGutter`](https://codemirror.net/5/doc/manual.html#clearGutter), and [`lineInfo`](https://codemirror.net/5/doc/manual.html#lineInfo) methods are now available on `Doc` objects.
 
-The [`heightAtLine`](https://codemirror.net/doc/manual.html#heightAtLine) method now takes an extra argument to allow finding the height at the top of the line's line widgets.
+The [`heightAtLine`](https://codemirror.net/5/doc/manual.html#heightAtLine) method now takes an extra argument to allow finding the height at the top of the line's line widgets.
 
-[ruby mode](https://codemirror.net/mode/ruby): `else` and `elsif` are now immediately indented.
+[ruby mode](https://codemirror.net/5/mode/ruby): `else` and `elsif` are now immediately indented.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.
 
 ## 5.20.2 (2016-10-21)
 
@@ -1246,27 +1246,27 @@ Make sure keypress events for backspace are ignored.
 
 Tokens styled with overlays no longer get a nonsense `cm-cm-overlay` class.
 
-Line endings for pasted content are now normalized to the editor's [preferred ending](https://codemirror.net/doc/manual.html#option_lineSeparator).
+Line endings for pasted content are now normalized to the editor's [preferred ending](https://codemirror.net/5/doc/manual.html#option_lineSeparator).
 
-[javascript mode](https://codemirror.net/mode/javascript): Improve support for class expressions. Support TypeScript optional class properties, the `abstract` keyword, and return type declarations for arrow functions.
+[javascript mode](https://codemirror.net/5/mode/javascript): Improve support for class expressions. Support TypeScript optional class properties, the `abstract` keyword, and return type declarations for arrow functions.
 
-[css mode](https://codemirror.net/mode/css): Fix highlighting of mixed-case keywords.
+[css mode](https://codemirror.net/5/mode/css): Fix highlighting of mixed-case keywords.
 
-[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Improve behavior when typing a quote before a string.
+[closebrackets addon](https://codemirror.net/5/doc/manual.html#addon_closebrackets): Improve behavior when typing a quote before a string.
 
 ### New features
 
 The core is now maintained as a number of small files, using ES6 syntax and modules, under the `src/` directory. A git checkout no longer contains a working `codemirror.js` until you `npm run build` (but when installing from NPM, it is included).
 
-The [`refresh`](https://codemirror.net/doc/manual.html#event_refresh) event is now documented and stable.
+The [`refresh`](https://codemirror.net/5/doc/manual.html#event_refresh) event is now documented and stable.
 
 ## 5.19.0 (2016-09-20)
 
 ### Bugfixes
 
-[erlang mode](https://codemirror.net/mode/erlang): Fix mode crash when trying to read an empty context.
+[erlang mode](https://codemirror.net/5/mode/erlang): Fix mode crash when trying to read an empty context.
 
-[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Fix broken behavior when toggling comments inside a comment.
+[comment addon](https://codemirror.net/5/doc/manual.html#addon_comment): Fix broken behavior when toggling comments inside a comment.
 
 xml-fold addon: Fix a null-dereference bug.
 
@@ -1276,43 +1276,43 @@ Fix an issue where the cursor position could be off in really long (~8000 charac
 
 ### New features
 
-[javascript mode](https://codemirror.net/mode/javascript): Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the `type` keyword.
+[javascript mode](https://codemirror.net/5/mode/javascript): Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the `type` keyword.
 
-The [`blur`](https://codemirror.net/doc/manual.html#event_blur) and [`focus`](https://codemirror.net/doc/manual.html#event_focus) events now pass the DOM event to their handlers.
+The [`blur`](https://codemirror.net/5/doc/manual.html#event_blur) and [`focus`](https://codemirror.net/5/doc/manual.html#event_focus) events now pass the DOM event to their handlers.
 
 ## 5.18.2 (2016-08-23)
 
 ### Bugfixes
 
-[vue mode](https://codemirror.net/mode/vue): Fix outdated references to renamed Pug mode dependency.
+[vue mode](https://codemirror.net/5/mode/vue): Fix outdated references to renamed Pug mode dependency.
 
 ## 5.18.0 (2016-08-22)
 
 ### Bugfixes
 
-Make sure [gutter backgrounds](https://codemirror.net/doc/manual.html#addLineClass) stick to the rest of the gutter during horizontal scrolling.
+Make sure [gutter backgrounds](https://codemirror.net/5/doc/manual.html#addLineClass) stick to the rest of the gutter during horizontal scrolling.
 
-The contenteditable [`inputStyle`](https://codemirror.net/doc/manual.html#option_inputStyle) now properly supports pasting on pre-Edge IE versions.
+The contenteditable [`inputStyle`](https://codemirror.net/5/doc/manual.html#option_inputStyle) now properly supports pasting on pre-Edge IE versions.
 
-[javascript mode](https://codemirror.net/mode/javascript): Fix some small parsing bugs and improve TypeScript support.
+[javascript mode](https://codemirror.net/5/mode/javascript): Fix some small parsing bugs and improve TypeScript support.
 
-[matchbrackets addon](https://codemirror.net/doc/manual.html#addon_matchbrackets): Fix bug where active highlighting was left in editor when the addon was disabled.
+[matchbrackets addon](https://codemirror.net/5/doc/manual.html#addon_matchbrackets): Fix bug where active highlighting was left in editor when the addon was disabled.
 
-[match-highlighter addon](https://codemirror.net/doc/manual.html#addon_match-highlighter): Only start highlighting things when the editor gains focus.
+[match-highlighter addon](https://codemirror.net/5/doc/manual.html#addon_match-highlighter): Only start highlighting things when the editor gains focus.
 
-[javascript-hint addon](https://codemirror.net/doc/manual.html#addon_javascript-hint): Also complete non-enumerable properties.
+[javascript-hint addon](https://codemirror.net/5/doc/manual.html#addon_javascript-hint): Also complete non-enumerable properties.
 
 ### New features
 
-The [`addOverlay`](https://codemirror.net/doc/manual.html#addOverlay) method now supports a `priority` option to control the order in which overlays are applied.
+The [`addOverlay`](https://codemirror.net/5/doc/manual.html#addOverlay) method now supports a `priority` option to control the order in which overlays are applied.
 
 MIME types that end in `+json` now default to the JSON mode when the MIME itself is not defined.
 
 ### Breaking changes
 
-The mode formerly known as Jade was renamed to [Pug](https://codemirror.net/mode/pug).
+The mode formerly known as Jade was renamed to [Pug](https://codemirror.net/5/mode/pug).
 
-The [Python mode](https://codemirror.net/mode/python) now defaults to Python 3 (rather than 2) syntax.
+The [Python mode](https://codemirror.net/5/mode/python) now defaults to Python 3 (rather than 2) syntax.
 
 ## 5.17.0 (2016-07-19)
 
@@ -1324,15 +1324,15 @@ Prevent IME dialog from overlapping typed content in Chrome.
 
 Improve measuring of characters near a line wrap.
 
-[javascript mode](https://codemirror.net/mode/javascript): Improve support for `async`, allow trailing commas in `import` lists.
+[javascript mode](https://codemirror.net/5/mode/javascript): Improve support for `async`, allow trailing commas in `import` lists.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Fix backspace in replace mode.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Fix backspace in replace mode.
 
-[sublime bindings](https://codemirror.net/demo/sublime.html): Fix some key bindings on OS X to match Sublime Text.
+[sublime bindings](https://codemirror.net/5/demo/sublime.html): Fix some key bindings on OS X to match Sublime Text.
 
 ### New features
 
-[markdown mode](https://codemirror.net/mode/markdown): Add more classes to image links in highlight-formatting mode.
+[markdown mode](https://codemirror.net/5/mode/markdown): Add more classes to image links in highlight-formatting mode.
 
 ## 5.16.0 (2016-06-20)
 
@@ -1344,15 +1344,15 @@ Make Control-drag work on Firefox.
 
 Make clicking or selection-dragging at the end of a wrapped line select the right position.
 
-[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Prevent widget scrollbar from hiding part of the hint text.
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Prevent widget scrollbar from hiding part of the hint text.
 
-[rulers addon](https://codemirror.net/doc/manual.html#addon_rulers): Prevent rulers from forcing a horizontal editor scrollbar.
+[rulers addon](https://codemirror.net/5/doc/manual.html#addon_rulers): Prevent rulers from forcing a horizontal editor scrollbar.
 
 ### New features
 
-[search addon](https://codemirror.net/doc/manual.html#addon_search): Automatically bind search-related keys in persistent dialog.
+[search addon](https://codemirror.net/5/doc/manual.html#addon_search): Automatically bind search-related keys in persistent dialog.
 
-[sublime keymap](https://codemirror.net/demo/sublime.html): Add a multi-cursor aware smart backspace binding.
+[sublime keymap](https://codemirror.net/5/demo/sublime.html): Add a multi-cursor aware smart backspace binding.
 
 ## 5.15.2 (2016-05-20)
 
@@ -1374,17 +1374,17 @@ Fix issue where the editor would complain about overlapping collapsed ranges whe
 
 Optimize document tree building when loading or pasting huge chunks of content.
 
-[markdown mode](https://codemirror.net/mode/markdown/): Fix several issues in matching link targets.
+[markdown mode](https://codemirror.net/5/mode/markdown/): Fix several issues in matching link targets.
 
-[clike mode](https://codemirror.net/mode/clike/): Improve indentation of C++ template declarations.
+[clike mode](https://codemirror.net/5/mode/clike/): Improve indentation of C++ template declarations.
 
 ### New features
 
 Explicitly bind Ctrl-O on OS X to make that binding (“open line”) act as expected.
 
-Pasting [linewise-copied](https://codemirror.net/doc/manual.html#option_lineWiseCopyCut) content when there is no selection now inserts the lines above the current line.
+Pasting [linewise-copied](https://codemirror.net/5/doc/manual.html#option_lineWiseCopyCut) content when there is no selection now inserts the lines above the current line.
 
-[javascript mode](https://codemirror.net/mode/javascript/): Support `async`/`await` and improve support for TypeScript type syntax.
+[javascript mode](https://codemirror.net/5/mode/javascript/): Support `async`/`await` and improve support for TypeScript type syntax.
 
 ## 5.14.2 (2016-04-20)
 
@@ -1394,37 +1394,37 @@ Push a new package to NPM due to an [NPM bug](https://github.com/npm/npm/issues/
 
 Set `dataTransfer.effectAllowed` in `dragstart` handler to help browsers use the right drag icon.
 
-Add the [mbox mode](https://codemirror.net/mode/mbox/index.html) to `mode/meta.js`.
+Add the [mbox mode](https://codemirror.net/5/mode/mbox/index.html) to `mode/meta.js`.
 
 ## 5.14.0 (2016-04-20)
 
 ### Bugfixes
 
-[`posFromIndex`](https://codemirror.net/doc/manual.html#posFromIndex) and [`indexFromPos`](https://codemirror.net/doc/manual.html#indexFromPos) now take [`lineSeparator`](https://codemirror.net/doc/manual.html#option_lineSeparator) into account.
+[`posFromIndex`](https://codemirror.net/5/doc/manual.html#posFromIndex) and [`indexFromPos`](https://codemirror.net/5/doc/manual.html#indexFromPos) now take [`lineSeparator`](https://codemirror.net/5/doc/manual.html#option_lineSeparator) into account.
 
-[vim bindings](https://codemirror.net/demo/vim.html): Only call `.save()` when it is actually available.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Only call `.save()` when it is actually available.
 
-[comment addon](https://codemirror.net/doc/manual.html#addon_comment): Be careful not to mangle multi-line strings.
+[comment addon](https://codemirror.net/5/doc/manual.html#addon_comment): Be careful not to mangle multi-line strings.
 
-[Python mode](https://codemirror.net/mode/python/index.html): Improve distinguishing of decorators from `@` operators.
+[Python mode](https://codemirror.net/5/mode/python/index.html): Improve distinguishing of decorators from `@` operators.
 
-[`findMarks`](https://codemirror.net/doc/manual.html#findMarks): No longer return marks that touch but don't overlap given range.
+[`findMarks`](https://codemirror.net/5/doc/manual.html#findMarks): No longer return marks that touch but don't overlap given range.
 
 ### New features
 
-[vim bindings](https://codemirror.net/demo/vim.html): Add yank command.
+[vim bindings](https://codemirror.net/5/demo/vim.html): Add yank command.
 
-[match-highlighter addon](https://codemirror.net/doc/manual.html#addon_match-highlighter): Add `trim` option to disable ignoring of whitespace.
+[match-highlighter addon](https://codemirror.net/5/doc/manual.html#addon_match-highlighter): Add `trim` option to disable ignoring of whitespace.
 
-[PowerShell mode](https://codemirror.net/mode/powershell/index.html): Added.
+[PowerShell mode](https://codemirror.net/5/mode/powershell/index.html): Added.
 
-[Yacas mode](https://codemirror.net/mode/yacas/index.html): Added.
+[Yacas mode](https://codemirror.net/5/mode/yacas/index.html): Added.
 
-[Web IDL mode](https://codemirror.net/mode/webidl/index.html): Added.
+[Web IDL mode](https://codemirror.net/5/mode/webidl/index.html): Added.
 
-[SAS mode](https://codemirror.net/mode/sas/index.html): Added.
+[SAS mode](https://codemirror.net/5/mode/sas/index.html): Added.
 
-[mbox mode](https://codemirror.net/mode/mbox/index.html): Added.
+[mbox mode](https://codemirror.net/5/mode/mbox/index.html): Added.
 
 ## 5.13.2 (2016-03-23)
 
@@ -1436,43 +1436,43 @@ Solves a problem where the gutter would sometimes not extend all the way to the
 
 ### New features
 
-New DOM event forwarded: [`"dragleave"`](https://codemirror.net/doc/manual.html#event_dom).
+New DOM event forwarded: [`"dragleave"`](https://codemirror.net/5/doc/manual.html#event_dom).
 
-[protobuf mode](https://codemirror.net/mode/protobuf/index.html): Newly added.
+[protobuf mode](https://codemirror.net/5/mode/protobuf/index.html): Newly added.
 
 ### Bugfixes
 
-Fix problem where [`findMarks`](https://codemirror.net/doc/manual.html#findMarks) sometimes failed to find multi-line marks.
+Fix problem where [`findMarks`](https://codemirror.net/5/doc/manual.html#findMarks) sometimes failed to find multi-line marks.
 
 Fix crash that showed up when atomic ranges and bidi text were combined.
 
-[show-hint addon](https://codemirror.net/demo/complete.html): Completion widgets no longer close when the line indented or dedented.
+[show-hint addon](https://codemirror.net/5/demo/complete.html): Completion widgets no longer close when the line indented or dedented.
 
-[merge addon](https://codemirror.net/demo/merge.html): Fix bug when merging chunks at the end of the file.
+[merge addon](https://codemirror.net/5/demo/merge.html): Fix bug when merging chunks at the end of the file.
 
-[placeholder addon](https://codemirror.net/doc/manual.html#addon_placeholder): No longer gets confused by [`swapDoc`](https://codemirror.net/doc/manual.html#swapDoc).
+[placeholder addon](https://codemirror.net/5/doc/manual.html#addon_placeholder): No longer gets confused by [`swapDoc`](https://codemirror.net/5/doc/manual.html#swapDoc).
 
-[simplescrollbars addon](https://codemirror.net/doc/manual.html#addon_simplescrollbars): Fix invalid state when deleting at end of document.
+[simplescrollbars addon](https://codemirror.net/5/doc/manual.html#addon_simplescrollbars): Fix invalid state when deleting at end of document.
 
-[clike mode](https://codemirror.net/mode/clike/index.html): No longer gets confused when a comment starts after an operator.
+[clike mode](https://codemirror.net/5/mode/clike/index.html): No longer gets confused when a comment starts after an operator.
 
-[markdown mode](https://codemirror.net/mode/markdown/index.html): Now supports CommonMark-style flexible list indentation.
+[markdown mode](https://codemirror.net/5/mode/markdown/index.html): Now supports CommonMark-style flexible list indentation.
 
-[dylan mode](https://codemirror.net/mode/dylan/index.html): Several improvements and fixes.
+[dylan mode](https://codemirror.net/5/mode/dylan/index.html): Several improvements and fixes.
 
 ## 5.12.0 (2016-02-19)
 
 ### New features
 
-[Vim bindings](https://codemirror.net/demo/vim.html): Ctrl-Q is now an alias for Ctrl-V.
+[Vim bindings](https://codemirror.net/5/demo/vim.html): Ctrl-Q is now an alias for Ctrl-V.
 
-[Vim bindings](https://codemirror.net/demo/vim.html): The Vim API now exposes an `unmap` method to unmap bindings.
+[Vim bindings](https://codemirror.net/5/demo/vim.html): The Vim API now exposes an `unmap` method to unmap bindings.
 
-[active-line addon](https://codemirror.net/demo/activeline.html): This addon can now style the active line's gutter.
+[active-line addon](https://codemirror.net/5/demo/activeline.html): This addon can now style the active line's gutter.
 
-[FCL mode](https://codemirror.net/mode/fcl/): Newly added.
+[FCL mode](https://codemirror.net/5/mode/fcl/): Newly added.
 
-[SQL mode](https://codemirror.net/mode/sql/): Now has a Postgresql dialect.
+[SQL mode](https://codemirror.net/5/mode/sql/): Now has a Postgresql dialect.
 
 ### Bugfixes
 
@@ -1484,147 +1484,147 @@ Solve a [problem](https://github.com/codemirror/CodeMirror/issues/3821) where th
 
 Fix a [bug](https://github.com/codemirror/CodeMirror/issues/3834) that caused phantom scroll space under the text in some situations.
 
-[Sublime Text bindings](https://codemirror.net/demo/sublime.html): Bind delete-line to Shift-Ctrl-K on OS X.
+[Sublime Text bindings](https://codemirror.net/5/demo/sublime.html): Bind delete-line to Shift-Ctrl-K on OS X.
 
-[Markdown mode](https://codemirror.net/mode/markdown/): Fix [issue](https://github.com/codemirror/CodeMirror/issues/3787) where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.
+[Markdown mode](https://codemirror.net/5/mode/markdown/): Fix [issue](https://github.com/codemirror/CodeMirror/issues/3787) where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.
 
-[Markdown mode](https://codemirror.net/mode/markdown/): Ignore backslashes in code fragments.
+[Markdown mode](https://codemirror.net/5/mode/markdown/): Ignore backslashes in code fragments.
 
-[Markdown mode](https://codemirror.net/mode/markdown/): Use whichever mode is registered as `text/html` to parse HTML.
+[Markdown mode](https://codemirror.net/5/mode/markdown/): Use whichever mode is registered as `text/html` to parse HTML.
 
-[Clike mode](https://codemirror.net/mode/clike/): Improve indentation of Scala `=>` functions.
+[Clike mode](https://codemirror.net/5/mode/clike/): Improve indentation of Scala `=>` functions.
 
-[Python mode](https://codemirror.net/mode/python/): Improve indentation of bracketed code.
+[Python mode](https://codemirror.net/5/mode/python/): Improve indentation of bracketed code.
 
-[HTMLMixed mode](https://codemirror.net/mode/htmlmixed/): Support multi-line opening tags for sub-languages (`<script>`, `<style>`, etc).
+[HTMLMixed mode](https://codemirror.net/5/mode/htmlmixed/): Support multi-line opening tags for sub-languages (`<script>`, `<style>`, etc).
 
-[Spreadsheet mode](https://codemirror.net/mode/spreadsheet/): Fix bug where the mode did not advance the stream when finding a backslash.
+[Spreadsheet mode](https://codemirror.net/5/mode/spreadsheet/): Fix bug where the mode did not advance the stream when finding a backslash.
 
-[XML mode](https://codemirror.net/mode/xml/): The mode now takes a `matchClosing` option to configure whether mismatched closing tags should be highlighted as errors.
+[XML mode](https://codemirror.net/5/mode/xml/): The mode now takes a `matchClosing` option to configure whether mismatched closing tags should be highlighted as errors.
 
 ## 5.11.0 (2016-01-20)
 
-* New modes: [JSX](https://codemirror.net/mode/jsx/index.html), [literate Haskell](https://codemirror.net/mode/haskell-literate/index.html)
-* The editor now forwards more [DOM events](https://codemirror.net/doc/manual.html#event_dom): `cut`, `copy`, `paste`, and `touchstart`. It will also forward `mousedown` for drag events
+* New modes: [JSX](https://codemirror.net/5/mode/jsx/index.html), [literate Haskell](https://codemirror.net/5/mode/haskell-literate/index.html)
+* The editor now forwards more [DOM events](https://codemirror.net/5/doc/manual.html#event_dom): `cut`, `copy`, `paste`, and `touchstart`. It will also forward `mousedown` for drag events
 * Fixes a bug where bookmarks next to collapsed spans were not rendered
-* The [Swift](https://codemirror.net/mode/swift/index.html) mode now supports auto-indentation
-* Frontmatters in the [YAML frontmatter](https://codemirror.net/mode/yaml-frontmatter/index.html) mode are now optional as intended
+* The [Swift](https://codemirror.net/5/mode/swift/index.html) mode now supports auto-indentation
+* Frontmatters in the [YAML frontmatter](https://codemirror.net/5/mode/yaml-frontmatter/index.html) mode are now optional as intended
 
 ## 5.10.0 (2015-12-21)
 
-* Modify the way [atomic ranges](https://codemirror.net/doc/manual.html#mark_atomic) are skipped by selection to try and make it less surprising.
-* The [Swift mode](https://codemirror.net/mode/swift/index.html) was rewritten.
-* New addon: [jump-to-line](https://codemirror.net/doc/manual.html#addon_jump-to-line).
-* New method: [`isReadOnly`](https://codemirror.net/doc/manual.html#isReadOnly).
-* The [show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint) now defaults to picking completions on single click.
-* The object passed to [`"beforeSelectionChange"`](https://codemirror.net/doc/manual.html#event_beforeSelectionChange) events now has an `origin` property.
-* New mode: [Crystal](https://codemirror.net/mode/crystal/index.html).
+* Modify the way [atomic ranges](https://codemirror.net/5/doc/manual.html#mark_atomic) are skipped by selection to try and make it less surprising.
+* The [Swift mode](https://codemirror.net/5/mode/swift/index.html) was rewritten.
+* New addon: [jump-to-line](https://codemirror.net/5/doc/manual.html#addon_jump-to-line).
+* New method: [`isReadOnly`](https://codemirror.net/5/doc/manual.html#isReadOnly).
+* The [show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint) now defaults to picking completions on single click.
+* The object passed to [`"beforeSelectionChange"`](https://codemirror.net/5/doc/manual.html#event_beforeSelectionChange) events now has an `origin` property.
+* New mode: [Crystal](https://codemirror.net/5/mode/crystal/index.html).
 
 ## 5.9.0 (2015-11-23)
 
 * Improve the way overlay (OS X-style) scrollbars are handled
-* Make [annotatescrollbar](https://codemirror.net/doc/manual.html#addon_annotatescrollbar) and scrollpastend addons work properly together
-* Make [show-hint](https://codemirror.net/doc/manual.html#addon_show-hint) addon select options on single click by default, move selection to hovered item
+* Make [annotatescrollbar](https://codemirror.net/5/doc/manual.html#addon_annotatescrollbar) and scrollpastend addons work properly together
+* Make [show-hint](https://codemirror.net/5/doc/manual.html#addon_show-hint) addon select options on single click by default, move selection to hovered item
 * Properly fold comments that include block-comment-start markers
 * Many small language mode fixes
 
 ## 5.8.0 (2015-10-20)
 
-* Fixes an infinite loop in the [hardwrap addon](https://codemirror.net/doc/manual.html#addon_hardwrap)
-* New modes: [NSIS](https://codemirror.net/mode/nsis/index.html), [Ceylon](https://codemirror.net/mode/clike/index.html)
-* The Kotlin mode is now a [clike](https://codemirror.net/mode/clike/index.html) dialect, rather than a stand-alone mode
-* New option: [`allowDropFileTypes`](https://codemirror.net/doc/manual.html#option_allowDropFileTypes). Binary files can no longer be dropped into CodeMirror
-* New themes: [bespin](https://codemirror.net/demo/theme.html#bespin), [hopscotch](https://codemirror.net/demo/theme.html#hopscotch), [isotope](https://codemirror.net/demo/theme.html#isotope), [railscasts](https://codemirror.net/demo/theme.html#railscasts)
+* Fixes an infinite loop in the [hardwrap addon](https://codemirror.net/5/doc/manual.html#addon_hardwrap)
+* New modes: [NSIS](https://codemirror.net/5/mode/nsis/index.html), [Ceylon](https://codemirror.net/5/mode/clike/index.html)
+* The Kotlin mode is now a [clike](https://codemirror.net/5/mode/clike/index.html) dialect, rather than a stand-alone mode
+* New option: [`allowDropFileTypes`](https://codemirror.net/5/doc/manual.html#option_allowDropFileTypes). Binary files can no longer be dropped into CodeMirror
+* New themes: [bespin](https://codemirror.net/5/demo/theme.html#bespin), [hopscotch](https://codemirror.net/5/demo/theme.html#hopscotch), [isotope](https://codemirror.net/5/demo/theme.html#isotope), [railscasts](https://codemirror.net/5/demo/theme.html#railscasts)
 
 ## 5.7.0 (2015-09-21)
 
-* New modes: [Vue](https://codemirror.net/mode/vue/index.html), [Oz](https://codemirror.net/mode/oz/index.html), [MscGen](https://codemirror.net/mode/mscgen/index.html) (and dialects), [Closure Stylesheets](https://codemirror.net/mode/css/gss.html)
-* Implement [CommonMark](http://commonmark.org)-style flexible list indent and cross-line code spans in [Markdown](https://codemirror.net/mode/markdown/index.html) mode
-* Add a replace-all button to the [search addon](https://codemirror.net/doc/manual.html#addon_search), and make the persistent search dialog transparent when it obscures the match
-* Handle `async`/`await` and ocal and binary numbers in [JavaScript mode](https://codemirror.net/mode/javascript/index.html)
-* Fix various issues with the [Haxe mode](https://codemirror.net/mode/haxe/index.html)
-* Make the [closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets) select only the wrapped text when wrapping selection in brackets
-* Tokenize properties as properties in the [CoffeeScript mode](https://codemirror.net/mode/coffeescript/index.html)
-* The [placeholder addon](https://codemirror.net/doc/manual.html#addon_placeholder) now accepts a DOM node as well as a string placeholder
+* New modes: [Vue](https://codemirror.net/5/mode/vue/index.html), [Oz](https://codemirror.net/5/mode/oz/index.html), [MscGen](https://codemirror.net/5/mode/mscgen/index.html) (and dialects), [Closure Stylesheets](https://codemirror.net/5/mode/css/gss.html)
+* Implement [CommonMark](http://commonmark.org)-style flexible list indent and cross-line code spans in [Markdown](https://codemirror.net/5/mode/markdown/index.html) mode
+* Add a replace-all button to the [search addon](https://codemirror.net/5/doc/manual.html#addon_search), and make the persistent search dialog transparent when it obscures the match
+* Handle `async`/`await` and ocal and binary numbers in [JavaScript mode](https://codemirror.net/5/mode/javascript/index.html)
+* Fix various issues with the [Haxe mode](https://codemirror.net/5/mode/haxe/index.html)
+* Make the [closebrackets addon](https://codemirror.net/5/doc/manual.html#addon_closebrackets) select only the wrapped text when wrapping selection in brackets
+* Tokenize properties as properties in the [CoffeeScript mode](https://codemirror.net/5/mode/coffeescript/index.html)
+* The [placeholder addon](https://codemirror.net/5/doc/manual.html#addon_placeholder) now accepts a DOM node as well as a string placeholder
 
 ## 5.6.0 (2015-08-20)
 
 * Fix bug where you could paste into a `readOnly` editor
 * Show a cursor at the drop location when dragging over the editor
-* The [Rust mode](https://codemirror.net/mode/rust/index.html) was rewritten to handle modern Rust
+* The [Rust mode](https://codemirror.net/5/mode/rust/index.html) was rewritten to handle modern Rust
 * The editor and theme CSS was cleaned up. Some selectors are now less specific than before
-* New theme: [abcdef](https://codemirror.net/demo/theme.html#abcdef)
-* Lines longer than [`maxHighlightLength`](https://codemirror.net/doc/manual.html#option_maxHighlightLength) are now less likely to mess up indentation
-* New addons: [`autorefresh`](https://codemirror.net/doc/manual.html#addon_autorefresh) for refreshing an editor the first time it becomes visible, and `html-lint` for using [HTMLHint](http://htmlhint.com/)
-* The [`search`](https://codemirror.net/doc/manual.html#addon_search) addon now recognizes `\r` and `\n` in pattern and replacement input
+* New theme: [abcdef](https://codemirror.net/5/demo/theme.html#abcdef)
+* Lines longer than [`maxHighlightLength`](https://codemirror.net/5/doc/manual.html#option_maxHighlightLength) are now less likely to mess up indentation
+* New addons: [`autorefresh`](https://codemirror.net/5/doc/manual.html#addon_autorefresh) for refreshing an editor the first time it becomes visible, and `html-lint` for using [HTMLHint](http://htmlhint.com/)
+* The [`search`](https://codemirror.net/5/doc/manual.html#addon_search) addon now recognizes `\r` and `\n` in pattern and replacement input
 
 ## 5.5.0 (2015-07-20)
 
-*   New option: [`lineSeparator`](https://codemirror.net/doc/manual.html#option_lineSeparator) (with corresponding [method](https://codemirror.net/doc/manual.html#lineSeparator))
-*   New themes: [dracula](https://codemirror.net/demo/theme.html#dracula), [seti](https://codemirror.net/demo/theme.html#seti), [yeti](https://codemirror.net/demo/theme.html#yeti), [material](https://codemirror.net/demo/theme.html#material), and [icecoder](https://codemirror.net/demo/theme.html#icecoder)
-*   New modes: [Brainfuck](https://codemirror.net/mode/brainfuck/index.html), [VHDL](https://codemirror.net/mode/vhdl/index.html), Squirrel ([clike](https://codemirror.net/mode/clike/index.html) dialect)
-*   Define a `findPersistent` command in the [search](https://codemirror.net/demo/search.html) addon, for a dialog that stays open as you cycle through matches
+*   New option: [`lineSeparator`](https://codemirror.net/5/doc/manual.html#option_lineSeparator) (with corresponding [method](https://codemirror.net/5/doc/manual.html#lineSeparator))
+*   New themes: [dracula](https://codemirror.net/5/demo/theme.html#dracula), [seti](https://codemirror.net/5/demo/theme.html#seti), [yeti](https://codemirror.net/5/demo/theme.html#yeti), [material](https://codemirror.net/5/demo/theme.html#material), and [icecoder](https://codemirror.net/5/demo/theme.html#icecoder)
+*   New modes: [Brainfuck](https://codemirror.net/5/mode/brainfuck/index.html), [VHDL](https://codemirror.net/5/mode/vhdl/index.html), Squirrel ([clike](https://codemirror.net/5/mode/clike/index.html) dialect)
+*   Define a `findPersistent` command in the [search](https://codemirror.net/5/demo/search.html) addon, for a dialog that stays open as you cycle through matches
 *   From this release on, the NPM module doesn't include documentation and demos
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.4.0...5.5.0)
 
 ## 5.4.0 (2015-06-25)
 
-*   New modes: [Twig](https://codemirror.net/mode/twig/index.html), [Elm](https://codemirror.net/mode/elm/index.html), [Factor](https://codemirror.net/mode/factor/index.html), [Swift](https://codemirror.net/mode/swift/index.html)
+*   New modes: [Twig](https://codemirror.net/5/mode/twig/index.html), [Elm](https://codemirror.net/5/mode/elm/index.html), [Factor](https://codemirror.net/5/mode/factor/index.html), [Swift](https://codemirror.net/5/mode/swift/index.html)
 *   Prefer clipboard API (if available) when pasting
-*   Refined definition highlighting in [clike](https://codemirror.net/mode/clike/index.html) mode
+*   Refined definition highlighting in [clike](https://codemirror.net/5/mode/clike/index.html) mode
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.3.0...5.4.0)
 
 ## 5.3.0 (2015-05-20)
 
-*   Fix several regressions in the [`show-hint`](https://codemirror.net/doc/manual.html#addon_show-hint) addon (`completeSingle` option, `"shown"` and `"close"` events)
-*   The [vim mode](https://codemirror.net/demo/vim.html) API was [documented](https://codemirror.net/doc/manual.html#vimapi)
-*   New modes: [ASN.1](https://codemirror.net/mode/asn.1/index.html), [TTCN](https://codemirror.net/mode/ttcn/index.html), and [TTCN-CFG](https://codemirror.net/mode/ttcn-cfg/index.html)
-*   The [clike](https://codemirror.net/mode/clike/index.html) mode can now deep-indent `switch` statements, and roughly recognizes types and defined identifiers
+*   Fix several regressions in the [`show-hint`](https://codemirror.net/5/doc/manual.html#addon_show-hint) addon (`completeSingle` option, `"shown"` and `"close"` events)
+*   The [vim mode](https://codemirror.net/5/demo/vim.html) API was [documented](https://codemirror.net/5/doc/manual.html#vimapi)
+*   New modes: [ASN.1](https://codemirror.net/5/mode/asn.1/index.html), [TTCN](https://codemirror.net/5/mode/ttcn/index.html), and [TTCN-CFG](https://codemirror.net/5/mode/ttcn-cfg/index.html)
+*   The [clike](https://codemirror.net/5/mode/clike/index.html) mode can now deep-indent `switch` statements, and roughly recognizes types and defined identifiers
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.2.0...5.3.0)
 
 ## 5.2.0 (2015-04-20)
 
-*   Fix several race conditions in [`show-hint`](https://codemirror.net/doc/manual.html#addon_show-hint)'s asynchronous mode
-*   Fix backspace binding in [Sublime bindings](https://codemirror.net/demo/sublime.html)
-*   Change the way IME is handled in the `"textarea"` [input style](https://codemirror.net/doc/manual.html#option_inputStyle)
-*   New modes: [MUMPS](https://codemirror.net/mode/mumps/index.html), [Handlebars](https://codemirror.net/mode/handlebars/index.html)
-*   Rewritten modes: [Django](https://codemirror.net/mode/django/index.html), [Z80](https://codemirror.net/mode/z80/index.html)
-*   New theme: [Liquibyte](https://codemirror.net/demo/theme.html#liquibyte)
-*   New option: [`lineWiseCopyCut`](https://codemirror.net/doc/manual.html#option_lineWiseCopyCut)
-*   The [Vim mode](https://codemirror.net/demo/vim.html) now supports buffer-local options and the `filetype` setting
+*   Fix several race conditions in [`show-hint`](https://codemirror.net/5/doc/manual.html#addon_show-hint)'s asynchronous mode
+*   Fix backspace binding in [Sublime bindings](https://codemirror.net/5/demo/sublime.html)
+*   Change the way IME is handled in the `"textarea"` [input style](https://codemirror.net/5/doc/manual.html#option_inputStyle)
+*   New modes: [MUMPS](https://codemirror.net/5/mode/mumps/index.html), [Handlebars](https://codemirror.net/5/mode/handlebars/index.html)
+*   Rewritten modes: [Django](https://codemirror.net/5/mode/django/index.html), [Z80](https://codemirror.net/5/mode/z80/index.html)
+*   New theme: [Liquibyte](https://codemirror.net/5/demo/theme.html#liquibyte)
+*   New option: [`lineWiseCopyCut`](https://codemirror.net/5/doc/manual.html#option_lineWiseCopyCut)
+*   The [Vim mode](https://codemirror.net/5/demo/vim.html) now supports buffer-local options and the `filetype` setting
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.1.0...5.2.0)
 
 ## 5.1.0 (2015-03-23)
 
-*   New modes: [ASCII armor](https://codemirror.net/mode/asciiarmor/index.html) (PGP data), [Troff](https://codemirror.net/mode/troff/index.html), and [CMake](https://codemirror.net/mode/cmake/index.html).
-*   Remove SmartyMixed mode, rewrite [Smarty](https://codemirror.net/mode/smarty/index.html) mode to supersede it.
-*   New commands in the [merge addon](https://codemirror.net/doc/manual.html#addon_merge): `goNextDiff` and `goPrevDiff`.
-*   The [closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets) can now be configured per mode.
+*   New modes: [ASCII armor](https://codemirror.net/5/mode/asciiarmor/index.html) (PGP data), [Troff](https://codemirror.net/5/mode/troff/index.html), and [CMake](https://codemirror.net/5/mode/cmake/index.html).
+*   Remove SmartyMixed mode, rewrite [Smarty](https://codemirror.net/5/mode/smarty/index.html) mode to supersede it.
+*   New commands in the [merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): `goNextDiff` and `goPrevDiff`.
+*   The [closebrackets addon](https://codemirror.net/5/doc/manual.html#addon_closebrackets) can now be configured per mode.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/5.0.0...5.1.0).
 
 ## 5.0.0 (2015-02-20)
 
 *   Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)
-*   New option [`inputStyle`](https://codemirror.net/doc/manual.html#option_inputStyle) to switch between hidden textarea and contenteditable input.
-*   The [`getInputField`](https://codemirror.net/doc/manual.html#getInputField) method is no longer guaranteed to return a textarea.
+*   New option [`inputStyle`](https://codemirror.net/5/doc/manual.html#option_inputStyle) to switch between hidden textarea and contenteditable input.
+*   The [`getInputField`](https://codemirror.net/5/doc/manual.html#getInputField) method is no longer guaranteed to return a textarea.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.13.0...5.0.0).
 
 ## 4.13.0 (2015-02-20)
 
-*   Fix the way the [`closetag`](https://codemirror.net/demo/closetag.html) demo handles the slash character.
-*   New modes: [Forth](https://codemirror.net/mode/forth/index.html), [Stylus](https://codemirror.net/mode/stylus/index.html).
-*   Make the [CSS mode](https://codemirror.net/mode/css/index.html) understand some modern CSS extensions.
-*   Have the [Scala mode](https://codemirror.net/mode/clike/index.html) handle symbols and triple-quoted strings.
+*   Fix the way the [`closetag`](https://codemirror.net/5/demo/closetag.html) demo handles the slash character.
+*   New modes: [Forth](https://codemirror.net/5/mode/forth/index.html), [Stylus](https://codemirror.net/5/mode/stylus/index.html).
+*   Make the [CSS mode](https://codemirror.net/5/mode/css/index.html) understand some modern CSS extensions.
+*   Have the [Scala mode](https://codemirror.net/5/mode/clike/index.html) handle symbols and triple-quoted strings.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0).
 
 ## 4.12.0 (2015-01-22)
 
-*   The [`closetag`](https://codemirror.net/doc/manual.html#addon_closetag) addon now defines a `"closeTag"` command.
-*   Adds a `findModeByFileName` to the [mode metadata](https://codemirror.net/doc/manual.html#addon_meta) addon.
-*   [Simple mode](https://codemirror.net/demo/simplemode.html) rules can now contain a `sol` property to only match at the start of a line.
-*   New addon: [`selection-pointer`](https://codemirror.net/doc/manual.html#addon_selection-pointer) to style the mouse cursor over the selection.
-*   Improvements to the [Sass mode](https://codemirror.net/mode/sass/index.html)'s indentation.
-*   The [Vim keymap](https://codemirror.net/demo/vim.html)'s search functionality now supports [scrollbar annotation](https://codemirror.net/doc/manual.html#addon_matchesonscrollbar).
+*   The [`closetag`](https://codemirror.net/5/doc/manual.html#addon_closetag) addon now defines a `"closeTag"` command.
+*   Adds a `findModeByFileName` to the [mode metadata](https://codemirror.net/5/doc/manual.html#addon_meta) addon.
+*   [Simple mode](https://codemirror.net/5/demo/simplemode.html) rules can now contain a `sol` property to only match at the start of a line.
+*   New addon: [`selection-pointer`](https://codemirror.net/5/doc/manual.html#addon_selection-pointer) to style the mouse cursor over the selection.
+*   Improvements to the [Sass mode](https://codemirror.net/5/mode/sass/index.html)'s indentation.
+*   The [Vim keymap](https://codemirror.net/5/demo/vim.html)'s search functionality now supports [scrollbar annotation](https://codemirror.net/5/doc/manual.html#addon_matchesonscrollbar).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.11.0...4.12.0).
 
 ## 4.11.0 (2015-01-09)
@@ -1637,65 +1637,65 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 
 ## 4.9.0 (2014-12-23)
 
-*   Overhauled scroll bar handling. Add pluggable [scrollbar implementations](https://codemirror.net/demo/simplescrollbars.html).
-*   Tweaked behavior for the [completion addons](https://codemirror.net/doc/manual.html#addon_show-hint) to not take text after cursor into account.
-*   Two new optional features in the [merge addon](https://codemirror.net/doc/manual.html#addon_merge): aligning editors, and folding unchanged text.
-*   New modes: [Dart](https://codemirror.net/mode/dart/index.html), [EBNF](https://codemirror.net/mode/ebnf/index.html), [spreadsheet](https://codemirror.net/mode/spreadsheet/index.html), and [Soy](https://codemirror.net/mode/soy/index.html).
-*   New [addon](https://codemirror.net/demo/panel.html) to show persistent panels below/above an editor.
-*   New themes: [zenburn](https://codemirror.net/demo/theme.html#zenburn) and [tomorrow night bright](https://codemirror.net/demo/theme.html#tomorrow-night-bright).
+*   Overhauled scroll bar handling. Add pluggable [scrollbar implementations](https://codemirror.net/5/demo/simplescrollbars.html).
+*   Tweaked behavior for the [completion addons](https://codemirror.net/5/doc/manual.html#addon_show-hint) to not take text after cursor into account.
+*   Two new optional features in the [merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): aligning editors, and folding unchanged text.
+*   New modes: [Dart](https://codemirror.net/5/mode/dart/index.html), [EBNF](https://codemirror.net/5/mode/ebnf/index.html), [spreadsheet](https://codemirror.net/5/mode/spreadsheet/index.html), and [Soy](https://codemirror.net/5/mode/soy/index.html).
+*   New [addon](https://codemirror.net/5/demo/panel.html) to show persistent panels below/above an editor.
+*   New themes: [zenburn](https://codemirror.net/5/demo/theme.html#zenburn) and [tomorrow night bright](https://codemirror.net/5/demo/theme.html#tomorrow-night-bright).
 *   Allow ctrl-click to clear existing cursors.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.8.0...4.9.0).
 
 ## 4.8.0 (2014-11-22)
 
-*   Built-in support for [multi-stroke key bindings](https://codemirror.net/doc/manual.html#normalizeKeyMap).
-*   New method: [`getLineTokens`](https://codemirror.net/doc/manual.html#getLineTokens).
-*   New modes: [dockerfile](https://codemirror.net/mode/dockerfile/index.html), [IDL](https://codemirror.net/mode/idl/index.html), [Objective C](https://codemirror.net/mode/clike/index.html) (crude).
-*   Support styling of gutter backgrounds, allow `"gutter"` styles in [`addLineClass`](https://codemirror.net/doc/manual.html#addLineClass).
-*   Many improvements to the [Vim mode](https://codemirror.net/demo/vim.html), rewritten visual mode.
-*   Improvements to modes: [gfm](https://codemirror.net/mode/gfm/index.html) (strikethrough), [SPARQL](https://codemirror.net/mode/sparql/index.html) (version 1.1 support), and [sTeX](https://codemirror.net/mode/stex/index.html) (no more runaway math mode).
+*   Built-in support for [multi-stroke key bindings](https://codemirror.net/5/doc/manual.html#normalizeKeyMap).
+*   New method: [`getLineTokens`](https://codemirror.net/5/doc/manual.html#getLineTokens).
+*   New modes: [dockerfile](https://codemirror.net/5/mode/dockerfile/index.html), [IDL](https://codemirror.net/5/mode/idl/index.html), [Objective C](https://codemirror.net/5/mode/clike/index.html) (crude).
+*   Support styling of gutter backgrounds, allow `"gutter"` styles in [`addLineClass`](https://codemirror.net/5/doc/manual.html#addLineClass).
+*   Many improvements to the [Vim mode](https://codemirror.net/5/demo/vim.html), rewritten visual mode.
+*   Improvements to modes: [gfm](https://codemirror.net/5/mode/gfm/index.html) (strikethrough), [SPARQL](https://codemirror.net/5/mode/sparql/index.html) (version 1.1 support), and [sTeX](https://codemirror.net/5/mode/stex/index.html) (no more runaway math mode).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.7.0...4.8.0).
 
 ## 4.7.0 (2014-10-20)
 
-*   **Incompatible**: The [lint addon](https://codemirror.net/demo/lint.html) now passes the editor's value as first argument to asynchronous lint functions, for consistency. The editor is still passed, as fourth argument.
+*   **Incompatible**: The [lint addon](https://codemirror.net/5/demo/lint.html) now passes the editor's value as first argument to asynchronous lint functions, for consistency. The editor is still passed, as fourth argument.
 *   Improved handling of unicode identifiers in modes for languages that support them.
-*   More mode improvements: [CoffeeScript](https://codemirror.net/mode/coffeescript/index.html) (indentation), [Verilog](https://codemirror.net/mode/verilog/index.html) (indentation), [Scala](https://codemirror.net/mode/clike/index.html) (indentation, triple-quoted strings), and [PHP](https://codemirror.net/mode/php/index.html) (interpolated variables in heredoc strings).
-*   New modes: [Textile](https://codemirror.net/mode/textile/index.html) and [Tornado templates](https://codemirror.net/mode/tornado/index.html).
-*   Experimental new [way to define modes](https://codemirror.net/demo/simplemode.html).
-*   Improvements to the [Vim bindings](https://codemirror.net/demo/vim.html): Arbitrary insert mode key mappings are now possible, and text objects are supported in visual mode.
-*   The mode [meta-information file](https://codemirror.net/mode/meta.js) now includes information about file extensions, and [helper functions](https://codemirror.net/doc/manual.html#addon_meta) `findModeByMIME` and `findModeByExtension`.
+*   More mode improvements: [CoffeeScript](https://codemirror.net/5/mode/coffeescript/index.html) (indentation), [Verilog](https://codemirror.net/5/mode/verilog/index.html) (indentation), [Scala](https://codemirror.net/5/mode/clike/index.html) (indentation, triple-quoted strings), and [PHP](https://codemirror.net/5/mode/php/index.html) (interpolated variables in heredoc strings).
+*   New modes: [Textile](https://codemirror.net/5/mode/textile/index.html) and [Tornado templates](https://codemirror.net/5/mode/tornado/index.html).
+*   Experimental new [way to define modes](https://codemirror.net/5/demo/simplemode.html).
+*   Improvements to the [Vim bindings](https://codemirror.net/5/demo/vim.html): Arbitrary insert mode key mappings are now possible, and text objects are supported in visual mode.
+*   The mode [meta-information file](https://codemirror.net/5/mode/meta.js) now includes information about file extensions, and [helper functions](https://codemirror.net/5/doc/manual.html#addon_meta) `findModeByMIME` and `findModeByExtension`.
 *   New logo!
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.6.0...4.7.0).
 
 ## 4.6.0 (2014-09-19)
 
-*   New mode: [Modelica](https://codemirror.net/mode/modelica/index.html)
-*   New method: [`findWordAt`](https://codemirror.net/doc/manual.html#findWordAt)
-*   Make it easier to [use text background styling](https://codemirror.net/demo/markselection.html)
+*   New mode: [Modelica](https://codemirror.net/5/mode/modelica/index.html)
+*   New method: [`findWordAt`](https://codemirror.net/5/doc/manual.html#findWordAt)
+*   Make it easier to [use text background styling](https://codemirror.net/5/demo/markselection.html)
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.5.0...4.6.0).
 
 ## 4.5.0 (2014-08-21)
 
 *   Fix several serious bugs with horizontal scrolling
-*   New mode: [Slim](https://codemirror.net/mode/slim/index.html)
-*   New command: [`goLineLeftSmart`](https://codemirror.net/doc/manual.html#command_goLineLeftSmart)
-*   More fixes and extensions for the [Vim](https://codemirror.net/demo/vim.html) visual block mode
+*   New mode: [Slim](https://codemirror.net/5/mode/slim/index.html)
+*   New command: [`goLineLeftSmart`](https://codemirror.net/5/doc/manual.html#command_goLineLeftSmart)
+*   More fixes and extensions for the [Vim](https://codemirror.net/5/demo/vim.html) visual block mode
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.4.0...4.5.0).
 
 ## 4.4.0 (2014-07-21)
 
 *   **Note:** Some events might now fire in slightly different order (`"change"` is still guaranteed to fire before `"cursorActivity"`)
 *   Nested operations in multiple editors are now synced (complete at same time, reducing DOM reflows)
-*   Visual block mode for [vim](https://codemirror.net/demo/vim.html) (<C-v>) is nearly complete
-*   New mode: [Kotlin](https://codemirror.net/mode/kotlin/index.html)
+*   Visual block mode for [vim](https://codemirror.net/5/demo/vim.html) (<C-v>) is nearly complete
+*   New mode: [Kotlin](https://codemirror.net/5/mode/kotlin/index.html)
 *   Better multi-selection paste for text copied from multiple CodeMirror selections
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.3.0...4.4.0).
 
 ## 4.3.0 (2014-06-23)
 
-*   Several [vim bindings](https://codemirror.net/demo/vim.html) improvements: search and exCommand history, global flag for `:substitute`, `:global` command.
-*   Allow hiding the cursor by setting [`cursorBlinkRate`](https://codemirror.net/doc/manual.html#option_cursorBlinkRate) to a negative value.
+*   Several [vim bindings](https://codemirror.net/5/demo/vim.html) improvements: search and exCommand history, global flag for `:substitute`, `:global` command.
+*   Allow hiding the cursor by setting [`cursorBlinkRate`](https://codemirror.net/5/doc/manual.html#option_cursorBlinkRate) to a negative value.
 *   Make gutter markers themeable, use this in foldgutter.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.2.0...4.3.0).
 
@@ -1704,22 +1704,22 @@ Emergency single-patch update to 4.9\. Fixes Firefox-specific problem where the
 *   Fix problem where some modes were broken by the fact that empty tokens were forbidden.
 *   Several fixes to context menu handling.
 *   On undo, scroll _change_, not cursor, into view.
-*   Rewritten [Jade](https://codemirror.net/mode/jade/index.html) mode.
-*   Various improvements to [Shell](https://codemirror.net/mode/shell/index.html) (support for more syntax) and [Python](https://codemirror.net/mode/python/index.html) (better indentation) modes.
-*   New mode: [Cypher](https://codemirror.net/mode/cypher/index.html).
-*   New theme: [Neo](https://codemirror.net/demo/theme.html#neo).
-*   Support direct styling options (color, line style, width) in the [rulers](https://codemirror.net/doc/manual.html#addon_rulers) addon.
-*   Recognize per-editor configuration for the [show-hint](https://codemirror.net/doc/manual.html#addon_show-hint) and [foldcode](https://codemirror.net/doc/manual.html#addon_foldcode) addons.
-*   More intelligent scanning for existing close tags in [closetag](https://codemirror.net/doc/manual.html#addon_closetag) addon.
-*   In the [Vim bindings](https://codemirror.net/demo/vim.html): Fix bracket matching, support case conversion in visual mode, visual paste, append action.
+*   Rewritten [Jade](https://codemirror.net/5/mode/jade/index.html) mode.
+*   Various improvements to [Shell](https://codemirror.net/5/mode/shell/index.html) (support for more syntax) and [Python](https://codemirror.net/5/mode/python/index.html) (better indentation) modes.
+*   New mode: [Cypher](https://codemirror.net/5/mode/cypher/index.html).
+*   New theme: [Neo](https://codemirror.net/5/demo/theme.html#neo).
+*   Support direct styling options (color, line style, width) in the [rulers](https://codemirror.net/5/doc/manual.html#addon_rulers) addon.
+*   Recognize per-editor configuration for the [show-hint](https://codemirror.net/5/doc/manual.html#addon_show-hint) and [foldcode](https://codemirror.net/5/doc/manual.html#addon_foldcode) addons.
+*   More intelligent scanning for existing close tags in [closetag](https://codemirror.net/5/doc/manual.html#addon_closetag) addon.
+*   In the [Vim bindings](https://codemirror.net/5/demo/vim.html): Fix bracket matching, support case conversion in visual mode, visual paste, append action.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.1.0...4.2.0).
 
 ## 4.1.0 (2014-04-22)
 
-*   _Slightly incompatible_: The [`"cursorActivity"`](https://codemirror.net/doc/manual.html#event_cursorActivity) event now fires after all other events for the operation (and only for handlers that were actually registered at the time the activity happened).
-*   New command: [`insertSoftTab`](https://codemirror.net/doc/manual.html#command_insertSoftTab).
-*   New mode: [Django](https://codemirror.net/mode/django/index.html).
-*   Improved modes: [Verilog](https://codemirror.net/mode/verilog/index.html) (rewritten), [Jinja2](https://codemirror.net/mode/jinja2/index.html), [Haxe](https://codemirror.net/mode/haxe/index.html), [PHP](https://codemirror.net/mode/php/index.html) (string interpolation highlighted), [JavaScript](https://codemirror.net/mode/javascript/index.html) (indentation of trailing else, template strings), [LiveScript](https://codemirror.net/mode/livescript/index.html) (multi-line strings).
+*   _Slightly incompatible_: The [`"cursorActivity"`](https://codemirror.net/5/doc/manual.html#event_cursorActivity) event now fires after all other events for the operation (and only for handlers that were actually registered at the time the activity happened).
+*   New command: [`insertSoftTab`](https://codemirror.net/5/doc/manual.html#command_insertSoftTab).
+*   New mode: [Django](https://codemirror.net/5/mode/django/index.html).
+*   Improved modes: [Verilog](https://codemirror.net/5/mode/verilog/index.html) (rewritten), [Jinja2](https://codemirror.net/5/mode/jinja2/index.html), [Haxe](https://codemirror.net/5/mode/haxe/index.html), [PHP](https://codemirror.net/5/mode/php/index.html) (string interpolation highlighted), [JavaScript](https://codemirror.net/5/mode/javascript/index.html) (indentation of trailing else, template strings), [LiveScript](https://codemirror.net/5/mode/livescript/index.html) (multi-line strings).
 *   Many small issues from the 3.x→4.x transition were found and fixed.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/4.0.3...4.1.0).
 
@@ -1729,45 +1729,45 @@ Merges the improvements from 4.1 that could easily be applied to the 3.x code. A
 
 ## 3.23.0 (2014-03-20)
 
-*   In the [XML mode](https://codemirror.net/mode/xml/index.html), add `brackets` style to angle brackets, fix case-sensitivity of tags for HTML.
-*   New mode: [Dylan](https://codemirror.net/mode/dylan/index.html).
-*   Many improvements to the [Vim bindings](https://codemirror.net/demo/vim.html).
+*   In the [XML mode](https://codemirror.net/5/mode/xml/index.html), add `brackets` style to angle brackets, fix case-sensitivity of tags for HTML.
+*   New mode: [Dylan](https://codemirror.net/5/mode/dylan/index.html).
+*   Many improvements to the [Vim bindings](https://codemirror.net/5/demo/vim.html).
 
 ## 3.22.0 (2014-02-21)
 
-*   Adds the [`findMarks`](https://codemirror.net/doc/manual.html#findMarks) method.
-*   New addons: [rulers](https://codemirror.net/doc/manual.html#addon_rulers), markdown-fold, yaml-lint.
-*   New theme: [mdn-like](https://codemirror.net/demo/theme.html#mdn-like).
-*   New mode: [Solr](https://codemirror.net/mode/solr/index.html).
+*   Adds the [`findMarks`](https://codemirror.net/5/doc/manual.html#findMarks) method.
+*   New addons: [rulers](https://codemirror.net/5/doc/manual.html#addon_rulers), markdown-fold, yaml-lint.
+*   New theme: [mdn-like](https://codemirror.net/5/demo/theme.html#mdn-like).
+*   New mode: [Solr](https://codemirror.net/5/mode/solr/index.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.21.0...3.22.0).
 
 ## 3.21.0 (2014-01-16)
 
 *   Auto-indenting a block will no longer add trailing whitespace to blank lines.
-*   Marking text has a new option [`clearWhenEmpty`](https://codemirror.net/doc/manual.html#markText) to control auto-removal.
+*   Marking text has a new option [`clearWhenEmpty`](https://codemirror.net/5/doc/manual.html#markText) to control auto-removal.
 *   Several bugfixes in the handling of bidirectional text.
-*   The [XML](https://codemirror.net/mode/xml/index.html) and [CSS](https://codemirror.net/mode/css/index.html) modes were largely rewritten. [LESS](https://codemirror.net/mode/css/less.html) support was added to the CSS mode.
-*   The OCaml mode was moved to an [mllike](https://codemirror.net/mode/mllike/index.html) mode, F# support added.
-*   Make it possible to fetch multiple applicable helper values with [`getHelpers`](https://codemirror.net/doc/manual.html#getHelpers), and to register helpers matched on predicates with [`registerGlobalHelper`](https://codemirror.net/doc/manual.html#registerGlobalHelper).
-*   New theme [pastel-on-dark](https://codemirror.net/demo/theme.html#pastel-on-dark).
-*   Better ECMAScript 6 support in [JavaScript](https://codemirror.net/mode/javascript/index.html) mode.
+*   The [XML](https://codemirror.net/5/mode/xml/index.html) and [CSS](https://codemirror.net/5/mode/css/index.html) modes were largely rewritten. [LESS](https://codemirror.net/5/mode/css/less.html) support was added to the CSS mode.
+*   The OCaml mode was moved to an [mllike](https://codemirror.net/5/mode/mllike/index.html) mode, F# support added.
+*   Make it possible to fetch multiple applicable helper values with [`getHelpers`](https://codemirror.net/5/doc/manual.html#getHelpers), and to register helpers matched on predicates with [`registerGlobalHelper`](https://codemirror.net/5/doc/manual.html#registerGlobalHelper).
+*   New theme [pastel-on-dark](https://codemirror.net/5/demo/theme.html#pastel-on-dark).
+*   Better ECMAScript 6 support in [JavaScript](https://codemirror.net/5/mode/javascript/index.html) mode.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.20.0...3.21.0).
 
 ## 3.20.0 (2013-11-21)
 
-*   New modes: [Julia](https://codemirror.net/mode/julia/index.html) and [PEG.js](https://codemirror.net/mode/pegjs/index.html).
-*   Support ECMAScript 6 in the [JavaScript mode](https://codemirror.net/mode/javascript/index.html).
-*   Improved indentation for the [CoffeeScript mode](https://codemirror.net/mode/coffeescript/index.html).
-*   Make non-printable-character representation [configurable](https://codemirror.net/doc/manual.html#option_specialChars).
-*   Add ‘notification’ functionality to [dialog](https://codemirror.net/doc/manual.html#addon_dialog) addon.
+*   New modes: [Julia](https://codemirror.net/5/mode/julia/index.html) and [PEG.js](https://codemirror.net/5/mode/pegjs/index.html).
+*   Support ECMAScript 6 in the [JavaScript mode](https://codemirror.net/5/mode/javascript/index.html).
+*   Improved indentation for the [CoffeeScript mode](https://codemirror.net/5/mode/coffeescript/index.html).
+*   Make non-printable-character representation [configurable](https://codemirror.net/5/doc/manual.html#option_specialChars).
+*   Add ‘notification’ functionality to [dialog](https://codemirror.net/5/doc/manual.html#addon_dialog) addon.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.19.0...3.20.0).
 
 ## 3.19.0 (2013-10-21)
 
-*   New modes: [Eiffel](https://codemirror.net/mode/eiffel/index.html), [Gherkin](https://codemirror.net/mode/gherkin/index.html), [MSSQL dialect](https://codemirror.net/mode/sql/?mime=text/x-mssql).
-*   New addons: [hardwrap](https://codemirror.net/doc/manual.html#addon_hardwrap), [sql-hint](https://codemirror.net/doc/manual.html#addon_sql-hint).
-*   New theme: [MBO](https://codemirror.net/demo/theme.html#mbo).
-*   Add [support](https://codemirror.net/doc/manual.html#token_style_line) for line-level styling from mode tokenizers.
+*   New modes: [Eiffel](https://codemirror.net/5/mode/eiffel/index.html), [Gherkin](https://codemirror.net/5/mode/gherkin/index.html), [MSSQL dialect](https://codemirror.net/5/mode/sql/?mime=text/x-mssql).
+*   New addons: [hardwrap](https://codemirror.net/5/doc/manual.html#addon_hardwrap), [sql-hint](https://codemirror.net/5/doc/manual.html#addon_sql-hint).
+*   New theme: [MBO](https://codemirror.net/5/demo/theme.html#mbo).
+*   Add [support](https://codemirror.net/5/doc/manual.html#token_style_line) for line-level styling from mode tokenizers.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.18.0...3.19.0).
 
 ## 3.18.0 (2013-09-23)
@@ -1776,70 +1776,70 @@ Emergency release to fix a problem in 3.17 where `.setOption("lineNumbers", fals
 
 ## 3.17.0 (2013-09-23)
 
-*   New modes: [Fortran](https://codemirror.net/mode/fortran/index.html), [Octave](https://codemirror.net/mode/octave/index.html) (Matlab), [TOML](https://codemirror.net/mode/toml/index.html), and [DTD](https://codemirror.net/mode/dtd/index.html).
-*   New addons: [`css-lint`](https://codemirror.net/addon/lint/css-lint.js), [`css-hint`](https://codemirror.net/doc/manual.html#addon_css-hint).
+*   New modes: [Fortran](https://codemirror.net/5/mode/fortran/index.html), [Octave](https://codemirror.net/5/mode/octave/index.html) (Matlab), [TOML](https://codemirror.net/5/mode/toml/index.html), and [DTD](https://codemirror.net/5/mode/dtd/index.html).
+*   New addons: [`css-lint`](https://codemirror.net/5/addon/lint/css-lint.js), [`css-hint`](https://codemirror.net/5/doc/manual.html#addon_css-hint).
 *   Improve resilience to CSS 'frameworks' that globally mess up `box-sizing`.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.16.0...3.17.0).
 
 ## 3.16.0 (2013-08-21)
 
-*   The whole codebase is now under a single [license](https://codemirror.net/LICENSE) file.
+*   The whole codebase is now under a single [license](https://codemirror.net/5/LICENSE) file.
 *   The project page was overhauled and redesigned.
-*   New themes: [Paraiso](https://codemirror.net/demo/theme.html#paraiso-dark) ([light](https://codemirror.net/demo/theme.html#paraiso-light)), [The Matrix](https://codemirror.net/demo/theme.html#the-matrix).
-*   Improved interaction between themes and [active-line](https://codemirror.net/doc/manual.html#addon_active-line)/[matchbrackets](https://codemirror.net/doc/manual.html#addon_matchbrackets) addons.
-*   New [folding](https://codemirror.net/doc/manual.html#addon_foldcode) function `CodeMirror.fold.comment`.
-*   Added [fullscreen](https://codemirror.net/doc/manual.html#addon_fullscreen) addon.
+*   New themes: [Paraiso](https://codemirror.net/5/demo/theme.html#paraiso-dark) ([light](https://codemirror.net/5/demo/theme.html#paraiso-light)), [The Matrix](https://codemirror.net/5/demo/theme.html#the-matrix).
+*   Improved interaction between themes and [active-line](https://codemirror.net/5/doc/manual.html#addon_active-line)/[matchbrackets](https://codemirror.net/5/doc/manual.html#addon_matchbrackets) addons.
+*   New [folding](https://codemirror.net/5/doc/manual.html#addon_foldcode) function `CodeMirror.fold.comment`.
+*   Added [fullscreen](https://codemirror.net/5/doc/manual.html#addon_fullscreen) addon.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.15.0...3.16.0).
 
 ## 3.15.0 (2013-07-29)
 
-*   New modes: [Jade](https://codemirror.net/mode/jade/index.html), [Nginx](https://codemirror.net/mode/nginx/index.html).
-*   New addons: [Tern](https://codemirror.net/demo/tern.html), [matchtags](https://codemirror.net/doc/manual.html#addon_matchtags), and [foldgutter](https://codemirror.net/doc/manual.html#addon_foldgutter).
-*   Introduced [_helper_](https://codemirror.net/doc/manual.html#getHelper) concept ([context](https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ)).
-*   New method: [`getModeAt`](https://codemirror.net/doc/manual.html#getModeAt).
-*   New themes: base16 [dark](https://codemirror.net/demo/theme.html#base16-dark)/[light](https://codemirror.net/demo/theme.html#base16-light), 3024 [dark](https://codemirror.net/demo/theme.html#3024-night)/[light](https://codemirror.net/demo/theme.html#3024-day), [tomorrow-night](https://codemirror.net/demo/theme.html#tomorrow-night-eighties).
+*   New modes: [Jade](https://codemirror.net/5/mode/jade/index.html), [Nginx](https://codemirror.net/5/mode/nginx/index.html).
+*   New addons: [Tern](https://codemirror.net/5/demo/tern.html), [matchtags](https://codemirror.net/5/doc/manual.html#addon_matchtags), and [foldgutter](https://codemirror.net/5/doc/manual.html#addon_foldgutter).
+*   Introduced [_helper_](https://codemirror.net/5/doc/manual.html#getHelper) concept ([context](https://groups.google.com/forum/#!msg/codemirror/cOc0xvUUEUU/nLrX1-qnidgJ)).
+*   New method: [`getModeAt`](https://codemirror.net/5/doc/manual.html#getModeAt).
+*   New themes: base16 [dark](https://codemirror.net/5/demo/theme.html#base16-dark)/[light](https://codemirror.net/5/demo/theme.html#base16-light), 3024 [dark](https://codemirror.net/5/demo/theme.html#3024-night)/[light](https://codemirror.net/5/demo/theme.html#3024-day), [tomorrow-night](https://codemirror.net/5/demo/theme.html#tomorrow-night-eighties).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.14.0...3.15.0).
 
 ## 3.14.0 (2013-06-20)
 
-*   New addons: [trailing space highlight](https://codemirror.net/doc/manual.html#addon_trailingspace), [XML completion](https://codemirror.net/doc/manual.html#addon_xml-hint) (rewritten), and [diff merging](https://codemirror.net/doc/manual.html#addon_merge).
-*   [`markText`](https://codemirror.net/doc/manual.html#markText) and [`addLineWidget`](https://codemirror.net/doc/manual.html#addLineWidget) now take a `handleMouseEvents` option.
-*   New methods: [`lineAtHeight`](https://codemirror.net/doc/manual.html#lineAtHeight), [`getTokenTypeAt`](https://codemirror.net/doc/manual.html#getTokenTypeAt).
-*   More precise cleanness-tracking using [`changeGeneration`](https://codemirror.net/doc/manual.html#changeGeneration) and [`isClean`](https://codemirror.net/doc/manual.html#isClean).
-*   Many extensions to [Emacs](https://codemirror.net/demo/emacs.html) mode (prefixes, more navigation units, and more).
-*   New events [`"keyHandled"`](https://codemirror.net/doc/manual.html#event_keyHandled) and [`"inputRead"`](https://codemirror.net/doc/manual.html#event_inputRead).
-*   Various improvements to [Ruby](https://codemirror.net/mode/ruby/index.html), [Smarty](https://codemirror.net/mode/smarty/index.html), [SQL](https://codemirror.net/mode/sql/index.html), and [Vim](https://codemirror.net/demo/vim.html) modes.
+*   New addons: [trailing space highlight](https://codemirror.net/5/doc/manual.html#addon_trailingspace), [XML completion](https://codemirror.net/5/doc/manual.html#addon_xml-hint) (rewritten), and [diff merging](https://codemirror.net/5/doc/manual.html#addon_merge).
+*   [`markText`](https://codemirror.net/5/doc/manual.html#markText) and [`addLineWidget`](https://codemirror.net/5/doc/manual.html#addLineWidget) now take a `handleMouseEvents` option.
+*   New methods: [`lineAtHeight`](https://codemirror.net/5/doc/manual.html#lineAtHeight), [`getTokenTypeAt`](https://codemirror.net/5/doc/manual.html#getTokenTypeAt).
+*   More precise cleanness-tracking using [`changeGeneration`](https://codemirror.net/5/doc/manual.html#changeGeneration) and [`isClean`](https://codemirror.net/5/doc/manual.html#isClean).
+*   Many extensions to [Emacs](https://codemirror.net/5/demo/emacs.html) mode (prefixes, more navigation units, and more).
+*   New events [`"keyHandled"`](https://codemirror.net/5/doc/manual.html#event_keyHandled) and [`"inputRead"`](https://codemirror.net/5/doc/manual.html#event_inputRead).
+*   Various improvements to [Ruby](https://codemirror.net/5/mode/ruby/index.html), [Smarty](https://codemirror.net/5/mode/smarty/index.html), [SQL](https://codemirror.net/5/mode/sql/index.html), and [Vim](https://codemirror.net/5/demo/vim.html) modes.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/3.13.0...3.14.0).
 
 ## 3.13.0 (2013-05-20)
 
-*   New modes: [COBOL](https://codemirror.net/mode/cobol/index.html) and [HAML](https://codemirror.net/mode/haml/index.html).
-*   New options: [`cursorScrollMargin`](https://codemirror.net/doc/manual.html#option_cursorScrollMargin) and [`coverGutterNextToScrollbar`](https://codemirror.net/doc/manual.html#option_coverGutterNextToScrollbar).
-*   New addon: [commenting](https://codemirror.net/doc/manual.html#addon_comment).
-*   More features added to the [Vim keymap](https://codemirror.net/demo/vim.html).
+*   New modes: [COBOL](https://codemirror.net/5/mode/cobol/index.html) and [HAML](https://codemirror.net/5/mode/haml/index.html).
+*   New options: [`cursorScrollMargin`](https://codemirror.net/5/doc/manual.html#option_cursorScrollMargin) and [`coverGutterNextToScrollbar`](https://codemirror.net/5/doc/manual.html#option_coverGutterNextToScrollbar).
+*   New addon: [commenting](https://codemirror.net/5/doc/manual.html#addon_comment).
+*   More features added to the [Vim keymap](https://codemirror.net/5/demo/vim.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.12...3.13.0).
 
 ## 3.12.0 (2013-04-19)
 
-*   New mode: [GNU assembler](https://codemirror.net/mode/gas/index.html).
-*   New options: [`maxHighlightLength`](https://codemirror.net/doc/manual.html#option_maxHighlightLength) and [`historyEventDelay`](https://codemirror.net/doc/manual.html#option_historyEventDelay).
-*   Added [`addToHistory`](https://codemirror.net/doc/manual.html#mark_addToHistory) option for `markText`.
+*   New mode: [GNU assembler](https://codemirror.net/5/mode/gas/index.html).
+*   New options: [`maxHighlightLength`](https://codemirror.net/5/doc/manual.html#option_maxHighlightLength) and [`historyEventDelay`](https://codemirror.net/5/doc/manual.html#option_historyEventDelay).
+*   Added [`addToHistory`](https://codemirror.net/5/doc/manual.html#mark_addToHistory) option for `markText`.
 *   Various fixes to JavaScript tokenization and indentation corner cases.
 *   Further improvements to the vim mode.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.11...v3.12).
 
 ## 3.11.0 (2013-03-20)
 
-*   **Removed code:** `collapserange`, `formatting`, and `simple-hint` addons. `plsql` and `mysql` modes (use [`sql`](https://codemirror.net/mode/sql/index.html) mode).
-*   **Moved code:** the range-finding functions for folding now have [their own files](https://codemirror.net/addon/fold/).
-*   **Changed interface:** the [`continuecomment`](https://codemirror.net/doc/manual.html#addon_continuecomment) addon now exposes an option, rather than a command.
-*   New modes: [SCSS](https://codemirror.net/mode/css/scss.html), [Tcl](https://codemirror.net/mode/tcl/index.html), [LiveScript](https://codemirror.net/mode/livescript/index.html), and [mIRC](https://codemirror.net/mode/mirc/index.html).
-*   New addons: [`placeholder`](https://codemirror.net/demo/placeholder.html), [HTML completion](https://codemirror.net/demo/html5complete.html).
-*   New methods: [`hasFocus`](https://codemirror.net/doc/manual.html#hasFocus), [`defaultCharWidth`](https://codemirror.net/doc/manual.html#defaultCharWidth).
-*   New events: [`beforeCursorEnter`](https://codemirror.net/doc/manual.html#event_beforeCursorEnter), [`renderLine`](https://codemirror.net/doc/manual.html#event_renderLine).
-*   Many improvements to the [`show-hint`](https://codemirror.net/doc/manual.html#addon_show-hint) completion dialog addon.
+*   **Removed code:** `collapserange`, `formatting`, and `simple-hint` addons. `plsql` and `mysql` modes (use [`sql`](https://codemirror.net/5/mode/sql/index.html) mode).
+*   **Moved code:** the range-finding functions for folding now have [their own files](https://codemirror.net/5/addon/fold/).
+*   **Changed interface:** the [`continuecomment`](https://codemirror.net/5/doc/manual.html#addon_continuecomment) addon now exposes an option, rather than a command.
+*   New modes: [SCSS](https://codemirror.net/5/mode/css/scss.html), [Tcl](https://codemirror.net/5/mode/tcl/index.html), [LiveScript](https://codemirror.net/5/mode/livescript/index.html), and [mIRC](https://codemirror.net/5/mode/mirc/index.html).
+*   New addons: [`placeholder`](https://codemirror.net/5/demo/placeholder.html), [HTML completion](https://codemirror.net/5/demo/html5complete.html).
+*   New methods: [`hasFocus`](https://codemirror.net/5/doc/manual.html#hasFocus), [`defaultCharWidth`](https://codemirror.net/5/doc/manual.html#defaultCharWidth).
+*   New events: [`beforeCursorEnter`](https://codemirror.net/5/doc/manual.html#event_beforeCursorEnter), [`renderLine`](https://codemirror.net/5/doc/manual.html#event_renderLine).
+*   Many improvements to the [`show-hint`](https://codemirror.net/5/doc/manual.html#addon_show-hint) completion dialog addon.
 *   Tweak behavior of by-word cursor motion.
-*   Further improvements to the [vim mode](https://codemirror.net/demo/vim.html).
+*   Further improvements to the [vim mode](https://codemirror.net/5/demo/vim.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.1...v3.11).
 
 ## 3.02.0 (2013-01-25)
@@ -1848,36 +1848,36 @@ Single-bugfix release. Fixes a problem that prevents CodeMirror instances from b
 
 ## 3.01.0 (2013-01-21)
 
-*   Move all add-ons into an organized directory structure under [`/addon`](https://codemirror.net/addon/). **You might have to adjust your paths.**
-*   New modes: [D](https://codemirror.net/mode/d/index.html), [Sass](https://codemirror.net/mode/sass/index.html), [APL](https://codemirror.net/mode/apl/index.html), [SQL](https://codemirror.net/mode/sql/index.html) (configurable), and [Asterisk](https://codemirror.net/mode/asterisk/index.html).
+*   Move all add-ons into an organized directory structure under [`/addon`](https://codemirror.net/5/addon/). **You might have to adjust your paths.**
+*   New modes: [D](https://codemirror.net/5/mode/d/index.html), [Sass](https://codemirror.net/5/mode/sass/index.html), [APL](https://codemirror.net/5/mode/apl/index.html), [SQL](https://codemirror.net/5/mode/sql/index.html) (configurable), and [Asterisk](https://codemirror.net/5/mode/asterisk/index.html).
 *   Several bugfixes in right-to-left text support.
-*   Add [`rtlMoveVisually`](https://codemirror.net/doc/manual.html#option_rtlMoveVisually) option.
+*   Add [`rtlMoveVisually`](https://codemirror.net/5/doc/manual.html#option_rtlMoveVisually) option.
 *   Improvements to vim keymap.
-*   Add built-in (lightweight) [overlay mode](https://codemirror.net/doc/manual.html#addOverlay) support.
-*   Support `showIfHidden` option for [line widgets](https://codemirror.net/doc/manual.html#addLineWidget).
-*   Add simple [Python hinter](https://codemirror.net/doc/manual.html#addon_python-hint).
-*   Bring back the [`fixedGutter`](https://codemirror.net/doc/manual.html#option_fixedGutter) option.
+*   Add built-in (lightweight) [overlay mode](https://codemirror.net/5/doc/manual.html#addOverlay) support.
+*   Support `showIfHidden` option for [line widgets](https://codemirror.net/5/doc/manual.html#addLineWidget).
+*   Add simple [Python hinter](https://codemirror.net/5/doc/manual.html#addon_python-hint).
+*   Bring back the [`fixedGutter`](https://codemirror.net/5/doc/manual.html#option_fixedGutter) option.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.0...v3.01).
 
 ## 3.1.0 (2013-02-21)
 
 *   **Incompatible:** key handlers may now _return_, rather than _throw_ `CodeMirror.Pass` to signal they didn't handle the key.
-*   Make documents a [first-class construct](https://codemirror.net/doc/manual.html#api_doc), support split views and subviews.
-*   Add a [new module](https://codemirror.net/doc/manual.html#addon_show-hint) for showing completion hints. Deprecate `simple-hint.js`.
-*   Extend [htmlmixed mode](https://codemirror.net/mode/htmlmixed/index.html) to allow custom handling of script types.
-*   Support an `insertLeft` option to [`setBookmark`](https://codemirror.net/doc/manual.html#setBookmark).
-*   Add an [`eachLine`](https://codemirror.net/doc/manual.html#eachLine) method to iterate over a document.
-*   New addon modules: [selection marking](https://codemirror.net/demo/markselection.html), [linting](https://codemirror.net/demo/lint.html), and [automatic bracket closing](https://codemirror.net/demo/closebrackets.html).
-*   Add [`"beforeChange"`](https://codemirror.net/doc/manual.html#event_beforeChange) and [`"beforeSelectionChange"`](https://codemirror.net/doc/manual.html#event_beforeSelectionChange) events.
-*   Add [`"hide"`](https://codemirror.net/doc/manual.html#event_hide) and [`"unhide"`](https://codemirror.net/doc/manual.html#event_unhide) events to marked ranges.
-*   Fix [`coordsChar`](https://codemirror.net/doc/manual.html#coordsChar)'s interpretation of its argument to match the documentation.
-*   New modes: [Turtle](https://codemirror.net/mode/turtle/index.html) and [Q](https://codemirror.net/mode/q/index.html).
-*   Further improvements to the [vim mode](https://codemirror.net/demo/vim.html).
+*   Make documents a [first-class construct](https://codemirror.net/5/doc/manual.html#api_doc), support split views and subviews.
+*   Add a [new module](https://codemirror.net/5/doc/manual.html#addon_show-hint) for showing completion hints. Deprecate `simple-hint.js`.
+*   Extend [htmlmixed mode](https://codemirror.net/5/mode/htmlmixed/index.html) to allow custom handling of script types.
+*   Support an `insertLeft` option to [`setBookmark`](https://codemirror.net/5/doc/manual.html#setBookmark).
+*   Add an [`eachLine`](https://codemirror.net/5/doc/manual.html#eachLine) method to iterate over a document.
+*   New addon modules: [selection marking](https://codemirror.net/5/demo/markselection.html), [linting](https://codemirror.net/5/demo/lint.html), and [automatic bracket closing](https://codemirror.net/5/demo/closebrackets.html).
+*   Add [`"beforeChange"`](https://codemirror.net/5/doc/manual.html#event_beforeChange) and [`"beforeSelectionChange"`](https://codemirror.net/5/doc/manual.html#event_beforeSelectionChange) events.
+*   Add [`"hide"`](https://codemirror.net/5/doc/manual.html#event_hide) and [`"unhide"`](https://codemirror.net/5/doc/manual.html#event_unhide) events to marked ranges.
+*   Fix [`coordsChar`](https://codemirror.net/5/doc/manual.html#coordsChar)'s interpretation of its argument to match the documentation.
+*   New modes: [Turtle](https://codemirror.net/5/mode/turtle/index.html) and [Q](https://codemirror.net/5/mode/q/index.html).
+*   Further improvements to the [vim mode](https://codemirror.net/5/demo/vim.html).
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v3.01...v3.1).
 
 ## 3.0.0 (2012-12-10)
 
-**New major version**. Only partially backwards-compatible. See the [upgrading guide](https://codemirror.net/doc/upgrade_v3.html) for more information. Changes since release candidate 2:
+**New major version**. Only partially backwards-compatible. See the [upgrading guide](https://codemirror.net/5/doc/upgrade_v3.html) for more information. Changes since release candidate 2:
 
 *   Rewritten VIM mode.
 *   Fix a few minor scrolling and sizing issues.
@@ -1886,55 +1886,55 @@ Single-bugfix release. Fixes a problem that prevents CodeMirror instances from b
 
 ## 2.38.0 (2013-01-21)
 
-Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](https://codemirror.net/mode/d/index.html), [Sass](https://codemirror.net/mode/sass/index.html), [APL](https://codemirror.net/mode/apl/index.html)) from the v3 branch.
+Integrate some bugfixes, enhancements to the vim keymap, and new modes ([D](https://codemirror.net/5/mode/d/index.html), [Sass](https://codemirror.net/5/mode/sass/index.html), [APL](https://codemirror.net/5/mode/apl/index.html)) from the v3 branch.
 
 ## 2.37.0 (2012-12-20)
 
-*   New mode: [SQL](https://codemirror.net/mode/sql/index.html) (will replace [plsql](https://codemirror.net/mode/plsql/index.html) and [mysql](https://codemirror.net/mode/mysql/index.html) modes).
+*   New mode: [SQL](https://codemirror.net/5/mode/sql/index.html) (will replace [plsql](https://codemirror.net/5/mode/plsql/index.html) and [mysql](https://codemirror.net/5/mode/mysql/index.html) modes).
 *   Further work on the new VIM mode.
 *   Fix Cmd/Ctrl keys on recent Operas on OS X.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.36...v2.37).
 
 ## 2.36.0 (2012-11-20)
 
-*   New mode: [Z80 assembly](https://codemirror.net/mode/z80/index.html).
-*   New theme: [Twilight](https://codemirror.net/demo/theme.html#twilight).
+*   New mode: [Z80 assembly](https://codemirror.net/5/mode/z80/index.html).
+*   New theme: [Twilight](https://codemirror.net/5/demo/theme.html#twilight).
 *   Add command-line compression helper.
-*   Make [`scrollIntoView`](https://codemirror.net/doc/manual.html#scrollIntoView) public.
-*   Add [`defaultTextHeight`](https://codemirror.net/doc/manual.html#defaultTextHeight) method.
+*   Make [`scrollIntoView`](https://codemirror.net/5/doc/manual.html#scrollIntoView) public.
+*   Add [`defaultTextHeight`](https://codemirror.net/5/doc/manual.html#defaultTextHeight) method.
 *   Various extensions to the vim keymap.
-*   Make [PHP mode](https://codemirror.net/mode/php/index.html) build on [mixed HTML mode](https://codemirror.net/mode/htmlmixed/index.html).
-*   Add [comment-continuing](https://codemirror.net/doc/manual.html#addon_continuecomment) add-on.
-*   Full [list of patches](https://codemirror.net/https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36).
+*   Make [PHP mode](https://codemirror.net/5/mode/php/index.html) build on [mixed HTML mode](https://codemirror.net/5/mode/htmlmixed/index.html).
+*   Add [comment-continuing](https://codemirror.net/5/doc/manual.html#addon_continuecomment) add-on.
+*   Full [list of patches](https://codemirror.net/5/https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36).
 
 ## 2.35.0 (2012-10-22)
 
-*   New (sub) mode: [TypeScript](https://codemirror.net/mode/javascript/typescript.html).
+*   New (sub) mode: [TypeScript](https://codemirror.net/5/mode/javascript/typescript.html).
 *   Don't overwrite (insert key) when pasting.
-*   Fix several bugs in [`markText`](https://codemirror.net/doc/manual.html#markText)/undo interaction.
+*   Fix several bugs in [`markText`](https://codemirror.net/5/doc/manual.html#markText)/undo interaction.
 *   Better indentation of JavaScript code without semicolons.
-*   Add [`defineInitHook`](https://codemirror.net/doc/manual.html#defineInitHook) function.
+*   Add [`defineInitHook`](https://codemirror.net/5/doc/manual.html#defineInitHook) function.
 *   Full [list of patches](https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35).
 
 ## 2.34.0 (2012-09-19)
 
-*   New mode: [Common Lisp](https://codemirror.net/mode/commonlisp/index.html).
+*   New mode: [Common Lisp](https://codemirror.net/5/mode/commonlisp/index.html).
 *   Fix right-click select-all on most browsers.
 *   Change the way highlighting happens:
       Saves memory and CPU cycles.
       `compareStates` is no longer needed.
       `onHighlightComplete` no longer works.
 *   Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.
-*   Add a [`CodeMirror.version`](https://codemirror.net/doc/manual.html#version) property.
-*   More robust handling of nested modes in [formatting](https://codemirror.net/demo/formatting.html) and [closetag](https://codemirror.net/demo/closetag.html) plug-ins.
-*   Un/redo now preserves [marked text](https://codemirror.net/doc/manual.html#markText) and bookmarks.
+*   Add a [`CodeMirror.version`](https://codemirror.net/5/doc/manual.html#version) property.
+*   More robust handling of nested modes in [formatting](https://codemirror.net/5/demo/formatting.html) and [closetag](https://codemirror.net/5/demo/closetag.html) plug-ins.
+*   Un/redo now preserves [marked text](https://codemirror.net/5/doc/manual.html#markText) and bookmarks.
 *   [Full list](https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34) of patches.
 
 ## 2.33.0 (2012-08-23)
 
-*   New mode: [Sieve](https://codemirror.net/mode/sieve/index.html).
-*   New [`getViewPort`](https://codemirror.net/doc/manual.html#getViewport) and [`onViewportChange`](https://codemirror.net/doc/manual.html#option_onViewportChange) API.
-*   [Configurable](https://codemirror.net/doc/manual.html#option_cursorBlinkRate) cursor blink rate.
+*   New mode: [Sieve](https://codemirror.net/5/mode/sieve/index.html).
+*   New [`getViewPort`](https://codemirror.net/5/doc/manual.html#getViewport) and [`onViewportChange`](https://codemirror.net/5/doc/manual.html#option_onViewportChange) API.
+*   [Configurable](https://codemirror.net/5/doc/manual.html#option_cursorBlinkRate) cursor blink rate.
 *   Make binding a key to `false` disabling handling (again).
 *   Show non-printing characters as red dots.
 *   More tweaks to the scrolling model.
@@ -1948,28 +1948,28 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 
 ## 2.31.0 (2012-07-20)
 
-*   New modes: [OCaml](https://codemirror.net/mode/ocaml/index.html), [Haxe](https://codemirror.net/mode/haxe/index.html), and [VB.NET](https://codemirror.net/mode/vb/index.html).
+*   New modes: [OCaml](https://codemirror.net/5/mode/ocaml/index.html), [Haxe](https://codemirror.net/5/mode/haxe/index.html), and [VB.NET](https://codemirror.net/5/mode/vb/index.html).
 *   Several fixes to the new scrolling model.
-*   Add a [`setSize`](https://codemirror.net/doc/manual.html#setSize) method for programmatic resizing.
-*   Add [`getHistory`](https://codemirror.net/doc/manual.html#getHistory) and [`setHistory`](https://codemirror.net/doc/manual.html#setHistory) methods.
-*   Allow custom line separator string in [`getValue`](https://codemirror.net/doc/manual.html#getValue) and [`getRange`](https://codemirror.net/doc/manual.html#getRange).
+*   Add a [`setSize`](https://codemirror.net/5/doc/manual.html#setSize) method for programmatic resizing.
+*   Add [`getHistory`](https://codemirror.net/5/doc/manual.html#getHistory) and [`setHistory`](https://codemirror.net/5/doc/manual.html#setHistory) methods.
+*   Allow custom line separator string in [`getValue`](https://codemirror.net/5/doc/manual.html#getValue) and [`getRange`](https://codemirror.net/5/doc/manual.html#getRange).
 *   Support double- and triple-click drag, double-clicking whitespace.
 *   And more... [(all patches)](https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31)
 
 ## 2.30.0 (2012-06-22)
 
 *   **New scrollbar implementation**. Should flicker less. Changes DOM structure of the editor.
-*   New theme: [vibrant-ink](https://codemirror.net/demo/theme.html#vibrant-ink).
+*   New theme: [vibrant-ink](https://codemirror.net/5/demo/theme.html#vibrant-ink).
 *   Many extensions to the VIM keymap (including text objects).
-*   Add [mode-multiplexing](https://codemirror.net/demo/multiplex.html) utility script.
+*   Add [mode-multiplexing](https://codemirror.net/5/demo/multiplex.html) utility script.
 *   Fix bug where right-click paste works in read-only mode.
-*   Add a [`getScrollInfo`](https://codemirror.net/doc/manual.html#getScrollInfo) method.
+*   Add a [`getScrollInfo`](https://codemirror.net/5/doc/manual.html#getScrollInfo) method.
 *   Lots of other [fixes](https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3).
 
 ## 2.25.0 (2012-05-23)
 
-*   New mode: [Erlang](https://codemirror.net/mode/erlang/index.html).
-*   **Remove xmlpure mode** (use [xml.js](https://codemirror.net/mode/xml/index.html)).
+*   New mode: [Erlang](https://codemirror.net/5/mode/erlang/index.html).
+*   **Remove xmlpure mode** (use [xml.js](https://codemirror.net/5/mode/xml/index.html)).
 *   Fix line-wrapping in Opera.
 *   Fix X Windows middle-click paste in Chrome.
 *   Fix bug that broke pasting of huge documents.
@@ -1978,11 +1978,11 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
 ## 2.24.0 (2012-04-23)
 
 *   **Drop support for Internet Explorer 6**.
-*   New modes: [Shell](https://codemirror.net/mode/shell/index.html), [Tiki wiki](https://codemirror.net/mode/tiki/index.html), [Pig Latin](https://codemirror.net/mode/pig/index.html).
-*   New themes: [Ambiance](https://codemirror.net/demo/theme.html#ambiance), [Blackboard](https://codemirror.net/demo/theme.html#blackboard).
-*   More control over drag/drop with [`dragDrop`](https://codemirror.net/doc/manual.html#option_dragDrop) and [`onDragEvent`](https://codemirror.net/doc/manual.html#option_onDragEvent) options.
+*   New modes: [Shell](https://codemirror.net/5/mode/shell/index.html), [Tiki wiki](https://codemirror.net/5/mode/tiki/index.html), [Pig Latin](https://codemirror.net/5/mode/pig/index.html).
+*   New themes: [Ambiance](https://codemirror.net/5/demo/theme.html#ambiance), [Blackboard](https://codemirror.net/5/demo/theme.html#blackboard).
+*   More control over drag/drop with [`dragDrop`](https://codemirror.net/5/doc/manual.html#option_dragDrop) and [`onDragEvent`](https://codemirror.net/5/doc/manual.html#option_onDragEvent) options.
 *   Make HTML mode a bit less pedantic.
-*   Add [`compoundChange`](https://codemirror.net/doc/manual.html#compoundChange) API method.
+*   Add [`compoundChange`](https://codemirror.net/5/doc/manual.html#compoundChange) API method.
 *   Several fixes in undo history and line hiding.
 *   Remove (broken) support for `catchall` in key maps, add `nofallthrough` boolean field instead.
 
@@ -1993,47 +1993,47 @@ Emergency fix for a bug where an editor with line wrapping on IE will break when
     *   Shift-tab: Reset line indentation to default
     *   Ctrl/Cmd-[: Reduce line indentation (old tab behaviour)
     *   Ctrl/Cmd-]: Increase line indentation (old shift-tab behaviour)
-*   New modes: [XQuery](https://codemirror.net/mode/xquery/index.html) and [VBScript](https://codemirror.net/mode/vbscript/index.html).
-*   Two new themes: [lesser-dark](https://codemirror.net/mode/less/index.html) and [xq-dark](https://codemirror.net/mode/xquery/index.html).
-*   Differentiate between background and text styles in [`setLineClass`](https://codemirror.net/doc/manual.html#setLineClass).
+*   New modes: [XQuery](https://codemirror.net/5/mode/xquery/index.html) and [VBScript](https://codemirror.net/5/mode/vbscript/index.html).
+*   Two new themes: [lesser-dark](https://codemirror.net/5/mode/less/index.html) and [xq-dark](https://codemirror.net/5/mode/xquery/index.html).
+*   Differentiate between background and text styles in [`setLineClass`](https://codemirror.net/5/doc/manual.html#setLineClass).
 *   Fix drag-and-drop in IE9+.
-*   Extend [`charCoords`](https://codemirror.net/doc/manual.html#charCoords) and [`cursorCoords`](https://codemirror.net/doc/manual.html#cursorCoords) with a `mode` argument.
-*   Add [`autofocus`](https://codemirror.net/doc/manual.html#option_autofocus) option.
-*   Add [`findMarksAt`](https://codemirror.net/doc/manual.html#findMarksAt) method.
+*   Extend [`charCoords`](https://codemirror.net/5/doc/manual.html#charCoords) and [`cursorCoords`](https://codemirror.net/5/doc/manual.html#cursorCoords) with a `mode` argument.
+*   Add [`autofocus`](https://codemirror.net/5/doc/manual.html#option_autofocus) option.
+*   Add [`findMarksAt`](https://codemirror.net/5/doc/manual.html#findMarksAt) method.
 
 ## 2.22.0 (2012-02-27)
 
-*   Allow [key handlers](https://codemirror.net/doc/manual.html#keymaps) to pass up events, allow binding characters.
-*   Add [`autoClearEmptyLines`](https://codemirror.net/doc/manual.html#option_autoClearEmptyLines) option.
+*   Allow [key handlers](https://codemirror.net/5/doc/manual.html#keymaps) to pass up events, allow binding characters.
+*   Add [`autoClearEmptyLines`](https://codemirror.net/5/doc/manual.html#option_autoClearEmptyLines) option.
 *   Properly use tab stops when rendering tabs.
 *   Make PHP mode more robust.
-*   Support indentation blocks in [code folder](https://codemirror.net/doc/manual.html#addon_foldcode).
-*   Add a script for [highlighting instances of the selection](https://codemirror.net/doc/manual.html#addon_match-highlighter).
-*   New [.properties](https://codemirror.net/mode/properties/index.html) mode.
+*   Support indentation blocks in [code folder](https://codemirror.net/5/doc/manual.html#addon_foldcode).
+*   Add a script for [highlighting instances of the selection](https://codemirror.net/5/doc/manual.html#addon_match-highlighter).
+*   New [.properties](https://codemirror.net/5/mode/properties/index.html) mode.
 *   Fix many bugs.
 
 ## 2.21.0 (2012-01-27)
 
-*   Added [LESS](https://codemirror.net/mode/less/index.html), [MySQL](https://codemirror.net/mode/mysql/index.html), [Go](https://codemirror.net/mode/go/index.html), and [Verilog](https://codemirror.net/mode/verilog/index.html) modes.
-*   Add [`smartIndent`](https://codemirror.net/doc/manual.html#option_smartIndent) option.
-*   Support a cursor in [`readOnly`](https://codemirror.net/doc/manual.html#option_readOnly)-mode.
+*   Added [LESS](https://codemirror.net/5/mode/less/index.html), [MySQL](https://codemirror.net/5/mode/mysql/index.html), [Go](https://codemirror.net/5/mode/go/index.html), and [Verilog](https://codemirror.net/5/mode/verilog/index.html) modes.
+*   Add [`smartIndent`](https://codemirror.net/5/doc/manual.html#option_smartIndent) option.
+*   Support a cursor in [`readOnly`](https://codemirror.net/5/doc/manual.html#option_readOnly)-mode.
 *   Support assigning multiple styles to a token.
 *   Use a new approach to drawing the selection.
-*   Add [`scrollTo`](https://codemirror.net/doc/manual.html#scrollTo) method.
+*   Add [`scrollTo`](https://codemirror.net/5/doc/manual.html#scrollTo) method.
 *   Allow undo/redo events to span non-adjacent lines.
 *   Lots and lots of bugfixes.
 
 ## 2.20.0 (2011-12-20)
 
-*   Slightly incompatible API changes. Read [this](https://codemirror.net/doc/upgrade_v2.2.html).
-*   New approach to [binding](https://codemirror.net/doc/manual.html#option_extraKeys) keys, support for [custom bindings](https://codemirror.net/doc/manual.html#option_keyMap).
+*   Slightly incompatible API changes. Read [this](https://codemirror.net/5/doc/upgrade_v2.2.html).
+*   New approach to [binding](https://codemirror.net/5/doc/manual.html#option_extraKeys) keys, support for [custom bindings](https://codemirror.net/5/doc/manual.html#option_keyMap).
 *   Support for overwrite (insert).
-*   [Custom-width](https://codemirror.net/doc/manual.html#option_tabSize) and [styleable](https://codemirror.net/demo/visibletabs.html) tabs.
-*   Moved more code into [add-on scripts](https://codemirror.net/doc/manual.html#addons).
+*   [Custom-width](https://codemirror.net/5/doc/manual.html#option_tabSize) and [styleable](https://codemirror.net/5/demo/visibletabs.html) tabs.
+*   Moved more code into [add-on scripts](https://codemirror.net/5/doc/manual.html#addons).
 *   Support for sane vertical cursor movement in wrapped lines.
-*   More reliable handling of editing [marked text](https://codemirror.net/doc/manual.html#markText).
-*   Add minimal [emacs](https://codemirror.net/demo/emacs.html) and [vim](https://codemirror.net/demo/vim.html) bindings.
-*   Rename `coordsFromIndex` to [`posFromIndex`](https://codemirror.net/doc/manual.html#posFromIndex), add [`indexFromPos`](https://codemirror.net/doc/manual.html#indexFromPos) method.
+*   More reliable handling of editing [marked text](https://codemirror.net/5/doc/manual.html#markText).
+*   Add minimal [emacs](https://codemirror.net/5/demo/emacs.html) and [vim](https://codemirror.net/5/demo/vim.html) bindings.
+*   Rename `coordsFromIndex` to [`posFromIndex`](https://codemirror.net/5/doc/manual.html#posFromIndex), add [`indexFromPos`](https://codemirror.net/5/doc/manual.html#indexFromPos) method.
 
 ## 2.18.0 (2011-11-21)
 
@@ -2041,11 +2041,11 @@ Fixes `TextMarker.clear`, which is broken in 2.17.
 
 ## 2.17.0 (2011-11-21)
 
-*   Add support for [line wrapping](https://codemirror.net/doc/manual.html#option_lineWrapping) and [code folding](https://codemirror.net/doc/manual.html#hideLine).
-*   Add [GitHub-style Markdown](https://codemirror.net/mode/gfm/index.html) mode.
-*   Add [Monokai](https://codemirror.net/theme/monokai.css) and [Rubyblue](https://codemirror.net/theme/rubyblue.css) themes.
-*   Add [`setBookmark`](https://codemirror.net/doc/manual.html#setBookmark) method.
-*   Move some of the demo code into reusable components under [`lib/util`](https://codemirror.net/addon/).
+*   Add support for [line wrapping](https://codemirror.net/5/doc/manual.html#option_lineWrapping) and [code folding](https://codemirror.net/5/doc/manual.html#hideLine).
+*   Add [GitHub-style Markdown](https://codemirror.net/5/mode/gfm/index.html) mode.
+*   Add [Monokai](https://codemirror.net/5/theme/monokai.css) and [Rubyblue](https://codemirror.net/5/theme/rubyblue.css) themes.
+*   Add [`setBookmark`](https://codemirror.net/5/doc/manual.html#setBookmark) method.
+*   Move some of the demo code into reusable components under [`lib/util`](https://codemirror.net/5/addon/).
 *   Make screen-coord-finding code faster and more reliable.
 *   Fix drag-and-drop in Firefox.
 *   Improve support for IME.
@@ -2056,11 +2056,11 @@ Fixes `TextMarker.clear`, which is broken in 2.17.
 
 ## 2.16.0 (2011-10-27)
 
-*   Add [Perl](https://codemirror.net/mode/perl/index.html), [Rust](https://codemirror.net/mode/rust/index.html), [TiddlyWiki](https://codemirror.net/mode/tiddlywiki/index.html), and [Groovy](https://codemirror.net/mode/groovy/index.html) modes.
+*   Add [Perl](https://codemirror.net/5/mode/perl/index.html), [Rust](https://codemirror.net/5/mode/rust/index.html), [TiddlyWiki](https://codemirror.net/5/mode/tiddlywiki/index.html), and [Groovy](https://codemirror.net/5/mode/groovy/index.html) modes.
 *   Dragging text inside the editor now moves, rather than copies.
-*   Add a [`coordsFromIndex`](https://codemirror.net/doc/manual.html#coordsFromIndex) method.
-*   **API change**: `setValue` now no longer clears history. Use [`clearHistory`](https://codemirror.net/doc/manual.html#clearHistory) for that.
-*   **API change**: [`markText`](https://codemirror.net/doc/manual.html#markText) now returns an object with `clear` and `find` methods. Marked text is now more robust when edited.
+*   Add a [`coordsFromIndex`](https://codemirror.net/5/doc/manual.html#coordsFromIndex) method.
+*   **API change**: `setValue` now no longer clears history. Use [`clearHistory`](https://codemirror.net/5/doc/manual.html#clearHistory) for that.
+*   **API change**: [`markText`](https://codemirror.net/5/doc/manual.html#markText) now returns an object with `clear` and `find` methods. Marked text is now more robust when edited.
 *   Fix editing code with tabs in Internet Explorer.
 
 ## 2.15.0 (2011-09-26)
@@ -2069,24 +2069,24 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 
 ## 2.14.0 (2011-09-26)
 
-*   Add [Clojure](https://codemirror.net/mode/clojure/index.html), [Pascal](https://codemirror.net/mode/pascal/index.html), [NTriples](https://codemirror.net/mode/ntriples/index.html), [Jinja2](https://codemirror.net/mode/jinja2/index.html), and [Markdown](https://codemirror.net/mode/markdown/index.html) modes.
-*   Add [Cobalt](https://codemirror.net/theme/cobalt.css) and [Eclipse](https://codemirror.net/theme/eclipse.css) themes.
-*   Add a [`fixedGutter`](https://codemirror.net/doc/manual.html#option_fixedGutter) option.
+*   Add [Clojure](https://codemirror.net/5/mode/clojure/index.html), [Pascal](https://codemirror.net/5/mode/pascal/index.html), [NTriples](https://codemirror.net/5/mode/ntriples/index.html), [Jinja2](https://codemirror.net/5/mode/jinja2/index.html), and [Markdown](https://codemirror.net/5/mode/markdown/index.html) modes.
+*   Add [Cobalt](https://codemirror.net/5/theme/cobalt.css) and [Eclipse](https://codemirror.net/5/theme/eclipse.css) themes.
+*   Add a [`fixedGutter`](https://codemirror.net/5/doc/manual.html#option_fixedGutter) option.
 *   Fix bug with `setValue` breaking cursor movement.
 *   Make gutter updates much more efficient.
 *   Allow dragging of text out of the editor (on modern browsers).
 
 ## 2.13.0 (2011-08-23)
 
-*   Add [Ruby](https://codemirror.net/mode/ruby/index.html), [R](https://codemirror.net/mode/r/index.html), [CoffeeScript](https://codemirror.net/mode/coffeescript/index.html), and [Velocity](https://codemirror.net/mode/velocity/index.html) modes.
-*   Add [`getGutterElement`](https://codemirror.net/doc/manual.html#getGutterElement) to API.
+*   Add [Ruby](https://codemirror.net/5/mode/ruby/index.html), [R](https://codemirror.net/5/mode/r/index.html), [CoffeeScript](https://codemirror.net/5/mode/coffeescript/index.html), and [Velocity](https://codemirror.net/5/mode/velocity/index.html) modes.
+*   Add [`getGutterElement`](https://codemirror.net/5/doc/manual.html#getGutterElement) to API.
 *   Several fixes to scrolling and positioning.
-*   Add [`smartHome`](https://codemirror.net/doc/manual.html#option_smartHome) option.
-*   Add an experimental [pure XML](https://codemirror.net/mode/xmlpure/index.html) mode.
+*   Add [`smartHome`](https://codemirror.net/5/doc/manual.html#option_smartHome) option.
+*   Add an experimental [pure XML](https://codemirror.net/5/mode/xmlpure/index.html) mode.
 
 ## 2.12.0 (2011-07-25)
 
-*   Add a [SPARQL](https://codemirror.net/mode/sparql/index.html) mode.
+*   Add a [SPARQL](https://codemirror.net/5/mode/sparql/index.html) mode.
 *   Fix bug with cursor jumping around in an unfocused editor in IE.
 *   Allow key and mouse events to bubble out of the editor. Ignore widget clicks.
 *   Solve cursor flakiness after undo/redo.
@@ -2099,37 +2099,37 @@ Fix bug that snuck into 2.14: Clicking the character that currently has the curs
 
 ## 2.11.0 (2011-07-04)
 
-*   Add a [Scheme mode](https://codemirror.net/mode/scheme/index.html).
+*   Add a [Scheme mode](https://codemirror.net/5/mode/scheme/index.html).
 *   Add a `replace` method to search cursors, for cursor-preserving replacements.
-*   Make the [C-like mode](https://codemirror.net/mode/clike/index.html) mode more customizable.
+*   Make the [C-like mode](https://codemirror.net/5/mode/clike/index.html) mode more customizable.
 *   Update XML mode to spot mismatched tags.
 *   Add `getStateAfter` API and `compareState` mode API methods for finer-grained mode magic.
 *   Add a `getScrollerElement` API method to manipulate the scrolling DIV.
 *   Fix drag-and-drop for Firefox.
-*   Add a C# configuration for the [C-like mode](https://codemirror.net/mode/clike/index.html).
-*   Add [full-screen editing](https://codemirror.net/demo/fullscreen.html) and [mode-changing](https://codemirror.net/demo/changemode.html) demos.
+*   Add a C# configuration for the [C-like mode](https://codemirror.net/5/mode/clike/index.html).
+*   Add [full-screen editing](https://codemirror.net/5/demo/fullscreen.html) and [mode-changing](https://codemirror.net/5/demo/changemode.html) demos.
 
 ## 2.10.0 (2011-06-07)
 
-Add a [theme](https://codemirror.net/doc/manual.html#option_theme) system ([demo](https://codemirror.net/demo/theme.html)). Note that this is not backwards-compatible—you'll have to update your styles and modes!
+Add a [theme](https://codemirror.net/5/doc/manual.html#option_theme) system ([demo](https://codemirror.net/5/demo/theme.html)). Note that this is not backwards-compatible—you'll have to update your styles and modes!
 
 ## 2.2.0 (2011-06-07)
 
-*   Add a [Lua mode](https://codemirror.net/mode/lua/index.html).
+*   Add a [Lua mode](https://codemirror.net/5/mode/lua/index.html).
 *   Fix reverse-searching for a regexp.
 *   Empty lines can no longer break highlighting.
 *   Rework scrolling model (the outer wrapper no longer does the scrolling).
 *   Solve horizontal jittering on long lines.
-*   Add [runmode.js](https://codemirror.net/demo/runmode.html).
+*   Add [runmode.js](https://codemirror.net/5/demo/runmode.html).
 *   Immediately re-highlight text when typing.
 *   Fix problem with 'sticking' horizontal scrollbar.
 
 ## 2.1.0 (2011-05-26)
 
-*   Add a [Smalltalk mode](https://codemirror.net/mode/smalltalk/index.html).
-*   Add a [reStructuredText mode](https://codemirror.net/mode/rst/index.html).
-*   Add a [Python mode](https://codemirror.net/mode/python/index.html).
-*   Add a [PL/SQL mode](https://codemirror.net/mode/plsql/index.html).
+*   Add a [Smalltalk mode](https://codemirror.net/5/mode/smalltalk/index.html).
+*   Add a [reStructuredText mode](https://codemirror.net/5/mode/rst/index.html).
+*   Add a [Python mode](https://codemirror.net/5/mode/python/index.html).
+*   Add a [PL/SQL mode](https://codemirror.net/5/mode/plsql/index.html).
 *   `coordsChar` now works
 *   Fix a problem where `onCursorActivity` interfered with `onChange`.
 *   Fix a number of scrolling and mouse-click-position glitches.
@@ -2143,4 +2143,4 @@ Add a [theme](https://codemirror.net/doc/manual.html#option_theme) system ([demo
 
 ## 2.0.0 (2011-03-28)
 
-CodeMirror 2 is a complete rewrite that's faster, smaller, simpler to use, and less dependent on browser quirks. See [this](https://codemirror.net/doc/internals.html) and [this](http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580) for more information.
+CodeMirror 2 is a complete rewrite that's faster, smaller, simpler to use, and less dependent on browser quirks. See [this](https://codemirror.net/5/doc/internals.html) and [this](http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580) for more information.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ebbef2f8ac..8a216d49c6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -71,7 +71,7 @@ a separate NPM package.
 By contributing code to CodeMirror you
 
  - agree to license the contributed code under CodeMirror's [MIT
-   license](https://codemirror.net/LICENSE).
+   license](https://codemirror.net/5/LICENSE).
 
  - confirm that you have the right to contribute and license the code
    in question. (Either you hold all rights on the code, or the rights
diff --git a/README.md b/README.md
index 39c24686b5..0e9f5b6098 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # CodeMirror
 
-[![Build Status](https://github.com/codemirror/codemirror/workflows/main/badge.svg)](https://github.com/codemirror/codemirror/actions)
+[![Build Status](https://github.com/codemirror/codemirror5/workflows/main/badge.svg)](https://github.com/codemirror/codemirror/actions)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a versatile text editor implemented in JavaScript for
@@ -14,8 +14,8 @@ customizing CodeMirror to fit your application, and extending it with
 new functionality.
 
 You can find more information (and the
-[manual](https://codemirror.net/doc/manual.html)) on the [project
-page](https://codemirror.net). For questions and discussion, use the
+[manual](https://codemirror.net/5/doc/manual.html)) on the [project
+page](https://codemirror.net/5/). For questions and discussion, use the
 [discussion forum](https://discuss.codemirror.net/).
 
 See
@@ -29,7 +29,7 @@ conduct.
 
 ### Installation
 
-Either get the [zip file](https://codemirror.net/codemirror.zip) with
+Either get the [zip file](https://codemirror.net/5/codemirror.zip) with
 the latest version, or make sure you have [Node](https://nodejs.org/)
 installed and run:
 
diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index dd0ff11b1e..7f6f3ed092 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
index 7ca1b4a9cc..2f16da8a49 100644
--- a/addon/comment/continuecomment.js
+++ b/addon/comment/continuecomment.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
index 5f1f4aa4cc..0294d23884 100644
--- a/addon/dialog/dialog.js
+++ b/addon/dialog/dialog.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Open simple dialogs on top of an editor. Relies on dialog.css.
 
diff --git a/addon/display/autorefresh.js b/addon/display/autorefresh.js
index 37014dc31d..b5e6ab0a3c 100644
--- a/addon/display/autorefresh.js
+++ b/addon/display/autorefresh.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
index eda7300f12..39451bda3b 100644
--- a/addon/display/fullscreen.js
+++ b/addon/display/fullscreen.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/display/panel.js b/addon/display/panel.js
index 29f7e0bebb..b00d683414 100644
--- a/addon/display/panel.js
+++ b/addon/display/panel.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function (mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/display/placeholder.js b/addon/display/placeholder.js
index cfb8341db2..7848f51462 100644
--- a/addon/display/placeholder.js
+++ b/addon/display/placeholder.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/display/rulers.js b/addon/display/rulers.js
index 0bb83bb022..4ca15eae3a 100644
--- a/addon/display/rulers.js
+++ b/addon/display/rulers.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
index 593d4439fb..badbbd85ac 100644
--- a/addon/edit/closebrackets.js
+++ b/addon/edit/closebrackets.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
index 7c22a50ecf..62c057844d 100644
--- a/addon/edit/closetag.js
+++ b/addon/edit/closetag.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /**
  * Tag-closer extension for CodeMirror.
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
index d8b2e0e1fe..915d813f47 100644
--- a/addon/edit/continuelist.js
+++ b/addon/edit/continuelist.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index 43dc8840f5..c342910ed5 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/matchtags.js b/addon/edit/matchtags.js
index 2203d9390d..afa6105f84 100644
--- a/addon/edit/matchtags.js
+++ b/addon/edit/matchtags.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/edit/trailingspace.js b/addon/edit/trailingspace.js
index c39c310a99..8d01c20cae 100644
--- a/addon/edit/trailingspace.js
+++ b/addon/edit/trailingspace.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
index 28cb093f2f..2124768af6 100644
--- a/addon/fold/brace-fold.js
+++ b/addon/fold/brace-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
index 836101d8b0..adaa79d865 100644
--- a/addon/fold/comment-fold.js
+++ b/addon/fold/comment-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/foldcode.js b/addon/fold/foldcode.js
index 721bc087e2..a6a51af8ee 100644
--- a/addon/fold/foldcode.js
+++ b/addon/fold/foldcode.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 7d46a609b0..481fea2af9 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/indent-fold.js b/addon/fold/indent-fold.js
index 0cc1126440..470e84ac42 100644
--- a/addon/fold/indent-fold.js
+++ b/addon/fold/indent-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/markdown-fold.js b/addon/fold/markdown-fold.js
index 6a551786d1..4f9cb02f1a 100644
--- a/addon/fold/markdown-fold.js
+++ b/addon/fold/markdown-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/fold/xml-fold.js b/addon/fold/xml-fold.js
index 13bc3838b2..5450d374ad 100644
--- a/addon/fold/xml-fold.js
+++ b/addon/fold/xml-fold.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/anyword-hint.js b/addon/hint/anyword-hint.js
index d27a9ec018..b20d9f6ffb 100644
--- a/addon/hint/anyword-hint.js
+++ b/addon/hint/anyword-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/css-hint.js b/addon/hint/css-hint.js
index 980d1197e5..5b36e82243 100644
--- a/addon/hint/css-hint.js
+++ b/addon/hint/css-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/html-hint.js b/addon/hint/html-hint.js
index 9878eca6ef..168f49c2f1 100644
--- a/addon/hint/html-hint.js
+++ b/addon/hint/html-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/javascript-hint.js b/addon/hint/javascript-hint.js
index 9f06b1b546..95639798d1 100644
--- a/addon/hint/javascript-hint.js
+++ b/addon/hint/javascript-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index 0af9bc7848..be729c3efe 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // declare global: DOMRect
 
diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index efdce813cf..57c3b64f26 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/hint/xml-hint.js b/addon/hint/xml-hint.js
index 2b3153124e..1fc6394434 100644
--- a/addon/hint/xml-hint.js
+++ b/addon/hint/xml-hint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/lint/coffeescript-lint.js b/addon/lint/coffeescript-lint.js
index a54c703516..793ea9027c 100644
--- a/addon/lint/coffeescript-lint.js
+++ b/addon/lint/coffeescript-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
 
diff --git a/addon/lint/css-lint.js b/addon/lint/css-lint.js
index 6058a73eb1..94a67b4423 100644
--- a/addon/lint/css-lint.js
+++ b/addon/lint/css-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Depends on csslint.js from https://github.com/stubbornella/csslint
 
diff --git a/addon/lint/html-lint.js b/addon/lint/html-lint.js
index 5295c33331..5be24fe61b 100644
--- a/addon/lint/html-lint.js
+++ b/addon/lint/html-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Depends on htmlhint.js from http://htmlhint.com/js/htmlhint.js
 
diff --git a/addon/lint/javascript-lint.js b/addon/lint/javascript-lint.js
index e5bc752308..c1599f8503 100644
--- a/addon/lint/javascript-lint.js
+++ b/addon/lint/javascript-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Depends on jshint.js from https://github.com/jshint/jshint
 
diff --git a/addon/lint/json-lint.js b/addon/lint/json-lint.js
index ac1d6ec28c..4a4fe396ec 100644
--- a/addon/lint/json-lint.js
+++ b/addon/lint/json-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Depends on jsonlint.js from https://github.com/zaach/jsonlint
 
diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 1613deb9dd..7b40e10e91 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/lint/yaml-lint.js b/addon/lint/yaml-lint.js
index b4ac5abc4e..5dbb15996e 100644
--- a/addon/lint/yaml-lint.js
+++ b/addon/lint/yaml-lint.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index 35292c0218..a5ba21aa84 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
 
diff --git a/addon/mode/loadmode.js b/addon/mode/loadmode.js
index fc695d0c37..ee1c1518ff 100644
--- a/addon/mode/loadmode.js
+++ b/addon/mode/loadmode.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/mode/multiplex.js b/addon/mode/multiplex.js
index 6140bc4f96..d7f378af63 100644
--- a/addon/mode/multiplex.js
+++ b/addon/mode/multiplex.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/mode/multiplex_test.js b/addon/mode/multiplex_test.js
index 8503988672..37e8077b87 100644
--- a/addon/mode/multiplex_test.js
+++ b/addon/mode/multiplex_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   CodeMirror.defineMode("markdown_with_stex", function(){
diff --git a/addon/mode/overlay.js b/addon/mode/overlay.js
index 016e3c28cc..1aab1595ee 100644
--- a/addon/mode/overlay.js
+++ b/addon/mode/overlay.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Utility function that allows modes to be combined. The mode given
 // as the base argument takes care of most of the normal mode
diff --git a/addon/mode/simple.js b/addon/mode/simple.js
index 0d8cbdebd8..1f0e0beb76 100644
--- a/addon/mode/simple.js
+++ b/addon/mode/simple.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/runmode/colorize.js b/addon/runmode/colorize.js
index 3be5411506..5f76b367af 100644
--- a/addon/runmode/colorize.js
+++ b/addon/runmode/colorize.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index f5d58e2428..612e896fd7 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/scroll/annotatescrollbar.js b/addon/scroll/annotatescrollbar.js
index c12e44cda5..b8d52b7b5f 100644
--- a/addon/scroll/annotatescrollbar.js
+++ b/addon/scroll/annotatescrollbar.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/scroll/scrollpastend.js b/addon/scroll/scrollpastend.js
index 2ed9d95e84..310fb62069 100644
--- a/addon/scroll/scrollpastend.js
+++ b/addon/scroll/scrollpastend.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/scroll/simplescrollbars.js b/addon/scroll/simplescrollbars.js
index 750a2bd399..f1356a8c75 100644
--- a/addon/scroll/simplescrollbars.js
+++ b/addon/scroll/simplescrollbars.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/search/jump-to-line.js b/addon/search/jump-to-line.js
index 990c235ef1..596383bb57 100644
--- a/addon/search/jump-to-line.js
+++ b/addon/search/jump-to-line.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Defines jumpToLine command. Uses dialog.js if present.
 
diff --git a/addon/search/match-highlighter.js b/addon/search/match-highlighter.js
index 9b181ebc01..f7e7fb3a14 100644
--- a/addon/search/match-highlighter.js
+++ b/addon/search/match-highlighter.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Highlighting text that matches the selection
 //
diff --git a/addon/search/matchesonscrollbar.js b/addon/search/matchesonscrollbar.js
index 8a4a827584..acab47b033 100644
--- a/addon/search/matchesonscrollbar.js
+++ b/addon/search/matchesonscrollbar.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/search/search.js b/addon/search/search.js
index 23ed894cdc..9662b0943d 100644
--- a/addon/search/search.js
+++ b/addon/search/search.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Define search commands. Depends on dialog.js or another
 // implementation of the openDialog method.
diff --git a/addon/search/searchcursor.js b/addon/search/searchcursor.js
index 230017b781..ffe6932db7 100644
--- a/addon/search/searchcursor.js
+++ b/addon/search/searchcursor.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/selection/active-line.js b/addon/selection/active-line.js
index c7b14ce07f..ff81ffc81a 100644
--- a/addon/selection/active-line.js
+++ b/addon/selection/active-line.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/selection/mark-selection.js b/addon/selection/mark-selection.js
index adfaa62d1a..fc80159598 100644
--- a/addon/selection/mark-selection.js
+++ b/addon/selection/mark-selection.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Because sometimes you need to mark the selected *text*.
 //
diff --git a/addon/selection/selection-pointer.js b/addon/selection/selection-pointer.js
index f0bd61a33e..924b4659c1 100644
--- a/addon/selection/selection-pointer.js
+++ b/addon/selection/selection-pointer.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index a88371747c..b2509e0d65 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Glue code between CodeMirror and Tern.
 //
diff --git a/addon/tern/worker.js b/addon/tern/worker.js
index e134ad47d6..ed1b685755 100644
--- a/addon/tern/worker.js
+++ b/addon/tern/worker.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // declare global: tern, server
 
diff --git a/addon/wrap/hardwrap.js b/addon/wrap/hardwrap.js
index 516368c80d..e7053b58ab 100644
--- a/addon/wrap/hardwrap.js
+++ b/addon/wrap/hardwrap.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/demo/activeline.html b/demo/activeline.html
index f2228141a2..5e37765c60 100644
--- a/demo/activeline.html
+++ b/demo/activeline.html
@@ -12,12 +12,12 @@
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Active Line</a>
diff --git a/demo/anywordhint.html b/demo/anywordhint.html
index 57df9a36a7..4e9d712f11 100644
--- a/demo/anywordhint.html
+++ b/demo/anywordhint.html
@@ -11,12 +11,12 @@
 <script src="../addon/hint/anyword-hint.js" id=anyword></script>
 <script src="../mode/javascript/javascript.js"></script>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Any Word Completion</a>
diff --git a/demo/bidi.html b/demo/bidi.html
index a7d22d6c7a..25cca1f9d6 100644
--- a/demo/bidi.html
+++ b/demo/bidi.html
@@ -12,12 +12,12 @@
   fieldset {border: none}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Bi-directional Text</a>
diff --git a/demo/btree.html b/demo/btree.html
index 318810143c..5f9e4d361d 100644
--- a/demo/btree.html
+++ b/demo/btree.html
@@ -11,12 +11,12 @@
       .CodeMirror {border: 1px solid #aaa; height: 400px}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">B-Tree visualization</a>
diff --git a/demo/buffers.html b/demo/buffers.html
index b1f4975c67..95cf672d30 100644
--- a/demo/buffers.html
+++ b/demo/buffers.html
@@ -12,12 +12,12 @@
       .CodeMirror {border: 1px solid black; height: 250px;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Multiple Buffer & Split View</a>
diff --git a/demo/changemode.html b/demo/changemode.html
index da9b0243ee..37a826deae 100644
--- a/demo/changemode.html
+++ b/demo/changemode.html
@@ -12,12 +12,12 @@
       .CodeMirror {border: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Mode-Changing</a>
diff --git a/demo/closebrackets.html b/demo/closebrackets.html
index d1415abd2b..dbb0e69a3c 100644
--- a/demo/closebrackets.html
+++ b/demo/closebrackets.html
@@ -12,12 +12,12 @@
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Closebrackets</a>
diff --git a/demo/closetag.html b/demo/closetag.html
index 1f86114a9f..7c69b99c87 100644
--- a/demo/closetag.html
+++ b/demo/closetag.html
@@ -16,12 +16,12 @@
       .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Close-Tag</a>
@@ -38,5 +38,5 @@ <h2>Close-Tag Demo</h2>
         autoCloseTags: true
       });
     </script>
-  <p>Uses the <a href="https://codemirror.net/doc/manual.html#addon_closetag">closetag</a> addon to auto-close tags.</p>
+  <p>Uses the <a href="https://codemirror.net/5/doc/manual.html#addon_closetag">closetag</a> addon to auto-close tags.</p>
   </article>
diff --git a/demo/complete.html b/demo/complete.html
index 3e7bd5ff56..ece04dbfd9 100644
--- a/demo/complete.html
+++ b/demo/complete.html
@@ -13,12 +13,12 @@
 <script src="../mode/markdown/markdown.js"></script>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Autocomplete</a>
diff --git a/demo/emacs.html b/demo/emacs.html
index 8f436f8b7d..0e3de210bd 100644
--- a/demo/emacs.html
+++ b/demo/emacs.html
@@ -18,12 +18,12 @@
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Emacs bindings</a>
diff --git a/demo/folding.html b/demo/folding.html
index 166aa98cf9..07bb4c8aa3 100644
--- a/demo/folding.html
+++ b/demo/folding.html
@@ -35,12 +35,12 @@
 
 <body>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Code Folding</a>
diff --git a/demo/fullscreen.html b/demo/fullscreen.html
index 06bf03e107..ed9d504a97 100644
--- a/demo/fullscreen.html
+++ b/demo/fullscreen.html
@@ -12,12 +12,12 @@
 <script src="../addon/display/fullscreen.js"></script>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Full Screen Editing</a>
diff --git a/demo/hardwrap.html b/demo/hardwrap.html
index 999cf012b9..ec1c4efbea 100644
--- a/demo/hardwrap.html
+++ b/demo/hardwrap.html
@@ -12,12 +12,12 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Hard-wrapping</a>
diff --git a/demo/html5complete.html b/demo/html5complete.html
index 6b908a4520..961662cae2 100644
--- a/demo/html5complete.html
+++ b/demo/html5complete.html
@@ -22,12 +22,12 @@
 
 <body>
   <div id=nav>
-    <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+    <a href="https://codemirror.net/5"><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>
+      <li><a href="https://github.com/codemirror/codemirror5">Code</a>
     </ul>
     <ul>
       <li><a class=active href="#">HTML completion</a>
diff --git a/demo/indentwrap.html b/demo/indentwrap.html
index d61f679540..8ec08c5d93 100644
--- a/demo/indentwrap.html
+++ b/demo/indentwrap.html
@@ -12,12 +12,12 @@
       .CodeMirror pre > * { text-indent: 0px; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Indented wrapped line</a>
diff --git a/demo/lint.html b/demo/lint.html
index a479cdd30a..919fedd607 100644
--- a/demo/lint.html
+++ b/demo/lint.html
@@ -20,12 +20,12 @@
       .CodeMirror {border: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Linter</a>
diff --git a/demo/loadmode.html b/demo/loadmode.html
index 263d679cae..c7500d0647 100644
--- a/demo/loadmode.html
+++ b/demo/loadmode.html
@@ -12,12 +12,12 @@
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Lazy Mode Loading</a>
diff --git a/demo/marker.html b/demo/marker.html
index 6744ee3a6e..d0b87d84c2 100644
--- a/demo/marker.html
+++ b/demo/marker.html
@@ -13,12 +13,12 @@
       .CodeMirror {border: 1px solid #aaa;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Breakpoint</a>
diff --git a/demo/markselection.html b/demo/markselection.html
index 10734b4106..37a66e2dfa 100644
--- a/demo/markselection.html
+++ b/demo/markselection.html
@@ -15,12 +15,12 @@
       .styled-background { background-color: #ff7; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Selection Marking</a>
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
index 8e0ff25b89..fd8459b9de 100644
--- a/demo/matchhighlighter.html
+++ b/demo/matchhighlighter.html
@@ -21,12 +21,12 @@
       .CodeMirror-selection-highlight-scrollbar {background-color: green}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Match Highlighter</a>
diff --git a/demo/matchtags.html b/demo/matchtags.html
index a5ff6b01b6..95af946172 100644
--- a/demo/matchtags.html
+++ b/demo/matchtags.html
@@ -13,12 +13,12 @@
       .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Tag Matcher</a>
diff --git a/demo/merge.html b/demo/merge.html
index 6eff813452..0fdd21c4c1 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -28,12 +28,12 @@
     }
   </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">merge view</a>
diff --git a/demo/multiplex.html b/demo/multiplex.html
index 1336620433..4c2ae88742 100644
--- a/demo/multiplex.html
+++ b/demo/multiplex.html
@@ -13,12 +13,12 @@
       .cm-delimit {color: #fa4;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Multiplexing Parser</a>
diff --git a/demo/mustache.html b/demo/mustache.html
index f37f01b537..5266b1619d 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -13,12 +13,12 @@
       .cm-mustache {color: #0ca;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Overlay Parser</a>
diff --git a/demo/panel.html b/demo/panel.html
index d4f813d048..d8cabb810c 100644
--- a/demo/panel.html
+++ b/demo/panel.html
@@ -40,12 +40,12 @@
 </style>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Panel</a>
diff --git a/demo/placeholder.html b/demo/placeholder.html
index b3bb5fa6f8..b1073bf494 100644
--- a/demo/placeholder.html
+++ b/demo/placeholder.html
@@ -14,12 +14,12 @@
       .CodeMirror pre.CodeMirror-placeholder { color: #999; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Placeholder</a>
diff --git a/demo/preview.html b/demo/preview.html
index 660c7921c6..ff96b782a2 100644
--- a/demo/preview.html
+++ b/demo/preview.html
@@ -25,12 +25,12 @@
       }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">HTML5 preview</a>
diff --git a/demo/requirejs.html b/demo/requirejs.html
index 0503c92197..00339fbf1f 100644
--- a/demo/requirejs.html
+++ b/demo/requirejs.html
@@ -15,11 +15,11 @@
 
 <body>
   <div id=nav>
-    <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+    <a href="https://codemirror.net/5"><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>
+      <li><a href="https://github.com/codemirror/codemirror5">Code</a>
     </ul>
     <ul>
       <li><a class=active href="#">HTML completion</a>
diff --git a/demo/resize.html b/demo/resize.html
index 850f560139..88c794eda0 100644
--- a/demo/resize.html
+++ b/demo/resize.html
@@ -14,12 +14,12 @@
       }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Autoresize</a>
diff --git a/demo/rulers.html b/demo/rulers.html
index ef12987edb..99d3482295 100644
--- a/demo/rulers.html
+++ b/demo/rulers.html
@@ -11,12 +11,12 @@
   .CodeMirror {border-top: 1px solid #888; border-bottom: 1px solid #888;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Ruler demo</a>
diff --git a/demo/runmode-standalone.html b/demo/runmode-standalone.html
index f3503b98d8..c008e49fb2 100644
--- a/demo/runmode-standalone.html
+++ b/demo/runmode-standalone.html
@@ -8,12 +8,12 @@
 <script src="../addon/runmode/runmode-standalone.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Mode Runner</a>
diff --git a/demo/runmode.html b/demo/runmode.html
index 0284c40567..59ea409825 100644
--- a/demo/runmode.html
+++ b/demo/runmode.html
@@ -9,12 +9,12 @@
 <script src="../addon/runmode/runmode.js"></script>
 <script src="../mode/xml/xml.js"></script>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Mode Runner</a>
diff --git a/demo/search.html b/demo/search.html
index 3abb0c78e6..32e12b5333 100644
--- a/demo/search.html
+++ b/demo/search.html
@@ -20,12 +20,12 @@
       dt {font-family: monospace; color: #666;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Search/Replace</a>
diff --git a/demo/simplemode.html b/demo/simplemode.html
index b03335fb87..d43e6d1f18 100644
--- a/demo/simplemode.html
+++ b/demo/simplemode.html
@@ -16,12 +16,12 @@
 </style>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Simple Mode</a>
diff --git a/demo/simplescrollbars.html b/demo/simplescrollbars.html
index 1604297894..078a5f1261 100644
--- a/demo/simplescrollbars.html
+++ b/demo/simplescrollbars.html
@@ -12,12 +12,12 @@
 <script src="../addon/scroll/simplescrollbars.js"></script>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Simple Scrollbar</a>
diff --git a/demo/spanaffectswrapping_shim.html b/demo/spanaffectswrapping_shim.html
index 46667ddc69..d95f364322 100644
--- a/demo/spanaffectswrapping_shim.html
+++ b/demo/spanaffectswrapping_shim.html
@@ -5,12 +5,12 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Automatically derive odd wrapping behavior for your browser</a>
diff --git a/demo/sublime.html b/demo/sublime.html
index bfe17c5670..a1890d22b8 100644
--- a/demo/sublime.html
+++ b/demo/sublime.html
@@ -25,12 +25,12 @@
   .CodeMirror-linenumbers { padding: 0 8px; }
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Sublime bindings</a>
diff --git a/demo/tern.html b/demo/tern.html
index e331fd5cf8..7cc9b67f13 100644
--- a/demo/tern.html
+++ b/demo/tern.html
@@ -27,12 +27,12 @@
       .CodeMirror {border: 1px solid #ddd;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Tern</a>
diff --git a/demo/theme.html b/demo/theme.html
index 1ccac88c4b..e394aa266b 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -76,12 +76,12 @@
       .CodeMirror {border: 1px solid black; font-size:13px}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Theme</a>
diff --git a/demo/trailingspace.html b/demo/trailingspace.html
index fb553994b5..00e5e31200 100644
--- a/demo/trailingspace.html
+++ b/demo/trailingspace.html
@@ -16,12 +16,12 @@
       }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Trailing Whitespace</a>
diff --git a/demo/variableheight.html b/demo/variableheight.html
index a3af5cf4a9..f78129313a 100644
--- a/demo/variableheight.html
+++ b/demo/variableheight.html
@@ -20,12 +20,12 @@
       .cm-strong { font-size: 140%; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Variable Height</a>
diff --git a/demo/vim.html b/demo/vim.html
index 41406b4a6e..e7df36f6d9 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -16,12 +16,12 @@
       .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Vim bindings</a>
@@ -35,7 +35,7 @@ <h2>Vim bindings demo</h2>
 active maintainer. That means that if you report bugs in it, they are
 likely to go unanswered. It also means that if you want to help, you
 are very welcome to look
-at <a href="https://github.com/codemirror/codemirror/issues?q=is%3Aissue+is%3Aopen+label%3Avim">the
+at <a href="https://github.com/codemirror/codemirror5/issues?q=is%3Aissue+is%3Aopen+label%3Avim">the
 open issues</a> and see which ones you can solve.</p>
 
 <form><textarea id="code" name="code">
diff --git a/demo/visibletabs.html b/demo/visibletabs.html
index f4f5a78329..1ddaf8ba44 100644
--- a/demo/visibletabs.html
+++ b/demo/visibletabs.html
@@ -16,12 +16,12 @@
       }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Visible tabs</a>
diff --git a/demo/widget.html b/demo/widget.html
index 6fae2d2f57..18b1651291 100644
--- a/demo/widget.html
+++ b/demo/widget.html
@@ -14,12 +14,12 @@
       .lint-error-icon {color: white; background-color: red; font-weight: bold; border-radius: 50%; padding: 0 3px; margin-right: 7px;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Inline Widget</a>
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
index dbbc9bacdc..7420e1a4e0 100644
--- a/demo/xmlcomplete.html
+++ b/demo/xmlcomplete.html
@@ -14,12 +14,12 @@
       .CodeMirror { border: 1px solid #eee; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">XML Autocomplete</a>
diff --git a/doc/internals.html b/doc/internals.html
index 893604e936..dc48fec320 100644
--- a/doc/internals.html
+++ b/doc/internals.html
@@ -7,12 +7,12 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="#top">Introduction</a></li>
@@ -46,7 +46,7 @@ <h2 id=top>(Re-) Implementing A Syntax-Highlighting Editor in JavaScript</h2>
 on my blog.</p>
 
 <p>This is a followup to
-my <a href="https://codemirror.net/story.html">Brutal Odyssey to the
+my <a href="https://codemirror.net/5/story.html">Brutal Odyssey to the
 Dark Side of the DOM Tree</a> story. That one describes the
 mind-bending process of implementing (what would become) CodeMirror 1.
 This one describes the internals of CodeMirror 2, a complete rewrite
@@ -108,7 +108,7 @@ <h2 id=top>(Re-) Implementing A Syntax-Highlighting Editor in JavaScript</h2>
 incompatibility and bugginess in these features, I had to paper over
 with my own code. Not only did I have to do some serious stunt-work to
 get it to work on older browsers (as detailed in the
-previous <a href="https://codemirror.net/story.html">story</a>), things
+previous <a href="https://codemirror.net/5/story.html">story</a>), things
 also kept breaking in newly released versions, requiring me to come up
 with <em>new</em> scary hacks in order to keep up. This was starting
 to lose its appeal.</p>
@@ -293,7 +293,7 @@ <h2>Intelligent Updating</h2>
   <h2>Parsers can be Simple</h2>
 
 <p>When I wrote CodeMirror 1, I
-thought <a href="https://codemirror.net/story.html#parser">interruptible
+thought <a href="https://codemirror.net/5/story.html#parser">interruptible
 parsers</a> were a hugely scary and complicated thing, and I used a
 bunch of heavyweight abstractions to keep this supposed complexity
 under control: parsers
diff --git a/doc/manual.html b/doc/manual.html
index 9479d3d665..8db8695979 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -24,11 +24,11 @@
 </style>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
   <ul>
     <li><a href="../index.html">Home</a></li>
     <li><a href="#overview" class=active data-default="true">Manual</a></li>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a></li>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a></li>
   </ul>
   <ul>
     <li><a href="#usage">Basic Usage</a></li>
@@ -2408,7 +2408,7 @@ <h2 id="addons">Addons</h2>
       Accepts <code>linenumber</code>, <code>+/-linenumber</code>, <code>line:char</code>,
       <code>scroll%</code> and <code>:linenumber</code> formats.
       This will make use of <a href="#addon_dialog"><code>openDialog</code></a>
-      when available to make prompting for line number neater.</dd> Demo available <a href="https://codemirror.net/demo/search.html">here</a>.
+      when available to make prompting for line number neater.</dd> Demo available <a href="https://codemirror.net/5/demo/search.html">here</a>.
 
       <dt id="addon_matchesonscrollbar"><a href="../addon/search/matchesonscrollbar.js"><code>search/matchesonscrollbar.js</code></a></dt>
       <dd>Adds a <code>showMatchesOnScrollbar</code> method to editor
diff --git a/doc/realworld.html b/doc/realworld.html
index af07e73116..4b62d7e04f 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -5,12 +5,12 @@
 <link rel=stylesheet href="docs.css">
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Real-world uses</a>
@@ -21,7 +21,7 @@
 
 <h2>CodeMirror real-world uses</h2>
 
-    <p>Create a <a href="https://github.com/codemirror/codemirror">pull
+    <p>Create a <a href="https://github.com/codemirror/codemirror5">pull
     request</a> if you'd like your project to be added to this list.</p>
 
     <ul>
diff --git a/doc/releases.html b/doc/releases.html
index 1209318259..7b190d2449 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -6,12 +6,12 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active data-default="true" href="#v5">Version 5.x</a>
@@ -30,511 +30,511 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
-  <p class="rel">30-05-2022: <a href="https://codemirror.net/codemirror-5.65.5.zip">Version 5.65.5</a>:</p>
+  <p class="rel">30-05-2022: <a href="https://codemirror.net/5/codemirror-5.65.5.zip">Version 5.65.5</a>:</p>
 
   <ul class="rel-note">
     <li>Work around a bug in Chrome 102 that caused wheel scrolling of the editor to constantly stop.</li>
-    <li><a href="https://codemirror.net/demo/search.html">search addon</a>: Make sure the search field has an accessible label.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Preserve indentation on otherwise empty lines when indenting.</li>
+    <li><a href="https://codemirror.net/5/demo/search.html">search addon</a>: Make sure the search field has an accessible label.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_comment">comment addon</a>: Preserve indentation on otherwise empty lines when indenting.</li>
   </ul>
 
-  <p class="rel">20-05-2022: <a href="https://codemirror.net/codemirror-5.65.4.zip">Version 5.65.4</a>:</p>
+  <p class="rel">20-05-2022: <a href="https://codemirror.net/5/codemirror-5.65.4.zip">Version 5.65.4</a>:</p>
 
   <ul class="rel-note">
     <li>Ignore paste events when the editor doesn’t have focus.</li>
-    <li><a href="https://codemirror.net/mode/sparql/index.html">sparql mode</a>: Fix parsing of variables after operators.</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Properly tokenize <code>!==</code> and <code>===</code> operators.</li>
+    <li><a href="https://codemirror.net/5/mode/sparql/index.html">sparql mode</a>: Fix parsing of variables after operators.</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Properly tokenize <code>!==</code> and <code>===</code> operators.</li>
   </ul>
 
-  <p class="rel">20-04-2022: <a href="https://codemirror.net/codemirror-5.65.3.zip">Version 5.65.3</a>:</p>
+  <p class="rel">20-04-2022: <a href="https://codemirror.net/5/codemirror-5.65.3.zip">Version 5.65.3</a>:</p>
 
   <ul class="rel-note">
     <li>Fix a crash that could occur when when marking text.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Add aria label to buttons.</li>
-    <li><a href="https://codemirror.net/mode/groovy/index.html">groovy mode</a>: Properly highlight interpolated variables.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_merge">merge addon</a>: Add aria label to buttons.</li>
+    <li><a href="https://codemirror.net/5/mode/groovy/index.html">groovy mode</a>: Properly highlight interpolated variables.</li>
   </ul>
 
-  <p class="rel">21-02-2022: <a href="https://codemirror.net/codemirror-5.65.2.zip">Version 5.65.2</a>:</p>
+  <p class="rel">21-02-2022: <a href="https://codemirror.net/5/codemirror-5.65.2.zip">Version 5.65.2</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/mode/clike/">clike mode</a>: Recognize triple quoted string in Java.</li>
-    <li><a href="https://codemirror.net/mode/cypher/index.html">cypher mode</a>: Fix handling of punctuation.</li>
+    <li><a href="https://codemirror.net/5/mode/clike/">clike mode</a>: Recognize triple quoted string in Java.</li>
+    <li><a href="https://codemirror.net/5/mode/cypher/index.html">cypher mode</a>: Fix handling of punctuation.</li>
   </ul>
 
-  <p class="rel">20-01-2022: <a href="https://codemirror.net/codemirror-5.65.1.zip">Version 5.65.1</a>:</p>
+  <p class="rel">20-01-2022: <a href="https://codemirror.net/5/codemirror-5.65.1.zip">Version 5.65.1</a>:</p>
 
   <ul class="rel-note">
     <li>Fix miscalculation of vertical positions in lines that have both line widgets and replaced newlines.</li>
   </ul>
 
-  <p class="rel">20-12-2021: <a href="https://codemirror.net/codemirror-5.65.0.zip">Version 5.65.0</a>:</p>
+  <p class="rel">20-12-2021: <a href="https://codemirror.net/5/codemirror-5.65.0.zip">Version 5.65.0</a>:</p>
 
   <ul class="rel-note">
     <li>brace-folding addon: Fix broken folding on lines with both braces and square brackets.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support g0, g$, g&lt;Arrow&gt;.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Support g0, g$, g&lt;Arrow&gt;.</li>
   </ul>
 
-  <p class="rel">20-11-2021: <a href="https://codemirror.net/codemirror-5.64.0.zip">Version 5.64.0</a>:</p>
+  <p class="rel">20-11-2021: <a href="https://codemirror.net/5/codemirror-5.64.0.zip">Version 5.64.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix a crash that occurred in some situations with replacing marks across line breaks.</li>
     <li>Make sure native scrollbars reset their position when hidden and re-shown.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support C-u to delete back a line.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Support C-u to delete back a line.</li>
   </ul>
 
-  <p class="rel">11-10-2021: <a href="https://codemirror.net/codemirror-5.63.3.zip">Version 5.63.3</a>:</p>
+  <p class="rel">11-10-2021: <a href="https://codemirror.net/5/codemirror-5.63.3.zip">Version 5.63.3</a>:</p>
 
   <ul class="rel-note">
     <li>Prevent external styles from giving the hidden textarea a min-height.</li>
     <li>Remove a stray autosave file that was part of the previous release.</li>
   </ul>
 
-  <p class="rel">29-09-2021: <a href="https://codemirror.net/codemirror-5.63.1.zip">Version 5.63.1</a>:</p>
+  <p class="rel">29-09-2021: <a href="https://codemirror.net/5/codemirror-5.63.1.zip">Version 5.63.1</a>:</p>
 
   <ul class="rel-note">
     <li>Fix an issue with mouse scrolling on Chrome 94 Windows, which made scrolling by wheel move unusably slow.</li>
   </ul>
 
-  <p class="rel">20-09-2021: <a href="https://codemirror.net/codemirror-5.63.0.zip">Version 5.63.0</a>:</p>
+  <p class="rel">20-09-2021: <a href="https://codemirror.net/5/codemirror-5.63.0.zip">Version 5.63.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix scroll position jumping when scrolling a document with very different line heights.</li>
-    <li><a href="https://codemirror.net/mode/xml/">xml mode</a>: Look up HTML element behavior in a case-insensitive way.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support guu for case-changing.</li>
+    <li><a href="https://codemirror.net/5/mode/xml/">xml mode</a>: Look up HTML element behavior in a case-insensitive way.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Support guu for case-changing.</li>
   </ul>
 
-  <p class="rel">20-08-2021: <a href="https://codemirror.net/codemirror-5.62.3.zip">Version 5.62.3</a>:</p>
+  <p class="rel">20-08-2021: <a href="https://codemirror.net/5/codemirror-5.62.3.zip">Version 5.62.3</a>:</p>
 
   <ul class="rel-note">
     <li>Give the editor a <code>translate=no</code> attribute to prevent automatic translation from modifying its content.</li>
     <li>Give vim-style cursors a width that matches the character after them.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Make buttons keyboard-accessible.</li>
-    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Fix by-page scrolling keybindings, which were accidentally inverted.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_merge">merge addon</a>: Make buttons keyboard-accessible.</li>
+    <li><a href="https://codemirror.net/5/demo/emacs.html">emacs bindings</a>: Fix by-page scrolling keybindings, which were accidentally inverted.</li>
   </ul>
 
-  <p class="rel">21-07-2021: <a href="https://codemirror.net/codemirror-5.62.2.zip">Version 5.62.2</a>:</p>
+  <p class="rel">21-07-2021: <a href="https://codemirror.net/5/codemirror-5.62.2.zip">Version 5.62.2</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Fix a regression that broke several addon options.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_lint">lint addon</a>: Fix a regression that broke several addon options.</li>
   </ul>
 
-  <p class="rel">20-07-2021: <a href="https://codemirror.net/codemirror-5.62.1.zip">Version 5.62.1</a>:</p>
+  <p class="rel">20-07-2021: <a href="https://codemirror.net/5/codemirror-5.62.1.zip">Version 5.62.1</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Make matching of upper-case characters more Unicode-aware.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Prevent options passed to the addon itself from being given to the linter.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Improve screen reader support.</li>
-    <li><a href="https://codemirror.net/demo/search.html">search addon</a>: Avoid using <code>innerHTML</code>.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Make matching of upper-case characters more Unicode-aware.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_lint">lint addon</a>: Prevent options passed to the addon itself from being given to the linter.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Improve screen reader support.</li>
+    <li><a href="https://codemirror.net/5/demo/search.html">search addon</a>: Avoid using <code>innerHTML</code>.</li>
   </ul>
 
-  <p class="rel">21-06-2021: <a href="https://codemirror.net/codemirror-5.62.0.zip">Version 5.62.0</a>:</p>
+  <p class="rel">21-06-2021: <a href="https://codemirror.net/5/codemirror-5.62.0.zip">Version 5.62.0</a>:</p>
 
   <ul class="rel-note">
-    <a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Add support for highlighting lines with errors or warnings.</li>
+    <a href="https://codemirror.net/5/doc/manual.html#addon_lint">lint addon</a>: Add support for highlighting lines with errors or warnings.</li>
     <li>Improve support for vim-style cursors in a number of themes.</li>
   </ul>
 
-  <p class="rel">20-05-2021: <a href="https://codemirror.net/codemirror-5.61.1.zip">Version 5.61.1</a>:</p>
+  <p class="rel">20-05-2021: <a href="https://codemirror.net/5/codemirror-5.61.1.zip">Version 5.61.1</a>:</p>
 
   <ul class="rel-note">
     <li>Fix a bug where changing the editor’s document could confuse text-direction management.</li>
     <li>Fix a bug in horizontally scrolling the cursor into view.</li>
     <li>Optimize adding lots of marks in a single transaction.</li>
-    <li><a href="https://codemirror.net/demo/simplemode.html">simple mode addon</a>: Support regexps with a unicode flag.</li>
-    <li><a href="https://codemirror.net/mode/javascript/index.html">javascript mode</a>: Add support for TypeScript template string types, improve integration with JSX mode.</li>
+    <li><a href="https://codemirror.net/5/demo/simplemode.html">simple mode addon</a>: Support regexps with a unicode flag.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/index.html">javascript mode</a>: Add support for TypeScript template string types, improve integration with JSX mode.</li>
   </ul>
 
-  <p class="rel">20-04-2021: <a href="https://codemirror.net/codemirror-5.61.0.zip">Version 5.61.0</a>:</p>
+  <p class="rel">20-04-2021: <a href="https://codemirror.net/5/codemirror-5.61.0.zip">Version 5.61.0</a>:</p>
 
   <ul class="rel-note">
     <li>The library now emits an <code>"updateGutter"</code> event when the gutter width changes.</li>
-    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Provide named commands for all bindings.</li>
+    <li><a href="https://codemirror.net/5/demo/emacs.html">emacs bindings</a>: Provide named commands for all bindings.</li>
     <li>Improve support for being in a shadow DOM in contenteditable mode.</li>
     <li>Prevent line number from being read by screen readers.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix a crash caused by a race condition.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve scope tracking.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix a crash caused by a race condition.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Improve scope tracking.</li>
   </ul>
 
-  <p class="rel">20-03-2021: <a href="https://codemirror.net/codemirror-5.60.0.zip">Version 5.60.0</a>:</p>
+  <p class="rel">20-03-2021: <a href="https://codemirror.net/5/codemirror-5.60.0.zip">Version 5.60.0</a>:</p>
 
   <ul class="rel-note">
     <li><code>setSelections</code> now allows ranges to omit the <code>head</code> property when it is equal to <code>anchor</code>.</li>
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Add support for reverse line sorting.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime bindings</a>: Add support for reverse line sorting.</li>
     <li>Fix autofocus feature in contenteditable mode.</li>
-    <li><a href="https://codemirror.net/demo/simplemode.html">simple mode addon</a>: Fix a null-dereference crash.</li>
-    <li><a href="https://codemirror.net/demo/multiplex.html">multiplex addon</a>: Make it possible to use <code>parseDelimiters</code> when both delimiters are the same.</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix a lockup bug.</li>
+    <li><a href="https://codemirror.net/5/demo/simplemode.html">simple mode addon</a>: Fix a null-dereference crash.</li>
+    <li><a href="https://codemirror.net/5/demo/multiplex.html">multiplex addon</a>: Make it possible to use <code>parseDelimiters</code> when both delimiters are the same.</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Fix a lockup bug.</li>
   </ul>
 
-  <p class="rel">24-02-2021: <a href="https://codemirror.net/codemirror-5.59.4.zip">Version 5.59.4</a>:</p>
+  <p class="rel">24-02-2021: <a href="https://codemirror.net/5/codemirror-5.59.4.zip">Version 5.59.4</a>:</p>
 
   <ul class="rel-note">
     <li>Give the scrollbar corner filler a background again, to prevent content from peeping through between the scrollbars.
   </ul>
 
-  <p class="rel">20-02-2021: <a href="https://codemirror.net/codemirror-5.59.3.zip">Version 5.59.3</a>:</p>
+  <p class="rel">20-02-2021: <a href="https://codemirror.net/5/codemirror-5.59.3.zip">Version 5.59.3</a>:</p>
 
   <ul class="rel-note">
     <li>Don’t override the way zero-with non-joiners are rendered.</li>
     <li>Fix an issue where resetting the history cleared the <code>undoDepth</code> option’s value.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix substitute command when joining and splitting lines, fix global command when line number change, add support for <code>:vglobal</code>, properly treat caps lock as a modifier key.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Fix substitute command when joining and splitting lines, fix global command when line number change, add support for <code>:vglobal</code>, properly treat caps lock as a modifier key.</li>
   </ul>
 
-  <p class="rel">20-01-2021: <a href="https://codemirror.net/codemirror-5.59.2.zip">Version 5.59.2</a>:</p>
+  <p class="rel">20-01-2021: <a href="https://codemirror.net/5/codemirror-5.59.2.zip">Version 5.59.2</a>:</p>
 
   <ul class="rel-note">
     <li>Don’t try to scroll the selection into view in <code>readonly: "nocursor"</code> mode.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Fix a regression in the behavior of pressing enter between brackets.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Fix an infinite loop on specific syntax errors in object types.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Fix a regression in the behavior of pressing enter between brackets.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Fix an infinite loop on specific syntax errors in object types.</li>
     <li>various modes: Fix inefficient RegExp matching.</li>
   </ul>
 
-  <p class="rel">31-12-2020: <a href="https://codemirror.net/codemirror-5.59.1.zip">Version 5.59.1</a>:</p>
+  <p class="rel">31-12-2020: <a href="https://codemirror.net/5/codemirror-5.59.1.zip">Version 5.59.1</a>:</p>
 
   <ul class="rel-note">
     <li>Fix an issue where some Chrome browsers were detected as iOS.</li>
   </ul>
 
-  <p class="rel">20-12-2020: <a href="https://codemirror.net/codemirror-5.59.0.zip">Version 5.59.0</a>:</p>
+  <p class="rel">20-12-2020: <a href="https://codemirror.net/5/codemirror-5.59.0.zip">Version 5.59.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix platform detection on recent iPadOS.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Don't show duplicate messages for a given line.</li>
-    <li><a href="https://codemirror.net/mode/clojure/index.html">clojure mode</a>: Fix regexp that matched in exponential time for some inputs.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_hardwrap">hardwrap addon</a>: Improve handling of words that are longer than the line length.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix leaked event handler on disabling the addon.</li>
-    <li><a href="https://codemirror.net/demo/search/">search addon</a>: Make it possible to configure the search addon to show the dialog at the bottom of the editor.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_lint">lint addon</a>: Don't show duplicate messages for a given line.</li>
+    <li><a href="https://codemirror.net/5/mode/clojure/index.html">clojure mode</a>: Fix regexp that matched in exponential time for some inputs.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_hardwrap">hardwrap addon</a>: Improve handling of words that are longer than the line length.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix leaked event handler on disabling the addon.</li>
+    <li><a href="https://codemirror.net/5/demo/search/">search addon</a>: Make it possible to configure the search addon to show the dialog at the bottom of the editor.</li>
   </ul>
 
-  <p class="rel">19-11-2020: <a href="https://codemirror.net/codemirror-5.58.3.zip">Version 5.58.3</a>:</p>
+  <p class="rel">19-11-2020: <a href="https://codemirror.net/5/codemirror-5.58.3.zip">Version 5.58.3</a>:</p>
 
   <ul class="rel-note">
     <li>Suppress quick-firing of blur-focus events when dragging and clicking on Internet Explorer.</li>
     <li>Fix the <code>insertAt</code> option to <code>addLineWidget</code> to actually allow the widget to be placed after all widgets for the line.</li>
-    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support <code>@Attribute</code> and element composition.</li>
-    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Support heredoc quoting.</li>
+    <li><a href="https://codemirror.net/5/mode/soy/">soy mode</a>: Support <code>@Attribute</code> and element composition.</li>
+    <li><a href="https://codemirror.net/5/mode/shell/">shell mode</a>: Support heredoc quoting.</li>
   </ul>
 
-  <p class="rel">23-10-2020: <a href="https://codemirror.net/codemirror-5.58.2.zip">Version 5.58.2</a>:</p>
+  <p class="rel">23-10-2020: <a href="https://codemirror.net/5/codemirror-5.58.2.zip">Version 5.58.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix a bug where horizontally scrolling the cursor into view sometimes failed with a non-fixed gutter.</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix an infinite recursion bug.</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Fix an infinite recursion bug.</li>
   </ul>
 
-  <p class="rel">21-09-2020: <a href="https://codemirror.net/codemirror-5.58.1.zip">Version 5.58.1</a>:</p>
+  <p class="rel">21-09-2020: <a href="https://codemirror.net/5/codemirror-5.58.1.zip">Version 5.58.1</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: Remove arrow function that ended up in the code.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_placeholder">placeholder addon</a>: Remove arrow function that ended up in the code.</li>
   </ul>
 
-  <p class="rel">21-09-2020: <a href="https://codemirror.net/codemirror-5.58.0.zip">Version 5.58.0</a>:</p>
+  <p class="rel">21-09-2020: <a href="https://codemirror.net/5/codemirror-5.58.0.zip">Version 5.58.0</a>:</p>
 
   <ul class="rel-note">
     <li>Make backspace delete by code point, not glyph.</li>
     <li>Suppress flickering focus outline when clicking on scrollbars in Chrome.</li>
     <li>Fix a bug that prevented attributes added via <code>markText</code> from showing up unless the span also had some other styling.</li>
     <li>Suppress cut and paste context menu entries in readonly editors in Chrome.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: Update placeholder visibility during composition.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_placeholder">placeholder addon</a>: Update placeholder visibility during composition.</li>
     <li>Make it less cumbersome to style new lint message types.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support black hole register, <code>gn</code> and <code>gN</code></li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Support black hole register, <code>gn</code> and <code>gN</code></li>
   </ul>
 
-  <p class="rel">20-08-2020: <a href="https://codemirror.net/codemirror-5.57.0.zip">Version 5.57.0</a>:</p>
+  <p class="rel">20-08-2020: <a href="https://codemirror.net/5/codemirror-5.57.0.zip">Version 5.57.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix issue that broke binding the macOS Command key.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Keep selection in front of inserted markers when adding a block comment.</li>
-    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Recognize more properties and value names.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_annotatescrollbar">annotatescrollbar addon</a>: Don’t hide matches in collapsed content.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support tag text objects in xml and html modes.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_comment">comment addon</a>: Keep selection in front of inserted markers when adding a block comment.</li>
+    <li><a href="https://codemirror.net/5/mode/css/">css mode</a>: Recognize more properties and value names.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_annotatescrollbar">annotatescrollbar addon</a>: Don’t hide matches in collapsed content.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Support tag text objects in xml and html modes.</li>
   </ul>
 
-  <p class="rel">20-07-2020: <a href="https://codemirror.net/codemirror-5.56.0.zip">Version 5.56.0</a>:</p>
+  <p class="rel">20-07-2020: <a href="https://codemirror.net/5/codemirror-5.56.0.zip">Version 5.56.0</a>:</p>
 
   <ul class="rel-note">
     <li>Line-wise pasting was fixed on Chrome Windows.</li>
-    <li><a href="https://codemirror.net/mode/wast/">wast mode</a>: Follow standard changes.</li>
-    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support import expressions, template type, and loop indices.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_sql-hint">sql-hint addon</a>: Improve handling of double quotes.</li>
+    <li><a href="https://codemirror.net/5/mode/wast/">wast mode</a>: Follow standard changes.</li>
+    <li><a href="https://codemirror.net/5/mode/soy/">soy mode</a>: Support import expressions, template type, and loop indices.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_sql-hint">sql-hint addon</a>: Improve handling of double quotes.</li>
     <li><h3 id="new-features">New features</h3></li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: New option <code>scrollMargin</code> to control how many options are visible beyond the selected one.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_hardwrap">hardwrap addon</a>: New option <code>forceBreak</code> to disable breaking of words that are longer than a line.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: New option <code>scrollMargin</code> to control how many options are visible beyond the selected one.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_hardwrap">hardwrap addon</a>: New option <code>forceBreak</code> to disable breaking of words that are longer than a line.</li>
   </ul>
 
-  <p class="rel">21-06-2020: <a href="https://codemirror.net/codemirror-5.55.0.zip">Version 5.55.0</a>:</p>
+  <p class="rel">21-06-2020: <a href="https://codemirror.net/5/codemirror-5.55.0.zip">Version 5.55.0</a>:</p>
 
   <ul class="rel-note">
     <li>The editor no longer overrides the rendering of zero-width joiners (allowing combined emoji to be shown).</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix an issue where the <code>vim-mode-change</code> event was fired twice.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Only allow <code>--&gt;</code>-style comments at the start of a line.</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Improve indentation.</li>
-    <li><a href="https://codemirror.net/mode/pascal/index.html">pascal mode</a>: Recognize curly bracket comments.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_runmode">runmode addon</a>: Further sync up the implementation of the standalone and node variants with the regular library.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Fix an issue where the <code>vim-mode-change</code> event was fired twice.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Only allow <code>--&gt;</code>-style comments at the start of a line.</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Improve indentation.</li>
+    <li><a href="https://codemirror.net/5/mode/pascal/index.html">pascal mode</a>: Recognize curly bracket comments.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_runmode">runmode addon</a>: Further sync up the implementation of the standalone and node variants with the regular library.</li>
     <li><h3 id="new-features">New features</h3></li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_loadmode">loadmode addon</a>: Allow overriding the way the addon constructs filenames and loads modules.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_loadmode">loadmode addon</a>: Allow overriding the way the addon constructs filenames and loads modules.</li>
   </ul>
 
-  <p class="rel">20-05-2020: <a href="https://codemirror.net/codemirror-5.54.0.zip">Version 5.54.0</a>:</p>
+  <p class="rel">20-05-2020: <a href="https://codemirror.net/5/codemirror-5.54.0.zip">Version 5.54.0</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/doc/manual.html#addon_runmode">runmode addon</a>: Properly support for cross-line lookahead.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Allow Ex-Commands with non-word names.</li>
-    <li><a href="https://codemirror.net/mode/gfm/">gfm mode</a>: Add a <code>fencedCodeBlockDefaultMode</code> option.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_runmode">runmode addon</a>: Properly support for cross-line lookahead.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Allow Ex-Commands with non-word names.</li>
+    <li><a href="https://codemirror.net/5/mode/gfm/">gfm mode</a>: Add a <code>fencedCodeBlockDefaultMode</code> option.</li>
     <li>Improve support for having focus inside in-editor widgets in contenteditable-mode.</li>
     <li>Fix issue where the scroll position could jump when clicking on a selection in Chrome.</li>
-    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Better format string support.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing of private properties and class fields.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Disable highlighting when the editor doesn’t have focus.</li>
+    <li><a href="https://codemirror.net/5/mode/python/">python mode</a>: Better format string support.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Improve parsing of private properties and class fields.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Disable highlighting when the editor doesn’t have focus.</li>
   </ul>
 
-  <p class="rel">21-04-2020: <a href="https://codemirror.net/codemirror-5.53.2.zip">Version 5.53.2</a>:</p>
+  <p class="rel">21-04-2020: <a href="https://codemirror.net/5/codemirror-5.53.2.zip">Version 5.53.2</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix a regression that broke completion picking.
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix a regression that broke completion picking.
   </ul>
 
-  <p class="rel">21-04-2020: <a href="https://codemirror.net/codemirror-5.53.0.zip">Version 5.53.0</a>:</p>
+  <p class="rel">21-04-2020: <a href="https://codemirror.net/5/codemirror-5.53.0.zip">Version 5.53.0</a>:</p>
 
   <ul class="rel-note">
-    <li>New option: <a href="https://codemirror.net/doc/manual.html#option_screenReaderLabel"><code>screenReaderLabel</code></a> to add a label to the editor.</li>
-    <li>New mode: <a href="https://codemirror.net/mode/wast/">wast</a>.</li>
+    <li>New option: <a href="https://codemirror.net/5/doc/manual.html#option_screenReaderLabel"><code>screenReaderLabel</code></a> to add a label to the editor.</li>
+    <li>New mode: <a href="https://codemirror.net/5/mode/wast/">wast</a>.</li>
     <li>Fix a bug where the editor layout could remain confused after a call to <code>refresh</code> when line wrapping was enabled.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_dialog">dialog addon</a>: Don’t close dialogs when the document window loses focus.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Compensate for editor top position when aligning lines.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Improve EOL handling.</li>
-    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Include default keymap as a fallback.</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix an infinite loop bug.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Scroll cursor into view when picking a completion.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_dialog">dialog addon</a>: Don’t close dialogs when the document window loses focus.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_merge">merge addon</a>: Compensate for editor top position when aligning lines.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Improve EOL handling.</li>
+    <li><a href="https://codemirror.net/5/demo/emacs.html">emacs bindings</a>: Include default keymap as a fallback.</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Fix an infinite loop bug.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Scroll cursor into view when picking a completion.</li>
   </ul>
 
-  <p class="rel">20-03-2020: <a href="https://codemirror.net/codemirror-5.52.2.zip">Version 5.52.2</a>:</p>
+  <p class="rel">20-03-2020: <a href="https://codemirror.net/5/codemirror-5.52.2.zip">Version 5.52.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix selection management in contenteditable mode when the editor doesn’t have focus.</li>
     <li>Fix a bug that would cause the editor to get confused about the visible viewport in some situations in line-wrapping mode.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Don’t treat single dashes as setext header markers.</li>
-    <li><a href="https://codemirror.net/demo/theme.html#zenburn">zenburn theme</a>: Make sure background styles take precedence over default styles.</li>
-    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Recognize a number of new properties.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Don’t treat single dashes as setext header markers.</li>
+    <li><a href="https://codemirror.net/5/demo/theme.html#zenburn">zenburn theme</a>: Make sure background styles take precedence over default styles.</li>
+    <li><a href="https://codemirror.net/5/mode/css/">css mode</a>: Recognize a number of new properties.</li>
   </ul>
 
-  <p class="rel">20-02-2020: <a href="https://codemirror.net/codemirror-5.52.0.zip">Version 5.52.0</a>:</p>
+  <p class="rel">20-02-2020: <a href="https://codemirror.net/5/codemirror-5.52.0.zip">Version 5.52.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix a bug in handling of bidi text with Arabic numbers in a right-to-left editor.</li>
     <li>Fix a crash when combining file drop with a <code>"beforeChange"</code> filter.</li>
     <li>Prevent issue when passing negative coordinates to <code>scrollTo</code>.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint</a> and <a href="https://codemirror.net/demo/tern.html">tern</a> addons: Allow the tooltip to be appended to the editor wrapper element instead of the document body.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_lint">lint</a> and <a href="https://codemirror.net/demo/tern.html">tern</a> addons: Allow the tooltip to be appended to the editor wrapper element instead of the document body.</li>
   </ul>
 
-  <p class="rel">20-01-2020: <a href="https://codemirror.net/codemirror-5.51.0.zip">Version 5.51.0</a>:</p>
+  <p class="rel">20-01-2020: <a href="https://codemirror.net/5/codemirror-5.51.0.zip">Version 5.51.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix the behavior of the home and end keys when <code>direction</code> is set to <code>"rtl"</code>.</li>
     <li>When dropping multiple files, don’t abort the drop of the valid files when there’s an invalid or binary file among them.</li>
     <li>Make sure <code>clearHistory</code> clears the history in all linked docs with a shared history.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix behavior of <code>'</code> and <code>`</code> marks, fix <code>R</code> in visual mode.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support <code>gi</code>, <code>gI<code>, and <code>gJ</code>.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Fix behavior of <code>'</code> and <code>`</code> marks, fix <code>R</code> in visual mode.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Support <code>gi</code>, <code>gI<code>, and <code>gJ</code>.</li>
   </ul>
 
-  <p class="rel">01-01-2020: <a href="https://codemirror.net/codemirror-5.50.2.zip">Version 5.50.2</a>:</p>
+  <p class="rel">01-01-2020: <a href="https://codemirror.net/5/codemirror-5.50.2.zip">Version 5.50.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix bug that broke removal of line widgets.</li>
   </ul>
 
-  <p class="rel">20-12-2019: <a href="https://codemirror.net/codemirror-5.50.0.zip">Version 5.50.0</a>:</p>
+  <p class="rel">20-12-2019: <a href="https://codemirror.net/5/codemirror-5.50.0.zip">Version 5.50.0</a>:</p>
 
   <ul class="rel-note">
-    <li>Add a <code>className</code> option to <a href="https://codemirror.net/doc/manual.html#addLineWidget"><code>addLineWidget</code></a>.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_foldcode">foldcode addon</a>: Allow fold widgets to be functions, to dynamically create fold markers.</li>
-    <li>New themes: <a href="https://codemirror.net/demo/theme.html#ayu-dark">ayu-dark</a> and <a href="https://codemirror.net/demo/theme.html#ayu-mirage">ayu-mirage</a>.</li>
+    <li>Add a <code>className</code> option to <a href="https://codemirror.net/5/doc/manual.html#addLineWidget"><code>addLineWidget</code></a>.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_foldcode">foldcode addon</a>: Allow fold widgets to be functions, to dynamically create fold markers.</li>
+    <li>New themes: <a href="https://codemirror.net/5/demo/theme.html#ayu-dark">ayu-dark</a> and <a href="https://codemirror.net/demo/theme.html#ayu-mirage">ayu-mirage</a>.</li>
     <li>Make Shift-Delete to cut work on Firefox.</li>
-    <li><a href="https://codemirror.net/demo/closetag.html">closetag addon</a>: Properly handle self-closing tags.</li>
-    <li><a href="https://codemirror.net/mode/handlebars/">handlebars mode</a>: Fix triple-brace support.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support matching <code>$</code> in reverse regexp search.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Don’t get confused by changing panel sizes.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Complete variables defined in outer scopes.</li>
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Make by-subword motion more consistent with Sublime Text.</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Don’t break on zero-prefixed integers.</li>
-    <li><a href="https://codemirror.net/mode/elm/">elm mode</a>: Sync with upstream version.</li>
-    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Support Postgres-style backslash-escaped string literals.</li>
+    <li><a href="https://codemirror.net/5/demo/closetag.html">closetag addon</a>: Properly handle self-closing tags.</li>
+    <li><a href="https://codemirror.net/5/mode/handlebars/">handlebars mode</a>: Fix triple-brace support.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support matching <code>$</code> in reverse regexp search.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_panel">panel addon</a>: Don’t get confused by changing panel sizes.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Complete variables defined in outer scopes.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime bindings</a>: Make by-subword motion more consistent with Sublime Text.</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Don’t break on zero-prefixed integers.</li>
+    <li><a href="https://codemirror.net/5/mode/elm/">elm mode</a>: Sync with upstream version.</li>
+    <li><a href="https://codemirror.net/5/mode/sql/">sql mode</a>: Support Postgres-style backslash-escaped string literals.</li>
   </ul>
 
-  <p class="rel">21-10-2019: <a href="https://codemirror.net/codemirror-5.49.2.zip">Version 5.49.2</a>:</p>
+  <p class="rel">21-10-2019: <a href="https://codemirror.net/5/codemirror-5.49.2.zip">Version 5.49.2</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Make <code>selectNextOccurrence</code> stop doing something when all occurrences are selected.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_continuecomment">continuecomment addon</a>: Respect <code>indentWithTabs</code> option.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_foldgutter">foldgutter addon</a>: Optimize by reusing DOM when possible.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Don’t reset inline styles at the start of a continued list item line.</li>
-    <li><a href="https://codemirror.net/mode/clike/">clike mode</a>: Add a configuration for Objective-C++.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime bindings</a>: Make <code>selectNextOccurrence</code> stop doing something when all occurrences are selected.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_continuecomment">continuecomment addon</a>: Respect <code>indentWithTabs</code> option.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_foldgutter">foldgutter addon</a>: Optimize by reusing DOM when possible.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Don’t reset inline styles at the start of a continued list item line.</li>
+    <li><a href="https://codemirror.net/5/mode/clike/">clike mode</a>: Add a configuration for Objective-C++.</li>
   </ul>
 
-  <p class="rel">20-09-2019: <a href="https://codemirror.net/codemirror-5.49.0.zip">Version 5.49.0</a>:</p>
+  <p class="rel">20-09-2019: <a href="https://codemirror.net/5/codemirror-5.49.0.zip">Version 5.49.0</a>:</p>
 
   <ul class="rel-note">
-    <li>New themes: <a href="https://codemirror.net/demo/theme.html#moxer">moxer</a>, <a href="https://codemirror.net/demo/theme.html#material-darker">material-darker</a>, <a href="https://codemirror.net/demo/theme.html#material-palenight">material-palenight</a>, <a href="https://codemirror.net/demo/theme.html#material-ocean">material-ocean</a>.</li>
-    <li><a href="https://codemirror.net/mode/xml/">xml mode</a>: Provide a more abstract way to query context, which other modes for XML-like languages can also implement.</li>
-    <li><a href="https://codemirror.net/mode/octave/index.html">octave mode</a>: Don’t mark common punctuation as error.</li>
-    <li><a href="https://codemirror.net/mode/clike/">clike mode</a>: Support nested comments and properly indent lambdas in Kotlin.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_foldgutter">foldgutter</a> and <a href="https://codemirror.net/doc/manual.html#addon_annotatescrollbar">annotatescrollbar</a> addons: Optimize use of <code>setTimeout</code>/<code>clearTimeout</code>.</li>
+    <li>New themes: <a href="https://codemirror.net/5/demo/theme.html#moxer">moxer</a>, <a href="https://codemirror.net/demo/theme.html#material-darker">material-darker</a>, <a href="https://codemirror.net/demo/theme.html#material-palenight">material-palenight</a>, <a href="https://codemirror.net/demo/theme.html#material-ocean">material-ocean</a>.</li>
+    <li><a href="https://codemirror.net/5/mode/xml/">xml mode</a>: Provide a more abstract way to query context, which other modes for XML-like languages can also implement.</li>
+    <li><a href="https://codemirror.net/5/mode/octave/index.html">octave mode</a>: Don’t mark common punctuation as error.</li>
+    <li><a href="https://codemirror.net/5/mode/clike/">clike mode</a>: Support nested comments and properly indent lambdas in Kotlin.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_foldgutter">foldgutter</a> and <a href="https://codemirror.net/doc/manual.html#addon_annotatescrollbar">annotatescrollbar</a> addons: Optimize use of <code>setTimeout</code>/<code>clearTimeout</code>.</li>
   </ul>
 
-  <p class="rel">20-08-2019: <a href="https://codemirror.net/codemirror-5.48.4.zip">Version 5.48.4</a>:</p>
+  <p class="rel">20-08-2019: <a href="https://codemirror.net/5/codemirror-5.48.4.zip">Version 5.48.4</a>:</p>
 
   <ul class="rel-note">
     <li>Make default styles for line elements more specific so that they don’t apply to all <code>&lt;pre&gt;</code> elements inside the editor.</li>
     <li>Improve efficiency of fold gutter when there’s big folded chunks of code in view.</li>
     <li>Fix a bug that would leave the editor uneditable when a content-covering collapsed range was removed by replacing the entire document.</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Support number separators.</li>
-    <li><a href="https://codemirror.net/mode/asterisk/">asterisk mode</a>: Improve comment support.</li>
-    <li><a href="https://codemirror.net/mode/handlebars/">handlebars mode</a>: Support triple-brace tags.</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Support number separators.</li>
+    <li><a href="https://codemirror.net/5/mode/asterisk/">asterisk mode</a>: Improve comment support.</li>
+    <li><a href="https://codemirror.net/5/mode/handlebars/">handlebars mode</a>: Support triple-brace tags.</li>
   </ul>
 
-  <p class="rel">20-07-2019: <a href="https://codemirror.net/codemirror-5.48.2.zip">Version 5.48.2</a>:</p>
+  <p class="rel">20-07-2019: <a href="https://codemirror.net/5/codemirror-5.48.2.zip">Version 5.48.2</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Adjust char escape substitution to match vim, support <code>&amp;/$0</code>.</li>
-    <li><a href="https://codemirror.net/demo/search/">search addon</a>: Try to make backslash behavior in query strings less confusing.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Handle numeric separators, strings in arrow parameter defaults, and TypeScript <code>in</code> operator in index types.</li>
-    <li><a href="https://codemirror.net/mode/sparql/index.html">sparql mode</a>: Allow non-ASCII identifier characters.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Adjust char escape substitution to match vim, support <code>&amp;/$0</code>.</li>
+    <li><a href="https://codemirror.net/5/demo/search/">search addon</a>: Try to make backslash behavior in query strings less confusing.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Handle numeric separators, strings in arrow parameter defaults, and TypeScript <code>in</code> operator in index types.</li>
+    <li><a href="https://codemirror.net/5/mode/sparql/index.html">sparql mode</a>: Allow non-ASCII identifier characters.</li>
   </ul>
 
-  <p class="rel">20-06-2019: <a href="https://codemirror.net/codemirror-5.48.0.zip">Version 5.48.0</a>:</p>
+  <p class="rel">20-06-2019: <a href="https://codemirror.net/5/codemirror-5.48.0.zip">Version 5.48.0</a>:</p>
 
   <ul class="rel-note">
     <li>Treat non-printing character range u+fff9 to u+fffc as special characters and highlight them.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix positioning when the dialog is placed in a scrollable container.</li>
-    <li>Add <a href="https://codemirror.net/doc/manual.html#mark_selectLeft"><code>selectLeft</code></a>/<a href="https://codemirror.net/doc/manual.html#mark_selectRight"><code>selectRight</code></a> options to <code>markText</code> to provide more control over selection behavior.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix positioning when the dialog is placed in a scrollable container.</li>
+    <li>Add <a href="https://codemirror.net/5/doc/manual.html#mark_selectLeft"><code>selectLeft</code></a>/<a href="https://codemirror.net/doc/manual.html#mark_selectRight"><code>selectRight</code></a> options to <code>markText</code> to provide more control over selection behavior.</li>
   </ul>
 
-  <p class="rel">21-05-2019: <a href="https://codemirror.net/codemirror-5.47.0.zip">Version 5.47.0</a>:</p>
+  <p class="rel">21-05-2019: <a href="https://codemirror.net/5/codemirror-5.47.0.zip">Version 5.47.0</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Properly handle <code>...</code> syntax.</li>
-    <li><a href="https://codemirror.net/mode/ruby">ruby mode</a>: Fix indenting before closing brackets.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix repeat for <code>C-v I</code>, fix handling of fat cursor <code>C-v c Esc</code> and <code>0</code>, fix <code>@@</code>, fix block-wise yank.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add support for <code>`</code> text object.</li>
+    <li><a href="https://codemirror.net/5/mode/python/">python mode</a>: Properly handle <code>...</code> syntax.</li>
+    <li><a href="https://codemirror.net/5/mode/ruby">ruby mode</a>: Fix indenting before closing brackets.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Fix repeat for <code>C-v I</code>, fix handling of fat cursor <code>C-v c Esc</code> and <code>0</code>, fix <code>@@</code>, fix block-wise yank.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Add support for <code>`</code> text object.</li>
   </ul>
 
-  <p class="rel">22-04-2019: <a href="https://codemirror.net/codemirror-5.46.0.zip">Version 5.46.0</a>:</p>
+  <p class="rel">22-04-2019: <a href="https://codemirror.net/5/codemirror-5.46.0.zip">Version 5.46.0</a>:</p>
 
   <ul class="rel-note">
-    <li>Allow <a href="https://codemirror.net/doc/manual.html#option_gutters">gutters</a> to specify direct CSS stings.</li>
+    <li>Allow <a href="https://codemirror.net/5/doc/manual.html#option_gutters">gutters</a> to specify direct CSS stings.</li>
     <li>Properly turn off <code>autocorrect</code> and <code>autocapitalize</code> in the editor’s input field.</li>
-    <li>Fix issue where calling <a href="https://codemirror.net/doc/manual.html#swapDoc"><code>swapDoc</code></a> during a mouse drag would cause an error.</li>
+    <li>Fix issue where calling <a href="https://codemirror.net/5/doc/manual.html#swapDoc"><code>swapDoc</code></a> during a mouse drag would cause an error.</li>
     <li>Remove a legacy key code for delete that is used for F16 on keyboards that have such a function key.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_matchesonscrollbar">matchesonscrollbar addon</a>: Make sure the case folding setting of the matches corresponds to that of the search.</li>
-    <li><a href="https://codemirror.net/mode/swift">swift mode</a>: Fix handling of empty strings.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_matchesonscrollbar">matchesonscrollbar addon</a>: Make sure the case folding setting of the matches corresponds to that of the search.</li>
+    <li><a href="https://codemirror.net/5/mode/swift">swift mode</a>: Fix handling of empty strings.</li>
   </ul>
 
-  <p class="rel">20-03-2019: <a href="https://codemirror.net/codemirror-5.45.0.zip">Version 5.45.0</a>:</p>
+  <p class="rel">20-03-2019: <a href="https://codemirror.net/5/codemirror-5.45.0.zip">Version 5.45.0</a>:</p>
 
   <ul class="rel-note">
-    <li>New theme: <a href="https://codemirror.net/demo/theme.html#yonce">yoncé</a>.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_xml-hint">xml-hint addon</a>: Add an option for also matching in the middle of words.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve heuristic for when to auto-close newly typed brackets.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_sql-hint">sql-hint addon</a>: Fix 16.30. brixplkatz 13</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Ignore <code>&lt;</code> and <code>&gt;</code> when matching other brackets.</li>
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Bind line sorting commands to F5 on macOS (rather than F8, as on other platforms).</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix bug that’d cause the mode get stuck.</li>
+    <li>New theme: <a href="https://codemirror.net/5/demo/theme.html#yonce">yoncé</a>.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_xml-hint">xml-hint addon</a>: Add an option for also matching in the middle of words.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve heuristic for when to auto-close newly typed brackets.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_sql-hint">sql-hint addon</a>: Fix 16.30. brixplkatz 13</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Ignore <code>&lt;</code> and <code>&gt;</code> when matching other brackets.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime bindings</a>: Bind line sorting commands to F5 on macOS (rather than F8, as on other platforms).</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Fix bug that’d cause the mode get stuck.</li>
   </ul>
 
-  <p class="rel">21-02-2019: <a href="https://codemirror.net/codemirror-5.44.0.zip">Version 5.44.0</a>:</p>
+  <p class="rel">21-02-2019: <a href="https://codemirror.net/5/codemirror-5.44.0.zip">Version 5.44.0</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Properly emulate forward-delete.</li>
-    <li>New theme: <a href="https://codemirror.net/demo/theme.html#nord">nord</a>.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Properly emulate forward-delete.</li>
+    <li>New theme: <a href="https://codemirror.net/5/demo/theme.html#nord">nord</a>.</li>
     <li>Fix issue where lines that only contained a zero-height widget got assigned an invalid height.</li>
     <li>Improve support for middle-click paste on X Windows.</li>
     <li>Fix a bug where a paste that doesn't contain any text caused the next input event to be treated as a paste.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix accidental global variable.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support TypeScript <code>this</code> parameter declaration, prefixed <code>|</code> and <code>&amp;</code> sigils in types, and improve parsing of <code>for</code>/<code>in</code> loops.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix accidental global variable.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Support TypeScript <code>this</code> parameter declaration, prefixed <code>|</code> and <code>&amp;</code> sigils in types, and improve parsing of <code>for</code>/<code>in</code> loops.</li>
   </ul>
 
-  <p class="rel">21-01-2019: <a href="https://codemirror.net/codemirror-5.43.0.zip">Version 5.43.0</a>:</p>
+  <p class="rel">21-01-2019: <a href="https://codemirror.net/5/codemirror-5.43.0.zip">Version 5.43.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix mistakes in passing through the arguments to <code>indent</code> in several wrapping modes.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Fix parsing for a number of new and obscure TypeScript features.</li>
-    <li><a href="https://codemirror.net/mode/ruby">ruby mode</a>: Support indented end tokens for heredoc strings.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Fix parsing for a number of new and obscure TypeScript features.</li>
+    <li><a href="https://codemirror.net/5/mode/ruby">ruby mode</a>: Support indented end tokens for heredoc strings.</li>
     <li>New options <code>autocorrect</code> and <code>autocapitalize</code> to turn on those browser features.</li>
   </ul>
 
-  <p class="rel">21-12-2018: <a href="https://codemirror.net/codemirror-5.42.2.zip">Version 5.42.2</a>:</p>
+  <p class="rel">21-12-2018: <a href="https://codemirror.net/5/codemirror-5.42.2.zip">Version 5.42.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix problem where canceling a change via the <code>&quot;beforeChange&quot;</code> event could corrupt the textarea input.</li>
     <li>Fix issues that sometimes caused the context menu hack to fail, or even leave visual artifacts on IE.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Make it possible to select text between angle brackets.</li>
-    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Fix tokenizing of CSS variables.</li>
-    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Fix another bug in tokenizing of format strings.</li>
-    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: More accurate highlighting.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Make it possible to select text between angle brackets.</li>
+    <li><a href="https://codemirror.net/5/mode/css/">css mode</a>: Fix tokenizing of CSS variables.</li>
+    <li><a href="https://codemirror.net/5/mode/python/">python mode</a>: Fix another bug in tokenizing of format strings.</li>
+    <li><a href="https://codemirror.net/5/mode/soy/">soy mode</a>: More accurate highlighting.</li>
   </ul>
 
-  <p class="rel">20-11-2018: <a href="https://codemirror.net/codemirror-5.42.0.zip">Version 5.42.0</a>:</p>
+  <p class="rel">20-11-2018: <a href="https://codemirror.net/5/codemirror-5.42.0.zip">Version 5.42.0</a>:</p>
 
   <ul class="rel-note">
-    <li>The <a href="https://codemirror.net/doc/manual.html#markText"><code>markText</code> method</a> now takes an <a href="https://codemirror.net/doc/manual.html#mark_attributes"><code>attributes</code></a> option that can be used to add attributes text's HTML representation.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add support for the <code>=</code> binding.</li>
+    <li>The <a href="https://codemirror.net/5/doc/manual.html#markText"><code>markText</code> method</a> now takes an <a href="https://codemirror.net/doc/manual.html#mark_attributes"><code>attributes</code></a> option that can be used to add attributes text's HTML representation.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Add support for the <code>=</code> binding.</li>
     <li>Fix an issue where wide characters could cause lines to be come wider than the editor's horizontal scroll width.</li>
     <li>Optimize handling of window resize events.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Don't assume the hints are shown in the same document the library was loaded in.</li>
-    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Fix bug where a string inside a template string broke highlighting.</li>
-    <li><a href="https://codemirror.net/mode/swift">swift mode</a>: Support multi-line strings.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Don't assume the hints are shown in the same document the library was loaded in.</li>
+    <li><a href="https://codemirror.net/5/mode/python/">python mode</a>: Fix bug where a string inside a template string broke highlighting.</li>
+    <li><a href="https://codemirror.net/5/mode/swift">swift mode</a>: Support multi-line strings.</li>
   </ul>
 
-  <p class="rel">25-10-2018: <a href="https://codemirror.net/codemirror-5.41.0.zip">Version 5.41.0</a>:</p>
+  <p class="rel">25-10-2018: <a href="https://codemirror.net/5/codemirror-5.41.0.zip">Version 5.41.0</a>:</p>
 
   <ul class="rel-note">
-    <li>A new <a href="https://codemirror.net/doc/manual.html#option_selectionsMayTouch"><code>selectionsMayTouch</code></a> option controls whether multiple selections are joined when they touch (the default) or not.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add <code>noremap</code> binding command.</li>
-    <li>Fix firing of <a href="https://codemirror.net/doc/manual.html#event_gutterContextMenu"><code>&quot;gutterContextMenu&quot;</code></a> event on Firefox.</li>
+    <li>A new <a href="https://codemirror.net/5/doc/manual.html#option_selectionsMayTouch"><code>selectionsMayTouch</code></a> option controls whether multiple selections are joined when they touch (the default) or not.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Add <code>noremap</code> binding command.</li>
+    <li>Fix firing of <a href="https://codemirror.net/5/doc/manual.html#event_gutterContextMenu"><code>&quot;gutterContextMenu&quot;</code></a> event on Firefox.</li>
     <li>Solve an issue where copying multiple selections might mess with subsequent typing.</li>
-    <li>Don't crash when <a href="https://codemirror.net/doc/manual.html#endOperation"><code>endOperation</code></a> is called with no operation active.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix insert mode repeat after visualBlock edits.</li>
-    <li><a href="https://codemirror.net/mode/scheme/index.html">scheme mode</a>: Improve highlighting of quoted expressions.</li>
-    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support injected data and <code>@param</code> in comments.</li>
-    <li><a href="https://codemirror.net/mode/clike/">objective c mode</a>: Improve conformance to the actual language.</li>
+    <li>Don't crash when <a href="https://codemirror.net/5/doc/manual.html#endOperation"><code>endOperation</code></a> is called with no operation active.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Fix insert mode repeat after visualBlock edits.</li>
+    <li><a href="https://codemirror.net/5/mode/scheme/index.html">scheme mode</a>: Improve highlighting of quoted expressions.</li>
+    <li><a href="https://codemirror.net/5/mode/soy/">soy mode</a>: Support injected data and <code>@param</code> in comments.</li>
+    <li><a href="https://codemirror.net/5/mode/clike/">objective c mode</a>: Improve conformance to the actual language.</li>
   </ul>
 
-  <p class="rel">20-09-2018: <a href="https://codemirror.net/codemirror-5.40.2.zip">Version 5.40.2</a>:</p>
+  <p class="rel">20-09-2018: <a href="https://codemirror.net/5/codemirror-5.40.2.zip">Version 5.40.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix firing of <code>gutterContextMenu</code> event on Firefox.</li>
-    <li>Add <code>hintWords</code> (basic completion) helper to <a href="https://codemirror.net/mode/clojure/index.html">clojure</a>, <a href="https://codemirror.net/mode/mllike/index.html">mllike</a>, <a href="https://codemirror.net/mode/julia/">julia</a>, <a href="https://codemirror.net/mode/shell/">shell</a>, and <a href="https://codemirror.net/mode/r/">r</a> modes.</li>
-    <li><a href="https://codemirror.net/mode/clojure/index.html">clojure mode</a>: Clean up and improve.</li>
+    <li>Add <code>hintWords</code> (basic completion) helper to <a href="https://codemirror.net/5/mode/clojure/index.html">clojure</a>, <a href="https://codemirror.net/mode/mllike/index.html">mllike</a>, <a href="https://codemirror.net/mode/julia/">julia</a>, <a href="https://codemirror.net/mode/shell/">shell</a>, and <a href="https://codemirror.net/mode/r/">r</a> modes.</li>
+    <li><a href="https://codemirror.net/5/mode/clojure/index.html">clojure mode</a>: Clean up and improve.</li>
   </ul>
 
-  <p class="rel">25-08-2018: <a href="https://codemirror.net/codemirror-5.40.0.zip">Version 5.40.0</a>:</p>
+  <p class="rel">25-08-2018: <a href="https://codemirror.net/5/codemirror-5.40.0.zip">Version 5.40.0</a>:</p>
 
   <ul class="rel-note">
-    <li>New method <a href="https://codemirror.net/doc/manual.html#phrase"><code>phrase</code></a> and option <a href="https://codemirror.net/doc/manual.html#option_phrases"><code>phrases</code></a> to make translating UI text in addons easier.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Fix issue where bracket-closing wouldn't work before punctuation.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Fix problem where replacing the last remaining panel dropped the newly added panel.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_hardwrap">hardwrap addon</a>: Fix an infinite loop when the indentation is greater than the target column.</li>
-    <li><a href="https://codemirror.net/mode/jinja2/">jinja2</a> and <a href="https://codemirror.net/mode/markdown/">markdown</a> modes: Add comment metadata.</li>
+    <li>New method <a href="https://codemirror.net/5/doc/manual.html#phrase"><code>phrase</code></a> and option <a href="https://codemirror.net/doc/manual.html#option_phrases"><code>phrases</code></a> to make translating UI text in addons easier.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Fix issue where bracket-closing wouldn't work before punctuation.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_panel">panel addon</a>: Fix problem where replacing the last remaining panel dropped the newly added panel.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_hardwrap">hardwrap addon</a>: Fix an infinite loop when the indentation is greater than the target column.</li>
+    <li><a href="https://codemirror.net/5/mode/jinja2/">jinja2</a> and <a href="https://codemirror.net/mode/markdown/">markdown</a> modes: Add comment metadata.</li>
   </ul>
 
-  <p class="rel">20-07-2018: <a href="https://codemirror.net/codemirror-5.39.2.zip">Version 5.39.2</a>:</p>
+  <p class="rel">20-07-2018: <a href="https://codemirror.net/5/codemirror-5.39.2.zip">Version 5.39.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix issue where when you pass the document as a <code>Doc</code> instance to the <code>CodeMirror</code> constructor, the <code>mode</code> option was ignored.</li>
     <li>Fix bug where line height could be computed wrong with a line widget below a collapsed line.</li>
     <li>Fix overeager <code>.npmignore</code> dropping the <code>bin/source-highlight</code> utility from the distribution.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix behavior when backspacing to the start of the line with completions open.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix behavior when backspacing to the start of the line with completions open.</li>
   </ul>
 
-  <p class="rel">20-06-2018: <a href="https://codemirror.net/codemirror-5.39.0.zip">Version 5.39.0</a>:</p>
+  <p class="rel">20-06-2018: <a href="https://codemirror.net/5/codemirror-5.39.0.zip">Version 5.39.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix issue that in some circumstances caused content to be clipped off at the bottom after a resize.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Improve handling of blank lines in HTML tags.</li>
-    <li><a href="https://codemirror.net/mode/stex/">stex mode</a>: Add an <code>inMathMode</code> option to start the mode in math mode.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Improve handling of blank lines in HTML tags.</li>
+    <li><a href="https://codemirror.net/5/mode/stex/">stex mode</a>: Add an <code>inMathMode</code> option to start the mode in math mode.</li>
   </ul>
 
-  <p class="rel">21-05-2018: <a href="https://codemirror.net/codemirror-5.38.0.zip">Version 5.38.0</a>:</p>
+  <p class="rel">21-05-2018: <a href="https://codemirror.net/5/codemirror-5.38.0.zip">Version 5.38.0</a>:</p>
 
   <ul class="rel-note">
     <li>Improve reliability of noticing a missing mouseup event during dragging.</li>
@@ -542,189 +542,189 @@ <h2>Version 5.x</h2>
     <li>Fix interpretation of line breaks and non-breaking spaces inserted by renderer in contentEditable mode.</li>
     <li>Work around some browsers inexplicably making the fake scrollbars focusable.</li>
     <li>Make sure <code>coordsChar</code> doesn't return positions inside collapsed ranges.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support block scopes, bindingless catch, bignum suffix, <code>s</code> regexp flag.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Adjust a wasteful regexp.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Allow opening the control without any item selected.</li>
-    <li>New theme: <a href="https://codemirror.net/demo/theme.html#darcula">darcula</a>.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_dialog">dialog addon</a>: Add a CSS class (<code>dialog-opened</code>) to the editor when a dialog is open.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Support block scopes, bindingless catch, bignum suffix, <code>s</code> regexp flag.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Adjust a wasteful regexp.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Allow opening the control without any item selected.</li>
+    <li>New theme: <a href="https://codemirror.net/5/demo/theme.html#darcula">darcula</a>.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_dialog">dialog addon</a>: Add a CSS class (<code>dialog-opened</code>) to the editor when a dialog is open.</li>
   </ul>
 
-  <p class="rel">20-04-2018: <a href="https://codemirror.net/codemirror-5.37.0.zip">Version 5.37.0</a>:</p>
+  <p class="rel">20-04-2018: <a href="https://codemirror.net/5/codemirror-5.37.0.zip">Version 5.37.0</a>:</p>
 
   <ul class="rel-note">
     <li>Suppress keypress events during composition, for platforms that don't properly do this themselves.</li>
-    <li><a href="https://codemirror.net/demo/folding.html">xml-fold addon</a>: Improve handling of line-wrapped opening tags.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve TypeScript support.</li>
-    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Highlight expressions inside format strings.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add support for '(' and ')' movement.</li>
-    <li>New themes: <a href="https://codemirror.net/demo/theme.html#idea">idea</a>, <a href="https://codemirror.net/demo/theme.html#ssms">ssms</a>, <a href="https://codemirror.net/demo/theme.html#gruvbox-dark">gruvbox-dark</a>.</li>
+    <li><a href="https://codemirror.net/5/demo/folding.html">xml-fold addon</a>: Improve handling of line-wrapped opening tags.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Improve TypeScript support.</li>
+    <li><a href="https://codemirror.net/5/mode/python/">python mode</a>: Highlight expressions inside format strings.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Add support for '(' and ')' movement.</li>
+    <li>New themes: <a href="https://codemirror.net/5/demo/theme.html#idea">idea</a>, <a href="https://codemirror.net/demo/theme.html#ssms">ssms</a>, <a href="https://codemirror.net/demo/theme.html#gruvbox-dark">gruvbox-dark</a>.</li>
   </ul>
 
-  <p class="rel">20-03-2018: <a href="https://codemirror.net/codemirror-5.36.0.zip">Version 5.36.0</a>:</p>
+  <p class="rel">20-03-2018: <a href="https://codemirror.net/5/codemirror-5.36.0.zip">Version 5.36.0</a>:</p>
 
   <ul class="rel-note">
     <li>Make sure all document-level event handlers are registered on the document that the editor is part of.</li>
     <li>Fix issue that prevented edits whose origin starts with <code>+</code> from being combined in history events for an editor-less document.</li>
-    <li><a href="https://codemirror.net/demo/multiplex.html">multiplex addon</a>: Improve handling of indentation.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Use CSS <code>:after</code> element to style the scroll-lock icon.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Don't provide completions in JSON mode.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix numbering error.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Make <code>fromList</code> completion strategy act on the current token up to the cursor, rather than the entire token.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix a regexp with potentially exponental complexity.</li>
-    <li>New theme: <a href="https://codemirror.net/demo/theme.html#lucario">lucario</a>.</li>
+    <li><a href="https://codemirror.net/5/demo/multiplex.html">multiplex addon</a>: Improve handling of indentation.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_merge">merge addon</a>: Use CSS <code>:after</code> element to style the scroll-lock icon.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Don't provide completions in JSON mode.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix numbering error.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Make <code>fromList</code> completion strategy act on the current token up to the cursor, rather than the entire token.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Fix a regexp with potentially exponental complexity.</li>
+    <li>New theme: <a href="https://codemirror.net/5/demo/theme.html#lucario">lucario</a>.</li>
   </ul>
 
-  <p class="rel">20-02-2018: <a href="https://codemirror.net/codemirror-5.35.0.zip">Version 5.35.0</a>:</p>
+  <p class="rel">20-02-2018: <a href="https://codemirror.net/5/codemirror-5.35.0.zip">Version 5.35.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix problem where selection undo might change read-only documents.</li>
     <li>Fix crash when calling <code>addLineWidget</code> on a document that has no attached editor.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix behavior of <code>^</code> in multiline regexp mode.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Fix problem with matching words that have regexp special syntax in them.</li>
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix <code>addCursorToSelection</code> for short lines.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Support alternative delimiters in replace command.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support TypeScript intersection types, dynamic <code>import</code>.</li>
-    <li><a href="https://codemirror.net/mode/stex/">stex mode</a>: Fix parsing of <code>\(</code> <code>\)</code> delimiters, recognize more atom arguments.</li>
-    <li><a href="https://codemirror.net/mode/haskell/">haskell mode</a>: Highlight more builtins, support <code>&lt;*</code> and <code>*&gt;</code>.</li>
-    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.</li>
-    <li><a href="https://codemirror.net/mode/dockerfile/">dockerfile mode</a>: Highlight strings and ports, recognize more instructions.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix behavior of <code>^</code> in multiline regexp mode.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Fix problem with matching words that have regexp special syntax in them.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime bindings</a>: Fix <code>addCursorToSelection</code> for short lines.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Support alternative delimiters in replace command.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Support TypeScript intersection types, dynamic <code>import</code>.</li>
+    <li><a href="https://codemirror.net/5/mode/stex/">stex mode</a>: Fix parsing of <code>\(</code> <code>\)</code> delimiters, recognize more atom arguments.</li>
+    <li><a href="https://codemirror.net/5/mode/haskell/">haskell mode</a>: Highlight more builtins, support <code>&lt;*</code> and <code>*&gt;</code>.</li>
+    <li><a href="https://codemirror.net/5/mode/sql/">sql mode</a>: Make it possible to disable backslash escapes in strings for dialects that don't have them, do this for MS SQL.</li>
+    <li><a href="https://codemirror.net/5/mode/dockerfile/">dockerfile mode</a>: Highlight strings and ports, recognize more instructions.</li>
   </ul>
 
-  <p class="rel">29-01-2018: <a href="https://codemirror.net/codemirror-5.34.0.zip">Version 5.34.0</a>:</p>
+  <p class="rel">29-01-2018: <a href="https://codemirror.net/5/codemirror-5.34.0.zip">Version 5.34.0</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix a problem where inline styles would persist across list items.</li>
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix the <code>toggleBookmark</code> command.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when closing triple quotes.</li>
-    <li><a href="https://codemirror.net/demo/folding.html">xml-fold addon</a>: Fix folding of line-broken XML tags.</li>
-    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Better handling of nested quoting.</li>
-    <li><a href="https://codemirror.net/demo/lint.html">javascript-lint addon</a>: Clean up and simplify.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix support for multiple editors at the same time.</li>
-    <li>New themes: <a href="https://codemirror.net/demo/theme.html#oceanic-next">oceanic-next</a> and <a href="https://codemirror.net/demo/theme.html#shadowfox">shadowfox</a>.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Fix a problem where inline styles would persist across list items.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime bindings</a>: Fix the <code>toggleBookmark</code> command.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when closing triple quotes.</li>
+    <li><a href="https://codemirror.net/5/demo/folding.html">xml-fold addon</a>: Fix folding of line-broken XML tags.</li>
+    <li><a href="https://codemirror.net/5/mode/shell/">shell mode</a>: Better handling of nested quoting.</li>
+    <li><a href="https://codemirror.net/5/demo/lint.html">javascript-lint addon</a>: Clean up and simplify.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix support for multiple editors at the same time.</li>
+    <li>New themes: <a href="https://codemirror.net/5/demo/theme.html#oceanic-next">oceanic-next</a> and <a href="https://codemirror.net/demo/theme.html#shadowfox">shadowfox</a>.</li>
   </ul>
 
-  <p class="rel">21-12-2017: <a href="https://codemirror.net/codemirror-5.33.0.zip">Version 5.33.0</a>:</p>
+  <p class="rel">21-12-2017: <a href="https://codemirror.net/5/codemirror-5.33.0.zip">Version 5.33.0</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Make updates more efficient.</li>
-    <li><a href="https://codemirror.net/mode/css/">css mode</a>: The mode is now properly case-insensitive.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix broken handling of unordered lists introduced in previous release.</li>
-    <li><a href="https://codemirror.net/mode/swift">swift</a> and <a href="https://codemirror.net/mode/clike/">scala</a> modes: Support nested block comments.</li>
-    <li><a href="https://codemirror.net/mode/mllike/index.html">mllike mode</a>: Improve OCaml support.</li>
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Use the proper key bindings for <code>addCursorToNextLine</code> and <code>addCursorToPrevLine</code>.</li>
-    <li><a href="https://codemirror.net/mode/jsx/index.html">jsx mode</a>: Support JSX fragments.</li>
-    <li><a href="https://codemirror.net/demo/closetag.html">closetag addon</a>: Add an option to disable auto-indenting.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_lint">lint addon</a>: Make updates more efficient.</li>
+    <li><a href="https://codemirror.net/5/mode/css/">css mode</a>: The mode is now properly case-insensitive.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_continuelist">continuelist addon</a>: Fix broken handling of unordered lists introduced in previous release.</li>
+    <li><a href="https://codemirror.net/5/mode/swift">swift</a> and <a href="https://codemirror.net/mode/clike/">scala</a> modes: Support nested block comments.</li>
+    <li><a href="https://codemirror.net/5/mode/mllike/index.html">mllike mode</a>: Improve OCaml support.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime bindings</a>: Use the proper key bindings for <code>addCursorToNextLine</code> and <code>addCursorToPrevLine</code>.</li>
+    <li><a href="https://codemirror.net/5/mode/jsx/index.html">jsx mode</a>: Support JSX fragments.</li>
+    <li><a href="https://codemirror.net/5/demo/closetag.html">closetag addon</a>: Add an option to disable auto-indenting.</li>
   </ul>
 
-  <p class="rel">22-11-2017: <a href="https://codemirror.net/codemirror-5.32.0.zip">Version 5.32.0</a>:</p>
+  <p class="rel">22-11-2017: <a href="https://codemirror.net/5/codemirror-5.32.0.zip">Version 5.32.0</a>:</p>
 
   <ul class="rel-note">
     <li>Increase contrast on default bracket-matching colors.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of <code>enum</code> and <code>module</code> keywords.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix bug when uncommenting a comment that spans all but the last selected line.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix bug in case folding.</li>
-    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Prevent single-character deletions from resetting the kill ring.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Tweak quote matching behavior.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Increment ordered list numbers when adding one.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Recognize TypeScript type parameters for calls, type guards, and type parameter defaults. Improve handling of <code>enum</code> and <code>module</code> keywords.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_comment">comment addon</a>: Fix bug when uncommenting a comment that spans all but the last selected line.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix bug in case folding.</li>
+    <li><a href="https://codemirror.net/5/demo/emacs.html">emacs bindings</a>: Prevent single-character deletions from resetting the kill ring.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Tweak quote matching behavior.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_continuelist">continuelist addon</a>: Increment ordered list numbers when adding one.</li>
   </ul>
 
-  <p class="rel">20-10-2017: <a href="https://codemirror.net/codemirror-5.31.0.zip">Version 5.31.0</a>:</p>
+  <p class="rel">20-10-2017: <a href="https://codemirror.net/5/codemirror-5.31.0.zip">Version 5.31.0</a>:</p>
 
   <ul class="rel-note">
-    <li>Modes added with <a href="https://codemirror.net/doc/manual.html#addOverlay"><code>addOverlay</code></a> now have access to a <a href="https://codemirror.net/doc/manual.html#baseToken"><code>baseToken</code></a> method on their input stream, giving access to the tokens of the underlying mode.</li>
+    <li>Modes added with <a href="https://codemirror.net/5/doc/manual.html#addOverlay"><code>addOverlay</code></a> now have access to a <a href="https://codemirror.net/doc/manual.html#baseToken"><code>baseToken</code></a> method on their input stream, giving access to the tokens of the underlying mode.</li>
     <li>Further improve selection drawing and cursor motion in right-to-left documents.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable <a href="https://codemirror.net/doc/manual.html#option_contentEditable">input mode</a>.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_continuecomment">continuecomment addon</a>: Fix bug when pressing enter after a single-line block comment.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix issue with leaving indented fenced code blocks.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Fix ctrl-w behavior, support quote-dot and backtick-dot marks, make the wide cursor visible in contentEditable <a href="https://codemirror.net/doc/manual.html#option_contentEditable">input mode</a>.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_continuecomment">continuecomment addon</a>: Fix bug when pressing enter after a single-line block comment.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Fix issue with leaving indented fenced code blocks.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Fix bad parsing of operators without spaces between them. Fix some corner cases around semicolon insertion and regexps.</li>
   </ul>
 
-  <p class="rel">20-09-2017: <a href="https://codemirror.net/codemirror-5.30.0.zip">Version 5.30.0</a>:</p>
+  <p class="rel">20-09-2017: <a href="https://codemirror.net/5/codemirror-5.30.0.zip">Version 5.30.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fixed a number of issues with drawing right-to-left selections and mouse selection in bidirectional text.</li>
-    <li><a href="https://codemirror.net/demo/search/">search addon</a>: Fix crash when restarting search after doing empty search.</li>
+    <li><a href="https://codemirror.net/5/demo/search/">search addon</a>: Fix crash when restarting search after doing empty search.</li>
     <li><a href="http://cm/doc/manual.html#addon_mark-selection">mark-selection addon</a>: Fix off-by-one bug.</li>
-    <li><a href="https://codemirror.net/demo/tern.html">tern addon</a>: Fix bad request made when editing at the bottom of a large document.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing in a number of corner cases.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.</li>
-    <li><a href="https://codemirror.net/mode/gfm/">gfm mode</a>: Don't highlight SHA1 'hashes' without numbers to avoid false positives.</li>
-    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support injected data and <code>@param</code> in comments.</li>
-    <li><a href="https://codemirror.net/demo/simplemode.html">simple mode addon</a>: Allow groups in regexps when <code>token</code> isn't an array.</li>
+    <li><a href="https://codemirror.net/5/demo/tern.html">tern addon</a>: Fix bad request made when editing at the bottom of a large document.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Improve parsing in a number of corner cases.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Fix crash when a sub-mode doesn't support indentation, allow uppercase X in task lists.</li>
+    <li><a href="https://codemirror.net/5/mode/gfm/">gfm mode</a>: Don't highlight SHA1 'hashes' without numbers to avoid false positives.</li>
+    <li><a href="https://codemirror.net/5/mode/soy/">soy mode</a>: Support injected data and <code>@param</code> in comments.</li>
+    <li><a href="https://codemirror.net/5/demo/simplemode.html">simple mode addon</a>: Allow groups in regexps when <code>token</code> isn't an array.</li>
   </ul>
 
-  <p class="rel">24-08-2017: <a href="https://codemirror.net/codemirror-5.29.0.zip">Version 5.29.0</a>:</p>
+  <p class="rel">24-08-2017: <a href="https://codemirror.net/5/codemirror-5.29.0.zip">Version 5.29.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix crash in contentEditable input style when editing near a bookmark.</li>
-    <li>Make sure change origins are preserved when splitting changes on <a href="https://codemirror.net/doc/manual.html#mark_readOnly">read-only marks</a>.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: More support for TypeScript syntax.</li>
-    <li><a href="https://codemirror.net/mode/d/">d mode</a>: Support nested comments.</li>
-    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Improve tokenizing of operators.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Further improve CommonMark conformance.</li>
-    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Don't run comment tokens through the mode's state machine.</li>
-    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Allow strings to span lines.</li>
-    <li><a href="https://codemirror.net/demo/search/">search addon</a>: Fix crash in persistent search when <code>extraKeys</code> is null.</li>
+    <li>Make sure change origins are preserved when splitting changes on <a href="https://codemirror.net/5/doc/manual.html#mark_readOnly">read-only marks</a>.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: More support for TypeScript syntax.</li>
+    <li><a href="https://codemirror.net/5/mode/d/">d mode</a>: Support nested comments.</li>
+    <li><a href="https://codemirror.net/5/mode/python/">python mode</a>: Improve tokenizing of operators.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Further improve CommonMark conformance.</li>
+    <li><a href="https://codemirror.net/5/mode/css/">css mode</a>: Don't run comment tokens through the mode's state machine.</li>
+    <li><a href="https://codemirror.net/5/mode/shell/">shell mode</a>: Allow strings to span lines.</li>
+    <li><a href="https://codemirror.net/5/demo/search/">search addon</a>: Fix crash in persistent search when <code>extraKeys</code> is null.</li>
   </ul>
 
-  <p class="rel">21-07-2017: <a href="https://codemirror.net/codemirror-5.28.0.zip">Version 5.28.0</a>:</p>
+  <p class="rel">21-07-2017: <a href="https://codemirror.net/5/codemirror-5.28.0.zip">Version 5.28.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix copying of, or replacing editor content with, a single dash character when copying a big selection in some corner cases.</li>
-    <li>Make <a href="https://codemirror.net/doc/manual.html#command_goLineLeft"><code>&quot;goLineLeft&quot;</code></a>/<code>&quot;goLineRight&quot;</code> behave better on wrapped lines.</li>
-    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Fix tokenizing of multi-dot operator and allow digits in subfield names.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix infinite loop on some composed character inputs.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Make list parsing more CommonMark-compliant.</li>
-    <li><a href="https://codemirror.net/mode/gfm/">gfm mode</a>: Highlight colon syntax for emoji.</li>
+    <li>Make <a href="https://codemirror.net/5/doc/manual.html#command_goLineLeft"><code>&quot;goLineLeft&quot;</code></a>/<code>&quot;goLineRight&quot;</code> behave better on wrapped lines.</li>
+    <li><a href="https://codemirror.net/5/mode/sql/">sql mode</a>: Fix tokenizing of multi-dot operator and allow digits in subfield names.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Fix infinite loop on some composed character inputs.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Make list parsing more CommonMark-compliant.</li>
+    <li><a href="https://codemirror.net/5/mode/gfm/">gfm mode</a>: Highlight colon syntax for emoji.</li>
   </ul>
 
-  <p class="rel">29-06-2017: <a href="https://codemirror.net/codemirror-5.27.4.zip">Version 5.27.4</a>:</p>
+  <p class="rel">29-06-2017: <a href="https://codemirror.net/5/codemirror-5.27.4.zip">Version 5.27.4</a>:</p>
 
   <ul class="rel-note">
     <li>Fix crash when using mode lookahead.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Don't block inner mode's indentation support.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Don't block inner mode's indentation support.</li>
   </ul>
 
-  <p class="rel">22-06-2017: <a href="https://codemirror.net/codemirror-5.27.2.zip">Version 5.27.2</a>:</p>
+  <p class="rel">22-06-2017: <a href="https://codemirror.net/5/codemirror-5.27.2.zip">Version 5.27.2</a>:</p>
 
   <ul class="rel-note">
-    <li>Fix crash in the <a href="https://codemirror.net/demo/simplemode.html">simple mode</a> addon.</li>
+    <li>Fix crash in the <a href="https://codemirror.net/5/demo/simplemode.html">simple mode</a> addon.</li>
   </ul>
 
-  <p class="rel">22-06-2017: <a href="https://codemirror.net/codemirror-5.27.0.zip">Version 5.27.0</a>:</p>
+  <p class="rel">22-06-2017: <a href="https://codemirror.net/5/codemirror-5.27.0.zip">Version 5.27.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix infinite loop in forced display update.</li>
     <li>Properly disable the hidden textarea when <code>readOnly</code> is <code>&quot;nocursor&quot;</code>.</li>
     <li>Calling the <code>Doc</code> constructor without <code>new</code> works again.</li>
-    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Handle nested comments.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix bug where markup was ignored on indented paragraph lines.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Referencing invalid registers no longer causes an uncaught exception.</li>
-    <li><a href="https://codemirror.net/mode/rust/">rust mode</a>: Add the correct MIME type.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Document options.</li>
+    <li><a href="https://codemirror.net/5/mode/sql/">sql mode</a>: Handle nested comments.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Fix bug where markup was ignored on indented paragraph lines.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Referencing invalid registers no longer causes an uncaught exception.</li>
+    <li><a href="https://codemirror.net/5/mode/rust/">rust mode</a>: Add the correct MIME type.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Document options.</li>
     <li>Mouse button clicks can now be bound in keymaps by using names like <code>&quot;LeftClick&quot;</code> or <code>&quot;Ctrl-Alt-MiddleTripleClick&quot;</code>. When bound to a function, that function will be passed the position of the click as second argument.</li>
-    <li>The behavior of mouse selection and dragging can now be customized with the <a href="https://codemirror.net/doc/manual.html#option_configureMouse"><code>configureMouse</code></a> option.</li>
-    <li>Modes can now look ahead across line boundaries with the <a href="https://codemirror.net/doc/manual.html#StringStream"><code>StringStream</code></a><code>.lookahead</code> method.</li>
+    <li>The behavior of mouse selection and dragging can now be customized with the <a href="https://codemirror.net/5/doc/manual.html#option_configureMouse"><code>configureMouse</code></a> option.</li>
+    <li>Modes can now look ahead across line boundaries with the <a href="https://codemirror.net/5/doc/manual.html#StringStream"><code>StringStream</code></a><code>.lookahead</code> method.</li>
     <li>Introduces a <code>&quot;type&quot;</code> token type, makes modes that recognize types output it, and add styling for it to the themes.</li>
-    <li>New <a href="https://codemirror.net/doc/manual.html#option_pasteLinesPerSelection"><code>pasteLinesPerSelection</code></a> option to control the behavior of pasting multiple lines into multiple selections.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support multi-line regular expression matches, and normalize strings when matching.</li>
+    <li>New <a href="https://codemirror.net/5/doc/manual.html#option_pasteLinesPerSelection"><code>pasteLinesPerSelection</code></a> option to control the behavior of pasting multiple lines into multiple selections.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_searchcursor">searchcursor addon</a>: Support multi-line regular expression matches, and normalize strings when matching.</li>
   </ul>
 
-  <p class="rel">22-05-2017: <a href="https://codemirror.net/codemirror-5.26.0.zip">Version 5.26.0</a>:</p>
+  <p class="rel">22-05-2017: <a href="https://codemirror.net/5/codemirror-5.26.0.zip">Version 5.26.0</a>:</p>
 
   <ul class="rel-note">
     <li>In textarea-mode, don't reset the input field during composition.</li>
     <li>More careful restoration of selections in widgets, during editor redraw.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Parse line offsets in line or range specs.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: More TypeScript parsing fixes.</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Fix issue where the mode gets stuck.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Understand cross-line links, parse all bracketed things as links.</li>
-    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Support single-quoted strings.</li>
-    <li><a href="https://codemirror.net/mode/go/">go mode</a>: Don't try to indent inside strings or comments.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Parse line offsets in line or range specs.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: More TypeScript parsing fixes.</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Fix issue where the mode gets stuck.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Understand cross-line links, parse all bracketed things as links.</li>
+    <li><a href="https://codemirror.net/5/mode/soy/">soy mode</a>: Support single-quoted strings.</li>
+    <li><a href="https://codemirror.net/5/mode/go/">go mode</a>: Don't try to indent inside strings or comments.</li>
   </ul>
 
-  <p class="rel">20-04-2017: <a href="https://codemirror.net/codemirror-5.25.2.zip">Version 5.25.2</a>:</p>
+  <p class="rel">20-04-2017: <a href="https://codemirror.net/5/codemirror-5.25.2.zip">Version 5.25.2</a>:</p>
 
   <ul class="rel-note">
     <li>Better handling of selections that cover the whole viewport in contentEditable-mode.</li>
@@ -732,12 +732,12 @@ <h2>Version 5.x</h2>
     <li>Work around Chrome Android bug when converting screen coordinates to editor positions.</li>
     <li>Make sure long-clicking a selection sets a cursor and doesn't show the editor losing focus.</li>
     <li>Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Recognize annotations and TypeScript-style type parameters.</li>
-    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Handle nested braces.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Make parsing of strong/em delimiters CommonMark-compliant.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Recognize annotations and TypeScript-style type parameters.</li>
+    <li><a href="https://codemirror.net/5/mode/shell/">shell mode</a>: Handle nested braces.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Make parsing of strong/em delimiters CommonMark-compliant.</li>
   </ul>
 
-  <p class="rel">20-03-2017: <a href="https://codemirror.net/codemirror-5.25.0.zip">Version 5.25.0</a>:</p>
+  <p class="rel">20-03-2017: <a href="https://codemirror.net/5/codemirror-5.25.0.zip">Version 5.25.0</a>:</p>
 
   <ul class=rel-note>
     <li>In contentEditable-mode, properly locate changes that repeat a character when inserted with IME.</li>
@@ -746,163 +746,163 @@ <h2>Version 5.x</h2>
     <li>Count Unicode control characters 0x80 to 0x9F as special (non-printing) chars.</li>
     <li>Fix handling of shadow DOM roots when finding the active element.</li>
     <li>Add <code>role=presentation</code> to more DOM elements to improve screen reader support.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Make aligning of unchanged chunks more robust.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix comment-toggling on a block of text that starts and ends in a (different) block comment.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
-    <li><a href="https://codemirror.net/mode/r/">r mode</a>: Fix indentation after semicolon-less statements.</li>
-    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Properly handle escaped parentheses in parenthesized expressions.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix a few bugs around leaving fenced code blocks.</li>
-    <li><a href="https://codemirror.net/mode/soy/">soy mode</a>: Improve indentation.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_lint">lint addon</a>: Support asynchronous linters that return promises.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_continuelist">continuelist addon</a>: Support continuing task lists.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Make Y behave like yy.</li>
-    <li><a href="https://codemirror.net/mode/sql/">sql mode</a>: Support sqlite dialect.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_merge">merge addon</a>: Make aligning of unchanged chunks more robust.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_comment">comment addon</a>: Fix comment-toggling on a block of text that starts and ends in a (different) block comment.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Improve support for TypeScript syntax.</li>
+    <li><a href="https://codemirror.net/5/mode/r/">r mode</a>: Fix indentation after semicolon-less statements.</li>
+    <li><a href="https://codemirror.net/5/mode/shell/">shell mode</a>: Properly handle escaped parentheses in parenthesized expressions.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Fix a few bugs around leaving fenced code blocks.</li>
+    <li><a href="https://codemirror.net/5/mode/soy/">soy mode</a>: Improve indentation.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_lint">lint addon</a>: Support asynchronous linters that return promises.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_continuelist">continuelist addon</a>: Support continuing task lists.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Make Y behave like yy.</li>
+    <li><a href="https://codemirror.net/5/mode/sql/">sql mode</a>: Support sqlite dialect.</li>
   </ul>
 
-  <p class="rel">22-02-2017: <a href="https://codemirror.net/codemirror-5.24.2.zip">Version 5.24.2</a>:</p>
+  <p class="rel">22-02-2017: <a href="https://codemirror.net/5/codemirror-5.24.2.zip">Version 5.24.2</a>:</p>
 
   <ul class=rel-note>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support computed class method names.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Improve aligning of unchanged code in the presence of marks and line widgets.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Support computed class method names.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_merge">merge addon</a>: Improve aligning of unchanged code in the presence of marks and line widgets.</li>
   </ul>
 
-  <p class="rel">20-02-2017: <a href="https://codemirror.net/codemirror-5.24.0.zip">Version 5.24.0</a>:</p>
+  <p class="rel">20-02-2017: <a href="https://codemirror.net/5/codemirror-5.24.0.zip">Version 5.24.0</a>:</p>
 
   <ul class=rel-note>
     <li>Positions now support a <code>sticky</code> property which determines whether they should be associated with the character before (value <code>"before"</code>) or after (value <code>"after"</code>) them.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Make it possible to remove built-in bindings through the API.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Make it possible to remove built-in bindings through the API.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_comment">comment addon</a>: Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.</li>
     <li>A cursor directly before a line-wrapping break is now drawn before or after the line break depending on which direction you arrived from.</li>
     <li>Visual cursor motion in line-wrapped right-to-left text should be much more correct.</li>
     <li>Fix bug in handling of read-only marked text.</li>
-    <li><a href="https://codemirror.net/mode/shell/">shell mode</a>: Properly tokenize nested parentheses.</li>
-    <li><a href="https://codemirror.net/mode/python/">python mode</a>: Support underscores in number literals.</li>
-    <li><a href="https://codemirror.net/mode/sass/">sass mode</a>: Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset. Now depends on the css mode.</li>
-    <li><a href="https://codemirror.net/mode/css/">css mode</a>: Expose <code>lineComment</code> property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.</li>
-    <li><a href="https://codemirror.net/mode/julia/">julia mode</a>: Properly indent <code>elseif</code> lines.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Properly recognize the end of fenced code blocks when inside other markup.</li>
-    <li><a href="https://codemirror.net/mode/clike/">scala mode</a>: Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.</li>
-    <li><a href="https://codemirror.net/mode/xml/">xml mode</a>: Allow dashes in HTML tag names.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Improve parsing of async methods, TypeScript-style comma-separated superclass lists.</li>
-    <li><a href="https://codemirror.net/demo/folding.html">indent-fold addon</a>: Ignore comment lines.</li>
+    <li><a href="https://codemirror.net/5/mode/shell/">shell mode</a>: Properly tokenize nested parentheses.</li>
+    <li><a href="https://codemirror.net/5/mode/python/">python mode</a>: Support underscores in number literals.</li>
+    <li><a href="https://codemirror.net/5/mode/sass/">sass mode</a>: Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset. Now depends on the css mode.</li>
+    <li><a href="https://codemirror.net/5/mode/css/">css mode</a>: Expose <code>lineComment</code> property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.</li>
+    <li><a href="https://codemirror.net/5/mode/julia/">julia mode</a>: Properly indent <code>elseif</code> lines.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Properly recognize the end of fenced code blocks when inside other markup.</li>
+    <li><a href="https://codemirror.net/5/mode/clike/">scala mode</a>: Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.</li>
+    <li><a href="https://codemirror.net/5/mode/xml/">xml mode</a>: Allow dashes in HTML tag names.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Improve parsing of async methods, TypeScript-style comma-separated superclass lists.</li>
+    <li><a href="https://codemirror.net/5/demo/folding.html">indent-fold addon</a>: Ignore comment lines.</li>
   </ul>
 
-  <p class="rel">19-01-2017: <a href="https://codemirror.net/codemirror-5.23.0.zip">Version 5.23.0</a>:</p>
+  <p class="rel">19-01-2017: <a href="https://codemirror.net/5/codemirror-5.23.0.zip">Version 5.23.0</a>:</p>
 
   <ul class=rel-note>
     <li>Presentation-related elements DOM elements are now marked as such to help screen readers.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Be more picky about what HTML tags look like to avoid false positives.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Be more picky about what HTML tags look like to avoid false positives.</li>
     <li><code>findModeByMIME</code> now understands <code>+json</code> and <code>+xml</code> MIME suffixes.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Add support for an <code>override</code> option to ignore language-specific defaults.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_panel">panel addon</a>: Add a <code>stable</code> option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Add support for an <code>override</code> option to ignore language-specific defaults.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_panel">panel addon</a>: Add a <code>stable</code> option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.</li>
   </ul>
 
-  <p class="rel">20-12-2016: <a href="https://codemirror.net/codemirror-5.22.0.zip">Version 5.22.0</a>:</p>
+  <p class="rel">20-12-2016: <a href="https://codemirror.net/5/codemirror-5.22.0.zip">Version 5.22.0</a>:</p>
 
   <ul class=rel-note>
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Make <code>selectBetweenBrackets</code> work with multiple cursors.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Fix issues with parsing complex TypeScript types, imports, and exports.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime bindings</a>: Make <code>selectBetweenBrackets</code> work with multiple cursors.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Fix issues with parsing complex TypeScript types, imports, and exports.</li>
     <li>A contentEditable editor instance with autofocus enabled no longer crashes during initializing.</li>
-    <li><a href="https://codemirror.net/demo/emacs.html">emacs bindings</a>: Export <code>CodeMirror.emacs</code> to allow other addons to hook into Emacs-style functionality.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_active-line">active-line addon</a>: Add <code>nonEmpty</code> option.</li>
-    <li>New event: <a href="https://codemirror.net/doc/manual.html#event_optionChange"><code>optionChange</code></a>.</li>
+    <li><a href="https://codemirror.net/5/demo/emacs.html">emacs bindings</a>: Export <code>CodeMirror.emacs</code> to allow other addons to hook into Emacs-style functionality.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_active-line">active-line addon</a>: Add <code>nonEmpty</code> option.</li>
+    <li>New event: <a href="https://codemirror.net/5/doc/manual.html#event_optionChange"><code>optionChange</code></a>.</li>
   </ul>
 
-  <p class="rel">21-11-2016: <a href="https://codemirror.net/codemirror-5.21.0.zip">Version 5.21.0</a>:</p>
+  <p class="rel">21-11-2016: <a href="https://codemirror.net/5/codemirror-5.21.0.zip">Version 5.21.0</a>:</p>
 
   <ul class=rel-note>
-    <li>Tapping/clicking the editor in <a href="https://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a> on Chrome now puts the cursor at the tapped position.</li>
-    <li>Fix various crashes and misbehavior when reading composition events in <a href="https://codemirror.net/doc/manual.html#option_inputStyle">contentEditable mode</a>.</li>
+    <li>Tapping/clicking the editor in <a href="https://codemirror.net/5/doc/manual.html#option_inputStyle">contentEditable mode</a> on Chrome now puts the cursor at the tapped position.</li>
+    <li>Fix various crashes and misbehavior when reading composition events in <a href="https://codemirror.net/5/doc/manual.html#option_inputStyle">contentEditable mode</a>.</li>
     <li>Catches and ignores an IE 'Unspecified Error' when creating an editor in an iframe before there is a <code>&lt;body&gt;</code>.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_merge">merge addon</a>: Fix several issues in the chunk-aligning feature.</li>
-    <li><a href="https://codemirror.net/mode/verilog">verilog mode</a>: Rewritten to address various issues.</li>
-    <li><a href="https://codemirror.net/mode/julia">julia mode</a>: Recognize Julia 0.5 syntax.</li>
-    <li><a href="https://codemirror.net/mode/swift">swift mode</a>: Various fixes and adjustments to current syntax.</li>
-    <li><a href="https://codemirror.net/mode/markdown">markdown mode</a>: Allow lists without a blank line above them.</li>
-    <li>The <a href="https://codemirror.net/doc/manual.html#setGutterMarker"><code>setGutterMarker</code></a>, <a href="https://codemirror.net/doc/manual.html#clearGutter"><code>clearGutter</code></a>, and <a href="https://codemirror.net/doc/manual.html#lineInfo"><code>lineInfo</code></a> methods are now available on <code>Doc</code> objects.</li>
-    <li>The <a href="https://codemirror.net/doc/manual.html#heightAtLine"><code>heightAtLine</code></a> method now takes an extra argument to allow finding the height at the top of the line's line widgets.</li>
-    <li><a href="https://codemirror.net/mode/ruby">ruby mode</a>: <code>else</code> and <code>elsif</code> are now immediately indented.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_merge">merge addon</a>: Fix several issues in the chunk-aligning feature.</li>
+    <li><a href="https://codemirror.net/5/mode/verilog">verilog mode</a>: Rewritten to address various issues.</li>
+    <li><a href="https://codemirror.net/5/mode/julia">julia mode</a>: Recognize Julia 0.5 syntax.</li>
+    <li><a href="https://codemirror.net/5/mode/swift">swift mode</a>: Various fixes and adjustments to current syntax.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown">markdown mode</a>: Allow lists without a blank line above them.</li>
+    <li>The <a href="https://codemirror.net/5/doc/manual.html#setGutterMarker"><code>setGutterMarker</code></a>, <a href="https://codemirror.net/doc/manual.html#clearGutter"><code>clearGutter</code></a>, and <a href="https://codemirror.net/doc/manual.html#lineInfo"><code>lineInfo</code></a> methods are now available on <code>Doc</code> objects.</li>
+    <li>The <a href="https://codemirror.net/5/doc/manual.html#heightAtLine"><code>heightAtLine</code></a> method now takes an extra argument to allow finding the height at the top of the line's line widgets.</li>
+    <li><a href="https://codemirror.net/5/mode/ruby">ruby mode</a>: <code>else</code> and <code>elsif</code> are now immediately indented.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Bind Ctrl-T and Ctrl-D to in- and dedent in insert mode.</li>
   </ul>
 
-  <p class="rel">20-10-2016: <a href="https://codemirror.net/codemirror-5.20.0.zip">Version 5.20.0</a>:</p>
+  <p class="rel">20-10-2016: <a href="https://codemirror.net/5/codemirror-5.20.0.zip">Version 5.20.0</a>:</p>
 
   <ul class=rel-note>
     <li>Make <code>newlineAndIndent</code> command work with multiple cursors on the same line.</li>
     <li>Make sure keypress events for backspace are ignored.</li>
     <li>Tokens styled with overlays no longer get a nonsense <code>cm-cm-overlay</code> class.</li>
-    <li>Line endings for pasted content are now normalized to the editor's <a href="https://codemirror.net/doc/manual.html#option_lineSeparator">preferred ending</a>.</li>
-    <li><a href="https://codemirror.net/mode/javascript">javascript mode</a>: Improve support for class expressions. Support TypeScript optional class properties, the <code>abstract</code> keyword, and return type declarations for arrow functions.</li>
-    <li><a href="https://codemirror.net/mode/css">css mode</a>: Fix highlighting of mixed-case keywords.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when typing a quote before a string.</li>
+    <li>Line endings for pasted content are now normalized to the editor's <a href="https://codemirror.net/5/doc/manual.html#option_lineSeparator">preferred ending</a>.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript">javascript mode</a>: Improve support for class expressions. Support TypeScript optional class properties, the <code>abstract</code> keyword, and return type declarations for arrow functions.</li>
+    <li><a href="https://codemirror.net/5/mode/css">css mode</a>: Fix highlighting of mixed-case keywords.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_closebrackets">closebrackets addon</a>: Improve behavior when typing a quote before a string.</li>
     <li>The core is now maintained as a number of small files, using ES6 syntax and modules, under the <code>src/</code> directory. A git checkout no longer contains a working <code>codemirror.js</code> until you <code>npm run build</code> (but when installing from NPM, it is included).</li>
-    <li>The <a href="https://codemirror.net/doc/manual.html#event_refresh"><code>refresh</code></a> event is now documented and stable.</li>
+    <li>The <a href="https://codemirror.net/5/doc/manual.html#event_refresh"><code>refresh</code></a> event is now documented and stable.</li>
   </ul>
 
-  <p class="rel">20-09-2016: <a href="https://codemirror.net/codemirror-5.19.0.zip">Version 5.19.0</a>:</p>
+  <p class="rel">20-09-2016: <a href="https://codemirror.net/5/codemirror-5.19.0.zip">Version 5.19.0</a>:</p>
 
   <ul class=rel-note>
-    <li><a href="https://codemirror.net/mode/erlang">erlang mode</a>: Fix mode crash when trying to read an empty context.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Fix broken behavior when toggling comments inside a comment.</li>
+    <li><a href="https://codemirror.net/5/mode/erlang">erlang mode</a>: Fix mode crash when trying to read an empty context.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_comment">comment addon</a>: Fix broken behavior when toggling comments inside a comment.</li>
     <li>xml-fold addon: Fix a null-dereference bug.</li>
     <li>Page up and page down now do something even in single-line documents.</li>
     <li>Fix an issue where the cursor position could be off in really long (~8000 character) tokens.</li>
-    <li><a href="https://codemirror.net/mode/javascript">javascript mode</a>: Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the <code>type</code> keyword.</li>
-    <li>The <a href="https://codemirror.net/doc/manual.html#event_blur"><code>blur</code></a> and <a href="https://codemirror.net/doc/manual.html#event_focus"><code>focus</code></a> events now pass the DOM event to their handlers.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript">javascript mode</a>: Better indentation when semicolons are missing. Better support for TypeScript classes, optional parameters, and the <code>type</code> keyword.</li>
+    <li>The <a href="https://codemirror.net/5/doc/manual.html#event_blur"><code>blur</code></a> and <a href="https://codemirror.net/doc/manual.html#event_focus"><code>focus</code></a> events now pass the DOM event to their handlers.</li>
   </ul>
 
-  <p class="rel">23-08-2016: <a href="https://codemirror.net/codemirror-5.18.2.zip">Version 5.18.2</a>:</p>
+  <p class="rel">23-08-2016: <a href="https://codemirror.net/5/codemirror-5.18.2.zip">Version 5.18.2</a>:</p>
 
   <ul class=rel-note>
-    <li><a href="https://codemirror.net/mode/vue">vue mode</a>: Fix outdated references to renamed Pug mode dependency.</li>
+    <li><a href="https://codemirror.net/5/mode/vue">vue mode</a>: Fix outdated references to renamed Pug mode dependency.</li>
   </ul>
 
-  <p class="rel">22-08-2016: <a href="https://codemirror.net/codemirror-5.18.0.zip">Version 5.18.0</a>:</p>
+  <p class="rel">22-08-2016: <a href="https://codemirror.net/5/codemirror-5.18.0.zip">Version 5.18.0</a>:</p>
 
   <ul class=rel-note>
-    <li>Make sure <a href="https://codemirror.net/doc/manual.html#addLineClass">gutter backgrounds</a> stick to the rest of the gutter during horizontal scrolling.</li>
-    <li>The contenteditable <a href="https://codemirror.net/doc/manual.html#option_inputStyle"><code>inputStyle</code></a> now properly supports pasting on pre-Edge IE versions.</li>
-    <li><a href="https://codemirror.net/mode/javascript">javascript mode</a>: Fix some small parsing bugs and improve TypeScript support.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix bug where active highlighting was left in editor when the addon was disabled.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Only start highlighting things when the editor gains focus.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Also complete non-enumerable properties.</li>
-    <li>The <a href="https://codemirror.net/doc/manual.html#addOverlay"><code>addOverlay</code></a> method now supports a <code>priority</code> option to control the order in which overlays are applied.</li>
+    <li>Make sure <a href="https://codemirror.net/5/doc/manual.html#addLineClass">gutter backgrounds</a> stick to the rest of the gutter during horizontal scrolling.</li>
+    <li>The contenteditable <a href="https://codemirror.net/5/doc/manual.html#option_inputStyle"><code>inputStyle</code></a> now properly supports pasting on pre-Edge IE versions.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript">javascript mode</a>: Fix some small parsing bugs and improve TypeScript support.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_matchbrackets">matchbrackets addon</a>: Fix bug where active highlighting was left in editor when the addon was disabled.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Only start highlighting things when the editor gains focus.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_javascript-hint">javascript-hint addon</a>: Also complete non-enumerable properties.</li>
+    <li>The <a href="https://codemirror.net/5/doc/manual.html#addOverlay"><code>addOverlay</code></a> method now supports a <code>priority</code> option to control the order in which overlays are applied.</li>
     <li>MIME types that end in <code>+json</code> now default to the JSON mode when the MIME itself is not defined.</li>
-    <li>The mode formerly known as Jade was renamed to <a href="https://codemirror.net/mode/pug">Pug</a>.</li>
-    <li>The <a href="https://codemirror.net/mode/python">Python mode</a> now defaults to Python 3 (rather than 2) syntax.</li>
+    <li>The mode formerly known as Jade was renamed to <a href="https://codemirror.net/5/mode/pug">Pug</a>.</li>
+    <li>The <a href="https://codemirror.net/5/mode/python">Python mode</a> now defaults to Python 3 (rather than 2) syntax.</li>
   </ul>
 
-  <p class="rel">19-07-2016: <a href="https://codemirror.net/codemirror-5.17.0.zip">Version 5.17.0</a>:</p>
+  <p class="rel">19-07-2016: <a href="https://codemirror.net/5/codemirror-5.17.0.zip">Version 5.17.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix problem with wrapped trailing whitespace displaying incorrectly.</li>
     <li>Prevent IME dialog from overlapping typed content in Chrome.</li>
     <li>Improve measuring of characters near a line wrap.</li>
-    <li><a href="https://codemirror.net/mode/javascript">javascript mode</a>: Improve support for <code>async</code>, allow trailing commas in <code>import</code> lists.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Fix backspace in replace mode.</li>
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime bindings</a>: Fix some key bindings on OS X to match Sublime Text.</li>
-    <li><a href="https://codemirror.net/mode/markdown">markdown mode</a>: Add more classes to image links in highlight-formatting mode.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript">javascript mode</a>: Improve support for <code>async</code>, allow trailing commas in <code>import</code> lists.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Fix backspace in replace mode.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime bindings</a>: Fix some key bindings on OS X to match Sublime Text.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown">markdown mode</a>: Add more classes to image links in highlight-formatting mode.</li>
   </ul>
 
-  <p class="rel">20-06-2016: <a href="https://codemirror.net/codemirror-5.16.0.zip">Version 5.16.0</a>:</p>
+  <p class="rel">20-06-2016: <a href="https://codemirror.net/5/codemirror-5.16.0.zip">Version 5.16.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix glitches when dragging content caused by the drop indicator receiving mouse events.</li>
     <li>Make Control-drag work on Firefox.</li>
     <li>Make clicking or selection-dragging at the end of a wrapped line select the right position.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_show-hint">show-hint addon</a>: Prevent widget scrollbar from hiding part of the hint text.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_rulers">rulers addon</a>: Prevent rulers from forcing a horizontal editor scrollbar.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_search">search addon</a>: Automatically bind search-related keys in persistent dialog.</li>
-    <li><a href="https://codemirror.net/demo/sublime.html">sublime keymap</a>: Add a multi-cursor aware smart backspace binding.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Prevent widget scrollbar from hiding part of the hint text.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_rulers">rulers addon</a>: Prevent rulers from forcing a horizontal editor scrollbar.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_search">search addon</a>: Automatically bind search-related keys in persistent dialog.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">sublime keymap</a>: Add a multi-cursor aware smart backspace binding.</li>
   </ul>
 
-  <p class="rel">20-05-2016: <a href="https://codemirror.net/codemirror-5.15.2.zip">Version 5.15.2</a>:</p>
+  <p class="rel">20-05-2016: <a href="https://codemirror.net/5/codemirror-5.15.2.zip">Version 5.15.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix a critical document corruption bug that occurs when a document is gradually grown.</li>
   </ul>
 
-  <p class="rel">20-05-2016: <a href="https://codemirror.net/codemirror-5.15.0.zip">Version 5.15.0</a>:</p>
+  <p class="rel">20-05-2016: <a href="https://codemirror.net/5/codemirror-5.15.0.zip">Version 5.15.0</a>:</p>
 
   <ul class="rel-note">
     <li>Fix bug that caused the selection to reset when focusing the editor in contentEditable input mode.</li>
@@ -911,77 +911,77 @@ <h2>Version 5.x</h2>
     <li>Fix issue where the editor would complain about overlapping collapsed ranges when there weren't any.</li>
     <li>Optimize document tree building when loading or pasting huge chunks of content.</li>
     <li>Explicitly bind Ctrl-O on OS X to make that binding (“open line”) act as expected.</li>
-    <li>Pasting <a href="https://codemirror.net/doc/manual.html#option_lineWiseCopyCut">linewise-copied</a> content when there is no selection now inserts the lines above the current line.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">markdown mode</a>: Fix several issues in matching link targets.</li>
-    <li><a href="https://codemirror.net/mode/clike/">clike mode</a>: Improve indentation of C++ template declarations.</li>
-    <li><a href="https://codemirror.net/mode/javascript/">javascript mode</a>: Support <code>async</code>/<code>await</code> and improve support for TypeScript type syntax.</li>
-  </ul>
-
-  <p class="rel">20-04-2016: <a href="https://codemirror.net/codemirror-5.14.0.zip">Version 5.14.0</a>:</p>
-
-  <ul class="rel-note">
-    <li><a href="https://codemirror.net/doc/manual.html#posFromIndex"><code>posFromIndex</code></a> and <a href="https://codemirror.net/doc/manual.html#indexFromPos"><code>indexFromPos</code></a> now take <a href="https://codemirror.net/doc/manual.html#option_lineSeparator"><code>lineSeparator</code></a> into account</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Only call <code>.save()</code> when it is actually available</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_comment">comment addon</a>: Be careful not to mangle multi-line strings</li>
-    <li><a href="https://codemirror.net/mode/python/index.html">Python mode</a>: Improve distinguishing of decorators from <code>@</code> operators</li>
-    <li><a href="https://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a>: No longer return marks that touch but don't overlap given range</li>
-    <li><a href="https://codemirror.net/demo/vim.html">vim bindings</a>: Add yank command</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Add <code>trim</code> option to disable ignoring of whitespace</li>
-    <li><a href="https://codemirror.net/mode/powershell/index.html">PowerShell mode</a>: Added</li>
-    <li><a href="https://codemirror.net/mode/yacas/index.html">Yacas mode</a>: Added</li>
-    <li><a href="https://codemirror.net/mode/webidl/index.html">Web IDL mode</a>: Added</li>
-    <li><a href="https://codemirror.net/mode/sas/index.html">SAS mode</a>: Added</li>
-    <li><a href="https://codemirror.net/mode/mbox/index.html">mbox mode</a>: Added</li>
+    <li>Pasting <a href="https://codemirror.net/5/doc/manual.html#option_lineWiseCopyCut">linewise-copied</a> content when there is no selection now inserts the lines above the current line.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">markdown mode</a>: Fix several issues in matching link targets.</li>
+    <li><a href="https://codemirror.net/5/mode/clike/">clike mode</a>: Improve indentation of C++ template declarations.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/">javascript mode</a>: Support <code>async</code>/<code>await</code> and improve support for TypeScript type syntax.</li>
+  </ul>
+
+  <p class="rel">20-04-2016: <a href="https://codemirror.net/5/codemirror-5.14.0.zip">Version 5.14.0</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/doc/manual.html#posFromIndex"><code>posFromIndex</code></a> and <a href="https://codemirror.net/doc/manual.html#indexFromPos"><code>indexFromPos</code></a> now take <a href="https://codemirror.net/doc/manual.html#option_lineSeparator"><code>lineSeparator</code></a> into account</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Only call <code>.save()</code> when it is actually available</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_comment">comment addon</a>: Be careful not to mangle multi-line strings</li>
+    <li><a href="https://codemirror.net/5/mode/python/index.html">Python mode</a>: Improve distinguishing of decorators from <code>@</code> operators</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#findMarks"><code>findMarks</code></a>: No longer return marks that touch but don't overlap given range</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Add yank command</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_match-highlighter">match-highlighter addon</a>: Add <code>trim</code> option to disable ignoring of whitespace</li>
+    <li><a href="https://codemirror.net/5/mode/powershell/index.html">PowerShell mode</a>: Added</li>
+    <li><a href="https://codemirror.net/5/mode/yacas/index.html">Yacas mode</a>: Added</li>
+    <li><a href="https://codemirror.net/5/mode/webidl/index.html">Web IDL mode</a>: Added</li>
+    <li><a href="https://codemirror.net/5/mode/sas/index.html">SAS mode</a>: Added</li>
+    <li><a href="https://codemirror.net/5/mode/mbox/index.html">mbox mode</a>: Added</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.13.4...5.14.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">21-03-2016: <a href="https://codemirror.net/codemirror-5.13.2.zip">Version 5.13.2</a>:</p>
+  <p class="rel">21-03-2016: <a href="https://codemirror.net/5/codemirror-5.13.2.zip">Version 5.13.2</a>:</p>
 
   <ul class="rel-note">
     <li>Solves a problem where the gutter would sometimes not extend all the way to the end of the document.</li>
   </ul>
 
-  <p class="rel">21-03-2016: <a href="https://codemirror.net/codemirror-5.13.zip">Version 5.13</a>:</p>
+  <p class="rel">21-03-2016: <a href="https://codemirror.net/5/codemirror-5.13.zip">Version 5.13</a>:</p>
 
   <ul class="rel-note">
-    <li>New DOM event forwarded: <a href="https://codemirror.net/doc/manual.html#event_dom"><code>&quot;dragleave&quot;</code></a>.</li>
-    <li><a href="https://codemirror.net/mode/protobuf/index.html">protobuf mode</a>: Newly added.</li>
-    <li>Fix problem where <a href="https://codemirror.net/doc/manual.html#findMarks"><code>findMarks</code></a> sometimes failed to find multi-line marks.</li>
+    <li>New DOM event forwarded: <a href="https://codemirror.net/5/doc/manual.html#event_dom"><code>&quot;dragleave&quot;</code></a>.</li>
+    <li><a href="https://codemirror.net/5/mode/protobuf/index.html">protobuf mode</a>: Newly added.</li>
+    <li>Fix problem where <a href="https://codemirror.net/5/doc/manual.html#findMarks"><code>findMarks</code></a> sometimes failed to find multi-line marks.</li>
     <li>Fix crash that showed up when atomic ranges and bidi text were combined.</li>
-    <li><a href="https://codemirror.net/demo/complete.html">show-hint addon</a>: Completion widgets no longer close when the line indented or dedented.</li>
-    <li><a href="https://codemirror.net/demo/merge.html">merge addon</a>: Fix bug when merging chunks at the end of the file.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_placeholder">placeholder addon</a>: No longer gets confused by <a href="https://codemirror.net/doc/manual.html#swapDoc"><code>swapDoc</code></a>.</li>
-    <li><a href="https://codemirror.net/doc/manual.html#addon_simplescrollbars">simplescrollbars addon</a>: Fix invalid state when deleting at end of document.</li>
-    <li><a href="https://codemirror.net/mode/clike/index.html">clike mode</a>: No longer gets confused when a comment starts after an operator.</li>
-    <li><a href="https://codemirror.net/mode/markdown/index.html">markdown mode</a>: Now supports CommonMark-style flexible list indentation.</li>
-    <li><a href="https://codemirror.net/mode/dylan/index.html">dylan mode</a>: Several improvements and fixes.</li>
+    <li><a href="https://codemirror.net/5/demo/complete.html">show-hint addon</a>: Completion widgets no longer close when the line indented or dedented.</li>
+    <li><a href="https://codemirror.net/5/demo/merge.html">merge addon</a>: Fix bug when merging chunks at the end of the file.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_placeholder">placeholder addon</a>: No longer gets confused by <a href="https://codemirror.net/doc/manual.html#swapDoc"><code>swapDoc</code></a>.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_simplescrollbars">simplescrollbars addon</a>: Fix invalid state when deleting at end of document.</li>
+    <li><a href="https://codemirror.net/5/mode/clike/index.html">clike mode</a>: No longer gets confused when a comment starts after an operator.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/index.html">markdown mode</a>: Now supports CommonMark-style flexible list indentation.</li>
+    <li><a href="https://codemirror.net/5/mode/dylan/index.html">dylan mode</a>: Several improvements and fixes.</li>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.12.0...5.13.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">19-02-2016: <a href="https://codemirror.net/codemirror-5.12.zip">Version 5.12</a>:</p>
+  <p class="rel">19-02-2016: <a href="https://codemirror.net/5/codemirror-5.12.zip">Version 5.12</a>:</p>
 
   <ul class="rel-note">
-    <li><a href="https://codemirror.net/demo/vim.html">Vim bindings</a>: Ctrl-Q is now an alias for Ctrl-V.</li>
-    <li><a href="https://codemirror.net/demo/vim.html">Vim bindings</a>: The Vim API now exposes an <code>unmap</code> method to unmap bindings.</li>
-    <li><a href="https://codemirror.net/demo/activeline.html">active-line addon</a>: This addon can now style the active line's gutter.</li>
-    <li><a href="https://codemirror.net/mode/fcl/">FCL mode</a>: Newly added.</li>
-    <li><a href="https://codemirror.net/mode/sql/">SQL mode</a>: Now has a Postgresql dialect.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">Vim bindings</a>: Ctrl-Q is now an alias for Ctrl-V.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">Vim bindings</a>: The Vim API now exposes an <code>unmap</code> method to unmap bindings.</li>
+    <li><a href="https://codemirror.net/5/demo/activeline.html">active-line addon</a>: This addon can now style the active line's gutter.</li>
+    <li><a href="https://codemirror.net/5/mode/fcl/">FCL mode</a>: Newly added.</li>
+    <li><a href="https://codemirror.net/5/mode/sql/">SQL mode</a>: Now has a Postgresql dialect.</li>
     <li>Fix <a href="https://github.com/codemirror/CodeMirror/issues/3781">issue</a> where trying to scroll to a horizontal position outside of the document's width could cause the gutter to be positioned incorrectly.</li>
     <li>Use absolute, rather than fixed positioning in the context-menu intercept hack, to work around a <a href="https://github.com/codemirror/CodeMirror/issues/3238">problem</a> when the editor is inside a transformed parent container.</li>
     <li>Solve a <a href="https://github.com/codemirror/CodeMirror/issues/3821">problem</a> where the horizontal scrollbar could hide text in Firefox.</li>
     <li>Fix a <a href="https://github.com/codemirror/CodeMirror/issues/3834">bug</a> that caused phantom scroll space under the text in some situations.</li>
-    <li><a href="https://codemirror.net/demo/sublime.html">Sublime Text bindings</a>: Bind delete-line to Shift-Ctrl-K on OS X.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">Markdown mode</a>: Fix <a href="https://github.com/codemirror/CodeMirror/issues/3787">issue</a> where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">Markdown mode</a>: Ignore backslashes in code fragments.</li>
-    <li><a href="https://codemirror.net/mode/markdown/">Markdown mode</a>: Use whichever mode is registered as <code>text/html</code> to parse HTML.</li>
-    <li><a href="https://codemirror.net/mode/clike/">Clike mode</a>: Improve indentation of Scala <code>=&gt;</code> functions.</li>
-    <li><a href="https://codemirror.net/mode/python/">Python mode</a>: Improve indentation of bracketed code.</li>
-    <li><a href="https://codemirror.net/mode/htmlmixed/">HTMLMixed mode</a>: Support multi-line opening tags for sub-languages (<code>&lt;script&gt;</code>, <code>&lt;style&gt;</code>, etc).</li>
-    <li><a href="https://codemirror.net/mode/spreadsheet/">Spreadsheet mode</a>: Fix bug where the mode did not advance the stream when finding a backslash.</li>
-    <li><a href="https://codemirror.net/mode/xml/">XML mode</a>: The mode now takes a <code>matchClosing</code> option to configure whether mismatched closing tags should be highlighted as errors.</li>
+    <li><a href="https://codemirror.net/5/demo/sublime.html">Sublime Text bindings</a>: Bind delete-line to Shift-Ctrl-K on OS X.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">Markdown mode</a>: Fix <a href="https://github.com/codemirror/CodeMirror/issues/3787">issue</a> where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">Markdown mode</a>: Ignore backslashes in code fragments.</li>
+    <li><a href="https://codemirror.net/5/mode/markdown/">Markdown mode</a>: Use whichever mode is registered as <code>text/html</code> to parse HTML.</li>
+    <li><a href="https://codemirror.net/5/mode/clike/">Clike mode</a>: Improve indentation of Scala <code>=&gt;</code> functions.</li>
+    <li><a href="https://codemirror.net/5/mode/python/">Python mode</a>: Improve indentation of bracketed code.</li>
+    <li><a href="https://codemirror.net/5/mode/htmlmixed/">HTMLMixed mode</a>: Support multi-line opening tags for sub-languages (<code>&lt;script&gt;</code>, <code>&lt;style&gt;</code>, etc).</li>
+    <li><a href="https://codemirror.net/5/mode/spreadsheet/">Spreadsheet mode</a>: Fix bug where the mode did not advance the stream when finding a backslash.</li>
+    <li><a href="https://codemirror.net/5/mode/xml/">XML mode</a>: The mode now takes a <code>matchClosing</code> option to configure whether mismatched closing tags should be highlighted as errors.</li>
   </ul>
 
-  <p class="rel">20-01-2016: <a href="https://codemirror.net/codemirror-5.11.zip">Version 5.11</a>:</p>
+  <p class="rel">20-01-2016: <a href="https://codemirror.net/5/codemirror-5.11.zip">Version 5.11</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/jsx/index.html">JSX</a>, <a href="../mode/haskell-literate/index.html">literate Haskell</a></li>
@@ -992,7 +992,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.10.0...5.11.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">21-12-2015: <a href="https://codemirror.net/codemirror-5.10.zip">Version 5.10</a>:</p>
+  <p class="rel">21-12-2015: <a href="https://codemirror.net/5/codemirror-5.10.zip">Version 5.10</a>:</p>
 
   <ul class="rel-note">
     <li>Modify the way <a href="manual.html#mark_atomic">atomic ranges</a> are skipped by selection to try and make it less surprising.</li>
@@ -1005,7 +1005,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.9.0...5.10.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">23-11-2015: <a href="https://codemirror.net/codemirror-5.9.zip">Version 5.9</a>:</p>
+  <p class="rel">23-11-2015: <a href="https://codemirror.net/5/codemirror-5.9.zip">Version 5.9</a>:</p>
 
   <ul class="rel-note">
     <li>Improve the way overlay (OS X-style) scrollbars are handled</li>
@@ -1016,7 +1016,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.8.0...5.9.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-10-2015: <a href="https://codemirror.net/codemirror-5.8.zip">Version 5.8</a>:</p>
+  <p class="rel">20-10-2015: <a href="https://codemirror.net/5/codemirror-5.8.zip">Version 5.8</a>:</p>
 
   <ul class="rel-note">
     <li>Fixes an infinite loop in
@@ -1029,7 +1029,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.7.0...5.8.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-09-2015: <a href="https://codemirror.net/codemirror-5.7.zip">Version 5.7</a>:</p>
+  <p class="rel">20-09-2015: <a href="https://codemirror.net/5/codemirror-5.7.zip">Version 5.7</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/vue/index.html">Vue</a>, <a href="../mode/oz/index.html">Oz</a>, <a href="../mode/mscgen/index.html">MscGen</a> (and dialects), <a href="../mode/css/gss.html">Closure Stylesheets</a></li>
@@ -1043,7 +1043,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.6.0...5.7.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-08-2015: <a href="https://codemirror.net/codemirror-5.6.zip">Version 5.6</a>:</p>
+  <p class="rel">20-08-2015: <a href="https://codemirror.net/5/codemirror-5.6.zip">Version 5.6</a>:</p>
 
   <ul class="rel-note">
     <li>Fix bug where you could paste into a <code>readOnly</code> editor</li>
@@ -1057,7 +1057,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.5.0...5.6.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-07-2015: <a href="https://codemirror.net/codemirror-5.5.zip">Version 5.5</a>:</p>
+  <p class="rel">20-07-2015: <a href="https://codemirror.net/5/codemirror-5.5.zip">Version 5.5</a>:</p>
 
   <ul class="rel-note">
     <li>New option: <a href="manual.html#option_lineSeparator"><code>lineSeparator</code></a> (with corresponding <a href="manual.html#lineSeparator">method</a>)
@@ -1070,7 +1070,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.4.0...5.5.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">25-06-2015: <a href="https://codemirror.net/codemirror-5.4.zip">Version 5.4</a>:</p>
+  <p class="rel">25-06-2015: <a href="https://codemirror.net/5/codemirror-5.4.zip">Version 5.4</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/twig/index.html">Twig</a>, <a href="../mode/elm/index.html">Elm</a>, <a href="../mode/factor/index.html">Factor</a>, <a href="../mode/swift/index.html">Swift</a></li>
@@ -1079,7 +1079,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.3.0...5.4.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-05-2015: <a href="https://codemirror.net/codemirror-5.3.zip">Version 5.3</a>:</p>
+  <p class="rel">20-05-2015: <a href="https://codemirror.net/5/codemirror-5.3.zip">Version 5.3</a>:</p>
 
   <ul class="rel-note">
     <li>Fix several regressions in the <a href="manual.html#addon_show-hint"><code>show-hint</code></a> addon (<code>completeSingle</code> option, <code>"shown"</code> and <code>"close"</code> events)</li>
@@ -1089,7 +1089,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.2.0...5.3.0">list of patches</a></li>
   </ul>
 
-  <p class="rel">20-04-2015: <a href="https://codemirror.net/codemirror-5.2.zip">Version 5.2</a>:</p>
+  <p class="rel">20-04-2015: <a href="https://codemirror.net/5/codemirror-5.2.zip">Version 5.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix several race conditions
@@ -1106,7 +1106,7 @@ <h2>Version 5.x</h2>
     <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="https://codemirror.net/codemirror-5.1.zip">Version 5.1</a>:</p>
+  <p class="rel">23-03-2015: <a href="https://codemirror.net/5/codemirror-5.1.zip">Version 5.1</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/asciiarmor/index.html">ASCII armor</a> (PGP data), <a href="../mode/troff/index.html">Troff</a>, and <a href="../mode/cmake/index.html">CMake</a>.</li>
@@ -1117,7 +1117,7 @@ <h2>Version 5.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/5.0.0...5.1.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-02-2015: <a href="https://codemirror.net/codemirror-5.0.zip">Version 5.0</a>:</p>
+  <p class="rel">20-02-2015: <a href="https://codemirror.net/5/codemirror-5.0.zip">Version 5.0</a>:</p>
 
   <ul class="rel-note">
     <li>Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)</li>
@@ -1133,7 +1133,7 @@ <h2>Version 5.x</h2>
 
   <h2>Version 4.x</h2>
 
-  <p class="rel">20-02-2015: <a href="https://codemirror.net/codemirror-4.13.zip">Version 4.13</a>:</p>
+  <p class="rel">20-02-2015: <a href="https://codemirror.net/5/codemirror-4.13.zip">Version 4.13</a>:</p>
 
   <ul class="rel-note">
     <li>Fix the way the <a href="../demo/closetag.html"><code>closetag</code></a> demo handles the slash character.</li>
@@ -1143,7 +1143,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.12.0...4.13.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-01-2015: <a href="https://codemirror.net/codemirror-4.12.zip">Version 4.12</a>:</p>
+  <p class="rel">22-01-2015: <a href="https://codemirror.net/5/codemirror-4.12.zip">Version 4.12</a>:</p>
 
   <ul class="rel-note">
     <li>The <a href="manual.html#addon_closetag"><code>closetag</code></a>
@@ -1163,19 +1163,19 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.11.0...4.12.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">9-01-2015: <a href="https://codemirror.net/codemirror-4.11.zip">Version 4.11</a>:</p>
+  <p class="rel">9-01-2015: <a href="https://codemirror.net/5/codemirror-4.11.zip">Version 4.11</a>:</p>
 
   <p class="rel-note">Unfortunately, 4.10 did not take care of the
   Firefox scrolling issue entirely. This release adds two more patches
   to address that.</p>
 
-  <p class="rel">29-12-2014: <a href="https://codemirror.net/codemirror-4.10.zip">Version 4.10</a>:</p>
+  <p class="rel">29-12-2014: <a href="https://codemirror.net/5/codemirror-4.10.zip">Version 4.10</a>:</p>
 
   <p class="rel-note">Emergency single-patch update to 4.9. Fixes
   Firefox-specific problem where the cursor could end up behind the
   horizontal scrollbar.</p>
 
-  <p class="rel">23-12-2014: <a href="https://codemirror.net/codemirror-4.9.zip">Version 4.9</a>:</p>
+  <p class="rel">23-12-2014: <a href="https://codemirror.net/5/codemirror-4.9.zip">Version 4.9</a>:</p>
 
   <ul class="rel-note">
     <li>Overhauled scroll bar handling.
@@ -1198,7 +1198,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.8.0...4.9.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-11-2014: <a href="https://codemirror.net/codemirror-4.8.zip">Version 4.8</a>:</p>
+  <p class="rel">22-11-2014: <a href="https://codemirror.net/5/codemirror-4.8.zip">Version 4.8</a>:</p>
 
   <ul class="rel-note">
     <li>Built-in support for <a href="manual.html#normalizeKeyMap">multi-stroke key bindings</a>.</li>
@@ -1210,7 +1210,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.7.0...4.8.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-10-2014: <a href="https://codemirror.net/codemirror-4.7.zip">Version 4.7</a>:</p>
+  <p class="rel">20-10-2014: <a href="https://codemirror.net/5/codemirror-4.7.zip">Version 4.7</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Incompatible</strong>:
@@ -1241,7 +1241,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.6.0...4.7.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-09-2014: <a href="https://codemirror.net/codemirror-4.6.zip">Version 4.6</a>:</p>
+  <p class="rel">19-09-2014: <a href="https://codemirror.net/5/codemirror-4.6.zip">Version 4.6</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/modelica/index.html">Modelica</a></li>
@@ -1250,7 +1250,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.5.0...4.6.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-08-2014: <a href="https://codemirror.net/codemirror-4.5.zip">Version 4.5</a>:</p>
+  <p class="rel">21-08-2014: <a href="https://codemirror.net/5/codemirror-4.5.zip">Version 4.5</a>:</p>
 
   <ul class="rel-note">
     <li>Fix several serious bugs with horizontal scrolling</li>
@@ -1260,7 +1260,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.4.0...4.5.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-07-2014: <a href="https://codemirror.net/codemirror-4.4.zip">Version 4.4</a>:</p>
+  <p class="rel">21-07-2014: <a href="https://codemirror.net/5/codemirror-4.4.zip">Version 4.4</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Note:</strong> Some events might now fire in slightly
@@ -1274,7 +1274,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.3.0...4.4.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">23-06-2014: <a href="https://codemirror.net/codemirror-4.3.zip">Version 4.3</a>:</p>
+  <p class="rel">23-06-2014: <a href="https://codemirror.net/5/codemirror-4.3.zip">Version 4.3</a>:</p>
 
   <ul class="rel-note">
     <li>Several <a href="../demo/vim.html">vim bindings</a>
@@ -1287,7 +1287,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.2.0...4.3.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-05-2014: <a href="https://codemirror.net/codemirror-4.2.zip">Version 4.2</a>:</p>
+  <p class="rel">19-05-2014: <a href="https://codemirror.net/5/codemirror-4.2.zip">Version 4.2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix problem where some modes were broken by the fact that empty tokens were forbidden.</li>
@@ -1304,7 +1304,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.1.0...4.2.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-04-2014: <a href="https://codemirror.net/codemirror-4.1.zip">Version 4.1</a>:</p>
+  <p class="rel">22-04-2014: <a href="https://codemirror.net/5/codemirror-4.1.zip">Version 4.1</a>:</p>
 
   <ul class="rel-note">
     <li><em>Slightly incompatible</em>:
@@ -1319,7 +1319,7 @@ <h2>Version 4.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/4.0.3...4.1.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-03-2014: <a href="https://codemirror.net/codemirror-4.0.zip">Version 4.0</a>:</p>
+  <p class="rel">20-03-2014: <a href="https://codemirror.net/5/codemirror-4.0.zip">Version 4.0</a>:</p>
 
   <p class="rel-note">This is a new major version of CodeMirror. There
   are a few <strong>incompatible</strong> changes in the API. Upgrade
@@ -1341,13 +1341,13 @@ <h2>Version 4.x</h2>
 
   <h2>Version 3.x</h2>
 
-  <p class="rel">22-04-2014: <a href="https://codemirror.net/codemirror-3.24.zip">Version 3.24</a>:</p>
+  <p class="rel">22-04-2014: <a href="https://codemirror.net/5/codemirror-3.24.zip">Version 3.24</a>:</p>
 
   <p class="rel-note">Merges the improvements from 4.1 that could
   easily be applied to the 3.x code. Also improves the way the editor
   size is updated when line widgets change.</p>
 
-  <p class="rel">20-03-2014: <a href="https://codemirror.net/codemirror-3.23.zip">Version 3.23</a>:</p>
+  <p class="rel">20-03-2014: <a href="https://codemirror.net/5/codemirror-3.23.zip">Version 3.23</a>:</p>
 
   <ul class="rel-note">
     <li>In the <a href="../mode/xml/index.html">XML mode</a>,
@@ -1357,7 +1357,7 @@ <h2>Version 3.x</h2>
     <li>Many improvements to the <a href="../demo/vim.html">Vim bindings</a>.</li>
   </ul>
 
-  <p class="rel">21-02-2014: <a href="https://codemirror.net/codemirror-3.22.zip">Version 3.22</a>:</p>
+  <p class="rel">21-02-2014: <a href="https://codemirror.net/5/codemirror-3.22.zip">Version 3.22</a>:</p>
 
   <ul class="rel-note">
     <li>Adds the <a href="manual.html#findMarks"><code>findMarks</code></a> method.</li>
@@ -1367,7 +1367,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.21.0...3.22.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">16-01-2014: <a href="https://codemirror.net/codemirror-3.21.zip">Version 3.21</a>:</p>
+  <p class="rel">16-01-2014: <a href="https://codemirror.net/5/codemirror-3.21.zip">Version 3.21</a>:</p>
 
   <ul class="rel-note">
     <li>Auto-indenting a block will no longer add trailing whitespace to blank lines.</li>
@@ -1381,7 +1381,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.20.0...3.21.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-11-2013: <a href="https://codemirror.net/codemirror-3.20.zip">Version 3.20</a>:</p>
+  <p class="rel">21-11-2013: <a href="https://codemirror.net/5/codemirror-3.20.zip">Version 3.20</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/julia/index.html">Julia</a> and <a href="../mode/pegjs/index.html">PEG.js</a>.</li>
@@ -1392,7 +1392,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.19.0...3.20.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-10-2013: <a href="https://codemirror.net/codemirror-3.19.zip">Version 3.19</a>:</p>
+  <p class="rel">21-10-2013: <a href="https://codemirror.net/5/codemirror-3.19.zip">Version 3.19</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/eiffel/index.html">Eiffel</a>, <a href="../mode/gherkin/index.html">Gherkin</a>, <a href="../mode/sql/?mime=text/x-mssql">MSSQL dialect</a>.</li>
@@ -1402,13 +1402,13 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.18.0...3.19.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">23-09-2013: <a href="https://codemirror.net/codemirror-3.18.zip">Version 3.18</a>:</p>
+  <p class="rel">23-09-2013: <a href="https://codemirror.net/5/codemirror-3.18.zip">Version 3.18</a>:</p>
 
   <p class="rel-note">Emergency release to fix a problem in 3.17
   where <code>.setOption("lineNumbers", false)</code> would raise an
   error.</p>
 
-  <p class="rel">23-09-2013: <a href="https://codemirror.net/codemirror-3.17.zip">Version 3.17</a>:</p>
+  <p class="rel">23-09-2013: <a href="https://codemirror.net/5/codemirror-3.17.zip">Version 3.17</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/fortran/index.html">Fortran</a>, <a href="../mode/octave/index.html">Octave</a> (Matlab), <a href="../mode/toml/index.html">TOML</a>, and <a href="../mode/dtd/index.html">DTD</a>.</li>
@@ -1417,7 +1417,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.16.0...3.17.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-08-2013: <a href="https://codemirror.net/codemirror-3.16.zip">Version 3.16</a>:</p>
+  <p class="rel">21-08-2013: <a href="https://codemirror.net/5/codemirror-3.16.zip">Version 3.16</a>:</p>
 
   <ul class="rel-note">
     <li>The whole codebase is now under a single <a href="../LICENSE">license</a> file.</li>
@@ -1429,7 +1429,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.15.0...3.16.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">29-07-2013: <a href="https://codemirror.net/codemirror-3.15.zip">Version 3.15</a>:</p>
+  <p class="rel">29-07-2013: <a href="https://codemirror.net/5/codemirror-3.15.zip">Version 3.15</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/jade/index.html">Jade</a>, <a href="../mode/nginx/index.html">Nginx</a>.</li>
@@ -1440,7 +1440,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.14.0...3.15.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-06-2013: <a href="https://codemirror.net/codemirror-3.14.zip">Version 3.14</a>:</p>
+  <p class="rel">20-06-2013: <a href="https://codemirror.net/5/codemirror-3.14.zip">Version 3.14</a>:</p>
 
   <ul class="rel-note">
     <li>New
@@ -1467,7 +1467,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/3.13.0...3.14.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-05-2013: <a href="https://codemirror.net/codemirror-3.13.zip">Version 3.13</a>:</p>
+  <p class="rel">20-05-2013: <a href="https://codemirror.net/5/codemirror-3.13.zip">Version 3.13</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/cobol/index.html">COBOL</a> and <a href="../mode/haml/index.html">HAML</a>.</li>
@@ -1477,7 +1477,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.12...3.13.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-04-2013: <a href="https://codemirror.net/codemirror-3.12.zip">Version 3.12</a>:</p>
+  <p class="rel">19-04-2013: <a href="https://codemirror.net/5/codemirror-3.12.zip">Version 3.12</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/gas/index.html">GNU assembler</a>.</li>
@@ -1491,7 +1491,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.11...v3.12">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-03-2013: <a href="https://codemirror.net/codemirror-3.11.zip">Version 3.11</a>:</p>
+  <p class="rel">20-03-2013: <a href="https://codemirror.net/5/codemirror-3.11.zip">Version 3.11</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Removed code:</strong> <code>collapserange</code>,
@@ -1516,7 +1516,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.1...v3.11">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">21-02-2013: <a href="https://codemirror.net/codemirror-3.1.zip">Version 3.1</a>:</p>
+  <p class="rel">21-02-2013: <a href="https://codemirror.net/5/codemirror-3.1.zip">Version 3.1</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Incompatible:</strong> key handlers may
@@ -1553,13 +1553,13 @@ <h2>Version 3.x</h2>
   </ul>
 
 
-  <p class="rel">25-01-2013: <a href="https://codemirror.net/codemirror-3.02.zip">Version 3.02</a>:</p>
+  <p class="rel">25-01-2013: <a href="https://codemirror.net/5/codemirror-3.02.zip">Version 3.02</a>:</p>
 
   <p class="rel-note">Single-bugfix release. Fixes a problem that
   prevents CodeMirror instances from being garbage-collected after
   they become unused.</p>
 
-  <p class="rel">21-01-2013: <a href="https://codemirror.net/codemirror-3.01.zip">Version 3.01</a>:</p>
+  <p class="rel">21-01-2013: <a href="https://codemirror.net/5/codemirror-3.01.zip">Version 3.01</a>:</p>
 
   <ul class="rel-note">
     <li>Move all add-ons into an organized directory structure
@@ -1578,7 +1578,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0...v3.01">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">10-12-2012: <a href="https://codemirror.net/codemirror-3.0.zip">Version 3.0</a>:</p>
+  <p class="rel">10-12-2012: <a href="https://codemirror.net/5/codemirror-3.0.zip">Version 3.0</a>:</p>
 
   <p class="rel-note"><strong>New major version</strong>. Only
   partially backwards-compatible. See
@@ -1592,7 +1592,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0rc2...v3.0">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-11-2012: <a href="https://codemirror.net/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
+  <p class="rel">20-11-2012: <a href="https://codemirror.net/5/codemirror-3.0rc2.zip">Version 3.0, release candidate 2</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/http/index.html">HTTP</a>.</li>
@@ -1604,7 +1604,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0rc1...v3.0rc2">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-11-2012: <a href="https://codemirror.net/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
+  <p class="rel">20-11-2012: <a href="https://codemirror.net/5/codemirror-3.0rc1.zip">Version 3.0, release candidate 1</a>:</p>
 
   <ul class="rel-note">
     <li>New theme: <a href="../demo/theme.html#solarized%20light">Solarized</a>.</li>
@@ -1621,7 +1621,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0beta2...v3.0rc1">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-10-2012: <a href="https://codemirror.net/codemirror-3.0beta2.zip">Version 3.0, beta 2</a>:</p>
+  <p class="rel">22-10-2012: <a href="https://codemirror.net/5/codemirror-3.0beta2.zip">Version 3.0, beta 2</a>:</p>
 
   <ul class="rel-note">
     <li>Fix page-based coordinate computation.</li>
@@ -1637,7 +1637,7 @@ <h2>Version 3.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v3.0beta1...v3.0beta2">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-09-2012: <a href="https://codemirror.net/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
+  <p class="rel">19-09-2012: <a href="https://codemirror.net/5/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
 
   <ul class="rel-note">
     <li>Bi-directional text support.</li>
@@ -1653,14 +1653,14 @@ <h2>Version 3.x</h2>
 
   <h2>Version 2.x</h2>
 
-  <p class="rel">21-01-2013: <a href="https://codemirror.net/codemirror-2.38.zip">Version 2.38</a>:</p>
+  <p class="rel">21-01-2013: <a href="https://codemirror.net/5/codemirror-2.38.zip">Version 2.38</a>:</p>
 
   <p class="rel-note">Integrate some bugfixes, enhancements to the vim keymap, and new
   modes
   (<a href="../mode/d/index.html">D</a>, <a href="../mode/sass/index.html">Sass</a>, <a href="../mode/apl/index.html">APL</a>)
   from the v3 branch.</p>
 
-  <p class="rel">20-12-2012: <a href="https://codemirror.net/codemirror-2.37.zip">Version 2.37</a>:</p>
+  <p class="rel">20-12-2012: <a href="https://codemirror.net/5/codemirror-2.37.zip">Version 2.37</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/sql/index.html">SQL</a> (will replace <a href="../mode/plsql/index.html">plsql</a> and <a href="../mode/mysql/index.html">mysql</a> modes).</li>
@@ -1669,7 +1669,7 @@ <h2>Version 2.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v2.36...v2.37">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">20-11-2012: <a href="https://codemirror.net/codemirror-2.36.zip">Version 2.36</a>:</p>
+  <p class="rel">20-11-2012: <a href="https://codemirror.net/5/codemirror-2.36.zip">Version 2.36</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/z80/index.html">Z80 assembly</a>.</li>
@@ -1683,7 +1683,7 @@ <h2>Version 2.x</h2>
     <li>Full <a href="../https://github.com/codemirror/CodeMirror/compare/v2.35...v2.36">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">22-10-2012: <a href="https://codemirror.net/codemirror-2.35.zip">Version 2.35</a>:</p>
+  <p class="rel">22-10-2012: <a href="https://codemirror.net/5/codemirror-2.35.zip">Version 2.35</a>:</p>
 
   <ul class="rel-note">
     <li>New (sub) mode: <a href="../mode/javascript/typescript.html">TypeScript</a>.</li>
@@ -1694,7 +1694,7 @@ <h2>Version 2.x</h2>
     <li>Full <a href="https://github.com/codemirror/CodeMirror/compare/v2.34...v2.35">list of patches</a>.</li>
   </ul>
 
-  <p class="rel">19-09-2012: <a href="https://codemirror.net/codemirror-2.34.zip">Version 2.34</a>:</p>
+  <p class="rel">19-09-2012: <a href="https://codemirror.net/5/codemirror-2.34.zip">Version 2.34</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/commonlisp/index.html">Common Lisp</a>.</li>
@@ -1707,7 +1707,7 @@ <h2>Version 2.x</h2>
     <li><a href="https://github.com/codemirror/CodeMirror/compare/v2.33...v2.34">Full list</a> of patches.</li>
   </ul>
 
-  <p class="rel">23-08-2012: <a href="https://codemirror.net/codemirror-2.33.zip">Version 2.33</a>:</p>
+  <p class="rel">23-08-2012: <a href="https://codemirror.net/5/codemirror-2.33.zip">Version 2.33</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/sieve/index.html">Sieve</a>.</li>
@@ -1721,13 +1721,13 @@ <h2>Version 2.x</h2>
     <li><a href="https://github.com/codemirror/CodeMirror/compare/v2.32...v2.33">Full list</a> of patches.</li>
   </ul>
 
-  <p class="rel">23-07-2012: <a href="https://codemirror.net/codemirror-2.32.zip">Version 2.32</a>:</p>
+  <p class="rel">23-07-2012: <a href="https://codemirror.net/5/codemirror-2.32.zip">Version 2.32</a>:</p>
 
   <p class="rel-note">Emergency fix for a bug where an editor with
   line wrapping on IE will break when there is <em>no</em>
   scrollbar.</p>
 
-  <p class="rel">20-07-2012: <a href="https://codemirror.net/codemirror-2.31.zip">Version 2.31</a>:</p>
+  <p class="rel">20-07-2012: <a href="https://codemirror.net/5/codemirror-2.31.zip">Version 2.31</a>:</p>
 
   <ul class="rel-note">
     <li>New modes: <a href="../mode/ocaml/index.html">OCaml</a>, <a href="../mode/haxe/index.html">Haxe</a>, and <a href="../mode/vb/index.html">VB.NET</a>.</li>
@@ -1739,7 +1739,7 @@ <h2>Version 2.x</h2>
     <li>And more... <a href="https://github.com/codemirror/CodeMirror/compare/v2.3...v2.31">(all patches)</a></li>
   </ul>
 
-  <p class="rel">22-06-2012: <a href="https://codemirror.net/codemirror-2.3.zip">Version 2.3</a>:</p>
+  <p class="rel">22-06-2012: <a href="https://codemirror.net/5/codemirror-2.3.zip">Version 2.3</a>:</p>
 
   <ul class="rel-note">
     <li><strong>New scrollbar implementation</strong>. Should flicker less. Changes DOM structure of the editor.</li>
@@ -1751,7 +1751,7 @@ <h2>Version 2.x</h2>
     <li>Lots of other <a href="https://github.com/codemirror/CodeMirror/compare/v2.25...v2.3">fixes</a>.</li>
   </ul>
 
-  <p class="rel">23-05-2012: <a href="https://codemirror.net/codemirror-2.25.zip">Version 2.25</a>:</p>
+  <p class="rel">23-05-2012: <a href="https://codemirror.net/5/codemirror-2.25.zip">Version 2.25</a>:</p>
 
   <ul class="rel-note">
     <li>New mode: <a href="../mode/erlang/index.html">Erlang</a>.</li>
@@ -1762,7 +1762,7 @@ <h2>Version 2.x</h2>
     <li>Fix backspace and tab key repeat in Opera.</li>
   </ul>
 
-  <p class="rel">23-04-2012: <a href="https://codemirror.net/codemirror-2.24.zip">Version 2.24</a>:</p>
+  <p class="rel">23-04-2012: <a href="https://codemirror.net/5/codemirror-2.24.zip">Version 2.24</a>:</p>
 
   <ul class="rel-note">
     <li><strong>Drop support for Internet Explorer 6</strong>.</li>
@@ -1781,7 +1781,7 @@ <h2>Version 2.x</h2>
     add <code>nofallthrough</code> boolean field instead.</li>
   </ul>
 
-  <p class="rel">26-03-2012: <a href="https://codemirror.net/codemirror-2.23.zip">Version 2.23</a>:</p>
+  <p class="rel">26-03-2012: <a href="https://codemirror.net/5/codemirror-2.23.zip">Version 2.23</a>:</p>
 
   <ul class="rel-note">
     <li>Change <strong>default binding for tab</strong> <a href="javascript:void(document.getElementById('tabbinding').style.display='')">[more]</a>
@@ -1804,7 +1804,7 @@ <h2>Version 2.x</h2>
     <li>Add <a href="manual.html#findMarksAt"><code>findMarksAt</code></a> method.</li>
   </ul>
 
-  <p class="rel">27-02-2012: <a href="https://codemirror.net/codemirror-2.22.zip">Version 2.22</a>:</p>
+  <p class="rel">27-02-2012: <a href="https://codemirror.net/5/codemirror-2.22.zip">Version 2.22</a>:</p>
 
   <ul class="rel-note">
     <li>Allow <a href="manual.html#keymaps">key handlers</a> to pass up events, allow binding characters.</li>
@@ -1817,7 +1817,7 @@ <h2>Version 2.x</h2>
     <li>Fix many bugs.</li>
   </ul>
 
-  <p class="rel">27-01-2012: <a href="https://codemirror.net/codemirror-2.21.zip">Version 2.21</a>:</p>
+  <p class="rel">27-01-2012: <a href="https://codemirror.net/5/codemirror-2.21.zip">Version 2.21</a>:</p>
 
   <ul class="rel-note">
     <li>Added <a href="../mode/less/index.html">LESS</a>, <a href="../mode/mysql/index.html">MySQL</a>,
@@ -1832,7 +1832,7 @@ <h2>Version 2.x</h2>
     <li>Lots and lots of bugfixes.</li>
   </ul>
 
-  <p class="rel">20-12-2011: <a href="https://codemirror.net/codemirror-2.2.zip">Version 2.2</a>:</p>
+  <p class="rel">20-12-2011: <a href="https://codemirror.net/5/codemirror-2.2.zip">Version 2.2</a>:</p>
 
   <ul class="rel-note">
     <li>Slightly incompatible API changes. Read <a href="upgrade_v2.2.html">this</a>.</li>
@@ -1855,10 +1855,10 @@ <h2>Version 2.x</h2>
     method.</li>
   </ul>
 
-  <p class="rel">21-11-2011: <a href="https://codemirror.net/codemirror-2.18.zip">Version 2.18</a>:</p>
+  <p class="rel">21-11-2011: <a href="https://codemirror.net/5/codemirror-2.18.zip">Version 2.18</a>:</p>
   <p class="rel-note">Fixes <code>TextMarker.clear</code>, which is broken in 2.17.</p>
 
-  <p class="rel">21-11-2011: <a href="https://codemirror.net/codemirror-2.17.zip">Version 2.17</a>:</p>
+  <p class="rel">21-11-2011: <a href="https://codemirror.net/5/codemirror-2.17.zip">Version 2.17</a>:</p>
   <ul class="rel-note">
     <li>Add support for <a href="manual.html#option_lineWrapping">line
     wrapping</a> and <a href="manual.html#hideLine">code
@@ -1878,7 +1878,7 @@ <h2>Version 2.x</h2>
     <li>Various fixes to modes.</li>
   </ul>
 
-  <p class="rel">27-10-2011: <a href="https://codemirror.net/codemirror-2.16.zip">Version 2.16</a>:</p>
+  <p class="rel">27-10-2011: <a href="https://codemirror.net/5/codemirror-2.16.zip">Version 2.16</a>:</p>
   <ul class="rel-note">
     <li>Add <a href="../mode/perl/index.html">Perl</a>, <a href="../mode/rust/index.html">Rust</a>, <a href="../mode/tiddlywiki/index.html">TiddlyWiki</a>, and <a href="../mode/groovy/index.html">Groovy</a> modes.</li>
     <li>Dragging text inside the editor now moves, rather than copies.</li>
@@ -1890,12 +1890,12 @@ <h2>Version 2.x</h2>
     <li>Fix editing code with tabs in Internet Explorer.</li>
   </ul>
 
-  <p class="rel">26-09-2011: <a href="https://codemirror.net/codemirror-2.15.zip">Version 2.15</a>:</p>
+  <p class="rel">26-09-2011: <a href="https://codemirror.net/5/codemirror-2.15.zip">Version 2.15</a>:</p>
   <p class="rel-note">Fix bug that snuck into 2.14: Clicking the
   character that currently has the cursor didn't re-focus the
   editor.</p>
 
-  <p class="rel">26-09-2011: <a href="https://codemirror.net/codemirror-2.14.zip">Version 2.14</a>:</p>
+  <p class="rel">26-09-2011: <a href="https://codemirror.net/5/codemirror-2.14.zip">Version 2.14</a>:</p>
   <ul class="rel-note">
     <li>Add <a href="../mode/clojure/index.html">Clojure</a>, <a href="../mode/pascal/index.html">Pascal</a>, <a href="../mode/ntriples/index.html">NTriples</a>, <a href="../mode/jinja2/index.html">Jinja2</a>, and <a href="../mode/markdown/index.html">Markdown</a> modes.</li>
     <li>Add <a href="../theme/cobalt.css">Cobalt</a> and <a href="../theme/eclipse.css">Eclipse</a> themes.</li>
@@ -1906,7 +1906,7 @@ <h2>Version 2.x</h2>
   </ul>
 
 
-  <p class="rel">23-08-2011: <a href="https://codemirror.net/codemirror-2.13.zip">Version 2.13</a>:</p>
+  <p class="rel">23-08-2011: <a href="https://codemirror.net/5/codemirror-2.13.zip">Version 2.13</a>:</p>
   <ul class="rel-note">
     <li>Add <a href="../mode/ruby/index.html">Ruby</a>, <a href="../mode/r/index.html">R</a>, <a href="../mode/coffeescript/index.html">CoffeeScript</a>, and <a href="../mode/velocity/index.html">Velocity</a> modes.</li>
     <li>Add <a href="manual.html#getGutterElement"><code>getGutterElement</code></a> to API.</li>
@@ -1915,7 +1915,7 @@ <h2>Version 2.x</h2>
     <li>Add an experimental <a href="../mode/xmlpure/index.html">pure XML</a> mode.</li>
   </ul>
 
-  <p class="rel">25-07-2011: <a href="https://codemirror.net/codemirror-2.12.zip">Version 2.12</a>:</p>
+  <p class="rel">25-07-2011: <a href="https://codemirror.net/5/codemirror-2.12.zip">Version 2.12</a>:</p>
   <ul class="rel-note">
     <li>Add a <a href="../mode/sparql/index.html">SPARQL</a> mode.</li>
     <li>Fix bug with cursor jumping around in an unfocused editor in IE.</li>
@@ -1929,7 +1929,7 @@ <h2>Version 2.x</h2>
     <li>Fix width feedback loop bug that caused the width of an inner DIV to shrink.</li>
   </ul>
 
-  <p class="rel">04-07-2011: <a href="https://codemirror.net/codemirror-2.11.zip">Version 2.11</a>:</p>
+  <p class="rel">04-07-2011: <a href="https://codemirror.net/5/codemirror-2.11.zip">Version 2.11</a>:</p>
   <ul class="rel-note">
     <li>Add a <a href="../mode/scheme/index.html">Scheme mode</a>.</li>
     <li>Add a <code>replace</code> method to search cursors, for cursor-preserving replacements.</li>
@@ -1942,14 +1942,14 @@ <h2>Version 2.x</h2>
     <li>Add <a href="../demo/fullscreen.html">full-screen editing</a> and <a href="../demo/changemode.html">mode-changing</a> demos.</li>
   </ul>
 
-  <p class="rel">07-06-2011: <a href="https://codemirror.net/codemirror-2.1.zip">Version 2.1</a>:</p>
+  <p class="rel">07-06-2011: <a href="https://codemirror.net/5/codemirror-2.1.zip">Version 2.1</a>:</p>
   <p class="rel-note">Add
   a <a href="manual.html#option_theme">theme</a> system
   (<a href="../demo/theme.html">demo</a>). Note that this is not
   backwards-compatible—you'll have to update your styles and
   modes!</p>
 
-  <p class="rel">07-06-2011: <a href="https://codemirror.net/codemirror-2.02.zip">Version 2.02</a>:</p>
+  <p class="rel">07-06-2011: <a href="https://codemirror.net/5/codemirror-2.02.zip">Version 2.02</a>:</p>
   <ul class="rel-note">
     <li>Add a <a href="../mode/lua/index.html">Lua mode</a>.</li>
     <li>Fix reverse-searching for a regexp.</li>
@@ -1961,7 +1961,7 @@ <h2>Version 2.x</h2>
     <li>Fix problem with 'sticking' horizontal scrollbar.</li>
   </ul>
 
-  <p class="rel">26-05-2011: <a href="https://codemirror.net/codemirror-2.01.zip">Version 2.01</a>:</p>
+  <p class="rel">26-05-2011: <a href="https://codemirror.net/5/codemirror-2.01.zip">Version 2.01</a>:</p>
   <ul class="rel-note">
     <li>Add a <a href="../mode/smalltalk/index.html">Smalltalk mode</a>.</li>
     <li>Add a <a href="../mode/rst/index.html">reStructuredText mode</a>.</li>
@@ -1979,28 +1979,28 @@ <h2>Version 2.x</h2>
     <li>Fix the context menu for Firefox.</li>
   </ul>
 
-  <p class="rel">28-03-2011: <a href="https://codemirror.net/codemirror-2.0.zip">Version 2.0</a>:</p>
+  <p class="rel">28-03-2011: <a href="https://codemirror.net/5/codemirror-2.0.zip">Version 2.0</a>:</p>
   <p class="rel-note">CodeMirror 2 is a complete rewrite that's
   faster, smaller, simpler to use, and less dependent on browser
   quirks. See <a href="internals.html">this</a>
   and <a href="http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580">this</a>
   for more information.</p>
 
-  <p class="rel">22-02-2011: <a href="https://github.com/codemirror/codemirror/tree/beta2">Version 2.0 beta 2</a>:</p>
+  <p class="rel">22-02-2011: <a href="https://github.com/codemirror/codemirror5/tree/beta2">Version 2.0 beta 2</a>:</p>
   <p class="rel-note">Somewhat more mature API, lots of bugs shaken out.</p>
 
-  <p class="rel">17-02-2011: <a href="https://codemirror.net/codemirror-0.94.zip">Version 0.94</a>:</p>
+  <p class="rel">17-02-2011: <a href="https://codemirror.net/5/codemirror-0.94.zip">Version 0.94</a>:</p>
   <ul class="rel-note">
     <li><code>tabMode: "spaces"</code> was modified slightly (now indents when something is selected).</li>
     <li>Fixes a bug that would cause the selection code to break on some IE versions.</li>
     <li>Disabling spell-check on WebKit browsers now works.</li>
   </ul>
 
-  <p class="rel">08-02-2011: <a href="https://codemirror.net/">Version 2.0 beta 1</a>:</p>
+  <p class="rel">08-02-2011: <a href="https://codemirror.net/5/">Version 2.0 beta 1</a>:</p>
   <p class="rel-note">CodeMirror 2 is a complete rewrite of
   CodeMirror, no longer depending on an editable frame.</p>
 
-  <p class="rel">19-01-2011: <a href="https://codemirror.net/codemirror-0.93.zip">Version 0.93</a>:</p>
+  <p class="rel">19-01-2011: <a href="https://codemirror.net/5/codemirror-0.93.zip">Version 0.93</a>:</p>
   <ul class="rel-note">
     <li>Added a <a href="contrib/regex/index.html">Regular Expression</a> parser.</li>
     <li>Fixes to the PHP parser.</li>
@@ -2016,14 +2016,14 @@ <h2>Version 2.x</h2>
 
   <h2>Version 0.x</h2>
 
-  <p class="rel">28-03-2011: <a href="https://codemirror.net/codemirror-1.0.zip">Version 1.0</a>:</p>
+  <p class="rel">28-03-2011: <a href="https://codemirror.net/5/codemirror-1.0.zip">Version 1.0</a>:</p>
   <ul class="rel-note">
     <li>Fix error when debug history overflows.</li>
     <li>Refine handling of C# verbatim strings.</li>
     <li>Fix some issues with JavaScript indentation.</li>
   </ul>
 
-  <p class="rel">17-12-2010: <a href="https://codemirror.net/codemirror-0.92.zip">Version 0.92</a>:</p>
+  <p class="rel">17-12-2010: <a href="https://codemirror.net/5/codemirror-0.92.zip">Version 0.92</a>:</p>
   <ul class="rel-note">
     <li>Make CodeMirror work in XHTML documents.</li>
     <li>Fix bug in handling of backslashes in Python strings.</li>
@@ -2037,7 +2037,7 @@ <h2>Version 0.x</h2>
   </ul>
 
   <p class="rel">11-11-2010: <a
-  href="https://codemirror.net/codemirror-0.91.zip">Version 0.91</a>:</p>
+  href="https://codemirror.net/5/codemirror-0.91.zip">Version 0.91</a>:</p>
   <ul class="rel-note">
     <li>Adds support for <a href="contrib/java">Java</a>.</li>
     <li>Small additions to the <a href="contrib/php">PHP</a> and <a href="contrib/sql">SQL</a> parsers.</li>
@@ -2048,7 +2048,7 @@ <h2>Version 0.x</h2>
   </ul>
 
   <p class="rel">02-10-2010: <a
-  href="https://codemirror.net/codemirror-0.9.zip">Version 0.9</a>:</p>
+  href="https://codemirror.net/5/codemirror-0.9.zip">Version 0.9</a>:</p>
   <ul class="rel-note">
     <li>Add support for searching backwards.</li>
     <li>There are now parsers for <a href="contrib/scheme/index.html">Scheme</a>, <a href="contrib/xquery/index.html">XQuery</a>, and <a href="contrib/ometa/index.html">OmetaJS</a>.</li>
@@ -2061,7 +2061,7 @@ <h2>Version 0.x</h2>
   </ul>
 
   <p class="rel">22-07-2010: <a
-  href="https://codemirror.net/codemirror-0.8.zip">Version 0.8</a>:</p>
+  href="https://codemirror.net/5/codemirror-0.8.zip">Version 0.8</a>:</p>
   <ul class="rel-note">
     <li>Add a <code>cursorCoords</code> method to find the screen
     coordinates of the cursor.</li>
@@ -2084,7 +2084,7 @@ <h2>Version 0.x</h2>
   </ul>
 
   <p class="rel">27-04-2010: <a
-  href="https://codemirror.net/codemirror-0.67.zip">Version
+  href="https://codemirror.net/5/codemirror-0.67.zip">Version
   0.67</a>:</p>
   <p class="rel-note">More consistent page-up/page-down behaviour
   across browsers. Fix some issues with hidden editors looping forever
@@ -2096,7 +2096,7 @@ <h2>Version 0.x</h2>
   running editor.</p>
 
   <p class="rel">01-03-2010: <a
-  href="https://codemirror.net/codemirror-0.66.zip">Version
+  href="https://codemirror.net/5/codemirror-0.66.zip">Version
   0.66</a>:</p>
   <p class="rel-note">Adds <code>removeLine</code> method to API.
   Introduces the <a href="contrib/plsql/index.html">PLSQL parser</a>.
@@ -2105,7 +2105,7 @@ <h2>Version 0.x</h2>
   selection bugs, and a number of small glitches.</p>
 
   <p class="rel">12-11-2009: <a
-  href="https://codemirror.net/codemirror-0.65.zip">Version
+  href="https://codemirror.net/5/codemirror-0.65.zip">Version
   0.65</a>:</p>
   <p class="rel-note">Add support for having both line-wrapping and
   line-numbers turned on, make paren-highlighting style customisable
@@ -2114,7 +2114,7 @@ <h2>Version 0.x</h2>
   <em>re</em>introduced in version 10.</p>
 
   <p class="rel">23-10-2009: <a
-  href="https://codemirror.net/codemirror-0.64.zip">Version
+  href="https://codemirror.net/5/codemirror-0.64.zip">Version
   0.64</a>:</p>
   <p class="rel-note">Solves some issues introduced by the
   paste-handling changes from the previous release. Adds
@@ -2127,12 +2127,12 @@ <h2>Version 0.x</h2>
   parser. And, as usual, add workarounds for various newly discovered
   browser incompatibilities.</p>
 
-  <p class="rel">31-08-2009: <a href="https://codemirror.net/codemirror-0.63.zip">Version 0.63</a>:</p>
+  <p class="rel">31-08-2009: <a href="https://codemirror.net/5/codemirror-0.63.zip">Version 0.63</a>:</p>
   <p class="rel-note"> Overhaul of paste-handling (less fragile), fixes for several
   serious IE8 issues (cursor jumping, end-of-document bugs) and a number
   of small problems.</p>
 
-  <p class="rel">30-05-2009: <a href="https://codemirror.net/codemirror-0.62.zip">Version 0.62</a>:</p>
+  <p class="rel">30-05-2009: <a href="https://codemirror.net/5/codemirror-0.62.zip">Version 0.62</a>:</p>
   <p class="rel-note">Introduces <a href="contrib/python/index.html">Python</a>
   and <a href="contrib/lua/index.html">Lua</a> parsers. Add
   <code>setParser</code> (on-the-fly mode changing) and
diff --git a/doc/reporting.html b/doc/reporting.html
index 32d7986d79..42753ad187 100644
--- a/doc/reporting.html
+++ b/doc/reporting.html
@@ -5,12 +5,12 @@
 <link rel=stylesheet href="docs.css">
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Reporting bugs</a>
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
index dabe974cfa..89ea14a1be 100644
--- a/doc/upgrade_v2.2.html
+++ b/doc/upgrade_v2.2.html
@@ -5,12 +5,12 @@
 <link rel=stylesheet href="docs.css">
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">2.2 upgrade guide</a>
diff --git a/doc/upgrade_v3.html b/doc/upgrade_v3.html
index 2fec440fe9..e16350ca74 100644
--- a/doc/upgrade_v3.html
+++ b/doc/upgrade_v3.html
@@ -14,12 +14,12 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#upgrade">Upgrade guide</a>
diff --git a/doc/upgrade_v4.html b/doc/upgrade_v4.html
index dc79654f01..3de8ced5ca 100644
--- a/doc/upgrade_v4.html
+++ b/doc/upgrade_v4.html
@@ -6,12 +6,12 @@
 <script src="activebookmark.js"></script>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
 
   <ul>
     <li><a href="../index.html">Home</a>
     <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#upgrade">Upgrade guide</a>
diff --git a/index.html b/index.html
index 63426417ea..3ddd697b8d 100644
--- a/index.html
+++ b/index.html
@@ -26,13 +26,13 @@
 </div>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="doc/logo.png"></a>
 
   <ul>
     <li><a class=active data-default="true" href="#description">Home</a>
     <li><a href="doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-    <li><a href="https://codemirror.net/6/">Version 6</a>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
+    <li><a href="https://codemirror.net/5/6/">Version 6</a>
   </ul>
   <ul>
     <li><a href="#features">Features</a>
@@ -92,8 +92,8 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/codemirror.zip">5.65.5</a>.<br>
-    You can see the <a href="https://github.com/codemirror/codemirror" title="GitHub repository">code</a>,<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.5</a>.<br>
+    You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
   </div>
@@ -141,7 +141,7 @@ <h2>Community</h2>
   on <a href="https://github.com/codemirror/CodeMirror/">github</a>
   (<a href="http://marijnhaverbeke.nl/git/codemirror">alternate git
   repository</a>).
-  Please <a href="https://codemirror.net/doc/reporting.html">read these
+  Please <a href="https://codemirror.net/5/doc/reporting.html">read these
   pointers</a> before submitting a bug. Use pull requests to submit
   patches. All contributions must be released under the same MIT
   license that CodeMirror uses.</p>
diff --git a/keymap/emacs.js b/keymap/emacs.js
index 9e7ae60f6b..f4e4e90e35 100644
--- a/keymap/emacs.js
+++ b/keymap/emacs.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/keymap/sublime.js b/keymap/sublime.js
index 0c9a63e01e..fe677c845d 100644
--- a/keymap/sublime.js
+++ b/keymap/sublime.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // A rough approximation of Sublime Text's keybindings
 // Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
diff --git a/keymap/vim.js b/keymap/vim.js
index b2da1c132d..2b053f37c7 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /**
  * Supported keybindings:
diff --git a/mode/apl/apl.js b/mode/apl/apl.js
index b1955f6c94..667aa792e6 100644
--- a/mode/apl/apl.js
+++ b/mode/apl/apl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/apl/index.html b/mode/apl/index.html
index 81cef4915b..1946d2f810 100644
--- a/mode/apl/index.html
+++ b/mode/apl/index.html
@@ -12,12 +12,12 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/asciiarmor/asciiarmor.js b/mode/asciiarmor/asciiarmor.js
index f560f42423..a8ef077c32 100644
--- a/mode/asciiarmor/asciiarmor.js
+++ b/mode/asciiarmor/asciiarmor.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/asciiarmor/index.html b/mode/asciiarmor/index.html
index 2ca76cc963..08ae934999 100644
--- a/mode/asciiarmor/index.html
+++ b/mode/asciiarmor/index.html
@@ -9,12 +9,12 @@
 <script src="asciiarmor.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/asn.1/asn.1.js b/mode/asn.1/asn.1.js
index df1330b686..ab63acc2f3 100644
--- a/mode/asn.1/asn.1.js
+++ b/mode/asn.1/asn.1.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/asn.1/index.html b/mode/asn.1/index.html
index c79f489568..10028f38bb 100644
--- a/mode/asn.1/index.html
+++ b/mode/asn.1/index.html
@@ -15,14 +15,14 @@
     }
 </style>
 <div id=nav>
-    <a href="https://codemirror.net"><h1>CodeMirror</h1>
+    <a href="https://codemirror.net/5"><h1>CodeMirror</h1>
         <img id=logo src="../../doc/logo.png" alt="">
     </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>
+        <li><a href="https://github.com/codemirror/codemirror5">Code</a>
     </ul>
     <ul>
         <li><a href="../index.html">Language modes</a>
diff --git a/mode/asterisk/asterisk.js b/mode/asterisk/asterisk.js
index 49a727019a..16b982787d 100644
--- a/mode/asterisk/asterisk.js
+++ b/mode/asterisk/asterisk.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /*
  * =====================================================================================
diff --git a/mode/asterisk/index.html b/mode/asterisk/index.html
index de43e34481..6b1c5e1baf 100644
--- a/mode/asterisk/index.html
+++ b/mode/asterisk/index.html
@@ -13,12 +13,12 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/brainfuck/brainfuck.js b/mode/brainfuck/brainfuck.js
index af6d889aee..b5a30f8119 100644
--- a/mode/brainfuck/brainfuck.js
+++ b/mode/brainfuck/brainfuck.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Brainfuck mode created by Michael Kaminsky https://github.com/mkaminsky11
 
diff --git a/mode/brainfuck/index.html b/mode/brainfuck/index.html
index 7849e5968a..568cc6d46e 100644
--- a/mode/brainfuck/index.html
+++ b/mode/brainfuck/index.html
@@ -12,12 +12,12 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index afb7b3be88..748909efeb 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/clike/index.html b/mode/clike/index.html
index b1c881904f..5b82df3cc8 100644
--- a/mode/clike/index.html
+++ b/mode/clike/index.html
@@ -12,12 +12,12 @@
 <script src="clike.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clike/scala.html b/mode/clike/scala.html
index 3d2123c010..49eab45dca 100644
--- a/mode/clike/scala.html
+++ b/mode/clike/scala.html
@@ -10,12 +10,12 @@
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="clike.js"></script>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clike/test.js b/mode/clike/test.js
index 9441b95956..80d8ea4548 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-c");
diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 0b9d6acc3e..3305165808 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports === "object" && typeof module === "object") // CommonJS
diff --git a/mode/clojure/index.html b/mode/clojure/index.html
index d0634344a1..3cad7c52c4 100644
--- a/mode/clojure/index.html
+++ b/mode/clojure/index.html
@@ -11,12 +11,12 @@
 <script src="clojure.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/clojure/test.js b/mode/clojure/test.js
index 642473b283..18ee645dbc 100644
--- a/mode/clojure/test.js
+++ b/mode/clojure/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function () {
     var mode = CodeMirror.getMode({indentUnit: 2}, "clojure");
diff --git a/mode/cmake/cmake.js b/mode/cmake/cmake.js
index 496c71d1fd..f08c7d78b2 100644
--- a/mode/cmake/cmake.js
+++ b/mode/cmake/cmake.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object")
diff --git a/mode/cmake/index.html b/mode/cmake/index.html
index edd6838a0f..e8e717224d 100644
--- a/mode/cmake/index.html
+++ b/mode/cmake/index.html
@@ -13,12 +13,12 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/cobol/cobol.js b/mode/cobol/cobol.js
index a7aeafa03a..3e735f08ca 100644
--- a/mode/cobol/cobol.js
+++ b/mode/cobol/cobol.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /**
  * Author: Gautam Mehta
diff --git a/mode/cobol/index.html b/mode/cobol/index.html
index 40feb0014e..ac1374e9b3 100644
--- a/mode/cobol/index.html
+++ b/mode/cobol/index.html
@@ -39,12 +39,12 @@
         .CodeMirror-activeline-background {background: #555555 !important;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/coffeescript/coffeescript.js b/mode/coffeescript/coffeescript.js
index a54e9d5ed0..56098726ed 100644
--- a/mode/coffeescript/coffeescript.js
+++ b/mode/coffeescript/coffeescript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /**
  * Link to the project's GitHub page:
diff --git a/mode/coffeescript/index.html b/mode/coffeescript/index.html
index 6d51aab3d3..191774ae60 100644
--- a/mode/coffeescript/index.html
+++ b/mode/coffeescript/index.html
@@ -9,12 +9,12 @@
 <script src="coffeescript.js"></script>
 <style>.CodeMirror {border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index e8528a9cf5..c60ff6d6fc 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/commonlisp/index.html b/mode/commonlisp/index.html
index 59b446080b..a39c4555ec 100644
--- a/mode/commonlisp/index.html
+++ b/mode/commonlisp/index.html
@@ -9,12 +9,12 @@
 <script src="commonlisp.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/crystal/crystal.js b/mode/crystal/crystal.js
index 5dae5032b4..73b0dbe13c 100644
--- a/mode/crystal/crystal.js
+++ b/mode/crystal/crystal.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/crystal/index.html b/mode/crystal/index.html
index bbd26504f1..dfffab47e3 100644
--- a/mode/crystal/index.html
+++ b/mode/crystal/index.html
@@ -14,12 +14,12 @@
 </style>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/css.js b/mode/css/css.js
index 0841f9cb30..5a1c3014d0 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/css/gss.html b/mode/css/gss.html
index 17d24f8ac9..aa12bfb684 100644
--- a/mode/css/gss.html
+++ b/mode/css/gss.html
@@ -13,12 +13,12 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/gss_test.js b/mode/css/gss_test.js
index 2401bc4968..0901563c3b 100644
--- a/mode/css/gss_test.js
+++ b/mode/css/gss_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   "use strict";
diff --git a/mode/css/index.html b/mode/css/index.html
index 42b327ca66..233d19b989 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -12,12 +12,12 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/less.html b/mode/css/less.html
index f7611ef087..ea7db0059d 100644
--- a/mode/css/less.html
+++ b/mode/css/less.html
@@ -10,12 +10,12 @@
 <script src="css.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/less_test.js b/mode/css/less_test.js
index abeb6a2040..cf367eaf12 100644
--- a/mode/css/less_test.js
+++ b/mode/css/less_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   "use strict";
diff --git a/mode/css/scss.html b/mode/css/scss.html
index 525bab2fec..75ef4f9255 100644
--- a/mode/css/scss.html
+++ b/mode/css/scss.html
@@ -10,12 +10,12 @@
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/css/scss_test.js b/mode/css/scss_test.js
index 68afc664b6..14c1d13503 100644
--- a/mode/css/scss_test.js
+++ b/mode/css/scss_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");
diff --git a/mode/css/test.js b/mode/css/test.js
index 64352d74fc..573207e833 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "css");
diff --git a/mode/cypher/cypher.js b/mode/cypher/cypher.js
index 6203d59984..df8cf43395 100644
--- a/mode/cypher/cypher.js
+++ b/mode/cypher/cypher.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // By the Neo4j Team and contributors.
 // https://github.com/neo4j-contrib/CodeMirror
diff --git a/mode/cypher/index.html b/mode/cypher/index.html
index 43631d84df..caab582ffe 100644
--- a/mode/cypher/index.html
+++ b/mode/cypher/index.html
@@ -16,12 +16,12 @@
 }
         </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/cypher/test.js b/mode/cypher/test.js
index 691835596f..f277aa7c11 100644
--- a/mode/cypher/test.js
+++ b/mode/cypher/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "cypher");
diff --git a/mode/d/d.js b/mode/d/d.js
index efab570633..29b8995dc5 100644
--- a/mode/d/d.js
+++ b/mode/d/d.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/d/index.html b/mode/d/index.html
index a4ea6c888e..6213b7532d 100644
--- a/mode/d/index.html
+++ b/mode/d/index.html
@@ -10,12 +10,12 @@
 <script src="d.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/d/test.js b/mode/d/test.js
index f8ac9de1c8..69745fad1b 100644
--- a/mode/d/test.js
+++ b/mode/d/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "d");
diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index fe64517a5e..340076712c 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/dart/index.html b/mode/dart/index.html
index 277fd21984..88b8936dec 100644
--- a/mode/dart/index.html
+++ b/mode/dart/index.html
@@ -9,12 +9,12 @@
 <script src="dart.js"></script>
 <style>.CodeMirror {border: 1px solid #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/diff/diff.js b/mode/diff/diff.js
index a30fd37a50..21631bf3ee 100644
--- a/mode/diff/diff.js
+++ b/mode/diff/diff.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/diff/index.html b/mode/diff/index.html
index fa052307f6..f85c8906ed 100644
--- a/mode/diff/index.html
+++ b/mode/diff/index.html
@@ -15,12 +15,12 @@
       span.cm-error.cm-tag { background-color: #2b2; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/django/django.js b/mode/django/django.js
index 07be123986..aca3319332 100644
--- a/mode/django/django.js
+++ b/mode/django/django.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/django/index.html b/mode/django/index.html
index 728493efea..00445b355c 100644
--- a/mode/django/index.html
+++ b/mode/django/index.html
@@ -13,12 +13,12 @@
 <script src="django.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/dockerfile/dockerfile.js b/mode/dockerfile/dockerfile.js
index 983170f519..41d90853af 100644
--- a/mode/dockerfile/dockerfile.js
+++ b/mode/dockerfile/dockerfile.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/dockerfile/index.html b/mode/dockerfile/index.html
index 63ad0e548e..7d450c5fad 100644
--- a/mode/dockerfile/index.html
+++ b/mode/dockerfile/index.html
@@ -10,12 +10,12 @@
 <script src="dockerfile.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/dockerfile/test.js b/mode/dockerfile/test.js
index 51add3ce9c..812e6287c3 100644
--- a/mode/dockerfile/test.js
+++ b/mode/dockerfile/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-dockerfile");
diff --git a/mode/dtd/dtd.js b/mode/dtd/dtd.js
index 1bff91cbab..08f65ed681 100644
--- a/mode/dtd/dtd.js
+++ b/mode/dtd/dtd.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /*
   DTD mode
diff --git a/mode/dtd/index.html b/mode/dtd/index.html
index 9866942d58..1a90ef9e26 100644
--- a/mode/dtd/index.html
+++ b/mode/dtd/index.html
@@ -9,12 +9,12 @@
 <script src="dtd.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/dylan/dylan.js b/mode/dylan/dylan.js
index 6725edccc0..fd45659b1c 100644
--- a/mode/dylan/dylan.js
+++ b/mode/dylan/dylan.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/dylan/index.html b/mode/dylan/index.html
index fbb8fe5161..09871a070a 100644
--- a/mode/dylan/index.html
+++ b/mode/dylan/index.html
@@ -12,12 +12,12 @@
 <script src="dylan.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/dylan/test.js b/mode/dylan/test.js
index 8b121b9133..aba6309f44 100644
--- a/mode/dylan/test.js
+++ b/mode/dylan/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "dylan");
diff --git a/mode/ebnf/ebnf.js b/mode/ebnf/ebnf.js
index d8fb3f3a2f..ecd6bc7933 100644
--- a/mode/ebnf/ebnf.js
+++ b/mode/ebnf/ebnf.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ebnf/index.html b/mode/ebnf/index.html
index 70d6873038..67c081fc13 100644
--- a/mode/ebnf/index.html
+++ b/mode/ebnf/index.html
@@ -13,12 +13,12 @@
   </head>
   <body>
     <div id=nav>
-      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+      <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+        <li><a href="https://github.com/codemirror/codemirror5">Code</a>
       </ul>
       <ul>
         <li><a href="../index.html">Language modes</a>
diff --git a/mode/ecl/ecl.js b/mode/ecl/ecl.js
index 9af8aee180..66de133a01 100644
--- a/mode/ecl/ecl.js
+++ b/mode/ecl/ecl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ecl/index.html b/mode/ecl/index.html
index c8b1384258..1e978046dd 100644
--- a/mode/ecl/index.html
+++ b/mode/ecl/index.html
@@ -9,12 +9,12 @@
 <script src="ecl.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/eiffel/eiffel.js b/mode/eiffel/eiffel.js
index f6f3f458b6..d6fd23c3f1 100644
--- a/mode/eiffel/eiffel.js
+++ b/mode/eiffel/eiffel.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/eiffel/index.html b/mode/eiffel/index.html
index 0a431cce42..64d1e6653a 100644
--- a/mode/eiffel/index.html
+++ b/mode/eiffel/index.html
@@ -13,12 +13,12 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/elm/elm.js b/mode/elm/elm.js
index 6ce940fe82..837e58e758 100644
--- a/mode/elm/elm.js
+++ b/mode/elm/elm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
+// Distributed under an MIT license: http://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/elm/index.html b/mode/elm/index.html
index 004b1d4480..6332bb5f88 100644
--- a/mode/elm/index.html
+++ b/mode/elm/index.html
@@ -9,12 +9,12 @@
 <script src="elm.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/erlang/erlang.js b/mode/erlang/erlang.js
index d827296f3b..914276d4a1 100644
--- a/mode/erlang/erlang.js
+++ b/mode/erlang/erlang.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /*jshint unused:true, eqnull:true, curly:true, bitwise:true */
 /*jshint undef:true, latedef:true, trailing:true */
diff --git a/mode/erlang/index.html b/mode/erlang/index.html
index 0462dd9e45..56d1dc6d56 100644
--- a/mode/erlang/index.html
+++ b/mode/erlang/index.html
@@ -11,12 +11,12 @@
 <script src="erlang.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/factor/factor.js b/mode/factor/factor.js
index d3f7d499cb..5111447ef0 100644
--- a/mode/factor/factor.js
+++ b/mode/factor/factor.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Factor syntax highlight - simple mode
 //
diff --git a/mode/factor/index.html b/mode/factor/index.html
index 6a77230d40..80863b7558 100644
--- a/mode/factor/index.html
+++ b/mode/factor/index.html
@@ -16,12 +16,12 @@
 }
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/fcl/fcl.js b/mode/fcl/fcl.js
index 2d3f2001d3..07f3ef1b25 100644
--- a/mode/fcl/fcl.js
+++ b/mode/fcl/fcl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/fcl/index.html b/mode/fcl/index.html
index 9194dfddaf..fd74281c0e 100644
--- a/mode/fcl/index.html
+++ b/mode/fcl/index.html
@@ -11,12 +11,12 @@
 <script src="fcl.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/forth/forth.js b/mode/forth/forth.js
index f2caa27af8..36959ae403 100644
--- a/mode/forth/forth.js
+++ b/mode/forth/forth.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Author: Aliaksei Chapyzhenka
 
diff --git a/mode/forth/index.html b/mode/forth/index.html
index 6b6477cae7..43c94e0ed2 100644
--- a/mode/forth/index.html
+++ b/mode/forth/index.html
@@ -16,12 +16,12 @@
 }
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/fortran/fortran.js b/mode/fortran/fortran.js
index c33cf63edd..1ca5b7beca 100644
--- a/mode/fortran/fortran.js
+++ b/mode/fortran/fortran.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/fortran/index.html b/mode/fortran/index.html
index 1dd45641ac..48f5bbb473 100644
--- a/mode/fortran/index.html
+++ b/mode/fortran/index.html
@@ -9,12 +9,12 @@
 <script src="fortran.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index 016dc29d60..db09a8af08 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/gas/index.html b/mode/gas/index.html
index c8a89b27de..c5945ca21b 100644
--- a/mode/gas/index.html
+++ b/mode/gas/index.html
@@ -9,12 +9,12 @@
 <script src="gas.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 492c9487a6..65288d757e 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index 7d2f38b6ab..0166e21e60 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -20,12 +20,12 @@
   .cm-s-default .cm-emoji {color: #009688;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
index e2002879cb..644387613f 100644
--- a/mode/gfm/test.js
+++ b/mode/gfm/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var config = {tabSize: 4, indentUnit: 2}
diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index 1b438b9057..196543e505 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /*
 Gherkin mode - http://www.cukes.info/
diff --git a/mode/gherkin/index.html b/mode/gherkin/index.html
index e51a00ce48..1f982e06b0 100644
--- a/mode/gherkin/index.html
+++ b/mode/gherkin/index.html
@@ -9,12 +9,12 @@
 <script src="gherkin.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/go/go.js b/mode/go/go.js
index c005e42ddc..898f747adb 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/go/index.html b/mode/go/index.html
index 10ec0249d9..eeb4d80168 100644
--- a/mode/go/index.html
+++ b/mode/go/index.html
@@ -11,12 +11,12 @@
 <script src="go.js"></script>
 <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 848a07719f..89d0fe0854 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/groovy/index.html b/mode/groovy/index.html
index 9d40fb8efb..481dca7755 100644
--- a/mode/groovy/index.html
+++ b/mode/groovy/index.html
@@ -10,12 +10,12 @@
 <script src="groovy.js"></script>
 <style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haml/haml.js b/mode/haml/haml.js
index d941d97433..5e5091fe44 100644
--- a/mode/haml/haml.js
+++ b/mode/haml/haml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/haml/index.html b/mode/haml/index.html
index ac1348d096..90cc00f02f 100644
--- a/mode/haml/index.html
+++ b/mode/haml/index.html
@@ -13,12 +13,12 @@
 <script src="haml.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haml/test.js b/mode/haml/test.js
index e051452738..5a1258b3c5 100644
--- a/mode/haml/test.js
+++ b/mode/haml/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "haml");
diff --git a/mode/handlebars/handlebars.js b/mode/handlebars/handlebars.js
index 359871a20d..d38c0ebcba 100644
--- a/mode/handlebars/handlebars.js
+++ b/mode/handlebars/handlebars.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/handlebars/index.html b/mode/handlebars/index.html
index 1b5f628b44..83d527b8b7 100644
--- a/mode/handlebars/index.html
+++ b/mode/handlebars/index.html
@@ -13,12 +13,12 @@
 <script src="handlebars.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haskell-literate/haskell-literate.js b/mode/haskell-literate/haskell-literate.js
index 4bb9268491..751fda424b 100644
--- a/mode/haskell-literate/haskell-literate.js
+++ b/mode/haskell-literate/haskell-literate.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function (mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/haskell-literate/index.html b/mode/haskell-literate/index.html
index aa3f3ea5b1..416455d0f9 100644
--- a/mode/haskell-literate/index.html
+++ b/mode/haskell-literate/index.html
@@ -13,13 +13,13 @@
   border-bottom : 1px solid #DDDDDD;
 }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haskell/haskell.js b/mode/haskell/haskell.js
index 2e882dc600..26bf6124ea 100644
--- a/mode/haskell/haskell.js
+++ b/mode/haskell/haskell.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/haskell/index.html b/mode/haskell/index.html
index 598cbb55e9..2d6931d4bf 100644
--- a/mode/haskell/index.html
+++ b/mode/haskell/index.html
@@ -11,12 +11,12 @@
 <script src="haskell.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index 45376852a6..c32d3df3ca 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/haxe/index.html b/mode/haxe/index.html
index 65e31f44c3..a4e24ecdfd 100644
--- a/mode/haxe/index.html
+++ b/mode/haxe/index.html
@@ -9,12 +9,12 @@
 <script src="haxe.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index 439e63a427..5cceeef484 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/htmlembedded/index.html b/mode/htmlembedded/index.html
index d17afec8b1..06e77178b7 100644
--- a/mode/htmlembedded/index.html
+++ b/mode/htmlembedded/index.html
@@ -14,12 +14,12 @@
 <script src="htmlembedded.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index af3138179a..3f6d8b7d70 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/htmlmixed/index.html b/mode/htmlmixed/index.html
index c70bf1653f..9548361579 100644
--- a/mode/htmlmixed/index.html
+++ b/mode/htmlmixed/index.html
@@ -14,12 +14,12 @@
 <script src="htmlmixed.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/http/http.js b/mode/http/http.js
index 092353259f..aaa138f471 100644
--- a/mode/http/http.js
+++ b/mode/http/http.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/http/index.html b/mode/http/index.html
index 80d585ef4a..ddfa8c11ea 100644
--- a/mode/http/index.html
+++ b/mode/http/index.html
@@ -9,12 +9,12 @@
 <script src="http.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/idl/idl.js b/mode/idl/idl.js
index 37302bb90f..7b57672d43 100644
--- a/mode/idl/idl.js
+++ b/mode/idl/idl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/idl/index.html b/mode/idl/index.html
index 915b1f27ff..b1fa6c7c21 100644
--- a/mode/idl/index.html
+++ b/mode/idl/index.html
@@ -10,12 +10,12 @@
 <script src="idl.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/index.html b/mode/index.html
index 51205ddce9..db8ee8f705 100644
--- a/mode/index.html
+++ b/mode/index.html
@@ -5,12 +5,12 @@
 <link rel=stylesheet href="../doc/docs.css">
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Language modes</a>
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 2b6cede8a8..f4be5ead2c 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -12,12 +12,12 @@
 <script src="javascript.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 7cfee313a3..48a46d65d0 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/javascript/json-ld.html b/mode/javascript/json-ld.html
index 6a29c14453..d3dff2e29b 100644
--- a/mode/javascript/json-ld.html
+++ b/mode/javascript/json-ld.html
@@ -12,12 +12,12 @@
 <script src="javascript.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id="nav">
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"/></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/javascript/test.js b/mode/javascript/test.js
index e730302024..a1bcf1f2d6 100644
--- a/mode/javascript/test.js
+++ b/mode/javascript/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index 7da84d2add..d0bc3aeee6 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -10,12 +10,12 @@
 <script src="javascript.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index 2f626d1995..e2a822231f 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -9,12 +9,12 @@
 <script src="jinja2.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index 77c9b22cae..ace1f1f3fc 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/jsx/index.html b/mode/jsx/index.html
index ef03834e08..0f2822efdb 100644
--- a/mode/jsx/index.html
+++ b/mode/jsx/index.html
@@ -11,12 +11,12 @@
 <script src="jsx.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index beea3b9139..1406ef195d 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index b47a3521ec..08a0d47c3e 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "jsx")
diff --git a/mode/julia/index.html b/mode/julia/index.html
index 7a9217bc3e..73824f2a5d 100644
--- a/mode/julia/index.html
+++ b/mode/julia/index.html
@@ -10,12 +10,12 @@
 <script src="julia.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/julia/julia.js b/mode/julia/julia.js
index 62272fd6ec..0b422849b9 100644
--- a/mode/julia/julia.js
+++ b/mode/julia/julia.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/livescript/index.html b/mode/livescript/index.html
index 05e4b2fdd3..b487fcd52d 100644
--- a/mode/livescript/index.html
+++ b/mode/livescript/index.html
@@ -10,12 +10,12 @@
 <script src="livescript.js"></script>
 <style>.CodeMirror {font-size: 80%;border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/livescript/livescript.js b/mode/livescript/livescript.js
index 595e067d16..149b22303d 100644
--- a/mode/livescript/livescript.js
+++ b/mode/livescript/livescript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /**
  * Link to the project's GitHub page:
diff --git a/mode/lua/index.html b/mode/lua/index.html
index 05c94462c2..55f38ee556 100644
--- a/mode/lua/index.html
+++ b/mode/lua/index.html
@@ -11,12 +11,12 @@
 <script src="lua.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
@@ -75,7 +75,7 @@ <h2>Lua mode</h2>
     </script>
 
     <p>Loosely based on Franciszek
-    Wawrzak's <a href="https://codemirror.net/1/contrib/lua">CodeMirror
+    Wawrzak's <a href="https://codemirror.net/5/1/contrib/lua">CodeMirror
     1 mode</a>. One configuration parameter is
     supported, <code>specials</code>, to which you can provide an
     array of strings to have those identifiers highlighted with
diff --git a/mode/lua/lua.js b/mode/lua/lua.js
index 2fad0180ff..7d053524cb 100644
--- a/mode/lua/lua.js
+++ b/mode/lua/lua.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's
 // CodeMirror 1 mode.
diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 4984c04b2c..b307f74941 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -17,12 +17,12 @@
       .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index a9e272ea81..6eef54427f 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index fd5a1fb4d5..2e3f466731 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var config = {tabSize: 4, indentUnit: 2}
diff --git a/mode/mathematica/index.html b/mode/mathematica/index.html
index accce207a4..ac6eeb4741 100644
--- a/mode/mathematica/index.html
+++ b/mode/mathematica/index.html
@@ -12,12 +12,12 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mathematica/mathematica.js b/mode/mathematica/mathematica.js
index 72b3492101..a8c5f78c05 100644
--- a/mode/mathematica/mathematica.js
+++ b/mode/mathematica/mathematica.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Mathematica mode copyright (c) 2015 by Calin Barbat
 // Based on code by Patrick Scheibe (halirutan)
diff --git a/mode/mbox/index.html b/mode/mbox/index.html
index 6dcc4b8fae..95bba18be7 100644
--- a/mode/mbox/index.html
+++ b/mode/mbox/index.html
@@ -9,12 +9,12 @@
 <script src="mbox.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mbox/mbox.js b/mode/mbox/mbox.js
index 640437ed64..d668f51ec2 100644
--- a/mode/mbox/mbox.js
+++ b/mode/mbox/mbox.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/meta.js b/mode/meta.js
index 38d5e0131d..2d52ba6750 100644
--- a/mode/meta.js
+++ b/mode/meta.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/mirc/index.html b/mode/mirc/index.html
index f81641bf1e..6daa07c9f3 100644
--- a/mode/mirc/index.html
+++ b/mode/mirc/index.html
@@ -11,12 +11,12 @@
 <script src="mirc.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mirc/mirc.js b/mode/mirc/mirc.js
index d27b0152e9..c6208081dd 100644
--- a/mode/mirc/mirc.js
+++ b/mode/mirc/mirc.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 //mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
 
diff --git a/mode/mllike/index.html b/mode/mllike/index.html
index 6e8f2640e6..6f05c13cb2 100644
--- a/mode/mllike/index.html
+++ b/mode/mllike/index.html
@@ -12,12 +12,12 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mllike/mllike.js b/mode/mllike/mllike.js
index 8f92372782..a21a555789 100644
--- a/mode/mllike/mllike.js
+++ b/mode/mllike/mllike.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/modelica/index.html b/mode/modelica/index.html
index 9ab4b48853..aba729103b 100644
--- a/mode/modelica/index.html
+++ b/mode/modelica/index.html
@@ -12,12 +12,12 @@
 <script src="modelica.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/modelica/modelica.js b/mode/modelica/modelica.js
index 2e9622f03f..57133b2527 100644
--- a/mode/modelica/modelica.js
+++ b/mode/modelica/modelica.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Modelica support for CodeMirror, copyright (c) by Lennart Ochel
 
diff --git a/mode/mscgen/index.html b/mode/mscgen/index.html
index 5f2e826d22..f48f317030 100644
--- a/mode/mscgen/index.html
+++ b/mode/mscgen/index.html
@@ -9,11 +9,11 @@
 <script src="mscgen.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mscgen/mscgen.js b/mode/mscgen/mscgen.js
index 8d39341cf9..654ed965e1 100644
--- a/mode/mscgen/mscgen.js
+++ b/mode/mscgen/mscgen.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // mode(s) for the sequence chart dsl's mscgen, xù and msgenny
 // For more information on mscgen, see the site of the original author:
diff --git a/mode/mscgen/mscgen_test.js b/mode/mscgen/mscgen_test.js
index ff3816d853..76551c82b9 100644
--- a/mode/mscgen/mscgen_test.js
+++ b/mode/mscgen/mscgen_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "mscgen");
diff --git a/mode/mscgen/msgenny_test.js b/mode/mscgen/msgenny_test.js
index a3ed577dd2..0449c587d8 100644
--- a/mode/mscgen/msgenny_test.js
+++ b/mode/mscgen/msgenny_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-msgenny");
diff --git a/mode/mscgen/xu_test.js b/mode/mscgen/xu_test.js
index d65a058712..7f90cd4fd2 100644
--- a/mode/mscgen/xu_test.js
+++ b/mode/mscgen/xu_test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-xu");
diff --git a/mode/mumps/index.html b/mode/mumps/index.html
index 4af4e0adec..5299d05d5f 100644
--- a/mode/mumps/index.html
+++ b/mode/mumps/index.html
@@ -9,12 +9,12 @@
 <script src="mumps.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/mumps/mumps.js b/mode/mumps/mumps.js
index c53b4bf3a2..2f76a52ea9 100644
--- a/mode/mumps/mumps.js
+++ b/mode/mumps/mumps.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /*
   This MUMPS Language script was constructed using vbscript.js as a template.
diff --git a/mode/nginx/index.html b/mode/nginx/index.html
index 1aa690a6d4..c5c0b5ea1f 100644
--- a/mode/nginx/index.html
+++ b/mode/nginx/index.html
@@ -21,12 +21,12 @@
     }
   </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/nginx/nginx.js b/mode/nginx/nginx.js
index a09f1501fa..b6c1d5fcdb 100644
--- a/mode/nginx/nginx.js
+++ b/mode/nginx/nginx.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/nsis/index.html b/mode/nsis/index.html
index 71a65d7d8e..0fe50e9865 100644
--- a/mode/nsis/index.html
+++ b/mode/nsis/index.html
@@ -13,12 +13,12 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index ebd3c8bf5c..7098b80634 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Author: Jan T. Sott (http://github.com/idleberg)
 
diff --git a/mode/ntriples/index.html b/mode/ntriples/index.html
index 275cf08b49..5698a3599f 100644
--- a/mode/ntriples/index.html
+++ b/mode/ntriples/index.html
@@ -14,12 +14,12 @@
       }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/ntriples/ntriples.js b/mode/ntriples/ntriples.js
index 5dd027286a..970238771a 100644
--- a/mode/ntriples/ntriples.js
+++ b/mode/ntriples/ntriples.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /**********************************************************
 * This script provides syntax highlighting support for
diff --git a/mode/octave/index.html b/mode/octave/index.html
index 033e351486..d3d14b1c82 100644
--- a/mode/octave/index.html
+++ b/mode/octave/index.html
@@ -10,12 +10,12 @@
 <script src="octave.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/octave/octave.js b/mode/octave/octave.js
index 33a03368fa..0ff1f4818c 100644
--- a/mode/octave/octave.js
+++ b/mode/octave/octave.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/oz/index.html b/mode/oz/index.html
index 0b44d7f34d..2f77a9ccd0 100644
--- a/mode/oz/index.html
+++ b/mode/oz/index.html
@@ -12,11 +12,11 @@
   .CodeMirror {border: 1px solid #aaa;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/oz/oz.js b/mode/oz/oz.js
index 73857e4c7e..5d653f1a2f 100644
--- a/mode/oz/oz.js
+++ b/mode/oz/oz.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/pascal/index.html b/mode/pascal/index.html
index 414be54c4f..ad29c1c43f 100644
--- a/mode/pascal/index.html
+++ b/mode/pascal/index.html
@@ -9,12 +9,12 @@
 <script src="pascal.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index c48698bd70..062ea1189e 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/pegjs/index.html b/mode/pegjs/index.html
index 47129f5540..e40ac11cd7 100644
--- a/mode/pegjs/index.html
+++ b/mode/pegjs/index.html
@@ -13,12 +13,12 @@
   </head>
   <body>
     <div id=nav>
-      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+      <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+        <li><a href="https://github.com/codemirror/codemirror5">Code</a>
       </ul>
       <ul>
         <li><a href="../index.html">Language modes</a>
diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index ac011d3c8f..c0ed2fcc06 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/perl/index.html b/mode/perl/index.html
index b879b33553..114a6c9063 100644
--- a/mode/perl/index.html
+++ b/mode/perl/index.html
@@ -9,12 +9,12 @@
 <script src="perl.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/perl/perl.js b/mode/perl/perl.js
index 41e7bc731c..93fa73ccea 100644
--- a/mode/perl/perl.js
+++ b/mode/perl/perl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
 // This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
diff --git a/mode/php/index.html b/mode/php/index.html
index 0de6ae64b7..d4439fdd0e 100644
--- a/mode/php/index.html
+++ b/mode/php/index.html
@@ -15,12 +15,12 @@
 <script src="php.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/php/php.js b/mode/php/php.js
index 127b4a2382..281c290aea 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/php/test.js b/mode/php/test.js
index ec158145ce..c4c06c49e8 100644
--- a/mode/php/test.js
+++ b/mode/php/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "php");
diff --git a/mode/pig/index.html b/mode/pig/index.html
index 109442cf73..8a3873771d 100644
--- a/mode/pig/index.html
+++ b/mode/pig/index.html
@@ -8,12 +8,12 @@
 <script src="pig.js"></script>
 <style>.CodeMirror {border: 2px inset #dee;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/pig/pig.js b/mode/pig/pig.js
index 3b9c7746bb..a5914ce7ca 100644
--- a/mode/pig/pig.js
+++ b/mode/pig/pig.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /*
  *      Pig Latin Mode for CodeMirror 2
diff --git a/mode/powershell/index.html b/mode/powershell/index.html
index fae029826f..88ab9b1ab7 100644
--- a/mode/powershell/index.html
+++ b/mode/powershell/index.html
@@ -12,12 +12,12 @@
   </head>
   <body>
     <div id=nav>
-      <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+      <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+        <li><a href="https://github.com/codemirror/codemirror5">Code</a>
       </ul>
       <ul>
         <li><a href="../index.html">Language modes</a>
diff --git a/mode/powershell/powershell.js b/mode/powershell/powershell.js
index 4869ae7370..c793594f7e 100644
--- a/mode/powershell/powershell.js
+++ b/mode/powershell/powershell.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   'use strict';
diff --git a/mode/powershell/test.js b/mode/powershell/test.js
index 261406dfa0..d29174e28a 100644
--- a/mode/powershell/test.js
+++ b/mode/powershell/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "powershell");
diff --git a/mode/properties/index.html b/mode/properties/index.html
index d121dc9a1e..0bc3fa59ed 100644
--- a/mode/properties/index.html
+++ b/mode/properties/index.html
@@ -9,12 +9,12 @@
 <script src="properties.js"></script>
 <style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/properties/properties.js b/mode/properties/properties.js
index 02fd7fe5eb..22dff6e121 100644
--- a/mode/properties/properties.js
+++ b/mode/properties/properties.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/protobuf/index.html b/mode/protobuf/index.html
index 9af2cff794..6b570407aa 100644
--- a/mode/protobuf/index.html
+++ b/mode/protobuf/index.html
@@ -9,12 +9,12 @@
 <script src="protobuf.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/protobuf/protobuf.js b/mode/protobuf/protobuf.js
index 40b0842d47..782bff46a2 100644
--- a/mode/protobuf/protobuf.js
+++ b/mode/protobuf/protobuf.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/pug/index.html b/mode/pug/index.html
index a36f04784a..1c85b8726b 100644
--- a/mode/pug/index.html
+++ b/mode/pug/index.html
@@ -13,12 +13,12 @@
 <script src="pug.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/pug/pug.js b/mode/pug/pug.js
index 73e9ae2fc8..64f5430278 100644
--- a/mode/pug/pug.js
+++ b/mode/pug/pug.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/puppet/index.html b/mode/puppet/index.html
index fe29237139..c4d7da45d5 100644
--- a/mode/puppet/index.html
+++ b/mode/puppet/index.html
@@ -13,12 +13,12 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/puppet/puppet.js b/mode/puppet/puppet.js
index a92ca1107b..412e8504f0 100644
--- a/mode/puppet/puppet.js
+++ b/mode/puppet/puppet.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/python/index.html b/mode/python/index.html
index 78a3a14641..edf958f8e6 100644
--- a/mode/python/index.html
+++ b/mode/python/index.html
@@ -10,12 +10,12 @@
 <script src="python.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/python/python.js b/mode/python/python.js
index 9e532ea1b3..1cec2de886 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/python/test.js b/mode/python/test.js
index 1adf95320e..ca5da153dd 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4},
diff --git a/mode/q/index.html b/mode/q/index.html
index a34b7b49bb..98b36d36f2 100644
--- a/mode/q/index.html
+++ b/mode/q/index.html
@@ -10,12 +10,12 @@
 <script src="q.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/q/q.js b/mode/q/q.js
index c016a6aa65..9b1a9d8ed9 100644
--- a/mode/q/q.js
+++ b/mode/q/q.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/r/index.html b/mode/r/index.html
index da8745ffa6..55e39a5874 100644
--- a/mode/r/index.html
+++ b/mode/r/index.html
@@ -15,12 +15,12 @@
       .cm-s-default span.cm-arg-is { color: brown; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/r/r.js b/mode/r/r.js
index de34c201bd..f69f70632c 100644
--- a/mode/r/r.js
+++ b/mode/r/r.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/rpm/changes/index.html b/mode/rpm/changes/index.html
index 9d244ecc85..a6893193ea 100644
--- a/mode/rpm/changes/index.html
+++ b/mode/rpm/changes/index.html
@@ -11,12 +11,12 @@
     <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../../index.html">Language modes</a>
diff --git a/mode/rpm/index.html b/mode/rpm/index.html
index aa1dec990d..6a764c91d4 100644
--- a/mode/rpm/index.html
+++ b/mode/rpm/index.html
@@ -11,12 +11,12 @@
     <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/rpm/rpm.js b/mode/rpm/rpm.js
index bb9ec9ffad..ae990d339a 100644
--- a/mode/rpm/rpm.js
+++ b/mode/rpm/rpm.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/rst/index.html b/mode/rst/index.html
index 4e001f8e9e..9c4da54d9c 100644
--- a/mode/rst/index.html
+++ b/mode/rst/index.html
@@ -10,12 +10,12 @@
 <script src="rst.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/rst/rst.js b/mode/rst/rst.js
index f14eb270f9..76fe0573b8 100644
--- a/mode/rst/rst.js
+++ b/mode/rst/rst.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ruby/index.html b/mode/ruby/index.html
index daebdca291..3bb87f5a33 100644
--- a/mode/ruby/index.html
+++ b/mode/ruby/index.html
@@ -13,12 +13,12 @@
       .cm-s-default span.cm-arrow { color: red; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/ruby/ruby.js b/mode/ruby/ruby.js
index 67ae0e3f51..b216c196cb 100644
--- a/mode/ruby/ruby.js
+++ b/mode/ruby/ruby.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ruby/test.js b/mode/ruby/test.js
index 905c0e4849..4ce7918d2b 100644
--- a/mode/ruby/test.js
+++ b/mode/ruby/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "ruby");
diff --git a/mode/rust/index.html b/mode/rust/index.html
index 071ba0251d..13546620cc 100644
--- a/mode/rust/index.html
+++ b/mode/rust/index.html
@@ -10,12 +10,12 @@
 <script src="rust.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index f95f320d08..f702a50100 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/rust/test.js b/mode/rust/test.js
index 36c5cdeba8..347e2ffbe3 100644
--- a/mode/rust/test.js
+++ b/mode/rust/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4}, "rust");
diff --git a/mode/sas/index.html b/mode/sas/index.html
index 7877002d05..146fbbfe77 100644
--- a/mode/sas/index.html
+++ b/mode/sas/index.html
@@ -15,12 +15,12 @@
   .cm-s-default .cm-trailing-space-new-line:before {position: absolute; content: "\21B5"; color: #777;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sas/sas.js b/mode/sas/sas.js
index 49b96b66de..47260e0375 100755
--- a/mode/sas/sas.js
+++ b/mode/sas/sas.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 
 // SAS mode copyright (c) 2016 Jared Dean, SAS Institute
diff --git a/mode/sass/index.html b/mode/sass/index.html
index bf5cdb2030..7e4befa247 100644
--- a/mode/sass/index.html
+++ b/mode/sass/index.html
@@ -11,12 +11,12 @@
 <script src="sass.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; font-size:12px; height: 400px}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sass/sass.js b/mode/sass/sass.js
index d8427bff57..3cfac0a416 100644
--- a/mode/sass/sass.js
+++ b/mode/sass/sass.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/sass/test.js b/mode/sass/test.js
index 63d79193b4..4ed129093b 100644
--- a/mode/sass/test.js
+++ b/mode/sass/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "sass");
diff --git a/mode/scheme/index.html b/mode/scheme/index.html
index d0c140e829..f8a6e5c935 100644
--- a/mode/scheme/index.html
+++ b/mode/scheme/index.html
@@ -9,12 +9,12 @@
 <script src="scheme.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/scheme/scheme.js b/mode/scheme/scheme.js
index d11a132df3..598dd2846b 100644
--- a/mode/scheme/scheme.js
+++ b/mode/scheme/scheme.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /**
  * Author: Koh Zi Han, based on implementation by Koh Zi Chun
diff --git a/mode/shell/index.html b/mode/shell/index.html
index 6aed459b8b..ccaad3cbdf 100644
--- a/mode/shell/index.html
+++ b/mode/shell/index.html
@@ -12,12 +12,12 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 8271485f5f..9ae9118e0e 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/shell/test.js b/mode/shell/test.js
index 237375d451..eee1ddba0c 100644
--- a/mode/shell/test.js
+++ b/mode/shell/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({}, "shell");
diff --git a/mode/sieve/index.html b/mode/sieve/index.html
index ebceba3534..86df543253 100644
--- a/mode/sieve/index.html
+++ b/mode/sieve/index.html
@@ -9,12 +9,12 @@
 <script src="sieve.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sieve/sieve.js b/mode/sieve/sieve.js
index b7236401a7..d08fe47a4f 100644
--- a/mode/sieve/sieve.js
+++ b/mode/sieve/sieve.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/slim/index.html b/mode/slim/index.html
index bade96dd21..f90c3413bd 100644
--- a/mode/slim/index.html
+++ b/mode/slim/index.html
@@ -20,12 +20,12 @@
 <script src="slim.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/slim/slim.js b/mode/slim/slim.js
index b8ccb1381f..6da9f97e57 100644
--- a/mode/slim/slim.js
+++ b/mode/slim/slim.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
 
diff --git a/mode/slim/test.js b/mode/slim/test.js
index 991797fc88..82115d1b12 100644
--- a/mode/slim/test.js
+++ b/mode/slim/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
 
diff --git a/mode/smalltalk/index.html b/mode/smalltalk/index.html
index a64b2ffee6..f4dc298bb2 100644
--- a/mode/smalltalk/index.html
+++ b/mode/smalltalk/index.html
@@ -14,12 +14,12 @@
       .CodeMirror-gutter pre {color: white; font-weight: bold;}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/smalltalk/smalltalk.js b/mode/smalltalk/smalltalk.js
index 5039fe2d15..9e8ee938a9 100644
--- a/mode/smalltalk/smalltalk.js
+++ b/mode/smalltalk/smalltalk.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/smarty/index.html b/mode/smarty/index.html
index 2f7ea88a74..8241d4cee5 100644
--- a/mode/smarty/index.html
+++ b/mode/smarty/index.html
@@ -10,12 +10,12 @@
 <script src="smarty.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/smarty/smarty.js b/mode/smarty/smarty.js
index 57852feb0e..4660b9bc8a 100644
--- a/mode/smarty/smarty.js
+++ b/mode/smarty/smarty.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /**
  * Smarty 2 and 3 mode.
diff --git a/mode/solr/index.html b/mode/solr/index.html
index f055b5a74e..6311ab21dd 100644
--- a/mode/solr/index.html
+++ b/mode/solr/index.html
@@ -18,12 +18,12 @@
   }
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/solr/solr.js b/mode/solr/solr.js
index eda4a7a17d..fe995637de 100644
--- a/mode/solr/solr.js
+++ b/mode/solr/solr.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/soy/index.html b/mode/soy/index.html
index 2979846abe..f48472970e 100644
--- a/mode/soy/index.html
+++ b/mode/soy/index.html
@@ -14,12 +14,12 @@
 <script src="soy.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/soy/soy.js b/mode/soy/soy.js
index debe7268f4..3c3aea3635 100644
--- a/mode/soy/soy.js
+++ b/mode/soy/soy.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/soy/test.js b/mode/soy/test.js
index 44e7c4c2e2..466064be43 100644
--- a/mode/soy/test.js
+++ b/mode/soy/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "soy");
diff --git a/mode/sparql/index.html b/mode/sparql/index.html
index 59fb877b94..a702484303 100644
--- a/mode/sparql/index.html
+++ b/mode/sparql/index.html
@@ -10,12 +10,12 @@
 <script src="sparql.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index c325bc1acb..417704f75a 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/spreadsheet/index.html b/mode/spreadsheet/index.html
index 6850eaa879..2e50871051 100644
--- a/mode/spreadsheet/index.html
+++ b/mode/spreadsheet/index.html
@@ -10,12 +10,12 @@
 <script src="spreadsheet.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/spreadsheet/spreadsheet.js b/mode/spreadsheet/spreadsheet.js
index d87f988d35..6ba3656b45 100644
--- a/mode/spreadsheet/spreadsheet.js
+++ b/mode/spreadsheet/spreadsheet.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/sql/index.html b/mode/sql/index.html
index 05cafbe50d..a7b9c548ed 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -18,12 +18,12 @@
 }
         </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index cd8b757bb6..65d8fc254c 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/stex/index.html b/mode/stex/index.html
index 2c67ab2597..0a66778b23 100644
--- a/mode/stex/index.html
+++ b/mode/stex/index.html
@@ -9,12 +9,12 @@
 <script src="stex.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/stex/stex.js b/mode/stex/stex.js
index 20c3bc7a18..2b73bc98b3 100644
--- a/mode/stex/stex.js
+++ b/mode/stex/stex.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /*
  * Author: Constantin Jucovschi (c.jucovschi@jacobs-university.de)
diff --git a/mode/stex/test.js b/mode/stex/test.js
index b1dbcf4cd5..3e90eea93f 100644
--- a/mode/stex/test.js
+++ b/mode/stex/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, "stex");
diff --git a/mode/stylus/index.html b/mode/stylus/index.html
index 2c043391c4..99234aa604 100644
--- a/mode/stylus/index.html
+++ b/mode/stylus/index.html
@@ -11,12 +11,12 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;} form{margin-bottom: .7em;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/stylus/stylus.js b/mode/stylus/stylus.js
index 0759dcbdf7..dae99e5d2f 100644
--- a/mode/stylus/stylus.js
+++ b/mode/stylus/stylus.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Stylus mode created by Dmitry Kiselyov http://git.io/AaRB
 
diff --git a/mode/swift/index.html b/mode/swift/index.html
index e593f7eeab..1aa6dfdbf0 100644
--- a/mode/swift/index.html
+++ b/mode/swift/index.html
@@ -12,12 +12,12 @@
 	.CodeMirror { border: 2px inset #dee; }
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 55e31e2708..972550db04 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Swift mode created by Michael Kaminsky https://github.com/mkaminsky11
 
diff --git a/mode/swift/test.js b/mode/swift/test.js
index 8c93721d12..d3056242aa 100644
--- a/mode/swift/test.js
+++ b/mode/swift/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "swift");
diff --git a/mode/tcl/index.html b/mode/tcl/index.html
index 8c183970b3..87bc109c7b 100644
--- a/mode/tcl/index.html
+++ b/mode/tcl/index.html
@@ -10,12 +10,12 @@
 <script src="tcl.js"></script>
 <script src="../../addon/scroll/scrollpastend.js"></script>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/tcl/tcl.js b/mode/tcl/tcl.js
index dec0662a60..fd0c51752d 100644
--- a/mode/tcl/tcl.js
+++ b/mode/tcl/tcl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 //tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
 
diff --git a/mode/textile/index.html b/mode/textile/index.html
index 865b9cebcf..7acffba7f1 100644
--- a/mode/textile/index.html
+++ b/mode/textile/index.html
@@ -9,7 +9,7 @@
 <script src="textile.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/textile/test.js b/mode/textile/test.js
index 754c5f6bd7..c66dc29972 100644
--- a/mode/textile/test.js
+++ b/mode/textile/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({tabSize: 4}, 'textile');
diff --git a/mode/textile/textile.js b/mode/textile/textile.js
index b378fb61f5..db01fcf530 100644
--- a/mode/textile/textile.js
+++ b/mode/textile/textile.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") { // CommonJS
diff --git a/mode/tiddlywiki/index.html b/mode/tiddlywiki/index.html
index 28dffe1c14..865499520d 100644
--- a/mode/tiddlywiki/index.html
+++ b/mode/tiddlywiki/index.html
@@ -11,12 +11,12 @@
 <script src="tiddlywiki.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/tiddlywiki/tiddlywiki.js b/mode/tiddlywiki/tiddlywiki.js
index 6a9ce447ba..b96316d5bc 100644
--- a/mode/tiddlywiki/tiddlywiki.js
+++ b/mode/tiddlywiki/tiddlywiki.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /***
     |''Name''|tiddlywiki.js|
diff --git a/mode/tiki/index.html b/mode/tiki/index.html
index 1a66d5a46f..afc2bb2885 100644
--- a/mode/tiki/index.html
+++ b/mode/tiki/index.html
@@ -10,12 +10,12 @@
 <script src="tiki.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index 092b859532..da251464d2 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/toml/index.html b/mode/toml/index.html
index aa19591941..21bb12db05 100644
--- a/mode/toml/index.html
+++ b/mode/toml/index.html
@@ -9,12 +9,12 @@
 <script src="toml.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/toml/toml.js b/mode/toml/toml.js
index 891f384b5b..ee0c23928e 100644
--- a/mode/toml/toml.js
+++ b/mode/toml/toml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/tornado/index.html b/mode/tornado/index.html
index 96d0d0b35a..790eb6c259 100644
--- a/mode/tornado/index.html
+++ b/mode/tornado/index.html
@@ -12,7 +12,7 @@
 <script src="tornado.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>
diff --git a/mode/tornado/tornado.js b/mode/tornado/tornado.js
index aa589a08c3..973770de56 100644
--- a/mode/tornado/tornado.js
+++ b/mode/tornado/tornado.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/troff/index.html b/mode/troff/index.html
index ad5bf7af4e..5c871b6c3d 100644
--- a/mode/troff/index.html
+++ b/mode/troff/index.html
@@ -12,12 +12,12 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/troff/troff.js b/mode/troff/troff.js
index 0c2220d2cc..6d720ca3c3 100644
--- a/mode/troff/troff.js
+++ b/mode/troff/troff.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object")
diff --git a/mode/ttcn-cfg/index.html b/mode/ttcn-cfg/index.html
index 73833aca94..c7f0e82405 100644
--- a/mode/ttcn-cfg/index.html
+++ b/mode/ttcn-cfg/index.html
@@ -15,14 +15,14 @@
     }
 </style>
 <div id=nav>
-    <a href="https://codemirror.net"><h1>CodeMirror</h1>
+    <a href="https://codemirror.net/5"><h1>CodeMirror</h1>
         <img id=logo src="../../doc/logo.png" alt="">
     </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>
+        <li><a href="https://github.com/codemirror/codemirror5">Code</a>
     </ul>
     <ul>
         <li><a href="../index.html">Language modes</a>
diff --git a/mode/ttcn-cfg/ttcn-cfg.js b/mode/ttcn-cfg/ttcn-cfg.js
index 9d4b8405af..60bace18ee 100644
--- a/mode/ttcn-cfg/ttcn-cfg.js
+++ b/mode/ttcn-cfg/ttcn-cfg.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/ttcn/index.html b/mode/ttcn/index.html
index 592d2f2af7..147845ae79 100644
--- a/mode/ttcn/index.html
+++ b/mode/ttcn/index.html
@@ -15,14 +15,14 @@
     }
 </style>
 <div id=nav>
-    <a href="https://codemirror.net"><h1>CodeMirror</h1>
+    <a href="https://codemirror.net/5"><h1>CodeMirror</h1>
         <img id=logo src="../../doc/logo.png" alt="">
     </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>
+        <li><a href="https://github.com/codemirror/codemirror5">Code</a>
     </ul>
     <ul>
         <li><a href="../index.html">Language modes</a>
diff --git a/mode/ttcn/ttcn.js b/mode/ttcn/ttcn.js
index 0304e7c53d..cd56efe0a4 100644
--- a/mode/ttcn/ttcn.js
+++ b/mode/ttcn/ttcn.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/turtle/index.html b/mode/turtle/index.html
index 6a2b4ba444..3b82f4e5c4 100644
--- a/mode/turtle/index.html
+++ b/mode/turtle/index.html
@@ -10,12 +10,12 @@
 <script src="turtle.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/turtle/turtle.js b/mode/turtle/turtle.js
index 695239661f..e73f535a5b 100644
--- a/mode/turtle/turtle.js
+++ b/mode/turtle/turtle.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/twig/index.html b/mode/twig/index.html
index 3107d50030..05e101bde0 100644
--- a/mode/twig/index.html
+++ b/mode/twig/index.html
@@ -11,12 +11,12 @@
 <script src="../../addon/mode/multiplex.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/twig/twig.js b/mode/twig/twig.js
index a6dd3f1a68..d85f0aed8c 100644
--- a/mode/twig/twig.js
+++ b/mode/twig/twig.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/vb/index.html b/mode/vb/index.html
index 84922c1908..5ef317e6ee 100644
--- a/mode/vb/index.html
+++ b/mode/vb/index.html
@@ -15,12 +15,12 @@
       .CodeMirror pre { font-family: Inconsolata; font-size: 14px}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 6e4b476309..d77fdfb197 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/vbscript/index.html b/mode/vbscript/index.html
index 5db9c00b9f..bd91c7657a 100644
--- a/mode/vbscript/index.html
+++ b/mode/vbscript/index.html
@@ -9,12 +9,12 @@
 <script src="vbscript.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/vbscript/vbscript.js b/mode/vbscript/vbscript.js
index 4033948133..49c26e5bb1 100644
--- a/mode/vbscript/vbscript.js
+++ b/mode/vbscript/vbscript.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 /*
 For extra ASP classic objects, initialize CodeMirror instance with this option:
diff --git a/mode/velocity/index.html b/mode/velocity/index.html
index 59d05c17a4..5031f1f412 100644
--- a/mode/velocity/index.html
+++ b/mode/velocity/index.html
@@ -10,12 +10,12 @@
 <script src="velocity.js"></script>
 <style>.CodeMirror {border: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/velocity/velocity.js b/mode/velocity/velocity.js
index 79a621a5b0..7576399221 100644
--- a/mode/velocity/velocity.js
+++ b/mode/velocity/velocity.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/verilog/index.html b/mode/verilog/index.html
index c159dbe14c..2d37a5738c 100644
--- a/mode/verilog/index.html
+++ b/mode/verilog/index.html
@@ -10,12 +10,12 @@
 <script src="verilog.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/verilog/test.js b/mode/verilog/test.js
index 38c1cbe457..3787bf2460 100644
--- a/mode/verilog/test.js
+++ b/mode/verilog/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4}, "verilog");
diff --git a/mode/verilog/verilog.js b/mode/verilog/verilog.js
index 6c799f298b..221328eb49 100644
--- a/mode/verilog/verilog.js
+++ b/mode/verilog/verilog.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/vhdl/index.html b/mode/vhdl/index.html
index 50b6a10e12..0d254fb842 100644
--- a/mode/vhdl/index.html
+++ b/mode/vhdl/index.html
@@ -10,12 +10,12 @@
 <script src="vhdl.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/vhdl/vhdl.js b/mode/vhdl/vhdl.js
index 133e67a268..a7ddfd1e69 100644
--- a/mode/vhdl/vhdl.js
+++ b/mode/vhdl/vhdl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Originally written by Alf Nielsen, re-written by Michael Zhou
 (function(mod) {
diff --git a/mode/vue/index.html b/mode/vue/index.html
index 6ea54b7562..e11a4b86b1 100644
--- a/mode/vue/index.html
+++ b/mode/vue/index.html
@@ -21,12 +21,12 @@
 <script src="vue.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/vue/vue.js b/mode/vue/vue.js
index b6e6cc5137..a0220bdc7b 100644
--- a/mode/vue/vue.js
+++ b/mode/vue/vue.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function (mod) {
   "use strict";
diff --git a/mode/wast/index.html b/mode/wast/index.html
index e589d90e09..977dfe8b65 100644
--- a/mode/wast/index.html
+++ b/mode/wast/index.html
@@ -15,14 +15,14 @@
   }
 </style>
 <div id=nav>
-  <a href="https://codemirror.net">
+  <a href="https://codemirror.net/5">
     <h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt="">
   </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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/wast/test.js b/mode/wast/test.js
index 0ebb388c3c..b5f7c71082 100644
--- a/mode/wast/test.js
+++ b/mode/wast/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 4}, "wast");
diff --git a/mode/wast/wast.js b/mode/wast/wast.js
index 471ace5be7..0a0af853da 100644
--- a/mode/wast/wast.js
+++ b/mode/wast/wast.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/webidl/index.html b/mode/webidl/index.html
index e9c325ed59..d96ebca8f5 100644
--- a/mode/webidl/index.html
+++ b/mode/webidl/index.html
@@ -10,12 +10,12 @@
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 
 <div id="nav">
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id="logo" src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/webidl/webidl.js b/mode/webidl/webidl.js
index 120de6bea7..7fa01da473 100644
--- a/mode/webidl/webidl.js
+++ b/mode/webidl/webidl.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/xml/index.html b/mode/xml/index.html
index c0dec45904..c0f5e84a91 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -9,12 +9,12 @@
 <script src="xml.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/xml/test.js b/mode/xml/test.js
index b586d2b459..ab376116f8 100644
--- a/mode/xml/test.js
+++ b/mode/xml/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var mode = CodeMirror.getMode({indentUnit: 2}, "xml"), mname = "xml";
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index 4e36106b49..701e151ab2 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/xquery/index.html b/mode/xquery/index.html
index bca4d06b5a..f9466ddecc 100644
--- a/mode/xquery/index.html
+++ b/mode/xquery/index.html
@@ -16,12 +16,12 @@
 	}
     </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/xquery/test.js b/mode/xquery/test.js
index f7ad3ac529..4d559fdbcb 100644
--- a/mode/xquery/test.js
+++ b/mode/xquery/test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Don't take these too seriously -- the expected results appear to be
 // based on the results of actual runs without any serious manual
diff --git a/mode/xquery/xquery.js b/mode/xquery/xquery.js
index 395b6a7014..e9ae43b516 100644
--- a/mode/xquery/xquery.js
+++ b/mode/xquery/xquery.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/yacas/index.html b/mode/yacas/index.html
index 398725649a..50ed00ec4e 100644
--- a/mode/yacas/index.html
+++ b/mode/yacas/index.html
@@ -12,12 +12,12 @@
   .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
 </style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/yacas/yacas.js b/mode/yacas/yacas.js
index b7ac96b71d..1e775d99ec 100644
--- a/mode/yacas/yacas.js
+++ b/mode/yacas/yacas.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 // Yacas mode copyright (c) 2015 by Grzegorz Mazur
 // Loosely based on mathematica mode by Calin Barbat
diff --git a/mode/yaml-frontmatter/index.html b/mode/yaml-frontmatter/index.html
index f55b5bd8f7..df17320bc1 100644
--- a/mode/yaml-frontmatter/index.html
+++ b/mode/yaml-frontmatter/index.html
@@ -13,12 +13,12 @@
 <script src="yaml-frontmatter.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/yaml-frontmatter/yaml-frontmatter.js b/mode/yaml-frontmatter/yaml-frontmatter.js
index 5c6175e4ec..0b30aa2431 100644
--- a/mode/yaml-frontmatter/yaml-frontmatter.js
+++ b/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function (mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/yaml/index.html b/mode/yaml/index.html
index 6014d9d375..b923116ef6 100644
--- a/mode/yaml/index.html
+++ b/mode/yaml/index.html
@@ -9,12 +9,12 @@
 <script src="yaml.js"></script>
 <style>.CodeMirror { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; }</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index d464941026..298db55f6f 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/mode/z80/index.html b/mode/z80/index.html
index ca53bffefd..1cff455bc1 100644
--- a/mode/z80/index.html
+++ b/mode/z80/index.html
@@ -9,12 +9,12 @@
 <script src="z80.js"></script>
 <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
+  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a href="../index.html">Language modes</a>
diff --git a/mode/z80/z80.js b/mode/z80/z80.js
index 8cea4ff90c..596e57d2e6 100644
--- a/mode/z80/z80.js
+++ b/mode/z80/z80.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
diff --git a/package.json b/package.json
index 3f88289156..0dae561ba3 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "CodeMirror",
     "Editor"
   ],
-  "homepage": "https://codemirror.net",
+  "homepage": "https://codemirror.net/5/",
   "repository": {
     "type": "git",
     "url": "https://github.com/codemirror/CodeMirror.git"
diff --git a/rollup.config.js b/rollup.config.js
index f50f62fae2..236b79c593 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -5,9 +5,9 @@ export default [
     input: "src/codemirror.js",
     output: {
       banner: `// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
-// This is CodeMirror (https://codemirror.net), a code editor
+// This is CodeMirror (https://codemirror.net/5), a code editor
 // implemented in JavaScript on top of the browser's DOM.
 //
 // You can find some technical background for some of the code below
diff --git a/test/html-hint-test.js b/test/html-hint-test.js
index a40582e296..e8544275c8 100644
--- a/test/html-hint-test.js
+++ b/test/html-hint-test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var Pos = CodeMirror.Pos;
diff --git a/test/index.html b/test/index.html
index 3369beac1f..e03b6e643c 100644
--- a/test/index.html
+++ b/test/index.html
@@ -84,12 +84,12 @@
 </style>
 
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../doc/logo.png"></a>
+  <a href="https://codemirror.net/5"><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>
+    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
   </ul>
   <ul>
     <li><a class=active href="#">Test suite</a>
diff --git a/test/sql-hint-test.js b/test/sql-hint-test.js
index d1ea7f1f81..15d2a36fd3 100644
--- a/test/sql-hint-test.js
+++ b/test/sql-hint-test.js
@@ -1,5 +1,5 @@
 // CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
+// Distributed under an MIT license: https://codemirror.net/5/LICENSE
 
 (function() {
   var Pos = CodeMirror.Pos;

From 2ca1993b1abfb41d03dcaf17e7bd0a2f70c4f2dd Mon Sep 17 00:00:00 2001
From: Yakov Manshin <git@yakovmanshin.com>
Date: Mon, 13 Jun 2022 12:25:29 +0400
Subject: [PATCH 4631/4742] [swift mode] Support for Structured Concurrency
 keywords

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

diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 972550db04..1edc7907d8 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -19,14 +19,14 @@
     return set
   }
 
-  var keywords = wordSet(["_","var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype",
+  var keywords = wordSet(["_","var","let","actor","class","enum","extension","import","protocol","struct","func","typealias","associatedtype",
                           "open","public","internal","fileprivate","private","deinit","init","new","override","self","subscript","super",
                           "convenience","dynamic","final","indirect","lazy","required","static","unowned","unowned(safe)","unowned(unsafe)","weak","as","is",
                           "break","case","continue","default","else","fallthrough","for","guard","if","in","repeat","switch","where","while",
-                          "defer","return","inout","mutating","nonmutating","catch","do","rethrows","throw","throws","try","didSet","get","set","willSet",
+                          "defer","return","inout","mutating","nonmutating","isolated","nonisolated","catch","do","rethrows","throw","throws","async","await","try","didSet","get","set","willSet",
                           "assignment","associativity","infix","left","none","operator","postfix","precedence","precedencegroup","prefix","right",
                           "Any","AnyObject","Type","dynamicType","Self","Protocol","__COLUMN__","__FILE__","__FUNCTION__","__LINE__"])
-  var definingKeywords = wordSet(["var","let","class","enum","extension","import","protocol","struct","func","typealias","associatedtype","for"])
+  var definingKeywords = wordSet(["var","let","actor","class","enum","extension","import","protocol","struct","func","typealias","associatedtype","for"])
   var atoms = wordSet(["true","false","nil","self","super","_"])
   var types = wordSet(["Array","Bool","Character","Dictionary","Double","Float","Int","Int8","Int16","Int32","Int64","Never","Optional","Set","String",
                        "UInt8","UInt16","UInt32","UInt64","Void"])

From f5e456edc213f28a719fedce719dfa0aa8728e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20dBruxelles?=
 <18559798+jdbruxelles@users.noreply.github.com>
Date: Thu, 16 Jun 2022 14:05:22 +0200
Subject: [PATCH 4632/4742] Fix link to v6

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

diff --git a/index.html b/index.html
index 3ddd697b8d..700d3eaa62 100644
--- a/index.html
+++ b/index.html
@@ -32,7 +32,7 @@
     <li><a class=active data-default="true" href="#description">Home</a>
     <li><a href="doc/manual.html">Manual</a>
     <li><a href="https://github.com/codemirror/codemirror5">Code</a>
-    <li><a href="https://codemirror.net/5/6/">Version 6</a>
+    <li><a href="https://codemirror.net/">Version 6</a>
   </ul>
   <ul>
     <li><a href="#features">Features</a>

From 511a0726bff4a84217b6d95d79e8fb3af26e865b Mon Sep 17 00:00:00 2001
From: Tim Down <tim@timdown.co.uk>
Date: Wed, 22 Jun 2022 10:10:20 +0100
Subject: [PATCH 4633/4742] [vim bindings] Correct zb and z- key bindings being
 the wrong way round

---
 keymap/vim.js    |  4 ++--
 test/driver.js   |  3 +++
 test/vim_test.js | 34 ++++++++++++++++++++++++++++++++--
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 2b053f37c7..e0563e0b01 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -225,8 +225,8 @@
     { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
     { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
     { keys: 'z<CR>', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
-    { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
+    { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
     { keys: '.', type: 'action', action: 'repeatLastEdit' },
     { keys: '<C-a>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
     { keys: '<C-x>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
diff --git a/test/driver.js b/test/driver.js
index bc1634eaae..938846e9dd 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -101,6 +101,9 @@ function label(str, msg) {
 function eq(a, b, msg) {
   if (a != b) throw new Failure(label(a + " != " + b, msg));
 }
+function notEq(a, b, msg) {
+  if (a == b) throw new Failure(label(a + " == " + b, msg));
+}
 function near(a, b, margin, msg) {
   if (Math.abs(a - b) > margin)
     throw new Failure(label(a + " is not close to " + b + " (" + margin + ")", msg));
diff --git a/test/vim_test.js b/test/vim_test.js
index 0085633daa..f7d3c9fbbb 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -3567,6 +3567,7 @@ testVim('HML', function(cm, vim, helpers) {
 })()});
 
 var zVals = [];
+var cursorIndexVals = [];
 forEach(['zb','zz','zt','z-','z.','z<CR>'], function(e, idx){
   var lineNum = 250;
   var lines = 35;
@@ -3576,11 +3577,16 @@ forEach(['zb','zz','zt','z-','z.','z<CR>'], function(e, idx){
     var k2 = e.substring(1);
     var textHeight = cm.defaultTextHeight();
     cm.setSize(600, lines*textHeight);
-    cm.setCursor(lineNum, 0);
+    cm.setCursor(lineNum, 1);
+    var originalCursorIndex = cm.indexFromPos(cm.getCursor());
     helpers.doKeys(k1, k2);
     zVals[idx] = cm.getScrollInfo().top;
+    cursorIndexVals[idx] = {
+      before: originalCursorIndex,
+      after: cm.indexFromPos(cm.getCursor())
+    };
   }, { value: (function(){
-    return new Array(500).join('\n');
+    return new Array(500).join('12\n');
   })()});
 });
 testVim('zb_to_bottom', function(cm, vim, helpers){
@@ -3619,6 +3625,30 @@ testVim('zz==z.', function(cm, vim, helpers){
 testVim('zt==z<CR>', function(cm, vim, helpers){
   eq(zVals[2], zVals[5]);
 });
+testVim('zt_no_cursor_change', function(cm, vim, helpers){
+  var cursorIndexes = cursorIndexVals[2]
+  eq(cursorIndexes.before, cursorIndexes.after);
+});
+testVim('z<CR>_cursor_change', function(cm, vim, helpers){
+  var cursorIndexes = cursorIndexVals[5]
+  notEq(cursorIndexes.before, cursorIndexes.after);
+});
+testVim('zz_no_cursor_change', function(cm, vim, helpers){
+  var cursorIndexes = cursorIndexVals[1]
+  eq(cursorIndexes.before, cursorIndexes.after);
+});
+testVim('z._cursor_change', function(cm, vim, helpers){
+  var cursorIndexes = cursorIndexVals[4]
+  notEq(cursorIndexes.before, cursorIndexes.after);
+});
+testVim('zb_no_cursor_change', function(cm, vim, helpers){
+  var cursorIndexes = cursorIndexVals[0]
+  eq(cursorIndexes.before, cursorIndexes.after);
+});
+testVim('z-_cursor_change', function(cm, vim, helpers){
+  var cursorIndexes = cursorIndexVals[3]
+  notEq(cursorIndexes.before, cursorIndexes.after);
+});
 
 var moveTillCharacterSandbox =
   'The quick brown fox \n';

From 64dfb17693f73f56bef0b48ba303e2b601a6c7d3 Mon Sep 17 00:00:00 2001
From: Tim Down <tim@timdown.co.uk>
Date: Wed, 22 Jun 2022 10:11:03 +0100
Subject: [PATCH 4634/4742] [vim bindings] Fix zb and z- scrolling with wrapped
 lines

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

diff --git a/keymap/vim.js b/keymap/vim.js
index e0563e0b01..6afa98d5cb 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2416,11 +2416,14 @@
         var charCoords = cm.charCoords(new Pos(lineNum, 0), 'local');
         var height = cm.getScrollInfo().clientHeight;
         var y = charCoords.top;
-        var lineHeight = charCoords.bottom - y;
         switch (actionArgs.position) {
-          case 'center': y = y - (height / 2) + lineHeight;
+          case 'center': y = charCoords.bottom - height / 2;
             break;
-          case 'bottom': y = y - height + lineHeight;
+          case 'bottom':
+            var lineLastCharPos = new Pos(lineNum, cm.getLine(lineNum).length - 1);
+            var lineLastCharCoords = cm.charCoords(lineLastCharPos, 'local');
+            var lineHeight = lineLastCharCoords.bottom - y;
+            y = y - height + lineHeight
             break;
         }
         cm.scrollTo(null, y);

From 5bc5321efa83f7ba7a620fcf4c74a7ac38dedbca Mon Sep 17 00:00:00 2001
From: Mark Boyes <mark.boyes@oxfordsemantic.tech>
Date: Thu, 23 Jun 2022 07:23:15 +0100
Subject: [PATCH 4635/4742] [sparql mode] Add INTO keyword

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

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 417704f75a..5e68f5670d 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -31,7 +31,7 @@ CodeMirror.defineMode("sparql", function(config) {
                              "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group",
                              "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union",
                              "true", "false", "with",
-                             "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
+                             "data", "copy", "to", "move", "add", "create", "drop", "clear", "load", "into"]);
   var operatorChars = /[*+\-<>=&|\^\/!\?]/;
 
   function tokenBase(stream, state) {

From e94848f38fe6fe913866b842d90176f4aef72c73 Mon Sep 17 00:00:00 2001
From: Faris Masad <farismasad@gmail.com>
Date: Fri, 24 Jun 2022 06:32:28 -1000
Subject: [PATCH 4636/4742] Make sure v5 releases don't override latest on npm

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0dae561ba3..cb18cb5d9a 100644
--- a/package.json
+++ b/package.json
@@ -43,5 +43,8 @@
     "dependencies": {},
     "devDependencies": {}
   },
-  "dependencies": {}
+  "dependencies": {},
+  "publishConfig": {
+    "tag": "version5"
+  }
 }

From c722d1b4e24582512fd72377835d374670e5dda3 Mon Sep 17 00:00:00 2001
From: Erik Krogh Kristensen <erik-krogh@github.com>
Date: Fri, 24 Jun 2022 19:43:44 +0200
Subject: [PATCH 4637/4742] [css mode] Fix the char ranges identifying valid
 colors

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

diff --git a/mode/css/css.js b/mode/css/css.js
index 5a1c3014d0..b0721b4191 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -228,7 +228,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     if (type == "}" || type == "{") return popAndPass(type, stream, state);
     if (type == "(") return pushContext(state, stream, "parens");
 
-    if (type == "hash" && !/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(stream.current())) {
+    if (type == "hash" && !/^#([0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/.test(stream.current())) {
       override += " error";
     } else if (type == "word") {
       wordAsValue(stream);

From e7e1c87c59eb965b67c739ba6adef7a2165a9a99 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jun 2022 13:44:35 +0200
Subject: [PATCH 4638/4742] Mark version 5.65.6

---
 AUTHORS           |  1 +
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 4edf4c1697..e0c7f54121 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -111,6 +111,7 @@ benhormann
 Ben Hormann
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
+benjaminr-ps
 Benjamin Young
 Ben Keen
 Ben Miller
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dea0a3f20f..ef2f9bef8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.65.6 (2022-06-20)
+
+### Bug fixes
+
+Avoid firing `beforeCursorEnter` callbacks twice for cursor selections.
+
+Improve support for auto-hiding macOS scrollbars.
+
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Fix an issue where the tooltip could be placed to the left of the screen.
+
+[swift mode](https://codemirror.net/5/mode/swift): Support structured concurrency keywords.
+
 ## 5.65.5 (2022-05-30)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 8db8695979..5782898d6f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.5</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.6</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 7b190d2449..f42d6aac5e 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -30,6 +30,15 @@ <h2>Release notes and version history</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-06-2022: <a href="https://codemirror.net/5/codemirror-5.65.6.zip">Version 5.65.6</a>:</p>
+
+  <ul class="rel-note">
+    <li>Avoid firing <code>beforeCursorEnter</code> callbacks twice for cursor selections.</li>
+    <li>Improve support for auto-hiding macOS scrollbars.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix an issue where the tooltip could be placed to the left of the screen.</li>
+    <li><a href="https://codemirror.net/5/mode/swift">swift mode</a>: Support structured concurrency keywords.</li>
+  </ul>
+
   <p class="rel">30-05-2022: <a href="https://codemirror.net/5/codemirror-5.65.5.zip">Version 5.65.5</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 700d3eaa62..00d7d26536 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.5</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.6</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index cb18cb5d9a..a132e8f6c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.5",
+  "version": "5.65.6",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 84c331056b..6a1bdfb2a4 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.5"
+CodeMirror.version = "5.65.6"

From 5adf5942d7b1f9fd9ef4667c56b5f7f4ace97261 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 20 Jun 2022 13:54:28 +0200
Subject: [PATCH 4639/4742] Fix some remaining links to old repository

---
 .github/workflows/ci.yml |  2 +-
 README.md                |  2 +-
 bin/upload-release.js    | 31 ++++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f6e8536817..77d1cf5a3d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
 
       - uses: actions/cache@v2
         with:
-          path: '/home/runner/work/codemirror/codemirror/node_modules'
+          path: '/home/runner/work/codemirror/codemirror5/node_modules'
           key: ${{ runner.os }}-modules
 
       - run: npm install
diff --git a/README.md b/README.md
index 0e9f5b6098..578a5a9730 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # CodeMirror
 
-[![Build Status](https://github.com/codemirror/codemirror5/workflows/main/badge.svg)](https://github.com/codemirror/codemirror/actions)
+[![Build Status](https://github.com/codemirror/codemirror5/workflows/main/badge.svg)](https://github.com/codemirror/codemirror5/actions)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a versatile text editor implemented in JavaScript for
diff --git a/bin/upload-release.js b/bin/upload-release.js
index 7c8551468c..59ed6f5a8f 100644
--- a/bin/upload-release.js
+++ b/bin/upload-release.js
@@ -2,34 +2,43 @@
 
 let version = process.argv[2]
 let auth = process.argv[3]
+let url = require("url")
 
 if (!auth) {
   console.log("Usage: upload-release.js [TAG] [github-user:password]")
   process.exit(1)
 }
 
-require('child_process').exec("git --no-pager show -s --format='%s' " + version, (error, stdout) => {
-  if (error) throw error
-  let message = stdout.split("\n").slice(2)
-  message = message.slice(0, message.indexOf("-----BEGIN PGP SIGNATURE-----")).join("\n")
-
+function post(host, path, body) {
   let req = require("https").request({
-    host: "api.github.com",
+    host,
     auth: auth,
     headers: {"user-agent": "Release uploader"},
-    path: "/repos/codemirror/codemirror/releases",
+    path,
     method: "POST"
   }, res => {
-    if (res.statusCode >= 300) {
-      console.error(res.statusMessage)
+    if (res.statusCode >= 300 && res.statusCode < 400) {
+      console.log(res.headers.location)
+      let parsed = url.parse(res.headers.location)
+      post(parsed.host, parsed.path, body)
+    } else if (res.statusCode >= 400) {
+      console.error(res.statusCode, res.statusMessage)
       res.on("data", d => console.log(d.toString()))
       res.on("end", process.exit(1))
     }
   })
-  req.write(JSON.stringify({
+  req.write(body)
+  req.end()
+}
+
+require('child_process').exec("git --no-pager show -s --format='%s' " + version, (error, stdout) => {
+  if (error) throw error
+  let message = stdout.split("\n").slice(2)
+  message = message.slice(0, message.indexOf("-----BEGIN PGP SIGNATURE-----")).join("\n")
+
+  post("api.github.com", "/repos/codemirror/codemirror5/releases", JSON.stringify({
     tag_name: version,
     name: version,
     body: message
   }))
-  req.end()
 })

From 571171d0324a835a4f0d5784c1e006b41942a3d8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 27 Jun 2022 07:59:39 +0200
Subject: [PATCH 4640/4742] Only apply scroll hack on Chrome version 102, not
 newer ones

---
 src/display/scroll_events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/scroll_events.js b/src/display/scroll_events.js
index 809e78b087..50ac818874 100644
--- a/src/display/scroll_events.js
+++ b/src/display/scroll_events.js
@@ -43,7 +43,7 @@ export function onScrollWheel(cm, e) {
   // On Chrome 102, viewport updates somehow stop wheel-based
   // scrolling. Turning off pointer events during the scroll seems
   // to avoid the issue.
-  if (chrome && chrome_version >= 102) {
+  if (chrome && chrome_version == 102) {
     if (cm.display.chromeScrollHack == null) cm.display.sizer.style.pointerEvents = "none"
     else clearTimeout(cm.display.chromeScrollHack)
     cm.display.chromeScrollHack = setTimeout(() => {

From 384438b1c2b74c29e1d106f008bdac79c41013c8 Mon Sep 17 00:00:00 2001
From: kometenstaub <83140328+kometenstaub@users.noreply.github.com>
Date: Mon, 27 Jun 2022 11:39:59 +0200
Subject: [PATCH 4641/4742] [vim bindings] Add sentence option for around/inner
 text object operation

---
 keymap/vim.js    | 175 +++++++++++++++++++++++++++++++++++++++++++----
 test/vim_test.js |  80 ++++++++++++++++++++++
 2 files changed, 242 insertions(+), 13 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 6afa98d5cb..0b1208cd2d 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -2154,6 +2154,20 @@
           }
         } else if (character === 't') {
           tmp = expandTagUnderCursor(cm, head, inclusive);
+        } else if (character === 's') {
+          // account for cursor on end of sentence symbol
+          var content = cm.getLine(head.line);
+          if (head.ch > 0 && isEndOfSentenceSymbol(content[head.ch])) {
+            head.ch -= 1;
+          }
+          var end = getSentence(cm, head, motionArgs.repeat, 1, inclusive)
+          var start = getSentence(cm, head, motionArgs.repeat, -1, inclusive)
+          // closer vim behaviour, 'a' only takes the space after the sentence if there is one before and after
+          if (isWhiteSpaceString(cm.getLine(start.line)[start.ch])
+              && isWhiteSpaceString(cm.getLine(end.line)[end.ch -1])) {
+            start = {line: start.line, ch: start.ch + 1}
+          }
+          tmp = {start: start, end: end};
         } else {
           // No text object defined for this, don't move.
           return null;
@@ -3805,21 +3819,156 @@
       start = new Pos(i, 0);
       return { start: start, end: end };
     }
+  function getSentence(cm, cur, repeat, dir, inclusive /*includes whitespace*/) {
+    /*
+    Takes an index object
+    {
+    line: the line string,
+    ln: line number,
+    pos: index in line,
+    dir: direction of traversal (-1 or 1)
+    }
+    and modifies the pos member to represent the
+    next valid position or sets the line to null if there are
+    no more valid positions.
+   */
+    function nextChar(curr) {
+      if (curr.pos + curr.dir < 0 || curr.pos + curr.dir >= curr.line.length) {
+          curr.line = null;
+        }
+      else {
+        curr.pos += curr.dir;
+      }
+    }
+    /*
+    Performs one iteration of traversal in forward direction
+    Returns an index object of the new location
+   */
+    function forward(cm, ln, pos, dir) {
+      var line = cm.getLine(ln);
+
+      var curr = {
+        line: line,
+        ln: ln,
+        pos: pos,
+        dir: dir,
+      };
 
-    function findSentence(cm, cur, repeat, dir) {
+      if (curr.line === "") {
+        return { ln: curr.ln, pos: curr.pos };
+      }
 
-      /*
-        Takes an index object
-        {
-          line: the line string,
-          ln: line number,
-          pos: index in line,
-          dir: direction of traversal (-1 or 1)
-        }
-        and modifies the line, ln, and pos members to represent the
-        next valid position or sets them to null if there are
-        no more valid positions.
-       */
+      var lastSentencePos = curr.pos;
+
+      // Move one step to skip character we start on
+      nextChar(curr);
+
+      while (curr.line !== null) {
+        lastSentencePos = curr.pos;
+        if (isEndOfSentenceSymbol(curr.line[curr.pos])) {
+          if (!inclusive) {
+            return { ln: curr.ln, pos: curr.pos + 1 };
+          } else {
+            nextChar(curr);
+            while (curr.line !== null ) {
+              if (isWhiteSpaceString(curr.line[curr.pos])) {
+                lastSentencePos = curr.pos;
+                nextChar(curr)
+              } else {
+                break;
+              }
+            }
+            return { ln: curr.ln, pos: lastSentencePos + 1, };
+          }
+        }
+        nextChar(curr);
+      }
+      return { ln: curr.ln, pos: lastSentencePos + 1 };
+    }
+
+    /*
+    Performs one iteration of traversal in reverse direction
+    Returns an index object of the new location
+   */
+    function reverse(cm, ln, pos, dir) {
+      var line = cm.getLine(ln);
+
+      var curr = {
+        line: line,
+        ln: ln,
+        pos: pos,
+        dir: dir,
+      }
+
+      if (curr.line === "") {
+        return { ln: curr.ln, pos: curr.pos };
+      }
+
+      var lastSentencePos = curr.pos;
+
+      // Move one step to skip character we start on
+      nextChar(curr);
+
+      while (curr.line !== null) {
+        if (!isWhiteSpaceString(curr.line[curr.pos]) && !isEndOfSentenceSymbol(curr.line[curr.pos])) {
+          lastSentencePos = curr.pos;
+        }
+
+        else if (isEndOfSentenceSymbol(curr.line[curr.pos]) ) {
+          if (!inclusive) {
+            return { ln: curr.ln, pos: lastSentencePos };
+          } else {
+              if (isWhiteSpaceString(curr.line[curr.pos + 1])) {
+                return { ln: curr.ln, pos: curr.pos + 1, };
+              } else {
+                return {ln: curr.ln, pos: lastSentencePos};
+              }
+          }
+        }
+
+        nextChar(curr);
+      }
+      curr.line = line
+      if (inclusive && isWhiteSpaceString(curr.line[curr.pos])) {
+        return { ln: curr.ln, pos: curr.pos };
+      } else {
+        return { ln: curr.ln, pos: lastSentencePos };
+      }
+
+    }
+
+    var curr_index = {
+      ln: cur.line,
+      pos: cur.ch,
+    };
+
+    while (repeat > 0) {
+      if (dir < 0) {
+        curr_index = reverse(cm, curr_index.ln, curr_index.pos, dir);
+      }
+      else {
+        curr_index = forward(cm, curr_index.ln, curr_index.pos, dir);
+      }
+      repeat--;
+    }
+
+    return new Pos(curr_index.ln, curr_index.pos);
+  }
+
+  function findSentence(cm, cur, repeat, dir) {
+
+    /*
+    Takes an index object
+    {
+    line: the line string,
+    ln: line number,
+    pos: index in line,
+    dir: direction of traversal (-1 or 1)
+    }
+    and modifies the line, ln, and pos members to represent the
+    next valid position or sets them to null if there are
+    no more valid positions.
+   */
       function nextChar(cm, idx) {
         if (idx.pos + idx.dir < 0 || idx.pos + idx.dir >= idx.line.length) {
           idx.ln += idx.dir;
diff --git a/test/vim_test.js b/test/vim_test.js
index f7d3c9fbbb..4b76d47b00 100644
--- a/test/vim_test.js
+++ b/test/vim_test.js
@@ -648,6 +648,86 @@ testVim('paragraph_motions', function(cm, vim, helpers) {
   eq('b\na\na\nc\n', register.toString());
 }, { value: 'a\na\n\n\n\nb\nc\n\n\n\n\n\n\nd\n\ne\nf' });
 
+testVim('sentence_selections', function(cm, vim, helpers) {
+  // vis at beginning of line
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'i', 's');
+  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(0, 14), cm.getCursor('head'));
+
+  // vas at beginning of line
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'a', 's');
+  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(0, 15), cm.getCursor('head'));
+
+  // vis on sentence end
+  cm.setCursor(0, 13);
+  helpers.doKeys('v', 'i', 's');
+  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(0, 14), cm.getCursor('head'));
+
+  // vas on sentence end
+  cm.setCursor(0, 13);
+  helpers.doKeys('v', 'a', 's');
+  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(0, 15), cm.getCursor('head'));
+
+  // vis at sentence end, no whitespace after it
+  cm.setCursor(1, 18);
+  helpers.doKeys('v', 'i', 's');
+  eqCursorPos(new Pos(1, 13), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(1, 19), cm.getCursor('head'));
+
+  // vas at sentence end, no whitespace after it
+  cm.setCursor(1, 18);
+  helpers.doKeys('v', 'a', 's');
+  eqCursorPos(new Pos(1, 12), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(1, 19), cm.getCursor('head'));
+
+  // vis at sentence beginning, on whitespace
+  cm.setCursor(0, 14);
+  helpers.doKeys('v', 'i', 's');
+  eqCursorPos(new Pos(0, 14), cm.getCursor('anchor'));
+  eqCursorPos(new Pos(0, 29), cm.getCursor('head'));
+
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'i', 's');
+  var register = helpers.getRegisterController().getRegister();
+  eq('Test sentence.', register.toString());
+
+  // return to original value
+  helpers.doKeys('u')
+
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'a', 's');
+  register = helpers.getRegisterController().getRegister();
+  eq('Test sentence. ', register.toString());
+
+  // return to original value
+  helpers.doKeys('u')
+
+  cm.setCursor(1, 20);
+  helpers.doKeys('c', 'a', 's', '<Esc>');
+  register = helpers.getRegisterController().getRegister();
+  eq('Test.', register.toString());
+
+  // return to original value
+  helpers.doKeys('u')
+
+  cm.setCursor(3, 11);
+  helpers.doKeys('y', 'a', 's');
+  register = helpers.getRegisterController().getRegister();
+  eq('This is more text. ', register.toString());
+
+  cm.setCursor(3, 31);
+  helpers.doKeys('y', 'a', 's');
+  register = helpers.getRegisterController().getRegister();
+  eq(' No end of sentence symbol', register.toString());
+
+}, { value: 'Test sentence. Test question?\nAgain.Never. Again.Test.\n\nHello. This is more text. No end of sentence symbol\n' });
+
+
 // Operator tests
 testVim('dl', function(cm, vim, helpers) {
   var curStart = makeCursor(0, 0);

From 8216951fbeb6e0b6ded59207fefb42f55da3acee Mon Sep 17 00:00:00 2001
From: fzipp <fzipp@gmx.de>
Date: Thu, 30 Jun 2022 18:11:26 +0200
Subject: [PATCH 4642/4742] [go mode] Add new builtin types `any` and
 `comparable`

Go 1.18 introduced two new predeclared identifiers: `any` and `comparable`:
https://go.dev/doc/go1.18#generics
---
 mode/go/go.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/go/go.js b/mode/go/go.js
index 898f747adb..8dbdc65d1c 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -24,7 +24,7 @@ CodeMirror.defineMode("go", function(config) {
     "float32":true, "float64":true, "int8":true, "int16":true, "int32":true,
     "int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true,
     "uint64":true, "int":true, "uint":true, "uintptr":true, "error": true,
-    "rune":true
+    "rune":true, "any":true, "comparable":true
   };
 
   var atoms = {

From 2e50c906583a720848c1158c2c753f01954fdd37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pontus=20Granstr=C3=B6m?=
 <51674754+pontusgranstrom@users.noreply.github.com>
Date: Fri, 1 Jul 2022 07:41:44 +0200
Subject: [PATCH 4643/4742] [elm mode] Add support for line comments

This lets a user toggle comments with a keyboard shortcut when using codemirror to edit Elm code.
---
 mode/elm/elm.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/elm/elm.js b/mode/elm/elm.js
index 837e58e758..671cba5352 100644
--- a/mode/elm/elm.js
+++ b/mode/elm/elm.js
@@ -229,6 +229,8 @@
     return {
       startState: function ()  { return { f: normal() }; },
       copyState:  function (s) { return { f: s.f }; },
+      
+      lineComment: '--',
 
       token: function(stream, state) {
         var type = state.f(stream, function(s) { state.f = s; });

From 52dc64004c481ff025beaed5d018c0bfb9ad05f6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 1 Jul 2022 07:53:51 +0200
Subject: [PATCH 4644/4742] Delete trailing whitespace

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

diff --git a/mode/elm/elm.js b/mode/elm/elm.js
index 671cba5352..e41dfb06db 100644
--- a/mode/elm/elm.js
+++ b/mode/elm/elm.js
@@ -229,7 +229,7 @@
     return {
       startState: function ()  { return { f: normal() }; },
       copyState:  function (s) { return { f: s.f }; },
-      
+
       lineComment: '--',
 
       token: function(stream, state) {

From a6fdd560c769c946ee04befda5d9378e7a8fdfbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <suprdewd@gmail.com>
Date: Sat, 9 Jul 2022 12:53:36 +0200
Subject: [PATCH 4645/4742] [tern addon] Make sure dialog text is HTML escaped

This addresses a potential XSS vulnerability caused by tern's
construction of inline HTML where text input is not escaped, which is
then passed to the openDialog function for rendering. The construction
is replaced with an equivalent DOM fragment construction, which
the openDialog API also supports.

This is currently a blocker for CodeMirror users that want to enforce
Trusted Types in their web application.
---
 addon/tern/tern.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addon/tern/tern.js b/addon/tern/tern.js
index b2509e0d65..8a4d67db09 100644
--- a/addon/tern/tern.js
+++ b/addon/tern/tern.js
@@ -589,10 +589,16 @@
   }
 
   function dialog(cm, text, f) {
-    if (cm.openDialog)
-      cm.openDialog(text + ": <input type=text>", f);
-    else
+    if (cm.openDialog) {
+      var fragment = document.createDocumentFragment();
+      fragment.appendChild(document.createTextNode(text + ": "));
+      var input = document.createElement("input");
+      input.type = "text";
+      fragment.appendChild(input);
+      cm.openDialog(fragment, f);
+    } else {
       f(prompt(text, ""));
+    }
   }
 
   // Tooltips

From 4ccf2bddfe5bb911208a3fc51255070eee2f9574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <suprdewd@gmail.com>
Date: Sat, 9 Jul 2022 12:54:38 +0200
Subject: [PATCH 4646/4742] [runmode addon] Use textContent instead of
 innerHTML to clear elements

In general, assigning a plain string to the innerHTML property of an
element can cause XSS vulnerabilities, and is thus considered as a
violation by the Trusted Types web platform security mechanism. This
commit addresses two such violations in CodeMirror by replacing them
with semantically equivalent assignments to the textContent property.
This is currently a blocker for CodeMirror users that want to enforce
Trusted Types in their web application.
---
 addon/runmode/colorize.js | 2 +-
 addon/runmode/runmode.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addon/runmode/colorize.js b/addon/runmode/colorize.js
index 5f76b367af..ead1c5884a 100644
--- a/addon/runmode/colorize.js
+++ b/addon/runmode/colorize.js
@@ -31,7 +31,7 @@
 
       var text = [];
       textContent(node, text);
-      node.innerHTML = "";
+      node.textContent = "";
       CodeMirror.runMode(text.join(""), mode, node);
 
       node.className += " cm-s-default";
diff --git a/addon/runmode/runmode.js b/addon/runmode/runmode.js
index 612e896fd7..e1525b66f6 100644
--- a/addon/runmode/runmode.js
+++ b/addon/runmode/runmode.js
@@ -20,7 +20,7 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
     var ie = /MSIE \d/.test(navigator.userAgent);
     var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
     var node = callback, col = 0;
-    node.innerHTML = "";
+    node.textContent = "";
     callback = function(text, style) {
       if (text == "\n") {
         // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.

From d77d0b864d92209e0de52bdd613dcbc57cae9da7 Mon Sep 17 00:00:00 2001
From: Boris Verkhovskiy <boris.verk@gmail.com>
Date: Tue, 12 Jul 2022 15:56:57 -0700
Subject: [PATCH 4647/4742] [sql mode] Document other support values of sql
 modes

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

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 65d8fc254c..999daf7f0c 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -43,7 +43,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
       || (ch == "0" && stream.match(/^b[01]+/)))) {
       // bitstring
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/bit-field-literals.html
+      // ref: https://dev.mysql.com/doc/refman/8.0/en/bit-value-literals.html
       return "number";
     } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
       // numbers
@@ -489,7 +489,11 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
     * ODBCdotTable: .tableName
     * zerolessFloat: .1
-    * doubleQuote
+    * decimallessFloat: 1.
+    * hexNumber: X'01AF' X'01af' x'01AF' x'01af' 0x01AF 0x01af
+    * binaryNumber: b'01' B'01' 0b01
+    * doubleQuote: "string"
+    * escapeConstant: E''
     * nCharCast: N'string'
     * charsetCast: _utf8'string'
     * commentHash: use # char for comments

From 482b7a45547175cabaa9fa68b31244625215a82a Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Wed, 13 Jul 2022 00:58:06 +0200
Subject: [PATCH 4648/4742] [nsis mode] add Target command

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 7098b80634..b84ecc2167 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -31,13 +31,13 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /^\s*(?:\!(else|endif|macroend))\b/i, token: "keyword", dedent: true},
 
     // Runtime Commands
-    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetKnownFolderPath|GetLabelAddress|GetTempFileName|GetWinVer|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfRtlLanguage|IfShellVarContextAll|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/i, token: "keyword"},
+    {regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetKnownFolderPath|GetLabelAddress|GetTempFileName|GetWinVer|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfRtlLanguage|IfShellVarContextAll|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Target|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/i, token: "keyword"},
     {regex: /^\s*(?:Function|PageEx|Section(?:Group)?)\b/i, token: "keyword", indent: true},
     {regex: /^\s*(?:(Function|PageEx|Section(?:Group)?)End)\b/i, token: "keyword", dedent: true},
 
     // Command Options
     {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR(32|64)?|HKCU(32|64)?|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM(32|64)?|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/i, token: "atom"},
-    {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/i, token: "builtin"},
+    {regex: /\b(?:admin|all|amd64-unicode|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|x-86-(ansi|unicode)|zlib)\b/i, token: "builtin"},
 
     // LogicLib.nsh
     {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/i, token: "variable-2", indent: true},

From c401c299ce13cd99d8b6798a9bb21b443dec4493 Mon Sep 17 00:00:00 2001
From: Boris Verkhovskiy <boris.verk@gmail.com>
Date: Wed, 13 Jul 2022 10:53:39 -0700
Subject: [PATCH 4649/4742] [sql mode] Support empty number literals

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

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 999daf7f0c..13024a23b6 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -35,19 +35,19 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
     if (support.hexNumber &&
       ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/))
-      || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/))) {
+      || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]*'/))) {
       // hex
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/hexadecimal-literals.html
+      // ref: https://dev.mysql.com/doc/refman/8.0/en/hexadecimal-literals.html
       return "number";
     } else if (support.binaryNumber &&
-      (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
+      (((ch == "b" || ch == "B") && stream.match(/^'[01]*'/))
       || (ch == "0" && stream.match(/^b[01]+/)))) {
       // bitstring
       // ref: https://dev.mysql.com/doc/refman/8.0/en/bit-value-literals.html
       return "number";
     } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
       // numbers
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
+      // ref: https://dev.mysql.com/doc/refman/8.0/en/number-literals.html
       stream.match(/^[0-9]*(\.[0-9]+)?([eE][-+]?[0-9]+)?/);
       support.decimallessFloat && stream.match(/^\.(?!\.)/);
       return "number";
@@ -56,14 +56,14 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       return "variable-3";
     } else if (ch == "'" || (ch == '"' && support.doubleQuote)) {
       // strings
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
+      // ref: https://dev.mysql.com/doc/refman/8.0/en/string-literals.html
       state.tokenize = tokenLiteral(ch);
       return state.tokenize(stream, state);
     } else if ((((support.nCharCast && (ch == "n" || ch == "N"))
         || (support.charsetCast && ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
         && (stream.peek() == "'" || stream.peek() == '"'))) {
       // charset casting: _utf8'str', N'str', n'str'
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
+      // ref: https://dev.mysql.com/doc/refman/8.0/en/string-literals.html
       return "keyword";
     } else if (support.escapeConstant && (ch == "e" || ch == "E")
         && (stream.peek() == "'" || (stream.peek() == '"' && support.doubleQuote))) {
@@ -95,7 +95,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       if (stream.match(/^\.+/))
         return null
       // .table_name (ODBC)
-      // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
+      // // ref: https://dev.mysql.com/doc/refman/8.0/en/identifier-qualifiers.html
       if (support.ODBCdotTable && stream.match(/^[\w\d_$#]+/))
         return "variable-2";
     } else if (operatorChars.test(ch)) {
@@ -112,13 +112,13 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     } else if (ch == '{' &&
         (stream.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/) || stream.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/))) {
       // dates (weird ODBC syntax)
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
+      // ref: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-literals.html
       return "number";
     } else {
       stream.eatWhile(/^[_\w\d]/);
       var word = stream.current().toLowerCase();
       // dates (standard SQL syntax)
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
+      // ref: https://dev.mysql.com/doc/refman/8.0/en/date-and-time-literals.html
       if (dateSQL.hasOwnProperty(word) && (stream.match(/^( )+'[^']*'/) || stream.match(/^( )+"[^"]*"/)))
         return "number";
       if (atoms.hasOwnProperty(word)) return "atom";
@@ -214,7 +214,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   // `identifier`
   function hookIdentifier(stream) {
     // MySQL/MariaDB identifiers
-    // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
+    // ref: https://dev.mysql.com/doc/refman/8.0/en/identifier-qualifiers.html
     var ch;
     while ((ch = stream.next()) != null) {
       if (ch == "`" && !stream.eat("`")) return "variable-2";
@@ -241,7 +241,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     // variables
     // @@prefix.varName @varName
     // varName can be quoted with ` or ' or "
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
+    // ref: https://dev.mysql.com/doc/refman/8.0/en/user-variables.html
     if (stream.eat("@")) {
       stream.match('session.');
       stream.match('local.');
@@ -266,12 +266,12 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
   // short client keyword token
   function hookClient(stream) {
     // \N means NULL
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/null-values.html
+    // ref: https://dev.mysql.com/doc/refman/8.0/en/null-values.html
     if (stream.eat("N")) {
         return "atom";
     }
     // \g, etc
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/mysql-commands.html
+    // ref: https://dev.mysql.com/doc/refman/8.0/en/mysql-commands.html
     return stream.match(/^[a-zA-Z.#!?]/) ? "variable-2" : null;
   }
 
@@ -287,7 +287,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
   var defaultBuiltin = "bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"
 
-  // A generic SQL Mode. It's not a standard, it just try to support what is generally supported
+  // A generic SQL Mode. It's not a standard, it just tries to support what is generally supported
   CodeMirror.defineMIME("text/x-sql", {
     name: "sql",
     keywords: set(sqlKeywords + "begin"),

From 638951ee8f037849fd12032cab56db94b096b23e Mon Sep 17 00:00:00 2001
From: Boris Verkhovskiy <boris.verk@gmail.com>
Date: Thu, 14 Jul 2022 01:42:28 -0700
Subject: [PATCH 4650/4742] [sql mode] Trino SQL

---
 mode/sql/index.html |  3 +++
 mode/sql/sql.js     | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/mode/sql/index.html b/mode/sql/index.html
index a7b9c548ed..2b61145bb7 100644
--- a/mode/sql/index.html
+++ b/mode/sql/index.html
@@ -62,6 +62,9 @@ <h2>SQL Mode for CodeMirror</h2>
             <code><a href="?mime=text/x-gql">text/x-gql</a></code>,
             <code><a href="?mime=text/x-gpsql">text/x-gpsql</a></code>.
             <code><a href="?mime=text/x-esper">text/x-esper</a></code>.
+            <code><a href="?mime=text/x-sqlite">text/x-sqlite</a></code>.
+            <code><a href="?mime=text/x-sparksql">text/x-sparksql</a></code>.
+            <code><a href="?mime=text/x-trino">text/x-trino</a></code>.
         </p>
 <script>
 window.onload = function() {
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 13024a23b6..105b22ffb9 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -471,6 +471,26 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     dateSQL: set("time"),
     support: set("decimallessFloat zerolessFloat binaryNumber hexNumber")
   });
+
+  // Trino (formerly known as Presto)
+  CodeMirror.defineMIME("text/x-trino", {
+    name: "sql",
+    // https://github.com/trinodb/trino/blob/bc7a4eeedde28684c7ae6f74cefcaf7c6e782174/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4#L859-L1129
+    // https://github.com/trinodb/trino/blob/bc7a4eeedde28684c7ae6f74cefcaf7c6e782174/docs/src/main/sphinx/functions/list.rst
+    keywords: set("abs absent acos add admin after all all_match alter analyze and any any_match approx_distinct approx_most_frequent approx_percentile approx_set arbitrary array_agg array_distinct array_except array_intersect array_join array_max array_min array_position array_remove array_sort array_union arrays_overlap as asc asin at at_timezone atan atan2 authorization avg bar bernoulli beta_cdf between bing_tile bing_tile_at bing_tile_coordinates bing_tile_polygon bing_tile_quadkey bing_tile_zoom_level bing_tiles_around bit_count bitwise_and bitwise_and_agg bitwise_left_shift bitwise_not bitwise_or bitwise_or_agg bitwise_right_shift bitwise_right_shift_arithmetic bitwise_xor bool_and bool_or both by call cardinality cascade case cast catalogs cbrt ceil ceiling char2hexint checksum chr classify coalesce codepoint column columns combinations comment commit committed concat concat_ws conditional constraint contains contains_sequence convex_hull_agg copartition corr cos cosh cosine_similarity count count_if covar_pop covar_samp crc32 create cross cube cume_dist current current_catalog current_date current_groups current_path current_role current_schema current_time current_timestamp current_timezone current_user data date_add date_diff date_format date_parse date_trunc day day_of_month day_of_week day_of_year deallocate default define definer degrees delete dense_rank deny desc describe descriptor distinct distributed dow doy drop e element_at else empty empty_approx_set encoding end error escape evaluate_classifier_predictions every except excluding execute exists exp explain extract false features fetch filter final first first_value flatten floor following for format format_datetime format_number from from_base from_base32 from_base64 from_base64url from_big_endian_32 from_big_endian_64 from_encoded_polyline from_geojson_geometry from_hex from_ieee754_32 from_ieee754_64 from_iso8601_date from_iso8601_timestamp from_iso8601_timestamp_nanos from_unixtime from_unixtime_nanos from_utf8 full functions geometric_mean geometry_from_hadoop_shape geometry_invalid_reason geometry_nearest_points geometry_to_bing_tiles geometry_union geometry_union_agg grant granted grants graphviz great_circle_distance greatest group grouping groups hamming_distance hash_counts having histogram hmac_md5 hmac_sha1 hmac_sha256 hmac_sha512 hour human_readable_seconds if ignore in including index infinity initial inner input insert intersect intersection_cardinality into inverse_beta_cdf inverse_normal_cdf invoker io is is_finite is_infinite is_json_scalar is_nan isolation jaccard_index join json_array json_array_contains json_array_get json_array_length json_exists json_extract json_extract_scalar json_format json_object json_parse json_query json_size json_value keep key keys kurtosis lag last last_day_of_month last_value lateral lead leading learn_classifier learn_libsvm_classifier learn_libsvm_regressor learn_regressor least left length level levenshtein_distance like limit line_interpolate_point line_interpolate_points line_locate_point listagg ln local localtime localtimestamp log log10 log2 logical lower lpad ltrim luhn_check make_set_digest map_agg map_concat map_entries map_filter map_from_entries map_keys map_union map_values map_zip_with match match_recognize matched matches materialized max max_by md5 measures merge merge_set_digest millisecond min min_by minute mod month multimap_agg multimap_from_entries murmur3 nan natural next nfc nfd nfkc nfkd ngrams no none none_match normal_cdf normalize not now nth_value ntile null nullif nulls numeric_histogram object objectid_timestamp of offset omit on one only option or order ordinality outer output over overflow parse_data_size parse_datetime parse_duration partition partitions passing past path pattern per percent_rank permute pi position pow power preceding prepare privileges properties prune qdigest_agg quarter quotes radians rand random range rank read recursive reduce reduce_agg refresh regexp_count regexp_extract regexp_extract_all regexp_like regexp_position regexp_replace regexp_split regr_intercept regr_slope regress rename render repeat repeatable replace reset respect restrict returning reverse revoke rgb right role roles rollback rollup round row_number rows rpad rtrim running scalar schema schemas second security seek select sequence serializable session set sets sha1 sha256 sha512 show shuffle sign simplify_geometry sin skewness skip slice some soundex spatial_partitioning spatial_partitions split split_part split_to_map split_to_multimap spooky_hash_v2_32 spooky_hash_v2_64 sqrt st_area st_asbinary st_astext st_boundary st_buffer st_centroid st_contains st_convexhull st_coorddim st_crosses st_difference st_dimension st_disjoint st_distance st_endpoint st_envelope st_envelopeaspts st_equals st_exteriorring st_geometries st_geometryfromtext st_geometryn st_geometrytype st_geomfrombinary st_interiorringn st_interiorrings st_intersection st_intersects st_isclosed st_isempty st_isring st_issimple st_isvalid st_length st_linefromtext st_linestring st_multipoint st_numgeometries st_numinteriorring st_numpoints st_overlaps st_point st_pointn st_points st_polygon st_relate st_startpoint st_symdifference st_touches st_union st_within st_x st_xmax st_xmin st_y st_ymax st_ymin start starts_with stats stddev stddev_pop stddev_samp string strpos subset substr substring sum system table tables tablesample tan tanh tdigest_agg text then ties timestamp_objectid timezone_hour timezone_minute to to_base to_base32 to_base64 to_base64url to_big_endian_32 to_big_endian_64 to_char to_date to_encoded_polyline to_geojson_geometry to_geometry to_hex to_ieee754_32 to_ieee754_64 to_iso8601 to_milliseconds to_spherical_geography to_timestamp to_unixtime to_utf8 trailing transaction transform transform_keys transform_values translate trim trim_array true truncate try try_cast type typeof uescape unbounded uncommitted unconditional union unique unknown unmatched unnest update upper url_decode url_encode url_extract_fragment url_extract_host url_extract_parameter url_extract_path url_extract_port url_extract_protocol url_extract_query use user using utf16 utf32 utf8 validate value value_at_quantile values values_at_quantiles var_pop var_samp variance verbose version view week week_of_year when where width_bucket wilson_interval_lower wilson_interval_upper window with with_timezone within without word_stem work wrapper write xxhash64 year year_of_week yow zip zip_with"),
+    // https://github.com/trinodb/trino/blob/bc7a4eeedde28684c7ae6f74cefcaf7c6e782174/core/trino-main/src/main/java/io/trino/metadata/TypeRegistry.java#L131-L168
+    // https://github.com/trinodb/trino/blob/bc7a4eeedde28684c7ae6f74cefcaf7c6e782174/plugin/trino-ml/src/main/java/io/trino/plugin/ml/MLPlugin.java#L35
+    // https://github.com/trinodb/trino/blob/bc7a4eeedde28684c7ae6f74cefcaf7c6e782174/plugin/trino-mongodb/src/main/java/io/trino/plugin/mongodb/MongoPlugin.java#L32
+    // https://github.com/trinodb/trino/blob/bc7a4eeedde28684c7ae6f74cefcaf7c6e782174/plugin/trino-geospatial/src/main/java/io/trino/plugin/geospatial/GeoPlugin.java#L37
+    builtin: set("array bigint bingtile boolean char codepoints color date decimal double function geometry hyperloglog int integer interval ipaddress joniregexp json json2016 jsonpath kdbtree likepattern map model objectid p4hyperloglog precision qdigest re2jregexp real regressor row setdigest smallint sphericalgeography tdigest time timestamp tinyint uuid varbinary varchar zone"),
+    atoms: set("false true null unknown"),
+    // https://trino.io/docs/current/functions/list.html#id1
+    operatorChars: /^[[\]|<>=!\-+*/%]/,
+    dateSQL: set("date time timestamp zone"),
+    // hexNumber is necessary for VARBINARY literals, e.g. X'65683F'
+    // but it also enables 0xFF hex numbers, which Trino doesn't support.
+    support: set("ODBCdotTable decimallessFloat zerolessFloat hexNumber")
+  });
 });
 
 /*

From c651c21fb62ec0bdd70927fb8062f7a2da21d7b1 Mon Sep 17 00:00:00 2001
From: Harutyun Amirjanyan <amirjanyan@gmail.com>
Date: Tue, 19 Jul 2022 11:47:45 +0400
Subject: [PATCH 4651/4742] [vim bindings] Use code from codemirror-vim

---
 .github/workflows/ci.yml |    2 +-
 keymap/vim.js            | 5890 --------------------------------------
 package.json             |    4 +-
 rollup.config.js         |   12 +-
 test/index.html          |    1 -
 test/vim_test.js         | 5283 ----------------------------------
 6 files changed, 15 insertions(+), 11177 deletions(-)
 delete mode 100644 keymap/vim.js
 delete mode 100644 test/vim_test.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 77d1cf5a3d..82d6354155 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 name: main
-on: [push]
+on: [push, pull_request]
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
diff --git a/keymap/vim.js b/keymap/vim.js
deleted file mode 100644
index 0b1208cd2d..0000000000
--- a/keymap/vim.js
+++ /dev/null
@@ -1,5890 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/5/LICENSE
-
-/**
- * Supported keybindings:
- *   Too many to list. Refer to defaultKeymap below.
- *
- * Supported Ex commands:
- *   Refer to defaultExCommandMap below.
- *
- * Registers: unnamed, -, ., :, /, _, a-z, A-Z, 0-9
- *   (Does not respect the special case for number registers when delete
- *    operator is made with these commands: %, (, ),  , /, ?, n, N, {, } )
- *   TODO: Implement the remaining registers.
- *
- * Marks: a-z, A-Z, and 0-9
- *   TODO: Implement the remaining special marks. They have more complex
- *       behavior.
- *
- * Events:
- *  'vim-mode-change' - raised on the editor anytime the current mode changes,
- *                      Event object: {mode: "visual", subMode: "linewise"}
- *
- * Code structure:
- *  1. Default keymap
- *  2. Variable declarations and short basic helpers
- *  3. Instance (External API) implementation
- *  4. Internal state tracking objects (input state, counter) implementation
- *     and instantiation
- *  5. Key handler (the main command dispatcher) implementation
- *  6. Motion, operator, and action implementations
- *  7. Helper functions for the key handler, motions, operators, and actions
- *  8. Set up Vim to work as a keymap for CodeMirror.
- *  9. Ex command implementations.
- */
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/edit/matchbrackets.js"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/edit/matchbrackets"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  'use strict';
-
-  var Pos = CodeMirror.Pos;
-
-  function transformCursor(cm, range) {
-    var vim = cm.state.vim;
-    if (!vim || vim.insertMode) return range.head;
-    var head = vim.sel.head;
-    if (!head)  return range.head;
-
-    if (vim.visualBlock) {
-      if (range.head.line != head.line) {
-        return;
-      }
-    }
-    if (range.from() == range.anchor && !range.empty()) {
-      if (range.head.line == head.line && range.head.ch != head.ch)
-        return new Pos(range.head.line, range.head.ch - 1);
-    }
-
-    return range.head;
-  }
-
-  var defaultKeymap = [
-    // Key to key mapping. This goes first to make it possible to override
-    // existing mappings.
-    { keys: '<Left>', type: 'keyToKey', toKeys: 'h' },
-    { keys: '<Right>', type: 'keyToKey', toKeys: 'l' },
-    { keys: '<Up>', type: 'keyToKey', toKeys: 'k' },
-    { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
-    { keys: 'g<Up>', type: 'keyToKey', toKeys: 'gk' },
-    { keys: 'g<Down>', type: 'keyToKey', toKeys: 'gj' },
-    { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
-    { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'},
-    { keys: '<Del>', type: 'keyToKey', toKeys: 'x', context: 'normal'},
-    { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
-    { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B', context: 'normal' },
-    { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
-    { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b', context: 'normal' },
-    { keys: '<C-n>', type: 'keyToKey', toKeys: 'j' },
-    { keys: '<C-p>', type: 'keyToKey', toKeys: 'k' },
-    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>' },
-    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>' },
-    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
-    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
-    { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
-    { keys: 's', type: 'keyToKey', toKeys: 'c', context: 'visual'},
-    { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
-    { keys: 'S', type: 'keyToKey', toKeys: 'VdO', context: 'visual' },
-    { keys: '<Home>', type: 'keyToKey', toKeys: '0' },
-    { keys: '<End>', type: 'keyToKey', toKeys: '$' },
-    { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
-    { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
-    { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
-    { keys: '<Ins>', type: 'keyToKey', toKeys: 'i', context: 'normal'},
-    { keys: '<Ins>', type: 'action', action: 'toggleOverwrite', context: 'insert' },
-    // Motions
-    { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
-    { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
-    { keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }},
-    { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }},
-    { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }},
-    { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }},
-    { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }},
-    { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }},
-    { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }},
-    { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }},
-    { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }},
-    { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }},
-    { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }},
-    { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }},
-    { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }},
-    { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }},
-    { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
-    { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
-    { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
-    { keys: '(', type: 'motion', motion: 'moveBySentence', motionArgs: { forward: false }},
-    { keys: ')', type: 'motion', motion: 'moveBySentence', motionArgs: { forward: true }},
-    { keys: '<C-f>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
-    { keys: '<C-b>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
-    { keys: '<C-d>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
-    { keys: '<C-u>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
-    { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
-    {keys: "g$", type: "motion", motion: "moveToEndOfDisplayLine"},
-    {keys: "g^", type: "motion", motion: "moveToStartOfDisplayLine"},
-    {keys: "g0", type: "motion", motion: "moveToStartOfDisplayLine"},
-    { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
-    { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
-    { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }},
-    { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
-    { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }},
-    { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }},
-    { keys: 'f<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }},
-    { keys: 'F<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }},
-    { keys: 't<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }},
-    { keys: 'T<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }},
-    { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }},
-    { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }},
-    { keys: '\'<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}},
-    { keys: '`<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}},
-    { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
-    { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
-    { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
-    { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
-    // the next two aren't motions but must come before more general motion declarations
-    { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}},
-    { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}},
-    { keys: ']<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}},
-    { keys: '[<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}},
-    { keys: '|', type: 'motion', motion: 'moveToColumn'},
-    { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'},
-    { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
-    // Operators
-    { keys: 'd', type: 'operator', operator: 'delete' },
-    { keys: 'y', type: 'operator', operator: 'yank' },
-    { keys: 'c', type: 'operator', operator: 'change' },
-    { keys: '=', type: 'operator', operator: 'indentAuto' },
-    { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
-    { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
-    { keys: 'g~', type: 'operator', operator: 'changeCase' },
-    { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true },
-    { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
-    { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
-    { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
-    { keys: 'gn', type: 'motion', motion: 'findAndSelectNextInclusive', motionArgs: { forward: true }},
-    { keys: 'gN', type: 'motion', motion: 'findAndSelectNextInclusive', motionArgs: { forward: false }},
-    // Operator-Motion dual commands
-    { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
-    { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
-    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
-    { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
-    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'expandToLine', motionArgs: { linewise: true }, context: 'normal'},
-    { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
-    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
-    { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
-    { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
-    { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
-    { keys: '<C-u>', type: 'operatorMotion', operator: 'delete', motion: 'moveToStartOfLine', context: 'insert' },
-    { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
-    //ignore C-w in normal mode
-    { keys: '<C-w>', type: 'idle', context: 'normal' },
-    // Actions
-    { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
-    { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
-    { keys: '<C-e>', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
-    { keys: '<C-y>', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
-    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' },
-    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
-    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
-    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
-    { keys: 'gi', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'lastEdit' }, context: 'normal' },
-    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
-    { keys: 'gI', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'bol'}, context: 'normal' },
-    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
-    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
-    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
-    { keys: 'v', type: 'action', action: 'toggleVisualMode' },
-    { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
-    { keys: '<C-v>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
-    { keys: '<C-q>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
-    { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
-    { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
-    { keys: 'gJ', type: 'action', action: 'joinLines', actionArgs: { keepSpaces: true }, isEdit: true },
-    { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
-    { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
-    { keys: 'r<character>', type: 'action', action: 'replace', isEdit: true },
-    { keys: '@<character>', type: 'action', action: 'replayMacro' },
-    { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' },
-    // Handle Replace-mode as a special case of insert mode.
-    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }, context: 'normal'},
-    { keys: 'R', type: 'operator', operator: 'change', operatorArgs: { linewise: true, fullLine: true }, context: 'visual', exitVisualBlock: true},
-    { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
-    { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
-    { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
-    { keys: '<C-r>', type: 'action', action: 'redo' },
-    { keys: 'm<character>', type: 'action', action: 'setMark' },
-    { keys: '"<character>', type: 'action', action: 'setRegister' },
-    { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }},
-    { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
-    { keys: 'z<CR>', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
-    { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: '.', type: 'action', action: 'repeatLastEdit' },
-    { keys: '<C-a>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
-    { keys: '<C-x>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
-    { keys: '<C-t>', type: 'action', action: 'indent', actionArgs: { indentRight: true }, context: 'insert' },
-    { keys: '<C-d>', type: 'action', action: 'indent', actionArgs: { indentRight: false }, context: 'insert' },
-    // Text object motions
-    { keys: 'a<character>', type: 'motion', motion: 'textObjectManipulation' },
-    { keys: 'i<character>', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
-    // Search
-    { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
-    { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
-    { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
-    { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
-    // Ex command
-    { keys: ':', type: 'ex' }
-  ];
-  var defaultKeymapLength = defaultKeymap.length;
-
-  /**
-   * Ex commands
-   * Care must be taken when adding to the default Ex command map. For any
-   * 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' },
-    { name: 'vmap', shortName: 'vm' },
-    { name: 'unmap' },
-    { name: 'write', shortName: 'w' },
-    { name: 'undo', shortName: 'u' },
-    { name: 'redo', shortName: 'red' },
-    { 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' },
-    { name: 'yank', shortName: 'y' },
-    { name: 'delmarks', shortName: 'delm' },
-    { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
-    { name: 'vglobal', shortName: 'v' },
-    { name: 'global', shortName: 'g' }
-  ];
-
-  var Vim = function() {
-    function enterVimMode(cm) {
-      cm.setOption('disableInput', true);
-      cm.setOption('showCursorWhenSelecting', false);
-      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-      cm.on('cursorActivity', onCursorActivity);
-      maybeInitVimState(cm);
-      CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
-    }
-
-    function leaveVimMode(cm) {
-      cm.setOption('disableInput', false);
-      cm.off('cursorActivity', onCursorActivity);
-      CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
-      cm.state.vim = null;
-      if (highlightTimeout) clearTimeout(highlightTimeout);
-    }
-
-    function detachVimMap(cm, next) {
-      if (this == CodeMirror.keyMap.vim) {
-        cm.options.$customCursor = null;
-        CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
-      }
-
-      if (!next || next.attach != attachVimMap)
-        leaveVimMode(cm);
-    }
-    function attachVimMap(cm, prev) {
-      if (this == CodeMirror.keyMap.vim) {
-        if (cm.curOp) cm.curOp.selectionChanged = true;
-        cm.options.$customCursor = transformCursor;
-        CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
-      }
-
-      if (!prev || prev.attach != attachVimMap)
-        enterVimMode(cm);
-    }
-
-    // Deprecated, simply setting the keymap works again.
-    CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
-      if (val && cm.getOption("keyMap") != "vim")
-        cm.setOption("keyMap", "vim");
-      else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
-        cm.setOption("keyMap", "default");
-    });
-
-    function cmKey(key, cm) {
-      if (!cm) { return undefined; }
-      if (this[key]) { return this[key]; }
-      var vimKey = cmKeyToVimKey(key);
-      if (!vimKey) {
-        return false;
-      }
-      var cmd = vimApi.findKey(cm, vimKey);
-      if (typeof cmd == 'function') {
-        CodeMirror.signal(cm, 'vim-keypress', vimKey);
-      }
-      return cmd;
-    }
-
-    var modifiers = {Shift:'S',Ctrl:'C',Alt:'A',Cmd:'D',Mod:'A',CapsLock:''};
-    var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del',Insert:'Ins'};
-    function cmKeyToVimKey(key) {
-      if (key.charAt(0) == '\'') {
-        // Keypress character binding of format "'a'"
-        return key.charAt(1);
-      }
-      var pieces = key.split(/-(?!$)/);
-      var lastPiece = pieces[pieces.length - 1];
-      if (pieces.length == 1 && pieces[0].length == 1) {
-        // No-modifier bindings use literal character bindings above. Skip.
-        return false;
-      } else if (pieces.length == 2 && pieces[0] == 'Shift' && lastPiece.length == 1) {
-        // Ignore Shift+char bindings as they should be handled by literal character.
-        return false;
-      }
-      var hasCharacter = false;
-      for (var i = 0; i < pieces.length; i++) {
-        var piece = pieces[i];
-        if (piece in modifiers) { pieces[i] = modifiers[piece]; }
-        else { hasCharacter = true; }
-        if (piece in specialKeys) { pieces[i] = specialKeys[piece]; }
-      }
-      if (!hasCharacter) {
-        // Vim does not support modifier only keys.
-        return false;
-      }
-      // TODO: Current bindings expect the character to be lower case, but
-      // it looks like vim key notation uses upper case.
-      if (isUpperCase(lastPiece)) {
-        pieces[pieces.length - 1] = lastPiece.toLowerCase();
-      }
-      return '<' + pieces.join('-') + '>';
-    }
-
-    function getOnPasteFn(cm) {
-      var vim = cm.state.vim;
-      if (!vim.onPasteFn) {
-        vim.onPasteFn = function() {
-          if (!vim.insertMode) {
-            cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
-            actions.enterInsertMode(cm, {}, vim);
-          }
-        };
-      }
-      return vim.onPasteFn;
-    }
-
-    var numberRegex = /[\d]/;
-    var wordCharTest = [CodeMirror.isWordChar, function(ch) {
-      return ch && !CodeMirror.isWordChar(ch) && !/\s/.test(ch);
-    }], bigWordCharTest = [function(ch) {
-      return /\S/.test(ch);
-    }];
-    function makeKeyRange(start, size) {
-      var keys = [];
-      for (var i = start; i < start + size; i++) {
-        keys.push(String.fromCharCode(i));
-      }
-      return keys;
-    }
-    var upperCaseAlphabet = makeKeyRange(65, 26);
-    var lowerCaseAlphabet = makeKeyRange(97, 26);
-    var numbers = makeKeyRange(48, 10);
-    var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
-    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '_', '/']);
-    var upperCaseChars;
-    try { upperCaseChars = new RegExp("^[\\p{Lu}]$", "u"); }
-    catch (_) { upperCaseChars = /^[A-Z]$/; }
-
-    function isLine(cm, line) {
-      return line >= cm.firstLine() && line <= cm.lastLine();
-    }
-    function isLowerCase(k) {
-      return (/^[a-z]$/).test(k);
-    }
-    function isMatchableSymbol(k) {
-      return '()[]{}'.indexOf(k) != -1;
-    }
-    function isNumber(k) {
-      return numberRegex.test(k);
-    }
-    function isUpperCase(k) {
-      return upperCaseChars.test(k);
-    }
-    function isWhiteSpaceString(k) {
-      return (/^\s*$/).test(k);
-    }
-    function isEndOfSentenceSymbol(k) {
-      return '.?!'.indexOf(k) != -1;
-    }
-    function inArray(val, arr) {
-      for (var i = 0; i < arr.length; i++) {
-        if (arr[i] == val) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    var options = {};
-    function defineOption(name, defaultValue, type, aliases, callback) {
-      if (defaultValue === undefined && !callback) {
-        throw Error('defaultValue is required unless callback is provided');
-      }
-      if (!type) { type = 'string'; }
-      options[name] = {
-        type: type,
-        defaultValue: defaultValue,
-        callback: callback
-      };
-      if (aliases) {
-        for (var i = 0; i < aliases.length; i++) {
-          options[aliases[i]] = options[name];
-        }
-      }
-      if (defaultValue) {
-        setOption(name, defaultValue);
-      }
-    }
-
-    function setOption(name, value, cm, cfg) {
-      var option = options[name];
-      cfg = cfg || {};
-      var scope = cfg.scope;
-      if (!option) {
-        return new Error('Unknown option: ' + name);
-      }
-      if (option.type == 'boolean') {
-        if (value && value !== true) {
-          return new Error('Invalid argument: ' + name + '=' + value);
-        } else if (value !== false) {
-          // Boolean options are set to true if value is not defined.
-          value = true;
-        }
-      }
-      if (option.callback) {
-        if (scope !== 'local') {
-          option.callback(value, undefined);
-        }
-        if (scope !== 'global' && cm) {
-          option.callback(value, cm);
-        }
-      } else {
-        if (scope !== 'local') {
-          option.value = option.type == 'boolean' ? !!value : value;
-        }
-        if (scope !== 'global' && cm) {
-          cm.state.vim.options[name] = {value: value};
-        }
-      }
-    }
-
-    function getOption(name, cm, cfg) {
-      var option = options[name];
-      cfg = cfg || {};
-      var scope = cfg.scope;
-      if (!option) {
-        return new Error('Unknown option: ' + name);
-      }
-      if (option.callback) {
-        var local = cm && option.callback(undefined, cm);
-        if (scope !== 'global' && local !== undefined) {
-          return local;
-        }
-        if (scope !== 'local') {
-          return option.callback();
-        }
-        return;
-      } else {
-        var local = (scope !== 'global') && (cm && cm.state.vim.options[name]);
-        return (local || (scope !== 'local') && option || {}).value;
-      }
-    }
-
-    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.getOption('mode');
-        return mode == 'null' ? '' : mode;
-      } else {
-        var mode = name == '' ? 'null' : name;
-        cm.setOption('mode', mode);
-      }
-    });
-
-    var createCircularJumpList = function() {
-      var size = 100;
-      var pointer = -1;
-      var head = 0;
-      var tail = 0;
-      var buffer = new Array(size);
-      function add(cm, oldCur, newCur) {
-        var current = pointer % size;
-        var curMark = buffer[current];
-        function useNextSlot(cursor) {
-          var next = ++pointer % size;
-          var trashMark = buffer[next];
-          if (trashMark) {
-            trashMark.clear();
-          }
-          buffer[next] = cm.setBookmark(cursor);
-        }
-        if (curMark) {
-          var markPos = curMark.find();
-          // avoid recording redundant cursor position
-          if (markPos && !cursorEqual(markPos, oldCur)) {
-            useNextSlot(oldCur);
-          }
-        } else {
-          useNextSlot(oldCur);
-        }
-        useNextSlot(newCur);
-        head = pointer;
-        tail = pointer - size + 1;
-        if (tail < 0) {
-          tail = 0;
-        }
-      }
-      function move(cm, offset) {
-        pointer += offset;
-        if (pointer > head) {
-          pointer = head;
-        } else if (pointer < tail) {
-          pointer = tail;
-        }
-        var mark = buffer[(size + pointer) % size];
-        // skip marks that are temporarily removed from text buffer
-        if (mark && !mark.find()) {
-          var inc = offset > 0 ? 1 : -1;
-          var newCur;
-          var oldCur = cm.getCursor();
-          do {
-            pointer += inc;
-            mark = buffer[(size + pointer) % size];
-            // skip marks that are the same as current position
-            if (mark &&
-                (newCur = mark.find()) &&
-                !cursorEqual(oldCur, newCur)) {
-              break;
-            }
-          } while (pointer < head && pointer > tail);
-        }
-        return mark;
-      }
-      function find(cm, offset) {
-        var oldPointer = pointer;
-        var mark = move(cm, offset);
-        pointer = oldPointer;
-        return mark && mark.find();
-      }
-      return {
-        cachedCursor: undefined, //used for # and * jumps
-        add: add,
-        find: find,
-        move: move
-      };
-    };
-
-    // Returns an object to track the changes associated insert mode.  It
-    // clones the object that is passed in, or creates an empty object one if
-    // none is provided.
-    var createInsertModeChanges = function(c) {
-      if (c) {
-        // Copy construction
-        return {
-          changes: c.changes,
-          expectCursorActivityForChange: c.expectCursorActivityForChange
-        };
-      }
-      return {
-        // Change list
-        changes: [],
-        // Set to true on change, false on cursorActivity.
-        expectCursorActivityForChange: false
-      };
-    };
-
-    function MacroModeState() {
-      this.latestRegister = undefined;
-      this.isPlaying = false;
-      this.isRecording = false;
-      this.replaySearchQueries = [];
-      this.onRecordingDone = undefined;
-      this.lastInsertModeChanges = createInsertModeChanges();
-    }
-    MacroModeState.prototype = {
-      exitMacroRecordMode: function() {
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.onRecordingDone) {
-          macroModeState.onRecordingDone(); // close dialog
-        }
-        macroModeState.onRecordingDone = undefined;
-        macroModeState.isRecording = false;
-      },
-      enterMacroRecordMode: function(cm, registerName) {
-        var register =
-            vimGlobalState.registerController.getRegister(registerName);
-        if (register) {
-          register.clear();
-          this.latestRegister = registerName;
-          if (cm.openDialog) {
-            this.onRecordingDone = cm.openDialog(
-                document.createTextNode('(recording)['+registerName+']'), null, {bottom:true});
-          }
-          this.isRecording = true;
-        }
-      }
-    };
-
-    function maybeInitVimState(cm) {
-      if (!cm.state.vim) {
-        // Store instance state in the CodeMirror object.
-        cm.state.vim = {
-          inputState: new InputState(),
-          // Vim's input state that triggered the last edit, used to repeat
-          // motions and operators with '.'.
-          lastEditInputState: undefined,
-          // Vim's action command before the last edit, used to repeat actions
-          // with '.' and insert mode repeat.
-          lastEditActionCommand: undefined,
-          // When using jk for navigation, if you move from a longer line to a
-          // shorter line, the cursor may clip to the end of the shorter line.
-          // If j is pressed again and cursor goes to the next line, the
-          // cursor should go back to its horizontal position on the longer
-          // line if it can. This is to keep track of the horizontal position.
-          lastHPos: -1,
-          // Doing the same with screen-position for gj/gk
-          lastHSPos: -1,
-          // The last motion command run. Cleared if a non-motion command gets
-          // executed in between.
-          lastMotion: null,
-          marks: {},
-          insertMode: false,
-          // Repeat count for changes made in insert mode, triggered by key
-          // sequences like 3,i. Only exists when insertMode is true.
-          insertModeRepeat: undefined,
-          visualMode: false,
-          // If we are in visual line mode. No effect if visualMode is false.
-          visualLine: false,
-          visualBlock: false,
-          lastSelection: null,
-          lastPastedText: null,
-          sel: {},
-          // Buffer-local/window-local values of vim options.
-          options: {}
-        };
-      }
-      return cm.state.vim;
-    }
-    var vimGlobalState;
-    function resetVimGlobalState() {
-      vimGlobalState = {
-        // The current search query.
-        searchQuery: null,
-        // Whether we are searching backwards.
-        searchIsReversed: false,
-        // Replace part of the last substituted pattern
-        lastSubstituteReplacePart: undefined,
-        jumpList: createCircularJumpList(),
-        macroModeState: new MacroModeState,
-        // Recording latest f, t, F or T motion command.
-        lastCharacterSearch: {increment:0, forward:true, selectedCharacter:''},
-        registerController: new RegisterController({}),
-        // search history buffer
-        searchHistoryController: new HistoryController(),
-        // ex Command history buffer
-        exCommandHistoryController : new HistoryController()
-      };
-      for (var optionName in options) {
-        var option = options[optionName];
-        option.value = option.defaultValue;
-      }
-    }
-
-    var lastInsertModeKeyTimer;
-    var vimApi= {
-      buildKeyMap: function() {
-        // TODO: Convert keymap into dictionary format for fast lookup.
-      },
-      // Testing hook, though it might be useful to expose the register
-      // controller anyway.
-      getRegisterController: function() {
-        return vimGlobalState.registerController;
-      },
-      // Testing hook.
-      resetVimGlobalState_: resetVimGlobalState,
-
-      // Testing hook.
-      getVimGlobalState_: function() {
-        return vimGlobalState;
-      },
-
-      // Testing hook.
-      maybeInitVimState_: maybeInitVimState,
-
-      suppressErrorLogging: false,
-
-      InsertModeKey: InsertModeKey,
-      map: function(lhs, rhs, ctx) {
-        // Add user defined key bindings.
-        exCommandDispatcher.map(lhs, rhs, ctx);
-      },
-      unmap: function(lhs, ctx) {
-        return exCommandDispatcher.unmap(lhs, ctx);
-      },
-      // Non-recursive map function.
-      // NOTE: This will not create mappings to key maps that aren't present
-      // in the default key map. See TODO at bottom of function.
-      noremap: function(lhs, rhs, ctx) {
-        function toCtxArray(ctx) {
-          return ctx ? [ctx] : ['normal', 'insert', 'visual'];
-        }
-        var ctxsToMap = toCtxArray(ctx);
-        // Look through all actual defaults to find a map candidate.
-        var actualLength = defaultKeymap.length, origLength = defaultKeymapLength;
-        for (var i = actualLength - origLength;
-             i < actualLength && ctxsToMap.length;
-             i++) {
-          var mapping = defaultKeymap[i];
-          // Omit mappings that operate in the wrong context(s) and those of invalid type.
-          if (mapping.keys == rhs &&
-              (!ctx || !mapping.context || mapping.context === ctx) &&
-              mapping.type.substr(0, 2) !== 'ex' &&
-              mapping.type.substr(0, 3) !== 'key') {
-            // Make a shallow copy of the original keymap entry.
-            var newMapping = {};
-            for (var key in mapping) {
-              newMapping[key] = mapping[key];
-            }
-            // Modify it point to the new mapping with the proper context.
-            newMapping.keys = lhs;
-            if (ctx && !newMapping.context) {
-              newMapping.context = ctx;
-            }
-            // Add it to the keymap with a higher priority than the original.
-            this._mapCommand(newMapping);
-            // Record the mapped contexts as complete.
-            var mappedCtxs = toCtxArray(mapping.context);
-            ctxsToMap = ctxsToMap.filter(function(el) { return mappedCtxs.indexOf(el) === -1; });
-          }
-        }
-        // TODO: Create non-recursive keyToKey mappings for the unmapped contexts once those exist.
-      },
-      // Remove all user-defined mappings for the provided context.
-      mapclear: function(ctx) {
-        // Partition the existing keymap into user-defined and true defaults.
-        var actualLength = defaultKeymap.length,
-            origLength = defaultKeymapLength;
-        var userKeymap = defaultKeymap.slice(0, actualLength - origLength);
-        defaultKeymap = defaultKeymap.slice(actualLength - origLength);
-        if (ctx) {
-          // If a specific context is being cleared, we need to keep mappings
-          // from all other contexts.
-          for (var i = userKeymap.length - 1; i >= 0; i--) {
-            var mapping = userKeymap[i];
-            if (ctx !== mapping.context) {
-              if (mapping.context) {
-                this._mapCommand(mapping);
-              } else {
-                // `mapping` applies to all contexts so create keymap copies
-                // for each context except the one being cleared.
-                var contexts = ['normal', 'insert', 'visual'];
-                for (var j in contexts) {
-                  if (contexts[j] !== ctx) {
-                    var newMapping = {};
-                    for (var key in mapping) {
-                      newMapping[key] = mapping[key];
-                    }
-                    newMapping.context = contexts[j];
-                    this._mapCommand(newMapping);
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      // 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,
-      defineEx: function(name, prefix, func){
-        if (!prefix) {
-          prefix = name;
-        } else if (name.indexOf(prefix) !== 0) {
-          throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
-        }
-        exCommands[name]=func;
-        exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
-      },
-      handleKey: function (cm, key, origin) {
-        var command = this.findKey(cm, key, origin);
-        if (typeof command === 'function') {
-          return command();
-        }
-      },
-      /**
-       * This is the outermost function called by CodeMirror, after keys have
-       * been mapped to their Vim equivalents.
-       *
-       * Finds a command based on the key (and cached keys if there is a
-       * multi-key sequence). Returns `undefined` if no key is matched, a noop
-       * function if a partial match is found (multi-key), and a function to
-       * execute the bound command if a a key is matched. The function always
-       * returns true.
-       */
-      findKey: function(cm, key, origin) {
-        var vim = maybeInitVimState(cm);
-        function handleMacroRecording() {
-          var macroModeState = vimGlobalState.macroModeState;
-          if (macroModeState.isRecording) {
-            if (key == 'q') {
-              macroModeState.exitMacroRecordMode();
-              clearInputState(cm);
-              return true;
-            }
-            if (origin != 'mapping') {
-              logKey(macroModeState, key);
-            }
-          }
-        }
-        function handleEsc() {
-          if (key == '<Esc>') {
-            if (vim.visualMode) {
-              // Get back to normal mode.
-              exitVisualMode(cm);
-            } else if (vim.insertMode) {
-              // Get back to normal mode.
-              exitInsertMode(cm);
-            } else {
-              // We're already in normal mode. Let '<Esc>' be handled normally.
-              return;
-            }
-            clearInputState(cm);
-            return true;
-          }
-        }
-        function doKeyToKey(keys) {
-          // TODO: prevent infinite recursion.
-          var match;
-          while (keys) {
-            // Pull off one command key, which is either a single character
-            // or a special sequence wrapped in '<' and '>', e.g. '<Space>'.
-            match = (/<\w+-.+?>|<\w+>|./).exec(keys);
-            key = match[0];
-            keys = keys.substring(match.index + key.length);
-            vimApi.handleKey(cm, key, 'mapping');
-          }
-        }
-
-        function handleKeyInsertMode() {
-          if (handleEsc()) { return true; }
-          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
-          var keysAreChars = key.length == 1;
-          var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
-          // Need to check all key substrings in insert mode.
-          while (keys.length > 1 && match.type != 'full') {
-            var keys = vim.inputState.keyBuffer = keys.slice(1);
-            var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
-            if (thisMatch.type != 'none') { match = thisMatch; }
-          }
-          if (match.type == 'none') { clearInputState(cm); return false; }
-          else if (match.type == 'partial') {
-            if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
-            lastInsertModeKeyTimer = window.setTimeout(
-              function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } },
-              getOption('insertModeEscKeysTimeout'));
-            return !keysAreChars;
-          }
-
-          if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
-          if (keysAreChars) {
-            var selections = cm.listSelections();
-            for (var i = 0; i < selections.length; i++) {
-              var here = selections[i].head;
-              cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
-            }
-            vimGlobalState.macroModeState.lastInsertModeChanges.changes.pop();
-          }
-          clearInputState(cm);
-          return match.command;
-        }
-
-        function handleKeyNonInsertMode() {
-          if (handleMacroRecording() || handleEsc()) { return true; }
-
-          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
-          if (/^[1-9]\d*$/.test(keys)) { return true; }
-
-          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
-          if (!keysMatcher) { clearInputState(cm); return false; }
-          var context = vim.visualMode ? 'visual' :
-                                         'normal';
-          var mainKey = keysMatcher[2] || keysMatcher[1];
-          if (vim.inputState.operatorShortcut && vim.inputState.operatorShortcut.slice(-1) == mainKey) {
-            // multikey operators act linewise by repeating only the last character
-            mainKey = vim.inputState.operatorShortcut;
-          }
-          var match = commandDispatcher.matchCommand(mainKey, defaultKeymap, vim.inputState, context);
-          if (match.type == 'none') { clearInputState(cm); return false; }
-          else if (match.type == 'partial') { return true; }
-
-          vim.inputState.keyBuffer = '';
-          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
-          if (keysMatcher[1] && keysMatcher[1] != '0') {
-            vim.inputState.pushRepeatDigit(keysMatcher[1]);
-          }
-          return match.command;
-        }
-
-        var command;
-        if (vim.insertMode) { command = handleKeyInsertMode(); }
-        else { command = handleKeyNonInsertMode(); }
-        if (command === false) {
-          return !vim.insertMode && key.length === 1 ? function() { return true; } : undefined;
-        } else if (command === true) {
-          // TODO: Look into using CodeMirror's multi-key handling.
-          // Return no-op since we are caching the key. Counts as handled, but
-          // don't want act on it just yet.
-          return function() { return true; };
-        } else {
-          return function() {
-            return cm.operation(function() {
-              cm.curOp.isVimOp = true;
-              try {
-                if (command.type == 'keyToKey') {
-                  doKeyToKey(command.toKeys);
-                } else {
-                  commandDispatcher.processCommand(cm, vim, command);
-                }
-              } catch (e) {
-                // clear VIM state in case it's in a bad state.
-                cm.state.vim = undefined;
-                maybeInitVimState(cm);
-                if (!vimApi.suppressErrorLogging) {
-                  console['log'](e);
-                }
-                throw e;
-              }
-              return true;
-            });
-          };
-        }
-      },
-      handleEx: function(cm, input) {
-        exCommandDispatcher.processCommand(cm, input);
-      },
-
-      defineMotion: defineMotion,
-      defineAction: defineAction,
-      defineOperator: defineOperator,
-      mapCommand: mapCommand,
-      _mapCommand: _mapCommand,
-
-      defineRegister: defineRegister,
-
-      exitVisualMode: exitVisualMode,
-      exitInsertMode: exitInsertMode
-    };
-
-    // Represents the current input state.
-    function InputState() {
-      this.prefixRepeat = [];
-      this.motionRepeat = [];
-
-      this.operator = null;
-      this.operatorArgs = null;
-      this.motion = null;
-      this.motionArgs = null;
-      this.keyBuffer = []; // For matching multi-key commands.
-      this.registerName = null; // Defaults to the unnamed register.
-    }
-    InputState.prototype.pushRepeatDigit = function(n) {
-      if (!this.operator) {
-        this.prefixRepeat = this.prefixRepeat.concat(n);
-      } else {
-        this.motionRepeat = this.motionRepeat.concat(n);
-      }
-    };
-    InputState.prototype.getRepeat = function() {
-      var repeat = 0;
-      if (this.prefixRepeat.length > 0 || this.motionRepeat.length > 0) {
-        repeat = 1;
-        if (this.prefixRepeat.length > 0) {
-          repeat *= parseInt(this.prefixRepeat.join(''), 10);
-        }
-        if (this.motionRepeat.length > 0) {
-          repeat *= parseInt(this.motionRepeat.join(''), 10);
-        }
-      }
-      return repeat;
-    };
-
-    function clearInputState(cm, reason) {
-      cm.state.vim.inputState = new InputState();
-      CodeMirror.signal(cm, 'vim-command-done', reason);
-    }
-
-    /*
-     * Register stores information about copy and paste registers.  Besides
-     * text, a register must store whether it is linewise (i.e., when it is
-     * pasted, should it insert itself into a new line, or should the text be
-     * inserted at the cursor position.)
-     */
-    function Register(text, linewise, blockwise) {
-      this.clear();
-      this.keyBuffer = [text || ''];
-      this.insertModeChanges = [];
-      this.searchQueries = [];
-      this.linewise = !!linewise;
-      this.blockwise = !!blockwise;
-    }
-    Register.prototype = {
-      setText: function(text, linewise, blockwise) {
-        this.keyBuffer = [text || ''];
-        this.linewise = !!linewise;
-        this.blockwise = !!blockwise;
-      },
-      pushText: function(text, linewise) {
-        // if this register has ever been set to linewise, use linewise.
-        if (linewise) {
-          if (!this.linewise) {
-            this.keyBuffer.push('\n');
-          }
-          this.linewise = true;
-        }
-        this.keyBuffer.push(text);
-      },
-      pushInsertModeChanges: function(changes) {
-        this.insertModeChanges.push(createInsertModeChanges(changes));
-      },
-      pushSearchQuery: function(query) {
-        this.searchQueries.push(query);
-      },
-      clear: function() {
-        this.keyBuffer = [];
-        this.insertModeChanges = [];
-        this.searchQueries = [];
-        this.linewise = false;
-      },
-      toString: function() {
-        return this.keyBuffer.join('');
-      }
-    };
-
-    /**
-     * Defines an external register.
-     *
-     * The name should be a single character that will be used to reference the register.
-     * The register should support setText, pushText, clear, and toString(). See Register
-     * for a reference implementation.
-     */
-    function defineRegister(name, register) {
-      var registers = vimGlobalState.registerController.registers;
-      if (!name || name.length != 1) {
-        throw Error('Register name must be 1 character');
-      }
-      if (registers[name]) {
-        throw Error('Register already defined ' + name);
-      }
-      registers[name] = register;
-      validRegisters.push(name);
-    }
-
-    /*
-     * vim registers allow you to keep many independent copy and paste buffers.
-     * See http://usevim.com/2012/04/13/registers/ for an introduction.
-     *
-     * RegisterController keeps the state of all the registers.  An initial
-     * state may be passed in.  The unnamed register '"' will always be
-     * overridden.
-     */
-    function RegisterController(registers) {
-      this.registers = registers;
-      this.unnamedRegister = registers['"'] = new Register();
-      registers['.'] = new Register();
-      registers[':'] = new Register();
-      registers['/'] = new Register();
-    }
-    RegisterController.prototype = {
-      pushText: function(registerName, operator, text, linewise, blockwise) {
-        // The black hole register, "_, means delete/yank to nowhere.
-        if (registerName === '_') return;
-        if (linewise && text.charAt(text.length - 1) !== '\n'){
-          text += '\n';
-        }
-        // Lowercase and uppercase registers refer to the same register.
-        // Uppercase just means append.
-        var register = this.isValidRegister(registerName) ?
-            this.getRegister(registerName) : null;
-        // if no register/an invalid register was specified, things go to the
-        // default registers
-        if (!register) {
-          switch (operator) {
-            case 'yank':
-              // The 0 register contains the text from the most recent yank.
-              this.registers['0'] = new Register(text, linewise, blockwise);
-              break;
-            case 'delete':
-            case 'change':
-              if (text.indexOf('\n') == -1) {
-                // Delete less than 1 line. Update the small delete register.
-                this.registers['-'] = new Register(text, linewise);
-              } else {
-                // Shift down the contents of the numbered registers and put the
-                // deleted text into register 1.
-                this.shiftNumericRegisters_();
-                this.registers['1'] = new Register(text, linewise);
-              }
-              break;
-          }
-          // Make sure the unnamed register is set to what just happened
-          this.unnamedRegister.setText(text, linewise, blockwise);
-          return;
-        }
-
-        // If we've gotten to this point, we've actually specified a register
-        var append = isUpperCase(registerName);
-        if (append) {
-          register.pushText(text, linewise);
-        } else {
-          register.setText(text, linewise, blockwise);
-        }
-        // The unnamed register always has the same value as the last used
-        // register.
-        this.unnamedRegister.setText(register.toString(), linewise);
-      },
-      // Gets the register named @name.  If one of @name doesn't already exist,
-      // create it.  If @name is invalid, return the unnamedRegister.
-      getRegister: function(name) {
-        if (!this.isValidRegister(name)) {
-          return this.unnamedRegister;
-        }
-        name = name.toLowerCase();
-        if (!this.registers[name]) {
-          this.registers[name] = new Register();
-        }
-        return this.registers[name];
-      },
-      isValidRegister: function(name) {
-        return name && inArray(name, validRegisters);
-      },
-      shiftNumericRegisters_: function() {
-        for (var i = 9; i >= 2; i--) {
-          this.registers[i] = this.getRegister('' + (i - 1));
-        }
-      }
-    };
-    function HistoryController() {
-        this.historyBuffer = [];
-        this.iterator = 0;
-        this.initialPrefix = null;
-    }
-    HistoryController.prototype = {
-      // the input argument here acts a user entered prefix for a small time
-      // until we start autocompletion in which case it is the autocompleted.
-      nextMatch: function (input, up) {
-        var historyBuffer = this.historyBuffer;
-        var dir = up ? -1 : 1;
-        if (this.initialPrefix === null) this.initialPrefix = input;
-        for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) {
-          var element = historyBuffer[i];
-          for (var j = 0; j <= element.length; j++) {
-            if (this.initialPrefix == element.substring(0, j)) {
-              this.iterator = i;
-              return element;
-            }
-          }
-        }
-        // should return the user input in case we reach the end of buffer.
-        if (i >= historyBuffer.length) {
-          this.iterator = historyBuffer.length;
-          return this.initialPrefix;
-        }
-        // return the last autocompleted query or exCommand as it is.
-        if (i < 0 ) return input;
-      },
-      pushInput: function(input) {
-        var index = this.historyBuffer.indexOf(input);
-        if (index > -1) this.historyBuffer.splice(index, 1);
-        if (input.length) this.historyBuffer.push(input);
-      },
-      reset: function() {
-        this.initialPrefix = null;
-        this.iterator = this.historyBuffer.length;
-      }
-    };
-    var commandDispatcher = {
-      matchCommand: function(keys, keyMap, inputState, context) {
-        var matches = commandMatches(keys, keyMap, context, inputState);
-        if (!matches.full && !matches.partial) {
-          return {type: 'none'};
-        } else if (!matches.full && matches.partial) {
-          return {type: 'partial'};
-        }
-
-        var bestMatch;
-        for (var i = 0; i < matches.full.length; i++) {
-          var match = matches.full[i];
-          if (!bestMatch) {
-            bestMatch = match;
-          }
-        }
-        if (bestMatch.keys.slice(-11) == '<character>') {
-          var character = lastChar(keys);
-          if (!character) return {type: 'none'};
-          inputState.selectedCharacter = character;
-        }
-        return {type: 'full', command: bestMatch};
-      },
-      processCommand: function(cm, vim, command) {
-        vim.inputState.repeatOverride = command.repeatOverride;
-        switch (command.type) {
-          case 'motion':
-            this.processMotion(cm, vim, command);
-            break;
-          case 'operator':
-            this.processOperator(cm, vim, command);
-            break;
-          case 'operatorMotion':
-            this.processOperatorMotion(cm, vim, command);
-            break;
-          case 'action':
-            this.processAction(cm, vim, command);
-            break;
-          case 'search':
-            this.processSearch(cm, vim, command);
-            break;
-          case 'ex':
-          case 'keyToEx':
-            this.processEx(cm, vim, command);
-            break;
-          default:
-            break;
-        }
-      },
-      processMotion: function(cm, vim, command) {
-        vim.inputState.motion = command.motion;
-        vim.inputState.motionArgs = copyArgs(command.motionArgs);
-        this.evalInput(cm, vim);
-      },
-      processOperator: function(cm, vim, command) {
-        var inputState = vim.inputState;
-        if (inputState.operator) {
-          if (inputState.operator == command.operator) {
-            // Typing an operator twice like 'dd' makes the operator operate
-            // linewise
-            inputState.motion = 'expandToLine';
-            inputState.motionArgs = { linewise: true };
-            this.evalInput(cm, vim);
-            return;
-          } else {
-            // 2 different operators in a row doesn't make sense.
-            clearInputState(cm);
-          }
-        }
-        inputState.operator = command.operator;
-        inputState.operatorArgs = copyArgs(command.operatorArgs);
-        if (command.keys.length > 1) {
-          inputState.operatorShortcut = command.keys;
-        }
-        if (command.exitVisualBlock) {
-            vim.visualBlock = false;
-            updateCmSelection(cm);
-        }
-        if (vim.visualMode) {
-          // Operating on a selection in visual mode. We don't need a motion.
-          this.evalInput(cm, vim);
-        }
-      },
-      processOperatorMotion: function(cm, vim, command) {
-        var visualMode = vim.visualMode;
-        var operatorMotionArgs = copyArgs(command.operatorMotionArgs);
-        if (operatorMotionArgs) {
-          // Operator motions may have special behavior in visual mode.
-          if (visualMode && operatorMotionArgs.visualLine) {
-            vim.visualLine = true;
-          }
-        }
-        this.processOperator(cm, vim, command);
-        if (!visualMode) {
-          this.processMotion(cm, vim, command);
-        }
-      },
-      processAction: function(cm, vim, command) {
-        var inputState = vim.inputState;
-        var repeat = inputState.getRepeat();
-        var repeatIsExplicit = !!repeat;
-        var actionArgs = copyArgs(command.actionArgs) || {};
-        if (inputState.selectedCharacter) {
-          actionArgs.selectedCharacter = inputState.selectedCharacter;
-        }
-        // Actions may or may not have motions and operators. Do these first.
-        if (command.operator) {
-          this.processOperator(cm, vim, command);
-        }
-        if (command.motion) {
-          this.processMotion(cm, vim, command);
-        }
-        if (command.motion || command.operator) {
-          this.evalInput(cm, vim);
-        }
-        actionArgs.repeat = repeat || 1;
-        actionArgs.repeatIsExplicit = repeatIsExplicit;
-        actionArgs.registerName = inputState.registerName;
-        clearInputState(cm);
-        vim.lastMotion = null;
-        if (command.isEdit) {
-          this.recordLastEdit(vim, inputState, command);
-        }
-        actions[command.action](cm, actionArgs, vim);
-      },
-      processSearch: function(cm, vim, command) {
-        if (!cm.getSearchCursor) {
-          // Search depends on SearchCursor.
-          return;
-        }
-        var forward = command.searchArgs.forward;
-        var wholeWordOnly = command.searchArgs.wholeWordOnly;
-        getSearchState(cm).setReversed(!forward);
-        var promptPrefix = (forward) ? '/' : '?';
-        var originalQuery = getSearchState(cm).getQuery();
-        var originalScrollPos = cm.getScrollInfo();
-        function handleQuery(query, ignoreCase, smartCase) {
-          vimGlobalState.searchHistoryController.pushInput(query);
-          vimGlobalState.searchHistoryController.reset();
-          try {
-            updateSearchQuery(cm, query, ignoreCase, smartCase);
-          } catch (e) {
-            showConfirm(cm, 'Invalid regex: ' + query);
-            clearInputState(cm);
-            return;
-          }
-          commandDispatcher.processMotion(cm, vim, {
-            type: 'motion',
-            motion: 'findNext',
-            motionArgs: { forward: true, toJumplist: command.searchArgs.toJumplist }
-          });
-        }
-        function onPromptClose(query) {
-          cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-          handleQuery(query, true /** ignoreCase */, true /** smartCase */);
-          var macroModeState = vimGlobalState.macroModeState;
-          if (macroModeState.isRecording) {
-            logSearchQuery(macroModeState, query);
-          }
-        }
-        function onPromptKeyUp(e, query, close) {
-          var keyName = CodeMirror.keyName(e), up, offset;
-          if (keyName == 'Up' || keyName == 'Down') {
-            up = keyName == 'Up' ? true : false;
-            offset = e.target ? e.target.selectionEnd : 0;
-            query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
-            close(query);
-            if (offset && e.target) e.target.selectionEnd = e.target.selectionStart = Math.min(offset, e.target.value.length);
-          } else {
-            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
-              vimGlobalState.searchHistoryController.reset();
-          }
-          var parsedQuery;
-          try {
-            parsedQuery = updateSearchQuery(cm, query,
-                true /** ignoreCase */, true /** smartCase */);
-          } catch (e) {
-            // Swallow bad regexes for incremental search.
-          }
-          if (parsedQuery) {
-            cm.scrollIntoView(findNext(cm, !forward, parsedQuery), 30);
-          } else {
-            clearSearchHighlight(cm);
-            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-          }
-        }
-        function onPromptKeyDown(e, query, close) {
-          var keyName = CodeMirror.keyName(e);
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
-              (keyName == 'Backspace' && query == '')) {
-            vimGlobalState.searchHistoryController.pushInput(query);
-            vimGlobalState.searchHistoryController.reset();
-            updateSearchQuery(cm, originalQuery);
-            clearSearchHighlight(cm);
-            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-            CodeMirror.e_stop(e);
-            clearInputState(cm);
-            close();
-            cm.focus();
-          } else if (keyName == 'Up' || keyName == 'Down') {
-            CodeMirror.e_stop(e);
-          } else if (keyName == 'Ctrl-U') {
-            // Ctrl-U clears input.
-            CodeMirror.e_stop(e);
-            close('');
-          }
-        }
-        switch (command.searchArgs.querySrc) {
-          case 'prompt':
-            var macroModeState = vimGlobalState.macroModeState;
-            if (macroModeState.isPlaying) {
-              var query = macroModeState.replaySearchQueries.shift();
-              handleQuery(query, true /** ignoreCase */, false /** smartCase */);
-            } else {
-              showPrompt(cm, {
-                  onClose: onPromptClose,
-                  prefix: promptPrefix,
-                  desc: '(JavaScript regexp)',
-                  onKeyUp: onPromptKeyUp,
-                  onKeyDown: onPromptKeyDown
-              });
-            }
-            break;
-          case 'wordUnderCursor':
-            var word = expandWordUnderCursor(cm, false /** inclusive */,
-                true /** forward */, false /** bigWord */,
-                true /** noSymbol */);
-            var isKeyword = true;
-            if (!word) {
-              word = expandWordUnderCursor(cm, false /** inclusive */,
-                  true /** forward */, false /** bigWord */,
-                  false /** noSymbol */);
-              isKeyword = false;
-            }
-            if (!word) {
-              return;
-            }
-            var query = cm.getLine(word.start.line).substring(word.start.ch,
-                word.end.ch);
-            if (isKeyword && wholeWordOnly) {
-                query = '\\b' + query + '\\b';
-            } else {
-              query = escapeRegex(query);
-            }
-
-            // cachedCursor is used to save the old position of the cursor
-            // when * or # causes vim to seek for the nearest word and shift
-            // the cursor before entering the motion.
-            vimGlobalState.jumpList.cachedCursor = cm.getCursor();
-            cm.setCursor(word.start);
-
-            handleQuery(query, true /** ignoreCase */, false /** smartCase */);
-            break;
-        }
-      },
-      processEx: function(cm, vim, command) {
-        function onPromptClose(input) {
-          // Give the prompt some time to close so that if processCommand shows
-          // an error, the elements don't overlap.
-          vimGlobalState.exCommandHistoryController.pushInput(input);
-          vimGlobalState.exCommandHistoryController.reset();
-          exCommandDispatcher.processCommand(cm, input);
-        }
-        function onPromptKeyDown(e, input, close) {
-          var keyName = CodeMirror.keyName(e), up, offset;
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
-              (keyName == 'Backspace' && input == '')) {
-            vimGlobalState.exCommandHistoryController.pushInput(input);
-            vimGlobalState.exCommandHistoryController.reset();
-            CodeMirror.e_stop(e);
-            clearInputState(cm);
-            close();
-            cm.focus();
-          }
-          if (keyName == 'Up' || keyName == 'Down') {
-            CodeMirror.e_stop(e);
-            up = keyName == 'Up' ? true : false;
-            offset = e.target ? e.target.selectionEnd : 0;
-            input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
-            close(input);
-            if (offset && e.target) e.target.selectionEnd = e.target.selectionStart = Math.min(offset, e.target.value.length);
-          } 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();
-          }
-        }
-        if (command.type == 'keyToEx') {
-          // Handle user defined Ex to Ex mappings
-          exCommandDispatcher.processCommand(cm, command.exArgs.input);
-        } else {
-          if (vim.visualMode) {
-            showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>',
-                onKeyDown: onPromptKeyDown, selectValueOnOpen: false});
-          } else {
-            showPrompt(cm, { onClose: onPromptClose, prefix: ':',
-                onKeyDown: onPromptKeyDown});
-          }
-        }
-      },
-      evalInput: function(cm, vim) {
-        // If the motion command is set, execute both the operator and motion.
-        // Otherwise return.
-        var inputState = vim.inputState;
-        var motion = inputState.motion;
-        var motionArgs = inputState.motionArgs || {};
-        var operator = inputState.operator;
-        var operatorArgs = inputState.operatorArgs || {};
-        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 ? 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;
-        var repeat;
-        if (operator) {
-          this.recordLastEdit(vim, inputState);
-        }
-        if (inputState.repeatOverride !== undefined) {
-          // If repeatOverride is specified, that takes precedence over the
-          // input state's repeat. Used by Ex mode and can be user defined.
-          repeat = inputState.repeatOverride;
-        } else {
-          repeat = inputState.getRepeat();
-        }
-        if (repeat > 0 && motionArgs.explicitRepeat) {
-          motionArgs.repeatIsExplicit = true;
-        } else if (motionArgs.noRepeat ||
-            (!motionArgs.explicitRepeat && repeat === 0)) {
-          repeat = 1;
-          motionArgs.repeatIsExplicit = false;
-        }
-        if (inputState.selectedCharacter) {
-          // If there is a character input, stick it in all of the arg arrays.
-          motionArgs.selectedCharacter = operatorArgs.selectedCharacter =
-              inputState.selectedCharacter;
-        }
-        motionArgs.repeat = repeat;
-        clearInputState(cm);
-        if (motion) {
-          var motionResult = motions[motion](cm, origHead, motionArgs, vim, inputState);
-          vim.lastMotion = motions[motion];
-          if (!motionResult) {
-            return;
-          }
-          if (motionArgs.toJumplist) {
-            var jumpList = vimGlobalState.jumpList;
-            // if the current motion is # or *, use cachedCursor
-            var cachedCursor = jumpList.cachedCursor;
-            if (cachedCursor) {
-              recordJumpPosition(cm, cachedCursor, motionResult);
-              delete jumpList.cachedCursor;
-            } else {
-              recordJumpPosition(cm, origHead, motionResult);
-            }
-          }
-          if (motionResult instanceof Array) {
-            newAnchor = motionResult[0];
-            newHead = motionResult[1];
-          } else {
-            newHead = motionResult;
-          }
-          // TODO: Handle null returns from motion commands better.
-          if (!newHead) {
-            newHead = copyCursor(origHead);
-          }
-          if (vim.visualMode) {
-            if (!(vim.visualBlock && newHead.ch === Infinity)) {
-              newHead = clipCursorToContent(cm, newHead);
-            }
-            if (newAnchor) {
-              newAnchor = clipCursorToContent(cm, newAnchor);
-            }
-            newAnchor = newAnchor || oldAnchor;
-            sel.anchor = newAnchor;
-            sel.head = newHead;
-            updateCmSelection(cm);
-            updateMark(cm, vim, '<',
-                cursorIsBefore(newAnchor, newHead) ? newAnchor
-                    : newHead);
-            updateMark(cm, vim, '>',
-                cursorIsBefore(newAnchor, newHead) ? newHead
-                    : newAnchor);
-          } else if (!operator) {
-            newHead = clipCursorToContent(cm, newHead);
-            cm.setCursor(newHead.line, newHead.ch);
-          }
-        }
-        if (operator) {
-          if (operatorArgs.lastSel) {
-            // Replaying a visual mode operation
-            newAnchor = oldAnchor;
-            var lastSel = operatorArgs.lastSel;
-            var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
-            var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
-            if (lastSel.visualLine) {
-              // Linewise Visual mode: The same number of lines.
-              newHead = new Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
-            } else if (lastSel.visualBlock) {
-              // Blockwise Visual mode: The same number of lines and columns.
-              newHead = new Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
-            } else if (lastSel.head.line == lastSel.anchor.line) {
-              // Normal Visual mode within one line: The same number of characters.
-              newHead = new Pos(oldAnchor.line, oldAnchor.ch + chOffset);
-            } else {
-              // Normal Visual mode with several lines: The same number of lines, in the
-              // last line the same number of characters as in the last line the last time.
-              newHead = new Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
-            }
-            vim.visualMode = true;
-            vim.visualLine = lastSel.visualLine;
-            vim.visualBlock = lastSel.visualBlock;
-            sel = vim.sel = {
-              anchor: newAnchor,
-              head: newHead
-            };
-            updateCmSelection(cm);
-          } else if (vim.visualMode) {
-            operatorArgs.lastSel = {
-              anchor: copyCursor(sel.anchor),
-              head: copyCursor(sel.head),
-              visualBlock: vim.visualBlock,
-              visualLine: vim.visualLine
-            };
-          }
-          var curStart, curEnd, linewise, mode;
-          var cmSel;
-          if (vim.visualMode) {
-            // Init visual op
-            curStart = cursorMin(sel.head, sel.anchor);
-            curEnd = cursorMax(sel.head, sel.anchor);
-            linewise = vim.visualLine || operatorArgs.linewise;
-            mode = vim.visualBlock ? 'block' :
-                   linewise ? 'line' :
-                   'char';
-            cmSel = makeCmSelection(cm, {
-              anchor: curStart,
-              head: curEnd
-            }, mode);
-            if (linewise) {
-              var ranges = cmSel.ranges;
-              if (mode == 'block') {
-                // Linewise operators in visual block mode extend to end of line
-                for (var i = 0; i < ranges.length; i++) {
-                  ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
-                }
-              } else if (mode == 'line') {
-                ranges[0].head = new Pos(ranges[0].head.line + 1, 0);
-              }
-            }
-          } else {
-            // Init motion op
-            curStart = copyCursor(newAnchor || oldAnchor);
-            curEnd = copyCursor(newHead || oldHead);
-            if (cursorIsBefore(curEnd, curStart)) {
-              var tmp = curStart;
-              curStart = curEnd;
-              curEnd = tmp;
-            }
-            linewise = motionArgs.linewise || operatorArgs.linewise;
-            if (linewise) {
-              // Expand selection to entire line.
-              expandSelectionToLine(cm, curStart, curEnd);
-            } else if (motionArgs.forward) {
-              // Clip to trailing newlines only if the motion goes forward.
-              clipToLine(cm, curStart, curEnd);
-            }
-            mode = 'char';
-            var exclusive = !motionArgs.inclusive || linewise;
-            cmSel = makeCmSelection(cm, {
-              anchor: curStart,
-              head: curEnd
-            }, mode, exclusive);
-          }
-          cm.setSelections(cmSel.ranges, cmSel.primary);
-          vim.lastMotion = null;
-          operatorArgs.repeat = repeat; // For indent in visual mode.
-          operatorArgs.registerName = registerName;
-          // Keep track of linewise as it affects how paste and change behave.
-          operatorArgs.linewise = linewise;
-          var operatorMoveTo = operators[operator](
-            cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
-          if (vim.visualMode) {
-            exitVisualMode(cm, operatorMoveTo != null);
-          }
-          if (operatorMoveTo) {
-            cm.setCursor(operatorMoveTo);
-          }
-        }
-      },
-      recordLastEdit: function(vim, inputState, actionCommand) {
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.isPlaying) { return; }
-        vim.lastEditInputState = inputState;
-        vim.lastEditActionCommand = actionCommand;
-        macroModeState.lastInsertModeChanges.changes = [];
-        macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
-        macroModeState.lastInsertModeChanges.visualBlock = vim.visualBlock ? vim.sel.head.line - vim.sel.anchor.line : 0;
-      }
-    };
-
-    /**
-     * typedef {Object{line:number,ch:number}} Cursor An object containing the
-     *     position of the cursor.
-     */
-    // All of the functions below return Cursor objects.
-    var motions = {
-      moveToTopLine: function(cm, _head, motionArgs) {
-        var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
-        return new Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
-      },
-      moveToMiddleLine: function(cm) {
-        var range = getUserVisibleLines(cm);
-        var line = Math.floor((range.top + range.bottom) * 0.5);
-        return new Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
-      },
-      moveToBottomLine: function(cm, _head, motionArgs) {
-        var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
-        return new Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
-      },
-      expandToLine: function(_cm, head, motionArgs) {
-        // Expands forward to end of line, and then to next line if repeat is
-        // >1. Does not handle backward motion!
-        var cur = head;
-        return new Pos(cur.line + motionArgs.repeat - 1, Infinity);
-      },
-      findNext: function(cm, _head, motionArgs) {
-        var state = getSearchState(cm);
-        var query = state.getQuery();
-        if (!query) {
-          return;
-        }
-        var prev = !motionArgs.forward;
-        // If search is initiated with ? instead of /, negate direction.
-        prev = (state.isReversed()) ? !prev : prev;
-        highlightSearchMatches(cm, query);
-        return findNext(cm, prev/** prev */, query, motionArgs.repeat);
-      },
-      /**
-       * Find and select the next occurrence of the search query. If the cursor is currently
-       * within a match, then find and select the current match. Otherwise, find the next occurrence in the
-       * appropriate direction.
-       *
-       * This differs from `findNext` in the following ways:
-       *
-       * 1. Instead of only returning the "from", this returns a "from", "to" range.
-       * 2. If the cursor is currently inside a search match, this selects the current match
-       *    instead of the next match.
-       * 3. If there is no associated operator, this will turn on visual mode.
-       */
-      findAndSelectNextInclusive: function(cm, _head, motionArgs, vim, prevInputState) {
-        var state = getSearchState(cm);
-        var query = state.getQuery();
-
-        if (!query) {
-          return;
-        }
-
-        var prev = !motionArgs.forward;
-        prev = (state.isReversed()) ? !prev : prev;
-
-        // next: [from, to] | null
-        var next = findNextFromAndToInclusive(cm, prev, query, motionArgs.repeat, vim);
-
-        // No matches.
-        if (!next) {
-          return;
-        }
-
-        // If there's an operator that will be executed, return the selection.
-        if (prevInputState.operator) {
-          return next;
-        }
-
-        // At this point, we know that there is no accompanying operator -- let's
-        // deal with visual mode in order to select an appropriate match.
-
-        var from = next[0];
-        // For whatever reason, when we use the "to" as returned by searchcursor.js directly,
-        // the resulting selection is extended by 1 char. Let's shrink it so that only the
-        // match is selected.
-        var to = new Pos(next[1].line, next[1].ch - 1);
-
-        if (vim.visualMode) {
-          // If we were in visualLine or visualBlock mode, get out of it.
-          if (vim.visualLine || vim.visualBlock) {
-            vim.visualLine = false;
-            vim.visualBlock = false;
-            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: ""});
-          }
-
-          // If we're currently in visual mode, we should extend the selection to include
-          // the search result.
-          var anchor = vim.sel.anchor;
-          if (anchor) {
-            if (state.isReversed()) {
-              if (motionArgs.forward) {
-                return [anchor, from];
-              }
-
-              return [anchor, to];
-            } else {
-              if (motionArgs.forward) {
-                return [anchor, to];
-              }
-
-              return [anchor, from];
-            }
-          }
-        } else {
-          // Let's turn visual mode on.
-          vim.visualMode = true;
-          vim.visualLine = false;
-          vim.visualBlock = false;
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: ""});
-        }
-
-        return prev ? [to, from] : [from, to];
-      },
-      goToMark: function(cm, _head, motionArgs, vim) {
-        var pos = getMarkPos(cm, vim, motionArgs.selectedCharacter);
-        if (pos) {
-          return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos;
-        }
-        return null;
-      },
-      moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) {
-        if (vim.visualBlock && motionArgs.sameLine) {
-          var sel = vim.sel;
-          return [
-            clipCursorToContent(cm, new Pos(sel.anchor.line, sel.head.ch)),
-            clipCursorToContent(cm, new Pos(sel.head.line, sel.anchor.ch))
-          ];
-        } else {
-          return ([vim.sel.head, vim.sel.anchor]);
-        }
-      },
-      jumpToMark: function(cm, head, motionArgs, vim) {
-        var best = head;
-        for (var i = 0; i < motionArgs.repeat; i++) {
-          var cursor = best;
-          for (var key in vim.marks) {
-            if (!isLowerCase(key)) {
-              continue;
-            }
-            var mark = vim.marks[key].find();
-            var isWrongDirection = (motionArgs.forward) ?
-              cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark);
-
-            if (isWrongDirection) {
-              continue;
-            }
-            if (motionArgs.linewise && (mark.line == cursor.line)) {
-              continue;
-            }
-
-            var equal = cursorEqual(cursor, best);
-            var between = (motionArgs.forward) ?
-              cursorIsBetween(cursor, mark, best) :
-              cursorIsBetween(best, mark, cursor);
-
-            if (equal || between) {
-              best = mark;
-            }
-          }
-        }
-
-        if (motionArgs.linewise) {
-          // Vim places the cursor on the first non-whitespace character of
-          // the line if there is one, else it places the cursor at the end
-          // of the line, regardless of whether a mark was found.
-          best = new Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
-        }
-        return best;
-      },
-      moveByCharacters: function(_cm, head, motionArgs) {
-        var cur = head;
-        var repeat = motionArgs.repeat;
-        var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
-        return new Pos(cur.line, ch);
-      },
-      moveByLines: function(cm, head, motionArgs, vim) {
-        var cur = head;
-        var endCh = cur.ch;
-        // Depending what our last motion was, we may want to do different
-        // things. If our last motion was moving vertically, we want to
-        // preserve the HPos from our last horizontal move.  If our last motion
-        // was going to the end of a line, moving vertically we should go to
-        // the end of the line, etc.
-        switch (vim.lastMotion) {
-          case this.moveByLines:
-          case this.moveByDisplayLines:
-          case this.moveByScroll:
-          case this.moveToColumn:
-          case this.moveToEol:
-            endCh = vim.lastHPos;
-            break;
-          default:
-            vim.lastHPos = endCh;
-        }
-        var repeat = motionArgs.repeat+(motionArgs.repeatOffset||0);
-        var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
-        var first = cm.firstLine();
-        var last = cm.lastLine();
-        var posV = cm.findPosV(cur, (motionArgs.forward ? repeat : -repeat), 'line', vim.lastHSPos);
-        var hasMarkedText = motionArgs.forward ? posV.line > line : posV.line < line;
-        if (hasMarkedText) {
-          line = posV.line;
-          endCh = posV.ch;
-        }
-        // Vim go to line begin or line end when cursor at first/last line and
-        // move to previous/next line is triggered.
-        if (line < first && cur.line == first){
-          return this.moveToStartOfLine(cm, head, motionArgs, vim);
-        } else if (line > last && cur.line == last){
-            return moveToEol(cm, head, motionArgs, vim, true);
-        }
-        if (motionArgs.toFirstChar){
-          endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
-          vim.lastHPos = endCh;
-        }
-        vim.lastHSPos = cm.charCoords(new Pos(line, endCh),'div').left;
-        return new Pos(line, endCh);
-      },
-      moveByDisplayLines: function(cm, head, motionArgs, vim) {
-        var cur = head;
-        switch (vim.lastMotion) {
-          case this.moveByDisplayLines:
-          case this.moveByScroll:
-          case this.moveByLines:
-          case this.moveToColumn:
-          case this.moveToEol:
-            break;
-          default:
-            vim.lastHSPos = cm.charCoords(cur,'div').left;
-        }
-        var repeat = motionArgs.repeat;
-        var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),'line',vim.lastHSPos);
-        if (res.hitSide) {
-          if (motionArgs.forward) {
-            var lastCharCoords = cm.charCoords(res, 'div');
-            var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
-            var res = cm.coordsChar(goalCoords, 'div');
-          } else {
-            var resCoords = cm.charCoords(new Pos(cm.firstLine(), 0), 'div');
-            resCoords.left = vim.lastHSPos;
-            res = cm.coordsChar(resCoords, 'div');
-          }
-        }
-        vim.lastHPos = res.ch;
-        return res;
-      },
-      moveByPage: function(cm, head, motionArgs) {
-        // CodeMirror only exposes functions that move the cursor page down, so
-        // doing this bad hack to move the cursor and move it back. evalInput
-        // will move the cursor to where it should be in the end.
-        var curStart = head;
-        var repeat = motionArgs.repeat;
-        return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
-      },
-      moveByParagraph: function(cm, head, motionArgs) {
-        var dir = motionArgs.forward ? 1 : -1;
-        return findParagraph(cm, head, motionArgs.repeat, dir);
-      },
-      moveBySentence: function(cm, head, motionArgs) {
-        var dir = motionArgs.forward ? 1 : -1;
-        return findSentence(cm, head, motionArgs.repeat, dir);
-      },
-      moveByScroll: function(cm, head, motionArgs, vim) {
-        var scrollbox = cm.getScrollInfo();
-        var curEnd = null;
-        var repeat = motionArgs.repeat;
-        if (!repeat) {
-          repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
-        }
-        var orig = cm.charCoords(head, 'local');
-        motionArgs.repeat = repeat;
-        var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim);
-        if (!curEnd) {
-          return null;
-        }
-        var dest = cm.charCoords(curEnd, 'local');
-        cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
-        return curEnd;
-      },
-      moveByWords: function(cm, head, motionArgs) {
-        return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward,
-            !!motionArgs.wordEnd, !!motionArgs.bigWord);
-      },
-      moveTillCharacter: function(cm, _head, motionArgs) {
-        var repeat = motionArgs.repeat;
-        var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter);
-        var increment = motionArgs.forward ? -1 : 1;
-        recordLastCharacterSearch(increment, motionArgs);
-        if (!curEnd) return null;
-        curEnd.ch += increment;
-        return curEnd;
-      },
-      moveToCharacter: function(cm, head, motionArgs) {
-        var repeat = motionArgs.repeat;
-        recordLastCharacterSearch(0, motionArgs);
-        return moveToCharacter(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || head;
-      },
-      moveToSymbol: function(cm, head, motionArgs) {
-        var repeat = motionArgs.repeat;
-        return findSymbol(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || head;
-      },
-      moveToColumn: function(cm, head, motionArgs, vim) {
-        var repeat = motionArgs.repeat;
-        // repeat is equivalent to which column we want to move to!
-        vim.lastHPos = repeat - 1;
-        vim.lastHSPos = cm.charCoords(head,'div').left;
-        return moveToColumn(cm, repeat);
-      },
-      moveToEol: function(cm, head, motionArgs, vim) {
-        return moveToEol(cm, head, motionArgs, vim, false);
-      },
-      moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
-        // Go to the start of the line where the text begins, or the end for
-        // whitespace-only lines
-        var cursor = head;
-        return new Pos(cursor.line,
-                   findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
-      },
-      moveToMatchedSymbol: function(cm, head) {
-        var cursor = head;
-        var line = cursor.line;
-        var ch = cursor.ch;
-        var lineText = cm.getLine(line);
-        var symbol;
-        for (; ch < lineText.length; ch++) {
-          symbol = lineText.charAt(ch);
-          if (symbol && isMatchableSymbol(symbol)) {
-            var style = cm.getTokenTypeAt(new Pos(line, ch + 1));
-            if (style !== "string" && style !== "comment") {
-              break;
-            }
-          }
-        }
-        if (ch < lineText.length) {
-          // Only include angle brackets in analysis if they are being matched.
-          var re = (ch === '<' || ch === '>') ? /[(){}[\]<>]/ : /[(){}[\]]/;
-          var matched = cm.findMatchingBracket(new Pos(line, ch), {bracketRegex: re});
-          return matched.to;
-        } else {
-          return cursor;
-        }
-      },
-      moveToStartOfLine: function(_cm, head) {
-        return new Pos(head.line, 0);
-      },
-      moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
-        var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
-        if (motionArgs.repeatIsExplicit) {
-          lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
-        }
-        return new Pos(lineNum,
-                   findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
-      },
-      moveToStartOfDisplayLine: function(cm) {
-        cm.execCommand("goLineLeft");
-        return cm.getCursor();
-      },
-      moveToEndOfDisplayLine: function(cm) {
-        cm.execCommand("goLineRight");
-        var head = cm.getCursor();
-        if (head.sticky == "before") head.ch--;
-        return head;
-      },
-      textObjectManipulation: function(cm, head, motionArgs, vim) {
-        // TODO: lots of possible exceptions that can be thrown here. Try da(
-        //     outside of a () block.
-        var mirroredPairs = {'(': ')', ')': '(',
-                             '{': '}', '}': '{',
-                             '[': ']', ']': '[',
-                             '<': '>', '>': '<'};
-        var selfPaired = {'\'': true, '"': true, '`': true};
-
-        var character = motionArgs.selectedCharacter;
-        // 'b' refers to  '()' block.
-        // 'B' refers to  '{}' block.
-        if (character == 'b') {
-          character = '(';
-        } else if (character == 'B') {
-          character = '{';
-        }
-
-        // Inclusive is the difference between a and i
-        // TODO: Instead of using the additional text object map to perform text
-        //     object operations, merge the map into the defaultKeyMap and use
-        //     motionArgs to define behavior. Define separate entries for 'aw',
-        //     'iw', 'a[', 'i[', etc.
-        var inclusive = !motionArgs.textObjectInner;
-
-        var tmp;
-        if (mirroredPairs[character]) {
-          tmp = selectCompanionObject(cm, head, character, inclusive);
-        } else if (selfPaired[character]) {
-          tmp = findBeginningAndEnd(cm, head, character, inclusive);
-        } else if (character === 'W') {
-          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
-                                                     true /** bigWord */);
-        } else if (character === 'w') {
-          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
-                                                     false /** bigWord */);
-        } else if (character === 'p') {
-          tmp = findParagraph(cm, head, motionArgs.repeat, 0, inclusive);
-          motionArgs.linewise = true;
-          if (vim.visualMode) {
-            if (!vim.visualLine) { vim.visualLine = true; }
-          } else {
-            var operatorArgs = vim.inputState.operatorArgs;
-            if (operatorArgs) { operatorArgs.linewise = true; }
-            tmp.end.line--;
-          }
-        } else if (character === 't') {
-          tmp = expandTagUnderCursor(cm, head, inclusive);
-        } else if (character === 's') {
-          // account for cursor on end of sentence symbol
-          var content = cm.getLine(head.line);
-          if (head.ch > 0 && isEndOfSentenceSymbol(content[head.ch])) {
-            head.ch -= 1;
-          }
-          var end = getSentence(cm, head, motionArgs.repeat, 1, inclusive)
-          var start = getSentence(cm, head, motionArgs.repeat, -1, inclusive)
-          // closer vim behaviour, 'a' only takes the space after the sentence if there is one before and after
-          if (isWhiteSpaceString(cm.getLine(start.line)[start.ch])
-              && isWhiteSpaceString(cm.getLine(end.line)[end.ch -1])) {
-            start = {line: start.line, ch: start.ch + 1}
-          }
-          tmp = {start: start, end: end};
-        } else {
-          // No text object defined for this, don't move.
-          return null;
-        }
-
-        if (!cm.state.vim.visualMode) {
-          return [tmp.start, tmp.end];
-        } else {
-          return expandSelection(cm, tmp.start, tmp.end);
-        }
-      },
-
-      repeatLastCharacterSearch: function(cm, head, motionArgs) {
-        var lastSearch = vimGlobalState.lastCharacterSearch;
-        var repeat = motionArgs.repeat;
-        var forward = motionArgs.forward === lastSearch.forward;
-        var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
-        cm.moveH(-increment, 'char');
-        motionArgs.inclusive = forward ? true : false;
-        var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
-        if (!curEnd) {
-          cm.moveH(increment, 'char');
-          return head;
-        }
-        curEnd.ch += increment;
-        return curEnd;
-      }
-    };
-
-    function defineMotion(name, fn) {
-      motions[name] = fn;
-    }
-
-    function fillArray(val, times) {
-      var arr = [];
-      for (var i = 0; i < times; i++) {
-        arr.push(val);
-      }
-      return arr;
-    }
-    /**
-     * An operator acts on a text selection. It receives the list of selections
-     * as input. The corresponding CodeMirror selection is guaranteed to
-    * match the input selection.
-     */
-    var operators = {
-      change: function(cm, args, ranges) {
-        var finalHead, text;
-        var vim = cm.state.vim;
-        var anchor = ranges[0].anchor,
-            head = ranges[0].head;
-        if (!vim.visualMode) {
-          text = cm.getRange(anchor, head);
-          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 && lastState.motionArgs && lastState.motionArgs.forward) {
-              head = offsetCursor(head, 0, - match[0].length);
-              text = text.slice(0, - match[0].length);
-            }
-          }
-          var prevLineEnd = new Pos(anchor.line - 1, Number.MAX_VALUE);
-          var wasLastLine = cm.firstLine() == cm.lastLine();
-          if (head.line > cm.lastLine() && args.linewise && !wasLastLine) {
-            cm.replaceRange('', prevLineEnd, head);
-          } else {
-            cm.replaceRange('', anchor, head);
-          }
-          if (args.linewise) {
-            // Push the next line back down, if there is a next line.
-            if (!wasLastLine) {
-              cm.setCursor(prevLineEnd);
-              CodeMirror.commands.newlineAndIndent(cm);
-            }
-            // make sure cursor ends up at the end of the line.
-            anchor.ch = Number.MAX_VALUE;
-          }
-          finalHead = anchor;
-        } else if (args.fullLine) {
-            head.ch = Number.MAX_VALUE;
-            head.line--;
-            cm.setSelection(anchor, head)
-            text = cm.getSelection();
-            cm.replaceSelection("");
-            finalHead = anchor;
-        } else {
-          text = cm.getSelection();
-          var replacement = fillArray('', ranges.length);
-          cm.replaceSelections(replacement);
-          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
-        }
-        vimGlobalState.registerController.pushText(
-            args.registerName, 'change', text,
-            args.linewise, ranges.length > 1);
-        actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim);
-      },
-      // delete is a javascript keyword.
-      'delete': function(cm, args, ranges) {
-        var finalHead, text;
-        var vim = cm.state.vim;
-        if (!vim.visualBlock) {
-          var anchor = ranges[0].anchor,
-              head = ranges[0].head;
-          if (args.linewise &&
-              head.line != cm.firstLine() &&
-              anchor.line == cm.lastLine() &&
-              anchor.line == head.line - 1) {
-            // Special case for dd on last line (and first line).
-            if (anchor.line == cm.firstLine()) {
-              anchor.ch = 0;
-            } else {
-              anchor = new Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
-            }
-          }
-          text = cm.getRange(anchor, head);
-          cm.replaceRange('', anchor, head);
-          finalHead = anchor;
-          if (args.linewise) {
-            finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor);
-          }
-        } else {
-          text = cm.getSelection();
-          var replacement = fillArray('', ranges.length);
-          cm.replaceSelections(replacement);
-          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
-        }
-        vimGlobalState.registerController.pushText(
-            args.registerName, 'delete', text,
-            args.linewise, vim.visualBlock);
-        return clipCursorToContent(cm, finalHead);
-      },
-      indent: function(cm, args, ranges) {
-        var vim = cm.state.vim;
-        var startLine = ranges[0].anchor.line;
-        var endLine = vim.visualBlock ?
-          ranges[ranges.length - 1].anchor.line :
-          ranges[0].head.line;
-        // In visual mode, n> shifts the selection right n times, instead of
-        // shifting n lines right once.
-        var repeat = (vim.visualMode) ? args.repeat : 1;
-        if (args.linewise) {
-          // The only way to delete a newline is to delete until the start of
-          // the next line, so in linewise mode evalInput will include the next
-          // line. We don't want this in indent, so we go back a line.
-          endLine--;
-        }
-        for (var i = startLine; i <= endLine; i++) {
-          for (var j = 0; j < repeat; j++) {
-            cm.indentLine(i, args.indentRight);
-          }
-        }
-        return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
-      },
-      indentAuto: function(cm, _args, ranges) {
-        cm.execCommand("indentAuto");
-        return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
-      },
-      changeCase: function(cm, args, ranges, oldAnchor, newHead) {
-        var selections = cm.getSelections();
-        var swapped = [];
-        var toLower = args.toLower;
-        for (var j = 0; j < selections.length; j++) {
-          var toSwap = selections[j];
-          var text = '';
-          if (toLower === true) {
-            text = toSwap.toLowerCase();
-          } else if (toLower === false) {
-            text = toSwap.toUpperCase();
-          } else {
-            for (var i = 0; i < toSwap.length; i++) {
-              var character = toSwap.charAt(i);
-              text += isUpperCase(character) ? character.toLowerCase() :
-                  character.toUpperCase();
-            }
-          }
-          swapped.push(text);
-        }
-        cm.replaceSelections(swapped);
-        if (args.shouldMoveCursor){
-          return newHead;
-        } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) {
-          return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor);
-        } else if (args.linewise){
-          return oldAnchor;
-        } else {
-          return cursorMin(ranges[0].anchor, ranges[0].head);
-        }
-      },
-      yank: function(cm, args, ranges, oldAnchor) {
-        var vim = cm.state.vim;
-        var text = cm.getSelection();
-        var endPos = vim.visualMode
-          ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor)
-          : oldAnchor;
-        vimGlobalState.registerController.pushText(
-            args.registerName, 'yank',
-            text, args.linewise, vim.visualBlock);
-        return endPos;
-      }
-    };
-
-    function defineOperator(name, fn) {
-      operators[name] = fn;
-    }
-
-    var actions = {
-      jumpListWalk: function(cm, actionArgs, vim) {
-        if (vim.visualMode) {
-          return;
-        }
-        var repeat = actionArgs.repeat;
-        var forward = actionArgs.forward;
-        var jumpList = vimGlobalState.jumpList;
-
-        var mark = jumpList.move(cm, forward ? repeat : -repeat);
-        var markPos = mark ? mark.find() : undefined;
-        markPos = markPos ? markPos : cm.getCursor();
-        cm.setCursor(markPos);
-      },
-      scroll: function(cm, actionArgs, vim) {
-        if (vim.visualMode) {
-          return;
-        }
-        var repeat = actionArgs.repeat || 1;
-        var lineHeight = cm.defaultTextHeight();
-        var top = cm.getScrollInfo().top;
-        var delta = lineHeight * repeat;
-        var newPos = actionArgs.forward ? top + delta : top - delta;
-        var cursor = copyCursor(cm.getCursor());
-        var cursorCoords = cm.charCoords(cursor, 'local');
-        if (actionArgs.forward) {
-          if (newPos > cursorCoords.top) {
-             cursor.line += (newPos - cursorCoords.top) / lineHeight;
-             cursor.line = Math.ceil(cursor.line);
-             cm.setCursor(cursor);
-             cursorCoords = cm.charCoords(cursor, 'local');
-             cm.scrollTo(null, cursorCoords.top);
-          } else {
-             // Cursor stays within bounds.  Just reposition the scroll window.
-             cm.scrollTo(null, newPos);
-          }
-        } else {
-          var newBottom = newPos + cm.getScrollInfo().clientHeight;
-          if (newBottom < cursorCoords.bottom) {
-             cursor.line -= (cursorCoords.bottom - newBottom) / lineHeight;
-             cursor.line = Math.floor(cursor.line);
-             cm.setCursor(cursor);
-             cursorCoords = cm.charCoords(cursor, 'local');
-             cm.scrollTo(
-                 null, cursorCoords.bottom - cm.getScrollInfo().clientHeight);
-          } else {
-             // Cursor stays within bounds.  Just reposition the scroll window.
-             cm.scrollTo(null, newPos);
-          }
-        }
-      },
-      scrollToCursor: function(cm, actionArgs) {
-        var lineNum = cm.getCursor().line;
-        var charCoords = cm.charCoords(new Pos(lineNum, 0), 'local');
-        var height = cm.getScrollInfo().clientHeight;
-        var y = charCoords.top;
-        switch (actionArgs.position) {
-          case 'center': y = charCoords.bottom - height / 2;
-            break;
-          case 'bottom':
-            var lineLastCharPos = new Pos(lineNum, cm.getLine(lineNum).length - 1);
-            var lineLastCharCoords = cm.charCoords(lineLastCharPos, 'local');
-            var lineHeight = lineLastCharCoords.bottom - y;
-            y = y - height + lineHeight
-            break;
-        }
-        cm.scrollTo(null, y);
-      },
-      replayMacro: function(cm, actionArgs, vim) {
-        var registerName = actionArgs.selectedCharacter;
-        var repeat = actionArgs.repeat;
-        var macroModeState = vimGlobalState.macroModeState;
-        if (registerName == '@') {
-          registerName = macroModeState.latestRegister;
-        } else {
-          macroModeState.latestRegister = registerName;
-        }
-        while(repeat--){
-          executeMacroRegister(cm, vim, macroModeState, registerName);
-        }
-      },
-      enterMacroRecordMode: function(cm, actionArgs) {
-        var macroModeState = vimGlobalState.macroModeState;
-        var registerName = actionArgs.selectedCharacter;
-        if (vimGlobalState.registerController.isValidRegister(registerName)) {
-          macroModeState.enterMacroRecordMode(cm, registerName);
-        }
-      },
-      toggleOverwrite: function(cm) {
-        if (!cm.state.overwrite) {
-          cm.toggleOverwrite(true);
-          cm.setOption('keyMap', 'vim-replace');
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
-        } else {
-          cm.toggleOverwrite(false);
-          cm.setOption('keyMap', 'vim-insert');
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
-        }
-      },
-      enterInsertMode: function(cm, actionArgs, vim) {
-        if (cm.getOption('readOnly')) { return; }
-        vim.insertMode = true;
-        vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
-        var insertAt = (actionArgs) ? actionArgs.insertAt : null;
-        var sel = vim.sel;
-        var head = actionArgs.head || cm.getCursor('head');
-        var height = cm.listSelections().length;
-        if (insertAt == 'eol') {
-          head = new Pos(head.line, lineLength(cm, head.line));
-        } else if (insertAt == 'bol') {
-          head = new Pos(head.line, 0);
-        } else if (insertAt == 'charAfter') {
-          head = offsetCursor(head, 0, 1);
-        } else if (insertAt == 'firstNonBlank') {
-          head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
-        } else if (insertAt == 'startOfSelectedArea') {
-          if (!vim.visualMode)
-              return;
-          if (!vim.visualBlock) {
-            if (sel.head.line < sel.anchor.line) {
-              head = sel.head;
-            } else {
-              head = new Pos(sel.anchor.line, 0);
-            }
-          } else {
-            head = new Pos(
-                Math.min(sel.head.line, sel.anchor.line),
-                Math.min(sel.head.ch, sel.anchor.ch));
-            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
-          }
-        } else if (insertAt == 'endOfSelectedArea') {
-            if (!vim.visualMode)
-              return;
-          if (!vim.visualBlock) {
-            if (sel.head.line >= sel.anchor.line) {
-              head = offsetCursor(sel.head, 0, 1);
-            } else {
-              head = new Pos(sel.anchor.line, 0);
-            }
-          } else {
-            head = new Pos(
-                Math.min(sel.head.line, sel.anchor.line),
-                Math.max(sel.head.ch, sel.anchor.ch) + 1);
-            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
-          }
-        } else if (insertAt == 'inplace') {
-          if (vim.visualMode){
-            return;
-          }
-        } else if (insertAt == 'lastEdit') {
-          head = getLastEditPos(cm) || head;
-        }
-        cm.setOption('disableInput', false);
-        if (actionArgs && actionArgs.replace) {
-          // Handle Replace-mode as a special case of insert mode.
-          cm.toggleOverwrite(true);
-          cm.setOption('keyMap', 'vim-replace');
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
-        } else {
-          cm.toggleOverwrite(false);
-          cm.setOption('keyMap', 'vim-insert');
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
-        }
-        if (!vimGlobalState.macroModeState.isPlaying) {
-          // Only record if not replaying.
-          cm.on('change', onChange);
-          CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
-        }
-        if (vim.visualMode) {
-          exitVisualMode(cm);
-        }
-        selectForInsert(cm, head, height);
-      },
-      toggleVisualMode: function(cm, actionArgs, vim) {
-        var repeat = actionArgs.repeat;
-        var anchor = cm.getCursor();
-        var head;
-        // TODO: The repeat should actually select number of characters/lines
-        //     equal to the repeat times the size of the previous visual
-        //     operation.
-        if (!vim.visualMode) {
-          // Entering visual mode
-          vim.visualMode = true;
-          vim.visualLine = !!actionArgs.linewise;
-          vim.visualBlock = !!actionArgs.blockwise;
-          head = clipCursorToContent(
-              cm, new Pos(anchor.line, anchor.ch + repeat - 1));
-          vim.sel = {
-            anchor: anchor,
-            head: head
-          };
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
-          updateCmSelection(cm);
-          updateMark(cm, vim, '<', cursorMin(anchor, head));
-          updateMark(cm, vim, '>', cursorMax(anchor, head));
-        } else if (vim.visualLine ^ actionArgs.linewise ||
-            vim.visualBlock ^ actionArgs.blockwise) {
-          // Toggling between modes
-          vim.visualLine = !!actionArgs.linewise;
-          vim.visualBlock = !!actionArgs.blockwise;
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
-          updateCmSelection(cm);
-        } else {
-          exitVisualMode(cm);
-        }
-      },
-      reselectLastSelection: function(cm, _actionArgs, vim) {
-        var lastSelection = vim.lastSelection;
-        if (vim.visualMode) {
-          updateLastSelection(cm, vim);
-        }
-        if (lastSelection) {
-          var anchor = lastSelection.anchorMark.find();
-          var head = lastSelection.headMark.find();
-          if (!anchor || !head) {
-            // If the marks have been destroyed due to edits, do nothing.
-            return;
-          }
-          vim.sel = {
-            anchor: anchor,
-            head: head
-          };
-          vim.visualMode = true;
-          vim.visualLine = lastSelection.visualLine;
-          vim.visualBlock = lastSelection.visualBlock;
-          updateCmSelection(cm);
-          updateMark(cm, vim, '<', cursorMin(anchor, head));
-          updateMark(cm, vim, '>', cursorMax(anchor, head));
-          CodeMirror.signal(cm, 'vim-mode-change', {
-            mode: 'visual',
-            subMode: vim.visualLine ? 'linewise' :
-                     vim.visualBlock ? 'blockwise' : ''});
-        }
-      },
-      joinLines: function(cm, actionArgs, vim) {
-        var curStart, curEnd;
-        if (vim.visualMode) {
-          curStart = cm.getCursor('anchor');
-          curEnd = cm.getCursor('head');
-          if (cursorIsBefore(curEnd, curStart)) {
-            var tmp = curEnd;
-            curEnd = curStart;
-            curStart = tmp;
-          }
-          curEnd.ch = lineLength(cm, curEnd.line) - 1;
-        } else {
-          // Repeat is the number of lines to join. Minimum 2 lines.
-          var repeat = Math.max(actionArgs.repeat, 2);
-          curStart = cm.getCursor();
-          curEnd = clipCursorToContent(cm, new Pos(curStart.line + repeat - 1,
-                                               Infinity));
-        }
-        var finalCh = 0;
-        for (var i = curStart.line; i < curEnd.line; i++) {
-          finalCh = lineLength(cm, curStart.line);
-          var tmp = new Pos(curStart.line + 1,
-                        lineLength(cm, curStart.line + 1));
-          var text = cm.getRange(curStart, tmp);
-          text = actionArgs.keepSpaces
-            ? text.replace(/\n\r?/g, '')
-            : text.replace(/\n\s*/g, ' ');
-          cm.replaceRange(text, curStart, tmp);
-        }
-        var curFinalPos = new Pos(curStart.line, finalCh);
-        if (vim.visualMode) {
-          exitVisualMode(cm, false);
-        }
-        cm.setCursor(curFinalPos);
-      },
-      newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
-        vim.insertMode = true;
-        var insertAt = copyCursor(cm.getCursor());
-        if (insertAt.line === cm.firstLine() && !actionArgs.after) {
-          // Special case for inserting newline before start of document.
-          cm.replaceRange('\n', new Pos(cm.firstLine(), 0));
-          cm.setCursor(cm.firstLine(), 0);
-        } else {
-          insertAt.line = (actionArgs.after) ? insertAt.line :
-              insertAt.line - 1;
-          insertAt.ch = lineLength(cm, insertAt.line);
-          cm.setCursor(insertAt);
-          var newlineFn = CodeMirror.commands.newlineAndIndentContinueComment ||
-              CodeMirror.commands.newlineAndIndent;
-          newlineFn(cm);
-        }
-        this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
-      },
-      paste: function(cm, actionArgs, vim) {
-        var cur = copyCursor(cm.getCursor());
-        var register = vimGlobalState.registerController.getRegister(
-            actionArgs.registerName);
-        var text = register.toString();
-        if (!text) {
-          return;
-        }
-        if (actionArgs.matchIndent) {
-          var tabSize = cm.getOption("tabSize");
-          // length that considers tabs and tabSize
-          var whitespaceLength = function(str) {
-            var tabs = (str.split("\t").length - 1);
-            var spaces = (str.split(" ").length - 1);
-            return tabs * tabSize + spaces * 1;
-          };
-          var currentLine = cm.getLine(cm.getCursor().line);
-          var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
-          // chomp last newline b/c don't want it to match /^\s*/gm
-          var chompedText = text.replace(/\n$/, '');
-          var wasChomped = text !== chompedText;
-          var firstIndent = whitespaceLength(text.match(/^\s*/)[0]);
-          var text = chompedText.replace(/^\s*/gm, function(wspace) {
-            var newIndent = indent + (whitespaceLength(wspace) - firstIndent);
-            if (newIndent < 0) {
-              return "";
-            }
-            else if (cm.getOption("indentWithTabs")) {
-              var quotient = Math.floor(newIndent / tabSize);
-              return Array(quotient + 1).join('\t');
-            }
-            else {
-              return Array(newIndent + 1).join(' ');
-            }
-          });
-          text += wasChomped ? "\n" : "";
-        }
-        if (actionArgs.repeat > 1) {
-          var text = Array(actionArgs.repeat + 1).join(text);
-        }
-        var linewise = register.linewise;
-        var blockwise = register.blockwise;
-        if (blockwise) {
-          text = text.split('\n');
-          if (linewise) {
-              text.pop();
-          }
-          for (var i = 0; i < text.length; i++) {
-            text[i] = (text[i] == '') ? ' ' : text[i];
-          }
-          cur.ch += actionArgs.after ? 1 : 0;
-          cur.ch = Math.min(lineLength(cm, cur.line), cur.ch);
-        } else if (linewise) {
-          if(vim.visualMode) {
-            text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
-          } else if (actionArgs.after) {
-            // Move the newline at the end to the start instead, and paste just
-            // before the newline character of the line we are on right now.
-            text = '\n' + text.slice(0, text.length - 1);
-            cur.ch = lineLength(cm, cur.line);
-          } else {
-            cur.ch = 0;
-          }
-        } else {
-          cur.ch += actionArgs.after ? 1 : 0;
-        }
-        var curPosFinal;
-        var idx;
-        if (vim.visualMode) {
-          //  save the pasted text for reselection if the need arises
-          vim.lastPastedText = text;
-          var lastSelectionCurEnd;
-          var selectedArea = getSelectedAreaRange(cm, vim);
-          var selectionStart = selectedArea[0];
-          var selectionEnd = selectedArea[1];
-          var selectedText = cm.getSelection();
-          var selections = cm.listSelections();
-          var emptyStrings = new Array(selections.length).join('1').split('1');
-          // save the curEnd marker before it get cleared due to cm.replaceRange.
-          if (vim.lastSelection) {
-            lastSelectionCurEnd = vim.lastSelection.headMark.find();
-          }
-          // push the previously selected text to unnamed register
-          vimGlobalState.registerController.unnamedRegister.setText(selectedText);
-          if (blockwise) {
-            // first delete the selected text
-            cm.replaceSelections(emptyStrings);
-            // Set new selections as per the block length of the yanked text
-            selectionEnd = new Pos(selectionStart.line + text.length-1, selectionStart.ch);
-            cm.setCursor(selectionStart);
-            selectBlock(cm, selectionEnd);
-            cm.replaceSelections(text);
-            curPosFinal = selectionStart;
-          } else if (vim.visualBlock) {
-            cm.replaceSelections(emptyStrings);
-            cm.setCursor(selectionStart);
-            cm.replaceRange(text, selectionStart, selectionStart);
-            curPosFinal = selectionStart;
-          } else {
-            cm.replaceRange(text, selectionStart, selectionEnd);
-            curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
-          }
-          // restore the the curEnd marker
-          if(lastSelectionCurEnd) {
-            vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd);
-          }
-          if (linewise) {
-            curPosFinal.ch=0;
-          }
-        } else {
-          if (blockwise) {
-            cm.setCursor(cur);
-            for (var i = 0; i < text.length; i++) {
-              var line = cur.line+i;
-              if (line > cm.lastLine()) {
-                cm.replaceRange('\n',  new Pos(line, 0));
-              }
-              var lastCh = lineLength(cm, line);
-              if (lastCh < cur.ch) {
-                extendLineToColumn(cm, line, cur.ch);
-              }
-            }
-            cm.setCursor(cur);
-            selectBlock(cm, new Pos(cur.line + text.length-1, cur.ch));
-            cm.replaceSelections(text);
-            curPosFinal = cur;
-          } else {
-            cm.replaceRange(text, cur);
-            // Now fine tune the cursor to where we want it.
-            if (linewise && actionArgs.after) {
-              curPosFinal = new Pos(
-              cur.line + 1,
-              findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
-            } else if (linewise && !actionArgs.after) {
-              curPosFinal = new Pos(
-                cur.line,
-                findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
-            } else if (!linewise && actionArgs.after) {
-              idx = cm.indexFromPos(cur);
-              curPosFinal = cm.posFromIndex(idx + text.length - 1);
-            } else {
-              idx = cm.indexFromPos(cur);
-              curPosFinal = cm.posFromIndex(idx + text.length);
-            }
-          }
-        }
-        if (vim.visualMode) {
-          exitVisualMode(cm, false);
-        }
-        cm.setCursor(curPosFinal);
-      },
-      undo: function(cm, actionArgs) {
-        cm.operation(function() {
-          repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)();
-          cm.setCursor(cm.getCursor('anchor'));
-        });
-      },
-      redo: function(cm, actionArgs) {
-        repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)();
-      },
-      setRegister: function(_cm, actionArgs, vim) {
-        vim.inputState.registerName = actionArgs.selectedCharacter;
-      },
-      setMark: function(cm, actionArgs, vim) {
-        var markName = actionArgs.selectedCharacter;
-        updateMark(cm, vim, markName, cm.getCursor());
-      },
-      replace: function(cm, actionArgs, vim) {
-        var replaceWith = actionArgs.selectedCharacter;
-        var curStart = cm.getCursor();
-        var replaceTo;
-        var curEnd;
-        var selections = cm.listSelections();
-        if (vim.visualMode) {
-          curStart = cm.getCursor('start');
-          curEnd = cm.getCursor('end');
-        } else {
-          var line = cm.getLine(curStart.line);
-          replaceTo = curStart.ch + actionArgs.repeat;
-          if (replaceTo > line.length) {
-            replaceTo=line.length;
-          }
-          curEnd = new Pos(curStart.line, replaceTo);
-        }
-        if (replaceWith=='\n') {
-          if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
-          // special case, where vim help says to replace by just one line-break
-          (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
-        } else {
-          var replaceWithStr = cm.getRange(curStart, curEnd);
-          //replace all characters in range by selected, but keep linebreaks
-          replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
-          if (vim.visualBlock) {
-            // Tabs are split in visua block before replacing
-            var spaces = new Array(cm.getOption("tabSize")+1).join(' ');
-            replaceWithStr = cm.getSelection();
-            replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
-            cm.replaceSelections(replaceWithStr);
-          } else {
-            cm.replaceRange(replaceWithStr, curStart, curEnd);
-          }
-          if (vim.visualMode) {
-            curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ?
-                         selections[0].anchor : selections[0].head;
-            cm.setCursor(curStart);
-            exitVisualMode(cm, false);
-          } else {
-            cm.setCursor(offsetCursor(curEnd, 0, -1));
-          }
-        }
-      },
-      incrementNumberToken: function(cm, actionArgs) {
-        var cur = cm.getCursor();
-        var lineStr = cm.getLine(cur.line);
-        var re = /(-?)(?:(0x)([\da-f]+)|(0b|0|)(\d+))/gi;
-        var match;
-        var start;
-        var end;
-        var numberStr;
-        while ((match = re.exec(lineStr)) !== null) {
-          start = match.index;
-          end = start + match[0].length;
-          if (cur.ch < end)break;
-        }
-        if (!actionArgs.backtrack && (end <= cur.ch))return;
-        if (match) {
-          var baseStr = match[2] || match[4]
-          var digits = match[3] || match[5]
-          var increment = actionArgs.increase ? 1 : -1;
-          var base = {'0b': 2, '0': 8, '': 10, '0x': 16}[baseStr.toLowerCase()];
-          var number = parseInt(match[1] + digits, base) + (increment * actionArgs.repeat);
-          numberStr = number.toString(base);
-          var zeroPadding = baseStr ? new Array(digits.length - numberStr.length + 1 + match[1].length).join('0') : ''
-          if (numberStr.charAt(0) === '-') {
-            numberStr = '-' + baseStr + zeroPadding + numberStr.substr(1);
-          } else {
-            numberStr = baseStr + zeroPadding + numberStr;
-          }
-          var from = new Pos(cur.line, start);
-          var to = new Pos(cur.line, end);
-          cm.replaceRange(numberStr, from, to);
-        } else {
-          return;
-        }
-        cm.setCursor(new Pos(cur.line, start + numberStr.length - 1));
-      },
-      repeatLastEdit: function(cm, actionArgs, vim) {
-        var lastEditInputState = vim.lastEditInputState;
-        if (!lastEditInputState) { return; }
-        var repeat = actionArgs.repeat;
-        if (repeat && actionArgs.repeatIsExplicit) {
-          vim.lastEditInputState.repeatOverride = repeat;
-        } else {
-          repeat = vim.lastEditInputState.repeatOverride || repeat;
-        }
-        repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
-      },
-      indent: function(cm, actionArgs) {
-        cm.indentLine(cm.getCursor().line, actionArgs.indentRight);
-      },
-      exitInsertMode: exitInsertMode
-    };
-
-    function defineAction(name, fn) {
-      actions[name] = fn;
-    }
-
-    /*
-     * Below are miscellaneous utility functions used by vim.js
-     */
-
-    /**
-     * Clips cursor to ensure that line is within the buffer's range
-     * If includeLineBreak is true, then allow cur.ch == lineLength.
-     */
-    function clipCursorToContent(cm, cur) {
-      var vim = cm.state.vim;
-      var includeLineBreak = vim.insertMode || vim.visualMode;
-      var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
-      var maxCh = lineLength(cm, line) - 1 + !!includeLineBreak;
-      var ch = Math.min(Math.max(0, cur.ch), maxCh);
-      return new Pos(line, ch);
-    }
-    function copyArgs(args) {
-      var ret = {};
-      for (var prop in args) {
-        if (args.hasOwnProperty(prop)) {
-          ret[prop] = args[prop];
-        }
-      }
-      return ret;
-    }
-    function offsetCursor(cur, offsetLine, offsetCh) {
-      if (typeof offsetLine === 'object') {
-        offsetCh = offsetLine.ch;
-        offsetLine = offsetLine.line;
-      }
-      return new Pos(cur.line + offsetLine, cur.ch + offsetCh);
-    }
-    function commandMatches(keys, keyMap, context, inputState) {
-      // Partial matches are not applied. They inform the key handler
-      // that the current key sequence is a subsequence of a valid key
-      // sequence, so that the key buffer is not cleared.
-      var match, partial = [], full = [];
-      for (var i = 0; i < keyMap.length; i++) {
-        var command = keyMap[i];
-        if (context == 'insert' && command.context != 'insert' ||
-            command.context && command.context != context ||
-            inputState.operator && command.type == 'action' ||
-            !(match = commandMatch(keys, command.keys))) { continue; }
-        if (match == 'partial') { partial.push(command); }
-        if (match == 'full') { full.push(command); }
-      }
-      return {
-        partial: partial.length && partial,
-        full: full.length && full
-      };
-    }
-    function commandMatch(pressed, mapped) {
-      if (mapped.slice(-11) == '<character>') {
-        // Last character matches anything.
-        var prefixLen = mapped.length - 11;
-        var pressedPrefix = pressed.slice(0, prefixLen);
-        var mappedPrefix = mapped.slice(0, prefixLen);
-        return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' :
-               mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false;
-      } else {
-        return pressed == mapped ? 'full' :
-               mapped.indexOf(pressed) == 0 ? 'partial' : false;
-      }
-    }
-    function lastChar(keys) {
-      var match = /^.*(<[^>]+>)$/.exec(keys);
-      var selectedCharacter = match ? match[1] : keys.slice(-1);
-      if (selectedCharacter.length > 1){
-        switch(selectedCharacter){
-          case '<CR>':
-            selectedCharacter='\n';
-            break;
-          case '<Space>':
-            selectedCharacter=' ';
-            break;
-          default:
-            selectedCharacter='';
-            break;
-        }
-      }
-      return selectedCharacter;
-    }
-    function repeatFn(cm, fn, repeat) {
-      return function() {
-        for (var i = 0; i < repeat; i++) {
-          fn(cm);
-        }
-      };
-    }
-    function copyCursor(cur) {
-      return new Pos(cur.line, cur.ch);
-    }
-    function cursorEqual(cur1, cur2) {
-      return cur1.ch == cur2.ch && cur1.line == cur2.line;
-    }
-    function cursorIsBefore(cur1, cur2) {
-      if (cur1.line < cur2.line) {
-        return true;
-      }
-      if (cur1.line == cur2.line && cur1.ch < cur2.ch) {
-        return true;
-      }
-      return false;
-    }
-    function cursorMin(cur1, cur2) {
-      if (arguments.length > 2) {
-        cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1));
-      }
-      return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
-    }
-    function cursorMax(cur1, cur2) {
-      if (arguments.length > 2) {
-        cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1));
-      }
-      return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
-    }
-    function cursorIsBetween(cur1, cur2, cur3) {
-      // returns true if cur2 is between cur1 and cur3.
-      var cur1before2 = cursorIsBefore(cur1, cur2);
-      var cur2before3 = cursorIsBefore(cur2, cur3);
-      return cur1before2 && cur2before3;
-    }
-    function lineLength(cm, lineNum) {
-      return cm.getLine(lineNum).length;
-    }
-    function trim(s) {
-      if (s.trim) {
-        return s.trim();
-      }
-      return s.replace(/^\s+|\s+$/g, '');
-    }
-    function escapeRegex(s) {
-      return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
-    }
-    function extendLineToColumn(cm, lineNum, column) {
-      var endCh = lineLength(cm, lineNum);
-      var spaces = new Array(column-endCh+1).join(' ');
-      cm.setCursor(new Pos(lineNum, endCh));
-      cm.replaceRange(spaces, cm.getCursor());
-    }
-    // This functions selects a rectangular block
-    // of text with selectionEnd as any of its corner
-    // Height of block:
-    // Difference in selectionEnd.line and first/last selection.line
-    // Width of the block:
-    // Distance between selectionEnd.ch and any(first considered here) selection.ch
-    function selectBlock(cm, selectionEnd) {
-      var selections = [], ranges = cm.listSelections();
-      var head = copyCursor(cm.clipPos(selectionEnd));
-      var isClipped = !cursorEqual(selectionEnd, head);
-      var curHead = cm.getCursor('head');
-      var primIndex = getIndex(ranges, curHead);
-      var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor);
-      var max = ranges.length - 1;
-      var index = max - primIndex > primIndex ? max : 0;
-      var base = ranges[index].anchor;
-
-      var firstLine = Math.min(base.line, head.line);
-      var lastLine = Math.max(base.line, head.line);
-      var baseCh = base.ch, headCh = head.ch;
-
-      var dir = ranges[index].head.ch - baseCh;
-      var newDir = headCh - baseCh;
-      if (dir > 0 && newDir <= 0) {
-        baseCh++;
-        if (!isClipped) { headCh--; }
-      } else if (dir < 0 && newDir >= 0) {
-        baseCh--;
-        if (!wasClipped) { headCh++; }
-      } else if (dir < 0 && newDir == -1) {
-        baseCh--;
-        headCh++;
-      }
-      for (var line = firstLine; line <= lastLine; line++) {
-        var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
-        selections.push(range);
-      }
-      cm.setSelections(selections);
-      selectionEnd.ch = headCh;
-      base.ch = baseCh;
-      return base;
-    }
-    function selectForInsert(cm, head, height) {
-      var sel = [];
-      for (var i = 0; i < height; i++) {
-        var lineHead = offsetCursor(head, i, 0);
-        sel.push({anchor: lineHead, head: lineHead});
-      }
-      cm.setSelections(sel, 0);
-    }
-    // getIndex returns the index of the cursor in the selections.
-    function getIndex(ranges, cursor, end) {
-      for (var i = 0; i < ranges.length; i++) {
-        var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor);
-        var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor);
-        if (atAnchor || atHead) {
-          return i;
-        }
-      }
-      return -1;
-    }
-    function getSelectedAreaRange(cm, vim) {
-      var lastSelection = vim.lastSelection;
-      var getCurrentSelectedAreaRange = function() {
-        var selections = cm.listSelections();
-        var start =  selections[0];
-        var end = selections[selections.length-1];
-        var selectionStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
-        var selectionEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
-        return [selectionStart, selectionEnd];
-      };
-      var getLastSelectedAreaRange = function() {
-        var selectionStart = cm.getCursor();
-        var selectionEnd = cm.getCursor();
-        var block = lastSelection.visualBlock;
-        if (block) {
-          var width = block.width;
-          var height = block.height;
-          selectionEnd = new Pos(selectionStart.line + height, selectionStart.ch + width);
-          var selections = [];
-          // selectBlock creates a 'proper' rectangular block.
-          // We do not want that in all cases, so we manually set selections.
-          for (var i = selectionStart.line; i < selectionEnd.line; i++) {
-            var anchor = new Pos(i, selectionStart.ch);
-            var head = new Pos(i, selectionEnd.ch);
-            var range = {anchor: anchor, head: head};
-            selections.push(range);
-          }
-          cm.setSelections(selections);
-        } else {
-          var start = lastSelection.anchorMark.find();
-          var end = lastSelection.headMark.find();
-          var line = end.line - start.line;
-          var ch = end.ch - start.ch;
-          selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
-          if (lastSelection.visualLine) {
-            selectionStart = new Pos(selectionStart.line, 0);
-            selectionEnd = new Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
-          }
-          cm.setSelection(selectionStart, selectionEnd);
-        }
-        return [selectionStart, selectionEnd];
-      };
-      if (!vim.visualMode) {
-      // In case of replaying the action.
-        return getLastSelectedAreaRange();
-      } else {
-        return getCurrentSelectedAreaRange();
-      }
-    }
-    // Updates the previous selection with the current selection's values. This
-    // should only be called in visual mode.
-    function updateLastSelection(cm, vim) {
-      var anchor = vim.sel.anchor;
-      var head = vim.sel.head;
-      // To accommodate the effect of lastPastedText in the last selection
-      if (vim.lastPastedText) {
-        head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length);
-        vim.lastPastedText = null;
-      }
-      vim.lastSelection = {'anchorMark': cm.setBookmark(anchor),
-                           'headMark': cm.setBookmark(head),
-                           'anchor': copyCursor(anchor),
-                           'head': copyCursor(head),
-                           'visualMode': vim.visualMode,
-                           'visualLine': vim.visualLine,
-                           'visualBlock': vim.visualBlock};
-    }
-    function expandSelection(cm, start, end) {
-      var sel = cm.state.vim.sel;
-      var head = sel.head;
-      var anchor = sel.anchor;
-      var tmp;
-      if (cursorIsBefore(end, start)) {
-        tmp = end;
-        end = start;
-        start = tmp;
-      }
-      if (cursorIsBefore(head, anchor)) {
-        head = cursorMin(start, head);
-        anchor = cursorMax(anchor, end);
-      } else {
-        anchor = cursorMin(start, anchor);
-        head = cursorMax(head, end);
-        head = offsetCursor(head, 0, -1);
-        if (head.ch == -1 && head.line != cm.firstLine()) {
-          head = new Pos(head.line - 1, lineLength(cm, head.line - 1));
-        }
-      }
-      return [anchor, head];
-    }
-    /**
-     * Updates the CodeMirror selection to match the provided vim selection.
-     * If no arguments are given, it uses the current vim selection state.
-     */
-    function updateCmSelection(cm, sel, mode) {
-      var vim = cm.state.vim;
-      sel = sel || vim.sel;
-      var mode = mode ||
-        vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
-      var cmSel = makeCmSelection(cm, sel, mode);
-      cm.setSelections(cmSel.ranges, cmSel.primary);
-    }
-    function makeCmSelection(cm, sel, mode, exclusive) {
-      var head = copyCursor(sel.head);
-      var anchor = copyCursor(sel.anchor);
-      if (mode == 'char') {
-        var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
-        var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
-        head = offsetCursor(sel.head, 0, headOffset);
-        anchor = offsetCursor(sel.anchor, 0, anchorOffset);
-        return {
-          ranges: [{anchor: anchor, head: head}],
-          primary: 0
-        };
-      } else if (mode == 'line') {
-        if (!cursorIsBefore(sel.head, sel.anchor)) {
-          anchor.ch = 0;
-
-          var lastLine = cm.lastLine();
-          if (head.line > lastLine) {
-            head.line = lastLine;
-          }
-          head.ch = lineLength(cm, head.line);
-        } else {
-          head.ch = 0;
-          anchor.ch = lineLength(cm, anchor.line);
-        }
-        return {
-          ranges: [{anchor: anchor, head: head}],
-          primary: 0
-        };
-      } else if (mode == 'block') {
-        var top = Math.min(anchor.line, head.line),
-            fromCh = anchor.ch,
-            bottom = Math.max(anchor.line, head.line),
-            toCh = head.ch;
-        if (fromCh < toCh) { toCh += 1 }
-        else { fromCh += 1 };
-        var height = bottom - top + 1;
-        var primary = head.line == top ? 0 : height - 1;
-        var ranges = [];
-        for (var i = 0; i < height; i++) {
-          ranges.push({
-            anchor: new Pos(top + i, fromCh),
-            head: new Pos(top + i, toCh)
-          });
-        }
-        return {
-          ranges: ranges,
-          primary: primary
-        };
-      }
-    }
-    function getHead(cm) {
-      var cur = cm.getCursor('head');
-      if (cm.getSelection().length == 1) {
-        // Small corner case when only 1 character is selected. The "real"
-        // head is the left of head and anchor.
-        cur = cursorMin(cur, cm.getCursor('anchor'));
-      }
-      return cur;
-    }
-
-    /**
-     * If moveHead is set to false, the CodeMirror selection will not be
-     * touched. The caller assumes the responsibility of putting the cursor
-    * in the right place.
-     */
-    function exitVisualMode(cm, moveHead) {
-      var vim = cm.state.vim;
-      if (moveHead !== false) {
-        cm.setCursor(clipCursorToContent(cm, vim.sel.head));
-      }
-      updateLastSelection(cm, vim);
-      vim.visualMode = false;
-      vim.visualLine = false;
-      vim.visualBlock = false;
-      if (!vim.insertMode) CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-    }
-
-    // Remove any trailing newlines from the selection. For
-    // example, with the caret at the start of the last word on the line,
-    // 'dw' should word, but not the newline, while 'w' should advance the
-    // caret to the first character of the next line.
-    function clipToLine(cm, curStart, curEnd) {
-      var selection = cm.getRange(curStart, curEnd);
-      // Only clip if the selection ends with trailing newline + whitespace
-      if (/\n\s*$/.test(selection)) {
-        var lines = selection.split('\n');
-        // We know this is all whitespace.
-        lines.pop();
-
-        // Cases:
-        // 1. Last word is an empty line - do not clip the trailing '\n'
-        // 2. Last word is not an empty line - clip the trailing '\n'
-        var line;
-        // Find the line containing the last word, and clip all whitespace up
-        // to it.
-        for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) {
-          curEnd.line--;
-          curEnd.ch = 0;
-        }
-        // If the last word is not an empty line, clip an additional newline
-        if (line) {
-          curEnd.line--;
-          curEnd.ch = lineLength(cm, curEnd.line);
-        } else {
-          curEnd.ch = 0;
-        }
-      }
-    }
-
-    // Expand the selection to line ends.
-    function expandSelectionToLine(_cm, curStart, curEnd) {
-      curStart.ch = 0;
-      curEnd.ch = 0;
-      curEnd.line++;
-    }
-
-    function findFirstNonWhiteSpaceCharacter(text) {
-      if (!text) {
-        return 0;
-      }
-      var firstNonWS = text.search(/\S/);
-      return firstNonWS == -1 ? text.length : firstNonWS;
-    }
-
-    function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
-      var cur = getHead(cm);
-      var line = cm.getLine(cur.line);
-      var idx = cur.ch;
-
-      // Seek to first word or non-whitespace character, depending on if
-      // noSymbol is true.
-      var test = noSymbol ? wordCharTest[0] : bigWordCharTest [0];
-      while (!test(line.charAt(idx))) {
-        idx++;
-        if (idx >= line.length) { return null; }
-      }
-
-      if (bigWord) {
-        test = bigWordCharTest[0];
-      } else {
-        test = wordCharTest[0];
-        if (!test(line.charAt(idx))) {
-          test = wordCharTest[1];
-        }
-      }
-
-      var end = idx, start = idx;
-      while (test(line.charAt(end)) && end < line.length) { end++; }
-      while (test(line.charAt(start)) && start >= 0) { start--; }
-      start++;
-
-      if (inclusive) {
-        // If present, include all whitespace after word.
-        // Otherwise, include all whitespace before word, except indentation.
-        var wordEnd = end;
-        while (/\s/.test(line.charAt(end)) && end < line.length) { end++; }
-        if (wordEnd == end) {
-          var wordStart = start;
-          while (/\s/.test(line.charAt(start - 1)) && start > 0) { start--; }
-          if (!start) { start = wordStart; }
-        }
-      }
-      return { start: new Pos(cur.line, start), end: new Pos(cur.line, end) };
-    }
-
-    /**
-     * Depends on the following:
-     *
-     * - editor mode should be htmlmixedmode / xml
-     * - mode/xml/xml.js should be loaded
-     * - addon/fold/xml-fold.js should be loaded
-     *
-     * If any of the above requirements are not true, this function noops.
-     *
-     * This is _NOT_ a 100% accurate implementation of vim tag text objects.
-     * The following caveats apply (based off cursory testing, I'm sure there
-     * are other discrepancies):
-     *
-     * - Does not work inside comments:
-     *   ```
-     *   <!-- <div>broken</div> -->
-     *   ```
-     * - Does not work when tags have different cases:
-     *   ```
-     *   <div>broken</DIV>
-     *   ```
-     * - Does not work when cursor is inside a broken tag:
-     *   ```
-     *   <div><brok><en></div>
-     *   ```
-     */
-    function expandTagUnderCursor(cm, head, inclusive) {
-      var cur = head;
-      if (!CodeMirror.findMatchingTag || !CodeMirror.findEnclosingTag) {
-        return { start: cur, end: cur };
-      }
-
-      var tags = CodeMirror.findMatchingTag(cm, head) || CodeMirror.findEnclosingTag(cm, head);
-      if (!tags || !tags.open || !tags.close) {
-        return { start: cur, end: cur };
-      }
-
-      if (inclusive) {
-        return { start: tags.open.from, end: tags.close.to };
-      }
-      return { start: tags.open.to, end: tags.close.from };
-    }
-
-    function recordJumpPosition(cm, oldCur, newCur) {
-      if (!cursorEqual(oldCur, newCur)) {
-        vimGlobalState.jumpList.add(cm, oldCur, newCur);
-      }
-    }
-
-    function recordLastCharacterSearch(increment, args) {
-        vimGlobalState.lastCharacterSearch.increment = increment;
-        vimGlobalState.lastCharacterSearch.forward = args.forward;
-        vimGlobalState.lastCharacterSearch.selectedCharacter = args.selectedCharacter;
-    }
-
-    var symbolToMode = {
-        '(': 'bracket', ')': 'bracket', '{': 'bracket', '}': 'bracket',
-        '[': 'section', ']': 'section',
-        '*': 'comment', '/': 'comment',
-        'm': 'method', 'M': 'method',
-        '#': 'preprocess'
-    };
-    var findSymbolModes = {
-      bracket: {
-        isComplete: function(state) {
-          if (state.nextCh === state.symb) {
-            state.depth++;
-            if (state.depth >= 1)return true;
-          } else if (state.nextCh === state.reverseSymb) {
-            state.depth--;
-          }
-          return false;
-        }
-      },
-      section: {
-        init: function(state) {
-          state.curMoveThrough = true;
-          state.symb = (state.forward ? ']' : '[') === state.symb ? '{' : '}';
-        },
-        isComplete: function(state) {
-          return state.index === 0 && state.nextCh === state.symb;
-        }
-      },
-      comment: {
-        isComplete: function(state) {
-          var found = state.lastCh === '*' && state.nextCh === '/';
-          state.lastCh = state.nextCh;
-          return found;
-        }
-      },
-      // TODO: The original Vim implementation only operates on level 1 and 2.
-      // The current implementation doesn't check for code block level and
-      // therefore it operates on any levels.
-      method: {
-        init: function(state) {
-          state.symb = (state.symb === 'm' ? '{' : '}');
-          state.reverseSymb = state.symb === '{' ? '}' : '{';
-        },
-        isComplete: function(state) {
-          if (state.nextCh === state.symb)return true;
-          return false;
-        }
-      },
-      preprocess: {
-        init: function(state) {
-          state.index = 0;
-        },
-        isComplete: function(state) {
-          if (state.nextCh === '#') {
-            var token = state.lineText.match(/^#(\w+)/)[1];
-            if (token === 'endif') {
-              if (state.forward && state.depth === 0) {
-                return true;
-              }
-              state.depth++;
-            } else if (token === 'if') {
-              if (!state.forward && state.depth === 0) {
-                return true;
-              }
-              state.depth--;
-            }
-            if (token === 'else' && state.depth === 0)return true;
-          }
-          return false;
-        }
-      }
-    };
-    function findSymbol(cm, repeat, forward, symb) {
-      var cur = copyCursor(cm.getCursor());
-      var increment = forward ? 1 : -1;
-      var endLine = forward ? cm.lineCount() : -1;
-      var curCh = cur.ch;
-      var line = cur.line;
-      var lineText = cm.getLine(line);
-      var state = {
-        lineText: lineText,
-        nextCh: lineText.charAt(curCh),
-        lastCh: null,
-        index: curCh,
-        symb: symb,
-        reverseSymb: (forward ?  { ')': '(', '}': '{' } : { '(': ')', '{': '}' })[symb],
-        forward: forward,
-        depth: 0,
-        curMoveThrough: false
-      };
-      var mode = symbolToMode[symb];
-      if (!mode)return cur;
-      var init = findSymbolModes[mode].init;
-      var isComplete = findSymbolModes[mode].isComplete;
-      if (init) { init(state); }
-      while (line !== endLine && repeat) {
-        state.index += increment;
-        state.nextCh = state.lineText.charAt(state.index);
-        if (!state.nextCh) {
-          line += increment;
-          state.lineText = cm.getLine(line) || '';
-          if (increment > 0) {
-            state.index = 0;
-          } else {
-            var lineLen = state.lineText.length;
-            state.index = (lineLen > 0) ? (lineLen-1) : 0;
-          }
-          state.nextCh = state.lineText.charAt(state.index);
-        }
-        if (isComplete(state)) {
-          cur.line = line;
-          cur.ch = state.index;
-          repeat--;
-        }
-      }
-      if (state.nextCh || state.curMoveThrough) {
-        return new Pos(line, state.index);
-      }
-      return cur;
-    }
-
-    /*
-     * Returns the boundaries of the next word. If the cursor in the middle of
-     * the word, then returns the boundaries of the current word, starting at
-     * the cursor. If the cursor is at the start/end of a word, and we are going
-     * forward/backward, respectively, find the boundaries of the next word.
-     *
-     * @param {CodeMirror} cm CodeMirror object.
-     * @param {Cursor} cur The cursor position.
-     * @param {boolean} forward True to search forward. False to search
-     *     backward.
-     * @param {boolean} bigWord True if punctuation count as part of the word.
-     *     False if only [a-zA-Z0-9] characters count as part of the word.
-     * @param {boolean} emptyLineIsWord True if empty lines should be treated
-     *     as words.
-     * @return {Object{from:number, to:number, line: number}} The boundaries of
-     *     the word, or null if there are no more words.
-     */
-    function findWord(cm, cur, forward, bigWord, emptyLineIsWord) {
-      var lineNum = cur.line;
-      var pos = cur.ch;
-      var line = cm.getLine(lineNum);
-      var dir = forward ? 1 : -1;
-      var charTests = bigWord ? bigWordCharTest: wordCharTest;
-
-      if (emptyLineIsWord && line == '') {
-        lineNum += dir;
-        line = cm.getLine(lineNum);
-        if (!isLine(cm, lineNum)) {
-          return null;
-        }
-        pos = (forward) ? 0 : line.length;
-      }
-
-      while (true) {
-        if (emptyLineIsWord && line == '') {
-          return { from: 0, to: 0, line: lineNum };
-        }
-        var stop = (dir > 0) ? line.length : -1;
-        var wordStart = stop, wordEnd = stop;
-        // Find bounds of next word.
-        while (pos != stop) {
-          var foundWord = false;
-          for (var i = 0; i < charTests.length && !foundWord; ++i) {
-            if (charTests[i](line.charAt(pos))) {
-              wordStart = pos;
-              // Advance to end of word.
-              while (pos != stop && charTests[i](line.charAt(pos))) {
-                pos += dir;
-              }
-              wordEnd = pos;
-              foundWord = wordStart != wordEnd;
-              if (wordStart == cur.ch && lineNum == cur.line &&
-                  wordEnd == wordStart + dir) {
-                // We started at the end of a word. Find the next one.
-                continue;
-              } else {
-                return {
-                  from: Math.min(wordStart, wordEnd + 1),
-                  to: Math.max(wordStart, wordEnd),
-                  line: lineNum };
-              }
-            }
-          }
-          if (!foundWord) {
-            pos += dir;
-          }
-        }
-        // Advance to next/prev line.
-        lineNum += dir;
-        if (!isLine(cm, lineNum)) {
-          return null;
-        }
-        line = cm.getLine(lineNum);
-        pos = (dir > 0) ? 0 : line.length;
-      }
-    }
-
-    /**
-     * @param {CodeMirror} cm CodeMirror object.
-     * @param {Pos} cur The position to start from.
-     * @param {int} repeat Number of words to move past.
-     * @param {boolean} forward True to search forward. False to search
-     *     backward.
-     * @param {boolean} wordEnd True to move to end of word. False to move to
-     *     beginning of word.
-     * @param {boolean} bigWord True if punctuation count as part of the word.
-     *     False if only alphabet characters count as part of the word.
-     * @return {Cursor} The position the cursor should move to.
-     */
-    function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) {
-      var curStart = copyCursor(cur);
-      var words = [];
-      if (forward && !wordEnd || !forward && wordEnd) {
-        repeat++;
-      }
-      // For 'e', empty lines are not considered words, go figure.
-      var emptyLineIsWord = !(forward && wordEnd);
-      for (var i = 0; i < repeat; i++) {
-        var word = findWord(cm, cur, forward, bigWord, emptyLineIsWord);
-        if (!word) {
-          var eodCh = lineLength(cm, cm.lastLine());
-          words.push(forward
-              ? {line: cm.lastLine(), from: eodCh, to: eodCh}
-              : {line: 0, from: 0, to: 0});
-          break;
-        }
-        words.push(word);
-        cur = new Pos(word.line, forward ? (word.to - 1) : word.from);
-      }
-      var shortCircuit = words.length != repeat;
-      var firstWord = words[0];
-      var lastWord = words.pop();
-      if (forward && !wordEnd) {
-        // w
-        if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) {
-          // We did not start in the middle of a word. Discard the extra word at the end.
-          lastWord = words.pop();
-        }
-        return new Pos(lastWord.line, lastWord.from);
-      } else if (forward && wordEnd) {
-        return new Pos(lastWord.line, lastWord.to - 1);
-      } else if (!forward && wordEnd) {
-        // ge
-        if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
-          // We did not start in the middle of a word. Discard the extra word at the end.
-          lastWord = words.pop();
-        }
-        return new Pos(lastWord.line, lastWord.to);
-      } else {
-        // b
-        return new Pos(lastWord.line, lastWord.from);
-      }
-    }
-
-    function moveToEol(cm, head, motionArgs, vim, keepHPos) {
-      var cur = head;
-      var retval= new Pos(cur.line + motionArgs.repeat - 1, Infinity);
-      var end=cm.clipPos(retval);
-      end.ch--;
-      if (!keepHPos) {
-        vim.lastHPos = Infinity;
-        vim.lastHSPos = cm.charCoords(end,'div').left;
-      }
-      return retval;
-    }
-
-    function moveToCharacter(cm, repeat, forward, character) {
-      var cur = cm.getCursor();
-      var start = cur.ch;
-      var idx;
-      for (var i = 0; i < repeat; i ++) {
-        var line = cm.getLine(cur.line);
-        idx = charIdxInLine(start, line, character, forward, true);
-        if (idx == -1) {
-          return null;
-        }
-        start = idx;
-      }
-      return new Pos(cm.getCursor().line, idx);
-    }
-
-    function moveToColumn(cm, repeat) {
-      // repeat is always >= 1, so repeat - 1 always corresponds
-      // to the column we want to go to.
-      var line = cm.getCursor().line;
-      return clipCursorToContent(cm, new Pos(line, repeat - 1));
-    }
-
-    function updateMark(cm, vim, markName, pos) {
-      if (!inArray(markName, validMarks)) {
-        return;
-      }
-      if (vim.marks[markName]) {
-        vim.marks[markName].clear();
-      }
-      vim.marks[markName] = cm.setBookmark(pos);
-    }
-
-    function charIdxInLine(start, line, character, forward, includeChar) {
-      // Search for char in line.
-      // motion_options: {forward, includeChar}
-      // If includeChar = true, include it too.
-      // If forward = true, search forward, else search backwards.
-      // If char is not found on this line, do nothing
-      var idx;
-      if (forward) {
-        idx = line.indexOf(character, start + 1);
-        if (idx != -1 && !includeChar) {
-          idx -= 1;
-        }
-      } else {
-        idx = line.lastIndexOf(character, start - 1);
-        if (idx != -1 && !includeChar) {
-          idx += 1;
-        }
-      }
-      return idx;
-    }
-
-    function findParagraph(cm, head, repeat, dir, inclusive) {
-      var line = head.line;
-      var min = cm.firstLine();
-      var max = cm.lastLine();
-      var start, end, i = line;
-      function isEmpty(i) { return !cm.getLine(i); }
-      function isBoundary(i, dir, any) {
-        if (any) { return isEmpty(i) != isEmpty(i + dir); }
-        return !isEmpty(i) && isEmpty(i + dir);
-      }
-      if (dir) {
-        while (min <= i && i <= max && repeat > 0) {
-          if (isBoundary(i, dir)) { repeat--; }
-          i += dir;
-        }
-        return new Pos(i, 0);
-      }
-
-      var vim = cm.state.vim;
-      if (vim.visualLine && isBoundary(line, 1, true)) {
-        var anchor = vim.sel.anchor;
-        if (isBoundary(anchor.line, -1, true)) {
-          if (!inclusive || anchor.line != line) {
-            line += 1;
-          }
-        }
-      }
-      var startState = isEmpty(line);
-      for (i = line; i <= max && repeat; i++) {
-        if (isBoundary(i, 1, true)) {
-          if (!inclusive || isEmpty(i) != startState) {
-            repeat--;
-          }
-        }
-      }
-      end = new Pos(i, 0);
-      // select boundary before paragraph for the last one
-      if (i > max && !startState) { startState = true; }
-      else { inclusive = false; }
-      for (i = line; i > min; i--) {
-        if (!inclusive || isEmpty(i) == startState || i == line) {
-          if (isBoundary(i, -1, true)) { break; }
-        }
-      }
-      start = new Pos(i, 0);
-      return { start: start, end: end };
-    }
-  function getSentence(cm, cur, repeat, dir, inclusive /*includes whitespace*/) {
-    /*
-    Takes an index object
-    {
-    line: the line string,
-    ln: line number,
-    pos: index in line,
-    dir: direction of traversal (-1 or 1)
-    }
-    and modifies the pos member to represent the
-    next valid position or sets the line to null if there are
-    no more valid positions.
-   */
-    function nextChar(curr) {
-      if (curr.pos + curr.dir < 0 || curr.pos + curr.dir >= curr.line.length) {
-          curr.line = null;
-        }
-      else {
-        curr.pos += curr.dir;
-      }
-    }
-    /*
-    Performs one iteration of traversal in forward direction
-    Returns an index object of the new location
-   */
-    function forward(cm, ln, pos, dir) {
-      var line = cm.getLine(ln);
-
-      var curr = {
-        line: line,
-        ln: ln,
-        pos: pos,
-        dir: dir,
-      };
-
-      if (curr.line === "") {
-        return { ln: curr.ln, pos: curr.pos };
-      }
-
-      var lastSentencePos = curr.pos;
-
-      // Move one step to skip character we start on
-      nextChar(curr);
-
-      while (curr.line !== null) {
-        lastSentencePos = curr.pos;
-        if (isEndOfSentenceSymbol(curr.line[curr.pos])) {
-          if (!inclusive) {
-            return { ln: curr.ln, pos: curr.pos + 1 };
-          } else {
-            nextChar(curr);
-            while (curr.line !== null ) {
-              if (isWhiteSpaceString(curr.line[curr.pos])) {
-                lastSentencePos = curr.pos;
-                nextChar(curr)
-              } else {
-                break;
-              }
-            }
-            return { ln: curr.ln, pos: lastSentencePos + 1, };
-          }
-        }
-        nextChar(curr);
-      }
-      return { ln: curr.ln, pos: lastSentencePos + 1 };
-    }
-
-    /*
-    Performs one iteration of traversal in reverse direction
-    Returns an index object of the new location
-   */
-    function reverse(cm, ln, pos, dir) {
-      var line = cm.getLine(ln);
-
-      var curr = {
-        line: line,
-        ln: ln,
-        pos: pos,
-        dir: dir,
-      }
-
-      if (curr.line === "") {
-        return { ln: curr.ln, pos: curr.pos };
-      }
-
-      var lastSentencePos = curr.pos;
-
-      // Move one step to skip character we start on
-      nextChar(curr);
-
-      while (curr.line !== null) {
-        if (!isWhiteSpaceString(curr.line[curr.pos]) && !isEndOfSentenceSymbol(curr.line[curr.pos])) {
-          lastSentencePos = curr.pos;
-        }
-
-        else if (isEndOfSentenceSymbol(curr.line[curr.pos]) ) {
-          if (!inclusive) {
-            return { ln: curr.ln, pos: lastSentencePos };
-          } else {
-              if (isWhiteSpaceString(curr.line[curr.pos + 1])) {
-                return { ln: curr.ln, pos: curr.pos + 1, };
-              } else {
-                return {ln: curr.ln, pos: lastSentencePos};
-              }
-          }
-        }
-
-        nextChar(curr);
-      }
-      curr.line = line
-      if (inclusive && isWhiteSpaceString(curr.line[curr.pos])) {
-        return { ln: curr.ln, pos: curr.pos };
-      } else {
-        return { ln: curr.ln, pos: lastSentencePos };
-      }
-
-    }
-
-    var curr_index = {
-      ln: cur.line,
-      pos: cur.ch,
-    };
-
-    while (repeat > 0) {
-      if (dir < 0) {
-        curr_index = reverse(cm, curr_index.ln, curr_index.pos, dir);
-      }
-      else {
-        curr_index = forward(cm, curr_index.ln, curr_index.pos, dir);
-      }
-      repeat--;
-    }
-
-    return new Pos(curr_index.ln, curr_index.pos);
-  }
-
-  function findSentence(cm, cur, repeat, dir) {
-
-    /*
-    Takes an index object
-    {
-    line: the line string,
-    ln: line number,
-    pos: index in line,
-    dir: direction of traversal (-1 or 1)
-    }
-    and modifies the line, ln, and pos members to represent the
-    next valid position or sets them to null if there are
-    no more valid positions.
-   */
-      function nextChar(cm, idx) {
-        if (idx.pos + idx.dir < 0 || idx.pos + idx.dir >= idx.line.length) {
-          idx.ln += idx.dir;
-          if (!isLine(cm, idx.ln)) {
-            idx.line = null;
-            idx.ln = null;
-            idx.pos = null;
-            return;
-          }
-          idx.line = cm.getLine(idx.ln);
-          idx.pos = (idx.dir > 0) ? 0 : idx.line.length - 1;
-        }
-        else {
-          idx.pos += idx.dir;
-        }
-      }
-
-      /*
-        Performs one iteration of traversal in forward direction
-        Returns an index object of the new location
-       */
-      function forward(cm, ln, pos, dir) {
-        var line = cm.getLine(ln);
-        var stop = (line === "");
-
-        var curr = {
-          line: line,
-          ln: ln,
-          pos: pos,
-          dir: dir,
-        }
-
-        var last_valid = {
-          ln: curr.ln,
-          pos: curr.pos,
-        }
-
-        var skip_empty_lines = (curr.line === "");
-
-        // Move one step to skip character we start on
-        nextChar(cm, curr);
-
-        while (curr.line !== null) {
-          last_valid.ln = curr.ln;
-          last_valid.pos = curr.pos;
-
-          if (curr.line === "" && !skip_empty_lines) {
-            return { ln: curr.ln, pos: curr.pos, };
-          }
-          else if (stop && curr.line !== "" && !isWhiteSpaceString(curr.line[curr.pos])) {
-            return { ln: curr.ln, pos: curr.pos, };
-          }
-          else if (isEndOfSentenceSymbol(curr.line[curr.pos])
-            && !stop
-            && (curr.pos === curr.line.length - 1
-              || isWhiteSpaceString(curr.line[curr.pos + 1]))) {
-            stop = true;
-          }
-
-          nextChar(cm, curr);
-        }
-
-        /*
-          Set the position to the last non whitespace character on the last
-          valid line in the case that we reach the end of the document.
-        */
-        var line = cm.getLine(last_valid.ln);
-        last_valid.pos = 0;
-        for(var i = line.length - 1; i >= 0; --i) {
-          if (!isWhiteSpaceString(line[i])) {
-            last_valid.pos = i;
-            break;
-          }
-        }
-
-        return last_valid;
-
-      }
-
-      /*
-        Performs one iteration of traversal in reverse direction
-        Returns an index object of the new location
-       */
-      function reverse(cm, ln, pos, dir) {
-        var line = cm.getLine(ln);
-
-        var curr = {
-          line: line,
-          ln: ln,
-          pos: pos,
-          dir: dir,
-        }
-
-        var last_valid = {
-          ln: curr.ln,
-          pos: null,
-        };
-
-        var skip_empty_lines = (curr.line === "");
-
-        // Move one step to skip character we start on
-        nextChar(cm, curr);
-
-        while (curr.line !== null) {
-
-          if (curr.line === "" && !skip_empty_lines) {
-            if (last_valid.pos !== null) {
-              return last_valid;
-            }
-            else {
-              return { ln: curr.ln, pos: curr.pos };
-            }
-          }
-          else if (isEndOfSentenceSymbol(curr.line[curr.pos])
-              && last_valid.pos !== null
-              && !(curr.ln === last_valid.ln && curr.pos + 1 === last_valid.pos)) {
-            return last_valid;
-          }
-          else if (curr.line !== "" && !isWhiteSpaceString(curr.line[curr.pos])) {
-            skip_empty_lines = false;
-            last_valid = { ln: curr.ln, pos: curr.pos }
-          }
-
-          nextChar(cm, curr);
-        }
-
-        /*
-          Set the position to the first non whitespace character on the last
-          valid line in the case that we reach the beginning of the document.
-        */
-        var line = cm.getLine(last_valid.ln);
-        last_valid.pos = 0;
-        for(var i = 0; i < line.length; ++i) {
-          if (!isWhiteSpaceString(line[i])) {
-            last_valid.pos = i;
-            break;
-          }
-        }
-        return last_valid;
-      }
-
-      var curr_index = {
-        ln: cur.line,
-        pos: cur.ch,
-      };
-
-      while (repeat > 0) {
-        if (dir < 0) {
-          curr_index = reverse(cm, curr_index.ln, curr_index.pos, dir);
-        }
-        else {
-          curr_index = forward(cm, curr_index.ln, curr_index.pos, dir);
-        }
-        repeat--;
-      }
-
-      return new Pos(curr_index.ln, curr_index.pos);
-    }
-
-    // TODO: perhaps this finagling of start and end positions belongs
-    // in codemirror/replaceRange?
-    function selectCompanionObject(cm, head, symb, inclusive) {
-      var cur = head, start, end;
-
-      var bracketRegexp = ({
-        '(': /[()]/, ')': /[()]/,
-        '[': /[[\]]/, ']': /[[\]]/,
-        '{': /[{}]/, '}': /[{}]/,
-        '<': /[<>]/, '>': /[<>]/})[symb];
-      var openSym = ({
-        '(': '(', ')': '(',
-        '[': '[', ']': '[',
-        '{': '{', '}': '{',
-        '<': '<', '>': '<'})[symb];
-      var curChar = cm.getLine(cur.line).charAt(cur.ch);
-      // Due to the behavior of scanForBracket, we need to add an offset if the
-      // cursor is on a matching open bracket.
-      var offset = curChar === openSym ? 1 : 0;
-
-      start = cm.scanForBracket(new Pos(cur.line, cur.ch + offset), -1, undefined, {'bracketRegex': bracketRegexp});
-      end = cm.scanForBracket(new Pos(cur.line, cur.ch + offset), 1, undefined, {'bracketRegex': bracketRegexp});
-
-      if (!start || !end) {
-        return { start: cur, end: cur };
-      }
-
-      start = start.pos;
-      end = end.pos;
-
-      if ((start.line == end.line && start.ch > end.ch)
-          || (start.line > end.line)) {
-        var tmp = start;
-        start = end;
-        end = tmp;
-      }
-
-      if (inclusive) {
-        end.ch += 1;
-      } else {
-        start.ch += 1;
-      }
-
-      return { start: start, end: end };
-    }
-
-    // Takes in a symbol and a cursor and tries to simulate text objects that
-    // have identical opening and closing symbols
-    // TODO support across multiple lines
-    function findBeginningAndEnd(cm, head, symb, inclusive) {
-      var cur = copyCursor(head);
-      var line = cm.getLine(cur.line);
-      var chars = line.split('');
-      var start, end, i, len;
-      var firstIndex = chars.indexOf(symb);
-
-      // the decision tree is to always look backwards for the beginning first,
-      // but if the cursor is in front of the first instance of the symb,
-      // then move the cursor forward
-      if (cur.ch < firstIndex) {
-        cur.ch = firstIndex;
-        // Why is this line even here???
-        // cm.setCursor(cur.line, firstIndex+1);
-      }
-      // otherwise if the cursor is currently on the closing symbol
-      else if (firstIndex < cur.ch && chars[cur.ch] == symb) {
-        end = cur.ch; // assign end to the current cursor
-        --cur.ch; // make sure to look backwards
-      }
-
-      // if we're currently on the symbol, we've got a start
-      if (chars[cur.ch] == symb && !end) {
-        start = cur.ch + 1; // assign start to ahead of the cursor
-      } else {
-        // go backwards to find the start
-        for (i = cur.ch; i > -1 && !start; i--) {
-          if (chars[i] == symb) {
-            start = i + 1;
-          }
-        }
-      }
-
-      // look forwards for the end symbol
-      if (start && !end) {
-        for (i = start, len = chars.length; i < len && !end; i++) {
-          if (chars[i] == symb) {
-            end = i;
-          }
-        }
-      }
-
-      // nothing found
-      if (!start || !end) {
-        return { start: cur, end: cur };
-      }
-
-      // include the symbols
-      if (inclusive) {
-        --start; ++end;
-      }
-
-      return {
-        start: new Pos(cur.line, start),
-        end: new Pos(cur.line, end)
-      };
-    }
-
-    // Search functions
-    defineOption('pcre', true, 'boolean');
-    function SearchState() {}
-    SearchState.prototype = {
-      getQuery: function() {
-        return vimGlobalState.query;
-      },
-      setQuery: function(query) {
-        vimGlobalState.query = query;
-      },
-      getOverlay: function() {
-        return this.searchOverlay;
-      },
-      setOverlay: function(overlay) {
-        this.searchOverlay = overlay;
-      },
-      isReversed: function() {
-        return vimGlobalState.isReversed;
-      },
-      setReversed: function(reversed) {
-        vimGlobalState.isReversed = reversed;
-      },
-      getScrollbarAnnotate: function() {
-        return this.annotate;
-      },
-      setScrollbarAnnotate: function(annotate) {
-        this.annotate = annotate;
-      }
-    };
-    function getSearchState(cm) {
-      var vim = cm.state.vim;
-      return vim.searchState_ || (vim.searchState_ = new SearchState());
-    }
-    function splitBySlash(argString) {
-      return splitBySeparator(argString, '/');
-    }
-
-    function findUnescapedSlashes(argString) {
-      return findUnescapedSeparators(argString, '/');
-    }
-
-    function splitBySeparator(argString, separator) {
-      var slashes = findUnescapedSeparators(argString, separator) || [];
-      if (!slashes.length) return [];
-      var tokens = [];
-      // in case of strings like foo/bar
-      if (slashes[0] !== 0) return;
-      for (var i = 0; i < slashes.length; i++) {
-        if (typeof slashes[i] == 'number')
-          tokens.push(argString.substring(slashes[i] + 1, slashes[i+1]));
-      }
-      return tokens;
-    }
-
-    function findUnescapedSeparators(str, separator) {
-      if (!separator)
-        separator = '/';
-
-      var escapeNextChar = false;
-      var slashes = [];
-      for (var i = 0; i < str.length; i++) {
-        var c = str.charAt(i);
-        if (!escapeNextChar && c == separator) {
-          slashes.push(i);
-        }
-        escapeNextChar = !escapeNextChar && (c == '\\');
-      }
-      return slashes;
-    }
-
-    // Translates a search string from ex (vim) syntax into javascript form.
-    function translateRegex(str) {
-      // When these match, add a '\' if unescaped or remove one if escaped.
-      var specials = '|(){';
-      // Remove, but never add, a '\' for these.
-      var unescape = '}';
-      var escapeNextChar = false;
-      var out = [];
-      for (var i = -1; i < str.length; i++) {
-        var c = str.charAt(i) || '';
-        var n = str.charAt(i+1) || '';
-        var specialComesNext = (n && specials.indexOf(n) != -1);
-        if (escapeNextChar) {
-          if (c !== '\\' || !specialComesNext) {
-            out.push(c);
-          }
-          escapeNextChar = false;
-        } else {
-          if (c === '\\') {
-            escapeNextChar = true;
-            // Treat the unescape list as special for removing, but not adding '\'.
-            if (n && unescape.indexOf(n) != -1) {
-              specialComesNext = true;
-            }
-            // Not passing this test means removing a '\'.
-            if (!specialComesNext || n === '\\') {
-              out.push(c);
-            }
-          } else {
-            out.push(c);
-            if (specialComesNext && n !== '\\') {
-              out.push('\\');
-            }
-          }
-        }
-      }
-      return out.join('');
-    }
-
-    // Translates the replace part of a search and replace from ex (vim) syntax into
-    // javascript form.  Similar to translateRegex, but additionally fixes back references
-    // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'.
-    var charUnescapes = {'\\n': '\n', '\\r': '\r', '\\t': '\t'};
-    function translateRegexReplace(str) {
-      var escapeNextChar = false;
-      var out = [];
-      for (var i = -1; i < str.length; i++) {
-        var c = str.charAt(i) || '';
-        var n = str.charAt(i+1) || '';
-        if (charUnescapes[c + n]) {
-          out.push(charUnescapes[c+n]);
-          i++;
-        } else if (escapeNextChar) {
-          // At any point in the loop, escapeNextChar is true if the previous
-          // character was a '\' and was not escaped.
-          out.push(c);
-          escapeNextChar = false;
-        } else {
-          if (c === '\\') {
-            escapeNextChar = true;
-            if ((isNumber(n) || n === '$')) {
-              out.push('$');
-            } else if (n !== '/' && n !== '\\') {
-              out.push('\\');
-            }
-          } else {
-            if (c === '$') {
-              out.push('$');
-            }
-            out.push(c);
-            if (n === '/') {
-              out.push('\\');
-            }
-          }
-        }
-      }
-      return out.join('');
-    }
-
-    // Unescape \ and / in the replace part, for PCRE mode.
-    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t', '\\&':'&'};
-    function unescapeRegexReplace(str) {
-      var stream = new CodeMirror.StringStream(str);
-      var output = [];
-      while (!stream.eol()) {
-        // Search for \.
-        while (stream.peek() && stream.peek() != '\\') {
-          output.push(stream.next());
-        }
-        var matched = false;
-        for (var matcher in unescapes) {
-          if (stream.match(matcher, true)) {
-            matched = true;
-            output.push(unescapes[matcher]);
-            break;
-          }
-        }
-        if (!matched) {
-          // Don't change anything
-          output.push(stream.next());
-        }
-      }
-      return output.join('');
-    }
-
-    /**
-     * Extract the regular expression from the query and return a Regexp object.
-     * Returns null if the query is blank.
-     * If ignoreCase is passed in, the Regexp object will have the 'i' flag set.
-     * If smartCase is passed in, and the query contains upper case letters,
-     *   then ignoreCase is overridden, and the 'i' flag will not be set.
-     * If the query contains the /i in the flag part of the regular expression,
-     *   then both ignoreCase and smartCase are ignored, and 'i' will be passed
-     *   through to the Regex object.
-     */
-    function parseQuery(query, ignoreCase, smartCase) {
-      // First update the last search register
-      var lastSearchRegister = vimGlobalState.registerController.getRegister('/');
-      lastSearchRegister.setText(query);
-      // Check if the query is already a regex.
-      if (query instanceof RegExp) { return query; }
-      // First try to extract regex + flags from the input. If no flags found,
-      // extract just the regex. IE does not accept flags directly defined in
-      // the regex string in the form /regex/flags
-      var slashes = findUnescapedSlashes(query);
-      var regexPart;
-      var forceIgnoreCase;
-      if (!slashes.length) {
-        // Query looks like 'regexp'
-        regexPart = query;
-      } else {
-        // Query looks like 'regexp/...'
-        regexPart = query.substring(0, slashes[0]);
-        var flagsPart = query.substring(slashes[0]);
-        forceIgnoreCase = (flagsPart.indexOf('i') != -1);
-      }
-      if (!regexPart) {
-        return null;
-      }
-      if (!getOption('pcre')) {
-        regexPart = translateRegex(regexPart);
-      }
-      if (smartCase) {
-        ignoreCase = (/^[^A-Z]*$/).test(regexPart);
-      }
-      var regexp = new RegExp(regexPart,
-          (ignoreCase || forceIgnoreCase) ? 'im' : 'm');
-      return regexp;
-    }
-
-    /**
-     * dom - Document Object Manipulator
-     * Usage:
-     *   dom('<tag>'|<node>[, ...{<attributes>|<$styles>}|<child-node>|'<text>'])
-     * Examples:
-     *   dom('div', {id:'xyz'}, dom('p', 'CM rocks!', {$color:'red'}))
-     *   dom(document.head, dom('script', 'alert("hello!")'))
-     * Not supported:
-     *   dom('p', ['arrays are objects'], Error('objects specify attributes'))
-     */
-    function dom(n) {
-      if (typeof n === 'string') n = document.createElement(n);
-      for (var a, i = 1; i < arguments.length; i++) {
-        if (!(a = arguments[i])) continue;
-        if (typeof a !== 'object') a = document.createTextNode(a);
-        if (a.nodeType) n.appendChild(a);
-        else for (var key in a) {
-          if (!Object.prototype.hasOwnProperty.call(a, key)) continue;
-          if (key[0] === '$') n.style[key.slice(1)] = a[key];
-          else n.setAttribute(key, a[key]);
-        }
-      }
-      return n;
-    }
-
-    function showConfirm(cm, template) {
-      var pre = dom('pre', {$color: 'red', class: 'cm-vim-message'}, template);
-      if (cm.openNotification) {
-        cm.openNotification(pre, {bottom: true, duration: 5000});
-      } else {
-        alert(pre.innerText);
-      }
-    }
-
-    function makePrompt(prefix, desc) {
-      return dom(document.createDocumentFragment(),
-               dom('span', {$fontFamily: 'monospace', $whiteSpace: 'pre'},
-                 prefix,
-                 dom('input', {type: 'text', autocorrect: 'off',
-                               autocapitalize: 'off', spellcheck: 'false'})),
-               desc && dom('span', {$color: '#888'}, desc));
-    }
-
-    function showPrompt(cm, options) {
-      var template = makePrompt(options.prefix, options.desc);
-      if (cm.openDialog) {
-        cm.openDialog(template, options.onClose, {
-          onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
-          bottom: true, selectValueOnOpen: false, value: options.value
-        });
-      }
-      else {
-        var shortText = '';
-        if (typeof options.prefix != "string" && options.prefix) shortText += options.prefix.textContent;
-        if (options.desc) shortText += " " + options.desc;
-        options.onClose(prompt(shortText, ''));
-      }
-    }
-
-    function regexEqual(r1, r2) {
-      if (r1 instanceof RegExp && r2 instanceof RegExp) {
-          var props = ['global', 'multiline', 'ignoreCase', 'source'];
-          for (var i = 0; i < props.length; i++) {
-              var prop = props[i];
-              if (r1[prop] !== r2[prop]) {
-                  return false;
-              }
-          }
-          return true;
-      }
-      return false;
-    }
-    // Returns true if the query is valid.
-    function updateSearchQuery(cm, rawQuery, ignoreCase, smartCase) {
-      if (!rawQuery) {
-        return;
-      }
-      var state = getSearchState(cm);
-      var query = parseQuery(rawQuery, !!ignoreCase, !!smartCase);
-      if (!query) {
-        return;
-      }
-      highlightSearchMatches(cm, query);
-      if (regexEqual(query, state.getQuery())) {
-        return query;
-      }
-      state.setQuery(query);
-      return query;
-    }
-    function searchOverlay(query) {
-      if (query.source.charAt(0) == '^') {
-        var matchSol = true;
-      }
-      return {
-        token: function(stream) {
-          if (matchSol && !stream.sol()) {
-            stream.skipToEnd();
-            return;
-          }
-          var match = stream.match(query, false);
-          if (match) {
-            if (match[0].length == 0) {
-              // Matched empty string, skip to next.
-              stream.next();
-              return 'searching';
-            }
-            if (!stream.sol()) {
-              // Backtrack 1 to match \b
-              stream.backUp(1);
-              if (!query.exec(stream.next() + match[0])) {
-                stream.next();
-                return null;
-              }
-            }
-            stream.match(query);
-            return 'searching';
-          }
-          while (!stream.eol()) {
-            stream.next();
-            if (stream.match(query, false)) break;
-          }
-        },
-        query: query
-      };
-    }
-    var highlightTimeout = 0;
-    function highlightSearchMatches(cm, query) {
-      clearTimeout(highlightTimeout);
-      highlightTimeout = setTimeout(function() {
-        if (!cm.state.vim) return;
-        var searchState = getSearchState(cm);
-        var overlay = searchState.getOverlay();
-        if (!overlay || query != overlay.query) {
-          if (overlay) {
-            cm.removeOverlay(overlay);
-          }
-          overlay = searchOverlay(query);
-          cm.addOverlay(overlay);
-          if (cm.showMatchesOnScrollbar) {
-            if (searchState.getScrollbarAnnotate()) {
-              searchState.getScrollbarAnnotate().clear();
-            }
-            searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
-          }
-          searchState.setOverlay(overlay);
-        }
-      }, 50);
-    }
-    function findNext(cm, prev, query, repeat) {
-      if (repeat === undefined) { repeat = 1; }
-      return cm.operation(function() {
-        var pos = cm.getCursor();
-        var cursor = cm.getSearchCursor(query, pos);
-        for (var i = 0; i < repeat; i++) {
-          var found = cursor.find(prev);
-          if (i == 0 && found && cursorEqual(cursor.from(), pos)) {
-            var lastEndPos = prev ? cursor.from() : cursor.to();
-            found = cursor.find(prev);
-            if (found && !found[0] && cursorEqual(cursor.from(), lastEndPos)) {
-              if (cm.getLine(lastEndPos.line).length == lastEndPos.ch)
-                found = cursor.find(prev);
-            }
-          }
-          if (!found) {
-            // SearchCursor may have returned null because it hit EOF, wrap
-            // around and try again.
-            cursor = cm.getSearchCursor(query,
-                (prev) ? new Pos(cm.lastLine()) : new Pos(cm.firstLine(), 0) );
-            if (!cursor.find(prev)) {
-              return;
-            }
-          }
-        }
-        return cursor.from();
-      });
-    }
-    /**
-     * Pretty much the same as `findNext`, except for the following differences:
-     *
-     * 1. Before starting the search, move to the previous search. This way if our cursor is
-     * already inside a match, we should return the current match.
-     * 2. Rather than only returning the cursor's from, we return the cursor's from and to as a tuple.
-     */
-    function findNextFromAndToInclusive(cm, prev, query, repeat, vim) {
-      if (repeat === undefined) { repeat = 1; }
-      return cm.operation(function() {
-        var pos = cm.getCursor();
-        var cursor = cm.getSearchCursor(query, pos);
-
-        // Go back one result to ensure that if the cursor is currently a match, we keep it.
-        var found = cursor.find(!prev);
-
-        // If we haven't moved, go back one more (similar to if i==0 logic in findNext).
-        if (!vim.visualMode && found && cursorEqual(cursor.from(), pos)) {
-          cursor.find(!prev);
-        }
-
-        for (var i = 0; i < repeat; i++) {
-          found = cursor.find(prev);
-          if (!found) {
-            // SearchCursor may have returned null because it hit EOF, wrap
-            // around and try again.
-            cursor = cm.getSearchCursor(query,
-                (prev) ? new Pos(cm.lastLine()) : new Pos(cm.firstLine(), 0) );
-            if (!cursor.find(prev)) {
-              return;
-            }
-          }
-        }
-        return [cursor.from(), cursor.to()];
-      });
-    }
-    function clearSearchHighlight(cm) {
-      var state = getSearchState(cm);
-      cm.removeOverlay(getSearchState(cm).getOverlay());
-      state.setOverlay(null);
-      if (state.getScrollbarAnnotate()) {
-        state.getScrollbarAnnotate().clear();
-        state.setScrollbarAnnotate(null);
-      }
-    }
-    /**
-     * Check if pos is in the specified range, INCLUSIVE.
-     * Range can be specified with 1 or 2 arguments.
-     * If the first range argument is an array, treat it as an array of line
-     * numbers. Match pos against any of the lines.
-     * If the first range argument is a number,
-     *   if there is only 1 range argument, check if pos has the same line
-     *       number
-     *   if there are 2 range arguments, then check if pos is in between the two
-     *       range arguments.
-     */
-    function isInRange(pos, start, end) {
-      if (typeof pos != 'number') {
-        // Assume it is a cursor position. Get the line number.
-        pos = pos.line;
-      }
-      if (start instanceof Array) {
-        return inArray(pos, start);
-      } else {
-        if (typeof end == 'number') {
-          return (pos >= start && pos <= end);
-        } else {
-          return pos == start;
-        }
-      }
-    }
-    function getUserVisibleLines(cm) {
-      var scrollInfo = cm.getScrollInfo();
-      var occludeToleranceTop = 6;
-      var occludeToleranceBottom = 10;
-      var from = cm.coordsChar({left:0, top: occludeToleranceTop + scrollInfo.top}, 'local');
-      var bottomY = scrollInfo.clientHeight - occludeToleranceBottom + scrollInfo.top;
-      var to = cm.coordsChar({left:0, top: bottomY}, 'local');
-      return {top: from.line, bottom: to.line};
-    }
-
-    function getMarkPos(cm, vim, markName) {
-      if (markName == '\'' || markName == '`') {
-        return vimGlobalState.jumpList.find(cm, -1) || new Pos(0, 0);
-      } else if (markName == '.') {
-        return getLastEditPos(cm);
-      }
-
-      var mark = vim.marks[markName];
-      return mark && mark.find();
-    }
-
-    function getLastEditPos(cm) {
-      var done = cm.doc.history.done;
-      for (var i = done.length; i--;) {
-        if (done[i].changes) {
-          return copyCursor(done[i].changes[0].to);
-        }
-      }
-    }
-
-    var ExCommandDispatcher = function() {
-      this.buildCommandMap_();
-    };
-    ExCommandDispatcher.prototype = {
-      processCommand: function(cm, input, opt_params) {
-        var that = this;
-        cm.operation(function () {
-          cm.curOp.isVimOp = true;
-          that._processCommand(cm, input, opt_params);
-        });
-      },
-      _processCommand: function(cm, input, opt_params) {
-        var vim = cm.state.vim;
-        var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
-        var previousCommand = commandHistoryRegister.toString();
-        if (vim.visualMode) {
-          exitVisualMode(cm);
-        }
-        var inputStream = new CodeMirror.StringStream(input);
-        // update ": with the latest command whether valid or invalid
-        commandHistoryRegister.setText(input);
-        var params = opt_params || {};
-        params.input = input;
-        try {
-          this.parseInput_(cm, inputStream, params);
-        } catch(e) {
-          showConfirm(cm, e.toString());
-          throw e;
-        }
-        var command;
-        var commandName;
-        if (!params.commandName) {
-          // If only a line range is defined, move to the line.
-          if (params.line !== undefined) {
-            commandName = 'move';
-          }
-        } else {
-          command = this.matchCommand_(params.commandName);
-          if (command) {
-            commandName = command.name;
-            if (command.excludeFromCommandHistory) {
-              commandHistoryRegister.setText(previousCommand);
-            }
-            this.parseCommandArgs_(inputStream, params, command);
-            if (command.type == 'exToKey') {
-              // Handle Ex to Key mapping.
-              for (var i = 0; i < command.toKeys.length; i++) {
-                vimApi.handleKey(cm, command.toKeys[i], 'mapping');
-              }
-              return;
-            } else if (command.type == 'exToEx') {
-              // Handle Ex to Ex mapping.
-              this.processCommand(cm, command.toInput);
-              return;
-            }
-          }
-        }
-        if (!commandName) {
-          showConfirm(cm, 'Not an editor command ":' + input + '"');
-          return;
-        }
-        try {
-          exCommands[commandName](cm, params);
-          // Possibly asynchronous commands (e.g. substitute, which might have a
-          // user confirmation), are responsible for calling the callback when
-          // done. All others have it taken care of for them here.
-          if ((!command || !command.possiblyAsync) && params.callback) {
-            params.callback();
-          }
-        } catch(e) {
-          showConfirm(cm, e.toString());
-          throw e;
-        }
-      },
-      parseInput_: function(cm, inputStream, result) {
-        inputStream.eatWhile(':');
-        // Parse range.
-        if (inputStream.eat('%')) {
-          result.line = cm.firstLine();
-          result.lineEnd = cm.lastLine();
-        } else {
-          result.line = this.parseLineSpec_(cm, inputStream);
-          if (result.line !== undefined && inputStream.eat(',')) {
-            result.lineEnd = this.parseLineSpec_(cm, inputStream);
-          }
-        }
-
-        // Parse command name.
-        var commandMatch = inputStream.match(/^(\w+|!!|@@|[!#&*<=>@~])/);
-        if (commandMatch) {
-          result.commandName = commandMatch[1];
-        } else {
-          result.commandName = inputStream.match(/.*/)[0];
-        }
-
-        return result;
-      },
-      parseLineSpec_: function(cm, inputStream) {
-        var numberMatch = inputStream.match(/^(\d+)/);
-        if (numberMatch) {
-          // Absolute line number plus offset (N+M or N-M) is probably a typo,
-          // not something the user actually wanted. (NB: vim does allow this.)
-          return parseInt(numberMatch[1], 10) - 1;
-        }
-        switch (inputStream.next()) {
-          case '.':
-            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
-          case '$':
-            return this.parseLineSpecOffset_(inputStream, cm.lastLine());
-          case '\'':
-            var markName = inputStream.next();
-            var markPos = getMarkPos(cm, cm.state.vim, markName);
-            if (!markPos) throw new Error('Mark not set');
-            return this.parseLineSpecOffset_(inputStream, markPos.line);
-          case '-':
-          case '+':
-            inputStream.backUp(1);
-            // Offset is relative to current line if not otherwise specified.
-            return this.parseLineSpecOffset_(inputStream, cm.getCursor().line);
-          default:
-            inputStream.backUp(1);
-            return undefined;
-        }
-      },
-      parseLineSpecOffset_: function(inputStream, line) {
-        var offsetMatch = inputStream.match(/^([+-])?(\d+)/);
-        if (offsetMatch) {
-          var offset = parseInt(offsetMatch[2], 10);
-          if (offsetMatch[1] == "-") {
-            line -= offset;
-          } else {
-            line += offset;
-          }
-        }
-        return line;
-      },
-      parseCommandArgs_: function(inputStream, params, command) {
-        if (inputStream.eol()) {
-          return;
-        }
-        params.argString = inputStream.match(/.*/)[0];
-        // Parse command-line arguments
-        var delim = command.argDelimiter || /\s+/;
-        var args = trim(params.argString).split(delim);
-        if (args.length && args[0]) {
-          params.args = args;
-        }
-      },
-      matchCommand_: function(commandName) {
-        // Return the command in the command map that matches the shortest
-        // prefix of the passed in command name. The match is guaranteed to be
-        // unambiguous if the defaultExCommandMap's shortNames are set up
-        // correctly. (see @code{defaultExCommandMap}).
-        for (var i = commandName.length; i > 0; i--) {
-          var prefix = commandName.substring(0, i);
-          if (this.commandMap_[prefix]) {
-            var command = this.commandMap_[prefix];
-            if (command.name.indexOf(commandName) === 0) {
-              return command;
-            }
-          }
-        }
-        return null;
-      },
-      buildCommandMap_: function() {
-        this.commandMap_ = {};
-        for (var i = 0; i < defaultExCommandMap.length; i++) {
-          var command = defaultExCommandMap[i];
-          var key = command.shortName || command.name;
-          this.commandMap_[key] = command;
-        }
-      },
-      map: function(lhs, rhs, ctx) {
-        if (lhs != ':' && lhs.charAt(0) == ':') {
-          if (ctx) { throw Error('Mode not supported for ex mappings'); }
-          var commandName = lhs.substring(1);
-          if (rhs != ':' && rhs.charAt(0) == ':') {
-            // Ex to Ex mapping
-            this.commandMap_[commandName] = {
-              name: commandName,
-              type: 'exToEx',
-              toInput: rhs.substring(1),
-              user: true
-            };
-          } else {
-            // Ex to key mapping
-            this.commandMap_[commandName] = {
-              name: commandName,
-              type: 'exToKey',
-              toKeys: rhs,
-              user: true
-            };
-          }
-        } else {
-          if (rhs != ':' && rhs.charAt(0) == ':') {
-            // Key to Ex mapping.
-            var mapping = {
-              keys: lhs,
-              type: 'keyToEx',
-              exArgs: { input: rhs.substring(1) }
-            };
-            if (ctx) { mapping.context = ctx; }
-            defaultKeymap.unshift(mapping);
-          } else {
-            // Key to key mapping
-            var mapping = {
-              keys: lhs,
-              type: 'keyToKey',
-              toKeys: rhs
-            };
-            if (ctx) { mapping.context = ctx; }
-            defaultKeymap.unshift(mapping);
-          }
-        }
-      },
-      unmap: function(lhs, ctx) {
-        if (lhs != ':' && lhs.charAt(0) == ':') {
-          // Ex to Ex or Ex to key mapping
-          if (ctx) { throw Error('Mode not supported for ex mappings'); }
-          var commandName = lhs.substring(1);
-          if (this.commandMap_[commandName] && this.commandMap_[commandName].user) {
-            delete this.commandMap_[commandName];
-            return true;
-          }
-        } else {
-          // Key to Ex or key to key mapping
-          var keys = lhs;
-          for (var i = 0; i < defaultKeymap.length; i++) {
-            if (keys == defaultKeymap[i].keys
-                && defaultKeymap[i].context === ctx) {
-              defaultKeymap.splice(i, 1);
-              return true;
-            }
-          }
-        }
-      }
-    };
-
-    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) {
-          if (cm) {
-            showConfirm(cm, 'Invalid mapping: ' + params.input);
-          }
-          return;
-        }
-        exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
-      },
-      imap: function(cm, params) { this.map(cm, params, 'insert'); },
-      nmap: function(cm, params) { this.map(cm, params, 'normal'); },
-      vmap: function(cm, params) { this.map(cm, params, 'visual'); },
-      unmap: function(cm, params, ctx) {
-        var mapArgs = params.args;
-        if (!mapArgs || mapArgs.length < 1 || !exCommandDispatcher.unmap(mapArgs[0], ctx)) {
-          if (cm) {
-            showConfirm(cm, 'No such mapping: ' + params.input);
-          }
-        }
-      },
-      move: function(cm, params) {
-        commandDispatcher.processCommand(cm, cm.state.vim, {
-            type: 'motion',
-            motion: 'moveToLineOrEdgeOfDocument',
-            motionArgs: { forward: false, explicitRepeat: true,
-              linewise: true },
-            repeatOverride: params.line+1});
-      },
-      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);
-          }
-          return;
-        }
-        var expr = setArgs[0].split('=');
-        var optionName = expr[0];
-        var value = expr[1];
-        var forceGet = false;
-
-        if (optionName.charAt(optionName.length - 1) == '?') {
-          // If post-fixed with ?, then the set is actually a get.
-          if (value) { throw Error('Trailing characters: ' + params.argString); }
-          optionName = optionName.substring(0, optionName.length - 1);
-          forceGet = true;
-        }
-        if (value === undefined && optionName.substring(0, 2) == 'no') {
-          // To set boolean options to false, the option name is prefixed with
-          // 'no'.
-          optionName = optionName.substring(2);
-          value = false;
-        }
-
-        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 no value is provided, then we assume this is a get.
-        if (!optionIsBoolean && value === undefined || forceGet) {
-          var oldValue = getOption(optionName, cm, setCfg);
-          if (oldValue instanceof Error) {
-            showConfirm(cm, oldValue.message);
-          } else if (oldValue === true || oldValue === false) {
-            showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
-          } else {
-            showConfirm(cm, '  ' + optionName + '=' + oldValue);
-          }
-        } else {
-          var setOptionReturn = setOption(optionName, value, cm, setCfg);
-          if (setOptionReturn instanceof Error) {
-            showConfirm(cm, setOptionReturn.message);
-          }
-        }
-      },
-      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----------\n\n';
-        if (!regArgs) {
-          for (var registerName in registers) {
-            var text = registers[registerName].toString();
-            if (text.length) {
-              regInfo += '"' + registerName + '    ' + text + '\n'
-            }
-          }
-        } else {
-          var registerName;
-          regArgs = regArgs.join('');
-          for (var i = 0; i < regArgs.length; i++) {
-            registerName = regArgs.charAt(i);
-            if (!vimGlobalState.registerController.isValidRegister(registerName)) {
-              continue;
-            }
-            var register = registers[registerName] || new Register();
-            regInfo += '"' + registerName + '    ' + register.toString() + '\n'
-          }
-        }
-        showConfirm(cm, regInfo);
-      },
-      sort: function(cm, params) {
-        var reverse, ignoreCase, unique, number, pattern;
-        function parseArgs() {
-          if (params.argString) {
-            var args = new CodeMirror.StringStream(params.argString);
-            if (args.eat('!')) { reverse = true; }
-            if (args.eol()) { return; }
-            if (!args.eatSpace()) { return 'Invalid arguments'; }
-            var opts = args.match(/([dinuox]+)?\s*(\/.+\/)?\s*/);
-            if (!opts && !args.eol()) { return 'Invalid arguments'; }
-            if (opts[1]) {
-              ignoreCase = opts[1].indexOf('i') != -1;
-              unique = opts[1].indexOf('u') != -1;
-              var decimal = opts[1].indexOf('d') != -1 || opts[1].indexOf('n') != -1 && 1;
-              var hex = opts[1].indexOf('x') != -1 && 1;
-              var octal = opts[1].indexOf('o') != -1 && 1;
-              if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
-              number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
-            }
-            if (opts[2]) {
-              pattern = new RegExp(opts[2].substr(1, opts[2].length - 2), ignoreCase ? 'i' : '');
-            }
-          }
-        }
-        var err = parseArgs();
-        if (err) {
-          showConfirm(cm, err + ': ' + params.argString);
-          return;
-        }
-        var lineStart = params.line || cm.firstLine();
-        var lineEnd = params.lineEnd || params.line || cm.lastLine();
-        if (lineStart == lineEnd) { return; }
-        var curStart = new Pos(lineStart, 0);
-        var curEnd = new Pos(lineEnd, lineLength(cm, lineEnd));
-        var text = cm.getRange(curStart, curEnd).split('\n');
-        var numberRegex = pattern ? pattern :
-           (number == 'decimal') ? /(-?)([\d]+)/ :
-           (number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i :
-           (number == 'octal') ? /([0-7]+)/ : null;
-        var radix = (number == 'decimal') ? 10 : (number == 'hex') ? 16 : (number == 'octal') ? 8 : null;
-        var numPart = [], textPart = [];
-        if (number || pattern) {
-          for (var i = 0; i < text.length; i++) {
-            var matchPart = pattern ? text[i].match(pattern) : null;
-            if (matchPart && matchPart[0] != '') {
-              numPart.push(matchPart);
-            } else if (!pattern && numberRegex.exec(text[i])) {
-              numPart.push(text[i]);
-            } else {
-              textPart.push(text[i]);
-            }
-          }
-        } else {
-          textPart = text;
-        }
-        function compareFn(a, b) {
-          if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
-          if (ignoreCase) { a = a.toLowerCase(); b = b.toLowerCase(); }
-          var anum = number && numberRegex.exec(a);
-          var bnum = number && numberRegex.exec(b);
-          if (!anum) { return a < b ? -1 : 1; }
-          anum = parseInt((anum[1] + anum[2]).toLowerCase(), radix);
-          bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix);
-          return anum - bnum;
-        }
-        function comparePatternFn(a, b) {
-          if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
-          if (ignoreCase) { a[0] = a[0].toLowerCase(); b[0] = b[0].toLowerCase(); }
-          return (a[0] < b[0]) ? -1 : 1;
-        }
-        numPart.sort(pattern ? comparePatternFn : compareFn);
-        if (pattern) {
-          for (var i = 0; i < numPart.length; i++) {
-            numPart[i] = numPart[i].input;
-          }
-        } else if (!number) { textPart.sort(compareFn); }
-        text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart);
-        if (unique) { // Remove duplicate lines
-          var textOld = text;
-          var lastLine;
-          text = [];
-          for (var i = 0; i < textOld.length; i++) {
-            if (textOld[i] != lastLine) {
-              text.push(textOld[i]);
-            }
-            lastLine = textOld[i];
-          }
-        }
-        cm.replaceRange(text.join('\n'), curStart, curEnd);
-      },
-      vglobal: function(cm, params) {
-        // global inspects params.commandName
-        this.global(cm, params);
-      },
-      global: function(cm, params) {
-        // a global command is of the form
-        // :[range]g/pattern/[cmd]
-        // argString holds the string /pattern/[cmd]
-        var argString = params.argString;
-        if (!argString) {
-          showConfirm(cm, 'Regular Expression missing from global');
-          return;
-        }
-        var inverted = params.commandName[0] === 'v';
-        // range is specified here
-        var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
-        var lineEnd = params.lineEnd || params.line || cm.lastLine();
-        // get the tokens from argString
-        var tokens = splitBySlash(argString);
-        var regexPart = argString, cmd;
-        if (tokens.length) {
-          regexPart = tokens[0];
-          cmd = tokens.slice(1, tokens.length).join('/');
-        }
-        if (regexPart) {
-          // If regex part is empty, then use the previous query. Otherwise
-          // use the regex part as the new query.
-          try {
-           updateSearchQuery(cm, regexPart, true /** ignoreCase */,
-             true /** smartCase */);
-          } catch (e) {
-           showConfirm(cm, 'Invalid regex: ' + regexPart);
-           return;
-          }
-        }
-        // now that we have the regexPart, search for regex matches in the
-        // specified range of lines
-        var query = getSearchState(cm).getQuery();
-        var matchedLines = [];
-        for (var i = lineStart; i <= lineEnd; i++) {
-          var line = cm.getLineHandle(i);
-          var matched = query.test(line.text);
-          if (matched !== inverted) {
-            matchedLines.push(cmd ? line : line.text);
-          }
-        }
-        // if there is no [cmd], just display the list of matched lines
-        if (!cmd) {
-          showConfirm(cm, matchedLines.join('\n'));
-          return;
-        }
-        var index = 0;
-        var nextCommand = function() {
-          if (index < matchedLines.length) {
-            var line = matchedLines[index++];
-            var lineNum = cm.getLineNumber(line);
-            if (lineNum == null) {
-              nextCommand();
-              return;
-            }
-            var command = (lineNum + 1) + cmd;
-            exCommandDispatcher.processCommand(cm, command, {
-              callback: nextCommand
-            });
-          }
-        };
-        nextCommand();
-      },
-      substitute: function(cm, params) {
-        if (!cm.getSearchCursor) {
-          throw new Error('Search feature not available. Requires searchcursor.js or ' +
-              'any other getSearchCursor implementation.');
-        }
-        var argString = params.argString;
-        var tokens = argString ? splitBySeparator(argString, argString[0]) : [];
-        var regexPart, replacePart = '', trailing, flagsPart, count;
-        var confirm = false; // Whether to confirm each replace.
-        var global = false; // True to replace all instances on a line, false to replace only 1.
-        if (tokens.length) {
-          regexPart = tokens[0];
-          if (getOption('pcre') && regexPart !== '') {
-              regexPart = new RegExp(regexPart).source; //normalize not escaped characters
-          }
-          replacePart = tokens[1];
-          if (replacePart !== undefined) {
-            if (getOption('pcre')) {
-              replacePart = unescapeRegexReplace(replacePart.replace(/([^\\])&/g,"$1$$&"));
-            } else {
-              replacePart = translateRegexReplace(replacePart);
-            }
-            vimGlobalState.lastSubstituteReplacePart = replacePart;
-          }
-          trailing = tokens[2] ? tokens[2].split(' ') : [];
-        } else {
-          // either the argString is empty or its of the form ' hello/world'
-          // actually splitBySlash returns a list of tokens
-          // only if the string starts with a '/'
-          if (argString && argString.length) {
-            showConfirm(cm, 'Substitutions should be of the form ' +
-                ':s/pattern/replace/');
-            return;
-          }
-        }
-        // After the 3rd slash, we can have flags followed by a space followed
-        // by count.
-        if (trailing) {
-          flagsPart = trailing[0];
-          count = parseInt(trailing[1]);
-          if (flagsPart) {
-            if (flagsPart.indexOf('c') != -1) {
-              confirm = true;
-            }
-            if (flagsPart.indexOf('g') != -1) {
-              global = true;
-            }
-            if (getOption('pcre')) {
-               regexPart = regexPart + '/' + flagsPart;
-            } else {
-               regexPart = regexPart.replace(/\//g, "\\/") + '/' + flagsPart;
-            }
-          }
-        }
-        if (regexPart) {
-          // If regex part is empty, then use the previous query. Otherwise use
-          // the regex part as the new query.
-          try {
-            updateSearchQuery(cm, regexPart, true /** ignoreCase */,
-              true /** smartCase */);
-          } catch (e) {
-            showConfirm(cm, 'Invalid regex: ' + regexPart);
-            return;
-          }
-        }
-        replacePart = replacePart || vimGlobalState.lastSubstituteReplacePart;
-        if (replacePart === undefined) {
-          showConfirm(cm, 'No previous substitute regular expression');
-          return;
-        }
-        var state = getSearchState(cm);
-        var query = state.getQuery();
-        var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
-        var lineEnd = params.lineEnd || lineStart;
-        if (lineStart == cm.firstLine() && lineEnd == cm.lastLine()) {
-          lineEnd = Infinity;
-        }
-        if (count) {
-          lineStart = lineEnd;
-          lineEnd = lineStart + count - 1;
-        }
-        var startPos = clipCursorToContent(cm, new Pos(lineStart, 0));
-        var cursor = cm.getSearchCursor(query, startPos);
-        doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback);
-      },
-      redo: CodeMirror.commands.redo,
-      undo: CodeMirror.commands.undo,
-      write: function(cm) {
-        if (CodeMirror.commands.save) {
-          // If a save command is defined, call it.
-          CodeMirror.commands.save(cm);
-        } else if (cm.save) {
-          // Saves to text area if no save command is defined and cm.save() is available.
-          cm.save();
-        }
-      },
-      nohlsearch: function(cm) {
-        clearSearchHighlight(cm);
-      },
-      yank: function (cm) {
-        var cur = copyCursor(cm.getCursor());
-        var line = cur.line;
-        var lineText = cm.getLine(line);
-        vimGlobalState.registerController.pushText(
-          '0', 'yank', lineText, true, true);
-      },
-      delmarks: function(cm, params) {
-        if (!params.argString || !trim(params.argString)) {
-          showConfirm(cm, 'Argument required');
-          return;
-        }
-
-        var state = cm.state.vim;
-        var stream = new CodeMirror.StringStream(trim(params.argString));
-        while (!stream.eol()) {
-          stream.eatSpace();
-
-          // Record the streams position at the beginning of the loop for use
-          // in error messages.
-          var count = stream.pos;
-
-          if (!stream.match(/[a-zA-Z]/, false)) {
-            showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
-            return;
-          }
-
-          var sym = stream.next();
-          // Check if this symbol is part of a range
-          if (stream.match('-', true)) {
-            // This symbol is part of a range.
-
-            // The range must terminate at an alphabetic character.
-            if (!stream.match(/[a-zA-Z]/, false)) {
-              showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
-              return;
-            }
-
-            var startMark = sym;
-            var finishMark = stream.next();
-            // The range must terminate at an alphabetic character which
-            // shares the same case as the start of the range.
-            if (isLowerCase(startMark) && isLowerCase(finishMark) ||
-                isUpperCase(startMark) && isUpperCase(finishMark)) {
-              var start = startMark.charCodeAt(0);
-              var finish = finishMark.charCodeAt(0);
-              if (start >= finish) {
-                showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
-                return;
-              }
-
-              // Because marks are always ASCII values, and we have
-              // determined that they are the same case, we can use
-              // their char codes to iterate through the defined range.
-              for (var j = 0; j <= finish - start; j++) {
-                var mark = String.fromCharCode(start + j);
-                delete state.marks[mark];
-              }
-            } else {
-              showConfirm(cm, 'Invalid argument: ' + startMark + '-');
-              return;
-            }
-          } else {
-            // This symbol is a valid mark, and is not part of a range.
-            delete state.marks[sym];
-          }
-        }
-      }
-    };
-
-    var exCommandDispatcher = new ExCommandDispatcher();
-
-    /**
-    * @param {CodeMirror} cm CodeMirror instance we are in.
-    * @param {boolean} confirm Whether to confirm each replace.
-    * @param {Cursor} lineStart Line to start replacing from.
-    * @param {Cursor} lineEnd Line to stop replacing at.
-    * @param {RegExp} query Query for performing matches with.
-    * @param {string} replaceWith Text to replace matches with. May contain $1,
-    *     $2, etc for replacing captured groups using JavaScript replace.
-    * @param {function()} callback A callback for when the replace is done.
-    */
-    function doReplace(cm, confirm, global, lineStart, lineEnd, searchCursor, query,
-        replaceWith, callback) {
-      // Set up all the functions.
-      cm.state.vim.exMode = true;
-      var done = false;
-      var lastPos, modifiedLineNumber, joined;
-      function replaceAll() {
-        cm.operation(function() {
-          while (!done) {
-            replace();
-            next();
-          }
-          stop();
-        });
-      }
-      function replace() {
-        var text = cm.getRange(searchCursor.from(), searchCursor.to());
-        var newText = text.replace(query, replaceWith);
-        var unmodifiedLineNumber = searchCursor.to().line;
-        searchCursor.replace(newText);
-        modifiedLineNumber = searchCursor.to().line;
-        lineEnd += modifiedLineNumber - unmodifiedLineNumber;
-        joined = modifiedLineNumber < unmodifiedLineNumber;
-      }
-      function findNextValidMatch() {
-        var lastMatchTo = lastPos && copyCursor(searchCursor.to());
-        var match = searchCursor.findNext();
-        if (match && !match[0] && lastMatchTo && cursorEqual(searchCursor.from(), lastMatchTo)) {
-          match = searchCursor.findNext();
-        }
-        return match;
-      }
-      function next() {
-        // The below only loops to skip over multiple occurrences on the same
-        // line when 'global' is not true.
-        while(findNextValidMatch() &&
-              isInRange(searchCursor.from(), lineStart, lineEnd)) {
-          if (!global && searchCursor.from().line == modifiedLineNumber && !joined) {
-            continue;
-          }
-          cm.scrollIntoView(searchCursor.from(), 30);
-          cm.setSelection(searchCursor.from(), searchCursor.to());
-          lastPos = searchCursor.from();
-          done = false;
-          return;
-        }
-        done = true;
-      }
-      function stop(close) {
-        if (close) { close(); }
-        cm.focus();
-        if (lastPos) {
-          cm.setCursor(lastPos);
-          var vim = cm.state.vim;
-          vim.exMode = false;
-          vim.lastHPos = vim.lastHSPos = lastPos.ch;
-        }
-        if (callback) { callback(); }
-      }
-      function onPromptKeyDown(e, _value, close) {
-        // Swallow all keys.
-        CodeMirror.e_stop(e);
-        var keyName = CodeMirror.keyName(e);
-        switch (keyName) {
-          case 'Y':
-            replace(); next(); break;
-          case 'N':
-            next(); break;
-          case 'A':
-            // replaceAll contains a call to close of its own. We don't want it
-            // to fire too early or multiple times.
-            var savedCallback = callback;
-            callback = undefined;
-            cm.operation(replaceAll);
-            callback = savedCallback;
-            break;
-          case 'L':
-            replace();
-            // fall through and exit.
-          case 'Q':
-          case 'Esc':
-          case 'Ctrl-C':
-          case 'Ctrl-[':
-            stop(close);
-            break;
-        }
-        if (done) { stop(close); }
-        return true;
-      }
-
-      // Actually do replace.
-      next();
-      if (done) {
-        showConfirm(cm, 'No matches for ' + query.source);
-        return;
-      }
-      if (!confirm) {
-        replaceAll();
-        if (callback) { callback(); }
-        return;
-      }
-      showPrompt(cm, {
-        prefix: dom('span', 'replace with ', dom('strong', replaceWith), ' (y/n/a/q/l)'),
-        onKeyDown: onPromptKeyDown
-      });
-    }
-
-    CodeMirror.keyMap.vim = {
-      attach: attachVimMap,
-      detach: detachVimMap,
-      call: cmKey
-    };
-
-    function exitInsertMode(cm) {
-      var vim = cm.state.vim;
-      var macroModeState = vimGlobalState.macroModeState;
-      var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
-      var isPlaying = macroModeState.isPlaying;
-      var lastChange = macroModeState.lastInsertModeChanges;
-      if (!isPlaying) {
-        cm.off('change', onChange);
-        CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
-      }
-      if (!isPlaying && vim.insertModeRepeat > 1) {
-        // Perform insert mode repeat for commands like 3,a and 3,o.
-        repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
-            true /** repeatForInsert */);
-        vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
-      }
-      delete vim.insertModeRepeat;
-      vim.insertMode = false;
-      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
-      cm.setOption('keyMap', 'vim');
-      cm.setOption('disableInput', true);
-      cm.toggleOverwrite(false); // exit replace mode if we were in it.
-      // update the ". register before exiting insert mode
-      insertModeChangeRegister.setText(lastChange.changes.join(''));
-      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-      if (macroModeState.isRecording) {
-        logInsertModeChange(macroModeState);
-      }
-    }
-
-    function _mapCommand(command) {
-      defaultKeymap.unshift(command);
-    }
-
-    function mapCommand(keys, type, name, args, extra) {
-      var command = {keys: keys, type: type};
-      command[type] = name;
-      command[type + "Args"] = args;
-      for (var key in extra)
-        command[key] = extra[key];
-      _mapCommand(command);
-    }
-
-    // The timeout in milliseconds for the two-character ESC keymap should be
-    // adjusted according to your typing speed to prevent false positives.
-    defineOption('insertModeEscKeysTimeout', 200, 'number');
-
-    CodeMirror.keyMap['vim-insert'] = {
-      // TODO: override navigation keys so that Esc will cancel automatic
-      // indentation from o, O, i_<CR>
-      fallthrough: ['default'],
-      attach: attachVimMap,
-      detach: detachVimMap,
-      call: cmKey
-    };
-
-    CodeMirror.keyMap['vim-replace'] = {
-      'Backspace': 'goCharLeft',
-      fallthrough: ['vim-insert'],
-      attach: attachVimMap,
-      detach: detachVimMap,
-      call: cmKey
-    };
-
-    function executeMacroRegister(cm, vim, macroModeState, registerName) {
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      if (registerName == ':') {
-        // Read-only register containing last Ex command.
-        if (register.keyBuffer[0]) {
-          exCommandDispatcher.processCommand(cm, register.keyBuffer[0]);
-        }
-        macroModeState.isPlaying = false;
-        return;
-      }
-      var keyBuffer = register.keyBuffer;
-      var imc = 0;
-      macroModeState.isPlaying = true;
-      macroModeState.replaySearchQueries = register.searchQueries.slice(0);
-      for (var i = 0; i < keyBuffer.length; i++) {
-        var text = keyBuffer[i];
-        var match, key;
-        while (text) {
-          // Pull off one command key, which is either a single character
-          // or a special sequence wrapped in '<' and '>', e.g. '<Space>'.
-          match = (/<\w+-.+?>|<\w+>|./).exec(text);
-          key = match[0];
-          text = text.substring(match.index + key.length);
-          vimApi.handleKey(cm, key, 'macro');
-          if (vim.insertMode) {
-            var changes = register.insertModeChanges[imc++].changes;
-            vimGlobalState.macroModeState.lastInsertModeChanges.changes =
-                changes;
-            repeatInsertModeChanges(cm, changes, 1);
-            exitInsertMode(cm);
-          }
-        }
-      }
-      macroModeState.isPlaying = false;
-    }
-
-    function logKey(macroModeState, key) {
-      if (macroModeState.isPlaying) { return; }
-      var registerName = macroModeState.latestRegister;
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register) {
-        register.pushText(key);
-      }
-    }
-
-    function logInsertModeChange(macroModeState) {
-      if (macroModeState.isPlaying) { return; }
-      var registerName = macroModeState.latestRegister;
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register && register.pushInsertModeChanges) {
-        register.pushInsertModeChanges(macroModeState.lastInsertModeChanges);
-      }
-    }
-
-    function logSearchQuery(macroModeState, query) {
-      if (macroModeState.isPlaying) { return; }
-      var registerName = macroModeState.latestRegister;
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register && register.pushSearchQuery) {
-        register.pushSearchQuery(query);
-      }
-    }
-
-    /**
-     * Listens for changes made in insert mode.
-     * Should only be active in insert mode.
-     */
-    function onChange(cm, changeObj) {
-      var macroModeState = vimGlobalState.macroModeState;
-      var lastChange = macroModeState.lastInsertModeChanges;
-      if (!macroModeState.isPlaying) {
-        while(changeObj) {
-          lastChange.expectCursorActivityForChange = true;
-          if (lastChange.ignoreCount > 1) {
-            lastChange.ignoreCount--;
-          } else if (changeObj.origin == '+input' || changeObj.origin == 'paste'
-              || changeObj.origin === undefined /* only in testing */) {
-            var selectionCount = cm.listSelections().length;
-            if (selectionCount > 1)
-              lastChange.ignoreCount = selectionCount;
-            var text = changeObj.text.join('\n');
-            if (lastChange.maybeReset) {
-              lastChange.changes = [];
-              lastChange.maybeReset = false;
-            }
-            if (text) {
-              if (cm.state.overwrite && !/\n/.test(text)) {
-                lastChange.changes.push([text]);
-              } else {
-                lastChange.changes.push(text);
-              }
-            }
-          }
-          // Change objects may be chained with next.
-          changeObj = changeObj.next;
-        }
-      }
-    }
-
-    /**
-    * Listens for any kind of cursor activity on CodeMirror.
-    */
-    function onCursorActivity(cm) {
-      var vim = cm.state.vim;
-      if (vim.insertMode) {
-        // Tracking cursor activity in insert mode (for macro support).
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.isPlaying) { return; }
-        var lastChange = macroModeState.lastInsertModeChanges;
-        if (lastChange.expectCursorActivityForChange) {
-          lastChange.expectCursorActivityForChange = false;
-        } else {
-          // Cursor moved outside the context of an edit. Reset the change.
-          lastChange.maybeReset = true;
-        }
-      } else if (!cm.curOp.isVimOp) {
-        handleExternalSelection(cm, vim);
-      }
-    }
-    function handleExternalSelection(cm, vim) {
-      var anchor = cm.getCursor('anchor');
-      var head = cm.getCursor('head');
-      // Enter or exit visual mode to match mouse selection.
-      if (vim.visualMode && !cm.somethingSelected()) {
-        exitVisualMode(cm, false);
-      } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
-        vim.visualMode = true;
-        vim.visualLine = false;
-        CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-      }
-      if (vim.visualMode) {
-        // Bind CodeMirror selection model to vim selection model.
-        // Mouse selections are considered visual characterwise.
-        var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
-        var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
-        head = offsetCursor(head, 0, headOffset);
-        anchor = offsetCursor(anchor, 0, anchorOffset);
-        vim.sel = {
-          anchor: anchor,
-          head: head
-        };
-        updateMark(cm, vim, '<', cursorMin(head, anchor));
-        updateMark(cm, vim, '>', cursorMax(head, anchor));
-      } else if (!vim.insertMode) {
-        // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
-        vim.lastHPos = cm.getCursor().ch;
-      }
-    }
-
-    /** Wrapper for special keys pressed in insert mode */
-    function InsertModeKey(keyName) {
-      this.keyName = keyName;
-    }
-
-    /**
-    * Handles raw key down events from the text area.
-    * - Should only be active in insert mode.
-    * - For recording deletes in insert mode.
-    */
-    function onKeyEventTargetKeyDown(e) {
-      var macroModeState = vimGlobalState.macroModeState;
-      var lastChange = macroModeState.lastInsertModeChanges;
-      var keyName = CodeMirror.keyName(e);
-      if (!keyName) { return; }
-      function onKeyFound() {
-        if (lastChange.maybeReset) {
-          lastChange.changes = [];
-          lastChange.maybeReset = false;
-        }
-        lastChange.changes.push(new InsertModeKey(keyName));
-        return true;
-      }
-      if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
-        CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound);
-      }
-    }
-
-    /**
-     * Repeats the last edit, which includes exactly 1 command and at most 1
-     * insert. Operator and motion commands are read from lastEditInputState,
-     * while action commands are read from lastEditActionCommand.
-     *
-     * If repeatForInsert is true, then the function was called by
-     * exitInsertMode to repeat the insert mode changes the user just made. The
-     * corresponding enterInsertMode call was made with a count.
-     */
-    function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
-      var macroModeState = vimGlobalState.macroModeState;
-      macroModeState.isPlaying = true;
-      var isAction = !!vim.lastEditActionCommand;
-      var cachedInputState = vim.inputState;
-      function repeatCommand() {
-        if (isAction) {
-          commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
-        } else {
-          commandDispatcher.evalInput(cm, vim);
-        }
-      }
-      function repeatInsert(repeat) {
-        if (macroModeState.lastInsertModeChanges.changes.length > 0) {
-          // For some reason, repeat cw in desktop VIM does not repeat
-          // insert mode changes. Will conform to that behavior.
-          repeat = !vim.lastEditActionCommand ? 1 : repeat;
-          var changeObject = macroModeState.lastInsertModeChanges;
-          repeatInsertModeChanges(cm, changeObject.changes, repeat);
-        }
-      }
-      vim.inputState = vim.lastEditInputState;
-      if (isAction && vim.lastEditActionCommand.interlaceInsertRepeat) {
-        // o and O repeat have to be interlaced with insert repeats so that the
-        // insertions appear on separate lines instead of the last line.
-        for (var i = 0; i < repeat; i++) {
-          repeatCommand();
-          repeatInsert(1);
-        }
-      } else {
-        if (!repeatForInsert) {
-          // Hack to get the cursor to end up at the right place. If I is
-          // repeated in insert mode repeat, cursor will be 1 insert
-          // change set left of where it should be.
-          repeatCommand();
-        }
-        repeatInsert(repeat);
-      }
-      vim.inputState = cachedInputState;
-      if (vim.insertMode && !repeatForInsert) {
-        // Don't exit insert mode twice. If repeatForInsert is set, then we
-        // were called by an exitInsertMode call lower on the stack.
-        exitInsertMode(cm);
-      }
-      macroModeState.isPlaying = false;
-    }
-
-    function repeatInsertModeChanges(cm, changes, repeat) {
-      function keyHandler(binding) {
-        if (typeof binding == 'string') {
-          CodeMirror.commands[binding](cm);
-        } else {
-          binding(cm);
-        }
-        return true;
-      }
-      var head = cm.getCursor('head');
-      var visualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.visualBlock;
-      if (visualBlock) {
-        // Set up block selection again for repeating the changes.
-        selectForInsert(cm, head, visualBlock + 1);
-        repeat = cm.listSelections().length;
-        cm.setCursor(head);
-      }
-      for (var i = 0; i < repeat; i++) {
-        if (visualBlock) {
-          cm.setCursor(offsetCursor(head, i, 0));
-        }
-        for (var j = 0; j < changes.length; j++) {
-          var change = changes[j];
-          if (change instanceof InsertModeKey) {
-            CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
-          } else if (typeof change == "string") {
-            cm.replaceSelection(change);
-          } else {
-            var start = cm.getCursor();
-            var end = offsetCursor(start, 0, change[0].length);
-            cm.replaceRange(change[0], start, end);
-            cm.setCursor(end);
-          }
-        }
-      }
-      if (visualBlock) {
-        cm.setCursor(offsetCursor(head, 0, 1));
-      }
-    }
-
-    resetVimGlobalState();
-    return vimApi;
-  };
-  // Initialize Vim and make it available as an API.
-  CodeMirror.Vim = Vim();
-});
diff --git a/package.json b/package.json
index a132e8f6c7..927bbd87a0 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,11 @@
   "devDependencies": {
     "@rollup/plugin-buble": "^0.21.3",
     "blint": "^1.1.0",
+    "cm5-vim": "^0.0.5",
     "node-static": "0.7.11",
     "puppeteer": "^1.20.0",
-    "rollup": "^1.26.3"
+    "rollup": "^1.26.3",
+    "rollup-plugin-copy": "^3.4.0"
   },
   "bugs": "http://github.com/codemirror/CodeMirror/issues",
   "keywords": [
diff --git a/rollup.config.js b/rollup.config.js
index 236b79c593..24f1f13410 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,4 +1,14 @@
 import buble from '@rollup/plugin-buble';
+import copy from 'rollup-plugin-copy'
+
+let copyVim = copy({
+  targets: [
+    { 
+      src: require.resolve("cm5-vim/vim.js").replace(/\\/g,  "/"), 
+      dest: "./keymap" 
+    }
+  ]
+});
 
 export default [
   {
@@ -17,7 +27,7 @@ export default [
       file: "lib/codemirror.js",
       name: "CodeMirror"
     },
-    plugins: [ buble({namedFunctionExpressions: false}) ]
+    plugins: [ buble({namedFunctionExpressions: false}), copyVim ]
   },
   {
     input: ["src/addon/runmode/runmode-standalone.js"],
diff --git a/test/index.html b/test/index.html
index e03b6e643c..ab7ad436a7 100644
--- a/test/index.html
+++ b/test/index.html
@@ -162,7 +162,6 @@ <h2>Test Suite</h2>
     <script src="emacs_test.js"></script>
     <script src="sql-hint-test.js"></script>
     <script src="sublime_test.js"></script>
-    <script src="vim_test.js"></script>
     <script src="html-hint-test.js"></script>
     <script src="annotatescrollbar.js"></script>
     <script>
diff --git a/test/vim_test.js b/test/vim_test.js
deleted file mode 100644
index 4b76d47b00..0000000000
--- a/test/vim_test.js
+++ /dev/null
@@ -1,5283 +0,0 @@
-var Pos = CodeMirror.Pos;
-CodeMirror.Vim.suppressErrorLogging = true;
-
-var code = '' +
-' wOrd1 (#%\n' +
-' word3] \n' +
-'aopop pop 0 1 2 3 4\n' +
-' (a) [b] {c} \n' +
-'int getchar(void) {\n' +
-'  static char buf[BUFSIZ];\n' +
-'  static char *bufp = buf;\n' +
-'  if (n == 0) {  /* buffer is empty */\n' +
-'    n = read(0, buf, sizeof buf);\n' +
-'    bufp = buf;\n' +
-'  }\n' +
-'\n' +
-'  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;\n' +
-' \n' +
-'}\n';
-
-var lines = (function() {
-  var lineText = code.split('\n');
-  var ret = [];
-  for (var i = 0; i < lineText.length; i++) {
-    ret[i] = {
-      line: i,
-      length: lineText[i].length,
-      lineText: lineText[i],
-      textStart: /^\s*/.exec(lineText[i])[0].length
-    };
-  }
-  return ret;
-})();
-var endOfDocument = makeCursor(lines.length - 1,
-    lines[lines.length - 1].length);
-var wordLine = lines[0];
-var bigWordLine = lines[1];
-var charLine = lines[2];
-var bracesLine = lines[3];
-var seekBraceLine = lines[4];
-var foldingStart = lines[7];
-var foldingEnd = lines[11];
-
-var word1 = {
-  start: new Pos(wordLine.line, 1),
-  end: new Pos(wordLine.line, 5)
-};
-var word2 = {
-  start: new Pos(wordLine.line, word1.end.ch + 2),
-  end: new Pos(wordLine.line, word1.end.ch + 4)
-};
-var word3 = {
-  start: new Pos(bigWordLine.line, 1),
-  end: new Pos(bigWordLine.line, 5)
-};
-var bigWord1 = word1;
-var bigWord2 = word2;
-var bigWord3 = {
-  start: new Pos(bigWordLine.line, 1),
-  end: new Pos(bigWordLine.line, 7)
-};
-var bigWord4 = {
-  start: new Pos(bigWordLine.line, bigWord1.end.ch + 3),
-  end: new Pos(bigWordLine.line, bigWord1.end.ch + 7)
-};
-
-var oChars = [ new Pos(charLine.line, 1),
-    new Pos(charLine.line, 3),
-    new Pos(charLine.line, 7) ];
-var pChars = [ new Pos(charLine.line, 2),
-    new Pos(charLine.line, 4),
-    new Pos(charLine.line, 6),
-    new Pos(charLine.line, 8) ];
-var numChars = [ new Pos(charLine.line, 10),
-    new Pos(charLine.line, 12),
-    new Pos(charLine.line, 14),
-    new Pos(charLine.line, 16),
-    new Pos(charLine.line, 18)];
-var parens1 = {
-  start: new Pos(bracesLine.line, 1),
-  end: new Pos(bracesLine.line, 3)
-};
-var squares1 = {
-  start: new Pos(bracesLine.line, 5),
-  end: new Pos(bracesLine.line, 7)
-};
-var curlys1 = {
-  start: new Pos(bracesLine.line, 9),
-  end: new Pos(bracesLine.line, 11)
-};
-var seekOutside = {
-  start: new Pos(seekBraceLine.line, 1),
-  end: new Pos(seekBraceLine.line, 16)
-};
-var seekInside = {
-  start: new Pos(seekBraceLine.line, 14),
-  end: new Pos(seekBraceLine.line, 11)
-};
-var foldingRangeDown = {
-  start: new Pos(foldingStart.line, 3),
-  end: new Pos(foldingEnd.line, 0)
-};
-var foldingRangeUp = {
-  start: new Pos(foldingEnd.line, 0),
-  end: new Pos(foldingStart.line, 0)
-};
-
-function copyCursor(cur) {
-  return new Pos(cur.line, cur.ch);
-}
-
-function forEach(arr, func) {
-  for (var i = 0; i < arr.length; i++) {
-    func(arr[i], i, arr);
-  }
-}
-
-function expectFail(fn) {
-    try {
-        fn();
-    } catch(expected) {
-        return;
-    };
-    throw new Error("Expected to throw an error");
-}
-
-function vimKeyToKeyName(key) {
-  return key.replace(/[CS]-|CR|BS/g, function(part) {
-    return {"C-": "Ctrl-", "S-": "Shift", CR: "Return", BS: "Backspace"}[part];
-  });
-}
-
-function testVim(name, run, opts, expectedFail) {
-  var vimOpts = {
-    lineNumbers: true,
-    vimMode: true,
-    showCursorWhenSelecting: true,
-    value: code
-  };
-  for (var prop in opts) {
-    if (opts.hasOwnProperty(prop)) {
-      vimOpts[prop] = opts[prop];
-    }
-  }
-  return test('vim_' + name, function() {
-    var place = document.getElementById("testground");
-    place.style.visibility = "visible";
-    var cm = CodeMirror(place, vimOpts);
-    var vim = CodeMirror.Vim.maybeInitVimState_(cm);
-
-    cm.focus();
-    // workaround for cm5 slow polling in blurred window
-    Object.defineProperty(cm.state, "focused", {
-        set: function(e) {},
-        get: function() {
-            return document.activeElement == cm.getInputField();
-        }
-    });
-
-    function doKeysFn(cm) {
-      return function() {
-        var args = arguments[0]
-        if (!Array.isArray(args)) { args = arguments; }
-        for (var i = 0; i < args.length; i++) {
-          var key = args[i];
-          if (key.length > 1 && key[0] == "<" && key.slice(-1) == ">") {
-              key = vimKeyToKeyName(key.slice(1, -1));
-          }
-          typeKey(key);
-        }
-      }
-    }
-    function doExFn(cm) {
-      return function(command) {
-        helpers.doKeys(':', command, '\n');
-      }
-    }
-    function assertCursorAtFn(cm) {
-      return function(line, ch) {
-        var pos;
-        if (ch == null && typeof line.line == 'number') {
-          pos = line;
-        } else {
-          pos = makeCursor(line, ch);
-        }
-        eqCursorPos(cm.getCursor(), pos);
-      }
-    }
-    var helpers = {
-      doKeys: doKeysFn(cm),
-      doEx: doExFn(cm),
-      assertCursorAt: assertCursorAtFn(cm),
-      getRegisterController: function() {
-        return CodeMirror.Vim.getRegisterController();
-      },
-      getNotificationText: function() {
-        return cm.getWrapperElement().querySelector(".cm-vim-message").textContent;
-      }
-    }
-    CodeMirror.Vim.resetVimGlobalState_();
-    var successful = false;
-    try {
-      run(cm, vim, helpers);
-      successful = true;
-    } finally {
-      if (successful && !verbose) {
-        cm.getWrapperElement().remove();
-      }
-    }
-  }, expectedFail);
-};
-testVim('qq@q', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'q', 'l', 'l', 'q');
-  helpers.assertCursorAt(0,2);
-  helpers.doKeys('@', 'q');
-  helpers.assertCursorAt(0,4);
-}, { value: '            '});
-testVim('@@', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'q', 'l', 'l', 'q');
-  helpers.assertCursorAt(0,2);
-  helpers.doKeys('@', 'q');
-  helpers.assertCursorAt(0,4);
-  helpers.doKeys('@', '@');
-  helpers.assertCursorAt(0,6);
-}, { value: '            '});
-var jumplistScene = ''+
-  'word\n'+
-  '(word)\n'+
-  '{word\n'+
-  'word.\n'+
-  '\n'+
-  'word search\n'+
-  '}word\n'+
-  'word\n'+
-  'word\n';
-function testJumplist(name, keys, endPos, startPos) {
-  endPos = makeCursor(endPos[0], endPos[1]);
-  startPos = makeCursor(startPos[0], startPos[1]);
-  testVim(name, function(cm, vim, helpers) {
-    CodeMirror.Vim.resetVimGlobalState_();
-    cm.setCursor(startPos);
-    helpers.doKeys.apply(null, keys);
-    helpers.assertCursorAt(endPos);
-  }, {value: jumplistScene});
-}
-testJumplist('jumplist_H', ['H', '<C-o>'], [5,2], [5,2]);
-testJumplist('jumplist_M', ['M', '<C-o>'], [2,2], [2,2]);
-testJumplist('jumplist_L', ['L', '<C-o>'], [2,2], [2,2]);
-testJumplist('jumplist_[[', ['[', '[', '<C-o>'], [5,2], [5,2]);
-testJumplist('jumplist_]]', [']', ']', '<C-o>'], [2,2], [2,2]);
-testJumplist('jumplist_G', ['G', '<C-o>'], [5,2], [5,2]);
-testJumplist('jumplist_gg', ['g', 'g', '<C-o>'], [5,2], [5,2]);
-testJumplist('jumplist_%', ['%', '<C-o>'], [1,5], [1,5]);
-testJumplist('jumplist_{', ['{', '<C-o>'], [1,5], [1,5]);
-testJumplist('jumplist_}', ['}', '<C-o>'], [1,5], [1,5]);
-testJumplist('jumplist_\'', ['m', 'a', 'h', '\'', 'a', 'h', '<C-i>'], [1,0], [1,5]);
-testJumplist('jumplist_`', ['m', 'a', 'h', '`', 'a', 'h', '<C-i>'], [1,5], [1,5]);
-testJumplist('jumplist_*_cachedCursor', ['*', '<C-o>'], [1,3], [1,3]);
-testJumplist('jumplist_#_cachedCursor', ['#', '<C-o>'], [1,3], [1,3]);
-testJumplist('jumplist_n', ['#', 'n', '<C-o>'], [1,1], [2,3]);
-testJumplist('jumplist_N', ['#', 'N', '<C-o>'], [1,1], [2,3]);
-testJumplist('jumplist_repeat_<c-o>', ['*', '*', '*', '3', '<C-o>'], [2,3], [2,3]);
-testJumplist('jumplist_repeat_<c-i>', ['*', '*', '*', '3', '<C-o>', '2', '<C-i>'], [5,0], [2,3]);
-testJumplist('jumplist_repeated_motion', ['3', '*', '<C-o>'], [2,3], [2,3]);
-testJumplist('jumplist_/', ['/', 'dialog\n', '<C-o>'], [2,3], [2,3]);
-testJumplist('jumplist_?', ['?', 'dialog\n', '<C-o>'], [2,3], [2,3]);
-testJumplist('jumplist_skip_deleted_mark<c-o>',
-             ['*', 'n', 'n', 'k', 'd', 'k', '<C-o>', '<C-o>', '<C-o>'],
-             [0,2], [0,2]);
-testJumplist('jumplist_skip_deleted_mark<c-i>',
-             ['*', 'n', 'n', 'k', 'd', 'k', '<C-o>', '<C-i>', '<C-i>'],
-             [1,0], [0,2]);
-
-/**
- * @param name Name of the test
- * @param keys An array of keys or a string with a single key to simulate.
- * @param endPos The expected end position of the cursor.
- * @param startPos The position the cursor should start at, defaults to 0, 0.
- */
-function testMotion(name, keys, endPos, startPos) {
-  testVim(name, function(cm, vim, helpers) {
-    if (!startPos) {
-      startPos = new Pos(0, 0);
-    }
-    cm.setCursor(startPos);
-    helpers.doKeys(keys);
-    helpers.assertCursorAt(endPos);
-  });
-}
-
-function testMotionWithFolding(name, keys, endPos, startPos) {
-  testVim(name, function (cm, vim, helpers) {
-    cm.foldCode(startPos);
-    cm.foldCode(endPos);
-    cm.setCursor(startPos);
-    helpers.doKeys(keys);
-    helpers.assertCursorAt(endPos)
-  })
-}
-
-function makeCursor(line, ch) {
-  return new Pos(line, ch);
-}
-
-function offsetCursor(cur, offsetLine, offsetCh) {
-  return new Pos(cur.line + offsetLine, cur.ch + offsetCh);
-}
-
-// Motion tests
-testMotion('|', '|', makeCursor(0, 0), makeCursor(0,4));
-testMotion('|_repeat', ['3', '|'], makeCursor(0, 2), makeCursor(0,4));
-testMotion('h', 'h', makeCursor(0, 0), word1.start);
-testMotion('h_repeat', ['3', 'h'], offsetCursor(word1.end, 0, -3), word1.end);
-testMotion('l', 'l', makeCursor(0, 1));
-testMotion('l_repeat', ['2', 'l'], makeCursor(0, 2));
-testMotion('j', 'j', offsetCursor(word1.end, 1, 0), word1.end);
-testMotion('j_repeat', ['2', 'j'], offsetCursor(word1.end, 2, 0), word1.end);
-testMotion('j_repeat_clip', ['1000', 'j'], endOfDocument);
-testMotion('k', 'k', offsetCursor(word3.end, -1, 0), word3.end);
-testMotion('k_repeat', ['2', 'k'], makeCursor(0, 4), makeCursor(2, 4));
-testMotion('k_repeat_clip', ['1000', 'k'], makeCursor(0, 4), makeCursor(2, 4));
-testMotion('w', 'w', word1.start);
-testMotion('keepHPos', ['5', 'j', 'j', '7', 'k'], makeCursor(8, 12), makeCursor(12, 12));
-testMotion('keepHPosEol', ['$', '2', 'j'], makeCursor(2, 18));
-testMotion('w_multiple_newlines_no_space', 'w', makeCursor(12, 2), makeCursor(11, 2));
-testMotion('w_multiple_newlines_with_space', 'w', makeCursor(14, 0), makeCursor(12, 51));
-testMotion('w_repeat', ['2', 'w'], word2.start);
-testMotion('w_wrap', ['w'], word3.start, word2.start);
-testMotion('w_endOfDocument', 'w', endOfDocument, endOfDocument);
-testMotion('w_start_to_end', ['1000', 'w'], endOfDocument, makeCursor(0, 0));
-testMotion('W', 'W', bigWord1.start);
-testMotion('W_repeat', ['2', 'W'], bigWord3.start, bigWord1.start);
-testMotion('e', 'e', word1.end);
-testMotion('e_repeat', ['2', 'e'], word2.end);
-testMotion('e_wrap', 'e', word3.end, word2.end);
-testMotion('e_endOfDocument', 'e', endOfDocument, endOfDocument);
-testMotion('e_start_to_end', ['1000', 'e'], endOfDocument, makeCursor(0, 0));
-testMotion('b', 'b', word3.start, word3.end);
-testMotion('b_repeat', ['2', 'b'], word2.start, word3.end);
-testMotion('b_wrap', 'b', word2.start, word3.start);
-testMotion('b_startOfDocument', 'b', makeCursor(0, 0), makeCursor(0, 0));
-testMotion('b_end_to_start', ['1000', 'b'], makeCursor(0, 0), endOfDocument);
-testMotion('ge', ['g', 'e'], word2.end, word3.end);
-testMotion('ge_repeat', ['2', 'g', 'e'], word1.end, word3.start);
-testMotion('ge_wrap', ['g', 'e'], word2.end, word3.start);
-testMotion('ge_startOfDocument', ['g', 'e'], makeCursor(0, 0),
-    makeCursor(0, 0));
-testMotion('ge_end_to_start', ['1000', 'g', 'e'], makeCursor(0, 0), endOfDocument);
-testMotion('gg', ['g', 'g'], makeCursor(lines[0].line, lines[0].textStart),
-    makeCursor(3, 1));
-testMotion('gg_repeat', ['3', 'g', 'g'],
-    makeCursor(lines[2].line, lines[2].textStart));
-testMotion('G', 'G',
-    makeCursor(lines[lines.length - 1].line, lines[lines.length - 1].textStart),
-    makeCursor(3, 1));
-testMotion('G_repeat', ['3', 'G'], makeCursor(lines[2].line,
-    lines[2].textStart));
-// TODO: Make the test code long enough to test Ctrl-F and Ctrl-B.
-testMotion('0', '0', makeCursor(0, 0), makeCursor(0, 8));
-testMotion('^', '^', makeCursor(0, lines[0].textStart), makeCursor(0, 8));
-testMotion('+', '+', makeCursor(1, lines[1].textStart), makeCursor(0, 8));
-testMotion('-', '-', makeCursor(0, lines[0].textStart), makeCursor(1, 4));
-testMotion('_', ['6','_'], makeCursor(5, lines[5].textStart), makeCursor(0, 8));
-testMotion('$', '$', makeCursor(0, lines[0].length - 1), makeCursor(0, 1));
-testMotion('$_repeat', ['2', '$'], makeCursor(1, lines[1].length - 1),
-    makeCursor(0, 3));
-testMotion('$', ['v', '$'], makeCursor(0, lines[0].length), makeCursor(0, 1));
-testMotion('f', ['f', 'p'], pChars[0], makeCursor(charLine.line, 0));
-testMotion('f_repeat', ['2', 'f', 'p'], pChars[2], pChars[0]);
-testMotion('f_num', ['f', '2'], numChars[2], makeCursor(charLine.line, 0));
-testMotion('t', ['t','p'], offsetCursor(pChars[0], 0, -1),
-    makeCursor(charLine.line, 0));
-testMotion('t_repeat', ['2', 't', 'p'], offsetCursor(pChars[2], 0, -1),
-    pChars[0]);
-testMotion('F', ['F', 'p'], pChars[0], pChars[1]);
-testMotion('F_repeat', ['2', 'F', 'p'], pChars[0], pChars[2]);
-testMotion('T', ['T', 'p'], offsetCursor(pChars[0], 0, 1), pChars[1]);
-testMotion('T_repeat', ['2', 'T', 'p'], offsetCursor(pChars[0], 0, 1), pChars[2]);
-testMotion('%_parens', ['%'], parens1.end, parens1.start);
-testMotion('%_squares', ['%'], squares1.end, squares1.start);
-testMotion('%_braces', ['%'], curlys1.end, curlys1.start);
-testMotion('%_seek_outside', ['%'], seekOutside.end, seekOutside.start);
-testMotion('%_seek_inside', ['%'], seekInside.end, seekInside.start);
-
-// Motion with folding tests
-testMotionWithFolding('j_with_folding', 'j', foldingRangeDown.end, foldingRangeDown.start);
-testMotionWithFolding('k_with_folding', 'k', foldingRangeUp.end, foldingRangeUp.start);
-
-testVim('%_seek_skip', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,9);
-}, {value:'01234"("()'});
-testVim('%_skip_string', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,4);
-  cm.setCursor(0,2);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,0);
-}, {value:'(")")'});
-testVim('%_skip_comment', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,6);
-  cm.setCursor(0,3);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,0);
-}, {value:'(/*)*/)'});
-// Make sure that moving down after going to the end of a line always leaves you
-// at the end of a line, but preserves the offset in other cases
-testVim('Changing lines after Eol operation', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys(['$']);
-  helpers.doKeys(['j']);
-  // After moving to Eol and then down, we should be at Eol of line 2
-  helpers.assertCursorAt(new Pos(1, lines[1].length - 1));
-  helpers.doKeys(['j']);
-  // After moving down, we should be at Eol of line 3
-  helpers.assertCursorAt(new Pos(2, lines[2].length - 1));
-  helpers.doKeys(['h']);
-  helpers.doKeys(['j']);
-  // After moving back one space and then down, since line 4 is shorter than line 2, we should
-  // be at Eol of line 2 - 1
-  helpers.assertCursorAt(new Pos(3, lines[3].length - 1));
-  helpers.doKeys(['j']);
-  helpers.doKeys(['j']);
-  // After moving down again, since line 3 has enough characters, we should be back to the
-  // same place we were at on line 1
-  helpers.assertCursorAt(new Pos(5, lines[2].length - 2));
-});
-//making sure gj and gk recover from clipping
-testVim('gj_gk_clipping', function(cm,vim,helpers){
-  cm.setCursor(0, 1);
-  helpers.doKeys('g','j','g','j');
-  helpers.assertCursorAt(2, 1);
-  helpers.doKeys('g','k','g','k');
-  helpers.assertCursorAt(0, 1);
-},{value: 'line 1\n\nline 2'});
-//testing a mix of j/k and gj/gk
-testVim('j_k_and_gj_gk', function(cm,vim,helpers){
-  cm.setSize(120);
-  cm.setCursor(0, 0);
-  //go to the last character on the first line
-  helpers.doKeys('$');
-  //move up/down on the column within the wrapped line
-  //side-effect: cursor is not locked to eol anymore
-  helpers.doKeys('g','k');
-  var cur=cm.getCursor();
-  eq(cur.line,0);
-  is((cur.ch<176),'gk didn\'t move cursor back (1)');
-  helpers.doKeys('g','j');
-  helpers.assertCursorAt(0, 176);
-  //should move to character 177 on line 2 (j/k preserve character index within line)
-  helpers.doKeys('j');
-  //due to different line wrapping, the cursor can be on a different screen-x now
-  //gj and gk preserve screen-x on movement, much like moveV
-  helpers.doKeys('3','g','k');
-  cur=cm.getCursor();
-  eq(cur.line,1);
-  is((cur.ch<176),'gk didn\'t move cursor back (2)');
-  helpers.doKeys('g','j','2','g','j');
-  //should return to the same character-index
-  helpers.doKeys('k');
-  helpers.assertCursorAt(0, 176);
-},{ lineWrapping:true, value: 'This line is intentionally long. It tests movements of gj and gk over wrapped lines. Starts on the end of this line, then makes a step up and back to set the origin for j and k.\nThis line is supposed to be even longer than the previous. I will jump here and make another wiggle with gj and gk, before I jump back to the line above. Both wiggles should not change my cursor\'s target character but both j/k and gj/gk change each other\'s reference position.'});
-testVim('gj_gk', function(cm, vim, helpers) {
-  cm.setSize(120);
-  // Test top of document edge case.
-  cm.setCursor(0, 4);
-  helpers.doKeys('g', 'j');
-  helpers.doKeys('10', 'g', 'k');
-  helpers.assertCursorAt(0, 4);
-
-  // Test moving down preserves column position.
-  helpers.doKeys('g', 'j');
-  var pos1 = cm.getCursor();
-  var expectedPos2 = new Pos(0, (pos1.ch - 4) * 2 + 4);
-  helpers.doKeys('g', 'j');
-  helpers.assertCursorAt(expectedPos2);
-
-  // Move to the last character
-  cm.setCursor(0, 0);
-  // Move left to reset HSPos
-  helpers.doKeys('h');
-  // Test bottom of document edge case.
-  helpers.doKeys('100', 'g', 'j');
-  var endingPos = cm.getCursor();
-  is(endingPos.ch != 0, 'gj should not be on wrapped line 0');
-  var topLeftCharCoords = cm.charCoords(makeCursor(0, 0));
-  var endingCharCoords = cm.charCoords(endingPos);
-  is(topLeftCharCoords.left == endingCharCoords.left, 'gj should end up on column 0');
-},{ lineNumbers: false, lineWrapping:true, value: 'Thislineisintentionallylongtotestmovementofgjandgkoverwrappedlines.' });
-testVim('g0_g$', function(cm, vim, helpers) {
-  var topLeftCharCoords = cm.charCoords(makeCursor(0, 0));
-  cm.setCursor(0, 4);
-  cm.setSize(120);
-  helpers.doKeys('g', 'Down');
-  var secondLineCoords = cm.charCoords(cm.getCursor());
-  is(secondLineCoords.top > topLeftCharCoords.top);
-  is(secondLineCoords.left > topLeftCharCoords.left);
-
-  helpers.doKeys('g', '0');
-  var start = cm.getCursor();
-  var startCoords = cm.charCoords(start);
-  is(start.ch != 0);
-  is(startCoords.left == topLeftCharCoords.left);
-  is(secondLineCoords.top === startCoords.top);
-  is(secondLineCoords.left > startCoords.left);
-
-  helpers.doKeys('g', '$');
-  var end = cm.getCursor();
-  var endCoords = cm.charCoords(end);
-  is(startCoords.left < endCoords.left);
-  is(startCoords.top == endCoords.top);
-  is(start.ch < end.ch && end.ch < cm.getValue().length / 2);
-},{ lineNumbers: false, lineWrapping:true, value: 'This line is intentionally long to test movement of g$ and g0 over wrapped lines.' });
-testVim('}', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('}');
-  helpers.assertCursorAt(1, 0);
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', '}');
-  helpers.assertCursorAt(4, 0);
-  cm.setCursor(0, 0);
-  helpers.doKeys('6', '}');
-  helpers.assertCursorAt(5, 0);
-}, { value: 'a\n\nb\nc\n\nd' });
-testVim('{', function(cm, vim, helpers) {
-  cm.setCursor(5, 0);
-  helpers.doKeys('{');
-  helpers.assertCursorAt(4, 0);
-  cm.setCursor(5, 0);
-  helpers.doKeys('2', '{');
-  helpers.assertCursorAt(1, 0);
-  cm.setCursor(5, 0);
-  helpers.doKeys('6', '{');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'a\n\nb\nc\n\nd' });
-testVim('(', function(cm, vim, helpers) {
-  cm.setCursor(6, 23);
-  helpers.doKeys('(');
-  helpers.assertCursorAt(6, 14);
-  helpers.doKeys('2', '(');
-  helpers.assertCursorAt(5, 0);
-  helpers.doKeys('(');
-  helpers.assertCursorAt(4, 0);
-  helpers.doKeys('(');
-  helpers.assertCursorAt(3, 0);
-  helpers.doKeys('(');
-  helpers.assertCursorAt(2, 0);
-  helpers.doKeys('(');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('(');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'sentence1.\n\n\nsentence2\n\nsentence3. sentence4\n   sentence5? sentence6!' });
-testVim(')', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', ')');
-  helpers.assertCursorAt(3, 0);
-  helpers.doKeys(')');
-  helpers.assertCursorAt(4, 0);
-  helpers.doKeys(')');
-  helpers.assertCursorAt(5, 0);
-  helpers.doKeys(')');
-  helpers.assertCursorAt(5, 11);
-  helpers.doKeys(')');
-  helpers.assertCursorAt(6, 14);
-  helpers.doKeys(')');
-  helpers.assertCursorAt(6, 23);
-  helpers.doKeys(')');
-  helpers.assertCursorAt(6, 23);
-}, { value: 'sentence1.\n\n\nsentence2\n\nsentence3. sentence4\n   sentence5? sentence6!' });
-testVim('paragraph_motions', function(cm, vim, helpers) {
-  cm.setCursor(10, 0);
-  helpers.doKeys('{');
-  helpers.assertCursorAt(4, 0);
-  helpers.doKeys('{');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('2', '}');
-  helpers.assertCursorAt(7, 0);
-  helpers.doKeys('2', '}');
-  helpers.assertCursorAt(16, 0);
-
-  cm.setCursor(9, 0);
-  helpers.doKeys('}');
-  helpers.assertCursorAt(14, 0);
-
-  cm.setCursor(6, 0);
-  helpers.doKeys('}');
-  helpers.assertCursorAt(7, 0);
-
-  // ip inside empty space
-  cm.setCursor(10, 0);
-  helpers.doKeys('v', 'i', 'p');
-  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(12, 0), cm.getCursor('head'));
-  helpers.doKeys('i', 'p');
-  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(13, 1), cm.getCursor('head'));
-  helpers.doKeys('2', 'i', 'p');
-  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(16, 1), cm.getCursor('head'));
-
-  // should switch to visualLine mode
-  cm.setCursor(14, 0);
-  helpers.doKeys('<Esc>', 'v', 'i', 'p');
-  helpers.assertCursorAt(14, 0);
-
-  cm.setCursor(14, 0);
-  helpers.doKeys('<Esc>', 'V', 'i', 'p');
-  eqCursorPos(new Pos(16, 1), cm.getCursor('head'));
-
-  // ap inside empty space
-  cm.setCursor(10, 0);
-  helpers.doKeys('<Esc>', 'v', 'a', 'p');
-  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(13, 1), cm.getCursor('head'));
-  helpers.doKeys('a', 'p');
-  eqCursorPos(new Pos(7, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(16, 1), cm.getCursor('head'));
-
-  cm.setCursor(13, 0);
-  helpers.doKeys('v', 'a', 'p');
-  eqCursorPos(new Pos(13, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(14, 0), cm.getCursor('head'));
-
-  cm.setCursor(16, 0);
-  helpers.doKeys('v', 'a', 'p');
-  eqCursorPos(new Pos(14, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(16, 1), cm.getCursor('head'));
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'a', 'p');
-  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(4, 0), cm.getCursor('head'));
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'i', 'p');
-  var register = helpers.getRegisterController().getRegister();
-  eq('a\na\n', register.toString());
-  is(register.linewise);
-  helpers.doKeys('3', 'j', 'p');
-  helpers.doKeys('y', 'i', 'p');
-  is(register.linewise);
-  eq('b\na\na\nc\n', register.toString());
-}, { value: 'a\na\n\n\n\nb\nc\n\n\n\n\n\n\nd\n\ne\nf' });
-
-testVim('sentence_selections', function(cm, vim, helpers) {
-  // vis at beginning of line
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'i', 's');
-  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(0, 14), cm.getCursor('head'));
-
-  // vas at beginning of line
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'a', 's');
-  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(0, 15), cm.getCursor('head'));
-
-  // vis on sentence end
-  cm.setCursor(0, 13);
-  helpers.doKeys('v', 'i', 's');
-  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(0, 14), cm.getCursor('head'));
-
-  // vas on sentence end
-  cm.setCursor(0, 13);
-  helpers.doKeys('v', 'a', 's');
-  eqCursorPos(new Pos(0, 0), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(0, 15), cm.getCursor('head'));
-
-  // vis at sentence end, no whitespace after it
-  cm.setCursor(1, 18);
-  helpers.doKeys('v', 'i', 's');
-  eqCursorPos(new Pos(1, 13), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(1, 19), cm.getCursor('head'));
-
-  // vas at sentence end, no whitespace after it
-  cm.setCursor(1, 18);
-  helpers.doKeys('v', 'a', 's');
-  eqCursorPos(new Pos(1, 12), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(1, 19), cm.getCursor('head'));
-
-  // vis at sentence beginning, on whitespace
-  cm.setCursor(0, 14);
-  helpers.doKeys('v', 'i', 's');
-  eqCursorPos(new Pos(0, 14), cm.getCursor('anchor'));
-  eqCursorPos(new Pos(0, 29), cm.getCursor('head'));
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'i', 's');
-  var register = helpers.getRegisterController().getRegister();
-  eq('Test sentence.', register.toString());
-
-  // return to original value
-  helpers.doKeys('u')
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'a', 's');
-  register = helpers.getRegisterController().getRegister();
-  eq('Test sentence. ', register.toString());
-
-  // return to original value
-  helpers.doKeys('u')
-
-  cm.setCursor(1, 20);
-  helpers.doKeys('c', 'a', 's', '<Esc>');
-  register = helpers.getRegisterController().getRegister();
-  eq('Test.', register.toString());
-
-  // return to original value
-  helpers.doKeys('u')
-
-  cm.setCursor(3, 11);
-  helpers.doKeys('y', 'a', 's');
-  register = helpers.getRegisterController().getRegister();
-  eq('This is more text. ', register.toString());
-
-  cm.setCursor(3, 31);
-  helpers.doKeys('y', 'a', 's');
-  register = helpers.getRegisterController().getRegister();
-  eq(' No end of sentence symbol', register.toString());
-
-}, { value: 'Test sentence. Test question?\nAgain.Never. Again.Test.\n\nHello. This is more text. No end of sentence symbol\n' });
-
-
-// Operator tests
-testVim('dl', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 0);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'l');
-  eq('word1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' ', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-}, { value: ' word1 ' });
-testVim('dl_eol', function(cm, vim, helpers) {
-  cm.setCursor(0, 6);
-  helpers.doKeys('d', 'l');
-  eq(' word1', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' ', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 5);
-}, { value: ' word1 ' });
-testVim('dl_repeat', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 0);
-  cm.setCursor(curStart);
-  helpers.doKeys('2', 'd', 'l');
-  eq('ord1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' w', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-}, { value: ' word1 ' });
-testVim('dh', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'h');
-  eq(' wrd1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('o', register.toString());
-  is(!register.linewise);
-  eqCursorPos(offsetCursor(curStart, 0 , -1), cm.getCursor());
-}, { value: ' word1 ' });
-testVim('dj', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'j');
-  eq(' word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' word1\nword2\n', register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: ' word1\nword2\n word3' });
-testVim('dj_end_of_document', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'j');
-  eq('', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' word1 \n', register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1 ' });
-testVim('dk', function(cm, vim, helpers) {
-  var curStart = makeCursor(1, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'k');
-  eq(' word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' word1\nword2\n', register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: ' word1\nword2\n word3' });
-testVim('dk_start_of_document', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'k');
-  eq('', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' word1 \n', register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1 ' });
-testVim('dw_space', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 0);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'w');
-  eq('word1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' ', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-}, { value: ' word1 ' });
-testVim('dw_word', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'w');
-  eq(' word2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1 ', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-}, { value: ' word1 word2' });
-testVim('dw_unicode_word', function(cm, vim, helpers) {
-  helpers.doKeys('d', 'w');
-  eq(cm.getValue().length, 10);
-  helpers.doKeys('d', 'w');
-  eq(cm.getValue().length, 6);
-  helpers.doKeys('d', 'w');
-  eq(cm.getValue().length, 5);
-  helpers.doKeys('d', 'e');
-  eq(cm.getValue().length, 2);
-}, { value: '  \u0562\u0561\u0580\u0587\xbbe\xb5g  ' });
-testVim('dw_only_word', function(cm, vim, helpers) {
-  // Test that if there is only 1 word left, dw deletes till the end of the
-  // line.
-  cm.setCursor(0, 1);
-  helpers.doKeys('d', 'w');
-  eq(' ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1 ', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1 ' });
-testVim('dw_eol', function(cm, vim, helpers) {
-  // Assert that dw does not delete the newline if last word to delete is at end
-  // of line.
-  cm.setCursor(0, 1);
-  helpers.doKeys('d', 'w');
-  eq(' \nword2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1\nword2' });
-testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
-  // Assert that dw does not delete the newline if last word to delete is at end
-  // of line and it is followed by multiple newlines.
-  cm.setCursor(0, 1);
-  helpers.doKeys('d', 'w');
-  eq(' \n\nword2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1\n\nword2' });
-testVim('dw_empty_line_followed_by_whitespace', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('  \nword', cm.getValue());
-}, { value: '\n  \nword' });
-testVim('dw_empty_line_followed_by_word', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('word', cm.getValue());
-}, { value: '\nword' });
-testVim('dw_empty_line_followed_by_empty_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('\n', cm.getValue());
-}, { value: '\n\n' });
-testVim('dw_whitespace_followed_by_whitespace', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('\n   \n', cm.getValue());
-}, { value: '  \n   \n' });
-testVim('dw_whitespace_followed_by_empty_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('\n\n', cm.getValue());
-}, { value: '  \n\n' });
-testVim('dw_word_whitespace_word', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('\n   \nword2', cm.getValue());
-}, { value: 'word1\n   \nword2'})
-testVim('dw_end_of_document', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('d', 'w');
-  eq('\nab', cm.getValue());
-}, { value: '\nabc' });
-testVim('dw_repeat', function(cm, vim, helpers) {
-  // Assert that dw does delete newline if it should go to the next line, and
-  // that repeat works properly.
-  cm.setCursor(0, 1);
-  helpers.doKeys('d', '2', 'w');
-  eq(' ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1\nword2', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1\nword2' });
-testVim('de_word_start_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'e');
-  eq('\n\n', cm.getValue());
-}, { value: 'word\n\n' });
-testVim('de_word_end_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  helpers.doKeys('d', 'e');
-  eq('wor', cm.getValue());
-}, { value: 'word\n\n\n' });
-testVim('de_whitespace_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'e');
-  eq('', cm.getValue());
-}, { value: '   \n\n\n' });
-testVim('de_end_of_document', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('d', 'e');
-  eq('\nab', cm.getValue());
-}, { value: '\nabc' });
-testVim('db_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('d', 'b');
-  eq('\n\n', cm.getValue());
-}, { value: '\n\n\n' });
-testVim('db_word_start_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('d', 'b');
-  eq('\nword', cm.getValue());
-}, { value: '\n\nword' });
-testVim('db_word_end_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 3);
-  helpers.doKeys('d', 'b');
-  eq('\n\nd', cm.getValue());
-}, { value: '\n\nword' });
-testVim('db_whitespace_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('d', 'b');
-  eq('', cm.getValue());
-}, { value: '\n   \n' });
-testVim('db_start_of_document', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'b');
-  eq('abc\n', cm.getValue());
-}, { value: 'abc\n' });
-testVim('dge_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doKeys('d', 'g', 'e');
-  // Note: In real VIM the result should be '', but it's not quite consistent,
-  // since 2 newlines are deleted. But in the similar case of word\n\n, only
-  // 1 newline is deleted. We'll diverge from VIM's behavior since it's much
-  // easier this way.
-  eq('\n', cm.getValue());
-}, { value: '\n\n' });
-testVim('dge_word_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doKeys('d', 'g', 'e');
-  eq('wor\n', cm.getValue());
-}, { value: 'word\n\n'});
-testVim('dge_whitespace_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('d', 'g', 'e');
-  eq('', cm.getValue());
-}, { value: '\n  \n' });
-testVim('dge_start_of_document', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'g', 'e');
-  eq('bc\n', cm.getValue());
-}, { value: 'abc\n' });
-testVim('d_inclusive', function(cm, vim, helpers) {
-  // Assert that when inclusive is set, the character the cursor is on gets
-  // deleted too.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'e');
-  eq('  ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-}, { value: ' word1 ' });
-testVim('d_reverse', function(cm, vim, helpers) {
-  // Test that deleting in reverse works.
-  cm.setCursor(1, 0);
-  helpers.doKeys('d', 'b');
-  eq(' word2 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1\n', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: ' word1\nword2 ' });
-testVim('dd', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange(new Pos(0, 0),
-    new Pos(1, 0));
-  var expectedLineCount = cm.lineCount() - 1;
-  helpers.doKeys('d', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, lines[1].textStart);
-});
-testVim('dd_prefix_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange(new Pos(0, 0),
-    new Pos(2, 0));
-  var expectedLineCount = cm.lineCount() - 2;
-  helpers.doKeys('2', 'd', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, lines[2].textStart);
-});
-testVim('dd_motion_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange(new Pos(0, 0),
-    new Pos(2, 0));
-  var expectedLineCount = cm.lineCount() - 2;
-  helpers.doKeys('d', '2', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, lines[2].textStart);
-});
-testVim('dd_multiply_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange(new Pos(0, 0),
-    new Pos(6, 0));
-  var expectedLineCount = cm.lineCount() - 6;
-  helpers.doKeys('2', 'd', '3', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, lines[6].textStart);
-});
-testVim('dd_lastline', function(cm, vim, helpers) {
-  cm.setCursor(cm.lineCount(), 0);
-  var expectedLineCount = cm.lineCount() - 1;
-  helpers.doKeys('d', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  helpers.assertCursorAt(cm.lineCount() - 1, 0);
-});
-testVim('dd_only_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  var expectedRegister = cm.getValue() + "\n";
-  helpers.doKeys('d','d');
-  eq(1, cm.lineCount());
-  eq('', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedRegister, register.toString());
-}, { value: "thisistheonlyline" });
-testVim('cG', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', 'G', 'inserted');
-  eq('inserted\n', cm.getValue());
-  helpers.assertCursorAt(0, 8);
-}, { value: 'line1\nline2'});
-// Yank commands should behave the exact same as d commands, expect that nothing
-// gets deleted.
-testVim('yw_repeat', function(cm, vim, helpers) {
-  // Assert that yw does yank newline if it should go to the next line, and
-  // that repeat works properly.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('y', '2', 'w');
-  eq(' word1\nword2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1\nword2', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-}, { value: ' word1\nword2' });
-testVim('yy_multiply_repeat', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  var expectedBuffer = cm.getRange(new Pos(0, 0),
-    new Pos(6, 0));
-  var expectedLineCount = cm.lineCount();
-  helpers.doKeys('2', 'y', '3', 'y');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-});
-testVim('2dd_blank_P', function(cm, vim, helpers) {
-  helpers.doKeys('2', 'd', 'd', 'P');
-  eq('\na\n\n', cm.getValue());
-}, { value: '\na\n\n' });
-// Change commands behave like d commands except that it also enters insert
-// mode. In addition, when the change is linewise, an additional newline is
-// inserted so that insert mode starts on that line.
-testVim('cw', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', '2', 'w');
-  eq(' word3', cm.getValue());
-  helpers.assertCursorAt(0, 0);
-}, { value: 'word1 word2 word3'});
-testVim('cw_repeat', function(cm, vim, helpers) {
-  // Assert that cw does delete newline if it should go to the next line, and
-  // that repeat works properly.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('c', '2', 'w');
-  eq(' ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1\nword2', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: ' word1\nword2' });
-testVim('cc_multiply_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange(new Pos(0, 0),
-    new Pos(6, 0));
-  var expectedLineCount = cm.lineCount() - 5;
-  helpers.doKeys('2', 'c', '3', 'c');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  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);
-  helpers.doKeys('c', 'c');
-  eq(expectedLineCount, cm.lineCount());
-});
-function fillArray(val, times) {
-  var arr = [];
-  for (var i = 0; i < times; i++) {
-    arr.push(val);
-  }
-  return arr;
-}
-testVim('c_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'c');
-  helpers.doKeys('hello');
-  eq('1hello\n5hello\nahellofg', cm.getValue());
-  helpers.doKeys('<Esc>');
-  cm.setCursor(2, 3);
-  helpers.doKeys('<C-v>', '2', 'k', 'h', 'C');
-  helpers.doKeys('world');
-  eq('1hworld\n5hworld\nahworld', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-testVim('c_visual_block_replay', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
-  helpers.doKeys('fo');
-  eq('1fo4\n5fo8\nafodefg', cm.getValue());
-  helpers.doKeys('<Esc>');
-  cm.setCursor(0, 0);
-  helpers.doKeys('.');
-  eq('foo4\nfoo8\nfoodefg', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-testVim('I_visual_block_replay', function(cm, vim, helpers) {
-  cm.setCursor(0, 2);
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'I');
-  helpers.doKeys('+-')
-  eq('12+-34\n56+-78\nab+-cdefg\nxyz', cm.getValue());
-  helpers.doKeys('<Esc>');
-  // ensure that repeat location doesn't depend on last selection
-  cm.setCursor(3, 2);
-  helpers.doKeys('g', 'v')
-  eq("+-34\n+-78\n+-cd", cm.getSelection())
-  cm.setCursor(0, 3);
-  helpers.doKeys('<C-v>', '1', 'j', '2', 'l');
-  eq("-34\n-78", cm.getSelection());
-  cm.setCursor(0, 0);
-  eq("", cm.getSelection());
-  helpers.doKeys('g', 'v');
-  eq("-34\n-78", cm.getSelection());
-  cm.setCursor(1, 1);
-  helpers.doKeys('.');
-  eq('12+-34\n5+-6+-78\na+-b+-cdefg\nx+-yz', cm.getValue());
-}, {value: '1234\n5678\nabcdefg\nxyz'});
-
-testVim('visual_block_backwards', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('3', 'l');
-  helpers.doKeys('<C-v>', '2', 'j', '2', '<Left>');
-  eq('123\n678\nbcd', cm.getSelection());
-  helpers.doKeys('A');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('A', '<Esc>');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('g', 'v');
-  eq('123\n678\nbcd', cm.getSelection());
-  helpers.doKeys('x');
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('g', 'v');
-  eq('A4 \nA9 \nAef', cm.getSelection());
-}, {value: '01234 line 1\n56789 line 2\nabcdefg line 3\nline 4'});
-
-testVim('d_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 'd');
-  eq('1\n5\nafg', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-testVim('D_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'D');
-  eq('1\n5\na', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-
-testVim('s_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'l', 's');
-  helpers.doKeys('hello{');
-  eq('1hello{\n5hello{\nahello{fg\n', cm.getValue());
-  helpers.doKeys('<Esc>');
-  cm.setCursor(2, 3);
-  helpers.doKeys('<C-v>', '1', 'k', 'h', 'S');
-  helpers.doKeys('world');
-  eq('1hello{\n  world\n', cm.getValue());
-}, {value: '1234\n5678\nabcdefg\n'});
-
-// Test mode change event. It should only fire once per mode transition.
-testVim('on_mode_change', function(cm, vim, helpers) {
-  var modeHist = [];
-  function callback(arg) {
-    var subMode = arg.subMode ? ':' + arg.subMode : '';
-    modeHist.push(arg.mode + subMode);
-  }
-  helpers.doKeys('<Esc>', '<Esc>');
-  cm.on('vim-mode-change', callback);
-  function test(key, mode) {
-    modeHist.length = 0;
-    helpers.doKeys(key);
-    eq(modeHist.join(';'), mode);
-  }
-  test('v', 'visual');
-  test('c', 'insert');
-  test('<Esc>', 'normal');
-  test('<C-v>', 'visual:blockwise');
-  test('I', 'insert');
-  test('<Esc>', 'normal');
-  test('R', 'replace');
-  test('x', '');
-  test('<C-[>', 'normal');
-  test('v', 'visual');
-  test('V', 'visual:linewise');
-  test('<C-v>', 'visual:blockwise');
-  test('v', 'visual');
-  test('<C-c>', 'normal');
-  test('a', 'insert');
-  test('<Esc>', 'normal');
-  test('v', 'visual');
-  test(':', ''); // Event for Command-line mode not implemented.
-  test('y\n', 'normal');
-});
-
-// Swapcase commands edit in place and do not modify registers.
-testVim('g~w_repeat', function(cm, vim, helpers) {
-  // Assert that dw does delete newline if it should go to the next line, and
-  // that repeat works properly.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('g', '~', '2', 'w');
-  eq(' WORD1\nWORD2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-}, { value: ' word1\nword2' });
-testVim('g~g~', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = cm.getValue().toUpperCase();
-  helpers.doKeys('2', 'g', '~', '3', 'g', '~');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-}, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
-testVim('gu_and_gU', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 7);
-  var value = cm.getValue();
-  cm.setCursor(curStart);
-  helpers.doKeys('2', 'g', 'U', 'w');
-  eq(cm.getValue(), 'wa wb xX WC wd');
-  eqCursorPos(curStart, cm.getCursor());
-  helpers.doKeys('2', 'g', 'u', 'w');
-  eq(cm.getValue(), value);
-
-  helpers.doKeys('2', 'g', 'U', 'B');
-  eq(cm.getValue(), 'wa WB Xx wc wd');
-  eqCursorPos(makeCursor(0, 3), cm.getCursor());
-
-  cm.setCursor(makeCursor(0, 4));
-  helpers.doKeys('g', 'u', 'i', 'w');
-  eq(cm.getValue(), 'wa wb Xx wc wd');
-  eqCursorPos(makeCursor(0, 3), cm.getCursor());
-
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-
-  cm.setCursor(curStart);
-  cm.setValue('abc efg\nxyz');
-  helpers.doKeys('g', 'U', 'g', 'U');
-  eq(cm.getValue(), 'ABC EFG\nxyz');
-  helpers.doKeys('g', 'u', 'u');
-  eq(cm.getValue(), 'abc efg\nxyz');
-  eqCursorPos(makeCursor(0, 0), cm.getCursor());
-  helpers.doKeys('g', 'U', '2', 'U');
-  eq(cm.getValue(), 'ABC EFG\nXYZ');
-}, { value: 'wa wb xx wc wd' });
-testVim('visual_block_~', function(cm, vim, helpers) {
-  cm.setCursor(1, 1);
-  helpers.doKeys('<C-v>', 'l', 'l', 'j', '~');
-  helpers.assertCursorAt(1, 1);
-  eq('hello\nwoRLd\naBCDe', cm.getValue());
-  cm.setCursor(2, 0);
-  helpers.doKeys('v', 'l', 'l', '~');
-  helpers.assertCursorAt(2, 0);
-  eq('hello\nwoRLd\nAbcDe', cm.getValue());
-},{value: 'hello\nwOrld\nabcde' });
-testVim('._swapCase_visualBlock', function(cm, vim, helpers) {
-  helpers.doKeys('<C-v>', 'j', 'j', 'l', '~');
-  cm.setCursor(0, 3);
-  helpers.doKeys('.');
-  eq('HelLO\nWorLd\nAbcdE', cm.getValue());
-},{value: 'hEllo\nwOrlD\naBcDe' });
-testVim('._delete_visualBlock', function(cm, vim, helpers) {
-  helpers.doKeys('<C-v>', 'j', 'x');
-  eq('ive\ne\nsome\nsugar', cm.getValue());
-  helpers.doKeys('.');
-  eq('ve\n\nsome\nsugar', cm.getValue());
-  helpers.doKeys('j', 'j', '.');
-  eq('ve\n\nome\nugar', cm.getValue());
-  helpers.doKeys('u', '<C-r>', '.');
-  eq('ve\n\nme\ngar', cm.getValue());
-},{value: 'give\nme\nsome\nsugar' });
-testVim('>{motion}', function(cm, vim, helpers) {
-  cm.setCursor(1, 3);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = '   word1\n  word2\nword3 ';
-  helpers.doKeys('>', 'k');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
-}, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
-testVim('>>', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = '   word1\n  word2\nword3 ';
-  helpers.doKeys('2', '>', '>');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
-}, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
-testVim('<{motion}', function(cm, vim, helpers) {
-  cm.setCursor(1, 3);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = ' word1\nword2\nword3 ';
-  helpers.doKeys('<', 'k');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
-testVim('<<', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = ' word1\nword2\nword3 ';
-  helpers.doKeys('2', '<', '<');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
-testVim('=', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  helpers.doKeys('<C-v>', 'j', 'j');
-  var expectedValue = 'word1\nword2\nword3';
-  helpers.doKeys('=');
-  eq(expectedValue, cm.getValue());
-}, { value: '   word1\n  word2\n  word3', indentUnit: 2 });
-
-// Edit tests - configureCm is an optional argument that gives caller
-// access to the cm object.
-function testEdit(name, before, pos, edit, after, configureCm) {
-  return testVim(name, function(cm, vim, helpers) {
-             if (configureCm) {
-               configureCm(cm);
-             }
-             var ch = before.search(pos)
-             var line = before.substring(0, ch).split('\n').length - 1;
-             if (line) {
-               ch = before.substring(0, ch).split('\n').pop().length;
-             }
-             cm.setCursor(line, ch);
-             helpers.doKeys.apply(this, edit.split(''));
-             eq(after, cm.getValue());
-           }, {value: before});
-}
-
-// These Delete tests effectively cover word-wise Change, Visual & Yank.
-// Tabs are used as differentiated whitespace to catch edge cases.
-// Normal word:
-testEdit('diw_mid_spc', 'foo \tbAr\t baz', /A/, 'diw', 'foo \t\t baz');
-testEdit('daw_mid_spc', 'foo \tbAr\t baz', /A/, 'daw', 'foo \tbaz');
-testEdit('diw_mid_punct', 'foo \tbAr.\t baz', /A/, 'diw', 'foo \t.\t baz');
-testEdit('daw_mid_punct', 'foo \tbAr.\t baz', /A/, 'daw', 'foo.\t baz');
-testEdit('diw_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'diw', 'foo \t,.\t baz');
-testEdit('daw_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'daw', 'foo \t,.\t baz');
-testEdit('diw_start_spc', 'bAr \tbaz', /A/, 'diw', ' \tbaz');
-testEdit('daw_start_spc', 'bAr \tbaz', /A/, 'daw', 'baz');
-testEdit('diw_start_punct', 'bAr. \tbaz', /A/, 'diw', '. \tbaz');
-testEdit('daw_start_punct', 'bAr. \tbaz', /A/, 'daw', '. \tbaz');
-testEdit('diw_end_spc', 'foo \tbAr', /A/, 'diw', 'foo \t');
-testEdit('daw_end_spc', 'foo \tbAr', /A/, 'daw', 'foo');
-testEdit('diw_end_punct', 'foo \tbAr.', /A/, 'diw', 'foo \t.');
-testEdit('daw_end_punct', 'foo \tbAr.', /A/, 'daw', 'foo.');
-// Big word:
-testEdit('diW_mid_spc', 'foo \tbAr\t baz', /A/, 'diW', 'foo \t\t baz');
-testEdit('daW_mid_spc', 'foo \tbAr\t baz', /A/, 'daW', 'foo \tbaz');
-testEdit('diW_mid_punct', 'foo \tbAr.\t baz', /A/, 'diW', 'foo \t\t baz');
-testEdit('daW_mid_punct', 'foo \tbAr.\t baz', /A/, 'daW', 'foo \tbaz');
-testEdit('diW_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'diW', 'foo \t\t baz');
-testEdit('daW_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'daW', 'foo \tbaz');
-testEdit('diW_start_spc', 'bAr\t baz', /A/, 'diW', '\t baz');
-testEdit('daW_start_spc', 'bAr\t baz', /A/, 'daW', 'baz');
-testEdit('diW_start_punct', 'bAr.\t baz', /A/, 'diW', '\t baz');
-testEdit('daW_start_punct', 'bAr.\t baz', /A/, 'daW', 'baz');
-testEdit('diW_end_spc', 'foo \tbAr', /A/, 'diW', 'foo \t');
-testEdit('daW_end_spc', 'foo \tbAr', /A/, 'daW', 'foo');
-testEdit('diW_end_punct', 'foo \tbAr.', /A/, 'diW', 'foo \t');
-testEdit('daW_end_punct', 'foo \tbAr.', /A/, 'daW', 'foo');
-// Deleting text objects
-//    Open and close on same line
-testEdit('di(_open_spc', 'foo (bAr) baz', /\(/, 'di(', 'foo () baz');
-testEdit('di)_open_spc', 'foo (bAr) baz', /\(/, 'di)', 'foo () baz');
-testEdit('dib_open_spc', 'foo (bAr) baz', /\(/, 'dib', 'foo () baz');
-testEdit('da(_open_spc', 'foo (bAr) baz', /\(/, 'da(', 'foo  baz');
-testEdit('da)_open_spc', 'foo (bAr) baz', /\(/, 'da)', 'foo  baz');
-
-testEdit('di(_middle_spc', 'foo (bAr) baz', /A/, 'di(', 'foo () baz');
-testEdit('di)_middle_spc', 'foo (bAr) baz', /A/, 'di)', 'foo () baz');
-testEdit('da(_middle_spc', 'foo (bAr) baz', /A/, 'da(', 'foo  baz');
-testEdit('da)_middle_spc', 'foo (bAr) baz', /A/, 'da)', 'foo  baz');
-
-testEdit('di(_close_spc', 'foo (bAr) baz', /\)/, 'di(', 'foo () baz');
-testEdit('di)_close_spc', 'foo (bAr) baz', /\)/, 'di)', 'foo () baz');
-testEdit('da(_close_spc', 'foo (bAr) baz', /\)/, 'da(', 'foo  baz');
-testEdit('da)_close_spc', 'foo (bAr) baz', /\)/, 'da)', 'foo  baz');
-
-testEdit('di`', 'foo `bAr` baz', /`/, 'di`', 'foo `` baz');
-testEdit('di>', 'foo <bAr> baz', /</, 'di>', 'foo <> baz');
-testEdit('da<', 'foo <bAr> baz', /</, 'da<', 'foo  baz');
-
-//  delete around and inner b.
-testEdit('dab_on_(_should_delete_around_()block', 'o( in(abc) )', /\(a/, 'dab', 'o( in )');
-
-//  delete around and inner B.
-testEdit('daB_on_{_should_delete_around_{}block', 'o{ in{abc} }', /{a/, 'daB', 'o{ in }');
-testEdit('diB_on_{_should_delete_inner_{}block', 'o{ in{abc} }', /{a/, 'diB', 'o{ in{} }');
-
-testEdit('da{_on_{_should_delete_inner_block', 'o{ in{abc} }', /{a/, 'da{', 'o{ in }');
-testEdit('di[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'di[', 'foo (bAr) baz');
-testEdit('di[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'di[', 'foo (bAr) baz');
-testEdit('da[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'da[', 'foo (bAr) baz');
-testEdit('da[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'da[', 'foo (bAr) baz');
-testMotion('di(_outside_should_stay', ['d', 'i', '('], new Pos(0, 0), new Pos(0, 0));
-
-//  Open and close on different lines, equally indented
-testEdit('di{_middle_spc', 'a{\n\tbar\n}b', /r/, 'di{', 'a{}b');
-testEdit('di}_middle_spc', 'a{\n\tbar\n}b', /r/, 'di}', 'a{}b');
-testEdit('da{_middle_spc', 'a{\n\tbar\n}b', /r/, 'da{', 'ab');
-testEdit('da}_middle_spc', 'a{\n\tbar\n}b', /r/, 'da}', 'ab');
-testEdit('daB_middle_spc', 'a{\n\tbar\n}b', /r/, 'daB', 'ab');
-
-// open and close on diff lines, open indented less than close
-testEdit('di{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di{', 'a{}b');
-testEdit('di}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di}', 'a{}b');
-testEdit('da{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da{', 'ab');
-testEdit('da}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da}', 'ab');
-
-// open and close on diff lines, open indented more than close
-testEdit('di[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di[', 'a\t[]b');
-testEdit('di]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di]', 'a\t[]b');
-testEdit('da[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da[', 'a\tb');
-testEdit('da]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da]', 'a\tb');
-
-// open and close on diff lines, open indented more than close
-testEdit('di<_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'di<', 'a\t<>b');
-testEdit('di>_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'di>', 'a\t<>b');
-testEdit('da<_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'da<', 'a\tb');
-testEdit('da>_middle_spc', 'a\t<\n\tbar\n>b', /r/, 'da>', 'a\tb');
-
-// deleting tag objects
-testEdit('dat_noop', '<outer><inner>hello</inner></outer>', /n/, 'dat', '<outer><inner>hello</inner></outer>');
-testEdit('dat_open_tag', '<outer><inner>hello</inner></outer>', /n/, 'dat', '<outer></outer>', function(cm) {
-  cm.setOption('mode', 'xml');
-});
-testEdit('dat_inside_tag', '<outer><inner>hello</inner></outer>', /l/, 'dat', '<outer></outer>', function(cm) {
-  cm.setOption('mode', 'xml');
-});
-testEdit('dat_close_tag', '<outer><inner>hello</inner></outer>', /\//, 'dat', '<outer></outer>', function(cm) {
-  cm.setOption('mode', 'xml');
-});
-
-testEdit('dit_open_tag', '<outer><inner>hello</inner></outer>', /n/, 'dit', '<outer><inner></inner></outer>', function(cm) {
-  cm.setOption('mode', 'xml');
-});
-testEdit('dit_inside_tag', '<outer><inner>hello</inner></outer>', /l/, 'dit', '<outer><inner></inner></outer>', function(cm) {
-  cm.setOption('mode', 'xml');
-});
-testEdit('dit_close_tag', '<outer><inner>hello</inner></outer>', /\//, 'dit', '<outer><inner></inner></outer>', function(cm) {
-  cm.setOption('mode', 'xml');
-});
-
-function testSelection(name, before, pos, keys, sel) {
-  return testVim(name, function(cm, vim, helpers) {
-             var ch = before.search(pos)
-             var line = before.substring(0, ch).split('\n').length - 1;
-             if (line) {
-               ch = before.substring(0, ch).split('\n').pop().length;
-             }
-             cm.setCursor(line, ch);
-             helpers.doKeys.apply(this, keys.split(''));
-             eq(sel, cm.getSelection());
-           }, {value: before});
-}
-testSelection('viw_middle_spc', 'foo \tbAr\t baz', /A/, 'viw', 'bAr');
-testSelection('vaw_middle_spc', 'foo \tbAr\t baz', /A/, 'vaw', 'bAr\t ');
-testSelection('viw_middle_punct', 'foo \tbAr,\t baz', /A/, 'viw', 'bAr');
-testSelection('vaW_middle_punct', 'foo \tbAr,\t baz', /A/, 'vaW', 'bAr,\t ');
-testSelection('viw_start_spc', 'foo \tbAr\t baz', /b/, 'viw', 'bAr');
-testSelection('viw_end_spc', 'foo \tbAr\t baz', /r/, 'viw', 'bAr');
-testSelection('viw_eol', 'foo \tbAr', /r/, 'viw', 'bAr');
-testSelection('vi{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'vi{', '\n\tbar\n\t');
-testSelection('va{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'va{', '{\n\tbar\n\t}');
-
-testVim('mouse_select', function(cm, vim, helpers) {
-  cm.setSelection(new Pos(0, 2), new Pos(0, 4), {origin: '*mouse'});
-  is(cm.state.vim.visualMode);
-  is(!cm.state.vim.visualLine);
-  is(!cm.state.vim.visualBlock);
-  helpers.doKeys('<Esc>');
-  is(!cm.somethingSelected());
-  helpers.doKeys('g', 'v');
-  eq('cd', cm.getSelection());
-}, {value: 'abcdef'});
-
-// Operator-motion tests
-testVim('D', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  helpers.doKeys('D');
-  eq(' wo\nword2\n word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('rd1', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 2);
-}, { value: ' word1\nword2\n word3' });
-testVim('C', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('C');
-  eq(' wo\nword2\n word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('rd1', register.toString());
-  is(!register.linewise);
-  eqCursorPos(curStart, cm.getCursor());
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: ' word1\nword2\n word3' });
-testVim('Y', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('Y');
-  eq(' word1\nword2\n word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' word1\n', register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, 3);
-}, { value: ' word1\nword2\n word3' });
-testVim('Yy_blockwise', function(cm, vim, helpers) {
-  helpers.doKeys('<C-v>', 'j', '2', 'l', 'Y');
-  helpers.doKeys('G', 'p', 'g', 'g');
-  helpers.doKeys('<C-v>', 'j', '2', 'l', 'y');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('$', 'p');
-  eq('123456123\n123456123\n123456\n123456', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('123\n123', register.toString());
-  is(register.blockwise);
-  helpers.assertCursorAt(0, 6);
-  helpers.doKeys('$', 'j', 'p');
-  helpers.doKeys('$', 'j', 'P');
-  eq("123456123\n123456123123\n123456   121233\n123456     123", cm.getValue());
-}, { value: '123456\n123456\n' });
-testVim('~', function(cm, vim, helpers) {
-  helpers.doKeys('3', '~');
-  eq('ABCdefg', cm.getValue());
-  helpers.assertCursorAt(0, 3);
-}, { value: 'abcdefg' });
-
-// Action tests
-testVim('ctrl-a', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-a>');
-  eq('-9', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('2','<C-a>');
-  eq('-7', cm.getValue());
-}, {value: '-10'});
-testVim('ctrl-x', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-x>');
-  eq('-1', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('2','<C-x>');
-  eq('-3', cm.getValue());
-}, {value: '0'});
-testVim('<C-x>/<C-a> search forward', function(cm, vim, helpers) {
-  forEach(['<C-x>', '<C-a>'], function(key) {
-    cm.setCursor(0, 0);
-    helpers.doKeys(key);
-    helpers.assertCursorAt(0, 5);
-    helpers.doKeys('l');
-    helpers.doKeys(key);
-    helpers.assertCursorAt(0, 10);
-    cm.setCursor(0, 11);
-    helpers.doKeys(key);
-    helpers.assertCursorAt(0, 11);
-  });
-}, {value: '__jmp1 jmp2 jmp'});
-testVim('insert_ctrl_u', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 10);
-  cm.setCursor(curStart);
-  helpers.doKeys('a');
-  helpers.doKeys('<C-u>');
-  eq('', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1/word2', register.toString());
-  is(!register.linewise);
-  var curEnd = makeCursor(0, 0);
-  eqCursorPos(curEnd, cm.getCursor());
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: 'word1/word2' });
-testVim('insert_ctrl_w', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 10);
-  cm.setCursor(curStart);
-  helpers.doKeys('a');
-  helpers.doKeys('<C-w>');
-  eq('word1/', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word2', register.toString());
-  is(!register.linewise);
-  var curEnd = makeCursor(0, 6);
-  eqCursorPos(curEnd, cm.getCursor());
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: 'word1/word2' });
-testVim('normal_ctrl_w', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('<C-w>');
-  eq('word', cm.getValue());
-  var curEnd = makeCursor(0, 3);
-  helpers.assertCursorAt(0,3);
-  eqCursorPos(curEnd, cm.getCursor());
-  eq('vim', cm.getOption('keyMap'));
-}, {value: 'word'});
-testVim('a', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('a');
-  helpers.assertCursorAt(0, 2);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('a_eol', function(cm, vim, helpers) {
-  cm.setCursor(0, lines[0].length - 1);
-  helpers.doKeys('a');
-  helpers.assertCursorAt(0, lines[0].length);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('A_endOfSelectedArea', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'j', 'l');
-  helpers.doKeys('A');
-  helpers.assertCursorAt(1, 2);
-  eq('vim-insert', cm.getOption('keyMap'));
-}, {value: 'foo\nbar'});
-testVim('i', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('i');
-  helpers.assertCursorAt(0, 1);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('i_repeat', function(cm, vim, helpers) {
-  helpers.doKeys('3', 'i');
-  helpers.doKeys('test')
-  helpers.doKeys('<Esc>');
-  eq('testtesttest', cm.getValue());
-  helpers.assertCursorAt(0, 11);
-}, { value: '' });
-testVim('i_repeat_delete', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('2', 'i');
-  helpers.doKeys('z')
-  helpers.doKeys('Backspace', 'Backspace');
-  helpers.doKeys('<Esc>');
-  eq('abe', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-}, { value: 'abcde' });
-testVim('insert', function(cm, vim, helpers) {
-  helpers.doKeys('i');
-  eq('vim-insert', cm.getOption('keyMap'));
-  eq(false, cm.state.overwrite);
-  helpers.doKeys('<Ins>');
-  eq('vim-replace', cm.getOption('keyMap'));
-  eq(true, cm.state.overwrite);
-  helpers.doKeys('<Ins>');
-  eq('vim-insert', cm.getOption('keyMap'));
-  eq(false, cm.state.overwrite);
-});
-testVim('i_backspace', function(cm, vim, helpers) {
-  cm.setCursor(0, 10);
-  helpers.doKeys('i');
-  helpers.doKeys('Backspace');
-  helpers.assertCursorAt(0, 9);
-  eq('012345678', cm.getValue());
-}, { value: '0123456789'});
-testVim('i_overwrite_backspace', function(cm, vim, helpers) {
-  cm.setCursor(0, 10);
-  helpers.doKeys('i');
-  helpers.doKeys('<Ins>');
-  helpers.doKeys('Backspace');
-  helpers.assertCursorAt(new Pos(0, 9, "after"));
-  eq('0123456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('i_forward_delete', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  helpers.doKeys('i');
-  helpers.doKeys('Delete');
-  helpers.assertCursorAt(0, 3);
-  eq('A124\nBCD', cm.getValue());
-  helpers.doKeys('Delete');
-  helpers.assertCursorAt(0, 3);
-  eq('A12\nBCD', cm.getValue());
-  helpers.doKeys('Delete');
-  helpers.assertCursorAt(0, 3);
-  eq('A12BCD', cm.getValue());
-}, { value: 'A1234\nBCD'});
-testVim('forward_delete', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  helpers.doKeys('<Del>');
-  helpers.assertCursorAt(0, 3);
-  eq('A124\nBCD', cm.getValue());
-  helpers.doKeys('<Del>');
-  helpers.assertCursorAt(0, 2);
-  eq('A12\nBCD', cm.getValue());
-  helpers.doKeys('<Del>');
-  helpers.assertCursorAt(0, 1);
-  eq('A1\nBCD', cm.getValue());
-}, { value: 'A1234\nBCD'});
-testVim('A', function(cm, vim, helpers) {
-  helpers.doKeys('A');
-  helpers.assertCursorAt(0, lines[0].length);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('A_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'A');
-  helpers.doKeys('hello');
-  eq('testhello\nmehello\npleahellose', cm.getValue());
-  helpers.doKeys('<Esc>');
-  cm.setCursor(0, 0);
-  helpers.doKeys('.');
-  // TODO this doesn't work yet
-  // eq('teshellothello\nme hello hello\nplehelloahellose', cm.getValue());
-}, {value: 'test\nme\nplease'});
-testVim('I', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('I');
-  helpers.assertCursorAt(0, lines[0].textStart);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('I_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('3', 'I');
-  helpers.doKeys('test')
-  helpers.doKeys('<Esc>');
-  eq('testtesttestblah', cm.getValue());
-  helpers.assertCursorAt(0, 11);
-}, { value: 'blah' });
-testVim('I_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'l', 'I');
-  helpers.doKeys('hello');
-  eq('hellotest\nhellome\nhelloplease', cm.getValue());
-}, {value: 'test\nme\nplease'});
-testVim('o', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('o');
-  eq('word1\n\nword2', cm.getValue());
-  helpers.assertCursorAt(1, 0);
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: 'word1\nword2' });
-testVim('o_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('3', 'o');
-  helpers.doKeys('test')
-  helpers.doKeys('<Esc>');
-  eq('\ntest\ntest\ntest', cm.getValue());
-  helpers.assertCursorAt(3, 3);
-}, { value: '' });
-testVim('O', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('O');
-  eq('\nword1\nword2', cm.getValue());
-  helpers.assertCursorAt(0, 0);
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: 'word1\nword2' });
-testVim('J', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('J');
-  var expectedValue = 'word1  word2\nword3\n word4';
-  eq(expectedValue, cm.getValue());
-  helpers.assertCursorAt(0, expectedValue.indexOf('word2') - 1);
-}, { value: 'word1 \n    word2\nword3\n word4' });
-testVim('J_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('3', 'J');
-  var expectedValue = 'word1  word2 word3\n word4';
-  eq(expectedValue, cm.getValue());
-  helpers.assertCursorAt(0, expectedValue.indexOf('word3') - 1);
-}, { value: 'word1 \n    word2\nword3\n word4' });
-testVim('gJ', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('g', 'J');
-  eq('word1word2 \n word3', cm.getValue());
-  helpers.assertCursorAt(0, 5);
-  helpers.doKeys('g', 'J');
-  eq('word1word2  word3', cm.getValue());
-  helpers.assertCursorAt(0, 11);
-}, { value: 'word1\nword2 \n word3' });
-testVim('gi', function(cm, vim, helpers) {
-  cm.setCursor(1, 5);
-  helpers.doKeys('g', 'I');
-  helpers.doKeys('a', 'a', '<Esc>', 'k');
-  eq('12\naa  xxxx', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('g', 'i');
-  helpers.assertCursorAt(1, 2);
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: '12\n  xxxx' });
-testVim('p', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);
-  helpers.doKeys('p');
-  eq('__abc\ndef_', cm.getValue());
-  helpers.assertCursorAt(1, 2);
-}, { value: '___' });
-testVim('p_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().getRegister('a').setText('abc\ndef', false);
-  helpers.doKeys('"', 'a', 'p');
-  eq('__abc\ndef_', cm.getValue());
-  helpers.assertCursorAt(1, 2);
-}, { value: '___' });
-testVim('p_wrong_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().getRegister('a').setText('abc\ndef', false);
-  helpers.doKeys('p');
-  eq('___', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-}, { value: '___' });
-testVim('p_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', '  a\nd\n', true);
-  helpers.doKeys('2', 'p');
-  eq('___\n  a\nd\n  a\nd', cm.getValue());
-  helpers.assertCursorAt(1, 2);
-}, { value: '___' });
-testVim('p_lastline', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', '  a\nd', true);
-  helpers.doKeys('2', 'p');
-  eq('___\n  a\nd\n  a\nd', cm.getValue());
-  helpers.assertCursorAt(1, 2);
-}, { value: '___' });
-testVim(']p_first_indent_is_smaller', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
-  helpers.doKeys(']', 'p');
-  eq('  ___\n  abc\n    def', cm.getValue());
-}, { value: '  ___' });
-testVim(']p_first_indent_is_larger', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '    abc\n  def\n', true);
-  helpers.doKeys(']', 'p');
-  eq('  ___\n  abc\ndef', cm.getValue());
-}, { value: '  ___' });
-testVim(']p_with_tab_indents', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '\t\tabc\n\t\t\tdef\n', true);
-  helpers.doKeys(']', 'p');
-  eq('\t___\n\tabc\n\t\tdef', cm.getValue());
-}, { value: '\t___', indentWithTabs: true});
-testVim(']p_with_spaces_translated_to_tabs', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
-  helpers.doKeys(']', 'p');
-  eq('\t___\n\tabc\n\t\tdef', cm.getValue());
-}, { value: '\t___', indentWithTabs: true, tabSize: 2 });
-testVim('[p', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
-  helpers.doKeys('[', 'p');
-  eq('  abc\n    def\n  ___', cm.getValue());
-}, { value: '  ___' });
-testVim('P', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);
-  helpers.doKeys('P');
-  eq('_abc\ndef__', cm.getValue());
-  helpers.assertCursorAt(1, 3);
-}, { value: '___' });
-testVim('P_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', '  a\nd\n', true);
-  helpers.doKeys('2', 'P');
-  eq('  a\nd\n  a\nd\n___', cm.getValue());
-  helpers.assertCursorAt(0, 2);
-}, { value: '___' });
-testVim('r', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('3', 'r', 'u');
-  eq('wuuuet\nanother', cm.getValue(),'3r failed');
-  helpers.assertCursorAt(0, 3);
-  cm.setCursor(0, 4);
-  helpers.doKeys('v', 'j', 'h', 'r', '<Space>');
-  eq('wuuu  \n    her', cm.getValue(),'Replacing selection by space-characters failed');
-  cm.setValue("ox");
-  helpers.doKeys('r', '<C-c>');
-  eq('ox', cm.getValue());
-  helpers.doKeys('r', '<Del>');
-  eq('ox', cm.getValue());
-  helpers.doKeys('r', '<CR>');
-  eq('\nx', cm.getValue());
-}, { value: 'wordet\nanother' });
-testVim('r_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(2, 3);
-  helpers.doKeys('<C-v>', 'k', 'k', 'h', 'h', 'r', 'l');
-  eq('1lll\n5lll\nalllefg', cm.getValue());
-  helpers.doKeys('<C-v>', 'l', 'j', 'r', '<Space>');
-  eq('1  l\n5  l\nalllefg', cm.getValue());
-  cm.setCursor(2, 0);
-  helpers.doKeys('o');
-  helpers.doKeys('\t\t')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('<C-v>', 'h', 'h', 'r', 'r');
-  eq('1  l\n5  l\nalllefg\nrrrrrrrr', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-testVim('R', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('R');
-  helpers.assertCursorAt(0, 1);
-  eq('vim-replace', cm.getOption('keyMap'));
-  is(cm.state.overwrite, 'Setting overwrite state failed');
-});
-testVim('R_visual', function(cm, vim, helpers) {
-  helpers.doKeys('<C-v>', 'j', 'R', '0', '<Esc>');
-  eq('0\nb33\nc44\nc55', cm.getValue());
-  helpers.doKeys('2', 'j', '.');
-  eq('0\nb33\n0', cm.getValue());
-  helpers.doKeys('k', 'v', 'R', '1', '<Esc>');
-  eq('0\n1\n0', cm.getValue());
-  helpers.doKeys('k', '.');
-  eq('1\n1\n0', cm.getValue());
-  helpers.doKeys('p');
-  eq('1\n0\n1\n0', cm.getValue());
-}, {value: 'a11\na22\nb33\nc44\nc55'});
-testVim('mark', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 't');
-  helpers.assertCursorAt(2, 2);
-  cm.setCursor(2, 0);
-  cm.replaceRange('   h', cm.getCursor());
-  cm.setCursor(0, 0);
-  helpers.doKeys('\'', 't');
-  helpers.assertCursorAt(2, 3);
-});
-testVim('mark\'', function(cm, vim, helpers) {
-  // motions that do not update jumplist
-  cm.setCursor(2, 2);
-  helpers.doKeys('`', '\'');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('j', '3', 'l');
-  helpers.doKeys('`', '`');
-  helpers.assertCursorAt(2, 2);
-  helpers.doKeys('`', '`');
-  helpers.assertCursorAt(1, 3);
-  // motions that update jumplist
-  helpers.doKeys('/', '=', '\n');
-  helpers.assertCursorAt(6, 20);
-  helpers.doKeys('`', '`');
-  helpers.assertCursorAt(1, 3);
-  helpers.doKeys('\'', '\'');
-  helpers.assertCursorAt(6, 2);
-  helpers.doKeys('\'', '`');
-  helpers.assertCursorAt(1, 1);
-  // edits
-  helpers.doKeys('g', 'I', '\n', '<Esc>', 'l');
-  helpers.doKeys('`', '`');
-  helpers.assertCursorAt(7, 2);
-  helpers.doKeys('`', '`');
-  helpers.assertCursorAt(2, 1);
-});
-testVim('mark.', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('O', 'testing', '<Esc>');
-  cm.setCursor(3, 3);
-  helpers.doKeys('\'', '.');
-  helpers.assertCursorAt(0, 0);
-  cm.setCursor(4, 4);
-  helpers.doKeys('`', '.');
-  helpers.assertCursorAt(0, 6);
-});
-testVim('jumpToMark_next', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(0, 0);
-  helpers.doKeys(']', '`');
-  helpers.assertCursorAt(2, 2);
-  cm.setCursor(0, 0);
-  helpers.doKeys(']', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_next_repeat', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', ']', '`');
-  helpers.assertCursorAt(3, 2);
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', ']', '\'');
-  helpers.assertCursorAt(3, 1);
-});
-testVim('jumpToMark_next_sameline', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 4);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(2, 2);
-  helpers.doKeys(']', '`');
-  helpers.assertCursorAt(2, 4);
-});
-testVim('jumpToMark_next_onlyprev', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(4, 0);
-  helpers.doKeys(']', '`');
-  helpers.assertCursorAt(4, 0);
-});
-testVim('jumpToMark_next_nomark', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys(']', '`');
-  helpers.assertCursorAt(2, 2);
-  helpers.doKeys(']', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_next_linewise_over', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(3, 4);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(2, 1);
-  helpers.doKeys(']', '\'');
-  helpers.assertCursorAt(3, 1);
-});
-testVim('jumpToMark_next_action', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ']', '`');
-  helpers.assertCursorAt(0, 0);
-  var actual = cm.getLine(0);
-  var expected = 'pop pop 0 1 2 3 4';
-  eq(actual, expected, "Deleting while jumping to the next mark failed.");
-});
-testVim('jumpToMark_next_line_action', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ']', '\'');
-  helpers.assertCursorAt(0, 1);
-  var actual = cm.getLine(0);
-  var expected = ' (a) [b] {c} '
-  eq(actual, expected, "Deleting while jumping to the next mark line failed.");
-});
-testVim('jumpToMark_prev', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(4, 0);
-  helpers.doKeys('[', '`');
-  helpers.assertCursorAt(2, 2);
-  cm.setCursor(4, 0);
-  helpers.doKeys('[', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_prev_repeat', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(5, 0);
-  helpers.doKeys('2', '[', '`');
-  helpers.assertCursorAt(3, 2);
-  cm.setCursor(5, 0);
-  helpers.doKeys('2', '[', '\'');
-  helpers.assertCursorAt(3, 1);
-});
-testVim('jumpToMark_prev_sameline', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 4);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(2, 2);
-  helpers.doKeys('[', '`');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_prev_onlynext', function(cm, vim, helpers) {
-  cm.setCursor(4, 4);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 0);
-  helpers.doKeys('[', '`');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_prev_nomark', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('[', '`');
-  helpers.assertCursorAt(2, 2);
-  helpers.doKeys('[', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_prev_linewise_over', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(3, 4);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 6);
-  helpers.doKeys('[', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('delmark_single', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 't');
-  helpers.doEx('delmarks t');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 't');
-  helpers.assertCursorAt(0, 0);
-});
-testVim('delmark_range', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'd');
-  cm.setCursor(5, 2);
-  helpers.doKeys('m', 'e');
-  helpers.doEx('delmarks b-d');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 'a');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'b');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'c');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'd');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'e');
-  helpers.assertCursorAt(5, 2);
-});
-testVim('delmark_multi', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'd');
-  cm.setCursor(5, 2);
-  helpers.doKeys('m', 'e');
-  helpers.doEx('delmarks bcd');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 'a');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'b');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'c');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'd');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'e');
-  helpers.assertCursorAt(5, 2);
-});
-testVim('delmark_multi_space', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'd');
-  cm.setCursor(5, 2);
-  helpers.doKeys('m', 'e');
-  helpers.doEx('delmarks b c d');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 'a');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'b');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'c');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'd');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'e');
-  helpers.assertCursorAt(5, 2);
-});
-testVim('delmark_all', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'd');
-  cm.setCursor(5, 2);
-  helpers.doKeys('m', 'e');
-  helpers.doEx('delmarks a b-de');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 'a');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('`', 'b');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('`', 'c');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('`', 'd');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('`', 'e');
-  helpers.assertCursorAt(0, 0);
-});
-testVim('visual', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l');
-  helpers.assertCursorAt(0, 4);
-  eqCursorPos(makeCursor(0, 1), cm.getCursor('anchor'));
-  helpers.doKeys('d');
-  eq('15', cm.getValue());
-}, { value: '12345' });
-testVim('visual_yank', function(cm, vim, helpers) {
-  helpers.doKeys('v', '3', 'l', 'y');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('p');
-  eq('aa te test for yank', cm.getValue());
-}, { value: 'a test for yank' })
-testVim('visual_w', function(cm, vim, helpers) {
-  helpers.doKeys('v', 'w');
-  eq(cm.getSelection(), 'motion t');
-}, { value: 'motion test'});
-testVim('visual_initial_selection', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('v');
-  cm.getSelection('n');
-}, { value: 'init'});
-testVim('visual_crossover_left', function(cm, vim, helpers) {
-  cm.setCursor(0, 2);
-  helpers.doKeys('v', 'l', 'h', 'h');
-  cm.getSelection('ro');
-}, { value: 'cross'});
-testVim('visual_crossover_left', function(cm, vim, helpers) {
-  cm.setCursor(0, 2);
-  helpers.doKeys('v', 'h', 'l', 'l');
-  cm.getSelection('os');
-}, { value: 'cross'});
-testVim('visual_crossover_up', function(cm, vim, helpers) {
-  cm.setCursor(3, 2);
-  helpers.doKeys('v', 'j', 'k', 'k');
-  eqCursorPos(new Pos(2, 2), cm.getCursor('head'));
-  eqCursorPos(new Pos(3, 3), cm.getCursor('anchor'));
-  helpers.doKeys('k');
-  eqCursorPos(new Pos(1, 2), cm.getCursor('head'));
-  eqCursorPos(new Pos(3, 3), cm.getCursor('anchor'));
-}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
-testVim('visual_crossover_down', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('v', 'k', 'j', 'j');
-  eqCursorPos(new Pos(2, 3), cm.getCursor('head'));
-  eqCursorPos(new Pos(1, 2), cm.getCursor('anchor'));
-  helpers.doKeys('j');
-  eqCursorPos(new Pos(3, 3), cm.getCursor('head'));
-  eqCursorPos(new Pos(1, 2), cm.getCursor('anchor'));
-}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
-testVim('visual_exit', function(cm, vim, helpers) {
-  helpers.doKeys('<C-v>', 'l', 'j', 'j', '<Esc>');
-  eqCursorPos(cm.getCursor('anchor'), cm.getCursor('head'));
-  eq(vim.visualMode, false);
-}, { value: 'hello\nworld\nfoo' });
-testVim('visual_line', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'V', 'l', 'j', 'j', 'd');
-  eq(' 4\n 5', cm.getValue());
-}, { value: ' 1\n 2\n 3\n 4\n 5' });
-testVim('visual_block_move_to_eol', function(cm, vim, helpers) {
-  // moveToEol should move all block cursors to end of line
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-v>', 'G', '$');
-  var selections = cm.getSelections().join();
-  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
-  // i.e. extending the selection
-  // till the end of the longest line.
-  helpers.doKeys('<C-v>', 'l', 'j', 'j', '6', 'l', 'd');
-  helpers.doKeys('d', 'd', 'd', 'd');
-  eq('', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-testVim('visual_block_truncate_on_short_line', function(cm, vim, helpers) {
-  // check for left side selection in case
-  // of moving up to a shorter line.
-  cm.replaceRange('', cm.getCursor());
-  cm.setCursor(3, 4);
-  helpers.doKeys('<C-v>', 'l', 'k', 'k', 'd');
-  eq('hello world\n{\ntis\nsa!', cm.getValue());
-}, {value: 'hello world\n{\nthis is\nsparta!'});
-testVim('visual_block_corners', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('<C-v>', '2', 'l', 'k');
-  // circle around the anchor
-  // and check the selections
-  var selections = cm.getSelections();
-  eq('345891', selections.join(''));
-  helpers.doKeys('4', 'h');
-  selections = cm.getSelections();
-  eq('123678', selections.join(''));
-  helpers.doKeys('j', 'j');
-  selections = cm.getSelections();
-  eq('678abc', selections.join(''));
-  helpers.doKeys('4', 'l');
-  selections = cm.getSelections();
-  eq('891cde', selections.join(''));
-}, {value: '12345\n67891\nabcde'});
-testVim('visual_block_mode_switch', function(cm, vim, helpers) {
-  // switch between visual modes
-  cm.setCursor(1, 1);
-  // blockwise to characterwise visual
-  helpers.doKeys('<C-v>', 'j', 'l', 'v');
-  var selections = cm.getSelections();
-  eq('7891\nabc', selections.join(''));
-  // characterwise to blockwise
-  helpers.doKeys('<C-v>');
-  selections = cm.getSelections();
-  eq('78bc', selections.join(''));
-  // blockwise to linewise visual
-  helpers.doKeys('V');
-  selections = cm.getSelections();
-  eq('67891\nabcde', selections.join(''));
-}, {value: '12345\n67891\nabcde'});
-testVim('visual_block_crossing_short_line', function(cm, vim, helpers) {
-  // visual block with long and short lines
-  cm.setCursor(0, 3);
-  helpers.doKeys('<C-v>', 'j', 'j', 'j');
-  var selections = cm.getSelections().join();
-  eq('4,,d,b', selections);
-  helpers.doKeys('3', 'k');
-  selections = cm.getSelections().join();
-  eq('4', selections);
-  helpers.doKeys('5', 'j', 'k');
-  selections = cm.getSelections().join("");
-  eq(10, selections.length);
-}, {value: '123456\n78\nabcdefg\nfoobar\n}\n'});
-testVim('visual_block_curPos_on_exit', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-v>', '3' , 'l', '<Esc>');
-  eqCursorPos(makeCursor(0, 3), cm.getCursor());
-  helpers.doKeys('h', '<C-v>', '2' , 'j' ,'3' , 'l');
-  eq(cm.getSelections().join(), "3456,,cdef");
-  helpers.doKeys('4' , 'h');
-  eq(cm.getSelections().join(), "23,8,bc");
-  helpers.doKeys('2' , 'l');
-  eq(cm.getSelections().join(), "34,,cd");
-}, {value: '123456\n78\nabcdefg\nfoobar'});
-
-testVim('visual_marks', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l', 'j', 'j', 'v');
-  // Test visual mode marks
-  cm.setCursor(2, 1);
-  helpers.doKeys('\'', '<');
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('\'', '>');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('visual_join', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'V', 'l', 'j', 'j', 'J');
-  eq(' 1 2 3\n 4\n 5', cm.getValue());
-  is(!vim.visualMode);
-}, { value: ' 1\n 2\n 3\n 4\n 5' });
-testVim('visual_join_2', function(cm, vim, helpers) {
-  helpers.doKeys('G', 'V', 'g', 'g', 'J');
-  eq('1 2 3 4 5 6 ', cm.getValue());
-  is(!vim.visualMode);
-}, { value: '1\n2\n3\n4\n5\n6\n'});
-testVim('visual_blank', function(cm, vim, helpers) {
-  helpers.doKeys('v', 'k');
-  eq(vim.visualMode, true);
-}, { value: '\n' });
-testVim('reselect_visual', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l', 'l', 'y', 'g', 'v');
-  helpers.assertCursorAt(0, 5);
-  eqCursorPos(makeCursor(0, 1), cm.getCursor('anchor'));
-  helpers.doKeys('v');
-  cm.setCursor(1, 0);
-  helpers.doKeys('v', 'l', 'l', 'p');
-  eq('123456\n2345\nbar', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('g', 'v');
-  // here the fake cursor is at (1, 3)
-  helpers.assertCursorAt(1, 4);
-  eqCursorPos(makeCursor(1, 0), cm.getCursor('anchor'));
-  helpers.doKeys('v');
-  cm.setCursor(2, 0);
-  helpers.doKeys('v', 'l', 'l', 'g', 'v');
-  helpers.assertCursorAt(1, 4);
-  eqCursorPos(makeCursor(1, 0), cm.getCursor('anchor'));
-  helpers.doKeys('g', 'v');
-  helpers.assertCursorAt(2, 3);
-  eqCursorPos(makeCursor(2, 0), cm.getCursor('anchor'));
-  eq('123456\n2345\nbar', cm.getValue());
-}, { value: '123456\nfoo\nbar' });
-testVim('reselect_visual_line', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'V', 'j', 'j', 'V', 'g', 'v', 'd');
-  eq('foo\nand\nbar', cm.getValue());
-  cm.setCursor(1, 0);
-  helpers.doKeys('V', 'y', 'j');
-  helpers.doKeys('V', 'p' , 'g', 'v', 'd');
-  eq('foo\nand', cm.getValue());
-}, { value: 'hello\nthis\nis\nfoo\nand\nbar' });
-testVim('reselect_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('<C-v>', 'k', 'h', '<C-v>');
-  cm.setCursor(2, 1);
-  helpers.doKeys('v', 'l', 'g', 'v');
-  eqCursorPos(new Pos(1, 2), vim.sel.anchor);
-  eqCursorPos(new Pos(0, 1), vim.sel.head);
-  // Ensure selection is done with visual block mode rather than one
-  // continuous range.
-  eq(cm.getSelections().join(''), '23oo')
-  helpers.doKeys('g', 'v');
-  eqCursorPos(new Pos(2, 1), vim.sel.anchor);
-  eqCursorPos(new Pos(2, 2), vim.sel.head);
-  helpers.doKeys('<Esc>');
-  // Ensure selection of deleted range
-  cm.setCursor(1, 1);
-  helpers.doKeys('v', '<C-v>', 'j', 'd', 'g', 'v');
-  eq(cm.getSelections().join(''), 'or');
-}, { value: '123456\nfoo\nbar' });
-testVim('s_normal', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('s');
-  helpers.doKeys('<Esc>');
-  eq('ac', cm.getValue());
-}, { value: 'abc'});
-testVim('s_visual', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('v', 's');
-  helpers.doKeys('<Esc>');
-  helpers.assertCursorAt(0, 0);
-  eq('ac', cm.getValue());
-}, { value: 'abc'});
-testVim('o_visual', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys('v','l','l','l','o');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys('v','v','j','j','j','o');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys('O');
-  helpers.doKeys('l','l')
-  helpers.assertCursorAt(3, 3);
-  helpers.doKeys('d');
-  eq('p',cm.getValue());
-}, { value: 'abcd\nefgh\nijkl\nmnop'});
-testVim('o_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('<C-v>','3','j','l','l', 'o');
-  eqCursorPos(new Pos(3, 3), vim.sel.anchor);
-  eqCursorPos(new Pos(0, 1), vim.sel.head);
-  helpers.doKeys('O');
-  eqCursorPos(new Pos(3, 1), vim.sel.anchor);
-  eqCursorPos(new Pos(0, 3), vim.sel.head);
-  helpers.doKeys('o');
-  eqCursorPos(new Pos(0, 3), vim.sel.anchor);
-  eqCursorPos(new Pos(3, 1), vim.sel.head);
-}, { value: 'abcd\nefgh\nijkl\nmnop'});
-testVim('changeCase_visual', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'l', 'l');
-  helpers.doKeys('U');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('v', 'l', 'l');
-  helpers.doKeys('u');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('l', 'l', 'l', '.');
-  helpers.assertCursorAt(0, 3);
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', 'v', 'j', 'U', 'q');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('j', '@', 'a');
-  helpers.assertCursorAt(1, 0);
-  cm.setCursor(3, 0);
-  helpers.doKeys('V', 'U', 'j', '.');
-  eq('ABCDEF\nGHIJKL\nMnopq\nSHORT LINE\nLONG LINE OF TEXT', cm.getValue());
-}, { value: 'abcdef\nghijkl\nmnopq\nshort line\nlong line of text'});
-testVim('changeCase_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(2, 1);
-  helpers.doKeys('<C-v>', 'k', 'k', 'h', 'U');
-  eq('ABcdef\nGHijkl\nMNopq\nfoo', cm.getValue());
-  cm.setCursor(0, 2);
-  helpers.doKeys('.');
-  eq('ABCDef\nGHIJkl\nMNOPq\nfoo', cm.getValue());
-  // check when last line is shorter.
-  cm.setCursor(2, 2);
-  helpers.doKeys('.');
-  eq('ABCDef\nGHIJkl\nMNOPq\nfoO', cm.getValue());
-}, { value: 'abcdef\nghijkl\nmnopq\nfoo'});
-testVim('visual_paste', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'l', 'l', 'y');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('3', 'l', 'j', 'v', 'l', 'p');
-  helpers.assertCursorAt(1, 5);
-  eq('this is a\nunithitest for visual paste', cm.getValue());
-  cm.setCursor(0, 0);
-  // in case of pasting whole line
-  helpers.doKeys('y', 'y');
-  cm.setCursor(1, 6);
-  helpers.doKeys('v', 'l', 'l', 'l', 'p');
-  helpers.assertCursorAt(2, 0);
-  eq('this is a\nunithi\nthis is a\n for visual paste', cm.getValue());
-}, { value: 'this is a\nunit test for visual paste'});
-
-// This checks the contents of the register used to paste the text
-testVim('v_paste_from_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'w');
-  cm.setCursor(1, 0);
-  helpers.doKeys('v', 'p');
-  helpers.doEx('registers');
-  is(/a\s+register/.test(helpers.getNotificationText()));
-}, { value: 'register contents\nare not erased'});
-testVim('S_normal', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('j', 'S');
-  helpers.doKeys('<Esc>');
-  helpers.assertCursorAt(1, 1);
-  eq('aa{\n  \ncc', cm.getValue());
-  helpers.doKeys('j', 'S');
-  eq('aa{\n  \n  ', cm.getValue());
-  helpers.assertCursorAt(2, 2);
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('d', 'd', 'd', 'd');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('S');
-  is(vim.insertMode);
-  eq('', cm.getValue());
-}, { value: 'aa{\nbb\ncc'});
-testVim('blockwise_paste', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-v>', '3', 'j', 'l', 'y');
-  cm.setCursor(0, 2);
-  // paste one char after the current cursor position
-  helpers.doKeys('p');
-  eq('helhelo\nworwold\nfoofo\nbarba', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', '4', 'l', 'y');
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-v>', '3', 'j', 'p');
-  eq('helheelhelo\norwold\noofo\narba', cm.getValue());
-}, { value: 'hello\nworld\nfoo\nbar'});
-testVim('blockwise_paste_long/short_line', function(cm, vim, helpers) {
-  // extend short lines in case of different line lengths.
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-v>', 'j', 'j', 'y');
-  cm.setCursor(0, 3);
-  helpers.doKeys('p');
-  eq('hellho\nfoo f\nbar b', cm.getValue());
-}, { value: 'hello\nfoo\nbar'});
-testVim('blockwise_paste_cut_paste', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-v>', '2', 'j', 'x');
-  cm.setCursor(0, 0);
-  helpers.doKeys('P');
-  eq('cut\nand\npaste\nme', cm.getValue());
-}, { value: 'cut\nand\npaste\nme'});
-testVim('blockwise_paste_from_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-v>', '2', 'j', '"', 'a', 'y');
-  cm.setCursor(0, 3);
-  helpers.doKeys('"', 'a', 'p');
-  eq('foobfar\nhellho\nworlwd', cm.getValue());
-}, { value: 'foobar\nhello\nworld'});
-testVim('blockwise_paste_last_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'y');
-  cm.setCursor(3, 0);
-  helpers.doKeys('p');
-  eq('cut\nand\npaste\nmcue\n an\n pa', cm.getValue());
-}, { value: 'cut\nand\npaste\nme'});
-
-testVim('S_visual', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('v', 'j', 'S');
-  helpers.doKeys('<Esc>');
-  helpers.assertCursorAt(0, 0);
-  eq('\ncc', cm.getValue());
-}, { value: 'aa\nbb\ncc'});
-
-testVim('d_/', function(cm, vim, helpers) {
-  helpers.doKeys('2', 'd', '/', 'match', '\n');
-  helpers.assertCursorAt(0, 0);
-  eq('match \n next', cm.getValue());
-  helpers.doKeys('d', ':', '2', '\n');
-  // TODO eq(' next', cm.getValue());
-}, { value: 'text match match \n next' });
-testVim('/ and n/N', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'match', '\n');
-  helpers.assertCursorAt(0, 11);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 6);
-  helpers.doKeys('N');
-  helpers.assertCursorAt(0, 11);
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', '/', 'match', '\n');
-  helpers.assertCursorAt(1, 6);
-}, { value: 'match nope match \n nope Match' });
-testVim('/ and gn selects the appropriate word', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'match', '\n');
-  helpers.assertCursorAt(0, 11);
-
-  // gn should highlight the the current word while it is within a match.
-
-  // gn when cursor is in beginning of match
-  helpers.doKeys('gn', '<Esc>');
-  helpers.assertCursorAt(0, 15);
-
-  // gn when cursor is at end of match
-  helpers.doKeys('gn', '<Esc>');
-  helpers.doKeys('<Esc>');
-  helpers.assertCursorAt(0, 15);
-
-  // consecutive gns should extend the selection
-  helpers.doKeys('gn');
-  helpers.assertCursorAt(0, 16);
-  helpers.doKeys('gn');
-  helpers.assertCursorAt(1, 11);
-
-  // we should have selected the second and third "match"
-  helpers.doKeys('d');
-  eq('match nope ', cm.getValue());
-}, { value: 'match nope match \n nope Match' });
-testVim('/ and gN selects the appropriate word', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'match', '\n');
-  helpers.assertCursorAt(0, 11);
-
-  // gN when cursor is at beginning of match
-  helpers.doKeys('gN', '<Esc>');
-  helpers.assertCursorAt(0, 11);
-
-  // gN when cursor is at end of match
-  helpers.doKeys('e', 'gN', '<Esc>');
-  helpers.assertCursorAt(0, 11);
-
-  // consecutive gNs should extend the selection
-  helpers.doKeys('gN');
-  helpers.assertCursorAt(0, 11);
-  helpers.doKeys('gN');
-  helpers.assertCursorAt(0, 0);
-
-  // we should have selected the first and second "match"
-  helpers.doKeys('d');
-  eq(' \n nope Match', cm.getValue());
-}, { value: 'match nope match \n nope Match' })
-testVim('/ and gn with an associated operator', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'match', '\n');
-  helpers.assertCursorAt(0, 11);
-
-  helpers.doKeys('c', 'gn', 'changed', '<Esc>');
-
-  // change the current match.
-  eq('match nope changed \n nope Match', cm.getValue());
-
-  // change the next match.
-  helpers.doKeys('.');
-  eq('match nope changed \n nope changed', cm.getValue());
-
-  // change the final match.
-  helpers.doKeys('.');
-  eq('changed nope changed \n nope changed', cm.getValue());
-}, { value: 'match nope match \n nope Match' });
-testVim('/ and gN with an associated operator', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'match', '\n');
-  helpers.assertCursorAt(0, 11);
-
-  helpers.doKeys('c', 'gN', 'changed', '<Esc>');
-
-  // change the current match.
-  eq('match nope changed \n nope Match', cm.getValue());
-
-  // change the next match.
-  helpers.doKeys('.');
-  eq('changed nope changed \n nope Match', cm.getValue());
-
-  // change the final match.
-  helpers.doKeys('.');
-  eq('changed nope changed \n nope changed', cm.getValue());
-}, { value: 'match nope match \n nope Match' });
-testVim('/_case', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'Match', '\n');
-  helpers.assertCursorAt(1, 6);
-}, { value: 'match nope match \n nope Match' });
-testVim('/_2_pcre', function(cm, vim, helpers) {
-  CodeMirror.Vim.setOption('pcre', true);
-  helpers.doKeys('/', '(word){2}', '\n');
-  helpers.assertCursorAt(1, 9);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(2, 1);
-}, { value: 'word\n another wordword\n wordwordword\n' });
-testVim('/_2_nopcre', function(cm, vim, helpers) {
-  CodeMirror.Vim.setOption('pcre', false);
-  helpers.doKeys('/', '\\(word\\)\\{2}', '\n');
-  helpers.assertCursorAt(1, 9);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(2, 1);
-}, { value: 'word\n another wordword\n wordwordword\n' });
-testVim('/_nongreedy', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'aa', '\n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa aa \n a aa'});
-testVim('?_nongreedy', function(cm, vim, helpers) {
-  helpers.doKeys('?', 'aa', '\n');
-  helpers.assertCursorAt(1, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 1);
-}, { value: 'aaa aa \n a aa'});
-testVim('/_greedy', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'a+', '\n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 1);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa aa \n a aa'});
-testVim('?_greedy', function(cm, vim, helpers) {
-  helpers.doKeys('?', 'a+', '\n');
-  helpers.assertCursorAt(1, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 1);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa aa \n a aa'});
-testVim('/_greedy_0_or_more', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'a*', '\n');
-  helpers.assertCursorAt(0, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 5);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 0);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 1);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa  aa\n aa'});
-testVim('?_greedy_0_or_more', function(cm, vim, helpers) {
-  helpers.doKeys('?', 'a*', '\n');
-  helpers.assertCursorAt(1, 1);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 0);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 5);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa  aa\n aa'});
-testVim('? and n/N', function(cm, vim, helpers) {
-  helpers.doKeys('?', 'match', '\n');
-  helpers.assertCursorAt(1, 6);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 11);
-  helpers.doKeys('N');
-  helpers.assertCursorAt(1, 6);
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', '?', 'match', '\n');
-  helpers.assertCursorAt(0, 11);
-}, { value: 'match nope match \n nope Match' });
-testVim('? and gn selects the appropriate word', function(cm, vim, helpers) {
-  helpers.doKeys('?', 'match', '\n', 'n');
-  helpers.assertCursorAt(0, 11);
-
-  // gn should highlight the the current word while it is within a match.
-
-  // gn when cursor is in beginning of match
-  helpers.doKeys('gn', '<Esc>');
-  helpers.assertCursorAt(0, 11);
-
-  // gn when cursor is at end of match
-  helpers.doKeys('e', 'gn', '<Esc>');
-  helpers.assertCursorAt(0, 11);
-
-  // consecutive gns should extend the selection
-  helpers.doKeys('gn');
-  helpers.assertCursorAt(0, 11);
-  helpers.doKeys('gn');
-  helpers.assertCursorAt(0, 0);
-
-  // we should have selected the first and second "match"
-  helpers.doKeys('d');
-  eq(' \n nope Match', cm.getValue());
-}, { value: 'match nope match \n nope Match' });
-testVim('? and gN selects the appropriate word', function(cm, vim, helpers) {
-  helpers.doKeys('?', 'match', '\n', 'n');
-  helpers.assertCursorAt(0, 11);
-
-  // gN when cursor is at beginning of match
-  helpers.doKeys('gN', '<Esc>');
-  helpers.assertCursorAt(0, 15);
-
-  // gN when cursor is at end of match
-  helpers.doKeys('gN', '<Esc>');
-  helpers.assertCursorAt(0, 15);
-
-  // consecutive gNs should extend the selection
-  helpers.doKeys('gN');
-  helpers.assertCursorAt(0, 16);
-  helpers.doKeys('gN');
-  helpers.assertCursorAt(1, 11);
-
-  // we should have selected the second and third "match"
-  helpers.doKeys('d');
-  eq('match nope ', cm.getValue());
-}, { value: 'match nope match \n nope Match' })
-testVim('? and gn with an associated operator', function(cm, vim, helpers) {
-  helpers.doKeys('?', 'match', '\n', 'n');
-  helpers.assertCursorAt(0, 11);
-
-  helpers.doKeys('c', 'gn', 'changed', '<Esc>');
-
-  // change the current match.
-  eq('match nope changed \n nope Match', cm.getValue());
-
-  // change the next match.
-  helpers.doKeys('.');
-  eq('changed nope changed \n nope Match', cm.getValue());
-
-  // change the final match.
-  helpers.doKeys('.');
-  eq('changed nope changed \n nope changed', cm.getValue());
-}, { value: 'match nope match \n nope Match' });
-testVim('? and gN with an associated operator', function(cm, vim, helpers) {
-  helpers.doKeys('?', 'match', '\n', 'n');
-  helpers.assertCursorAt(0, 11);
-
-  helpers.doKeys('c', 'gN', 'changed', '<Esc>');
-
-  // change the current match.
-  eq('match nope changed \n nope Match', cm.getValue());
-
-  // change the next match.
-  helpers.doKeys('.');
-  eq('match nope changed \n nope changed', cm.getValue());
-
-  // change the final match.
-  helpers.doKeys('.');
-  eq('changed nope changed \n nope changed', cm.getValue());
-}, { value: 'match nope match \n nope Match' });
-testVim('*', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('*');
-  helpers.assertCursorAt(0, 22);
-
-  cm.setCursor(0, 9);
-  helpers.doKeys('2', '*');
-  helpers.assertCursorAt(1, 8);
-}, { value: 'nomatch match nomatch match \nnomatch Match' });
-testVim('*_no_word', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('*');
-  helpers.assertCursorAt(0, 0);
-}, { value: ' \n match \n' });
-testVim('*_symbol', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('*');
-  helpers.assertCursorAt(1, 0);
-}, { value: ' /}\n/} match \n' });
-testVim('#', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('#');
-  helpers.assertCursorAt(1, 8);
-
-  cm.setCursor(0, 9);
-  helpers.doKeys('2', '#');
-  helpers.assertCursorAt(0, 22);
-}, { value: 'nomatch match nomatch match \nnomatch Match' });
-testVim('*_seek', function(cm, vim, helpers) {
-  // Should skip over space and symbols.
-  cm.setCursor(0, 3);
-  helpers.doKeys('*');
-  helpers.assertCursorAt(0, 22);
-}, { value: '    :=  match nomatch match \nnomatch Match' });
-testVim('#', function(cm, vim, helpers) {
-  // Should skip over space and symbols.
-  cm.setCursor(0, 3);
-  helpers.doKeys('#');
-  helpers.assertCursorAt(1, 8);
-}, { value: '    :=  match nomatch match \nnomatch Match' });
-testVim('g*', function(cm, vim, helpers) {
-  cm.setCursor(0, 8);
-  helpers.doKeys('g', '*');
-  helpers.assertCursorAt(0, 18);
-  cm.setCursor(0, 8);
-  helpers.doKeys('3', 'g', '*');
-  helpers.assertCursorAt(1, 8);
-}, { value: 'matches match alsoMatch\nmatchme matching' });
-testVim('g#', function(cm, vim, helpers) {
-  cm.setCursor(0, 8);
-  helpers.doKeys('g', '#');
-  helpers.assertCursorAt(0, 0);
-  cm.setCursor(0, 8);
-  helpers.doKeys('3', 'g', '#');
-  helpers.assertCursorAt(1, 0);
-}, { value: 'matches match alsoMatch\nmatchme matching' });
-testVim('macro_insert', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', '0', 'i');
-  helpers.doKeys('foo')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('q', '@', 'a');
-  eq('foofoo', cm.getValue());
-}, { value: ''});
-testVim('macro_insert_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', '$', 'a');
-  helpers.doKeys('larry.')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('a');
-  helpers.doKeys('curly.')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('q');
-  helpers.doKeys('a');
-  helpers.doKeys('moe.')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('@', 'a');
-  // At this point, the most recent edit should be the 2nd insert change
-  // inside the macro, i.e. "curly.".
-  helpers.doKeys('.');
-  eq('larry.curly.moe.larry.curly.curly.', cm.getValue());
-}, { value: ''});
-testVim('macro_space', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('<Space>', '<Space>');
-  helpers.assertCursorAt(0, 2);
-  helpers.doKeys('q', 'a', '<Space>', '<Space>', 'q');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('@', 'a');
-  helpers.assertCursorAt(0, 6);
-  helpers.doKeys('@', 'a');
-  helpers.assertCursorAt(0, 8);
-}, { value: 'one line of text.'});
-testVim('macro_t_search', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', 't', 'e', 'q');
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('l', '@', 'a');
-  helpers.assertCursorAt(0, 6);
-  helpers.doKeys('l', ';');
-  helpers.assertCursorAt(0, 12);
-}, { value: 'one line of text.'});
-testVim('macro_f_search', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'b', 'f', 'e', 'q');
-  helpers.assertCursorAt(0, 2);
-  helpers.doKeys('@', 'b');
-  helpers.assertCursorAt(0, 7);
-  helpers.doKeys(';');
-  helpers.assertCursorAt(0, 13);
-}, { value: 'one line of text.'});
-testVim('macro_slash_search', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'c');
-  helpers.doKeys('/', 'e', '\n', 'q');
-  helpers.assertCursorAt(0, 2);
-  helpers.doKeys('@', 'c');
-  helpers.assertCursorAt(0, 7);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 13);
-}, { value: 'one line of text.'});
-testVim('macro_multislash_search', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'd');
-  helpers.doKeys('/', 'e', '\n');
-  helpers.doKeys('/', 't', '\n', 'q');
-  helpers.assertCursorAt(0, 12);
-  helpers.doKeys('@', 'd');
-  helpers.assertCursorAt(0, 15);
-}, { value: 'one line of text to rule them all.'});
-testVim('macro_last_ex_command_register', function (cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('s/a/b');
-  helpers.doKeys('2', '@', ':');
-  eq('bbbaa', cm.getValue());
-  helpers.assertCursorAt(0, 2);
-}, { value: 'aaaaa'});
-testVim('macro_last_run_macro', function (cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', 'C', 'a', '<Esc>', 'q');
-  helpers.doKeys('q', 'b', 'C', 'b', '<Esc>', 'q');
-  helpers.doKeys('@', 'a');
-  helpers.doKeys('d', 'd');
-  helpers.doKeys('@', '@');
-  eq('a', cm.getValue());
-}, { value: ''});
-testVim('macro_parens', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'z', 'i');
-  helpers.doKeys('(')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('e', 'a');
-  helpers.doKeys(')')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('q');
-  helpers.doKeys('w', '@', 'z');
-  helpers.doKeys('w', '@', 'z');
-  eq('(see) (spot) (run)', cm.getValue());
-}, { value: 'see spot run'});
-testVim('macro_overwrite', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'z', '0', 'i');
-  helpers.doKeys('I ')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('q');
-  helpers.doKeys('e');
-  // Now replace the macro with something else.
-  helpers.doKeys('q', 'z', 'a');
-  helpers.doKeys('.')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('q');
-  helpers.doKeys('e', '@', 'z');
-  helpers.doKeys('e', '@', 'z');
-  eq('I see. spot. run.', cm.getValue());
-}, { value: 'see spot run'});
-testVim('macro_search_f', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', 'f', ' ');
-  helpers.assertCursorAt(0,3);
-  helpers.doKeys('q', '0');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys('@', 'a');
-  helpers.assertCursorAt(0,3);
-}, { value: 'The quick brown fox jumped over the lazy dog.'});
-testVim('macro_search_2f', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', '2', 'f', ' ');
-  helpers.assertCursorAt(0,9);
-  helpers.doKeys('q', '0');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys('@', 'a');
-  helpers.assertCursorAt(0,9);
-}, { value: 'The quick brown fox jumped over the lazy dog.'});
-testVim('macro_yank_tick', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  // Start recording a macro into the \' register.
-  helpers.doKeys('q', '\'');
-  helpers.doKeys('y', '<Right>', '<Right>', '<Right>', '<Right>', 'p');
-  helpers.assertCursorAt(0,4);
-  eq('the tex parrot', cm.getValue());
-}, { value: 'the ex parrot'});
-testVim('yank_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'y');
-  helpers.doKeys('j', '"', 'b', 'y', 'y');
-  helpers.doEx('registers');
-  var text = helpers.getNotificationText();
-  is(/a\s+foo/.test(text));
-  is(/b\s+bar/.test(text));
-}, { value: 'foo\nbar'});
-testVim('yank_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('<C-v>', 'l', 'j', '"', 'a', 'y');
-  helpers.doEx('registers');
-  is(/a\s+oo\nar/.test(helpers.getNotificationText()));
-}, { value: 'foo\nbar'});
-testVim('yank_append_line_to_line_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'y');
-  helpers.doKeys('j', '"', 'A', 'y', 'y');
-  helpers.doEx('registers');
-  var text = helpers.getNotificationText();
-  is(/a\s+foo\nbar/.test(text));
-  is(/"\s+foo\nbar/.test(text));
-}, { value: 'foo\nbar'});
-testVim('yank_append_word_to_word_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'w');
-  helpers.doKeys('j', '"', 'A', 'y', 'w');
-  helpers.doEx('registers');
-  var text = helpers.getNotificationText();
-  is(/a\s+foobar/.test(text));
-  is(/"\s+foobar/.test(text));
-}, { value: 'foo\nbar'});
-testVim('yank_append_line_to_word_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'w');
-  helpers.doKeys('j', '"', 'A', 'y', 'y');
-  helpers.doEx('registers');
-  var text = helpers.getNotificationText();
-  is(/a\s+foo\nbar/.test(text));
-  is(/"\s+foo\nbar/.test(text));
-}, { value: 'foo\nbar'});
-testVim('yank_append_word_to_line_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'y');
-  helpers.doKeys('j', '"', 'A', 'y', 'w');
-  helpers.doEx('registers');
-  var text = helpers.getNotificationText();
-  is(/a\s+foo\nbar/.test(text));
-  is(/"\s+foo\nbar/.test(text));
-}, { value: 'foo\nbar'});
-testVim('black_hole_register', function(cm,vim,helpers) {
-  helpers.doKeys('g', 'g', 'y', 'G');
-  helpers.doEx('registers');
-  var registersText = helpers.getNotificationText();
-  helpers.doKeys('"', '_', 'd', 'G');
-  helpers.doEx('registers');
-  eq(registersText, helpers.getNotificationText(), 'One or more registers were modified');
-  helpers.doKeys('"', '_', 'p');
-  eq('', cm.getValue());
-}, { value: 'foo\nbar'});
-testVim('macro_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', 'i');
-  helpers.doKeys('gangnam')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('q');
-  helpers.doKeys('q', 'b', 'o');
-  helpers.doKeys('style')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('q');
-  helpers.doEx('registers');
-  var text = helpers.getNotificationText();
-  is(/a\s+i/.test(text));
-  is(/b\s+o/.test(text));
-}, { value: ''});
-testVim('._register', function(cm,vim,helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys('i');
-  helpers.doKeys('foo')
-  helpers.doKeys('<Esc>');
-  helpers.doEx('registers');
-  is(/\.\s+foo/.test(helpers.getNotificationText()));
-}, {value: ''});
-testVim(':_register', function(cm,vim,helpers) {
-  helpers.doEx('bar');
-  helpers.doEx('registers');
-  is(/:\s+bar/.test(helpers.getNotificationText()));
-}, {value: ''});
-testVim('registers_html_encoding', function(cm,vim,helpers) {
-  helpers.doKeys('y', 'y');
-  helpers.doEx('registers');
-  is(/"\s+<script>throw "&amp;"<\/script>/.test(helpers.getNotificationText()));
-}, {value: '<script>throw "&amp;"</script>'});
-testVim('search_register_escape', function(cm, vim, helpers) {
-  // Check that the register is restored if the user escapes rather than confirms.
-  helpers.doKeys('/', 'waldo', '\n');
-  helpers.doKeys('/', 'foo', '<Esc>');
-  helpers.doEx('registers');
-  var text = helpers.getNotificationText();
-  is(/waldo/.test(text));
-  is(!/foo/.test(text));
-}, {value: ''});
-testVim('search_register', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'foo', '\n');
-  helpers.doEx('registers');
-  is(/\/\s+foo/.test(helpers.getNotificationText()));
-}, {value: ''});
-testVim('search_history', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'this', '\n');
-  helpers.doKeys('/', 'checks', '\n');
-  helpers.doKeys('/', 'search', '\n');
-  helpers.doKeys('/', 'history', '\n');
-  helpers.doKeys('/', 'checks', '\n');
-  helpers.doKeys('/');
-  helpers.doKeys('Up');
-  eq(document.activeElement.value, 'checks');
-  helpers.doKeys('Up');
-  eq(document.activeElement.value, 'history');
-  helpers.doKeys('Up');
-  eq(document.activeElement.value, 'search');
-  helpers.doKeys('Up');
-  eq(document.activeElement.value, 'this');
-  helpers.doKeys('Down');
-  eq(document.activeElement.value, 'search');
-}, {value: ''});
-testVim('exCommand_history', function(cm, vim, helpers) {
-  helpers.doEx('registers');
-  helpers.doEx('sort');
-  helpers.doEx('map');
-  helpers.doEx('invalid');
-  helpers.doKeys(':');
-  helpers.doKeys('Up');
-  eq(document.activeElement.value, 'invalid');
-  helpers.doKeys('Up');
-  eq(document.activeElement.value, 'map');
-  helpers.doKeys('Up');
-  eq(document.activeElement.value, 'sort');
-  helpers.doKeys('Up');
-  eq(document.activeElement.value, 'registers');
-  helpers.doKeys('<Esc>', ':');
-  helpers.doKeys('s');
-  eq(document.activeElement.value, 's');
-  helpers.doKeys('Up');
-  eq(document.activeElement.value, 'sort');
-}, {value: ''});
-testVim('search_clear', function(cm, vim, helpers) {
-  helpers.doKeys('/', 'foo');
-  eq(document.activeElement.value, 'foo');
-  helpers.doKeys('<C-u>');
-  eq(document.activeElement.value, '');
-});
-testVim('exCommand_clear', function(cm, vim, helpers) {
-  helpers.doKeys(':', 'foo');
-  eq(document.activeElement.value, 'foo');
-  helpers.doKeys('<C-u>');
-  eq(document.activeElement.value, '');
-});
-testVim('.', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', 'd', 'w');
-  helpers.doKeys('.');
-  eq('5 6', cm.getValue());
-}, { value: '1 2 3 4 5 6'});
-testVim('._repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', 'd', 'w');
-  helpers.doKeys('3', '.');
-  eq('6', cm.getValue());
-}, { value: '1 2 3 4 5 6'});
-testVim('._insert', function(cm, vim, helpers) {
-  helpers.doKeys('i');
-  helpers.doKeys('test')
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('.');
-  eq('testestt', cm.getValue());
-  helpers.assertCursorAt(0, 6);
-  helpers.doKeys('O');
-  helpers.doKeys('xyz')
-  helpers.doKeys('Backspace');
-  helpers.doKeys('Down');
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('.');
-  eq('xy\nxy\ntestestt', cm.getValue());
-  helpers.assertCursorAt(1, 1);
-}, { value: ''});
-testVim('._insert_repeat', function(cm, vim, helpers) {
-  helpers.doKeys('i');
-  helpers.doKeys('test')
-  cm.setCursor(0, 4);
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('2', '.');
-  eq('testesttestt', cm.getValue());
-  helpers.assertCursorAt(0, 10);
-}, { value: ''});
-testVim('._repeat_insert', function(cm, vim, helpers) {
-  helpers.doKeys('3', 'i');
-  helpers.doKeys('te')
-  cm.setCursor(0, 2);
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('.');
-  eq('tetettetetee', cm.getValue());
-  helpers.assertCursorAt(0, 10);
-}, { value: ''});
-testVim('._insert_o', function(cm, vim, helpers) {
-  helpers.doKeys('o');
-  helpers.doKeys('z')
-  cm.setCursor(1, 1);
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('.');
-  eq('\nz\nz', cm.getValue());
-  helpers.assertCursorAt(2, 0);
-}, { value: ''});
-testVim('._insert_o_repeat', function(cm, vim, helpers) {
-  helpers.doKeys('o');
-  helpers.doKeys('z')
-  helpers.doKeys('<Esc>');
-  cm.setCursor(1, 0);
-  helpers.doKeys('2', '.');
-  eq('\nz\nz\nz', cm.getValue());
-  helpers.assertCursorAt(3, 0);
-}, { value: ''});
-testVim('._insert_o_indent', function(cm, vim, helpers) {
-  helpers.doKeys('o');
-  helpers.doKeys('z')
-  helpers.doKeys('<Esc>');
-  cm.setCursor(1, 2);
-  helpers.doKeys('.');
-  eq('{\n  z\n  z', cm.getValue());
-  helpers.assertCursorAt(2, 2);
-}, { value: '{'});
-testVim('._insert_cw', function(cm, vim, helpers) {
-  helpers.doKeys('c', 'w');
-  helpers.doKeys('test')
-  helpers.doKeys('<Esc>');
-  cm.setCursor(0, 3);
-  helpers.doKeys('2', 'l');
-  helpers.doKeys('.');
-  eq('test test word3', cm.getValue());
-  helpers.assertCursorAt(0, 8);
-}, { value: 'word1 word2 word3' });
-testVim('._insert_cw_repeat', function(cm, vim, helpers) {
-  // For some reason, repeat cw in desktop VIM will does not repeat insert mode
-  // changes. Will conform to that behavior.
-  helpers.doKeys('c', 'w');
-  helpers.doKeys('test');
-  helpers.doKeys('<Esc>');
-  cm.setCursor(0, 4);
-  helpers.doKeys('l');
-  helpers.doKeys('2', '.');
-  eq('test test', cm.getValue());
-  helpers.assertCursorAt(0, 8);
-}, { value: 'word1 word2 word3' });
-testVim('._delete', function(cm, vim, helpers) {
-  cm.setCursor(0, 5);
-  helpers.doKeys('i');
-  helpers.doKeys('Backspace');
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('.');
-  eq('zace', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-}, { value: 'zabcde'});
-testVim('._delete_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 6);
-  helpers.doKeys('i');
-  helpers.doKeys('Backspace');
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('2', '.');
-  eq('zzce', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-}, { value: 'zzabcde'});
-testVim('._visual_>', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('V', 'j', '>');
-  cm.setCursor(2, 0)
-  helpers.doKeys('.');
-  eq('  1\n  2\n  3\n  4', cm.getValue());
-  helpers.assertCursorAt(2, 2);
-}, { value: '1\n2\n3\n4'});
-testVim('._replace_repeat', function(cm, vim, helpers) {
-  helpers.doKeys('R');
-  cm.replaceRange('123', cm.getCursor(), offsetCursor(cm.getCursor(), 0, 3));
-  cm.setCursor(0, 3);
-  helpers.doKeys('<Esc>');
-  helpers.doKeys('2', '.');
-  eq('12123123\nabcdefg', cm.getValue());
-  helpers.assertCursorAt(0, 7);
-  cm.setCursor(1, 0);
-  helpers.doKeys('.');
-  eq('12123123\n123123g', cm.getValue());
-  helpers.doKeys('l', '"', '.', 'p');
-  eq('12123123\n123123g123', cm.getValue());
-}, { value: 'abcdef\nabcdefg'});
-testVim('f;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('f', 'x');
-  helpers.doKeys(';');
-  helpers.doKeys('2', ';');
-  eq(9, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('F;', function(cm, vim, helpers) {
-  cm.setCursor(0, 8);
-  helpers.doKeys('F', 'x');
-  helpers.doKeys(';');
-  helpers.doKeys('2', ';');
-  eq(2, cm.getCursor().ch);
-}, { value: '01x3xx6x8x'});
-testVim('t;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('t', 'x');
-  helpers.doKeys(';');
-  helpers.doKeys('2', ';');
-  eq(8, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('T;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('T', 'x');
-  helpers.doKeys(';');
-  helpers.doKeys('2', ';');
-  eq(2, cm.getCursor().ch);
-}, { value: '0xx3xx678x'});
-testVim('f,', function(cm, vim, helpers) {
-  cm.setCursor(0, 6);
-  helpers.doKeys('f', 'x');
-  helpers.doKeys(',');
-  helpers.doKeys('2', ',');
-  eq(2, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('F,', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  helpers.doKeys('F', 'x');
-  helpers.doKeys(',');
-  helpers.doKeys('2', ',');
-  eq(9, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('t,', function(cm, vim, helpers) {
-  cm.setCursor(0, 6);
-  helpers.doKeys('t', 'x');
-  helpers.doKeys(',');
-  helpers.doKeys('2', ',');
-  eq(3, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('T,', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('T', 'x');
-  helpers.doKeys(',');
-  helpers.doKeys('2', ',');
-  eq(8, cm.getCursor().ch);
-}, { value: '01x3xx67xx'});
-testVim('fd,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('f', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ';');
-  eq('56789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('d', ',');
-  eq('01239', cm.getValue());
-}, { value: '0123456789'});
-testVim('Fd,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('F', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('d', ';');
-  eq('01239', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ',');
-  eq('56789', cm.getValue());
-}, { value: '0123456789'});
-testVim('td,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('t', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ';');
-  eq('456789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('d', ',');
-  eq('012349', cm.getValue());
-}, { value: '0123456789'});
-testVim('Td,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('T', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('d', ';');
-  eq('012349', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ',');
-  eq('456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('fc,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('f', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', ';', '<Esc>');
-  eq('56789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('c', ',');
-  eq('01239', cm.getValue());
-}, { value: '0123456789'});
-testVim('Fc,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('F', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('c', ';', '<Esc>');
-  eq('01239', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', ',');
-  eq('56789', cm.getValue());
-}, { value: '0123456789'});
-testVim('tc,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('t', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', ';', '<Esc>');
-  eq('456789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('c', ',');
-  eq('012349', cm.getValue());
-}, { value: '0123456789'});
-testVim('Tc,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('T', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('c', ';', '<Esc>');
-  eq('012349', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', ',');
-  eq('456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('fy,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('f', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('y', ';', 'P');
-  eq('012340123456789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('y', ',', 'P');
-  eq('012345678456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('Fy,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('F', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('y', ';', 'p');
-  eq('012345678945678', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('y', ',', 'P');
-  eq('012340123456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('ty,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('t', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('y', ';', 'P');
-  eq('01230123456789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('y', ',', 'p');
-  eq('01234567895678', cm.getValue());
-}, { value: '0123456789'});
-testVim('Ty,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('T', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('y', ';', 'p');
-  eq('01234567895678', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('y', ',', 'P');
-  eq('01230123456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('HML', function(cm, vim, helpers) {
-  cm.refresh();
-  var lines = 35;
-  var textHeight = cm.defaultTextHeight();
-  cm.setSize(600, lines*textHeight);
-  cm.setCursor(120, 0);
-  helpers.doKeys('H');
-  helpers.assertCursorAt(86, 2);
-  helpers.doKeys('L');
-  helpers.assertCursorAt(120, 4);
-  helpers.doKeys('M');
-  helpers.assertCursorAt(103,4);
-}, { value: (function(){
-  var lines = new Array(100);
-  var upper = '  xx\n';
-  var lower = '    xx\n';
-  upper = lines.join(upper);
-  lower = lines.join(lower);
-  return upper + lower;
-})()});
-
-var zVals = [];
-var cursorIndexVals = [];
-forEach(['zb','zz','zt','z-','z.','z<CR>'], function(e, idx){
-  var lineNum = 250;
-  var lines = 35;
-  testVim(e, function(cm, vim, helpers) {
-    cm.refresh();
-    var k1 = e[0];
-    var k2 = e.substring(1);
-    var textHeight = cm.defaultTextHeight();
-    cm.setSize(600, lines*textHeight);
-    cm.setCursor(lineNum, 1);
-    var originalCursorIndex = cm.indexFromPos(cm.getCursor());
-    helpers.doKeys(k1, k2);
-    zVals[idx] = cm.getScrollInfo().top;
-    cursorIndexVals[idx] = {
-      before: originalCursorIndex,
-      after: cm.indexFromPos(cm.getCursor())
-    };
-  }, { value: (function(){
-    return new Array(500).join('12\n');
-  })()});
-});
-testVim('zb_to_bottom', function(cm, vim, helpers){
-  cm.refresh();
-  var lineNum = 250;
-  cm.setSize(600, 35*cm.defaultTextHeight());
-  cm.setCursor(lineNum, 0);
-  helpers.doKeys('z', 'b');
-  var scrollInfo = cm.getScrollInfo();
-  eq(scrollInfo.top + scrollInfo.clientHeight, cm.charCoords(new Pos(lineNum, 0), 'local').bottom);
-}, { value: (function(){
-  return new Array(500).join('\n');
-})()});
-testVim('zt_to_top', function(cm, vim, helpers){
-  cm.refresh();
-  var lineNum = 250;
-  cm.setSize(600, 35*cm.defaultTextHeight());
-  cm.setCursor(lineNum, 0);
-  helpers.doKeys('z', 't');
-  eq(cm.getScrollInfo().top, cm.charCoords(new Pos(lineNum, 0), 'local').top);
-}, { value: (function(){
-  return new Array(500).join('\n');
-})()});
-testVim('zb<zz', function(cm, vim, helpers){
-  eq(zVals[0]<zVals[1], true);
-});
-testVim('zz<zt', function(cm, vim, helpers){
-  eq(zVals[1]<zVals[2], true);
-});
-testVim('zb==z-', function(cm, vim, helpers){
-  eq(zVals[0], zVals[3]);
-});
-testVim('zz==z.', function(cm, vim, helpers){
-  eq(zVals[1], zVals[4]);
-});
-testVim('zt==z<CR>', function(cm, vim, helpers){
-  eq(zVals[2], zVals[5]);
-});
-testVim('zt_no_cursor_change', function(cm, vim, helpers){
-  var cursorIndexes = cursorIndexVals[2]
-  eq(cursorIndexes.before, cursorIndexes.after);
-});
-testVim('z<CR>_cursor_change', function(cm, vim, helpers){
-  var cursorIndexes = cursorIndexVals[5]
-  notEq(cursorIndexes.before, cursorIndexes.after);
-});
-testVim('zz_no_cursor_change', function(cm, vim, helpers){
-  var cursorIndexes = cursorIndexVals[1]
-  eq(cursorIndexes.before, cursorIndexes.after);
-});
-testVim('z._cursor_change', function(cm, vim, helpers){
-  var cursorIndexes = cursorIndexVals[4]
-  notEq(cursorIndexes.before, cursorIndexes.after);
-});
-testVim('zb_no_cursor_change', function(cm, vim, helpers){
-  var cursorIndexes = cursorIndexVals[0]
-  eq(cursorIndexes.before, cursorIndexes.after);
-});
-testVim('z-_cursor_change', function(cm, vim, helpers){
-  var cursorIndexes = cursorIndexVals[3]
-  notEq(cursorIndexes.before, cursorIndexes.after);
-});
-
-var moveTillCharacterSandbox =
-  'The quick brown fox \n';
-testVim('moveTillCharacter', function(cm, vim, helpers){
-  cm.setCursor(0, 0);
-  // Search for the 'q'.
-  helpers.doKeys('/', 'q', '\n');
-  eq(4, cm.getCursor().ch);
-  // Jump to just before the first o in the list.
-  helpers.doKeys('t');
-  helpers.doKeys('o');
-  eq('The quick brown fox \n', cm.getValue());
-  // Delete that one character.
-  helpers.doKeys('d');
-  helpers.doKeys('t');
-  helpers.doKeys('o');
-  eq('The quick bown fox \n', cm.getValue());
-  // Delete everything until the next 'o'.
-  helpers.doKeys('.');
-  eq('The quick box \n', cm.getValue());
-  // An unmatched character should have no effect.
-  helpers.doKeys('d');
-  helpers.doKeys('t');
-  helpers.doKeys('q');
-  eq('The quick box \n', cm.getValue());
-  // Matches should only be possible on single lines.
-  helpers.doKeys('d');
-  helpers.doKeys('t');
-  helpers.doKeys('z');
-  eq('The quick box \n', cm.getValue());
-  // After all that, the search for 'q' should still be active, so the 'N' command
-  // can run it again in reverse. Use that to delete everything back to the 'q'.
-  helpers.doKeys('d');
-  helpers.doKeys('N');
-  eq('The ox \n', cm.getValue());
-  eq(4, cm.getCursor().ch);
-}, { value: moveTillCharacterSandbox});
-testVim('searchForPipe', function(cm, vim, helpers){
-  CodeMirror.Vim.setOption('pcre', false);
-  cm.setCursor(0, 0);
-  // Search for the '|'.
-  helpers.doKeys('/', '|', '\n');
-  eq(4, cm.getCursor().ch);
-}, { value: 'this|that'});
-
-
-var scrollMotionSandbox =
-  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n';
-testVim('scrollMotion', function(cm, vim, helpers){
-  var prevCursor, prevScrollInfo;
-  cm.setCursor(0, 0);
-  // ctrl-y at the top of the file should have no effect.
-  helpers.doKeys('<C-y>');
-  eq(0, cm.getCursor().line);
-  prevScrollInfo = cm.getScrollInfo();
-  helpers.doKeys('<C-e>');
-  eq(1, cm.getCursor().line);
-  is(prevScrollInfo.top < cm.getScrollInfo().top);
-  // Jump to the end of the sandbox.
-  cm.setCursor(1000, 0);
-  prevCursor = cm.getCursor();
-  // ctrl-e at the bottom of the file should have no effect.
-  helpers.doKeys('<C-e>');
-  eq(prevCursor.line, cm.getCursor().line);
-  prevScrollInfo = cm.getScrollInfo();
-  helpers.doKeys('<C-y>');
-  eq(prevCursor.line - 1, cm.getCursor().line, "Y");
-  is(prevScrollInfo.top > cm.getScrollInfo().top);
-}, { value: scrollMotionSandbox});
-
-var squareBracketMotionSandbox = ''+
-  '({\n'+//0
-  '  ({\n'+//11
-  '  /*comment {\n'+//2
-  '            */(\n'+//3
-  '#else                \n'+//4
-  '  /*       )\n'+//5
-  '#if        }\n'+//6
-  '  )}*/\n'+//7
-  ')}\n'+//8
-  '{}\n'+//9
-  '#else {{\n'+//10
-  '{}\n'+//11
-  '}\n'+//12
-  '{\n'+//13
-  '#endif\n'+//14
-  '}\n'+//15
-  '}\n'+//16
-  '#else';//17
-testVim('[[, ]]', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys(']', ']');
-  helpers.assertCursorAt(9,0);
-  helpers.doKeys('2', ']', ']');
-  helpers.assertCursorAt(13,0);
-  helpers.doKeys(']', ']');
-  helpers.assertCursorAt(17,0);
-  helpers.doKeys('[', '[');
-  helpers.assertCursorAt(13,0);
-  helpers.doKeys('2', '[', '[');
-  helpers.assertCursorAt(9,0);
-  helpers.doKeys('[', '[');
-  helpers.assertCursorAt(0,0);
-}, { value: squareBracketMotionSandbox});
-testVim('[], ][', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys(']', '[');
-  helpers.assertCursorAt(12,0);
-  helpers.doKeys('2', ']', '[');
-  helpers.assertCursorAt(16,0);
-  helpers.doKeys(']', '[');
-  helpers.assertCursorAt(17,0);
-  helpers.doKeys('[', ']');
-  helpers.assertCursorAt(16,0);
-  helpers.doKeys('2', '[', ']');
-  helpers.assertCursorAt(12,0);
-  helpers.doKeys('[', ']');
-  helpers.assertCursorAt(0,0);
-}, { value: squareBracketMotionSandbox});
-testVim('[{, ]}', function(cm, vim, helpers) {
-  cm.setCursor(4, 10);
-  helpers.doKeys('[', '{');
-  helpers.assertCursorAt(2,12);
-  helpers.doKeys('2', '[', '{');
-  helpers.assertCursorAt(0,1);
-  cm.setCursor(4, 10);
-  helpers.doKeys(']', '}');
-  helpers.assertCursorAt(6,11);
-  helpers.doKeys('2', ']', '}');
-  helpers.assertCursorAt(8,1);
-  cm.setCursor(0,1);
-  helpers.doKeys(']', '}');
-  helpers.assertCursorAt(8,1);
-  helpers.doKeys('[', '{');
-  helpers.assertCursorAt(0,1);
-}, { value: squareBracketMotionSandbox});
-testVim('[(, ])', function(cm, vim, helpers) {
-  cm.setCursor(4, 10);
-  helpers.doKeys('[', '(');
-  helpers.assertCursorAt(3,14);
-  helpers.doKeys('2', '[', '(');
-  helpers.assertCursorAt(0,0);
-  cm.setCursor(4, 10);
-  helpers.doKeys(']', ')');
-  helpers.assertCursorAt(5,11);
-  helpers.doKeys('2', ']', ')');
-  helpers.assertCursorAt(8,0);
-  helpers.doKeys('[', '(');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys(']', ')');
-  helpers.assertCursorAt(8,0);
-}, { value: squareBracketMotionSandbox});
-testVim('[*, ]*, [/, ]/', function(cm, vim, helpers) {
-  forEach(['*', '/'], function(key){
-    cm.setCursor(7, 0);
-    helpers.doKeys('2', '[', key);
-    helpers.assertCursorAt(2,2);
-    helpers.doKeys('2', ']', key);
-    helpers.assertCursorAt(7,5);
-  });
-}, { value: squareBracketMotionSandbox});
-testVim('[#, ]#', function(cm, vim, helpers) {
-  cm.setCursor(10, 3);
-  helpers.doKeys('2', '[', '#');
-  helpers.assertCursorAt(4,0);
-  helpers.doKeys('5', ']', '#');
-  helpers.assertCursorAt(17,0);
-  cm.setCursor(10, 3);
-  helpers.doKeys(']', '#');
-  helpers.assertCursorAt(14,0);
-}, { value: squareBracketMotionSandbox});
-testVim('[m, ]m, [M, ]M', function(cm, vim, helpers) {
-  cm.setCursor(11, 0);
-  helpers.doKeys('[', 'm');
-  helpers.assertCursorAt(10,7);
-  helpers.doKeys('4', '[', 'm');
-  helpers.assertCursorAt(1,3);
-  helpers.doKeys('5', ']', 'm');
-  helpers.assertCursorAt(11,0);
-  helpers.doKeys('[', 'M');
-  helpers.assertCursorAt(9,1);
-  helpers.doKeys('3', ']', 'M');
-  helpers.assertCursorAt(15,0);
-  helpers.doKeys('5', '[', 'M');
-  helpers.assertCursorAt(7,3);
-}, { value: squareBracketMotionSandbox});
-
-testVim('i_indent_right', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedValue = '   word1\nword2\nword3 ';
-  helpers.doKeys('i', '<C-t>');
-  eq(expectedValue, cm.getValue());
-  helpers.assertCursorAt(0, 5);
-}, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
-testVim('i_indent_left', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedValue = ' word1\nword2\nword3 ';
-  helpers.doKeys('i', '<C-d>');
-  eq(expectedValue, cm.getValue());
-  helpers.assertCursorAt(0, 1);
-}, { value: '   word1\nword2\nword3 ', indentUnit: 2 });
-
-// Ex mode tests
-testVim('ex_go_to_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('4');
-  helpers.assertCursorAt(3, 0);
-}, { value: 'a\nb\nc\nd\ne\n'});
-testVim('ex_go_to_mark', function(cm, vim, helpers) {
-  cm.setCursor(3, 0);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(0, 0);
-  helpers.doEx('\'a');
-  helpers.assertCursorAt(3, 0);
-}, { value: 'a\nb\nc\nd\ne\n'});
-testVim('ex_go_to_line_offset', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('+3');
-  helpers.assertCursorAt(3, 0);
-  helpers.doEx('-1');
-  helpers.assertCursorAt(2, 0);
-  helpers.doEx('.2');
-  helpers.assertCursorAt(4, 0);
-  helpers.doEx('.-3');
-  helpers.assertCursorAt(1, 0);
-}, { value: 'a\nb\nc\nd\ne\n'});
-testVim('ex_go_to_mark_offset', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(0, 0);
-  helpers.doEx('\'a1');
-  helpers.assertCursorAt(3, 0);
-  helpers.doEx('\'a-1');
-  helpers.assertCursorAt(1, 0);
-  helpers.doEx('\'a+2');
-  helpers.assertCursorAt(4, 0);
-}, { value: 'a\nb\nc\nd\ne\n'});
-testVim('ex_write', function(cm, vim, helpers) {
-  var tmp = CodeMirror.commands.save;
-  var written;
-  var actualCm;
-  CodeMirror.commands.save = function(cm) {
-    written = true;
-    actualCm = cm;
-  };
-  // Test that w, wr, wri ... write all trigger :write.
-  var command = 'write';
-  for (var i = 1; i < command.length; i++) {
-    written = false;
-    actualCm = null;
-    helpers.doEx(command.substring(0, i));
-    eq(written, true);
-    eq(actualCm, cm);
-  }
-  CodeMirror.commands.save = tmp;
-});
-testVim('ex_sort', function(cm, vim, helpers) {
-  helpers.doEx('sort');
-  eq('Z\na\nb\nc\nd', cm.getValue());
-}, { value: 'b\nZ\nd\nc\na'});
-testVim('ex_sort_reverse', function(cm, vim, helpers) {
-  helpers.doEx('sort!');
-  eq('d\nc\nb\na', cm.getValue());
-}, { value: 'b\nd\nc\na'});
-testVim('ex_sort_range', function(cm, vim, helpers) {
-  helpers.doEx('2,3sort');
-  eq('b\nc\nd\na', cm.getValue());
-}, { value: 'b\nd\nc\na'});
-testVim('ex_sort_oneline', function(cm, vim, helpers) {
-  helpers.doEx('2sort');
-  // Expect no change.
-  eq('b\nd\nc\na', cm.getValue());
-}, { value: 'b\nd\nc\na'});
-testVim('ex_sort_ignoreCase', function(cm, vim, helpers) {
-  helpers.doEx('sort i');
-  eq('a\nb\nc\nd\nZ', cm.getValue());
-}, { value: 'b\nZ\nd\nc\na'});
-testVim('ex_sort_unique', function(cm, vim, helpers) {
-  helpers.doEx('sort u');
-  eq('Z\na\nb\nc\nd', cm.getValue());
-}, { value: 'b\nZ\na\na\nd\na\nc\na'});
-testVim('ex_sort_decimal', function(cm, vim, helpers) {
-  helpers.doEx('sort d');
-  eq('d3\n s5\n6\n.9', cm.getValue());
-}, { value: '6\nd3\n s5\n.9'});
-testVim('ex_sort_decimal_negative', function(cm, vim, helpers) {
-  helpers.doEx('sort d');
-  eq('z-9\nd3\n s5\n6\n.9', cm.getValue());
-}, { value: '6\nd3\n s5\n.9\nz-9'});
-testVim('ex_sort_decimal_reverse', function(cm, vim, helpers) {
-  helpers.doEx('sort! d');
-  eq('.9\n6\n s5\nd3', cm.getValue());
-}, { value: '6\nd3\n s5\n.9'});
-testVim('ex_sort_hex', function(cm, vim, helpers) {
-  helpers.doEx('sort x');
-  eq(' s5\n6\n.9\n&0xB\nd3', cm.getValue());
-}, { value: '6\nd3\n s5\n&0xB\n.9'});
-testVim('ex_sort_octal', function(cm, vim, helpers) {
-  helpers.doEx('sort o');
-  eq('.9\n.8\nd3\n s5\n6', cm.getValue());
-}, { value: '6\nd3\n s5\n.9\n.8'});
-testVim('ex_sort_decimal_mixed', function(cm, vim, helpers) {
-  helpers.doEx('sort d');
-  eq('z\ny\nc1\nb2\na3', cm.getValue());
-}, { value: 'a3\nz\nc1\ny\nb2'});
-testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
-  helpers.doEx('sort! d');
-  eq('a3\nb2\nc1\nz\ny', cm.getValue());
-}, { value: 'a3\nz\nc1\ny\nb2'});
-testVim('ex_sort_pattern_alpha', function(cm, vim, helpers) {
-  helpers.doEx('sort /[a-z]/');
-  eq('a3\nb2\nc1\ny\nz', cm.getValue());
-}, { value: 'z\ny\nc1\nb2\na3'});
-testVim('ex_sort_pattern_alpha_reverse', function(cm, vim, helpers) {
-  helpers.doEx('sort! /[a-z]/');
-  eq('z\ny\nc1\nb2\na3', cm.getValue());
-}, { value: 'z\ny\nc1\nb2\na3'});
-testVim('ex_sort_pattern_alpha_ignoreCase', function(cm, vim, helpers) {
-  helpers.doEx('sort i/[a-z]/');
-  eq('a3\nb2\nC1\nY\nz', cm.getValue());
-}, { value: 'z\nY\nC1\nb2\na3'});
-testVim('ex_sort_pattern_alpha_longer', function(cm, vim, helpers) {
-  helpers.doEx('sort /[a-z]+/');
-  eq('a\naa\nab\nade\nadele\nadelle\nadriana\nalex\nalexandra\nb\nc\ny\nz', cm.getValue());
-}, { value: 'z\nab\naa\nade\nadelle\nalexandra\nalex\nadriana\nadele\ny\nc\nb\na'});
-testVim('ex_sort_pattern_alpha_only', function(cm, vim, helpers) {
-  helpers.doEx('sort /^[a-z]$/');
-  eq('z1\ny2\na3\nb\nc', cm.getValue());
-}, { value: 'z1\ny2\na3\nc\nb'});
-testVim('ex_sort_pattern_alpha_only_reverse', function(cm, vim, helpers) {
-  helpers.doEx('sort! /^[a-z]$/');
-  eq('c\nb\nz1\ny2\na3', cm.getValue());
-}, { value: 'z1\ny2\na3\nc\nb'});
-testVim('ex_sort_pattern_alpha_num', function(cm, vim, helpers) {
-  helpers.doEx('sort /[a-z][0-9]/');
-  eq('c\nb\na3\ny2\nz1', cm.getValue());
-}, { value: 'z1\ny2\na3\nc\nb'});
-// test for :global command
-testVim('ex_global', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('g/one/s//two');
-  eq('two one\n two one\n two one', cm.getValue());
-  helpers.doEx('1,2g/two/s//one');
-  eq('one one\n one one\n two one', cm.getValue());
-  helpers.doEx('g/^ /');
-  eq(' one one\n two one', helpers.getNotificationText());
-}, {value: 'one one\n one one\n one one'});
-testVim('ex_global_substitute_join', function(cm, vim, helpers) {
-  helpers.doEx('g/o/s/\\n/;');
-  eq('one;two\nthree\nfour;five\n', cm.getValue());
-}, {value: 'one\ntwo\nthree\nfour\nfive\n'});
-testVim('ex_global_substitute_split', function(cm, vim, helpers) {
-  helpers.doEx('g/e/s/[or]/\\n');
-  eq('\nne\ntwo\nth\nee\nfour\nfive\n', cm.getValue());
-}, {value: 'one\ntwo\nthree\nfour\nfive\n'});
-testVim('ex_global_confirm', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('g/one/s//two/gc');
-  helpers.doKeys('n');
-  helpers.doKeys('y');
-  helpers.doKeys('a');
-  helpers.doKeys('q');
-  helpers.doKeys('y');
-  eq('one two\n two two\n one one\n two one\n one one', cm.getValue());
-}, {value: 'one one\n one one\n one one\n one one\n one one'});
-// test for :vglobal command
-testVim('ex_vglobal', function(cm, vim, helpers) {
-  helpers.doEx('v/e/s/o/e');
-  eq('one\n twe\n three\n feur\n five\n', cm.getValue());
-  helpers.doEx('v/[vw]');
-  eq('one\n three\n feur\n', helpers.getNotificationText());
-}, {value: 'one\n two\n three\n four\n five\n'});
-// Basic substitute tests.
-testVim('ex_substitute_same_line', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('s/one/two/g');
-  eq('one one\n two two', cm.getValue());
-}, { value: 'one one\n one one'});
-testVim('ex_substitute_alternate_separator', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('s#o/e#two#g');
-  eq('o/e o/e\n two two', cm.getValue());
-}, { value: 'o/e o/e\n o/e o/e'});
-testVim('ex_substitute_full_file', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('%s/one/two/g');
-  eq('two two\n two two', cm.getValue());
-}, { value: 'one one\n one one'});
-testVim('ex_substitute_input_range', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('1,3s/\\d/0/g');
-  eq('0\n0\n0\n4', cm.getValue());
-}, { value: '1\n2\n3\n4' });
-testVim('ex_substitute_range_current_to_input', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('.,3s/\\d/0/g');
-  eq('1\n0\n0\n4', cm.getValue());
-}, { value: '1\n2\n3\n4' });
-testVim('ex_substitute_range_input_to_current', function(cm, vim, helpers) {
-  cm.setCursor(3, 0);
-  helpers.doEx('2,.s/\\d/0/g');
-  eq('1\n0\n0\n0\n5', cm.getValue());
-}, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_range_offset', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doEx('-1,+1s/\\d/0/g');
-  eq('1\n0\n0\n0\n5', cm.getValue());
-}, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_range_implicit_offset', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('.1,.3s/\\d/0/g');
-  eq('1\n0\n0\n0\n5', cm.getValue());
-}, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_to_eof', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doEx('.,$s/\\d/0/g');
-  eq('1\n2\n0\n0\n0', cm.getValue());
-}, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_to_relative_eof', function(cm, vim, helpers) {
-  cm.setCursor(4, 0);
-  helpers.doEx('2,$-2s/\\d/0/g');
-  eq('1\n0\n0\n4\n5', cm.getValue());
-}, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_range_mark', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('ma');
-  cm.setCursor(0, 0);
-  helpers.doEx('.,\'as/\\d/0/g');
-  eq('0\n0\n0\n4\n5', cm.getValue());
-}, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_range_mark_offset', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('ma');
-  cm.setCursor(0, 0);
-  helpers.doEx('\'a-1,\'a+1s/\\d/0/g');
-  eq('1\n0\n0\n0\n5', cm.getValue());
-}, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_visual_range', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  // Set last visual mode selection marks '< and '> at lines 2 and 4
-  helpers.doKeys('V', '2', 'j', 'v');
-  helpers.doKeys(':');
-  eq(document.activeElement.value, "'<,'>");
-  helpers.doKeys('s/\\d/0/g', '\n');
-  eq('1\n0\n0\n0\n5', cm.getValue());
-}, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
-  // If the query is empty, use last query.
-  cm.setCursor(1, 0);
-  helpers.doKeys('/', '1\n');
-  helpers.doEx('s//b/g');
-  eq('abb ab2 ab3', cm.getValue());
-}, { value: 'a11 a12 a13' });
-testVim('ex_substitute_javascript', function(cm, vim, helpers) {
-  CodeMirror.Vim.setOption('pcre', false);
-  cm.setCursor(1, 0);
-  // Throw all the things that javascript likes to treat as special values
-  // into the replace part. All should be literal (this is VIM).
-  helpers.doEx('s/\\(\\d+\\)/$$ $\' $` $& \\1/g')
-  eq('a $$ $\' $` $& 0 b', cm.getValue());
-}, { value: 'a 0 b' });
-testVim('ex_substitute_empty_arguments', function(cm,vim,helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('s/a/b/g');
-  cm.setCursor(1, 0);
-  helpers.doEx('s');
-  eq('b b\nb a', cm.getValue());
-}, {value: 'a a\na a'});
-
-// More complex substitute tests that test both pcre and nopcre options.
-function testSubstitute(name, options) {
-  testVim(name + '_pcre', function(cm, vim, helpers) {
-    cm.setCursor(1, 0);
-    CodeMirror.Vim.setOption('pcre', true);
-    helpers.doEx(options.expr);
-    eq(options.expectedValue, cm.getValue());
-  }, options);
-  // If no noPcreExpr is defined, assume that it's the same as the expr.
-  var noPcreExpr = options.noPcreExpr ? options.noPcreExpr : options.expr;
-  testVim(name + '_nopcre', function(cm, vim, helpers) {
-    cm.setCursor(1, 0);
-    CodeMirror.Vim.setOption('pcre', false);
-    helpers.doEx(noPcreExpr);
-    eq(options.expectedValue, cm.getValue());
-  }, options);
-}
-testSubstitute('ex_substitute_capture', {
-  value: 'a11 a12 a13',
-  expectedValue: 'a1111 a1212 a1313',
-  // $n is a backreference
-  expr: 's/(\\d+)/$1$1/g',
-  // \n is a backreference.
-  noPcreExpr: 's/\\(\\d+\\)/\\1\\1/g'});
-testSubstitute('ex_substitute_capture2', {
-  value: 'a 0 b',
-  expectedValue: 'a $00 b',
-  expr: 's/(\\d+)/$$$1$1/g',
-  noPcreExpr: 's/\\(\\d+\\)/$\\1\\1/g'});
-testSubstitute('ex_substitute_nocapture', {
-  value: 'a11 a12 a13',
-  expectedValue: 'a$1$1 a$1$1 a$1$1',
-  expr: 's/(\\d+)/$$1$$1/g',
-  noPcreExpr: 's/\\(\\d+\\)/$1$1/g'});
-testSubstitute('ex_substitute_nocapture2', {
-  value: 'a 0 b',
-  expectedValue: 'a $10 b',
-  expr: 's/(\\d+)/$$1$1/g',
-  noPcreExpr: 's/\\(\\d+\\)/\\$1\\1/g'});
-testSubstitute('ex_substitute_nocapture', {
-  value: 'a b c',
-  expectedValue: 'a $ c',
-  expr: 's/b/$$/',
-  noPcreExpr: 's/b/$/'});
-testSubstitute('ex_substitute_slash_regex', {
-  value: 'one/two \n three/four',
-  expectedValue: 'one|two \n three|four',
-  expr: '%s/\\//|'});
-testSubstitute('ex_substitute_pipe_regex', {
-  value: 'one|two \n three|four',
-  expectedValue: 'one,two \n three,four',
-  expr: '%s/\\|/,/',
-  noPcreExpr: '%s/|/,/'});
-testSubstitute('ex_substitute_or_regex', {
-  value: 'one|two \n three|four',
-  expectedValue: 'ana|twa \n thraa|faar',
-  expr: '%s/o|e|u/a/g',
-  noPcreExpr: '%s/o\\|e\\|u/a/g'});
-testSubstitute('ex_substitute_or_word_regex', {
-  value: 'one|two \n three|four',
-  expectedValue: 'five|five \n three|four',
-  expr: '%s/(one|two)/five/g',
-  noPcreExpr: '%s/\\(one\\|two\\)/five/g'});
-testSubstitute('ex_substitute_forward_slash_regex', {
-    value: 'forward slash \/ was here',
-  expectedValue: 'forward slash  was here',
-  expr: '%s#\\/##g',
-  noPcreExpr: '%s#/##g'});
-testVim("ex_substitute_ampersand_pcre", function(cm, vim, helpers) {
-    cm.setCursor(0, 0);
-    CodeMirror.Vim.setOption('pcre', true);
-    helpers.doEx('%s/foo/namespace.&/');
-    eq("namespace.foo", cm.getValue());
-  }, { value: 'foo' });
-testVim("ex_substitute_ampersand_multiple_pcre", function(cm, vim, helpers) {
-    cm.setCursor(0, 0);
-    CodeMirror.Vim.setOption('pcre', true);
-    helpers.doEx('%s/f.o/namespace.&/');
-    eq("namespace.foo\nnamespace.fzo", cm.getValue());
-  }, { value: 'foo\nfzo' });
-testVim("ex_escaped_ampersand_should_not_substitute_pcre", function(cm, vim, helpers) {
-    cm.setCursor(0, 0);
-    CodeMirror.Vim.setOption('pcre', true);
-    helpers.doEx('%s/foo/namespace.\\&/');
-    eq("namespace.&", cm.getValue());
-  }, { value: 'foo' });
-testSubstitute('ex_substitute_backslashslash_regex', {
-  value: 'one\\two \n three\\four',
-  expectedValue: 'one,two \n three,four',
-  expr: '%s/\\\\/,'});
-testSubstitute('ex_substitute_slash_replacement', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one/two \n three/four',
-  expr: '%s/,/\\/'});
-testSubstitute('ex_substitute_backslash_replacement', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one\\two \n three\\four',
-  expr: '%s/,/\\\\/g'});
-testSubstitute('ex_substitute_multibackslash_replacement', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one\\\\\\\\two \n three\\\\\\\\four', // 2*8 backslashes.
-  expr: '%s/,/\\\\\\\\\\\\\\\\/g'}); // 16 backslashes.
-testSubstitute('ex_substitute_dollar_assertion', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one,two ,\n three,four,',
-  expr: '%s/$/,/g'});
-testSubstitute('ex_substitute_dollar_assertion_empty_lines', {
-  value: '\n\n\n\n\n\n',
-  expectedValue: ';\n;\n;\n;\n;\n;\n;',
-  expr: '%s/$/;/g'});
-testSubstitute('ex_substitute_dollar_literal', {
-  value: 'one$two\n$three\nfour$\n$',
-  expectedValue: 'one,two\n,three\nfour,\n,',
-  expr: '%s/\\$/,/g'});
-testSubstitute('ex_substitute_newline_match', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one,two , three,four',
-  expr: '%s/\\n/,/g'});
-testSubstitute('ex_substitute_newline_join_global', {
-  value: 'one,two \n three,four \n five \n six',
-  expectedValue: 'one,two \n three,four , five \n six',
-  expr: '2s/\\n/,/g'});
-testSubstitute('ex_substitute_newline_join_noglobal', {
-  value: 'one,two \n three,four \n five \n six\n',
-  expectedValue: 'one,two \n three,four , five , six\n',
-  expr: '2,3s/\\n/,/'});
-testSubstitute('ex_substitute_newline_replacement', {
-  value: 'one,two, \n three,four,',
-  expectedValue: 'one\ntwo\n \n three\nfour\n',
-  expr: '%s/,/\\n/g'});
-testSubstitute('ex_substitute_newline_multiple_splits', {
-  value: 'one,two, \n three,four,five,six, \n seven,',
-  expectedValue: 'one,two, \n three\nfour\nfive\nsix\n \n seven,',
-  expr: '2s/,/\\n/g'});
-testSubstitute('ex_substitute_newline_first_occurrences', {
-  value: 'one,two, \n three,four,five,six, \n seven,',
-  expectedValue: 'one\ntwo, \n three\nfour,five,six, \n seven\n',
-  expr: '%s/,/\\n/'});
-testSubstitute('ex_substitute_braces_word', {
-  value: 'ababab abb ab{2}',
-  expectedValue: 'ab abb ab{2}',
-  expr: '%s/(ab){2}//g',
-  noPcreExpr: '%s/\\(ab\\)\\{2\\}//g'});
-testSubstitute('ex_substitute_braces_range', {
-  value: 'a aa aaa aaaa',
-  expectedValue: 'a   a',
-  expr: '%s/a{2,3}//g',
-  noPcreExpr: '%s/a\\{2,3\\}//g'});
-testSubstitute('ex_substitute_braces_literal', {
-  value: 'ababab abb ab{2}',
-  expectedValue: 'ababab abb ',
-  expr: '%s/ab\\{2\\}//g',
-  noPcreExpr: '%s/ab{2}//g'});
-testSubstitute('ex_substitute_braces_char', {
-  value: 'ababab abb ab{2}',
-  expectedValue: 'ababab  ab{2}',
-  expr: '%s/ab{2}//g',
-  noPcreExpr: '%s/ab\\{2\\}//g'});
-testSubstitute('ex_substitute_braces_no_escape', {
-  value: 'ababab abb ab{2}',
-  expectedValue: 'ababab  ab{2}',
-  expr: '%s/ab{2}//g',
-  noPcreExpr: '%s/ab\\{2}//g'});
-testSubstitute('ex_substitute_count', {
-  value: '1\n2\n3\n4',
-  expectedValue: '1\n0\n0\n4',
-  expr: 's/\\d/0/i 2'});
-testSubstitute('ex_substitute_count_with_range', {
-  value: '1\n2\n3\n4',
-  expectedValue: '1\n2\n0\n0',
-  expr: '1,3s/\\d/0/ 3'});
-testSubstitute('ex_substitute_not_global', {
-  value: 'aaa\nbaa\ncaa',
-  expectedValue: 'xaa\nbxa\ncxa',
-  expr: '%s/a/x/'});
-testSubstitute('ex_substitute_optional', {
-  value: 'aaa  aa\n aa',
-  expectedValue: '<aaa> <> <aa>\n<> <aa>',
-  expr: '%s/(a*)/<$1>/g',
-  noPcreExpr: '%s/\\(a*\\)/<\\1>/g'});
-testSubstitute('ex_substitute_empty_match', {
-  value: 'aaa  aa\n aa\nbb\n',
-  expectedValue: '<aaa>  <aa>\n <aa>\nbb<>\n<>',
-  expr: '%s/(a+|$)/<$1>/g',
-  noPcreExpr: '%s/\\(a+\\|$\\)/<\\1>/g'});
-testSubstitute('ex_substitute_empty_or_match', {
-  value: '1234\n567\n89\n0\n',
-  expectedValue: '<12><34>\n<56>7<>\n<89>\n0<>\n<>',
-  expr: '%s/(..|$)/<$1>/g',
-  noPcreExpr: '%s/\\(..\\|$\\)/<\\1>/g'});
-function testSubstituteConfirm(name, command, initialValue, expectedValue, keys, finalPos) {
-  testVim(name, function(cm, vim, helpers) {
-    helpers.doEx(command);
-    for (var i = 0; i < keys.length; i++) {
-      helpers.doKeys(keys.charAt(i))
-    }
-    eq(expectedValue, cm.getValue());
-    helpers.assertCursorAt(finalPos);
-  }, { value: initialValue });
-}
-testSubstituteConfirm('ex_substitute_confirm_emptydoc',
-    '%s/x/b/c', '', '', '', makeCursor(0, 0));
-testSubstituteConfirm('ex_substitute_confirm_nomatch',
-    '%s/x/b/c', 'ba a\nbab', 'ba a\nbab', '', makeCursor(0, 0));
-testSubstituteConfirm('ex_substitute_confirm_accept',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'yyy', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_random_keys',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'ysdkywerty', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_some',
-    '%s/a/b/cg', 'ba a\nbab', 'bb a\nbbb', 'yny', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_all',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'a', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_accept_then_all',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'ya', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_quit',
-    '%s/a/b/cg', 'ba a\nbab', 'bb a\nbab', 'yq', makeCursor(0, 3));
-testSubstituteConfirm('ex_substitute_confirm_last',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
-testSubstituteConfirm('ex_substitute_confirm_oneline',
-    '1s/a/b/cg', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
-testSubstituteConfirm('ex_substitute_confirm_range_accept',
-    '1,2s/a/b/cg', 'aa\na \na\na', 'bb\nb \na\na', 'yyy', makeCursor(1, 0));
-testSubstituteConfirm('ex_substitute_confirm_range_some',
-    '1,3s/a/b/cg', 'aa\na \na\na', 'ba\nb \nb\na', 'ynyy', makeCursor(2, 0));
-testSubstituteConfirm('ex_substitute_confirm_range_all',
-    '1,3s/a/b/cg', 'aa\na \na\na', 'bb\nb \nb\na', 'a', makeCursor(2, 0));
-testSubstituteConfirm('ex_substitute_confirm_range_last',
-    '1,3s/a/b/cg', 'aa\na \na\na', 'bb\nb \na\na', 'yyl', makeCursor(1, 0));
-//:noh should clear highlighting of search-results but allow to resume search through n
-testVim('ex_noh_clearSearchHighlight', function(cm, vim, helpers) {
-  helpers.doKeys('?', 'match', '\n');
-  helpers.doEx('noh');
-  eq(vim.searchState_.getOverlay(),null,'match-highlighting wasn\'t cleared');
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 11,'can\'t resume search after clearing highlighting');
-}, { value: 'match nope match \n nope Match' });
-testVim('ex_yank', function (cm, vim, helpers) {
-  var curStart = makeCursor(3, 0);
-  cm.setCursor(curStart);
-  helpers.doEx('y');
-  var register = helpers.getRegisterController().getRegister();
-  var line = cm.getLine(3);
-  eq(line + '\n', register.toString());
-});
-testVim('set_boolean', function(cm, vim, helpers) {
-  CodeMirror.Vim.defineOption('testoption', true, 'boolean');
-  // Test default value is set.
-  is(CodeMirror.Vim.getOption('testoption'));
-  // Test fail to set to non-boolean
-  var result = CodeMirror.Vim.setOption('testoption', '5');
-  is(result instanceof Error);
-  // Test setOption
-  CodeMirror.Vim.setOption('testoption', false);
-  is(!CodeMirror.Vim.getOption('testoption'));
-});
-testVim('ex_set_boolean', function(cm, vim, helpers) {
-  CodeMirror.Vim.defineOption('testoption', true, 'boolean');
-  // Test default value is set.
-  is(CodeMirror.Vim.getOption('testoption'));
-  is(!cm.state.currentNotificationClose);
-  // Test fail to set to non-boolean
-  helpers.doEx('set testoption=22');
-  is(cm.state.currentNotificationClose);
-  // Test setOption
-  helpers.doEx('set notestoption');
-  is(!CodeMirror.Vim.getOption('testoption'));
-});
-testVim('set_string', function(cm, vim, helpers) {
-  CodeMirror.Vim.defineOption('testoption', 'a', 'string');
-  // Test default value is set.
-  eq('a', CodeMirror.Vim.getOption('testoption'));
-  // Test no fail to set non-string.
-  var result = CodeMirror.Vim.setOption('testoption', true);
-  is(!result);
-  // Test fail to set 'notestoption'
-  result = CodeMirror.Vim.setOption('notestoption', 'b');
-  is(result instanceof Error);
-  // Test setOption
-  CodeMirror.Vim.setOption('testoption', 'c');
-  eq('c', CodeMirror.Vim.getOption('testoption'));
-});
-testVim('ex_set_string', function(cm, vim, helpers) {
-  CodeMirror.Vim.defineOption('testopt', 'a', 'string');
-  // Test default value is set.
-  eq('a', CodeMirror.Vim.getOption('testopt'));
-  // Test fail to set 'notestopt'
-  is(!cm.state.currentNotificationClose);
-  helpers.doEx('set notestopt=b');
-  is(cm.state.currentNotificationClose);
-  // Test setOption
-  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 global;
-
-  function cb(val, cm, cfg) {
-    if (val === undefined) {
-      // Getter
-      if (cm) {
-        return cm._local;
-      } else {
-        return global;
-      }
-    } else {
-      // Setter
-      if (cm) {
-        cm._local = val;
-      } else {
-        global = val;
-      }
-    }
-  }
-
-  CodeMirror.Vim.defineOption('testopt', 'a', 'string', cb);
-  // Test default value is set.
-  eq('a', CodeMirror.Vim.getOption('testopt'));
-  // Test fail to set 'notestopt'
-  is(!cm.state.currentNotificationClose);
-  helpers.doEx('set notestopt=b');
-  is(cm.state.currentNotificationClose);
-  // 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'));
-})
-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);
-});
-
-testVim('mapclear', function(cm, vim, helpers) {
-  CodeMirror.Vim.map('w', 'l');
-  cm.setCursor(0, 0);
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('w');
-  helpers.assertCursorAt(0, 1);
-  CodeMirror.Vim.mapclear('visual');
-  helpers.doKeys('v', 'w', 'v');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('w');
-  helpers.assertCursorAt(0, 5);
-  CodeMirror.Vim.mapclear();
-}, { value: 'abc abc' });
-testVim('mapclear_context', function(cm, vim, helpers) {
-  CodeMirror.Vim.map('w', 'l', 'normal');
-  cm.setCursor(0, 0);
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('w');
-  helpers.assertCursorAt(0, 1);
-  CodeMirror.Vim.mapclear('normal');
-  helpers.doKeys('w');
-  helpers.assertCursorAt(0, 4);
-  CodeMirror.Vim.mapclear();
-}, { value: 'abc abc' });
-
-testVim('ex_map_key2key', function(cm, vim, helpers) {
-  helpers.doEx('map a x');
-  helpers.doKeys('a');
-  helpers.assertCursorAt(0, 0);
-  eq('bc', cm.getValue());
-  CodeMirror.Vim.mapclear();
-}, { value: 'abc' });
-testVim('ex_unmap_key2key', function(cm, vim, helpers) {
-  helpers.doEx('map a x');
-  helpers.doEx('unmap a');
-  helpers.doKeys('a');
-  eq('vim-insert', cm.getOption('keyMap'));
-  CodeMirror.Vim.mapclear();
-}, { value: 'abc' });
-testVim('ex_unmap_key2key_does_not_remove_default', function(cm, vim, helpers) {
-  helpers.doEx('unmap a');
-  is(/No such mapping: unmap a/.test(helpers.getNotificationText()));
-  helpers.doKeys('a');
-  eq('vim-insert', cm.getOption('keyMap'));
-  CodeMirror.Vim.mapclear();
-}, { value: 'abc' });
-testVim('ex_map_key2key_to_colon', function(cm, vim, helpers) {
-  helpers.doEx('map ; :');
-  var dialogOpened = false;
-  cm.openDialog = function() {
-    dialogOpened = true;
-  }
-  helpers.doKeys(';');
-  eq(dialogOpened, true);
-  CodeMirror.Vim.mapclear();
-});
-testVim('ex_map_ex2key:', function(cm, vim, helpers) {
-  helpers.doEx('map :del x');
-  helpers.doEx('del');
-  helpers.assertCursorAt(0, 0);
-  eq('bc', cm.getValue());
-  CodeMirror.Vim.mapclear();
-}, { value: 'abc' });
-testVim('ex_map_ex2ex', function(cm, vim, helpers) {
-  helpers.doEx('map :del :w');
-  var tmp = CodeMirror.commands.save;
-  var written = false;
-  var actualCm;
-  CodeMirror.commands.save = function(cm) {
-    written = true;
-    actualCm = cm;
-  };
-  helpers.doEx('del');
-  CodeMirror.commands.save = tmp;
-  eq(written, true);
-  eq(actualCm, cm);
-  CodeMirror.Vim.mapclear();
-});
-testVim('ex_map_key2ex', function(cm, vim, helpers) {
-  helpers.doEx('map a :w');
-  var tmp = CodeMirror.commands.save;
-  var written = false;
-  var actualCm;
-  CodeMirror.commands.save = function(cm) {
-    written = true;
-    actualCm = cm;
-  };
-  helpers.doKeys('a');
-  CodeMirror.commands.save = tmp;
-  eq(written, true);
-  eq(actualCm, cm);
-  CodeMirror.Vim.mapclear();
-});
-testVim('ex_map_key2key_visual_api', function(cm, vim, helpers) {
-  CodeMirror.Vim.map('b', ':w', 'visual');
-  var tmp = CodeMirror.commands.save;
-  var written = false;
-  var actualCm;
-  CodeMirror.commands.save = function(cm) {
-    written = true;
-    actualCm = cm;
-  };
-  // Mapping should not work in normal mode.
-  helpers.doKeys('b');
-  eq(written, false);
-  // Mapping should work in visual mode.
-  helpers.doKeys('v', 'b');
-  eq(written, true);
-  eq(actualCm, cm);
-
-  CodeMirror.commands.save = tmp;
-  CodeMirror.Vim.mapclear();
-});
-testVim('ex_imap', function(cm, vim, helpers) {
-  CodeMirror.Vim.map('jk', '<Esc>', 'insert');
-  helpers.doKeys('i');
-  is(vim.insertMode);
-  helpers.doKeys('j', 'k');
-  is(!vim.insertMode);
-  cm.setCursor(0, 1);
-  CodeMirror.Vim.map('jj', '<Esc>', 'insert');
-  helpers.doKeys('<C-v>', '2', 'j', 'l', 'c');
-  helpers.doKeys('f', 'o');
-  eq('1fo4\n5fo8\nafodefg', cm.getValue());
-  helpers.doKeys('j', 'j');
-  cm.setCursor(0, 0);
-  helpers.doKeys('.');
-  eq('foo4\nfoo8\nfoodefg', cm.getValue());
-  CodeMirror.Vim.mapclear();
-}, { value: '1234\n5678\nabcdefg' });
-testVim('ex_unmap_api', function(cm, vim, helpers) {
-  CodeMirror.Vim.map('<Alt-X>', 'gg', 'normal');
-  is(CodeMirror.Vim.handleKey(cm, "<Alt-X>", "normal"), "Alt-X key is mapped");
-  CodeMirror.Vim.unmap("<Alt-X>", "normal");
-  is(!CodeMirror.Vim.handleKey(cm, "<Alt-X>", "normal"), "Alt-X key is unmapped");
-  CodeMirror.Vim.mapclear();
-});
-// Testing registration of functions as ex-commands and mapping to <Key>-keys
-testVim('ex_api_test', function(cm, vim, helpers) {
-  var res=false;
-  var val='from';
-  CodeMirror.Vim.defineEx('extest','ext',function(cm,params){
-    if(params.args)val=params.args[0];
-    else res=true;
-  });
-  helpers.doEx(':ext to');
-  eq(val,'to','Defining ex-command failed');
-  CodeMirror.Vim.map('<C-CR><Space>',':ext');
-  helpers.doKeys('<C-CR>','<Space>');
-  is(res,'Mapping to key failed');
-  CodeMirror.Vim.mapclear();
-});
-// Testing ex-commands with non-alpha names.
-testVim('ex_special_names', function(cm, vim, helpers) {
-  var ran,val;
-  var cmds = ['!','!!','#','&','*','<','=','>','@','@@','~','regtest1','RT2'];
-  cmds.forEach(function(name){
-    CodeMirror.Vim.defineEx(name,'',function(cm,params){
-      ran=params.commandName;
-      val=params.argString;
-    });
-    helpers.doEx(':'+name);
-    eq(ran,name,'Running ex-command failed');
-    helpers.doEx(':'+name+' x');
-    eq(val,' x','Running ex-command with param failed: '+name);
-    if(/^\W+$/.test(name)){
-      helpers.doEx(':'+name+'y');
-      eq(val,'y','Running ex-command with param failed: '+name);
-    }
-    else{
-      helpers.doEx(':'+name+'-y');
-      eq(val,'-y','Running ex-command with param failed: '+name);
-    }
-    if(name!=='!'){
-      helpers.doEx(':'+name+'!');
-      eq(ran,name,'Running ex-command with bang failed');
-      eq(val,'!','Running ex-command with bang failed: '+name);
-      helpers.doEx(':'+name+'!z');
-      eq(ran,name,'Running ex-command with bang & param failed');
-      eq(val,'!z','Running ex-command with bang & param failed: '+name);
-    }
-  });
-});
-// For now, this test needs to be last because it messes up : for future tests.
-testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
-  helpers.doEx('map : x');
-  helpers.doKeys(':');
-  helpers.assertCursorAt(0, 0);
-  eq('bc', cm.getValue());
-  CodeMirror.Vim.mapclear();
-}, { value: 'abc' });
-
-testVim('map <Esc> in normal mode', function(cm, vim, helpers) {
-  CodeMirror.Vim.noremap('<Esc>', 'i', 'normal');
-  helpers.doKeys('<Esc>');
-  is(vim.insertMode, "Didn't switch to insert mode.");
-  helpers.doKeys('<Esc>');
-  is(!vim.insertMode, "Didn't switch to normal mode.");
-  CodeMirror.Vim.mapclear();
-});
-
-testVim('noremap', function(cm, vim, helpers) {
-  CodeMirror.Vim.noremap(';', 'l');
-  cm.setCursor(0, 0);
-  eq('wOrd1', cm.getValue());
-  // Mapping should work in normal mode.
-  helpers.doKeys(';', 'r', '1');
-  eq('w1rd1', cm.getValue());
-  // Mapping will not work in insert mode because of no current fallback
-  // keyToKey mapping support.
-  helpers.doKeys('i', ';', '<Esc>');
-  eq('w;1rd1', cm.getValue());
-  // unmap all mappings
-  CodeMirror.Vim.mapclear();
-}, { value: 'wOrd1' });
-testVim('noremap_swap', function(cm, vim, helpers) {
-  CodeMirror.Vim.noremap('i', 'a', 'normal');
-  CodeMirror.Vim.noremap('a', 'i', 'normal');
-  cm.setCursor(0, 0);
-  // 'a' should act like 'i'.
-  helpers.doKeys('a');
-  eqCursorPos(new Pos(0, 0), cm.getCursor());
-  // ...and 'i' should act like 'a'.
-  helpers.doKeys('<Esc>', 'i');
-  eqCursorPos(new Pos(0, 1), cm.getCursor());
-  // unmap all mappings
-  CodeMirror.Vim.mapclear();
-}, { value: 'foo' });
-testVim('noremap_map_interaction', function(cm, vim, helpers) {
-  // noremap should clobber map
-  CodeMirror.Vim.map(';', 'l');
-  CodeMirror.Vim.noremap(';', 'l');
-  CodeMirror.Vim.map('l', 'j');
-  cm.setCursor(0, 0);
-  helpers.doKeys(';');
-  eqCursorPos(new Pos(0, 1), cm.getCursor());
-  helpers.doKeys('l');
-  eqCursorPos(new Pos(1, 1), cm.getCursor());
-  // map should be able to point to a noremap
-  CodeMirror.Vim.map('m', ';');
-  helpers.doKeys('m');
-  eqCursorPos(new Pos(1, 2), cm.getCursor());
-  // unmap all mappings
-  CodeMirror.Vim.mapclear();
-}, { value: 'wOrd1\nwOrd2' });
-testVim('noremap_map_interaction2', function(cm, vim, helpers) {
-  // map should point to the most recent noremap
-  CodeMirror.Vim.noremap(';', 'l');
-  CodeMirror.Vim.map('m', ';');
-  CodeMirror.Vim.noremap(';', 'h');
-  cm.setCursor(0, 0);
-  helpers.doKeys('l');
-  eqCursorPos(new Pos(0, 1), cm.getCursor());
-  helpers.doKeys('m');
-  eqCursorPos(new Pos(0, 0), cm.getCursor());
-  // unmap all mappings
-  CodeMirror.Vim.mapclear();
-}, { value: 'wOrd1\nwOrd2' });
-
-// Test event handlers
-testVim('beforeSelectionChange', function(cm, vim, helpers) {
-  cm.setCursor(0, 100);
-  eqCursorPos(cm.getCursor('head'), cm.getCursor('anchor'));
-}, { value: 'abc' });
-
-testVim('increment_binary', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('<C-a>');
-  eq('0b001', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0b010', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0b001', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0b000', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-a>');
-  eq('0b001', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0b010', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0b001', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0b000', cm.getValue());
-}, { value: '0b000' });
-
-testVim('increment_octal', function(cm, vim, helpers) {
-  cm.setCursor(0, 2);
-  helpers.doKeys('<C-a>');
-  eq('001', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('002', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('003', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('004', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('005', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('006', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('007', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('010', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('007', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('006', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('005', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('004', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('003', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('002', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('001', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('000', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-a>');
-  eq('001', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('002', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('001', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('000', cm.getValue());
-}, { value: '000' });
-
-testVim('increment_decimal', function(cm, vim, helpers) {
-  cm.setCursor(0, 2);
-  helpers.doKeys('<C-a>');
-  eq('101', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('102', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('103', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('104', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('105', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('106', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('107', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('108', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('109', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('110', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('109', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('108', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('107', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('106', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('105', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('104', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('103', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('102', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('101', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('100', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-a>');
-  eq('101', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('102', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('101', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('100', cm.getValue());
-}, { value: '100' });
-
-testVim('increment_decimal_single_zero', function(cm, vim, helpers) {
-  helpers.doKeys('<C-a>');
-  eq('1', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('2', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('3', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('4', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('5', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('6', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('7', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('8', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('9', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('10', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('9', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('8', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('7', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('6', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('5', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('4', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('3', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('2', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('1', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-a>');
-  eq('1', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('2', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('1', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0', cm.getValue());
-}, { value: '0' });
-
-testVim('increment_hexadecimal', function(cm, vim, helpers) {
-  cm.setCursor(0, 2);
-  helpers.doKeys('<C-a>');
-  eq('0x1', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x2', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x3', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x4', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x5', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x6', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x7', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x8', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x9', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0xa', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0xb', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0xc', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0xd', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0xe', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0xf', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x10', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x0f', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x0e', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x0d', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x0c', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x0b', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x0a', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x09', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x08', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x07', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x06', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x05', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x04', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x03', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x02', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x01', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x00', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('<C-a>');
-  eq('0x01', cm.getValue());
-  helpers.doKeys('<C-a>');
-  eq('0x02', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x01', cm.getValue());
-  helpers.doKeys('<C-x>');
-  eq('0x00', cm.getValue());
-}, { value: '0x0' });
-
-var typeKey = function() {
-  var keyCodeToKey = {};
-  var keyCodeToCode = {};
-
-  var alias = {};
-  alias.Ctrl = "Control";
-  alias.Option = "Alt";
-  alias.Cmd = alias.Super = alias.Meta = "Command";
-
-  var controlKeys = {
-    Shift: 16, Control: 17, Alt: 18, Meta: 224, Command: 224,
-    Backspace:8, Tab:9, Return: 13, Enter: 13,
-    Pause: 19, Escape: 27, PageUp: 33, PageDown: 34, End: 35, Home: 36,
-    Left: 37, Up: 38, Right: 39, Down: 40, Insert: 45, Delete: 46,
-    ArrowLeft: 37, ArrowUp: 38, ArrowRight: 39, ArrowDown: 40,
-  };
-  var shiftedKeys = {};
-  var printableKeys = {};
-  var specialKeys = {
-    Backquote: [192, "`", "~"], Minus: [189, "-", "_"], Equal: [187, "=", "+"],
-    BracketLeft: [219, "[", "{"], Backslash: [220, "\\", "|"], BracketRight: [221, "]", "}"],
-    Semicolon: [186, ";", ":"], Quote: [222, "'", '"'], Comma: [188, ",", "<"],
-    Period: [190, ".", ">"], Slash: [191, "/", "?"], Space: [32, " "], NumpadAdd: [107, "+"],
-    NumpadDecimal: [110, "."], NumpadSubtract: [109, "-"], NumpadDivide: [111, "/"], NumpadMultiply: [106, "*"]
-  };
-  for (var i in specialKeys) {
-    var key = specialKeys[i];
-    printableKeys[i] = printableKeys[key[1]] = shiftedKeys[key[2]] = key[0];
-    keyCodeToCode[key[0]] = i;
-  }
-  for (var i = 0; i < 10; i++) {
-    printableKeys[i] = shiftedKeys["!@#$%^&*()"[i]] = 48 + i;
-    keyCodeToCode[48 + i] = "Digit" + i;
-  }
-  for (var i = 65; i < 90; i++) {
-    var chr = String.fromCharCode(i + 32);
-    printableKeys[chr] = shiftedKeys[chr.toUpperCase()] = i;
-    keyCodeToCode[i] = "Key" + chr.toUpperCase();
-  }
-  for (var i = 1; i < 13; i++) {
-    controlKeys["F" + i] = 111 + i;
-  }
-
-  for (var i in controlKeys) {
-    keyCodeToKey[controlKeys[i]] = i;
-    keyCodeToCode[controlKeys[i]] = i;
-  }
-  controlKeys["\n"] = controlKeys.Return;
-  controlKeys.Del = controlKeys.Delete;
-  controlKeys.Esc = controlKeys.Escape;
-  controlKeys.Ins = controlKeys.Insert;
-
-  var shift = false;
-  var ctrl = false;
-  var meta = false;
-  var alt = false;
-  function reset() {
-    shift = ctrl = meta = alt = false;
-  }
-  function updateModifierStates(keyCode) {
-    if (keyCode == controlKeys.Shift)
-      return shift = true;
-    if (keyCode == controlKeys.Control)
-      return ctrl = true;
-    if (keyCode == controlKeys.Meta)
-      return meta = true;
-    if (keyCode == controlKeys.Alt)
-      return alt = true;
-  }
-
-  function sendKey(letter, timeout) {
-    var keyCode = controlKeys[letter] || printableKeys[letter] || shiftedKeys[letter];
-    var isModifier = updateModifierStates(keyCode);
-
-    var text = letter;
-    var isTextInput = true;
-    if (ctrl || alt || meta || controlKeys[letter]) {
-      isTextInput = false;
-    } else if (shift) {
-      text = text.toUpperCase();
-    }
-
-    var target = document.activeElement;
-    var prevented = emit("keydown", true);
-    if (isModifier) return;
-    if (!prevented && isTextInput) prevented = emit("keypress", true);
-    if (!prevented && ctrl && !alt && !meta && letter == "c") emitClipboard("copy");
-    if (!prevented) updateTextInput();
-    emit("keyup", true);
-
-    function emitClipboard(type) {
-      var data = {bubbles: true, cancelable:true};
-      var event = new KeyboardEvent(type, data);
-      event.clipboardData = {
-        setData: function() {},
-        getData: function() {},
-        clearData: function() {},
-      };
-      target.dispatchEvent(event);
-    }
-    function emit(type, bubbles) {
-      var el = document.activeElement;
-      var data = {bubbles: bubbles, cancelable:true};
-      data.charCode = text.charCodeAt(0);
-      data.keyCode = type == "keypress" ? data.charCode : keyCode;
-      data.which = data.keyCode;
-      data.shiftKey = shift || shiftedKeys[text];
-      data.ctrlKey = ctrl;
-      data.altKey = alt;
-      data.metaKey = meta;
-      data.key = text || keyCodeToKey[keyCode];
-      data.code = keyCodeToCode[keyCode];
-      var event = new KeyboardEvent(type, data);
-
-      var el = document.activeElement;
-      el.dispatchEvent(event);
-      return event.defaultPrevented;
-    }
-    function updateTextInput() {
-      if (!isTextInput && keyCode == controlKeys.Return) {
-        text = "\n";
-      }
-      if (target._handleInputEventForTest) {
-        return target._handleInputEventForTest(text);
-      }
-      var isTextarea = "selectionStart" in target && typeof target.value == "string";
-      if (!isTextarea) return;
-
-      var start = target.selectionStart;
-      var end = target.selectionEnd;
-      var value = target.value;
-
-      if (!isTextInput) {
-        if (keyCode == controlKeys.Backspace) {
-          if (start != end) start = Math.max(start - 1, 0);
-        } else if (keyCode == controlKeys.Delete) {
-          if (start != end) end = Math.min(end + 1, value.length);
-        } else {
-          return;
-        }
-      }
-      var newValue = value.slice(0, start) + text + value.slice(end);
-      var newStart = start + text.length;
-      var newEnd = newStart;
-      if (newValue != value || newStart != start || newEnd != end) {
-        target.value = newValue;
-        target.setSelectionRange(newStart, newEnd);
-        emit("input", false);
-      }
-    }
-  }
-
-  function type() {
-    var keys = Array.prototype.slice.call(arguments);
-    for (var i = 0; i < keys.length; i++) {
-      var key = keys[i];
-      if (Array.isArray(key)) {
-        type.apply(null, key);
-        continue;
-      }
-      reset();
-      if (key.length > 1) {
-        var isKeyName = controlKeys[key] || printableKeys[key] || shiftedKeys[key];
-        if (!isKeyName) {
-          var parts = key.split("-");
-          var modifier = alias[parts[0]] || parts[0];
-          if (!updateModifierStates(controlKeys[modifier])) {
-            type.apply(null, key.split(""));
-            continue;
-          }
-          key = parts.pop();
-          parts.forEach(function(part) {
-            var keyCode = controlKeys[part];
-            updateModifierStates(keyCode);
-          });
-        }
-      }
-      sendKey(key);
-    }
-  }
-
-  return type;
-}();

From 96010fcc7274b45023e9d695ca9753e47b6397a5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2022 09:51:50 +0200
Subject: [PATCH 4652/4742] Don't use global document/window

Closes https://github.com/codemirror/codemirror5/pull/6964
---
 src/display/operations.js               |  2 +-
 src/display/scrolling.js                |  3 ++-
 src/display/update_display.js           | 11 ++++++-----
 src/edit/fromTextArea.js                |  2 +-
 src/edit/key_events.js                  |  4 ++--
 src/edit/methods.js                     |  8 ++++----
 src/edit/mouse_events.js                |  8 ++++----
 src/input/ContentEditableInput.js       |  6 +++---
 src/input/TextareaInput.js              |  6 +++---
 src/measurement/position_measurement.js | 22 +++++++++++-----------
 src/util/dom.js                         | 10 +++++++---
 11 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 79396e9bd7..27d82cb9d9 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -116,7 +116,7 @@ function endOperation_W2(op) {
     cm.display.maxLineChanged = false
   }
 
-  let takeFocus = op.focus && op.focus == activeElt()
+  let takeFocus = op.focus && op.focus == activeElt(doc(cm))
   if (op.preparedSelection)
     cm.display.input.showSelection(op.preparedSelection, takeFocus)
   if (op.updatedDisplay || op.startHeight != cm.doc.height)
diff --git a/src/display/scrolling.js b/src/display/scrolling.js
index 27d6f70cda..322aa87994 100644
--- a/src/display/scrolling.js
+++ b/src/display/scrolling.js
@@ -16,8 +16,9 @@ export function maybeScrollWindow(cm, rect) {
   if (signalDOMEvent(cm, "scrollCursorIntoView")) return
 
   let display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null
+  let doc = display.wrapper.ownerDocument
   if (rect.top + box.top < 0) doScroll = true
-  else if (rect.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false
+  else if (rect.bottom + box.top > (doc.defaultView.innerHeight || doc.documentElement.clientHeight)) doScroll = false
   if (doScroll != null && !phantom) {
     let scrollNode = elt("div", "\u200b", null, `position: absolute;
                          top: ${rect.top - display.viewOffset - paddingTop(cm.display)}px;
diff --git a/src/display/update_display.js b/src/display/update_display.js
index 83c2540705..88247c6c92 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -3,7 +3,7 @@ import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans.js"
 import { getLine, lineNumberFor } from "../line/utils_line.js"
 import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement.js"
 import { mac, webkit } from "../util/browser.js"
-import { activeElt, removeChildren, contains } from "../util/dom.js"
+import { activeElt, removeChildren, contains, win, doc } from "../util/dom.js"
 import { hasHandler, signal } from "../util/event.js"
 import { signalLater } from "../util/operation_group.js"
 import { indexOf } from "../util/misc.js"
@@ -57,11 +57,11 @@ export function maybeClipScrollbars(cm) {
 
 function selectionSnapshot(cm) {
   if (cm.hasFocus()) return null
-  let active = activeElt()
+  let active = activeElt(doc(cm))
   if (!active || !contains(cm.display.lineDiv, active)) return null
   let result = {activeElt: active}
   if (window.getSelection) {
-    let sel = window.getSelection()
+    let sel = win(cm).getSelection()
     if (sel.anchorNode && sel.extend && contains(cm.display.lineDiv, sel.anchorNode)) {
       result.anchorNode = sel.anchorNode
       result.anchorOffset = sel.anchorOffset
@@ -73,11 +73,12 @@ function selectionSnapshot(cm) {
 }
 
 function restoreSelection(snapshot) {
-  if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt()) return
+  if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt(snapshot.activeElt.ownerDocument)) return
   snapshot.activeElt.focus()
   if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
       snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
-    let sel = window.getSelection(), range = document.createRange()
+    let doc = shapshot.activeElt.ownerDocument
+    let sel = doc.defaultView.getSelection(), range = doc.createRange()
     range.setEnd(snapshot.anchorNode, snapshot.anchorOffset)
     range.collapse(false)
     sel.removeAllRanges()
diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
index 35024c5e27..cdd10d74a0 100644
--- a/src/edit/fromTextArea.js
+++ b/src/edit/fromTextArea.js
@@ -13,7 +13,7 @@ export function fromTextArea(textarea, options) {
   // Set autofocus to true if this textarea is focused, or if it has
   // autofocus and no other element is focused.
   if (options.autofocus == null) {
-    let hasFocus = activeElt()
+    let hasFocus = activeElt(textarea.ownerDocument)
     options.autofocus = hasFocus == textarea ||
       textarea.getAttribute("autofocus") != null && hasFocus == document.body
   }
diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index 8f72182ab2..1d3c9f908c 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -3,7 +3,7 @@ import { restartBlink } from "../display/selection.js"
 import { isModifierKey, keyName, lookupKey } from "../input/keymap.js"
 import { eventInWidget } from "../measurement/widgets.js"
 import { ie, ie_version, mac, presto, gecko } from "../util/browser.js"
-import { activeElt, addClass, rmClass } from "../util/dom.js"
+import { activeElt, addClass, rmClass, doc } from "../util/dom.js"
 import { e_preventDefault, off, on, signalDOMEvent } from "../util/event.js"
 import { hasCopyEvent } from "../util/feature_detection.js"
 import { Delayed, Pass } from "../util/misc.js"
@@ -107,7 +107,7 @@ let lastStoppedKey = null
 export function onKeyDown(e) {
   let cm = this
   if (e.target && e.target != cm.display.input.getField()) return
-  cm.curOp.focus = activeElt()
+  cm.curOp.focus = activeElt(doc(cm))
   if (signalDOMEvent(cm, e)) return
   // IE does strange things with escape.
   if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false
diff --git a/src/edit/methods.js b/src/edit/methods.js
index c33a859865..b1cbcc9e2e 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -1,7 +1,7 @@
 import { deleteNearSelection } from "./deleteNearSelection.js"
 import { commands } from "./commands.js"
 import { attachDoc } from "../model/document_data.js"
-import { activeElt, addClass, rmClass } from "../util/dom.js"
+import { activeElt, addClass, rmClass, doc, win } from "../util/dom.js"
 import { eventMixin, signal } from "../util/event.js"
 import { getLineStyles, getContextBefore, takeToken } from "../line/highlight.js"
 import { indentLine } from "../input/indent.js"
@@ -38,7 +38,7 @@ export default function(CodeMirror) {
 
   CodeMirror.prototype = {
     constructor: CodeMirror,
-    focus: function(){window.focus(); this.display.input.focus()},
+    focus: function(){win(this).focus(); this.display.input.focus()},
 
     setOption: function(option, value) {
       let options = this.options, old = options[option]
@@ -358,7 +358,7 @@ export default function(CodeMirror) {
 
       signal(this, "overwriteToggle", this, this.state.overwrite)
     },
-    hasFocus: function() { return this.display.input.getField() == activeElt() },
+    hasFocus: function() { return this.display.input.getField() == activeElt(doc(this)) },
     isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
 
     scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y) }),
@@ -537,7 +537,7 @@ function findPosH(doc, pos, dir, unit, visually) {
 function findPosV(cm, pos, dir, unit) {
   let doc = cm.doc, x = pos.left, y
   if (unit == "page") {
-    let pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight)
+    let pageSize = Math.min(cm.display.wrapper.clientHeight, win(cm).innerHeight || doc(cm).documentElement.clientHeight)
     let moveAmount = Math.max(pageSize - .5 * textHeight(cm.display), 3)
     y = (dir > 0 ? pos.bottom : pos.top) + dir * moveAmount
 
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index b5d0b5a64e..f6fc07406a 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -9,7 +9,7 @@ import { normalizeSelection, Range, Selection } from "../model/selection.js"
 import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates.js"
 import { captureRightClick, chromeOS, ie, ie_version, mac, webkit, safari } from "../util/browser.js"
 import { getOrder, getBidiPartAt } from "../util/bidi.js"
-import { activeElt } from "../util/dom.js"
+import { activeElt, doc, win } from "../util/dom.js"
 import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event.js"
 import { dragAndDrop } from "../util/feature_detection.js"
 import { bind, countColumn, findColumn, sel_mouse } from "../util/misc.js"
@@ -73,7 +73,7 @@ export function onMouseDown(e) {
   }
   if (clickInGutter(cm, e)) return
   let pos = posFromMouse(cm, e), button = e_button(e), repeat = pos ? clickRepeat(pos, button) : "single"
-  window.focus()
+  win(cm).focus()
 
   // #3261: make sure, that we're not starting a second selection
   if (button == 1 && cm.state.selectingText)
@@ -128,7 +128,7 @@ function configureMouse(cm, repeat, event) {
 
 function leftButtonDown(cm, pos, repeat, event) {
   if (ie) setTimeout(bind(ensureFocus, cm), 0)
-  else cm.curOp.focus = activeElt()
+  else cm.curOp.focus = activeElt(doc(cm))
 
   let behavior = configureMouse(cm, repeat, event)
 
@@ -292,7 +292,7 @@ function leftButtonSelect(cm, event, start, behavior) {
     let cur = posFromMouse(cm, e, true, behavior.unit == "rectangle")
     if (!cur) return
     if (cmp(cur, lastPos) != 0) {
-      cm.curOp.focus = activeElt()
+      cm.curOp.focus = activeElt(doc(cm))
       extendTo(cur)
       let visible = visibleLines(display, doc)
       if (cur.line >= visible.to || cur.line < visible.from)
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index 4845a4ebbb..ef2e41f51e 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -96,7 +96,7 @@ export default class ContentEditableInput {
       let kludge = hiddenTextarea(), te = kludge.firstChild
       cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild)
       te.value = lastCopied.text.join("\n")
-      let hadFocus = activeElt()
+      let hadFocus = activeElt(div.ownerDocument)
       selectInput(te)
       setTimeout(() => {
         cm.display.lineSpace.removeChild(kludge)
@@ -119,7 +119,7 @@ export default class ContentEditableInput {
 
   prepareSelection() {
     let result = prepareSelection(this.cm, false)
-    result.focus = activeElt() == this.div
+    result.focus = activeElt(this.div.ownerDocument) == this.div
     return result
   }
 
@@ -213,7 +213,7 @@ export default class ContentEditableInput {
 
   focus() {
     if (this.cm.options.readOnly != "nocursor") {
-      if (!this.selectionInEditor() || activeElt() != this.div)
+      if (!this.selectionInEditor() || activeElt(this.div.ownerDocument) != this.div)
         this.showSelection(this.prepareSelection(), true)
       this.div.focus()
     }
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 977eb22723..9334e72ef9 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -177,7 +177,7 @@ export default class TextareaInput {
   supportsTouch() { return false }
 
   focus() {
-    if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
+    if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt(this.textarea.ownerDocument) != this.textarea)) {
       try { this.textarea.focus() }
       catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
     }
@@ -299,9 +299,9 @@ export default class TextareaInput {
       z-index: 1000; background: ${ie ? "rgba(255, 255, 255, .05)" : "transparent"};
       outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);`
     let oldScrollY
-    if (webkit) oldScrollY = window.scrollY // Work around Chrome issue (#2712)
+    if (webkit) oldScrollY = te.ownerDocument.defaultView.scrollY // Work around Chrome issue (#2712)
     display.input.focus()
-    if (webkit) window.scrollTo(null, oldScrollY)
+    if (webkit) te.ownerDocument.defaultView.scrollTo(null, oldScrollY)
     display.input.reset()
     // Adds "Select all" to context menu in FF
     if (!cm.somethingSelected()) te.value = input.prevInput = " "
diff --git a/src/measurement/position_measurement.js b/src/measurement/position_measurement.js
index 2766fb796b..26232a77a4 100644
--- a/src/measurement/position_measurement.js
+++ b/src/measurement/position_measurement.js
@@ -4,7 +4,7 @@ import { collapsedSpanAround, heightAtLine, lineIsHidden, visualLine } from "../
 import { getLine, lineAtHeight, lineNo, updateLineHeight } from "../line/utils_line.js"
 import { bidiOther, getBidiPartAt, getOrder } from "../util/bidi.js"
 import { chrome, android, ie, ie_version } from "../util/browser.js"
-import { elt, removeChildren, range, removeChildrenAndAdd } from "../util/dom.js"
+import { elt, removeChildren, range, removeChildrenAndAdd, doc } from "../util/dom.js"
 import { e_target } from "../util/event.js"
 import { hasBadZoomedRects } from "../util/feature_detection.js"
 import { countColumn, findFirst, isExtendingChar, scrollerGap, skipExtendingChars } from "../util/misc.js"
@@ -282,16 +282,16 @@ export function clearCaches(cm) {
   cm.display.lineNumChars = null
 }
 
-function pageScrollX() {
+function pageScrollX(doc) {
   // Work around https://bugs.chromium.org/p/chromium/issues/detail?id=489206
   // which causes page_Offset and bounding client rects to use
   // different reference viewports and invalidate our calculations.
-  if (chrome && android) return -(document.body.getBoundingClientRect().left - parseInt(getComputedStyle(document.body).marginLeft))
-  return window.pageXOffset || (document.documentElement || document.body).scrollLeft
+  if (chrome && android) return -(doc.body.getBoundingClientRect().left - parseInt(getComputedStyle(doc.body).marginLeft))
+  return doc.defaultView.pageXOffset || (doc.documentElement || doc.body).scrollLeft
 }
-function pageScrollY() {
-  if (chrome && android) return -(document.body.getBoundingClientRect().top - parseInt(getComputedStyle(document.body).marginTop))
-  return window.pageYOffset || (document.documentElement || document.body).scrollTop
+function pageScrollY(doc) {
+  if (chrome && android) return -(doc.body.getBoundingClientRect().top - parseInt(getComputedStyle(doc.body).marginTop))
+  return doc.defaultView.pageYOffset || (doc.documentElement || doc.body).scrollTop
 }
 
 function widgetTopHeight(lineObj) {
@@ -317,8 +317,8 @@ export function intoCoordSystem(cm, lineObj, rect, context, includeWidgets) {
   else yOff -= cm.display.viewOffset
   if (context == "page" || context == "window") {
     let lOff = cm.display.lineSpace.getBoundingClientRect()
-    yOff += lOff.top + (context == "window" ? 0 : pageScrollY())
-    let xOff = lOff.left + (context == "window" ? 0 : pageScrollX())
+    yOff += lOff.top + (context == "window" ? 0 : pageScrollY(doc(cm)))
+    let xOff = lOff.left + (context == "window" ? 0 : pageScrollX(doc(cm)))
     rect.left += xOff; rect.right += xOff
   }
   rect.top += yOff; rect.bottom += yOff
@@ -332,8 +332,8 @@ export function fromCoordSystem(cm, coords, context) {
   let left = coords.left, top = coords.top
   // First move into "page" coordinate system
   if (context == "page") {
-    left -= pageScrollX()
-    top -= pageScrollY()
+    left -= pageScrollX(doc(cm))
+    top -= pageScrollY(doc(cm))
   } else if (context == "local" || !context) {
     let localBox = cm.display.sizer.getBoundingClientRect()
     left += localBox.left
diff --git a/src/util/dom.js b/src/util/dom.js
index 04d2569d28..fa4346e6a4 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -64,15 +64,15 @@ export function contains(parent, child) {
   } while (child = child.parentNode)
 }
 
-export function activeElt() {
+export function activeElt(doc) {
   // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.
   // IE < 10 will throw when accessed while the page is loading or in an iframe.
   // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.
   let activeElement
   try {
-    activeElement = document.activeElement
+    activeElement = doc.activeElement
   } catch(e) {
-    activeElement = document.body || null
+    activeElement = doc.body || null
   }
   while (activeElement && activeElement.shadowRoot && activeElement.shadowRoot.activeElement)
     activeElement = activeElement.shadowRoot.activeElement
@@ -95,3 +95,7 @@ if (ios) // Mobile Safari apparently has a bug where select() is broken.
   selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length }
 else if (ie) // Suppress mysterious IE10 errors
   selectInput = function(node) { try { node.select() } catch(_e) {} }
+
+export function doc(cm) { return cm.display.wrapper.ownerDocument.defaultView }
+
+export function win(cm) { return doc(cm).defaultView }

From 02abcd2d01f87b0410696faf8fc7c3955e32c65d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2022 09:54:30 +0200
Subject: [PATCH 4653/4742] Fix previous patch

---
 src/display/operations.js     | 2 +-
 src/display/update_display.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index 27d82cb9d9..b004575bb9 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -2,7 +2,7 @@ import { clipPos } from "../line/pos.js"
 import { findMaxLine } from "../line/spans.js"
 import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement.js"
 import { signal } from "../util/event.js"
-import { activeElt } from "../util/dom.js"
+import { activeElt, doc } from "../util/dom.js"
 import { finishOperation, pushOperation } from "../util/operation_group.js"
 
 import { ensureFocus } from "./focus.js"
diff --git a/src/display/update_display.js b/src/display/update_display.js
index 88247c6c92..63529d5188 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -77,7 +77,7 @@ function restoreSelection(snapshot) {
   snapshot.activeElt.focus()
   if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
       snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
-    let doc = shapshot.activeElt.ownerDocument
+    let doc = snapshot.activeElt.ownerDocument
     let sel = doc.defaultView.getSelection(), range = doc.createRange()
     range.setEnd(snapshot.anchorNode, snapshot.anchorOffset)
     range.collapse(false)

From feed828066b0087665cf067ec7ac82a210866284 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2022 10:23:57 +0200
Subject: [PATCH 4654/4742] Add keymap/vim.js to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f552109d20..f2c6a9621a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /node_modules
 /npm-debug.log
 /package-lock.json
+/keymap/vim.js
 /test*.html
 .tern-*
 *~

From 139983f94824ec0afd08ab07cc896d78b5366196 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2022 10:24:11 +0200
Subject: [PATCH 4655/4742] Upgrade blint

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 927bbd87a0..6d30b98216 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@rollup/plugin-buble": "^0.21.3",
-    "blint": "^1.1.0",
+    "blint": "^1.1.2",
     "cm5-vim": "^0.0.5",
     "node-static": "0.7.11",
     "puppeteer": "^1.20.0",

From 24c3a06e6b1e73eaa6f264f934a7c5e2be5329ed Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2022 10:32:28 +0200
Subject: [PATCH 4656/4742] Fix doc(cm) to actually return a document

---
 src/util/dom.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/dom.js b/src/util/dom.js
index fa4346e6a4..6672645a8d 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -96,6 +96,6 @@ if (ios) // Mobile Safari apparently has a bug where select() is broken.
 else if (ie) // Suppress mysterious IE10 errors
   selectInput = function(node) { try { node.select() } catch(_e) {} }
 
-export function doc(cm) { return cm.display.wrapper.ownerDocument.defaultView }
+export function doc(cm) { return cm.display.wrapper.ownerDocument }
 
 export function win(cm) { return doc(cm).defaultView }

From fbe87a2a8385fbbd5a2ef2e4f3cef621059a53f4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 19 Jul 2022 12:57:23 +0200
Subject: [PATCH 4657/4742] Link codemirror-vim from vim demo

---
 demo/vim.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/demo/vim.html b/demo/vim.html
index e7df36f6d9..7f4b6e67c9 100644
--- a/demo/vim.html
+++ b/demo/vim.html
@@ -31,12 +31,11 @@
 <article>
 <h2>Vim bindings demo</h2>
 
-<p><strong style="color: #c33; text-decoration: none">Note:</strong> The CodeMirror vim bindings do not have an
-active maintainer. That means that if you report bugs in it, they are
-likely to go unanswered. It also means that if you want to help, you
-are very welcome to look
-at <a href="https://github.com/codemirror/codemirror5/issues?q=is%3Aissue+is%3Aopen+label%3Avim">the
-open issues</a> and see which ones you can solve.</p>
+<p><strong style="color: #c33; text-decoration: none">Note:</strong>
+The CodeMirror vim bindings are maintained in
+the <a href="https://github.com/replit/codemirror-vim">codemirror-vim</a>
+repository, not this project. The file is still included in the
+distribution for backwards compatibility.</p>
 
 <form><textarea id="code" name="code">
 #include "syscalls.h"

From 9b34840545162c9d27cf057bce8042de8bedd27e Mon Sep 17 00:00:00 2001
From: Randy Luecke <randy.luecke@me.com>
Date: Tue, 19 Jul 2022 12:54:20 -0700
Subject: [PATCH 4658/4742] Fix for new function name clashing with local
 variable.

---
 src/edit/mouse_events.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index f6fc07406a..e854d64791 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -9,7 +9,7 @@ import { normalizeSelection, Range, Selection } from "../model/selection.js"
 import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates.js"
 import { captureRightClick, chromeOS, ie, ie_version, mac, webkit, safari } from "../util/browser.js"
 import { getOrder, getBidiPartAt } from "../util/bidi.js"
-import { activeElt, doc, win } from "../util/dom.js"
+import { activeElt, doc as getDoc, win } from "../util/dom.js"
 import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event.js"
 import { dragAndDrop } from "../util/feature_detection.js"
 import { bind, countColumn, findColumn, sel_mouse } from "../util/misc.js"
@@ -128,7 +128,7 @@ function configureMouse(cm, repeat, event) {
 
 function leftButtonDown(cm, pos, repeat, event) {
   if (ie) setTimeout(bind(ensureFocus, cm), 0)
-  else cm.curOp.focus = activeElt(doc(cm))
+  else cm.curOp.focus = activeElt(getDoc(cm))
 
   let behavior = configureMouse(cm, repeat, event)
 
@@ -292,7 +292,7 @@ function leftButtonSelect(cm, event, start, behavior) {
     let cur = posFromMouse(cm, e, true, behavior.unit == "rectangle")
     if (!cur) return
     if (cmp(cur, lastPos) != 0) {
-      cm.curOp.focus = activeElt(doc(cm))
+      cm.curOp.focus = activeElt(getDoc(cm))
       extendTo(cur)
       let visible = visibleLines(display, doc)
       if (cur.line >= visible.to || cur.line < visible.from)

From 7a2106aed246ae6dc1a05dc92a8cdc4196e12213 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Jul 2022 09:41:14 +0200
Subject: [PATCH 4659/4742] Add '5' to title of front and manual pages

---
 doc/manual.html | 2 +-
 index.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 5782898d6f..e2fcf6ecf8 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror: User Manual</title>
+<title>CodeMirror 5 User Manual</title>
 <meta charset="utf-8"/>
 <link rel=stylesheet href="docs.css">
 <script src="activebookmark.js"></script>
diff --git a/index.html b/index.html
index 00d7d26536..947b79d187 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<title>CodeMirror</title>
+<title>CodeMirror 5</title>
 <meta charset="utf-8"/>
 
 <link rel=stylesheet href="lib/codemirror.css">

From dc7e324c5c02e2b23851ab7849fcfcbf305bf737 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 20 Jul 2022 11:49:25 +0200
Subject: [PATCH 4660/4742] Mark version 5.65.7

---
 AUTHORS           | 10 ++++++++++
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 12 ++++++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index e0c7f54121..058017d8ab 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -124,6 +124,7 @@ Billiam
 Billy Moon
 Bin Ni
 binny
+Bjarki Ágúst Guðmundsson
 Bjorn Hansen
 B Krishna Chaitanya
 Blaine G
@@ -133,6 +134,7 @@ boomyjee
 Bo Peng
 borawjm
 Boris K
+Boris Verkhovskiy
 Brad Metcalf
 Brandon Frohs
 Brandon Wamboldt
@@ -262,6 +264,7 @@ Enam Mijbah Noor
 Eric Allam
 Eric Bogard
 Erik Demaine
+Erik Krogh Kristensen
 Erik Welander
 erosman
 eustas
@@ -270,6 +273,7 @@ Fabien Dubosson
 Fabien O'Carroll
 Fabio Zendhi Nagao
 Faiza Alsaied
+Faris Masad
 Fauntleroy
 fbuchinger
 feizhang365
@@ -294,6 +298,7 @@ Frank Wiegand
 fraxx001
 Fredrik Borg
 FUJI Goro (gfx)
+fzipp
 Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
@@ -335,6 +340,7 @@ Haoran Yu
 Harald Schilly
 Hardest
 Harshvardhan Gupta
+Harutyun Amirjanyan
 Hasan Delibaş
 Hasan Karahan
 Heanes
@@ -497,6 +503,7 @@ Kim-Anh Tran
 Klaus Silveira
 Koh Zi Han, Cliff
 komakino
+kometenstaub
 Konrad Zapotoczny
 Konstantin Chernenko
 Konstantin Lopuhin
@@ -735,6 +742,7 @@ Pi Delport
 Pierre Gerold
 Pieter Ouwerkerk
 Piyush
+Pontus Granström
 Pontus Melke
 prasanthj
 Prasanth J
@@ -886,6 +894,7 @@ thomasmaclean
 Thomas Schmid
 Tim Alby
 Tim Baumann
+Tim Down
 Tim Gates
 Tim Nguyen
 Timothy Farrell
@@ -945,6 +954,7 @@ Wojtek Ptak
 wonderboyjon
 Wu Cheng-Han
 Xavier Mendez
+Yakov Manshin
 Yang Guo
 Yash Singh
 Yash-Singh1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef2f9bef8c..4ff4d5ca10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.65.7 (2022-07-20)
+
+### Bug fixes
+
+Fix several references to the global `document`/`window`, improving support for creating an editor in another frame.
+
+[vim bindings](https://codemirror.net/5/demo/vim.html): Use [upstream](https://github.com/replit/codemirror-vim/) code instead of keeping our own copy.
+
+[tern addon](https://codemirror.net/5/demo/tern.html): Properly HTML escape variable names in rename dialog.
+
 ## 5.65.6 (2022-06-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index e2fcf6ecf8..bfeec73e98 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.6</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.7</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 f42d6aac5e..c3201a48b4 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,8 +28,20 @@ <h2>Release notes and version history</h2>
 
 <section id=v5 class=first>
 
+  <h2>Version 6.x</h2>
+
+  <p>See <a href="https://codemirror.net/docs/changelog/">the new website</a>.</p>
+
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-07-2022: <a href="https://codemirror.net/5/codemirror-5.65.7.zip">Version 5.65.7</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix several references to the global <code>document</code>/<code>window</code>, improving support for creating an editor in another frame.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Use <a href="https://github.com/replit/codemirror-vim/">upstream</a> code instead of keeping our own copy.</li>
+    <li><a href="https://codemirror.net/5/demo/tern.html">tern addon</a>: Properly HTML escape variable names in rename dialog.</li>
+  </ul>
+
   <p class="rel">20-06-2022: <a href="https://codemirror.net/5/codemirror-5.65.6.zip">Version 5.65.6</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 947b79d187..b70dcbbe67 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.6</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.7</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 6d30b98216..e8b7587750 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.6",
+  "version": "5.65.7",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 6a1bdfb2a4..9e925a1ffa 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.6"
+CodeMirror.version = "5.65.7"

From fc0440bc7563aead662492b0f1b0512637545442 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 22 Jul 2022 08:38:26 +0200
Subject: [PATCH 4661/4742] Include direction override and isolate characters
 in default specialChars regexp

Closes https://github.com/codemirror/codemirror5/issues/6967
---
 doc/manual.html     | 2 +-
 src/edit/options.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index bfeec73e98..fb8a2e89bd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -286,7 +286,7 @@ <h2>Configuration</h2>
       should be replaced by a
       special <a href="#option_specialCharPlaceholder">placeholder</a>.
       Mostly useful for non-printing special characters. The default
-      is <code>/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/</code>.</dd>
+      is <code>/[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\u2066\u2067\u2069\ufeff\ufff9-\ufffc]/</code>.</dd>
       <dt id="option_specialCharPlaceholder"><code><strong>specialCharPlaceholder</strong>: function(char) → Element</code></dt>
       <dd>A function that, given a special character identified by
       the <a href="#option_specialChars"><code>specialChars</code></a>
diff --git a/src/edit/options.js b/src/edit/options.js
index 8cb9cee065..d6bc37aa95 100644
--- a/src/edit/options.js
+++ b/src/edit/options.js
@@ -68,7 +68,7 @@ export function defineOptions(CodeMirror) {
     for (let i = newBreaks.length - 1; i >= 0; i--)
       replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
   })
-  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, (cm, val, old) => {
+  option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\u202d\u202e\u2066\u2067\u2069\ufeff\ufff9-\ufffc]/g, (cm, val, old) => {
     cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g")
     if (old != Init) cm.refresh()
   })

From 7710c7c8c3577c9173a11952db352240bcf238f7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 27 Jul 2022 15:48:15 +0200
Subject: [PATCH 4662/4742] Fix bug in input resetting during composition

Closes https://github.com/codemirror/codemirror5/issues/6893
---
 src/input/TextareaInput.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 9334e72ef9..3db3f5f0f3 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -28,6 +28,7 @@ export default class TextareaInput {
     // Used to work around IE issue with selection being forgotten when focus moves away from textarea
     this.hasSelection = false
     this.composing = null
+    this.resetting = false
   }
 
   init(display) {
@@ -158,8 +159,9 @@ export default class TextareaInput {
   // Reset the input to correspond to the selection (or to be empty,
   // when not typing and nothing is selected)
   reset(typing) {
-    if (this.contextMenuPending || this.composing) return
+    if (this.contextMenuPending || this.composing && typing) return
     let cm = this.cm
+    this.resetting = true
     if (cm.somethingSelected()) {
       this.prevInput = ""
       let content = cm.getSelection()
@@ -170,6 +172,7 @@ export default class TextareaInput {
       this.prevInput = this.textarea.value = ""
       if (ie && ie_version >= 9) this.hasSelection = null
     }
+    this.resetting = false
   }
 
   getField() { return this.textarea }
@@ -227,7 +230,7 @@ export default class TextareaInput {
     // 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.contextMenuPending || !cm.state.focused ||
+    if (this.contextMenuPending || this.resetting || !cm.state.focused ||
         (hasSelection(input) && !prevInput && !this.composing) ||
         cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
       return false

From 7ac872b0dbdd75a5c88a8c143c14021f70451041 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 28 Jul 2022 10:27:42 +0200
Subject: [PATCH 4663/4742] [foldgutter addon] Recompute fold markers on mode
 change

Closes https://github.com/codemirror/codemirror5/issues/6968
---
 addon/fold/foldgutter.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addon/fold/foldgutter.js b/addon/fold/foldgutter.js
index 481fea2af9..8fc0e99474 100644
--- a/addon/fold/foldgutter.js
+++ b/addon/fold/foldgutter.js
@@ -21,6 +21,7 @@
       cm.off("fold", onFold);
       cm.off("unfold", onFold);
       cm.off("swapDoc", onChange);
+      cm.off("optionChange", optionChange);
     }
     if (val) {
       cm.state.foldGutter = new State(parseOptions(val));
@@ -31,6 +32,7 @@
       cm.on("fold", onFold);
       cm.on("unfold", onFold);
       cm.on("swapDoc", onChange);
+      cm.on("optionChange", optionChange);
     }
   });
 
@@ -120,6 +122,10 @@
     else cm.foldCode(Pos(line, 0), opts);
   }
 
+  function optionChange(cm, option) {
+    if (option == "mode") onChange(cm)
+  }
+
   function onChange(cm) {
     var state = cm.state.foldGutter;
     if (!state) return;

From 84bb7bfc4ef6037a9172b60ec44caa65be0cff5a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 1 Aug 2022 15:52:17 +0200
Subject: [PATCH 4664/4742] [python mode] Add exec and print to hintWords

Closes https://github.com/codemirror/codemirror5/issues/6969
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index 1cec2de886..2a5898db71 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -32,7 +32,7 @@
                         "sorted", "staticmethod", "str", "sum", "super", "tuple",
                         "type", "vars", "zip", "__import__", "NotImplemented",
                         "Ellipsis", "__debug__"];
-  CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
+  CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins).concat(["exec", "print"]);
 
   function top(state) {
     return state.scopes[state.scopes.length - 1];

From 9670ccf3b1512e8e6a5b5591e98c242ac6e9f5c3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Mon, 1 Aug 2022 15:54:31 +0200
Subject: [PATCH 4665/4742] Add missing closing paren

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

diff --git a/mode/python/python.js b/mode/python/python.js
index 2a5898db71..d75b021e2c 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -32,7 +32,7 @@
                         "sorted", "staticmethod", "str", "sum", "super", "tuple",
                         "type", "vars", "zip", "__import__", "NotImplemented",
                         "Ellipsis", "__debug__"];
-  CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins).concat(["exec", "print"]);
+  CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins).concat(["exec", "print"]));
 
   function top(state) {
     return state.scopes[state.scopes.length - 1];

From 3b15f70cf8bf5ec08600bc639088a8d31cdaf1a8 Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Mon, 8 Aug 2022 10:55:40 +0300
Subject: [PATCH 4666/4742] [real-world uses] Add Cloud Commander

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

diff --git a/doc/realworld.html b/doc/realworld.html
index 4b62d7e04f..4d822b36ab 100644
--- a/doc/realworld.html
+++ b/doc/realworld.html
@@ -42,6 +42,7 @@ <h2>CodeMirror real-world uses</h2>
       <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
       <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
       <li><a href="https://encap.github.io/clone-it/">Clone-It</a> (HTML & CSS learning game)</li>
+      <li><a href="https://cloudcmd.io">Cloud Commander</a> (filemanager for the web)</li>
       <li><a href="https://electronjs.org/apps/colon">Colon</a> (A flexible text editor or IDE)</li>
       <li><a href="http://code.world/">CodeWorld</a> (Haskell playground)</li>
       <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>

From 9232cb375098b3c89fc1fba2dd4d874096b24f18 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 11 Aug 2022 10:11:59 +0200
Subject: [PATCH 4667/4742] [merge addon] Fix IE10 compatibility

By changing a function declaration to a variable declaration

Closes https://github.com/codemirror/codemirror5/issues/6976
---
 addon/merge/merge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index a5ba21aa84..d61051cf32 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -614,7 +614,7 @@
     var gapElts = [lockWrap];
     if (dv.mv.options.revertButtons !== false) {
       dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
-      function copyButtons(e) {
+      var copyButtons = function(e) {
         var node = e.target || e.srcElement;
         if (!node.chunk) return;
         if (node.className == "CodeMirror-merge-copy-reverse") {

From 21141474f6e80241a1b1081017e6c055bdaa7aa4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sat, 20 Aug 2022 13:14:27 +0200
Subject: [PATCH 4668/4742] Mark version 5.65.8

---
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ff4d5ca10..327f5069c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.65.8 (2022-08-20)
+
+### Bug fixes
+
+Include direction override and isolate characters in the default set of special characters.
+
+Fix an issue that could cause document corruption when mouse-selecting during composition.
+
+[foldgutter addon](https://codemirror.net/5/doc/manual.html#addon_foldgutter): Refresh markers when the editor's mode changes.
+
+[merge addon](https://codemirror.net/5/doc/manual.html#addon_merge): Fix syntax that prevented the addon from loading in IE10.
+
 ## 5.65.7 (2022-07-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index fb8a2e89bd..de63c5d223 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.7</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.8</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 c3201a48b4..83f7d531c8 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,15 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-08-2022: <a href="https://codemirror.net/5/codemirror-5.65.8.zip">Version 5.65.8</a>:</p>
+
+  <ul class="rel-note">
+    <li>Include direction override and isolate characters in the default set of special characters.</li>
+    <li>Fix an issue that could cause document corruption when mouse-selecting during composition.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_foldgutter">foldgutter addon</a>: Refresh markers when the editor’s mode changes.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_merge">merge addon</a>: Fix syntax that prevented the addon from loading in IE10.</li>
+  </ul>
+
   <p class="rel">20-07-2022: <a href="https://codemirror.net/5/codemirror-5.65.7.zip">Version 5.65.7</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index b70dcbbe67..b77dc6a661 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.7</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.8</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index e8b7587750..e1388a4b0c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.7",
+  "version": "5.65.8",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 9e925a1ffa..5b222fe15e 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.7"
+CodeMirror.version = "5.65.8"

From b7460f6b8d01f80eaff63b8923f5699466e556a6 Mon Sep 17 00:00:00 2001
From: Vladislav Voitenok <vleduser@gmail.com>
Date: Fri, 26 Aug 2022 13:10:09 +0300
Subject: [PATCH 4669/4742] [jinja2 mode] Support line statements

---
 mode/jinja2/index.html | 10 ++++++
 mode/jinja2/jinja2.js  | 69 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/mode/jinja2/index.html b/mode/jinja2/index.html
index e2a822231f..9b93dabe48 100644
--- a/mode/jinja2/index.html
+++ b/mode/jinja2/index.html
@@ -45,6 +45,16 @@ <h2>Jinja2 mode</h2>
   })
 }}
 {% include (&#39;test.incl.html.twig&#39;) %}
+
+# for item in seq:
+    &lt;li&gt;{{ item }} &lt;/li&gt;    ## this comment is ignored
+# endfor
+# set text = "Multiline
+	text"
+# for href, caption in [('index.html', 'Index'),
+                        ('about.html', 'About')]:
+    &lt;li&gt;&lt;a href="{{ href }}"&gt;{{ caption }}&lt;/a&gt;&lt;/li&gt;
+# endfor
 </textarea></form>
     <script>
       var editor =
diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index ace1f1f3fc..a2954a5f05 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -13,18 +13,18 @@
 
   CodeMirror.defineMode("jinja2", function() {
     var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif",
-      "extends", "filter", "endfilter", "firstof", "for",
+      "extends", "filter", "endfilter", "firstof", "do", "for",
       "endfor", "if", "endif", "ifchanged", "endifchanged",
-      "ifequal", "endifequal", "ifnotequal",
+      "ifequal", "endifequal", "ifnotequal", "set", "raw", "endraw",
       "endifnotequal", "in", "include", "load", "not", "now", "or",
-      "parsed", "regroup", "reversed", "spaceless",
-      "endspaceless", "ssi", "templatetag", "openblock",
-      "closeblock", "openvariable", "closevariable",
+      "parsed", "regroup", "reversed", "spaceless", "call", "endcall", "macro",
+      "endmacro", "endspaceless", "ssi", "templatetag", "openblock",
+      "closeblock", "openvariable", "closevariable", "without", "context",
       "openbrace", "closebrace", "opencomment",
       "closecomment", "widthratio", "url", "with", "endwith",
       "get_current_language", "trans", "endtrans", "noop", "blocktrans",
       "endblocktrans", "get_available_languages",
-      "get_current_language_bidi", "plural"],
+      "get_current_language_bidi", "pluralize", "autoescape", "endautoescape"],
     operator = /^[+\-*&%=<>!?|~^]/,
     sign = /^[:\[\(\{]/,
     atom = ["true", "false"],
@@ -78,7 +78,24 @@
           state.instring = ch;
           stream.next();
           return "string";
-        } else if(stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
+        }
+        else if (state.inbraces > 0 && ch ==")") {
+          stream.next()
+          state.inbraces--;
+        }
+        else if (ch == "(") {
+          stream.next()
+          state.inbraces++;
+        }
+        else if (state.inbrackets > 0 && ch =="]") {
+          stream.next()
+          state.inbrackets--;
+        }
+        else if (ch == "[") {
+          stream.next()
+          state.inbrackets++;
+        }
+        else if (!state.lineTag && (stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}"))) {        
           state.intag = false;
           return "tag";
         } else if(stream.match(operator)) {
@@ -87,6 +104,10 @@
         } else if(stream.match(sign)) {
           state.sign = true;
         } else {
+          if (stream.column() == 1 && state.lineTag && stream.match(keywords)) {
+            //allow nospace after tag before the keyword
+            return "keyword";
+          }
           if(stream.eat(" ") || stream.sol()) {
             if(stream.match(keywords)) {
               return "keyword";
@@ -120,25 +141,51 @@
         } else if (ch = stream.eat(/\{|%/)) {
           //Cache close tag
           state.intag = ch;
+          state.inbraces = 0;
+          state.inbrackets = 0;
           if(ch == "{") {
             state.intag = "}";
           }
           stream.eat("-");
           return "tag";
         }
+      //Line statements
+      } else if (stream.eat('#')) {
+        if (stream.peek() == '#') {
+          stream.skipToEnd();
+          return "comment"
+        }
+        else if (!stream.eol()) {
+          state.intag = true;
+          state.lineTag = true;
+          state.inbraces = 0;
+          state.inbrackets = 0;
+          return "tag";
+        }
       }
       stream.next();
     };
 
     return {
       startState: function () {
-        return {tokenize: tokenBase};
+        return {
+          tokenize: tokenBase,
+          inbrackets:0,
+          inbraces:0
+        };
       },
-      token: function (stream, state) {
-        return state.tokenize(stream, state);
+      token: function(stream, state) {
+        var style = state.tokenize(stream, state);
+        if (stream.eol() && state.lineTag && !state.instring && state.inbraces == 0 && state.inbrackets == 0) {
+          //Close line statement at the EOL
+          state.intag = false
+          state.lineTag = false
+        }
+	return style;
       },
       blockCommentStart: "{#",
-      blockCommentEnd: "#}"
+      blockCommentEnd: "#}",
+      lineComment: "##",
     };
   });
 

From 0ade73a9ea223f24684270281cd163ef46f30610 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 26 Aug 2022 12:17:11 +0200
Subject: [PATCH 4670/4742] [jinja2 mode] Remove trailing whitespace

Issue https://github.com/codemirror/codemirror5/pull/6975
---
 mode/jinja2/jinja2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index a2954a5f05..fca9f61c1b 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -95,7 +95,7 @@
           stream.next()
           state.inbrackets++;
         }
-        else if (!state.lineTag && (stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}"))) {        
+        else if (!state.lineTag && (stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}"))) {
           state.intag = false;
           return "tag";
         } else if(stream.match(operator)) {

From f1430486d9ce38771a15b77d94734345515768d2 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 26 Aug 2022 12:20:21 +0200
Subject: [PATCH 4671/4742] [jinja2 mode] Remove tab

Issue https://github.com/codemirror/codemirror5/pull/6975
---
 mode/jinja2/jinja2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/jinja2/jinja2.js b/mode/jinja2/jinja2.js
index fca9f61c1b..ec6f9903c6 100644
--- a/mode/jinja2/jinja2.js
+++ b/mode/jinja2/jinja2.js
@@ -181,7 +181,7 @@
           state.intag = false
           state.lineTag = false
         }
-	return style;
+        return style;
       },
       blockCommentStart: "{#",
       blockCommentEnd: "#}",

From ccacc382636a8f892f665b0eb49dcdce99593ae3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 26 Aug 2022 18:17:39 +0200
Subject: [PATCH 4672/4742] [show-hint addon] Resize popup if it doesn't fit in
 the viewport

Issue https://github.com/codemirror/codemirror5/pull/6979
---
 addon/hint/show-hint.css |  1 +
 addon/hint/show-hint.js  | 20 +++++++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/addon/hint/show-hint.css b/addon/hint/show-hint.css
index 5617ccca2b..d41031cdb8 100644
--- a/addon/hint/show-hint.css
+++ b/addon/hint/show-hint.css
@@ -19,6 +19,7 @@
 
   max-height: 20em;
   overflow-y: auto;
+  box-sizing: border-box;
 }
 
 .CodeMirror-hint {
diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index be729c3efe..aaf1f643f4 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -286,20 +286,14 @@
     setTimeout(function() { startScroll = cm.getScrollInfo(); });
 
     var overlapY = box.bottom - winH;
-    if (overlapY > 0) {
-      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
-      if (curTop - height > 0) { // Fits above cursor
-        hints.style.top = (top = pos.top - height - offsetTop) + "px";
+    if (overlapY > 0) { // Does not fit below
+      var height = box.bottom - box.top, spaceAbove = box.top - (pos.bottom - pos.top) - 2
+      if (winH - box.top < spaceAbove) { // More room at the top
+        if (height > spaceAbove) hints.style.height = (height = spaceAbove) + "px";
+        hints.style.top = ((top = pos.top - height) + offsetTop) + "px";
         below = false;
-      } else if (height > winH) {
-        hints.style.height = (winH - 5) + "px";
-        hints.style.top = (top = pos.bottom - box.top - offsetTop) + "px";
-        var cursor = cm.getCursor();
-        if (data.from.ch != cursor.ch) {
-          pos = cm.cursorCoords(cursor);
-          hints.style.left = (left = pos.left - offsetLeft) + "px";
-          box = hints.getBoundingClientRect();
-        }
+      } else {
+        hints.style.height = (winH - box.top - 2) + "px";
       }
     }
     var overlapX = box.right - winW;

From 264ba931c4cfcc9f271ae9f1d7a71c934290c008 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 6 Sep 2022 15:15:02 +0200
Subject: [PATCH 4673/4742] [swift mode] Fix tokenizing of block comments

Closes https://github.com/codemirror/codemirror5/issues/6981
---
 mode/swift/swift.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mode/swift/swift.js b/mode/swift/swift.js
index 1edc7907d8..4edc4507ae 100644
--- a/mode/swift/swift.js
+++ b/mode/swift/swift.js
@@ -143,14 +143,12 @@
 
   function tokenComment(stream, state) {
     var ch
-    while (true) {
-      stream.match(/^[^/*]+/, true)
-      ch = stream.next()
-      if (!ch) break
+    while (ch = stream.next()) {
       if (ch === "/" && stream.eat("*")) {
         state.tokenize.push(tokenComment)
       } else if (ch === "*" && stream.eat("/")) {
         state.tokenize.pop()
+        break
       }
     }
     return "comment"

From 0f41e5153f8948604a0e9a2d71a1adbb9aeaed23 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 8 Sep 2022 09:49:04 +0200
Subject: [PATCH 4674/4742] Add clip-path to wrapper element on Chrome 105 to
 work around browser bug

Issue https://github.com/codemirror/codemirror5/issues/6982
---
 src/display/Display.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/display/Display.js b/src/display/Display.js
index 9d4c0360d6..28d8dbb013 100644
--- a/src/display/Display.js
+++ b/src/display/Display.js
@@ -1,4 +1,4 @@
-import { gecko, ie, ie_version, mobile, webkit } from "../util/browser.js"
+import { gecko, ie, ie_version, mobile, webkit, chrome, chrome_version } from "../util/browser.js"
 import { elt, eltP } from "../util/dom.js"
 import { scrollerGap } from "../util/misc.js"
 import { getGutters, renderGutters } from "./gutters.js"
@@ -48,6 +48,8 @@ export function Display(place, doc, input, options) {
   d.scroller.setAttribute("tabIndex", "-1")
   // The element in which the editor lives.
   d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror")
+  // See #6982. FIXME remove when this has been fixed for a while in Chrome
+  if (chrome && chrome_version >= 105) d.wrapper.style.clipPath = "inset(0px)"
 
   // This attribute is respected by automatic translation systems such as Google Translate,
   // and may also be respected by tools used by human translators.

From ec72109aced0494d3b1df18faa0df079a42fcbc2 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Thu, 8 Sep 2022 12:52:37 +0200
Subject: [PATCH 4675/4742] [nsis mode] add ${Case} variants

Reference: https://nsis.sourceforge.io/LogicLib
---
 mode/nsis/nsis.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index b84ecc2167..2173916bb2 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -40,7 +40,7 @@ CodeMirror.defineSimpleMode("nsis",{
     {regex: /\b(?:admin|all|amd64-unicode|auto|both|bottom|bzip2|components|current|custom|directory|false|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|off|on|right|show|silent|silentlog|textonly|top|true|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|x-86-(ansi|unicode)|zlib)\b/i, token: "builtin"},
 
     // LogicLib.nsh
-    {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/i, token: "variable-2", indent: true},
+    {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:2|3|4|5|Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/i, token: "variable-2", indent: true},
 
     // FileFunc.nsh
     {regex: /\$\{(?:BannerTrimPath|DirState|DriveSpace|Get(BaseName|Drives|ExeName|ExePath|FileAttributes|FileExt|FileName|FileVersion|Options|OptionsS|Parameters|Parent|Root|Size|Time)|Locate|RefreshShellIcons)\}/i, token: "variable-2", dedent: true},

From e5071ebb0b35bec9207c42c364d8a1fd3e942cf6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Sep 2022 14:36:09 +0200
Subject: [PATCH 4676/4742] Mark version 5.65.9

---
 AUTHORS           |  1 +
 CHANGELOG.md      | 12 ++++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  9 +++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 058017d8ab..3d19b21470 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -934,6 +934,7 @@ Vestimir Markov
 vf
 Victor Bocharsky
 Vincent Woo
+Vladislav Voitenok
 Volker Mische
 vtripolitakis
 wdouglashall
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 327f5069c4..b8e118d258 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.65.9 (2022-09-20)
+
+### Bug fixes
+
+Add a workaround for a regression in Chrome 105 that could cause content below the editor to not receive mouse events.
+
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Resize the tooltip if it doesn't fit the screen.
+
+[swift mode](https://codemirror.net/5/mode/swift): Fix tokenizing of block comments.
+
+[jinja2 mode](https://codemirror.net/5/mode/jinja2/): Support line statements.
+
 ## 5.65.8 (2022-08-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index de63c5d223..9be3471a1c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.8</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.9</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 83f7d531c8..9a8f368bc6 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,15 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-09-2022: <a href="https://codemirror.net/5/codemirror-5.65.9.zip">Version 5.65.9</a>:</p>
+
+  <ul class="rel-note">
+    <li>Add a workaround for a regression in Chrome 105 that could cause content below the editor to not receive mouse events.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Resize the tooltip if it doesn’t fit the screen.</li>
+    <li><a href="https://codemirror.net/5/mode/swift">swift mode</a>: Fix tokenizing of block comments.</li>
+    <li><a href="https://codemirror.net/5/mode/jinja2/">jinja2 mode</a>: Support line statements.</li>
+  </ul>
+
   <p class="rel">20-08-2022: <a href="https://codemirror.net/5/codemirror-5.65.8.zip">Version 5.65.8</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index b77dc6a661..33dd81f12d 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.8</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.9</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index e1388a4b0c..4647fb121f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.8",
+  "version": "5.65.9",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 5b222fe15e..85841e7279 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.8"
+CodeMirror.version = "5.65.9"

From e1fe2100d0fdc7c34d47993f6514bdd2213c0015 Mon Sep 17 00:00:00 2001
From: Mark Boyes <mark.boyes@oxfordsemantic.tech>
Date: Thu, 6 Oct 2022 12:52:06 +0100
Subject: [PATCH 4677/4742] [sparql mode] Identify all characters in prefixes

---
 mode/sparql/sparql.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/mode/sparql/sparql.js b/mode/sparql/sparql.js
index 5e68f5670d..6d928b5cde 100644
--- a/mode/sparql/sparql.js
+++ b/mode/sparql/sparql.js
@@ -33,6 +33,9 @@ CodeMirror.defineMode("sparql", function(config) {
                              "true", "false", "with",
                              "data", "copy", "to", "move", "add", "create", "drop", "clear", "load", "into"]);
   var operatorChars = /[*+\-<>=&|\^\/!\?]/;
+  var PN_CHARS = "[A-Za-z_\\-0-9]";
+  var PREFIX_START = new RegExp("[A-Za-z]");
+  var PREFIX_REMAINDER = new RegExp("((" + PN_CHARS + "|\\.)*(" + PN_CHARS + "))?:");
 
   function tokenBase(stream, state) {
     var ch = stream.next();
@@ -71,20 +74,18 @@ CodeMirror.defineMode("sparql", function(config) {
       stream.eatWhile(/[a-z\d\-]/i);
       return "meta";
     }
-    else {
-      stream.eatWhile(/[_\w\d]/);
-      if (stream.eat(":")) {
+    else if (PREFIX_START.test(ch) && stream.match(PREFIX_REMAINDER)) {
         eatPnLocal(stream);
         return "atom";
-      }
-      var word = stream.current();
-      if (ops.test(word))
-        return "builtin";
-      else if (keywords.test(word))
-        return "keyword";
-      else
-        return "variable";
     }
+    stream.eatWhile(/[_\w\d]/);
+    var word = stream.current();
+    if (ops.test(word))
+      return "builtin";
+    else if (keywords.test(word))
+      return "keyword";
+    else
+      return "variable";
   }
 
   function eatPnLocal(stream) {

From 9296326b0a9e37489e00d4d7bfabd4725f6bfb7b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Wed, 26 Oct 2022 14:23:29 +0200
Subject: [PATCH 4678/4742] [javascript mode] Fix recognition of class property
 keywords before private names

Closes https://github.com/codemirror/codemirror5/issues/6996
---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 48a46d65d0..bb735ebc96 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -779,7 +779,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "async" ||
         (type == "variable" &&
          (value == "static" || value == "get" || value == "set" || (isTS && isModifier(value))) &&
-         cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false))) {
+         cx.stream.match(/^\s+#?[\w$\xa1-\uffff]/, false))) {
       cx.marked = "keyword";
       return cont(classBody);
     }

From 2e3df70d4cfa5db5a9218893f2366fba7e59b928 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Nov 2022 01:32:23 +0100
Subject: [PATCH 4679/4742] [pegjs mode] Remove useless lines

---
 mode/pegjs/pegjs.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mode/pegjs/pegjs.js b/mode/pegjs/pegjs.js
index c0ed2fcc06..c0012c5cf2 100644
--- a/mode/pegjs/pegjs.js
+++ b/mode/pegjs/pegjs.js
@@ -31,8 +31,6 @@ CodeMirror.defineMode("pegjs", function (config) {
       };
     },
     token: function (stream, state) {
-      if (stream)
-
       //check for state changes
       if (!state.inString && !state.inComment && ((stream.peek() == '"') || (stream.peek() == "'"))) {
         state.stringType = stream.peek();
@@ -43,7 +41,6 @@ CodeMirror.defineMode("pegjs", function (config) {
         state.inComment = true;
       }
 
-      //return state
       if (state.inString) {
         while (state.inString && !stream.eol()) {
           if (stream.peek() === state.stringType) {

From 407d1f1c896dd507095559466fedb3335b8e182f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Nov 2022 01:33:47 +0100
Subject: [PATCH 4680/4742] [sql-hint addon] Make completion work when SQL
 isn't the outermost mode

Closes https://github.com/codemirror/codemirror5/issues/5249
---
 addon/hint/sql-hint.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 57c3b64f26..e01f502635 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -24,15 +24,13 @@
   function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }
 
   function getKeywords(editor) {
-    var mode = editor.doc.modeOption;
-    if (mode === "sql") mode = "text/x-sql";
-    return CodeMirror.resolveMode(mode).keywords;
+    return editor.getModeAt(editor.getCursor()).keywords || CodeMirror.resolveMode("text/x-sql").keywords;
   }
 
   function getIdentifierQuote(editor) {
-    var mode = editor.doc.modeOption;
-    if (mode === "sql") mode = "text/x-sql";
-    return CodeMirror.resolveMode(mode).identifierQuote || "`";
+    return editor.getModeAt(editor.getCursor()).identifierQuote ||
+      CodeMirror.resolveMode("text/x-sql").identifierQuote ||
+      "`";
   }
 
   function getText(item) {

From 742627abcab8314dcabed2ce8ae6d347eaaf5512 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 15 Nov 2022 09:36:27 +0100
Subject: [PATCH 4681/4742] [sql-hint addon] Fix retrieving of parser config

---
 addon/hint/sql-hint.js | 10 ++++++----
 mode/sql/sql.js        |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index e01f502635..61faec0bc0 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -23,14 +23,16 @@
 
   function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }
 
+  function getModeConf(editor) {
+    return editor.getModeAt(editor.getCursor()).config || CodeMirror.resolveMode("text/x-sql")
+  }
+
   function getKeywords(editor) {
-    return editor.getModeAt(editor.getCursor()).keywords || CodeMirror.resolveMode("text/x-sql").keywords;
+    return getModeConf(editor).keywords || []
   }
 
   function getIdentifierQuote(editor) {
-    return editor.getModeAt(editor.getCursor()).identifierQuote ||
-      CodeMirror.resolveMode("text/x-sql").identifierQuote ||
-      "`";
+    return getModeConf(editor).identifierQuote || "`";
   }
 
   function getText(item) {
diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index 105b22ffb9..fedf6cd77c 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -207,7 +207,8 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     blockCommentStart: "/*",
     blockCommentEnd: "*/",
     lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : "--",
-    closeBrackets: "()[]{}''\"\"``"
+    closeBrackets: "()[]{}''\"\"``",
+    config: parserConfig
   };
 });
 

From fe0bc6d5d5967ad4073805022b4e01e96a21bc1f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Sun, 20 Nov 2022 16:35:33 +0100
Subject: [PATCH 4682/4742] Mark version 5.65.10

---
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8e118d258..41d7f0815d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.65.10 (2022-11-20)
+
+### Bug fixes
+
+[sql-hint addon](https://codemirror.net/5/doc/manual.html#addon_sql-hint): Fix completion when the SQL mode is wrapped by some outer mode.
+
+[javascript mode](https://codemirror.net/5/mode/javascript/index.html): Fix parsing of property keywords before private property names.
+
 ## 5.65.9 (2022-09-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 9be3471a1c..19b21d8c1c 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.9</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.10</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 9a8f368bc6..a20dfa0312 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,13 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-11-2022: <a href="https://codemirror.net/5/codemirror-5.65.10.zip">Version 5.65.10</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_sql-hint">sql mode</a>: Fix completion when the SQL mode is wrapped by some outer mode.</li>
+    <li><a href="https://codemirror.net/5/mode/javascript/index.html">javascript mode</a>: Fix parsing of property keywords before private property names.</li>
+  </ul>
+
   <p class="rel">20-09-2022: <a href="https://codemirror.net/5/codemirror-5.65.9.zip">Version 5.65.9</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 33dd81f12d..75c53a2de0 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.9</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.10</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 4647fb121f..b6cde62684 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.9",
+  "version": "5.65.10",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 85841e7279..6d436dfbeb 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.9"
+CodeMirror.version = "5.65.10"

From 349c8a6c7adbb1a0d31b205260807f4f5847b1a6 Mon Sep 17 00:00:00 2001
From: DoctorKrolic <70431552+DoctorKrolic@users.noreply.github.com>
Date: Tue, 29 Nov 2022 18:58:47 +0300
Subject: [PATCH 4683/4742] [clike mode] Add new C# keywords

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

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 748909efeb..8075edb8a1 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -512,8 +512,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     name: "clike",
     keywords: words("abstract as async await base break case catch checked class const continue" +
                     " default delegate do else enum event explicit extern finally fixed for" +
-                    " foreach goto if implicit in interface internal is lock namespace new" +
-                    " operator out override params private protected public readonly ref return sealed" +
+                    " foreach goto if implicit in init interface internal is lock namespace new" +
+                    " operator out override params private protected public readonly record ref required return sealed" +
                     " sizeof stackalloc static struct switch this throw try typeof unchecked" +
                     " unsafe using virtual void volatile while add alias ascending descending dynamic from get" +
                     " global group into join let orderby partial remove select set value var yield"),
@@ -522,7 +522,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
                  " UInt64 bool byte char decimal double short int long object"  +
                  " sbyte float string ushort uint ulong"),
     blockKeywords: words("catch class do else finally for foreach if struct switch try while"),
-    defKeywords: words("class interface namespace struct var"),
+    defKeywords: words("class interface namespace record struct var"),
     typeFirstDefinitions: true,
     atoms: words("true false null"),
     hooks: {

From 7814ddf4011a9ec479d378fe7f3623bea0b17faf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 8 Dec 2022 08:21:15 +0100
Subject: [PATCH 4684/4742] [sql-hint addon] Reindent

---
 addon/hint/sql-hint.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index 61faec0bc0..b4a919518e 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -109,9 +109,9 @@
     var nameParts = getText(name).split(".");
     for (var i = 0; i < nameParts.length; i++)
       nameParts[i] = identifierQuote +
-        // duplicate identifierQuotes
-        nameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +
-        identifierQuote;
+      // duplicate identifierQuotes
+    nameParts[i].replace(new RegExp(identifierQuote,"g"), identifierQuote+identifierQuote) +
+      identifierQuote;
     var escaped = nameParts.join(".");
     if (typeof name == "string") return escaped;
     name = shallowClone(name);
@@ -283,21 +283,21 @@
         }
         return w;
       };
-    addMatches(result, search, defaultTable, function(w) {
+      addMatches(result, search, defaultTable, function(w) {
         return objectOrClass(w, "CodeMirror-hint-table CodeMirror-hint-default-table");
-    });
-    addMatches(
+      });
+      addMatches(
         result,
         search,
         tables, function(w) {
           return objectOrClass(w, "CodeMirror-hint-table");
         }
-    );
-    if (!disableKeywords)
-      addMatches(result, search, keywords, function(w) {
+      );
+      if (!disableKeywords)
+        addMatches(result, search, keywords, function(w) {
           return objectOrClass(w.toUpperCase(), "CodeMirror-hint-keyword");
-      });
-  }
+        });
+    }
 
     return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
   });

From fbe612a66ab2a8063b6309c24d5cc613d8b80a50 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 8 Dec 2022 08:27:56 +0100
Subject: [PATCH 4685/4742] [sql-hint addon] Fix getting keywords from plain
 sql mode

---
 addon/hint/sql-hint.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addon/hint/sql-hint.js b/addon/hint/sql-hint.js
index b4a919518e..5c9810537a 100644
--- a/addon/hint/sql-hint.js
+++ b/addon/hint/sql-hint.js
@@ -23,16 +23,16 @@
 
   function isArray(val) { return Object.prototype.toString.call(val) == "[object Array]" }
 
-  function getModeConf(editor) {
-    return editor.getModeAt(editor.getCursor()).config || CodeMirror.resolveMode("text/x-sql")
+  function getModeConf(editor, field) {
+    return editor.getModeAt(editor.getCursor()).config[field] || CodeMirror.resolveMode("text/x-sql")[field]
   }
 
   function getKeywords(editor) {
-    return getModeConf(editor).keywords || []
+    return getModeConf(editor, "keywords") || []
   }
 
   function getIdentifierQuote(editor) {
-    return getModeConf(editor).identifierQuote || "`";
+    return getModeConf(editor, "identifierQuote") || "`";
   }
 
   function getText(item) {

From d122e55c4818ef72e45939c4c06301bc36cb4a53 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Thu, 8 Dec 2022 08:35:20 +0100
Subject: [PATCH 4686/4742] [sql mode] Always enable tokenizing of dot-prefixed
 names

---
 mode/sql/sql.js | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index fedf6cd77c..7b9dec7de1 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -94,9 +94,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
         return "number";
       if (stream.match(/^\.+/))
         return null
-      // .table_name (ODBC)
-      // // ref: https://dev.mysql.com/doc/refman/8.0/en/identifier-qualifiers.html
-      if (support.ODBCdotTable && stream.match(/^[\w\d_$#]+/))
+      if (stream.match(/^[\w\d_$#]+/))
         return "variable-2";
     } else if (operatorChars.test(ch)) {
       // operators
@@ -295,7 +293,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     builtin: set(defaultBuiltin),
     atoms: set("false true null unknown"),
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
+    support: set("doubleQuote binaryNumber hexNumber")
   });
 
   CodeMirror.defineMIME("text/x-mssql", {
@@ -322,7 +320,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
+    support: set("decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -338,7 +336,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
+    support: set("decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
     hooks: {
       "@":   hookVar,
       "`":   hookIdentifier,
@@ -409,7 +407,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=]/,
     dateSQL: set("date timestamp"),
-    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
+    support: set("doubleQuote binaryNumber hexNumber")
   });
 
   CodeMirror.defineMIME("text/x-pgsql", {
@@ -424,7 +422,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     operatorChars: /^[*\/+\-%<>!=&|^\/#@?~]/,
     backslashStringEscapes: false,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast escapeConstant")
+    support: set("decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast escapeConstant")
   });
 
   // Google's SQL-like query language, GQL
@@ -446,7 +444,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*+\-%<>!=&|^\/#@?~]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
+    support: set("decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast")
   });
 
   // Spark SQL
@@ -457,7 +455,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null"),
     operatorChars: /^[*\/+\-%<>!=~&|^]/,
     dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable doubleQuote zerolessFloat")
+    support: set("doubleQuote zerolessFloat")
   });
 
   // Esper
@@ -490,7 +488,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     dateSQL: set("date time timestamp zone"),
     // hexNumber is necessary for VARBINARY literals, e.g. X'65683F'
     // but it also enables 0xFF hex numbers, which Trino doesn't support.
-    support: set("ODBCdotTable decimallessFloat zerolessFloat hexNumber")
+    support: set("decimallessFloat zerolessFloat hexNumber")
   });
 });
 
@@ -508,7 +506,6 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     Commands parsed and executed by the client (not the server).
   support:
     A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
-    * ODBCdotTable: .tableName
     * zerolessFloat: .1
     * decimallessFloat: 1.
     * hexNumber: X'01AF' X'01af' x'01AF' x'01af' 0x01AF 0x01af

From dd931d8f896de393b959f7519ff401071c09135b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 9 Dec 2022 10:47:14 +0100
Subject: [PATCH 4687/4742] Respect spellcheck/autocorrect/autocapitalize
 options in textarea input style

Issue https://github.com/codemirror/codemirror5/issues/7009
---
 src/input/ContentEditableInput.js | 1 +
 src/input/TextareaInput.js        | 4 +++-
 src/input/input.js                | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index ef2e41f51e..f789af74ee 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -94,6 +94,7 @@ export default class ContentEditableInput {
       }
       // Old-fashioned briefly-focus-a-textarea hack
       let kludge = hiddenTextarea(), te = kludge.firstChild
+      disableBrowserMagic(te)
       cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild)
       te.value = lastCopied.text.join("\n")
       let hadFocus = activeElt(div.ownerDocument)
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 3db3f5f0f3..0aac125b11 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -1,6 +1,6 @@
 import { operation, runInOp } from "../display/operations.js"
 import { prepareSelection } from "../display/selection.js"
-import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, setLastCopied } from "./input.js"
+import { applyTextInput, copyableRanges, handlePaste, hiddenTextarea, disableBrowserMagic, setLastCopied } from "./input.js"
 import { cursorCoords, posFromMouse } from "../measurement/position_measurement.js"
 import { eventInWidget } from "../measurement/widgets.js"
 import { simpleSelection } from "../model/selection.js"
@@ -117,6 +117,8 @@ export default class TextareaInput {
     // The semihidden textarea that is focused when the editor is
     // focused, and receives input.
     this.textarea = this.wrapper.firstChild
+    let opts = this.cm.options
+    disableBrowserMagic(this.textarea, opts.spellcheck, opts.autocorrect, opts.autocapitalize)
   }
 
   screenReaderLabelChanged(label) {
diff --git a/src/input/input.js b/src/input/input.js
index e740106298..8b15639cfd 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -130,6 +130,5 @@ export function hiddenTextarea() {
   else te.setAttribute("wrap", "off")
   // If border: 0; -- iOS fails to open keyboard (issue #1287)
   if (ios) te.style.border = "1px solid black"
-  disableBrowserMagic(te)
   return div
 }

From d4d7d3c4e18cc6bfff7136abc4cbd31bad194b6e Mon Sep 17 00:00:00 2001
From: "Joseph D. Purcell" <josephdpurcell@gmail.com>
Date: Wed, 7 Dec 2022 18:20:31 -0500
Subject: [PATCH 4688/4742] Use autocorrect and autocapitalize value of on
 instead of empty string

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

diff --git a/src/input/input.js b/src/input/input.js
index 8b15639cfd..b766d415db 100644
--- a/src/input/input.js
+++ b/src/input/input.js
@@ -114,8 +114,8 @@ export function copyableRanges(cm) {
 }
 
 export function disableBrowserMagic(field, spellcheck, autocorrect, autocapitalize) {
-  field.setAttribute("autocorrect", autocorrect ? "" : "off")
-  field.setAttribute("autocapitalize", autocapitalize ? "" : "off")
+  field.setAttribute("autocorrect", autocorrect ? "on" : "off")
+  field.setAttribute("autocapitalize", autocapitalize ? "on" : "off")
   field.setAttribute("spellcheck", !!spellcheck)
 }
 

From f006b571d20b3b3e932b1d9013d73d0ada2c22bd Mon Sep 17 00:00:00 2001
From: "sahil.mahna" <sahil.mahna@servicenow.com>
Date: Tue, 13 Dec 2022 17:46:27 +0530
Subject: [PATCH 4689/4742] Add keyboard spacebar interactive for merge editor
 buttons

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

diff --git a/addon/merge/merge.js b/addon/merge/merge.js
index d61051cf32..14362fa6e9 100644
--- a/addon/merge/merge.js
+++ b/addon/merge/merge.js
@@ -610,7 +610,7 @@
     lock.setAttribute("tabindex", "0");
     var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
     CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
-    CodeMirror.on(lock, "keyup", function(e) { e.key === "Enter" && setScrollLock(dv, !dv.lockScroll); });
+    CodeMirror.on(lock, "keyup", function(e) { (e.key === "Enter" || e.code === "Space") && setScrollLock(dv, !dv.lockScroll); });
     var gapElts = [lockWrap];
     if (dv.mv.options.revertButtons !== false) {
       dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
@@ -624,7 +624,7 @@
         copyChunk(dv, dv.edit, dv.orig, node.chunk);
       }
       CodeMirror.on(dv.copyButtons, "click", copyButtons);
-      CodeMirror.on(dv.copyButtons, "keyup", function(e) { e.key === "Enter" && copyButtons(e); });
+      CodeMirror.on(dv.copyButtons, "keyup", function(e) { (e.key === "Enter" || e.code === "Space") && copyButtons(e); });
       gapElts.unshift(dv.copyButtons);
     }
     if (dv.mv.options.connect != "align") {

From f124e299238f2b622a96761886d0d930b11d55d9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 20 Dec 2022 11:11:01 +0100
Subject: [PATCH 4690/4742] Mark version 5.65.11

---
 AUTHORS           | 2 ++
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 3d19b21470..72c1eaa757 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -238,6 +238,7 @@ Dimitri Mitropoulos
 Dinindu D. Wanniarachchi
 dmaclach
 Dmitry Kiselyov
+DoctorKrolic
 domagoj412
 Dominator008
 Domizio Demichelis
@@ -460,6 +461,7 @@ Jon Sangster
 Joo
 Joost-Wim Boekesteijn
 José dBruxelles
+Joseph D. Purcell
 Joseph Pecoraro
 Josh Barnes
 Josh Cohen
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41d7f0815d..a4f6c93166 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.65.11 (2022-12-20)
+
+### Bug fixes
+
+Also respect autocapitalize/autocorrect/spellcheck options in textarea mode.
+
+[sql-hint addon](https://codemirror.net/5/doc/manual.html#addon_sql-hint): Fix keyword completion in generic SQL mode.
+
 ## 5.65.10 (2022-11-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 19b21d8c1c..6598c9f52d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.10</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.11</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 a20dfa0312..20948676a4 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,13 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-12-2022: <a href="https://codemirror.net/5/codemirror-5.65.11.zip">Version 5.65.11</a>:</p>
+
+  <ul class="rel-note">
+    <li>Also respect autocapitalize/autocorrect/spellcheck options in textarea mode.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_sql-hint">sql-hint addon</a>: Fix keyword completion in generic SQL mode.</li>
+  </ul>
+
   <p class="rel">20-11-2022: <a href="https://codemirror.net/5/codemirror-5.65.10.zip">Version 5.65.10</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 75c53a2de0..022d6d39c3 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.10</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.11</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index b6cde62684..c845e8fbca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.10",
+  "version": "5.65.11",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 6d436dfbeb..7cbb5330b4 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.10"
+CodeMirror.version = "5.65.11"

From d4a6699187bb34ebf82321c227c0118f4c28f564 Mon Sep 17 00:00:00 2001
From: yoyoyodog123 <104166150+CommanderQuack@users.noreply.github.com>
Date: Fri, 23 Dec 2022 03:07:17 -0600
Subject: [PATCH 4691/4742] [python mode] Add match/case to py3 keywords

---
 mode/python/python.js |  6 +++---
 mode/python/test.js   | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index d75b021e2c..cbf12ad4b1 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -20,7 +20,7 @@
                         "def", "del", "elif", "else", "except", "finally",
                         "for", "from", "global", "if", "import",
                         "lambda", "pass", "raise", "return",
-                        "try", "while", "with", "yield", "in"];
+                        "try", "while", "with", "yield", "in", "False", "True"];
   var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
                         "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
                         "enumerate", "eval", "filter", "float", "format", "frozenset",
@@ -60,7 +60,7 @@
     if (py3) {
       // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
       var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
-      myKeywords = myKeywords.concat(["nonlocal", "False", "True", "None", "async", "await"]);
+      myKeywords = myKeywords.concat(["nonlocal", "None", "async", "await", "match", "case"]);
       myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
       var stringPrefixes = new RegExp("^(([rbuf]|(br)|(rb)|(fr)|(rf))?('{3}|\"{3}|['\"]))", "i");
     } else {
@@ -68,7 +68,7 @@
       myKeywords = myKeywords.concat(["exec", "print"]);
       myBuiltins = myBuiltins.concat(["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
                                       "file", "intern", "long", "raw_input", "reduce", "reload",
-                                      "unichr", "unicode", "xrange", "False", "True", "None"]);
+                                      "unichr", "unicode", "xrange", "None"]);
       var stringPrefixes = new RegExp("^(([rubf]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
     }
     var keywords = wordRegexp(myKeywords);
diff --git a/mode/python/test.js b/mode/python/test.js
index ca5da153dd..9fe1439f3f 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -71,4 +71,19 @@
      "        [keyword pass]",
      "    [keyword else]:",
      "        [variable baz]()")
+  
+  MT("dedentCase",
+     "[keyword match] [variable x]:",
+     "    [keyword case] [variable y]:",
+     "        [variable foo]()")
+  MT("dedentCasePass",
+     "[keyword match] [variable x]:",
+     "    [keyword case] [variable y]:",
+     "        [keyword pass]")
+
+  MT("dedentCaseInFunction",
+     "[keyword def] [def foo]():",
+     "    [keyword match] [variable x]:",
+     "        [keyword case] [variable y]:",
+     "            [variable foo]()")
 })();

From 9e864a1bb7c4c452f462d7f8d8be111c8bb8ad6f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Fri, 23 Dec 2022 10:17:29 +0100
Subject: [PATCH 4692/4742] Remove trailing whitespace

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

diff --git a/mode/python/test.js b/mode/python/test.js
index 9fe1439f3f..ade5498166 100644
--- a/mode/python/test.js
+++ b/mode/python/test.js
@@ -71,7 +71,7 @@
      "        [keyword pass]",
      "    [keyword else]:",
      "        [variable baz]()")
-  
+
   MT("dedentCase",
      "[keyword match] [variable x]:",
      "    [keyword case] [variable y]:",

From 34b84359c4ce289086c82c203f66ef74614d8a0d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.nl>
Date: Tue, 24 Jan 2023 08:25:56 +0100
Subject: [PATCH 4693/4742] Update maintainer email

---
 LICENSE      | 2 +-
 index.html   | 2 +-
 package.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index ff7db4b99f..9018d33e8f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2017 by Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (C) 2017 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/index.html b/index.html
index 022d6d39c3..bd697e9c72 100644
--- a/index.html
+++ b/index.html
@@ -152,7 +152,7 @@ <h2>Community</h2>
   posted in the
   forum's <a href="https://discuss.codemirror.net/c/announce">"announce"</a>
   category. If needed, you can
-  contact <a href="mailto:marijnh@gmail.com">the maintainer</a>
+  contact <a href="mailto:marijn@haverbeke.berlin">the maintainer</a>
   directly. We aim to be an inclusive, welcoming community. To make
   that explicit, we have
   a <a href="http://contributor-covenant.org/version/1/1/0/">code of
diff --git a/package.json b/package.json
index c845e8fbca..b2082c799d 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "style": "lib/codemirror.css",
   "author": {
     "name": "Marijn Haverbeke",
-    "email": "marijnh@gmail.com",
+    "email": "marijn@haverbeke.berlin",
     "url": "http://marijnhaverbeke.nl"
   },
   "description": "Full-featured in-browser code editor",

From 58f592582f114919e980a8035a46327471c01527 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Thu, 2 Feb 2023 09:57:06 +0100
Subject: [PATCH 4694/4742] [bespin theme] Increase selection contrast

Closes https://github.com/codemirror/codemirror5/issues/7018
---
 theme/bespin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/bespin.css b/theme/bespin.css
index 60913ba938..3fd3d93a5a 100644
--- a/theme/bespin.css
+++ b/theme/bespin.css
@@ -9,7 +9,7 @@
 */
 
 .cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
-.cm-s-bespin div.CodeMirror-selected {background: #36312e !important;}
+.cm-s-bespin div.CodeMirror-selected {background: #59554f !important;}
 .cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
 .cm-s-bespin .CodeMirror-linenumber {color: #666666;}
 .cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}

From 659df46b1f53cd94952058e23687f9e58e1b997e Mon Sep 17 00:00:00 2001
From: yoyoyodog123 <104166150+Captain-Quack@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:44:36 -0600
Subject: [PATCH 4695/4742] [python mode] Add new built-in functions

- Aiter (added in 3.10)
- Anext (added in 3.10)
- Breakpoint (added in 3.7)
---
 mode/python/python.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/python/python.js b/mode/python/python.js
index cbf12ad4b1..3946ceeeb0 100644
--- a/mode/python/python.js
+++ b/mode/python/python.js
@@ -60,7 +60,7 @@
     if (py3) {
       // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
       var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
-      myKeywords = myKeywords.concat(["nonlocal", "None", "async", "await", "match", "case"]);
+      myKeywords = myKeywords.concat(["nonlocal", "None", "aiter", "anext", "async", "await", "breakpoint", "match", "case"]);
       myBuiltins = myBuiltins.concat(["ascii", "bytes", "exec", "print"]);
       var stringPrefixes = new RegExp("^(([rbuf]|(br)|(rb)|(fr)|(rf))?('{3}|\"{3}|['\"]))", "i");
     } else {

From 6fc81b126fabd791a31d9c9d146f2aff32953d5b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Mon, 20 Feb 2023 11:55:39 +0100
Subject: [PATCH 4696/4742] Mark version 5.65.12

---
 AUTHORS           | 2 ++
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 72c1eaa757..13e0c7f48a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -799,6 +799,7 @@ ryu-sato
 sabaca
 sach.gupta
 Sachin Gupta
+sahil.mahna
 Sam Lee
 Sam Rawlins
 Samuel Ainsworth
@@ -964,6 +965,7 @@ Yash-Singh1
 Yassin N. Hassan
 YNH Webdev
 yoongu
+yoyoyodog123
 Yunchi Luo
 Yuvi Panda
 Yvonnick Esnault
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4f6c93166..ab3ca34ee5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.65.12 (2023-02-20)
+
+### Bug fixes
+
+[python mode](https://codemirror.net/5/mode/python/): Add new built-ins and keywords.
+
 ## 5.65.11 (2022-12-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 6598c9f52d..20ff731d01 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.11</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.12</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 20948676a4..3e86d6e9eb 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,12 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-12-2022: <a href="https://codemirror.net/5/codemirror-5.65.12.zip">Version 5.65.12</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/mode/python/">python mode</a>: Add new built-ins and keywords.</li>
+  </ul>
+
   <p class="rel">20-12-2022: <a href="https://codemirror.net/5/codemirror-5.65.11.zip">Version 5.65.11</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index bd697e9c72..ea7dc4ffb8 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.11</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.12</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index b2082c799d..6bdd100884 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.11",
+  "version": "5.65.12",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 7cbb5330b4..2becd5c766 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.11"
+CodeMirror.version = "5.65.12"

From 658bff7c56b7829aeabb8a914be5ca728d8aba0b Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Fri, 24 Feb 2023 08:40:47 +0100
Subject: [PATCH 4697/4742] [sql mode] Make sure 'with' is highlighted as a
 keyword for PostgreSQL

Closes https://github.com/codemirror/codemirror5/issues/7022
---
 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 7b9dec7de1..d3983889f7 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -417,7 +417,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     // For pl/pgsql lang - https://github.com/postgres/postgres/blob/REL_11_2/src/pl/plpgsql/src/pl_scanner.c
     keywords: set(sqlKeywords + "a abort abs absent absolute access according action ada add admin after aggregate alias all allocate also alter always analyse analyze and any are array array_agg array_max_cardinality as asc asensitive assert assertion assignment asymmetric at atomic attach attribute attributes authorization avg backward base64 before begin begin_frame begin_partition bernoulli between bigint binary bit bit_length blob blocked bom boolean both breadth by c cache call called cardinality cascade cascaded case cast catalog catalog_name ceil ceiling chain char char_length character character_length character_set_catalog character_set_name character_set_schema characteristics characters check checkpoint class class_origin clob close cluster coalesce cobol collate collation collation_catalog collation_name collation_schema collect column column_name columns command_function command_function_code comment comments commit committed concurrently condition condition_number configuration conflict connect connection connection_name constant constraint constraint_catalog constraint_name constraint_schema constraints constructor contains content continue control conversion convert copy corr corresponding cost count covar_pop covar_samp create cross csv cube cume_dist current current_catalog current_date current_default_transform_group current_path current_role current_row current_schema current_time current_timestamp current_transform_group_for_type current_user cursor cursor_name cycle data database datalink datatype date datetime_interval_code datetime_interval_precision day db deallocate debug dec decimal declare default defaults deferrable deferred defined definer degree delete delimiter delimiters dense_rank depends depth deref derived desc describe descriptor detach detail deterministic diagnostics dictionary disable discard disconnect dispatch distinct dlnewcopy dlpreviouscopy dlurlcomplete dlurlcompleteonly dlurlcompletewrite dlurlpath dlurlpathonly dlurlpathwrite dlurlscheme dlurlserver dlvalue do document domain double drop dump dynamic dynamic_function dynamic_function_code each element else elseif elsif empty enable encoding encrypted end end_frame end_partition endexec enforced enum equals errcode error escape event every except exception exclude excluding exclusive exec execute exists exit exp explain expression extension external extract false family fetch file filter final first first_value flag float floor following for force foreach foreign fortran forward found frame_row free freeze from fs full function functions fusion g general generated get global go goto grant granted greatest group grouping groups handler having header hex hierarchy hint hold hour id identity if ignore ilike immediate immediately immutable implementation implicit import in include including increment indent index indexes indicator info inherit inherits initially inline inner inout input insensitive insert instance instantiable instead int integer integrity intersect intersection interval into invoker is isnull isolation join k key key_member key_type label lag language large last last_value lateral lead leading leakproof least left length level library like like_regex limit link listen ln load local localtime localtimestamp location locator lock locked log logged loop lower m map mapping match matched materialized max max_cardinality maxvalue member merge message message_length message_octet_length message_text method min minute minvalue mod mode modifies module month more move multiset mumps name names namespace national natural nchar nclob nesting new next nfc nfd nfkc nfkd nil no none normalize normalized not nothing notice notify notnull nowait nth_value ntile null nullable nullif nulls number numeric object occurrences_regex octet_length octets of off offset oids old on only open operator option options or order ordering ordinality others out outer output over overlaps overlay overriding owned owner p pad parallel parameter parameter_mode parameter_name parameter_ordinal_position parameter_specific_catalog parameter_specific_name parameter_specific_schema parser partial partition pascal passing passthrough password path percent percent_rank percentile_cont percentile_disc perform period permission pg_context pg_datatype_name pg_exception_context pg_exception_detail pg_exception_hint placing plans pli policy portion position position_regex power precedes preceding precision prepare prepared preserve primary print_strict_params prior privileges procedural procedure procedures program public publication query quote raise range rank read reads real reassign recheck recovery recursive ref references referencing refresh regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy reindex relative release rename repeatable replace replica requiring reset respect restart restore restrict result result_oid return returned_cardinality returned_length returned_octet_length returned_sqlstate returning returns reverse revoke right role rollback rollup routine routine_catalog routine_name routine_schema routines row row_count row_number rows rowtype rule savepoint scale schema schema_name schemas scope scope_catalog scope_name scope_schema scroll search second section security select selective self sensitive sequence sequences serializable server server_name session session_user set setof sets share show similar simple size skip slice smallint snapshot some source space specific specific_name specifictype sql sqlcode sqlerror sqlexception sqlstate sqlwarning sqrt stable stacked standalone start state statement static statistics stddev_pop stddev_samp stdin stdout storage strict strip structure style subclass_origin submultiset subscription substring substring_regex succeeds sum symmetric sysid system system_time system_user t table table_name tables tablesample tablespace temp template temporary text then ties time timestamp timezone_hour timezone_minute to token top_level_count trailing transaction transaction_active transactions_committed transactions_rolled_back transform transforms translate translate_regex translation treat trigger trigger_catalog trigger_name trigger_schema trim trim_array true truncate trusted type types uescape unbounded uncommitted under unencrypted union unique unknown unlink unlisten unlogged unnamed unnest until untyped update upper uri usage use_column use_variable user user_defined_type_catalog user_defined_type_code user_defined_type_name user_defined_type_schema using vacuum valid validate validator value value_of values var_pop var_samp varbinary varchar variable_conflict variadic varying verbose version versioning view views volatile warning when whenever where while whitespace width_bucket window with within without work wrapper write xml xmlagg xmlattributes xmlbinary xmlcast xmlcomment xmlconcat xmldeclaration xmldocument xmlelement xmlexists xmlforest xmliterate xmlnamespaces xmlparse xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltext xmlvalidate year yes zone"),
     // https://www.postgresql.org/docs/11/datatype.html
-    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time without zone with timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
+    builtin: set("bigint int8 bigserial serial8 bit varying varbit boolean bool box bytea character char varchar cidr circle date double precision float8 inet integer int int4 interval json jsonb line lseg macaddr macaddr8 money numeric decimal path pg_lsn point polygon real float4 smallint int2 smallserial serial2 serial serial4 text time zone timetz timestamp timestamptz tsquery tsvector txid_snapshot uuid xml"),
     atoms: set("false true null unknown"),
     operatorChars: /^[*\/+\-%<>!=&|^\/#@?~]/,
     backslashStringEscapes: false,

From 6a705898e74e223b74e02fe59f60af83074205a0 Mon Sep 17 00:00:00 2001
From: Brett Morgan <brett.morgan@gmail.com>
Date: Fri, 3 Mar 2023 10:10:22 +1100
Subject: [PATCH 4698/4742] [dart mode] Add keywords

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

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 340076712c..54aedf3297 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -15,7 +15,7 @@
     "implements mixin get native set typedef with enum throw rethrow " +
     "assert break case continue default in return new deferred async await covariant " +
     "try catch finally do else for if switch while import library export " +
-    "part of show hide is as extension on yield late required").split(" ");
+    "part of show hide is as extension on yield late required sealed base interface when").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
   var atoms = "true false null".split(" ");
   var builtins = "void bool num int double dynamic var String Null Never".split(" ");

From c17c5f0abe0147151d834e8eec9c400ec327120a Mon Sep 17 00:00:00 2001
From: Brett Morgan <brett.morgan@gmail.com>
Date: Wed, 8 Mar 2023 21:26:18 +1100
Subject: [PATCH 4699/4742] [dart mode] Add `inline` keyword for inline classes

Context: https://github.com/dart-lang/language/blob/master/accepted/future-releases/inline-classes/feature-specification.md

Related: https://github.com/dart-lang/sdk/issues/49734
---
 mode/dart/dart.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index 54aedf3297..f81e4f91a4 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -12,10 +12,10 @@
   "use strict";
 
   var keywords = ("this super static final const abstract class extends external factory " +
-    "implements mixin get native set typedef with enum throw rethrow " +
-    "assert break case continue default in return new deferred async await covariant " +
-    "try catch finally do else for if switch while import library export " +
-    "part of show hide is as extension on yield late required sealed base interface when").split(" ");
+    "implements mixin get native set typedef with enum throw rethrow assert break case " +
+    "continue default in return new deferred async await covariant try catch finally " +
+    "do else for if switch while import library export part of show hide is as extension " +
+    "on yield late required sealed base interface when inline").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
   var atoms = "true false null".split(" ");
   var builtins = "void bool num int double dynamic var String Null Never".split(" ");

From 9974ded36bf01746eb2a00926916fef834d3d0d0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Thu, 16 Mar 2023 17:45:22 +0100
Subject: [PATCH 4700/4742] [clike mode] Properly match character literals in
 Scala mode

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

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 8075edb8a1..fcfc7c45cc 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -613,6 +613,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         return state.tokenize(stream, state);
       },
       "'": function(stream) {
+        if (stream.match(/^(\\[^'\s]+|[^\\'])'/)) return "string-2"
         stream.eatWhile(/[\w\$_\xa1-\uffff]/);
         return "atom";
       },

From 330a06dd6ece17833f0127093d44ae18a1a5c451 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Thu, 27 Apr 2023 10:23:26 +0200
Subject: [PATCH 4701/4742] Mark version 5.65.13

---
 AUTHORS           | 1 +
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 13e0c7f48a..3dd26e0fbb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -139,6 +139,7 @@ Brad Metcalf
 Brandon Frohs
 Brandon Wamboldt
 Bret Little
+Brett Morgan
 Brett Zamir
 Brian Grinstead
 BrianHung
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab3ca34ee5..3daac7a9ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.65.13 (2023-04-27)
+
+### Bug fixes
+
+[dart mode](https://codemirror.net/5/mode/dart/index.html): Add some new keywords.
+
+[clike mode](https://codemirror.net/5/mode/clike/): Tokenize Scala character literals.
+
 ## 5.65.12 (2023-02-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 20ff731d01..7d3667f90d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.12</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.13</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 3e86d6e9eb..40f7e16031 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,13 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-12-2022: <a href="https://codemirror.net/5/codemirror-5.65.13.zip">Version 5.65.13</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/mode/dart/index.html">dart mode</a>: Add some new keywords.</li>
+    <li><a href="https://codemirror.net/5/mode/clike/">clike mode</a>: Tokenize Scala character literals.</li>
+  </ul>
+
   <p class="rel">20-12-2022: <a href="https://codemirror.net/5/codemirror-5.65.12.zip">Version 5.65.12</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index ea7dc4ffb8..2adb14b3ed 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.12</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.13</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 6bdd100884..3af57c7282 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.12",
+  "version": "5.65.13",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 2becd5c766..d41a4e45c0 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.12"
+CodeMirror.version = "5.65.13"

From 480a35d793745572de439a5aaa44fd4fe74a2bb3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Thu, 27 Apr 2023 10:39:13 +0200
Subject: [PATCH 4702/4742] Fix error output in release upload script

---
 bin/upload-release.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/upload-release.js b/bin/upload-release.js
index 59ed6f5a8f..336a37ecd0 100644
--- a/bin/upload-release.js
+++ b/bin/upload-release.js
@@ -24,7 +24,7 @@ function post(host, path, body) {
     } else if (res.statusCode >= 400) {
       console.error(res.statusCode, res.statusMessage)
       res.on("data", d => console.log(d.toString()))
-      res.on("end", process.exit(1))
+      res.on("end", () => process.exit(1))
     }
   })
   req.write(body)

From 1e58b28781af0d2a9fc426c744dcdc22c6216dd6 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Thu, 29 Jun 2023 17:15:39 +0200
Subject: [PATCH 4703/4742] [lint addon] Remove confused annotation filtering

---
 addon/lint/lint.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 7b40e10e91..052313dc5c 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -199,10 +199,6 @@
       var anns = annotations[line];
       if (!anns) continue;
 
-      // filter out duplicate messages
-      var message = [];
-      anns = anns.filter(function(item) { return message.indexOf(item.message) > -1 ? false : message.push(item.message) });
-
       var maxSeverity = null;
       var tipLabel = state.hasGutter && document.createDocumentFragment();
 
@@ -220,9 +216,8 @@
           __annotation: ann
         }));
       }
-      // use original annotations[line] to show multiple messages
       if (state.hasGutter)
-        cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, annotations[line].length > 1,
+        cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, anns.length > 1,
                                                        options.tooltips));
 
       if (options.highlightLines)

From a0854c752a76e4ba9512a9beedb9076f36e4f8f9 Mon Sep 17 00:00:00 2001
From: "Jan T. Sott" <git@idleberg.com>
Date: Mon, 3 Jul 2023 09:54:01 +0200
Subject: [PATCH 4704/4742] [nsis mode] Add !assert command

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

diff --git a/mode/nsis/nsis.js b/mode/nsis/nsis.js
index 2173916bb2..de18871251 100644
--- a/mode/nsis/nsis.js
+++ b/mode/nsis/nsis.js
@@ -24,7 +24,7 @@ CodeMirror.defineSimpleMode("nsis",{
     { regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
 
     // Compile Time Commands
-    {regex: /^\s*(?:\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|error|execute|finalize|getdllversion|gettlbversion|include|insertmacro|macro|macroend|makensis|packhdr|pragma|searchparse|searchreplace|system|tempfile|undef|uninstfinalize|verbose|warning))\b/i, token: "keyword"},
+    {regex: /^\s*(?:\!(addincludedir|addplugindir|appendfile|assert|cd|define|delfile|echo|error|execute|finalize|getdllversion|gettlbversion|include|insertmacro|macro|macroend|makensis|packhdr|pragma|searchparse|searchreplace|system|tempfile|undef|uninstfinalize|verbose|warning))\b/i, token: "keyword"},
 
     // Conditional Compilation
     {regex: /^\s*(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/i, token: "keyword", indent: true},

From 69e38f574c03bc2d46c806ffc5f652d31d071c21 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Sat, 15 Jul 2023 08:59:15 +0200
Subject: [PATCH 4705/4742] [java mode] Fix indentation after class extends
 clause

Closes https://github.com/codemirror/codemirror5/issues/7049
---
 mode/clike/clike.js | 3 ++-
 mode/clike/test.js  | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index fcfc7c45cc..e9f441fc0a 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -218,7 +218,8 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     },
 
     indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null || state.typeAtEndOfLine) return CodeMirror.Pass;
+      if (state.tokenize != tokenBase && state.tokenize != null || state.typeAtEndOfLine && isTopScope(state.context))
+        return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       var closing = firstChar == ctx.type;
       if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
diff --git a/mode/clike/test.js b/mode/clike/test.js
index 80d8ea4548..2933a00277 100644
--- a/mode/clike/test.js
+++ b/mode/clike/test.js
@@ -162,4 +162,9 @@
          "[type StringBuffer];",
          "[type StringBuilder];",
          "[type Void];");
+
+  MTJAVA("indent",
+         "[keyword public] [keyword class] [def A] [keyword extends] [variable B]",
+         "{",
+         "  [variable c]()")
 })();

From 82ce3d2f64b18e86306a9d9da85beeba4e17834e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Mon, 17 Jul 2023 09:35:44 +0200
Subject: [PATCH 4706/4742] Mark version 5.65.14

---
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html | 12 ++++++++++--
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3daac7a9ac..4ef2a2cc79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.65.14 (2023-07-17)
+
+### Bug fixes
+
+[clike mode](https://codemirror.net/5/mode/clike/): Fix poor indentation in some Java code.
+
+[nsis mode](https://codemirror.net/5/mode/nsis/index.html): Recognize `!assert` command.
+
+[lint addon](https://codemirror.net/5/doc/manual.html#addon_lint): Remove broken annotation deduplication.
+
 ## 5.65.13 (2023-04-27)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 7d3667f90d..873bd4a6a9 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.13</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.14</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 40f7e16031..e8b6ccae7c 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,14 +34,22 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
-  <p class="rel">20-12-2022: <a href="https://codemirror.net/5/codemirror-5.65.13.zip">Version 5.65.13</a>:</p>
+  <p class="rel">17-07-2023: <a href="https://codemirror.net/5/codemirror-5.65.14.zip">Version 5.65.14</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/mode/clike/">clike mode</a>: Fix poor indentation in some Java code.</li>
+    <li><a href="https://codemirror.net/5/mode/nsis/index.html">nsis mode</a>: Recognize <code>!assert</code> command.</li>
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_lint">lint addon</a>: Remove broken annotation deduplication.</li>
+  </ul>
+
+  <p class="rel">27-04-2023: <a href="https://codemirror.net/5/codemirror-5.65.13.zip">Version 5.65.13</a>:</p>
 
   <ul class="rel-note">
     <li><a href="https://codemirror.net/5/mode/dart/index.html">dart mode</a>: Add some new keywords.</li>
     <li><a href="https://codemirror.net/5/mode/clike/">clike mode</a>: Tokenize Scala character literals.</li>
   </ul>
 
-  <p class="rel">20-12-2022: <a href="https://codemirror.net/5/codemirror-5.65.12.zip">Version 5.65.12</a>:</p>
+  <p class="rel">20-02-2023: <a href="https://codemirror.net/5/codemirror-5.65.12.zip">Version 5.65.12</a>:</p>
 
   <ul class="rel-note">
     <li><a href="https://codemirror.net/5/mode/python/">python mode</a>: Add new built-ins and keywords.</li>
diff --git a/index.html b/index.html
index 2adb14b3ed..728b0bfb62 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.13</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.14</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 3af57c7282..a9c6f80eb6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.13",
+  "version": "5.65.14",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index d41a4e45c0..834e27eb45 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.13"
+CodeMirror.version = "5.65.14"

From 370f7c4a7222211987a826b0e9f43d8980229c64 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Fri, 21 Jul 2023 21:23:28 +0200
Subject: [PATCH 4707/4742] [lint addon] Make sure tooltips don't stick out of
 the window width

Issue https://github.com/codemirror/codemirror5/pull/7044
---
 addon/lint/lint.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addon/lint/lint.js b/addon/lint/lint.js
index 052313dc5c..21631b9d24 100644
--- a/addon/lint/lint.js
+++ b/addon/lint/lint.js
@@ -24,8 +24,10 @@
 
     function position(e) {
       if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
-      tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + "px";
-      tt.style.left = (e.clientX + 5) + "px";
+      var top = Math.max(0, e.clientY - tt.offsetHeight - 5);
+      var left = Math.max(0, Math.min(e.clientX + 5, tt.ownerDocument.defaultView.innerWidth - tt.offsetWidth));
+      tt.style.top = top + "px"
+      tt.style.left = left + "px";
     }
     CodeMirror.on(document, "mousemove", position);
     position(e);

From 817ea7be474c3452a78864c05aa7f38ec8f2ff85 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Mon, 31 Jul 2023 21:21:56 +0200
Subject: [PATCH 4708/4742] Fix install example in readme

Closes https://github.com/codemirror/codemirror5/issues/7051
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 578a5a9730..e021f2bf7a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # CodeMirror
 
 [![Build Status](https://github.com/codemirror/codemirror5/workflows/main/badge.svg)](https://github.com/codemirror/codemirror5/actions)
-[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a versatile text editor implemented in JavaScript for
 the browser. It is specialized for editing code, and comes with over
@@ -33,7 +32,7 @@ Either get the [zip file](https://codemirror.net/5/codemirror.zip) with
 the latest version, or make sure you have [Node](https://nodejs.org/)
 installed and run:
 
-    npm install codemirror
+    npm install codemirror@5
 
 **NOTE**: This is the source repository for the library, and not the
 distribution channel. Cloning it is not the recommended way to install

From 4ea5f465587e1624b668ae98738ffafc1bef71de Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Wed, 9 Aug 2023 22:54:39 +0200
Subject: [PATCH 4709/4742] [yaml mode] Fix exponential regexp

Closes https://github.com/codemirror/codemirror5/issues/7053
---
 mode/yaml/yaml.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/yaml/yaml.js b/mode/yaml/yaml.js
index 298db55f6f..895d1330a2 100644
--- a/mode/yaml/yaml.js
+++ b/mode/yaml/yaml.js
@@ -85,7 +85,7 @@ CodeMirror.defineMode("yaml", function() {
       }
 
       /* pairs (associative arrays) -> key */
-      if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)) {
+      if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^\s,\[\]{}#&*!|>'"%@`])[^#:]*(?=:($|\s))/)) {
         state.pair = true;
         state.keyCol = stream.indentation();
         return "atom";

From 854ee51ef20434eae043d64f92e6f8548d569030 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Tue, 29 Aug 2023 08:59:28 +0200
Subject: [PATCH 4710/4742] Mark version 5.65.15

---
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ef2a2cc79..31c9043708 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.65.15 (2023-08-29)
+
+### Bug fixes
+
+[lint addon](https://codemirror.net/5/doc/manual.html#addon_lint): Prevent tooltips from sticking out of the viewport.
+
+[yaml mode](https://codemirror.net/5/mode/yaml/): Fix an exponential-complexity regular expression.
+
 ## 5.65.14 (2023-07-17)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 873bd4a6a9..7496ff277a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.14</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.15</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 e8b6ccae7c..5d94bad1fb 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,13 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">29-08-2023: <a href="https://codemirror.net/5/codemirror-5.65.15.zip">Version 5.65.15</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_lint">lint addon</a>: Prevent tooltips from sticking out of the viewport.</li>
+    <li><a href="https://codemirror.net/5/mode/yaml/">yaml mode</a>: Fix an exponential-complexity regular expression.</li>
+  </ul>
+
   <p class="rel">17-07-2023: <a href="https://codemirror.net/5/codemirror-5.65.14.zip">Version 5.65.14</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 728b0bfb62..319adcbaa9 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.14</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.15</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index a9c6f80eb6..eb0c44cf09 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.14",
+  "version": "5.65.15",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 834e27eb45..f69663b6fe 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.14"
+CodeMirror.version = "5.65.15"

From 638abda97cf458d9243804b75de53714209e8632 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Fri, 1 Sep 2023 08:56:11 +0200
Subject: [PATCH 4711/4742] [go mode] Allow underscore separators in numbers

Closes https://github.com/codemirror/codemirror5/issues/7059
---
 mode/go/go.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/go/go.js b/mode/go/go.js
index 8dbdc65d1c..bd54f1ab03 100644
--- a/mode/go/go.js
+++ b/mode/go/go.js
@@ -46,11 +46,11 @@ CodeMirror.defineMode("go", function(config) {
     }
     if (/[\d\.]/.test(ch)) {
       if (ch == ".") {
-        stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
+        stream.match(/^[0-9_]+([eE][\-+]?[0-9_]+)?/);
       } else if (ch == "0") {
-        stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
+        stream.match(/^[xX][0-9a-fA-F_]+/) || stream.match(/^[0-7_]+/);
       } else {
-        stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
+        stream.match(/^[0-9_]*\.?[0-9_]*([eE][\-+]?[0-9_]+)?/);
       }
       return "number";
     }

From ee6a1d201f748fa6b777513e4998eb652df896ed Mon Sep 17 00:00:00 2001
From: Parker Lougheed <parlough@gmail.com>
Date: Sun, 10 Sep 2023 10:35:37 -0500
Subject: [PATCH 4712/4742] [dart mode] Remove support for inline keyword

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

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index f81e4f91a4..ba9ff3dd2c 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -15,7 +15,7 @@
     "implements mixin get native set typedef with enum throw rethrow assert break case " +
     "continue default in return new deferred async await covariant try catch finally " +
     "do else for if switch while import library export part of show hide is as extension " +
-    "on yield late required sealed base interface when inline").split(" ");
+    "on yield late required sealed base interface when").split(" ");
   var blockKeywords = "try catch finally do else for if switch while".split(" ");
   var atoms = "true false null".split(" ");
   var builtins = "void bool num int double dynamic var String Null Never".split(" ");

From 53faa33ac69598b7495e160824b58ebb8d70fe97 Mon Sep 17 00:00:00 2001
From: Parker Lougheed <parlough@gmail.com>
Date: Sun, 10 Sep 2023 10:36:12 -0500
Subject: [PATCH 4713/4742] [dart mdoe] Fix code example to compile and run
 with modern Dart versions

---
 mode/dart/index.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/mode/dart/index.html b/mode/dart/index.html
index 88b8936dec..ee6128c1f7 100644
--- a/mode/dart/index.html
+++ b/mode/dart/index.html
@@ -29,33 +29,33 @@ <h2>Dart mode</h2>
 import 'dart:math' show Random;
 
 void main() {
-  print(new Die(n: 12).roll());
+  print(Die(n: 12).roll());
 }
 
 // Define a class.
 class Die {
   // Define a class variable.
-  static Random shaker = new Random();
+  static final Random shaker = Random();
 
   // Define instance variables.
-  int sides, value;
-
-  // Define a method using shorthand syntax.
-  String toString() => '$value';
+  final int sides;
+  int? lastRoll;
 
   // Define a constructor.
-  Die({int n: 6}) {
-    if (4 <= n && n <= 20) {
-      sides = n;
-    } else {
+  Die({int n = 6}) : sides = n {
+    if (4 > n || n > 20) {
       // Support for errors and exceptions.
-      throw new ArgumentError(/* */);
+      throw ArgumentError(/* */);
     }
   }
 
+  // Define a method using shorthand syntax.
+  @override
+  String toString() => '$lastRoll';
+
   // Define an instance method.
   int roll() {
-    return value = shaker.nextInt(sides) + 1;
+    return lastRoll = shaker.nextInt(sides) + 1;
   }
 }
 </textarea>

From 3bb9e7a38a9b95c66538676100fcced9cfe264ef Mon Sep 17 00:00:00 2001
From: Gabriela Gutierrez <gabigutierrez@google.com>
Date: Thu, 21 Sep 2023 11:27:55 -0300
Subject: [PATCH 4714/4742] Ref actions by commit SHA in ci.yml

It's important to make sure the SHA's are from the original repositories and not forks.

For reference:

https://github.com/actions/checkout/releases/tag/v4.0.0
https://github.com/actions/checkout/commit/3df4ab11eba7bda6032a0b82a6bb43b11571feac

https://github.com/actions/cache/releases/tag/v3.3.2
https://github.com/actions/cache/commit/704facf57e6136b1bc63b828d79edcd491f0ee84

Signed-off-by: Gabriela Gutierrez <gabigutierrez@google.com>
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 82d6354155..d0a07b4e07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,9 +5,9 @@ jobs:
     runs-on: ubuntu-latest
     name: Build and test
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.0
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
         with:
           path: '/home/runner/work/codemirror/codemirror5/node_modules'
           key: ${{ runner.os }}-modules

From 2329ebb19b9846d1306c2379a5c85858df85e71f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Wed, 18 Oct 2023 17:54:08 +0200
Subject: [PATCH 4715/4742] Link to CM6 in readme

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e021f2bf7a..6f42e99c50 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-# CodeMirror
+# CodeMirror 5
+
+**NOTE:** [CodeMirror 6](https://codemirror.net/) exists, and is more mobile-friendly, more accessible, better designed, and much more actively maintained.
 
 [![Build Status](https://github.com/codemirror/codemirror5/workflows/main/badge.svg)](https://github.com/codemirror/codemirror5/actions)
 

From bcb86262e8a2a606bfa13ed47f8c6171b4d37ac9 Mon Sep 17 00:00:00 2001
From: Luke Haas <lukehaas7@gmail.com>
Date: Wed, 25 Oct 2023 17:13:13 +0100
Subject: [PATCH 4716/4742] [jsx mode] Support trailing-comma generics syntax
 in JSX with TS

Issue https://github.com/codemirror/codemirror5/pull/7073
---
 mode/jsx/jsx.js  | 2 +-
 mode/jsx/test.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 1406ef195d..83141c0567 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -103,7 +103,7 @@
     }
 
     function jsToken(stream, state, cx) {
-      if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
+      if (stream.peek() == "<" && !/,\s*>/.test(stream.string) && jsMode.expressionAllowed(stream, cx.state)) {
         state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "", "")),
                                     xmlMode, 0, state.context)
         jsMode.skipExpression(cx.state)
diff --git a/mode/jsx/test.js b/mode/jsx/test.js
index 08a0d47c3e..606557363a 100644
--- a/mode/jsx/test.js
+++ b/mode/jsx/test.js
@@ -95,4 +95,6 @@
      "[bracket&tag <][tag MyComponent] [attribute foo]=[string \"bar\"] [bracket&tag />]; [comment //ok]",
      "[bracket&tag <][tag MyComponent] [attribute foo]={[number 0]} [bracket&tag />]; [comment //error]")
 
+   TS("tsx_react_generics",
+      "[variable x] [operator =] [operator <] [variable T],[operator >] ([def v]: [type T]) [operator =>] [variable-2 v];")
 })()

From adc4282471ee15e2c91b7da7d5398cd1b8eee978 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Fri, 27 Oct 2023 10:34:12 +0200
Subject: [PATCH 4717/4742] [jsx mode] Narrow test for trailing-comma generic

Issue https://github.com/codemirror/codemirror5/pull/7073
---
 mode/jsx/jsx.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mode/jsx/jsx.js b/mode/jsx/jsx.js
index 83141c0567..35ac608e16 100644
--- a/mode/jsx/jsx.js
+++ b/mode/jsx/jsx.js
@@ -103,7 +103,8 @@
     }
 
     function jsToken(stream, state, cx) {
-      if (stream.peek() == "<" && !/,\s*>/.test(stream.string) && jsMode.expressionAllowed(stream, cx.state)) {
+      if (stream.peek() == "<" && !stream.match(/^<([^<>]|<[^>]*>)+,\s*>/, false) &&
+          jsMode.expressionAllowed(stream, cx.state)) {
         state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "", "")),
                                     xmlMode, 0, state.context)
         jsMode.skipExpression(cx.state)

From 676fc52bf13e8788636af2cd4519e6b50c1f5adc Mon Sep 17 00:00:00 2001
From: Pavel Feldman <pavel.feldman@gmail.com>
Date: Fri, 10 Nov 2023 23:42:44 -0800
Subject: [PATCH 4718/4742] Make active element tracking work inside closed
 shadow roots

---
 src/display/operations.js         |  4 ++--
 src/display/update_display.js     |  6 +++---
 src/edit/fromTextArea.js          |  4 ++--
 src/edit/key_events.js            |  4 ++--
 src/edit/methods.js               |  4 ++--
 src/edit/mouse_events.js          |  6 +++---
 src/input/ContentEditableInput.js |  8 ++++----
 src/input/TextareaInput.js        |  4 ++--
 src/util/dom.js                   | 14 ++++++++++++--
 9 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/display/operations.js b/src/display/operations.js
index b004575bb9..a7e8039e89 100644
--- a/src/display/operations.js
+++ b/src/display/operations.js
@@ -2,7 +2,7 @@ import { clipPos } from "../line/pos.js"
 import { findMaxLine } from "../line/spans.js"
 import { displayWidth, measureChar, scrollGap } from "../measurement/position_measurement.js"
 import { signal } from "../util/event.js"
-import { activeElt, doc } from "../util/dom.js"
+import { activeElt, root } from "../util/dom.js"
 import { finishOperation, pushOperation } from "../util/operation_group.js"
 
 import { ensureFocus } from "./focus.js"
@@ -116,7 +116,7 @@ function endOperation_W2(op) {
     cm.display.maxLineChanged = false
   }
 
-  let takeFocus = op.focus && op.focus == activeElt(doc(cm))
+  let takeFocus = op.focus && op.focus == activeElt(root(cm))
   if (op.preparedSelection)
     cm.display.input.showSelection(op.preparedSelection, takeFocus)
   if (op.updatedDisplay || op.startHeight != cm.doc.height)
diff --git a/src/display/update_display.js b/src/display/update_display.js
index 63529d5188..665dc8c91a 100644
--- a/src/display/update_display.js
+++ b/src/display/update_display.js
@@ -3,7 +3,7 @@ import { heightAtLine, visualLineEndNo, visualLineNo } from "../line/spans.js"
 import { getLine, lineNumberFor } from "../line/utils_line.js"
 import { displayHeight, displayWidth, getDimensions, paddingVert, scrollGap } from "../measurement/position_measurement.js"
 import { mac, webkit } from "../util/browser.js"
-import { activeElt, removeChildren, contains, win, doc } from "../util/dom.js"
+import { activeElt, removeChildren, contains, win, root, rootNode } from "../util/dom.js"
 import { hasHandler, signal } from "../util/event.js"
 import { signalLater } from "../util/operation_group.js"
 import { indexOf } from "../util/misc.js"
@@ -57,7 +57,7 @@ export function maybeClipScrollbars(cm) {
 
 function selectionSnapshot(cm) {
   if (cm.hasFocus()) return null
-  let active = activeElt(doc(cm))
+  let active = activeElt(root(cm))
   if (!active || !contains(cm.display.lineDiv, active)) return null
   let result = {activeElt: active}
   if (window.getSelection) {
@@ -73,7 +73,7 @@ function selectionSnapshot(cm) {
 }
 
 function restoreSelection(snapshot) {
-  if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt(snapshot.activeElt.ownerDocument)) return
+  if (!snapshot || !snapshot.activeElt || snapshot.activeElt == activeElt(rootNode(snapshot.activeElt))) return
   snapshot.activeElt.focus()
   if (!/^(INPUT|TEXTAREA)$/.test(snapshot.activeElt.nodeName) &&
       snapshot.anchorNode && contains(document.body, snapshot.anchorNode) && contains(document.body, snapshot.focusNode)) {
diff --git a/src/edit/fromTextArea.js b/src/edit/fromTextArea.js
index cdd10d74a0..cbad7f6eb4 100644
--- a/src/edit/fromTextArea.js
+++ b/src/edit/fromTextArea.js
@@ -1,5 +1,5 @@
 import { CodeMirror } from "./CodeMirror.js"
-import { activeElt } from "../util/dom.js"
+import { activeElt, rootNode } from "../util/dom.js"
 import { off, on } from "../util/event.js"
 import { copyObj } from "../util/misc.js"
 
@@ -13,7 +13,7 @@ export function fromTextArea(textarea, options) {
   // Set autofocus to true if this textarea is focused, or if it has
   // autofocus and no other element is focused.
   if (options.autofocus == null) {
-    let hasFocus = activeElt(textarea.ownerDocument)
+    let hasFocus = activeElt(rootNode(textarea))
     options.autofocus = hasFocus == textarea ||
       textarea.getAttribute("autofocus") != null && hasFocus == document.body
   }
diff --git a/src/edit/key_events.js b/src/edit/key_events.js
index 1d3c9f908c..737d11d89b 100644
--- a/src/edit/key_events.js
+++ b/src/edit/key_events.js
@@ -3,7 +3,7 @@ import { restartBlink } from "../display/selection.js"
 import { isModifierKey, keyName, lookupKey } from "../input/keymap.js"
 import { eventInWidget } from "../measurement/widgets.js"
 import { ie, ie_version, mac, presto, gecko } from "../util/browser.js"
-import { activeElt, addClass, rmClass, doc } from "../util/dom.js"
+import { activeElt, addClass, rmClass, root } from "../util/dom.js"
 import { e_preventDefault, off, on, signalDOMEvent } from "../util/event.js"
 import { hasCopyEvent } from "../util/feature_detection.js"
 import { Delayed, Pass } from "../util/misc.js"
@@ -107,7 +107,7 @@ let lastStoppedKey = null
 export function onKeyDown(e) {
   let cm = this
   if (e.target && e.target != cm.display.input.getField()) return
-  cm.curOp.focus = activeElt(doc(cm))
+  cm.curOp.focus = activeElt(root(cm))
   if (signalDOMEvent(cm, e)) return
   // IE does strange things with escape.
   if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false
diff --git a/src/edit/methods.js b/src/edit/methods.js
index b1cbcc9e2e..9fb8787522 100644
--- a/src/edit/methods.js
+++ b/src/edit/methods.js
@@ -1,7 +1,7 @@
 import { deleteNearSelection } from "./deleteNearSelection.js"
 import { commands } from "./commands.js"
 import { attachDoc } from "../model/document_data.js"
-import { activeElt, addClass, rmClass, doc, win } from "../util/dom.js"
+import { activeElt, addClass, rmClass, root, win } from "../util/dom.js"
 import { eventMixin, signal } from "../util/event.js"
 import { getLineStyles, getContextBefore, takeToken } from "../line/highlight.js"
 import { indentLine } from "../input/indent.js"
@@ -358,7 +358,7 @@ export default function(CodeMirror) {
 
       signal(this, "overwriteToggle", this, this.state.overwrite)
     },
-    hasFocus: function() { return this.display.input.getField() == activeElt(doc(this)) },
+    hasFocus: function() { return this.display.input.getField() == activeElt(root(this)) },
     isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit) },
 
     scrollTo: methodOp(function (x, y) { scrollToCoords(this, x, y) }),
diff --git a/src/edit/mouse_events.js b/src/edit/mouse_events.js
index e854d64791..421e70b2a7 100644
--- a/src/edit/mouse_events.js
+++ b/src/edit/mouse_events.js
@@ -9,7 +9,7 @@ import { normalizeSelection, Range, Selection } from "../model/selection.js"
 import { extendRange, extendSelection, replaceOneSelection, setSelection } from "../model/selection_updates.js"
 import { captureRightClick, chromeOS, ie, ie_version, mac, webkit, safari } from "../util/browser.js"
 import { getOrder, getBidiPartAt } from "../util/bidi.js"
-import { activeElt, doc as getDoc, win } from "../util/dom.js"
+import { activeElt, root, win } from "../util/dom.js"
 import { e_button, e_defaultPrevented, e_preventDefault, e_target, hasHandler, off, on, signal, signalDOMEvent } from "../util/event.js"
 import { dragAndDrop } from "../util/feature_detection.js"
 import { bind, countColumn, findColumn, sel_mouse } from "../util/misc.js"
@@ -128,7 +128,7 @@ function configureMouse(cm, repeat, event) {
 
 function leftButtonDown(cm, pos, repeat, event) {
   if (ie) setTimeout(bind(ensureFocus, cm), 0)
-  else cm.curOp.focus = activeElt(getDoc(cm))
+  else cm.curOp.focus = activeElt(root(cm))
 
   let behavior = configureMouse(cm, repeat, event)
 
@@ -292,7 +292,7 @@ function leftButtonSelect(cm, event, start, behavior) {
     let cur = posFromMouse(cm, e, true, behavior.unit == "rectangle")
     if (!cur) return
     if (cmp(cur, lastPos) != 0) {
-      cm.curOp.focus = activeElt(getDoc(cm))
+      cm.curOp.focus = activeElt(root(cm))
       extendTo(cur)
       let visible = visibleLines(display, doc)
       if (cur.line >= visible.to || cur.line < visible.from)
diff --git a/src/input/ContentEditableInput.js b/src/input/ContentEditableInput.js
index f789af74ee..158ff24749 100644
--- a/src/input/ContentEditableInput.js
+++ b/src/input/ContentEditableInput.js
@@ -10,7 +10,7 @@ import { simpleSelection } from "../model/selection.js"
 import { setSelection } from "../model/selection_updates.js"
 import { getBidiPartAt, getOrder } from "../util/bidi.js"
 import { android, chrome, gecko, ie_version } from "../util/browser.js"
-import { activeElt, contains, range, removeChildrenAndAdd, selectInput } from "../util/dom.js"
+import { activeElt, contains, range, removeChildrenAndAdd, selectInput, rootNode } from "../util/dom.js"
 import { on, signalDOMEvent } from "../util/event.js"
 import { Delayed, lst, sel_dontScroll } from "../util/misc.js"
 
@@ -97,7 +97,7 @@ export default class ContentEditableInput {
       disableBrowserMagic(te)
       cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild)
       te.value = lastCopied.text.join("\n")
-      let hadFocus = activeElt(div.ownerDocument)
+      let hadFocus = activeElt(rootNode(div))
       selectInput(te)
       setTimeout(() => {
         cm.display.lineSpace.removeChild(kludge)
@@ -120,7 +120,7 @@ export default class ContentEditableInput {
 
   prepareSelection() {
     let result = prepareSelection(this.cm, false)
-    result.focus = activeElt(this.div.ownerDocument) == this.div
+    result.focus = activeElt(rootNode(this.div)) == this.div
     return result
   }
 
@@ -214,7 +214,7 @@ export default class ContentEditableInput {
 
   focus() {
     if (this.cm.options.readOnly != "nocursor") {
-      if (!this.selectionInEditor() || activeElt(this.div.ownerDocument) != this.div)
+      if (!this.selectionInEditor() || activeElt(rootNode(this.div)) != this.div)
         this.showSelection(this.prepareSelection(), true)
       this.div.focus()
     }
diff --git a/src/input/TextareaInput.js b/src/input/TextareaInput.js
index 0aac125b11..26a17281c4 100644
--- a/src/input/TextareaInput.js
+++ b/src/input/TextareaInput.js
@@ -6,7 +6,7 @@ import { eventInWidget } from "../measurement/widgets.js"
 import { simpleSelection } from "../model/selection.js"
 import { selectAll, setSelection } from "../model/selection_updates.js"
 import { captureRightClick, ie, ie_version, ios, mac, mobile, presto, webkit } from "../util/browser.js"
-import { activeElt, removeChildrenAndAdd, selectInput } from "../util/dom.js"
+import { activeElt, removeChildrenAndAdd, selectInput, rootNode } from "../util/dom.js"
 import { e_preventDefault, e_stop, off, on, signalDOMEvent } from "../util/event.js"
 import { hasSelection } from "../util/feature_detection.js"
 import { Delayed, sel_dontScroll } from "../util/misc.js"
@@ -182,7 +182,7 @@ export default class TextareaInput {
   supportsTouch() { return false }
 
   focus() {
-    if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt(this.textarea.ownerDocument) != this.textarea)) {
+    if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt(rootNode(this.textarea)) != this.textarea)) {
       try { this.textarea.focus() }
       catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
     }
diff --git a/src/util/dom.js b/src/util/dom.js
index 6672645a8d..52fc9495ce 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -64,13 +64,14 @@ export function contains(parent, child) {
   } while (child = child.parentNode)
 }
 
-export function activeElt(doc) {
+export function activeElt(rootNode) {
   // IE and Edge may throw an "Unspecified Error" when accessing document.activeElement.
   // IE < 10 will throw when accessed while the page is loading or in an iframe.
   // IE > 9 and Edge will throw when accessed in an iframe if document.body is unavailable.
+  let doc = rootNode.ownerDocument || rootNode
   let activeElement
   try {
-    activeElement = doc.activeElement
+    activeElement = rootNode.activeElement
   } catch(e) {
     activeElement = doc.body || null
   }
@@ -98,4 +99,13 @@ else if (ie) // Suppress mysterious IE10 errors
 
 export function doc(cm) { return cm.display.wrapper.ownerDocument }
 
+export function root(cm) {
+  return rootNode(cm.display.wrapper)
+}
+
+export function rootNode(element) {
+  // Detect modern browsers (2017+).
+  return element.getRootNode ? element.getRootNode() : element.ownerDocument
+}
+
 export function win(cm) { return doc(cm).defaultView }

From e84384b4210bc35300994de07c6333666f2a5c9e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Mon, 20 Nov 2023 10:57:37 +0100
Subject: [PATCH 4719/4742] Mark version 5.65.16

---
 AUTHORS           |  2 ++
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 3dd26e0fbb..c38f088f68 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -301,6 +301,7 @@ fraxx001
 Fredrik Borg
 FUJI Goro (gfx)
 fzipp
+Gabriela Gutierrez
 Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
@@ -718,6 +719,7 @@ Panupong Pasupat
 paris
 Paris
 Paris Kasidiaris
+Parker Lougheed
 Patil Arpith
 Patrick Kettner
 Patrick Stoica
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31c9043708..6ba18d2cd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.65.16 (2023-11-20)
+
+### Bug fixes
+
+Fix focus tracking in shadow DOM.
+
+[go mode](https://codemirror.net/5/mode/go/): Allow underscores in numbers.
+
+[jsx mode](https://codemirror.net/5/mode/jsx/index.html): Support TS generics marked by trailing comma.
+
 ## 5.65.15 (2023-08-29)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 7496ff277a..2a915729e3 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.15</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.16</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 5d94bad1fb..9777ec70ea 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,14 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-11-2023: <a href="https://codemirror.net/5/codemirror-5.65.16.zip">Version 5.65.16</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix focus tracking in shadow DOM.</li>
+    <li><a href="https://codemirror.net/5/mode/go/">go mode</a>: Allow underscores in numbers.</li>
+    <li><a href="https://codemirror.net/5/mode/jsx/index.html">jsx mode</a>: Support TS generics marked by trailing comma.</li>
+  </ul>
+
   <p class="rel">29-08-2023: <a href="https://codemirror.net/5/codemirror-5.65.15.zip">Version 5.65.15</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 319adcbaa9..28c0918d63 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.15</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.16</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index eb0c44cf09..2c618b4db0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.15",
+  "version": "5.65.16",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index f69663b6fe..650d09bd95 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.15"
+CodeMirror.version = "5.65.16"

From 0c8456c3bc92fb3085ac636f5ed117df24e22ca7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Thu, 29 Feb 2024 07:17:45 +0100
Subject: [PATCH 4720/4742] [duotone theme] Improve contrast on comment tokens

Closes https://github.com/codemirror/codemirror5/issues/7087
---
 theme/duotone-dark.css  | 2 +-
 theme/duotone-light.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/duotone-dark.css b/theme/duotone-dark.css
index 88fdc76c8e..5373178e8d 100644
--- a/theme/duotone-dark.css
+++ b/theme/duotone-dark.css
@@ -26,7 +26,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 
 .cm-s-duotone-dark span.cm-variable-2, .cm-s-duotone-dark span.cm-variable-3, .cm-s-duotone-dark span.cm-type, .cm-s-duotone-dark span.cm-string-2, .cm-s-duotone-dark span.cm-url { color: #7a63ee; }
 .cm-s-duotone-dark span.cm-def, .cm-s-duotone-dark span.cm-tag, .cm-s-duotone-dark span.cm-builtin, .cm-s-duotone-dark span.cm-qualifier, .cm-s-duotone-dark span.cm-header, .cm-s-duotone-dark span.cm-em { color: #eeebff; }
-.cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #6c6783; }
+.cm-s-duotone-dark span.cm-bracket, .cm-s-duotone-dark span.cm-comment { color: #a7a5b2; }
 
 /* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
 .cm-s-duotone-dark span.cm-error, .cm-s-duotone-dark span.cm-invalidchar { color: #f00; }
diff --git a/theme/duotone-light.css b/theme/duotone-light.css
index d99480f7c4..a0a0b8336e 100644
--- a/theme/duotone-light.css
+++ b/theme/duotone-light.css
@@ -25,7 +25,7 @@ CodeMirror template by Jan T. Sott (https://github.com/idleberg), adapted by Bra
 
 .cm-s-duotone-light span.cm-variable-2, .cm-s-duotone-light span.cm-variable-3, .cm-s-duotone-light span.cm-type, .cm-s-duotone-light span.cm-string-2, .cm-s-duotone-light span.cm-url { color: #896724; }
 .cm-s-duotone-light span.cm-def, .cm-s-duotone-light span.cm-tag, .cm-s-duotone-light span.cm-builtin, .cm-s-duotone-light span.cm-qualifier, .cm-s-duotone-light span.cm-header, .cm-s-duotone-light span.cm-em { color: #2d2006; }
-.cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #b6ad9a; }
+.cm-s-duotone-light span.cm-bracket, .cm-s-duotone-light span.cm-comment { color: #6f6e6a; }
 
 /* using #f00 red for errors, don't think any of the colorscheme variables will stand out enough, ... maybe by giving it a background-color ... */
 /* .cm-s-duotone-light span.cm-error { background: #896724; color: #728fcb; } */

From b7b1bbcb9668032f6ab16766e19572745c6326b9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Wed, 3 Apr 2024 14:56:27 +0200
Subject: [PATCH 4721/4742] [crystal mode] Fix an infinite loop in tokenizing
 of heredoc strings

Closes https://github.com/codemirror/codemirror5/issues/7092
---
 mode/crystal/crystal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/crystal/crystal.js b/mode/crystal/crystal.js
index 73b0dbe13c..b22c5dbe41 100644
--- a/mode/crystal/crystal.js
+++ b/mode/crystal/crystal.js
@@ -379,7 +379,7 @@
               return "string";
             }
 
-            escaped = embed && stream.next() == "\\";
+            escaped = stream.next() == "\\" && embed;
           } else {
             stream.next();
             escaped = false;

From 5a966343ec7c7f740f0dc01e4a8e7d0bd288c1ef Mon Sep 17 00:00:00 2001
From: David Foster <david.foster@techsmart.codes>
Date: Fri, 19 Apr 2024 09:48:36 -0700
Subject: [PATCH 4722/4742] Add regression test for issue #4641

---
 test/comment_test.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/comment_test.js b/test/comment_test.js
index 7deda79138..2210667163 100644
--- a/test/comment_test.js
+++ b/test/comment_test.js
@@ -115,4 +115,9 @@ namespace = "comment_";
     cm.setCursor(1, 0)
     cm.execCommand("toggleComment")
   }, "<!-- foo\nbar -->", "<!-- foo\nbar -->")
+  
+  test("toggleWithMultipleInnerComments", "javascript", function(cm) {
+    cm.execCommand("selectAll")
+    cm.execCommand("toggleComment")
+  }, "/* foo */\na\n/* bar */\nb", "// /* foo */\n// a\n// /* bar */\n// b")
 })();

From fec380ddc125419ab2ba47765442ea557a88d611 Mon Sep 17 00:00:00 2001
From: David Foster <david.foster@techsmart.codes>
Date: Mon, 22 Apr 2024 12:46:40 -0700
Subject: [PATCH 4723/4742] Add regression test for issue #1975

---
 test/comment_test.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/comment_test.js b/test/comment_test.js
index 2210667163..7612f47e37 100644
--- a/test/comment_test.js
+++ b/test/comment_test.js
@@ -120,4 +120,16 @@ namespace = "comment_";
     cm.execCommand("selectAll")
     cm.execCommand("toggleComment")
   }, "/* foo */\na\n/* bar */\nb", "// /* foo */\n// a\n// /* bar */\n// b")
+  
+  var before = 'console.log("//string gets corrupted.");';
+  var after  = '// console.log("//string gets corrupted.");';
+  test("toggleWithStringContainingComment1", "javascript", function(cm) {
+    cm.setCursor({line: 0, ch: 16 /* after // inside string */});
+    cm.execCommand("toggleComment");
+  }, before, after)
+  test("toggleWithStringContainingComment2", "javascript", function(cm) {
+    cm.setCursor({line: 0, ch: 16 /* after // inside string */});
+    cm.execCommand("toggleComment");
+    cm.execCommand("toggleComment");
+  }, before, before)
 })();

From 064c9a880750a492c598433e6ddd155f836caaac Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Sat, 20 Jul 2024 16:24:23 +0200
Subject: [PATCH 4724/4742] Mark version 5.65.17

---
 AUTHORS           | 1 +
 CHANGELOG.md      | 6 ++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 6 ++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index c38f088f68..5bc0ef4f48 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -218,6 +218,7 @@ Dave Brondsema
 Dave MacLachlan
 Dave Myers
 David Barnett
+David Foster
 David H. Bronke
 David Mignot
 David Pathakjee
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ba18d2cd7..81107b20dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.65.17 (2024-07-20)
+
+### Bug fixes
+
+[crystal mode](https://codemirror.net/5/mode/crystal/index.html): Fix an infinite loop bug when tokenizing heredoc strings.
+
 ## 5.65.16 (2023-11-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 2a915729e3..9951e08cca 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.16</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.17</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 9777ec70ea..da9acb17aa 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,12 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-07-2024: <a href="https://codemirror.net/5/codemirror-5.65.17.zip">Version 5.65.17</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/mode/crystal/index.html">crystal mode</a>: Fix an infinite loop bug when tokenizing heredoc strings.</li>
+  </ul>
+
   <p class="rel">20-11-2023: <a href="https://codemirror.net/5/codemirror-5.65.16.zip">Version 5.65.16</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 28c0918d63..0a61fa7693 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.16</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.17</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 2c618b4db0..37c4c86670 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.16",
+  "version": "5.65.17",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 650d09bd95..ad89b5a760 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.16"
+CodeMirror.version = "5.65.17"

From 13eeec1ec2fe12571cd0b2feb57a1d575fc14355 Mon Sep 17 00:00:00 2001
From: "Allef Santana (garug)" <allefff@gmail.com>
Date: Thu, 1 Aug 2024 12:18:54 -0300
Subject: [PATCH 4725/4742] [clojure mode] Enable brace folding

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

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index 3305165808..78bf286606 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -281,6 +281,7 @@ CodeMirror.defineMode("clojure", function (options) {
     },
 
     closeBrackets: {pairs: "()[]{}\"\""},
+    fold: "brace",
     lineComment: ";;"
   };
 });

From 48d159a49b1db89523df7834cb18b46ac142764b Mon Sep 17 00:00:00 2001
From: pkucode <cssjtu@163.com>
Date: Thu, 15 Aug 2024 23:46:23 +0800
Subject: [PATCH 4726/4742] Remove repeated words in comments

Signed-off-by: pkucode <cssjtu@163.com>
---
 addon/edit/matchbrackets.js | 2 +-
 doc/manual.html             | 2 +-
 src/display/update_lines.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
index c342910ed5..0d1bcb662e 100644
--- a/addon/edit/matchbrackets.js
+++ b/addon/edit/matchbrackets.js
@@ -27,7 +27,7 @@
       afterCursor = /(^| )cm-fat-cursor($| )/.test(cm.getWrapperElement().className)
     var re = bracketRegex(config)
 
-    // A cursor is defined as between two characters, but in in vim command mode
+    // A cursor is defined as between two characters, but in vim command mode
     // (i.e. not insert mode), the cursor is visually represented as a
     // highlighted box on top of the 2nd character. Otherwise, we allow matches
     // from before or after the cursor.
diff --git a/doc/manual.html b/doc/manual.html
index 9951e08cca..553ac6c731 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -3733,7 +3733,7 @@ <h3 id="vimapi_extending">Extending VIM</h3>
       been mapped to their Vim equivalents. Finds a command based on the key
       (and cached keys if there is a multi-key sequence). Returns <code>undefined</code>
       if no key is matched, a noop function if a partial match is found (multi-key),
-      and a function to execute the bound command if a a key is matched. The
+      and a function to execute the bound command if a key is matched. The
       function always returns true.
       </dd>
 
diff --git a/src/display/update_lines.js b/src/display/update_lines.js
index f09524b605..efb68f4479 100644
--- a/src/display/update_lines.js
+++ b/src/display/update_lines.js
@@ -58,7 +58,7 @@ function updateWidgetHeight(line) {
 }
 
 // Compute the lines that are visible in a given viewport (defaults
-// the the current scroll position). viewport may contain top,
+// the current scroll position). viewport may contain top,
 // height, and ensure (see op.scrollToPos) properties.
 export function visibleLines(display, doc, viewport) {
   let top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop

From dd44c943cc25109d73041abb9f859581c4dec07a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Wed, 28 Aug 2024 10:21:47 +0200
Subject: [PATCH 4727/4742] [groovy mode] Stop parsing interpolated variable
 names when hitting whitespace

Closes https://github.com/codemirror/codemirror5/issues/7103
---
 mode/groovy/groovy.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mode/groovy/groovy.js b/mode/groovy/groovy.js
index 89d0fe0854..24d886ebb1 100644
--- a/mode/groovy/groovy.js
+++ b/mode/groovy/groovy.js
@@ -129,10 +129,8 @@ CodeMirror.defineMode("groovy", function(config) {
 
   function tokenVariableDeref(stream, state) {
     var next = stream.match(/^(\.|[\w\$_]+)/)
-    if (!next) {
-      state.tokenize.pop()
-      return state.tokenize[state.tokenize.length-1](stream, state)
-    }
+    if (!next || !stream.match(next[0] == "." ? /^[\w$_]/ : /^\./)) state.tokenize.pop()
+    if (!next) return state.tokenize[state.tokenize.length-1](stream, state)
     return next[0] == "." ? null : "variable"
   }
 

From e1b414d88d515b895add96df9d689fc9d0098fa0 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Thu, 5 Sep 2024 07:45:25 -0700
Subject: [PATCH 4728/4742] [dart mode] Support digit separators

---
 mode/dart/dart.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/dart/dart.js b/mode/dart/dart.js
index ba9ff3dd2c..cbbf391cc5 100644
--- a/mode/dart/dart.js
+++ b/mode/dart/dart.js
@@ -44,6 +44,8 @@
     blockKeywords: set(blockKeywords),
     builtin: set(builtins),
     atoms: set(atoms),
+    // clike numbers without the suffixes, and with '_' separators.
+    number: /^(?:0x[a-f\d_]+|(?:[\d_]+\.?[\d_]*|\.[\d_]+)(?:e[-+]?[\d_]+)?)/i,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_\.]/);

From 81d004923d399fdb3af447fee63c5255e255d6f3 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Wed, 18 Sep 2024 09:29:02 +0200
Subject: [PATCH 4729/4742] Drop realworld.html page

---
 doc/realworld.html | 209 ---------------------------------------------
 index.html         |   9 +-
 2 files changed, 1 insertion(+), 217 deletions(-)
 delete mode 100644 doc/realworld.html

diff --git a/doc/realworld.html b/doc/realworld.html
deleted file mode 100644
index 4d822b36ab..0000000000
--- a/doc/realworld.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Real-world Uses</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="docs.css">
-
-<div id=nav>
-  <a href="https://codemirror.net/5"><h1>CodeMirror</h1><img id=logo src="logo.png"></a>
-
-  <ul>
-    <li><a href="../index.html">Home</a>
-    <li><a href="manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror5">Code</a>
-  </ul>
-  <ul>
-    <li><a class=active href="#">Real-world uses</a>
-  </ul>
-</div>
-
-<article>
-
-<h2>CodeMirror real-world uses</h2>
-
-    <p>Create a <a href="https://github.com/codemirror/codemirror5">pull
-    request</a> if you'd like your project to be added to this list.</p>
-
-    <ul>
-      <li><a href="https://www.adaface.com/pair-pro">Adaface PairPro</a> (Shared code editor with compiler and video conferencing)</li>
-      <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
-      <li><a href="http://adnuntius.com">Adnuntius</a> (used for in-browser code editing and version history)</li>
-      <li><a href="http://alm.tools">ALM Tools</a> (TypeScript powered IDE)</li>
-      <li><a href="http://amber-lang.net/">Amber</a> (JavaScript-based Smalltalk system)</li>
-      <li><a href="http://apeye.org/">APEye</a> (tool for testing &amp; documenting APIs)</li>
-      <li><a href="https://github.com/google/appengine-codiad">Appengine Codiad</a></li>
-      <li><a href="https://chrome.google.com/webstore/detail/better-text-viewer/lcaidopdffhfemoefoaadecppnjdknkc">Better Text Viewer</a> (plain text reader app for Chrome)</li>
-      <li><a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a> (code hosting)</li>
-      <li><a href="https://blogger.googleblog.com/2013/04/improvements-to-blogger-template-html.html">Blogger's theme editor</a></li>
-      <li><a href="http://bluegriffon.org/">BlueGriffon</a> (HTML editor)</li>
-      <li><a href="https://bnfplayground.pauliankline.com/">BNF Playground</a> (grammar workbench)</li>
-      <li><a href="https://github.com/isdampe/BosonEditorExperimental">Boson Editor</a> (code editor)</li>
-      <li><a href="http://cargocollective.com/">Cargo Collective</a> (creative publishing platform)</li>
-      <li><a href="https://developers.google.com/chrome-developer-tools/">Chrome DevTools</a></li>
-      <li><a href="http://clickhelp.co/">ClickHelp</a> (technical writing tool)</li>
-      <li><a href="https://encap.github.io/clone-it/">Clone-It</a> (HTML & CSS learning game)</li>
-      <li><a href="https://cloudcmd.io">Cloud Commander</a> (filemanager for the web)</li>
-      <li><a href="https://electronjs.org/apps/colon">Colon</a> (A flexible text editor or IDE)</li>
-      <li><a href="http://code.world/">CodeWorld</a> (Haskell playground)</li>
-      <li><a href="http://complete-ly.appspot.com/playground/code.playground.html">Complete.ly playground</a></li>
-      <li><a href="https://codeanywhere.com/">Codeanywhere</a> (multi-platform cloud editor)</li>
-      <li><a href="http://drupal.org/project/cpn">Code per Node</a> (Drupal module)</li>
-      <li><a href="https://codebitt.com/">CodeBitt</a> (Code snippet sharing)</li>
-      <li><a href="http://www.codebugapp.com/">Codebug</a> (PHP Xdebug front-end)</li>
-      <li><a href="http://codefights.com/">CodeFights</a> (practice programming)</li>
-      <li><a href="https://github.com/angelozerr/CodeMirror-Eclipse">CodeMirror Eclipse</a> (embed CM in Eclipse)</li>
-      <li><a href="http://emmet.io/blog/codemirror-movie/">CodeMirror movie</a> (scripted editing demos)</li>
-      <li><a href="https://github.com/haoranyu/codemirror-record/">CodeMirror Record</a> (codemirror activity recording and playback)</li>
-      <li><a href="http://code.google.com/p/codemirror2-gwt/">CodeMirror2-GWT</a> (Google Web Toolkit wrapper)</li>
-      <li><a href="http://www.crunchzilla.com/code-monster">Code Monster</a> & <a href="http://www.crunchzilla.com/code-maven">Code Maven</a> (learning environment)</li>
-      <li><a href="http://codepen.io">Codepen</a> (gallery of animations)</li>
-      <li><a href="https://github.com/pepstock-org/Coderba">Coderba</a> Google Web Toolkit (GWT) wrapper</li>
-      <li><a href="https://coderpad.io/">Coderpad</a> (interviewing tool)</li>
-      <li><a href="https:/coderush.xyz/">CodeRush</a> typing speed test for programmers</li>
-      <li><a href="http://sasstwo.codeschool.com/levels/1/challenges/1">Code School</a> (online tech learning environment)</li>
-      <li><a href="http://code-snippets.bungeshea.com/">Code Snippets</a> (WordPress snippet management plugin)</li>
-      <li><a href="http://antonmi.github.io/code_together/">Code together</a> (collaborative editing)</li>
-      <li><a href="https://www.codevolve.com/">Codevolve</a> (programming lessons as-a-service)</li>
-      <li><a href="http://www.codezample.com">CodeZample</a> (code snippet sharing)</li>
-      <li><a href="http://codio.com">Codio</a> (Web IDE)</li>
-      <li><a href="https://www.codiva.io/">Codiva.io</a> (Online Java Compiler and IDE with auto-completion and error highlighting)</li>
-      <li><a href="http://www.communitycodecamp.com/">Community Code Camp</a> (code snippet sharing)</li>
-      <li><a href="http://www.compilejava.net/">compilejava.net</a> (online Java sandbox)</li>
-      <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>
-      <li><a href="http://www.crossui.com/">CrossUI</a> (cross-platform UI builder)</li>
-      <li><a href="http://rsnous.com/cruncher/">Cruncher</a> (notepad with calculation features)</li>
-      <li><a href="http://www.crudzilla.com/">Crudzilla</a> (self-hosted web IDE)</li>
-      <li><a href="http://cssdeck.com/">CSSDeck</a> (CSS showcase)</li>
-      <li><a href="http://ireneros.com/deck/deck.js-codemirror/introduction/#textarea-code">Deck.js integration</a> (slides with editors)</li>
-      <li><a href="http://www.dbninja.com">DbNinja</a> (MySQL access interface)</li>
-      <li><a href="http://www.ecsspert.com/">eCSSpert</a> (CSS demos and experiments)</li>
-      <li><a href="https://edabit.com">Edabit</a> (coding challenges)</li>
-      <li><a href="http://elm-lang.org/Examples.elm">Elm language examples</a></li>
-      <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
-      <li><a href="http://emmet.io">Emmet</a> (fast XML editing)</li>
-      <li><a href="https://github.com/espruino/EspruinoWebIDE">Espruino Web IDE</a> (Chrome App for writing code on Espruino devices)</li>
-      <li><a href="https://exlskills.com/learn-en/talent/interviews">EXLskills Live Interviews</a></li>
-      <li><a href="http://www.fastfig.com/">Fastfig</a> (online computation/math tool)</li>
-      <li><a href="https://metacpan.org/module/Farabi">Farabi</a> (modern Perl IDE)</li>
-      <li><a href="http://blog.pamelafox.org/2012/02/interactive-html5-slides-with-fathomjs.html">FathomJS integration</a> (slides with editors, again)</li>
-      <li><a href="http://fiddlesalad.com/">Fiddle Salad</a> (web development environment)</li>
-      <li><a href="https://github.com/simogeo/Filemanager">Filemanager</a></li>
-      <li><a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox Developer Tools</a></li>
-      <li><a href="http://www.firepad.io">Firepad</a> (collaborative text editor)</li>
-      <li><a href="https://gerritcodereview.com/">Gerrit</a>'s diff view and inline editor</li>
-      <li><a href="https://github.com/maks/git-crx">Git Crx</a> (Chrome App for browsing local git repos)</li>
-      <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
-      <li><a href="https://github.com/">GitHub</a>'s in-browser edit feature</li>
-      <li><a href="https://glitch.com/">Glitch</a> (community-driven app building)</li>
-      <li><a href="http://tour.golang.org">Go language tour</a></li>
-      <li><a href="https://script.google.com/">Google Apps Script</a></li>
-      <li><a href="http://web.uvic.ca/~siefkenj/graphit/graphit.html">Graphit</a> (function graphing)</li>
-      <li><a href="https://graviton.netlify.app/">Graviton Editor</a> (Cross-platform and modern-looking code editor)</li>
-      <li><a href="https://hackmd.io">HackMD</a> (Realtime collaborative markdown notes on all platforms)</li>
-      <li><a href="http://www.handcraft.com/">Handcraft</a> (HTML prototyping)</li>
-      <li><a href="http://hawkee.com/">Hawkee</a></li>
-      <li><a href="http://try.haxe.org">Haxe</a> (Haxe Playground) </li>
-      <li><a href="http://haxpad.com/">HaxPad</a> (editor for Win RT)</li>
-      <li><a href="http://megafonweblab.github.com/histone-javascript/">Histone template engine playground</a></li>
-      <li><a href="http://www.homegenie.it/docs/automation_getstarted.php">Homegenie</a> (home automation server)</li>
-      <li><a href="http://icecoder.net">ICEcoder</a> (web IDE)</li>
-      <li><a href="https://innovay.app/formatter/html">Innovay Web Tools</a> (HTML, JS, CSS code beautifier)</li>
-      <li><a href="https://www.intervue.io">Intervue</a> (Pair programming for interviews)</li>
-      <li><a href="http://ipython.org/">IPython</a> (interactive computing shell)</li>
-      <li><a href="https://joelpinheiro.github.io/itrading/">iTrading</a> (Algorithmic Trading)</li>
-      <li><a href="http://i-mos.org/imos/">i-MOS</a> (modeling and simulation platform)</li>
-      <li><a href="http://www.janvas.com/">Janvas</a> (vector graphics editor)</li>
-      <li><a href="https://code.wetrafa.xyz/">JdBEdit</a> (web IDE)</li>
-      <li><a href="http://extensions.joomla.org/extensions/edition/editors/8723">Joomla plugin</a></li>
-      <li><a href="http://jqfundamentals.com/">jQuery fundamentals</a> (interactive tutorial)</li>
-      <li><a href="http://jsbin.com">jsbin.com</a> (JS playground)</li>
-      <li><a href="http://tool.jser.com/preprocessor">JSER preprocessor</a></li>
-      <li><a href="https://github.com/kucherenko/jscpd">jscpd</a> (code duplication detector)</li>
-      <li><a href="http://jsfiddle.net">JSFiddle</a> (another JS playground)</li>
-      <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>
-      <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://www.kodhus.com/kodity/">Kodit</a></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="http://lighttable.com/">Light Table</a> (experimental IDE)</li>
-      <li><a href="http://liveweave.com/">Liveweave</a> (HTML/CSS/JS scratchpad)</li>
-      <li><a href="https://liveuml.com/">LiveUML</a> (PlantUML online editor)</li>
-      <li><a href="https://github.com/TuvaLabs/markdown-delight-editor">Markdown Delight Editor</a> (extensible markdown editor polymer component)</li>
-      <li><a href="http://marklighteditor.com/">Marklight editor</a> (lightweight markup editor)</li>
-      <li><a href="https://www.mediawiki.org/wiki/Extension:CodeMirror">MediaWiki extension</a> (wiki engine)</li>
-      <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
-      <li><a href="http://www.iunbug.com/mihtool">MIHTool</a> (iOS web-app debugging tool)</li>
-      <li><a href="http://mscgen.js.org/index.html">mscgen_js</a> (online sequence chart editor)</li>
-      <li><a href="http://mvcplayground.apphb.com/">MVC Playground</a></li>
-      <li><a href="http://www.navigatecms.com">Navigate CMS</a></li>
-      <li><a href="https://github.com/soliton4/nodeMirror">nodeMirror</a> (IDE project)</li>
-      <li><a href="https://notex.ch">NoTex</a> (rST authoring)</li>
-      <li><a href="https://nteract.io">nteract</a> (interactive literate coding notebook)</li>
-      <li><a href="http://oakoutliner.com">Oak</a> (online outliner)</li>
-      <li><a href="http://www.greycampus.com/opencampus">OpenCampus</a></li>
-      <li><a href="http://clrhome.org/asm/">ORG</a> (z80 assembly IDE)</li>
-      <li><a href="https://github.com/mamacdon/orion-codemirror">Orion-CodeMirror integration</a> (running CodeMirror modes in Orion)</li>
-      <li><a href="https://www.overleaf.com/">Overleaf</a> (Collaborative LaTeX Editor)</li>
-      <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
-      <li><a href="http://pharaoh.js.org/">Pharaoh</a> (browser &amp; desktop editor for the classroom)</li>
-      <li><a href="http://prinbit.com/">PrinBit</a> (collaborative coding tool)</li>
-      <li><a href="https://www.pramp.com/ref/codemirror">Pramp</a> (free platform to practice mock interviews and coding problems)</li>
-      <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
-      <li><a href="https://pypi.python.org/pypi/PubliForge/">PubliForge</a> (online publishing system)</li>
-      <li><a href="http://www.puzzlescript.net/">Puzzlescript</a> (puzzle game engine)</li>
-      <li><a href="https://chrome.google.com/webstore/detail/quantum/hmnlklahndgbhdoclhdnoafhafbhmnkm?hl=en-US">Quantum</a> (code editor for Chrome OS)</li>
-      <li><a href="http://ariya.ofilabs.com/2011/09/hybrid-webnative-desktop-codemirror.html">Qt+Webkit integration</a> (building a desktop CodeMirror app)</li>
-      <li><a href="http://www.quivive-file-manager.com">Quivive File Manager</a></li>
-      <li><a href="https://racktables.org">RackTables</a> (data centre resources manager)</li>
-      <li><a href="http://rascalmicro.com/docs/basic-tutorial-getting-started.html">Rascal</a> (tiny computer)</li>
-      <li><a href="https://www.realtime.io/">RealTime.io</a> (Internet-of-Things infrastructure)</li>
-      <li><a href="http://refork.com/">Refork</a> (animation demo gallery and sharing)</li>
-      <li><a href="http://sagecell.sagemath.org">SageMathCell</a> (interactive mathematical software)</li>
-      <li><a href="https://sass2css.herokuapp.com/">SASS2CSS</a> (SASS, SCSS or LESS to CSS converter and CSS beautifier)</li>
-      <li><a href="https://cloud.sagemath.com/">SageMathCloud</a> (interactive mathematical software environment)</li>
-      <li><a href="https://github.com/szekelymilan/salvare">salvare</a> (real-time collaborative code editor)</li>
-      <li><a href="https://chrome.google.com/webstore/detail/servephp/mnpikomdchjhkhbhmbboehfdjkobbfpo">ServePHP</a> (PHP code testing in Chrome dev tools)</li>
-      <li><a href="http://scala-lang.org/blog/2017/02/20/introducing-scastie.html">Scastie</a> (Scala playground)</li>
-      <li><a href="https://www.shadertoy.com/">Shadertoy</a> (shader sharing)</li>
-      <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
-      <li><a href="http://www.skulpt.org/">Skulpt</a> (in-browser Python environment)</li>
-      <li><a href="https://www.sourcelair.com">SourceLair</a> (in-browser IDE for Django, Node.js, PHP and HTML5)</li>
-      <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>
-      <li><a href="http://syframework.alwaysdata.net">SyBox</a> (PHP playground)</li>
-      <li><a href="http://www.tagspaces.org/">TagSpaces</a> (personal data manager)</li>
-      <li><a href="https://textbox.io/">Textbox.io</a> (WYSIWYG rich text editor)</a></li>
-      <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
-      <li><a href="http://www.mapbox.com/tilemill/">TileMill</a> (map design tool)</li>
-      <li><a href="https://tilepieces.net">Tilepieces</a> (visually editing HTML documents and Web applications projects)</li>
-      <li><a href="http://doc.tiki.org/Syntax+Highlighter">Tiki</a> (wiki CMS groupware)</li>
-      <li><a href="https://www.tistory.com">Tistory</a> (blog service)</li>
-      <li><a href="http://www.toolsverse.com/products/data-explorer/">Toolsverse Data Explorer</a> (database management)</li>
-      <li><a href="http://blog.englard.net/post/39608000629/codeintumblr">Tumblr code highlighting shim</a></li>
-      <li><a href="http://turbopy.com/">TurboPY</a> (web publishing framework)</li>
-      <li><a href="http://cruise.eecs.uottawa.ca/umpleonline/">UmpleOnline</a> (model-oriented programming tool)</li>
-      <li><a href="https://upsource.jetbrains.com/idea-ce/file/idea-ce-7706e7832aa9e2fd0c2decdb5cbef2225692c696/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorFactoryImpl.java">Upsource</a> (code browser and review tool)</li>
-      <li><a href="https://violentmonkey.github.io/">Violentmonkey</a> (userscript manager / editor)</li>
-      <li><a href="https://github.com/mgaitan/waliki">Waliki</a> (wiki engine)</li>
-      <li><a href="http://wamer.net/">Wamer</a> (web application builder)</li>
-      <li><a href="https://github.com/brettz9/webappfind">webappfind</a> (windows file bindings for webapps)</li>
-      <li><a href="http://www.webglacademy.com/">WebGL academy</a> (learning WebGL)</li>
-      <li><a href="http://webglplayground.net/">WebGL playground</a></li>
-      <li><a href="https://www.webkit.org/blog/2518/state-of-web-inspector/#source-code">WebKit Web inspector</a></li>
-      <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
-      <li><a href="https://github.com/b3log/wide">Wide</a> (golang web IDE)</li>
-      <li><a href="http://wordpress.org/extend/plugins/codemirror-for-codeeditor/">WordPress plugin</a></li>
-      <li><a href="http://www.xosystem.org/home/applications_websites/xosystem_website/xoside_EN.php">XOSide</a> (online editor)</li>
-      <li><a href="http://videlibri.sourceforge.net/cgi-bin/xidelcgi">XQuery tester</a></li>
-      <li><a href="http://q42jaap.github.io/xsd2codemirror/">xsd2codemirror</a> (convert XSD to CM XML completion info)</li>
-      <li><a href="http://www.yacas.org/yacas_online/yacas_online.html">Yacas Online</a> (interactive mathematical software)</li>
-    </ul>
-
-</article>
-
diff --git a/index.html b/index.html
index 0a61fa7693..2bc4b9c083 100644
--- a/index.html
+++ b/index.html
@@ -128,14 +128,7 @@ <h2>Features</h2>
   <h2>Community</h2>
 
   <p>CodeMirror is an open-source project shared under
-  an <a href="LICENSE">MIT license</a>. It is the editor used in the
-  dev tools for
-  <a href="https://hacks.mozilla.org/2013/11/firefox-developer-tools-episode-27-edit-as-html-codemirror-more/">Firefox</a>,
-  <a href="https://developers.google.com/chrome-developer-tools/">Chrome</a>,
-  and <a href="https://developer.apple.com/safari/tools/">Safari</a>, in <a href="http://www.lighttable.com/">Light
-  Table</a>, <a href="http://brackets.io/">Adobe
-  Brackets</a>, <a href="http://blog.bitbucket.org/2013/05/14/edit-your-code-in-the-cloud-with-bitbucket/">Bitbucket</a>,
-  and <a href="doc/realworld.html">many other projects</a>.</p>
+  an <a href="LICENSE">MIT license</a>.</p>
 
   <p>Development and bug tracking happens
   on <a href="https://github.com/codemirror/CodeMirror/">github</a>

From 998f328b6b01217f6ef9e958ce3a128daddc592e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Fri, 20 Sep 2024 13:18:09 +0200
Subject: [PATCH 4730/4742] Mark version 5.65.18

---
 AUTHORS           | 2 ++
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5bc0ef4f48..db9c367183 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,6 +41,7 @@ alexey-k
 Alex Piggott
 Alf Eaton
 Aliaksei Chapyzhenka
+Allef Santana (garug)
 Allen Sarkisyan
 Ami Fischman
 Amin Shali
@@ -748,6 +749,7 @@ Pi Delport
 Pierre Gerold
 Pieter Ouwerkerk
 Piyush
+pkucode
 Pontus Granström
 Pontus Melke
 prasanthj
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81107b20dc..665ec14023 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.65.18 (2024-09-20)
+
+### Bug fixes
+
+[dart mode](https://codemirror.net/5/mode/dart/index.html): Handle numeric separators.
+
+[groovy mode](https://codemirror.net/5/mode/groovy/index.html): Fix a bug in highlighting interpolated variable names.
+
 ## 5.65.17 (2024-07-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 553ac6c731..ae992b3e6d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.17</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.18</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 da9acb17aa..de5d6f0b82 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,13 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-09-2024: <a href="https://codemirror.net/5/codemirror-5.65.18.zip">Version 5.65.18</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/mode/dart/index.html">dart mode</a>: Handle numeric separators.</li>
+    <li><a href="https://codemirror.net/5/mode/groovy/index.html">groovy mode</a>: Fix a bug in highlighting interpolated variable names.</li>
+  </ul>
+
   <p class="rel">20-07-2024: <a href="https://codemirror.net/5/codemirror-5.65.17.zip">Version 5.65.17</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 2bc4b9c083..0d823ad2cb 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.17</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.18</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 37c4c86670..2b4a0f237a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.17",
+  "version": "5.65.18",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index ad89b5a760..d136287d12 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.17"
+CodeMirror.version = "5.65.18"

From deee5c01586a7630fb0c1b32d4635fd4bb5fa545 Mon Sep 17 00:00:00 2001
From: "noor.masarwa" <62531656+Noormasarwa@users.noreply.github.com>
Date: Tue, 22 Oct 2024 14:21:57 +0300
Subject: [PATCH 4731/4742] [gherkin mode]: Add support for Rule Example
 keywords

Co-authored-by: Noor-Masarwe <nmasarwe@opentext.com>
---
 mode/gherkin/gherkin.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mode/gherkin/gherkin.js b/mode/gherkin/gherkin.js
index 196543e505..b6464310c9 100644
--- a/mode/gherkin/gherkin.js
+++ b/mode/gherkin/gherkin.js
@@ -155,6 +155,22 @@ CodeMirror.defineMode("gherkin", function () {
         state.inKeywordLine = true;
         return "keyword";
 
+        // RULE
+      } else if (state.allowScenario && stream.match(/(規則|ルール|قانون|قواعد|חוק|قاعدة|Правило|Правила|Reegel|Regel|Règle|Regola|Regla|Regulă|Regul|Regula|Regel|Regel|Regula|Правило|Правила|Regel|Regola|Regul|Reeglid|Rule):/)) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        state.allowMultilineArgument = true;
+        return "keyword";
+
+        // EXAMPLE
+      } else if (state.allowScenario && stream.match(/(例子|例|サンプル|예|דוגמה|مثال|Үрнәк|Пример|Παράδειγμα|Exemplo|Exemple|Beispiel|Ejemplo|Example|Esempio|Örnek|Példa|Pavyzdys|Paraugs|Voorbeeld|Příklad|Príklad|Exemplu|Esempi):/)) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        state.allowMultilineArgument = true;
+        return "keyword";
+
       // INLINE STRING
       } else if (stream.match(/"[^"]*"?/)) {
         return "string";

From b60e456801640147f47609c141105d5d58fcb1e8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Thu, 5 Dec 2024 10:33:40 +0100
Subject: [PATCH 4732/4742] [pascal mode] Make keywords case-insensitive

Closes https://github.com/codemirror/codemirror5/pull/7113
---
 mode/pascal/pascal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/pascal/pascal.js b/mode/pascal/pascal.js
index 062ea1189e..502f2c886b 100644
--- a/mode/pascal/pascal.js
+++ b/mode/pascal/pascal.js
@@ -72,7 +72,7 @@ CodeMirror.defineMode("pascal", function() {
       return "operator";
     }
     stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current();
+    var cur = stream.current().toLowerCase();
     if (keywords.propertyIsEnumerable(cur)) return "keyword";
     if (atoms.propertyIsEnumerable(cur)) return "atom";
     return "variable";

From 064ea16b7d1c0724ed1f63b2d6187435c9497a1e Mon Sep 17 00:00:00 2001
From: Beni Cherniavsky-Paskin <cben@redhat.com>
Date: Mon, 11 Mar 2019 20:02:26 +0200
Subject: [PATCH 4733/4742] [theme demo] Fix dropdown losing choice on
 solarized light / dark

Choosing "solarized dark" correctly sets .cm-s-solarized .cm-s-dark
(as documented https://codemirror.net/doc/manual.html#option_theme).

It then sets URL fragment to #solarized%20dark,
which was looking for `solarized%20dark` in dropdown and failing.
This commit makes both setting and getting URL fragment reliable.
---
 demo/theme.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/demo/theme.html b/demo/theme.html
index e394aa266b..5fe7a57547 100644
--- a/demo/theme.html
+++ b/demo/theme.html
@@ -183,9 +183,10 @@ <h2>Theme Demo</h2>
   function selectTheme() {
     var theme = input.options[input.selectedIndex].textContent;
     editor.setOption("theme", theme);
-    location.hash = "#" + theme;
+    location.hash = "#" + encodeURIComponent(theme);
   }
-  var choice = (location.hash && location.hash.slice(1)) ||
+  var choice = (location.hash &&
+                decodeURIComponent(location.hash.slice(1))) ||
                (document.location.search &&
                 decodeURIComponent(document.location.search.slice(1)));
   if (choice) {
@@ -193,7 +194,7 @@ <h2>Theme Demo</h2>
     editor.setOption("theme", choice);
   }
   CodeMirror.on(window, "hashchange", function() {
-    var theme = location.hash.slice(1);
+    var theme = decodeURIComponent(location.hash.slice(1));
     if (theme) { input.value = theme; selectTheme(); }
   });
 </script>

From 187450ac140094ae30630bc209c88c9f1b278e67 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Tue, 11 Mar 2025 15:39:10 +0100
Subject: [PATCH 4734/4742] Upgrade actions/cache to v4

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0a07b4e07..723792ec31 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.0
 
-      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 #v3.3.2
+      - uses: actions/cache@v4
         with:
           path: '/home/runner/work/codemirror/codemirror5/node_modules'
           key: ${{ runner.os }}-modules

From eed51d071bce00302f209d66b8d2cf908b2cb733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Vr=C3=A1na?= <jakub@vrana.cz>
Date: Sun, 16 Mar 2025 20:27:59 +0100
Subject: [PATCH 4735/4742] [sql mode] Support quoted identifier for PostgreSQL

---
 mode/sql/sql.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/sql/sql.js b/mode/sql/sql.js
index d3983889f7..a386f5c6c3 100644
--- a/mode/sql/sql.js
+++ b/mode/sql/sql.js
@@ -421,6 +421,10 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
     atoms: set("false true null unknown"),
     operatorChars: /^[*\/+\-%<>!=&|^\/#@?~]/,
     backslashStringEscapes: false,
+    identifierQuote: "\"", // https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
+    hooks: {
+      "\"":   hookIdentifierDoublequote
+    },
     dateSQL: set("date time timestamp"),
     support: set("decimallessFloat zerolessFloat binaryNumber hexNumber nCharCast charsetCast escapeConstant")
   });

From 8a5dcbb838e06fa01cba4d0b74d988ab66821c33 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Thu, 20 Mar 2025 17:27:04 +0100
Subject: [PATCH 4736/4742] Mark version 5.65.19

---
 AUTHORS           |  1 +
 CHANGELOG.md      | 10 ++++++++++
 doc/manual.html   |  2 +-
 doc/releases.html |  8 ++++++++
 index.html        |  2 +-
 package.json      |  2 +-
 src/edit/main.js  |  2 +-
 7 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index db9c367183..b263596758 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -697,6 +697,7 @@ Nils Knappmeier
 Nina Pypchenko
 Nisarg Jhaveri
 nlwillia
+noor.masarwa
 noragrossman
 Norman Rzepka
 Nouzbe
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 665ec14023..ee12d024db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.65.19 (2025-03-20)
+
+### Bug fixes
+
+[gherkin mode](https://codemirror.net/5/mode/gherkin/index.html): Add support for Rule Example keywords
+
+[pascal mode](https://codemirror.net/5/mode/pascal/index.html) Make keywords case-insensitive
+
+[sql mode](https://codemirror.net/5/mode/sql/) Support quoted identifier for PostgreSQL
+
 ## 5.65.18 (2024-09-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index ae992b3e6d..957a8f2fd1 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.18</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.19</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 de5d6f0b82..4229243846 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,14 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-03-2025: <a href="https://codemirror.net/5/codemirror-5.65.19.zip">Version 5.65.19</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/mode/gherkin/index.html">gherkin mode</a>: Add support for Rule Example keywords</li>
+    <li><a href="https://codemirror.net/5/mode/pascal/index.html">pascal mode</a> Make keywords case-insensitive</li>
+    <li><a href="https://codemirror.net/5/mode/sql/">sql mode</a> Support quoted identifier for PostgreSQL</li>
+  </ul>
+
   <p class="rel">20-09-2024: <a href="https://codemirror.net/5/codemirror-5.65.18.zip">Version 5.65.18</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 0d823ad2cb..9190bf20f2 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.18</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.19</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 2b4a0f237a..6273631203 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.18",
+  "version": "5.65.19",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index d136287d12..a27507456b 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.18"
+CodeMirror.version = "5.65.19"

From 1df33b7ac759488da69d8d83a792636e7c08c2e2 Mon Sep 17 00:00:00 2001
From: Zaid Daba'een <zaiddabaeen@users.noreply.github.com>
Date: Mon, 31 Mar 2025 13:50:52 +0300
Subject: [PATCH 4737/4742] clip-path issue fixed in Chrome 106

In Chrome 105, `clip-path` needed to be set as pointer events were ineffective outside CodeMirror editor instance but within paddings and margins of its elements. This has been resolved in Chrome 106 as seen [here](https://issues.chromium.org/issues/40863245#comment21).
---
 src/display/Display.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/display/Display.js b/src/display/Display.js
index 28d8dbb013..201e81c1cc 100644
--- a/src/display/Display.js
+++ b/src/display/Display.js
@@ -49,7 +49,7 @@ export function Display(place, doc, input, options) {
   // The element in which the editor lives.
   d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror")
   // See #6982. FIXME remove when this has been fixed for a while in Chrome
-  if (chrome && chrome_version >= 105) d.wrapper.style.clipPath = "inset(0px)"
+  if (chrome && chrome_version === 105) d.wrapper.style.clipPath = "inset(0px)"
 
   // This attribute is respected by automatic translation systems such as Google Translate,
   // and may also be respected by tools used by human translators.

From 98e86d1ae3fc8b6353e511bf25cf7adac7b03482 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Fri, 18 Jul 2025 07:55:08 +0200
Subject: [PATCH 4738/4742] [gas mode] Define text/x-gas mime type

Closes https://github.com/codemirror/codemirror5/issues/7134
---
 mode/gas/gas.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mode/gas/gas.js b/mode/gas/gas.js
index db09a8af08..cbf08586fc 100644
--- a/mode/gas/gas.js
+++ b/mode/gas/gas.js
@@ -350,4 +350,6 @@ CodeMirror.defineMode("gas", function(_config, parserConfig) {
   };
 });
 
+CodeMirror.defineMIME("text/x-gas", "gas");
+
 });

From 9f1450da47dd6ce43bb54491415364782970fe98 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Sun, 10 Aug 2025 10:22:41 +0200
Subject: [PATCH 4739/4742] [show-hint addon] Fix incorrectly applied offset

Closes https://github.com/codemirror/codemirror5/pull/7129
---
 addon/hint/show-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addon/hint/show-hint.js b/addon/hint/show-hint.js
index aaf1f643f4..eb448db7af 100644
--- a/addon/hint/show-hint.js
+++ b/addon/hint/show-hint.js
@@ -290,7 +290,7 @@
       var height = box.bottom - box.top, spaceAbove = box.top - (pos.bottom - pos.top) - 2
       if (winH - box.top < spaceAbove) { // More room at the top
         if (height > spaceAbove) hints.style.height = (height = spaceAbove) + "px";
-        hints.style.top = ((top = pos.top - height) + offsetTop) + "px";
+        hints.style.top = ((top = pos.top - height) - offsetTop) + "px";
         below = false;
       } else {
         hints.style.height = (winH - box.top - 2) + "px";

From b0c45cf0fbd3dc7cb2016a79fb81c723827f4e31 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijn@haverbeke.berlin>
Date: Sun, 10 Aug 2025 10:30:49 +0200
Subject: [PATCH 4740/4742] Mark version 5.65.20

---
 AUTHORS           | 1 +
 CHANGELOG.md      | 8 ++++++++
 doc/manual.html   | 2 +-
 doc/releases.html | 7 +++++++
 index.html        | 2 +-
 package.json      | 2 +-
 src/edit/main.js  | 2 +-
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b263596758..c800afe9d5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -978,6 +978,7 @@ Yuvi Panda
 Yvonnick Esnault
 Zac Anger
 Zachary Dremann
+Zaid Daba'een
 ZeeshanNoor
 Zeno Rocha
 Zhang Hao
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee12d024db..8a7064be6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 5.65.20 (2025-08-10)
+
+### Bug fixes
+
+[show-hint addon](https://codemirror.net/5/doc/manual.html#addon_show-hint): Fix a positioning issue when the tooltip is at the bottom of the screen.
+
+[gas mode](https://codemirror.net/5/mode/gas/index.html): Properly define the MIME type the mode's demo page mentions.
+
 ## 5.65.19 (2025-03-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index 957a8f2fd1..3ea659e970 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,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.65.19</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.20</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 4229243846..42227c7316 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -34,6 +34,13 @@ <h2>Version 6.x</h2>
 
   <h2>Version 5.x</h2>
 
+  <p class="rel">10-08-2025: <a href="https://codemirror.net/5/codemirror-5.65.20.zip">Version 5.65.20</a>:</p>
+
+  <ul class="rel-note">
+    <li><a href="https://codemirror.net/5/doc/manual.html#addon_show-hint">show-hint addon</a>: Fix a positioning issue when the tooltip is at the bottom of the screen.
+    <li><a href="https://codemirror.net/5/mode/gas/index.html">gas mode</a>: Properly define the MIME type the mode's demo page mentions.
+  </ul>
+
   <p class="rel">20-03-2025: <a href="https://codemirror.net/5/codemirror-5.65.19.zip">Version 5.65.19</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 9190bf20f2..7cc603ccbc 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.19</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.20</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 6273631203..330bfeb30a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.19",
+  "version": "5.65.20",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index a27507456b..949d9d4031 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.19"
+CodeMirror.version = "5.65.20"

From 876911012efc844bcbc8e6e764399cf28916d7a7 Mon Sep 17 00:00:00 2001
From: flofriday <flohacksfriday@gmail.com>
Date: Thu, 21 Aug 2025 14:47:06 +0200
Subject: [PATCH 4741/4742] [kotlin mode]: Fix unsigned long literal token

---
 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 e9f441fc0a..f783dfc8f2 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -680,7 +680,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     intendSwitch: false,
     indentStatements: false,
     multiLineStrings: true,
-    number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+(\.\d+)?|\.\d+)(?:e[-+]?[\d_]+)?)(u|ll?|l|f)?/i,
+    number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+(\.\d+)?|\.\d+)(?:e[-+]?[\d_]+)?)(ul?|l|f)?/i,
     blockKeywords: words("catch class do else finally for if where try while enum"),
     defKeywords: words("class val var object interface fun"),
     atoms: words("true false null this"),

From be271d3b04487edeece41c27f7a2e2ac98faccc9 Mon Sep 17 00:00:00 2001
From: Hicham Omari <hichamomari@hotmail.com>
Date: Tue, 16 Sep 2025 16:09:16 +0200
Subject: [PATCH 4742/4742] [clike mode] Correct a typo

---
 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 f783dfc8f2..30c8f6e3aa 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -677,7 +677,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "ByteArray Char CharArray DeprecationLevel DoubleArray Enum FloatArray Function Int IntArray Lazy " +
       "LazyThreadSafetyMode LongArray Nothing ShortArray Unit"
     ),
-    intendSwitch: false,
+    indentSwitch: false,
     indentStatements: false,
     multiLineStrings: true,
     number: /^(?:0x[a-f\d_]+|0b[01_]+|(?:[\d_]+(\.\d+)?|\.\d+)(?:e[-+]?[\d_]+)?)(ul?|l|f)?/i,